diff --git a/.docsreference.azurecli.json b/.docsreference.azurecli.json
new file mode 100644
index 0000000000..f4a0c4baa1
--- /dev/null
+++ b/.docsreference.azurecli.json
@@ -0,0 +1,116 @@
+{
+    "extensionInformationTemplate":"> [!Note]\n> This reference is part of the **{EXTENSION_NAME}** extension for Azure CLI and requires version {MIN_CORE_VERSION} or higher.  The extension will automatically install the first time you run an **{COMMAND_GROUP}** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.",
+    "titleMapping":{
+        "az": {
+            "TocTitle": "Reference",
+            "PageTitle": "Azure CLI 2.0: Command reference"
+        },
+        "az ad": {
+            "TocTitle": "ad - Azure Active Directory",
+            "PageTitle": "Azure Active Directory (AAD)"
+        },
+        "az ad sp": {
+            "TocTitle": "ad sp - service principals",
+            "PageTitle": "AAD service principals"
+        },
+
+        "az batch pool os": {
+            "TocTitle": "batch pool os - operating systems",
+            "PageTitle": "Batch pool operating systems"
+        },
+        "az cdn": {
+            "TocTitle": "cdn - Content Delivery Network",
+            "PageTitle": "CDN"
+        },
+         "az dla": {
+            "TocTitle": "dla - Data Lake Analytics",
+            "PageTitle": "Data Lake Analytics"
+        },
+         "az dla catalog tvf": {
+            "TocTitle": "dla catalog tvf - Table-valued functions",
+            "PageTitle": "Data Lake Analytics catalog table-valued functions"
+        },
+         "az dls": {
+            "TocTitle": "dls - Data Lake Store",
+            "PageTitle": "Data Lake Store"
+        },
+        "az dls fs": {
+            "TocTitle": "dls fs - file system",
+            "PageTitle": "Data Lake Store file system"
+        },
+        "az disk": {
+            "TocTitle": "disk - Managed Disks",
+            "PageTitle": "Managed Disks"
+        },
+        "az feature": {
+            "TocTitle": "feature - Resource provider features",
+            "PageTitle": "Resource provider features"
+        },
+        "az image": {
+            "TocTitle": "image - VM Images",
+            "PageTitle": "Virtual Machine Images"
+        },
+         "az lab": {
+            "TocTitle": "lab - DevTest Lab",
+            "PageTitle": "Dev/Test Lab"
+        },
+        "az network dns record-set ptr": {
+            "TocTitle": "network dns record-set ptr - pointer",
+            "PageTitle": "DNS - PTR (pointer) records"
+        },
+         "az storage cors": {
+            "TocTitle": "storage cors - Cross-origin resource sharing",
+            "PageTitle": "Cross-origin resource sharing"
+        },
+        "az vmss": {
+            "TocTitle": "vmss - VM Scale Sets",
+            "PageTitle": "VM scale Sets (VMSS)"
+        },
+        "az ams": {
+            "TocTitle": "ams - Azure Media Services",
+            "PageTitle": "Azure Media Services (AMS)"
+        }	
+    },
+    "globalParameters": [
+        {
+            "name": "--debug",
+            "isRequired": "false",
+            "summary":"Increase logging verbosity to show all debug logs."
+        },
+        {
+            "name": "--help -h",
+            "isRequired": "false",
+            "summary": "Show this help message and exit."
+        }, 
+        {
+            "name": "--only-show-errors",
+            "isRequired": "false",
+            "summary": "Only show errors, suppressing warnings."
+        },
+        {
+            "name": "--output -o",
+            "isRequired": "false",
+            "summary": "Output format.",
+            "defaultValue": "json",
+            "parameterValueGroup": "json, jsonc, table, tsv"
+        },
+        {
+            "name": "--query",
+            "isRequired": "false",
+            "summary": "JMESPath query string. See <a href=\"http://jmespath.org/\">http://jmespath.org/</a> for more information and examples."
+        },
+        {
+            "name": "--verbose",
+            "isRequired": "false",
+            "summary": "Increase logging verbosity. Use --debug for full debug logs."
+        }
+    ],
+    "ServicePages":[
+        {
+            "IsFullListPage": true,
+            "name": "List A - Z",
+            "title": "All Azure CLI Command Reference List A - Z",
+            "summary": "These are all the command groups for Azure CLI 2.0"
+        }
+      ]      
+}
diff --git a/.gitignore b/.gitignore
index 0800744871..023f65b8d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-log/
 obj/
 azurecli/
 _site/
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
index d5b33b7037..92208049e3 100644
--- a/.openpublishing.publish.config.json
+++ b/.openpublishing.publish.config.json
@@ -1,10 +1,14 @@
 {
   "build_entry_point": "docs",
+  "redirection_files": [
+      ".openpublishing.redirection.json",
+      ".openpublishing.redirection.reference-extension.json"
+  ],
   "docsets_to_publish": [
     {
-      "docset_name": "azure-cli-docs",
+      "docset_name": "e2eprod-azure-cli-docs",
       "build_source_folder": ".",
-      "build_output_subfolder": "cli/azure",
+      "build_output_subfolder": "e2eprod-azure-cli-docs",
       "locale": "en-us",
       "open_to_public_contributors": true,
       "type_mapping": {
@@ -13,7 +17,9 @@
         "RestApi": "Content",
         "AzurePyCli": "Content",
         "UniversalReference": "Content",
-        "Tutorial": "Content"
+        "AzureCLIGroup": "Content",
+        "Tutorial": "Content",
+        "ZonePivotGroups": "Toc"
       },
       "build_entry_point": "docs",
       "template_folder": "_themes",
@@ -30,13 +36,12 @@
   ],
   "notification_subscribers": [],
   "sync_notification_subscribers": [],
-  "branches_to_filter": [],
   "git_repository_branch_open_to_public_contributors": "master",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "enable_incremental_build": false,
-  "error_log_codes": ["DuplicateOutputFiles"],
   "contribution_branch_mappings": {},
+  "branches_to_filter": ["prtest","prtest-nometavalidation","master-sync-work","live-sync-work","repo_sync_novalidation_prtest_branch","repo_sync_novalidation_live_branch","repo_sync_novalidation_master_branch"],
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
@@ -45,24 +50,26 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "_themes.pdf",
-      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "path_to_root": "azure-dev-docs-pr",
+      "url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr/",
       "branch": "master",
       "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
     "live": [
-      "Publish",
-      "Pdf"
+      "Publish"
     ]
   },
-  "need_generate_pdf_url_template": true,
+  "need_generate_pdf_url_template": false,
   "targets": {
     "pdf": {
       "template_folder": "_themes.pdf"
     }
   },
+  "error_log_codes": [
+    "DuplicateOutputFiles"
+  ],
   "need_generate_intellisense": false,
   "dependent_packages": [
     {
@@ -82,22 +89,23 @@
   ],
   "JoinTOCPlugin": [
     {
-      "TopLevelTOC": "latest/docs-ref-autogen/toc.yml",
       "ConceptualTOC": "docs-ref-conceptual/toc.yml",
-      "ReferenceTOCUrl": "/cli/azure/command/toc.json?view=azure-cli-latest",
-      "ConceptualTOCUrl": "/cli/azure/toc.json?view=azure-cli-latest"
+      "ReferenceTOCUrl": "/cli/azure/command/toc.json"
     },
     {
-      "TopLevelTOC": "2017-03-09-profile/docs-ref-autogen/toc.yml",
-      "ConceptualTOC": "docs-ref-conceptual/toc.yml",
-      "ReferenceTOCUrl": "/cli/azure/command/toc.json?view=azure-cli-2017-03-09-profile",
-      "ConceptualTOCUrl": "/cli/azure/toc.json?view=azure-cli-2017-03-09-profile"
+      "ReferenceTOC": "latest/docs-ref-autogen/toc.yml",
+      "ConceptualTOCUrl": "/cli/azure/toc.json"
     },
     {
-      "TopLevelTOC": "2018-03-01-hybrid/docs-ref-autogen/toc.yml",
-      "ConceptualTOC": "docs-ref-conceptual/toc.yml",
-      "ReferenceTOCUrl": "/cli/azure/command/toc.json?view=azure-cli-2018-03-01-hybrid",
-      "ConceptualTOCUrl": "/cli/azure/toc.json?view=azure-cli-2018-03-01-hybrid"
+      "ReferenceTOC": "2017-03-09-profile/docs-ref-autogen/toc.yml",
+      "ConceptualTOCUrl": "/cli/azure/toc.json"
+    },
+    {
+      "ReferenceTOC": "2018-03-01-hybrid/docs-ref-autogen/toc.yml",
+      "ConceptualTOCUrl": "/cli/azure/toc.json"
     }
-  ]
+  ],
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  }
 }
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 04c6d76d2f..9693672176 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -74,6 +74,22 @@
             "source_path": "docs-ref-conceptual/azure-cli-extensions.md",
             "redirect_url": "/cli/azure/azure-cli-extensions-overview",
             "redirect_document_id": false
+        },
+
+        {
+            "source_path": "docs-ref-conceptual/install-azure-cli-yum.md",
+            "redirect_url": "/cli/azure/install-azure-cli-linux?pivots=yum",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs-ref-conceptual/install-azure-cli-apt.md",
+            "redirect_url": "/cli/azure/install-azure-cli-linux?pivots=apt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs-ref-conceptual/install-azure-cli-zypper.md",
+            "redirect_url": "/cli/azure/install-azure-cli-linux?pivots=zypper",
+            "redirect_document_id": false
         }
     ]
 }
diff --git a/.openpublishing.redirection.reference-extension.json b/.openpublishing.redirection.reference-extension.json
new file mode 100644
index 0000000000..4406e15ad1
--- /dev/null
+++ b/.openpublishing.redirection.reference-extension.json
@@ -0,0 +1,9409 @@
+{
+    "redirections": [
+        {
+            "source_path": "latest/docs-ref-autogen/ext/account/account.yml",
+            "redirect_url": "/cli/azure/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/account/account.yml",
+            "redirect_url": "/cli/azure/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/account/account.yml",
+            "redirect_url": "/cli/azure/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/acrtransfer/acr.yml",
+            "redirect_url": "/cli/azure/acr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/acrtransfer/acr.yml",
+            "redirect_url": "/cli/azure/acr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/acrtransfer/acr.yml",
+            "redirect_url": "/cli/azure/acr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/ad/ad.yml",
+            "redirect_url": "/cli/azure/ad",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/ad/ad.yml",
+            "redirect_url": "/cli/azure/ad",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/ad/ad.yml",
+            "redirect_url": "/cli/azure/ad",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aem/vm.yml",
+            "redirect_url": "/cli/azure/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aem/vm.yml",
+            "redirect_url": "/cli/azure/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm.yml",
+            "redirect_url": "/cli/azure/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/ai-examples/ai-examples.yml",
+            "redirect_url": "/cli/azure/ai-examples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/ai-examples/ai-examples.yml",
+            "redirect_url": "/cli/azure/ai-examples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/ai-examples.yml",
+            "redirect_url": "/cli/azure/ai-examples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aks-preview/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/alertsmanagement/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/alias/alias.yml",
+            "redirect_url": "/cli/azure/alias",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/alias/alias.yml",
+            "redirect_url": "/cli/azure/alias",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/alias/alias.yml",
+            "redirect_url": "/cli/azure/alias",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/arcappliance/arcappliance.yml",
+            "redirect_url": "/cli/azure/arcappliance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/arcappliance/arcappliance.yml",
+            "redirect_url": "/cli/azure/arcappliance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/arcappliance/arcappliance.yml",
+            "redirect_url": "/cli/azure/arcappliance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/attestation/attestation.yml",
+            "redirect_url": "/cli/azure/attestation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/attestation/attestation.yml",
+            "redirect_url": "/cli/azure/attestation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/attestation/attestation.yml",
+            "redirect_url": "/cli/azure/attestation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/automation/automation.yml",
+            "redirect_url": "/cli/azure/automation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/automation/automation.yml",
+            "redirect_url": "/cli/azure/automation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/automation/automation.yml",
+            "redirect_url": "/cli/azure/automation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml",
+            "redirect_url": "/cli/azure/batch",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml",
+            "redirect_url": "/cli/azure/batch",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml",
+            "redirect_url": "/cli/azure/batch",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml.yml",
+            "redirect_url": "/cli/azure/ml",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml.yml",
+            "redirect_url": "/cli/azure/ml",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml.yml",
+            "redirect_url": "/cli/azure/ml",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/artifacts.yml",
+            "redirect_url": "/cli/azure/artifacts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts.yml",
+            "redirect_url": "/cli/azure/artifacts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts.yml",
+            "redirect_url": "/cli/azure/artifacts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards.yml",
+            "redirect_url": "/cli/azure/boards",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards.yml",
+            "redirect_url": "/cli/azure/boards",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards.yml",
+            "redirect_url": "/cli/azure/boards",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops.yml",
+            "redirect_url": "/cli/azure/devops",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops.yml",
+            "redirect_url": "/cli/azure/devops",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops.yml",
+            "redirect_url": "/cli/azure/devops",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines.yml",
+            "redirect_url": "/cli/azure/pipelines",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines.yml",
+            "redirect_url": "/cli/azure/pipelines",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines.yml",
+            "redirect_url": "/cli/azure/pipelines",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos.yml",
+            "redirect_url": "/cli/azure/repos",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos.yml",
+            "redirect_url": "/cli/azure/repos",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos.yml",
+            "redirect_url": "/cli/azure/repos",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt.yml",
+            "redirect_url": "/cli/azure/dt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt.yml",
+            "redirect_url": "/cli/azure/dt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt.yml",
+            "redirect_url": "/cli/azure/dt",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot.yml",
+            "redirect_url": "/cli/azure/iot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot.yml",
+            "redirect_url": "/cli/azure/iot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot.yml",
+            "redirect_url": "/cli/azure/iot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/baremetal-infrastructure/baremetalinstance.yml",
+            "redirect_url": "/cli/azure/baremetalinstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/baremetal-infrastructure/baremetalinstance.yml",
+            "redirect_url": "/cli/azure/baremetalinstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/baremetal-infrastructure/baremetalinstance.yml",
+            "redirect_url": "/cli/azure/baremetalinstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blockchain/blockchain.yml",
+            "redirect_url": "/cli/azure/blockchain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain.yml",
+            "redirect_url": "/cli/azure/blockchain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain.yml",
+            "redirect_url": "/cli/azure/blockchain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint.yml",
+            "redirect_url": "/cli/azure/blueprint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint.yml",
+            "redirect_url": "/cli/azure/blueprint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint.yml",
+            "redirect_url": "/cli/azure/blueprint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cli-translator/cli-translator.yml",
+            "redirect_url": "/cli/azure/cli-translator",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cli-translator/cli-translator.yml",
+            "redirect_url": "/cli/azure/cli-translator",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cli-translator/cli-translator.yml",
+            "redirect_url": "/cli/azure/cli-translator",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/codespaces/codespace.yml",
+            "redirect_url": "/cli/azure/codespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace.yml",
+            "redirect_url": "/cli/azure/codespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace.yml",
+            "redirect_url": "/cli/azure/codespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/communication/communication.yml",
+            "redirect_url": "/cli/azure/communication",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/communication/communication.yml",
+            "redirect_url": "/cli/azure/communication",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/communication/communication.yml",
+            "redirect_url": "/cli/azure/communication",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/confluent/confluent.yml",
+            "redirect_url": "/cli/azure/confluent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/confluent/confluent.yml",
+            "redirect_url": "/cli/azure/confluent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/confluent/confluent.yml",
+            "redirect_url": "/cli/azure/confluent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml",
+            "redirect_url": "/cli/azure/connectedk8s",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml",
+            "redirect_url": "/cli/azure/connectedk8s",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml",
+            "redirect_url": "/cli/azure/connectedk8s",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml",
+            "redirect_url": "/cli/azure/connectedmachine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml",
+            "redirect_url": "/cli/azure/connectedmachine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml",
+            "redirect_url": "/cli/azure/connectedmachine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb.yml",
+            "redirect_url": "/cli/azure/cosmosdb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb.yml",
+            "redirect_url": "/cli/azure/cosmosdb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb.yml",
+            "redirect_url": "/cli/azure/cosmosdb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra.yml",
+            "redirect_url": "/cli/azure/managed-cassandra",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra.yml",
+            "redirect_url": "/cli/azure/managed-cassandra",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra.yml",
+            "redirect_url": "/cli/azure/managed-cassandra",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/costmanagement/costmanagement.yml",
+            "redirect_url": "/cli/azure/costmanagement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement.yml",
+            "redirect_url": "/cli/azure/costmanagement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement.yml",
+            "redirect_url": "/cli/azure/costmanagement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware.yml",
+            "redirect_url": "/cli/azure/csvmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware.yml",
+            "redirect_url": "/cli/azure/csvmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware.yml",
+            "redirect_url": "/cli/azure/csvmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/custom-providers/custom-providers.yml",
+            "redirect_url": "/cli/azure/custom-providers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers.yml",
+            "redirect_url": "/cli/azure/custom-providers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers.yml",
+            "redirect_url": "/cli/azure/custom-providers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/customlocation/customlocation.yml",
+            "redirect_url": "/cli/azure/customlocation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/customlocation/customlocation.yml",
+            "redirect_url": "/cli/azure/customlocation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/customlocation/customlocation.yml",
+            "redirect_url": "/cli/azure/customlocation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/databox/databox.yml",
+            "redirect_url": "/cli/azure/databox",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/databox/databox.yml",
+            "redirect_url": "/cli/azure/databox",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox.yml",
+            "redirect_url": "/cli/azure/databox",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/databricks/databricks.yml",
+            "redirect_url": "/cli/azure/databricks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks.yml",
+            "redirect_url": "/cli/azure/databricks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks.yml",
+            "redirect_url": "/cli/azure/databricks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory.yml",
+            "redirect_url": "/cli/azure/datafactory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory.yml",
+            "redirect_url": "/cli/azure/datafactory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory.yml",
+            "redirect_url": "/cli/azure/datafactory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare.yml",
+            "redirect_url": "/cli/azure/datashare",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare.yml",
+            "redirect_url": "/cli/azure/datashare",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare.yml",
+            "redirect_url": "/cli/azure/datashare",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/db-up/mysql.yml",
+            "redirect_url": "/cli/azure/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/db-up/mysql.yml",
+            "redirect_url": "/cli/azure/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/db-up/mysql.yml",
+            "redirect_url": "/cli/azure/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/db-up/postgres.yml",
+            "redirect_url": "/cli/azure/postgres",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/db-up/postgres.yml",
+            "redirect_url": "/cli/azure/postgres",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/db-up/postgres.yml",
+            "redirect_url": "/cli/azure/postgres",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/db-up/sql.yml",
+            "redirect_url": "/cli/azure/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/db-up/sql.yml",
+            "redirect_url": "/cli/azure/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/db-up/sql.yml",
+            "redirect_url": "/cli/azure/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/deploy-to-azure/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/deploy-to-azure/container.yml",
+            "redirect_url": "/cli/azure/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container.yml",
+            "redirect_url": "/cli/azure/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container.yml",
+            "redirect_url": "/cli/azure/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml",
+            "redirect_url": "/cli/azure/functionapp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml",
+            "redirect_url": "/cli/azure/functionapp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml",
+            "redirect_url": "/cli/azure/functionapp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/dev-spaces/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/aks.yml",
+            "redirect_url": "/cli/azure/aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/dms-preview/dms.yml",
+            "redirect_url": "/cli/azure/dms",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms.yml",
+            "redirect_url": "/cli/azure/dms",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms.yml",
+            "redirect_url": "/cli/azure/dms",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid.yml",
+            "redirect_url": "/cli/azure/eventgrid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid.yml",
+            "redirect_url": "/cli/azure/eventgrid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid.yml",
+            "redirect_url": "/cli/azure/eventgrid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/express-route-cross-connection/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/footprint/footprint.yml",
+            "redirect_url": "/cli/azure/footprint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/footprint/footprint.yml",
+            "redirect_url": "/cli/azure/footprint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/footprint/footprint.yml",
+            "redirect_url": "/cli/azure/footprint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/fzf/fzf.yml",
+            "redirect_url": "/cli/azure/fzf",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/fzf/fzf.yml",
+            "redirect_url": "/cli/azure/fzf",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/fzf/fzf.yml",
+            "redirect_url": "/cli/azure/fzf",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/guestconfig/guestconfig.yml",
+            "redirect_url": "/cli/azure/guestconfig",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/guestconfig/guestconfig.yml",
+            "redirect_url": "/cli/azure/guestconfig",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/guestconfig/guestconfig.yml",
+            "redirect_url": "/cli/azure/guestconfig",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hack/hack.yml",
+            "redirect_url": "/cli/azure/hack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hack/hack.yml",
+            "redirect_url": "/cli/azure/hack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hack/hack.yml",
+            "redirect_url": "/cli/azure/hack",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml",
+            "redirect_url": "/cli/azure/dedicated-hsm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml",
+            "redirect_url": "/cli/azure/dedicated-hsm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml",
+            "redirect_url": "/cli/azure/dedicated-hsm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthbot/healthbot.yml",
+            "redirect_url": "/cli/azure/healthbot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthbot/healthbot.yml",
+            "redirect_url": "/cli/azure/healthbot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthbot/healthbot.yml",
+            "redirect_url": "/cli/azure/healthbot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml",
+            "redirect_url": "/cli/azure/healthcareapis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml",
+            "redirect_url": "/cli/azure/healthcareapis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml",
+            "redirect_url": "/cli/azure/healthcareapis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml",
+            "redirect_url": "/cli/azure/hpc-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml",
+            "redirect_url": "/cli/azure/hpc-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml",
+            "redirect_url": "/cli/azure/hpc-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/image-copy-extension/image.yml",
+            "redirect_url": "/cli/azure/image",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/image.yml",
+            "redirect_url": "/cli/azure/image",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/image.yml",
+            "redirect_url": "/cli/azure/image",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/import-export/import-export.yml",
+            "redirect_url": "/cli/azure/import-export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export.yml",
+            "redirect_url": "/cli/azure/import-export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export.yml",
+            "redirect_url": "/cli/azure/import-export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml",
+            "redirect_url": "/cli/azure/internet-analyzer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml",
+            "redirect_url": "/cli/azure/internet-analyzer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml",
+            "redirect_url": "/cli/azure/internet-analyzer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/ip-group/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/ip-group/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/k8s-configuration/k8s-configuration.yml",
+            "redirect_url": "/cli/azure/k8s-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/k8s-configuration/k8s-configuration.yml",
+            "redirect_url": "/cli/azure/k8s-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/k8s-configuration/k8s-configuration.yml",
+            "redirect_url": "/cli/azure/k8s-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/k8s-extension/k8s-extension.yml",
+            "redirect_url": "/cli/azure/k8s-extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/k8s-extension/k8s-extension.yml",
+            "redirect_url": "/cli/azure/k8s-extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/k8s-extension/k8s-extension.yml",
+            "redirect_url": "/cli/azure/k8s-extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml",
+            "redirect_url": "/cli/azure/k8sconfiguration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml",
+            "redirect_url": "/cli/azure/k8sconfiguration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml",
+            "redirect_url": "/cli/azure/k8sconfiguration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto.yml",
+            "redirect_url": "/cli/azure/kusto",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto.yml",
+            "redirect_url": "/cli/azure/kusto",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto.yml",
+            "redirect_url": "/cli/azure/kusto",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/log-analytics/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/log-analytics-solution/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/logic/logic.yml",
+            "redirect_url": "/cli/azure/logic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/logic/logic.yml",
+            "redirect_url": "/cli/azure/logic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic.yml",
+            "redirect_url": "/cli/azure/logic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/maintenance/maintenance.yml",
+            "redirect_url": "/cli/azure/maintenance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance.yml",
+            "redirect_url": "/cli/azure/maintenance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance.yml",
+            "redirect_url": "/cli/azure/maintenance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/managementpartner/managementpartner.yml",
+            "redirect_url": "/cli/azure/managementpartner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/managementpartner/managementpartner.yml",
+            "redirect_url": "/cli/azure/managementpartner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/managementpartner.yml",
+            "redirect_url": "/cli/azure/managementpartner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh.yml",
+            "redirect_url": "/cli/azure/mesh",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh.yml",
+            "redirect_url": "/cli/azure/mesh",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh.yml",
+            "redirect_url": "/cli/azure/mesh",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml",
+            "redirect_url": "/cli/azure/spatial-anchors-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml",
+            "redirect_url": "/cli/azure/spatial-anchors-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml",
+            "redirect_url": "/cli/azure/spatial-anchors-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml",
+            "redirect_url": "/cli/azure/netappfiles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml",
+            "redirect_url": "/cli/azure/netappfiles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml",
+            "redirect_url": "/cli/azure/netappfiles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub.yml",
+            "redirect_url": "/cli/azure/notification-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub.yml",
+            "redirect_url": "/cli/azure/notification-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub.yml",
+            "redirect_url": "/cli/azure/notification-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure.yml",
+            "redirect_url": "/cli/azure/offazure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure.yml",
+            "redirect_url": "/cli/azure/offazure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure.yml",
+            "redirect_url": "/cli/azure/offazure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering.yml",
+            "redirect_url": "/cli/azure/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering.yml",
+            "redirect_url": "/cli/azure/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering.yml",
+            "redirect_url": "/cli/azure/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/portal/portal.yml",
+            "redirect_url": "/cli/azure/portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/portal/portal.yml",
+            "redirect_url": "/cli/azure/portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal.yml",
+            "redirect_url": "/cli/azure/portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/powerbidedicated/powerbi.yml",
+            "redirect_url": "/cli/azure/powerbi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi.yml",
+            "redirect_url": "/cli/azure/powerbi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi.yml",
+            "redirect_url": "/cli/azure/powerbi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/providerhub/providerhub.yml",
+            "redirect_url": "/cli/azure/providerhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/providerhub/providerhub.yml",
+            "redirect_url": "/cli/azure/providerhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/providerhub/providerhub.yml",
+            "redirect_url": "/cli/azure/providerhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/quantum/quantum.yml",
+            "redirect_url": "/cli/azure/quantum",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/quantum/quantum.yml",
+            "redirect_url": "/cli/azure/quantum",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/quantum/quantum.yml",
+            "redirect_url": "/cli/azure/quantum",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/rdbms-connect/mysql.yml",
+            "redirect_url": "/cli/azure/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/rdbms-connect/mysql.yml",
+            "redirect_url": "/cli/azure/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/rdbms-connect/mysql.yml",
+            "redirect_url": "/cli/azure/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/rdbms-connect/postgres.yml",
+            "redirect_url": "/cli/azure/postgres",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/rdbms-connect/postgres.yml",
+            "redirect_url": "/cli/azure/postgres",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/rdbms-connect/postgres.yml",
+            "redirect_url": "/cli/azure/postgres",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/redisenterprise/redisenterprise.yml",
+            "redirect_url": "/cli/azure/redisenterprise",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/redisenterprise/redisenterprise.yml",
+            "redirect_url": "/cli/azure/redisenterprise",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/redisenterprise/redisenterprise.yml",
+            "redirect_url": "/cli/azure/redisenterprise",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/resource-graph/graph.yml",
+            "redirect_url": "/cli/azure/graph",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph.yml",
+            "redirect_url": "/cli/azure/graph",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph.yml",
+            "redirect_url": "/cli/azure/graph",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/resource-mover/resource-mover.yml",
+            "redirect_url": "/cli/azure/resource-mover",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/resource-mover/resource-mover.yml",
+            "redirect_url": "/cli/azure/resource-mover",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/resource-mover/resource-mover.yml",
+            "redirect_url": "/cli/azure/resource-mover",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sap-hana/hanainstance.yml",
+            "redirect_url": "/cli/azure/hanainstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sap-hana/hanainstance.yml",
+            "redirect_url": "/cli/azure/hanainstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/hanainstance.yml",
+            "redirect_url": "/cli/azure/hanainstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sap-hana/sapmonitor.yml",
+            "redirect_url": "/cli/azure/sapmonitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor.yml",
+            "redirect_url": "/cli/azure/sapmonitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor.yml",
+            "redirect_url": "/cli/azure/sapmonitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/scheduled-query/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/scheduled-query/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/scheduled-query/monitor.yml",
+            "redirect_url": "/cli/azure/monitor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel.yml",
+            "redirect_url": "/cli/azure/sentinel",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel.yml",
+            "redirect_url": "/cli/azure/sentinel",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel.yml",
+            "redirect_url": "/cli/azure/sentinel",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml",
+            "redirect_url": "/cli/azure/spring-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml",
+            "redirect_url": "/cli/azure/spring-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml",
+            "redirect_url": "/cli/azure/spring-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/ssh/ssh.yml",
+            "redirect_url": "/cli/azure/ssh",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/ssh/ssh.yml",
+            "redirect_url": "/cli/azure/ssh",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/ssh/ssh.yml",
+            "redirect_url": "/cli/azure/ssh",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stack-hci/stack-hci.yml",
+            "redirect_url": "/cli/azure/stack-hci",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stack-hci/stack-hci.yml",
+            "redirect_url": "/cli/azure/stack-hci",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stack-hci/stack-hci.yml",
+            "redirect_url": "/cli/azure/stack-hci",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage.yml",
+            "redirect_url": "/cli/azure/storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage.yml",
+            "redirect_url": "/cli/azure/storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage.yml",
+            "redirect_url": "/cli/azure/storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage.yml",
+            "redirect_url": "/cli/azure/storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage.yml",
+            "redirect_url": "/cli/azure/storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage.yml",
+            "redirect_url": "/cli/azure/storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storagesync/storagesync.yml",
+            "redirect_url": "/cli/azure/storagesync",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync.yml",
+            "redirect_url": "/cli/azure/storagesync",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync.yml",
+            "redirect_url": "/cli/azure/storagesync",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml",
+            "redirect_url": "/cli/azure/stream-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml",
+            "redirect_url": "/cli/azure/stream-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml",
+            "redirect_url": "/cli/azure/stream-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/subscription/account.yml",
+            "redirect_url": "/cli/azure/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/subscription/account.yml",
+            "redirect_url": "/cli/azure/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/subscription/account.yml",
+            "redirect_url": "/cli/azure/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/support/support.yml",
+            "redirect_url": "/cli/azure/support",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/support/support.yml",
+            "redirect_url": "/cli/azure/support",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/support/support.yml",
+            "redirect_url": "/cli/azure/support",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse.yml",
+            "redirect_url": "/cli/azure/synapse",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse.yml",
+            "redirect_url": "/cli/azure/synapse",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse.yml",
+            "redirect_url": "/cli/azure/synapse",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi.yml",
+            "redirect_url": "/cli/azure/tsi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi.yml",
+            "redirect_url": "/cli/azure/tsi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi.yml",
+            "redirect_url": "/cli/azure/tsi",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-network-tap/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network.yml",
+            "redirect_url": "/cli/azure/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vm-repair/vm.yml",
+            "redirect_url": "/cli/azure/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm.yml",
+            "redirect_url": "/cli/azure/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm.yml",
+            "redirect_url": "/cli/azure/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware.yml",
+            "redirect_url": "/cli/azure/vmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware.yml",
+            "redirect_url": "/cli/azure/vmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware.yml",
+            "redirect_url": "/cli/azure/vmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/webapp/webapp.yml",
+            "redirect_url": "/cli/azure/webapp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp.yml",
+            "redirect_url": "/cli/azure/webapp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp.yml",
+            "redirect_url": "/cli/azure/webapp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/account/account/alias.yml",
+            "redirect_url": "/cli/azure/account/alias",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/account/account/alias.yml",
+            "redirect_url": "/cli/azure/account/alias",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/account/account/alias.yml",
+            "redirect_url": "/cli/azure/account/alias",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/account/account/subscription.yml",
+            "redirect_url": "/cli/azure/account/subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/account/account/subscription.yml",
+            "redirect_url": "/cli/azure/account/subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/account/account/subscription.yml",
+            "redirect_url": "/cli/azure/account/subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/account/account/tenant.yml",
+            "redirect_url": "/cli/azure/account/tenant",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/account/account/tenant.yml",
+            "redirect_url": "/cli/azure/account/tenant",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/account/account/tenant.yml",
+            "redirect_url": "/cli/azure/account/tenant",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/acrtransfer/acr/export-pipeline.yml",
+            "redirect_url": "/cli/azure/acr/export-pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/acrtransfer/acr/export-pipeline.yml",
+            "redirect_url": "/cli/azure/acr/export-pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/acrtransfer/acr/export-pipeline.yml",
+            "redirect_url": "/cli/azure/acr/export-pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/acrtransfer/acr/import-pipeline.yml",
+            "redirect_url": "/cli/azure/acr/import-pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/acrtransfer/acr/import-pipeline.yml",
+            "redirect_url": "/cli/azure/acr/import-pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/acrtransfer/acr/import-pipeline.yml",
+            "redirect_url": "/cli/azure/acr/import-pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/acrtransfer/acr/pipeline-run.yml",
+            "redirect_url": "/cli/azure/acr/pipeline-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/acrtransfer/acr/pipeline-run.yml",
+            "redirect_url": "/cli/azure/acr/pipeline-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/acrtransfer/acr/pipeline-run.yml",
+            "redirect_url": "/cli/azure/acr/pipeline-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/ad/ad/ds.yml",
+            "redirect_url": "/cli/azure/ad/ds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/ad/ad/ds.yml",
+            "redirect_url": "/cli/azure/ad/ds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/ad/ad/ds.yml",
+            "redirect_url": "/cli/azure/ad/ds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aem/vm/aem.yml",
+            "redirect_url": "/cli/azure/vm/aem",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aem/vm/aem.yml",
+            "redirect_url": "/cli/azure/vm/aem",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm/aem.yml",
+            "redirect_url": "/cli/azure/vm/aem",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aks-preview/aks/maintenanceconfiguration.yml",
+            "redirect_url": "/cli/azure/aks/maintenanceconfiguration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/maintenanceconfiguration.yml",
+            "redirect_url": "/cli/azure/aks/maintenanceconfiguration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/maintenanceconfiguration.yml",
+            "redirect_url": "/cli/azure/aks/maintenanceconfiguration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml",
+            "redirect_url": "/cli/azure/aks/nodepool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml",
+            "redirect_url": "/cli/azure/aks/nodepool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml",
+            "redirect_url": "/cli/azure/aks/nodepool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aks-preview/aks/pod-identity.yml",
+            "redirect_url": "/cli/azure/aks/pod-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/pod-identity.yml",
+            "redirect_url": "/cli/azure/aks/pod-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/pod-identity.yml",
+            "redirect_url": "/cli/azure/aks/pod-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml",
+            "redirect_url": "/cli/azure/monitor/action-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml",
+            "redirect_url": "/cli/azure/monitor/action-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml",
+            "redirect_url": "/cli/azure/monitor/action-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/arcappliance/arcappliance/create.yml",
+            "redirect_url": "/cli/azure/arcappliance/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/arcappliance/arcappliance/create.yml",
+            "redirect_url": "/cli/azure/arcappliance/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/arcappliance/arcappliance/create.yml",
+            "redirect_url": "/cli/azure/arcappliance/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/arcappliance/arcappliance/delete.yml",
+            "redirect_url": "/cli/azure/arcappliance/delete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/arcappliance/arcappliance/delete.yml",
+            "redirect_url": "/cli/azure/arcappliance/delete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/arcappliance/arcappliance/delete.yml",
+            "redirect_url": "/cli/azure/arcappliance/delete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/arcappliance/arcappliance/deploy.yml",
+            "redirect_url": "/cli/azure/arcappliance/deploy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/arcappliance/arcappliance/deploy.yml",
+            "redirect_url": "/cli/azure/arcappliance/deploy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/arcappliance/arcappliance/deploy.yml",
+            "redirect_url": "/cli/azure/arcappliance/deploy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/attestation/attestation/policy.yml",
+            "redirect_url": "/cli/azure/attestation/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/attestation/attestation/policy.yml",
+            "redirect_url": "/cli/azure/attestation/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/attestation/attestation/policy.yml",
+            "redirect_url": "/cli/azure/attestation/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/attestation/attestation/signer.yml",
+            "redirect_url": "/cli/azure/attestation/signer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/attestation/attestation/signer.yml",
+            "redirect_url": "/cli/azure/attestation/signer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/attestation/attestation/signer.yml",
+            "redirect_url": "/cli/azure/attestation/signer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/automation/automation/account.yml",
+            "redirect_url": "/cli/azure/automation/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/automation/automation/account.yml",
+            "redirect_url": "/cli/azure/automation/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/automation/automation/account.yml",
+            "redirect_url": "/cli/azure/automation/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/automation/automation/job.yml",
+            "redirect_url": "/cli/azure/automation/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/automation/automation/job.yml",
+            "redirect_url": "/cli/azure/automation/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/automation/automation/job.yml",
+            "redirect_url": "/cli/azure/automation/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/automation/automation/runbook.yml",
+            "redirect_url": "/cli/azure/automation/runbook",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/automation/automation/runbook.yml",
+            "redirect_url": "/cli/azure/automation/runbook",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/automation/automation/runbook.yml",
+            "redirect_url": "/cli/azure/automation/runbook",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml",
+            "redirect_url": "/cli/azure/batch/file",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml",
+            "redirect_url": "/cli/azure/batch/file",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml",
+            "redirect_url": "/cli/azure/batch/file",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml",
+            "redirect_url": "/cli/azure/batch/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml",
+            "redirect_url": "/cli/azure/batch/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml",
+            "redirect_url": "/cli/azure/batch/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml",
+            "redirect_url": "/cli/azure/batch/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml",
+            "redirect_url": "/cli/azure/batch/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml",
+            "redirect_url": "/cli/azure/batch/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml",
+            "redirect_url": "/cli/azure/ml/computetarget",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml",
+            "redirect_url": "/cli/azure/ml/computetarget",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml",
+            "redirect_url": "/cli/azure/ml/computetarget",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml",
+            "redirect_url": "/cli/azure/ml/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml",
+            "redirect_url": "/cli/azure/ml/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml",
+            "redirect_url": "/cli/azure/ml/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml",
+            "redirect_url": "/cli/azure/ml/datastore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml",
+            "redirect_url": "/cli/azure/ml/datastore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml",
+            "redirect_url": "/cli/azure/ml/datastore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml",
+            "redirect_url": "/cli/azure/ml/endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml",
+            "redirect_url": "/cli/azure/ml/endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml",
+            "redirect_url": "/cli/azure/ml/endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml",
+            "redirect_url": "/cli/azure/ml/environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml",
+            "redirect_url": "/cli/azure/ml/environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml",
+            "redirect_url": "/cli/azure/ml/environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml",
+            "redirect_url": "/cli/azure/ml/experiment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml",
+            "redirect_url": "/cli/azure/ml/experiment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml",
+            "redirect_url": "/cli/azure/ml/experiment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml",
+            "redirect_url": "/cli/azure/ml/folder",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml",
+            "redirect_url": "/cli/azure/ml/folder",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml",
+            "redirect_url": "/cli/azure/ml/folder",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml",
+            "redirect_url": "/cli/azure/ml/model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml",
+            "redirect_url": "/cli/azure/ml/model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml",
+            "redirect_url": "/cli/azure/ml/model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml",
+            "redirect_url": "/cli/azure/ml/pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml",
+            "redirect_url": "/cli/azure/ml/pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml",
+            "redirect_url": "/cli/azure/ml/pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml",
+            "redirect_url": "/cli/azure/ml/run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml",
+            "redirect_url": "/cli/azure/ml/run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml",
+            "redirect_url": "/cli/azure/ml/run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml",
+            "redirect_url": "/cli/azure/ml/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml",
+            "redirect_url": "/cli/azure/ml/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml",
+            "redirect_url": "/cli/azure/ml/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml",
+            "redirect_url": "/cli/azure/ml/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml",
+            "redirect_url": "/cli/azure/ml/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml",
+            "redirect_url": "/cli/azure/ml/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml",
+            "redirect_url": "/cli/azure/artifacts/universal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml",
+            "redirect_url": "/cli/azure/artifacts/universal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml",
+            "redirect_url": "/cli/azure/artifacts/universal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/area.yml",
+            "redirect_url": "/cli/azure/boards/area",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area.yml",
+            "redirect_url": "/cli/azure/boards/area",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area.yml",
+            "redirect_url": "/cli/azure/boards/area",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/iteration.yml",
+            "redirect_url": "/cli/azure/boards/iteration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration.yml",
+            "redirect_url": "/cli/azure/boards/iteration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration.yml",
+            "redirect_url": "/cli/azure/boards/iteration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/work-item.yml",
+            "redirect_url": "/cli/azure/boards/work-item",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item.yml",
+            "redirect_url": "/cli/azure/boards/work-item",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item.yml",
+            "redirect_url": "/cli/azure/boards/work-item",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/admin.yml",
+            "redirect_url": "/cli/azure/devops/admin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin.yml",
+            "redirect_url": "/cli/azure/devops/admin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin.yml",
+            "redirect_url": "/cli/azure/devops/admin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/extension.yml",
+            "redirect_url": "/cli/azure/devops/extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/extension.yml",
+            "redirect_url": "/cli/azure/devops/extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/extension.yml",
+            "redirect_url": "/cli/azure/devops/extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/project.yml",
+            "redirect_url": "/cli/azure/devops/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/project.yml",
+            "redirect_url": "/cli/azure/devops/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/project.yml",
+            "redirect_url": "/cli/azure/devops/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/security.yml",
+            "redirect_url": "/cli/azure/devops/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security.yml",
+            "redirect_url": "/cli/azure/devops/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security.yml",
+            "redirect_url": "/cli/azure/devops/security",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/team.yml",
+            "redirect_url": "/cli/azure/devops/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/team.yml",
+            "redirect_url": "/cli/azure/devops/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/team.yml",
+            "redirect_url": "/cli/azure/devops/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/user.yml",
+            "redirect_url": "/cli/azure/devops/user",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/user.yml",
+            "redirect_url": "/cli/azure/devops/user",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/user.yml",
+            "redirect_url": "/cli/azure/devops/user",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/wiki.yml",
+            "redirect_url": "/cli/azure/devops/wiki",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki.yml",
+            "redirect_url": "/cli/azure/devops/wiki",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki.yml",
+            "redirect_url": "/cli/azure/devops/wiki",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml",
+            "redirect_url": "/cli/azure/pipelines/agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml",
+            "redirect_url": "/cli/azure/pipelines/agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml",
+            "redirect_url": "/cli/azure/pipelines/agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/build.yml",
+            "redirect_url": "/cli/azure/pipelines/build",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build.yml",
+            "redirect_url": "/cli/azure/pipelines/build",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build.yml",
+            "redirect_url": "/cli/azure/pipelines/build",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml",
+            "redirect_url": "/cli/azure/pipelines/folder",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml",
+            "redirect_url": "/cli/azure/pipelines/folder",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml",
+            "redirect_url": "/cli/azure/pipelines/folder",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml",
+            "redirect_url": "/cli/azure/pipelines/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml",
+            "redirect_url": "/cli/azure/pipelines/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml",
+            "redirect_url": "/cli/azure/pipelines/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml",
+            "redirect_url": "/cli/azure/pipelines/queue",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml",
+            "redirect_url": "/cli/azure/pipelines/queue",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml",
+            "redirect_url": "/cli/azure/pipelines/queue",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/release.yml",
+            "redirect_url": "/cli/azure/pipelines/release",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release.yml",
+            "redirect_url": "/cli/azure/pipelines/release",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release.yml",
+            "redirect_url": "/cli/azure/pipelines/release",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml",
+            "redirect_url": "/cli/azure/pipelines/runs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml",
+            "redirect_url": "/cli/azure/pipelines/runs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml",
+            "redirect_url": "/cli/azure/pipelines/runs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml",
+            "redirect_url": "/cli/azure/pipelines/variable-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml",
+            "redirect_url": "/cli/azure/pipelines/variable-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml",
+            "redirect_url": "/cli/azure/pipelines/variable-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml",
+            "redirect_url": "/cli/azure/pipelines/variable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml",
+            "redirect_url": "/cli/azure/pipelines/variable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml",
+            "redirect_url": "/cli/azure/pipelines/variable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/import.yml",
+            "redirect_url": "/cli/azure/repos/import",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/import.yml",
+            "redirect_url": "/cli/azure/repos/import",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/import.yml",
+            "redirect_url": "/cli/azure/repos/import",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy.yml",
+            "redirect_url": "/cli/azure/repos/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy.yml",
+            "redirect_url": "/cli/azure/repos/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy.yml",
+            "redirect_url": "/cli/azure/repos/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/pr.yml",
+            "redirect_url": "/cli/azure/repos/pr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr.yml",
+            "redirect_url": "/cli/azure/repos/pr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr.yml",
+            "redirect_url": "/cli/azure/repos/pr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/ref.yml",
+            "redirect_url": "/cli/azure/repos/ref",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/ref.yml",
+            "redirect_url": "/cli/azure/repos/ref",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/ref.yml",
+            "redirect_url": "/cli/azure/repos/ref",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall.yml",
+            "redirect_url": "/cli/azure/network/firewall",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall.yml",
+            "redirect_url": "/cli/azure/network/firewall",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall.yml",
+            "redirect_url": "/cli/azure/network/firewall",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml",
+            "redirect_url": "/cli/azure/dt/endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml",
+            "redirect_url": "/cli/azure/dt/endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml",
+            "redirect_url": "/cli/azure/dt/endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/model.yml",
+            "redirect_url": "/cli/azure/dt/model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/model.yml",
+            "redirect_url": "/cli/azure/dt/model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/model.yml",
+            "redirect_url": "/cli/azure/dt/model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/network.yml",
+            "redirect_url": "/cli/azure/dt/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/network.yml",
+            "redirect_url": "/cli/azure/dt/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/network.yml",
+            "redirect_url": "/cli/azure/dt/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml",
+            "redirect_url": "/cli/azure/dt/role-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml",
+            "redirect_url": "/cli/azure/dt/role-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml",
+            "redirect_url": "/cli/azure/dt/role-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/route.yml",
+            "redirect_url": "/cli/azure/dt/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/route.yml",
+            "redirect_url": "/cli/azure/dt/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/route.yml",
+            "redirect_url": "/cli/azure/dt/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/twin.yml",
+            "redirect_url": "/cli/azure/dt/twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin.yml",
+            "redirect_url": "/cli/azure/dt/twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin.yml",
+            "redirect_url": "/cli/azure/dt/twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central.yml",
+            "redirect_url": "/cli/azure/iot/central",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central.yml",
+            "redirect_url": "/cli/azure/iot/central",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central.yml",
+            "redirect_url": "/cli/azure/iot/central",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/device.yml",
+            "redirect_url": "/cli/azure/iot/device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device.yml",
+            "redirect_url": "/cli/azure/iot/device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device.yml",
+            "redirect_url": "/cli/azure/iot/device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/dps.yml",
+            "redirect_url": "/cli/azure/iot/dps",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps.yml",
+            "redirect_url": "/cli/azure/iot/dps",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps.yml",
+            "redirect_url": "/cli/azure/iot/dps",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/edge.yml",
+            "redirect_url": "/cli/azure/iot/edge",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge.yml",
+            "redirect_url": "/cli/azure/iot/edge",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge.yml",
+            "redirect_url": "/cli/azure/iot/edge",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub.yml",
+            "redirect_url": "/cli/azure/iot/hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub.yml",
+            "redirect_url": "/cli/azure/iot/hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub.yml",
+            "redirect_url": "/cli/azure/iot/hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/product.yml",
+            "redirect_url": "/cli/azure/iot/product",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/product.yml",
+            "redirect_url": "/cli/azure/iot/product",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/product.yml",
+            "redirect_url": "/cli/azure/iot/product",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml",
+            "redirect_url": "/cli/azure/blockchain/consortium",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml",
+            "redirect_url": "/cli/azure/blockchain/consortium",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml",
+            "redirect_url": "/cli/azure/blockchain/consortium",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blockchain/blockchain/member.yml",
+            "redirect_url": "/cli/azure/blockchain/member",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/member.yml",
+            "redirect_url": "/cli/azure/blockchain/member",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/member.yml",
+            "redirect_url": "/cli/azure/blockchain/member",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml",
+            "redirect_url": "/cli/azure/blockchain/transaction-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml",
+            "redirect_url": "/cli/azure/blockchain/transaction-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml",
+            "redirect_url": "/cli/azure/blockchain/transaction-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml",
+            "redirect_url": "/cli/azure/blueprint/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml",
+            "redirect_url": "/cli/azure/blueprint/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml",
+            "redirect_url": "/cli/azure/blueprint/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml",
+            "redirect_url": "/cli/azure/blueprint/resource-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml",
+            "redirect_url": "/cli/azure/blueprint/resource-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml",
+            "redirect_url": "/cli/azure/blueprint/resource-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/version.yml",
+            "redirect_url": "/cli/azure/blueprint/version",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version.yml",
+            "redirect_url": "/cli/azure/blueprint/version",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version.yml",
+            "redirect_url": "/cli/azure/blueprint/version",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cli-translator/cli-translator/arm.yml",
+            "redirect_url": "/cli/azure/cli-translator/arm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cli-translator/cli-translator/arm.yml",
+            "redirect_url": "/cli/azure/cli-translator/arm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cli-translator/cli-translator/arm.yml",
+            "redirect_url": "/cli/azure/cli-translator/arm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/codespaces/codespace/location.yml",
+            "redirect_url": "/cli/azure/codespace/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/location.yml",
+            "redirect_url": "/cli/azure/codespace/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/location.yml",
+            "redirect_url": "/cli/azure/codespace/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/codespaces/codespace/plan.yml",
+            "redirect_url": "/cli/azure/codespace/plan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/plan.yml",
+            "redirect_url": "/cli/azure/codespace/plan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/plan.yml",
+            "redirect_url": "/cli/azure/codespace/plan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/codespaces/codespace/secret.yml",
+            "redirect_url": "/cli/azure/codespace/secret",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/secret.yml",
+            "redirect_url": "/cli/azure/codespace/secret",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/secret.yml",
+            "redirect_url": "/cli/azure/codespace/secret",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/confluent/confluent/organization.yml",
+            "redirect_url": "/cli/azure/confluent/organization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/confluent/confluent/organization.yml",
+            "redirect_url": "/cli/azure/confluent/organization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/confluent/confluent/organization.yml",
+            "redirect_url": "/cli/azure/confluent/organization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/confluent/confluent/terms.yml",
+            "redirect_url": "/cli/azure/confluent/terms",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/confluent/confluent/terms.yml",
+            "redirect_url": "/cli/azure/confluent/terms",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/confluent/confluent/terms.yml",
+            "redirect_url": "/cli/azure/confluent/terms",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/connectedmachine/connectedmachine/extension.yml",
+            "redirect_url": "/cli/azure/connectedmachine/extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/connectedmachine/extension.yml",
+            "redirect_url": "/cli/azure/connectedmachine/extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/connectedmachine/extension.yml",
+            "redirect_url": "/cli/azure/connectedmachine/extension",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/restorable-database-account.yml",
+            "redirect_url": "/cli/azure/cosmosdb/restorable-database-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/restorable-database-account.yml",
+            "redirect_url": "/cli/azure/cosmosdb/restorable-database-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/restorable-database-account.yml",
+            "redirect_url": "/cli/azure/cosmosdb/restorable-database-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra/cluster.yml",
+            "redirect_url": "/cli/azure/managed-cassandra/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra/cluster.yml",
+            "redirect_url": "/cli/azure/managed-cassandra/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra/cluster.yml",
+            "redirect_url": "/cli/azure/managed-cassandra/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra/datacenter.yml",
+            "redirect_url": "/cli/azure/managed-cassandra/datacenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra/datacenter.yml",
+            "redirect_url": "/cli/azure/managed-cassandra/datacenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/managed-cassandra/datacenter.yml",
+            "redirect_url": "/cli/azure/managed-cassandra/datacenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml",
+            "redirect_url": "/cli/azure/costmanagement/export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml",
+            "redirect_url": "/cli/azure/costmanagement/export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml",
+            "redirect_url": "/cli/azure/costmanagement/export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml",
+            "redirect_url": "/cli/azure/csvmware/private-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml",
+            "redirect_url": "/cli/azure/csvmware/private-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml",
+            "redirect_url": "/cli/azure/csvmware/private-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml",
+            "redirect_url": "/cli/azure/csvmware/resource-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml",
+            "redirect_url": "/cli/azure/csvmware/resource-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml",
+            "redirect_url": "/cli/azure/csvmware/resource-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml",
+            "redirect_url": "/cli/azure/csvmware/virtual-network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml",
+            "redirect_url": "/cli/azure/csvmware/virtual-network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml",
+            "redirect_url": "/cli/azure/csvmware/virtual-network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml",
+            "redirect_url": "/cli/azure/csvmware/vm-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml",
+            "redirect_url": "/cli/azure/csvmware/vm-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml",
+            "redirect_url": "/cli/azure/csvmware/vm-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/vm.yml",
+            "redirect_url": "/cli/azure/csvmware/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm.yml",
+            "redirect_url": "/cli/azure/csvmware/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm.yml",
+            "redirect_url": "/cli/azure/csvmware/vm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml",
+            "redirect_url": "/cli/azure/custom-providers/resource-provider",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml",
+            "redirect_url": "/cli/azure/custom-providers/resource-provider",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml",
+            "redirect_url": "/cli/azure/custom-providers/resource-provider",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/databox/databox/job.yml",
+            "redirect_url": "/cli/azure/databox/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/databox/databox/job.yml",
+            "redirect_url": "/cli/azure/databox/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox/job.yml",
+            "redirect_url": "/cli/azure/databox/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/databricks/databricks/workspace.yml",
+            "redirect_url": "/cli/azure/databricks/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks/workspace.yml",
+            "redirect_url": "/cli/azure/databricks/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks/workspace.yml",
+            "redirect_url": "/cli/azure/databricks/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/activity-run.yml",
+            "redirect_url": "/cli/azure/datafactory/activity-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/activity-run.yml",
+            "redirect_url": "/cli/azure/datafactory/activity-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/activity-run.yml",
+            "redirect_url": "/cli/azure/datafactory/activity-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/dataset.yml",
+            "redirect_url": "/cli/azure/datafactory/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/dataset.yml",
+            "redirect_url": "/cli/azure/datafactory/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/dataset.yml",
+            "redirect_url": "/cli/azure/datafactory/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/factory.yml",
+            "redirect_url": "/cli/azure/datafactory/factory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/factory.yml",
+            "redirect_url": "/cli/azure/datafactory/factory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/factory.yml",
+            "redirect_url": "/cli/azure/datafactory/factory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime-node.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime-node.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime-node.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime-node",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/linked-service.yml",
+            "redirect_url": "/cli/azure/datafactory/linked-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/linked-service.yml",
+            "redirect_url": "/cli/azure/datafactory/linked-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/linked-service.yml",
+            "redirect_url": "/cli/azure/datafactory/linked-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/pipeline-run.yml",
+            "redirect_url": "/cli/azure/datafactory/pipeline-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/pipeline-run.yml",
+            "redirect_url": "/cli/azure/datafactory/pipeline-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/pipeline-run.yml",
+            "redirect_url": "/cli/azure/datafactory/pipeline-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/pipeline.yml",
+            "redirect_url": "/cli/azure/datafactory/pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/pipeline.yml",
+            "redirect_url": "/cli/azure/datafactory/pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/pipeline.yml",
+            "redirect_url": "/cli/azure/datafactory/pipeline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/trigger-run.yml",
+            "redirect_url": "/cli/azure/datafactory/trigger-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/trigger-run.yml",
+            "redirect_url": "/cli/azure/datafactory/trigger-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/trigger-run.yml",
+            "redirect_url": "/cli/azure/datafactory/trigger-run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/trigger.yml",
+            "redirect_url": "/cli/azure/datafactory/trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/trigger.yml",
+            "redirect_url": "/cli/azure/datafactory/trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/trigger.yml",
+            "redirect_url": "/cli/azure/datafactory/trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/account.yml",
+            "redirect_url": "/cli/azure/datashare/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/account.yml",
+            "redirect_url": "/cli/azure/datashare/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/account.yml",
+            "redirect_url": "/cli/azure/datashare/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/consumer.yml",
+            "redirect_url": "/cli/azure/datashare/consumer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer.yml",
+            "redirect_url": "/cli/azure/datashare/consumer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer.yml",
+            "redirect_url": "/cli/azure/datashare/consumer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/dataset.yml",
+            "redirect_url": "/cli/azure/datashare/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/dataset.yml",
+            "redirect_url": "/cli/azure/datashare/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/dataset.yml",
+            "redirect_url": "/cli/azure/datashare/dataset",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/invitation.yml",
+            "redirect_url": "/cli/azure/datashare/invitation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/invitation.yml",
+            "redirect_url": "/cli/azure/datashare/invitation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/invitation.yml",
+            "redirect_url": "/cli/azure/datashare/invitation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml",
+            "redirect_url": "/cli/azure/datashare/provider-share-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml",
+            "redirect_url": "/cli/azure/datashare/provider-share-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml",
+            "redirect_url": "/cli/azure/datashare/provider-share-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml",
+            "redirect_url": "/cli/azure/datashare/synchronization-setting",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml",
+            "redirect_url": "/cli/azure/datashare/synchronization-setting",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml",
+            "redirect_url": "/cli/azure/datashare/synchronization-setting",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/synchronization.yml",
+            "redirect_url": "/cli/azure/datashare/synchronization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization.yml",
+            "redirect_url": "/cli/azure/datashare/synchronization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization.yml",
+            "redirect_url": "/cli/azure/datashare/synchronization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml",
+            "redirect_url": "/cli/azure/aks/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml",
+            "redirect_url": "/cli/azure/aks/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml",
+            "redirect_url": "/cli/azure/aks/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/deploy-to-azure/container/app.yml",
+            "redirect_url": "/cli/azure/container/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container/app.yml",
+            "redirect_url": "/cli/azure/container/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container/app.yml",
+            "redirect_url": "/cli/azure/container/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml",
+            "redirect_url": "/cli/azure/functionapp/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml",
+            "redirect_url": "/cli/azure/functionapp/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml",
+            "redirect_url": "/cli/azure/functionapp/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/applicationgroup.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/applicationgroup",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/applicationgroup.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/applicationgroup",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/applicationgroup.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/applicationgroup",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/hostpool.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/hostpool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/hostpool.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/hostpool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/hostpool.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/hostpool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/workspace.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/workspace.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/desktopvirtualization/desktopvirtualization/workspace.yml",
+            "redirect_url": "/cli/azure/desktopvirtualization/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/dms-preview/dms/project.yml",
+            "redirect_url": "/cli/azure/dms/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project.yml",
+            "redirect_url": "/cli/azure/dms/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project.yml",
+            "redirect_url": "/cli/azure/dms/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/dms-preview/dms/task.yml",
+            "redirect_url": "/cli/azure/dms/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/task.yml",
+            "redirect_url": "/cli/azure/dms/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/task.yml",
+            "redirect_url": "/cli/azure/dms/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/extension-topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/extension-topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/extension-topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/system-topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/system-topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/system-topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic-type",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic-type",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic-type",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml",
+            "redirect_url": "/cli/azure/network/cross-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml",
+            "redirect_url": "/cli/azure/network/cross-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml",
+            "redirect_url": "/cli/azure/network/cross-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/footprint/footprint/experiment.yml",
+            "redirect_url": "/cli/azure/footprint/experiment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/footprint/footprint/experiment.yml",
+            "redirect_url": "/cli/azure/footprint/experiment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/footprint/footprint/experiment.yml",
+            "redirect_url": "/cli/azure/footprint/experiment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/footprint/footprint/measurement-endpoint-condition.yml",
+            "redirect_url": "/cli/azure/footprint/measurement-endpoint-condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/footprint/footprint/measurement-endpoint-condition.yml",
+            "redirect_url": "/cli/azure/footprint/measurement-endpoint-condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/footprint/footprint/measurement-endpoint-condition.yml",
+            "redirect_url": "/cli/azure/footprint/measurement-endpoint-condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/footprint/footprint/measurement-endpoint.yml",
+            "redirect_url": "/cli/azure/footprint/measurement-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/footprint/footprint/measurement-endpoint.yml",
+            "redirect_url": "/cli/azure/footprint/measurement-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/footprint/footprint/measurement-endpoint.yml",
+            "redirect_url": "/cli/azure/footprint/measurement-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/footprint/footprint/profile.yml",
+            "redirect_url": "/cli/azure/footprint/profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/footprint/footprint/profile.yml",
+            "redirect_url": "/cli/azure/footprint/profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/footprint/footprint/profile.yml",
+            "redirect_url": "/cli/azure/footprint/profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door.yml",
+            "redirect_url": "/cli/azure/network/front-door",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door.yml",
+            "redirect_url": "/cli/azure/network/front-door",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door.yml",
+            "redirect_url": "/cli/azure/network/front-door",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-assignment-report.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-assignment-report",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-assignment-report.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-assignment-report",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-assignment-report.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-assignment-report",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-assignment.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-assignment.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-assignment.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-hcrp-assignment-report.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-hcrp-assignment-report",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-hcrp-assignment-report.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-hcrp-assignment-report",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-hcrp-assignment-report.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-hcrp-assignment-report",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-hcrp-assignment.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-hcrp-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-hcrp-assignment.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-hcrp-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/guestconfig/guestconfig/guest-configuration-hcrp-assignment.yml",
+            "redirect_url": "/cli/azure/guestconfig/guest-configuration-hcrp-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthcareapis/healthcareapis/acr.yml",
+            "redirect_url": "/cli/azure/healthcareapis/acr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/acr.yml",
+            "redirect_url": "/cli/azure/healthcareapis/acr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/acr.yml",
+            "redirect_url": "/cli/azure/healthcareapis/acr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml",
+            "redirect_url": "/cli/azure/healthcareapis/operation-result",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml",
+            "redirect_url": "/cli/azure/healthcareapis/operation-result",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml",
+            "redirect_url": "/cli/azure/healthcareapis/operation-result",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthcareapis/healthcareapis/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/healthcareapis/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/healthcareapis/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/healthcareapis/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthcareapis/healthcareapis/private-link-resource.yml",
+            "redirect_url": "/cli/azure/healthcareapis/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/private-link-resource.yml",
+            "redirect_url": "/cli/azure/healthcareapis/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/private-link-resource.yml",
+            "redirect_url": "/cli/azure/healthcareapis/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml",
+            "redirect_url": "/cli/azure/healthcareapis/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml",
+            "redirect_url": "/cli/azure/healthcareapis/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml",
+            "redirect_url": "/cli/azure/healthcareapis/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/blob-storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/blob-storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/blob-storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/nfs-storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/nfs-storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/nfs-storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml",
+            "redirect_url": "/cli/azure/hpc-cache/skus",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml",
+            "redirect_url": "/cli/azure/hpc-cache/skus",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml",
+            "redirect_url": "/cli/azure/hpc-cache/skus",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml",
+            "redirect_url": "/cli/azure/hpc-cache/storage-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml",
+            "redirect_url": "/cli/azure/hpc-cache/usage-model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml",
+            "redirect_url": "/cli/azure/hpc-cache/usage-model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml",
+            "redirect_url": "/cli/azure/hpc-cache/usage-model",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml",
+            "redirect_url": "/cli/azure/import-export/bit-locker-key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml",
+            "redirect_url": "/cli/azure/import-export/bit-locker-key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml",
+            "redirect_url": "/cli/azure/import-export/bit-locker-key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/import-export/import-export/location.yml",
+            "redirect_url": "/cli/azure/import-export/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/location.yml",
+            "redirect_url": "/cli/azure/import-export/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/location.yml",
+            "redirect_url": "/cli/azure/import-export/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/preconfigured-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/preconfigured-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/preconfigured-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/profile",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml",
+            "redirect_url": "/cli/azure/internet-analyzer/test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/ip-group/network/ip-group.yml",
+            "redirect_url": "/cli/azure/network/ip-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/ip-group/network/ip-group.yml",
+            "redirect_url": "/cli/azure/network/ip-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network/ip-group.yml",
+            "redirect_url": "/cli/azure/network/ip-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml",
+            "redirect_url": "/cli/azure/kusto/attached-database-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml",
+            "redirect_url": "/cli/azure/kusto/attached-database-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml",
+            "redirect_url": "/cli/azure/kusto/attached-database-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml",
+            "redirect_url": "/cli/azure/kusto/cluster-principal-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml",
+            "redirect_url": "/cli/azure/kusto/cluster-principal-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml",
+            "redirect_url": "/cli/azure/kusto/cluster-principal-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/cluster.yml",
+            "redirect_url": "/cli/azure/kusto/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster.yml",
+            "redirect_url": "/cli/azure/kusto/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster.yml",
+            "redirect_url": "/cli/azure/kusto/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/data-connection.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml",
+            "redirect_url": "/cli/azure/kusto/database-principal-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml",
+            "redirect_url": "/cli/azure/kusto/database-principal-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml",
+            "redirect_url": "/cli/azure/kusto/database-principal-assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/database.yml",
+            "redirect_url": "/cli/azure/kusto/database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database.yml",
+            "redirect_url": "/cli/azure/kusto/database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database.yml",
+            "redirect_url": "/cli/azure/kusto/database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/logic/logic/integration-account.yml",
+            "redirect_url": "/cli/azure/logic/integration-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/logic/logic/integration-account.yml",
+            "redirect_url": "/cli/azure/logic/integration-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/integration-account.yml",
+            "redirect_url": "/cli/azure/logic/integration-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/logic/logic/workflow.yml",
+            "redirect_url": "/cli/azure/logic/workflow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/logic/logic/workflow.yml",
+            "redirect_url": "/cli/azure/logic/workflow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/workflow.yml",
+            "redirect_url": "/cli/azure/logic/workflow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml",
+            "redirect_url": "/cli/azure/maintenance/applyupdate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml",
+            "redirect_url": "/cli/azure/maintenance/applyupdate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml",
+            "redirect_url": "/cli/azure/maintenance/applyupdate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml",
+            "redirect_url": "/cli/azure/maintenance/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml",
+            "redirect_url": "/cli/azure/maintenance/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml",
+            "redirect_url": "/cli/azure/maintenance/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml",
+            "redirect_url": "/cli/azure/maintenance/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml",
+            "redirect_url": "/cli/azure/maintenance/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml",
+            "redirect_url": "/cli/azure/maintenance/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/maintenance/maintenance/public-configuration.yml",
+            "redirect_url": "/cli/azure/maintenance/public-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/public-configuration.yml",
+            "redirect_url": "/cli/azure/maintenance/public-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/public-configuration.yml",
+            "redirect_url": "/cli/azure/maintenance/public-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/maintenance/maintenance/update.yml",
+            "redirect_url": "/cli/azure/maintenance/update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/update.yml",
+            "redirect_url": "/cli/azure/maintenance/update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/update.yml",
+            "redirect_url": "/cli/azure/maintenance/update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/app.yml",
+            "redirect_url": "/cli/azure/mesh/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/app.yml",
+            "redirect_url": "/cli/azure/mesh/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/app.yml",
+            "redirect_url": "/cli/azure/mesh/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml",
+            "redirect_url": "/cli/azure/mesh/code-package-log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml",
+            "redirect_url": "/cli/azure/mesh/code-package-log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml",
+            "redirect_url": "/cli/azure/mesh/code-package-log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/deployment.yml",
+            "redirect_url": "/cli/azure/mesh/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/deployment.yml",
+            "redirect_url": "/cli/azure/mesh/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/deployment.yml",
+            "redirect_url": "/cli/azure/mesh/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/gateway.yml",
+            "redirect_url": "/cli/azure/mesh/gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/gateway.yml",
+            "redirect_url": "/cli/azure/mesh/gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/gateway.yml",
+            "redirect_url": "/cli/azure/mesh/gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/generate.yml",
+            "redirect_url": "/cli/azure/mesh/generate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/generate.yml",
+            "redirect_url": "/cli/azure/mesh/generate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/generate.yml",
+            "redirect_url": "/cli/azure/mesh/generate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/network.yml",
+            "redirect_url": "/cli/azure/mesh/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/network.yml",
+            "redirect_url": "/cli/azure/mesh/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/network.yml",
+            "redirect_url": "/cli/azure/mesh/network",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/secret.yml",
+            "redirect_url": "/cli/azure/mesh/secret",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secret.yml",
+            "redirect_url": "/cli/azure/mesh/secret",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secret.yml",
+            "redirect_url": "/cli/azure/mesh/secret",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml",
+            "redirect_url": "/cli/azure/mesh/secretvalue",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml",
+            "redirect_url": "/cli/azure/mesh/secretvalue",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml",
+            "redirect_url": "/cli/azure/mesh/secretvalue",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/service-replica.yml",
+            "redirect_url": "/cli/azure/mesh/service-replica",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service-replica.yml",
+            "redirect_url": "/cli/azure/mesh/service-replica",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service-replica.yml",
+            "redirect_url": "/cli/azure/mesh/service-replica",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/service.yml",
+            "redirect_url": "/cli/azure/mesh/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service.yml",
+            "redirect_url": "/cli/azure/mesh/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service.yml",
+            "redirect_url": "/cli/azure/mesh/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mesh/mesh/volume.yml",
+            "redirect_url": "/cli/azure/mesh/volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/volume.yml",
+            "redirect_url": "/cli/azure/mesh/volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/volume.yml",
+            "redirect_url": "/cli/azure/mesh/volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml",
+            "redirect_url": "/cli/azure/spatial-anchors-account/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml",
+            "redirect_url": "/cli/azure/spatial-anchors-account/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml",
+            "redirect_url": "/cli/azure/spatial-anchors-account/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml",
+            "redirect_url": "/cli/azure/netappfiles/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml",
+            "redirect_url": "/cli/azure/netappfiles/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml",
+            "redirect_url": "/cli/azure/netappfiles/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml",
+            "redirect_url": "/cli/azure/netappfiles/mount-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml",
+            "redirect_url": "/cli/azure/netappfiles/mount-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml",
+            "redirect_url": "/cli/azure/netappfiles/mount-target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml",
+            "redirect_url": "/cli/azure/netappfiles/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml",
+            "redirect_url": "/cli/azure/netappfiles/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml",
+            "redirect_url": "/cli/azure/netappfiles/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml",
+            "redirect_url": "/cli/azure/netappfiles/snapshot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml",
+            "redirect_url": "/cli/azure/netappfiles/snapshot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml",
+            "redirect_url": "/cli/azure/netappfiles/snapshot",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml",
+            "redirect_url": "/cli/azure/netappfiles/volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml",
+            "redirect_url": "/cli/azure/netappfiles/volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml",
+            "redirect_url": "/cli/azure/netappfiles/volume",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml",
+            "redirect_url": "/cli/azure/notification-hub/authorization-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml",
+            "redirect_url": "/cli/azure/notification-hub/authorization-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml",
+            "redirect_url": "/cli/azure/notification-hub/authorization-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml",
+            "redirect_url": "/cli/azure/notification-hub/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml",
+            "redirect_url": "/cli/azure/notification-hub/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml",
+            "redirect_url": "/cli/azure/notification-hub/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/hyperv.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/hyperv.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/hyperv.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/vmware.yml",
+            "redirect_url": "/cli/azure/offazure/vmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/vmware.yml",
+            "redirect_url": "/cli/azure/offazure/vmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/vmware.yml",
+            "redirect_url": "/cli/azure/offazure/vmware",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/asn.yml",
+            "redirect_url": "/cli/azure/peering/asn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/asn.yml",
+            "redirect_url": "/cli/azure/peering/asn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/asn.yml",
+            "redirect_url": "/cli/azure/peering/asn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/legacy.yml",
+            "redirect_url": "/cli/azure/peering/legacy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/legacy.yml",
+            "redirect_url": "/cli/azure/peering/legacy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/legacy.yml",
+            "redirect_url": "/cli/azure/peering/legacy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/location.yml",
+            "redirect_url": "/cli/azure/peering/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/location.yml",
+            "redirect_url": "/cli/azure/peering/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/location.yml",
+            "redirect_url": "/cli/azure/peering/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/peering.yml",
+            "redirect_url": "/cli/azure/peering/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/peering.yml",
+            "redirect_url": "/cli/azure/peering/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/peering.yml",
+            "redirect_url": "/cli/azure/peering/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/received-route.yml",
+            "redirect_url": "/cli/azure/peering/received-route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/received-route.yml",
+            "redirect_url": "/cli/azure/peering/received-route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/received-route.yml",
+            "redirect_url": "/cli/azure/peering/received-route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/registered-asn.yml",
+            "redirect_url": "/cli/azure/peering/registered-asn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/registered-asn.yml",
+            "redirect_url": "/cli/azure/peering/registered-asn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/registered-asn.yml",
+            "redirect_url": "/cli/azure/peering/registered-asn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/registered-prefix.yml",
+            "redirect_url": "/cli/azure/peering/registered-prefix",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/registered-prefix.yml",
+            "redirect_url": "/cli/azure/peering/registered-prefix",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/registered-prefix.yml",
+            "redirect_url": "/cli/azure/peering/registered-prefix",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/service.yml",
+            "redirect_url": "/cli/azure/peering/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service.yml",
+            "redirect_url": "/cli/azure/peering/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service.yml",
+            "redirect_url": "/cli/azure/peering/service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/portal/portal/dashboard.yml",
+            "redirect_url": "/cli/azure/portal/dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/portal/portal/dashboard.yml",
+            "redirect_url": "/cli/azure/portal/dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal/dashboard.yml",
+            "redirect_url": "/cli/azure/portal/dashboard",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml",
+            "redirect_url": "/cli/azure/powerbi/embedded-capacity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml",
+            "redirect_url": "/cli/azure/powerbi/embedded-capacity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml",
+            "redirect_url": "/cli/azure/powerbi/embedded-capacity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/providerhub/providerhub/custom-rollout.yml",
+            "redirect_url": "/cli/azure/providerhub/custom-rollout",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/providerhub/providerhub/custom-rollout.yml",
+            "redirect_url": "/cli/azure/providerhub/custom-rollout",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/providerhub/providerhub/custom-rollout.yml",
+            "redirect_url": "/cli/azure/providerhub/custom-rollout",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/providerhub/providerhub/default-rollout.yml",
+            "redirect_url": "/cli/azure/providerhub/default-rollout",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/providerhub/providerhub/default-rollout.yml",
+            "redirect_url": "/cli/azure/providerhub/default-rollout",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/providerhub/providerhub/default-rollout.yml",
+            "redirect_url": "/cli/azure/providerhub/default-rollout",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/providerhub/providerhub/manifest.yml",
+            "redirect_url": "/cli/azure/providerhub/manifest",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/providerhub/providerhub/manifest.yml",
+            "redirect_url": "/cli/azure/providerhub/manifest",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/providerhub/providerhub/manifest.yml",
+            "redirect_url": "/cli/azure/providerhub/manifest",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/providerhub/providerhub/provider-registration.yml",
+            "redirect_url": "/cli/azure/providerhub/provider-registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/providerhub/providerhub/provider-registration.yml",
+            "redirect_url": "/cli/azure/providerhub/provider-registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/providerhub/providerhub/provider-registration.yml",
+            "redirect_url": "/cli/azure/providerhub/provider-registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/providerhub/providerhub/resource-type-registration.yml",
+            "redirect_url": "/cli/azure/providerhub/resource-type-registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/providerhub/providerhub/resource-type-registration.yml",
+            "redirect_url": "/cli/azure/providerhub/resource-type-registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/providerhub/providerhub/resource-type-registration.yml",
+            "redirect_url": "/cli/azure/providerhub/resource-type-registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/quantum/quantum/job.yml",
+            "redirect_url": "/cli/azure/quantum/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/quantum/quantum/job.yml",
+            "redirect_url": "/cli/azure/quantum/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/quantum/quantum/job.yml",
+            "redirect_url": "/cli/azure/quantum/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/quantum/quantum/offerings.yml",
+            "redirect_url": "/cli/azure/quantum/offerings",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/quantum/quantum/offerings.yml",
+            "redirect_url": "/cli/azure/quantum/offerings",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/quantum/quantum/offerings.yml",
+            "redirect_url": "/cli/azure/quantum/offerings",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/quantum/quantum/target.yml",
+            "redirect_url": "/cli/azure/quantum/target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/quantum/quantum/target.yml",
+            "redirect_url": "/cli/azure/quantum/target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/quantum/quantum/target.yml",
+            "redirect_url": "/cli/azure/quantum/target",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/quantum/quantum/workspace.yml",
+            "redirect_url": "/cli/azure/quantum/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/quantum/quantum/workspace.yml",
+            "redirect_url": "/cli/azure/quantum/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/quantum/quantum/workspace.yml",
+            "redirect_url": "/cli/azure/quantum/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/rdbms-connect/mysql/flexible-server.yml",
+            "redirect_url": "/cli/azure/mysql/flexible-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/rdbms-connect/mysql/flexible-server.yml",
+            "redirect_url": "/cli/azure/mysql/flexible-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/rdbms-connect/mysql/flexible-server.yml",
+            "redirect_url": "/cli/azure/mysql/flexible-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/rdbms-connect/postgres/flexible-server.yml",
+            "redirect_url": "/cli/azure/postgres/flexible-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/rdbms-connect/postgres/flexible-server.yml",
+            "redirect_url": "/cli/azure/postgres/flexible-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/rdbms-connect/postgres/flexible-server.yml",
+            "redirect_url": "/cli/azure/postgres/flexible-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/redisenterprise/redisenterprise/database.yml",
+            "redirect_url": "/cli/azure/redisenterprise/database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/redisenterprise/redisenterprise/database.yml",
+            "redirect_url": "/cli/azure/redisenterprise/database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/redisenterprise/redisenterprise/database.yml",
+            "redirect_url": "/cli/azure/redisenterprise/database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/redisenterprise/redisenterprise/operation-status.yml",
+            "redirect_url": "/cli/azure/redisenterprise/operation-status",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/redisenterprise/redisenterprise/operation-status.yml",
+            "redirect_url": "/cli/azure/redisenterprise/operation-status",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/redisenterprise/redisenterprise/operation-status.yml",
+            "redirect_url": "/cli/azure/redisenterprise/operation-status",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml",
+            "redirect_url": "/cli/azure/graph/shared-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml",
+            "redirect_url": "/cli/azure/graph/shared-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml",
+            "redirect_url": "/cli/azure/graph/shared-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/resource-mover/resource-mover/move-collection.yml",
+            "redirect_url": "/cli/azure/resource-mover/move-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/resource-mover/resource-mover/move-collection.yml",
+            "redirect_url": "/cli/azure/resource-mover/move-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/resource-mover/resource-mover/move-collection.yml",
+            "redirect_url": "/cli/azure/resource-mover/move-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/resource-mover/resource-mover/move-resource.yml",
+            "redirect_url": "/cli/azure/resource-mover/move-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/resource-mover/resource-mover/move-resource.yml",
+            "redirect_url": "/cli/azure/resource-mover/move-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/resource-mover/resource-mover/move-resource.yml",
+            "redirect_url": "/cli/azure/resource-mover/move-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml",
+            "redirect_url": "/cli/azure/sapmonitor/provider-instance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml",
+            "redirect_url": "/cli/azure/sapmonitor/provider-instance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml",
+            "redirect_url": "/cli/azure/sapmonitor/provider-instance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/scheduled-query/monitor/scheduled-query.yml",
+            "redirect_url": "/cli/azure/monitor/scheduled-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/scheduled-query/monitor/scheduled-query.yml",
+            "redirect_url": "/cli/azure/monitor/scheduled-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/scheduled-query/monitor/scheduled-query.yml",
+            "redirect_url": "/cli/azure/monitor/scheduled-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/action.yml",
+            "redirect_url": "/cli/azure/sentinel/action",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/action.yml",
+            "redirect_url": "/cli/azure/sentinel/action",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/action.yml",
+            "redirect_url": "/cli/azure/sentinel/action",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/alert-rule-template.yml",
+            "redirect_url": "/cli/azure/sentinel/alert-rule-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/alert-rule-template.yml",
+            "redirect_url": "/cli/azure/sentinel/alert-rule-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/alert-rule-template.yml",
+            "redirect_url": "/cli/azure/sentinel/alert-rule-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/alert-rule.yml",
+            "redirect_url": "/cli/azure/sentinel/alert-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/alert-rule.yml",
+            "redirect_url": "/cli/azure/sentinel/alert-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/alert-rule.yml",
+            "redirect_url": "/cli/azure/sentinel/alert-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/bookmark.yml",
+            "redirect_url": "/cli/azure/sentinel/bookmark",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/bookmark.yml",
+            "redirect_url": "/cli/azure/sentinel/bookmark",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/bookmark.yml",
+            "redirect_url": "/cli/azure/sentinel/bookmark",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/data-connector.yml",
+            "redirect_url": "/cli/azure/sentinel/data-connector",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/data-connector.yml",
+            "redirect_url": "/cli/azure/sentinel/data-connector",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/data-connector.yml",
+            "redirect_url": "/cli/azure/sentinel/data-connector",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/incident-comment.yml",
+            "redirect_url": "/cli/azure/sentinel/incident-comment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/incident-comment.yml",
+            "redirect_url": "/cli/azure/sentinel/incident-comment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/incident-comment.yml",
+            "redirect_url": "/cli/azure/sentinel/incident-comment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/sentinel/sentinel/incident.yml",
+            "redirect_url": "/cli/azure/sentinel/incident",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/sentinel/sentinel/incident.yml",
+            "redirect_url": "/cli/azure/sentinel/incident",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/sentinel/sentinel/incident.yml",
+            "redirect_url": "/cli/azure/sentinel/incident",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app-insights.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app-insights.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app-insights.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml",
+            "redirect_url": "/cli/azure/spring-cloud/certificate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml",
+            "redirect_url": "/cli/azure/spring-cloud/certificate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml",
+            "redirect_url": "/cli/azure/spring-cloud/certificate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml",
+            "redirect_url": "/cli/azure/spring-cloud/test-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml",
+            "redirect_url": "/cli/azure/spring-cloud/test-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml",
+            "redirect_url": "/cli/azure/spring-cloud/test-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stack-hci/stack-hci/cluster.yml",
+            "redirect_url": "/cli/azure/stack-hci/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stack-hci/stack-hci/cluster.yml",
+            "redirect_url": "/cli/azure/stack-hci/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stack-hci/stack-hci/cluster.yml",
+            "redirect_url": "/cli/azure/stack-hci/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/account.yml",
+            "redirect_url": "/cli/azure/storage/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/account.yml",
+            "redirect_url": "/cli/azure/storage/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/account.yml",
+            "redirect_url": "/cli/azure/storage/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob.yml",
+            "redirect_url": "/cli/azure/storage/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob.yml",
+            "redirect_url": "/cli/azure/storage/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob.yml",
+            "redirect_url": "/cli/azure/storage/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/container.yml",
+            "redirect_url": "/cli/azure/storage/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/container.yml",
+            "redirect_url": "/cli/azure/storage/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/container.yml",
+            "redirect_url": "/cli/azure/storage/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/account.yml",
+            "redirect_url": "/cli/azure/storage/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account.yml",
+            "redirect_url": "/cli/azure/storage/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account.yml",
+            "redirect_url": "/cli/azure/storage/account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml",
+            "redirect_url": "/cli/azure/storage/azcopy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml",
+            "redirect_url": "/cli/azure/storage/azcopy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml",
+            "redirect_url": "/cli/azure/storage/azcopy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/blob.yml",
+            "redirect_url": "/cli/azure/storage/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob.yml",
+            "redirect_url": "/cli/azure/storage/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob.yml",
+            "redirect_url": "/cli/azure/storage/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/file.yml",
+            "redirect_url": "/cli/azure/storage/file",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/file.yml",
+            "redirect_url": "/cli/azure/storage/file",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/file.yml",
+            "redirect_url": "/cli/azure/storage/file",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml",
+            "redirect_url": "/cli/azure/storagesync/registered-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml",
+            "redirect_url": "/cli/azure/storagesync/registered-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml",
+            "redirect_url": "/cli/azure/storagesync/registered-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml",
+            "redirect_url": "/cli/azure/stream-analytics/function",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml",
+            "redirect_url": "/cli/azure/stream-analytics/function",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml",
+            "redirect_url": "/cli/azure/stream-analytics/function",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml",
+            "redirect_url": "/cli/azure/stream-analytics/input",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml",
+            "redirect_url": "/cli/azure/stream-analytics/input",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml",
+            "redirect_url": "/cli/azure/stream-analytics/input",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml",
+            "redirect_url": "/cli/azure/stream-analytics/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml",
+            "redirect_url": "/cli/azure/stream-analytics/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml",
+            "redirect_url": "/cli/azure/stream-analytics/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml",
+            "redirect_url": "/cli/azure/stream-analytics/output",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml",
+            "redirect_url": "/cli/azure/stream-analytics/output",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml",
+            "redirect_url": "/cli/azure/stream-analytics/output",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml",
+            "redirect_url": "/cli/azure/stream-analytics/quota",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml",
+            "redirect_url": "/cli/azure/stream-analytics/quota",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml",
+            "redirect_url": "/cli/azure/stream-analytics/quota",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml",
+            "redirect_url": "/cli/azure/stream-analytics/transformation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml",
+            "redirect_url": "/cli/azure/stream-analytics/transformation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml",
+            "redirect_url": "/cli/azure/stream-analytics/transformation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/support/support/services.yml",
+            "redirect_url": "/cli/azure/support/services",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/support/support/services.yml",
+            "redirect_url": "/cli/azure/support/services",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services.yml",
+            "redirect_url": "/cli/azure/support/services",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/support/support/tickets.yml",
+            "redirect_url": "/cli/azure/support/tickets",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets.yml",
+            "redirect_url": "/cli/azure/support/tickets",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets.yml",
+            "redirect_url": "/cli/azure/support/tickets",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/spark.yml",
+            "redirect_url": "/cli/azure/synapse/spark",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark.yml",
+            "redirect_url": "/cli/azure/synapse/spark",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark.yml",
+            "redirect_url": "/cli/azure/synapse/spark",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/sql.yml",
+            "redirect_url": "/cli/azure/synapse/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql.yml",
+            "redirect_url": "/cli/azure/synapse/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql.yml",
+            "redirect_url": "/cli/azure/synapse/sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/workspace.yml",
+            "redirect_url": "/cli/azure/synapse/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace.yml",
+            "redirect_url": "/cli/azure/synapse/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace.yml",
+            "redirect_url": "/cli/azure/synapse/workspace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/access-policy.yml",
+            "redirect_url": "/cli/azure/tsi/access-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/access-policy.yml",
+            "redirect_url": "/cli/azure/tsi/access-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/access-policy.yml",
+            "redirect_url": "/cli/azure/tsi/access-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/environment.yml",
+            "redirect_url": "/cli/azure/tsi/environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/environment.yml",
+            "redirect_url": "/cli/azure/tsi/environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/environment.yml",
+            "redirect_url": "/cli/azure/tsi/environment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source.yml",
+            "redirect_url": "/cli/azure/tsi/event-source",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source.yml",
+            "redirect_url": "/cli/azure/tsi/event-source",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source.yml",
+            "redirect_url": "/cli/azure/tsi/event-source",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/reference-data-set.yml",
+            "redirect_url": "/cli/azure/tsi/reference-data-set",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/reference-data-set.yml",
+            "redirect_url": "/cli/azure/tsi/reference-data-set",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/reference-data-set.yml",
+            "redirect_url": "/cli/azure/tsi/reference-data-set",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml",
+            "redirect_url": "/cli/azure/network/nic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml",
+            "redirect_url": "/cli/azure/network/nic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml",
+            "redirect_url": "/cli/azure/network/nic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml",
+            "redirect_url": "/cli/azure/network/vnet",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml",
+            "redirect_url": "/cli/azure/network/vnet",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml",
+            "redirect_url": "/cli/azure/network/vnet",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vhub.yml",
+            "redirect_url": "/cli/azure/network/vhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub.yml",
+            "redirect_url": "/cli/azure/network/vhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub.yml",
+            "redirect_url": "/cli/azure/network/vhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vpn-server-config.yml",
+            "redirect_url": "/cli/azure/network/vpn-server-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-server-config.yml",
+            "redirect_url": "/cli/azure/network/vpn-server-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-server-config.yml",
+            "redirect_url": "/cli/azure/network/vpn-server-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml",
+            "redirect_url": "/cli/azure/network/vpn-site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml",
+            "redirect_url": "/cli/azure/network/vpn-site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml",
+            "redirect_url": "/cli/azure/network/vpn-site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vwan.yml",
+            "redirect_url": "/cli/azure/network/vwan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vwan.yml",
+            "redirect_url": "/cli/azure/network/vwan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vwan.yml",
+            "redirect_url": "/cli/azure/network/vwan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vm-repair/vm/repair.yml",
+            "redirect_url": "/cli/azure/vm/repair",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm/repair.yml",
+            "redirect_url": "/cli/azure/vm/repair",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm/repair.yml",
+            "redirect_url": "/cli/azure/vm/repair",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware/authorization.yml",
+            "redirect_url": "/cli/azure/vmware/authorization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/authorization.yml",
+            "redirect_url": "/cli/azure/vmware/authorization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/authorization.yml",
+            "redirect_url": "/cli/azure/vmware/authorization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware/cluster.yml",
+            "redirect_url": "/cli/azure/vmware/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/cluster.yml",
+            "redirect_url": "/cli/azure/vmware/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/cluster.yml",
+            "redirect_url": "/cli/azure/vmware/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware/datastore.yml",
+            "redirect_url": "/cli/azure/vmware/datastore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/datastore.yml",
+            "redirect_url": "/cli/azure/vmware/datastore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/datastore.yml",
+            "redirect_url": "/cli/azure/vmware/datastore",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware/hcx-enterprise-site.yml",
+            "redirect_url": "/cli/azure/vmware/hcx-enterprise-site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/hcx-enterprise-site.yml",
+            "redirect_url": "/cli/azure/vmware/hcx-enterprise-site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/hcx-enterprise-site.yml",
+            "redirect_url": "/cli/azure/vmware/hcx-enterprise-site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware/location.yml",
+            "redirect_url": "/cli/azure/vmware/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/location.yml",
+            "redirect_url": "/cli/azure/vmware/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/location.yml",
+            "redirect_url": "/cli/azure/vmware/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml",
+            "redirect_url": "/cli/azure/vmware/private-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml",
+            "redirect_url": "/cli/azure/vmware/private-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml",
+            "redirect_url": "/cli/azure/vmware/private-cloud",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/webapp/webapp/container.yml",
+            "redirect_url": "/cli/azure/webapp/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/container.yml",
+            "redirect_url": "/cli/azure/webapp/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/container.yml",
+            "redirect_url": "/cli/azure/webapp/container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml",
+            "redirect_url": "/cli/azure/webapp/remote-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml",
+            "redirect_url": "/cli/azure/webapp/remote-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml",
+            "redirect_url": "/cli/azure/webapp/remote-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/webapp/webapp/scan.yml",
+            "redirect_url": "/cli/azure/webapp/scan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/scan.yml",
+            "redirect_url": "/cli/azure/webapp/scan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/scan.yml",
+            "redirect_url": "/cli/azure/webapp/scan",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/aks-preview/aks/pod-identity/exception.yml",
+            "redirect_url": "/cli/azure/aks/pod-identity/exception",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/pod-identity/exception.yml",
+            "redirect_url": "/cli/azure/aks/pod-identity/exception",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/pod-identity/exception.yml",
+            "redirect_url": "/cli/azure/aks/pod-identity/exception",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/api-key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/api-key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/api-key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/events",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/events",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/events",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/amlcompute",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/amlcompute",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/amlcompute",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/attach",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/attach",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/attach",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/computeinstance.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/computeinstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/computeinstance.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/computeinstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/computeinstance.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/computeinstance",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/update",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml",
+            "redirect_url": "/cli/azure/ml/endpoint/realtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml",
+            "redirect_url": "/cli/azure/ml/endpoint/realtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml",
+            "redirect_url": "/cli/azure/ml/endpoint/realtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml",
+            "redirect_url": "/cli/azure/ml/workspace/private-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml",
+            "redirect_url": "/cli/azure/ml/workspace/private-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml",
+            "redirect_url": "/cli/azure/ml/workspace/private-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/area/project.yml",
+            "redirect_url": "/cli/azure/boards/area/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/project.yml",
+            "redirect_url": "/cli/azure/boards/area/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/project.yml",
+            "redirect_url": "/cli/azure/boards/area/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/area/team.yml",
+            "redirect_url": "/cli/azure/boards/area/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/team.yml",
+            "redirect_url": "/cli/azure/boards/area/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/team.yml",
+            "redirect_url": "/cli/azure/boards/area/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml",
+            "redirect_url": "/cli/azure/boards/iteration/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml",
+            "redirect_url": "/cli/azure/boards/iteration/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml",
+            "redirect_url": "/cli/azure/boards/iteration/project",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml",
+            "redirect_url": "/cli/azure/boards/iteration/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml",
+            "redirect_url": "/cli/azure/boards/iteration/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml",
+            "redirect_url": "/cli/azure/boards/iteration/team",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml",
+            "redirect_url": "/cli/azure/boards/work-item/relation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml",
+            "redirect_url": "/cli/azure/boards/work-item/relation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml",
+            "redirect_url": "/cli/azure/boards/work-item/relation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml",
+            "redirect_url": "/cli/azure/devops/admin/banner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml",
+            "redirect_url": "/cli/azure/devops/admin/banner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml",
+            "redirect_url": "/cli/azure/devops/admin/banner",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/security/group.yml",
+            "redirect_url": "/cli/azure/devops/security/group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group.yml",
+            "redirect_url": "/cli/azure/devops/security/group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group.yml",
+            "redirect_url": "/cli/azure/devops/security/group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml",
+            "redirect_url": "/cli/azure/devops/security/permission",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml",
+            "redirect_url": "/cli/azure/devops/security/permission",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml",
+            "redirect_url": "/cli/azure/devops/security/permission",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint/azurerm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint/azurerm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint/azurerm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint/github",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint/github",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml",
+            "redirect_url": "/cli/azure/devops/service-endpoint/github",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml",
+            "redirect_url": "/cli/azure/devops/wiki/page",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml",
+            "redirect_url": "/cli/azure/devops/wiki/page",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml",
+            "redirect_url": "/cli/azure/devops/wiki/page",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml",
+            "redirect_url": "/cli/azure/pipelines/build/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml",
+            "redirect_url": "/cli/azure/pipelines/build/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml",
+            "redirect_url": "/cli/azure/pipelines/build/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml",
+            "redirect_url": "/cli/azure/pipelines/build/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml",
+            "redirect_url": "/cli/azure/pipelines/build/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml",
+            "redirect_url": "/cli/azure/pipelines/build/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml",
+            "redirect_url": "/cli/azure/pipelines/release/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml",
+            "redirect_url": "/cli/azure/pipelines/release/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml",
+            "redirect_url": "/cli/azure/pipelines/release/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml",
+            "redirect_url": "/cli/azure/pipelines/runs/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml",
+            "redirect_url": "/cli/azure/pipelines/runs/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml",
+            "redirect_url": "/cli/azure/pipelines/runs/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml",
+            "redirect_url": "/cli/azure/pipelines/runs/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml",
+            "redirect_url": "/cli/azure/pipelines/runs/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml",
+            "redirect_url": "/cli/azure/pipelines/runs/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml",
+            "redirect_url": "/cli/azure/pipelines/variable-group/variable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml",
+            "redirect_url": "/cli/azure/pipelines/variable-group/variable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml",
+            "redirect_url": "/cli/azure/pipelines/variable-group/variable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml",
+            "redirect_url": "/cli/azure/repos/policy/approver-count",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml",
+            "redirect_url": "/cli/azure/repos/policy/approver-count",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml",
+            "redirect_url": "/cli/azure/repos/policy/approver-count",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml",
+            "redirect_url": "/cli/azure/repos/policy/build",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml",
+            "redirect_url": "/cli/azure/repos/policy/build",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml",
+            "redirect_url": "/cli/azure/repos/policy/build",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml",
+            "redirect_url": "/cli/azure/repos/policy/case-enforcement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml",
+            "redirect_url": "/cli/azure/repos/policy/case-enforcement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml",
+            "redirect_url": "/cli/azure/repos/policy/case-enforcement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml",
+            "redirect_url": "/cli/azure/repos/policy/comment-required",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml",
+            "redirect_url": "/cli/azure/repos/policy/comment-required",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml",
+            "redirect_url": "/cli/azure/repos/policy/comment-required",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml",
+            "redirect_url": "/cli/azure/repos/policy/file-size",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml",
+            "redirect_url": "/cli/azure/repos/policy/file-size",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml",
+            "redirect_url": "/cli/azure/repos/policy/file-size",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml",
+            "redirect_url": "/cli/azure/repos/policy/merge-strategy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml",
+            "redirect_url": "/cli/azure/repos/policy/merge-strategy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml",
+            "redirect_url": "/cli/azure/repos/policy/merge-strategy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml",
+            "redirect_url": "/cli/azure/repos/policy/required-reviewer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml",
+            "redirect_url": "/cli/azure/repos/policy/required-reviewer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml",
+            "redirect_url": "/cli/azure/repos/policy/required-reviewer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml",
+            "redirect_url": "/cli/azure/repos/policy/work-item-linking",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml",
+            "redirect_url": "/cli/azure/repos/policy/work-item-linking",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml",
+            "redirect_url": "/cli/azure/repos/policy/work-item-linking",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml",
+            "redirect_url": "/cli/azure/repos/pr/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml",
+            "redirect_url": "/cli/azure/repos/pr/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml",
+            "redirect_url": "/cli/azure/repos/pr/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml",
+            "redirect_url": "/cli/azure/repos/pr/reviewer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml",
+            "redirect_url": "/cli/azure/repos/pr/reviewer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml",
+            "redirect_url": "/cli/azure/repos/pr/reviewer",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml",
+            "redirect_url": "/cli/azure/repos/pr/work-item",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml",
+            "redirect_url": "/cli/azure/repos/pr/work-item",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml",
+            "redirect_url": "/cli/azure/repos/pr/work-item",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/application-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/application-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/application-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml",
+            "redirect_url": "/cli/azure/network/firewall/ip-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml",
+            "redirect_url": "/cli/azure/network/firewall/ip-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml",
+            "redirect_url": "/cli/azure/network/firewall/ip-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml",
+            "redirect_url": "/cli/azure/network/firewall/management-ip-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml",
+            "redirect_url": "/cli/azure/network/firewall/management-ip-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml",
+            "redirect_url": "/cli/azure/network/firewall/management-ip-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/nat-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/nat-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/nat-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/network-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/network-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/network-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-allowlist.yml",
+            "redirect_url": "/cli/azure/network/firewall/threat-intel-allowlist",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-allowlist.yml",
+            "redirect_url": "/cli/azure/network/firewall/threat-intel-allowlist",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-allowlist.yml",
+            "redirect_url": "/cli/azure/network/firewall/threat-intel-allowlist",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml",
+            "redirect_url": "/cli/azure/dt/endpoint/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml",
+            "redirect_url": "/cli/azure/dt/endpoint/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml",
+            "redirect_url": "/cli/azure/dt/endpoint/create",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/network/private-endpoint.yml",
+            "redirect_url": "/cli/azure/dt/network/private-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/network/private-endpoint.yml",
+            "redirect_url": "/cli/azure/dt/network/private-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/network/private-endpoint.yml",
+            "redirect_url": "/cli/azure/dt/network/private-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/network/private-link.yml",
+            "redirect_url": "/cli/azure/dt/network/private-link",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/network/private-link.yml",
+            "redirect_url": "/cli/azure/dt/network/private-link",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/network/private-link.yml",
+            "redirect_url": "/cli/azure/dt/network/private-link",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml",
+            "redirect_url": "/cli/azure/dt/twin/component",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml",
+            "redirect_url": "/cli/azure/dt/twin/component",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml",
+            "redirect_url": "/cli/azure/dt/twin/component",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml",
+            "redirect_url": "/cli/azure/dt/twin/relationship",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml",
+            "redirect_url": "/cli/azure/dt/twin/relationship",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml",
+            "redirect_url": "/cli/azure/dt/twin/relationship",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml",
+            "redirect_url": "/cli/azure/dt/twin/telemetry",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml",
+            "redirect_url": "/cli/azure/dt/twin/telemetry",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml",
+            "redirect_url": "/cli/azure/dt/twin/telemetry",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/api-token.yml",
+            "redirect_url": "/cli/azure/iot/central/api-token",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/api-token.yml",
+            "redirect_url": "/cli/azure/iot/central/api-token",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/api-token.yml",
+            "redirect_url": "/cli/azure/iot/central/api-token",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/device-template.yml",
+            "redirect_url": "/cli/azure/iot/central/device-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device-template.yml",
+            "redirect_url": "/cli/azure/iot/central/device-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device-template.yml",
+            "redirect_url": "/cli/azure/iot/central/device-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/device.yml",
+            "redirect_url": "/cli/azure/iot/central/device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device.yml",
+            "redirect_url": "/cli/azure/iot/central/device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device.yml",
+            "redirect_url": "/cli/azure/iot/central/device",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/diagnostics.yml",
+            "redirect_url": "/cli/azure/iot/central/diagnostics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/diagnostics.yml",
+            "redirect_url": "/cli/azure/iot/central/diagnostics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/diagnostics.yml",
+            "redirect_url": "/cli/azure/iot/central/diagnostics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/user.yml",
+            "redirect_url": "/cli/azure/iot/central/user",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/user.yml",
+            "redirect_url": "/cli/azure/iot/central/user",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/user.yml",
+            "redirect_url": "/cli/azure/iot/central/user",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml",
+            "redirect_url": "/cli/azure/iot/device/c2d-message",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml",
+            "redirect_url": "/cli/azure/iot/device/c2d-message",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml",
+            "redirect_url": "/cli/azure/iot/device/c2d-message",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml",
+            "redirect_url": "/cli/azure/iot/dps/enrollment-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml",
+            "redirect_url": "/cli/azure/iot/dps/enrollment-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml",
+            "redirect_url": "/cli/azure/iot/dps/enrollment-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml",
+            "redirect_url": "/cli/azure/iot/dps/enrollment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml",
+            "redirect_url": "/cli/azure/iot/dps/enrollment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml",
+            "redirect_url": "/cli/azure/iot/dps/enrollment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml",
+            "redirect_url": "/cli/azure/iot/dps/registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml",
+            "redirect_url": "/cli/azure/iot/dps/registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml",
+            "redirect_url": "/cli/azure/iot/dps/registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml",
+            "redirect_url": "/cli/azure/iot/edge/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml",
+            "redirect_url": "/cli/azure/iot/edge/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml",
+            "redirect_url": "/cli/azure/iot/edge/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml",
+            "redirect_url": "/cli/azure/iot/hub/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml",
+            "redirect_url": "/cli/azure/iot/hub/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml",
+            "redirect_url": "/cli/azure/iot/hub/configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/digital-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/digital-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/digital-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/digital-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/digital-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/digital-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml",
+            "redirect_url": "/cli/azure/iot/hub/distributed-tracing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml",
+            "redirect_url": "/cli/azure/iot/hub/distributed-tracing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml",
+            "redirect_url": "/cli/azure/iot/hub/distributed-tracing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml",
+            "redirect_url": "/cli/azure/iot/hub/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml",
+            "redirect_url": "/cli/azure/iot/hub/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml",
+            "redirect_url": "/cli/azure/iot/hub/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/product/requirement.yml",
+            "redirect_url": "/cli/azure/iot/product/requirement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/product/requirement.yml",
+            "redirect_url": "/cli/azure/iot/product/requirement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/product/requirement.yml",
+            "redirect_url": "/cli/azure/iot/product/requirement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/product/test.yml",
+            "redirect_url": "/cli/azure/iot/product/test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/product/test.yml",
+            "redirect_url": "/cli/azure/iot/product/test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/product/test.yml",
+            "redirect_url": "/cli/azure/iot/product/test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/role",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/role",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/role",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml",
+            "redirect_url": "/cli/azure/blueprint/artifact/template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml",
+            "redirect_url": "/cli/azure/blueprint/version/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml",
+            "redirect_url": "/cli/azure/blueprint/version/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml",
+            "redirect_url": "/cli/azure/blueprint/version/artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-collection.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-collection.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-collection.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-database.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-database.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-database.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-resource.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-resource.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/mongodb/restorable-resource.yml",
+            "redirect_url": "/cli/azure/cosmosdb/mongodb/restorable-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-container.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-container.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-container.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-container",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-database.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-database.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-database.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-database",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-resource.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-resource.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/restorable-resource.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/restorable-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml",
+            "redirect_url": "/cli/azure/csvmware/vm/disk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml",
+            "redirect_url": "/cli/azure/csvmware/vm/disk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml",
+            "redirect_url": "/cli/azure/csvmware/vm/disk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml",
+            "redirect_url": "/cli/azure/csvmware/vm/nic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml",
+            "redirect_url": "/cli/azure/csvmware/vm/nic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml",
+            "redirect_url": "/cli/azure/csvmware/vm/nic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/databricks/databricks/workspace/vnet-peering.yml",
+            "redirect_url": "/cli/azure/databricks/workspace/vnet-peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks/workspace/vnet-peering.yml",
+            "redirect_url": "/cli/azure/databricks/workspace/vnet-peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks/workspace/vnet-peering.yml",
+            "redirect_url": "/cli/azure/databricks/workspace/vnet-peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/linked-integration-runtime.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/linked-integration-runtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/linked-integration-runtime.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/linked-integration-runtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/linked-integration-runtime.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/linked-integration-runtime",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/managed.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/managed",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/managed.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/managed",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/managed.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/managed",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/self-hosted.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/self-hosted",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/self-hosted.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/self-hosted",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datafactory/datafactory/integration-runtime/self-hosted.yml",
+            "redirect_url": "/cli/azure/datafactory/integration-runtime/self-hosted",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/dataset-mapping",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/dataset-mapping",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/dataset-mapping",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/invitation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/invitation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/invitation",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/share-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/share-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/share-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/trigger",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/dms-preview/dms/project/task.yml",
+            "redirect_url": "/cli/azure/dms/project/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project/task.yml",
+            "redirect_url": "/cli/azure/dms/project/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project/task.yml",
+            "redirect_url": "/cli/azure/dms/project/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/domain/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/registration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/topic",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/system-topic/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/system-topic/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/system-topic/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/private-endpoint-connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml",
+            "redirect_url": "/cli/azure/eventgrid/topic/private-link-resource",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml",
+            "redirect_url": "/cli/azure/network/cross-connection/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml",
+            "redirect_url": "/cli/azure/network/cross-connection/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml",
+            "redirect_url": "/cli/azure/network/cross-connection/peering",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml",
+            "redirect_url": "/cli/azure/network/front-door/backend-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml",
+            "redirect_url": "/cli/azure/network/front-door/backend-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml",
+            "redirect_url": "/cli/azure/network/front-door/backend-pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml",
+            "redirect_url": "/cli/azure/network/front-door/frontend-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml",
+            "redirect_url": "/cli/azure/network/front-door/frontend-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml",
+            "redirect_url": "/cli/azure/network/front-door/frontend-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml",
+            "redirect_url": "/cli/azure/network/front-door/load-balancing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml",
+            "redirect_url": "/cli/azure/network/front-door/load-balancing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml",
+            "redirect_url": "/cli/azure/network/front-door/load-balancing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/probe.yml",
+            "redirect_url": "/cli/azure/network/front-door/probe",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/probe.yml",
+            "redirect_url": "/cli/azure/network/front-door/probe",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/probe.yml",
+            "redirect_url": "/cli/azure/network/front-door/probe",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/routing-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/routing-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/routing-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/event-grid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/event-grid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/event-grid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/event-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/event-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/event-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/iot-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/iot-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml",
+            "redirect_url": "/cli/azure/kusto/data-connection/iot-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics/solution",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics/solution",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml",
+            "redirect_url": "/cli/azure/monitor/log-analytics/solution",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/adm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/adm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/adm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/apns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/apns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/apns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/baidu",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/baidu",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/baidu",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/gcm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/gcm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/gcm",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/mpns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/mpns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/mpns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/wns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/wns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml",
+            "redirect_url": "/cli/azure/notification-hub/credential/wns",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml",
+            "redirect_url": "/cli/azure/notification-hub/namespace/authorization-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml",
+            "redirect_url": "/cli/azure/notification-hub/namespace/authorization-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml",
+            "redirect_url": "/cli/azure/notification-hub/namespace/authorization-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/hyperv/cluster.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/hyperv/cluster.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/hyperv/cluster.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/hyperv/host.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/host",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/hyperv/host.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/host",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/hyperv/host.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/host",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/hyperv/machine.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/machine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/hyperv/machine.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/machine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/hyperv/machine.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/machine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/hyperv/run-as-account.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/run-as-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/hyperv/run-as-account.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/run-as-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/hyperv/run-as-account.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/run-as-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/hyperv/site.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/hyperv/site.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/hyperv/site.yml",
+            "redirect_url": "/cli/azure/offazure/hyperv/site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/vmware/machine.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/machine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/vmware/machine.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/machine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/vmware/machine.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/machine",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/vmware/run-as-account.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/run-as-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/vmware/run-as-account.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/run-as-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/vmware/run-as-account.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/run-as-account",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/vmware/site.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/vmware/site.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/vmware/site.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/site",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/offazure/offazure/vmware/vcenter.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/vcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/offazure/offazure/vmware/vcenter.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/vcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/offazure/offazure/vmware/vcenter.yml",
+            "redirect_url": "/cli/azure/offazure/vmware/vcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/service/country.yml",
+            "redirect_url": "/cli/azure/peering/service/country",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/country.yml",
+            "redirect_url": "/cli/azure/peering/service/country",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/country.yml",
+            "redirect_url": "/cli/azure/peering/service/country",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/service/location.yml",
+            "redirect_url": "/cli/azure/peering/service/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/location.yml",
+            "redirect_url": "/cli/azure/peering/service/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/location.yml",
+            "redirect_url": "/cli/azure/peering/service/location",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/service/prefix.yml",
+            "redirect_url": "/cli/azure/peering/service/prefix",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/prefix.yml",
+            "redirect_url": "/cli/azure/peering/service/prefix",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/prefix.yml",
+            "redirect_url": "/cli/azure/peering/service/prefix",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/peering/peering/service/provider.yml",
+            "redirect_url": "/cli/azure/peering/service/provider",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/provider.yml",
+            "redirect_url": "/cli/azure/peering/service/provider",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/provider.yml",
+            "redirect_url": "/cli/azure/peering/service/provider",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/custom-domain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/custom-domain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/custom-domain",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/deployment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server/git",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server/git",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server/git",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/account/blob-service-properties.yml",
+            "redirect_url": "/cli/azure/storage/account/blob-service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/account/blob-service-properties.yml",
+            "redirect_url": "/cli/azure/storage/account/blob-service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/account/blob-service-properties.yml",
+            "redirect_url": "/cli/azure/storage/account/blob-service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob/copy.yml",
+            "redirect_url": "/cli/azure/storage/blob/copy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob/copy.yml",
+            "redirect_url": "/cli/azure/storage/blob/copy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob/copy.yml",
+            "redirect_url": "/cli/azure/storage/blob/copy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob/lease.yml",
+            "redirect_url": "/cli/azure/storage/blob/lease",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob/lease.yml",
+            "redirect_url": "/cli/azure/storage/blob/lease",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob/lease.yml",
+            "redirect_url": "/cli/azure/storage/blob/lease",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob/metadata.yml",
+            "redirect_url": "/cli/azure/storage/blob/metadata",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob/metadata.yml",
+            "redirect_url": "/cli/azure/storage/blob/metadata",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob/metadata.yml",
+            "redirect_url": "/cli/azure/storage/blob/metadata",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob/service-properties.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob/service-properties.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob/service-properties.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob/tag.yml",
+            "redirect_url": "/cli/azure/storage/blob/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob/tag.yml",
+            "redirect_url": "/cli/azure/storage/blob/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob/tag.yml",
+            "redirect_url": "/cli/azure/storage/blob/tag",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/account/blob-inventory-policy.yml",
+            "redirect_url": "/cli/azure/storage/account/blob-inventory-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/blob-inventory-policy.yml",
+            "redirect_url": "/cli/azure/storage/account/blob-inventory-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/blob-inventory-policy.yml",
+            "redirect_url": "/cli/azure/storage/account/blob-inventory-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/account/file-service-properties.yml",
+            "redirect_url": "/cli/azure/storage/account/file-service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/file-service-properties.yml",
+            "redirect_url": "/cli/azure/storage/account/file-service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/file-service-properties.yml",
+            "redirect_url": "/cli/azure/storage/account/file-service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml",
+            "redirect_url": "/cli/azure/storage/account/network-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml",
+            "redirect_url": "/cli/azure/storage/account/network-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml",
+            "redirect_url": "/cli/azure/storage/account/network-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml",
+            "redirect_url": "/cli/azure/storage/azcopy/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml",
+            "redirect_url": "/cli/azure/storage/azcopy/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml",
+            "redirect_url": "/cli/azure/storage/azcopy/blob",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml",
+            "redirect_url": "/cli/azure/storage/blob/access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml",
+            "redirect_url": "/cli/azure/storage/blob/access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml",
+            "redirect_url": "/cli/azure/storage/blob/access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group/cloud-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group/cloud-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group/cloud-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group/server-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group/server-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml",
+            "redirect_url": "/cli/azure/storagesync/sync-group/server-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/support/support/services/problem-classifications.yml",
+            "redirect_url": "/cli/azure/support/services/problem-classifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/support/support/services/problem-classifications.yml",
+            "redirect_url": "/cli/azure/support/services/problem-classifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services/problem-classifications.yml",
+            "redirect_url": "/cli/azure/support/services/problem-classifications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/support/support/tickets/communications.yml",
+            "redirect_url": "/cli/azure/support/tickets/communications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets/communications.yml",
+            "redirect_url": "/cli/azure/support/tickets/communications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets/communications.yml",
+            "redirect_url": "/cli/azure/support/tickets/communications",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/spark/job.yml",
+            "redirect_url": "/cli/azure/synapse/spark/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/job.yml",
+            "redirect_url": "/cli/azure/synapse/spark/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/job.yml",
+            "redirect_url": "/cli/azure/synapse/spark/job",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml",
+            "redirect_url": "/cli/azure/synapse/spark/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml",
+            "redirect_url": "/cli/azure/synapse/spark/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml",
+            "redirect_url": "/cli/azure/synapse/spark/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/spark/session.yml",
+            "redirect_url": "/cli/azure/synapse/spark/session",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/session.yml",
+            "redirect_url": "/cli/azure/synapse/spark/session",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/session.yml",
+            "redirect_url": "/cli/azure/synapse/spark/session",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml",
+            "redirect_url": "/cli/azure/synapse/spark/statement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml",
+            "redirect_url": "/cli/azure/synapse/spark/statement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml",
+            "redirect_url": "/cli/azure/synapse/spark/statement",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml",
+            "redirect_url": "/cli/azure/synapse/sql/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml",
+            "redirect_url": "/cli/azure/synapse/sql/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml",
+            "redirect_url": "/cli/azure/synapse/sql/pool",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml",
+            "redirect_url": "/cli/azure/synapse/workspace/firewall-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml",
+            "redirect_url": "/cli/azure/synapse/workspace/firewall-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml",
+            "redirect_url": "/cli/azure/synapse/workspace/firewall-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/environment/gen1.yml",
+            "redirect_url": "/cli/azure/tsi/environment/gen1",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/environment/gen1.yml",
+            "redirect_url": "/cli/azure/tsi/environment/gen1",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/environment/gen1.yml",
+            "redirect_url": "/cli/azure/tsi/environment/gen1",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/environment/gen2.yml",
+            "redirect_url": "/cli/azure/tsi/environment/gen2",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/environment/gen2.yml",
+            "redirect_url": "/cli/azure/tsi/environment/gen2",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/environment/gen2.yml",
+            "redirect_url": "/cli/azure/tsi/environment/gen2",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source/eventhub.yml",
+            "redirect_url": "/cli/azure/tsi/event-source/eventhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source/eventhub.yml",
+            "redirect_url": "/cli/azure/tsi/event-source/eventhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source/eventhub.yml",
+            "redirect_url": "/cli/azure/tsi/event-source/eventhub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source/iothub.yml",
+            "redirect_url": "/cli/azure/tsi/event-source/iothub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source/iothub.yml",
+            "redirect_url": "/cli/azure/tsi/event-source/iothub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/tsi/event-source/iothub.yml",
+            "redirect_url": "/cli/azure/tsi/event-source/iothub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml",
+            "redirect_url": "/cli/azure/network/nic/vtap-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml",
+            "redirect_url": "/cli/azure/network/nic/vtap-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml",
+            "redirect_url": "/cli/azure/network/nic/vtap-config",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml",
+            "redirect_url": "/cli/azure/network/vnet/tap",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml",
+            "redirect_url": "/cli/azure/network/vnet/tap",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml",
+            "redirect_url": "/cli/azure/network/vnet/tap",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway/connection.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway/connection.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway/connection.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway/vpn-client.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway/vpn-client",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway/vpn-client.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway/vpn-client",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/p2s-vpn-gateway/vpn-client.yml",
+            "redirect_url": "/cli/azure/network/p2s-vpn-gateway/vpn-client",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml",
+            "redirect_url": "/cli/azure/network/vhub/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml",
+            "redirect_url": "/cli/azure/network/vhub/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml",
+            "redirect_url": "/cli/azure/network/vhub/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml",
+            "redirect_url": "/cli/azure/network/vhub/route-table",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml",
+            "redirect_url": "/cli/azure/network/vhub/route-table",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml",
+            "redirect_url": "/cli/azure/network/vhub/route-table",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml",
+            "redirect_url": "/cli/azure/network/vhub/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml",
+            "redirect_url": "/cli/azure/network/vhub/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml",
+            "redirect_url": "/cli/azure/network/vhub/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vpn-server-config/ipsec-policy.yml",
+            "redirect_url": "/cli/azure/network/vpn-server-config/ipsec-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-server-config/ipsec-policy.yml",
+            "redirect_url": "/cli/azure/network/vpn-server-config/ipsec-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-server-config/ipsec-policy.yml",
+            "redirect_url": "/cli/azure/network/vpn-server-config/ipsec-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/billing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/billing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/billing",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/continues-export.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/continues-export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/continues-export.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/continues-export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/continues-export.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/continues-export",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/linked-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/linked-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml",
+            "redirect_url": "/cli/azure/monitor/app-insights/component/linked-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/amlcompute/identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/amlcompute/identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml",
+            "redirect_url": "/cli/azure/ml/computetarget/amlcompute/identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml",
+            "redirect_url": "/cli/azure/devops/security/group/membership",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml",
+            "redirect_url": "/cli/azure/devops/security/group/membership",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml",
+            "redirect_url": "/cli/azure/devops/security/group/membership",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml",
+            "redirect_url": "/cli/azure/devops/security/permission/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml",
+            "redirect_url": "/cli/azure/devops/security/permission/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml",
+            "redirect_url": "/cli/azure/devops/security/permission/namespace",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/application-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/application-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/application-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/nat-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/nat-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/nat-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/network-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/network-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/network-rule/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/intrusion-detection.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/intrusion-detection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/intrusion-detection.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/intrusion-detection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/intrusion-detection.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/intrusion-detection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/dt/network/private-endpoint/connection.yml",
+            "redirect_url": "/cli/azure/dt/network/private-endpoint/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/network/private-endpoint/connection.yml",
+            "redirect_url": "/cli/azure/dt/network/private-endpoint/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/network/private-endpoint/connection.yml",
+            "redirect_url": "/cli/azure/dt/network/private-endpoint/connection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/device/command.yml",
+            "redirect_url": "/cli/azure/iot/central/device/command",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device/command.yml",
+            "redirect_url": "/cli/azure/iot/central/device/command",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device/command.yml",
+            "redirect_url": "/cli/azure/iot/central/device/command",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/central/device/twin.yml",
+            "redirect_url": "/cli/azure/iot/central/device/twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device/twin.yml",
+            "redirect_url": "/cli/azure/iot/central/device/twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device/twin.yml",
+            "redirect_url": "/cli/azure/iot/central/device/twin",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/children.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/children",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/children.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/children",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/children.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/children",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/parent.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/parent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/parent.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/parent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity/parent.yml",
+            "redirect_url": "/cli/azure/iot/hub/device-identity/parent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-identity/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-identity/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity/connection-string.yml",
+            "redirect_url": "/cli/azure/iot/hub/module-identity/connection-string",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/product/test/case.yml",
+            "redirect_url": "/cli/azure/iot/product/test/case",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/product/test/case.yml",
+            "redirect_url": "/cli/azure/iot/product/test/case",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/product/test/case.yml",
+            "redirect_url": "/cli/azure/iot/product/test/case",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/product/test/run.yml",
+            "redirect_url": "/cli/azure/iot/product/test/run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/product/test/run.yml",
+            "redirect_url": "/cli/azure/iot/product/test/run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/product/test/run.yml",
+            "redirect_url": "/cli/azure/iot/product/test/run",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-iot/iot/product/test/task.yml",
+            "redirect_url": "/cli/azure/iot/product/test/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/product/test/task.yml",
+            "redirect_url": "/cli/azure/iot/product/test/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/product/test/task.yml",
+            "redirect_url": "/cli/azure/iot/product/test/task",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role/assignment.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role/assignment.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role/assignment.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role/assignment",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role/definition.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role/definition.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/cosmosdb-preview/cosmosdb/sql/role/definition.yml",
+            "redirect_url": "/cli/azure/cosmosdb/sql/role/definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/share-subscription/synchronization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/share-subscription/synchronization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml",
+            "redirect_url": "/cli/azure/datashare/consumer/share-subscription/synchronization",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace/event-channel",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace/event-channel",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace/event-channel",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/namespace/key",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/topic/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/topic/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml",
+            "redirect_url": "/cli/azure/eventgrid/partner/topic/event-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml",
+            "redirect_url": "/cli/azure/network/front-door/backend-pool/backend",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml",
+            "redirect_url": "/cli/azure/network/front-door/backend-pool/backend",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml",
+            "redirect_url": "/cli/azure/network/front-door/backend-pool/backend",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rule-definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rule-definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rule-definition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/association.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/association",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/association.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/association",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/association.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/association",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/data-flow.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/data-flow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/data-flow.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/data-flow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/data-flow.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/data-flow",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/log-analytics.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/performance-counter.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/performance-counter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/performance-counter.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/performance-counter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/performance-counter.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/performance-counter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/syslog.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/syslog",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/syslog.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/syslog",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/syslog.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/syslog",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/windows-event-log.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/windows-event-log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/windows-event-log.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/windows-event-log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/monitor-control-service/monitor/data-collection/rule/windows-event-log.yml",
+            "redirect_url": "/cli/azure/monitor/data-collection/rule/windows-event-log",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/cosmos",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/cosmos",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/cosmos",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/mysql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/redis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/redis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml",
+            "redirect_url": "/cli/azure/spring-cloud/app/binding/redis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server/git/repo",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server/git/repo",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml",
+            "redirect_url": "/cli/azure/spring-cloud/config-server/git/repo",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-blob-preview/storage/blob/service-properties/delete-policy.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties/delete-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-blob-preview/storage/blob/service-properties/delete-policy.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties/delete-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-blob-preview/storage/blob/service-properties/delete-policy.yml",
+            "redirect_url": "/cli/azure/storage/blob/service-properties/delete-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory/access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory/access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory/access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory/metadata",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory/metadata",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml",
+            "redirect_url": "/cli/azure/storage/blob/directory/metadata",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml",
+            "redirect_url": "/cli/azure/network/vhub/route-table/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml",
+            "redirect_url": "/cli/azure/network/vhub/route-table/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml",
+            "redirect_url": "/cli/azure/network/vhub/route-table/route",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway/connection/ipsec-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway/connection/ipsec-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml",
+            "redirect_url": "/cli/azure/network/vpn-gateway/connection/ipsec-policy",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group/collection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule/action",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule/action",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule/action",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule/condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule/condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml",
+            "redirect_url": "/cli/azure/network/front-door/rules-engine/rule/condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules/exclusion",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules/exclusion",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules/exclusion",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules/override",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules/override",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/managed-rules/override",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/rule/match-condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/rule/match-condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml",
+            "redirect_url": "/cli/azure/network/front-door/waf-policy/rule/match-condition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "latest/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group/collection/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group/collection/rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml",
+            "redirect_url": "/cli/azure/network/firewall/policy/rule-collection-group/collection/rule",
+            "redirect_document_id": false
+        }
+    ]
+}
\ No newline at end of file
diff --git a/2017-03-09-profile/docs-ref-autogen/TOC.yml b/2017-03-09-profile/docs-ref-autogen/TOC.yml
index d52055c5b3..9266904272 100644
--- a/2017-03-09-profile/docs-ref-autogen/TOC.yml
+++ b/2017-03-09-profile/docs-ref-autogen/TOC.yml
@@ -1,13887 +1,4508 @@
 - name: Reference
+  displayName: Reference
   items:
-  - name: Overview
+  - name: List A - Z
     uid: az
-  - name: configure
-    uid: az_configure
-    displayName: az configure
-  - name: feedback
-    uid: az_feedback
-    displayName: az feedback
-  - name: find
-    uid: az_find
-    displayName: az find
-  - name: interactive
-    uid: az_interactive
-    displayName: az interactive
-  - name: login
-    uid: az_login
-    displayName: az login
-  - name: logout
-    uid: az_logout
-    displayName: az logout
-  - name: rest
-    uid: az_rest
-    displayName: az rest
-  - name: self-test
-    uid: az_self_test
-    displayName: az self-test
-  - name: version
-    uid: az_version
-    displayName: az version
+    displayName: List A - Z
+  - name: API Management
+    uid: sp-API_Management
+    displayName: API Management
+    items: []
   - name: Azure Active Directory
-    displayName: az ad
     items:
-    - name: Overview
-      uid: az_ad
-      displayName: az ad
-    - name: Applications
-      displayName: az ad app
-      items:
-      - name: Overview
-        uid: az_ad_app
-        displayName: az ad app
-      - name: create
-        uid: az_ad_app_create
-        displayName: az ad app create
-      - name: delete
-        uid: az_ad_app_delete
-        displayName: az ad app delete
-      - name: list
-        uid: az_ad_app_list
-        displayName: az ad app list
-      - name: show
-        uid: az_ad_app_show
-        displayName: az ad app show
-      - name: update
-        uid: az_ad_app_update
-        displayName: az ad app update
-      - name: credential
-        displayName: az ad app credential
+    - name: Summary
+      uid: sp-Azure_Active_Directory
+      displayName: Azure Active Directory
+    - name: ad - Azure Active Directory
+      items:
+      - name: Summary
+        uid: az_ad
+        displayName: az ad
+      - name: app
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_app
+          displayName: az ad app
+        - name: credential
           uid: az_ad_app_credential
           displayName: az ad app credential
-        - name: delete
-          uid: az_ad_app_credential_delete
-          displayName: az ad app credential delete
-        - name: list
-          uid: az_ad_app_credential_list
-          displayName: az ad app credential list
-        - name: reset
-          uid: az_ad_app_credential_reset
-          displayName: az ad app credential reset
-      - name: owner
-        displayName: az ad app owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_app_owner
           displayName: az ad app owner
-        - name: add
-          uid: az_ad_app_owner_add
-          displayName: az ad app owner add
-        - name: list
-          uid: az_ad_app_owner_list
-          displayName: az ad app owner list
-        - name: remove
-          uid: az_ad_app_owner_remove
-          displayName: az ad app owner remove
-      - name: permission
-        displayName: az ad app permission
-        items:
-        - name: Overview
+          items: []
+        - name: permission
           uid: az_ad_app_permission
           displayName: az ad app permission
-        - name: add
-          uid: az_ad_app_permission_add
-          displayName: az ad app permission add
-        - name: admin-consent
-          uid: az_ad_app_permission_admin_consent
-          displayName: az ad app permission admin-consent
-        - name: delete
-          uid: az_ad_app_permission_delete
-          displayName: az ad app permission delete
-        - name: grant
-          uid: az_ad_app_permission_grant
-          displayName: az ad app permission grant
-        - name: list
-          uid: az_ad_app_permission_list
-          displayName: az ad app permission list
-        - name: list-grants
-          uid: az_ad_app_permission_list_grants
-          displayName: az ad app permission list-grants
-    - name: Groups
-      displayName: az ad group
-      items:
-      - name: Overview
-        uid: az_ad_group
-        displayName: az ad group
-      - name: create
-        uid: az_ad_group_create
-        displayName: az ad group create
-      - name: delete
-        uid: az_ad_group_delete
-        displayName: az ad group delete
-      - name: get-member-groups
-        uid: az_ad_group_get_member_groups
-        displayName: az ad group get-member-groups
-      - name: list
-        uid: az_ad_group_list
-        displayName: az ad group list
-      - name: show
-        uid: az_ad_group_show
-        displayName: az ad group show
-      - name: member
-        displayName: az ad group member
+          items: []
+      - name: ds
+        uid: az_ad_ds
+        displayName: az ad ds
+        items: []
+      - name: group
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_group
+          displayName: az ad group
+        - name: member
           uid: az_ad_group_member
           displayName: az ad group member
-        - name: add
-          uid: az_ad_group_member_add
-          displayName: az ad group member add
-        - name: check
-          uid: az_ad_group_member_check
-          displayName: az ad group member check
-        - name: list
-          uid: az_ad_group_member_list
-          displayName: az ad group member list
-        - name: remove
-          uid: az_ad_group_member_remove
-          displayName: az ad group member remove
-      - name: owner
-        displayName: az ad group owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_group_owner
           displayName: az ad group owner
-        - name: add
-          uid: az_ad_group_owner_add
-          displayName: az ad group owner add
-        - name: list
-          uid: az_ad_group_owner_list
-          displayName: az ad group owner list
-        - name: remove
-          uid: az_ad_group_owner_remove
-          displayName: az ad group owner remove
-    - name: Service principals
-      displayName: az ad sp
-      items:
-      - name: Overview
-        uid: az_ad_sp
-        displayName: az ad sp
-      - name: create
-        uid: az_ad_sp_create
-        displayName: az ad sp create
-      - name: create-for-rbac
-        uid: az_ad_sp_create_for_rbac
-        displayName: az ad sp create-for-rbac
-      - name: delete
-        uid: az_ad_sp_delete
-        displayName: az ad sp delete
-      - name: list
-        uid: az_ad_sp_list
-        displayName: az ad sp list
-      - name: show
-        uid: az_ad_sp_show
-        displayName: az ad sp show
-      - name: update
-        uid: az_ad_sp_update
-        displayName: az ad sp update
-      - name: credential
-        displayName: az ad sp credential
+          items: []
+      - name: signed-in-user
+        uid: az_ad_signed-in-user
+        displayName: az ad signed-in-user
+        items: []
+      - name: ad sp - service principals
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_sp
+          displayName: az ad sp
+        - name: credential
           uid: az_ad_sp_credential
           displayName: az ad sp credential
-        - name: delete
-          uid: az_ad_sp_credential_delete
-          displayName: az ad sp credential delete
-        - name: list
-          uid: az_ad_sp_credential_list
-          displayName: az ad sp credential list
-        - name: reset
-          uid: az_ad_sp_credential_reset
-          displayName: az ad sp credential reset
-      - name: owner
-        displayName: az ad sp owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_sp_owner
           displayName: az ad sp owner
-        - name: list
-          uid: az_ad_sp_owner_list
-          displayName: az ad sp owner list
-    - name: Users
-      displayName: az ad user
-      items:
-      - name: Overview
+          items: []
+      - name: user
         uid: az_ad_user
         displayName: az ad user
-      - name: create
-        uid: az_ad_user_create
-        displayName: az ad user create
-      - name: delete
-        uid: az_ad_user_delete
-        displayName: az ad user delete
-      - name: get-member-groups
-        uid: az_ad_user_get_member_groups
-        displayName: az ad user get-member-groups
-      - name: list
-        uid: az_ad_user_list
-        displayName: az ad user list
-      - name: show
-        uid: az_ad_user_show
-        displayName: az ad user show
-      - name: update
-        uid: az_ad_user_update
-        displayName: az ad user update
-    - name: signed-in-user
-      displayName: az ad signed-in-user
+        items: []
+  - name: Azure Advisor
+    uid: sp-Azure_Advisor
+    displayName: Azure Advisor
+    items: []
+  - name: Azure API for FHIR
+    items:
+    - name: Summary
+      uid: sp-Azure_API_for_FHIR
+      displayName: Azure API for FHIR
+    - name: healthcareapis
       items:
-      - name: Overview
-        uid: az_ad_signed_in_user
-        displayName: az ad signed-in-user
-      - name: list-owned-objects
-        uid: az_ad_signed_in_user_list_owned_objects
-        displayName: az ad signed-in-user list-owned-objects
-      - name: show
-        uid: az_ad_signed_in_user_show
-        displayName: az ad signed-in-user show
-  - name: Cloud management
-    displayName: az cloud
+      - name: Summary
+        uid: az_healthcareapis
+        displayName: az healthcareapis
+      - name: acr
+        uid: az_healthcareapis_acr
+        displayName: az healthcareapis acr
+        items: []
+      - name: operation-result
+        uid: az_healthcareapis_operation-result
+        displayName: az healthcareapis operation-result
+        items: []
+      - name: private-endpoint-connection
+        uid: az_healthcareapis_private-endpoint-connection
+        displayName: az healthcareapis private-endpoint-connection
+        items: []
+      - name: private-link-resource
+        uid: az_healthcareapis_private-link-resource
+        displayName: az healthcareapis private-link-resource
+        items: []
+      - name: service
+        uid: az_healthcareapis_service
+        displayName: az healthcareapis service
+        items: []
+  - name: Azure App Configuration
     items:
-    - name: Overview
-      uid: az_cloud
-      displayName: az cloud
-    - name: list
-      uid: az_cloud_list
-      displayName: az cloud list
-    - name: list-profiles
-      uid: az_cloud_list_profiles
-      displayName: az cloud list-profiles
-    - name: register
-      uid: az_cloud_register
-      displayName: az cloud register
-    - name: set
-      uid: az_cloud_set
-      displayName: az cloud set
-    - name: show
-      uid: az_cloud_show
-      displayName: az cloud show
-    - name: unregister
-      uid: az_cloud_unregister
-      displayName: az cloud unregister
-    - name: update
-      uid: az_cloud_update
-      displayName: az cloud update
-  - name: HDInsight
-    displayName: az hdinsight
+    - name: Summary
+      uid: sp-Azure_App_Configuration
+      displayName: Azure App Configuration
+    - name: appconfig
+      items:
+      - name: Summary
+        uid: az_appconfig
+        displayName: az appconfig
+      - name: credential
+        uid: az_appconfig_credential
+        displayName: az appconfig credential
+        items: []
+      - name: feature
+        items:
+        - name: Summary
+          uid: az_appconfig_feature
+          displayName: az appconfig feature
+        - name: filter
+          uid: az_appconfig_feature_filter
+          displayName: az appconfig feature filter
+          items: []
+      - name: identity
+        uid: az_appconfig_identity
+        displayName: az appconfig identity
+        items: []
+      - name: kv
+        uid: az_appconfig_kv
+        displayName: az appconfig kv
+        items: []
+      - name: revision
+        uid: az_appconfig_revision
+        displayName: az appconfig revision
+        items: []
+  - name: Azure App Service
+    uid: sp-Azure_App_Service
+    displayName: Azure App Service
+    items: []
+  - name: Azure Application Insights
+    uid: sp-Azure_Application_Insights
+    displayName: Azure Application Insights
+    items: []
+  - name: Azure Arc
     items:
-    - name: Overview
-      uid: az_hdinsight
-      displayName: az hdinsight
-    - name: create
-      uid: az_hdinsight_create
-      displayName: az hdinsight create
-    - name: delete
-      uid: az_hdinsight_delete
-      displayName: az hdinsight delete
-    - name: list
-      uid: az_hdinsight_list
-      displayName: az hdinsight list
-    - name: list-usage
-      uid: az_hdinsight_list_usage
-      displayName: az hdinsight list-usage
-    - name: resize
-      uid: az_hdinsight_resize
-      displayName: az hdinsight resize
-    - name: rotate-disk-encryption-key
-      uid: az_hdinsight_rotate_disk_encryption_key
-      displayName: az hdinsight rotate-disk-encryption-key
-    - name: show
-      uid: az_hdinsight_show
-      displayName: az hdinsight show
-    - name: update
-      uid: az_hdinsight_update
-      displayName: az hdinsight update
-    - name: wait
-      uid: az_hdinsight_wait
-      displayName: az hdinsight wait
-    - name: application
-      displayName: az hdinsight application
+    - name: Summary
+      uid: sp-Azure_Arc
+      displayName: Azure Arc
+    - name: connectedmachine
       items:
-      - name: Overview
-        uid: az_hdinsight_application
-        displayName: az hdinsight application
-      - name: create
-        uid: az_hdinsight_application_create
-        displayName: az hdinsight application create
-      - name: delete
-        uid: az_hdinsight_application_delete
-        displayName: az hdinsight application delete
-      - name: list
-        uid: az_hdinsight_application_list
-        displayName: az hdinsight application list
-      - name: show
-        uid: az_hdinsight_application_show
-        displayName: az hdinsight application show
-      - name: wait
-        uid: az_hdinsight_application_wait
-        displayName: az hdinsight application wait
-    - name: monitor
-      displayName: az hdinsight monitor
+      - name: Summary
+        uid: az_connectedmachine
+        displayName: az connectedmachine
+      - name: extension
+        uid: az_connectedmachine_extension
+        displayName: az connectedmachine extension
+        items: []
+  - name: Azure Arc for VMware PrivateCloud
+    uid: sp-Azure_Arc_for_VMware_PrivateCloud
+    displayName: Azure Arc for VMware PrivateCloud
+    items: []
+  - name: Azure Artifacts
+    items:
+    - name: Summary
+      uid: sp-Azure_Artifacts
+      displayName: Azure Artifacts
+    - name: artifacts
       items:
-      - name: Overview
-        uid: az_hdinsight_monitor
-        displayName: az hdinsight monitor
-      - name: disable
-        uid: az_hdinsight_monitor_disable
-        displayName: az hdinsight monitor disable
-      - name: enable
-        uid: az_hdinsight_monitor_enable
-        displayName: az hdinsight monitor enable
-      - name: show
-        uid: az_hdinsight_monitor_show
-        displayName: az hdinsight monitor show
-    - name: script-action
-      displayName: az hdinsight script-action
+      - name: Summary
+        uid: az_artifacts
+        displayName: az artifacts
+      - name: universal
+        uid: az_artifacts_universal
+        displayName: az artifacts universal
+        items: []
+  - name: Azure Attestation
+    items:
+    - name: Summary
+      uid: sp-Azure_Attestation
+      displayName: Azure Attestation
+    - name: attestation
+      items:
+      - name: Summary
+        uid: az_attestation
+        displayName: az attestation
+      - name: policy
+        uid: az_attestation_policy
+        displayName: az attestation policy
+        items: []
+      - name: signer
+        uid: az_attestation_signer
+        displayName: az attestation signer
+        items: []
+  - name: Azure Automation
+    items:
+    - name: Summary
+      uid: sp-Azure_Automation
+      displayName: Azure Automation
+    - name: automation
+      items:
+      - name: Summary
+        uid: az_automation
+        displayName: az automation
+      - name: account
+        uid: az_automation_account
+        displayName: az automation account
+        items: []
+      - name: job
+        uid: az_automation_job
+        displayName: az automation job
+        items: []
+      - name: runbook
+        uid: az_automation_runbook
+        displayName: az automation runbook
+        items: []
+  - name: Azure Backup
+    uid: sp-Azure_Backup
+    displayName: Azure Backup
+    items: []
+  - name: Azure Batch
+    items:
+    - name: Summary
+      uid: sp-Azure_Batch
+      displayName: Azure Batch
+    - name: batch
       items:
-      - name: Overview
-        uid: az_hdinsight_script_action
-        displayName: az hdinsight script-action
-      - name: delete
-        uid: az_hdinsight_script_action_delete
-        displayName: az hdinsight script-action delete
-      - name: execute
-        uid: az_hdinsight_script_action_execute
-        displayName: az hdinsight script-action execute
-      - name: list
-        uid: az_hdinsight_script_action_list
-        displayName: az hdinsight script-action list
-      - name: list-execution-history
-        uid: az_hdinsight_script_action_list_execution_history
-        displayName: az hdinsight script-action list-execution-history
-      - name: promote
-        uid: az_hdinsight_script_action_promote
-        displayName: az hdinsight script-action promote
-      - name: show-execution-details
-        uid: az_hdinsight_script_action_show_execution_details
-        displayName: az hdinsight script-action show-execution-details
-  - name: Key Vault
-    displayName: az keyvault
+      - name: Summary
+        uid: az_batch
+        displayName: az batch
+      - name: file
+        uid: az_batch_file
+        displayName: az batch file
+        items: []
+      - name: job
+        uid: az_batch_job
+        displayName: az batch job
+        items: []
+      - name: pool
+        uid: az_batch_pool
+        displayName: az batch pool
+        items: []
+  - name: Azure Blockchain
     items:
-    - name: Overview
-      uid: az_keyvault
-      displayName: az keyvault
-    - name: create
-      uid: az_keyvault_create
-      displayName: az keyvault create
-    - name: delete
-      uid: az_keyvault_delete
-      displayName: az keyvault delete
-    - name: delete-policy
-      uid: az_keyvault_delete_policy
-      displayName: az keyvault delete-policy
-    - name: list
-      uid: az_keyvault_list
-      displayName: az keyvault list
-    - name: list-deleted
-      uid: az_keyvault_list_deleted
-      displayName: az keyvault list-deleted
-    - name: purge
-      uid: az_keyvault_purge
-      displayName: az keyvault purge
-    - name: recover
-      uid: az_keyvault_recover
-      displayName: az keyvault recover
-    - name: set-policy
-      uid: az_keyvault_set_policy
-      displayName: az keyvault set-policy
-    - name: show
-      uid: az_keyvault_show
-      displayName: az keyvault show
-    - name: update
-      uid: az_keyvault_update
-      displayName: az keyvault update
-    - name: Certificates
-      displayName: az keyvault certificate
+    - name: Summary
+      uid: sp-Azure_Blockchain
+      displayName: Azure Blockchain
+    - name: blockchain
       items:
-      - name: Overview
-        uid: az_keyvault_certificate
-        displayName: az keyvault certificate
-      - name: create
-        uid: az_keyvault_certificate_create
-        displayName: az keyvault certificate create
-      - name: delete
-        uid: az_keyvault_certificate_delete
-        displayName: az keyvault certificate delete
-      - name: download
-        uid: az_keyvault_certificate_download
-        displayName: az keyvault certificate download
-      - name: get-default-policy
-        uid: az_keyvault_certificate_get_default_policy
-        displayName: az keyvault certificate get-default-policy
-      - name: import
-        uid: az_keyvault_certificate_import
-        displayName: az keyvault certificate import
-      - name: list
-        uid: az_keyvault_certificate_list
-        displayName: az keyvault certificate list
-      - name: list-deleted
-        uid: az_keyvault_certificate_list_deleted
-        displayName: az keyvault certificate list-deleted
-      - name: list-versions
-        uid: az_keyvault_certificate_list_versions
-        displayName: az keyvault certificate list-versions
-      - name: purge
-        uid: az_keyvault_certificate_purge
-        displayName: az keyvault certificate purge
-      - name: recover
-        uid: az_keyvault_certificate_recover
-        displayName: az keyvault certificate recover
-      - name: set-attributes
-        uid: az_keyvault_certificate_set_attributes
-        displayName: az keyvault certificate set-attributes
-      - name: show
-        uid: az_keyvault_certificate_show
-        displayName: az keyvault certificate show
-      - name: show-deleted
-        uid: az_keyvault_certificate_show_deleted
-        displayName: az keyvault certificate show-deleted
-      - name: Contacts
-        displayName: az keyvault certificate contact
+      - name: Summary
+        uid: az_blockchain
+        displayName: az blockchain
+      - name: consortium
+        uid: az_blockchain_consortium
+        displayName: az blockchain consortium
+        items: []
+      - name: member
+        uid: az_blockchain_member
+        displayName: az blockchain member
+        items: []
+      - name: transaction-node
+        uid: az_blockchain_transaction-node
+        displayName: az blockchain transaction-node
+        items: []
+  - name: Azure Blueprint
+    items:
+    - name: Summary
+      uid: sp-Azure_Blueprint
+      displayName: Azure Blueprint
+    - name: blueprint
+      items:
+      - name: Summary
+        uid: az_blueprint
+        displayName: az blueprint
+      - name: artifact
         items:
-        - name: Overview
-          uid: az_keyvault_certificate_contact
-          displayName: az keyvault certificate contact
-        - name: add
-          uid: az_keyvault_certificate_contact_add
-          displayName: az keyvault certificate contact add
-        - name: delete
-          uid: az_keyvault_certificate_contact_delete
-          displayName: az keyvault certificate contact delete
-        - name: list
-          uid: az_keyvault_certificate_contact_list
-          displayName: az keyvault certificate contact list
-      - name: Issuers
-        displayName: az keyvault certificate issuer
+        - name: Summary
+          uid: az_blueprint_artifact
+          displayName: az blueprint artifact
+        - name: policy
+          uid: az_blueprint_artifact_policy
+          displayName: az blueprint artifact policy
+          items: []
+        - name: role
+          uid: az_blueprint_artifact_role
+          displayName: az blueprint artifact role
+          items: []
+        - name: template
+          uid: az_blueprint_artifact_template
+          displayName: az blueprint artifact template
+          items: []
+      - name: assignment
+        uid: az_blueprint_assignment
+        displayName: az blueprint assignment
+        items: []
+      - name: resource-group
+        uid: az_blueprint_resource-group
+        displayName: az blueprint resource-group
+        items: []
+      - name: version
         items:
-        - name: Overview
-          uid: az_keyvault_certificate_issuer
-          displayName: az keyvault certificate issuer
-        - name: create
-          uid: az_keyvault_certificate_issuer_create
-          displayName: az keyvault certificate issuer create
-        - name: delete
-          uid: az_keyvault_certificate_issuer_delete
-          displayName: az keyvault certificate issuer delete
-        - name: list
-          uid: az_keyvault_certificate_issuer_list
-          displayName: az keyvault certificate issuer list
-        - name: show
-          uid: az_keyvault_certificate_issuer_show
-          displayName: az keyvault certificate issuer show
-        - name: update
-          uid: az_keyvault_certificate_issuer_update
-          displayName: az keyvault certificate issuer update
-        - name: Administration
-          displayName: az keyvault certificate issuer admin
-          items:
-          - name: Overview
-            uid: az_keyvault_certificate_issuer_admin
-            displayName: az keyvault certificate issuer admin
-          - name: add
-            uid: az_keyvault_certificate_issuer_admin_add
-            displayName: az keyvault certificate issuer admin add
-          - name: delete
-            uid: az_keyvault_certificate_issuer_admin_delete
-            displayName: az keyvault certificate issuer admin delete
-          - name: list
-            uid: az_keyvault_certificate_issuer_admin_list
-            displayName: az keyvault certificate issuer admin list
-      - name: Pending
-        displayName: az keyvault certificate pending
+        - name: Summary
+          uid: az_blueprint_version
+          displayName: az blueprint version
+        - name: artifact
+          uid: az_blueprint_version_artifact
+          displayName: az blueprint version artifact
+          items: []
+  - name: Azure Boards
+    items:
+    - name: Summary
+      uid: sp-Azure_Boards
+      displayName: Azure Boards
+    - name: boards
+      items:
+      - name: Summary
+        uid: az_boards
+        displayName: az boards
+      - name: area
         items:
-        - name: Overview
-          uid: az_keyvault_certificate_pending
-          displayName: az keyvault certificate pending
-        - name: delete
-          uid: az_keyvault_certificate_pending_delete
-          displayName: az keyvault certificate pending delete
-        - name: merge
-          uid: az_keyvault_certificate_pending_merge
-          displayName: az keyvault certificate pending merge
-        - name: show
-          uid: az_keyvault_certificate_pending_show
-          displayName: az keyvault certificate pending show
-    - name: Keys
-      displayName: az keyvault key
+        - name: Summary
+          uid: az_boards_area
+          displayName: az boards area
+        - name: project
+          uid: az_boards_area_project
+          displayName: az boards area project
+          items: []
+        - name: team
+          uid: az_boards_area_team
+          displayName: az boards area team
+          items: []
+      - name: iteration
+        items:
+        - name: Summary
+          uid: az_boards_iteration
+          displayName: az boards iteration
+        - name: project
+          uid: az_boards_iteration_project
+          displayName: az boards iteration project
+          items: []
+        - name: team
+          uid: az_boards_iteration_team
+          displayName: az boards iteration team
+          items: []
+      - name: work-item
+        items:
+        - name: Summary
+          uid: az_boards_work-item
+          displayName: az boards work-item
+        - name: relation
+          uid: az_boards_work-item_relation
+          displayName: az boards work-item relation
+          items: []
+  - name: Azure Bot
+    items:
+    - name: Summary
+      uid: sp-Azure_Bot
+      displayName: Azure Bot
+    - name: healthbot
+      uid: az_healthbot
+      displayName: az healthbot
+      items: []
+  - name: Azure Bot Service
+    uid: sp-Azure_Bot_Service
+    displayName: Azure Bot Service
+    items: []
+  - name: Azure Cache for Redis
+    uid: sp-Azure_Cache_for_Redis
+    displayName: Azure Cache for Redis
+    items: []
+  - name: Azure CLI
+    items:
+    - name: Summary
+      uid: sp-Azure_CLI
+      displayName: Azure CLI
+    - name: account
       items:
-      - name: Overview
-        uid: az_keyvault_key
-        displayName: az keyvault key
-      - name: backup
-        uid: az_keyvault_key_backup
-        displayName: az keyvault key backup
-      - name: create
-        uid: az_keyvault_key_create
-        displayName: az keyvault key create
-      - name: delete
-        uid: az_keyvault_key_delete
-        displayName: az keyvault key delete
-      - name: download
-        uid: az_keyvault_key_download
-        displayName: az keyvault key download
-      - name: import
-        uid: az_keyvault_key_import
-        displayName: az keyvault key import
-      - name: list
-        uid: az_keyvault_key_list
-        displayName: az keyvault key list
-      - name: list-deleted
-        uid: az_keyvault_key_list_deleted
-        displayName: az keyvault key list-deleted
-      - name: list-versions
-        uid: az_keyvault_key_list_versions
-        displayName: az keyvault key list-versions
-      - name: purge
-        uid: az_keyvault_key_purge
-        displayName: az keyvault key purge
-      - name: recover
-        uid: az_keyvault_key_recover
-        displayName: az keyvault key recover
-      - name: restore
-        uid: az_keyvault_key_restore
-        displayName: az keyvault key restore
-      - name: set-attributes
-        uid: az_keyvault_key_set_attributes
-        displayName: az keyvault key set-attributes
-      - name: show
-        uid: az_keyvault_key_show
-        displayName: az keyvault key show
-      - name: show-deleted
-        uid: az_keyvault_key_show_deleted
-        displayName: az keyvault key show-deleted
-    - name: Secrets
-      displayName: az keyvault secret
+      - name: Summary
+        uid: az_account
+        displayName: az account
+      - name: alias
+        uid: az_account_alias
+        displayName: az account alias
+        items: []
+      - name: lock
+        uid: az_account_lock
+        displayName: az account lock
+        items: []
+      - name: management-group
+        items:
+        - name: Summary
+          uid: az_account_management-group
+          displayName: az account management-group
+        - name: subscription
+          uid: az_account_management-group_subscription
+          displayName: az account management-group subscription
+          items: []
+      - name: subscription
+        uid: az_account_subscription
+        displayName: az account subscription
+        items: []
+      - name: tenant
+        uid: az_account_tenant
+        displayName: az account tenant
+        items: []
+    - name: alias
+      uid: az_alias
+      displayName: az alias
+      items: []
+    - name: cache
+      uid: az_cache
+      displayName: az cache
+      items: []
+    - name: cli-translator
+      items:
+      - name: Summary
+        uid: az_cli-translator
+        displayName: az cli-translator
+      - name: arm
+        uid: az_cli-translator_arm
+        displayName: az cli-translator arm
+        items: []
+    - name: cloud
+      uid: az_cloud
+      displayName: az cloud
+      items: []
+    - name: config
+      items:
+      - name: Summary
+        uid: az_config
+        displayName: az config
+      - name: param-persist
+        uid: az_config_param-persist
+        displayName: az config param-persist
+        items: []
+    - name: demo
+      uid: az_demo
+      displayName: az demo
+      items: []
+    - name: extension
+      uid: az_extension
+      displayName: az extension
+      items: []
+    - name: fzf
+      uid: az_fzf
+      displayName: az fzf
+      items: []
+    - name: local-context
+      uid: az_local-context
+      displayName: az local-context
+      items: []
+  - name: Azure Cloud Services (extended support)
+    items:
+    - name: Summary
+      uid: sp-Azure_Cloud_Services_(extended_support)
+      displayName: Azure Cloud Services (extended support)
+    - name: cloud-service
+      items:
+      - name: Summary
+        uid: az_cloud-service
+        displayName: az cloud-service
+      - name: role
+        uid: az_cloud-service_role
+        displayName: az cloud-service role
+        items: []
+      - name: role-instance
+        uid: az_cloud-service_role-instance
+        displayName: az cloud-service role-instance
+        items: []
+      - name: update-domain
+        uid: az_cloud-service_update-domain
+        displayName: az cloud-service update-domain
+        items: []
+  - name: Azure Cognitive Search
+    uid: sp-Azure_Cognitive_Search
+    displayName: Azure Cognitive Search
+    items: []
+  - name: Azure Cognitive Service
+    uid: sp-Azure_Cognitive_Service
+    displayName: Azure Cognitive Service
+    items: []
+  - name: Azure Communication Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Communication_Service
+      displayName: Azure Communication Service
+    - name: communication
+      uid: az_communication
+      displayName: az communication
+      items: []
+  - name: Azure Container Instances
+    items:
+    - name: Summary
+      uid: sp-Azure_Container_Instances
+      displayName: Azure Container Instances
+    - name: container
       items:
-      - name: Overview
-        uid: az_keyvault_secret
-        displayName: az keyvault secret
-      - name: backup
-        uid: az_keyvault_secret_backup
-        displayName: az keyvault secret backup
-      - name: delete
-        uid: az_keyvault_secret_delete
-        displayName: az keyvault secret delete
-      - name: download
-        uid: az_keyvault_secret_download
-        displayName: az keyvault secret download
-      - name: list
-        uid: az_keyvault_secret_list
-        displayName: az keyvault secret list
-      - name: list-deleted
-        uid: az_keyvault_secret_list_deleted
-        displayName: az keyvault secret list-deleted
-      - name: list-versions
-        uid: az_keyvault_secret_list_versions
-        displayName: az keyvault secret list-versions
-      - name: purge
-        uid: az_keyvault_secret_purge
-        displayName: az keyvault secret purge
-      - name: recover
-        uid: az_keyvault_secret_recover
-        displayName: az keyvault secret recover
-      - name: restore
-        uid: az_keyvault_secret_restore
-        displayName: az keyvault secret restore
-      - name: set
-        uid: az_keyvault_secret_set
-        displayName: az keyvault secret set
-      - name: set-attributes
-        uid: az_keyvault_secret_set_attributes
-        displayName: az keyvault secret set-attributes
-      - name: show
-        uid: az_keyvault_secret_show
-        displayName: az keyvault secret show
-      - name: show-deleted
-        uid: az_keyvault_secret_show_deleted
-        displayName: az keyvault secret show-deleted
-  - name: Locks
-    displayName: az lock
+      - name: Summary
+        uid: az_container
+        displayName: az container
+      - name: app
+        uid: az_container_app
+        displayName: az container app
+        items: []
+  - name: Azure Container Registries
     items:
-    - name: Overview
-      uid: az_lock
-      displayName: az lock
-    - name: create
-      uid: az_lock_create
-      displayName: az lock create
-    - name: delete
-      uid: az_lock_delete
-      displayName: az lock delete
-    - name: list
-      uid: az_lock_list
-      displayName: az lock list
-    - name: show
-      uid: az_lock_show
-      displayName: az lock show
-    - name: update
-      uid: az_lock_update
-      displayName: az lock update
-  - name: Networking
-    displayName: az network
+    - name: Summary
+      uid: sp-Azure_Container_Registries
+      displayName: Azure Container Registries
+    - name: acr
+      items:
+      - name: Summary
+        uid: az_acr
+        displayName: az acr
+      - name: export-pipeline
+        uid: az_acr_export-pipeline
+        displayName: az acr export-pipeline
+        items: []
+      - name: import-pipeline
+        uid: az_acr_import-pipeline
+        displayName: az acr import-pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_acr_pipeline-run
+        displayName: az acr pipeline-run
+        items: []
+  - name: Azure Container Services
+    uid: sp-Azure_Container_Services
+    displayName: Azure Container Services
+    items: []
+  - name: Azure Cosmos DB
+    items:
+    - name: Summary
+      uid: sp-Azure_Cosmos_DB
+      displayName: Azure Cosmos DB
+    - name: cosmosdb
+      items:
+      - name: Summary
+        uid: az_cosmosdb
+        displayName: az cosmosdb
+      - name: mongodb
+        items:
+        - name: Summary
+          uid: az_cosmosdb_mongodb
+          displayName: az cosmosdb mongodb
+        - name: restorable-collection
+          uid: az_cosmosdb_mongodb_restorable-collection
+          displayName: az cosmosdb mongodb restorable-collection
+          items: []
+        - name: restorable-database
+          uid: az_cosmosdb_mongodb_restorable-database
+          displayName: az cosmosdb mongodb restorable-database
+          items: []
+        - name: restorable-resource
+          uid: az_cosmosdb_mongodb_restorable-resource
+          displayName: az cosmosdb mongodb restorable-resource
+          items: []
+      - name: restorable-database-account
+        uid: az_cosmosdb_restorable-database-account
+        displayName: az cosmosdb restorable-database-account
+        items: []
+      - name: sql
+        items:
+        - name: Summary
+          uid: az_cosmosdb_sql
+          displayName: az cosmosdb sql
+        - name: restorable-container
+          uid: az_cosmosdb_sql_restorable-container
+          displayName: az cosmosdb sql restorable-container
+          items: []
+        - name: restorable-database
+          uid: az_cosmosdb_sql_restorable-database
+          displayName: az cosmosdb sql restorable-database
+          items: []
+        - name: restorable-resource
+          uid: az_cosmosdb_sql_restorable-resource
+          displayName: az cosmosdb sql restorable-resource
+          items: []
+    - name: managed-cassandra
+      items:
+      - name: Summary
+        uid: az_managed-cassandra
+        displayName: az managed-cassandra
+      - name: cluster
+        uid: az_managed-cassandra_cluster
+        displayName: az managed-cassandra cluster
+        items: []
+      - name: datacenter
+        uid: az_managed-cassandra_datacenter
+        displayName: az managed-cassandra datacenter
+        items: []
+  - name: Azure Cost Management + Billing
     items:
-    - name: Overview
-      uid: az_network
-      displayName: az network
-    - name: list-service-aliases
-      uid: az_network_list_service_aliases
-      displayName: az network list-service-aliases
-    - name: list-usages
-      uid: az_network_list_usages
-      displayName: az network list-usages
-    - name: Application Gateway
-      displayName: az network application-gateway
+    - name: Summary
+      uid: sp-Azure_Cost_Management_+_Billing
+      displayName: Azure Cost Management + Billing
+    - name: costmanagement
       items:
-      - name: Overview
-        uid: az_network_application_gateway
-        displayName: az network application-gateway
-      - name: create
-        uid: az_network_application_gateway_create
-        displayName: az network application-gateway create
-      - name: delete
-        uid: az_network_application_gateway_delete
-        displayName: az network application-gateway delete
-      - name: list
-        uid: az_network_application_gateway_list
-        displayName: az network application-gateway list
-      - name: show
-        uid: az_network_application_gateway_show
-        displayName: az network application-gateway show
-      - name: start
-        uid: az_network_application_gateway_start
-        displayName: az network application-gateway start
-      - name: stop
-        uid: az_network_application_gateway_stop
-        displayName: az network application-gateway stop
-      - name: update
-        uid: az_network_application_gateway_update
-        displayName: az network application-gateway update
-      - name: wait
-        uid: az_network_application_gateway_wait
-        displayName: az network application-gateway wait
-      - name: Address pools
-        displayName: az network application-gateway address-pool
+      - name: Summary
+        uid: az_costmanagement
+        displayName: az costmanagement
+      - name: export
+        uid: az_costmanagement_export
+        displayName: az costmanagement export
+        items: []
+  - name: Azure Custom Providers
+    items:
+    - name: Summary
+      uid: sp-Azure_Custom_Providers
+      displayName: Azure Custom Providers
+    - name: custom-providers
+      items:
+      - name: Summary
+        uid: az_custom-providers
+        displayName: az custom-providers
+      - name: resource-provider
+        uid: az_custom-providers_resource-provider
+        displayName: az custom-providers resource-provider
+        items: []
+  - name: Azure Data Explorer
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Explorer
+      displayName: Azure Data Explorer
+    - name: kusto
+      items:
+      - name: Summary
+        uid: az_kusto
+        displayName: az kusto
+      - name: attached-database-configuration
+        uid: az_kusto_attached-database-configuration
+        displayName: az kusto attached-database-configuration
+        items: []
+      - name: cluster
+        uid: az_kusto_cluster
+        displayName: az kusto cluster
+        items: []
+      - name: cluster-principal-assignment
+        uid: az_kusto_cluster-principal-assignment
+        displayName: az kusto cluster-principal-assignment
+        items: []
+      - name: database
+        uid: az_kusto_database
+        displayName: az kusto database
+        items: []
+      - name: database-principal-assignment
+        uid: az_kusto_database-principal-assignment
+        displayName: az kusto database-principal-assignment
+        items: []
+      - name: data-connection
         items:
-        - name: Overview
-          uid: az_network_application_gateway_address_pool
-          displayName: az network application-gateway address-pool
-        - name: create
-          uid: az_network_application_gateway_address_pool_create
-          displayName: az network application-gateway address-pool create
-        - name: delete
-          uid: az_network_application_gateway_address_pool_delete
-          displayName: az network application-gateway address-pool delete
-        - name: list
-          uid: az_network_application_gateway_address_pool_list
-          displayName: az network application-gateway address-pool list
-        - name: show
-          uid: az_network_application_gateway_address_pool_show
-          displayName: az network application-gateway address-pool show
-        - name: update
-          uid: az_network_application_gateway_address_pool_update
-          displayName: az network application-gateway address-pool update
-      - name: Authorization certificates
-        displayName: az network application-gateway auth-cert
+        - name: Summary
+          uid: az_kusto_data-connection
+          displayName: az kusto data-connection
+        - name: event-grid
+          uid: az_kusto_data-connection_event-grid
+          displayName: az kusto data-connection event-grid
+          items: []
+        - name: event-hub
+          uid: az_kusto_data-connection_event-hub
+          displayName: az kusto data-connection event-hub
+          items: []
+        - name: iot-hub
+          uid: az_kusto_data-connection_iot-hub
+          displayName: az kusto data-connection iot-hub
+          items: []
+      - name: operation-result
+        uid: az_kusto_operation-result
+        displayName: az kusto operation-result
+        items: []
+      - name: script
+        uid: az_kusto_script
+        displayName: az kusto script
+        items: []
+  - name: Azure Data Explorer (Kusto)
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Explorer_(Kusto)
+      displayName: Azure Data Explorer (Kusto)
+    - name: kusto
+      items:
+      - name: Summary
+        uid: az_kusto
+        displayName: az kusto
+      - name: attached-database-configuration
+        uid: az_kusto_attached-database-configuration
+        displayName: az kusto attached-database-configuration
+        items: []
+      - name: cluster
+        uid: az_kusto_cluster
+        displayName: az kusto cluster
+        items: []
+      - name: cluster-principal-assignment
+        uid: az_kusto_cluster-principal-assignment
+        displayName: az kusto cluster-principal-assignment
+        items: []
+      - name: database
+        uid: az_kusto_database
+        displayName: az kusto database
+        items: []
+      - name: database-principal-assignment
+        uid: az_kusto_database-principal-assignment
+        displayName: az kusto database-principal-assignment
+        items: []
+      - name: data-connection
         items:
-        - name: Overview
-          uid: az_network_application_gateway_auth_cert
-          displayName: az network application-gateway auth-cert
-        - name: create
-          uid: az_network_application_gateway_auth_cert_create
-          displayName: az network application-gateway auth-cert create
-        - name: delete
-          uid: az_network_application_gateway_auth_cert_delete
-          displayName: az network application-gateway auth-cert delete
-        - name: list
-          uid: az_network_application_gateway_auth_cert_list
-          displayName: az network application-gateway auth-cert list
-        - name: show
-          uid: az_network_application_gateway_auth_cert_show
-          displayName: az network application-gateway auth-cert show
-        - name: update
-          uid: az_network_application_gateway_auth_cert_update
-          displayName: az network application-gateway auth-cert update
-      - name: Front-end IP addresses
-        displayName: az network application-gateway frontend-ip
+        - name: Summary
+          uid: az_kusto_data-connection
+          displayName: az kusto data-connection
+        - name: event-grid
+          uid: az_kusto_data-connection_event-grid
+          displayName: az kusto data-connection event-grid
+          items: []
+        - name: event-hub
+          uid: az_kusto_data-connection_event-hub
+          displayName: az kusto data-connection event-hub
+          items: []
+        - name: iot-hub
+          uid: az_kusto_data-connection_iot-hub
+          displayName: az kusto data-connection iot-hub
+          items: []
+      - name: operation-result
+        uid: az_kusto_operation-result
+        displayName: az kusto operation-result
+        items: []
+      - name: script
+        uid: az_kusto_script
+        displayName: az kusto script
+        items: []
+  - name: Azure Data Factory
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Factory
+      displayName: Azure Data Factory
+    - name: datafactory
+      items:
+      - name: Summary
+        uid: az_datafactory
+        displayName: az datafactory
+      - name: activity-run
+        uid: az_datafactory_activity-run
+        displayName: az datafactory activity-run
+        items: []
+      - name: dataset
+        uid: az_datafactory_dataset
+        displayName: az datafactory dataset
+        items: []
+      - name: integration-runtime
+        items:
+        - name: Summary
+          uid: az_datafactory_integration-runtime
+          displayName: az datafactory integration-runtime
+        - name: linked-integration-runtime
+          uid: az_datafactory_integration-runtime_linked-integration-runtime
+          displayName: az datafactory integration-runtime linked-integration-runtime
+          items: []
+        - name: managed
+          uid: az_datafactory_integration-runtime_managed
+          displayName: az datafactory integration-runtime managed
+          items: []
+        - name: self-hosted
+          uid: az_datafactory_integration-runtime_self-hosted
+          displayName: az datafactory integration-runtime self-hosted
+          items: []
+      - name: integration-runtime-node
+        uid: az_datafactory_integration-runtime-node
+        displayName: az datafactory integration-runtime-node
+        items: []
+      - name: linked-service
+        uid: az_datafactory_linked-service
+        displayName: az datafactory linked-service
+        items: []
+      - name: pipeline
+        uid: az_datafactory_pipeline
+        displayName: az datafactory pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_datafactory_pipeline-run
+        displayName: az datafactory pipeline-run
+        items: []
+      - name: trigger
+        uid: az_datafactory_trigger
+        displayName: az datafactory trigger
+        items: []
+      - name: trigger-run
+        uid: az_datafactory_trigger-run
+        displayName: az datafactory trigger-run
+        items: []
+  - name: Azure Data Lake Analytics
+    uid: sp-Azure_Data_Lake_Analytics
+    displayName: Azure Data Lake Analytics
+    items: []
+  - name: Azure Data Lake Storage
+    uid: sp-Azure_Data_Lake_Storage
+    displayName: Azure Data Lake Storage
+    items: []
+  - name: Azure Data Migration
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Migration
+      displayName: Azure Data Migration
+    - name: dms
+      items:
+      - name: Summary
+        uid: az_dms
+        displayName: az dms
+      - name: project
         items:
-        - name: Overview
-          uid: az_network_application_gateway_frontend_ip
-          displayName: az network application-gateway frontend-ip
-        - name: create
-          uid: az_network_application_gateway_frontend_ip_create
-          displayName: az network application-gateway frontend-ip create
-        - name: delete
-          uid: az_network_application_gateway_frontend_ip_delete
-          displayName: az network application-gateway frontend-ip delete
-        - name: list
-          uid: az_network_application_gateway_frontend_ip_list
-          displayName: az network application-gateway frontend-ip list
-        - name: show
-          uid: az_network_application_gateway_frontend_ip_show
-          displayName: az network application-gateway frontend-ip show
-        - name: update
-          uid: az_network_application_gateway_frontend_ip_update
-          displayName: az network application-gateway frontend-ip update
-      - name: Front-end ports
-        displayName: az network application-gateway frontend-port
+        - name: Summary
+          uid: az_dms_project
+          displayName: az dms project
+        - name: task
+          uid: az_dms_project_task
+          displayName: az dms project task
+          items: []
+  - name: Azure Data Share
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Share
+      displayName: Azure Data Share
+    - name: datashare
+      items:
+      - name: Summary
+        uid: az_datashare
+        displayName: az datashare
+      - name: account
+        uid: az_datashare_account
+        displayName: az datashare account
+        items: []
+      - name: consumer
         items:
-        - name: Overview
-          uid: az_network_application_gateway_frontend_port
-          displayName: az network application-gateway frontend-port
-        - name: create
-          uid: az_network_application_gateway_frontend_port_create
-          displayName: az network application-gateway frontend-port create
-        - name: delete
-          uid: az_network_application_gateway_frontend_port_delete
-          displayName: az network application-gateway frontend-port delete
-        - name: list
-          uid: az_network_application_gateway_frontend_port_list
-          displayName: az network application-gateway frontend-port list
-        - name: show
-          uid: az_network_application_gateway_frontend_port_show
-          displayName: az network application-gateway frontend-port show
-        - name: update
-          uid: az_network_application_gateway_frontend_port_update
-          displayName: az network application-gateway frontend-port update
-      - name: HTTP listeners
-        displayName: az network application-gateway http-listener
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_http_listener
-          displayName: az network application-gateway http-listener
-        - name: create
-          uid: az_network_application_gateway_http_listener_create
-          displayName: az network application-gateway http-listener create
-        - name: delete
-          uid: az_network_application_gateway_http_listener_delete
-          displayName: az network application-gateway http-listener delete
-        - name: list
-          uid: az_network_application_gateway_http_listener_list
-          displayName: az network application-gateway http-listener list
-        - name: show
-          uid: az_network_application_gateway_http_listener_show
-          displayName: az network application-gateway http-listener show
-        - name: update
-          uid: az_network_application_gateway_http_listener_update
-          displayName: az network application-gateway http-listener update
-      - name: HTTP settings
-        displayName: az network application-gateway http-settings
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_http_settings
-          displayName: az network application-gateway http-settings
-        - name: create
-          uid: az_network_application_gateway_http_settings_create
-          displayName: az network application-gateway http-settings create
-        - name: delete
-          uid: az_network_application_gateway_http_settings_delete
-          displayName: az network application-gateway http-settings delete
-        - name: list
-          uid: az_network_application_gateway_http_settings_list
-          displayName: az network application-gateway http-settings list
-        - name: show
-          uid: az_network_application_gateway_http_settings_show
-          displayName: az network application-gateway http-settings show
-        - name: update
-          uid: az_network_application_gateway_http_settings_update
-          displayName: az network application-gateway http-settings update
-      - name: Probes
-        displayName: az network application-gateway probe
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_probe
-          displayName: az network application-gateway probe
-        - name: create
-          uid: az_network_application_gateway_probe_create
-          displayName: az network application-gateway probe create
-        - name: delete
-          uid: az_network_application_gateway_probe_delete
-          displayName: az network application-gateway probe delete
-        - name: list
-          uid: az_network_application_gateway_probe_list
-          displayName: az network application-gateway probe list
-        - name: show
-          uid: az_network_application_gateway_probe_show
-          displayName: az network application-gateway probe show
-        - name: update
-          uid: az_network_application_gateway_probe_update
-          displayName: az network application-gateway probe update
-      - name: Routing rules
-        displayName: az network application-gateway rule
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_rule
-          displayName: az network application-gateway rule
-        - name: create
-          uid: az_network_application_gateway_rule_create
-          displayName: az network application-gateway rule create
-        - name: delete
-          uid: az_network_application_gateway_rule_delete
-          displayName: az network application-gateway rule delete
-        - name: list
-          uid: az_network_application_gateway_rule_list
-          displayName: az network application-gateway rule list
-        - name: show
-          uid: az_network_application_gateway_rule_show
-          displayName: az network application-gateway rule show
-        - name: update
-          uid: az_network_application_gateway_rule_update
-          displayName: az network application-gateway rule update
-      - name: SSL certificates
-        displayName: az network application-gateway ssl-cert
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_ssl_cert
-          displayName: az network application-gateway ssl-cert
-        - name: create
-          uid: az_network_application_gateway_ssl_cert_create
-          displayName: az network application-gateway ssl-cert create
-        - name: delete
-          uid: az_network_application_gateway_ssl_cert_delete
-          displayName: az network application-gateway ssl-cert delete
-        - name: list
-          uid: az_network_application_gateway_ssl_cert_list
-          displayName: az network application-gateway ssl-cert list
-        - name: show
-          uid: az_network_application_gateway_ssl_cert_show
-          displayName: az network application-gateway ssl-cert show
-        - name: update
-          uid: az_network_application_gateway_ssl_cert_update
-          displayName: az network application-gateway ssl-cert update
-      - name: SSL policies
-        displayName: az network application-gateway ssl-policy
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_ssl_policy
-          displayName: az network application-gateway ssl-policy
-        - name: set
-          uid: az_network_application_gateway_ssl_policy_set
-          displayName: az network application-gateway ssl-policy set
-        - name: show
-          uid: az_network_application_gateway_ssl_policy_show
-          displayName: az network application-gateway ssl-policy show
-      - name: URL path maps
-        displayName: az network application-gateway url-path-map
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_url_path_map
-          displayName: az network application-gateway url-path-map
-        - name: create
-          uid: az_network_application_gateway_url_path_map_create
-          displayName: az network application-gateway url-path-map create
-        - name: delete
-          uid: az_network_application_gateway_url_path_map_delete
-          displayName: az network application-gateway url-path-map delete
-        - name: list
-          uid: az_network_application_gateway_url_path_map_list
-          displayName: az network application-gateway url-path-map list
-        - name: show
-          uid: az_network_application_gateway_url_path_map_show
-          displayName: az network application-gateway url-path-map show
-        - name: update
-          uid: az_network_application_gateway_url_path_map_update
-          displayName: az network application-gateway url-path-map update
-        - name: Rules
-          displayName: az network application-gateway url-path-map rule
+        - name: Summary
+          uid: az_datashare_consumer
+          displayName: az datashare consumer
+        - name: dataset-mapping
+          uid: az_datashare_consumer_dataset-mapping
+          displayName: az datashare consumer dataset-mapping
+          items: []
+        - name: invitation
+          uid: az_datashare_consumer_invitation
+          displayName: az datashare consumer invitation
+          items: []
+        - name: share-subscription
           items:
-          - name: Overview
-            uid: az_network_application_gateway_url_path_map_rule
-            displayName: az network application-gateway url-path-map rule
-          - name: create
-            uid: az_network_application_gateway_url_path_map_rule_create
-            displayName: az network application-gateway url-path-map rule create
-          - name: delete
-            uid: az_network_application_gateway_url_path_map_rule_delete
-            displayName: az network application-gateway url-path-map rule delete
-      - name: Web application firewall settings
-        displayName: az network application-gateway waf-config
+          - name: Summary
+            uid: az_datashare_consumer_share-subscription
+            displayName: az datashare consumer share-subscription
+          - name: synchronization
+            uid: az_datashare_consumer_share-subscription_synchronization
+            displayName: az datashare consumer share-subscription synchronization
+            items: []
+        - name: trigger
+          uid: az_datashare_consumer_trigger
+          displayName: az datashare consumer trigger
+          items: []
+      - name: dataset
+        uid: az_datashare_dataset
+        displayName: az datashare dataset
+        items: []
+      - name: invitation
+        uid: az_datashare_invitation
+        displayName: az datashare invitation
+        items: []
+      - name: provider-share-subscription
+        uid: az_datashare_provider-share-subscription
+        displayName: az datashare provider-share-subscription
+        items: []
+      - name: synchronization
+        uid: az_datashare_synchronization
+        displayName: az datashare synchronization
+        items: []
+      - name: synchronization-setting
+        uid: az_datashare_synchronization-setting
+        displayName: az datashare synchronization-setting
+        items: []
+  - name: Azure Database for MariaDB
+    uid: sp-Azure_Database_for_MariaDB
+    displayName: Azure Database for MariaDB
+    items: []
+  - name: Azure Database for MySQL
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_for_MySQL
+      displayName: Azure Database for MySQL
+    - name: mysql
+      items:
+      - name: Summary
+        uid: az_mysql
+        displayName: az mysql
+      - name: flexible-server
+        uid: az_mysql_flexible-server
+        displayName: az mysql flexible-server
+        items: []
+  - name: Azure Database for PostgreSQL
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_for_PostgreSQL
+      displayName: Azure Database for PostgreSQL
+    - name: postgres
+      items:
+      - name: Summary
+        uid: az_postgres
+        displayName: az postgres
+      - name: flexible-server
+        uid: az_postgres_flexible-server
+        displayName: az postgres flexible-server
+        items: []
+  - name: Azure Database Migration Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_Migration_Service
+      displayName: Azure Database Migration Service
+    - name: dms
+      items:
+      - name: Summary
+        uid: az_dms
+        displayName: az dms
+      - name: project
         items:
-        - name: Overview
-          uid: az_network_application_gateway_waf_config
-          displayName: az network application-gateway waf-config
-        - name: set
-          uid: az_network_application_gateway_waf_config_set
-          displayName: az network application-gateway waf-config set
-        - name: show
-          uid: az_network_application_gateway_waf_config_show
-          displayName: az network application-gateway waf-config show
-      - name: rewrite-rule
-        displayName: az network application-gateway rewrite-rule
+        - name: Summary
+          uid: az_dms_project
+          displayName: az dms project
+        - name: task
+          uid: az_dms_project_task
+          displayName: az dms project task
+          items: []
+  - name: Azure Databox
+    items:
+    - name: Summary
+      uid: sp-Azure_Databox
+      displayName: Azure Databox
+    - name: databox
+      items:
+      - name: Summary
+        uid: az_databox
+        displayName: az databox
+      - name: job
+        uid: az_databox_job
+        displayName: az databox job
+        items: []
+  - name: Azure Databricks
+    items:
+    - name: Summary
+      uid: sp-Azure_Databricks
+      displayName: Azure Databricks
+    - name: databricks
+      items:
+      - name: Summary
+        uid: az_databricks
+        displayName: az databricks
+      - name: workspace
         items:
-        - name: Overview
-          uid: az_network_application_gateway_rewrite_rule
-          displayName: az network application-gateway rewrite-rule
-        - name: set
-          displayName: az network application-gateway rewrite-rule set
-          items:
-          - name: Overview
-            uid: az_network_application_gateway_rewrite_rule_set
-            displayName: az network application-gateway rewrite-rule set
-          - name: create
-            uid: az_network_application_gateway_rewrite_rule_set_create
-            displayName: az network application-gateway rewrite-rule set create
-          - name: delete
-            uid: az_network_application_gateway_rewrite_rule_set_delete
-            displayName: az network application-gateway rewrite-rule set delete
-          - name: list
-            uid: az_network_application_gateway_rewrite_rule_set_list
-            displayName: az network application-gateway rewrite-rule set list
-          - name: show
-            uid: az_network_application_gateway_rewrite_rule_set_show
-            displayName: az network application-gateway rewrite-rule set show
-          - name: update
-            uid: az_network_application_gateway_rewrite_rule_set_update
-            displayName: az network application-gateway rewrite-rule set update
-    - name: DNS
-      displayName: az network dns
+        - name: Summary
+          uid: az_databricks_workspace
+          displayName: az databricks workspace
+        - name: vnet-peering
+          uid: az_databricks_workspace_vnet-peering
+          displayName: az databricks workspace vnet-peering
+          items: []
+  - name: Azure Dedicated HSM
+    items:
+    - name: Summary
+      uid: sp-Azure_Dedicated_HSM
+      displayName: Azure Dedicated HSM
+    - name: dedicated-hsm
+      uid: az_dedicated-hsm
+      displayName: az dedicated-hsm
+      items: []
+  - name: Azure DevOps
+    items:
+    - name: Summary
+      uid: sp-Azure_DevOps
+      displayName: Azure DevOps
+    - name: devops
       items:
-      - name: Overview
-        uid: az_network_dns
-        displayName: az network dns
-      - name: Record sets
-        displayName: az network dns record-set
+      - name: Summary
+        uid: az_devops
+        displayName: az devops
+      - name: admin
         items:
-        - name: Overview
-          uid: az_network_dns_record_set
-          displayName: az network dns record-set
-        - name: list
-          uid: az_network_dns_record_set_list
-          displayName: az network dns record-set list
-        - name: A
-          displayName: az network dns record-set a
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_a
-            displayName: az network dns record-set a
-          - name: add-record
-            uid: az_network_dns_record_set_a_add_record
-            displayName: az network dns record-set a add-record
-          - name: create
-            uid: az_network_dns_record_set_a_create
-            displayName: az network dns record-set a create
-          - name: delete
-            uid: az_network_dns_record_set_a_delete
-            displayName: az network dns record-set a delete
-          - name: list
-            uid: az_network_dns_record_set_a_list
-            displayName: az network dns record-set a list
-          - name: remove-record
-            uid: az_network_dns_record_set_a_remove_record
-            displayName: az network dns record-set a remove-record
-          - name: show
-            uid: az_network_dns_record_set_a_show
-            displayName: az network dns record-set a show
-          - name: update
-            uid: az_network_dns_record_set_a_update
-            displayName: az network dns record-set a update
-        - name: AAAA
-          displayName: az network dns record-set aaaa
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_aaaa
-            displayName: az network dns record-set aaaa
-          - name: add-record
-            uid: az_network_dns_record_set_aaaa_add_record
-            displayName: az network dns record-set aaaa add-record
-          - name: create
-            uid: az_network_dns_record_set_aaaa_create
-            displayName: az network dns record-set aaaa create
-          - name: delete
-            uid: az_network_dns_record_set_aaaa_delete
-            displayName: az network dns record-set aaaa delete
-          - name: list
-            uid: az_network_dns_record_set_aaaa_list
-            displayName: az network dns record-set aaaa list
-          - name: remove-record
-            uid: az_network_dns_record_set_aaaa_remove_record
-            displayName: az network dns record-set aaaa remove-record
-          - name: show
-            uid: az_network_dns_record_set_aaaa_show
-            displayName: az network dns record-set aaaa show
-          - name: update
-            uid: az_network_dns_record_set_aaaa_update
-            displayName: az network dns record-set aaaa update
-        - name: CNAME
-          displayName: az network dns record-set cname
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_cname
-            displayName: az network dns record-set cname
-          - name: create
-            uid: az_network_dns_record_set_cname_create
-            displayName: az network dns record-set cname create
-          - name: delete
-            uid: az_network_dns_record_set_cname_delete
-            displayName: az network dns record-set cname delete
-          - name: list
-            uid: az_network_dns_record_set_cname_list
-            displayName: az network dns record-set cname list
-          - name: remove-record
-            uid: az_network_dns_record_set_cname_remove_record
-            displayName: az network dns record-set cname remove-record
-          - name: set-record
-            uid: az_network_dns_record_set_cname_set_record
-            displayName: az network dns record-set cname set-record
-          - name: show
-            uid: az_network_dns_record_set_cname_show
-            displayName: az network dns record-set cname show
-        - name: MX (mail)
-          displayName: az network dns record-set mx
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_mx
-            displayName: az network dns record-set mx
-          - name: add-record
-            uid: az_network_dns_record_set_mx_add_record
-            displayName: az network dns record-set mx add-record
-          - name: create
-            uid: az_network_dns_record_set_mx_create
-            displayName: az network dns record-set mx create
-          - name: delete
-            uid: az_network_dns_record_set_mx_delete
-            displayName: az network dns record-set mx delete
-          - name: list
-            uid: az_network_dns_record_set_mx_list
-            displayName: az network dns record-set mx list
-          - name: remove-record
-            uid: az_network_dns_record_set_mx_remove_record
-            displayName: az network dns record-set mx remove-record
-          - name: show
-            uid: az_network_dns_record_set_mx_show
-            displayName: az network dns record-set mx show
-          - name: update
-            uid: az_network_dns_record_set_mx_update
-            displayName: az network dns record-set mx update
-        - name: NS (nameserver)
-          displayName: az network dns record-set ns
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_ns
-            displayName: az network dns record-set ns
-          - name: add-record
-            uid: az_network_dns_record_set_ns_add_record
-            displayName: az network dns record-set ns add-record
-          - name: create
-            uid: az_network_dns_record_set_ns_create
-            displayName: az network dns record-set ns create
-          - name: delete
-            uid: az_network_dns_record_set_ns_delete
-            displayName: az network dns record-set ns delete
-          - name: list
-            uid: az_network_dns_record_set_ns_list
-            displayName: az network dns record-set ns list
-          - name: remove-record
-            uid: az_network_dns_record_set_ns_remove_record
-            displayName: az network dns record-set ns remove-record
-          - name: show
-            uid: az_network_dns_record_set_ns_show
-            displayName: az network dns record-set ns show
-          - name: update
-            uid: az_network_dns_record_set_ns_update
-            displayName: az network dns record-set ns update
-        - name: PTR (pointer)
-          displayName: az network dns record-set ptr
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_ptr
-            displayName: az network dns record-set ptr
-          - name: add-record
-            uid: az_network_dns_record_set_ptr_add_record
-            displayName: az network dns record-set ptr add-record
-          - name: create
-            uid: az_network_dns_record_set_ptr_create
-            displayName: az network dns record-set ptr create
-          - name: delete
-            uid: az_network_dns_record_set_ptr_delete
-            displayName: az network dns record-set ptr delete
-          - name: list
-            uid: az_network_dns_record_set_ptr_list
-            displayName: az network dns record-set ptr list
-          - name: remove-record
-            uid: az_network_dns_record_set_ptr_remove_record
-            displayName: az network dns record-set ptr remove-record
-          - name: show
-            uid: az_network_dns_record_set_ptr_show
-            displayName: az network dns record-set ptr show
-          - name: update
-            uid: az_network_dns_record_set_ptr_update
-            displayName: az network dns record-set ptr update
-        - name: SRV
-          displayName: az network dns record-set srv
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_srv
-            displayName: az network dns record-set srv
-          - name: add-record
-            uid: az_network_dns_record_set_srv_add_record
-            displayName: az network dns record-set srv add-record
-          - name: create
-            uid: az_network_dns_record_set_srv_create
-            displayName: az network dns record-set srv create
-          - name: delete
-            uid: az_network_dns_record_set_srv_delete
-            displayName: az network dns record-set srv delete
-          - name: list
-            uid: az_network_dns_record_set_srv_list
-            displayName: az network dns record-set srv list
-          - name: remove-record
-            uid: az_network_dns_record_set_srv_remove_record
-            displayName: az network dns record-set srv remove-record
-          - name: show
-            uid: az_network_dns_record_set_srv_show
-            displayName: az network dns record-set srv show
-          - name: update
-            uid: az_network_dns_record_set_srv_update
-            displayName: az network dns record-set srv update
-        - name: TXT
-          displayName: az network dns record-set txt
+        - name: Summary
+          uid: az_devops_admin
+          displayName: az devops admin
+        - name: banner
+          uid: az_devops_admin_banner
+          displayName: az devops admin banner
+          items: []
+      - name: extension
+        uid: az_devops_extension
+        displayName: az devops extension
+        items: []
+      - name: project
+        uid: az_devops_project
+        displayName: az devops project
+        items: []
+      - name: security
+        items:
+        - name: Summary
+          uid: az_devops_security
+          displayName: az devops security
+        - name: group
           items:
-          - name: Overview
-            uid: az_network_dns_record_set_txt
-            displayName: az network dns record-set txt
-          - name: add-record
-            uid: az_network_dns_record_set_txt_add_record
-            displayName: az network dns record-set txt add-record
-          - name: create
-            uid: az_network_dns_record_set_txt_create
-            displayName: az network dns record-set txt create
-          - name: delete
-            uid: az_network_dns_record_set_txt_delete
-            displayName: az network dns record-set txt delete
-          - name: list
-            uid: az_network_dns_record_set_txt_list
-            displayName: az network dns record-set txt list
-          - name: remove-record
-            uid: az_network_dns_record_set_txt_remove_record
-            displayName: az network dns record-set txt remove-record
-          - name: show
-            uid: az_network_dns_record_set_txt_show
-            displayName: az network dns record-set txt show
-          - name: update
-            uid: az_network_dns_record_set_txt_update
-            displayName: az network dns record-set txt update
-        - name: soa
-          displayName: az network dns record-set soa
+          - name: Summary
+            uid: az_devops_security_group
+            displayName: az devops security group
+          - name: membership
+            uid: az_devops_security_group_membership
+            displayName: az devops security group membership
+            items: []
+        - name: permission
           items:
-          - name: Overview
-            uid: az_network_dns_record_set_soa
-            displayName: az network dns record-set soa
-          - name: show
-            uid: az_network_dns_record_set_soa_show
-            displayName: az network dns record-set soa show
-          - name: update
-            uid: az_network_dns_record_set_soa_update
-            displayName: az network dns record-set soa update
-      - name: Zones
-        displayName: az network dns zone
+          - name: Summary
+            uid: az_devops_security_permission
+            displayName: az devops security permission
+          - name: namespace
+            uid: az_devops_security_permission_namespace
+            displayName: az devops security permission namespace
+            items: []
+      - name: service-endpoint
         items:
-        - name: Overview
-          uid: az_network_dns_zone
-          displayName: az network dns zone
-        - name: create
-          uid: az_network_dns_zone_create
-          displayName: az network dns zone create
-        - name: delete
-          uid: az_network_dns_zone_delete
-          displayName: az network dns zone delete
-        - name: export
-          uid: az_network_dns_zone_export
-          displayName: az network dns zone export
-        - name: import
-          uid: az_network_dns_zone_import
-          displayName: az network dns zone import
-        - name: list
-          uid: az_network_dns_zone_list
-          displayName: az network dns zone list
-        - name: show
-          uid: az_network_dns_zone_show
-          displayName: az network dns zone show
-        - name: update
-          uid: az_network_dns_zone_update
-          displayName: az network dns zone update
-    - name: Express Route
-      displayName: az network express-route
+        - name: Summary
+          uid: az_devops_service-endpoint
+          displayName: az devops service-endpoint
+        - name: azurerm
+          uid: az_devops_service-endpoint_azurerm
+          displayName: az devops service-endpoint azurerm
+          items: []
+        - name: github
+          uid: az_devops_service-endpoint_github
+          displayName: az devops service-endpoint github
+          items: []
+      - name: team
+        uid: az_devops_team
+        displayName: az devops team
+        items: []
+      - name: user
+        uid: az_devops_user
+        displayName: az devops user
+        items: []
+      - name: wiki
+        items:
+        - name: Summary
+          uid: az_devops_wiki
+          displayName: az devops wiki
+        - name: page
+          uid: az_devops_wiki_page
+          displayName: az devops wiki page
+          items: []
+  - name: Azure DevTest Labs
+    uid: sp-Azure_DevTest_Labs
+    displayName: Azure DevTest Labs
+    items: []
+  - name: Azure Digital Twins
+    items:
+    - name: Summary
+      uid: sp-Azure_Digital_Twins
+      displayName: Azure Digital Twins
+    - name: dt
       items:
-      - name: Overview
-        uid: az_network_express_route
-        displayName: az network express-route
-      - name: create
-        uid: az_network_express_route_create
-        displayName: az network express-route create
-      - name: list
-        uid: az_network_express_route_list
-        displayName: az network express-route list
-      - name: list-route-tables
-        uid: az_network_express_route_list_route_tables
-        displayName: az network express-route list-route-tables
-      - name: Peering
-        displayName: az network express-route peering
+      - name: Summary
+        uid: az_dt
+        displayName: az dt
+      - name: endpoint
         items:
-        - name: Overview
-          uid: az_network_express_route_peering
-          displayName: az network express-route peering
+        - name: Summary
+          uid: az_dt_endpoint
+          displayName: az dt endpoint
         - name: create
-          uid: az_network_express_route_peering_create
-          displayName: az network express-route peering create
-        - name: delete
-          uid: az_network_express_route_peering_delete
-          displayName: az network express-route peering delete
-        - name: list
-          uid: az_network_express_route_peering_list
-          displayName: az network express-route peering list
-        - name: show
-          uid: az_network_express_route_peering_show
-          displayName: az network express-route peering show
-        - name: update
-          uid: az_network_express_route_peering_update
-          displayName: az network express-route peering update
-        - name: connection
-          displayName: az network express-route peering connection
-          items:
-          - name: Overview
-            uid: az_network_express_route_peering_connection
-            displayName: az network express-route peering connection
-          - name: create
-            uid: az_network_express_route_peering_connection_create
-            displayName: az network express-route peering connection create
-      - name: gateway
-        displayName: az network express-route gateway
+          uid: az_dt_endpoint_create
+          displayName: az dt endpoint create
+          items: []
+      - name: model
+        uid: az_dt_model
+        displayName: az dt model
+        items: []
+      - name: network
         items:
-        - name: Overview
-          uid: az_network_express_route_gateway
-          displayName: az network express-route gateway
-        - name: create
-          uid: az_network_express_route_gateway_create
-          displayName: az network express-route gateway create
-        - name: list
-          uid: az_network_express_route_gateway_list
-          displayName: az network express-route gateway list
-        - name: connection
-          displayName: az network express-route gateway connection
+        - name: Summary
+          uid: az_dt_network
+          displayName: az dt network
+        - name: private-endpoint
           items:
-          - name: Overview
-            uid: az_network_express_route_gateway_connection
-            displayName: az network express-route gateway connection
-          - name: create
-            uid: az_network_express_route_gateway_connection_create
-            displayName: az network express-route gateway connection create
-      - name: port
-        displayName: az network express-route port
+          - name: Summary
+            uid: az_dt_network_private-endpoint
+            displayName: az dt network private-endpoint
+          - name: connection
+            uid: az_dt_network_private-endpoint_connection
+            displayName: az dt network private-endpoint connection
+            items: []
+        - name: private-link
+          uid: az_dt_network_private-link
+          displayName: az dt network private-link
+          items: []
+      - name: role-assignment
+        uid: az_dt_role-assignment
+        displayName: az dt role-assignment
+        items: []
+      - name: route
+        uid: az_dt_route
+        displayName: az dt route
+        items: []
+      - name: twin
         items:
-        - name: Overview
-          uid: az_network_express_route_port
-          displayName: az network express-route port
-        - name: create
-          uid: az_network_express_route_port_create
-          displayName: az network express-route port create
-        - name: list
-          uid: az_network_express_route_port_list
-          displayName: az network express-route port list
-    - name: Local gateways
-      displayName: az network local-gateway
-      items:
-      - name: Overview
-        uid: az_network_local_gateway
-        displayName: az network local-gateway
-      - name: create
-        uid: az_network_local_gateway_create
-        displayName: az network local-gateway create
-      - name: delete
-        uid: az_network_local_gateway_delete
-        displayName: az network local-gateway delete
-      - name: list
-        uid: az_network_local_gateway_list
-        displayName: az network local-gateway list
-      - name: show
-        uid: az_network_local_gateway_show
-        displayName: az network local-gateway show
-      - name: update
-        uid: az_network_local_gateway_update
-        displayName: az network local-gateway update
-      - name: wait
-        uid: az_network_local_gateway_wait
-        displayName: az network local-gateway wait
-    - name: Network Load Balancer
-      displayName: az network lb
+        - name: Summary
+          uid: az_dt_twin
+          displayName: az dt twin
+        - name: component
+          uid: az_dt_twin_component
+          displayName: az dt twin component
+          items: []
+        - name: relationship
+          uid: az_dt_twin_relationship
+          displayName: az dt twin relationship
+          items: []
+        - name: telemetry
+          uid: az_dt_twin_telemetry
+          displayName: az dt twin telemetry
+          items: []
+  - name: Azure Disk Pool Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Disk_Pool_Service
+      displayName: Azure Disk Pool Service
+    - name: disk-pool
+      items:
+      - name: Summary
+        uid: az_disk-pool
+        displayName: az disk-pool
+      - name: iscsi-target
+        uid: az_disk-pool_iscsi-target
+        displayName: az disk-pool iscsi-target
+        items: []
+  - name: Azure Disk Storage
+    uid: sp-Azure_Disk_Storage
+    displayName: Azure Disk Storage
+    items: []
+  - name: Azure Event Grid
+    items:
+    - name: Summary
+      uid: sp-Azure_Event_Grid
+      displayName: Azure Event Grid
+    - name: eventgrid
       items:
-      - name: Overview
-        uid: az_network_lb
-        displayName: az network lb
-      - name: create
-        uid: az_network_lb_create
-        displayName: az network lb create
-      - name: delete
-        uid: az_network_lb_delete
-        displayName: az network lb delete
-      - name: list
-        uid: az_network_lb_list
-        displayName: az network lb list
-      - name: show
-        uid: az_network_lb_show
-        displayName: az network lb show
-      - name: update
-        uid: az_network_lb_update
-        displayName: az network lb update
-      - name: Back-end address pools
-        displayName: az network lb address-pool
-        items:
-        - name: Overview
-          uid: az_network_lb_address_pool
-          displayName: az network lb address-pool
-        - name: create
-          uid: az_network_lb_address_pool_create
-          displayName: az network lb address-pool create
-        - name: delete
-          uid: az_network_lb_address_pool_delete
-          displayName: az network lb address-pool delete
-        - name: list
-          uid: az_network_lb_address_pool_list
-          displayName: az network lb address-pool list
-        - name: show
-          uid: az_network_lb_address_pool_show
-          displayName: az network lb address-pool show
-      - name: Front-end IP addresses
-        displayName: az network lb frontend-ip
-        items:
-        - name: Overview
-          uid: az_network_lb_frontend_ip
-          displayName: az network lb frontend-ip
-        - name: create
-          uid: az_network_lb_frontend_ip_create
-          displayName: az network lb frontend-ip create
-        - name: delete
-          uid: az_network_lb_frontend_ip_delete
-          displayName: az network lb frontend-ip delete
-        - name: list
-          uid: az_network_lb_frontend_ip_list
-          displayName: az network lb frontend-ip list
-        - name: show
-          uid: az_network_lb_frontend_ip_show
-          displayName: az network lb frontend-ip show
-        - name: update
-          uid: az_network_lb_frontend_ip_update
-          displayName: az network lb frontend-ip update
-      - name: Inbound NAT address pools
-        displayName: az network lb inbound-nat-pool
-        items:
-        - name: Overview
-          uid: az_network_lb_inbound_nat_pool
-          displayName: az network lb inbound-nat-pool
-        - name: create
-          uid: az_network_lb_inbound_nat_pool_create
-          displayName: az network lb inbound-nat-pool create
-        - name: delete
-          uid: az_network_lb_inbound_nat_pool_delete
-          displayName: az network lb inbound-nat-pool delete
-        - name: list
-          uid: az_network_lb_inbound_nat_pool_list
-          displayName: az network lb inbound-nat-pool list
-        - name: show
-          uid: az_network_lb_inbound_nat_pool_show
-          displayName: az network lb inbound-nat-pool show
-        - name: update
-          uid: az_network_lb_inbound_nat_pool_update
-          displayName: az network lb inbound-nat-pool update
-      - name: Inbound NAT address rules
-        displayName: az network lb inbound-nat-rule
-        items:
-        - name: Overview
-          uid: az_network_lb_inbound_nat_rule
-          displayName: az network lb inbound-nat-rule
-        - name: create
-          uid: az_network_lb_inbound_nat_rule_create
-          displayName: az network lb inbound-nat-rule create
-        - name: delete
-          uid: az_network_lb_inbound_nat_rule_delete
-          displayName: az network lb inbound-nat-rule delete
-        - name: list
-          uid: az_network_lb_inbound_nat_rule_list
-          displayName: az network lb inbound-nat-rule list
-        - name: show
-          uid: az_network_lb_inbound_nat_rule_show
-          displayName: az network lb inbound-nat-rule show
-        - name: update
-          uid: az_network_lb_inbound_nat_rule_update
-          displayName: az network lb inbound-nat-rule update
-      - name: Probes
-        displayName: az network lb probe
-        items:
-        - name: Overview
-          uid: az_network_lb_probe
-          displayName: az network lb probe
-        - name: create
-          uid: az_network_lb_probe_create
-          displayName: az network lb probe create
-        - name: delete
-          uid: az_network_lb_probe_delete
-          displayName: az network lb probe delete
-        - name: list
-          uid: az_network_lb_probe_list
-          displayName: az network lb probe list
-        - name: show
-          uid: az_network_lb_probe_show
-          displayName: az network lb probe show
-        - name: update
-          uid: az_network_lb_probe_update
-          displayName: az network lb probe update
-      - name: Rules
-        displayName: az network lb rule
+      - name: Summary
+        uid: az_eventgrid
+        displayName: az eventgrid
+      - name: domain
         items:
-        - name: Overview
-          uid: az_network_lb_rule
-          displayName: az network lb rule
-        - name: create
-          uid: az_network_lb_rule_create
-          displayName: az network lb rule create
-        - name: delete
-          uid: az_network_lb_rule_delete
-          displayName: az network lb rule delete
-        - name: list
-          uid: az_network_lb_rule_list
-          displayName: az network lb rule list
-        - name: show
-          uid: az_network_lb_rule_show
-          displayName: az network lb rule show
-        - name: update
-          uid: az_network_lb_rule_update
-          displayName: az network lb rule update
-    - name: Network interfaces
-      displayName: az network nic
-      items:
-      - name: Overview
-        uid: az_network_nic
-        displayName: az network nic
-      - name: create
-        uid: az_network_nic_create
-        displayName: az network nic create
-      - name: delete
-        uid: az_network_nic_delete
-        displayName: az network nic delete
-      - name: list
-        uid: az_network_nic_list
-        displayName: az network nic list
-      - name: show
-        uid: az_network_nic_show
-        displayName: az network nic show
-      - name: update
-        uid: az_network_nic_update
-        displayName: az network nic update
-      - name: wait
-        uid: az_network_nic_wait
-        displayName: az network nic wait
-      - name: NIC IP configurations
-        displayName: az network nic ip-config
+        - name: Summary
+          uid: az_eventgrid_domain
+          displayName: az eventgrid domain
+        - name: key
+          uid: az_eventgrid_domain_key
+          displayName: az eventgrid domain key
+          items: []
+        - name: private-endpoint-connection
+          uid: az_eventgrid_domain_private-endpoint-connection
+          displayName: az eventgrid domain private-endpoint-connection
+          items: []
+        - name: private-link-resource
+          uid: az_eventgrid_domain_private-link-resource
+          displayName: az eventgrid domain private-link-resource
+          items: []
+        - name: topic
+          uid: az_eventgrid_domain_topic
+          displayName: az eventgrid domain topic
+          items: []
+      - name: event-subscription
+        uid: az_eventgrid_event-subscription
+        displayName: az eventgrid event-subscription
+        items: []
+      - name: extension-topic
+        uid: az_eventgrid_extension-topic
+        displayName: az eventgrid extension-topic
+        items: []
+      - name: partner
         items:
-        - name: Overview
-          uid: az_network_nic_ip_config
-          displayName: az network nic ip-config
-        - name: create
-          uid: az_network_nic_ip_config_create
-          displayName: az network nic ip-config create
-        - name: delete
-          uid: az_network_nic_ip_config_delete
-          displayName: az network nic ip-config delete
-        - name: list
-          uid: az_network_nic_ip_config_list
-          displayName: az network nic ip-config list
-        - name: show
-          uid: az_network_nic_ip_config_show
-          displayName: az network nic ip-config show
-        - name: update
-          uid: az_network_nic_ip_config_update
-          displayName: az network nic ip-config update
-        - name: Address pools
-          displayName: az network nic ip-config address-pool
+        - name: Summary
+          uid: az_eventgrid_partner
+          displayName: az eventgrid partner
+        - name: namespace
           items:
-          - name: Overview
-            uid: az_network_nic_ip_config_address_pool
-            displayName: az network nic ip-config address-pool
-          - name: add
-            uid: az_network_nic_ip_config_address_pool_add
-            displayName: az network nic ip-config address-pool add
-          - name: remove
-            uid: az_network_nic_ip_config_address_pool_remove
-            displayName: az network nic ip-config address-pool remove
-        - name: Inbound NAT rules
-          displayName: az network nic ip-config inbound-nat-rule
+          - name: Summary
+            uid: az_eventgrid_partner_namespace
+            displayName: az eventgrid partner namespace
+          - name: event-channel
+            uid: az_eventgrid_partner_namespace_event-channel
+            displayName: az eventgrid partner namespace event-channel
+            items: []
+          - name: key
+            uid: az_eventgrid_partner_namespace_key
+            displayName: az eventgrid partner namespace key
+            items: []
+        - name: registration
+          uid: az_eventgrid_partner_registration
+          displayName: az eventgrid partner registration
+          items: []
+        - name: topic
           items:
-          - name: Overview
-            uid: az_network_nic_ip_config_inbound_nat_rule
-            displayName: az network nic ip-config inbound-nat-rule
-          - name: add
-            uid: az_network_nic_ip_config_inbound_nat_rule_add
-            displayName: az network nic ip-config inbound-nat-rule add
-          - name: remove
-            uid: az_network_nic_ip_config_inbound_nat_rule_remove
-            displayName: az network nic ip-config inbound-nat-rule remove
-    - name: Network security groups
-      displayName: az network nsg
-      items:
-      - name: Overview
-        uid: az_network_nsg
-        displayName: az network nsg
-      - name: create
-        uid: az_network_nsg_create
-        displayName: az network nsg create
-      - name: delete
-        uid: az_network_nsg_delete
-        displayName: az network nsg delete
-      - name: list
-        uid: az_network_nsg_list
-        displayName: az network nsg list
-      - name: show
-        uid: az_network_nsg_show
-        displayName: az network nsg show
-      - name: update
-        uid: az_network_nsg_update
-        displayName: az network nsg update
-      - name: Rules
-        displayName: az network nsg rule
+          - name: Summary
+            uid: az_eventgrid_partner_topic
+            displayName: az eventgrid partner topic
+          - name: event-subscription
+            uid: az_eventgrid_partner_topic_event-subscription
+            displayName: az eventgrid partner topic event-subscription
+            items: []
+      - name: system-topic
         items:
-        - name: Overview
-          uid: az_network_nsg_rule
-          displayName: az network nsg rule
-        - name: create
-          uid: az_network_nsg_rule_create
-          displayName: az network nsg rule create
-        - name: delete
-          uid: az_network_nsg_rule_delete
-          displayName: az network nsg rule delete
-        - name: list
-          uid: az_network_nsg_rule_list
-          displayName: az network nsg rule list
-        - name: show
-          uid: az_network_nsg_rule_show
-          displayName: az network nsg rule show
-        - name: update
-          uid: az_network_nsg_rule_update
-          displayName: az network nsg rule update
-    - name: Public IP addresses
-      displayName: az network public-ip
-      items:
-      - name: Overview
-        uid: az_network_public_ip
-        displayName: az network public-ip
-      - name: create
-        uid: az_network_public_ip_create
-        displayName: az network public-ip create
-      - name: delete
-        uid: az_network_public_ip_delete
-        displayName: az network public-ip delete
-      - name: list
-        uid: az_network_public_ip_list
-        displayName: az network public-ip list
-      - name: show
-        uid: az_network_public_ip_show
-        displayName: az network public-ip show
-      - name: update
-        uid: az_network_public_ip_update
-        displayName: az network public-ip update
-      - name: prefix
-        displayName: az network public-ip prefix
+        - name: Summary
+          uid: az_eventgrid_system-topic
+          displayName: az eventgrid system-topic
+        - name: event-subscription
+          uid: az_eventgrid_system-topic_event-subscription
+          displayName: az eventgrid system-topic event-subscription
+          items: []
+      - name: topic
         items:
-        - name: Overview
-          uid: az_network_public_ip_prefix
-          displayName: az network public-ip prefix
-        - name: create
-          uid: az_network_public_ip_prefix_create
-          displayName: az network public-ip prefix create
-        - name: list
-          uid: az_network_public_ip_prefix_list
-          displayName: az network public-ip prefix list
-    - name: Route tables
-      displayName: az network route-table
-      items:
-      - name: Overview
-        uid: az_network_route_table
-        displayName: az network route-table
-      - name: create
-        uid: az_network_route_table_create
-        displayName: az network route-table create
-      - name: delete
-        uid: az_network_route_table_delete
-        displayName: az network route-table delete
-      - name: list
-        uid: az_network_route_table_list
-        displayName: az network route-table list
-      - name: show
-        uid: az_network_route_table_show
-        displayName: az network route-table show
-      - name: update
-        uid: az_network_route_table_update
-        displayName: az network route-table update
-      - name: Routes
-        displayName: az network route-table route
-        items:
-        - name: Overview
-          uid: az_network_route_table_route
-          displayName: az network route-table route
-        - name: create
-          uid: az_network_route_table_route_create
-          displayName: az network route-table route create
-        - name: delete
-          uid: az_network_route_table_route_delete
-          displayName: az network route-table route delete
-        - name: list
-          uid: az_network_route_table_route_list
-          displayName: az network route-table route list
-        - name: show
-          uid: az_network_route_table_route_show
-          displayName: az network route-table route show
-        - name: update
-          uid: az_network_route_table_route_update
-          displayName: az network route-table route update
-    - name: Traffic Manager
-      displayName: az network traffic-manager
+        - name: Summary
+          uid: az_eventgrid_topic
+          displayName: az eventgrid topic
+        - name: key
+          uid: az_eventgrid_topic_key
+          displayName: az eventgrid topic key
+          items: []
+        - name: private-endpoint-connection
+          uid: az_eventgrid_topic_private-endpoint-connection
+          displayName: az eventgrid topic private-endpoint-connection
+          items: []
+        - name: private-link-resource
+          uid: az_eventgrid_topic_private-link-resource
+          displayName: az eventgrid topic private-link-resource
+          items: []
+      - name: topic-type
+        uid: az_eventgrid_topic-type
+        displayName: az eventgrid topic-type
+        items: []
+  - name: Azure Event Hubs
+    uid: sp-Azure_Event_Hubs
+    displayName: Azure Event Hubs
+    items: []
+  - name: Azure File Sync
+    items:
+    - name: Summary
+      uid: sp-Azure_File_Sync
+      displayName: Azure File Sync
+    - name: storagesync
       items:
-      - name: Overview
-        uid: az_network_traffic_manager
-        displayName: az network traffic-manager
-      - name: End points
-        displayName: az network traffic-manager endpoint
-        items:
-        - name: Overview
-          uid: az_network_traffic_manager_endpoint
-          displayName: az network traffic-manager endpoint
-        - name: create
-          uid: az_network_traffic_manager_endpoint_create
-          displayName: az network traffic-manager endpoint create
-        - name: delete
-          uid: az_network_traffic_manager_endpoint_delete
-          displayName: az network traffic-manager endpoint delete
-        - name: list
-          uid: az_network_traffic_manager_endpoint_list
-          displayName: az network traffic-manager endpoint list
-        - name: show
-          uid: az_network_traffic_manager_endpoint_show
-          displayName: az network traffic-manager endpoint show
-        - name: show-geographic-hierarchy
-          uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-          displayName: az network traffic-manager endpoint show-geographic-hierarchy
-        - name: update
-          uid: az_network_traffic_manager_endpoint_update
-          displayName: az network traffic-manager endpoint update
-      - name: Profiles
-        displayName: az network traffic-manager profile
+      - name: Summary
+        uid: az_storagesync
+        displayName: az storagesync
+      - name: registered-server
+        uid: az_storagesync_registered-server
+        displayName: az storagesync registered-server
+        items: []
+      - name: sync-group
         items:
-        - name: Overview
-          uid: az_network_traffic_manager_profile
-          displayName: az network traffic-manager profile
-        - name: check-dns
-          uid: az_network_traffic_manager_profile_check_dns
-          displayName: az network traffic-manager profile check-dns
-        - name: create
-          uid: az_network_traffic_manager_profile_create
-          displayName: az network traffic-manager profile create
-        - name: delete
-          uid: az_network_traffic_manager_profile_delete
-          displayName: az network traffic-manager profile delete
-        - name: list
-          uid: az_network_traffic_manager_profile_list
-          displayName: az network traffic-manager profile list
-        - name: show
-          uid: az_network_traffic_manager_profile_show
-          displayName: az network traffic-manager profile show
-        - name: update
-          uid: az_network_traffic_manager_profile_update
-          displayName: az network traffic-manager profile update
-    - name: VPN connections
-      displayName: az network vpn-connection
+        - name: Summary
+          uid: az_storagesync_sync-group
+          displayName: az storagesync sync-group
+        - name: cloud-endpoint
+          uid: az_storagesync_sync-group_cloud-endpoint
+          displayName: az storagesync sync-group cloud-endpoint
+          items: []
+        - name: server-endpoint
+          uid: az_storagesync_sync-group_server-endpoint
+          displayName: az storagesync sync-group server-endpoint
+          items: []
+  - name: Azure Front Door
+    uid: sp-Azure_Front_Door
+    displayName: Azure Front Door
+    items: []
+  - name: Azure Functions
+    items:
+    - name: Summary
+      uid: sp-Azure_Functions
+      displayName: Azure Functions
+    - name: functionapp
       items:
-      - name: Overview
-        uid: az_network_vpn_connection
-        displayName: az network vpn-connection
-      - name: create
-        uid: az_network_vpn_connection_create
-        displayName: az network vpn-connection create
-      - name: delete
-        uid: az_network_vpn_connection_delete
-        displayName: az network vpn-connection delete
-      - name: list
-        uid: az_network_vpn_connection_list
-        displayName: az network vpn-connection list
-      - name: show
-        uid: az_network_vpn_connection_show
-        displayName: az network vpn-connection show
-      - name: update
-        uid: az_network_vpn_connection_update
-        displayName: az network vpn-connection update
-      - name: Shared keys
-        displayName: az network vpn-connection shared-key
-        items:
-        - name: Overview
-          uid: az_network_vpn_connection_shared_key
-          displayName: az network vpn-connection shared-key
-        - name: reset
-          uid: az_network_vpn_connection_shared_key_reset
-          displayName: az network vpn-connection shared-key reset
-        - name: show
-          uid: az_network_vpn_connection_shared_key_show
-          displayName: az network vpn-connection shared-key show
-        - name: update
-          uid: az_network_vpn_connection_shared_key_update
-          displayName: az network vpn-connection shared-key update
-    - name: Virtual Network
-      displayName: az network vnet
+      - name: Summary
+        uid: az_functionapp
+        displayName: az functionapp
+      - name: app
+        uid: az_functionapp_app
+        displayName: az functionapp app
+        items: []
+  - name: Azure HDInsight
+    items:
+    - name: Summary
+      uid: sp-Azure_HDInsight
+      displayName: Azure HDInsight
+    - name: hdinsight
+      items:
+      - name: Summary
+        uid: az_hdinsight
+        displayName: az hdinsight
+      - name: application
+        uid: az_hdinsight_application
+        displayName: az hdinsight application
+        items: []
+      - name: autoscale
+        items:
+        - name: Summary
+          uid: az_hdinsight_autoscale
+          displayName: az hdinsight autoscale
+        - name: condition
+          uid: az_hdinsight_autoscale_condition
+          displayName: az hdinsight autoscale condition
+          items: []
+      - name: host
+        uid: az_hdinsight_host
+        displayName: az hdinsight host
+        items: []
+      - name: monitor
+        uid: az_hdinsight_monitor
+        displayName: az hdinsight monitor
+        items: []
+      - name: script-action
+        uid: az_hdinsight_script-action
+        displayName: az hdinsight script-action
+        items: []
+  - name: Azure HPC Cache
+    items:
+    - name: Summary
+      uid: sp-Azure_HPC_Cache
+      displayName: Azure HPC Cache
+    - name: hpc-cache
       items:
-      - name: Overview
-        uid: az_network_vnet
-        displayName: az network vnet
-      - name: create
-        uid: az_network_vnet_create
-        displayName: az network vnet create
-      - name: delete
-        uid: az_network_vnet_delete
-        displayName: az network vnet delete
-      - name: list
-        uid: az_network_vnet_list
-        displayName: az network vnet list
-      - name: show
-        uid: az_network_vnet_show
-        displayName: az network vnet show
-      - name: update
-        uid: az_network_vnet_update
-        displayName: az network vnet update
-      - name: Subnets
-        displayName: az network vnet subnet
-        items:
-        - name: Overview
-          uid: az_network_vnet_subnet
-          displayName: az network vnet subnet
-        - name: create
-          uid: az_network_vnet_subnet_create
-          displayName: az network vnet subnet create
-        - name: delete
-          uid: az_network_vnet_subnet_delete
-          displayName: az network vnet subnet delete
-        - name: list
-          uid: az_network_vnet_subnet_list
-          displayName: az network vnet subnet list
-        - name: show
-          uid: az_network_vnet_subnet_show
-          displayName: az network vnet subnet show
-        - name: update
-          uid: az_network_vnet_subnet_update
-          displayName: az network vnet subnet update
-    - name: Virtual Network gateways
-      displayName: az network vnet-gateway
+      - name: Summary
+        uid: az_hpc-cache
+        displayName: az hpc-cache
+      - name: blob-storage-target
+        uid: az_hpc-cache_blob-storage-target
+        displayName: az hpc-cache blob-storage-target
+        items: []
+      - name: nfs-storage-target
+        uid: az_hpc-cache_nfs-storage-target
+        displayName: az hpc-cache nfs-storage-target
+        items: []
+      - name: skus
+        uid: az_hpc-cache_skus
+        displayName: az hpc-cache skus
+        items: []
+      - name: storage-target
+        uid: az_hpc-cache_storage-target
+        displayName: az hpc-cache storage-target
+        items: []
+      - name: usage-model
+        uid: az_hpc-cache_usage-model
+        displayName: az hpc-cache usage-model
+        items: []
+  - name: Azure IoT
+    items:
+    - name: Summary
+      uid: sp-Azure_IoT
+      displayName: Azure IoT
+    - name: iot
       items:
-      - name: Overview
-        uid: az_network_vnet_gateway
-        displayName: az network vnet-gateway
-      - name: Revoked certificates
-        displayName: az network vnet-gateway revoked-cert
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_revoked_cert
-          displayName: az network vnet-gateway revoked-cert
-        - name: create
-          uid: az_network_vnet_gateway_revoked_cert_create
-          displayName: az network vnet-gateway revoked-cert create
-        - name: delete
-          uid: az_network_vnet_gateway_revoked_cert_delete
-          displayName: az network vnet-gateway revoked-cert delete
-      - name: Root certificates
-        displayName: az network vnet-gateway root-cert
+      - name: Summary
+        uid: az_iot
+        displayName: az iot
+      - name: central
         items:
-        - name: Overview
-          uid: az_network_vnet_gateway_root_cert
-          displayName: az network vnet-gateway root-cert
-        - name: create
-          uid: az_network_vnet_gateway_root_cert_create
-          displayName: az network vnet-gateway root-cert create
-        - name: delete
-          uid: az_network_vnet_gateway_root_cert_delete
-          displayName: az network vnet-gateway root-cert delete
-      - name: vpn-client
-        displayName: az network vnet-gateway vpn-client
+        - name: Summary
+          uid: az_iot_central
+          displayName: az iot central
+        - name: api-token
+          uid: az_iot_central_api-token
+          displayName: az iot central api-token
+          items: []
+        - name: device
+          items:
+          - name: Summary
+            uid: az_iot_central_device
+            displayName: az iot central device
+          - name: command
+            uid: az_iot_central_device_command
+            displayName: az iot central device command
+            items: []
+          - name: twin
+            uid: az_iot_central_device_twin
+            displayName: az iot central device twin
+            items: []
+        - name: device-template
+          uid: az_iot_central_device-template
+          displayName: az iot central device-template
+          items: []
+        - name: diagnostics
+          uid: az_iot_central_diagnostics
+          displayName: az iot central diagnostics
+          items: []
+        - name: user
+          uid: az_iot_central_user
+          displayName: az iot central user
+          items: []
+      - name: device
+        items:
+        - name: Summary
+          uid: az_iot_device
+          displayName: az iot device
+        - name: c2d-message
+          uid: az_iot_device_c2d-message
+          displayName: az iot device c2d-message
+          items: []
+      - name: dps
         items:
-        - name: Overview
-          uid: az_network_vnet_gateway_vpn_client
-          displayName: az network vnet-gateway vpn-client
-        - name: generate
-          uid: az_network_vnet_gateway_vpn_client_generate
-          displayName: az network vnet-gateway vpn-client generate
-    - name: bastion
-      displayName: az network bastion
-      items:
-      - name: Overview
-        uid: az_network_bastion
-        displayName: az network bastion
-      - name: create
-        uid: az_network_bastion_create
-        displayName: az network bastion create
-      - name: list
-        uid: az_network_bastion_list
-        displayName: az network bastion list
-    - name: private-dns
-      displayName: az network private-dns
-      items:
-      - name: Overview
-        uid: az_network_private_dns
-        displayName: az network private-dns
-      - name: link
-        displayName: az network private-dns link
+        - name: Summary
+          uid: az_iot_dps
+          displayName: az iot dps
+        - name: enrollment
+          uid: az_iot_dps_enrollment
+          displayName: az iot dps enrollment
+          items: []
+        - name: enrollment-group
+          uid: az_iot_dps_enrollment-group
+          displayName: az iot dps enrollment-group
+          items: []
+        - name: registration
+          uid: az_iot_dps_registration
+          displayName: az iot dps registration
+          items: []
+      - name: edge
         items:
-        - name: Overview
-          uid: az_network_private_dns_link
-          displayName: az network private-dns link
-        - name: vnet
-          displayName: az network private-dns link vnet
-          items:
-          - name: Overview
-            uid: az_network_private_dns_link_vnet
-            displayName: az network private-dns link vnet
-          - name: create
-            uid: az_network_private_dns_link_vnet_create
-            displayName: az network private-dns link vnet create
-          - name: delete
-            uid: az_network_private_dns_link_vnet_delete
-            displayName: az network private-dns link vnet delete
-          - name: list
-            uid: az_network_private_dns_link_vnet_list
-            displayName: az network private-dns link vnet list
-          - name: show
-            uid: az_network_private_dns_link_vnet_show
-            displayName: az network private-dns link vnet show
-          - name: update
-            uid: az_network_private_dns_link_vnet_update
-            displayName: az network private-dns link vnet update
-          - name: wait
-            uid: az_network_private_dns_link_vnet_wait
-            displayName: az network private-dns link vnet wait
-      - name: record-set
-        displayName: az network private-dns record-set
+        - name: Summary
+          uid: az_iot_edge
+          displayName: az iot edge
+        - name: deployment
+          uid: az_iot_edge_deployment
+          displayName: az iot edge deployment
+          items: []
+      - name: hub
         items:
-        - name: Overview
-          uid: az_network_private_dns_record_set
-          displayName: az network private-dns record-set
-        - name: list
-          uid: az_network_private_dns_record_set_list
-          displayName: az network private-dns record-set list
-        - name: a
-          displayName: az network private-dns record-set a
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_a
-            displayName: az network private-dns record-set a
-          - name: add-record
-            uid: az_network_private_dns_record_set_a_add_record
-            displayName: az network private-dns record-set a add-record
-          - name: create
-            uid: az_network_private_dns_record_set_a_create
-            displayName: az network private-dns record-set a create
-          - name: delete
-            uid: az_network_private_dns_record_set_a_delete
-            displayName: az network private-dns record-set a delete
-          - name: list
-            uid: az_network_private_dns_record_set_a_list
-            displayName: az network private-dns record-set a list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_a_remove_record
-            displayName: az network private-dns record-set a remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_a_show
-            displayName: az network private-dns record-set a show
-          - name: update
-            uid: az_network_private_dns_record_set_a_update
-            displayName: az network private-dns record-set a update
-        - name: aaaa
-          displayName: az network private-dns record-set aaaa
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_aaaa
-            displayName: az network private-dns record-set aaaa
-          - name: add-record
-            uid: az_network_private_dns_record_set_aaaa_add_record
-            displayName: az network private-dns record-set aaaa add-record
-          - name: create
-            uid: az_network_private_dns_record_set_aaaa_create
-            displayName: az network private-dns record-set aaaa create
-          - name: delete
-            uid: az_network_private_dns_record_set_aaaa_delete
-            displayName: az network private-dns record-set aaaa delete
-          - name: list
-            uid: az_network_private_dns_record_set_aaaa_list
-            displayName: az network private-dns record-set aaaa list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_aaaa_remove_record
-            displayName: az network private-dns record-set aaaa remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_aaaa_show
-            displayName: az network private-dns record-set aaaa show
-          - name: update
-            uid: az_network_private_dns_record_set_aaaa_update
-            displayName: az network private-dns record-set aaaa update
-        - name: cname
-          displayName: az network private-dns record-set cname
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_cname
-            displayName: az network private-dns record-set cname
-          - name: create
-            uid: az_network_private_dns_record_set_cname_create
-            displayName: az network private-dns record-set cname create
-          - name: delete
-            uid: az_network_private_dns_record_set_cname_delete
-            displayName: az network private-dns record-set cname delete
-          - name: list
-            uid: az_network_private_dns_record_set_cname_list
-            displayName: az network private-dns record-set cname list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_cname_remove_record
-            displayName: az network private-dns record-set cname remove-record
-          - name: set-record
-            uid: az_network_private_dns_record_set_cname_set_record
-            displayName: az network private-dns record-set cname set-record
-          - name: show
-            uid: az_network_private_dns_record_set_cname_show
-            displayName: az network private-dns record-set cname show
-          - name: update
-            uid: az_network_private_dns_record_set_cname_update
-            displayName: az network private-dns record-set cname update
-        - name: mx
-          displayName: az network private-dns record-set mx
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_mx
-            displayName: az network private-dns record-set mx
-          - name: add-record
-            uid: az_network_private_dns_record_set_mx_add_record
-            displayName: az network private-dns record-set mx add-record
-          - name: create
-            uid: az_network_private_dns_record_set_mx_create
-            displayName: az network private-dns record-set mx create
-          - name: delete
-            uid: az_network_private_dns_record_set_mx_delete
-            displayName: az network private-dns record-set mx delete
-          - name: list
-            uid: az_network_private_dns_record_set_mx_list
-            displayName: az network private-dns record-set mx list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_mx_remove_record
-            displayName: az network private-dns record-set mx remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_mx_show
-            displayName: az network private-dns record-set mx show
-          - name: update
-            uid: az_network_private_dns_record_set_mx_update
-            displayName: az network private-dns record-set mx update
-        - name: ptr
-          displayName: az network private-dns record-set ptr
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_ptr
-            displayName: az network private-dns record-set ptr
-          - name: add-record
-            uid: az_network_private_dns_record_set_ptr_add_record
-            displayName: az network private-dns record-set ptr add-record
-          - name: create
-            uid: az_network_private_dns_record_set_ptr_create
-            displayName: az network private-dns record-set ptr create
-          - name: delete
-            uid: az_network_private_dns_record_set_ptr_delete
-            displayName: az network private-dns record-set ptr delete
-          - name: list
-            uid: az_network_private_dns_record_set_ptr_list
-            displayName: az network private-dns record-set ptr list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_ptr_remove_record
-            displayName: az network private-dns record-set ptr remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_ptr_show
-            displayName: az network private-dns record-set ptr show
-          - name: update
-            uid: az_network_private_dns_record_set_ptr_update
-            displayName: az network private-dns record-set ptr update
-        - name: soa
-          displayName: az network private-dns record-set soa
+        - name: Summary
+          uid: az_iot_hub
+          displayName: az iot hub
+        - name: configuration
+          uid: az_iot_hub_configuration
+          displayName: az iot hub configuration
+          items: []
+        - name: connection-string
+          uid: az_iot_hub_connection-string
+          displayName: az iot hub connection-string
+          items: []
+        - name: device-identity
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_soa
-            displayName: az network private-dns record-set soa
-          - name: show
-            uid: az_network_private_dns_record_set_soa_show
-            displayName: az network private-dns record-set soa show
-          - name: update
-            uid: az_network_private_dns_record_set_soa_update
-            displayName: az network private-dns record-set soa update
-        - name: srv
-          displayName: az network private-dns record-set srv
+          - name: Summary
+            uid: az_iot_hub_device-identity
+            displayName: az iot hub device-identity
+          - name: children
+            uid: az_iot_hub_device-identity_children
+            displayName: az iot hub device-identity children
+            items: []
+          - name: connection-string
+            uid: az_iot_hub_device-identity_connection-string
+            displayName: az iot hub device-identity connection-string
+            items: []
+          - name: parent
+            uid: az_iot_hub_device-identity_parent
+            displayName: az iot hub device-identity parent
+            items: []
+        - name: device-twin
+          uid: az_iot_hub_device-twin
+          displayName: az iot hub device-twin
+          items: []
+        - name: digital-twin
+          uid: az_iot_hub_digital-twin
+          displayName: az iot hub digital-twin
+          items: []
+        - name: distributed-tracing
+          uid: az_iot_hub_distributed-tracing
+          displayName: az iot hub distributed-tracing
+          items: []
+        - name: job
+          uid: az_iot_hub_job
+          displayName: az iot hub job
+          items: []
+        - name: module-identity
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_srv
-            displayName: az network private-dns record-set srv
-          - name: add-record
-            uid: az_network_private_dns_record_set_srv_add_record
-            displayName: az network private-dns record-set srv add-record
-          - name: create
-            uid: az_network_private_dns_record_set_srv_create
-            displayName: az network private-dns record-set srv create
-          - name: delete
-            uid: az_network_private_dns_record_set_srv_delete
-            displayName: az network private-dns record-set srv delete
-          - name: list
-            uid: az_network_private_dns_record_set_srv_list
-            displayName: az network private-dns record-set srv list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_srv_remove_record
-            displayName: az network private-dns record-set srv remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_srv_show
-            displayName: az network private-dns record-set srv show
-          - name: update
-            uid: az_network_private_dns_record_set_srv_update
-            displayName: az network private-dns record-set srv update
-        - name: txt
-          displayName: az network private-dns record-set txt
+          - name: Summary
+            uid: az_iot_hub_module-identity
+            displayName: az iot hub module-identity
+          - name: connection-string
+            uid: az_iot_hub_module-identity_connection-string
+            displayName: az iot hub module-identity connection-string
+            items: []
+        - name: module-twin
+          uid: az_iot_hub_module-twin
+          displayName: az iot hub module-twin
+          items: []
+      - name: product
+        items:
+        - name: Summary
+          uid: az_iot_product
+          displayName: az iot product
+        - name: requirement
+          uid: az_iot_product_requirement
+          displayName: az iot product requirement
+          items: []
+        - name: test
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_txt
-            displayName: az network private-dns record-set txt
-          - name: add-record
-            uid: az_network_private_dns_record_set_txt_add_record
-            displayName: az network private-dns record-set txt add-record
-          - name: create
-            uid: az_network_private_dns_record_set_txt_create
-            displayName: az network private-dns record-set txt create
-          - name: delete
-            uid: az_network_private_dns_record_set_txt_delete
-            displayName: az network private-dns record-set txt delete
-          - name: list
-            uid: az_network_private_dns_record_set_txt_list
-            displayName: az network private-dns record-set txt list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_txt_remove_record
-            displayName: az network private-dns record-set txt remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_txt_show
-            displayName: az network private-dns record-set txt show
-          - name: update
-            uid: az_network_private_dns_record_set_txt_update
-            displayName: az network private-dns record-set txt update
-      - name: zone
-        displayName: az network private-dns zone
-        items:
-        - name: Overview
-          uid: az_network_private_dns_zone
-          displayName: az network private-dns zone
-        - name: create
-          uid: az_network_private_dns_zone_create
-          displayName: az network private-dns zone create
-        - name: delete
-          uid: az_network_private_dns_zone_delete
-          displayName: az network private-dns zone delete
-        - name: export
-          uid: az_network_private_dns_zone_export
-          displayName: az network private-dns zone export
-        - name: import
-          uid: az_network_private_dns_zone_import
-          displayName: az network private-dns zone import
-        - name: list
-          uid: az_network_private_dns_zone_list
-          displayName: az network private-dns zone list
-        - name: show
-          uid: az_network_private_dns_zone_show
-          displayName: az network private-dns zone show
-        - name: update
-          uid: az_network_private_dns_zone_update
-          displayName: az network private-dns zone update
-        - name: wait
-          uid: az_network_private_dns_zone_wait
-          displayName: az network private-dns zone wait
-    - name: private-endpoint
-      displayName: az network private-endpoint
-      items:
-      - name: Overview
-        uid: az_network_private_endpoint
-        displayName: az network private-endpoint
-      - name: list
-        uid: az_network_private_endpoint_list
-        displayName: az network private-endpoint list
-    - name: private-endpoint-connection
-      displayName: az network private-endpoint-connection
-      items:
-      - name: Overview
-        uid: az_network_private_endpoint_connection
-        displayName: az network private-endpoint-connection
-      - name: approve
-        uid: az_network_private_endpoint_connection_approve
-        displayName: az network private-endpoint-connection approve
-      - name: delete
-        uid: az_network_private_endpoint_connection_delete
-        displayName: az network private-endpoint-connection delete
-      - name: list
-        uid: az_network_private_endpoint_connection_list
-        displayName: az network private-endpoint-connection list
-      - name: reject
-        uid: az_network_private_endpoint_connection_reject
-        displayName: az network private-endpoint-connection reject
-      - name: show
-        uid: az_network_private_endpoint_connection_show
-        displayName: az network private-endpoint-connection show
-    - name: private-link-resource
-      displayName: az network private-link-resource
-      items:
-      - name: Overview
-        uid: az_network_private_link_resource
-        displayName: az network private-link-resource
-      - name: list
-        uid: az_network_private_link_resource_list
-        displayName: az network private-link-resource list
-    - name: private-link-service
-      displayName: az network private-link-service
-      items:
-      - name: Overview
-        uid: az_network_private_link_service
-        displayName: az network private-link-service
-      - name: create
-        uid: az_network_private_link_service_create
-        displayName: az network private-link-service create
-      - name: list
-        uid: az_network_private_link_service_list
-        displayName: az network private-link-service list
-      - name: connection
-        displayName: az network private-link-service connection
-        items:
-        - name: Overview
-          uid: az_network_private_link_service_connection
-          displayName: az network private-link-service connection
-        - name: update
-          uid: az_network_private_link_service_connection_update
-          displayName: az network private-link-service connection update
-    - name: profile
-      displayName: az network profile
-      items:
-      - name: Overview
-        uid: az_network_profile
-        displayName: az network profile
-      - name: list
-        uid: az_network_profile_list
-        displayName: az network profile list
-    - name: security-partner-provider
-      displayName: az network security-partner-provider
-      items:
-      - name: Overview
-        uid: az_network_security_partner_provider
-        displayName: az network security-partner-provider
-      - name: create
-        uid: az_network_security_partner_provider_create
-        displayName: az network security-partner-provider create
-      - name: list
-        uid: az_network_security_partner_provider_list
-        displayName: az network security-partner-provider list
-    - name: service-endpoint
-      displayName: az network service-endpoint
-      items:
-      - name: Overview
-        uid: az_network_service_endpoint
-        displayName: az network service-endpoint
-      - name: policy
-        displayName: az network service-endpoint policy
-        items:
-        - name: Overview
-          uid: az_network_service_endpoint_policy
-          displayName: az network service-endpoint policy
-        - name: create
-          uid: az_network_service_endpoint_policy_create
-          displayName: az network service-endpoint policy create
-        - name: list
-          uid: az_network_service_endpoint_policy_list
-          displayName: az network service-endpoint policy list
-      - name: policy-definition
-        displayName: az network service-endpoint policy-definition
-        items:
-        - name: Overview
-          uid: az_network_service_endpoint_policy_definition
-          displayName: az network service-endpoint policy-definition
-        - name: create
-          uid: az_network_service_endpoint_policy_definition_create
-          displayName: az network service-endpoint policy-definition create
-    - name: vrouter
-      displayName: az network vrouter
-      items:
-      - name: Overview
-        uid: az_network_vrouter
-        displayName: az network vrouter
-      - name: create
-        uid: az_network_vrouter_create
-        displayName: az network vrouter create
-      - name: list
-        uid: az_network_vrouter_list
-        displayName: az network vrouter list
-      - name: peering
-        displayName: az network vrouter peering
-        items:
-        - name: Overview
-          uid: az_network_vrouter_peering
-          displayName: az network vrouter peering
-        - name: create
-          uid: az_network_vrouter_peering_create
-          displayName: az network vrouter peering create
-  - name: Resource groups
-    displayName: az group
+          - name: Summary
+            uid: az_iot_product_test
+            displayName: az iot product test
+          - name: case
+            uid: az_iot_product_test_case
+            displayName: az iot product test case
+            items: []
+          - name: run
+            uid: az_iot_product_test_run
+            displayName: az iot product test run
+            items: []
+          - name: task
+            uid: az_iot_product_test_task
+            displayName: az iot product test task
+            items: []
+  - name: Azure Key Vault
     items:
-    - name: Overview
-      uid: az_group
-      displayName: az group
-    - name: create
-      uid: az_group_create
-      displayName: az group create
-    - name: delete
-      uid: az_group_delete
-      displayName: az group delete
-    - name: exists
-      uid: az_group_exists
-      displayName: az group exists
-    - name: export
-      uid: az_group_export
-      displayName: az group export
-    - name: list
-      uid: az_group_list
-      displayName: az group list
-    - name: show
-      uid: az_group_show
-      displayName: az group show
-    - name: update
-      uid: az_group_update
-      displayName: az group update
-    - name: wait
-      uid: az_group_wait
-      displayName: az group wait
-    - name: Deployments
-      displayName: az group deployment
+    - name: Summary
+      uid: sp-Azure_Key_Vault
+      displayName: Azure Key Vault
+    - name: keyvault
       items:
-      - name: Overview
-        uid: az_group_deployment
-        displayName: az group deployment
-      - name: cancel
-        uid: az_group_deployment_cancel
-        displayName: az group deployment cancel
-      - name: create
-        uid: az_group_deployment_create
-        displayName: az group deployment create
-      - name: delete
-        uid: az_group_deployment_delete
-        displayName: az group deployment delete
-      - name: export
-        uid: az_group_deployment_export
-        displayName: az group deployment export
-      - name: list
-        uid: az_group_deployment_list
-        displayName: az group deployment list
-      - name: show
-        uid: az_group_deployment_show
-        displayName: az group deployment show
-      - name: validate
-        uid: az_group_deployment_validate
-        displayName: az group deployment validate
-      - name: wait
-        uid: az_group_deployment_wait
-        displayName: az group deployment wait
-      - name: Operations
-        displayName: az group deployment operation
+      - name: Summary
+        uid: az_keyvault
+        displayName: az keyvault
+      - name: certificate
         items:
-        - name: Overview
-          uid: az_group_deployment_operation
-          displayName: az group deployment operation
-        - name: list
-          uid: az_group_deployment_operation_list
-          displayName: az group deployment operation list
-        - name: show
-          uid: az_group_deployment_operation_show
-          displayName: az group deployment operation show
-    - name: lock
-      displayName: az group lock
-      items:
-      - name: Overview
-        uid: az_group_lock
-        displayName: az group lock
-      - name: create
-        uid: az_group_lock_create
-        displayName: az group lock create
-      - name: delete
-        uid: az_group_lock_delete
-        displayName: az group lock delete
-      - name: list
-        uid: az_group_lock_list
-        displayName: az group lock list
-      - name: show
-        uid: az_group_lock_show
-        displayName: az group lock show
-      - name: update
-        uid: az_group_lock_update
-        displayName: az group lock update
-  - name: Resource policies
-    displayName: az policy
-    items:
-    - name: Overview
-      uid: az_policy
-      displayName: az policy
-    - name: Assignments
-      displayName: az policy assignment
-      items:
-      - name: Overview
-        uid: az_policy_assignment
-        displayName: az policy assignment
-      - name: create
-        uid: az_policy_assignment_create
-        displayName: az policy assignment create
-      - name: delete
-        uid: az_policy_assignment_delete
-        displayName: az policy assignment delete
-      - name: list
-        uid: az_policy_assignment_list
-        displayName: az policy assignment list
-      - name: show
-        uid: az_policy_assignment_show
-        displayName: az policy assignment show
-    - name: Definitions
-      displayName: az policy definition
-      items:
-      - name: Overview
-        uid: az_policy_definition
-        displayName: az policy definition
-      - name: create
-        uid: az_policy_definition_create
-        displayName: az policy definition create
-      - name: delete
-        uid: az_policy_definition_delete
-        displayName: az policy definition delete
-      - name: list
-        uid: az_policy_definition_list
-        displayName: az policy definition list
-      - name: show
-        uid: az_policy_definition_show
-        displayName: az policy definition show
-      - name: update
-        uid: az_policy_definition_update
-        displayName: az policy definition update
-  - name: Resource providers
-    displayName: az provider
+        - name: Summary
+          uid: az_keyvault_certificate
+          displayName: az keyvault certificate
+        - name: contact
+          uid: az_keyvault_certificate_contact
+          displayName: az keyvault certificate contact
+          items: []
+        - name: issuer
+          items:
+          - name: Summary
+            uid: az_keyvault_certificate_issuer
+            displayName: az keyvault certificate issuer
+          - name: admin
+            uid: az_keyvault_certificate_issuer_admin
+            displayName: az keyvault certificate issuer admin
+            items: []
+        - name: pending
+          uid: az_keyvault_certificate_pending
+          displayName: az keyvault certificate pending
+          items: []
+      - name: key
+        uid: az_keyvault_key
+        displayName: az keyvault key
+        items: []
+      - name: secret
+        uid: az_keyvault_secret
+        displayName: az keyvault secret
+        items: []
+  - name: Azure Kubernetes Configuration Service
     items:
-    - name: Overview
-      uid: az_provider
-      displayName: az provider
-    - name: list
-      uid: az_provider_list
-      displayName: az provider list
-    - name: register
-      uid: az_provider_register
-      displayName: az provider register
-    - name: show
-      uid: az_provider_show
-      displayName: az provider show
-    - name: unregister
-      uid: az_provider_unregister
-      displayName: az provider unregister
-    - name: operation
-      displayName: az provider operation
-      items:
-      - name: Overview
-        uid: az_provider_operation
-        displayName: az provider operation
-      - name: list
-        uid: az_provider_operation_list
-        displayName: az provider operation list
-      - name: show
-        uid: az_provider_operation_show
-        displayName: az provider operation show
-  - name: Resource tags
-    displayName: az tag
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Configuration_Service
+      displayName: Azure Kubernetes Configuration Service
+    - name: k8sconfiguration
+      uid: az_k8sconfiguration
+      displayName: az k8sconfiguration
+      items: []
+    - name: k8s-configuration
+      uid: az_k8s-configuration
+      displayName: az k8s-configuration
+      items: []
+  - name: Azure Kubernetes Extension Service
     items:
-    - name: Overview
-      uid: az_tag
-      displayName: az tag
-    - name: add-value
-      uid: az_tag_add_value
-      displayName: az tag add-value
-    - name: create
-      uid: az_tag_create
-      displayName: az tag create
-    - name: delete
-      uid: az_tag_delete
-      displayName: az tag delete
-    - name: list
-      uid: az_tag_list
-      displayName: az tag list
-    - name: remove-value
-      uid: az_tag_remove_value
-      displayName: az tag remove-value
-  - name: Resources
-    displayName: az resource
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Extension_Service
+      displayName: Azure Kubernetes Extension Service
+    - name: k8s-extension
+      uid: az_k8s-extension
+      displayName: az k8s-extension
+      items: []
+  - name: Azure Kubernetes Service
     items:
-    - name: Overview
-      uid: az_resource
-      displayName: az resource
-    - name: create
-      uid: az_resource_create
-      displayName: az resource create
-    - name: delete
-      uid: az_resource_delete
-      displayName: az resource delete
-    - name: invoke-action
-      uid: az_resource_invoke_action
-      displayName: az resource invoke-action
-    - name: list
-      uid: az_resource_list
-      displayName: az resource list
-    - name: move
-      uid: az_resource_move
-      displayName: az resource move
-    - name: show
-      uid: az_resource_show
-      displayName: az resource show
-    - name: tag
-      uid: az_resource_tag
-      displayName: az resource tag
-    - name: update
-      uid: az_resource_update
-      displayName: az resource update
-    - name: wait
-      uid: az_resource_wait
-      displayName: az resource wait
-    - name: Links
-      displayName: az resource link
-      items:
-      - name: Overview
-        uid: az_resource_link
-        displayName: az resource link
-      - name: create
-        uid: az_resource_link_create
-        displayName: az resource link create
-      - name: delete
-        uid: az_resource_link_delete
-        displayName: az resource link delete
-      - name: list
-        uid: az_resource_link_list
-        displayName: az resource link list
-      - name: show
-        uid: az_resource_link_show
-        displayName: az resource link show
-      - name: update
-        uid: az_resource_link_update
-        displayName: az resource link update
-    - name: lock
-      displayName: az resource lock
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Service
+      displayName: Azure Kubernetes Service
+    - name: aks
       items:
-      - name: Overview
-        uid: az_resource_lock
-        displayName: az resource lock
-      - name: create
-        uid: az_resource_lock_create
-        displayName: az resource lock create
-      - name: delete
-        uid: az_resource_lock_delete
-        displayName: az resource lock delete
-      - name: list
-        uid: az_resource_lock_list
-        displayName: az resource lock list
-      - name: show
-        uid: az_resource_lock_show
-        displayName: az resource lock show
-      - name: update
-        uid: az_resource_lock_update
-        displayName: az resource lock update
-  - name: Roles
-    displayName: az role
+      - name: Summary
+        uid: az_aks
+        displayName: az aks
+      - name: app
+        uid: az_aks_app
+        displayName: az aks app
+        items: []
+      - name: command
+        uid: az_aks_command
+        displayName: az aks command
+        items: []
+      - name: maintenanceconfiguration
+        uid: az_aks_maintenanceconfiguration
+        displayName: az aks maintenanceconfiguration
+        items: []
+      - name: nodepool
+        uid: az_aks_nodepool
+        displayName: az aks nodepool
+        items: []
+      - name: pod-identity
+        items:
+        - name: Summary
+          uid: az_aks_pod-identity
+          displayName: az aks pod-identity
+        - name: exception
+          uid: az_aks_pod-identity_exception
+          displayName: az aks pod-identity exception
+          items: []
+    - name: connectedk8s
+      uid: az_connectedk8s
+      displayName: az connectedk8s
+      items: []
+  - name: Azure Lab Services
     items:
-    - name: Overview
-      uid: az_role
-      displayName: az role
-    - name: Assignments
-      displayName: az role assignment
-      items:
-      - name: Overview
-        uid: az_role_assignment
-        displayName: az role assignment
-      - name: create
-        uid: az_role_assignment_create
-        displayName: az role assignment create
-      - name: delete
-        uid: az_role_assignment_delete
-        displayName: az role assignment delete
-      - name: list
-        uid: az_role_assignment_list
-        displayName: az role assignment list
-      - name: list-changelogs
-        uid: az_role_assignment_list_changelogs
-        displayName: az role assignment list-changelogs
-    - name: Definitions
-      displayName: az role definition
+    - name: Summary
+      uid: sp-Azure_Lab_Services
+      displayName: Azure Lab Services
+    - name: hack
+      uid: az_hack
+      displayName: az hack
+      items: []
+  - name: Azure Logic Apps
+    items:
+    - name: Summary
+      uid: sp-Azure_Logic_Apps
+      displayName: Azure Logic Apps
+    - name: logic
       items:
-      - name: Overview
-        uid: az_role_definition
-        displayName: az role definition
-      - name: create
-        uid: az_role_definition_create
-        displayName: az role definition create
-      - name: delete
-        uid: az_role_definition_delete
-        displayName: az role definition delete
-      - name: list
-        uid: az_role_definition_list
-        displayName: az role definition list
-      - name: update
-        uid: az_role_definition_update
-        displayName: az role definition update
-  - name: Storage
-    displayName: az storage
+      - name: Summary
+        uid: az_logic
+        displayName: az logic
+      - name: integration-account
+        uid: az_logic_integration-account
+        displayName: az logic integration-account
+        items: []
+      - name: workflow
+        uid: az_logic_workflow
+        displayName: az logic workflow
+        items: []
+  - name: Azure Machine Learning
     items:
-    - name: Overview
-      uid: az_storage
-      displayName: az storage
-    - name: copy
-      uid: az_storage_copy
-      displayName: az storage copy
-    - name: remove
-      uid: az_storage_remove
-      displayName: az storage remove
-    - name: Accounts
-      displayName: az storage account
+    - name: Summary
+      uid: sp-Azure_Machine_Learning
+      displayName: Azure Machine Learning
+    - name: ml
       items:
-      - name: Overview
-        uid: az_storage_account
-        displayName: az storage account
-      - name: check-name
-        uid: az_storage_account_check_name
-        displayName: az storage account check-name
-      - name: create
-        uid: az_storage_account_create
-        displayName: az storage account create
-      - name: delete
-        uid: az_storage_account_delete
-        displayName: az storage account delete
-      - name: generate-sas
-        uid: az_storage_account_generate_sas
-        displayName: az storage account generate-sas
-      - name: list
-        uid: az_storage_account_list
-        displayName: az storage account list
-      - name: show
-        uid: az_storage_account_show
-        displayName: az storage account show
-      - name: show-connection-string
-        uid: az_storage_account_show_connection_string
-        displayName: az storage account show-connection-string
-      - name: show-usage
-        uid: az_storage_account_show_usage
-        displayName: az storage account show-usage
-      - name: Keys
-        displayName: az storage account keys
-        items:
-        - name: Overview
-          uid: az_storage_account_keys
-          displayName: az storage account keys
-        - name: list
-          uid: az_storage_account_keys_list
-          displayName: az storage account keys list
-        - name: renew
-          uid: az_storage_account_keys_renew
-          displayName: az storage account keys renew
-    - name: Blob
-      displayName: az storage blob
+      - name: Summary
+        uid: az_ml
+        displayName: az ml
+      - name: code
+        uid: az_ml_code
+        displayName: az ml code
+        items: []
+      - name: compute
+        uid: az_ml_compute
+        displayName: az ml compute
+        items: []
+      - name: data
+        uid: az_ml_data
+        displayName: az ml data
+        items: []
+      - name: datastore
+        uid: az_ml_datastore
+        displayName: az ml datastore
+        items: []
+      - name: endpoint
+        uid: az_ml_endpoint
+        displayName: az ml endpoint
+        items: []
+      - name: environment
+        uid: az_ml_environment
+        displayName: az ml environment
+        items: []
+      - name: job
+        uid: az_ml_job
+        displayName: az ml job
+        items: []
+      - name: model
+        uid: az_ml_model
+        displayName: az ml model
+        items: []
+      - name: workspace
+        uid: az_ml_workspace
+        displayName: az ml workspace
+        items: []
+    - name: ml(v1)
       items:
-      - name: Overview
-        uid: az_storage_blob
-        displayName: az storage blob
-      - name: delete
-        uid: az_storage_blob_delete
-        displayName: az storage blob delete
-      - name: delete-batch
-        uid: az_storage_blob_delete_batch
-        displayName: az storage blob delete-batch
-      - name: download
-        uid: az_storage_blob_download
-        displayName: az storage blob download
-      - name: download-batch
-        uid: az_storage_blob_download_batch
-        displayName: az storage blob download-batch
-      - name: exists
-        uid: az_storage_blob_exists
-        displayName: az storage blob exists
-      - name: generate-sas
-        uid: az_storage_blob_generate_sas
-        displayName: az storage blob generate-sas
-      - name: list
-        uid: az_storage_blob_list
-        displayName: az storage blob list
-      - name: set-tier
-        uid: az_storage_blob_set_tier
-        displayName: az storage blob set-tier
-      - name: show
-        uid: az_storage_blob_show
-        displayName: az storage blob show
-      - name: snapshot
-        uid: az_storage_blob_snapshot
-        displayName: az storage blob snapshot
-      - name: sync
-        uid: az_storage_blob_sync
-        displayName: az storage blob sync
-      - name: update
-        uid: az_storage_blob_update
-        displayName: az storage blob update
-      - name: upload
-        uid: az_storage_blob_upload
-        displayName: az storage blob upload
-      - name: upload-batch
-        uid: az_storage_blob_upload_batch
-        displayName: az storage blob upload-batch
-      - name: url
-        uid: az_storage_blob_url
-        displayName: az storage blob url
-      - name: Copy operations
-        displayName: az storage blob copy
+      - name: Summary
+        uid: az_ml(v1)
+        displayName: az ml
+      - name: computetarget
         items:
-        - name: Overview
-          uid: az_storage_blob_copy
-          displayName: az storage blob copy
-        - name: cancel
-          uid: az_storage_blob_copy_cancel
-          displayName: az storage blob copy cancel
-        - name: start
-          uid: az_storage_blob_copy_start
-          displayName: az storage blob copy start
-        - name: start-batch
-          uid: az_storage_blob_copy_start_batch
-          displayName: az storage blob copy start-batch
-      - name: Leases
-        displayName: az storage blob lease
-        items:
-        - name: Overview
-          uid: az_storage_blob_lease
-          displayName: az storage blob lease
-        - name: acquire
-          uid: az_storage_blob_lease_acquire
-          displayName: az storage blob lease acquire
-        - name: break
-          uid: az_storage_blob_lease_break
-          displayName: az storage blob lease break
-        - name: change
-          uid: az_storage_blob_lease_change
-          displayName: az storage blob lease change
-        - name: release
-          uid: az_storage_blob_lease_release
-          displayName: az storage blob lease release
-        - name: renew
-          uid: az_storage_blob_lease_renew
-          displayName: az storage blob lease renew
-      - name: Metadata
-        displayName: az storage blob metadata
-        items:
-        - name: Overview
-          uid: az_storage_blob_metadata
-          displayName: az storage blob metadata
-        - name: show
-          uid: az_storage_blob_metadata_show
-          displayName: az storage blob metadata show
-        - name: update
-          uid: az_storage_blob_metadata_update
-          displayName: az storage blob metadata update
-      - name: Service properties
-        displayName: az storage blob service-properties
-        items:
-        - name: Overview
-          uid: az_storage_blob_service_properties
-          displayName: az storage blob service-properties
-        - name: show
-          uid: az_storage_blob_service_properties_show
-          displayName: az storage blob service-properties show
-        - name: update
-          uid: az_storage_blob_service_properties_update
-          displayName: az storage blob service-properties update
-    - name: Containers
-      displayName: az storage container
-      items:
-      - name: Overview
-        uid: az_storage_container
-        displayName: az storage container
-      - name: create
-        uid: az_storage_container_create
-        displayName: az storage container create
-      - name: delete
-        uid: az_storage_container_delete
-        displayName: az storage container delete
-      - name: exists
-        uid: az_storage_container_exists
-        displayName: az storage container exists
-      - name: generate-sas
-        uid: az_storage_container_generate_sas
-        displayName: az storage container generate-sas
-      - name: list
-        uid: az_storage_container_list
-        displayName: az storage container list
-      - name: set-permission
-        uid: az_storage_container_set_permission
-        displayName: az storage container set-permission
-      - name: show
-        uid: az_storage_container_show
-        displayName: az storage container show
-      - name: show-permission
-        uid: az_storage_container_show_permission
-        displayName: az storage container show-permission
-      - name: Leases
-        displayName: az storage container lease
-        items:
-        - name: Overview
-          uid: az_storage_container_lease
-          displayName: az storage container lease
-        - name: acquire
-          uid: az_storage_container_lease_acquire
-          displayName: az storage container lease acquire
-        - name: break
-          uid: az_storage_container_lease_break
-          displayName: az storage container lease break
-        - name: change
-          uid: az_storage_container_lease_change
-          displayName: az storage container lease change
-        - name: release
-          uid: az_storage_container_lease_release
-          displayName: az storage container lease release
-        - name: renew
-          uid: az_storage_container_lease_renew
-          displayName: az storage container lease renew
-      - name: Metadata
-        displayName: az storage container metadata
-        items:
-        - name: Overview
-          uid: az_storage_container_metadata
-          displayName: az storage container metadata
-        - name: show
-          uid: az_storage_container_metadata_show
-          displayName: az storage container metadata show
-        - name: update
-          uid: az_storage_container_metadata_update
-          displayName: az storage container metadata update
-      - name: Policies
-        displayName: az storage container policy
-        items:
-        - name: Overview
-          uid: az_storage_container_policy
-          displayName: az storage container policy
-        - name: create
-          uid: az_storage_container_policy_create
-          displayName: az storage container policy create
-        - name: delete
-          uid: az_storage_container_policy_delete
-          displayName: az storage container policy delete
-        - name: list
-          uid: az_storage_container_policy_list
-          displayName: az storage container policy list
-        - name: show
-          uid: az_storage_container_policy_show
-          displayName: az storage container policy show
-    - name: Cross-origin resource sharing
-      displayName: az storage cors
-      items:
-      - name: Overview
-        uid: az_storage_cors
-        displayName: az storage cors
-      - name: add
-        uid: az_storage_cors_add
-        displayName: az storage cors add
-      - name: clear
-        uid: az_storage_cors_clear
-        displayName: az storage cors clear
-      - name: list
-        uid: az_storage_cors_list
-        displayName: az storage cors list
-    - name: Directories
-      displayName: az storage directory
-      items:
-      - name: Overview
-        uid: az_storage_directory
-        displayName: az storage directory
-      - name: create
-        uid: az_storage_directory_create
-        displayName: az storage directory create
-      - name: delete
-        uid: az_storage_directory_delete
-        displayName: az storage directory delete
-      - name: exists
-        uid: az_storage_directory_exists
-        displayName: az storage directory exists
-      - name: list
-        uid: az_storage_directory_list
-        displayName: az storage directory list
-      - name: show
-        uid: az_storage_directory_show
-        displayName: az storage directory show
-      - name: Metadata
-        displayName: az storage directory metadata
-        items:
-        - name: Overview
-          uid: az_storage_directory_metadata
-          displayName: az storage directory metadata
-        - name: show
-          uid: az_storage_directory_metadata_show
-          displayName: az storage directory metadata show
-        - name: update
-          uid: az_storage_directory_metadata_update
-          displayName: az storage directory metadata update
-    - name: File shares
-      displayName: az storage share
-      items:
-      - name: Overview
-        uid: az_storage_share
-        displayName: az storage share
-      - name: create
-        uid: az_storage_share_create
-        displayName: az storage share create
-      - name: delete
-        uid: az_storage_share_delete
-        displayName: az storage share delete
-      - name: exists
-        uid: az_storage_share_exists
-        displayName: az storage share exists
-      - name: generate-sas
-        uid: az_storage_share_generate_sas
-        displayName: az storage share generate-sas
-      - name: list
-        uid: az_storage_share_list
-        displayName: az storage share list
-      - name: show
-        uid: az_storage_share_show
-        displayName: az storage share show
-      - name: stats
-        uid: az_storage_share_stats
-        displayName: az storage share stats
-      - name: update
-        uid: az_storage_share_update
-        displayName: az storage share update
-      - name: url
-        uid: az_storage_share_url
-        displayName: az storage share url
-      - name: Metadata
-        displayName: az storage share metadata
-        items:
-        - name: Overview
-          uid: az_storage_share_metadata
-          displayName: az storage share metadata
-        - name: show
-          uid: az_storage_share_metadata_show
-          displayName: az storage share metadata show
-        - name: update
-          uid: az_storage_share_metadata_update
-          displayName: az storage share metadata update
-      - name: Policies
-        displayName: az storage share policy
-        items:
-        - name: Overview
-          uid: az_storage_share_policy
-          displayName: az storage share policy
-        - name: create
-          uid: az_storage_share_policy_create
-          displayName: az storage share policy create
-        - name: delete
-          uid: az_storage_share_policy_delete
-          displayName: az storage share policy delete
-        - name: list
-          uid: az_storage_share_policy_list
-          displayName: az storage share policy list
-        - name: show
-          uid: az_storage_share_policy_show
-          displayName: az storage share policy show
-        - name: update
-          uid: az_storage_share_policy_update
-          displayName: az storage share policy update
-    - name: Files
-      displayName: az storage file
-      items:
-      - name: Overview
-        uid: az_storage_file
-        displayName: az storage file
-      - name: delete
-        uid: az_storage_file_delete
-        displayName: az storage file delete
-      - name: delete-batch
-        uid: az_storage_file_delete_batch
-        displayName: az storage file delete-batch
-      - name: download
-        uid: az_storage_file_download
-        displayName: az storage file download
-      - name: download-batch
-        uid: az_storage_file_download_batch
-        displayName: az storage file download-batch
-      - name: exists
-        uid: az_storage_file_exists
-        displayName: az storage file exists
-      - name: generate-sas
-        uid: az_storage_file_generate_sas
-        displayName: az storage file generate-sas
-      - name: list
-        uid: az_storage_file_list
-        displayName: az storage file list
-      - name: resize
-        uid: az_storage_file_resize
-        displayName: az storage file resize
-      - name: show
-        uid: az_storage_file_show
-        displayName: az storage file show
-      - name: update
-        uid: az_storage_file_update
-        displayName: az storage file update
-      - name: upload
-        uid: az_storage_file_upload
-        displayName: az storage file upload
-      - name: upload-batch
-        uid: az_storage_file_upload_batch
-        displayName: az storage file upload-batch
-      - name: url
-        uid: az_storage_file_url
-        displayName: az storage file url
-      - name: Copy operations
-        displayName: az storage file copy
-        items:
-        - name: Overview
-          uid: az_storage_file_copy
-          displayName: az storage file copy
-        - name: cancel
-          uid: az_storage_file_copy_cancel
-          displayName: az storage file copy cancel
-        - name: start
-          uid: az_storage_file_copy_start
-          displayName: az storage file copy start
-        - name: start-batch
-          uid: az_storage_file_copy_start_batch
-          displayName: az storage file copy start-batch
-      - name: Metadata
-        displayName: az storage file metadata
-        items:
-        - name: Overview
-          uid: az_storage_file_metadata
-          displayName: az storage file metadata
-        - name: show
-          uid: az_storage_file_metadata_show
-          displayName: az storage file metadata show
-        - name: update
-          uid: az_storage_file_metadata_update
-          displayName: az storage file metadata update
-    - name: Logging
-      displayName: az storage logging
-      items:
-      - name: Overview
-        uid: az_storage_logging
-        displayName: az storage logging
-      - name: off
-        uid: az_storage_logging_off
-        displayName: az storage logging off
-      - name: show
-        uid: az_storage_logging_show
-        displayName: az storage logging show
-      - name: update
-        uid: az_storage_logging_update
-        displayName: az storage logging update
-    - name: Messages
-      displayName: az storage message
-      items:
-      - name: Overview
-        uid: az_storage_message
-        displayName: az storage message
-      - name: clear
-        uid: az_storage_message_clear
-        displayName: az storage message clear
-      - name: delete
-        uid: az_storage_message_delete
-        displayName: az storage message delete
-      - name: get
-        uid: az_storage_message_get
-        displayName: az storage message get
-      - name: peek
-        uid: az_storage_message_peek
-        displayName: az storage message peek
-      - name: put
-        uid: az_storage_message_put
-        displayName: az storage message put
-      - name: update
-        uid: az_storage_message_update
-        displayName: az storage message update
-    - name: Metrics
-      displayName: az storage metrics
-      items:
-      - name: Overview
-        uid: az_storage_metrics
-        displayName: az storage metrics
-      - name: show
-        uid: az_storage_metrics_show
-        displayName: az storage metrics show
-      - name: update
-        uid: az_storage_metrics_update
-        displayName: az storage metrics update
-    - name: Queues
-      displayName: az storage queue
-      items:
-      - name: Overview
-        uid: az_storage_queue
-        displayName: az storage queue
-      - name: create
-        uid: az_storage_queue_create
-        displayName: az storage queue create
-      - name: delete
-        uid: az_storage_queue_delete
-        displayName: az storage queue delete
-      - name: exists
-        uid: az_storage_queue_exists
-        displayName: az storage queue exists
-      - name: generate-sas
-        uid: az_storage_queue_generate_sas
-        displayName: az storage queue generate-sas
-      - name: list
-        uid: az_storage_queue_list
-        displayName: az storage queue list
-      - name: Metadata
-        displayName: az storage queue metadata
-        items:
-        - name: Overview
-          uid: az_storage_queue_metadata
-          displayName: az storage queue metadata
-        - name: show
-          uid: az_storage_queue_metadata_show
-          displayName: az storage queue metadata show
-        - name: update
-          uid: az_storage_queue_metadata_update
-          displayName: az storage queue metadata update
-      - name: Policies
-        displayName: az storage queue policy
-        items:
-        - name: Overview
-          uid: az_storage_queue_policy
-          displayName: az storage queue policy
-        - name: create
-          uid: az_storage_queue_policy_create
-          displayName: az storage queue policy create
-        - name: delete
-          uid: az_storage_queue_policy_delete
-          displayName: az storage queue policy delete
-        - name: list
-          uid: az_storage_queue_policy_list
-          displayName: az storage queue policy list
-        - name: show
-          uid: az_storage_queue_policy_show
-          displayName: az storage queue policy show
-        - name: update
-          uid: az_storage_queue_policy_update
-          displayName: az storage queue policy update
-    - name: Table storage entities
-      displayName: az storage entity
-      items:
-      - name: Overview
-        uid: az_storage_entity
-        displayName: az storage entity
-      - name: delete
-        uid: az_storage_entity_delete
-        displayName: az storage entity delete
-      - name: insert
-        uid: az_storage_entity_insert
-        displayName: az storage entity insert
-      - name: merge
-        uid: az_storage_entity_merge
-        displayName: az storage entity merge
-      - name: query
-        uid: az_storage_entity_query
-        displayName: az storage entity query
-      - name: replace
-        uid: az_storage_entity_replace
-        displayName: az storage entity replace
-      - name: show
-        uid: az_storage_entity_show
-        displayName: az storage entity show
-    - name: Tables
-      displayName: az storage table
-      items:
-      - name: Overview
-        uid: az_storage_table
-        displayName: az storage table
-      - name: create
-        uid: az_storage_table_create
-        displayName: az storage table create
-      - name: delete
-        uid: az_storage_table_delete
-        displayName: az storage table delete
-      - name: exists
-        uid: az_storage_table_exists
-        displayName: az storage table exists
-      - name: generate-sas
-        uid: az_storage_table_generate_sas
-        displayName: az storage table generate-sas
-      - name: list
-        uid: az_storage_table_list
-        displayName: az storage table list
-      - name: Policies
-        displayName: az storage table policy
-        items:
-        - name: Overview
-          uid: az_storage_table_policy
-          displayName: az storage table policy
-        - name: create
-          uid: az_storage_table_policy_create
-          displayName: az storage table policy create
-        - name: delete
-          uid: az_storage_table_policy_delete
-          displayName: az storage table policy delete
-        - name: list
-          uid: az_storage_table_policy_list
-          displayName: az storage table policy list
-        - name: show
-          uid: az_storage_table_policy_show
-          displayName: az storage table policy show
-        - name: update
-          uid: az_storage_table_policy_update
-          displayName: az storage table policy update
-  - name: Subscriptions
-    displayName: az account
-    items:
-    - name: Overview
-      uid: az_account
-      displayName: az account
-    - name: clear
-      uid: az_account_clear
-      displayName: az account clear
-    - name: get-access-token
-      uid: az_account_get_access_token
-      displayName: az account get-access-token
-    - name: list
-      uid: az_account_list
-      displayName: az account list
-    - name: list-locations
-      uid: az_account_list_locations
-      displayName: az account list-locations
-    - name: set
-      uid: az_account_set
-      displayName: az account set
-    - name: show
-      uid: az_account_show
-      displayName: az account show
-    - name: lock
-      displayName: az account lock
-      items:
-      - name: Overview
-        uid: az_account_lock
-        displayName: az account lock
-      - name: create
-        uid: az_account_lock_create
-        displayName: az account lock create
-      - name: delete
-        uid: az_account_lock_delete
-        displayName: az account lock delete
-      - name: list
-        uid: az_account_lock_list
-        displayName: az account lock list
-      - name: show
-        uid: az_account_lock_show
-        displayName: az account lock show
-      - name: update
-        uid: az_account_lock_update
-        displayName: az account lock update
-    - name: management-group
-      displayName: az account management-group
-      items:
-      - name: Overview
-        uid: az_account_management_group
-        displayName: az account management-group
-      - name: create
-        uid: az_account_management_group_create
-        displayName: az account management-group create
-      - name: delete
-        uid: az_account_management_group_delete
-        displayName: az account management-group delete
-      - name: list
-        uid: az_account_management_group_list
-        displayName: az account management-group list
-      - name: show
-        uid: az_account_management_group_show
-        displayName: az account management-group show
-      - name: update
-        uid: az_account_management_group_update
-        displayName: az account management-group update
-      - name: subscription
-        displayName: az account management-group subscription
-        items:
-        - name: Overview
-          uid: az_account_management_group_subscription
-          displayName: az account management-group subscription
-        - name: add
-          uid: az_account_management_group_subscription_add
-          displayName: az account management-group subscription add
-        - name: remove
-          uid: az_account_management_group_subscription_remove
-          displayName: az account management-group subscription remove
-  - name: VM Images
-    displayName: az image
-    items:
-    - name: Overview
-      uid: az_image
-      displayName: az image
-    - name: builder
-      displayName: az image builder
-      items:
-      - name: Overview
-        uid: az_image_builder
-        displayName: az image builder
-      - name: create
-        uid: az_image_builder_create
-        displayName: az image builder create
-      - name: delete
-        uid: az_image_builder_delete
-        displayName: az image builder delete
-      - name: list
-        uid: az_image_builder_list
-        displayName: az image builder list
-      - name: run
-        uid: az_image_builder_run
-        displayName: az image builder run
-      - name: show
-        uid: az_image_builder_show
-        displayName: az image builder show
-      - name: show-runs
-        uid: az_image_builder_show_runs
-        displayName: az image builder show-runs
-      - name: update
-        uid: az_image_builder_update
-        displayName: az image builder update
-      - name: wait
-        uid: az_image_builder_wait
-        displayName: az image builder wait
-      - name: customizer
-        displayName: az image builder customizer
-        items:
-        - name: Overview
-          uid: az_image_builder_customizer
-          displayName: az image builder customizer
-        - name: add
-          uid: az_image_builder_customizer_add
-          displayName: az image builder customizer add
-        - name: clear
-          uid: az_image_builder_customizer_clear
-          displayName: az image builder customizer clear
-        - name: remove
-          uid: az_image_builder_customizer_remove
-          displayName: az image builder customizer remove
-      - name: output
-        displayName: az image builder output
-        items:
-        - name: Overview
-          uid: az_image_builder_output
-          displayName: az image builder output
-        - name: add
-          uid: az_image_builder_output_add
-          displayName: az image builder output add
-        - name: clear
-          uid: az_image_builder_output_clear
-          displayName: az image builder output clear
-        - name: remove
-          uid: az_image_builder_output_remove
-          displayName: az image builder output remove
-  - name: VM Scale Sets
-    displayName: az vmss
-    items:
-    - name: Overview
-      uid: az_vmss
-      displayName: az vmss
-    - name: create
-      uid: az_vmss_create
-      displayName: az vmss create
-    - name: deallocate
-      uid: az_vmss_deallocate
-      displayName: az vmss deallocate
-    - name: delete
-      uid: az_vmss_delete
-      displayName: az vmss delete
-    - name: delete-instances
-      uid: az_vmss_delete_instances
-      displayName: az vmss delete-instances
-    - name: get-instance-view
-      uid: az_vmss_get_instance_view
-      displayName: az vmss get-instance-view
-    - name: list
-      uid: az_vmss_list
-      displayName: az vmss list
-    - name: list-instance-connection-info
-      uid: az_vmss_list_instance_connection_info
-      displayName: az vmss list-instance-connection-info
-    - name: list-instance-public-ips
-      uid: az_vmss_list_instance_public_ips
-      displayName: az vmss list-instance-public-ips
-    - name: list-instances
-      uid: az_vmss_list_instances
-      displayName: az vmss list-instances
-    - name: list-skus
-      uid: az_vmss_list_skus
-      displayName: az vmss list-skus
-    - name: restart
-      uid: az_vmss_restart
-      displayName: az vmss restart
-    - name: scale
-      uid: az_vmss_scale
-      displayName: az vmss scale
-    - name: set-orchestration-service-state
-      uid: az_vmss_set_orchestration_service_state
-      displayName: az vmss set-orchestration-service-state
-    - name: show
-      uid: az_vmss_show
-      displayName: az vmss show
-    - name: start
-      uid: az_vmss_start
-      displayName: az vmss start
-    - name: stop
-      uid: az_vmss_stop
-      displayName: az vmss stop
-    - name: update
-      uid: az_vmss_update
-      displayName: az vmss update
-    - name: update-instances
-      uid: az_vmss_update_instances
-      displayName: az vmss update-instances
-    - name: wait
-      uid: az_vmss_wait
-      displayName: az vmss wait
-    - name: Diagnostics
-      displayName: az vmss diagnostics
-      items:
-      - name: Overview
-        uid: az_vmss_diagnostics
-        displayName: az vmss diagnostics
-      - name: get-default-config
-        uid: az_vmss_diagnostics_get_default_config
-        displayName: az vmss diagnostics get-default-config
-      - name: set
-        uid: az_vmss_diagnostics_set
-        displayName: az vmss diagnostics set
-    - name: Extensions
-      displayName: az vmss extension
-      items:
-      - name: Overview
-        uid: az_vmss_extension
-        displayName: az vmss extension
-      - name: delete
-        uid: az_vmss_extension_delete
-        displayName: az vmss extension delete
-      - name: list
-        uid: az_vmss_extension_list
-        displayName: az vmss extension list
-      - name: set
-        uid: az_vmss_extension_set
-        displayName: az vmss extension set
-      - name: show
-        uid: az_vmss_extension_show
-        displayName: az vmss extension show
-      - name: Images
-        displayName: az vmss extension image
-        items:
-        - name: Overview
-          uid: az_vmss_extension_image
-          displayName: az vmss extension image
-        - name: list
-          uid: az_vmss_extension_image_list
-          displayName: az vmss extension image list
-        - name: list-names
-          uid: az_vmss_extension_image_list_names
-          displayName: az vmss extension image list-names
-        - name: list-versions
-          uid: az_vmss_extension_image_list_versions
-          displayName: az vmss extension image list-versions
-        - name: show
-          uid: az_vmss_extension_image_show
-          displayName: az vmss extension image show
-    - name: Network interfaces
-      displayName: az vmss nic
-      items:
-      - name: Overview
-        uid: az_vmss_nic
-        displayName: az vmss nic
-      - name: list
-        uid: az_vmss_nic_list
-        displayName: az vmss nic list
-      - name: list-vm-nics
-        uid: az_vmss_nic_list_vm_nics
-        displayName: az vmss nic list-vm-nics
-      - name: show
-        uid: az_vmss_nic_show
-        displayName: az vmss nic show
-    - name: identity
-      displayName: az vmss identity
-      items:
-      - name: Overview
-        uid: az_vmss_identity
-        displayName: az vmss identity
-      - name: assign
-        uid: az_vmss_identity_assign
-        displayName: az vmss identity assign
-      - name: show
-        uid: az_vmss_identity_show
-        displayName: az vmss identity show
-  - name: Virtual Machines
-    displayName: az vm
-    items:
-    - name: Overview
-      uid: az_vm
-      displayName: az vm
-    - name: auto-shutdown
-      uid: az_vm_auto_shutdown
-      displayName: az vm auto-shutdown
-    - name: capture
-      uid: az_vm_capture
-      displayName: az vm capture
-    - name: create
-      uid: az_vm_create
-      displayName: az vm create
-    - name: deallocate
-      uid: az_vm_deallocate
-      displayName: az vm deallocate
-    - name: delete
-      uid: az_vm_delete
-      displayName: az vm delete
-    - name: generalize
-      uid: az_vm_generalize
-      displayName: az vm generalize
-    - name: get-instance-view
-      uid: az_vm_get_instance_view
-      displayName: az vm get-instance-view
-    - name: list
-      uid: az_vm_list
-      displayName: az vm list
-    - name: list-ip-addresses
-      uid: az_vm_list_ip_addresses
-      displayName: az vm list-ip-addresses
-    - name: list-sizes
-      uid: az_vm_list_sizes
-      displayName: az vm list-sizes
-    - name: list-usage
-      uid: az_vm_list_usage
-      displayName: az vm list-usage
-    - name: list-vm-resize-options
-      uid: az_vm_list_vm_resize_options
-      displayName: az vm list-vm-resize-options
-    - name: open-port
-      uid: az_vm_open_port
-      displayName: az vm open-port
-    - name: redeploy
-      uid: az_vm_redeploy
-      displayName: az vm redeploy
-    - name: resize
-      uid: az_vm_resize
-      displayName: az vm resize
-    - name: restart
-      uid: az_vm_restart
-      displayName: az vm restart
-    - name: show
-      uid: az_vm_show
-      displayName: az vm show
-    - name: start
-      uid: az_vm_start
-      displayName: az vm start
-    - name: stop
-      uid: az_vm_stop
-      displayName: az vm stop
-    - name: update
-      uid: az_vm_update
-      displayName: az vm update
-    - name: wait
-      uid: az_vm_wait
-      displayName: az vm wait
-    - name: Availability sets
-      displayName: az vm availability-set
-      items:
-      - name: Overview
-        uid: az_vm_availability_set
-        displayName: az vm availability-set
-      - name: create
-        uid: az_vm_availability_set_create
-        displayName: az vm availability-set create
-      - name: delete
-        uid: az_vm_availability_set_delete
-        displayName: az vm availability-set delete
-      - name: list
-        uid: az_vm_availability_set_list
-        displayName: az vm availability-set list
-      - name: list-sizes
-        uid: az_vm_availability_set_list_sizes
-        displayName: az vm availability-set list-sizes
-      - name: show
-        uid: az_vm_availability_set_show
-        displayName: az vm availability-set show
-      - name: update
-        uid: az_vm_availability_set_update
-        displayName: az vm availability-set update
-    - name: Boot diagnostics
-      displayName: az vm boot-diagnostics
-      items:
-      - name: Overview
-        uid: az_vm_boot_diagnostics
-        displayName: az vm boot-diagnostics
-      - name: disable
-        uid: az_vm_boot_diagnostics_disable
-        displayName: az vm boot-diagnostics disable
-      - name: enable
-        uid: az_vm_boot_diagnostics_enable
-        displayName: az vm boot-diagnostics enable
-      - name: get-boot-log
-        uid: az_vm_boot_diagnostics_get_boot_log
-        displayName: az vm boot-diagnostics get-boot-log
-    - name: Diagnostics
-      displayName: az vm diagnostics
-      items:
-      - name: Overview
-        uid: az_vm_diagnostics
-        displayName: az vm diagnostics
-      - name: get-default-config
-        uid: az_vm_diagnostics_get_default_config
-        displayName: az vm diagnostics get-default-config
-      - name: set
-        uid: az_vm_diagnostics_set
-        displayName: az vm diagnostics set
-    - name: Encryption
-      displayName: az vm encryption
-      items:
-      - name: Overview
-        uid: az_vm_encryption
-        displayName: az vm encryption
-      - name: disable
-        uid: az_vm_encryption_disable
-        displayName: az vm encryption disable
-      - name: enable
-        uid: az_vm_encryption_enable
-        displayName: az vm encryption enable
-      - name: show
-        uid: az_vm_encryption_show
-        displayName: az vm encryption show
-    - name: Extensions
-      displayName: az vm extension
-      items:
-      - name: Overview
-        uid: az_vm_extension
-        displayName: az vm extension
-      - name: delete
-        uid: az_vm_extension_delete
-        displayName: az vm extension delete
-      - name: list
-        uid: az_vm_extension_list
-        displayName: az vm extension list
-      - name: set
-        uid: az_vm_extension_set
-        displayName: az vm extension set
-      - name: show
-        uid: az_vm_extension_show
-        displayName: az vm extension show
-      - name: wait
-        uid: az_vm_extension_wait
-        displayName: az vm extension wait
-      - name: Extension images
-        displayName: az vm extension image
-        items:
-        - name: Overview
-          uid: az_vm_extension_image
-          displayName: az vm extension image
-        - name: list
-          uid: az_vm_extension_image_list
-          displayName: az vm extension image list
-        - name: list-names
-          uid: az_vm_extension_image_list_names
-          displayName: az vm extension image list-names
-        - name: list-versions
-          uid: az_vm_extension_image_list_versions
-          displayName: az vm extension image list-versions
-        - name: show
-          uid: az_vm_extension_image_show
-          displayName: az vm extension image show
-    - name: Images
-      displayName: az vm image
-      items:
-      - name: Overview
-        uid: az_vm_image
-        displayName: az vm image
-      - name: accept-terms
-        uid: az_vm_image_accept_terms
-        displayName: az vm image accept-terms
-      - name: list
-        uid: az_vm_image_list
-        displayName: az vm image list
-      - name: list-offers
-        uid: az_vm_image_list_offers
-        displayName: az vm image list-offers
-      - name: list-publishers
-        uid: az_vm_image_list_publishers
-        displayName: az vm image list-publishers
-      - name: list-skus
-        uid: az_vm_image_list_skus
-        displayName: az vm image list-skus
-      - name: show
-        uid: az_vm_image_show
-        displayName: az vm image show
-      - name: terms
-        displayName: az vm image terms
-        items:
-        - name: Overview
-          uid: az_vm_image_terms
-          displayName: az vm image terms
-        - name: accept
-          uid: az_vm_image_terms_accept
-          displayName: az vm image terms accept
-        - name: cancel
-          uid: az_vm_image_terms_cancel
-          displayName: az vm image terms cancel
-        - name: show
-          uid: az_vm_image_terms_show
-          displayName: az vm image terms show
-    - name: Network interfaces
-      displayName: az vm nic
-      items:
-      - name: Overview
-        uid: az_vm_nic
-        displayName: az vm nic
-      - name: add
-        uid: az_vm_nic_add
-        displayName: az vm nic add
-      - name: list
-        uid: az_vm_nic_list
-        displayName: az vm nic list
-      - name: remove
-        uid: az_vm_nic_remove
-        displayName: az vm nic remove
-      - name: set
-        uid: az_vm_nic_set
-        displayName: az vm nic set
-      - name: show
-        uid: az_vm_nic_show
-        displayName: az vm nic show
-    - name: Unmanaged disks
-      displayName: az vm unmanaged-disk
-      items:
-      - name: Overview
-        uid: az_vm_unmanaged_disk
-        displayName: az vm unmanaged-disk
-      - name: attach
-        uid: az_vm_unmanaged_disk_attach
-        displayName: az vm unmanaged-disk attach
-      - name: detach
-        uid: az_vm_unmanaged_disk_detach
-        displayName: az vm unmanaged-disk detach
-      - name: list
-        uid: az_vm_unmanaged_disk_list
-        displayName: az vm unmanaged-disk list
-    - name: Users
-      displayName: az vm user
-      items:
-      - name: Overview
-        uid: az_vm_user
-        displayName: az vm user
-      - name: delete
-        uid: az_vm_user_delete
-        displayName: az vm user delete
-      - name: reset-ssh
-        uid: az_vm_user_reset_ssh
-        displayName: az vm user reset-ssh
-      - name: update
-        uid: az_vm_user_update
-        displayName: az vm user update
-    - name: identity
-      displayName: az vm identity
-      items:
-      - name: Overview
-        uid: az_vm_identity
-        displayName: az vm identity
-      - name: assign
-        uid: az_vm_identity_assign
-        displayName: az vm identity assign
-      - name: show
-        uid: az_vm_identity_show
-        displayName: az vm identity show
-    - name: monitor
-      displayName: az vm monitor
-      items:
-      - name: Overview
-        uid: az_vm_monitor
-        displayName: az vm monitor
-      - name: log
-        displayName: az vm monitor log
-        items:
-        - name: Overview
-          uid: az_vm_monitor_log
-          displayName: az vm monitor log
-        - name: show
-          uid: az_vm_monitor_log_show
-          displayName: az vm monitor log show
-    - name: secret
-      displayName: az vm secret
-      items:
-      - name: Overview
-        uid: az_vm_secret
-        displayName: az vm secret
-      - name: add
-        uid: az_vm_secret_add
-        displayName: az vm secret add
-      - name: format
-        uid: az_vm_secret_format
-        displayName: az vm secret format
-      - name: list
-        uid: az_vm_secret_list
-        displayName: az vm secret list
-      - name: remove
-        uid: az_vm_secret_remove
-        displayName: az vm secret remove
-  - name: appconfig
-    displayName: az appconfig
-    items:
-    - name: Overview
-      uid: az_appconfig
-      displayName: az appconfig
-    - name: create
-      uid: az_appconfig_create
-      displayName: az appconfig create
-    - name: delete
-      uid: az_appconfig_delete
-      displayName: az appconfig delete
-    - name: list
-      uid: az_appconfig_list
-      displayName: az appconfig list
-    - name: show
-      uid: az_appconfig_show
-      displayName: az appconfig show
-    - name: update
-      uid: az_appconfig_update
-      displayName: az appconfig update
-    - name: credential
-      displayName: az appconfig credential
-      items:
-      - name: Overview
-        uid: az_appconfig_credential
-        displayName: az appconfig credential
-      - name: list
-        uid: az_appconfig_credential_list
-        displayName: az appconfig credential list
-      - name: regenerate
-        uid: az_appconfig_credential_regenerate
-        displayName: az appconfig credential regenerate
-    - name: feature
-      displayName: az appconfig feature
-      items:
-      - name: Overview
-        uid: az_appconfig_feature
-        displayName: az appconfig feature
-      - name: delete
-        uid: az_appconfig_feature_delete
-        displayName: az appconfig feature delete
-      - name: disable
-        uid: az_appconfig_feature_disable
-        displayName: az appconfig feature disable
-      - name: enable
-        uid: az_appconfig_feature_enable
-        displayName: az appconfig feature enable
-      - name: list
-        uid: az_appconfig_feature_list
-        displayName: az appconfig feature list
-      - name: lock
-        uid: az_appconfig_feature_lock
-        displayName: az appconfig feature lock
-      - name: set
-        uid: az_appconfig_feature_set
-        displayName: az appconfig feature set
-      - name: show
-        uid: az_appconfig_feature_show
-        displayName: az appconfig feature show
-      - name: unlock
-        uid: az_appconfig_feature_unlock
-        displayName: az appconfig feature unlock
-      - name: filter
-        displayName: az appconfig feature filter
-        items:
-        - name: Overview
-          uid: az_appconfig_feature_filter
-          displayName: az appconfig feature filter
-        - name: add
-          uid: az_appconfig_feature_filter_add
-          displayName: az appconfig feature filter add
-        - name: delete
-          uid: az_appconfig_feature_filter_delete
-          displayName: az appconfig feature filter delete
-        - name: list
-          uid: az_appconfig_feature_filter_list
-          displayName: az appconfig feature filter list
-        - name: show
-          uid: az_appconfig_feature_filter_show
-          displayName: az appconfig feature filter show
-    - name: identity
-      displayName: az appconfig identity
-      items:
-      - name: Overview
-        uid: az_appconfig_identity
-        displayName: az appconfig identity
-      - name: assign
-        uid: az_appconfig_identity_assign
-        displayName: az appconfig identity assign
-      - name: remove
-        uid: az_appconfig_identity_remove
-        displayName: az appconfig identity remove
-      - name: show
-        uid: az_appconfig_identity_show
-        displayName: az appconfig identity show
-    - name: kv
-      displayName: az appconfig kv
-      items:
-      - name: Overview
-        uid: az_appconfig_kv
-        displayName: az appconfig kv
-      - name: delete
-        uid: az_appconfig_kv_delete
-        displayName: az appconfig kv delete
-      - name: export
-        uid: az_appconfig_kv_export
-        displayName: az appconfig kv export
-      - name: import
-        uid: az_appconfig_kv_import
-        displayName: az appconfig kv import
-      - name: list
-        uid: az_appconfig_kv_list
-        displayName: az appconfig kv list
-      - name: lock
-        uid: az_appconfig_kv_lock
-        displayName: az appconfig kv lock
-      - name: restore
-        uid: az_appconfig_kv_restore
-        displayName: az appconfig kv restore
-      - name: set
-        uid: az_appconfig_kv_set
-        displayName: az appconfig kv set
-      - name: set-keyvault
-        uid: az_appconfig_kv_set_keyvault
-        displayName: az appconfig kv set-keyvault
-      - name: show
-        uid: az_appconfig_kv_show
-        displayName: az appconfig kv show
-      - name: unlock
-        uid: az_appconfig_kv_unlock
-        displayName: az appconfig kv unlock
-    - name: revision
-      displayName: az appconfig revision
-      items:
-      - name: Overview
-        uid: az_appconfig_revision
-        displayName: az appconfig revision
-      - name: list
-        uid: az_appconfig_revision_list
-        displayName: az appconfig revision list
-  - name: artifacts
-    displayName: az artifacts
-    items:
-    - name: Overview
-      uid: az_artifacts
-      displayName: az artifacts
-    - name: universal
-      displayName: az artifacts universal
-      items:
-      - name: Overview
-        uid: az_artifacts_universal
-        displayName: az artifacts universal
-      - name: download
-        uid: az_artifacts_universal_download
-        displayName: az artifacts universal download
-      - name: publish
-        uid: az_artifacts_universal_publish
-        displayName: az artifacts universal publish
-  - name: boards
-    displayName: az boards
-    items:
-    - name: Overview
-      uid: az_boards
-      displayName: az boards
-    - name: query
-      uid: az_boards_query
-      displayName: az boards query
-    - name: area
-      displayName: az boards area
-      items:
-      - name: Overview
-        uid: az_boards_area
-        displayName: az boards area
-      - name: project
-        displayName: az boards area project
-        items:
-        - name: Overview
-          uid: az_boards_area_project
-          displayName: az boards area project
-        - name: create
-          uid: az_boards_area_project_create
-          displayName: az boards area project create
-        - name: delete
-          uid: az_boards_area_project_delete
-          displayName: az boards area project delete
-        - name: list
-          uid: az_boards_area_project_list
-          displayName: az boards area project list
-        - name: show
-          uid: az_boards_area_project_show
-          displayName: az boards area project show
-        - name: update
-          uid: az_boards_area_project_update
-          displayName: az boards area project update
-      - name: team
-        displayName: az boards area team
-        items:
-        - name: Overview
-          uid: az_boards_area_team
-          displayName: az boards area team
-        - name: add
-          uid: az_boards_area_team_add
-          displayName: az boards area team add
-        - name: list
-          uid: az_boards_area_team_list
-          displayName: az boards area team list
-        - name: remove
-          uid: az_boards_area_team_remove
-          displayName: az boards area team remove
-        - name: update
-          uid: az_boards_area_team_update
-          displayName: az boards area team update
-    - name: iteration
-      displayName: az boards iteration
-      items:
-      - name: Overview
-        uid: az_boards_iteration
-        displayName: az boards iteration
-      - name: project
-        displayName: az boards iteration project
-        items:
-        - name: Overview
-          uid: az_boards_iteration_project
-          displayName: az boards iteration project
-        - name: create
-          uid: az_boards_iteration_project_create
-          displayName: az boards iteration project create
-        - name: delete
-          uid: az_boards_iteration_project_delete
-          displayName: az boards iteration project delete
-        - name: list
-          uid: az_boards_iteration_project_list
-          displayName: az boards iteration project list
-        - name: show
-          uid: az_boards_iteration_project_show
-          displayName: az boards iteration project show
-        - name: update
-          uid: az_boards_iteration_project_update
-          displayName: az boards iteration project update
-      - name: team
-        displayName: az boards iteration team
-        items:
-        - name: Overview
-          uid: az_boards_iteration_team
-          displayName: az boards iteration team
-        - name: add
-          uid: az_boards_iteration_team_add
-          displayName: az boards iteration team add
-        - name: list
-          uid: az_boards_iteration_team_list
-          displayName: az boards iteration team list
-        - name: list-work-items
-          uid: az_boards_iteration_team_list_work_items
-          displayName: az boards iteration team list-work-items
-        - name: remove
-          uid: az_boards_iteration_team_remove
-          displayName: az boards iteration team remove
-        - name: set-backlog-iteration
-          uid: az_boards_iteration_team_set_backlog_iteration
-          displayName: az boards iteration team set-backlog-iteration
-        - name: set-default-iteration
-          uid: az_boards_iteration_team_set_default_iteration
-          displayName: az boards iteration team set-default-iteration
-        - name: show-backlog-iteration
-          uid: az_boards_iteration_team_show_backlog_iteration
-          displayName: az boards iteration team show-backlog-iteration
-        - name: show-default-iteration
-          uid: az_boards_iteration_team_show_default_iteration
-          displayName: az boards iteration team show-default-iteration
-    - name: work-item
-      displayName: az boards work-item
-      items:
-      - name: Overview
-        uid: az_boards_work_item
-        displayName: az boards work-item
-      - name: create
-        uid: az_boards_work_item_create
-        displayName: az boards work-item create
-      - name: delete
-        uid: az_boards_work_item_delete
-        displayName: az boards work-item delete
-      - name: show
-        uid: az_boards_work_item_show
-        displayName: az boards work-item show
-      - name: update
-        uid: az_boards_work_item_update
-        displayName: az boards work-item update
-      - name: relation
-        displayName: az boards work-item relation
-        items:
-        - name: Overview
-          uid: az_boards_work_item_relation
-          displayName: az boards work-item relation
-        - name: add
-          uid: az_boards_work_item_relation_add
-          displayName: az boards work-item relation add
-        - name: list-type
-          uid: az_boards_work_item_relation_list_type
-          displayName: az boards work-item relation list-type
-        - name: remove
-          uid: az_boards_work_item_relation_remove
-          displayName: az boards work-item relation remove
-        - name: show
-          uid: az_boards_work_item_relation_show
-          displayName: az boards work-item relation show
-  - name: cache
-    displayName: az cache
-    items:
-    - name: Overview
-      uid: az_cache
-      displayName: az cache
-    - name: delete
-      uid: az_cache_delete
-      displayName: az cache delete
-    - name: list
-      uid: az_cache_list
-      displayName: az cache list
-    - name: purge
-      uid: az_cache_purge
-      displayName: az cache purge
-    - name: show
-      uid: az_cache_show
-      displayName: az cache show
-  - name: deployment
-    displayName: az deployment
-    items:
-    - name: Overview
-      uid: az_deployment
-      displayName: az deployment
-    - name: group
-      displayName: az deployment group
-      items:
-      - name: Overview
-        uid: az_deployment_group
-        displayName: az deployment group
-      - name: cancel
-        uid: az_deployment_group_cancel
-        displayName: az deployment group cancel
-      - name: create
-        uid: az_deployment_group_create
-        displayName: az deployment group create
-      - name: delete
-        uid: az_deployment_group_delete
-        displayName: az deployment group delete
-      - name: export
-        uid: az_deployment_group_export
-        displayName: az deployment group export
-      - name: list
-        uid: az_deployment_group_list
-        displayName: az deployment group list
-      - name: show
-        uid: az_deployment_group_show
-        displayName: az deployment group show
-      - name: validate
-        uid: az_deployment_group_validate
-        displayName: az deployment group validate
-      - name: wait
-        uid: az_deployment_group_wait
-        displayName: az deployment group wait
-    - name: operation
-      displayName: az deployment operation
-      items:
-      - name: Overview
-        uid: az_deployment_operation
-        displayName: az deployment operation
-      - name: group
-        displayName: az deployment operation group
-        items:
-        - name: Overview
-          uid: az_deployment_operation_group
-          displayName: az deployment operation group
-        - name: list
-          uid: az_deployment_operation_group_list
-          displayName: az deployment operation group list
-        - name: show
-          uid: az_deployment_operation_group_show
-          displayName: az deployment operation group show
-  - name: deployment-scripts
-    displayName: az deployment-scripts
-    items:
-    - name: Overview
-      uid: az_deployment_scripts
-      displayName: az deployment-scripts
-    - name: delete
-      uid: az_deployment_scripts_delete
-      displayName: az deployment-scripts delete
-    - name: list
-      uid: az_deployment_scripts_list
-      displayName: az deployment-scripts list
-    - name: show
-      uid: az_deployment_scripts_show
-      displayName: az deployment-scripts show
-    - name: show-log
-      uid: az_deployment_scripts_show_log
-      displayName: az deployment-scripts show-log
-  - name: devops
-    displayName: az devops
-    items:
-    - name: Overview
-      uid: az_devops
-      displayName: az devops
-    - name: configure
-      uid: az_devops_configure
-      displayName: az devops configure
-    - name: feedback
-      uid: az_devops_feedback
-      displayName: az devops feedback
-    - name: invoke
-      uid: az_devops_invoke
-      displayName: az devops invoke
-    - name: login
-      uid: az_devops_login
-      displayName: az devops login
-    - name: logout
-      uid: az_devops_logout
-      displayName: az devops logout
-    - name: admin
-      displayName: az devops admin
-      items:
-      - name: Overview
-        uid: az_devops_admin
-        displayName: az devops admin
-      - name: banner
-        displayName: az devops admin banner
-        items:
-        - name: Overview
-          uid: az_devops_admin_banner
-          displayName: az devops admin banner
-        - name: add
-          uid: az_devops_admin_banner_add
-          displayName: az devops admin banner add
-        - name: list
-          uid: az_devops_admin_banner_list
-          displayName: az devops admin banner list
-        - name: remove
-          uid: az_devops_admin_banner_remove
-          displayName: az devops admin banner remove
-        - name: show
-          uid: az_devops_admin_banner_show
-          displayName: az devops admin banner show
-        - name: update
-          uid: az_devops_admin_banner_update
-          displayName: az devops admin banner update
-    - name: extension
-      displayName: az devops extension
-      items:
-      - name: Overview
-        uid: az_devops_extension
-        displayName: az devops extension
-      - name: disable
-        uid: az_devops_extension_disable
-        displayName: az devops extension disable
-      - name: enable
-        uid: az_devops_extension_enable
-        displayName: az devops extension enable
-      - name: install
-        uid: az_devops_extension_install
-        displayName: az devops extension install
-      - name: list
-        uid: az_devops_extension_list
-        displayName: az devops extension list
-      - name: search
-        uid: az_devops_extension_search
-        displayName: az devops extension search
-      - name: show
-        uid: az_devops_extension_show
-        displayName: az devops extension show
-      - name: uninstall
-        uid: az_devops_extension_uninstall
-        displayName: az devops extension uninstall
-    - name: project
-      displayName: az devops project
-      items:
-      - name: Overview
-        uid: az_devops_project
-        displayName: az devops project
-      - name: create
-        uid: az_devops_project_create
-        displayName: az devops project create
-      - name: delete
-        uid: az_devops_project_delete
-        displayName: az devops project delete
-      - name: list
-        uid: az_devops_project_list
-        displayName: az devops project list
-      - name: show
-        uid: az_devops_project_show
-        displayName: az devops project show
-    - name: security
-      displayName: az devops security
-      items:
-      - name: Overview
-        uid: az_devops_security
-        displayName: az devops security
-      - name: group
-        displayName: az devops security group
-        items:
-        - name: Overview
-          uid: az_devops_security_group
-          displayName: az devops security group
-        - name: create
-          uid: az_devops_security_group_create
-          displayName: az devops security group create
-        - name: delete
-          uid: az_devops_security_group_delete
-          displayName: az devops security group delete
-        - name: list
-          uid: az_devops_security_group_list
-          displayName: az devops security group list
-        - name: show
-          uid: az_devops_security_group_show
-          displayName: az devops security group show
-        - name: update
-          uid: az_devops_security_group_update
-          displayName: az devops security group update
-        - name: membership
-          displayName: az devops security group membership
-          items:
-          - name: Overview
-            uid: az_devops_security_group_membership
-            displayName: az devops security group membership
-          - name: add
-            uid: az_devops_security_group_membership_add
-            displayName: az devops security group membership add
-          - name: list
-            uid: az_devops_security_group_membership_list
-            displayName: az devops security group membership list
-          - name: remove
-            uid: az_devops_security_group_membership_remove
-            displayName: az devops security group membership remove
-      - name: permission
-        displayName: az devops security permission
-        items:
-        - name: Overview
-          uid: az_devops_security_permission
-          displayName: az devops security permission
-        - name: list
-          uid: az_devops_security_permission_list
-          displayName: az devops security permission list
-        - name: reset
-          uid: az_devops_security_permission_reset
-          displayName: az devops security permission reset
-        - name: reset-all
-          uid: az_devops_security_permission_reset_all
-          displayName: az devops security permission reset-all
-        - name: show
-          uid: az_devops_security_permission_show
-          displayName: az devops security permission show
-        - name: update
-          uid: az_devops_security_permission_update
-          displayName: az devops security permission update
-        - name: namespace
-          displayName: az devops security permission namespace
-          items:
-          - name: Overview
-            uid: az_devops_security_permission_namespace
-            displayName: az devops security permission namespace
-          - name: list
-            uid: az_devops_security_permission_namespace_list
-            displayName: az devops security permission namespace list
-          - name: show
-            uid: az_devops_security_permission_namespace_show
-            displayName: az devops security permission namespace show
-    - name: service-endpoint
-      displayName: az devops service-endpoint
-      items:
-      - name: Overview
-        uid: az_devops_service_endpoint
-        displayName: az devops service-endpoint
-      - name: create
-        uid: az_devops_service_endpoint_create
-        displayName: az devops service-endpoint create
-      - name: delete
-        uid: az_devops_service_endpoint_delete
-        displayName: az devops service-endpoint delete
-      - name: list
-        uid: az_devops_service_endpoint_list
-        displayName: az devops service-endpoint list
-      - name: show
-        uid: az_devops_service_endpoint_show
-        displayName: az devops service-endpoint show
-      - name: update
-        uid: az_devops_service_endpoint_update
-        displayName: az devops service-endpoint update
-      - name: azurerm
-        displayName: az devops service-endpoint azurerm
-        items:
-        - name: Overview
-          uid: az_devops_service_endpoint_azurerm
-          displayName: az devops service-endpoint azurerm
-        - name: create
-          uid: az_devops_service_endpoint_azurerm_create
-          displayName: az devops service-endpoint azurerm create
-      - name: github
-        displayName: az devops service-endpoint github
-        items:
-        - name: Overview
-          uid: az_devops_service_endpoint_github
-          displayName: az devops service-endpoint github
-        - name: create
-          uid: az_devops_service_endpoint_github_create
-          displayName: az devops service-endpoint github create
-    - name: team
-      displayName: az devops team
-      items:
-      - name: Overview
-        uid: az_devops_team
-        displayName: az devops team
-      - name: create
-        uid: az_devops_team_create
-        displayName: az devops team create
-      - name: delete
-        uid: az_devops_team_delete
-        displayName: az devops team delete
-      - name: list
-        uid: az_devops_team_list
-        displayName: az devops team list
-      - name: list-member
-        uid: az_devops_team_list_member
-        displayName: az devops team list-member
-      - name: show
-        uid: az_devops_team_show
-        displayName: az devops team show
-      - name: update
-        uid: az_devops_team_update
-        displayName: az devops team update
-    - name: user
-      displayName: az devops user
-      items:
-      - name: Overview
-        uid: az_devops_user
-        displayName: az devops user
-      - name: add
-        uid: az_devops_user_add
-        displayName: az devops user add
-      - name: list
-        uid: az_devops_user_list
-        displayName: az devops user list
-      - name: remove
-        uid: az_devops_user_remove
-        displayName: az devops user remove
-      - name: show
-        uid: az_devops_user_show
-        displayName: az devops user show
-      - name: update
-        uid: az_devops_user_update
-        displayName: az devops user update
-    - name: wiki
-      displayName: az devops wiki
-      items:
-      - name: Overview
-        uid: az_devops_wiki
-        displayName: az devops wiki
-      - name: create
-        uid: az_devops_wiki_create
-        displayName: az devops wiki create
-      - name: delete
-        uid: az_devops_wiki_delete
-        displayName: az devops wiki delete
-      - name: list
-        uid: az_devops_wiki_list
-        displayName: az devops wiki list
-      - name: show
-        uid: az_devops_wiki_show
-        displayName: az devops wiki show
-      - name: page
-        displayName: az devops wiki page
-        items:
-        - name: Overview
-          uid: az_devops_wiki_page
-          displayName: az devops wiki page
-        - name: create
-          uid: az_devops_wiki_page_create
-          displayName: az devops wiki page create
-        - name: delete
-          uid: az_devops_wiki_page_delete
-          displayName: az devops wiki page delete
-        - name: show
-          uid: az_devops_wiki_page_show
-          displayName: az devops wiki page show
-        - name: update
-          uid: az_devops_wiki_page_update
-          displayName: az devops wiki page update
-  - name: extension
-    displayName: az extension
-    items:
-    - name: Overview
-      uid: az_extension
-      displayName: az extension
-    - name: add
-      uid: az_extension_add
-      displayName: az extension add
-    - name: list
-      uid: az_extension_list
-      displayName: az extension list
-    - name: list-available
-      uid: az_extension_list_available
-      displayName: az extension list-available
-    - name: remove
-      uid: az_extension_remove
-      displayName: az extension remove
-    - name: show
-      uid: az_extension_show
-      displayName: az extension show
-    - name: update
-      uid: az_extension_update
-      displayName: az extension update
-  - name: local-context
-    displayName: az local-context
-    items:
-    - name: Overview
-      uid: az_local_context
-      displayName: az local-context
-    - name: delete
-      uid: az_local_context_delete
-      displayName: az local-context delete
-    - name: off
-      uid: az_local_context_off
-      displayName: az local-context off
-    - name: on
-      uid: az_local_context_on
-      displayName: az local-context on
-    - name: show
-      uid: az_local_context_show
-      displayName: az local-context show
-  - name: pipelines
-    displayName: az pipelines
-    items:
-    - name: Overview
-      uid: az_pipelines
-      displayName: az pipelines
-    - name: create
-      uid: az_pipelines_create
-      displayName: az pipelines create
-    - name: delete
-      uid: az_pipelines_delete
-      displayName: az pipelines delete
-    - name: list
-      uid: az_pipelines_list
-      displayName: az pipelines list
-    - name: run
-      uid: az_pipelines_run
-      displayName: az pipelines run
-    - name: show
-      uid: az_pipelines_show
-      displayName: az pipelines show
-    - name: update
-      uid: az_pipelines_update
-      displayName: az pipelines update
-    - name: agent
-      displayName: az pipelines agent
-      items:
-      - name: Overview
-        uid: az_pipelines_agent
-        displayName: az pipelines agent
-      - name: list
-        uid: az_pipelines_agent_list
-        displayName: az pipelines agent list
-      - name: show
-        uid: az_pipelines_agent_show
-        displayName: az pipelines agent show
-    - name: build
-      displayName: az pipelines build
-      items:
-      - name: Overview
-        uid: az_pipelines_build
-        displayName: az pipelines build
-      - name: list
-        uid: az_pipelines_build_list
-        displayName: az pipelines build list
-      - name: queue
-        uid: az_pipelines_build_queue
-        displayName: az pipelines build queue
-      - name: show
-        uid: az_pipelines_build_show
-        displayName: az pipelines build show
-      - name: definition
-        displayName: az pipelines build definition
-        items:
-        - name: Overview
-          uid: az_pipelines_build_definition
-          displayName: az pipelines build definition
-        - name: list
-          uid: az_pipelines_build_definition_list
-          displayName: az pipelines build definition list
-        - name: show
-          uid: az_pipelines_build_definition_show
-          displayName: az pipelines build definition show
-      - name: tag
-        displayName: az pipelines build tag
-        items:
-        - name: Overview
-          uid: az_pipelines_build_tag
-          displayName: az pipelines build tag
-        - name: add
-          uid: az_pipelines_build_tag_add
-          displayName: az pipelines build tag add
-        - name: delete
-          uid: az_pipelines_build_tag_delete
-          displayName: az pipelines build tag delete
-        - name: list
-          uid: az_pipelines_build_tag_list
-          displayName: az pipelines build tag list
-    - name: folder
-      displayName: az pipelines folder
-      items:
-      - name: Overview
-        uid: az_pipelines_folder
-        displayName: az pipelines folder
-      - name: create
-        uid: az_pipelines_folder_create
-        displayName: az pipelines folder create
-      - name: delete
-        uid: az_pipelines_folder_delete
-        displayName: az pipelines folder delete
-      - name: list
-        uid: az_pipelines_folder_list
-        displayName: az pipelines folder list
-      - name: update
-        uid: az_pipelines_folder_update
-        displayName: az pipelines folder update
-    - name: pool
-      displayName: az pipelines pool
-      items:
-      - name: Overview
-        uid: az_pipelines_pool
-        displayName: az pipelines pool
-      - name: list
-        uid: az_pipelines_pool_list
-        displayName: az pipelines pool list
-      - name: show
-        uid: az_pipelines_pool_show
-        displayName: az pipelines pool show
-    - name: queue
-      displayName: az pipelines queue
-      items:
-      - name: Overview
-        uid: az_pipelines_queue
-        displayName: az pipelines queue
-      - name: list
-        uid: az_pipelines_queue_list
-        displayName: az pipelines queue list
-      - name: show
-        uid: az_pipelines_queue_show
-        displayName: az pipelines queue show
-    - name: release
-      displayName: az pipelines release
-      items:
-      - name: Overview
-        uid: az_pipelines_release
-        displayName: az pipelines release
-      - name: create
-        uid: az_pipelines_release_create
-        displayName: az pipelines release create
-      - name: list
-        uid: az_pipelines_release_list
-        displayName: az pipelines release list
-      - name: show
-        uid: az_pipelines_release_show
-        displayName: az pipelines release show
-      - name: definition
-        displayName: az pipelines release definition
-        items:
-        - name: Overview
-          uid: az_pipelines_release_definition
-          displayName: az pipelines release definition
-        - name: list
-          uid: az_pipelines_release_definition_list
-          displayName: az pipelines release definition list
-        - name: show
-          uid: az_pipelines_release_definition_show
-          displayName: az pipelines release definition show
-    - name: runs
-      displayName: az pipelines runs
-      items:
-      - name: Overview
-        uid: az_pipelines_runs
-        displayName: az pipelines runs
-      - name: list
-        uid: az_pipelines_runs_list
-        displayName: az pipelines runs list
-      - name: show
-        uid: az_pipelines_runs_show
-        displayName: az pipelines runs show
-      - name: artifact
-        displayName: az pipelines runs artifact
-        items:
-        - name: Overview
-          uid: az_pipelines_runs_artifact
-          displayName: az pipelines runs artifact
-        - name: download
-          uid: az_pipelines_runs_artifact_download
-          displayName: az pipelines runs artifact download
-        - name: list
-          uid: az_pipelines_runs_artifact_list
-          displayName: az pipelines runs artifact list
-        - name: upload
-          uid: az_pipelines_runs_artifact_upload
-          displayName: az pipelines runs artifact upload
-      - name: tag
-        displayName: az pipelines runs tag
-        items:
-        - name: Overview
-          uid: az_pipelines_runs_tag
-          displayName: az pipelines runs tag
-        - name: add
-          uid: az_pipelines_runs_tag_add
-          displayName: az pipelines runs tag add
-        - name: delete
-          uid: az_pipelines_runs_tag_delete
-          displayName: az pipelines runs tag delete
-        - name: list
-          uid: az_pipelines_runs_tag_list
-          displayName: az pipelines runs tag list
-    - name: variable
-      displayName: az pipelines variable
-      items:
-      - name: Overview
-        uid: az_pipelines_variable
-        displayName: az pipelines variable
-      - name: create
-        uid: az_pipelines_variable_create
-        displayName: az pipelines variable create
-      - name: delete
-        uid: az_pipelines_variable_delete
-        displayName: az pipelines variable delete
-      - name: list
-        uid: az_pipelines_variable_list
-        displayName: az pipelines variable list
-      - name: update
-        uid: az_pipelines_variable_update
-        displayName: az pipelines variable update
-    - name: variable-group
-      displayName: az pipelines variable-group
-      items:
-      - name: Overview
-        uid: az_pipelines_variable_group
-        displayName: az pipelines variable-group
-      - name: create
-        uid: az_pipelines_variable_group_create
-        displayName: az pipelines variable-group create
-      - name: delete
-        uid: az_pipelines_variable_group_delete
-        displayName: az pipelines variable-group delete
-      - name: list
-        uid: az_pipelines_variable_group_list
-        displayName: az pipelines variable-group list
-      - name: show
-        uid: az_pipelines_variable_group_show
-        displayName: az pipelines variable-group show
-      - name: update
-        uid: az_pipelines_variable_group_update
-        displayName: az pipelines variable-group update
-      - name: variable
-        displayName: az pipelines variable-group variable
-        items:
-        - name: Overview
-          uid: az_pipelines_variable_group_variable
-          displayName: az pipelines variable-group variable
-        - name: create
-          uid: az_pipelines_variable_group_variable_create
-          displayName: az pipelines variable-group variable create
-        - name: delete
-          uid: az_pipelines_variable_group_variable_delete
-          displayName: az pipelines variable-group variable delete
-        - name: list
-          uid: az_pipelines_variable_group_variable_list
-          displayName: az pipelines variable-group variable list
-        - name: update
-          uid: az_pipelines_variable_group_variable_update
-          displayName: az pipelines variable-group variable update
-  - name: repos
-    displayName: az repos
-    items:
-    - name: Overview
-      uid: az_repos
-      displayName: az repos
-    - name: create
-      uid: az_repos_create
-      displayName: az repos create
-    - name: delete
-      uid: az_repos_delete
-      displayName: az repos delete
-    - name: list
-      uid: az_repos_list
-      displayName: az repos list
-    - name: show
-      uid: az_repos_show
-      displayName: az repos show
-    - name: update
-      uid: az_repos_update
-      displayName: az repos update
-    - name: import
-      displayName: az repos import
-      items:
-      - name: Overview
-        uid: az_repos_import
-        displayName: az repos import
-      - name: create
-        uid: az_repos_import_create
-        displayName: az repos import create
-    - name: policy
-      displayName: az repos policy
-      items:
-      - name: Overview
-        uid: az_repos_policy
-        displayName: az repos policy
-      - name: create
-        uid: az_repos_policy_create
-        displayName: az repos policy create
-      - name: delete
-        uid: az_repos_policy_delete
-        displayName: az repos policy delete
-      - name: list
-        uid: az_repos_policy_list
-        displayName: az repos policy list
-      - name: show
-        uid: az_repos_policy_show
-        displayName: az repos policy show
-      - name: update
-        uid: az_repos_policy_update
-        displayName: az repos policy update
-      - name: approver-count
-        displayName: az repos policy approver-count
-        items:
-        - name: Overview
-          uid: az_repos_policy_approver_count
-          displayName: az repos policy approver-count
-        - name: create
-          uid: az_repos_policy_approver_count_create
-          displayName: az repos policy approver-count create
-        - name: update
-          uid: az_repos_policy_approver_count_update
-          displayName: az repos policy approver-count update
-      - name: build
-        displayName: az repos policy build
-        items:
-        - name: Overview
-          uid: az_repos_policy_build
-          displayName: az repos policy build
-        - name: create
-          uid: az_repos_policy_build_create
-          displayName: az repos policy build create
-        - name: update
-          uid: az_repos_policy_build_update
-          displayName: az repos policy build update
-      - name: case-enforcement
-        displayName: az repos policy case-enforcement
-        items:
-        - name: Overview
-          uid: az_repos_policy_case_enforcement
-          displayName: az repos policy case-enforcement
-        - name: create
-          uid: az_repos_policy_case_enforcement_create
-          displayName: az repos policy case-enforcement create
-        - name: update
-          uid: az_repos_policy_case_enforcement_update
-          displayName: az repos policy case-enforcement update
-      - name: comment-required
-        displayName: az repos policy comment-required
-        items:
-        - name: Overview
-          uid: az_repos_policy_comment_required
-          displayName: az repos policy comment-required
-        - name: create
-          uid: az_repos_policy_comment_required_create
-          displayName: az repos policy comment-required create
-        - name: update
-          uid: az_repos_policy_comment_required_update
-          displayName: az repos policy comment-required update
-      - name: file-size
-        displayName: az repos policy file-size
-        items:
-        - name: Overview
-          uid: az_repos_policy_file_size
-          displayName: az repos policy file-size
-        - name: create
-          uid: az_repos_policy_file_size_create
-          displayName: az repos policy file-size create
-        - name: update
-          uid: az_repos_policy_file_size_update
-          displayName: az repos policy file-size update
-      - name: merge-strategy
-        displayName: az repos policy merge-strategy
-        items:
-        - name: Overview
-          uid: az_repos_policy_merge_strategy
-          displayName: az repos policy merge-strategy
-        - name: create
-          uid: az_repos_policy_merge_strategy_create
-          displayName: az repos policy merge-strategy create
-        - name: update
-          uid: az_repos_policy_merge_strategy_update
-          displayName: az repos policy merge-strategy update
-      - name: required-reviewer
-        displayName: az repos policy required-reviewer
-        items:
-        - name: Overview
-          uid: az_repos_policy_required_reviewer
-          displayName: az repos policy required-reviewer
-        - name: create
-          uid: az_repos_policy_required_reviewer_create
-          displayName: az repos policy required-reviewer create
-        - name: update
-          uid: az_repos_policy_required_reviewer_update
-          displayName: az repos policy required-reviewer update
-      - name: work-item-linking
-        displayName: az repos policy work-item-linking
-        items:
-        - name: Overview
-          uid: az_repos_policy_work_item_linking
-          displayName: az repos policy work-item-linking
-        - name: create
-          uid: az_repos_policy_work_item_linking_create
-          displayName: az repos policy work-item-linking create
-        - name: update
-          uid: az_repos_policy_work_item_linking_update
-          displayName: az repos policy work-item-linking update
-    - name: pr
-      displayName: az repos pr
-      items:
-      - name: Overview
-        uid: az_repos_pr
-        displayName: az repos pr
-      - name: checkout
-        uid: az_repos_pr_checkout
-        displayName: az repos pr checkout
-      - name: create
-        uid: az_repos_pr_create
-        displayName: az repos pr create
-      - name: list
-        uid: az_repos_pr_list
-        displayName: az repos pr list
-      - name: set-vote
-        uid: az_repos_pr_set_vote
-        displayName: az repos pr set-vote
-      - name: show
-        uid: az_repos_pr_show
-        displayName: az repos pr show
-      - name: update
-        uid: az_repos_pr_update
-        displayName: az repos pr update
-      - name: policy
-        displayName: az repos pr policy
-        items:
-        - name: Overview
-          uid: az_repos_pr_policy
-          displayName: az repos pr policy
-        - name: list
-          uid: az_repos_pr_policy_list
-          displayName: az repos pr policy list
-        - name: queue
-          uid: az_repos_pr_policy_queue
-          displayName: az repos pr policy queue
-      - name: reviewer
-        displayName: az repos pr reviewer
-        items:
-        - name: Overview
-          uid: az_repos_pr_reviewer
-          displayName: az repos pr reviewer
-        - name: add
-          uid: az_repos_pr_reviewer_add
-          displayName: az repos pr reviewer add
-        - name: list
-          uid: az_repos_pr_reviewer_list
-          displayName: az repos pr reviewer list
-        - name: remove
-          uid: az_repos_pr_reviewer_remove
-          displayName: az repos pr reviewer remove
-      - name: work-item
-        displayName: az repos pr work-item
-        items:
-        - name: Overview
-          uid: az_repos_pr_work_item
-          displayName: az repos pr work-item
-        - name: add
-          uid: az_repos_pr_work_item_add
-          displayName: az repos pr work-item add
-        - name: list
-          uid: az_repos_pr_work_item_list
-          displayName: az repos pr work-item list
-        - name: remove
-          uid: az_repos_pr_work_item_remove
-          displayName: az repos pr work-item remove
-    - name: ref
-      displayName: az repos ref
-      items:
-      - name: Overview
-        uid: az_repos_ref
-        displayName: az repos ref
-      - name: create
-        uid: az_repos_ref_create
-        displayName: az repos ref create
-      - name: delete
-        uid: az_repos_ref_delete
-        displayName: az repos ref delete
-      - name: list
-        uid: az_repos_ref_list
-        displayName: az repos ref list
-      - name: lock
-        uid: az_repos_ref_lock
-        displayName: az repos ref lock
-      - name: unlock
-        uid: az_repos_ref_unlock
-        displayName: az repos ref unlock
-  - name: security
-    displayName: az security
-    items:
-    - name: Overview
-      uid: az_security
-      displayName: az security
-    - name: alert
-      displayName: az security alert
-      items:
-      - name: Overview
-        uid: az_security_alert
-        displayName: az security alert
-      - name: list
-        uid: az_security_alert_list
-        displayName: az security alert list
-      - name: show
-        uid: az_security_alert_show
-        displayName: az security alert show
-      - name: update
-        uid: az_security_alert_update
-        displayName: az security alert update
-    - name: atp
-      displayName: az security atp
-      items:
-      - name: Overview
-        uid: az_security_atp
-        displayName: az security atp
-      - name: storage
-        displayName: az security atp storage
-        items:
-        - name: Overview
-          uid: az_security_atp_storage
-          displayName: az security atp storage
-        - name: show
-          uid: az_security_atp_storage_show
-          displayName: az security atp storage show
-        - name: update
-          uid: az_security_atp_storage_update
-          displayName: az security atp storage update
-    - name: auto-provisioning-setting
-      displayName: az security auto-provisioning-setting
-      items:
-      - name: Overview
-        uid: az_security_auto_provisioning_setting
-        displayName: az security auto-provisioning-setting
-      - name: list
-        uid: az_security_auto_provisioning_setting_list
-        displayName: az security auto-provisioning-setting list
-      - name: show
-        uid: az_security_auto_provisioning_setting_show
-        displayName: az security auto-provisioning-setting show
-      - name: update
-        uid: az_security_auto_provisioning_setting_update
-        displayName: az security auto-provisioning-setting update
-    - name: contact
-      displayName: az security contact
-      items:
-      - name: Overview
-        uid: az_security_contact
-        displayName: az security contact
-      - name: create
-        uid: az_security_contact_create
-        displayName: az security contact create
-      - name: delete
-        uid: az_security_contact_delete
-        displayName: az security contact delete
-      - name: list
-        uid: az_security_contact_list
-        displayName: az security contact list
-      - name: show
-        uid: az_security_contact_show
-        displayName: az security contact show
-    - name: discovered-security-solution
-      displayName: az security discovered-security-solution
-      items:
-      - name: Overview
-        uid: az_security_discovered_security_solution
-        displayName: az security discovered-security-solution
-      - name: list
-        uid: az_security_discovered_security_solution_list
-        displayName: az security discovered-security-solution list
-      - name: show
-        uid: az_security_discovered_security_solution_show
-        displayName: az security discovered-security-solution show
-    - name: external-security-solution
-      displayName: az security external-security-solution
-      items:
-      - name: Overview
-        uid: az_security_external_security_solution
-        displayName: az security external-security-solution
-      - name: list
-        uid: az_security_external_security_solution_list
-        displayName: az security external-security-solution list
-      - name: show
-        uid: az_security_external_security_solution_show
-        displayName: az security external-security-solution show
-    - name: jit-policy
-      displayName: az security jit-policy
-      items:
-      - name: Overview
-        uid: az_security_jit_policy
-        displayName: az security jit-policy
-      - name: list
-        uid: az_security_jit_policy_list
-        displayName: az security jit-policy list
-      - name: show
-        uid: az_security_jit_policy_show
-        displayName: az security jit-policy show
-    - name: location
-      displayName: az security location
-      items:
-      - name: Overview
-        uid: az_security_location
-        displayName: az security location
-      - name: list
-        uid: az_security_location_list
-        displayName: az security location list
-      - name: show
-        uid: az_security_location_show
-        displayName: az security location show
-    - name: pricing
-      displayName: az security pricing
-      items:
-      - name: Overview
-        uid: az_security_pricing
-        displayName: az security pricing
-      - name: create
-        uid: az_security_pricing_create
-        displayName: az security pricing create
-      - name: list
-        uid: az_security_pricing_list
-        displayName: az security pricing list
-      - name: show
-        uid: az_security_pricing_show
-        displayName: az security pricing show
-    - name: setting
-      displayName: az security setting
-      items:
-      - name: Overview
-        uid: az_security_setting
-        displayName: az security setting
-      - name: list
-        uid: az_security_setting_list
-        displayName: az security setting list
-      - name: show
-        uid: az_security_setting_show
-        displayName: az security setting show
-    - name: task
-      displayName: az security task
-      items:
-      - name: Overview
-        uid: az_security_task
-        displayName: az security task
-      - name: list
-        uid: az_security_task_list
-        displayName: az security task list
-      - name: show
-        uid: az_security_task_show
-        displayName: az security task show
-    - name: topology
-      displayName: az security topology
-      items:
-      - name: Overview
-        uid: az_security_topology
-        displayName: az security topology
-      - name: list
-        uid: az_security_topology_list
-        displayName: az security topology list
-      - name: show
-        uid: az_security_topology_show
-        displayName: az security topology show
-    - name: workspace-setting
-      displayName: az security workspace-setting
-      items:
-      - name: Overview
-        uid: az_security_workspace_setting
-        displayName: az security workspace-setting
-      - name: create
-        uid: az_security_workspace_setting_create
-        displayName: az security workspace-setting create
-      - name: delete
-        uid: az_security_workspace_setting_delete
-        displayName: az security workspace-setting delete
-      - name: list
-        uid: az_security_workspace_setting_list
-        displayName: az security workspace-setting list
-      - name: show
-        uid: az_security_workspace_setting_show
-        displayName: az security workspace-setting show
-- name: Extensions Reference
-  items:
-  - name: account
-    items:
-    - name: Overview
-      uid: ext_account_az
-    - name: Subscriptions
-      displayName: az account
-      items:
-      - name: Overview
-        uid: ext_account_az_account
-        displayName: az account
-      - name: subscription
-        displayName: az account subscription
-        items:
-        - name: Overview
-          uid: ext_account_az_account_subscription
-          displayName: az account subscription
-        - name: cancel
-          uid: ext_account_az_account_subscription_cancel
-          displayName: az account subscription cancel
-        - name: create
-          uid: ext_account_az_account_subscription_create
-          displayName: az account subscription create
-        - name: create-csp
-          uid: ext_account_az_account_subscription_create_csp
-          displayName: az account subscription create-csp
-        - name: create-in-enrollment-account
-          uid: ext_account_az_account_subscription_create_in_enrollment_account
-          displayName: az account subscription create-in-enrollment-account
-        - name: enable
-          uid: ext_account_az_account_subscription_enable
-          displayName: az account subscription enable
-        - name: rename
-          uid: ext_account_az_account_subscription_rename
-          displayName: az account subscription rename
-  - name: aem
-    items:
-    - name: Overview
-      uid: ext_aem_az
-    - name: Virtual Machines
-      displayName: az vm
-      items:
-      - name: Overview
-        uid: ext_aem_az_vm
-        displayName: az vm
-      - name: aem
-        displayName: az vm aem
-        items:
-        - name: Overview
-          uid: ext_aem_az_vm_aem
-          displayName: az vm aem
-        - name: delete
-          uid: ext_aem_az_vm_aem_delete
-          displayName: az vm aem delete
-        - name: set
-          uid: ext_aem_az_vm_aem_set
-          displayName: az vm aem set
-        - name: verify
-          uid: ext_aem_az_vm_aem_verify
-          displayName: az vm aem verify
-  - name: ai-did-you-mean-this
-    items:
-    - name: Overview
-      uid: ext_ai-did-you-mean-this_az
-    - name: ai-did-you-mean-this
-      displayName: az ai-did-you-mean-this
-      items:
-      - name: Overview
-        uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-        displayName: az ai-did-you-mean-this
-      - name: version
-        uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-        displayName: az ai-did-you-mean-this version
-  - name: ai-examples
-    items:
-    - name: Overview
-      uid: ext_ai-examples_az
-    - name: ai-examples
-      displayName: az ai-examples
-      items:
-      - name: Overview
-        uid: ext_ai-examples_az_ai_examples
-        displayName: az ai-examples
-      - name: check-connection
-        uid: ext_ai-examples_az_ai_examples_check_connection
-        displayName: az ai-examples check-connection
-  - name: aks-preview
-    items:
-    - name: Overview
-      uid: ext_aks-preview_az
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_aks-preview_az_aks
-        displayName: az aks
-      - name: browse
-        uid: ext_aks-preview_az_aks_browse
-        displayName: az aks browse
-      - name: create
-        uid: ext_aks-preview_az_aks_create
-        displayName: az aks create
-      - name: disable-addons
-        uid: ext_aks-preview_az_aks_disable_addons
-        displayName: az aks disable-addons
-      - name: enable-addons
-        uid: ext_aks-preview_az_aks_enable_addons
-        displayName: az aks enable-addons
-      - name: get-credentials
-        uid: ext_aks-preview_az_aks_get_credentials
-        displayName: az aks get-credentials
-      - name: get-upgrades
-        uid: ext_aks-preview_az_aks_get_upgrades
-        displayName: az aks get-upgrades
-      - name: get-versions
-        uid: ext_aks-preview_az_aks_get_versions
-        displayName: az aks get-versions
-      - name: kanalyze
-        uid: ext_aks-preview_az_aks_kanalyze
-        displayName: az aks kanalyze
-      - name: kollect
-        uid: ext_aks-preview_az_aks_kollect
-        displayName: az aks kollect
-      - name: rotate-certs
-        uid: ext_aks-preview_az_aks_rotate_certs
-        displayName: az aks rotate-certs
-      - name: scale
-        uid: ext_aks-preview_az_aks_scale
-        displayName: az aks scale
-      - name: show
-        uid: ext_aks-preview_az_aks_show
-        displayName: az aks show
-      - name: update
-        uid: ext_aks-preview_az_aks_update
-        displayName: az aks update
-      - name: upgrade
-        uid: ext_aks-preview_az_aks_upgrade
-        displayName: az aks upgrade
-      - name: wait
-        uid: ext_aks-preview_az_aks_wait
-        displayName: az aks wait
-      - name: nodepool
-        displayName: az aks nodepool
-        items:
-        - name: Overview
-          uid: ext_aks-preview_az_aks_nodepool
-          displayName: az aks nodepool
-        - name: add
-          uid: ext_aks-preview_az_aks_nodepool_add
-          displayName: az aks nodepool add
-        - name: delete
-          uid: ext_aks-preview_az_aks_nodepool_delete
-          displayName: az aks nodepool delete
-        - name: list
-          uid: ext_aks-preview_az_aks_nodepool_list
-          displayName: az aks nodepool list
-        - name: scale
-          uid: ext_aks-preview_az_aks_nodepool_scale
-          displayName: az aks nodepool scale
-        - name: show
-          uid: ext_aks-preview_az_aks_nodepool_show
-          displayName: az aks nodepool show
-        - name: update
-          uid: ext_aks-preview_az_aks_nodepool_update
-          displayName: az aks nodepool update
-        - name: upgrade
-          uid: ext_aks-preview_az_aks_nodepool_upgrade
-          displayName: az aks nodepool upgrade
-  - name: alertsmanagement
-    items:
-    - name: Overview
-      uid: ext_alertsmanagement_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_alertsmanagement_az_monitor
-        displayName: az monitor
-      - name: action-rule
-        displayName: az monitor action-rule
-        items:
-        - name: Overview
-          uid: ext_alertsmanagement_az_monitor_action_rule
-          displayName: az monitor action-rule
-        - name: create
-          uid: ext_alertsmanagement_az_monitor_action_rule_create
-          displayName: az monitor action-rule create
-        - name: delete
-          uid: ext_alertsmanagement_az_monitor_action_rule_delete
-          displayName: az monitor action-rule delete
-        - name: list
-          uid: ext_alertsmanagement_az_monitor_action_rule_list
-          displayName: az monitor action-rule list
-        - name: show
-          uid: ext_alertsmanagement_az_monitor_action_rule_show
-          displayName: az monitor action-rule show
-        - name: update
-          uid: ext_alertsmanagement_az_monitor_action_rule_update
-          displayName: az monitor action-rule update
-  - name: alias
-    items:
-    - name: Overview
-      uid: ext_alias_az
-    - name: alias
-      displayName: az alias
-      items:
-      - name: Overview
-        uid: ext_alias_az_alias
-        displayName: az alias
-      - name: create
-        uid: ext_alias_az_alias_create
-        displayName: az alias create
-      - name: export
-        uid: ext_alias_az_alias_export
-        displayName: az alias export
-      - name: import
-        uid: ext_alias_az_alias_import
-        displayName: az alias import
-      - name: list
-        uid: ext_alias_az_alias_list
-        displayName: az alias list
-      - name: remove
-        uid: ext_alias_az_alias_remove
-        displayName: az alias remove
-      - name: remove-all
-        uid: ext_alias_az_alias_remove_all
-        displayName: az alias remove-all
-  - name: application-insights
-    items:
-    - name: Overview
-      uid: ext_application-insights_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_application-insights_az_monitor
-        displayName: az monitor
-      - name: app-insights
-        displayName: az monitor app-insights
-        items:
-        - name: Overview
-          uid: ext_application-insights_az_monitor_app_insights
-          displayName: az monitor app-insights
-        - name: query
-          uid: ext_application-insights_az_monitor_app_insights_query
-          displayName: az monitor app-insights query
-        - name: api-key
-          displayName: az monitor app-insights api-key
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_api_key
-            displayName: az monitor app-insights api-key
-          - name: create
-            uid: ext_application-insights_az_monitor_app_insights_api_key_create
-            displayName: az monitor app-insights api-key create
-          - name: delete
-            uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-            displayName: az monitor app-insights api-key delete
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_api_key_show
-            displayName: az monitor app-insights api-key show
-        - name: component
-          displayName: az monitor app-insights component
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_component
-            displayName: az monitor app-insights component
-          - name: create
-            uid: ext_application-insights_az_monitor_app_insights_component_create
-            displayName: az monitor app-insights component create
-          - name: delete
-            uid: ext_application-insights_az_monitor_app_insights_component_delete
-            displayName: az monitor app-insights component delete
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_component_show
-            displayName: az monitor app-insights component show
-          - name: update
-            uid: ext_application-insights_az_monitor_app_insights_component_update
-            displayName: az monitor app-insights component update
-          - name: update-tags
-            uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-            displayName: az monitor app-insights component update-tags
-          - name: billing
-            displayName: az monitor app-insights component billing
-            items:
-            - name: Overview
-              uid: ext_application-insights_az_monitor_app_insights_component_billing
-              displayName: az monitor app-insights component billing
-            - name: show
-              uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-              displayName: az monitor app-insights component billing show
-            - name: update
-              uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-              displayName: az monitor app-insights component billing update
-          - name: linked-storage
-            displayName: az monitor app-insights component linked-storage
-            items:
-            - name: Overview
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-              displayName: az monitor app-insights component linked-storage
-            - name: link
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-              displayName: az monitor app-insights component linked-storage link
-            - name: show
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-              displayName: az monitor app-insights component linked-storage show
-            - name: unlink
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-              displayName: az monitor app-insights component linked-storage unlink
-            - name: update
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-              displayName: az monitor app-insights component linked-storage update
-        - name: events
-          displayName: az monitor app-insights events
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_events
-            displayName: az monitor app-insights events
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_events_show
-            displayName: az monitor app-insights events show
-        - name: metrics
-          displayName: az monitor app-insights metrics
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_metrics
-            displayName: az monitor app-insights metrics
-          - name: get-metadata
-            uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-            displayName: az monitor app-insights metrics get-metadata
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_metrics_show
-            displayName: az monitor app-insights metrics show
-  - name: azure-batch-cli-extensions
-    items:
-    - name: Overview
-      uid: ext_azure-batch-cli-extensions_az
-    - name: Batch
-      displayName: az batch
-      items:
-      - name: Overview
-        uid: ext_azure-batch-cli-extensions_az_batch
-        displayName: az batch
-      - name: Jobs
-        displayName: az batch job
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_job
-          displayName: az batch job
-        - name: create
-          uid: ext_azure-batch-cli-extensions_az_batch_job_create
-          displayName: az batch job create
-      - name: Pools
-        displayName: az batch pool
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_pool
-          displayName: az batch pool
-        - name: create
-          uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-          displayName: az batch pool create
-      - name: file
-        displayName: az batch file
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_file
-          displayName: az batch file
-        - name: download
-          uid: ext_azure-batch-cli-extensions_az_batch_file_download
-          displayName: az batch file download
-        - name: upload
-          uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-          displayName: az batch file upload
-  - name: azure-cli-iot-ext
-    items:
-    - name: Overview
-      uid: ext_azure-cli-iot-ext_az
-    - name: IoT
-      displayName: az iot
-      items:
-      - name: Overview
-        uid: ext_azure-cli-iot-ext_az_iot
-        displayName: az iot
-      - name: Devices
-        displayName: az iot device
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_device
-          displayName: az iot device
-        - name: send-d2c-message
-          uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-          displayName: az iot device send-d2c-message
-        - name: simulate
-          uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-          displayName: az iot device simulate
-        - name: upload-file
-          uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-          displayName: az iot device upload-file
-        - name: c2d-message
-          displayName: az iot device c2d-message
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-            displayName: az iot device c2d-message
-          - name: abandon
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-            displayName: az iot device c2d-message abandon
-          - name: complete
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-            displayName: az iot device c2d-message complete
-          - name: receive
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-            displayName: az iot device c2d-message receive
-          - name: reject
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-            displayName: az iot device c2d-message reject
-          - name: send
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-            displayName: az iot device c2d-message send
-      - name: Hubs
-        displayName: az iot hub
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_hub
-          displayName: az iot hub
-        - name: generate-sas-token
-          uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-          displayName: az iot hub generate-sas-token
-        - name: invoke-device-method
-          uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-          displayName: az iot hub invoke-device-method
-        - name: invoke-module-method
-          uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-          displayName: az iot hub invoke-module-method
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-          displayName: az iot hub monitor-events
-        - name: monitor-feedback
-          uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-          displayName: az iot hub monitor-feedback
-        - name: query
-          uid: ext_azure-cli-iot-ext_az_iot_hub_query
-          displayName: az iot hub query
-        - name: Jobs
-          displayName: az iot hub job
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job
-            displayName: az iot hub job
-          - name: cancel
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-            displayName: az iot hub job cancel
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-            displayName: az iot hub job create
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-            displayName: az iot hub job list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-            displayName: az iot hub job show
-        - name: configuration
-          displayName: az iot hub configuration
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-            displayName: az iot hub configuration
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-            displayName: az iot hub configuration create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-            displayName: az iot hub configuration delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-            displayName: az iot hub configuration list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-            displayName: az iot hub configuration show
-          - name: show-metric
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-            displayName: az iot hub configuration show-metric
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-            displayName: az iot hub configuration update
-        - name: device-identity
-          displayName: az iot hub device-identity
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-            displayName: az iot hub device-identity
-          - name: add-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-            displayName: az iot hub device-identity add-children
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-            displayName: az iot hub device-identity create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-            displayName: az iot hub device-identity delete
-          - name: export
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-            displayName: az iot hub device-identity export
-          - name: get-parent
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-            displayName: az iot hub device-identity get-parent
-          - name: import
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-            displayName: az iot hub device-identity import
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-            displayName: az iot hub device-identity list
-          - name: list-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-            displayName: az iot hub device-identity list-children
-          - name: remove-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-            displayName: az iot hub device-identity remove-children
-          - name: set-parent
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-            displayName: az iot hub device-identity set-parent
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-            displayName: az iot hub device-identity show
-          - name: show-connection-string
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-            displayName: az iot hub device-identity show-connection-string
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-            displayName: az iot hub device-identity update
-        - name: device-twin
-          displayName: az iot hub device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-            displayName: az iot hub device-twin
-          - name: replace
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-            displayName: az iot hub device-twin replace
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-            displayName: az iot hub device-twin show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-            displayName: az iot hub device-twin update
-        - name: distributed-tracing
-          displayName: az iot hub distributed-tracing
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-            displayName: az iot hub distributed-tracing
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-            displayName: az iot hub distributed-tracing show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-            displayName: az iot hub distributed-tracing update
-        - name: module-identity
-          displayName: az iot hub module-identity
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-            displayName: az iot hub module-identity
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-            displayName: az iot hub module-identity create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-            displayName: az iot hub module-identity delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-            displayName: az iot hub module-identity list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-            displayName: az iot hub module-identity show
-          - name: show-connection-string
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-            displayName: az iot hub module-identity show-connection-string
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-            displayName: az iot hub module-identity update
-        - name: module-twin
-          displayName: az iot hub module-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-            displayName: az iot hub module-twin
-          - name: replace
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-            displayName: az iot hub module-twin replace
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-            displayName: az iot hub module-twin show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-            displayName: az iot hub module-twin update
-      - name: central
-        displayName: az iot central
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_central
-          displayName: az iot central
-        - name: app
-          displayName: az iot central app
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_central_app
-            displayName: az iot central app
-          - name: monitor-events
-            uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-            displayName: az iot central app monitor-events
-        - name: device-twin
-          displayName: az iot central device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-            displayName: az iot central device-twin
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-            displayName: az iot central device-twin show
-      - name: dps
-        displayName: az iot dps
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_dps
-          displayName: az iot dps
-        - name: enrollment
-          displayName: az iot dps enrollment
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-            displayName: az iot dps enrollment
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-            displayName: az iot dps enrollment create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-            displayName: az iot dps enrollment delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-            displayName: az iot dps enrollment list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-            displayName: az iot dps enrollment show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-            displayName: az iot dps enrollment update
-        - name: enrollment-group
-          displayName: az iot dps enrollment-group
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-            displayName: az iot dps enrollment-group
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-            displayName: az iot dps enrollment-group create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-            displayName: az iot dps enrollment-group delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-            displayName: az iot dps enrollment-group list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-            displayName: az iot dps enrollment-group show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-            displayName: az iot dps enrollment-group update
-        - name: registration
-          displayName: az iot dps registration
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-            displayName: az iot dps registration
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-            displayName: az iot dps registration delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-            displayName: az iot dps registration list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-            displayName: az iot dps registration show
-      - name: dt
-        displayName: az iot dt
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_dt
-          displayName: az iot dt
-        - name: invoke-command
-          uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-          displayName: az iot dt invoke-command
-        - name: list-commands
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-          displayName: az iot dt list-commands
-        - name: list-interfaces
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-          displayName: az iot dt list-interfaces
-        - name: list-properties
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-          displayName: az iot dt list-properties
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-          displayName: az iot dt monitor-events
-        - name: update-property
-          uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-          displayName: az iot dt update-property
-      - name: edge
-        displayName: az iot edge
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_edge
-          displayName: az iot edge
-        - name: set-modules
-          uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-          displayName: az iot edge set-modules
-        - name: deployment
-          displayName: az iot edge deployment
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-            displayName: az iot edge deployment
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-            displayName: az iot edge deployment create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-            displayName: az iot edge deployment delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-            displayName: az iot edge deployment list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-            displayName: az iot edge deployment show
-          - name: show-metric
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-            displayName: az iot edge deployment show-metric
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-            displayName: az iot edge deployment update
-      - name: pnp
-        displayName: az iot pnp
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_pnp
-          displayName: az iot pnp
-        - name: capability-model
-          displayName: az iot pnp capability-model
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-            displayName: az iot pnp capability-model
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-            displayName: az iot pnp capability-model create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-            displayName: az iot pnp capability-model delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-            displayName: az iot pnp capability-model list
-          - name: publish
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-            displayName: az iot pnp capability-model publish
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-            displayName: az iot pnp capability-model show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-            displayName: az iot pnp capability-model update
-        - name: interface
-          displayName: az iot pnp interface
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-            displayName: az iot pnp interface
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-            displayName: az iot pnp interface create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-            displayName: az iot pnp interface delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-            displayName: az iot pnp interface list
-          - name: publish
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-            displayName: az iot pnp interface publish
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-            displayName: az iot pnp interface show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-            displayName: az iot pnp interface update
-    - name: iotcentral
-      displayName: az iotcentral
-      items:
-      - name: Overview
-        uid: ext_azure-cli-iot-ext_az_iotcentral
-        displayName: az iotcentral
-      - name: app
-        displayName: az iotcentral app
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iotcentral_app
-          displayName: az iotcentral app
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-          displayName: az iotcentral app monitor-events
-      - name: device-twin
-        displayName: az iotcentral device-twin
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-          displayName: az iotcentral device-twin
-        - name: show
-          uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-          displayName: az iotcentral device-twin show
-  - name: azure-cli-ml
-    items:
-    - name: Overview
-      uid: ext_azure-cli-ml_az
-    - name: ml
-      displayName: az ml
-      items:
-      - name: Overview
-        uid: ext_azure-cli-ml_az_ml
-        displayName: az ml
-      - name: computetarget
-        displayName: az ml computetarget
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_computetarget
-          displayName: az ml computetarget
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_computetarget_delete
-          displayName: az ml computetarget delete
-        - name: detach
-          uid: ext_azure-cli-ml_az_ml_computetarget_detach
-          displayName: az ml computetarget detach
-        - name: get-credentials
-          uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-          displayName: az ml computetarget get-credentials
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_computetarget_list
-          displayName: az ml computetarget list
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_computetarget_show
-          displayName: az ml computetarget show
-        - name: amlcompute
-          displayName: az ml computetarget amlcompute
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-            displayName: az ml computetarget amlcompute
-          - name: identity
-            displayName: az ml computetarget amlcompute identity
-            items:
-            - name: Overview
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-              displayName: az ml computetarget amlcompute identity
-            - name: assign
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-              displayName: az ml computetarget amlcompute identity assign
-            - name: remove
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-              displayName: az ml computetarget amlcompute identity remove
-            - name: show
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-              displayName: az ml computetarget amlcompute identity show
-        - name: attach
-          displayName: az ml computetarget attach
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach
-            displayName: az ml computetarget attach
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-            displayName: az ml computetarget attach aks
-          - name: remote
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-            displayName: az ml computetarget attach remote
-        - name: create
-          displayName: az ml computetarget create
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_create
-            displayName: az ml computetarget create
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-            displayName: az ml computetarget create aks
-          - name: amlcompute
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-            displayName: az ml computetarget create amlcompute
-          - name: datafactory
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-            displayName: az ml computetarget create datafactory
-        - name: update
-          displayName: az ml computetarget update
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_update
-            displayName: az ml computetarget update
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-            displayName: az ml computetarget update aks
-          - name: amlcompute
-            uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-            displayName: az ml computetarget update amlcompute
-      - name: dataset
-        displayName: az ml dataset
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_dataset
-          displayName: az ml dataset
-        - name: archive
-          uid: ext_azure-cli-ml_az_ml_dataset_archive
-          displayName: az ml dataset archive
-        - name: deprecate
-          uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-          displayName: az ml dataset deprecate
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_dataset_list
-          displayName: az ml dataset list
-        - name: reactivate
-          uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-          displayName: az ml dataset reactivate
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_dataset_register
-          displayName: az ml dataset register
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_dataset_show
-          displayName: az ml dataset show
-        - name: unregister
-          uid: ext_azure-cli-ml_az_ml_dataset_unregister
-          displayName: az ml dataset unregister
-      - name: datastore
-        displayName: az ml datastore
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_datastore
-          displayName: az ml datastore
-        - name: attach-adls
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-          displayName: az ml datastore attach-adls
-        - name: attach-adls-gen2
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-          displayName: az ml datastore attach-adls-gen2
-        - name: attach-blob
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-          displayName: az ml datastore attach-blob
-        - name: attach-dbfs
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-          displayName: az ml datastore attach-dbfs
-        - name: attach-file
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-          displayName: az ml datastore attach-file
-        - name: attach-mysqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-          displayName: az ml datastore attach-mysqldb
-        - name: attach-psqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-          displayName: az ml datastore attach-psqldb
-        - name: attach-sqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-          displayName: az ml datastore attach-sqldb
-        - name: detach
-          uid: ext_azure-cli-ml_az_ml_datastore_detach
-          displayName: az ml datastore detach
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_datastore_download
-          displayName: az ml datastore download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_datastore_list
-          displayName: az ml datastore list
-        - name: set-default
-          uid: ext_azure-cli-ml_az_ml_datastore_set_default
-          displayName: az ml datastore set-default
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_datastore_show
-          displayName: az ml datastore show
-        - name: show-default
-          uid: ext_azure-cli-ml_az_ml_datastore_show_default
-          displayName: az ml datastore show-default
-        - name: upload
-          uid: ext_azure-cli-ml_az_ml_datastore_upload
-          displayName: az ml datastore upload
-      - name: endpoint
-        displayName: az ml endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_endpoint
-          displayName: az ml endpoint
-        - name: realtime
-          displayName: az ml endpoint realtime
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-            displayName: az ml endpoint realtime
-          - name: create-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-            displayName: az ml endpoint realtime create-version
-          - name: delete
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-            displayName: az ml endpoint realtime delete
-          - name: delete-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-            displayName: az ml endpoint realtime delete-version
-          - name: get-access-token
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-            displayName: az ml endpoint realtime get-access-token
-          - name: get-keys
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-            displayName: az ml endpoint realtime get-keys
-          - name: get-logs
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-            displayName: az ml endpoint realtime get-logs
-          - name: list
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-            displayName: az ml endpoint realtime list
-          - name: regen-key
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-            displayName: az ml endpoint realtime regen-key
-          - name: run
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-            displayName: az ml endpoint realtime run
-          - name: show
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-            displayName: az ml endpoint realtime show
-          - name: update
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-            displayName: az ml endpoint realtime update
-          - name: update-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-            displayName: az ml endpoint realtime update-version
-      - name: environment
-        displayName: az ml environment
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_environment
-          displayName: az ml environment
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_environment_download
-          displayName: az ml environment download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_environment_list
-          displayName: az ml environment list
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_environment_register
-          displayName: az ml environment register
-        - name: scaffold
-          uid: ext_azure-cli-ml_az_ml_environment_scaffold
-          displayName: az ml environment scaffold
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_environment_show
-          displayName: az ml environment show
-      - name: experiment
-        displayName: az ml experiment
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_experiment
-          displayName: az ml experiment
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_experiment_list
-          displayName: az ml experiment list
-      - name: folder
-        displayName: az ml folder
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_folder
-          displayName: az ml folder
-        - name: attach
-          uid: ext_azure-cli-ml_az_ml_folder_attach
-          displayName: az ml folder attach
-      - name: model
-        displayName: az ml model
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_model
-          displayName: az ml model
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_model_delete
-          displayName: az ml model delete
-        - name: deploy
-          uid: ext_azure-cli-ml_az_ml_model_deploy
-          displayName: az ml model deploy
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_model_download
-          displayName: az ml model download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_model_list
-          displayName: az ml model list
-        - name: package
-          uid: ext_azure-cli-ml_az_ml_model_package
-          displayName: az ml model package
-        - name: profile
-          uid: ext_azure-cli-ml_az_ml_model_profile
-          displayName: az ml model profile
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_model_register
-          displayName: az ml model register
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_model_show
-          displayName: az ml model show
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_model_update
-          displayName: az ml model update
-      - name: pipeline
-        displayName: az ml pipeline
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_pipeline
-          displayName: az ml pipeline
-        - name: clone
-          uid: ext_azure-cli-ml_az_ml_pipeline_clone
-          displayName: az ml pipeline clone
-        - name: clone-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-          displayName: az ml pipeline clone-draft
-        - name: create
-          uid: ext_azure-cli-ml_az_ml_pipeline_create
-          displayName: az ml pipeline create
-        - name: create-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-          displayName: az ml pipeline create-draft
-        - name: create-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-          displayName: az ml pipeline create-schedule
-        - name: delete-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-          displayName: az ml pipeline delete-draft
-        - name: disable
-          uid: ext_azure-cli-ml_az_ml_pipeline_disable
-          displayName: az ml pipeline disable
-        - name: disable-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-          displayName: az ml pipeline disable-schedule
-        - name: enable
-          uid: ext_azure-cli-ml_az_ml_pipeline_enable
-          displayName: az ml pipeline enable
-        - name: enable-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-          displayName: az ml pipeline enable-schedule
-        - name: get
-          uid: ext_azure-cli-ml_az_ml_pipeline_get
-          displayName: az ml pipeline get
-        - name: last-pipeline-run
-          uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-          displayName: az ml pipeline last-pipeline-run
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_pipeline_list
-          displayName: az ml pipeline list
-        - name: list-drafts
-          uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-          displayName: az ml pipeline list-drafts
-        - name: list-steps
-          uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-          displayName: az ml pipeline list-steps
-        - name: pipeline-runs-list
-          uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-          displayName: az ml pipeline pipeline-runs-list
-        - name: publish-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-          displayName: az ml pipeline publish-draft
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_pipeline_show
-          displayName: az ml pipeline show
-        - name: show-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-          displayName: az ml pipeline show-draft
-        - name: show-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-          displayName: az ml pipeline show-schedule
-        - name: submit-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-          displayName: az ml pipeline submit-draft
-        - name: update-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-          displayName: az ml pipeline update-draft
-        - name: update-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-          displayName: az ml pipeline update-schedule
-      - name: run
-        displayName: az ml run
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_run
-          displayName: az ml run
-        - name: cancel
-          uid: ext_azure-cli-ml_az_ml_run_cancel
-          displayName: az ml run cancel
-        - name: download-logs
-          uid: ext_azure-cli-ml_az_ml_run_download_logs
-          displayName: az ml run download-logs
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_run_list
-          displayName: az ml run list
-        - name: monitor-logs
-          uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-          displayName: az ml run monitor-logs
-        - name: monitor-tensorboard
-          uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-          displayName: az ml run monitor-tensorboard
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_run_show
-          displayName: az ml run show
-        - name: submit-hyperdrive
-          uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-          displayName: az ml run submit-hyperdrive
-        - name: submit-pipeline
-          uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-          displayName: az ml run submit-pipeline
-        - name: submit-script
-          uid: ext_azure-cli-ml_az_ml_run_submit_script
-          displayName: az ml run submit-script
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_run_update
-          displayName: az ml run update
-      - name: service
-        displayName: az ml service
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_service
-          displayName: az ml service
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_service_delete
-          displayName: az ml service delete
-        - name: get-access-token
-          uid: ext_azure-cli-ml_az_ml_service_get_access_token
-          displayName: az ml service get-access-token
-        - name: get-keys
-          uid: ext_azure-cli-ml_az_ml_service_get_keys
-          displayName: az ml service get-keys
-        - name: get-logs
-          uid: ext_azure-cli-ml_az_ml_service_get_logs
-          displayName: az ml service get-logs
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_service_list
-          displayName: az ml service list
-        - name: regen-key
-          uid: ext_azure-cli-ml_az_ml_service_regen_key
-          displayName: az ml service regen-key
-        - name: run
-          uid: ext_azure-cli-ml_az_ml_service_run
-          displayName: az ml service run
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_service_show
-          displayName: az ml service show
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_service_update
-          displayName: az ml service update
-      - name: workspace
-        displayName: az ml workspace
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_workspace
-          displayName: az ml workspace
-        - name: create
-          uid: ext_azure-cli-ml_az_ml_workspace_create
-          displayName: az ml workspace create
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_workspace_delete
-          displayName: az ml workspace delete
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_workspace_list
-          displayName: az ml workspace list
-        - name: share
-          uid: ext_azure-cli-ml_az_ml_workspace_share
-          displayName: az ml workspace share
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_workspace_show
-          displayName: az ml workspace show
-        - name: sync-keys
-          uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-          displayName: az ml workspace sync-keys
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_workspace_update
-          displayName: az ml workspace update
-        - name: private-endpoint
-          displayName: az ml workspace private-endpoint
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-            displayName: az ml workspace private-endpoint
-          - name: add
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-            displayName: az ml workspace private-endpoint add
-          - name: delete
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-            displayName: az ml workspace private-endpoint delete
-          - name: list
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-            displayName: az ml workspace private-endpoint list
-  - name: azure-devops
-    items:
-    - name: Overview
-      uid: ext_azure-devops_az
-    - name: artifacts
-      displayName: az artifacts
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_artifacts
-        displayName: az artifacts
-      - name: universal
-        displayName: az artifacts universal
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_artifacts_universal
-          displayName: az artifacts universal
-        - name: download
-          uid: ext_azure-devops_az_artifacts_universal_download
-          displayName: az artifacts universal download
-        - name: publish
-          uid: ext_azure-devops_az_artifacts_universal_publish
-          displayName: az artifacts universal publish
-    - name: boards
-      displayName: az boards
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_boards
-        displayName: az boards
-      - name: query
-        uid: ext_azure-devops_az_boards_query
-        displayName: az boards query
-      - name: area
-        displayName: az boards area
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_area
-          displayName: az boards area
-        - name: project
-          displayName: az boards area project
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_area_project
-            displayName: az boards area project
-          - name: create
-            uid: ext_azure-devops_az_boards_area_project_create
-            displayName: az boards area project create
-          - name: delete
-            uid: ext_azure-devops_az_boards_area_project_delete
-            displayName: az boards area project delete
-          - name: list
-            uid: ext_azure-devops_az_boards_area_project_list
-            displayName: az boards area project list
-          - name: show
-            uid: ext_azure-devops_az_boards_area_project_show
-            displayName: az boards area project show
-          - name: update
-            uid: ext_azure-devops_az_boards_area_project_update
-            displayName: az boards area project update
-        - name: team
-          displayName: az boards area team
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_area_team
-            displayName: az boards area team
-          - name: add
-            uid: ext_azure-devops_az_boards_area_team_add
-            displayName: az boards area team add
-          - name: list
-            uid: ext_azure-devops_az_boards_area_team_list
-            displayName: az boards area team list
-          - name: remove
-            uid: ext_azure-devops_az_boards_area_team_remove
-            displayName: az boards area team remove
-          - name: update
-            uid: ext_azure-devops_az_boards_area_team_update
-            displayName: az boards area team update
-      - name: iteration
-        displayName: az boards iteration
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_iteration
-          displayName: az boards iteration
-        - name: project
-          displayName: az boards iteration project
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_iteration_project
-            displayName: az boards iteration project
-          - name: create
-            uid: ext_azure-devops_az_boards_iteration_project_create
-            displayName: az boards iteration project create
-          - name: delete
-            uid: ext_azure-devops_az_boards_iteration_project_delete
-            displayName: az boards iteration project delete
-          - name: list
-            uid: ext_azure-devops_az_boards_iteration_project_list
-            displayName: az boards iteration project list
-          - name: show
-            uid: ext_azure-devops_az_boards_iteration_project_show
-            displayName: az boards iteration project show
-          - name: update
-            uid: ext_azure-devops_az_boards_iteration_project_update
-            displayName: az boards iteration project update
-        - name: team
-          displayName: az boards iteration team
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_iteration_team
-            displayName: az boards iteration team
-          - name: add
-            uid: ext_azure-devops_az_boards_iteration_team_add
-            displayName: az boards iteration team add
-          - name: list
-            uid: ext_azure-devops_az_boards_iteration_team_list
-            displayName: az boards iteration team list
-          - name: list-work-items
-            uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-            displayName: az boards iteration team list-work-items
-          - name: remove
-            uid: ext_azure-devops_az_boards_iteration_team_remove
-            displayName: az boards iteration team remove
-          - name: set-backlog-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-            displayName: az boards iteration team set-backlog-iteration
-          - name: set-default-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-            displayName: az boards iteration team set-default-iteration
-          - name: show-backlog-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-            displayName: az boards iteration team show-backlog-iteration
-          - name: show-default-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-            displayName: az boards iteration team show-default-iteration
-      - name: work-item
-        displayName: az boards work-item
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_work_item
-          displayName: az boards work-item
-        - name: create
-          uid: ext_azure-devops_az_boards_work_item_create
-          displayName: az boards work-item create
-        - name: delete
-          uid: ext_azure-devops_az_boards_work_item_delete
-          displayName: az boards work-item delete
-        - name: show
-          uid: ext_azure-devops_az_boards_work_item_show
-          displayName: az boards work-item show
-        - name: update
-          uid: ext_azure-devops_az_boards_work_item_update
-          displayName: az boards work-item update
-        - name: relation
-          displayName: az boards work-item relation
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_work_item_relation
-            displayName: az boards work-item relation
-          - name: add
-            uid: ext_azure-devops_az_boards_work_item_relation_add
-            displayName: az boards work-item relation add
-          - name: list-type
-            uid: ext_azure-devops_az_boards_work_item_relation_list_type
-            displayName: az boards work-item relation list-type
-          - name: remove
-            uid: ext_azure-devops_az_boards_work_item_relation_remove
-            displayName: az boards work-item relation remove
-          - name: show
-            uid: ext_azure-devops_az_boards_work_item_relation_show
-            displayName: az boards work-item relation show
-    - name: devops
-      displayName: az devops
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_devops
-        displayName: az devops
-      - name: configure
-        uid: ext_azure-devops_az_devops_configure
-        displayName: az devops configure
-      - name: feedback
-        uid: ext_azure-devops_az_devops_feedback
-        displayName: az devops feedback
-      - name: invoke
-        uid: ext_azure-devops_az_devops_invoke
-        displayName: az devops invoke
-      - name: login
-        uid: ext_azure-devops_az_devops_login
-        displayName: az devops login
-      - name: logout
-        uid: ext_azure-devops_az_devops_logout
-        displayName: az devops logout
-      - name: admin
-        displayName: az devops admin
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_admin
-          displayName: az devops admin
-        - name: banner
-          displayName: az devops admin banner
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_admin_banner
-            displayName: az devops admin banner
-          - name: add
-            uid: ext_azure-devops_az_devops_admin_banner_add
-            displayName: az devops admin banner add
-          - name: list
-            uid: ext_azure-devops_az_devops_admin_banner_list
-            displayName: az devops admin banner list
-          - name: remove
-            uid: ext_azure-devops_az_devops_admin_banner_remove
-            displayName: az devops admin banner remove
-          - name: show
-            uid: ext_azure-devops_az_devops_admin_banner_show
-            displayName: az devops admin banner show
-          - name: update
-            uid: ext_azure-devops_az_devops_admin_banner_update
-            displayName: az devops admin banner update
-      - name: extension
-        displayName: az devops extension
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_extension
-          displayName: az devops extension
-        - name: disable
-          uid: ext_azure-devops_az_devops_extension_disable
-          displayName: az devops extension disable
-        - name: enable
-          uid: ext_azure-devops_az_devops_extension_enable
-          displayName: az devops extension enable
-        - name: install
-          uid: ext_azure-devops_az_devops_extension_install
-          displayName: az devops extension install
-        - name: list
-          uid: ext_azure-devops_az_devops_extension_list
-          displayName: az devops extension list
-        - name: search
-          uid: ext_azure-devops_az_devops_extension_search
-          displayName: az devops extension search
-        - name: show
-          uid: ext_azure-devops_az_devops_extension_show
-          displayName: az devops extension show
-        - name: uninstall
-          uid: ext_azure-devops_az_devops_extension_uninstall
-          displayName: az devops extension uninstall
-      - name: project
-        displayName: az devops project
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_project
-          displayName: az devops project
-        - name: create
-          uid: ext_azure-devops_az_devops_project_create
-          displayName: az devops project create
-        - name: delete
-          uid: ext_azure-devops_az_devops_project_delete
-          displayName: az devops project delete
-        - name: list
-          uid: ext_azure-devops_az_devops_project_list
-          displayName: az devops project list
-        - name: show
-          uid: ext_azure-devops_az_devops_project_show
-          displayName: az devops project show
-      - name: security
-        displayName: az devops security
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_security
-          displayName: az devops security
-        - name: group
-          displayName: az devops security group
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_security_group
-            displayName: az devops security group
-          - name: create
-            uid: ext_azure-devops_az_devops_security_group_create
-            displayName: az devops security group create
-          - name: delete
-            uid: ext_azure-devops_az_devops_security_group_delete
-            displayName: az devops security group delete
-          - name: list
-            uid: ext_azure-devops_az_devops_security_group_list
-            displayName: az devops security group list
-          - name: show
-            uid: ext_azure-devops_az_devops_security_group_show
-            displayName: az devops security group show
-          - name: update
-            uid: ext_azure-devops_az_devops_security_group_update
-            displayName: az devops security group update
-          - name: membership
-            displayName: az devops security group membership
-            items:
-            - name: Overview
-              uid: ext_azure-devops_az_devops_security_group_membership
-              displayName: az devops security group membership
-            - name: add
-              uid: ext_azure-devops_az_devops_security_group_membership_add
-              displayName: az devops security group membership add
-            - name: list
-              uid: ext_azure-devops_az_devops_security_group_membership_list
-              displayName: az devops security group membership list
-            - name: remove
-              uid: ext_azure-devops_az_devops_security_group_membership_remove
-              displayName: az devops security group membership remove
-        - name: permission
-          displayName: az devops security permission
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_security_permission
-            displayName: az devops security permission
-          - name: list
-            uid: ext_azure-devops_az_devops_security_permission_list
-            displayName: az devops security permission list
-          - name: reset
-            uid: ext_azure-devops_az_devops_security_permission_reset
-            displayName: az devops security permission reset
-          - name: reset-all
-            uid: ext_azure-devops_az_devops_security_permission_reset_all
-            displayName: az devops security permission reset-all
-          - name: show
-            uid: ext_azure-devops_az_devops_security_permission_show
-            displayName: az devops security permission show
-          - name: update
-            uid: ext_azure-devops_az_devops_security_permission_update
-            displayName: az devops security permission update
-          - name: namespace
-            displayName: az devops security permission namespace
-            items:
-            - name: Overview
-              uid: ext_azure-devops_az_devops_security_permission_namespace
-              displayName: az devops security permission namespace
-            - name: list
-              uid: ext_azure-devops_az_devops_security_permission_namespace_list
-              displayName: az devops security permission namespace list
-            - name: show
-              uid: ext_azure-devops_az_devops_security_permission_namespace_show
-              displayName: az devops security permission namespace show
-      - name: service-endpoint
-        displayName: az devops service-endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_service_endpoint
-          displayName: az devops service-endpoint
-        - name: create
-          uid: ext_azure-devops_az_devops_service_endpoint_create
-          displayName: az devops service-endpoint create
-        - name: delete
-          uid: ext_azure-devops_az_devops_service_endpoint_delete
-          displayName: az devops service-endpoint delete
-        - name: list
-          uid: ext_azure-devops_az_devops_service_endpoint_list
-          displayName: az devops service-endpoint list
-        - name: show
-          uid: ext_azure-devops_az_devops_service_endpoint_show
-          displayName: az devops service-endpoint show
-        - name: update
-          uid: ext_azure-devops_az_devops_service_endpoint_update
-          displayName: az devops service-endpoint update
-        - name: azurerm
-          displayName: az devops service-endpoint azurerm
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-            displayName: az devops service-endpoint azurerm
-          - name: create
-            uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-            displayName: az devops service-endpoint azurerm create
-        - name: github
-          displayName: az devops service-endpoint github
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_service_endpoint_github
-            displayName: az devops service-endpoint github
-          - name: create
-            uid: ext_azure-devops_az_devops_service_endpoint_github_create
-            displayName: az devops service-endpoint github create
-      - name: team
-        displayName: az devops team
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_team
-          displayName: az devops team
-        - name: create
-          uid: ext_azure-devops_az_devops_team_create
-          displayName: az devops team create
-        - name: delete
-          uid: ext_azure-devops_az_devops_team_delete
-          displayName: az devops team delete
-        - name: list
-          uid: ext_azure-devops_az_devops_team_list
-          displayName: az devops team list
-        - name: list-member
-          uid: ext_azure-devops_az_devops_team_list_member
-          displayName: az devops team list-member
-        - name: show
-          uid: ext_azure-devops_az_devops_team_show
-          displayName: az devops team show
-        - name: update
-          uid: ext_azure-devops_az_devops_team_update
-          displayName: az devops team update
-      - name: user
-        displayName: az devops user
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_user
-          displayName: az devops user
-        - name: add
-          uid: ext_azure-devops_az_devops_user_add
-          displayName: az devops user add
-        - name: list
-          uid: ext_azure-devops_az_devops_user_list
-          displayName: az devops user list
-        - name: remove
-          uid: ext_azure-devops_az_devops_user_remove
-          displayName: az devops user remove
-        - name: show
-          uid: ext_azure-devops_az_devops_user_show
-          displayName: az devops user show
-        - name: update
-          uid: ext_azure-devops_az_devops_user_update
-          displayName: az devops user update
-      - name: wiki
-        displayName: az devops wiki
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_wiki
-          displayName: az devops wiki
-        - name: create
-          uid: ext_azure-devops_az_devops_wiki_create
-          displayName: az devops wiki create
-        - name: delete
-          uid: ext_azure-devops_az_devops_wiki_delete
-          displayName: az devops wiki delete
-        - name: list
-          uid: ext_azure-devops_az_devops_wiki_list
-          displayName: az devops wiki list
-        - name: show
-          uid: ext_azure-devops_az_devops_wiki_show
-          displayName: az devops wiki show
-        - name: page
-          displayName: az devops wiki page
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_wiki_page
-            displayName: az devops wiki page
-          - name: create
-            uid: ext_azure-devops_az_devops_wiki_page_create
-            displayName: az devops wiki page create
-          - name: delete
-            uid: ext_azure-devops_az_devops_wiki_page_delete
-            displayName: az devops wiki page delete
-          - name: show
-            uid: ext_azure-devops_az_devops_wiki_page_show
-            displayName: az devops wiki page show
-          - name: update
-            uid: ext_azure-devops_az_devops_wiki_page_update
-            displayName: az devops wiki page update
-    - name: pipelines
-      displayName: az pipelines
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_pipelines
-        displayName: az pipelines
-      - name: create
-        uid: ext_azure-devops_az_pipelines_create
-        displayName: az pipelines create
-      - name: delete
-        uid: ext_azure-devops_az_pipelines_delete
-        displayName: az pipelines delete
-      - name: list
-        uid: ext_azure-devops_az_pipelines_list
-        displayName: az pipelines list
-      - name: run
-        uid: ext_azure-devops_az_pipelines_run
-        displayName: az pipelines run
-      - name: show
-        uid: ext_azure-devops_az_pipelines_show
-        displayName: az pipelines show
-      - name: update
-        uid: ext_azure-devops_az_pipelines_update
-        displayName: az pipelines update
-      - name: agent
-        displayName: az pipelines agent
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_agent
-          displayName: az pipelines agent
-        - name: list
-          uid: ext_azure-devops_az_pipelines_agent_list
-          displayName: az pipelines agent list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_agent_show
-          displayName: az pipelines agent show
-      - name: build
-        displayName: az pipelines build
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_build
-          displayName: az pipelines build
-        - name: list
-          uid: ext_azure-devops_az_pipelines_build_list
-          displayName: az pipelines build list
-        - name: queue
-          uid: ext_azure-devops_az_pipelines_build_queue
-          displayName: az pipelines build queue
-        - name: show
-          uid: ext_azure-devops_az_pipelines_build_show
-          displayName: az pipelines build show
-        - name: definition
-          displayName: az pipelines build definition
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_build_definition
-            displayName: az pipelines build definition
-          - name: list
-            uid: ext_azure-devops_az_pipelines_build_definition_list
-            displayName: az pipelines build definition list
-          - name: show
-            uid: ext_azure-devops_az_pipelines_build_definition_show
-            displayName: az pipelines build definition show
-        - name: tag
-          displayName: az pipelines build tag
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_build_tag
-            displayName: az pipelines build tag
-          - name: add
-            uid: ext_azure-devops_az_pipelines_build_tag_add
-            displayName: az pipelines build tag add
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_build_tag_delete
-            displayName: az pipelines build tag delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_build_tag_list
-            displayName: az pipelines build tag list
-      - name: folder
-        displayName: az pipelines folder
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_folder
-          displayName: az pipelines folder
-        - name: create
-          uid: ext_azure-devops_az_pipelines_folder_create
-          displayName: az pipelines folder create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_folder_delete
-          displayName: az pipelines folder delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_folder_list
-          displayName: az pipelines folder list
-        - name: update
-          uid: ext_azure-devops_az_pipelines_folder_update
-          displayName: az pipelines folder update
-      - name: pool
-        displayName: az pipelines pool
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_pool
-          displayName: az pipelines pool
-        - name: list
-          uid: ext_azure-devops_az_pipelines_pool_list
-          displayName: az pipelines pool list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_pool_show
-          displayName: az pipelines pool show
-      - name: queue
-        displayName: az pipelines queue
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_queue
-          displayName: az pipelines queue
-        - name: list
-          uid: ext_azure-devops_az_pipelines_queue_list
-          displayName: az pipelines queue list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_queue_show
-          displayName: az pipelines queue show
-      - name: release
-        displayName: az pipelines release
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_release
-          displayName: az pipelines release
-        - name: create
-          uid: ext_azure-devops_az_pipelines_release_create
-          displayName: az pipelines release create
-        - name: list
-          uid: ext_azure-devops_az_pipelines_release_list
-          displayName: az pipelines release list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_release_show
-          displayName: az pipelines release show
-        - name: definition
-          displayName: az pipelines release definition
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_release_definition
-            displayName: az pipelines release definition
-          - name: list
-            uid: ext_azure-devops_az_pipelines_release_definition_list
-            displayName: az pipelines release definition list
-          - name: show
-            uid: ext_azure-devops_az_pipelines_release_definition_show
-            displayName: az pipelines release definition show
-      - name: runs
-        displayName: az pipelines runs
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_runs
-          displayName: az pipelines runs
-        - name: list
-          uid: ext_azure-devops_az_pipelines_runs_list
-          displayName: az pipelines runs list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_runs_show
-          displayName: az pipelines runs show
-        - name: artifact
-          displayName: az pipelines runs artifact
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_runs_artifact
-            displayName: az pipelines runs artifact
-          - name: download
-            uid: ext_azure-devops_az_pipelines_runs_artifact_download
-            displayName: az pipelines runs artifact download
-          - name: list
-            uid: ext_azure-devops_az_pipelines_runs_artifact_list
-            displayName: az pipelines runs artifact list
-          - name: upload
-            uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-            displayName: az pipelines runs artifact upload
-        - name: tag
-          displayName: az pipelines runs tag
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_runs_tag
-            displayName: az pipelines runs tag
-          - name: add
-            uid: ext_azure-devops_az_pipelines_runs_tag_add
-            displayName: az pipelines runs tag add
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_runs_tag_delete
-            displayName: az pipelines runs tag delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_runs_tag_list
-            displayName: az pipelines runs tag list
-      - name: variable
-        displayName: az pipelines variable
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_variable
-          displayName: az pipelines variable
-        - name: create
-          uid: ext_azure-devops_az_pipelines_variable_create
-          displayName: az pipelines variable create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_variable_delete
-          displayName: az pipelines variable delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_variable_list
-          displayName: az pipelines variable list
-        - name: update
-          uid: ext_azure-devops_az_pipelines_variable_update
-          displayName: az pipelines variable update
-      - name: variable-group
-        displayName: az pipelines variable-group
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_variable_group
-          displayName: az pipelines variable-group
-        - name: create
-          uid: ext_azure-devops_az_pipelines_variable_group_create
-          displayName: az pipelines variable-group create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_variable_group_delete
-          displayName: az pipelines variable-group delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_variable_group_list
-          displayName: az pipelines variable-group list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_variable_group_show
-          displayName: az pipelines variable-group show
-        - name: update
-          uid: ext_azure-devops_az_pipelines_variable_group_update
-          displayName: az pipelines variable-group update
-        - name: variable
-          displayName: az pipelines variable-group variable
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_variable_group_variable
-            displayName: az pipelines variable-group variable
-          - name: create
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-            displayName: az pipelines variable-group variable create
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-            displayName: az pipelines variable-group variable delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-            displayName: az pipelines variable-group variable list
-          - name: update
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-            displayName: az pipelines variable-group variable update
-    - name: repos
-      displayName: az repos
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_repos
-        displayName: az repos
-      - name: create
-        uid: ext_azure-devops_az_repos_create
-        displayName: az repos create
-      - name: delete
-        uid: ext_azure-devops_az_repos_delete
-        displayName: az repos delete
-      - name: list
-        uid: ext_azure-devops_az_repos_list
-        displayName: az repos list
-      - name: show
-        uid: ext_azure-devops_az_repos_show
-        displayName: az repos show
-      - name: update
-        uid: ext_azure-devops_az_repos_update
-        displayName: az repos update
-      - name: import
-        displayName: az repos import
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_import
-          displayName: az repos import
-        - name: create
-          uid: ext_azure-devops_az_repos_import_create
-          displayName: az repos import create
-      - name: policy
-        displayName: az repos policy
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_policy
-          displayName: az repos policy
-        - name: create
-          uid: ext_azure-devops_az_repos_policy_create
-          displayName: az repos policy create
-        - name: delete
-          uid: ext_azure-devops_az_repos_policy_delete
-          displayName: az repos policy delete
-        - name: list
-          uid: ext_azure-devops_az_repos_policy_list
-          displayName: az repos policy list
-        - name: show
-          uid: ext_azure-devops_az_repos_policy_show
-          displayName: az repos policy show
-        - name: update
-          uid: ext_azure-devops_az_repos_policy_update
-          displayName: az repos policy update
-        - name: approver-count
-          displayName: az repos policy approver-count
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_approver_count
-            displayName: az repos policy approver-count
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_approver_count_create
-            displayName: az repos policy approver-count create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_approver_count_update
-            displayName: az repos policy approver-count update
-        - name: build
-          displayName: az repos policy build
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_build
-            displayName: az repos policy build
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_build_create
-            displayName: az repos policy build create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_build_update
-            displayName: az repos policy build update
-        - name: case-enforcement
-          displayName: az repos policy case-enforcement
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_case_enforcement
-            displayName: az repos policy case-enforcement
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-            displayName: az repos policy case-enforcement create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-            displayName: az repos policy case-enforcement update
-        - name: comment-required
-          displayName: az repos policy comment-required
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_comment_required
-            displayName: az repos policy comment-required
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_comment_required_create
-            displayName: az repos policy comment-required create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_comment_required_update
-            displayName: az repos policy comment-required update
-        - name: file-size
-          displayName: az repos policy file-size
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_file_size
-            displayName: az repos policy file-size
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_file_size_create
-            displayName: az repos policy file-size create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_file_size_update
-            displayName: az repos policy file-size update
-        - name: merge-strategy
-          displayName: az repos policy merge-strategy
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_merge_strategy
-            displayName: az repos policy merge-strategy
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-            displayName: az repos policy merge-strategy create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-            displayName: az repos policy merge-strategy update
-        - name: required-reviewer
-          displayName: az repos policy required-reviewer
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_required_reviewer
-            displayName: az repos policy required-reviewer
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-            displayName: az repos policy required-reviewer create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-            displayName: az repos policy required-reviewer update
-        - name: work-item-linking
-          displayName: az repos policy work-item-linking
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_work_item_linking
-            displayName: az repos policy work-item-linking
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-            displayName: az repos policy work-item-linking create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-            displayName: az repos policy work-item-linking update
-      - name: pr
-        displayName: az repos pr
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_pr
-          displayName: az repos pr
-        - name: checkout
-          uid: ext_azure-devops_az_repos_pr_checkout
-          displayName: az repos pr checkout
-        - name: create
-          uid: ext_azure-devops_az_repos_pr_create
-          displayName: az repos pr create
-        - name: list
-          uid: ext_azure-devops_az_repos_pr_list
-          displayName: az repos pr list
-        - name: set-vote
-          uid: ext_azure-devops_az_repos_pr_set_vote
-          displayName: az repos pr set-vote
-        - name: show
-          uid: ext_azure-devops_az_repos_pr_show
-          displayName: az repos pr show
-        - name: update
-          uid: ext_azure-devops_az_repos_pr_update
-          displayName: az repos pr update
-        - name: policy
-          displayName: az repos pr policy
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_policy
-            displayName: az repos pr policy
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_policy_list
-            displayName: az repos pr policy list
-          - name: queue
-            uid: ext_azure-devops_az_repos_pr_policy_queue
-            displayName: az repos pr policy queue
-        - name: reviewer
-          displayName: az repos pr reviewer
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_reviewer
-            displayName: az repos pr reviewer
-          - name: add
-            uid: ext_azure-devops_az_repos_pr_reviewer_add
-            displayName: az repos pr reviewer add
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_reviewer_list
-            displayName: az repos pr reviewer list
-          - name: remove
-            uid: ext_azure-devops_az_repos_pr_reviewer_remove
-            displayName: az repos pr reviewer remove
-        - name: work-item
-          displayName: az repos pr work-item
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_work_item
-            displayName: az repos pr work-item
-          - name: add
-            uid: ext_azure-devops_az_repos_pr_work_item_add
-            displayName: az repos pr work-item add
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_work_item_list
-            displayName: az repos pr work-item list
-          - name: remove
-            uid: ext_azure-devops_az_repos_pr_work_item_remove
-            displayName: az repos pr work-item remove
-      - name: ref
-        displayName: az repos ref
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_ref
-          displayName: az repos ref
-        - name: create
-          uid: ext_azure-devops_az_repos_ref_create
-          displayName: az repos ref create
-        - name: delete
-          uid: ext_azure-devops_az_repos_ref_delete
-          displayName: az repos ref delete
-        - name: list
-          uid: ext_azure-devops_az_repos_ref_list
-          displayName: az repos ref list
-        - name: lock
-          uid: ext_azure-devops_az_repos_ref_lock
-          displayName: az repos ref lock
-        - name: unlock
-          uid: ext_azure-devops_az_repos_ref_unlock
-          displayName: az repos ref unlock
-  - name: azure-firewall
-    items:
-    - name: Overview
-      uid: ext_azure-firewall_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_azure-firewall_az_network
-        displayName: az network
-      - name: firewall
-        displayName: az network firewall
-        items:
-        - name: Overview
-          uid: ext_azure-firewall_az_network_firewall
-          displayName: az network firewall
-        - name: create
-          uid: ext_azure-firewall_az_network_firewall_create
-          displayName: az network firewall create
-        - name: delete
-          uid: ext_azure-firewall_az_network_firewall_delete
-          displayName: az network firewall delete
-        - name: list
-          uid: ext_azure-firewall_az_network_firewall_list
-          displayName: az network firewall list
-        - name: list-fqdn-tags
-          uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-          displayName: az network firewall list-fqdn-tags
-        - name: show
-          uid: ext_azure-firewall_az_network_firewall_show
-          displayName: az network firewall show
-        - name: update
-          uid: ext_azure-firewall_az_network_firewall_update
-          displayName: az network firewall update
-        - name: application-rule
-          displayName: az network firewall application-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_application_rule
-            displayName: az network firewall application-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_application_rule_create
-            displayName: az network firewall application-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-            displayName: az network firewall application-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_application_rule_list
-            displayName: az network firewall application-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_application_rule_show
-            displayName: az network firewall application-rule show
-          - name: collection
-            displayName: az network firewall application-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-              displayName: az network firewall application-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-              displayName: az network firewall application-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-              displayName: az network firewall application-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-              displayName: az network firewall application-rule collection show
-        - name: ip-config
-          displayName: az network firewall ip-config
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_ip_config
-            displayName: az network firewall ip-config
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_ip_config_create
-            displayName: az network firewall ip-config create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-            displayName: az network firewall ip-config delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_ip_config_list
-            displayName: az network firewall ip-config list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_ip_config_show
-            displayName: az network firewall ip-config show
-        - name: management-ip-config
-          displayName: az network firewall management-ip-config
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config
-            displayName: az network firewall management-ip-config
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-            displayName: az network firewall management-ip-config show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-            displayName: az network firewall management-ip-config update
-        - name: nat-rule
-          displayName: az network firewall nat-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_nat_rule
-            displayName: az network firewall nat-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-            displayName: az network firewall nat-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-            displayName: az network firewall nat-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-            displayName: az network firewall nat-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-            displayName: az network firewall nat-rule show
-          - name: collection
-            displayName: az network firewall nat-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-              displayName: az network firewall nat-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-              displayName: az network firewall nat-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-              displayName: az network firewall nat-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-              displayName: az network firewall nat-rule collection show
-        - name: network-rule
-          displayName: az network firewall network-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_network_rule
-            displayName: az network firewall network-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_network_rule_create
-            displayName: az network firewall network-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-            displayName: az network firewall network-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_network_rule_list
-            displayName: az network firewall network-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_network_rule_show
-            displayName: az network firewall network-rule show
-          - name: collection
-            displayName: az network firewall network-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-              displayName: az network firewall network-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-              displayName: az network firewall network-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-              displayName: az network firewall network-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-              displayName: az network firewall network-rule collection show
-        - name: policy
-          displayName: az network firewall policy
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_policy
-            displayName: az network firewall policy
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_policy_create
-            displayName: az network firewall policy create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_policy_delete
-            displayName: az network firewall policy delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_policy_list
-            displayName: az network firewall policy list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_policy_show
-            displayName: az network firewall policy show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_policy_update
-            displayName: az network firewall policy update
-          - name: rule-collection-group
-            displayName: az network firewall policy rule-collection-group
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-              displayName: az network firewall policy rule-collection-group
-            - name: create
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-              displayName: az network firewall policy rule-collection-group create
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-              displayName: az network firewall policy rule-collection-group delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-              displayName: az network firewall policy rule-collection-group list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-              displayName: az network firewall policy rule-collection-group show
-            - name: update
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-              displayName: az network firewall policy rule-collection-group update
-            - name: collection
-              displayName: az network firewall policy rule-collection-group collection
-              items:
-              - name: Overview
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-                displayName: az network firewall policy rule-collection-group collection
-              - name: add-filter-collection
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-                displayName: az network firewall policy rule-collection-group collection add-filter-collection
-              - name: add-nat-collection
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-                displayName: az network firewall policy rule-collection-group collection add-nat-collection
-              - name: list
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-                displayName: az network firewall policy rule-collection-group collection list
-              - name: remove
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-                displayName: az network firewall policy rule-collection-group collection remove
-              - name: rule
-                displayName: az network firewall policy rule-collection-group collection rule
-                items:
-                - name: Overview
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-                  displayName: az network firewall policy rule-collection-group collection rule
-                - name: add
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-                  displayName: az network firewall policy rule-collection-group collection rule add
-                - name: remove
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-                  displayName: az network firewall policy rule-collection-group collection rule remove
-        - name: threat-intel-whitelist
-          displayName: az network firewall threat-intel-whitelist
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-            displayName: az network firewall threat-intel-whitelist
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-            displayName: az network firewall threat-intel-whitelist create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-            displayName: az network firewall threat-intel-whitelist delete
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-            displayName: az network firewall threat-intel-whitelist show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-            displayName: az network firewall threat-intel-whitelist update
-  - name: azure-iot
-    items:
-    - name: Overview
-      uid: ext_azure-iot_az
-    - name: IoT
-      displayName: az iot
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_iot
-        displayName: az iot
-      - name: Devices
-        displayName: az iot device
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_device
-          displayName: az iot device
-        - name: send-d2c-message
-          uid: ext_azure-iot_az_iot_device_send_d2c_message
-          displayName: az iot device send-d2c-message
-        - name: simulate
-          uid: ext_azure-iot_az_iot_device_simulate
-          displayName: az iot device simulate
-        - name: upload-file
-          uid: ext_azure-iot_az_iot_device_upload_file
-          displayName: az iot device upload-file
-        - name: c2d-message
-          displayName: az iot device c2d-message
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_device_c2d_message
-            displayName: az iot device c2d-message
-          - name: abandon
-            uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-            displayName: az iot device c2d-message abandon
-          - name: complete
-            uid: ext_azure-iot_az_iot_device_c2d_message_complete
-            displayName: az iot device c2d-message complete
-          - name: receive
-            uid: ext_azure-iot_az_iot_device_c2d_message_receive
-            displayName: az iot device c2d-message receive
-          - name: reject
-            uid: ext_azure-iot_az_iot_device_c2d_message_reject
-            displayName: az iot device c2d-message reject
-          - name: send
-            uid: ext_azure-iot_az_iot_device_c2d_message_send
-            displayName: az iot device c2d-message send
-      - name: Hubs
-        displayName: az iot hub
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_hub
-          displayName: az iot hub
-        - name: generate-sas-token
-          uid: ext_azure-iot_az_iot_hub_generate_sas_token
-          displayName: az iot hub generate-sas-token
-        - name: invoke-device-method
-          uid: ext_azure-iot_az_iot_hub_invoke_device_method
-          displayName: az iot hub invoke-device-method
-        - name: invoke-module-method
-          uid: ext_azure-iot_az_iot_hub_invoke_module_method
-          displayName: az iot hub invoke-module-method
-        - name: monitor-events
-          uid: ext_azure-iot_az_iot_hub_monitor_events
-          displayName: az iot hub monitor-events
-        - name: monitor-feedback
-          uid: ext_azure-iot_az_iot_hub_monitor_feedback
-          displayName: az iot hub monitor-feedback
-        - name: query
-          uid: ext_azure-iot_az_iot_hub_query
-          displayName: az iot hub query
-        - name: Jobs
-          displayName: az iot hub job
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_job
-            displayName: az iot hub job
-          - name: cancel
-            uid: ext_azure-iot_az_iot_hub_job_cancel
-            displayName: az iot hub job cancel
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_job_create
-            displayName: az iot hub job create
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_job_list
-            displayName: az iot hub job list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_job_show
-            displayName: az iot hub job show
-        - name: configuration
-          displayName: az iot hub configuration
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_configuration
-            displayName: az iot hub configuration
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_configuration_create
-            displayName: az iot hub configuration create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_configuration_delete
-            displayName: az iot hub configuration delete
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_configuration_list
-            displayName: az iot hub configuration list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_configuration_show
-            displayName: az iot hub configuration show
-          - name: show-metric
-            uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-            displayName: az iot hub configuration show-metric
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_configuration_update
-            displayName: az iot hub configuration update
-        - name: device-identity
-          displayName: az iot hub device-identity
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_device_identity
-            displayName: az iot hub device-identity
-          - name: add-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-            displayName: az iot hub device-identity add-children
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_device_identity_create
-            displayName: az iot hub device-identity create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_device_identity_delete
-            displayName: az iot hub device-identity delete
-          - name: export
-            uid: ext_azure-iot_az_iot_hub_device_identity_export
-            displayName: az iot hub device-identity export
-          - name: get-parent
-            uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-            displayName: az iot hub device-identity get-parent
-          - name: import
-            uid: ext_azure-iot_az_iot_hub_device_identity_import
-            displayName: az iot hub device-identity import
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_device_identity_list
-            displayName: az iot hub device-identity list
-          - name: list-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-            displayName: az iot hub device-identity list-children
-          - name: remove-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-            displayName: az iot hub device-identity remove-children
-          - name: set-parent
-            uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-            displayName: az iot hub device-identity set-parent
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_device_identity_show
-            displayName: az iot hub device-identity show
-          - name: show-connection-string
-            uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-            displayName: az iot hub device-identity show-connection-string
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_device_identity_update
-            displayName: az iot hub device-identity update
-        - name: device-twin
-          displayName: az iot hub device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_device_twin
-            displayName: az iot hub device-twin
-          - name: replace
-            uid: ext_azure-iot_az_iot_hub_device_twin_replace
-            displayName: az iot hub device-twin replace
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_device_twin_show
-            displayName: az iot hub device-twin show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_device_twin_update
-            displayName: az iot hub device-twin update
-        - name: distributed-tracing
-          displayName: az iot hub distributed-tracing
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing
-            displayName: az iot hub distributed-tracing
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-            displayName: az iot hub distributed-tracing show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-            displayName: az iot hub distributed-tracing update
-        - name: module-identity
-          displayName: az iot hub module-identity
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_module_identity
-            displayName: az iot hub module-identity
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_module_identity_create
-            displayName: az iot hub module-identity create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_module_identity_delete
-            displayName: az iot hub module-identity delete
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_module_identity_list
-            displayName: az iot hub module-identity list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_module_identity_show
-            displayName: az iot hub module-identity show
-          - name: show-connection-string
-            uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-            displayName: az iot hub module-identity show-connection-string
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_module_identity_update
-            displayName: az iot hub module-identity update
-        - name: module-twin
-          displayName: az iot hub module-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_module_twin
-            displayName: az iot hub module-twin
-          - name: replace
-            uid: ext_azure-iot_az_iot_hub_module_twin_replace
-            displayName: az iot hub module-twin replace
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_module_twin_show
-            displayName: az iot hub module-twin show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_module_twin_update
-            displayName: az iot hub module-twin update
-      - name: central
-        displayName: az iot central
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_central
-          displayName: az iot central
-        - name: app
-          displayName: az iot central app
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_central_app
-            displayName: az iot central app
-          - name: monitor-events
-            uid: ext_azure-iot_az_iot_central_app_monitor_events
-            displayName: az iot central app monitor-events
-          - name: validate-messages
-            uid: ext_azure-iot_az_iot_central_app_validate_messages
-            displayName: az iot central app validate-messages
-          - name: device
-            displayName: az iot central app device
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device
-              displayName: az iot central app device
-            - name: create
-              uid: ext_azure-iot_az_iot_central_app_device_create
-              displayName: az iot central app device create
-            - name: delete
-              uid: ext_azure-iot_az_iot_central_app_device_delete
-              displayName: az iot central app device delete
-            - name: list
-              uid: ext_azure-iot_az_iot_central_app_device_list
-              displayName: az iot central app device list
-            - name: registration-info
-              uid: ext_azure-iot_az_iot_central_app_device_registration_info
-              displayName: az iot central app device registration-info
-            - name: registration-summary
-              uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-              displayName: az iot central app device registration-summary
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_show
-              displayName: az iot central app device show
-          - name: device-template
-            displayName: az iot central app device-template
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device_template
-              displayName: az iot central app device-template
-            - name: create
-              uid: ext_azure-iot_az_iot_central_app_device_template_create
-              displayName: az iot central app device-template create
-            - name: delete
-              uid: ext_azure-iot_az_iot_central_app_device_template_delete
-              displayName: az iot central app device-template delete
-            - name: list
-              uid: ext_azure-iot_az_iot_central_app_device_template_list
-              displayName: az iot central app device-template list
-            - name: map
-              uid: ext_azure-iot_az_iot_central_app_device_template_map
-              displayName: az iot central app device-template map
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_template_show
-              displayName: az iot central app device-template show
-          - name: device-twin
-            displayName: az iot central app device-twin
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device_twin
-              displayName: az iot central app device-twin
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_twin_show
-              displayName: az iot central app device-twin show
-        - name: device-twin
-          displayName: az iot central device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_central_device_twin
-            displayName: az iot central device-twin
-          - name: show
-            uid: ext_azure-iot_az_iot_central_device_twin_show
-            displayName: az iot central device-twin show
-      - name: dps
-        displayName: az iot dps
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_dps
-          displayName: az iot dps
-        - name: enrollment
-          displayName: az iot dps enrollment
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_enrollment
-            displayName: az iot dps enrollment
-          - name: create
-            uid: ext_azure-iot_az_iot_dps_enrollment_create
-            displayName: az iot dps enrollment create
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_enrollment_delete
-            displayName: az iot dps enrollment delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_enrollment_list
-            displayName: az iot dps enrollment list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_enrollment_show
-            displayName: az iot dps enrollment show
-          - name: update
-            uid: ext_azure-iot_az_iot_dps_enrollment_update
-            displayName: az iot dps enrollment update
-        - name: enrollment-group
-          displayName: az iot dps enrollment-group
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_enrollment_group
-            displayName: az iot dps enrollment-group
-          - name: create
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-            displayName: az iot dps enrollment-group create
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-            displayName: az iot dps enrollment-group delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-            displayName: az iot dps enrollment-group list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-            displayName: az iot dps enrollment-group show
-          - name: update
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-            displayName: az iot dps enrollment-group update
-        - name: registration
-          displayName: az iot dps registration
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_registration
-            displayName: az iot dps registration
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_registration_delete
-            displayName: az iot dps registration delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_registration_list
-            displayName: az iot dps registration list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_registration_show
-            displayName: az iot dps registration show
-      - name: dt
-        displayName: az iot dt
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_dt
-          displayName: az iot dt
-        - name: invoke-command
-          uid: ext_azure-iot_az_iot_dt_invoke_command
-          displayName: az iot dt invoke-command
-        - name: list-commands
-          uid: ext_azure-iot_az_iot_dt_list_commands
-          displayName: az iot dt list-commands
-        - name: list-interfaces
-          uid: ext_azure-iot_az_iot_dt_list_interfaces
-          displayName: az iot dt list-interfaces
-        - name: list-properties
-          uid: ext_azure-iot_az_iot_dt_list_properties
-          displayName: az iot dt list-properties
-        - name: monitor-events
-          uid: ext_azure-iot_az_iot_dt_monitor_events
-          displayName: az iot dt monitor-events
-        - name: update-property
-          uid: ext_azure-iot_az_iot_dt_update_property
-          displayName: az iot dt update-property
-      - name: edge
-        displayName: az iot edge
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_edge
-          displayName: az iot edge
-        - name: set-modules
-          uid: ext_azure-iot_az_iot_edge_set_modules
-          displayName: az iot edge set-modules
-        - name: deployment
-          displayName: az iot edge deployment
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_edge_deployment
-            displayName: az iot edge deployment
-          - name: create
-            uid: ext_azure-iot_az_iot_edge_deployment_create
-            displayName: az iot edge deployment create
-          - name: delete
-            uid: ext_azure-iot_az_iot_edge_deployment_delete
-            displayName: az iot edge deployment delete
-          - name: list
-            uid: ext_azure-iot_az_iot_edge_deployment_list
-            displayName: az iot edge deployment list
-          - name: show
-            uid: ext_azure-iot_az_iot_edge_deployment_show
-            displayName: az iot edge deployment show
-          - name: show-metric
-            uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-            displayName: az iot edge deployment show-metric
-          - name: update
-            uid: ext_azure-iot_az_iot_edge_deployment_update
-            displayName: az iot edge deployment update
-      - name: pnp
-        displayName: az iot pnp
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_pnp
-          displayName: az iot pnp
-        - name: capability-model
-          displayName: az iot pnp capability-model
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_pnp_capability_model
-            displayName: az iot pnp capability-model
-          - name: create
-            uid: ext_azure-iot_az_iot_pnp_capability_model_create
-            displayName: az iot pnp capability-model create
-          - name: delete
-            uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-            displayName: az iot pnp capability-model delete
-          - name: list
-            uid: ext_azure-iot_az_iot_pnp_capability_model_list
-            displayName: az iot pnp capability-model list
-          - name: publish
-            uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-            displayName: az iot pnp capability-model publish
-          - name: show
-            uid: ext_azure-iot_az_iot_pnp_capability_model_show
-            displayName: az iot pnp capability-model show
-          - name: update
-            uid: ext_azure-iot_az_iot_pnp_capability_model_update
-            displayName: az iot pnp capability-model update
-        - name: interface
-          displayName: az iot pnp interface
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_pnp_interface
-            displayName: az iot pnp interface
-          - name: create
-            uid: ext_azure-iot_az_iot_pnp_interface_create
-            displayName: az iot pnp interface create
-          - name: delete
-            uid: ext_azure-iot_az_iot_pnp_interface_delete
-            displayName: az iot pnp interface delete
-          - name: list
-            uid: ext_azure-iot_az_iot_pnp_interface_list
-            displayName: az iot pnp interface list
-          - name: publish
-            uid: ext_azure-iot_az_iot_pnp_interface_publish
-            displayName: az iot pnp interface publish
-          - name: show
-            uid: ext_azure-iot_az_iot_pnp_interface_show
-            displayName: az iot pnp interface show
-          - name: update
-            uid: ext_azure-iot_az_iot_pnp_interface_update
-            displayName: az iot pnp interface update
-    - name: dt
-      displayName: az dt
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_dt
-        displayName: az dt
-      - name: create
-        uid: ext_azure-iot_az_dt_create
-        displayName: az dt create
-      - name: delete
-        uid: ext_azure-iot_az_dt_delete
-        displayName: az dt delete
-      - name: list
-        uid: ext_azure-iot_az_dt_list
-        displayName: az dt list
-      - name: show
-        uid: ext_azure-iot_az_dt_show
-        displayName: az dt show
-      - name: endpoint
-        displayName: az dt endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_endpoint
-          displayName: az dt endpoint
-        - name: delete
-          uid: ext_azure-iot_az_dt_endpoint_delete
-          displayName: az dt endpoint delete
-        - name: list
-          uid: ext_azure-iot_az_dt_endpoint_list
-          displayName: az dt endpoint list
-        - name: show
-          uid: ext_azure-iot_az_dt_endpoint_show
-          displayName: az dt endpoint show
-        - name: create
-          displayName: az dt endpoint create
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_endpoint_create
-            displayName: az dt endpoint create
-          - name: eventgrid
-            uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-            displayName: az dt endpoint create eventgrid
-          - name: eventhub
-            uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-            displayName: az dt endpoint create eventhub
-          - name: servicebus
-            uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-            displayName: az dt endpoint create servicebus
-      - name: model
-        displayName: az dt model
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_model
-          displayName: az dt model
-        - name: create
-          uid: ext_azure-iot_az_dt_model_create
-          displayName: az dt model create
-        - name: delete
-          uid: ext_azure-iot_az_dt_model_delete
-          displayName: az dt model delete
-        - name: list
-          uid: ext_azure-iot_az_dt_model_list
-          displayName: az dt model list
-        - name: show
-          uid: ext_azure-iot_az_dt_model_show
-          displayName: az dt model show
-        - name: update
-          uid: ext_azure-iot_az_dt_model_update
-          displayName: az dt model update
-      - name: role-assignment
-        displayName: az dt role-assignment
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_role_assignment
-          displayName: az dt role-assignment
-        - name: create
-          uid: ext_azure-iot_az_dt_role_assignment_create
-          displayName: az dt role-assignment create
-        - name: delete
-          uid: ext_azure-iot_az_dt_role_assignment_delete
-          displayName: az dt role-assignment delete
-        - name: list
-          uid: ext_azure-iot_az_dt_role_assignment_list
-          displayName: az dt role-assignment list
-      - name: route
-        displayName: az dt route
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_route
-          displayName: az dt route
-        - name: create
-          uid: ext_azure-iot_az_dt_route_create
-          displayName: az dt route create
-        - name: delete
-          uid: ext_azure-iot_az_dt_route_delete
-          displayName: az dt route delete
-        - name: list
-          uid: ext_azure-iot_az_dt_route_list
-          displayName: az dt route list
-        - name: show
-          uid: ext_azure-iot_az_dt_route_show
-          displayName: az dt route show
-      - name: twin
-        displayName: az dt twin
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_twin
-          displayName: az dt twin
-        - name: create
-          uid: ext_azure-iot_az_dt_twin_create
-          displayName: az dt twin create
-        - name: delete
-          uid: ext_azure-iot_az_dt_twin_delete
-          displayName: az dt twin delete
-        - name: query
-          uid: ext_azure-iot_az_dt_twin_query
-          displayName: az dt twin query
-        - name: show
-          uid: ext_azure-iot_az_dt_twin_show
-          displayName: az dt twin show
-        - name: update
-          uid: ext_azure-iot_az_dt_twin_update
-          displayName: az dt twin update
-        - name: component
-          displayName: az dt twin component
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_component
-            displayName: az dt twin component
-          - name: show
-            uid: ext_azure-iot_az_dt_twin_component_show
-            displayName: az dt twin component show
-          - name: update
-            uid: ext_azure-iot_az_dt_twin_component_update
-            displayName: az dt twin component update
-        - name: relationship
-          displayName: az dt twin relationship
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_relationship
-            displayName: az dt twin relationship
-          - name: create
-            uid: ext_azure-iot_az_dt_twin_relationship_create
-            displayName: az dt twin relationship create
-          - name: delete
-            uid: ext_azure-iot_az_dt_twin_relationship_delete
-            displayName: az dt twin relationship delete
-          - name: list
-            uid: ext_azure-iot_az_dt_twin_relationship_list
-            displayName: az dt twin relationship list
-          - name: show
-            uid: ext_azure-iot_az_dt_twin_relationship_show
-            displayName: az dt twin relationship show
-          - name: update
-            uid: ext_azure-iot_az_dt_twin_relationship_update
-            displayName: az dt twin relationship update
-        - name: telemetry
-          displayName: az dt twin telemetry
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_telemetry
-            displayName: az dt twin telemetry
-          - name: send
-            uid: ext_azure-iot_az_dt_twin_telemetry_send
-            displayName: az dt twin telemetry send
-    - name: iotcentral
-      displayName: az iotcentral
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_iotcentral
-        displayName: az iotcentral
-      - name: app
-        displayName: az iotcentral app
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iotcentral_app
-          displayName: az iotcentral app
-        - name: monitor-events
-          uid: ext_azure-iot_az_iotcentral_app_monitor_events
-          displayName: az iotcentral app monitor-events
-        - name: device-twin
-          displayName: az iotcentral app device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iotcentral_app_device_twin
-            displayName: az iotcentral app device-twin
-          - name: show
-            uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-            displayName: az iotcentral app device-twin show
-      - name: device-twin
-        displayName: az iotcentral device-twin
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iotcentral_device_twin
-          displayName: az iotcentral device-twin
-        - name: show
-          uid: ext_azure-iot_az_iotcentral_device_twin_show
-          displayName: az iotcentral device-twin show
-  - name: blockchain
-    items:
-    - name: Overview
-      uid: ext_blockchain_az
-    - name: blockchain
-      displayName: az blockchain
-      items:
-      - name: Overview
-        uid: ext_blockchain_az_blockchain
-        displayName: az blockchain
-      - name: consortium
-        displayName: az blockchain consortium
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_consortium
-          displayName: az blockchain consortium
-        - name: list
-          uid: ext_blockchain_az_blockchain_consortium_list
-          displayName: az blockchain consortium list
-      - name: member
-        displayName: az blockchain member
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_member
-          displayName: az blockchain member
-        - name: create
-          uid: ext_blockchain_az_blockchain_member_create
-          displayName: az blockchain member create
-        - name: delete
-          uid: ext_blockchain_az_blockchain_member_delete
-          displayName: az blockchain member delete
-        - name: list
-          uid: ext_blockchain_az_blockchain_member_list
-          displayName: az blockchain member list
-        - name: list-api-key
-          uid: ext_blockchain_az_blockchain_member_list_api_key
-          displayName: az blockchain member list-api-key
-        - name: list-consortium-member
-          uid: ext_blockchain_az_blockchain_member_list_consortium_member
-          displayName: az blockchain member list-consortium-member
-        - name: regenerate-api-key
-          uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-          displayName: az blockchain member regenerate-api-key
-        - name: show
-          uid: ext_blockchain_az_blockchain_member_show
-          displayName: az blockchain member show
-        - name: update
-          uid: ext_blockchain_az_blockchain_member_update
-          displayName: az blockchain member update
-        - name: wait
-          uid: ext_blockchain_az_blockchain_member_wait
-          displayName: az blockchain member wait
-      - name: transaction-node
-        displayName: az blockchain transaction-node
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_transaction_node
-          displayName: az blockchain transaction-node
-        - name: create
-          uid: ext_blockchain_az_blockchain_transaction_node_create
-          displayName: az blockchain transaction-node create
-        - name: delete
-          uid: ext_blockchain_az_blockchain_transaction_node_delete
-          displayName: az blockchain transaction-node delete
-        - name: list
-          uid: ext_blockchain_az_blockchain_transaction_node_list
-          displayName: az blockchain transaction-node list
-        - name: list-api-key
-          uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-          displayName: az blockchain transaction-node list-api-key
-        - name: regenerate-api-key
-          uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-          displayName: az blockchain transaction-node regenerate-api-key
-        - name: show
-          uid: ext_blockchain_az_blockchain_transaction_node_show
-          displayName: az blockchain transaction-node show
-        - name: update
-          uid: ext_blockchain_az_blockchain_transaction_node_update
-          displayName: az blockchain transaction-node update
-        - name: wait
-          uid: ext_blockchain_az_blockchain_transaction_node_wait
-          displayName: az blockchain transaction-node wait
-  - name: blueprint
-    items:
-    - name: Overview
-      uid: ext_blueprint_az
-    - name: blueprint
-      displayName: az blueprint
-      items:
-      - name: Overview
-        uid: ext_blueprint_az_blueprint
-        displayName: az blueprint
-      - name: create
-        uid: ext_blueprint_az_blueprint_create
-        displayName: az blueprint create
-      - name: delete
-        uid: ext_blueprint_az_blueprint_delete
-        displayName: az blueprint delete
-      - name: import
-        uid: ext_blueprint_az_blueprint_import
-        displayName: az blueprint import
-      - name: list
-        uid: ext_blueprint_az_blueprint_list
-        displayName: az blueprint list
-      - name: publish
-        uid: ext_blueprint_az_blueprint_publish
-        displayName: az blueprint publish
-      - name: show
-        uid: ext_blueprint_az_blueprint_show
-        displayName: az blueprint show
-      - name: update
-        uid: ext_blueprint_az_blueprint_update
-        displayName: az blueprint update
-      - name: artifact
-        displayName: az blueprint artifact
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_artifact
-          displayName: az blueprint artifact
-        - name: delete
-          uid: ext_blueprint_az_blueprint_artifact_delete
-          displayName: az blueprint artifact delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_artifact_list
-          displayName: az blueprint artifact list
-        - name: show
-          uid: ext_blueprint_az_blueprint_artifact_show
-          displayName: az blueprint artifact show
-        - name: policy
-          displayName: az blueprint artifact policy
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_policy
-            displayName: az blueprint artifact policy
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_policy_create
-            displayName: az blueprint artifact policy create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_policy_update
-            displayName: az blueprint artifact policy update
-        - name: role
-          displayName: az blueprint artifact role
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_role
-            displayName: az blueprint artifact role
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_role_create
-            displayName: az blueprint artifact role create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_role_update
-            displayName: az blueprint artifact role update
-        - name: template
-          displayName: az blueprint artifact template
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_template
-            displayName: az blueprint artifact template
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_template_create
-            displayName: az blueprint artifact template create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_template_update
-            displayName: az blueprint artifact template update
-      - name: assignment
-        displayName: az blueprint assignment
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_assignment
-          displayName: az blueprint assignment
-        - name: create
-          uid: ext_blueprint_az_blueprint_assignment_create
-          displayName: az blueprint assignment create
-        - name: delete
-          uid: ext_blueprint_az_blueprint_assignment_delete
-          displayName: az blueprint assignment delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_assignment_list
-          displayName: az blueprint assignment list
-        - name: show
-          uid: ext_blueprint_az_blueprint_assignment_show
-          displayName: az blueprint assignment show
-        - name: update
-          uid: ext_blueprint_az_blueprint_assignment_update
-          displayName: az blueprint assignment update
-        - name: wait
-          uid: ext_blueprint_az_blueprint_assignment_wait
-          displayName: az blueprint assignment wait
-        - name: who
-          uid: ext_blueprint_az_blueprint_assignment_who
-          displayName: az blueprint assignment who
-      - name: resource-group
-        displayName: az blueprint resource-group
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_resource_group
-          displayName: az blueprint resource-group
-        - name: add
-          uid: ext_blueprint_az_blueprint_resource_group_add
-          displayName: az blueprint resource-group add
-        - name: list
-          uid: ext_blueprint_az_blueprint_resource_group_list
-          displayName: az blueprint resource-group list
-        - name: remove
-          uid: ext_blueprint_az_blueprint_resource_group_remove
-          displayName: az blueprint resource-group remove
-        - name: show
-          uid: ext_blueprint_az_blueprint_resource_group_show
-          displayName: az blueprint resource-group show
-        - name: update
-          uid: ext_blueprint_az_blueprint_resource_group_update
-          displayName: az blueprint resource-group update
-      - name: version
-        displayName: az blueprint version
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_version
-          displayName: az blueprint version
-        - name: delete
-          uid: ext_blueprint_az_blueprint_version_delete
-          displayName: az blueprint version delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_version_list
-          displayName: az blueprint version list
-        - name: show
-          uid: ext_blueprint_az_blueprint_version_show
-          displayName: az blueprint version show
-        - name: artifact
-          displayName: az blueprint version artifact
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_version_artifact
-            displayName: az blueprint version artifact
-          - name: list
-            uid: ext_blueprint_az_blueprint_version_artifact_list
-            displayName: az blueprint version artifact list
-          - name: show
-            uid: ext_blueprint_az_blueprint_version_artifact_show
-            displayName: az blueprint version artifact show
-  - name: codespaces
-    items:
-    - name: Overview
-      uid: ext_codespaces_az
-    - name: codespace
-      displayName: az codespace
-      items:
-      - name: Overview
-        uid: ext_codespaces_az_codespace
-        displayName: az codespace
-      - name: create
-        uid: ext_codespaces_az_codespace_create
-        displayName: az codespace create
-      - name: delete
-        uid: ext_codespaces_az_codespace_delete
-        displayName: az codespace delete
-      - name: list
-        uid: ext_codespaces_az_codespace_list
-        displayName: az codespace list
-      - name: open
-        uid: ext_codespaces_az_codespace_open
-        displayName: az codespace open
-      - name: resume
-        uid: ext_codespaces_az_codespace_resume
-        displayName: az codespace resume
-      - name: show
-        uid: ext_codespaces_az_codespace_show
-        displayName: az codespace show
-      - name: suspend
-        uid: ext_codespaces_az_codespace_suspend
-        displayName: az codespace suspend
-      - name: location
-        displayName: az codespace location
-        items:
-        - name: Overview
-          uid: ext_codespaces_az_codespace_location
-          displayName: az codespace location
-        - name: list
-          uid: ext_codespaces_az_codespace_location_list
-          displayName: az codespace location list
-        - name: show
-          uid: ext_codespaces_az_codespace_location_show
-          displayName: az codespace location show
-      - name: plan
-        displayName: az codespace plan
-        items:
-        - name: Overview
-          uid: ext_codespaces_az_codespace_plan
-          displayName: az codespace plan
-        - name: create
-          uid: ext_codespaces_az_codespace_plan_create
-          displayName: az codespace plan create
-        - name: delete
-          uid: ext_codespaces_az_codespace_plan_delete
-          displayName: az codespace plan delete
-        - name: list
-          uid: ext_codespaces_az_codespace_plan_list
-          displayName: az codespace plan list
-        - name: show
-          uid: ext_codespaces_az_codespace_plan_show
-          displayName: az codespace plan show
-  - name: connectedk8s
-    items:
-    - name: Overview
-      uid: ext_connectedk8s_az
-    - name: connectedk8s
-      displayName: az connectedk8s
-      items:
-      - name: Overview
-        uid: ext_connectedk8s_az_connectedk8s
-        displayName: az connectedk8s
-      - name: connect
-        uid: ext_connectedk8s_az_connectedk8s_connect
-        displayName: az connectedk8s connect
-      - name: delete
-        uid: ext_connectedk8s_az_connectedk8s_delete
-        displayName: az connectedk8s delete
-      - name: list
-        uid: ext_connectedk8s_az_connectedk8s_list
-        displayName: az connectedk8s list
-      - name: show
-        uid: ext_connectedk8s_az_connectedk8s_show
-        displayName: az connectedk8s show
-  - name: connectedmachine
-    items:
-    - name: Overview
-      uid: ext_connectedmachine_az
-    - name: connectedmachine
-      displayName: az connectedmachine
-      items:
-      - name: Overview
-        uid: ext_connectedmachine_az_connectedmachine
-        displayName: az connectedmachine
-      - name: delete
-        uid: ext_connectedmachine_az_connectedmachine_delete
-        displayName: az connectedmachine delete
-      - name: list
-        uid: ext_connectedmachine_az_connectedmachine_list
-        displayName: az connectedmachine list
-      - name: show
-        uid: ext_connectedmachine_az_connectedmachine_show
-        displayName: az connectedmachine show
-  - name: costmanagement
-    items:
-    - name: Overview
-      uid: ext_costmanagement_az
-    - name: costmanagement
-      displayName: az costmanagement
-      items:
-      - name: Overview
-        uid: ext_costmanagement_az_costmanagement
-        displayName: az costmanagement
-      - name: query
-        uid: ext_costmanagement_az_costmanagement_query
-        displayName: az costmanagement query
-      - name: export
-        displayName: az costmanagement export
-        items:
-        - name: Overview
-          uid: ext_costmanagement_az_costmanagement_export
-          displayName: az costmanagement export
-        - name: create
-          uid: ext_costmanagement_az_costmanagement_export_create
-          displayName: az costmanagement export create
-        - name: delete
-          uid: ext_costmanagement_az_costmanagement_export_delete
-          displayName: az costmanagement export delete
-        - name: list
-          uid: ext_costmanagement_az_costmanagement_export_list
-          displayName: az costmanagement export list
-        - name: show
-          uid: ext_costmanagement_az_costmanagement_export_show
-          displayName: az costmanagement export show
-        - name: update
-          uid: ext_costmanagement_az_costmanagement_export_update
-          displayName: az costmanagement export update
-  - name: csvmware
-    items:
-    - name: Overview
-      uid: ext_csvmware_az
-    - name: csvmware
-      displayName: az csvmware
-      items:
-      - name: Overview
-        uid: ext_csvmware_az_csvmware
-        displayName: az csvmware
-      - name: private-cloud
-        displayName: az csvmware private-cloud
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_private_cloud
-          displayName: az csvmware private-cloud
-        - name: list
-          uid: ext_csvmware_az_csvmware_private_cloud_list
-          displayName: az csvmware private-cloud list
-        - name: show
-          uid: ext_csvmware_az_csvmware_private_cloud_show
-          displayName: az csvmware private-cloud show
-      - name: resource-pool
-        displayName: az csvmware resource-pool
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_resource_pool
-          displayName: az csvmware resource-pool
-        - name: list
-          uid: ext_csvmware_az_csvmware_resource_pool_list
-          displayName: az csvmware resource-pool list
-        - name: show
-          uid: ext_csvmware_az_csvmware_resource_pool_show
-          displayName: az csvmware resource-pool show
-      - name: virtual-network
-        displayName: az csvmware virtual-network
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_virtual_network
-          displayName: az csvmware virtual-network
-        - name: list
-          uid: ext_csvmware_az_csvmware_virtual_network_list
-          displayName: az csvmware virtual-network list
-        - name: show
-          uid: ext_csvmware_az_csvmware_virtual_network_show
-          displayName: az csvmware virtual-network show
-      - name: vm
-        displayName: az csvmware vm
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_vm
-          displayName: az csvmware vm
-        - name: create
-          uid: ext_csvmware_az_csvmware_vm_create
-          displayName: az csvmware vm create
-        - name: delete
-          uid: ext_csvmware_az_csvmware_vm_delete
-          displayName: az csvmware vm delete
-        - name: list
-          uid: ext_csvmware_az_csvmware_vm_list
-          displayName: az csvmware vm list
-        - name: show
-          uid: ext_csvmware_az_csvmware_vm_show
-          displayName: az csvmware vm show
-        - name: start
-          uid: ext_csvmware_az_csvmware_vm_start
-          displayName: az csvmware vm start
-        - name: stop
-          uid: ext_csvmware_az_csvmware_vm_stop
-          displayName: az csvmware vm stop
-        - name: update
-          uid: ext_csvmware_az_csvmware_vm_update
-          displayName: az csvmware vm update
-        - name: disk
-          displayName: az csvmware vm disk
-          items:
-          - name: Overview
-            uid: ext_csvmware_az_csvmware_vm_disk
-            displayName: az csvmware vm disk
-          - name: add
-            uid: ext_csvmware_az_csvmware_vm_disk_add
-            displayName: az csvmware vm disk add
-          - name: delete
-            uid: ext_csvmware_az_csvmware_vm_disk_delete
-            displayName: az csvmware vm disk delete
-          - name: list
-            uid: ext_csvmware_az_csvmware_vm_disk_list
-            displayName: az csvmware vm disk list
-          - name: show
-            uid: ext_csvmware_az_csvmware_vm_disk_show
-            displayName: az csvmware vm disk show
-        - name: nic
-          displayName: az csvmware vm nic
-          items:
-          - name: Overview
-            uid: ext_csvmware_az_csvmware_vm_nic
-            displayName: az csvmware vm nic
-          - name: add
-            uid: ext_csvmware_az_csvmware_vm_nic_add
-            displayName: az csvmware vm nic add
-          - name: delete
-            uid: ext_csvmware_az_csvmware_vm_nic_delete
-            displayName: az csvmware vm nic delete
-          - name: list
-            uid: ext_csvmware_az_csvmware_vm_nic_list
-            displayName: az csvmware vm nic list
-          - name: show
-            uid: ext_csvmware_az_csvmware_vm_nic_show
-            displayName: az csvmware vm nic show
-      - name: vm-template
-        displayName: az csvmware vm-template
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_vm_template
-          displayName: az csvmware vm-template
-        - name: list
-          uid: ext_csvmware_az_csvmware_vm_template_list
-          displayName: az csvmware vm-template list
-        - name: show
-          uid: ext_csvmware_az_csvmware_vm_template_show
-          displayName: az csvmware vm-template show
-  - name: custom-providers
-    items:
-    - name: Overview
-      uid: ext_custom-providers_az
-    - name: custom-providers
-      displayName: az custom-providers
-      items:
-      - name: Overview
-        uid: ext_custom-providers_az_custom_providers
-        displayName: az custom-providers
-      - name: resource-provider
-        displayName: az custom-providers resource-provider
-        items:
-        - name: Overview
-          uid: ext_custom-providers_az_custom_providers_resource_provider
-          displayName: az custom-providers resource-provider
-        - name: create
-          uid: ext_custom-providers_az_custom_providers_resource_provider_create
-          displayName: az custom-providers resource-provider create
-        - name: delete
-          uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-          displayName: az custom-providers resource-provider delete
-        - name: list
-          uid: ext_custom-providers_az_custom_providers_resource_provider_list
-          displayName: az custom-providers resource-provider list
-        - name: show
-          uid: ext_custom-providers_az_custom_providers_resource_provider_show
-          displayName: az custom-providers resource-provider show
-        - name: update
-          uid: ext_custom-providers_az_custom_providers_resource_provider_update
-          displayName: az custom-providers resource-provider update
-  - name: databox
-    items:
-    - name: Overview
-      uid: ext_databox_az
-    - name: databox
-      displayName: az databox
-      items:
-      - name: Overview
-        uid: ext_databox_az_databox
-        displayName: az databox
-      - name: job
-        displayName: az databox job
-        items:
-        - name: Overview
-          uid: ext_databox_az_databox_job
-          displayName: az databox job
-        - name: cancel
-          uid: ext_databox_az_databox_job_cancel
-          displayName: az databox job cancel
-        - name: create
-          uid: ext_databox_az_databox_job_create
-          displayName: az databox job create
-        - name: delete
-          uid: ext_databox_az_databox_job_delete
-          displayName: az databox job delete
-        - name: list
-          uid: ext_databox_az_databox_job_list
-          displayName: az databox job list
-        - name: list-credentials
-          uid: ext_databox_az_databox_job_list_credentials
-          displayName: az databox job list-credentials
-        - name: show
-          uid: ext_databox_az_databox_job_show
-          displayName: az databox job show
-        - name: update
-          uid: ext_databox_az_databox_job_update
-          displayName: az databox job update
-  - name: databricks
-    items:
-    - name: Overview
-      uid: ext_databricks_az
-    - name: databricks
-      displayName: az databricks
-      items:
-      - name: Overview
-        uid: ext_databricks_az_databricks
-        displayName: az databricks
-      - name: workspace
-        displayName: az databricks workspace
-        items:
-        - name: Overview
-          uid: ext_databricks_az_databricks_workspace
-          displayName: az databricks workspace
-        - name: create
-          uid: ext_databricks_az_databricks_workspace_create
-          displayName: az databricks workspace create
-        - name: delete
-          uid: ext_databricks_az_databricks_workspace_delete
-          displayName: az databricks workspace delete
-        - name: list
-          uid: ext_databricks_az_databricks_workspace_list
-          displayName: az databricks workspace list
-        - name: show
-          uid: ext_databricks_az_databricks_workspace_show
-          displayName: az databricks workspace show
-        - name: update
-          uid: ext_databricks_az_databricks_workspace_update
-          displayName: az databricks workspace update
-        - name: wait
-          uid: ext_databricks_az_databricks_workspace_wait
-          displayName: az databricks workspace wait
-  - name: datashare
-    items:
-    - name: Overview
-      uid: ext_datashare_az
-    - name: datashare
-      displayName: az datashare
-      items:
-      - name: Overview
-        uid: ext_datashare_az_datashare
-        displayName: az datashare
-      - name: create
-        uid: ext_datashare_az_datashare_create
-        displayName: az datashare create
-      - name: delete
-        uid: ext_datashare_az_datashare_delete
-        displayName: az datashare delete
-      - name: list
-        uid: ext_datashare_az_datashare_list
-        displayName: az datashare list
-      - name: show
-        uid: ext_datashare_az_datashare_show
-        displayName: az datashare show
-      - name: wait
-        uid: ext_datashare_az_datashare_wait
-        displayName: az datashare wait
-      - name: account
-        displayName: az datashare account
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_account
-          displayName: az datashare account
-        - name: create
-          uid: ext_datashare_az_datashare_account_create
-          displayName: az datashare account create
-        - name: delete
-          uid: ext_datashare_az_datashare_account_delete
-          displayName: az datashare account delete
-        - name: list
-          uid: ext_datashare_az_datashare_account_list
-          displayName: az datashare account list
-        - name: show
-          uid: ext_datashare_az_datashare_account_show
-          displayName: az datashare account show
-        - name: update
-          uid: ext_datashare_az_datashare_account_update
-          displayName: az datashare account update
-        - name: wait
-          uid: ext_datashare_az_datashare_account_wait
-          displayName: az datashare account wait
-      - name: consumer
-        displayName: az datashare consumer
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_consumer
-          displayName: az datashare consumer
-        - name: dataset-mapping
-          displayName: az datashare consumer dataset-mapping
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping
-            displayName: az datashare consumer dataset-mapping
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-            displayName: az datashare consumer dataset-mapping create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-            displayName: az datashare consumer dataset-mapping delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-            displayName: az datashare consumer dataset-mapping list
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-            displayName: az datashare consumer dataset-mapping show
-        - name: invitation
-          displayName: az datashare consumer invitation
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_invitation
-            displayName: az datashare consumer invitation
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_invitation_list
-            displayName: az datashare consumer invitation list
-          - name: reject
-            uid: ext_datashare_az_datashare_consumer_invitation_reject
-            displayName: az datashare consumer invitation reject
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_invitation_show
-            displayName: az datashare consumer invitation show
-        - name: share-subscription
-          displayName: az datashare consumer share-subscription
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_share_subscription
-            displayName: az datashare consumer share-subscription
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_share_subscription_create
-            displayName: az datashare consumer share-subscription create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-            displayName: az datashare consumer share-subscription delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list
-            displayName: az datashare consumer share-subscription list
-          - name: list-source-dataset
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-            displayName: az datashare consumer share-subscription list-source-dataset
-          - name: list-source-share-synchronization-setting
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-            displayName: az datashare consumer share-subscription list-source-share-synchronization-setting
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_share_subscription_show
-            displayName: az datashare consumer share-subscription show
-          - name: wait
-            uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-            displayName: az datashare consumer share-subscription wait
-          - name: synchronization
-            displayName: az datashare consumer share-subscription synchronization
-            items:
-            - name: Overview
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-              displayName: az datashare consumer share-subscription synchronization
-            - name: cancel
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-              displayName: az datashare consumer share-subscription synchronization cancel
-            - name: list
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-              displayName: az datashare consumer share-subscription synchronization list
-            - name: list-detail
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-              displayName: az datashare consumer share-subscription synchronization list-detail
-            - name: start
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-              displayName: az datashare consumer share-subscription synchronization start
-            - name: wait
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-              displayName: az datashare consumer share-subscription synchronization wait
-        - name: trigger
-          displayName: az datashare consumer trigger
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_trigger
-            displayName: az datashare consumer trigger
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_trigger_create
-            displayName: az datashare consumer trigger create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_trigger_delete
-            displayName: az datashare consumer trigger delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_trigger_list
-            displayName: az datashare consumer trigger list
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_trigger_show
-            displayName: az datashare consumer trigger show
-          - name: wait
-            uid: ext_datashare_az_datashare_consumer_trigger_wait
-            displayName: az datashare consumer trigger wait
-      - name: dataset
-        displayName: az datashare dataset
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_dataset
-          displayName: az datashare dataset
-        - name: create
-          uid: ext_datashare_az_datashare_dataset_create
-          displayName: az datashare dataset create
-        - name: delete
-          uid: ext_datashare_az_datashare_dataset_delete
-          displayName: az datashare dataset delete
-        - name: list
-          uid: ext_datashare_az_datashare_dataset_list
-          displayName: az datashare dataset list
-        - name: show
-          uid: ext_datashare_az_datashare_dataset_show
-          displayName: az datashare dataset show
-        - name: wait
-          uid: ext_datashare_az_datashare_dataset_wait
-          displayName: az datashare dataset wait
-      - name: invitation
-        displayName: az datashare invitation
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_invitation
-          displayName: az datashare invitation
-        - name: create
-          uid: ext_datashare_az_datashare_invitation_create
-          displayName: az datashare invitation create
-        - name: delete
-          uid: ext_datashare_az_datashare_invitation_delete
-          displayName: az datashare invitation delete
-        - name: list
-          uid: ext_datashare_az_datashare_invitation_list
-          displayName: az datashare invitation list
-        - name: show
-          uid: ext_datashare_az_datashare_invitation_show
-          displayName: az datashare invitation show
-      - name: provider-share-subscription
-        displayName: az datashare provider-share-subscription
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_provider_share_subscription
-          displayName: az datashare provider-share-subscription
-        - name: list
-          uid: ext_datashare_az_datashare_provider_share_subscription_list
-          displayName: az datashare provider-share-subscription list
-        - name: reinstate
-          uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-          displayName: az datashare provider-share-subscription reinstate
-        - name: revoke
-          uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-          displayName: az datashare provider-share-subscription revoke
-        - name: show
-          uid: ext_datashare_az_datashare_provider_share_subscription_show
-          displayName: az datashare provider-share-subscription show
-        - name: wait
-          uid: ext_datashare_az_datashare_provider_share_subscription_wait
-          displayName: az datashare provider-share-subscription wait
-      - name: synchronization
-        displayName: az datashare synchronization
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_synchronization
-          displayName: az datashare synchronization
-        - name: list
-          uid: ext_datashare_az_datashare_synchronization_list
-          displayName: az datashare synchronization list
-        - name: list-detail
-          uid: ext_datashare_az_datashare_synchronization_list_detail
-          displayName: az datashare synchronization list-detail
-      - name: synchronization-setting
-        displayName: az datashare synchronization-setting
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_synchronization_setting
-          displayName: az datashare synchronization-setting
-        - name: create
-          uid: ext_datashare_az_datashare_synchronization_setting_create
-          displayName: az datashare synchronization-setting create
-        - name: delete
-          uid: ext_datashare_az_datashare_synchronization_setting_delete
-          displayName: az datashare synchronization-setting delete
-        - name: list
-          uid: ext_datashare_az_datashare_synchronization_setting_list
-          displayName: az datashare synchronization-setting list
-        - name: show
-          uid: ext_datashare_az_datashare_synchronization_setting_show
-          displayName: az datashare synchronization-setting show
-        - name: wait
-          uid: ext_datashare_az_datashare_synchronization_setting_wait
-          displayName: az datashare synchronization-setting wait
-  - name: db-up
-    items:
-    - name: Overview
-      uid: ext_db-up_az
-    - name: MySQL
-      displayName: az mysql
-      items:
-      - name: Overview
-        uid: ext_db-up_az_mysql
-        displayName: az mysql
-      - name: down
-        uid: ext_db-up_az_mysql_down
-        displayName: az mysql down
-      - name: show-connection-string
-        uid: ext_db-up_az_mysql_show_connection_string
-        displayName: az mysql show-connection-string
-      - name: up
-        uid: ext_db-up_az_mysql_up
-        displayName: az mysql up
-    - name: PostgreSQL
-      displayName: az postgres
-      items:
-      - name: Overview
-        uid: ext_db-up_az_postgres
-        displayName: az postgres
-      - name: down
-        uid: ext_db-up_az_postgres_down
-        displayName: az postgres down
-      - name: show-connection-string
-        uid: ext_db-up_az_postgres_show_connection_string
-        displayName: az postgres show-connection-string
-      - name: up
-        uid: ext_db-up_az_postgres_up
-        displayName: az postgres up
-    - name: SQL
-      displayName: az sql
-      items:
-      - name: Overview
-        uid: ext_db-up_az_sql
-        displayName: az sql
-      - name: down
-        uid: ext_db-up_az_sql_down
-        displayName: az sql down
-      - name: up
-        uid: ext_db-up_az_sql_up
-        displayName: az sql up
-  - name: deploy-to-azure
-    items:
-    - name: Overview
-      uid: ext_deploy-to-azure_az
-    - name: Container
-      displayName: az container
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_container
-        displayName: az container
-      - name: app
-        displayName: az container app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_container_app
-          displayName: az container app
-        - name: up
-          uid: ext_deploy-to-azure_az_container_app_up
-          displayName: az container app up
-    - name: Functions
-      displayName: az functionapp
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_functionapp
-        displayName: az functionapp
-      - name: app
-        displayName: az functionapp app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_functionapp_app
-          displayName: az functionapp app
-        - name: up
-          uid: ext_deploy-to-azure_az_functionapp_app_up
-          displayName: az functionapp app up
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_aks
-        displayName: az aks
-      - name: app
-        displayName: az aks app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_aks_app
-          displayName: az aks app
-        - name: up
-          uid: ext_deploy-to-azure_az_aks_app_up
-          displayName: az aks app up
-  - name: dev-spaces
-    items:
-    - name: Overview
-      uid: ext_dev-spaces_az
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_dev-spaces_az_aks
-        displayName: az aks
-      - name: use-dev-spaces
-        uid: ext_dev-spaces_az_aks_use_dev_spaces
-        displayName: az aks use-dev-spaces
-  - name: dms-preview
-    items:
-    - name: Overview
-      uid: ext_dms-preview_az
-    - name: dms
-      displayName: az dms
-      items:
-      - name: Overview
-        uid: ext_dms-preview_az_dms
-        displayName: az dms
-      - name: project
-        displayName: az dms project
-        items:
-        - name: Overview
-          uid: ext_dms-preview_az_dms_project
-          displayName: az dms project
-        - name: create
-          uid: ext_dms-preview_az_dms_project_create
-          displayName: az dms project create
-        - name: task
-          displayName: az dms project task
-          items:
-          - name: Overview
-            uid: ext_dms-preview_az_dms_project_task
-            displayName: az dms project task
-          - name: cancel
-            uid: ext_dms-preview_az_dms_project_task_cancel
-            displayName: az dms project task cancel
-          - name: create
-            uid: ext_dms-preview_az_dms_project_task_create
-            displayName: az dms project task create
-          - name: cutover
-            uid: ext_dms-preview_az_dms_project_task_cutover
-            displayName: az dms project task cutover
-          - name: restart
-            uid: ext_dms-preview_az_dms_project_task_restart
-            displayName: az dms project task restart
-          - name: stop
-            uid: ext_dms-preview_az_dms_project_task_stop
-            displayName: az dms project task stop
-      - name: task
-        displayName: az dms task
-        items:
-        - name: Overview
-          uid: ext_dms-preview_az_dms_task
-          displayName: az dms task
-        - name: cancel
-          uid: ext_dms-preview_az_dms_task_cancel
-          displayName: az dms task cancel
-        - name: create
-          uid: ext_dms-preview_az_dms_task_create
-          displayName: az dms task create
-        - name: delete
-          uid: ext_dms-preview_az_dms_task_delete
-          displayName: az dms task delete
-        - name: list
-          uid: ext_dms-preview_az_dms_task_list
-          displayName: az dms task list
-        - name: show
-          uid: ext_dms-preview_az_dms_task_show
-          displayName: az dms task show
-  - name: eventgrid
-    items:
-    - name: Overview
-      uid: ext_eventgrid_az
-    - name: eventgrid
-      displayName: az eventgrid
-      items:
-      - name: Overview
-        uid: ext_eventgrid_az_eventgrid
-        displayName: az eventgrid
-      - name: domain
-        displayName: az eventgrid domain
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_domain
-          displayName: az eventgrid domain
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_domain_create
-          displayName: az eventgrid domain create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_domain_delete
-          displayName: az eventgrid domain delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_domain_list
-          displayName: az eventgrid domain list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_domain_show
-          displayName: az eventgrid domain show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_domain_update
-          displayName: az eventgrid domain update
-        - name: key
-          displayName: az eventgrid domain key
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_key
-            displayName: az eventgrid domain key
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_key_list
-            displayName: az eventgrid domain key list
-          - name: regenerate
-            uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-            displayName: az eventgrid domain key regenerate
-        - name: private-endpoint-connection
-          displayName: az eventgrid domain private-endpoint-connection
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-            displayName: az eventgrid domain private-endpoint-connection
-          - name: approve
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-            displayName: az eventgrid domain private-endpoint-connection approve
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-            displayName: az eventgrid domain private-endpoint-connection delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-            displayName: az eventgrid domain private-endpoint-connection list
-          - name: reject
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-            displayName: az eventgrid domain private-endpoint-connection reject
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-            displayName: az eventgrid domain private-endpoint-connection show
-        - name: private-link-resource
-          displayName: az eventgrid domain private-link-resource
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-            displayName: az eventgrid domain private-link-resource
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-            displayName: az eventgrid domain private-link-resource list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-            displayName: az eventgrid domain private-link-resource show
-        - name: topic
-          displayName: az eventgrid domain topic
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_topic
-            displayName: az eventgrid domain topic
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_domain_topic_create
-            displayName: az eventgrid domain topic create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-            displayName: az eventgrid domain topic delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_topic_list
-            displayName: az eventgrid domain topic list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_topic_show
-            displayName: az eventgrid domain topic show
-      - name: event-subscription
-        displayName: az eventgrid event-subscription
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_event_subscription
-          displayName: az eventgrid event-subscription
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_event_subscription_create
-          displayName: az eventgrid event-subscription create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-          displayName: az eventgrid event-subscription delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_event_subscription_list
-          displayName: az eventgrid event-subscription list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_event_subscription_show
-          displayName: az eventgrid event-subscription show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_event_subscription_update
-          displayName: az eventgrid event-subscription update
-      - name: extension-topic
-        displayName: az eventgrid extension-topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_extension_topic
-          displayName: az eventgrid extension-topic
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_extension_topic_show
-          displayName: az eventgrid extension-topic show
-      - name: partner
-        displayName: az eventgrid partner
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_partner
-          displayName: az eventgrid partner
-        - name: namespace
-          displayName: az eventgrid partner namespace
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_namespace
-            displayName: az eventgrid partner namespace
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-            displayName: az eventgrid partner namespace create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-            displayName: az eventgrid partner namespace delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-            displayName: az eventgrid partner namespace list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-            displayName: az eventgrid partner namespace show
-          - name: event-channel
-            displayName: az eventgrid partner namespace event-channel
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-              displayName: az eventgrid partner namespace event-channel
-            - name: create
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-              displayName: az eventgrid partner namespace event-channel create
-            - name: delete
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-              displayName: az eventgrid partner namespace event-channel delete
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-              displayName: az eventgrid partner namespace event-channel list
-            - name: show
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-              displayName: az eventgrid partner namespace event-channel show
-          - name: key
-            displayName: az eventgrid partner namespace key
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-              displayName: az eventgrid partner namespace key
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-              displayName: az eventgrid partner namespace key list
-            - name: regenerate
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-              displayName: az eventgrid partner namespace key regenerate
-        - name: registration
-          displayName: az eventgrid partner registration
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_registration
-            displayName: az eventgrid partner registration
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_partner_registration_create
-            displayName: az eventgrid partner registration create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-            displayName: az eventgrid partner registration delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_registration_list
-            displayName: az eventgrid partner registration list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_registration_show
-            displayName: az eventgrid partner registration show
-        - name: topic
-          displayName: az eventgrid partner topic
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_topic
-            displayName: az eventgrid partner topic
-          - name: activate
-            uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-            displayName: az eventgrid partner topic activate
-          - name: deactivate
-            uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-            displayName: az eventgrid partner topic deactivate
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-            displayName: az eventgrid partner topic delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_topic_list
-            displayName: az eventgrid partner topic list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_topic_show
-            displayName: az eventgrid partner topic show
-          - name: event-subscription
-            displayName: az eventgrid partner topic event-subscription
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-              displayName: az eventgrid partner topic event-subscription
-            - name: create
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-              displayName: az eventgrid partner topic event-subscription create
-            - name: delete
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-              displayName: az eventgrid partner topic event-subscription delete
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-              displayName: az eventgrid partner topic event-subscription list
-            - name: show
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-              displayName: az eventgrid partner topic event-subscription show
-            - name: update
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-              displayName: az eventgrid partner topic event-subscription update
-      - name: system-topic
-        displayName: az eventgrid system-topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_system_topic
-          displayName: az eventgrid system-topic
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_system_topic_create
-          displayName: az eventgrid system-topic create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_system_topic_delete
-          displayName: az eventgrid system-topic delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_system_topic_list
-          displayName: az eventgrid system-topic list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_system_topic_show
-          displayName: az eventgrid system-topic show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_system_topic_update
-          displayName: az eventgrid system-topic update
-        - name: event-subscription
-          displayName: az eventgrid system-topic event-subscription
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-            displayName: az eventgrid system-topic event-subscription
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-            displayName: az eventgrid system-topic event-subscription create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-            displayName: az eventgrid system-topic event-subscription delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-            displayName: az eventgrid system-topic event-subscription list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-            displayName: az eventgrid system-topic event-subscription show
-          - name: update
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-            displayName: az eventgrid system-topic event-subscription update
-      - name: topic
-        displayName: az eventgrid topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_topic
-          displayName: az eventgrid topic
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_topic_create
-          displayName: az eventgrid topic create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_topic_delete
-          displayName: az eventgrid topic delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_topic_list
-          displayName: az eventgrid topic list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_topic_show
-          displayName: az eventgrid topic show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_topic_update
-          displayName: az eventgrid topic update
-        - name: key
-          displayName: az eventgrid topic key
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_key
-            displayName: az eventgrid topic key
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_key_list
-            displayName: az eventgrid topic key list
-          - name: regenerate
-            uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-            displayName: az eventgrid topic key regenerate
-        - name: private-endpoint-connection
-          displayName: az eventgrid topic private-endpoint-connection
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-            displayName: az eventgrid topic private-endpoint-connection
-          - name: approve
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-            displayName: az eventgrid topic private-endpoint-connection approve
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-            displayName: az eventgrid topic private-endpoint-connection delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-            displayName: az eventgrid topic private-endpoint-connection list
-          - name: reject
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-            displayName: az eventgrid topic private-endpoint-connection reject
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-            displayName: az eventgrid topic private-endpoint-connection show
-        - name: private-link-resource
-          displayName: az eventgrid topic private-link-resource
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-            displayName: az eventgrid topic private-link-resource
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-            displayName: az eventgrid topic private-link-resource list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-            displayName: az eventgrid topic private-link-resource show
-      - name: topic-type
-        displayName: az eventgrid topic-type
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_topic_type
-          displayName: az eventgrid topic-type
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_topic_type_list
-          displayName: az eventgrid topic-type list
-        - name: list-event-types
-          uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-          displayName: az eventgrid topic-type list-event-types
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_topic_type_show
-          displayName: az eventgrid topic-type show
-  - name: express-route
-    items:
-    - name: Overview
-      uid: ext_express-route_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_express-route_az_network
-        displayName: az network
-      - name: Express Route
-        displayName: az network express-route
-        items:
-        - name: Overview
-          uid: ext_express-route_az_network_express_route
-          displayName: az network express-route
-        - name: create
-          uid: ext_express-route_az_network_express_route_create
-          displayName: az network express-route create
-        - name: list
-          uid: ext_express-route_az_network_express_route_list
-          displayName: az network express-route list
-        - name: show
-          uid: ext_express-route_az_network_express_route_show
-          displayName: az network express-route show
-        - name: update
-          uid: ext_express-route_az_network_express_route_update
-          displayName: az network express-route update
-        - name: gateway
-          displayName: az network express-route gateway
-          items:
-          - name: Overview
-            uid: ext_express-route_az_network_express_route_gateway
-            displayName: az network express-route gateway
-          - name: create
-            uid: ext_express-route_az_network_express_route_gateway_create
-            displayName: az network express-route gateway create
-          - name: delete
-            uid: ext_express-route_az_network_express_route_gateway_delete
-            displayName: az network express-route gateway delete
-          - name: list
-            uid: ext_express-route_az_network_express_route_gateway_list
-            displayName: az network express-route gateway list
-          - name: show
-            uid: ext_express-route_az_network_express_route_gateway_show
-            displayName: az network express-route gateway show
-          - name: update
-            uid: ext_express-route_az_network_express_route_gateway_update
-            displayName: az network express-route gateway update
-          - name: connection
-            displayName: az network express-route gateway connection
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_gateway_connection
-              displayName: az network express-route gateway connection
-            - name: create
-              uid: ext_express-route_az_network_express_route_gateway_connection_create
-              displayName: az network express-route gateway connection create
-            - name: delete
-              uid: ext_express-route_az_network_express_route_gateway_connection_delete
-              displayName: az network express-route gateway connection delete
-            - name: list
-              uid: ext_express-route_az_network_express_route_gateway_connection_list
-              displayName: az network express-route gateway connection list
-            - name: show
-              uid: ext_express-route_az_network_express_route_gateway_connection_show
-              displayName: az network express-route gateway connection show
-            - name: update
-              uid: ext_express-route_az_network_express_route_gateway_connection_update
-              displayName: az network express-route gateway connection update
-        - name: port
-          displayName: az network express-route port
-          items:
-          - name: Overview
-            uid: ext_express-route_az_network_express_route_port
-            displayName: az network express-route port
-          - name: create
-            uid: ext_express-route_az_network_express_route_port_create
-            displayName: az network express-route port create
-          - name: delete
-            uid: ext_express-route_az_network_express_route_port_delete
-            displayName: az network express-route port delete
-          - name: list
-            uid: ext_express-route_az_network_express_route_port_list
-            displayName: az network express-route port list
-          - name: show
-            uid: ext_express-route_az_network_express_route_port_show
-            displayName: az network express-route port show
-          - name: update
-            uid: ext_express-route_az_network_express_route_port_update
-            displayName: az network express-route port update
-          - name: link
-            displayName: az network express-route port link
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_port_link
-              displayName: az network express-route port link
-            - name: list
-              uid: ext_express-route_az_network_express_route_port_link_list
-              displayName: az network express-route port link list
-            - name: show
-              uid: ext_express-route_az_network_express_route_port_link_show
-              displayName: az network express-route port link show
-          - name: location
-            displayName: az network express-route port location
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_port_location
-              displayName: az network express-route port location
-            - name: list
-              uid: ext_express-route_az_network_express_route_port_location_list
-              displayName: az network express-route port location list
-            - name: show
-              uid: ext_express-route_az_network_express_route_port_location_show
-              displayName: az network express-route port location show
-  - name: express-route-cross-connection
-    items:
-    - name: Overview
-      uid: ext_express-route-cross-connection_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_express-route-cross-connection_az_network
-        displayName: az network
-      - name: cross-connection
-        displayName: az network cross-connection
-        items:
-        - name: Overview
-          uid: ext_express-route-cross-connection_az_network_cross_connection
-          displayName: az network cross-connection
-        - name: list
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list
-          displayName: az network cross-connection list
-        - name: list-arp-tables
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-          displayName: az network cross-connection list-arp-tables
-        - name: list-route-tables
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-          displayName: az network cross-connection list-route-tables
-        - name: show
-          uid: ext_express-route-cross-connection_az_network_cross_connection_show
-          displayName: az network cross-connection show
-        - name: summarize-route-table
-          uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-          displayName: az network cross-connection summarize-route-table
-        - name: update
-          uid: ext_express-route-cross-connection_az_network_cross_connection_update
-          displayName: az network cross-connection update
-        - name: wait
-          uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-          displayName: az network cross-connection wait
-        - name: peering
-          displayName: az network cross-connection peering
+        - name: Summary
+          uid: az_ml(v1)_computetarget
+          displayName: az ml computetarget
+        - name: amlcompute
           items:
-          - name: Overview
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-            displayName: az network cross-connection peering
-          - name: create
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-            displayName: az network cross-connection peering create
-          - name: delete
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-            displayName: az network cross-connection peering delete
-          - name: list
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-            displayName: az network cross-connection peering list
-          - name: show
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-            displayName: az network cross-connection peering show
-          - name: update
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-            displayName: az network cross-connection peering update
-  - name: front-door
-    items:
-    - name: Overview
-      uid: ext_front-door_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_front-door_az_network
-        displayName: az network
-      - name: front-door
-        displayName: az network front-door
-        items:
-        - name: Overview
-          uid: ext_front-door_az_network_front_door
-          displayName: az network front-door
-        - name: check-custom-domain
-          uid: ext_front-door_az_network_front_door_check_custom_domain
-          displayName: az network front-door check-custom-domain
+          - name: Summary
+            uid: az_ml(v1)_computetarget_amlcompute
+            displayName: az ml computetarget amlcompute
+          - name: identity
+            uid: az_ml(v1)_computetarget_amlcompute_identity
+            displayName: az ml computetarget amlcompute identity
+            items: []
+        - name: attach
+          uid: az_ml(v1)_computetarget_attach
+          displayName: az ml computetarget attach
+          items: []
+        - name: computeinstance
+          uid: az_ml(v1)_computetarget_computeinstance
+          displayName: az ml computetarget computeinstance
+          items: []
         - name: create
-          uid: ext_front-door_az_network_front_door_create
-          displayName: az network front-door create
-        - name: delete
-          uid: ext_front-door_az_network_front_door_delete
-          displayName: az network front-door delete
-        - name: list
-          uid: ext_front-door_az_network_front_door_list
-          displayName: az network front-door list
-        - name: purge-endpoint
-          uid: ext_front-door_az_network_front_door_purge_endpoint
-          displayName: az network front-door purge-endpoint
-        - name: show
-          uid: ext_front-door_az_network_front_door_show
-          displayName: az network front-door show
+          uid: az_ml(v1)_computetarget_create
+          displayName: az ml computetarget create
+          items: []
         - name: update
-          uid: ext_front-door_az_network_front_door_update
-          displayName: az network front-door update
-        - name: backend-pool
-          displayName: az network front-door backend-pool
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_backend_pool
-            displayName: az network front-door backend-pool
-          - name: create
-            uid: ext_front-door_az_network_front_door_backend_pool_create
-            displayName: az network front-door backend-pool create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_backend_pool_delete
-            displayName: az network front-door backend-pool delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_backend_pool_list
-            displayName: az network front-door backend-pool list
-          - name: show
-            uid: ext_front-door_az_network_front_door_backend_pool_show
-            displayName: az network front-door backend-pool show
-          - name: backend
-            displayName: az network front-door backend-pool backend
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_backend_pool_backend
-              displayName: az network front-door backend-pool backend
-            - name: add
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-              displayName: az network front-door backend-pool backend add
-            - name: list
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-              displayName: az network front-door backend-pool backend list
-            - name: remove
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-              displayName: az network front-door backend-pool backend remove
-        - name: frontend-endpoint
-          displayName: az network front-door frontend-endpoint
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_frontend_endpoint
-            displayName: az network front-door frontend-endpoint
-          - name: create
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-            displayName: az network front-door frontend-endpoint create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-            displayName: az network front-door frontend-endpoint delete
-          - name: disable-https
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-            displayName: az network front-door frontend-endpoint disable-https
-          - name: enable-https
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-            displayName: az network front-door frontend-endpoint enable-https
-          - name: list
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-            displayName: az network front-door frontend-endpoint list
-          - name: show
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-            displayName: az network front-door frontend-endpoint show
-        - name: load-balancing
-          displayName: az network front-door load-balancing
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_load_balancing
-            displayName: az network front-door load-balancing
-          - name: create
-            uid: ext_front-door_az_network_front_door_load_balancing_create
-            displayName: az network front-door load-balancing create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_load_balancing_delete
-            displayName: az network front-door load-balancing delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_load_balancing_list
-            displayName: az network front-door load-balancing list
-          - name: show
-            uid: ext_front-door_az_network_front_door_load_balancing_show
-            displayName: az network front-door load-balancing show
-        - name: probe
-          displayName: az network front-door probe
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_probe
-            displayName: az network front-door probe
-          - name: create
-            uid: ext_front-door_az_network_front_door_probe_create
-            displayName: az network front-door probe create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_probe_delete
-            displayName: az network front-door probe delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_probe_list
-            displayName: az network front-door probe list
-          - name: show
-            uid: ext_front-door_az_network_front_door_probe_show
-            displayName: az network front-door probe show
-          - name: update
-            uid: ext_front-door_az_network_front_door_probe_update
-            displayName: az network front-door probe update
-        - name: routing-rule
-          displayName: az network front-door routing-rule
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_routing_rule
-            displayName: az network front-door routing-rule
-          - name: create
-            uid: ext_front-door_az_network_front_door_routing_rule_create
-            displayName: az network front-door routing-rule create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_routing_rule_delete
-            displayName: az network front-door routing-rule delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_routing_rule_list
-            displayName: az network front-door routing-rule list
-          - name: show
-            uid: ext_front-door_az_network_front_door_routing_rule_show
-            displayName: az network front-door routing-rule show
-          - name: update
-            uid: ext_front-door_az_network_front_door_routing_rule_update
-            displayName: az network front-door routing-rule update
-        - name: rules-engine
-          displayName: az network front-door rules-engine
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_rules_engine
-            displayName: az network front-door rules-engine
-          - name: delete
-            uid: ext_front-door_az_network_front_door_rules_engine_delete
-            displayName: az network front-door rules-engine delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_rules_engine_list
-            displayName: az network front-door rules-engine list
-          - name: show
-            uid: ext_front-door_az_network_front_door_rules_engine_show
-            displayName: az network front-door rules-engine show
-          - name: rule
-            displayName: az network front-door rules-engine rule
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_rules_engine_rule
-              displayName: az network front-door rules-engine rule
-            - name: create
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-              displayName: az network front-door rules-engine rule create
-            - name: delete
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-              displayName: az network front-door rules-engine rule delete
-            - name: list
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-              displayName: az network front-door rules-engine rule list
-            - name: show
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-              displayName: az network front-door rules-engine rule show
-            - name: update
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-              displayName: az network front-door rules-engine rule update
-            - name: action
-              displayName: az network front-door rules-engine rule action
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-                displayName: az network front-door rules-engine rule action
-              - name: add
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-                displayName: az network front-door rules-engine rule action add
-              - name: list
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-                displayName: az network front-door rules-engine rule action list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-                displayName: az network front-door rules-engine rule action remove
-            - name: condition
-              displayName: az network front-door rules-engine rule condition
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-                displayName: az network front-door rules-engine rule condition
-              - name: add
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-                displayName: az network front-door rules-engine rule condition add
-              - name: list
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-                displayName: az network front-door rules-engine rule condition list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-                displayName: az network front-door rules-engine rule condition remove
-        - name: waf-policy
-          displayName: az network front-door waf-policy
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_waf_policy
-            displayName: az network front-door waf-policy
-          - name: create
-            uid: ext_front-door_az_network_front_door_waf_policy_create
-            displayName: az network front-door waf-policy create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_waf_policy_delete
-            displayName: az network front-door waf-policy delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_waf_policy_list
-            displayName: az network front-door waf-policy list
-          - name: show
-            uid: ext_front-door_az_network_front_door_waf_policy_show
-            displayName: az network front-door waf-policy show
-          - name: update
-            uid: ext_front-door_az_network_front_door_waf_policy_update
-            displayName: az network front-door waf-policy update
-          - name: managed-rule-definition
-            displayName: az network front-door waf-policy managed-rule-definition
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-              displayName: az network front-door waf-policy managed-rule-definition
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-              displayName: az network front-door waf-policy managed-rule-definition list
-          - name: managed-rules
-            displayName: az network front-door waf-policy managed-rules
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-              displayName: az network front-door waf-policy managed-rules
-            - name: add
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-              displayName: az network front-door waf-policy managed-rules add
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-              displayName: az network front-door waf-policy managed-rules list
-            - name: remove
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-              displayName: az network front-door waf-policy managed-rules remove
-            - name: exclusion
-              displayName: az network front-door waf-policy managed-rules exclusion
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-                displayName: az network front-door waf-policy managed-rules exclusion
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-                displayName: az network front-door waf-policy managed-rules exclusion add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-                displayName: az network front-door waf-policy managed-rules exclusion list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-                displayName: az network front-door waf-policy managed-rules exclusion remove
-            - name: override
-              displayName: az network front-door waf-policy managed-rules override
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-                displayName: az network front-door waf-policy managed-rules override
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-                displayName: az network front-door waf-policy managed-rules override add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-                displayName: az network front-door waf-policy managed-rules override list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-                displayName: az network front-door waf-policy managed-rules override remove
-          - name: rule
-            displayName: az network front-door waf-policy rule
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_rule
-              displayName: az network front-door waf-policy rule
-            - name: create
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-              displayName: az network front-door waf-policy rule create
-            - name: delete
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-              displayName: az network front-door waf-policy rule delete
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-              displayName: az network front-door waf-policy rule list
-            - name: show
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-              displayName: az network front-door waf-policy rule show
-            - name: update
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-              displayName: az network front-door waf-policy rule update
-            - name: match-condition
-              displayName: az network front-door waf-policy rule match-condition
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-                displayName: az network front-door waf-policy rule match-condition
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-                displayName: az network front-door waf-policy rule match-condition add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-                displayName: az network front-door waf-policy rule match-condition list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-                displayName: az network front-door waf-policy rule match-condition remove
-  - name: hack
-    items:
-    - name: Overview
-      uid: ext_hack_az
-    - name: hack
-      displayName: az hack
-      items:
-      - name: Overview
-        uid: ext_hack_az_hack
-        displayName: az hack
-      - name: create
-        uid: ext_hack_az_hack_create
-        displayName: az hack create
-      - name: show
-        uid: ext_hack_az_hack_show
-        displayName: az hack show
-  - name: hardware-security-modules
-    items:
-    - name: Overview
-      uid: ext_hardware-security-modules_az
-    - name: dedicated-hsm
-      displayName: az dedicated-hsm
-      items:
-      - name: Overview
-        uid: ext_hardware-security-modules_az_dedicated_hsm
-        displayName: az dedicated-hsm
-      - name: create
-        uid: ext_hardware-security-modules_az_dedicated_hsm_create
-        displayName: az dedicated-hsm create
-      - name: delete
-        uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-        displayName: az dedicated-hsm delete
-      - name: list
-        uid: ext_hardware-security-modules_az_dedicated_hsm_list
-        displayName: az dedicated-hsm list
-      - name: show
-        uid: ext_hardware-security-modules_az_dedicated_hsm_show
-        displayName: az dedicated-hsm show
-      - name: update
-        uid: ext_hardware-security-modules_az_dedicated_hsm_update
-        displayName: az dedicated-hsm update
-      - name: wait
-        uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-        displayName: az dedicated-hsm wait
-  - name: healthcareapis
-    items:
-    - name: Overview
-      uid: ext_healthcareapis_az
-    - name: healthcareapis
-      displayName: az healthcareapis
-      items:
-      - name: Overview
-        uid: ext_healthcareapis_az_healthcareapis
-        displayName: az healthcareapis
-      - name: operation-result
-        displayName: az healthcareapis operation-result
+          uid: az_ml(v1)_computetarget_update
+          displayName: az ml computetarget update
+          items: []
+      - name: dataset
+        uid: az_ml(v1)_dataset
+        displayName: az ml dataset
+        items: []
+      - name: datastore
+        uid: az_ml(v1)_datastore
+        displayName: az ml datastore
+        items: []
+      - name: endpoint
         items:
-        - name: Overview
-          uid: ext_healthcareapis_az_healthcareapis_operation_result
-          displayName: az healthcareapis operation-result
-        - name: show
-          uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-          displayName: az healthcareapis operation-result show
+        - name: Summary
+          uid: az_ml(v1)_endpoint
+          displayName: az ml endpoint
+        - name: realtime
+          uid: az_ml(v1)_endpoint_realtime
+          displayName: az ml endpoint realtime
+          items: []
+      - name: environment
+        uid: az_ml(v1)_environment
+        displayName: az ml environment
+        items: []
+      - name: experiment
+        uid: az_ml(v1)_experiment
+        displayName: az ml experiment
+        items: []
+      - name: folder
+        uid: az_ml(v1)_folder
+        displayName: az ml folder
+        items: []
+      - name: model
+        uid: az_ml(v1)_model
+        displayName: az ml model
+        items: []
+      - name: pipeline
+        uid: az_ml(v1)_pipeline
+        displayName: az ml pipeline
+        items: []
+      - name: run
+        uid: az_ml(v1)_run
+        displayName: az ml run
+        items: []
       - name: service
-        displayName: az healthcareapis service
-        items:
-        - name: Overview
-          uid: ext_healthcareapis_az_healthcareapis_service
-          displayName: az healthcareapis service
-        - name: create
-          uid: ext_healthcareapis_az_healthcareapis_service_create
-          displayName: az healthcareapis service create
-        - name: delete
-          uid: ext_healthcareapis_az_healthcareapis_service_delete
-          displayName: az healthcareapis service delete
-        - name: list
-          uid: ext_healthcareapis_az_healthcareapis_service_list
-          displayName: az healthcareapis service list
-        - name: show
-          uid: ext_healthcareapis_az_healthcareapis_service_show
-          displayName: az healthcareapis service show
-        - name: update
-          uid: ext_healthcareapis_az_healthcareapis_service_update
-          displayName: az healthcareapis service update
-  - name: hpc-cache
-    items:
-    - name: Overview
-      uid: ext_hpc-cache_az
-    - name: hpc-cache
-      displayName: az hpc-cache
-      items:
-      - name: Overview
-        uid: ext_hpc-cache_az_hpc_cache
-        displayName: az hpc-cache
-      - name: create
-        uid: ext_hpc-cache_az_hpc_cache_create
-        displayName: az hpc-cache create
-      - name: delete
-        uid: ext_hpc-cache_az_hpc_cache_delete
-        displayName: az hpc-cache delete
-      - name: flush
-        uid: ext_hpc-cache_az_hpc_cache_flush
-        displayName: az hpc-cache flush
-      - name: list
-        uid: ext_hpc-cache_az_hpc_cache_list
-        displayName: az hpc-cache list
-      - name: show
-        uid: ext_hpc-cache_az_hpc_cache_show
-        displayName: az hpc-cache show
-      - name: start
-        uid: ext_hpc-cache_az_hpc_cache_start
-        displayName: az hpc-cache start
-      - name: stop
-        uid: ext_hpc-cache_az_hpc_cache_stop
-        displayName: az hpc-cache stop
-      - name: update
-        uid: ext_hpc-cache_az_hpc_cache_update
-        displayName: az hpc-cache update
-      - name: upgrade-firmware
-        uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-        displayName: az hpc-cache upgrade-firmware
-      - name: wait
-        uid: ext_hpc-cache_az_hpc_cache_wait
-        displayName: az hpc-cache wait
-      - name: blob-storage-target
-        displayName: az hpc-cache blob-storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-          displayName: az hpc-cache blob-storage-target
-        - name: add
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-          displayName: az hpc-cache blob-storage-target add
-        - name: update
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-          displayName: az hpc-cache blob-storage-target update
-      - name: nfs-storage-target
-        displayName: az hpc-cache nfs-storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-          displayName: az hpc-cache nfs-storage-target
-        - name: add
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-          displayName: az hpc-cache nfs-storage-target add
-        - name: update
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-          displayName: az hpc-cache nfs-storage-target update
-      - name: skus
-        displayName: az hpc-cache skus
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_skus
-          displayName: az hpc-cache skus
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_skus_list
-          displayName: az hpc-cache skus list
-      - name: storage-target
-        displayName: az hpc-cache storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_storage_target
-          displayName: az hpc-cache storage-target
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-          displayName: az hpc-cache storage-target list
-        - name: remove
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-          displayName: az hpc-cache storage-target remove
-        - name: show
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-          displayName: az hpc-cache storage-target show
-      - name: usage-model
-        displayName: az hpc-cache usage-model
+        uid: az_ml(v1)_service
+        displayName: az ml service
+        items: []
+      - name: workspace
         items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_usage_model
-          displayName: az hpc-cache usage-model
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-          displayName: az hpc-cache usage-model list
-  - name: image-copy-extension
+        - name: Summary
+          uid: az_ml(v1)_workspace
+          displayName: az ml workspace
+        - name: private-endpoint
+          uid: az_ml(v1)_workspace_private-endpoint
+          displayName: az ml workspace private-endpoint
+          items: []
+  - name: Azure Managed Applications
+    uid: sp-Azure_Managed_Applications
+    displayName: Azure Managed Applications
+    items: []
+  - name: Azure Managed Services
+    uid: sp-Azure_Managed_Services
+    displayName: Azure Managed Services
+    items: []
+  - name: Azure Maps
+    uid: sp-Azure_Maps
+    displayName: Azure Maps
+    items: []
+  - name: Azure Marketplace Ordering
     items:
-    - name: Overview
-      uid: ext_image-copy-extension_az
-    - name: VM Images
-      displayName: az image
-      items:
-      - name: Overview
-        uid: ext_image-copy-extension_az_image
-        displayName: az image
-      - name: copy
-        uid: ext_image-copy-extension_az_image_copy
-        displayName: az image copy
-  - name: import-export
+    - name: Summary
+      uid: sp-Azure_Marketplace_Ordering
+      displayName: Azure Marketplace Ordering
+    - name: term
+      uid: az_term
+      displayName: az term
+      items: []
+  - name: Azure Media Services
+    uid: sp-Azure_Media_Services
+    displayName: Azure Media Services
+    items: []
+  - name: Azure Migrate
     items:
-    - name: Overview
-      uid: ext_import-export_az
-    - name: import-export
-      displayName: az import-export
-      items:
-      - name: Overview
-        uid: ext_import-export_az_import_export
-        displayName: az import-export
-      - name: create
-        uid: ext_import-export_az_import_export_create
-        displayName: az import-export create
-      - name: delete
-        uid: ext_import-export_az_import_export_delete
-        displayName: az import-export delete
-      - name: list
-        uid: ext_import-export_az_import_export_list
-        displayName: az import-export list
-      - name: show
-        uid: ext_import-export_az_import_export_show
-        displayName: az import-export show
-      - name: update
-        uid: ext_import-export_az_import_export_update
-        displayName: az import-export update
-      - name: bit-locker-key
-        displayName: az import-export bit-locker-key
-        items:
-        - name: Overview
-          uid: ext_import-export_az_import_export_bit_locker_key
-          displayName: az import-export bit-locker-key
-        - name: list
-          uid: ext_import-export_az_import_export_bit_locker_key_list
-          displayName: az import-export bit-locker-key list
-      - name: location
-        displayName: az import-export location
-        items:
-        - name: Overview
-          uid: ext_import-export_az_import_export_location
-          displayName: az import-export location
-        - name: list
-          uid: ext_import-export_az_import_export_location_list
-          displayName: az import-export location list
-        - name: show
-          uid: ext_import-export_az_import_export_location_show
-          displayName: az import-export location show
-  - name: interactive
-    uid: ext_interactive_az
-  - name: internet-analyzer
+    - name: Summary
+      uid: sp-Azure_Migrate
+      displayName: Azure Migrate
+    - name: offazure
+      items:
+      - name: Summary
+        uid: az_offazure
+        displayName: az offazure
+      - name: hyperv
+        items:
+        - name: Summary
+          uid: az_offazure_hyperv
+          displayName: az offazure hyperv
+        - name: cluster
+          uid: az_offazure_hyperv_cluster
+          displayName: az offazure hyperv cluster
+          items: []
+        - name: host
+          uid: az_offazure_hyperv_host
+          displayName: az offazure hyperv host
+          items: []
+        - name: machine
+          uid: az_offazure_hyperv_machine
+          displayName: az offazure hyperv machine
+          items: []
+        - name: run-as-account
+          uid: az_offazure_hyperv_run-as-account
+          displayName: az offazure hyperv run-as-account
+          items: []
+        - name: site
+          uid: az_offazure_hyperv_site
+          displayName: az offazure hyperv site
+          items: []
+      - name: vmware
+        items:
+        - name: Summary
+          uid: az_offazure_vmware
+          displayName: az offazure vmware
+        - name: machine
+          uid: az_offazure_vmware_machine
+          displayName: az offazure vmware machine
+          items: []
+        - name: run-as-account
+          uid: az_offazure_vmware_run-as-account
+          displayName: az offazure vmware run-as-account
+          items: []
+        - name: site
+          uid: az_offazure_vmware_site
+          displayName: az offazure vmware site
+          items: []
+        - name: vcenter
+          uid: az_offazure_vmware_vcenter
+          displayName: az offazure vmware vcenter
+          items: []
+  - name: Azure Monitor
     items:
-    - name: Overview
-      uid: ext_internet-analyzer_az
-    - name: internet-analyzer
-      displayName: az internet-analyzer
-      items:
-      - name: Overview
-        uid: ext_internet-analyzer_az_internet_analyzer
-        displayName: az internet-analyzer
-      - name: show-scorecard
-        uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-        displayName: az internet-analyzer show-scorecard
-      - name: show-timeseries
-        uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-        displayName: az internet-analyzer show-timeseries
-      - name: preconfigured-endpoint
-        displayName: az internet-analyzer preconfigured-endpoint
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-          displayName: az internet-analyzer preconfigured-endpoint
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-          displayName: az internet-analyzer preconfigured-endpoint list
+    - name: Summary
+      uid: sp-Azure_Monitor
+      displayName: Azure Monitor
+    - name: footprint
+      items:
+      - name: Summary
+        uid: az_footprint
+        displayName: az footprint
+      - name: experiment
+        uid: az_footprint_experiment
+        displayName: az footprint experiment
+        items: []
+      - name: measurement-endpoint
+        uid: az_footprint_measurement-endpoint
+        displayName: az footprint measurement-endpoint
+        items: []
+      - name: measurement-endpoint-condition
+        uid: az_footprint_measurement-endpoint-condition
+        displayName: az footprint measurement-endpoint-condition
+        items: []
       - name: profile
-        displayName: az internet-analyzer profile
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_profile
-          displayName: az internet-analyzer profile
-        - name: create
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-          displayName: az internet-analyzer profile create
-        - name: delete
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-          displayName: az internet-analyzer profile delete
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-          displayName: az internet-analyzer profile list
-        - name: show
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-          displayName: az internet-analyzer profile show
-        - name: update
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-          displayName: az internet-analyzer profile update
-      - name: test
-        displayName: az internet-analyzer test
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_test
-          displayName: az internet-analyzer test
-        - name: create
-          uid: ext_internet-analyzer_az_internet_analyzer_test_create
-          displayName: az internet-analyzer test create
-        - name: delete
-          uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-          displayName: az internet-analyzer test delete
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_test_list
-          displayName: az internet-analyzer test list
-        - name: show
-          uid: ext_internet-analyzer_az_internet_analyzer_test_show
-          displayName: az internet-analyzer test show
-        - name: update
-          uid: ext_internet-analyzer_az_internet_analyzer_test_update
-          displayName: az internet-analyzer test update
-  - name: ip-group
-    items:
-    - name: Overview
-      uid: ext_ip-group_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_ip-group_az_network
-        displayName: az network
-      - name: ip-group
-        displayName: az network ip-group
-        items:
-        - name: Overview
-          uid: ext_ip-group_az_network_ip_group
-          displayName: az network ip-group
-        - name: create
-          uid: ext_ip-group_az_network_ip_group_create
-          displayName: az network ip-group create
-        - name: delete
-          uid: ext_ip-group_az_network_ip_group_delete
-          displayName: az network ip-group delete
-        - name: list
-          uid: ext_ip-group_az_network_ip_group_list
-          displayName: az network ip-group list
-        - name: show
-          uid: ext_ip-group_az_network_ip_group_show
-          displayName: az network ip-group show
-        - name: update
-          uid: ext_ip-group_az_network_ip_group_update
-          displayName: az network ip-group update
-  - name: k8sconfiguration
-    items:
-    - name: Overview
-      uid: ext_k8sconfiguration_az
-    - name: k8sconfiguration
-      displayName: az k8sconfiguration
-      items:
-      - name: Overview
-        uid: ext_k8sconfiguration_az_k8sconfiguration
-        displayName: az k8sconfiguration
-      - name: create
-        uid: ext_k8sconfiguration_az_k8sconfiguration_create
-        displayName: az k8sconfiguration create
-      - name: delete
-        uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-        displayName: az k8sconfiguration delete
-      - name: list
-        uid: ext_k8sconfiguration_az_k8sconfiguration_list
-        displayName: az k8sconfiguration list
-      - name: show
-        uid: ext_k8sconfiguration_az_k8sconfiguration_show
-        displayName: az k8sconfiguration show
-      - name: update
-        uid: ext_k8sconfiguration_az_k8sconfiguration_update
-        displayName: az k8sconfiguration update
-  - name: keyvault-preview
-    items:
-    - name: Overview
-      uid: ext_keyvault-preview_az
-    - name: Key Vault
-      displayName: az keyvault
-      items:
-      - name: Overview
-        uid: ext_keyvault-preview_az_keyvault
-        displayName: az keyvault
-      - name: create
-        uid: ext_keyvault-preview_az_keyvault_create
-        displayName: az keyvault create
-      - name: delete
-        uid: ext_keyvault-preview_az_keyvault_delete
-        displayName: az keyvault delete
-      - name: delete-policy
-        uid: ext_keyvault-preview_az_keyvault_delete_policy
-        displayName: az keyvault delete-policy
-      - name: list
-        uid: ext_keyvault-preview_az_keyvault_list
-        displayName: az keyvault list
-      - name: list-deleted
-        uid: ext_keyvault-preview_az_keyvault_list_deleted
-        displayName: az keyvault list-deleted
-      - name: purge
-        uid: ext_keyvault-preview_az_keyvault_purge
-        displayName: az keyvault purge
-      - name: recover
-        uid: ext_keyvault-preview_az_keyvault_recover
-        displayName: az keyvault recover
-      - name: set-policy
-        uid: ext_keyvault-preview_az_keyvault_set_policy
-        displayName: az keyvault set-policy
-      - name: show
-        uid: ext_keyvault-preview_az_keyvault_show
-        displayName: az keyvault show
-      - name: update
-        uid: ext_keyvault-preview_az_keyvault_update
-        displayName: az keyvault update
-      - name: Certificates
-        displayName: az keyvault certificate
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_certificate
-          displayName: az keyvault certificate
-        - name: create
-          uid: ext_keyvault-preview_az_keyvault_certificate_create
-          displayName: az keyvault certificate create
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_certificate_delete
-          displayName: az keyvault certificate delete
-        - name: download
-          uid: ext_keyvault-preview_az_keyvault_certificate_download
-          displayName: az keyvault certificate download
-        - name: get-default-policy
-          uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-          displayName: az keyvault certificate get-default-policy
-        - name: import
-          uid: ext_keyvault-preview_az_keyvault_certificate_import
-          displayName: az keyvault certificate import
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_certificate_list
-          displayName: az keyvault certificate list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-          displayName: az keyvault certificate list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-          displayName: az keyvault certificate list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_certificate_purge
-          displayName: az keyvault certificate purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_certificate_recover
-          displayName: az keyvault certificate recover
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-          displayName: az keyvault certificate set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_certificate_show
-          displayName: az keyvault certificate show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-          displayName: az keyvault certificate show-deleted
-        - name: Contacts
-          displayName: az keyvault certificate contact
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact
-            displayName: az keyvault certificate contact
-          - name: add
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-            displayName: az keyvault certificate contact add
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-            displayName: az keyvault certificate contact delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-            displayName: az keyvault certificate contact list
-        - name: Issuers
-          displayName: az keyvault certificate issuer
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-            displayName: az keyvault certificate issuer
-          - name: create
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-            displayName: az keyvault certificate issuer create
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-            displayName: az keyvault certificate issuer delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-            displayName: az keyvault certificate issuer list
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-            displayName: az keyvault certificate issuer show
-          - name: update
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-            displayName: az keyvault certificate issuer update
-          - name: Administration
-            displayName: az keyvault certificate issuer admin
-            items:
-            - name: Overview
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-              displayName: az keyvault certificate issuer admin
-            - name: add
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-              displayName: az keyvault certificate issuer admin add
-            - name: delete
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-              displayName: az keyvault certificate issuer admin delete
-            - name: list
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-              displayName: az keyvault certificate issuer admin list
-        - name: Pending
-          displayName: az keyvault certificate pending
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending
-            displayName: az keyvault certificate pending
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-            displayName: az keyvault certificate pending delete
-          - name: merge
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-            displayName: az keyvault certificate pending merge
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-            displayName: az keyvault certificate pending show
-      - name: Keys
-        displayName: az keyvault key
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_key
-          displayName: az keyvault key
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_key_backup
-          displayName: az keyvault key backup
-        - name: create
-          uid: ext_keyvault-preview_az_keyvault_key_create
-          displayName: az keyvault key create
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_key_delete
-          displayName: az keyvault key delete
-        - name: import
-          uid: ext_keyvault-preview_az_keyvault_key_import
-          displayName: az keyvault key import
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_key_list
-          displayName: az keyvault key list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-          displayName: az keyvault key list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_key_list_versions
-          displayName: az keyvault key list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_key_purge
-          displayName: az keyvault key purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_key_recover
-          displayName: az keyvault key recover
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_key_restore
-          displayName: az keyvault key restore
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-          displayName: az keyvault key set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_key_show
-          displayName: az keyvault key show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-          displayName: az keyvault key show-deleted
-      - name: Secrets
-        displayName: az keyvault secret
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_secret
-          displayName: az keyvault secret
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_secret_backup
-          displayName: az keyvault secret backup
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_secret_delete
-          displayName: az keyvault secret delete
-        - name: download
-          uid: ext_keyvault-preview_az_keyvault_secret_download
-          displayName: az keyvault secret download
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_secret_list
-          displayName: az keyvault secret list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-          displayName: az keyvault secret list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-          displayName: az keyvault secret list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_secret_purge
-          displayName: az keyvault secret purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_secret_recover
-          displayName: az keyvault secret recover
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_secret_restore
-          displayName: az keyvault secret restore
-        - name: set
-          uid: ext_keyvault-preview_az_keyvault_secret_set
-          displayName: az keyvault secret set
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-          displayName: az keyvault secret set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_secret_show
-          displayName: az keyvault secret show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-          displayName: az keyvault secret show-deleted
-      - name: network-rule
-        displayName: az keyvault network-rule
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_network_rule
-          displayName: az keyvault network-rule
-        - name: add
-          uid: ext_keyvault-preview_az_keyvault_network_rule_add
-          displayName: az keyvault network-rule add
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_network_rule_list
-          displayName: az keyvault network-rule list
-        - name: remove
-          uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-          displayName: az keyvault network-rule remove
-      - name: storage
-        displayName: az keyvault storage
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_storage
-          displayName: az keyvault storage
-        - name: add
-          uid: ext_keyvault-preview_az_keyvault_storage_add
-          displayName: az keyvault storage add
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_storage_backup
-          displayName: az keyvault storage backup
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_storage_list
-          displayName: az keyvault storage list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-          displayName: az keyvault storage list-deleted
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_storage_purge
-          displayName: az keyvault storage purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_storage_recover
-          displayName: az keyvault storage recover
-        - name: regenerate-key
-          uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-          displayName: az keyvault storage regenerate-key
-        - name: remove
-          uid: ext_keyvault-preview_az_keyvault_storage_remove
-          displayName: az keyvault storage remove
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_storage_restore
-          displayName: az keyvault storage restore
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_storage_show
-          displayName: az keyvault storage show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-          displayName: az keyvault storage show-deleted
-        - name: update
-          uid: ext_keyvault-preview_az_keyvault_storage_update
-          displayName: az keyvault storage update
-        - name: sas-definition
-          displayName: az keyvault storage sas-definition
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-            displayName: az keyvault storage sas-definition
-          - name: create
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-            displayName: az keyvault storage sas-definition create
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-            displayName: az keyvault storage sas-definition delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-            displayName: az keyvault storage sas-definition list
-          - name: list-deleted
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-            displayName: az keyvault storage sas-definition list-deleted
-          - name: recover
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-            displayName: az keyvault storage sas-definition recover
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-            displayName: az keyvault storage sas-definition show
-          - name: show-deleted
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-            displayName: az keyvault storage sas-definition show-deleted
-          - name: update
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-            displayName: az keyvault storage sas-definition update
-  - name: kusto
-    items:
-    - name: Overview
-      uid: ext_kusto_az
-    - name: kusto
-      displayName: az kusto
-      items:
-      - name: Overview
-        uid: ext_kusto_az_kusto
-        displayName: az kusto
-      - name: attached-database-configuration
-        displayName: az kusto attached-database-configuration
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_attached_database_configuration
-          displayName: az kusto attached-database-configuration
-        - name: create
-          uid: ext_kusto_az_kusto_attached_database_configuration_create
-          displayName: az kusto attached-database-configuration create
-        - name: delete
-          uid: ext_kusto_az_kusto_attached_database_configuration_delete
-          displayName: az kusto attached-database-configuration delete
-        - name: list
-          uid: ext_kusto_az_kusto_attached_database_configuration_list
-          displayName: az kusto attached-database-configuration list
-        - name: show
-          uid: ext_kusto_az_kusto_attached_database_configuration_show
-          displayName: az kusto attached-database-configuration show
-        - name: update
-          uid: ext_kusto_az_kusto_attached_database_configuration_update
-          displayName: az kusto attached-database-configuration update
-        - name: wait
-          uid: ext_kusto_az_kusto_attached_database_configuration_wait
-          displayName: az kusto attached-database-configuration wait
-      - name: cluster
-        displayName: az kusto cluster
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_cluster
-          displayName: az kusto cluster
-        - name: add-language-extension
-          uid: ext_kusto_az_kusto_cluster_add_language_extension
-          displayName: az kusto cluster add-language-extension
-        - name: create
-          uid: ext_kusto_az_kusto_cluster_create
-          displayName: az kusto cluster create
-        - name: delete
-          uid: ext_kusto_az_kusto_cluster_delete
-          displayName: az kusto cluster delete
-        - name: detach-follower-database
-          uid: ext_kusto_az_kusto_cluster_detach_follower_database
-          displayName: az kusto cluster detach-follower-database
-        - name: diagnose-virtual-network
-          uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-          displayName: az kusto cluster diagnose-virtual-network
-        - name: list
-          uid: ext_kusto_az_kusto_cluster_list
-          displayName: az kusto cluster list
-        - name: list-follower-database
-          uid: ext_kusto_az_kusto_cluster_list_follower_database
-          displayName: az kusto cluster list-follower-database
-        - name: list-language-extension
-          uid: ext_kusto_az_kusto_cluster_list_language_extension
-          displayName: az kusto cluster list-language-extension
-        - name: list-sku
-          uid: ext_kusto_az_kusto_cluster_list_sku
-          displayName: az kusto cluster list-sku
-        - name: remove-language-extension
-          uid: ext_kusto_az_kusto_cluster_remove_language_extension
-          displayName: az kusto cluster remove-language-extension
-        - name: show
-          uid: ext_kusto_az_kusto_cluster_show
-          displayName: az kusto cluster show
-        - name: start
-          uid: ext_kusto_az_kusto_cluster_start
-          displayName: az kusto cluster start
-        - name: stop
-          uid: ext_kusto_az_kusto_cluster_stop
-          displayName: az kusto cluster stop
-        - name: update
-          uid: ext_kusto_az_kusto_cluster_update
-          displayName: az kusto cluster update
-        - name: wait
-          uid: ext_kusto_az_kusto_cluster_wait
-          displayName: az kusto cluster wait
-      - name: cluster-principal-assignment
-        displayName: az kusto cluster-principal-assignment
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_cluster_principal_assignment
-          displayName: az kusto cluster-principal-assignment
-        - name: create
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-          displayName: az kusto cluster-principal-assignment create
-        - name: delete
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-          displayName: az kusto cluster-principal-assignment delete
-        - name: list
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-          displayName: az kusto cluster-principal-assignment list
-        - name: show
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-          displayName: az kusto cluster-principal-assignment show
-        - name: update
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-          displayName: az kusto cluster-principal-assignment update
-        - name: wait
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-          displayName: az kusto cluster-principal-assignment wait
-      - name: data-connection
-        displayName: az kusto data-connection
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_data_connection
-          displayName: az kusto data-connection
-        - name: delete
-          uid: ext_kusto_az_kusto_data_connection_delete
-          displayName: az kusto data-connection delete
-        - name: list
-          uid: ext_kusto_az_kusto_data_connection_list
-          displayName: az kusto data-connection list
-        - name: show
-          uid: ext_kusto_az_kusto_data_connection_show
-          displayName: az kusto data-connection show
-        - name: wait
-          uid: ext_kusto_az_kusto_data_connection_wait
-          displayName: az kusto data-connection wait
-        - name: event-grid
-          displayName: az kusto data-connection event-grid
-          items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_event_grid
-            displayName: az kusto data-connection event-grid
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_event_grid_create
-            displayName: az kusto data-connection event-grid create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-            displayName: az kusto data-connection event-grid data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_event_grid_update
-            displayName: az kusto data-connection event-grid update
-        - name: event-hub
-          displayName: az kusto data-connection event-hub
-          items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_event_hub
-            displayName: az kusto data-connection event-hub
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_event_hub_create
-            displayName: az kusto data-connection event-hub create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-            displayName: az kusto data-connection event-hub data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_event_hub_update
-            displayName: az kusto data-connection event-hub update
-        - name: iot-hub
-          displayName: az kusto data-connection iot-hub
-          items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_iot_hub
-            displayName: az kusto data-connection iot-hub
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-            displayName: az kusto data-connection iot-hub create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-            displayName: az kusto data-connection iot-hub data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-            displayName: az kusto data-connection iot-hub update
-      - name: database
-        displayName: az kusto database
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_database
-          displayName: az kusto database
-        - name: add-principal
-          uid: ext_kusto_az_kusto_database_add_principal
-          displayName: az kusto database add-principal
-        - name: create
-          uid: ext_kusto_az_kusto_database_create
-          displayName: az kusto database create
-        - name: delete
-          uid: ext_kusto_az_kusto_database_delete
-          displayName: az kusto database delete
-        - name: list
-          uid: ext_kusto_az_kusto_database_list
-          displayName: az kusto database list
-        - name: list-principal
-          uid: ext_kusto_az_kusto_database_list_principal
-          displayName: az kusto database list-principal
-        - name: remove-principal
-          uid: ext_kusto_az_kusto_database_remove_principal
-          displayName: az kusto database remove-principal
-        - name: show
-          uid: ext_kusto_az_kusto_database_show
-          displayName: az kusto database show
-        - name: update
-          uid: ext_kusto_az_kusto_database_update
-          displayName: az kusto database update
-        - name: wait
-          uid: ext_kusto_az_kusto_database_wait
-          displayName: az kusto database wait
-      - name: database-principal-assignment
-        displayName: az kusto database-principal-assignment
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_database_principal_assignment
-          displayName: az kusto database-principal-assignment
-        - name: create
-          uid: ext_kusto_az_kusto_database_principal_assignment_create
-          displayName: az kusto database-principal-assignment create
-        - name: delete
-          uid: ext_kusto_az_kusto_database_principal_assignment_delete
-          displayName: az kusto database-principal-assignment delete
-        - name: list
-          uid: ext_kusto_az_kusto_database_principal_assignment_list
-          displayName: az kusto database-principal-assignment list
-        - name: show
-          uid: ext_kusto_az_kusto_database_principal_assignment_show
-          displayName: az kusto database-principal-assignment show
-        - name: update
-          uid: ext_kusto_az_kusto_database_principal_assignment_update
-          displayName: az kusto database-principal-assignment update
-        - name: wait
-          uid: ext_kusto_az_kusto_database_principal_assignment_wait
-          displayName: az kusto database-principal-assignment wait
-  - name: log-analytics
-    items:
-    - name: Overview
-      uid: ext_log-analytics_az
-    - name: Monitoring
-      displayName: az monitor
+        uid: az_footprint_profile
+        displayName: az footprint profile
+        items: []
+    - name: monitor
       items:
-      - name: Overview
-        uid: ext_log-analytics_az_monitor
+      - name: Summary
+        uid: az_monitor
         displayName: az monitor
-      - name: log-analytics
-        displayName: az monitor log-analytics
+      - name: action-rule
+        uid: az_monitor_action-rule
+        displayName: az monitor action-rule
+        items: []
+      - name: app-insights
         items:
-        - name: Overview
-          uid: ext_log-analytics_az_monitor_log_analytics
-          displayName: az monitor log-analytics
-        - name: query
-          uid: ext_log-analytics_az_monitor_log_analytics_query
-          displayName: az monitor log-analytics query
-  - name: log-analytics-solution
-    items:
-    - name: Overview
-      uid: ext_log-analytics-solution_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_log-analytics-solution_az_monitor
-        displayName: az monitor
+        - name: Summary
+          uid: az_monitor_app-insights
+          displayName: az monitor app-insights
+        - name: api-key
+          uid: az_monitor_app-insights_api-key
+          displayName: az monitor app-insights api-key
+          items: []
+        - name: component
+          items:
+          - name: Summary
+            uid: az_monitor_app-insights_component
+            displayName: az monitor app-insights component
+          - name: billing
+            uid: az_monitor_app-insights_component_billing
+            displayName: az monitor app-insights component billing
+            items: []
+          - name: continues-export
+            uid: az_monitor_app-insights_component_continues-export
+            displayName: az monitor app-insights component continues-export
+            items: []
+          - name: linked-storage
+            uid: az_monitor_app-insights_component_linked-storage
+            displayName: az monitor app-insights component linked-storage
+            items: []
+        - name: events
+          uid: az_monitor_app-insights_events
+          displayName: az monitor app-insights events
+          items: []
+        - name: metrics
+          uid: az_monitor_app-insights_metrics
+          displayName: az monitor app-insights metrics
+          items: []
+      - name: data-collection
+        items:
+        - name: Summary
+          uid: az_monitor_data-collection
+          displayName: az monitor data-collection
+        - name: rule
+          items:
+          - name: Summary
+            uid: az_monitor_data-collection_rule
+            displayName: az monitor data-collection rule
+          - name: association
+            uid: az_monitor_data-collection_rule_association
+            displayName: az monitor data-collection rule association
+            items: []
+          - name: data-flow
+            uid: az_monitor_data-collection_rule_data-flow
+            displayName: az monitor data-collection rule data-flow
+            items: []
+          - name: log-analytics
+            uid: az_monitor_data-collection_rule_log-analytics
+            displayName: az monitor data-collection rule log-analytics
+            items: []
+          - name: performance-counter
+            uid: az_monitor_data-collection_rule_performance-counter
+            displayName: az monitor data-collection rule performance-counter
+            items: []
+          - name: syslog
+            uid: az_monitor_data-collection_rule_syslog
+            displayName: az monitor data-collection rule syslog
+            items: []
+          - name: windows-event-log
+            uid: az_monitor_data-collection_rule_windows-event-log
+            displayName: az monitor data-collection rule windows-event-log
+            items: []
       - name: log-analytics
-        displayName: az monitor log-analytics
         items:
-        - name: Overview
-          uid: ext_log-analytics-solution_az_monitor_log_analytics
+        - name: Summary
+          uid: az_monitor_log-analytics
           displayName: az monitor log-analytics
         - name: solution
+          uid: az_monitor_log-analytics_solution
           displayName: az monitor log-analytics solution
-          items:
-          - name: Overview
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-            displayName: az monitor log-analytics solution
-          - name: create
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-            displayName: az monitor log-analytics solution create
-          - name: delete
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-            displayName: az monitor log-analytics solution delete
-          - name: list
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-            displayName: az monitor log-analytics solution list
-          - name: show
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-            displayName: az monitor log-analytics solution show
-          - name: update
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-            displayName: az monitor log-analytics solution update
-  - name: logic
+          items: []
+      - name: scheduled-query
+        uid: az_monitor_scheduled-query
+        displayName: az monitor scheduled-query
+        items: []
+  - name: Azure NetApp Files
     items:
-    - name: Overview
-      uid: ext_logic_az
-    - name: logic
-      displayName: az logic
+    - name: Summary
+      uid: sp-Azure_NetApp_Files
+      displayName: Azure NetApp Files
+    - name: netappfiles
       items:
-      - name: Overview
-        uid: ext_logic_az_logic
-        displayName: az logic
-      - name: integration-account
-        displayName: az logic integration-account
-        items:
-        - name: Overview
-          uid: ext_logic_az_logic_integration_account
-          displayName: az logic integration-account
-        - name: create
-          uid: ext_logic_az_logic_integration_account_create
-          displayName: az logic integration-account create
-        - name: delete
-          uid: ext_logic_az_logic_integration_account_delete
-          displayName: az logic integration-account delete
-        - name: import
-          uid: ext_logic_az_logic_integration_account_import
-          displayName: az logic integration-account import
-        - name: list
-          uid: ext_logic_az_logic_integration_account_list
-          displayName: az logic integration-account list
-        - name: show
-          uid: ext_logic_az_logic_integration_account_show
-          displayName: az logic integration-account show
-        - name: update
-          uid: ext_logic_az_logic_integration_account_update
-          displayName: az logic integration-account update
-      - name: workflow
-        displayName: az logic workflow
-        items:
-        - name: Overview
-          uid: ext_logic_az_logic_workflow
-          displayName: az logic workflow
-        - name: create
-          uid: ext_logic_az_logic_workflow_create
-          displayName: az logic workflow create
-        - name: delete
-          uid: ext_logic_az_logic_workflow_delete
-          displayName: az logic workflow delete
-        - name: list
-          uid: ext_logic_az_logic_workflow_list
-          displayName: az logic workflow list
-        - name: show
-          uid: ext_logic_az_logic_workflow_show
-          displayName: az logic workflow show
-        - name: update
-          uid: ext_logic_az_logic_workflow_update
-          displayName: az logic workflow update
-  - name: maintenance
+      - name: Summary
+        uid: az_netappfiles
+        displayName: az netappfiles
+      - name: account
+        uid: az_netappfiles_account
+        displayName: az netappfiles account
+        items: []
+      - name: mount-target
+        uid: az_netappfiles_mount-target
+        displayName: az netappfiles mount-target
+        items: []
+      - name: pool
+        uid: az_netappfiles_pool
+        displayName: az netappfiles pool
+        items: []
+      - name: snapshot
+        uid: az_netappfiles_snapshot
+        displayName: az netappfiles snapshot
+        items: []
+      - name: volume
+        uid: az_netappfiles_volume
+        displayName: az netappfiles volume
+        items: []
+  - name: Azure Network
     items:
-    - name: Overview
-      uid: ext_maintenance_az
-    - name: maintenance
-      displayName: az maintenance
+    - name: Summary
+      uid: sp-Azure_Network
+      displayName: Azure Network
+    - name: internet-analyzer
       items:
-      - name: Overview
-        uid: ext_maintenance_az_maintenance
-        displayName: az maintenance
-      - name: applyupdate
-        displayName: az maintenance applyupdate
+      - name: Summary
+        uid: az_internet-analyzer
+        displayName: az internet-analyzer
+      - name: preconfigured-endpoint
+        uid: az_internet-analyzer_preconfigured-endpoint
+        displayName: az internet-analyzer preconfigured-endpoint
+        items: []
+      - name: profile
+        uid: az_internet-analyzer_profile
+        displayName: az internet-analyzer profile
+        items: []
+      - name: test
+        uid: az_internet-analyzer_test
+        displayName: az internet-analyzer test
+        items: []
+    - name: network
+      items:
+      - name: Summary
+        uid: az_network
+        displayName: az network
+      - name: application-gateway
         items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_applyupdate
-          displayName: az maintenance applyupdate
-        - name: create
-          uid: ext_maintenance_az_maintenance_applyupdate_create
-          displayName: az maintenance applyupdate create
-        - name: get
-          uid: ext_maintenance_az_maintenance_applyupdate_get
-          displayName: az maintenance applyupdate get
-        - name: show
-          uid: ext_maintenance_az_maintenance_applyupdate_show
-          displayName: az maintenance applyupdate show
-      - name: assignment
-        displayName: az maintenance assignment
+        - name: Summary
+          uid: az_network_application-gateway
+          displayName: az network application-gateway
+        - name: address-pool
+          uid: az_network_application-gateway_address-pool
+          displayName: az network application-gateway address-pool
+          items: []
+        - name: auth-cert
+          uid: az_network_application-gateway_auth-cert
+          displayName: az network application-gateway auth-cert
+          items: []
+        - name: frontend-ip
+          uid: az_network_application-gateway_frontend-ip
+          displayName: az network application-gateway frontend-ip
+          items: []
+        - name: frontend-port
+          uid: az_network_application-gateway_frontend-port
+          displayName: az network application-gateway frontend-port
+          items: []
+        - name: http-listener
+          uid: az_network_application-gateway_http-listener
+          displayName: az network application-gateway http-listener
+          items: []
+        - name: http-settings
+          uid: az_network_application-gateway_http-settings
+          displayName: az network application-gateway http-settings
+          items: []
+        - name: probe
+          uid: az_network_application-gateway_probe
+          displayName: az network application-gateway probe
+          items: []
+        - name: rewrite-rule
+          items:
+          - name: Summary
+            uid: az_network_application-gateway_rewrite-rule
+            displayName: az network application-gateway rewrite-rule
+          - name: set
+            uid: az_network_application-gateway_rewrite-rule_set
+            displayName: az network application-gateway rewrite-rule set
+            items: []
+        - name: rule
+          uid: az_network_application-gateway_rule
+          displayName: az network application-gateway rule
+          items: []
+        - name: ssl-cert
+          uid: az_network_application-gateway_ssl-cert
+          displayName: az network application-gateway ssl-cert
+          items: []
+        - name: ssl-policy
+          uid: az_network_application-gateway_ssl-policy
+          displayName: az network application-gateway ssl-policy
+          items: []
+        - name: url-path-map
+          items:
+          - name: Summary
+            uid: az_network_application-gateway_url-path-map
+            displayName: az network application-gateway url-path-map
+          - name: rule
+            uid: az_network_application-gateway_url-path-map_rule
+            displayName: az network application-gateway url-path-map rule
+            items: []
+        - name: waf-config
+          uid: az_network_application-gateway_waf-config
+          displayName: az network application-gateway waf-config
+          items: []
+      - name: bastion
+        uid: az_network_bastion
+        displayName: az network bastion
+        items: []
+      - name: cross-connection
         items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_assignment
-          displayName: az maintenance assignment
-        - name: create
-          uid: ext_maintenance_az_maintenance_assignment_create
-          displayName: az maintenance assignment create
-        - name: delete
-          uid: ext_maintenance_az_maintenance_assignment_delete
-          displayName: az maintenance assignment delete
-        - name: list
-          uid: ext_maintenance_az_maintenance_assignment_list
-          displayName: az maintenance assignment list
-      - name: configuration
-        displayName: az maintenance configuration
+        - name: Summary
+          uid: az_network_cross-connection
+          displayName: az network cross-connection
+        - name: peering
+          uid: az_network_cross-connection_peering
+          displayName: az network cross-connection peering
+          items: []
+      - name: cross-region-lb
+        items:
+        - name: Summary
+          uid: az_network_cross-region-lb
+          displayName: az network cross-region-lb
+        - name: address-pool
+          items:
+          - name: Summary
+            uid: az_network_cross-region-lb_address-pool
+            displayName: az network cross-region-lb address-pool
+          - name: address
+            uid: az_network_cross-region-lb_address-pool_address
+            displayName: az network cross-region-lb address-pool address
+            items: []
+        - name: frontend-ip
+          uid: az_network_cross-region-lb_frontend-ip
+          displayName: az network cross-region-lb frontend-ip
+          items: []
+        - name: probe
+          uid: az_network_cross-region-lb_probe
+          displayName: az network cross-region-lb probe
+          items: []
+        - name: rule
+          uid: az_network_cross-region-lb_rule
+          displayName: az network cross-region-lb rule
+          items: []
+      - name: dns
+        items:
+        - name: Summary
+          uid: az_network_dns
+          displayName: az network dns
+        - name: record-set
+          items:
+          - name: Summary
+            uid: az_network_dns_record-set
+            displayName: az network dns record-set
+          - name: a
+            uid: az_network_dns_record-set_a
+            displayName: az network dns record-set a
+            items: []
+          - name: aaaa
+            uid: az_network_dns_record-set_aaaa
+            displayName: az network dns record-set aaaa
+            items: []
+          - name: cname
+            uid: az_network_dns_record-set_cname
+            displayName: az network dns record-set cname
+            items: []
+          - name: mx
+            uid: az_network_dns_record-set_mx
+            displayName: az network dns record-set mx
+            items: []
+          - name: ns
+            uid: az_network_dns_record-set_ns
+            displayName: az network dns record-set ns
+            items: []
+          - name: network dns record-set ptr - pointer
+            uid: az_network_dns_record-set_ptr
+            displayName: az network dns record-set ptr
+            items: []
+          - name: soa
+            uid: az_network_dns_record-set_soa
+            displayName: az network dns record-set soa
+            items: []
+          - name: srv
+            uid: az_network_dns_record-set_srv
+            displayName: az network dns record-set srv
+            items: []
+          - name: txt
+            uid: az_network_dns_record-set_txt
+            displayName: az network dns record-set txt
+            items: []
+        - name: zone
+          uid: az_network_dns_zone
+          displayName: az network dns zone
+          items: []
+      - name: express-route
         items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_configuration
-          displayName: az maintenance configuration
-        - name: create
-          uid: ext_maintenance_az_maintenance_configuration_create
-          displayName: az maintenance configuration create
-        - name: delete
-          uid: ext_maintenance_az_maintenance_configuration_delete
-          displayName: az maintenance configuration delete
-        - name: list
-          uid: ext_maintenance_az_maintenance_configuration_list
-          displayName: az maintenance configuration list
-        - name: show
-          uid: ext_maintenance_az_maintenance_configuration_show
-          displayName: az maintenance configuration show
-        - name: update
-          uid: ext_maintenance_az_maintenance_configuration_update
-          displayName: az maintenance configuration update
-      - name: update
-        displayName: az maintenance update
+        - name: Summary
+          uid: az_network_express-route
+          displayName: az network express-route
+        - name: gateway
+          items:
+          - name: Summary
+            uid: az_network_express-route_gateway
+            displayName: az network express-route gateway
+          - name: connection
+            uid: az_network_express-route_gateway_connection
+            displayName: az network express-route gateway connection
+            items: []
+        - name: peering
+          items:
+          - name: Summary
+            uid: az_network_express-route_peering
+            displayName: az network express-route peering
+          - name: connection
+            uid: az_network_express-route_peering_connection
+            displayName: az network express-route peering connection
+            items: []
+        - name: port
+          uid: az_network_express-route_port
+          displayName: az network express-route port
+          items: []
+      - name: firewall
         items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_update
-          displayName: az maintenance update
-        - name: list
-          uid: ext_maintenance_az_maintenance_update_list
-          displayName: az maintenance update list
-  - name: managementpartner
-    items:
-    - name: Overview
-      uid: ext_managementpartner_az
-    - name: managementpartner
-      displayName: az managementpartner
-      items:
-      - name: Overview
-        uid: ext_managementpartner_az_managementpartner
-        displayName: az managementpartner
-      - name: create
-        uid: ext_managementpartner_az_managementpartner_create
-        displayName: az managementpartner create
-      - name: delete
-        uid: ext_managementpartner_az_managementpartner_delete
-        displayName: az managementpartner delete
-      - name: show
-        uid: ext_managementpartner_az_managementpartner_show
-        displayName: az managementpartner show
-      - name: update
-        uid: ext_managementpartner_az_managementpartner_update
-        displayName: az managementpartner update
-  - name: mesh
-    items:
-    - name: Overview
-      uid: ext_mesh_az
-    - name: mesh
-      displayName: az mesh
-      items:
-      - name: Overview
-        uid: ext_mesh_az_mesh
-        displayName: az mesh
-      - name: app
-        displayName: az mesh app
+        - name: Summary
+          uid: az_network_firewall
+          displayName: az network firewall
+        - name: application-rule
+          items:
+          - name: Summary
+            uid: az_network_firewall_application-rule
+            displayName: az network firewall application-rule
+          - name: collection
+            uid: az_network_firewall_application-rule_collection
+            displayName: az network firewall application-rule collection
+            items: []
+        - name: ip-config
+          uid: az_network_firewall_ip-config
+          displayName: az network firewall ip-config
+          items: []
+        - name: management-ip-config
+          uid: az_network_firewall_management-ip-config
+          displayName: az network firewall management-ip-config
+          items: []
+        - name: nat-rule
+          items:
+          - name: Summary
+            uid: az_network_firewall_nat-rule
+            displayName: az network firewall nat-rule
+          - name: collection
+            uid: az_network_firewall_nat-rule_collection
+            displayName: az network firewall nat-rule collection
+            items: []
+        - name: network-rule
+          items:
+          - name: Summary
+            uid: az_network_firewall_network-rule
+            displayName: az network firewall network-rule
+          - name: collection
+            uid: az_network_firewall_network-rule_collection
+            displayName: az network firewall network-rule collection
+            items: []
+        - name: policy
+          items:
+          - name: Summary
+            uid: az_network_firewall_policy
+            displayName: az network firewall policy
+          - name: intrusion-detection
+            uid: az_network_firewall_policy_intrusion-detection
+            displayName: az network firewall policy intrusion-detection
+            items: []
+          - name: rule-collection-group
+            items:
+            - name: Summary
+              uid: az_network_firewall_policy_rule-collection-group
+              displayName: az network firewall policy rule-collection-group
+            - name: collection
+              items:
+              - name: Summary
+                uid: az_network_firewall_policy_rule-collection-group_collection
+                displayName: az network firewall policy rule-collection-group collection
+              - name: rule
+                uid: az_network_firewall_policy_rule-collection-group_collection_rule
+                displayName: az network firewall policy rule-collection-group collection rule
+                items: []
+        - name: threat-intel-allowlist
+          uid: az_network_firewall_threat-intel-allowlist
+          displayName: az network firewall threat-intel-allowlist
+          items: []
+      - name: front-door
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_app
-          displayName: az mesh app
-        - name: delete
-          uid: ext_mesh_az_mesh_app_delete
-          displayName: az mesh app delete
-        - name: list
-          uid: ext_mesh_az_mesh_app_list
-          displayName: az mesh app list
-        - name: show
-          uid: ext_mesh_az_mesh_app_show
-          displayName: az mesh app show
-      - name: code-package-log
-        displayName: az mesh code-package-log
+        - name: Summary
+          uid: az_network_front-door
+          displayName: az network front-door
+        - name: backend-pool
+          items:
+          - name: Summary
+            uid: az_network_front-door_backend-pool
+            displayName: az network front-door backend-pool
+          - name: backend
+            uid: az_network_front-door_backend-pool_backend
+            displayName: az network front-door backend-pool backend
+            items: []
+        - name: frontend-endpoint
+          uid: az_network_front-door_frontend-endpoint
+          displayName: az network front-door frontend-endpoint
+          items: []
+        - name: load-balancing
+          uid: az_network_front-door_load-balancing
+          displayName: az network front-door load-balancing
+          items: []
+        - name: probe
+          uid: az_network_front-door_probe
+          displayName: az network front-door probe
+          items: []
+        - name: routing-rule
+          uid: az_network_front-door_routing-rule
+          displayName: az network front-door routing-rule
+          items: []
+        - name: rules-engine
+          items:
+          - name: Summary
+            uid: az_network_front-door_rules-engine
+            displayName: az network front-door rules-engine
+          - name: rule
+            items:
+            - name: Summary
+              uid: az_network_front-door_rules-engine_rule
+              displayName: az network front-door rules-engine rule
+            - name: action
+              uid: az_network_front-door_rules-engine_rule_action
+              displayName: az network front-door rules-engine rule action
+              items: []
+            - name: condition
+              uid: az_network_front-door_rules-engine_rule_condition
+              displayName: az network front-door rules-engine rule condition
+              items: []
+        - name: waf-policy
+          items:
+          - name: Summary
+            uid: az_network_front-door_waf-policy
+            displayName: az network front-door waf-policy
+          - name: managed-rule-definition
+            uid: az_network_front-door_waf-policy_managed-rule-definition
+            displayName: az network front-door waf-policy managed-rule-definition
+            items: []
+          - name: managed-rules
+            items:
+            - name: Summary
+              uid: az_network_front-door_waf-policy_managed-rules
+              displayName: az network front-door waf-policy managed-rules
+            - name: exclusion
+              uid: az_network_front-door_waf-policy_managed-rules_exclusion
+              displayName: az network front-door waf-policy managed-rules exclusion
+              items: []
+            - name: override
+              uid: az_network_front-door_waf-policy_managed-rules_override
+              displayName: az network front-door waf-policy managed-rules override
+              items: []
+          - name: rule
+            items:
+            - name: Summary
+              uid: az_network_front-door_waf-policy_rule
+              displayName: az network front-door waf-policy rule
+            - name: match-condition
+              uid: az_network_front-door_waf-policy_rule_match-condition
+              displayName: az network front-door waf-policy rule match-condition
+              items: []
+      - name: ip-group
+        uid: az_network_ip-group
+        displayName: az network ip-group
+        items: []
+      - name: lb
+        items:
+        - name: Summary
+          uid: az_network_lb
+          displayName: az network lb
+        - name: address-pool
+          items:
+          - name: Summary
+            uid: az_network_lb_address-pool
+            displayName: az network lb address-pool
+          - name: address
+            uid: az_network_lb_address-pool_address
+            displayName: az network lb address-pool address
+            items: []
+        - name: frontend-ip
+          uid: az_network_lb_frontend-ip
+          displayName: az network lb frontend-ip
+          items: []
+        - name: inbound-nat-pool
+          uid: az_network_lb_inbound-nat-pool
+          displayName: az network lb inbound-nat-pool
+          items: []
+        - name: inbound-nat-rule
+          uid: az_network_lb_inbound-nat-rule
+          displayName: az network lb inbound-nat-rule
+          items: []
+        - name: probe
+          uid: az_network_lb_probe
+          displayName: az network lb probe
+          items: []
+        - name: rule
+          uid: az_network_lb_rule
+          displayName: az network lb rule
+          items: []
+      - name: local-gateway
+        uid: az_network_local-gateway
+        displayName: az network local-gateway
+        items: []
+      - name: nic
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_code_package_log
-          displayName: az mesh code-package-log
-        - name: get
-          uid: ext_mesh_az_mesh_code_package_log_get
-          displayName: az mesh code-package-log get
-      - name: deployment
-        displayName: az mesh deployment
+        - name: Summary
+          uid: az_network_nic
+          displayName: az network nic
+        - name: ip-config
+          items:
+          - name: Summary
+            uid: az_network_nic_ip-config
+            displayName: az network nic ip-config
+          - name: address-pool
+            uid: az_network_nic_ip-config_address-pool
+            displayName: az network nic ip-config address-pool
+            items: []
+          - name: inbound-nat-rule
+            uid: az_network_nic_ip-config_inbound-nat-rule
+            displayName: az network nic ip-config inbound-nat-rule
+            items: []
+        - name: vtap-config
+          uid: az_network_nic_vtap-config
+          displayName: az network nic vtap-config
+          items: []
+      - name: nsg
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_deployment
-          displayName: az mesh deployment
-        - name: create
-          uid: ext_mesh_az_mesh_deployment_create
-          displayName: az mesh deployment create
-      - name: gateway
-        displayName: az mesh gateway
+        - name: Summary
+          uid: az_network_nsg
+          displayName: az network nsg
+        - name: rule
+          uid: az_network_nsg_rule
+          displayName: az network nsg rule
+          items: []
+      - name: p2s-vpn-gateway
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_gateway
-          displayName: az mesh gateway
-        - name: delete
-          uid: ext_mesh_az_mesh_gateway_delete
-          displayName: az mesh gateway delete
-        - name: list
-          uid: ext_mesh_az_mesh_gateway_list
-          displayName: az mesh gateway list
-        - name: show
-          uid: ext_mesh_az_mesh_gateway_show
-          displayName: az mesh gateway show
-      - name: generate
-        displayName: az mesh generate
+        - name: Summary
+          uid: az_network_p2s-vpn-gateway
+          displayName: az network p2s-vpn-gateway
+        - name: connection
+          uid: az_network_p2s-vpn-gateway_connection
+          displayName: az network p2s-vpn-gateway connection
+          items: []
+        - name: vpn-client
+          uid: az_network_p2s-vpn-gateway_vpn-client
+          displayName: az network p2s-vpn-gateway vpn-client
+          items: []
+      - name: private-dns
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_generate
-          displayName: az mesh generate
-        - name: armtemplate
-          uid: ext_mesh_az_mesh_generate_armtemplate
-          displayName: az mesh generate armtemplate
-      - name: network
-        displayName: az mesh network
+        - name: Summary
+          uid: az_network_private-dns
+          displayName: az network private-dns
+        - name: link
+          items:
+          - name: Summary
+            uid: az_network_private-dns_link
+            displayName: az network private-dns link
+          - name: vnet
+            uid: az_network_private-dns_link_vnet
+            displayName: az network private-dns link vnet
+            items: []
+        - name: record-set
+          items:
+          - name: Summary
+            uid: az_network_private-dns_record-set
+            displayName: az network private-dns record-set
+          - name: a
+            uid: az_network_private-dns_record-set_a
+            displayName: az network private-dns record-set a
+            items: []
+          - name: aaaa
+            uid: az_network_private-dns_record-set_aaaa
+            displayName: az network private-dns record-set aaaa
+            items: []
+          - name: cname
+            uid: az_network_private-dns_record-set_cname
+            displayName: az network private-dns record-set cname
+            items: []
+          - name: mx
+            uid: az_network_private-dns_record-set_mx
+            displayName: az network private-dns record-set mx
+            items: []
+          - name: ptr
+            uid: az_network_private-dns_record-set_ptr
+            displayName: az network private-dns record-set ptr
+            items: []
+          - name: soa
+            uid: az_network_private-dns_record-set_soa
+            displayName: az network private-dns record-set soa
+            items: []
+          - name: srv
+            uid: az_network_private-dns_record-set_srv
+            displayName: az network private-dns record-set srv
+            items: []
+          - name: txt
+            uid: az_network_private-dns_record-set_txt
+            displayName: az network private-dns record-set txt
+            items: []
+        - name: zone
+          uid: az_network_private-dns_zone
+          displayName: az network private-dns zone
+          items: []
+      - name: private-endpoint
+        uid: az_network_private-endpoint
+        displayName: az network private-endpoint
+        items: []
+      - name: private-endpoint-connection
+        uid: az_network_private-endpoint-connection
+        displayName: az network private-endpoint-connection
+        items: []
+      - name: private-link-resource
+        uid: az_network_private-link-resource
+        displayName: az network private-link-resource
+        items: []
+      - name: private-link-service
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_network
-          displayName: az mesh network
-        - name: delete
-          uid: ext_mesh_az_mesh_network_delete
-          displayName: az mesh network delete
-        - name: list
-          uid: ext_mesh_az_mesh_network_list
-          displayName: az mesh network list
-        - name: show
-          uid: ext_mesh_az_mesh_network_show
-          displayName: az mesh network show
-      - name: secret
-        displayName: az mesh secret
+        - name: Summary
+          uid: az_network_private-link-service
+          displayName: az network private-link-service
+        - name: connection
+          uid: az_network_private-link-service_connection
+          displayName: az network private-link-service connection
+          items: []
+      - name: profile
+        uid: az_network_profile
+        displayName: az network profile
+        items: []
+      - name: public-ip
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_secret
-          displayName: az mesh secret
-        - name: delete
-          uid: ext_mesh_az_mesh_secret_delete
-          displayName: az mesh secret delete
-        - name: list
-          uid: ext_mesh_az_mesh_secret_list
-          displayName: az mesh secret list
-        - name: show
-          uid: ext_mesh_az_mesh_secret_show
-          displayName: az mesh secret show
-      - name: secretvalue
-        displayName: az mesh secretvalue
+        - name: Summary
+          uid: az_network_public-ip
+          displayName: az network public-ip
+        - name: prefix
+          uid: az_network_public-ip_prefix
+          displayName: az network public-ip prefix
+          items: []
+      - name: route-table
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_secretvalue
-          displayName: az mesh secretvalue
-        - name: delete
-          uid: ext_mesh_az_mesh_secretvalue_delete
-          displayName: az mesh secretvalue delete
-        - name: list
-          uid: ext_mesh_az_mesh_secretvalue_list
-          displayName: az mesh secretvalue list
-        - name: show
-          uid: ext_mesh_az_mesh_secretvalue_show
-          displayName: az mesh secretvalue show
-      - name: service
-        displayName: az mesh service
+        - name: Summary
+          uid: az_network_route-table
+          displayName: az network route-table
+        - name: route
+          uid: az_network_route-table_route
+          displayName: az network route-table route
+          items: []
+      - name: security-partner-provider
+        uid: az_network_security-partner-provider
+        displayName: az network security-partner-provider
+        items: []
+      - name: service-endpoint
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_service
-          displayName: az mesh service
-        - name: list
-          uid: ext_mesh_az_mesh_service_list
-          displayName: az mesh service list
-        - name: show
-          uid: ext_mesh_az_mesh_service_show
-          displayName: az mesh service show
-      - name: service-replica
-        displayName: az mesh service-replica
+        - name: Summary
+          uid: az_network_service-endpoint
+          displayName: az network service-endpoint
+        - name: policy
+          uid: az_network_service-endpoint_policy
+          displayName: az network service-endpoint policy
+          items: []
+        - name: policy-definition
+          uid: az_network_service-endpoint_policy-definition
+          displayName: az network service-endpoint policy-definition
+          items: []
+      - name: traffic-manager
+        items:
+        - name: Summary
+          uid: az_network_traffic-manager
+          displayName: az network traffic-manager
+        - name: endpoint
+          uid: az_network_traffic-manager_endpoint
+          displayName: az network traffic-manager endpoint
+          items: []
+        - name: profile
+          uid: az_network_traffic-manager_profile
+          displayName: az network traffic-manager profile
+          items: []
+      - name: vhub
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_service_replica
-          displayName: az mesh service-replica
-        - name: list
-          uid: ext_mesh_az_mesh_service_replica_list
-          displayName: az mesh service-replica list
-        - name: show
-          uid: ext_mesh_az_mesh_service_replica_show
-          displayName: az mesh service-replica show
-      - name: volume
-        displayName: az mesh volume
+        - name: Summary
+          uid: az_network_vhub
+          displayName: az network vhub
+        - name: connection
+          uid: az_network_vhub_connection
+          displayName: az network vhub connection
+          items: []
+        - name: route
+          uid: az_network_vhub_route
+          displayName: az network vhub route
+          items: []
+        - name: route-table
+          items:
+          - name: Summary
+            uid: az_network_vhub_route-table
+            displayName: az network vhub route-table
+          - name: route
+            uid: az_network_vhub_route-table_route
+            displayName: az network vhub route-table route
+            items: []
+      - name: virtual-appliance
+        items:
+        - name: Summary
+          uid: az_network_virtual-appliance
+          displayName: az network virtual-appliance
+        - name: site
+          uid: az_network_virtual-appliance_site
+          displayName: az network virtual-appliance site
+          items: []
+      - name: vnet
+        items:
+        - name: Summary
+          uid: az_network_vnet
+          displayName: az network vnet
+        - name: subnet
+          uid: az_network_vnet_subnet
+          displayName: az network vnet subnet
+          items: []
+        - name: tap
+          uid: az_network_vnet_tap
+          displayName: az network vnet tap
+          items: []
+      - name: vnet-gateway
+        items:
+        - name: Summary
+          uid: az_network_vnet-gateway
+          displayName: az network vnet-gateway
+        - name: revoked-cert
+          uid: az_network_vnet-gateway_revoked-cert
+          displayName: az network vnet-gateway revoked-cert
+          items: []
+        - name: root-cert
+          uid: az_network_vnet-gateway_root-cert
+          displayName: az network vnet-gateway root-cert
+          items: []
+        - name: vpn-client
+          uid: az_network_vnet-gateway_vpn-client
+          displayName: az network vnet-gateway vpn-client
+          items: []
+      - name: vpn-connection
+        items:
+        - name: Summary
+          uid: az_network_vpn-connection
+          displayName: az network vpn-connection
+        - name: shared-key
+          uid: az_network_vpn-connection_shared-key
+          displayName: az network vpn-connection shared-key
+          items: []
+      - name: vpn-gateway
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_volume
-          displayName: az mesh volume
-        - name: create
-          uid: ext_mesh_az_mesh_volume_create
-          displayName: az mesh volume create
-        - name: delete
-          uid: ext_mesh_az_mesh_volume_delete
-          displayName: az mesh volume delete
-        - name: list
-          uid: ext_mesh_az_mesh_volume_list
-          displayName: az mesh volume list
-        - name: show
-          uid: ext_mesh_az_mesh_volume_show
-          displayName: az mesh volume show
-  - name: mixed-reality
-    items:
-    - name: Overview
-      uid: ext_mixed-reality_az
-    - name: spatial-anchors-account
-      displayName: az spatial-anchors-account
-      items:
-      - name: Overview
-        uid: ext_mixed-reality_az_spatial_anchors_account
-        displayName: az spatial-anchors-account
-      - name: create
-        uid: ext_mixed-reality_az_spatial_anchors_account_create
-        displayName: az spatial-anchors-account create
-      - name: delete
-        uid: ext_mixed-reality_az_spatial_anchors_account_delete
-        displayName: az spatial-anchors-account delete
-      - name: list
-        uid: ext_mixed-reality_az_spatial_anchors_account_list
-        displayName: az spatial-anchors-account list
-      - name: show
-        uid: ext_mixed-reality_az_spatial_anchors_account_show
-        displayName: az spatial-anchors-account show
-      - name: key
-        displayName: az spatial-anchors-account key
+        - name: Summary
+          uid: az_network_vpn-gateway
+          displayName: az network vpn-gateway
+        - name: connection
+          items:
+          - name: Summary
+            uid: az_network_vpn-gateway_connection
+            displayName: az network vpn-gateway connection
+          - name: ipsec-policy
+            uid: az_network_vpn-gateway_connection_ipsec-policy
+            displayName: az network vpn-gateway connection ipsec-policy
+            items: []
+      - name: vpn-server-config
+        items:
+        - name: Summary
+          uid: az_network_vpn-server-config
+          displayName: az network vpn-server-config
+        - name: ipsec-policy
+          uid: az_network_vpn-server-config_ipsec-policy
+          displayName: az network vpn-server-config ipsec-policy
+          items: []
+      - name: vpn-site
+        uid: az_network_vpn-site
+        displayName: az network vpn-site
+        items: []
+      - name: vrouter
         items:
-        - name: Overview
-          uid: ext_mixed-reality_az_spatial_anchors_account_key
-          displayName: az spatial-anchors-account key
-        - name: renew
-          uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-          displayName: az spatial-anchors-account key renew
-        - name: show
-          uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-          displayName: az spatial-anchors-account key show
-  - name: netappfiles-preview
-    items:
-    - name: Overview
-      uid: ext_netappfiles-preview_az
-    - name: netappfiles
-      displayName: az netappfiles
+        - name: Summary
+          uid: az_network_vrouter
+          displayName: az network vrouter
+        - name: peering
+          uid: az_network_vrouter_peering
+          displayName: az network vrouter peering
+          items: []
+      - name: vwan
+        uid: az_network_vwan
+        displayName: az network vwan
+        items: []
+    - name: peering
       items:
-      - name: Overview
-        uid: ext_netappfiles-preview_az_netappfiles
-        displayName: az netappfiles
-      - name: account
-        displayName: az netappfiles account
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_account
-          displayName: az netappfiles account
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_account_create
-          displayName: az netappfiles account create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_account_delete
-          displayName: az netappfiles account delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_account_list
-          displayName: az netappfiles account list
-        - name: set
-          uid: ext_netappfiles-preview_az_netappfiles_account_set
-          displayName: az netappfiles account set
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_account_show
-          displayName: az netappfiles account show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_account_update
-          displayName: az netappfiles account update
-      - name: mount-target
-        displayName: az netappfiles mount-target
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_mount_target
-          displayName: az netappfiles mount-target
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-          displayName: az netappfiles mount-target list
-      - name: pool
-        displayName: az netappfiles pool
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_pool
-          displayName: az netappfiles pool
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_pool_create
-          displayName: az netappfiles pool create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-          displayName: az netappfiles pool delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_pool_list
-          displayName: az netappfiles pool list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_pool_show
-          displayName: az netappfiles pool show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_pool_update
-          displayName: az netappfiles pool update
-      - name: snapshot
-        displayName: az netappfiles snapshot
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot
-          displayName: az netappfiles snapshot
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-          displayName: az netappfiles snapshot create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-          displayName: az netappfiles snapshot delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-          displayName: az netappfiles snapshot list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-          displayName: az netappfiles snapshot show
-      - name: volume
-        displayName: az netappfiles volume
+      - name: Summary
+        uid: az_peering
+        displayName: az peering
+      - name: asn
+        uid: az_peering_asn
+        displayName: az peering asn
+        items: []
+      - name: legacy
+        uid: az_peering_legacy
+        displayName: az peering legacy
+        items: []
+      - name: location
+        uid: az_peering_location
+        displayName: az peering location
+        items: []
+      - name: peering
+        uid: az_peering_peering
+        displayName: az peering peering
+        items: []
+      - name: received-route
+        uid: az_peering_received-route
+        displayName: az peering received-route
+        items: []
+      - name: registered-asn
+        uid: az_peering_registered-asn
+        displayName: az peering registered-asn
+        items: []
+      - name: registered-prefix
+        uid: az_peering_registered-prefix
+        displayName: az peering registered-prefix
+        items: []
+      - name: service
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_volume
-          displayName: az netappfiles volume
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_volume_create
-          displayName: az netappfiles volume create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-          displayName: az netappfiles volume delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_volume_list
-          displayName: az netappfiles volume list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_volume_show
-          displayName: az netappfiles volume show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_volume_update
-          displayName: az netappfiles volume update
-  - name: notification-hub
+        - name: Summary
+          uid: az_peering_service
+          displayName: az peering service
+        - name: country
+          uid: az_peering_service_country
+          displayName: az peering service country
+          items: []
+        - name: location
+          uid: az_peering_service_location
+          displayName: az peering service location
+          items: []
+        - name: prefix
+          uid: az_peering_service_prefix
+          displayName: az peering service prefix
+          items: []
+        - name: provider
+          uid: az_peering_service_provider
+          displayName: az peering service provider
+          items: []
+  - name: Azure Notification Hubs
     items:
-    - name: Overview
-      uid: ext_notification-hub_az
+    - name: Summary
+      uid: sp-Azure_Notification_Hubs
+      displayName: Azure Notification Hubs
     - name: notification-hub
-      displayName: az notification-hub
       items:
-      - name: Overview
-        uid: ext_notification-hub_az_notification_hub
+      - name: Summary
+        uid: az_notification-hub
         displayName: az notification-hub
-      - name: check-availability
-        uid: ext_notification-hub_az_notification_hub_check_availability
-        displayName: az notification-hub check-availability
-      - name: create
-        uid: ext_notification-hub_az_notification_hub_create
-        displayName: az notification-hub create
-      - name: delete
-        uid: ext_notification-hub_az_notification_hub_delete
-        displayName: az notification-hub delete
-      - name: list
-        uid: ext_notification-hub_az_notification_hub_list
-        displayName: az notification-hub list
-      - name: show
-        uid: ext_notification-hub_az_notification_hub_show
-        displayName: az notification-hub show
-      - name: test-send
-        uid: ext_notification-hub_az_notification_hub_test_send
-        displayName: az notification-hub test-send
-      - name: update
-        uid: ext_notification-hub_az_notification_hub_update
-        displayName: az notification-hub update
       - name: authorization-rule
+        uid: az_notification-hub_authorization-rule
         displayName: az notification-hub authorization-rule
-        items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_authorization_rule
-          displayName: az notification-hub authorization-rule
-        - name: create
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-          displayName: az notification-hub authorization-rule create
-        - name: delete
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-          displayName: az notification-hub authorization-rule delete
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-          displayName: az notification-hub authorization-rule list
-        - name: list-keys
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-          displayName: az notification-hub authorization-rule list-keys
-        - name: regenerate-keys
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-          displayName: az notification-hub authorization-rule regenerate-keys
-        - name: show
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-          displayName: az notification-hub authorization-rule show
+        items: []
       - name: credential
-        displayName: az notification-hub credential
         items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_credential
+        - name: Summary
+          uid: az_notification-hub_credential
           displayName: az notification-hub credential
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_credential_list
-          displayName: az notification-hub credential list
         - name: adm
+          uid: az_notification-hub_credential_adm
           displayName: az notification-hub credential adm
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_adm
-            displayName: az notification-hub credential adm
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_adm_update
-            displayName: az notification-hub credential adm update
+          items: []
         - name: apns
+          uid: az_notification-hub_credential_apns
           displayName: az notification-hub credential apns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_apns
-            displayName: az notification-hub credential apns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_apns_update
-            displayName: az notification-hub credential apns update
+          items: []
         - name: baidu
+          uid: az_notification-hub_credential_baidu
           displayName: az notification-hub credential baidu
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_baidu
-            displayName: az notification-hub credential baidu
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-            displayName: az notification-hub credential baidu update
+          items: []
         - name: gcm
+          uid: az_notification-hub_credential_gcm
           displayName: az notification-hub credential gcm
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_gcm
-            displayName: az notification-hub credential gcm
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-            displayName: az notification-hub credential gcm update
+          items: []
         - name: mpns
+          uid: az_notification-hub_credential_mpns
           displayName: az notification-hub credential mpns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_mpns
-            displayName: az notification-hub credential mpns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-            displayName: az notification-hub credential mpns update
+          items: []
         - name: wns
+          uid: az_notification-hub_credential_wns
           displayName: az notification-hub credential wns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_wns
-            displayName: az notification-hub credential wns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_wns_update
-            displayName: az notification-hub credential wns update
+          items: []
       - name: namespace
-        displayName: az notification-hub namespace
         items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_namespace
+        - name: Summary
+          uid: az_notification-hub_namespace
           displayName: az notification-hub namespace
-        - name: check-availability
-          uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-          displayName: az notification-hub namespace check-availability
-        - name: create
-          uid: ext_notification-hub_az_notification_hub_namespace_create
-          displayName: az notification-hub namespace create
-        - name: delete
-          uid: ext_notification-hub_az_notification_hub_namespace_delete
-          displayName: az notification-hub namespace delete
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_namespace_list
-          displayName: az notification-hub namespace list
-        - name: show
-          uid: ext_notification-hub_az_notification_hub_namespace_show
-          displayName: az notification-hub namespace show
-        - name: update
-          uid: ext_notification-hub_az_notification_hub_namespace_update
-          displayName: az notification-hub namespace update
-        - name: wait
-          uid: ext_notification-hub_az_notification_hub_namespace_wait
-          displayName: az notification-hub namespace wait
         - name: authorization-rule
+          uid: az_notification-hub_namespace_authorization-rule
           displayName: az notification-hub namespace authorization-rule
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-            displayName: az notification-hub namespace authorization-rule
-          - name: create
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-            displayName: az notification-hub namespace authorization-rule create
-          - name: delete
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-            displayName: az notification-hub namespace authorization-rule delete
-          - name: list
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-            displayName: az notification-hub namespace authorization-rule list
-          - name: list-keys
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-            displayName: az notification-hub namespace authorization-rule list-keys
-          - name: regenerate-keys
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-            displayName: az notification-hub namespace authorization-rule regenerate-keys
-          - name: show
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-            displayName: az notification-hub namespace authorization-rule show
-  - name: peering
+          items: []
+  - name: Azure Pipelines
     items:
-    - name: Overview
-      uid: ext_peering_az
-    - name: peering
-      displayName: az peering
+    - name: Summary
+      uid: sp-Azure_Pipelines
+      displayName: Azure Pipelines
+    - name: pipelines
       items:
-      - name: Overview
-        uid: ext_peering_az_peering
-        displayName: az peering
-      - name: create
-        uid: ext_peering_az_peering_create
-        displayName: az peering create
-      - name: delete
-        uid: ext_peering_az_peering_delete
-        displayName: az peering delete
-      - name: list
-        uid: ext_peering_az_peering_list
-        displayName: az peering list
-      - name: show
-        uid: ext_peering_az_peering_show
-        displayName: az peering show
-      - name: update
-        uid: ext_peering_az_peering_update
-        displayName: az peering update
-      - name: asn
-        displayName: az peering asn
+      - name: Summary
+        uid: az_pipelines
+        displayName: az pipelines
+      - name: agent
+        uid: az_pipelines_agent
+        displayName: az pipelines agent
+        items: []
+      - name: build
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_asn
-          displayName: az peering asn
-        - name: create
-          uid: ext_peering_az_peering_asn_create
-          displayName: az peering asn create
-        - name: delete
-          uid: ext_peering_az_peering_asn_delete
-          displayName: az peering asn delete
-        - name: list
-          uid: ext_peering_az_peering_asn_list
-          displayName: az peering asn list
-        - name: show
-          uid: ext_peering_az_peering_asn_show
-          displayName: az peering asn show
-        - name: update
-          uid: ext_peering_az_peering_asn_update
-          displayName: az peering asn update
-      - name: legacy
-        displayName: az peering legacy
+        - name: Summary
+          uid: az_pipelines_build
+          displayName: az pipelines build
+        - name: definition
+          uid: az_pipelines_build_definition
+          displayName: az pipelines build definition
+          items: []
+        - name: tag
+          uid: az_pipelines_build_tag
+          displayName: az pipelines build tag
+          items: []
+      - name: folder
+        uid: az_pipelines_folder
+        displayName: az pipelines folder
+        items: []
+      - name: pool
+        uid: az_pipelines_pool
+        displayName: az pipelines pool
+        items: []
+      - name: queue
+        uid: az_pipelines_queue
+        displayName: az pipelines queue
+        items: []
+      - name: release
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_legacy
-          displayName: az peering legacy
-        - name: list
-          uid: ext_peering_az_peering_legacy_list
-          displayName: az peering legacy list
-      - name: location
-        displayName: az peering location
+        - name: Summary
+          uid: az_pipelines_release
+          displayName: az pipelines release
+        - name: definition
+          uid: az_pipelines_release_definition
+          displayName: az pipelines release definition
+          items: []
+      - name: runs
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_location
-          displayName: az peering location
-        - name: list
-          uid: ext_peering_az_peering_location_list
-          displayName: az peering location list
-      - name: service
-        displayName: az peering service
+        - name: Summary
+          uid: az_pipelines_runs
+          displayName: az pipelines runs
+        - name: artifact
+          uid: az_pipelines_runs_artifact
+          displayName: az pipelines runs artifact
+          items: []
+        - name: tag
+          uid: az_pipelines_runs_tag
+          displayName: az pipelines runs tag
+          items: []
+      - name: variable
+        uid: az_pipelines_variable
+        displayName: az pipelines variable
+        items: []
+      - name: variable-group
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_service
-          displayName: az peering service
-        - name: create
-          uid: ext_peering_az_peering_service_create
-          displayName: az peering service create
-        - name: delete
-          uid: ext_peering_az_peering_service_delete
-          displayName: az peering service delete
-        - name: list
-          uid: ext_peering_az_peering_service_list
-          displayName: az peering service list
-        - name: show
-          uid: ext_peering_az_peering_service_show
-          displayName: az peering service show
-        - name: update
-          uid: ext_peering_az_peering_service_update
-          displayName: az peering service update
-        - name: location
-          displayName: az peering service location
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_location
-            displayName: az peering service location
-          - name: list
-            uid: ext_peering_az_peering_service_location_list
-            displayName: az peering service location list
-        - name: prefix
-          displayName: az peering service prefix
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_prefix
-            displayName: az peering service prefix
-          - name: create
-            uid: ext_peering_az_peering_service_prefix_create
-            displayName: az peering service prefix create
-          - name: delete
-            uid: ext_peering_az_peering_service_prefix_delete
-            displayName: az peering service prefix delete
-          - name: list
-            uid: ext_peering_az_peering_service_prefix_list
-            displayName: az peering service prefix list
-          - name: show
-            uid: ext_peering_az_peering_service_prefix_show
-            displayName: az peering service prefix show
-          - name: update
-            uid: ext_peering_az_peering_service_prefix_update
-            displayName: az peering service prefix update
-        - name: provider
-          displayName: az peering service provider
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_provider
-            displayName: az peering service provider
-          - name: list
-            uid: ext_peering_az_peering_service_provider_list
-            displayName: az peering service provider list
-  - name: portal
+        - name: Summary
+          uid: az_pipelines_variable-group
+          displayName: az pipelines variable-group
+        - name: variable
+          uid: az_pipelines_variable-group_variable
+          displayName: az pipelines variable-group variable
+          items: []
+  - name: Azure Policy
+    items:
+    - name: Summary
+      uid: sp-Azure_Policy
+      displayName: Azure Policy
+    - name: guestconfig
+      items:
+      - name: Summary
+        uid: az_guestconfig
+        displayName: az guestconfig
+      - name: guest-configuration-assignment
+        uid: az_guestconfig_guest-configuration-assignment
+        displayName: az guestconfig guest-configuration-assignment
+        items: []
+      - name: guest-configuration-assignment-report
+        uid: az_guestconfig_guest-configuration-assignment-report
+        displayName: az guestconfig guest-configuration-assignment-report
+        items: []
+      - name: guest-configuration-hcrp-assignment
+        uid: az_guestconfig_guest-configuration-hcrp-assignment
+        displayName: az guestconfig guest-configuration-hcrp-assignment
+        items: []
+      - name: guest-configuration-hcrp-assignment-report
+        uid: az_guestconfig_guest-configuration-hcrp-assignment-report
+        displayName: az guestconfig guest-configuration-hcrp-assignment-report
+        items: []
+    - name: policy
+      items:
+      - name: Summary
+        uid: az_policy
+        displayName: az policy
+      - name: assignment
+        uid: az_policy_assignment
+        displayName: az policy assignment
+        items: []
+      - name: definition
+        uid: az_policy_definition
+        displayName: az policy definition
+        items: []
+  - name: Azure Portal
+    items:
+    - name: Summary
+      uid: sp-Azure_Portal
+      displayName: Azure Portal
+    - name: portal
+      items:
+      - name: Summary
+        uid: az_portal
+        displayName: az portal
+      - name: dashboard
+        uid: az_portal_dashboard
+        displayName: az portal dashboard
+        items: []
+  - name: Azure Providers
+    items:
+    - name: Summary
+      uid: sp-Azure_Providers
+      displayName: Azure Providers
+    - name: providerhub
+      items:
+      - name: Summary
+        uid: az_providerhub
+        displayName: az providerhub
+      - name: custom-rollout
+        uid: az_providerhub_custom-rollout
+        displayName: az providerhub custom-rollout
+        items: []
+      - name: default-rollout
+        uid: az_providerhub_default-rollout
+        displayName: az providerhub default-rollout
+        items: []
+      - name: manifest
+        uid: az_providerhub_manifest
+        displayName: az providerhub manifest
+        items: []
+      - name: provider-registration
+        uid: az_providerhub_provider-registration
+        displayName: az providerhub provider-registration
+        items: []
+      - name: resource-type-registration
+        uid: az_providerhub_resource-type-registration
+        displayName: az providerhub resource-type-registration
+        items: []
+  - name: Azure Quantum
+    items:
+    - name: Summary
+      uid: sp-Azure_Quantum
+      displayName: Azure Quantum
+    - name: quantum
+      items:
+      - name: Summary
+        uid: az_quantum
+        displayName: az quantum
+      - name: job
+        uid: az_quantum_job
+        displayName: az quantum job
+        items: []
+      - name: offerings
+        uid: az_quantum_offerings
+        displayName: az quantum offerings
+        items: []
+      - name: target
+        uid: az_quantum_target
+        displayName: az quantum target
+        items: []
+      - name: workspace
+        uid: az_quantum_workspace
+        displayName: az quantum workspace
+        items: []
+  - name: Azure Red Hat OpenShift
+    uid: sp-Azure_Red_Hat_OpenShift
+    displayName: Azure Red Hat OpenShift
+    items: []
+  - name: Azure Relay
+    uid: sp-Azure_Relay
+    displayName: Azure Relay
+    items: []
+  - name: Azure Remote Rendering
+    items:
+    - name: Summary
+      uid: sp-Azure_Remote_Rendering
+      displayName: Azure Remote Rendering
+    - name: remote-rendering-account
+      items:
+      - name: Summary
+        uid: az_remote-rendering-account
+        displayName: az remote-rendering-account
+      - name: key
+        uid: az_remote-rendering-account_key
+        displayName: az remote-rendering-account key
+        items: []
+  - name: Azure Repos
+    items:
+    - name: Summary
+      uid: sp-Azure_Repos
+      displayName: Azure Repos
+    - name: repos
+      items:
+      - name: Summary
+        uid: az_repos
+        displayName: az repos
+      - name: import
+        uid: az_repos_import
+        displayName: az repos import
+        items: []
+      - name: policy
+        items:
+        - name: Summary
+          uid: az_repos_policy
+          displayName: az repos policy
+        - name: approver-count
+          uid: az_repos_policy_approver-count
+          displayName: az repos policy approver-count
+          items: []
+        - name: build
+          uid: az_repos_policy_build
+          displayName: az repos policy build
+          items: []
+        - name: case-enforcement
+          uid: az_repos_policy_case-enforcement
+          displayName: az repos policy case-enforcement
+          items: []
+        - name: comment-required
+          uid: az_repos_policy_comment-required
+          displayName: az repos policy comment-required
+          items: []
+        - name: file-size
+          uid: az_repos_policy_file-size
+          displayName: az repos policy file-size
+          items: []
+        - name: merge-strategy
+          uid: az_repos_policy_merge-strategy
+          displayName: az repos policy merge-strategy
+          items: []
+        - name: required-reviewer
+          uid: az_repos_policy_required-reviewer
+          displayName: az repos policy required-reviewer
+          items: []
+        - name: work-item-linking
+          uid: az_repos_policy_work-item-linking
+          displayName: az repos policy work-item-linking
+          items: []
+      - name: pr
+        items:
+        - name: Summary
+          uid: az_repos_pr
+          displayName: az repos pr
+        - name: policy
+          uid: az_repos_pr_policy
+          displayName: az repos pr policy
+          items: []
+        - name: reviewer
+          uid: az_repos_pr_reviewer
+          displayName: az repos pr reviewer
+          items: []
+        - name: work-item
+          uid: az_repos_pr_work-item
+          displayName: az repos pr work-item
+          items: []
+      - name: ref
+        uid: az_repos_ref
+        displayName: az repos ref
+        items: []
+  - name: Azure Reservations
+    uid: sp-Azure_Reservations
+    displayName: Azure Reservations
+    items: []
+  - name: Azure Resource Graph
     items:
-    - name: Overview
-      uid: ext_portal_az
-    - name: portal
-      displayName: az portal
-      items:
-      - name: Overview
-        uid: ext_portal_az_portal
-        displayName: az portal
-      - name: dashboard
-        displayName: az portal dashboard
-        items:
-        - name: Overview
-          uid: ext_portal_az_portal_dashboard
-          displayName: az portal dashboard
-        - name: create
-          uid: ext_portal_az_portal_dashboard_create
-          displayName: az portal dashboard create
-        - name: delete
-          uid: ext_portal_az_portal_dashboard_delete
-          displayName: az portal dashboard delete
-        - name: import
-          uid: ext_portal_az_portal_dashboard_import
-          displayName: az portal dashboard import
-        - name: list
-          uid: ext_portal_az_portal_dashboard_list
-          displayName: az portal dashboard list
-        - name: show
-          uid: ext_portal_az_portal_dashboard_show
-          displayName: az portal dashboard show
-        - name: update
-          uid: ext_portal_az_portal_dashboard_update
-          displayName: az portal dashboard update
-  - name: powerbidedicated
+    - name: Summary
+      uid: sp-Azure_Resource_Graph
+      displayName: Azure Resource Graph
+    - name: graph
+      uid: az_graph
+      displayName: az graph
+      items: []
+  - name: Azure Resource Manager
     items:
-    - name: Overview
-      uid: ext_powerbidedicated_az
-    - name: powerbi
-      displayName: az powerbi
-      items:
-      - name: Overview
-        uid: ext_powerbidedicated_az_powerbi
-        displayName: az powerbi
-      - name: embedded-capacity
-        displayName: az powerbi embedded-capacity
+    - name: Summary
+      uid: sp-Azure_Resource_Manager
+      displayName: Azure Resource Manager
+    - name: deployment
+      items:
+      - name: Summary
+        uid: az_deployment
+        displayName: az deployment
+      - name: group
+        uid: az_deployment_group
+        displayName: az deployment group
+        items: []
+      - name: operation
         items:
-        - name: Overview
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-          displayName: az powerbi embedded-capacity
-        - name: create
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-          displayName: az powerbi embedded-capacity create
-        - name: delete
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-          displayName: az powerbi embedded-capacity delete
-        - name: list
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-          displayName: az powerbi embedded-capacity list
-        - name: show
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-          displayName: az powerbi embedded-capacity show
-        - name: update
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-          displayName: az powerbi embedded-capacity update
-        - name: wait
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-          displayName: az powerbi embedded-capacity wait
-  - name: privatedns
-    items:
-    - name: Overview
-      uid: ext_privatedns_az
-    - name: Networking
-      displayName: az network
+        - name: Summary
+          uid: az_deployment_operation
+          displayName: az deployment operation
+        - name: group
+          uid: az_deployment_operation_group
+          displayName: az deployment operation group
+          items: []
+    - name: deployment-scripts
+      uid: az_deployment-scripts
+      displayName: az deployment-scripts
+      items: []
+    - name: group
       items:
-      - name: Overview
-        uid: ext_privatedns_az_network
-        displayName: az network
-      - name: private-dns
-        displayName: az network private-dns
+      - name: Summary
+        uid: az_group
+        displayName: az group
+      - name: deployment
         items:
-        - name: Overview
-          uid: ext_privatedns_az_network_private_dns
-          displayName: az network private-dns
-        - name: link
-          displayName: az network private-dns link
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_link
-            displayName: az network private-dns link
-          - name: vnet
-            displayName: az network private-dns link vnet
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_link_vnet
-              displayName: az network private-dns link vnet
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_link_vnet_create
-              displayName: az network private-dns link vnet create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-              displayName: az network private-dns link vnet delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_link_vnet_list
-              displayName: az network private-dns link vnet list
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_link_vnet_show
-              displayName: az network private-dns link vnet show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_link_vnet_update
-              displayName: az network private-dns link vnet update
-            - name: wait
-              uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-              displayName: az network private-dns link vnet wait
-        - name: record-set
-          displayName: az network private-dns record-set
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_record_set
-            displayName: az network private-dns record-set
-          - name: list
-            uid: ext_privatedns_az_network_private_dns_record_set_list
-            displayName: az network private-dns record-set list
-          - name: a
-            displayName: az network private-dns record-set a
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_a
-              displayName: az network private-dns record-set a
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-              displayName: az network private-dns record-set a add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_a_create
-              displayName: az network private-dns record-set a create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-              displayName: az network private-dns record-set a delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_a_list
-              displayName: az network private-dns record-set a list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-              displayName: az network private-dns record-set a remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_a_show
-              displayName: az network private-dns record-set a show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_a_update
-              displayName: az network private-dns record-set a update
-          - name: aaaa
-            displayName: az network private-dns record-set aaaa
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-              displayName: az network private-dns record-set aaaa
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-              displayName: az network private-dns record-set aaaa add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-              displayName: az network private-dns record-set aaaa create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-              displayName: az network private-dns record-set aaaa delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-              displayName: az network private-dns record-set aaaa list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-              displayName: az network private-dns record-set aaaa remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-              displayName: az network private-dns record-set aaaa show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-              displayName: az network private-dns record-set aaaa update
-          - name: cname
-            displayName: az network private-dns record-set cname
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_cname
-              displayName: az network private-dns record-set cname
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-              displayName: az network private-dns record-set cname create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-              displayName: az network private-dns record-set cname delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-              displayName: az network private-dns record-set cname list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-              displayName: az network private-dns record-set cname remove-record
-            - name: set-record
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-              displayName: az network private-dns record-set cname set-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-              displayName: az network private-dns record-set cname show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-              displayName: az network private-dns record-set cname update
-          - name: mx
-            displayName: az network private-dns record-set mx
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_mx
-              displayName: az network private-dns record-set mx
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-              displayName: az network private-dns record-set mx add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-              displayName: az network private-dns record-set mx create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-              displayName: az network private-dns record-set mx delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-              displayName: az network private-dns record-set mx list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-              displayName: az network private-dns record-set mx remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-              displayName: az network private-dns record-set mx show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-              displayName: az network private-dns record-set mx update
-          - name: ptr
-            displayName: az network private-dns record-set ptr
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr
-              displayName: az network private-dns record-set ptr
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-              displayName: az network private-dns record-set ptr add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-              displayName: az network private-dns record-set ptr create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-              displayName: az network private-dns record-set ptr delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-              displayName: az network private-dns record-set ptr list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-              displayName: az network private-dns record-set ptr remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-              displayName: az network private-dns record-set ptr show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-              displayName: az network private-dns record-set ptr update
-          - name: soa
-            displayName: az network private-dns record-set soa
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_soa
-              displayName: az network private-dns record-set soa
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-              displayName: az network private-dns record-set soa show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-              displayName: az network private-dns record-set soa update
-          - name: srv
-            displayName: az network private-dns record-set srv
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_srv
-              displayName: az network private-dns record-set srv
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-              displayName: az network private-dns record-set srv add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-              displayName: az network private-dns record-set srv create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-              displayName: az network private-dns record-set srv delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-              displayName: az network private-dns record-set srv list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-              displayName: az network private-dns record-set srv remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-              displayName: az network private-dns record-set srv show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-              displayName: az network private-dns record-set srv update
-          - name: txt
-            displayName: az network private-dns record-set txt
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_txt
-              displayName: az network private-dns record-set txt
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-              displayName: az network private-dns record-set txt add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-              displayName: az network private-dns record-set txt create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-              displayName: az network private-dns record-set txt delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-              displayName: az network private-dns record-set txt list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-              displayName: az network private-dns record-set txt remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-              displayName: az network private-dns record-set txt show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-              displayName: az network private-dns record-set txt update
-        - name: zone
-          displayName: az network private-dns zone
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_zone
-            displayName: az network private-dns zone
-          - name: create
-            uid: ext_privatedns_az_network_private_dns_zone_create
-            displayName: az network private-dns zone create
-          - name: delete
-            uid: ext_privatedns_az_network_private_dns_zone_delete
-            displayName: az network private-dns zone delete
-          - name: list
-            uid: ext_privatedns_az_network_private_dns_zone_list
-            displayName: az network private-dns zone list
-          - name: show
-            uid: ext_privatedns_az_network_private_dns_zone_show
-            displayName: az network private-dns zone show
-          - name: update
-            uid: ext_privatedns_az_network_private_dns_zone_update
-            displayName: az network private-dns zone update
-          - name: wait
-            uid: ext_privatedns_az_network_private_dns_zone_wait
-            displayName: az network private-dns zone wait
-  - name: resource-graph
+        - name: Summary
+          uid: az_group_deployment
+          displayName: az group deployment
+        - name: operation
+          uid: az_group_deployment_operation
+          displayName: az group deployment operation
+          items: []
+      - name: lock
+        uid: az_group_lock
+        displayName: az group lock
+        items: []
+    - name: lock
+      uid: az_lock
+      displayName: az lock
+      items: []
+    - name: provider
+      items:
+      - name: Summary
+        uid: az_provider
+        displayName: az provider
+      - name: operation
+        uid: az_provider_operation
+        displayName: az provider operation
+        items: []
+    - name: resource
+      items:
+      - name: Summary
+        uid: az_resource
+        displayName: az resource
+      - name: link
+        uid: az_resource_link
+        displayName: az resource link
+        items: []
+      - name: lock
+        uid: az_resource_lock
+        displayName: az resource lock
+        items: []
+    - name: tag
+      uid: az_tag
+      displayName: az tag
+      items: []
+  - name: Azure Resource Mover
     items:
-    - name: Overview
-      uid: ext_resource-graph_az
-    - name: graph
-      displayName: az graph
+    - name: Summary
+      uid: sp-Azure_Resource_Mover
+      displayName: Azure Resource Mover
+    - name: resource-mover
+      items:
+      - name: Summary
+        uid: az_resource-mover
+        displayName: az resource-mover
+      - name: move-collection
+        uid: az_resource-mover_move-collection
+        displayName: az resource-mover move-collection
+        items: []
+      - name: move-resource
+        uid: az_resource-mover_move-resource
+        displayName: az resource-mover move-resource
+        items: []
+  - name: Azure resource providers
+    uid: sp-Azure_resource_providers
+    displayName: Azure resource providers
+    items: []
+  - name: Azure role-based access Control
+    items:
+    - name: Summary
+      uid: sp-Azure_role-based_access_Control
+      displayName: Azure role-based access Control
+    - name: role
+      items:
+      - name: Summary
+        uid: az_role
+        displayName: az role
+      - name: assignment
+        uid: az_role_assignment
+        displayName: az role assignment
+        items: []
+      - name: definition
+        uid: az_role_definition
+        displayName: az role definition
+        items: []
+  - name: Azure Security Center
+    items:
+    - name: Summary
+      uid: sp-Azure_Security_Center
+      displayName: Azure Security Center
+    - name: security
       items:
-      - name: Overview
-        uid: ext_resource-graph_az_graph
-        displayName: az graph
-      - name: query
-        uid: ext_resource-graph_az_graph_query
-        displayName: az graph query
-      - name: shared-query
-        displayName: az graph shared-query
-        items:
-        - name: Overview
-          uid: ext_resource-graph_az_graph_shared_query
-          displayName: az graph shared-query
-        - name: create
-          uid: ext_resource-graph_az_graph_shared_query_create
-          displayName: az graph shared-query create
-        - name: delete
-          uid: ext_resource-graph_az_graph_shared_query_delete
-          displayName: az graph shared-query delete
-        - name: list
-          uid: ext_resource-graph_az_graph_shared_query_list
-          displayName: az graph shared-query list
-        - name: show
-          uid: ext_resource-graph_az_graph_shared_query_show
-          displayName: az graph shared-query show
-  - name: sap-hana
+      - name: Summary
+        uid: az_security
+        displayName: az security
+      - name: adaptive_network_hardenings
+        uid: az_security_adaptive_network_hardenings
+        displayName: az security adaptive_network_hardenings
+        items: []
+      - name: adaptive-application-controls
+        uid: az_security_adaptive-application-controls
+        displayName: az security adaptive-application-controls
+        items: []
+      - name: alert
+        uid: az_security_alert
+        displayName: az security alert
+        items: []
+      - name: allowed_connections
+        uid: az_security_allowed_connections
+        displayName: az security allowed_connections
+        items: []
+      - name: assessment
+        uid: az_security_assessment
+        displayName: az security assessment
+        items: []
+      - name: assessment-metadata
+        uid: az_security_assessment-metadata
+        displayName: az security assessment-metadata
+        items: []
+      - name: atp
+        items:
+        - name: Summary
+          uid: az_security_atp
+          displayName: az security atp
+        - name: storage
+          uid: az_security_atp_storage
+          displayName: az security atp storage
+          items: []
+      - name: auto-provisioning-setting
+        uid: az_security_auto-provisioning-setting
+        displayName: az security auto-provisioning-setting
+        items: []
+      - name: contact
+        uid: az_security_contact
+        displayName: az security contact
+        items: []
+      - name: discovered-security-solution
+        uid: az_security_discovered-security-solution
+        displayName: az security discovered-security-solution
+        items: []
+      - name: external-security-solution
+        uid: az_security_external-security-solution
+        displayName: az security external-security-solution
+        items: []
+      - name: iot-alerts
+        uid: az_security_iot-alerts
+        displayName: az security iot-alerts
+        items: []
+      - name: iot-analytics
+        uid: az_security_iot-analytics
+        displayName: az security iot-analytics
+        items: []
+      - name: iot-recommendations
+        uid: az_security_iot-recommendations
+        displayName: az security iot-recommendations
+        items: []
+      - name: iot-solution
+        uid: az_security_iot-solution
+        displayName: az security iot-solution
+        items: []
+      - name: jit-policy
+        uid: az_security_jit-policy
+        displayName: az security jit-policy
+        items: []
+      - name: location
+        uid: az_security_location
+        displayName: az security location
+        items: []
+      - name: pricing
+        uid: az_security_pricing
+        displayName: az security pricing
+        items: []
+      - name: regulatory-compliance-assessments
+        uid: az_security_regulatory-compliance-assessments
+        displayName: az security regulatory-compliance-assessments
+        items: []
+      - name: regulatory-compliance-controls
+        uid: az_security_regulatory-compliance-controls
+        displayName: az security regulatory-compliance-controls
+        items: []
+      - name: regulatory-compliance-standards
+        uid: az_security_regulatory-compliance-standards
+        displayName: az security regulatory-compliance-standards
+        items: []
+      - name: secure-score-control-definitions
+        uid: az_security_secure-score-control-definitions
+        displayName: az security secure-score-control-definitions
+        items: []
+      - name: secure-score-controls
+        uid: az_security_secure-score-controls
+        displayName: az security secure-score-controls
+        items: []
+      - name: secure-scores
+        uid: az_security_secure-scores
+        displayName: az security secure-scores
+        items: []
+      - name: setting
+        uid: az_security_setting
+        displayName: az security setting
+        items: []
+      - name: sub-assessment
+        uid: az_security_sub-assessment
+        displayName: az security sub-assessment
+        items: []
+      - name: task
+        uid: az_security_task
+        displayName: az security task
+        items: []
+      - name: topology
+        uid: az_security_topology
+        displayName: az security topology
+        items: []
+      - name: va
+        items:
+        - name: Summary
+          uid: az_security_va
+          displayName: az security va
+        - name: sql
+          items:
+          - name: Summary
+            uid: az_security_va_sql
+            displayName: az security va sql
+          - name: baseline
+            uid: az_security_va_sql_baseline
+            displayName: az security va sql baseline
+            items: []
+          - name: results
+            uid: az_security_va_sql_results
+            displayName: az security va sql results
+            items: []
+          - name: scans
+            uid: az_security_va_sql_scans
+            displayName: az security va sql scans
+            items: []
+      - name: workspace-setting
+        uid: az_security_workspace-setting
+        displayName: az security workspace-setting
+        items: []
+  - name: Azure Sentinel
     items:
-    - name: Overview
-      uid: ext_sap-hana_az
-    - name: hanainstance
-      displayName: az hanainstance
+    - name: Summary
+      uid: sp-Azure_Sentinel
+      displayName: Azure Sentinel
+    - name: sentinel
+      items:
+      - name: Summary
+        uid: az_sentinel
+        displayName: az sentinel
+      - name: action
+        uid: az_sentinel_action
+        displayName: az sentinel action
+        items: []
+      - name: alert-rule
+        uid: az_sentinel_alert-rule
+        displayName: az sentinel alert-rule
+        items: []
+      - name: alert-rule-template
+        uid: az_sentinel_alert-rule-template
+        displayName: az sentinel alert-rule-template
+        items: []
+      - name: bookmark
+        uid: az_sentinel_bookmark
+        displayName: az sentinel bookmark
+        items: []
+      - name: data-connector
+        uid: az_sentinel_data-connector
+        displayName: az sentinel data-connector
+        items: []
+      - name: incident
+        uid: az_sentinel_incident
+        displayName: az sentinel incident
+        items: []
+      - name: incident-comment
+        uid: az_sentinel_incident-comment
+        displayName: az sentinel incident-comment
+        items: []
+  - name: Azure Service Bus Messaging
+    uid: sp-Azure_Service_Bus_Messaging
+    displayName: Azure Service Bus Messaging
+    items: []
+  - name: Azure Service Fabric
+    uid: sp-Azure_Service_Fabric
+    displayName: Azure Service Fabric
+    items: []
+  - name: Azure Service Fabric Mesh
+    items:
+    - name: Summary
+      uid: sp-Azure_Service_Fabric_Mesh
+      displayName: Azure Service Fabric Mesh
+    - name: mesh
       items:
-      - name: Overview
-        uid: ext_sap-hana_az_hanainstance
-        displayName: az hanainstance
-      - name: create
-        uid: ext_sap-hana_az_hanainstance_create
-        displayName: az hanainstance create
-      - name: delete
-        uid: ext_sap-hana_az_hanainstance_delete
-        displayName: az hanainstance delete
-      - name: list
-        uid: ext_sap-hana_az_hanainstance_list
-        displayName: az hanainstance list
-      - name: restart
-        uid: ext_sap-hana_az_hanainstance_restart
-        displayName: az hanainstance restart
-      - name: show
-        uid: ext_sap-hana_az_hanainstance_show
-        displayName: az hanainstance show
-      - name: shutdown
-        uid: ext_sap-hana_az_hanainstance_shutdown
-        displayName: az hanainstance shutdown
-      - name: start
-        uid: ext_sap-hana_az_hanainstance_start
-        displayName: az hanainstance start
-      - name: update
-        uid: ext_sap-hana_az_hanainstance_update
-        displayName: az hanainstance update
-    - name: sapmonitor
-      displayName: az sapmonitor
+      - name: Summary
+        uid: az_mesh
+        displayName: az mesh
+      - name: app
+        uid: az_mesh_app
+        displayName: az mesh app
+        items: []
+      - name: code-package-log
+        uid: az_mesh_code-package-log
+        displayName: az mesh code-package-log
+        items: []
+      - name: deployment
+        uid: az_mesh_deployment
+        displayName: az mesh deployment
+        items: []
+      - name: gateway
+        uid: az_mesh_gateway
+        displayName: az mesh gateway
+        items: []
+      - name: generate
+        uid: az_mesh_generate
+        displayName: az mesh generate
+        items: []
+      - name: network
+        uid: az_mesh_network
+        displayName: az mesh network
+        items: []
+      - name: secret
+        uid: az_mesh_secret
+        displayName: az mesh secret
+        items: []
+      - name: secretvalue
+        uid: az_mesh_secretvalue
+        displayName: az mesh secretvalue
+        items: []
+      - name: service
+        uid: az_mesh_service
+        displayName: az mesh service
+        items: []
+      - name: service-replica
+        uid: az_mesh_service-replica
+        displayName: az mesh service-replica
+        items: []
+      - name: volume
+        uid: az_mesh_volume
+        displayName: az mesh volume
+        items: []
+  - name: Azure SignalR
+    uid: sp-Azure_SignalR
+    displayName: Azure SignalR
+    items: []
+  - name: Azure Spatial Anchors
+    items:
+    - name: Summary
+      uid: sp-Azure_Spatial_Anchors
+      displayName: Azure Spatial Anchors
+    - name: spatial-anchors-account
       items:
-      - name: Overview
-        uid: ext_sap-hana_az_sapmonitor
-        displayName: az sapmonitor
-      - name: create
-        uid: ext_sap-hana_az_sapmonitor_create
-        displayName: az sapmonitor create
-      - name: delete
-        uid: ext_sap-hana_az_sapmonitor_delete
-        displayName: az sapmonitor delete
-      - name: list
-        uid: ext_sap-hana_az_sapmonitor_list
-        displayName: az sapmonitor list
-      - name: show
-        uid: ext_sap-hana_az_sapmonitor_show
-        displayName: az sapmonitor show
-      - name: update
-        uid: ext_sap-hana_az_sapmonitor_update
-        displayName: az sapmonitor update
-      - name: provider-instance
-        displayName: az sapmonitor provider-instance
-        items:
-        - name: Overview
-          uid: ext_sap-hana_az_sapmonitor_provider_instance
-          displayName: az sapmonitor provider-instance
-        - name: create
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-          displayName: az sapmonitor provider-instance create
-        - name: delete
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-          displayName: az sapmonitor provider-instance delete
-        - name: list
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-          displayName: az sapmonitor provider-instance list
-        - name: show
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-          displayName: az sapmonitor provider-instance show
-  - name: spring-cloud
+      - name: Summary
+        uid: az_spatial-anchors-account
+        displayName: az spatial-anchors-account
+      - name: key
+        uid: az_spatial-anchors-account_key
+        displayName: az spatial-anchors-account key
+        items: []
+  - name: Azure Spring Cloud
     items:
-    - name: Overview
-      uid: ext_spring-cloud_az
+    - name: Summary
+      uid: sp-Azure_Spring_Cloud
+      displayName: Azure Spring Cloud
     - name: spring-cloud
-      displayName: az spring-cloud
       items:
-      - name: Overview
-        uid: ext_spring-cloud_az_spring_cloud
+      - name: Summary
+        uid: az_spring-cloud
         displayName: az spring-cloud
-      - name: create
-        uid: ext_spring-cloud_az_spring_cloud_create
-        displayName: az spring-cloud create
-      - name: delete
-        uid: ext_spring-cloud_az_spring_cloud_delete
-        displayName: az spring-cloud delete
-      - name: list
-        uid: ext_spring-cloud_az_spring_cloud_list
-        displayName: az spring-cloud list
-      - name: show
-        uid: ext_spring-cloud_az_spring_cloud_show
-        displayName: az spring-cloud show
-      - name: update
-        uid: ext_spring-cloud_az_spring_cloud_update
-        displayName: az spring-cloud update
       - name: app
-        displayName: az spring-cloud app
         items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_app
+        - name: Summary
+          uid: az_spring-cloud_app
           displayName: az spring-cloud app
-        - name: create
-          uid: ext_spring-cloud_az_spring_cloud_app_create
-          displayName: az spring-cloud app create
-        - name: delete
-          uid: ext_spring-cloud_az_spring_cloud_app_delete
-          displayName: az spring-cloud app delete
-        - name: deploy
-          uid: ext_spring-cloud_az_spring_cloud_app_deploy
-          displayName: az spring-cloud app deploy
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_app_list
-          displayName: az spring-cloud app list
-        - name: logs
-          uid: ext_spring-cloud_az_spring_cloud_app_logs
-          displayName: az spring-cloud app logs
-        - name: restart
-          uid: ext_spring-cloud_az_spring_cloud_app_restart
-          displayName: az spring-cloud app restart
-        - name: scale
-          uid: ext_spring-cloud_az_spring_cloud_app_scale
-          displayName: az spring-cloud app scale
-        - name: set-deployment
-          uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-          displayName: az spring-cloud app set-deployment
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_app_show
-          displayName: az spring-cloud app show
-        - name: show-deploy-log
-          uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-          displayName: az spring-cloud app show-deploy-log
-        - name: start
-          uid: ext_spring-cloud_az_spring_cloud_app_start
-          displayName: az spring-cloud app start
-        - name: stop
-          uid: ext_spring-cloud_az_spring_cloud_app_stop
-          displayName: az spring-cloud app stop
-        - name: update
-          uid: ext_spring-cloud_az_spring_cloud_app_update
-          displayName: az spring-cloud app update
         - name: binding
-          displayName: az spring-cloud app binding
           items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_binding
+          - name: Summary
+            uid: az_spring-cloud_app_binding
             displayName: az spring-cloud app binding
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-            displayName: az spring-cloud app binding list
-          - name: remove
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-            displayName: az spring-cloud app binding remove
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-            displayName: az spring-cloud app binding show
           - name: cosmos
+            uid: az_spring-cloud_app_binding_cosmos
             displayName: az spring-cloud app binding cosmos
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-              displayName: az spring-cloud app binding cosmos
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-              displayName: az spring-cloud app binding cosmos add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-              displayName: az spring-cloud app binding cosmos update
+            items: []
           - name: mysql
+            uid: az_spring-cloud_app_binding_mysql
             displayName: az spring-cloud app binding mysql
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-              displayName: az spring-cloud app binding mysql
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-              displayName: az spring-cloud app binding mysql add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-              displayName: az spring-cloud app binding mysql update
+            items: []
           - name: redis
+            uid: az_spring-cloud_app_binding_redis
             displayName: az spring-cloud app binding redis
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-              displayName: az spring-cloud app binding redis
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-              displayName: az spring-cloud app binding redis add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-              displayName: az spring-cloud app binding redis update
+            items: []
         - name: custom-domain
+          uid: az_spring-cloud_app_custom-domain
           displayName: az spring-cloud app custom-domain
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-            displayName: az spring-cloud app custom-domain
-          - name: bind
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-            displayName: az spring-cloud app custom-domain bind
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-            displayName: az spring-cloud app custom-domain list
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-            displayName: az spring-cloud app custom-domain show
-          - name: unbind
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-            displayName: az spring-cloud app custom-domain unbind
-          - name: update
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-            displayName: az spring-cloud app custom-domain update
+          items: []
         - name: deployment
+          uid: az_spring-cloud_app_deployment
           displayName: az spring-cloud app deployment
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment
-            displayName: az spring-cloud app deployment
-          - name: create
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-            displayName: az spring-cloud app deployment create
-          - name: delete
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-            displayName: az spring-cloud app deployment delete
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-            displayName: az spring-cloud app deployment list
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-            displayName: az spring-cloud app deployment show
+          items: []
         - name: identity
+          uid: az_spring-cloud_app_identity
           displayName: az spring-cloud app identity
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_identity
-            displayName: az spring-cloud app identity
-          - name: assign
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-            displayName: az spring-cloud app identity assign
-          - name: remove
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-            displayName: az spring-cloud app identity remove
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-            displayName: az spring-cloud app identity show
+          items: []
         - name: log
+          uid: az_spring-cloud_app_log
           displayName: az spring-cloud app log
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_log
-            displayName: az spring-cloud app log
-          - name: tail
-            uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-            displayName: az spring-cloud app log tail
+          items: []
+      - name: app-insights
+        uid: az_spring-cloud_app-insights
+        displayName: az spring-cloud app-insights
+        items: []
       - name: certificate
+        uid: az_spring-cloud_certificate
         displayName: az spring-cloud certificate
-        items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_certificate
-          displayName: az spring-cloud certificate
-        - name: add
-          uid: ext_spring-cloud_az_spring_cloud_certificate_add
-          displayName: az spring-cloud certificate add
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_certificate_list
-          displayName: az spring-cloud certificate list
-        - name: remove
-          uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-          displayName: az spring-cloud certificate remove
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_certificate_show
-          displayName: az spring-cloud certificate show
+        items: []
       - name: config-server
-        displayName: az spring-cloud config-server
         items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_config_server
+        - name: Summary
+          uid: az_spring-cloud_config-server
           displayName: az spring-cloud config-server
-        - name: clear
-          uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-          displayName: az spring-cloud config-server clear
-        - name: set
-          uid: ext_spring-cloud_az_spring_cloud_config_server_set
-          displayName: az spring-cloud config-server set
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_config_server_show
-          displayName: az spring-cloud config-server show
         - name: git
-          displayName: az spring-cloud config-server git
           items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_config_server_git
+          - name: Summary
+            uid: az_spring-cloud_config-server_git
             displayName: az spring-cloud config-server git
-          - name: set
-            uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-            displayName: az spring-cloud config-server git set
           - name: repo
+            uid: az_spring-cloud_config-server_git_repo
             displayName: az spring-cloud config-server git repo
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-              displayName: az spring-cloud config-server git repo
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-              displayName: az spring-cloud config-server git repo add
-            - name: list
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-              displayName: az spring-cloud config-server git repo list
-            - name: remove
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-              displayName: az spring-cloud config-server git repo remove
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-              displayName: az spring-cloud config-server git repo update
+            items: []
       - name: test-endpoint
+        uid: az_spring-cloud_test-endpoint
         displayName: az spring-cloud test-endpoint
-        items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-          displayName: az spring-cloud test-endpoint
-        - name: disable
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-          displayName: az spring-cloud test-endpoint disable
-        - name: enable
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-          displayName: az spring-cloud test-endpoint enable
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-          displayName: az spring-cloud test-endpoint list
-        - name: renew-key
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-          displayName: az spring-cloud test-endpoint renew-key
-  - name: storage-or-preview
+        items: []
+  - name: Azure SQL
     items:
-    - name: Overview
-      uid: ext_storage-or-preview_az
-    - name: Storage
-      displayName: az storage
-      items:
-      - name: Overview
-        uid: ext_storage-or-preview_az_storage
-        displayName: az storage
-      - name: Accounts
-        displayName: az storage account
-        items:
-        - name: Overview
-          uid: ext_storage-or-preview_az_storage_account
-          displayName: az storage account
-        - name: or-policy
-          displayName: az storage account or-policy
-          items:
-          - name: Overview
-            uid: ext_storage-or-preview_az_storage_account_or_policy
-            displayName: az storage account or-policy
-          - name: create
-            uid: ext_storage-or-preview_az_storage_account_or_policy_create
-            displayName: az storage account or-policy create
-          - name: delete
-            uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-            displayName: az storage account or-policy delete
-          - name: list
-            uid: ext_storage-or-preview_az_storage_account_or_policy_list
-            displayName: az storage account or-policy list
-          - name: show
-            uid: ext_storage-or-preview_az_storage_account_or_policy_show
-            displayName: az storage account or-policy show
-          - name: update
-            uid: ext_storage-or-preview_az_storage_account_or_policy_update
-            displayName: az storage account or-policy update
-          - name: rule
-            displayName: az storage account or-policy rule
-            items:
-            - name: Overview
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-              displayName: az storage account or-policy rule
-            - name: add
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-              displayName: az storage account or-policy rule add
-            - name: list
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-              displayName: az storage account or-policy rule list
-            - name: remove
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-              displayName: az storage account or-policy rule remove
-            - name: show
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-              displayName: az storage account or-policy rule show
-            - name: update
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-              displayName: az storage account or-policy rule update
-  - name: storage-preview
+    - name: Summary
+      uid: sp-Azure_SQL
+      displayName: Azure SQL
+    - name: sql
+      uid: az_sql
+      displayName: az sql
+      items: []
+  - name: Azure SQL Server
+    items:
+    - name: Summary
+      uid: sp-Azure_SQL_Server
+      displayName: Azure SQL Server
+    - name: sql
+      uid: az_sql
+      displayName: az sql
+      items: []
+  - name: Azure Stack Edge
+    uid: sp-Azure_Stack_Edge
+    displayName: Azure Stack Edge
+    items: []
+  - name: Azure Stack HCI
+    items:
+    - name: Summary
+      uid: sp-Azure_Stack_HCI
+      displayName: Azure Stack HCI
+    - name: stack-hci
+      items:
+      - name: Summary
+        uid: az_stack-hci
+        displayName: az stack-hci
+      - name: cluster
+        uid: az_stack-hci_cluster
+        displayName: az stack-hci cluster
+        items: []
+  - name: Azure Storage
     items:
-    - name: Overview
-      uid: ext_storage-preview_az
-    - name: Storage
-      displayName: az storage
+    - name: Summary
+      uid: sp-Azure_Storage
+      displayName: Azure Storage
+    - name: import-export
+      items:
+      - name: Summary
+        uid: az_import-export
+        displayName: az import-export
+      - name: bit-locker-key
+        uid: az_import-export_bit-locker-key
+        displayName: az import-export bit-locker-key
+        items: []
+      - name: location
+        uid: az_import-export_location
+        displayName: az import-export location
+        items: []
+    - name: storage
       items:
-      - name: Overview
-        uid: ext_storage-preview_az_storage
+      - name: Summary
+        uid: az_storage
         displayName: az storage
-      - name: Accounts
-        displayName: az storage account
+      - name: account
         items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_account
+        - name: Summary
+          uid: az_storage_account
           displayName: az storage account
-        - name: check-name
-          uid: ext_storage-preview_az_storage_account_check_name
-          displayName: az storage account check-name
-        - name: create
-          uid: ext_storage-preview_az_storage_account_create
-          displayName: az storage account create
-        - name: delete
-          uid: ext_storage-preview_az_storage_account_delete
-          displayName: az storage account delete
-        - name: failover
-          uid: ext_storage-preview_az_storage_account_failover
-          displayName: az storage account failover
-        - name: list
-          uid: ext_storage-preview_az_storage_account_list
-          displayName: az storage account list
-        - name: show
-          uid: ext_storage-preview_az_storage_account_show
-          displayName: az storage account show
-        - name: show-usage
-          uid: ext_storage-preview_az_storage_account_show_usage
-          displayName: az storage account show-usage
-        - name: update
-          uid: ext_storage-preview_az_storage_account_update
-          displayName: az storage account update
-        - name: Keys
+        - name: blob-inventory-policy
+          uid: az_storage_account_blob-inventory-policy
+          displayName: az storage account blob-inventory-policy
+          items: []
+        - name: blob-service-properties
+          uid: az_storage_account_blob-service-properties
+          displayName: az storage account blob-service-properties
+          items: []
+        - name: file-service-properties
+          uid: az_storage_account_file-service-properties
+          displayName: az storage account file-service-properties
+          items: []
+        - name: keys
+          uid: az_storage_account_keys
           displayName: az storage account keys
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_keys
-            displayName: az storage account keys
-          - name: list
-            uid: ext_storage-preview_az_storage_account_keys_list
-            displayName: az storage account keys list
-          - name: renew
-            uid: ext_storage-preview_az_storage_account_keys_renew
-            displayName: az storage account keys renew
-        - name: management-policy
-          displayName: az storage account management-policy
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_management_policy
-            displayName: az storage account management-policy
-          - name: create
-            uid: ext_storage-preview_az_storage_account_management_policy_create
-            displayName: az storage account management-policy create
-          - name: delete
-            uid: ext_storage-preview_az_storage_account_management_policy_delete
-            displayName: az storage account management-policy delete
-          - name: show
-            uid: ext_storage-preview_az_storage_account_management_policy_show
-            displayName: az storage account management-policy show
-          - name: update
-            uid: ext_storage-preview_az_storage_account_management_policy_update
-            displayName: az storage account management-policy update
+          items: []
         - name: network-rule
+          uid: az_storage_account_network-rule
           displayName: az storage account network-rule
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_network_rule
-            displayName: az storage account network-rule
-          - name: add
-            uid: ext_storage-preview_az_storage_account_network_rule_add
-            displayName: az storage account network-rule add
-          - name: list
-            uid: ext_storage-preview_az_storage_account_network_rule_list
-            displayName: az storage account network-rule list
-          - name: remove
-            uid: ext_storage-preview_az_storage_account_network_rule_remove
-            displayName: az storage account network-rule remove
-      - name: Blob
-        displayName: az storage blob
+          items: []
+      - name: azcopy
+        items:
+        - name: Summary
+          uid: az_storage_azcopy
+          displayName: az storage azcopy
+        - name: blob
+          uid: az_storage_azcopy_blob
+          displayName: az storage azcopy blob
+          items: []
+      - name: blob
         items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_blob
+        - name: Summary
+          uid: az_storage_blob
           displayName: az storage blob
-        - name: list
-          uid: ext_storage-preview_az_storage_blob_list
-          displayName: az storage blob list
-        - name: move
-          uid: ext_storage-preview_az_storage_blob_move
-          displayName: az storage blob move
-        - name: Service properties
-          displayName: az storage blob service-properties
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_service_properties
-            displayName: az storage blob service-properties
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_service_properties_show
-            displayName: az storage blob service-properties show
-          - name: update
-            uid: ext_storage-preview_az_storage_blob_service_properties_update
-            displayName: az storage blob service-properties update
         - name: access
+          uid: az_storage_blob_access
           displayName: az storage blob access
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_access
-            displayName: az storage blob access
-          - name: set
-            uid: ext_storage-preview_az_storage_blob_access_set
-            displayName: az storage blob access set
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_access_show
-            displayName: az storage blob access show
-          - name: update
-            uid: ext_storage-preview_az_storage_blob_access_update
-            displayName: az storage blob access update
+          items: []
+        - name: copy
+          uid: az_storage_blob_copy
+          displayName: az storage blob copy
+          items: []
         - name: directory
-          displayName: az storage blob directory
           items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_directory
+          - name: Summary
+            uid: az_storage_blob_directory
             displayName: az storage blob directory
-          - name: create
-            uid: ext_storage-preview_az_storage_blob_directory_create
-            displayName: az storage blob directory create
-          - name: delete
-            uid: ext_storage-preview_az_storage_blob_directory_delete
-            displayName: az storage blob directory delete
-          - name: download
-            uid: ext_storage-preview_az_storage_blob_directory_download
-            displayName: az storage blob directory download
-          - name: exists
-            uid: ext_storage-preview_az_storage_blob_directory_exists
-            displayName: az storage blob directory exists
-          - name: list
-            uid: ext_storage-preview_az_storage_blob_directory_list
-            displayName: az storage blob directory list
-          - name: move
-            uid: ext_storage-preview_az_storage_blob_directory_move
-            displayName: az storage blob directory move
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_directory_show
-            displayName: az storage blob directory show
-          - name: upload
-            uid: ext_storage-preview_az_storage_blob_directory_upload
-            displayName: az storage blob directory upload
           - name: access
+            uid: az_storage_blob_directory_access
             displayName: az storage blob directory access
-            items:
-            - name: Overview
-              uid: ext_storage-preview_az_storage_blob_directory_access
-              displayName: az storage blob directory access
-            - name: set
-              uid: ext_storage-preview_az_storage_blob_directory_access_set
-              displayName: az storage blob directory access set
-            - name: show
-              uid: ext_storage-preview_az_storage_blob_directory_access_show
-              displayName: az storage blob directory access show
-            - name: update
-              uid: ext_storage-preview_az_storage_blob_directory_access_update
-              displayName: az storage blob directory access update
+            items: []
           - name: metadata
+            uid: az_storage_blob_directory_metadata
             displayName: az storage blob directory metadata
-            items:
-            - name: Overview
-              uid: ext_storage-preview_az_storage_blob_directory_metadata
-              displayName: az storage blob directory metadata
-            - name: show
-              uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-              displayName: az storage blob directory metadata show
-            - name: update
-              uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-              displayName: az storage blob directory metadata update
-      - name: azcopy
-        displayName: az storage azcopy
+            items: []
+        - name: lease
+          uid: az_storage_blob_lease
+          displayName: az storage blob lease
+          items: []
+        - name: metadata
+          uid: az_storage_blob_metadata
+          displayName: az storage blob metadata
+          items: []
+        - name: service-properties
+          items:
+          - name: Summary
+            uid: az_storage_blob_service-properties
+            displayName: az storage blob service-properties
+          - name: delete-policy
+            uid: az_storage_blob_service-properties_delete-policy
+            displayName: az storage blob service-properties delete-policy
+            items: []
+        - name: tag
+          uid: az_storage_blob_tag
+          displayName: az storage blob tag
+          items: []
+      - name: container
+        items:
+        - name: Summary
+          uid: az_storage_container
+          displayName: az storage container
+        - name: lease
+          uid: az_storage_container_lease
+          displayName: az storage container lease
+          items: []
+        - name: metadata
+          uid: az_storage_container_metadata
+          displayName: az storage container metadata
+          items: []
+        - name: policy
+          uid: az_storage_container_policy
+          displayName: az storage container policy
+          items: []
+      - name: storage cors - Cross-origin resource sharing
+        uid: az_storage_cors
+        displayName: az storage cors
+        items: []
+      - name: directory
+        items:
+        - name: Summary
+          uid: az_storage_directory
+          displayName: az storage directory
+        - name: metadata
+          uid: az_storage_directory_metadata
+          displayName: az storage directory metadata
+          items: []
+      - name: entity
+        uid: az_storage_entity
+        displayName: az storage entity
+        items: []
+      - name: file
+        items:
+        - name: Summary
+          uid: az_storage_file
+          displayName: az storage file
+        - name: copy
+          uid: az_storage_file_copy
+          displayName: az storage file copy
+          items: []
+        - name: metadata
+          uid: az_storage_file_metadata
+          displayName: az storage file metadata
+          items: []
+      - name: fs
+        items:
+        - name: Summary
+          uid: az_storage_fs
+          displayName: az storage fs
+        - name: service-properties
+          uid: az_storage_fs_service-properties
+          displayName: az storage fs service-properties
+          items: []
+      - name: logging
+        uid: az_storage_logging
+        displayName: az storage logging
+        items: []
+      - name: message
+        uid: az_storage_message
+        displayName: az storage message
+        items: []
+      - name: metrics
+        uid: az_storage_metrics
+        displayName: az storage metrics
+        items: []
+      - name: queue
         items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_azcopy
-          displayName: az storage azcopy
-        - name: run-command
-          uid: ext_storage-preview_az_storage_azcopy_run_command
-          displayName: az storage azcopy run-command
-        - name: blob
-          displayName: az storage azcopy blob
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_azcopy_blob
-            displayName: az storage azcopy blob
-          - name: delete
-            uid: ext_storage-preview_az_storage_azcopy_blob_delete
-            displayName: az storage azcopy blob delete
-          - name: download
-            uid: ext_storage-preview_az_storage_azcopy_blob_download
-            displayName: az storage azcopy blob download
-          - name: sync
-            uid: ext_storage-preview_az_storage_azcopy_blob_sync
-            displayName: az storage azcopy blob sync
-          - name: upload
-            uid: ext_storage-preview_az_storage_azcopy_blob_upload
-            displayName: az storage azcopy blob upload
-  - name: storagesync
-    items:
-    - name: Overview
-      uid: ext_storagesync_az
-    - name: storagesync
-      displayName: az storagesync
-      items:
-      - name: Overview
-        uid: ext_storagesync_az_storagesync
-        displayName: az storagesync
-      - name: create
-        uid: ext_storagesync_az_storagesync_create
-        displayName: az storagesync create
-      - name: delete
-        uid: ext_storagesync_az_storagesync_delete
-        displayName: az storagesync delete
-      - name: list
-        uid: ext_storagesync_az_storagesync_list
-        displayName: az storagesync list
-      - name: show
-        uid: ext_storagesync_az_storagesync_show
-        displayName: az storagesync show
-      - name: registered-server
-        displayName: az storagesync registered-server
+        - name: Summary
+          uid: az_storage_queue
+          displayName: az storage queue
+        - name: metadata
+          uid: az_storage_queue_metadata
+          displayName: az storage queue metadata
+          items: []
+        - name: policy
+          uid: az_storage_queue_policy
+          displayName: az storage queue policy
+          items: []
+      - name: share
         items:
-        - name: Overview
-          uid: ext_storagesync_az_storagesync_registered_server
-          displayName: az storagesync registered-server
-        - name: delete
-          uid: ext_storagesync_az_storagesync_registered_server_delete
-          displayName: az storagesync registered-server delete
-        - name: list
-          uid: ext_storagesync_az_storagesync_registered_server_list
-          displayName: az storagesync registered-server list
-        - name: show
-          uid: ext_storagesync_az_storagesync_registered_server_show
-          displayName: az storagesync registered-server show
-        - name: wait
-          uid: ext_storagesync_az_storagesync_registered_server_wait
-          displayName: az storagesync registered-server wait
-      - name: sync-group
-        displayName: az storagesync sync-group
+        - name: Summary
+          uid: az_storage_share
+          displayName: az storage share
+        - name: metadata
+          uid: az_storage_share_metadata
+          displayName: az storage share metadata
+          items: []
+        - name: policy
+          uid: az_storage_share_policy
+          displayName: az storage share policy
+          items: []
+      - name: table
         items:
-        - name: Overview
-          uid: ext_storagesync_az_storagesync_sync_group
-          displayName: az storagesync sync-group
-        - name: create
-          uid: ext_storagesync_az_storagesync_sync_group_create
-          displayName: az storagesync sync-group create
-        - name: delete
-          uid: ext_storagesync_az_storagesync_sync_group_delete
-          displayName: az storagesync sync-group delete
-        - name: list
-          uid: ext_storagesync_az_storagesync_sync_group_list
-          displayName: az storagesync sync-group list
-        - name: show
-          uid: ext_storagesync_az_storagesync_sync_group_show
-          displayName: az storagesync sync-group show
-        - name: cloud-endpoint
-          displayName: az storagesync sync-group cloud-endpoint
-          items:
-          - name: Overview
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-            displayName: az storagesync sync-group cloud-endpoint
-          - name: create
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-            displayName: az storagesync sync-group cloud-endpoint create
-          - name: delete
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-            displayName: az storagesync sync-group cloud-endpoint delete
-          - name: list
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-            displayName: az storagesync sync-group cloud-endpoint list
-          - name: show
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-            displayName: az storagesync sync-group cloud-endpoint show
-          - name: wait
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-            displayName: az storagesync sync-group cloud-endpoint wait
-        - name: server-endpoint
-          displayName: az storagesync sync-group server-endpoint
-          items:
-          - name: Overview
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-            displayName: az storagesync sync-group server-endpoint
-          - name: create
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-            displayName: az storagesync sync-group server-endpoint create
-          - name: delete
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-            displayName: az storagesync sync-group server-endpoint delete
-          - name: list
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-            displayName: az storagesync sync-group server-endpoint list
-          - name: show
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-            displayName: az storagesync sync-group server-endpoint show
-          - name: update
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-            displayName: az storagesync sync-group server-endpoint update
-          - name: wait
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-            displayName: az storagesync sync-group server-endpoint wait
-  - name: stream-analytics
+        - name: Summary
+          uid: az_storage_table
+          displayName: az storage table
+        - name: policy
+          uid: az_storage_table_policy
+          displayName: az storage table policy
+          items: []
+  - name: Azure Stream Analytics
     items:
-    - name: Overview
-      uid: ext_stream-analytics_az
+    - name: Summary
+      uid: sp-Azure_Stream_Analytics
+      displayName: Azure Stream Analytics
     - name: stream-analytics
-      displayName: az stream-analytics
       items:
-      - name: Overview
-        uid: ext_stream-analytics_az_stream_analytics
+      - name: Summary
+        uid: az_stream-analytics
         displayName: az stream-analytics
       - name: function
+        uid: az_stream-analytics_function
         displayName: az stream-analytics function
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_function
-          displayName: az stream-analytics function
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_function_create
-          displayName: az stream-analytics function create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_function_delete
-          displayName: az stream-analytics function delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_function_list
-          displayName: az stream-analytics function list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_function_show
-          displayName: az stream-analytics function show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_function_test
-          displayName: az stream-analytics function test
+        items: []
       - name: input
+        uid: az_stream-analytics_input
         displayName: az stream-analytics input
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_input
-          displayName: az stream-analytics input
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_input_create
-          displayName: az stream-analytics input create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_input_delete
-          displayName: az stream-analytics input delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_input_list
-          displayName: az stream-analytics input list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_input_show
-          displayName: az stream-analytics input show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_input_test
-          displayName: az stream-analytics input test
+        items: []
       - name: job
+        uid: az_stream-analytics_job
         displayName: az stream-analytics job
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_job
-          displayName: az stream-analytics job
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_job_create
-          displayName: az stream-analytics job create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_job_delete
-          displayName: az stream-analytics job delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_job_list
-          displayName: az stream-analytics job list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_job_show
-          displayName: az stream-analytics job show
-        - name: start
-          uid: ext_stream-analytics_az_stream_analytics_job_start
-          displayName: az stream-analytics job start
-        - name: stop
-          uid: ext_stream-analytics_az_stream_analytics_job_stop
-          displayName: az stream-analytics job stop
-        - name: update
-          uid: ext_stream-analytics_az_stream_analytics_job_update
-          displayName: az stream-analytics job update
-        - name: wait
-          uid: ext_stream-analytics_az_stream_analytics_job_wait
-          displayName: az stream-analytics job wait
+        items: []
       - name: output
+        uid: az_stream-analytics_output
         displayName: az stream-analytics output
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_output
-          displayName: az stream-analytics output
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_output_create
-          displayName: az stream-analytics output create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_output_delete
-          displayName: az stream-analytics output delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_output_list
-          displayName: az stream-analytics output list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_output_show
-          displayName: az stream-analytics output show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_output_test
-          displayName: az stream-analytics output test
+        items: []
       - name: quota
+        uid: az_stream-analytics_quota
         displayName: az stream-analytics quota
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_quota
-          displayName: az stream-analytics quota
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_quota_show
-          displayName: az stream-analytics quota show
+        items: []
       - name: transformation
+        uid: az_stream-analytics_transformation
         displayName: az stream-analytics transformation
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_transformation
-          displayName: az stream-analytics transformation
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_transformation_create
-          displayName: az stream-analytics transformation create
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_transformation_show
-          displayName: az stream-analytics transformation show
-        - name: update
-          uid: ext_stream-analytics_az_stream_analytics_transformation_update
-          displayName: az stream-analytics transformation update
-  - name: subscription
-    items:
-    - name: Overview
-      uid: ext_subscription_az
-    - name: Subscriptions
-      displayName: az account
-      items:
-      - name: Overview
-        uid: ext_subscription_az_account
-        displayName: az account
-      - name: create
-        uid: ext_subscription_az_account_create
-        displayName: az account create
-  - name: support
+        items: []
+  - name: Azure Support
     items:
-    - name: Overview
-      uid: ext_support_az
+    - name: Summary
+      uid: sp-Azure_Support
+      displayName: Azure Support
     - name: support
-      displayName: az support
       items:
-      - name: Overview
-        uid: ext_support_az_support
+      - name: Summary
+        uid: az_support
         displayName: az support
       - name: services
-        displayName: az support services
         items:
-        - name: Overview
-          uid: ext_support_az_support_services
+        - name: Summary
+          uid: az_support_services
           displayName: az support services
-        - name: list
-          uid: ext_support_az_support_services_list
-          displayName: az support services list
-        - name: show
-          uid: ext_support_az_support_services_show
-          displayName: az support services show
         - name: problem-classifications
+          uid: az_support_services_problem-classifications
           displayName: az support services problem-classifications
-          items:
-          - name: Overview
-            uid: ext_support_az_support_services_problem_classifications
-            displayName: az support services problem-classifications
-          - name: list
-            uid: ext_support_az_support_services_problem_classifications_list
-            displayName: az support services problem-classifications list
-          - name: show
-            uid: ext_support_az_support_services_problem_classifications_show
-            displayName: az support services problem-classifications show
+          items: []
       - name: tickets
-        displayName: az support tickets
         items:
-        - name: Overview
-          uid: ext_support_az_support_tickets
+        - name: Summary
+          uid: az_support_tickets
           displayName: az support tickets
-        - name: create
-          uid: ext_support_az_support_tickets_create
-          displayName: az support tickets create
-        - name: list
-          uid: ext_support_az_support_tickets_list
-          displayName: az support tickets list
-        - name: show
-          uid: ext_support_az_support_tickets_show
-          displayName: az support tickets show
-        - name: update
-          uid: ext_support_az_support_tickets_update
-          displayName: az support tickets update
         - name: communications
+          uid: az_support_tickets_communications
           displayName: az support tickets communications
-          items:
-          - name: Overview
-            uid: ext_support_az_support_tickets_communications
-            displayName: az support tickets communications
-          - name: create
-            uid: ext_support_az_support_tickets_communications_create
-            displayName: az support tickets communications create
-          - name: list
-            uid: ext_support_az_support_tickets_communications_list
-            displayName: az support tickets communications list
-          - name: show
-            uid: ext_support_az_support_tickets_communications_show
-            displayName: az support tickets communications show
-  - name: synapse
+          items: []
+  - name: Azure Synapse Analytics
     items:
-    - name: Overview
-      uid: ext_synapse_az
+    - name: Summary
+      uid: sp-Azure_Synapse_Analytics
+      displayName: Azure Synapse Analytics
     - name: synapse
-      displayName: az synapse
       items:
-      - name: Overview
-        uid: ext_synapse_az_synapse
+      - name: Summary
+        uid: az_synapse
         displayName: az synapse
+      - name: activity-run
+        uid: az_synapse_activity-run
+        displayName: az synapse activity-run
+        items: []
+      - name: data-flow
+        uid: az_synapse_data-flow
+        displayName: az synapse data-flow
+        items: []
+      - name: dataset
+        uid: az_synapse_dataset
+        displayName: az synapse dataset
+        items: []
+      - name: integration-runtime
+        uid: az_synapse_integration-runtime
+        displayName: az synapse integration-runtime
+        items: []
+      - name: integration-runtime-node
+        uid: az_synapse_integration-runtime-node
+        displayName: az synapse integration-runtime-node
+        items: []
+      - name: linked-service
+        uid: az_synapse_linked-service
+        displayName: az synapse linked-service
+        items: []
+      - name: notebook
+        uid: az_synapse_notebook
+        displayName: az synapse notebook
+        items: []
+      - name: pipeline
+        uid: az_synapse_pipeline
+        displayName: az synapse pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_synapse_pipeline-run
+        displayName: az synapse pipeline-run
+        items: []
+      - name: role
+        items:
+        - name: Summary
+          uid: az_synapse_role
+          displayName: az synapse role
+        - name: assignment
+          uid: az_synapse_role_assignment
+          displayName: az synapse role assignment
+          items: []
+        - name: definition
+          uid: az_synapse_role_definition
+          displayName: az synapse role definition
+          items: []
+        - name: scope
+          uid: az_synapse_role_scope
+          displayName: az synapse role scope
+          items: []
       - name: spark
-        displayName: az synapse spark
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_spark
+        - name: Summary
+          uid: az_synapse_spark
           displayName: az synapse spark
         - name: job
+          uid: az_synapse_spark_job
           displayName: az synapse spark job
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_job
-            displayName: az synapse spark job
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_job_cancel
-            displayName: az synapse spark job cancel
-          - name: list
-            uid: ext_synapse_az_synapse_spark_job_list
-            displayName: az synapse spark job list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_job_show
-            displayName: az synapse spark job show
-          - name: submit
-            uid: ext_synapse_az_synapse_spark_job_submit
-            displayName: az synapse spark job submit
+          items: []
         - name: pool
+          uid: az_synapse_spark_pool
           displayName: az synapse spark pool
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_pool
-            displayName: az synapse spark pool
-          - name: create
-            uid: ext_synapse_az_synapse_spark_pool_create
-            displayName: az synapse spark pool create
-          - name: delete
-            uid: ext_synapse_az_synapse_spark_pool_delete
-            displayName: az synapse spark pool delete
-          - name: list
-            uid: ext_synapse_az_synapse_spark_pool_list
-            displayName: az synapse spark pool list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_pool_show
-            displayName: az synapse spark pool show
-          - name: update
-            uid: ext_synapse_az_synapse_spark_pool_update
-            displayName: az synapse spark pool update
-          - name: wait
-            uid: ext_synapse_az_synapse_spark_pool_wait
-            displayName: az synapse spark pool wait
+          items: []
         - name: session
+          uid: az_synapse_spark_session
           displayName: az synapse spark session
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_session
-            displayName: az synapse spark session
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_session_cancel
-            displayName: az synapse spark session cancel
-          - name: create
-            uid: ext_synapse_az_synapse_spark_session_create
-            displayName: az synapse spark session create
-          - name: list
-            uid: ext_synapse_az_synapse_spark_session_list
-            displayName: az synapse spark session list
-          - name: reset-timeout
-            uid: ext_synapse_az_synapse_spark_session_reset_timeout
-            displayName: az synapse spark session reset-timeout
-          - name: show
-            uid: ext_synapse_az_synapse_spark_session_show
-            displayName: az synapse spark session show
+          items: []
         - name: statement
+          uid: az_synapse_spark_statement
           displayName: az synapse spark statement
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_statement
-            displayName: az synapse spark statement
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_statement_cancel
-            displayName: az synapse spark statement cancel
-          - name: invoke
-            uid: ext_synapse_az_synapse_spark_statement_invoke
-            displayName: az synapse spark statement invoke
-          - name: list
-            uid: ext_synapse_az_synapse_spark_statement_list
-            displayName: az synapse spark statement list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_statement_show
-            displayName: az synapse spark statement show
+          items: []
       - name: sql
-        displayName: az synapse sql
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_sql
+        - name: Summary
+          uid: az_synapse_sql
           displayName: az synapse sql
+        - name: ad-admin
+          uid: az_synapse_sql_ad-admin
+          displayName: az synapse sql ad-admin
+          items: []
+        - name: audit-policy
+          uid: az_synapse_sql_audit-policy
+          displayName: az synapse sql audit-policy
+          items: []
         - name: pool
-          displayName: az synapse sql pool
           items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_sql_pool
+          - name: Summary
+            uid: az_synapse_sql_pool
             displayName: az synapse sql pool
-          - name: create
-            uid: ext_synapse_az_synapse_sql_pool_create
-            displayName: az synapse sql pool create
-          - name: delete
-            uid: ext_synapse_az_synapse_sql_pool_delete
-            displayName: az synapse sql pool delete
-          - name: list
-            uid: ext_synapse_az_synapse_sql_pool_list
-            displayName: az synapse sql pool list
-          - name: pause
-            uid: ext_synapse_az_synapse_sql_pool_pause
-            displayName: az synapse sql pool pause
-          - name: resume
-            uid: ext_synapse_az_synapse_sql_pool_resume
-            displayName: az synapse sql pool resume
-          - name: show
-            uid: ext_synapse_az_synapse_sql_pool_show
-            displayName: az synapse sql pool show
-          - name: update
-            uid: ext_synapse_az_synapse_sql_pool_update
-            displayName: az synapse sql pool update
-          - name: wait
-            uid: ext_synapse_az_synapse_sql_pool_wait
-            displayName: az synapse sql pool wait
+          - name: audit-policy
+            uid: az_synapse_sql_pool_audit-policy
+            displayName: az synapse sql pool audit-policy
+            items: []
+          - name: classification
+            items:
+            - name: Summary
+              uid: az_synapse_sql_pool_classification
+              displayName: az synapse sql pool classification
+            - name: recommendation
+              uid: az_synapse_sql_pool_classification_recommendation
+              displayName: az synapse sql pool classification recommendation
+              items: []
+          - name: tde
+            uid: az_synapse_sql_pool_tde
+            displayName: az synapse sql pool tde
+            items: []
+          - name: threat-policy
+            uid: az_synapse_sql_pool_threat-policy
+            displayName: az synapse sql pool threat-policy
+            items: []
+      - name: trigger
+        uid: az_synapse_trigger
+        displayName: az synapse trigger
+        items: []
+      - name: trigger-run
+        uid: az_synapse_trigger-run
+        displayName: az synapse trigger-run
+        items: []
       - name: workspace
-        displayName: az synapse workspace
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_workspace
+        - name: Summary
+          uid: az_synapse_workspace
           displayName: az synapse workspace
-        - name: check-name
-          uid: ext_synapse_az_synapse_workspace_check_name
-          displayName: az synapse workspace check-name
-        - name: create
-          uid: ext_synapse_az_synapse_workspace_create
-          displayName: az synapse workspace create
-        - name: delete
-          uid: ext_synapse_az_synapse_workspace_delete
-          displayName: az synapse workspace delete
-        - name: list
-          uid: ext_synapse_az_synapse_workspace_list
-          displayName: az synapse workspace list
-        - name: show
-          uid: ext_synapse_az_synapse_workspace_show
-          displayName: az synapse workspace show
-        - name: update
-          uid: ext_synapse_az_synapse_workspace_update
-          displayName: az synapse workspace update
-        - name: wait
-          uid: ext_synapse_az_synapse_workspace_wait
-          displayName: az synapse workspace wait
         - name: firewall-rule
+          uid: az_synapse_workspace_firewall-rule
           displayName: az synapse workspace firewall-rule
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_workspace_firewall_rule
-            displayName: az synapse workspace firewall-rule
-          - name: create
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-            displayName: az synapse workspace firewall-rule create
-          - name: delete
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-            displayName: az synapse workspace firewall-rule delete
-          - name: list
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-            displayName: az synapse workspace firewall-rule list
-          - name: show
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-            displayName: az synapse workspace firewall-rule show
-          - name: wait
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-            displayName: az synapse workspace firewall-rule wait
-  - name: timeseriesinsights
+          items: []
+        - name: key
+          uid: az_synapse_workspace_key
+          displayName: az synapse workspace key
+          items: []
+        - name: managed-identity
+          uid: az_synapse_workspace_managed-identity
+          displayName: az synapse workspace managed-identity
+          items: []
+  - name: Azure Time Series Insights
     items:
-    - name: Overview
-      uid: ext_timeseriesinsights_az
-    - name: timeseriesinsights
-      displayName: az timeseriesinsights
-      items:
-      - name: Overview
-        uid: ext_timeseriesinsights_az_timeseriesinsights
-        displayName: az timeseriesinsights
+    - name: Summary
+      uid: sp-Azure_Time_Series_Insights
+      displayName: Azure Time Series Insights
+    - name: tsi
+      items:
+      - name: Summary
+        uid: az_tsi
+        displayName: az tsi
       - name: access-policy
-        displayName: az timeseriesinsights access-policy
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-          displayName: az timeseriesinsights access-policy
-        - name: create
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-          displayName: az timeseriesinsights access-policy create
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-          displayName: az timeseriesinsights access-policy delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-          displayName: az timeseriesinsights access-policy list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-          displayName: az timeseriesinsights access-policy show
-        - name: update
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-          displayName: az timeseriesinsights access-policy update
+        uid: az_tsi_access-policy
+        displayName: az tsi access-policy
+        items: []
       - name: environment
-        displayName: az timeseriesinsights environment
         items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-          displayName: az timeseriesinsights environment
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-          displayName: az timeseriesinsights environment delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-          displayName: az timeseriesinsights environment list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-          displayName: az timeseriesinsights environment show
-        - name: longterm
-          displayName: az timeseriesinsights environment longterm
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-            displayName: az timeseriesinsights environment longterm
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-            displayName: az timeseriesinsights environment longterm create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-            displayName: az timeseriesinsights environment longterm update
-        - name: standard
-          displayName: az timeseriesinsights environment standard
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-            displayName: az timeseriesinsights environment standard
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-            displayName: az timeseriesinsights environment standard create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-            displayName: az timeseriesinsights environment standard update
+        - name: Summary
+          uid: az_tsi_environment
+          displayName: az tsi environment
+        - name: gen1
+          uid: az_tsi_environment_gen1
+          displayName: az tsi environment gen1
+          items: []
+        - name: gen2
+          uid: az_tsi_environment_gen2
+          displayName: az tsi environment gen2
+          items: []
       - name: event-source
-        displayName: az timeseriesinsights event-source
         items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-          displayName: az timeseriesinsights event-source
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-          displayName: az timeseriesinsights event-source delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-          displayName: az timeseriesinsights event-source list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-          displayName: az timeseriesinsights event-source show
+        - name: Summary
+          uid: az_tsi_event-source
+          displayName: az tsi event-source
         - name: eventhub
-          displayName: az timeseriesinsights event-source eventhub
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-            displayName: az timeseriesinsights event-source eventhub
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-            displayName: az timeseriesinsights event-source eventhub create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-            displayName: az timeseriesinsights event-source eventhub update
+          uid: az_tsi_event-source_eventhub
+          displayName: az tsi event-source eventhub
+          items: []
         - name: iothub
-          displayName: az timeseriesinsights event-source iothub
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-            displayName: az timeseriesinsights event-source iothub
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-            displayName: az timeseriesinsights event-source iothub create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-            displayName: az timeseriesinsights event-source iothub update
+          uid: az_tsi_event-source_iothub
+          displayName: az tsi event-source iothub
+          items: []
       - name: reference-data-set
-        displayName: az timeseriesinsights reference-data-set
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-          displayName: az timeseriesinsights reference-data-set
-        - name: create
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-          displayName: az timeseriesinsights reference-data-set create
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-          displayName: az timeseriesinsights reference-data-set delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-          displayName: az timeseriesinsights reference-data-set list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-          displayName: az timeseriesinsights reference-data-set show
-        - name: update
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-          displayName: az timeseriesinsights reference-data-set update
-  - name: virtual-network-tap
+        uid: az_tsi_reference-data-set
+        displayName: az tsi reference-data-set
+        items: []
+  - name: Azure Virtual Machine scale sets
     items:
-    - name: Overview
-      uid: ext_virtual-network-tap_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_virtual-network-tap_az_network
-        displayName: az network
-      - name: Network interfaces
-        displayName: az network nic
-        items:
-        - name: Overview
-          uid: ext_virtual-network-tap_az_network_nic
-          displayName: az network nic
-        - name: vtap-config
-          displayName: az network nic vtap-config
-          items:
-          - name: Overview
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config
-            displayName: az network nic vtap-config
-          - name: create
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-            displayName: az network nic vtap-config create
-          - name: delete
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-            displayName: az network nic vtap-config delete
-          - name: list
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-            displayName: az network nic vtap-config list
-          - name: show
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-            displayName: az network nic vtap-config show
-      - name: Virtual Network
-        displayName: az network vnet
+    - name: Summary
+      uid: sp-Azure_Virtual_Machine_scale_sets
+      displayName: Azure Virtual Machine scale sets
+    - name: vmss - VM Scale Sets
+      items:
+      - name: Summary
+        uid: az_vmss
+        displayName: az vmss
+      - name: diagnostics
+        uid: az_vmss_diagnostics
+        displayName: az vmss diagnostics
+        items: []
+      - name: extension
         items:
-        - name: Overview
-          uid: ext_virtual-network-tap_az_network_vnet
-          displayName: az network vnet
-        - name: tap
-          displayName: az network vnet tap
-          items:
-          - name: Overview
-            uid: ext_virtual-network-tap_az_network_vnet_tap
-            displayName: az network vnet tap
-          - name: create
-            uid: ext_virtual-network-tap_az_network_vnet_tap_create
-            displayName: az network vnet tap create
-          - name: delete
-            uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-            displayName: az network vnet tap delete
-          - name: list
-            uid: ext_virtual-network-tap_az_network_vnet_tap_list
-            displayName: az network vnet tap list
-          - name: show
-            uid: ext_virtual-network-tap_az_network_vnet_tap_show
-            displayName: az network vnet tap show
-          - name: update
-            uid: ext_virtual-network-tap_az_network_vnet_tap_update
-            displayName: az network vnet tap update
-  - name: virtual-wan
+        - name: Summary
+          uid: az_vmss_extension
+          displayName: az vmss extension
+        - name: image
+          uid: az_vmss_extension_image
+          displayName: az vmss extension image
+          items: []
+      - name: identity
+        uid: az_vmss_identity
+        displayName: az vmss identity
+        items: []
+      - name: nic
+        uid: az_vmss_nic
+        displayName: az vmss nic
+        items: []
+  - name: Azure Virtual Machines
     items:
-    - name: Overview
-      uid: ext_virtual-wan_az
-    - name: Networking
-      displayName: az network
+    - name: Summary
+      uid: sp-Azure_Virtual_Machines
+      displayName: Azure Virtual Machines
+    - name: desktopvirtualization
+      items:
+      - name: Summary
+        uid: az_desktopvirtualization
+        displayName: az desktopvirtualization
+      - name: applicationgroup
+        uid: az_desktopvirtualization_applicationgroup
+        displayName: az desktopvirtualization applicationgroup
+        items: []
+      - name: hostpool
+        uid: az_desktopvirtualization_hostpool
+        displayName: az desktopvirtualization hostpool
+        items: []
+      - name: workspace
+        uid: az_desktopvirtualization_workspace
+        displayName: az desktopvirtualization workspace
+        items: []
+    - name: image - VM Images
       items:
-      - name: Overview
-        uid: ext_virtual-wan_az_network
-        displayName: az network
-      - name: vhub
-        displayName: az network vhub
+      - name: Summary
+        uid: az_image
+        displayName: az image
+      - name: builder
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vhub
-          displayName: az network vhub
-        - name: create
-          uid: ext_virtual-wan_az_network_vhub_create
-          displayName: az network vhub create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vhub_delete
-          displayName: az network vhub delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vhub_list
-          displayName: az network vhub list
-        - name: show
-          uid: ext_virtual-wan_az_network_vhub_show
-          displayName: az network vhub show
-        - name: update
-          uid: ext_virtual-wan_az_network_vhub_update
-          displayName: az network vhub update
-        - name: connection
-          displayName: az network vhub connection
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_connection
-            displayName: az network vhub connection
-          - name: create
-            uid: ext_virtual-wan_az_network_vhub_connection_create
-            displayName: az network vhub connection create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vhub_connection_delete
-            displayName: az network vhub connection delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_connection_list
-            displayName: az network vhub connection list
-          - name: show
-            uid: ext_virtual-wan_az_network_vhub_connection_show
-            displayName: az network vhub connection show
-        - name: route
-          displayName: az network vhub route
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_route
-            displayName: az network vhub route
-          - name: add
-            uid: ext_virtual-wan_az_network_vhub_route_add
-            displayName: az network vhub route add
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_route_list
-            displayName: az network vhub route list
-          - name: remove
-            uid: ext_virtual-wan_az_network_vhub_route_remove
-            displayName: az network vhub route remove
-        - name: route-table
-          displayName: az network vhub route-table
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_route_table
-            displayName: az network vhub route-table
-          - name: create
-            uid: ext_virtual-wan_az_network_vhub_route_table_create
-            displayName: az network vhub route-table create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vhub_route_table_delete
-            displayName: az network vhub route-table delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_route_table_list
-            displayName: az network vhub route-table list
-          - name: show
-            uid: ext_virtual-wan_az_network_vhub_route_table_show
-            displayName: az network vhub route-table show
-          - name: update
-            uid: ext_virtual-wan_az_network_vhub_route_table_update
-            displayName: az network vhub route-table update
-          - name: route
-            displayName: az network vhub route-table route
-            items:
-            - name: Overview
-              uid: ext_virtual-wan_az_network_vhub_route_table_route
-              displayName: az network vhub route-table route
-            - name: add
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-              displayName: az network vhub route-table route add
-            - name: list
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-              displayName: az network vhub route-table route list
-            - name: remove
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-              displayName: az network vhub route-table route remove
-      - name: vpn-gateway
-        displayName: az network vpn-gateway
+        - name: Summary
+          uid: az_image_builder
+          displayName: az image builder
+        - name: customizer
+          uid: az_image_builder_customizer
+          displayName: az image builder customizer
+          items: []
+        - name: output
+          uid: az_image_builder_output
+          displayName: az image builder output
+          items: []
+    - name: maintenance
+      items:
+      - name: Summary
+        uid: az_maintenance
+        displayName: az maintenance
+      - name: applyupdate
+        uid: az_maintenance_applyupdate
+        displayName: az maintenance applyupdate
+        items: []
+      - name: applyupdate-for-resource-group
+        uid: az_maintenance_applyupdate-for-resource-group
+        displayName: az maintenance applyupdate-for-resource-group
+        items: []
+      - name: assignment
+        uid: az_maintenance_assignment
+        displayName: az maintenance assignment
+        items: []
+      - name: configuration
+        uid: az_maintenance_configuration
+        displayName: az maintenance configuration
+        items: []
+      - name: configuration-for-resource-group
+        uid: az_maintenance_configuration-for-resource-group
+        displayName: az maintenance configuration-for-resource-group
+        items: []
+      - name: public-configuration
+        uid: az_maintenance_public-configuration
+        displayName: az maintenance public-configuration
+        items: []
+      - name: update
+        uid: az_maintenance_update
+        displayName: az maintenance update
+        items: []
+    - name: ssh
+      uid: az_ssh
+      displayName: az ssh
+      items: []
+    - name: sshkey
+      uid: az_sshkey
+      displayName: az sshkey
+      items: []
+    - name: vm
+      items:
+      - name: Summary
+        uid: az_vm
+        displayName: az vm
+      - name: aem
+        uid: az_vm_aem
+        displayName: az vm aem
+        items: []
+      - name: availability-set
+        uid: az_vm_availability-set
+        displayName: az vm availability-set
+        items: []
+      - name: boot-diagnostics
+        uid: az_vm_boot-diagnostics
+        displayName: az vm boot-diagnostics
+        items: []
+      - name: diagnostics
+        uid: az_vm_diagnostics
+        displayName: az vm diagnostics
+        items: []
+      - name: encryption
+        uid: az_vm_encryption
+        displayName: az vm encryption
+        items: []
+      - name: extension
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vpn_gateway
-          displayName: az network vpn-gateway
-        - name: create
-          uid: ext_virtual-wan_az_network_vpn_gateway_create
-          displayName: az network vpn-gateway create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vpn_gateway_delete
-          displayName: az network vpn-gateway delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vpn_gateway_list
-          displayName: az network vpn-gateway list
-        - name: show
-          uid: ext_virtual-wan_az_network_vpn_gateway_show
-          displayName: az network vpn-gateway show
-        - name: update
-          uid: ext_virtual-wan_az_network_vpn_gateway_update
-          displayName: az network vpn-gateway update
-        - name: connection
-          displayName: az network vpn-gateway connection
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection
-            displayName: az network vpn-gateway connection
-          - name: create
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-            displayName: az network vpn-gateway connection create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-            displayName: az network vpn-gateway connection delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-            displayName: az network vpn-gateway connection list
-          - name: show
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-            displayName: az network vpn-gateway connection show
-          - name: ipsec-policy
-            displayName: az network vpn-gateway connection ipsec-policy
-            items:
-            - name: Overview
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-              displayName: az network vpn-gateway connection ipsec-policy
-            - name: add
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-              displayName: az network vpn-gateway connection ipsec-policy add
-            - name: list
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-              displayName: az network vpn-gateway connection ipsec-policy list
-            - name: remove
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-              displayName: az network vpn-gateway connection ipsec-policy remove
-      - name: vpn-site
-        displayName: az network vpn-site
+        - name: Summary
+          uid: az_vm_extension
+          displayName: az vm extension
+        - name: image
+          uid: az_vm_extension_image
+          displayName: az vm extension image
+          items: []
+      - name: identity
+        uid: az_vm_identity
+        displayName: az vm identity
+        items: []
+      - name: image
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vpn_site
-          displayName: az network vpn-site
-        - name: create
-          uid: ext_virtual-wan_az_network_vpn_site_create
-          displayName: az network vpn-site create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vpn_site_delete
-          displayName: az network vpn-site delete
-        - name: download
-          uid: ext_virtual-wan_az_network_vpn_site_download
-          displayName: az network vpn-site download
-        - name: list
-          uid: ext_virtual-wan_az_network_vpn_site_list
-          displayName: az network vpn-site list
-        - name: show
-          uid: ext_virtual-wan_az_network_vpn_site_show
-          displayName: az network vpn-site show
-        - name: update
-          uid: ext_virtual-wan_az_network_vpn_site_update
-          displayName: az network vpn-site update
-      - name: vwan
-        displayName: az network vwan
+        - name: Summary
+          uid: az_vm_image
+          displayName: az vm image
+        - name: terms
+          uid: az_vm_image_terms
+          displayName: az vm image terms
+          items: []
+      - name: monitor
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vwan
-          displayName: az network vwan
-        - name: create
-          uid: ext_virtual-wan_az_network_vwan_create
-          displayName: az network vwan create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vwan_delete
-          displayName: az network vwan delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vwan_list
-          displayName: az network vwan list
-        - name: show
-          uid: ext_virtual-wan_az_network_vwan_show
-          displayName: az network vwan show
-        - name: update
-          uid: ext_virtual-wan_az_network_vwan_update
-          displayName: az network vwan update
-  - name: vm-repair
-    items:
-    - name: Overview
-      uid: ext_vm-repair_az
-    - name: Virtual Machines
-      displayName: az vm
-      items:
-      - name: Overview
-        uid: ext_vm-repair_az_vm
-        displayName: az vm
+        - name: Summary
+          uid: az_vm_monitor
+          displayName: az vm monitor
+        - name: log
+          uid: az_vm_monitor_log
+          displayName: az vm monitor log
+          items: []
+      - name: nic
+        uid: az_vm_nic
+        displayName: az vm nic
+        items: []
       - name: repair
+        uid: az_vm_repair
         displayName: az vm repair
-        items:
-        - name: Overview
-          uid: ext_vm-repair_az_vm_repair
-          displayName: az vm repair
-        - name: create
-          uid: ext_vm-repair_az_vm_repair_create
-          displayName: az vm repair create
-        - name: list-scripts
-          uid: ext_vm-repair_az_vm_repair_list_scripts
-          displayName: az vm repair list-scripts
-        - name: restore
-          uid: ext_vm-repair_az_vm_repair_restore
-          displayName: az vm repair restore
-        - name: run
-          uid: ext_vm-repair_az_vm_repair_run
-          displayName: az vm repair run
-  - name: vmware
+        items: []
+      - name: secret
+        uid: az_vm_secret
+        displayName: az vm secret
+        items: []
+      - name: unmanaged-disk
+        uid: az_vm_unmanaged-disk
+        displayName: az vm unmanaged-disk
+        items: []
+      - name: user
+        uid: az_vm_user
+        displayName: az vm user
+        items: []
+  - name: Azure VMWare Solution
     items:
-    - name: Overview
-      uid: ext_vmware_az
+    - name: Summary
+      uid: sp-Azure_VMWare_Solution
+      displayName: Azure VMWare Solution
+    - name: csvmware
+      items:
+      - name: Summary
+        uid: az_csvmware
+        displayName: az csvmware
+      - name: private-cloud
+        uid: az_csvmware_private-cloud
+        displayName: az csvmware private-cloud
+        items: []
+      - name: resource-pool
+        uid: az_csvmware_resource-pool
+        displayName: az csvmware resource-pool
+        items: []
+      - name: virtual-network
+        uid: az_csvmware_virtual-network
+        displayName: az csvmware virtual-network
+        items: []
+      - name: vm
+        items:
+        - name: Summary
+          uid: az_csvmware_vm
+          displayName: az csvmware vm
+        - name: disk
+          uid: az_csvmware_vm_disk
+          displayName: az csvmware vm disk
+          items: []
+        - name: nic
+          uid: az_csvmware_vm_nic
+          displayName: az csvmware vm nic
+          items: []
+      - name: vm-template
+        uid: az_csvmware_vm-template
+        displayName: az csvmware vm-template
+        items: []
     - name: vmware
-      displayName: az vmware
       items:
-      - name: Overview
-        uid: ext_vmware_az_vmware
+      - name: Summary
+        uid: az_vmware
         displayName: az vmware
-      - name: checkquotaavailability
-        uid: ext_vmware_az_vmware_checkquotaavailability
-        displayName: az vmware checkquotaavailability
+      - name: authorization
+        uid: az_vmware_authorization
+        displayName: az vmware authorization
+        items: []
       - name: cluster
+        uid: az_vmware_cluster
         displayName: az vmware cluster
-        items:
-        - name: Overview
-          uid: ext_vmware_az_vmware_cluster
-          displayName: az vmware cluster
-        - name: create
-          uid: ext_vmware_az_vmware_cluster_create
-          displayName: az vmware cluster create
-        - name: delete
-          uid: ext_vmware_az_vmware_cluster_delete
-          displayName: az vmware cluster delete
-        - name: list
-          uid: ext_vmware_az_vmware_cluster_list
-          displayName: az vmware cluster list
-        - name: show
-          uid: ext_vmware_az_vmware_cluster_show
-          displayName: az vmware cluster show
-        - name: update
-          uid: ext_vmware_az_vmware_cluster_update
-          displayName: az vmware cluster update
+        items: []
+      - name: datastore
+        uid: az_vmware_datastore
+        displayName: az vmware datastore
+        items: []
+      - name: hcx-enterprise-site
+        uid: az_vmware_hcx-enterprise-site
+        displayName: az vmware hcx-enterprise-site
+        items: []
+      - name: location
+        uid: az_vmware_location
+        displayName: az vmware location
+        items: []
       - name: private-cloud
+        uid: az_vmware_private-cloud
         displayName: az vmware private-cloud
-        items:
-        - name: Overview
-          uid: ext_vmware_az_vmware_private_cloud
-          displayName: az vmware private-cloud
-        - name: addauthorization
-          uid: ext_vmware_az_vmware_private_cloud_addauthorization
-          displayName: az vmware private-cloud addauthorization
-        - name: addidentitysource
-          uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-          displayName: az vmware private-cloud addidentitysource
-        - name: create
-          uid: ext_vmware_az_vmware_private_cloud_create
-          displayName: az vmware private-cloud create
-        - name: delete
-          uid: ext_vmware_az_vmware_private_cloud_delete
-          displayName: az vmware private-cloud delete
-        - name: deleteauthorization
-          uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-          displayName: az vmware private-cloud deleteauthorization
-        - name: deleteidentitysource
-          uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-          displayName: az vmware private-cloud deleteidentitysource
-        - name: list
-          uid: ext_vmware_az_vmware_private_cloud_list
-          displayName: az vmware private-cloud list
-        - name: listadmincredentials
-          uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-          displayName: az vmware private-cloud listadmincredentials
-        - name: show
-          uid: ext_vmware_az_vmware_private_cloud_show
-          displayName: az vmware private-cloud show
-        - name: update
-          uid: ext_vmware_az_vmware_private_cloud_update
-          displayName: az vmware private-cloud update
-  - name: webapp
+        items: []
+  - name: Azure Web Apps
     items:
-    - name: Overview
-      uid: ext_webapp_az
-    - name: Web Apps
-      displayName: az webapp
+    - name: Summary
+      uid: sp-Azure_Web_Apps
+      displayName: Azure Web Apps
+    - name: webapp
       items:
-      - name: Overview
-        uid: ext_webapp_az_webapp
+      - name: Summary
+        uid: az_webapp
         displayName: az webapp
       - name: container
+        uid: az_webapp_container
         displayName: az webapp container
-        items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_container
-          displayName: az webapp container
-        - name: up
-          uid: ext_webapp_az_webapp_container_up
-          displayName: az webapp container up
+        items: []
       - name: remote-connection
+        uid: az_webapp_remote-connection
         displayName: az webapp remote-connection
-        items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_remote_connection
-          displayName: az webapp remote-connection
-        - name: create
-          uid: ext_webapp_az_webapp_remote_connection_create
-          displayName: az webapp remote-connection create
+        items: []
       - name: scan
+        uid: az_webapp_scan
         displayName: az webapp scan
+        items: []
+  - name: Azure Web PubSub
+    items:
+    - name: Summary
+      uid: sp-Azure_Web_PubSub
+      displayName: Azure Web PubSub
+    - name: webpubsub
+      items:
+      - name: Summary
+        uid: az_webpubsub
+        displayName: az webpubsub
+      - name: client
+        uid: az_webpubsub_client
+        displayName: az webpubsub client
+        items: []
+      - name: event-handler
+        items:
+        - name: Summary
+          uid: az_webpubsub_event-handler
+          displayName: az webpubsub event-handler
+        - name: hub
+          uid: az_webpubsub_event-handler_hub
+          displayName: az webpubsub event-handler hub
+          items: []
+      - name: key
+        uid: az_webpubsub_key
+        displayName: az webpubsub key
+        items: []
+      - name: network-rule
+        uid: az_webpubsub_network-rule
+        displayName: az webpubsub network-rule
+        items: []
+      - name: service
         items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_scan
-          displayName: az webapp scan
-        - name: list-result
-          uid: ext_webapp_az_webapp_scan_list_result
-          displayName: az webapp scan list-result
-        - name: show-result
-          uid: ext_webapp_az_webapp_scan_show_result
-          displayName: az webapp scan show-result
-        - name: start
-          uid: ext_webapp_az_webapp_scan_start
-          displayName: az webapp scan start
-        - name: stop
-          uid: ext_webapp_az_webapp_scan_stop
-          displayName: az webapp scan stop
-        - name: track
-          uid: ext_webapp_az_webapp_scan_track
-          displayName: az webapp scan track
+        - name: Summary
+          uid: az_webpubsub_service
+          displayName: az webpubsub service
+        - name: connection
+          uid: az_webpubsub_service_connection
+          displayName: az webpubsub service connection
+          items: []
+        - name: group
+          uid: az_webpubsub_service_group
+          displayName: az webpubsub service group
+          items: []
+        - name: permission
+          uid: az_webpubsub_service_permission
+          displayName: az webpubsub service permission
+          items: []
+        - name: user
+          uid: az_webpubsub_service_user
+          displayName: az webpubsub service user
+          items: []
+  - name: Bicep
+    items:
+    - name: Summary
+      uid: sp-Bicep
+      displayName: Bicep
+    - name: bicep
+      uid: az_bicep
+      displayName: az bicep
+      items: []
+  - name: Content Delivery Network
+    uid: sp-Content_Delivery_Network
+    displayName: Content Delivery Network
+    items: []
+  - name: Microsoft AI
+    items:
+    - name: Summary
+      uid: sp-Microsoft_AI
+      displayName: Microsoft AI
+    - name: ai-examples
+      uid: az_ai-examples
+      displayName: az ai-examples
+      items: []
+  - name: Microsoft Partner Network
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Partner_Network
+      displayName: Microsoft Partner Network
+    - name: managementpartner
+      uid: az_managementpartner
+      displayName: az managementpartner
+      items: []
+  - name: Microsoft Partner Services
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Partner_Services
+      displayName: Microsoft Partner Services
+    - name: confluent
+      items:
+      - name: Summary
+        uid: az_confluent
+        displayName: az confluent
+      - name: organization
+        uid: az_confluent_organization
+        displayName: az confluent organization
+        items: []
+      - name: terms
+        uid: az_confluent_terms
+        displayName: az confluent terms
+        items: []
+    - name: datadog
+      items:
+      - name: Summary
+        uid: az_datadog
+        displayName: az datadog
+      - name: monitor
+        uid: az_datadog_monitor
+        displayName: az datadog monitor
+        items: []
+      - name: sso-config
+        uid: az_datadog_sso-config
+        displayName: az datadog sso-config
+        items: []
+      - name: tag-rule
+        uid: az_datadog_tag-rule
+        displayName: az datadog tag-rule
+        items: []
+      - name: terms
+        uid: az_datadog_terms
+        displayName: az datadog terms
+        items: []
+  - name: Microsoft Windows
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Windows
+      displayName: Microsoft Windows
+    - name: baremetalinstance
+      uid: az_baremetalinstance
+      displayName: az baremetalinstance
+      items: []
+  - name: Power BI
+    items:
+    - name: Summary
+      uid: sp-Power_BI
+      displayName: Power BI
+    - name: powerbi
+      items:
+      - name: Summary
+        uid: az_powerbi
+        displayName: az powerbi
+      - name: embedded-capacity
+        uid: az_powerbi_embedded-capacity
+        displayName: az powerbi embedded-capacity
+        items: []
+  - name: SAP HANA on Azure
+    items:
+    - name: Summary
+      uid: sp-SAP_HANA_on_Azure
+      displayName: SAP HANA on Azure
+    - name: hanainstance
+      uid: az_hanainstance
+      displayName: az hanainstance
+      items: []
+    - name: sapmonitor
+      items:
+      - name: Summary
+        uid: az_sapmonitor
+        displayName: az sapmonitor
+      - name: provider-instance
+        uid: az_sapmonitor_provider-instance
+        displayName: az sapmonitor provider-instance
+        items: []
+  - name: Visual Studio
+    items:
+    - name: Summary
+      uid: sp-Visual_Studio
+      displayName: Visual Studio
+    - name: codespace
+      items:
+      - name: Summary
+        uid: az_codespace
+        displayName: az codespace
+      - name: location
+        uid: az_codespace_location
+        displayName: az codespace location
+        items: []
+      - name: plan
+        uid: az_codespace_plan
+        displayName: az codespace plan
+        items: []
+      - name: secret
+        uid: az_codespace_secret
+        displayName: az codespace secret
+        items: []
diff --git a/2017-03-09-profile/docs-ref-autogen/account.yml b/2017-03-09-profile/docs-ref-autogen/account.yml
index 31b3df8f08..bbc0d30658 100644
--- a/2017-03-09-profile/docs-ref-autogen/account.yml
+++ b/2017-03-09-profile/docs-ref-autogen/account.yml
@@ -1,51 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_clear
-  - az_account_get_access_token
-  - az_account_list
-  - az_account_list_locations
-  - az_account_set
-  - az_account_show
+### YamlMime:AzureCLIGroup
+uid: az_account
+name: az account
+summary: Manage Azure subscription information.
+description: ''
+directCommands:
 - uid: az_account_clear
   name: az account clear
   summary: Clear all subscriptions from the CLI's local cache.
   description: To clear the current subscription, use 'az logout'.
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_get_access_token
+  syntax: az account clear
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_create
+  name: az account create
+  summary: Create a subscription.
+  description: ''
+  syntax: >-
+    az account create --enrollment-account-name
+                      --offer-type {MS-AZR-0017P, MS-AZR-0148P}
+                      [--display-name]
+                      [--owner-object-id]
+                      [--owner-spn]
+                      [--owner-upn]
+  requiredParameters:
+  - isRequired: true
+    name: --enrollment-account-name --enrollment-account-object-id
+    summary: The name of the enrollment account which should be used to create a subscription.
+    description: ''
+  - isRequired: true
+    name: --offer-type
+    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
+    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.
+    description: ''
+  optionalParameters:
+  - name: --display-name
+    summary: The display name of the subscription.
+    description: ''
+  - name: --owner-object-id
+    summary: The object id(s) of the owner(s) which should be granted access to the new subscription.
+    description: ''
+  - name: --owner-spn
+    summary: The service principal name(s) of the owner(s) which should be granted access to the new subscription.
+    description: ''
+  - name: --owner-upn
+    summary: The user principal name(s) of owner(s) who should be granted access to the new subscription.
+    description: ''
+- uid: az_account_get-access-token
   name: az account get-access-token
   summary: Get a token for utilities to access Azure.
   description: The token will be valid for at least 5 minutes with the maximum at 60 minutes. If the subscription argument isn't specified, the current account is used.
-  langs:
-  - azurecli
+  syntax: >-
+    az account get-access-token [--resource]
+                                [--resource-type {aad-graph, arm, batch, data-lake, media, ms-graph, oss-rdbms}]
+                                [--subscription]
+                                [--tenant]
   examples:
   - summary: Get an access token for the current account
-    syntax:
-      content: az account get-access-token
+    syntax: az account get-access-token
   - summary: Get an access token for a specific subscription
-    syntax:
-      content: az account get-access-token --subscription 00000000-0000-0000-0000-000000000000
+    syntax: az account get-access-token --subscription 00000000-0000-0000-0000-000000000000
   - summary: Get an access token for a specific tenant
-    syntax:
-      content: az account get-access-token --tenant 00000000-0000-0000-0000-000000000000
+    syntax: az account get-access-token --tenant 00000000-0000-0000-0000-000000000000
   - summary: Get an access token to use with MS Graph API
-    syntax:
-      content: az account get-access-token --resource-type ms-graph
-  parameters:
+    syntax: az account get-access-token --resource-type ms-graph
+  optionalParameters:
   - name: --resource
     summary: Azure resource endpoints. Default to Azure Resource Manager.
     description: ''
@@ -59,144 +76,104 @@ items:
   - name: --tenant -t
     summary: Tenant ID for which the token is acquired. Only available for user and service principal account, not for MSI or Cloud Shell account.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_list
   name: az account list
   summary: Get a list of subscriptions for the logged in account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az account list [--all]
+                    [--query-examples]
+                    [--refresh]
+  optionalParameters:
   - name: --all
     summary: List all subscriptions, rather than just 'Enabled' ones.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --refresh
     summary: Retrieve up-to-date subscriptions from server.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_list_locations
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_list-locations
   name: az account list-locations
   summary: List supported regions for the current subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  syntax: az account list-locations
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_set
   name: az account set
   summary: Set a subscription to be the current active subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az account set --subscription
+  requiredParameters:
   - isRequired: true
     name: --subscription -s
     summary: Name or ID of subscription.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_show
   name: az account show
   summary: Get the details of a subscription.
-  description: If the subscription isn't specified, shows the details of the default subscription.
-  langs:
-  - azurecli
-  parameters:
+  description: >-
+    If the subscription isn't specified, shows the details of the default subscription.
+
+
+    When --sdk-auth is used, the output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az account show [--query-examples]
+                    [--sdk-auth]
+                    [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sdk-auth
     summary: Output result to a file compatible with Azure SDK auth. Only applicable when authenticating with a Service Principal.
     description: ''
   - name: --subscription -s
     summary: Name or ID of subscription.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_clear
-  name: az account clear
-  summary: Clear all subscriptions from the CLI's local cache.
-- uid: az_account_get_access_token
-  name: az account get-access-token
-  summary: Get a token for utilities to access Azure.
-- uid: az_account_list
-  name: az account list
-  summary: Get a list of subscriptions for the logged in account.
-- uid: az_account_list_locations
-  name: az account list-locations
-  summary: List supported regions for the current subscription.
-- uid: az_account_lock
-  name: az account lock
-  summary: Manage Azure subscription level locks.
-- uid: az_account_lock_create
-  name: az account lock create
-  summary: Create a subscription lock.
-- uid: az_account_lock_delete
-  name: az account lock delete
-  summary: Delete a subscription lock.
-- uid: az_account_lock_list
-  name: az account lock list
-  summary: List lock information in the subscription.
-- uid: az_account_lock_show
-  name: az account lock show
-  summary: Show the details of a subscription lock.
-- uid: az_account_lock_update
-  name: az account lock update
-  summary: Update a subscription lock.
-- uid: az_account_management_group
-  name: az account management-group
-  summary: Manage Azure Management Groups.
-- uid: az_account_management_group_create
-  name: az account management-group create
-  summary: Create a new management group.
-- uid: az_account_management_group_delete
-  name: az account management-group delete
-  summary: Delete an existing management group.
-- uid: az_account_management_group_list
-  name: az account management-group list
-  summary: List all management groups.
-- uid: az_account_management_group_show
-  name: az account management-group show
-  summary: Get a specific management group.
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
-- uid: az_account_management_group_update
-  name: az account management-group update
-  summary: Update an existing management group.
-- uid: az_account_set
-  name: az account set
-  summary: Set a subscription to be the current active subscription.
-- uid: az_account_show
-  name: az account show
-  summary: Get the details of a subscription.
+- az_account_alias
+- az_account_alias_create
+- az_account_alias_delete
+- az_account_alias_list
+- az_account_alias_show
+- az_account_alias_wait
+- az_account_clear
+- az_account_create
+- az_account_get-access-token
+- az_account_list
+- az_account_list-locations
+- az_account_lock
+- az_account_lock_create
+- az_account_lock_delete
+- az_account_lock_list
+- az_account_lock_show
+- az_account_lock_update
+- az_account_management-group
+- az_account_management-group_create
+- az_account_management-group_delete
+- az_account_management-group_list
+- az_account_management-group_show
+- az_account_management-group_subscription
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
+- az_account_management-group_update
+- az_account_set
+- az_account_show
+- az_account_subscription
+- az_account_subscription_cancel
+- az_account_subscription_enable
+- az_account_subscription_list
+- az_account_subscription_list-location
+- az_account_subscription_rename
+- az_account_subscription_show
+- az_account_tenant
+- az_account_tenant_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -212,10 +189,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure subscription information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure subscription information.
diff --git a/2017-03-09-profile/docs-ref-autogen/account/alias.yml b/2017-03-09-profile/docs-ref-autogen/account/alias.yml
new file mode 100644
index 0000000000..3b1e1fe6d7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/account/alias.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_alias
+name: az account alias
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account alias** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage subscription alias.
+description: ''
+directCommands:
+- uid: az_account_alias_create
+  name: az account alias create
+  summary: Create Alias Subscription.
+  description: ''
+  syntax: >-
+    az account alias create --name
+                            [--billing-scope]
+                            [--display-name]
+                            [--no-wait]
+                            [--reseller-id]
+                            [--subscription-id]
+                            [--workload {DevTest, Production}]
+  examples:
+  - summary: CreateAlias
+    syntax: az account alias create --name "aliasForNewSub" --billing-scope "/providers/Microsoft.Billing/billingAccounts/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:024cabf4-7321-4cf9-be59-df0c77ca51de_2019-05-31/billingProfiles/PE2Q-NOIT-BG7-TGB/invoiceSections/MTT4-OBS7-PJA-TGB" --display-name "Contoso MCA subscription" --workload "Production"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+  optionalParameters:
+  - name: --billing-scope
+    summary: Billing scope. It determines whether the subscription is Field-Led, Partner-Led or LegacyEA.
+    description: ''
+  - name: --display-name
+    summary: The friendly name of the subscription.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --reseller-id
+    summary: Reseller ID, basically MPN Id.
+    description: ''
+  - name: --subscription-id
+    summary: This parameter can be used to create alias for existing subscription ID.
+    description: ''
+  - name: --workload
+    parameterValueGroup: DevTest, Production
+    summary: The workload type of the subscription. It can be either Production or DevTest.
+    description: ''
+- uid: az_account_alias_delete
+  name: az account alias delete
+  summary: Delete Alias.
+  description: ''
+  syntax: az account alias delete --name
+  examples:
+  - summary: DeleteAlias
+    syntax: az account alias delete --name "aliasForNewSub"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+- uid: az_account_alias_list
+  name: az account alias list
+  summary: List Alias Subscriptions.
+  description: ''
+  syntax: az account alias list
+  examples:
+  - summary: List Alias Subscriptions
+    syntax: az account alias list
+- uid: az_account_alias_show
+  name: az account alias show
+  summary: Get Alias Subscription.
+  description: ''
+  syntax: az account alias show --name
+  examples:
+  - summary: GetAlias
+    syntax: az account alias show --name "aliasForNewSub"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+- uid: az_account_alias_wait
+  name: az account alias wait
+  summary: Place the CLI in a waiting state until a condition of the account alias is met.
+  description: ''
+  syntax: >-
+    az account alias wait --name
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the account alias is successfully created.
+    syntax: az account alias wait --name "aliasForNewSub" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_account_alias_create
+- az_account_alias_delete
+- az_account_alias_list
+- az_account_alias_show
+- az_account_alias_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage subscription alias.
diff --git a/2017-03-09-profile/docs-ref-autogen/account/lock.yml b/2017-03-09-profile/docs-ref-autogen/account/lock.yml
index 7df0034c5d..eedcad460e 100644
--- a/2017-03-09-profile/docs-ref-autogen/account/lock.yml
+++ b/2017-03-09-profile/docs-ref-autogen/account/lock.yml
@@ -1,28 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_lock
-  name: az account lock
-  summary: Manage Azure subscription level locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_lock_create
-  - az_account_lock_delete
-  - az_account_lock_list
-  - az_account_lock_show
-  - az_account_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_account_lock
+name: az account lock
+summary: Manage Azure subscription level locks.
+description: ''
+directCommands:
 - uid: az_account_lock_create
   name: az account lock create
   summary: Create a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock create --lock-type {CanNotDelete, ReadOnly}
+                           --name
+                           [--notes]
   examples:
   - summary: Create a read-only subscription level lock.
-    syntax:
-      content: az account lock create --lock-type ReadOnly -n lockName
-  parameters:
+    syntax: az account lock create --lock-type ReadOnly -n lockName
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -32,92 +25,82 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes about this lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_delete
   name: az account lock delete
   summary: Delete a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock delete [--ids]
+                           [--name]
   examples:
   - summary: Delete a subscription lock
-    syntax:
-      content: az account lock delete --name lockName
-  parameters:
+    syntax: az account lock delete --name lockName
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_list
   name: az account lock list
   summary: List lock information in the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock list [--filter-string]
+                         [--query-examples]
   examples:
   - summary: List out all locks on the subscription level
-    syntax:
-      content: az account lock list
-  parameters:
+    syntax: az account lock list
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_show
   name: az account lock show
   summary: Show the details of a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock show [--ids]
+                         [--name]
+                         [--query-examples]
   examples:
   - summary: Show a subscription level lock
-    syntax:
-      content: az account lock show -n lockname
-  parameters:
+    syntax: az account lock show -n lockname
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_update
   name: az account lock update
   summary: Update a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock update [--ids]
+                           [--lock-type {CanNotDelete, ReadOnly}]
+                           [--name]
+                           [--notes]
   examples:
   - summary: Update a subscription lock with new notes and type
-    syntax:
-      content: az account lock update --name lockName --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az account lock update --name lockName --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -131,28 +114,13 @@ items:
   - name: --notes
     summary: Notes about this lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_lock_create
-  name: az account lock create
-  summary: Create a subscription lock.
-- uid: az_account_lock_delete
-  name: az account lock delete
-  summary: Delete a subscription lock.
-- uid: az_account_lock_list
-  name: az account lock list
-  summary: List lock information in the subscription.
-- uid: az_account_lock_show
-  name: az account lock show
-  summary: Show the details of a subscription lock.
-- uid: az_account_lock_update
-  name: az account lock update
-  summary: Update a subscription lock.
+- az_account_lock_create
+- az_account_lock_delete
+- az_account_lock_list
+- az_account_lock_show
+- az_account_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -168,10 +136,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure subscription level locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure subscription level locks.
diff --git a/2017-03-09-profile/docs-ref-autogen/account/management-group.yml b/2017-03-09-profile/docs-ref-autogen/account/management-group.yml
index 6639f53f26..6c12c4fca8 100644
--- a/2017-03-09-profile/docs-ref-autogen/account/management-group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/account/management-group.yml
@@ -1,194 +1,151 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_management_group
-  name: az account management-group
-  summary: Manage Azure Management Groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_management_group_create
-  - az_account_management_group_delete
-  - az_account_management_group_list
-  - az_account_management_group_show
-  - az_account_management_group_update
-- uid: az_account_management_group_create
+### YamlMime:AzureCLIGroup
+uid: az_account_management-group
+name: az account management-group
+summary: Manage Azure Management Groups.
+description: ''
+directCommands:
+- uid: az_account_management-group_create
   name: az account management-group create
   summary: Create a new management group.
   description: Create a new management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group create --name
+                                       [--display-name]
+                                       [--parent]
   examples:
   - summary: Create a new management group.
-    syntax:
-      content: az account management-group create --name GroupName
+    syntax: az account management-group create --name GroupName
   - summary: Create a new management group with a specific display name.
-    syntax:
-      content: az account management-group create --name GroupName --display-name DisplayName
+    syntax: az account management-group create --name GroupName --display-name DisplayName
   - summary: Create a new management group with a specific parent.
-    syntax:
-      content: az account management-group create --name GroupName --parent ParentId/ParentName
+    syntax: az account management-group create --name GroupName --parent ParentId/ParentName
   - summary: Create a new management group with a specific display name and parent.
-    syntax:
-      content: az account management-group create --name GroupName --display-name DisplayName --parent ParentId/ParentName
-  parameters:
+    syntax: az account management-group create --name GroupName --display-name DisplayName --parent ParentId/ParentName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
+  optionalParameters:
   - name: --display-name -d
     summary: Sets the display name of the management group. If null, the group name is set as the display name.
     description: ''
   - name: --parent -p
     summary: Sets the parent of the management group. Can be the fully qualified id or the name of the management group. If null, the root tenant group is set as the parent.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_delete
   name: az account management-group delete
   summary: Delete an existing management group.
   description: Delete an existing management group.
-  langs:
-  - azurecli
+  syntax: az account management-group delete --name
   examples:
   - summary: Delete an existing management group
-    syntax:
-      content: az account management-group delete --name GroupName
-  parameters:
+    syntax: az account management-group delete --name GroupName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_list
   name: az account management-group list
   summary: List all management groups.
   description: List of all management groups in the current tenant.
-  langs:
-  - azurecli
+  syntax: az account management-group list [--query-examples]
   examples:
   - summary: List all management groups
-    syntax:
-      content: az account management-group list
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_show
+    syntax: az account management-group list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_show
   name: az account management-group show
   summary: Get a specific management group.
   description: Get the details of the management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group show --name
+                                     [--expand]
+                                     [--query-examples]
+                                     [--recurse]
   examples:
   - summary: Get a management group.
-    syntax:
-      content: az account management-group show --name GroupName
+    syntax: az account management-group show --name GroupName
   - summary: Get a management group with children in the first level of hierarchy.
-    syntax:
-      content: az account management-group show --name GroupName -e
+    syntax: az account management-group show --name GroupName -e
   - summary: Get a management group with children in all levels of hierarchy.
-    syntax:
-      content: az account management-group show --name GroupName -e -r
-  parameters:
+    syntax: az account management-group show --name GroupName -e -r
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the management group.
+    summary: Name of the management group (the last segment of the resource ID). Do not use display name.
     description: ''
+  optionalParameters:
   - name: --expand -e
     summary: If given, lists the children in the first level of hierarchy.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --recurse -r
     summary: If given, lists the children in all levels of hierarchy.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_update
   name: az account management-group update
   summary: Update an existing management group.
   description: Update an existing management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group update --name
+                                       [--add]
+                                       [--display-name]
+                                       [--force-string]
+                                       [--parent]
+                                       [--remove]
+                                       [--set]
   examples:
   - summary: Update an existing management group with a specific display name.
-    syntax:
-      content: az account management-group update --name GroupName --display-name DisplayName
+    syntax: az account management-group update --name GroupName --display-name DisplayName
   - summary: Update an existing management group with a specific parent.
-    syntax:
-      content: az account management-group update --name GroupName --parent ParentId/ParentName
+    syntax: az account management-group update --name GroupName --parent ParentId/ParentName
   - summary: Update an existing management group with a specific display name and parent.
-    syntax:
-      content: az account management-group update --name GroupName --display-name DisplayName --parent ParentId/ParentName
-  parameters:
+    syntax: az account management-group update --name GroupName --display-name DisplayName --parent ParentId/ParentName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
-  - name: --display-name -d
-    summary: Updates the display name of the management group. If null, no change is made.
-    description: ''
-  - name: --parent -p
-    summary: Update the parent of the management group. Can be the fully qualified id or the name of the management group. If null, no change is made.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --display-name -d
+    summary: Updates the display name of the management group. If null, no change is made.
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --parent -p
+    summary: Update the parent of the management group. Can be the fully qualified id or the name of the management group. If null, no change is made.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_management_group_create
-  name: az account management-group create
-  summary: Create a new management group.
-- uid: az_account_management_group_delete
-  name: az account management-group delete
-  summary: Delete an existing management group.
-- uid: az_account_management_group_list
-  name: az account management-group list
-  summary: List all management groups.
-- uid: az_account_management_group_show
-  name: az account management-group show
-  summary: Get a specific management group.
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
-- uid: az_account_management_group_update
-  name: az account management-group update
-  summary: Update an existing management group.
+- az_account_management-group_create
+- az_account_management-group_delete
+- az_account_management-group_list
+- az_account_management-group_show
+- az_account_management-group_subscription
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
+- az_account_management-group_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -204,10 +161,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure Management Groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure Management Groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/account/management-group/subscription.yml b/2017-03-09-profile/docs-ref-autogen/account/management-group/subscription.yml
index dba31b3417..9dd07e642c 100644
--- a/2017-03-09-profile/docs-ref-autogen/account/management-group/subscription.yml
+++ b/2017-03-09-profile/docs-ref-autogen/account/management-group/subscription.yml
@@ -1,25 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_management_group_subscription_add
-  - az_account_management_group_subscription_remove
-- uid: az_account_management_group_subscription_add
+### YamlMime:AzureCLIGroup
+uid: az_account_management-group_subscription
+name: az account management-group subscription
+summary: Subscription operations for Management Groups.
+description: ''
+directCommands:
+- uid: az_account_management-group_subscription_add
   name: az account management-group subscription add
   summary: Add a subscription to a management group.
   description: Add a subscription to a management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group subscription add --name
+                                                 --subscription
   examples:
   - summary: Add a subscription to a management group.
-    syntax:
-      content: az account management-group subscription add --name GroupName --subscription Subscription
-  parameters:
+    syntax: az account management-group subscription add --name GroupName --subscription Subscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
@@ -28,23 +23,18 @@ items:
     name: --subscription -s
     summary: Subscription Id or Name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_subscription_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_subscription_remove
   name: az account management-group subscription remove
   summary: Remove an existing subscription from a management group.
   description: Remove an existing subscription from a management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group subscription remove --name
+                                                    --subscription
   examples:
   - summary: Remove an existing subscription from a management group.
-    syntax:
-      content: az account management-group subscription remove --name GroupName --subscription Subscription
-  parameters:
+    syntax: az account management-group subscription remove --name GroupName --subscription Subscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
@@ -53,19 +43,10 @@ items:
     name: --subscription -s
     summary: Subscription Id or Name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -81,10 +62,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Subscription operations for Management Groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Subscription operations for Management Groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/account/subscription.yml b/2017-03-09-profile/docs-ref-autogen/account/subscription.yml
new file mode 100644
index 0000000000..e70ff8195a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/account/subscription.yml
@@ -0,0 +1,119 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_subscription
+name: az account subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage subscriptions.
+description: ''
+directCommands:
+- uid: az_account_subscription_cancel
+  name: az account subscription cancel
+  summary: Cancel subscription.
+  description: ''
+  syntax: >-
+    az account subscription cancel --id
+                                   [--yes]
+  examples:
+  - summary: Cancel subscription
+    syntax: az account subscription cancel --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_account_subscription_enable
+  name: az account subscription enable
+  summary: Enable subscription.
+  description: ''
+  syntax: az account subscription enable --id
+  examples:
+  - summary: Enable subscription
+    syntax: az account subscription enable --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+- uid: az_account_subscription_list
+  name: az account subscription list
+  summary: Get all subscriptions for a tenant.
+  description: ''
+  syntax: az account subscription list
+  examples:
+  - summary: listSubscriptions
+    syntax: az account subscription list
+- uid: az_account_subscription_list-location
+  name: az account subscription list-location
+  summary: This operation provides all the locations that are available for resource providers; however, each resource provider may support a subset of this list.
+  description: ''
+  syntax: az account subscription list-location --id
+  examples:
+  - summary: listLocations
+    syntax: az account subscription list-location --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: The ID of the target subscription.
+    description: ''
+- uid: az_account_subscription_rename
+  name: az account subscription rename
+  summary: Rename subscription.
+  description: ''
+  syntax: >-
+    az account subscription rename --id
+                                   [--name]
+  examples:
+  - summary: Rename subscription
+    syntax: az account subscription rename --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+  optionalParameters:
+  - name: --name --subscription-name -n
+    summary: New subscription name.
+    description: ''
+- uid: az_account_subscription_show
+  name: az account subscription show
+  summary: Get details about a specified subscription.
+  description: ''
+  syntax: az account subscription show --id
+  examples:
+  - summary: getSubscription
+    syntax: az account subscription show --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: The ID of the target subscription.
+    description: ''
+commands:
+- az_account_subscription_cancel
+- az_account_subscription_enable
+- az_account_subscription_list
+- az_account_subscription_list-location
+- az_account_subscription_rename
+- az_account_subscription_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/account/tenant.yml b/2017-03-09-profile/docs-ref-autogen/account/tenant.yml
new file mode 100644
index 0000000000..92816bcd8c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/account/tenant.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_tenant
+name: az account tenant
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account tenant** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tenant.
+description: ''
+directCommands:
+- uid: az_account_tenant_list
+  name: az account tenant list
+  summary: Get the tenants for your account.
+  description: ''
+  syntax: az account tenant list
+  examples:
+  - summary: listTenants
+    syntax: az account tenant list
+commands:
+- az_account_tenant_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tenant.
diff --git a/2017-03-09-profile/docs-ref-autogen/acr.yml b/2017-03-09-profile/docs-ref-autogen/acr.yml
new file mode 100644
index 0000000000..5ecc4212a7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/acr.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr
+name: az acr
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private registries with Azure Container Registries.
+description: ''
+commands:
+- az_acr_export-pipeline
+- az_acr_export-pipeline_create
+- az_acr_export-pipeline_delete
+- az_acr_export-pipeline_list
+- az_acr_export-pipeline_show
+- az_acr_import-pipeline
+- az_acr_import-pipeline_create
+- az_acr_import-pipeline_delete
+- az_acr_import-pipeline_list
+- az_acr_import-pipeline_show
+- az_acr_pipeline-run
+- az_acr_pipeline-run_create
+- az_acr_pipeline-run_delete
+- az_acr_pipeline-run_list
+- az_acr_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private registries with Azure Container Registries.
diff --git a/2017-03-09-profile/docs-ref-autogen/acr/export-pipeline.yml b/2017-03-09-profile/docs-ref-autogen/acr/export-pipeline.yml
new file mode 100644
index 0000000000..a1a4be6601
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/acr/export-pipeline.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_export-pipeline
+name: az acr export-pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr export-pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR export pipelines.
+description: ''
+directCommands:
+- uid: az_acr_export-pipeline_create
+  name: az acr export-pipeline create
+  summary: Create an export pipeline.
+  description: ''
+  syntax: >-
+    az acr export-pipeline create --name
+                                  --registry
+                                  --resource-group
+                                  --secret-uri
+                                  --storage-container-uri
+                                  [--assign-identity]
+                                  [--options]
+  examples:
+  - summary: Create an export pipeline.
+    syntax: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
+  - summary: Create an export pipeline with a user assigned identity and all available options.
+    syntax: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options OverwriteBlobs ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-uri -s
+    summary: Keyvault secret URI containing a valid SAS token to the associated storage account of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  - isRequired: true
+    name: --storage-container-uri -c
+    summary: Storage account container URI of the source or target storage account container of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity -i
+    summary: User assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.
+    description: ''
+  - name: --options -z
+    summary: 'Space-separated list of options. May only container the following options: OverwriteBlobs,ContinueOnErrors.'
+    description: ''
+- uid: az_acr_export-pipeline_delete
+  name: az acr export-pipeline delete
+  summary: Delete an export pipeline.
+  description: ''
+  syntax: >-
+    az acr export-pipeline delete --name
+                                  --registry
+                                  --resource-group
+  examples:
+  - summary: Delete an export pipeline.
+    syntax: az acr export-pipeline delete --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_export-pipeline_list
+  name: az acr export-pipeline list
+  summary: List export pipelines on a Container Registry.
+  description: ''
+  syntax: >-
+    az acr export-pipeline list --registry
+                                --resource-group
+  examples:
+  - summary: List export pipelines on a container registry
+    syntax: az acr export-pipeline list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_export-pipeline_show
+  name: az acr export-pipeline show
+  summary: Show an export pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr export-pipeline show --name
+                                --registry
+                                --resource-group
+  examples:
+  - summary: Show a specific export pipeline in detail.
+    syntax: az acr export-pipeline show --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_export-pipeline_create
+- az_acr_export-pipeline_delete
+- az_acr_export-pipeline_list
+- az_acr_export-pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR export pipelines.
diff --git a/2017-03-09-profile/docs-ref-autogen/acr/import-pipeline.yml b/2017-03-09-profile/docs-ref-autogen/acr/import-pipeline.yml
new file mode 100644
index 0000000000..d67f5b3523
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/acr/import-pipeline.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_import-pipeline
+name: az acr import-pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr import-pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR import pipelines.
+description: ''
+directCommands:
+- uid: az_acr_import-pipeline_create
+  name: az acr import-pipeline create
+  summary: Create an import pipeline.
+  description: ''
+  syntax: >-
+    az acr import-pipeline create --name
+                                  --registry
+                                  --resource-group
+                                  --secret-uri
+                                  --storage-container-uri
+                                  [--assign-identity]
+                                  [--options]
+                                  [--source-trigger-enabled {false, true}]
+  examples:
+  - summary: Create an import pipeline.
+    syntax: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
+  - summary: Create an import pipeline with a user assigned identity, all available options, and source trigger disabled.
+    syntax: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options DeleteSourceBlobOnSuccess OverwriteTags ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity --source-trigger-enabled False
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-uri -s
+    summary: Keyvault secret URI containing a valid SAS token to the associated storage account of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  - isRequired: true
+    name: --storage-container-uri -c
+    summary: Storage account container URI of the source or target storage account container of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity -i
+    summary: User assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.
+    description: ''
+  - name: --options -z
+    summary: 'Space-separated list of options. May only contain the following options: DeleteSourceBlobOnSuccess,OverwriteTags,ContinueOnErrors,DisableSourceTrigger.'
+    description: ''
+  - name: --source-trigger-enabled -e
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: Boolean parameter that determines whether source trigger is enabled on the pipeline. Must be either True or False. True by default.
+    description: ''
+- uid: az_acr_import-pipeline_delete
+  name: az acr import-pipeline delete
+  summary: Delete an import pipeline.
+  description: ''
+  syntax: >-
+    az acr import-pipeline delete --name
+                                  --registry
+                                  --resource-group
+  examples:
+  - summary: Delete an import pipeline.
+    syntax: az acr import-pipeline delete --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_import-pipeline_list
+  name: az acr import-pipeline list
+  summary: List import pipelines on a Container Registry.
+  description: ''
+  syntax: >-
+    az acr import-pipeline list --registry
+                                --resource-group
+  examples:
+  - summary: List import pipelines on a container registry
+    syntax: az acr import-pipeline list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_import-pipeline_show
+  name: az acr import-pipeline show
+  summary: Show an import pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr import-pipeline show --name
+                                --registry
+                                --resource-group
+  examples:
+  - summary: Show a specific import pipeline in detail.
+    syntax: az acr import-pipeline show --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_import-pipeline_create
+- az_acr_import-pipeline_delete
+- az_acr_import-pipeline_list
+- az_acr_import-pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR import pipelines.
diff --git a/2017-03-09-profile/docs-ref-autogen/acr/pipeline-run.yml b/2017-03-09-profile/docs-ref-autogen/acr/pipeline-run.yml
new file mode 100644
index 0000000000..3e3b2410c4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/acr/pipeline-run.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_pipeline-run
+name: az acr pipeline-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr pipeline-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR import and export pipeline runs.
+description: ''
+directCommands:
+- uid: az_acr_pipeline-run_create
+  name: az acr pipeline-run create
+  summary: Create a pipeline run.
+  description: ''
+  syntax: >-
+    az acr pipeline-run create --name
+                               --pipeline
+                               --pipeline-type
+                               --registry
+                               --resource-group
+                               --storage-blob
+                               [--artifacts]
+                               [--force-redeploy]
+  examples:
+  - summary: Create an import pipeline run.
+    syntax: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type import --storage-blob $MyBlob
+  - summary: Create an export pipeline run and force redeploy.
+    syntax: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type export --storage-blob $MyBlob --artifacts hello-world:latest hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042 --force-redeploy
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --pipeline -p
+    summary: Name of the pipeline to run.
+    description: ''
+  - isRequired: true
+    name: --pipeline-type -t
+    summary: Type of pipeline. Must be either import or export.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-blob -b
+    summary: Name of the storage blob to be imported or exported.
+    description: ''
+  optionalParameters:
+  - name: --artifacts -a
+    summary: Space-separated list of container artifacts. Artifacts must be either of the form `repository:tag` or `repository@digest` such as hello-world:latest or hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042.
+    description: ''
+  - name: --force-redeploy -f
+    summary: Flag that forces ARM to redeploy resource even if no parameters have changed.
+    description: ''
+- uid: az_acr_pipeline-run_delete
+  name: az acr pipeline-run delete
+  summary: Delete an export pipeline.
+  description: ''
+  syntax: >-
+    az acr pipeline-run delete --name
+                               --registry
+                               --resource-group
+  examples:
+  - summary: Delete an export pipeline.
+    syntax: az acr pipeline-run delete --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_pipeline-run_list
+  name: az acr pipeline-run list
+  summary: List pipelineruns of all pipelines on a container registry.
+  description: ''
+  syntax: >-
+    az acr pipeline-run list --registry
+                             --resource-group
+  examples:
+  - summary: List all export pipelines on a container registry
+    syntax: az acr pipeline-run list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_pipeline-run_show
+  name: az acr pipeline-run show
+  summary: Show an export pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr pipeline-run show --name
+                             --registry
+                             --resource-group
+  examples:
+  - summary: Show a specific export pipeline in detail.
+    syntax: az acr pipeline-run show --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_pipeline-run_create
+- az_acr_pipeline-run_delete
+- az_acr_pipeline-run_list
+- az_acr_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR import and export pipeline runs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad.yml b/2017-03-09-profile/docs-ref-autogen/ad.yml
index f843119468..4e8e0c6308 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad.yml
@@ -1,190 +1,75 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad
-  name: az ad
-  summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_ad
+name: az ad
+summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
+description: ''
 commands:
-- uid: az_ad_app
-  name: az ad app
-  summary: Manage applications with AAD Graph.
-- uid: az_ad_app_create
-  name: az ad app create
-  summary: Create a web application, web API or native application.
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
-- uid: az_ad_app_delete
-  name: az ad app delete
-  summary: Delete an application.
-- uid: az_ad_app_list
-  name: az ad app list
-  summary: List applications.
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
-- uid: az_ad_app_show
-  name: az ad app show
-  summary: Get the details of an application.
-- uid: az_ad_app_update
-  name: az ad app update
-  summary: Update an application.
-- uid: az_ad_group
-  name: az ad group
-  summary: Manage Azure Active Directory groups.
-- uid: az_ad_group_create
-  name: az ad group create
-  summary: Create a group in the directory.
-- uid: az_ad_group_delete
-  name: az ad group delete
-  summary: Delete a group from the directory.
-- uid: az_ad_group_get_member_groups
-  name: az ad group get-member-groups
-  summary: Gets a collection of object IDs of groups of which the specified group is a member.
-- uid: az_ad_group_list
-  name: az ad group list
-  summary: List groups in the directory.
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
-- uid: az_ad_group_show
-  name: az ad group show
-  summary: Gets group information from the directory.
-- uid: az_ad_signed_in_user
-  name: az ad signed-in-user
-  summary: Show graph information about current signed-in user in CLI.
-- uid: az_ad_signed_in_user_list_owned_objects
-  name: az ad signed-in-user list-owned-objects
-  summary: Get the list of directory objects that are owned by the user.
-- uid: az_ad_signed_in_user_show
-  name: az ad signed-in-user show
-  summary: Gets the details for the currently logged-in user.
-- uid: az_ad_sp
-  name: az ad sp
-  summary: Manage Azure Active Directory service principals for automation authentication.
-- uid: az_ad_sp_create
-  name: az ad sp create
-  summary: Create a service principal.
-- uid: az_ad_sp_create_for_rbac
-  name: az ad sp create-for-rbac
-  summary: Create a service principal and configure its access to Azure resources.
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
-- uid: az_ad_sp_delete
-  name: az ad sp delete
-  summary: Delete a service principal and its role assignments.
-- uid: az_ad_sp_list
-  name: az ad sp list
-  summary: List service principals.
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
-- uid: az_ad_sp_show
-  name: az ad sp show
-  summary: Get the details of a service principal.
-- uid: az_ad_sp_update
-  name: az ad sp update
-  summary: Update a service principal.
-- uid: az_ad_user
-  name: az ad user
-  summary: Manage Azure Active Directory users and user authentication.
-- uid: az_ad_user_create
-  name: az ad user create
-  summary: Create an Azure Active Directory user.
-- uid: az_ad_user_delete
-  name: az ad user delete
-  summary: Delete a user.
-- uid: az_ad_user_get_member_groups
-  name: az ad user get-member-groups
-  summary: Get groups of which the user is a member.
-- uid: az_ad_user_list
-  name: az ad user list
-  summary: List Azure Active Directory users.
-- uid: az_ad_user_show
-  name: az ad user show
-  summary: Gets user information from the directory.
-- uid: az_ad_user_update
-  name: az ad user update
-  summary: Update Azure Active Directory users.
+- az_ad_app
+- az_ad_app_create
+- az_ad_app_credential
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
+- az_ad_app_delete
+- az_ad_app_list
+- az_ad_app_owner
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
+- az_ad_app_permission
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
+- az_ad_app_show
+- az_ad_app_update
+- az_ad_ds
+- az_ad_ds_create
+- az_ad_ds_delete
+- az_ad_ds_list
+- az_ad_ds_show
+- az_ad_ds_update
+- az_ad_ds_wait
+- az_ad_group
+- az_ad_group_create
+- az_ad_group_delete
+- az_ad_group_get-member-groups
+- az_ad_group_list
+- az_ad_group_member
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
+- az_ad_group_owner
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
+- az_ad_group_show
+- az_ad_signed-in-user
+- az_ad_signed-in-user_list-owned-objects
+- az_ad_signed-in-user_show
+- az_ad_sp
+- az_ad_sp_create
+- az_ad_sp_create-for-rbac
+- az_ad_sp_credential
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
+- az_ad_sp_delete
+- az_ad_sp_list
+- az_ad_sp_owner
+- az_ad_sp_owner_list
+- az_ad_sp_show
+- az_ad_sp_update
+- az_ad_user
+- az_ad_user_create
+- az_ad_user_delete
+- az_ad_user_get-member-groups
+- az_ad_user_list
+- az_ad_user_show
+- az_ad_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +85,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/app.yml b/2017-03-09-profile/docs-ref-autogen/ad/app.yml
index 5ed3dbe609..e704c73e5f 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/app.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/app.yml
@@ -1,84 +1,90 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app
-  name: az ad app
-  summary: Manage applications with AAD Graph.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_create
-  - az_ad_app_delete
-  - az_ad_app_list
-  - az_ad_app_show
-  - az_ad_app_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_app
+name: az ad app
+summary: Manage applications with AAD Graph.
+description: ''
+directCommands:
 - uid: az_ad_app_create
   name: az ad app create
   summary: Create a web application, web API or native application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app create --display-name
+                     [--app-roles]
+                     [--available-to-other-tenants {false, true}]
+                     [--credential-description]
+                     [--end-date]
+                     [--homepage]
+                     [--identifier-uris]
+                     [--key-type {AsymmetricX509Cert, Password, Symmetric}]
+                     [--key-usage {Sign, Verify}]
+                     [--key-value]
+                     [--native-app {false, true}]
+                     [--oauth2-allow-implicit-flow {false, true}]
+                     [--optional-claims]
+                     [--password]
+                     [--reply-urls]
+                     [--required-resource-accesses]
+                     [--start-date]
   examples:
   - summary: Create a native application with delegated permission of "access the AAD directory as the signed-in user"
-    syntax:
-      content: >-
-        az ad app create --display-name my-native --native-app --required-resource-accesses @manifest.json
+    syntax: >-
+      az ad app create --display-name my-native --native-app --required-resource-accesses @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "resourceAppId": "00000002-0000-0000-c000-000000000000",
-            "resourceAccess": [
-                {
-                    "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
-                    "type": "Scope"
-                }
-           ]
-        }]
+      [{
+          "resourceAppId": "00000002-0000-0000-c000-000000000000",
+          "resourceAccess": [
+              {
+                  "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
+                  "type": "Scope"
+              }
+         ]
+      }]
   - summary: Create an application with a role
-    syntax:
-      content: >-
-        az ad app create --id e042ec79-34cd-498f-9d9f-123456781234 --display-name mytestapp --identifier-uris https://mytestapp.websites.net --app-roles @manifest.json
+    syntax: >-
+      az ad app create --display-name mytestapp --identifier-uris https://mytestapp.websites.net --app-roles @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "allowedMemberTypes": [
-              "User"
-            ],
-            "description": "Approvers can mark documents as approved",
-            "displayName": "Approver",
-            "isEnabled": "true",
-            "value": "approver"
-        }]
+      [{
+          "allowedMemberTypes": [
+            "User"
+          ],
+          "description": "Approvers can mark documents as approved",
+          "displayName": "Approver",
+          "isEnabled": "true",
+          "value": "approver"
+      }]
   - summary: Create an application with optional claims
-    syntax:
-      content: >-
-        az ad app create --display-name mytestapp --optional-claims @manifest.json
+    syntax: >-
+      az ad app create --display-name mytestapp --optional-claims @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        {
-            "idToken": [
-                {
-                    "name": "auth_time",
-                    "source": null,
-                    "essential": false
-                }
-            ],
-            "accessToken": [
-                {
-                    "name": "email",
-                    "source": null,
-                    "essential": false
-                }
-            ]
-        }
-  parameters:
+      {
+          "idToken": [
+              {
+                  "name": "auth_time",
+                  "source": null,
+                  "essential": false
+              }
+          ],
+          "accessToken": [
+              {
+                  "name": "email",
+                  "source": null,
+                  "essential": false
+              }
+          ]
+      }
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: The display name of the application.
     description: ''
+  optionalParameters:
   - name: --app-roles
     summary: Declare the roles you want to associate with your application. Should be in manifest json format. See examples below for details.
     description: ''
@@ -120,7 +126,7 @@ items:
     summary: Whether to allow implicit grant flow for OAuth2.
     description: ''
   - name: --optional-claims
-    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference <a href="https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type">https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type</a> for optional claim properties.
+    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type for optional claim properties.
     description: ''
   - name: --password
     summary: App password, aka 'client secret'.
@@ -134,40 +140,34 @@ items:
   - name: --start-date
     summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_delete
   name: az ad app delete
   summary: Delete an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad app delete --id
   examples:
   - summary: Delete an application. (autogenerated)
-    syntax:
-      content: az ad app delete --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app delete --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_list
   name: az ad app list
   summary: List applications.
   description: For low latency, by default, only the first 100 will be returned unless you provide filter arguments or use "--all".
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad app list [--all]
+                   [--app-id]
+                   [--display-name]
+                   [--filter]
+                   [--identifier-uri]
+                   [--query-examples]
+                   [--show-mine]
+  optionalParameters:
   - name: --all
     summary: List all entities, expect long delay if under a big organization.
     description: ''
@@ -183,106 +183,123 @@ items:
   - name: --identifier-uri
     summary: Graph application identifier, must be in uri format.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --show-mine
     summary: List entities owned by the current user.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_show
   name: az ad app show
   summary: Get the details of an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app show --id
+                   [--query-examples]
   examples:
   - summary: Get the details of an application. (autogenerated)
-    syntax:
-      content: az ad app show --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app show --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_update
   name: az ad app update
   summary: Update an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app update --id
+                     [--add]
+                     [--app-roles]
+                     [--available-to-other-tenants {false, true}]
+                     [--credential-description]
+                     [--display-name]
+                     [--end-date]
+                     [--force-string]
+                     [--homepage]
+                     [--identifier-uris]
+                     [--key-type {AsymmetricX509Cert, Password, Symmetric}]
+                     [--key-usage {Sign, Verify}]
+                     [--key-value]
+                     [--oauth2-allow-implicit-flow {false, true}]
+                     [--optional-claims]
+                     [--password]
+                     [--remove]
+                     [--reply-urls]
+                     [--required-resource-accesses]
+                     [--set]
+                     [--start-date]
   examples:
   - summary: update a native application with delegated permission of "access the AAD directory as the signed-in user"
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --required-resource-accesses @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --required-resource-accesses @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "resourceAppId": "00000002-0000-0000-c000-000000000000",
-            "resourceAccess": [
-                {
-                    "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
-                    "type": "Scope"
-                }
-           ]
-        }]
+      [{
+          "resourceAppId": "00000002-0000-0000-c000-000000000000",
+          "resourceAccess": [
+              {
+                  "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
+                  "type": "Scope"
+              }
+         ]
+      }]
   - summary: declare an application role
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --app-roles @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --app-roles @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "allowedMemberTypes": [
-              "User"
-            ],
-            "description": "Approvers can mark documents as approved",
-            "displayName": "Approver",
-            "isEnabled": "true",
-            "value": "approver"
-        }]
+      [{
+          "allowedMemberTypes": [
+            "User"
+          ],
+          "description": "Approvers can mark documents as approved",
+          "displayName": "Approver",
+          "isEnabled": "true",
+          "value": "approver"
+      }]
   - summary: update optional claims
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --optional-claims @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --optional-claims @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        {
-            "idToken": [
-                {
-                    "name": "auth_time",
-                    "source": null,
-                    "essential": false
-                }
-            ],
-            "accessToken": [
-                {
-                    "name": "email",
-                    "source": null,
-                    "essential": false
-                }
-            ]
-        }
+      {
+          "idToken": [
+              {
+                  "name": "auth_time",
+                  "source": null,
+                  "essential": false
+              }
+          ],
+          "accessToken": [
+              {
+                  "name": "email",
+                  "source": null,
+                  "essential": false
+              }
+          ]
+      }
   - summary: update an application's group membership claims to "All"
-    syntax:
-      content: az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --set groupMembershipClaims=All
-  parameters:
+    syntax: az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --set groupMembershipClaims=All
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --app-roles
     summary: Declare the roles you want to associate with your application. Should be in manifest json format. See examples below for details.
     description: ''
@@ -299,6 +316,9 @@ items:
   - name: --end-date
     summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --homepage
     summary: The url where users can sign in and use your app.
     description: ''
@@ -323,99 +343,48 @@ items:
     summary: Whether to allow implicit grant flow for OAuth2.
     description: ''
   - name: --optional-claims
-    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference <a href="https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type">https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type</a> for optional claim properties.
+    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type for optional claim properties.
     description: ''
   - name: --password
     summary: App password, aka 'client secret'.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --reply-urls
     summary: Space-separated URIs to which Azure AD will redirect in response to an OAuth 2.0 request. The value does not need to be a physical endpoint, but must be a valid URI.
     description: ''
   - name: --required-resource-accesses
     summary: Resource scopes and roles the application requires access to. Should be in manifest json format. See examples below for details.
     description: ''
-  - name: --start-date
-    summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --start-date
+    summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_create
-  name: az ad app create
-  summary: Create a web application, web API or native application.
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
-- uid: az_ad_app_delete
-  name: az ad app delete
-  summary: Delete an application.
-- uid: az_ad_app_list
-  name: az ad app list
-  summary: List applications.
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
-- uid: az_ad_app_show
-  name: az ad app show
-  summary: Get the details of an application.
-- uid: az_ad_app_update
-  name: az ad app update
-  summary: Update an application.
+- az_ad_app_create
+- az_ad_app_credential
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
+- az_ad_app_delete
+- az_ad_app_list
+- az_ad_app_owner
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
+- az_ad_app_permission
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
+- az_ad_app_show
+- az_ad_app_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -431,10 +400,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage applications with AAD Graph.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage applications with AAD Graph.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/app/credential.yml b/2017-03-09-profile/docs-ref-autogen/ad/app/credential.yml
index b56156ff5a..b58c58b89a 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/app/credential.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/app/credential.yml
@@ -1,26 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_credential_delete
-  - az_ad_app_credential_list
-  - az_ad_app_credential_reset
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_credential
+name: az ad app credential
+summary: Manage an application's password or certificate credentials.
+description: ''
+directCommands:
 - uid: az_ad_app_credential_delete
   name: az ad app credential delete
   summary: Delete an application's password or certificate credentials.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app credential delete --id
+                                --key-id
+                                [--cert]
   examples:
   - summary: delete an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad app credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -29,69 +24,86 @@ items:
     name: --key-id
     summary: Credential key id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_credential_list
   name: az ad app credential list
-  summary: List an application's password or certificate credentials.
+  summary: List an application's password or certificate credential metadata. (The content of the password or certificate credential is not retrievable.).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app credential list --id
+                              [--cert]
+                              [--query-examples]
   examples:
   - summary: list an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app credential list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_credential_reset
   name: az ad app credential reset
   summary: Append or overwrite an application's password or certificate credentials.
-  description: ''
-  langs:
-  - azurecli
+  description: The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az ad app credential reset --id
+                               [--append]
+                               [--cert]
+                               [--create-cert]
+                               [--credential-description]
+                               [--end-date]
+                               [--keyvault]
+                               [--password]
+                               [--years]
   examples:
+  - summary: Append a certificate to the application with the certificate string.
+    syntax: az ad app credential reset --id 00000000-0000-0000-0000-000000000000 --cert "MIICoT..." --append
+  - summary: Append a certificate to the application with the certificate file.
+    syntax: >-
+      az ad app credential reset --id 00000000-0000-0000-0000-000000000000 --cert "@~/cert.pem" --append
+
+      cert.pem contains the following content
+
+      -----BEGIN CERTIFICATE-----  <<< this line is optional
+
+      MIICoT...
+
+      -----END CERTIFICATE-----    <<< this line is optional
   - summary: append or overwrite an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential reset --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app credential reset --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --append
     summary: Append the new credential instead of overwriting.
     description: ''
-  - name: --credential-description
-    summary: The description of the password.
-    description: ''
-  - name: --end-date
-    summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
-    description: ''
   - name: --cert
     summary: Certificate to use for credentials.
     description: ''
   - name: --create-cert
     summary: Create a self-signed certificate to use for the credential.
     description: ''
+  - name: --credential-description
+    summary: The description of the password.
+    description: ''
+  - name: --end-date
+    summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
+    description: ''
   - name: --keyvault
     summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
     description: ''
@@ -101,22 +113,11 @@ items:
   - name: --years
     summary: Number of years for which the credentials will be valid.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -132,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage an application's password or certificate credentials.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage an application's password or certificate credentials.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/app/owner.yml b/2017-03-09-profile/docs-ref-autogen/ad/app/owner.yml
index 0b8fbdc9e9..e023aa07a3 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/app/owner.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/app/owner.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_owner_add
-  - az_ad_app_owner_list
-  - az_ad_app_owner_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_owner
+name: az ad app owner
+summary: Manage application owners.
+description: ''
+directCommands:
 - uid: az_ad_app_owner_add
   name: az ad app owner add
   summary: Add an application owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app owner add --id
+                        --owner-object-id
   examples:
   - summary: add an application owner. (autogenerated)
-    syntax:
-      content: az ad app owner add --id 00000000-0000-0000-0000-000000000000 --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad app owner add --id 00000000-0000-0000-0000-000000000000 --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -29,40 +23,35 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_owner_list
   name: az ad app owner list
   summary: List application owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app owner list --id
+                         [--query-examples]
   examples:
   - summary: List application owners. (autogenerated)
-    syntax:
-      content: az ad app owner list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app owner list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_owner_remove
   name: az ad app owner remove
   summary: Remove an application owner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad app owner remove --id
+                           --owner-object-id
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -71,22 +60,11 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +80,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage application owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage application owners.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/app/permission.yml b/2017-03-09-profile/docs-ref-autogen/ad/app/permission.yml
index 0452d8f7b7..74f2d3e691 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/app/permission.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/app/permission.yml
@@ -1,112 +1,111 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_permission_add
-  - az_ad_app_permission_admin_consent
-  - az_ad_app_permission_delete
-  - az_ad_app_permission_grant
-  - az_ad_app_permission_list
-  - az_ad_app_permission_list_grants
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_permission
+name: az ad app permission
+summary: Manage an application's OAuth2 permissions.
+description: ''
+directCommands:
 - uid: az_ad_app_permission_add
   name: az ad app permission add
   summary: Add an API permission.
-  description: Invoking "az ad app permission grant" is needed to activate it.
-  langs:
-  - azurecli
+  description: >-
+    Invoking "az ad app permission grant" is needed to activate it.
+
+
+    To get available permissions of the resource app, run `az ad sp show --id <resource-appId>`. For example, to get available permissions for Graph API:
+      - Azure Active Directory Graph: `az ad sp show --id 00000002-0000-0000-c000-000000000000`
+      - Microsoft Graph: `az ad sp show --id 00000003-0000-0000-c000-000000000000`
+    Application permissions under the `appRoles` property correspond to `Role` in --api-permissions. Delegated permissions under the `oauth2Permissions` property correspond to `Scope` in --api-permissions.
+  syntax: >-
+    az ad app permission add --api
+                             --api-permissions
+                             --id
   examples:
-  - summary: add a Graph API permission of "Sign in and read user profile"
-    syntax:
-      content: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6=Scope
-  parameters:
+  - summary: Add Azure Active Directory Graph delegated permission User.Read (Sign in and read user profile).
+    syntax: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6=Scope
+  - summary: Add Azure Active Directory Graph application permission Application.ReadWrite.All (Read and write all applications).
+    syntax: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 1cda74f2-2616-4834-b122-5cb1b07f8a59=Role
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --api-permissions
-    summary: Space separated list of `&lt;resource-access-id&gt;=&lt;type&gt;`.
+    summary: Specify `ResourceAccess.id` - The unique identifier for one of the OAuth2Permission or AppRole instances that the resource application exposes. Space-separated list of `<resource-access-id>=<type>`.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_app_permission_admin_consent
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_app_permission_admin-consent
   name: az ad app permission admin-consent
   summary: Grant Application & Delegated permissions through admin-consent.
   description: You must login as a directory administrator.
-  langs:
-  - azurecli
+  syntax: az ad app permission admin-consent --id
   examples:
-  - summary: grant Application & Delegated permissions through admin-consent. (autogenerated)
-    syntax:
-      content: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
-  parameters:
+  - summary: Grant Application & Delegated permissions through admin-consent. (autogenerated)
+    syntax: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_delete
   name: az ad app permission delete
   summary: Remove an API permission.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission delete --api
+                                --id
+                                [--api-permissions]
   examples:
-  - summary: remove an AAD graph permission
-    syntax:
-      content: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000
-  parameters:
+  - summary: Remove Azure Active Directory Graph permissions.
+    syntax: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000
+  - summary: Remove Azure Active Directory Graph delegated permission User.Read (Sign in and read user profile).
+    syntax: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --api-permissions
+    summary: Specify `ResourceAccess.id` - The unique identifier for one of the OAuth2Permission or AppRole instances that the resource application exposes. Space-separated list of `<resource-access-id>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_grant
   name: az ad app permission grant
   summary: Grant the app an API Delegated permissions.
-  description: For Application permissions, please use "ad app permission admin-consent".
-  langs:
-  - azurecli
+  description: >-
+    A service principal must exist for the app when running this command. To create a corresponding service principal, use `az ad sp create --id {appId}`.
+
+    For Application permissions, please use "ad app permission admin-consent".
+  syntax: >-
+    az ad app permission grant --api
+                               --id
+                               [--consent-type {AllPrincipals, Principal}]
+                               [--expires]
+                               [--principal-id]
+                               [--scope]
   examples:
   - summary: Grant a native application with permissions to access an existing API with TTL of 2 years
-    syntax:
-      content: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --api a0322f79-57df-498f-9d9f-12678 --expires 2
-  parameters:
+    syntax: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --api a0322f79-57df-498f-9d9f-12678 --expires 2
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --consent-type
     defaultValue: AllPrincipals
     parameterValueGroup: AllPrincipals, Principal
@@ -123,44 +122,39 @@ items:
     defaultValue: user_impersonation
     summary: Specifies the value of the scope claim that the resource application should expect in the OAuth 2.0 access token, e.g. User.Read.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_list
   name: az ad app permission list
   summary: List API permissions the application has requested.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission list --id
+                              [--query-examples]
   examples:
   - summary: List the OAuth2 permissions for an existing AAD app
-    syntax:
-      content: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234
-  parameters:
+    syntax: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the associated application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_app_permission_list_grants
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_app_permission_list-grants
   name: az ad app permission list-grants
   summary: List Oauth2 permission grants.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission list-grants [--filter]
+                                     [--id]
+                                     [--show-resource-name {false, true}]
   examples:
   - summary: list oauth2 permissions granted to the service principal
-    syntax:
-      content: az ad app permission list-grants --id e042ec79-34cd-498f-9d9f-1234234123456
-  parameters:
+    syntax: az ad app permission list-grants --id e042ec79-34cd-498f-9d9f-1234234123456
+  optionalParameters:
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
@@ -171,31 +165,14 @@ items:
     parameterValueGroup: false, true
     summary: Show resource's display name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,10 +188,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage an application's OAuth2 permissions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage an application's OAuth2 permissions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/ds.yml b/2017-03-09-profile/docs-ref-autogen/ad/ds.yml
new file mode 100644
index 0000000000..f02cede4fd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ad/ds.yml
@@ -0,0 +1,438 @@
+### YamlMime:AzureCLIGroup
+uid: az_ad_ds
+name: az ad ds
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ad** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ad ds** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage domain service with azure active directory.
+description: ''
+directCommands:
+- uid: az_ad_ds_create
+  name: az ad ds create
+  summary: Create a new domain service with the specified parameters.
+  description: ''
+  syntax: >-
+    az ad ds create --domain
+                    --name
+                    --replica-sets
+                    --resource-group
+                    [--domain-config-type {FullySynced, ResourceTrusting}]
+                    [--external-access {Disabled, Enabled}]
+                    [--filtered-sync {Disabled, Enabled}]
+                    [--ldaps {Disabled, Enabled}]
+                    [--no-wait]
+                    [--notify-dc-admins {Disabled, Enabled}]
+                    [--notify-global-admins {Disabled, Enabled}]
+                    [--notify-others]
+                    [--ntlm-v1 {Disabled, Enabled}]
+                    [--pfx-cert]
+                    [--pfx-cert-pwd]
+                    [--resource-forest {Disabled, Enabled}]
+                    [--settings]
+                    [--sku {Enterprise, Premium, Standard}]
+                    [--sync-kerberos-pwd {Disabled, Enabled}]
+                    [--sync-ntlm-pwd {Disabled, Enabled}]
+                    [--sync-on-prem-pwd {Disabled, Enabled}]
+                    [--tags]
+                    [--tls-v1 {Disabled, Enabled}]
+  examples:
+  - summary: Create Domain Service
+    syntax: az ad ds create --domain "TestDS.com" --replica-sets location="West US" subnet-id="<subnetId>" --name "TestDS.com" --resource-group "rg"
+  - summary: Create Domain Service with specified settings (Line breaks for legibility only)
+    syntax: >-
+      az ad ds create --domain "TestDS.com" --replica-sets location="West US" subnet-id="<subnetId>" --name "TestDS.com" --resource-group "rg"
+
+      --ntlm-v1 "Enabled" --sync-ntlm-pwd "Enabled" --tls-v1 "Disabled" --filtered-sync "Enabled" --external-access "Enabled"
+
+      --ldaps "Enabled" --pfx-cert "cert or path to cert" --pfx-cert-pwd "<pfxCertificatePassword>"
+
+      --notify-others "a@gmail.com" "b@gmail.com" --notify-dc-admins "Enabled" --notify-global-admins "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --domain
+    summary: The name of the Azure domain that the user would like to deploy Domain Services to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --replica-sets
+    summary: List of ReplicaSets.
+    description: >-
+      Usage: --replica-sets location=XX subnet-id=XX
+
+
+      location: Virtual network location
+
+      subnet-id: The id of the subnet that Domain Services will be deployed on.
+
+
+      Multiple actions can be specified by using more than one --replica-sets argument.
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --domain-config-type
+    parameterValueGroup: FullySynced, ResourceTrusting
+    summary: Domain Configuration Type.
+    description: ''
+  - name: --external-access
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP access over the internet is enabled or disabled.
+    description: ''
+  - name: --filtered-sync
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled or Disabled flag to turn on Group-based filtered sync.
+    description: ''
+  - name: --ldaps
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP is enabled or disabled.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notify-dc-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should domain controller admins be notified.
+    description: ''
+  - name: --notify-global-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should global admins be notified.
+    description: ''
+  - name: --notify-others
+    summary: The list of additional recipients.
+    description: ''
+  - name: --ntlm-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not NtlmV1 is enabled or disabled.
+    description: ''
+  - name: --pfx-cert
+    summary: The certificate required to configure Secure LDAP. The parameter passed here should be the file path to the certificate pfx file or a base64encoded representation of the certificate pfx file.
+    description: ''
+  - name: --pfx-cert-pwd
+    summary: The password to decrypt the provided Secure LDAP certificate pfx file.
+    description: ''
+  - name: --resource-forest
+    parameterValueGroup: Disabled, Enabled
+    summary: Resource Forest.
+    description: ''
+  - name: --settings
+    summary: List of settings for Resource Forest. This can be either a JSON-formatted string or the location to a file containing the JSON object.
+    description: >-
+      The format of the settings JSON object for Resource Forest:
+
+      [
+          {
+              "trusted_domain_fqdn": "XX",
+              "trust_direction": "XX",
+              "friendly_name": "XX",
+              "remote_dns_ips": "XX",
+              "trust_password": "XX"
+          },
+          ...n
+      ].
+  - name: --sku
+    parameterValueGroup: Enterprise, Premium, Standard
+    summary: Sku Type.
+    description: ''
+  - name: --sync-kerberos-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncKerberosPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-ntlm-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-on-prem-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncOnPremPasswords is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --tls-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not TlsV1 is enabled or disabled.
+    description: ''
+- uid: az_ad_ds_delete
+  name: az ad ds delete
+  summary: The Delete Domain Service operation deletes an existing Domain Service.
+  description: ''
+  syntax: >-
+    az ad ds delete --name
+                    --resource-group
+                    [--no-wait]
+                    [--yes]
+  examples:
+  - summary: Delete Domain Service
+    syntax: az ad ds delete --name "TestDomainService.com" --resource-group "TestResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ad_ds_list
+  name: az ad ds list
+  summary: List domain services in resource group or in subscription.
+  description: ''
+  syntax: az ad ds list [--resource-group]
+  examples:
+  - summary: List Domain Service By Group
+    syntax: az ad ds list --resource-group "TestResourceGroup"
+  - summary: List Domain Service By Sub
+    syntax: az ad ds list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ad_ds_show
+  name: az ad ds show
+  summary: Get the specified domain service.
+  description: ''
+  syntax: >-
+    az ad ds show --name
+                  --resource-group
+  examples:
+  - summary: Get Domain Service
+    syntax: az ad ds show --name "TestDomainService.com" --resource-group "TestResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ad_ds_update
+  name: az ad ds update
+  summary: Update the existing deployment properties for domain service.
+  description: ''
+  syntax: >-
+    az ad ds update --name
+                    --resource-group
+                    [--domain-config-type {FullySynced, ResourceTrusting}]
+                    [--external-access {Disabled, Enabled}]
+                    [--filtered-sync {Disabled, Enabled}]
+                    [--ldaps {Disabled, Enabled}]
+                    [--no-wait]
+                    [--notify-dc-admins {Disabled, Enabled}]
+                    [--notify-global-admins {Disabled, Enabled}]
+                    [--notify-others]
+                    [--ntlm-v1 {Disabled, Enabled}]
+                    [--pfx-cert]
+                    [--pfx-cert-pwd]
+                    [--replica-sets]
+                    [--resource-forest {Disabled, Enabled}]
+                    [--settings]
+                    [--sku {Enterprise, Premium, Standard}]
+                    [--sync-kerberos-pwd {Disabled, Enabled}]
+                    [--sync-ntlm-pwd {Disabled, Enabled}]
+                    [--sync-on-prem-pwd {Disabled, Enabled}]
+                    [--tags]
+                    [--tls-v1 {Disabled, Enabled}]
+  examples:
+  - summary: Update sku
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --sku "Enterprise"
+  - summary: Update domain security settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --ntlm-v1 "Enabled" --tls-v1 "Disabled"
+  - summary: Update ldaps settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --external-access "Enabled" --ldaps "Enabled" --pfx-cert "MIIDPDCCAiSg..." --pfx-cert-pwd "<pfxCertificatePassword>"
+  - summary: Update notification settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --notify-dc-admins "Enabled" --notify-global-admins "Disabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --domain-config-type
+    parameterValueGroup: FullySynced, ResourceTrusting
+    summary: Domain Configuration Type.
+    description: ''
+  - name: --external-access
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP access over the internet is enabled or disabled.
+    description: ''
+  - name: --filtered-sync
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled or Disabled flag to turn on Group-based filtered sync.
+    description: ''
+  - name: --ldaps
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP is enabled or disabled.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notify-dc-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should domain controller admins be notified.
+    description: ''
+  - name: --notify-global-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should global admins be notified.
+    description: ''
+  - name: --notify-others
+    summary: The list of additional recipients.
+    description: ''
+  - name: --ntlm-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not NtlmV1 is enabled or disabled.
+    description: ''
+  - name: --pfx-cert
+    summary: The certificate required to configure Secure LDAP. The parameter passed here should be the file path to the certificate pfx file or a base64encoded representation of the certificate pfx file.
+    description: ''
+  - name: --pfx-cert-pwd
+    summary: The password to decrypt the provided Secure LDAP certificate pfx file.
+    description: ''
+  - name: --replica-sets
+    summary: List of ReplicaSets.
+    description: >-
+      Usage: --replica-sets location=XX subnet-id=XX
+
+
+      location: Virtual network location
+
+      subnet-id: The id of the subnet that Domain Services will be deployed on.
+
+
+      Multiple actions can be specified by using more than one --replica-sets argument.
+  - name: --resource-forest
+    parameterValueGroup: Disabled, Enabled
+    summary: Resource Forest.
+    description: ''
+  - name: --settings
+    summary: List of settings for Resource Forest. This can be either a JSON-formatted string or the location to a file containing the JSON object.
+    description: >-
+      The format of the settings JSON object for Resource Forest:
+
+      [
+          {
+              "trusted_domain_fqdn": "XX",
+              "trust_direction": "XX",
+              "friendly_name": "XX",
+              "remote_dns_ips": "XX",
+              "trust_password": "XX"
+          },
+          ...n
+      ].
+  - name: --sku
+    parameterValueGroup: Enterprise, Premium, Standard
+    summary: Sku Type.
+    description: ''
+  - name: --sync-kerberos-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncKerberosPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-ntlm-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-on-prem-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncOnPremPasswords is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --tls-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not TlsV1 is enabled or disabled.
+    description: ''
+- uid: az_ad_ds_wait
+  name: az ad ds wait
+  summary: Place the CLI in a waiting state until a condition of the ad ds is met.
+  description: ''
+  syntax: >-
+    az ad ds wait --name
+                  --resource-group
+                  [--created]
+                  [--custom]
+                  [--deleted]
+                  [--exists]
+                  [--interval]
+                  [--timeout]
+                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the ad ds is successfully created.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the ad ds is successfully updated.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the ad ds is successfully deleted.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_ad_ds_create
+- az_ad_ds_delete
+- az_ad_ds_list
+- az_ad_ds_show
+- az_ad_ds_update
+- az_ad_ds_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage domain service with azure active directory.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/group.yml b/2017-03-09-profile/docs-ref-autogen/ad/group.yml
index 12abd57e91..083e51c7e2 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/group.yml
@@ -1,28 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group
-  name: az ad group
-  summary: Manage Azure Active Directory groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_create
-  - az_ad_group_delete
-  - az_ad_group_get_member_groups
-  - az_ad_group_list
-  - az_ad_group_show
+### YamlMime:AzureCLIGroup
+uid: az_ad_group
+name: az ad group
+summary: Manage Azure Active Directory groups.
+description: ''
+directCommands:
 - uid: az_ad_group_create
   name: az ad group create
   summary: Create a group in the directory.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group create --display-name
+                       --mail-nickname
+                       [--description]
+                       [--force {false, true}]
   examples:
   - summary: Create a group in the directory. (autogenerated)
-    syntax:
-      content: az ad group create --display-name MyDisplay --mail-nickname MyDisplay
-  parameters:
+    syntax: az ad group create --display-name MyDisplay --mail-nickname MyDisplay
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: Object's display name or its prefix.
@@ -31,44 +25,40 @@ items:
     name: --mail-nickname
     summary: Mail nickname.
     description: ''
+  optionalParameters:
+  - name: --description
+    summary: Group description.
+    description: ''
   - name: --force
     parameterValueGroup: false, true
     summary: Always create a new group instead of updating the one with same display and mail nickname.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_delete
   name: az ad group delete
   summary: Delete a group from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad group delete --group
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_group_get_member_groups
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_group_get-member-groups
   name: az ad group get-member-groups
   summary: Gets a collection of object IDs of groups of which the specified group is a member.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group get-member-groups --group
+                                  [--additional-properties]
+                                  [--security-enabled-only {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
+  optionalParameters:
   - name: --additional-properties
     summary: Unmatched properties from the message are deserialized this collection.
     description: ''
@@ -76,91 +66,58 @@ items:
     parameterValueGroup: false, true
     summary: If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_list
   name: az ad group list
   summary: List groups in the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group list [--display-name]
+                     [--filter]
+                     [--query-examples]
+  optionalParameters:
   - name: --display-name
     summary: Object's display name or its prefix.
     description: ''
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_show
   name: az ad group show
   summary: Gets group information from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group show --group
+                     [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_create
-  name: az ad group create
-  summary: Create a group in the directory.
-- uid: az_ad_group_delete
-  name: az ad group delete
-  summary: Delete a group from the directory.
-- uid: az_ad_group_get_member_groups
-  name: az ad group get-member-groups
-  summary: Gets a collection of object IDs of groups of which the specified group is a member.
-- uid: az_ad_group_list
-  name: az ad group list
-  summary: List groups in the directory.
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
-- uid: az_ad_group_show
-  name: az ad group show
-  summary: Gets group information from the directory.
+- az_ad_group_create
+- az_ad_group_delete
+- az_ad_group_get-member-groups
+- az_ad_group_list
+- az_ad_group_member
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
+- az_ad_group_owner
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
+- az_ad_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/group/member.yml b/2017-03-09-profile/docs-ref-autogen/ad/group/member.yml
index 89af3cbdaa..e5705aa209 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/group/member.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/group/member.yml
@@ -1,23 +1,18 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_member_add
-  - az_ad_group_member_check
-  - az_ad_group_member_list
-  - az_ad_group_member_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_group_member
+name: az ad group member
+summary: Manage Azure Active Directory group members.
+description: ''
+directCommands:
 - uid: az_ad_group_member_add
   name: az ad group member add
   summary: Add a member to a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member add --group
+                           --member-id
+                           [--additional-properties]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -26,26 +21,22 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
+  optionalParameters:
   - name: --additional-properties
     summary: Unmatched properties from the message are deserialized this collection.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_check
   name: az ad group member check
   summary: Check if a member is in a group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group member check --group
+                             --member-id
   examples:
   - summary: Check if a member is in a group. (autogenerated)
-    syntax:
-      content: az ad group member check --group MyGroupDisplayName --member-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group member check --group MyGroupDisplayName --member-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -54,36 +45,32 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_list
   name: az ad group member list
   summary: Gets the members of a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member list --group
+                            [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_remove
   name: az ad group member remove
   summary: Remove a member from a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member remove --group
+                              --member-id
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -92,25 +79,12 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -126,10 +100,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory group members.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory group members.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/group/owner.yml b/2017-03-09-profile/docs-ref-autogen/ad/group/owner.yml
index e58e19029f..5a879fb16d 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/group/owner.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/group/owner.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_owner_add
-  - az_ad_group_owner_list
-  - az_ad_group_owner_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_group_owner
+name: az ad group owner
+summary: Manage Azure Active Directory group owners.
+description: ''
+directCommands:
 - uid: az_ad_group_owner_add
   name: az ad group owner add
   summary: Add a group owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner add --group
+                          --owner-object-id
   examples:
   - summary: add a group owner. (autogenerated)
-    syntax:
-      content: az ad group owner add --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group owner add --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -29,44 +23,38 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_owner_list
   name: az ad group owner list
   summary: List group owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner list --group
+                           [--query-examples]
   examples:
   - summary: List group owners. (autogenerated)
-    syntax:
-      content: az ad group owner list --group MyGroupDisplayName
-  parameters:
+    syntax: az ad group owner list --group MyGroupDisplayName
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_owner_remove
   name: az ad group owner remove
   summary: Remove a group owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner remove --group
+                             --owner-object-id
   examples:
   - summary: remove a group owner. (autogenerated)
-    syntax:
-      content: az ad group owner remove --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group owner remove --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -75,22 +63,11 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,10 +83,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory group owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory group owners.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/signed-in-user.yml b/2017-03-09-profile/docs-ref-autogen/ad/signed-in-user.yml
index 88125e52b8..e485ad5b81 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/signed-in-user.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/signed-in-user.yml
@@ -1,50 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_signed_in_user
-  name: az ad signed-in-user
-  summary: Show graph information about current signed-in user in CLI.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_signed_in_user_list_owned_objects
-  - az_ad_signed_in_user_show
-- uid: az_ad_signed_in_user_list_owned_objects
+### YamlMime:AzureCLIGroup
+uid: az_ad_signed-in-user
+name: az ad signed-in-user
+summary: Show graph information about current signed-in user in CLI.
+description: ''
+directCommands:
+- uid: az_ad_signed-in-user_list-owned-objects
   name: az ad signed-in-user list-owned-objects
   summary: Get the list of directory objects that are owned by the user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad signed-in-user list-owned-objects [--type]
+  optionalParameters:
   - name: --type -t
     summary: Object type filter, e.g. "application", "servicePrincipal"  "group", etc.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_signed_in_user_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_signed-in-user_show
   name: az ad signed-in-user show
   summary: Gets the details for the currently logged-in user.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  syntax: az ad signed-in-user show [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_signed_in_user_list_owned_objects
-  name: az ad signed-in-user list-owned-objects
-  summary: Get the list of directory objects that are owned by the user.
-- uid: az_ad_signed_in_user_show
-  name: az ad signed-in-user show
-  summary: Gets the details for the currently logged-in user.
+- az_ad_signed-in-user_list-owned-objects
+- az_ad_signed-in-user_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -60,10 +42,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Show graph information about current signed-in user in CLI.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Show graph information about current signed-in user in CLI.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/sp.yml b/2017-03-09-profile/docs-ref-autogen/ad/sp.yml
index 45ef6d1a48..b25acb5f25 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/sp.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/sp.yml
@@ -1,80 +1,77 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp
-  name: az ad sp
-  summary: Manage Azure Active Directory service principals for automation authentication.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_create
-  - az_ad_sp_create_for_rbac
-  - az_ad_sp_delete
-  - az_ad_sp_list
-  - az_ad_sp_show
-  - az_ad_sp_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp
+name: az ad sp
+summary: Manage Azure Active Directory service principals for automation authentication.
+description: ''
+directCommands:
 - uid: az_ad_sp_create
   name: az ad sp create
   summary: Create a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad sp create --id
   examples:
   - summary: Create a service principal. (autogenerated)
-    syntax:
-      content: az ad sp create --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp create --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the associated application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_sp_create_for_rbac
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_sp_create-for-rbac
   name: az ad sp create-for-rbac
   summary: Create a service principal and configure its access to Azure resources.
-  description: ''
-  langs:
-  - azurecli
+  description: >-
+    The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+
+
+    By default, this command assigns the 'Contributor' role to the service principal at the subscription scope. To reduce your risk of a compromised service principal, use --skip-assignment to avoid creating a role assignment, then assign a more specific role and narrow the scope to a resource or resource group. See [steps to add a role assignment](https://aka.ms/azadsp-more) for more information.
+
+
+    WARNING: In a future release, this command will NOT create a 'Contributor' role assignment by default. If needed, use the --role argument to explicitly create a role assignment.
+  syntax: >-
+    az ad sp create-for-rbac [--cert]
+                             [--create-cert]
+                             [--keyvault]
+                             [--name]
+                             [--role]
+                             [--scopes]
+                             [--sdk-auth {false, true}]
+                             [--skip-assignment {false, true}]
+                             [--years]
   examples:
   - summary: Create with a default role assignment.
-    syntax:
-      content: az ad sp create-for-rbac
+    syntax: az ad sp create-for-rbac
   - summary: Create using a custom name, and with a default assignment.
-    syntax:
-      content: az ad sp create-for-rbac -n "MyApp"
+    syntax: az ad sp create-for-rbac -n "MyApp"
   - summary: Create without a default assignment.
-    syntax:
-      content: az ad sp create-for-rbac --skip-assignment
-  - summary: Create with customized contributor assignments.
-    syntax:
-      content: >-
-        az ad sp create-for-rbac -n "MyApp" --role contributor \
-            --scopes /subscriptions/{SubID}/resourceGroups/{ResourceGroup1} \
-            /subscriptions/{SubID}/resourceGroups/{ResourceGroup2}
+    syntax: az ad sp create-for-rbac --skip-assignment
+  - summary: Create with a Contributor role assignments on specified scope.
+    syntax: az ad sp create-for-rbac -n "MyApp" --role Contributor --scopes /subscriptions/{SubID}/resourceGroups/{ResourceGroup1} /subscriptions/{SubID}/resourceGroups/{ResourceGroup2}
   - summary: Create using a self-signed certificate.
-    syntax:
-      content: az ad sp create-for-rbac --create-cert
+    syntax: az ad sp create-for-rbac --create-cert
   - summary: Create using a self-signed certificate, and store it within KeyVault.
-    syntax:
-      content: az ad sp create-for-rbac --keyvault MyVault --cert CertName --create-cert
+    syntax: az ad sp create-for-rbac --keyvault MyVault --cert CertName --create-cert
   - summary: Create using existing certificate in KeyVault.
-    syntax:
-      content: az ad sp create-for-rbac --keyvault MyVault --cert CertName
-  parameters:
+    syntax: az ad sp create-for-rbac --keyvault MyVault --cert CertName
+  optionalParameters:
+  - name: --cert
+    summary: Certificate to use for credentials.
+    description: When used with `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
+  - name: --create-cert
+    summary: Create a self-signed certificate to use for the credential. Only the current OS user has read/write permission to this certificate.
+    description: Use with `--keyvault` to create the certificate in Key Vault. Otherwise, a certificate will be created locally.
+  - name: --keyvault
+    summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
+    description: ''
   - name: --name -n
     summary: A URI to use as the logic name. It doesn't need to exist. If not present, CLI will generate one.
     description: ''
   - name: --role
-    defaultValue: Contributor
     summary: Role of the service principal.
     description: ''
   - name: --scopes
-    summary: Space-separated list of scopes the service principal's role assignment applies to. Defaults to the root of the current subscription.
+    summary: Space-separated list of scopes the service principal's role assignment applies to. Defaults to the root of the current subscription. e.g., /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333, /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup, or /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM.
     description: ''
   - name: --sdk-auth
     parameterValueGroup: false, true
@@ -82,54 +79,38 @@ items:
     description: ''
   - name: --skip-assignment
     parameterValueGroup: false, true
-    summary: Skip creating the default assignment, which allows the service principal to access resources under the current subscription.
-    description: ''
-  - name: --cert
-    summary: Certificate to use for credentials.
-    description: When used with `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
-  - name: --create-cert
-    summary: Create a self-signed certificate to use for the credential.
-    description: Use with `--keyvault` to create the certificate in Key Vault. Otherwise, a certificate will be created locally.
-  - name: --keyvault
-    summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
+    summary: Skip creating the default assignment, which allows the service principal to access resources under the current subscription. When specified, --scopes will be ignored. You may use `az role assignment create` to create role assignments for this service principal later.
     description: ''
   - name: --years
     summary: 'Number of years for which the credentials will be valid. Default: 1 year.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_delete
   name: az ad sp delete
   summary: Delete a service principal and its role assignments.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad sp delete --id
   examples:
   - summary: Delete a service principal and its role assignments. (autogenerated)
-    syntax:
-      content: az ad sp delete --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp delete --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_list
   name: az ad sp list
   summary: List service principals.
   description: For low latency, by default, only the first 100 will be returned unless you provide filter arguments or use "--all".
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad sp list [--all]
+                  [--display-name]
+                  [--filter]
+                  [--query-examples]
+                  [--show-mine]
+                  [--spn]
+  optionalParameters:
   - name: --all
     summary: List all entities, expect long delay if under a big organization.
     description: ''
@@ -139,54 +120,55 @@ items:
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --show-mine
     summary: List entities owned by the current user.
     description: ''
   - name: --spn
     summary: Service principal name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_show
   name: az ad sp show
   summary: Get the details of a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp show --id
+                  [--query-examples]
   examples:
   - summary: Get the details of a service principal. (autogenerated)
-    syntax:
-      content: az ad sp show --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp show --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_update
   name: az ad sp update
   summary: Update a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp update --id
+                    [--add]
+                    [--force-string]
+                    [--remove]
+                    [--set]
   examples:
   - summary: update a service principal (autogenerated)
-    syntax:
-      content: az ad sp update --id 00000000-0000-0000-0000-000000000000 --set groupMembershipClaims=All
-  parameters:
+    syntax: az ad sp update --id 00000000-0000-0000-0000-000000000000 --set groupMembershipClaims=All
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
@@ -199,49 +181,20 @@ items:
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_create
-  name: az ad sp create
-  summary: Create a service principal.
-- uid: az_ad_sp_create_for_rbac
-  name: az ad sp create-for-rbac
-  summary: Create a service principal and configure its access to Azure resources.
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
-- uid: az_ad_sp_delete
-  name: az ad sp delete
-  summary: Delete a service principal and its role assignments.
-- uid: az_ad_sp_list
-  name: az ad sp list
-  summary: List service principals.
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
-- uid: az_ad_sp_show
-  name: az ad sp show
-  summary: Get the details of a service principal.
-- uid: az_ad_sp_update
-  name: az ad sp update
-  summary: Update a service principal.
+- az_ad_sp_create
+- az_ad_sp_create-for-rbac
+- az_ad_sp_credential
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
+- az_ad_sp_delete
+- az_ad_sp_list
+- az_ad_sp_owner
+- az_ad_sp_owner_list
+- az_ad_sp_show
+- az_ad_sp_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -257,10 +210,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory service principals for automation authentication.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory service principals for automation authentication.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/sp/credential.yml b/2017-03-09-profile/docs-ref-autogen/ad/sp/credential.yml
index 80370c6e38..a383215bb5 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/sp/credential.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/sp/credential.yml
@@ -1,26 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-  description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_credential_delete
-  - az_ad_sp_credential_list
-  - az_ad_sp_credential_reset
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp_credential
+name: az ad sp credential
+summary: Manage a service principal's credentials.
+description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
+directCommands:
 - uid: az_ad_sp_credential_delete
   name: az ad sp credential delete
   summary: Delete a service principal's credential.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp credential delete --id
+                               --key-id
+                               [--cert]
   examples:
-  - summary: delete a service principal's credential. (autogenerated)
-    syntax:
-      content: az ad sp credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+  - summary: Delete a service principal's credential. (autogenerated)
+    syntax: az ad sp credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
@@ -29,54 +24,75 @@ items:
     name: --key-id
     summary: Credential key id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_credential_list
   name: az ad sp credential list
   summary: List a service principal's credentials.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp credential list --id
+                             [--cert]
+                             [--query-examples]
   examples:
-  - summary: list a service principal's credentials. (autogenerated)
-    syntax:
-      content: az ad sp credential list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+  - summary: List a service principal's credentials. (autogenerated)
+    syntax: az ad sp credential list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_credential_reset
   name: az ad sp credential reset
   summary: Reset a service principal credential.
-  description: Use upon expiration of the service principal's credentials, or in the event that login credentials are lost.
-  langs:
-  - azurecli
+  description: >-
+    Use upon expiration of the service principal's credentials, or in the event that login credentials are lost.
+
+
+    The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az ad sp credential reset --name
+                              [--append]
+                              [--cert]
+                              [--create-cert]
+                              [--credential-description]
+                              [--end-date]
+                              [--keyvault]
+                              [--password]
+                              [--years]
   examples:
+  - summary: Append a certificate to the service principal with the certificate string.
+    syntax: az ad sp credential reset --name myapp --cert "MIICoT..." --append
+  - summary: Append a certificate to the service principal with the certificate file.
+    syntax: >-
+      az ad sp credential reset --name myapp --cert "@~/cert.pem" --append
+
+      cert.pem contains the following content
+
+      -----BEGIN CERTIFICATE-----  <<< this line is optional
+
+      MIICoT...
+
+      -----END CERTIFICATE-----    <<< this line is optional
   - summary: Reset a service principal credential. (autogenerated)
-    syntax:
-      content: az ad sp credential reset --name MyAppURIForCredential
-  parameters:
+    syntax: az ad sp credential reset --name MyAppURIForCredential
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name or app ID of the service principal.
     description: ''
+  optionalParameters:
   - name: --append
     summary: Append the new credential instead of overwriting.
     description: ''
@@ -101,22 +117,11 @@ items:
   - name: --years
     summary: 'Number of years for which the credentials will be valid. Default: 1 year.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -132,10 +137,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/sp/owner.yml b/2017-03-09-profile/docs-ref-autogen/ad/sp/owner.yml
index 2480bcb6bc..ef2fe89a5c 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/sp/owner.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/sp/owner.yml
@@ -1,38 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_owner_list
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp_owner
+name: az ad sp owner
+summary: Manage service principal owners.
+description: ''
+directCommands:
 - uid: az_ad_sp_owner_list
   name: az ad sp owner list
   summary: List service principal owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp owner list --id
+                        [--query-examples]
   examples:
   - summary: List service principal owners. (autogenerated)
-    syntax:
-      content: az ad sp owner list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp owner list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id or the service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
+- az_ad_sp_owner_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -48,10 +41,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage service principal owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage service principal owners.
diff --git a/2017-03-09-profile/docs-ref-autogen/ad/user.yml b/2017-03-09-profile/docs-ref-autogen/ad/user.yml
index 01908ef4d4..b743b865df 100644
--- a/2017-03-09-profile/docs-ref-autogen/ad/user.yml
+++ b/2017-03-09-profile/docs-ref-autogen/ad/user.yml
@@ -1,25 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_user
-  name: az ad user
-  summary: Manage Azure Active Directory users and user authentication.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_user_create
-  - az_ad_user_delete
-  - az_ad_user_get_member_groups
-  - az_ad_user_list
-  - az_ad_user_show
-  - az_ad_user_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_user
+name: az ad user
+summary: Manage Azure Active Directory users and user authentication.
+description: ''
+directCommands:
 - uid: az_ad_user_create
   name: az ad user create
   summary: Create an Azure Active Directory user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user create --display-name
+                      --password
+                      --user-principal-name
+                      [--force-change-password-next-login {false, true}]
+                      [--immutable-id]
+                      [--mail-nickname]
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: Object's display name or its prefix.
@@ -32,9 +28,10 @@ items:
     name: --user-principal-name
     summary: Required. The user principal name (someuser@contoso.com). It must contain one of the verified domains for the tenant.
     description: ''
+  optionalParameters:
   - name: --force-change-password-next-login
     parameterValueGroup: false, true
-    summary: Marks this user as needing to update their password the next time they authenticate.
+    summary: Marks this user as needing to update their password the next time they authenticate. If omitted, false will be used.
     description: ''
   - name: --immutable-id
     summary: This must be specified if you are using a federated domain for the user's userPrincipalName (UPN) property when creating a new user account. It is used to associate an on-premises Active Directory user account with their Azure AD user object.
@@ -42,107 +39,98 @@ items:
   - name: --mail-nickname
     summary: Mail alias. Defaults to user principal name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_delete
   name: az ad user delete
   summary: Delete a user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad user delete --id
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_user_get_member_groups
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_user_get-member-groups
   name: az ad user get-member-groups
   summary: Get groups of which the user is a member.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad user get-member-groups --id
+                                 [--security-enabled-only]
   examples:
   - summary: Get groups of which the user is a member (autogenerated)
-    syntax:
-      content: az ad user get-member-groups --upn-or-object-id myuser@consoso.com
-  parameters:
+    syntax: az ad user get-member-groups --upn-or-object-id myuser@contoso.com
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
+  optionalParameters:
   - name: --security-enabled-only
     summary: If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_list
   name: az ad user list
   summary: List Azure Active Directory users.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user list [--display-name]
+                    [--filter]
+                    [--query-examples]
+                    [--upn]
+  optionalParameters:
   - name: --display-name
     summary: Object's display name or its prefix.
     description: ''
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --upn
     summary: User principal name, e.g. john.doe@contoso.com.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_show
   name: az ad user show
   summary: Gets user information from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user show --id
+                    [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_update
   name: az ad user update
   summary: Update Azure Active Directory users.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad user update --id
+                      [--account-enabled {false, true}]
+                      [--display-name]
+                      [--force-change-password-next-login {false, true}]
+                      [--mail-nickname]
+                      [--password]
   examples:
   - summary: Update Azure Active Directory users. (autogenerated)
-    syntax:
-      content: az ad user update --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad user update --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
+  optionalParameters:
   - name: --account-enabled
     parameterValueGroup: false, true
     summary: Enable the user account.
@@ -160,31 +148,14 @@ items:
   - name: --password
     summary: User password.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_user_create
-  name: az ad user create
-  summary: Create an Azure Active Directory user.
-- uid: az_ad_user_delete
-  name: az ad user delete
-  summary: Delete a user.
-- uid: az_ad_user_get_member_groups
-  name: az ad user get-member-groups
-  summary: Get groups of which the user is a member.
-- uid: az_ad_user_list
-  name: az ad user list
-  summary: List Azure Active Directory users.
-- uid: az_ad_user_show
-  name: az ad user show
-  summary: Gets user information from the directory.
-- uid: az_ad_user_update
-  name: az ad user update
-  summary: Update Azure Active Directory users.
+- az_ad_user_create
+- az_ad_user_delete
+- az_ad_user_get-member-groups
+- az_ad_user_list
+- az_ad_user_show
+- az_ad_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +171,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory users and user authentication.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory users and user authentication.
diff --git a/2017-03-09-profile/docs-ref-autogen/ai-examples.yml b/2017-03-09-profile/docs-ref-autogen/ai-examples.yml
new file mode 100644
index 0000000000..f36fbab675
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ai-examples.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_ai-examples
+name: az ai-examples
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ai-examples** extension for Azure CLI and requires version 2.2.0 or higher.  The extension will automatically install the first time you run an **az ai-examples** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Add AI powered examples to help content.
+description: ''
+directCommands:
+- uid: az_ai-examples_check-connection
+  name: az ai-examples check-connection
+  summary: Check if the client can connect to the AI example service.
+  description: ''
+  syntax: az ai-examples check-connection
+commands:
+- az_ai-examples_check-connection
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Add AI powered examples to help content.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks.yml b/2017-03-09-profile/docs-ref-autogen/aks.yml
new file mode 100644
index 0000000000..3263ce5a10
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks.yml
@@ -0,0 +1,1359 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks
+name: az aks
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Kubernetes Services.
+description: ''
+directCommands:
+- uid: az_aks_browse
+  name: az aks browse
+  summary: Show the dashboard for a Kubernetes cluster in a web browser.
+  description: ''
+  syntax: >-
+    az aks browse --name
+                  --resource-group
+                  [--disable-browser]
+                  [--listen-address]
+                  [--listen-port]
+  examples:
+  - summary: Show the dashboard for a Kubernetes cluster in a web browser. (autogenerated)
+    syntax: az aks browse --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disable-browser
+    summary: Don't launch a web browser after establishing port-forwarding.
+    description: Add this argument when launching a web browser manually, or for automated testing.
+  - name: --listen-address
+    defaultValue: 127.0.0.1
+    summary: The listening address for the dashboard.
+    description: Add this argument to listen on a specific IP address.
+  - name: --listen-port
+    defaultValue: "8001"
+    summary: The listening port for the dashboard.
+    description: Add this argument when the default listening port is used by another process or unavailable.
+- uid: az_aks_create
+  name: az aks create
+  summary: Create a new managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks create --name
+                  --resource-group
+                  [--aad-admin-group-object-ids]
+                  [--aad-client-app-id]
+                  [--aad-server-app-id]
+                  [--aad-server-app-secret]
+                  [--aad-tenant-id]
+                  [--aci-subnet-name]
+                  [--admin-username]
+                  [--aks-custom-headers]
+                  [--api-server-authorized-ip-ranges]
+                  [--appgw-id]
+                  [--appgw-name]
+                  [--appgw-subnet-cidr]
+                  [--appgw-subnet-id]
+                  [--appgw-subnet-prefix]
+                  [--appgw-watch-namespace]
+                  [--assign-identity]
+                  [--assign-kubelet-identity]
+                  [--attach-acr]
+                  [--auto-upgrade-channel {node-image, none, patch, rapid, stable}]
+                  [--client-secret]
+                  [--cluster-autoscaler-profile]
+                  [--disable-local-accounts]
+                  [--disable-rbac]
+                  [--dns-name-prefix]
+                  [--dns-service-ip]
+                  [--docker-bridge-address]
+                  [--enable-aad]
+                  [--enable-addons]
+                  [--enable-ahub]
+                  [--enable-azure-rbac]
+                  [--enable-cluster-autoscaler]
+                  [--enable-encryption-at-host {false, true}]
+                  [--enable-fips-image]
+                  [--enable-managed-identity]
+                  [--enable-node-public-ip]
+                  [--enable-pod-identity]
+                  [--enable-pod-identity-with-kubenet]
+                  [--enable-pod-security-policy]
+                  [--enable-private-cluster]
+                  [--enable-rbac]
+                  [--enable-secret-rotation]
+                  [--enable-sgxquotehelper]
+                  [--enable-vmss]
+                  [--fqdn-subdomain]
+                  [--generate-ssh-keys]
+                  [--kubelet-config]
+                  [--kubernetes-version]
+                  [--linux-os-config]
+                  [--load-balancer-idle-timeout]
+                  [--load-balancer-managed-outbound-ip-count]
+                  [--load-balancer-outbound-ip-prefixes]
+                  [--load-balancer-outbound-ips]
+                  [--load-balancer-outbound-ports]
+                  [--load-balancer-sku]
+                  [--location]
+                  [--max-count]
+                  [--max-pods]
+                  [--min-count]
+                  [--network-plugin {azure, kubenet}]
+                  [--network-policy]
+                  [--no-ssh-key]
+                  [--no-wait]
+                  [--node-count]
+                  [--node-osdisk-diskencryptionset-id]
+                  [--node-osdisk-size]
+                  [--node-osdisk-type]
+                  [--node-public-ip-prefix-id]
+                  [--node-resource-group]
+                  [--node-vm-size]
+                  [--node-zones {1, 2, 3}]
+                  [--nodepool-labels]
+                  [--nodepool-name]
+                  [--nodepool-tags]
+                  [--os-sku]
+                  [--outbound-type {loadBalancer, userDefinedRouting}]
+                  [--pod-cidr]
+                  [--pod-subnet-id]
+                  [--ppg]
+                  [--private-dns-zone]
+                  [--service-cidr]
+                  [--service-principal]
+                  [--skip-subnet-role-assignment]
+                  [--ssh-key-value]
+                  [--tags]
+                  [--uptime-sla]
+                  [--vm-set-type]
+                  [--vnet-subnet-id]
+                  [--windows-admin-password]
+                  [--windows-admin-username]
+                  [--workspace-resource-id]
+                  [--yes]
+  examples:
+  - summary: Create a Kubernetes cluster with an existing SSH public key.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
+  - summary: Create a Kubernetes cluster with a specific version.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9
+  - summary: Create a Kubernetes cluster with a larger node pool.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-count 7
+  - summary: Create a kubernetes cluster with cluster autosclaler enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --node-count 3 --enable-cluster-autoscaler --min-count 1 --max-count 5
+  - summary: Create a kubernetes cluster with k8s 1.13.9 but use vmas.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --vm-set-type AvailabilitySet
+  - summary: Create a kubernetes cluster with default kubernetes vesrion, default SKU load balancer(standard) and default vm set type(VirtualMachineScaleSets).
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster
+  - summary: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
+  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
+  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
+  - summary: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
+  - summary: Create a kubernetes cluster with basic SKU load balancer and AvailabilitySet vm set type.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku basic --vm-set-type AvailabilitySet
+  - summary: Create a kubernetes cluster with authorized apiserver IP ranges.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24,195.168.1.0
+  - summary: Create a kubernetes cluster with server side encryption using your owned key.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-diskencryptionset-id <disk-encryption-set-resource-id>
+  - summary: Create a kubernetes cluster with userDefinedRouting, standard load balancer SKU and a custom subnet preconfigured with a route table
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --outbound-type userDefinedRouting --load-balancer-sku standard --vnet-subnet-id customUserSubnetVnetID
+  - summary: Create a kubernetes cluster with supporting Windows agent pools with AHUB enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku Standard --network-plugin azure --windows-admin-username azure --windows-admin-password 'replacePassword1234$' --enable-ahub
+  - summary: Create a kubernetes cluster with managed AAD enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Create a kubernetes cluster with ephemeral os enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-type Ephemeral --node-osdisk-size 48
+  - summary: Create a kubernetes cluster with custom tags
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --tags "foo=bar" "baz=qux"
+  - summary: Create a kubernetes cluster with EncryptionAtHost enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-encryption-at-host
+  - summary: Create a kubernetes cluster with custom control plane identity and kubelet identity.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --assign-identity <control-plane-identity-resource-id> --assign-kubelet-identity <kubelet-identity-resource-id>
+  - summary: Create a kubernetes cluster with Azure RBAC enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --enable-azure-rbac
+  - summary: Create a kubernetes cluster with a specific os-sku
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --os-sku Ubuntu
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-admin-group-object-ids
+    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
+    description: ''
+  - name: --aad-client-app-id
+    summary: The ID of an Azure Active Directory client application of type "Native". This application is for user login via kubectl.
+    description: ''
+  - name: --aad-server-app-id
+    summary: The ID of an Azure Active Directory server application of type "Web app/API". This application represents the managed cluster's apiserver (Server application).
+    description: ''
+  - name: --aad-server-app-secret
+    summary: The secret of an Azure Active Directory server application.
+    description: ''
+  - name: --aad-tenant-id
+    summary: The ID of an Azure Active Directory tenant.
+    description: ''
+  - name: --aci-subnet-name
+    summary: The name of a subnet in an existing VNet into which to deploy the virtual nodes.
+    description: ''
+  - name: --admin-username -u
+    defaultValue: azureuser
+    summary: User account to create on node VMs for SSH access.
+    description: ''
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --api-server-authorized-ip-ranges
+    summary: Comma seperated list of authorized apiserver IP ranges. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
+    description: ''
+  - name: --appgw-id
+    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-name
+    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-cidr
+    summary: Subnet CIDR to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-id
+    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-prefix
+    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-watch-namespace
+    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
+    description: ''
+  - name: --assign-identity
+    summary: Specify an existing user assigned identity to manage cluster resource group.
+    description: ''
+  - name: --assign-kubelet-identity
+    summary: Specify an existing user assigned identity for kubelet's usage, which is typically used to pull image from ACR.
+    description: ''
+  - name: --attach-acr
+    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --auto-upgrade-channel
+    parameterValueGroup: node-image, none, patch, rapid, stable
+    summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade.
+    description: ''
+  - name: --client-secret
+    summary: Secret associated with the service principal. This argument is required if `--service-principal` is specified.
+    description: ''
+  - name: --cluster-autoscaler-profile
+    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
+    description: ''
+  - name: --disable-local-accounts
+    summary: (Preview) If set to true, getting static credential will be disabled for this cluster.
+    description: ''
+  - name: --disable-rbac
+    summary: Disable Kubernetes Role-Based Access Control.
+    description: ''
+  - name: --dns-name-prefix -p
+    summary: Prefix for hostnames that are created. If not specified, generate a hostname using the managed cluster and resource group names.
+    description: ''
+  - name: --dns-service-ip
+    summary: An IP address assigned to the Kubernetes DNS service.
+    description: This address must be within the Kubernetes service address range specified by "--service-cidr". For example, 10.0.0.10.
+  - name: --docker-bridge-address
+    summary: A specific IP address and netmask for the Docker bridge, using standard CIDR notation.
+    description: This address must not be in any Subnet IP ranges, or the Kubernetes service address range. For example, 172.17.0.1/16.
+  - name: --enable-aad
+    summary: Enable managed AAD feature for cluster.
+    description: ''
+  - name: --enable-addons -a
+    summary: Enable the Kubernetes addons in a comma-separated list.
+    description: >-
+      These addons are available:
+          http_application_routing        - configure ingress with automatic public DNS name creation.
+          monitoring                      - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
+                                            If monitoring addon is enabled --no-wait argument will have no effect
+          virtual-node                    - enable AKS Virtual Node. Requires --aci-subnet-name to provide the name of an existing subnet for the Virtual Node to use.
+                                            aci-subnet-name must be in the same vnet which is specified by --vnet-subnet-id (required as well).
+          azure-policy                    - enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
+                                            Learn more at aka.ms/aks/policy.
+          ingress-appgw                   - enable Application Gateway Ingress Controller addon (PREVIEW).
+          confcom                         - enable confcom addon, this will enable SGX device plugin by default(PREVIEW).
+          open-service-mesh               - enable Open Service Mesh addon (PREVIEW).
+          gitops                          - enable GitOps (PREVIEW).
+          azure-keyvault-secrets-provider - enable Azure Keyvault Secrets Provider addon (PREVIEW).
+          azure-defender                  - enable Azure Defender addon (PREVIEW).
+  - name: --enable-ahub
+    summary: Enable Azure Hybrid User Benefits (AHUB) for Windows VMs.
+    description: ''
+  - name: --enable-azure-rbac
+    summary: Enable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --enable-cluster-autoscaler
+    summary: Enable cluster autoscaler, default value is false.
+    description: If specified, please make sure the kubernetes version is larger than 1.10.6.
+  - name: --enable-encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable EncryptionAtHost on agent node pool.
+    description: ''
+  - name: --enable-fips-image
+    summary: Use FIPS-enabled OS on agent nodes.
+    description: ''
+  - name: --enable-managed-identity
+    defaultValue: "1"
+    summary: Using managed identity to manage cluster resource group. Default value is true, you can explicitly specify "--client-id" and "--secret" to disable managed identity.
+    description: ''
+  - name: --enable-node-public-ip
+    summary: Enable VMSS node public IP.
+    description: ''
+  - name: --enable-pod-identity
+    summary: (PREVIEW) Enable pod identity addon.
+    description: ''
+  - name: --enable-pod-identity-with-kubenet
+    summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin.
+    description: ''
+  - name: --enable-pod-security-policy
+    summary: (PREVIEW) Enable pod security policy.
+    description: ''
+  - name: --enable-private-cluster
+    summary: Enable private cluster.
+    description: ''
+  - name: --enable-rbac -r
+    summary: 'Enable Kubernetes Role-Based Access Control. Default: enabled.'
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-sgxquotehelper
+    summary: Enable SGX quote helper for confcom addon.
+    description: ''
+  - name: --enable-vmss
+    summary: To be deprecated. Use vm_set_type instead.
+    description: ''
+  - name: --fqdn-subdomain
+    summary: Prefix for FQDN that is created for private cluster with custom private dns zone scenario.
+    description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing.
+    description: ''
+  - name: --kubelet-config
+    summary: Kubelet configurations for agent nodes.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
+    description: ''
+    valueFrom: '`az aks get-versions`'
+  - name: --linux-os-config
+    summary: OS configurations for Linux agent nodes.
+    description: ''
+  - name: --load-balancer-idle-timeout
+    summary: Load balancer idle timeout in minutes.
+    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --load-balancer-managed-outbound-ip-count
+    summary: Load balancer managed outbound IP count.
+    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ip-prefixes
+    summary: Load balancer outbound IP prefix resource IDs.
+    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ips
+    summary: Load balancer outbound IP resource IDs.
+    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ports
+    summary: Load balancer outbound allocated ports.
+    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
+  - name: --load-balancer-sku
+    summary: Azure Load Balancer SKU selection for your cluster. basic or standard.
+    description: Select between Basic or Standard Azure Load Balancer SKU for your AKS cluster.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-pods -m
+    summary: The maximum number of pods deployable to a node.
+    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --network-plugin
+    parameterValueGroup: azure, kubenet
+    summary: The Kubernetes network plugin to use.
+    description: Specify "azure" for advanced networking configurations. Defaults to "kubenet".
+  - name: --network-policy
+    summary: (PREVIEW) The Kubernetes network policy to use.
+    description: >-
+      Using together with "azure" network plugin.
+
+      Specify "azure" for Azure network policy manager and "calico" for calico network policy controller.
+
+      Defaults to "" (network policy disabled).
+  - name: --no-ssh-key -x
+    summary: Do not use or create a local SSH key.
+    description: To access nodes after creating a cluster with this option, use the Azure Portal.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes node pool. It is required when --enable-cluster-autoscaler specified. After creating a cluster, you can change the size of its node pool with `az aks scale`.
+    description: ''
+  - name: --node-osdisk-diskencryptionset-id
+    summary: ResourceId of the disk encryption set to use for enabling encryption at rest.
+    description: ''
+  - name: --node-osdisk-size
+    summary: Size in GB of the OS disk for each node in the node pool. Minimum 30 GB.
+    description: ''
+  - name: --node-osdisk-type
+    summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Managed'. May not be changed for this pool after creation.
+    description: ''
+  - name: --node-public-ip-prefix-id
+    summary: Public IP prefix ID used to assign public IPs to VMSS nodes.
+    description: ''
+  - name: --node-resource-group
+    summary: The node resource group is the resource group where all customer's resources will be created in, such as virtual machines.
+    description: ''
+  - name: --node-vm-size -s
+    defaultValue: Standard_DS2_v2
+    summary: Size of Virtual Machines to create as Kubernetes nodes.
+    description: ''
+  - name: --node-zones --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: (--node-zones will be deprecated, use --zones) Space-separated list of availability zones where agent nodes will be placed.
+    description: ''
+  - name: --nodepool-labels
+    summary: 'Space-separated labels: key[=value] [key[=value] ...]. You can not change the node labels through CLI after creation. See https://aka.ms/node-labels for syntax of labels.'
+    description: ''
+  - name: --nodepool-name
+    defaultValue: nodepool1
+    summary: Node pool name, upto 12 alphanumeric characters.
+    description: ''
+  - name: --nodepool-tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --os-sku
+    summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+    description: ''
+  - name: --outbound-type
+    parameterValueGroup: loadBalancer, userDefinedRouting
+    summary: How outbound traffic will be configured for a cluster.
+    description: Select between loadBalancer and userDefinedRouting. If not set, defaults to type loadBalancer. Requires --vnet-subnet-id to be provided with a preconfigured route table and --load-balancer-sku to be Standard.
+  - name: --pod-cidr
+    summary: A CIDR notation IP range from which to assign pod IPs when kubenet is used.
+    description: This range must not overlap with any Subnet IP ranges. For example, 172.244.0.0/16.
+  - name: --pod-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    description: ''
+  - name: --ppg
+    summary: The ID of a PPG.
+    description: ''
+  - name: --private-dns-zone
+    summary: Private dns zone mode for private cluster. "none" mode is in preview.
+    description: Allowed values are "system", "none" (Preview) or your custom private dns zone resource id. If not set, defaults to type system. Requires --enable-private-cluster to be used.
+  - name: --service-cidr
+    summary: A CIDR notation IP range from which to assign service cluster IPs.
+    description: This range must not overlap with any Subnet IP ranges. For example, 10.0.0.0/16.
+  - name: --service-principal
+    summary: Service principal used for authentication to Azure APIs.
+    description: If not specified, a new service principal is created and cached at $HOME.azureaksServicePrincipal.json to be used by subsequent `az aks` commands.
+  - name: --skip-subnet-role-assignment
+    summary: Skip role assignment for subnet (advanced networking).
+    description: If specified, please make sure your service principal has the access to your subnet.
+  - name: --ssh-key-value
+    defaultValue: ~\.ssh\id_rsa.pub
+    summary: Public key path or key contents to install on node VMs for SSH access. For example, 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'.
+    description: ''
+  - name: --tags
+    summary: The tags of the managed cluster. The managed cluster instance and all resources managed by the cloud provider will be tagged.
+    description: ''
+  - name: --uptime-sla
+    summary: Enable a paid managed cluster service with a financially backed SLA.
+    description: ''
+  - name: --vm-set-type
+    summary: Agent pool vm set type. VirtualMachineScaleSets or AvailabilitySet.
+    description: ''
+  - name: --vnet-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+    description: ''
+  - name: --windows-admin-password
+    summary: User account password to use on windows node VMs.
+    description: >-
+      Rules for windows-admin-password:
+          - Minimum-length: 14 characters
+          - Max-length: 123 characters
+          - Complexity requirements: 3 out of 4 conditions below need to be fulfilled
+            * Has lower characters
+            * Has upper characters
+            * Has a digit
+            * Has a special character (Regex match [W_])
+          - Disallowed values:  "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminpassword?view=azure-dotnet.
+  - name: --windows-admin-username
+    summary: User account to create on windows node VMs.
+    description: >-
+      Rules for windows-admin-username:
+          - restriction: Cannot end in "."
+          - Disallowed values: "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5".
+          - Minimum-length: 1 character
+          - Max-length: 20 characters
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminusername?view=azure-dotnet.
+  - name: --workspace-resource-id
+    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data. If not specified, uses the default Log Analytics Workspace if it exists, otherwise creates one.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_disable-addons
+  name: az aks disable-addons
+  summary: Disable Kubernetes addons.
+  description: ''
+  syntax: >-
+    az aks disable-addons --addons
+                          --name
+                          --resource-group
+                          [--no-wait]
+  examples:
+  - summary: Disable Kubernetes addons. (autogenerated)
+    syntax: az aks disable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --addons -a
+    summary: Disable the Kubernetes addons in a comma-separated list.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_enable-addons
+  name: az aks enable-addons
+  summary: Enable Kubernetes addons.
+  description: >-
+    These addons are available:
+        http_application_routing        - configure ingress with automatic public DNS name creation.
+        monitoring                      - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
+                                          If monitoring addon is enabled --no-wait argument will have no effect
+        virtual-node                    - enable AKS Virtual Node. Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
+        azure-policy                    - enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
+                                          Learn more at aka.ms/aks/policy.
+        ingress-appgw                   - enable Application Gateway Ingress Controller addon (PREVIEW).
+        open-service-mesh               - enable Open Service Mesh addon (PREVIEW).
+        gitops                          - enable GitOps (PREVIEW).
+        azure-keyvault-secrets-provider - enable Azure Keyvault Secrets Provider addon (PREVIEW).
+        azure-defender                  - enable Azure Defender addon (PREVIEW).
+  syntax: >-
+    az aks enable-addons --addons
+                         --name
+                         --resource-group
+                         [--appgw-id]
+                         [--appgw-name]
+                         [--appgw-subnet-cidr]
+                         [--appgw-subnet-id]
+                         [--appgw-subnet-prefix]
+                         [--appgw-watch-namespace]
+                         [--enable-secret-rotation]
+                         [--enable-sgxquotehelper]
+                         [--no-wait]
+                         [--subnet-name]
+                         [--workspace-resource-id]
+  examples:
+  - summary: Enable Kubernetes addons. (autogenerated)
+    syntax: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet-name VirtualNodeSubnet
+  - summary: Enable ingress-appgw addon with subnet prefix.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-cidr 10.2.0.0/16 --appgw-name gateway
+  - summary: Enable open-service-mesh addon.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons open-service-mesh
+  - summary: Enable azure-defender addon with workspace resourceId.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons azure-defender --workspace-resource-id WorkspaceResourceId
+  requiredParameters:
+  - isRequired: true
+    name: --addons -a
+    summary: Enable the Kubernetes addons in a comma-separated list.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --appgw-id
+    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-name
+    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-cidr
+    summary: Subnet CIDR to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-id
+    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-prefix
+    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-watch-namespace
+    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces. Use with ingress-azure addon.
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-sgxquotehelper
+    summary: Enable SGX quote helper for confcom addon.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subnet-name -s
+    summary: The subnet name for the virtual node to use.
+    description: ''
+  - name: --workspace-resource-id
+    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data.
+    description: ''
+- uid: az_aks_get-credentials
+  name: az aks get-credentials
+  summary: Get access credentials for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks get-credentials --name
+                           --resource-group
+                           [--admin]
+                           [--context]
+                           [--file]
+                           [--overwrite-existing]
+                           [--user]
+  examples:
+  - summary: Get access credentials for a managed Kubernetes cluster. (autogenerated)
+    syntax: az aks get-credentials --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin -a
+    summary: 'Get cluster administrator credentials.  Default: cluster user credentials.'
+    description: ''
+  - name: --context
+    summary: If specified, overwrite the default context name.
+    description: ''
+  - name: --file -f
+    defaultValue: ~/.kube/config
+    summary: Kubernetes configuration file to update. Use "-" to print YAML to stdout instead.
+    description: ''
+  - name: --overwrite-existing
+    summary: Overwrite any existing cluster entry with the same name.
+    description: ''
+  - name: --user -u
+    defaultValue: clusterUser
+    summary: 'Get credentials for the user. Only valid when --admin is False.  Default: cluster user credentials.'
+    description: ''
+- uid: az_aks_get-os-options
+  name: az aks get-os-options
+  summary: Get the OS options available for creating a managed Kubernetes cluster.
+  description: ''
+  syntax: az aks get-os-options --location
+  examples:
+  - summary: Get the OS options available for creating a managed Kubernetes cluster
+    syntax: az aks get-os-options --location westus2
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_aks_get-upgrades
+  name: az aks get-upgrades
+  summary: Get the upgrade versions available for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks get-upgrades --name
+                        --resource-group
+  examples:
+  - summary: Get the upgrade versions available for a managed Kubernetes cluster
+    syntax: az aks get-upgrades --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_get-versions
+  name: az aks get-versions
+  summary: Get the versions available for creating a managed Kubernetes cluster.
+  description: ''
+  syntax: az aks get-versions --location
+  examples:
+  - summary: Get the versions available for creating a managed Kubernetes cluster
+    syntax: az aks get-versions --location westus2
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_aks_kanalyze
+  name: az aks kanalyze
+  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
+  description: ''
+  syntax: >-
+    az aks kanalyze --name
+                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_kollect
+  name: az aks kollect
+  summary: Collecting diagnostic information for the Kubernetes cluster.
+  description: >-
+    Collect diagnostic information for the Kubernetes cluster and store it in the specified storage account.
+
+    You can provide the storage account in three ways:
+      storage account name and a shared access signature with write permission.
+      resource Id to a storage account you own.
+      the storagea account in diagnostics settings for your managed cluster.
+  syntax: >-
+    az aks kollect --name
+                   --resource-group
+                   [--container-logs]
+                   [--kube-objects]
+                   [--node-logs]
+                   [--sas-token]
+                   [--storage-account]
+  examples:
+  - summary: using storage account name and a shared access signature token with write permission
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account MyStorageAccount --sas-token "MySasToken"
+  - summary: using the resource id of a storagea account resource you own.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account "MyStoreageAccountResourceId"
+  - summary: using the storagea account in diagnostics settings for your managed cluster.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster
+  - summary: customize the container logs to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --container-logs "mynamespace1/mypod1 myns2"
+  - summary: customize the kubernetes objects to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --kube-objects "mynamespace1/service myns2/deployment/deployment1"
+  - summary: customize the node log files to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --node-logs "/var/log/azure-vnet.log /var/log/azure-vnet-ipam.log"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container-logs
+    summary: The list of container logs to collect.
+    description: >-
+      The list of container logs to collect. Its value can be either all containers
+
+      in a namespace, for example, kube-system, or a specific container in a
+
+      namespace, for example, kube-system/tunnelfront.
+  - name: --kube-objects
+    summary: The list of kubernetes objects to describe.
+    description: >-
+      The list of kubernetes objects to describe. Its value can be either all objects of a type
+
+      in a namespace, for example, kube-system/pod, or a specific object of a type in a namespace,
+
+      for example, kube-system/deployment/tunnelfront.
+  - name: --node-logs
+    summary: The list of node logs to collect. For example, /var/log/cloud-init.log.
+    description: ''
+  - name: --sas-token
+    summary: The SAS token with writable permission for the storage account.
+    description: ''
+  - name: --storage-account
+    summary: Name or ID of the storage account to save the diagnostic information.
+    description: ''
+- uid: az_aks_rotate-certs
+  name: az aks rotate-certs
+  summary: Rotate certificates and keys on a managed Kubernetes cluster.
+  description: Kubernetes will be unavailable during cluster certificate rotation.
+  syntax: >-
+    az aks rotate-certs --name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_scale
+  name: az aks scale
+  summary: Scale the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks scale --name
+                 --node-count
+                 --resource-group
+                 [--no-wait]
+                 [--nodepool-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --node-count -c
+    summary: Number of nodes in the Kubernetes node pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --nodepool-name
+    summary: Node pool name, upto 12 alphanumeric characters.
+    description: ''
+- uid: az_aks_show
+  name: az aks show
+  summary: Show the details for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks show --name
+                --resource-group
+  examples:
+  - summary: Show the details for a managed Kubernetes cluster
+    syntax: az aks show --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_start
+  name: az aks start
+  summary: Start Managed Cluster.
+  description: Starts a Stopped Managed Cluster.
+  syntax: >-
+    az aks start --name
+                 --resource-group
+                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_stop
+  name: az aks stop
+  summary: Stop Managed Cluster.
+  description: Stops a Running Managed Cluster.
+  syntax: >-
+    az aks stop --name
+                --resource-group
+                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_update
+  name: az aks update
+  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
+  description: ''
+  syntax: >-
+    az aks update --name
+                  --resource-group
+                  [--aad-admin-group-object-ids]
+                  [--aad-tenant-id]
+                  [--aks-custom-headers]
+                  [--api-server-authorized-ip-ranges]
+                  [--assign-identity]
+                  [--attach-acr]
+                  [--auto-upgrade-channel {node-image, none, patch, rapid, stable}]
+                  [--cluster-autoscaler-profile]
+                  [--detach-acr]
+                  [--disable-ahub]
+                  [--disable-azure-rbac]
+                  [--disable-cluster-autoscaler]
+                  [--disable-local-accounts]
+                  [--disable-pod-identity]
+                  [--disable-pod-security-policy]
+                  [--disable-secret-rotation]
+                  [--enable-aad]
+                  [--enable-ahub]
+                  [--enable-azure-rbac]
+                  [--enable-cluster-autoscaler]
+                  [--enable-local-accounts]
+                  [--enable-managed-identity]
+                  [--enable-pod-identity]
+                  [--enable-pod-identity-with-kubenet]
+                  [--enable-pod-security-policy]
+                  [--enable-secret-rotation]
+                  [--load-balancer-idle-timeout]
+                  [--load-balancer-managed-outbound-ip-count]
+                  [--load-balancer-outbound-ip-prefixes]
+                  [--load-balancer-outbound-ips]
+                  [--load-balancer-outbound-ports]
+                  [--max-count]
+                  [--min-count]
+                  [--no-uptime-sla]
+                  [--no-wait]
+                  [--tags]
+                  [--update-cluster-autoscaler]
+                  [--uptime-sla]
+                  [--windows-admin-password]
+                  [--yes]
+  examples:
+  - summary: Enable cluster-autoscaler within node count range [1,5]
+    syntax: az aks update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n MyManagedCluster
+  - summary: Disable cluster-autoscaler for an existing cluster
+    syntax: az aks update --disable-cluster-autoscaler -g MyResourceGroup -n MyManagedCluster
+  - summary: Update min-count or max-count for cluster autoscaler.
+    syntax: az aks update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n MyManagedCluster
+  - summary: Enable pod security policy.
+    syntax: az aks update --enable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
+  - summary: Disable pod security policy.
+    syntax: az aks update --disable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use two AKS created IPs for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
+  - summary: Update a kubernetes cluster with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
+  - summary: Update a kubernetes cluster with authorized apiserver ip ranges.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24
+  - summary: Disable authorized apiserver ip ranges feature for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges ""
+  - summary: Restrict apiserver traffic in a kubernetes cluster to agentpool nodes.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 0.0.0.0/32
+  - summary: Update a AKS-managed AAD cluster with tenant ID or admin group object IDs.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Migrate a AKS AAD-Integrated cluster or a non-AAAAD cluster to a AKS-managed AAD cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Enable Azure Hybrid User Benefits featture for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-ahub
+  - summary: Disable Azure Hybrid User Benefits featture for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-ahub
+  - summary: Update the cluster to use system assigned managed identity in control plane.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-managed-identity
+  - summary: Update the cluster to use user assigned managed identity in control plane.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-managed-identity --assign-identity <user_assigned_identity_resource_id>
+  - summary: Enable pod identity addon.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-pod-identity
+  - summary: Disable pod identity addon.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-pod-identity
+  - summary: Update the tags of a kubernetes cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCLuster --tags "foo=bar" "baz=qux"
+  - summary: Update Windows password of a kubernetes cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCLuster --windows-admin-password "Repl@cePassw0rd12345678"
+  - summary: Update a managed AAD AKS cluster to use Azure RBAC
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-azure-rbac
+  - summary: Disable Azure RBAC in a managed AAD AKS cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-azure-rbac
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-admin-group-object-ids
+    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
+    description: ''
+  - name: --aad-tenant-id
+    summary: The ID of an Azure Active Directory tenant.
+    description: ''
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --api-server-authorized-ip-ranges
+    summary: Comma seperated list of authorized apiserver IP ranges. Set to "" to allow all traffic on a previously restricted cluster. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
+    description: ''
+  - name: --assign-identity
+    summary: (PREVIEW) Specify an existing user assigned identity to manage cluster resource group.
+    description: ''
+  - name: --attach-acr
+    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --auto-upgrade-channel
+    parameterValueGroup: node-image, none, patch, rapid, stable
+    summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade.
+    description: ''
+  - name: --cluster-autoscaler-profile
+    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
+    description: ''
+  - name: --detach-acr
+    summary: Disable the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --disable-ahub
+    summary: Disable Azure Hybrid User Benefits (AHUB) feature for cluster.
+    description: ''
+  - name: --disable-azure-rbac
+    summary: Disable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --disable-cluster-autoscaler -d
+    summary: Disable cluster autoscaler.
+    description: ''
+  - name: --disable-local-accounts
+    summary: (Preview) If set to true, getting static credential will be disabled for this cluster.
+    description: ''
+  - name: --disable-pod-identity
+    summary: (PREVIEW) Disable Pod Identity addon for cluster.
+    description: ''
+  - name: --disable-pod-security-policy
+    summary: (PREVIEW) Disable pod security policy.
+    description: ''
+  - name: --disable-secret-rotation
+    summary: Disable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-aad
+    summary: Enable managed AAD feature for cluster.
+    description: ''
+  - name: --enable-ahub
+    summary: Enable Azure Hybrid User Benefits (AHUB) feature for cluster.
+    description: ''
+  - name: --enable-azure-rbac
+    summary: Enable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --enable-local-accounts
+    summary: (Preview) If set to true, will enable getting static credential for this cluster.
+    description: ''
+  - name: --enable-managed-identity
+    summary: (PREVIEW) Update current cluster to managed identity to manage cluster resource group.
+    description: ''
+  - name: --enable-pod-identity
+    summary: (PREVIEW) Enable Pod Identity addon for cluster.
+    description: ''
+  - name: --enable-pod-identity-with-kubenet
+    summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin.
+    description: ''
+  - name: --enable-pod-security-policy
+    summary: (PREVIEW) Enable pod security policy.
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --load-balancer-idle-timeout
+    summary: Load balancer idle timeout in minutes.
+    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --load-balancer-managed-outbound-ip-count
+    summary: Load balancer managed outbound IP count.
+    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ip-prefixes
+    summary: Load balancer outbound IP prefix resource IDs.
+    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ips
+    summary: Load balancer outbound IP resource IDs.
+    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ports
+    summary: Load balancer outbound allocated ports.
+    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --no-uptime-sla
+    summary: Change a paid managed cluster to a free one.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: The tags of the managed cluster. The managed cluster instance and all resources managed by the cloud provider will be tagged.
+    description: ''
+  - name: --update-cluster-autoscaler -u
+    summary: Update min-count or max-count for cluster autoscaler.
+    description: ''
+  - name: --uptime-sla
+    summary: Enable a paid managed cluster service with a financially backed SLA.
+    description: ''
+  - name: --windows-admin-password
+    summary: User account password to use on windows node VMs.
+    description: >-
+      Rules for windows-admin-password:
+          - Minimum-length: 14 characters
+          - Max-length: 123 characters
+          - Complexity requirements: 3 out of 4 conditions below need to be fulfilled
+            * Has lower characters
+            * Has upper characters
+            * Has a digit
+            * Has a special character (Regex match [W_])
+          - Disallowed values:  "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminpassword?view=azure-dotnet.
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_upgrade
+  name: az aks upgrade
+  summary: Upgrade a managed Kubernetes cluster to a newer version.
+  description: Kubernetes will be unavailable during cluster upgrades.
+  syntax: >-
+    az aks upgrade --name
+                   --resource-group
+                   [--aks-custom-headers]
+                   [--control-plane-only]
+                   [--kubernetes-version]
+                   [--no-wait]
+                   [--node-image-only]
+                   [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --control-plane-only
+    summary: Upgrade the cluster control plane only. If not specified, control plane AND all node pools will be upgraded.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to upgrade the cluster to, such as "1.11.12".
+    description: ''
+    valueFrom: '`az aks get-upgrades`'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-image-only
+    summary: Only upgrade node image for agent pools.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_use-dev-spaces
+  name: az aks use-dev-spaces
+  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks use-dev-spaces --name
+                          --resource-group
+                          [--endpoint {None, Private, Public}]
+                          [--space]
+                          [--update]
+                          [--yes]
+  examples:
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, interactively selecting a dev space.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, updating to the latest Azure Dev Spaces             client components and selecting a new or existing dev space 'my-space'.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks --update --space my-space
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, selecting a new or existing dev space             'develop/my-space' without prompting for confirmation.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks -s develop/my-space -y
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster with a private endpoint.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks -e private
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --endpoint -e
+    defaultValue: Public
+    parameterValueGroup: None, Private, Public
+    summary: The endpoint type to be used for a Azure Dev Spaces controller. See https://aka.ms/azds-networking for more information.
+    description: ''
+  - name: --space -s
+    summary: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
+    description: ''
+  - name: --update
+    summary: Update to the latest Azure Dev Spaces client components.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Requires --space.
+    description: ''
+- uid: az_aks_wait
+  name: az aks wait
+  summary: Wait for a managed Kubernetes cluster to reach a desired state.
+  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
+  syntax: >-
+    az aks wait --name
+                --resource-group
+                [--created]
+                [--custom]
+                [--deleted]
+                [--exists]
+                [--interval]
+                [--timeout]
+                [--updated]
+  examples:
+  - summary: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes.
+    syntax: az aks wait -g MyResourceGroup -n MyManagedCluster --updated --interval 60 --timeout 1800
+  - summary: Wait for a managed Kubernetes cluster to reach a desired state (autogenerated)
+    syntax: az aks wait --created --interval 60 --name MyManagedCluster --resource-group MyResourceGroup --timeout 1800
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_aks_app
+- az_aks_app_up
+- az_aks_browse
+- az_aks_command
+- az_aks_command_invoke
+- az_aks_command_result
+- az_aks_create
+- az_aks_disable-addons
+- az_aks_enable-addons
+- az_aks_get-credentials
+- az_aks_get-os-options
+- az_aks_get-upgrades
+- az_aks_get-versions
+- az_aks_kanalyze
+- az_aks_kollect
+- az_aks_maintenanceconfiguration
+- az_aks_maintenanceconfiguration_add
+- az_aks_maintenanceconfiguration_delete
+- az_aks_maintenanceconfiguration_list
+- az_aks_maintenanceconfiguration_show
+- az_aks_maintenanceconfiguration_update
+- az_aks_nodepool
+- az_aks_nodepool_add
+- az_aks_nodepool_delete
+- az_aks_nodepool_get-upgrades
+- az_aks_nodepool_list
+- az_aks_nodepool_scale
+- az_aks_nodepool_show
+- az_aks_nodepool_update
+- az_aks_nodepool_upgrade
+- az_aks_pod-identity
+- az_aks_pod-identity_add
+- az_aks_pod-identity_delete
+- az_aks_pod-identity_exception
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+- az_aks_pod-identity_list
+- az_aks_rotate-certs
+- az_aks_scale
+- az_aks_show
+- az_aks_start
+- az_aks_stop
+- az_aks_update
+- az_aks_upgrade
+- az_aks_use-dev-spaces
+- az_aks_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Kubernetes Services.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks/app.yml b/2017-03-09-profile/docs-ref-autogen/aks/app.yml
new file mode 100644
index 0000000000..0a759a89e8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks/app.yml
@@ -0,0 +1,59 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_app
+name: az aks app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az aks app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage AKS app.
+description: ''
+directCommands:
+- uid: az_aks_app_up
+  name: az aks app up
+  summary: Deploy to AKS via GitHub actions.
+  description: ''
+  syntax: >-
+    az aks app up [--acr]
+                  [--aks-cluster]
+                  [--branch-name]
+                  [--do-not-wait]
+                  [--port]
+                  [--repository]
+  optionalParameters:
+  - name: --acr
+    summary: Name of the Azure Container Registry to be used for pushing the image.
+    description: ''
+  - name: --aks-cluster
+    summary: Name of the cluster to select for deployment.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --port
+    summary: Port on which your application runs. Default is 8080.
+    description: ''
+  - name: --repository -r
+    summary: GitHub repository URL e.g. https://github.com/azure/azure-cli.
+    description: ''
+commands:
+- az_aks_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage AKS app.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks/command.yml b/2017-03-09-profile/docs-ref-autogen/aks/command.yml
new file mode 100644
index 0000000000..0f5c8907d8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks/command.yml
@@ -0,0 +1,80 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_command
+name: az aks command
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks command** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: See detail usage in 'az aks command invoke', 'az aks command result'.
+description: ''
+directCommands:
+- uid: az_aks_command_invoke
+  name: az aks command invoke
+  summary: Run a shell command (with kubectl, helm) on your aks cluster, support attaching files as well.
+  description: ''
+  syntax: >-
+    az aks command invoke --name
+                          --resource-group
+                          [--command]
+                          [--file]
+                          [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --command -c
+    summary: Command or shell script you want run.
+    description: ''
+  - name: --file -f
+    summary: Files will be used by the command, use '.' to attach the current folder.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_command_result
+  name: az aks command result
+  summary: Fetch result from previously triggered 'aks command invoke'.
+  description: ''
+  syntax: >-
+    az aks command result --name
+                          --resource-group
+                          [--command-id]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --command-id -i
+    summary: CommandId returned from 'aks command invoke'.
+    description: ''
+commands:
+- az_aks_command_invoke
+- az_aks_command_result
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: See detail usage in 'az aks command invoke', 'az aks command result'.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks/maintenanceconfiguration.yml b/2017-03-09-profile/docs-ref-autogen/aks/maintenanceconfiguration.yml
new file mode 100644
index 0000000000..fd69697c85
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks/maintenanceconfiguration.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_maintenanceconfiguration
+name: az aks maintenanceconfiguration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks maintenanceconfiguration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage maintenance configurations in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_maintenanceconfiguration_add
+  name: az aks maintenanceconfiguration add
+  summary: Add a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration add --cluster-name
+                                        --name
+                                        --resource-group
+                                        [--config-file]
+                                        [--start-hour]
+                                        [--weekday]
+  examples:
+  - summary: Add a maintenance configuration with --weekday and --start-hour.
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday  --start-hour 1
+        The maintenance is allowed on Monday 1:00am to 2:00am
+  - summary: Add a maintenance configuration with --weekday.The maintenance is allowd on any time of that day.
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday
+        The maintenance is allowed on Monday.
+  - summary: Add a maintenance configuration with maintenance configuration json file
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --config-file ./test.json
+          The content of json file looks below. It means the maintenance is allowed on UTC time Tuesday 1:00am - 3:00 am and Wednesday 1:00am - 2:00am, 6:00am-7:00am
+          No maintenance is allowed from 2020-11-26T03:00:00Z to 2020-11-30T12:00:00Z and from 2020-12-26T03:00:00Z to 2020-12-26T12:00:00Z even if they are allowed in the above weekly setting
+          {
+                "timeInWeek": [
+                  {
+                    "day": "Tuesday",
+                    "hour_slots": [
+                      1,
+                      2
+                    ]
+                  },
+                  {
+                    "day": "Wednesday",
+                    "hour_slots": [
+                      1,
+                      6
+                    ]
+                  }
+                ],
+                "notAllowedTime": [
+                  {
+                    "start": "2021-11-26T03:00:00Z",
+                    "end": "2021-11-30T12:00:00Z"
+                  },
+                  {
+                    "start": "2021-12-26T03:00:00Z",
+                    "end": "2021-12-26T12:00:00Z"
+                  }
+                ]
+        }
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --config-file
+    summary: The maintenance configuration json file.
+    description: ''
+  - name: --start-hour
+    summary: The start time of 1 hour window which maintenance is allowd. E.g. 1 means it's allowd between 1:00 am and 2:00 am.
+    description: ''
+  - name: --weekday
+    summary: A day in week on which maintenance is allowed. E.g. Monday.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_delete
+  name: az aks maintenanceconfiguration delete
+  summary: Delete a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration delete --cluster-name
+                                           --name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_list
+  name: az aks maintenanceconfiguration list
+  summary: List maintenance configurations in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration list --cluster-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_show
+  name: az aks maintenanceconfiguration show
+  summary: Show the details of a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration show --cluster-name
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_update
+  name: az aks maintenanceconfiguration update
+  summary: Update a maintenance configuration of a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration update --cluster-name
+                                           --name
+                                           --resource-group
+                                           [--config-file]
+                                           [--start-hour]
+                                           [--weekday]
+  examples:
+  - summary: Update a maintenance configuration with --weekday and --start-hour.
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday  --start-hour 1
+        The maintenance is allowed on Monday 1:00am to 2:00am
+  - summary: Update a maintenance configuration with --weekday.The maintenance is allowd on any time of that day.
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday
+        The maintenance is allowed on Monday.
+  - summary: Update a maintenance configuration with maintenance configuration json file
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --config-file ./test.json
+          The content of json file looks below. It means the maintenance is allowed on UTC time Tuesday 1:00am - 3:00 am and Wednesday 1:00am - 2:00am, 6:00am-7:00am
+          No maintenance is allowed from 2020-11-26T03:00:00Z to 2020-11-30T12:00:00Z and from 2020-12-26T03:00:00Z to 2020-12-26T12:00:00Z even if they are allowed in the above weekly setting
+          {
+                "timeInWeek": [
+                  {
+                    "day": "Tuesday",
+                    "hour_slots": [
+                      1,
+                      2
+                    ]
+                  },
+                  {
+                    "day": "Wednesday",
+                    "hour_slots": [
+                      1,
+                      6
+                    ]
+                  }
+                ],
+                "notAllowedTime": [
+                  {
+                    "start": "2021-11-26T03:00:00Z",
+                    "end": "2021-11-30T12:00:00Z"
+                  },
+                  {
+                    "start": "2021-12-26T03:00:00Z",
+                    "end": "2021-12-26T12:00:00Z"
+                  }
+                ]
+        }
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --config-file
+    summary: The maintenance configuration json file.
+    description: ''
+  - name: --start-hour
+    summary: The start time of 1 hour window which maintenance is allowd. E.g. 1 means it's allowd between 1:00 am and 2:00 am.
+    description: ''
+  - name: --weekday
+    summary: A day in week on which maintenance is allowed. E.g. Monday.
+    description: ''
+commands:
+- az_aks_maintenanceconfiguration_add
+- az_aks_maintenanceconfiguration_delete
+- az_aks_maintenanceconfiguration_list
+- az_aks_maintenanceconfiguration_show
+- az_aks_maintenanceconfiguration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage maintenance configurations in managed Kubernetes cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks/nodepool.yml b/2017-03-09-profile/docs-ref-autogen/aks/nodepool.yml
new file mode 100644
index 0000000000..a82717b4b4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks/nodepool.yml
@@ -0,0 +1,424 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_nodepool
+name: az aks nodepool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks nodepool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage node pools in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_nodepool_add
+  name: az aks nodepool add
+  summary: Add a node pool to the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool add --cluster-name
+                        --name
+                        --resource-group
+                        [--aks-custom-headers]
+                        [--enable-cluster-autoscaler]
+                        [--enable-encryption-at-host]
+                        [--enable-fips-image]
+                        [--enable-node-public-ip]
+                        [--eviction-policy {Deallocate, Delete}]
+                        [--kubelet-config]
+                        [--kubernetes-version]
+                        [--labels]
+                        [--linux-os-config]
+                        [--max-count]
+                        [--max-pods]
+                        [--max-surge]
+                        [--min-count]
+                        [--mode {System, User}]
+                        [--no-wait]
+                        [--node-count]
+                        [--node-osdisk-size]
+                        [--node-osdisk-type]
+                        [--node-public-ip-prefix-id]
+                        [--node-taints]
+                        [--node-vm-size]
+                        [--node-zones {1, 2, 3}]
+                        [--os-sku]
+                        [--os-type]
+                        [--pod-subnet-id]
+                        [--ppg]
+                        [--priority {Regular, Spot}]
+                        [--spot-max-price]
+                        [--tags]
+                        [--vnet-subnet-id]
+  examples:
+  - summary: Create a nodepool in an existing AKS cluster with ephemeral os enabled.
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster --node-osdisk-type Ephemeral --node-osdisk-size 48
+  - summary: Create a nodepool with EncryptionAtHost enabled.
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster --enable-encryption-at-host
+  - summary: Create a nodepool cluster with a specific os-sku
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster  --os-sku Ubuntu
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --enable-encryption-at-host
+    summary: Enable EncryptionAtHost on agent node pool.
+    description: ''
+  - name: --enable-fips-image
+    summary: Use FIPS-enabled OS on agent nodes.
+    description: ''
+  - name: --enable-node-public-ip
+    summary: Enable VMSS node public IP.
+    description: ''
+  - name: --eviction-policy
+    defaultValue: Delete
+    parameterValueGroup: Deallocate, Delete
+    summary: The eviction policy of the Spot node pool. It can only be set when --priority is Spot.
+    description: ''
+  - name: --kubelet-config
+    summary: Kubelet configurations for agent nodes.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
+    description: ''
+    valueFrom: '`az aks get-versions`'
+  - name: --labels
+    summary: The node labels for the node pool. You can't change the node labels through CLI after the node pool is created. See https://aka.ms/node-labels for syntax of labels.
+    description: ''
+  - name: --linux-os-config
+    summary: OS configurations for Linux agent nodes.
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-pods -m
+    summary: The maximum number of pods deployable to a node.
+    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --mode
+    defaultValue: User
+    parameterValueGroup: System, User
+    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes agent pool. After creating a cluster, you can change the size of its node pool with `az aks scale`.
+    description: ''
+  - name: --node-osdisk-size
+    summary: Size in GB of the OS disk for each node in the agent pool. Minimum 30 GB.
+    description: ''
+  - name: --node-osdisk-type
+    summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Managed'. May not be changed for this pool after creation.
+    description: ''
+  - name: --node-public-ip-prefix-id
+    summary: Public IP prefix ID used to assign public IPs to VMSS nodes.
+    description: ''
+  - name: --node-taints
+    summary: The node taints for the node pool. You can't change the node taints through CLI after the node pool is created.
+    description: ''
+  - name: --node-vm-size -s
+    summary: Size of Virtual Machines to create as Kubernetes nodes.
+    description: ''
+  - name: --node-zones --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: (will be deprecated, use --zones) Availability zones where agent nodes will be placed.
+    description: ''
+  - name: --os-sku
+    summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+    description: ''
+  - name: --os-type
+    defaultValue: Linux
+    summary: The OS Type. Linux or Windows.
+    description: ''
+  - name: --pod-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    description: ''
+  - name: --ppg
+    summary: The ID of a PPG.
+    description: ''
+  - name: --priority
+    defaultValue: Regular
+    parameterValueGroup: Regular, Spot
+    summary: The priority of the node pool.
+    description: ''
+  - name: --spot-max-price
+    defaultValue: nan
+    summary: It can only be set when --priority is Spot. Specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. It can only include up to 5 decimal places.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+    description: ''
+- uid: az_aks_nodepool_delete
+  name: az aks nodepool delete
+  summary: Delete the agent pool in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool delete --cluster-name
+                           --name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_nodepool_get-upgrades
+  name: az aks nodepool get-upgrades
+  summary: Get the available upgrade versions for an agent pool of the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool get-upgrades --cluster-name
+                                 --nodepool-name
+                                 --resource-group
+  examples:
+  - summary: Get the available upgrade versions for an agent pool of the managed Kubernetes cluster.
+    syntax: az aks nodepool get-upgrades --resource-group MyResourceGroup --cluster-name MyManagedCluster --nodepool-name MyNodePool
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --nodepool-name
+    summary: Name of the node pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_list
+  name: az aks nodepool list
+  summary: List node pools in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool list --cluster-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_scale
+  name: az aks nodepool scale
+  summary: Scale the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool scale --cluster-name
+                          --name
+                          --resource-group
+                          [--no-wait]
+                          [--node-count]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes node pool.
+    description: ''
+- uid: az_aks_nodepool_show
+  name: az aks nodepool show
+  summary: Show the details for a node pool in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool show --cluster-name
+                         --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_update
+  name: az aks nodepool update
+  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
+  description: ''
+  syntax: >-
+    az aks nodepool update --cluster-name
+                           --name
+                           --resource-group
+                           [--disable-cluster-autoscaler]
+                           [--enable-cluster-autoscaler]
+                           [--max-count]
+                           [--max-surge]
+                           [--min-count]
+                           [--mode {System, User}]
+                           [--no-wait]
+                           [--tags]
+                           [--update-cluster-autoscaler]
+  examples:
+  - summary: Enable cluster-autoscaler within node count range [1,5]
+    syntax: az aks nodepool update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Disable cluster-autoscaler for an existing cluster
+    syntax: az aks nodepool update --disable-cluster-autoscaler -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Update min-count or max-count for cluster autoscaler.
+    syntax: az aks nodepool update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Change a node pool to system mode
+    syntax: az aks nodepool update --mode System -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disable-cluster-autoscaler -d
+    summary: Disable cluster autoscaler.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --mode
+    parameterValueGroup: System, User
+    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --update-cluster-autoscaler -u
+    summary: Update min-count or max-count for cluster autoscaler.
+    description: ''
+- uid: az_aks_nodepool_upgrade
+  name: az aks nodepool upgrade
+  summary: Upgrade the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool upgrade --cluster-name
+                            --name
+                            --resource-group
+                            [--kubernetes-version]
+                            [--max-surge]
+                            [--no-wait]
+                            [--node-image-only]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to upgrade the node pool to, such as "1.11.12".
+    description: ''
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-image-only
+    summary: Only upgrade agent pool's node image.
+    description: ''
+commands:
+- az_aks_nodepool_add
+- az_aks_nodepool_delete
+- az_aks_nodepool_get-upgrades
+- az_aks_nodepool_list
+- az_aks_nodepool_scale
+- az_aks_nodepool_show
+- az_aks_nodepool_update
+- az_aks_nodepool_upgrade
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage node pools in managed Kubernetes cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks/pod-identity.yml b/2017-03-09-profile/docs-ref-autogen/aks/pod-identity.yml
new file mode 100644
index 0000000000..f26eabfbd7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks/pod-identity.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_pod-identity
+name: az aks pod-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks pod-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage pod identities in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_pod-identity_add
+  name: az aks pod-identity add
+  summary: Add a pod identity to a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity add --cluster-name
+                            --identity-resource-id
+                            --namespace
+                            --resource-group
+                            [--binding-selector]
+                            [--name]
+  examples:
+  - summary: Add pod identity
+    syntax: az aks pod-identity add --cluster-name MyManagedCluster --resource-group MyResourceGroup --namespace my-namespace --name my-identity --identity-resource-id <my-identity-resource-id>
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --identity-resource-id
+    summary: Resource id of the identity to use.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --binding-selector
+    summary: Optional binding selector to use.
+    description: ''
+  - name: --name -n
+    summary: The pod identity name. Generate if not specified.
+    description: ''
+- uid: az_aks_pod-identity_delete
+  name: az aks pod-identity delete
+  summary: Remove a pod identity from a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity delete --cluster-name
+                               --name
+                               --namespace
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity name.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_list
+  name: az aks pod-identity list
+  summary: List pod identities in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity list --cluster-name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_aks_pod-identity_add
+- az_aks_pod-identity_delete
+- az_aks_pod-identity_exception
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+- az_aks_pod-identity_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage pod identities in managed Kubernetes cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/aks/pod-identity/exception.yml b/2017-03-09-profile/docs-ref-autogen/aks/pod-identity/exception.yml
new file mode 100644
index 0000000000..70b2724367
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/aks/pod-identity/exception.yml
@@ -0,0 +1,136 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_pod-identity_exception
+name: az aks pod-identity exception
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks pod-identity exception** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage pod identity exceptions in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_pod-identity_exception_add
+  name: az aks pod-identity exception add
+  summary: Add a pod identity exception to a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception add --cluster-name
+                                      --namespace
+                                      --pod-labels
+                                      --resource-group
+                                      [--name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace.
+    description: ''
+  - isRequired: true
+    name: --pod-labels
+    summary: 'Space-separated labels: key=value [key=value ...].'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The pod identity exception name. Generate if not specified.
+    description: ''
+- uid: az_aks_pod-identity_exception_delete
+  name: az aks pod-identity exception delete
+  summary: Remove a pod identity exception from a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception delete --cluster-name
+                                         --name
+                                         --namespace
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity exception name to remove.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace to remove.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_exception_list
+  name: az aks pod-identity exception list
+  summary: List pod identity exceptions in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception list --cluster-name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_exception_update
+  name: az aks pod-identity exception update
+  summary: Update a pod identity exception in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception update --cluster-name
+                                         --name
+                                         --namespace
+                                         --pod-labels
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity exception name to remove.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace to remove.
+    description: ''
+  - isRequired: true
+    name: --pod-labels
+    summary: Pod labels in key=value [key=value ...].
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage pod identity exceptions in managed Kubernetes cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/alias.yml b/2017-03-09-profile/docs-ref-autogen/alias.yml
new file mode 100644
index 0000000000..06dd5690c2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/alias.yml
@@ -0,0 +1,117 @@
+### YamlMime:AzureCLIGroup
+uid: az_alias
+name: az alias
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alias** extension for Azure CLI and requires version 2.0.31.dev0 or higher.  The extension will automatically install the first time you run an **az alias** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure CLI Aliases.
+description: ''
+directCommands:
+- uid: az_alias_create
+  name: az alias create
+  summary: Create an alias.
+  description: ''
+  syntax: >-
+    az alias create --command
+                    --name
+  examples:
+  - summary: Create simple alias commands.
+    syntax: >-
+      az alias create --name rg --command group
+
+
+      az alias create --name ls --command list
+  - summary: Create a complex alias.
+    syntax: az alias create --name list-vm --command 'vm list --resource-group myResourceGroup'
+  - summary: Create an alias command with arguments.
+    syntax: >-
+      az alias create --name 'list-vm {{ resource_group }}' \
+        --command 'vm list --resource-group {{ resource_group }}'
+  - summary: Process arguments using Jinja2 templates.
+    syntax: >-
+      az alias create --name 'storage-ls {{ url }}' \
+        --command 'storage blob list
+          --account-name {{ url.replace("https://", "").split(".")[0] }}
+          --container-name {{ url.replace("https://", "").split("/")[1] }}'
+  requiredParameters:
+  - isRequired: true
+    name: --command -c
+    summary: The command that the alias points to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the alias.
+    description: ''
+- uid: az_alias_export
+  name: az alias export
+  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
+  description: ''
+  syntax: >-
+    az alias export [--exclude]
+                    [--path]
+  optionalParameters:
+  - name: --exclude -e
+    summary: Space-separated aliases excluded from export.
+    description: ''
+  - name: --path -p
+    summary: The path of the alias configuration file to export to.
+    description: ''
+- uid: az_alias_import
+  name: az alias import
+  summary: Import aliases from an INI configuration file or an URL.
+  description: ''
+  syntax: az alias import --source
+  requiredParameters:
+  - isRequired: true
+    name: --source -s
+    summary: The source of the aliases to import from.
+    description: ''
+- uid: az_alias_list
+  name: az alias list
+  summary: List the registered aliases.
+  description: ''
+  syntax: az alias list
+- uid: az_alias_remove
+  name: az alias remove
+  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
+  description: ''
+  syntax: az alias remove --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Space-separated aliases.
+    description: ''
+- uid: az_alias_remove-all
+  name: az alias remove-all
+  summary: Remove all registered aliases.
+  description: ''
+  syntax: az alias remove-all [--yes]
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+commands:
+- az_alias_create
+- az_alias_export
+- az_alias_import
+- az_alias_list
+- az_alias_remove
+- az_alias_remove-all
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure CLI Aliases.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig.yml b/2017-03-09-profile/docs-ref-autogen/appconfig.yml
index 1364e0e032..a01c1ea135 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig.yml
@@ -1,176 +1,173 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig
-  name: az appconfig
-  summary: Manage App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_create
-  - az_appconfig_delete
-  - az_appconfig_list
-  - az_appconfig_show
-  - az_appconfig_update
+### YamlMime:AzureCLIGroup
+uid: az_appconfig
+name: az appconfig
+summary: Manage App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_create
   name: az appconfig create
   summary: Create an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig create --location
+                        --name
+                        --resource-group
+                        [--assign-identity]
+                        [--enable-public-network {false, true}]
+                        [--sku {Free, Standard}]
+                        [--subscription]
   examples:
   - summary: Create an App Configuration with name, location, sku and resource group.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
   - summary: Create an App Configuration with name, location, sku and resource group with system assigned identity.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
   - summary: Create an App Configuration with name, location, sku and resource group with user assigned identity.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
-  parameters:
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
+  - summary: Create an App Configuration with name, location and resource group and enable public network access.
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --enable-public-network
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: free, standard
-    summary: The sku of App Configuration.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified.
+    summary: Space-separated list of managed identities to be assigned. Use "[system]" to refer to system-assigned managed identity or a resource ID to refer to user-assigned managed identity. If this argument is provided without any value, system-assigned managed identity will be assigned by default. If this argument is not provided, no managed identities will be assigned to this App Configuration store.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: When true, requests coming from public networks have permission to access this store while private endpoint is enabled. When false, only requests made through Private Links can reach this store.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    parameterValueGroup: Free, Standard
+    summary: The sku of App Configuration.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_delete
   name: az appconfig delete
   summary: Delete an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig delete --name
+                        [--resource-group]
+                        [--subscription]
+                        [--yes]
   examples:
   - summary: Delete an App Configuration under resource group
-    syntax:
-      content: az appconfig delete -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig delete -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_list
   name: az appconfig list
   summary: Lists all App Configurations under the current subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig list [--query-examples]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: List all App Configurations under a resource group
-    syntax:
-      content: az appconfig list -g MyResourceGroup
-  parameters:
+    syntax: az appconfig list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_show
   name: az appconfig show
   summary: Show properties of an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig show --name
+                      [--query-examples]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: Show properties of an App Configuration
-    syntax:
-      content: az appconfig show -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig show -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_update
   name: az appconfig update
   summary: Update an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig update --name
+                        [--enable-public-network {false, true}]
+                        [--encryption-key-name]
+                        [--encryption-key-vault]
+                        [--encryption-key-version]
+                        [--identity-client-id]
+                        [--resource-group]
+                        [--sku {Free, Standard}]
+                        [--subscription]
+                        [--tags]
   examples:
   - summary: Update tags of an App Configuration
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
   - summary: Upgrade sku of an App Configuration to standard
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
   - summary: Enable customer encryption key with system assigned identity
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name myKey --encryption-key-version keyVersion --encryption-key-vault https://keyVaultName.vault.azure.net
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name myKey --encryption-key-version keyVersion --encryption-key-vault https://keyVaultName.vault.azure.net
   - summary: Remove customer encryption key
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name ""
-  parameters:
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name ""
+  - summary: Update an App Configuration to enable public network access.
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --enable-public-network true
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --sku
-    parameterValueGroup: free, standard
-    summary: The sku of App Configuration.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  optionalParameters:
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: When true, requests coming from public networks have permission to access this store while private endpoint is enabled. When false, only requests made through Private Links can reach this store.
     description: ''
   - name: --encryption-key-name
     summary: The name of the KeyVault key.
@@ -182,135 +179,62 @@ items:
     summary: The version of the KeyVault key. Use the latest version by default.
     description: ''
   - name: --identity-client-id
-    summary: Client ID of the managed identity with wrap and unwrap access to encryption key. Use system assigned identity by default.
+    summary: Client ID of the managed identity with wrap and unwrap access to encryption key. Use system-assigned managed identity by default.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Free, Standard
+    summary: The sku of App Configuration.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_create
-  name: az appconfig create
-  summary: Create an App Configuration.
-- uid: az_appconfig_credential
-  name: az appconfig credential
-  summary: Manage credentials for App Configurations.
-- uid: az_appconfig_credential_list
-  name: az appconfig credential list
-  summary: List access keys of an App Configuration.
-- uid: az_appconfig_credential_regenerate
-  name: az appconfig credential regenerate
-  summary: Regenerate an access key for an App Configuration.
-- uid: az_appconfig_delete
-  name: az appconfig delete
-  summary: Delete an App Configuration.
-- uid: az_appconfig_feature
-  name: az appconfig feature
-  summary: Manage feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_delete
-  name: az appconfig feature delete
-  summary: Delete feature flag.
-- uid: az_appconfig_feature_disable
-  name: az appconfig feature disable
-  summary: Disable a feature flag to turn it OFF for use.
-- uid: az_appconfig_feature_enable
-  name: az appconfig feature enable
-  summary: Enable a feature flag to turn it ON for use.
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
-- uid: az_appconfig_feature_list
-  name: az appconfig feature list
-  summary: List feature flags.
-- uid: az_appconfig_feature_lock
-  name: az appconfig feature lock
-  summary: Lock a feature flag to prohibit write operations.
-- uid: az_appconfig_feature_set
-  name: az appconfig feature set
-  summary: Set a feature flag.
-- uid: az_appconfig_feature_show
-  name: az appconfig feature show
-  summary: Show all attributes of a feature flag.
-- uid: az_appconfig_feature_unlock
-  name: az appconfig feature unlock
-  summary: Unlock a feature to gain write operations.
-- uid: az_appconfig_identity
-  name: az appconfig identity
-  summary: Managed identities for App Configurations.
-- uid: az_appconfig_identity_assign
-  name: az appconfig identity assign
-  summary: Update managed identities for an App Configuration.
-- uid: az_appconfig_identity_remove
-  name: az appconfig identity remove
-  summary: Remove managed identities for an App Configuration.
-- uid: az_appconfig_identity_show
-  name: az appconfig identity show
-  summary: Display managed identities for an App Configuration.
-- uid: az_appconfig_kv
-  name: az appconfig kv
-  summary: Manage key-values stored in an App Configuration.
-- uid: az_appconfig_kv_delete
-  name: az appconfig kv delete
-  summary: Delete key-values.
-- uid: az_appconfig_kv_export
-  name: az appconfig kv export
-  summary: Export configurations to another place from your App Configuration.
-- uid: az_appconfig_kv_import
-  name: az appconfig kv import
-  summary: Import configurations into your App Configuration from another place.
-- uid: az_appconfig_kv_list
-  name: az appconfig kv list
-  summary: List key-values.
-- uid: az_appconfig_kv_lock
-  name: az appconfig kv lock
-  summary: Lock a key-value to prohibit write operations.
-- uid: az_appconfig_kv_restore
-  name: az appconfig kv restore
-  summary: Restore key-values.
-- uid: az_appconfig_kv_set
-  name: az appconfig kv set
-  summary: Set a key-value.
-- uid: az_appconfig_kv_set_keyvault
-  name: az appconfig kv set-keyvault
-  summary: Set a keyvault reference.
-- uid: az_appconfig_kv_show
-  name: az appconfig kv show
-  summary: Show all attributes of a key-value.
-- uid: az_appconfig_kv_unlock
-  name: az appconfig kv unlock
-  summary: Unlock a key-value to gain write operations.
-- uid: az_appconfig_list
-  name: az appconfig list
-  summary: Lists all App Configurations under the current subscription.
-- uid: az_appconfig_revision
-  name: az appconfig revision
-  summary: Manage revisions for key-values stored in an App Configuration.
-- uid: az_appconfig_revision_list
-  name: az appconfig revision list
-  summary: Lists revision history of key-values.
-- uid: az_appconfig_show
-  name: az appconfig show
-  summary: Show properties of an App Configuration.
-- uid: az_appconfig_update
-  name: az appconfig update
-  summary: Update an App Configuration.
+- az_appconfig_create
+- az_appconfig_credential
+- az_appconfig_credential_list
+- az_appconfig_credential_regenerate
+- az_appconfig_delete
+- az_appconfig_feature
+- az_appconfig_feature_delete
+- az_appconfig_feature_disable
+- az_appconfig_feature_enable
+- az_appconfig_feature_filter
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
+- az_appconfig_feature_list
+- az_appconfig_feature_lock
+- az_appconfig_feature_set
+- az_appconfig_feature_show
+- az_appconfig_feature_unlock
+- az_appconfig_identity
+- az_appconfig_identity_assign
+- az_appconfig_identity_remove
+- az_appconfig_identity_show
+- az_appconfig_kv
+- az_appconfig_kv_delete
+- az_appconfig_kv_export
+- az_appconfig_kv_import
+- az_appconfig_kv_list
+- az_appconfig_kv_lock
+- az_appconfig_kv_restore
+- az_appconfig_kv_set
+- az_appconfig_kv_set-keyvault
+- az_appconfig_kv_show
+- az_appconfig_kv_unlock
+- az_appconfig_list
+- az_appconfig_revision
+- az_appconfig_revision_list
+- az_appconfig_show
+- az_appconfig_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -326,10 +250,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage App Configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig/credential.yml b/2017-03-09-profile/docs-ref-autogen/appconfig/credential.yml
index 7a90cd2a3b..164466cbcd 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig/credential.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig/credential.yml
@@ -1,79 +1,69 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_credential
-  name: az appconfig credential
-  summary: Manage credentials for App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_credential_list
-  - az_appconfig_credential_regenerate
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_credential
+name: az appconfig credential
+summary: Manage credentials for App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_credential_list
   name: az appconfig credential list
   summary: List access keys of an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig credential list --name
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List access keys of an App Configuration
-    syntax:
-      content: az appconfig credential list -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig credential list -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_credential_regenerate
   name: az appconfig credential regenerate
   summary: Regenerate an access key for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig credential regenerate --id
+                                       --name
+                                       [--resource-group]
+                                       [--subscription]
   examples:
   - summary: Regenerate a read only access key for an App Configuration
-    syntax:
-      content: az appconfig credential regenerate -g MyResourceGroup -n MyAppConfiguration --id 0-l0-s0:8ldbreMVH+d7EjaSUg3H
-  parameters:
+    syntax: az appconfig credential regenerate -g MyResourceGroup -n MyAppConfiguration --id 0-l0-s0:8ldbreMVH+d7EjaSUg3H
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Id of the key to be regenerated. Can be found using az appconfig credential list command.
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_credential_list
-  name: az appconfig credential list
-  summary: List access keys of an App Configuration.
-- uid: az_appconfig_credential_regenerate
-  name: az appconfig credential regenerate
-  summary: Regenerate an access key for an App Configuration.
+- az_appconfig_credential_list
+- az_appconfig_credential_regenerate
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -89,10 +79,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage credentials for App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage credentials for App Configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig/feature.yml b/2017-03-09-profile/docs-ref-autogen/appconfig/feature.yml
index 8f95bca75d..7171edc3d6 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig/feature.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig/feature.yml
@@ -1,168 +1,198 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_feature
-  name: az appconfig feature
-  summary: Manage feature flags stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_feature_delete
-  - az_appconfig_feature_disable
-  - az_appconfig_feature_enable
-  - az_appconfig_feature_list
-  - az_appconfig_feature_lock
-  - az_appconfig_feature_set
-  - az_appconfig_feature_show
-  - az_appconfig_feature_unlock
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_feature
+name: az appconfig feature
+summary: Manage feature flags stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_feature_delete
   name: az appconfig feature delete
   summary: Delete feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature delete --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: Delete a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature delete -n MyAppConfiguration --feature color --label MyLabel --yes
+    syntax: az appconfig feature delete -n MyAppConfiguration --feature color --label MyLabel --yes
   - summary: Delete a feature using connection string.
-    syntax:
-      content: az appconfig feature delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label MyLabel
-  parameters:
+    syntax: az appconfig feature delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label MyLabel
+  - summary: Delete a feature using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature delete --endpoint https://myappconfiguration.azconfig.io --feature color --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be deleted. Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix. Comma separated keys are not supported. Please provide escaped string if your feature name contains comma.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, delete the feature flag with null label by default. Support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_disable
   name: az appconfig feature disable
   summary: Disable a feature flag to turn it OFF for use.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature disable --feature
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--endpoint]
+                                 [--label]
+                                 [--name]
+                                 [--subscription]
+                                 [--yes]
   examples:
   - summary: disable a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature disable -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature disable -n MyAppConfiguration --feature color --label test
   - summary: Force disabling a feature using connection string.
-    syntax:
-      content: az appconfig feature disable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature disable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be disabled.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, disable the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_enable
   name: az appconfig feature enable
   summary: Enable a feature flag to turn it ON for use.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature enable --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: enable a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature enable -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature enable -n MyAppConfiguration --feature color --label test
   - summary: Force enabling a feature using connection string.
-    syntax:
-      content: az appconfig feature enable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature enable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be enabled.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, enable the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_list
   name: az appconfig feature list
   summary: List feature flags.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature list [--all]
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--feature]
+                              [--fields {conditions, description, key, label, last_modified, locked, state}]
+                              [--label]
+                              [--name]
+                              [--query-examples]
+                              [--subscription]
+                              [--top]
   examples:
   - summary: List all feature flags.
-    syntax:
-      content: az appconfig feature list -n MyAppConfiguration
+    syntax: az appconfig feature list -n MyAppConfiguration
   - summary: List all feature flags with null labels.
-    syntax:
-      content: az appconfig feature list -n MyAppConfiguration --label \0
+    syntax: az appconfig feature list -n MyAppConfiguration --label \0
   - summary: List a specfic feature for any label start with v1. using connection string.
-    syntax:
-      content: az appconfig feature list --feature color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
+    syntax: az appconfig feature list --feature color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
   - summary: List all features with any labels and query only key, state and conditions.
-    syntax:
-      content: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key state conditions
+    syntax: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key state conditions
   - summary: List 150 feature flags with any labels.
-    syntax:
-      content: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --top 150
+    syntax: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --top 150
   - summary: List feature flags with multiple labels.
-    syntax:
-      content: az appconfig feature list --label test,prod,\0 -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig feature list --label test,prod,\0 -n MyAppConfiguration
+  optionalParameters:
   - name: --all
     summary: List all feature flags.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --feature
     summary: Key of the feature to be listed. Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix. Comma separated keys are not supported. Please provide escaped string if your feature name contains comma.
@@ -175,121 +205,157 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_lock
   name: az appconfig feature lock
   summary: Lock a feature flag to prohibit write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature lock --feature
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--label]
+                              [--name]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Lock a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature lock -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature lock -n MyAppConfiguration --feature color --label test
   - summary: Force locking a feature using connection string.
-    syntax:
-      content: az appconfig feature lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be locked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, lock the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_set
   name: az appconfig feature set
   summary: Set a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature set --feature
+                             [--auth-mode {key, login}]
+                             [--connection-string]
+                             [--description]
+                             [--endpoint]
+                             [--label]
+                             [--name]
+                             [--subscription]
+                             [--yes]
   examples:
   - summary: Set a feature flag with label MyLabel.
-    syntax:
-      content: az appconfig feature set -n MyAppConfiguration --feature color --label MyLabel
+    syntax: az appconfig feature set -n MyAppConfiguration --feature color --label MyLabel
   - summary: Set a feature flag with null label using connection string and set a description.
-    syntax:
-      content: az appconfig feature set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
-  parameters:
+    syntax: az appconfig feature set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
+  - summary: Set a feature flag using your 'az login' credentials.
+    syntax: az appconfig feature set --endpoint https://myappconfiguration.azconfig.io --feature color --label MyLabel --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature flag to be set. Only alphanumeric characters, '.', '-' and '_' are allowed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --description
     summary: Description of the feature flag to be set.
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, set the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_show
   name: az appconfig feature show
   summary: Show all attributes of a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature show --feature
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--fields {conditions, description, key, label, last_modified, locked, state}]
+                              [--label]
+                              [--name]
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Show a feature flag using App Configuration name with a specific label
-    syntax:
-      content: az appconfig feature show -n MyAppConfiguration --feature color --label MyLabel
+    syntax: az appconfig feature show -n MyAppConfiguration --feature color --label MyLabel
   - summary: Show a feature flag using connection string and field filters
-    syntax:
-      content: az appconfig feature show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --fields key locked conditions state
-  parameters:
+    syntax: az appconfig feature show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --fields key locked conditions state
+  - summary: Show a feature flag using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature show --endpoint https://myappconfiguration.azconfig.io --feature color --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature flag to be retrieved.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --fields
     parameterValueGroup: conditions, description, key, label, last_modified, locked, state
@@ -299,96 +365,77 @@ items:
     summary: If no label specified, show entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_unlock
   name: az appconfig feature unlock
   summary: Unlock a feature to gain write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature unlock --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: Unlock a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature unlock -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature unlock -n MyAppConfiguration --feature color --label test
   - summary: Force unlocking a feature using connection string.
-    syntax:
-      content: az appconfig feature unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be unlocked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, unlock the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_feature_delete
-  name: az appconfig feature delete
-  summary: Delete feature flag.
-- uid: az_appconfig_feature_disable
-  name: az appconfig feature disable
-  summary: Disable a feature flag to turn it OFF for use.
-- uid: az_appconfig_feature_enable
-  name: az appconfig feature enable
-  summary: Enable a feature flag to turn it ON for use.
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
-- uid: az_appconfig_feature_list
-  name: az appconfig feature list
-  summary: List feature flags.
-- uid: az_appconfig_feature_lock
-  name: az appconfig feature lock
-  summary: Lock a feature flag to prohibit write operations.
-- uid: az_appconfig_feature_set
-  name: az appconfig feature set
-  summary: Set a feature flag.
-- uid: az_appconfig_feature_show
-  name: az appconfig feature show
-  summary: Show all attributes of a feature flag.
-- uid: az_appconfig_feature_unlock
-  name: az appconfig feature unlock
-  summary: Unlock a feature to gain write operations.
+- az_appconfig_feature_delete
+- az_appconfig_feature_disable
+- az_appconfig_feature_enable
+- az_appconfig_feature_filter
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
+- az_appconfig_feature_list
+- az_appconfig_feature_lock
+- az_appconfig_feature_set
+- az_appconfig_feature_show
+- az_appconfig_feature_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -404,10 +451,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage feature flags stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage feature flags stored in an App Configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig/feature/filter.yml b/2017-03-09-profile/docs-ref-autogen/appconfig/feature/filter.yml
index 983c38c78a..2b093aded9 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig/feature/filter.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig/feature/filter.yml
@@ -1,33 +1,37 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_feature_filter_add
-  - az_appconfig_feature_filter_delete
-  - az_appconfig_feature_filter_list
-  - az_appconfig_feature_filter_show
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_feature_filter
+name: az appconfig feature filter
+summary: Manage filters associated with feature flags stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_feature_filter_add
   name: az appconfig feature filter add
   summary: Add a filter to a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter add --feature
+                                    --filter-name
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--endpoint]
+                                    [--filter-parameters]
+                                    [--index]
+                                    [--label]
+                                    [--name]
+                                    [--subscription]
+                                    [--yes]
   examples:
   - summary: Add a filter for feature 'color' with label MyLabel with name 'MyFilter' and 2 parameters.
-    syntax:
-      content: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters Name=Value Name2=Value2
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters Name=\"Value\" Name2=\"Value2\"
   - summary: Insert a filter at index 2 (zero-based index) for feature 'color' with label MyLabel and filter name 'MyFilter' with no parameters
-    syntax:
-      content: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --index 2
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --index 2
   - summary: Add a filter with name 'MyFilter' using connection string.
-    syntax:
-      content: az appconfig feature filter add --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
-  parameters:
+    syntax: az appconfig feature filter add --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
+  - summary: Add a filter with name 'MyFilter' using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature filter add --endpoint=https://contoso.azconfig.io --feature color --filter-name MyFilter --auth-mode login
+  - summary: Add a filter for feature 'color' with label MyLabel with name 'MyFilter' and array parameters.
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters ArrayParam=[1,2,3]
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature to which you want to add the filter.
@@ -36,11 +40,20 @@ items:
     name: --filter-name
     summary: Name of the filter to be added.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --filter-parameters
-    summary: Space-separated filter parameters in 'name[=value]' format.
+    summary: Space-separated filter parameters in 'name[=value]' format. The value must be an escaped JSON string.
     description: ''
   - name: --index
     summary: Zero-based index in the list of filters where you want to insert the new filter. If no index is specified or index is invalid, filter will be added to the end of the list.
@@ -49,46 +62,57 @@ items:
     summary: If no label specified, add to the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_delete
   name: az appconfig feature filter delete
   summary: Delete a filter from a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter delete --feature
+                                       [--all]
+                                       [--auth-mode {key, login}]
+                                       [--connection-string]
+                                       [--endpoint]
+                                       [--filter-name]
+                                       [--index]
+                                       [--label]
+                                       [--name]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete a filter from a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature filter delete -n MyAppConfiguration --feature color --filter-name MyFilter --yes
+    syntax: az appconfig feature filter delete -n MyAppConfiguration --feature color --filter-name MyFilter --yes
   - summary: Delete a filter from a feature when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter delete --feature color --filter-name MyFilter --index 2 --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx
+    syntax: az appconfig feature filter delete --feature color --filter-name MyFilter --index 2 --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx
   - summary: Delete all filters of a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature filter delete -n MyAppConfiguration --feature color --label MyLabel --all --yes
-  parameters:
+    syntax: az appconfig feature filter delete -n MyAppConfiguration --feature color --label MyLabel --all --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature from which you want to delete the filter.
     description: ''
+  optionalParameters:
   - name: --all
     summary: Delete all filters associated with a feature flag.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --filter-name
     summary: Name of the filter to be deleted.
@@ -100,76 +124,94 @@ items:
     summary: If no label specified, delete from the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_list
   name: az appconfig feature filter list
   summary: List all filters for a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter list --feature
+                                     [--all]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--endpoint]
+                                     [--label]
+                                     [--name]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--top]
   examples:
   - summary: List all filters for feature flag 'color'.
-    syntax:
-      content: az appconfig feature filter list -n MyAppConfiguration --feature color --all
+    syntax: az appconfig feature filter list -n MyAppConfiguration --feature color --all
   - summary: List 150 filters for feature flag 'color'
-    syntax:
-      content: az appconfig feature filter list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --feature color --top 150
-  parameters:
+    syntax: az appconfig feature filter list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --feature color --top 150
+  - summary: List all filters for feature flag 'color' using your 'az login' credentials.
+    syntax: az appconfig feature filter list --endpoint https://myappconfiguration.azconfig.io --feature color --all --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature whose filters you want to be displayed.
     description: ''
+  optionalParameters:
   - name: --all
     summary: List all filters associated with a feature flag.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, display filters from the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_show
   name: az appconfig feature filter show
   summary: Show filters of a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter show --feature
+                                     --filter-name
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--endpoint]
+                                     [--index]
+                                     [--label]
+                                     [--name]
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Show one unique feature filter when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter show -n MyAppConfiguration --feature color --filter-name MyFilter --index 2
+    syntax: az appconfig feature filter show -n MyAppConfiguration --feature color --filter-name MyFilter --index 2
   - summary: Show all instances of a feature filter when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
-  parameters:
+    syntax: az appconfig feature filter show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature which contains the filter.
@@ -178,8 +220,17 @@ items:
     name: --filter-name
     summary: Name of the filter to be displayed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --index
     summary: Zero-based index of the filter to be displayed in case there are multiple instances with same filter name.
@@ -188,30 +239,20 @@ items:
     summary: If no label specified, show the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,10 +268,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage filters associated with feature flags stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage filters associated with feature flags stored in an App Configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig/identity.yml b/2017-03-09-profile/docs-ref-autogen/appconfig/identity.yml
index 82e2696a02..97f9293862 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig/identity.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig/identity.yml
@@ -1,124 +1,105 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_identity
-  name: az appconfig identity
-  summary: Managed identities for App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_identity_assign
-  - az_appconfig_identity_remove
-  - az_appconfig_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_identity
+name: az appconfig identity
+summary: Managed identities for App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_identity_assign
   name: az appconfig identity assign
   summary: Update managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity assign --name
+                                 [--identities]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Enable the system-assigned identity for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
   - summary: Assign a user-assigned managed identity for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
   - summary: Assign both system-assigned and user assigned identities for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
-  parameters:
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --identities
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified.
+    summary: Accept system-assigned or user-assigned managed identities separated by spaces. Use '[system]' to refer to system-assigned managed identity or a resource ID to refer to user-assigned managed identity. If this argument is not provided or this argument is provided without any value, system-assigned managed identity will be used by default.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_identity_remove
   name: az appconfig identity remove
   summary: Remove managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity remove --name
+                                 [--identities]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Remove the system-assigned identity from a App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
   - summary: Remove a user assigned identity from a App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
   - summary: Remove all identities from an App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
-  parameters:
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --identities
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, '[all]' for all identities or a resource id to refer user assigned identity. Remove system assigned identity if not specified.
+    summary: Accept system-assigned or user-assigned managed identities separated by spaces. Use '[system]' to refer to system-assigned managed identity, '[all]' for all managed identities or a resource ID to refer user-assigned managed identity. If this argument is not provided or this argument is provided without any value, system-assigned managed identity will be removed by default.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_identity_show
   name: az appconfig identity show
   summary: Display managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity show --name
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Display managed identities for a task.
-    syntax:
-      content: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_identity_assign
-  name: az appconfig identity assign
-  summary: Update managed identities for an App Configuration.
-- uid: az_appconfig_identity_remove
-  name: az appconfig identity remove
-  summary: Remove managed identities for an App Configuration.
-- uid: az_appconfig_identity_show
-  name: az appconfig identity show
-  summary: Display managed identities for an App Configuration.
+- az_appconfig_identity_assign
+- az_appconfig_identity_remove
+- az_appconfig_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -134,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Managed identities for App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Managed identities for App Configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig/kv.yml b/2017-03-09-profile/docs-ref-autogen/appconfig/kv.yml
index 1c95aee6d7..6a6cfefa20 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig/kv.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig/kv.yml
@@ -1,135 +1,152 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_kv
-  name: az appconfig kv
-  summary: Manage key-values stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_kv_delete
-  - az_appconfig_kv_export
-  - az_appconfig_kv_import
-  - az_appconfig_kv_list
-  - az_appconfig_kv_lock
-  - az_appconfig_kv_restore
-  - az_appconfig_kv_set
-  - az_appconfig_kv_set_keyvault
-  - az_appconfig_kv_show
-  - az_appconfig_kv_unlock
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_kv
+name: az appconfig kv
+summary: Manage key-values stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_kv_delete
   name: az appconfig kv delete
   summary: Delete key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv delete --key
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--endpoint]
+                           [--label]
+                           [--name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Delete a key using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig kv delete -n MyAppConfiguration --key color --label MyLabel --yes
+    syntax: az appconfig kv delete -n MyAppConfiguration --key color --label MyLabel --yes
   - summary: Delete a key using connection string.
-    syntax:
-      content: az appconfig kv delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
-  parameters:
+    syntax: az appconfig kv delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
+  - summary: Delete a key using your 'az login' credentials and App Configuration endpoint.
+    syntax: az appconfig kv delete --endpoint https://myappconfiguration.azconfig.io --key color --auth-mode login --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, delete entry with null label. Support star sign as filters, for instance \* means all label and abc\* means labels with abc as prefix.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_export
   name: az appconfig kv export
   summary: Export configurations to another place from your App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv export --destination {appconfig, appservice, file}
+                           [--appservice-account]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--dest-auth-mode {key, login}]
+                           [--dest-connection-string]
+                           [--dest-endpoint]
+                           [--dest-label]
+                           [--dest-name]
+                           [--endpoint]
+                           [--format {json, properties, yaml}]
+                           [--key]
+                           [--label]
+                           [--name]
+                           [--naming-convention {camel, hyphen, pascal, underscore}]
+                           [--path]
+                           [--prefix]
+                           [--preserve-labels {false, true}]
+                           [--resolve-keyvault {false, true}]
+                           [--separator]
+                           [--skip-features {false, true}]
+                           [--skip-keyvault {false, true}]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Export all keys and feature flags with label test to a json file.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json
+    syntax: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json
   - summary: Export all keys with null label to an App Service application.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appservice  --appservice-account MyAppService
+    syntax: az appconfig kv export -n MyAppConfiguration -d appservice --appservice-account MyAppService
   - summary: Export all keys with label test excluding feature flags to a json file.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json --skip-features
+    syntax: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json --skip-features
   - summary: Export all keys and feature flags with all labels to another App Configuration.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --preserve-labels
+    syntax: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --preserve-labels
   - summary: Export all keys and feature flags with all labels to another App Configuration and overwrite destination labels.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --dest-label ExportedKeys
-  parameters:
+    syntax: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --dest-label ExportedKeys
+  - summary: Export all keys to another App Configuration using your 'az login' credentials.
+    syntax: az appconfig kv export -d appconfig --endpoint https://myappconfiguration.azconfig.io --auth-mode login --dest-endpoint https://anotherappconfiguration.azconfig.io --dest-auth-mode login --key * --label * --preserve-labels
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     parameterValueGroup: appconfig, appservice, file
     summary: The destination of exporting. Note that exporting feature flags to appservice is not supported.
     description: ''
-  - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
-    description: ''
-  - name: --key
-    summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be exported.
-    description: ''
-  - name: --label
-    summary: Only keys and feature flags with this label will be exported. If no label specified, export keys and feature flags with null label by default. Only when export destination is appconfig, we support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Label filters are not supported when exporting to file or appservice.
-    description: ''
-  - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --prefix
-    summary: Prefix to be trimmed from keys. Prefix will be ignored for feature flags.
+  optionalParameters:
+  - name: --appservice-account
+    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
     description: ''
-  - name: --skip-features
-    parameterValueGroup: false, true
-    summary: Export items excluding all feature flags. By default, all features with the specified label will be exported to file or appconfig. Not applicable for appservice.
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
     description: ''
-  - name: --skip-keyvault
-    parameterValueGroup: false, true
-    summary: Export items excluding all key vault references. By default, all key vault references with the specified label will be exported.
+  - name: --connection-string
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for preview.
+  - name: --dest-auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Auth mode for connecting to destination App Configuration. For details, refer to "--auth-mode" argument.
     description: ''
   - name: --dest-connection-string
     summary: Combination of access key and endpoint of the destination store.
     description: ''
+  - name: --dest-endpoint
+    summary: If --dest-auth-mode is "login", provide endpoint URL of the destination App Configuration.
+    description: ''
   - name: --dest-label
     summary: Exported KVs will be labeled with this destination label. If neither --dest-label nor --preserve-labels is specified, will assign null label.
     description: ''
   - name: --dest-name
     summary: The name of the destination App Configuration.
     description: ''
-  - name: --preserve-labels
-    parameterValueGroup: false, true
-    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --dest-label.
-    description: ''
-  - name: --appservice-account
-    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --format
     parameterValueGroup: json, properties, yaml
     summary: File format exporting to. Required for file arguments. Currently, feature flags are not supported in properties format.
     description: ''
+  - name: --key
+    summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be exported.
+    description: ''
+  - name: --label
+    summary: Only keys and feature flags with this label will be exported. If no label specified, export keys and feature flags with null label by default. Only when export destination is appconfig, we support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Label filters are not supported when exporting to file or appservice.
+    description: ''
+  - name: --name -n
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
   - name: --naming-convention
     defaultValue: pascal
     parameterValueGroup: camel, hyphen, pascal, underscore
@@ -138,79 +155,143 @@ items:
   - name: --path
     summary: Local configuration file path. Required for file arguments.
     description: ''
+  - name: --prefix
+    summary: Prefix to be trimmed from keys. Prefix will be ignored for feature flags.
+    description: ''
+  - name: --preserve-labels
+    parameterValueGroup: false, true
+    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --dest-label.
+    description: ''
   - name: --resolve-keyvault
     parameterValueGroup: false, true
     summary: Resolve the content of key vault reference.
     description: ''
   - name: --separator
-    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Required for exporting hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
+    summary: "Delimiter for flattening the key-value pairs to json or yaml file. Required for exporting hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
+    description: ''
+  - name: --skip-features
+    parameterValueGroup: false, true
+    summary: Export items excluding all feature flags. By default, all features with the specified label will be exported to file or appconfig. Not applicable for appservice.
+    description: ''
+  - name: --skip-keyvault
+    parameterValueGroup: false, true
+    summary: Export items excluding all key vault references. By default, all key vault references with the specified label will be exported.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for preview.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_import
   name: az appconfig kv import
   summary: Import configurations into your App Configuration from another place.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv import --source {appconfig, appservice, file}
+                           [--appservice-account]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--content-type]
+                           [--depth]
+                           [--endpoint]
+                           [--format {json, properties, yaml}]
+                           [--label]
+                           [--name]
+                           [--path]
+                           [--prefix]
+                           [--preserve-labels {false, true}]
+                           [--separator]
+                           [--skip-features {false, true}]
+                           [--src-auth-mode {key, login}]
+                           [--src-connection-string]
+                           [--src-endpoint]
+                           [--src-key]
+                           [--src-label]
+                           [--src-name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Import all keys and feature flags from a file and apply test label.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration --label test -s file --path D:/abc.json --format json
+    syntax: az appconfig kv import -n MyAppConfiguration --label test -s file --path D:/abc.json --format json
   - summary: Import all keys and feature flags with null label and apply new label from an App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --label ImportedKeys
-  - summary: Import all keys and apply null label from an App Service appliaction.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appservice --appservice-account MyAppService
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --label ImportedKeys
+  - summary: Import all keys and apply null label from an App Service application.
+    syntax: az appconfig kv import -n MyAppConfiguration -s appservice --appservice-account MyAppService
   - summary: Import all keys with label test and apply test2 label excluding feature flags from an App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-label test --label test2 --src-name AnotherAppConfiguration --skip-features
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-label test --label test2 --src-name AnotherAppConfiguration --skip-features
   - summary: Import all keys and feature flags with all labels to another App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --src-key * --src-label * --preserve-labels
-  parameters:
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --src-key * --src-label * --preserve-labels
+  - summary: Import all keys and feature flags from a JSON file and apply JSON content type.
+    syntax: az appconfig kv import -n MyAppConfiguration -s file --path D:/abc.json --format json --separator . --content-type application/json
+  - summary: Import all keys to another App Configuration using your 'az login' credentials.
+    syntax: az appconfig kv import -s appconfig --endpoint https://myappconfiguration.azconfig.io --auth-mode login --src-endpoint https://anotherappconfiguration.azconfig.io --src-auth-mode login --src-key * --src-label * --preserve-labels
+  requiredParameters:
   - isRequired: true
     name: --source -s
     parameterValueGroup: appconfig, appservice, file
     summary: The source of importing. Note that importing feature flags from appservice is not supported.
     description: ''
+  optionalParameters:
+  - name: --appservice-account
+    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
+    description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --content-type
     summary: Content type of all imported items.
     description: ''
+  - name: --depth
+    summary: Depth for flattening the json or yaml file to key-value pairs. Flatten to the deepest level by default if --separator is provided. Not applicable for property files or feature flags.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
+  - name: --format
+    parameterValueGroup: json, properties, yaml
+    summary: Imported file format. Required for file arguments. Currently, feature flags are not supported in properties format.
+    description: ''
   - name: --label
     summary: Imported KVs and feature flags will be assigned with this label. If no label specified, will assign null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --path
+    summary: Local configuration file path. Required for file arguments.
     description: ''
   - name: --prefix
     summary: This prefix will be appended to the front of imported keys. Prefix will be ignored for feature flags.
     description: ''
-  - name: --skip-features
+  - name: --preserve-labels
     parameterValueGroup: false, true
-    summary: Import only key values and exclude all feature flags. By default, all feature flags will be imported from file or appconfig. Not applicable for appservice.
+    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --label.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for preview.
+  - name: --separator
+    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
     description: ''
-  - name: --preserve-labels
+  - name: --skip-features
     parameterValueGroup: false, true
-    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --label.
+    summary: Import only key values and exclude all feature flags. By default, all feature flags will be imported from file or appconfig. Not applicable for appservice.
+    description: ''
+  - name: --src-auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Auth mode for connecting to source App Configuration. For details, refer to "--auth-mode" argument.
     description: ''
   - name: --src-connection-string
     summary: Combination of access key and endpoint of the source store.
     description: ''
+  - name: --src-endpoint
+    summary: If --src-auth-mode is "login", provide endpoint URL of the source App Configuration.
+    description: ''
   - name: --src-key
     summary: If no key specified, import all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be imported.
     description: ''
@@ -220,66 +301,65 @@ items:
   - name: --src-name
     summary: The name of the source App Configuration.
     description: ''
-  - name: --appservice-account
-    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
-    description: ''
-  - name: --depth
-    summary: Depth for flattening the json or yaml file to key-value pairs. Flatten to the deepest level by default. Not applicable for property files or feature flags.
-    description: ''
-  - name: --format
-    parameterValueGroup: json, properties, yaml
-    summary: Imported file format. Required for file arguments. Currently, feature flags are not supported in properties format.
-    description: ''
-  - name: --path
-    summary: Local configuration file path. Required for file arguments.
-    description: ''
-  - name: --separator
-    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Required for importing hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for preview.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_list
   name: az appconfig kv list
   summary: List key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv list [--all]
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--datetime]
+                         [--endpoint]
+                         [--fields {content_type, etag, key, label, last_modified, locked, tags, value}]
+                         [--key]
+                         [--label]
+                         [--name]
+                         [--query-examples]
+                         [--resolve-keyvault {false, true}]
+                         [--subscription]
+                         [--top]
   examples:
   - summary: List all key-values with null label.
-    syntax:
-      content: az appconfig kv list -n MyAppConfiguration --label \0
+    syntax: az appconfig kv list -n MyAppConfiguration --label \0
   - summary: List a specific key for any label start with v1. using connection string.
-    syntax:
-      content: az appconfig kv list --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
+    syntax: az appconfig kv list --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
   - summary: List all keys with any labels and query only key, value and tags.
-    syntax:
-      content: az appconfig kv list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value tags --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value tags --datetime "2019-05-01T11:24:12Z"
   - summary: List content of key vault reference with key prefix 'KVRef_' and only select key and value.
-    syntax:
-      content: az appconfig kv list -n MyAppConfiguration --key "KVRef_*" --resolve-keyvault --query "[*].{key:key, value:value}"
+    syntax: az appconfig kv list -n MyAppConfiguration --key "KVRef_*" --resolve-keyvault --query "[*].{key:key, value:value}"
   - summary: List key-values with multiple labels.
-    syntax:
-      content: az appconfig kv list --label test,prod,\0 -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig kv list --label test,prod,\0 -n MyAppConfiguration
+  - summary: List all key-values with all labels using your 'az login' credentials.
+    syntax: az appconfig kv list --endpoint https://myappconfiguration.azconfig.io --auth-mode login
+  optionalParameters:
   - name: --all
     summary: List all items.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --fields
     parameterValueGroup: content_type, etag, key, label, last_modified, locked, tags, value
-    summary: Customize output fields.
+    summary: Space-separated customized output fields.
     description: ''
   - name: --key
     summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
@@ -288,134 +368,179 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resolve-keyvault
     parameterValueGroup: false, true
     summary: Resolve the content of key vault reference. This argument should NOT be specified along with --fields. Instead use --query for customized query.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_lock
   name: az appconfig kv lock
   summary: Lock a key-value to prohibit write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv lock --key
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--endpoint]
+                         [--label]
+                         [--name]
+                         [--subscription]
+                         [--yes]
   examples:
   - summary: Lock a key-value using App Configuration name.
-    syntax:
-      content: az appconfig kv lock -n MyAppConfiguration --key color --label test
+    syntax: az appconfig kv lock -n MyAppConfiguration --key color --label test
   - summary: Force locking a key-value using connection string.
-    syntax:
-      content: az appconfig kv lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
-  parameters:
+    syntax: az appconfig kv lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be locked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, lock entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_restore
   name: az appconfig kv restore
   summary: Restore key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv restore --datetime
+                            [--auth-mode {key, login}]
+                            [--connection-string]
+                            [--endpoint]
+                            [--key]
+                            [--label]
+                            [--name]
+                            [--subscription]
+                            [--yes]
   examples:
   - summary: Restore all key-values to a specific point in time.
-    syntax:
-      content: az appconfig kv restore -n MyAppConfiguration --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv restore -n MyAppConfiguration --datetime "2019-05-01T11:24:12Z"
   - summary: Restore a specific key for any label start with v1. using connection string to a specific point in time.
-    syntax:
-      content: az appconfig kv restore --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.* --datetime "2019-05-01T11:24:12Z"
-  parameters:
+    syntax: az appconfig kv restore --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.* --datetime "2019-05-01T11:24:12Z"
+  requiredParameters:
   - isRequired: true
     name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --key
     summary: If no key specified, restore all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
     description: ''
   - name: --label
-    summary: If no label specified, restore all key-value pairs with all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix.
+    summary: If no label specified, restore all key-value pairs with all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_set
   name: az appconfig kv set
   summary: Set a key-value.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv set --key
+                        [--auth-mode {key, login}]
+                        [--connection-string]
+                        [--content-type]
+                        [--endpoint]
+                        [--label]
+                        [--name]
+                        [--subscription]
+                        [--tags]
+                        [--value]
+                        [--yes]
   examples:
   - summary: Set a key-value with label MyLabel.
-    syntax:
-      content: az appconfig kv set -n MyAppConfiguration --key color --label MyLabel --value red
+    syntax: az appconfig kv set -n MyAppConfiguration --key color --label MyLabel --value red
   - summary: Set a key with null label using connection string.
-    syntax:
-      content: az appconfig kv set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --value red --tags key1=value1 key2=value2
-  parameters:
+    syntax: az appconfig kv set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --value red --tags key1=value1 key2=value2
+  - summary: Set a key with string value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key color --value \"red\" --content-type application/json
+  - summary: Set a key with list value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key options --value [1,2,3] --content-type application/activity+json;charset=utf-8
+  - summary: Set a key with null value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key foo --value null --content-type application/json
+  - summary: Set a key-value using your 'az login' credentials.
+    syntax: az appconfig kv set --endpoint https://myappconfiguration.azconfig.io --key color --value red --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be set. Key cannot be a '.' or '..', or contain the '%' character.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --content-type
     summary: Content type of the keyvalue to be set.
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, set the key with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -426,29 +551,28 @@ items:
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_appconfig_kv_set_keyvault
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
+- uid: az_appconfig_kv_set-keyvault
   name: az appconfig kv set-keyvault
   summary: Set a keyvault reference.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv set-keyvault --key
+                                 --secret-identifier
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--endpoint]
+                                 [--label]
+                                 [--name]
+                                 [--subscription]
+                                 [--tags]
+                                 [--yes]
   examples:
   - summary: Set a keyvault reference with label MyLabel.
-    syntax:
-      content: az appconfig kv set-keyvault -n MyAppConfiguration --key HostSecret --label MyLabel --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret/Dummyversion
+    syntax: az appconfig kv set-keyvault -n MyAppConfiguration --key HostSecret --label MyLabel --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret/Dummyversion
   - summary: Set a keyvault reference with null label and multiple tags using connection string.
-    syntax:
-      content: az appconfig kv set-keyvault --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key HostSecret --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret --tags tag1=value1 tag2=value2
-  parameters:
+    syntax: az appconfig kv set-keyvault --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key HostSecret --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret --tags tag1=value1 tag2=value2
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be set. Key cannot be a '.' or '..', or contain the '%' character.
@@ -457,14 +581,26 @@ items:
     name: --secret-identifier
     summary: ID of the Key Vault object. Can be found using 'az keyvault {collection} show' command, where collection is key, secret or certificate. To set reference to the latest version of your secret, remove version information from secret identifier.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, set the key with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -472,124 +608,120 @@ items:
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_show
   name: az appconfig kv show
   summary: Show all attributes of a key-value.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv show --key
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--datetime]
+                         [--endpoint]
+                         [--label]
+                         [--name]
+                         [--query-examples]
+                         [--subscription]
   examples:
   - summary: Show a key-value using App Configuration name with a specific label and datetime
-    syntax:
-      content: az appconfig kv show -n MyAppConfiguration --key color --label MyLabel --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv show -n MyAppConfiguration --key color --label MyLabel --datetime "2019-05-01T11:24:12Z"
   - summary: Show a key-value using connection string with label
-    syntax:
-      content: az appconfig kv show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
-  parameters:
+    syntax: az appconfig kv show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
+  - summary: Show a key-value using your 'az login' credentials.
+    syntax: az appconfig kv show --key color --auth-mode login --endpoint https://myappconfiguration.azconfig.io
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be showed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, show entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_unlock
   name: az appconfig kv unlock
   summary: Unlock a key-value to gain write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv unlock --key
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--endpoint]
+                           [--label]
+                           [--name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Unlock a key-value using App Configuration name.
-    syntax:
-      content: az appconfig kv unlock -n MyAppConfiguration --key color --label test
+    syntax: az appconfig kv unlock -n MyAppConfiguration --key color --label test
   - summary: Force unlocking a key-value using connection string.
-    syntax:
-      content: az appconfig kv unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
-  parameters:
+    syntax: az appconfig kv unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be unlocked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, unlock entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_kv_delete
-  name: az appconfig kv delete
-  summary: Delete key-values.
-- uid: az_appconfig_kv_export
-  name: az appconfig kv export
-  summary: Export configurations to another place from your App Configuration.
-- uid: az_appconfig_kv_import
-  name: az appconfig kv import
-  summary: Import configurations into your App Configuration from another place.
-- uid: az_appconfig_kv_list
-  name: az appconfig kv list
-  summary: List key-values.
-- uid: az_appconfig_kv_lock
-  name: az appconfig kv lock
-  summary: Lock a key-value to prohibit write operations.
-- uid: az_appconfig_kv_restore
-  name: az appconfig kv restore
-  summary: Restore key-values.
-- uid: az_appconfig_kv_set
-  name: az appconfig kv set
-  summary: Set a key-value.
-- uid: az_appconfig_kv_set_keyvault
-  name: az appconfig kv set-keyvault
-  summary: Set a keyvault reference.
-- uid: az_appconfig_kv_show
-  name: az appconfig kv show
-  summary: Show all attributes of a key-value.
-- uid: az_appconfig_kv_unlock
-  name: az appconfig kv unlock
-  summary: Unlock a key-value to gain write operations.
+- az_appconfig_kv_delete
+- az_appconfig_kv_export
+- az_appconfig_kv_import
+- az_appconfig_kv_list
+- az_appconfig_kv_lock
+- az_appconfig_kv_restore
+- az_appconfig_kv_set
+- az_appconfig_kv_set-keyvault
+- az_appconfig_kv_show
+- az_appconfig_kv_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -605,10 +737,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage key-values stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage key-values stored in an App Configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/appconfig/revision.yml b/2017-03-09-profile/docs-ref-autogen/appconfig/revision.yml
index 37c362f780..ce4398c928 100644
--- a/2017-03-09-profile/docs-ref-autogen/appconfig/revision.yml
+++ b/2017-03-09-profile/docs-ref-autogen/appconfig/revision.yml
@@ -1,42 +1,56 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_revision
-  name: az appconfig revision
-  summary: Manage revisions for key-values stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_revision_list
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_revision
+name: az appconfig revision
+summary: Manage revisions for key-values stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_revision_list
   name: az appconfig revision list
   summary: Lists revision history of key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig revision list [--all]
+                               [--auth-mode {key, login}]
+                               [--connection-string]
+                               [--datetime]
+                               [--endpoint]
+                               [--fields {content_type, etag, key, label, last_modified, locked, tags, value}]
+                               [--key]
+                               [--label]
+                               [--name]
+                               [--query-examples]
+                               [--subscription]
+                               [--top]
   examples:
   - summary: List revision history of a key-value using App Configuration name.
-    syntax:
-      content: az appconfig revision list -n MyAppConfiguration --key color --label test
+    syntax: az appconfig revision list -n MyAppConfiguration --key color --label test
   - summary: List revision history of a key-value with multiple labels.
-    syntax:
-      content: az appconfig revision list -n MyAppConfiguration --key color --label test,prod,\0
+    syntax: az appconfig revision list -n MyAppConfiguration --key color --label test,prod,\0
   - summary: List revision history for key "color" with any labels using connection string
-    syntax:
-      content: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --datetime "2019-05-01T11:24:12Z"
-  parameters:
+    syntax: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --datetime "2019-05-01T11:24:12Z"
+  - summary: List revision history for all items and query only key, value and last_modified.
+    syntax: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value last_modified
+  optionalParameters:
   - name: --all
     summary: List all items.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --fields
     parameterValueGroup: content_type, etag, key, label, last_modified, locked, tags, value
-    summary: Customize output fields.
+    summary: Space-separated customized output fields.
     description: ''
   - name: --key
     summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
@@ -45,24 +59,20 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_revision_list
-  name: az appconfig revision list
-  summary: Lists revision history of key-values.
+- az_appconfig_revision_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -78,10 +88,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage revisions for key-values stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage revisions for key-values stored in an App Configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/arcappliance.yml b/2017-03-09-profile/docs-ref-autogen/arcappliance.yml
new file mode 100644
index 0000000000..0ad8a69c53
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/arcappliance.yml
@@ -0,0 +1,90 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance
+name: az arcappliance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage an Arc Appliance.
+description: ''
+directCommands:
+- uid: az_arcappliance_get-credentials
+  name: az arcappliance get-credentials
+  summary: Command to get credentials.
+  description: ''
+  syntax: >-
+    az arcappliance get-credentials --name
+                                    --resource-group
+  examples:
+  - summary: Command to get credentials for a specific Appliance resource.
+    syntax: az arcappliance get-credentials --resource-group [REQUIRED] --name [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_list
+  name: az arcappliance list
+  summary: Command to list Arc Appliances.
+  description: ''
+  syntax: az arcappliance list [--resource-group]
+  examples:
+  - summary: Command to list Appliance resources in a resource group in current subscription context.
+    syntax: az arcappliance list -g [OPTIONAL]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_show
+  name: az arcappliance show
+  summary: Command to get an Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance show --name
+                         --resource-group
+  examples:
+  - summary: Command to give details about a particular Appliance resource in a resource group
+    syntax: az arcappliance show --resource-group [REQUIRED] --name [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_create
+- az_arcappliance_create_hci
+- az_arcappliance_create_vmware
+- az_arcappliance_delete
+- az_arcappliance_delete_hci
+- az_arcappliance_delete_vmware
+- az_arcappliance_deploy
+- az_arcappliance_deploy_hci
+- az_arcappliance_deploy_vmware
+- az_arcappliance_get-credentials
+- az_arcappliance_list
+- az_arcappliance_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage an Arc Appliance.
diff --git a/2017-03-09-profile/docs-ref-autogen/arcappliance/create.yml b/2017-03-09-profile/docs-ref-autogen/arcappliance/create.yml
new file mode 100644
index 0000000000..8be82f7c92
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/arcappliance/create.yml
@@ -0,0 +1,94 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_create
+name: az arcappliance create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for creation of appliance.
+description: ''
+directCommands:
+- uid: az_arcappliance_create_hci
+  name: az arcappliance create hci
+  summary: Command to create HCI Arc Appliance - must be done after Appliance has been deployed.
+  description: ''
+  syntax: >-
+    az arcappliance create hci --config-file
+                               --kubeconfig
+                               [--location]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Create Arc Appliance HCI Resource
+    syntax: az arcappliance create hci --config-file [REQUIRED] --kubeconfig [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  - isRequired: true
+    name: --kubeconfig
+    summary: Path to kubeconfig output from deploy command.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_create_vmware
+  name: az arcappliance create vmware
+  summary: Command to create VMware Arc Appliance - must be done Appliance has been deployed.
+  description: ''
+  syntax: >-
+    az arcappliance create vmware --config-file
+                                  --kubeconfig
+                                  [--location]
+                                  [--name]
+                                  [--resource-group]
+  examples:
+  - summary: Create Arc Appliance VMware Resource
+    syntax: az arcappliance create vmware --config-file [REQUIRED] --kubeconfig [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  - isRequired: true
+    name: --kubeconfig
+    summary: Path to kubeconfig output from deploy command.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_create_hci
+- az_arcappliance_create_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for creation of appliance.
diff --git a/2017-03-09-profile/docs-ref-autogen/arcappliance/delete.yml b/2017-03-09-profile/docs-ref-autogen/arcappliance/delete.yml
new file mode 100644
index 0000000000..025b6b3708
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/arcappliance/delete.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_delete
+name: az arcappliance delete
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance delete** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for deletion of appliance cluster and resource.
+description: ''
+directCommands:
+- uid: az_arcappliance_delete_hci
+  name: az arcappliance delete hci
+  summary: Command to delete HCI Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance delete hci --config-file
+                               [--location]
+                               [--name]
+                               [--resource-group]
+                               [--yes]
+  examples:
+  - summary: Delete Arc Appliance HCI Resource
+    syntax: az arcappliance delete hci --config-file [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_arcappliance_delete_vmware
+  name: az arcappliance delete vmware
+  summary: Command to delete VMware Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance delete vmware --config-file
+                                  [--location]
+                                  [--name]
+                                  [--resource-group]
+                                  [--yes]
+  examples:
+  - summary: Delete Arc Appliance VMware Resource
+    syntax: az arcappliance delete vmware --config-file [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+commands:
+- az_arcappliance_delete_hci
+- az_arcappliance_delete_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for deletion of appliance cluster and resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/arcappliance/deploy.yml b/2017-03-09-profile/docs-ref-autogen/arcappliance/deploy.yml
new file mode 100644
index 0000000000..ac8a09ca92
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/arcappliance/deploy.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_deploy
+name: az arcappliance deploy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance deploy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for deployment of appliance cluster.
+description: ''
+directCommands:
+- uid: az_arcappliance_deploy_hci
+  name: az arcappliance deploy hci
+  summary: Command to deploy HCI Arc Appliance - must be done before Azure Resource creation.
+  description: ''
+  syntax: >-
+    az arcappliance deploy hci --config-file
+                               [--location]
+                               [--name]
+                               [--outfile]
+                               [--resource-group]
+  examples:
+  - summary: Deploy Arc Appliance using HCI
+    syntax: az arcappliance deploy hci --config-file [REQUIRED]
+  - summary: Deploy Arc Appliance using HCI with a specified outfile
+    syntax: az arcappliance deploy hci --config-file [REQUIRED] --outfile [OPTIONAL]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --outfile
+    defaultValue: kubeconfig
+    summary: Path to where Kubeconfig should be output, defaults to ./kubeconfig.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_deploy_vmware
+  name: az arcappliance deploy vmware
+  summary: Command to deploy VMware Arc Appliance - must be done before Azure Resource creation.
+  description: ''
+  syntax: >-
+    az arcappliance deploy vmware --config-file
+                                  [--location]
+                                  [--name]
+                                  [--outfile]
+                                  [--resource-group]
+  examples:
+  - summary: Deploy Arc Appliance using VMware
+    syntax: az arcappliance deploy vmware --config-file [REQUIRED]
+  - summary: Deploy Arc Appliance using VMware with a specified outfile
+    syntax: az arcappliance deploy vmware --config-file [REQUIRED] --outfile [OPTIONAL]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --outfile
+    defaultValue: kubeconfig
+    summary: Path to where Kubeconfig should be output, defaults to ./kubeconfig.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_deploy_hci
+- az_arcappliance_deploy_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for deployment of appliance cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/artifacts.yml b/2017-03-09-profile/docs-ref-autogen/artifacts.yml
index 1cd52e4092..a5d005d483 100644
--- a/2017-03-09-profile/docs-ref-autogen/artifacts.yml
+++ b/2017-03-09-profile/docs-ref-autogen/artifacts.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_artifacts
+name: az artifacts
+summary: Manage Azure Artifacts.
+description: This command group is a part of the azure-devops extension.
 commands:
-- uid: az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-- uid: az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
+- az_artifacts_universal
+- az_artifacts_universal_download
+- az_artifacts_universal_publish
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,4 +22,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/artifacts/universal.yml b/2017-03-09-profile/docs-ref-autogen/artifacts/universal.yml
index 0a89664228..cfa0e7eb3d 100644
--- a/2017-03-09-profile/docs-ref-autogen/artifacts/universal.yml
+++ b/2017-03-09-profile/docs-ref-autogen/artifacts/universal.yml
@@ -1,21 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_artifacts_universal_download
-  - az_artifacts_universal_publish
+### YamlMime:AzureCLIGroup
+uid: az_artifacts_universal
+name: az artifacts universal
+summary: Manage Universal Packages.
+description: ''
+directCommands:
 - uid: az_artifacts_universal_download
   name: az artifacts universal download
   summary: Download a package.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az artifacts universal download --feed
+                                    --name
+                                    --path
+                                    --version
+                                    [--detect {false, true}]
+                                    [--file-filter]
+                                    [--org]
+                                    [--project]
+                                    [--scope {organization, project}]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --feed
     summary: Name or ID of the feed.
@@ -32,6 +36,7 @@ items:
     name: --version -v
     summary: Version of the package, e.g. 1.0.0.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -40,7 +45,7 @@ items:
     summary: Wildcard filter for file download.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -57,9 +62,18 @@ items:
   name: az artifacts universal publish
   summary: Publish a package to a feed.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az artifacts universal publish --feed
+                                   --name
+                                   --path
+                                   --version
+                                   [--description]
+                                   [--detect {false, true}]
+                                   [--org]
+                                   [--project]
+                                   [--scope {organization, project}]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --feed
     summary: Name or ID of the feed.
@@ -76,6 +90,7 @@ items:
     name: --version -v
     summary: Version of the package, e.g. '1.0.0'.
     description: ''
+  optionalParameters:
   - name: --description -d
     summary: Description of the package.
     description: ''
@@ -84,7 +99,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -98,12 +113,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
+- az_artifacts_universal_download
+- az_artifacts_universal_publish
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -119,4 +130,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Universal Packages.
+metadata:
+  description: Manage Universal Packages.
diff --git a/2017-03-09-profile/docs-ref-autogen/attestation.yml b/2017-03-09-profile/docs-ref-autogen/attestation.yml
new file mode 100644
index 0000000000..9251c8c0e3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/attestation.yml
@@ -0,0 +1,184 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation
+name: az attestation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Microsoft Azure Attestation (MAA).
+description: ''
+directCommands:
+- uid: az_attestation_create
+  name: az attestation create
+  summary: Creates a new Attestation Provider instance.
+  description: ''
+  syntax: >-
+    az attestation create --location
+                          --name
+                          --resource-group
+                          [--certs-input-path]
+                          [--tags]
+  examples:
+  - summary: AttestationProviders_Create
+    syntax: az attestation create --name "myattestationprovider" --resource-group "MyResourceGroup" -l westus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --certs-input-path
+    summary: Space-separated file paths to PEM/DER files containing certificates.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_attestation_delete
+  name: az attestation delete
+  summary: Delete Attestation Service.
+  description: ''
+  syntax: >-
+    az attestation delete [--id]
+                          [--name]
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: AttestationProviders_Delete
+    syntax: az attestation delete --name "myattestationprovider" --resource-group "sample-resource-group"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_attestation_get-default-by-location
+  name: az attestation get-default-by-location
+  summary: Get the default provider by location.
+  description: ''
+  syntax: az attestation get-default-by-location --location
+  examples:
+  - summary: AttestationProviders_GetDefaultWithLocation
+    syntax: az attestation get-default-by-location --location "Central US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. (eg: "West US").'
+    description: ''
+- uid: az_attestation_list
+  name: az attestation list
+  summary: Returns a list of attestation providers in a subscription.
+  description: ''
+  syntax: az attestation list [--resource-group]
+  examples:
+  - summary: AttestationProviders_ListByResourceGroup
+    syntax: az attestation list --resource-group "testrg1"
+  - summary: AttestationProviders_List
+    syntax: az attestation list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_list-default
+  name: az attestation list-default
+  summary: Get the default provider.
+  description: ''
+  syntax: az attestation list-default
+  examples:
+  - summary: AttestationProviders_GetDefault
+    syntax: az attestation list-default
+- uid: az_attestation_show
+  name: az attestation show
+  summary: Get the status of Attestation Provider.
+  description: ''
+  syntax: >-
+    az attestation show [--id]
+                        [--name]
+                        [--resource-group]
+  examples:
+  - summary: AttestationProviders_Get
+    syntax: az attestation show --name "myattestationprovider" --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_update
+  name: az attestation update
+  summary: Updates the Attestation Provider.
+  description: ''
+  syntax: >-
+    az attestation update --name
+                          --resource-group
+                          [--tags]
+  examples:
+  - summary: AttestationProviders_Update
+    syntax: >-
+      az attestation update --name "myattestationprovider" --resource-group "MyResourceGroup" \
+
+      --tags Property1="Value1" Property2="Value2" Property3="Value3"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_attestation_create
+- az_attestation_delete
+- az_attestation_get-default-by-location
+- az_attestation_list
+- az_attestation_list-default
+- az_attestation_policy
+- az_attestation_policy_reset
+- az_attestation_policy_set
+- az_attestation_policy_show
+- az_attestation_show
+- az_attestation_signer
+- az_attestation_signer_add
+- az_attestation_signer_list
+- az_attestation_signer_remove
+- az_attestation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Microsoft Azure Attestation (MAA).
diff --git a/2017-03-09-profile/docs-ref-autogen/attestation/policy.yml b/2017-03-09-profile/docs-ref-autogen/attestation/policy.yml
new file mode 100644
index 0000000000..1ece84d673
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/attestation/policy.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation_policy
+name: az attestation policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage policies.
+description: ''
+directCommands:
+- uid: az_attestation_policy_reset
+  name: az attestation policy reset
+  summary: Resets the attestation policy for the specified tenant and reverts to the default policy.
+  description: ''
+  syntax: >-
+    az attestation policy reset --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                                [--id]
+                                [--name]
+                                [--policy-jws]
+                                [--resource-group]
+  examples:
+  - summary: Resets the attestation policy for the specified tenant and reverts to the default policy.
+    syntax: >-
+      az attestation policy reset -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --policy-jws "eyJhbGciOiJub25lIn0.."
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --policy-jws
+    defaultValue: eyJhbGciOiJub25lIn0..
+    summary: JSON Web Signature with an empty policy document.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_policy_set
+  name: az attestation policy set
+  summary: Sets the policy for a given kind of attestation type.
+  description: ''
+  syntax: >-
+    az attestation policy set --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                              [--id]
+                              [--name]
+                              [--new-attestation-policy]
+                              [--new-attestation-policy-file]
+                              [--policy-format {JWT, Text}]
+                              [--resource-group]
+  examples:
+  - summary: Sets the policy for a given kind of attestation type using JWT content.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy "{JWT}" --policy-format JWT
+  - summary: Sets the policy for a given kind of attestation type using Text content.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy "{json_text}"
+  - summary: Sets the policy for a given kind of attestation type using file name.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy-file "{file_name}" --policy-format JWT
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --new-attestation-policy
+    summary: Content of the new attestation policy (Text or JWT).
+    description: ''
+  - name: --new-attestation-policy-file -f
+    summary: File name of the new attestation policy.
+    description: ''
+  - name: --policy-format
+    defaultValue: Text
+    parameterValueGroup: JWT, Text
+    summary: Specifies the format for the policy, either Text or JWT (JSON Web Token).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_policy_show
+  name: az attestation policy show
+  summary: Retrieves the current policy for a given kind of attestation type.
+  description: ''
+  syntax: >-
+    az attestation policy show --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                               [--id]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Retrieves the current policy for a given kind of attestation type.
+    syntax: >-
+      az attestation policy show -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_attestation_policy_reset
+- az_attestation_policy_set
+- az_attestation_policy_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/attestation/signer.yml b/2017-03-09-profile/docs-ref-autogen/attestation/signer.yml
new file mode 100644
index 0000000000..4f2e97e682
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/attestation/signer.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation_signer
+name: az attestation signer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation signer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage signers.
+description: ''
+directCommands:
+- uid: az_attestation_signer_add
+  name: az attestation signer add
+  summary: Adds a new attestation policy certificate to the set of policy management certificates.
+  description: ''
+  syntax: >-
+    az attestation signer add [--id]
+                              [--name]
+                              [--resource-group]
+                              [--signer]
+                              [--signer-file]
+  examples:
+  - summary: Adds a new attestation policy certificate to the set of policy management certificates.
+    syntax: >-
+      az attestation signer add -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --signer "eyAiYWxnIjoiUlMyNTYiLCAie..."
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --signer
+    summary: The policy certificate to add. An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate" whose value is an RFC7517 JSON Web Key which specifies a new key to update. The RFC7519 JWT must be signed with one of the existing signing certificates.
+    description: ''
+  - name: --signer-file -f
+    summary: File name of the signer. (--signer and --signer-file/-f are mutually exclusive.).
+    description: ''
+- uid: az_attestation_signer_list
+  name: az attestation signer list
+  summary: Retrieves the set of certificates used to express policy for the current tenant.
+  description: ''
+  syntax: >-
+    az attestation signer list [--id]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Retrieves the set of certificates used to express policy for the current tenant.
+    syntax: az attestation signer list -n "myattestationprovider" -g "MyResourceGroup"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_signer_remove
+  name: az attestation signer remove
+  summary: Removes the specified policy management certificate.
+  description: ''
+  syntax: >-
+    az attestation signer remove [--id]
+                                 [--name]
+                                 [--resource-group]
+                                 [--signer]
+                                 [--signer-file]
+  examples:
+  - summary: Removes the specified policy management certificate.
+    syntax: >-
+      az attestation signer remove -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --signer "eyAiYWxnIjoiUlMyNTYiLCAie..."
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --signer
+    summary: The policy certificate to remove. An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate" whose value is an RFC7517 JSON Web Key which specifies a new key to update. The RFC7519 JWT must be signed with one of the existing signing certificates.
+    description: ''
+  - name: --signer-file -f
+    summary: File name of the signer. (--signer and --signer-file/-f are mutually exclusive.).
+    description: ''
+commands:
+- az_attestation_signer_add
+- az_attestation_signer_list
+- az_attestation_signer_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage signers.
diff --git a/2017-03-09-profile/docs-ref-autogen/automation.yml b/2017-03-09-profile/docs-ref-autogen/automation.yml
new file mode 100644
index 0000000000..d242ff42e5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/automation.yml
@@ -0,0 +1,49 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation
+name: az automation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_automation_account
+- az_automation_account_create
+- az_automation_account_delete
+- az_automation_account_list
+- az_automation_account_show
+- az_automation_account_update
+- az_automation_job
+- az_automation_job_list
+- az_automation_job_resume
+- az_automation_job_show
+- az_automation_job_stop
+- az_automation_job_suspend
+- az_automation_runbook
+- az_automation_runbook_create
+- az_automation_runbook_delete
+- az_automation_runbook_list
+- az_automation_runbook_publish
+- az_automation_runbook_replace-content
+- az_automation_runbook_revert-to-published
+- az_automation_runbook_show
+- az_automation_runbook_start
+- az_automation_runbook_update
+- az_automation_runbook_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/automation/account.yml b/2017-03-09-profile/docs-ref-autogen/automation/account.yml
new file mode 100644
index 0000000000..473fbb9e54
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/automation/account.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_account
+name: az automation account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Account.
+description: ''
+directCommands:
+- uid: az_automation_account_create
+  name: az automation account create
+  summary: Create automation account.
+  description: ''
+  syntax: >-
+    az automation account create --automation-account-name
+                                 --resource-group
+                                 [--location]
+                                 [--sku {Basic, Free}]
+                                 [--tags]
+  examples:
+  - summary: Create an automation account
+    syntax: az automation account create --automation-account-name "myAutomationAccount" --location "East US 2"                --sku "Free" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: Basic, Free
+    summary: Account SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_account_delete
+  name: az automation account delete
+  summary: Delete an automation account.
+  description: ''
+  syntax: >-
+    az automation account delete --automation-account-name
+                                 --resource-group
+                                 [--yes]
+  examples:
+  - summary: Delete automation account
+    syntax: az automation account delete --name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_automation_account_list
+  name: az automation account list
+  summary: Retrieve a list of accounts within a given resource group. And Retrieve a list of accounts within a given subscription.
+  description: ''
+  syntax: az automation account list [--resource-group]
+  examples:
+  - summary: List automation accounts by resource group
+    syntax: az automation account list --resource-group "rg"
+  - summary: List automation accounts by resource group
+    syntax: az automation account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_account_show
+  name: az automation account show
+  summary: Get information about an Automation Account.
+  description: ''
+  syntax: >-
+    az automation account show --automation-account-name
+                               --resource-group
+  examples:
+  - summary: Get automation account
+    syntax: az automation account show --name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_account_update
+  name: az automation account update
+  summary: Update an automation account.
+  description: ''
+  syntax: >-
+    az automation account update --automation-account-name
+                                 --resource-group
+                                 [--sku {Basic, Free}]
+                                 [--tags]
+  examples:
+  - summary: Update an automation account
+    syntax: az automation account update --automation-account-name "myAutomationAccount" --tags KEY=VALUE                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: Basic, Free
+    summary: Account SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_automation_account_create
+- az_automation_account_delete
+- az_automation_account_list
+- az_automation_account_show
+- az_automation_account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Account.
diff --git a/2017-03-09-profile/docs-ref-autogen/automation/job.yml b/2017-03-09-profile/docs-ref-autogen/automation/job.yml
new file mode 100644
index 0000000000..cac965160c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/automation/job.yml
@@ -0,0 +1,148 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_job
+name: az automation job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Job.
+description: ''
+directCommands:
+- uid: az_automation_job_list
+  name: az automation job list
+  summary: Retrieve a list of jobs.
+  description: ''
+  syntax: >-
+    az automation job list --automation-account-name
+                           --resource-group
+  examples:
+  - summary: List jobs by automation account
+    syntax: az automation job list --automation-account-name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_resume
+  name: az automation job resume
+  summary: Resume the job identified by jobName.
+  description: ''
+  syntax: >-
+    az automation job resume --automation-account-name
+                             --job-name
+                             --resource-group
+  examples:
+  - summary: Resume job
+    syntax: az automation job resume --automation-account-name "myAutomationAccount" --name "foo"                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_show
+  name: az automation job show
+  summary: Retrieve the job identified by job name.
+  description: ''
+  syntax: >-
+    az automation job show --automation-account-name
+                           --job-name
+                           --resource-group
+  examples:
+  - summary: Get job
+    syntax: az automation job show --automation-account-name "myAutomationAccount" --name "foo" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_stop
+  name: az automation job stop
+  summary: Stop the job identified by jobName.
+  description: ''
+  syntax: >-
+    az automation job stop --automation-account-name
+                           --job-name
+                           --resource-group
+  examples:
+  - summary: Stop job
+    syntax: az automation job stop --automation-account-name "myAutomationAccount" --name "foo" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_suspend
+  name: az automation job suspend
+  summary: Suspend the job identified by job name.
+  description: ''
+  syntax: >-
+    az automation job suspend --automation-account-name
+                              --job-name
+                              --resource-group
+  examples:
+  - summary: Suspend job
+    syntax: az automation job suspend --automation-account-name "myAutomationAccount" --name "foo"                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_automation_job_list
+- az_automation_job_resume
+- az_automation_job_show
+- az_automation_job_stop
+- az_automation_job_suspend
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Job.
diff --git a/2017-03-09-profile/docs-ref-autogen/automation/runbook.yml b/2017-03-09-profile/docs-ref-autogen/automation/runbook.yml
new file mode 100644
index 0000000000..c8586384b9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/automation/runbook.yml
@@ -0,0 +1,388 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_runbook
+name: az automation runbook
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation runbook** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Runbook.
+description: ''
+directCommands:
+- uid: az_automation_runbook_create
+  name: az automation runbook create
+  summary: Create the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook create --automation-account-name
+                                 --name
+                                 --resource-group
+                                 --type {Graph, GraphPowerShell, GraphPowerShellWorkflow, PowerShell, PowerShellWorkflow, Script}
+                                 [--description]
+                                 [--location]
+                                 [--log-activity-trace]
+                                 [--log-progress {false, true}]
+                                 [--log-verbose {false, true}]
+                                 [--tags]
+  examples:
+  - summary: Create a runbook
+    syntax: az automation runbook create --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook" --type "PowerShell" --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Graph, GraphPowerShell, GraphPowerShellWorkflow, PowerShell, PowerShellWorkflow, Script
+    summary: Type of the runbook.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the runbook.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-activity-trace
+    summary: Activity level tracing options of the runbook.
+    description: ''
+  - name: --log-progress
+    parameterValueGroup: false, true
+    summary: Progress log option of the runbook.
+    description: ''
+  - name: --log-verbose
+    parameterValueGroup: false, true
+    summary: Verbose log option of the runbook.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_runbook_delete
+  name: az automation runbook delete
+  summary: Delete the runbook by name.
+  description: ''
+  syntax: >-
+    az automation runbook delete --automation-account-name
+                                 --name
+                                 --resource-group
+                                 [--yes]
+  examples:
+  - summary: Delete a runbook
+    syntax: az automation runbook delete --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_automation_runbook_list
+  name: az automation runbook list
+  summary: Retrieve a list of runbooks.
+  description: ''
+  syntax: >-
+    az automation runbook list --automation-account-name
+                               --resource-group
+  examples:
+  - summary: List runbooks by automation account
+    syntax: az automation runbook list --automation-account-name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_publish
+  name: az automation runbook publish
+  summary: Publish runbook draft.
+  description: ''
+  syntax: >-
+    az automation runbook publish --automation-account-name
+                                  --name
+                                  --resource-group
+                                  [--no-wait]
+  examples:
+  - summary: Publish runbook draft
+    syntax: az automation runbook publish --automation-account-name "myAutomationAccount" --resource-group                "rg" --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The parameters supplied to the publish runbook operation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_automation_runbook_replace-content
+  name: az automation runbook replace-content
+  summary: Replace content of the runbook.
+  description: ''
+  syntax: >-
+    az automation runbook replace-content --automation-account-name
+                                          --content
+                                          --name
+                                          --resource-group
+                                          [--no-wait]
+  examples:
+  - summary: Replace content of the runbook
+    syntax: az automation runbook replace-content --automation-account-name "myAutomationAccount" --resource-group                "rg" --name "myRunbook" --content @/path/to/script
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --content
+    summary: The runbook content.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_automation_runbook_revert-to-published
+  name: az automation runbook revert-to-published
+  summary: Revert the runbook content to last known published state.
+  description: ''
+  syntax: >-
+    az automation runbook revert-to-published --automation-account-name
+                                              --name
+                                              --resource-group
+  examples:
+  - summary: Replace content of the runbook
+    syntax: az automation runbook revert-to-published --automation-account-name "myAutomationAccount"                --resource-group "rg" --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_show
+  name: az automation runbook show
+  summary: Retrieve the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook show --automation-account-name
+                               --name
+                               --resource-group
+  examples:
+  - summary: Get runbook
+    syntax: az automation runbook show --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_start
+  name: az automation runbook start
+  summary: Start the runbook.
+  description: ''
+  syntax: >-
+    az automation runbook start --automation-account-name
+                                --resource-group
+                                [--name]
+                                [--parameters]
+                                [--run-on]
+  examples:
+  - summary: Start the runbook
+    syntax: az automation runbook start --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters of the job. Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --run-on
+    summary: RunOn which specifies the group name where the job is to be executed.
+    description: ''
+- uid: az_automation_runbook_update
+  name: az automation runbook update
+  summary: Update the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook update --automation-account-name
+                                 --name
+                                 --resource-group
+                                 [--description]
+                                 [--log-activity-trace]
+                                 [--log-progress {false, true}]
+                                 [--log-verbose {false, true}]
+                                 [--tags]
+  examples:
+  - summary: Update a runbook
+    syntax: az automation runbook update --automation-account-name "myAutomationAccount" --description                "Runbook Description" --log-activity-trace 1 --log-progress true --log-verbose false                --resource-group "rg" --runbook-name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the runbook.
+    description: ''
+  - name: --log-activity-trace
+    summary: Activity level tracing options of the runbook.
+    description: ''
+  - name: --log-progress
+    parameterValueGroup: false, true
+    summary: Progress log option of the runbook.
+    description: ''
+  - name: --log-verbose
+    parameterValueGroup: false, true
+    summary: Verbose log option of the runbook.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_runbook_wait
+  name: az automation runbook wait
+  summary: Place the CLI in a waiting state until a condition of the automation runbook is met.
+  description: ''
+  syntax: >-
+    az automation runbook wait --automation-account-name
+                               --name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the automation runbook is successfully created.
+    syntax: az automation runbook wait --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook" --created
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_automation_runbook_create
+- az_automation_runbook_delete
+- az_automation_runbook_list
+- az_automation_runbook_publish
+- az_automation_runbook_replace-content
+- az_automation_runbook_revert-to-published
+- az_automation_runbook_show
+- az_automation_runbook_start
+- az_automation_runbook_update
+- az_automation_runbook_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Runbook.
diff --git a/2017-03-09-profile/docs-ref-autogen/baremetalinstance.yml b/2017-03-09-profile/docs-ref-autogen/baremetalinstance.yml
new file mode 100644
index 0000000000..4648feef1f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/baremetalinstance.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_baremetalinstance
+name: az baremetalinstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **baremetal-infrastructure** extension for Azure CLI and requires version 2.12.0 or higher.  The extension will automatically install the first time you run an **az baremetalinstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage BareMetal Instances.
+description: ''
+directCommands:
+- uid: az_baremetalinstance_delete
+  name: az baremetalinstance delete
+  summary: Delete a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance delete --instance-name
+                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_list
+  name: az baremetalinstance list
+  summary: List BareMetal Instances.
+  description: ''
+  syntax: az baremetalinstance list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_restart
+  name: az baremetalinstance restart
+  summary: Restart a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance restart --instance-name
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_show
+  name: az baremetalinstance show
+  summary: Get the details of a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance show --instance-name
+                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_shutdown
+  name: az baremetalinstance shutdown
+  summary: Shutdown a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance shutdown --instance-name
+                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_start
+  name: az baremetalinstance start
+  summary: Start a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance start --instance-name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_update
+  name: az baremetalinstance update
+  summary: Update the tags field of a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance update --instance-name
+                                --resource-group
+                                [--add]
+                                [--force-string]
+                                [--no-wait]
+                                [--remove]
+                                [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_baremetalinstance_delete
+- az_baremetalinstance_list
+- az_baremetalinstance_restart
+- az_baremetalinstance_show
+- az_baremetalinstance_shutdown
+- az_baremetalinstance_start
+- az_baremetalinstance_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage BareMetal Instances.
diff --git a/2017-03-09-profile/docs-ref-autogen/batch.yml b/2017-03-09-profile/docs-ref-autogen/batch.yml
new file mode 100644
index 0000000000..fc7056b203
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/batch.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch
+name: az batch
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Batch.
+description: ''
+commands:
+- az_batch_file
+- az_batch_file_download
+- az_batch_file_upload
+- az_batch_job
+- az_batch_job_create
+- az_batch_pool
+- az_batch_pool_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Batch.
diff --git a/2017-03-09-profile/docs-ref-autogen/batch/file.yml b/2017-03-09-profile/docs-ref-autogen/batch/file.yml
new file mode 100644
index 0000000000..07eebdf0eb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/batch/file.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_file
+name: az batch file
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch file** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch input files.
+description: ''
+directCommands:
+- uid: az_batch_file_download
+  name: az batch file download
+  summary: Download a specified file or directory of files to the specified storage path.
+  description: ''
+  syntax: >-
+    az batch file download --file-group
+                           --local-path
+                           [--account-endpoint]
+                           [--account-key]
+                           [--account-name]
+                           [--overwrite]
+                           [--remote-path]
+                           [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --file-group
+    summary: Name of a file group from which the files will be downloaded.
+    description: ''
+  - isRequired: true
+    name: --local-path
+    summary: Path to a local file or directory to be stored the download files.
+    description: ''
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --overwrite
+    summary: If set, an existing file in the local path will be overwritten.
+    description: ''
+  - name: --remote-path
+    summary: The subdirectory under which files exist remotely.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+- uid: az_batch_file_upload
+  name: az batch file upload
+  summary: Upload a specified file or directory of files to the specified storage path.
+  description: ''
+  syntax: >-
+    az batch file upload --file-group
+                         --local-path
+                         [--account-endpoint]
+                         [--account-key]
+                         [--account-name]
+                         [--flatten]
+                         [--remote-path]
+                         [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --file-group
+    summary: Name of a file group under which the files will be stored.
+    description: ''
+  - isRequired: true
+    name: --local-path
+    summary: Path to a local file or directory to be uploaded - can include wildcard patterns.
+    description: ''
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --flatten
+    summary: If set, will not retain local directory structure in storage.
+    description: ''
+  - name: --remote-path
+    summary: Group subdirectory under which files will be uploaded.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+commands:
+- az_batch_file_download
+- az_batch_file_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch input files.
diff --git a/2017-03-09-profile/docs-ref-autogen/batch/job.yml b/2017-03-09-profile/docs-ref-autogen/batch/job.yml
new file mode 100644
index 0000000000..0bdc131e1a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/batch/job.yml
@@ -0,0 +1,107 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_job
+name: az batch job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch jobs.
+description: ''
+directCommands:
+- uid: az_batch_job_create
+  name: az batch job create
+  summary: Add a job and associated task(s) to a Batch account.
+  description: ''
+  syntax: >-
+    az batch job create [--account-endpoint]
+                        [--account-key]
+                        [--account-name]
+                        [--id]
+                        [--job-manager-task-command-line]
+                        [--job-manager-task-environment-settings]
+                        [--job-manager-task-id]
+                        [--job-manager-task-resource-files]
+                        [--job-max-task-retry-count]
+                        [--job-max-wall-clock-time]
+                        [--json-file]
+                        [--metadata]
+                        [--parameters]
+                        [--pool-id]
+                        [--priority]
+                        [--resource-group]
+                        [--template]
+                        [--uses-task-dependencies]
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --id
+    summary: Required. A string that uniquely identifies the Job within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).
+    description: ''
+  - name: --job-manager-task-command-line
+    summary: The command line of the Job Manager task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
+    description: ''
+  - name: --job-manager-task-environment-settings
+    summary: A list of environment variable settings for the Job Manager task. Space separated values in 'key=value' format.
+    description: ''
+  - name: --job-manager-task-id
+    summary: A string that uniquely identifies the Job Manager task within the job. The id can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than 64 characters.
+    description: ''
+  - name: --job-manager-task-resource-files
+    summary: A list of files that the Batch service will download to the compute node before running the command line. Files listed under this element are located in the task's working directory. Space separated resource references in filename=httpurl format.
+    description: ''
+  - name: --job-max-task-retry-count
+    summary: The maximum number of times each task may be retried. The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try each task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries a task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry tasks. If the maximum retry count is -1, the Batch service retries tasks without limit. The default value is 0 (no retries).
+    description: ''
+  - name: --job-max-wall-clock-time
+    summary: The maximum elapsed time that the job may run, measured from the time the job is created. If the job does not complete within the time limit, the Batch service terminates it and any tasks that are still running. In this case, the termination reason will be MaxWallClockTimeExpiry. If this property is not specified, there is no time limit on how long the job may run. Expected format is an ISO-8601 duration.
+    description: ''
+  - name: --json-file
+    summary: The file containing the job to create in JSON format, if this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --metadata
+    summary: A list of name-value pairs associated with the job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code. Space separated values in 'key=value' format.
+    description: ''
+  - name: --parameters
+    summary: Parameter values for a Batch job JSON template file. Can only be used with --template.
+    description: ''
+  - name: --pool-id
+    summary: The id of an existing pool. All the tasks of the job will run on the specified pool.
+    description: ''
+  - name: --priority
+    summary: The priority of the Job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. The default value is 0.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+  - name: --template
+    summary: A Batch job JSON template file. If this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --uses-task-dependencies
+    summary: The flag that determines if this job will use tasks with dependencies. True if flag present.
+    description: ''
+commands:
+- az_batch_job_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/batch/pool.yml b/2017-03-09-profile/docs-ref-autogen/batch/pool.yml
new file mode 100644
index 0000000000..95958ad097
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/batch/pool.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_pool
+name: az batch pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch pools.
+description: ''
+directCommands:
+- uid: az_batch_pool_create
+  name: az batch pool create
+  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
+  description: ''
+  syntax: >-
+    az batch pool create [--account-endpoint]
+                         [--account-key]
+                         [--account-name]
+                         [--application-licenses]
+                         [--application-package-references]
+                         [--auto-scale-formula]
+                         [--certificate-references]
+                         [--disk-encryption-targets]
+                         [--enable-inter-node-communication]
+                         [--id]
+                         [--image]
+                         [--json-file]
+                         [--metadata]
+                         [--node-agent-sku-id]
+                         [--os-family]
+                         [--parameters]
+                         [--resize-timeout]
+                         [--resource-group]
+                         [--start-task-command-line]
+                         [--start-task-resource-files]
+                         [--start-task-wait-for-success]
+                         [--target-dedicated-nodes]
+                         [--target-low-priority-nodes]
+                         [--template]
+                         [--vm-size]
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --application-licenses
+    summary: The list of application licenses the Batch service will make available on each Compute Node in the Pool. The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, Pool creation will fail.
+    description: ''
+  - name: --application-package-references
+    summary: The list of Packages to be installed on each Compute Node in the Pool. Changes to Package references affect all new Nodes joining the Pool, but do not affect Compute Nodes that are already in the Pool until they are rebooted or reimaged. There is a maximum of 10 Package references on any given Pool.
+    description: ''
+  - name: --auto-scale-formula
+    summary: A formula for the desired number of Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to false. It is required if enableAutoScale is set to true. The formula is checked for validity before the Pool is created. If the formula is not valid, the Batch service rejects the request with detailed error information. For more information about specifying this formula, see 'Automatically scale Compute Nodes in an Azure Batch Pool' (https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/).
+    description: ''
+  - name: --certificate-references
+    summary: The list of Certificates to be installed on each Compute Node in the Pool. For Windows Nodes, the Batch service installs the Certificates to the specified Certificate store and location. For Linux Compute Nodes, the Certificates are stored in a directory inside the Task working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the Task to query for this location. For Certificates with visibility of 'remoteUser', a 'certs' directory is created in the user's home directory (e.g., /home/{user-name}/certs) and Certificates are placed in that directory.
+    description: ''
+  - name: --disk-encryption-targets
+    summary: A space seperated list of DiskEncryptionTargets. current possible values include OsDisk and TemporaryDisk.
+    description: ''
+  - name: --enable-inter-node-communication
+    summary: Whether the Pool permits direct communication between Compute Nodes. Enabling inter-node communication limits the maximum size of the Pool due to deployment restrictions on the Compute Nodes of the Pool. This may result in the Pool not reaching its desired size. The default value is false.
+    description: ''
+  - name: --id
+    summary: Required. A string that uniquely identifies the Pool within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two Pool IDs within an Account that differ only by case).
+    description: ''
+  - name: --image
+    summary: "OS image reference. This can be either 'publisher:offer:sku[:version]' format, or a fully qualified ARM image id of the form '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}'. If 'publisher:offer:sku[:version]' format, version is optional and if omitted latest will be used. Valid values can be retrieved via 'az batch pool node-agent-skus list'. For example: 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'."
+    description: ''
+  - name: --json-file
+    summary: The file containing the pool to create in JSON format, if this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --metadata
+    summary: A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.
+    description: ''
+  - name: --node-agent-sku-id
+    summary: The SKU of the Batch node agent to be provisioned on compute nodes in the pool. The Batch node agent is a program that runs on each node in the pool, and provides the command-and-control interface between the node and the Batch service. There are different implementations of the node agent, known as SKUs, for different operating systems. You must specify a node agent SKU which matches the selected image reference. To get the list of supported node agent SKUs along with their list of verified image references, see the 'List supported node agent SKUs' operation.
+    description: ''
+  - name: --os-family
+    summary: 'The Azure Guest OS family to be installed on the virtual machines in the pool. Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. For more information, see Azure Guest OS Releases (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). Allowed values: 2, 3, 4, 5.'
+    description: ''
+  - name: --parameters
+    summary: Parameter values for a Batch pool JSON template file. Can only be used with --template.
+    description: ''
+  - name: --resize-timeout
+    summary: The timeout for allocation of Compute Nodes to the Pool. This timeout applies only to manual scaling; it has no effect when enableAutoScale is set to true. The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+  - name: --start-task-command-line
+    summary: The command line of the start task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
+    description: ''
+  - name: --start-task-resource-files
+    summary: A list of files that the Batch service will download to the compute node before running the command line. Space separated resource references in filename=httpurl format.
+    description: ''
+  - name: --start-task-wait-for-success
+    summary: Whether the Batch service should wait for the start task to complete successfully (that is, to exit with exit code 0) before scheduling any tasks on the compute node. If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is false. True if flag present.
+    description: ''
+  - name: --target-dedicated-nodes
+    summary: The desired number of dedicated Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
+    description: ''
+  - name: --target-low-priority-nodes
+    summary: The desired number of low-priority Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
+    description: ''
+  - name: --template
+    summary: A Batch pool JSON template file. If this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --vm-size
+    summary: Required. The size of virtual machines in the Pool. All virtual machines in a Pool are the same size. For information about available sizes of virtual machines for Cloud Services Pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for Pools using Images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
+    description: ''
+commands:
+- az_batch_pool_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/bicep.yml b/2017-03-09-profile/docs-ref-autogen/bicep.yml
new file mode 100644
index 0000000000..556ba04f4e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/bicep.yml
@@ -0,0 +1,132 @@
+### YamlMime:AzureCLIGroup
+uid: az_bicep
+name: az bicep
+summary: Bicep CLI command group.
+description: ''
+directCommands:
+- uid: az_bicep_build
+  name: az bicep build
+  summary: Build a Bicep file.
+  description: ''
+  syntax: >-
+    az bicep build --file
+                   [--outdir]
+                   [--outfile]
+                   [--stdout]
+                   [--subscription]
+  examples:
+  - summary: Build a Bicep file.
+    syntax: az bicep build --file {bicep_file}
+  - summary: Build a Bicep file and print all output to stdout.
+    syntax: az bicep build --file {bicep_file} --stdout
+  - summary: Build a Bicep file and save the result to the specified directory.
+    syntax: az bicep build --file {bicep_file} --outdir {out_dir}
+  - summary: Build a Bicep file and save the result to the specified file.
+    syntax: az bicep build --file {bicep_file} --outfile {out_file}
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The path to the Bicep file to build in the file system.
+    description: ''
+  optionalParameters:
+  - name: --outdir
+    summary: When set, saves the output at the specified directory.
+    description: ''
+  - name: --outfile
+    summary: When set, saves the output as the specified file path.
+    description: ''
+  - name: --stdout
+    summary: When set, prints all output to stdout instead of corresponding files.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_decompile
+  name: az bicep decompile
+  summary: Attempt to decompile an ARM template file to a Bicep file.
+  description: ''
+  syntax: >-
+    az bicep decompile --file
+                       [--subscription]
+  examples:
+  - summary: Decompile an ARM template file.
+    syntax: az bicep decompile --file {json_template_file}
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The path to the ARM template to decompile in the file system.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_install
+  name: az bicep install
+  summary: Install Bicep CLI.
+  description: ''
+  syntax: >-
+    az bicep install [--subscription]
+                     [--version]
+  examples:
+  - summary: Install Bicep CLI.
+    syntax: az bicep install
+  - summary: Install a specific version of Bicep CLI.
+    syntax: az bicep install --version v0.2.212
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --version -v
+    summary: The version of Bicep CLI to be installed. Default to the latest if not specified.
+    description: ''
+- uid: az_bicep_list-versions
+  name: az bicep list-versions
+  summary: List out all available versions of Bicep CLI.
+  description: ''
+  syntax: az bicep list-versions [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_upgrade
+  name: az bicep upgrade
+  summary: Upgrade Bicep CLI to the latest version.
+  description: ''
+  syntax: az bicep upgrade [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_version
+  name: az bicep version
+  summary: Show the installed version of Bicep CLI.
+  description: ''
+  syntax: az bicep version [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+commands:
+- az_bicep_build
+- az_bicep_decompile
+- az_bicep_install
+- az_bicep_list-versions
+- az_bicep_upgrade
+- az_bicep_version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Bicep CLI command group.
diff --git a/2017-03-09-profile/docs-ref-autogen/blockchain.yml b/2017-03-09-profile/docs-ref-autogen/blockchain.yml
new file mode 100644
index 0000000000..e8b0f0bc05
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blockchain.yml
@@ -0,0 +1,47 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain
+name: az blockchain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_blockchain_consortium
+- az_blockchain_consortium_list
+- az_blockchain_member
+- az_blockchain_member_create
+- az_blockchain_member_delete
+- az_blockchain_member_list
+- az_blockchain_member_list-api-key
+- az_blockchain_member_list-consortium-member
+- az_blockchain_member_regenerate-api-key
+- az_blockchain_member_show
+- az_blockchain_member_update
+- az_blockchain_member_wait
+- az_blockchain_transaction-node
+- az_blockchain_transaction-node_create
+- az_blockchain_transaction-node_delete
+- az_blockchain_transaction-node_list
+- az_blockchain_transaction-node_list-api-key
+- az_blockchain_transaction-node_regenerate-api-key
+- az_blockchain_transaction-node_show
+- az_blockchain_transaction-node_update
+- az_blockchain_transaction-node_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/blockchain/consortium.yml b/2017-03-09-profile/docs-ref-autogen/blockchain/consortium.yml
new file mode 100644
index 0000000000..2f97e5909f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blockchain/consortium.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_consortium
+name: az blockchain consortium
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain consortium** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain consortium.
+description: ''
+directCommands:
+- uid: az_blockchain_consortium_list
+  name: az blockchain consortium list
+  summary: List the available consortiums for a subscription.
+  description: ''
+  syntax: az blockchain consortium list --location
+  examples:
+  - summary: List the available consortiums for a subscription.
+    syntax: az blockchain consortium list --location "southeastasia"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_blockchain_consortium_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain consortium.
diff --git a/2017-03-09-profile/docs-ref-autogen/blockchain/member.yml b/2017-03-09-profile/docs-ref-autogen/blockchain/member.yml
new file mode 100644
index 0000000000..2c081dce30
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blockchain/member.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_member
+name: az blockchain member
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain member** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain member.
+description: ''
+directCommands:
+- uid: az_blockchain_member_create
+  name: az blockchain member create
+  summary: Create a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member create --name
+                                --resource-group
+                                [--consortium]
+                                [--consortium-management-account-password]
+                                [--firewall-rules]
+                                [--location]
+                                [--no-wait]
+                                [--password]
+                                [--protocol {Corda, NotSpecified, Parity, Quorum}]
+                                [--sku {Basic, Standard}]
+                                [--tags]
+                                [--validator-nodes-sku]
+  examples:
+  - summary: Create a blockchain member.
+    syntax: az blockchain member create --location "southeastasia" --consortium "ContoseConsortium" --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --validator-nodes-sku capacity=2 --protocol "Quorum" --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consortium
+    summary: Gets or sets the consortium for the blockchain member.
+    description: ''
+  - name: --consortium-management-account-password
+    summary: Sets the managed consortium management account password.
+    description: ''
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian member.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --password
+    summary: Sets the basic auth password of the blockchain member.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Corda, NotSpecified, Parity, Quorum
+    summary: Gets or sets the blockchain protocol.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The Sku of the blockchain member.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validator-nodes-sku
+    summary: 'Gets or sets the blockchain validator nodes Sku. Expect value: capacity=xx.'
+    description: ''
+- uid: az_blockchain_member_delete
+  name: az blockchain member delete
+  summary: Delete a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member delete --name
+                                --resource-group
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete a blockchain member.
+    syntax: az blockchain member delete --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blockchain_member_list
+  name: az blockchain member list
+  summary: List the blockchain members.
+  description: ''
+  syntax: az blockchain member list [--resource-group]
+  examples:
+  - summary: List the blockchain members in a resource group.
+    syntax: az blockchain member list --resource-group "mygroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_list-api-key
+  name: az blockchain member list-api-key
+  summary: List the API keys for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member list-api-key --name
+                                      --resource-group
+  examples:
+  - summary: List the API keys for a blockchain member.
+    syntax: az blockchain member list-api-key --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_list-consortium-member
+  name: az blockchain member list-consortium-member
+  summary: List the consortium members for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member list-consortium-member --name
+                                                --resource-group
+  examples:
+  - summary: List the consortium members for a blockchain member.
+    syntax: az blockchain member list-consortium-member --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_regenerate-api-key
+  name: az blockchain member regenerate-api-key
+  summary: Regenerate the API keys for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member regenerate-api-key --name
+                                            --resource-group
+                                            [--key-name {key1, key2}]
+  examples:
+  - summary: Regenerate the API keys for a blockchain member.
+    syntax: az blockchain member regenerate-api-key --key-name "key1" --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: key1, key2
+    summary: Gets or sets the API key name.
+    description: ''
+- uid: az_blockchain_member_show
+  name: az blockchain member show
+  summary: Show the details about a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member show --name
+                              --resource-group
+  examples:
+  - summary: Show the details about a blockchain member.
+    syntax: az blockchain member show --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_update
+  name: az blockchain member update
+  summary: Update a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member update --name
+                                --resource-group
+                                [--consortium-management-account-password]
+                                [--firewall-rules]
+                                [--password]
+                                [--tags]
+  examples:
+  - summary: Update a blockchain member.
+    syntax: az blockchain member update --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --name "ContoseMember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consortium-management-account-password
+    summary: Sets the managed consortium management account password.
+    description: ''
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian member.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_blockchain_member_wait
+  name: az blockchain member wait
+  summary: Wait until a blockchain member is created or deleted.
+  description: ''
+  syntax: >-
+    az blockchain member wait --name
+                              --resource-group
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Wait until a blockchain member is created.
+    syntax: az blockchain member wait --name "contosemember1" --resource-group "mygroup" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_blockchain_member_create
+- az_blockchain_member_delete
+- az_blockchain_member_list
+- az_blockchain_member_list-api-key
+- az_blockchain_member_list-consortium-member
+- az_blockchain_member_regenerate-api-key
+- az_blockchain_member_show
+- az_blockchain_member_update
+- az_blockchain_member_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain member.
diff --git a/2017-03-09-profile/docs-ref-autogen/blockchain/transaction-node.yml b/2017-03-09-profile/docs-ref-autogen/blockchain/transaction-node.yml
new file mode 100644
index 0000000000..5af3848fca
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blockchain/transaction-node.yml
@@ -0,0 +1,307 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_transaction-node
+name: az blockchain transaction-node
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain transaction-node** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain transaction-node.
+description: ''
+directCommands:
+- uid: az_blockchain_transaction-node_create
+  name: az blockchain transaction-node create
+  summary: Create a transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node create --member-name
+                                          --name
+                                          --resource-group
+                                          [--firewall-rules]
+                                          [--location]
+                                          [--no-wait]
+                                          [--password]
+  examples:
+  - summary: Create a transaction node.
+    syntax: az blockchain transaction-node create --member-name "contosemember1" --resource-group "mygroup" --location "southeastasia" --password "1234abcdEFG1" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian transaction node.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+- uid: az_blockchain_transaction-node_delete
+  name: az blockchain transaction-node delete
+  summary: Delete the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node delete --member-name
+                                          --name
+                                          --resource-group
+                                          [--no-wait]
+                                          [--yes]
+  examples:
+  - summary: Delete the transaction node.
+    syntax: az blockchain transaction-node delete --member-name "contosemember1" --resource-group "mygroup" --name "txNode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blockchain_transaction-node_list
+  name: az blockchain transaction-node list
+  summary: List the transaction nodes for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node list --member-name
+                                        --resource-group
+  examples:
+  - summary: List the transaction nodes for a blockchain member.
+    syntax: az blockchain transaction-node list --member-name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_list-api-key
+  name: az blockchain transaction-node list-api-key
+  summary: List the API keys for the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node list-api-key --member-name
+                                                --name
+                                                --resource-group
+  examples:
+  - summary: List the API keys for the transaction node.
+    syntax: az blockchain transaction-node list-api-key --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_regenerate-api-key
+  name: az blockchain transaction-node regenerate-api-key
+  summary: Regenerate the API keys for the blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node regenerate-api-key --member-name
+                                                      --name
+                                                      --resource-group
+                                                      [--key-name {key1, key2}]
+                                                      [--value]
+  examples:
+  - summary: Regenerate the API keys for the blockchain member.
+    syntax: az blockchain transaction-node regenerate-api-key --key-name "key1" --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: key1, key2
+    summary: Gets or sets the API key name.
+    description: ''
+  - name: --value
+    summary: Gets or sets the API key value.
+    description: ''
+- uid: az_blockchain_transaction-node_show
+  name: az blockchain transaction-node show
+  summary: Show the details of the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node show --member-name
+                                        --name
+                                        --resource-group
+  examples:
+  - summary: Show the details of the transaction node.
+    syntax: az blockchain transaction-node show --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_update
+  name: az blockchain transaction-node update
+  summary: Update the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node update --member-name
+                                          --name
+                                          --resource-group
+                                          [--firewall-rules]
+                                          [--password]
+  examples:
+  - summary: Update the transaction node.
+    syntax: az blockchain transaction-node update --member-name "contosemember1" --resource-group "mygroup" --password "1234abcdEFG1" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian transaction node.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+- uid: az_blockchain_transaction-node_wait
+  name: az blockchain transaction-node wait
+  summary: Wait until the transaction node is created or deleted.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node wait --member-name
+                                        --name
+                                        --resource-group
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--interval]
+                                        [--timeout]
+                                        [--updated]
+  examples:
+  - summary: Wait until the transaction node is created.
+    syntax: az blockchain transaction-node wait --member-name "contosemember1" --resource-group "mygroup" --name "txNode2" --created
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_blockchain_transaction-node_create
+- az_blockchain_transaction-node_delete
+- az_blockchain_transaction-node_list
+- az_blockchain_transaction-node_list-api-key
+- az_blockchain_transaction-node_regenerate-api-key
+- az_blockchain_transaction-node_show
+- az_blockchain_transaction-node_update
+- az_blockchain_transaction-node_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain transaction-node.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint.yml b/2017-03-09-profile/docs-ref-autogen/blueprint.yml
new file mode 100644
index 0000000000..2135211f65
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint.yml
@@ -0,0 +1,368 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint
+name: az blueprint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint.
+description: ''
+directCommands:
+- uid: az_blueprint_create
+  name: az blueprint create
+  summary: Create a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint create --name
+                        [--description]
+                        [--display-name]
+                        [--management-group]
+                        [--parameters]
+                        [--subscription]
+                        [--target-scope {managementGroup, subscription}]
+  examples:
+  - summary: Create a subscription blueprint
+    syntax: >-
+      az blueprint create --subscription MySubscription --name \
+
+      MyBlueprint --description \
+
+      "blueprint contains all artifacts" --target-scope \
+
+      subscription
+  - summary: Create a management group blueprint
+    syntax: >-
+      az blueprint create --management-group MyManagementGroup --name \
+
+      MyBlueprint --description \
+
+      "blueprint contains all artifact" --target-scope \
+
+      subscription
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --target-scope
+    defaultValue: subscription
+    parameterValueGroup: managementGroup, subscription
+    summary: The scope where this blueprint definition can be assigned.
+    description: ''
+- uid: az_blueprint_delete
+  name: az blueprint delete
+  summary: Delete a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint delete --name
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Delete a management group blueprint
+    syntax: >-
+      az blueprint delete --management-group MyManagementGroup --name \
+
+      MyBlueprint
+  - summary: Delete a subscription blueprint
+    syntax: >-
+      az blueprint delete --subscription MySubscription --name \
+
+      MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_export
+  name: az blueprint export
+  summary: Export a blueprint definition and artifacts to json file(s).
+  description: ''
+  syntax: >-
+    az blueprint export --name
+                        --output-path
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Export a blueprint definition and artifacts
+    syntax: >-
+      az blueprint export --name MyBlueprint \
+
+      --output-path "path/to/blueprint/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition to export.
+    description: ''
+  - isRequired: true
+    name: --output-path
+    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file will be named blueprint.json. Artifacts json files will be in a subdirectory named artifacts.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Skip user confirmation. When set, if directory does not exist, it will be created. If the directory exists and has contents, they will be overwritten. If not set, user will be prompted for permission to proceed.
+    description: ''
+- uid: az_blueprint_import
+  name: az blueprint import
+  summary: Import a blueprint definition and artifacts from a directoy of json files.
+  description: ''
+  syntax: >-
+    az blueprint import --input-path
+                        --name
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Import a blueprint definition and artifacts
+    syntax: >-
+      az blueprint import --name MyBlueprint \
+
+      --input-path "path/to/blueprint/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file should be named blueprint.json. Artifacts json files should be in a subdirectory named artifacts.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_list
+  name: az blueprint list
+  summary: List blueprint definitions.
+  description: ''
+  syntax: >-
+    az blueprint list [--management-group]
+                      [--subscription]
+  examples:
+  - summary: List blueprints in a management group
+    syntax: az blueprint list --management-group MyManagementGroup
+  - summary: List blueprints in a subscription
+    syntax: az blueprint list --subscription MySubscription
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_publish
+  name: az blueprint publish
+  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
+  description: ''
+  syntax: >-
+    az blueprint publish --blueprint-name
+                         --version
+                         [--change-notes]
+                         [--management-group]
+                         [--subscription]
+  examples:
+  - summary: Publish a management group blueprint
+    syntax: >-
+      az blueprint publish --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: Publish a subscription blueprint
+    syntax: >-
+      az blueprint publish --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --change-notes
+    summary: Version-specific change notes.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_show
+  name: az blueprint show
+  summary: Get a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint show --name
+                      [--management-group]
+                      [--subscription]
+  examples:
+  - summary: Show a management group blueprint
+    syntax: >-
+      az blueprint show --management-group MyManagementGroup --name \
+
+      MyBlueprint
+  - summary: Show a subscription blueprint
+    syntax: >-
+      az blueprint show --subscription MySubscription --name \
+
+      MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_update
+  name: az blueprint update
+  summary: Update a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint update --name
+                        [--add]
+                        [--description]
+                        [--force-string]
+                        [--management-group]
+                        [--parameters]
+                        [--remove]
+                        [--set]
+                        [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact
+- az_blueprint_artifact_delete
+- az_blueprint_artifact_list
+- az_blueprint_artifact_policy
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+- az_blueprint_artifact_role
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+- az_blueprint_artifact_show
+- az_blueprint_artifact_template
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+- az_blueprint_assignment
+- az_blueprint_assignment_create
+- az_blueprint_assignment_delete
+- az_blueprint_assignment_list
+- az_blueprint_assignment_show
+- az_blueprint_assignment_update
+- az_blueprint_assignment_wait
+- az_blueprint_assignment_who
+- az_blueprint_create
+- az_blueprint_delete
+- az_blueprint_export
+- az_blueprint_import
+- az_blueprint_list
+- az_blueprint_publish
+- az_blueprint_resource-group
+- az_blueprint_resource-group_add
+- az_blueprint_resource-group_list
+- az_blueprint_resource-group_remove
+- az_blueprint_resource-group_show
+- az_blueprint_resource-group_update
+- az_blueprint_show
+- az_blueprint_update
+- az_blueprint_version
+- az_blueprint_version_artifact
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+- az_blueprint_version_delete
+- az_blueprint_version_list
+- az_blueprint_version_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/artifact.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact.yml
new file mode 100644
index 0000000000..e51e30f6d4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact.yml
@@ -0,0 +1,147 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact
+name: az blueprint artifact
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_delete
+  name: az blueprint artifact delete
+  summary: Delete a blueprint artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact delete --blueprint-name
+                                 --name
+                                 [--management-group]
+                                 [--subscription]
+                                 [--yes]
+  examples:
+  - summary: Delete a role assignment artifact
+    syntax: >-
+      az blueprint artifact delete --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --name OwnerAssignment
+  - summary: Delete an ARM template artifact
+    syntax: >-
+      az blueprint artifact delete --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint artifact.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_artifact_list
+  name: az blueprint artifact list
+  summary: List artifacts for a given blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint artifact list --blueprint-name
+                               [--management-group]
+                               [--subscription]
+  examples:
+  - summary: List artifcats for a management group blueprint
+    syntax: >-
+      az blueprint artifact list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint
+  - summary: List artifcats for a subscription blueprint
+    syntax: >-
+      az blueprint artifact list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_show
+  name: az blueprint artifact show
+  summary: Get a blueprint artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact show --blueprint-name
+                               --name
+                               [--management-group]
+                               [--subscription]
+  examples:
+  - summary: Show an artifact of a subscription blueprint
+    syntax: >-
+      az blueprint artifact show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --name OwnerAssignment
+  - summary: Show an artifact of a management group blueprint
+    syntax: >-
+      az blueprint artifact show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint artifact.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_delete
+- az_blueprint_artifact_list
+- az_blueprint_artifact_policy
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+- az_blueprint_artifact_role
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+- az_blueprint_artifact_show
+- az_blueprint_artifact_template
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/policy.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/policy.yml
new file mode 100644
index 0000000000..8fed0d0031
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/policy.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_policy
+name: az blueprint artifact policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint policy assignment artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_policy_create
+  name: az blueprint artifact policy create
+  summary: Create blueprint policy artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact policy create --artifact-name
+                                        --blueprint-name
+                                        --policy-definition-id
+                                        [--depends-on]
+                                        [--description]
+                                        [--display-name]
+                                        [--management-group]
+                                        [--parameters]
+                                        [--resource-group-art]
+                                        [--subscription]
+  examples:
+  - summary: Create a policy artifact
+    syntax: >-
+      az blueprint artifact policy create \
+
+      --blueprint-name MyBlueprint --artifact-name MyPolicy --policy-definition-id \
+
+      "/providers/Microsoft.Authorization/policyDefinitions/00000000-0000-0000-0000-000000000000" \
+
+      --parameters path/to/file --display-name "Policy to do sth"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --policy-definition-id
+    summary: The full policy definition id.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_policy_update
+  name: az blueprint artifact policy update
+  summary: Update blueprint policy artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact policy update --artifact-name
+                                        --blueprint-name
+                                        [--depends-on]
+                                        [--description]
+                                        [--display-name]
+                                        [--management-group]
+                                        [--parameters]
+                                        [--resource-group-art]
+                                        [--subscription]
+  examples:
+  - summary: Update a policy artifact
+    syntax: >-
+      az blueprint artifact policy update \
+
+      --blueprint-name MyBlueprint --artifact-name MyPolicy --display-name "My Policy"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint policy assignment artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/role.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/role.yml
new file mode 100644
index 0000000000..5450ee1af5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/role.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_role
+name: az blueprint artifact role
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact role** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint role assignment artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_role_create
+  name: az blueprint artifact role create
+  summary: Create blueprint role artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact role create --artifact-name
+                                      --blueprint-name
+                                      --principal-ids
+                                      --role-definition-id
+                                      [--depends-on]
+                                      [--description]
+                                      [--display-name]
+                                      [--management-group]
+                                      [--resource-group-art]
+                                      [--subscription]
+  examples:
+  - summary: Create a role artifact
+    syntax: >-
+      az blueprint artifact role create \
+
+      --blueprint-name MyBlueprint --artifact-name MyRole --role-definition-id \
+
+      "/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000" \
+
+      --principal-ids "[parameters('[Usergrouporapplicationname]:MyRoleAssignmentName')]"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --principal-ids
+    summary: Array of user or group identities in Azure Active Directory or a reference to the corresponding parameter in blueprint definiton. The roleDefinition will apply to each identity.
+    description: ''
+  - isRequired: true
+    name: --role-definition-id
+    summary: The full role definition id. Only built-in roles are supported.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_role_update
+  name: az blueprint artifact role update
+  summary: Update blueprint role artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact role update --artifact-name
+                                      --blueprint-name
+                                      [--depends-on]
+                                      [--description]
+                                      [--display-name]
+                                      [--management-group]
+                                      [--resource-group-art]
+                                      [--subscription]
+  examples:
+  - summary: Update a role artifact
+    syntax: >-
+      az blueprint artifact role update \
+
+      --blueprint-name MyBlueprint --artifact-name MyRole --display-name "My Big Role"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint role assignment artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/template.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/template.yml
new file mode 100644
index 0000000000..e28470c67e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/artifact/template.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_template
+name: az blueprint artifact template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint ARM template artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_template_create
+  name: az blueprint artifact template create
+  summary: Create blueprint arm artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact template create --artifact-name
+                                          --blueprint-name
+                                          --template
+                                          [--depends-on]
+                                          [--description]
+                                          [--display-name]
+                                          [--management-group]
+                                          [--parameters]
+                                          [--resource-group-art]
+                                          [--subscription]
+  examples:
+  - summary: Create an arm artifact
+    syntax: >-
+      az blueprint artifact template create \
+
+      --blueprint-name MyBlueprint --artifact-name MyTemplate \
+
+      --parameters path/to/parameter/file --template path/to/template
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --template -t
+    summary: ARM template in JSON string or path to JSON file.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_template_update
+  name: az blueprint artifact template update
+  summary: Update blueprint arm artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact template update --artifact-name
+                                          --blueprint-name
+                                          [--depends-on]
+                                          [--description]
+                                          [--display-name]
+                                          [--management-group]
+                                          [--parameters]
+                                          [--resource-group-art]
+                                          [--subscription]
+                                          [--template]
+  examples:
+  - summary: Update a arm artifact
+    syntax: >-
+      az blueprint artifact template update \
+
+      --blueprint-name MyBlueprint --artifact-name MyTemplate --display-name "My Template"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --template -t
+    summary: ARM template in JSON string or path to JSON file.
+    description: ''
+commands:
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint ARM template artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/assignment.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/assignment.yml
new file mode 100644
index 0000000000..00354fab87
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/assignment.yml
@@ -0,0 +1,349 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_assignment
+name: az blueprint assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint assignment.
+description: ''
+directCommands:
+- uid: az_blueprint_assignment_create
+  name: az blueprint assignment create
+  summary: Create a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment create --name
+                                   [--blueprint-version]
+                                   [--description]
+                                   [--display-name]
+                                   [--identity-type {None, SystemAssigned, UserAssigned}]
+                                   [--location]
+                                   [--locks-excluded-principals]
+                                   [--locks-mode {AllResourcesDoNotDelete, AllResourcesReadOnly, None}]
+                                   [--management-group]
+                                   [--parameters]
+                                   [--resource-group-value]
+                                   [--subscription]
+                                   [--user-assigned-identity]
+  examples:
+  - summary: Assignment with system-assigned managed identity
+    syntax: >-
+      az blueprint assignment create --subscription MySubscription --name \
+
+      MyBlueprintAssignment --location eastus --identity-type SystemAssigned \
+
+      --description "Enforce pre-defined MyBlueprint to this subscription." \
+
+      --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup/provid \
+
+      ers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
+
+      --resource-group-value artifact_name=rg-art-1 name=rg1 location=westus \
+
+      --resource-group-value artifact_name=rg-art-2 name=rg2 location=eastus \
+
+      --parameters "path/to/parameter/file" \
+  - summary: Assignment with user-assigned managed identity
+    syntax: >-
+      az blueprint assignment create --subscription MySubscription --name \
+
+      MyBlueprintAssignment --location eastus --identity-type UserAssigned \
+
+      --user-assigned-identity "/subscriptions/00000000-0000-0000-0000-000000000000 \
+
+      /resourcegroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myIdentity"\
+
+      --description "Enforce pre-defined MyBlueprint to this subscription." \
+
+      --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup \
+
+      /providers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
+
+      --resource-group-value artifact_name=rg-art-1 name=rg1 location=eastus \
+
+      --parameters "path/to/parameter/file" \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --blueprint-version
+    summary: Resource ID of the published version of a blueprint definition.
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --identity-type
+    defaultValue: SystemAssigned
+    parameterValueGroup: None, SystemAssigned, UserAssigned
+    summary: Type of the managed identity.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --locks-excluded-principals
+    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
+    description: ''
+  - name: --locks-mode
+    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
+    summary: Lock mode.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --parameters -p
+    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-value
+    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --user-assigned-identity
+    summary: The user-assigned managed identity associated with the resource.
+    description: ''
+- uid: az_blueprint_assignment_delete
+  name: az blueprint assignment delete
+  summary: Delete a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment delete --name
+                                   [--management-group]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Delete an assignment
+    syntax: >-
+      az blueprint assignment delete --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_assignment_list
+  name: az blueprint assignment list
+  summary: List blueprint assignments within a subscription.
+  description: ''
+  syntax: >-
+    az blueprint assignment list [--management-group]
+                                 [--subscription]
+  examples:
+  - summary: List assignments
+    syntax: az blueprint assignment list --subscription MySubscription
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+- uid: az_blueprint_assignment_show
+  name: az blueprint assignment show
+  summary: Get a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment show --name
+                                 [--management-group]
+                                 [--subscription]
+  examples:
+  - summary: Show an assignment
+    syntax: >-
+      az blueprint assignment show --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+- uid: az_blueprint_assignment_update
+  name: az blueprint assignment update
+  summary: Update a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment update --name
+                                   [--blueprint-version]
+                                   [--description]
+                                   [--display-name]
+                                   [--identity-type {None, SystemAssigned, UserAssigned}]
+                                   [--location]
+                                   [--locks-excluded-principals]
+                                   [--locks-mode {AllResourcesDoNotDelete, AllResourcesReadOnly, None}]
+                                   [--management-group]
+                                   [--parameters]
+                                   [--resource-group-value]
+                                   [--subscription]
+                                   [--user-assigned-identity]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --blueprint-version
+    summary: Resource ID of the published version of a blueprint definition.
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --identity-type
+    parameterValueGroup: None, SystemAssigned, UserAssigned
+    summary: Type of the managed identity.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --locks-excluded-principals
+    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
+    description: ''
+  - name: --locks-mode
+    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
+    summary: Lock mode.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --parameters -p
+    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-value
+    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --user-assigned-identity
+    summary: The user-assigned managed identity associated with the resource.
+    description: ''
+- uid: az_blueprint_assignment_wait
+  name: az blueprint assignment wait
+  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
+  description: ''
+  syntax: >-
+    az blueprint assignment wait --name
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--management-group]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Blueprint Assignment is successfully provisioned.
+    syntax: az blueprint assignment wait --subscription MySubscription \ --name MyBlueprintAssignment --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+- uid: az_blueprint_assignment_who
+  name: az blueprint assignment who
+  summary: Get Blueprint Servie Principal Name objectId.
+  description: ''
+  syntax: >-
+    az blueprint assignment who --name
+                                [--management-group]
+                                [--subscription]
+  examples:
+  - summary: Get SPN objectId
+    syntax: >-
+      az blueprint assignment who --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+commands:
+- az_blueprint_assignment_create
+- az_blueprint_assignment_delete
+- az_blueprint_assignment_list
+- az_blueprint_assignment_show
+- az_blueprint_assignment_update
+- az_blueprint_assignment_wait
+- az_blueprint_assignment_who
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint assignment.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/resource-group.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/resource-group.yml
new file mode 100644
index 0000000000..758bae1ab7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/resource-group.yml
@@ -0,0 +1,234 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_resource-group
+name: az blueprint resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint resource group artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_resource-group_add
+  name: az blueprint resource-group add
+  summary: Add a resource group artifact to the blueprint.
+  description: ''
+  syntax: >-
+    az blueprint resource-group add --blueprint-name
+                                    [--artifact-name]
+                                    [--depends-on]
+                                    [--description]
+                                    [--display-name]
+                                    [--management-group]
+                                    [--rg-location]
+                                    [--rg-name]
+                                    [--subscription]
+                                    [--tags]
+  examples:
+  - summary: Add a resource group artifact
+    syntax: >-
+      az blueprint resource-group add \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: Display name of this resource group artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --rg-location
+    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
+    description: ''
+  - name: --rg-name
+    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --tags
+    summary: Tags to be assigned to this resource group.
+    description: ''
+- uid: az_blueprint_resource-group_list
+  name: az blueprint resource-group list
+  summary: List blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group list --blueprint-name
+                                     [--management-group]
+                                     [--subscription]
+  examples:
+  - summary: List resource group artifacts
+    syntax: >-
+      az blueprint resource-group list \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_resource-group_remove
+  name: az blueprint resource-group remove
+  summary: Remove a blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group remove --artifact-name
+                                       --blueprint-name
+                                       [--management-group]
+                                       [--subscription]
+                                       [--yes]
+  examples:
+  - summary: Remove a resource group artifact
+    syntax: >-
+      az blueprint resource-group remove \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_resource-group_show
+  name: az blueprint resource-group show
+  summary: Show blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group show --artifact-name
+                                     --blueprint-name
+                                     [--management-group]
+                                     [--subscription]
+  examples:
+  - summary: Show a resource group artifact
+    syntax: >-
+      az blueprint resource-group show \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_resource-group_update
+  name: az blueprint resource-group update
+  summary: Update blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group update --artifact-name
+                                       --blueprint-name
+                                       [--depends-on]
+                                       [--description]
+                                       [--display-name]
+                                       [--management-group]
+                                       [--rg-location]
+                                       [--rg-name]
+                                       [--subscription]
+                                       [--tags]
+  examples:
+  - summary: Update a resource group artifact
+    syntax: >-
+      az blueprint resource-group update \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt --display-name "My Resource Group"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: Display name of this resource group artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --rg-location
+    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
+    description: ''
+  - name: --rg-name
+    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --tags
+    summary: Tags to be assigned to this resource group.
+    description: ''
+commands:
+- az_blueprint_resource-group_add
+- az_blueprint_resource-group_list
+- az_blueprint_resource-group_remove
+- az_blueprint_resource-group_show
+- az_blueprint_resource-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint resource group artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/version.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/version.yml
new file mode 100644
index 0000000000..fd5f45f233
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/version.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_version
+name: az blueprint version
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint version** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage published blueprint versions.
+description: ''
+directCommands:
+- uid: az_blueprint_version_delete
+  name: az blueprint version delete
+  summary: Delete a published version of a blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version delete --blueprint-name
+                                --version
+                                [--management-group]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a published subscription blueprint
+    syntax: >-
+      az blueprint version delete --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  - summary: Delete a published management group blueprint
+    syntax: >-
+      az blueprint version delete --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_version_list
+  name: az blueprint version list
+  summary: List published versions of given blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint version list --blueprint-name
+                              [--management-group]
+                              [--subscription]
+  examples:
+  - summary: List published blueprints of a management group
+    syntax: >-
+      az blueprint version list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint
+  - summary: List published blueprints of a subscription
+    syntax: >-
+      az blueprint version list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_version_show
+  name: az blueprint version show
+  summary: Get a published version of a blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version show --blueprint-name
+                              --version
+                              [--management-group]
+                              [--subscription]
+  examples:
+  - summary: Get a published management group blueprint
+    syntax: >-
+      az blueprint version show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: Get a published subscription blueprint
+    syntax: >-
+      az blueprint version show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_version_artifact
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+- az_blueprint_version_delete
+- az_blueprint_version_list
+- az_blueprint_version_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage published blueprint versions.
diff --git a/2017-03-09-profile/docs-ref-autogen/blueprint/version/artifact.yml b/2017-03-09-profile/docs-ref-autogen/blueprint/version/artifact.yml
new file mode 100644
index 0000000000..276ac2e929
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/blueprint/version/artifact.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_version_artifact
+name: az blueprint version artifact
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint version artifact** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage published blueprint artifacts.
+description: ''
+directCommands:
+- uid: az_blueprint_version_artifact_list
+  name: az blueprint version artifact list
+  summary: List artifacts for a version of a published blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version artifact list --blueprint-name
+                                       --version
+                                       [--management-group]
+                                       [--subscription]
+  examples:
+  - summary: List artifacts of a published management group blueprint
+    syntax: >-
+      az blueprint version artifact list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: List artifacts of a published subscription blueprint
+    syntax: >-
+      az blueprint version artifact list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_version_artifact_show
+  name: az blueprint version artifact show
+  summary: Show an artifact for a published blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version artifact show --artifact-name
+                                       --blueprint-name
+                                       --version
+                                       [--management-group]
+                                       [--subscription]
+  examples:
+  - summary: Show a role assignment artifact
+    syntax: >-
+      az blueprint version artifact show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2 --artifact-name OwnerAssignment
+  - summary: Show a template artifact
+    syntax: >-
+      az blueprint version artifact show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2 --artifact-name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage published blueprint artifacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards.yml b/2017-03-09-profile/docs-ref-autogen/boards.yml
index 147a57aa03..5cf68a9755 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards.yml
@@ -1,20 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_boards_query
+### YamlMime:AzureCLIGroup
+uid: az_boards
+name: az boards
+summary: Manage Azure Boards.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_boards_query
   name: az boards query
   summary: Query for a list of work items.
   description: Only supports flat queries.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards query [--detect {false, true}]
+                    [--id]
+                    [--org]
+                    [--path]
+                    [--project]
+                    [--subscription]
+                    [--wiql]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -23,7 +25,7 @@ items:
     summary: The ID of an existing query.  Required unless --path or --wiql are specified.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: The path of an existing query.  Ignored if --id is specified.
@@ -31,130 +33,52 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --wiql
-    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --wiql
+    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
+    description: ''
 commands:
-- uid: az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-- uid: az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-- uid: az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-- uid: az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-- uid: az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
+- az_boards_area
+- az_boards_area_project
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
+- az_boards_area_team
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
+- az_boards_iteration
+- az_boards_iteration_project
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
+- az_boards_iteration_team
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
+- az_boards_query
+- az_boards_work-item
+- az_boards_work-item_create
+- az_boards_work-item_delete
+- az_boards_work-item_relation
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
+- az_boards_work-item_show
+- az_boards_work-item_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -170,4 +94,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/area.yml b/2017-03-09-profile/docs-ref-autogen/boards/area.yml
index 7ca7d14214..1c10d2893a 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/area.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/area.yml
@@ -1,46 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_boards_area
+name: az boards area
+summary: Manage area paths.
+description: ''
 commands:
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
+- az_boards_area_project
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
+- az_boards_area_team
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -56,4 +30,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage area paths.
+metadata:
+  description: Manage area paths.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/area/project.yml b/2017-03-09-profile/docs-ref-autogen/boards/area/project.yml
index 3664b29e8f..e014d7f2e9 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/area/project.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/area/project.yml
@@ -1,34 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_area_project_create
-  - az_boards_area_project_delete
-  - az_boards_area_project_list
-  - az_boards_area_project_show
-  - az_boards_area_project_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_area_project
+name: az boards area project
+summary: Manage areas for a project.
+description: ''
+directCommands:
 - uid: az_boards_area_project_create
   name: az boards area project create
   summary: Create area.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project create --name
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--path]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the area.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an area. Creates an area at root level if --path is not specified. Example:ProjectNameAreaAreaName.
@@ -43,36 +41,48 @@ items:
   name: az boards area project delete
   summary: Delete area.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project delete --path
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+                                  [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_boards_area_project_list
   name: az boards area project list
   summary: List areas for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project list [--depth]
+                                [--detect {false, true}]
+                                [--org]
+                                [--path]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  optionalParameters:
   - name: --depth
     defaultValue: "1"
     summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
@@ -82,7 +92,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
@@ -90,6 +100,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -97,23 +110,32 @@ items:
   name: az boards area project show
   summary: Show area details for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project show --id
+                                [--detect {false, true}]
+                                [--org]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Area ID.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -121,13 +143,20 @@ items:
   name: az boards area project update
   summary: Update area.
   description: Move area or update area name.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project update --path
+                                  [--child-id]
+                                  [--detect {false, true}]
+                                  [--name]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
     description: ''
+  optionalParameters:
   - name: --child-id
     summary: Move an existing area and add as child node for this area.
     description: ''
@@ -139,7 +168,7 @@ items:
     summary: New name of the area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -148,21 +177,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -178,4 +197,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a project.
+metadata:
+  description: Manage areas for a project.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/area/team.yml b/2017-03-09-profile/docs-ref-autogen/boards/area/team.yml
index 40c1b91d7f..1cbf664774 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/area/team.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/area/team.yml
@@ -1,27 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_area_team_add
-  - az_boards_area_team_list
-  - az_boards_area_team_remove
-  - az_boards_area_team_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_area_team
+name: az boards area team
+summary: Manage areas for a team.
+description: ''
+directCommands:
 - uid: az_boards_area_team_add
   name: az boards area team add
   summary: Add area to a team.
   description: Every team needs to have a default area configured which can't be empty. Hence, you need to pass --set-as-default while adding first area to your team. You can later configure any other area which already added to team as default by using `az boards area team update -h` command.
-  langs:
-  - azurecli
+  syntax: >-
+    az boards area team add --path
+                            --team
+                            [--detect {false, true}]
+                            [--include-sub-areas {false, true}]
+                            [--org]
+                            [--project]
+                            [--set-as-default]
+                            [--subscription]
   examples:
   - summary: Add area to a team.
-    syntax:
-      content: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
-  parameters:
+    syntax: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -30,6 +29,7 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -39,7 +39,7 @@ items:
     summary: Include child nodes of this area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -54,23 +54,32 @@ items:
   name: az boards area team list
   summary: List areas for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team list --team
+                             [--detect {false, true}]
+                             [--org]
+                             [--project]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -78,9 +87,14 @@ items:
   name: az boards area team remove
   summary: Remove area from a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team remove --path
+                               --team
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -89,12 +103,13 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -106,9 +121,16 @@ items:
   name: az boards area team update
   summary: Update team area.
   description: Update any area to include/exclude sub areas OR Set already added area as default.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team update --path
+                               --team
+                               [--detect {false, true}]
+                               [--include-sub-areas {false, true}]
+                               [--org]
+                               [--project]
+                               [--set-as-default]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -117,6 +139,7 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -126,7 +149,7 @@ items:
     summary: Include child nodes of this area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -138,18 +161,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -165,4 +180,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a team.
+metadata:
+  description: Manage areas for a team.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/iteration.yml b/2017-03-09-profile/docs-ref-autogen/boards/iteration.yml
index dea0301992..56a0d13dbf 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/iteration.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/iteration.yml
@@ -1,58 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration
+name: az boards iteration
+summary: Manage iterations.
+description: ''
 commands:
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
+- az_boards_iteration_project
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
+- az_boards_iteration_team
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -68,4 +34,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations.
+metadata:
+  description: Manage iterations.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/iteration/project.yml b/2017-03-09-profile/docs-ref-autogen/boards/iteration/project.yml
index c8de369d09..daf94a9ff1 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/iteration/project.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/iteration/project.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_iteration_project_create
-  - az_boards_iteration_project_delete
-  - az_boards_iteration_project_list
-  - az_boards_iteration_project_show
-  - az_boards_iteration_project_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration_project
+name: az boards iteration project
+summary: Manage iterations for a project.
+description: ''
+directCommands:
 - uid: az_boards_iteration_project_create
   name: az boards iteration project create
   summary: Create iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project create --name
+                                       [--detect {false, true}]
+                                       [--finish-date]
+                                       [--org]
+                                       [--path]
+                                       [--project]
+                                       [--start-date]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the iteration.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -31,7 +31,7 @@ items:
     summary: 'Finish date of the iteration. Example : "2019-06-21".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an iteration. Creates an iteration at root level if --path is not specified. Example:ProjectNameIterationIterationName.
@@ -49,36 +49,48 @@ items:
   name: az boards iteration project delete
   summary: Delete iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project delete --path
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+                                       [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_boards_iteration_project_list
   name: az boards iteration project list
   summary: List iterations for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project list [--depth]
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--path]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  optionalParameters:
   - name: --depth
     defaultValue: "1"
     summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
@@ -88,7 +100,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
@@ -96,6 +108,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -103,23 +118,32 @@ items:
   name: az boards iteration project show
   summary: Show iteration details for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project show --id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Iteration ID.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -127,13 +151,22 @@ items:
   name: az boards iteration project update
   summary: Update project iteration.
   description: Move iteration or update iteration details like name AND/OR start-date and finish-date.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project update --path
+                                       [--child-id]
+                                       [--detect {false, true}]
+                                       [--finish-date]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--start-date]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
     description: ''
+  optionalParameters:
   - name: --child-id
     summary: Move an existing iteration and add as child node for this iteration.
     description: ''
@@ -148,7 +181,7 @@ items:
     summary: New name of the iteration.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -160,21 +193,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -190,4 +213,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a project.
+metadata:
+  description: Manage iterations for a project.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/iteration/team.yml b/2017-03-09-profile/docs-ref-autogen/boards/iteration/team.yml
index 77a911bc04..f9feb16624 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/iteration/team.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/iteration/team.yml
@@ -1,27 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_iteration_team_add
-  - az_boards_iteration_team_list
-  - az_boards_iteration_team_list_work_items
-  - az_boards_iteration_team_remove
-  - az_boards_iteration_team_set_backlog_iteration
-  - az_boards_iteration_team_set_default_iteration
-  - az_boards_iteration_team_show_backlog_iteration
-  - az_boards_iteration_team_show_default_iteration
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration_team
+name: az boards iteration team
+summary: Manage iterations for a team.
+description: ''
+directCommands:
 - uid: az_boards_iteration_team_add
   name: az boards iteration team add
   summary: Add iteration to a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team add --id
+                                 --team
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -30,12 +24,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,36 +42,51 @@ items:
   name: az boards iteration team list
   summary: List iterations for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team list --team
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--timeframe]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --timeframe
-    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_list_work_items
+  - name: --timeframe
+    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
+    description: ''
+- uid: az_boards_iteration_team_list-work-items
   name: az boards iteration team list-work-items
   summary: List work-items for an iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team list-work-items --id
+                                             --team
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -85,12 +95,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -102,9 +113,14 @@ items:
   name: az boards iteration team remove
   summary: Remove iteration from a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team remove --id
+                                    --team
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -113,12 +129,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -126,13 +143,18 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_set_backlog_iteration
+- uid: az_boards_iteration_team_set-backlog-iteration
   name: az boards iteration team set-backlog-iteration
   summary: Set backlog iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team set-backlog-iteration --id
+                                                   --team
+                                                   [--detect {false, true}]
+                                                   [--org]
+                                                   [--project]
+                                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration which needs to be set as backlog iteration.
@@ -141,12 +163,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -154,17 +177,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_set_default_iteration
+- uid: az_boards_iteration_team_set-default-iteration
   name: az boards iteration team set-default-iteration
   summary: Set default iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team set-default-iteration --team
+                                                   [--default-iteration-macro]
+                                                   [--detect {false, true}]
+                                                   [--id]
+                                                   [--org]
+                                                   [--project]
+                                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --default-iteration-macro
     summary: 'Default iteration macro. Example: @CurrentIteration.'
     description: ''
@@ -176,7 +206,7 @@ items:
     summary: Identifier of the iteration which needs to be set as default.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -184,23 +214,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_show_backlog_iteration
+- uid: az_boards_iteration_team_show-backlog-iteration
   name: az boards iteration team show-backlog-iteration
   summary: Show backlog iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team show-backlog-iteration --team
+                                                    [--detect {false, true}]
+                                                    [--org]
+                                                    [--project]
+                                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -208,23 +243,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_show_default_iteration
+- uid: az_boards_iteration_team_show-default-iteration
   name: az boards iteration team show-default-iteration
   summary: Show default iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team show-default-iteration --team
+                                                    [--detect {false, true}]
+                                                    [--org]
+                                                    [--project]
+                                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -233,30 +273,14 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -272,4 +296,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a team.
+metadata:
+  description: Manage iterations for a team.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/work-item.yml b/2017-03-09-profile/docs-ref-autogen/boards/work-item.yml
index 948056d580..14c24db075 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/work-item.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/work-item.yml
@@ -1,23 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_work_item_create
-  - az_boards_work_item_delete
-  - az_boards_work_item_show
-  - az_boards_work_item_update
-- uid: az_boards_work_item_create
+### YamlMime:AzureCLIGroup
+uid: az_boards_work-item
+name: az boards work-item
+summary: Manage work items.
+description: ''
+directCommands:
+- uid: az_boards_work-item_create
   name: az boards work-item create
   summary: Create a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item create --title
+                               --type
+                               [--area]
+                               [--assigned-to]
+                               [--description]
+                               [--detect {false, true}]
+                               [--discussion]
+                               [--fields]
+                               [--iteration]
+                               [--open]
+                               [--org]
+                               [--project]
+                               [--reason]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --title
     summary: Title of the work item.
@@ -26,6 +32,7 @@ items:
     name: --type
     summary: Name of the work item type (e.g. Bug).
     description: ''
+  optionalParameters:
   - name: --area
     summary: Area the work item is assigned to (e.g. Demos).
     description: ''
@@ -43,7 +50,7 @@ items:
     summary: Comment to add to a discussion in a work item.
     description: ''
   - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
+    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
     description: ''
   - name: --iteration
     summary: Iteration path of the work item (e.g. DemosIteration 1).
@@ -52,7 +59,7 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -63,17 +70,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_delete
+- uid: az_boards_work-item_delete
   name: az boards work-item delete
   summary: Delete a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item delete --id
+                               [--destroy]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Unique id of the work item.
     description: ''
+  optionalParameters:
   - name: --destroy
     summary: Permanently delete this work item.
     description: ''
@@ -82,28 +96,37 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_show
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_boards_work-item_show
   name: az boards work-item show
   summary: Show details for a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item show --id
+                             [--as-of]
+                             [--detect {false, true}]
+                             [--expand {all, fields, links, none, relations}]
+                             [--fields]
+                             [--open]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
     description: ''
+  optionalParameters:
   - name: --as-of
     summary: "Work item details as of a particular date and time. Provide a date or date time string. Assumes local time zone. Example: '2019-01-20', '2019-01-20 00:20:00'. For UTC, append 'UTC' to the date time string, '2019-01-20 00:20:00 UTC'."
     description: ''
@@ -123,22 +146,39 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_update
+- uid: az_boards_work-item_update
   name: az boards work-item update
   summary: Update work items.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item update --id
+                               [--area]
+                               [--assigned-to]
+                               [--description]
+                               [--detect {false, true}]
+                               [--discussion]
+                               [--fields]
+                               [--iteration]
+                               [--open]
+                               [--org]
+                               [--reason]
+                               [--state]
+                               [--subscription]
+                               [--title]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the work item to update.
     description: ''
+  optionalParameters:
   - name: --area
     summary: Area the work item is assigned to (e.g. Demos).
     description: ''
@@ -156,7 +196,7 @@ items:
     summary: Comment to add to a discussion in a work item.
     description: ''
   - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
+    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
     description: ''
   - name: --iteration
     summary: Iteration path of the work item (e.g. DemosIteration 1).
@@ -165,7 +205,7 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --reason
     summary: Reason for the state of the work item.
@@ -173,40 +213,22 @@ items:
   - name: --state
     summary: State of the work item (e.g. active).
     description: ''
-  - name: --title
-    summary: Title of the work item.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --title
+    summary: Title of the work item.
+    description: ''
 commands:
-- uid: az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
+- az_boards_work-item_create
+- az_boards_work-item_delete
+- az_boards_work-item_relation
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
+- az_boards_work-item_show
+- az_boards_work-item_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -222,4 +244,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items.
+metadata:
+  description: Manage work items.
diff --git a/2017-03-09-profile/docs-ref-autogen/boards/work-item/relation.yml b/2017-03-09-profile/docs-ref-autogen/boards/work-item/relation.yml
index dfea92aa34..3e6e9879a8 100644
--- a/2017-03-09-profile/docs-ref-autogen/boards/work-item/relation.yml
+++ b/2017-03-09-profile/docs-ref-autogen/boards/work-item/relation.yml
@@ -1,23 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_work_item_relation_add
-  - az_boards_work_item_relation_list_type
-  - az_boards_work_item_relation_remove
-  - az_boards_work_item_relation_show
-- uid: az_boards_work_item_relation_add
+### YamlMime:AzureCLIGroup
+uid: az_boards_work-item_relation
+name: az boards work-item relation
+summary: Manage work item relations.
+description: ''
+directCommands:
+- uid: az_boards_work-item_relation_add
   name: az boards work-item relation add
   summary: Add relation(s) to work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation add --id
+                                     --relation-type
+                                     --target-id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
@@ -30,40 +28,49 @@ items:
     name: --target-id
     summary: 'ID(s) of work-items to create relation with.                          Multiple values can be passed comma separated. Example: 1,2.'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_list_type
+- uid: az_boards_work-item_relation_list-type
   name: az boards work-item relation list-type
   summary: List work item relations supported in the organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation list-type [--detect {false, true}]
+                                           [--org]
+                                           [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_remove
+- uid: az_boards_work-item_relation_remove
   name: az boards work-item relation remove
   summary: Remove relation(s) from work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation remove --id
+                                        --relation-type
+                                        --target-id
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--subscription]
+                                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
@@ -76,53 +83,54 @@ items:
     name: --target-id
     summary: 'ID(s) of work-items to remove relation from.                          Multiple values can be passed comma separated. Example: 1,2.'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_show
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_boards_work-item_relation_show
   name: az boards work-item relation show
   summary: Get work item, fill relations with friendly name.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation show --id
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--query-examples]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -138,4 +146,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item relations.
+metadata:
+  description: Manage work item relations.
diff --git a/2017-03-09-profile/docs-ref-autogen/cache.yml b/2017-03-09-profile/docs-ref-autogen/cache.yml
index 948b187998..2599a6b9b2 100644
--- a/2017-03-09-profile/docs-ref-autogen/cache.yml
+++ b/2017-03-09-profile/docs-ref-autogen/cache.yml
@@ -1,35 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_cache
-  name: az cache
-  summary: Commands to manage CLI objects cached using the `--defer` argument.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_cache_delete
-  - az_cache_list
-  - az_cache_purge
-  - az_cache_show
+### YamlMime:AzureCLIGroup
+uid: az_cache
+name: az cache
+summary: Commands to manage CLI objects cached using the `--defer` argument.
+description: ''
+directCommands:
 - uid: az_cache_delete
   name: az cache delete
   summary: Delete an object from the cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache delete --name
+                    --resource-group
+                    --resource-type
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-type -t
     summary: The resource type.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -37,9 +34,13 @@ items:
   name: az cache list
   summary: List the contents of the object cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache list [--query-examples]
+                  [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -47,9 +48,8 @@ items:
   name: az cache purge
   summary: Clear the entire CLI object cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az cache purge [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -57,37 +57,37 @@ items:
   name: az cache show
   summary: Show the contents of a specific object in the cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache show --name
+                  --resource-group
+                  --resource-type
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-type -t
     summary: The resource type.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_cache_delete
-  name: az cache delete
-  summary: Delete an object from the cache.
-- uid: az_cache_list
-  name: az cache list
-  summary: List the contents of the object cache.
-- uid: az_cache_purge
-  name: az cache purge
-  summary: Clear the entire CLI object cache.
-- uid: az_cache_show
-  name: az cache show
-  summary: Show the contents of a specific object in the cache.
+- az_cache_delete
+- az_cache_list
+- az_cache_purge
+- az_cache_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -103,4 +103,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage CLI objects cached using the `--defer` argument.
+metadata:
+  description: Commands to manage CLI objects cached using the `--defer` argument.
diff --git a/2017-03-09-profile/docs-ref-autogen/cli-translator.yml b/2017-03-09-profile/docs-ref-autogen/cli-translator.yml
new file mode 100644
index 0000000000..a0ae214250
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cli-translator.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_cli-translator
+name: az cli-translator
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cli-translator** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az cli-translator** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Translate ARM template or REST API to CLI scripts.
+description: ''
+commands:
+- az_cli-translator_arm
+- az_cli-translator_arm_translate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Translate ARM template or REST API to CLI scripts.
diff --git a/2017-03-09-profile/docs-ref-autogen/cli-translator/arm.yml b/2017-03-09-profile/docs-ref-autogen/cli-translator/arm.yml
new file mode 100644
index 0000000000..5a3c85efc8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cli-translator/arm.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_cli-translator_arm
+name: az cli-translator arm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cli-translator** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az cli-translator arm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
+description: ''
+directCommands:
+- uid: az_cli-translator_arm_translate
+  name: az cli-translator arm translate
+  summary: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
+  description: ''
+  syntax: >-
+    az cli-translator arm translate --parameters
+                                    --resource-group
+                                    --template
+                                    [--target-subscription]
+  examples:
+  - summary: Translate ARM template.json and parameters.json to CLI scripts
+    syntax: az cli-translator arm translate --target-subscription 00000000-0000-0000-0000-000000000000 --resource-group groupName --template /path/to/local/template --parameters /path/to/local/parameters
+  requiredParameters:
+  - isRequired: true
+    name: --parameters
+    summary: The local path or url of parameters.json file.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: The local path or url of template.json file.
+    description: ''
+  optionalParameters:
+  - name: --target-subscription
+    summary: The target subscription id. If omit, the current subscription id will be used.
+    description: ''
+commands:
+- az_cli-translator_arm_translate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
diff --git a/2017-03-09-profile/docs-ref-autogen/cloud-service.yml b/2017-03-09-profile/docs-ref-autogen/cloud-service.yml
new file mode 100644
index 0000000000..5bc3ea321f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cloud-service.yml
@@ -0,0 +1,422 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service
+name: az cloud-service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service (extended support).
+description: ''
+directCommands:
+- uid: az_cloud-service_create
+  name: az cloud-service create
+  summary: Create a cloud service (extended support). Please note some properties can be set only during cloud service creation.
+  description: ''
+  syntax: >-
+    az cloud-service create --cloud-service-name
+                            --resource-group
+                            [--configuration]
+                            [--configuration-url]
+                            [--extensions]
+                            [--id]
+                            [--lb]
+                            [--location]
+                            [--no-wait]
+                            [--package-url]
+                            [--roles]
+                            [--secrets]
+                            [--start-cloud-service {false, true}]
+                            [--tags]
+                            [--upgrade-mode {Auto, Manual, Simultaneous}]
+  examples:
+  - summary: Create a cloud service with 2 roles, 2 load balancers (one has a public IP and another has a private IP), secrets and extensions.
+    syntax: 'az cloud-service create -g ResourceGroup -n CloudService --roles ContosoFrontend:Standard_D1_v2:1:Standard ContosoBackend:Standard_D1_v2:1:Standard --package-url PackageURL --configuration Config --load-balancer-configurations MyLoadBalancer:MyFe:PublicIP:: MyLoadBalancer2:MyFe2::SubnetIDd:PrivateIPID --secrets Vault0:Cert0:Cert1 Vault1:Cert2:Cert3:Cert4 --extensions "@extensions.json"'
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --configuration
+    summary: 'Specify the XML service configuration (.cscfg) for the cloud service. Expected value: xml-string/@xml-file.'
+    description: ''
+  - name: --configuration-url
+    summary: Specify a URL that refers to the location of the service configuration in the Blob service. The service package URL  can be Shared Access Signature (SAS) URI from any storage account. This is a write-only property and is not returned in GET calls.
+    description: ''
+  - name: --extensions
+    summary: 'List of extensions for the cloud service. Expected value: json-string/@json-file. Example: [{"properties": {"type": "RDP", "autoUpgradeMinorVersion": false, "protectedSettings": "settings","publisher": "Microsoft.Windows.Azure.Extensions", "settings": "settings", "typeHandlerVersion": "1.2.1"}, "name": "RDPExtension"}].'
+    description: ''
+  - name: --id
+    summary: Resource Id.
+    description: ''
+  - name: --lb --load-balancer-configurations
+    summary: 'The list of load balancer configurations separated by space for the cloud service. The public IP is a mandatory field. Format: LBName:FrontendIPConfiguration:PublicIPAddress:Subnet:PrivateIP.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --package-url
+    summary: Specify a URL that refers to the location of the service package in the Blob service. The service package URL can be Shared Access Signature (SAS) URI from any storage account. This is a write-only property and is not returned in GET calls.
+    description: ''
+  - name: --roles
+    summary: 'List of roles separated by space for the cloud service. Format: RoleName:SkuName:SkuCapacity:SkuTier.'
+    description: ''
+  - name: --secrets
+    summary: 'Specify certificates separated by space that should be installed onto the role instances. Format: KeyVaultName:CertificateUrl:CertificateUrl2:...:CertificateUrlN.'
+    description: ''
+  - name: --start-cloud-service
+    parameterValueGroup: false, true
+    summary: Indicate whether to start the cloud service immediately after it is created. The default value is `true`. If false, the service model is still deployed, but the code is not run immediately. Instead, the service is PoweredOff until you call Start, at which time the service will be started. A deployed service still incurs charges, even if it is poweredoff.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --upgrade-mode
+    parameterValueGroup: Auto, Manual, Simultaneous
+    summary: Update mode for the cloud service. Role instances are allocated to update domains when the service is deployed. Updates can be initiated manually in each update domain or initiated automatically in all update domains. Possible Values are Auto, Manual, Simultaneous. If not specified, the default value is Auto. If set to Manual, PUT UpdateDomain must be called to apply the update. If set to Auto, the update is automatically applied to each update domain in sequence.
+    description: ''
+- uid: az_cloud-service_delete
+  name: az cloud-service delete
+  summary: Delete a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service delete --cloud-service-name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_delete-instance
+  name: az cloud-service delete-instance
+  summary: Delete role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service delete-instance --cloud-service-name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--role-instances]
+                                     [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_list
+  name: az cloud-service list
+  summary: Get a list of all cloud services under a resource group.
+  description: ''
+  syntax: az cloud-service list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_list-all
+  name: az cloud-service list-all
+  summary: Get a list of all cloud services in the subscription, regardless of the associated resource group.
+  description: ''
+  syntax: az cloud-service list-all
+- uid: az_cloud-service_power-off
+  name: az cloud-service power-off
+  summary: Power off the cloud service. Note that resources are still attached and you are getting charged for the resources.
+  description: ''
+  syntax: >-
+    az cloud-service power-off --cloud-service-name
+                               --resource-group
+                               [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_rebuild
+  name: az cloud-service rebuild
+  summary: Rebuild Role Instances. Reinstall the operating system on instances of web roles or worker roles and initialize the storage resources that are used by them. If you do not want to initialize storage resources, you can use Reimage Role Instances.
+  description: ''
+  syntax: >-
+    az cloud-service rebuild --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_reimage
+  name: az cloud-service reimage
+  summary: Reimage asynchronous operation reinstalls the operating system on instances of web roles or worker roles.
+  description: ''
+  syntax: >-
+    az cloud-service reimage --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_restart
+  name: az cloud-service restart
+  summary: Restart one or more role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service restart --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_show
+  name: az cloud-service show
+  summary: Display information about a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service show --cloud-service-name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_show-instance-view
+  name: az cloud-service show-instance-view
+  summary: Get the status of a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service show-instance-view --cloud-service-name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_start
+  name: az cloud-service start
+  summary: Start the cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service start --cloud-service-name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_update
+  name: az cloud-service update
+  summary: Update a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update --cloud-service-name
+                            --resource-group
+                            [--no-wait]
+                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_cloud-service_wait
+  name: az cloud-service wait
+  summary: Place the CLI in a waiting state until a condition of the cloud-service is met.
+  description: ''
+  syntax: >-
+    az cloud-service wait --cloud-service-name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_cloud-service_create
+- az_cloud-service_delete
+- az_cloud-service_delete-instance
+- az_cloud-service_list
+- az_cloud-service_list-all
+- az_cloud-service_power-off
+- az_cloud-service_rebuild
+- az_cloud-service_reimage
+- az_cloud-service_restart
+- az_cloud-service_role
+- az_cloud-service_role_list
+- az_cloud-service_role_show
+- az_cloud-service_role-instance
+- az_cloud-service_role-instance_delete
+- az_cloud-service_role-instance_list
+- az_cloud-service_role-instance_rebuild
+- az_cloud-service_role-instance_reimage
+- az_cloud-service_role-instance_restart
+- az_cloud-service_role-instance_show
+- az_cloud-service_role-instance_show-instance-view
+- az_cloud-service_role-instance_show-remote-desktop-file
+- az_cloud-service_show
+- az_cloud-service_show-instance-view
+- az_cloud-service_start
+- az_cloud-service_update
+- az_cloud-service_update-domain
+- az_cloud-service_update-domain_list-update-domain
+- az_cloud-service_update-domain_show-update-domain
+- az_cloud-service_update-domain_walk-update-domain
+- az_cloud-service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service (extended support).
diff --git a/2017-03-09-profile/docs-ref-autogen/cloud-service/role-instance.yml b/2017-03-09-profile/docs-ref-autogen/cloud-service/role-instance.yml
new file mode 100644
index 0000000000..3fe7177b79
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cloud-service/role-instance.yml
@@ -0,0 +1,223 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_role-instance
+name: az cloud-service role-instance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service role-instance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service role instance with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_role-instance_delete
+  name: az cloud-service role-instance delete
+  summary: Delete a role instance from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance delete --cloud-service-name
+                                          --resource-group
+                                          --role-instance-name
+                                          [--no-wait]
+                                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_role-instance_list
+  name: az cloud-service role-instance list
+  summary: Get the list of all role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance list --cloud-service-name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_role-instance_rebuild
+  name: az cloud-service role-instance rebuild
+  summary: The Rebuild Role Instance asynchronous operation reinstalls the operating system on instances of web roles or worker roles and initializes the storage resources that are used by them. If you do not want to initialize storage resources, you can use Reimage Role Instance.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance rebuild --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_reimage
+  name: az cloud-service role-instance reimage
+  summary: The Reimage Role Instance asynchronous operation reinstalls the operating system on instances of web roles or worker roles.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance reimage --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_restart
+  name: az cloud-service role-instance restart
+  summary: The Reboot Role Instance asynchronous operation requests a reboot of a role instance in the cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance restart --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_show
+  name: az cloud-service role-instance show
+  summary: Get a role instance from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show --cloud-service-name
+                                        --resource-group
+                                        --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+- uid: az_cloud-service_role-instance_show-instance-view
+  name: az cloud-service role-instance show-instance-view
+  summary: Retrieve information about the run-time state of a role instance in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show-instance-view --cloud-service-name
+                                                      --resource-group
+                                                      --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+- uid: az_cloud-service_role-instance_show-remote-desktop-file
+  name: az cloud-service role-instance show-remote-desktop-file
+  summary: Get a remote desktop file for a role instance in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show-remote-desktop-file --cloud-service-name
+                                                            --resource-group
+                                                            --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+commands:
+- az_cloud-service_role-instance_delete
+- az_cloud-service_role-instance_list
+- az_cloud-service_role-instance_rebuild
+- az_cloud-service_role-instance_reimage
+- az_cloud-service_role-instance_restart
+- az_cloud-service_role-instance_show
+- az_cloud-service_role-instance_show-instance-view
+- az_cloud-service_role-instance_show-remote-desktop-file
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service role instance with cloud service.
diff --git a/2017-03-09-profile/docs-ref-autogen/cloud-service/role.yml b/2017-03-09-profile/docs-ref-autogen/cloud-service/role.yml
new file mode 100644
index 0000000000..389cec1fa5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cloud-service/role.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_role
+name: az cloud-service role
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service role** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service role with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_role_list
+  name: az cloud-service role list
+  summary: Get a list of all roles in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role list --cloud-service-name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_role_show
+  name: az cloud-service role show
+  summary: Get a role from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role show --cloud-service-name
+                               --resource-group
+                               --role-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-name
+    summary: Name of the role.
+    description: ''
+commands:
+- az_cloud-service_role_list
+- az_cloud-service_role_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service role with cloud service.
diff --git a/2017-03-09-profile/docs-ref-autogen/cloud-service/update-domain.yml b/2017-03-09-profile/docs-ref-autogen/cloud-service/update-domain.yml
new file mode 100644
index 0000000000..401a31b63a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cloud-service/update-domain.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_update-domain
+name: az cloud-service update-domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service update-domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service update domain with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_update-domain_list-update-domain
+  name: az cloud-service update-domain list-update-domain
+  summary: Get a list of all update domains in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain list-update-domain --cloud-service-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_update-domain_show-update-domain
+  name: az cloud-service update-domain show-update-domain
+  summary: Get the specified update domain of a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain show-update-domain --cloud-service-name
+                                                      --resource-group
+                                                      --update-domain
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --update-domain
+    summary: 'Specifies an integer value that identifies the update domain. Update domains are identified with a zero-based index: the first update domain has an ID of 0, the second has an ID of 1, and so on.'
+    description: ''
+- uid: az_cloud-service_update-domain_walk-update-domain
+  name: az cloud-service update-domain walk-update-domain
+  summary: Update the role instances in the specified update domain.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain walk-update-domain --cloud-service-name
+                                                      --resource-group
+                                                      --update-domain
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --update-domain
+    summary: 'Specifies an integer value that identifies the update domain. Update domains are identified with a zero-based index: the first update domain has an ID of 0, the second has an ID of 1, and so on.'
+    description: ''
+commands:
+- az_cloud-service_update-domain_list-update-domain
+- az_cloud-service_update-domain_show-update-domain
+- az_cloud-service_update-domain_walk-update-domain
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service update domain with cloud service.
diff --git a/2017-03-09-profile/docs-ref-autogen/cloud.yml b/2017-03-09-profile/docs-ref-autogen/cloud.yml
index 012b6e81dc..8cc5841bd3 100644
--- a/2017-03-09-profile/docs-ref-autogen/cloud.yml
+++ b/2017-03-09-profile/docs-ref-autogen/cloud.yml
@@ -1,39 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_cloud
-  name: az cloud
-  summary: Manage registered Azure clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_cloud_list
-  - az_cloud_list_profiles
-  - az_cloud_register
-  - az_cloud_set
-  - az_cloud_show
-  - az_cloud_unregister
-  - az_cloud_update
+### YamlMime:AzureCLIGroup
+uid: az_cloud
+name: az cloud
+summary: Manage registered Azure clouds.
+description: ''
+directCommands:
 - uid: az_cloud_list
   name: az cloud list
   summary: List registered clouds.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_cloud_list_profiles
+  syntax: az cloud list [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
+- uid: az_cloud_list-profiles
   name: az cloud list-profiles
   summary: List the supported profiles for a cloud.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud list-profiles [--name]
+                           [--show-all]
+  optionalParameters:
   - name: --name -n
     defaultValue: AzureCloud
     summary: Name of a registered cloud.
@@ -41,23 +29,58 @@ items:
   - name: --show-all
     summary: Show all available profiles supported in the CLI.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_register
   name: az cloud register
   summary: Register a cloud.
   description: When registering a cloud, specify only the resource manager endpoint for the autodetection of other endpoints.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud register --name
+                      [--cloud-config]
+                      [--endpoint-active-directory]
+                      [--endpoint-active-directory-data-lake-resource-id]
+                      [--endpoint-active-directory-graph-resource-id]
+                      [--endpoint-active-directory-resource-id]
+                      [--endpoint-gallery]
+                      [--endpoint-management]
+                      [--endpoint-resource-manager]
+                      [--endpoint-sql-management]
+                      [--endpoint-vm-image-alias-doc]
+                      [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
+                      [--suffix-acr-login-server-endpoint]
+                      [--suffix-azure-datalake-analytics-catalog-and-job-endpoint]
+                      [--suffix-azure-datalake-store-file-system-endpoint]
+                      [--suffix-keyvault-dns]
+                      [--suffix-sql-server-hostname]
+                      [--suffix-storage-endpoint]
+  examples:
+  - summary: Register a cloud with a config file
+    syntax: >-
+      az cloud register -n MyCloud --cloud-config @"cloud.json"
+
+      ("cloud.json" supports all the endpoint and suffix options in camel case or the JSON output format from az cloud show. See the example content below.)
+
+      {
+        "endpointActiveDirectory": "https://login.microsoftonline.us",
+        "suffixAcrLoginServerEndpoint": ".azurecr.us"
+      }
+
+      or
+
+      {
+        "endpoints":{
+          "activeDirectory": "https://login.microsoftonline.us"
+        },
+        "suffixes":{
+          "acrLoginServerEndpoint": ".azurecr.us"
+        }
+      }
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
+  optionalParameters:
   - name: --cloud-config
     summary: JSON encoded cloud configuration. Use @{file} to load from a file.
     description: ''
@@ -89,7 +112,7 @@ items:
     summary: The uri of the document which caches commonly used virtual machine images.
     description: ''
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
   - name: --suffix-acr-login-server-endpoint
@@ -110,86 +133,85 @@ items:
   - name: --suffix-storage-endpoint
     summary: The endpoint suffix for storage accounts.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_set
   name: az cloud set
   summary: Set the active cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az cloud set --name
+                 [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
   examples:
   - summary: Set the active cloud. (autogenerated)
-    syntax:
-      content: az cloud set --name MyRegisteredCloud
-  parameters:
+    syntax: az cloud set --name MyRegisteredCloud
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
+  optionalParameters:
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_show
   name: az cloud show
   summary: Get the details of a registered cloud.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud show [--name]
+                  [--query-examples]
+  optionalParameters:
   - name: --name -n
     defaultValue: AzureCloud
     summary: Name of a registered cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_unregister
   name: az cloud unregister
   summary: Unregister a cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: az cloud unregister --name
   examples:
   - summary: Unregister a cloud. (autogenerated)
-    syntax:
-      content: az cloud unregister --name MyRegisteredCloud
-  parameters:
+    syntax: az cloud unregister --name MyRegisteredCloud
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_update
   name: az cloud update
   summary: Update the configuration of a cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az cloud update [--cloud-config]
+                    [--endpoint-active-directory]
+                    [--endpoint-active-directory-data-lake-resource-id]
+                    [--endpoint-active-directory-graph-resource-id]
+                    [--endpoint-active-directory-resource-id]
+                    [--endpoint-gallery]
+                    [--endpoint-management]
+                    [--endpoint-resource-manager]
+                    [--endpoint-sql-management]
+                    [--endpoint-vm-image-alias-doc]
+                    [--name]
+                    [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
+                    [--suffix-acr-login-server-endpoint]
+                    [--suffix-azure-datalake-analytics-catalog-and-job-endpoint]
+                    [--suffix-azure-datalake-store-file-system-endpoint]
+                    [--suffix-keyvault-dns]
+                    [--suffix-sql-server-hostname]
+                    [--suffix-storage-endpoint]
   examples:
   - summary: Update the configuration of a cloud. (autogenerated)
-    syntax:
-      content: az cloud update --profile latest
-  parameters:
+    syntax: az cloud update --profile latest
+  optionalParameters:
   - name: --cloud-config
     summary: JSON encoded cloud configuration. Use @{file} to load from a file.
     description: ''
@@ -225,7 +247,7 @@ items:
     summary: Name of a registered cloud.
     description: ''
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
   - name: --suffix-acr-login-server-endpoint
@@ -246,34 +268,15 @@ items:
   - name: --suffix-storage-endpoint
     summary: The endpoint suffix for storage accounts.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 commands:
-- uid: az_cloud_list
-  name: az cloud list
-  summary: List registered clouds.
-- uid: az_cloud_list_profiles
-  name: az cloud list-profiles
-  summary: List the supported profiles for a cloud.
-- uid: az_cloud_register
-  name: az cloud register
-  summary: Register a cloud.
-- uid: az_cloud_set
-  name: az cloud set
-  summary: Set the active cloud.
-- uid: az_cloud_show
-  name: az cloud show
-  summary: Get the details of a registered cloud.
-- uid: az_cloud_unregister
-  name: az cloud unregister
-  summary: Unregister a cloud.
-- uid: az_cloud_update
-  name: az cloud update
-  summary: Update the configuration of a cloud.
+- az_cloud_list
+- az_cloud_list-profiles
+- az_cloud_register
+- az_cloud_set
+- az_cloud_show
+- az_cloud_unregister
+- az_cloud_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -289,10 +292,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/800e711239d60c81de6679d73779563b2cedcc62/src/azure-cli/azure/cli/command_modules/cloud/_help.py
-updated_at: 2/13/2020 4:56:47 AM
-ms.date: 02/13/2020
-description: Manage registered Azure clouds.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 10/30/2020
+  description: Manage registered Azure clouds.
diff --git a/2017-03-09-profile/docs-ref-autogen/codespace.yml b/2017-03-09-profile/docs-ref-autogen/codespace.yml
new file mode 100644
index 0000000000..65ea5c5a6b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/codespace.yml
@@ -0,0 +1,364 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace
+name: az codespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Visual Studio Codespaces.
+description: ''
+directCommands:
+- uid: az_codespace_create
+  name: az codespace create
+  summary: Create a Codespace.
+  description: ''
+  syntax: >-
+    az codespace create --name
+                        --plan
+                        [--dotfiles-command]
+                        [--dotfiles-path]
+                        [--dotfiles-repo]
+                        [--git-repo]
+                        [--git-user-email]
+                        [--git-user-name]
+                        [--instance-type]
+                        [--resource-group]
+                        [--suspend-after {120, 30, 5, 60}]
+  examples:
+  - summary: Create a Codespace with default plan settings
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace
+  - summary: Create a Codespace with a different instance type with custom suspend time
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux --suspend-after 5
+  - summary: Create a Codespace with a git repo
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --git-repo https://github.com/github/repo --git-user-name "User Name" --git-user-email user@example.com
+  - summary: Create a Codespace with a dotfiles repo
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --dotfiles-repo https://github.com/github/dotfiles --dotfiles-path ~/dotfiles --dotfiles-command bootstrap.sh
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --dotfiles-command
+    summary: The command we'll run after cloning your dotfiles repository.
+    description: ''
+  - name: --dotfiles-path
+    summary: Path where you expect your dotfiles repository to be cloned into the Codespace.
+    description: ''
+  - name: --dotfiles-repo
+    summary: 'Url of dotfiles git repository. More info: https://aka.ms/vso-docs/reference/personalizing.'
+    description: ''
+  - name: --git-repo
+    summary: Url of the git repository we'll clone into the Codespace.
+    description: ''
+  - name: --git-user-email
+    summary: Git user email. For example, the output of `git config user.email`.
+    description: ''
+  - name: --git-user-name
+    summary: Git username. For example, the output of `git config user.name`.
+    description: ''
+  - name: --instance-type
+    summary: Instance Type.
+    description: ''
+    valueFrom: az codespace location show
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Automatically suspend the inactive Codespace after this many minutes.
+    description: ''
+- uid: az_codespace_delete
+  name: az codespace delete
+  summary: Delete a Codespace.
+  description: ''
+  syntax: >-
+    az codespace delete --plan
+                        [--id]
+                        [--name]
+                        [--resource-group]
+                        [--yes]
+  examples:
+  - summary: Delete a Codespace given name
+    syntax: az codespace delete -g my-rg --plan my-plan --name my-codespace
+  - summary: Delete a Codespace given id
+    syntax: az codespace delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Delete a Codespace given plan id and Codespace name
+    syntax: az codespace delete --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_list
+  name: az codespace list
+  summary: List Codespaces.
+  description: ''
+  syntax: >-
+    az codespace list --plan
+                      [--all]
+                      [--resource-group]
+  examples:
+  - summary: List Codespaces
+    syntax: az codespace list -g my-rg --plan my-plan
+  - summary: List Codespaces given plan id
+    syntax: az codespace list --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --all
+    summary: Include the Codespaces of other users. You may not have access to connect or modify these other Codespaces.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_open
+  name: az codespace open
+  summary: Open a Codespace in the web browser.
+  description: Confirmation is required if the Codespace is not in the 'Available' state as opening a Codespace will automatically resume it.
+  syntax: >-
+    az codespace open --plan
+                      [--id]
+                      [--name]
+                      [--resource-group]
+                      [--yes]
+  examples:
+  - summary: Open a Codespace given name
+    syntax: az codespace open -g my-rg --plan my-plan --name my-codespace
+  - summary: Open a Codespace given id
+    syntax: az codespace open -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Open a Codespace given plan id and Codespace name
+    syntax: az codespace open --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_resume
+  name: az codespace resume
+  summary: Resume a Codespace.
+  description: ''
+  syntax: >-
+    az codespace resume --plan
+                        [--id]
+                        [--name]
+                        [--resource-group]
+  examples:
+  - summary: Resume a Codespace given name
+    syntax: az codespace resume -g my-rg --plan my-plan --name my-codespace
+  - summary: Resume a Codespace given id
+    syntax: az codespace resume -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Resume a Codespace given plan id and Codespace name
+    syntax: az codespace resume --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_set-config
+  name: az codespace set-config
+  summary: Set configuration for codespace commands.
+  description: ''
+  syntax: >-
+    az codespace set-config [--clear]
+                            [--domain]
+                            [--rp]
+  optionalParameters:
+  - name: --clear
+    summary: Clear current configuration to return to defaults.
+    description: ''
+  - name: --domain
+    summary: Service domain to use.
+    description: ''
+  - name: --rp
+    summary: Resource Provider API version to use.
+    description: ''
+- uid: az_codespace_show
+  name: az codespace show
+  summary: Show details of a Codespace.
+  description: ''
+  syntax: >-
+    az codespace show --plan
+                      [--id]
+                      [--name]
+                      [--resource-group]
+  examples:
+  - summary: Show details of a Codespace given name
+    syntax: az codespace show -g my-rg --plan my-plan --name my-codespace
+  - summary: Show details of a Codespace given id
+    syntax: az codespace show -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Show details of a Codespace given plan id and Codespace name
+    syntax: az codespace show --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_show-config
+  name: az codespace show-config
+  summary: Show current configuration for codespace commands.
+  description: ''
+  syntax: az codespace show-config
+- uid: az_codespace_suspend
+  name: az codespace suspend
+  summary: Suspend a Codespace.
+  description: ''
+  syntax: >-
+    az codespace suspend --plan
+                         [--id]
+                         [--name]
+                         [--resource-group]
+  examples:
+  - summary: Suspend a Codespace given name
+    syntax: az codespace suspend -g my-rg --plan my-plan --name my-codespace
+  - summary: Suspend a Codespace given id
+    syntax: az codespace suspend -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Suspend a Codespace given plan id and Codespace name
+    syntax: az codespace suspend --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_update
+  name: az codespace update
+  summary: Update a Codespace.
+  description: ''
+  syntax: >-
+    az codespace update --plan
+                        [--id]
+                        [--instance-type]
+                        [--name]
+                        [--resource-group]
+                        [--suspend-after {120, 30, 5, 60}]
+  examples:
+  - summary: Update a Codespace with a different instance type
+    syntax: az codespace update -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux
+  - summary: Update a Codespace with a different suspend after
+    syntax: az codespace update -g my-rg --plan my-plan --name my-codespace --suspend-after 30
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --instance-type
+    summary: Instance Type.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Automatically suspend the inactive Codespace after this many minutes.
+    description: ''
+commands:
+- az_codespace_create
+- az_codespace_delete
+- az_codespace_list
+- az_codespace_location
+- az_codespace_location_list
+- az_codespace_location_show
+- az_codespace_open
+- az_codespace_plan
+- az_codespace_plan_create
+- az_codespace_plan_delete
+- az_codespace_plan_list
+- az_codespace_plan_show
+- az_codespace_resume
+- az_codespace_secret
+- az_codespace_secret_create
+- az_codespace_secret_delete
+- az_codespace_secret_list
+- az_codespace_secret_update
+- az_codespace_set-config
+- az_codespace_show
+- az_codespace_show-config
+- az_codespace_suspend
+- az_codespace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Visual Studio Codespaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/codespace/location.yml b/2017-03-09-profile/docs-ref-autogen/codespace/location.yml
new file mode 100644
index 0000000000..86d607998a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/codespace/location.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_location
+name: az codespace location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Information on available regions.
+description: ''
+directCommands:
+- uid: az_codespace_location_list
+  name: az codespace location list
+  summary: List available regions.
+  description: ''
+  syntax: az codespace location list
+- uid: az_codespace_location_show
+  name: az codespace location show
+  summary: Show details of a region.
+  description: ''
+  syntax: az codespace location show --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the region.
+    description: ''
+commands:
+- az_codespace_location_list
+- az_codespace_location_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Information on available regions.
diff --git a/2017-03-09-profile/docs-ref-autogen/codespace/plan.yml b/2017-03-09-profile/docs-ref-autogen/codespace/plan.yml
new file mode 100644
index 0000000000..f43310d8cf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/codespace/plan.yml
@@ -0,0 +1,140 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_plan
+name: az codespace plan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace plan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Codespace plans.
+description: ''
+directCommands:
+- uid: az_codespace_plan_create
+  name: az codespace plan create
+  summary: Create a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan create --name
+                             --resource-group
+                             [--default-instance-type]
+                             [--default-suspend-after {120, 30, 5, 60}]
+                             [--location]
+                             [--subnet]
+                             [--tags]
+  examples:
+  - summary: Create a plan in same region as resource group
+    syntax: az codespace plan create -g my-rg -n my-plan
+  - summary: Create a plan in a specific region
+    syntax: az codespace plan create -g my-rg -n my-plan -l westus2
+  - summary: Create a plan with tags
+    syntax: az codespace plan create -g my-rg -n my-plan --tags tagname=tagvalue
+  - summary: Create a plan with a default instance type
+    syntax: az codespace plan create -g my-rg -n my-plan --default-instance-type premiumLinux
+  - summary: Create a plan with a default suspend after
+    syntax: az codespace plan create -g my-rg -n my-plan --default-suspend-after 120
+  - summary: Create a plan associated with a subnet
+    syntax: az codespace plan create -g my-rg -n my-plan --subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Network/virtualNetworks/my-vnet/subnets/default
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --default-instance-type
+    summary: Default Instance Type for Codespaces in this plan.
+    description: ''
+  - name: --default-suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Default minutes Codespaces in this plan should suspend after.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subnet
+    summary: Resource ID of an existing subnet. If specified, all Codespaces in this plan will be created in this subnet. The subnet must be in the same region as the plan.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_codespace_plan_delete
+  name: az codespace plan delete
+  summary: Delete a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan delete --name
+                             --resource-group
+                             [--yes]
+  examples:
+  - summary: Delete a plan
+    syntax: az codespace plan delete -g my-rg -n my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_plan_list
+  name: az codespace plan list
+  summary: List Codespace plans.
+  description: ''
+  syntax: az codespace plan list [--resource-group]
+  examples:
+  - summary: List plans
+    syntax: az codespace plan list
+  - summary: List plans in a given resource group
+    syntax: az codespace plan list -g my-rg
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_plan_show
+  name: az codespace plan show
+  summary: Show details of a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan show --name
+                           --resource-group
+  examples:
+  - summary: Show details of a plan
+    syntax: az codespace plan show -g my-rg -n my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_codespace_plan_create
+- az_codespace_plan_delete
+- az_codespace_plan_list
+- az_codespace_plan_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Codespace plans.
diff --git a/2017-03-09-profile/docs-ref-autogen/codespace/secret.yml b/2017-03-09-profile/docs-ref-autogen/codespace/secret.yml
new file mode 100644
index 0000000000..38cc2c474a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/codespace/secret.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_secret
+name: az codespace secret
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace secret** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage plan secrets.
+description: ''
+directCommands:
+- uid: az_codespace_secret_create
+  name: az codespace secret create
+  summary: Create a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret create --name
+                               --plan
+                               --value
+                               [--filters]
+                               [--note]
+                               [--resource-group]
+  examples:
+  - summary: Create a plan secret.
+    syntax: az codespace secret create -g my-rg --plan my-plan --name API_KEY --value "secretkey" --note "service api key"
+  - summary: Create a plan secret with filters.
+    syntax: az codespace secret create -g my-rg --plan my-plan --name API_KEY --value "secretkey" --filters GitRepo=https://github.com/repo/name CodespaceName=mycodespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Value of the secret.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: 'Space-separated filters: type=value [type=value ...]. Use "" to clear existing filters. Allowed types: GitRepo, CodespaceName.'
+    description: ''
+  - name: --note
+    summary: Note for the secret.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_delete
+  name: az codespace secret delete
+  summary: Delete a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret delete --id
+                               --plan
+                               [--resource-group]
+  examples:
+  - summary: Delete a plan secret.
+    syntax: az codespace secret delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_list
+  name: az codespace secret list
+  summary: List plan secrets.
+  description: ''
+  syntax: >-
+    az codespace secret list --plan
+                             [--resource-group]
+  examples:
+  - summary: List plan secrets.
+    syntax: az codespace secret list -g my-rg --plan my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_update
+  name: az codespace secret update
+  summary: Update a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret update --id
+                               --plan
+                               [--filters]
+                               [--name]
+                               [--note]
+                               [--resource-group]
+                               [--value]
+  examples:
+  - summary: Update a plan secret with new values.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --name API_KEY --value "newsecretkey" --note "service api key"
+  - summary: Update a plan secret with new filters.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --filters GitRepo=https://github.com/repo/name CodespaceName=mycodespace
+  - summary: Update a plan secret and clear existing filters.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --filters ''
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: 'Space-separated filters: type=value [type=value ...]. Use "" to clear existing filters. Allowed types: GitRepo, CodespaceName.'
+    description: ''
+  - name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - name: --note
+    summary: Note for the secret.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --value
+    summary: Value of the secret.
+    description: ''
+commands:
+- az_codespace_secret_create
+- az_codespace_secret_delete
+- az_codespace_secret_list
+- az_codespace_secret_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage plan secrets.
diff --git a/2017-03-09-profile/docs-ref-autogen/communication.yml b/2017-03-09-profile/docs-ref-autogen/communication.yml
new file mode 100644
index 0000000000..3cd874ba3f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/communication.yml
@@ -0,0 +1,300 @@
+### YamlMime:AzureCLIGroup
+uid: az_communication
+name: az communication
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **communication** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az communication** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage communication service.
+description: ''
+directCommands:
+- uid: az_communication_create
+  name: az communication create
+  summary: Create a new Communication Service or update an existing Communication Service.
+  description: ''
+  syntax: >-
+    az communication create --name
+                            --resource-group
+                            [--data-location]
+                            [--location]
+                            [--no-wait]
+                            [--tags]
+  examples:
+  - summary: Create a Communication Service
+    syntax: az communication create --name "MyCommunicationResource" --location "Global" --data-location "United States" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-location
+    summary: The location where the communication service stores its data at rest.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_communication_delete
+  name: az communication delete
+  summary: Operation to delete a Communication Service.
+  description: ''
+  syntax: >-
+    az communication delete --name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: Delete a Communication Service
+    syntax: az communication delete --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_communication_link-notification-hub
+  name: az communication link-notification-hub
+  summary: Link an Azure Notification Hub to this communication.
+  description: ''
+  syntax: >-
+    az communication link-notification-hub --name
+                                           --resource-group
+                                           [--connection-string]
+                                           [--resource-id]
+  examples:
+  - summary: Link a Communication Service to a existing notification hub
+    syntax: az communication link-notification-hub --name "MyCommunicationResource" --connection-string "Endpoint=sb://MyNamespace.servicebus.windows.net/;SharedAccessKey=abcd1234" --resource-id "/subscriptions/12345/resourceGroups/MyOtherResourceGroup/providers/Microsoft.NotificationHubs/namespaces/MyNamespace/notificationHubs/MyHub" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --connection-string
+    summary: Connection string for the notification hub.
+    description: ''
+  - name: --resource-id
+    summary: The resource ID of the notification hub.
+    description: ''
+- uid: az_communication_list
+  name: az communication list
+  summary: List all resources in a subscription or a resource group.
+  description: ''
+  syntax: az communication list [--resource-group]
+  examples:
+  - summary: List by resource group
+    syntax: az communication list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_list-key
+  name: az communication list-key
+  summary: Get the access keys of the Communication Service resource.
+  description: ''
+  syntax: >-
+    az communication list-key --name
+                              --resource-group
+  examples:
+  - summary: List access keys of a Communication Service
+    syntax: az communication list-key --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_regenerate-key
+  name: az communication regenerate-key
+  summary: Regenerate Communication Service access key. PrimaryKey and SecondaryKey cannot be regenerated at the same time.
+  description: ''
+  syntax: >-
+    az communication regenerate-key --name
+                                    --resource-group
+                                    [--key-type {Primary, Secondary}]
+  examples:
+  - summary: Regenerate primary access keys of a Communication Service
+    syntax: az communication regenerate-key --name "MyCommunicationResource" --key-type "Primary" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-type
+    parameterValueGroup: Primary, Secondary
+    summary: The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive).
+    description: ''
+- uid: az_communication_show
+  name: az communication show
+  summary: Get the Communication Service and its properties.
+  description: ''
+  syntax: >-
+    az communication show --name
+                          --resource-group
+  examples:
+  - summary: Get the detail of a Communication Service
+    syntax: az communication show --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_show-status
+  name: az communication show-status
+  summary: Get the current status of an async operation.
+  description: ''
+  syntax: >-
+    az communication show-status --location
+                                 --operation-id
+  examples:
+  - summary: Get the current status of a specific operation
+    syntax: az communication show-status --operation-id "db5f291f-284d-46e9-9152-d5c83f7c14b8" --location "westus2"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The ID of an ongoing async operation.
+    description: ''
+- uid: az_communication_update
+  name: az communication update
+  summary: Operation to update an existing Communication Service.
+  description: ''
+  syntax: >-
+    az communication update --name
+                            --resource-group
+                            [--tags]
+  examples:
+  - summary: Update a Communication Service
+    syntax: az communication update --name "MyCommunicationResource" --tags newTag="newVal" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_communication_wait
+  name: az communication wait
+  summary: Place the CLI in a waiting state until a condition of the communication is met.
+  description: ''
+  syntax: >-
+    az communication wait --name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the communication is successfully created.
+    syntax: az communication wait --name "MyCommunicationResource" --resource-group "MyResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the communication is successfully deleted.
+    syntax: az communication wait --name "MyCommunicationResource" --resource-group "MyResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_communication_create
+- az_communication_delete
+- az_communication_link-notification-hub
+- az_communication_list
+- az_communication_list-key
+- az_communication_regenerate-key
+- az_communication_show
+- az_communication_show-status
+- az_communication_update
+- az_communication_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage communication service.
diff --git a/2017-03-09-profile/docs-ref-autogen/config.yml b/2017-03-09-profile/docs-ref-autogen/config.yml
new file mode 100644
index 0000000000..7da352b168
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/config.yml
@@ -0,0 +1,108 @@
+### YamlMime:AzureCLIGroup
+uid: az_config
+name: az config
+summary: Manage Azure CLI configuration.
+description: Available since Azure CLI 2.10.0.
+directCommands:
+- uid: az_config_get
+  name: az config get
+  summary: Get a configuration.
+  description: ''
+  syntax: >-
+    az config get [--local]
+                  [<KEY>]
+  examples:
+  - summary: Get all configurations.
+    syntax: az config get
+  - summary: Get configurations in `core` section.
+    syntax: az config get core
+  - summary: Get the configuration of key `core.no_color`.
+    syntax: az config get core.no_color
+  optionalParameters:
+  - name: --local
+    summary: Include local configuration. Scan from the working directory up to the root drive, then the global configuration and return the first occurrence.
+    description: ''
+  - name: <KEY>
+    summary: The configuration to get. If not provided, all sections and configurations will be listed. If `section` is provided, all configurations under the specified section will be listed. If `<section>.<key>` is provided, only the corresponding configuration is shown.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_set
+  name: az config set
+  summary: Set a configuration.
+  description: >-
+    For available configuration options, see https://docs.microsoft.com/cli/azure/azure-cli-configuration.
+
+    By default without specifying --local, the configuration will be saved to `~/.azure/config`.
+  syntax: >-
+    az config set [--local]
+                  [<KEY_VALUE>]
+  examples:
+  - summary: Disable color with `core.no_color`.
+    syntax: az config set core.no_color=true
+  - summary: Hide warnings and only show errors with `core.only_show_errors`.
+    syntax: az config set core.only_show_errors=true
+  - summary: Turn on client-side telemetry.
+    syntax: az config set core.collect_telemetry=true
+  - summary: Turn on file logging and set its location.
+    syntax: >-
+      az config set logging.enable_log_file=true
+
+      az config set logging.log_dir=~/az-logs
+  - summary: Set the default location to `westus2` and default resource group to `myRG`.
+    syntax: az config set defaults.location=westus2 defaults.group=MyResourceGroup
+  - summary: Set the default resource group to `myRG` on a local scope.
+    syntax: az config set defaults.group=myRG --local
+  optionalParameters:
+  - name: --local
+    summary: Set as a local configuration in the working directory.
+    description: ''
+  - name: <KEY_VALUE>
+    summary: Space-separated configurations in the form of <section>.<key>=<value>.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_unset
+  name: az config unset
+  summary: Unset a configuration.
+  description: ''
+  syntax: >-
+    az config unset [--local]
+                    [<KEY>]
+  examples:
+  - summary: Unset the configuration of key `core.no_color`.
+    syntax: az config unset core.no_color
+  optionalParameters:
+  - name: --local
+    summary: Include local configuration. Scan from the working directory up to the root drive, then the global configuration and unset the first occurrence.
+    description: ''
+  - name: <KEY>
+    summary: The configuration to unset, in the form of <section>.<key>.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+commands:
+- az_config_get
+- az_config_param-persist
+- az_config_param-persist_delete
+- az_config_param-persist_off
+- az_config_param-persist_on
+- az_config_param-persist_show
+- az_config_set
+- az_config_unset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 03/17/2021
+  description: Available since Azure CLI 2.10.0.
diff --git a/2017-03-09-profile/docs-ref-autogen/config/param-persist.yml b/2017-03-09-profile/docs-ref-autogen/config/param-persist.yml
new file mode 100644
index 0000000000..55ecd5fcbc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/config/param-persist.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_config_param-persist
+name: az config param-persist
+summary: Manage parameter persistence.
+description: ''
+directCommands:
+- uid: az_config_param-persist_delete
+  name: az config param-persist delete
+  summary: Delete parameter persistence data.
+  description: ''
+  syntax: >-
+    az config param-persist delete [--all]
+                                   [--purge]
+                                   [--recursive]
+                                   [--yes]
+                                   [<NAME>]
+  examples:
+  - summary: Delete resource_group_name from parameter persistence
+    syntax: az config param-persist delete resource_group_name
+  - summary: Clear all parameter persistence data
+    syntax: az config param-persist delete --all
+  - summary: Delete parameter persistence file
+    syntax: az config param-persist delete --all --purge
+  - summary: Delete parameter persistence file recursively
+    syntax: az config param-persist delete --all --purge --recursive
+  optionalParameters:
+  - name: --all
+    summary: Clear all parameter persistence data. Either positional name argument  or --all can be specified.
+    description: ''
+  - name: --purge
+    summary: Delete parameter persistence file from working directory. Only available when --all is specified.
+    description: ''
+  - name: --recursive
+    summary: Indicate this is recursive delete of parameter persistence. Only available when --all is specified.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Only available when --all is specified.
+    description: ''
+  - name: <NAME>
+    summary: Space-separated list of parameter persistence names. Either positional name argument or --all can be specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_off
+  name: az config param-persist off
+  summary: Turn off parameter persistence.
+  description: ''
+  syntax: az config param-persist off
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_on
+  name: az config param-persist on
+  summary: Turn on parameter persistence.
+  description: ''
+  syntax: az config param-persist on
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_show
+  name: az config param-persist show
+  summary: Show parameter persistence data.
+  description: ''
+  syntax: >-
+    az config param-persist show [--query-examples]
+                                 [<NAME>]
+  examples:
+  - summary: Show all parameter persistence value
+    syntax: az config param-persist show
+  - summary: Show resource_group_name parameter persistence value
+    syntax: az config param-persist show resource_group_name
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: <NAME>
+    summary: Space-separated list of parameter persistence names.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+commands:
+- az_config_param-persist_delete
+- az_config_param-persist_off
+- az_config_param-persist_on
+- az_config_param-persist_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 03/17/2021
+  description: Manage parameter persistence.
diff --git a/2017-03-09-profile/docs-ref-autogen/confluent.yml b/2017-03-09-profile/docs-ref-autogen/confluent.yml
new file mode 100644
index 0000000000..708b242a84
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/confluent.yml
@@ -0,0 +1,36 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent
+name: az confluent
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage confluent resources.
+description: ''
+commands:
+- az_confluent_organization
+- az_confluent_organization_create
+- az_confluent_organization_delete
+- az_confluent_organization_list
+- az_confluent_organization_show
+- az_confluent_organization_update
+- az_confluent_organization_wait
+- az_confluent_terms
+- az_confluent_terms_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage confluent resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/confluent/organization.yml b/2017-03-09-profile/docs-ref-autogen/confluent/organization.yml
new file mode 100644
index 0000000000..08e6689dd4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/confluent/organization.yml
@@ -0,0 +1,237 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent_organization
+name: az confluent organization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent organization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage organization with confluent.
+description: ''
+directCommands:
+- uid: az_confluent_organization_create
+  name: az confluent organization create
+  summary: Create Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization create --name
+                                     --resource-group
+                                     [--location]
+                                     [--no-wait]
+                                     [--offer-detail]
+                                     [--tags]
+                                     [--user-detail]
+  examples:
+  - summary: Organization_Create
+    syntax: az confluent organization create --location "West US" --offer-detail id="string" plan-id="string" plan-name="string" publisher-id="string" term-unit="string" --user-detail email-address="contoso@microsoft.com" first-name="string" last-name="string" --tags Environment="Dev" --name "myOrganization" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offer-detail
+    summary: Confluent offer detail.
+    description: >-
+      Usage: --offer-detail publisher-id=XX id=XX plan-id=XX plan-name=XX term-unit=XX status=XX
+
+
+      publisher-id: Publisher Id
+
+      id: Offer Id
+
+      plan-id: Offer Plan Id
+
+      plan-name: Offer Plan Name
+
+      term-unit: Offer Plan Term unit
+
+      status: SaaS Offer Status.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --user-detail
+    summary: Subscriber detail.
+    description: >-
+      Usage: --user-detail first-name=XX last-name=XX email-address=XX
+
+
+      first-name: First name
+
+      last-name: Last name
+
+      email-address: Email address.
+- uid: az_confluent_organization_delete
+  name: az confluent organization delete
+  summary: Delete Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization delete --name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete organization
+    syntax: az confluent organization delete --name "myOrganization" --resource-group "myResourceGroup"
+  - summary: Delete organization using IDs
+    syntax: az confluent organization delete --ids "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Confluent/organizations/{myOrganization}"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_confluent_organization_list
+  name: az confluent organization list
+  summary: List all Organizations under the specified resource group. And List all organizations under the specified subscription.
+  description: ''
+  syntax: az confluent organization list [--resource-group]
+  examples:
+  - summary: Organization_ListByResourceGroup
+    syntax: az confluent organization list --resource-group "myResourceGroup"
+  - summary: Organization_ListBySubscription
+    syntax: az confluent organization list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_confluent_organization_show
+  name: az confluent organization show
+  summary: Get the properties of a specific Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization show --name
+                                   --resource-group
+  examples:
+  - summary: Show organization
+    syntax: az confluent organization show --name "myOrganization" --resource-group "myResourceGroup"
+  - summary: Show organization using IDs
+    syntax: az confluent organization show --ids "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Confluent/organizations/{myOrganization}"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_confluent_organization_update
+  name: az confluent organization update
+  summary: Update Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization update --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: Confluent_Update
+    syntax: az confluent organization update --tags client="dev-client" env="dev" --name "myOrganization" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_confluent_organization_wait
+  name: az confluent organization wait
+  summary: Place the CLI in a waiting state until a condition of the confluent organization is met.
+  description: ''
+  syntax: >-
+    az confluent organization wait --name
+                                   --resource-group
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the confluent organization is successfully created.
+    syntax: az confluent organization wait --name "myOrganization" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the confluent organization is successfully deleted.
+    syntax: az confluent organization wait --name "myOrganization" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_confluent_organization_create
+- az_confluent_organization_delete
+- az_confluent_organization_list
+- az_confluent_organization_show
+- az_confluent_organization_update
+- az_confluent_organization_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage organization with confluent.
diff --git a/2017-03-09-profile/docs-ref-autogen/confluent/terms.yml b/2017-03-09-profile/docs-ref-autogen/confluent/terms.yml
new file mode 100644
index 0000000000..377fb60bc6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/confluent/terms.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent_terms
+name: az confluent terms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent terms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage marketplace agreement with confluent.
+description: ''
+directCommands:
+- uid: az_confluent_terms_list
+  name: az confluent terms list
+  summary: List Confluent marketplace agreements in the subscription.
+  description: ''
+  syntax: az confluent terms list
+  examples:
+  - summary: MarketplaceAgreements_List
+    syntax: az confluent terms list
+commands:
+- az_confluent_terms_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage marketplace agreement with confluent.
diff --git a/2017-03-09-profile/docs-ref-autogen/connectedk8s.yml b/2017-03-09-profile/docs-ref-autogen/connectedk8s.yml
new file mode 100644
index 0000000000..d473ecab4c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/connectedk8s.yml
@@ -0,0 +1,423 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedk8s
+name: az connectedk8s
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedk8s** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az connectedk8s** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage connected kubernetes clusters.
+description: ''
+directCommands:
+- uid: az_connectedk8s_connect
+  name: az connectedk8s connect
+  summary: Onboard a connected kubernetes cluster to azure.
+  description: ''
+  syntax: >-
+    az connectedk8s connect --name
+                            --resource-group
+                            [--custom-locations-oid]
+                            [--disable-auto-upgrade]
+                            [--distribution {aks, aks_engine, aks_management, aks_workload, auto, capz, eks, generic, gke, k3s, kind, minikube, openshift, rancher_rke, tkg}]
+                            [--infrastructure {auto, aws, azure, azure_stack_edge, azure_stack_hci, azure_stack_hub, gcp, generic, vsphere, windows_server}]
+                            [--kube-config]
+                            [--kube-context]
+                            [--location]
+                            [--no-wait]
+                            [--proxy-cert]
+                            [--proxy-http]
+                            [--proxy-https]
+                            [--proxy-skip-range]
+                            [--tags]
+  examples:
+  - summary: Onboard a connected kubernetes cluster with default kube config and kube context.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName
+  - summary: Onboard a connected kubernetes cluster with default kube config and kube context and disabling auto upgrade of arc agents.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --disable-auto-upgrade
+  - summary: Onboard a connected kubernetes cluster by specifying the kubeconfig and kubecontext.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
+  - summary: Onboard a connected kubernetes cluster by specifying the https proxy, http proxy, no proxy settings.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  - summary: Onboard a connected kubernetes cluster by specifying the https proxy, http proxy, no proxy  with cert settings.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --proxy-cert /path/to/crt --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-locations-oid
+    summary: OID of 'custom-locations' app.
+    description: ''
+  - name: --disable-auto-upgrade
+    summary: Flag to disable auto upgrade of arc agents.
+    description: ''
+  - name: --distribution
+    defaultValue: auto
+    parameterValueGroup: aks, aks_engine, aks_management, aks_workload, auto, capz, eks, generic, gke, k3s, kind, minikube, openshift, rancher_rke, tkg
+    summary: The Kubernetes distribution which will be running on this connected cluster.
+    description: ''
+  - name: --infrastructure
+    defaultValue: auto
+    parameterValueGroup: auto, aws, azure, azure_stack_edge, azure_stack_hci, azure_stack_hub, gcp, generic, vsphere, windows_server
+    summary: The infrastructure on which the Kubernetes cluster represented by this connected cluster will be running on.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --proxy-cert
+    summary: Path to the certificate file for proxy.
+    description: ''
+  - name: --proxy-http
+    summary: Http proxy URL to be used.
+    description: ''
+  - name: --proxy-https
+    summary: Https proxy URL to be used.
+    description: ''
+  - name: --proxy-skip-range
+    summary: List of URLs/CIDRs for which proxy should not to be used.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_connectedk8s_delete
+  name: az connectedk8s delete
+  summary: Delete a connected kubernetes cluster along with connected cluster agents.
+  description: ''
+  syntax: >-
+    az connectedk8s delete --name
+                           --resource-group
+                           [--kube-config]
+                           [--kube-context]
+                           [--no-wait]
+                           [--yes]
+  examples:
+  - summary: Delete a connected kubernetes cluster and connected cluster agents with default kubeconfig and kubecontext.
+    syntax: az connectedk8s delete -g resourceGroupName -n connectedClusterName
+  - summary: Delete a connected kubernetes cluster by specifying the kubeconfig and kubecontext for connected cluster agents deletion.
+    syntax: az connectedk8s delete -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedk8s_disable-features
+  name: az connectedk8s disable-features
+  summary: Disables the selective features on the connected cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s disable-features --features {azure-rbac, cluster-connect, custom-locations}
+                                     --name
+                                     --resource-group
+                                     [--kube-config]
+                                     [--kube-context]
+                                     [--yes]
+  examples:
+  - summary: Disables the azure-rbac feature.
+    syntax: az connectedk8s disable-features -n clusterName -g resourceGroupName --features azure-rbac
+  - summary: Disable multiple features.
+    syntax: az connectedk8s disable-features -n clusterName -g resourceGroupName --features custom-locations azure-rbac
+  requiredParameters:
+  - isRequired: true
+    name: --features
+    parameterValueGroup: azure-rbac, cluster-connect, custom-locations
+    summary: Space-separated list of features you want to disable.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedk8s_enable-features
+  name: az connectedk8s enable-features
+  summary: Enables the selective features on the connected cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s enable-features --features {azure-rbac, cluster-connect, custom-locations}
+                                    --name
+                                    --resource-group
+                                    [--app-id]
+                                    [--app-secret]
+                                    [--custom-locations-oid]
+                                    [--kube-config]
+                                    [--kube-context]
+                                    [--skip-azure-rbac-list]
+  examples:
+  - summary: Enables the Cluster-Connect feature.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features cluster-connect
+  - summary: Enable Azure RBAC feature.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features azure-rbac --app-id appID --app-secret="appSecret" --skip-azure-rbac-list "user1@domain.com,spn_oid"
+  - summary: Enable multiple features.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features cluster-connect custom-locations
+  requiredParameters:
+  - isRequired: true
+    name: --features
+    parameterValueGroup: azure-rbac, cluster-connect, custom-locations
+    summary: Space-separated list of features you want to enable.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-id
+    summary: Application ID for enabling Azure RBAC. Specify when enabling azure-rbac.
+    description: ''
+  - name: --app-secret
+    summary: Application secret for enabling Azure RBAC. Specify when enabling azure-rbac.
+    description: ''
+  - name: --custom-locations-oid
+    summary: OID of 'custom-locations' app.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --skip-azure-rbac-list
+    summary: Comma separated list of names of usernames/email/oid. Azure RBAC will be skipped for these users. Specify when enabling azure-rbac.
+    description: ''
+- uid: az_connectedk8s_list
+  name: az connectedk8s list
+  summary: List connected kubernetes clusters.
+  description: ''
+  syntax: az connectedk8s list [--resource-group]
+  examples:
+  - summary: List all connected kubernetes clusters in a resource group.
+    syntax: az connectedk8s list -g resourceGroupName --subscription subscriptionName
+  - summary: List all connected kubernetes clusters in a subscription.
+    syntax: az connectedk8s list --subscription subscriptionName
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedk8s_proxy
+  name: az connectedk8s proxy
+  summary: Get access to a connected kubernetes cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s proxy --name
+                          --resource-group
+                          [--file]
+                          [--kube-context]
+                          [--port]
+                          [--token]
+  examples:
+  - summary: Get access to a connected kubernetes cluster.
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName
+  - summary: Get access to a connected kubernetes cluster with custom port
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --port portValue
+  - summary: Get access to a connected kubernetes cluster with service account token
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --token tokenValue
+  - summary: Get access to a connected kubernetes cluster by specifying custom kubeconfig location
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName -f path/to/kubeconfig
+  - summary: Get access to a connected kubernetes cluster by specifying custom context
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --kube-context contextName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    defaultValue: ~/.kube/config
+    summary: Kubernetes configuration file to update. If not provided, updates the file '~/.kube/config'. Use '-' to print YAML to stdout instead.
+    description: ''
+  - name: --kube-context
+    summary: If specified, overwrite the default context name.
+    description: ''
+  - name: --port
+    defaultValue: "47011"
+    summary: Port used for accessing connected cluster.
+    description: ''
+  - name: --token
+    summary: Service account token to use to authenticate to the kubernetes cluster.
+    description: ''
+- uid: az_connectedk8s_show
+  name: az connectedk8s show
+  summary: Show details of a connected kubernetes cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s show --name
+                         --resource-group
+  examples:
+  - summary: Show the details for a connected kubernetes cluster
+    syntax: az connectedk8s show -g resourceGroupName -n connectedClusterName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedk8s_update
+  name: az connectedk8s update
+  summary: Update properties of the onboarded agents.
+  description: ''
+  syntax: >-
+    az connectedk8s update --name
+                           --resource-group
+                           [--auto-upgrade {false, true}]
+                           [--disable-proxy]
+                           [--kube-config]
+                           [--kube-context]
+                           [--proxy-cert]
+                           [--proxy-http]
+                           [--proxy-https]
+                           [--proxy-skip-range]
+  examples:
+  - summary: Update proxy values for the agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName  --proxy-cert /path/to/crt --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  - summary: Disable proxy settings for agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName --disable-proxy
+  - summary: Disable auto-upgrade of agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName --auto-upgrade false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade
+    parameterValueGroup: false, true
+    summary: Flag to enable/disable auto upgrade of arc agents. By default, auto upgrade of agents is enabled.
+    description: ''
+  - name: --disable-proxy
+    summary: Disables proxy settings for agents.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --proxy-cert
+    summary: Path to the certificate file for proxy.
+    description: ''
+  - name: --proxy-http
+    summary: Http proxy URL to be used.
+    description: ''
+  - name: --proxy-https
+    summary: Https proxy URL to be used.
+    description: ''
+  - name: --proxy-skip-range
+    summary: List of URLs/CIDRs for which proxy should not to be used.
+    description: ''
+- uid: az_connectedk8s_upgrade
+  name: az connectedk8s upgrade
+  summary: Atomically upgrade onboarded agents to the specific version or default to the latest version.
+  description: ''
+  syntax: >-
+    az connectedk8s upgrade --name
+                            --resource-group
+                            [--agent-version]
+                            [--kube-config]
+                            [--kube-context]
+  examples:
+  - summary: Upgrade the agents to the latest version
+    syntax: az connectedk8s upgrade -g resourceGroupName -n connectedClusterName
+  - summary: Upgrade the agents to a specific version
+    syntax: az connectedk8s upgrade -g resourceGroupName -n connectedClusterName --agent-version 0.2.62
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent-version
+    summary: Version of agent to update the helm charts to.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+commands:
+- az_connectedk8s_connect
+- az_connectedk8s_delete
+- az_connectedk8s_disable-features
+- az_connectedk8s_enable-features
+- az_connectedk8s_list
+- az_connectedk8s_proxy
+- az_connectedk8s_show
+- az_connectedk8s_update
+- az_connectedk8s_upgrade
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage connected kubernetes clusters.
diff --git a/2017-03-09-profile/docs-ref-autogen/connectedmachine.yml b/2017-03-09-profile/docs-ref-autogen/connectedmachine.yml
new file mode 100644
index 0000000000..b6cb9c1f2b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/connectedmachine.yml
@@ -0,0 +1,93 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedmachine
+name: az connectedmachine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedmachine** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az connectedmachine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Connectedmachine.
+description: ''
+directCommands:
+- uid: az_connectedmachine_delete
+  name: az connectedmachine delete
+  summary: The operation to remove a hybrid machine identity in Azure.
+  description: ''
+  syntax: >-
+    az connectedmachine delete --machine-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Machine
+    syntax: az connectedmachine delete --name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: The name of the hybrid machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedmachine_list
+  name: az connectedmachine list
+  summary: Lists all the hybrid machines in the specified subscription.
+  description: ''
+  syntax: az connectedmachine list [--resource-group]
+  examples:
+  - summary: List Machines by resource group
+    syntax: az connectedmachine list --resource-group "myResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedmachine_show
+  name: az connectedmachine show
+  summary: Retrieves information about the model view or the instance view of a hybrid machine.
+  description: ''
+  syntax: >-
+    az connectedmachine show --machine-name
+                             --resource-group
+  examples:
+  - summary: Get Machine
+    syntax: az connectedmachine show --name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: The name of the hybrid machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_connectedmachine_delete
+- az_connectedmachine_extension
+- az_connectedmachine_extension_create
+- az_connectedmachine_extension_delete
+- az_connectedmachine_extension_list
+- az_connectedmachine_extension_show
+- az_connectedmachine_extension_update
+- az_connectedmachine_extension_wait
+- az_connectedmachine_list
+- az_connectedmachine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Connectedmachine.
diff --git a/2017-03-09-profile/docs-ref-autogen/connectedmachine/extension.yml b/2017-03-09-profile/docs-ref-autogen/connectedmachine/extension.yml
new file mode 100644
index 0000000000..beaf30f43f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/connectedmachine/extension.yml
@@ -0,0 +1,303 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedmachine_extension
+name: az connectedmachine extension
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedmachine** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az connectedmachine extension** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Connectedmachine extension.
+description: ''
+directCommands:
+- uid: az_connectedmachine_extension_create
+  name: az connectedmachine extension create
+  summary: The operation to create or update the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension create --extension-name
+                                         --location
+                                         --machine-name
+                                         --resource-group
+                                         [--auto-upgrade-minor {false, true}]
+                                         [--force-update-tag]
+                                         [--no-wait]
+                                         [--protected-settings]
+                                         [--publisher]
+                                         [--settings]
+                                         [--tags]
+                                         [--type]
+                                         [--type-handler-version]
+  examples:
+  - summary: Create a Machine Extension (PUT)
+    syntax: az connectedmachine extension create --machine-name "myMachine" --name "CustomScriptExtension" --location "eastus2euap" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\"commandToExecute\":\"powershell.exe -c \\\"Get-Process | Where-Object { $_.CPU -gt 10000 }\\\"\"}" --type-handler-version "1.10" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be created or updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade-minor
+    parameterValueGroup: false, true
+    summary: Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
+    description: ''
+  - name: --force-update-tag
+    summary: How the extension handler should be forced to update even if the extension configuration has not changed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protected-settings
+    summary: 'The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --publisher
+    summary: The name of the extension handler publisher.
+    description: ''
+  - name: --settings
+    summary: 'Json formatted public settings for the extension. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: Specifies the type of the extension; an example is "CustomScriptExtension".
+    description: ''
+  - name: --type-handler-version
+    summary: Specifies the version of the script handler.
+    description: ''
+- uid: az_connectedmachine_extension_delete
+  name: az connectedmachine extension delete
+  summary: The operation to delete the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension delete --extension-name
+                                         --machine-name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete a Machine Extension
+    syntax: az connectedmachine extension delete --machine-name "myMachine" --name "MMA" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be deleted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedmachine_extension_list
+  name: az connectedmachine extension list
+  summary: The operation to get all extensions of a non-Azure machine.
+  description: ''
+  syntax: >-
+    az connectedmachine extension list --machine-name
+                                       --resource-group
+                                       [--expand]
+  examples:
+  - summary: Get all Machine Extensions
+    syntax: az connectedmachine extension list --machine-name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The expand expression to apply on the operation.
+    description: ''
+- uid: az_connectedmachine_extension_show
+  name: az connectedmachine extension show
+  summary: The operation to get the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension show --extension-name
+                                       --machine-name
+                                       --resource-group
+  examples:
+  - summary: Get Machine Extension
+    syntax: az connectedmachine extension show --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedmachine_extension_update
+  name: az connectedmachine extension update
+  summary: The operation to update the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension update --extension-name
+                                         --machine-name
+                                         --resource-group
+                                         [--auto-upgrade-minor {false, true}]
+                                         [--force-update-tag]
+                                         [--no-wait]
+                                         [--protected-settings]
+                                         [--publisher]
+                                         [--settings]
+                                         [--tags]
+                                         [--type]
+                                         [--type-handler-version]
+  examples:
+  - summary: Update a Machine Extension (PATCH)
+    syntax: az connectedmachine extension update --machine-name "myMachine" --name "CustomScriptExtension" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\"commandToExecute\":\"powershell.exe -c \\\"Get-Process | Where-Object { $_.CPU -lt 100 }\\\"\"}" --type-handler-version "1.10" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be created or updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade-minor
+    parameterValueGroup: false, true
+    summary: Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
+    description: ''
+  - name: --force-update-tag
+    summary: How the extension handler should be forced to update even if the extension configuration has not changed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protected-settings
+    summary: 'The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --publisher
+    summary: The name of the extension handler publisher.
+    description: ''
+  - name: --settings
+    summary: 'Json formatted public settings for the extension. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: Specifies the type of the extension; an example is "CustomScriptExtension".
+    description: ''
+  - name: --type-handler-version
+    summary: Specifies the version of the script handler.
+    description: ''
+- uid: az_connectedmachine_extension_wait
+  name: az connectedmachine extension wait
+  summary: Place the CLI in a waiting state until a condition of the connectedmachine extension is met.
+  description: ''
+  syntax: >-
+    az connectedmachine extension wait --extension-name
+                                       --machine-name
+                                       --resource-group
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully created.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully updated.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully deleted.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_connectedmachine_extension_create
+- az_connectedmachine_extension_delete
+- az_connectedmachine_extension_list
+- az_connectedmachine_extension_show
+- az_connectedmachine_extension_update
+- az_connectedmachine_extension_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Connectedmachine extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/container.yml b/2017-03-09-profile/docs-ref-autogen/container.yml
new file mode 100644
index 0000000000..f2c7fa37eb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/container.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_container
+name: az container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Container Instances.
+description: ''
+commands:
+- az_container_app
+- az_container_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Container Instances.
diff --git a/2017-03-09-profile/docs-ref-autogen/container/app.yml b/2017-03-09-profile/docs-ref-autogen/container/app.yml
new file mode 100644
index 0000000000..44cfc75479
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/container/app.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_container_app
+name: az container app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az container app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to Manage Azure Container Instances App.
+description: ''
+directCommands:
+- uid: az_container_app_up
+  name: az container app up
+  summary: Deploy to Azure Container Instances using GitHub Actions.
+  description: ''
+  syntax: >-
+    az container app up [--acr]
+                        [--branch-name]
+                        [--do-not-wait]
+                        [--port]
+                        [--repository]
+  optionalParameters:
+  - name: --acr
+    summary: Name of the Azure Container Registry to be used for pushing the image.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --port
+    summary: Port on which your application runs. Default is 8080.
+    description: ''
+  - name: --repository
+    summary: GitHub Repository URL e.g. https://github.com/contoso/webapp.
+    description: ''
+commands:
+- az_container_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to Manage Azure Container Instances App.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb.yml
new file mode 100644
index 0000000000..5a16ea2bf0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb.yml
@@ -0,0 +1,378 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb
+name: az cosmosdb
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Cosmos DB database accounts.
+description: ''
+directCommands:
+- uid: az_cosmosdb_create
+  name: az cosmosdb create
+  summary: Create a new Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb create --name
+                       --resource-group
+                       [--backup-interval]
+                       [--backup-policy-type {Continuous, Periodic}]
+                       [--backup-retention]
+                       [--capabilities]
+                       [--databases-to-restore]
+                       [--default-consistency-level {BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong}]
+                       [--disable-key-based-metadata-write-access {false, true}]
+                       [--enable-analytical-storage {false, true}]
+                       [--enable-automatic-failover {false, true}]
+                       [--enable-free-tier {false, true}]
+                       [--enable-multiple-write-locations {false, true}]
+                       [--enable-public-network {false, true}]
+                       [--enable-virtual-network {false, true}]
+                       [--ip-range-filter]
+                       [--is-restore-request {false, true}]
+                       [--key-uri]
+                       [--kind {GlobalDocumentDB, MongoDB, Parse}]
+                       [--locations]
+                       [--max-interval]
+                       [--max-staleness-prefix]
+                       [--restore-source]
+                       [--restore-timestamp]
+                       [--server-version {3.2, 3.6, 4.0}]
+                       [--tags]
+                       [--virtual-network-rules]
+  examples:
+  - summary: Create a new Azure Cosmos DB database account.
+    syntax: az cosmosdb create --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup --subscription MySubscription
+  - summary: Create a new Azure Cosmos DB database account with two regions. UK South is zone redundant.
+    syntax: az cosmosdb create -n myaccount -g mygroup --locations regionName=eastus failoverPriority=0 isZoneRedundant=False --locations regionName=uksouth failoverPriority=1 isZoneRedundant=True --enable-multiple-write-locations
+  - summary: Create a new Azure Cosmos DB database account by restoring from an existing account in the given location
+    syntax: az cosmosdb create -n restoredaccount -g mygroup --is-restore-request true --restore-source /subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d056a4f8-044a-436f-80c8-cd3edbc94c68 --restore-timestamp 2020-07-13T16:03:41+0000 --locations regionName=westus failoverPriority=0 isZoneRedundant=False
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-interval
+    summary: The frequency(in minutes) with which backups are taken (only for accounts with periodic mode backups).
+    description: ''
+  - name: --backup-policy-type
+    parameterValueGroup: Continuous, Periodic
+    summary: The type of backup policy of the account to create.
+    description: ''
+  - name: --backup-retention
+    summary: The time(in hours) for which each backup is retained (only for accounts with periodic mode backups).
+    description: ''
+  - name: --capabilities
+    summary: Set custom capabilities on the Cosmos DB database account.
+    description: ''
+  - name: --databases-to-restore
+    summary: Add a database and its collection names to restore.
+    description: 'Usage:          --databases-to-restore name=DatabaseName collections=collection1 [collection2 ...].'
+  - name: --default-consistency-level
+    parameterValueGroup: BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong
+    summary: Default consistency level of the Cosmos DB database account.
+    description: ''
+  - name: --disable-key-based-metadata-write-access
+    parameterValueGroup: false, true
+    summary: Disable write operations on metadata resources (databases, containers, throughput) via account keys.
+    description: ''
+  - name: --enable-analytical-storage
+    parameterValueGroup: false, true
+    summary: Flag to enable log storage on the account.
+    description: ''
+  - name: --enable-automatic-failover
+    parameterValueGroup: false, true
+    summary: Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.
+    description: ''
+  - name: --enable-free-tier
+    parameterValueGroup: false, true
+    summary: If enabled the account is free-tier.
+    description: ''
+  - name: --enable-multiple-write-locations
+    parameterValueGroup: false, true
+    summary: Enable Multiple Write Locations.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: Enable or disable public network access to server.
+    description: ''
+  - name: --enable-virtual-network
+    parameterValueGroup: false, true
+    summary: Enables virtual network on the Cosmos DB database account.
+    description: ''
+  - name: --ip-range-filter
+    summary: Firewall support. Specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma-separated and must not contain any spaces.
+    description: ''
+  - name: --is-restore-request -r
+    parameterValueGroup: false, true
+    summary: Restore from an existing/deleted account.
+    description: ''
+  - name: --key-uri
+    summary: The URI of the key vault.
+    description: ''
+  - name: --kind
+    defaultValue: GlobalDocumentDB
+    parameterValueGroup: GlobalDocumentDB, MongoDB, Parse
+    summary: The type of Cosmos DB database account to create.
+    description: ''
+  - name: --locations
+    summary: Add a location to the Cosmos DB database account.
+    description: >-
+      Usage:          --locations KEY=VALUE [KEY=VALUE ...]
+
+      Required Keys:  regionName, failoverPriority
+
+      Optional Key:   isZoneRedundant
+
+      Default:        single region account in the location of the specified resource group.
+
+      Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
+
+      Multiple locations can be specified by using more than one `--locations` argument.
+  - name: --max-interval
+    defaultValue: "5"
+    summary: When used with Bounded Staleness consistency, this value represents the time amount of staleness (in seconds) tolerated. Accepted range for this value is 1 - 100.
+    description: ''
+  - name: --max-staleness-prefix
+    defaultValue: "100"
+    summary: When used with Bounded Staleness consistency, this value represents the number of stale requests tolerated. Accepted range for this value is 1 - 2,147,483,647.
+    description: ''
+  - name: --restore-source
+    summary: The restorable-database-account Id of the source account from which the account has to be restored. Required if --is-restore-request is set to true.
+    description: ''
+  - name: --restore-timestamp
+    summary: The timestamp to which the account has to be restored to. Required if --is-restore-request is set to true.
+    description: ''
+  - name: --server-version
+    parameterValueGroup: 3.2, 3.6, 4.0
+    summary: Valid only for MongoDB accounts.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-network-rules
+    summary: ACL's for virtual network.
+    description: ''
+- uid: az_cosmosdb_list
+  name: az cosmosdb list
+  summary: List Azure Cosmos DB database accounts.
+  description: ''
+  syntax: az cosmosdb list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cosmosdb_restore
+  name: az cosmosdb restore
+  summary: Create a new Azure Cosmos DB database account by restoring from an existing database account.
+  description: ''
+  syntax: >-
+    az cosmosdb restore --account-name
+                        --location
+                        --resource-group
+                        --restore-timestamp
+                        --target-database-account-name
+                        [--databases-to-restore]
+  examples:
+  - summary: Create a new Azure Cosmos DB database account by restoring from an existing database account.
+    syntax: az cosmosdb restore --target-database-account-name MyRestoredCosmosDBDatabaseAccount --account-name MySourceAccount --restore-timestamp 2020-07-13T16:03:41+0000 -g MyResourceGroup --location westus
+  - summary: Create a new Azure Cosmos DB database account by restoring only the selected databases and collections from an existing database account.
+    syntax: az cosmosdb restore -g MyResourceGroup --target-database-account-name MyRestoredCosmosDBDatabaseAccount --account-name MySourceAccount --restore-timestamp 2020-07-13T16:03:41+0000 --location westus --databases-to-restore name=MyDB1 collections=collection1 collection2 --databases-to-restore name=MyDB2 collections=collection3 collection4
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: Name of the source Cosmos DB database account for the restore.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: The location of the source account from which restore is triggered. This will also be the write region of the restored account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp to which the account has to be restored to.
+    description: ''
+  - isRequired: true
+    name: --target-database-account-name -n
+    summary: Name of the new target Cosmos DB database account after the restore.
+    description: ''
+  optionalParameters:
+  - name: --databases-to-restore
+    summary: Add a database and its collection names to restore.
+    description: >-
+      Usage:          --databases-to-restore name=DatabaseName collections=collection1 [collection2 ...]
+
+      Multiple databases can be specified by using more than one `--databases-to-restore` argument.
+- uid: az_cosmosdb_show
+  name: az cosmosdb show
+  summary: Get the details of an Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb show --name
+                     --resource-group
+  examples:
+  - summary: Get the details of an Azure Cosmos DB database account. (autogenerated)
+    syntax: az cosmosdb show --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cosmosdb_update
+  name: az cosmosdb update
+  summary: Update an Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb update --name
+                       --resource-group
+                       [--backup-interval]
+                       [--backup-retention]
+                       [--capabilities]
+                       [--default-consistency-level {BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong}]
+                       [--disable-key-based-metadata-write-access {false, true}]
+                       [--enable-analytical-storage {false, true}]
+                       [--enable-automatic-failover {false, true}]
+                       [--enable-multiple-write-locations {false, true}]
+                       [--enable-public-network {false, true}]
+                       [--enable-virtual-network {false, true}]
+                       [--ip-range-filter]
+                       [--locations]
+                       [--max-interval]
+                       [--max-staleness-prefix]
+                       [--tags]
+                       [--virtual-network-rules]
+  examples:
+  - summary: Update an Azure Cosmos DB database account.
+    syntax: az cosmosdb update --capabilities EnableGremlin --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  - summary: Update an new Azure Cosmos DB database account with two regions. UK South is zone redundant.
+    syntax: az cosmosdb update -n myaccount -g mygroup --locations regionName=eastus failoverPriority=0 isZoneRedundant=False --locations regionName=uksouth failoverPriority=1 isZoneRedundant=True --enable-multiple-write-locations
+  - summary: Update the backup policy parameters of a database account with Periodic backup type.
+    syntax: az cosmosdb update -n myaccount -g mygroup --backup-interval 240 --backup-retention 24
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-interval
+    summary: The frequency(in minutes) with which backups are taken (only for accounts with periodic mode backups).
+    description: ''
+  - name: --backup-retention
+    summary: The time(in hours) for which each backup is retained (only for accounts with periodic mode backups).
+    description: ''
+  - name: --capabilities
+    summary: Set custom capabilities on the Cosmos DB database account.
+    description: ''
+  - name: --default-consistency-level
+    parameterValueGroup: BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong
+    summary: Default consistency level of the Cosmos DB database account.
+    description: ''
+  - name: --disable-key-based-metadata-write-access
+    parameterValueGroup: false, true
+    summary: Disable write operations on metadata resources (databases, containers, throughput) via account keys.
+    description: ''
+  - name: --enable-analytical-storage
+    parameterValueGroup: false, true
+    summary: Flag to enable log storage on the account.
+    description: ''
+  - name: --enable-automatic-failover
+    parameterValueGroup: false, true
+    summary: Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.
+    description: ''
+  - name: --enable-multiple-write-locations
+    parameterValueGroup: false, true
+    summary: Enable Multiple Write Locations.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: Enable or disable public network access to server.
+    description: ''
+  - name: --enable-virtual-network
+    parameterValueGroup: false, true
+    summary: Enables virtual network on the Cosmos DB database account.
+    description: ''
+  - name: --ip-range-filter
+    summary: Firewall support. Specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma-separated and must not contain any spaces.
+    description: ''
+  - name: --locations
+    summary: Add a location to the Cosmos DB database account.
+    description: >-
+      Usage:          --locations KEY=VALUE [KEY=VALUE ...]
+
+      Required Keys:  regionName, failoverPriority
+
+      Optional Key:   isZoneRedundant
+
+      Default:        single region account in the location of the specified resource group.
+
+      Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
+
+      Multiple locations can be specified by using more than one `--locations` argument.
+  - name: --max-interval
+    summary: When used with Bounded Staleness consistency, this value represents the time amount of staleness (in seconds) tolerated. Accepted range for this value is 1 - 100.
+    description: ''
+  - name: --max-staleness-prefix
+    summary: When used with Bounded Staleness consistency, this value represents the number of stale requests tolerated. Accepted range for this value is 1 - 2,147,483,647.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-network-rules
+    summary: ACL's for virtual network.
+    description: ''
+commands:
+- az_cosmosdb_create
+- az_cosmosdb_list
+- az_cosmosdb_mongodb
+- az_cosmosdb_mongodb_restorable-collection
+- az_cosmosdb_mongodb_restorable-collection_list
+- az_cosmosdb_mongodb_restorable-database
+- az_cosmosdb_mongodb_restorable-database_list
+- az_cosmosdb_mongodb_restorable-resource
+- az_cosmosdb_mongodb_restorable-resource_list
+- az_cosmosdb_restorable-database-account
+- az_cosmosdb_restorable-database-account_list
+- az_cosmosdb_restorable-database-account_show
+- az_cosmosdb_restore
+- az_cosmosdb_show
+- az_cosmosdb_sql
+- az_cosmosdb_sql_restorable-container
+- az_cosmosdb_sql_restorable-container_list
+- az_cosmosdb_sql_restorable-database
+- az_cosmosdb_sql_restorable-database_list
+- az_cosmosdb_sql_restorable-resource
+- az_cosmosdb_sql_restorable-resource_list
+- az_cosmosdb_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Cosmos DB database accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb.yml
new file mode 100644
index 0000000000..610b76c9fd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb
+name: az cosmosdb mongodb
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage MongoDB resources of Azure Cosmos DB account.
+description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-collection
+- az_cosmosdb_mongodb_restorable-collection_list
+- az_cosmosdb_mongodb_restorable-database
+- az_cosmosdb_mongodb_restorable-database_list
+- az_cosmosdb_mongodb_restorable-resource
+- az_cosmosdb_mongodb_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage MongoDB resources of Azure Cosmos DB account.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml
new file mode 100644
index 0000000000..2374ca024c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-collection
+name: az cosmosdb mongodb restorable-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of mongodb collections that are restorable in a database of a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-collection_list
+  name: az cosmosdb mongodb restorable-collection list
+  summary: List all the versions of all the mongodb collections that were created / modified / deleted in the given database and restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-collection list --database-rid
+                                                   --instance-id
+                                                   --location
+  requiredParameters:
+  - isRequired: true
+    name: --database-rid -d
+    summary: Rid of the database.
+    description: ''
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-collection_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of mongodb collections that are restorable in a database of a Azure Cosmos DB account.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml
new file mode 100644
index 0000000000..181857de0d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-database
+name: az cosmosdb mongodb restorable-database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of mongodb databases that are restorable in a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-database_list
+  name: az cosmosdb mongodb restorable-database list
+  summary: List all the versions of all the mongodb databases that were created / modified / deleted in the given restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-database list --instance-id
+                                                 --location
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-database_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of mongodb databases that are restorable in a Azure Cosmos DB account.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml
new file mode 100644
index 0000000000..2918518898
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-resource
+name: az cosmosdb mongodb restorable-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the databases and its collections that can be restored in the given account at the given timesamp and region.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-resource_list
+  name: az cosmosdb mongodb restorable-resource list
+  summary: List all the databases and its collections that can be restored in the given account at the given timesamp and region.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-resource list --instance-id
+                                                 --location
+                                                 --restore-location
+                                                 --restore-timestamp
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the account.
+    description: ''
+  - isRequired: true
+    name: --restore-location -r
+    summary: The region of the restore.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp of the restore.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the databases and its collections that can be restored in the given account at the given timesamp and region.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/restorable-database-account.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/restorable-database-account.yml
new file mode 100644
index 0000000000..ad67088e6d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/restorable-database-account.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_restorable-database-account
+name: az cosmosdb restorable-database-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb restorable-database-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage restorable Azure Cosmos DB accounts.
+description: ''
+directCommands:
+- uid: az_cosmosdb_restorable-database-account_list
+  name: az cosmosdb restorable-database-account list
+  summary: List all the database accounts that can be restored.
+  description: ''
+  syntax: >-
+    az cosmosdb restorable-database-account list [--account-name]
+                                                 [--location]
+  optionalParameters:
+  - name: --account-name -n
+    summary: Name of the Account.
+    description: ''
+  - name: --location -l
+    summary: Location.
+    description: ''
+- uid: az_cosmosdb_restorable-database-account_show
+  name: az cosmosdb restorable-database-account show
+  summary: Show the details of a database account that can be restored.
+  description: ''
+  syntax: >-
+    az cosmosdb restorable-database-account show [--instance-id]
+                                                 [--location]
+  optionalParameters:
+  - name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_restorable-database-account_list
+- az_cosmosdb_restorable-database-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage restorable Azure Cosmos DB accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql.yml
new file mode 100644
index 0000000000..05446094e9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql
+name: az cosmosdb sql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage SQL resources of Azure Cosmos DB account.
+description: ''
+commands:
+- az_cosmosdb_sql_restorable-container
+- az_cosmosdb_sql_restorable-container_list
+- az_cosmosdb_sql_restorable-database
+- az_cosmosdb_sql_restorable-database_list
+- az_cosmosdb_sql_restorable-resource
+- az_cosmosdb_sql_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage SQL resources of Azure Cosmos DB account.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-container.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-container.yml
new file mode 100644
index 0000000000..02728ebe76
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-container.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-container
+name: az cosmosdb sql restorable-container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of sql containers that are restorable in a database of a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-container_list
+  name: az cosmosdb sql restorable-container list
+  summary: List all the versions of all the sql containers that were created / modified / deleted in the given database and restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-container list --database-rid
+                                              --instance-id
+                                              --location
+  requiredParameters:
+  - isRequired: true
+    name: --database-rid -d
+    summary: Rid of the database.
+    description: ''
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-container_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of sql containers that are restorable in a database of a Azure Cosmos DB account.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-database.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-database.yml
new file mode 100644
index 0000000000..69996d747a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-database.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-database
+name: az cosmosdb sql restorable-database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of sql databases that are restorable in a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-database_list
+  name: az cosmosdb sql restorable-database list
+  summary: List all the versions of all the sql databases that were created / modified / deleted in the given restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-database list --instance-id
+                                             --location
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-database_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of sql databases that are restorable in a Azure Cosmos DB account.
diff --git a/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml
new file mode 100644
index 0000000000..63c1c845e3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-resource
+name: az cosmosdb sql restorable-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the databases and its containers that can be restored in the given account at the given timesamp and region.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-resource_list
+  name: az cosmosdb sql restorable-resource list
+  summary: List all the databases and its containers that can be restored in the given account at the given timesamp and region.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-resource list --instance-id
+                                             --location
+                                             --restore-location
+                                             --restore-timestamp
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the account.
+    description: ''
+  - isRequired: true
+    name: --restore-location -r
+    summary: The region of the restore.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp of the restore.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the databases and its containers that can be restored in the given account at the given timesamp and region.
diff --git a/2017-03-09-profile/docs-ref-autogen/costmanagement.yml b/2017-03-09-profile/docs-ref-autogen/costmanagement.yml
new file mode 100644
index 0000000000..0384019aa3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/costmanagement.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_costmanagement
+name: az costmanagement
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **costmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az costmanagement** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cost and billing in Azure.
+description: ''
+directCommands:
+- uid: az_costmanagement_query
+  name: az costmanagement query
+  summary: Query the usage data for scope defined.
+  description: ''
+  syntax: >-
+    az costmanagement query --scope
+                            --timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}
+                            --type {ActualCost, AmortizedCost, Usage}
+                            [--dataset-aggregation]
+                            [--dataset-configuration]
+                            [--dataset-filter]
+                            [--dataset-grouping]
+                            [--time-period]
+  examples:
+  - summary: Query in ManagementGroup scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
+  - summary: Query in ManagementGroupQuery scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
+  - summary: Query in a ResourceGroup scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
+  - summary: Query in a ResourceGroupQuery scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceType" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
+  - summary: Query in a Subscription scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  - summary: Query in a Subscription scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes "/subscriptions/{subscriptionId}/" for subscription scope, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}" for resourceGroup scope, "/providers/Microsoft.Management/managementGroups/{managementGroupId}" for Management Group scope.
+    description: ''
+  - isRequired: true
+    name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query.If custom, then a specific time period must be provided.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: ActualCost, AmortizedCost, Usage
+    summary: The type of the query.
+    description: ''
+  optionalParameters:
+  - name: --dataset-aggregation
+    summary: 'Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the aliasfor the aggregated column. Query can have up to 2 aggregation clauses. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-filter
+    summary: 'Has filter expression to use in the query. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses.Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.'
+    description: ''
+commands:
+- az_costmanagement_export
+- az_costmanagement_export_create
+- az_costmanagement_export_delete
+- az_costmanagement_export_list
+- az_costmanagement_export_show
+- az_costmanagement_export_update
+- az_costmanagement_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cost and billing in Azure.
diff --git a/2017-03-09-profile/docs-ref-autogen/costmanagement/export.yml b/2017-03-09-profile/docs-ref-autogen/costmanagement/export.yml
new file mode 100644
index 0000000000..05d49aa1e2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/costmanagement/export.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_costmanagement_export
+name: az costmanagement export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **costmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az costmanagement export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Costmanagement export.
+description: ''
+directCommands:
+- uid: az_costmanagement_export_create
+  name: az costmanagement export create
+  summary: The operation to create an export.
+  description: ''
+  syntax: >-
+    az costmanagement export create --name
+                                    --scope
+                                    --storage-account-id
+                                    --storage-container
+                                    --timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}
+                                    [--dataset-configuration]
+                                    [--dataset-grouping]
+                                    [--recurrence {Annually, Daily, Monthly, Weekly}]
+                                    [--recurrence-period]
+                                    [--schedule-status {Active, Inactive}]
+                                    [--storage-directory]
+                                    [--time-period]
+                                    [--type {ActualCost, AmortizedCost, Usage}]
+  examples:
+  - summary: Create an export for ManagementGroup scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Create an export for ResourceGroup scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Create an export for Subscription scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  - isRequired: true
+    name: --storage-account-id
+    summary: The ID of the storage account to store exports.
+    description: ''
+  - isRequired: true
+    name: --storage-container
+    summary: The storage container to deliver exports.
+    description: ''
+  - isRequired: true
+    name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
+    description: ''
+  optionalParameters:
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --recurrence
+    parameterValueGroup: Annually, Daily, Monthly, Weekly
+    summary: The schedule recurrence.
+    description: ''
+  - name: --recurrence-period
+    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
+    description: ''
+  - name: --schedule-status
+    parameterValueGroup: Active, Inactive
+    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
+    description: ''
+  - name: --storage-directory
+    summary: The root directory in the storage container to store exports.
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
+    description: ''
+  - name: --type
+    parameterValueGroup: ActualCost, AmortizedCost, Usage
+    summary: The type of the query.
+    description: ''
+- uid: az_costmanagement_export_delete
+  name: az costmanagement export delete
+  summary: The operation to delete an export.
+  description: ''
+  syntax: >-
+    az costmanagement export delete --name
+                                    --scope
+                                    [--yes]
+  examples:
+  - summary: delete an export for a ManagementGroup scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: delete an export for ResourceGroup scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: delete an export for Subscription scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_costmanagement_export_list
+  name: az costmanagement export list
+  summary: The operation to list all exports at the given scope.
+  description: ''
+  syntax: az costmanagement export list --scope
+  examples:
+  - summary: list exports in a ManagementGroup scope
+    syntax: az costmanagement export list --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: list exports in a ResourceGroup scope
+    syntax: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: list exports in a Subscription scope
+    syntax: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+- uid: az_costmanagement_export_show
+  name: az costmanagement export show
+  summary: The operation to get the execution history of an export for the defined scope by export name.
+  description: ''
+  syntax: >-
+    az costmanagement export show --name
+                                  --scope
+  examples:
+  - summary: Show an export in a ManagementGroup scope
+    syntax: az costmanagement export show --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Show an export in a ResourceGroup scope
+    syntax: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Show an export in a Subscription scope
+    syntax: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+- uid: az_costmanagement_export_update
+  name: az costmanagement export update
+  summary: The operation to update an export.
+  description: ''
+  syntax: >-
+    az costmanagement export update --name
+                                    --scope
+                                    [--dataset-configuration]
+                                    [--dataset-grouping]
+                                    [--recurrence {Annually, Daily, Monthly, Weekly}]
+                                    [--recurrence-period]
+                                    [--schedule-status {Active, Inactive}]
+                                    [--storage-account-id]
+                                    [--storage-container]
+                                    [--storage-directory]
+                                    [--time-period]
+                                    [--timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}]
+  examples:
+  - summary: Update an export in a ManagementGroup scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Update an export in a ResourceGroup scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Update an export in a Subscription scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  optionalParameters:
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --recurrence
+    parameterValueGroup: Annually, Daily, Monthly, Weekly
+    summary: The schedule recurrence.
+    description: ''
+  - name: --recurrence-period
+    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
+    description: ''
+  - name: --schedule-status
+    parameterValueGroup: Active, Inactive
+    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
+    description: ''
+  - name: --storage-account-id
+    summary: The ID of the storage account to store exports.
+    description: ''
+  - name: --storage-container
+    summary: The storage container to deliver exports.
+    description: ''
+  - name: --storage-directory
+    summary: The root directory in the storage container to store exports.
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
+    description: ''
+  - name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
+    description: ''
+commands:
+- az_costmanagement_export_create
+- az_costmanagement_export_delete
+- az_costmanagement_export_list
+- az_costmanagement_export_show
+- az_costmanagement_export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Costmanagement export.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware.yml b/2017-03-09-profile/docs-ref-autogen/csvmware.yml
new file mode 100644
index 0000000000..2404aeb9bf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware.yml
@@ -0,0 +1,57 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware
+name: az csvmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure VMware Solution by CloudSimple.
+description: ''
+commands:
+- az_csvmware_private-cloud
+- az_csvmware_private-cloud_list
+- az_csvmware_private-cloud_show
+- az_csvmware_resource-pool
+- az_csvmware_resource-pool_list
+- az_csvmware_resource-pool_show
+- az_csvmware_virtual-network
+- az_csvmware_virtual-network_list
+- az_csvmware_virtual-network_show
+- az_csvmware_vm
+- az_csvmware_vm_create
+- az_csvmware_vm_delete
+- az_csvmware_vm_disk
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+- az_csvmware_vm_list
+- az_csvmware_vm_nic
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+- az_csvmware_vm_show
+- az_csvmware_vm_start
+- az_csvmware_vm_stop
+- az_csvmware_vm_update
+- az_csvmware_vm-template
+- az_csvmware_vm-template_list
+- az_csvmware_vm-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure VMware Solution by CloudSimple.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/private-cloud.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/private-cloud.yml
new file mode 100644
index 0000000000..fafa42ad1e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/private-cloud.yml
@@ -0,0 +1,62 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_private-cloud
+name: az csvmware private-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware private-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware private clouds.
+description: ''
+directCommands:
+- uid: az_csvmware_private-cloud_list
+  name: az csvmware private-cloud list
+  summary: List details of private clouds in a region.
+  description: ''
+  syntax: az csvmware private-cloud list --location
+  examples:
+  - summary: List details of private clouds in East US.
+    syntax: az csvmware private-cloud list --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+- uid: az_csvmware_private-cloud_show
+  name: az csvmware private-cloud show
+  summary: Get the details of a private cloud in a region.
+  description: ''
+  syntax: >-
+    az csvmware private-cloud show --location
+                                   --name
+  examples:
+  - summary: Get the details of a private cloud which is in East US.
+    syntax: az csvmware private-cloud show -n MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_private-cloud_list
+- az_csvmware_private-cloud_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware private clouds.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/resource-pool.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/resource-pool.yml
new file mode 100644
index 0000000000..64acdc496e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/resource-pool.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_resource-pool
+name: az csvmware resource-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware resource-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware resource pools.
+description: ''
+directCommands:
+- uid: az_csvmware_resource-pool_list
+  name: az csvmware resource-pool list
+  summary: List details of resource pools in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware resource-pool list --location
+                                   --private-cloud
+  examples:
+  - summary: List details of resource pools.
+    syntax: az csvmware resource-pool list -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+- uid: az_csvmware_resource-pool_show
+  name: az csvmware resource-pool show
+  summary: Get the details of a resource pool in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware resource-pool show --location
+                                   --name
+                                   --private-cloud
+  examples:
+  - summary: Get the details of a resource pool.
+    syntax: az csvmware resource-pool show -n MyResourcePool -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_resource-pool_list
+- az_csvmware_resource-pool_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware resource pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/virtual-network.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/virtual-network.yml
new file mode 100644
index 0000000000..f9864b1582
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/virtual-network.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_virtual-network
+name: az csvmware virtual-network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware virtual-network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual networks.
+description: ''
+directCommands:
+- uid: az_csvmware_virtual-network_list
+  name: az csvmware virtual-network list
+  summary: List details of available virtual networks in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware virtual-network list --location
+                                     --private-cloud
+                                     --resource-pool
+  examples:
+  - summary: List details of virtual networks.
+    syntax: az csvmware virtual-network list -p MyPrivateCloud -r MyResourcePool --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the resource pool used to derive vSphere cluster which contains virtual networks. You can also pass the basename of the ID.
+    description: ''
+- uid: az_csvmware_virtual-network_show
+  name: az csvmware virtual-network show
+  summary: Get the details of a virtual network in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware virtual-network show --location
+                                     --name
+                                     --private-cloud
+  examples:
+  - summary: Get the details of a virtual network.
+    syntax: az csvmware virtual-network show -n MyVirtualNetwork -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the virtual network (vsphereId). You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_virtual-network_list
+- az_csvmware_virtual-network_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual networks.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/vm-template.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/vm-template.yml
new file mode 100644
index 0000000000..dc1b6e9950
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/vm-template.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm-template
+name: az csvmware vm-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine templates.
+description: ''
+directCommands:
+- uid: az_csvmware_vm-template_list
+  name: az csvmware vm-template list
+  summary: List details of VMware virtual machines templates in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware vm-template list --location
+                                 --private-cloud
+                                 --resource-pool
+  examples:
+  - summary: List details of VM templates.
+    syntax: az csvmware vm-template list -p MyPrivateCloud -r MyResourcePool --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+- uid: az_csvmware_vm-template_show
+  name: az csvmware vm-template show
+  summary: Get the details of a VMware virtual machines template in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware vm-template show --location
+                                 --name
+                                 --private-cloud
+  examples:
+  - summary: Get the details of a VM template.
+    syntax: az csvmware vm-template show  -n MyVmTemplate -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the vSphere virtual machine template. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_vm-template_list
+- az_csvmware_vm-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine templates.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/vm.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/vm.yml
new file mode 100644
index 0000000000..d3f8af1364
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/vm.yml
@@ -0,0 +1,277 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm
+name: az csvmware vm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machines.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_create
+  name: az csvmware vm create
+  summary: Create a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm create --name
+                          --private-cloud
+                          --resource-group
+                          --resource-pool
+                          --template
+                          [--cores]
+                          [--disk]
+                          [--expose-to-guest-vm {false, true}]
+                          [--location]
+                          [--nic]
+                          [--ram]
+  examples:
+  - summary: Creating a VM with default parameters from the vm template.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate
+  - summary: Creating a VM and adding an extra nic to the VM with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot. The name entered in the nic is for identification purposes only, to see if such a nic name exists in the vm template, else a nic is created and a new name is assigned. Lets say the vm template contains a nic with name "Network adapter 1".
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
+  - summary: Customizing specific properties of a VM. Changing the number of cores to 2 and adapter of "Network adapter 1" nic to E1000E, from that specified in the template. All other properties would be defaulted from the template.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --cores 2 --nic name="Network adapter 1" adapter=E1000E
+  - summary: Customizing specific properties of a VM. Changing the adapter of "Network adapter 1" nic to E1000E, from that specified in the template, and also adding another nic with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name="Network adapter 1" adapter=E1000E --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
+  - summary: Creating a VM and adding an extra disk to the VM with SCSI controller 0, persistent mode, and 41943040 KB size. The name entered in the disk is for identification purposes only, to see if such a disk name exists in the vm template, else a disk is created and a new name is assigned. Lets say the vm template contains a disk with name "Hard disk 1".
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
+  - summary: Customizing specific properties of a VM. Changing the size of "Hard disk 1" disk to 21943040 KB, from that specified in the template, and also adding another disk with SCSI controller 0, persistent mode, and 41943040 KB size.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name="Hard disk 1" size=21943040 --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the VMware resource pool for this virtual machine in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: ID of the vSphere template from which this virtual machine will be created. You can also pass the basename of the ID.
+    description: ''
+  optionalParameters:
+  - name: --cores
+    summary: The number of CPU cores required. The default is taken from the vSphere VM template specified.
+    description: ''
+  - name: --disk
+    summary: Add or modify disks.
+    description: >-
+      By default, the disks will be added according to the vSphere VM template.
+
+      You can add more disks, or modify some properties of a disk specified in the VM template.
+
+      Multiple disks can be specified by using more than one `--disk` argument.
+
+      If a disk name already exists in the VM template, that disk would be modified according to the user input.
+
+      If a disk name does not exist in the VM template, a new disk would be created and a new name will be assigned to it.
+
+      Usage:   --disk name=MyDiskName controller=SCSIControllerID mode=IndependenceMode size=DiskSizeInKB.
+  - name: --expose-to-guest-vm
+    parameterValueGroup: false, true
+    summary: Will expose full CPU virtualization to the guest operating system. The default is taken from the vSphere VM template specified.
+    description: ''
+  - name: --location -l
+    summary: Region in which the private cloud is present. If default location is not configured, will default to the resource group's location.
+    description: ''
+  - name: --nic
+    summary: Add or modify NICs.
+    description: >-
+      By default, the nics will be added according to the vSphere VM template.
+
+      You can add more nics, or modify some properties of a nic specified in the VM template.
+
+      Multiple nics can be specified by using more than one `--nic` argument.
+
+      If a nic name already exists in the VM template, that nic would be modified according to the user input.
+
+      If a nic name does not exist in the VM template, a new nic would be created and a new name will be assigned to it.
+
+      Usage:   --nic name=MyNicName virtual-network=MyNetwork adapter=MyAdapter power-on-boot=True/False.
+  - name: --ram
+    summary: The amount of memory in MB. The default is taken from the vSphere VM template specified.
+    description: ''
+- uid: az_csvmware_vm_delete
+  name: az csvmware vm delete
+  summary: Delete a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm delete --name
+                          --resource-group
+  examples:
+  - summary: Delete a VMware VM.
+    syntax: az csvmware vm delete -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_list
+  name: az csvmware vm list
+  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
+  description: ''
+  syntax: az csvmware vm list [--resource-group]
+  examples:
+  - summary: List details of VMware VMs in the current subscription.
+    syntax: az csvmware vm list
+  - summary: List details of VMware VMs in a particular resource group.
+    syntax: az csvmware vm list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_show
+  name: az csvmware vm show
+  summary: Get the details of a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm show --name
+                        --resource-group
+  examples:
+  - summary: Get the details of a VMware VM.
+    syntax: az csvmware vm show -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_start
+  name: az csvmware vm start
+  summary: Start a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm start --name
+                         --resource-group
+  examples:
+  - summary: Start a VMware VM.
+    syntax: az csvmware vm start -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_stop
+  name: az csvmware vm stop
+  summary: Stop/Reboot/Suspend a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm stop --mode {poweroff, reboot, shutdown, suspend}
+                        --name
+                        --resource-group
+  examples:
+  - summary: Power off a VMware VM.
+    syntax: az csvmware vm stop -n MyVm -g MyResourceGroup --mode poweroff
+  - summary: Restart a VMware VM.
+    syntax: az csvmware vm stop -n MyVm -g MyResourceGroup --mode reboot
+  requiredParameters:
+  - isRequired: true
+    name: --mode
+    parameterValueGroup: poweroff, reboot, shutdown, suspend
+    summary: Stop mode.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_update
+  name: az csvmware vm update
+  summary: Update the tags field of a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm update --name
+                          --resource-group
+                          [--add]
+                          [--force-string]
+                          [--no-wait]
+                          [--remove]
+                          [--set]
+  examples:
+  - summary: Add or update a tag.
+    syntax: az csvmware vm update -n MyVm -g MyResourceGroup --set tags.tagName=tagValue
+  - summary: Remove a tag.
+    syntax: az csvmware vm update -n MyVm -g MyResourceGroup --remove tags.tagName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_csvmware_vm_create
+- az_csvmware_vm_delete
+- az_csvmware_vm_disk
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+- az_csvmware_vm_list
+- az_csvmware_vm_nic
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+- az_csvmware_vm_show
+- az_csvmware_vm_start
+- az_csvmware_vm_stop
+- az_csvmware_vm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machines.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/vm/disk.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/vm/disk.yml
new file mode 100644
index 0000000000..c32b9254ef
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/vm/disk.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm_disk
+name: az csvmware vm disk
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm disk** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine's disks.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_disk_add
+  name: az csvmware vm disk add
+  summary: Add disk to a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm disk add --resource-group
+                            --vm-name
+                            [--controller]
+                            [--mode {independent_nonpersistent, independent_persistent, persistent}]
+                            [--size]
+  examples:
+  - summary: Add a disk with default parameters in a VM.
+    syntax: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup
+  - summary: Add a disk with SATA controller 0 and 64 GB memory in a VM.
+    syntax: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup --controller 15000 --size 67108864
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --controller
+    defaultValue: "1000"
+    summary: Id of the controller. Input 1000 for SCSI controller 0, and 15000 for SATA controller 0.
+    description: ''
+  - name: --mode
+    defaultValue: persistent
+    parameterValueGroup: independent_nonpersistent, independent_persistent, persistent
+    summary: The disk independence mode.
+    description: ''
+  - name: --size
+    defaultValue: "16777216"
+    summary: The amount of disk size in KB.
+    description: ''
+- uid: az_csvmware_vm_disk_delete
+  name: az csvmware vm disk delete
+  summary: Delete disks from a VM.
+  description: ''
+  syntax: >-
+    az csvmware vm disk delete --disks
+                               --resource-group
+                               --vm-name
+  examples:
+  - summary: Delete two disks from a VM.
+    syntax: az csvmware vm disk delete --vm-name MyVm -g MyResourceGroup --disks "My Disk Name 1" "My Disk Name 2"
+  requiredParameters:
+  - isRequired: true
+    name: --disks
+    summary: Names of disks.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_disk_list
+  name: az csvmware vm disk list
+  summary: List details of disks available on a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm disk list --resource-group
+                             --vm-name
+  examples:
+  - summary: List details of disks in a VM.
+    syntax: az csvmware vm disk list --vm-name MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_disk_show
+  name: az csvmware vm disk show
+  summary: Get the details of a VMware virtual machine's disk.
+  description: ''
+  syntax: >-
+    az csvmware vm disk show --name
+                             --resource-group
+                             --vm-name
+  examples:
+  - summary: Get the details of a disk in a VM.
+    syntax: az csvmware vm disk show --vm-name MyVm -g MyResourceGroup -n "My Disk Name"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the disk.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+commands:
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine's disks.
diff --git a/2017-03-09-profile/docs-ref-autogen/csvmware/vm/nic.yml b/2017-03-09-profile/docs-ref-autogen/csvmware/vm/nic.yml
new file mode 100644
index 0000000000..06731d3613
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/csvmware/vm/nic.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm_nic
+name: az csvmware vm nic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm nic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine's Network Interface Cards.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_nic_add
+  name: az csvmware vm nic add
+  summary: Add NIC to a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm nic add --resource-group
+                           --virtual-network
+                           --vm-name
+                           [--adapter {E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3}]
+                           [--power-on-boot {false, true}]
+  examples:
+  - summary: Add a NIC with default parameters in a VM.
+    syntax: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork
+  - summary: Add a NIC with E1000E adapter that powers on boot in a VM.
+    syntax: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork --adapter E1000E --power-on-boot true
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --virtual-network
+    summary: ID of the virtual network. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --adapter
+    defaultValue: VMXNET3
+    parameterValueGroup: E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3
+    summary: The adapter for the NIC.
+    description: ''
+  - name: --power-on-boot
+    parameterValueGroup: false, true
+    summary: Will power on the NIC at boot time.
+    description: ''
+- uid: az_csvmware_vm_nic_delete
+  name: az csvmware vm nic delete
+  summary: Delete NICs from a VM.
+  description: ''
+  syntax: >-
+    az csvmware vm nic delete --nics
+                              --resource-group
+                              --vm-name
+  examples:
+  - summary: Delete two NICs from a VM.
+    syntax: az csvmware vm nic delete --vm-name MyVm -g MyResourceGroup --nics "My NIC Name 1" "My NIC Name 2"
+  requiredParameters:
+  - isRequired: true
+    name: --nics
+    summary: Names of NICs.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_nic_list
+  name: az csvmware vm nic list
+  summary: List details of NICs available on a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm nic list --resource-group
+                            --vm-name
+  examples:
+  - summary: List details of NICs in a VM.
+    syntax: az csvmware vm nic list --vm-name MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_nic_show
+  name: az csvmware vm nic show
+  summary: Get the details of a VMware virtual machine's NIC.
+  description: ''
+  syntax: >-
+    az csvmware vm nic show --name
+                            --resource-group
+                            --vm-name
+  examples:
+  - summary: Get the details of a NIC in a VM.
+    syntax: az csvmware vm nic show --vm-name MyVm -g MyResourceGroup -n "My NIC Name"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the NIC.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+commands:
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine's Network Interface Cards.
diff --git a/2017-03-09-profile/docs-ref-autogen/custom-providers.yml b/2017-03-09-profile/docs-ref-autogen/custom-providers.yml
new file mode 100644
index 0000000000..fb93fe6845
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/custom-providers.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_custom-providers
+name: az custom-providers
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **custom-providers** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az custom-providers** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_custom-providers_resource-provider
+- az_custom-providers_resource-provider_create
+- az_custom-providers_resource-provider_delete
+- az_custom-providers_resource-provider_list
+- az_custom-providers_resource-provider_show
+- az_custom-providers_resource-provider_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/custom-providers/resource-provider.yml b/2017-03-09-profile/docs-ref-autogen/custom-providers/resource-provider.yml
new file mode 100644
index 0000000000..7e4da4ca30
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/custom-providers/resource-provider.yml
@@ -0,0 +1,200 @@
+### YamlMime:AzureCLIGroup
+uid: az_custom-providers_resource-provider
+name: az custom-providers resource-provider
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **custom-providers** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az custom-providers resource-provider** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage custom resource provider.
+description: ''
+directCommands:
+- uid: az_custom-providers_resource-provider_create
+  name: az custom-providers resource-provider create
+  summary: Create or update the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider create --name
+                                                 --resource-group
+                                                 [--action]
+                                                 [--location]
+                                                 [--no-wait]
+                                                 [--resource-type]
+                                                 [--tags]
+                                                 [--validation]
+  examples:
+  - summary: Create or update a custom resource provider.
+    syntax: >-
+      az custom-providers resource-provider create -n MyRP -g MyRG \
+
+      --action name=ping endpoint=https://test.azurewebsites.net/api routing_type=Proxy \
+
+      --resource-type name=users endpoint=https://test.azurewebsites.net/api routing_type="Proxy, Cache" \
+
+      --validation validation_type=swagger specification=https://raw.githubusercontent.com/test.json
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action to the custom resource provider.
+    description: >-
+      Usage: --action name=ping endpoint="https://test.azurewebsites.net/api/{requestPath}" routing_type=Proxy
+
+
+      name: Required. The name of the action.
+
+      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
+
+      routing_type: The routing types that are supported for action requests. Possible values include: 'Proxy'.
+
+
+      Multiple actions can be specified by using more than one `--action` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-type -r
+    summary: Add a custom resource type to the custom resource provider.
+    description: >-
+      Usage: --resource-type name=user endpoint="https://test.azurewebsites.net/api/{requestPath}" routing_type="Proxy, Cache"
+
+
+      name: Required. The name of the resource type.
+
+      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
+
+      routing_type: The routing types that are supported for resource requests. Possible values include: 'Proxy', 'Proxy,Cache'.
+
+
+      Multiple resource types can be specified by using more than one `--resource-type` argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation -v
+    summary: Add a validation to the custom resource provider.
+    description: >-
+      Usage: --validation specification="https://raw.githubusercontent.com/" validation_type="Swagger"
+
+
+      specification: A link to the validation specification.vThe specification must be hosted on raw.githubusercontent.com.
+
+      validation_type: The type of validation to run against a matching request. Possible values include: 'Swagger'.
+
+
+      Multiple validations can be specified by using more than one `--validation` argument.
+- uid: az_custom-providers_resource-provider_delete
+  name: az custom-providers resource-provider delete
+  summary: Delete the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider delete --name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--yes]
+  examples:
+  - summary: Delete a custom resource provider.
+    syntax: az custom-providers resource-provider delete -g MyRG -n MyRP
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_custom-providers_resource-provider_list
+  name: az custom-providers resource-provider list
+  summary: Get all the custom resource providers within a resource group or in the current subscription.
+  description: ''
+  syntax: az custom-providers resource-provider list [--resource-group]
+  examples:
+  - summary: List all custom resource providers in the resource group.
+    syntax: az custom-providers resource-provider list -g MyRG
+  - summary: List all custom resource providers in the current subscription.
+    syntax: az custom-providers resource-provider list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_custom-providers_resource-provider_show
+  name: az custom-providers resource-provider show
+  summary: Get the properties for the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider show --name
+                                               --resource-group
+  examples:
+  - summary: Get a custom resource provider.
+    syntax: az custom-providers resource-provider show -g MyRG -n MyRP
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_custom-providers_resource-provider_update
+  name: az custom-providers resource-provider update
+  summary: Update the custom resource provider. Only tags can be updated.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider update --name
+                                                 --resource-group
+                                                 [--tags]
+  examples:
+  - summary: Update the tags for a custom resource provider.
+    syntax: az custom-providers resource-provider update -g MyRG -n MyRP --tags a=b
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_custom-providers_resource-provider_create
+- az_custom-providers_resource-provider_delete
+- az_custom-providers_resource-provider_list
+- az_custom-providers_resource-provider_show
+- az_custom-providers_resource-provider_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage custom resource provider.
diff --git a/2017-03-09-profile/docs-ref-autogen/customlocation.yml b/2017-03-09-profile/docs-ref-autogen/customlocation.yml
new file mode 100644
index 0000000000..f0f4b82228
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/customlocation.yml
@@ -0,0 +1,217 @@
+### YamlMime:AzureCLIGroup
+uid: az_customlocation
+name: az customlocation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **customlocation** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az customlocation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to Create, Get, List and Delete CustomLocations.
+description: ''
+directCommands:
+- uid: az_customlocation_create
+  name: az customlocation create
+  summary: Create a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation create --cluster-extension-ids
+                             --host-resource-id
+                             --name
+                             --namespace
+                             --resource-group
+                             [--kubeconfig]
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kubeconfig -k
+    summary: Admin Kubeconfig of Cluster. Needs to passed in as a file if the cluster is a non-AAD enabled Cluster.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_customlocation_delete
+  name: az customlocation delete
+  summary: Delete a Customlocation.
+  description: ''
+  syntax: >-
+    az customlocation delete --name
+                             --resource-group
+                             [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_customlocation_list
+  name: az customlocation list
+  summary: Command to list CustomLocations.
+  description: ''
+  syntax: az customlocation list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_list-enabled-resource-types
+  name: az customlocation list-enabled-resource-types
+  summary: Get details of Enabled Resource Types for a CustomLocation.
+  description: ''
+  syntax: >-
+    az customlocation list-enabled-resource-types --name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_patch
+  name: az customlocation patch
+  summary: Patch a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation patch --cluster-extension-ids
+                            --host-resource-id
+                            --name
+                            --namespace
+                            --resource-group
+                            [--display-name]
+                            [--location]
+                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --display-name -d
+    summary: Display Name of Custom Location.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags -t
+    summary: A json file for tags for Custom Location.
+    description: ''
+- uid: az_customlocation_show
+  name: az customlocation show
+  summary: Get details of a Customlocation.
+  description: ''
+  syntax: >-
+    az customlocation show --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_update
+  name: az customlocation update
+  summary: Update a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation update --cluster-extension-ids
+                             --host-resource-id
+                             --name
+                             --namespace
+                             --resource-group
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_customlocation_create
+- az_customlocation_delete
+- az_customlocation_list
+- az_customlocation_list-enabled-resource-types
+- az_customlocation_patch
+- az_customlocation_show
+- az_customlocation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to Create, Get, List and Delete CustomLocations.
diff --git a/2017-03-09-profile/docs-ref-autogen/databox.yml b/2017-03-09-profile/docs-ref-autogen/databox.yml
new file mode 100644
index 0000000000..4c7c3bf6ca
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/databox.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_databox
+name: az databox
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databox** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databox** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_databox_job
+- az_databox_job_cancel
+- az_databox_job_create
+- az_databox_job_delete
+- az_databox_job_list
+- az_databox_job_list-credentials
+- az_databox_job_show
+- az_databox_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/databox/job.yml b/2017-03-09-profile/docs-ref-autogen/databox/job.yml
new file mode 100644
index 0000000000..e7805b9b48
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/databox/job.yml
@@ -0,0 +1,352 @@
+### YamlMime:AzureCLIGroup
+uid: az_databox_job
+name: az databox job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databox** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databox job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databox job.
+description: ''
+directCommands:
+- uid: az_databox_job_cancel
+  name: az databox job cancel
+  summary: Cancel a job.
+  description: ''
+  syntax: >-
+    az databox job cancel --name
+                          --reason
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Cancel the job "SdkJob3971" under resource group "SdkRg4981".
+    syntax: az databox job cancel --resource-group "SdkRg4981" --name "SdkJob3971" --reason "CancelTest"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --reason
+    summary: Reason for cancellation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databox_job_create
+  name: az databox job create
+  summary: Create a new job with the specified parameters.
+  description: ''
+  syntax: >-
+    az databox job create --city
+                          --contact-name
+                          --country
+                          --email-list
+                          --location
+                          --name
+                          --phone
+                          --postal-code
+                          --resource-group
+                          --sku {DataBox, DataBoxDisk, DataBoxHeavy}
+                          --state-or-province
+                          --street-address1
+                          [--company-name]
+                          [--expected-data-size]
+                          [--mobile]
+                          [--resource-group-for-managed-disk]
+                          [--staging-storage-account]
+                          [--storage-accounts]
+                          [--street-address2]
+                          [--street-address3]
+                          [--tags]
+  examples:
+  - summary: Create a databox job to use both storage account and managed disk as data destination.
+    syntax: >-
+      az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
+
+      "westus" --sku "DataBox" --contact-name "Public SDK Test" \
+
+      --phone "1234567890" --email-list "testing@microsoft.com" \
+
+      --street-address1 "16 TOWNSEND ST" --street-address2 "Unit 1" --city "San Francisco"  \
+
+      --state-or-province "CA" --country "US" --postal-code "94107" --company-name "Microsoft" \
+
+      --storage-account sa1 sa2 --staging-storage-account sa \
+
+      --resource-group-for-managed-disk /subscriptions/sub/resourceGroups/rg
+  - summary: Create a databoxdisk job to use storage account as data destination.
+    syntax: >-
+      az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
+
+      "westus" --sku "DataBoxDisk" --expected-data-size 1 --contact-name "Public SDK Test" \
+
+      --phone "1234567890" --email-list "testing@microsoft.com" --street-address1 "16 TOWNSEND ST" \
+
+      --street-address2 "Unit 1" --city "San Francisco" --state-or-province "CA" --country "US" \
+
+      --postal-code "94107" --company-name "Microsoft" --storage-account sa1
+  requiredParameters:
+  - isRequired: true
+    name: --city
+    summary: Name of the City.
+    description: ''
+  - isRequired: true
+    name: --contact-name
+    summary: Contact name of the person.
+    description: ''
+  - isRequired: true
+    name: --country
+    summary: 'Name of the Country. Ex: US.'
+    description: ''
+  - isRequired: true
+    name: --email-list
+    summary: Space-separated list of Email addresses to be notified about job progress.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --phone
+    summary: Phone number of the contact person.
+    description: ''
+  - isRequired: true
+    name: --postal-code
+    summary: Postal code.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: DataBox, DataBoxDisk, DataBoxHeavy
+    summary: The sku type of DataBox.
+    description: ''
+  - isRequired: true
+    name: --state-or-province
+    summary: Name of the State or Province.
+    description: ''
+  - isRequired: true
+    name: --street-address1
+    summary: Street Address line 1.
+    description: ''
+  optionalParameters:
+  - name: --company-name
+    summary: Name of the company.
+    description: ''
+  - name: --expected-data-size
+    summary: The expected size of the data which needs to be transferred in this job, in terabytes.The maximum usable capacity is up to 35 TB. This is only needed when sku is DataBoxDisk.
+    description: ''
+  - name: --mobile
+    summary: Mobile number of the contact person.
+    description: ''
+  - name: --resource-group-for-managed-disk
+    summary: The name or ID of the destination resource group where the Compute disks should be created.
+    description: ''
+  - name: --staging-storage-account
+    summary: The name or ID of the destination storage account that can be used to copy the vhd for staging.
+    description: ''
+  - name: --storage-accounts
+    summary: Space-separated list of the destination storage account. It can be the name or resource ID of storage account.
+    description: ''
+  - name: --street-address2
+    summary: Street Address line 2.
+    description: ''
+  - name: --street-address3
+    summary: Street Address line 3.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_databox_job_delete
+  name: az databox job delete
+  summary: Delete a job.
+  description: ''
+  syntax: >-
+    az databox job delete --name
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Delete the job "SdkJob3971" in resource group "SdkRg4981".
+    syntax: az databox job delete --resource-group "SdkRg4981" --name "SdkJob3971"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databox_job_list
+  name: az databox job list
+  summary: List all the jobs available under the given resource group or the given subscription.
+  description: ''
+  syntax: az databox job list [--resource-group]
+  examples:
+  - summary: List all the jobs available under the current subscription.
+    syntax: az databox job list
+  - summary: List all the jobs available under the resource group "SdkRg4981".
+    syntax: az databox job list --resource-group "SdkRg4981"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_list-credentials
+  name: az databox job list-credentials
+  summary: List the unencrypted secrets related to the job.
+  description: ''
+  syntax: >-
+    az databox job list-credentials --name
+                                    --resource-group
+  examples:
+  - summary: List the unencrypted secrets related to the job "TJ-636646322037905056".
+    syntax: az databox job list-credentials --resource-group "bvttoolrg6" --name "TJ-636646322037905056"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_show
+  name: az databox job show
+  summary: Get information about the specified job.
+  description: ''
+  syntax: >-
+    az databox job show --name
+                        --resource-group
+  examples:
+  - summary: Get the information about the job "SdkJob3971".
+    syntax: az databox job show --resource-group "SdkRg4981" --name "SdkJob3971"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_update
+  name: az databox job update
+  summary: Update an existing job with the specified parameters.
+  description: ''
+  syntax: >-
+    az databox job update --name
+                          --resource-group
+                          [--city]
+                          [--company-name]
+                          [--contact-name]
+                          [--country]
+                          [--email-list]
+                          [--mobile]
+                          [--phone]
+                          [--postal-code]
+                          [--state-or-province]
+                          [--street-address1]
+                          [--street-address2]
+                          [--street-address3]
+  examples:
+  - summary: Update the job "SdkJob3971" with the specified parameters.
+    syntax: >-
+      az databox job update --resource-group "SdkRg4981" --name "SdkJob3971" \
+
+      --contact-name "Update Job" --phone "1234567890" \
+
+      --email-list "testing@microsoft.com" \
+
+      --street-address1 "16 TOWNSEND ST" \
+
+      --city "San Francisco" --state-or-province "CA" \
+
+      --country "US" --postal-code "94107" \
+
+      --company-name "Microsoft" \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --city
+    summary: Name of the City.
+    description: ''
+  - name: --company-name
+    summary: Name of the company.
+    description: ''
+  - name: --contact-name
+    summary: Contact name of the person.
+    description: ''
+  - name: --country
+    summary: 'Name of the Country. Ex: US.'
+    description: ''
+  - name: --email-list
+    summary: List of Email addresses to be notified about job progress.
+    description: ''
+  - name: --mobile
+    summary: Mobile number of the contact person.
+    description: ''
+  - name: --phone
+    summary: Phone number of the contact person.
+    description: ''
+  - name: --postal-code
+    summary: Postal code.
+    description: ''
+  - name: --state-or-province
+    summary: Name of the State or Province.
+    description: ''
+  - name: --street-address1
+    summary: Street Address line 1.
+    description: ''
+  - name: --street-address2
+    summary: Street Address line 2.
+    description: ''
+  - name: --street-address3
+    summary: Street Address line 3.
+    description: ''
+commands:
+- az_databox_job_cancel
+- az_databox_job_create
+- az_databox_job_delete
+- az_databox_job_list
+- az_databox_job_list-credentials
+- az_databox_job_show
+- az_databox_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databox job.
diff --git a/2017-03-09-profile/docs-ref-autogen/databricks.yml b/2017-03-09-profile/docs-ref-autogen/databricks.yml
new file mode 100644
index 0000000000..0fefc73812
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/databricks.yml
@@ -0,0 +1,41 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks
+name: az databricks
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage databricks workspaces.
+description: ''
+commands:
+- az_databricks_workspace
+- az_databricks_workspace_create
+- az_databricks_workspace_delete
+- az_databricks_workspace_list
+- az_databricks_workspace_show
+- az_databricks_workspace_update
+- az_databricks_workspace_vnet-peering
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+- az_databricks_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage databricks workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/databricks/workspace.yml b/2017-03-09-profile/docs-ref-autogen/databricks/workspace.yml
new file mode 100644
index 0000000000..a0e6c5ced3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/databricks/workspace.yml
@@ -0,0 +1,278 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks_workspace
+name: az databricks workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databricks workspace.
+description: ''
+directCommands:
+- uid: az_databricks_workspace_create
+  name: az databricks workspace create
+  summary: Create a new workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace create --location
+                                   --name
+                                   --resource-group
+                                   --sku {premium, standard, trial}
+                                   [--enable-no-public-ip]
+                                   [--managed-resource-group]
+                                   [--no-wait]
+                                   [--prepare-encryption]
+                                   [--private-subnet]
+                                   [--public-subnet]
+                                   [--require-infrastructure-encryption]
+                                   [--tags]
+                                   [--vnet]
+  examples:
+  - summary: Create a workspace
+    syntax: az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location westus --sku standard
+  - summary: Create a workspace with managed identity for storage account
+    syntax: az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location eastus2euap --sku premium --prepare-encryption
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: premium, standard, trial
+    summary: The SKU tier name.
+    description: ''
+  optionalParameters:
+  - name: --enable-no-public-ip
+    summary: Flag to enable the no public ip feature.
+    description: ''
+  - name: --managed-resource-group
+    summary: The managed resource group to create. It can be either a name or a resource ID.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prepare-encryption
+    summary: Flag to enable the Managed Identity for managed storage account to prepare for CMK encryption.
+    description: ''
+  - name: --private-subnet
+    summary: The name of a Private Subnet within the Virtual Network.
+    description: ''
+  - name: --public-subnet
+    summary: The name of a Public Subnet within the Virtual Network.
+    description: ''
+  - name: --require-infrastructure-encryption
+    summary: Flag to enable the DBFS root file system with secondary layer of encryption with platform managed keys for data at rest.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet
+    summary: Virtual Network name or resource ID.
+    description: ''
+- uid: az_databricks_workspace_delete
+  name: az databricks workspace delete
+  summary: Delete the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace delete --name
+                                   --resource-group
+                                   [--no-wait]
+                                   [--yes]
+  examples:
+  - summary: Delete the workspace
+    syntax: az databricks workspace delete --resource-group MyResourceGroup --name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databricks_workspace_list
+  name: az databricks workspace list
+  summary: Get all the workspaces.
+  description: ''
+  syntax: az databricks workspace list [--resource-group]
+  examples:
+  - summary: List workspaces within a resource group
+    syntax: az databricks workspace list --resource-group MyResourceGroup
+  - summary: List workspaces within the default subscription
+    syntax: az databricks workspace list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databricks_workspace_show
+  name: az databricks workspace show
+  summary: Show the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace show --name
+                                 --resource-group
+  examples:
+  - summary: Show the workspace
+    syntax: az databricks workspace show --resource-group MyResourceGroup --name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databricks_workspace_update
+  name: az databricks workspace update
+  summary: Update the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace update --name
+                                   --resource-group
+                                   [--key-name]
+                                   [--key-source {Default, Microsoft.Keyvault}]
+                                   [--key-vault]
+                                   [--key-version]
+                                   [--no-wait]
+                                   [--prepare-encryption]
+                                   [--tags]
+  examples:
+  - summary: Update the workspace's tags.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags key1=value1 key2=value2
+  - summary: Clean the workspace's tags.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags ""
+  - summary: Prepare for CMK encryption by assigning identity for storage account.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --prepare-encryption
+  - summary: Configure CMK encryption
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --key-source Microsoft.KeyVault --key-name MyKey --key-vault https://myKeyVault.vault.azure.net/ --key-version 00000000000000000000000000000000
+  - summary: Revert encryption to Microsoft Managed Keys
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --key-source Default
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    summary: The name of KeyVault key.
+    description: ''
+  - name: --key-source
+    parameterValueGroup: Default, Microsoft.Keyvault
+    summary: The encryption key source (provider).
+    description: ''
+  - name: --key-vault
+    summary: The Uri of KeyVault.
+    description: ''
+  - name: --key-version
+    summary: The version of KeyVault key. It is optional when updating CMK.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prepare-encryption
+    summary: Flag to enable the Managed Identity for managed storage account to prepare for CMK encryption.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_databricks_workspace_wait
+  name: az databricks workspace wait
+  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
+  description: ''
+  syntax: >-
+    az databricks workspace wait --name
+                                 --resource-group
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Databricks workspace is successfully provisioned.
+    syntax: az databricks workspace wait --resource-group MyResourceGroup --name MyWorkspace \ --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_databricks_workspace_create
+- az_databricks_workspace_delete
+- az_databricks_workspace_list
+- az_databricks_workspace_show
+- az_databricks_workspace_update
+- az_databricks_workspace_vnet-peering
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+- az_databricks_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databricks workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/databricks/workspace/vnet-peering.yml b/2017-03-09-profile/docs-ref-autogen/databricks/workspace/vnet-peering.yml
new file mode 100644
index 0000000000..3eb423318a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/databricks/workspace/vnet-peering.yml
@@ -0,0 +1,270 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks_workspace_vnet-peering
+name: az databricks workspace vnet-peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks workspace vnet-peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databricks workspace vnet peering.
+description: ''
+directCommands:
+- uid: az_databricks_workspace_vnet-peering_create
+  name: az databricks workspace vnet-peering create
+  summary: Create a vnet peering for a workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering create --name
+                                                --remote-vnet
+                                                --resource-group
+                                                --workspace-name
+                                                [--allow-forwarded-traffic {false, true}]
+                                                [--allow-gateway-transit {false, true}]
+                                                [--allow-virtual-network-access {false, true}]
+                                                [--no-wait]
+                                                [--use-remote-gateways {false, true}]
+  examples:
+  - summary: Create a vnet peering for a workspace
+    syntax: >-
+      az databricks workspace vnet-peering create --resource-group MyResourceGroup --workspace-name MyWorkspace \
+
+      -n MyPeering --remote-vnet /subscriptions/000000-0000-0000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVNet
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --remote-vnet
+    summary: The remote virtual network name or Resource ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --allow-forwarded-traffic
+    parameterValueGroup: false, true
+    summary: Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+    description: ''
+  - name: --allow-gateway-transit
+    parameterValueGroup: false, true
+    summary: If gateway links can be used in remote virtual networking to link to this virtual network.
+    description: ''
+  - name: --allow-virtual-network-access
+    parameterValueGroup: false, true
+    summary: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --use-remote-gateways
+    parameterValueGroup: false, true
+    summary: If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_delete
+  name: az databricks workspace vnet-peering delete
+  summary: Delete the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering delete --name
+                                                --resource-group
+                                                --workspace-name
+                                                [--no-wait]
+  examples:
+  - summary: Delete the vnet peering.
+    syntax: az databricks workspace vnet-peering delete --resource-group MyResourceGroup --workspace-name MyWorkspace -n MyPeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_list
+  name: az databricks workspace vnet-peering list
+  summary: List vnet peerings under a workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering list --resource-group
+                                              --workspace-name
+  examples:
+  - summary: List vnet peerings under a workspace.
+    syntax: az databricks workspace vnet-peering list --resource-group MyResourceGroup --workspace-name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_show
+  name: az databricks workspace vnet-peering show
+  summary: Show the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering show --name
+                                              --resource-group
+                                              --workspace-name
+  examples:
+  - summary: Show the vnet peering
+    syntax: az databricks workspace vnet-peering show --resource-group MyResourceGroup --workspace-name MyWorkspace -n MyPeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_update
+  name: az databricks workspace vnet-peering update
+  summary: Update the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering update --name
+                                                --resource-group
+                                                --workspace-name
+                                                [--allow-forwarded-traffic {false, true}]
+                                                [--allow-gateway-transit {false, true}]
+                                                [--allow-virtual-network-access {false, true}]
+                                                [--no-wait]
+                                                [--use-remote-gateways {false, true}]
+  examples:
+  - summary: Update the vnet peering (enable gateway transit and disable virtual network access).
+    syntax: >-
+      az databricks workspace vnet-peering update --resource-group MyResourceGroup --workspace-name MyWorkspace \
+
+      -n MyPeering --allow-gateway-transit --allow-virtual-network-access false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --allow-forwarded-traffic
+    parameterValueGroup: false, true
+    summary: Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+    description: ''
+  - name: --allow-gateway-transit
+    parameterValueGroup: false, true
+    summary: If gateway links can be used in remote virtual networking to link to this virtual network.
+    description: ''
+  - name: --allow-virtual-network-access
+    parameterValueGroup: false, true
+    summary: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --use-remote-gateways
+    parameterValueGroup: false, true
+    summary: If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_wait
+  name: az databricks workspace vnet-peering wait
+  summary: Place the CLI in a waiting state until a condition of the Databricks workspace vnet peering is met.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering wait --name
+                                              --resource-group
+                                              --workspace-name
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Databricks workspace vnet peering is successfully provisioned.
+    syntax: az databricks workspace vnet-peering wait --resource-group MyResourceGroup --workspace-name MyWorkspace \ --name MyPeering --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databricks workspace vnet peering.
diff --git a/2017-03-09-profile/docs-ref-autogen/datadog.yml b/2017-03-09-profile/docs-ref-autogen/datadog.yml
new file mode 100644
index 0000000000..c022011242
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datadog.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog
+name: az datadog
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_datadog_monitor
+- az_datadog_monitor_create
+- az_datadog_monitor_delete
+- az_datadog_monitor_get-default-key
+- az_datadog_monitor_list
+- az_datadog_monitor_list-api-key
+- az_datadog_monitor_list-host
+- az_datadog_monitor_list-linked-resource
+- az_datadog_monitor_list-monitored-resource
+- az_datadog_monitor_refresh-set-password-link
+- az_datadog_monitor_set-default-key
+- az_datadog_monitor_show
+- az_datadog_monitor_update
+- az_datadog_monitor_wait
+- az_datadog_sso-config
+- az_datadog_sso-config_create
+- az_datadog_sso-config_list
+- az_datadog_sso-config_show
+- az_datadog_sso-config_update
+- az_datadog_sso-config_wait
+- az_datadog_tag-rule
+- az_datadog_tag-rule_create
+- az_datadog_tag-rule_list
+- az_datadog_tag-rule_show
+- az_datadog_tag-rule_update
+- az_datadog_terms
+- az_datadog_terms_create
+- az_datadog_terms_list
+- az_datadog_terms_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/datadog/monitor.yml b/2017-03-09-profile/docs-ref-autogen/datadog/monitor.yml
new file mode 100644
index 0000000000..d434256cdc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datadog/monitor.yml
@@ -0,0 +1,401 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_monitor
+name: az datadog monitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog monitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage monitor with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_monitor_create
+  name: az datadog monitor create
+  summary: Create a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor create --monitor-name
+                              --resource-group
+                              [--datadog-organization-properties]
+                              [--location]
+                              [--no-wait]
+                              [--sku-name]
+                              [--tags]
+                              [--type {SystemAssigned, UserAssigned}]
+                              [--user-info]
+  examples:
+  - summary: Monitors_Create
+    syntax: az datadog monitor create --name "myMonitor" --resource-group "myResourceGroup" --location "West US 2" --tags Environment="Dev" --user-info name="Alice" email-address="alice@microsoft.com" phone-number="123-456-7890" --type "SystemAssigned" --sku-name "payg_v2_Monthly"
+  - summary: Monitors creation with linking to Datadogo organization.
+    syntax: az datadog monitor create --name "myMonitor" --resource-group "myResourceGroup" --location "West US 2" --datadog-organization-properties api-key=XX application-key=XX --tags Environment="Dev" --user-info name="Alice" email-address="alice@microsoft.com" phone-number="123-456-7890" --type "SystemAssigned" --sku-name "Linked"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --datadog-organization-properties
+    summary: Datadog organization properties.
+    description: >-
+      Usage: --datadog-organization-properties linking-auth-code=XX linking-client-id=XX redirect-uri=XX api-key=XX application-key=XX enterprise-app-id=XX
+
+
+      linking-auth-code: The auth code used to linking to an existing datadog organization.
+
+      linking-client-id: The client_id from an existing in exchange for an auth token to link organization.
+
+      redirect-uri: The redirect uri for linking.
+
+      api-key: Api key associated to the Datadog organization.
+
+      application-key: Application key associated to the Datadog organization.
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign on.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-name
+    summary: Name of the SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: SystemAssigned, UserAssigned
+    summary: Identity type.
+    description: ''
+  - name: --user-info
+    summary: User info.
+    description: >-
+      Usage: --user-info name=XX email-address=XX phone-number=XX
+
+
+      name: Name of the user
+
+      email-address: Email of the user used by Datadog for contacting them if needed
+
+      phone-number: Phone number of the user used by Datadog for contacting them if needed.
+- uid: az_datadog_monitor_delete
+  name: az datadog monitor delete
+  summary: Delete a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor delete --monitor-name
+                              --resource-group
+                              [--no-wait]
+                              [--yes]
+  examples:
+  - summary: Monitors_Delete
+    syntax: az datadog monitor delete --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datadog_monitor_get-default-key
+  name: az datadog monitor get-default-key
+  summary: Get the default api key.
+  description: ''
+  syntax: >-
+    az datadog monitor get-default-key --monitor-name
+                                       --resource-group
+  examples:
+  - summary: Monitors_GetDefaultKey
+    syntax: az datadog monitor get-default-key --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list
+  name: az datadog monitor list
+  summary: List all monitors under the specified resource group. And List all monitors under the specified subscription.
+  description: ''
+  syntax: az datadog monitor list [--resource-group]
+  examples:
+  - summary: Monitors_ListByResourceGroup
+    syntax: az datadog monitor list --resource-group "myResourceGroup"
+  - summary: Monitors_List
+    syntax: az datadog monitor list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-api-key
+  name: az datadog monitor list-api-key
+  summary: List the api keys for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-api-key --monitor-name
+                                    --resource-group
+  examples:
+  - summary: Monitors_ListApiKeys
+    syntax: az datadog monitor list-api-key --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-host
+  name: az datadog monitor list-host
+  summary: List the hosts for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-host --monitor-name
+                                 --resource-group
+  examples:
+  - summary: Monitors_ListHosts
+    syntax: az datadog monitor list-host --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-linked-resource
+  name: az datadog monitor list-linked-resource
+  summary: List all Azure resources associated to the same Datadog organization as the target resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-linked-resource --monitor-name
+                                            --resource-group
+  examples:
+  - summary: Monitors_ListLinkedResources
+    syntax: az datadog monitor list-linked-resource --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-monitored-resource
+  name: az datadog monitor list-monitored-resource
+  summary: List the resources currently being monitored by the Datadog monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-monitored-resource --monitor-name
+                                               --resource-group
+  examples:
+  - summary: Monitors_ListMonitoredResources
+    syntax: az datadog monitor list-monitored-resource --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_refresh-set-password-link
+  name: az datadog monitor refresh-set-password-link
+  summary: Refresh the set password link and return a latest one.
+  description: ''
+  syntax: >-
+    az datadog monitor refresh-set-password-link --monitor-name
+                                                 --resource-group
+  examples:
+  - summary: Monitors_RefreshSetPasswordLink
+    syntax: az datadog monitor refresh-set-password-link --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_set-default-key
+  name: az datadog monitor set-default-key
+  summary: Set the default api key.
+  description: ''
+  syntax: >-
+    az datadog monitor set-default-key --monitor-name
+                                       --resource-group
+                                       [--created]
+                                       [--created-by]
+                                       [--key]
+                                       [--name]
+  examples:
+  - summary: Monitors_SetDefaultKey
+    syntax: az datadog monitor set-default-key --monitor-name "myMonitor" --key "1111111111111111aaaaaaaaaaaaaaaa" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time of creation of the API key.
+    description: ''
+  - name: --created-by
+    summary: The user that created the API key.
+    description: ''
+  - name: --key
+    summary: The value of the API key.
+    description: ''
+  - name: --name
+    summary: The name of the API key.
+    description: ''
+- uid: az_datadog_monitor_show
+  name: az datadog monitor show
+  summary: Get the properties of a specific monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor show --monitor-name
+                            --resource-group
+  examples:
+  - summary: Monitors_Get
+    syntax: az datadog monitor show --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_update
+  name: az datadog monitor update
+  summary: Update a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor update --monitor-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Monitors_Update
+    syntax: az datadog monitor update --name "myMonitor" --tags Environment="Dev" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datadog_monitor_wait
+  name: az datadog monitor wait
+  summary: Place the CLI in a waiting state until a condition of the datadog monitor is met.
+  description: ''
+  syntax: >-
+    az datadog monitor wait --monitor-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datadog monitor is successfully created.
+    syntax: az datadog monitor wait --name "myMonitor" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the datadog monitor is successfully deleted.
+    syntax: az datadog monitor wait --name "myMonitor" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datadog_monitor_create
+- az_datadog_monitor_delete
+- az_datadog_monitor_get-default-key
+- az_datadog_monitor_list
+- az_datadog_monitor_list-api-key
+- az_datadog_monitor_list-host
+- az_datadog_monitor_list-linked-resource
+- az_datadog_monitor_list-monitored-resource
+- az_datadog_monitor_refresh-set-password-link
+- az_datadog_monitor_set-default-key
+- az_datadog_monitor_show
+- az_datadog_monitor_update
+- az_datadog_monitor_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage monitor with datadog.
diff --git a/2017-03-09-profile/docs-ref-autogen/datadog/sso-config.yml b/2017-03-09-profile/docs-ref-autogen/datadog/sso-config.yml
new file mode 100644
index 0000000000..f650395664
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datadog/sso-config.yml
@@ -0,0 +1,224 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_sso-config
+name: az datadog sso-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog sso-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage sso config with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_sso-config_create
+  name: az datadog sso-config create
+  summary: Configures single-sign-on for this resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config create --configuration-name
+                                 --monitor-name
+                                 --resource-group
+                                 [--no-wait]
+                                 [--properties]
+  examples:
+  - summary: SingleSignOnConfigurations_CreateOrUpdate
+    syntax: az datadog sso-config create --configuration-name "default" --monitor-name "myMonitor" --properties enterprise-app-id="00000000-0000-0000-0000-000000000000" single-sign-on-state="Enable" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --properties
+    summary: ''
+    description: >-
+      Usage: --properties provisioning-state=XX single-sign-on-state=XX enterprise-app-id=XX
+
+
+      single-sign-on-state: Various states of the SSO resource
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign-on.
+- uid: az_datadog_sso-config_list
+  name: az datadog sso-config list
+  summary: List the single sign-on configurations for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config list --monitor-name
+                               --resource-group
+  examples:
+  - summary: SingleSignOnConfigurations_List
+    syntax: az datadog sso-config list --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_sso-config_show
+  name: az datadog sso-config show
+  summary: Gets the datadog single sign-on resource for the given Monitor.
+  description: ''
+  syntax: >-
+    az datadog sso-config show --configuration-name
+                               --monitor-name
+                               --resource-group
+  examples:
+  - summary: SingleSignOnConfigurations_Get
+    syntax: az datadog sso-config show --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_sso-config_update
+  name: az datadog sso-config update
+  summary: Configures single-sign-on for this resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config update --configuration-name
+                                 --monitor-name
+                                 --resource-group
+                                 [--add]
+                                 [--force-string]
+                                 [--no-wait]
+                                 [--properties]
+                                 [--remove]
+                                 [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --properties
+    summary: ''
+    description: >-
+      Usage: --properties provisioning-state=XX single-sign-on-state=XX enterprise-app-id=XX
+
+
+      single-sign-on-state: Various states of the SSO resource
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign-on.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_datadog_sso-config_wait
+  name: az datadog sso-config wait
+  summary: Place the CLI in a waiting state until a condition of the datadog sso-config is met.
+  description: ''
+  syntax: >-
+    az datadog sso-config wait --configuration-name
+                               --monitor-name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datadog sso-config is successfully created.
+    syntax: az datadog sso-config wait --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the datadog sso-config is successfully updated.
+    syntax: az datadog sso-config wait --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup" --updated
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datadog_sso-config_create
+- az_datadog_sso-config_list
+- az_datadog_sso-config_show
+- az_datadog_sso-config_update
+- az_datadog_sso-config_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage sso config with datadog.
diff --git a/2017-03-09-profile/docs-ref-autogen/datadog/tag-rule.yml b/2017-03-09-profile/docs-ref-autogen/datadog/tag-rule.yml
new file mode 100644
index 0000000000..f3ed087fa6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datadog/tag-rule.yml
@@ -0,0 +1,228 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_tag-rule
+name: az datadog tag-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog tag-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tag rule with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_tag-rule_create
+  name: az datadog tag-rule create
+  summary: Create a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule create --monitor-name
+                               --resource-group
+                               --rule-set-name
+                               [--filtering-tags]
+                               [--log-rules-filtering-tags]
+                               [--send-aad-logs {false, true}]
+                               [--send-resource-logs {false, true}]
+                               [--send-subscription-logs {false, true}]
+  examples:
+  - summary: TagRules_CreateOrUpdate
+    syntax: az datadog tag-rule create --monitor-name "myMonitor" --log-rules-filtering-tags name="Environment" action="Include" value="Prod" --log-rules-filtering-tags name="Environment" action="Exclude" value="Dev" --send-aad-logs false --send-resource-logs true --send-subscription-logs true --resource-group "myResourceGroup" --rule-set-name "default"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+  optionalParameters:
+  - name: --filtering-tags
+    summary: List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --filtering-tags argument.
+  - name: --log-rules-filtering-tags
+    summary: List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --log-rules-filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --log-rules-filtering-tags argument.
+  - name: --send-aad-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if AAD logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-resource-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure resource logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-subscription-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure subscription logs should be sent for the Monitor resource.
+    description: ''
+- uid: az_datadog_tag-rule_list
+  name: az datadog tag-rule list
+  summary: List the tag rules for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule list --monitor-name
+                             --resource-group
+  examples:
+  - summary: TagRules_List
+    syntax: az datadog tag-rule list --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_tag-rule_show
+  name: az datadog tag-rule show
+  summary: Get a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule show --monitor-name
+                             --resource-group
+                             --rule-set-name
+  examples:
+  - summary: TagRules_Get
+    syntax: az datadog tag-rule show --monitor-name "myMonitor" --resource-group "myResourceGroup" --rule-set-name "default"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+- uid: az_datadog_tag-rule_update
+  name: az datadog tag-rule update
+  summary: Update a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule update --monitor-name
+                               --resource-group
+                               --rule-set-name
+                               [--add]
+                               [--filtering-tags]
+                               [--force-string]
+                               [--log-rules-filtering-tags]
+                               [--remove]
+                               [--send-aad-logs {false, true}]
+                               [--send-resource-logs {false, true}]
+                               [--send-subscription-logs {false, true}]
+                               [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --filtering-tags
+    summary: List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --filtering-tags argument.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --log-rules-filtering-tags
+    summary: List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --log-rules-filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --log-rules-filtering-tags argument.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --send-aad-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if AAD logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-resource-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure resource logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-subscription-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure subscription logs should be sent for the Monitor resource.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_datadog_tag-rule_create
+- az_datadog_tag-rule_list
+- az_datadog_tag-rule_show
+- az_datadog_tag-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tag rule with datadog.
diff --git a/2017-03-09-profile/docs-ref-autogen/datadog/terms.yml b/2017-03-09-profile/docs-ref-autogen/datadog/terms.yml
new file mode 100644
index 0000000000..43aee9f595
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datadog/terms.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_terms
+name: az datadog terms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog terms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage marketplace agreements with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_terms_create
+  name: az datadog terms create
+  summary: Create Datadog marketplace agreement in the subscription.
+  description: ''
+  syntax: az datadog terms create [--properties]
+  examples:
+  - summary: MarketplaceAgreements_CreateOrUpdate
+    syntax: az datadog terms create --properties accepted=true
+  optionalParameters:
+  - name: --properties
+    summary: Represents the properties of the resource.
+    description: >-
+      Usage: --properties publisher=XX product=XX plan=XX license-text-link=XX privacy-policy-link=XX retrieve-datetime=XX signature=XX accepted=XX
+
+
+      publisher: Publisher identifier string.
+
+      product: Product identifier string.
+
+      plan: Plan identifier string.
+
+      license-text-link: Link to HTML with Microsoft and Publisher terms.
+
+      privacy-policy-link: Link to the privacy policy of the publisher.
+
+      retrieve-datetime: Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.
+
+      signature: Terms signature.
+
+      accepted: If any version of the terms have been accepted, otherwise false.
+- uid: az_datadog_terms_list
+  name: az datadog terms list
+  summary: List datadog marketplace agreements.
+  description: ''
+  syntax: az datadog terms list
+  examples:
+  - summary: List marketplace agreements
+    syntax: az datadog terms list
+- uid: az_datadog_terms_update
+  name: az datadog terms update
+  summary: Update Datadog marketplace agreement in the subscription.
+  description: ''
+  syntax: az datadog terms update [--properties]
+  optionalParameters:
+  - name: --properties
+    summary: Represents the properties of the resource.
+    description: >-
+      Usage: --properties publisher=XX product=XX plan=XX license-text-link=XX privacy-policy-link=XX retrieve-datetime=XX signature=XX accepted=XX
+
+
+      publisher: Publisher identifier string.
+
+      product: Product identifier string.
+
+      plan: Plan identifier string.
+
+      license-text-link: Link to HTML with Microsoft and Publisher terms.
+
+      privacy-policy-link: Link to the privacy policy of the publisher.
+
+      retrieve-datetime: Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.
+
+      signature: Terms signature.
+
+      accepted: If any version of the terms have been accepted, otherwise false.
+commands:
+- az_datadog_terms_create
+- az_datadog_terms_list
+- az_datadog_terms_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage marketplace agreements with datadog.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory.yml b/2017-03-09-profile/docs-ref-autogen/datafactory.yml
new file mode 100644
index 0000000000..dddd6f3be0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory.yml
@@ -0,0 +1,404 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory
+name: az datafactory
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage factory with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_configure-factory-repo
+  name: az datafactory configure-factory-repo
+  summary: Updates a factory's repo information.
+  description: ''
+  syntax: >-
+    az datafactory configure-factory-repo --location
+                                          [--factory-git-hub-configuration]
+                                          [--factory-resource-id]
+                                          [--factory-vsts-configuration]
+  examples:
+  - summary: Factories_ConfigureFactoryRepo
+    syntax: az datafactory configure-factory-repo --factory-resource-id "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName" --factory-vsts-configuration account-name="ADF" collaboration-branch="master" last-commit-id="" project-name="project" repository-name="repo" root-folder="/" tenant-id="" --location "East US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --factory-git-hub-configuration --github-config
+    summary: Factory's GitHub repo information.
+    description: >-
+      Usage: --factory-git-hub-configuration host-name=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      host-name: GitHub Enterprise host name. For example: https://github.mydomain.com
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --factory-resource-id
+    summary: The factory resource id.
+    description: ''
+  - name: --factory-vsts-configuration --vsts-config
+    summary: Factory's VSTS repo information.
+    description: >-
+      Usage: --factory-vsts-configuration project-name=XX tenant-id=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      project-name: Required. VSTS project name.
+
+      tenant-id: VSTS tenant id.
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+- uid: az_datafactory_create
+  name: az datafactory create
+  summary: Create a factory.
+  description: ''
+  syntax: >-
+    az datafactory create --factory-name
+                          --resource-group
+                          [--factory-git-hub-configuration]
+                          [--factory-vsts-configuration]
+                          [--global-parameters]
+                          [--if-match]
+                          [--location]
+                          [--tags]
+  examples:
+  - summary: Factories_CreateOrUpdate
+    syntax: az datafactory create --location "East US" --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --factory-git-hub-configuration --github-config
+    summary: Factory's GitHub repo information.
+    description: >-
+      Usage: --factory-git-hub-configuration host-name=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      host-name: GitHub Enterprise host name. For example: https://github.mydomain.com
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --factory-vsts-configuration --vsts-config
+    summary: Factory's VSTS repo information.
+    description: >-
+      Usage: --factory-vsts-configuration project-name=XX tenant-id=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      project-name: Required. VSTS project name.
+
+      tenant-id: VSTS tenant id.
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --global-parameters
+    summary: 'List of parameters for factory. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --if-match
+    summary: ETag of the factory entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datafactory_delete
+  name: az datafactory delete
+  summary: Deletes a factory.
+  description: ''
+  syntax: >-
+    az datafactory delete --factory-name
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Factories_Delete
+    syntax: az datafactory delete --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_get-data-plane-access
+  name: az datafactory get-data-plane-access
+  summary: Get Data Plane access.
+  description: ''
+  syntax: >-
+    az datafactory get-data-plane-access --factory-name
+                                         --resource-group
+                                         [--access-resource-path]
+                                         [--expire-time]
+                                         [--permissions]
+                                         [--profile-name]
+                                         [--start-time]
+  examples:
+  - summary: Factories_GetDataPlaneAccess
+    syntax: az datafactory get-data-plane-access --name "exampleFactoryName" --access-resource-path "" --expire-time "2018-11-10T09:46:20.2659347Z" --permissions "r" --profile-name "DefaultProfile" --start-time "2018-11-10T02:46:20.2659347Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --access-resource-path
+    summary: The resource path to get access relative to factory. Currently only empty string is supported which corresponds to the factory resource.
+    description: ''
+  - name: --expire-time
+    summary: Expiration time for the token. Maximum duration for the token is eight hours and by default the token will expire in eight hours.
+    description: ''
+  - name: --permissions
+    summary: The string with permissions for Data Plane access. Currently only 'r' is supported which grants read only access.
+    description: ''
+  - name: --profile-name
+    summary: The name of the profile. Currently only the default is supported. The default value is DefaultProfile.
+    description: ''
+  - name: --start-time
+    summary: Start time for the token. If not specified the current time will be used.
+    description: ''
+- uid: az_datafactory_get-git-hub-access-token
+  name: az datafactory get-git-hub-access-token
+  summary: Get GitHub Access Token.
+  description: ''
+  syntax: >-
+    az datafactory get-git-hub-access-token --factory-name
+                                            --git-hub-access-code
+                                            --git-hub-access-token-base-url
+                                            --resource-group
+                                            [--git-hub-client-id]
+  examples:
+  - summary: Factories_GetGitHubAccessToken
+    syntax: az datafactory get-git-hub-access-token --name "exampleFactoryName" --git-hub-access-code "some" --git-hub-access-token-base-url "some" --git-hub-client-id "some" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --git-hub-access-code
+    summary: GitHub access code.
+    description: ''
+  - isRequired: true
+    name: --git-hub-access-token-base-url
+    summary: GitHub access token base URL.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --git-hub-client-id
+    summary: GitHub application client ID.
+    description: ''
+- uid: az_datafactory_list
+  name: az datafactory list
+  summary: Lists factories. And Lists factories under the specified subscription.
+  description: ''
+  syntax: az datafactory list [--resource-group]
+  examples:
+  - summary: Factories_ListByResourceGroup
+    syntax: az datafactory list --resource-group "exampleResourceGroup"
+  - summary: Factories_List
+    syntax: az datafactory list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_show
+  name: az datafactory show
+  summary: Gets a factory.
+  description: ''
+  syntax: >-
+    az datafactory show --factory-name
+                        --resource-group
+                        [--if-none-match]
+  examples:
+  - summary: Factories_Get
+    syntax: az datafactory show --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the factory entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_update
+  name: az datafactory update
+  summary: Updates a factory.
+  description: ''
+  syntax: >-
+    az datafactory update --factory-name
+                          --resource-group
+                          [--tags]
+  examples:
+  - summary: Factories_Update
+    syntax: az datafactory update --name "exampleFactoryName" --tags exampleTag="exampleValue" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_datafactory_activity-run
+- az_datafactory_activity-run_query-by-pipeline-run
+- az_datafactory_configure-factory-repo
+- az_datafactory_create
+- az_datafactory_dataset
+- az_datafactory_dataset_create
+- az_datafactory_dataset_delete
+- az_datafactory_dataset_list
+- az_datafactory_dataset_show
+- az_datafactory_dataset_update
+- az_datafactory_delete
+- az_datafactory_get-data-plane-access
+- az_datafactory_get-git-hub-access-token
+- az_datafactory_integration-runtime
+- az_datafactory_integration-runtime_delete
+- az_datafactory_integration-runtime_get-connection-info
+- az_datafactory_integration-runtime_get-monitoring-data
+- az_datafactory_integration-runtime_get-status
+- az_datafactory_integration-runtime_linked-integration-runtime
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+- az_datafactory_integration-runtime_list
+- az_datafactory_integration-runtime_list-auth-key
+- az_datafactory_integration-runtime_managed
+- az_datafactory_integration-runtime_managed_create
+- az_datafactory_integration-runtime_regenerate-auth-key
+- az_datafactory_integration-runtime_remove-link
+- az_datafactory_integration-runtime_self-hosted
+- az_datafactory_integration-runtime_self-hosted_create
+- az_datafactory_integration-runtime_show
+- az_datafactory_integration-runtime_start
+- az_datafactory_integration-runtime_stop
+- az_datafactory_integration-runtime_sync-credentials
+- az_datafactory_integration-runtime_update
+- az_datafactory_integration-runtime_upgrade
+- az_datafactory_integration-runtime_wait
+- az_datafactory_integration-runtime-node
+- az_datafactory_integration-runtime-node_delete
+- az_datafactory_integration-runtime-node_get-ip-address
+- az_datafactory_integration-runtime-node_show
+- az_datafactory_integration-runtime-node_update
+- az_datafactory_linked-service
+- az_datafactory_linked-service_create
+- az_datafactory_linked-service_delete
+- az_datafactory_linked-service_list
+- az_datafactory_linked-service_show
+- az_datafactory_linked-service_update
+- az_datafactory_list
+- az_datafactory_pipeline
+- az_datafactory_pipeline_create
+- az_datafactory_pipeline_create-run
+- az_datafactory_pipeline_delete
+- az_datafactory_pipeline_list
+- az_datafactory_pipeline_show
+- az_datafactory_pipeline_update
+- az_datafactory_pipeline-run
+- az_datafactory_pipeline-run_cancel
+- az_datafactory_pipeline-run_query-by-factory
+- az_datafactory_pipeline-run_show
+- az_datafactory_show
+- az_datafactory_trigger
+- az_datafactory_trigger_create
+- az_datafactory_trigger_delete
+- az_datafactory_trigger_get-event-subscription-status
+- az_datafactory_trigger_list
+- az_datafactory_trigger_query-by-factory
+- az_datafactory_trigger_show
+- az_datafactory_trigger_start
+- az_datafactory_trigger_stop
+- az_datafactory_trigger_subscribe-to-event
+- az_datafactory_trigger_unsubscribe-from-event
+- az_datafactory_trigger_update
+- az_datafactory_trigger_wait
+- az_datafactory_trigger-run
+- az_datafactory_trigger-run_cancel
+- az_datafactory_trigger-run_query-by-factory
+- az_datafactory_trigger-run_rerun
+- az_datafactory_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage factory with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/activity-run.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/activity-run.yml
new file mode 100644
index 0000000000..5a4487a65f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/activity-run.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_activity-run
+name: az datafactory activity-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory activity-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage activity run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_activity-run_query-by-pipeline-run
+  name: az datafactory activity-run query-by-pipeline-run
+  summary: Query activity runs based on input filter conditions.
+  description: ''
+  syntax: >-
+    az datafactory activity-run query-by-pipeline-run --factory-name
+                                                      --last-updated-after
+                                                      --last-updated-before
+                                                      --resource-group
+                                                      --run-id
+                                                      [--continuation-token]
+                                                      [--filters]
+                                                      [--order-by]
+  examples:
+  - summary: ActivityRuns_QueryByPipelineRun
+    syntax: az datafactory activity-run query-by-pipeline-run --factory-name "exampleFactoryName" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+commands:
+- az_datafactory_activity-run_query-by-pipeline-run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage activity run with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/dataset.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/dataset.yml
new file mode 100644
index 0000000000..6d566d2665
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/dataset.yml
@@ -0,0 +1,226 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_dataset
+name: az datafactory dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage dataset with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_dataset_create
+  name: az datafactory dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset create --dataset-name
+                                  --factory-name
+                                  --properties
+                                  --resource-group
+                                  [--if-match]
+  examples:
+  - summary: Datasets_Create
+    syntax: az datafactory dataset create --properties "{\"type\":\"AzureBlob\",\"linkedServiceName\":{\"type\":\"LinkedServiceReference\",\"referenceName\":\"exampleLinkedService\"},\"parameters\":{\"MyFileName\":{\"type\":\"String\"},\"MyFolderPath\":{\"type\":\"String\"}},\"typeProperties\":{\"format\":{\"type\":\"TextFormat\"},\"fileName\":{\"type\":\"Expression\",\"value\":\"@dataset().MyFileName\"},\"folderPath\":{\"type\":\"Expression\",\"value\":\"@dataset().MyFolderPath\"}}}" --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Dataset properties. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the dataset entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_dataset_delete
+  name: az datafactory dataset delete
+  summary: Deletes a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset delete --dataset-name
+                                  --factory-name
+                                  --resource-group
+                                  [--yes]
+  examples:
+  - summary: Datasets_Delete
+    syntax: az datafactory dataset delete --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_dataset_list
+  name: az datafactory dataset list
+  summary: Lists datasets.
+  description: ''
+  syntax: >-
+    az datafactory dataset list --factory-name
+                                --resource-group
+  examples:
+  - summary: Datasets_ListByFactory
+    syntax: az datafactory dataset list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_dataset_show
+  name: az datafactory dataset show
+  summary: Gets a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset show --dataset-name
+                                --factory-name
+                                --resource-group
+                                [--if-none-match]
+  examples:
+  - summary: Datasets_Get
+    syntax: az datafactory dataset show --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the dataset entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_dataset_update
+  name: az datafactory dataset update
+  summary: Update a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset update --dataset-name
+                                  --factory-name
+                                  --linked-service-name
+                                  --resource-group
+                                  [--add]
+                                  [--annotations]
+                                  [--description]
+                                  [--folder]
+                                  [--force-string]
+                                  [--if-match]
+                                  [--if-none-match]
+                                  [--parameters]
+                                  [--remove]
+                                  [--schema]
+                                  [--set]
+                                  [--structure]
+  examples:
+  - summary: Datasets_Update
+    syntax: az datafactory dataset update --description "Example description" --linked-service-name "{\"type\":\"LinkedServiceReference\",\"referenceName\":\"exampleLinkedService\"}" --parameters "{\"MyFileName\":{\"type\":\"String\"},\"MyFolderPath\":{\"type\":\"String\"}}" --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name
+    summary: 'Linked service reference. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the Dataset. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Dataset description.
+    description: ''
+  - name: --folder
+    summary: The folder that this Dataset is in. If not specified, Dataset will appear at the root level.
+    description: >-
+      Usage: --folder name=XX
+
+
+      name: The name of the folder that this Dataset is in.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the dataset entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the dataset entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters for dataset. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --schema
+    summary: 'Columns that define the physical type schema of the dataset. Type: array (or Expression with resultType array), itemType: DatasetSchemaDataElement. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --structure
+    summary: 'Columns that define the structure of the dataset. Type: array (or Expression with resultType array), itemType: DatasetDataElement. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_dataset_create
+- az_datafactory_dataset_delete
+- az_datafactory_dataset_list
+- az_datafactory_dataset_show
+- az_datafactory_dataset_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage dataset with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime-node.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime-node.yml
new file mode 100644
index 0000000000..17a025d274
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime-node.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime-node
+name: az datafactory integration-runtime-node
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime-node** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime node with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime-node_delete
+  name: az datafactory integration-runtime-node delete
+  summary: Deletes a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node delete --factory-name
+                                                   --integration-runtime-name
+                                                   --node-name
+                                                   --resource-group
+                                                   [--yes]
+  examples:
+  - summary: IntegrationRuntimesNodes_Delete
+    syntax: az datafactory integration-runtime-node delete --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_get-ip-address
+  name: az datafactory integration-runtime-node get-ip-address
+  summary: Get the IP address of self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node get-ip-address --factory-name
+                                                           --integration-runtime-name
+                                                           --node-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimeNodes_GetIpAddress
+    syntax: az datafactory integration-runtime-node get-ip-address --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_show
+  name: az datafactory integration-runtime-node show
+  summary: Gets a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node show --factory-name
+                                                 --integration-runtime-name
+                                                 --node-name
+                                                 --resource-group
+  examples:
+  - summary: IntegrationRuntimeNodes_Get
+    syntax: az datafactory integration-runtime-node show --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_update
+  name: az datafactory integration-runtime-node update
+  summary: Updates a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node update --factory-name
+                                                   --integration-runtime-name
+                                                   --node-name
+                                                   --resource-group
+                                                   [--concurrent-jobs-limit]
+  examples:
+  - summary: IntegrationRuntimeNodes_Update
+    syntax: az datafactory integration-runtime-node update --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup" --concurrent-jobs-limit 2
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --concurrent-jobs-limit
+    summary: The number of concurrent jobs permitted to run on the integration runtime node. Values between 1 and maxConcurrentJobs(inclusive) are allowed.
+    description: ''
+commands:
+- az_datafactory_integration-runtime-node_delete
+- az_datafactory_integration-runtime-node_get-ip-address
+- az_datafactory_integration-runtime-node_show
+- az_datafactory_integration-runtime-node_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime node with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime.yml
new file mode 100644
index 0000000000..88b13e9bad
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime.yml
@@ -0,0 +1,480 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime
+name: az datafactory integration-runtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_delete
+  name: az datafactory integration-runtime delete
+  summary: Deletes an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime delete --factory-name
+                                              --integration-runtime-name
+                                              --resource-group
+                                              [--yes]
+  examples:
+  - summary: IntegrationRuntimes_Delete
+    syntax: az datafactory integration-runtime delete --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-connection-info
+  name: az datafactory integration-runtime get-connection-info
+  summary: Gets the on-premises integration runtime connection information for encrypting the on-premises data source credentials.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-connection-info --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetConnectionInfo
+    syntax: az datafactory integration-runtime get-connection-info --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-monitoring-data
+  name: az datafactory integration-runtime get-monitoring-data
+  summary: Get the integration runtime monitoring data, which includes the monitor data for all the nodes under this integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-monitoring-data --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetMonitoringData
+    syntax: az datafactory integration-runtime get-monitoring-data --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-status
+  name: az datafactory integration-runtime get-status
+  summary: Gets detailed status information for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-status --factory-name
+                                                  --integration-runtime-name
+                                                  --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetStatus
+    syntax: az datafactory integration-runtime get-status --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_list
+  name: az datafactory integration-runtime list
+  summary: Lists integration runtimes.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime list --factory-name
+                                            --resource-group
+  examples:
+  - summary: IntegrationRuntimes_ListByFactory
+    syntax: az datafactory integration-runtime list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_list-auth-key
+  name: az datafactory integration-runtime list-auth-key
+  summary: Retrieves the authentication keys for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime list-auth-key --factory-name
+                                                     --integration-runtime-name
+                                                     --resource-group
+  examples:
+  - summary: IntegrationRuntimes_ListAuthKeys
+    syntax: az datafactory integration-runtime list-auth-key --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_regenerate-auth-key
+  name: az datafactory integration-runtime regenerate-auth-key
+  summary: Regenerates the authentication key for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime regenerate-auth-key --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+                                                           [--key-name {authKey1, authKey2}]
+  examples:
+  - summary: IntegrationRuntimes_RegenerateAuthKey
+    syntax: az datafactory integration-runtime regenerate-auth-key --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --key-name "authKey2" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: authKey1, authKey2
+    summary: The name of the authentication key to regenerate.
+    description: ''
+- uid: az_datafactory_integration-runtime_remove-link
+  name: az datafactory integration-runtime remove-link
+  summary: Remove all linked integration runtimes under specific data factory in a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime remove-link --factory-name
+                                                   --integration-runtime-name
+                                                   --linked-factory-name
+                                                   --resource-group
+  examples:
+  - summary: IntegrationRuntimes_Upgrade
+    syntax: az datafactory integration-runtime remove-link --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --linked-factory-name "exampleFactoryName-linked" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --linked-factory-name
+    summary: The data factory name for linked integration runtime.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_show
+  name: az datafactory integration-runtime show
+  summary: Gets an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime show --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--if-none-match]
+  examples:
+  - summary: IntegrationRuntimes_Get
+    syntax: az datafactory integration-runtime show --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_integration-runtime_start
+  name: az datafactory integration-runtime start
+  summary: Starts a ManagedReserved type integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime start --factory-name
+                                             --integration-runtime-name
+                                             --resource-group
+                                             [--no-wait]
+  examples:
+  - summary: IntegrationRuntimes_Start
+    syntax: az datafactory integration-runtime start --factory-name "exampleFactoryName" --name "exampleManagedIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_integration-runtime_stop
+  name: az datafactory integration-runtime stop
+  summary: Stops a ManagedReserved type integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime stop --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--no-wait]
+  examples:
+  - summary: IntegrationRuntimes_Stop
+    syntax: az datafactory integration-runtime stop --factory-name "exampleFactoryName" --name "exampleManagedIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_integration-runtime_sync-credentials
+  name: az datafactory integration-runtime sync-credentials
+  summary: Force the integration runtime to synchronize credentials across integration runtime nodes, and this will override the credentials across all worker nodes with those available on the dispatcher node. If you already have the latest credential backup file, you should manually import it (preferred) on any self-hosted integration runtime node than using this API directly.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime sync-credentials --factory-name
+                                                        --integration-runtime-name
+                                                        --resource-group
+  examples:
+  - summary: IntegrationRuntimes_SyncCredentials
+    syntax: az datafactory integration-runtime sync-credentials --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_update
+  name: az datafactory integration-runtime update
+  summary: Updates an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime update --factory-name
+                                              --integration-runtime-name
+                                              --resource-group
+                                              [--auto-update {Off, On}]
+                                              [--update-delay-offset]
+  examples:
+  - summary: IntegrationRuntimes_Update
+    syntax: az datafactory integration-runtime update --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup" --auto-update "Off" --update-delay-offset "\"PT3H\""
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enables or disables the auto-update feature of the self-hosted integration runtime. See https://go.microsoft.com/fwlink/?linkid=854189.
+    description: ''
+  - name: --update-delay-offset
+    summary: The time offset (in hours) in the day, e.g., PT03H is 3 hours. The integration runtime auto update will happen on that time.
+    description: ''
+- uid: az_datafactory_integration-runtime_upgrade
+  name: az datafactory integration-runtime upgrade
+  summary: Upgrade self-hosted integration runtime to latest version if availability.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime upgrade --factory-name
+                                               --integration-runtime-name
+                                               --resource-group
+  examples:
+  - summary: IntegrationRuntimes_Upgrade
+    syntax: az datafactory integration-runtime upgrade --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_wait
+  name: az datafactory integration-runtime wait
+  summary: Place the CLI in a waiting state until a condition of the datafactory integration-runtime is met.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime wait --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--created]
+                                            [--custom]
+                                            [--deleted]
+                                            [--exists]
+                                            [--if-none-match]
+                                            [--interval]
+                                            [--timeout]
+                                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datafactory integration-runtime is successfully created.
+    syntax: az datafactory integration-runtime wait --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup" --created
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datafactory_integration-runtime_delete
+- az_datafactory_integration-runtime_get-connection-info
+- az_datafactory_integration-runtime_get-monitoring-data
+- az_datafactory_integration-runtime_get-status
+- az_datafactory_integration-runtime_linked-integration-runtime
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+- az_datafactory_integration-runtime_list
+- az_datafactory_integration-runtime_list-auth-key
+- az_datafactory_integration-runtime_managed
+- az_datafactory_integration-runtime_managed_create
+- az_datafactory_integration-runtime_regenerate-auth-key
+- az_datafactory_integration-runtime_remove-link
+- az_datafactory_integration-runtime_self-hosted
+- az_datafactory_integration-runtime_self-hosted_create
+- az_datafactory_integration-runtime_show
+- az_datafactory_integration-runtime_start
+- az_datafactory_integration-runtime_stop
+- az_datafactory_integration-runtime_sync-credentials
+- az_datafactory_integration-runtime_update
+- az_datafactory_integration-runtime_upgrade
+- az_datafactory_integration-runtime_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml
new file mode 100644
index 0000000000..748df0e7d1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_linked-integration-runtime
+name: az datafactory integration-runtime linked-integration-runtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime linked-integration-runtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group linked-integration-runtime.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_linked-integration-runtime_create
+  name: az datafactory integration-runtime linked-integration-runtime create
+  summary: Create a linked integration runtime entry in a shared integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime linked-integration-runtime create --factory-name
+                                                                         --integration-runtime-name
+                                                                         --resource-group
+                                                                         [--data-factory-name]
+                                                                         [--location]
+                                                                         [--name]
+                                                                         [--subscription-id]
+  examples:
+  - summary: IntegrationRuntimes_CreateLinkedIntegrationRuntime
+    syntax: az datafactory integration-runtime linked-integration-runtime create --name "bfa92911-9fb6-4fbe-8f23-beae87bc1c83" --location "West US" --data-factory-name "e9955d6d-56ea-4be3-841c-52a12c1a9981" --subscription-id "061774c7-4b5a-4159-a55b-365581830283" --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-factory-name
+    summary: The name of the data factory that the linked integration runtime belongs to.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: The name of the linked integration runtime.
+    description: ''
+  - name: --subscription-id
+    summary: The ID of the subscription that the linked integration runtime belongs to.
+    description: ''
+commands:
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group linked-integration-runtime.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/managed.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/managed.yml
new file mode 100644
index 0000000000..75036b9269
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/managed.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_managed
+name: az datafactory integration-runtime managed
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime managed** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group managed.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_managed_create
+  name: az datafactory integration-runtime managed create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime managed create --factory-name
+                                                      --integration-runtime-name
+                                                      --resource-group
+                                                      [--compute-properties]
+                                                      [--description]
+                                                      [--if-match]
+                                                      [--ssis-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compute-properties
+    summary: 'The compute resource for managed integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --ssis-properties
+    summary: 'SSIS properties for managed integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_integration-runtime_managed_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group managed.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml
new file mode 100644
index 0000000000..1f867dcd53
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_self-hosted
+name: az datafactory integration-runtime self-hosted
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime self-hosted** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group self-hosted.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_self-hosted_create
+  name: az datafactory integration-runtime self-hosted create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime self-hosted create --factory-name
+                                                          --integration-runtime-name
+                                                          --resource-group
+                                                          [--description]
+                                                          [--if-match]
+                                                          [--linked-info]
+  examples:
+  - summary: IntegrationRuntimes_Create
+    syntax: az datafactory integration-runtime self-hosted create --factory-name "exampleFactoryName" --description "A selfhosted integration runtime" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --linked-info
+    summary: 'The base definition of a linked integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_integration-runtime_self-hosted_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group self-hosted.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/linked-service.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/linked-service.yml
new file mode 100644
index 0000000000..5db4a171b3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/linked-service.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_linked-service
+name: az datafactory linked-service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory linked-service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage linked service with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_linked-service_create
+  name: az datafactory linked-service create
+  summary: Create a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service create --factory-name
+                                         --linked-service-name
+                                         --properties
+                                         --resource-group
+                                         [--if-match]
+  examples:
+  - summary: LinkedServices_Create
+    syntax: az datafactory linked-service create --factory-name "exampleFactoryName" --properties "{\"type\":\"AzureStorage\",\"typeProperties\":{\"connectionString\":{\"type\":\"SecureString\",\"value\":\"DefaultEndpointsProtocol=https;AccountName=examplestorageaccount;AccountKey=<storage key>\"}}}" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Properties of linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the linkedService entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_linked-service_delete
+  name: az datafactory linked-service delete
+  summary: Deletes a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service delete --factory-name
+                                         --linked-service-name
+                                         --resource-group
+                                         [--yes]
+  examples:
+  - summary: LinkedServices_Delete
+    syntax: az datafactory linked-service delete --factory-name "exampleFactoryName" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_linked-service_list
+  name: az datafactory linked-service list
+  summary: Lists linked services.
+  description: ''
+  syntax: >-
+    az datafactory linked-service list --factory-name
+                                       --resource-group
+  examples:
+  - summary: LinkedServices_ListByFactory
+    syntax: az datafactory linked-service list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_linked-service_show
+  name: az datafactory linked-service show
+  summary: Gets a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service show --factory-name
+                                       --linked-service-name
+                                       --resource-group
+                                       [--if-none-match]
+  examples:
+  - summary: LinkedServices_Get
+    syntax: az datafactory linked-service show --factory-name "exampleFactoryName" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the linked service entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_linked-service_update
+  name: az datafactory linked-service update
+  summary: Update a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service update --factory-name
+                                         --linked-service-name
+                                         --resource-group
+                                         [--add]
+                                         [--annotations]
+                                         [--connect-via]
+                                         [--description]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--parameters]
+                                         [--remove]
+                                         [--set]
+  examples:
+  - summary: LinkedServices_Update
+    syntax: az datafactory linked-service update --factory-name "exampleFactoryName" --description "Example description" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --connect-via
+    summary: 'The integration runtime reference. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Linked service description.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the linkedService entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the linked service entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters for linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_datafactory_linked-service_create
+- az_datafactory_linked-service_delete
+- az_datafactory_linked-service_list
+- az_datafactory_linked-service_show
+- az_datafactory_linked-service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage linked service with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/pipeline-run.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/pipeline-run.yml
new file mode 100644
index 0000000000..812414abac
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/pipeline-run.yml
@@ -0,0 +1,147 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_pipeline-run
+name: az datafactory pipeline-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory pipeline-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage pipeline run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_pipeline-run_cancel
+  name: az datafactory pipeline-run cancel
+  summary: Cancel a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run cancel --factory-name
+                                       --resource-group
+                                       --run-id
+                                       [--is-recursive {false, true}]
+  examples:
+  - summary: PipelineRuns_Cancel
+    syntax: az datafactory pipeline-run cancel --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "16ac5348-ff82-4f95-a80d-638c1d47b721"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  optionalParameters:
+  - name: --is-recursive
+    parameterValueGroup: false, true
+    summary: If true, cancel all the Child pipelines that are triggered by the current pipeline.
+    description: ''
+- uid: az_datafactory_pipeline-run_query-by-factory
+  name: az datafactory pipeline-run query-by-factory
+  summary: Query pipeline runs in the factory based on input filter conditions.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run query-by-factory --factory-name
+                                                 --last-updated-after
+                                                 --last-updated-before
+                                                 --resource-group
+                                                 [--continuation-token]
+                                                 [--filters]
+                                                 [--order-by]
+  examples:
+  - summary: PipelineRuns_QueryByFactory
+    syntax: az datafactory pipeline-run query-by-factory --factory-name "exampleFactoryName" --filters operand="PipelineName" operator="Equals" values="examplePipeline" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+- uid: az_datafactory_pipeline-run_show
+  name: az datafactory pipeline-run show
+  summary: Get a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run show --factory-name
+                                     --resource-group
+                                     --run-id
+  examples:
+  - summary: PipelineRuns_Get
+    syntax: az datafactory pipeline-run show --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+commands:
+- az_datafactory_pipeline-run_cancel
+- az_datafactory_pipeline-run_query-by-factory
+- az_datafactory_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage pipeline run with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/pipeline.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/pipeline.yml
new file mode 100644
index 0000000000..aa76dd493e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/pipeline.yml
@@ -0,0 +1,277 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_pipeline
+name: az datafactory pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage pipeline with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_pipeline_create
+  name: az datafactory pipeline create
+  summary: Create a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline create --factory-name
+                                   --name
+                                   --pipeline
+                                   --resource-group
+                                   [--if-match]
+  examples:
+  - summary: Pipelines_Create
+    syntax: az datafactory pipeline create --factory-name "exampleFactoryName" --pipeline "{\"activities\":[{\"name\":\"ExampleForeachActivity\",\"type\":\"ForEach\",\"typeProperties\":{\"activities\":[{\"name\":\"ExampleCopyActivity\",\"type\":\"Copy\",\"inputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":\"examplecontainer.csv\",\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"outputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":{\"type\":\"Expression\",\"value\":\"@item()\"},\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"typeProperties\":{\"dataIntegrationUnits\":32,\"sink\":{\"type\":\"BlobSink\"},\"source\":{\"type\":\"BlobSource\"}}}],\"isSequential\":true,\"items\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.OutputBlobNameList\"}}}],\"parameters\":{\"JobId\":{\"type\":\"String\"},\"OutputBlobNameList\":{\"type\":\"Array\"}},\"variables\":{\"TestVariableArray\":{\"type\":\"Array\"}},\"runDimensions\":{\"JobId\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.JobId\"}},\"duration\":\"0.00:10:00\"}" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --pipeline
+    summary: 'Pipeline resource definition. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the pipeline entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_pipeline_create-run
+  name: az datafactory pipeline create-run
+  summary: Creates a run of a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline create-run --factory-name
+                                       --name
+                                       --resource-group
+                                       [--is-recovery {false, true}]
+                                       [--parameters]
+                                       [--reference-pipeline-run-id]
+                                       [--start-activity-name]
+                                       [--start-from-failure {false, true}]
+  examples:
+  - summary: Pipelines_CreateRun
+    syntax: az datafactory pipeline create-run --factory-name "exampleFactoryName" --parameters "{\"OutputBlobNameList\":[\"exampleoutput.csv\"]}" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --is-recovery
+    parameterValueGroup: false, true
+    summary: Recovery mode flag. If recovery mode is set to true, the specified referenced pipeline run and the new run will be grouped under the same groupId.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters of the pipeline run. These parameters will be used only if the runId is not specified. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --reference-pipeline-run-id
+    summary: The pipeline run identifier. If run ID is specified the parameters of the specified run will be used to create a new run.
+    description: ''
+  - name: --start-activity-name
+    summary: In recovery mode, the rerun will start from this activity. If not specified, all activities will run.
+    description: ''
+  - name: --start-from-failure
+    parameterValueGroup: false, true
+    summary: In recovery mode, if set to true, the rerun will start from failed activities. The property will be used only if startActivityName is not specified.
+    description: ''
+- uid: az_datafactory_pipeline_delete
+  name: az datafactory pipeline delete
+  summary: Deletes a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline delete --factory-name
+                                   --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Pipelines_Delete
+    syntax: az datafactory pipeline delete --factory-name "exampleFactoryName" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_pipeline_list
+  name: az datafactory pipeline list
+  summary: Lists pipelines.
+  description: ''
+  syntax: >-
+    az datafactory pipeline list --factory-name
+                                 --resource-group
+  examples:
+  - summary: Pipelines_ListByFactory
+    syntax: az datafactory pipeline list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_pipeline_show
+  name: az datafactory pipeline show
+  summary: Gets a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline show --factory-name
+                                 --name
+                                 --resource-group
+                                 [--if-none-match]
+  examples:
+  - summary: Pipelines_Get
+    syntax: az datafactory pipeline show --factory-name "exampleFactoryName" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the pipeline entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_pipeline_update
+  name: az datafactory pipeline update
+  summary: Update a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline update --factory-name
+                                   --name
+                                   --resource-group
+                                   [--activities]
+                                   [--add]
+                                   [--annotations]
+                                   [--concurrency]
+                                   [--description]
+                                   [--duration]
+                                   [--folder-name]
+                                   [--force-string]
+                                   [--if-match]
+                                   [--if-none-match]
+                                   [--parameters]
+                                   [--remove]
+                                   [--run-dimensions]
+                                   [--set]
+                                   [--variables]
+  examples:
+  - summary: Pipelines_Update
+    syntax: az datafactory pipeline update --factory-name "exampleFactoryName" --description "Example description" --activities "[{\"name\":\"ExampleForeachActivity\",\"type\":\"ForEach\",\"typeProperties\":{\"activities\":[{\"name\":\"ExampleCopyActivity\",\"type\":\"Copy\",\"inputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":\"examplecontainer.csv\",\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"outputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":{\"type\":\"Expression\",\"value\":\"@item()\"},\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"typeProperties\":{\"dataIntegrationUnits\":32,\"sink\":{\"type\":\"BlobSink\"},\"source\":{\"type\":\"BlobSource\"}}}],\"isSequential\":true,\"items\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.OutputBlobNameList\"}}}]" --parameters "{\"OutputBlobNameList\":{\"type\":\"Array\"}}" --duration "0.00:10:00" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --activities
+    summary: 'List of activities in pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the Pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --concurrency
+    summary: The max number of concurrent runs for the pipeline.
+    description: ''
+  - name: --description
+    summary: The description of the pipeline.
+    description: ''
+  - name: --duration
+    summary: 'TimeSpan value, after which an Azure Monitoring Metric is fired. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --folder-name
+    summary: The name of the folder that this Pipeline is in.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the pipeline entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the pipeline entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'List of parameters for pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --run-dimensions
+    summary: 'Dimensions emitted by Pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --variables
+    summary: 'List of variables for pipeline. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_pipeline_create
+- az_datafactory_pipeline_create-run
+- az_datafactory_pipeline_delete
+- az_datafactory_pipeline_list
+- az_datafactory_pipeline_show
+- az_datafactory_pipeline_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage pipeline with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/trigger-run.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/trigger-run.yml
new file mode 100644
index 0000000000..76ef739154
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/trigger-run.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_trigger-run
+name: az datafactory trigger-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory trigger-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage trigger run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_trigger-run_cancel
+  name: az datafactory trigger-run cancel
+  summary: Cancel a single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run cancel --factory-name
+                                      --resource-group
+                                      --run-id
+                                      --trigger-name
+  examples:
+  - summary: Triggers_Cancel
+    syntax: az datafactory trigger-run cancel --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --trigger-name
+    summary: The trigger name.
+    description: ''
+- uid: az_datafactory_trigger-run_query-by-factory
+  name: az datafactory trigger-run query-by-factory
+  summary: Query trigger runs.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run query-by-factory --factory-name
+                                                --last-updated-after
+                                                --last-updated-before
+                                                --resource-group
+                                                [--continuation-token]
+                                                [--filters]
+                                                [--order-by]
+  examples:
+  - summary: TriggerRuns_QueryByFactory
+    syntax: az datafactory trigger-run query-by-factory --factory-name "exampleFactoryName" --filters operand="TriggerName" operator="Equals" values="exampleTrigger" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+- uid: az_datafactory_trigger-run_rerun
+  name: az datafactory trigger-run rerun
+  summary: Rerun single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run rerun --factory-name
+                                     --resource-group
+                                     --run-id
+                                     --trigger-name
+  examples:
+  - summary: Triggers_Rerun
+    syntax: az datafactory trigger-run rerun --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --trigger-name
+    summary: The trigger name.
+    description: ''
+commands:
+- az_datafactory_trigger-run_cancel
+- az_datafactory_trigger-run_query-by-factory
+- az_datafactory_trigger-run_rerun
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage trigger run with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datafactory/trigger.yml b/2017-03-09-profile/docs-ref-autogen/datafactory/trigger.yml
new file mode 100644
index 0000000000..1da72fb8c6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datafactory/trigger.yml
@@ -0,0 +1,435 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_trigger
+name: az datafactory trigger
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory trigger** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage trigger with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_trigger_create
+  name: az datafactory trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger create --factory-name
+                                  --name
+                                  --properties
+                                  --resource-group
+                                  [--if-match]
+  examples:
+  - summary: Triggers_Create
+    syntax: az datafactory trigger create --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --properties "{\"type\":\"ScheduleTrigger\",\"pipelines\":[{\"parameters\":{\"OutputBlobNameList\":[\"exampleoutput.csv\"]},\"pipelineReference\":{\"type\":\"PipelineReference\",\"referenceName\":\"examplePipeline\"}}],\"typeProperties\":{\"recurrence\":{\"endTime\":\"2018-06-16T00:55:13.8441801Z\",\"frequency\":\"Minute\",\"interval\":4,\"startTime\":\"2018-06-16T00:39:13.8441801Z\",\"timeZone\":\"UTC\"}}}" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Properties of the trigger. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the trigger entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_trigger_delete
+  name: az datafactory trigger delete
+  summary: Deletes a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger delete --factory-name
+                                  --name
+                                  --resource-group
+                                  [--yes]
+  examples:
+  - summary: Triggers_Delete
+    syntax: az datafactory trigger delete --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_trigger_get-event-subscription-status
+  name: az datafactory trigger get-event-subscription-status
+  summary: Get a trigger's event subscription status.
+  description: ''
+  syntax: >-
+    az datafactory trigger get-event-subscription-status --factory-name
+                                                         --name
+                                                         --resource-group
+  examples:
+  - summary: Triggers_GetEventSubscriptionStatus
+    syntax: az datafactory trigger get-event-subscription-status --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_trigger_list
+  name: az datafactory trigger list
+  summary: Lists triggers.
+  description: ''
+  syntax: >-
+    az datafactory trigger list --factory-name
+                                --resource-group
+  examples:
+  - summary: Triggers_ListByFactory
+    syntax: az datafactory trigger list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_trigger_query-by-factory
+  name: az datafactory trigger query-by-factory
+  summary: Query triggers.
+  description: ''
+  syntax: >-
+    az datafactory trigger query-by-factory --factory-name
+                                            --resource-group
+                                            [--continuation-token]
+                                            [--parent-trigger-name]
+  examples:
+  - summary: Triggers_QueryByFactory
+    syntax: az datafactory trigger query-by-factory --factory-name "exampleFactoryName" --parent-trigger-name "exampleTrigger" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --parent-trigger-name
+    summary: The name of the parent TumblingWindowTrigger to get the child rerun triggers.
+    description: ''
+- uid: az_datafactory_trigger_show
+  name: az datafactory trigger show
+  summary: Gets a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger show --factory-name
+                                --name
+                                --resource-group
+                                [--if-none-match]
+  examples:
+  - summary: Triggers_Get
+    syntax: az datafactory trigger show --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_trigger_start
+  name: az datafactory trigger start
+  summary: Starts a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger start --factory-name
+                                 --name
+                                 --resource-group
+                                 [--no-wait]
+  examples:
+  - summary: Triggers_Start
+    syntax: az datafactory trigger start --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_stop
+  name: az datafactory trigger stop
+  summary: Stops a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger stop --factory-name
+                                --name
+                                --resource-group
+                                [--no-wait]
+  examples:
+  - summary: Triggers_Stop
+    syntax: az datafactory trigger stop --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_subscribe-to-event
+  name: az datafactory trigger subscribe-to-event
+  summary: Subscribe event trigger to events.
+  description: ''
+  syntax: >-
+    az datafactory trigger subscribe-to-event --factory-name
+                                              --name
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: Triggers_SubscribeToEvents
+    syntax: az datafactory trigger subscribe-to-event --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_unsubscribe-from-event
+  name: az datafactory trigger unsubscribe-from-event
+  summary: Unsubscribe event trigger from events.
+  description: ''
+  syntax: >-
+    az datafactory trigger unsubscribe-from-event --factory-name
+                                                  --name
+                                                  --resource-group
+                                                  [--no-wait]
+  examples:
+  - summary: Triggers_UnsubscribeFromEvents
+    syntax: az datafactory trigger unsubscribe-from-event --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_update
+  name: az datafactory trigger update
+  summary: Update a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger update --factory-name
+                                  --name
+                                  --resource-group
+                                  [--add]
+                                  [--annotations]
+                                  [--description]
+                                  [--force-string]
+                                  [--if-match]
+                                  [--if-none-match]
+                                  [--remove]
+                                  [--set]
+  examples:
+  - summary: Triggers_Update
+    syntax: az datafactory trigger update --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --description "Example description" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the trigger. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Trigger description.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the trigger entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_datafactory_trigger_wait
+  name: az datafactory trigger wait
+  summary: Place the CLI in a waiting state until a condition of the datafactory trigger is met.
+  description: ''
+  syntax: >-
+    az datafactory trigger wait --factory-name
+                                --name
+                                --resource-group
+                                [--created]
+                                [--custom]
+                                [--deleted]
+                                [--exists]
+                                [--if-none-match]
+                                [--interval]
+                                [--timeout]
+                                [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datafactory trigger is successfully created.
+    syntax: az datafactory trigger wait --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger" --created
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datafactory_trigger_create
+- az_datafactory_trigger_delete
+- az_datafactory_trigger_get-event-subscription-status
+- az_datafactory_trigger_list
+- az_datafactory_trigger_query-by-factory
+- az_datafactory_trigger_show
+- az_datafactory_trigger_start
+- az_datafactory_trigger_stop
+- az_datafactory_trigger_subscribe-to-event
+- az_datafactory_trigger_unsubscribe-from-event
+- az_datafactory_trigger_update
+- az_datafactory_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage trigger with datafactory.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare.yml b/2017-03-09-profile/docs-ref-autogen/datashare.yml
new file mode 100644
index 0000000000..8402be1519
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare.yml
@@ -0,0 +1,265 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare
+name: az datashare
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare.
+description: For a summary of CLI commands for Data Share, see https://docs.microsoft.com/azure/data-share/azure-cli-references-for-data-share.
+directCommands:
+- uid: az_datashare_create
+  name: az datashare create
+  summary: Create a datashare.
+  description: ''
+  syntax: >-
+    az datashare create --account-name
+                        --name
+                        --resource-group
+                        [--description]
+                        [--share-kind {CopyBased, InPlace}]
+                        [--terms]
+  examples:
+  - summary: Create a datashare
+    syntax: az datashare create --account-name MyAccount --resource-group MyResourceGroup --description "share description" --share-kind "CopyBased" --terms "Confidential" --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Share description.
+    description: ''
+  - name: --share-kind
+    parameterValueGroup: CopyBased, InPlace
+    summary: Share kind.
+    description: ''
+  - name: --terms
+    summary: Share terms.
+    description: ''
+- uid: az_datashare_delete
+  name: az datashare delete
+  summary: Delete a datashare.
+  description: ''
+  syntax: >-
+    az datashare delete --account-name
+                        --name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: Delete a datashare
+    syntax: az datashare delete --account-name MyAccount --resource-group MyResourceGroup --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_list
+  name: az datashare list
+  summary: List datashares in an account.
+  description: ''
+  syntax: >-
+    az datashare list --account-name
+                      --resource-group
+  examples:
+  - summary: List datashares
+    syntax: az datashare list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_show
+  name: az datashare show
+  summary: Show a datashare.
+  description: ''
+  syntax: >-
+    az datashare show --account-name
+                      --name
+                      --resource-group
+  examples:
+  - summary: Show a datashare
+    syntax: az datashare show --account-name MyAccount --resource-group MyResourceGroup --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_wait
+  name: az datashare wait
+  summary: Place the CLI in a waiting state until a condition of the datashare is met.
+  description: ''
+  syntax: >-
+    az datashare wait --account-name
+                      --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare is successfully provisioned.
+    syntax: az datashare wait --account-name MyAccount --resource-group MyResourceGroup --name MyShare --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_account
+- az_datashare_account_create
+- az_datashare_account_delete
+- az_datashare_account_list
+- az_datashare_account_show
+- az_datashare_account_update
+- az_datashare_account_wait
+- az_datashare_consumer
+- az_datashare_consumer_dataset-mapping
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+- az_datashare_consumer_invitation
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+- az_datashare_consumer_share-subscription
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+- az_datashare_consumer_trigger
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+- az_datashare_create
+- az_datashare_dataset
+- az_datashare_dataset_create
+- az_datashare_dataset_delete
+- az_datashare_dataset_list
+- az_datashare_dataset_show
+- az_datashare_dataset_wait
+- az_datashare_delete
+- az_datashare_invitation
+- az_datashare_invitation_create
+- az_datashare_invitation_delete
+- az_datashare_invitation_list
+- az_datashare_invitation_show
+- az_datashare_list
+- az_datashare_provider-share-subscription
+- az_datashare_provider-share-subscription_list
+- az_datashare_provider-share-subscription_reinstate
+- az_datashare_provider-share-subscription_revoke
+- az_datashare_provider-share-subscription_show
+- az_datashare_provider-share-subscription_wait
+- az_datashare_show
+- az_datashare_synchronization
+- az_datashare_synchronization_list
+- az_datashare_synchronization_list-detail
+- az_datashare_synchronization-setting
+- az_datashare_synchronization-setting_create
+- az_datashare_synchronization-setting_delete
+- az_datashare_synchronization-setting_list
+- az_datashare_synchronization-setting_show
+- az_datashare_synchronization-setting_wait
+- az_datashare_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: For a summary of CLI commands for Data Share, see https://docs.microsoft.com/azure/data-share/azure-cli-references-for-data-share.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/account.yml b/2017-03-09-profile/docs-ref-autogen/datashare/account.yml
new file mode 100644
index 0000000000..a5e5d542d2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/account.yml
@@ -0,0 +1,199 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_account
+name: az datashare account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare accounts.
+description: ''
+directCommands:
+- uid: az_datashare_account_create
+  name: az datashare account create
+  summary: Create an account.
+  description: ''
+  syntax: >-
+    az datashare account create --name
+                                --resource-group
+                                [--location]
+                                [--no-wait]
+                                [--tags]
+  examples:
+  - summary: Create an account
+    syntax: az datashare account create --location "West US 2" --tags tag1=Red tag2=White --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datashare_account_delete
+  name: az datashare account delete
+  summary: Delete an account.
+  description: ''
+  syntax: >-
+    az datashare account delete --name
+                                --resource-group
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete the account
+    syntax: az datashare account delete --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_account_list
+  name: az datashare account list
+  summary: List datashare accounts.
+  description: ''
+  syntax: az datashare account list [--resource-group]
+  examples:
+  - summary: List accounts by resource group
+    syntax: az datashare account list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_account_show
+  name: az datashare account show
+  summary: Show an account.
+  description: ''
+  syntax: >-
+    az datashare account show --name
+                              --resource-group
+  examples:
+  - summary: Show account information
+    syntax: az datashare account show --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_account_update
+  name: az datashare account update
+  summary: Patch an account.
+  description: ''
+  syntax: >-
+    az datashare account update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update account tags
+    syntax: az datashare account update --name MyAccount --tags tag1=Red tag2=White --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datashare_account_wait
+  name: az datashare account wait
+  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
+  description: ''
+  syntax: >-
+    az datashare account wait --name
+                              --resource-group
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare account is successfully provisioned.
+    syntax: az datashare account wait --name MyAccount --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_account_create
+- az_datashare_account_delete
+- az_datashare_account_list
+- az_datashare_account_show
+- az_datashare_account_update
+- az_datashare_account_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage datashare accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/consumer.yml b/2017-03-09-profile/docs-ref-autogen/datashare/consumer.yml
new file mode 100644
index 0000000000..cfc6a3446c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/consumer.yml
@@ -0,0 +1,56 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer
+name: az datashare consumer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare.
+description: ''
+commands:
+- az_datashare_consumer_dataset-mapping
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+- az_datashare_consumer_invitation
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+- az_datashare_consumer_share-subscription
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+- az_datashare_consumer_trigger
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/consumer/dataset-mapping.yml b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/dataset-mapping.yml
new file mode 100644
index 0000000000..e5e22266e1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/dataset-mapping.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_dataset-mapping
+name: az datashare consumer dataset-mapping
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer dataset-mapping** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare dataset mappings.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_dataset-mapping_create
+  name: az datashare consumer dataset-mapping create
+  summary: Create a dataSet mapping.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping create --account-name
+                                                 --mapping
+                                                 --name
+                                                 --resource-group
+                                                 --share-subscription-name
+  examples:
+  - summary: Create a Blob dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
+  - summary: Create a BlobFolder dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"BlobFolder\",\"properties\":{\"containerName\":\"C2\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"prefix\":\"folder21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage3\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
+  - summary: Create a SqlDBTable dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDBTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"databaseName\":\"Database1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
+  - summary: Create a AdlsGen2File dataset mapping
+    syntax: 'az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"AdlsGen2File\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"fileSystem\": \"fileSystem\",\"outputType\":\"Csv\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a SqlDWTable dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"dataWarehouseName\":\"DataWarehouse1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --mapping
+    summary: Dataset mapping in JSON string or path to JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_delete
+  name: az datashare consumer dataset-mapping delete
+  summary: Delete a dataset mapping in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping delete --account-name
+                                                 --name
+                                                 --resource-group
+                                                 --share-subscription-name
+                                                 [--yes]
+  examples:
+  - summary: Delete a dataset mapping
+    syntax: az datashare consumer dataset-mapping delete --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_list
+  name: az datashare consumer dataset-mapping list
+  summary: List dataset mappings in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping list --account-name
+                                               --resource-group
+                                               --share-subscription-name
+  examples:
+  - summary: List dataset mappings
+    syntax: az datashare consumer dataset-mapping list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_show
+  name: az datashare consumer dataset-mapping show
+  summary: Show a dataset mapping in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping show --account-name
+                                               --name
+                                               --resource-group
+                                               --share-subscription-name
+  examples:
+  - summary: Show a dataset mapping
+    syntax: az datashare consumer dataset-mapping show --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+commands:
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare dataset mappings.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/consumer/invitation.yml b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/invitation.yml
new file mode 100644
index 0000000000..cb12ce6c0e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/invitation.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_invitation
+name: az datashare consumer invitation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer invitation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare invitations.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_invitation_list
+  name: az datashare consumer invitation list
+  summary: List received invitations.
+  description: ''
+  syntax: az datashare consumer invitation list
+  examples:
+  - summary: List invitations
+    syntax: az datashare consumer invitation list
+- uid: az_datashare_consumer_invitation_reject
+  name: az datashare consumer invitation reject
+  summary: Reject an invitation.
+  description: ''
+  syntax: >-
+    az datashare consumer invitation reject --invitation-id
+                                            --location
+  examples:
+  - summary: Reject an invitation
+    syntax: az datashare consumer invitation reject --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --invitation-id
+    summary: An invitation id.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_datashare_consumer_invitation_show
+  name: az datashare consumer invitation show
+  summary: Show a received invitation.
+  description: ''
+  syntax: >-
+    az datashare consumer invitation show --invitation-id
+                                          --location
+  examples:
+  - summary: Show an invitation
+    syntax: az datashare consumer invitation show --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --invitation-id
+    summary: An invitation id.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare invitations.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/consumer/share-subscription.yml b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/share-subscription.yml
new file mode 100644
index 0000000000..d0ceefd8c0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/share-subscription.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_share-subscription
+name: az datashare consumer share-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer share-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare share subscriptions.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_share-subscription_create
+  name: az datashare consumer share-subscription create
+  summary: Create a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription create --account-name
+                                                    --invitation-id
+                                                    --name
+                                                    --resource-group
+                                                    --source-share-location
+  examples:
+  - summary: Create a share subscription
+    syntax: az datashare consumer share-subscription create --account-name MyAccount --resource-group MyResourceGroup --invitation-id 00000000-0000-0000-0000-000000000000 --source-share-location "eastus2" --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --invitation-id
+    summary: The invitation id.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source-share-location
+    summary: Source share location.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_delete
+  name: az datashare consumer share-subscription delete
+  summary: Delete a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription delete --account-name
+                                                    --name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--yes]
+  examples:
+  - summary: Delete a share subscription
+    syntax: az datashare consumer share-subscription delete --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list
+  name: az datashare consumer share-subscription list
+  summary: List share subscriptions in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list --account-name
+                                                  --resource-group
+  examples:
+  - summary: List share subscriptions
+    syntax: az datashare consumer share-subscription list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list-source-dataset
+  name: az datashare consumer share-subscription list-source-dataset
+  summary: List source datasets of a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list-source-dataset --account-name
+                                                                 --resource-group
+                                                                 --share-subscription-name
+  examples:
+  - summary: List source datasets
+    syntax: az datashare consumer share-subscription list-source-dataset --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+  name: az datashare consumer share-subscription list-source-share-synchronization-setting
+  summary: List synchronization settings set on a share.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list-source-share-synchronization-setting --account-name
+                                                                                       --resource-group
+                                                                                       --share-subscription-name
+  examples:
+  - summary: List synchronization settings
+    syntax: az datashare consumer share-subscription list-source-share-synchronization-setting --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_show
+  name: az datashare consumer share-subscription show
+  summary: Show a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription show --account-name
+                                                  --name
+                                                  --resource-group
+  examples:
+  - summary: Show a share subscription
+    syntax: az datashare consumer share-subscription show --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_wait
+  name: az datashare consumer share-subscription wait
+  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription wait --account-name
+                                                  --name
+                                                  --resource-group
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare share subscription is successfully provisioned.
+    syntax: az datashare consumer share-subscription wait --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare share subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml
new file mode 100644
index 0000000000..6d8b9e26ff
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_share-subscription_synchronization
+name: az datashare consumer share-subscription synchronization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer share-subscription synchronization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare share subscription synchronizations.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_share-subscription_synchronization_cancel
+  name: az datashare consumer share-subscription synchronization cancel
+  summary: Request to cancel a synchronization.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization cancel --account-name
+                                                                    --resource-group
+                                                                    --share-subscription-name
+                                                                    --synchronization-id
+                                                                    [--no-wait]
+  examples:
+  - summary: Request to cancel a synchronization
+    syntax: az datashare consumer share-subscription synchronization cancel --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_list
+  name: az datashare consumer share-subscription synchronization list
+  summary: List synchronizations of a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization list --account-name
+                                                                  --resource-group
+                                                                  --share-subscription-name
+  examples:
+  - summary: List synchronizations
+    syntax: az datashare consumer share-subscription synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_list-detail
+  name: az datashare consumer share-subscription synchronization list-detail
+  summary: List synchronization details.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization list-detail --account-name
+                                                                         --resource-group
+                                                                         --share-subscription-name
+                                                                         --synchronization-id
+  examples:
+  - summary: List synchronization details
+    syntax: az datashare consumer share-subscription synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: Synchronization id.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_start
+  name: az datashare consumer share-subscription synchronization start
+  summary: Initiate a dataset synchronization.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization start --account-name
+                                                                   --resource-group
+                                                                   --share-subscription-name
+                                                                   [--no-wait]
+                                                                   [--synchronization-mode {FullSync, Incremental}]
+  examples:
+  - summary: Initiate a dataset synchronization
+    syntax: az datashare consumer share-subscription synchronization start --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-mode "Incremental"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --synchronization-mode
+    parameterValueGroup: FullSync, Incremental
+    summary: Synchronization mode.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_wait
+  name: az datashare consumer share-subscription synchronization wait
+  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization wait --account-name
+                                                                  --resource-group
+                                                                  --share-subscription-name
+                                                                  --synchronization-id
+                                                                  [--created]
+                                                                  [--custom]
+                                                                  [--deleted]
+                                                                  [--exists]
+                                                                  [--interval]
+                                                                  [--timeout]
+                                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization finishes successfully.
+    syntax: az datashare consumer share-subscription synchronization wait --custom "status=='Succeeded'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization is cancelled.
+    syntax: az datashare consumer share-subscription synchronization wait --custom "status=='Cancelled'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare share subscription synchronizations.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/consumer/trigger.yml b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/trigger.yml
new file mode 100644
index 0000000000..01e55fb80c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/consumer/trigger.yml
@@ -0,0 +1,235 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_trigger
+name: az datashare consumer trigger
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer trigger** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare consumer triggers.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_trigger_create
+  name: az datashare consumer trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger create --account-name
+                                         --name
+                                         --recurrence-interval {Day, Hour}
+                                         --resource-group
+                                         --share-subscription-name
+                                         --synchronization-time
+                                         [--kind {ScheduleBased}]
+                                         [--no-wait]
+  examples:
+  - summary: Create a trigger
+    syntax: az datashare consumer trigger create --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --recurrence-interval
+    parameterValueGroup: Day, Hour
+    summary: Synchronization Recurrence Interval.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-time
+    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  optionalParameters:
+  - name: --kind
+    defaultValue: ScheduleBased
+    parameterValueGroup: ScheduleBased
+    summary: Kind of synchronization.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_consumer_trigger_delete
+  name: az datashare consumer trigger delete
+  summary: Delete a trigger in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger delete --account-name
+                                         --name
+                                         --resource-group
+                                         --share-subscription-name
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete a trigger
+    syntax: az datashare consumer trigger delete --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_trigger_list
+  name: az datashare consumer trigger list
+  summary: List triggers in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger list --account-name
+                                       --resource-group
+                                       --share-subscription-name
+  examples:
+  - summary: List triggers
+    syntax: az datashare consumer trigger list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_trigger_show
+  name: az datashare consumer trigger show
+  summary: Show a trigger in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger show --account-name
+                                       --name
+                                       --resource-group
+                                       --share-subscription-name
+  examples:
+  - summary: Show a trigger
+    syntax: az datashare consumer trigger show --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_trigger_wait
+  name: az datashare consumer trigger wait
+  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger wait --account-name
+                                       --name
+                                       --resource-group
+                                       --share-subscription-name
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare trigger is successfully provisioned.
+    syntax: az datashare consumer trigger wait --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the shareSubscription.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare consumer triggers.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/dataset.yml b/2017-03-09-profile/docs-ref-autogen/datashare/dataset.yml
new file mode 100644
index 0000000000..5ea4f7943f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/dataset.yml
@@ -0,0 +1,228 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_dataset
+name: az datashare dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare datasets.
+description: ''
+directCommands:
+- uid: az_datashare_dataset_create
+  name: az datashare dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az datashare dataset create --account-name
+                                --dataset
+                                --name
+                                --resource-group
+                                --share-name
+  examples:
+  - summary: Create a Blob dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"filePath\":\"file21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a BlobFolder dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"BlobFolder\",\"properties\":{\"containerName\":\"C1\",\"prefix\":\"folder21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a KustoCluster dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoCluster\",\"properties\":{\"kustoClusterResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1\"}}"'
+  - summary: Create a KustoDatabase dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoDatabase\",\"properties\":{\"kustoDatabaseResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1/databases/Database1\"}}"'
+  - summary: Create a SqlDBTable dataset
+    syntax: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDBTable\",\"properties\":{\"databaseName\":\"MySqlDB\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\", \"tableName\":\"Table1\"}}"
+  - summary: Create a SqlDWTable dataset
+    syntax: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataWarehouseName\":\"MyDataWarehouse\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Sql/servers/MyServer\",\"tableName\":\"MyTable\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --dataset
+    summary: Dataset parameters in JSON string or path to JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_delete
+  name: az datashare dataset delete
+  summary: Delete a dataset in a share.
+  description: ''
+  syntax: >-
+    az datashare dataset delete --account-name
+                                --name
+                                --resource-group
+                                --share-name
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete a dataset
+    syntax: az datashare dataset delete --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_dataset_list
+  name: az datashare dataset list
+  summary: List datasets in a share.
+  description: ''
+  syntax: >-
+    az datashare dataset list --account-name
+                              --resource-group
+                              --share-name
+  examples:
+  - summary: List datasets
+    syntax: az datashare dataset list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_show
+  name: az datashare dataset show
+  summary: Show a dataset.
+  description: ''
+  syntax: >-
+    az datashare dataset show --account-name
+                              --name
+                              --resource-group
+                              --share-name
+  examples:
+  - summary: Show a dataset
+    syntax: az datashare dataset show --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_wait
+  name: az datashare dataset wait
+  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
+  description: ''
+  syntax: >-
+    az datashare dataset wait --account-name
+                              --name
+                              --resource-group
+                              --share-name
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare dataset is successfully provisioned.
+    syntax: az datashare dataset wait --account-name MyAccount --share-name MyShare --name MyDataset --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_dataset_create
+- az_datashare_dataset_delete
+- az_datashare_dataset_list
+- az_datashare_dataset_show
+- az_datashare_dataset_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare datasets.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/invitation.yml b/2017-03-09-profile/docs-ref-autogen/datashare/invitation.yml
new file mode 100644
index 0000000000..34f0ed0567
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/invitation.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_invitation
+name: az datashare invitation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare invitation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare invitations.
+description: ''
+directCommands:
+- uid: az_datashare_invitation_create
+  name: az datashare invitation create
+  summary: Create an invitation.
+  description: ''
+  syntax: >-
+    az datashare invitation create --account-name
+                                   --name
+                                   --resource-group
+                                   --share-name
+                                   [--target-active-directory-id]
+                                   [--target-email]
+                                   [--target-object-id]
+  examples:
+  - summary: Create an invitation
+    syntax: az datashare invitation create --account-name MyAccount --target-email "receiver@microsoft.com" --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --target-active-directory-id
+    summary: The target Azure AD Id. Can't be combined with email.
+    description: ''
+  - name: --target-email
+    summary: The email the invitation is directed to.
+    description: ''
+  - name: --target-object-id
+    summary: The target user or application Id that invitation is being sent to. Must be specified along TargetActiveDirectoryId. This enables sending invitations to specific users or applications in an AD tenant.
+    description: ''
+- uid: az_datashare_invitation_delete
+  name: az datashare invitation delete
+  summary: Delete an invitation in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation delete --account-name
+                                   --name
+                                   --resource-group
+                                   --share-name
+                                   [--yes]
+  examples:
+  - summary: Delete an invitation
+    syntax: az datashare invitation delete --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_invitation_list
+  name: az datashare invitation list
+  summary: List invitations in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation list --account-name
+                                 --resource-group
+                                 --share-name
+  examples:
+  - summary: List invitations
+    syntax: az datashare invitation list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_invitation_show
+  name: az datashare invitation show
+  summary: Show an invitation in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation show --account-name
+                                 --name
+                                 --resource-group
+                                 --share-name
+  examples:
+  - summary: Show an invitation
+    syntax: az datashare invitation show --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+commands:
+- az_datashare_invitation_create
+- az_datashare_invitation_delete
+- az_datashare_invitation_list
+- az_datashare_invitation_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare invitations.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/provider-share-subscription.yml b/2017-03-09-profile/docs-ref-autogen/datashare/provider-share-subscription.yml
new file mode 100644
index 0000000000..a340735a88
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/provider-share-subscription.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_provider-share-subscription
+name: az datashare provider-share-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare provider-share-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare share subscriptions.
+description: ''
+directCommands:
+- uid: az_datashare_provider-share-subscription_list
+  name: az datashare provider-share-subscription list
+  summary: List share subscriptions in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription list --account-name
+                                                  --resource-group
+                                                  --share-name
+  examples:
+  - summary: List share subscriptions
+    syntax: az datashare provider-share-subscription list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_provider-share-subscription_reinstate
+  name: az datashare provider-share-subscription reinstate
+  summary: Reinstate a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription reinstate --account-name
+                                                       --resource-group
+                                                       --share-name
+                                                       --share-subscription
+  examples:
+  - summary: Reinstate a share subscription
+    syntax: az datashare provider-share-subscription reinstate --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+- uid: az_datashare_provider-share-subscription_revoke
+  name: az datashare provider-share-subscription revoke
+  summary: Revoke a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription revoke --account-name
+                                                    --resource-group
+                                                    --share-name
+                                                    --share-subscription
+                                                    [--no-wait]
+  examples:
+  - summary: Revoke a share subscription
+    syntax: az datashare provider-share-subscription revoke --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_provider-share-subscription_show
+  name: az datashare provider-share-subscription show
+  summary: Show a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription show --account-name
+                                                  --resource-group
+                                                  --share-name
+                                                  --share-subscription
+  examples:
+  - summary: Show a share subscription
+    syntax: az datashare provider-share-subscription show --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+- uid: az_datashare_provider-share-subscription_wait
+  name: az datashare provider-share-subscription wait
+  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription wait --account-name
+                                                  --resource-group
+                                                  --share-name
+                                                  --share-subscription
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare provider share subscription is successfully provisioned.
+    syntax: az datashare provider-share-subscription wait --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_provider-share-subscription_list
+- az_datashare_provider-share-subscription_reinstate
+- az_datashare_provider-share-subscription_revoke
+- az_datashare_provider-share-subscription_show
+- az_datashare_provider-share-subscription_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare share subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/synchronization-setting.yml b/2017-03-09-profile/docs-ref-autogen/datashare/synchronization-setting.yml
new file mode 100644
index 0000000000..c56e275392
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/synchronization-setting.yml
@@ -0,0 +1,231 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_synchronization-setting
+name: az datashare synchronization-setting
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare synchronization-setting** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare synchronization settings.
+description: ''
+directCommands:
+- uid: az_datashare_synchronization-setting_create
+  name: az datashare synchronization-setting create
+  summary: Create a synchronization setting.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting create --account-name
+                                                --name
+                                                --recurrence-interval {Day, Hour}
+                                                --resource-group
+                                                --share-name
+                                                --synchronization-time
+                                                [--kind {ScheduleBased}]
+  examples:
+  - summary: Create a synchronization setting
+    syntax: az datashare synchronization-setting create --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MyDataset --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --recurrence-interval
+    parameterValueGroup: Day, Hour
+    summary: Synchronization Recurrence Interval.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --synchronization-time
+    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  optionalParameters:
+  - name: --kind
+    defaultValue: ScheduleBased
+    parameterValueGroup: ScheduleBased
+    summary: Kind of synchronization.
+    description: ''
+- uid: az_datashare_synchronization-setting_delete
+  name: az datashare synchronization-setting delete
+  summary: Delete a synchronization setting in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting delete --account-name
+                                                --name
+                                                --resource-group
+                                                --share-name
+                                                [--no-wait]
+                                                [--yes]
+  examples:
+  - summary: Delete a synchronization setting
+    syntax: az datashare synchronization-setting delete --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_synchronization-setting_list
+  name: az datashare synchronization-setting list
+  summary: List synchronization settings in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting list --account-name
+                                              --resource-group
+                                              --share-name
+  examples:
+  - summary: List synchronization settings
+    syntax: az datashare synchronization-setting list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization-setting_show
+  name: az datashare synchronization-setting show
+  summary: Show a synchronization setting in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting show --account-name
+                                              --name
+                                              --resource-group
+                                              --share-name
+  examples:
+  - summary: Show a synchronization setting
+    syntax: az datashare synchronization-setting show --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization-setting_wait
+  name: az datashare synchronization-setting wait
+  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting wait --account-name
+                                              --name
+                                              --resource-group
+                                              --share-name
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare synchronization setting is successfully provisioned.
+    syntax: az datashare synchronization-setting wait --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_synchronization-setting_create
+- az_datashare_synchronization-setting_delete
+- az_datashare_synchronization-setting_list
+- az_datashare_synchronization-setting_show
+- az_datashare_synchronization-setting_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare synchronization settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/datashare/synchronization.yml b/2017-03-09-profile/docs-ref-autogen/datashare/synchronization.yml
new file mode 100644
index 0000000000..f5cb5f65dc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/datashare/synchronization.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_synchronization
+name: az datashare synchronization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare synchronization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare synchronization.
+description: ''
+directCommands:
+- uid: az_datashare_synchronization_list
+  name: az datashare synchronization list
+  summary: List synchronizations of a datashare.
+  description: ''
+  syntax: >-
+    az datashare synchronization list --account-name
+                                      --resource-group
+                                      --share-name
+  examples:
+  - summary: List synchronizations
+    syntax: az datashare synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization_list-detail
+  name: az datashare synchronization list-detail
+  summary: List synchronization details.
+  description: ''
+  syntax: >-
+    az datashare synchronization list-detail --account-name
+                                             --resource-group
+                                             --share-name
+                                             [--synchronization-id]
+  examples:
+  - summary: List synchronization details
+    syntax: az datashare synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+commands:
+- az_datashare_synchronization_list
+- az_datashare_synchronization_list-detail
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage datashare synchronization.
diff --git a/2017-03-09-profile/docs-ref-autogen/dedicated-hsm.yml b/2017-03-09-profile/docs-ref-autogen/dedicated-hsm.yml
new file mode 100644
index 0000000000..cded4c8275
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dedicated-hsm.yml
@@ -0,0 +1,229 @@
+### YamlMime:AzureCLIGroup
+uid: az_dedicated-hsm
+name: az dedicated-hsm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hardware-security-modules** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az dedicated-hsm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
+description: ''
+directCommands:
+- uid: az_dedicated-hsm_create
+  name: az dedicated-hsm create
+  summary: Create a dedicated HSM in the specified subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm create --location
+                            --name
+                            --resource-group
+                            [--network-profile-network-interfaces]
+                            [--no-wait]
+                            [--sku]
+                            [--stamp-id]
+                            [--subnet]
+                            [--tags]
+                            [--zones]
+  examples:
+  - summary: Create a new dedicated HSM
+    syntax: az dedicated-hsm create -n "hsm1" -l "japanwest" -i private-ip-address="1.0.0.1" -s id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.Network/virtualNetworks/hsm/subnets/hsm" --stamp-id "stamp1" --sku name="SafeNet Luna Network HSM A790" --tags Dept="hsm" Environment="dogfood" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the dedicated Hsm.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --network-profile-network-interfaces -i
+    summary: 'Specifies a list of ip address from the specfied subnet for the network interfaces associated with the dedicated HSM. Expected value: -i private-ip-address=xx.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: 'The HSM device SKU if a non-standard HSM is wanted (default is: SafeNet Luna Network HSM A790).'
+    description: ''
+  - name: --stamp-id
+    summary: This field will be used when RP does not support Availability zones.
+    description: ''
+  - name: --subnet -s
+    summary: 'Specifies the identifier of the subnet. Expected value: id=xx.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zones
+    summary: The Dedicated Hsm zones.
+    description: ''
+- uid: az_dedicated-hsm_delete
+  name: az dedicated-hsm delete
+  summary: Deletes the specified Azure Dedicated HSM.
+  description: ''
+  syntax: >-
+    az dedicated-hsm delete --name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: Delete a dedicated HSM
+    syntax: az dedicated-hsm delete -n "hsm1" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dedicated HSM to delete.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dedicated-hsm_list
+  name: az dedicated-hsm list
+  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm list [--resource-group]
+                          [--top]
+  examples:
+  - summary: List dedicated HSM devices in a subscription
+    syntax: az dedicated-hsm list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_dedicated-hsm_show
+  name: az dedicated-hsm show
+  summary: Gets the specified Azure dedicated HSM.
+  description: ''
+  syntax: >-
+    az dedicated-hsm show --name
+                          --resource-group
+  examples:
+  - summary: Get a dedicated HSM
+    syntax: az dedicated-hsm show -n "hsm1" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dedicated-hsm_update
+  name: az dedicated-hsm update
+  summary: Update a dedicated HSM in the specified subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm update --name
+                            --resource-group
+                            [--no-wait]
+                            [--tags]
+  examples:
+  - summary: Update an existing dedicated HSM
+    syntax: az dedicated-hsm update -n "hsm1" --tags Dept="hsm" Environment="dogfood" Slice="A" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_dedicated-hsm_wait
+  name: az dedicated-hsm wait
+  summary: Waits for operation to complete.
+  description: ''
+  syntax: >-
+    az dedicated-hsm wait --name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Delete a dedicated HSM
+    syntax: az dedicated-hsm wait --created -g "hsm-group" --name "hsm1"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_dedicated-hsm_create
+- az_dedicated-hsm_delete
+- az_dedicated-hsm_list
+- az_dedicated-hsm_show
+- az_dedicated-hsm_update
+- az_dedicated-hsm_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Dedicated-hsm to create, update, list, show, and delete HSMs.
diff --git a/2017-03-09-profile/docs-ref-autogen/demo.yml b/2017-03-09-profile/docs-ref-autogen/demo.yml
new file mode 100644
index 0000000000..ef37199548
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/demo.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_demo
+name: az demo
+summary: Demos for designing, developing and demonstrating Azure CLI.
+description: ''
+directCommands:
+- uid: az_demo_style
+  name: az demo style
+  summary: A demo showing supported text styles.
+  description: ''
+  syntax: >-
+    az demo style [--subscription]
+                  [--theme {cloud-shell, dark, light, none}]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --theme
+    parameterValueGroup: cloud-shell, dark, light, none
+    summary: The theme to format styled text. If unspecified, the default theme is used.
+    description: ''
+commands:
+- az_demo_style
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Demos for designing, developing and demonstrating Azure CLI.
diff --git a/2017-03-09-profile/docs-ref-autogen/deployment-scripts.yml b/2017-03-09-profile/docs-ref-autogen/deployment-scripts.yml
index 48c6938705..e855d392e4 100644
--- a/2017-03-09-profile/docs-ref-autogen/deployment-scripts.yml
+++ b/2017-03-09-profile/docs-ref-autogen/deployment-scripts.yml
@@ -1,118 +1,117 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_scripts
-  name: az deployment-scripts
-  summary: Manage deployment scripts at subscription or resource group scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_scripts_delete
-  - az_deployment_scripts_list
-  - az_deployment_scripts_show
-  - az_deployment_scripts_show_log
-- uid: az_deployment_scripts_delete
+### YamlMime:AzureCLIGroup
+uid: az_deployment-scripts
+name: az deployment-scripts
+summary: Manage deployment scripts at subscription or resource group scope.
+description: ''
+directCommands:
+- uid: az_deployment-scripts_delete
   name: az deployment-scripts delete
   summary: Delete a deployment script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts delete --name
+                                 --resource-group
+                                 [--subscription]
+                                 [--yes]
   examples:
   - summary: Delete a deployment script found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts delete --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts delete --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_deployment-scripts_list
   name: az deployment-scripts list
   summary: List all deployment scripts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts list [--query-examples]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Retrieve all deployment scripts found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts list
+    syntax: az deployment-scripts list
   - summary: Retrieve all deployment scripts found in a resource group
-    syntax:
-      content: az deployment-scripts list --resource-group contoso-rg
-  parameters:
+    syntax: az deployment-scripts list --resource-group contoso-rg
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_show
+- uid: az_deployment-scripts_show
   name: az deployment-scripts show
   summary: Retrieve a deployment script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts show --name
+                               --resource-group
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Retrieve a deployment script found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts show --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts show --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_show_log
+- uid: az_deployment-scripts_show-log
   name: az deployment-scripts show-log
   summary: Show deployment script logs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts show-log --name
+                                   --resource-group
+                                   [--subscription]
   examples:
   - summary: Retrieve deployment script logs found in the user's logged-in default subscription, max limit is 4MB.
-    syntax:
-      content: az deployment-scripts show-log --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts show-log --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_deployment_scripts_delete
-  name: az deployment-scripts delete
-  summary: Delete a deployment script.
-- uid: az_deployment_scripts_list
-  name: az deployment-scripts list
-  summary: List all deployment scripts.
-- uid: az_deployment_scripts_show
-  name: az deployment-scripts show
-  summary: Retrieve a deployment script.
-- uid: az_deployment_scripts_show_log
-  name: az deployment-scripts show-log
-  summary: Show deployment script logs.
+- az_deployment-scripts_delete
+- az_deployment-scripts_list
+- az_deployment-scripts_show
+- az_deployment-scripts_show-log
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -128,4 +127,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage deployment scripts at subscription or resource group scope.
+metadata:
+  description: Manage deployment scripts at subscription or resource group scope.
diff --git a/2017-03-09-profile/docs-ref-autogen/deployment.yml b/2017-03-09-profile/docs-ref-autogen/deployment.yml
index 9ea3d875c2..c833337fdd 100644
--- a/2017-03-09-profile/docs-ref-autogen/deployment.yml
+++ b/2017-03-09-profile/docs-ref-autogen/deployment.yml
@@ -1,52 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment
-  name: az deployment
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_deployment
+name: az deployment
+summary: Manage Azure Resource Manager template deployment at subscription scope.
+description: ''
 commands:
-- uid: az_deployment_group
-  name: az deployment group
-  summary: Manage Azure Resource Manager template deployment at resource group.
-- uid: az_deployment_group_cancel
-  name: az deployment group cancel
-  summary: Cancel a deployment at resource group.
-- uid: az_deployment_group_create
-  name: az deployment group create
-  summary: Start a deployment at resource group.
-- uid: az_deployment_group_delete
-  name: az deployment group delete
-  summary: Delete a deployment at resource group.
-- uid: az_deployment_group_export
-  name: az deployment group export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group_list
-  name: az deployment group list
-  summary: List deployments at resource group.
-- uid: az_deployment_group_show
-  name: az deployment group show
-  summary: Show a deployment at resource group.
-- uid: az_deployment_group_validate
-  name: az deployment group validate
-  summary: Validate whether a template is valid at resource group.
-- uid: az_deployment_group_wait
-  name: az deployment group wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
-- uid: az_deployment_operation
-  name: az deployment operation
-  summary: Manage deployment operations at subscription scope.
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_group
+- az_deployment_group_cancel
+- az_deployment_group_create
+- az_deployment_group_delete
+- az_deployment_group_export
+- az_deployment_group_list
+- az_deployment_group_show
+- az_deployment_group_validate
+- az_deployment_group_wait
+- az_deployment_operation
+- az_deployment_operation_group
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -62,10 +32,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at subscription scope.
diff --git a/2017-03-09-profile/docs-ref-autogen/deployment/group.yml b/2017-03-09-profile/docs-ref-autogen/deployment/group.yml
index b58d0f36eb..da92300d71 100644
--- a/2017-03-09-profile/docs-ref-autogen/deployment/group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/deployment/group.yml
@@ -1,80 +1,78 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_group
-  name: az deployment group
-  summary: Manage Azure Resource Manager template deployment at resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_group_cancel
-  - az_deployment_group_create
-  - az_deployment_group_delete
-  - az_deployment_group_export
-  - az_deployment_group_list
-  - az_deployment_group_show
-  - az_deployment_group_validate
-  - az_deployment_group_wait
+### YamlMime:AzureCLIGroup
+uid: az_deployment_group
+name: az deployment group
+summary: Manage Azure Resource Manager template deployment at resource group.
+description: ''
+directCommands:
 - uid: az_deployment_group_cancel
   name: az deployment group cancel
   summary: Cancel a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group cancel --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Cancel a deployment at resource group.
-    syntax:
-      content: az deployment group cancel -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group cancel -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_create
   name: az deployment group create
   summary: Start a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group create --resource-group
+                               [--aux-subs]
+                               [--aux-tenants]
+                               [--handle-extended-json-format]
+                               [--mode {Complete, Incremental}]
+                               [--name]
+                               [--no-prompt {false, true}]
+                               [--no-wait]
+                               [--parameters]
+                               [--query-string]
+                               [--rollback-on-error]
+                               [--subscription]
+                               [--template-file]
+                               [--template-uri]
   examples:
   - summary: Create a deployment at resource group from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment at resource group from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-file azuredeploy.json  \
-            --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-file azuredeploy.json  \
+          --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
   - summary: Create a deployment at resource group from a local template file, using parameters from an array string.
-    syntax:
-      content: az deployment group create --resource-group testgroup --template-file demotemplate.json --parameters exampleString='inline string' exampleArray='("value1", "value2")'
+    syntax: az deployment group create --resource-group testgroup --template-file demotemplate.json --parameters exampleString='inline string' exampleArray='("value1", "value2")'
   - summary: Create a deployment at resource group from a local template, using a parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-file azuredeploy.json  --parameters @params.json \
-            --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-file azuredeploy.json  --parameters @params.json \
+          --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  - summary: Create a deployment at subscription scope from a template-spec
+    syntax: az deployment group create --resource-group testrg --template-spec "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Resources/templateSpecs/myTemplateSpec/versions/1.0"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group to create deployment at.
     description: ''
+  optionalParameters:
   - name: --aux-subs
     summary: Auxiliary subscriptions which will be used during deployment across tenants.
     description: ''
@@ -101,154 +99,161 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_delete
   name: az deployment group delete
   summary: Delete a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group delete --name
+                               --resource-group
+                               [--no-wait]
+                               [--subscription]
   examples:
   - summary: Delete a deployment at resource group.
-    syntax:
-      content: az deployment group delete -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group delete -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_export
   name: az deployment group export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group export --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Export the template used for a deployment at resource group.
-    syntax:
-      content: az deployment group export --resource-group testrg --name MyDeployment
-  parameters:
+    syntax: az deployment group export --resource-group testrg --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_list
   name: az deployment group list
   summary: List deployments at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group list --resource-group
+                             [--filter]
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List deployments at resource group.
-    syntax:
-      content: az deployment group list -g testrg
-  parameters:
+    syntax: az deployment group list -g testrg
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --filter
-    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit <a href="https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters">https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters</a>.
+    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_show
   name: az deployment group show
   summary: Show a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Show a deployment at resource group.
-    syntax:
-      content: az deployment group show -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group show -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_validate
   name: az deployment group validate
   summary: Validate whether a template is valid at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group validate --resource-group
+                                 [--handle-extended-json-format]
+                                 [--mode {Complete, Incremental}]
+                                 [--name]
+                                 [--no-prompt {false, true}]
+                                 [--parameters]
+                                 [--query-string]
+                                 [--rollback-on-error]
+                                 [--subscription]
+                                 [--template-file]
+                                 [--template-uri]
   examples:
   - summary: Validate whether a template is valid at resource group.
-    syntax:
-      content: az deployment group validate --resource-group testrg --template-file {template-file}
-  parameters:
+    syntax: az deployment group validate --resource-group testrg --template-file {template-file}
+  - summary: Validate whether a template is valid at resource group. (autogenerated)
+    syntax: az deployment group validate --parameters MyValue=This MyArray=@array.json --resource-group testrg --template-file azuredeploy.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group to create deployment at.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -266,40 +271,51 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_wait
   name: az deployment group wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment group wait --name
+                             --resource-group
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--interval]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
+    syntax: az deployment group wait --created --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -316,6 +332,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -323,40 +342,16 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_group_cancel
-  name: az deployment group cancel
-  summary: Cancel a deployment at resource group.
-- uid: az_deployment_group_create
-  name: az deployment group create
-  summary: Start a deployment at resource group.
-- uid: az_deployment_group_delete
-  name: az deployment group delete
-  summary: Delete a deployment at resource group.
-- uid: az_deployment_group_export
-  name: az deployment group export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group_list
-  name: az deployment group list
-  summary: List deployments at resource group.
-- uid: az_deployment_group_show
-  name: az deployment group show
-  summary: Show a deployment at resource group.
-- uid: az_deployment_group_validate
-  name: az deployment group validate
-  summary: Validate whether a template is valid at resource group.
-- uid: az_deployment_group_wait
-  name: az deployment group wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_deployment_group_cancel
+- az_deployment_group_create
+- az_deployment_group_delete
+- az_deployment_group_export
+- az_deployment_group_list
+- az_deployment_group_show
+- az_deployment_group_validate
+- az_deployment_group_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -372,10 +367,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at resource group.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at resource group.
diff --git a/2017-03-09-profile/docs-ref-autogen/deployment/operation.yml b/2017-03-09-profile/docs-ref-autogen/deployment/operation.yml
index 5bade12abc..676feb5e95 100644
--- a/2017-03-09-profile/docs-ref-autogen/deployment/operation.yml
+++ b/2017-03-09-profile/docs-ref-autogen/deployment/operation.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation
-  name: az deployment operation
-  summary: Manage deployment operations at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation
+name: az deployment operation
+summary: Manage deployment operations at subscription scope.
+description: ''
 commands:
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_operation_group
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,10 +22,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at subscription scope.
diff --git a/2017-03-09-profile/docs-ref-autogen/deployment/operation/group.yml b/2017-03-09-profile/docs-ref-autogen/deployment/operation/group.yml
index 30158d5936..d12db1d67a 100644
--- a/2017-03-09-profile/docs-ref-autogen/deployment/operation/group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/deployment/operation/group.yml
@@ -1,45 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_operation_group_list
-  - az_deployment_operation_group_show
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation_group
+name: az deployment operation group
+summary: Manage deployment operations at resource group.
+description: ''
+directCommands:
 - uid: az_deployment_operation_group_list
   name: az deployment operation group list
   summary: List deployment operations at resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation group list --name
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  examples:
+  - summary: List deployment operations at resource group (autogenerated)
+    syntax: az deployment operation group list --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_operation_group_show
   name: az deployment operation group show
   summary: Show a deployment operation at resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation group show --name
+                                       --operation-ids
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -50,24 +54,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -83,10 +82,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at resource group.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at resource group.
diff --git a/2017-03-09-profile/docs-ref-autogen/desktopvirtualization.yml b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization.yml
new file mode 100644
index 0000000000..a8d860aefe
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization.yml
@@ -0,0 +1,44 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization
+name: az desktopvirtualization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_desktopvirtualization_applicationgroup
+- az_desktopvirtualization_applicationgroup_create
+- az_desktopvirtualization_applicationgroup_delete
+- az_desktopvirtualization_applicationgroup_list
+- az_desktopvirtualization_applicationgroup_show
+- az_desktopvirtualization_applicationgroup_update
+- az_desktopvirtualization_hostpool
+- az_desktopvirtualization_hostpool_create
+- az_desktopvirtualization_hostpool_delete
+- az_desktopvirtualization_hostpool_list
+- az_desktopvirtualization_hostpool_show
+- az_desktopvirtualization_hostpool_update
+- az_desktopvirtualization_workspace
+- az_desktopvirtualization_workspace_create
+- az_desktopvirtualization_workspace_delete
+- az_desktopvirtualization_workspace_list
+- az_desktopvirtualization_workspace_show
+- az_desktopvirtualization_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/applicationgroup.yml b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/applicationgroup.yml
new file mode 100644
index 0000000000..7c2877b787
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/applicationgroup.yml
@@ -0,0 +1,168 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_applicationgroup
+name: az desktopvirtualization applicationgroup
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization applicationgroup** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization applicationgroup.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_applicationgroup_create
+  name: az desktopvirtualization applicationgroup create
+  summary: Create or update an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup create --application-group-type {Desktop, RemoteApp}
+                                                     --host-pool-arm-path
+                                                     --location
+                                                     --name
+                                                     --resource-group
+                                                     [--description]
+                                                     [--friendly-name]
+                                                     [--tags]
+  examples:
+  - summary: ApplicationGroup_Create
+    syntax: az desktopvirtualization applicationgroup create --location "centralus" --description "des1" --application-group-type "RemoteApp" --friendly-name "friendly" --host-pool-arm-path "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/MyResourceGroup/providers/Microsoft.DesktopVirtualization/hostPools/MyHostPool" --tags tag1="value1" tag2="value2" --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --application-group-type
+    parameterValueGroup: Desktop, RemoteApp
+    summary: Resource Type of ApplicationGroup.
+    description: ''
+  - isRequired: true
+    name: --host-pool-arm-path
+    summary: HostPool arm path of ApplicationGroup.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of ApplicationGroup.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of ApplicationGroup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_delete
+  name: az desktopvirtualization applicationgroup delete
+  summary: Remove an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup delete --name
+                                                     --resource-group
+  examples:
+  - summary: ApplicationGroup_Delete
+    syntax: az desktopvirtualization applicationgroup delete --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_list
+  name: az desktopvirtualization applicationgroup list
+  summary: List applicationGroups in subscription.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup list [--filter]
+                                                   [--resource-group]
+  examples:
+  - summary: ApplicationGroup_ListByResourceGroup
+    syntax: az desktopvirtualization applicationgroup list --filter "applicationGroupType eq 'RailApplication'" --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --filter
+    summary: OData filter expression. Valid properties for filtering are applicationGroupType.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_show
+  name: az desktopvirtualization applicationgroup show
+  summary: Get an application group.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup show --name
+                                                   --resource-group
+  examples:
+  - summary: ApplicationGroup_Get
+    syntax: az desktopvirtualization applicationgroup show --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_update
+  name: az desktopvirtualization applicationgroup update
+  summary: Update an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup update --name
+                                                     --resource-group
+                                                     [--description]
+                                                     [--friendly-name]
+                                                     [--tags]
+  examples:
+  - summary: ApplicationGroups_Update
+    syntax: az desktopvirtualization applicationgroup update --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of ApplicationGroup.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of ApplicationGroup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_desktopvirtualization_applicationgroup_create
+- az_desktopvirtualization_applicationgroup_delete
+- az_desktopvirtualization_applicationgroup_list
+- az_desktopvirtualization_applicationgroup_show
+- az_desktopvirtualization_applicationgroup_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization applicationgroup.
diff --git a/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/hostpool.yml b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/hostpool.yml
new file mode 100644
index 0000000000..fd474b922a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/hostpool.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_hostpool
+name: az desktopvirtualization hostpool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization hostpool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization hostpool.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_hostpool_create
+  name: az desktopvirtualization hostpool create
+  summary: Create or update a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool create --host-pool-type {Personal, Pooled}
+                                             --load-balancer-type {BreadthFirst, DepthFirst, Persistent}
+                                             --location
+                                             --name
+                                             --personal-desktop-assignment-type {Automatic, Direct}
+                                             --resource-group
+                                             [--custom-rdp-property]
+                                             [--description]
+                                             [--friendly-name]
+                                             [--max-session-limit]
+                                             [--registration-info]
+                                             [--ring]
+                                             [--sso-context]
+                                             [--tags]
+                                             [--validation-environment {false, true}]
+                                             [--vm-template]
+  examples:
+  - summary: HostPool_Create
+    syntax: az desktopvirtualization hostpool create --location "centralus" --description "des1" --friendly-name "friendly" --host-pool-type "Pooled" --load-balancer-type "BreadthFirst" --max-session-limit 999999 --personal-desktop-assignment-type "Automatic" --registration-info expiration-time="2020-10-01T14:01:54.9571247Z" registration-token-operation="Update" --sso-context "KeyVaultPath" --tags tag1="value1" tag2="value2" --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --host-pool-type
+    parameterValueGroup: Personal, Pooled
+    summary: HostPool type for desktop.
+    description: ''
+  - isRequired: true
+    name: --load-balancer-type
+    parameterValueGroup: BreadthFirst, DepthFirst, Persistent
+    summary: The type of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --personal-desktop-assignment-type
+    parameterValueGroup: Automatic, Direct
+    summary: PersonalDesktopAssignment type for HostPool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-rdp-property
+    summary: Custom rdp property of HostPool.
+    description: ''
+  - name: --description
+    summary: Description of HostPool.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of HostPool.
+    description: ''
+  - name: --max-session-limit
+    summary: The max session limit of HostPool.
+    description: ''
+  - name: --registration-info
+    summary: The registration info of HostPool.
+    description: >-
+      Usage: --registration-info expiration-time=XX token=XX registration-token-operation=XX
+
+
+      expiration-time: Expiration time of registration token.
+
+      token: The registration token base64 encoded string.
+
+      registration-token-operation: The type of resetting the token.
+  - name: --ring
+    summary: The ring number of HostPool.
+    description: ''
+  - name: --sso-context
+    summary: Path to keyvault containing ssoContext secret.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation-environment
+    parameterValueGroup: false, true
+    summary: Is validation environment.
+    description: ''
+  - name: --vm-template
+    summary: VM template for sessionhosts configuration within hostpool.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_delete
+  name: az desktopvirtualization hostpool delete
+  summary: Remove a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool delete --name
+                                             --resource-group
+                                             [--force {false, true}]
+  examples:
+  - summary: HostPool_Delete
+    syntax: az desktopvirtualization hostpool delete --force true --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --force
+    parameterValueGroup: false, true
+    summary: Force flag to delete sessionHost.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_list
+  name: az desktopvirtualization hostpool list
+  summary: List hostPools in subscription.
+  description: ''
+  syntax: az desktopvirtualization hostpool list [--resource-group]
+  examples:
+  - summary: HostPool_ListByResourceGroup
+    syntax: az desktopvirtualization hostpool list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_show
+  name: az desktopvirtualization hostpool show
+  summary: Get a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool show --name
+                                           --resource-group
+  examples:
+  - summary: HostPool_Get
+    syntax: az desktopvirtualization hostpool show --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_update
+  name: az desktopvirtualization hostpool update
+  summary: Update a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool update --name
+                                             --resource-group
+                                             [--custom-rdp-property]
+                                             [--description]
+                                             [--friendly-name]
+                                             [--load-balancer-type {BreadthFirst, DepthFirst, Persistent}]
+                                             [--max-session-limit]
+                                             [--personal-desktop-assignment-type {Automatic, Direct}]
+                                             [--registration-info]
+                                             [--ring]
+                                             [--sso-context]
+                                             [--tags]
+                                             [--validation-environment {false, true}]
+  examples:
+  - summary: HostPool_Update
+    syntax: az desktopvirtualization hostpool update --description "des1" --friendly-name "friendly" --load-balancer-type "BreadthFirst" --max-session-limit 999999 --personal-desktop-assignment-type "Automatic" --registration-info expiration-time="2020-10-01T15:01:54.9571247Z" registration-token-operation="Update" --sso-context "KeyVaultPath" --tags tag1="value1" tag2="value2" --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-rdp-property
+    summary: Custom rdp property of HostPool.
+    description: ''
+  - name: --description
+    summary: Description of HostPool.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of HostPool.
+    description: ''
+  - name: --load-balancer-type
+    parameterValueGroup: BreadthFirst, DepthFirst, Persistent
+    summary: The type of the load balancer.
+    description: ''
+  - name: --max-session-limit
+    summary: The max session limit of HostPool.
+    description: ''
+  - name: --personal-desktop-assignment-type
+    parameterValueGroup: Automatic, Direct
+    summary: PersonalDesktopAssignment type for HostPool.
+    description: ''
+  - name: --registration-info
+    summary: The registration info of HostPool.
+    description: >-
+      Usage: --registration-info expiration-time=XX registration-token-operation=XX
+
+
+      expiration-time: Expiration time of registration token.
+
+      registration-token-operation: The type of resetting the token.
+  - name: --ring
+    summary: The ring number of HostPool.
+    description: ''
+  - name: --sso-context
+    summary: Path to keyvault containing ssoContext secret.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation-environment
+    parameterValueGroup: false, true
+    summary: Is validation environment.
+    description: ''
+commands:
+- az_desktopvirtualization_hostpool_create
+- az_desktopvirtualization_hostpool_delete
+- az_desktopvirtualization_hostpool_list
+- az_desktopvirtualization_hostpool_show
+- az_desktopvirtualization_hostpool_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization hostpool.
diff --git a/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/workspace.yml b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/workspace.yml
new file mode 100644
index 0000000000..dc072fadea
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/desktopvirtualization/workspace.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_workspace
+name: az desktopvirtualization workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization workspace.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_workspace_create
+  name: az desktopvirtualization workspace create
+  summary: Create or update a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace create --location
+                                              --name
+                                              --resource-group
+                                              [--application-group-references]
+                                              [--description]
+                                              [--friendly-name]
+                                              [--tags]
+  examples:
+  - summary: Workspace_Create
+    syntax: az desktopvirtualization workspace create --resource-group "MyResourceGroup" --location "centralus" --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-group-references
+    summary: List of applicationGroup resource Ids.
+    description: ''
+  - name: --description
+    summary: Description of Workspace.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of Workspace.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_desktopvirtualization_workspace_delete
+  name: az desktopvirtualization workspace delete
+  summary: Remove a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace delete --name
+                                              --resource-group
+  examples:
+  - summary: Workspace_Delete
+    syntax: az desktopvirtualization workspace delete --resource-group "MyResourceGroup" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_list
+  name: az desktopvirtualization workspace list
+  summary: List workspaces in subscription.
+  description: ''
+  syntax: az desktopvirtualization workspace list [--resource-group]
+  examples:
+  - summary: Workspace_ListByResourceGroup
+    syntax: az desktopvirtualization workspace list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_show
+  name: az desktopvirtualization workspace show
+  summary: Get a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace show --name
+                                            --resource-group
+  examples:
+  - summary: Workspace_Get
+    syntax: az desktopvirtualization workspace show --resource-group "MyResourceGroup" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_update
+  name: az desktopvirtualization workspace update
+  summary: Update a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace update --name
+                                              --resource-group
+                                              [--application-group-references]
+                                              [--description]
+                                              [--friendly-name]
+                                              [--tags]
+  examples:
+  - summary: Workspace_Update
+    syntax: az desktopvirtualization workspace update --resource-group "MyResourceGroup" --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-group-references
+    summary: List of applicationGroup links.
+    description: ''
+  - name: --description
+    summary: Description of Workspace.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of Workspace.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_desktopvirtualization_workspace_create
+- az_desktopvirtualization_workspace_delete
+- az_desktopvirtualization_workspace_list
+- az_desktopvirtualization_workspace_show
+- az_desktopvirtualization_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops.yml b/2017-03-09-profile/docs-ref-autogen/devops.yml
index bee17d2a03..ed8bcfb183 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops.yml
@@ -1,87 +1,91 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-  description: >-
-    Related Groups
+### YamlMime:AzureCLIGroup
+uid: az_devops
+name: az devops
+summary: Manage Azure DevOps organization level operations.
+description: >-
+  Related Groups
 
-    az pipelines: Manage Azure Pipelines
+  az pipelines: Manage Azure Pipelines
 
-    az boards: Manage Azure Boards
+  az boards: Manage Azure Boards
 
-    az repos: Manage Azure Repos
+  az repos: Manage Azure Repos
 
-    az artifacts: Manage Azure Artifacts.
-  langs:
-  - azurecli
-  children:
-  - az_devops_configure
-  - az_devops_feedback
-  - az_devops_invoke
-  - az_devops_login
-  - az_devops_logout
+  az artifacts: Manage Azure Artifacts.
+directCommands:
 - uid: az_devops_configure
   name: az devops configure
   summary: Configure the Azure DevOps CLI or view your configuration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops configure [--defaults]
+                        [--list]
+                        [--subscription]
+                        [--use-git-aliases {false, true}]
+  optionalParameters:
   - name: --defaults -d
     summary: Space separated 'name=value' pairs for common arguments defaults, e.g. '--defaults project=my-project-name organization=https://dev.azure.com/organizationName arg=value'. Use '' to clear the defaults, e.g. --defaults project=''.
     description: ''
   - name: --list -l
     summary: Lists the contents of the config file.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-git-aliases
     parameterValueGroup: false, true
     summary: Set to 'true' to configure Git aliases global git config file (to enable commands like "git pr list"). Set to 'false' to remove any aliases set by the tool.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_feedback
   name: az devops feedback
   summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az devops feedback [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_devops_invoke
   name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
+  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - https://docs.microsoft.com/en-us/rest/api/azure/devops/.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops invoke [--accept-media-type]
+                     [--api-version]
+                     [--area]
+                     [--detect {false, true}]
+                     [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                     [--http-method {DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}]
+                     [--in-file]
+                     [--media-type]
+                     [--org]
+                     [--out-file]
+                     [--query-parameters]
+                     [--resource]
+                     [--route-parameters]
+                     [--subscription]
   examples:
   - summary: Discover areas related to 'Wiki'
-    syntax:
-      content: az devops invoke --query "[?contains(area,'wiki')]"
+    syntax: az devops invoke --query "[?contains(area,'wiki')]"
   - summary: Get all wikis in a project
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
+    syntax: >-
+      az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
 
-        az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
+      az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
   - summary: Add page to a wiki
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
+    syntax: >-
+      az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
 
-        wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
+      wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
 
-        --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
+      --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
 
-        az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
+      az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
 
-        wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
+      wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
 
-        --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
-  parameters:
+      --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
+  optionalParameters:
   - name: --accept-media-type
     defaultValue: application/json
     summary: Specifies the content type of the response.
@@ -115,7 +119,7 @@ items:
     summary: Specifies the content type of the request.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --out-file
     summary: Path and file name to the file  for which this function saves the response body.
@@ -135,12 +139,13 @@ items:
 - uid: az_devops_login
   name: az devops login
   summary: Set the credential (PAT) to use for a particular organization.
-  description: Refer <a href="https://aka.ms/azure-devops-cli-auth">https://aka.ms/azure-devops-cli-auth</a> for more information on providing PAT as input.
-  langs:
-  - azurecli
-  parameters:
+  description: Refer https://aka.ms/azure-devops-cli-auth for more information on providing PAT as input.
+  syntax: >-
+    az devops login [--org]
+                    [--subscription]
+  optionalParameters:
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName">https://dev.azure.com/MyOrganizationName</a>.'
+    summary: 'Azure DevOps organization URL. Example: https://dev.azure.com/MyOrganizationName.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -149,250 +154,95 @@ items:
   name: az devops logout
   summary: Clear the credential for all or a particular organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops logout [--org]
+                     [--subscription]
+  optionalParameters:
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>. If no organization is specified, all organizations will be logged out.'
+    summary: 'Azure DevOps organization URL. Example: https://dev.azure.com/MyOrganizationName/. If no organization is specified, all organizations will be logged out.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-- uid: az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-- uid: az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-- uid: az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-- uid: az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-- uid: az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-- uid: az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-- uid: az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-- uid: az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-- uid: az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-- uid: az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-- uid: az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-- uid: az_devops_team
-  name: az devops team
-  summary: Manage teams.
-- uid: az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-- uid: az_devops_user
-  name: az devops user
-  summary: Manage users.
-- uid: az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-- uid: az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-- uid: az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
+- az_devops_admin
+- az_devops_admin_banner
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
+- az_devops_configure
+- az_devops_extension
+- az_devops_extension_disable
+- az_devops_extension_enable
+- az_devops_extension_install
+- az_devops_extension_list
+- az_devops_extension_search
+- az_devops_extension_show
+- az_devops_extension_uninstall
+- az_devops_feedback
+- az_devops_invoke
+- az_devops_login
+- az_devops_logout
+- az_devops_project
+- az_devops_project_create
+- az_devops_project_delete
+- az_devops_project_list
+- az_devops_project_show
+- az_devops_security
+- az_devops_security_group
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
+- az_devops_security_permission
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
+- az_devops_service-endpoint
+- az_devops_service-endpoint_azurerm
+- az_devops_service-endpoint_azurerm_create
+- az_devops_service-endpoint_create
+- az_devops_service-endpoint_delete
+- az_devops_service-endpoint_github
+- az_devops_service-endpoint_github_create
+- az_devops_service-endpoint_list
+- az_devops_service-endpoint_show
+- az_devops_service-endpoint_update
+- az_devops_team
+- az_devops_team_create
+- az_devops_team_delete
+- az_devops_team_list
+- az_devops_team_list-member
+- az_devops_team_show
+- az_devops_team_update
+- az_devops_user
+- az_devops_user_add
+- az_devops_user_list
+- az_devops_user_remove
+- az_devops_user_show
+- az_devops_user_update
+- az_devops_wiki
+- az_devops_wiki_create
+- az_devops_wiki_delete
+- az_devops_wiki_list
+- az_devops_wiki_page
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
+- az_devops_wiki_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -408,13 +258,14 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Related Groups
+metadata:
+  description: >-
+    Related Groups
 
-  az pipelines: Manage Azure Pipelines
+    az pipelines: Manage Azure Pipelines
 
-  az boards: Manage Azure Boards
+    az boards: Manage Azure Boards
 
-  az repos: Manage Azure Repos
+    az repos: Manage Azure Repos
 
-  az artifacts: Manage Azure Artifacts.
+    az artifacts: Manage Azure Artifacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/admin.yml b/2017-03-09-profile/docs-ref-autogen/devops/admin.yml
index 321a3a2bf8..3e73a57e9c 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/admin.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/admin.yml
@@ -1,31 +1,15 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_devops_admin
+name: az devops admin
+summary: Manage administration operations.
+description: ''
 commands:
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
+- az_devops_admin_banner
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -41,4 +25,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage administration operations.
+metadata:
+  description: Manage administration operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/admin/banner.yml b/2017-03-09-profile/docs-ref-autogen/devops/admin/banner.yml
index 4223ec7ca4..bf702cf069 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/admin/banner.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/admin/banner.yml
@@ -1,28 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_admin_banner_add
-  - az_devops_admin_banner_list
-  - az_devops_admin_banner_remove
-  - az_devops_admin_banner_show
-  - az_devops_admin_banner_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_admin_banner
+name: az devops admin banner
+summary: Manage organization banner.
+description: ''
+directCommands:
 - uid: az_devops_admin_banner_add
   name: az devops admin banner add
   summary: Add a new banner and immediately show it.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner add --message
+                               [--detect {false, true}]
+                               [--expiration]
+                               [--id]
+                               [--org]
+                               [--subscription]
+                               [--type {error, info, warning}]
+  requiredParameters:
   - isRequired: true
     name: --message -m
     summary: Message (string) to show in the banner.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -34,28 +33,34 @@ items:
     summary: Identifier for the new banner. This identifier is needed to change or remove the message later. A unique identifier is automatically created if one is not specified.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --type -t
     parameterValueGroup: error, info, warning
     summary: Type of banner to present. Defaults is "info".
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_admin_banner_list
   name: az devops admin banner list
   summary: List banners.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner list [--detect {false, true}]
+                                [--org]
+                                [--query-examples]
+                                [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -64,19 +69,23 @@ items:
   name: az devops admin banner remove
   summary: Remove a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner remove --id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the banner to remove.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -85,19 +94,27 @@ items:
   name: az devops admin banner show
   summary: Show details for a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner show --id
+                                [--detect {false, true}]
+                                [--org]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier for the banner.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -106,13 +123,20 @@ items:
   name: az devops admin banner update
   summary: Update the message, level, or expiration date for a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner update --id
+                                  [--detect {false, true}]
+                                  [--expiration]
+                                  [--message]
+                                  [--org]
+                                  [--subscription]
+                                  [--type {error, info, warning}]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the banner to update.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -124,31 +148,21 @@ items:
     summary: Message (string) to show in the banner.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --type -t
     parameterValueGroup: error, info, warning
     summary: Type of banner to present. Defaults is "info".
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -164,4 +178,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage organization banner.
+metadata:
+  description: Manage organization banner.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/extension.yml b/2017-03-09-profile/docs-ref-autogen/devops/extension.yml
index 9d37fa3efe..2313c84136 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/extension.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/extension.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_extension_disable
-  - az_devops_extension_enable
-  - az_devops_extension_install
-  - az_devops_extension_list
-  - az_devops_extension_search
-  - az_devops_extension_show
-  - az_devops_extension_uninstall
+### YamlMime:AzureCLIGroup
+uid: az_devops_extension
+name: az devops extension
+summary: Manage extensions.
+description: ''
+directCommands:
 - uid: az_devops_extension_disable
   name: az devops extension disable
   summary: Disable an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension disable --extension-id
+                                --publisher-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -29,12 +23,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -43,9 +38,13 @@ items:
   name: az devops extension enable
   summary: Enable an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension enable --extension-id
+                               --publisher-id
+                               [--detect {false, true}]
+                               [--org]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -54,12 +53,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -68,9 +68,13 @@ items:
   name: az devops extension install
   summary: Install an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension install --extension-id
+                                --publisher-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -79,12 +83,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -93,9 +98,14 @@ items:
   name: az devops extension list
   summary: List extensions installed in an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension list [--detect {false, true}]
+                             [--include-built-in {false, true}]
+                             [--include-disabled {false, true}]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -109,7 +119,10 @@ items:
     summary: Include disabled extensions.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -118,13 +131,15 @@ items:
   name: az devops extension search
   summary: Search extensions from marketplace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension search --search-query
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --search-query -q
     summary: Search term.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -132,9 +147,14 @@ items:
   name: az devops extension show
   summary: Get detail of single extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension show --extension-id
+                             --publisher-id
+                             [--detect {false, true}]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -143,12 +163,16 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -157,9 +181,14 @@ items:
   name: az devops extension uninstall
   summary: Uninstall an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension uninstall --extension-id
+                                  --publisher-id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--subscription]
+                                  [--yes]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -168,41 +197,28 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 commands:
-- uid: az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
+- az_devops_extension_disable
+- az_devops_extension_enable
+- az_devops_extension_install
+- az_devops_extension_list
+- az_devops_extension_search
+- az_devops_extension_show
+- az_devops_extension_uninstall
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -218,4 +234,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage extensions.
+metadata:
+  description: Manage extensions.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/project.yml b/2017-03-09-profile/docs-ref-autogen/devops/project.yml
index 2a8368296c..48b5ecfe60 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/project.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/project.yml
@@ -1,27 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_project_create
-  - az_devops_project_delete
-  - az_devops_project_list
-  - az_devops_project_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_project
+name: az devops project
+summary: Manage team projects.
+description: ''
+directCommands:
 - uid: az_devops_project_create
   name: az devops project create
   summary: Create a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project create --name
+                             [--description]
+                             [--detect {false, true}]
+                             [--open]
+                             [--org]
+                             [--process]
+                             [--source-control {git, tfvc}]
+                             [--subscription]
+                             [--visibility {private, public}]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new project.
     description: ''
+  optionalParameters:
   - name: --description -d
     summary: Description for the new project.
     description: ''
@@ -33,7 +35,7 @@ items:
     summary: Open the team project in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --process -p
     summary: Process to use. Default if not specified.
@@ -43,45 +45,58 @@ items:
     parameterValueGroup: git, tfvc
     summary: Source control type of the initial code repository created.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --visibility
     defaultValue: private
     parameterValueGroup: private, public
     summary: Project visibility.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_project_delete
   name: az devops project delete
   summary: Delete team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project delete --id
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+                             [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the project to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_project_list
   name: az devops project list
   summary: List team projects.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project list [--continuation-token]
+                           [--detect {false, true}]
+                           [--get-default-team-image-url {false, true}]
+                           [--org]
+                           [--query-examples]
+                           [--skip]
+                           [--state-filter {all, createPending, deleted, deleting, new, unchanged, wellFormed}]
+                           [--subscription]
+                           [--top]
+  optionalParameters:
   - name: --continuation-token
     summary: Continuation token. This can be retrived from previous run of this command if more results are present.
     description: ''
@@ -94,7 +109,10 @@ items:
     summary: Whether to get default team image url or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: Number of results to skip.
@@ -104,23 +122,29 @@ items:
     parameterValueGroup: all, createPending, deleted, deleting, new, unchanged, wellFormed
     summary: State filter.
     description: ''
-  - name: --top
-    summary: Maximum number of results to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of results to list.
+    description: ''
 - uid: az_devops_project_show
   name: az devops project show
   summary: Show team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project show --project
+                           [--detect {false, true}]
+                           [--open]
+                           [--org]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -129,24 +153,19 @@ items:
     summary: Open the team project in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
+- az_devops_project_create
+- az_devops_project_delete
+- az_devops_project_list
+- az_devops_project_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -162,4 +181,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage team projects.
+metadata:
+  description: Manage team projects.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/security.yml b/2017-03-09-profile/docs-ref-autogen/devops/security.yml
index ab6577b7b7..5ab75e06d0 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/security.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/security.yml
@@ -1,70 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_devops_security
+name: az devops security
+summary: Manage security related operations.
+description: ''
 commands:
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
+- az_devops_security_group
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
+- az_devops_security_permission
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -80,4 +38,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security related operations.
+metadata:
+  description: Manage security related operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/security/group.yml b/2017-03-09-profile/docs-ref-autogen/devops/security/group.yml
index 0cda88cc2c..87050e10c0 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/security/group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/security/group.yml
@@ -1,51 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_group_create
-  - az_devops_security_group_delete
-  - az_devops_security_group_list
-  - az_devops_security_group_show
-  - az_devops_security_group_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_group
+name: az devops security group
+summary: Manage security groups.
+description: ''
+directCommands:
 - uid: az_devops_security_group_create
   name: az devops security group create
   summary: Create a new Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops security group create [--description]
+                                    [--detect {false, true}]
+                                    [--email-id]
+                                    [--groups]
+                                    [--name]
+                                    [--org]
+                                    [--origin-id]
+                                    [--project]
+                                    [--scope {organization, project}]
+                                    [--subscription]
   examples:
   - summary: Create an Azure DevOps Group with name and description
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
+    syntax: >-
+      az devops security group create --name 'Some group name'
 
-        --description 'Something to describe this group'
+      --description 'Something to describe this group'
   - summary: Add an existing AAD group to an Azure DevOps group
-    syntax:
-      content: >-
-        Get object ID of an existing AAD group
+    syntax: >-
+      Get object ID of an existing AAD group
 
-        az ad group show -g '{Group Name}'
+      az ad group show -g '{Group Name}'
 
-        az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
+      az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
   - summary: Add an existing AAD group to an Azure DevOps group with AAD group Email ID
-    syntax:
-      content: >-
-        az devops security group create --email-id '{Email ID of AAD group}'
+    syntax: >-
+      az devops security group create --email-id '{Email ID of AAD group}'
 
-        --groups 'vssgp.someDescriptorForGroup'
+      --groups 'vssgp.someDescriptorForGroup'
   - summary: Create a new Azure DevOps group and add it to existing Azure DevOps groups.
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
+    syntax: >-
+      az devops security group create --name 'Some group name'
 
-        --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
-  parameters:
+      --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
+  optionalParameters:
   - name: --description
     summary: Description of Azure DevOps group.
     description: ''
@@ -63,7 +60,7 @@ items:
     summary: Name of Azure DevOps group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --origin-id
     summary: Create new group using the OriginID as a reference to an existing group from an external AD or AAD backed provider. Required if name or email-id is missing.
@@ -83,33 +80,45 @@ items:
   name: az devops security group delete
   summary: Delete an Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group delete --id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--subscription]
+                                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_security_group_list
   name: az devops security group list
   summary: List all the groups in a project or organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group list [--continuation-token]
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--query-examples]
+                                  [--scope {organization, project}]
+                                  [--subject-types]
+                                  [--subscription]
+  optionalParameters:
   - name: --continuation-token
     summary: If there are more results that can't be returned in a single page, the result set will contain a continuation token for retrieval of the next set of results.
     description: ''
@@ -118,11 +127,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: List groups for a particular project.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     defaultValue: project
     parameterValueGroup: organization, project
@@ -138,19 +150,27 @@ items:
   name: az devops security group show
   summary: Show group details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group show --id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -159,13 +179,19 @@ items:
   name: az devops security group update
   summary: Update name AND/OR description for an Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group update --id
+                                    [--description]
+                                    [--detect {false, true}]
+                                    [--name]
+                                    [--org]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --description
     summary: New description for Azure DevOps group.
     description: ''
@@ -177,39 +203,21 @@ items:
     summary: New name for Azure DevOps group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -225,4 +233,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security groups.
+metadata:
+  description: Manage security groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/security/group/membership.yml b/2017-03-09-profile/docs-ref-autogen/devops/security/group/membership.yml
index afae7695f6..32ba3cfd76 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/security/group/membership.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/security/group/membership.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_group_membership_add
-  - az_devops_security_group_membership_list
-  - az_devops_security_group_membership_remove
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_group_membership
+name: az devops security group membership
+summary: Manage memberships for security groups.
+description: ''
+directCommands:
 - uid: az_devops_security_group_membership_add
   name: az devops security group membership add
   summary: Add membership.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership add --group-id
+                                            --member-id
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id
     summary: Descriptor of the group to which member needs to be added.
@@ -25,12 +23,13 @@ items:
     name: --member-id
     summary: Descriptor of the group or Email Id of the user to be added. User should already be a part of the organization. Use `az devops user add` command to add an user to organization.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -39,19 +38,28 @@ items:
   name: az devops security group membership list
   summary: List memberships for a group or user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership list --id
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--query-examples]
+                                             [--relationship {memberof, members}]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Group descriptor or User Email whose membership details are required.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --relationship
     defaultValue: members
@@ -65,9 +73,14 @@ items:
   name: az devops security group membership remove
   summary: Remove membership.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership remove --group-id
+                                               --member-id
+                                               [--detect {false, true}]
+                                               [--org]
+                                               [--subscription]
+                                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id
     summary: Descriptor of the group from which member needs to be removed.
@@ -76,29 +89,24 @@ items:
     name: --member-id
     summary: Descriptor of the group or Email Id of the user to be removed.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 commands:
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -114,4 +122,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage memberships for security groups.
+metadata:
+  description: Manage memberships for security groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/security/permission.yml b/2017-03-09-profile/docs-ref-autogen/devops/security/permission.yml
index fea65aaca1..eb0bab97d2 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/security/permission.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/security/permission.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_permission_list
-  - az_devops_security_permission_reset
-  - az_devops_security_permission_reset_all
-  - az_devops_security_permission_show
-  - az_devops_security_permission_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_permission
+name: az devops security permission
+summary: Manage security permissions.
+description: ''
+directCommands:
 - uid: az_devops_security_permission_list
   name: az devops security permission list
   summary: List tokens for given user/group and namespace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission list --id
+                                       --subject
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--query-examples]
+                                       [--recurse]
+                                       [--subscription]
+                                       [--token]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -27,29 +26,39 @@ items:
     name: --subject
     summary: User Email ID or Group descriptor.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --recurse
     summary: If true and this is a hierarchical namespace, return child ACLs of the specified token.
     description: ''
-  - name: --token
-    summary: Security token.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --token
+    summary: Security token.
+    description: ''
 - uid: az_devops_security_permission_reset
   name: az devops security permission reset
   summary: Reset permission for given permission bit(s).
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission reset --id
+                                        --permission-bit
+                                        --subject
+                                        --token
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -66,23 +75,30 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_security_permission_reset_all
+- uid: az_devops_security_permission_reset-all
   name: az devops security permission reset-all
   summary: Clear all permissions of this token for a user/group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission reset-all --id
+                                            --subject
+                                            --token
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--subscription]
+                                            [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -95,26 +111,33 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_security_permission_show
   name: az devops security permission show
   summary: Show permissions for given token, namespace and user/group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission show --id
+                                       --subject
+                                       --token
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -127,12 +150,16 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -140,20 +167,27 @@ items:
 - uid: az_devops_security_permission_update
   name: az devops security permission update
   summary: Assign allow or deny permission to given user/group.
-  description: Learn more at <a href="https://aka.ms/azure-devops-cli-security-permission">https://aka.ms/azure-devops-cli-security-permission</a>.
-  langs:
-  - azurecli
+  description: Learn more at https://aka.ms/azure-devops-cli-security-permission.
+  syntax: >-
+    az devops security permission update --id
+                                         --subject
+                                         --token
+                                         [--allow-bit]
+                                         [--deny-bit]
+                                         [--detect {false, true}]
+                                         [--merge {false, true}]
+                                         [--org]
+                                         [--subscription]
   examples:
   - summary: Assign view, edit and delete permission for team projects.
-    syntax:
-      content: >-
-        az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
+    syntax: >-
+      az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
 
 
-        You would need to add the bit value of the various permission bits to
+      You would need to add the bit value of the various permission bits to
 
-        simultaneously allow/deny multiple permissions.
-  parameters:
+      simultaneously allow/deny multiple permissions.
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -166,6 +200,7 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --allow-bit
     summary: Allow bit or addition of bits. Required if --deny-bit is missing.
     description: ''
@@ -182,36 +217,20 @@ items:
     summary: If set, the existing ACE has its allow and deny merged with                          the incoming ACE's allow and deny. If unset, the existing ACE is displaced.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,4 +246,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security permissions.
+metadata:
+  description: Manage security permissions.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/security/permission/namespace.yml b/2017-03-09-profile/docs-ref-autogen/devops/security/permission/namespace.yml
index 9b76ef9021..703b38cf0c 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/security/permission/namespace.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/security/permission/namespace.yml
@@ -1,21 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_permission_namespace_list
-  - az_devops_security_permission_namespace_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_permission_namespace
+name: az devops security permission namespace
+summary: Manage security namespaces.
+description: ''
+directCommands:
 - uid: az_devops_security_permission_namespace_list
   name: az devops security permission namespace list
   summary: List all available namespaces for an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission namespace list [--detect {false, true}]
+                                                 [--local-only]
+                                                 [--org]
+                                                 [--query-examples]
+                                                 [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -24,7 +23,10 @@ items:
     summary: If true, retrieve only local security namespaces.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -33,30 +35,34 @@ items:
   name: az devops security permission namespace show
   summary: Show details of permissions available in each namespace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission namespace show --id
+                                                 [--detect {false, true}]
+                                                 [--org]
+                                                 [--query-examples]
+                                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -72,4 +78,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security namespaces.
+metadata:
+  description: Manage security namespaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint.yml
index e14b0060a3..5d0fba1f03 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint.yml
@@ -1,28 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_create
-  - az_devops_service_endpoint_delete
-  - az_devops_service_endpoint_list
-  - az_devops_service_endpoint_show
-  - az_devops_service_endpoint_update
-- uid: az_devops_service_endpoint_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint
+name: az devops service-endpoint
+summary: Manage service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_create
   name: az devops service-endpoint create
   summary: Create a service endpoint using configuration file.
-  description: You can learn more about this at <a href="https://aka.ms/azure-devops-service-endpoint-config">https://aka.ms/azure-devops-service-endpoint-config</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: You can learn more about this at https://aka.ms/azure-devops-service-endpoint-config.
+  syntax: >-
+    az devops service-endpoint create --service-endpoint-configuration
+                                      [--detect {false, true}]
+                                      [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --service-endpoint-configuration
     summary: Configuration file with service endpoint request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -33,7 +31,7 @@ items:
     summary: Encoding of the input file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -41,17 +39,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_delete
+- uid: az_devops_service-endpoint_delete
   name: az devops service-endpoint delete
   summary: Deletes service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint delete --id
+                                      [--deep]
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+                                      [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Id of the service endpoint to delete.
     description: ''
+  optionalParameters:
   - name: --deep
     summary: Specific to AzureRM endpoint created in Automatic flow. When it is specified, this will also delete corresponding AAD application in Azure.
     description: ''
@@ -60,72 +65,94 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_devops_service-endpoint_list
   name: az devops service-endpoint list
   summary: List service endpoints in a project.
   description: rtypelist of VssJsonCollectionWrapper.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint list [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_show
+- uid: az_devops_service-endpoint_show
   name: az devops service-endpoint show
   summary: Get the details of a service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint show --id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the service endpoint.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_update
+- uid: az_devops_service-endpoint_update
   name: az devops service-endpoint update
   summary: Update a service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint update --id
+                                      [--detect {false, true}]
+                                      [--enable-for-all {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the service endpoint.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -135,7 +162,7 @@ items:
     summary: Allow all pipelines to access this service endpoint.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -144,33 +171,15 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
+- az_devops_service-endpoint_azurerm
+- az_devops_service-endpoint_azurerm_create
+- az_devops_service-endpoint_create
+- az_devops_service-endpoint_delete
+- az_devops_service-endpoint_github
+- az_devops_service-endpoint_github_create
+- az_devops_service-endpoint_list
+- az_devops_service-endpoint_show
+- az_devops_service-endpoint_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -186,4 +195,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage service endpoints/connections.
+metadata:
+  description: Manage service endpoints/connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/azurerm.yml b/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/azurerm.yml
index 753c21aaf3..fc8eaab85b 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/azurerm.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/azurerm.yml
@@ -1,20 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_azurerm_create
-- uid: az_devops_service_endpoint_azurerm_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint_azurerm
+name: az devops service-endpoint azurerm
+summary: Manage Azure RM service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_azurerm_create
   name: az devops service-endpoint azurerm create
   summary: Create an Azure RM type service endpoint.
-  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at https://aka.ms/azure-devops-cli-azurerm-service-endpoint.
+  syntax: >-
+    az devops service-endpoint azurerm create --azure-rm-service-principal-id
+                                              --azure-rm-subscription-id
+                                              --azure-rm-subscription-name
+                                              --azure-rm-tenant-id
+                                              --name
+                                              [--azure-rm-service-principal-certificate-path]
+                                              [--detect {false, true}]
+                                              [--org]
+                                              [--project]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --azure-rm-service-principal-id
     summary: Service principal id for creating azure rm service endpoint.
@@ -35,15 +40,16 @@ items:
     name: --name
     summary: Name of service endpoint to create.
     description: ''
+  optionalParameters:
   - name: --azure-rm-service-principal-certificate-path
-    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:&lt;password_here&gt;". More details : <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.'
+    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:<password_here>". More details : https://aka.ms/azure-devops-cli-azurerm-service-endpoint.'
     description: ''
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,9 +58,7 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
+- az_devops_service-endpoint_azurerm_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -70,4 +74,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure RM service endpoints/connections.
+metadata:
+  description: Manage Azure RM service endpoints/connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/github.yml b/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/github.yml
index e42bf8ec38..2532d9b542 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/github.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/service-endpoint/github.yml
@@ -1,20 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_github_create
-- uid: az_devops_service_endpoint_github_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint_github
+name: az devops service-endpoint github
+summary: Manage GitHub service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_github_create
   name: az devops service-endpoint github create
   summary: Create a GitHub service endpoint.
-  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-service-endpoint">https://aka.ms/azure-devops-cli-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at https://aka.ms/azure-devops-cli-service-endpoint.
+  syntax: >-
+    az devops service-endpoint github create --github-url
+                                             --name
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --github-url
     summary: Url for github for creating service endpoint.
@@ -23,12 +24,13 @@ items:
     name: --name
     summary: Name of service endpoint to create.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -37,9 +39,7 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
+- az_devops_service-endpoint_github_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -55,4 +55,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage GitHub service endpoints/connections.
+metadata:
+  description: Manage GitHub service endpoints/connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/team.yml b/2017-03-09-profile/docs-ref-autogen/devops/team.yml
index e130a3e250..54efcf73e6 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/team.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/team.yml
@@ -1,29 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_team
-  name: az devops team
-  summary: Manage teams.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_team_create
-  - az_devops_team_delete
-  - az_devops_team_list
-  - az_devops_team_list_member
-  - az_devops_team_show
-  - az_devops_team_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_team
+name: az devops team
+summary: Manage teams.
+description: ''
+directCommands:
 - uid: az_devops_team_create
   name: az devops team create
   summary: Create a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team create --name
+                          [--description]
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new team.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the new team.
     description: ''
@@ -32,7 +29,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -44,72 +41,94 @@ items:
   name: az devops team delete
   summary: Delete a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team delete --id
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the team to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_team_list
   name: az devops team list
   summary: List all teams in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team list [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--skip]
+                        [--subscription]
+                        [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --skip
     summary: Number of teams to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of teams to return.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_team_list_member
+  - name: --top
+    summary: Maximum number of teams to return.
+    description: ''
+- uid: az_devops_team_list-member
   name: az devops team list-member
   summary: List members of a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team list-member --team
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--skip]
+                               [--subscription]
+                               [--top]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to show members of.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -117,33 +136,42 @@ items:
   - name: --skip
     summary: Number of members to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of members to return.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of members to return.
+    description: ''
 - uid: az_devops_team_show
   name: az devops team show
   summary: Show team details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team show --team
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to show.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -151,13 +179,20 @@ items:
   name: az devops team update
   summary: Update a team's name and/or description.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team update --team
+                          [--description]
+                          [--detect {false, true}]
+                          [--name]
+                          [--org]
+                          [--project]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to be updated.
     description: ''
+  optionalParameters:
   - name: --description
     summary: New description of the team.
     description: ''
@@ -169,7 +204,7 @@ items:
     summary: New name of the team.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -178,24 +213,12 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
+- az_devops_team_create
+- az_devops_team_delete
+- az_devops_team_list
+- az_devops_team_list-member
+- az_devops_team_show
+- az_devops_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,4 +234,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage teams.
+metadata:
+  description: Manage teams.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/user.yml b/2017-03-09-profile/docs-ref-autogen/devops/user.yml
index 10f8218c6f..8257e0b579 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/user.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/user.yml
@@ -1,24 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_user
-  name: az devops user
-  summary: Manage users.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_user_add
-  - az_devops_user_list
-  - az_devops_user_remove
-  - az_devops_user_show
-  - az_devops_user_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_user
+name: az devops user
+summary: Manage users.
+description: ''
+directCommands:
 - uid: az_devops_user_add
   name: az devops user add
   summary: Add user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user add --email-id
+                       --license-type {advanced, earlyAdopter, express, professional, stakeholder}
+                       [--detect {false, true}]
+                       [--org]
+                       [--send-email-invite {false, true}]
+                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email-id
     summary: Email ID of the user.
@@ -28,12 +25,13 @@ items:
     parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
     summary: License type for the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --send-email-invite
     parameterValueGroup: false, true
@@ -46,67 +44,88 @@ items:
   name: az devops user list
   summary: List users in an organization [except for users which are added via AAD groups].
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user list [--detect {false, true}]
+                        [--org]
+                        [--query-examples]
+                        [--skip]
+                        [--subscription]
+                        [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: 'Offset: Number of records to skip.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --top
     defaultValue: "100"
     summary: Maximum number of users to return. Max value is 10000.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_user_remove
   name: az devops user remove
   summary: Remove user from an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user remove --user
+                          [--detect {false, true}]
+                          [--org]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_user_show
   name: az devops user show
   summary: Show user details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user show --user
+                        [--detect {false, true}]
+                        [--org]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -115,9 +134,13 @@ items:
   name: az devops user update
   summary: Update license type for a user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user update --license-type {advanced, earlyAdopter, express, professional, stakeholder}
+                          --user
+                          [--detect {false, true}]
+                          [--org]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --license-type
     parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
@@ -127,32 +150,23 @@ items:
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
+- az_devops_user_add
+- az_devops_user_list
+- az_devops_user_remove
+- az_devops_user_show
+- az_devops_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -168,4 +182,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage users.
+metadata:
+  description: Manage users.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/wiki.yml b/2017-03-09-profile/docs-ref-autogen/devops/wiki.yml
index 134f191558..98722ad2b5 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/wiki.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/wiki.yml
@@ -1,33 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_wiki_create
-  - az_devops_wiki_delete
-  - az_devops_wiki_list
-  - az_devops_wiki_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_wiki
+name: az devops wiki
+summary: Manage wikis.
+description: ''
+directCommands:
 - uid: az_devops_wiki_create
   name: az devops wiki create
   summary: Create a wiki.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki create [--detect {false, true}]
+                          [--mapped-path]
+                          [--name]
+                          [--org]
+                          [--project]
+                          [--repository]
+                          [--subscription]
+                          [--type {codewiki, projectwiki}]
+                          [--version]
   examples:
   - summary: Create a project wiki
-    syntax:
-      content: az devops wiki create --name myprojectwiki
+    syntax: az devops wiki create --name myprojectwiki
   - summary: Create a code wiki from a folder in a code repository
-    syntax:
-      content: >-
-        az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
+    syntax: >-
+      az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
 
-        --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
-  parameters:
+      --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -39,7 +38,7 @@ items:
     summary: Name of the new wiki.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,6 +46,9 @@ items:
   - name: --repository -r
     summary: '[Required for codewiki type] Name or ID of the repository to publish the wiki from.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --type --wiki-type
     defaultValue: projectwiki
     parameterValueGroup: codewiki, projectwiki
@@ -55,60 +57,69 @@ items:
   - name: --version -v
     summary: '[Required for codewiki type] Repository branch name to publish the code wiki from.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_wiki_delete
   name: az devops wiki delete
   summary: Delete a wiki.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki delete --wiki
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --wiki
     summary: Name or Id of the wiki to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_wiki_list
   name: az devops wiki list
   summary: List all the wikis in a project or organization.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki list [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--scope {organization, project}]
+                        [--subscription]
   examples:
   - summary: List all wikis for a project
-    syntax:
-      content: az devops wiki list
+    syntax: az devops wiki list
   - summary: List all wikis in the organization
-    syntax:
-      content: az devops wiki list --scope organization
-  parameters:
+    syntax: az devops wiki list --scope organization
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     defaultValue: project
     parameterValueGroup: organization, project
@@ -121,13 +132,20 @@ items:
   name: az devops wiki show
   summary: Show details of a wiki.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki show --wiki
+                        [--detect {false, true}]
+                        [--open]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -136,42 +154,27 @@ items:
     summary: Open the wiki in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
+- az_devops_wiki_create
+- az_devops_wiki_delete
+- az_devops_wiki_list
+- az_devops_wiki_page
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
+- az_devops_wiki_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -187,4 +190,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wikis.
+metadata:
+  description: Manage wikis.
diff --git a/2017-03-09-profile/docs-ref-autogen/devops/wiki/page.yml b/2017-03-09-profile/docs-ref-autogen/devops/wiki/page.yml
index 2523227065..73bb957973 100644
--- a/2017-03-09-profile/docs-ref-autogen/devops/wiki/page.yml
+++ b/2017-03-09-profile/docs-ref-autogen/devops/wiki/page.yml
@@ -1,30 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_wiki_page_create
-  - az_devops_wiki_page_delete
-  - az_devops_wiki_page_show
-  - az_devops_wiki_page_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_wiki_page
+name: az devops wiki page
+summary: Manage wiki pages.
+description: ''
+directCommands:
 - uid: az_devops_wiki_page_create
   name: az devops wiki page create
   summary: Add a new page.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki page create --path
+                               --wiki
+                               [--comment]
+                               [--content]
+                               [--detect {false, true}]
+                               [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                               [--file-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
   examples:
   - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
+    syntax: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
   - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with content from a file
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
-  parameters:
+    syntax: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -33,6 +33,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Added a new page using Azure DevOps CLI
     summary: Comment in the commit message of file add operation.
@@ -53,7 +54,7 @@ items:
     summary: Path of the file input if content is specified in the file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -65,9 +66,16 @@ items:
   name: az devops wiki page delete
   summary: Delete a page.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki page delete --path
+                               --wiki
+                               [--comment]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -76,6 +84,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Deleted the page using Azure DevOps CLI
     summary: Comment in the commit message of delete operation.
@@ -85,24 +94,33 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_wiki_page_show
   name: az devops wiki page show
   summary: Get the content of a page or open a page.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki page show --path
+                             --wiki
+                             [--detect {false, true}]
+                             [--include-content]
+                             [--open]
+                             [--org]
+                             [--project]
+                             [--query-examples]
+                             [--subscription]
+                             [--version]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -111,6 +129,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -122,31 +141,42 @@ items:
     summary: Open the wiki page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --version -v
-    summary: Version (ETag) of the wiki page.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version -v
+    summary: Version (ETag) of the wiki page.
+    description: ''
 - uid: az_devops_wiki_page_update
   name: az devops wiki page update
   summary: Edit a page.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki page update --path
+                               --version
+                               --wiki
+                               [--comment]
+                               [--content]
+                               [--detect {false, true}]
+                               [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                               [--file-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
   examples:
   - summary: Update content of page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
+    syntax: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
   - summary: Update content of page with path 'my page' in a wiki with content from a file
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  parameters:
+    syntax: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -159,6 +189,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Updated the page using Azure DevOps CLI
     summary: Comment in the commit message of file edit operation.
@@ -179,7 +210,7 @@ items:
     summary: Path of the file input if content is specified in the file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -188,18 +219,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -215,4 +238,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wiki pages.
+metadata:
+  description: Manage wiki pages.
diff --git a/2017-03-09-profile/docs-ref-autogen/disk-pool.yml b/2017-03-09-profile/docs-ref-autogen/disk-pool.yml
new file mode 100644
index 0000000000..49a0cde4c1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/disk-pool.yml
@@ -0,0 +1,325 @@
+### YamlMime:AzureCLIGroup
+uid: az_disk-pool
+name: az disk-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **diskpool** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az disk-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure disk pool.
+description: ''
+directCommands:
+- uid: az_disk-pool_create
+  name: az disk-pool create
+  summary: Create Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool create --disk-pool-name
+                        --resource-group
+                        --sku
+                        --subnet-id
+                        [--additional-capabilities]
+                        [--availability-zones]
+                        [--disks]
+                        [--location]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Create or Update Disk pool
+    syntax: az disk-pool create --location "westus" --availability-zones "1" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --subnet-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" --sku name="Basic_V0" tier="Basic" --tags key="value" --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: Determines the SKU of the Disk Pool.
+    description: >-
+      Usage: --sku name=XX tier=XX
+
+
+      name: Required. Sku name
+
+      tier: Sku tier.
+  - isRequired: true
+    name: --subnet-id
+    summary: Azure Resource ID of a Subnet for the Disk Pool.
+    description: ''
+  optionalParameters:
+  - name: --additional-capabilities -a
+    summary: List of additional capabilities for a Disk Pool.
+    description: ''
+  - name: --availability-zones
+    summary: 'Logical zone for Disk Pool resource; example: ["1"].'
+    description: ''
+  - name: --disks
+    summary: List of Azure Managed Disks to attach to a Disk Pool.
+    description: >-
+      The order of this parameter is specific customized. Usage:  --disks id-value
+
+
+      id: Required. Unique Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --disks argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_disk-pool_delete
+  name: az disk-pool delete
+  summary: Delete a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool delete --disk-pool-name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: Delete Disk pool
+    syntax: az disk-pool delete --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk-pool_list
+  name: az disk-pool list
+  summary: Gets a list of DiskPools in a resource group. And Gets a list of Disk Pools in a subscription.
+  description: ''
+  syntax: az disk-pool list [--resource-group]
+  examples:
+  - summary: List Disk Pools
+    syntax: az disk-pool list --resource-group "myResourceGroup"
+  - summary: List Disk Pools by subscription
+    syntax: az disk-pool list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_list-skus
+  name: az disk-pool list-skus
+  summary: Lists available Disk Pool Skus in an Azure location.
+  description: ''
+  syntax: az disk-pool list-skus [--location]
+  examples:
+  - summary: List Disk Pool Skus
+    syntax: az disk-pool list-skus --location "eastus"
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_disk-pool_show
+  name: az disk-pool show
+  summary: Get a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool show --disk-pool-name
+                      --resource-group
+  examples:
+  - summary: Get Disk pool
+    syntax: az disk-pool show --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_start
+  name: az disk-pool start
+  summary: The operation to start a Disk Pool.
+  description: ''
+  syntax: >-
+    az disk-pool start --disk-pool-name
+                       --resource-group
+                       [--no-wait]
+  examples:
+  - summary: Start Disk Pool
+    syntax: az disk-pool start --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_disk-pool_stop
+  name: az disk-pool stop
+  summary: Shuts down the Disk Pool and releases the compute resources. You are not billed for the compute resources that this Disk Pool uses.
+  description: ''
+  syntax: >-
+    az disk-pool stop --disk-pool-name
+                      --resource-group
+                      [--no-wait]
+  examples:
+  - summary: Deallocate Disk Pool
+    syntax: az disk-pool stop --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_disk-pool_update
+  name: az disk-pool update
+  summary: Update a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool update --disk-pool-name
+                        --resource-group
+                        [--disks]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Update Disk pool
+    syntax: az disk-pool update --name "myDiskPool" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --tags key="value" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disks
+    summary: List of Azure Managed Disks to attach to a Disk Pool.
+    description: >-
+      The order of this parameter is specific customized. Usage:  --disks id-value
+
+
+      id: Required. Unique Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --disks argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_disk-pool_wait
+  name: az disk-pool wait
+  summary: Place the CLI in a waiting state until a condition of the disk-pool is met.
+  description: ''
+  syntax: >-
+    az disk-pool wait --disk-pool-name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully created.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully updated.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully deleted.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_disk-pool_create
+- az_disk-pool_delete
+- az_disk-pool_iscsi-target
+- az_disk-pool_iscsi-target_create
+- az_disk-pool_iscsi-target_delete
+- az_disk-pool_iscsi-target_list
+- az_disk-pool_iscsi-target_show
+- az_disk-pool_iscsi-target_update
+- az_disk-pool_iscsi-target_wait
+- az_disk-pool_list
+- az_disk-pool_list-skus
+- az_disk-pool_show
+- az_disk-pool_start
+- az_disk-pool_stop
+- az_disk-pool_update
+- az_disk-pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure disk pool.
diff --git a/2017-03-09-profile/docs-ref-autogen/disk-pool/iscsi-target.yml b/2017-03-09-profile/docs-ref-autogen/disk-pool/iscsi-target.yml
new file mode 100644
index 0000000000..0eb020a1c3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/disk-pool/iscsi-target.yml
@@ -0,0 +1,289 @@
+### YamlMime:AzureCLIGroup
+uid: az_disk-pool_iscsi-target
+name: az disk-pool iscsi-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **diskpool** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az disk-pool iscsi-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage iSCSI target with a Disk Pool.
+description: ''
+directCommands:
+- uid: az_disk-pool_iscsi-target_create
+  name: az disk-pool iscsi-target create
+  summary: Create an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target create --acl-mode {Dynamic, Static}
+                                     --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--luns]
+                                     [--no-wait]
+                                     [--static-acls]
+                                     [--target-iqn]
+  examples:
+  - summary: Create or Update iSCSI Target
+    syntax: az disk-pool iscsi-target create --disk-pool-name "myDiskPool" --acl-mode "Dynamic" --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --target-iqn "iqn.2005-03.org.iscsi:server1" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --acl-mode
+    parameterValueGroup: Dynamic, Static
+    summary: Mode for Target connectivity.
+    description: ''
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --luns
+    summary: List of LUNs to be exposed through iSCSI Target.
+    description: >-
+      Usage: --luns name=XX managed-disk-azure-resource-id=XX
+
+
+      name: Required. User defined name for iSCSI LUN; example: "lun0"
+
+      managed-disk-azure-resource-id: Required. Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --luns argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --static-acls
+    summary: Access Control List (ACL) for an iSCSI Target; defines LUN masking policy.
+    description: >-
+      Usage: --static-acls initiator-iqn=XX mapped-luns=XX
+
+
+      initiator-iqn: Required. iSCSI initiator IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:client".
+
+      mapped-luns: Required. List of LUN names mapped to the ACL.
+
+
+      Multiple actions can be specified by using more than one --static-acls argument.
+  - name: --target-iqn
+    summary: 'ISCSI Target IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:server".'
+    description: ''
+- uid: az_disk-pool_iscsi-target_delete
+  name: az disk-pool iscsi-target delete
+  summary: Delete an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target delete --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete iSCSI Target
+    syntax: az disk-pool iscsi-target delete --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk-pool_iscsi-target_list
+  name: az disk-pool iscsi-target list
+  summary: Get iSCSI Targets in a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target list --disk-pool-name
+                                   --resource-group
+  examples:
+  - summary: List Disk Pools by Resource Group
+    syntax: az disk-pool iscsi-target list --disk-pool-name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_iscsi-target_show
+  name: az disk-pool iscsi-target show
+  summary: Get an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target show --disk-pool-name
+                                   --iscsi-target-name
+                                   --resource-group
+  examples:
+  - summary: Get iSCSI Target
+    syntax: az disk-pool iscsi-target show --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_iscsi-target_update
+  name: az disk-pool iscsi-target update
+  summary: Update an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target update --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--luns]
+                                     [--no-wait]
+                                     [--static-acls]
+  examples:
+  - summary: Update iSCSI Target
+    syntax: az disk-pool iscsi-target update --disk-pool-name "myDiskPool" --name "myIscsiTarget" --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --luns
+    summary: List of LUNs to be exposed through iSCSI Target.
+    description: >-
+      Usage: --luns name=XX managed-disk-azure-resource-id=XX
+
+
+      name: Required. User defined name for iSCSI LUN; example: "lun0"
+
+      managed-disk-azure-resource-id: Required. Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --luns argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --static-acls
+    summary: Access Control List (ACL) for an iSCSI Target; defines LUN masking policy.
+    description: >-
+      Usage: --static-acls initiator-iqn=XX mapped-luns=XX
+
+
+      initiator-iqn: Required. iSCSI initiator IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:client".
+
+      mapped-luns: Required. List of LUN names mapped to the ACL.
+
+
+      Multiple actions can be specified by using more than one --static-acls argument.
+- uid: az_disk-pool_iscsi-target_wait
+  name: az disk-pool iscsi-target wait
+  summary: Place the CLI in a waiting state until a condition of the disk-pool iscsi-target is met.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target wait --disk-pool-name
+                                   --iscsi-target-name
+                                   --resource-group
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully created.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully updated.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully deleted.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_disk-pool_iscsi-target_create
+- az_disk-pool_iscsi-target_delete
+- az_disk-pool_iscsi-target_list
+- az_disk-pool_iscsi-target_show
+- az_disk-pool_iscsi-target_update
+- az_disk-pool_iscsi-target_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage iSCSI target with a Disk Pool.
diff --git a/2017-03-09-profile/docs-ref-autogen/dms.yml b/2017-03-09-profile/docs-ref-autogen/dms.yml
new file mode 100644
index 0000000000..172507032f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dms.yml
@@ -0,0 +1,35 @@
+### YamlMime:AzureCLIGroup
+uid: az_dms
+name: az dms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **dms-preview** extension for Azure CLI and requires version 2.0.43 or higher.  The extension will automatically install the first time you run an **az dms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Data Migration Service (DMS) instances.
+description: ''
+commands:
+- az_dms_project
+- az_dms_project_create
+- az_dms_project_task
+- az_dms_project_task_cancel
+- az_dms_project_task_create
+- az_dms_project_task_cutover
+- az_dms_project_task_restart
+- az_dms_project_task_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Data Migration Service (DMS) instances.
diff --git a/2017-03-09-profile/docs-ref-autogen/dms/project.yml b/2017-03-09-profile/docs-ref-autogen/dms/project.yml
new file mode 100644
index 0000000000..e3aaf67902
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dms/project.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_dms_project
+name: az dms project
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **dms-preview** extension for Azure CLI and requires version 2.0.43 or higher.  The extension will automatically install the first time you run an **az dms project** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage projects for an instance of the Data Migration Service.
+description: ''
+directCommands:
+- uid: az_dms_project_create
+  name: az dms project create
+  summary: Create a migration Project which can contain multiple Tasks.
+  description: >-
+    The following project configurations are supported:
+        -) source -> target
+        1) SQL -> SQLDB
+        2) MySQL -> AzureDbForMySql
+        3) PostgreSQL -> AzureDbForPostgreSQL
+        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API).
+  syntax: >-
+    az dms project create --location
+                          --name
+                          --resource-group
+                          --service-name
+                          --source-platform
+                          --target-platform
+                          [--tags]
+  examples:
+  - summary: Create a SQL Project for a DMS instance.
+    syntax: az dms project create -l westus -n myproject -g myresourcegroup --service-name mydms --source-platform SQL --target-platform SQLDB --tags tagName1=tagValue1 tagWithNoValue
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  - isRequired: true
+    name: --source-platform
+    summary: 'The type of server for the source database. The supported types are: SQL, MySQL, PostgreSQL, MongoDB.'
+    description: ''
+  - isRequired: true
+    name: --target-platform
+    summary: 'The type of service for the target database. The supported types are: SQLDB, AzureDbForMySql, AzureDbForPostgreSQL, MongoDB.'
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: A space-delimited list of tags in tag1[=value1]" format.
+    description: ''
+commands:
+- az_dms_project_create
+- az_dms_project_task
+- az_dms_project_task_cancel
+- az_dms_project_task_create
+- az_dms_project_task_cutover
+- az_dms_project_task_restart
+- az_dms_project_task_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage projects for an instance of the Data Migration Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/dms/project/task.yml b/2017-03-09-profile/docs-ref-autogen/dms/project/task.yml
new file mode 100644
index 0000000000..f0bc264282
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dms/project/task.yml
@@ -0,0 +1,384 @@
+### YamlMime:AzureCLIGroup
+uid: az_dms_project_task
+name: az dms project task
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **dms-preview** extension for Azure CLI and requires version 2.0.43 or higher.  The extension will automatically install the first time you run an **az dms project task** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tasks for a Data Migration Service instance's project.
+description: ''
+directCommands:
+- uid: az_dms_project_task_cancel
+  name: az dms project task cancel
+  summary: This command is being deprecated. Use the stop command instead.
+  description: >-
+    To keep a more consistent experience with Azure's portal UI use:
+        az dms project task stop.
+  syntax: >-
+    az dms project task cancel --name
+                               --project-name
+                               --resource-group
+                               --service-name
+                               [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --object-name
+    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
+    description: ''
+- uid: az_dms_project_task_create
+  name: az dms project task create
+  summary: Create and start a migration Task.
+  description: >-
+    The following task configurations are supported:
+        -) source -> target :: task type
+        1) SQL -> SQLDB :: OfflineMigration
+        2) MySQL -> AzureDbForMySql :: OnlineMigration
+        3) PostgreSQL -> AzureDbForPostgreSQL :: OnlineMigration
+        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API) :: OfflineMigration.
+  syntax: >-
+    az dms project task create --database-options-json
+                               --name
+                               --project-name
+                               --resource-group
+                               --service-name
+                               --source-connection-json
+                               --target-connection-json
+                               --task-type
+                               [--enable-data-integrity-validation]
+                               [--enable-query-analysis-validation]
+                               [--enable-schema-validation]
+                               [--validate-only]
+                               [--validated-task-name]
+  examples:
+  - summary: Create and start a SQL Task which performs no validation checks.
+    syntax: "az dms project task create --database-options-json C:\\CliFiles\\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json '{'dataSource': 'myserver', 'authentication': 'SqlAuthentication', 'encryptConnection': 'true', 'trustServerCertificate': 'true'}' --target-connection-json C:\\CliFiles\\targetConnection.json --task-type offlinemigration"
+  - summary: Create and start a SQL Task which performs all validation checks.
+    syntax: az dms project task create --database-options-json C:\CliFiles\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json C:\CliFiles\sourceConnection.json --target-connection-json C:\CliFiles\targetConnection.json --enable-data-integrity-validation --enable-query-analysis-validation --enable-schema-validation --task-type offlinemigration
+  requiredParameters:
+  - isRequired: true
+    name: --database-options-json
+    summary: Database and table information. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
+    description: >-
+      For SQL we support per table migrations. To use this, specify the tables names in the 'table_map' as below. You can also set the source as read only.
+        [
+            {
+                "name": "source database",
+                "target_database_name": "target database",
+                "make_source_db_read_only": false|true,
+                "table_map": {
+                    "schema.SourceTableName1": "schema.TargetTableName1",
+                    "schema.SourceTableName2": "schema.TargetTableName2",
+                    ...n
+                }
+            },
+            ...n
+        ]
+
+      For MySQL and PostgreSQL, the format of the database options JSON object.
+        [
+            {
+                "name": "source database",
+                "target_database_name": "target database",
+                // Used for manipulating the underlying migration engine.
+                // Only provide if instructed to do so or if you really know what you are doing.
+                "migrationSetting": {
+                    "setting1": "value1",
+                    ...n
+                },
+                // Used for manipulating the underlying migration engine.
+                // Only provide if instructed to do so or if you really know what you are doing.
+                "sourceSetting": {
+                    "setting1": "value1",
+                    ...n
+                },
+                // Used for manipulating the underlying migration engine.
+                // Only provide if instructed to do so or if you really know what you are doing.
+                "targetSetting": {
+                    "setting1": "value1",
+                    ...n
+                },
+                // Applies only for PostgreSQL
+                // List tables that you want included in the migration.
+                "selectedTables": [
+                    "schemaName1.tableName1",
+                    ...n
+                ]
+            },
+            ...n
+        ]
+
+      For MongoDB we support per collection migrations. To use this, specify the collections inside the database object as below.
+        {
+            // set to zero to get the default boost during migration (recommended)
+            "boostRUs": 0,
+            // "OneTime" or "Continuous", only "OneTime" is currently supported
+            "replication": "OneTime",
+            // Set to null to use maximum resources available.
+            "throttling": {
+                // percentage of the CPU to try to avoid using
+                "minFreeCpu": 25,
+                // amount of RAM (in MBs) to try to avoid using
+                "minFreeMemoryMb": 1024,
+                // max number of collections to migrate at a time
+                "maxParallelism": 2
+            },
+            "databases": {
+                "database_name": {
+                    // see https://docs.microsoft.com/th-th/azure/cosmos-db/request-units,     ||
+                    // set to null to use default
+                    // or 0 if throughput should not be provisioned at the database level
+                    "targetRUs": 0,
+                    "collections": {
+                        "collection_name_1": {
+                            // Whether the target database/collection will be deleted if exists
+                            "canDelete": true,
+                            // set to null if target should not be sharded
+                            // or to copy the shard key from source (if exists)
+                            "shardKey": null,
+                            // set to null to use default (recommended)
+                            "targetRUs": null
+                        },
+                        "collection_name_2": {
+                            "canDelete": true,
+                            "shardKey": {
+                                "fields": [
+                                    {
+                                        "name": "field_name",
+                                        // accepts "Forward", "Reverse", or "Hashed" but CosmosDB only accepts a single-field, hashed shard key
+                                        "order": "Forward"
+                                    },
+                                    ...n
+                                ],
+                                // whether shard key is unique
+                                // see https://docs.microsoft.com/azure/cosmos-db/partition-data
+                                "isUnique": false
+                            },
+                            "targetRUs": 10000
+                        },
+                        ...n
+                    }
+                },
+                ...n
+            }
+        }.
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  - isRequired: true
+    name: --source-connection-json
+    summary: The connection information to the source server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
+    description: >-
+      The format of the connection JSON object for SQL connections.
+        {
+            "userName": "user name",    // if this is missing or null, you will be prompted
+            "password": null,           // if this is missing or null (highly recommended) you will be prompted
+            "dataSource": "server name[,port]",
+            "authentication": "SqlAuthentication|WindowsAuthentication",
+            "encryptConnection": true,      // highly recommended to leave as true
+            "trustServerCertificate": false  // highly recommended to leave as false
+        }
+
+      The format of the connection JSON object for MySql connections.
+        {
+            "userName": "user name",    // if this is missing or null, you will be prompted
+            "password": null,           // if this is missing or null (highly recommended) you will be prompted
+            "serverName": "server name",
+            "port": 3306                // if this is missing, it will default to 3306
+        }
+
+      The format of the connection JSON object for PostgreSQL connections.
+        {
+            "userName": "user name",    // if this is missing or null, you will be prompted
+            "password": null,           // if this is missing or null (highly recommended) you will be prompted
+            "serverName": "server name",
+            "databaseName": "database name", // if this is missing, it will default to the 'postgres' database
+            "port": 5432,                // if this is missing, it will default to 5432
+            "encryptConnection": true,      // highly recommended to leave as true (For PostgreSQL to Azure PostgreSQL migration only)
+            "trustServerCertificate": false  // highly recommended to leave as false (For PostgreSQL to Azure PostgreSQL migration only)
+        }
+
+      The format of the connection JSON object for MongoDB connections.
+        {
+            "userName": null,   // if this is missing or null, you will be prompted
+            "password": null,   // if this is missing or null (highly recommended) you will be prompted
+            "connectionString": "mongodb://hostOrIp:port"
+        }.
+  - isRequired: true
+    name: --target-connection-json
+    summary: The connection information to the target server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See 'source-connection-json' for examples of connection formats.
+    description: ''
+  - isRequired: true
+    name: --task-type
+    summary: 'The type of data movement the task will support. The supported types are: OnlineMigration, OfflineMigration.'
+    description: ''
+  optionalParameters:
+  - name: --enable-data-integrity-validation
+    summary: (For SQL only) Whether to perform a checksum based data integrity validation between source and target for the selected database and tables.
+    description: ''
+  - name: --enable-query-analysis-validation
+    summary: (For SQL only) Whether to perform a quick and intelligent query analysis by retrieving queries from the source database and executing them in the target. The result will have execution statistics for executions in source and target databases for the extracted queries.
+    description: ''
+  - name: --enable-schema-validation
+    summary: (For SQL only) Whether to compare the schema information between source and target.
+    description: ''
+  - name: --validate-only
+    summary: (For MongoDB to Cosmos DB only) Whether to run validation only and NOT run migration. It is mandatory to run a 'validate only' task before attempting an actual migration. Once the validation is complete, pass the name of this 'validate only' task to a new task's 'validated task name' argument.
+    description: ''
+  - name: --validated-task-name
+    summary: (For MongoDB to Cosmos DB only) When running a migration it is neceaary to pass in the name of a previously run 'validate only' task.
+    description: ''
+- uid: az_dms_project_task_cutover
+  name: az dms project task cutover
+  summary: For an online migration task, complete the migration by performing a cutover.
+  description: >-
+    To see the result of the request, please use the 'task show' command:
+        az dms project task show ... --expand command.
+  syntax: >-
+    az dms project task cutover --name
+                                --project-name
+                                --resource-group
+                                --service-name
+                                [--immediate]
+                                [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --immediate
+    summary: For MongoDB migrations, whether to cutover immediately or to let the currently loaded events get migrated. For all other migration types, this has no effect.
+    description: ''
+  - name: --object-name
+    summary: For MongoDB migrations, the qualified name of the database or collection you wish to cutover. Leave blank to cutover the entire migration. For all other migration types, the name of the database on the source you wish to cutover.
+    description: ''
+- uid: az_dms_project_task_restart
+  name: az dms project task restart
+  summary: ''
+  description: >-
+    To see the result of the request, please use the 'task show' command:
+        az dms project task show ... --expand command.
+  syntax: >-
+    az dms project task restart --name
+                                --project-name
+                                --resource-group
+                                --service-name
+                                [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --object-name
+    summary: The qualified name of the database or collection you wish to restart. Leave blank to restart the entire migration.
+    description: ''
+- uid: az_dms_project_task_stop
+  name: az dms project task stop
+  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
+  description: >-
+    To see the result of the request, please use the 'task show' command:
+        az dms project task show ... --expand command.
+  syntax: >-
+    az dms project task stop --name
+                             --project-name
+                             --resource-group
+                             --service-name
+                             [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --object-name
+    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
+    description: ''
+commands:
+- az_dms_project_task_cancel
+- az_dms_project_task_create
+- az_dms_project_task_cutover
+- az_dms_project_task_restart
+- az_dms_project_task_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tasks for a Data Migration Service instance's project.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt.yml b/2017-03-09-profile/docs-ref-autogen/dt.yml
new file mode 100644
index 0000000000..98071f0631
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt.yml
@@ -0,0 +1,215 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt
+name: az dt
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Digital Twins solutions & infrastructure.
+description: ''
+directCommands:
+- uid: az_dt_create
+  name: az dt create
+  summary: Create or update a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt create --dt-name
+                 --resource-group
+                 [--assign-identity {false, true}]
+                 [--location]
+                 [--pna {Disabled, Enabled}]
+                 [--role]
+                 [--scopes]
+                 [--tags]
+  examples:
+  - summary: Create instance in target resource group using the resource group location.
+    syntax: az dt create -n {instance_name} -g {resouce_group}
+  - summary: Create instance in target resource group with specified location and tags.
+    syntax: az dt create -n {instance_name} -g {resouce_group} -l westus --tags a=b c=d
+  - summary: Create instance in the target resource group with a system managed identity.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity
+  - summary: Create instance in the target resource group with a system managed identity then assign the identity to one or more scopes (space-separated) with the role of Contributor.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity --scopes "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.EventHub/namespaces/myEventHubNamespace/eventhubs/myEventHub" "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.ServiceBus/namespaces/myServiceBusNamespace/topics/myTopic"
+  - summary: Create instance in the target resource group with a system managed identity then assign the identity to one or more scopes with a custom specified role.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity --scopes "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.EventHub/namespaces/myEventHubNamespace/eventhubs/myEventHub" "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.ServiceBus/namespaces/myServiceBusNamespace/topics/myTopic" --role MyCustomRole
+  - summary: Update an instance in the target resource group to enable system managed identity.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity
+  - summary: Update an instance in the target resource group to disable system managed identity.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity false
+  - summary: Update an instance in the target resource group with new tag values and disable public network access.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --tags env=prod --public-network-access Disabled
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity
+    parameterValueGroup: false, true
+    summary: Assign a system generated identity to the Digital Twins instance.
+    description: ''
+  - name: --location -l
+    summary: Digital Twins instance location. If no location is provided the resource group location is used.You can configure the default location using `az configure --defaults location=<name>`.
+    description: ''
+  - name: --pna --public-network-access
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Determines if the Digital Twins instance can be accessed from a public network.
+    description: ''
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or Id the system assigned identity will have.
+    description: ''
+  - name: --scopes
+    summary: Space-seperated scopes the system assigned identity can access.
+    description: ''
+  - name: --tags
+    summary: 'Digital Twins instance tags. Property bag in key-value pairs with the following format: a=b c=d.'
+    description: ''
+- uid: az_dt_delete
+  name: az dt delete
+  summary: Delete an existing Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt delete --dt-name
+                 [--no-wait]
+                 [--resource-group]
+                 [--yes]
+  examples:
+  - summary: Delete an arbitrary instance in blocking fashion with a confirmation prompt.
+    syntax: az dt delete -n {instance_name}
+  - summary: Delete an arbitrary instance with no blocking or prompt.
+    syntax: az dt delete -n {instance_name} -y --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_list
+  name: az dt list
+  summary: List the collection of Digital Twins instances by subscription or resource group.
+  description: ''
+  syntax: az dt list [--resource-group]
+  examples:
+  - summary: List all instances in the current subscription.
+    syntax: az dt list
+  - summary: List all instances in target resource group and output in table format.
+    syntax: az dt list -g {resource_group} --output table
+  - summary: List all instances in subscription that meet a condition.
+    syntax: az dt list --query "[?contains(name, 'Production')]"
+  - summary: Count instances that meet condition.
+    syntax: az dt list --query "length([?contains(name, 'Production')])"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_show
+  name: az dt show
+  summary: Show an existing Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt show --dt-name
+               [--resource-group]
+  examples:
+  - summary: Show an instance.
+    syntax: az dt show -n {instance_name}
+  - summary: Show an instance and project certain properties.
+    syntax: az dt show -n {instance_name} --query "{Endpoint:hostName, Location:location}"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_create
+- az_dt_delete
+- az_dt_endpoint
+- az_dt_endpoint_create
+- az_dt_endpoint_create_eventgrid
+- az_dt_endpoint_create_eventhub
+- az_dt_endpoint_create_servicebus
+- az_dt_endpoint_delete
+- az_dt_endpoint_list
+- az_dt_endpoint_show
+- az_dt_list
+- az_dt_model
+- az_dt_model_create
+- az_dt_model_delete
+- az_dt_model_delete-all
+- az_dt_model_list
+- az_dt_model_show
+- az_dt_model_update
+- az_dt_network
+- az_dt_network_private-endpoint
+- az_dt_network_private-endpoint_connection
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+- az_dt_network_private-link
+- az_dt_network_private-link_list
+- az_dt_network_private-link_show
+- az_dt_role-assignment
+- az_dt_role-assignment_create
+- az_dt_role-assignment_delete
+- az_dt_role-assignment_list
+- az_dt_route
+- az_dt_route_create
+- az_dt_route_delete
+- az_dt_route_list
+- az_dt_route_show
+- az_dt_show
+- az_dt_twin
+- az_dt_twin_component
+- az_dt_twin_component_show
+- az_dt_twin_component_update
+- az_dt_twin_create
+- az_dt_twin_delete
+- az_dt_twin_delete-all
+- az_dt_twin_query
+- az_dt_twin_relationship
+- az_dt_twin_relationship_create
+- az_dt_twin_relationship_delete
+- az_dt_twin_relationship_delete-all
+- az_dt_twin_relationship_list
+- az_dt_twin_relationship_show
+- az_dt_twin_relationship_update
+- az_dt_twin_show
+- az_dt_twin_telemetry
+- az_dt_twin_telemetry_send
+- az_dt_twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Digital Twins solutions & infrastructure.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/endpoint.yml b/2017-03-09-profile/docs-ref-autogen/dt/endpoint.yml
new file mode 100644
index 0000000000..e68bb77d02
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/endpoint.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_endpoint
+name: az dt endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Digital Twins instance endpoints.
+description: ''
+directCommands:
+- uid: az_dt_endpoint_delete
+  name: az dt endpoint delete
+  summary: Remove an endpoint from a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt endpoint delete --dt-name
+                          --en
+                          [--no-wait]
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: Remove an endpoint from an instance and block until the operation is complete.
+    syntax: az dt endpoint delete -n {instance_name} --endpoint-name {endpoint_name}
+  - summary: Remove an endpoint from an instance without confirmation or blocking.
+    syntax: az dt endpoint delete -n {instance_name} --endpoint-name {endpoint_name} -y --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_endpoint_list
+  name: az dt endpoint list
+  summary: List all egress endpoints configured on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt endpoint list --dt-name
+                        [--resource-group]
+  examples:
+  - summary: List all egress endpoints configured on an instance.
+    syntax: az dt endpoint list -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_endpoint_show
+  name: az dt endpoint show
+  summary: Show details of an endpoint configured on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt endpoint show --dt-name
+                        --en
+                        [--resource-group]
+  examples:
+  - summary: Show a desired endpoint by name on an instance.
+    syntax: az dt endpoint show -n {instance_name} --endpoint-name {endpoint_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_endpoint_create
+- az_dt_endpoint_create_eventgrid
+- az_dt_endpoint_create_eventhub
+- az_dt_endpoint_create_servicebus
+- az_dt_endpoint_delete
+- az_dt_endpoint_list
+- az_dt_endpoint_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Digital Twins instance endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/endpoint/create.yml b/2017-03-09-profile/docs-ref-autogen/dt/endpoint/create.yml
new file mode 100644
index 0000000000..bbe9b39467
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/endpoint/create.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_endpoint_create
+name: az dt endpoint create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt endpoint create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Add egress endpoints to a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_endpoint_create_eventgrid
+  name: az dt endpoint create eventgrid
+  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
+  description: ''
+  syntax: >-
+    az dt endpoint create eventgrid --dt-name
+                                    --egg
+                                    --egt
+                                    --en
+                                    [--auth-type {IdentityBased, KeyBased}]
+                                    [--deadletter-sas-uri]
+                                    [--deadletter-uri]
+                                    [--egs]
+                                    [--resource-group]
+  examples:
+  - summary: Adds an EventGrid Topic endpoint to a target instance.
+    syntax: az dt endpoint create eventgrid --endpoint-name {endpoint_name} --eventgrid-resource-group {eventgrid_resource_group} --eventgrid-topic {eventgrid_topic_name} -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --egg --eventgrid-resource-group
+    summary: Name of EventGrid Topic resource group.
+    description: ''
+  - isRequired: true
+    name: --egt --eventgrid-topic
+    summary: Name of EventGrid Topic to integrate with.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: KeyBased
+    parameterValueGroup: IdentityBased, KeyBased
+    summary: Endpoint authentication type.
+    description: ''
+  - name: --deadletter-sas-uri --dsu
+    summary: Dead-letter storage container URL with SAS token for Key based authentication.
+    description: ''
+  - name: --deadletter-uri --du
+    summary: Dead-letter storage container URL for Identity based authentication.
+    description: ''
+  - name: --egs --eventgrid-subscription
+    summary: Name or ID of subscription where the endpoint resource exists. If no subscription is provided the default subscription is used.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_endpoint_create_eventhub
+  name: az dt endpoint create eventhub
+  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource. The instance must be created with a managed identity to support identity based endpoint integration.
+  description: ''
+  syntax: >-
+    az dt endpoint create eventhub --dt-name
+                                   --eh
+                                   --ehg
+                                   --ehn
+                                   --en
+                                   [--auth-type {IdentityBased, KeyBased}]
+                                   [--deadletter-sas-uri]
+                                   [--deadletter-uri]
+                                   [--ehp]
+                                   [--ehs]
+                                   [--resource-group]
+  examples:
+  - summary: Adds an EventHub endpoint to a target instance using Key based auth.
+    syntax: az dt endpoint create eventhub --endpoint-name {endpoint_name} --eventhub-resource-group {eventhub_resource_group} --eventhub-namespace {eventhub_namespace} --eventhub {eventhub_name} --eventhub-policy {eventhub_policy} -n {instance_name}
+  - summary: Adds an EventHub endpoint to a target instance using Identity based auth.
+    syntax: az dt endpoint create eventhub --endpoint-name {endpoint_name} --eventhub-resource-group {eventhub_resource_group} --eventhub-namespace {eventhub_namespace} --eventhub {eventhub_name} --auth-type IdentityBased -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --eh --eventhub
+    summary: Name of EventHub to integrate with.
+    description: ''
+  - isRequired: true
+    name: --ehg --eventhub-resource-group
+    summary: Name of EventHub resource group.
+    description: ''
+  - isRequired: true
+    name: --ehn --eventhub-namespace
+    summary: EventHub Namespace identifier.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: KeyBased
+    parameterValueGroup: IdentityBased, KeyBased
+    summary: Endpoint authentication type.
+    description: ''
+  - name: --deadletter-sas-uri --dsu
+    summary: Dead-letter storage container URL with SAS token for Key based authentication.
+    description: ''
+  - name: --deadletter-uri --du
+    summary: Dead-letter storage container URL for Identity based authentication.
+    description: ''
+  - name: --ehp --eventhub-policy
+    summary: EventHub policy to use for endpoint configuration. Required when --auth-type is KeyBased.
+    description: ''
+  - name: --ehs --eventhub-subscription
+    summary: Name or ID of subscription where the endpoint resource exists. If no subscription is provided the default subscription is used.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_endpoint_create_servicebus
+  name: az dt endpoint create servicebus
+  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource. The instance must be created with a managed identity to support identity based endpoint integration.
+  description: ''
+  syntax: >-
+    az dt endpoint create servicebus --dt-name
+                                     --en
+                                     --sbg
+                                     --sbn
+                                     --sbt
+                                     [--auth-type {IdentityBased, KeyBased}]
+                                     [--deadletter-sas-uri]
+                                     [--deadletter-uri]
+                                     [--resource-group]
+                                     [--sbp]
+                                     [--sbs]
+  examples:
+  - summary: Adds a ServiceBus Topic endpoint to a target instance using Key based auth.
+    syntax: az dt endpoint create servicebus --endpoint-name {endpoint_name} --servicebus-resource-group {servicebus_resource_group} --servicebus-namespace {servicebus_namespace} --servicebus-topic {servicebus_topic_name} --servicebus-policy {servicebus_policy} -n {instance_name}
+  - summary: Adds a ServiceBus Topic endpoint to a target instance using Identity based auth.
+    syntax: az dt endpoint create servicebus --endpoint-name {endpoint_name} --servicebus-resource-group {servicebus_resource_group} --servicebus-namespace {servicebus_namespace} --servicebus-topic {servicebus_topic_name} -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  - isRequired: true
+    name: --sbg --servicebus-resource-group
+    summary: Name of ServiceBus resource group.
+    description: ''
+  - isRequired: true
+    name: --sbn --servicebus-namespace
+    summary: ServiceBus Namespace identifier.
+    description: ''
+  - isRequired: true
+    name: --sbt --servicebus-topic
+    summary: Name of ServiceBus Topic to integrate with.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: KeyBased
+    parameterValueGroup: IdentityBased, KeyBased
+    summary: Endpoint authentication type.
+    description: ''
+  - name: --deadletter-sas-uri --dsu
+    summary: Dead-letter storage container URL with SAS token for Key based authentication.
+    description: ''
+  - name: --deadletter-uri --du
+    summary: Dead-letter storage container URL for Identity based authentication.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sbp --servicebus-policy
+    summary: ServiceBus Topic policy to use for endpoint configuration. Required when --auth-type is KeyBased.
+    description: ''
+  - name: --sbs --servicebus-subscription
+    summary: Name or ID of subscription where the endpoint resource exists. If no subscription is provided the default subscription is used.
+    description: ''
+commands:
+- az_dt_endpoint_create_eventgrid
+- az_dt_endpoint_create_eventhub
+- az_dt_endpoint_create_servicebus
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Add egress endpoints to a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/model.yml b/2017-03-09-profile/docs-ref-autogen/dt/model.yml
new file mode 100644
index 0000000000..54ff392059
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/model.yml
@@ -0,0 +1,202 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_model
+name: az dt model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage DTDL models and definitions on a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_model_create
+  name: az dt model create
+  summary: Uploads one or more models. When any error occurs, no models are uploaded.
+  description: --models can be inline json or file path.
+  syntax: >-
+    az dt model create --dt-name
+                       [--fd]
+                       [--models]
+                       [--resource-group]
+  examples:
+  - summary: Bulk upload all .json or .dtdl model files from a target directory. Model processing is recursive.
+    syntax: az dt model create -n {instance_or_hostname} --from-directory {directory_path}
+  - summary: Upload model json inline or from file path.
+    syntax: az dt model create -n {instance_or_hostname} --models {file_path_or_inline_json}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --fd --from-directory
+    summary: The directory JSON model files will be parsed from.
+    description: ''
+  - name: --models
+    summary: Inline model JSON or file path to model JSON.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_delete
+  name: az dt model delete
+  summary: Delete a model. A model can only be deleted if no other models reference it.
+  description: ''
+  syntax: >-
+    az dt model delete --dt-name
+                       --dtmi
+                       [--resource-group]
+  examples:
+  - summary: Delete a target model.
+    syntax: az dt model delete -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_delete-all
+  name: az dt model delete-all
+  summary: Delete all models within a Digital Twins instance. Twins configurations are not affected but may be broken without model definitions.
+  description: ''
+  syntax: >-
+    az dt model delete-all --dt-name
+                           [--resource-group]
+                           [--yes]
+  examples:
+  - summary: Delete all models.
+    syntax: az dt model delete-all -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_model_list
+  name: az dt model list
+  summary: List model metadata, definitions and dependencies.
+  description: ''
+  syntax: >-
+    az dt model list --dt-name
+                     [--def {false, true}]
+                     [--dependencies-for]
+                     [--resource-group]
+  examples:
+  - summary: List model metadata
+    syntax: az dt model list -n {instance_or_hostname}
+  - summary: List model definitions
+    syntax: az dt model list -n {instance_or_hostname} --definition
+  - summary: List dependencies of particular pre-existing model(s). Space seperate dtmi values.
+    syntax: az dt model list -n {instance_or_hostname} --dependencies-for {model_id0} {model_id1}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --def --definition
+    parameterValueGroup: false, true
+    summary: The operation will retrieve the model definition.
+    description: ''
+  - name: --dependencies-for
+    summary: The set of models which will have their dependencies retrieved. If omitted, all models are retrieved. Format is a whitespace separated list.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_show
+  name: az dt model show
+  summary: Retrieve a target model or model definition.
+  description: ''
+  syntax: >-
+    az dt model show --dt-name
+                     --dtmi
+                     [--def {false, true}]
+                     [--resource-group]
+  examples:
+  - summary: Show model meta data
+    syntax: az dt model show -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1"
+  - summary: Show model meta data and definition
+    syntax: az dt model show -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1" --definition
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  optionalParameters:
+  - name: --def --definition
+    parameterValueGroup: false, true
+    summary: The operation will retrieve the model definition.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_update
+  name: az dt model update
+  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
+  description: ''
+  syntax: >-
+    az dt model update --dt-name
+                       --dtmi
+                       [--decommission {false, true}]
+                       [--resource-group]
+  examples:
+  - summary: Decommision a target model
+    syntax: az dt model update -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1" --decommission
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  optionalParameters:
+  - name: --decommission
+    parameterValueGroup: false, true
+    summary: Indicates intent to decommission a target model.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_model_create
+- az_dt_model_delete
+- az_dt_model_delete-all
+- az_dt_model_list
+- az_dt_model_show
+- az_dt_model_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage DTDL models and definitions on a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/network.yml b/2017-03-09-profile/docs-ref-autogen/dt/network.yml
new file mode 100644
index 0000000000..865441d5a1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/network.yml
@@ -0,0 +1,36 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network
+name: az dt network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins network configuration including private links and endpoint connections.
+description: ''
+commands:
+- az_dt_network_private-endpoint
+- az_dt_network_private-endpoint_connection
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+- az_dt_network_private-link
+- az_dt_network_private-link_list
+- az_dt_network_private-link_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Digital Twins network configuration including private links and endpoint connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/network/private-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/dt/network/private-endpoint.yml
new file mode 100644
index 0000000000..0789b85b58
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/network/private-endpoint.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network_private-endpoint
+name: az dt network private-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network private-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins instance private-endpoints.
+description: Use 'az network private-endpoint create' to create a private-endpoint and link to a Digital Twins resource.
+commands:
+- az_dt_network_private-endpoint_connection
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Use 'az network private-endpoint create' to create a private-endpoint and link to a Digital Twins resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/network/private-endpoint/connection.yml b/2017-03-09-profile/docs-ref-autogen/dt/network/private-endpoint/connection.yml
new file mode 100644
index 0000000000..318910d827
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/network/private-endpoint/connection.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network_private-endpoint_connection
+name: az dt network private-endpoint connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network private-endpoint connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins instance private-endpoint connections.
+description: ''
+directCommands:
+- uid: az_dt_network_private-endpoint_connection_delete
+  name: az dt network private-endpoint connection delete
+  summary: Delete a private-endpoint connection associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection delete --cn
+                                                     --dt-name
+                                                     [--no-wait]
+                                                     [--resource-group]
+                                                     [--yes]
+  examples:
+  - summary: Delete the private-endpoint connection named ba8408b6-1372-41b2-aef8-af43afc4729f with confirmation. Block until finished.
+    syntax: az dt network private-endpoint connection delete -n {instance_name} --cn ba8408b6-1372-41b2-aef8-af43afc4729f
+  - summary: Delete the private-endpoint connection named ba8408b6-1372-41b2-aef8-af43afc4729f no confirmation. Return immediately.
+    syntax: az dt network private-endpoint connection delete -n {instance_name} --cn ba8408b6-1372-41b2-aef8-af43afc4729f -y --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --cn --conn-name
+    summary: Private endpoint connection name.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_network_private-endpoint_connection_list
+  name: az dt network private-endpoint connection list
+  summary: List private-endpoint connections associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection list --dt-name
+                                                   [--resource-group]
+  examples:
+  - summary: List all private-endpoint connections associated with the instance.
+    syntax: az dt network private-endpoint connection list -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_network_private-endpoint_connection_set
+  name: az dt network private-endpoint connection set
+  summary: Set the state of a private-endpoint connection associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection set --cn
+                                                  --dt-name
+                                                  --status {Approved, Disconnected, Pending, Rejected}
+                                                  [--actions-required]
+                                                  [--desc]
+                                                  [--group-ids]
+                                                  [--resource-group]
+  examples:
+  - summary: Approve a pending private-endpoint connection associated with the instance and add a description.
+    syntax: az dt network private-endpoint connection set -n {instance_name} --cn {connection_name} --status Approved --desc "A description."
+  - summary: Reject a private-endpoint connection associated with the instance and add a description.
+    syntax: az dt network private-endpoint connection set -n {instance_name} --cn {connection_name} --status Rejected --desc "Does not comply."
+  requiredParameters:
+  - isRequired: true
+    name: --cn --conn-name
+    summary: Private endpoint connection name.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --status
+    parameterValueGroup: Approved, Disconnected, Pending, Rejected
+    summary: The status of a private endpoint connection.
+    description: ''
+  optionalParameters:
+  - name: --actions-required --ar
+    summary: A message indicating if changes on the service provider require any updates on the consumer.
+    description: ''
+  - name: --desc --description
+    summary: Description for the private endpoint connection.
+    description: ''
+  - name: --group-ids
+    summary: Space seperated list of group ids that the private endpoint should connect to.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_network_private-endpoint_connection_show
+  name: az dt network private-endpoint connection show
+  summary: Show a private-endpoint connection associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection show --cn
+                                                   --dt-name
+                                                   [--resource-group]
+  examples:
+  - summary: Show details of the private-endpoint connection named ba8408b6-1372-41b2-aef8-af43afc4729f.
+    syntax: az dt network private-endpoint connection show -n {instance_name} --cn ba8408b6-1372-41b2-aef8-af43afc4729f
+  requiredParameters:
+  - isRequired: true
+    name: --cn --conn-name
+    summary: Private endpoint connection name.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Digital Twins instance private-endpoint connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/network/private-link.yml b/2017-03-09-profile/docs-ref-autogen/dt/network/private-link.yml
new file mode 100644
index 0000000000..5caf067764
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/network/private-link.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network_private-link
+name: az dt network private-link
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network private-link** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins instance private-link operations.
+description: ''
+directCommands:
+- uid: az_dt_network_private-link_list
+  name: az dt network private-link list
+  summary: List private-links associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-link list --dt-name
+                                    [--resource-group]
+  examples:
+  - summary: List all private-links associated with the instance.
+    syntax: az dt network private-link list -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_network_private-link_show
+  name: az dt network private-link show
+  summary: Show a private-link associated with the instance.
+  description: ''
+  syntax: >-
+    az dt network private-link show --dt-name
+                                    --link-name
+                                    [--resource-group]
+  examples:
+  - summary: Show the private-link named "API" associated with the instance.
+    syntax: az dt network private-link show -n {instance_name} --link-name API
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --link-name --ln
+    summary: Private link name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_network_private-link_list
+- az_dt_network_private-link_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Digital Twins instance private-link operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/role-assignment.yml b/2017-03-09-profile/docs-ref-autogen/dt/role-assignment.yml
new file mode 100644
index 0000000000..e977f2573f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/role-assignment.yml
@@ -0,0 +1,139 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_role-assignment
+name: az dt role-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt role-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage RBAC role assignments for a Digital Twins instance.
+description: >-
+  Note that in order to perform role assignments, the logged in principal needs permissions
+
+  such as Owner or User Access Administrator at the assigned scope.
+
+
+  This command group is provided for convenience. For more complex role assignment scenarios
+
+  use the 'az role assignment' command group.
+directCommands:
+- uid: az_dt_role-assignment_create
+  name: az dt role-assignment create
+  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
+  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
+  syntax: >-
+    az dt role-assignment create --assignee
+                                 --dt-name
+                                 --role
+                                 [--resource-group]
+  examples:
+  - summary: Assign a user (by email) the built-in Digital Twins Owner role against a target instance.
+    syntax: az dt role-assignment create -n {instance_name} --assignee "owneruser@microsoft.com" --role "Azure Digital Twins Data Owner"
+  - summary: Assign a user (by object Id) the built-in Digital Twins Reader role against a target instance.
+    syntax: az dt role-assignment create -n {instance_name} --assignee "97a89267-0966-4054-a156-b7d86ef8e216" --role "Azure Digital Twins Data Reader"
+  - summary: Assign a service principal a custom role against a target instance.
+    syntax: az dt role-assignment create -n {instance_name} --assignee {service_principal_name_or_id} --role {role_name_or_id}
+  requiredParameters:
+  - isRequired: true
+    name: --assignee
+    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --role
+    summary: Role name or Id.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_role-assignment_delete
+  name: az dt role-assignment delete
+  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
+  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
+  syntax: >-
+    az dt role-assignment delete --dt-name
+                                 [--assignee]
+                                 [--resource-group]
+                                 [--role]
+  examples:
+  - summary: Remove a user from a specific role assignment of a Digital Twins instance.
+    syntax: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com" --role "Azure Digital Twins Data Reader"
+  - summary: Remove a user from all assigned roles of a Digital Twins instance.
+    syntax: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    summary: Role name or Id.
+    description: ''
+- uid: az_dt_role-assignment_list
+  name: az dt role-assignment list
+  summary: List the existing role assignments of a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt role-assignment list --dt-name
+                               [--include-inherited {false, true}]
+                               [--resource-group]
+                               [--role]
+  examples:
+  - summary: List the role assignments on a target instance.
+    syntax: az dt role-assignment list -n {instance_name}
+  - summary: List the role assignments on a target instance and filter by role.
+    syntax: az dt role-assignment list -n {instance_name} --role {role_name_or_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --include-inherited
+    parameterValueGroup: false, true
+    summary: Include assignments applied on parent scopes.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    summary: Role name or Id.
+    description: ''
+commands:
+- az_dt_role-assignment_create
+- az_dt_role-assignment_delete
+- az_dt_role-assignment_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Note that in order to perform role assignments, the logged in principal needs permissions
+
+    such as Owner or User Access Administrator at the assigned scope.
+
+
+    This command group is provided for convenience. For more complex role assignment scenarios
+
+    use the 'az role assignment' command group.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/route.yml b/2017-03-09-profile/docs-ref-autogen/dt/route.yml
new file mode 100644
index 0000000000..5b9c8efa63
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/route.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_route
+name: az dt route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure event routes.
+description: Note that an endpoint must first be configred before adding an event route.
+directCommands:
+- uid: az_dt_route_create
+  name: az dt route create
+  summary: Add an event route to a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route create --dt-name
+                       --en
+                       --rn
+                       [--filter]
+                       [--resource-group]
+  examples:
+  - summary: Adds an event route for an existing endpoint on target instance with default filter of "true".
+    syntax: az dt route create -n {instance_or_hostname} --endpoint-name {endpoint_name} --route-name {route_name}
+  - summary: Adds an event route for an existing endpoint on target instance with custom filter.
+    syntax: az dt route create -n {instance_or_hostname} --endpoint-name {endpoint_name} --route-name {route_name} --filter "type = 'Microsoft.DigitalTwins.Twin.Create'"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  - isRequired: true
+    name: --rn --route-name
+    summary: Event route name.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    defaultValue: "true"
+    summary: Event route filter.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_route_delete
+  name: az dt route delete
+  summary: Remove an event route from a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route delete --dt-name
+                       --rn
+                       [--resource-group]
+  examples:
+  - summary: Remove an event route from a target instance.
+    syntax: az dt route delete -n {instance_or_hostname} --route-name {route_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --rn --route-name
+    summary: Event route name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_route_list
+  name: az dt route list
+  summary: List the configured event routes of a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route list --dt-name
+                     [--resource-group]
+  examples:
+  - summary: List configured event routes of a target instance.
+    syntax: az dt route list -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_route_show
+  name: az dt route show
+  summary: Show details of an event route configured on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route show --dt-name
+                     --rn
+                     [--resource-group]
+  examples:
+  - summary: Show an event route on a target instance.
+    syntax: az dt route show -n {instance_or_hostname} --route-name {route_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --rn --route-name
+    summary: Event route name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_route_create
+- az_dt_route_delete
+- az_dt_route_list
+- az_dt_route_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Note that an endpoint must first be configred before adding an event route.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/twin.yml b/2017-03-09-profile/docs-ref-autogen/dt/twin.yml
new file mode 100644
index 0000000000..bd6b52856b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/twin.yml
@@ -0,0 +1,257 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin
+name: az dt twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure the digital twins of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_create
+  name: az dt twin create
+  summary: Create a digital twin on an instance.
+  description: >-
+    --properties can be inline JSON or file path.
+
+    Note: --properties are required for twins that contain components.
+  syntax: >-
+    az dt twin create --dt-name
+                      --dtmi
+                      --twin-id
+                      [--if-none-match]
+                      [--properties]
+                      [--resource-group]
+  examples:
+  - summary: Create a digital twin from an existing (prior-created) model.
+    syntax: az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:Room;1" --twin-id {twin_id}
+  - summary: Create a digital twin from an existing (prior-created) model with if-none-match tag.
+    syntax: az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:Room;1" --twin-id {twin_id} --if-none-match
+  - summary: Create a digital twin from an existing (prior-created) model. Instantiate with property values.
+    syntax: "az dt twin create -n {instance_or_hostname} --dtmi \"dtmi:com:example:DeviceInformation;1\" --twin-id {twin_id} --properties '{\"manufacturer\": \"Microsoft\"}'"
+  - summary: Create a digital twin with component from existing (prior-created) models. Instantiate component with minimum properties.
+    syntax: >-
+      az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:TemperatureController;1" --twin-id {twin_id} --properties '{
+          "Thermostat": {
+              "$metadata": {},
+          }
+      }'
+  - summary: Create a digital twin with component from existing (prior-created) models. Instantiate with property values.
+    syntax: >-
+      az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:TemperatureController;1" --twin-id {twin_id} --properties '{
+          "Temperature": 10.2,
+          "Thermostat": {
+              "$metadata": {},
+              "setPointTemp": 23.12
+          }
+      }'
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: Indicates the create operation should fail if an existing twin with the same id exists.
+    description: ''
+  - name: --properties -p
+    summary: Initial property values for instantiating a digital twin or related components. Provide file path or inline JSON. Properties are required for twins that contain components, at the minimum you must provide an empty $metadata object for each component.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_delete
+  name: az dt twin delete
+  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
+  description: ''
+  syntax: >-
+    az dt twin delete --dt-name
+                      --twin-id
+                      [--etag]
+                      [--resource-group]
+  examples:
+  - summary: Remove a digital twin by Id.
+    syntax: az dt twin delete -n {instance_or_hostname} --twin-id {twin_id}
+  - summary: Remove a digital twin by Id using the etag.
+    syntax: az dt twin delete -n {instance_or_hostname} --twin-id {twin_id} --etag {etag}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_delete-all
+  name: az dt twin delete-all
+  summary: Deletes all digital twins within a Digital Twins instance, including all relationships for those twins.
+  description: ''
+  syntax: >-
+    az dt twin delete-all --dt-name
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: Delete all digital twins. Any relationships referencing the twins will also be deleted.
+    syntax: az dt twin delete-all -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_twin_query
+  name: az dt twin query
+  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
+  description: ''
+  syntax: >-
+    az dt twin query --dt-name
+                     --query-command
+                     [--cost {false, true}]
+                     [--resource-group]
+  examples:
+  - summary: Query all digital twins in target instance and project all attributes. Also show cost in query units.
+    syntax: az dt twin query -n {instance_or_hostname} -q "select * from digitaltwins" --show-cost
+  - summary: Query by model and project all attributes.
+    syntax: az dt twin query -n {instance_or_hostname} -q "select * from digitaltwins T where IS_OF_MODEL(T, 'dtmi:com:example:Room;2')"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --query-command -q
+    summary: User query to be executed.
+    description: ''
+  optionalParameters:
+  - name: --cost --show-cost
+    parameterValueGroup: false, true
+    summary: Calculates and shows the query charge.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_show
+  name: az dt twin show
+  summary: Show the details of a digital twin.
+  description: ''
+  syntax: >-
+    az dt twin show --dt-name
+                    --twin-id
+                    [--resource-group]
+  examples:
+  - summary: Show the details of a digital twin.
+    syntax: az dt twin show -n {instance_or_hostname} --twin-id {twin_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_update
+  name: az dt twin update
+  summary: Update an instance digital twin via JSON patch specification.
+  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
+  syntax: >-
+    az dt twin update --dt-name
+                      --json-patch
+                      --twin-id
+                      [--etag]
+                      [--resource-group]
+  examples:
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: "az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin via JSON patch specification and using etag.
+    syntax: "az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --etag {etag} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: >-
+      az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --json-patch '[
+        {"op":"replace", "path":"/Temperature", "value": 20.5},
+        {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
+      ]'
+  - summary: Update a digital twin via JSON patch specification defined in a file.
+    syntax: az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_twin_component
+- az_dt_twin_component_show
+- az_dt_twin_component_update
+- az_dt_twin_create
+- az_dt_twin_delete
+- az_dt_twin_delete-all
+- az_dt_twin_query
+- az_dt_twin_relationship
+- az_dt_twin_relationship_create
+- az_dt_twin_relationship_delete
+- az_dt_twin_relationship_delete-all
+- az_dt_twin_relationship_list
+- az_dt_twin_relationship_show
+- az_dt_twin_relationship_update
+- az_dt_twin_show
+- az_dt_twin_telemetry
+- az_dt_twin_telemetry_send
+- az_dt_twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure the digital twins of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/twin/component.yml b/2017-03-09-profile/docs-ref-autogen/dt/twin/component.yml
new file mode 100644
index 0000000000..1d3fc25def
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/twin/component.yml
@@ -0,0 +1,105 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin_component
+name: az dt twin component
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin component** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Show and update the digital twin components of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_component_show
+  name: az dt twin component show
+  summary: Show details of a digital twin component.
+  description: ''
+  syntax: >-
+    az dt twin component show --component
+                              --dt-name
+                              --twin-id
+                              [--resource-group]
+  examples:
+  - summary: Show details of a digital twin component
+    syntax: az dt twin component show -n {instance_or_hostname} --twin-id {twin_id} --component Thermostat
+  requiredParameters:
+  - isRequired: true
+    name: --component
+    summary: The path to the DTDL component.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_component_update
+  name: az dt twin component update
+  summary: Update a digital twin component via JSON patch specification.
+  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
+  syntax: >-
+    az dt twin component update --component
+                                --dt-name
+                                --json-patch
+                                --twin-id
+                                [--etag]
+                                [--resource-group]
+  examples:
+  - summary: Update a digital twin component via JSON patch specification.
+    syntax: "az dt twin component update -n {instance_or_hostname} --twin-id {twin_id} --component {component_path} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin component via JSON patch specification.
+    syntax: >-
+      az dt twin component update -n {instance_or_hostname} --twin-id {twin_id} --component {component_path} --json-patch '[
+        {"op":"replace", "path":"/Temperature", "value": 20.5},
+        {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
+      ]'
+  - summary: Update a digital twin component via JSON patch specification defined in a file.
+    syntax: az dt twin component update -n {instance_or_hostname} --twin-id {twin_id} --component {component_path} --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --component
+    summary: The path to the DTDL component.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_twin_component_show
+- az_dt_twin_component_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Show and update the digital twin components of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/twin/relationship.yml b/2017-03-09-profile/docs-ref-autogen/dt/twin/relationship.yml
new file mode 100644
index 0000000000..b927df600c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/twin/relationship.yml
@@ -0,0 +1,265 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin_relationship
+name: az dt twin relationship
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin relationship** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure the digital twin relationships of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_relationship_create
+  name: az dt twin relationship create
+  summary: Create a relationship between source and target digital twins.
+  description: --properties can be inline JSON or file path.
+  syntax: >-
+    az dt twin relationship create --dt-name
+                                   --kind
+                                   --relationship-id
+                                   --source
+                                   --target
+                                   [--if-none-match]
+                                   [--properties]
+                                   [--resource-group]
+  examples:
+  - summary: Create a relationship between two digital twins.
+    syntax: az dt twin relationship create -n {instance_or_hostname} --relationship-id {relationship_id} --relationship contains --twin-id {source_twin_id} --target {target_twin_id}
+  - summary: Create a relationship between two digital twins with if-none-match tag
+    syntax: az dt twin relationship create -n {instance_or_hostname} --relationship-id {relationship_id} --relationship contains --twin-id {source_twin_id} --target {target_twin_id} --if-none-match
+  - summary: Create a relationship with initialized properties between two digital twins.
+    syntax: "az dt twin relationship create -n {instance_or_hostname} --relationship-id {relationship_id} --relationship contains --twin-id {source_twin_id} --target {target_twin_id} --properties '{\"ownershipUser\": \"me\", \"ownershipDepartment\": \"Computer Science\"}'"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --kind --relationship
+    summary: "Relationship name or kind. For example: 'contains'."
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  - isRequired: true
+    name: --target --target-twin-id
+    summary: The target twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: Indicates the create operation should fail if an existing twin with the same id exists.
+    description: ''
+  - name: --properties -p
+    summary: Initial property values for instantiating a digital twin relationship. Provide file path or inline JSON.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_delete
+  name: az dt twin relationship delete
+  summary: Delete a digital twin relationship on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt twin relationship delete --dt-name
+                                   --relationship-id
+                                   --source
+                                   [--etag]
+                                   [--resource-group]
+  examples:
+  - summary: Delete a digital twin relationship.
+    syntax: az dt twin relationship delete -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id}
+  - summary: Delete a digital twin relationship using the etag.
+    syntax: az dt twin relationship delete -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --etag {etag}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_delete-all
+  name: az dt twin relationship delete-all
+  summary: Deletes all digital twin relationships within a Digital Twins instance, including incoming relationships.
+  description: ''
+  syntax: >-
+    az dt twin relationship delete-all --dt-name
+                                       [--resource-group]
+                                       [--source]
+                                       [--yes]
+  examples:
+  - summary: Delete all digital twin relationships associated with the twin.
+    syntax: az dt twin relationship delete-all -n {instance_or_hostname} --twin-id {twin_id}
+  - summary: Delete all digital twin relationships within the Digital Twins instace.
+    syntax: az dt twin relationship delete-all -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_twin_relationship_list
+  name: az dt twin relationship list
+  summary: List the relationships of a digital twin.
+  description: ''
+  syntax: >-
+    az dt twin relationship list --dt-name
+                                 --source
+                                 [--incoming {false, true}]
+                                 [--kind]
+                                 [--resource-group]
+  examples:
+  - summary: List outgoing relationships of a digital twin.
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id}
+  - summary: List outgoing relationships of a digital twin and filter on relationship 'contains'
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id} --relationship contains
+  - summary: List incoming relationships of a digital twin.
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id} --incoming
+  - summary: List incoming relationships of a digital twin and filter on relationship 'contains'.
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id} --relationship contains --incoming
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --incoming
+    parameterValueGroup: false, true
+    summary: Retrieves all incoming relationships for a digital twin.
+    description: ''
+  - name: --kind --relationship
+    summary: Filter result by the kind of relationship.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_show
+  name: az dt twin relationship show
+  summary: Show details of a digital twin relationship.
+  description: ''
+  syntax: >-
+    az dt twin relationship show --dt-name
+                                 --relationship-id
+                                 --source
+                                 [--resource-group]
+  examples:
+  - summary: Show details of a digital twin relationship.
+    syntax: az dt twin relationship show -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_update
+  name: az dt twin relationship update
+  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
+  description: Operations are limited to add, replace and remove.
+  syntax: >-
+    az dt twin relationship update --dt-name
+                                   --json-patch
+                                   --relationship-id
+                                   --source
+                                   [--etag]
+                                   [--resource-group]
+  examples:
+  - summary: Update a digital twin relationship via JSON patch specification.
+    syntax: "az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin relationship via JSON patch specification and using etag.
+    syntax: "az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}' --etag {etag}"
+  - summary: Update a digital twin relationship via JSON patch specification.
+    syntax: >-
+      az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '[
+        {"op":"replace", "path":"/Temperature", "value": 20.5},
+        {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
+      ]'
+  - summary: Update a digital twin relationship via JSON patch specification defined in a file.
+    syntax: az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_twin_relationship_create
+- az_dt_twin_relationship_delete
+- az_dt_twin_relationship_delete-all
+- az_dt_twin_relationship_list
+- az_dt_twin_relationship_show
+- az_dt_twin_relationship_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure the digital twin relationships of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/dt/twin/telemetry.yml b/2017-03-09-profile/docs-ref-autogen/dt/twin/telemetry.yml
new file mode 100644
index 0000000000..2e24af0f26
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/dt/twin/telemetry.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin_telemetry
+name: az dt twin telemetry
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin telemetry** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Test and validate the event routes and endpoints of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_telemetry_send
+  name: az dt twin telemetry send
+  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
+  description: ''
+  syntax: >-
+    az dt twin telemetry send --dt-name
+                              --twin-id
+                              [--component]
+                              [--dt-id]
+                              [--resource-group]
+                              [--telemetry]
+  examples:
+  - summary: Send twin telemetry
+    syntax: az dt twin telemetry send -n {instance_or_hostname} --twin-id {twin_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --component
+    summary: The path to the DTDL component. If set, telemetry will be emitted on behalf of the component.
+    description: ''
+  - name: --dt-id
+    summary: A unique message identifier (in the scope of the digital twin id) that is commonly used for de-duplicating messages. If no value is provided a GUID is automatically generated.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --telemetry
+    summary: 'Inline telemetry JSON or file path to telemetry JSON. Default payload is an empty object: {}.'
+    description: ''
+commands:
+- az_dt_twin_telemetry_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Test and validate the event routes and endpoints of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid.yml
new file mode 100644
index 0000000000..e60e089558
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid.yml
@@ -0,0 +1,123 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid
+name: az eventgrid
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
+description: ''
+commands:
+- az_eventgrid_domain
+- az_eventgrid_domain_create
+- az_eventgrid_domain_delete
+- az_eventgrid_domain_key
+- az_eventgrid_domain_key_list
+- az_eventgrid_domain_key_regenerate
+- az_eventgrid_domain_list
+- az_eventgrid_domain_private-endpoint-connection
+- az_eventgrid_domain_private-endpoint-connection_approve
+- az_eventgrid_domain_private-endpoint-connection_delete
+- az_eventgrid_domain_private-endpoint-connection_list
+- az_eventgrid_domain_private-endpoint-connection_reject
+- az_eventgrid_domain_private-endpoint-connection_show
+- az_eventgrid_domain_private-link-resource
+- az_eventgrid_domain_private-link-resource_list
+- az_eventgrid_domain_private-link-resource_show
+- az_eventgrid_domain_show
+- az_eventgrid_domain_topic
+- az_eventgrid_domain_topic_create
+- az_eventgrid_domain_topic_delete
+- az_eventgrid_domain_topic_list
+- az_eventgrid_domain_topic_show
+- az_eventgrid_domain_update
+- az_eventgrid_event-subscription
+- az_eventgrid_event-subscription_create
+- az_eventgrid_event-subscription_delete
+- az_eventgrid_event-subscription_list
+- az_eventgrid_event-subscription_show
+- az_eventgrid_event-subscription_update
+- az_eventgrid_extension-topic
+- az_eventgrid_extension-topic_show
+- az_eventgrid_partner
+- az_eventgrid_partner_namespace
+- az_eventgrid_partner_namespace_create
+- az_eventgrid_partner_namespace_delete
+- az_eventgrid_partner_namespace_event-channel
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+- az_eventgrid_partner_namespace_key
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+- az_eventgrid_partner_namespace_list
+- az_eventgrid_partner_namespace_show
+- az_eventgrid_partner_registration
+- az_eventgrid_partner_registration_create
+- az_eventgrid_partner_registration_delete
+- az_eventgrid_partner_registration_list
+- az_eventgrid_partner_registration_show
+- az_eventgrid_partner_topic
+- az_eventgrid_partner_topic_activate
+- az_eventgrid_partner_topic_deactivate
+- az_eventgrid_partner_topic_delete
+- az_eventgrid_partner_topic_event-subscription
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+- az_eventgrid_partner_topic_list
+- az_eventgrid_partner_topic_show
+- az_eventgrid_system-topic
+- az_eventgrid_system-topic_create
+- az_eventgrid_system-topic_delete
+- az_eventgrid_system-topic_event-subscription
+- az_eventgrid_system-topic_event-subscription_create
+- az_eventgrid_system-topic_event-subscription_delete
+- az_eventgrid_system-topic_event-subscription_list
+- az_eventgrid_system-topic_event-subscription_show
+- az_eventgrid_system-topic_event-subscription_update
+- az_eventgrid_system-topic_list
+- az_eventgrid_system-topic_show
+- az_eventgrid_system-topic_update
+- az_eventgrid_topic
+- az_eventgrid_topic_create
+- az_eventgrid_topic_delete
+- az_eventgrid_topic_key
+- az_eventgrid_topic_key_list
+- az_eventgrid_topic_key_regenerate
+- az_eventgrid_topic_list
+- az_eventgrid_topic_private-endpoint-connection
+- az_eventgrid_topic_private-endpoint-connection_approve
+- az_eventgrid_topic_private-endpoint-connection_delete
+- az_eventgrid_topic_private-endpoint-connection_list
+- az_eventgrid_topic_private-endpoint-connection_reject
+- az_eventgrid_topic_private-endpoint-connection_show
+- az_eventgrid_topic_private-link-resource
+- az_eventgrid_topic_private-link-resource_list
+- az_eventgrid_topic_private-link-resource_show
+- az_eventgrid_topic_show
+- az_eventgrid_topic_update
+- az_eventgrid_topic-type
+- az_eventgrid_topic-type_list
+- az_eventgrid_topic-type_list-event-types
+- az_eventgrid_topic-type_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/domain.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain.yml
new file mode 100644
index 0000000000..7d3fd225f7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain.yml
@@ -0,0 +1,225 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain
+name: az eventgrid domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event domains.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_create
+  name: az eventgrid domain create
+  summary: Create a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain create --location
+                               --name
+                               --resource-group
+                               [--identity {noidentity, systemassigned}]
+                               [--inbound-ip-rules]
+                               [--input-mapping-default-values]
+                               [--input-mapping-fields]
+                               [--input-schema {cloudeventschemav1_0, customeventschema, eventgridschema}]
+                               [--public-network-access {disabled, enabled}]
+                               [--sku {basic, premium}]
+                               [--tags]
+  examples:
+  - summary: Create a new domain.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2
+  - summary: Create a new domain with custom input mappings.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=mytopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
+  - summary: Create a new domain that accepts events published in CloudEvents V1.0 schema and maps a property mytopicfield to the topic name.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema cloudeventschemav1_0 --input-mapping-fields topic=mytopicfield
+  - summary: Create a new domain which allows specific inbound ip rules.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku basic
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --input-mapping-default-values
+    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
+    description: ''
+  - name: --input-mapping-fields
+    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
+    description: ''
+  - name: --input-schema
+    defaultValue: eventgridschema
+    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
+    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
+    description: ''
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_domain_delete
+  name: az eventgrid domain delete
+  summary: Delete a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain delete --name
+                               --resource-group
+  examples:
+  - summary: Delete a domain.
+    syntax: az eventgrid domain delete -g rg1 --name domain1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_list
+  name: az eventgrid domain list
+  summary: List available domains.
+  description: ''
+  syntax: >-
+    az eventgrid domain list [--odata-query]
+                             [--resource-group]
+  examples:
+  - summary: List all domains in the current Azure subscription.
+    syntax: az eventgrid domain list
+  - summary: List all domains in a resource group.
+    syntax: az eventgrid domain list -g rg1
+  - summary: List all domains in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid domain list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all domains in a resource group except the domain with name "name1"
+    syntax: az eventgrid domain list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_show
+  name: az eventgrid domain show
+  summary: Get the details of a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain show --name
+                             --resource-group
+  examples:
+  - summary: Show the details of a domain.
+    syntax: az eventgrid domain show -g rg1 -n domain1
+  - summary: Show the details of a domain based on resource ID.
+    syntax: az eventgrid domain show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_update
+  name: az eventgrid domain update
+  summary: Update a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain update --name
+                               --resource-group
+                               [--identity {noidentity, systemassigned}]
+                               [--inbound-ip-rules]
+                               [--public-network-access {disabled, enabled}]
+                               [--sku {basic, premium}]
+                               [--tags]
+  examples:
+  - summary: Update the properties of an existing domain.
+    syntax: az eventgrid domain update -g rg1 --name domain1 --sku Basic --identity noidentity --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_eventgrid_domain_create
+- az_eventgrid_domain_delete
+- az_eventgrid_domain_key
+- az_eventgrid_domain_key_list
+- az_eventgrid_domain_key_regenerate
+- az_eventgrid_domain_list
+- az_eventgrid_domain_private-endpoint-connection
+- az_eventgrid_domain_private-endpoint-connection_approve
+- az_eventgrid_domain_private-endpoint-connection_delete
+- az_eventgrid_domain_private-endpoint-connection_list
+- az_eventgrid_domain_private-endpoint-connection_reject
+- az_eventgrid_domain_private-endpoint-connection_show
+- az_eventgrid_domain_private-link-resource
+- az_eventgrid_domain_private-link-resource_list
+- az_eventgrid_domain_private-link-resource_show
+- az_eventgrid_domain_show
+- az_eventgrid_domain_topic
+- az_eventgrid_domain_topic_create
+- az_eventgrid_domain_topic_delete
+- az_eventgrid_domain_topic_list
+- az_eventgrid_domain_topic_show
+- az_eventgrid_domain_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event domains.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/key.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/key.yml
new file mode 100644
index 0000000000..ccc8f47946
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/key.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_key
+name: az eventgrid domain key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage shared access keys of a domain.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_key_list
+  name: az eventgrid domain key list
+  summary: List shared access keys of a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain key list --name
+                                 --resource-group
+  examples:
+  - summary: List shared access keys of a domain. (autogenerated)
+    syntax: az eventgrid domain key list --name MyDomain --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_key_regenerate
+  name: az eventgrid domain key regenerate
+  summary: Regenerate a shared access key of a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain key regenerate --key-name
+                                       --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: Key name to regenerate key1 or key2.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_key_list
+- az_eventgrid_domain_key_regenerate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage shared access keys of a domain.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/private-endpoint-connection.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/private-endpoint-connection.yml
new file mode 100644
index 0000000000..533840fbbe
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/private-endpoint-connection.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_private-endpoint-connection
+name: az eventgrid domain private-endpoint-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain private-endpoint-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private endpoint connection resources of a domain.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_private-endpoint-connection_approve
+  name: az eventgrid domain private-endpoint-connection approve
+  summary: Approve a private endpoint connection request for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection approve --domain-name
+                                                            --name
+                                                            --resource-group
+                                                            [--description]
+  examples:
+  - summary: Approve a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection approve -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the approval.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_delete
+  name: az eventgrid domain private-endpoint-connection delete
+  summary: Delete a private endpoint connection for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection delete --domain-name
+                                                           --name
+                                                           --resource-group
+  examples:
+  - summary: Delete private endpoint connection for a specific domain.
+    syntax: az eventgrid domain private-endpoint-connection delete -g rg1 --domain-name domain1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_list
+  name: az eventgrid domain private-endpoint-connection list
+  summary: List the properties of all the private endpoint connections for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection list --name
+                                                         --resource-group
+  examples:
+  - summary: List a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection list -g rg1 -n domain1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_reject
+  name: az eventgrid domain private-endpoint-connection reject
+  summary: Reject a private endpoint connection request for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection reject --domain-name
+                                                           --name
+                                                           --resource-group
+                                                           [--description]
+  examples:
+  - summary: Reject a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection reject -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the rejection.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_show
+  name: az eventgrid domain private-endpoint-connection show
+  summary: Display the properties of a private endpoint connection for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection show --domain-name
+                                                         --name
+                                                         --resource-group
+  examples:
+  - summary: Show a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection show -g rg1 --domain-name domain1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_private-endpoint-connection_approve
+- az_eventgrid_domain_private-endpoint-connection_delete
+- az_eventgrid_domain_private-endpoint-connection_list
+- az_eventgrid_domain_private-endpoint-connection_reject
+- az_eventgrid_domain_private-endpoint-connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private endpoint connection resources of a domain.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/private-link-resource.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/private-link-resource.yml
new file mode 100644
index 0000000000..26f604db64
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/private-link-resource.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_private-link-resource
+name: az eventgrid domain private-link-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain private-link-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private link resource of a domain.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_private-link-resource_list
+  name: az eventgrid domain private-link-resource list
+  summary: List the properties of all the private link resources for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-link-resource list --domain-name
+                                                   --resource-group
+  examples:
+  - summary: Show a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-link-resource list -g rg1 --domain-name domain1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_private-link-resource_show
+  name: az eventgrid domain private-link-resource show
+  summary: Display the properties of a private link resource for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-link-resource show --domain-name
+                                                   --name
+                                                   --resource-group
+  examples:
+  - summary: Show a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-link-resource show -g rg1 --domain-name domain1 -n domain
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private link resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_private-link-resource_list
+- az_eventgrid_domain_private-link-resource_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private link resource of a domain.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/topic.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/topic.yml
new file mode 100644
index 0000000000..39cbb85254
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/domain/topic.yml
@@ -0,0 +1,132 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_topic
+name: az eventgrid domain topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event domain topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_topic_create
+  name: az eventgrid domain topic create
+  summary: Create a domain topic under a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic create --domain-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: Create a new domain topic under domain.
+    syntax: az eventgrid domain topic create -g rg1 --domain-name domain1 --name domaintopic1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_topic_delete
+  name: az eventgrid domain topic delete
+  summary: Delete a domain topic under a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic delete --domain-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: Delete a domain topic.
+    syntax: az eventgrid domain topic delete -g rg1 --domain-name domain1 --name domaintopic1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_topic_list
+  name: az eventgrid domain topic list
+  summary: List available topics in a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic list --domain-name
+                                   --resource-group
+                                   [--odata-query]
+  examples:
+  - summary: List all topics in a domain.
+    syntax: az eventgrid domain topic list -g rg1 --domain-name domain1
+  - summary: List all domain topics in a domain whose name contains the pattern "XYZ"
+    syntax: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all domain topics in a domain except the domain topic with name "name1"
+    syntax: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "NOT (name eq 'name1')"
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_domain_topic_show
+  name: az eventgrid domain topic show
+  summary: Get the details of a domain topic.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic show --domain-name
+                                   --name
+                                   --resource-group
+  examples:
+  - summary: Show the details of a domain topic.
+    syntax: az eventgrid domain topic show -g rg1 --domain-name domain1 --name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_topic_create
+- az_eventgrid_domain_topic_delete
+- az_eventgrid_domain_topic_list
+- az_eventgrid_domain_topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event domain topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/event-subscription.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/event-subscription.yml
new file mode 100644
index 0000000000..6f22ed35c1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/event-subscription.yml
@@ -0,0 +1,638 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_event-subscription
+name: az eventgrid event-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid event-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event subscriptions.
+description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
+directCommands:
+- uid: az_eventgrid_event-subscription_create
+  name: az eventgrid event-subscription create
+  summary: Create a new event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription create --name
+                                           [--advanced-filter]
+                                           [--azure-active-directory-application-id-or-uri]
+                                           [--azure-active-directory-tenant-id]
+                                           [--deadletter-endpoint]
+                                           [--deadletter-identity {systemassigned}]
+                                           [--deadletter-identity-endpoint]
+                                           [--delivery-identity {systemassigned}]
+                                           [--delivery-identity-endpoint]
+                                           [--delivery-identity-endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--endpoint]
+                                           [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--event-delivery-schema {cloudeventschemav1_0, custominputschema, eventgridschema}]
+                                           [--event-ttl]
+                                           [--expiration-date]
+                                           [--included-event-types]
+                                           [--labels]
+                                           [--max-delivery-attempts]
+                                           [--max-events-per-batch]
+                                           [--preferred-batch-size-in-kilobytes]
+                                           [--source-resource-id]
+                                           [--subject-begins-with]
+                                           [--subject-case-sensitive {false, true}]
+                                           [--subject-ends-with]
+  examples:
+  - summary: Create a new event subscription for an Event Grid topic, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for an Azure subscription subscription, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for a resource group, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for a storage account, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1"  \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for a storage account, using advanced filters.
+    syntax: >-
+      az eventgrid event-subscription create  --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  - summary: Create a new event subscription for an Azure subscription, with a filter specifying a subject prefix.
+    syntax: >-
+      az eventgrid event-subscription create --name es4 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-begins-with mysubject_prefix
+  - summary: Create a new event subscription for a resource group, with a filter specifying a subject suffix.
+    syntax: >-
+      az eventgrid event-subscription create --name es5 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-ends-with mysubject_suffix
+  - summary: Create a new event subscription for an Azure subscription, using default filters, and an EventHub as a destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint-type eventhub \
+          --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.EventHub/namespaces/n1/eventhubs/EH1
+  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure Storage queue as a destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint-type storagequeue \
+          --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/queueservices/default/queues/q1
+  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure ServiceBusQueue as a destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint-type servicebusqueue \
+          --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.ServiceBus/namespaces/ns1/queues/queue1
+  - summary: Create a new event subscription for an Event Grid domain, using default filters, and CloudEvent V 1.0 as the delivery schema.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --event-delivery-schema cloudeventschemav1_0
+  - summary: Create a new event subscription for a storage account, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier).
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
+          --max-delivery-attempts 10 --event-ttl 120
+  - summary: Create a new event subscription for a domain topic.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/t1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription (for a storage account) with an expiration date.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/sa1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --expiration-date "2018-10-31"
+  - summary: Create a new event subscription for an Event Grid topic, using Azure Active Directory enabled Webhook as a destination .
+    syntax: >-
+      az eventgrid event-subscription create --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --azure-active-directory-tenant-id azureactivedirectorytenantid
+          --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
+  - summary: Create a new event subscription for an Event Grid topic, using Azure Function as destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
+  - summary: Create a new event subscription for an Event Grid topic, using Eventhub with systemassigned MSI identity as destination and with deadletter with MSI identity
+    syntax: >-
+      az eventgrid event-subscription create --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --delivery-identity-endpoint-type eventhub --delivery-identity systemassigned --delivery-identity-endpoint /subscriptions/{SubId2|}/resourceGroups/{RG2}/providers/Microsoft.eventhub/namespaces/{EventHubNamespace}/eventhubs/{EventhubName} \
+          --deadletter-identity-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 --deadletter-identity systemassigned -n {EventSubscriptionName}
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --azure-active-directory-application-id-or-uri
+    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --azure-active-directory-tenant-id
+    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
+  - name: --deadletter-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the deadletter destination resource.
+    description: ''
+  - name: --deadletter-identity-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --delivery-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
+    description: ''
+  - name: --delivery-identity-endpoint
+    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --delivery-identity-endpoint-type
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint with resource identity.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --event-delivery-schema
+    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
+    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
+    description: ''
+  - name: --event-ttl
+    defaultValue: "1440"
+    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
+    description: ''
+  - name: --expiration-date
+    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --max-delivery-attempts
+    defaultValue: "30"
+    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
+    description: ''
+  - name: --max-events-per-batch
+    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
+    description: ''
+  - name: --preferred-batch-size-in-kilobytes
+    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource to which the event subscription needs to be created.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-case-sensitive
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+- uid: az_eventgrid_event-subscription_delete
+  name: az eventgrid event-subscription delete
+  summary: Delete an event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription delete --name
+                                           [--source-resource-id]
+  examples:
+  - summary: Delete an event subscription for an Event Grid topic.
+    syntax: >-
+      az eventgrid event-subscription delete --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
+  - summary: Delete an event subscription for an Event Grid domain topic.
+    syntax: >-
+      az eventgrid event-subscription delete --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/topic1
+  - summary: Delete an event subscription for an Event Grid domain.
+    syntax: >-
+      az eventgrid event-subscription delete --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
+  - summary: Delete an event subscription for an Azure subscription.
+    syntax: >-
+      az eventgrid event-subscription delete --name es2 \
+          --source-resource-id /subscriptions/{SubID}
+  - summary: Delete an event subscription for a resource group.
+    syntax: >-
+      az eventgrid event-subscription delete --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
+  - summary: Delete an event subscription for a storage account.
+    syntax: >-
+      az eventgrid event-subscription delete --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be deleted.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+- uid: az_eventgrid_event-subscription_list
+  name: az eventgrid event-subscription list
+  summary: List event subscriptions.
+  description: >-
+    Event Grid supports both regional and global event subscriptions: Event subscriptions on regional resources (such as Storage accounts or Event Grid topics) are regional, while event subscriptions on global resources (such as an Azure subscription or resource group) are global.
+
+    Hence, you can list event subscriptions in a few different ways:
+
+    1. To list by the resource ID of the resource whose event subscriptions you want to list, specify the --source-resource-id parameter. No other parameters must be specified.
+
+    2. To list by a topic-type (e.g. storage accounts), specify the --topic-type parameter along with --location (e.g. "westus2") parameter. For global topic types (e.g. "Microsoft.Resources.Subscriptions"), specify the location value as "global".
+
+    3. To list all event subscriptions in a region (across all topic types), specify only the --location parameter.
+
+    4. For both #2 and #3 above, to filter only by a resource group, you can additionally specify the --resource-group parameter.
+  syntax: >-
+    az eventgrid event-subscription list [--location]
+                                         [--odata-query]
+                                         [--resource-group]
+                                         [--source-resource-id]
+                                         [--topic-type-name]
+  examples:
+  - summary: List all event subscriptions created for an Event Grid topic.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
+  - summary: List all event subscriptions created for a storage account.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob
+  - summary: List all event subscriptions created for an Azure subscription.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}
+  - summary: List all event subscriptions created for a resource group.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
+  - summary: List all event subscriptions for an Event Grid domain.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1
+  - summary: List all event subscriptions for an Event Grid domain topic.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1/topics/topic1
+  - summary: List all Storage event subscriptions (under the currently selected Azure subscription) in westus2.
+    syntax: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2
+  - summary: List all Storage event subscriptions (under the given resource group) in westus2.
+    syntax: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2 --resource-group {RG}
+  - summary: List all regional or global event subscriptions (under the currently selected Azure subscription).
+    syntax: >-
+      az eventgrid event-subscription list --location westus2
+
+      az eventgrid event-subscription list --location global
+  - summary: List all regional or global event subscriptions under a specified resource group.
+    syntax: >-
+      az eventgrid event-subscription list --location westus2 --resource-group {RG}
+
+      az eventgrid event-subscription list --location global --resource-group {RG}
+  - summary: List all event subscriptions for an Event Grid domain whose name contains the pattern "XYZ"
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all event subscriptions for an Event Grid domain except the event subscription with name "name1"
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be listed.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+  - name: --topic-type-name
+    summary: Name of the topic-type whose event subscriptions need to be listed. When this is specified, you must also specify --location.
+    description: >-
+      Example 1: List all Storage event subscriptions in WestUS2
+          --resource-group TestRG --topic-type-name Microsoft.Storage.StorageAccounts --location westus2
+      Example 2: List all event subscriptions on Azure subscriptions
+          --topic-type-name Microsoft.Resources.Subscriptions --location global.
+- uid: az_eventgrid_event-subscription_show
+  name: az eventgrid event-subscription show
+  summary: Get the details of an event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription show --name
+                                         [--include-full-endpoint-url {false, true}]
+                                         [--source-resource-id]
+  examples:
+  - summary: Show the details of an event subscription for an Event Grid topic.
+    syntax: >-
+      az eventgrid event-subscription show --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/topic1
+  - summary: Show the details of an event subscription for an Azure subscription.
+    syntax: >-
+      az eventgrid event-subscription show --name es2 \
+          --source-resource-id /subscriptions/{SubID}
+  - summary: Show the details of an event subscription for a resource group.
+    syntax: >-
+      az eventgrid event-subscription show --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+  - summary: Show the details of an event subscription for a storage account.
+    syntax: >-
+      az eventgrid event-subscription show --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/microsoft.storage/storageaccounts/kalsegblob
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --include-full-endpoint-url
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be shown.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+- uid: az_eventgrid_event-subscription_update
+  name: az eventgrid event-subscription update
+  summary: Update an event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription update --name
+                                           [--add]
+                                           [--advanced-filter]
+                                           [--deadletter-endpoint]
+                                           [--deadletter-identity {systemassigned}]
+                                           [--deadletter-identity-endpoint]
+                                           [--delivery-identity {systemassigned}]
+                                           [--delivery-identity-endpoint]
+                                           [--delivery-identity-endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--endpoint]
+                                           [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--force-string]
+                                           [--included-event-types]
+                                           [--labels]
+                                           [--remove]
+                                           [--set]
+                                           [--source-resource-id]
+                                           [--subject-begins-with]
+                                           [--subject-ends-with]
+  examples:
+  - summary: Update an event subscription for an Event Grid topic to specify a new endpoint.
+    syntax: >-
+      az eventgrid event-subscription update --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for an Azure subscription to specify a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid event-subscription update --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --subject-ends-with .jpg
+  - summary: Update an event subscription for a resource group to specify a new endpoint and a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid event-subscription update --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
+          --subject-ends-with .png \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for a storage account to specify a new list of included event types.
+    syntax: >-
+      az eventgrid event-subscription update --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob" \
+          --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
+  - summary: Update an event subscription for a storage account, to include a deadletter destination.
+    syntax: >-
+      az eventgrid event-subscription update --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob" \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
+  - summary: Update an event subscription for a storage account, using advanced filters.
+    syntax: >-
+      az eventgrid event-subscription update --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --deadletter-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the deadletter destination resource.
+    description: ''
+  - name: --deadletter-identity-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --delivery-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
+    description: ''
+  - name: --delivery-identity-endpoint
+    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --delivery-identity-endpoint-type
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint with resource identity.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be updated.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+commands:
+- az_eventgrid_event-subscription_create
+- az_eventgrid_event-subscription_delete
+- az_eventgrid_event-subscription_list
+- az_eventgrid_event-subscription_show
+- az_eventgrid_event-subscription_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/extension-topic.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/extension-topic.yml
new file mode 100644
index 0000000000..5adcf7594e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/extension-topic.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_extension-topic
+name: az eventgrid extension-topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid extension-topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Event Grid extension topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_extension-topic_show
+  name: az eventgrid extension-topic show
+  summary: Get the details of an extension topic.
+  description: ''
+  syntax: az eventgrid extension-topic show --scope
+  examples:
+  - summary: Show the details of an extension topic.
+    syntax: az eventgrid extension-topic show --scope /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageAccounts/{StorageAccountName}
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The identifier of the resource to which extension topic is queried. The scope can be a subscription, or a resource group, or a top level resource belonging to a resource provider namespace. For example, use '/subscriptions/{subscriptionId}/' for a subscription, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' for Azure resource.
+    description: ''
+commands:
+- az_eventgrid_extension-topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Event Grid extension topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner.yml
new file mode 100644
index 0000000000..f354fa7674
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner.yml
@@ -0,0 +1,57 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner
+name: az eventgrid partner
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner resources.
+description: ''
+commands:
+- az_eventgrid_partner_namespace
+- az_eventgrid_partner_namespace_create
+- az_eventgrid_partner_namespace_delete
+- az_eventgrid_partner_namespace_event-channel
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+- az_eventgrid_partner_namespace_key
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+- az_eventgrid_partner_namespace_list
+- az_eventgrid_partner_namespace_show
+- az_eventgrid_partner_registration
+- az_eventgrid_partner_registration_create
+- az_eventgrid_partner_registration_delete
+- az_eventgrid_partner_registration_list
+- az_eventgrid_partner_registration_show
+- az_eventgrid_partner_topic
+- az_eventgrid_partner_topic_activate
+- az_eventgrid_partner_topic_deactivate
+- az_eventgrid_partner_topic_delete
+- az_eventgrid_partner_topic_event-subscription
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+- az_eventgrid_partner_topic_list
+- az_eventgrid_partner_topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace.yml
new file mode 100644
index 0000000000..d2350e759f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_namespace
+name: az eventgrid partner namespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner namespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner namespaces.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_namespace_create
+  name: az eventgrid partner namespace create
+  summary: Create a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace create --location
+                                          --name
+                                          --partner-registration-id
+                                          --resource-group
+                                          [--tags]
+  examples:
+  - summary: Create a new partner namespace.
+    syntax: az eventgrid partner namespace create -g rg1 --name namespaceName1 -l westus2 --partner-registration-id 795c9f2f-6d2d-42ff-a570-42fd3043192c
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --partner-registration-id
+    summary: 'The fully qualified ARM Id of the partner registration that should be associated with this partner namespace. This takes the following format: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/partnerRegistrations/{partnerRegistrationName}.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_partner_namespace_delete
+  name: az eventgrid partner namespace delete
+  summary: Delete a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace delete --name
+                                          --resource-group
+  examples:
+  - summary: Delete a specific partner namespace.
+    syntax: az eventgrid partner namespace delete -g rg1 --name partnernamespace1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_list
+  name: az eventgrid partner namespace list
+  summary: List available partner namespaces.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace list [--odata-query]
+                                        [--resource-group]
+  examples:
+  - summary: List all partner namespaces in the current Azure subscription.
+    syntax: az eventgrid partner namespace list
+  - summary: List all partner namespaces in a resource group.
+    syntax: az eventgrid partner namespace list -g rg1
+  - summary: List all partner namespaces in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner namespace list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all partner namespaces in a resource group except the partner namespace with name "name1"
+    syntax: az eventgrid partner namespace list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_show
+  name: az eventgrid partner namespace show
+  summary: Get the details of a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace show --name
+                                        --resource-group
+  examples:
+  - summary: Show the details of a partner namespace.
+    syntax: az eventgrid partner namespace show -g rg1 -n partnernamespace1
+  - summary: Show the details of a partner namespace based on resource ID.
+    syntax: az eventgrid partner namespace show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_namespace_create
+- az_eventgrid_partner_namespace_delete
+- az_eventgrid_partner_namespace_event-channel
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+- az_eventgrid_partner_namespace_key
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+- az_eventgrid_partner_namespace_list
+- az_eventgrid_partner_namespace_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner namespaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace/event-channel.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace/event-channel.yml
new file mode 100644
index 0000000000..c15a8d4099
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace/event-channel.yml
@@ -0,0 +1,196 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_namespace_event-channel
+name: az eventgrid partner namespace event-channel
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner namespace event-channel** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner event channels.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_namespace_event-channel_create
+  name: az eventgrid partner namespace event-channel create
+  summary: Create an event channel under a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel create --desination-topic-name
+                                                        --destination-resource-group
+                                                        --destination-subscription-id
+                                                        --name
+                                                        --partner-namespace-name
+                                                        --resource-group
+                                                        --source
+                                                        [--activation-expiration-date]
+                                                        [--partner-topic-description]
+                                                        [--publisher-filter]
+  examples:
+  - summary: Create a specific event channel.
+    syntax: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1
+  - summary: Create a specific event channel with an activation expiration time and partner topic friendly description.
+    syntax: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --activation-expiration-date '2020-05-20T10:00' --partner-topic-description 'This topic is created by Costoco corp on user behavior.'
+  - summary: Create a specific event channel with publisher filters.
+    syntax: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --publisher-filter data.key1 NumberIn 2 3 4 100 200 --publisher-filter data.key2 StringIn 2 3 4 100 200
+  requiredParameters:
+  - isRequired: true
+    name: --desination-topic-name
+    summary: Name of the partner topic associated with the event channel.
+    description: ''
+  - isRequired: true
+    name: --destination-resource-group
+    summary: Azure Resource Group of the customer creating the event channel. The partner topic associated with the event channel will be created under this resource group.
+    description: ''
+  - isRequired: true
+    name: --destination-subscription-id
+    summary: Azure subscription Id of the customer creating the event channel. The partner topic associated with the event channel will be created under this Azure subscription.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event channel.
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source
+    summary: The identifier of the resource that forms the partner source of the events. This represents a unique resource in the partner's resource model.
+    description: ''
+  optionalParameters:
+  - name: --activation-expiration-date
+    summary: Date or datetime in UTC ISO 8601 format (e.g., '2022-02-17T01:59:59+00:00' or '2022-02-17') after which the event channel and corresponding partner topic would expire and get auto deleted. If this time is not specified, the expiration date is set to seven days by default.
+    description: ''
+  - name: --partner-topic-description
+    summary: Friendly description of the corresponding partner topic. This will be helpful to remove any ambiguity of the origin of creation of the partner topic for the customer.
+    description: ''
+  - name: --publisher-filter
+    summary: A publisher filter that is used to enable filtering of events based on a specific event property. This set of filters that are specified by the publisher in order to determine which events to be received by the subscriber.
+    description: >-
+      Usage:                     --publisher-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --publisher-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --publisher-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --publisher-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --publisher-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --publisher-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --publisher-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --publisher-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --publisher-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --publisher-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --publisher-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --publisher-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --publisher-filter data.property3 BoolEquals true
+
+      Multiple publisher filters can be specified by using more than one `--publisher-filter` argument.
+- uid: az_eventgrid_partner_namespace_event-channel_delete
+  name: az eventgrid partner namespace event-channel delete
+  summary: Delete a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel delete --name
+                                                        --partner-namespace-name
+                                                        --resource-group
+  examples:
+  - summary: Delete a specific partner namespace.
+    syntax: az eventgrid partner namespace event-channel delete -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event channel.
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_event-channel_list
+  name: az eventgrid partner namespace event-channel list
+  summary: List available partner event-channels.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel list --partner-namespace-name
+                                                      --resource-group
+                                                      [--odata-query]
+  examples:
+  - summary: List all event-channels in a specific partner namespace.
+    syntax: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1
+  - summary: List all event channel under a partner namespace whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1  --odata-query "Contains(name, 'XYZ')"
+  requiredParameters:
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_partner_namespace_event-channel_show
+  name: az eventgrid partner namespace event-channel show
+  summary: Get the details of an event channel under a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel show --name
+                                                      --partner-namespace-name
+                                                      --resource-group
+  examples:
+  - summary: Show the details of an event channel.
+    syntax: az eventgrid partner namespace event-channel show -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
+  - summary: Show the details of an event-channel based on resource ID.
+    syntax: az eventgrid partner namespace event-channel show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1/eventChannels/eventChannelName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event channel.
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner event channels.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace/key.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace/key.yml
new file mode 100644
index 0000000000..43a9a45cc4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/namespace/key.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_namespace_key
+name: az eventgrid partner namespace key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner namespace key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage shared access keys of a partner namespace.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_namespace_key_list
+  name: az eventgrid partner namespace key list
+  summary: List shared access keys of a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace key list --partner-namespace-name
+                                            --resource-group
+  examples:
+  - summary: List shared access keys of a partner namespace (autogenerated)
+    syntax: az eventgrid partner namespace key list --partner-namespace-name MyNamespace --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_key_regenerate
+  name: az eventgrid partner namespace key regenerate
+  summary: Regenerate a shared access key of a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace key regenerate --key-name
+                                                  --partner-namespace-name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: Key name to regenerate (key1 or key2).
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage shared access keys of a partner namespace.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/registration.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/registration.yml
new file mode 100644
index 0000000000..ba0aec35b3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/registration.yml
@@ -0,0 +1,159 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_registration
+name: az eventgrid partner registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner registrations.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_registration_create
+  name: az eventgrid partner registration create
+  summary: Create a new partner registration.
+  description: ''
+  syntax: >-
+    az eventgrid partner registration create --name
+                                             --partner-name
+                                             --resource-group
+                                             --resource-type-name
+                                             [--authorized-subscription-ids]
+                                             [--customer-service-extension]
+                                             [--customer-service-number]
+                                             [--customer-service-uri]
+                                             [--description]
+                                             [--display-name]
+                                             [--logo-uri]
+                                             [--long-description]
+                                             [--setup-uri]
+                                             [--tags]
+  examples:
+  - summary: Create a new partner registration with basic information.
+    syntax: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445
+  - summary: Create a new partner registration with partner information.
+    syntax: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445 --description ExampleDescription --display-name ExampleDisplayName1 --logo-uri 'https://www.example.com/logo.png' --setup-uri 'https://www.example.com' --long-description 'This is sample description}' --customer-service-number '+1 800 123 4567' --customer-service-extension '125' --customer-service-uri 'https://www.example.com/customerservice'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner registration.
+    description: ''
+  - isRequired: true
+    name: --partner-name
+    summary: Official name of the partner.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-type-name
+    summary: Name of the partner topic resource type. This name should be unique among all partner topic types names.
+    description: ''
+  optionalParameters:
+  - name: --authorized-subscription-ids
+    summary: A space-separated list of Azure subscription Ids that are authorized to create a partner namespace associated with this partner registration. This is an optional property. Creating partner namespaces is always permitted under the same Azure subscription as the one used for creating the partner registration.
+    description: ''
+  - name: --customer-service-extension
+    summary: The extension of the customer service number of the publisher. Only digits are allowed and number of digits should not exceed 10.
+    description: ''
+  - name: --customer-service-number
+    summary: "The customer service number of the publisher. The expected phone format should start with a '+' sign followed by the country code. The remaining digits are then followed. Only digits and spaces are allowed and its length cannot exceed 16 digits including country code. Examples of valid phone numbers are: +1 515 123 4567 and +966 7 5115 2471. Examples of invalid phone numbers are: +1 (515) 123-4567, 1 515 123 4567 and +966 121 5115 24 7 551 1234 43."
+    description: ''
+  - name: --customer-service-uri
+    summary: The customer service URI of the publisher.
+    description: ''
+  - name: --description
+    summary: Description of the partner topic type.
+    description: ''
+  - name: --display-name
+    summary: Display name for the partner topic type.
+    description: ''
+  - name: --logo-uri
+    summary: URI of the partner logo.
+    description: ''
+  - name: --long-description
+    summary: Description of the custom scenarios and integration. Length of this description should not exceed 2048 characters.
+    description: ''
+  - name: --setup-uri
+    summary: URI of the partner website that can be used by Azure customers to setup Event Grid integration on an event source.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_partner_registration_delete
+  name: az eventgrid partner registration delete
+  summary: Delete a partner registration.
+  description: Deletes a partner registration with the specified parameters.
+  syntax: >-
+    az eventgrid partner registration delete --name
+                                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_registration_list
+  name: az eventgrid partner registration list
+  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
+  description: ''
+  syntax: >-
+    az eventgrid partner registration list [--odata-query]
+                                           [--resource-group]
+  examples:
+  - summary: List all partner registrations in the current Azure subscription.
+    syntax: az eventgrid partner registration list
+  - summary: List all partner registrations in a resource group.
+    syntax: az eventgrid partner registration list -g rg1
+  - summary: List all partner registrations in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner registration list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all partner registrations in a resource group except the partner registration with name "name1"
+    syntax: az eventgrid partner registration list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_registration_show
+  name: az eventgrid partner registration show
+  summary: Get a partner registration.
+  description: Gets a partner registration with the specified parameters.
+  syntax: >-
+    az eventgrid partner registration show --name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_registration_create
+- az_eventgrid_partner_registration_delete
+- az_eventgrid_partner_registration_list
+- az_eventgrid_partner_registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner registrations.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/topic.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/topic.yml
new file mode 100644
index 0000000000..39c550fc61
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/topic.yml
@@ -0,0 +1,140 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_topic
+name: az eventgrid partner topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_topic_activate
+  name: az eventgrid partner topic activate
+  summary: Activate a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic activate --name
+                                        --resource-group
+  examples:
+  - summary: Activate a specific partner topic.
+    syntax: az eventgrid partner topic activate -g rg1 -n partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_deactivate
+  name: az eventgrid partner topic deactivate
+  summary: Deactivate a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic deactivate --name
+                                          --resource-group
+  examples:
+  - summary: Deactivate a specific partner topic.
+    syntax: az eventgrid partner topic deactivate -g rg1 -n partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_delete
+  name: az eventgrid partner topic delete
+  summary: Delete a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic delete --name
+                                      --resource-group
+  examples:
+  - summary: Delete a specific partner topic.
+    syntax: az eventgrid partner topic delete -g rg1 --name partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_list
+  name: az eventgrid partner topic list
+  summary: List available partner topics.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic list [--odata-query]
+                                    [--resource-group]
+  examples:
+  - summary: List all partner topics in the current Azure subscription.
+    syntax: az eventgrid partner topic list
+  - summary: List all partner topics in a resource group.
+    syntax: az eventgrid partner topic list -g rg1
+  - summary: List all partner topics in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all partner topics in a resource group except the partner topic with name "name1"
+    syntax: az eventgrid partner topic list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_show
+  name: az eventgrid partner topic show
+  summary: Get the details of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic show --name
+                                    --resource-group
+  examples:
+  - summary: Show the details of a partner topic.
+    syntax: az eventgrid partner topic show -g rg1 -n partnertopic1
+  - summary: Show the details of a partner topic based on resource ID.
+    syntax: az eventgrid partner topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnetopics/topic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_topic_activate
+- az_eventgrid_partner_topic_deactivate
+- az_eventgrid_partner_topic_delete
+- az_eventgrid_partner_topic_event-subscription
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+- az_eventgrid_partner_topic_list
+- az_eventgrid_partner_topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/topic/event-subscription.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/topic/event-subscription.yml
new file mode 100644
index 0000000000..e1457a1990
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/partner/topic/event-subscription.yml
@@ -0,0 +1,387 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_topic_event-subscription
+name: az eventgrid partner topic event-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner topic event-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event subscriptions of partner topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_topic_event-subscription_create
+  name: az eventgrid partner topic event-subscription create
+  summary: Create a new event subscription for a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription create --name
+                                                         --partner-topic-name
+                                                         --resource-group
+                                                         [--advanced-filter]
+                                                         [--azure-active-directory-application-id-or-uri]
+                                                         [--azure-active-directory-tenant-id]
+                                                         [--deadletter-endpoint]
+                                                         [--endpoint]
+                                                         [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                         [--event-delivery-schema {cloudeventschemav1_0, custominputschema, eventgridschema}]
+                                                         [--event-ttl]
+                                                         [--expiration-date]
+                                                         [--included-event-types]
+                                                         [--labels]
+                                                         [--max-delivery-attempts]
+                                                         [--max-events-per-batch]
+                                                         [--preferred-batch-size-in-kilobytes]
+                                                         [--subject-begins-with]
+                                                         [--subject-case-sensitive {false, true}]
+                                                         [--subject-ends-with]
+  examples:
+  - summary: Create a new event subscription for an Event Grid partner topic, using default filters.
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for an Event Grid partner topic, with a filter specifying a subject prefix.
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es4 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-begins-with mysubject_prefix
+  - summary: Create a new event subscription for an Event Grid partner topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
+    syntax: >-
+      az eventgrid partner topic event-subscription create -n es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --event-delivery-schema cloudeventschemav1_0
+  - summary: Create a new event subscription for an Event Grid partnertopic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
+          --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
+  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Active Directory enabled Webhook as a destination .
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --azure-active-directory-tenant-id azureactivedirectorytenantid
+          --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
+  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Function as destination.
+    syntax: >-
+      az eventgrid partner topic event-subscription create -n es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --azure-active-directory-application-id-or-uri
+    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --azure-active-directory-tenant-id
+    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --event-delivery-schema
+    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
+    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
+    description: ''
+  - name: --event-ttl
+    defaultValue: "1440"
+    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
+    description: ''
+  - name: --expiration-date
+    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --max-delivery-attempts
+    defaultValue: "30"
+    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
+    description: ''
+  - name: --max-events-per-batch
+    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
+    description: ''
+  - name: --preferred-batch-size-in-kilobytes
+    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-case-sensitive
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_delete
+  name: az eventgrid partner topic event-subscription delete
+  summary: Delete an event subscription of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription delete --name
+                                                         --partner-topic-name
+                                                         --resource-group
+  examples:
+  - summary: Delete an event subscription for an Event Grid partner topic.
+    syntax: >-
+      az eventgrid partner topic event-subscription delete --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_list
+  name: az eventgrid partner topic event-subscription list
+  summary: List event subscriptions of a specific partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription list --partner-topic-name
+                                                       --resource-group
+                                                       [--odata-query]
+  examples:
+  - summary: List all event subscriptions created for an Event Grid partner topic.
+    syntax: az eventgrid partner topic event-subscription list -g rg1 --partner-topic-name partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_show
+  name: az eventgrid partner topic event-subscription show
+  summary: Get the details of an event subscription of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription show --name
+                                                       --partner-topic-name
+                                                       --resource-group
+                                                       [--include-full-endpoint-url {false, true}]
+  examples:
+  - summary: Show the details of an event subscription for an Event Grid partner topic.
+    syntax: >-
+      az eventgrid partner topic event-subscription show --name es1 \
+           -g rg1 --partner-topic-name partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-full-endpoint-url
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_update
+  name: az eventgrid partner topic event-subscription update
+  summary: Update an event subscription of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription update --name
+                                                         --partner-topic-name
+                                                         --resource-group
+                                                         [--advanced-filter]
+                                                         [--deadletter-endpoint]
+                                                         [--endpoint]
+                                                         [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                         [--included-event-types]
+                                                         [--labels]
+                                                         [--subject-begins-with]
+                                                         [--subject-ends-with]
+  examples:
+  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for an Event Grid partner topic to specify a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --subject-ends-with .jpg
+  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es3 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --subject-ends-with .png \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
+  - summary: Update an event subscription for an Azure Event Grid partner topic, to include a deadletter destination.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
+  - summary: Update an event subscription for an Azure Event Grid partner topic, using advanced filters.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es3 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+commands:
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event subscriptions of partner topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/system-topic.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/system-topic.yml
new file mode 100644
index 0000000000..1ab7771e3f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/system-topic.yml
@@ -0,0 +1,165 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_system-topic
+name: az eventgrid system-topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid system-topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage system topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_system-topic_create
+  name: az eventgrid system-topic create
+  summary: Create a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic create --location
+                                     --name
+                                     --resource-group
+                                     --source
+                                     --topic-type
+                                     [--tags]
+  examples:
+  - summary: Create a new system topic for storage account source.
+    syntax: az eventgrid system-topic create -g rg1 --name systemtopic1 --location westus2 --topic-type microsoft.storage.storageaccounts --source /subscriptions/1b3b4501-23b9-4790-c31b-ddbd88d72123/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/stgaccountname
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source
+    summary: The ARM Id for the topic, e.g., /subscriptions/{SubId}/resourceGroups/{RgName}/providers/Microsoft.Storage/storageAccounts/{AccountName}.
+    description: ''
+  - isRequired: true
+    name: --topic-type
+    summary: Name of the topic type.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_system-topic_delete
+  name: az eventgrid system-topic delete
+  summary: Delete a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic delete --name
+                                     --resource-group
+  examples:
+  - summary: Delete a specific system topic.
+    syntax: az eventgrid system-topic delete -g rg1 --name systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_system-topic_list
+  name: az eventgrid system-topic list
+  summary: List available system topics.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic list [--odata-query]
+                                   [--resource-group]
+  examples:
+  - summary: List all system topics in the current Azure subscription.
+    syntax: az eventgrid system-topic list
+  - summary: List all system topics in a resource group.
+    syntax: az eventgrid system-topic list -g rg1
+  - summary: List all system topics in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid system-topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all system topics in a resource group except the system topic with name "name1"
+    syntax: az eventgrid system-topic list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_system-topic_show
+  name: az eventgrid system-topic show
+  summary: Get the details of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic show --name
+                                   --resource-group
+  examples:
+  - summary: Show the details of a system topic.
+    syntax: az eventgrid system-topic show -g rg1 -n systemtopic1
+  - summary: Show the details of a system topic based on resource ID.
+    syntax: az eventgrid system-topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/systemtopics/systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_system-topic_update
+  name: az eventgrid system-topic update
+  summary: Update a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic update --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: Update the properties of an existing system topic.
+    syntax: az eventgrid system-topic update -g rg1 --name systemtopic1 --tags Dept=IT
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_eventgrid_system-topic_create
+- az_eventgrid_system-topic_delete
+- az_eventgrid_system-topic_event-subscription
+- az_eventgrid_system-topic_event-subscription_create
+- az_eventgrid_system-topic_event-subscription_delete
+- az_eventgrid_system-topic_event-subscription_list
+- az_eventgrid_system-topic_event-subscription_show
+- az_eventgrid_system-topic_event-subscription_update
+- az_eventgrid_system-topic_list
+- az_eventgrid_system-topic_show
+- az_eventgrid_system-topic_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage system topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/system-topic/event-subscription.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/system-topic/event-subscription.yml
new file mode 100644
index 0000000000..50ad5f22fd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/system-topic/event-subscription.yml
@@ -0,0 +1,387 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_system-topic_event-subscription
+name: az eventgrid system-topic event-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid system-topic event-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event subscriptions of system topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_system-topic_event-subscription_create
+  name: az eventgrid system-topic event-subscription create
+  summary: Create a new event subscription for a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription create --name
+                                                        --resource-group
+                                                        --system-topic-name
+                                                        [--advanced-filter]
+                                                        [--azure-active-directory-application-id-or-uri]
+                                                        [--azure-active-directory-tenant-id]
+                                                        [--deadletter-endpoint]
+                                                        [--endpoint]
+                                                        [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                        [--event-delivery-schema {cloudeventschemav1_0, custominputschema, eventgridschema}]
+                                                        [--event-ttl]
+                                                        [--expiration-date]
+                                                        [--included-event-types]
+                                                        [--labels]
+                                                        [--max-delivery-attempts]
+                                                        [--max-events-per-batch]
+                                                        [--preferred-batch-size-in-kilobytes]
+                                                        [--subject-begins-with]
+                                                        [--subject-case-sensitive {false, true}]
+                                                        [--subject-ends-with]
+  examples:
+  - summary: Create a new event subscription for an Event Grid system topic, using default filters.
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for an Event Grid system topic, with a filter specifying a subject prefix.
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es4 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-begins-with mysubject_prefix
+  - summary: Create a new event subscription for an Event Grid system topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
+    syntax: >-
+      az eventgrid system-topic event-subscription create -n es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --event-delivery-schema cloudeventschemav1_0
+  - summary: Create a new event subscription for an Event Grid system topic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
+          --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
+  - summary: Create a new event subscription for an Event Grid system topic, using Azure Active Directory enabled Webhook as a destination .
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --azure-active-directory-tenant-id azureactivedirectorytenantid
+          --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
+  - summary: Create a new event subscription for an Event Grid system topic, using Azure Function as destination.
+    syntax: >-
+      az eventgrid system-topic event-subscription create -n es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --azure-active-directory-application-id-or-uri
+    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --azure-active-directory-tenant-id
+    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --event-delivery-schema
+    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
+    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
+    description: ''
+  - name: --event-ttl
+    defaultValue: "1440"
+    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
+    description: ''
+  - name: --expiration-date
+    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --max-delivery-attempts
+    defaultValue: "30"
+    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
+    description: ''
+  - name: --max-events-per-batch
+    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
+    description: ''
+  - name: --preferred-batch-size-in-kilobytes
+    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-case-sensitive
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_delete
+  name: az eventgrid system-topic event-subscription delete
+  summary: Delete an event subscription of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription delete --name
+                                                        --resource-group
+                                                        --system-topic-name
+  examples:
+  - summary: Delete an event subscription for an Event Grid system topic.
+    syntax: >-
+      az eventgrid system-topic event-subscription delete --name es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_list
+  name: az eventgrid system-topic event-subscription list
+  summary: List event subscriptions of a specific system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription list --resource-group
+                                                      --system-topic-name
+                                                      [--odata-query]
+  examples:
+  - summary: List all event subscriptions created for an Event Grid system topic.
+    syntax: az eventgrid system-topic event-subscription list -g rg1 --system-topic-name systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_show
+  name: az eventgrid system-topic event-subscription show
+  summary: Get the details of an event subscription of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription show --name
+                                                      --resource-group
+                                                      --system-topic-name
+                                                      [--include-full-endpoint-url {false, true}]
+  examples:
+  - summary: Show the details of an event subscription for an Event Grid system topic.
+    syntax: >-
+      az eventgrid system-topic event-subscription show --name es1 \
+           -g rg1 --system-topic-name systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --include-full-endpoint-url
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_update
+  name: az eventgrid system-topic event-subscription update
+  summary: Update an event subscription of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription update --name
+                                                        --resource-group
+                                                        --system-topic-name
+                                                        [--advanced-filter]
+                                                        [--deadletter-endpoint]
+                                                        [--endpoint]
+                                                        [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                        [--included-event-types]
+                                                        [--labels]
+                                                        [--subject-begins-with]
+                                                        [--subject-ends-with]
+  examples:
+  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es1 \
+          -g rg1 --system-topic-name systemtopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for an Event Grid system topic to specify a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --subject-ends-with .jpg
+  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es3 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --subject-ends-with .png \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
+  - summary: Update an event subscription for an Azure Event Grid system topic, to include a deadletter destination.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
+  - summary: Update an event subscription for an Azure Event Grid system topic, using advanced filters.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es3 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+commands:
+- az_eventgrid_system-topic_event-subscription_create
+- az_eventgrid_system-topic_event-subscription_delete
+- az_eventgrid_system-topic_event-subscription_list
+- az_eventgrid_system-topic_event-subscription_show
+- az_eventgrid_system-topic_event-subscription_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event subscriptions of system topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/topic-type.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic-type.yml
new file mode 100644
index 0000000000..22a2aac5d4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic-type.yml
@@ -0,0 +1,59 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic-type
+name: az eventgrid topic-type
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic-type** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Get details for topic types.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic-type_list
+  name: az eventgrid topic-type list
+  summary: List registered topic types.
+  description: ''
+  syntax: az eventgrid topic-type list
+- uid: az_eventgrid_topic-type_list-event-types
+  name: az eventgrid topic-type list-event-types
+  summary: List the event types supported by a topic type.
+  description: ''
+  syntax: az eventgrid topic-type list-event-types --name
+  examples:
+  - summary: List all event types supported by Azure Storage Accounts.
+    syntax: az eventgrid topic-type list-event-types -n Microsoft.Storage.StorageAccounts
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic type.
+    description: ''
+- uid: az_eventgrid_topic-type_show
+  name: az eventgrid topic-type show
+  summary: Get the details for a topic type.
+  description: ''
+  syntax: az eventgrid topic-type show --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic type.
+    description: ''
+commands:
+- az_eventgrid_topic-type_list
+- az_eventgrid_topic-type_list-event-types
+- az_eventgrid_topic-type_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Get details for topic types.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/topic.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic.yml
new file mode 100644
index 0000000000..e1982444dd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic.yml
@@ -0,0 +1,220 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic
+name: az eventgrid topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Event Grid topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_create
+  name: az eventgrid topic create
+  summary: Create a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic create --location
+                              --name
+                              --resource-group
+                              [--identity {noidentity, systemassigned}]
+                              [--inbound-ip-rules]
+                              [--input-mapping-default-values]
+                              [--input-mapping-fields]
+                              [--input-schema {cloudeventschemav1_0, customeventschema, eventgridschema}]
+                              [--public-network-access {disabled, enabled}]
+                              [--sku {basic, premium}]
+                              [--tags]
+  examples:
+  - summary: Create a new topic.
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2
+  - summary: Create a new topic with custom input mappings.
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=myTopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
+  - summary: Create a new topic that accepts events published in CloudEvents V1.0 schema.
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema cloudeventschemav1_0
+  - summary: Create a new topic which allows specific inbound ip rules with Basic Sku and system assigned identity
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku Basic --identity systemassigned
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --input-mapping-default-values
+    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
+    description: ''
+  - name: --input-mapping-fields
+    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
+    description: ''
+  - name: --input-schema
+    defaultValue: eventgridschema
+    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
+    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
+    description: ''
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_topic_delete
+  name: az eventgrid topic delete
+  summary: Delete a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic delete --name
+                              --resource-group
+  examples:
+  - summary: Delete a topic.
+    syntax: az eventgrid topic delete -g rg1 --name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_list
+  name: az eventgrid topic list
+  summary: List available topics.
+  description: ''
+  syntax: >-
+    az eventgrid topic list [--odata-query]
+                            [--resource-group]
+  examples:
+  - summary: List all topics in the current Azure subscription.
+    syntax: az eventgrid topic list
+  - summary: List all topics in a resource group.
+    syntax: az eventgrid topic list -g rg1
+  - summary: List all topics in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all topics in a resource group except the domain with name "name1"
+    syntax: az eventgrid topic list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_show
+  name: az eventgrid topic show
+  summary: Get the details of a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic show --name
+                            --resource-group
+  examples:
+  - summary: Show the details of a topic.
+    syntax: az eventgrid topic show -g rg1 -n topic1
+  - summary: Show the details of a topic based on resource ID.
+    syntax: az eventgrid topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_update
+  name: az eventgrid topic update
+  summary: Update a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic update --name
+                              --resource-group
+                              [--identity {noidentity, systemassigned}]
+                              [--inbound-ip-rules]
+                              [--public-network-access {disabled, enabled}]
+                              [--sku {basic, premium}]
+                              [--tags]
+  examples:
+  - summary: Update the properties of an existing topic with new sku, identity and public network access information.
+    syntax: az eventgrid topic update -g rg1 --name topic1 --sku Premium --identity systemassigned --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_eventgrid_topic_create
+- az_eventgrid_topic_delete
+- az_eventgrid_topic_key
+- az_eventgrid_topic_key_list
+- az_eventgrid_topic_key_regenerate
+- az_eventgrid_topic_list
+- az_eventgrid_topic_private-endpoint-connection
+- az_eventgrid_topic_private-endpoint-connection_approve
+- az_eventgrid_topic_private-endpoint-connection_delete
+- az_eventgrid_topic_private-endpoint-connection_list
+- az_eventgrid_topic_private-endpoint-connection_reject
+- az_eventgrid_topic_private-endpoint-connection_show
+- az_eventgrid_topic_private-link-resource
+- az_eventgrid_topic_private-link-resource_list
+- az_eventgrid_topic_private-link-resource_show
+- az_eventgrid_topic_show
+- az_eventgrid_topic_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Event Grid topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/key.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/key.yml
new file mode 100644
index 0000000000..11b17cfa4d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/key.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic_key
+name: az eventgrid topic key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage shared access keys of a topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_key_list
+  name: az eventgrid topic key list
+  summary: List shared access keys of a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic key list --name
+                                --resource-group
+  examples:
+  - summary: List shared access keys of a topic (autogenerated)
+    syntax: az eventgrid topic key list --name MyTopic --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_key_regenerate
+  name: az eventgrid topic key regenerate
+  summary: Regenerate a shared access key of a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic key regenerate --key-name
+                                      --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: Key name to regenerate key1 or key2.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_topic_key_list
+- az_eventgrid_topic_key_regenerate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage shared access keys of a topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/private-endpoint-connection.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/private-endpoint-connection.yml
new file mode 100644
index 0000000000..81eb7d6717
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/private-endpoint-connection.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic_private-endpoint-connection
+name: az eventgrid topic private-endpoint-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic private-endpoint-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private endpoint connections of a topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_private-endpoint-connection_approve
+  name: az eventgrid topic private-endpoint-connection approve
+  summary: Approve a private endpoint connection request for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection approve --name
+                                                           --resource-group
+                                                           --topic-name
+                                                           [--description]
+  examples:
+  - summary: Approve a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-endpoint-connection approve -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the approval.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_delete
+  name: az eventgrid topic private-endpoint-connection delete
+  summary: Delete a private endpoint connection for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection delete --name
+                                                          --resource-group
+                                                          --topic-name
+  examples:
+  - summary: Delete private endpoint connection for a specific topic.
+    syntax: az eventgrid topic private-endpoint-connection delete -g rg1 --topic-name topic1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_list
+  name: az eventgrid topic private-endpoint-connection list
+  summary: List the properties of all the private endpoint connections for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection list --resource-group
+                                                        --topic-name
+  examples:
+  - summary: List private endpoint connections for a topic.
+    syntax: az eventgrid topic private-endpoint-connection list -g rg1 --topic-name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_reject
+  name: az eventgrid topic private-endpoint-connection reject
+  summary: Reject a private endpoint connection request for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection reject --name
+                                                          --resource-group
+                                                          --topic-name
+                                                          [--description]
+  examples:
+  - summary: Reject a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-endpoint-connection reject -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the rejection.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_show
+  name: az eventgrid topic private-endpoint-connection show
+  summary: Display the properties of a private endpoint connection for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection show --name
+                                                        --resource-group
+                                                        --topic-name
+  examples:
+  - summary: Show a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-endpoint-connection show -g rg1 --topic-name topic1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+commands:
+- az_eventgrid_topic_private-endpoint-connection_approve
+- az_eventgrid_topic_private-endpoint-connection_delete
+- az_eventgrid_topic_private-endpoint-connection_list
+- az_eventgrid_topic_private-endpoint-connection_reject
+- az_eventgrid_topic_private-endpoint-connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private endpoint connections of a topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/private-link-resource.yml b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/private-link-resource.yml
new file mode 100644
index 0000000000..3e29c0d00b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/eventgrid/topic/private-link-resource.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic_private-link-resource
+name: az eventgrid topic private-link-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic private-link-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private link resource of a topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_private-link-resource_list
+  name: az eventgrid topic private-link-resource list
+  summary: List the properties of all the private link resources for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-link-resource list --resource-group
+                                                  --topic-name
+  examples:
+  - summary: Show a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-link-resource list -g rg1 --topic-name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+- uid: az_eventgrid_topic_private-link-resource_show
+  name: az eventgrid topic private-link-resource show
+  summary: Display the properties of a private link resource for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-link-resource show --name
+                                                  --resource-group
+                                                  --topic-name
+  examples:
+  - summary: Show a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-link-resource show -g rg1 --topic-name topic1 -n topic
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private link resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+commands:
+- az_eventgrid_topic_private-link-resource_list
+- az_eventgrid_topic_private-link-resource_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private link resource of a topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/account/account.yml b/2017-03-09-profile/docs-ref-autogen/ext/account/account.yml
deleted file mode 100644
index 6ce3c12eba..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/account/account.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_account_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_account_az_account_subscription
-  name: az account subscription
-  summary: Manage subscriptions.
-- uid: ext_account_az_account_subscription_cancel
-  name: az account subscription cancel
-  summary: Cancel subscription.
-- uid: ext_account_az_account_subscription_create
-  name: az account subscription create
-  summary: Create a new WebDirect or EA Azure subscription.
-- uid: ext_account_az_account_subscription_create_csp
-  name: az account subscription create-csp
-  summary: Create a new CSP subscription.
-- uid: ext_account_az_account_subscription_create_in_enrollment_account
-  name: az account subscription create-in-enrollment-account
-  summary: Create subscription in enrolment account.
-- uid: ext_account_az_account_subscription_enable
-  name: az account subscription enable
-  summary: Enable subscription.
-- uid: ext_account_az_account_subscription_rename
-  name: az account subscription rename
-  summary: Rename subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure subscription information.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/account/account/subscription.yml b/2017-03-09-profile/docs-ref-autogen/ext/account/account/subscription.yml
deleted file mode 100644
index 56ee324868..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/account/account/subscription.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_account_az_account_subscription
-  name: az account subscription
-  summary: Manage subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_account_az_account_subscription_cancel
-  - ext_account_az_account_subscription_create
-  - ext_account_az_account_subscription_create_csp
-  - ext_account_az_account_subscription_create_in_enrollment_account
-  - ext_account_az_account_subscription_enable
-  - ext_account_az_account_subscription_rename
-- uid: ext_account_az_account_subscription_cancel
-  name: az account subscription cancel
-  summary: Cancel subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel subscription
-    syntax:
-      content: az account subscription cancel --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --subscription-id
-    summary: Subscription Id.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_account_az_account_subscription_create
-  name: az account subscription create
-  summary: Create a new WebDirect or EA Azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create subscription
-    syntax:
-      content: >-
-        az account subscription create --billing-account-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx_XXXX-XX-XX" \
-
-        --billing-profile-name "27VR-HDWX-BG7-TGB" --cost-center "135366376" --display-name \
-
-        "Contoso MCA subscription" --owner xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx \
-
-        --sku-id "0001" --invoice-section-name "JGF7-NSBG-PJA-TGB"
-  parameters:
-  - isRequired: true
-    name: --billing-account-name
-    summary: The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --billing-profile-name
-    summary: The name of the billing profile in the billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --display-name
-    summary: The friendly name of the subscription.
-    description: ''
-  - isRequired: true
-    name: --invoice-section-name
-    summary: The name of the invoice section in the billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --sku-id
-    summary: The SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
-    description: ''
-  - name: --cost-center
-    summary: If set, the cost center will show up on the Azure usage and charges file.
-    description: ''
-  - name: --management-group-id
-    summary: The identifier of the management group to which this subscription will be associated.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --owner
-    summary: Active Directory Principal who’ll get owner access on the new subscription.
-    description: ''
-- uid: ext_account_az_account_subscription_create_csp
-  name: az account subscription create-csp
-  summary: Create a new CSP subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create CSP subscription
-    syntax:
-      content: >-
-        az account subscription create-csp --billing-account-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx_XXXX-XX-XX" \
-
-        --display-name "Contoso MCA subscription" --sku-id "0001" --customer-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --billing-account-name
-    summary: The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --customer-name
-    summary: The name of the customer.
-    description: ''
-  - isRequired: true
-    name: --display-name
-    summary: The friendly name of the subscription.
-    description: ''
-  - isRequired: true
-    name: --sku-id
-    summary: The SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --reseller-id
-    summary: Reseller ID, basically MPN Id.
-    description: ''
-- uid: ext_account_az_account_subscription_create_in_enrollment_account
-  name: az account subscription create-in-enrollment-account
-  summary: Create subscription in enrolment account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create subscription in enrollment account
-    syntax:
-      content: >-
-        az account subscription create-in-enrollment-account --display-name \
-
-        "Test Ea Azure Sub" --offer-type "MS-AZR-0017P" --owners \
-
-        xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx \
-
-        xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --enrollment-account-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --enrollment-account-name
-    summary: The name of the enrollment account to which the subscription will be billed.
-    description: ''
-  - name: --display-name
-    summary: The display name of the subscription.
-    description: ''
-  - name: --management-group-id
-    summary: The Management Group Id.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --offer-type
-    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
-    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available. Only valid when creating a subscription in a enrollment account scope.
-    description: ''
-  - name: --owners
-    summary: The list of principals that should be granted Owner access on the subscription. Principals should be of type User, Service Principal or Security Group.
-    description: ''
-- uid: ext_account_az_account_subscription_enable
-  name: az account subscription enable
-  summary: Enable subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable subscription
-    syntax:
-      content: az account subscription enable --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --subscription-id
-    summary: Subscription Id.
-    description: ''
-- uid: ext_account_az_account_subscription_rename
-  name: az account subscription rename
-  summary: Rename subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Rename subscription
-    syntax:
-      content: az account subscription rename --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --subscription-id
-    summary: Subscription Id.
-    description: ''
-  - name: --subscription-name
-    summary: New subscription name.
-    description: ''
-commands:
-- uid: ext_account_az_account_subscription_cancel
-  name: az account subscription cancel
-  summary: Cancel subscription.
-- uid: ext_account_az_account_subscription_create
-  name: az account subscription create
-  summary: Create a new WebDirect or EA Azure subscription.
-- uid: ext_account_az_account_subscription_create_csp
-  name: az account subscription create-csp
-  summary: Create a new CSP subscription.
-- uid: ext_account_az_account_subscription_create_in_enrollment_account
-  name: az account subscription create-in-enrollment-account
-  summary: Create subscription in enrolment account.
-- uid: ext_account_az_account_subscription_enable
-  name: az account subscription enable
-  summary: Enable subscription.
-- uid: ext_account_az_account_subscription_rename
-  name: az account subscription rename
-  summary: Rename subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/account/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/account/index.yml
deleted file mode 100644
index 84da9c46ce..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/account/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_account_az
-  name: account
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_account_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/aem/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/aem/index.yml
deleted file mode 100644
index c6dccf0041..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/aem/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aem_az
-  name: aem
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_aem_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/aem/vm.yml b/2017-03-09-profile/docs-ref-autogen/ext/aem/vm.yml
deleted file mode 100644
index 6c69576acb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/aem/vm.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aem_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_aem_az_vm_aem
-  name: az vm aem
-  summary: Manage Azure Enhanced Monitoring Extension for SAP.
-- uid: ext_aem_az_vm_aem_delete
-  name: az vm aem delete
-  summary: Remove Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_set
-  name: az vm aem set
-  summary: Configure Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_verify
-  name: az vm aem verify
-  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Linux or Windows virtual machines.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/aem/vm/aem.yml b/2017-03-09-profile/docs-ref-autogen/ext/aem/vm/aem.yml
deleted file mode 100644
index 6a382f7b2e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/aem/vm/aem.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aem_az_vm_aem
-  name: az vm aem
-  summary: Manage Azure Enhanced Monitoring Extension for SAP.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_aem_az_vm_aem_delete
-  - ext_aem_az_vm_aem_set
-  - ext_aem_az_vm_aem_verify
-- uid: ext_aem_az_vm_aem_delete
-  name: az vm aem delete
-  summary: Remove Azure Enhanced Monitoring Extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aem_az_vm_aem_set
-  name: az vm aem set
-  summary: Configure Azure Enhanced Monitoring Extension.
-  description: It can take up to 15 minutes for the monitoring data to appear in the SAP system.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --skip-storage-analytics
-    summary: Skip enabling analytics on storage accounts.
-    description: ''
-- uid: ext_aem_az_vm_aem_verify
-  name: az vm aem verify
-  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --skip-storage-check
-    summary: Disables the test for table content.
-    description: ''
-  - name: --wait-time-in-minutes
-    defaultValue: "15"
-    summary: Maximum minutes to wait for the storage metrics to be available.
-    description: ''
-commands:
-- uid: ext_aem_az_vm_aem_delete
-  name: az vm aem delete
-  summary: Remove Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_set
-  name: az vm aem set
-  summary: Configure Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_verify
-  name: az vm aem verify
-  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Enhanced Monitoring Extension for SAP.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ai-did-you-mean-this/ai-did-you-mean-this.yml b/2017-03-09-profile/docs-ref-autogen/ext/ai-did-you-mean-this/ai-did-you-mean-this.yml
deleted file mode 100644
index f68833b774..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ai-did-you-mean-this/ai-did-you-mean-this.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-  name: az ai-did-you-mean-this
-  summary: Add recommendations for recovering from failure.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-  name: az ai-did-you-mean-this version
-  summary: Prints the extension version.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-  name: az ai-did-you-mean-this version
-  summary: Prints the extension version.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Add recommendations for recovering from failure.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ai-did-you-mean-this/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/ai-did-you-mean-this/index.yml
deleted file mode 100644
index b58077c5d6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ai-did-you-mean-this/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-did-you-mean-this_az
-  name: ai-did-you-mean-this
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-  name: az ai-did-you-mean-this
-  summary: Add recommendations for recovering from failure.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ai-examples/ai-examples.yml b/2017-03-09-profile/docs-ref-autogen/ext/ai-examples/ai-examples.yml
deleted file mode 100644
index a8ff64bd94..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ai-examples/ai-examples.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-examples_az_ai_examples
-  name: az ai-examples
-  summary: Add AI powered examples to help content.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_ai-examples_az_ai_examples_check_connection
-- uid: ext_ai-examples_az_ai_examples_check_connection
-  name: az ai-examples check-connection
-  summary: Check if the client can connect to the AI example service.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_ai-examples_az_ai_examples_check_connection
-  name: az ai-examples check-connection
-  summary: Check if the client can connect to the AI example service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Add AI powered examples to help content.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ai-examples/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/ai-examples/index.yml
deleted file mode 100644
index 06ad6d31a2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ai-examples/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-examples_az
-  name: ai-examples
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ai-examples_az_ai_examples
-  name: az ai-examples
-  summary: Add AI powered examples to help content.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks.yml b/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks.yml
deleted file mode 100644
index 34113881ca..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks.yml
+++ /dev/null
@@ -1,906 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aks-preview_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_aks-preview_az_aks_browse
-  - ext_aks-preview_az_aks_create
-  - ext_aks-preview_az_aks_disable_addons
-  - ext_aks-preview_az_aks_enable_addons
-  - ext_aks-preview_az_aks_get_credentials
-  - ext_aks-preview_az_aks_get_upgrades
-  - ext_aks-preview_az_aks_get_versions
-  - ext_aks-preview_az_aks_kanalyze
-  - ext_aks-preview_az_aks_kollect
-  - ext_aks-preview_az_aks_rotate_certs
-  - ext_aks-preview_az_aks_scale
-  - ext_aks-preview_az_aks_show
-  - ext_aks-preview_az_aks_update
-  - ext_aks-preview_az_aks_upgrade
-  - ext_aks-preview_az_aks_wait
-- uid: ext_aks-preview_az_aks_browse
-  name: az aks browse
-  summary: Show the dashboard for a Kubernetes cluster in a web browser.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the dashboard for a Kubernetes cluster in a web browser. (autogenerated)
-    syntax:
-      content: az aks browse --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disable-browser
-    summary: Don't launch a web browser after establishing port-forwarding.
-    description: Add this argument when launching a web browser manually, or for automated testing.
-  - name: --listen-address
-    defaultValue: 127.0.0.1
-    summary: The listening address for the dashboard.
-    description: Add this argument to listen on a specific IP address.
-  - name: --listen-port
-    defaultValue: "8001"
-    summary: The listening port for the dashboard.
-    description: Add this argument when the default listening port is used by another process or unavailable.
-- uid: ext_aks-preview_az_aks_create
-  name: az aks create
-  summary: Create a new managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Kubernetes cluster with an existing SSH public key.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
-  - summary: Create a Kubernetes cluster with a specific version.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9
-  - summary: Create a Kubernetes cluster with a larger node pool.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --node-count 7
-  - summary: Create a kubernetes cluster with cluster autosclaler enabled.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --node-count 3 --enable-cluster-autoscaler --min-count 1 --max-count 5
-  - summary: Create a kubernetes cluster with k8s 1.13.9 but use vmas.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --vm-set-type AvailabilitySet
-  - summary: Create a kubernetes cluster with default kubernetes vesrion, default SKU load balancer(standard) and default vm set type(VirtualMachineScaleSets).
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster
-  - summary: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
-  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
-  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
-  - summary: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
-  - summary: Create a kubernetes cluster with basic SKU load balancer and AvailabilitySet vm set type.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku basic --vm-set-type AvailabilitySet
-  - summary: Create a kubernetes cluster with authorized apiserver IP ranges.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24,195.168.1.0
-  - summary: Create a kubernetes cluster with server side encryption using your owned key.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-diskencryptionset-id <disk-encryption-set-resource-id>
-  - summary: Create a kubernetes cluster with userDefinedRouting, standard load balancer SKU and a custom subnet preconfigured with a route table
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --outbound-type userDefinedRouting --load-balancer-sku standard --vnet-subnet-id customUserSubnetVnetID
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --aad-admin-group-object-ids
-    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
-    description: ''
-  - name: --aad-client-app-id
-    summary: The ID of an Azure Active Directory client application of type "Native". This application is for user login via kubectl.
-    description: ''
-  - name: --aad-server-app-id
-    summary: The ID of an Azure Active Directory server application of type "Web app/API". This application represents the managed cluster's apiserver (Server application).
-    description: ''
-  - name: --aad-server-app-secret
-    summary: The secret of an Azure Active Directory server application.
-    description: ''
-  - name: --aad-tenant-id
-    summary: The ID of an Azure Active Directory tenant.
-    description: ''
-  - name: --admin-username -u
-    defaultValue: azureuser
-    summary: User account to create on node VMs for SSH access.
-    description: ''
-  - name: --aks-custom-headers
-    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
-    description: ''
-  - name: --api-server-authorized-ip-ranges
-    summary: Comma seperated list of authorized apiserver IP ranges. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
-    description: ''
-  - name: --appgw-id
-    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-name
-    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-id
-    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-prefix
-    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-watch-namespace
-    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
-    description: ''
-  - name: --attach-acr
-    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
-    description: ''
-  - name: --client-secret
-    summary: Secret associated with the service principal. This argument is required if `--service-principal` is specified.
-    description: ''
-  - name: --cluster-autoscaler-profile
-    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
-    description: ''
-  - name: --disable-rbac
-    summary: Disable Kubernetes Role-Based Access Control.
-    description: ''
-  - name: --dns-name-prefix -p
-    summary: Prefix for hostnames that are created. If not specified, generate a hostname using the managed cluster and resource group names.
-    description: ''
-  - name: --dns-service-ip
-    summary: An IP address assigned to the Kubernetes DNS service.
-    description: This address must be within the Kubernetes service address range specified by "--service-cidr". For example, 10.0.0.10.
-  - name: --docker-bridge-address
-    summary: A specific IP address and netmask for the Docker bridge, using standard CIDR notation.
-    description: This address must not be in any Subnet IP ranges, or the Kubernetes service address range. For example, 172.17.0.1/16.
-  - name: --enable-aad
-    summary: Enable managed AAD feature for cluster.
-    description: ''
-  - name: --enable-addons -a
-    summary: Enable the Kubernetes addons in a comma-separated list.
-    description: >-
-      These addons are available:
-          http_application_routing  - configure ingress with automatic public DNS name creation.
-          monitoring                - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
-                                      If monitoring addon is enabled --no-wait argument will have no effect
-          virtual-node              - enable AKS Virtual Node (PREVIEW). Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
-          azure-policy              - enable Azure policy (PREVIEW).
-          ingress-appgw             - enable Applicaiton Gateway Ingress Controller addon (PREVIEW).
-  - name: --enable-cluster-autoscaler
-    summary: Enable cluster autoscaler, default value is false.
-    description: If specified, please make sure the kubernetes version is larger than 1.10.6.
-  - name: --enable-managed-identity
-    summary: (PREVIEW) Using a system assigned managed identity to manage cluster resource group.
-    description: ''
-  - name: --enable-node-public-ip
-    summary: Enable VMSS node public IP.
-    description: ''
-  - name: --enable-pod-security-policy
-    summary: (PREVIEW) Enable pod security policy.
-    description: ''
-  - name: --enable-private-cluster
-    summary: Enable private cluster.
-    description: ''
-  - name: --enable-rbac -r
-    summary: 'Enable Kubernetes Role-Based Access Control. Default: enabled.'
-    description: ''
-  - name: --enable-vmss
-    summary: To be deprecated. Use vm_set_type instead.
-    description: ''
-  - name: --generate-ssh-keys
-    summary: Generate SSH public and private key files if missing.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
-    description: ''
-    valueFrom: '`az aks get-versions`'
-  - name: --load-balancer-idle-timeout
-    summary: Load balancer idle timeout in minutes.
-    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120].
-  - name: --load-balancer-managed-outbound-ip-count
-    summary: Load balancer managed outbound IP count.
-    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
-  - name: --load-balancer-outbound-ip-prefixes
-    summary: Load balancer outbound IP prefix resource IDs.
-    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
-  - name: --load-balancer-outbound-ips
-    summary: Load balancer outbound IP resource IDs.
-    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
-  - name: --load-balancer-outbound-ports
-    summary: Load balancer outbound allocated ports.
-    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
-  - name: --load-balancer-sku
-    summary: Azure Load Balancer SKU selection for your cluster. basic or standard.
-    description: Select between Basic or Standard Azure Load Balancer SKU for your AKS cluster.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --max-pods -m
-    summary: The maximum number of pods deployable to a node.
-    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --network-plugin
-    parameterValueGroup: azure, kubenet
-    summary: The Kubernetes network plugin to use.
-    description: Specify "azure" for advanced networking configurations. Defaults to "kubenet".
-  - name: --network-policy
-    summary: (PREVIEW) The Kubernetes network policy to use.
-    description: >-
-      Using together with "azure" network plugin.
-
-      Specify "azure" for Azure network policy manager and "calico" for calico network policy controller.
-
-      Defaults to "" (network policy disabled).
-  - name: --no-ssh-key -x
-    summary: Do not use or create a local SSH key.
-    description: To access nodes after creating a cluster with this option, use the Azure Portal.
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-count -c
-    defaultValue: "3"
-    summary: Number of nodes in the Kubernetes node pool. It is required when --enable-cluster-autoscaler specified. After creating a cluster, you can change the size of its node pool with `az aks scale`.
-    description: ''
-  - name: --node-osdisk-diskencryptionset-id
-    summary: ResourceId of the disk encryption set to use for enabling encryption at rest.
-    description: ''
-  - name: --node-osdisk-size
-    summary: Size in GB of the OS disk for each node in the node pool. Minimum 30 GB.
-    description: ''
-  - name: --node-resource-group
-    summary: The node resource group is the resource group where all customer's resources will be created in, such as virtual machines.
-    description: ''
-  - name: --node-vm-size -s
-    defaultValue: Standard_DS2_v2
-    summary: Size of Virtual Machines to create as Kubernetes nodes.
-    description: ''
-  - name: --node-zones --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: (--node-zones will be deprecated, use --zones) Space-separated list of availability zones where agent nodes will be placed.
-    description: ''
-  - name: --nodepool-labels
-    summary: 'Space-separated labels: key[=value] [key[=value] ...]. You can not change the node labels through CLI after creation. See <a href="https://aka.ms/node-labels">https://aka.ms/node-labels</a> for syntax of labels.'
-    description: ''
-  - name: --nodepool-name
-    defaultValue: nodepool1
-    summary: Node pool name, upto 12 alphanumeric characters.
-    description: ''
-  - name: --nodepool-tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --outbound-type
-    parameterValueGroup: loadBalancer, userDefinedRouting
-    summary: How outbound traffic will be configured for a cluster.
-    description: Select between loadBalancer and userDefinedRouting. If not set, defaults to type loadBalancer. Requires --vnet-subnet-id to be provided with a preconfigured route table and --load-balancer-sku to be Standard.
-  - name: --pod-cidr
-    summary: A CIDR notation IP range from which to assign pod IPs when kubenet is used.
-    description: This range must not overlap with any Subnet IP ranges. For example, 172.244.0.0/16.
-  - name: --service-cidr
-    summary: A CIDR notation IP range from which to assign service cluster IPs.
-    description: This range must not overlap with any Subnet IP ranges. For example, 10.0.0.0/16.
-  - name: --service-principal
-    summary: Service principal used for authentication to Azure APIs.
-    description: If not specified, a new service principal is created and cached at $HOME.azureaksServicePrincipal.json to be used by subsequent `az aks` commands.
-  - name: --skip-subnet-role-assignment
-    summary: Skip role assignment for subnet (advanced networking).
-    description: If specified, please make sure your service principal has the access to your subnet.
-  - name: --ssh-key-value
-    defaultValue: ~\.ssh\id_rsa.pub
-    summary: Public key path or key contents to install on node VMs for SSH access. For example, 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --uptime-sla
-    summary: Enable a paid managed cluster service with a financially backed SLA.
-    description: ''
-  - name: --vm-set-type
-    summary: Agent pool vm set type. VirtualMachineScaleSets or AvailabilitySet.
-    description: ''
-  - name: --vnet-subnet-id
-    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
-    description: ''
-  - name: --windows-admin-password
-    summary: User account password to use on windows node VMs.
-    description: ''
-  - name: --windows-admin-username
-    summary: User account to create on windows node VMs.
-    description: ''
-  - name: --workspace-resource-id
-    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data. If not specified, uses the default Log Analytics Workspace if it exists, otherwise creates one.
-    description: ''
-- uid: ext_aks-preview_az_aks_disable_addons
-  name: az aks disable-addons
-  summary: Disable Kubernetes addons.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Disable Kubernetes addons. (autogenerated)
-    syntax:
-      content: az aks disable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --addons -a
-    summary: Disable the Kubernetes addons in a comma-separated list.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_aks-preview_az_aks_enable_addons
-  name: az aks enable-addons
-  summary: Enable Kubernetes addons.
-  description: >-
-    These addons are available:
-        http_application_routing  - configure ingress with automatic public DNS name creation.
-        monitoring                - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
-                                    If monitoring addon is enabled --no-wait argument will have no effect
-        virtual-node              - enable AKS Virtual Node (PREVIEW). Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
-        azure-policy              - enable Azure policy (PREVIEW).
-        ingress-appgw             - enable Application Gateway Ingress Controller addon (PREVIEW).
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable Kubernetes addons. (autogenerated)
-    syntax:
-      content: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet-name VirtualNodeSubnet
-  - summary: Enable ingress-appgw addon with subnet prefix.
-    syntax:
-      content: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-prefix 10.2.0.0/16 --appgw-name gateway
-  parameters:
-  - isRequired: true
-    name: --addons -a
-    summary: Enable the Kubernetes addons in a comma-separated list.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --appgw-id
-    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-name
-    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-id
-    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-prefix
-    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-watch-namespace
-    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces. Use with ingress-azure addon.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --subnet-name -s
-    summary: The subnet name for the virtual node to use.
-    description: ''
-  - name: --workspace-resource-id
-    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data.
-    description: ''
-- uid: ext_aks-preview_az_aks_get_credentials
-  name: az aks get-credentials
-  summary: Get access credentials for a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get access credentials for a managed Kubernetes cluster. (autogenerated)
-    syntax:
-      content: az aks get-credentials --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --admin -a
-    summary: 'Get cluster administrator credentials.  Default: cluster user credentials.'
-    description: ''
-  - name: --context
-    summary: If specified, overwrite the default context name.
-    description: ''
-  - name: --file -f
-    defaultValue: ~/.kube/config
-    summary: Kubernetes configuration file to update. Use "-" to print YAML to stdout instead.
-    description: ''
-  - name: --overwrite-existing
-    summary: Overwrite any existing cluster entry with the same name.
-    description: ''
-  - name: --user -u
-    defaultValue: clusterUser
-    summary: 'Get credentials for the user. Only valid when --admin is False.  Default: cluster user credentials.'
-    description: ''
-- uid: ext_aks-preview_az_aks_get_upgrades
-  name: az aks get-upgrades
-  summary: Get the upgrade versions available for a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the upgrade versions available for a managed Kubernetes cluster
-    syntax:
-      content: az aks get-upgrades --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_get_versions
-  name: az aks get-versions
-  summary: Get the versions available for creating a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the versions available for creating a managed Kubernetes cluster
-    syntax:
-      content: az aks get-versions --location westus2
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-- uid: ext_aks-preview_az_aks_kanalyze
-  name: az aks kanalyze
-  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_kollect
-  name: az aks kollect
-  summary: Collecting diagnostic information for the Kubernetes cluster.
-  description: >-
-    Collect diagnostic information for the Kubernetes cluster and store it in the specified storage account.
-
-    You can provide the storage account in three ways:
-      storage account name and a shared access signature with write permission.
-      resource Id to a storage account you own.
-      the storagea account in diagnostics settings for your managed cluster.
-  langs:
-  - azurecli
-  examples:
-  - summary: using storage account name and a shared access signature token with write permission
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account MyStorageAccount --sas-token "MySasToken"
-  - summary: using the resource id of a storagea account resource you own.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account "MyStoreageAccountResourceId"
-  - summary: using the storagea account in diagnostics settings for your managed cluster.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster
-  - summary: customize the container logs to collect.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --container-logs "mynamespace1/mypod1 myns2"
-  - summary: customize the kubernetes objects to collect.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --kube-objects "mynamespace1/service myns2/deployment/deployment1"
-  - summary: customize the node log files to collect.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --node-logs "/var/log/azure-vnet.log /var/log/azure-vnet-ipam.log"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --container-logs
-    summary: The list of container logs to collect.
-    description: >-
-      The list of container logs to collect. Its value can be either all containers
-
-      in a namespace, for example, kube-system, or a specific container in a
-
-      namespace, for example, kube-system/tunnelfront.
-  - name: --kube-objects
-    summary: The list of kubernetes objects to describe.
-    description: >-
-      The list of kubernetes objects to describe. Its value can be either all objects of a type
-
-      in a namespace, for example, kube-system/pod, or a specific object of a type in a namespace,
-
-      for example, kube-system/deployment/tunnelfront.
-  - name: --node-logs
-    summary: The list of node logs to collect. For example, /var/log/cloud-init.log.
-    description: ''
-  - name: --sas-token
-    summary: The SAS token with writable permission for the storage account.
-    description: ''
-  - name: --storage-account
-    summary: Name or ID of the storage account to save the diagnostic information.
-    description: ''
-- uid: ext_aks-preview_az_aks_rotate_certs
-  name: az aks rotate-certs
-  summary: Rotate certificates and keys on a managed Kubernetes cluster.
-  description: Kubernetes will be unavailable during cluster certificate rotation.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_aks-preview_az_aks_scale
-  name: az aks scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --node-count -c
-    summary: Number of nodes in the Kubernetes node pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --nodepool-name
-    summary: Node pool name, upto 12 alphanumeric characters.
-    description: ''
-- uid: ext_aks-preview_az_aks_show
-  name: az aks show
-  summary: Show the details for a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details for a managed Kubernetes cluster
-    syntax:
-      content: az aks show --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_update
-  name: az aks update
-  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable cluster-autoscaler within node count range [1,5]
-    syntax:
-      content: az aks update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n MyManagedCluster
-  - summary: Disable cluster-autoscaler for an existing cluster
-    syntax:
-      content: az aks update --disable-cluster-autoscaler -g MyResourceGroup -n MyManagedCluster
-  - summary: Update min-count or max-count for cluster autoscaler.
-    syntax:
-      content: az aks update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n MyManagedCluster
-  - summary: Enable pod security policy.
-    syntax:
-      content: az aks update --enable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
-  - summary: Disable pod security policy.
-    syntax:
-      content: az aks update --disable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
-  - summary: Update a kubernetes cluster with standard SKU load balancer to use two AKS created IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
-  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
-  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
-  - summary: Update a kubernetes cluster with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
-  - summary: Update a kubernetes cluster with authorized apiserver ip ranges.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24
-  - summary: Disable authorized apiserver ip ranges feature for a kubernetes cluster.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges ""
-  - summary: Restrict apiserver traffic in a kubernetes cluster to agentpool nodes.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 0.0.0.0/32
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --aad-admin-group-object-ids
-    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
-    description: ''
-  - name: --aad-tenant-id
-    summary: The ID of an Azure Active Directory tenant.
-    description: ''
-  - name: --aks-custom-headers
-    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
-    description: ''
-  - name: --api-server-authorized-ip-ranges
-    summary: Comma seperated list of authorized apiserver IP ranges. Set to "" to allow all traffic on a previously restricted cluster. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
-    description: ''
-  - name: --attach-acr
-    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
-    description: ''
-  - name: --cluster-autoscaler-profile
-    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
-    description: ''
-  - name: --detach-acr
-    summary: Disable the 'acrpull' role assignment to the ACR specified by name or resource ID.
-    description: ''
-  - name: --disable-cluster-autoscaler -d
-    summary: Disable cluster autoscaler.
-    description: ''
-  - name: --disable-pod-security-policy
-    summary: (PREVIEW) Disable pod security policy.
-    description: ''
-  - name: --enable-cluster-autoscaler -e
-    summary: Enable cluster autoscaler.
-    description: ''
-  - name: --enable-pod-security-policy
-    summary: (PREVIEW) Enable pod security policy.
-    description: ''
-  - name: --load-balancer-idle-timeout
-    summary: Load balancer idle timeout in minutes.
-    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120].
-  - name: --load-balancer-managed-outbound-ip-count
-    summary: Load balancer managed outbound IP count.
-    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
-  - name: --load-balancer-outbound-ip-prefixes
-    summary: Load balancer outbound IP prefix resource IDs.
-    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
-  - name: --load-balancer-outbound-ips
-    summary: Load balancer outbound IP resource IDs.
-    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
-  - name: --load-balancer-outbound-ports
-    summary: Load balancer outbound allocated ports.
-    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --update-cluster-autoscaler -u
-    summary: Update min-count or max-count for cluster autoscaler.
-    description: ''
-- uid: ext_aks-preview_az_aks_upgrade
-  name: az aks upgrade
-  summary: Upgrade a managed Kubernetes cluster to a newer version.
-  description: Kubernetes will be unavailable during cluster upgrades.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --control-plane-only
-    summary: Upgrade the cluster control plane only. If not specified, control plane AND all node pools will be upgraded.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to upgrade the cluster to, such as "1.11.12".
-    description: ''
-    valueFrom: '`az aks get-upgrades`'
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-image-only
-    summary: Only upgrade node image for agent pools.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_aks-preview_az_aks_wait
-  name: az aks wait
-  summary: Wait for a managed Kubernetes cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  examples:
-  - summary: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes.
-    syntax:
-      content: az aks wait -g MyResourceGroup -n MyManagedCluster --updated --interval 60 --timeout 1800
-  - summary: Wait for a managed Kubernetes cluster to reach a desired state (autogenerated)
-    syntax:
-      content: az aks wait --created --interval 60 --name MyManagedCluster --resource-group MyResourceGroup --timeout 1800
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_aks-preview_az_aks_browse
-  name: az aks browse
-  summary: Show the dashboard for a Kubernetes cluster in a web browser.
-- uid: ext_aks-preview_az_aks_create
-  name: az aks create
-  summary: Create a new managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_disable_addons
-  name: az aks disable-addons
-  summary: Disable Kubernetes addons.
-- uid: ext_aks-preview_az_aks_enable_addons
-  name: az aks enable-addons
-  summary: Enable Kubernetes addons.
-- uid: ext_aks-preview_az_aks_get_credentials
-  name: az aks get-credentials
-  summary: Get access credentials for a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_get_upgrades
-  name: az aks get-upgrades
-  summary: Get the upgrade versions available for a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_get_versions
-  name: az aks get-versions
-  summary: Get the versions available for creating a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_kanalyze
-  name: az aks kanalyze
-  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
-- uid: ext_aks-preview_az_aks_kollect
-  name: az aks kollect
-  summary: Collecting diagnostic information for the Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool
-  name: az aks nodepool
-  summary: Commands to manage node pools in Kubernetes kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_add
-  name: az aks nodepool add
-  summary: Add a node pool to the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_delete
-  name: az aks nodepool delete
-  summary: Delete the agent pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_list
-  name: az aks nodepool list
-  summary: List node pools in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_scale
-  name: az aks nodepool scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_show
-  name: az aks nodepool show
-  summary: Show the details for a node pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_update
-  name: az aks nodepool update
-  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
-- uid: ext_aks-preview_az_aks_nodepool_upgrade
-  name: az aks nodepool upgrade
-  summary: Upgrade the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_rotate_certs
-  name: az aks rotate-certs
-  summary: Rotate certificates and keys on a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_scale
-  name: az aks scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_show
-  name: az aks show
-  summary: Show the details for a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_update
-  name: az aks update
-  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
-- uid: ext_aks-preview_az_aks_upgrade
-  name: az aks upgrade
-  summary: Upgrade a managed Kubernetes cluster to a newer version.
-- uid: ext_aks-preview_az_aks_wait
-  name: az aks wait
-  summary: Wait for a managed Kubernetes cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kubernetes Services.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml b/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml
deleted file mode 100644
index 657320820c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml
+++ /dev/null
@@ -1,323 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aks-preview_az_aks_nodepool
-  name: az aks nodepool
-  summary: Commands to manage node pools in Kubernetes kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_aks-preview_az_aks_nodepool_add
-  - ext_aks-preview_az_aks_nodepool_delete
-  - ext_aks-preview_az_aks_nodepool_list
-  - ext_aks-preview_az_aks_nodepool_scale
-  - ext_aks-preview_az_aks_nodepool_show
-  - ext_aks-preview_az_aks_nodepool_update
-  - ext_aks-preview_az_aks_nodepool_upgrade
-- uid: ext_aks-preview_az_aks_nodepool_add
-  name: az aks nodepool add
-  summary: Add a node pool to the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --aks-custom-headers
-    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
-    description: ''
-  - name: --enable-cluster-autoscaler -e
-    summary: Enable cluster autoscaler.
-    description: ''
-  - name: --enable-node-public-ip
-    summary: Enable VMSS node public IP.
-    description: ''
-  - name: --eviction-policy
-    defaultValue: Delete
-    parameterValueGroup: Deallocate, Delete
-    summary: The eviction policy of the Spot node pool. It can only be set when --priority is Spot.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
-    description: ''
-    valueFrom: '`az aks get-versions`'
-  - name: --labels
-    summary: The node labels for the node pool. You can't change the node labels through CLI after the node pool is created. See <a href="https://aka.ms/node-labels">https://aka.ms/node-labels</a> for syntax of labels.
-    description: ''
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --max-pods -m
-    summary: The maximum number of pods deployable to a node.
-    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
-  - name: --max-surge
-    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
-    description: ''
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --mode
-    defaultValue: User
-    parameterValueGroup: System, User
-    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at <a href="https://aka.ms/aks/nodepool/mode">https://aka.ms/aks/nodepool/mode</a>.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-count -c
-    defaultValue: "3"
-    summary: Number of nodes in the Kubernetes agent pool. After creating a cluster, you can change the size of its node pool with `az aks scale`.
-    description: ''
-  - name: --node-osdisk-size
-    summary: Size in GB of the OS disk for each node in the agent pool. Minimum 30 GB.
-    description: ''
-  - name: --node-taints
-    summary: The node taints for the node pool. You can't change the node taints through CLI after the node pool is created.
-    description: ''
-  - name: --node-vm-size -s
-    summary: Size of Virtual Machines to create as Kubernetes nodes.
-    description: ''
-  - name: --node-zones --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: (will be deprecated, use --zones) Availability zones where agent nodes will be placed.
-    description: ''
-  - name: --os-type
-    defaultValue: Linux
-    summary: The OS Type. Linux or Windows.
-    description: ''
-  - name: --priority
-    defaultValue: Regular
-    parameterValueGroup: Regular, Spot
-    summary: The priority of the node pool.
-    description: ''
-  - name: --spot-max-price
-    defaultValue: nan
-    summary: It can only be set when --priority is Spot. Specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. It can only include up to 5 decimal places.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vnet-subnet-id
-    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_delete
-  name: az aks nodepool delete
-  summary: Delete the agent pool in the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_list
-  name: az aks nodepool list
-  summary: List node pools in the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_scale
-  name: az aks nodepool scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-count -c
-    defaultValue: "3"
-    summary: Number of nodes in the Kubernetes node pool.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_show
-  name: az aks nodepool show
-  summary: Show the details for a node pool in the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_update
-  name: az aks nodepool update
-  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable cluster-autoscaler within node count range [1,5]
-    syntax:
-      content: az aks nodepool update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  - summary: Disable cluster-autoscaler for an existing cluster
-    syntax:
-      content: az aks nodepool update --disable-cluster-autoscaler -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  - summary: Update min-count or max-count for cluster autoscaler.
-    syntax:
-      content: az aks nodepool update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  - summary: Change a node pool to system mode
-    syntax:
-      content: az aks nodepool update --mode System -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disable-cluster-autoscaler -d
-    summary: Disable cluster autoscaler.
-    description: ''
-  - name: --enable-cluster-autoscaler -e
-    summary: Enable cluster autoscaler.
-    description: ''
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --max-surge
-    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
-    description: ''
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --mode
-    parameterValueGroup: System, User
-    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at <a href="https://aka.ms/aks/nodepool/mode">https://aka.ms/aks/nodepool/mode</a>.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --update-cluster-autoscaler -u
-    summary: Update min-count or max-count for cluster autoscaler.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_upgrade
-  name: az aks nodepool upgrade
-  summary: Upgrade the node pool in a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to upgrade the node pool to, such as "1.11.12".
-    description: ''
-  - name: --max-surge
-    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-image-only
-    summary: Only upgrade agent pool's node image.
-    description: ''
-commands:
-- uid: ext_aks-preview_az_aks_nodepool_add
-  name: az aks nodepool add
-  summary: Add a node pool to the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_delete
-  name: az aks nodepool delete
-  summary: Delete the agent pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_list
-  name: az aks nodepool list
-  summary: List node pools in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_scale
-  name: az aks nodepool scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_show
-  name: az aks nodepool show
-  summary: Show the details for a node pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_update
-  name: az aks nodepool update
-  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
-- uid: ext_aks-preview_az_aks_nodepool_upgrade
-  name: az aks nodepool upgrade
-  summary: Upgrade the node pool in a managed Kubernetes cluster.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage node pools in Kubernetes kubernetes cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/index.yml
deleted file mode 100644
index 31d67a32fc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/aks-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aks-preview_az
-  name: aks-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_aks-preview_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/index.yml
deleted file mode 100644
index a75e7862e3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alertsmanagement_az
-  name: alertsmanagement
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_alertsmanagement_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor.yml b/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor.yml
deleted file mode 100644
index 86efe72de3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alertsmanagement_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_alertsmanagement_az_monitor_action_rule
-  name: az monitor action-rule
-  summary: Commands to manage action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_create
-  name: az monitor action-rule create
-  summary: Create an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_delete
-  name: az monitor action-rule delete
-  summary: Delete an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_list
-  name: az monitor action-rule list
-  summary: List all action rules of the subscription, created in given resource group and given input filters.
-- uid: ext_alertsmanagement_az_monitor_action_rule_show
-  name: az monitor action-rule show
-  summary: Get an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_update
-  name: az monitor action-rule update
-  summary: Update an action rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml
deleted file mode 100644
index 0cc410df36..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alertsmanagement_az_monitor_action_rule
-  name: az monitor action-rule
-  summary: Commands to manage action rule.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_alertsmanagement_az_monitor_action_rule_create
-  - ext_alertsmanagement_az_monitor_action_rule_delete
-  - ext_alertsmanagement_az_monitor_action_rule_list
-  - ext_alertsmanagement_az_monitor_action_rule_show
-  - ext_alertsmanagement_az_monitor_action_rule_update
-- uid: ext_alertsmanagement_az_monitor_action_rule_create
-  name: az monitor action-rule create
-  summary: Create an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an action rule to suppress notifications for all Sev4 alerts on all VMs within the subscription every weekend
-    syntax:
-      content: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --severity Equals Sev4 --target-resource-type Equals Microsoft.Compute/VirtualMachines --suppression-recurrence-type Weekly --suppression-recurrence 0 6 --suppression-start-date 12/09/2018 --suppression-end-date 12/18/2018 --suppression-start-time 06:00:00 --suppression-end-time 14:00:00
-  - summary: Create an action rule to suppress notifications for all log alerts generated for Computer-01 in subscription indefinitely as it's going through maintenance
-    syntax:
-      content: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
-  - summary: Create an action rule to suppress notifications in a resource group
-    syntax:
-      content: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --scope-type ResourceGroup --scope /subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/rg --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-type
-    parameterValueGroup: ActionGroup, Diagnostics, Suppression
-    summary: Indicate type of action rule.
-    description: ''
-  - name: --alert-context
-    summary: Filter alerts by alert context (payload).
-    description: ''
-  - name: --alert-description
-    summary: Filter alerts by alert rule description.
-    description: ''
-  - name: --alert-rule
-    summary: Filter alerts by alert rule name or ID.
-    description: ''
-  - name: --description
-    summary: Description of action rule.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --monitor-condition
-    summary: Filter alerts by monitor condition.
-    description: ''
-  - name: --monitor-service
-    summary: Filter alerts by monitor service.
-    description: ''
-  - name: --scope
-    summary: List of ARM IDs (space-delimited) of the given scope type which will be the target of the given action rule.
-    description: ''
-  - name: --scope-type
-    parameterValueGroup: Resource, ResourceGroup
-    summary: Type of target scope.
-    description: ''
-  - name: --severity
-    summary: Filter alerts by severity. All filters should follow format "operator value1 value2 ... valueN". Operator is one of Equals, NotEquals, Contains and DoesNotContain.
-    description: ''
-  - name: --status
-    parameterValueGroup: Disabled, Enabled
-    summary: Indicate if the given action rule is enabled or disabled. Default to enabled.
-    description: ''
-  - name: --suppression-end-date
-    summary: 'End date for suppression. Format: MM/DD/YYYY.'
-    description: ''
-  - name: --suppression-end-time
-    summary: 'End time for suppression. Format: hh:mm:ss.'
-    description: ''
-  - name: --suppression-recurrence
-    summary: List of recurrence pattern values, delimited by space. If --suppression-recurrence-type is Weekly, allowed values range from 0 to 6. 0 stands for Sunday, 1 stands for Monday, ..., 6 stands for Saturday. If --suppression-recurrence-type is Monthly, allowed values range from 1 to 31, stands for day of month.
-    description: ''
-  - name: --suppression-recurrence-type
-    parameterValueGroup: Always, Daily, Monthly, Once, Weekly
-    summary: Specifies when the suppression should be applied.
-    description: ''
-  - name: --suppression-start-date
-    summary: 'Start date for suppression. Format: MM/DD/YYYY.'
-    description: ''
-  - name: --suppression-start-time
-    summary: 'Start time for suppression. Format: hh:mm:ss.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --target-resource-type
-    summary: Filter alerts by target resource type.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_delete
-  name: az monitor action-rule delete
-  summary: Delete an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an action rule
-    syntax:
-      content: az monitor action-rule delete --resource-group rg --name rule
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_list
-  name: az monitor action-rule list
-  summary: List all action rules of the subscription, created in given resource group and given input filters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List action rules of the subscription
-    syntax:
-      content: az monitor action-rule list
-  - summary: List action rules of the resource group
-    syntax:
-      content: az monitor action-rule list --resource-group rg
-  parameters:
-  - name: --action-group
-    summary: Filter by action group configured as part of action rule.
-    description: ''
-  - name: --alert-rule-id
-    summary: Filter by alert rule ID.
-    description: ''
-  - name: --description
-    summary: Filter by alert rule description.
-    description: ''
-  - name: --impacted-scope
-    summary: Filter by impacted/target scope (provide comma separated list for multiple scopes). The value should be an well constructed ARM id of the scope.
-    description: ''
-  - name: --monitor-service
-    summary: Filter by monitor service which generates the alert instance. Default value is select all.
-    description: ''
-  - name: --name
-    summary: Filter by action rule name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --severity
-    summary: Filter by severity. Default value is select all.
-    description: ''
-  - name: --target-resource
-    summary: Filter by target resource (which is full ARM ID). Default value is select all.
-    description: ''
-  - name: --target-resource-group
-    summary: Filter by target resource group name. Default value is select all.
-    description: ''
-  - name: --target-resource-type
-    summary: Filter by target resource type. Default value is select all.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_show
-  name: az monitor action-rule show
-  summary: Get an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an action rule
-    syntax:
-      content: az monitor action-rule show --resource-group rg --name rule
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_update
-  name: az monitor action-rule update
-  summary: Update an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an action rule
-    syntax:
-      content: az monitor action-rule update --resource-group rg --name rule --status Disabled
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --status
-    parameterValueGroup: Disabled, Enabled
-    summary: Indicates if the given action rule is enabled or disabled.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_alertsmanagement_az_monitor_action_rule_create
-  name: az monitor action-rule create
-  summary: Create an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_delete
-  name: az monitor action-rule delete
-  summary: Delete an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_list
-  name: az monitor action-rule list
-  summary: List all action rules of the subscription, created in given resource group and given input filters.
-- uid: ext_alertsmanagement_az_monitor_action_rule_show
-  name: az monitor action-rule show
-  summary: Get an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_update
-  name: az monitor action-rule update
-  summary: Update an action rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage action rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/alias/alias.yml b/2017-03-09-profile/docs-ref-autogen/ext/alias/alias.yml
deleted file mode 100644
index 429a69cc42..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/alias/alias.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alias_az_alias
-  name: az alias
-  summary: Manage Azure CLI Aliases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_alias_az_alias_create
-  - ext_alias_az_alias_export
-  - ext_alias_az_alias_import
-  - ext_alias_az_alias_list
-  - ext_alias_az_alias_remove
-  - ext_alias_az_alias_remove_all
-- uid: ext_alias_az_alias_create
-  name: az alias create
-  summary: Create an alias.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create simple alias commands.
-    syntax:
-      content: >-
-        az alias create --name rg --command group
-
-
-        az alias create --name ls --command list
-  - summary: Create a complex alias.
-    syntax:
-      content: az alias create --name list-vm --command 'vm list --resource-group myResourceGroup'
-  - summary: Create an alias command with arguments.
-    syntax:
-      content: >-
-        az alias create --name 'list-vm {{ resource_group }}' \
-          --command 'vm list --resource-group {{ resource_group }}'
-  - summary: Process arguments using Jinja2 templates.
-    syntax:
-      content: >-
-        az alias create --name 'storage-ls {{ url }}' \
-          --command 'storage blob list
-            --account-name {{ url.replace("https://", "").split(".")[0] }}
-            --container-name {{ url.replace("https://", "").split("/")[1] }}'
-  parameters:
-  - isRequired: true
-    name: --command -c
-    summary: The command that the alias points to.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the alias.
-    description: ''
-- uid: ext_alias_az_alias_export
-  name: az alias export
-  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --exclude -e
-    summary: Space-separated aliases excluded from export.
-    description: ''
-  - name: --path -p
-    summary: The path of the alias configuration file to export to.
-    description: ''
-- uid: ext_alias_az_alias_import
-  name: az alias import
-  summary: Import aliases from an INI configuration file or an URL.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --source -s
-    summary: The source of the aliases to import from.
-    description: ''
-- uid: ext_alias_az_alias_list
-  name: az alias list
-  summary: List the registered aliases.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_alias_az_alias_remove
-  name: az alias remove
-  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Space-separated aliases.
-    description: ''
-- uid: ext_alias_az_alias_remove_all
-  name: az alias remove-all
-  summary: Remove all registered aliases.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-commands:
-- uid: ext_alias_az_alias_create
-  name: az alias create
-  summary: Create an alias.
-- uid: ext_alias_az_alias_export
-  name: az alias export
-  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
-- uid: ext_alias_az_alias_import
-  name: az alias import
-  summary: Import aliases from an INI configuration file or an URL.
-- uid: ext_alias_az_alias_list
-  name: az alias list
-  summary: List the registered aliases.
-- uid: ext_alias_az_alias_remove
-  name: az alias remove
-  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
-- uid: ext_alias_az_alias_remove_all
-  name: az alias remove-all
-  summary: Remove all registered aliases.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure CLI Aliases.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/alias/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/alias/index.yml
deleted file mode 100644
index 4eb84bc5c5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/alias/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alias_az
-  name: alias
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_alias_az_alias
-  name: az alias
-  summary: Manage Azure CLI Aliases.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/index.yml
deleted file mode 100644
index f7caf24d0b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az
-  name: application-insights
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_application-insights_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor.yml
deleted file mode 100644
index e5d5b38848..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_application-insights_az_monitor_app_insights
-  name: az monitor app-insights
-  summary: Commands for querying data in Application Insights applications.
-- uid: ext_application-insights_az_monitor_app_insights_api_key
-  name: az monitor app-insights api-key
-  summary: Operations on API keys associated with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component
-  name: az monitor app-insights component
-  summary: Manage an Application Insights component or its subcomponents.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_events
-  name: az monitor app-insights events
-  summary: Retrieve events from an application.
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-- uid: ext_application-insights_az_monitor_app_insights_metrics
-  name: az monitor app-insights metrics
-  summary: Retrieve metrics from an application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-- uid: ext_application-insights_az_monitor_app_insights_query
-  name: az monitor app-insights query
-  summary: Execute a query over data in your application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml
deleted file mode 100644
index 4f294213ce..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights
-  name: az monitor app-insights
-  summary: Commands for querying data in Application Insights applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_query
-- uid: ext_application-insights_az_monitor_app_insights_query
-  name: az monitor app-insights query
-  summary: Execute a query over data in your application.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a simple query over past 1 hour and 30 minutes.
-    syntax:
-      content: az monitor app-insights query --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --analytics-query 'requests | summarize count() by bin(timestamp, 1h)' --offset 1h30m
-  parameters:
-  - isRequired: true
-    name: --analytics-query
-    summary: Query to execute over Application Insights data.
-    description: ''
-  - isRequired: true
-    name: --apps -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - name: --end-time
-    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --offset
-    defaultValue: 1h
-    summary: 'Time offset of the query range, in ##d##h format.'
-    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start-time
-    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_api_key
-  name: az monitor app-insights api-key
-  summary: Operations on API keys associated with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component
-  name: az monitor app-insights component
-  summary: Manage an Application Insights component or its subcomponents.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_events
-  name: az monitor app-insights events
-  summary: Retrieve events from an application.
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-- uid: ext_application-insights_az_monitor_app_insights_metrics
-  name: az monitor app-insights metrics
-  summary: Retrieve metrics from an application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-- uid: ext_application-insights_az_monitor_app_insights_query
-  name: az monitor app-insights query
-  summary: Execute a query over data in your application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for querying data in Application Insights applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml
deleted file mode 100644
index e0def6ed7d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_api_key
-  name: az monitor app-insights api-key
-  summary: Operations on API keys associated with an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_api_key_create
-  - ext_application-insights_az_monitor_app_insights_api_key_delete
-  - ext_application-insights_az_monitor_app_insights_api_key_show
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a component with kind web and location.
-    syntax:
-      content: az monitor app-insights api-key create --api-key cli-demo --read-properties ReadTelemetry -g demoRg --app testApp
-  parameters:
-  - isRequired: true
-    name: --api-key
-    summary: Name of the API key to create.
-    description: ''
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --read-properties
-    summary: A space seperated list of names of read Roles for this API key to inherit.
-    description: ''
-  - name: --write-properties
-    summary: A space seperated list of names of write Roles for this API key to inherit.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete API Key.
-    syntax:
-      content: az monitor app-insights api-key delete --app demoApp -g demoRg --api-key demo-key
-  parameters:
-  - isRequired: true
-    name: --api-key
-    summary: Name of the API key to delete. Can be found using `api-keys show`.
-    description: ''
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Fetch API Key.
-    syntax:
-      content: az monitor app-insights api-key show --app demoApp -g demoRg --api-key demo-key
-  - summary: Fetch API Keys.
-    syntax:
-      content: az monitor app-insights api-key show --app demoApp -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --api-key
-    summary: Name of the API key to fetch. Can be found using `api-keys show`.
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Operations on API keys associated with an Application Insights component.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml
deleted file mode 100644
index 21d7b819e5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_component
-  name: az monitor app-insights component
-  summary: Manage an Application Insights component or its subcomponents.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_component_create
-  - ext_application-insights_az_monitor_app_insights_component_delete
-  - ext_application-insights_az_monitor_app_insights_component_show
-  - ext_application-insights_az_monitor_app_insights_component_update
-  - ext_application-insights_az_monitor_app_insights_component_update_tags
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a component with kind web and location.
-    syntax:
-      content: az monitor app-insights component create --app demoApp --location westus2 --kind web -g demoRg --application-type web
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --application-type
-    defaultValue: web
-    summary: Type of application being monitored.
-    description: ''
-  - name: --ingestion-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights ingestion.
-    description: ''
-  - name: --kind -k
-    defaultValue: web
-    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
-    description: ''
-  - name: --query-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights query.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --workspace
-    summary: Name or resource ID of a log analytics workspace.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a component with kind web and location.
-    syntax:
-      content: az monitor app-insights component delete --app demoApp -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a component by name.
-    syntax:
-      content: az monitor app-insights component show --app demoApp -g demoRg
-  - summary: List components in a resource group.
-    syntax:
-      content: az monitor app-insights component show -g demoRg
-  - summary: List components in the currently selected subscription.
-    syntax:
-      content: az monitor app-insights component show
-  parameters:
-  - name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a component with kind web.
-    syntax:
-      content: az monitor app-insights component update --app demoApp -k web -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --ingestion-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights ingestion.
-    description: ''
-  - name: --kind -k
-    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
-    description: ''
-  - name: --query-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights query.
-    description: ''
-  - name: --workspace
-    summary: Name or resource ID of a log analytics workspace.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tag 'name' to equal 'value'.
-    syntax:
-      content: az monitor app-insights component update-tags --app demoApp --tags name=value -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage an Application Insights component or its subcomponents.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml
deleted file mode 100644
index bed5cb0d38..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_component_billing_show
-  - ext_application-insights_az_monitor_app_insights_component_billing_update
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the billing features of an application insights component
-    syntax:
-      content: az monitor app-insights component billing show --app demoApp -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the daily cap of the billing features
-    syntax:
-      content: az monitor app-insights component billing update --app demoApp -g demoRg --cap 200 --stop
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cap
-    summary: Daily data volume cap in GB.
-    description: ''
-  - name: --stop -s
-    parameterValueGroup: false, true
-    summary: Do not send a notification email when the daily data volume cap is met.
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage an Application Insights component billing features.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml
deleted file mode 100644
index fba2777c8b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-account -s
-    summary: Name or ID of a linked storage account.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-account -s
-    summary: Name or ID of a linked storage account.
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage linked storage account for an Application Insights component.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml
deleted file mode 100644
index 0734a005a2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_events
-  name: az monitor app-insights events
-  summary: Retrieve events from an application.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_events_show
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an availability result by ID.
-    syntax:
-      content: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --event b2cf08df-bf42-4278-8d2c-5b55f85901fe
-  - summary: List availability results from the last 24 hours.
-    syntax:
-      content: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --offset 24h
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: The type of events to retrieve.
-    description: ''
-  - name: --end-time
-    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --event
-    summary: GUID of the event to retrieve. This could be obtained by first listing and filtering events, then selecting an event of interest.
-    description: ''
-  - name: --offset
-    defaultValue: 1h
-    summary: 'Time offset of the query range, in ##d##h format.'
-    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start-time
-    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Retrieve events from an application.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml b/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml
deleted file mode 100644
index 2faf471261..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_metrics
-  name: az monitor app-insights metrics
-  summary: Retrieve metrics from an application.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  - ext_application-insights_az_monitor_app_insights_metrics_show
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Views the metadata for the provided app.
-    syntax:
-      content: az monitor app-insights metrics get-metadata --app e292531c-eb03-4079-9bb0-fe6b56b99f8b
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: View the count of availabilityResults events.
-    syntax:
-      content: az monitor app-insights metrics show --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --metric availabilityResults/count
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --metrics -m
-    summary: The metric to retrieve. May be either a standard AI metric or an application-specific custom metric.
-    description: ''
-  - name: --aggregation
-    summary: The aggregation to use when computing the metric values. To retrieve more than one aggregation at a time, separate them with a comma. If no aggregation is specified, then the default aggregation for the metric is used.
-    description: ''
-  - name: --end-time
-    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --filter
-    summary: An expression used to filter the results.  This value should be a valid OData filter expression where the keys of each clause should be applicable dimensions for the metric you are retrieving.
-    description: ''
-  - name: --offset
-    defaultValue: 1h
-    summary: 'Time offset of the query range, in ##d##h format.'
-    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
-  - name: --orderby
-    summary: The aggregation function and direction to sort the segments by.  This value is only valid when segment is specified.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --segment
-    summary: The name of the dimension to segment the metric values by. This dimension must be applicable to the metric you are retrieving. To segment by more than one dimension at a time, separate them with a comma (,). In this case, the metric data will be segmented in the order the dimensions are listed in the parameter.
-    description: ''
-  - name: --start-time
-    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --top
-    summary: The number of segments to return.  This value is only valid when segment is specified.
-    description: ''
-  - name: --interval
-    summary: 'The interval over which to aggregate metrics, in ##h##m format.'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Retrieve metrics from an application.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml
deleted file mode 100644
index 4562566183..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch
-  name: az batch
-  summary: Manage Azure Batch.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_file
-  name: az batch file
-  summary: Manage Batch input files.
-- uid: ext_azure-batch-cli-extensions_az_batch_file_download
-  name: az batch file download
-  summary: Download a specified file or directory of files to the specified storage path.
-- uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-  name: az batch file upload
-  summary: Upload a specified file or directory of files to the specified storage path.
-- uid: ext_azure-batch-cli-extensions_az_batch_job
-  name: az batch job
-  summary: Manage Batch jobs.
-- uid: ext_azure-batch-cli-extensions_az_batch_job_create
-  name: az batch job create
-  summary: Add a job and associated task(s) to a Batch account.
-- uid: ext_azure-batch-cli-extensions_az_batch_pool
-  name: az batch pool
-  summary: Manage Batch pools.
-- uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-  name: az batch pool create
-  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Batch.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml
deleted file mode 100644
index a7739a11b3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch_file
-  name: az batch file
-  summary: Manage Batch input files.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-batch-cli-extensions_az_batch_file_download
-  - ext_azure-batch-cli-extensions_az_batch_file_upload
-- uid: ext_azure-batch-cli-extensions_az_batch_file_download
-  name: az batch file download
-  summary: Download a specified file or directory of files to the specified storage path.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-group
-    summary: Name of a file group from which the files will be downloaded.
-    description: ''
-  - isRequired: true
-    name: --local-path
-    summary: Path to a local file or directory to be stored the download files.
-    description: ''
-  - name: --overwrite
-    summary: If set, an existing file in the local path will be overwritten.
-    description: ''
-  - name: --remote-path
-    summary: The subdirectory under which files exist remotely.
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-- uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-  name: az batch file upload
-  summary: Upload a specified file or directory of files to the specified storage path.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-group
-    summary: Name of a file group under which the files will be stored.
-    description: ''
-  - isRequired: true
-    name: --local-path
-    summary: Path to a local file or directory to be uploaded - can include wildcard patterns.
-    description: ''
-  - name: --flatten
-    summary: If set, will not retain local directory structure in storage.
-    description: ''
-  - name: --remote-path
-    summary: Group subdirectory under which files will be uploaded.
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_file_download
-  name: az batch file download
-  summary: Download a specified file or directory of files to the specified storage path.
-- uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-  name: az batch file upload
-  summary: Upload a specified file or directory of files to the specified storage path.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Batch input files.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml
deleted file mode 100644
index 396dee3936..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch_job
-  name: az batch job
-  summary: Manage Batch jobs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-batch-cli-extensions_az_batch_job_create
-- uid: ext_azure-batch-cli-extensions_az_batch_job_create
-  name: az batch job create
-  summary: Add a job and associated task(s) to a Batch account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Required. A string that uniquely identifies the Job within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).
-    description: ''
-  - name: --json-file
-    summary: The file containing the job to create in JSON format, if this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --metadata
-    summary: A list of name-value pairs associated with the job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code. Space separated values in 'key=value' format.
-    description: ''
-  - name: --priority
-    summary: The priority of the Job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. The default value is 0.
-    description: ''
-  - name: --uses-task-dependencies
-    summary: The flag that determines if this job will use tasks with dependencies. True if flag present.
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-  - name: --parameters
-    summary: Parameter values for a Batch job JSON template file. Can only be used with --template.
-    description: ''
-  - name: --template
-    summary: A Batch job JSON template file. If this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --job-max-task-retry-count
-    summary: The maximum number of times each task may be retried. The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try each task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries a task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry tasks. If the maximum retry count is -1, the Batch service retries tasks without limit. The default value is 0 (no retries).
-    description: ''
-  - name: --job-max-wall-clock-time
-    summary: The maximum elapsed time that the job may run, measured from the time the job is created. If the job does not complete within the time limit, the Batch service terminates it and any tasks that are still running. In this case, the termination reason will be MaxWallClockTimeExpiry. If this property is not specified, there is no time limit on how long the job may run. Expected format is an ISO-8601 duration.
-    description: ''
-  - name: --job-manager-task-command-line
-    summary: The command line of the Job Manager task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
-    description: ''
-  - name: --job-manager-task-environment-settings
-    summary: A list of environment variable settings for the Job Manager task. Space separated values in 'key=value' format.
-    description: ''
-  - name: --job-manager-task-id
-    summary: A string that uniquely identifies the Job Manager task within the job. The id can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than 64 characters.
-    description: ''
-  - name: --job-manager-task-resource-files
-    summary: A list of files that the Batch service will download to the compute node before running the command line. Files listed under this element are located in the task's working directory. Space separated resource references in filename=httpurl format.
-    description: ''
-  - name: --pool-id
-    summary: The id of an existing pool. All the tasks of the job will run on the specified pool.
-    description: ''
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_job_create
-  name: az batch job create
-  summary: Add a job and associated task(s) to a Batch account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Batch jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml
deleted file mode 100644
index 2f3ddf48ad..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch_pool
-  name: az batch pool
-  summary: Manage Batch pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-batch-cli-extensions_az_batch_pool_create
-- uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-  name: az batch pool create
-  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --application-licenses
-    summary: The list of application licenses the Batch service will make available on each Compute Node in the Pool. The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, Pool creation will fail.
-    description: ''
-  - name: --application-package-references
-    summary: The list of Packages to be installed on each Compute Node in the Pool. Changes to Package references affect all new Nodes joining the Pool, but do not affect Compute Nodes that are already in the Pool until they are rebooted or reimaged. There is a maximum of 10 Package references on any given Pool.
-    description: ''
-  - name: --auto-scale-formula
-    summary: A formula for the desired number of Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to false. It is required if enableAutoScale is set to true. The formula is checked for validity before the Pool is created. If the formula is not valid, the Batch service rejects the request with detailed error information. For more information about specifying this formula, see 'Automatically scale Compute Nodes in an Azure Batch Pool' (<a href="https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/">https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/</a>).
-    description: ''
-  - name: --certificate-references
-    summary: The list of Certificates to be installed on each Compute Node in the Pool. For Windows Nodes, the Batch service installs the Certificates to the specified Certificate store and location. For Linux Compute Nodes, the Certificates are stored in a directory inside the Task working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the Task to query for this location. For Certificates with visibility of 'remoteUser', a 'certs' directory is created in the user's home directory (e.g., /home/{user-name}/certs) and Certificates are placed in that directory.
-    description: ''
-  - name: --enable-inter-node-communication
-    summary: Whether the Pool permits direct communication between Compute Nodes. Enabling inter-node communication limits the maximum size of the Pool due to deployment restrictions on the Compute Nodes of the Pool. This may result in the Pool not reaching its desired size. The default value is false.
-    description: ''
-  - name: --id
-    summary: Required. A string that uniquely identifies the Pool within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two Pool IDs within an Account that differ only by case).
-    description: ''
-  - name: --json-file
-    summary: The file containing the pool to create in JSON format, if this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --metadata
-    summary: A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.
-    description: ''
-  - name: --resize-timeout
-    summary: The timeout for allocation of Compute Nodes to the Pool. This timeout applies only to manual scaling; it has no effect when enableAutoScale is set to true. The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).
-    description: ''
-  - name: --target-dedicated-nodes
-    summary: The desired number of dedicated Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
-    description: ''
-  - name: --target-low-priority-nodes
-    summary: The desired number of low-priority Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
-    description: ''
-  - name: --vm-size
-    summary: Required. The size of virtual machines in the Pool. All virtual machines in a Pool are the same size. For information about available sizes of virtual machines for Cloud Services Pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (<a href="https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/">https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/</a>). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for Pools using Images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (<a href="https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/">https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/</a>) or Sizes for Virtual Machines (Windows) (<a href="https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/">https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/</a>). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-  - name: --parameters
-    summary: Parameter values for a Batch pool JSON template file. Can only be used with --template.
-    description: ''
-  - name: --template
-    summary: A Batch pool JSON template file. If this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --os-family
-    summary: 'The Azure Guest OS family to be installed on the virtual machines in the pool. Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. For more information, see Azure Guest OS Releases (<a href="https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases">https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases</a>). Allowed values: 2, 3, 4, 5.'
-    description: ''
-  - name: --start-task-command-line
-    summary: The command line of the start task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
-    description: ''
-  - name: --start-task-resource-files
-    summary: A list of files that the Batch service will download to the compute node before running the command line. Space separated resource references in filename=httpurl format.
-    description: ''
-  - name: --start-task-wait-for-success
-    summary: Whether the Batch service should wait for the start task to complete successfully (that is, to exit with exit code 0) before scheduling any tasks on the compute node. If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is false. True if flag present.
-    description: ''
-  - name: --image
-    summary: "OS image reference. This can be either 'publisher:offer:sku[:version]' format, or a fully qualified ARM image id of the form '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}'. If 'publisher:offer:sku[:version]' format, version is optional and if omitted latest will be used. Valid values can be retrieved via 'az batch pool node-agent-skus list'. For example: 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'."
-    description: ''
-  - name: --node-agent-sku-id
-    summary: The SKU of the Batch node agent to be provisioned on compute nodes in the pool. The Batch node agent is a program that runs on each node in the pool, and provides the command-and-control interface between the node and the Batch service. There are different implementations of the node agent, known as SKUs, for different operating systems. You must specify a node agent SKU which matches the selected image reference. To get the list of supported node agent SKUs along with their list of verified image references, see the 'List supported node agent SKUs' operation.
-    description: ''
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-  name: az batch pool create
-  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Batch pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/index.yml
deleted file mode 100644
index a8c6bac24e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-batch-cli-extensions/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az
-  name: azure-batch-cli-extensions
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch
-  name: az batch
-  summary: Manage Azure Batch.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/index.yml
deleted file mode 100644
index 277a581c1b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/index.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az
-  name: azure-cli-iot-ext
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-- uid: ext_azure-cli-iot-ext_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot.yml
deleted file mode 100644
index 2cdb51c7d5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot.yml
+++ /dev/null
@@ -1,407 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-  description: >-
-    Review the extension wiki tips to maximize usage
-
-    <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central
-  name: az iot central
-  summary: Manage Azure IoT Central assets.
-- uid: ext_azure-cli-iot-ext_az_iot_central_app
-  name: az iot central app
-  summary: Manage Azure IoT Central applications.
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-- uid: ext_azure-cli-iot-ext_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-- uid: ext_azure-cli-iot-ext_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Review the extension wiki tips to maximize usage
-
-  <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central.yml
deleted file mode 100644
index 7d1435344a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_central
-  name: az iot central
-  summary: Manage Azure IoT Central assets.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central_app
-  name: az iot central app
-  summary: Manage Azure IoT Central applications.
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Central assets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/app.yml
deleted file mode 100644
index 33e3b1c313..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/app.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_central_app
-  name: az iot central app
-  summary: Manage Azure IoT Central applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Central applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/device-twin.yml
deleted file mode 100644
index f3c502e6d8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device.yml
deleted file mode 100644
index de968df5bb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  - ext_azure-cli-iot-ext_az_iot_device_simulate
-  - ext_azure-cli-iot-ext_az_iot_device_upload_file
-- uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id}
-  - summary: Basic usage with custom data
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --data {message_body}
-  - summary: Send application properties
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props 'key0=value0;key1=value1'
-  - summary: Send system properties (Message Id and Correlation Id)
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props '$.mid=<id>;$.cid=<id>'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "1"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.'
-    description: ''
-  - name: --qos
-    defaultValue: "1"
-    parameterValueGroup: 0, 1
-    summary: Quality of Service. 0 = At most once, 1 = At least once. 2 (Exactly once) is not supported.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage (mqtt)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id}
-  - summary: Basic usage (mqtt) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --properties "myprop=myvalue;$.ct=application/json"
-  - summary: Basic usage (http)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http
-  - summary: Basic usage (http) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http --properties "iothub-app-myprop=myvalue;content-type=application/json;iothub-correlationid=12345"
-  - summary: Choose total message count and interval between messages
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --msg-count 1000 --msg-interval 5
-  - summary: Reject c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs reject --protocol http
-  - summary: Abandon c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs abandon --protocol http
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "100"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --mi --msg-interval
-    defaultValue: "3"
-    summary: Delay in seconds between device-to-cloud messages.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.  For http messaging - application properties are sent using iothub-app-<name>=value, for instance iothub-app-myprop=myvalue. System properties are generally prefixed with iothub-<name> like iothub-correlationid but there are exceptions such as content-type and content-encoding.'
-    description: ''
-  - name: --proto --protocol
-    defaultValue: mqtt
-    parameterValueGroup: http, mqtt
-    summary: Indicates device-to-cloud message protocol.
-    description: ''
-  - name: --receive-settle --rs
-    defaultValue: complete
-    parameterValueGroup: abandon, complete, reject
-    summary: Indicates how to settle received cloud-to-device messages. Supported with HTTP only.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --content-type --ct
-    summary: MIME Type of file.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --file-path --fp
-    summary: Path to file for upload.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Leverage device-to-cloud and cloud-to-device messaging capabilities.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device/c2d-message.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device/c2d-message.yml
deleted file mode 100644
index 65c4afa331..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device/c2d-message.yml
+++ /dev/null
@@ -1,219 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lock-timeout --lt
-    defaultValue: "60"
-    summary: Specifies the amount of time a message will be invisible to other receive calls.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage with default message body
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name}
-  - summary: Send cloud-to-device message with custom data and properties.
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --data 'Hello World' --props 'key0=value0;key1=value1'
-  - summary: Send a C2D message and wait for device acknowledgement
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --ack full --wait
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --ack
-    parameterValueGroup: full, negative, positive
-    summary: 'Request the delivery of per-message feedback regarding the final state of that message. The description of ack values is as follows. Positive: If the c2d message reaches the Completed state, IoT Hub generates a feedback message. Negative: If the c2d message reaches the Dead lettered state, IoT Hub generates a feedback message. Full: IoT Hub generates a feedback message in either case. By default, no ack is requested.'
-    description: ''
-  - name: --ce --content-encoding
-    defaultValue: utf-8
-    summary: The content encoding associated with the C2D message.
-    description: ''
-  - name: --cid --correlation-id
-    summary: The correlation Id associated with the C2D message.
-    description: ''
-  - name: --content-type --ct
-    summary: The content type associated with the C2D message.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --expiry --expiry-time-utc
-    summary: Units are milliseconds since unix epoch. If no time is indicated the default IoT Hub C2D message TTL is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --message-id --mid
-    summary: The C2D message Id. If no message Id is provided a UUID will be generated.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --uid --user-id
-    summary: The C2D message, user Id property.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: If set the c2d send operation will block until device feedback has been received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Cloud-to-device messaging commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps.yml
deleted file mode 100644
index 21dcd797f7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment-group.yml
deleted file mode 100644
index c78035f863..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment-group.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using a CA certificate {certificate_name} as secondary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name}
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service 'MyDps' in the resource group '{resource_group_name}' with provisioning status 'enabled', target IoT Hub '{iothub_host_name}' and initial twin tags '{"location":{"region":"US"}} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem --provisioning-status enabled --iot-hub-host-name {iothub_host_name} --initial-twin-tags "{'location':{'region':'US'}}"
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} with attestation type 'symmetrickey'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {primary_key} --secondary-key {secondary_key}
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new initial twin tags.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-tags "{'location':{'region':'US2'}}" --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary intermediate certificate and remove existing secondary intermediate certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --remove-secondary-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new secondary CA certificate '{certificate_name}' and remove existing primary CA certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name} --remove-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary key.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment.yml
deleted file mode 100644
index 895934142d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment.yml
+++ /dev/null
@@ -1,278 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}'
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with provisioning status 'disabled', target IoT Hub '{iothub_host_name}', device id '{device_id}' and initial twin properties '{"location":{"region":"US"}}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem --provisioning-status disabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --device-id {device_id}
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'tpm' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'symmetrickey' in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --primary-key {primary_key} --secondary-key {secondary_key}
-  - summary: Create an enrollment 'MyEnrollment' with reprovision in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --reprovision-policy {reprovision_type} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with static allocation policy in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy static --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs {iot_hub_host_name}
-  - summary: Create an enrollment 'MyEnrollment' with hashed allocation policy and multiple hubs in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy hashed --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2}"
-  parameters:
-  - isRequired: true
-    name: --at --attestation-type
-    parameterValueGroup: symmetricKey, tpm, x509
-    summary: Attestation Mechanism.
-    description: ''
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device. When choosing tpm as attestation type, endorsement key is required.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment '{enrollment_id}' with a new x509 certificate in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new endorsement key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new primary key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new reprovision type in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --reprovision-policy {reprovision_type} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new allocation policy in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy geolatency --etag AAAAAAAAAAA= --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2} {iot_hub_host_name3}"
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/registration.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/registration.yml
deleted file mode 100644
index bf2f79dde5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/registration.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  - ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  - ext_azure-cli-iot-ext_az_iot_dps_registration_show
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service registrations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dt.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dt.yml
deleted file mode 100644
index cff6192b3e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dt.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  - ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  - ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  - ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  - ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  - ext_azure-cli-iot-ext_az_iot_dt_update_property
-- uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a command on device .
-    syntax:
-      content: az iot dt invoke-command --login {iothub_cs} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  - summary: Execute a command on device within current session.
-    syntax:
-      content: az iot dt invoke-command --hub-name {iothub_name} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --cn --command-name
-    summary: IoT Plug and Play interface command name.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --command-payload --cp --cv
-    summary: IoT Plug and Play interface command payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "10"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all commands of all private interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id}
-  - summary: List all commands of a private interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id} --interface {plug_and_play_interface}
-  - summary: List all commands of all public interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source public --device-id {device_id}
-  - summary: List all commands of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all IoT Plug and Play interfaces on a device.
-    syntax:
-      content: az iot dt list-interfaces --login {iothub_cs} --device-id {device_id}
-  - summary: List all IoT Plug and Play interfaces on a device within current session.
-    syntax:
-      content: az iot dt list-interfaces --hub-name {iothub_name} --device-id {device_id}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all properties of all device's interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id}
-  - summary: List all properties of all public interfaces on an IoT Plug and Play device within current session.
-    syntax:
-      content: az iot dt list-properties --hub-name {iothub_name} --device-id {device_id} --source public
-  - summary: List all properties of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage monitoring events of all devices and all interfaces using the logged in session.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name}
-  - summary: Basic usage monitoring events of all devices and all interfaces using an IotHub connection string.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs}
-  - summary: Basic usage when filtering on specific interface events while targeting devices with a wildcard in the ID.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -d Device* -i {plug_and_play_interface}
-  - summary: Filter Digital Twin events of a subset of devices using IoT Hub query language.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter events on a device with a particular interface. Use a custom consumer group when binding and see all message properties.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs} --device-id {device_id} --interface {plug_and_play_interface} --consumer-group {consumer_group_name} --properties all
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an IoT Plug and Play device interfaces read-write property.
-    syntax:
-      content: az iot dt update-property --login {iothub_cs} --device-id {device_id} --interface-payload {payload}
-  - summary: Update an IoT Plug and Play device interfaces read-write property within current session.
-    syntax:
-      content: az iot dt update-property --hub-name {iothub_name} --device-id {device_id} --interface-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface-payload --ip --iv
-    summary: IoT Plug and Play interface payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage digital twin of an IoT Plug and Play device.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge.yml
deleted file mode 100644
index f730b01e58..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_edge_set_modules
-- uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-  description: >-
-    Modules content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Note: Upon execution the command will output the collection of modules applied to the device.
-  langs:
-  - azurecli
-  examples:
-  - summary: Test edge modules while in development by setting modules on a target device.
-    syntax:
-      content: az iot edge set-modules --hub-name {iothub_name} --device-id {device_id} --content ../modules_content.json
-  parameters:
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT solutions on the Edge.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge/deployment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge/deployment.yml
deleted file mode 100644
index beb68a5afe..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge/deployment.yml
+++ /dev/null
@@ -1,256 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-  description: >-
-    Deployment content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Edge deployments can be created with user defined metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a deployment with labels (bash syntax example) that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{"key0":"value0", "key1":"value1"}' --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a deployment with labels (powershell syntax example) that applies for devices tagged with environment 'dev'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{\"key\":\"value\"}' --target-condition "tags.environment='dev'"
-  - summary: Create a layered deployment that applies for devices tagged with environment 'dev'. Both user metrics and modules content defined inline (cmd syntax example).
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content "{\"modulesContent\":{\"$edgeAgent\":{\"properties.desired.modules.mymodule0\":{ }},\"$edgeHub\":{\"properties.desired.routes.myroute0\":\"FROM /messages/* INTO $upstream\"}}}" --target-condition "tags.environment='dev'" --priority 10 --metrics "{\"queries\":{\"mymetrik\":\"SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200\"}}" --layered
-  - summary: Create a layered deployment that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content layered_modules_content.json --target-condition "tags.building=9 and tags.environment='test'" --metrics metrics_content.json --layered
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: "Map of labels to be applied to target deployment. Use the following format: '{\"key0\":\"value0\", \"key1\":\"value1\"}'."
-    description: ''
-  - name: --layered
-    parameterValueGroup: false, true
-    summary: Layered deployments allow you to define desired properties in $edgeAgent, $edgeHub and user modules that will layer on top of a base deployment. For example the routes specified in a layered deployment will merge with routes of the base deployment. Routes with the same name will be overwritten based on deployment priority.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: IoT Edge deployment metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of deployment in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which an Edge deployment applies to.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of deployments to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the 'appliedCount' system metric
-    syntax:
-      content: az iot edge deployment show-metric -m appliedCount -d {deployment_name} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the labels and target condition of an existing edge deployment
-    syntax:
-      content: az iot edge deployment update -d {deployment_name} -n {iothub_name} --set labels='{"purpose":"dev", "owners":"IoTEngineering"}' targetCondition='tags.building=9'
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Edge deployments at scale.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub.yml
deleted file mode 100644
index ab94c6b2f8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub.yml
+++ /dev/null
@@ -1,469 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  - ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  - ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  - ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  - ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  - ext_azure-cli-iot-ext_az_iot_hub_query
-- uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-  description: For device SAS tokens, the policy parameter is used to access the the device registry only. Therefore the policy should have read access to the registry. For IoT Hub tokens the policy is part of the SAS.
-  langs:
-  - azurecli
-  examples:
-  - summary: Generate an IoT Hub SAS token using the iothubowner policy and primary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name}
-  - summary: Generate an IoT Hub SAS token using the registryRead policy and secondary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name} --policy registryRead --key-type secondary
-  - summary: Generate a device SAS token using the iothubowner policy to access the {iothub_name} device registry.
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} -n {iothub_name}
-  - summary: Generate a device SAS token using an IoT Hub connection string (with registry access)
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --du --duration
-    defaultValue: "3600"
-    summary: Valid token duration in seconds.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --pn --policy-name
-    defaultValue: iothubowner
-    summary: Shared access policy with operation permissions for target IoT Hub entity.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d Device*
-  - summary: Filter devices using IoT Hub query language
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --content-type application/json
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id}
-  - summary: Exit feedback monitor upon receiving a message with specific id (uuid)
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id} -w {message_id}
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --wait-on-msg -w
-    summary: Feedback monitor will block until a message with specific id (uuid) is received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-  description: Query an IoT Hub using a powerful SQL-like language to retrieve information regarding device and module twins, jobs and message routing. See <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language</a> for more information.
-  langs:
-  - azurecli
-  examples:
-  - summary: Query all device twin data in an Azure IoT Hub.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices"
-  - summary: Query all module twin data on target device.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices.modules where devices.deviceId = '{device_id}'"
-  parameters:
-  - isRequired: true
-    name: --query-command -q
-    summary: User query to be executed.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. By default query has no cap.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/configuration.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/configuration.yml
deleted file mode 100644
index 536a6571fe..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/configuration.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-  description: >-
-    Configuration content is json and slighty varies based on device or module intent.
-
-
-    Device configurations are in the form of {"deviceContent":{...}} or {"content":{"deviceContent":{...}}}
-
-
-    Module configurations are in the form of {"moduleContent":{...}} or {"content":{"moduleContent":{...}}}
-
-
-    Configurations can be defined with user provided metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device configuration with a priority of 3 that applies on condition when a device is tagged in building 9 and the environment is 'test'.
-    syntax:
-      content: az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a device configuration with labels and provide user metrics inline (bash syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition \"tags.building=9\" --labels '{\"key0\":\"value0\", \"key1\":\"value1\"}' --priority 10 --metrics '{\"metrics\": {\"queries\": {\"mymetric\": \"select deviceId from devices where tags.location='US'\"}}}'"
-  - summary: Create a module configuration with labels and provide user metrics inline (cmd syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content module_content.json --target-condition \"tags.building=9\" --labels \"{\\\"key0\\\":\\\"value0\\\", \\\"key1\\\":\\\"value1\\\"}\" --metrics \"{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\": \\\"select deviceId from devices where tags.location='US'\\\"}}}\""
-  - summary: Create a module configuration with content and user metrics inline (powershell syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content '{\\\"moduleContent\\\": {\\\"properties.desired.chillerWaterSettings\\\": {\\\"temperature\\\": 38, \\\"pressure\\\": 78}}}' --target-condition \"tags.building=9\" --priority 1 --metrics '{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\":\\\"select deviceId from devices where tags.location=''US''\\\"}}}'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: Device configuration content. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: 'Map of labels to be applied to target configuration. Format example: {"key0":"value0", "key1":"value1"}.'
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: Device configuration metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of the device configuration in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which a device configuration applies to.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of configurations to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the user defined 'warningLimit' metric
-    syntax:
-      content: az iot hub configuration show-metric -m warningLimit -c {configuration_name} -n {iothub_name}
-  - summary: Evaluate the system 'appliedCount' metric
-    syntax:
-      content: az iot hub configuration show-metric --metric-id appliedCount -c {configuration_name} -n {iothub_name} --metric-type system
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the priority of a device configuration and update its target condition
-    syntax:
-      content: az iot hub configuration update -c {configuration_name} -n {iothub_name} --set priority=10 targetCondition="tags.building=43 and tags.environment='dev'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT automatic device management configuration at scale.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-identity.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-identity.yml
deleted file mode 100644
index 4e0b5165ca..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-identity.yml
+++ /dev/null
@@ -1,482 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add non-edge devices as a children to the edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Add non-edge devices as a children to the edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name} -f
-  parameters:
-  - isRequired: true
-    name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an edge enabled IoT device with default authorization (shared private key).
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee
-  - summary: Create an edge enabled IoT device with default authorization (shared private key) and add child devices as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee --cl {child_device_id}
-  - summary: Create an IoT device with default authorization (shared private key) and set parent device as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --pd {edge_device_id}
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert valid for 10 days then use its thumbprint.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --valid-days 10
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert of default expiration (365 days) and output to target directory.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --output-dir /path/to/output
-  - summary: Create an IoT device with self-signed certificate authorization and explicitly provide primary and secondary thumbprints.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --ptp {thumbprint_1} --stp {thumbprint_2}
-  - summary: Create an IoT device with root CA authorization with disabled status and reason
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_ca --status disabled --status-reason 'for reasons'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --add-children --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --pd --set-parent
-    summary: Id of edge device.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sta --status
-    defaultValue: enabled
-    parameterValueGroup: disabled, enabled
-    summary: Set device status upon creation.
-    description: ''
-  - name: --star --status-reason
-    summary: Description for device status.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --bcu --blob-container-uri
-    summary: Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --ik --include-keys
-    parameterValueGroup: false, true
-    summary: If set, keys are exported normally. Otherwise, keys are set to null in export output.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the parent device of the specified device.
-    syntax:
-      content: az iot hub device-identity get-parent -d {non_edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --ibcu --input-blob-container-uri
-    summary: Blob Shared Access Signature URI with read access to a blob container. This blob contains the operations to be performed on the identity registry.
-    description: ''
-  - isRequired: true
-    name: --obcu --output-blob-container-uri
-    summary: Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show all assigned non-edge devices as comma-separated list.
-    syntax:
-      content: az iot hub device-identity list-children -d {edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove all mentioned devices as children of specified device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Remove all non-edge devices as children specified edge device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --remove-all
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --remove-all -a
-    summary: To remove all children.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the parent device of the specified non-edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} -n {iothub_name}
-  - summary: Set the parent device of the specified non-edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} --force -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - isRequired: true
-    name: --parent-device-id --pd
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-  description: Use --set followed by property assignments for updating a device. Leverage parameters returned from 'iot hub device-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Turn on edge capabilities for device
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set capabilities.iotEdge=true
-  - summary: Disable device status
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled
-  - summary: In one command
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled capabilities.iotEdge=true
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT devices.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-twin.yml
deleted file mode 100644
index aacfa07014..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-twin.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  - ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  - ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace device twin with file contents.
-    syntax:
-      content: az iot hub device-twin replace -d {device_id} -n {iothub_name} -j ../mydevicetwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-  description: Use --set followed by property assignments for updating a device twin. Leverage properties returned from 'iot hub device-twin show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Add nested tags to device twin.
-    syntax:
-      content: az iot hub device-twin update --device-id {device_id} --hub-name {iothub_name} --set tags='{"location":{"region":"US"}}'
-  - summary: Remove the 'region' property from parent 'location' property
-    syntax:
-      content: az iot hub device-twin update --device-id {device_id} --hub-name {iothub_name} --set tags.location.region='null'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device twin configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/distributed-tracing.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/distributed-tracing.yml
deleted file mode 100644
index bfc75e76cf..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/distributed-tracing.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  - ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the distributed tracing settings for a device
-    syntax:
-      content: az iot hub distributed-tracing show -d {device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the distributed tracing options for a device
-    syntax:
-      content: az iot hub distributed-tracing update -d {device_id} --sm on --sr 50 -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --sampling-mode --sm
-    parameterValueGroup: off, on
-    summary: Turns sampling for distributed tracing on and off. 1 is On and, 2 is Off.
-    description: ''
-  - isRequired: true
-    name: --sampling-rate --sr
-    summary: Controls the amount of messages sampled for adding trace context. This value isa percentage. Only values from 0 to 100 (inclusive) are permitted.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage distributed settings per-device.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/job.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/job.yml
deleted file mode 100644
index b6849667e7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/job.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  - ext_azure-cli-iot-ext_az_iot_hub_job_create
-  - ext_azure-cli-iot-ext_az_iot_hub_job_list
-  - ext_azure-cli-iot-ext_az_iot_hub_job_show
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel an IoT Hub job.
-    syntax:
-      content: az iot hub job cancel --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-  description: >-
-    When scheduling a twin update job, the twin patch is a required argument.
-
-    When scheduling a device method job, the method name and payload are required arguments.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create and schedule a job to update the twin tags of all devices.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}'"
-  - summary: Schedule job and block for result of "completed", "failed" or "cancelled". Specify poll interval in seconds.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}' --wait --poll-interval 30"
-  - summary: Create a job to update a desired twin property on a subset of devices, scheduled to run at an arbitrary future time.
-    syntax:
-      content: "az iot hub job create --job-id {job_name} --job-type scheduleUpdateTwin -n {iothub_name} --twin-patch '{\"properties\":{\"desired\": {\"temperatureF\": 65}}}' --start-time \"2020-01-08T12:19:56.868Z\" --query-condition \"deviceId IN ['MyDevice1', 'MyDevice2', 'MyDevice3']\""
-  - summary: Create and schedule a job to invoke a device method for a set of devices meeting a query condition.
-    syntax:
-      content: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -n {iothub_name} --method-name setSyncIntervalSec --method-payload 30 --query-condition "properties.reported.settings.syncIntervalSec != 30"
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - isRequired: true
-    name: --job-type --jt
-    parameterValueGroup: scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --duration --poll-duration
-    defaultValue: "600"
-    summary: Total duration in seconds where job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interval --poll-interval
-    defaultValue: "10"
-    summary: Interval in seconds that job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mct --method-connect-timeout
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait on device connection.
-    description: ''
-  - name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --method-payload --mp
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --method-response-timeout --mrt
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-  - name: --patch --twin-patch
-    summary: The desired twin patch. Provide file path or raw json.
-    description: ''
-  - name: --query-condition -q
-    summary: 'Condition for device query to get devices to execute the job on. Required if job type is scheduleDeviceMethod or scheduleUpdateTwin. Note: The service will prefix "SELECT \* FROM devices WHERE " to the input.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start --start-time
-    summary: The scheduled start of the job in ISO 8601 date time format. If no start time is provided, the job is queued for asap execution.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Max execution time in seconds, before job is terminated.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: Block until the created job is in a completed, failed or cancelled state. Will regularly poll on interval specified by --poll-interval.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all archived jobs within retention period (max of 30 days).
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name}
-  - summary: List all archived jobs projecting specific properties
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --query "[*].[jobId,type,status,startTime,endTime]"
-  - summary: List only update twin type jobs
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod
-  - summary: List device method jobs which have status "scheduled"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod --job-status scheduled
-  - summary: List device export jobs which have status "completed"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type export --job-status completed
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --job-status --js
-    parameterValueGroup: cancelled, completed, enqueued, failed, queued, running, scheduled, unknown
-    summary: The status of a scheduled job.
-    description: ''
-  - name: --job-type --jt
-    parameterValueGroup: export, import, scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a created job.
-    syntax:
-      content: az iot hub job show --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Hub jobs (v2).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-identity.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-identity.yml
deleted file mode 100644
index 910bbf4e70..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-identity.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate module symmetric authentication keys
-    syntax:
-      content: az iot hub module-identity update -m {module_name} -d {device_id} -n {iothub_name} --set authentication.symmetricKey.primaryKey="" authentication.symmetricKey.secondaryKey=""
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device modules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-twin.yml
deleted file mode 100644
index 8689edec4a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-twin.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  - ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  - ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace a module twin with file contents.
-    syntax:
-      content: az iot hub module-twin replace -d {device_id} -n {iothub_name} -m {module_name} -j ../mymodtwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-twin show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Add desired properties to module twin.
-    syntax:
-      content: az iot hub module-twin update -d {device_id} -n {iothub_name} -m {module_name} --set properties.desired='{"conditions":{"temperature":{"warning":70, "critical":100}}}'
-  - summary: Remove 'critical' property from parent 'temperature'
-    syntax:
-      content: az iot hub module-twin update -d mydevice -n myhub -m mymod --set properties.desired.condition.temperature.critical='null'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device module twin configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp.yml
deleted file mode 100644
index dcceb6fcd9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities of an IoT Plug and Play model repository.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/capability-model.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/capability-model.yml
deleted file mode 100644
index 60a1145bff..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/capability-model.yml
+++ /dev/null
@@ -1,212 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model create --def {plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model delete -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's capability-model.
-    syntax:
-      content: az iot pnp capability-model list -r {pnp_repository}
-  - summary: List all public capability-model.
-    syntax:
-      content: az iot pnp capability-model list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play models for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of capability-model to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish the capability-model to public repository.
-    syntax:
-      content: az iot pnp capability-model publish -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository capability-model.
-    syntax:
-      content: az iot pnp capability-model show -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  - summary: Get the details of public capability-model.
-    syntax:
-      content: az iot pnp capability-model show --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --expand
-    summary: Indicates whether to expand the device capability model's interface definitions or not.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model update --def {updated_plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage device capability models in an IoT Plug and Play model repository.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/interface.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/interface.yml
deleted file mode 100644
index 3aa115d427..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/interface.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an interface in the company repository.
-    syntax:
-      content: az iot pnp interface create --def {plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an interface in the company repository.
-    syntax:
-      content: az iot pnp interface delete -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's interfaces.
-    syntax:
-      content: az iot pnp interface list -r {pnp_repository}
-  - summary: List all public interfaces.
-    syntax:
-      content: az iot pnp interface list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play interfaces for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of interface to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish an interface to public repository.
-    syntax:
-      content: az iot pnp interface publish -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository interface.
-    syntax:
-      content: az iot pnp interface show -r {pnp_repository} --interface {plug_and_play_interface_id}
-  - summary: Get the details of public interface.
-    syntax:
-      content: az iot pnp interface show --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an interface in the company repository.
-    syntax:
-      content: az iot pnp interface update --def {updated_plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage interfaces in an IoT Plug and Play model repository.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral.yml
deleted file mode 100644
index 655654cfa5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central assets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/app.yml
deleted file mode 100644
index 503fe404d6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/app.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>
-
-
-    DEPRECATED. Use 'az iot central app monitor-events' instead.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/device-twin.yml
deleted file mode 100644
index a47ba7b2af..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-  description: DEPRECATED. Use 'az iot central device-twin' instead.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: DEPRECATED. Use 'az iot central device-twin show' instead.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: DEPRECATED. Use 'az iot central device-twin' instead.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/index.yml
deleted file mode 100644
index ce6e796ae6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az
-  name: azure-cli-ml
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml
-  name: az ml
-  summary: Azureml._cli commands.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml.yml
deleted file mode 100644
index ce98916bf6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml.yml
+++ /dev/null
@@ -1,434 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml
-  name: az ml
-  summary: Azureml._cli commands.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget
-  name: az ml computetarget
-  summary: Computetarget subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-  name: az ml computetarget amlcompute
-  summary: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach
-  name: az ml computetarget attach
-  summary: Attach subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create
-  name: az ml computetarget create
-  summary: Create a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_delete
-  name: az ml computetarget delete
-  summary: Delete a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_detach
-  name: az ml computetarget detach
-  summary: Detach a compute target (aks or remote) from a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  name: az ml computetarget get-credentials
-  summary: Get credentials for a compute target (aks or remote).
-- uid: ext_azure-cli-ml_az_ml_computetarget_list
-  name: az ml computetarget list
-  summary: List all the compute targets attached to a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_show
-  name: az ml computetarget show
-  summary: Show details of a specific compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update
-  name: az ml computetarget update
-  summary: Update a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_dataset
-  name: az ml dataset
-  summary: Commands for managing datasets in Azure Machine Learning Workspace.
-- uid: ext_azure-cli-ml_az_ml_dataset_archive
-  name: az ml dataset archive
-  summary: Archive an active or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-  name: az ml dataset deprecate
-  summary: Deprecate an active dataset in a workspace by another dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_list
-  name: az ml dataset list
-  summary: List all datasets in the workspace.
-- uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-  name: az ml dataset reactivate
-  summary: Reactivate an archived or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_register
-  name: az ml dataset register
-  summary: Register a new dataset from the specified file.
-- uid: ext_azure-cli-ml_az_ml_dataset_show
-  name: az ml dataset show
-  summary: Get details of a dataset by its id or registration name.
-- uid: ext_azure-cli-ml_az_ml_dataset_unregister
-  name: az ml dataset unregister
-  summary: Unregister all versions under the specified registration name.
-- uid: ext_azure-cli-ml_az_ml_datastore
-  name: az ml datastore
-  summary: Commands for managing and using datastores with the Azure ML Workspace.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-  name: az ml datastore attach-adls
-  summary: Attach an ADLS datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  name: az ml datastore attach-adls-gen2
-  summary: Attach a ADLS Gen2 datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-  name: az ml datastore attach-blob
-  summary: Attach a blob storage datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  name: az ml datastore attach-dbfs
-  summary: Attach a Databricks File System datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-  name: az ml datastore attach-file
-  summary: Attach a file share datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  name: az ml datastore attach-mysqldb
-  summary: Attach an Azure MySQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  name: az ml datastore attach-psqldb
-  summary: Attach an Azure PostgreSQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  name: az ml datastore attach-sqldb
-  summary: Attach an Azure SQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_detach
-  name: az ml datastore detach
-  summary: Detach a datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_download
-  name: az ml datastore download
-  summary: Download files from a Datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_list
-  name: az ml datastore list
-  summary: List datastores in the workspace.
-- uid: ext_azure-cli-ml_az_ml_datastore_set_default
-  name: az ml datastore set-default
-  summary: Set the workspace default datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show
-  name: az ml datastore show
-  summary: Show a single datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show_default
-  name: az ml datastore show-default
-  summary: Show the workspace default datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_upload
-  name: az ml datastore upload
-  summary: Upload files to a Datastore.
-- uid: ext_azure-cli-ml_az_ml_endpoint
-  name: az ml endpoint
-  summary: Manage machine learning endpoints.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-  name: az ml endpoint realtime
-  summary: Manage operationalized realtime endpoints.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_environment
-  name: az ml environment
-  summary: Commands to manage environments.
-- uid: ext_azure-cli-ml_az_ml_environment_download
-  name: az ml environment download
-  summary: Download an environment definition to a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_list
-  name: az ml environment list
-  summary: List environments in a workspace.
-- uid: ext_azure-cli-ml_az_ml_environment_register
-  name: az ml environment register
-  summary: Register an environment definition from a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_scaffold
-  name: az ml environment scaffold
-  summary: Scaffold the files for a default environment definition in the specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_show
-  name: az ml environment show
-  summary: Show an environment by name and optionally version.
-- uid: ext_azure-cli-ml_az_ml_experiment
-  name: az ml experiment
-  summary: Commands to manage experiments.
-- uid: ext_azure-cli-ml_az_ml_experiment_list
-  name: az ml experiment list
-  summary: List experiments in a workspace.
-- uid: ext_azure-cli-ml_az_ml_folder
-  name: az ml folder
-  summary: Folder subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_folder_attach
-  name: az ml folder attach
-  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
-- uid: ext_azure-cli-ml_az_ml_model
-  name: az ml model
-  summary: Manage machine learning models.
-- uid: ext_azure-cli-ml_az_ml_model_delete
-  name: az ml model delete
-  summary: Delete a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_deploy
-  name: az ml model deploy
-  summary: Deploy model(s) from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_download
-  name: az ml model download
-  summary: Download a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_list
-  name: az ml model list
-  summary: List models in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_package
-  name: az ml model package
-  summary: Package a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_profile
-  name: az ml model profile
-  summary: Profile model(s) in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_register
-  name: az ml model register
-  summary: Register a model to the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_show
-  name: az ml model show
-  summary: Show a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_update
-  name: az ml model update
-  summary: Update a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline
-  name: az ml pipeline
-  summary: Pipeline subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone
-  name: az ml pipeline clone
-  summary: Generate yml definition describing the pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  name: az ml pipeline clone-draft
-  summary: Create a pipeline draft from an existing pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create
-  name: az ml pipeline create
-  summary: Create a pipeline from a yaml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-  name: az ml pipeline create-draft
-  summary: Create a pipeline draft from a yml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  name: az ml pipeline create-schedule
-  summary: Create a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  name: az ml pipeline delete-draft
-  summary: Delete a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable
-  name: az ml pipeline disable
-  summary: Disable a pipeline from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  name: az ml pipeline disable-schedule
-  summary: Disable a schedule from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable
-  name: az ml pipeline enable
-  summary: Enable a pipeline and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  name: az ml pipeline enable-schedule
-  summary: Enable a schedule and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_get
-  name: az ml pipeline get
-  summary: Generate yml definition describing the pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  name: az ml pipeline last-pipeline-run
-  summary: Show last pipeline run for a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list
-  name: az ml pipeline list
-  summary: List all pipelines and respective schedules in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  name: az ml pipeline list-drafts
-  summary: List pipeline drafts in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-  name: az ml pipeline list-steps
-  summary: List the step runs generated from a pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  name: az ml pipeline pipeline-runs-list
-  summary: List pipeline runs generated from a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  name: az ml pipeline publish-draft
-  summary: Publish a pipeline draft as a published pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show
-  name: az ml pipeline show
-  summary: Show details of a pipeline and respective schedules.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-  name: az ml pipeline show-draft
-  summary: Show details of a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  name: az ml pipeline show-schedule
-  summary: Show details of a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  name: az ml pipeline submit-draft
-  summary: Submit a run from the pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-  name: az ml pipeline update-draft
-  summary: Update a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-  name: az ml pipeline update-schedule
-  summary: Update a schedule.
-- uid: ext_azure-cli-ml_az_ml_run
-  name: az ml run
-  summary: Commands for submitting, updating, and monitoring runs.
-- uid: ext_azure-cli-ml_az_ml_run_cancel
-  name: az ml run cancel
-  summary: Cancel run.
-- uid: ext_azure-cli-ml_az_ml_run_download_logs
-  name: az ml run download-logs
-  summary: Download log files.
-- uid: ext_azure-cli-ml_az_ml_run_list
-  name: az ml run list
-  summary: List runs.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-  name: az ml run monitor-logs
-  summary: Monitor the logs for an existing run.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  name: az ml run monitor-tensorboard
-  summary: Monitor an existing run using tensorboard.
-- uid: ext_azure-cli-ml_az_ml_run_show
-  name: az ml run show
-  summary: Show run.
-- uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  name: az ml run submit-hyperdrive
-  summary: Submit a hyper parameter sweep using run config.
-- uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-  name: az ml run submit-pipeline
-  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
-- uid: ext_azure-cli-ml_az_ml_run_submit_script
-  name: az ml run submit-script
-  summary: Submit a script for execution.
-- uid: ext_azure-cli-ml_az_ml_run_update
-  name: az ml run update
-  summary: Update the run by adding tags.
-- uid: ext_azure-cli-ml_az_ml_service
-  name: az ml service
-  summary: Manage operationalized services.
-- uid: ext_azure-cli-ml_az_ml_service_delete
-  name: az ml service delete
-  summary: Delete a service from the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_get_access_token
-  name: az ml service get-access-token
-  summary: Get a token to issue requests a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_keys
-  name: az ml service get-keys
-  summary: Get keys to issue requests against a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_logs
-  name: az ml service get-logs
-  summary: Get logs for a service.
-- uid: ext_azure-cli-ml_az_ml_service_list
-  name: az ml service list
-  summary: List services in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_regen_key
-  name: az ml service regen-key
-  summary: Regenerate keys for a service.
-- uid: ext_azure-cli-ml_az_ml_service_run
-  name: az ml service run
-  summary: Run a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_show
-  name: az ml service show
-  summary: Show details for a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_update
-  name: az ml service update
-  summary: Update a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace
-  name: az ml workspace
-  summary: Workspace subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_workspace_create
-  name: az ml workspace create
-  summary: Create a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_delete
-  name: az ml workspace delete
-  summary: Delete a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_list
-  name: az ml workspace list
-  summary: List workspaces.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-  name: az ml workspace private-endpoint
-  summary: Workspace private endpoint subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_share
-  name: az ml workspace share
-  summary: Share a workspace with another user with a given role.
-- uid: ext_azure-cli-ml_az_ml_workspace_show
-  name: az ml workspace show
-  summary: Show a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-  name: az ml workspace sync-keys
-  summary: Sync workspace keys  for dependent resources such as storage, acr, and app insights.
-- uid: ext_azure-cli-ml_az_ml_workspace_update
-  name: az ml workspace update
-  summary: Update a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Azureml._cli commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml
deleted file mode 100644
index 794bfb64db..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml
+++ /dev/null
@@ -1,217 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget
-  name: az ml computetarget
-  summary: Computetarget subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_delete
-  - ext_azure-cli-ml_az_ml_computetarget_detach
-  - ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  - ext_azure-cli-ml_az_ml_computetarget_list
-  - ext_azure-cli-ml_az_ml_computetarget_show
-- uid: ext_azure-cli-ml_az_ml_computetarget_delete
-  name: az ml computetarget delete
-  summary: Delete a compute target (aks or amlcompute).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the enviroment to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_detach
-  name: az ml computetarget detach
-  summary: Detach a compute target (aks or remote) from a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to detach.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the enviroment to detach.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  name: az ml computetarget get-credentials
-  summary: Get credentials for a compute target (aks or remote).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to retrieve keys for.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the compute target to get credentials for.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_list
-  name: az ml computetarget list
-  summary: List all the compute targets attached to a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the compute target to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_show
-  name: az ml computetarget show
-  summary: Show details of a specific compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the compute target to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-  name: az ml computetarget amlcompute
-  summary: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach
-  name: az ml computetarget attach
-  summary: Attach subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create
-  name: az ml computetarget create
-  summary: Create a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_delete
-  name: az ml computetarget delete
-  summary: Delete a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_detach
-  name: az ml computetarget detach
-  summary: Detach a compute target (aks or remote) from a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  name: az ml computetarget get-credentials
-  summary: Get credentials for a compute target (aks or remote).
-- uid: ext_azure-cli-ml_az_ml_computetarget_list
-  name: az ml computetarget list
-  summary: List all the compute targets attached to a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_show
-  name: az ml computetarget show
-  summary: Show details of a specific compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update
-  name: az ml computetarget update
-  summary: Update a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Computetarget subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml
deleted file mode 100644
index e6057f8888..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-  name: az ml computetarget amlcompute
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml
deleted file mode 100644
index 9ab80e22bb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  - ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  - ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --identities
-    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie <ResourceID1>,<ResourceID2>) to set user assigned identities.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --identities
-    summary: Use '[system]' to remove a system assigned identity else input resource IDs separated by commas (ie <ResourceID1>,<ResourceID2>) to remove user assigned identities.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: AzureML compute target identity commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml
deleted file mode 100644
index 5c35393e3d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach
-  name: az ml computetarget attach
-  summary: Attach subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  - ext_azure-cli-ml_az_ml_computetarget_attach_remote
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --compute-resource-id -i
-    summary: Resource ID of the compute object to attach to the workspace.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Specifies the compute target name. Must be unique to the workspace.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address -a
-    summary: DNS name or IP address of the target.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Specifies the compute target name. Must be unique to the workspace.
-    description: ''
-  - isRequired: true
-    name: --ssh-port
-    defaultValue: "22"
-    summary: Ssh port that can be use to connect to the compute.
-    description: ''
-  - isRequired: true
-    name: --username -u
-    summary: The username for the remote machine being attached. Must also provide either a password or public and private key files.
-    description: ''
-  - name: --password -p
-    summary: The password for the remote machine being attached. Must either provide a password or public and private key files.
-    description: ''
-  - name: --private-key-file
-    summary: Path to a file containing the private key information for the remote machine being attached.
-    description: ''
-  - name: --private-key-passphrase
-    summary: Passphrase for private key specified with the --private-key-file option.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Attach subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml
deleted file mode 100644
index 3ae03420e3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml
+++ /dev/null
@@ -1,226 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_create
-  name: az ml computetarget create
-  summary: Create a compute target (aks or amlcompute).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_create_aks
-  - ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  - ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --agent-count -a
-    summary: 'Number of agents to provision with the AKS cluster. Default: 3.'
-    description: ''
-  - name: --cluster-purpose
-    summary: 'Targeted purpose of the cluster. This is used when provisioning AzureML components to ensure the desired level of fault-tolerance and QoS. Accepted values are "FastProd" and "DevTest". Further detail of the use cases can be found here: <a href="https://aka.ms/azureml-create-new-aks-cluster">https://aka.ms/azureml-create-new-aks-cluster</a>.'
-    description: ''
-  - name: --dns-service-ip
-    summary: Containers DNS server IP address.
-    description: ''
-  - name: --docker-bridge-cidr
-    summary: A CIDR notation IP for Docker bridge.
-    description: ''
-  - name: --load-balancer-subnet
-    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
-    description: ''
-  - name: --load-balancer-type
-    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
-    description: ''
-  - name: --location -l
-    summary: Location to provision cluster in. If not specified, will default to workspace location.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --service-cidr
-    summary: A CIDR notation IP range from which to assign service cluster IPs.
-    description: ''
-  - name: --ssl-cert-file
-    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
-    description: ''
-  - name: --ssl-cname
-    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
-    description: ''
-  - name: --ssl-key-file
-    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
-    description: ''
-  - name: --ssl-leaf-domain-label
-    summary: Leaf domain label to use for the auto generated certificate.
-    description: ''
-  - name: --ssl-overwrite-domain
-    summary: When set overwrites the existing leaf domain label.
-    description: ''
-  - name: --subnet-name
-    summary: Name of the subnet inside the vnet.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --vm-size -s
-    summary: 'VM size to use for the compute target. A full list of options can be found here: <a href="https://aka.ms/azureml-aks-details">https://aka.ms/azureml-aks-details</a> Default: Standard_D3_v2.'
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network.
-    description: ''
-  - name: --vnet-resourcegroup-name
-    summary: Name of the resource group where the virtual network is located.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --max-nodes
-    summary: 'Maximum number of nodes to use. Default: 4.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - isRequired: true
-    name: --vm-size -s
-    summary: 'VM size to use for the compute target. More details can be found here: <a href="https://aka.ms/azureml-vm-details">https://aka.ms/azureml-vm-details</a> Default: Standard_NC6.'
-    description: ''
-  - name: --admin-user-password
-    summary: Password of the administrator user account.
-    description: ''
-  - name: --admin-user-ssh-key
-    summary: SSH public key of the administrator user account.
-    description: ''
-  - name: --admin-username
-    summary: Name of the administrator user account which can be used to SSH into nodes.
-    description: ''
-  - name: --assign-identity
-    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie <ResourceID1>,<ResourceID2>) to set user assigned identities.
-    description: ''
-  - name: --description
-    summary: Description of the compute target.
-    description: ''
-  - name: --idle-seconds-before-scaledown
-    summary: 'Node idle time in seconds before scaling down the cluster. Default: 120.'
-    description: ''
-  - name: --min-nodes
-    summary: 'Minimum number of nodes to use. Default: 0.'
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --remote-login-port-public-access
-    summary: 'State of the public SSH port. Possible values are: Enabled or Disabled.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subnet-name
-    summary: Name of the subnet inside the vnet.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --vm-priority -p
-    summary: "VM priority to use for the compute target. (Options are 'dedicated', 'lowpriority') Default: dedicated."
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network.
-    description: ''
-  - name: --vnet-resourcegroup-name
-    summary: Name of the resource group where the virtual network is located.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --location -l
-    summary: Location to provision cluster in. If not specified, will default to workspace location.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create a compute target (aks or amlcompute).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml
deleted file mode 100644
index 624badc4d1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_update
-  name: az ml computetarget update
-  summary: Update a compute target (aks or amlcompute).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_update_aks
-  - ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to update.
-    description: ''
-  - name: --load-balancer-subnet
-    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
-    description: ''
-  - name: --load-balancer-type
-    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --ssl-cert-file
-    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
-    description: ''
-  - name: --ssl-cname
-    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
-    description: ''
-  - name: --ssl-disable
-    summary: Disable SSL validation.
-    description: ''
-  - name: --ssl-key-file
-    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
-    description: ''
-  - name: --ssl-leaf-domain-label
-    summary: Leaf domain label to use for the auto generated certificate.
-    description: ''
-  - name: --ssl-overwrite-domain
-    summary: When set overwrites the existing leaf domain label.
-    description: ''
-  - name: --ssl-renew
-    summary: Refreshes the auto generated certificate. If provided, the existing SSL configuration must be auto.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --idle-seconds-before-scaledown
-    summary: Node idle time in seconds before scaling down the cluster.
-    description: ''
-  - name: --max-nodes
-    summary: Maximum number of nodes to use.
-    description: ''
-  - name: --min-nodes
-    summary: Minimum number of nodes to use.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Update a compute target (aks or amlcompute).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml
deleted file mode 100644
index 9cfb2a8de5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_dataset
-  name: az ml dataset
-  summary: Commands for managing datasets in Azure Machine Learning Workspace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_dataset_archive
-  - ext_azure-cli-ml_az_ml_dataset_deprecate
-  - ext_azure-cli-ml_az_ml_dataset_list
-  - ext_azure-cli-ml_az_ml_dataset_reactivate
-  - ext_azure-cli-ml_az_ml_dataset_register
-  - ext_azure-cli-ml_az_ml_dataset_show
-  - ext_azure-cli-ml_az_ml_dataset_unregister
-- uid: ext_azure-cli-ml_az_ml_dataset_archive
-  name: az ml dataset archive
-  summary: Archive an active or deprecated dataset.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id -i
-    summary: Dataset ID (guid).
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-  name: az ml dataset deprecate
-  summary: Deprecate an active dataset in a workspace by another dataset.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --deprecate-by-id -d
-    summary: Dataset ID (guid) which is the intended replacement for this Dataset.
-    description: ''
-  - name: --id -i
-    summary: Dataset ID (guid).
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_list
-  name: az ml dataset list
-  summary: List all datasets in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-  name: az ml dataset reactivate
-  summary: Reactivate an archived or deprecated dataset.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id -i
-    summary: Dataset ID (guid).
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_register
-  name: az ml dataset register
-  summary: Register a new dataset from the specified file.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --file -f
-    summary: Specification file for dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --show-template
-    summary: Show template of dataset specification file.
-    description: ''
-  - name: --skip-validation
-    summary: Skip validation that ensures data can be loaded from the dataset before registration.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_show
-  name: az ml dataset show
-  summary: Get details of a dataset by its id or registration name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id -i
-    summary: ID of the dataset saved to workspace.
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version -v
-    defaultValue: latest
-    summary: Registration version of the dataset.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_unregister
-  name: az ml dataset unregister
-  summary: Unregister all versions under the specified registration name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_dataset_archive
-  name: az ml dataset archive
-  summary: Archive an active or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-  name: az ml dataset deprecate
-  summary: Deprecate an active dataset in a workspace by another dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_list
-  name: az ml dataset list
-  summary: List all datasets in the workspace.
-- uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-  name: az ml dataset reactivate
-  summary: Reactivate an archived or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_register
-  name: az ml dataset register
-  summary: Register a new dataset from the specified file.
-- uid: ext_azure-cli-ml_az_ml_dataset_show
-  name: az ml dataset show
-  summary: Get details of a dataset by its id or registration name.
-- uid: ext_azure-cli-ml_az_ml_dataset_unregister
-  name: az ml dataset unregister
-  summary: Unregister all versions under the specified registration name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for managing datasets in Azure Machine Learning Workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml
deleted file mode 100644
index c4d4788326..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml
+++ /dev/null
@@ -1,745 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_datastore
-  name: az ml datastore
-  summary: Commands for managing and using datastores with the Azure ML Workspace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_datastore_attach_adls
-  - ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  - ext_azure-cli-ml_az_ml_datastore_attach_blob
-  - ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  - ext_azure-cli-ml_az_ml_datastore_attach_file
-  - ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  - ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  - ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  - ext_azure-cli-ml_az_ml_datastore_detach
-  - ext_azure-cli-ml_az_ml_datastore_download
-  - ext_azure-cli-ml_az_ml_datastore_list
-  - ext_azure-cli-ml_az_ml_datastore_set_default
-  - ext_azure-cli-ml_az_ml_datastore_show
-  - ext_azure-cli-ml_az_ml_datastore_show_default
-  - ext_azure-cli-ml_az_ml_datastore_upload
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-  name: az ml datastore attach-adls
-  summary: Attach an ADLS datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --client-id
-    summary: The service principal's client/application ID.
-    description: ''
-  - isRequired: true
-    name: --client-secret
-    summary: The service principal's secret.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --store-name -c
-    summary: The ADLS store name.
-    description: ''
-  - isRequired: true
-    name: --tenant-id
-    summary: The service principal Tenant ID.
-    description: ''
-  - name: --adls-resource-group
-    summary: The resource group the ADLS store belongs to.
-    description: ''
-  - name: --adls-subscription-id
-    summary: The ID of the subscription the ADLS store belongs to.
-    description: ''
-  - name: --authority-url
-    defaultValue: <a href="https://login.microsoftonline.com">https://login.microsoftonline.com</a>
-    summary: Authority url used to authenticate the user.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --resource-url
-    defaultValue: <a href="https://datalake.azure.net/">https://datalake.azure.net/</a>
-    summary: Determines what operations will be performed on the data lake store. Defaults to <a href="https://datalake.azure.net/">https://datalake.azure.net/</a> allowing for filesystem operations.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  name: az ml datastore attach-adls-gen2
-  summary: Attach a ADLS Gen2 datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the storage account.
-    description: ''
-  - isRequired: true
-    name: --client-id
-    summary: The service principal's client/application ID.
-    description: ''
-  - isRequired: true
-    name: --client-secret
-    summary: The service principal's secret.
-    description: ''
-  - isRequired: true
-    name: --file-system -c
-    summary: The file system name of the ADLS Gen2.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --tenant-id
-    summary: The service principal Tenant ID.
-    description: ''
-  - name: --authority-url
-    defaultValue: <a href="https://login.microsoftonline.com">https://login.microsoftonline.com</a>
-    summary: Authority url used to authenticate the user.
-    description: ''
-  - name: --endpoint
-    defaultValue: core.windows.net
-    summary: The endpoint of the storage account. Defaults to core.windows.net.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --protocol
-    defaultValue: https
-    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --resource-url
-    defaultValue: <a href="https://storage.azure.com/">https://storage.azure.com/</a>
-    summary: Determines what operations will be performed on the data lake store. Defaults to <a href="https://storage.azure.com/">https://storage.azure.com/</a> allowing for filesystem operations.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-  name: az ml datastore attach-blob
-  summary: Attach a blob storage datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the storage account.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The blob container name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --account-key -k
-    summary: The storage account key.
-    description: ''
-  - name: --endpoint
-    defaultValue: core.windows.net
-    summary: The endpoint of the storage account. Defaults to core.windows.net.
-    description: ''
-  - name: --grant-workspace-msi-access
-    summary: Grants Workspace Managed Service Identity (MSI) access to the storage account. Defaults to False. This should be set if the storage account is in a VNet. If set to True, we will use the current user's identity to grant the Workspace MSI access to the storage account. It may take up to 5 minutes for the granted access to take effect so the first time you run this, it can fail. If such an event occurs, please rerun this command after 5 minutes. If this error persists, please contact Azure Support.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --protocol
-    defaultValue: https
-    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --sas-token
-    summary: A SAS token for the blob container.
-    description: ''
-  - name: --storage-account-resource-group
-    summary: The resource group of the storage account.
-    description: ''
-  - name: --storage-account-subscription-id
-    summary: The subscription ID of the storage account.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  name: az ml datastore attach-dbfs
-  summary: Attach a Databricks File System datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-  name: az ml datastore attach-file
-  summary: Attach a file share datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the storage account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --share-name -c
-    summary: The file share name.
-    description: ''
-  - name: --account-key -k
-    summary: The storage account key.
-    description: ''
-  - name: --endpoint
-    defaultValue: core.windows.net
-    summary: The endpoint of the storage account. Defaults to core.windows.net.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --protocol
-    defaultValue: https
-    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --sas-token
-    summary: A SAS token for the blob container.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  name: az ml datastore attach-mysqldb
-  summary: Attach an Azure MySQL datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --database-name -d
-    summary: The database name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --password -p
-    summary: The password.
-    description: ''
-  - isRequired: true
-    name: --server-name
-    summary: The SQL/PostgreSQL/MySQL server name.
-    description: ''
-  - isRequired: true
-    name: --user-id -u
-    summary: The user ID.
-    description: ''
-  - name: --endpoint
-    defaultValue: mysql.database.azure.com
-    summary: The endpoint of the server. Defaults to mysql.database.azure.com.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --port
-    defaultValue: "5432"
-    summary: The port number.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  name: az ml datastore attach-psqldb
-  summary: Attach an Azure PostgreSQL datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --database-name -d
-    summary: The database name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --password -p
-    summary: The password.
-    description: ''
-  - isRequired: true
-    name: --server-name
-    summary: The SQL/PostgreSQL/MySQL server name.
-    description: ''
-  - isRequired: true
-    name: --user-id -u
-    summary: The user ID.
-    description: ''
-  - name: --endpoint
-    defaultValue: postgres.database.azure.com
-    summary: The endpoint of the server. Defaults to postgres.database.azure.com.
-    description: ''
-  - name: --enforce-ssl
-    defaultValue: "1"
-    summary: This sets the ssl value of the server. Defaults to true if not set.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --port
-    defaultValue: "5432"
-    summary: The port number.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  name: az ml datastore attach-sqldb
-  summary: Attach an Azure SQL datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --database-name -d
-    summary: The database name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --server-name
-    summary: The SQL/PostgreSQL/MySQL server name.
-    description: ''
-  - name: --authority-url
-    defaultValue: <a href="https://login.microsoftonline.com">https://login.microsoftonline.com</a>
-    summary: Authority url used to authenticate the user.
-    description: ''
-  - name: --client-id
-    summary: The service principal/application ID.
-    description: ''
-  - name: --client-secret
-    summary: The service principal's secret.
-    description: ''
-  - name: --endpoint
-    defaultValue: database.windows.net
-    summary: The endpoint of the sql server. Defaults to database.windows.net.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --password
-    summary: The password of the database user to access the database.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --resource-url
-    defaultValue: <a href="https://database.windows.net/">https://database.windows.net/</a>
-    summary: Determines what operations will be performed on the database.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tenant-id
-    summary: The service principal Tenant ID.
-    description: ''
-  - name: --username
-    summary: The username of the database user to access the database.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_detach
-  name: az ml datastore detach
-  summary: Detach a datastore by name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_download
-  name: az ml datastore download
-  summary: Download files from a Datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --target-path -d
-    summary: Target path for the downloaded files.
-    description: ''
-  - name: --hide-progress
-    summary: Whether to hide progress of operation.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite target files if they exist.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --prefix -p
-    summary: Path filter for files to download. If none is provided, downloads everything.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_list
-  name: az ml datastore list
-  summary: List datastores in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_set_default
-  name: az ml datastore set-default
-  summary: Set the workspace default datastore by name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_show
-  name: az ml datastore show
-  summary: Show a single datastore by name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_show_default
-  name: az ml datastore show-default
-  summary: Show the workspace default datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_upload
-  name: az ml datastore upload
-  summary: Upload files to a Datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --src-path -p
-    summary: Path from which to upload data.
-    description: ''
-  - name: --hide-progress
-    summary: Whether to hide progress of operation.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite target files if they exist.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --target-path -u
-    summary: Path to upload data in the container. Uploads to the root by default.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-  name: az ml datastore attach-adls
-  summary: Attach an ADLS datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  name: az ml datastore attach-adls-gen2
-  summary: Attach a ADLS Gen2 datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-  name: az ml datastore attach-blob
-  summary: Attach a blob storage datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  name: az ml datastore attach-dbfs
-  summary: Attach a Databricks File System datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-  name: az ml datastore attach-file
-  summary: Attach a file share datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  name: az ml datastore attach-mysqldb
-  summary: Attach an Azure MySQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  name: az ml datastore attach-psqldb
-  summary: Attach an Azure PostgreSQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  name: az ml datastore attach-sqldb
-  summary: Attach an Azure SQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_detach
-  name: az ml datastore detach
-  summary: Detach a datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_download
-  name: az ml datastore download
-  summary: Download files from a Datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_list
-  name: az ml datastore list
-  summary: List datastores in the workspace.
-- uid: ext_azure-cli-ml_az_ml_datastore_set_default
-  name: az ml datastore set-default
-  summary: Set the workspace default datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show
-  name: az ml datastore show
-  summary: Show a single datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show_default
-  name: az ml datastore show-default
-  summary: Show the workspace default datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_upload
-  name: az ml datastore upload
-  summary: Upload files to a Datastore.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for managing and using datastores with the Azure ML Workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml
deleted file mode 100644
index 4993d1e9c9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_endpoint
-  name: az ml endpoint
-  summary: Manage machine learning endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-  name: az ml endpoint realtime
-  summary: Manage operationalized realtime endpoints.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage machine learning endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml
deleted file mode 100644
index 7eca24b277..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml
+++ /dev/null
@@ -1,660 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-  name: az ml endpoint realtime
-  summary: Manage operationalized realtime endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name.
-    description: ''
-  - isRequired: true
-    name: --version-name --vn
-    summary: The version name to create in an Endpoint.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --cvt --is-control-version-type
-    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON file containing deployment metadata.
-    description: ''
-  - name: --description -d
-    summary: Description of the service.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --is-default
-    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --tp --traffic-percentile
-    summary: The traffic percentile this version takes in Endpoint.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name.
-    description: ''
-  - isRequired: true
-    name: --version-name --vn
-    summary: The version name to delete.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --num_lines -l
-    defaultValue: "5000"
-    summary: Number of log lines to return from tail (default is 5000).
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --compute-type -c
-    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS', 'AKSENDPOINT').
-    description: ''
-  - name: --model-id
-    summary: If provided, will only show services that have the specified model id.
-    description: ''
-  - name: --model-name
-    summary: If provided, will only show services that have the specified model name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoints to list.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key -k
-    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --set-key -s
-    summary: Provide auth value for the specified key.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name to score against.
-    description: ''
-  - name: --input-data -d
-    summary: The data to use for calling the endpoint.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to run.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the endpoint to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name to update.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ae --auth-enabled
-    summary: Whether or not to enable key auth for this Endpoint. Defaults to False.
-    description: ''
-  - name: --ai --enable-app-insights
-    summary: Whether or not to enable AppInsights for this Endpoint. Defaults to False.
-    description: ''
-  - name: --description -d
-    summary: Description of the endpoint.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --remove-tag
-    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --token-auth-enabled
-    summary: Whether or not to enable token auth for this Endpoint. Defaults to False.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the Endpoint to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name.
-    description: ''
-  - isRequired: true
-    name: --version-name --vn
-    summary: The version name to create in an Endpoint.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --cvt --is-control-version-type
-    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON file containing deployment metadata.
-    description: ''
-  - name: --description -d
-    summary: Description of the service.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --is-default
-    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --tp --traffic-percentile
-    summary: The traffic percentile this version takes in Endpoint.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage operationalized realtime endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml
deleted file mode 100644
index 9cf7b12103..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_environment
-  name: az ml environment
-  summary: Commands to manage environments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_environment_download
-  - ext_azure-cli-ml_az_ml_environment_list
-  - ext_azure-cli-ml_az_ml_environment_register
-  - ext_azure-cli-ml_az_ml_environment_scaffold
-  - ext_azure-cli-ml_az_ml_environment_show
-- uid: ext_azure-cli-ml_az_ml_environment_download
-  name: az ml environment download
-  summary: Download an environment definition to a specified directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --directory -d
-    summary: Directory for the environment.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite any existing destination folder.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version -v
-    summary: Version of the environment.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_list
-  name: az ml environment list
-  summary: List environments in a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_register
-  name: az ml environment register
-  summary: Register an environment definition from a specified directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --directory -d
-    summary: Directory for the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_scaffold
-  name: az ml environment scaffold
-  summary: Scaffold the files for a default environment definition in the specified directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --directory -d
-    summary: Directory for the environment.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_show
-  name: az ml environment show
-  summary: Show an environment by name and optionally version.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version -v
-    summary: Version of the environment.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_environment_download
-  name: az ml environment download
-  summary: Download an environment definition to a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_list
-  name: az ml environment list
-  summary: List environments in a workspace.
-- uid: ext_azure-cli-ml_az_ml_environment_register
-  name: az ml environment register
-  summary: Register an environment definition from a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_scaffold
-  name: az ml environment scaffold
-  summary: Scaffold the files for a default environment definition in the specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_show
-  name: az ml environment show
-  summary: Show an environment by name and optionally version.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage environments.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml
deleted file mode 100644
index 3509b62cbc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_experiment
-  name: az ml experiment
-  summary: Commands to manage experiments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_experiment_list
-- uid: ext_azure-cli-ml_az_ml_experiment_list
-  name: az ml experiment list
-  summary: List experiments in a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_experiment_list
-  name: az ml experiment list
-  summary: List experiments in a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage experiments.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml
deleted file mode 100644
index 88033902ee..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_folder
-  name: az ml folder
-  summary: Folder subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_folder_attach
-- uid: ext_azure-cli-ml_az_ml_folder_attach
-  name: az ml folder attach
-  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_folder_attach
-  name: az ml folder attach
-  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Folder subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml
deleted file mode 100644
index 7b9816b654..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml
+++ /dev/null
@@ -1,663 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_model
-  name: az ml model
-  summary: Manage machine learning models.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_model_delete
-  - ext_azure-cli-ml_az_ml_model_deploy
-  - ext_azure-cli-ml_az_ml_model_download
-  - ext_azure-cli-ml_az_ml_model_list
-  - ext_azure-cli-ml_az_ml_model_package
-  - ext_azure-cli-ml_az_ml_model_profile
-  - ext_azure-cli-ml_az_ml_model_register
-  - ext_azure-cli-ml_az_ml_model_show
-  - ext_azure-cli-ml_az_ml_model_update
-- uid: ext_azure-cli-ml_az_ml_model_delete
-  name: az ml model delete
-  summary: Delete a model from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --model-id -i
-    summary: ID of model to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_deploy
-  name: az ml model deploy
-  summary: Deploy model(s) from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the service deployed.
-    description: ''
-  - name: --ae --auth-enabled
-    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
-    description: ''
-  - name: --ai --enable-app-insights
-    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --base-image --bi
-    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
-    description: ''
-  - name: --base-image-registry --ir
-    summary: Image registry that contains the base image.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --compute-target --ct
-    summary: Name of compute target. Only applicable when deploying to AKS.
-    description: ''
-  - name: --compute-type --cp
-    summary: Compute type of service to deploy.
-    description: ''
-  - name: --cuda-version --cv
-    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON or YAML file containing deployment metadata.
-    description: ''
-  - name: --description
-    summary: Description of the service deployed.
-    description: ''
-  - name: --dn --dns-name-label
-    summary: The dns name for this Webservice.
-    description: ''
-  - name: --ds --extra-docker-file-steps
-    summary: Path to local file containing additional Docker steps to run when setting up image.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --eg --enable-gpu
-    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --key-name
-    summary: Key name for for encryption properties in customer-managed keys (CMK) for ACI.
-    description: ''
-  - name: --key-version
-    summary: Key version for for encryption properties in customer-managed keys (CMK) for ACI.
-    description: ''
-  - name: --kp --primary-key
-    summary: A primary auth key to use for this Webservice.
-    description: ''
-  - name: --ks --secondary-key
-    summary: A secondary auth key to use for this Webservice.
-    description: ''
-  - name: --lo --location
-    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: <a href="https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances">https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances</a>.'
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --namespace
-    summary: "Kubernetes namespace in which to deploy the service: up to 63 lowercase alphanumeric ('a'-'z', '0'-'9') and hyphen ('-') characters. The first and last characters cannot be hyphens. Only applicable when deploying to AKS."
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite the existing service if name conflicts.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --pi --profile-input
-    summary: Path to a JSON file containing profiling results.
-    description: ''
-  - name: --po --port
-    summary: The local port on which to expose the service's HTTP endpoint.
-    description: ''
-  - name: --property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --rt --runtime
-    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
-    description: ''
-  - name: --sc --ssl-cname
-    summary: The cname for if SSL is enabled.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --se --ssl-enabled
-    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
-    description: ''
-  - name: --sk --ssl-key-pem-file
-    summary: The key file needed if SSL is enabled.
-    description: ''
-  - name: --sp --ssl-cert-pem-file
-    summary: The cert file needed if SSL is enabled.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subnet-name
-    summary: Name of the subnet inside the vnet.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --token-auth-enabled
-    summary: Whether or not to enable token auth for this Webservice. Ignored if not deploying to AKS. Defaults to False.
-    description: ''
-  - name: --tp --traffic-percentile
-    summary: The amount of traffic the version takes in an endpoint. Can be a decimal. Defaults to 0.
-    description: ''
-  - name: --vault-base-url
-    summary: Vault base url for encryption properties in customer-managed keys (CMK) for ACI.
-    description: ''
-  - name: --version-name --vn
-    summary: The version name in an endpoint. Defaults to endpoint name for the first version.
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_download
-  name: az ml model download
-  summary: Download a model from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --model-id -i
-    summary: ID of model.
-    description: ''
-  - isRequired: true
-    name: --target-dir -t
-    summary: Target directory to download the model file to.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite if the same name file exists in target directory.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing model to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_list
-  name: az ml model list
-  summary: List models in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --dataset-id
-    summary: If provided, will only show models with the specified dataset ID.
-    description: ''
-  - name: --model-name -n
-    summary: An optional model name to filter the list by.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --run-id
-    summary: If provided, will only show models with the specified Run ID.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing models to list.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_package
-  name: az ml model package
-  summary: Package a model in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the package.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for packaging. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for packaging.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for packaging.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be packaged. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --output-path
-    summary: Output path for docker context. If an output path is passed, instead of building an image in the workspace ACR, a dockerfile and the necessary build context will be writen to that path.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --rt --runtime
-    summary: Which runtime to use for package. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_profile
-  name: az ml model profile
-  summary: Profile model(s) in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the model profile.
-    description: ''
-  - name: --base-image --bi
-    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
-    description: ''
-  - name: --base-image-registry --ir
-    summary: Image registry that contains the base image.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: Double value for maximum CPU to use when profiling.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --description
-    summary: Description of the model profile.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --gb --memory-in-gb
-    summary: Double value for maximum Memory to use when profiling.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --idi --input-dataset-id
-    summary: ID of the Tabular Dataset to be used as input for the profile.
-    description: ''
-  - name: --input-data -d
-    summary: The data to use for calling the web service.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Path to a JSON file where profile results metadata will be written. Used as input for model deployment.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_register
-  name: az ml model register
-  summary: Register a model to the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of model to register.
-    description: ''
-  - name: --asset-path
-    summary: The cloud path where the experiement run stores the model file.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --description -d
-    summary: Description of the model.
-    description: ''
-  - name: --experiment-name
-    summary: The name of the experiment.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The default number of GPUs to allocate for this model.
-    description: ''
-  - name: --model-framework
-    summary: 'Framework of the model to register. Currently supported frameworks: TensorFlow, ScikitLearn, Onnx, Custom.'
-    description: ''
-  - name: --model-framework-version
-    summary: Framework version of the model to register (e.g. 1.0.0, 2.4.1).
-    description: ''
-  - name: --model-path -p
-    summary: Full path of the model file to register.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Path to a JSON file where model registration metadata will be written. Used as input for model deployment.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --run-id -r
-    summary: The ID for the experiment run where model is registered from.
-    description: ''
-  - name: --run-metadata-file -f
-    summary: Path to a JSON file containing experiement run metadata.
-    description: ''
-  - name: --sample-input-dataset-id
-    summary: The ID for the sample input dataset.
-    description: ''
-  - name: --sample-output-dataset-id
-    summary: The ID for the sample output dataset.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to register this model with.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_show
-  name: az ml model show
-  summary: Show a model in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --model-id -i
-    summary: ID of model to show.
-    description: ''
-  - name: --model-name -n
-    summary: Name of model to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --run-id
-    summary: If provided, will only show models with the specified Run ID.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version
-    summary: If provided, will only show models with the specified name and version.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing model to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_update
-  name: az ml model update
-  summary: Update a model in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --model-id -i
-    summary: ID of model.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --description
-    summary: Description to update the model with. Will replace the current description.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The default number of GPUs to allocate for this model.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --remove-tag
-    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --sample-input-dataset-id
-    summary: The ID for the sample input dataset.
-    description: ''
-  - name: --sample-output-dataset-id
-    summary: The ID for the sample output dataset.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_model_delete
-  name: az ml model delete
-  summary: Delete a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_deploy
-  name: az ml model deploy
-  summary: Deploy model(s) from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_download
-  name: az ml model download
-  summary: Download a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_list
-  name: az ml model list
-  summary: List models in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_package
-  name: az ml model package
-  summary: Package a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_profile
-  name: az ml model profile
-  summary: Profile model(s) in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_register
-  name: az ml model register
-  summary: Register a model to the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_show
-  name: az ml model show
-  summary: Show a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_update
-  name: az ml model update
-  summary: Update a model in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage machine learning models.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml
deleted file mode 100644
index 4912ab8524..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml
+++ /dev/null
@@ -1,619 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_pipeline
-  name: az ml pipeline
-  summary: Pipeline subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_pipeline_clone
-  - ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  - ext_azure-cli-ml_az_ml_pipeline_create
-  - ext_azure-cli-ml_az_ml_pipeline_create_draft
-  - ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  - ext_azure-cli-ml_az_ml_pipeline_disable
-  - ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_enable
-  - ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_get
-  - ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  - ext_azure-cli-ml_az_ml_pipeline_list
-  - ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  - ext_azure-cli-ml_az_ml_pipeline_list_steps
-  - ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  - ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  - ext_azure-cli-ml_az_ml_pipeline_show
-  - ext_azure-cli-ml_az_ml_pipeline_show_draft
-  - ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  - ext_azure-cli-ml_az_ml_pipeline_update_draft
-  - ext_azure-cli-ml_az_ml_pipeline_update_schedule
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone
-  name: az ml pipeline clone
-  summary: Generate yml definition describing the pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path -p
-    summary: File path to save pipeline yaml to.
-    description: ''
-  - isRequired: true
-    name: --pipeline-run-id -i
-    summary: ID of the PipelineRun to clone (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  name: az ml pipeline clone-draft
-  summary: Create a pipeline draft from an existing pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --experiment-name -e
-    summary: Experiment name of the specified PipelineRun.
-    description: ''
-  - name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to create PipelineDraft from.
-    description: ''
-  - name: --pipeline-id -p
-    summary: ID of the PublishedPipeline to create PipelineDraft from.
-    description: ''
-  - name: --pipeline-run-id -r
-    summary: ID of the PipelineRun to create PipelineDraft from.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_create
-  name: az ml pipeline create
-  summary: Create a pipeline from a yaml definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to assign to the pipeline.
-    description: ''
-  - isRequired: true
-    name: --pipeline-yaml -y
-    summary: YAML file which defines a pipeline.
-    description: ''
-  - name: --continue -c
-    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
-    description: ''
-  - name: --description -d
-    summary: Description text of the pipeline.
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --version -v
-    summary: Version string of the pipeline.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-  name: az ml pipeline create-draft
-  summary: Create a pipeline draft from a yml definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --experiment_name -e
-    summary: Experiment name for the pipeline draft.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to assign to the pipeline draft.
-    description: ''
-  - isRequired: true
-    name: --pipeline-yaml -y
-    summary: YAML file which defines the pipeline draft.
-    description: ''
-  - name: --continue -c
-    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
-    description: ''
-  - name: --description -d
-    summary: Description text of the pipeline draft.
-    description: ''
-  - name: --parameters
-    summary: PipelineParameters for the draft with 'key=value' syntax.
-    description: ''
-  - name: --properties -p
-    summary: Properties for the draft with 'key=value' syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --tags -t
-    summary: Tags for the draft with 'key=value' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  name: az ml pipeline create-schedule
-  summary: Create a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --experiment-name -e
-    summary: Name of experiment.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of schedule.
-    description: ''
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to create schedule (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --schedule-yaml -y
-    summary: Schedule  YAML input.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  name: az ml pipeline delete-draft
-  summary: Delete a pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to delete (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable
-  name: az ml pipeline disable
-  summary: Disable a pipeline from running.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to disable (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  name: az ml pipeline disable-schedule
-  summary: Disable a schedule from running.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable
-  name: az ml pipeline enable
-  summary: Enable a pipeline and allow it to run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to enable (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  name: az ml pipeline enable-schedule
-  summary: Enable a schedule and allow it to run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_get
-  name: az ml pipeline get
-  summary: Generate yml definition describing the pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path -p
-    summary: File path to save Pipeline yaml to.
-    description: ''
-  - name: --pipeline-draft-id -d
-    summary: ID of the PipelineDraft to get (guid).
-    description: ''
-  - name: --pipeline-id -i
-    summary: ID of the Pipeline to get (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  name: az ml pipeline last-pipeline-run
-  summary: Show last pipeline run for a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_list
-  name: az ml pipeline list
-  summary: List all pipelines and respective schedules in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  name: az ml pipeline list-drafts
-  summary: List pipeline drafts in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --tags -t
-    summary: Tags for a draft with 'key=value' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-  name: az ml pipeline list-steps
-  summary: List the step runs generated from a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  name: az ml pipeline pipeline-runs-list
-  summary: List pipeline runs generated from a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  name: az ml pipeline publish-draft
-  summary: Publish a pipeline draft as a published pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to publish.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_show
-  name: az ml pipeline show
-  summary: Show details of a pipeline and respective schedules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to show (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-  name: az ml pipeline show-draft
-  summary: Show details of a pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  name: az ml pipeline show-schedule
-  summary: Show details of a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  name: az ml pipeline submit-draft
-  summary: Submit a run from the pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to use to submit run.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-  name: az ml pipeline update-draft
-  summary: Update a pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --continue -c
-    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
-    description: ''
-  - name: --description -d
-    summary: Description text of the pipeline draft.
-    description: ''
-  - name: --experiment_name -e
-    summary: Experiment name for the pipeline draft.
-    description: ''
-  - name: --name -n
-    summary: Name to assign to the pipeline draft.
-    description: ''
-  - name: --parameters
-    summary: PipelineParameters for the draft with 'key=value' syntax.
-    description: ''
-  - name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to update.
-    description: ''
-  - name: --pipeline-yaml -y
-    summary: YAML file which defines the pipeline draft.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --tags -t
-    summary: Tags for the draft with 'key=value' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-  name: az ml pipeline update-schedule
-  summary: Update a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --name -n
-    summary: Name of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --schedule-yaml -y
-    summary: Schedule  YAML input.
-    description: ''
-  - name: --status -t
-    summary: Status of the schedule to show (guid).
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone
-  name: az ml pipeline clone
-  summary: Generate yml definition describing the pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  name: az ml pipeline clone-draft
-  summary: Create a pipeline draft from an existing pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create
-  name: az ml pipeline create
-  summary: Create a pipeline from a yaml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-  name: az ml pipeline create-draft
-  summary: Create a pipeline draft from a yml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  name: az ml pipeline create-schedule
-  summary: Create a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  name: az ml pipeline delete-draft
-  summary: Delete a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable
-  name: az ml pipeline disable
-  summary: Disable a pipeline from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  name: az ml pipeline disable-schedule
-  summary: Disable a schedule from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable
-  name: az ml pipeline enable
-  summary: Enable a pipeline and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  name: az ml pipeline enable-schedule
-  summary: Enable a schedule and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_get
-  name: az ml pipeline get
-  summary: Generate yml definition describing the pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  name: az ml pipeline last-pipeline-run
-  summary: Show last pipeline run for a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list
-  name: az ml pipeline list
-  summary: List all pipelines and respective schedules in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  name: az ml pipeline list-drafts
-  summary: List pipeline drafts in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-  name: az ml pipeline list-steps
-  summary: List the step runs generated from a pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  name: az ml pipeline pipeline-runs-list
-  summary: List pipeline runs generated from a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  name: az ml pipeline publish-draft
-  summary: Publish a pipeline draft as a published pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show
-  name: az ml pipeline show
-  summary: Show details of a pipeline and respective schedules.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-  name: az ml pipeline show-draft
-  summary: Show details of a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  name: az ml pipeline show-schedule
-  summary: Show details of a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  name: az ml pipeline submit-draft
-  summary: Submit a run from the pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-  name: az ml pipeline update-draft
-  summary: Update a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-  name: az ml pipeline update-schedule
-  summary: Update a schedule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Pipeline subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml
deleted file mode 100644
index 5970b6942f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml
+++ /dev/null
@@ -1,438 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_run
-  name: az ml run
-  summary: Commands for submitting, updating, and monitoring runs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_run_cancel
-  - ext_azure-cli-ml_az_ml_run_download_logs
-  - ext_azure-cli-ml_az_ml_run_list
-  - ext_azure-cli-ml_az_ml_run_monitor_logs
-  - ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  - ext_azure-cli-ml_az_ml_run_show
-  - ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  - ext_azure-cli-ml_az_ml_run_submit_pipeline
-  - ext_azure-cli-ml_az_ml_run_submit_script
-  - ext_azure-cli-ml_az_ml_run_update
-- uid: ext_azure-cli-ml_az_ml_run_cancel
-  name: az ml run cancel
-  summary: Cancel run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_download_logs
-  name: az ml run download-logs
-  summary: Download log files.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --output-dir -d
-    summary: Output directory to download log files to.
-    description: ''
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_list
-  name: az ml run list
-  summary: List runs.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --compute-target-name
-    summary: The compute target name.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --last
-    defaultValue: "10"
-    summary: Fetch the latest N elements.
-    description: ''
-  - name: --minimal
-    summary: Flag to provide minimum properties for run output.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --parent-run-id
-    summary: Parent Run ID.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --pipeline-run-id
-    summary: Pipeline Run ID.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --status
-    parameterValueGroup: Completed, Failed, Finalizing, Preparing, Provisioning, Queued, Running, Starting
-    summary: Status of the run.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tags
-    summary: Tags for a run with 'key[=value]' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-  name: az ml run monitor-logs
-  summary: Monitor the logs for an existing run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  name: az ml run monitor-tensorboard
-  summary: Monitor an existing run using tensorboard.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --local-directory
-    summary: Local Directory to stage tensorboard files being monitored.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_show
-  name: az ml run show
-  summary: Show run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  name: az ml run submit-hyperdrive
-  summary: Submit a hyper parameter sweep using run config.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hyperdrive-configuration-name
-    summary: The full name of the hyperdrive configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
-    description: ''
-  - name: --async
-    summary: Disable output streaming.
-    description: ''
-  - name: --conda-dependencies -d
-    summary: Override the default Conda dependencies file.
-    description: ''
-  - name: --ct --target
-    summary: The name of the compute target to use for the run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --run-configuration-name -c
-    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
-    description: ''
-  - name: --source-directory
-    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-  - name: <USER_SCRIPT_AND_ARGUMENTS>
-    summary: The run submit arguments, like script name and script arguments.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-  name: az ml run submit-pipeline
-  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --datapaths -d
-    summary: Comma-separated list of name=datastore/path pairs for datapath parameter assignments.
-    description: ''
-  - name: --experiment-name -n
-    summary: Experiment name for run submission. If unspecified, use the pipeline name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --output_file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --parameters -p
-    summary: Comma-separated list of name=value pairs for pipeline parameter assignments.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --pipeline-id -i
-    summary: ID of a pipeline to submit (guid).
-    description: ''
-  - name: --pipeline-yaml -y
-    summary: YAML file which defines a pipeline.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_submit_script
-  name: az ml run submit-script
-  summary: Submit a script for execution.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --async
-    summary: Disable output streaming.
-    description: ''
-  - name: --conda-dependencies -d
-    summary: Override the default Conda dependencies file.
-    description: ''
-  - name: --ct --target
-    summary: The name of the compute target to use for the run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --run-configuration-name -c
-    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
-    description: ''
-  - name: --source-directory
-    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-  - name: <USER_SCRIPT_AND_ARGUMENTS>
-    summary: The run submit arguments, like script name and script arguments.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_update
-  name: az ml run update
-  summary: Update the run by adding tags.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --add-tag
-    summary: Tag the entitiy with 'key[=value]' syntax.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_run_cancel
-  name: az ml run cancel
-  summary: Cancel run.
-- uid: ext_azure-cli-ml_az_ml_run_download_logs
-  name: az ml run download-logs
-  summary: Download log files.
-- uid: ext_azure-cli-ml_az_ml_run_list
-  name: az ml run list
-  summary: List runs.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-  name: az ml run monitor-logs
-  summary: Monitor the logs for an existing run.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  name: az ml run monitor-tensorboard
-  summary: Monitor an existing run using tensorboard.
-- uid: ext_azure-cli-ml_az_ml_run_show
-  name: az ml run show
-  summary: Show run.
-- uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  name: az ml run submit-hyperdrive
-  summary: Submit a hyper parameter sweep using run config.
-- uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-  name: az ml run submit-pipeline
-  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
-- uid: ext_azure-cli-ml_az_ml_run_submit_script
-  name: az ml run submit-script
-  summary: Submit a script for execution.
-- uid: ext_azure-cli-ml_az_ml_run_update
-  name: az ml run update
-  summary: Update the run by adding tags.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for submitting, updating, and monitoring runs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml
deleted file mode 100644
index 9a854f8340..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml
+++ /dev/null
@@ -1,477 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_service
-  name: az ml service
-  summary: Manage operationalized services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_service_delete
-  - ext_azure-cli-ml_az_ml_service_get_access_token
-  - ext_azure-cli-ml_az_ml_service_get_keys
-  - ext_azure-cli-ml_az_ml_service_get_logs
-  - ext_azure-cli-ml_az_ml_service_list
-  - ext_azure-cli-ml_az_ml_service_regen_key
-  - ext_azure-cli-ml_az_ml_service_run
-  - ext_azure-cli-ml_az_ml_service_show
-  - ext_azure-cli-ml_az_ml_service_update
-- uid: ext_azure-cli-ml_az_ml_service_delete
-  name: az ml service delete
-  summary: Delete a service from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The service name to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_get_access_token
-  name: az ml service get-access-token
-  summary: Get a token to issue requests a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_get_keys
-  name: az ml service get-keys
-  summary: Get keys to issue requests against a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_get_logs
-  name: az ml service get-logs
-  summary: Get logs for a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --num_lines -l
-    defaultValue: "5000"
-    summary: Number of log lines to return from tail (default is 5000).
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_list
-  name: az ml service list
-  summary: List services in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --compute-type -c
-    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS').
-    description: ''
-  - name: --image-digest
-    summary: If provided, will only show services that have the specified image digest.
-    description: ''
-  - name: --model-id
-    summary: If provided, will only show services that have the specified model id.
-    description: ''
-  - name: --model-name
-    summary: If provided, will only show services that have the specified model name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the services to list.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_regen_key
-  name: az ml service regen-key
-  summary: Regenerate keys for a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key -k
-    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --set-key -s
-    summary: Provide auth value for the specified key.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_run
-  name: az ml service run
-  summary: Run a service in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The service name to score against.
-    description: ''
-  - name: --input-data -d
-    summary: The data to use for calling the web service.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to run.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_show
-  name: az ml service show
-  summary: Show details for a service in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webservice to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_update
-  name: az ml service update
-  summary: Update a service in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The service name to update.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ae --auth-enabled
-    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
-    description: ''
-  - name: --ai --enable-app-insights
-    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --base-image --bi
-    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
-    description: ''
-  - name: --base-image-registry --ir
-    summary: Image registry that contains the base image.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --cuda-version --cv
-    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON file containing deployment metadata.
-    description: ''
-  - name: --description -d
-    summary: Description of the service.
-    description: ''
-  - name: --dn --dns-name-label
-    summary: The dns name for this Webservice.
-    description: ''
-  - name: --ds --extra-docker-file-steps
-    summary: Path to local file containing additional Docker steps to run when setting up image.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --eg --enable-gpu
-    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --kp --primary-key
-    summary: A primary auth key to use for this Webservice.
-    description: ''
-  - name: --ks --secondary-key
-    summary: A secondary auth key to use for this Webservice.
-    description: ''
-  - name: --lo --location
-    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: <a href="https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances">https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances</a>.'
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --po --port
-    summary: The local port on which to expose the service's HTTP endpoint.
-    description: ''
-  - name: --remove-tag
-    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --rt --runtime
-    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
-    description: ''
-  - name: --sc --ssl-cname
-    summary: The cname for if SSL is enabled. Only applicable when updating an ACI service.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --se --ssl-enabled
-    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
-    description: ''
-  - name: --sk --ssl-key-pem-file
-    summary: The key file needed if SSL is enabled.
-    description: ''
-  - name: --sp --ssl-cert-pem-file
-    summary: The cert file needed if SSL is enabled.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --token-auth-enabled
-    summary: Whether or not to enable token auth for this Webservice. Only available for AKS web services. Defaults to False.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_service_delete
-  name: az ml service delete
-  summary: Delete a service from the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_get_access_token
-  name: az ml service get-access-token
-  summary: Get a token to issue requests a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_keys
-  name: az ml service get-keys
-  summary: Get keys to issue requests against a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_logs
-  name: az ml service get-logs
-  summary: Get logs for a service.
-- uid: ext_azure-cli-ml_az_ml_service_list
-  name: az ml service list
-  summary: List services in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_regen_key
-  name: az ml service regen-key
-  summary: Regenerate keys for a service.
-- uid: ext_azure-cli-ml_az_ml_service_run
-  name: az ml service run
-  summary: Run a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_show
-  name: az ml service show
-  summary: Show details for a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_update
-  name: az ml service update
-  summary: Update a service in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage operationalized services.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml
deleted file mode 100644
index c2cda04f16..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_workspace
-  name: az ml workspace
-  summary: Workspace subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_workspace_create
-  - ext_azure-cli-ml_az_ml_workspace_delete
-  - ext_azure-cli-ml_az_ml_workspace_list
-  - ext_azure-cli-ml_az_ml_workspace_share
-  - ext_azure-cli-ml_az_ml_workspace_show
-  - ext_azure-cli-ml_az_ml_workspace_sync_keys
-  - ext_azure-cli-ml_az_ml_workspace_update
-- uid: ext_azure-cli-ml_az_ml_workspace_create
-  name: az ml workspace create
-  summary: Create a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-  - name: --application-insights
-    summary: Application Insights to be associated with this workspace.
-    description: ''
-  - name: --cmk-keyvault
-    summary: The key vault containing the customer managed key in the Azure resource ID format.
-    description: ''
-  - name: --container-registry
-    summary: Container Registry to be associated with this workspace.
-    description: ''
-  - name: --exist-ok
-    summary: Do not fail if workspace exists.
-    description: ''
-  - name: --friendly-name -f
-    summary: Friendly name for this workspace.
-    description: ''
-  - name: --hbi-workspace
-    summary: Specifies whether the customer data is of High Business Impact(HBI), i.e., contains sensitive business information.
-    description: ''
-  - name: --keyvault
-    summary: Key Vault to be associated with this workspace.
-    description: ''
-  - name: --location -l
-    summary: Location for resource.
-    description: ''
-  - name: --pe-auto-approval
-    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
-    description: ''
-  - name: --pe-name
-    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
-    description: ''
-  - name: --pe-resource-group
-    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
-    description: ''
-  - name: --pe-subnet-name
-    defaultValue: default
-    summary: Name of the existing subnet to create the workspace private endpoint in.
-    description: ''
-  - name: --pe-subscription-id
-    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
-    description: ''
-  - name: --pe-vnet-name
-    summary: Name of the existing vnet to create the workspace private endpoint in.
-    description: ''
-  - name: --resource-cmk-uri
-    summary: The key URI of the customer managed key to encrypt the data at rest.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --sku
-    defaultValue: basic
-    summary: SKU/edition of a workspace -can be a 'basic' workspace or a feature rich 'enterprise' workspace.
-    description: ''
-  - name: --storage-account
-    summary: Storage account to be associated with this workspace.
-    description: ''
-  - name: --yes -y
-    summary: Create a resource group for this workspace.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_delete
-  name: az ml workspace delete
-  summary: Delete a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --all-resources
-    summary: Deletes resources which this workspace depends on like storage, acr, kv and app insights.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the workspace deletion to complete.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_list
-  name: az ml workspace list
-  summary: List workspaces.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_share
-  name: az ml workspace share
-  summary: Share a workspace with another user with a given role.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --role
-    summary: Role to assign to this user.
-    description: ''
-  - isRequired: true
-    name: --user
-    summary: User with whom to share this workspace.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_show
-  name: az ml workspace show
-  summary: Show a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-  name: az ml workspace sync-keys
-  summary: Sync workspace keys  for dependent resources such as storage, acr, and app insights.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_update
-  name: az ml workspace update
-  summary: Update a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --description -d
-    summary: Description of this workspace.
-    description: ''
-  - name: --friendly-name -f
-    summary: Friendly name.
-    description: ''
-  - name: --image-build-compute
-    summary: Compute target for image build.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tags
-    summary: Tags associated with this workspace.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_workspace_create
-  name: az ml workspace create
-  summary: Create a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_delete
-  name: az ml workspace delete
-  summary: Delete a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_list
-  name: az ml workspace list
-  summary: List workspaces.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-  name: az ml workspace private-endpoint
-  summary: Workspace private endpoint subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_share
-  name: az ml workspace share
-  summary: Share a workspace with another user with a given role.
-- uid: ext_azure-cli-ml_az_ml_workspace_show
-  name: az ml workspace show
-  summary: Show a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-  name: az ml workspace sync-keys
-  summary: Sync workspace keys  for dependent resources such as storage, acr, and app insights.
-- uid: ext_azure-cli-ml_az_ml_workspace_update
-  name: az ml workspace update
-  summary: Update a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Workspace subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml
deleted file mode 100644
index 73fed00322..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-  name: az ml workspace private-endpoint
-  summary: Workspace private endpoint subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  - ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  - ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --pe-auto-approval
-    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
-    description: ''
-  - name: --pe-name
-    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
-    description: ''
-  - name: --pe-resource-group
-    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
-    description: ''
-  - name: --pe-subnet-name
-    defaultValue: default
-    summary: Name of the existing subnet to create the workspace private endpoint in.
-    description: ''
-  - name: --pe-subscription-id
-    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
-    description: ''
-  - name: --pe-vnet-name
-    summary: Name of the existing vnet to create the workspace private endpoint in.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --resource-id
-    summary: The resource id of the Private EndPoint Connection.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Workspace private endpoint subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts.yml
deleted file mode 100644
index f436ca3ad5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-- uid: ext_azure-devops_az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: ext_azure-devops_az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml
deleted file mode 100644
index 39e2b16c6e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_artifacts_universal_download
-  - ext_azure-devops_az_artifacts_universal_publish
-- uid: ext_azure-devops_az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --feed
-    summary: Name or ID of the feed.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the package, e.g. 'foo-package'.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Directory to place the package contents.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: Version of the package, e.g. 1.0.0.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --file-filter
-    summary: Wildcard filter for file download.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --scope
-    defaultValue: organization
-    parameterValueGroup: organization, project
-    summary: "Scope of the feed: 'project' if the feed was created in a project, and 'organization' otherwise."
-    description: ''
-- uid: ext_azure-devops_az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --feed
-    summary: Name or ID of the feed.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the package, e.g. 'foo-package'.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Directory containing the package contents.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: Version of the package, e.g. '1.0.0'.
-    description: ''
-  - name: --description -d
-    summary: Description of the package.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --scope
-    defaultValue: organization
-    parameterValueGroup: organization, project
-    summary: "Scope of the feed: 'project' if the feed was created in a project, and 'organization' otherwise."
-    description: ''
-commands:
-- uid: ext_azure-devops_az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: ext_azure-devops_az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Universal Packages.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards.yml
deleted file mode 100644
index dafe7d0924..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_query
-- uid: ext_azure-devops_az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-  description: Only supports flat queries.
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: The ID of an existing query.  Required unless --path or --wiql are specified.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: The path of an existing query.  Ignored if --id is specified.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --wiql
-    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-- uid: ext_azure-devops_az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: ext_azure-devops_az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-- uid: ext_azure-devops_az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-- uid: ext_azure-devops_az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: ext_azure-devops_az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-- uid: ext_azure-devops_az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-- uid: ext_azure-devops_az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-- uid: ext_azure-devops_az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: ext_azure-devops_az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: ext_azure-devops_az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: ext_azure-devops_az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: ext_azure-devops_az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area.yml
deleted file mode 100644
index a72ce13365..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: ext_azure-devops_az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage area paths.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/project.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/project.yml
deleted file mode 100644
index 58a23004d4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/project.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_area_project_create
-  - ext_azure-devops_az_boards_area_project_delete
-  - ext_azure-devops_az_boards_area_project_list
-  - ext_azure-devops_az_boards_area_project_show
-  - ext_azure-devops_az_boards_area_project_update
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the area.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an area. Creates an area at root level if --path is not specified. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --depth
-    defaultValue: "1"
-    summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Area ID.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-  description: Move area or update area name.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --child-id
-    summary: Move an existing area and add as child node for this area.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name of the area.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a project.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/team.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/team.yml
deleted file mode 100644
index 0ee6bd04a6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/area/team.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_area_team_add
-  - ext_azure-devops_az_boards_area_team_list
-  - ext_azure-devops_az_boards_area_team_remove
-  - ext_azure-devops_az_boards_area_team_update
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-  description: Every team needs to have a default area configured which can't be empty. Hence, you need to pass --set-as-default while adding first area to your team. You can later configure any other area which already added to team as default by using `az boards area team update -h` command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Add area to a team.
-    syntax:
-      content: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Area path. Example:ProjectNameAreaName.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-sub-areas
-    parameterValueGroup: false, true
-    summary: Include child nodes of this area.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --set-as-default
-    summary: 'Set this area path as default area for this team. Default: False.'
-    description: ''
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Area path. Example:ProjectNameAreaName.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-  description: Update any area to include/exclude sub areas OR Set already added area as default.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Area path. Example:ProjectNameAreaName.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-sub-areas
-    parameterValueGroup: false, true
-    summary: Include child nodes of this area.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --set-as-default
-    summary: 'Set as default team area path. Default: False.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a team.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration.yml
deleted file mode 100644
index 23c1e7bfa5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: ext_azure-devops_az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml
deleted file mode 100644
index fbd0b576f2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_iteration_project_create
-  - ext_azure-devops_az_boards_iteration_project_delete
-  - ext_azure-devops_az_boards_iteration_project_list
-  - ext_azure-devops_az_boards_iteration_project_show
-  - ext_azure-devops_az_boards_iteration_project_update
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the iteration.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --finish-date
-    summary: 'Finish date of the iteration. Example : "2019-06-21".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an iteration. Creates an iteration at root level if --path is not specified. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --start-date
-    summary: 'Start date of the iteration. Example : "2019-06-03".'
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --depth
-    defaultValue: "1"
-    summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Iteration ID.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-  description: Move iteration or update iteration details like name AND/OR start-date and finish-date.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --child-id
-    summary: Move an existing iteration and add as child node for this iteration.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --finish-date
-    summary: 'Finish date of the iteration. Example : "2019-06-21".'
-    description: ''
-  - name: --name
-    summary: New name of the iteration.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --start-date
-    summary: 'Start date of the iteration. Example : "2019-06-03".'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a project.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml
deleted file mode 100644
index b1756cf484..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml
+++ /dev/null
@@ -1,251 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_iteration_team_add
-  - ext_azure-devops_az_boards_iteration_team_list
-  - ext_azure-devops_az_boards_iteration_team_list_work_items
-  - ext_azure-devops_az_boards_iteration_team_remove
-  - ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  - ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  - ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  - ext_azure-devops_az_boards_iteration_team_show_default_iteration
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --timeframe
-    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration which needs to be set as backlog iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --default-iteration-macro
-    summary: 'Default iteration macro. Example: @CurrentIteration.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: Identifier of the iteration which needs to be set as default.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a team.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item.yml
deleted file mode 100644
index 674a811df0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_work_item_create
-  - ext_azure-devops_az_boards_work_item_delete
-  - ext_azure-devops_az_boards_work_item_show
-  - ext_azure-devops_az_boards_work_item_update
-- uid: ext_azure-devops_az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --title
-    summary: Title of the work item.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: Name of the work item type (e.g. Bug).
-    description: ''
-  - name: --area
-    summary: Area the work item is assigned to (e.g. Demos).
-    description: ''
-  - name: --assigned-to
-    summary: Name of the person the work item is assigned-to (e.g. fabrikam).
-    description: ''
-  - name: --description -d
-    summary: Description of the work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --discussion
-    summary: Comment to add to a discussion in a work item.
-    description: ''
-  - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
-    description: ''
-  - name: --iteration
-    summary: Iteration path of the work item (e.g. DemosIteration 1).
-    description: ''
-  - name: --open
-    summary: Open the work item in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --reason
-    summary: Reason for the state of the work item.
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Unique id of the work item.
-    description: ''
-  - name: --destroy
-    summary: Permanently delete this work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - name: --as-of
-    summary: "Work item details as of a particular date and time. Provide a date or date time string. Assumes local time zone. Example: '2019-01-20', '2019-01-20 00:20:00'. For UTC, append 'UTC' to the date time string, '2019-01-20 00:20:00 UTC'."
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --expand
-    defaultValue: all
-    parameterValueGroup: all, fields, links, none, relations
-    summary: The expand parameters for work item attributes.
-    description: ''
-  - name: --fields -f
-    summary: Comma-separated list of requested fields. Example:System.Id,System.AreaPath. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
-    description: ''
-  - name: --open
-    summary: Open the work item in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The id of the work item to update.
-    description: ''
-  - name: --area
-    summary: Area the work item is assigned to (e.g. Demos).
-    description: ''
-  - name: --assigned-to
-    summary: Name of the person the work item is assigned-to (e.g. fabrikam).
-    description: ''
-  - name: --description -d
-    summary: Description of the work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --discussion
-    summary: Comment to add to a discussion in a work item.
-    description: ''
-  - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
-    description: ''
-  - name: --iteration
-    summary: Iteration path of the work item (e.g. DemosIteration 1).
-    description: ''
-  - name: --open
-    summary: Open the work item in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --reason
-    summary: Reason for the state of the work item.
-    description: ''
-  - name: --state
-    summary: State of the work item (e.g. active).
-    description: ''
-  - name: --title
-    summary: Title of the work item.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: ext_azure-devops_az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: ext_azure-devops_az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: ext_azure-devops_az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: ext_azure-devops_az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml
deleted file mode 100644
index 904773fb3b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_work_item_relation_add
-  - ext_azure-devops_az_boards_work_item_relation_list_type
-  - ext_azure-devops_az_boards_work_item_relation_remove
-  - ext_azure-devops_az_boards_work_item_relation_show
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - isRequired: true
-    name: --relation-type
-    summary: 'Relation type to create. Example: parent, child.'
-    description: ''
-  - isRequired: true
-    name: --target-id
-    summary: 'ID(s) of work-items to create relation with.                          Multiple values can be passed comma separated. Example: 1,2.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - isRequired: true
-    name: --relation-type
-    summary: 'Relation type to remove. Example: parent, child.'
-    description: ''
-  - isRequired: true
-    name: --target-id
-    summary: 'ID(s) of work-items to remove relation from.                          Multiple values can be passed comma separated. Example: 1,2.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item relations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops.yml
deleted file mode 100644
index 76e64eccd4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops.yml
+++ /dev/null
@@ -1,405 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-  description: >-
-    Related Groups
-
-    az pipelines: Manage Azure Pipelines
-
-    az boards: Manage Azure Boards
-
-    az repos: Manage Azure Repos
-
-    az artifacts: Manage Azure Artifacts.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_configure
-  - ext_azure-devops_az_devops_feedback
-  - ext_azure-devops_az_devops_invoke
-  - ext_azure-devops_az_devops_login
-  - ext_azure-devops_az_devops_logout
-- uid: ext_azure-devops_az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --defaults -d
-    summary: Space separated 'name=value' pairs for common arguments defaults, e.g. '--defaults project=my-project-name organization=https://dev.azure.com/organizationName arg=value'. Use '' to clear the defaults, e.g. --defaults project=''.
-    description: ''
-  - name: --list -l
-    summary: Lists the contents of the config file.
-    description: ''
-  - name: --use-git-aliases
-    parameterValueGroup: false, true
-    summary: Set to 'true' to configure Git aliases global git config file (to enable commands like "git pr list"). Set to 'false' to remove any aliases set by the tool.
-    description: ''
-- uid: ext_azure-devops_az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_azure-devops_az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Discover areas related to 'Wiki'
-    syntax:
-      content: az devops invoke --query "[?contains(area,'wiki')]"
-  - summary: Get all wikis in a project
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
-
-        az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
-  - summary: Add page to a wiki
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
-
-        wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
-
-        --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
-
-        az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
-
-        wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
-
-        --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
-  parameters:
-  - name: --accept-media-type
-    defaultValue: application/json
-    summary: Specifies the content type of the response.
-    description: ''
-  - name: --api-version
-    defaultValue: "5.0"
-    summary: The version of the API to target.
-    description: ''
-  - name: --area
-    summary: The area to find the resource.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the input file. Used in conjunction with --in-file.
-    description: ''
-  - name: --http-method
-    defaultValue: GET
-    parameterValueGroup: DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT
-    summary: Specifies the method used for the request.
-    description: ''
-  - name: --in-file
-    summary: Path and file name to the file that contains the contents of the request.
-    description: ''
-  - name: --media-type
-    defaultValue: application/json
-    summary: Specifies the content type of the request.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --out-file
-    summary: Path and file name to the file  for which this function saves the response body.
-    description: ''
-  - name: --query-parameters
-    summary: Specifies the list of query parameters.
-    description: ''
-  - name: --resource
-    summary: The name of the resource to operate on.
-    description: ''
-  - name: --route-parameters
-    summary: Specifies the list of route parameters.
-    description: ''
-- uid: ext_azure-devops_az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-  description: Refer <a href="https://aka.ms/azure-devops-cli-auth">https://aka.ms/azure-devops-cli-auth</a> for more information on providing PAT as input.
-  langs:
-  - azurecli
-  parameters:
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName">https://dev.azure.com/MyOrganizationName</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>. If no organization is specified, all organizations will be logged out.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-- uid: ext_azure-devops_az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-- uid: ext_azure-devops_az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-- uid: ext_azure-devops_az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-- uid: ext_azure-devops_az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: ext_azure-devops_az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: ext_azure-devops_az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: ext_azure-devops_az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: ext_azure-devops_az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: ext_azure-devops_az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: ext_azure-devops_az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-- uid: ext_azure-devops_az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-- uid: ext_azure-devops_az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-- uid: ext_azure-devops_az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-- uid: ext_azure-devops_az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-- uid: ext_azure-devops_az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-- uid: ext_azure-devops_az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: ext_azure-devops_az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: ext_azure-devops_az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: ext_azure-devops_az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-- uid: ext_azure-devops_az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-- uid: ext_azure-devops_az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-- uid: ext_azure-devops_az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: ext_azure-devops_az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: ext_azure-devops_az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-- uid: ext_azure-devops_az_devops_team
-  name: az devops team
-  summary: Manage teams.
-- uid: ext_azure-devops_az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: ext_azure-devops_az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: ext_azure-devops_az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: ext_azure-devops_az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: ext_azure-devops_az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: ext_azure-devops_az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-- uid: ext_azure-devops_az_devops_user
-  name: az devops user
-  summary: Manage users.
-- uid: ext_azure-devops_az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: ext_azure-devops_az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: ext_azure-devops_az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: ext_azure-devops_az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: ext_azure-devops_az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-- uid: ext_azure-devops_az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-- uid: ext_azure-devops_az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: ext_azure-devops_az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: ext_azure-devops_az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: ext_azure-devops_az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: ext_azure-devops_az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Related Groups
-
-  az pipelines: Manage Azure Pipelines
-
-  az boards: Manage Azure Boards
-
-  az repos: Manage Azure Repos
-
-  az artifacts: Manage Azure Artifacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin.yml
deleted file mode 100644
index a3c6015232..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage administration operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml
deleted file mode 100644
index 773057d8e8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_admin_banner_add
-  - ext_azure-devops_az_devops_admin_banner_list
-  - ext_azure-devops_az_devops_admin_banner_remove
-  - ext_azure-devops_az_devops_admin_banner_show
-  - ext_azure-devops_az_devops_admin_banner_update
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --message -m
-    summary: Message (string) to show in the banner.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --expiration
-    summary: 'Date/time when the banner should no longer be presented to users. If not set, the banner does not automatically expire and must be removed with the remove command. Example : "2019-06-10 17:21:00 UTC", "2019-06-10".'
-    description: ''
-  - name: --id
-    summary: Identifier for the new banner. This identifier is needed to change or remove the message later. A unique identifier is automatically created if one is not specified.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --type -t
-    parameterValueGroup: error, info, warning
-    summary: Type of banner to present. Defaults is "info".
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the banner to remove.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier for the banner.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the banner to update.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --expiration
-    summary: 'Date/time when the banner should no longer be presented to users. To unset the expiration for the banner, supply an empty value to this argument. Example : "2019-06-10 17:21:00 UTC", "2019-06-10".'
-    description: ''
-  - name: --message -m
-    summary: Message (string) to show in the banner.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --type -t
-    parameterValueGroup: error, info, warning
-    summary: Type of banner to present. Defaults is "info".
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage organization banner.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/extension.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/extension.yml
deleted file mode 100644
index a03ab09330..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/extension.yml
+++ /dev/null
@@ -1,200 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_extension_disable
-  - ext_azure-devops_az_devops_extension_enable
-  - ext_azure-devops_az_devops_extension_install
-  - ext_azure-devops_az_devops_extension_list
-  - ext_azure-devops_az_devops_extension_search
-  - ext_azure-devops_az_devops_extension_show
-  - ext_azure-devops_az_devops_extension_uninstall
-- uid: ext_azure-devops_az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-built-in
-    parameterValueGroup: false, true
-    summary: Include built in extensions.
-    description: ''
-  - name: --include-disabled
-    parameterValueGroup: false, true
-    summary: Include disabled extensions.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --search-query -q
-    summary: Search term.
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: ext_azure-devops_az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: ext_azure-devops_az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: ext_azure-devops_az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: ext_azure-devops_az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: ext_azure-devops_az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: ext_azure-devops_az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage extensions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/project.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/project.yml
deleted file mode 100644
index 86ba9fc229..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/project.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_project_create
-  - ext_azure-devops_az_devops_project_delete
-  - ext_azure-devops_az_devops_project_list
-  - ext_azure-devops_az_devops_project_show
-- uid: ext_azure-devops_az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the new project.
-    description: ''
-  - name: --description -d
-    summary: Description for the new project.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the team project in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --process -p
-    summary: Process to use. Default if not specified.
-    description: ''
-  - name: --source-control -s
-    defaultValue: git
-    parameterValueGroup: git, tfvc
-    summary: Source control type of the initial code repository created.
-    description: ''
-  - name: --visibility
-    defaultValue: private
-    parameterValueGroup: private, public
-    summary: Project visibility.
-    description: ''
-- uid: ext_azure-devops_az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The id of the project to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --continuation-token
-    summary: Continuation token. This can be retrived from previous run of this command if more results are present.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --get-default-team-image-url
-    parameterValueGroup: false, true
-    summary: Whether to get default team image url or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --skip
-    summary: Number of results to skip.
-    description: ''
-  - name: --state-filter
-    defaultValue: all
-    parameterValueGroup: all, createPending, deleted, deleting, new, unchanged, wellFormed
-    summary: State filter.
-    description: ''
-  - name: --top
-    summary: Maximum number of results to list.
-    description: ''
-- uid: ext_azure-devops_az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the team project in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: ext_azure-devops_az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: ext_azure-devops_az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: ext_azure-devops_az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage team projects.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security.yml
deleted file mode 100644
index 8be0ac9c2b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security related operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group.yml
deleted file mode 100644
index d7d8838832..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_group_create
-  - ext_azure-devops_az_devops_security_group_delete
-  - ext_azure-devops_az_devops_security_group_list
-  - ext_azure-devops_az_devops_security_group_show
-  - ext_azure-devops_az_devops_security_group_update
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an Azure DevOps Group with name and description
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
-
-        --description 'Something to describe this group'
-  - summary: Add an existing AAD group to an Azure DevOps group
-    syntax:
-      content: >-
-        Get object ID of an existing AAD group
-
-        az ad group show -g '{Group Name}'
-
-        az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
-  - summary: Add an existing AAD group to an Azure DevOps group with AAD group Email ID
-    syntax:
-      content: >-
-        az devops security group create --email-id '{Email ID of AAD group}'
-
-        --groups 'vssgp.someDescriptorForGroup'
-  - summary: Create a new Azure DevOps group and add it to existing Azure DevOps groups.
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
-
-        --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
-  parameters:
-  - name: --description
-    summary: Description of Azure DevOps group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --email-id
-    summary: Create new group using the mail address as a reference to an existing group from an external AD or AAD backed provider. Required if name or origin-id is missing.
-    description: ''
-  - name: --groups
-    summary: A comma separated list of descriptors referencing groups you want the newly created group to join.
-    description: ''
-  - name: --name
-    summary: Name of Azure DevOps group.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --origin-id
-    summary: Create new group using the OriginID as a reference to an existing group from an external AD or AAD backed provider. Required if name or email-id is missing.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project in which Azure DevOps group should be created.
-    description: ''
-  - name: --scope
-    defaultValue: project
-    parameterValueGroup: organization, project
-    summary: Create group at project or organization level.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Descriptor of the group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --continuation-token
-    summary: If there are more results that can't be returned in a single page, the result set will contain a continuation token for retrieval of the next set of results.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: List groups for a particular project.
-    description: ''
-  - name: --scope
-    defaultValue: project
-    parameterValueGroup: organization, project
-    summary: List groups at project or organization level.
-    description: ''
-  - name: --subject-types
-    summary: A comma separated list of user subject subtypes to reduce the retrieved results. You can give initial part of descriptor [before the dot] as a filter e.g. vssgp,aadgp.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Descriptor of the group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Descriptor of the group.
-    description: ''
-  - name: --description
-    summary: New description for Azure DevOps group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name for Azure DevOps group.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml
deleted file mode 100644
index 0eeb72191e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_group_membership_add
-  - ext_azure-devops_az_devops_security_group_membership_list
-  - ext_azure-devops_az_devops_security_group_membership_remove
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id
-    summary: Descriptor of the group to which member needs to be added.
-    description: ''
-  - isRequired: true
-    name: --member-id
-    summary: Descriptor of the group or Email Id of the user to be added. User should already be a part of the organization. Use `az devops user add` command to add an user to organization.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Group descriptor or User Email whose membership details are required.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --relationship
-    defaultValue: members
-    parameterValueGroup: memberof, members
-    summary: Get member of/members for this group.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id
-    summary: Descriptor of the group from which member needs to be removed.
-    description: ''
-  - isRequired: true
-    name: --member-id
-    summary: Descriptor of the group or Email Id of the user to be removed.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage memberships for security groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml
deleted file mode 100644
index 24aef7bed8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_permission_list
-  - ext_azure-devops_az_devops_security_permission_reset
-  - ext_azure-devops_az_devops_security_permission_reset_all
-  - ext_azure-devops_az_devops_security_permission_show
-  - ext_azure-devops_az_devops_security_permission_update
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --recurse
-    summary: If true and this is a hierarchical namespace, return child ACLs of the specified token.
-    description: ''
-  - name: --token
-    summary: Security token.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --permission-bit
-    summary: Permission bit or addition of permission bits which needs to be reset                         for given user/group and token.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-  description: Learn more at <a href="https://aka.ms/azure-devops-cli-security-permission">https://aka.ms/azure-devops-cli-security-permission</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Assign view, edit and delete permission for team projects.
-    syntax:
-      content: >-
-        az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
-
-
-        You would need to add the bit value of the various permission bits to
-
-        simultaneously allow/deny multiple permissions.
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --allow-bit
-    summary: Allow bit or addition of bits. Required if --deny-bit is missing.
-    description: ''
-  - name: --deny-bit
-    summary: Deny bit or addition of bits. Required if --allow-bit is missing.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --merge
-    defaultValue: "1"
-    parameterValueGroup: false, true
-    summary: If set, the existing ACE has its allow and deny merged with                          the incoming ACE's allow and deny. If unset, the existing ACE is displaced.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security permissions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml
deleted file mode 100644
index 2b43b3ba75..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_permission_namespace_list
-  - ext_azure-devops_az_devops_security_permission_namespace_show
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --local-only
-    summary: If true, retrieve only local security namespaces.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security namespaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml
deleted file mode 100644
index 26e43a4c41..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_service_endpoint_create
-  - ext_azure-devops_az_devops_service_endpoint_delete
-  - ext_azure-devops_az_devops_service_endpoint_list
-  - ext_azure-devops_az_devops_service_endpoint_show
-  - ext_azure-devops_az_devops_service_endpoint_update
-- uid: ext_azure-devops_az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-  description: You can learn more about this at <a href="https://aka.ms/azure-devops-service-endpoint-config">https://aka.ms/azure-devops-service-endpoint-config</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --service-endpoint-configuration
-    summary: Configuration file with service endpoint request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the input file.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Id of the service endpoint to delete.
-    description: ''
-  - name: --deep
-    summary: Specific to AzureRM endpoint created in Automatic flow. When it is specified, this will also delete corresponding AAD application in Azure.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-  description: rtypelist of VssJsonCollectionWrapper.
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the service endpoint.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the service endpoint.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enable-for-all
-    parameterValueGroup: false, true
-    summary: Allow all pipelines to access this service endpoint.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: ext_azure-devops_az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: ext_azure-devops_az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage service endpoints/connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml
deleted file mode 100644
index 58c134033c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_service_endpoint_azurerm_create
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --azure-rm-service-principal-id
-    summary: Service principal id for creating azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --azure-rm-subscription-id
-    summary: Subscription id for azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --azure-rm-subscription-name
-    summary: Name of azure subscription for azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --azure-rm-tenant-id
-    summary: Tenant id for creating azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of service endpoint to create.
-    description: ''
-  - name: --azure-rm-service-principal-certificate-path
-    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:&lt;password_here&gt;". More details : <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure RM service endpoints/connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml
deleted file mode 100644
index a95ea73210..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_service_endpoint_github_create
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-service-endpoint">https://aka.ms/azure-devops-cli-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --github-url
-    summary: Url for github for creating service endpoint.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of service endpoint to create.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage GitHub service endpoints/connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/team.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/team.yml
deleted file mode 100644
index eb33935f00..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/team.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_team
-  name: az devops team
-  summary: Manage teams.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_team_create
-  - ext_azure-devops_az_devops_team_delete
-  - ext_azure-devops_az_devops_team_list
-  - ext_azure-devops_az_devops_team_list_member
-  - ext_azure-devops_az_devops_team_show
-  - ext_azure-devops_az_devops_team_update
-- uid: ext_azure-devops_az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the new team.
-    description: ''
-  - name: --description
-    summary: Description of the new team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The id of the team to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --skip
-    summary: Number of teams to skip.
-    description: ''
-  - name: --top
-    summary: Maximum number of teams to return.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team to show members of.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --skip
-    summary: Number of members to skip.
-    description: ''
-  - name: --top
-    summary: Maximum number of members to return.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team to show.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team to be updated.
-    description: ''
-  - name: --description
-    summary: New description of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name of the team.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: ext_azure-devops_az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: ext_azure-devops_az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: ext_azure-devops_az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: ext_azure-devops_az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: ext_azure-devops_az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage teams.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/user.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/user.yml
deleted file mode 100644
index 6922f49706..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/user.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_user
-  name: az devops user
-  summary: Manage users.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_user_add
-  - ext_azure-devops_az_devops_user_list
-  - ext_azure-devops_az_devops_user_remove
-  - ext_azure-devops_az_devops_user_show
-  - ext_azure-devops_az_devops_user_update
-- uid: ext_azure-devops_az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email-id
-    summary: Email ID of the user.
-    description: ''
-  - isRequired: true
-    name: --license-type
-    parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
-    summary: License type for the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --send-email-invite
-    parameterValueGroup: false, true
-    summary: Whether to send email invite for new user or not.
-    description: ''
-- uid: ext_azure-devops_az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --skip
-    summary: 'Offset: Number of records to skip.'
-    description: ''
-  - name: --top
-    defaultValue: "100"
-    summary: Maximum number of users to return. Max value is 10000.
-    description: ''
-- uid: ext_azure-devops_az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --user
-    summary: Email ID or ID of the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --user
-    summary: Email ID or ID of the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --license-type
-    parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
-    summary: License type for the user.
-    description: ''
-  - isRequired: true
-    name: --user
-    summary: Email ID or ID of the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: ext_azure-devops_az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: ext_azure-devops_az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: ext_azure-devops_az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: ext_azure-devops_az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage users.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki.yml
deleted file mode 100644
index 2677cf8f99..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_wiki_create
-  - ext_azure-devops_az_devops_wiki_delete
-  - ext_azure-devops_az_devops_wiki_list
-  - ext_azure-devops_az_devops_wiki_show
-- uid: ext_azure-devops_az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a project wiki
-    syntax:
-      content: az devops wiki create --name myprojectwiki
-  - summary: Create a code wiki from a folder in a code repository
-    syntax:
-      content: >-
-        az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
-
-        --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --mapped-path
-    summary: "[Required for codewiki type] Mapped path of the new wiki e.g. '/' to publish from root of repository."
-    description: ''
-  - name: --name
-    summary: Name of the new wiki.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: '[Required for codewiki type] Name or ID of the repository to publish the wiki from.'
-    description: ''
-  - name: --type --wiki-type
-    defaultValue: projectwiki
-    parameterValueGroup: codewiki, projectwiki
-    summary: Type of wiki to create.
-    description: ''
-  - name: --version -v
-    summary: '[Required for codewiki type] Repository branch name to publish the code wiki from.'
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all wikis for a project
-    syntax:
-      content: az devops wiki list
-  - summary: List all wikis in the organization
-    syntax:
-      content: az devops wiki list --scope organization
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --scope
-    defaultValue: project
-    parameterValueGroup: organization, project
-    summary: List the wikis at project or organization level.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the wiki in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: ext_azure-devops_az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: ext_azure-devops_az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: ext_azure-devops_az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: ext_azure-devops_az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wikis.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml
deleted file mode 100644
index cb894d4d75..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml
+++ /dev/null
@@ -1,206 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_wiki_page_create
-  - ext_azure-devops_az_devops_wiki_page_delete
-  - ext_azure-devops_az_devops_wiki_page_show
-  - ext_azure-devops_az_devops_wiki_page_update
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
-  - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with content from a file
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --comment
-    defaultValue: Added a new page using Azure DevOps CLI
-    summary: Comment in the commit message of file add operation.
-    description: ''
-  - name: --content
-    summary: Content of the wiki page. Ignored if --file-path is specified.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the file. Used in conjunction with --file-path parameter.
-    description: ''
-  - name: --file-path
-    summary: Path of the file input if content is specified in the file.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --comment
-    defaultValue: Deleted the page using Azure DevOps CLI
-    summary: Comment in the commit message of delete operation.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-content
-    summary: Include content of the page.
-    description: ''
-  - name: --open
-    summary: Open the wiki page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --version -v
-    summary: Version (ETag) of the wiki page.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update content of page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  - summary: Update content of page with path 'my page' in a wiki with content from a file
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: Version (ETag) of file to edit.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --comment
-    defaultValue: Updated the page using Azure DevOps CLI
-    summary: Comment in the commit message of file edit operation.
-    description: ''
-  - name: --content
-    summary: Content of the wiki page. Ignored if --file-path is specified.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the file. Used in conjunction with --file-path parameter.
-    description: ''
-  - name: --file-path
-    summary: Path of the file input if content is specified in the file.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wiki pages.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/index.yml
deleted file mode 100644
index a6a06abd41..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/index.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az
-  name: azure-devops
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-- uid: ext_azure-devops_az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-- uid: ext_azure-devops_az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-- uid: ext_azure-devops_az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-- uid: ext_azure-devops_az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines.yml
deleted file mode 100644
index ed2f37c678..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines.yml
+++ /dev/null
@@ -1,479 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_create
-  - ext_azure-devops_az_pipelines_delete
-  - ext_azure-devops_az_pipelines_list
-  - ext_azure-devops_az_pipelines_run
-  - ext_azure-devops_az_pipelines_show
-  - ext_azure-devops_az_pipelines_update
-- uid: ext_azure-devops_az_pipelines_create
-  name: az pipelines create
-  summary: Create a new Azure Pipeline (YAML based).
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an Azure Pipeline from local checkout repository context
-    syntax:
-      content: >-
-        Repository name/url (--repository), type (--repository-type) and branch name (--branch) will be detected from the local git repository
-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-  - summary: Create an Azure Pipeline for a repository hosted on Github using clone url
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository https://github.com/SampleOrg/SampleRepo --branch master
-  - summary: Create an Azure Pipeline for a repository hosted on Github organization SampleOrg, repository name SampleRepo
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository SampleOrg/SampleRepoName --branch master --repository-type github
-  - summary: Create an Azure Pipeline for a repository hosted in a Azure Repo in the same project
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository SampleRepoName --branch master --repository-type tfsgit
-  - summary: Create an Azure Pipeline for a repository with the pipeline yaml already checked in into the repository
-    syntax:
-      content: >-
-        Service connection required for non Azure Repos can be optionally provided in the command to run it non interatively
-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository https://github.com/SampleOrg/SampleRepo --branch master --yml-path azure-pipelines.yml [--service-connection SERVICE_CONNECTION]
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the new pipeline.
-    description: ''
-  - name: --branch
-    summary: Branch name for which the pipeline will be configured. If omitted, it will be auto-detected from local repository.
-    description: ''
-  - name: --description
-    summary: Description for the new pipeline.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: Path of the folder where the pipeline needs to be created. Default is root folder. e.g. "user1/test_pipelines".
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-id
-    summary: Id of the queue in the available agent pools. Will be auto detected if not specified.
-    description: ''
-  - name: --repository
-    summary: Repository for which the pipeline needs to be configured. Can be clone url of the git repository or name of the repository for a Azure Repos or Owner/RepoName in case of GitHub repository. If omitted it will be auto-detected from the remote url of local git repository. If name is mentioned instead of url, --repository-type argument is also required.
-    description: ''
-  - name: --repository-type
-    parameterValueGroup: github, tfsgit
-    summary: Type of repository. If omitted, it will be auto-detected from remote url of local repository. 'tfsgit' for Azure Repos, 'github' for GitHub repository.
-    description: ''
-  - name: --service-connection
-    summary: Id of the Service connection created for the repository for GitHub repository. Use command az devops service-endpoint -h for creating/listing service_connections. Not required for Azure Repos.
-    description: ''
-  - name: --skip-first-run --skip-run
-    parameterValueGroup: false, true
-    summary: Specify this flag to prevent the first run being triggered by the command. Command will return a pipeline if run is skipped else it will output a pipeline run.
-    description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo (if yaml is already present in the repo).
-    description: ''
-- uid: ext_azure-devops_az_pipelines_delete
-  name: az pipelines delete
-  summary: Delete a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pipeline.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_list
-  name: az pipelines list
-  summary: List pipelines.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: If specified, filters to definitions under this folder.
-    description: ''
-  - name: --name
-    summary: 'Limit results to pipelines with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    parameterValueGroup: ModifiedAsc, ModifiedDesc, NameAsc, NameDesc, None
-    summary: Order of the results.
-    description: ''
-  - name: --repository
-    summary: Limit results to pipelines associated with this repository.
-    description: ''
-  - name: --repository-type
-    parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
-    summary: Limit results to pipelines associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
-    description: ''
-  - name: --top
-    summary: Maximum number of pipelines to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_run
-  name: az pipelines run
-  summary: Queue (run) a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: 'Name of the branch on which the pipeline run is to be queued. Example: refs/heads/master or master or refs/pull/1/merge.'
-    description: ''
-  - name: --commit-id
-    summary: Commit-id on which the pipeline run is to be queued.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: Folder path of pipeline. Default is root level folder.
-    description: ''
-  - name: --id
-    summary: ID of the pipeline to queue. Required if --name is not supplied.
-    description: ''
-  - name: --name
-    summary: Name of the pipeline to queue. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the pipeline results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_show
-  name: az pipelines show
-  summary: Get the details of a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: Folder path of pipeline. Default is root level folder.
-    description: ''
-  - name: --id
-    summary: ID of the pipeline.
-    description: ''
-  - name: --name
-    summary: Name of the pipeline. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the pipeline summary page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_update
-  name: az pipelines update
-  summary: Update a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: Branch name for which the pipeline will be configured.
-    description: ''
-  - name: --description
-    summary: New description for the pipeline.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: Id of the pipeline to update.
-    description: ''
-  - name: --name
-    summary: Name of the pipeline to update.
-    description: ''
-  - name: --new-folder-path
-    summary: New full path of the folder to move the pipeline to. e.g. "user1/production_pipelines".
-    description: ''
-  - name: --new-name
-    summary: New updated name of the pipeline.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-id
-    summary: Queue id of the agent pool where the pipeline needs to run.
-    description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-- uid: ext_azure-devops_az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: ext_azure-devops_az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-- uid: ext_azure-devops_az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-- uid: ext_azure-devops_az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: ext_azure-devops_az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: ext_azure-devops_az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: ext_azure-devops_az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: ext_azure-devops_az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-- uid: ext_azure-devops_az_pipelines_create
-  name: az pipelines create
-  summary: Create a new Azure Pipeline (YAML based).
-- uid: ext_azure-devops_az_pipelines_delete
-  name: az pipelines delete
-  summary: Delete a pipeline.
-- uid: ext_azure-devops_az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-- uid: ext_azure-devops_az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: ext_azure-devops_az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: ext_azure-devops_az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: ext_azure-devops_az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-- uid: ext_azure-devops_az_pipelines_list
-  name: az pipelines list
-  summary: List pipelines.
-- uid: ext_azure-devops_az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-- uid: ext_azure-devops_az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: ext_azure-devops_az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-- uid: ext_azure-devops_az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-- uid: ext_azure-devops_az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: ext_azure-devops_az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-- uid: ext_azure-devops_az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-- uid: ext_azure-devops_az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: ext_azure-devops_az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: ext_azure-devops_az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: ext_azure-devops_az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-- uid: ext_azure-devops_az_pipelines_run
-  name: az pipelines run
-  summary: Queue (run) a pipeline.
-- uid: ext_azure-devops_az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-- uid: ext_azure-devops_az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: ext_azure-devops_az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_show
-  name: az pipelines show
-  summary: Get the details of a pipeline.
-- uid: ext_azure-devops_az_pipelines_update
-  name: az pipelines update
-  summary: Update a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-- uid: ext_azure-devops_az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-- uid: ext_azure-devops_az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: ext_azure-devops_az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: ext_azure-devops_az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml
deleted file mode 100644
index 815daa9bca..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_agent_list
-  - ext_azure-devops_az_pipelines_agent_show
-- uid: ext_azure-devops_az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pool-id
-    summary: The agent pool containing the agents.
-    description: ''
-  - name: --agent-name
-    summary: Filter on agent name.
-    description: ''
-  - name: --demands
-    summary: Filter by demands the agents can satisfy. Comma separated list.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-assigned-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' current work.
-    description: ''
-  - name: --include-capabilities
-    parameterValueGroup: false, true
-    summary: Whether to include the agents' capabilities in the response.
-    description: ''
-  - name: --include-last-completed-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' most recent completed work.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --agent-id --id
-    summary: The agent ID to get information about.
-    description: ''
-  - isRequired: true
-    name: --pool-id
-    summary: The agent pool containing the agent.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-assigned-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' current work.
-    description: ''
-  - name: --include-capabilities
-    parameterValueGroup: false, true
-    summary: Whether to include the agents' capabilities in the response.
-    description: ''
-  - name: --include-last-completed-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' most recent completed work.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: ext_azure-devops_az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agents.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build.yml
deleted file mode 100644
index d4e0bc326d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_build_list
-  - ext_azure-devops_az_pipelines_build_queue
-  - ext_azure-devops_az_pipelines_build_show
-- uid: ext_azure-devops_az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: Filter by builds for this branch.
-    description: ''
-  - name: --definition-ids
-    summary: IDs (space separated) of definitions to list builds for.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --reason
-    parameterValueGroup: all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset
-    summary: Limit to builds with this reason.
-    description: ''
-  - name: --requested-for
-    summary: Limit to builds requested for this user or group.
-    description: ''
-  - name: --result
-    parameterValueGroup: canceled, failed, none, partiallySucceeded, succeeded
-    summary: Limit to builds with this result.
-    description: ''
-  - name: --status
-    parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
-    summary: Limit to builds with this status.
-    description: ''
-  - name: --tags
-    summary: Limit to builds with each of the specified tags. Space separated.
-    description: ''
-  - name: --top
-    summary: Maximum number of builds to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: 'Branch to build. Required if there is not a default branch set up on the definition. Example: refs/heads/master or master or refs/pull/1/merge.'
-    description: ''
-  - name: --commit-id
-    summary: Commit ID of the branch to build.
-    description: ''
-  - name: --definition-id
-    summary: ID of the definition to queue. Required if --name is not supplied.
-    description: ''
-  - name: --definition-name
-    summary: Name of the definition to queue. Ignored if --id is supplied.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the build results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-id
-    summary: Queue Id of the pool that will be used to queue the build.
-    description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the build.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the build results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: ext_azure-devops_az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: ext_azure-devops_az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: ext_azure-devops_az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: ext_azure-devops_az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage builds.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml
deleted file mode 100644
index 5a6cd77b37..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_build_definition_list
-  - ext_azure-devops_az_pipelines_build_definition_show
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: 'Limit results to definitions with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository
-    summary: Limit results to definitions associated with this repository.
-    description: ''
-  - name: --repository-type
-    parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
-    summary: Limit results to definitions associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
-    description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: ID of the definition.
-    description: ''
-  - name: --name
-    summary: Name of the definition. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the definition summary page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml
deleted file mode 100644
index fa93f6e312..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_build_tag_add
-  - ext_azure-devops_az_pipelines_build_tag_delete
-  - ext_azure-devops_az_pipelines_build_tag_list
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --build-id
-    summary: ID of the build.
-    description: ''
-  - isRequired: true
-    name: --tags
-    summary: Tag(s) to be added to the build. [Comma seperated values].
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --build-id
-    summary: ID of the build.
-    description: ''
-  - isRequired: true
-    name: --tag
-    summary: Tag to be deleted from the build.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --build-id
-    summary: ID of the build.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build tags.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml
deleted file mode 100644
index 8218001494..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_folder_create
-  - ext_azure-devops_az_pipelines_folder_delete
-  - ext_azure-devops_az_pipelines_folder_list
-  - ext_azure-devops_az_pipelines_folder_update
-- uid: ext_azure-devops_az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --description
-    summary: Description of the folder.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-  description: This will delete all pipelines in the folder.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    parameterValueGroup: Asc, Desc, None
-    summary: Order in which folders are returned.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --new-description
-    summary: New description of the folder.
-    description: ''
-  - name: --new-path
-    summary: New full path of the folder.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: ext_azure-devops_az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: ext_azure-devops_az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: ext_azure-devops_az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage folders for organizing pipelines.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml
deleted file mode 100644
index 62a3b7a9c3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_pool_list
-  - ext_azure-devops_az_pipelines_pool_show
-- uid: ext_azure-devops_az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter the list with user action permitted.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pool-name
-    summary: Filter the list with matching pool name.
-    description: ''
-  - name: --pool-type
-    parameterValueGroup: automation, deployment
-    summary: Filter the list with type of pool.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --pool-id
-    summary: Id of the pool to list the details.
-    description: ''
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter the list with user action permitted.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: ext_azure-devops_az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml
deleted file mode 100644
index 17b2bfb965..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_queue_list
-  - ext_azure-devops_az_pipelines_queue_show
-- uid: ext_azure-devops_az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter by whether the calling user has use or manage permissions.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-name
-    summary: Filter the list with matching queue name regex. e.g. \*ubuntu\* for queue with name 'Hosted Ubuntu 1604'.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --queue-id
-    summary: Id of the agent queue to get information about.
-    description: ''
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter by whether the calling user has use or manage permissions.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: ext_azure-devops_az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent queues.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release.yml
deleted file mode 100644
index 7f8715ff97..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_release_create
-  - ext_azure-devops_az_pipelines_release_list
-  - ext_azure-devops_az_pipelines_release_show
-- uid: ext_azure-devops_az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --artifact-metadata-list
-    summary: Space separated "alias=version_id" pairs.
-    description: ''
-  - name: --definition-id
-    summary: ID of the definition to create. Required if --definition-name is not supplied.
-    description: ''
-  - name: --definition-name
-    summary: Name of the definition to create. Ignored if --definition-id is supplied.
-    description: ''
-  - name: --description
-    summary: Description of the release.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the release results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --definition-id
-    summary: ID of definition to list releases for.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --source-branch
-    summary: Filter releases for this branch.
-    description: ''
-  - name: --status
-    summary: Limit to releases with this status.
-    description: ''
-  - name: --top
-    summary: Maximum number of releases to list. Default is 50.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the release.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the release results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: ext_azure-devops_az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: ext_azure-devops_az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: ext_azure-devops_az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage releases.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml
deleted file mode 100644
index e26dfdd012..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_release_definition_list
-  - ext_azure-devops_az_pipelines_release_definition_show
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --artifact-source-id
-    summary: Limit results to definitions associated with this artifact_source_id. e.g. For build it would be {projectGuid}:{BuildDefinitionId}, for Jenkins it would be {JenkinsConnectionId}:{JenkinsDefinitionId}, for TfsOnPrem it would be {TfsOnPremConnectionId}:{ProjectName}:{TfsOnPremDefinitionId}. For third-party artifacts e.g. TeamCity, BitBucket you may refer 'uniqueSourceIdentifier' inside vss-extension.json at <a href="https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions">https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions</a>.
-    description: ''
-  - name: --artifact-type
-    parameterValueGroup: build, externaltfsbuild, git, github, jenkins, tfvc
-    summary: Release definitions with given artifactType will be returned.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: 'Limit results to definitions with this name or contains this name. Example: "FabCI".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: ID of the definition.
-    description: ''
-  - name: --name
-    summary: Name of the definition. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the definition summary page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage release definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml
deleted file mode 100644
index ceda5ebbb0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_runs_list
-  - ext_azure-devops_az_pipelines_runs_show
-- uid: ext_azure-devops_az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: Filter by builds for this branch.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-ids
-    summary: IDs (space separated) of definitions to list builds for.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    parameterValueGroup: FinishTimeAsc, FinishTimeDesc, QueueTimeAsc, QueueTimeDesc, StartTimeAsc, StartTimeDesc
-    summary: Order of pipeline runs.
-    description: ''
-  - name: --reason
-    parameterValueGroup: all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset
-    summary: Limit to builds with this reason.
-    description: ''
-  - name: --requested-for
-    summary: Limit to builds requested for this user or group.
-    description: ''
-  - name: --result
-    parameterValueGroup: canceled, failed, none, partiallySucceeded, succeeded
-    summary: Limit to builds with this result.
-    description: ''
-  - name: --status
-    parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
-    summary: Limit to builds with this status.
-    description: ''
-  - name: --tags
-    summary: Limit to builds with each of the specified tags. Space separated.
-    description: ''
-  - name: --top
-    summary: Maximum number of builds to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pipeline run.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the build results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: ext_azure-devops_az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline runs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml
deleted file mode 100644
index 8958cb8d06..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_runs_artifact_download
-  - ext_azure-devops_az_pipelines_runs_artifact_list
-  - ext_azure-devops_az_pipelines_runs_artifact_upload
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the artifact to download.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Path to download the artifact into.
-    description: ''
-  - isRequired: true
-    name: --run-id
-    summary: ID of the run that the artifact is associated to.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the run that the artifact is associated to.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the artifact to upload.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Path to upload the artifact from.
-    description: ''
-  - isRequired: true
-    name: --run-id
-    summary: ID of the run that the artifact is associated to.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run artifacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml
deleted file mode 100644
index 6a13c1c940..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_runs_tag_add
-  - ext_azure-devops_az_pipelines_runs_tag_delete
-  - ext_azure-devops_az_pipelines_runs_tag_list
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the pipeline run.
-    description: ''
-  - isRequired: true
-    name: --tags
-    summary: Tag(s) to be added to the pipeline run. [Comma seperated values].
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the pipeline run.
-    description: ''
-  - isRequired: true
-    name: --tag
-    summary: Tag to be deleted from the pipeline run.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the  pipeline run.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run tags.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml
deleted file mode 100644
index e9a2e9f348..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_variable_group_create
-  - ext_azure-devops_az_pipelines_variable_group_delete
-  - ext_azure-devops_az_pipelines_variable_group_list
-  - ext_azure-devops_az_pipelines_variable_group_show
-  - ext_azure-devops_az_pipelines_variable_group_update
-- uid: ext_azure-devops_az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable group.
-    description: ''
-  - isRequired: true
-    name: --variables
-    summary: Variables in format key=value space separated pairs. Secret variables should be managed using `az pipelines variable-group variable` commands.
-    description: ''
-  - name: --authorize
-    parameterValueGroup: false, true
-    summary: Whether the variable group should be accessible by all pipelines.
-    description: ''
-  - name: --description
-    summary: Description of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --action --action-filter
-    parameterValueGroup: manage, none, use
-    summary: Action filter for the variable group. It specifies the action which can be performed on the variable groups.
-    description: ''
-  - name: --continuation-token
-    summary: Gets the variable groups after the continuation token provided.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --group-name
-    summary: Name of the variable group. Wildcards are accepted. e.g. var_group\*.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    defaultValue: Desc
-    parameterValueGroup: Asc, Desc
-    summary: Gets the results in the defined order.
-    description: ''
-  - name: --top
-    summary: Number of variable groups to get.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: ID of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - name: --authorize
-    parameterValueGroup: false, true
-    summary: Whether the variable group should be accessible by all pipelines.
-    description: ''
-  - name: --description
-    summary: New description of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name of the variable group.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: ext_azure-devops_az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: ext_azure-devops_az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variable groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml
deleted file mode 100644
index 923dcabc19..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml
+++ /dev/null
@@ -1,162 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_variable_group_variable_create
-  - ext_azure-devops_az_pipelines_variable_group_variable_delete
-  - ext_azure-devops_az_pipelines_variable_group_variable_list
-  - ext_azure-devops_az_pipelines_variable_group_variable_update
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: If the value of the variable is a secret.
-    description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --new-name
-    summary: New name of the variable.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --prompt-value
-    parameterValueGroup: false, true
-    summary: Set it to True to update the value of a secret variable using environment variable or prompt via standard input.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: If the value of the variable is a secret.
-    description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variables in a variable group.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml
deleted file mode 100644
index 80d0908b39..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_variable_create
-  - ext_azure-devops_az_pipelines_variable_delete
-  - ext_azure-devops_az_pipelines_variable_list
-  - ext_azure-devops_az_pipelines_variable_update
-- uid: ext_azure-devops_az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --allow-override
-    parameterValueGroup: false, true
-    summary: Indicates whether the value can be set at queue time.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline. Ignored if --pipeline-id parameter is supplied.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: Indicates whether the variable's value is a secret.
-    description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with <problematic ids="id10" refid="id9">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> or user will be prompted to enter it via standard input. e.g. A variable named `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline. Ignored if --pipeline-id parameter is supplied.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --allow-override
-    parameterValueGroup: false, true
-    summary: Indicates whether the value can be set at queue time.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --new-name
-    summary: New name of the variable.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline. Ignored if --pipeline-id parameter is supplied.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --prompt-value
-    parameterValueGroup: false, true
-    summary: Set it to True to update the value of a secret variable using environment variable or prompt via standard input.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: If the value of the variable is a secret.
-    description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, use --prompt-value parameter, to be prompted to enter it via standard input. For non-interactive consoles it can be picked from environment variable prefixed with <problematic ids="id12" refid="id11">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> e.g. A variable nameed `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline variables.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos.yml
deleted file mode 100644
index 2fb91bbb4a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos.yml
+++ /dev/null
@@ -1,330 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_create
-  - ext_azure-devops_az_repos_delete
-  - ext_azure-devops_az_repos_list
-  - ext_azure-devops_az_repos_show
-  - ext_azure-devops_az_repos_update
-- uid: ext_azure-devops_az_repos_create
-  name: az repos create
-  summary: Create a Git repository in a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name for the new repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the repository page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_delete
-  name: az repos delete
-  summary: Delete a Git repository in a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_repos_list
-  name: az repos list
-  summary: List Git repositories of a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_show
-  name: az repos show
-  summary: Get the details of a Git repository.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the repository page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_update
-  name: az repos update
-  summary: Update the Git repository.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-  - name: --default-branch
-    summary: "Default branch to be set for the repository. Example: 'refs/heads/live' or 'live'."
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name for the repository.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_create
-  name: az repos create
-  summary: Create a Git repository in a team project.
-- uid: ext_azure-devops_az_repos_delete
-  name: az repos delete
-  summary: Delete a Git repository in a team project.
-- uid: ext_azure-devops_az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-- uid: ext_azure-devops_az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-- uid: ext_azure-devops_az_repos_list
-  name: az repos list
-  summary: List Git repositories of a team project.
-- uid: ext_azure-devops_az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: ext_azure-devops_az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: ext_azure-devops_az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: ext_azure-devops_az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: ext_azure-devops_az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-- uid: ext_azure-devops_az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-- uid: ext_azure-devops_az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: ext_azure-devops_az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: ext_azure-devops_az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: ext_azure-devops_az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: ext_azure-devops_az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: ext_azure-devops_az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: ext_azure-devops_az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-- uid: ext_azure-devops_az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-- uid: ext_azure-devops_az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: ext_azure-devops_az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: ext_azure-devops_az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: ext_azure-devops_az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: ext_azure-devops_az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-- uid: ext_azure-devops_az_repos_show
-  name: az repos show
-  summary: Get the details of a Git repository.
-- uid: ext_azure-devops_az_repos_update
-  name: az repos update
-  summary: Update the Git repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/import.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/import.yml
deleted file mode 100644
index 6e7d95c22a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/import.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_import_create
-- uid: ext_azure-devops_az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --git-source-url --git-url
-    summary: Url of the source git repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --git-service-endpoint-id
-    summary: Service Endpoint for connection to external endpoint.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository to create the import request in.
-    description: ''
-  - name: --requires-authorization
-    summary: Flag to tell if source git repository is private.
-    description: ''
-  - name: --user-name
-    summary: User name in case source git repository is private.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git repositories import.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy.yml
deleted file mode 100644
index 5294ec00d2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_create
-  - ext_azure-devops_az_repos_policy_delete
-  - ext_azure-devops_az_repos_policy_list
-  - ext_azure-devops_az_repos_policy_show
-  - ext_azure-devops_az_repos_policy_update
-- uid: ext_azure-devops_az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config --policy-configuration
-    summary: Local file path for configuration file. Please use / backslash when typing in directory path.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: 'Branch name to filter results by exact match of branch name. The --repository-id parameter is required to use the branch filter. For example: --branch master.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: ID of the repository to filter results by exact match of the repository ID. For example --repository-ID e556f204-53c9-4153-9cd9-ef41a11e3345.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config --policy-configuration
-    summary: Local file path for configuration file. Please use / backslash when typing in directory path.
-    description: ''
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: ext_azure-devops_az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: ext_azure-devops_az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: ext_azure-devops_az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: ext_azure-devops_az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage branch policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml
deleted file mode 100644
index a37e77001b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_approver_count_create
-  - ext_azure-devops_az_repos_policy_approver_count_update
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --allow-downvotes
-    parameterValueGroup: false, true
-    summary: Whether to allow downvotes or not.
-    description: ''
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --creator-vote-counts
-    parameterValueGroup: false, true
-    summary: Whether the creator's vote counts or not.
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --minimum-approver-count
-    summary: 'Minimum number of approvers required. For example: 2.'
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --reset-on-source-push
-    parameterValueGroup: false, true
-    summary: Whether to reset source on push.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --allow-downvotes
-    parameterValueGroup: false, true
-    summary: Whether to allow downvotes or not.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --creator-vote-counts
-    parameterValueGroup: false, true
-    summary: Whether the creator's vote counts or not.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --minimum-approver-count
-    summary: 'Minimum number of approvers required. For example: 2.'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --reset-on-source-push
-    parameterValueGroup: false, true
-    summary: Whether to reset source on push.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage approver count policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml
deleted file mode 100644
index bb2a29dac8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_build_create
-  - ext_azure-devops_az_repos_policy_build_update
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --build-definition-id
-    summary: Build Definition Id.
-    description: ''
-  - isRequired: true
-    name: --display-name
-    summary: "Display name for this build policy to identify the policy. For example: 'Manual queue policy'."
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --manual-queue-only
-    parameterValueGroup: false, true
-    summary: Whether to allow only manual queue of builds.
-    description: ''
-  - isRequired: true
-    name: --queue-on-source-update-only
-    parameterValueGroup: false, true
-    summary: Queue Only on source update.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --valid-duration
-    summary: Policy validity duration (in minutes).
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --build-definition-id
-    summary: Build Definition Id.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --display-name
-    summary: "Display name for this build policy to identify the policy. For example: 'Manual queue policy'."
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --manual-queue-only
-    parameterValueGroup: false, true
-    summary: Whether to allow only manual queue of builds.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-on-source-update-only
-    parameterValueGroup: false, true
-    summary: Queue Only on source update.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --valid-duration
-    summary: Policy validity duration (in minutes).
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml
deleted file mode 100644
index ab14116286..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_case_enforcement_create
-  - ext_azure-devops_az_repos_policy_case_enforcement_update
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage case enforcement policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml
deleted file mode 100644
index 1b7dccc8bc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_comment_required_create
-  - ext_azure-devops_az_repos_policy_comment_required_update
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage comment required policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml
deleted file mode 100644
index 5122fa99b7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_file_size_create
-  - ext_azure-devops_az_repos_policy_file_size_update
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --maximum-git-blob-size
-    summary: Maximum git blob size in bytes. For example, to specify a 10byte limit, --maximum-git-blob-size 10.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --use-uncompressed-size
-    parameterValueGroup: false, true
-    summary: Whether to use uncompressed size.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --maximum-git-blob-size
-    summary: Maximum git blob size in bytes. For example, to specify a 10byte limit, --maximum-git-blob-size 10.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --use-uncompressed-size
-    parameterValueGroup: false, true
-    summary: Whether to use uncompressed size.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage file size policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml
deleted file mode 100644
index e06b907c46..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_merge_strategy_create
-  - ext_azure-devops_az_repos_policy_merge_strategy_update
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --allow-no-fast-forward
-    parameterValueGroup: false, true
-    summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
-    description: ''
-  - name: --allow-rebase
-    parameterValueGroup: false, true
-    summary: Rebase and fast-forward - Creates a linear history by replaying the source branch commits onto the target without a merge commit.
-    description: ''
-  - name: --allow-rebase-merge
-    parameterValueGroup: false, true
-    summary: Rebase with merge commit - Creates a semi-linear history by replaying the source branch commits onto the target and then creating a merge commit.
-    description: ''
-  - name: --allow-squash
-    parameterValueGroup: false, true
-    summary: Squash merge - Creates a linear history by condensing the source branch commits into a single new commit on the target branch.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --use-squash-merge
-    parameterValueGroup: false, true
-    summary: Whether to squash merge always. This option does not work for allowing other merge types.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --allow-no-fast-forward
-    parameterValueGroup: false, true
-    summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
-    description: ''
-  - name: --allow-rebase
-    parameterValueGroup: false, true
-    summary: Rebase and fast-forward - Creates a linear history by replaying the source branch commits onto the target without a merge commit.
-    description: ''
-  - name: --allow-rebase-merge
-    parameterValueGroup: false, true
-    summary: Rebase with merge commit - Creates a semi-linear history by replaying the source branch commits onto the target and then creating a merge commit.
-    description: ''
-  - name: --allow-squash
-    parameterValueGroup: false, true
-    summary: Squash merge - Creates a linear history by condensing the source branch commits into a single new commit on the target branch.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --use-squash-merge
-    parameterValueGroup: false, true
-    summary: Whether to squash merge always. This option does not work for allowing other merge types.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage merge strategy policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml
deleted file mode 100644
index e98e24fe5e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_required_reviewer_create
-  - ext_azure-devops_az_repos_policy_required_reviewer_update
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --message
-    summary: Message.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --required-reviewer-ids
-    summary: "Required reviewers email addresses separated by ';'. For example: john@contoso.com;alice@contoso.com."
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --message
-    summary: Message.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --required-reviewer-ids
-    summary: "Required reviewers email addresses separated by ';'. For example: john@contoso.com;alice@contoso.com."
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage required reviewer policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml
deleted file mode 100644
index 73409c64e7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_work_item_linking_create
-  - ext_azure-devops_az_repos_policy_work_item_linking_update
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item linking policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr.yml
deleted file mode 100644
index 4a95fc7331..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr.yml
+++ /dev/null
@@ -1,316 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_checkout
-  - ext_azure-devops_az_repos_pr_create
-  - ext_azure-devops_az_repos_pr_list
-  - ext_azure-devops_az_repos_pr_set_vote
-  - ext_azure-devops_az_repos_pr_show
-  - ext_azure-devops_az_repos_pr_update
-- uid: ext_azure-devops_az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --remote-name
-    defaultValue: origin
-    summary: Name of git remote against which PR is raised.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --auto-complete
-    parameterValueGroup: false, true
-    summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
-    description: ''
-  - name: --bypass-policy
-    parameterValueGroup: false, true
-    summary: Bypass required policies (if any) and completes the pull request once it can be merged.
-    description: ''
-  - name: --bypass-policy-reason
-    summary: Reason for bypassing the required policies.
-    description: ''
-  - name: --delete-source-branch
-    parameterValueGroup: false, true
-    summary: Delete the source branch after the pull request has been completed and merged into the target branch.
-    description: ''
-  - name: --description -d
-    summary: 'Description for the new pull request. Can include markdown. Each value sent to this arg will be a new line. For example: --description "First Line" "Second Line".'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --draft
-    parameterValueGroup: false, true
-    summary: Use this flag to create the pull request in draft/work in progress mode.
-    description: ''
-  - name: --merge-commit-message
-    summary: Message displayed when commits are merged.
-    description: ''
-  - name: --open
-    summary: Open the pull request in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository to create the pull request in.
-    description: ''
-  - name: --reviewers
-    summary: Additional users or groups to include as reviewers on the new pull request. Space separated.
-    description: ''
-  - name: --source-branch -s
-    summary: 'Name of the source branch. Example: "dev".'
-    description: ''
-  - name: --squash
-    parameterValueGroup: false, true
-    summary: Squash the commits in the source branch when merging into the target branch.
-    description: ''
-  - name: --target-branch -t
-    summary: Name of the target branch. If not specified, defaults to the default branch of the target repository.
-    description: ''
-  - name: --title
-    summary: Title for the new pull request.
-    description: ''
-  - name: --transition-work-items
-    parameterValueGroup: false, true
-    summary: Transition any work items linked to the pull request into the next logical state. (e.g. Active -> Resolved).
-    description: ''
-  - name: --work-items
-    summary: IDs of the work items to link to the new pull request. Space separated.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --creator
-    summary: Limit results to pull requests created by this user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-links
-    summary: Include _links for each pull request.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-  - name: --reviewer
-    summary: Limit results to pull requests where this user is a reviewer.
-    description: ''
-  - name: --skip
-    summary: Number of pull requests to skip.
-    description: ''
-  - name: --source-branch -s
-    summary: Limit results to pull requests that originate from this source branch.
-    description: ''
-  - name: --status
-    parameterValueGroup: abandoned, active, all, completed
-    summary: Limit results to pull requests with this status.
-    description: ''
-  - name: --target-branch -t
-    summary: Limit results to pull requests that target this branch.
-    description: ''
-  - name: --top
-    summary: Maximum number of pull requests to list.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --vote
-    parameterValueGroup: approve, approve-with-suggestions, reject, reset, wait-for-author
-    summary: New vote value for the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the pull request in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --auto-complete
-    parameterValueGroup: false, true
-    summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
-    description: ''
-  - name: --bypass-policy
-    parameterValueGroup: false, true
-    summary: Bypass required policies (if any) and completes the pull request once it can be merged.
-    description: ''
-  - name: --bypass-policy-reason
-    summary: Reason for bypassing the required policies.
-    description: ''
-  - name: --delete-source-branch
-    parameterValueGroup: false, true
-    summary: Delete the source branch after the pull request has been completed and merged into the target branch.
-    description: ''
-  - name: --description -d
-    summary: 'New description for the pull request.  Can include markdown.  Each value sent to this arg will be a new line. For example: --description "First Line" "Second Line".'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --draft
-    parameterValueGroup: false, true
-    summary: Publish the PR or convert to draft mode.
-    description: ''
-  - name: --merge-commit-message
-    summary: Message displayed when commits are merged.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --squash
-    parameterValueGroup: false, true
-    summary: Squash the commits in the source branch when merging into the target branch.
-    description: ''
-  - name: --status
-    parameterValueGroup: abandoned, active, completed
-    summary: Set the new state of pull request.
-    description: ''
-  - name: --title
-    summary: New title for the pull request.
-    description: ''
-  - name: --transition-work-items
-    parameterValueGroup: false, true
-    summary: Transition any work items linked to the pull request into the next logical state. (e.g. Active -> Resolved).
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: ext_azure-devops_az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: ext_azure-devops_az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: ext_azure-devops_az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: ext_azure-devops_az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: ext_azure-devops_az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: ext_azure-devops_az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull requests.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml
deleted file mode 100644
index b966024e54..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_policy_list
-  - ext_azure-devops_az_repos_pr_policy_queue
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --skip
-    summary: Number of policies to skip.
-    description: ''
-  - name: --top
-    summary: Maximum number of policies to list.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --evaluation-id -e
-    summary: ID of the policy evaluation to queue.
-    description: ''
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml
deleted file mode 100644
index 7065accc28..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_reviewer_add
-  - ext_azure-devops_az_repos_pr_reviewer_list
-  - ext_azure-devops_az_repos_pr_reviewer_remove
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --reviewers
-    summary: Users or groups to include as reviewers on a pull request. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --reviewers
-    summary: Users or groups to remove as reviewers on a pull request. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request reviewers.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml
deleted file mode 100644
index 8895b8ba7d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_work_item_add
-  - ext_azure-devops_az_repos_pr_work_item_list
-  - ext_azure-devops_az_repos_pr_work_item_remove
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --work-items
-    summary: IDs of the work items to link. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --work-items
-    summary: IDs of the work items to unlink. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items associated with pull requests.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/ref.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/ref.yml
deleted file mode 100644
index 43937dacf3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-devops/repos/ref.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_ref_create
-  - ext_azure-devops_az_repos_ref_delete
-  - ext_azure-devops_az_repos_ref_list
-  - ext_azure-devops_az_repos_ref_lock
-  - ext_azure-devops_az_repos_ref_unlock
-- uid: ext_azure-devops_az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to create (example: heads/my_branch or tags/my_tag).'
-    description: ''
-  - isRequired: true
-    name: --object-id
-    summary: Id of the object to create the reference from.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to delete (example: heads/my_branch).'
-    description: ''
-  - isRequired: true
-    name: --object-id
-    summary: Id of the reference to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --filter
-    summary: 'A filter to apply to the refs (starts with). Example: head or heads/ for the branches.'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to update (example: heads/my_branch).'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to update (example: heads/my_branch).'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: ext_azure-devops_az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: ext_azure-devops_az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: ext_azure-devops_az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: ext_azure-devops_az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git references.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/index.yml
deleted file mode 100644
index a5e4c6da10..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az
-  name: azure-firewall
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-firewall_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network.yml
deleted file mode 100644
index 7ba3c352c6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-firewall_az_network_firewall
-  name: az network firewall
-  summary: Manage and configure Azure Firewalls.
-- uid: ext_azure-firewall_az_network_firewall_application_rule
-  name: az network firewall application-rule
-  summary: Manage and configure Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_create
-  name: az network firewall create
-  summary: Create an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_delete
-  name: az network firewall delete
-  summary: Delete an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_ip_config
-  name: az network firewall ip-config
-  summary: Manage and configure Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_list
-  name: az network firewall list
-  summary: List Azure Firewalls.
-- uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  name: az network firewall list-fqdn-tags
-  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config
-  name: az network firewall management-ip-config
-  summary: Manage and configure Azure Firewall Management IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule
-  name: az network firewall nat-rule
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule
-  name: az network firewall network-rule
-  summary: Manage and configure Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_policy
-  name: az network firewall policy
-  summary: Manage and configure Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_show
-  name: az network firewall show
-  summary: Get the details of an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-  name: az network firewall threat-intel-whitelist
-  summary: Manage and configure Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_update
-  name: az network firewall update
-  summary: Update an Azure Firewall.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall.yml
deleted file mode 100644
index fffc44a5db..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall.yml
+++ /dev/null
@@ -1,362 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall
-  name: az network firewall
-  summary: Manage and configure Azure Firewalls.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_create
-  - ext_azure-firewall_az_network_firewall_delete
-  - ext_azure-firewall_az_network_firewall_list
-  - ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  - ext_azure-firewall_az_network_firewall_show
-  - ext_azure-firewall_az_network_firewall_update
-- uid: ext_azure-firewall_az_network_firewall_create
-  name: az network firewall create
-  summary: Create an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Azure firewall with private ranges
-    syntax:
-      content: az network firewall create -g MyResourceGroup -n MyFirewall --private-ranges 10.0.0.0 10.0.0.0/16 IANAPrivateRanges
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-policy --policy
-    summary: Name or ID of the firewallPolicy associated with this azure firewall.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --private-ranges
-    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
-    description: ''
-  - name: --sku
-    parameterValueGroup: AZFW_Hub, AZFW_VNet
-    summary: SKU of Azure firewall. This field cannot be updated after the creation. The default sku in server end is AZFW_VNet. If you want to attach azure firewall to vhub, you should set sku to AZFW_Hub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vhub --virtual-hub
-    summary: Name or ID of the virtualHub to which the firewall belongs.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_delete
-  name: az network firewall delete
-  summary: Delete an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_list
-  name: az network firewall list
-  summary: List Azure Firewalls.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  name: az network firewall list-fqdn-tags
-  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_azure-firewall_az_network_firewall_show
-  name: az network firewall show
-  summary: Get the details of an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_update
-  name: az network firewall update
-  summary: Update an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-policy --policy
-    summary: Name or ID of the firewallPolicy associated with this azure firewall.
-    description: ''
-  - name: --private-ranges
-    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vhub --virtual-hub
-    summary: Name or ID of the virtualHub to which the firewall belongs.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_application_rule
-  name: az network firewall application-rule
-  summary: Manage and configure Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_create
-  name: az network firewall create
-  summary: Create an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_delete
-  name: az network firewall delete
-  summary: Delete an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_ip_config
-  name: az network firewall ip-config
-  summary: Manage and configure Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_list
-  name: az network firewall list
-  summary: List Azure Firewalls.
-- uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  name: az network firewall list-fqdn-tags
-  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config
-  name: az network firewall management-ip-config
-  summary: Manage and configure Azure Firewall Management IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule
-  name: az network firewall nat-rule
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule
-  name: az network firewall network-rule
-  summary: Manage and configure Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_policy
-  name: az network firewall policy
-  summary: Manage and configure Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_show
-  name: az network firewall show
-  summary: Get the details of an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-  name: az network firewall threat-intel-whitelist
-  summary: Manage and configure Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_update
-  name: az network firewall update
-  summary: Update an Azure Firewall.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewalls.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml
deleted file mode 100644
index 9b4edb6937..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_application_rule
-  name: az network firewall application-rule
-  summary: Manage and configure Azure Firewall application rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_application_rule_create
-  - ext_azure-firewall_az_network_firewall_application_rule_delete
-  - ext_azure-firewall_az_network_firewall_application_rule_list
-  - ext_azure-firewall_az_network_firewall_application_rule_show
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application rule.
-    description: ''
-  - isRequired: true
-    name: --protocols
-    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Rule description.
-    description: ''
-  - name: --fqdn-tags
-    summary: Space-separated list of FQDN tags.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --source-ip-groups
-    summary: Space-separated list of name or resource id of source IpGroups.
-    description: ''
-  - name: --target-fqdns
-    summary: Space-separated list of fully qualified domain names (FDQN).
-    description: ''
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Deny
-    summary: The action to apply for the rule collection.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule collection from 100 (high) to 65000 (low).
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall application rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml
deleted file mode 100644
index 224fae7dac..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-  description: Collections are created as part of the `az network firewall application-rule create` command.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  - ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  - ext_azure-firewall_az_network_firewall_application_rule_collection_show
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Collections are created as part of the `az network firewall application-rule create` command.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml
deleted file mode 100644
index 41c03e3d09..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_ip_config
-  name: az network firewall ip-config
-  summary: Manage and configure Azure Firewall IP configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_ip_config_create
-  - ext_azure-firewall_az_network_firewall_ip_config_delete
-  - ext_azure-firewall_az_network_firewall_ip_config_list
-  - ext_azure-firewall_az_network_firewall_ip_config_show
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IP configuration.
-    description: ''
-  - isRequired: true
-    name: --public-ip-address
-    summary: Name or ID of the public IP to use.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallSubnet".
-    description: ''
-  - name: --m-name
-    summary: Name of the management IP configuration.
-    description: ''
-  - name: --m-public-ip-address
-    summary: Name or ID of the public IP to use for management ip configuation.
-    description: ''
-  - name: --m-vnet-name
-    summary: The virtual network (VNet) name for management ip configuation. It should contain one subnet called "AzureFirewallManagementSubnet".
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IP configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IP configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall IP configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml
deleted file mode 100644
index 48f4b7ad27..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config
-  name: az network firewall management-ip-config
-  summary: Manage and configure Azure Firewall Management IP configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_management_ip_config_show
-  - ext_azure-firewall_az_network_firewall_management_ip_config_update
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the public IP to use.
-    description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallManagementSubnet".
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall Management IP configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml
deleted file mode 100644
index fd099ec9cf..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule
-  name: az network firewall nat-rule
-  summary: Manage and configure Azure Firewall NAT rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_nat_rule_create
-  - ext_azure-firewall_az_network_firewall_nat_rule_delete
-  - ext_azure-firewall_az_network_firewall_nat_rule_list
-  - ext_azure-firewall_az_network_firewall_nat_rule_show
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --destination-addresses
-    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
-    description: ''
-  - isRequired: true
-    name: --destination-ports
-    summary: Space-separated list of destination ports. Use '\*' to match all.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the NAT rule.
-    description: ''
-  - isRequired: true
-    name: --protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of protocols.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --translated-port
-    summary: Translated port for this NAT rule.
-    description: ''
-  - name: --description
-    summary: Rule description.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --source-ip-groups
-    summary: Space-separated list of name or resource id of source IpGroups.
-    description: ''
-  - name: --translated-address
-    summary: Translated address for this NAT rule.
-    description: ''
-  - name: --translated-fqdn
-    summary: Translated FQDN for this NAT rule.
-    description: ''
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
-    description: ''
-  - name: --action
-    parameterValueGroup: Dnat, Snat
-    summary: The action to apply for the rule collection.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule collection from 100 (high) to 65000 (low).
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the NAT rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the NAT rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall NAT rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml
deleted file mode 100644
index cba4b9869e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-  description: Collections are created as part of the `az network firewall nat-rule create` command.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  - ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  - ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Collections are created as part of the `az network firewall nat-rule create` command.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml
deleted file mode 100644
index dbfb04a4d1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml
+++ /dev/null
@@ -1,176 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_network_rule
-  name: az network firewall network-rule
-  summary: Manage and configure Azure Firewall network rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_network_rule_create
-  - ext_azure-firewall_az_network_firewall_network_rule_delete
-  - ext_azure-firewall_az_network_firewall_network_rule_list
-  - ext_azure-firewall_az_network_firewall_network_rule_show
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --destination-ports
-    summary: Space-separated list of destination ports. Use '\*' to match all.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network rule.
-    description: ''
-  - isRequired: true
-    name: --protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of protocols.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Rule description.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --destination-fqdns
-    summary: Space-separated list of destination FQDNs.
-    description: ''
-  - name: --destination-ip-groups
-    summary: Space-separated list of name or resource id of destination IpGroups.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --source-ip-groups
-    summary: Space-separated list of name or resource id of source IpGroups.
-    description: ''
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Deny
-    summary: The action to apply for the rule collection.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule collection from 100 (high) to 65000 (low).
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall network rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml
deleted file mode 100644
index 5ee3f936fb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-  description: Collections are created as part of the `az network firewall network-rule create` command.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  - ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  - ext_azure-firewall_az_network_firewall_network_rule_collection_show
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Collections are created as part of the `az network firewall network-rule create` command.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml
deleted file mode 100644
index 7ca9562192..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy
-  name: az network firewall policy
-  summary: Manage and configure Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_create
-  - ext_azure-firewall_az_network_firewall_policy_delete
-  - ext_azure-firewall_az_network_firewall_policy_list
-  - ext_azure-firewall_az_network_firewall_policy_show
-  - ext_azure-firewall_az_network_firewall_policy_update
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --base-policy
-    summary: The name or ID of parent firewall policy from which rules are inherited.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --threat-intel-mode
-    parameterValueGroup: Alert, Deny, Off
-    summary: The operation mode for Threat Intelligence.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Expands referenced resources.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --threat-intel-mode
-    parameterValueGroup: Alert, Deny, Off
-    summary: The operation mode for Threat Intelligence.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure firewall policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml
deleted file mode 100644
index bc48ff87ed..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml
+++ /dev/null
@@ -1,189 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --priority
-    summary: Priority of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --priority
-    summary: Priority of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure firewall policy rule collection group.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml
deleted file mode 100644
index 5fffe6aacb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-  description: >-
-    Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are also two kinds of rules which are application rule and network rule.
-
-    NAT collection only support having one network rule. Filter collection support including a list of rules in it. But all of rules should be the same type.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-  description: Common Rule Arguments are used for both Network rule and Application rule. If you want to add more rules into filter collection, please use "az network policy rule-collection-group collection rule add/remove".
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a filter collection with Network rule into the rule collection group
-    syntax:
-      content: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name network_rule --rule-type NetworkRule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --destination-ports 12003 12004 --ip-protocols TCP UDP --collection-priority 11002
-  - summary: Add a filter collection with Application rule into the rule collection group
-    syntax:
-      content: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name application_rule --rule-type ApplicationRule --description "test" --destination-addresses "202.120.36.15" "202.120.36.16" --source-addresses "202.120.36.13" "202.120.36.14" --protocols Http=12800 Https=12801 --fqdn-tags AzureBackup HDInsight --collection-priority 11100
-  parameters:
-  - isRequired: true
-    name: --collection-priority
-    summary: The priority of the rule in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Deny
-    summary: The action type of a rule collection.
-    description: ''
-  - name: --fqdn-tags
-    summary: Space-separated list of FQDN tags for this rule.
-    description: ''
-  - name: --protocols
-    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
-    description: ''
-  - name: --target-fqdns
-    summary: Space-separated list of FQDNs for this rule.
-    description: ''
-  - name: --description
-    summary: The description of rule.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses.
-    description: ''
-  - name: --rule-name
-    summary: The name of rule.
-    description: ''
-  - name: --rule-type
-    parameterValueGroup: ApplicationRule, NetworkRule
-    summary: The type of rule.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses.
-    description: ''
-  - name: --destination-ports
-    summary: Space-separated list of destination ports.
-    description: ''
-  - name: --ip-protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of IP protocols.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a NAT collection into the rule collection group
-    syntax:
-      content: az network firewall policy rule-collection-group collection add-nat-collection -n nat_collection --collection-priority 10003 --policy-name {policy} -g {rg} --rule-collection-group-name {collectiongroup} --action DNAT --rule-name network_rule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --translated-address 128.1.1.1 --translated-port 1234 --destination-ports 12000 12001 --ip-protocols TCP UDP
-  parameters:
-  - isRequired: true
-    name: --collection-priority
-    summary: The priority of the rule in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --action
-    parameterValueGroup: DNAT, SNAT
-    summary: The action type of a rule collection.
-    description: ''
-  - name: --description
-    summary: The description of rule.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses.
-    description: ''
-  - name: --rule-name
-    summary: The name of rule.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses.
-    description: ''
-  - name: --translated-address
-    summary: Translated address for this NAT rule collection.
-    description: ''
-  - name: --translated-port
-    summary: Translated port for this NAT rule collection.
-    description: ''
-  - name: --destination-ports
-    summary: Space-separated list of destination ports.
-    description: ''
-  - name: --ip-protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of IP protocols.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are also two kinds of rules which are application rule and network rule.
-
-  NAT collection only support having one network rule. Filter collection support including a list of rules in it. But all of rules should be the same type.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml
deleted file mode 100644
index 936ac87c2c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-  description: Only filter collection supports having a list of rules.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-  description: Only filter collection supports having a list of rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name
-    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --fqdn-tags
-    summary: Space-separated list of FQDN tags for this rule.
-    description: ''
-  - name: --protocols
-    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
-    description: ''
-  - name: --target-fqdns
-    summary: Space-separated list of FQDNs for this rule.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of rule.
-    description: ''
-  - isRequired: true
-    name: --rule-type
-    parameterValueGroup: ApplicationRule, NetworkRule
-    summary: The type of rule.
-    description: ''
-  - name: --description
-    summary: The description of rule.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses.
-    description: ''
-  - name: --destination-ports
-    summary: Space-separated list of destination ports.
-    description: ''
-  - name: --ip-protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of IP protocols.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-  description: Only filter collection supports having a list of rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name
-    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of rule.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Only filter collection supports having a list of rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-whitelist.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-whitelist.yml
deleted file mode 100644
index 7d436902f1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-whitelist.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-  name: az network firewall threat-intel-whitelist
-  summary: Manage and configure Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a threat intelligence whitelist
-    syntax:
-      content: az network firewall threat-intel-whitelist create -g MyResourceGroup -n MyFirewall --ip-addresses 10.0.0.0 10.0.0.1 --fqdns *.microsoft.com www.bing.com *google.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --fqdns
-    summary: Space-separated list of FQDNs.
-    description: ''
-  - name: --ip-addresses
-    summary: Space-separated list of IPv4 addresses.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --fqdns
-    summary: Space-separated list of FQDNs.
-    description: ''
-  - name: --ip-addresses
-    summary: Space-separated list of IPv4 addresses.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall Threat Intelligence Whitelist.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt.yml
deleted file mode 100644
index 39b09d57ec..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt.yml
+++ /dev/null
@@ -1,253 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt
-  name: az dt
-  summary: Manage Azure Digital Twins (ADT) solutions & infrastructure.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_create
-  - ext_azure-iot_az_dt_delete
-  - ext_azure-iot_az_dt_list
-  - ext_azure-iot_az_dt_show
-- uid: ext_azure-iot_az_dt_create
-  name: az dt create
-  summary: Create a new Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create instance in target resource group with default location.
-    syntax:
-      content: az dt create -n {instance_name} -g {resouce_group} -l eastus2euap
-  - summary: Create instance in target resource group with specified location and tags.
-    syntax:
-      content: az dt create -n {instance_name} -g {resouce_group} -l westcentralus --tags "a=b;c=d"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: Digital Twins instance location. You can configure the default location using `az configure --defaults location=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins instance tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-- uid: ext_azure-iot_az_dt_delete
-  name: az dt delete
-  summary: Delete an existing Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an arbitrary instance.
-    syntax:
-      content: az dt delete -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_list
-  name: az dt list
-  summary: List the collection of Digital Twins instances by subscription or resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all instances in the current subscription.
-    syntax:
-      content: az dt list
-  - summary: List all instances in target resource group and output in table format.
-    syntax:
-      content: az dt list -g {resource_group} --output table
-  - summary: List all instances in subscription that meet a condition.
-    syntax:
-      content: az dt list --query "[?contains(name, 'Production')]"
-  - summary: Count instances that meet condition.
-    syntax:
-      content: az dt list --query "length([?contains(name, 'Production')])"
-  parameters:
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_show
-  name: az dt show
-  summary: Show an existing Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an instance.
-    syntax:
-      content: az dt show -n {instance_name}
-  - summary: Show an instance and project certain properties.
-    syntax:
-      content: az dt show -n {instance_name} --query "{Endpoint:hostName, Location:location}"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_create
-  name: az dt create
-  summary: Create a new Digital Twins instance.
-- uid: ext_azure-iot_az_dt_delete
-  name: az dt delete
-  summary: Delete an existing Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint
-  name: az dt endpoint
-  summary: Manage and configure Digital Twins instance endpoints.
-- uid: ext_azure-iot_az_dt_endpoint_create
-  name: az dt endpoint create
-  summary: Add egress endpoints to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_delete
-  name: az dt endpoint delete
-  summary: Remove an endpoint from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_list
-  name: az dt endpoint list
-  summary: List all egress endpoints configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_show
-  name: az dt endpoint show
-  summary: Show details of an endpoint configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_list
-  name: az dt list
-  summary: List the collection of Digital Twins instances by subscription or resource group.
-- uid: ext_azure-iot_az_dt_model
-  name: az dt model
-  summary: Manage DTDL models and definitions on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_model_create
-  name: az dt model create
-  summary: Uploads one or more models. When any error occurs, no models are uploaded.
-- uid: ext_azure-iot_az_dt_model_delete
-  name: az dt model delete
-  summary: Delete a model. A model can only be deleted if no other models reference it.
-- uid: ext_azure-iot_az_dt_model_list
-  name: az dt model list
-  summary: List model metadata, definitions and dependencies.
-- uid: ext_azure-iot_az_dt_model_show
-  name: az dt model show
-  summary: Retrieve a target model or model definition.
-- uid: ext_azure-iot_az_dt_model_update
-  name: az dt model update
-  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
-- uid: ext_azure-iot_az_dt_role_assignment
-  name: az dt role-assignment
-  summary: Manage RBAC role assignments for a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_create
-  name: az dt role-assignment create
-  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_delete
-  name: az dt role-assignment delete
-  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_list
-  name: az dt role-assignment list
-  summary: List the existing role assignments of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route
-  name: az dt route
-  summary: Manage and configure event routes.
-- uid: ext_azure-iot_az_dt_route_create
-  name: az dt route create
-  summary: Add an event route to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_delete
-  name: az dt route delete
-  summary: Remove an event route from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_list
-  name: az dt route list
-  summary: List the configured event routes of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_show
-  name: az dt route show
-  summary: Show details of an event route configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_show
-  name: az dt show
-  summary: Show an existing Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin
-  name: az dt twin
-  summary: Manage and configure the digital twins of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_component
-  name: az dt twin component
-  summary: Show and update the digital twin components of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_create
-  name: az dt twin create
-  summary: Create a digital twin on an instance.
-- uid: ext_azure-iot_az_dt_twin_delete
-  name: az dt twin delete
-  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
-- uid: ext_azure-iot_az_dt_twin_query
-  name: az dt twin query
-  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
-- uid: ext_azure-iot_az_dt_twin_relationship
-  name: az dt twin relationship
-  summary: Manage and configure the digital twin relationships of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_show
-  name: az dt twin show
-  summary: Show the details of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_telemetry
-  name: az dt twin telemetry
-  summary: Test and validate the event routes and endpoints of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-- uid: ext_azure-iot_az_dt_twin_update
-  name: az dt twin update
-  summary: Update an instance digital twin via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Digital Twins (ADT) solutions & infrastructure.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml
deleted file mode 100644
index 1bb6a2b6ec..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_endpoint
-  name: az dt endpoint
-  summary: Manage and configure Digital Twins instance endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_endpoint_delete
-  - ext_azure-iot_az_dt_endpoint_list
-  - ext_azure-iot_az_dt_endpoint_show
-- uid: ext_azure-iot_az_dt_endpoint_delete
-  name: az dt endpoint delete
-  summary: Remove an endpoint from a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an endpoint from an instance.
-    syntax:
-      content: az dt endpoint delete -n {instance_name} --endpoint-name {endpoint_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_list
-  name: az dt endpoint list
-  summary: List all egress endpoints configured on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all egress endpoints configured on an instance.
-    syntax:
-      content: az dt endpoint list -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_show
-  name: az dt endpoint show
-  summary: Show details of an endpoint configured on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a desired endpoint by name on an instance.
-    syntax:
-      content: az dt endpoint show -n {instance_name} --endpoint-name {endpoint_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_endpoint_create
-  name: az dt endpoint create
-  summary: Add egress endpoints to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_delete
-  name: az dt endpoint delete
-  summary: Remove an endpoint from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_list
-  name: az dt endpoint list
-  summary: List all egress endpoints configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_show
-  name: az dt endpoint show
-  summary: Show details of an endpoint configured on a Digital Twins instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Digital Twins instance endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml
deleted file mode 100644
index c9238d47a1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_endpoint_create
-  name: az dt endpoint create
-  summary: Add egress endpoints to a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_endpoint_create_eventgrid
-  - ext_azure-iot_az_dt_endpoint_create_eventhub
-  - ext_azure-iot_az_dt_endpoint_create_servicebus
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds an EventGrid Topic endpoint to a target instance.
-    syntax:
-      content: az dt endpoint create eventgrid --endpoint-name {endpoint_name} --eventgrid-resource-group {eventgrid_resource_group} --eventgrid-topic {eventgrid_topic_name} -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins endpoint tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - isRequired: true
-    name: --egg --eventgrid-resource-group
-    summary: Name of EventGrid Topic resource group.
-    description: ''
-  - isRequired: true
-    name: --egt --eventgrid-topic
-    summary: Name of EventGrid Topic to integrate with.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds an EventHub endpoint to a target instance.
-    syntax:
-      content: az dt endpoint create eventhub --endpoint-name {endpoint_name} --eventhub-resource-group {eventhub_resource_group} --eventhub-namespace {eventhub_namespace} --eventhub {eventhub_name} --eventhub-policy {eventhub_policy} -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins endpoint tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - isRequired: true
-    name: --eh --eventhub
-    summary: Name of EventHub to integrate with.
-    description: ''
-  - isRequired: true
-    name: --ehg --eventhub-resource-group
-    summary: Name of EventHub resource group.
-    description: ''
-  - isRequired: true
-    name: --ehn --eventhub-namespace
-    summary: EventHub Namespace identifier.
-    description: ''
-  - isRequired: true
-    name: --ehp --eventhub-policy
-    summary: EventHub policy to use for endpoint configuration.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds a ServiceBus Topic endpoint to a target instance.
-    syntax:
-      content: az dt endpoint create servicebus --endpoint-name {endpoint_name} --servicebus-resource-group {servicebus_resource_group} --servicebus-namespace {servicebus_namespace} --servicebus-topic {servicebus_topic_name} --servicebus-policy {servicebus_policy} -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins endpoint tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - isRequired: true
-    name: --sbg --servicebus-resource-group
-    summary: Name of ServiceBus resource group.
-    description: ''
-  - isRequired: true
-    name: --sbn --servicebus-namespace
-    summary: ServiceBus Namespace identifier.
-    description: ''
-  - isRequired: true
-    name: --sbp --servicebus-policy
-    summary: ServiceBus Topic policy to use for endpoint configuration.
-    description: ''
-  - isRequired: true
-    name: --sbt --servicebus-topic
-    summary: Name of ServiceBus Topic to integrate with.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Add egress endpoints to a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/model.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/model.yml
deleted file mode 100644
index 0b551e9934..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/model.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_model
-  name: az dt model
-  summary: Manage DTDL models and definitions on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_model_create
-  - ext_azure-iot_az_dt_model_delete
-  - ext_azure-iot_az_dt_model_list
-  - ext_azure-iot_az_dt_model_show
-  - ext_azure-iot_az_dt_model_update
-- uid: ext_azure-iot_az_dt_model_create
-  name: az dt model create
-  summary: Uploads one or more models. When any error occurs, no models are uploaded.
-  description: --models can be inline json or file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Bulk upload all .json or .dtdl model files from a target directory. Model processing is recursive.
-    syntax:
-      content: az dt model create -n {instance_name} --from-directory {directory_path}
-  - summary: Upload model json inline or from file path.
-    syntax:
-      content: az dt model create -n {instance_name} --models {file_path_or_inline_json}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --fd --from-directory
-    summary: The directory JSON model files will be parsed from.
-    description: ''
-  - name: --models
-    summary: Inline model JSON or file path to model JSON.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_delete
-  name: az dt model delete
-  summary: Delete a model. A model can only be deleted if no other models reference it.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a target model.
-    syntax:
-      content: az dt model delete -n {instance_name} --dtmi "dtmi:example:Floor;1"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_list
-  name: az dt model list
-  summary: List model metadata, definitions and dependencies.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List model metadata
-    syntax:
-      content: az dt model list -n {instance_name}
-  - summary: List model definitions
-    syntax:
-      content: az dt model list -n {instance_name} --definition
-  - summary: List dependencies of particular pre-existing model(s). Space seperate dtmi values.
-    syntax:
-      content: az dt model list -n {instance_name} --dependencies-for {model_id0} {model_id1}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --def --definition
-    parameterValueGroup: false, true
-    summary: The operation will retrieve the model definition.
-    description: ''
-  - name: --dependencies-for
-    summary: The set of models which will have their dependencies retrieved. If omitted, all models are retrieved. Format is a whitespace separated list.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_show
-  name: az dt model show
-  summary: Retrieve a target model or model definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show model meta data
-    syntax:
-      content: az dt model show -n {instance_name} --dtmi "dtmi:example:Floor;1"
-  - summary: Show model meta data and definition
-    syntax:
-      content: az dt model show -n {instance_name} --dtmi "dtmi:example:Floor;1" --definition
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - name: --def --definition
-    parameterValueGroup: false, true
-    summary: The operation will retrieve the model definition.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_update
-  name: az dt model update
-  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Decommision a target model
-    syntax:
-      content: az dt model update -n {instance_name} --dtmi "dtmi:example:Floor;1" --decommission
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - name: --decommission
-    parameterValueGroup: false, true
-    summary: Indicates intent to decommission a target model.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_model_create
-  name: az dt model create
-  summary: Uploads one or more models. When any error occurs, no models are uploaded.
-- uid: ext_azure-iot_az_dt_model_delete
-  name: az dt model delete
-  summary: Delete a model. A model can only be deleted if no other models reference it.
-- uid: ext_azure-iot_az_dt_model_list
-  name: az dt model list
-  summary: List model metadata, definitions and dependencies.
-- uid: ext_azure-iot_az_dt_model_show
-  name: az dt model show
-  summary: Retrieve a target model or model definition.
-- uid: ext_azure-iot_az_dt_model_update
-  name: az dt model update
-  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage DTDL models and definitions on a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml
deleted file mode 100644
index 0d498011df..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_role_assignment
-  name: az dt role-assignment
-  summary: Manage RBAC role assignments for a Digital Twins instance.
-  description: >-
-    Note that in order to perform role assignments, the logged in principal needs permissions
-
-    such as Owner or User Access Administrator at the assigned scope.
-
-
-    This command group is provided for convenience. For more complex role assignment scenarios
-
-    use the 'az role assignment' command group.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_role_assignment_create
-  - ext_azure-iot_az_dt_role_assignment_delete
-  - ext_azure-iot_az_dt_role_assignment_list
-- uid: ext_azure-iot_az_dt_role_assignment_create
-  name: az dt role-assignment create
-  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
-  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
-  langs:
-  - azurecli
-  examples:
-  - summary: Assign a user (by email) the built-in Digital Twins Owner role against a target instance.
-    syntax:
-      content: az dt role-assignment create -n {instance_name} --assignee "owneruser@microsoft.com" --role "Azure Digital Twins Owner (Preview)"
-  - summary: Assign a user (by object Id) the built-in Digital Twins Reader role against a target instance.
-    syntax:
-      content: az dt role-assignment create -n {instance_name} --assignee "97a89267-0966-4054-a156-b7d86ef8e216" --role "Azure Digital Twins Reader (Preview)"
-  - summary: Assign a service principal a custom role against a target instance.
-    syntax:
-      content: az dt role-assignment create -n {instance_name} --assignee {service_principal_name_or_id} --role {role_name_or_id}
-  parameters:
-  - isRequired: true
-    name: --assignee
-    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
-    description: ''
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --role
-    summary: Role name or Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_role_assignment_delete
-  name: az dt role-assignment delete
-  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
-  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a user from a specific role assignment of a Digital Twins instance.
-    syntax:
-      content: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com" --role "Azure Digital Twins Reader (Preview)"
-  - summary: Remove a user from all assigned roles of a Digital Twins instance.
-    syntax:
-      content: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --assignee
-    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --role
-    summary: Role name or Id.
-    description: ''
-- uid: ext_azure-iot_az_dt_role_assignment_list
-  name: az dt role-assignment list
-  summary: List the existing role assignments of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the role assignments on a target instance.
-    syntax:
-      content: az dt role-assignment list -n {instance_name}
-  - summary: List the role assignments on a target instance and filter by role.
-    syntax:
-      content: az dt role-assignment list -n {instance_name} --role {role_name_or_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --include-inherited
-    parameterValueGroup: false, true
-    summary: Include assignments applied on parent scopes.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --role
-    summary: Role name or Id.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_role_assignment_create
-  name: az dt role-assignment create
-  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_delete
-  name: az dt role-assignment delete
-  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_list
-  name: az dt role-assignment list
-  summary: List the existing role assignments of a Digital Twins instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Note that in order to perform role assignments, the logged in principal needs permissions
-
-  such as Owner or User Access Administrator at the assigned scope.
-
-
-  This command group is provided for convenience. For more complex role assignment scenarios
-
-  use the 'az role assignment' command group.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/route.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/route.yml
deleted file mode 100644
index dca55e2d77..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/route.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_route
-  name: az dt route
-  summary: Manage and configure event routes.
-  description: Note that an endpoint must first be configred before adding an event route.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_route_create
-  - ext_azure-iot_az_dt_route_delete
-  - ext_azure-iot_az_dt_route_list
-  - ext_azure-iot_az_dt_route_show
-- uid: ext_azure-iot_az_dt_route_create
-  name: az dt route create
-  summary: Add an event route to a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds an event route for an existing endpoint on target instance with default filter of "true".
-    syntax:
-      content: az dt route create -n {instance_name} --endpoint-name {endpoint_name} --route-name {route_name}
-  - summary: Adds an event route for an existing endpoint on target instance with custom filter.
-    syntax:
-      content: az dt route create -n {instance_name} --endpoint-name {endpoint_name} --route-name {route_name} --filter "type = 'Microsoft.DigitalTwins.Twin.Create'"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - isRequired: true
-    name: --rn --route-name
-    summary: Event route name.
-    description: ''
-  - name: --filter
-    defaultValue: "true"
-    summary: Event route filter.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_route_delete
-  name: az dt route delete
-  summary: Remove an event route from a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an event route from a target instance.
-    syntax:
-      content: az dt route delete -n {instance_name} --route-name {route_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --rn --route-name
-    summary: Event route name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_route_list
-  name: az dt route list
-  summary: List the configured event routes of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List configured event routes of a target instance.
-    syntax:
-      content: az dt route list -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_route_show
-  name: az dt route show
-  summary: Show details of an event route configured on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an event route on a target instance.
-    syntax:
-      content: az dt route show -n {instance_name} --route-name {route_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --rn --route-name
-    summary: Event route name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_route_create
-  name: az dt route create
-  summary: Add an event route to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_delete
-  name: az dt route delete
-  summary: Remove an event route from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_list
-  name: az dt route list
-  summary: List the configured event routes of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_show
-  name: az dt route show
-  summary: Show details of an event route configured on a Digital Twins instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Note that an endpoint must first be configred before adding an event route.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin.yml
deleted file mode 100644
index 8d4aeb6595..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin
-  name: az dt twin
-  summary: Manage and configure the digital twins of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_create
-  - ext_azure-iot_az_dt_twin_delete
-  - ext_azure-iot_az_dt_twin_query
-  - ext_azure-iot_az_dt_twin_show
-  - ext_azure-iot_az_dt_twin_update
-- uid: ext_azure-iot_az_dt_twin_create
-  name: az dt twin create
-  summary: Create a digital twin on an instance.
-  description: --properties can be inline JSON or file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a digital twin from an existing (prior-created) model.
-    syntax:
-      content: az dt twin create -n {instance_name} --dtmi urn:azureiot:DeviceManagement:DeviceInformation:1 --twin-id {twin_id}
-  - summary: Create a digital twin from an existing (prior-created) model. Instantiate with property values.
-    syntax:
-      content: "az dt twin create -n {instance_name} --dtmi urn:azureiot:DeviceManagement:DeviceInformation:1 --twin-id {twin_id} --properties '{\"manufacturer\": \"Microsoft\"}'"
-  - summary: Create a digital twin with component from existing (prior-created) models. Instantiate with property values.
-    syntax:
-      content: >-
-        az dt twin create -n {instance_name} --dtmi dtmi:example:Room;1 --twin-id {twin_id} --properties '{
-            "Temperature": 10.2,
-            "Thermostat": {
-                "$metadata": {},
-                "setPointTemp": 23.12
-            }
-        }'
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --properties -p
-    summary: Initial property values for instantiating a digital twin or related components. Provide file path or inline JSON.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_delete
-  name: az dt twin delete
-  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a digital twin by Id.
-    syntax:
-      content: az dt twin delete -n {instance_name} --twin-id {twin_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_query
-  name: az dt twin query
-  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Query all digital twins in target instance and project all attributes. Also show cost in query units.
-    syntax:
-      content: az dt twin query -n {instance_name} -q "select * from digitaltwins" --show-cost
-  - summary: Query by model and project all attributes.
-    syntax:
-      content: az dt twin query -n {instance_name} -q "select * from digitaltwins T where IS_OF_MODEL(T, 'dtmi:example:Room;2')"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --query-command -q
-    summary: User query to be executed.
-    description: ''
-  - name: --cost --show-cost
-    parameterValueGroup: false, true
-    summary: Calculates and shows the query charge.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_show
-  name: az dt twin show
-  summary: Show the details of a digital twin.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a digital twin.
-    syntax:
-      content: az dt twin show -n {instance_name} --twin-id {twin_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_update
-  name: az dt twin update
-  summary: Update an instance digital twin via JSON patch specification.
-  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a digital twin via JSON patch specification.
-    syntax:
-      content: "az dt twin update -n {instance_name} --twin-id {twin_id} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
-  - summary: Update a digital twin via JSON patch specification.
-    syntax:
-      content: >-
-        az dt twin update -n {instance_name} --twin-id {twin_id} --json-patch '[
-          {"op":"replace", "path":"/Temperature", "value": 20.5},
-          {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
-        ]'
-  - summary: Update a digital twin via JSON patch specification defined in a file.
-    syntax:
-      content: az dt twin update -n {instance_name} --twin-id {twin_id} --json-patch ./my/patch/document.json
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --json-patch --patch
-    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_component
-  name: az dt twin component
-  summary: Show and update the digital twin components of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_create
-  name: az dt twin create
-  summary: Create a digital twin on an instance.
-- uid: ext_azure-iot_az_dt_twin_delete
-  name: az dt twin delete
-  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
-- uid: ext_azure-iot_az_dt_twin_query
-  name: az dt twin query
-  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
-- uid: ext_azure-iot_az_dt_twin_relationship
-  name: az dt twin relationship
-  summary: Manage and configure the digital twin relationships of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_show
-  name: az dt twin show
-  summary: Show the details of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_telemetry
-  name: az dt twin telemetry
-  summary: Test and validate the event routes and endpoints of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-- uid: ext_azure-iot_az_dt_twin_update
-  name: az dt twin update
-  summary: Update an instance digital twin via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure the digital twins of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml
deleted file mode 100644
index 7e94a1de32..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin_component
-  name: az dt twin component
-  summary: Show and update the digital twin components of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_component_show
-  - ext_azure-iot_az_dt_twin_component_update
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a digital twin component
-    syntax:
-      content: az dt twin component show -n {instance_name} --twin-id {twin_id} --component Thermostat
-  parameters:
-  - isRequired: true
-    name: --component
-    summary: The path to the DTDL component.
-    description: ''
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a digital twin component via JSON patch specification.
-    syntax:
-      content: "az dt twin component update -n {instance_name} --twin-id {twin_id} --component {component_path} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
-  - summary: Update a digital twin component via JSON patch specification.
-    syntax:
-      content: >-
-        az dt twin component update -n {instance_name} --twin-id {twin_id} --component {component_path} --json-patch '[
-          {"op":"replace", "path":"/Temperature", "value": 20.5},
-          {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
-        ]'
-  - summary: Update a digital twin component via JSON patch specification defined in a file.
-    syntax:
-      content: az dt twin component update -n {instance_name} --twin-id {twin_id} --component {component_path} --json-patch ./my/patch/document.json
-  parameters:
-  - isRequired: true
-    name: --component
-    summary: The path to the DTDL component.
-    description: ''
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --json-patch --patch
-    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Show and update the digital twin components of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml
deleted file mode 100644
index 6cfb8487b8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml
+++ /dev/null
@@ -1,216 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin_relationship
-  name: az dt twin relationship
-  summary: Manage and configure the digital twin relationships of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_relationship_create
-  - ext_azure-iot_az_dt_twin_relationship_delete
-  - ext_azure-iot_az_dt_twin_relationship_list
-  - ext_azure-iot_az_dt_twin_relationship_show
-  - ext_azure-iot_az_dt_twin_relationship_update
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-  description: --properties can be inline JSON or file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a relationship between two digital twins.
-    syntax:
-      content: az dt twin relationship create -n {instance_name} --relationship-id {relationship_id} --relationship contains --source {source_twin_id} --target {target_twin_id}
-  - summary: Create a relationship with initialized properties between two digital twins.
-    syntax:
-      content: "az dt twin relationship create -n {instance_name} --relationship-id {relationship_id} --relationship contains --source {source_twin_id} --target {target_twin_id} --properties '{\"ownershipUser\": \"me\", \"ownershipDepartment\": \"Computer Science\"}'"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --kind --relationship
-    summary: "Relationship name or kind. For example: 'contains'."
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --source --source-twin-id -s
-    summary: The source twin Id for a relationship.
-    description: ''
-  - isRequired: true
-    name: --target --target-twin-id -t
-    summary: The target twin Id for a relationship.
-    description: ''
-  - name: --properties -p
-    summary: Initial property values for instantiating a digital twin relationship. Provide file path or inline JSON.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a digital twin relationship.
-    syntax:
-      content: az dt twin relationship delete -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List outgoing relationships of a digital twin.
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id}
-  - summary: List outgoing relationships of a digital twin and filter on relationship 'contains'
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id} --relationship contains
-  - summary: List incoming relationships of a digital twin.
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id} --incoming
-  - summary: List incoming relationships of a digital twin and filter on relationship 'contains'.
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id} --relationship contains --incoming
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --incoming
-    parameterValueGroup: false, true
-    summary: Retrieves all incoming relationships for a digital twin.
-    description: ''
-  - name: --kind --relationship
-    summary: Filter result by the kind of relationship.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a digital twin relationship.
-    syntax:
-      content: az dt twin relationship show -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-  description: Operations are limited to add, replace and remove.
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a digital twin relationship via JSON patch specification.
-    syntax:
-      content: "az dt twin relationship update -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
-  - summary: Update a digital twin relationship via JSON patch specification.
-    syntax:
-      content: >-
-        az dt twin relationship update -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '[
-          {"op":"replace", "path":"/Temperature", "value": 20.5},
-          {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
-        ]'
-  - summary: Update a digital twin relationship via JSON patch specification defined in a file.
-    syntax:
-      content: az dt twin relationship update -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch ./my/patch/document.json
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --json-patch --patch
-    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure the digital twin relationships of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml
deleted file mode 100644
index 804db2be68..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin_telemetry
-  name: az dt twin telemetry
-  summary: Test and validate the event routes and endpoints of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_telemetry_send
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Send twin telemetry
-    syntax:
-      content: az dt twin telemetry send -n {instance_name} --twin-id {twin_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --component
-    summary: The path to the DTDL component. If set, telemetry will be emitted on behalf of the component.
-    description: ''
-  - name: --dt-id
-    summary: A unique message identifier (in the scope of the digital twin id) that is commonly used for de-duplicating messages. If no value is provided a GUID is automatically generated.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --telemetry
-    summary: 'Inline telemetry JSON or file path to telemetry JSON. Default payload is an empty object: {}.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Test and validate the event routes and endpoints of a Digital Twins instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/index.yml
deleted file mode 100644
index a097e32caf..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/index.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az
-  name: azure-iot
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_dt
-  name: az dt
-  summary: Manage Azure Digital Twins (ADT) solutions & infrastructure.
-- uid: ext_azure-iot_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-- uid: ext_azure-iot_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot.yml
deleted file mode 100644
index a6509dcbcb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot.yml
+++ /dev/null
@@ -1,463 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-  description: >-
-    Review the extension wiki tips to maximize usage
-
-    <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_central
-  name: az iot central
-  summary: Manage Azure Central (IoT Central) solutions & infrastructure.
-- uid: ext_azure-iot_az_iot_central_app
-  name: az iot central app
-  summary: >-
-    Manage Azure IoT Central applications.
-
-
-    To use this command group, the user must be logged through the `az login` command,
-
-    have the correct tenant set (the users home tenant) and
-
-    have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-- uid: ext_azure-iot_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-iot_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-iot_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-- uid: ext_azure-iot_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-- uid: ext_azure-iot_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-iot_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-iot_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-iot_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-- uid: ext_azure-iot_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-- uid: ext_azure-iot_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-- uid: ext_azure-iot_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-iot_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-iot_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-iot_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-iot_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-iot_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-iot_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-- uid: ext_azure-iot_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Review the extension wiki tips to maximize usage
-
-  <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central.yml
deleted file mode 100644
index 17c6190890..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central
-  name: az iot central
-  summary: Manage Azure Central (IoT Central) solutions & infrastructure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_central_app
-  name: az iot central app
-  summary: >-
-    Manage Azure IoT Central applications.
-
-
-    To use this command group, the user must be logged through the `az login` command,
-
-    have the correct tenant set (the users home tenant) and
-
-    have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Central (IoT Central) solutions & infrastructure.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app.yml
deleted file mode 100644
index e6fb5009d5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app
-  name: az iot central app
-  summary: >-
-    Manage Azure IoT Central applications.
-
-
-    To use this command group, the user must be logged through the `az login` command,
-
-    have the correct tenant set (the users home tenant) and
-
-    have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_monitor_events
-  - ext_azure-iot_az_iot_central_app_validate_messages
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id}
-  - summary: Output errors as they are detected
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} --style scroll
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --dr --duration
-    defaultValue: "300"
-    summary: Maximum duration to receive messages from target device before terminating connection.Use 0 for infinity.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --max-messages --mm
-    defaultValue: "10"
-    summary: Maximum number of messages to recieve from target device before terminating connection.Use 0 for infinity.
-    description: ''
-  - name: --minimum-severity
-    defaultValue: warning
-    parameterValueGroup: error, info, warning
-    summary: Minimum severity of issue required for reporting.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --style
-    defaultValue: scroll
-    parameterValueGroup: csv, json, scroll
-    summary: Indicate output stylescroll = deliver errors as they arrive, json = summarize results as json, csv = summarize results as json.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Manage Azure IoT Central applications.
-
-
-  To use this command group, the user must be logged through the `az login` command,
-
-  have the correct tenant set (the users home tenant) and
-
-  have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device-template.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device-template.yml
deleted file mode 100644
index b659532191..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device-template.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_device_template_create
-  - ext_azure-iot_az_iot_central_app_device_template_delete
-  - ext_azure-iot_az_iot_central_app_device_template_list
-  - ext_azure-iot_az_iot_central_app_device_template_map
-  - ext_azure-iot_az_iot_central_app_device_template_show
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device template with payload read from a file
-    syntax:
-      content: az iot central app device-template create --app-id {appid} --content {pathtofile} --device-template-id {devicetemplateid}
-  - summary: Create a device template with payload read from raw json
-    syntax:
-      content: az iot central app device-template create --app-id {appid} --content {json} --device-template-id {devicetemplateid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: "Configuration for request. Provide path to JSON file or raw stringified JSON. [File Path Example: ./path/to/file.json] [Stringified JSON Example: {'a': 'b'}]."
-    description: ''
-  - isRequired: true
-    name: --device-template-id
-    summary: 'Device template id. Example: somedevicetemplate.'
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-  description: 'Note: this is expected to fail if any devices are still associated to this template.'
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a device template from IoT Central
-    syntax:
-      content: az iot central app device-template delete --app-id {appid} --device-template-id {devicetemplateid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-template-id
-    summary: 'Device template id. Example: somedevicetemplate.'
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all device templates
-    syntax:
-      content: az iot central app device-template list --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get device template name to id mapping
-    syntax:
-      content: az iot central app device-template map --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a device template
-    syntax:
-      content: az iot central app device-template show --app-id {appid} --device-template-id {devicetemplateid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-template-id
-    summary: 'Device template id. Example: somedevicetemplate.'
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure IoT Central device templates.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device-twin.yml
deleted file mode 100644
index 0f57659967..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_device_twin_show
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device.yml
deleted file mode 100644
index 9840498e70..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/app/device.yml
+++ /dev/null
@@ -1,217 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_device_create
-  - ext_azure-iot_az_iot_central_app_device_delete
-  - ext_azure-iot_az_iot_central_app_device_list
-  - ext_azure-iot_az_iot_central_app_device_registration_info
-  - ext_azure-iot_az_iot_central_app_device_registration_summary
-  - ext_azure-iot_az_iot_central_app_device_show
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device
-    syntax:
-      content: az iot central app device create --app-id {appid} --device-id {deviceid}
-  - summary: Create a simulated device
-    syntax:
-      content: az iot central app device create --app-id {appid} --device-id {deviceid} --instance-of {devicetemplateid} --simulated
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --device-name
-    summary: 'Human readable device name. Example: Fridge.'
-    description: ''
-  - name: --instance-of
-    summary: 'Central template id. Example: <a href="urn:ojpkindbz:modelDefinition:iild3tm_uo">urn:ojpkindbz:modelDefinition:iild3tm_uo</a>.'
-    description: ''
-  - name: --simulated
-    parameterValueGroup: false, true
-    summary: Add this flag if you would like IoT Central to set this up as a simulated device. --instance-of is required if this is true.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a device
-    syntax:
-      content: az iot central app device delete --app-id {appid} --device-id {deviceid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all devices in IoT Central
-    syntax:
-      content: az iot central app device list --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-  description: >-
-    Note: This command can take a significant amount of time to return
-
-    if no device id is specified and your app contains a lot of devices.
-  langs:
-  - azurecli
-  examples:
-  - summary: Get registration info on specified device
-    syntax:
-      content: az iot central app device registration-info --app-id {appid} --device-id {deviceid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-  description: >-
-    Note: This command can take a significant amount of time to return
-
-    if your app contains a lot of devices.
-  langs:
-  - azurecli
-  examples:
-  - summary: Registration summary
-    syntax:
-      content: az iot central app device registration-summary --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a device
-    syntax:
-      content: az iot central app device show --app-id {appid} --device-id {deviceid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure IoT Central devices.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device-twin.yml
deleted file mode 100644
index 2d9e7f9ca6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/central/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_device_twin_show
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device.yml
deleted file mode 100644
index 323285d06b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_device_send_d2c_message
-  - ext_azure-iot_az_iot_device_simulate
-  - ext_azure-iot_az_iot_device_upload_file
-- uid: ext_azure-iot_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id}
-  - summary: Basic usage with custom data
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --data {message_body}
-  - summary: Send application properties
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props 'key0=value0;key1=value1'
-  - summary: Send system properties (Message Id and Correlation Id)
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props '$.mid=<id>;$.cid=<id>'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "1"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.'
-    description: ''
-  - name: --qos
-    defaultValue: "1"
-    parameterValueGroup: 0, 1
-    summary: Quality of Service. 0 = At most once, 1 = At least once. 2 (Exactly once) is not supported.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage (mqtt)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id}
-  - summary: Basic usage (mqtt) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --properties "myprop=myvalue;$.ct=application/json"
-  - summary: Basic usage (http)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http
-  - summary: Basic usage (http) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http --properties "iothub-app-myprop=myvalue;content-type=application/json;iothub-correlationid=12345"
-  - summary: Choose total message count and interval between messages
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --msg-count 1000 --msg-interval 5
-  - summary: Reject c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs reject --protocol http
-  - summary: Abandon c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs abandon --protocol http
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "100"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --mi --msg-interval
-    defaultValue: "3"
-    summary: Delay in seconds between device-to-cloud messages.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.  For http messaging - application properties are sent using iothub-app-<name>=value, for instance iothub-app-myprop=myvalue. System properties are generally prefixed with iothub-<name> like iothub-correlationid but there are exceptions such as content-type and content-encoding.'
-    description: ''
-  - name: --proto --protocol
-    defaultValue: mqtt
-    parameterValueGroup: http, mqtt
-    summary: Indicates device-to-cloud message protocol.
-    description: ''
-  - name: --receive-settle --rs
-    defaultValue: complete
-    parameterValueGroup: abandon, complete, reject
-    summary: Indicates how to settle received cloud-to-device messages. Supported with HTTP only.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --content-type --ct
-    summary: MIME Type of file.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --file-path --fp
-    summary: Path to file for upload.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-iot_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-iot_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Leverage device-to-cloud and cloud-to-device messaging capabilities.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml
deleted file mode 100644
index 1d3a0d9e97..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml
+++ /dev/null
@@ -1,219 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_device_c2d_message_abandon
-  - ext_azure-iot_az_iot_device_c2d_message_complete
-  - ext_azure-iot_az_iot_device_c2d_message_receive
-  - ext_azure-iot_az_iot_device_c2d_message_reject
-  - ext_azure-iot_az_iot_device_c2d_message_send
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lock-timeout --lt
-    defaultValue: "60"
-    summary: Specifies the amount of time a message will be invisible to other receive calls.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage with default message body
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name}
-  - summary: Send cloud-to-device message with custom data and properties.
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --data 'Hello World' --props 'key0=value0;key1=value1'
-  - summary: Send a C2D message and wait for device acknowledgement
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --ack full --wait
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --ack
-    parameterValueGroup: full, negative, positive
-    summary: 'Request the delivery of per-message feedback regarding the final state of that message. The description of ack values is as follows. Positive: If the c2d message reaches the Completed state, IoT Hub generates a feedback message. Negative: If the c2d message reaches the Dead lettered state, IoT Hub generates a feedback message. Full: IoT Hub generates a feedback message in either case. By default, no ack is requested.'
-    description: ''
-  - name: --ce --content-encoding
-    defaultValue: utf-8
-    summary: The content encoding associated with the C2D message.
-    description: ''
-  - name: --cid --correlation-id
-    summary: The correlation Id associated with the C2D message.
-    description: ''
-  - name: --content-type --ct
-    summary: The content type associated with the C2D message.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --expiry --expiry-time-utc
-    summary: Units are milliseconds since unix epoch. If no time is indicated the default IoT Hub C2D message TTL is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --message-id --mid
-    summary: The C2D message Id. If no message Id is provided a UUID will be generated.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --uid --user-id
-    summary: The C2D message, user Id property.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: If set the c2d send operation will block until device feedback has been received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Cloud-to-device messaging commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps.yml
deleted file mode 100644
index deafe7708a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml
deleted file mode 100644
index f397f6cc05..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml
+++ /dev/null
@@ -1,269 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dps_enrollment_group_create
-  - ext_azure-iot_az_iot_dps_enrollment_group_delete
-  - ext_azure-iot_az_iot_dps_enrollment_group_list
-  - ext_azure-iot_az_iot_dps_enrollment_group_show
-  - ext_azure-iot_az_iot_dps_enrollment_group_update
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using a CA certificate {certificate_name} as secondary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name}
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service 'MyDps' in the resource group '{resource_group_name}' with provisioning status 'enabled', target IoT Hub '{iothub_host_name}' and initial twin tags '{"location":{"region":"US"}} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem --provisioning-status enabled --iot-hub-host-name {iothub_host_name} --initial-twin-tags "{'location':{'region':'US'}}"
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} with attestation type 'symmetrickey'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {primary_key} --secondary-key {secondary_key}
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new initial twin tags.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-tags "{'location':{'region':'US2'}}" --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary intermediate certificate and remove existing secondary intermediate certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --remove-secondary-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new secondary CA certificate '{certificate_name}' and remove existing primary CA certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name} --remove-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary key.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml
deleted file mode 100644
index 045c13bad4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml
+++ /dev/null
@@ -1,286 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dps_enrollment_create
-  - ext_azure-iot_az_iot_dps_enrollment_delete
-  - ext_azure-iot_az_iot_dps_enrollment_list
-  - ext_azure-iot_az_iot_dps_enrollment_show
-  - ext_azure-iot_az_iot_dps_enrollment_update
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}'
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with provisioning status 'disabled', target IoT Hub '{iothub_host_name}', device id '{device_id}' and initial twin properties '{"location":{"region":"US"}}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem --provisioning-status disabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --device-id {device_id}
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'tpm' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'symmetrickey' in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --primary-key {primary_key} --secondary-key {secondary_key}
-  - summary: Create an enrollment 'MyEnrollment' with reprovision in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --reprovision-policy {reprovision_type} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with static allocation policy in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy static --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs {iot_hub_host_name}
-  - summary: Create an enrollment 'MyEnrollment' with hashed allocation policy and multiple hubs in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy hashed --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2}"
-  parameters:
-  - isRequired: true
-    name: --at --attestation-type
-    parameterValueGroup: symmetricKey, tpm, x509
-    summary: Attestation Mechanism.
-    description: ''
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device. When choosing tpm as attestation type, endorsement key is required.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment '{enrollment_id}' with a new x509 certificate in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new endorsement key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new primary key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new reprovision type in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --reprovision-policy {reprovision_type} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new allocation policy in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy geolatency --etag AAAAAAAAAAA= --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2} {iot_hub_host_name3}"
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml
deleted file mode 100644
index 8d4b135177..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dps_registration_delete
-  - ext_azure-iot_az_iot_dps_registration_list
-  - ext_azure-iot_az_iot_dps_registration_show
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service registrations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dt.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dt.yml
deleted file mode 100644
index ab8fb1138f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/dt.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dt_invoke_command
-  - ext_azure-iot_az_iot_dt_list_commands
-  - ext_azure-iot_az_iot_dt_list_interfaces
-  - ext_azure-iot_az_iot_dt_list_properties
-  - ext_azure-iot_az_iot_dt_monitor_events
-  - ext_azure-iot_az_iot_dt_update_property
-- uid: ext_azure-iot_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a command on device .
-    syntax:
-      content: az iot dt invoke-command --login {iothub_cs} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  - summary: Execute a command on device within current session.
-    syntax:
-      content: az iot dt invoke-command --hub-name {iothub_name} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --cn --command-name
-    summary: IoT Plug and Play interface command name.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --command-payload --cp --cv
-    summary: IoT Plug and Play interface command payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "10"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all commands of all private interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id}
-  - summary: List all commands of a private interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id} --interface {plug_and_play_interface}
-  - summary: List all commands of all public interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source public --device-id {device_id}
-  - summary: List all commands of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all IoT Plug and Play interfaces on a device.
-    syntax:
-      content: az iot dt list-interfaces --login {iothub_cs} --device-id {device_id}
-  - summary: List all IoT Plug and Play interfaces on a device within current session.
-    syntax:
-      content: az iot dt list-interfaces --hub-name {iothub_name} --device-id {device_id}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all properties of all device's interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id}
-  - summary: List all properties of all public interfaces on an IoT Plug and Play device within current session.
-    syntax:
-      content: az iot dt list-properties --hub-name {iothub_name} --device-id {device_id} --source public
-  - summary: List all properties of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage monitoring events of all devices and all interfaces using the logged in session.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name}
-  - summary: Basic usage monitoring events of all devices and all interfaces using an IotHub connection string.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs}
-  - summary: Basic usage when filtering on specific interface events while targeting devices with a wildcard in the ID.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -d Device* -i {plug_and_play_interface}
-  - summary: Filter Digital Twin events of a subset of devices using IoT Hub query language.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter events on a device with a particular interface. Use a custom consumer group when binding and see all message properties.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs} --device-id {device_id} --interface {plug_and_play_interface} --consumer-group {consumer_group_name} --properties all
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an IoT Plug and Play device interfaces read-write property.
-    syntax:
-      content: az iot dt update-property --login {iothub_cs} --device-id {device_id} --interface-payload {payload}
-  - summary: Update an IoT Plug and Play device interfaces read-write property within current session.
-    syntax:
-      content: az iot dt update-property --hub-name {iothub_name} --device-id {device_id} --interface-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface-payload --ip --iv
-    summary: IoT Plug and Play interface payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-iot_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-iot_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-iot_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage digital twin of an IoT Plug and Play device.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge.yml
deleted file mode 100644
index 7eb19af8af..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_edge_set_modules
-- uid: ext_azure-iot_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-  description: >-
-    Modules content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Note: Upon execution the command will output the collection of modules applied to the device.
-  langs:
-  - azurecli
-  examples:
-  - summary: Test edge modules while in development by setting modules on a target device.
-    syntax:
-      content: az iot edge set-modules --hub-name {iothub_name} --device-id {device_id} --content ../modules_content.json
-  parameters:
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT solutions on the Edge.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml
deleted file mode 100644
index 738bc77730..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml
+++ /dev/null
@@ -1,256 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_edge_deployment_create
-  - ext_azure-iot_az_iot_edge_deployment_delete
-  - ext_azure-iot_az_iot_edge_deployment_list
-  - ext_azure-iot_az_iot_edge_deployment_show
-  - ext_azure-iot_az_iot_edge_deployment_show_metric
-  - ext_azure-iot_az_iot_edge_deployment_update
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-  description: >-
-    Deployment content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Edge deployments can be created with user defined metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a deployment with labels (bash syntax example) that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{"key0":"value0", "key1":"value1"}' --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a deployment with labels (powershell syntax example) that applies for devices tagged with environment 'dev'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{\"key\":\"value\"}' --target-condition "tags.environment='dev'"
-  - summary: Create a layered deployment that applies for devices tagged with environment 'dev'. Both user metrics and modules content defined inline (cmd syntax example).
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content "{\"modulesContent\":{\"$edgeAgent\":{\"properties.desired.modules.mymodule0\":{ }},\"$edgeHub\":{\"properties.desired.routes.myroute0\":\"FROM /messages/* INTO $upstream\"}}}" --target-condition "tags.environment='dev'" --priority 10 --metrics "{\"queries\":{\"mymetrik\":\"SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200\"}}" --layered
-  - summary: Create a layered deployment that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content layered_modules_content.json --target-condition "tags.building=9 and tags.environment='test'" --metrics metrics_content.json --layered
-  parameters:
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: "Map of labels to be applied to target deployment. Use the following format: '{\"key0\":\"value0\", \"key1\":\"value1\"}'."
-    description: ''
-  - name: --layered
-    parameterValueGroup: false, true
-    summary: Layered deployments allow you to define desired properties in $edgeAgent, $edgeHub and user modules that will layer on top of a base deployment. For example the routes specified in a layered deployment will merge with routes of the base deployment. Routes with the same name will be overwritten based on deployment priority.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: IoT Edge deployment metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of deployment in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which an Edge deployment applies to.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of deployments to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the 'appliedCount' system metric
-    syntax:
-      content: az iot edge deployment show-metric -m appliedCount -d {deployment_name} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the labels and target condition of an existing edge deployment
-    syntax:
-      content: az iot edge deployment update -d {deployment_name} -n {iothub_name} --set labels='{"purpose":"dev", "owners":"IoTEngineering"}' targetCondition='tags.building=9'
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Edge deployments at scale.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub.yml
deleted file mode 100644
index 77058b7fe5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub.yml
+++ /dev/null
@@ -1,469 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_generate_sas_token
-  - ext_azure-iot_az_iot_hub_invoke_device_method
-  - ext_azure-iot_az_iot_hub_invoke_module_method
-  - ext_azure-iot_az_iot_hub_monitor_events
-  - ext_azure-iot_az_iot_hub_monitor_feedback
-  - ext_azure-iot_az_iot_hub_query
-- uid: ext_azure-iot_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-  description: For device SAS tokens, the policy parameter is used to access the the device registry only. Therefore the policy should have read access to the registry. For IoT Hub tokens the policy is part of the SAS.
-  langs:
-  - azurecli
-  examples:
-  - summary: Generate an IoT Hub SAS token using the iothubowner policy and primary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name}
-  - summary: Generate an IoT Hub SAS token using the registryRead policy and secondary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name} --policy registryRead --key-type secondary
-  - summary: Generate a device SAS token using the iothubowner policy to access the {iothub_name} device registry.
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} -n {iothub_name}
-  - summary: Generate a device SAS token using an IoT Hub connection string (with registry access)
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --du --duration
-    defaultValue: "3600"
-    summary: Valid token duration in seconds.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --pn --policy-name
-    defaultValue: iothubowner
-    summary: Shared access policy with operation permissions for target IoT Hub entity.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d Device*
-  - summary: Filter devices using IoT Hub query language
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --content-type application/json
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id}
-  - summary: Exit feedback monitor upon receiving a message with specific id (uuid)
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id} -w {message_id}
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --wait-on-msg -w
-    summary: Feedback monitor will block until a message with specific id (uuid) is received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-  description: Query an IoT Hub using a powerful SQL-like language to retrieve information regarding device and module twins, jobs and message routing. See <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language</a> for more information.
-  langs:
-  - azurecli
-  examples:
-  - summary: Query all device twin data in an Azure IoT Hub.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices"
-  - summary: Query all module twin data on target device.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices.modules where devices.deviceId = '{device_id}'"
-  parameters:
-  - isRequired: true
-    name: --query-command -q
-    summary: User query to be executed.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. By default query has no cap.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-iot_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-iot_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-iot_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-iot_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-iot_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-iot_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml
deleted file mode 100644
index 67c58b2cf6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml
+++ /dev/null
@@ -1,264 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_configuration_create
-  - ext_azure-iot_az_iot_hub_configuration_delete
-  - ext_azure-iot_az_iot_hub_configuration_list
-  - ext_azure-iot_az_iot_hub_configuration_show
-  - ext_azure-iot_az_iot_hub_configuration_show_metric
-  - ext_azure-iot_az_iot_hub_configuration_update
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-  description: >-
-    Configuration content is json and slighty varies based on device or module intent.
-
-
-    Device configurations are in the form of {"deviceContent":{...}} or {"content":{"deviceContent":{...}}}
-
-
-    Module configurations are in the form of {"moduleContent":{...}} or {"content":{"moduleContent":{...}}}
-
-
-    Configurations can be defined with user provided metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-
-
-    Note: Target condition for modules must start with "from devices.modules where".
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device configuration with a priority of 3 that applies on condition when a device is tagged in building 9 and the environment is 'test'.
-    syntax:
-      content: az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a device configuration with labels and provide user metrics inline (bash syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition \"tags.building=9\" --labels '{\"key0\":\"value0\", \"key1\":\"value1\"}' --priority 10 --metrics '{\"metrics\": {\"queries\": {\"mymetric\": \"select deviceId from devices where tags.location='US'\"}}}'"
-  - summary: Create a module configuration with labels and provide user metrics inline (cmd syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content module_content.json --target-condition \"from devices.modules where tags.building=9\" --labels \"{\\\"key0\\\":\\\"value0\\\", \\\"key1\\\":\\\"value1\\\"}\" --metrics \"{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\": \\\"select moduleId from devices.modules where tags.location='US'\\\"}}}\""
-  - summary: Create a module configuration with content and user metrics inline (powershell syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content '{\\\"moduleContent\\\": {\\\"properties.desired.chillerWaterSettings\\\": {\\\"temperature\\\": 38, \\\"pressure\\\": 78}}}' --target-condition \"from devices.modules where tags.building=9\" --priority 1 --metrics '{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\":\\\"select moduleId from devices.modules where tags.location=''US''\\\"}}}'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: Device configuration content. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: 'Map of labels to be applied to target configuration. Format example: {"key0":"value0", "key1":"value1"}.'
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: Device configuration metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of the device configuration in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which a device configuration applies to.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of configurations to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the user defined 'warningLimit' metric
-    syntax:
-      content: az iot hub configuration show-metric -m warningLimit -c {configuration_name} -n {iothub_name}
-  - summary: Evaluate the system 'appliedCount' metric
-    syntax:
-      content: az iot hub configuration show-metric --metric-id appliedCount -c {configuration_name} -n {iothub_name} --metric-type system
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the priority of a device configuration and update its target condition
-    syntax:
-      content: az iot hub configuration update -c {configuration_name} -n {iothub_name} --set priority=10 targetCondition="tags.building=43 and tags.environment='dev'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT automatic device management configuration at scale.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml
deleted file mode 100644
index 2be51e53e0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml
+++ /dev/null
@@ -1,490 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_device_identity_add_children
-  - ext_azure-iot_az_iot_hub_device_identity_create
-  - ext_azure-iot_az_iot_hub_device_identity_delete
-  - ext_azure-iot_az_iot_hub_device_identity_export
-  - ext_azure-iot_az_iot_hub_device_identity_get_parent
-  - ext_azure-iot_az_iot_hub_device_identity_import
-  - ext_azure-iot_az_iot_hub_device_identity_list
-  - ext_azure-iot_az_iot_hub_device_identity_list_children
-  - ext_azure-iot_az_iot_hub_device_identity_remove_children
-  - ext_azure-iot_az_iot_hub_device_identity_set_parent
-  - ext_azure-iot_az_iot_hub_device_identity_show
-  - ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  - ext_azure-iot_az_iot_hub_device_identity_update
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add non-edge devices as a children to the edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Add non-edge devices as a children to the edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name} -f
-  parameters:
-  - isRequired: true
-    name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an edge enabled IoT device with default authorization (shared private key).
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee
-  - summary: Create an edge enabled IoT device with default authorization (shared private key) and add child devices as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee --cl {child_device_id}
-  - summary: Create an IoT device with default authorization (shared private key) and set parent device as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --pd {edge_device_id}
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert valid for 10 days then use its thumbprint.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --valid-days 10
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert of default expiration (365 days) and output to target directory.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --output-dir /path/to/output
-  - summary: Create an IoT device with self-signed certificate authorization and explicitly provide primary and secondary thumbprints.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --ptp {thumbprint_1} --stp {thumbprint_2}
-  - summary: Create an IoT device with root CA authorization with disabled status and reason
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_ca --status disabled --status-reason 'for reasons'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --add-children --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --pd --set-parent
-    summary: Id of edge device.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sta --status
-    defaultValue: enabled
-    parameterValueGroup: disabled, enabled
-    summary: Set device status upon creation.
-    description: ''
-  - name: --star --status-reason
-    summary: Description for device status.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --bcu --blob-container-uri
-    summary: 'Blob Shared Access Signature URI with write, read, and delete access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication, you must supply an https:// URI.'
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --auth-type --storage-authentication-type
-    parameterValueGroup: identity, key
-    summary: Authentication type for communicating with the storage container.
-    description: ''
-  - name: --ik --include-keys
-    parameterValueGroup: false, true
-    summary: If set, keys are exported normally. Otherwise, keys are set to null in export output.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the parent device of the specified device.
-    syntax:
-      content: az iot hub device-identity get-parent -d {non_edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --ibcu --input-blob-container-uri
-    summary: 'Blob Shared Access Signature URI with read access to a blob container. This blob contains the operations to be performed on the identity registry. Note: when using Identity-based authentication, you must supply an https:// URI.'
-    description: ''
-  - isRequired: true
-    name: --obcu --output-blob-container-uri
-    summary: 'Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication, you must supply an https:// URI.'
-    description: ''
-  - name: --auth-type --storage-authentication-type
-    parameterValueGroup: identity, key
-    summary: Authentication type for communicating with the storage container.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show all assigned non-edge devices as comma-separated list.
-    syntax:
-      content: az iot hub device-identity list-children -d {edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove all mentioned devices as children of specified device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Remove all non-edge devices as children specified edge device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --remove-all
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --remove-all -a
-    summary: To remove all children.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the parent device of the specified non-edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} -n {iothub_name}
-  - summary: Set the parent device of the specified non-edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} --force -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - isRequired: true
-    name: --parent-device-id --pd
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-  description: Use --set followed by property assignments for updating a device. Leverage parameters returned from 'iot hub device-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Turn on edge capabilities for device
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set capabilities.iotEdge=true
-  - summary: Disable device status
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled
-  - summary: In one command
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled capabilities.iotEdge=true
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT devices.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml
deleted file mode 100644
index 193115d27f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_device_twin_replace
-  - ext_azure-iot_az_iot_hub_device_twin_show
-  - ext_azure-iot_az_iot_hub_device_twin_update
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace device twin with file contents.
-    syntax:
-      content: az iot hub device-twin replace -d {device_id} -n {iothub_name} -j ../mydevicetwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch device twin desired properties.
-    syntax:
-      content: az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
-  - summary: Patch device twin tags.
-    syntax:
-      content: "az iot hub device-twin update -n {iothub_name} -d {device_id} --tags '{\"country\": \"USA\"}'"
-  - summary: Patch removal of 'critical' desired property from parent 'temperature'
-    syntax:
-      content: "az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --desired
-    summary: Twin desired properties.
-    description: ''
-  - name: --tags
-    summary: Twin tags.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device twin configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml
deleted file mode 100644
index ef31fb33a6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_distributed_tracing_show
-  - ext_azure-iot_az_iot_hub_distributed_tracing_update
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the distributed tracing settings for a device
-    syntax:
-      content: az iot hub distributed-tracing show -d {device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the distributed tracing options for a device
-    syntax:
-      content: az iot hub distributed-tracing update -d {device_id} --sm on --sr 50 -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --sampling-mode --sm
-    parameterValueGroup: off, on
-    summary: Turns sampling for distributed tracing on and off. 1 is On and, 2 is Off.
-    description: ''
-  - isRequired: true
-    name: --sampling-rate --sr
-    summary: Controls the amount of messages sampled for adding trace context. This value isa percentage. Only values from 0 to 100 (inclusive) are permitted.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage distributed settings per-device.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml
deleted file mode 100644
index 6905280da1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_job_cancel
-  - ext_azure-iot_az_iot_hub_job_create
-  - ext_azure-iot_az_iot_hub_job_list
-  - ext_azure-iot_az_iot_hub_job_show
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel an IoT Hub job.
-    syntax:
-      content: az iot hub job cancel --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-  description: >-
-    When scheduling a twin update job, the twin patch is a required argument.
-
-    When scheduling a device method job, the method name and payload are required arguments.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create and schedule a job to update the twin tags of all devices.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}'"
-  - summary: Schedule job and block for result of "completed", "failed" or "cancelled". Specify poll interval in seconds.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}' --wait --poll-interval 30"
-  - summary: Create a job to update a desired twin property on a subset of devices, scheduled to run at an arbitrary future time.
-    syntax:
-      content: "az iot hub job create --job-id {job_name} --job-type scheduleUpdateTwin -n {iothub_name} --twin-patch '{\"properties\":{\"desired\": {\"temperatureF\": 65}}}' --start-time \"2020-01-08T12:19:56.868Z\" --query-condition \"deviceId IN ['MyDevice1', 'MyDevice2', 'MyDevice3']\""
-  - summary: Create and schedule a job to invoke a device method for a set of devices meeting a query condition.
-    syntax:
-      content: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -n {iothub_name} --method-name setSyncIntervalSec --method-payload 30 --query-condition "properties.reported.settings.syncIntervalSec != 30"
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - isRequired: true
-    name: --job-type --jt
-    parameterValueGroup: scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --duration --poll-duration
-    defaultValue: "600"
-    summary: Total duration in seconds where job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interval --poll-interval
-    defaultValue: "10"
-    summary: Interval in seconds that job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mct --method-connect-timeout
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait on device connection.
-    description: ''
-  - name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --method-payload --mp
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --method-response-timeout --mrt
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-  - name: --patch --twin-patch
-    summary: The desired twin patch. Provide file path or raw json.
-    description: ''
-  - name: --query-condition -q
-    summary: 'Condition for device query to get devices to execute the job on. Required if job type is scheduleDeviceMethod or scheduleUpdateTwin. Note: The service will prefix "SELECT \* FROM devices WHERE " to the input.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start --start-time
-    summary: The scheduled start of the job in ISO 8601 date time format. If no start time is provided, the job is queued for asap execution.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Max execution time in seconds, before job is terminated.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: Block until the created job is in a completed, failed or cancelled state. Will regularly poll on interval specified by --poll-interval.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all archived jobs within retention period (max of 30 days).
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name}
-  - summary: List all archived jobs projecting specific properties
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --query "[*].[jobId,type,status,startTime,endTime]"
-  - summary: List only update twin type jobs
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod
-  - summary: List device method jobs which have status "scheduled"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod --job-status scheduled
-  - summary: List device export jobs which have status "completed"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type export --job-status completed
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --job-status --js
-    parameterValueGroup: cancelled, completed, enqueued, failed, queued, running, scheduled, unknown
-    summary: The status of a scheduled job.
-    description: ''
-  - name: --job-type --jt
-    parameterValueGroup: export, import, scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a created job.
-    syntax:
-      content: az iot hub job show --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Hub jobs (v2).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml
deleted file mode 100644
index 37425fd36c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_module_identity_create
-  - ext_azure-iot_az_iot_hub_module_identity_delete
-  - ext_azure-iot_az_iot_hub_module_identity_list
-  - ext_azure-iot_az_iot_hub_module_identity_show
-  - ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  - ext_azure-iot_az_iot_hub_module_identity_update
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate module symmetric authentication keys
-    syntax:
-      content: az iot hub module-identity update -m {module_name} -d {device_id} -n {iothub_name} --set authentication.symmetricKey.primaryKey="" authentication.symmetricKey.secondaryKey=""
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device modules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml
deleted file mode 100644
index e268625e75..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_module_twin_replace
-  - ext_azure-iot_az_iot_hub_module_twin_show
-  - ext_azure-iot_az_iot_hub_module_twin_update
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace a module twin with file contents.
-    syntax:
-      content: az iot hub module-twin replace -d {device_id} -n {iothub_name} -m {module_name} -j ../mymodtwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch module twin desired properties.
-    syntax:
-      content: az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
-  - summary: Patch module twin tags.
-    syntax:
-      content: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --tags '{\"country\": \"USA\"}'"
-  - summary: Patch removal of 'critical' desired property from parent 'temperature'
-    syntax:
-      content: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --desired
-    summary: Twin desired properties.
-    description: ''
-  - name: --tags
-    summary: Twin tags.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device module twin configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp.yml
deleted file mode 100644
index 6af569e9cb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities of an IoT Plug and Play model repository.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp/capability-model.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp/capability-model.yml
deleted file mode 100644
index 041f7a2309..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp/capability-model.yml
+++ /dev/null
@@ -1,212 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_pnp_capability_model_create
-  - ext_azure-iot_az_iot_pnp_capability_model_delete
-  - ext_azure-iot_az_iot_pnp_capability_model_list
-  - ext_azure-iot_az_iot_pnp_capability_model_publish
-  - ext_azure-iot_az_iot_pnp_capability_model_show
-  - ext_azure-iot_az_iot_pnp_capability_model_update
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model create --def {plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model delete -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's capability-model.
-    syntax:
-      content: az iot pnp capability-model list -r {pnp_repository}
-  - summary: List all public capability-model.
-    syntax:
-      content: az iot pnp capability-model list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play models for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of capability-model to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish the capability-model to public repository.
-    syntax:
-      content: az iot pnp capability-model publish -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository capability-model.
-    syntax:
-      content: az iot pnp capability-model show -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  - summary: Get the details of public capability-model.
-    syntax:
-      content: az iot pnp capability-model show --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --expand
-    summary: Indicates whether to expand the device capability model's interface definitions or not.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model update --def {updated_plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage device capability models in an IoT Plug and Play model repository.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp/interface.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp/interface.yml
deleted file mode 100644
index a51f3fb1ba..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iot/pnp/interface.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_pnp_interface_create
-  - ext_azure-iot_az_iot_pnp_interface_delete
-  - ext_azure-iot_az_iot_pnp_interface_list
-  - ext_azure-iot_az_iot_pnp_interface_publish
-  - ext_azure-iot_az_iot_pnp_interface_show
-  - ext_azure-iot_az_iot_pnp_interface_update
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an interface in the company repository.
-    syntax:
-      content: az iot pnp interface create --def {plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an interface in the company repository.
-    syntax:
-      content: az iot pnp interface delete -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's interfaces.
-    syntax:
-      content: az iot pnp interface list -r {pnp_repository}
-  - summary: List all public interfaces.
-    syntax:
-      content: az iot pnp interface list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play interfaces for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of interface to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish an interface to public repository.
-    syntax:
-      content: az iot pnp interface publish -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository interface.
-    syntax:
-      content: az iot pnp interface show -r {pnp_repository} --interface {plug_and_play_interface_id}
-  - summary: Get the details of public interface.
-    syntax:
-      content: az iot pnp interface show --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an interface in the company repository.
-    syntax:
-      content: az iot pnp interface update --def {updated_plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage interfaces in an IoT Plug and Play model repository.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral.yml
deleted file mode 100644
index d6fc1e8948..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-- uid: ext_azure-iot_az_iotcentral_app_device_twin
-  name: az iotcentral app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central assets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/app.yml
deleted file mode 100644
index fa72bd7baa..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/app.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iotcentral_app_monitor_events
-- uid: ext_azure-iot_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>
-
-
-    DEPRECATED. Use 'az iot central app monitor-events' instead.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iotcentral_app_device_twin
-  name: az iotcentral app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/app/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/app/device-twin.yml
deleted file mode 100644
index 4fe5b33a30..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/app/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral_app_device_twin
-  name: az iotcentral app device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iotcentral_app_device_twin_show
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/device-twin.yml
deleted file mode 100644
index 3a282a3ba1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/azure-iot/iotcentral/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-  description: DEPRECATED. Use 'az iot central device-twin' instead.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iotcentral_device_twin_show
-- uid: ext_azure-iot_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: DEPRECATED. Use 'az iot central device-twin show' instead.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: DEPRECATED. Use 'az iot central device-twin' instead.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain.yml b/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain.yml
deleted file mode 100644
index 68c37de7c2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain
-  name: az blockchain
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_blockchain_az_blockchain_consortium
-  name: az blockchain consortium
-  summary: Blockchain consortium.
-- uid: ext_blockchain_az_blockchain_consortium_list
-  name: az blockchain consortium list
-  summary: List the available consortiums for a subscription.
-- uid: ext_blockchain_az_blockchain_member
-  name: az blockchain member
-  summary: Blockchain member.
-- uid: ext_blockchain_az_blockchain_member_create
-  name: az blockchain member create
-  summary: Create a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_delete
-  name: az blockchain member delete
-  summary: Delete a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list
-  name: az blockchain member list
-  summary: List the blockchain members.
-- uid: ext_blockchain_az_blockchain_member_list_api_key
-  name: az blockchain member list-api-key
-  summary: List the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list_consortium_member
-  name: az blockchain member list-consortium-member
-  summary: List the consortium members for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-  name: az blockchain member regenerate-api-key
-  summary: Regenerate the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_show
-  name: az blockchain member show
-  summary: Show the details about a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_update
-  name: az blockchain member update
-  summary: Update a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_wait
-  name: az blockchain member wait
-  summary: Wait until a blockchain member is created or deleted.
-- uid: ext_blockchain_az_blockchain_transaction_node
-  name: az blockchain transaction-node
-  summary: Blockchain transaction-node.
-- uid: ext_blockchain_az_blockchain_transaction_node_create
-  name: az blockchain transaction-node create
-  summary: Create a transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_delete
-  name: az blockchain transaction-node delete
-  summary: Delete the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_list
-  name: az blockchain transaction-node list
-  summary: List the transaction nodes for a blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-  name: az blockchain transaction-node list-api-key
-  summary: List the API keys for the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  name: az blockchain transaction-node regenerate-api-key
-  summary: Regenerate the API keys for the blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_show
-  name: az blockchain transaction-node show
-  summary: Show the details of the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_update
-  name: az blockchain transaction-node update
-  summary: Update the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_wait
-  name: az blockchain transaction-node wait
-  summary: Wait until the transaction node is created or deleted.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml b/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml
deleted file mode 100644
index 7983eab30a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain_consortium
-  name: az blockchain consortium
-  summary: Blockchain consortium.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blockchain_az_blockchain_consortium_list
-- uid: ext_blockchain_az_blockchain_consortium_list
-  name: az blockchain consortium list
-  summary: List the available consortiums for a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the available consortiums for a subscription.
-    syntax:
-      content: az blockchain consortium list --location "southeastasia"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_blockchain_az_blockchain_consortium_list
-  name: az blockchain consortium list
-  summary: List the available consortiums for a subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Blockchain consortium.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/member.yml b/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/member.yml
deleted file mode 100644
index 47e4f9a2f3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/member.yml
+++ /dev/null
@@ -1,313 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain_member
-  name: az blockchain member
-  summary: Blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blockchain_az_blockchain_member_create
-  - ext_blockchain_az_blockchain_member_delete
-  - ext_blockchain_az_blockchain_member_list
-  - ext_blockchain_az_blockchain_member_list_api_key
-  - ext_blockchain_az_blockchain_member_list_consortium_member
-  - ext_blockchain_az_blockchain_member_regenerate_api_key
-  - ext_blockchain_az_blockchain_member_show
-  - ext_blockchain_az_blockchain_member_update
-  - ext_blockchain_az_blockchain_member_wait
-- uid: ext_blockchain_az_blockchain_member_create
-  name: az blockchain member create
-  summary: Create a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a blockchain member.
-    syntax:
-      content: az blockchain member create --location "southeastasia" --consortium "ContoseConsortium" --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --validator-nodes-sku capacity=2 --protocol "Quorum" --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consortium
-    summary: Gets or sets the consortium for the blockchain member.
-    description: ''
-  - name: --consortium-management-account-password
-    summary: Sets the managed consortium management account password.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian member.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --password
-    summary: Sets the basic auth password of the blockchain member.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Corda, NotSpecified, Parity, Quorum
-    summary: Gets or sets the blockchain protocol.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Standard
-    summary: The Sku of the blockchain member.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validator-nodes-sku
-    summary: 'Gets or sets the blockchain validator nodes Sku. Expect value: capacity=xx.'
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_delete
-  name: az blockchain member delete
-  summary: Delete a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a blockchain member.
-    syntax:
-      content: az blockchain member delete --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_list
-  name: az blockchain member list
-  summary: List the blockchain members.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the blockchain members in a resource group.
-    syntax:
-      content: az blockchain member list --resource-group "mygroup"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_list_api_key
-  name: az blockchain member list-api-key
-  summary: List the API keys for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the API keys for a blockchain member.
-    syntax:
-      content: az blockchain member list-api-key --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_list_consortium_member
-  name: az blockchain member list-consortium-member
-  summary: List the consortium members for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the consortium members for a blockchain member.
-    syntax:
-      content: az blockchain member list-consortium-member --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-  name: az blockchain member regenerate-api-key
-  summary: Regenerate the API keys for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate the API keys for a blockchain member.
-    syntax:
-      content: az blockchain member regenerate-api-key --key-name "key1" --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --key-name
-    parameterValueGroup: key1, key2
-    summary: Gets or sets the API key name.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_show
-  name: az blockchain member show
-  summary: Show the details about a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details about a blockchain member.
-    syntax:
-      content: az blockchain member show --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_update
-  name: az blockchain member update
-  summary: Update a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a blockchain member.
-    syntax:
-      content: az blockchain member update --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --name "ContoseMember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consortium-management-account-password
-    summary: Sets the managed consortium management account password.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian member.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --password
-    summary: Sets the transaction node dns endpoint basic auth password.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_wait
-  name: az blockchain member wait
-  summary: Wait until a blockchain member is created or deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Wait until a blockchain member is created.
-    syntax:
-      content: az blockchain member wait --name "contosemember1" --resource-group "mygroup" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_blockchain_az_blockchain_member_create
-  name: az blockchain member create
-  summary: Create a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_delete
-  name: az blockchain member delete
-  summary: Delete a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list
-  name: az blockchain member list
-  summary: List the blockchain members.
-- uid: ext_blockchain_az_blockchain_member_list_api_key
-  name: az blockchain member list-api-key
-  summary: List the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list_consortium_member
-  name: az blockchain member list-consortium-member
-  summary: List the consortium members for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-  name: az blockchain member regenerate-api-key
-  summary: Regenerate the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_show
-  name: az blockchain member show
-  summary: Show the details about a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_update
-  name: az blockchain member update
-  summary: Update a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_wait
-  name: az blockchain member wait
-  summary: Wait until a blockchain member is created or deleted.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Blockchain member.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml b/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml
deleted file mode 100644
index 6a2d5c3d9f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml
+++ /dev/null
@@ -1,300 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain_transaction_node
-  name: az blockchain transaction-node
-  summary: Blockchain transaction-node.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blockchain_az_blockchain_transaction_node_create
-  - ext_blockchain_az_blockchain_transaction_node_delete
-  - ext_blockchain_az_blockchain_transaction_node_list
-  - ext_blockchain_az_blockchain_transaction_node_list_api_key
-  - ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  - ext_blockchain_az_blockchain_transaction_node_show
-  - ext_blockchain_az_blockchain_transaction_node_update
-  - ext_blockchain_az_blockchain_transaction_node_wait
-- uid: ext_blockchain_az_blockchain_transaction_node_create
-  name: az blockchain transaction-node create
-  summary: Create a transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a transaction node.
-    syntax:
-      content: az blockchain transaction-node create --member-name "contosemember1" --resource-group "mygroup" --location "southeastasia" --password "1234abcdEFG1" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian transaction node.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --password
-    summary: Sets the transaction node dns endpoint basic auth password.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_delete
-  name: az blockchain transaction-node delete
-  summary: Delete the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the transaction node.
-    syntax:
-      content: az blockchain transaction-node delete --member-name "contosemember1" --resource-group "mygroup" --name "txNode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_list
-  name: az blockchain transaction-node list
-  summary: List the transaction nodes for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the transaction nodes for a blockchain member.
-    syntax:
-      content: az blockchain transaction-node list --member-name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-  name: az blockchain transaction-node list-api-key
-  summary: List the API keys for the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the API keys for the transaction node.
-    syntax:
-      content: az blockchain transaction-node list-api-key --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  name: az blockchain transaction-node regenerate-api-key
-  summary: Regenerate the API keys for the blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate the API keys for the blockchain member.
-    syntax:
-      content: az blockchain transaction-node regenerate-api-key --key-name "key1" --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --key-name
-    parameterValueGroup: key1, key2
-    summary: Gets or sets the API key name.
-    description: ''
-  - name: --value
-    summary: Gets or sets the API key value.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_show
-  name: az blockchain transaction-node show
-  summary: Show the details of the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of the transaction node.
-    syntax:
-      content: az blockchain transaction-node show --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_update
-  name: az blockchain transaction-node update
-  summary: Update the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the transaction node.
-    syntax:
-      content: az blockchain transaction-node update --member-name "contosemember1" --resource-group "mygroup" --password "1234abcdEFG1" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian transaction node.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --password
-    summary: Sets the transaction node dns endpoint basic auth password.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_wait
-  name: az blockchain transaction-node wait
-  summary: Wait until the transaction node is created or deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Wait until the transaction node is created.
-    syntax:
-      content: az blockchain transaction-node wait --member-name "contosemember1" --resource-group "mygroup" --name "txNode2" --created
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_blockchain_az_blockchain_transaction_node_create
-  name: az blockchain transaction-node create
-  summary: Create a transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_delete
-  name: az blockchain transaction-node delete
-  summary: Delete the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_list
-  name: az blockchain transaction-node list
-  summary: List the transaction nodes for a blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-  name: az blockchain transaction-node list-api-key
-  summary: List the API keys for the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  name: az blockchain transaction-node regenerate-api-key
-  summary: Regenerate the API keys for the blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_show
-  name: az blockchain transaction-node show
-  summary: Show the details of the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_update
-  name: az blockchain transaction-node update
-  summary: Update the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_wait
-  name: az blockchain transaction-node wait
-  summary: Wait until the transaction node is created or deleted.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Blockchain transaction-node.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/blockchain/index.yml
deleted file mode 100644
index 8577fd9c74..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blockchain/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az
-  name: blockchain
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_blockchain_az_blockchain
-  name: az blockchain
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint.yml
deleted file mode 100644
index a4902b02c9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint.yml
+++ /dev/null
@@ -1,396 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint
-  name: az blueprint
-  summary: Commands to manage blueprint.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_create
-  - ext_blueprint_az_blueprint_delete
-  - ext_blueprint_az_blueprint_import
-  - ext_blueprint_az_blueprint_list
-  - ext_blueprint_az_blueprint_publish
-  - ext_blueprint_az_blueprint_show
-  - ext_blueprint_az_blueprint_update
-- uid: ext_blueprint_az_blueprint_create
-  name: az blueprint create
-  summary: Create a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint create --subscription MySubscription --name \
-
-        MyBlueprint --description \
-
-        "blueprint contains all artifacts" --target-scope \
-
-        subscription
-  - summary: Create a management group blueprint
-    syntax:
-      content: >-
-        az blueprint create --management-group MyManagementGroup --name \
-
-        MyBlueprint --description \
-
-        "blueprint contains all artifact" --target-scope \
-
-        subscription
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --display-name
-    summary: One-liner string explain this resource.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --target-scope
-    defaultValue: subscription
-    parameterValueGroup: managementGroup, subscription
-    summary: The scope where this blueprint definition can be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_delete
-  name: az blueprint delete
-  summary: Delete a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a management group blueprint
-    syntax:
-      content: >-
-        az blueprint delete --management-group MyManagementGroup --name \
-
-        MyBlueprint
-  - summary: Delete a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint delete --subscription MySubscription --name \
-
-        MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_import
-  name: az blueprint import
-  summary: Import a blueprint definition and artifacts from a directoy of json files.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import a blueprint definition and artifacts
-    syntax:
-      content: >-
-        az blueprint import --name MyBlueprint \
-
-        --input-path "path/to/blueprint/directory"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file should be named blueprint.json. Artifacts json files should be in a subdirectory named artifacts.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_list
-  name: az blueprint list
-  summary: List blueprint definitions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List blueprints in a management group
-    syntax:
-      content: az blueprint list --management-group MyManagementGroup
-  - summary: List blueprints in a subscription
-    syntax:
-      content: az blueprint list --subscription MySubscription
-  parameters:
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_publish
-  name: az blueprint publish
-  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish a management group blueprint
-    syntax:
-      content: >-
-        az blueprint publish --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  - summary: Publish a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint publish --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --change-notes
-    summary: Version-specific change notes.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_show
-  name: az blueprint show
-  summary: Get a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a management group blueprint
-    syntax:
-      content: >-
-        az blueprint show --management-group MyManagementGroup --name \
-
-        MyBlueprint
-  - summary: Show a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint show --subscription MySubscription --name \
-
-        MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_update
-  name: az blueprint update
-  summary: Update a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact
-  name: az blueprint artifact
-  summary: Commands to manage blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_delete
-  name: az blueprint artifact delete
-  summary: Delete a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_list
-  name: az blueprint artifact list
-  summary: List artifacts for a given blueprint definition.
-- uid: ext_blueprint_az_blueprint_artifact_policy
-  name: az blueprint artifact policy
-  summary: Commands to manage blueprint policy assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role
-  name: az blueprint artifact role
-  summary: Commands to manage blueprint role assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_show
-  name: az blueprint artifact show
-  summary: Get a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template
-  name: az blueprint artifact template
-  summary: Commands to manage blueprint ARM template artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_assignment
-  name: az blueprint assignment
-  summary: Commands to manage blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_create
-  name: az blueprint assignment create
-  summary: Create a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_delete
-  name: az blueprint assignment delete
-  summary: Delete a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_list
-  name: az blueprint assignment list
-  summary: List blueprint assignments within a subscription.
-- uid: ext_blueprint_az_blueprint_assignment_show
-  name: az blueprint assignment show
-  summary: Get a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_update
-  name: az blueprint assignment update
-  summary: Update a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_wait
-  name: az blueprint assignment wait
-  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
-- uid: ext_blueprint_az_blueprint_assignment_who
-  name: az blueprint assignment who
-  summary: Get Blueprint Servie Principal Name objectId.
-- uid: ext_blueprint_az_blueprint_create
-  name: az blueprint create
-  summary: Create a blueprint definition.
-- uid: ext_blueprint_az_blueprint_delete
-  name: az blueprint delete
-  summary: Delete a blueprint definition.
-- uid: ext_blueprint_az_blueprint_import
-  name: az blueprint import
-  summary: Import a blueprint definition and artifacts from a directoy of json files.
-- uid: ext_blueprint_az_blueprint_list
-  name: az blueprint list
-  summary: List blueprint definitions.
-- uid: ext_blueprint_az_blueprint_publish
-  name: az blueprint publish
-  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
-- uid: ext_blueprint_az_blueprint_resource_group
-  name: az blueprint resource-group
-  summary: Commands to manage blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_add
-  name: az blueprint resource-group add
-  summary: Add a resource group artifact to the blueprint.
-- uid: ext_blueprint_az_blueprint_resource_group_list
-  name: az blueprint resource-group list
-  summary: List blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_remove
-  name: az blueprint resource-group remove
-  summary: Remove a blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_show
-  name: az blueprint resource-group show
-  summary: Show blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_update
-  name: az blueprint resource-group update
-  summary: Update blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_show
-  name: az blueprint show
-  summary: Get a blueprint definition.
-- uid: ext_blueprint_az_blueprint_update
-  name: az blueprint update
-  summary: Update a blueprint definition.
-- uid: ext_blueprint_az_blueprint_version
-  name: az blueprint version
-  summary: Commands to manage published blueprint versions.
-- uid: ext_blueprint_az_blueprint_version_artifact
-  name: az blueprint version artifact
-  summary: Commands to manage published blueprint artifacts.
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_delete
-  name: az blueprint version delete
-  summary: Delete a published version of a blueprint.
-- uid: ext_blueprint_az_blueprint_version_list
-  name: az blueprint version list
-  summary: List published versions of given blueprint definition.
-- uid: ext_blueprint_az_blueprint_version_show
-  name: az blueprint version show
-  summary: Get a published version of a blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml
deleted file mode 100644
index ea50a39752..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact
-  name: az blueprint artifact
-  summary: Commands to manage blueprint artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_delete
-  - ext_blueprint_az_blueprint_artifact_list
-  - ext_blueprint_az_blueprint_artifact_show
-- uid: ext_blueprint_az_blueprint_artifact_delete
-  name: az blueprint artifact delete
-  summary: Delete a blueprint artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a role assignment artifact
-    syntax:
-      content: >-
-        az blueprint artifact delete --subscription MySubscription \
-
-        --blueprint-name MyBlueprint --name OwnerAssignment
-  - summary: Delete an ARM template artifact
-    syntax:
-      content: >-
-        az blueprint artifact delete --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --name StorageTemplate
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint artifact.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_list
-  name: az blueprint artifact list
-  summary: List artifacts for a given blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List artifcats for a management group blueprint
-    syntax:
-      content: >-
-        az blueprint artifact list --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint
-  - summary: List artifcats for a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint artifact list --subscription MySubscription \
-
-        --blueprint-name MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_show
-  name: az blueprint artifact show
-  summary: Get a blueprint artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an artifact of a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint artifact show --subscription MySubscription \
-
-        --blueprint-name MyBlueprint --name OwnerAssignment
-  - summary: Show an artifact of a management group blueprint
-    syntax:
-      content: >-
-        az blueprint artifact show --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --name StorageTemplate
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint artifact.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_delete
-  name: az blueprint artifact delete
-  summary: Delete a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_list
-  name: az blueprint artifact list
-  summary: List artifacts for a given blueprint definition.
-- uid: ext_blueprint_az_blueprint_artifact_policy
-  name: az blueprint artifact policy
-  summary: Commands to manage blueprint policy assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role
-  name: az blueprint artifact role
-  summary: Commands to manage blueprint role assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_show
-  name: az blueprint artifact show
-  summary: Get a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template
-  name: az blueprint artifact template
-  summary: Commands to manage blueprint ARM template artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml
deleted file mode 100644
index 58fa5fd652..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact_policy
-  name: az blueprint artifact policy
-  summary: Commands to manage blueprint policy assignment artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_policy_create
-  - ext_blueprint_az_blueprint_artifact_policy_update
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a policy artifact
-    syntax:
-      content: >-
-        az blueprint artifact policy create \
-
-        --blueprint-name MyBlueprint --artifact-name MyPolicy --policy-definition-id \
-
-        "/providers/Microsoft.Authorization/policyDefinitions/00000000-0000-0000-0000-000000000000" \
-
-        --parameters path/to/file --display-name "Policy to do sth"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --policy-definition-id
-    summary: The full policy definition id.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a policy artifact
-    syntax:
-      content: >-
-        az blueprint artifact policy update \
-
-        --blueprint-name MyBlueprint --artifact-name MyPolicy --display-name "My Policy"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint policy assignment artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml
deleted file mode 100644
index 83b7fd6be9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact_role
-  name: az blueprint artifact role
-  summary: Commands to manage blueprint role assignment artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_role_create
-  - ext_blueprint_az_blueprint_artifact_role_update
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a role artifact
-    syntax:
-      content: >-
-        az blueprint artifact role create \
-
-        --blueprint-name MyBlueprint --artifact-name MyRole --role-definition-id \
-
-        "/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000" \
-
-        --principal-ids "[parameters('[Usergrouporapplicationname]:MyRoleAssignmentName')]"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --principal-ids
-    summary: Array of user or group identities in Azure Active Directory or a reference to the corresponding parameter in blueprint definiton. The roleDefinition will apply to each identity.
-    description: ''
-  - isRequired: true
-    name: --role-definition-id
-    summary: The full role definition id. Only built-in roles are supported.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a role artifact
-    syntax:
-      content: >-
-        az blueprint artifact role update \
-
-        --blueprint-name MyBlueprint --artifact-name MyRole --display-name "My Big Role"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint role assignment artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml
deleted file mode 100644
index 34e84e1636..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact_template
-  name: az blueprint artifact template
-  summary: Commands to manage blueprint ARM template artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_template_create
-  - ext_blueprint_az_blueprint_artifact_template_update
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an arm artifact
-    syntax:
-      content: >-
-        az blueprint artifact template create \
-
-        --blueprint-name MyBlueprint --artifact-name MyTemplate \
-
-        --parameters path/to/parameter/file --template path/to/template
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --template -t
-    summary: ARM template in JSON string or path to JSON file.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a arm artifact
-    syntax:
-      content: >-
-        az blueprint artifact template update \
-
-        --blueprint-name MyBlueprint --artifact-name MyTemplate --display-name "My Template"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --template -t
-    summary: ARM template in JSON string or path to JSON file.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint ARM template artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml
deleted file mode 100644
index 31acf588f2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml
+++ /dev/null
@@ -1,339 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_assignment
-  name: az blueprint assignment
-  summary: Commands to manage blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_assignment_create
-  - ext_blueprint_az_blueprint_assignment_delete
-  - ext_blueprint_az_blueprint_assignment_list
-  - ext_blueprint_az_blueprint_assignment_show
-  - ext_blueprint_az_blueprint_assignment_update
-  - ext_blueprint_az_blueprint_assignment_wait
-  - ext_blueprint_az_blueprint_assignment_who
-- uid: ext_blueprint_az_blueprint_assignment_create
-  name: az blueprint assignment create
-  summary: Create a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Assignment with system-assigned managed identity
-    syntax:
-      content: >-
-        az blueprint assignment create --subscription MySubscription --name \
-
-        MyBlueprintAssignment --location eastus --identity-type SystemAssigned \
-
-        --description "Enforce pre-defined MyBlueprint to this subscription." \
-
-        --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup/provid \
-
-        ers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
-
-        --resource-group-value artifact_name=rg-art-1 name=rg1 location=westus \
-
-        --resource-group-value artifact_name=rg-art-2 name=rg2 location=eastus \
-
-        --parameters "path/to/parameter/file" \
-  - summary: Assignment with user-assigned managed identity
-    syntax:
-      content: >-
-        az blueprint assignment create --subscription MySubscription --name \
-
-        MyBlueprintAssignment --location eastus --identity-type UserAssigned \
-
-        --user-assigned-identities identity-id \
-
-        --description "Enforce pre-defined MyBlueprint to this subscription." \
-
-        --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup \
-
-        /providers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
-
-        --resource-group-value artifact_name=rg-art-1 name=rg1 location=eastus \
-
-        --parameters "path/to/parameter/file" \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --blueprint-version
-    summary: Resource ID of the published version of a blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --display-name
-    summary: One-liner string explain this resource.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --locks-excluded-principals
-    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
-    description: ''
-  - name: --locks-mode
-    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
-    summary: Lock mode.
-    description: ''
-  - name: --parameters -p
-    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-value
-    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
-    description: ''
-  - name: --identity-type
-    defaultValue: SystemAssigned
-    parameterValueGroup: None, SystemAssigned, UserAssigned
-    summary: Type of the managed identity.
-    description: ''
-  - name: --principal-id
-    summary: Azure Active Directory principal ID associated with this Identity.
-    description: ''
-  - name: --tenant-id
-    summary: ID of the Azure Active Directory.
-    description: ''
-  - name: --user-assigned-identities
-    summary: The list of user-assigned managed identities associated with the resource. Key is the Azure resource Id of the managed identity.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_delete
-  name: az blueprint assignment delete
-  summary: Delete a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an assignment
-    syntax:
-      content: >-
-        az blueprint assignment delete --subscription MySubscription \
-
-        --name MyBlueprintAssignment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_list
-  name: az blueprint assignment list
-  summary: List blueprint assignments within a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List assignments
-    syntax:
-      content: az blueprint assignment list --subscription MySubscription
-  parameters:
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_show
-  name: az blueprint assignment show
-  summary: Get a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an assignment
-    syntax:
-      content: >-
-        az blueprint assignment show --subscription MySubscription \
-
-        --name MyBlueprintAssignment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_update
-  name: az blueprint assignment update
-  summary: Update a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --blueprint-version
-    summary: Resource ID of the published version of a blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --display-name
-    summary: One-liner string explain this resource.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --locks-excluded-principals
-    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
-    description: ''
-  - name: --locks-mode
-    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
-    summary: Lock mode.
-    description: ''
-  - name: --parameters -p
-    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-value
-    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
-    description: ''
-  - name: --identity-type
-    defaultValue: SystemAssigned
-    parameterValueGroup: None, SystemAssigned, UserAssigned
-    summary: Type of the managed identity.
-    description: ''
-  - name: --principal-id
-    summary: Azure Active Directory principal ID associated with this Identity.
-    description: ''
-  - name: --tenant-id
-    summary: ID of the Azure Active Directory.
-    description: ''
-  - name: --user-assigned-identities
-    summary: The list of user-assigned managed identities associated with the resource. Key is the Azure resource Id of the managed identity.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_wait
-  name: az blueprint assignment wait
-  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Blueprint Assignment is successfully provisioned.
-    syntax:
-      content: az blueprint assignment wait --subscription MySubscription \ --name MyBlueprintAssignment --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_who
-  name: az blueprint assignment who
-  summary: Get Blueprint Servie Principal Name objectId.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get SPN objectId
-    syntax:
-      content: >-
-        az blueprint assignment who --subscription MySubscription \
-
-        --name MyBlueprintAssignment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_assignment_create
-  name: az blueprint assignment create
-  summary: Create a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_delete
-  name: az blueprint assignment delete
-  summary: Delete a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_list
-  name: az blueprint assignment list
-  summary: List blueprint assignments within a subscription.
-- uid: ext_blueprint_az_blueprint_assignment_show
-  name: az blueprint assignment show
-  summary: Get a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_update
-  name: az blueprint assignment update
-  summary: Update a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_wait
-  name: az blueprint assignment wait
-  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
-- uid: ext_blueprint_az_blueprint_assignment_who
-  name: az blueprint assignment who
-  summary: Get Blueprint Servie Principal Name objectId.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint assignment.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml
deleted file mode 100644
index f7c844416a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_resource_group
-  name: az blueprint resource-group
-  summary: Commands to manage blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_resource_group_add
-  - ext_blueprint_az_blueprint_resource_group_list
-  - ext_blueprint_az_blueprint_resource_group_remove
-  - ext_blueprint_az_blueprint_resource_group_show
-  - ext_blueprint_az_blueprint_resource_group_update
-- uid: ext_blueprint_az_blueprint_resource_group_add
-  name: az blueprint resource-group add
-  summary: Add a resource group artifact to the blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group add \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: Display name of this resource group artifact.
-    description: ''
-  - name: --rg-location
-    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
-    description: ''
-  - name: --rg-name
-    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
-    description: ''
-  - name: --tags
-    summary: Tags to be assigned to this resource group.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_list
-  name: az blueprint resource-group list
-  summary: List blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List resource group artifacts
-    syntax:
-      content: >-
-        az blueprint resource-group list \
-
-        --blueprint-name MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_remove
-  name: az blueprint resource-group remove
-  summary: Remove a blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group remove \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_show
-  name: az blueprint resource-group show
-  summary: Show blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group show \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_update
-  name: az blueprint resource-group update
-  summary: Update blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group update \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt --display-name "My Resource Group"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: Display name of this resource group artifact.
-    description: ''
-  - name: --rg-location
-    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
-    description: ''
-  - name: --rg-name
-    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
-    description: ''
-  - name: --tags
-    summary: Tags to be assigned to this resource group.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_resource_group_add
-  name: az blueprint resource-group add
-  summary: Add a resource group artifact to the blueprint.
-- uid: ext_blueprint_az_blueprint_resource_group_list
-  name: az blueprint resource-group list
-  summary: List blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_remove
-  name: az blueprint resource-group remove
-  summary: Remove a blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_show
-  name: az blueprint resource-group show
-  summary: Show blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_update
-  name: az blueprint resource-group update
-  summary: Update blueprint resource group artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint resource group artifact.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version.yml
deleted file mode 100644
index dee6f1e1d6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_version
-  name: az blueprint version
-  summary: Commands to manage published blueprint versions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_version_delete
-  - ext_blueprint_az_blueprint_version_list
-  - ext_blueprint_az_blueprint_version_show
-- uid: ext_blueprint_az_blueprint_version_delete
-  name: az blueprint version delete
-  summary: Delete a published version of a blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a published subscription blueprint
-    syntax:
-      content: >-
-        az blueprint version delete --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2
-  - summary: Delete a published management group blueprint
-    syntax:
-      content: >-
-        az blueprint version delete --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_version_list
-  name: az blueprint version list
-  summary: List published versions of given blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List published blueprints of a management group
-    syntax:
-      content: >-
-        az blueprint version list --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint
-  - summary: List published blueprints of a subscription
-    syntax:
-      content: >-
-        az blueprint version list --subscription MySubscription \
-
-        --blueprint-name MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_version_show
-  name: az blueprint version show
-  summary: Get a published version of a blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a published management group blueprint
-    syntax:
-      content: >-
-        az blueprint version show --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  - summary: Get a published subscription blueprint
-    syntax:
-      content: >-
-        az blueprint version show --subscription MySubscription \
-
-        --blueprint-name MyBlueprint --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_version_artifact
-  name: az blueprint version artifact
-  summary: Commands to manage published blueprint artifacts.
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_delete
-  name: az blueprint version delete
-  summary: Delete a published version of a blueprint.
-- uid: ext_blueprint_az_blueprint_version_list
-  name: az blueprint version list
-  summary: List published versions of given blueprint definition.
-- uid: ext_blueprint_az_blueprint_version_show
-  name: az blueprint version show
-  summary: Get a published version of a blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage published blueprint versions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml
deleted file mode 100644
index 747336d0b4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_version_artifact
-  name: az blueprint version artifact
-  summary: Commands to manage published blueprint artifacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_version_artifact_list
-  - ext_blueprint_az_blueprint_version_artifact_show
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List artifacts of a published management group blueprint
-    syntax:
-      content: >-
-        az blueprint version artifact list --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  - summary: List artifacts of a published subscription blueprint
-    syntax:
-      content: >-
-        az blueprint version artifact list --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a role assignment artifact
-    syntax:
-      content: >-
-        az blueprint version artifact show --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2 --artifact-name OwnerAssignment
-  - summary: Show a template artifact
-    syntax:
-      content: >-
-        az blueprint version artifact show --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2 --artifact-name StorageTemplate
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage published blueprint artifacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/blueprint/index.yml
deleted file mode 100644
index a6e2656849..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/blueprint/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az
-  name: blueprint
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_blueprint_az_blueprint
-  name: az blueprint
-  summary: Commands to manage blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace.yml b/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace.yml
deleted file mode 100644
index 1b710ce4a2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace.yml
+++ /dev/null
@@ -1,314 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az_codespace
-  name: az codespace
-  summary: Manage Visual Studio Codespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_codespaces_az_codespace_create
-  - ext_codespaces_az_codespace_delete
-  - ext_codespaces_az_codespace_list
-  - ext_codespaces_az_codespace_open
-  - ext_codespaces_az_codespace_resume
-  - ext_codespaces_az_codespace_show
-  - ext_codespaces_az_codespace_suspend
-- uid: ext_codespaces_az_codespace_create
-  name: az codespace create
-  summary: Create a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Codespace with default settings
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace
-  - summary: Create a Codespace with a different instance type with custom suspend time
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux --suspend-after 5
-  - summary: Create a Codespace with a git repo
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace --git-repo https://github.com/github/repo --git-user-name "User Name" --git-user-email user@example.com
-  - summary: Create a Codespace with a dotfiles repo
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace --dotfiles-repo https://github.com/github/dotfiles --dotfiles-path ~/dotfiles --dotfiles-command bootstrap.sh
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --instance-type
-    defaultValue: standardLinux
-    summary: Instance Type.
-    description: ''
-    valueFrom: az codespace location show
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --suspend-after
-    defaultValue: "30"
-    parameterValueGroup: 120, 30, 5
-    summary: Automatically suspend the inactive Codespace after this many minutes.
-    description: ''
-  - name: --dotfiles-command
-    summary: The command we'll run after cloning your dotfiles repository.
-    description: ''
-  - name: --dotfiles-path
-    summary: Path where you expect your dotfiles repository to be cloned into the Codespace.
-    description: ''
-  - name: --dotfiles-repo
-    summary: 'Url of dotfiles git repository. More info: <a href="https://aka.ms/vso-docs/reference/personalizing">https://aka.ms/vso-docs/reference/personalizing</a>.'
-    description: ''
-  - name: --git-repo
-    summary: Url of the git repository we'll clone into the Codespace.
-    description: ''
-  - name: --git-user-email
-    summary: Git user email. For example, the output of `git config user.email`.
-    description: ''
-  - name: --git-user-name
-    summary: Git username. For example, the output of `git config user.name`.
-    description: ''
-- uid: ext_codespaces_az_codespace_delete
-  name: az codespace delete
-  summary: Delete a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Codespace given name
-    syntax:
-      content: az codespace delete -g my-rg --plan my-plan --name my-codespace
-  - summary: Delete a Codespace given id
-    syntax:
-      content: az codespace delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Delete a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace delete --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_codespaces_az_codespace_list
-  name: az codespace list
-  summary: List Codespaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Codespaces
-    syntax:
-      content: az codespace list -g my-rg --plan my-plan
-  - summary: List Codespaces given plan id and Codespace name
-    syntax:
-      content: az codespace list --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_open
-  name: az codespace open
-  summary: Open a Codespace in the web browser.
-  description: Confirmation is required if the Codespace is not in the 'Available' state as opening a Codespace will automatically resume it.
-  langs:
-  - azurecli
-  examples:
-  - summary: Open a Codespace given name
-    syntax:
-      content: az codespace open -g my-rg --plan my-plan --name my-codespace
-  - summary: Open a Codespace given id
-    syntax:
-      content: az codespace open -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Open a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace open --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_codespaces_az_codespace_resume
-  name: az codespace resume
-  summary: Resume a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Resume a Codespace given name
-    syntax:
-      content: az codespace resume -g my-rg --plan my-plan --name my-codespace
-  - summary: Resume a Codespace given id
-    syntax:
-      content: az codespace resume -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Resume a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace resume --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_show
-  name: az codespace show
-  summary: Show details of a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a Codespace given name
-    syntax:
-      content: az codespace show -g my-rg --plan my-plan --name my-codespace
-  - summary: Show details of a Codespace given id
-    syntax:
-      content: az codespace show -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Show details of a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace show --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_suspend
-  name: az codespace suspend
-  summary: Suspend a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Suspend a Codespace given name
-    syntax:
-      content: az codespace suspend -g my-rg --plan my-plan --name my-codespace
-  - summary: Suspend a Codespace given id
-    syntax:
-      content: az codespace suspend -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Suspend a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace suspend --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_codespaces_az_codespace_create
-  name: az codespace create
-  summary: Create a Codespace.
-- uid: ext_codespaces_az_codespace_delete
-  name: az codespace delete
-  summary: Delete a Codespace.
-- uid: ext_codespaces_az_codespace_list
-  name: az codespace list
-  summary: List Codespaces.
-- uid: ext_codespaces_az_codespace_location
-  name: az codespace location
-  summary: Information on available regions.
-- uid: ext_codespaces_az_codespace_location_list
-  name: az codespace location list
-  summary: List available regions.
-- uid: ext_codespaces_az_codespace_location_show
-  name: az codespace location show
-  summary: Show details on a region.
-- uid: ext_codespaces_az_codespace_open
-  name: az codespace open
-  summary: Open a Codespace in the web browser.
-- uid: ext_codespaces_az_codespace_plan
-  name: az codespace plan
-  summary: Manage Codespace plans.
-- uid: ext_codespaces_az_codespace_plan_create
-  name: az codespace plan create
-  summary: Create a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_delete
-  name: az codespace plan delete
-  summary: Delete a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_list
-  name: az codespace plan list
-  summary: List Codespace plans.
-- uid: ext_codespaces_az_codespace_plan_show
-  name: az codespace plan show
-  summary: Show details of a Codespace plan.
-- uid: ext_codespaces_az_codespace_resume
-  name: az codespace resume
-  summary: Resume a Codespace.
-- uid: ext_codespaces_az_codespace_show
-  name: az codespace show
-  summary: Show details of a Codespace.
-- uid: ext_codespaces_az_codespace_suspend
-  name: az codespace suspend
-  summary: Suspend a Codespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Visual Studio Codespaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/location.yml b/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/location.yml
deleted file mode 100644
index 7541a804a1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/location.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az_codespace_location
-  name: az codespace location
-  summary: Information on available regions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_codespaces_az_codespace_location_list
-  - ext_codespaces_az_codespace_location_show
-- uid: ext_codespaces_az_codespace_location_list
-  name: az codespace location list
-  summary: List available regions.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_codespaces_az_codespace_location_show
-  name: az codespace location show
-  summary: Show details on a region.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the region.
-    description: ''
-commands:
-- uid: ext_codespaces_az_codespace_location_list
-  name: az codespace location list
-  summary: List available regions.
-- uid: ext_codespaces_az_codespace_location_show
-  name: az codespace location show
-  summary: Show details on a region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Information on available regions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/plan.yml b/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/plan.yml
deleted file mode 100644
index a092ec277f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/codespace/plan.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az_codespace_plan
-  name: az codespace plan
-  summary: Manage Codespace plans.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_codespaces_az_codespace_plan_create
-  - ext_codespaces_az_codespace_plan_delete
-  - ext_codespaces_az_codespace_plan_list
-  - ext_codespaces_az_codespace_plan_show
-- uid: ext_codespaces_az_codespace_plan_create
-  name: az codespace plan create
-  summary: Create a Codespace plan.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a plan in same region as resource group
-    syntax:
-      content: az codespace plan create -g my-rg -n my-plan
-  - summary: Create a plan in a specific region
-    syntax:
-      content: az codespace plan create -g my-rg -n my-plan -l westus2
-  - summary: Create a plan with tags
-    syntax:
-      content: az codespace plan create -g my-rg -n my-plan -l westus2 --tags tagname=tagvalue
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace plan.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_codespaces_az_codespace_plan_delete
-  name: az codespace plan delete
-  summary: Delete a Codespace plan.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a plan
-    syntax:
-      content: az codespace plan delete -g my-rg -n my-plan
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace plan.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_plan_list
-  name: az codespace plan list
-  summary: List Codespace plans.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List plans
-    syntax:
-      content: az codespace plan list
-  - summary: List plans in a given resource group
-    syntax:
-      content: az codespace plan list -g my-rg
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_plan_show
-  name: az codespace plan show
-  summary: Show details of a Codespace plan.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a plan
-    syntax:
-      content: az codespace plan show -g my-rg -n my-plan
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace plan.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_codespaces_az_codespace_plan_create
-  name: az codespace plan create
-  summary: Create a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_delete
-  name: az codespace plan delete
-  summary: Delete a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_list
-  name: az codespace plan list
-  summary: List Codespace plans.
-- uid: ext_codespaces_az_codespace_plan_show
-  name: az codespace plan show
-  summary: Show details of a Codespace plan.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Codespace plans.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/codespaces/index.yml
deleted file mode 100644
index 5da055cc05..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/codespaces/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az
-  name: codespaces
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_codespaces_az_codespace
-  name: az codespace
-  summary: Manage Visual Studio Codespaces.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml b/2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml
deleted file mode 100644
index 8b61979fb2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedk8s_az_connectedk8s
-  name: az connectedk8s
-  summary: Commands to manage connected kubernetes clusters.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_connectedk8s_az_connectedk8s_connect
-  - ext_connectedk8s_az_connectedk8s_delete
-  - ext_connectedk8s_az_connectedk8s_list
-  - ext_connectedk8s_az_connectedk8s_show
-- uid: ext_connectedk8s_az_connectedk8s_connect
-  name: az connectedk8s connect
-  summary: Onboard a connected kubernetes cluster to azure.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Onboard a connected kubernetes cluster with default kube config and kube context.
-    syntax:
-      content: az connectedk8s connect -g resourceGroupName -n connectedClusterName
-  - summary: Onboard a connected kubernetes cluster by specifying the kubeconfig and kubecontext.
-    syntax:
-      content: az connectedk8s connect -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the connected cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --kube-config
-    summary: Path to the kube config file.
-    description: ''
-  - name: --kube-context
-    summary: Kubconfig context from current machine.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_connectedk8s_az_connectedk8s_delete
-  name: az connectedk8s delete
-  summary: Delete a connected kubernetes cluster along with connected cluster agents.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a connected kubernetes cluster and connected cluster agents with default kubeconfig and kubecontext.
-    syntax:
-      content: az connectedk8s delete -g resourceGroupName -n connectedClusterName
-  - summary: Delete a connected kubernetes cluster by specifying the kubeconfig and kubecontext for connected cluster agents deletion.
-    syntax:
-      content: az connectedk8s delete -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the connected cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --kube-config
-    summary: Path to the kube config file.
-    description: ''
-  - name: --kube-context
-    summary: Kubconfig context from current machine.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_connectedk8s_az_connectedk8s_list
-  name: az connectedk8s list
-  summary: List connected kubernetes clusters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all connected kubernetes clusters in a resource group.
-    syntax:
-      content: az connectedk8s list -g resourceGroupName --subscription subscriptionName
-  - summary: List all connected kubernetes clusters in a subscription.
-    syntax:
-      content: az connectedk8s list --subscription subscriptionName
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_connectedk8s_az_connectedk8s_show
-  name: az connectedk8s show
-  summary: Show details of a connected kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details for a connected kubernetes cluster
-    syntax:
-      content: az connectedk8s show -g resourceGroupName -n connectedClusterName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the connected cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_connectedk8s_az_connectedk8s_connect
-  name: az connectedk8s connect
-  summary: Onboard a connected kubernetes cluster to azure.
-- uid: ext_connectedk8s_az_connectedk8s_delete
-  name: az connectedk8s delete
-  summary: Delete a connected kubernetes cluster along with connected cluster agents.
-- uid: ext_connectedk8s_az_connectedk8s_list
-  name: az connectedk8s list
-  summary: List connected kubernetes clusters.
-- uid: ext_connectedk8s_az_connectedk8s_show
-  name: az connectedk8s show
-  summary: Show details of a connected kubernetes cluster.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage connected kubernetes clusters.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/index.yml
deleted file mode 100644
index c9e8b64582..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/connectedk8s/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedk8s_az
-  name: connectedk8s
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_connectedk8s_az_connectedk8s
-  name: az connectedk8s
-  summary: Commands to manage connected kubernetes clusters.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml b/2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml
deleted file mode 100644
index 7f80cc9c85..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedmachine_az_connectedmachine
-  name: az connectedmachine
-  summary: Commands to manage Connected machines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_connectedmachine_az_connectedmachine_delete
-  - ext_connectedmachine_az_connectedmachine_list
-  - ext_connectedmachine_az_connectedmachine_show
-- uid: ext_connectedmachine_az_connectedmachine_delete
-  name: az connectedmachine delete
-  summary: Delete a Connected machine.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Connected machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_connectedmachine_az_connectedmachine_list
-  name: az connectedmachine list
-  summary: List Connected machines.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_connectedmachine_az_connectedmachine_show
-  name: az connectedmachine show
-  summary: Show details of a Connected machine.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Connected machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_connectedmachine_az_connectedmachine_delete
-  name: az connectedmachine delete
-  summary: Delete a Connected machine.
-- uid: ext_connectedmachine_az_connectedmachine_list
-  name: az connectedmachine list
-  summary: List Connected machines.
-- uid: ext_connectedmachine_az_connectedmachine_show
-  name: az connectedmachine show
-  summary: Show details of a Connected machine.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Connected machines.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/index.yml
deleted file mode 100644
index 843cf79c5b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/connectedmachine/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedmachine_az
-  name: connectedmachine
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_connectedmachine_az_connectedmachine
-  name: az connectedmachine
-  summary: Commands to manage Connected machines.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement.yml b/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement.yml
deleted file mode 100644
index 300c45264d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_costmanagement_az_costmanagement
-  name: az costmanagement
-  summary: Manage cost and billing in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_costmanagement_az_costmanagement_query
-- uid: ext_costmanagement_az_costmanagement_query
-  name: az costmanagement query
-  summary: Query the usage data for scope defined.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Query in ManagementGroup scope
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
-  - summary: Query in ManagementGroupQuery scope via grouping
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
-  - summary: Query in a ResourceGroup scope
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
-  - summary: Query in a ResourceGroupQuery scope via grouping
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceType" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
-  - summary: Query in a Subscription scope
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  - summary: Query in a Subscription scope via grouping
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes "/subscriptions/{subscriptionId}/" for subscription scope, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}" for resourceGroup scope, "/providers/Microsoft.Management/managementGroups/{managementGroupId}" for Management Group scope.
-    description: ''
-  - isRequired: true
-    name: --timeframe
-    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
-    summary: The time frame for pulling data for the query.If custom, then a specific time period must be provided.
-    description: ''
-  - isRequired: true
-    name: --type
-    parameterValueGroup: ActualCost, AmortizedCost, Usage
-    summary: The type of the query.
-    description: ''
-  - name: --dataset-aggregation
-    summary: 'Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the aliasfor the aggregated column. Query can have up to 2 aggregation clauses. Expected value: json-string/@json-file.'
-    description: ''
-  - name: --dataset-configuration
-    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
-    description: ''
-  - name: --dataset-filter
-    summary: 'Has filter expression to use in the query. Expected value: json-string/@json-file.'
-    description: ''
-  - name: --dataset-grouping
-    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses.Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
-    description: ''
-  - name: --time-period
-    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.'
-    description: ''
-commands:
-- uid: ext_costmanagement_az_costmanagement_export
-  name: az costmanagement export
-  summary: Costmanagement export.
-- uid: ext_costmanagement_az_costmanagement_export_create
-  name: az costmanagement export create
-  summary: The operation to create an export.
-- uid: ext_costmanagement_az_costmanagement_export_delete
-  name: az costmanagement export delete
-  summary: The operation to delete an export.
-- uid: ext_costmanagement_az_costmanagement_export_list
-  name: az costmanagement export list
-  summary: The operation to list all exports at the given scope.
-- uid: ext_costmanagement_az_costmanagement_export_show
-  name: az costmanagement export show
-  summary: The operation to get the execution history of an export for the defined scope by export name.
-- uid: ext_costmanagement_az_costmanagement_export_update
-  name: az costmanagement export update
-  summary: The operation to update an export.
-- uid: ext_costmanagement_az_costmanagement_query
-  name: az costmanagement query
-  summary: Query the usage data for scope defined.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage cost and billing in Azure.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml b/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml
deleted file mode 100644
index 302bd3cdc1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_costmanagement_az_costmanagement_export
-  name: az costmanagement export
-  summary: Costmanagement export.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_costmanagement_az_costmanagement_export_create
-  - ext_costmanagement_az_costmanagement_export_delete
-  - ext_costmanagement_az_costmanagement_export_list
-  - ext_costmanagement_az_costmanagement_export_show
-  - ext_costmanagement_az_costmanagement_export_update
-- uid: ext_costmanagement_az_costmanagement_export_create
-  name: az costmanagement export create
-  summary: The operation to create an export.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an export for ManagementGroup scope
-    syntax:
-      content: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: Create an export for ResourceGroup scope
-    syntax:
-      content: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: Create an export for Subscription scope
-    syntax:
-      content: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-  - isRequired: true
-    name: --storage-account-id
-    summary: The ID of the storage account to store exports.
-    description: ''
-  - isRequired: true
-    name: --storage-container
-    summary: The storage container to deliver exports.
-    description: ''
-  - name: --storage-directory
-    summary: The root directory in the storage container to store exports.
-    description: ''
-  - isRequired: true
-    name: --timeframe
-    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
-    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
-    description: ''
-  - name: --dataset-configuration
-    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
-    description: ''
-  - name: --dataset-grouping
-    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
-    description: ''
-  - name: --time-period
-    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
-    description: ''
-  - name: --type
-    parameterValueGroup: ActualCost, AmortizedCost, Usage
-    summary: The type of the query.
-    description: ''
-  - name: --recurrence
-    parameterValueGroup: Annually, Daily, Monthly, Weekly
-    summary: The schedule recurrence.
-    description: ''
-  - name: --recurrence-period
-    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
-    description: ''
-  - name: --schedule-status
-    parameterValueGroup: Active, Inactive
-    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_delete
-  name: az costmanagement export delete
-  summary: The operation to delete an export.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: delete an export for a ManagementGroup scope
-    syntax:
-      content: az costmanagement export delete --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: delete an export for ResourceGroup scope
-    syntax:
-      content: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: delete an export for Subscription scope
-    syntax:
-      content: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_list
-  name: az costmanagement export list
-  summary: The operation to list all exports at the given scope.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: list exports in a ManagementGroup scope
-    syntax:
-      content: az costmanagement export list --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: list exports in a ResourceGroup scope
-    syntax:
-      content: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: list exports in a Subscription scope
-    syntax:
-      content: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_show
-  name: az costmanagement export show
-  summary: The operation to get the execution history of an export for the defined scope by export name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an export in a ManagementGroup scope
-    syntax:
-      content: az costmanagement export show --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: Show an export in a ResourceGroup scope
-    syntax:
-      content: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: Show an export in a Subscription scope
-    syntax:
-      content: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_update
-  name: az costmanagement export update
-  summary: The operation to update an export.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an export in a ManagementGroup scope
-    syntax:
-      content: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: Update an export in a ResourceGroup scope
-    syntax:
-      content: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: Update an export in a Subscription scope
-    syntax:
-      content: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-  - name: --storage-account-id
-    summary: The ID of the storage account to store exports.
-    description: ''
-  - name: --storage-container
-    summary: The storage container to deliver exports.
-    description: ''
-  - name: --storage-directory
-    summary: The root directory in the storage container to store exports.
-    description: ''
-  - name: --dataset-configuration
-    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
-    description: ''
-  - name: --dataset-grouping
-    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
-    description: ''
-  - name: --time-period
-    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
-    description: ''
-  - name: --timeframe
-    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
-    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
-    description: ''
-  - name: --recurrence
-    parameterValueGroup: Annually, Daily, Monthly, Weekly
-    summary: The schedule recurrence.
-    description: ''
-  - name: --recurrence-period
-    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
-    description: ''
-  - name: --schedule-status
-    parameterValueGroup: Active, Inactive
-    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
-    description: ''
-commands:
-- uid: ext_costmanagement_az_costmanagement_export_create
-  name: az costmanagement export create
-  summary: The operation to create an export.
-- uid: ext_costmanagement_az_costmanagement_export_delete
-  name: az costmanagement export delete
-  summary: The operation to delete an export.
-- uid: ext_costmanagement_az_costmanagement_export_list
-  name: az costmanagement export list
-  summary: The operation to list all exports at the given scope.
-- uid: ext_costmanagement_az_costmanagement_export_show
-  name: az costmanagement export show
-  summary: The operation to get the execution history of an export for the defined scope by export name.
-- uid: ext_costmanagement_az_costmanagement_export_update
-  name: az costmanagement export update
-  summary: The operation to update an export.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Costmanagement export.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/index.yml
deleted file mode 100644
index 55d21a7c64..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/costmanagement/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_costmanagement_az
-  name: costmanagement
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_costmanagement_az_costmanagement
-  name: az costmanagement
-  summary: Manage cost and billing in Azure.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware.yml
deleted file mode 100644
index 2310a9a176..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware
-  name: az csvmware
-  summary: Manage Azure VMware Solution by CloudSimple.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_csvmware_az_csvmware_private_cloud
-  name: az csvmware private-cloud
-  summary: Manage VMware private clouds.
-- uid: ext_csvmware_az_csvmware_private_cloud_list
-  name: az csvmware private-cloud list
-  summary: List details of private clouds in a region.
-- uid: ext_csvmware_az_csvmware_private_cloud_show
-  name: az csvmware private-cloud show
-  summary: Get the details of a private cloud in a region.
-- uid: ext_csvmware_az_csvmware_resource_pool
-  name: az csvmware resource-pool
-  summary: Manage VMware resource pools.
-- uid: ext_csvmware_az_csvmware_resource_pool_list
-  name: az csvmware resource-pool list
-  summary: List details of resource pools in a private cloud.
-- uid: ext_csvmware_az_csvmware_resource_pool_show
-  name: az csvmware resource-pool show
-  summary: Get the details of a resource pool in a private cloud.
-- uid: ext_csvmware_az_csvmware_virtual_network
-  name: az csvmware virtual-network
-  summary: Manage virtual networks.
-- uid: ext_csvmware_az_csvmware_virtual_network_list
-  name: az csvmware virtual-network list
-  summary: List details of available virtual networks in a private cloud.
-- uid: ext_csvmware_az_csvmware_virtual_network_show
-  name: az csvmware virtual-network show
-  summary: Get the details of a virtual network in a private cloud.
-- uid: ext_csvmware_az_csvmware_vm
-  name: az csvmware vm
-  summary: Manage VMware virtual machines.
-- uid: ext_csvmware_az_csvmware_vm_create
-  name: az csvmware vm create
-  summary: Create a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_delete
-  name: az csvmware vm delete
-  summary: Delete a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk
-  name: az csvmware vm disk
-  summary: Manage VMware virtual machine's disks.
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-- uid: ext_csvmware_az_csvmware_vm_list
-  name: az csvmware vm list
-  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
-- uid: ext_csvmware_az_csvmware_vm_nic
-  name: az csvmware vm nic
-  summary: Manage VMware virtual machine's Network Interface Cards.
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-- uid: ext_csvmware_az_csvmware_vm_show
-  name: az csvmware vm show
-  summary: Get the details of a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_start
-  name: az csvmware vm start
-  summary: Start a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_stop
-  name: az csvmware vm stop
-  summary: Stop/Reboot/Suspend a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_update
-  name: az csvmware vm update
-  summary: Update the tags field of a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_template
-  name: az csvmware vm-template
-  summary: Manage VMware virtual machine templates.
-- uid: ext_csvmware_az_csvmware_vm_template_list
-  name: az csvmware vm-template list
-  summary: List details of VMware virtual machines templates in a private cloud.
-- uid: ext_csvmware_az_csvmware_vm_template_show
-  name: az csvmware vm-template show
-  summary: Get the details of a VMware virtual machines template in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure VMware Solution by CloudSimple.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml
deleted file mode 100644
index 57407adb56..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_private_cloud
-  name: az csvmware private-cloud
-  summary: Manage VMware private clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_private_cloud_list
-  - ext_csvmware_az_csvmware_private_cloud_show
-- uid: ext_csvmware_az_csvmware_private_cloud_list
-  name: az csvmware private-cloud list
-  summary: List details of private clouds in a region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of private clouds in East US.
-    syntax:
-      content: az csvmware private-cloud list --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-- uid: ext_csvmware_az_csvmware_private_cloud_show
-  name: az csvmware private-cloud show
-  summary: Get the details of a private cloud in a region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a private cloud which is in East US.
-    syntax:
-      content: az csvmware private-cloud show -n MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_private_cloud_list
-  name: az csvmware private-cloud list
-  summary: List details of private clouds in a region.
-- uid: ext_csvmware_az_csvmware_private_cloud_show
-  name: az csvmware private-cloud show
-  summary: Get the details of a private cloud in a region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware private clouds.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml
deleted file mode 100644
index 7c43e2b2da..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_resource_pool
-  name: az csvmware resource-pool
-  summary: Manage VMware resource pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_resource_pool_list
-  - ext_csvmware_az_csvmware_resource_pool_show
-- uid: ext_csvmware_az_csvmware_resource_pool_list
-  name: az csvmware resource-pool list
-  summary: List details of resource pools in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of resource pools.
-    syntax:
-      content: az csvmware resource-pool list -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-- uid: ext_csvmware_az_csvmware_resource_pool_show
-  name: az csvmware resource-pool show
-  summary: Get the details of a resource pool in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a resource pool.
-    syntax:
-      content: az csvmware resource-pool show -n MyResourcePool -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_resource_pool_list
-  name: az csvmware resource-pool list
-  summary: List details of resource pools in a private cloud.
-- uid: ext_csvmware_az_csvmware_resource_pool_show
-  name: az csvmware resource-pool show
-  summary: Get the details of a resource pool in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware resource pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml
deleted file mode 100644
index 842b1d24f9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_virtual_network
-  name: az csvmware virtual-network
-  summary: Manage virtual networks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_virtual_network_list
-  - ext_csvmware_az_csvmware_virtual_network_show
-- uid: ext_csvmware_az_csvmware_virtual_network_list
-  name: az csvmware virtual-network list
-  summary: List details of available virtual networks in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of virtual networks.
-    syntax:
-      content: az csvmware virtual-network list -p MyPrivateCloud -r MyResourcePool --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-pool -r
-    summary: ID of the resource pool used to derive vSphere cluster which contains virtual networks. You can also pass the basename of the ID.
-    description: ''
-- uid: ext_csvmware_az_csvmware_virtual_network_show
-  name: az csvmware virtual-network show
-  summary: Get the details of a virtual network in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a virtual network.
-    syntax:
-      content: az csvmware virtual-network show -n MyVirtualNetwork -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ID of the virtual network (vsphereId). You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_virtual_network_list
-  name: az csvmware virtual-network list
-  summary: List details of available virtual networks in a private cloud.
-- uid: ext_csvmware_az_csvmware_virtual_network_show
-  name: az csvmware virtual-network show
-  summary: Get the details of a virtual network in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual networks.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml
deleted file mode 100644
index 88ca124707..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm_template
-  name: az csvmware vm-template
-  summary: Manage VMware virtual machine templates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_template_list
-  - ext_csvmware_az_csvmware_vm_template_show
-- uid: ext_csvmware_az_csvmware_vm_template_list
-  name: az csvmware vm-template list
-  summary: List details of VMware virtual machines templates in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of VM templates.
-    syntax:
-      content: az csvmware vm-template list -p MyPrivateCloud -r MyResourcePool --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-pool -r
-    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_template_show
-  name: az csvmware vm-template show
-  summary: Get the details of a VMware virtual machines template in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a VM template.
-    syntax:
-      content: az csvmware vm-template show  -n MyVmTemplate -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ID of the vSphere virtual machine template. You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_template_list
-  name: az csvmware vm-template list
-  summary: List details of VMware virtual machines templates in a private cloud.
-- uid: ext_csvmware_az_csvmware_vm_template_show
-  name: az csvmware vm-template show
-  summary: Get the details of a VMware virtual machines template in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machine templates.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm.yml
deleted file mode 100644
index 6f7f9b23a6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm.yml
+++ /dev/null
@@ -1,309 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm
-  name: az csvmware vm
-  summary: Manage VMware virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_create
-  - ext_csvmware_az_csvmware_vm_delete
-  - ext_csvmware_az_csvmware_vm_list
-  - ext_csvmware_az_csvmware_vm_show
-  - ext_csvmware_az_csvmware_vm_start
-  - ext_csvmware_az_csvmware_vm_stop
-  - ext_csvmware_az_csvmware_vm_update
-- uid: ext_csvmware_az_csvmware_vm_create
-  name: az csvmware vm create
-  summary: Create a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creating a VM with default parameters from the vm template.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate
-  - summary: Creating a VM and adding an extra nic to the VM with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot. The name entered in the nic is for identification purposes only, to see if such a nic name exists in the vm template, else a nic is created and a new name is assigned. Lets say the vm template contains a nic with name "Network adapter 1".
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
-  - summary: Customizing specific properties of a VM. Changing the number of cores to 2 and adapter of "Network adapter 1" nic to E1000E, from that specified in the template. All other properties would be defaulted from the template.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --cores 2 --nic name="Network adapter 1" adapter=E1000E
-  - summary: Customizing specific properties of a VM. Changing the adapter of "Network adapter 1" nic to E1000E, from that specified in the template, and also adding another nic with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name="Network adapter 1" adapter=E1000E --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
-  - summary: Creating a VM and adding an extra disk to the VM with SCSI controller 0, persistent mode, and 41943040 KB size. The name entered in the disk is for identification purposes only, to see if such a disk name exists in the vm template, else a disk is created and a new name is assigned. Lets say the vm template contains a disk with name "Hard disk 1".
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
-  - summary: Customizing specific properties of a VM. Changing the size of "Hard disk 1" disk to 21943040 KB, from that specified in the template, and also adding another disk with SCSI controller 0, persistent mode, and 41943040 KB size.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name="Hard disk 1" size=21943040 --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-pool -r
-    summary: ID of the VMware resource pool for this virtual machine in your CloudSimple Private Cloud. You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --template
-    summary: ID of the vSphere template from which this virtual machine will be created. You can also pass the basename of the ID.
-    description: ''
-  - name: --cores
-    summary: The number of CPU cores required. The default is taken from the vSphere VM template specified.
-    description: ''
-  - name: --expose-to-guest-vm
-    parameterValueGroup: false, true
-    summary: Will expose full CPU virtualization to the guest operating system. The default is taken from the vSphere VM template specified.
-    description: ''
-  - name: --location -l
-    summary: Region in which the private cloud is present. If default location is not configured, will default to the resource group's location.
-    description: ''
-  - name: --ram
-    summary: The amount of memory in MB. The default is taken from the vSphere VM template specified.
-    description: ''
-  - name: --nic
-    summary: Add or modify NICs.
-    description: >-
-      By default, the nics will be added according to the vSphere VM template.
-
-      You can add more nics, or modify some properties of a nic specified in the VM template.
-
-      Multiple nics can be specified by using more than one `--nic` argument.
-
-      If a nic name already exists in the VM template, that nic would be modified according to the user input.
-
-      If a nic name does not exist in the VM template, a new nic would be created and a new name will be assigned to it.
-
-      Usage:   --nic name=MyNicName virtual-network=MyNetwork adapter=MyAdapter power-on-boot=True/False.
-  - name: --disk
-    summary: Add or modify disks.
-    description: >-
-      By default, the disks will be added according to the vSphere VM template.
-
-      You can add more disks, or modify some properties of a disk specified in the VM template.
-
-      Multiple disks can be specified by using more than one `--disk` argument.
-
-      If a disk name already exists in the VM template, that disk would be modified according to the user input.
-
-      If a disk name does not exist in the VM template, a new disk would be created and a new name will be assigned to it.
-
-      Usage:   --disk name=MyDiskName controller=SCSIControllerID mode=IndependenceMode size=DiskSizeInKB.
-- uid: ext_csvmware_az_csvmware_vm_delete
-  name: az csvmware vm delete
-  summary: Delete a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a VMware VM.
-    syntax:
-      content: az csvmware vm delete -n MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_list
-  name: az csvmware vm list
-  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of VMware VMs in the current subscription.
-    syntax:
-      content: az csvmware vm list
-  - summary: List details of VMware VMs in a particular resource group.
-    syntax:
-      content: az csvmware vm list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_show
-  name: az csvmware vm show
-  summary: Get the details of a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a VMware VM.
-    syntax:
-      content: az csvmware vm show -n MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_start
-  name: az csvmware vm start
-  summary: Start a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Start a VMware VM.
-    syntax:
-      content: az csvmware vm start -n MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_stop
-  name: az csvmware vm stop
-  summary: Stop/Reboot/Suspend a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Power off a VMware VM.
-    syntax:
-      content: az csvmware vm stop -n MyVm -g MyResourceGroup --mode poweroff
-  - summary: Restart a VMware VM.
-    syntax:
-      content: az csvmware vm stop -n MyVm -g MyResourceGroup --mode reboot
-  parameters:
-  - isRequired: true
-    name: --mode
-    parameterValueGroup: poweroff, reboot, shutdown, suspend
-    summary: Stop mode.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_update
-  name: az csvmware vm update
-  summary: Update the tags field of a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add or update a tag.
-    syntax:
-      content: az csvmware vm update -n MyVm -g MyResourceGroup --set tags.tagName=tagValue
-  - summary: Remove a tag.
-    syntax:
-      content: az csvmware vm update -n MyVm -g MyResourceGroup --remove tags.tagName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_create
-  name: az csvmware vm create
-  summary: Create a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_delete
-  name: az csvmware vm delete
-  summary: Delete a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk
-  name: az csvmware vm disk
-  summary: Manage VMware virtual machine's disks.
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-- uid: ext_csvmware_az_csvmware_vm_list
-  name: az csvmware vm list
-  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
-- uid: ext_csvmware_az_csvmware_vm_nic
-  name: az csvmware vm nic
-  summary: Manage VMware virtual machine's Network Interface Cards.
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-- uid: ext_csvmware_az_csvmware_vm_show
-  name: az csvmware vm show
-  summary: Get the details of a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_start
-  name: az csvmware vm start
-  summary: Start a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_stop
-  name: az csvmware vm stop
-  summary: Stop/Reboot/Suspend a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_update
-  name: az csvmware vm update
-  summary: Update the tags field of a VMware virtual machine.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machines.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml
deleted file mode 100644
index c4158f3866..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm_disk
-  name: az csvmware vm disk
-  summary: Manage VMware virtual machine's disks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_disk_add
-  - ext_csvmware_az_csvmware_vm_disk_delete
-  - ext_csvmware_az_csvmware_vm_disk_list
-  - ext_csvmware_az_csvmware_vm_disk_show
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a disk with default parameters in a VM.
-    syntax:
-      content: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup
-  - summary: Add a disk with SATA controller 0 and 64 GB memory in a VM.
-    syntax:
-      content: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup --controller 15000 --size 67108864
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - name: --controller
-    defaultValue: "1000"
-    summary: Id of the controller. Input 1000 for SCSI controller 0, and 15000 for SATA controller 0.
-    description: ''
-  - name: --mode
-    defaultValue: persistent
-    parameterValueGroup: independent_nonpersistent, independent_persistent, persistent
-    summary: The disk independence mode.
-    description: ''
-  - name: --size
-    defaultValue: "16777216"
-    summary: The amount of disk size in KB.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete two disks from a VM.
-    syntax:
-      content: az csvmware vm disk delete --vm-name MyVm -g MyResourceGroup --disks "My Disk Name 1" "My Disk Name 2"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --disks
-    summary: Names of disks.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of disks in a VM.
-    syntax:
-      content: az csvmware vm disk list --vm-name MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a disk in a VM.
-    syntax:
-      content: az csvmware vm disk show --vm-name MyVm -g MyResourceGroup -n "My Disk Name"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the disk.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machine's disks.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml
deleted file mode 100644
index d09a6a1d36..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm_nic
-  name: az csvmware vm nic
-  summary: Manage VMware virtual machine's Network Interface Cards.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_nic_add
-  - ext_csvmware_az_csvmware_vm_nic_delete
-  - ext_csvmware_az_csvmware_vm_nic_list
-  - ext_csvmware_az_csvmware_vm_nic_show
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a NIC with default parameters in a VM.
-    syntax:
-      content: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork
-  - summary: Add a NIC with E1000E adapter that powers on boot in a VM.
-    syntax:
-      content: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork --adapter E1000E --power-on-boot true
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --virtual-network
-    summary: ID of the virtual network. You can also pass the basename of the ID.
-    description: ''
-  - name: --adapter
-    defaultValue: VMXNET3
-    parameterValueGroup: E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3
-    summary: The adapter for the NIC.
-    description: ''
-  - name: --power-on-boot
-    parameterValueGroup: false, true
-    summary: Will power on the NIC at boot time.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete two NICs from a VM.
-    syntax:
-      content: az csvmware vm nic delete --vm-name MyVm -g MyResourceGroup --nics "My NIC Name 1" "My NIC Name 2"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --nics
-    summary: Names of NICs.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of NICs in a VM.
-    syntax:
-      content: az csvmware vm nic list --vm-name MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a NIC in a VM.
-    syntax:
-      content: az csvmware vm nic show --vm-name MyVm -g MyResourceGroup -n "My NIC Name"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the NIC.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machine's Network Interface Cards.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/csvmware/index.yml
deleted file mode 100644
index 3140a5faa1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/csvmware/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az
-  name: csvmware
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_csvmware_az_csvmware
-  name: az csvmware
-  summary: Manage Azure VMware Solution by CloudSimple.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers.yml b/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers.yml
deleted file mode 100644
index 3ea9b29909..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_custom-providers_az_custom_providers
-  name: az custom-providers
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_custom-providers_az_custom_providers_resource_provider
-  name: az custom-providers resource-provider
-  summary: Commands to manage custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_create
-  name: az custom-providers resource-provider create
-  summary: Create or update the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-  name: az custom-providers resource-provider delete
-  summary: Delete the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_list
-  name: az custom-providers resource-provider list
-  summary: Get all the custom resource providers within a resource group or in the current subscription.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_show
-  name: az custom-providers resource-provider show
-  summary: Get the properties for the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_update
-  name: az custom-providers resource-provider update
-  summary: Update the custom resource provider. Only tags can be updated.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml b/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml
deleted file mode 100644
index 762d5fc289..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_custom-providers_az_custom_providers_resource_provider
-  name: az custom-providers resource-provider
-  summary: Commands to manage custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_custom-providers_az_custom_providers_resource_provider_create
-  - ext_custom-providers_az_custom_providers_resource_provider_delete
-  - ext_custom-providers_az_custom_providers_resource_provider_list
-  - ext_custom-providers_az_custom_providers_resource_provider_show
-  - ext_custom-providers_az_custom_providers_resource_provider_update
-- uid: ext_custom-providers_az_custom_providers_resource_provider_create
-  name: az custom-providers resource-provider create
-  summary: Create or update the custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a custom resource provider.
-    syntax:
-      content: >-
-        az custom-providers resource-provider create -n MyRP -g MyRG \
-
-        --action name=ping endpoint=https://test.azurewebsites.net/api routing_type=Proxy \
-
-        --resource-type name=users endpoint=https://test.azurewebsites.net/api routing_type="Proxy, Cache" \
-
-        --validation validation_type=swagger specification=https://raw.githubusercontent.com/test.json
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --action -a
-    summary: Add an action to the custom resource provider.
-    description: >-
-      Usage: --action name=ping endpoint="<a href="https://test.azurewebsites.net/api">https://test.azurewebsites.net/api</a>/{requestPath}" routing_type=Proxy
-
-
-      name: Required. The name of the action.
-
-      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
-
-      routing_type: The routing types that are supported for action requests. Possible values include: 'Proxy'.
-
-
-      Multiple actions can be specified by using more than one `--action` argument.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-type -r
-    summary: Add a custom resource type to the custom resource provider.
-    description: >-
-      Usage: --resource-type name=user endpoint="<a href="https://test.azurewebsites.net/api">https://test.azurewebsites.net/api</a>/{requestPath}" routing_type="Proxy, Cache"
-
-
-      name: Required. The name of the resource type.
-
-      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
-
-      routing_type: The routing types that are supported for resource requests. Possible values include: 'Proxy', 'Proxy,Cache'.
-
-
-      Multiple resource types can be specified by using more than one `--resource-type` argument.
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validation -v
-    summary: Add a validation to the custom resource provider.
-    description: >-
-      Usage: --validation specification="<a href="https://raw.githubusercontent.com/">https://raw.githubusercontent.com/</a>" validation_type="Swagger"
-
-
-      specification: A link to the validation specification.vThe specification must be hosted on raw.githubusercontent.com.
-
-      validation_type: The type of validation to run against a matching request. Possible values include: 'Swagger'.
-
-
-      Multiple validations can be specified by using more than one `--validation` argument.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-  name: az custom-providers resource-provider delete
-  summary: Delete the custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a custom resource provider.
-    syntax:
-      content: az custom-providers resource-provider delete -g MyRG -n MyRP
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_custom-providers_az_custom_providers_resource_provider_list
-  name: az custom-providers resource-provider list
-  summary: Get all the custom resource providers within a resource group or in the current subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all custom resource providers in the resource group.
-    syntax:
-      content: az custom-providers resource-provider list -g MyRG
-  - summary: List all custom resource providers in the current subscription.
-    syntax:
-      content: az custom-providers resource-provider list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_custom-providers_az_custom_providers_resource_provider_show
-  name: az custom-providers resource-provider show
-  summary: Get the properties for the custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a custom resource provider.
-    syntax:
-      content: az custom-providers resource-provider show -g MyRG -n MyRP
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_custom-providers_az_custom_providers_resource_provider_update
-  name: az custom-providers resource-provider update
-  summary: Update the custom resource provider. Only tags can be updated.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tags for a custom resource provider.
-    syntax:
-      content: az custom-providers resource-provider update -g MyRG -n MyRP --tags a=b
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_custom-providers_az_custom_providers_resource_provider_create
-  name: az custom-providers resource-provider create
-  summary: Create or update the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-  name: az custom-providers resource-provider delete
-  summary: Delete the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_list
-  name: az custom-providers resource-provider list
-  summary: Get all the custom resource providers within a resource group or in the current subscription.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_show
-  name: az custom-providers resource-provider show
-  summary: Get the properties for the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_update
-  name: az custom-providers resource-provider update
-  summary: Update the custom resource provider. Only tags can be updated.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage custom resource provider.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/index.yml
deleted file mode 100644
index c5c981b49e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/custom-providers/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_custom-providers_az
-  name: custom-providers
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_custom-providers_az_custom_providers
-  name: az custom-providers
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/databox/databox.yml b/2017-03-09-profile/docs-ref-autogen/ext/databox/databox.yml
deleted file mode 100644
index 7c129ba17f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/databox/databox.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databox_az_databox
-  name: az databox
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databox_az_databox_job
-  name: az databox job
-  summary: Commands to manage databox job.
-- uid: ext_databox_az_databox_job_cancel
-  name: az databox job cancel
-  summary: Cancel a job.
-- uid: ext_databox_az_databox_job_create
-  name: az databox job create
-  summary: Create a new job with the specified parameters.
-- uid: ext_databox_az_databox_job_delete
-  name: az databox job delete
-  summary: Delete a job.
-- uid: ext_databox_az_databox_job_list
-  name: az databox job list
-  summary: List all the jobs available under the given resource group or the given subscription.
-- uid: ext_databox_az_databox_job_list_credentials
-  name: az databox job list-credentials
-  summary: List the unencrypted secrets related to the job.
-- uid: ext_databox_az_databox_job_show
-  name: az databox job show
-  summary: Get information about the specified job.
-- uid: ext_databox_az_databox_job_update
-  name: az databox job update
-  summary: Update an existing job with the specified parameters.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/databox/databox/job.yml b/2017-03-09-profile/docs-ref-autogen/ext/databox/databox/job.yml
deleted file mode 100644
index 3a84a5f597..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/databox/databox/job.yml
+++ /dev/null
@@ -1,337 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databox_az_databox_job
-  name: az databox job
-  summary: Commands to manage databox job.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_databox_az_databox_job_cancel
-  - ext_databox_az_databox_job_create
-  - ext_databox_az_databox_job_delete
-  - ext_databox_az_databox_job_list
-  - ext_databox_az_databox_job_list_credentials
-  - ext_databox_az_databox_job_show
-  - ext_databox_az_databox_job_update
-- uid: ext_databox_az_databox_job_cancel
-  name: az databox job cancel
-  summary: Cancel a job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel the job "SdkJob3971" under resource group "SdkRg4981".
-    syntax:
-      content: az databox job cancel --resource-group "SdkRg4981" --name "SdkJob3971" --reason "CancelTest"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --reason
-    summary: Reason for cancellation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_databox_az_databox_job_create
-  name: az databox job create
-  summary: Create a new job with the specified parameters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a databox job to use both storage account and managed disk as data destination.
-    syntax:
-      content: >-
-        az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
-
-        "westus" --sku "DataBox" --contact-name "Public SDK Test" \
-
-        --phone "1234567890" --email-list "testing@microsoft.com" \
-
-        --street-address1 "16 TOWNSEND ST" --street-address2 "Unit 1" --city "San Francisco"  \
-
-        --state-or-province "CA" --country "US" --postal-code "94107" --company-name "Microsoft" \
-
-        --storage-account sa1 sa2 --staging-storage-account sa \
-
-        --resource-group-for-managed-disk /subscriptions/sub/resourceGroups/rg
-  - summary: Create a databoxdisk job to use storage account as data destination.
-    syntax:
-      content: >-
-        az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
-
-        "westus" --sku "DataBoxDisk" --expected-data-size 1 --contact-name "Public SDK Test" \
-
-        --phone "1234567890" --email-list "testing@microsoft.com" --street-address1 "16 TOWNSEND ST" \
-
-        --street-address2 "Unit 1" --city "San Francisco" --state-or-province "CA" --country "US" \
-
-        --postal-code "94107" --company-name "Microsoft" --storage-account sa1
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: DataBox, DataBoxDisk, DataBoxHeavy
-    summary: The sku type of DataBox.
-    description: ''
-  - name: --expected-data-size
-    summary: The expected size of the data which needs to be transferred in this job, in terabytes.The maximum usable capacity is up to 35 TB. This is only needed when sku is DataBoxDisk.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --contact-name
-    summary: Contact name of the person.
-    description: ''
-  - isRequired: true
-    name: --email-list
-    summary: Space-separated list of Email addresses to be notified about job progress.
-    description: ''
-  - isRequired: true
-    name: --phone
-    summary: Phone number of the contact person.
-    description: ''
-  - name: --mobile
-    summary: Mobile number of the contact person.
-    description: ''
-  - name: --resource-group-for-managed-disk
-    summary: The name or ID of the destination resource group where the Compute disks should be created.
-    description: ''
-  - name: --staging-storage-account
-    summary: The name or ID of the destination storage account that can be used to copy the vhd for staging.
-    description: ''
-  - isRequired: true
-    name: --city
-    summary: Name of the City.
-    description: ''
-  - isRequired: true
-    name: --country
-    summary: 'Name of the Country. Ex: US.'
-    description: ''
-  - isRequired: true
-    name: --postal-code
-    summary: Postal code.
-    description: ''
-  - isRequired: true
-    name: --state-or-province
-    summary: Name of the State or Province.
-    description: ''
-  - isRequired: true
-    name: --street-address1
-    summary: Street Address line 1.
-    description: ''
-  - name: --company-name
-    summary: Name of the company.
-    description: ''
-  - name: --street-address2
-    summary: Street Address line 2.
-    description: ''
-  - name: --street-address3
-    summary: Street Address line 3.
-    description: ''
-  - name: --storage-accounts
-    summary: Space-separated list of the destination storage account. It can be the name or resource ID of storage account.
-    description: ''
-- uid: ext_databox_az_databox_job_delete
-  name: az databox job delete
-  summary: Delete a job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the job "SdkJob3971" in resource group "SdkRg4981".
-    syntax:
-      content: az databox job delete --resource-group "SdkRg4981" --name "SdkJob3971"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_databox_az_databox_job_list
-  name: az databox job list
-  summary: List all the jobs available under the given resource group or the given subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all the jobs available under the current subscription.
-    syntax:
-      content: az databox job list
-  - summary: List all the jobs available under the resource group "SdkRg4981".
-    syntax:
-      content: az databox job list --resource-group "SdkRg4981"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databox_az_databox_job_list_credentials
-  name: az databox job list-credentials
-  summary: List the unencrypted secrets related to the job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the unencrypted secrets related to the job "TJ-636646322037905056".
-    syntax:
-      content: az databox job list-credentials --resource-group "bvttoolrg6" --name "TJ-636646322037905056"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databox_az_databox_job_show
-  name: az databox job show
-  summary: Get information about the specified job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the information about the job "SdkJob3971".
-    syntax:
-      content: az databox job show --resource-group "SdkRg4981" --name "SdkJob3971"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databox_az_databox_job_update
-  name: az databox job update
-  summary: Update an existing job with the specified parameters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the job "SdkJob3971" with the specified parameters.
-    syntax:
-      content: >-
-        az databox job update --resource-group "SdkRg4981" --name "SdkJob3971" \
-
-        --contact-name "Update Job" --phone "1234567890" \
-
-        --email-list "testing@microsoft.com" \
-
-        --street-address1 "16 TOWNSEND ST" \
-
-        --city "San Francisco" --state-or-province "CA" \
-
-        --country "US" --postal-code "94107" \
-
-        --company-name "Microsoft" \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --contact-name
-    summary: Contact name of the person.
-    description: ''
-  - name: --email-list
-    summary: List of Email addresses to be notified about job progress.
-    description: ''
-  - name: --mobile
-    summary: Mobile number of the contact person.
-    description: ''
-  - name: --phone
-    summary: Phone number of the contact person.
-    description: ''
-  - name: --city
-    summary: Name of the City.
-    description: ''
-  - name: --company-name
-    summary: Name of the company.
-    description: ''
-  - name: --country
-    summary: 'Name of the Country. Ex: US.'
-    description: ''
-  - name: --postal-code
-    summary: Postal code.
-    description: ''
-  - name: --state-or-province
-    summary: Name of the State or Province.
-    description: ''
-  - name: --street-address1
-    summary: Street Address line 1.
-    description: ''
-  - name: --street-address2
-    summary: Street Address line 2.
-    description: ''
-  - name: --street-address3
-    summary: Street Address line 3.
-    description: ''
-commands:
-- uid: ext_databox_az_databox_job_cancel
-  name: az databox job cancel
-  summary: Cancel a job.
-- uid: ext_databox_az_databox_job_create
-  name: az databox job create
-  summary: Create a new job with the specified parameters.
-- uid: ext_databox_az_databox_job_delete
-  name: az databox job delete
-  summary: Delete a job.
-- uid: ext_databox_az_databox_job_list
-  name: az databox job list
-  summary: List all the jobs available under the given resource group or the given subscription.
-- uid: ext_databox_az_databox_job_list_credentials
-  name: az databox job list-credentials
-  summary: List the unencrypted secrets related to the job.
-- uid: ext_databox_az_databox_job_show
-  name: az databox job show
-  summary: Get information about the specified job.
-- uid: ext_databox_az_databox_job_update
-  name: az databox job update
-  summary: Update an existing job with the specified parameters.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage databox job.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/databox/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/databox/index.yml
deleted file mode 100644
index ea7102a632..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/databox/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databox_az
-  name: databox
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databox_az_databox
-  name: az databox
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks.yml b/2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks.yml
deleted file mode 100644
index cdd93e45f4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databricks_az_databricks
-  name: az databricks
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databricks_az_databricks_workspace
-  name: az databricks workspace
-  summary: Commands to manage databricks workspace.
-- uid: ext_databricks_az_databricks_workspace_create
-  name: az databricks workspace create
-  summary: Create a new workspace.
-- uid: ext_databricks_az_databricks_workspace_delete
-  name: az databricks workspace delete
-  summary: Delete the workspace.
-- uid: ext_databricks_az_databricks_workspace_list
-  name: az databricks workspace list
-  summary: Get all the workspaces.
-- uid: ext_databricks_az_databricks_workspace_show
-  name: az databricks workspace show
-  summary: Show the workspace.
-- uid: ext_databricks_az_databricks_workspace_update
-  name: az databricks workspace update
-  summary: Update the workspace.
-- uid: ext_databricks_az_databricks_workspace_wait
-  name: az databricks workspace wait
-  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks/workspace.yml b/2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks/workspace.yml
deleted file mode 100644
index b7a5d07537..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/databricks/databricks/workspace.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databricks_az_databricks_workspace
-  name: az databricks workspace
-  summary: Commands to manage databricks workspace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_databricks_az_databricks_workspace_create
-  - ext_databricks_az_databricks_workspace_delete
-  - ext_databricks_az_databricks_workspace_list
-  - ext_databricks_az_databricks_workspace_show
-  - ext_databricks_az_databricks_workspace_update
-  - ext_databricks_az_databricks_workspace_wait
-- uid: ext_databricks_az_databricks_workspace_create
-  name: az databricks workspace create
-  summary: Create a new workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a workspace
-    syntax:
-      content: >-
-        az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location \
-
-        westus  --sku standard
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: premium, standard, trial
-    summary: The SKU tier name.
-    description: ''
-  - name: --managed-resource-group
-    summary: The managed resource group to create. It can be either a name or a resource ID.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --private-subnet
-    summary: The name of a new private subnet.
-    description: ''
-  - name: --public-subnet
-    summary: The name of a new public subnet.
-    description: ''
-  - name: --vnet
-    summary: Virtual network name or resource ID.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_delete
-  name: az databricks workspace delete
-  summary: Delete the workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the workspace
-    syntax:
-      content: az databricks workspace delete --resource-group MyResourceGroup --name MyWorkspace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_list
-  name: az databricks workspace list
-  summary: Get all the workspaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List workspaces within a resource group
-    syntax:
-      content: az databricks workspace list --resource-group MyResourceGroup
-  - summary: List workspaces within the default subscription
-    syntax:
-      content: az databricks workspace list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_show
-  name: az databricks workspace show
-  summary: Show the workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the workspace
-    syntax:
-      content: az databricks workspace show --resource-group MyResourceGroup --name MyWorkspace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_update
-  name: az databricks workspace update
-  summary: Update the workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the workspace's tags.
-    syntax:
-      content: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags key1=value1 key2=value2
-  - summary: Clean the workspace's tags.
-    syntax:
-      content: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags ""
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_wait
-  name: az databricks workspace wait
-  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Databricks workspace is successfully provisioned.
-    syntax:
-      content: az databricks workspace wait --resource-group MyResourceGroup --name MyWorkspace \ --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_databricks_az_databricks_workspace_create
-  name: az databricks workspace create
-  summary: Create a new workspace.
-- uid: ext_databricks_az_databricks_workspace_delete
-  name: az databricks workspace delete
-  summary: Delete the workspace.
-- uid: ext_databricks_az_databricks_workspace_list
-  name: az databricks workspace list
-  summary: Get all the workspaces.
-- uid: ext_databricks_az_databricks_workspace_show
-  name: az databricks workspace show
-  summary: Show the workspace.
-- uid: ext_databricks_az_databricks_workspace_update
-  name: az databricks workspace update
-  summary: Update the workspace.
-- uid: ext_databricks_az_databricks_workspace_wait
-  name: az databricks workspace wait
-  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage databricks workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/databricks/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/databricks/index.yml
deleted file mode 100644
index 15a5f1d1e6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/databricks/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databricks_az
-  name: databricks
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databricks_az_databricks
-  name: az databricks
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare.yml
deleted file mode 100644
index 5ccfaa5812..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare.yml
+++ /dev/null
@@ -1,385 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare
-  name: az datashare
-  summary: Commands to manage datashare.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_create
-  - ext_datashare_az_datashare_delete
-  - ext_datashare_az_datashare_list
-  - ext_datashare_az_datashare_show
-  - ext_datashare_az_datashare_wait
-- uid: ext_datashare_az_datashare_create
-  name: az datashare create
-  summary: Create a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a datashare
-    syntax:
-      content: az datashare create --account-name MyAccount --resource-group MyResourceGroup --description "share description" --share-kind "CopyBased" --terms "Confidential" --name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Share description.
-    description: ''
-  - name: --share-kind
-    parameterValueGroup: CopyBased, InPlace
-    summary: Share kind.
-    description: ''
-  - name: --terms
-    summary: Share terms.
-    description: ''
-- uid: ext_datashare_az_datashare_delete
-  name: az datashare delete
-  summary: Delete a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a datashare
-    syntax:
-      content: az datashare delete --account-name MyAccount --resource-group MyResourceGroup --name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_list
-  name: az datashare list
-  summary: List datashares in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List datashares
-    syntax:
-      content: az datashare list --account-name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_show
-  name: az datashare show
-  summary: Show a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a datashare
-    syntax:
-      content: az datashare show --account-name MyAccount --resource-group MyResourceGroup --name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_wait
-  name: az datashare wait
-  summary: Place the CLI in a waiting state until a condition of the datashare is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare is successfully provisioned.
-    syntax:
-      content: az datashare wait --account-name MyAccount --resource-group MyResourceGroup --name MyShare --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_account
-  name: az datashare account
-  summary: Commands to manage datashare accounts.
-- uid: ext_datashare_az_datashare_account_create
-  name: az datashare account create
-  summary: Create an account.
-- uid: ext_datashare_az_datashare_account_delete
-  name: az datashare account delete
-  summary: Delete an account.
-- uid: ext_datashare_az_datashare_account_list
-  name: az datashare account list
-  summary: List datashare accounts.
-- uid: ext_datashare_az_datashare_account_show
-  name: az datashare account show
-  summary: Show an account.
-- uid: ext_datashare_az_datashare_account_update
-  name: az datashare account update
-  summary: Patch an account.
-- uid: ext_datashare_az_datashare_account_wait
-  name: az datashare account wait
-  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
-- uid: ext_datashare_az_datashare_consumer
-  name: az datashare consumer
-  summary: Commands for consumers to manage datashare.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping
-  name: az datashare consumer dataset-mapping
-  summary: Commands for consumers to manage datashare dataset mappings.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_invitation
-  name: az datashare consumer invitation
-  summary: Commands for consumers to manage datashare invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-- uid: ext_datashare_az_datashare_consumer_share_subscription
-  name: az datashare consumer share-subscription
-  summary: Commands for consumers to manage datashare share subscriptions.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-- uid: ext_datashare_az_datashare_consumer_trigger
-  name: az datashare consumer trigger
-  summary: Commands for consumers to manage datashare consumer triggers.
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-- uid: ext_datashare_az_datashare_create
-  name: az datashare create
-  summary: Create a datashare.
-- uid: ext_datashare_az_datashare_dataset
-  name: az datashare dataset
-  summary: Commands for providers to manage datashare datasets.
-- uid: ext_datashare_az_datashare_dataset_create
-  name: az datashare dataset create
-  summary: Create a dataset.
-- uid: ext_datashare_az_datashare_dataset_delete
-  name: az datashare dataset delete
-  summary: Delete a dataset in a share.
-- uid: ext_datashare_az_datashare_dataset_list
-  name: az datashare dataset list
-  summary: List datasets in a share.
-- uid: ext_datashare_az_datashare_dataset_show
-  name: az datashare dataset show
-  summary: Show a dataset.
-- uid: ext_datashare_az_datashare_dataset_wait
-  name: az datashare dataset wait
-  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
-- uid: ext_datashare_az_datashare_delete
-  name: az datashare delete
-  summary: Delete a datashare.
-- uid: ext_datashare_az_datashare_invitation
-  name: az datashare invitation
-  summary: Commands for providers to manage datashare invitations.
-- uid: ext_datashare_az_datashare_invitation_create
-  name: az datashare invitation create
-  summary: Create an invitation.
-- uid: ext_datashare_az_datashare_invitation_delete
-  name: az datashare invitation delete
-  summary: Delete an invitation in a share.
-- uid: ext_datashare_az_datashare_invitation_list
-  name: az datashare invitation list
-  summary: List invitations in a share.
-- uid: ext_datashare_az_datashare_invitation_show
-  name: az datashare invitation show
-  summary: Show an invitation in a share.
-- uid: ext_datashare_az_datashare_list
-  name: az datashare list
-  summary: List datashares in an account.
-- uid: ext_datashare_az_datashare_provider_share_subscription
-  name: az datashare provider-share-subscription
-  summary: Commands for providers to manage datashare share subscriptions.
-- uid: ext_datashare_az_datashare_provider_share_subscription_list
-  name: az datashare provider-share-subscription list
-  summary: List share subscriptions in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-  name: az datashare provider-share-subscription reinstate
-  summary: Reinstate a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-  name: az datashare provider-share-subscription revoke
-  summary: Revoke a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_show
-  name: az datashare provider-share-subscription show
-  summary: Show a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_wait
-  name: az datashare provider-share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
-- uid: ext_datashare_az_datashare_show
-  name: az datashare show
-  summary: Show a datashare.
-- uid: ext_datashare_az_datashare_synchronization
-  name: az datashare synchronization
-  summary: Commands to manage datashare synchronization.
-- uid: ext_datashare_az_datashare_synchronization_list
-  name: az datashare synchronization list
-  summary: List synchronizations of a datashare.
-- uid: ext_datashare_az_datashare_synchronization_list_detail
-  name: az datashare synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_synchronization_setting
-  name: az datashare synchronization-setting
-  summary: Commands for providers to manage datashare synchronization settings.
-- uid: ext_datashare_az_datashare_synchronization_setting_create
-  name: az datashare synchronization-setting create
-  summary: Create a synchronization setting.
-- uid: ext_datashare_az_datashare_synchronization_setting_delete
-  name: az datashare synchronization-setting delete
-  summary: Delete a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_list
-  name: az datashare synchronization-setting list
-  summary: List synchronization settings in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_show
-  name: az datashare synchronization-setting show
-  summary: Show a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_wait
-  name: az datashare synchronization-setting wait
-  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
-- uid: ext_datashare_az_datashare_wait
-  name: az datashare wait
-  summary: Place the CLI in a waiting state until a condition of the datashare is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage datashare.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/account.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/account.yml
deleted file mode 100644
index 8fd2fef963..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/account.yml
+++ /dev/null
@@ -1,200 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_account
-  name: az datashare account
-  summary: Commands to manage datashare accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_account_create
-  - ext_datashare_az_datashare_account_delete
-  - ext_datashare_az_datashare_account_list
-  - ext_datashare_az_datashare_account_show
-  - ext_datashare_az_datashare_account_update
-  - ext_datashare_az_datashare_account_wait
-- uid: ext_datashare_az_datashare_account_create
-  name: az datashare account create
-  summary: Create an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an account
-    syntax:
-      content: az datashare account create --location "West US 2" --tags tag1=Red tag2=White --name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_datashare_az_datashare_account_delete
-  name: az datashare account delete
-  summary: Delete an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the account
-    syntax:
-      content: az datashare account delete --name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_account_list
-  name: az datashare account list
-  summary: List datashare accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List accounts by resource group
-    syntax:
-      content: az datashare account list --resource-group MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_account_show
-  name: az datashare account show
-  summary: Show an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show account information
-    syntax:
-      content: az datashare account show --name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_account_update
-  name: az datashare account update
-  summary: Patch an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update account tags
-    syntax:
-      content: az datashare account update --name MyAccount --tags tag1=Red tag2=White --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_datashare_az_datashare_account_wait
-  name: az datashare account wait
-  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare account is successfully provisioned.
-    syntax:
-      content: az datashare account wait --name MyAccount --resource-group MyResourceGroup --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_account_create
-  name: az datashare account create
-  summary: Create an account.
-- uid: ext_datashare_az_datashare_account_delete
-  name: az datashare account delete
-  summary: Delete an account.
-- uid: ext_datashare_az_datashare_account_list
-  name: az datashare account list
-  summary: List datashare accounts.
-- uid: ext_datashare_az_datashare_account_show
-  name: az datashare account show
-  summary: Show an account.
-- uid: ext_datashare_az_datashare_account_update
-  name: az datashare account update
-  summary: Patch an account.
-- uid: ext_datashare_az_datashare_account_wait
-  name: az datashare account wait
-  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage datashare accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer.yml
deleted file mode 100644
index 819a3c1959..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer
-  name: az datashare consumer
-  summary: Commands for consumers to manage datashare.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping
-  name: az datashare consumer dataset-mapping
-  summary: Commands for consumers to manage datashare dataset mappings.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_invitation
-  name: az datashare consumer invitation
-  summary: Commands for consumers to manage datashare invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-- uid: ext_datashare_az_datashare_consumer_share_subscription
-  name: az datashare consumer share-subscription
-  summary: Commands for consumers to manage datashare share subscriptions.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-- uid: ext_datashare_az_datashare_consumer_trigger
-  name: az datashare consumer trigger
-  summary: Commands for consumers to manage datashare consumer triggers.
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml
deleted file mode 100644
index a484e651ab..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml
+++ /dev/null
@@ -1,162 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping
-  name: az datashare consumer dataset-mapping
-  summary: Commands for consumers to manage datashare dataset mappings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_dataset_mapping_create
-  - ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  - ext_datashare_az_datashare_consumer_dataset_mapping_list
-  - ext_datashare_az_datashare_consumer_dataset_mapping_show
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Blob dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
-  - summary: Create a SqlDBTable dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDBTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"databaseName\":\"Database1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
-  - summary: Create a AdlsGen2File dataset mapping
-    syntax:
-      content: 'az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"AdlsGen2File\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"fileSystem\": \"fileSystem\",\"outputType\":\"Csv\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
-  - summary: Create a SqlDWTable dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"dataWarehouseName\":\"DataWarehouse1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --mapping
-    summary: Dataset mapping in JSON string or path to JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the datasetMapping.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping delete --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the datasetMapping.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List dataset mappings
-    syntax:
-      content: az datashare consumer dataset-mapping list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping show --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the datasetMapping.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare dataset mappings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml
deleted file mode 100644
index d0b0b4e536..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_invitation
-  name: az datashare consumer invitation
-  summary: Commands for consumers to manage datashare invitations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_invitation_list
-  - ext_datashare_az_datashare_consumer_invitation_reject
-  - ext_datashare_az_datashare_consumer_invitation_show
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List invitations
-    syntax:
-      content: az datashare consumer invitation list
-  parameters: []
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reject an invitation
-    syntax:
-      content: az datashare consumer invitation reject --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
-  parameters:
-  - isRequired: true
-    name: --invitation-id
-    summary: An invitation id.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an invitation
-    syntax:
-      content: az datashare consumer invitation show --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
-  parameters:
-  - isRequired: true
-    name: --invitation-id
-    summary: An invitation id.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare invitations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml
deleted file mode 100644
index e42afab878..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml
+++ /dev/null
@@ -1,266 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_share_subscription
-  name: az datashare consumer share-subscription
-  summary: Commands for consumers to manage datashare share subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_share_subscription_create
-  - ext_datashare_az_datashare_consumer_share_subscription_delete
-  - ext_datashare_az_datashare_consumer_share_subscription_list
-  - ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  - ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  - ext_datashare_az_datashare_consumer_share_subscription_show
-  - ext_datashare_az_datashare_consumer_share_subscription_wait
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a share subscription
-    syntax:
-      content: az datashare consumer share-subscription create --account-name MyAccount --resource-group MyResourceGroup --invitation-id 00000000-0000-0000-0000-000000000000 --source-share-location "eastus2" --name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --invitation-id
-    summary: The invitation id.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source-share-location
-    summary: Source share location.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a share subscription
-    syntax:
-      content: az datashare consumer share-subscription delete --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List share subscriptions
-    syntax:
-      content: az datashare consumer share-subscription list --account-name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List source datasets
-    syntax:
-      content: az datashare consumer share-subscription list-source-dataset --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization settings
-    syntax:
-      content: az datashare consumer share-subscription list-source-share-synchronization-setting --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a share subscription
-    syntax:
-      content: az datashare consumer share-subscription show --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare share subscription is successfully provisioned.
-    syntax:
-      content: az datashare consumer share-subscription wait --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare share subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml
deleted file mode 100644
index 28a704445b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Request to cancel a synchronization
-    syntax:
-      content: az datashare consumer share-subscription synchronization cancel --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --synchronization-id
-    summary: The synchronization GUID.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronizations
-    syntax:
-      content: az datashare consumer share-subscription synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization details
-    syntax:
-      content: az datashare consumer share-subscription synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --synchronization-id
-    summary: Synchronization id.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Initiate a dataset synchronization
-    syntax:
-      content: az datashare consumer share-subscription synchronization start --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-mode "Incremental"
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --synchronization-mode
-    parameterValueGroup: FullSync, Incremental
-    summary: Synchronization mode.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization finishes successfully.
-    syntax:
-      content: az datashare consumer share-subscription synchronization wait --custom "status=='Succeeded'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
-  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization is cancelled.
-    syntax:
-      content: az datashare consumer share-subscription synchronization wait --custom "status=='Cancelled'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --synchronization-id
-    summary: The synchronization GUID.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare share subscription synchronizations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml
deleted file mode 100644
index 307853d6f0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml
+++ /dev/null
@@ -1,223 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_trigger
-  name: az datashare consumer trigger
-  summary: Commands for consumers to manage datashare consumer triggers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_trigger_create
-  - ext_datashare_az_datashare_consumer_trigger_delete
-  - ext_datashare_az_datashare_consumer_trigger_list
-  - ext_datashare_az_datashare_consumer_trigger_show
-  - ext_datashare_az_datashare_consumer_trigger_wait
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a trigger
-    syntax:
-      content: az datashare consumer trigger create --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - isRequired: true
-    name: --recurrence-interval
-    parameterValueGroup: Day, Hour
-    summary: Synchronization Recurrence Interval.
-    description: ''
-  - isRequired: true
-    name: --synchronization-time
-    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --kind
-    defaultValue: ScheduleBased
-    parameterValueGroup: ScheduleBased
-    summary: Kind of synchronization.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a trigger
-    syntax:
-      content: az datashare consumer trigger delete --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List triggers
-    syntax:
-      content: az datashare consumer trigger list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a trigger
-    syntax:
-      content: az datashare consumer trigger show --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare trigger is successfully provisioned.
-    syntax:
-      content: az datashare consumer trigger wait --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the shareSubscription.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare consumer triggers.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/dataset.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/dataset.yml
deleted file mode 100644
index 4db7049041..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/dataset.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_dataset
-  name: az datashare dataset
-  summary: Commands for providers to manage datashare datasets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_dataset_create
-  - ext_datashare_az_datashare_dataset_delete
-  - ext_datashare_az_datashare_dataset_list
-  - ext_datashare_az_datashare_dataset_show
-  - ext_datashare_az_datashare_dataset_wait
-- uid: ext_datashare_az_datashare_dataset_create
-  name: az datashare dataset create
-  summary: Create a dataset.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Blob dataset
-    syntax:
-      content: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"filePath\":\"file21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
-  - summary: Create a KustoCluster dataset
-    syntax:
-      content: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoCluster\",\"properties\":{\"kustoClusterResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1\"}}"'
-  - summary: Create a KustoDatabase dataset
-    syntax:
-      content: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoDatabase\",\"properties\":{\"kustoDatabaseResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1/databases/Database1\"}}"'
-  - summary: Create a SqlDBTable dataset
-    syntax:
-      content: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDBTable\",\"properties\":{\"databaseName\":\"MySqlDB\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\", \"tableName\":\"Table1\"}}"
-  - summary: Create a SqlDWTable dataset
-    syntax:
-      content: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataWarehouseName\":\"MyDataWarehouse\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Sql/servers/MyServer\",\"tableName\":\"MyTable\"}}"
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --dataset
-    summary: Dataset parameters in JSON string or path to JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_delete
-  name: az datashare dataset delete
-  summary: Delete a dataset in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dataset
-    syntax:
-      content: az datashare dataset delete --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_list
-  name: az datashare dataset list
-  summary: List datasets in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List datasets
-    syntax:
-      content: az datashare dataset list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_show
-  name: az datashare dataset show
-  summary: Show a dataset.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a dataset
-    syntax:
-      content: az datashare dataset show --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_wait
-  name: az datashare dataset wait
-  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare dataset is successfully provisioned.
-    syntax:
-      content: az datashare dataset wait --account-name MyAccount --share-name MyShare --name MyDataset --resource-group MyResourceGroup --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_dataset_create
-  name: az datashare dataset create
-  summary: Create a dataset.
-- uid: ext_datashare_az_datashare_dataset_delete
-  name: az datashare dataset delete
-  summary: Delete a dataset in a share.
-- uid: ext_datashare_az_datashare_dataset_list
-  name: az datashare dataset list
-  summary: List datasets in a share.
-- uid: ext_datashare_az_datashare_dataset_show
-  name: az datashare dataset show
-  summary: Show a dataset.
-- uid: ext_datashare_az_datashare_dataset_wait
-  name: az datashare dataset wait
-  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare datasets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/invitation.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/invitation.yml
deleted file mode 100644
index ae23ab69a2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/invitation.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_invitation
-  name: az datashare invitation
-  summary: Commands for providers to manage datashare invitations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_invitation_create
-  - ext_datashare_az_datashare_invitation_delete
-  - ext_datashare_az_datashare_invitation_list
-  - ext_datashare_az_datashare_invitation_show
-- uid: ext_datashare_az_datashare_invitation_create
-  name: az datashare invitation create
-  summary: Create an invitation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an invitation
-    syntax:
-      content: az datashare invitation create --account-name MyAccount --target-email "receiver@microsoft.com" --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the invitation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --target-active-directory-id
-    summary: The target Azure AD Id. Can't be combined with email.
-    description: ''
-  - name: --target-email
-    summary: The email the invitation is directed to.
-    description: ''
-  - name: --target-object-id
-    summary: The target user or application Id that invitation is being sent to. Must be specified along TargetActiveDirectoryId. This enables sending invitations to specific users or applications in an AD tenant.
-    description: ''
-- uid: ext_datashare_az_datashare_invitation_delete
-  name: az datashare invitation delete
-  summary: Delete an invitation in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an invitation
-    syntax:
-      content: az datashare invitation delete --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the invitation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_invitation_list
-  name: az datashare invitation list
-  summary: List invitations in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List invitations
-    syntax:
-      content: az datashare invitation list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_invitation_show
-  name: az datashare invitation show
-  summary: Show an invitation in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an invitation
-    syntax:
-      content: az datashare invitation show --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the invitation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_invitation_create
-  name: az datashare invitation create
-  summary: Create an invitation.
-- uid: ext_datashare_az_datashare_invitation_delete
-  name: az datashare invitation delete
-  summary: Delete an invitation in a share.
-- uid: ext_datashare_az_datashare_invitation_list
-  name: az datashare invitation list
-  summary: List invitations in a share.
-- uid: ext_datashare_az_datashare_invitation_show
-  name: az datashare invitation show
-  summary: Show an invitation in a share.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare invitations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml
deleted file mode 100644
index ebc37ccefb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml
+++ /dev/null
@@ -1,203 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_provider_share_subscription
-  name: az datashare provider-share-subscription
-  summary: Commands for providers to manage datashare share subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_provider_share_subscription_list
-  - ext_datashare_az_datashare_provider_share_subscription_reinstate
-  - ext_datashare_az_datashare_provider_share_subscription_revoke
-  - ext_datashare_az_datashare_provider_share_subscription_show
-  - ext_datashare_az_datashare_provider_share_subscription_wait
-- uid: ext_datashare_az_datashare_provider_share_subscription_list
-  name: az datashare provider-share-subscription list
-  summary: List share subscriptions in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List share subscriptions
-    syntax:
-      content: az datashare provider-share-subscription list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-  name: az datashare provider-share-subscription reinstate
-  summary: Reinstate a share subscription in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reinstate a share subscription
-    syntax:
-      content: az datashare provider-share-subscription reinstate --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-  name: az datashare provider-share-subscription revoke
-  summary: Revoke a share subscription in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Revoke a share subscription
-    syntax:
-      content: az datashare provider-share-subscription revoke --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_show
-  name: az datashare provider-share-subscription show
-  summary: Show a share subscription in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a share subscription
-    syntax:
-      content: az datashare provider-share-subscription show --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_wait
-  name: az datashare provider-share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare provider share subscription is successfully provisioned.
-    syntax:
-      content: az datashare provider-share-subscription wait --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_provider_share_subscription_list
-  name: az datashare provider-share-subscription list
-  summary: List share subscriptions in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-  name: az datashare provider-share-subscription reinstate
-  summary: Reinstate a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-  name: az datashare provider-share-subscription revoke
-  summary: Revoke a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_show
-  name: az datashare provider-share-subscription show
-  summary: Show a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_wait
-  name: az datashare provider-share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare share subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml
deleted file mode 100644
index 2430428eac..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_synchronization_setting
-  name: az datashare synchronization-setting
-  summary: Commands for providers to manage datashare synchronization settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_synchronization_setting_create
-  - ext_datashare_az_datashare_synchronization_setting_delete
-  - ext_datashare_az_datashare_synchronization_setting_list
-  - ext_datashare_az_datashare_synchronization_setting_show
-  - ext_datashare_az_datashare_synchronization_setting_wait
-- uid: ext_datashare_az_datashare_synchronization_setting_create
-  name: az datashare synchronization-setting create
-  summary: Create a synchronization setting.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a synchronization setting
-    syntax:
-      content: az datashare synchronization-setting create --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MyDataset --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --recurrence-interval
-    parameterValueGroup: Day, Hour
-    summary: Synchronization Recurrence Interval.
-    description: ''
-  - isRequired: true
-    name: --synchronization-time
-    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --kind
-    defaultValue: ScheduleBased
-    parameterValueGroup: ScheduleBased
-    summary: Kind of synchronization.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_delete
-  name: az datashare synchronization-setting delete
-  summary: Delete a synchronization setting in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a synchronization setting
-    syntax:
-      content: az datashare synchronization-setting delete --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_list
-  name: az datashare synchronization-setting list
-  summary: List synchronization settings in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization settings
-    syntax:
-      content: az datashare synchronization-setting list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_show
-  name: az datashare synchronization-setting show
-  summary: Show a synchronization setting in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a synchronization setting
-    syntax:
-      content: az datashare synchronization-setting show --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_wait
-  name: az datashare synchronization-setting wait
-  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare synchronization setting is successfully provisioned.
-    syntax:
-      content: az datashare synchronization-setting wait --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_synchronization_setting_create
-  name: az datashare synchronization-setting create
-  summary: Create a synchronization setting.
-- uid: ext_datashare_az_datashare_synchronization_setting_delete
-  name: az datashare synchronization-setting delete
-  summary: Delete a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_list
-  name: az datashare synchronization-setting list
-  summary: List synchronization settings in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_show
-  name: az datashare synchronization-setting show
-  summary: Show a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_wait
-  name: az datashare synchronization-setting wait
-  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare synchronization settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization.yml
deleted file mode 100644
index b04558d3c6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/datashare/synchronization.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_synchronization
-  name: az datashare synchronization
-  summary: Commands to manage datashare synchronization.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_synchronization_list
-  - ext_datashare_az_datashare_synchronization_list_detail
-- uid: ext_datashare_az_datashare_synchronization_list
-  name: az datashare synchronization list
-  summary: List synchronizations of a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronizations
-    syntax:
-      content: az datashare synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_list_detail
-  name: az datashare synchronization list-detail
-  summary: List synchronization details.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization details
-    syntax:
-      content: az datashare synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --synchronization-id
-    summary: The synchronization GUID.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_synchronization_list
-  name: az datashare synchronization list
-  summary: List synchronizations of a datashare.
-- uid: ext_datashare_az_datashare_synchronization_list_detail
-  name: az datashare synchronization list-detail
-  summary: List synchronization details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage datashare synchronization.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/datashare/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/datashare/index.yml
deleted file mode 100644
index b674eec1dd..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/datashare/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az
-  name: datashare
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_datashare_az_datashare
-  name: az datashare
-  summary: Commands to manage datashare.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/db-up/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/db-up/index.yml
deleted file mode 100644
index 12dde3be67..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/db-up/index.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az
-  name: db-up
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_db-up_az_mysql
-  name: az mysql
-  summary: Manage Azure Database for MySQL servers.
-- uid: ext_db-up_az_postgres
-  name: az postgres
-  summary: Manage Azure Database for PostgreSQL servers.
-- uid: ext_db-up_az_sql
-  name: az sql
-  summary: Manage Azure SQL Databases and Data Warehouses.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/db-up/mysql.yml b/2017-03-09-profile/docs-ref-autogen/ext/db-up/mysql.yml
deleted file mode 100644
index 7afb4d561f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/db-up/mysql.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az_mysql
-  name: az mysql
-  summary: Manage Azure Database for MySQL servers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_db-up_az_mysql_down
-  - ext_db-up_az_mysql_show_connection_string
-  - ext_db-up_az_mysql_up
-- uid: ext_db-up_az_mysql_down
-  name: az mysql down
-  summary: Delete the MySQL server and its cached information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the server and the cached data, aside from the resource group.
-    syntax:
-      content: az mysql down
-  - summary: Delete the resource group and the full cache.
-    syntax:
-      content: az mysql down --delete-group
-  parameters:
-  - name: --delete-group
-    summary: Delete the resource group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_db-up_az_mysql_show_connection_string
-  name: az mysql show-connection-string
-  summary: Show the connection strings for a MySQL server database.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --admin-password -p
-    defaultValue: '{password}'
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    defaultValue: '{login}'
-    summary: The login username of the administrator.
-    description: ''
-  - name: --database-name -d
-    defaultValue: '{database}'
-    summary: The name of a database.
-    description: ''
-  - name: --server-name -s
-    defaultValue: '{server}'
-    summary: Name of the server.
-    description: ''
-- uid: ext_db-up_az_mysql_up
-  name: az mysql up
-  summary: Set up an Azure Database for MySQL server and configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Ensure that a Azure Database for MySQL server is up and running and configured for immediate use.
-    syntax:
-      content: az mysql up
-  - summary: To override default names, provide parameters indicating desired values/existing resources.
-    syntax:
-      content: az mysql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
-  parameters:
-  - name: --backup-retention
-    summary: The number of days a backup is retained.
-    description: ''
-  - name: --database-name -d
-    summary: The name of a database to initialize.
-    description: ''
-  - name: --geo-redundant-backup
-    defaultValue: Disabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable Geo-redundant or not for server backup.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --server-name -s
-    summary: Name of the server.
-    description: ''
-  - name: --sku-name
-    defaultValue: GP_Gen5_2
-    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
-    description: ''
-  - name: --ssl-enforcement
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable ssl enforcement or not when connect to server.
-    description: ''
-  - name: --storage-size
-    summary: The max storage size of the server. Unit is megabytes.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --version
-    defaultValue: "5.7"
-    summary: Server version.
-    description: ''
-  - name: --admin-password -p
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    summary: The login username of the administrator.
-    description: ''
-  - name: --generate-password
-    summary: Generate a password.
-    description: ''
-commands:
-- uid: ext_db-up_az_mysql_down
-  name: az mysql down
-  summary: Delete the MySQL server and its cached information.
-- uid: ext_db-up_az_mysql_show_connection_string
-  name: az mysql show-connection-string
-  summary: Show the connection strings for a MySQL server database.
-- uid: ext_db-up_az_mysql_up
-  name: az mysql up
-  summary: Set up an Azure Database for MySQL server and configurations.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Database for MySQL servers.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/db-up/postgres.yml b/2017-03-09-profile/docs-ref-autogen/ext/db-up/postgres.yml
deleted file mode 100644
index 209c48580e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/db-up/postgres.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az_postgres
-  name: az postgres
-  summary: Manage Azure Database for PostgreSQL servers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_db-up_az_postgres_down
-  - ext_db-up_az_postgres_show_connection_string
-  - ext_db-up_az_postgres_up
-- uid: ext_db-up_az_postgres_down
-  name: az postgres down
-  summary: Delete the PostgreSQL server and its cached information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the server and the cached data, aside from the resource group.
-    syntax:
-      content: az postgres down
-  - summary: Delete the resource group and the full cache.
-    syntax:
-      content: az postgres down --delete-group
-  parameters:
-  - name: --delete-group
-    summary: Delete the resource group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_db-up_az_postgres_show_connection_string
-  name: az postgres show-connection-string
-  summary: Show the connection strings for a PostgreSQL server database.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --admin-password -p
-    defaultValue: '{password}'
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    defaultValue: '{login}'
-    summary: The login username of the administrator.
-    description: ''
-  - name: --database-name -d
-    defaultValue: '{database}'
-    summary: The name of a database.
-    description: ''
-  - name: --server-name -s
-    defaultValue: '{server}'
-    summary: Name of the server.
-    description: ''
-- uid: ext_db-up_az_postgres_up
-  name: az postgres up
-  summary: Set up an Azure Database for PostgreSQL server and configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Ensure that a Azure Database for PostgreSQL server is up and running and configured for immediate use.
-    syntax:
-      content: az postgres up
-  - summary: To override default names, provide parameters indicating desired values/existing resources.
-    syntax:
-      content: az postgres up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
-  parameters:
-  - name: --backup-retention
-    summary: The number of days a backup is retained.
-    description: ''
-  - name: --database-name -d
-    summary: The name of a database to initialize.
-    description: ''
-  - name: --geo-redundant-backup
-    defaultValue: Disabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable Geo-redundant or not for server backup.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --server-name -s
-    summary: Name of the server.
-    description: ''
-  - name: --sku-name
-    defaultValue: GP_Gen5_2
-    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
-    description: ''
-  - name: --ssl-enforcement
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable ssl enforcement or not when connect to server.
-    description: ''
-  - name: --storage-size
-    summary: The max storage size of the server. Unit is megabytes.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --version
-    defaultValue: "10"
-    summary: Server version.
-    description: ''
-  - name: --admin-password -p
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    summary: The login username of the administrator.
-    description: ''
-  - name: --generate-password
-    summary: Generate a password.
-    description: ''
-commands:
-- uid: ext_db-up_az_postgres_down
-  name: az postgres down
-  summary: Delete the PostgreSQL server and its cached information.
-- uid: ext_db-up_az_postgres_show_connection_string
-  name: az postgres show-connection-string
-  summary: Show the connection strings for a PostgreSQL server database.
-- uid: ext_db-up_az_postgres_up
-  name: az postgres up
-  summary: Set up an Azure Database for PostgreSQL server and configurations.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Database for PostgreSQL servers.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/db-up/sql.yml b/2017-03-09-profile/docs-ref-autogen/ext/db-up/sql.yml
deleted file mode 100644
index 501277c064..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/db-up/sql.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az_sql
-  name: az sql
-  summary: Manage Azure SQL Databases and Data Warehouses.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_db-up_az_sql_down
-  - ext_db-up_az_sql_up
-- uid: ext_db-up_az_sql_down
-  name: az sql down
-  summary: Delete the SQL server and its cached information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the server and the cached data, aside from the resource group.
-    syntax:
-      content: az sql down
-  - summary: Delete the resource group and the full cache.
-    syntax:
-      content: az sql down --delete-group
-  parameters:
-  - name: --delete-group
-    summary: Delete the resource group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_db-up_az_sql_up
-  name: az sql up
-  summary: Set up an Azure Database for SQL server and configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Ensure that a Azure Database for SQL server is up and running and configured for immediate use.
-    syntax:
-      content: az sql up
-  - summary: To override default names, provide parameters indicating desired values/existing resources.
-    syntax:
-      content: az sql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
-  parameters:
-  - name: --database-name -d
-    summary: The name of a database to initialize.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --server-name -s
-    summary: Name of the server.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --version
-    defaultValue: "12.0"
-    summary: Server version.
-    description: ''
-  - name: --admin-password -p
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    summary: The login username of the administrator.
-    description: ''
-  - name: --generate-password
-    summary: Generate a password.
-    description: ''
-commands:
-- uid: ext_db-up_az_sql_down
-  name: az sql down
-  summary: Delete the SQL server and its cached information.
-- uid: ext_db-up_az_sql_up
-  name: az sql up
-  summary: Set up an Azure Database for SQL server and configurations.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure SQL Databases and Data Warehouses.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks.yml
deleted file mode 100644
index 1ad196056b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_aks_app
-  name: az aks app
-  summary: Commands to manage AKS app.
-- uid: ext_deploy-to-azure_az_aks_app_up
-  name: az aks app up
-  summary: Deploy to AKS via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kubernetes Services.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml
deleted file mode 100644
index 23e23b9e07..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_aks_app
-  name: az aks app
-  summary: Commands to manage AKS app.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_deploy-to-azure_az_aks_app_up
-- uid: ext_deploy-to-azure_az_aks_app_up
-  name: az aks app up
-  summary: Deploy to AKS via GitHub actions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --acr
-    summary: Name of the Azure Container Registry to be used for pushing the image.
-    description: ''
-  - name: --aks-cluster
-    summary: Name of the cluster to select for deployment.
-    description: ''
-  - name: --branch-name
-    summary: New branch name to be created to check in files and raise a PR.
-    description: ''
-  - name: --do-not-wait
-    summary: Do not wait for workflow completion.
-    description: ''
-  - name: --port
-    summary: Port on which your application runs. Default is 8080.
-    description: ''
-  - name: --repository -r
-    summary: GitHub repository URL e.g. <a href="https://github.com/azure/azure-cli">https://github.com/azure/azure-cli</a>.
-    description: ''
-commands:
-- uid: ext_deploy-to-azure_az_aks_app_up
-  name: az aks app up
-  summary: Deploy to AKS via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage AKS app.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container.yml
deleted file mode 100644
index 2483cb2ef2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_container
-  name: az container
-  summary: Manage Azure Container Instances.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_container_app
-  name: az container app
-  summary: Commands to Manage Azure Container Instances App.
-- uid: ext_deploy-to-azure_az_container_app_up
-  name: az container app up
-  summary: Deploy to Azure Container Instances using GitHub Actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Container Instances.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container/app.yml
deleted file mode 100644
index 90e512c908..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/container/app.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_container_app
-  name: az container app
-  summary: Commands to Manage Azure Container Instances App.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_deploy-to-azure_az_container_app_up
-- uid: ext_deploy-to-azure_az_container_app_up
-  name: az container app up
-  summary: Deploy to Azure Container Instances using GitHub Actions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --acr
-    summary: Name of the Azure Container Registry to be used for pushing the image.
-    description: ''
-  - name: --branch-name
-    summary: New branch name to be created to check in files and raise a PR.
-    description: ''
-  - name: --do-not-wait
-    summary: Do not wait for workflow completion.
-    description: ''
-  - name: --port
-    summary: Port on which your application runs. Default is 8080.
-    description: ''
-  - name: --repository
-    summary: GitHub Repository URL e.g. <a href="https://github.com/contoso/webapp">https://github.com/contoso/webapp</a>.
-    description: ''
-commands:
-- uid: ext_deploy-to-azure_az_container_app_up
-  name: az container app up
-  summary: Deploy to Azure Container Instances using GitHub Actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to Manage Azure Container Instances App.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml
deleted file mode 100644
index 3413da13df..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_functionapp
-  name: az functionapp
-  summary: Manage function apps. To install the Azure Functions Core tools see <a href="https://github.com/Azure/azure-functions-core-tools">https://github.com/Azure/azure-functions-core-tools</a>.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_functionapp_app
-  name: az functionapp app
-  summary: Commands to manage Azure Functions app.
-- uid: ext_deploy-to-azure_az_functionapp_app_up
-  name: az functionapp app up
-  summary: Deploy to Azure Functions via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage function apps. To install the Azure Functions Core tools see <a href="https://github.com/Azure/azure-functions-core-tools">https://github.com/Azure/azure-functions-core-tools</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml
deleted file mode 100644
index 9088eac4a1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_functionapp_app
-  name: az functionapp app
-  summary: Commands to manage Azure Functions app.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_deploy-to-azure_az_functionapp_app_up
-- uid: ext_deploy-to-azure_az_functionapp_app_up
-  name: az functionapp app up
-  summary: Deploy to Azure Functions via GitHub actions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function - Run interactive mode
-    syntax:
-      content: az functionapp app up
-  - summary: Deploy/Setup GitHub Action for locally checked out GitHub Repository to Azure Function
-    syntax:
-      content: >-
-        Repository name/url (--repository) will be detected from the local git repository
-
-        az functionapp app up --app-name AzFunctionPythonPreProd
-  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function
-    syntax:
-      content: az functionapp app up --app-name AzFunctionPythonPreProd --repository https://github.com/azure/deploy-functions
-  parameters:
-  - name: --app-name
-    summary: FunctionApp name in the subscription.
-    description: ''
-  - name: --branch-name
-    summary: New branch name to be created to check in files and raise a PR.
-    description: ''
-  - name: --do-not-wait
-    summary: Do not wait for workflow completion.
-    description: ''
-  - name: --repository -r
-    summary: GitHub repository URL e.g. <a href="https://github.com/azure/azure-cli">https://github.com/azure/azure-cli</a>.
-    description: ''
-commands:
-- uid: ext_deploy-to-azure_az_functionapp_app_up
-  name: az functionapp app up
-  summary: Deploy to Azure Functions via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Functions app.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/index.yml
deleted file mode 100644
index fedc8067f0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/deploy-to-azure/index.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az
-  name: deploy-to-azure
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-- uid: ext_deploy-to-azure_az_container
-  name: az container
-  summary: Manage Azure Container Instances.
-- uid: ext_deploy-to-azure_az_functionapp
-  name: az functionapp
-  summary: Manage function apps. To install the Azure Functions Core tools see <a href="https://github.com/Azure/azure-functions-core-tools">https://github.com/Azure/azure-functions-core-tools</a>.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/aks.yml b/2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/aks.yml
deleted file mode 100644
index 7ab309d8cf..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/aks.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dev-spaces_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_dev-spaces_az_aks_use_dev_spaces
-- uid: ext_dev-spaces_az_aks_use_dev_spaces
-  name: az aks use-dev-spaces
-  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, interactively selecting a dev space.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, updating to the latest Azure Dev Spaces             client components and selecting a new or existing dev space 'my-space'.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks --update --space my-space
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, selecting a new or existing dev space             'develop/my-space' without prompting for confirmation.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks -s develop/my-space -y
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster with a private endpoint.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks -e private
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: Public
-    parameterValueGroup: None, Private, Public
-    summary: The endpoint type to be used for a Azure Dev Spaces controller. See <a href="https://aka.ms/azds-networking">https://aka.ms/azds-networking</a> for more information.
-    description: ''
-  - name: --space -s
-    summary: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
-    description: ''
-  - name: --update
-    summary: Update to the latest Azure Dev Spaces client components.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation. Requires --space.
-    description: ''
-commands:
-- uid: ext_dev-spaces_az_aks_use_dev_spaces
-  name: az aks use-dev-spaces
-  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kubernetes Services.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/index.yml
deleted file mode 100644
index 94a9999409..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dev-spaces/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dev-spaces_az
-  name: dev-spaces
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_dev-spaces_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms.yml b/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms.yml
deleted file mode 100644
index 1057275e5a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms
-  name: az dms
-  summary: Manage Azure Data Migration Service (DMS) instances.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_dms-preview_az_dms_project
-  name: az dms project
-  summary: Manage Projects for an instance of the Data Migration Service.
-- uid: ext_dms-preview_az_dms_project_create
-  name: az dms project create
-  summary: Create a migration Project which can contain multiple Tasks.
-- uid: ext_dms-preview_az_dms_project_task
-  name: az dms project task
-  summary: Manage Tasks for a Data Migration Service instance's Project.
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-- uid: ext_dms-preview_az_dms_task
-  name: az dms task
-  summary: Manage service-level tasks for a Database Migration Service instance.
-- uid: ext_dms-preview_az_dms_task_cancel
-  name: az dms task cancel
-  summary: Cancel a service-level Task if it's currently queued or running.
-- uid: ext_dms-preview_az_dms_task_create
-  name: az dms task create
-  summary: Create and start a service-level task.
-- uid: ext_dms-preview_az_dms_task_delete
-  name: az dms task delete
-  summary: Delete a service-level Task.
-- uid: ext_dms-preview_az_dms_task_list
-  name: az dms task list
-  summary: List the service-level Tasks within a DMS instance. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
-- uid: ext_dms-preview_az_dms_task_show
-  name: az dms task show
-  summary: Show the details of a service-level Task. Use the "--expand" to get more details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Data Migration Service (DMS) instances.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project.yml b/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project.yml
deleted file mode 100644
index 9726d7a4b5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms_project
-  name: az dms project
-  summary: Manage Projects for an instance of the Data Migration Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_dms-preview_az_dms_project_create
-- uid: ext_dms-preview_az_dms_project_create
-  name: az dms project create
-  summary: Create a migration Project which can contain multiple Tasks.
-  description: >-
-    The following project configurations are supported:
-        -) source -> target
-        1) SQL -> SQLDB
-        2) MySQL -> AzureDbForMySql
-        3) PostgreSQL -> AzureDbForPostgreSQL
-        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API).
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a SQL Project for a DMS instance.
-    syntax:
-      content: az dms project create -l westus -n myproject -g myresourcegroup --service-name mydms --source-platform SQL --target-platform SQLDB --tags tagName1=tagValue1 tagWithNoValue
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - isRequired: true
-    name: --source-platform
-    summary: 'The type of server for the source database. The supported types are: SQL, MySQL, PostgreSQL, MongoDB.'
-    description: ''
-  - isRequired: true
-    name: --target-platform
-    summary: 'The type of service for the target database. The supported types are: SQLDB, AzureDbForMySql, AzureDbForPostgreSQL, MongoDB.'
-    description: ''
-  - name: --tags
-    summary: A space-delimited list of tags in tag1[=value1]" format.
-    description: ''
-commands:
-- uid: ext_dms-preview_az_dms_project_create
-  name: az dms project create
-  summary: Create a migration Project which can contain multiple Tasks.
-- uid: ext_dms-preview_az_dms_project_task
-  name: az dms project task
-  summary: Manage Tasks for a Data Migration Service instance's Project.
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Projects for an instance of the Data Migration Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project/task.yml b/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project/task.yml
deleted file mode 100644
index 2819b90027..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/project/task.yml
+++ /dev/null
@@ -1,407 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms_project_task
-  name: az dms project task
-  summary: Manage Tasks for a Data Migration Service instance's Project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_dms-preview_az_dms_project_task_cancel
-  - ext_dms-preview_az_dms_project_task_create
-  - ext_dms-preview_az_dms_project_task_cutover
-  - ext_dms-preview_az_dms_project_task_restart
-  - ext_dms-preview_az_dms_project_task_stop
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-  description: >-
-    To keep a more consistent experience with Azure's portal UI use:
-        az dms project task stop.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --object-name
-    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-  description: >-
-    The following task configurations are supported:
-        -) source -> target :: task type
-        1) SQL -> SQLDB :: OfflineMigration
-        2) MySQL -> AzureDbForMySql :: OnlineMigration
-        3) PostgreSQL -> AzureDbForPostgreSQL :: OnlineMigration
-        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API) :: OfflineMigration.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create and start a SQL Task which performs no validation checks.
-    syntax:
-      content: "az dms project task create --database-options-json C:\\CliFiles\\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json '{'dataSource': 'myserver', 'authentication': 'SqlAuthentication', 'encryptConnection': 'true', 'trustServerCertificate': 'true'}' --target-connection-json C:\\CliFiles\\targetConnection.json --task-type offlinemigration"
-  - summary: Create and start a SQL Task which performs all validation checks.
-    syntax:
-      content: az dms project task create --database-options-json C:\CliFiles\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json C:\CliFiles\sourceConnection.json --target-connection-json C:\CliFiles\targetConnection.json --enable-data-integrity-validation --enable-query-analysis-validation --enable-schema-validation --task-type offlinemigration
-  parameters:
-  - isRequired: true
-    name: --database-options-json
-    summary: Database and table information. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
-    description: >-
-      For SQL we support per table migrations. To use this, specify the tables names in the 'table_map' as below. You can also set the source as read only.
-        [
-            {
-                "name": "source database",
-                "target_database_name": "target database",
-                "make_source_db_read_only": false|true,
-                "table_map": {
-                    "schema.SourceTableName1": "schema.TargetTableName1",
-                    "schema.SourceTableName2": "schema.TargetTableName2",
-                    ...n
-                }
-            },
-            ...n
-        ]
-
-      For MySQL and PostgreSQL, the format of the database options JSON object.
-        [
-            {
-                "name": "source database",
-                "target_database_name": "target database",
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "migrationSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "sourceSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "targetSetting": {
-                    "setting1": "value1",
-                    ...n
-                }
-            },
-            ...n
-        ]
-
-      For MongoDB we support per collection migrations. To use this, specify the collections inside the database object as below.
-        {
-            // set to zero to get the default boost during migration (recommended)
-            "boostRUs": 0,
-            // "OneTime" or "Continuous", only "OneTime" is currently supported
-            "replication": "OneTime",
-            // Set to null to use maximum resources available.
-            "throttling": {
-                // percentage of the CPU to try to avoid using
-                "minFreeCpu": 25,
-                // amount of RAM (in MBs) to try to avoid using
-                "minFreeMemoryMb": 1024,
-                // max number of collections to migrate at a time
-                "maxParallelism": 2
-            },
-            "databases": {
-                "database_name": {
-                    // see <a href="https://docs.microsoft.com/th-th/azure/cosmos-db/request-units">https://docs.microsoft.com/th-th/azure/cosmos-db/request-units</a>,     ||
-                    // set to null to use default
-                    // or 0 if throughput should not be provisioned at the database level
-                    "targetRUs": 0,
-                    "collections": {
-                        "collection_name_1": {
-                            // Whether the target database/collection will be deleted if exists
-                            "canDelete": true,
-                            // set to null if target should not be sharded
-                            // or to copy the shard key from source (if exists)
-                            "shardKey": null,
-                            // set to null to use default (recommended)
-                            "targetRUs": null
-                        },
-                        "collection_name_2": {
-                            "canDelete": true,
-                            "shardKey": {
-                                "fields": [
-                                    {
-                                        "name": "field_name",
-                                        // accepts "Forward", "Reverse", or "Hashed" but CosmosDB only accepts a single-field, hashed shard key
-                                        "order": "Forward"
-                                    },
-                                    ...n
-                                ],
-                                // whether shard key is unique
-                                // see <a href="https://docs.microsoft.com/azure/cosmos-db/partition-data">https://docs.microsoft.com/azure/cosmos-db/partition-data</a>
-                                "isUnique": false
-                            },
-                            "targetRUs": 10000
-                        },
-                        ...n
-                    }
-                },
-                ...n
-            }
-        }
-
-      For Oracle to PostgreSQL, the format of the database options JSON object.
-        [
-            {
-                // "Preserve" or "ToLower". Not valid when providing "tableMap".
-                "caseManipulation": "",
-                // When provided, copies all tables within this schema, preserving the casing of the source object names,
-                // or using the value of "caseManipulation" if provided.
-                // Not valid if providing "tableMap".
-                "schemaName": "",
-                // Defines custom mapping of schemas and tables. As seen, offers freedom for mapping tables to different schemas, changing schema and table names, and modifying object name casing.
-                // Not valid if providing "schemaName".
-                "tableMap": {
-                    "SCHEMA1.TABLE1": "SCHEMA1.TABLE1",
-                    "SCHEMA2.TABLE2": "SCHEMA1.TABLE2",
-                    "SCHEMA2.TABLE3": "schema2.OtherTableName
-                    ...n
-                },
-                "targetDatabaseName": "database_name",
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "migrationSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "sourceSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "targetSetting": {
-                    "setting1": "value1",
-                    ...n
-                }
-            }
-        ].
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - isRequired: true
-    name: --source-connection-json
-    summary: The connection information to the source server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
-    description: >-
-      The format of the connection JSON object for SQL connections.
-        {
-            "userName": "user name",    // if this is missing or null, you will be prompted
-            "password": null,           // if this is missing or null (highly recommended) you will be prompted
-            "dataSource": "server name[,port]",
-            "authentication": "SqlAuthentication|WindowsAuthentication",
-            "encryptConnection": true,      // highly recommended to leave as true
-            "trustServerCertificate": false  // highly recommended to leave as false
-        }
-
-      The format of the connection JSON object for MySql connections.
-        {
-            "userName": "user name",    // if this is missing or null, you will be prompted
-            "password": null,           // if this is missing or null (highly recommended) you will be prompted
-            "serverName": "server name",
-            "port": 3306                // if this is missing, it will default to 3306
-        }
-
-      The format of the connection JSON object for PostgreSQL connections.
-        {
-            "userName": "user name",    // if this is missing or null, you will be prompted
-            "password": null,           // if this is missing or null (highly recommended) you will be prompted
-            "serverName": "server name",
-            "databaseName": "database name", // if this is missing, it will default to the 'postgres' database
-            "port": 5432,                // if this is missing, it will default to 5432
-            "encryptConnection": true,      // highly recommended to leave as true (For PostgreSQL to Azure PostgreSQL migration only)
-            "trustServerCertificate": false  // highly recommended to leave as false (For PostgreSQL to Azure PostgreSQL migration only)
-        }
-
-      The format of the connection JSON object for MongoDB connections.
-        {
-            "userName": null,   // if this is missing or null, you will be prompted
-            "password": null,   // if this is missing or null (highly recommended) you will be prompted
-            "connectionString": "mongodb://hostOrIp:port"
-        }
-
-      The format of the connection JSON object for Oracle connections.
-        {
-            "userName": null,   // if this is missing or null, you will be prompted
-            "password": null,   // if this is missing or null (highly recommended) you will be prompted
-            "dataSource": "//hostOrIp:port/serviceName"   // accepts EZConnect or Tnsnames formats
-        }.
-  - isRequired: true
-    name: --target-connection-json
-    summary: The connection information to the target server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See 'source-connection-json' for examples of connection formats.
-    description: ''
-  - isRequired: true
-    name: --task-type
-    summary: 'The type of data movement the task will support. The supported types are: OnlineMigration, OfflineMigration.'
-    description: ''
-  - name: --enable-data-integrity-validation
-    summary: (For SQL only) Whether to perform a checksum based data integrity validation between source and target for the selected database and tables.
-    description: ''
-  - name: --enable-query-analysis-validation
-    summary: (For SQL only) Whether to perform a quick and intelligent query analysis by retrieving queries from the source database and executing them in the target. The result will have execution statistics for executions in source and target databases for the extracted queries.
-    description: ''
-  - name: --enable-schema-validation
-    summary: (For SQL only) Whether to compare the schema information between source and target.
-    description: ''
-  - name: --validate-only
-    summary: (For MongoDB to Cosmos DB only) Whether to run validation only and NOT run migration. It is mandatory to run a 'validate only' task before attempting an actual migration. Once the validation is complete, pass the name of this 'validate only' task to a new task's 'validated task name' argument.
-    description: ''
-  - name: --validated-task-name
-    summary: (For MongoDB to Cosmos DB only) When running a migration it is neceaary to pass in the name of a previously run 'validate only' task.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-  description: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --immediate
-    summary: For MongoDB migrations, whether to cutover immediately or to let the currently loaded events get migrated. For all other migration types, this has no effect.
-    description: ''
-  - name: --object-name
-    summary: For MongoDB migrations, the qualified name of the database or collection you wish to cutover. Leave blank to cutover the entire migration. For all other migration types, the name of the database on the source you wish to cutover.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: ''
-  description: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --object-name
-    summary: The qualified name of the database or collection you wish to restart. Leave blank to restart the entire migration.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-  description: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --object-name
-    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
-    description: ''
-commands:
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Tasks for a Data Migration Service instance's Project.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/task.yml b/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/task.yml
deleted file mode 100644
index 5e3db9b7ae..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/dms/task.yml
+++ /dev/null
@@ -1,195 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms_task
-  name: az dms task
-  summary: Manage service-level tasks for a Database Migration Service instance.
-  description: Service-level tasks are non-migration tasks that are performed at the service level. This is usually for administrative and maintenance work which applies to the service's agent and VM.
-  langs:
-  - azurecli
-  children:
-  - ext_dms-preview_az_dms_task_cancel
-  - ext_dms-preview_az_dms_task_create
-  - ext_dms-preview_az_dms_task_delete
-  - ext_dms-preview_az_dms_task_list
-  - ext_dms-preview_az_dms_task_show
-- uid: ext_dms-preview_az_dms_task_cancel
-  name: az dms task cancel
-  summary: Cancel a service-level Task if it's currently queued or running.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a service-level task
-    syntax:
-      content: az dms task cancel -g myresourcegroup --service-name mydms -n mytask
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-- uid: ext_dms-preview_az_dms_task_create
-  name: az dms task create
-  summary: Create and start a service-level task.
-  description: >-
-    The following tasks are currently supported:
-        1) Check OCI driver against Oracle source to check for compatibility
-        2) Upload OCI driver install package
-        3) Install an already uploaded OCI driver package.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a service-level task which checks if the currently installed OCI driver supports
-    syntax:
-      content: 'az dms task create -g myresourcegroup --service-name mydms -n checkocitask1 --task-options-json "{"serverVersion": "12.2.0.1"}" --task-type CheckOciDriver'
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-  - isRequired: true
-    name: --task-options-json
-    summary: Information and settings relevant to the particular task's type. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
-    description: >-
-      For CheckOciDriver:
-          {
-              // The version of your Oracle source server against which to check the driver's compatibility.
-              // Can also be null to get a list of supported versions.
-              "serverVersion": "Oracle source version"
-          }
-
-      For UploadOciDriver:
-          {
-              "ociDriverPath": File share path of the driver install package,
-              "userName": "user name",    // if this is missing or null, you will be prompted
-              "password": "password"      // if this is missing or null (highly recommended) you will be prompted
-          }
-
-      For InstallOciDriver:
-          {
-              // The output of the UploadOciDriver task can be used here
-              "ociDriverPackageName": "Oci driver installer package name"
-          }.
-  - isRequired: true
-    name: --task-type
-    summary: The type of task to create. The supported types are CheckOciDriver, UploadOciDriver, and InstallOciDriver.
-    description: ''
-- uid: ext_dms-preview_az_dms_task_delete
-  name: az dms task delete
-  summary: Delete a service-level Task.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-  - name: --delete-running-tasks
-    summary: Delete the service-level Task even if the Task is currently running.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_dms-preview_az_dms_task_list
-  name: az dms task list
-  summary: List the service-level Tasks within a DMS instance. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Tasks within a DMS instance.
-    syntax:
-      content: az dms task list -g myresourcegroup -n mydms
-  - summary: List only the tasks that check the OCI driver compatibility within a DMS instance.
-    syntax:
-      content: az dms task list -g myresourcegroup -n mydms --task-type Service.Check.OCI
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --task-type
-    summary: The type of task to be listed. For the list of possible types see "az dms check-status".
-    description: ''
-- uid: ext_dms-preview_az_dms_task_show
-  name: az dms task show
-  summary: Show the details of a service-level Task. Use the "--expand" to get more details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-  - name: --expand
-    summary: Expand the response to provide more details. Use with "command" to see more details of the Task. Use with "output" to see the results of the Task's migration.
-    description: ''
-commands:
-- uid: ext_dms-preview_az_dms_task_cancel
-  name: az dms task cancel
-  summary: Cancel a service-level Task if it's currently queued or running.
-- uid: ext_dms-preview_az_dms_task_create
-  name: az dms task create
-  summary: Create and start a service-level task.
-- uid: ext_dms-preview_az_dms_task_delete
-  name: az dms task delete
-  summary: Delete a service-level Task.
-- uid: ext_dms-preview_az_dms_task_list
-  name: az dms task list
-  summary: List the service-level Tasks within a DMS instance. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
-- uid: ext_dms-preview_az_dms_task_show
-  name: az dms task show
-  summary: Show the details of a service-level Task. Use the "--expand" to get more details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Service-level tasks are non-migration tasks that are performed at the service level. This is usually for administrative and maintenance work which applies to the service's agent and VM.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/index.yml
deleted file mode 100644
index 940baefdbc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/dms-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az
-  name: dms-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_dms-preview_az_dms
-  name: az dms
-  summary: Manage Azure Data Migration Service (DMS) instances.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid.yml
deleted file mode 100644
index 151dfb9f4d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid.yml
+++ /dev/null
@@ -1,314 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid
-  name: az eventgrid
-  summary: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain
-  name: az eventgrid domain
-  summary: Manage event domains.
-- uid: ext_eventgrid_az_eventgrid_domain_create
-  name: az eventgrid domain create
-  summary: Create a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_delete
-  name: az eventgrid domain delete
-  summary: Delete a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key
-  name: az eventgrid domain key
-  summary: Manage shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_list
-  name: az eventgrid domain list
-  summary: List available domains.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-  name: az eventgrid domain private-endpoint-connection
-  summary: Manage private endpoint connection resources of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-  name: az eventgrid domain private-link-resource
-  summary: Manage private link resource of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_show
-  name: az eventgrid domain show
-  summary: Get the details of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic
-  name: az eventgrid domain topic
-  summary: Manage event domain topics.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-- uid: ext_eventgrid_az_eventgrid_domain_update
-  name: az eventgrid domain update
-  summary: Update a domain.
-- uid: ext_eventgrid_az_eventgrid_event_subscription
-  name: az eventgrid event-subscription
-  summary: Manage event subscriptions.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_create
-  name: az eventgrid event-subscription create
-  summary: Create a new event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-  name: az eventgrid event-subscription delete
-  summary: Delete an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_list
-  name: az eventgrid event-subscription list
-  summary: List event subscriptions.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_show
-  name: az eventgrid event-subscription show
-  summary: Get the details of an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_update
-  name: az eventgrid event-subscription update
-  summary: Update an event subscription.
-- uid: ext_eventgrid_az_eventgrid_extension_topic
-  name: az eventgrid extension-topic
-  summary: Manage Azure Event Grid extension topics.
-- uid: ext_eventgrid_az_eventgrid_extension_topic_show
-  name: az eventgrid extension-topic show
-  summary: Get the details of an extension topic.
-- uid: ext_eventgrid_az_eventgrid_partner
-  name: az eventgrid partner
-  summary: Manage partner resources.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace
-  name: az eventgrid partner namespace
-  summary: Manage partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_registration
-  name: az eventgrid partner registration
-  summary: Manage partner registrations.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_topic
-  name: az eventgrid partner topic
-  summary: Manage partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic
-  name: az eventgrid system-topic
-  summary: Manage system topics.
-- uid: ext_eventgrid_az_eventgrid_system_topic_create
-  name: az eventgrid system-topic create
-  summary: Create a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_delete
-  name: az eventgrid system-topic delete
-  summary: Delete a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-  name: az eventgrid system-topic event-subscription
-  summary: Manage event subscriptions of system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_list
-  name: az eventgrid system-topic list
-  summary: List available system topics.
-- uid: ext_eventgrid_az_eventgrid_system_topic_show
-  name: az eventgrid system-topic show
-  summary: Get the details of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_update
-  name: az eventgrid system-topic update
-  summary: Update a system topic.
-- uid: ext_eventgrid_az_eventgrid_topic
-  name: az eventgrid topic
-  summary: Manage Azure Event Grid topics.
-- uid: ext_eventgrid_az_eventgrid_topic_create
-  name: az eventgrid topic create
-  summary: Create a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_delete
-  name: az eventgrid topic delete
-  summary: Delete a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key
-  name: az eventgrid topic key
-  summary: Manage shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_list
-  name: az eventgrid topic list
-  summary: List available topics.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-  name: az eventgrid topic private-endpoint-connection
-  summary: Manage private endpoint connections of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-  name: az eventgrid topic private-link-resource
-  summary: Manage private link resource of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_show
-  name: az eventgrid topic show
-  summary: Get the details of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_update
-  name: az eventgrid topic update
-  summary: Update a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_type
-  name: az eventgrid topic-type
-  summary: Get details for topic types.
-- uid: ext_eventgrid_az_eventgrid_topic_type_list
-  name: az eventgrid topic-type list
-  summary: List registered topic types.
-- uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  name: az eventgrid topic-type list-event-types
-  summary: List the event types supported by a topic type.
-- uid: ext_eventgrid_az_eventgrid_topic_type_show
-  name: az eventgrid topic-type show
-  summary: Get the details for a topic type.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml
deleted file mode 100644
index 961d1631fa..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml
+++ /dev/null
@@ -1,263 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain
-  name: az eventgrid domain
-  summary: Manage event domains.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_create
-  - ext_eventgrid_az_eventgrid_domain_delete
-  - ext_eventgrid_az_eventgrid_domain_list
-  - ext_eventgrid_az_eventgrid_domain_show
-  - ext_eventgrid_az_eventgrid_domain_update
-- uid: ext_eventgrid_az_eventgrid_domain_create
-  name: az eventgrid domain create
-  summary: Create a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new domain.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2
-  - summary: Create a new domain with custom input mappings.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=mytopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
-  - summary: Create a new domain that accepts events published in CloudEvents V1.0 schema and maps a property mytopicfield to the topic name.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema cloudeventschemav1_0 --input-mapping-fields topic=mytopicfield
-  - summary: Create a new domain which allows specific inbound ip rules.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku basic
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --input-mapping-default-values
-    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
-    description: ''
-  - name: --input-mapping-fields
-    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
-    description: ''
-  - name: --input-schema
-    defaultValue: eventgridschema
-    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
-    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
-    description: ''
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    defaultValue: Basic
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_delete
-  name: az eventgrid domain delete
-  summary: Delete a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a domain.
-    syntax:
-      content: az eventgrid domain delete -g rg1 --name domain1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_list
-  name: az eventgrid domain list
-  summary: List available domains.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all domains in the current Azure subscription.
-    syntax:
-      content: az eventgrid domain list
-  - summary: List all domains in a resource group.
-    syntax:
-      content: az eventgrid domain list -g rg1
-  - summary: List all domains in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid domain list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all domains in a resource group except the domain with name "name1"
-    syntax:
-      content: az eventgrid domain list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_show
-  name: az eventgrid domain show
-  summary: Get the details of a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a domain.
-    syntax:
-      content: az eventgrid domain show -g rg1 -n domain1
-  - summary: Show the details of a domain based on resource ID.
-    syntax:
-      content: az eventgrid domain show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_update
-  name: az eventgrid domain update
-  summary: Update a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties of an existing domain.
-    syntax:
-      content: az eventgrid domain update -g rg1 --name domain1 --sku Basic --identity noidentity --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_create
-  name: az eventgrid domain create
-  summary: Create a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_delete
-  name: az eventgrid domain delete
-  summary: Delete a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key
-  name: az eventgrid domain key
-  summary: Manage shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_list
-  name: az eventgrid domain list
-  summary: List available domains.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-  name: az eventgrid domain private-endpoint-connection
-  summary: Manage private endpoint connection resources of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-  name: az eventgrid domain private-link-resource
-  summary: Manage private link resource of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_show
-  name: az eventgrid domain show
-  summary: Get the details of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic
-  name: az eventgrid domain topic
-  summary: Manage event domain topics.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-- uid: ext_eventgrid_az_eventgrid_domain_update
-  name: az eventgrid domain update
-  summary: Update a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event domains.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml
deleted file mode 100644
index 2ae9c45571..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_key
-  name: az eventgrid domain key
-  summary: Manage shared access keys of a domain.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_key_list
-  - ext_eventgrid_az_eventgrid_domain_key_regenerate
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List shared access keys of a domain. (autogenerated)
-    syntax:
-      content: az eventgrid domain key list --name MyDomain --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: Key name to regenerate key1 or key2.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared access keys of a domain.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml
deleted file mode 100644
index 1b896397b0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-  name: az eventgrid domain private-endpoint-connection
-  summary: Manage private endpoint connection resources of a domain.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Approve a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection approve -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Comments for the approval.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete private endpoint connection for a specific domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection delete -g rg1 --domain-name domain1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection list -g rg1 -n domain1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reject a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection reject -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Comments for the rejection.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection show -g rg1 --domain-name domain1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private endpoint connection resources of a domain.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml
deleted file mode 100644
index 6febea5d63..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-  name: az eventgrid domain private-link-resource
-  summary: Manage private link resource of a domain.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  - ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-link-resource list -g rg1 --domain-name domain1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-link-resource show -g rg1 --domain-name domain1 -n domain
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private link resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private link resource of a domain.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml
deleted file mode 100644
index 9b371e5b93..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_topic
-  name: az eventgrid domain topic
-  summary: Manage event domain topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_topic_create
-  - ext_eventgrid_az_eventgrid_domain_topic_delete
-  - ext_eventgrid_az_eventgrid_domain_topic_list
-  - ext_eventgrid_az_eventgrid_domain_topic_show
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new domain topic under domain.
-    syntax:
-      content: az eventgrid domain topic create -g rg1 --domain-name domain1 --name domaintopic1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a domain topic.
-    syntax:
-      content: az eventgrid domain topic delete -g rg1 --domain-name domain1 --name domaintopic1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all topics in a domain.
-    syntax:
-      content: az eventgrid domain topic list -g rg1 --domain-name domain1
-  - summary: List all domain topics in a domain whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all domain topics in a domain except the domain topic with name "name1"
-    syntax:
-      content: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a domain topic.
-    syntax:
-      content: az eventgrid domain topic show -g rg1 --domain-name domain1 --name topic1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event domain topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml
deleted file mode 100644
index fab570bbbc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml
+++ /dev/null
@@ -1,644 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_event_subscription
-  name: az eventgrid event-subscription
-  summary: Manage event subscriptions.
-  description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_event_subscription_create
-  - ext_eventgrid_az_eventgrid_event_subscription_delete
-  - ext_eventgrid_az_eventgrid_event_subscription_list
-  - ext_eventgrid_az_eventgrid_event_subscription_show
-  - ext_eventgrid_az_eventgrid_event_subscription_update
-- uid: ext_eventgrid_az_eventgrid_event_subscription_create
-  name: az eventgrid event-subscription create
-  summary: Create a new event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new event subscription for an Event Grid topic, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for an Azure subscription subscription, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for a resource group, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for a storage account, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1"  \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for a storage account, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create  --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  - summary: Create a new event subscription for an Azure subscription, with a filter specifying a subject prefix.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es4 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-begins-with mysubject_prefix
-  - summary: Create a new event subscription for a resource group, with a filter specifying a subject suffix.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es5 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-ends-with mysubject_suffix
-  - summary: Create a new event subscription for an Azure subscription, using default filters, and an EventHub as a destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint-type eventhub \
-            --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.EventHub/namespaces/n1/eventhubs/EH1
-  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure Storage queue as a destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint-type storagequeue \
-            --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/queueservices/default/queues/q1
-  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure ServiceBusQueue as a destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint-type servicebusqueue \
-            --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.ServiceBus/namespaces/ns1/queues/queue1
-  - summary: Create a new event subscription for an Event Grid domain, using default filters, and CloudEvent V 1.0 as the delivery schema.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --event-delivery-schema cloudeventschemav1_0
-  - summary: Create a new event subscription for a storage account, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier).
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
-            --max-delivery-attempts 10 --event-ttl 120
-  - summary: Create a new event subscription for a domain topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/t1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription (for a storage account) with an expiration date.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/sa1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --expiration-date "2018-10-31"
-  - summary: Create a new event subscription for an Event Grid topic, using Azure Active Directory enabled Webhook as a destination .
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --azure-active-directory-tenant-id azureactivedirectorytenantid
-            --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
-  - summary: Create a new event subscription for an Event Grid topic, using Azure Function as destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
-  - summary: Create a new event subscription for an Event Grid topic, using Eventhub with systemassigned MSI identity as destination and with deadletter with MSI identity
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --delivery-identity-endpoint-type eventhub --delivery-identity systemassigned --delivery-identity-endpoint /subscriptions/{SubId2|}/resourceGroups/{RG2}/providers/Microsoft.eventhub/namespaces/{EventHubNamespace}/eventhubs/{EventhubName} \
-            --deadletter-identity-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 --deadletter-identity systemassigned -n {EventSubscriptionName}
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --azure-active-directory-application-id-or-uri
-    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --azure-active-directory-tenant-id
-    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
-  - name: --deadletter-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the deadletter destination resource.
-    description: ''
-  - name: --deadletter-identity-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --delivery-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
-    description: ''
-  - name: --delivery-identity-endpoint
-    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --delivery-identity-endpoint-type
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint with resource identity.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --event-delivery-schema
-    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
-    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
-    description: ''
-  - name: --event-ttl
-    defaultValue: "1440"
-    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
-    description: ''
-  - name: --expiration-date
-    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --max-delivery-attempts
-    defaultValue: "30"
-    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
-    description: ''
-  - name: --max-events-per-batch
-    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
-    description: ''
-  - name: --preferred-batch-size-in-kilobytes
-    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource to which the event subscription needs to be created.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-case-sensitive
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-  name: az eventgrid event-subscription delete
-  summary: Delete an event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an event subscription for an Event Grid topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
-  - summary: Delete an event subscription for an Event Grid domain topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/topic1
-  - summary: Delete an event subscription for an Event Grid domain.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
-  - summary: Delete an event subscription for an Azure subscription.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es2 \
-            --source-resource-id /subscriptions/{SubID}
-  - summary: Delete an event subscription for a resource group.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
-  - summary: Delete an event subscription for a storage account.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be deleted.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_list
-  name: az eventgrid event-subscription list
-  summary: List event subscriptions.
-  description: >-
-    Event Grid supports both regional and global event subscriptions: Event subscriptions on regional resources (such as Storage accounts or Event Grid topics) are regional, while event subscriptions on global resources (such as an Azure subscription or resource group) are global.
-
-    Hence, you can list event subscriptions in a few different ways:
-
-    1. To list by the resource ID of the resource whose event subscriptions you want to list, specify the --source-resource-id parameter. No other parameters must be specified.
-
-    2. To list by a topic-type (e.g. storage accounts), specify the --topic-type parameter along with --location (e.g. "westus2") parameter. For global topic types (e.g. "Microsoft.Resources.Subscriptions"), specify the location value as "global".
-
-    3. To list all event subscriptions in a region (across all topic types), specify only the --location parameter.
-
-    4. For both #2 and #3 above, to filter only by a resource group, you can additionally specify the --resource-group parameter.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event subscriptions created for an Event Grid topic.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
-  - summary: List all event subscriptions created for a storage account.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob
-  - summary: List all event subscriptions created for an Azure subscription.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}
-  - summary: List all event subscriptions created for a resource group.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
-  - summary: List all event subscriptions for an Event Grid domain.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1
-  - summary: List all event subscriptions for an Event Grid domain topic.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1/topics/topic1
-  - summary: List all Storage event subscriptions (under the currently selected Azure subscription) in westus2.
-    syntax:
-      content: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2
-  - summary: List all Storage event subscriptions (under the given resource group) in westus2.
-    syntax:
-      content: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2 --resource-group {RG}
-  - summary: List all regional or global event subscriptions (under the currently selected Azure subscription).
-    syntax:
-      content: >-
-        az eventgrid event-subscription list --location westus2
-
-        az eventgrid event-subscription list --location global
-  - summary: List all regional or global event subscriptions under a specified resource group.
-    syntax:
-      content: >-
-        az eventgrid event-subscription list --location westus2 --resource-group {RG}
-
-        az eventgrid event-subscription list --location global --resource-group {RG}
-  - summary: List all event subscriptions for an Event Grid domain whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all event subscriptions for an Event Grid domain except the event subscription with name "name1"
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be listed.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-  - name: --topic-type-name
-    summary: Name of the topic-type whose event subscriptions need to be listed. When this is specified, you must also specify --location.
-    description: >-
-      Example 1: List all Storage event subscriptions in WestUS2
-          --resource-group TestRG --topic-type-name Microsoft.Storage.StorageAccounts --location westus2
-      Example 2: List all event subscriptions on Azure subscriptions
-          --topic-type-name Microsoft.Resources.Subscriptions --location global.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_show
-  name: az eventgrid event-subscription show
-  summary: Get the details of an event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event subscription for an Event Grid topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/topic1
-  - summary: Show the details of an event subscription for an Azure subscription.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es2 \
-            --source-resource-id /subscriptions/{SubID}
-  - summary: Show the details of an event subscription for a resource group.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-  - summary: Show the details of an event subscription for a storage account.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/microsoft.storage/storageaccounts/kalsegblob
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --include-full-endpoint-url
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be shown.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_update
-  name: az eventgrid event-subscription update
-  summary: Update an event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an event subscription for an Event Grid topic to specify a new endpoint.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for an Azure subscription to specify a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --subject-ends-with .jpg
-  - summary: Update an event subscription for a resource group to specify a new endpoint and a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
-            --subject-ends-with .png \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for a storage account to specify a new list of included event types.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob" \
-            --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
-  - summary: Update an event subscription for a storage account, to include a deadletter destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob" \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
-  - summary: Update an event subscription for a storage account, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --deadletter-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the deadletter destination resource.
-    description: ''
-  - name: --deadletter-identity-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --delivery-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
-    description: ''
-  - name: --delivery-identity-endpoint
-    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --delivery-identity-endpoint-type
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint with resource identity.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be updated.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_event_subscription_create
-  name: az eventgrid event-subscription create
-  summary: Create a new event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-  name: az eventgrid event-subscription delete
-  summary: Delete an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_list
-  name: az eventgrid event-subscription list
-  summary: List event subscriptions.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_show
-  name: az eventgrid event-subscription show
-  summary: Get the details of an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_update
-  name: az eventgrid event-subscription update
-  summary: Update an event subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml
deleted file mode 100644
index 7aa704cdc3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_extension_topic
-  name: az eventgrid extension-topic
-  summary: Manage Azure Event Grid extension topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_extension_topic_show
-- uid: ext_eventgrid_az_eventgrid_extension_topic_show
-  name: az eventgrid extension-topic show
-  summary: Get the details of an extension topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an extension topic.
-    syntax:
-      content: az eventgrid extension-topic show --scope /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageAccounts/{StorageAccountName}
-  parameters:
-  - isRequired: true
-    name: --scope
-    summary: The identifier of the resource to which extension topic is queried. The scope can be a subscription, or a resource group, or a top level resource belonging to a resource provider namespace. For example, use '/subscriptions/{subscriptionId}/' for a subscription, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' for Azure resource.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_extension_topic_show
-  name: az eventgrid extension-topic show
-  summary: Get the details of an extension topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Event Grid extension topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml
deleted file mode 100644
index 6a6288e98d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner
-  name: az eventgrid partner
-  summary: Manage partner resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace
-  name: az eventgrid partner namespace
-  summary: Manage partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_registration
-  name: az eventgrid partner registration
-  summary: Manage partner registrations.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_topic
-  name: az eventgrid partner topic
-  summary: Manage partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml
deleted file mode 100644
index 027cf47ff6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace
-  name: az eventgrid partner namespace
-  summary: Manage partner namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_namespace_create
-  - ext_eventgrid_az_eventgrid_partner_namespace_delete
-  - ext_eventgrid_az_eventgrid_partner_namespace_list
-  - ext_eventgrid_az_eventgrid_partner_namespace_show
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new partner namespace.
-    syntax:
-      content: az eventgrid partner namespace create -g rg1 --name namespaceName1 -l westus2 --partner-registration-id 795c9f2f-6d2d-42ff-a570-42fd3043192c
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --partner-registration-id
-    summary: 'The fully qualified ARM Id of the partner registration that should be associated with this partner namespace. This takes the following format: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/partnerRegistrations/{partnerRegistrationName}.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific partner namespace.
-    syntax:
-      content: az eventgrid partner namespace delete -g rg1 --name partnernamespace1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all partner namespaces in the current Azure subscription.
-    syntax:
-      content: az eventgrid partner namespace list
-  - summary: List all partner namespaces in a resource group.
-    syntax:
-      content: az eventgrid partner namespace list -g rg1
-  - summary: List all partner namespaces in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner namespace list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all partner namespaces in a resource group except the partner namespace with name "name1"
-    syntax:
-      content: az eventgrid partner namespace list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a partner namespace.
-    syntax:
-      content: az eventgrid partner namespace show -g rg1 -n partnernamespace1
-  - summary: Show the details of a partner namespace based on resource ID.
-    syntax:
-      content: az eventgrid partner namespace show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner namespaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml
deleted file mode 100644
index 8bc8efbfba..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml
+++ /dev/null
@@ -1,197 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a specific event channel.
-    syntax:
-      content: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1
-  - summary: Create a specific event channel with an activation expiration time and partner topic friendly description.
-    syntax:
-      content: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --activation-expiration-date '2020-05-20T10:00' --partner-topic-description 'This topic is created by Costoco corp on user behavior.'
-  - summary: Create a specific event channel with publisher filters.
-    syntax:
-      content: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --publisher-filter data.key1 NumberIn 2 3 4 100 200 --publisher-filter data.key2 StringIn 2 3 4 100 200
-  parameters:
-  - isRequired: true
-    name: --desination-topic-name
-    summary: Name of the partner topic associated with the event channel.
-    description: ''
-  - isRequired: true
-    name: --destination-resource-group
-    summary: Azure Resource Group of the customer creating the event channel. The partner topic associated with the event channel will be created under this resource group.
-    description: ''
-  - isRequired: true
-    name: --destination-subscription-id
-    summary: Azure subscription Id of the customer creating the event channel. The partner topic associated with the event channel will be created under this Azure subscription.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event channel.
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source
-    summary: The identifier of the resource that forms the partner source of the events. This represents a unique resource in the partner's resource model.
-    description: ''
-  - name: --activation-expiration-date
-    summary: Date or datetime in UTC ISO 8601 format (e.g., '2022-02-17T01:59:59+00:00' or '2022-02-17') after which the event channel and corresponding partner topic would expire and get auto deleted. If this time is not specified, the expiration date is set to seven days by default.
-    description: ''
-  - name: --partner-topic-description
-    summary: Friendly description of the corresponding partner topic. This will be helpful to remove any ambiguity of the origin of creation of the partner topic for the customer.
-    description: ''
-  - name: --publisher-filter
-    summary: A publisher filter that is used to enable filtering of events based on a specific event property. This set of filters that are specified by the publisher in order to determine which events to be received by the subscriber.
-    description: >-
-      Usage:                     --publisher-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --publisher-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --publisher-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --publisher-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --publisher-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --publisher-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --publisher-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --publisher-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --publisher-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --publisher-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --publisher-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --publisher-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --publisher-filter data.property3 BoolEquals true
-
-      Multiple publisher filters can be specified by using more than one `--publisher-filter` argument.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific partner namespace.
-    syntax:
-      content: az eventgrid partner namespace event-channel delete -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event channel.
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event-channels in a specific partner namespace.
-    syntax:
-      content: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1
-  - summary: List all event channel under a partner namespace whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1  --odata-query "Contains(name, 'XYZ')"
-  parameters:
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event channel.
-    syntax:
-      content: az eventgrid partner namespace event-channel show -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
-  - summary: Show the details of an event-channel based on resource ID.
-    syntax:
-      content: az eventgrid partner namespace event-channel show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1/eventChannels/eventChannelName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event channel.
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner event channels.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml
deleted file mode 100644
index 949b6eb377..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  - ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List shared access keys of a partner namespace (autogenerated)
-    syntax:
-      content: az eventgrid partner namespace key list --partner-namespace-name MyNamespace --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: Key name to regenerate (key1 or key2).
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared access keys of a partner namespace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml
deleted file mode 100644
index 07c75f6d36..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_registration
-  name: az eventgrid partner registration
-  summary: Manage partner registrations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_registration_create
-  - ext_eventgrid_az_eventgrid_partner_registration_delete
-  - ext_eventgrid_az_eventgrid_partner_registration_list
-  - ext_eventgrid_az_eventgrid_partner_registration_show
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new partner registration with basic information.
-    syntax:
-      content: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445
-  - summary: Create a new partner registration with partner information.
-    syntax:
-      content: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445 --description ExampleDescription --display-name ExampleDisplayName1 --logo-uri 'https://www.example.com/logo.png' --setup-uri 'https://www.example.com' --long-description 'This is sample description}' --customer-service-number '+1 800 123 4567' --customer-service-extension '125' --customer-service-uri 'https://www.example.com/customerservice'
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner registration.
-    description: ''
-  - isRequired: true
-    name: --partner-name
-    summary: Official name of the partner.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-type-name
-    summary: Name of the partner topic resource type. This name should be unique among all partner topic types names.
-    description: ''
-  - name: --authorized-subscription-ids
-    summary: A space-separated list of Azure subscription Ids that are authorized to create a partner namespace associated with this partner registration. This is an optional property. Creating partner namespaces is always permitted under the same Azure subscription as the one used for creating the partner registration.
-    description: ''
-  - name: --customer-service-extension
-    summary: The extension of the customer service number of the publisher. Only digits are allowed and number of digits should not exceed 10.
-    description: ''
-  - name: --customer-service-number
-    summary: "The customer service number of the publisher. The expected phone format should start with a '+' sign followed by the country code. The remaining digits are then followed. Only digits and spaces are allowed and its length cannot exceed 16 digits including country code. Examples of valid phone numbers are: +1 515 123 4567 and +966 7 5115 2471. Examples of invalid phone numbers are: +1 (515) 123-4567, 1 515 123 4567 and +966 121 5115 24 7 551 1234 43."
-    description: ''
-  - name: --customer-service-uri
-    summary: The customer service URI of the publisher.
-    description: ''
-  - name: --description
-    summary: Description of the partner topic type.
-    description: ''
-  - name: --display-name
-    summary: Display name for the partner topic type.
-    description: ''
-  - name: --logo-uri
-    summary: URI of the partner logo.
-    description: ''
-  - name: --long-description
-    summary: Description of the custom scenarios and integration. Length of this description should not exceed 2048 characters.
-    description: ''
-  - name: --setup-uri
-    summary: URI of the partner website that can be used by Azure customers to setup Event Grid integration on an event source.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-  description: Deletes a partner registration with the specified parameters.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all partner registrations in the current Azure subscription.
-    syntax:
-      content: az eventgrid partner registration list
-  - summary: List all partner registrations in a resource group.
-    syntax:
-      content: az eventgrid partner registration list -g rg1
-  - summary: List all partner registrations in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner registration list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all partner registrations in a resource group except the partner registration with name "name1"
-    syntax:
-      content: az eventgrid partner registration list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-  description: Gets a partner registration with the specified parameters.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner registrations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml
deleted file mode 100644
index 00a964ef35..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml
+++ /dev/null
@@ -1,169 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_topic
-  name: az eventgrid partner topic
-  summary: Manage partner topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_topic_activate
-  - ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  - ext_eventgrid_az_eventgrid_partner_topic_delete
-  - ext_eventgrid_az_eventgrid_partner_topic_list
-  - ext_eventgrid_az_eventgrid_partner_topic_show
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Activate a specific partner topic.
-    syntax:
-      content: az eventgrid partner topic activate -g rg1 -n partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deactivate a specific partner topic.
-    syntax:
-      content: az eventgrid partner topic deactivate -g rg1 -n partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific partner topic.
-    syntax:
-      content: az eventgrid partner topic delete -g rg1 --name partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all partner topics in the current Azure subscription.
-    syntax:
-      content: az eventgrid partner topic list
-  - summary: List all partner topics in a resource group.
-    syntax:
-      content: az eventgrid partner topic list -g rg1
-  - summary: List all partner topics in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all partner topics in a resource group except the partner topic with name "name1"
-    syntax:
-      content: az eventgrid partner topic list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a partner topic.
-    syntax:
-      content: az eventgrid partner topic show -g rg1 -n partnertopic1
-  - summary: Show the details of a partner topic based on resource ID.
-    syntax:
-      content: az eventgrid partner topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnetopics/topic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml
deleted file mode 100644
index d01a2b11c5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml
+++ /dev/null
@@ -1,374 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new event subscription for an Event Grid partner topic, using default filters.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for an Event Grid partner topic, with a filter specifying a subject prefix.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es4 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-begins-with mysubject_prefix
-  - summary: Create a new event subscription for an Event Grid partner topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create -n es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --event-delivery-schema cloudeventschemav1_0
-  - summary: Create a new event subscription for an Event Grid partnertopic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
-            --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
-  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Active Directory enabled Webhook as a destination .
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --azure-active-directory-tenant-id azureactivedirectorytenantid
-            --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
-  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Function as destination.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create -n es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --azure-active-directory-application-id-or-uri
-    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --azure-active-directory-tenant-id
-    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --event-delivery-schema
-    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
-    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
-    description: ''
-  - name: --event-ttl
-    defaultValue: "1440"
-    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
-    description: ''
-  - name: --expiration-date
-    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --max-delivery-attempts
-    defaultValue: "30"
-    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
-    description: ''
-  - name: --max-events-per-batch
-    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
-    description: ''
-  - name: --preferred-batch-size-in-kilobytes
-    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-case-sensitive
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an event subscription for an Event Grid partner topic.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription delete --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event subscriptions created for an Event Grid partner topic.
-    syntax:
-      content: az eventgrid partner topic event-subscription list -g rg1 --partner-topic-name partnertopic1
-  parameters:
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event subscription for an Event Grid partner topic.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription show --name es1 \
-             -g rg1 --partner-topic-name partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --include-full-endpoint-url
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for an Event Grid partner topic to specify a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --subject-ends-with .jpg
-  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es3 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --subject-ends-with .png \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
-  - summary: Update an event subscription for an Azure Event Grid partner topic, to include a deadletter destination.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
-  - summary: Update an event subscription for an Azure Event Grid partner topic, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es3 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event subscriptions of partner topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml
deleted file mode 100644
index 8140c7012d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_system_topic
-  name: az eventgrid system-topic
-  summary: Manage system topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_system_topic_create
-  - ext_eventgrid_az_eventgrid_system_topic_delete
-  - ext_eventgrid_az_eventgrid_system_topic_list
-  - ext_eventgrid_az_eventgrid_system_topic_show
-  - ext_eventgrid_az_eventgrid_system_topic_update
-- uid: ext_eventgrid_az_eventgrid_system_topic_create
-  name: az eventgrid system-topic create
-  summary: Create a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new system topic for storage account source.
-    syntax:
-      content: az eventgrid system-topic create -g rg1 --name systemtopic1 --location westus2 --topic-type microsoft.storage.storageaccounts --source /subscriptions/1b3b4501-23b9-4790-c31b-ddbd88d72123/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/stgaccountname
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source
-    summary: The ARM Id for the topic, e.g., /subscriptions/{SubId}/resourceGroups/{RgName}/providers/Microsoft.Storage/storageAccounts/{AccountName}.
-    description: ''
-  - isRequired: true
-    name: --topic-type
-    summary: Name of the topic type.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_delete
-  name: az eventgrid system-topic delete
-  summary: Delete a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific system topic.
-    syntax:
-      content: az eventgrid system-topic delete -g rg1 --name systemtopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_list
-  name: az eventgrid system-topic list
-  summary: List available system topics.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all system topics in the current Azure subscription.
-    syntax:
-      content: az eventgrid system-topic list
-  - summary: List all system topics in a resource group.
-    syntax:
-      content: az eventgrid system-topic list -g rg1
-  - summary: List all system topics in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid system-topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all system topics in a resource group except the system topic with name "name1"
-    syntax:
-      content: az eventgrid system-topic list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_show
-  name: az eventgrid system-topic show
-  summary: Get the details of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a system topic.
-    syntax:
-      content: az eventgrid system-topic show -g rg1 -n systemtopic1
-  - summary: Show the details of a system topic based on resource ID.
-    syntax:
-      content: az eventgrid system-topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/systemtopics/systemtopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_update
-  name: az eventgrid system-topic update
-  summary: Update a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties of an existing system topic.
-    syntax:
-      content: az eventgrid system-topic update -g rg1 --name systemtopic1 --tags Dept=IT
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_system_topic_create
-  name: az eventgrid system-topic create
-  summary: Create a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_delete
-  name: az eventgrid system-topic delete
-  summary: Delete a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-  name: az eventgrid system-topic event-subscription
-  summary: Manage event subscriptions of system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_list
-  name: az eventgrid system-topic list
-  summary: List available system topics.
-- uid: ext_eventgrid_az_eventgrid_system_topic_show
-  name: az eventgrid system-topic show
-  summary: Get the details of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_update
-  name: az eventgrid system-topic update
-  summary: Update a system topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage system topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml
deleted file mode 100644
index 0be11cce95..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml
+++ /dev/null
@@ -1,374 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-  name: az eventgrid system-topic event-subscription
-  summary: Manage event subscriptions of system topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new event subscription for an Event Grid system topic, using default filters.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for an Event Grid system topic, with a filter specifying a subject prefix.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es4 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-begins-with mysubject_prefix
-  - summary: Create a new event subscription for an Event Grid system topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create -n es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --event-delivery-schema cloudeventschemav1_0
-  - summary: Create a new event subscription for an Event Grid system topic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
-            --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
-  - summary: Create a new event subscription for an Event Grid system topic, using Azure Active Directory enabled Webhook as a destination .
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --azure-active-directory-tenant-id azureactivedirectorytenantid
-            --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
-  - summary: Create a new event subscription for an Event Grid system topic, using Azure Function as destination.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create -n es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --azure-active-directory-application-id-or-uri
-    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --azure-active-directory-tenant-id
-    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --event-delivery-schema
-    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
-    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
-    description: ''
-  - name: --event-ttl
-    defaultValue: "1440"
-    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
-    description: ''
-  - name: --expiration-date
-    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --max-delivery-attempts
-    defaultValue: "30"
-    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
-    description: ''
-  - name: --max-events-per-batch
-    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
-    description: ''
-  - name: --preferred-batch-size-in-kilobytes
-    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-case-sensitive
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an event subscription for an Event Grid system topic.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription delete --name es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event subscriptions created for an Event Grid system topic.
-    syntax:
-      content: az eventgrid system-topic event-subscription list -g rg1 --system-topic-name systemtopic1
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event subscription for an Event Grid system topic.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription show --name es1 \
-             -g rg1 --system-topic-name systemtopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --include-full-endpoint-url
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es1 \
-            -g rg1 --system-topic-name systemtopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for an Event Grid system topic to specify a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --subject-ends-with .jpg
-  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es3 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --subject-ends-with .png \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
-  - summary: Update an event subscription for an Azure Event Grid system topic, to include a deadletter destination.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
-  - summary: Update an event subscription for an Azure Event Grid system topic, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es3 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event subscriptions of system topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml
deleted file mode 100644
index 6c0a444432..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_type
-  name: az eventgrid topic-type
-  summary: Get details for topic types.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_type_list
-  - ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  - ext_eventgrid_az_eventgrid_topic_type_show
-- uid: ext_eventgrid_az_eventgrid_topic_type_list
-  name: az eventgrid topic-type list
-  summary: List registered topic types.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  name: az eventgrid topic-type list-event-types
-  summary: List the event types supported by a topic type.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event types supported by Azure Storage Accounts.
-    syntax:
-      content: az eventgrid topic-type list-event-types -n Microsoft.Storage.StorageAccounts
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic type.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_type_show
-  name: az eventgrid topic-type show
-  summary: Get the details for a topic type.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic type.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_type_list
-  name: az eventgrid topic-type list
-  summary: List registered topic types.
-- uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  name: az eventgrid topic-type list-event-types
-  summary: List the event types supported by a topic type.
-- uid: ext_eventgrid_az_eventgrid_topic_type_show
-  name: az eventgrid topic-type show
-  summary: Get the details for a topic type.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Get details for topic types.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml
deleted file mode 100644
index d8f8fdcf01..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml
+++ /dev/null
@@ -1,248 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic
-  name: az eventgrid topic
-  summary: Manage Azure Event Grid topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_create
-  - ext_eventgrid_az_eventgrid_topic_delete
-  - ext_eventgrid_az_eventgrid_topic_list
-  - ext_eventgrid_az_eventgrid_topic_show
-  - ext_eventgrid_az_eventgrid_topic_update
-- uid: ext_eventgrid_az_eventgrid_topic_create
-  name: az eventgrid topic create
-  summary: Create a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new topic.
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2
-  - summary: Create a new topic with custom input mappings.
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=myTopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
-  - summary: Create a new topic that accepts events published in CloudEvents V1.0 schema.
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema cloudeventschemav1_0
-  - summary: Create a new topic which allows specific inbound ip rules with Basic Sku and system assigned identity
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku Basic --identity systemassigned
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --input-mapping-default-values
-    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
-    description: ''
-  - name: --input-mapping-fields
-    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
-    description: ''
-  - name: --input-schema
-    defaultValue: eventgridschema
-    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
-    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
-    description: ''
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    defaultValue: Basic
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_delete
-  name: az eventgrid topic delete
-  summary: Delete a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a topic.
-    syntax:
-      content: az eventgrid topic delete -g rg1 --name topic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_list
-  name: az eventgrid topic list
-  summary: List available topics.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all topics in the current Azure subscription.
-    syntax:
-      content: az eventgrid topic list
-  - summary: List all topics in a resource group.
-    syntax:
-      content: az eventgrid topic list -g rg1
-  - summary: List all topics in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all topics in a resource group except the domain with name "name1"
-    syntax:
-      content: az eventgrid topic list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_show
-  name: az eventgrid topic show
-  summary: Get the details of a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a topic.
-    syntax:
-      content: az eventgrid topic show -g rg1 -n topic1
-  - summary: Show the details of a topic based on resource ID.
-    syntax:
-      content: az eventgrid topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_update
-  name: az eventgrid topic update
-  summary: Update a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties of an existing topic with new sku, identity and public network access information.
-    syntax:
-      content: az eventgrid topic update -g rg1 --name topic1 --sku Premium --identity systemassigned --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_create
-  name: az eventgrid topic create
-  summary: Create a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_delete
-  name: az eventgrid topic delete
-  summary: Delete a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key
-  name: az eventgrid topic key
-  summary: Manage shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_list
-  name: az eventgrid topic list
-  summary: List available topics.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-  name: az eventgrid topic private-endpoint-connection
-  summary: Manage private endpoint connections of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-  name: az eventgrid topic private-link-resource
-  summary: Manage private link resource of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_show
-  name: az eventgrid topic show
-  summary: Get the details of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_update
-  name: az eventgrid topic update
-  summary: Update a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Event Grid topics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml
deleted file mode 100644
index bfd7252f9e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_key
-  name: az eventgrid topic key
-  summary: Manage shared access keys of a topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_key_list
-  - ext_eventgrid_az_eventgrid_topic_key_regenerate
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List shared access keys of a topic (autogenerated)
-    syntax:
-      content: az eventgrid topic key list --name MyTopic --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: Key name to regenerate key1 or key2.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared access keys of a topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml
deleted file mode 100644
index 944d142b05..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-  name: az eventgrid topic private-endpoint-connection
-  summary: Manage private endpoint connections of a topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Approve a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection approve -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-  - name: --description
-    summary: Comments for the approval.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete private endpoint connection for a specific topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection delete -g rg1 --topic-name topic1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List private endpoint connections for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection list -g rg1 --topic-name topic1
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reject a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection reject -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-  - name: --description
-    summary: Comments for the rejection.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection show -g rg1 --topic-name topic1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private endpoint connections of a topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml
deleted file mode 100644
index d6c99354a3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-  name: az eventgrid topic private-link-resource
-  summary: Manage private link resource of a topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  - ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-link-resource list -g rg1 --topic-name topic1
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-link-resource show -g rg1 --topic-name topic1 -n topic
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private link resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private link resource of a topic.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/index.yml
deleted file mode 100644
index 1c1f49fd7a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/eventgrid/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az
-  name: eventgrid
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_eventgrid_az_eventgrid
-  name: az eventgrid
-  summary: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/index.yml
deleted file mode 100644
index d05dbb5aa2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az
-  name: express-route-cross-connection
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route-cross-connection_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network.yml
deleted file mode 100644
index 91d2552a16..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route-cross-connection_az_network_cross_connection
-  name: az network cross-connection
-  summary: Manage customers' ExpressRoute circuits.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list
-  name: az network cross-connection list
-  summary: List all ExpressRoute cross-connections for the current subscription.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  name: az network cross-connection list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  name: az network cross-connection list-route-tables
-  summary: Show the current routing table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-  name: az network cross-connection peering
-  summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_show
-  name: az network cross-connection show
-  summary: Get the details of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  name: az network cross-connection summarize-route-table
-  summary: Gets the route table summary associated with the express route cross connection in a resource group.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_update
-  name: az network cross-connection update
-  summary: Update settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-  name: az network cross-connection wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml
deleted file mode 100644
index 47b48313af..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml
+++ /dev/null
@@ -1,268 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az_network_cross_connection
-  name: az network cross-connection
-  summary: Manage customers' ExpressRoute circuits.
-  description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - ext_express-route-cross-connection_az_network_cross_connection_list
-  - ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  - ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  - ext_express-route-cross-connection_az_network_cross_connection_show
-  - ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  - ext_express-route-cross-connection_az_network_cross_connection_update
-  - ext_express-route-cross-connection_az_network_cross_connection_wait
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list
-  name: az network cross-connection list
-  summary: List all ExpressRoute cross-connections for the current subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all ExpressRoute cross-connections for the current subscription.
-    syntax:
-      content: az network cross-connection list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  name: az network cross-connection list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection.
-    syntax:
-      content: >-
-        az network cross-connection list-arp-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  name: az network cross-connection list-route-tables
-  summary: Show the current routing table of an ExpressRoute cross-connection peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current routing table of an ExpressRoute cross-connection peering.
-    syntax:
-      content: >-
-        az network cross-connection list-route-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_show
-  name: az network cross-connection show
-  summary: Get the details of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an ExpressRoute cross-connection.
-    syntax:
-      content: az network cross-connection show -n MyCircuit -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  name: az network cross-connection summarize-route-table
-  summary: Gets the route table summary associated with the express route cross connection in a resource group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_update
-  name: az network cross-connection update
-  summary: Update settings of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --notes
-    summary: Service provider notes.
-    description: ''
-  - name: --provisioning-state
-    parameterValueGroup: NotProvisioned, Provisioned, Provisioning
-    summary: Provisioning state of the customer ExpressRoute circuit.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-  name: az network cross-connection wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the ExpressRoute cross-connection is successfully provisioned.
-    syntax:
-      content: az network cross-connection wait -n MyCircuit -g MyResourceGroup --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list
-  name: az network cross-connection list
-  summary: List all ExpressRoute cross-connections for the current subscription.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  name: az network cross-connection list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  name: az network cross-connection list-route-tables
-  summary: Show the current routing table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-  name: az network cross-connection peering
-  summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_show
-  name: az network cross-connection show
-  summary: Get the details of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  name: az network cross-connection summarize-route-table
-  summary: Gets the route table summary associated with the express route cross connection in a resource group.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_update
-  name: az network cross-connection update
-  summary: Update settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-  name: az network cross-connection wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml
deleted file mode 100644
index 37f34b73d8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-  name: az network cross-connection peering
-  summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_update
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create Microsoft Peering settings with IPv4 configuration.
-    syntax:
-      content: >-
-        az network cross-connection peering create -g MyResourceGroup --cross-connection-name MyCircuit \
-            --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
-            --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
-            --advertised-public-prefixes 101.0.0.0/30
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --peer-asn
-    summary: Autonomous system number of the customer/connectivity provider.
-    description: ''
-  - isRequired: true
-    name: --peering-type
-    parameterValueGroup: AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering
-    summary: BGP peering type for the circuit.
-    description: ''
-  - isRequired: true
-    name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
-    description: ''
-  - isRequired: true
-    name: --vlan-id
-    summary: Identifier used to identify the customer.
-    description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
-    description: ''
-  - name: --advertised-public-prefixes
-    summary: Space-separated list of prefixes to be advertised through the BGP peering.
-    description: ''
-  - name: --customer-asn
-    summary: Autonomous system number of the customer.
-    description: ''
-  - name: --routing-registry-name
-    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
-    summary: Internet Routing Registry / Regional Internet Registry.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete private peering.
-    syntax:
-      content: az network cross-connection peering delete -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List peering settings of an ExpressRoute cross-connection.
-    syntax:
-      content: az network cross-connection peering list -g MyResourceGroup --cross-connection-name MyCircuit
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get private peering details of an ExpressRoute cross-connection.
-    syntax:
-      content: az network cross-connection peering show -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --peer-asn
-    summary: Autonomous system number of the customer/connectivity provider.
-    description: ''
-  - name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
-    description: ''
-  - name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
-    description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
-    description: ''
-  - name: --vlan-id
-    summary: Identifier used to identify the customer.
-    description: ''
-  - name: --advertised-public-prefixes
-    summary: Space-separated list of prefixes to be advertised through the BGP peering.
-    description: ''
-  - name: --customer-asn
-    summary: Autonomous system number of the customer.
-    description: ''
-  - name: --ip-version
-    defaultValue: IPv4
-    parameterValueGroup: IPv4, IPv6
-    summary: The IP version to update Microsoft Peering settings for.
-    description: ''
-  - name: --routing-registry-name
-    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
-    summary: Internet Routing Registry / Regional Internet Registry.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute peering of an ExpressRoute cross-connection.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/index.yml
deleted file mode 100644
index 622e4b5801..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az
-  name: express-route
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network.yml
deleted file mode 100644
index 8ec8c14839..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route_az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-- uid: ext_express-route_az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: ext_express-route_az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route.yml
deleted file mode 100644
index 6f07c31e42..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route.yml
+++ /dev/null
@@ -1,266 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-  description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_create
-  - ext_express-route_az_network_express_route_list
-  - ext_express-route_az_network_express_route_show
-  - ext_express-route_az_network_express_route_update
-- uid: ext_express-route_az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ExpressRoute circuit.
-    syntax:
-      content: az network express-route create --bandwidth 200 -n MyCircuit --peering-location "Silicon Valley" -g MyResourceGroup --provider "Equinix" -l "West US" --sku-family MeteredData --sku-tier Standard
-  parameters:
-  - isRequired: true
-    name: --bandwidth
-    summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
-    description: ''
-    valueFrom: az network express-route list-service-providers
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allow-global-reach
-    parameterValueGroup: false, true
-    summary: Enable global reach on the circuit.
-    description: ''
-  - name: --express-route-port
-    summary: Name or ID of an ExpressRoute port.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --peering-location
-    summary: Name of the peering location.
-    description: ''
-    valueFrom: az network express-route list-service-providers
-  - name: --provider
-    summary: Name of the ExpressRoute Service Provider.
-    description: ''
-    valueFrom: az network express-route list-service-providers
-  - name: --sku-family
-    defaultValue: MeteredData
-    parameterValueGroup: MeteredData, UnlimitedData
-    summary: Chosen SKU family of ExpressRoute circuit.
-    description: ''
-  - name: --sku-tier
-    defaultValue: Standard
-    parameterValueGroup: Premium, Standard
-    summary: SKU Tier of ExpressRoute circuit.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_express-route_az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all ExpressRoute circuits for the current subscription.
-    syntax:
-      content: az network express-route list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route show -n MyCircuit -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Change the SKU of an ExpressRoute circuit from Standard to Premium.
-    syntax:
-      content: az network express-route update -n MyCircuit -g MyResourceGroup --sku-tier Premium
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allow-global-reach
-    parameterValueGroup: false, true
-    summary: Enable global reach on the circuit.
-    description: ''
-  - name: --bandwidth
-    summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
-    description: ''
-  - name: --express-route-port
-    summary: Name or ID of an ExpressRoute port.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --peering-location
-    summary: Name of the peering location.
-    description: ''
-  - name: --provider
-    summary: Name of the ExpressRoute Service Provider.
-    description: ''
-  - name: --sku-family
-    parameterValueGroup: MeteredData, UnlimitedData
-    summary: Chosen SKU family of ExpressRoute circuit.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: Premium, Standard
-    summary: SKU Tier of ExpressRoute circuit.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: ext_express-route_az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/gateway.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/gateway.yml
deleted file mode 100644
index 4e30a3d6f7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/gateway.yml
+++ /dev/null
@@ -1,171 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_gateway_create
-  - ext_express-route_az_network_express_route_gateway_delete
-  - ext_express-route_az_network_express_route_gateway_list
-  - ext_express-route_az_network_express_route_gateway_show
-  - ext_express-route_az_network_express_route_gateway_update
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --virtual-hub
-    summary: Name or ID of the virtual hub to associate with the gateway.
-    description: ''
-  - name: --max-val
-    summary: Maximum number of scale units deployed for gateway.
-    description: ''
-  - name: --min-val
-    defaultValue: "2"
-    summary: Minimum number of scale units deployed for gateway.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --max-val
-    summary: Maximum number of scale units deployed for gateway.
-    description: ''
-  - name: --min-val
-    summary: Minimum number of scale units deployed for gateway.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute gateways.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/gateway/connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/gateway/connection.yml
deleted file mode 100644
index 37939f182e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/gateway/connection.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_gateway_connection_create
-  - ext_express-route_az_network_express_route_gateway_connection_delete
-  - ext_express-route_az_network_express_route_gateway_connection_list
-  - ext_express-route_az_network_express_route_gateway_connection_show
-  - ext_express-route_az_network_express_route_gateway_connection_update
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --authorization-key
-    summary: Authorization key to establish the connection.
-    description: ''
-  - name: --routing-weight
-    summary: Routing weight associated with the connection.
-    description: ''
-  - isRequired: true
-    name: --peering
-    summary: Name or ID of an ExpressRoute peering.
-    description: ''
-  - name: --circuit-name
-    summary: ExpressRoute circuit name.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --authorization-key
-    summary: Authorization key to establish the connection.
-    description: ''
-  - name: --routing-weight
-    summary: Routing weight associated with the connection.
-    description: ''
-  - name: --circuit-name
-    summary: ExpressRoute circuit name.
-    description: ''
-  - name: --peering
-    summary: Name or ID of an ExpressRoute peering.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute gateway connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port.yml
deleted file mode 100644
index 60a6aadeb2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_port_create
-  - ext_express-route_az_network_express_route_port_delete
-  - ext_express-route_az_network_express_route_port_list
-  - ext_express-route_az_network_express_route_port_show
-  - ext_express-route_az_network_express_route_port_update
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --bandwidth
-    summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Gbps.'
-    description: ''
-  - name: --encapsulation
-    parameterValueGroup: Dot1Q, QinQ
-    summary: Encapsulation method on physical ports.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --peering-location
-    summary: The name of the peering location that the port is mapped to physically.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute ports.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port/link.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port/link.yml
deleted file mode 100644
index 15309ae53d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port/link.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_port_link_list
-  - ext_express-route_az_network_express_route_port_link_show
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --port-name
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the ExpressRouteLink resource.
-    description: ''
-  - isRequired: true
-    name: --port-name
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: View ExpressRoute links.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port/location.yml b/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port/location.yml
deleted file mode 100644
index 2a585d2727..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/express-route/network/express-route/port/location.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_port_location_list
-  - ext_express-route_az_network_express_route_port_location_show
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Name of the requested ExpressRoutePort peering location.
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: View ExpressRoute port location information.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/index.yml
deleted file mode 100644
index c1c6569db0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az
-  name: front-door
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_front-door_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network.yml
deleted file mode 100644
index 7d6e59e096..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network.yml
+++ /dev/null
@@ -1,293 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_front-door_az_network_front_door
-  name: az network front-door
-  summary: Manage Front Doors.
-- uid: ext_front-door_az_network_front_door_backend_pool
-  name: az network front-door backend-pool
-  summary: Manage Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_check_custom_domain
-  name: az network front-door check-custom-domain
-  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
-- uid: ext_front-door_az_network_front_door_create
-  name: az network front-door create
-  summary: Create a Front Door.
-- uid: ext_front-door_az_network_front_door_delete
-  name: az network front-door delete
-  summary: Delete a Front Door.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint
-  name: az network front-door frontend-endpoint
-  summary: Manage Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_list
-  name: az network front-door list
-  summary: List Front Doors.
-- uid: ext_front-door_az_network_front_door_load_balancing
-  name: az network front-door load-balancing
-  summary: Manage Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-- uid: ext_front-door_az_network_front_door_probe
-  name: az network front-door probe
-  summary: Manage Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_purge_endpoint
-  name: az network front-door purge-endpoint
-  summary: Removes a content from Front Door.
-- uid: ext_front-door_az_network_front_door_routing_rule
-  name: az network front-door routing-rule
-  summary: Manage Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_rules_engine
-  name: az network front-door rules-engine
-  summary: Manage Front Door rules engines.
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-- uid: ext_front-door_az_network_front_door_show
-  name: az network front-door show
-  summary: Get the details of a Front Door.
-- uid: ext_front-door_az_network_front_door_update
-  name: az network front-door update
-  summary: Update settings of a Front Door.
-- uid: ext_front-door_az_network_front_door_waf_policy
-  name: az network front-door waf-policy
-  summary: Manage WebApplication Firewall (WAF) policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door.yml
deleted file mode 100644
index e861629aef..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door.yml
+++ /dev/null
@@ -1,490 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door
-  name: az network front-door
-  summary: Manage Front Doors.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_check_custom_domain
-  - ext_front-door_az_network_front_door_create
-  - ext_front-door_az_network_front_door_delete
-  - ext_front-door_az_network_front_door_list
-  - ext_front-door_az_network_front_door_purge_endpoint
-  - ext_front-door_az_network_front_door_show
-  - ext_front-door_az_network_front_door_update
-- uid: ext_front-door_az_network_front_door_check_custom_domain
-  name: az network front-door check-custom-domain
-  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --host-name
-    summary: The host name of the custom domain. Must be a domain name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_create
-  name: az network front-door create
-  summary: Create a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --friendly-name
-    summary: Friendly name of the Front Door.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --backend-address
-    summary: FQDN of the backend endpoint.
-    description: ''
-  - name: --backend-host-header
-    summary: Host header sent to the backend.
-    description: ''
-  - name: --enforce-certificate-name-check
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
-    description: ''
-  - name: --send-recv-timeout
-    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
-    description: ''
-  - name: --frontend-host-name
-    summary: Domain name of the frontend endpoint.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Interval in seconds between probes.
-    description: ''
-  - name: --path
-    defaultValue: /
-    summary: Path to probe.
-    description: ''
-  - name: --probeMethod
-    defaultValue: HEAD
-    parameterValueGroup: GET, HEAD
-    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
-    description: ''
-  - name: --protocol
-    defaultValue: Https
-    parameterValueGroup: Http, Https
-    summary: Protocol to use for sending probes.
-    description: ''
-  - name: --accepted-protocols
-    summary: 'Space-separated list of protocols to accept. Default: Http.'
-    description: ''
-  - name: --forwarding-protocol
-    defaultValue: MatchRequest
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --patterns
-    summary: "Space-separated list of patterns to match. Default: '/\\*'."
-    description: ''
-- uid: ext_front-door_az_network_front_door_delete
-  name: az network front-door delete
-  summary: Delete a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_front-door_az_network_front_door_list
-  name: az network front-door list
-  summary: List Front Doors.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_purge_endpoint
-  name: az network front-door purge-endpoint
-  summary: Removes a content from Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --content-paths
-    summary: The path to the content to be purged. Can describe a file path or a wild card directory.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_show
-  name: az network front-door show
-  summary: Get the details of a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_update
-  name: az network front-door update
-  summary: Update settings of a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --enforce-certificate-name-check
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
-    description: ''
-  - name: --send-recv-timeout
-    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_backend_pool
-  name: az network front-door backend-pool
-  summary: Manage Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_check_custom_domain
-  name: az network front-door check-custom-domain
-  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
-- uid: ext_front-door_az_network_front_door_create
-  name: az network front-door create
-  summary: Create a Front Door.
-- uid: ext_front-door_az_network_front_door_delete
-  name: az network front-door delete
-  summary: Delete a Front Door.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint
-  name: az network front-door frontend-endpoint
-  summary: Manage Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_list
-  name: az network front-door list
-  summary: List Front Doors.
-- uid: ext_front-door_az_network_front_door_load_balancing
-  name: az network front-door load-balancing
-  summary: Manage Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-- uid: ext_front-door_az_network_front_door_probe
-  name: az network front-door probe
-  summary: Manage Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_purge_endpoint
-  name: az network front-door purge-endpoint
-  summary: Removes a content from Front Door.
-- uid: ext_front-door_az_network_front_door_routing_rule
-  name: az network front-door routing-rule
-  summary: Manage Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_rules_engine
-  name: az network front-door rules-engine
-  summary: Manage Front Door rules engines.
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-- uid: ext_front-door_az_network_front_door_show
-  name: az network front-door show
-  summary: Get the details of a Front Door.
-- uid: ext_front-door_az_network_front_door_update
-  name: az network front-door update
-  summary: Update settings of a Front Door.
-- uid: ext_front-door_az_network_front_door_waf_policy
-  name: az network front-door waf-policy
-  summary: Manage WebApplication Firewall (WAF) policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Doors.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml
deleted file mode 100644
index 6e8b3323af..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_backend_pool
-  name: az network front-door backend-pool
-  summary: Manage Front Door backend pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_backend_pool_create
-  - ext_front-door_az_network_front_door_backend_pool_delete
-  - ext_front-door_az_network_front_door_backend_pool_list
-  - ext_front-door_az_network_front_door_backend_pool_show
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-  description: Since a backend pool must contain a backend, this command also creates the first backend. To add additional backends, use the `az network front-door backend-pool backend add` command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --load-balancing
-    summary: Name or ID of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --probe
-    summary: Name or ID of the probe settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - isRequired: true
-    name: --address
-    summary: FQDN of the backend endpoint.
-    description: ''
-  - name: --backend-host-header
-    summary: Host header sent to the backend.
-    description: ''
-  - name: --http-port
-    defaultValue: "80"
-    summary: HTTP TCP port number.
-    description: ''
-  - name: --https-port
-    defaultValue: "443"
-    summary: HTTPS TCP port number.
-    description: ''
-  - name: --priority
-    defaultValue: "1"
-    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
-    description: ''
-  - name: --weight
-    defaultValue: "50"
-    summary: Weight of this endpoint for load balancing purposes.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door backend pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml
deleted file mode 100644
index d22e07b2df..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_backend_pool_backend_add
-  - ext_front-door_az_network_front_door_backend_pool_backend_list
-  - ext_front-door_az_network_front_door_backend_pool_backend_remove
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address
-    summary: FQDN of the backend endpoint.
-    description: ''
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --pool-name
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --backend-host-header
-    summary: Host header sent to the backend.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --http-port
-    defaultValue: "80"
-    summary: HTTP TCP port number.
-    description: ''
-  - name: --https-port
-    defaultValue: "443"
-    summary: HTTPS TCP port number.
-    description: ''
-  - name: --priority
-    defaultValue: "1"
-    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
-    description: ''
-  - name: --weight
-    defaultValue: "50"
-    summary: Weight of this endpoint for load balancing purposes.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --pool-name
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --index
-    summary: Index of the backend to remove (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --pool-name
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage backends of Front Door backend pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml
deleted file mode 100644
index 5956e3aab1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_frontend_endpoint
-  name: az network front-door frontend-endpoint
-  summary: Manage Front Door frontend endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_frontend_endpoint_create
-  - ext_front-door_az_network_front_door_frontend_endpoint_delete
-  - ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  - ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  - ext_front-door_az_network_front_door_frontend_endpoint_list
-  - ext_front-door_az_network_front_door_frontend_endpoint_show
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --host-name
-    summary: Domain name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --session-affinity-enabled
-    parameterValueGroup: false, true
-    summary: Whether to allow session affinity on this host.
-    description: ''
-  - name: --session-affinity-ttl
-    summary: The TTL to use in seconds for session affinity.
-    description: ''
-  - name: --waf-policy
-    summary: Name or ID of a web application firewall policy.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-  description: HTTPS protocol for a custom domain can be enabled using Front Door managed certificate or using your own certificate in Azure Key Vault. For Azure Key Vault, right permissions need to be set for Front Door to access the Key vault. Learn more at <a href="https://aka.ms/FrontDoorCustomDomain">https://aka.ms/FrontDoorCustomDomain</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --certificate-source
-    defaultValue: FrontDoor
-    parameterValueGroup: AzureKeyVault, FrontDoor
-    summary: Certificate source to enable HTTPS.
-    description: ''
-  - name: --minimum-tls-version
-    defaultValue: "1.2"
-    parameterValueGroup: 1.0, 1.2
-    summary: The minimum TLS version required from the clients to establish an SSL handshake with Front Door.
-    description: ''
-  - name: --secret-name
-    summary: The name of the Key Vault secret representing the full certificate PFX.
-    description: ''
-  - name: --secret-version
-    summary: The version of the Key Vault secret representing the full certificate PFX.
-    description: ''
-  - name: --vault-id
-    summary: The resource id of the Key Vault containing the SSL certificate.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door frontend endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml
deleted file mode 100644
index 3a00016675..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_load_balancing
-  name: az network front-door load-balancing
-  summary: Manage Front Door load-balancing settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_load_balancing_create
-  - ext_front-door_az_network_front_door_load_balancing_delete
-  - ext_front-door_az_network_front_door_load_balancing_list
-  - ext_front-door_az_network_front_door_load_balancing_show
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sample-size
-    summary: The number of samples to consider for load balancing decisions.
-    description: ''
-  - isRequired: true
-    name: --successful-samples-required
-    summary: The number of samples within the sample period that must succeed.
-    description: ''
-  - name: --additional-latency
-    summary: The additional latency in milliseconds for probes to fall in the lowest latency bucket.
-    description: ''
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door load-balancing settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/probe.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/probe.yml
deleted file mode 100644
index ff4acf609e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/probe.yml
+++ /dev/null
@@ -1,177 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_probe
-  name: az network front-door probe
-  summary: Manage Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_probe_create
-  - ext_front-door_az_network_front_door_probe_delete
-  - ext_front-door_az_network_front_door_probe_list
-  - ext_front-door_az_network_front_door_probe_show
-  - ext_front-door_az_network_front_door_probe_update
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Https
-    summary: Protocol to use for sending probes.
-    description: ''
-  - isRequired: true
-    name: --interval
-    summary: Interval in seconds between probes.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Path to probe.
-    description: ''
-  - name: --enabled
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enabled status.
-    description: ''
-  - name: --probeMethod
-    defaultValue: HEAD
-    parameterValueGroup: GET, HEAD
-    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enabled status.
-    description: ''
-  - name: --interval
-    summary: Interval in seconds between probes.
-    description: ''
-  - name: --path
-    summary: Path to probe.
-    description: ''
-  - name: --probeMethod
-    parameterValueGroup: GET, HEAD
-    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Https
-    summary: Protocol to use for sending probes.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door health probe settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml
deleted file mode 100644
index f89b33e4f0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml
+++ /dev/null
@@ -1,292 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_routing_rule
-  name: az network front-door routing-rule
-  summary: Manage Front Door routing rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_routing_rule_create
-  - ext_front-door_az_network_front_door_routing_rule_delete
-  - ext_front-door_az_network_front_door_routing_rule_list
-  - ext_front-door_az_network_front_door_routing_rule_show
-  - ext_front-door_az_network_front_door_routing_rule_update
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-  description: >-
-    Create a Front Door routing rule to either forward the requests to a backend or redirect the users to a different URL.
-
-
-    Example 1: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Forward --backend-pool DefaultBackendPool -n forwardRoutingrule1 --patterns /forward1
-
-
-    Example 2: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Redirect --custom-host redirecthost.com -n redirectRouteRule1 --patterns /redirect1 --custom-query-string querystring.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --frontend-endpoints
-    summary: Space-separated list of frontend endpoint names or IDs.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --accepted-protocols
-    summary: 'Space-separated list of protocols to accept. Default: Http.'
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --patterns
-    summary: "Space-separated list of patterns to match. Default: '/\\*'."
-    description: ''
-  - name: --rules-engine
-    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
-    description: ''
-  - name: --backend-pool
-    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
-    description: ''
-  - name: --cache-duration
-    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
-    description: ''
-  - name: --caching
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to enable caching for this route.
-    description: ''
-  - name: --custom-forwarding-path
-    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
-    description: ''
-  - name: --dynamic-compression
-    parameterValueGroup: Disabled, Enabled
-    summary: Use dynamic compression for cached content.
-    description: ''
-  - name: --forwarding-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --query-parameter-strip-directive
-    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
-    summary: Treatment of URL query terms when forming the cache key.
-    description: ''
-  - name: --query-parameters
-    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
-    description: ''
-  - name: --custom-fragment
-    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
-    description: ''
-  - name: --custom-host
-    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
-    description: ''
-  - name: --custom-path
-    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
-    description: ''
-  - name: --custom-query-string
-    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
-    description: ''
-  - name: --redirect-protocol
-    defaultValue: MatchRequest
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: The protocol of the destination to where the traffic is redirected.
-    description: ''
-  - name: --redirect-type
-    defaultValue: Moved
-    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
-    summary: The redirect type the rule will use when redirecting traffic.
-    description: ''
-  - isRequired: true
-    name: --route-type
-    parameterValueGroup: Forward, Redirect
-    summary: Route type to define how Front Door should handle requests for this route i.e. forward them to a backend or redirect the users to a different URL.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --accepted-protocols
-    summary: 'Space-separated list of protocols to accept. Default: Http.'
-    description: ''
-  - name: --frontend-endpoints
-    summary: Space-separated list of frontend endpoint names or IDs.
-    description: ''
-  - name: --patterns
-    summary: "Space-separated list of patterns to match. Default: '/\\*'."
-    description: ''
-  - name: --rules-engine
-    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
-    description: ''
-  - name: --backend-pool
-    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
-    description: ''
-  - name: --cache-duration
-    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
-    description: ''
-  - name: --caching
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to enable caching for this route.
-    description: ''
-  - name: --custom-forwarding-path
-    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
-    description: ''
-  - name: --dynamic-compression
-    parameterValueGroup: Disabled, Enabled
-    summary: Use dynamic compression for cached content.
-    description: ''
-  - name: --forwarding-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --query-parameter-strip-directive
-    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
-    summary: Treatment of URL query terms when forming the cache key.
-    description: ''
-  - name: --query-parameters
-    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enabled status.
-    description: ''
-  - name: --custom-fragment
-    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
-    description: ''
-  - name: --custom-host
-    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
-    description: ''
-  - name: --custom-path
-    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
-    description: ''
-  - name: --custom-query-string
-    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
-    description: ''
-  - name: --redirect-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: The protocol of the destination to where the traffic is redirected.
-    description: ''
-  - name: --redirect-type
-    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
-    summary: The redirect type the rule will use when redirecting traffic.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door routing rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml
deleted file mode 100644
index a7af2dab23..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine
-  name: az network front-door rules-engine
-  summary: Manage Front Door rules engines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_delete
-  - ext_front-door_az_network_front_door_rules_engine_list
-  - ext_front-door_az_network_front_door_rules_engine_show
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door rules engines.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml
deleted file mode 100644
index 130872b77b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_rule_create
-  - ext_front-door_az_network_front_door_rules_engine_rule_delete
-  - ext_front-door_az_network_front_door_rules_engine_rule_list
-  - ext_front-door_az_network_front_door_rules_engine_rule_show
-  - ext_front-door_az_network_front_door_rules_engine_rule_update
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-  description: This command allows creating Rules Engine configuration with Header action type. To add additional actions like Route overrides, use the `az network front-door rules-engine rule action add` command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --priority
-    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --match-processing-behavior
-    parameterValueGroup: Continue, Stop
-    summary: Whether to stop processing rules after conditions in a rule is satisfied.
-    description: ''
-  - isRequired: true
-    name: --action-type
-    parameterValueGroup: RequestHeader, ResponseHeader
-    summary: Action type to apply for a rule.
-    description: ''
-  - name: --header-action
-    parameterValueGroup: Append, Delete, Overwrite
-    summary: Header action type for the requests.
-    description: ''
-  - name: --header-name
-    summary: Name of the header to modify.
-    description: ''
-  - name: --header-value
-    summary: Value of the header.
-    description: ''
-  - name: --match-values
-    summary: Space-separated list of values to match against.
-    description: ''
-  - name: --match-variable
-    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
-    summary: Name of the match condition.
-    description: ''
-  - name: --negate-condition
-    parameterValueGroup: false, true
-    summary: Applies "Not" to the operator.
-    description: ''
-  - name: --operator
-    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
-    summary: Operator of the match condition.
-    description: ''
-  - name: --selector
-    summary: Optional selector for the match condition variable.
-    description: ''
-  - name: --transforms
-    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
-    summary: Space-separated list of transforms to apply.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --match-processing-behavior
-    parameterValueGroup: Continue, Stop
-    summary: Whether to stop processing rules after conditions in a rule is satisfied.
-    description: ''
-  - name: --priority
-    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Rules Engine rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml
deleted file mode 100644
index 74ef803a09..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  - ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  - ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --action-type
-    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
-    summary: Action type to apply for a rule.
-    description: ''
-  - name: --header-action
-    parameterValueGroup: Append, Delete, Overwrite
-    summary: Header action type for the requests.
-    description: ''
-  - name: --header-name
-    summary: Name of the header to modify.
-    description: ''
-  - name: --header-value
-    summary: Value of the header.
-    description: ''
-  - name: --backend-pool
-    summary: Name or ID of a backend pool.
-    description: ''
-  - name: --cache-duration
-    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
-    description: ''
-  - name: --caching
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to enable caching for this route.
-    description: ''
-  - name: --custom-forwarding-path
-    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
-    description: ''
-  - name: --dynamic-compression
-    parameterValueGroup: Disabled, Enabled
-    summary: Use dynamic compression for cached content.
-    description: ''
-  - name: --forwarding-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --query-parameter-strip-directive
-    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
-    summary: Treatment of URL query terms when forming the cache key.
-    description: ''
-  - name: --query-parameters
-    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
-    description: ''
-  - name: --custom-fragment
-    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
-    description: ''
-  - name: --custom-host
-    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
-    description: ''
-  - name: --custom-path
-    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
-    description: ''
-  - name: --custom-query-string
-    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
-    description: ''
-  - name: --redirect-protocol
-    defaultValue: MatchRequest
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: The protocol of the destination to where the traffic is redirected.
-    description: ''
-  - name: --redirect-type
-    defaultValue: Moved
-    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
-    summary: The redirect type the rule will use when redirecting traffic.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --index
-    summary: 0-based index of the request or response header action to remove. Index parameter is not required for "ForwardRouteOverride" or "RedirectRouteOverride" action remove.
-    description: ''
-  - isRequired: true
-    name: --action-type
-    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
-    summary: Action type to apply for a rule.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Rules Engine actions for Front Door.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml
deleted file mode 100644
index e68470b9f6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  - ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  - ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --match-values
-    summary: Space-separated list of values to match against.
-    description: ''
-  - name: --match-variable
-    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
-    summary: Name of the match condition.
-    description: ''
-  - name: --negate-condition
-    parameterValueGroup: false, true
-    summary: Applies "Not" to the operator.
-    description: ''
-  - name: --operator
-    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
-    summary: Operator of the match condition.
-    description: ''
-  - name: --selector
-    summary: Optional selector for the match condition variable.
-    description: ''
-  - name: --transforms
-    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
-    summary: Space-separated list of transforms to apply.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --index
-    summary: 0-based index of the match condition to remove.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Rules Engine match conditions for Front Door.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml
deleted file mode 100644
index 4e1fff3079..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml
+++ /dev/null
@@ -1,241 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy
-  name: az network front-door waf-policy
-  summary: Manage WebApplication Firewall (WAF) policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_create
-  - ext_front-door_az_network_front_door_waf_policy_delete
-  - ext_front-door_az_network_front_door_waf_policy_list
-  - ext_front-door_az_network_front_door_waf_policy_show
-  - ext_front-door_az_network_front_door_waf_policy_update
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --custom-block-response-body
-    summary: Body to return for blocked requests.
-    description: ''
-  - name: --custom-block-response-status-code
-    summary: HTTP status to return for blocked requests.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --mode
-    parameterValueGroup: Detection, Prevention
-    summary: Firewall policy mode.
-    description: ''
-  - name: --redirect-url
-    summary: URL used for redirect rule action.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --custom-block-response-body
-    summary: Body to return for blocked requests.
-    description: ''
-  - name: --custom-block-response-status-code
-    summary: HTTP status to return for blocked requests.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --mode
-    parameterValueGroup: Detection, Prevention
-    summary: Firewall policy mode.
-    description: ''
-  - name: --redirect-url
-    summary: URL used for redirect rule action.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage WebApplication Firewall (WAF) policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml
deleted file mode 100644
index a7ea0c61fb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Learn about available managed rule sets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml
deleted file mode 100644
index 1f28b3f638..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available managed rulesets.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to apply.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Rule set version.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to remove.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Change and view managed rule sets associated with your WAF policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml
deleted file mode 100644
index 140da70047..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-  description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-  description: Prevents the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --match-variable
-    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
-    description: ''
-  - isRequired: true
-    name: --operator
-    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to exclusion.
-    description: ''
-  - isRequired: true
-    name: --value
-    summary: Values to match the variable name against.
-    description: ''
-  - name: --rule-group-id
-    summary: ID of the rule group containing the rule to exclusion.
-    description: ''
-  - name: --rule-id
-    summary: ID of the rule to apply exclusion.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the exclusions to list.
-    description: ''
-  - name: --rule-group-id
-    summary: ID of the rule group containing the exclusions to list.
-    description: ''
-  - name: --rule-id
-    summary: ID of the rule to list exclusion for.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --match-variable
-    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
-    description: ''
-  - isRequired: true
-    name: --operator
-    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the exclusion to remove.
-    description: ''
-  - isRequired: true
-    name: --value
-    summary: Values to match the variable name against.
-    description: ''
-  - name: --rule-group-id
-    summary: ID of the rule group containing the exclusion to remove.
-    description: ''
-  - name: --rule-id
-    summary: ID of the rule to remove from exclusion.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml
deleted file mode 100644
index 69797d0a49..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-group-id
-    summary: ID of the rule group containing the rule to override.
-    description: ''
-  - isRequired: true
-    name: --rule-id
-    summary: ID of the rule to override.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to override.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Block, Log, Redirect
-    summary: Action for applied rulesets.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Whether to disable the rule.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the overrides to list.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-group-id
-    summary: ID of the rule group containing the override to remove.
-    description: ''
-  - isRequired: true
-    name: --rule-id
-    summary: ID of the rule override to remove.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the override to remove.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml
deleted file mode 100644
index db229d0d24..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_rule_create
-  - ext_front-door_az_network_front_door_waf_policy_rule_delete
-  - ext_front-door_az_network_front_door_waf_policy_rule_list
-  - ext_front-door_az_network_front_door_waf_policy_rule_show
-  - ext_front-door_az_network_front_door_waf_policy_rule_update
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --action
-    parameterValueGroup: Allow, Block, Log, Redirect
-    summary: Rule action.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --priority
-    summary: Priority of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-type
-    parameterValueGroup: MatchRule, RateLimitRule
-    summary: Type of rule.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Whether to disable the rule.
-    description: ''
-  - name: --rate-limit-duration
-    summary: Rate limit duration in minutes.
-    description: ''
-  - name: --rate-limit-threshold
-    summary: Rate limit threshold.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Block, Log, Redirect
-    summary: Rule action.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Whether to disable the rule.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule.
-    description: ''
-  - name: --rate-limit-duration
-    summary: Rate limit duration in minutes.
-    description: ''
-  - name: --rate-limit-threshold
-    summary: Rate limit threshold.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage WAF policy custom rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml b/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml
deleted file mode 100644
index 41e19b0a47..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-  description: Note that at least one match-condition must be associated with a custom rule.
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  - ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  - ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-  description: >-
-    Usage:   [--negate] --match-variable VARIABLE[.selector] --operator OPERATOR --value [VALUE [VALUE ...]]
-
-      Variable allowed values: RemoteAddr, RequestMethod, QueryString, PostArgs, RequestUri, RequestHeader, RequestBody, Cookies, SocketAddr
-
-      Operator allowed values: Any, IPMatch, GeoMatch, Equal, Contains, LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, BeginsWith, EndsWith, RegEx.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --match-variable
-    summary: Variable[.Selector] Request variable to test with optional selector.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --operator
-    summary: Operator used to compare the variable to the values.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --values
-    summary: Space-separated list of values to match against.
-    description: ''
-  - name: --negate
-    parameterValueGroup: false, true
-    summary: Applies "Not" to the operator.
-    description: ''
-  - name: --transforms
-    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
-    summary: Space-separated list of transforms to apply.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --index
-    summary: 0-based index of the match condition to remove.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Note that at least one match-condition must be associated with a custom rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hack/hack.yml b/2017-03-09-profile/docs-ref-autogen/ext/hack/hack.yml
deleted file mode 100644
index a5182840dc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hack/hack.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hack_az_hack
-  name: az hack
-  summary: Commands to manage resources commonly used for student hacks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hack_az_hack_create
-  - ext_hack_az_hack_show
-- uid: ext_hack_az_hack_create
-  name: az hack create
-  summary: Create resources commonly used for a student hack, including a website, database, and artificial intelligence.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create website using Python and MySQL
-    syntax:
-      content: az hack create --name samplename --runtime python --location westus2 --database mysql
-  - summary: Create website using Node.js, SQL and Cognitive Services key
-    syntax:
-      content: az hack create --name samplename --runtime node --location westus2 --database sql --ai
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Base name of resources; random charagers will be appended.
-    description: ''
-  - isRequired: true
-    name: --runtime -r
-    parameterValueGroup: aspnet, jetty, node, php, python, tomcat
-    summary: Runtime.
-    description: ''
-  - name: --ai
-    summary: Enable Azure Cognitive Services.
-    description: ''
-  - name: --database -d
-    parameterValueGroup: cosmosdb, mysql, sql
-    summary: Database type - { sql | mysql | cosmosdb }.
-    description: ''
-- uid: ext_hack_az_hack_show
-  name: az hack show
-  summary: Display settings for created resources, including database name and password, Git url, and website url.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Display settings
-    syntax:
-      content: az hack show --name samplename
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the application.
-    description: ''
-commands:
-- uid: ext_hack_az_hack_create
-  name: az hack create
-  summary: Create resources commonly used for a student hack, including a website, database, and artificial intelligence.
-- uid: ext_hack_az_hack_show
-  name: az hack show
-  summary: Display settings for created resources, including database name and password, Git url, and website url.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage resources commonly used for student hacks.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hack/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/hack/index.yml
deleted file mode 100644
index 12d176f176..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hack/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hack_az
-  name: hack
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_hack_az_hack
-  name: az hack
-  summary: Commands to manage resources commonly used for student hacks.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml b/2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml
deleted file mode 100644
index 20c7442f1d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hardware-security-modules_az_dedicated_hsm
-  name: az dedicated-hsm
-  summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hardware-security-modules_az_dedicated_hsm_create
-  - ext_hardware-security-modules_az_dedicated_hsm_delete
-  - ext_hardware-security-modules_az_dedicated_hsm_list
-  - ext_hardware-security-modules_az_dedicated_hsm_show
-  - ext_hardware-security-modules_az_dedicated_hsm_update
-  - ext_hardware-security-modules_az_dedicated_hsm_wait
-- uid: ext_hardware-security-modules_az_dedicated_hsm_create
-  name: az dedicated-hsm create
-  summary: Create a dedicated HSM in the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new dedicated HSM
-    syntax:
-      content: az dedicated-hsm create -n "hsm1" -l "japanwest" -i private-ip-address="1.0.0.1" -s id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.Network/virtualNetworks/hsm/subnets/hsm" --stamp-id "stamp1" --sku name="SafeNet Luna Network HSM A790" --tags Dept="hsm" Environment="dogfood" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the dedicated Hsm.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --network-profile-network-interfaces -i
-    summary: 'Specifies a list of ip address from the specfied subnet for the network interfaces associated with the dedicated HSM. Expected value: -i private-ip-address=xx.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    summary: 'The HSM device SKU if a non-standard HSM is wanted (default is: SafeNet Luna Network HSM A790).'
-    description: ''
-  - name: --stamp-id
-    summary: This field will be used when RP does not support Availability zones.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --zones
-    summary: The Dedicated Hsm zones.
-    description: ''
-  - name: --subnet -s
-    summary: 'Specifies the identifier of the subnet. Expected value: id=xx.'
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-  name: az dedicated-hsm delete
-  summary: Deletes the specified Azure Dedicated HSM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dedicated HSM
-    syntax:
-      content: az dedicated-hsm delete -n "hsm1" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dedicated HSM to delete.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_list
-  name: az dedicated-hsm list
-  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List dedicated HSM devices in a subscription
-    syntax:
-      content: az dedicated-hsm list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of results to return.
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_show
-  name: az dedicated-hsm show
-  summary: Gets the specified Azure dedicated HSM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a dedicated HSM
-    syntax:
-      content: az dedicated-hsm show -n "hsm1" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dedicated HSM.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_update
-  name: az dedicated-hsm update
-  summary: Update a dedicated HSM in the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an existing dedicated HSM
-    syntax:
-      content: az dedicated-hsm update -n "hsm1" --tags Dept="hsm" Environment="dogfood" Slice="A" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the dedicated HSM.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-  name: az dedicated-hsm wait
-  summary: Waits for operation to complete.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dedicated HSM
-    syntax:
-      content: az dedicated-hsm wait --created -g "hsm-group" --name "hsm1"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the dedicated HSM.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_hardware-security-modules_az_dedicated_hsm_create
-  name: az dedicated-hsm create
-  summary: Create a dedicated HSM in the specified subscription.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-  name: az dedicated-hsm delete
-  summary: Deletes the specified Azure Dedicated HSM.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_list
-  name: az dedicated-hsm list
-  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_show
-  name: az dedicated-hsm show
-  summary: Gets the specified Azure dedicated HSM.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_update
-  name: az dedicated-hsm update
-  summary: Update a dedicated HSM in the specified subscription.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-  name: az dedicated-hsm wait
-  summary: Waits for operation to complete.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Dedicated-hsm to create, update, list, show, and delete HSMs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/index.yml
deleted file mode 100644
index 96506bfe3b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hardware-security-modules/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hardware-security-modules_az
-  name: hardware-security-modules
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_hardware-security-modules_az_dedicated_hsm
-  name: az dedicated-hsm
-  summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml b/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml
deleted file mode 100644
index 3fc8588ab6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az_healthcareapis
-  name: az healthcareapis
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_healthcareapis_az_healthcareapis_operation_result
-  name: az healthcareapis operation-result
-  summary: Healthcareapis operation-result.
-- uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-  name: az healthcareapis operation-result show
-  summary: Get the operation result for a long running operation.
-- uid: ext_healthcareapis_az_healthcareapis_service
-  name: az healthcareapis service
-  summary: Healthcareapis service.
-- uid: ext_healthcareapis_az_healthcareapis_service_create
-  name: az healthcareapis service create
-  summary: Create or update the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_delete
-  name: az healthcareapis service delete
-  summary: Delete a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_list
-  name: az healthcareapis service list
-  summary: Get all the service instances in a subscription.
-- uid: ext_healthcareapis_az_healthcareapis_service_show
-  name: az healthcareapis service show
-  summary: Get the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_update
-  name: az healthcareapis service update
-  summary: Update the metadata of a service instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml b/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml
deleted file mode 100644
index 3a02ede001..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az_healthcareapis_operation_result
-  name: az healthcareapis operation-result
-  summary: Healthcareapis operation-result.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_healthcareapis_az_healthcareapis_operation_result_show
-- uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-  name: az healthcareapis operation-result show
-  summary: Get the operation result for a long running operation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get operation result
-    syntax:
-      content: az healthcareapis operation-result show --location-name "westus" --operation-result-id "exampleid"
-  parameters:
-  - isRequired: true
-    name: --location-name
-    summary: The location of the operation.
-    description: ''
-  - isRequired: true
-    name: --operation-result-id
-    summary: The ID of the operation result to get.
-    description: ''
-commands:
-- uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-  name: az healthcareapis operation-result show
-  summary: Get the operation result for a long running operation.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Healthcareapis operation-result.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml b/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml
deleted file mode 100644
index 57ca72ec2c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az_healthcareapis_service
-  name: az healthcareapis service
-  summary: Healthcareapis service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_healthcareapis_az_healthcareapis_service_create
-  - ext_healthcareapis_az_healthcareapis_service_delete
-  - ext_healthcareapis_az_healthcareapis_service_list
-  - ext_healthcareapis_az_healthcareapis_service_show
-  - ext_healthcareapis_az_healthcareapis_service_update
-- uid: ext_healthcareapis_az_healthcareapis_service_create
-  name: az healthcareapis service create
-  summary: Create or update the metadata of a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or Update a service with all parameters
-    syntax:
-      content: az healthcareapis service create --resource-group "rg1" --resource-name "service1" --identity type="SystemAssigned" --kind "fhir-R4" --location "westus2" --properties "{\"accessPolicies\":[{\"objectId\":\"c487e7d1-3210-41a3-8ccc-e9372b78da47\"},{\"objectId\":\"5b307da8-43d4-492b-8b66-b0294ade872f\"}],\"authenticationConfiguration\":{\"audience\":\"https://azurehealthcareapis.com\",\"authority\":\"https://login.microsoftonline.com/abfde7b2-df0f-47e6-aabf-2462b07508dc\",\"smartProxyEnabled\":true},\"corsConfiguration\":{\"allowCredentials\":false,\"headers\":[\"*\"],\"maxAge\":1440,\"methods\":[\"DELETE\",\"GET\",\"OPTIONS\",\"PATCH\",\"POST\",\"PUT\"],\"origins\":[\"*\"]},\"cosmosDbConfiguration\":{\"offerThroughput\":1000},\"exportConfiguration\":{\"storageAccountName\":\"existingStorageAccount\"}}"
-  - summary: Create or Update a service with minimum parameters
-    syntax:
-      content: az healthcareapis service create --resource-group "rg1" --resource-name "service2" --kind "fhir-R4" --location "westus2" --properties "{\"accessPolicies\":[{\"objectId\":\"c487e7d1-3210-41a3-8ccc-e9372b78da47\"}]}"
-  parameters:
-  - isRequired: true
-    name: --kind
-    parameterValueGroup: fhir, fhir-R4, fhir-Stu3
-    summary: The kind of the service.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-  - name: --etag
-    summary: An etag associated with the resource, used for optimistic concurrency when editing it.
-    description: ''
-  - name: --identity
-    summary: 'Setting indicating whether the service has a managed identity associated with it. Expect value: type=xx.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --properties
-    summary: 'The common properties of a service. Expected value: json-string/@json-file.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_delete
-  name: az healthcareapis service delete
-  summary: Delete a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete service
-    syntax:
-      content: az healthcareapis service delete --resource-group "rg1" --resource-name "service1"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_list
-  name: az healthcareapis service list
-  summary: Get all the service instances in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all services in resource group
-    syntax:
-      content: az healthcareapis service list --resource-group "rgname"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_show
-  name: az healthcareapis service show
-  summary: Get the metadata of a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get metadata
-    syntax:
-      content: az healthcareapis service show --resource-group "rg1" --resource-name "service1"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_update
-  name: az healthcareapis service update
-  summary: Update the metadata of a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch service
-    syntax:
-      content: az healthcareapis service update --resource-group "rg1" --resource-name "service1" --tags tag1="value1" tag2="value2"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_healthcareapis_az_healthcareapis_service_create
-  name: az healthcareapis service create
-  summary: Create or update the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_delete
-  name: az healthcareapis service delete
-  summary: Delete a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_list
-  name: az healthcareapis service list
-  summary: Get all the service instances in a subscription.
-- uid: ext_healthcareapis_az_healthcareapis_service_show
-  name: az healthcareapis service show
-  summary: Get the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_update
-  name: az healthcareapis service update
-  summary: Update the metadata of a service instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Healthcareapis service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/index.yml
deleted file mode 100644
index 108231e116..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/healthcareapis/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az
-  name: healthcareapis
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_healthcareapis_az_healthcareapis
-  name: az healthcareapis
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml
deleted file mode 100644
index 1a459a3011..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml
+++ /dev/null
@@ -1,379 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache
-  name: az hpc-cache
-  summary: Commands to manage hpc cache.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_create
-  - ext_hpc-cache_az_hpc_cache_delete
-  - ext_hpc-cache_az_hpc_cache_flush
-  - ext_hpc-cache_az_hpc_cache_list
-  - ext_hpc-cache_az_hpc_cache_show
-  - ext_hpc-cache_az_hpc_cache_start
-  - ext_hpc-cache_az_hpc_cache_stop
-  - ext_hpc-cache_az_hpc_cache_update
-  - ext_hpc-cache_az_hpc_cache_upgrade_firmware
-  - ext_hpc-cache_az_hpc_cache_wait
-- uid: ext_hpc-cache_az_hpc_cache_create
-  name: az hpc-cache create
-  summary: Create or update a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_CreateOrUpdate
-    syntax:
-      content: >-
-        az hpc-cache create --resource-group "scgroup" --name "sc1" --location "eastus" \
-
-        --cache-size-gb "3072" --subnet "/subscriptions/{{ subscription_id }}/resourceGroups/{{ re
-
-        source_group }}/providers/Microsoft.Network/virtualNetworks/{{ virtual_network_name }}/sub
-
-        nets/{{ subnet_name }}" --sku-name "Standard_2G"
-  parameters:
-  - isRequired: true
-    name: --cache-size-gb
-    summary: The size of this Cache, in GB.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    summary: SKU name for this Cache.
-    description: ''
-  - isRequired: true
-    name: --subnet
-    summary: Subnet used for the Cache.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_delete
-  name: az hpc-cache delete
-  summary: Schedules a Cache for deletion.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Delete
-    syntax:
-      content: az hpc-cache delete --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_flush
-  name: az hpc-cache flush
-  summary: Tells a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors returned until the flush is complete.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Flush
-    syntax:
-      content: az hpc-cache flush --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_list
-  name: az hpc-cache list
-  summary: Returns all Caches the user has access to under a resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_List
-    syntax:
-      content: az hpc-cache list
-  - summary: Caches_ListByResourceGroup
-    syntax:
-      content: az hpc-cache list --resource-group "scgroup"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_show
-  name: az hpc-cache show
-  summary: Returns a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Get
-    syntax:
-      content: az hpc-cache show --resource-group "scgroup" --name "sc1"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_start
-  name: az hpc-cache start
-  summary: Tells a Stopped state Cache to transition to Active state.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Start
-    syntax:
-      content: az hpc-cache start --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_stop
-  name: az hpc-cache stop
-  summary: Tells an Active Cache to transition to Stopped state.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Stop
-    syntax:
-      content: az hpc-cache stop --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_update
-  name: az hpc-cache update
-  summary: Create or update a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Update
-    syntax:
-      content: >-
-        az hpc-cache update --resource-group "scgroup" --name "sc1" --location "eastus" \
-
-        --cache-size-gb "3072" --subnet "/subscriptions/{{ subscription_id }}/resourceGroups/{{ re
-
-        source_group }}/providers/Microsoft.Network/virtualNetworks/{{ virtual_network_name }}/sub
-
-        nets/{{ subnet_name }}" --sku-name "Standard_2G"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cache-size-gb
-    summary: The size of this Cache, in GB.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku-name
-    summary: SKU name for this Cache.
-    description: ''
-  - name: --subnet
-    summary: Subnet used for the Cache.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-  name: az hpc-cache upgrade-firmware
-  summary: Upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_UpgradeFirmware
-    syntax:
-      content: az hpc-cache upgrade-firmware --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_wait
-  name: az hpc-cache wait
-  summary: Waits a hpc Cache to specified state.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Wait
-    syntax:
-      content: az hpc-cache wait --resource-group "scgroup" --name "sc" --created
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-  name: az hpc-cache blob-storage-target
-  summary: Commands to create hpc cache blob storage target.
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  name: az hpc-cache blob-storage-target add
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-  name: az hpc-cache blob-storage-target update
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_create
-  name: az hpc-cache create
-  summary: Create or update a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_delete
-  name: az hpc-cache delete
-  summary: Schedules a Cache for deletion.
-- uid: ext_hpc-cache_az_hpc_cache_flush
-  name: az hpc-cache flush
-  summary: Tells a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors returned until the flush is complete.
-- uid: ext_hpc-cache_az_hpc_cache_list
-  name: az hpc-cache list
-  summary: Returns all Caches the user has access to under a resource group.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-  name: az hpc-cache nfs-storage-target
-  summary: Commands to create hpc cache nfs storage target.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  name: az hpc-cache nfs-storage-target add
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-  name: az hpc-cache nfs-storage-target update
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_show
-  name: az hpc-cache show
-  summary: Returns a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_skus
-  name: az hpc-cache skus
-  summary: Commands to manage hpc cache skus.
-- uid: ext_hpc-cache_az_hpc_cache_skus_list
-  name: az hpc-cache skus list
-  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
-- uid: ext_hpc-cache_az_hpc_cache_start
-  name: az hpc-cache start
-  summary: Tells a Stopped state Cache to transition to Active state.
-- uid: ext_hpc-cache_az_hpc_cache_stop
-  name: az hpc-cache stop
-  summary: Tells an Active Cache to transition to Stopped state.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target
-  name: az hpc-cache storage-target
-  summary: Commands to manage hpc cache storage target.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-  name: az hpc-cache storage-target list
-  summary: Returns a list of Storage Targets for the specified Cache.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-  name: az hpc-cache storage-target remove
-  summary: Removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-  name: az hpc-cache storage-target show
-  summary: Returns a Storage Target from a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_update
-  name: az hpc-cache update
-  summary: Create or update a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-  name: az hpc-cache upgrade-firmware
-  summary: Upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect.
-- uid: ext_hpc-cache_az_hpc_cache_usage_model
-  name: az hpc-cache usage-model
-  summary: Commands to manage hpc cache usage model.
-- uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-  name: az hpc-cache usage-model list
-  summary: Get the list of Cache Usage Models available to this subscription.
-- uid: ext_hpc-cache_az_hpc_cache_wait
-  name: az hpc-cache wait
-  summary: Waits a hpc Cache to specified state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml
deleted file mode 100644
index 0756913821..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-  name: az hpc-cache blob-storage-target
-  summary: Commands to create hpc cache blob storage target.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  - ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  name: az hpc-cache blob-storage-target add
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_CreateOrUpdate
-    syntax:
-      content: >-
-        az hpc-cache blob-storage-target add --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1" --storage-account "/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.Storage/storageAccounts/{acount_name}" \
-         --container-name "cn" --virtual-namespace-path "/test"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --container-name
-    summary: Name of target storage container.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-account
-    summary: Resource ID of target storage account.
-    description: ''
-  - isRequired: true
-    name: --virtual-namespace-path -v
-    summary: Path to create for this storage target in the client-facing virtual filesystem.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-  name: az hpc-cache blob-storage-target update
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --container-name
-    summary: Name of target storage container.
-    description: ''
-  - name: --storage-account
-    summary: Resource ID of target storage account.
-    description: ''
-  - name: --virtual-namespace-path -v
-    summary: Path to create for this storage target in the client-facing virtual filesystem.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  name: az hpc-cache blob-storage-target add
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-  name: az hpc-cache blob-storage-target update
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to create hpc cache blob storage target.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml
deleted file mode 100644
index d8c9276750..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-  name: az hpc-cache nfs-storage-target
-  summary: Commands to create hpc cache nfs storage target.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  - ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  name: az hpc-cache nfs-storage-target add
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_CreateOrUpdate
-    syntax:
-      content: >-
-        az hpc-cache nfs-storage-target add --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1" --nfs3-target 10.7.0.24 --nfs3-usage-model WRITE_AROUND \
-
-        --junction namespace-path="/nt2" nfs-export="/export/a" target-path="/1" \
-
-        --junction namespace-path="/nt3" nfs-export="/export/b"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --junction
-    summary: List of Cache namespace junctions to target for namespace associations.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --nfs3-target
-    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
-    description: ''
-  - isRequired: true
-    name: --nfs3-usage-model
-    summary: Identifies the primary usage model to be used for this Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-  name: az hpc-cache nfs-storage-target update
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --junction
-    summary: List of Cache namespace junctions to target for namespace associations.
-    description: ''
-  - name: --nfs3-target
-    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
-    description: ''
-  - name: --nfs3-usage-model
-    summary: Identifies the primary usage model to be used for this Storage Target.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  name: az hpc-cache nfs-storage-target add
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-  name: az hpc-cache nfs-storage-target update
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to create hpc cache nfs storage target.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml
deleted file mode 100644
index 06936e4486..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_skus
-  name: az hpc-cache skus
-  summary: Commands to manage hpc cache skus.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_skus_list
-- uid: ext_hpc-cache_az_hpc_cache_skus_list
-  name: az hpc-cache skus list
-  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Skus_List
-    syntax:
-      content: az hpc-cache skus list
-  parameters: []
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_skus_list
-  name: az hpc-cache skus list
-  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache skus.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml
deleted file mode 100644
index 25898bcaff..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_storage_target
-  name: az hpc-cache storage-target
-  summary: Commands to manage hpc cache storage target.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_storage_target_list
-  - ext_hpc-cache_az_hpc_cache_storage_target_remove
-  - ext_hpc-cache_az_hpc_cache_storage_target_show
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-  name: az hpc-cache storage-target list
-  summary: Returns a list of Storage Targets for the specified Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_List
-    syntax:
-      content: az hpc-cache storage-target list --resource-group "scgroup" --cache-name "sc1"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-  name: az hpc-cache storage-target remove
-  summary: Removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_Delete
-    syntax:
-      content: >-
-        az hpc-cache storage-target remove --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-  name: az hpc-cache storage-target show
-  summary: Returns a Storage Target from a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_Get
-    syntax:
-      content: >-
-        az hpc-cache storage-target show --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-  name: az hpc-cache storage-target list
-  summary: Returns a list of Storage Targets for the specified Cache.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-  name: az hpc-cache storage-target remove
-  summary: Removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-  name: az hpc-cache storage-target show
-  summary: Returns a Storage Target from a Cache.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache storage target.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml
deleted file mode 100644
index d0820310ae..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_usage_model
-  name: az hpc-cache usage-model
-  summary: Commands to manage hpc cache usage model.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_usage_model_list
-- uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-  name: az hpc-cache usage-model list
-  summary: Get the list of Cache Usage Models available to this subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: UsageModels_List
-    syntax:
-      content: az hpc-cache usage-model list
-  parameters: []
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-  name: az hpc-cache usage-model list
-  summary: Get the list of Cache Usage Models available to this subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache usage model.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/index.yml
deleted file mode 100644
index 714b97be2c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/hpc-cache/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az
-  name: hpc-cache
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_hpc-cache_az_hpc_cache
-  name: az hpc-cache
-  summary: Commands to manage hpc cache.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/image.yml b/2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/image.yml
deleted file mode 100644
index ed26ed7151..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/image.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_image-copy-extension_az_image
-  name: az image
-  summary: Manage custom virtual machine images.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_image-copy-extension_az_image_copy
-- uid: ext_image-copy-extension_az_image_copy
-  name: az image copy
-  summary: Copy a managed image (or vm) to other regions. It requires the source disk to be available.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Copy an image to several regions and cleanup at the end.
-    syntax:
-      content: >-
-        az image copy --source-resource-group mySources-rg --source-object-name myImage \
-            --target-location uksouth northeurope --target-resource-group "images-repo-rg" --cleanup
-  - summary: Use an already generalized vm to create images in other regions.
-    syntax:
-      content: >-
-        az image copy --source-resource-group mySources-rg --source-object-name myVm \
-            --source-type vm --target-location uksouth northeurope --target-resource-group "images-repo-rg"
-  parameters:
-  - isRequired: true
-    name: --source-object-name
-    summary: The name of the image or vm resource.
-    description: ''
-  - isRequired: true
-    name: --source-resource-group
-    summary: Name of the resource group of the source resource.
-    description: ''
-  - isRequired: true
-    name: --target-location
-    summary: Space separated location list to create the image in (e.g. westeurope etc.).
-    description: ''
-  - isRequired: true
-    name: --target-resource-group
-    summary: Name of the resource group to create images in.
-    description: ''
-  - name: --cleanup
-    summary: Include this switch to delete temporary resources upon completion.
-    description: ''
-  - name: --export-as-snapshot
-    summary: Include this switch to export the copies as snapshots instead of images.
-    description: ''
-  - name: --parallel-degree
-    defaultValue: "-1"
-    summary: Number of parallel copy operations.
-    description: ''
-  - name: --source-type
-    defaultValue: image
-    parameterValueGroup: image, vm
-    summary: Image or vm.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --target-name
-    summary: Name of the final image that will be created.
-    description: ''
-  - name: --target-subscription
-    summary: Name or ID of the subscription where the final image should be created.
-    description: ''
-  - name: --temporary_resource_group_name
-    defaultValue: image-copy-rg
-    summary: Resource Group name where temporary storage account will be created.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Time in seconds for the copy operation to finish. Increase this time if you are going to copy large images (disks) like 512GB or more.
-    description: ''
-commands:
-- uid: ext_image-copy-extension_az_image_copy
-  name: az image copy
-  summary: Copy a managed image (or vm) to other regions. It requires the source disk to be available.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage custom virtual machine images.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/index.yml
deleted file mode 100644
index cfca961e5f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/image-copy-extension/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_image-copy-extension_az
-  name: image-copy-extension
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_image-copy-extension_az_image
-  name: az image
-  summary: Manage custom virtual machine images.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export.yml b/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export.yml
deleted file mode 100644
index 7733043b9c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az_import_export
-  name: az import-export
-  summary: Manage Import Export.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_import-export_az_import_export_create
-  - ext_import-export_az_import_export_delete
-  - ext_import-export_az_import_export_list
-  - ext_import-export_az_import_export_show
-  - ext_import-export_az_import_export_update
-- uid: ext_import-export_az_import_export_create
-  name: az import-export create
-  summary: Creates a new job or updates an existing job in the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an import job
-    syntax:
-      content: >-
-        az import-export create --resource-group "myResourceGroup" --name "myJob"
-
-        --location "West US" --backup-drive-manifest true --diagnostics-path "waimportexport"
-
-        --drive-list bit-locker-key=238810-662376-448998-450120-652806-203390-606320-483076
-
-        drive-header-hash= drive-id=9CA995BB manifest-file=\\DriveManifest.xml
-
-        manifest-hash=109B21108597EF36D5785F08303F3638 --type "Import" --log-level "Verbose"
-
-        --return-address city=Redmond country-or-region=USA email=Test@contoso.com phone=4250000000
-
-        postal-code=98007 recipient-name=Tests state-or-province=wa street-address1=Street1
-
-        street-address2=street2 --storage-account "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-\
-
-        xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --backup-drive-manifest
-    parameterValueGroup: false, true
-    summary: Default value is false. Indicates whether the manifest files on the drives should be copied to block blobs.
-    description: ''
-  - name: --cancel-requested
-    parameterValueGroup: false, true
-    summary: Indicates whether a request has been submitted to cancel the job.
-    description: ''
-  - name: --client-tenant-id
-    summary: The tenant ID of the client making the request.
-    description: ''
-  - name: --delivery-package
-    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
-    description: ''
-  - name: --diagnostics-path
-    summary: The virtual blob directory to which the copy logs and backups of drive manifest files (if enabled) will be stored.
-    description: ''
-  - name: --drive-list
-    summary: List of up to ten drives that comprise the job. The drive list is a required element for an import job; it is not specified for export jobs.
-    description: ''
-  - name: --export
-    summary: A property containing information about the blobs to be exported for an export job. This property is required for export jobs, but must not be specified for import jobs.
-    description: ''
-  - name: --incomplete-blob-list-uri
-    summary: A blob path that points to a block blob containing a list of blob names that were not exported due to insufficient drive space. If all blobs were exported successfully, then this element is not included in the response.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --log-level
-    summary: Default value is Error. Indicates whether error logging or verbose logging will be enabled.
-    description: ''
-  - name: --percent-complete
-    summary: Overall percentage completed for the job.
-    description: ''
-  - name: --return-address
-    summary: Specifies the return address information for the job.
-    description: ''
-  - name: --return-package
-    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
-    description: ''
-  - name: --return-shipping
-    summary: Specifies the return carrier and customer's account with the carrier.
-    description: ''
-  - name: --shipping-information
-    summary: Contains information about the Microsoft datacenter to which the drives should be shipped.
-    description: ''
-  - name: --state
-    summary: Current state of the job.
-    description: ''
-  - name: --storage-account
-    summary: Name or ID of the storage account where data will be imported to or exported from.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --type
-    summary: The type of job.
-    description: ''
-- uid: ext_import-export_az_import_export_delete
-  name: az import-export delete
-  summary: Deletes an existing job. Only jobs in the Creating or Completed states can be deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete job
-    syntax:
-      content: az import-export delete --resource-group "myResourceGroup" --name "myJob"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_import-export_az_import_export_list
-  name: az import-export list
-  summary: Returns all active and completed jobs in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List jobs in a resource group
-    syntax:
-      content: az import-export list --resource-group "myResourceGroup"
-  - summary: List jobs in current subscription
-    syntax:
-      content: az import-export list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_import-export_az_import_export_show
-  name: az import-export show
-  summary: Gets information about an existing job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get job
-    syntax:
-      content: az import-export show --resource-group "myResourceGroup" --name "myJob"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_import-export_az_import_export_update
-  name: az import-export update
-  summary: Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update job
-    syntax:
-      content: >-
-        az import-export update --resource-group "myResourceGroup" --name "myJob"
-
-        --backup-drive-manifest true --log-level "Verbose" --state ""
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --backup-drive-manifest
-    parameterValueGroup: false, true
-    summary: Indicates whether the manifest files on the drives should be copied to block blobs.
-    description: ''
-  - name: --cancel-requested
-    parameterValueGroup: false, true
-    summary: If specified, the value must be true. The service will attempt to cancel the job.
-    description: ''
-  - name: --delivery-package
-    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
-    description: ''
-  - name: --drive-list
-    summary: List of drives that comprise the job.
-    description: ''
-  - name: --log-level
-    summary: Indicates whether error logging or verbose logging is enabled.
-    description: ''
-  - name: --return-address
-    summary: Specifies the return address information for the job.
-    description: ''
-  - name: --return-shipping
-    summary: Specifies the return carrier and customer's account with the carrier.
-    description: ''
-  - name: --state
-    summary: If specified, the value must be Shipping, which tells the Import/Export service that the package for the job has been shipped. The ReturnAddress and DeliveryPackage properties must have been set either in this request or in a previous request, otherwise the request will fail.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_import-export_az_import_export_bit_locker_key
-  name: az import-export bit-locker-key
-  summary: Import-export bit-locker-key.
-- uid: ext_import-export_az_import_export_bit_locker_key_list
-  name: az import-export bit-locker-key list
-  summary: Returns the BitLocker Keys for all drives in the specified job.
-- uid: ext_import-export_az_import_export_create
-  name: az import-export create
-  summary: Creates a new job or updates an existing job in the specified subscription.
-- uid: ext_import-export_az_import_export_delete
-  name: az import-export delete
-  summary: Deletes an existing job. Only jobs in the Creating or Completed states can be deleted.
-- uid: ext_import-export_az_import_export_list
-  name: az import-export list
-  summary: Returns all active and completed jobs in a subscription.
-- uid: ext_import-export_az_import_export_location
-  name: az import-export location
-  summary: Import-export location.
-- uid: ext_import-export_az_import_export_location_list
-  name: az import-export location list
-  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
-- uid: ext_import-export_az_import_export_location_show
-  name: az import-export location show
-  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
-- uid: ext_import-export_az_import_export_show
-  name: az import-export show
-  summary: Gets information about an existing job.
-- uid: ext_import-export_az_import_export_update
-  name: az import-export update
-  summary: Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Import Export.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml b/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml
deleted file mode 100644
index f6673813b9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az_import_export_bit_locker_key
-  name: az import-export bit-locker-key
-  summary: Import-export bit-locker-key.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_import-export_az_import_export_bit_locker_key_list
-- uid: ext_import-export_az_import_export_bit_locker_key_list
-  name: az import-export bit-locker-key list
-  summary: Returns the BitLocker Keys for all drives in the specified job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List BitLocker Keys for drives in a job
-    syntax:
-      content: az import-export bit-locker-key list --resource-group "myResourceGroup" --job-name "myJob"
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_import-export_az_import_export_bit_locker_key_list
-  name: az import-export bit-locker-key list
-  summary: Returns the BitLocker Keys for all drives in the specified job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Import-export bit-locker-key.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/location.yml b/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/location.yml
deleted file mode 100644
index e33ded201b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/import-export/import-export/location.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az_import_export_location
-  name: az import-export location
-  summary: Import-export location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_import-export_az_import_export_location_list
-  - ext_import-export_az_import_export_location_show
-- uid: ext_import-export_az_import_export_location_list
-  name: az import-export location list
-  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List locations to which you can ship the disks
-    syntax:
-      content: az import-export location list
-  parameters: []
-- uid: ext_import-export_az_import_export_location_show
-  name: az import-export location show
-  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details about a location
-    syntax:
-      content: az import-export location show --location "West US 2"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az import-export location list`.'
-    description: ''
-commands:
-- uid: ext_import-export_az_import_export_location_list
-  name: az import-export location list
-  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
-- uid: ext_import-export_az_import_export_location_show
-  name: az import-export location show
-  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Import-export location.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/import-export/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/import-export/index.yml
deleted file mode 100644
index c949acb650..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/import-export/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az
-  name: import-export
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_import-export_az_import_export
-  name: az import-export
-  summary: Manage Import Export.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/interactive/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/interactive/index.yml
deleted file mode 100644
index 982a33cd2f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/interactive/index.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_interactive_az
-  name: interactive
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands: []
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/index.yml
deleted file mode 100644
index 55a3b01a09..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az
-  name: internet-analyzer
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer
-  name: az internet-analyzer
-  summary: Commands to manage internet analyzer.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml b/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml
deleted file mode 100644
index 65e4782f65..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer
-  name: az internet-analyzer
-  summary: Commands to manage internet analyzer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_show_scorecard
-  - ext_internet-analyzer_az_internet_analyzer_show_timeseries
-- uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-  name: az internet-analyzer show-scorecard
-  summary: Show latency scorecard for a test.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --aggregation-interval
-    summary: The aggregation interval of the Latency Scorecard.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --test-name
-    summary: The name of the Internet Analyzer test.
-    description: ''
-  - name: --country
-    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - <a href="https://www.iso.org/iso-3166-country-codes.html">https://www.iso.org/iso-3166-country-codes.html</a>.
-    description: ''
-  - name: --end-date-time-utc
-    summary: The end DateTime of the Latency Scorecard in UTC.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-  name: az internet-analyzer show-timeseries
-  summary: Show timeseries for a test.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --aggregation-interval
-    summary: The aggregation interval of the Timeseries.
-    description: ''
-  - isRequired: true
-    name: --end-date-time-utc
-    summary: The end DateTime of the Timeseries in UTC.
-    description: ''
-  - isRequired: true
-    name: --endpoint
-    summary: The specific endpoint.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --start-date-time-utc
-    summary: The start DateTime of the Timeseries in UTC.
-    description: ''
-  - isRequired: true
-    name: --test-name
-    summary: The name of the Internet Analyzer test.
-    description: ''
-  - isRequired: true
-    name: --timeseries-type
-    summary: The type of Timeseries.
-    description: ''
-  - name: --country
-    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - <a href="https://www.iso.org/iso-3166-country-codes.html">https://www.iso.org/iso-3166-country-codes.html</a>.
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-  name: az internet-analyzer preconfigured-endpoint
-  summary: Commands to manage preconfigured endpoints.
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-  name: az internet-analyzer preconfigured-endpoint list
-  summary: List preconfigured endpoints.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile
-  name: az internet-analyzer profile
-  summary: Commands to manage internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-  name: az internet-analyzer profile create
-  summary: Create internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-  name: az internet-analyzer profile delete
-  summary: Delete internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-  name: az internet-analyzer profile list
-  summary: List internet analyzer profiles.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-  name: az internet-analyzer profile show
-  summary: Show internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-  name: az internet-analyzer profile update
-  summary: Update internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-  name: az internet-analyzer show-scorecard
-  summary: Show latency scorecard for a test.
-- uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-  name: az internet-analyzer show-timeseries
-  summary: Show timeseries for a test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test
-  name: az internet-analyzer test
-  summary: Commands to manage tests.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_create
-  name: az internet-analyzer test create
-  summary: Create test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-  name: az internet-analyzer test delete
-  summary: Delete test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_list
-  name: az internet-analyzer test list
-  summary: List tests.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_show
-  name: az internet-analyzer test show
-  summary: Show test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_update
-  name: az internet-analyzer test update
-  summary: Update test.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage internet analyzer.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml
deleted file mode 100644
index f3cc4aa5e8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-  name: az internet-analyzer preconfigured-endpoint
-  summary: Commands to manage preconfigured endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-  name: az internet-analyzer preconfigured-endpoint list
-  summary: List preconfigured endpoints.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets a list of Preconfigured Endpoints
-    syntax:
-      content: >-
-        az internet-analyzer preconfigured-endpoint list --resource-group "MyResourceGroup" \
-
-        --profile-name "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile for which to list preconfigured endpoints.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-  name: az internet-analyzer preconfigured-endpoint list
-  summary: List preconfigured endpoints.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage preconfigured endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml b/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml
deleted file mode 100644
index 38cbd54d10..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer_profile
-  name: az internet-analyzer profile
-  summary: Commands to manage internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_profile_create
-  - ext_internet-analyzer_az_internet_analyzer_profile_delete
-  - ext_internet-analyzer_az_internet_analyzer_profile_list
-  - ext_internet-analyzer_az_internet_analyzer_profile_show
-  - ext_internet-analyzer_az_internet_analyzer_profile_update
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-  name: az internet-analyzer profile create
-  summary: Create internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creates an Internet Analyzer Profile in a Resource Group
-    syntax:
-      content: >-
-        az internet-analyzer profile create --resource-group "MyResourceGroup" --name "MyProfile" \
-
-        --location "WestUs" --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to be created.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The state of the Experiment.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-  name: az internet-analyzer profile delete
-  summary: Delete internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deletes an Internet Analyzer Profile in a Resource Group
-    syntax:
-      content: az internet-analyzer profile delete --resource-group "MyResourceGroup" --name "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to be deleted.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-  name: az internet-analyzer profile list
-  summary: List internet analyzer profiles.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Internet Analyzer Profiles in a Resource Group
-    syntax:
-      content: az internet-analyzer profile list --resource-group "MyResourceGroup"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-  name: az internet-analyzer profile show
-  summary: Show internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets an Internet Analyzer Profile by Profile Id
-    syntax:
-      content: az internet-analyzer profile show --resource-group "MyResourceGroup" --name "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to show.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-  name: az internet-analyzer profile update
-  summary: Update internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Updates an Internet Analyzer Profile in a Resource Group
-    syntax:
-      content: >-
-        az internet-analyzer profile update --resource-group "MyResourceGroup" --name "MyProfile" \
-
-        --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to be updated.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The state of the Experiment.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-  name: az internet-analyzer profile create
-  summary: Create internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-  name: az internet-analyzer profile delete
-  summary: Delete internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-  name: az internet-analyzer profile list
-  summary: List internet analyzer profiles.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-  name: az internet-analyzer profile show
-  summary: Show internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-  name: az internet-analyzer profile update
-  summary: Update internet analyzer profile.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage internet analyzer profile.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml b/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml
deleted file mode 100644
index e0543c16e8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml
+++ /dev/null
@@ -1,226 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer_test
-  name: az internet-analyzer test
-  summary: Commands to manage tests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_test_create
-  - ext_internet-analyzer_az_internet_analyzer_test_delete
-  - ext_internet-analyzer_az_internet_analyzer_test_list
-  - ext_internet-analyzer_az_internet_analyzer_test_show
-  - ext_internet-analyzer_az_internet_analyzer_test_update
-- uid: ext_internet-analyzer_az_internet_analyzer_test_create
-  name: az internet-analyzer test create
-  summary: Create test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creates a test
-    syntax:
-      content: >-
-        az internet-analyzer test create --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment" --description "this is my first experiment!" \
-
-        --endpoint-a-name "endpoint A" --endpoint-a-endpoint "endpointA.net" --endpoint-b-name \
-
-        "endpoint B" --endpoint-b-endpoint "endpointB.net" --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to be created.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the new test should be created.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: The description of the details or intents of the test.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The initial of the test.
-    description: ''
-  - name: --endpoint-a-endpoint
-    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-a-name
-    summary: The name of the control endpoint.
-    description: ''
-  - name: --endpoint-b-endpoint
-    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-b-name
-    summary: The name of the other endpoint.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-  name: az internet-analyzer test delete
-  summary: Delete test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deletes a test
-    syntax:
-      content: >-
-        az internet-analyzer test delete --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to delete.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_list
-  name: az internet-analyzer test list
-  summary: List tests.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets a list of tests
-    syntax:
-      content: >-
-        az internet-analyzer test list --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile for which to list tests.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_show
-  name: az internet-analyzer test show
-  summary: Show test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets a test by name
-    syntax:
-      content: >-
-        az internet-analyzer test show --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to show.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_update
-  name: az internet-analyzer test update
-  summary: Update test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Updates a test
-    syntax:
-      content: >-
-        az internet-analyzer test update --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment" --description "string" --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to be updated.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: The description of the details or intents of the test.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The state of the Experiment.
-    description: ''
-  - name: --endpoint-a-endpoint
-    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-a-name
-    summary: The name of the control endpoint.
-    description: ''
-  - name: --endpoint-b-endpoint
-    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-b-name
-    summary: The name of the other endpoint.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_test_create
-  name: az internet-analyzer test create
-  summary: Create test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-  name: az internet-analyzer test delete
-  summary: Delete test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_list
-  name: az internet-analyzer test list
-  summary: List tests.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_show
-  name: az internet-analyzer test show
-  summary: Show test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_update
-  name: az internet-analyzer test update
-  summary: Update test.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage tests.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ip-group/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/ip-group/index.yml
deleted file mode 100644
index fc92c3de31..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ip-group/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ip-group_az
-  name: ip-group
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ip-group_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ip-group/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/ip-group/network.yml
deleted file mode 100644
index f81a111692..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ip-group/network.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ip-group_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ip-group_az_network_ip_group
-  name: az network ip-group
-  summary: Commands to manage IpGroup.
-- uid: ext_ip-group_az_network_ip_group_create
-  name: az network ip-group create
-  summary: Create an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_delete
-  name: az network ip-group delete
-  summary: Delete an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_list
-  name: az network ip-group list
-  summary: List all of IpGroup.
-- uid: ext_ip-group_az_network_ip_group_show
-  name: az network ip-group show
-  summary: Show details of an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_update
-  name: az network ip-group update
-  summary: Update an IpGroup.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/ip-group/network/ip-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/ip-group/network/ip-group.yml
deleted file mode 100644
index 2d00fe5406..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/ip-group/network/ip-group.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ip-group_az_network_ip_group
-  name: az network ip-group
-  summary: Commands to manage IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_ip-group_az_network_ip_group_create
-  - ext_ip-group_az_network_ip_group_delete
-  - ext_ip-group_az_network_ip_group_list
-  - ext_ip-group_az_network_ip_group_show
-  - ext_ip-group_az_network_ip_group_update
-- uid: ext_ip-group_az_network_ip_group_create
-  name: az network ip-group create
-  summary: Create an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --ip-addresses
-    summary: Space-separated list of IpAddress or IpAddressPrefix.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_delete
-  name: az network ip-group delete
-  summary: Delete an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_list
-  name: az network ip-group list
-  summary: List all of IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_show
-  name: az network ip-group show
-  summary: Show details of an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_update
-  name: az network ip-group update
-  summary: Update an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --ip-addresses
-    summary: Space-separated list of IpAddress or IpAddressPrefix.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_ip-group_az_network_ip_group_create
-  name: az network ip-group create
-  summary: Create an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_delete
-  name: az network ip-group delete
-  summary: Delete an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_list
-  name: az network ip-group list
-  summary: List all of IpGroup.
-- uid: ext_ip-group_az_network_ip_group_show
-  name: az network ip-group show
-  summary: Show details of an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_update
-  name: az network ip-group update
-  summary: Update an IpGroup.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage IpGroup.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/index.yml
deleted file mode 100644
index 6f2be1677c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_k8sconfiguration_az
-  name: k8sconfiguration
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_k8sconfiguration_az_k8sconfiguration
-  name: az k8sconfiguration
-  summary: Commands to manage Kubernetes configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml b/2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml
deleted file mode 100644
index 758dbbff41..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml
+++ /dev/null
@@ -1,260 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_k8sconfiguration_az_k8sconfiguration
-  name: az k8sconfiguration
-  summary: Commands to manage Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_k8sconfiguration_az_k8sconfiguration_create
-  - ext_k8sconfiguration_az_k8sconfiguration_delete
-  - ext_k8sconfiguration_az_k8sconfiguration_list
-  - ext_k8sconfiguration_az_k8sconfiguration_show
-  - ext_k8sconfiguration_az_k8sconfiguration_update
-- uid: ext_k8sconfiguration_az_k8sconfiguration_create
-  name: az k8sconfiguration create
-  summary: Create a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration create --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName --operator-instance-name OperatorInst01 \
-
-        --operator-namespace OperatorNamespace01 --repository-url git://github.com/fluxHowTo/flux-get-started \
-
-        --operator-params "'--git-readonly'" --enable-helm-operator --helm-operator-version 0.6.0 \
-
-        --scope namespace --helm-operator-params '--set helm.versions=v3'
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --repository-url -u
-    summary: Url of the source control repository.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --scope
-    parameterValueGroup: cluster, namespace
-    summary: Specify scope of the operator to be 'namespace' or 'cluster'.
-    description: ''
-  - name: --enable-helm-operator
-    parameterValueGroup: false, true
-    summary: Enable support for Helm chart deployments.
-    description: ''
-  - name: --helm-operator-params
-    summary: Chart values for the Helm Operator (if enabled).
-    description: ''
-  - name: --helm-operator-version
-    defaultValue: 0.3.0
-    summary: Chart version of the Helm Operator (if enabled).
-    description: ''
-  - name: --operator-instance-name
-    summary: Instance name of the Operator.
-    description: ''
-  - name: --operator-namespace
-    defaultValue: default
-    summary: Namespace in which to install the Operator.
-    description: ''
-  - name: --operator-params
-    summary: Parameters for the Operator.
-    description: ''
-  - name: --operator-type
-    defaultValue: flux
-    summary: Type of the operator. Valid value is 'flux'.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-  name: az k8sconfiguration delete
-  summary: Delete a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration delete --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_list
-  name: az k8sconfiguration list
-  summary: List Kubernetes configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Kubernetes configurations of a cluster
-    syntax:
-      content: >-
-        az k8sconfiguration list --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_show
-  name: az k8sconfiguration show
-  summary: Show details of a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration show --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_update
-  name: az k8sconfiguration update
-  summary: Update a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an existing Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration update --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \
-
-        --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \
-
-        --helm-operator-version 0.6.0 --helm-operator-params '--set helm.versions=v3'
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enable-helm-operator
-    parameterValueGroup: false, true
-    summary: Enable support for Helm chart deployments.
-    description: ''
-  - name: --helm-operator-params
-    summary: Chart values for the Helm Operator (if enabled).
-    description: ''
-  - name: --helm-operator-version
-    summary: Chart version of the Helm Operator (if enabled).
-    description: ''
-  - name: --operator-params
-    summary: Parameters for the Operator.
-    description: ''
-  - name: --repository-url -u
-    summary: Url of the source control repository.
-    description: ''
-commands:
-- uid: ext_k8sconfiguration_az_k8sconfiguration_create
-  name: az k8sconfiguration create
-  summary: Create a Kubernetes configuration.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-  name: az k8sconfiguration delete
-  summary: Delete a Kubernetes configuration.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_list
-  name: az k8sconfiguration list
-  summary: List Kubernetes configurations.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_show
-  name: az k8sconfiguration show
-  summary: Show details of a Kubernetes configuration.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_update
-  name: az k8sconfiguration update
-  summary: Update a Kubernetes configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Kubernetes configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/index.yml
deleted file mode 100644
index 40fb3971e3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az
-  name: keyvault-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_keyvault-preview_az_keyvault
-  name: az keyvault
-  summary: Safeguard and maintain control of keys, secrets, and certificates.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault.yml
deleted file mode 100644
index e35b817030..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault.yml
+++ /dev/null
@@ -1,576 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault
-  name: az keyvault
-  summary: Safeguard and maintain control of keys, secrets, and certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_create
-  - ext_keyvault-preview_az_keyvault_delete
-  - ext_keyvault-preview_az_keyvault_delete_policy
-  - ext_keyvault-preview_az_keyvault_list
-  - ext_keyvault-preview_az_keyvault_list_deleted
-  - ext_keyvault-preview_az_keyvault_purge
-  - ext_keyvault-preview_az_keyvault_recover
-  - ext_keyvault-preview_az_keyvault_set_policy
-  - ext_keyvault-preview_az_keyvault_show
-  - ext_keyvault-preview_az_keyvault_update
-- uid: ext_keyvault-preview_az_keyvault_create
-  name: az keyvault create
-  summary: Create a key vault.
-  description: Default permissions are created for the current user or service principal unless the `--no-self-perms` flag is specified.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enable-purge-protection
-    parameterValueGroup: false, true
-    summary: Prevents manual purging of deleted vault, and all contained entities.
-    description: ''
-  - name: --enable-soft-delete
-    parameterValueGroup: false, true
-    summary: Enable vault deletion recovery for the vault, and all contained entities.
-    description: ''
-  - name: --enabled-for-deployment
-    parameterValueGroup: false, true
-    summary: Allow Virtual Machines to retrieve certificates stored as secrets from the vault.
-    description: ''
-  - name: --enabled-for-disk-encryption
-    parameterValueGroup: false, true
-    summary: Allow Disk Encryption to retrieve secrets from the vault and unwrap keys.
-    description: ''
-  - name: --enabled-for-template-deployment
-    parameterValueGroup: false, true
-    summary: Allow Resource Manager to retrieve secrets from the vault.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-self-perms
-    parameterValueGroup: false, true
-    summary: Don't add permissions for the current user/service principal in the new vault.
-    description: ''
-  - name: --sku
-    defaultValue: standard
-    parameterValueGroup: premium, standard
-    summary: Required. SKU details.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_delete
-  name: az keyvault delete
-  summary: Delete a key vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_delete_policy
-  name: az keyvault delete-policy
-  summary: Delete security policy settings for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --object-id
-    summary: A GUID that identifies the principal that will receive permissions.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --spn
-    summary: Name of a service principal that will receive permissions.
-    description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_list
-  name: az keyvault list
-  summary: List key vaults.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_list_deleted
-  name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_keyvault-preview_az_keyvault_purge
-  name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-  description: Aka Purges the deleted Azure key vault.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_recover
-  name: az keyvault recover
-  summary: Recover a key vault.
-  description: Recovers a previously deleted key vault for which soft delete was enabled.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_set_policy
-  name: az keyvault set-policy
-  summary: Update security policy settings for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --object-id
-    summary: A GUID that identifies the principal that will receive permissions.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --spn
-    summary: Name of a service principal that will receive permissions.
-    description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
-    description: ''
-  - name: --certificate-permissions
-    parameterValueGroup: backup, create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, restore, setissuers, update
-    summary: Space-separated list of certificate permissions to assign.
-    description: ''
-  - name: --key-permissions
-    parameterValueGroup: backup, create, decrypt, delete, encrypt, get, import, list, purge, recover, restore, sign, unwrapKey, update, verify, wrapKey
-    summary: Space-separated list of key permissions to assign.
-    description: ''
-  - name: --secret-permissions
-    parameterValueGroup: backup, delete, get, list, purge, recover, restore, set
-    summary: Space-separated list of secret permissions to assign.
-    description: ''
-  - name: --storage-permissions
-    parameterValueGroup: backup, delete, deletesas, get, getsas, list, listsas, purge, recover, regeneratekey, restore, set, setsas, update
-    summary: Space-separated list of storage permissions to assign.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_show
-  name: az keyvault show
-  summary: Show details of a key vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_update
-  name: az keyvault update
-  summary: Update the properties of a key vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --enable-purge-protection
-    parameterValueGroup: false, true
-    summary: Prevents manual purging of deleted vault, and all contained entities.
-    description: ''
-  - name: --enable-soft-delete
-    parameterValueGroup: false, true
-    summary: Enable vault deletion recovery for the vault, and all contained entities.
-    description: ''
-  - name: --enabled-for-deployment
-    parameterValueGroup: false, true
-    summary: Allow Virtual Machines to retrieve certificates stored as secrets from the vault.
-    description: ''
-  - name: --enabled-for-disk-encryption
-    parameterValueGroup: false, true
-    summary: Allow Disk Encryption to retrieve secrets from the vault and unwrap keys.
-    description: ''
-  - name: --enabled-for-template-deployment
-    parameterValueGroup: false, true
-    summary: Allow Resource Manager to retrieve secrets from the vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-- uid: ext_keyvault-preview_az_keyvault_create
-  name: az keyvault create
-  summary: Create a key vault.
-- uid: ext_keyvault-preview_az_keyvault_delete
-  name: az keyvault delete
-  summary: Delete a key vault.
-- uid: ext_keyvault-preview_az_keyvault_delete_policy
-  name: az keyvault delete-policy
-  summary: Delete security policy settings for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-- uid: ext_keyvault-preview_az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: ext_keyvault-preview_az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: ext_keyvault-preview_az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: ext_keyvault-preview_az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: ext_keyvault-preview_az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-- uid: ext_keyvault-preview_az_keyvault_list
-  name: az keyvault list
-  summary: List key vaults.
-- uid: ext_keyvault-preview_az_keyvault_list_deleted
-  name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
-- uid: ext_keyvault-preview_az_keyvault_network_rule
-  name: az keyvault network-rule
-  summary: Manage vault network ACLs.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_add
-  name: az keyvault network-rule add
-  summary: Add a network rule to the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_list
-  name: az keyvault network-rule list
-  summary: Lists the network rules from the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-  name: az keyvault network-rule remove
-  summary: Removes a network rule from the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_purge
-  name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_recover
-  name: az keyvault recover
-  summary: Recover a key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-- uid: ext_keyvault-preview_az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: ext_keyvault-preview_az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-- uid: ext_keyvault-preview_az_keyvault_set_policy
-  name: az keyvault set-policy
-  summary: Update security policy settings for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_show
-  name: az keyvault show
-  summary: Show details of a key vault.
-- uid: ext_keyvault-preview_az_keyvault_storage
-  name: az keyvault storage
-  summary: Manage storage accounts.
-- uid: ext_keyvault-preview_az_keyvault_storage_add
-  name: az keyvault storage add
-  summary: Creates or updates a new storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_backup
-  name: az keyvault storage backup
-  summary: Backs up the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_list
-  name: az keyvault storage list
-  summary: List storage accounts managed by the specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-  name: az keyvault storage list-deleted
-  summary: Lists deleted storage accounts for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_purge
-  name: az keyvault storage purge
-  summary: Permanently deletes the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_recover
-  name: az keyvault storage recover
-  summary: Recovers the deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  name: az keyvault storage regenerate-key
-  summary: Regenerates the specified key value for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_remove
-  name: az keyvault storage remove
-  summary: Remove a Key Vault managed Azure Storage Account and all associated SAS definitions. This operation requires the storage/delete permission.
-- uid: ext_keyvault-preview_az_keyvault_storage_restore
-  name: az keyvault storage restore
-  summary: Restores a backed up storage account to a vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-  name: az keyvault storage sas-definition
-  summary: Manage storage account SAS definitions.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_show
-  name: az keyvault storage show
-  summary: Gets information about a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-  name: az keyvault storage show-deleted
-  summary: Gets the specified deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_update
-  name: az keyvault storage update
-  summary: Updates the specified attributes associated with the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_update
-  name: az keyvault update
-  summary: Update the properties of a key vault.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Safeguard and maintain control of keys, secrets, and certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate.yml
deleted file mode 100644
index 47fb64e958..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate.yml
+++ /dev/null
@@ -1,420 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_create
-  - ext_keyvault-preview_az_keyvault_certificate_delete
-  - ext_keyvault-preview_az_keyvault_certificate_download
-  - ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  - ext_keyvault-preview_az_keyvault_certificate_import
-  - ext_keyvault-preview_az_keyvault_certificate_list
-  - ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  - ext_keyvault-preview_az_keyvault_certificate_list_versions
-  - ext_keyvault-preview_az_keyvault_certificate_purge
-  - ext_keyvault-preview_az_keyvault_certificate_recover
-  - ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  - ext_keyvault-preview_az_keyvault_certificate_show
-  - ext_keyvault-preview_az_keyvault_certificate_show_deleted
-- uid: ext_keyvault-preview_az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-  description: Certificates can be used as a secrets for provisioned virtual machines.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a self-signed certificate with the default policy and add it to a virtual machine.
-    syntax:
-      content: "az keyvault certificate create --vault-name vaultname -n cert1 \\\n  -p \"$(az keyvault certificate get-default-policy)\"\n\nsecrets=$(az keyvault secret list-versions --vault-name vaultname \\\n  -n cert1 --query \"[?attributes.enabled].id\" -o tsv)\n\nvm_secrets=$(az vm secret format -s \"$secrets\") \n\naz vm create -g group-name -n vm-name --admin-username deploy  \\\n  --image debian --secrets \"$vm_secrets\""
-  parameters:
-  - isRequired: true
-    name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create certificate in disabled state.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validity
-    summary: Number of months the certificate is valid for. Overrides the value specified with --policy/-p.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-  description: Deletes all versions of a certificate object along with its associated policy. Delete certificate cannot be used to remove individual versions of a certificate object. This operation requires the certificates/delete permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-  description: The certificate formatted as either PEM or DER. PEM is the default.
-  langs:
-  - azurecli
-  examples:
-  - summary: Download a certificate as PEM and check its fingerprint in openssl.
-    syntax:
-      content: az keyvault certificate download --vault-name vault -n cert-name -f cert.pem && \ openssl x509 -in cert.pem -inform PEM  -noout -sha1 -fingerprint
-  - summary: Download a certificate as DER and check its fingerprint in openssl.
-    syntax:
-      content: az keyvault certificate download --vault-name vault -n cert-name -f cert.crt -e DER && \ openssl x509 -in cert.crt -inform DER  -noout -sha1 -fingerprint
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: File to receive the binary certificate contents.
-    description: ''
-  - name: --encoding -e
-    defaultValue: PEM
-    parameterValueGroup: DER, PEM
-    summary: Encoding of the certificate. DER will create a binary DER formatted x509 certificate, and PEM will create a base64 PEM x509 certificate.
-    description: ''
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The certificate version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-  description: >-
-    This default policy can be used in conjunction with `az keyvault create` to create a self-signed certificate. The default policy can also be used as a starting point to create derivative policies.
-
-
-    For more details, see: <a href="https://docs.microsoft.com/en-us/rest/api/keyvault/certificates-and-policies">https://docs.microsoft.com/en-us/rest/api/keyvault/certificates-and-policies</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a self-signed certificate with the default policy
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
-  parameters:
-  - name: --scaffold
-    summary: Create a fully formed policy structure with default values.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-  description: Certificates can also be used as a secrets in provisioned virtual machines.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a service principal with a certificate, add the certificate to Key Vault and provision a VM with that certificate.
-    syntax:
-      content: "service_principal=$(az ad sp create-for-rbac --create-cert) \n\ncert_file=$(echo $service_principal | jq .fileWithCertAndPrivateKey -r) \n\naz keyvault create -g my-group -n vaultname \n\naz keyvault certificate import --vault-name vaultname -n cert_file \n\nsecrets=$(az keyvault secret list-versions --vault-name vaultname \\\n  -n cert1 --query \"[?attributes.enabled].id\" -o tsv)\n\nvm_secrets=$(az vm secret format -s \"$secrets\") \n\naz vm create -g group-name -n vm-name --admin-username deploy  \\\n  --image debian --secrets \"$vm_secrets\""
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: PKCS12 file or PEM file containing the certificate and private key.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Import the certificate in disabled state.
-    description: ''
-  - name: --password
-    summary: If the private key in certificate is encrypted, the password used for encryption.
-    description: ''
-  - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-  description: The GetCertificates operation returns the set of certificates resources in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-pending
-    summary: Specifies whether to include certificates which are not completely provisioned.
-    description: ''
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-  description: The GetDeletedCertificates operation retrieves the certificates in the current vault which are in a deleted state and ready for recovery or purging. This operation includes deletion-specific information. This operation requires the certificates/get/list permission. This operation can only be enabled on soft-delete enabled vaults.
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-pending
-    summary: Specifies whether to include certificates which are not completely provisioned.
-    description: ''
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-  description: The GetCertificateVersions operation returns the versions of a certificate in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-  description: The PurgeDeletedCertificate operation performs an irreversible deletion of the specified certificate, without possibility for recovery. The operation is not available if the recovery level does not specify 'Purgeable'. This operation requires the certificate/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-  description: The RecoverDeletedCertificate operation performs the reversal of the Delete operation. The operation is applicable in vaults enabled for soft-delete, and must be issued during the retention interval (available in the deleted certificate's attributes). This operation requires the certificates/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-  description: The UpdateCertificate operation applies the specified update on the given certificate; the only elements updated are the certificate's attributes. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Enable the certificate.
-    description: ''
-  - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The certificate version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-  description: Gets information about a specific certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The certificate version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-  description: The GetDeletedCertificate operation retrieves the deleted certificate information plus its attributes, such as retention interval, scheduled permanent deletion and the current deletion recovery level. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/contact.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/contact.yml
deleted file mode 100644
index a9a0ccf5e9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/contact.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_contact_add
-  - ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  - ext_keyvault-preview_az_keyvault_certificate_contact_list
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Contact e-mail address. Must be unique.
-    description: ''
-  - name: --name
-    summary: Full contact name.
-    description: ''
-  - name: --phone
-    summary: Contact phone number.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Contact e-mail address. Must be unique.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-  description: The GetCertificateContacts operation returns the set of certificate contact resources in the specified key vault. This operation requires the certificates/managecontacts permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage contacts for certificate management.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer.yml
deleted file mode 100644
index 4916c55e3c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_update
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Set issuer to disabled state.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --account-id
-    summary: The issuer account id/username/etc.
-    description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
-    description: ''
-  - name: --organization-id
-    summary: The organization id.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-  description: The DeleteCertificateIssuer operation permanently removes the specified certificate issuer from the vault. This operation requires the certificates/manageissuers/deleteissuers permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-  description: The GetCertificateIssuers operation returns the set of certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-  description: The GetCertificateIssuer operation returns the specified certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Set issuer enabled state.
-    description: ''
-  - name: --provider-name
-    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --account-id
-    summary: The issuer account id/username/etc.
-    description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
-    description: ''
-  - name: --organization-id
-    summary: The organization id.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage certificate issuer information.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer/admin.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer/admin.yml
deleted file mode 100644
index 0512ff1910..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer/admin.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Admin e-mail address. Must be unique within the vault.
-    description: ''
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - name: --first-name
-    summary: ''
-    description: ''
-  - name: --last-name
-    summary: ''
-    description: ''
-  - name: --phone
-    summary: Amin phone number.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Admin e-mail address. Must be unique within the vault.
-    description: ''
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage admin information for certificate issuers.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/pending.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/pending.yml
deleted file mode 100644
index cbc83e1383..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/pending.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  - ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  - ext_keyvault-preview_az_keyvault_certificate_pending_show
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-  description: Deletes the creation operation for a specified certificate that is in the process of being created. The certificate is no longer created. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-  description: The MergeCertificate operation performs the merging of a certificate or certificate chain with a key pair currently available in the service. This operation requires the certificates/create permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: File containing the certificate or certificate chain to merge.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create certificate in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-  description: Gets the creation operation associated with a specified certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pending certificate creation operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/key.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/key.yml
deleted file mode 100644
index 2fffee8072..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/key.yml
+++ /dev/null
@@ -1,370 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_key_backup
-  - ext_keyvault-preview_az_keyvault_key_create
-  - ext_keyvault-preview_az_keyvault_key_delete
-  - ext_keyvault-preview_az_keyvault_key_import
-  - ext_keyvault-preview_az_keyvault_key_list
-  - ext_keyvault-preview_az_keyvault_key_list_deleted
-  - ext_keyvault-preview_az_keyvault_key_list_versions
-  - ext_keyvault-preview_az_keyvault_key_purge
-  - ext_keyvault-preview_az_keyvault_key_recover
-  - ext_keyvault-preview_az_keyvault_key_restore
-  - ext_keyvault-preview_az_keyvault_key_set_attributes
-  - ext_keyvault-preview_az_keyvault_key_show
-  - ext_keyvault-preview_az_keyvault_key_show_deleted
-- uid: ext_keyvault-preview_az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-  description: The Key Backup operation exports a key from Azure Key Vault in a protected form. Note that this operation does NOT return key material in a form that can be used outside the Azure Key Vault system, the returned key material is either protected to a Azure Key Vault HSM or to Azure Key Vault itself. The intent of this operation is to allow a client to GENERATE a key in one Azure Key Vault instance, BACKUP the key, and then RESTORE it into another Azure Key Vault instance. The BACKUP operation may be used to export, in protected form, any key type from Azure Key Vault. Individual versions of a key cannot be backed up. BACKUP / RESTORE can be performed within geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical area. This operation requires the key/backup permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: Local file path in which to store key backup.
-    description: ''
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-  description: The create key operation can be used to create any key type in Azure Key Vault. If the named key already exists, Azure Key Vault creates a new version of the key. It requires the keys/create permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --curve
-    parameterValueGroup: P-256, P-384, P-521, SECP256K1
-    summary: Elliptic curve name. For valid values, see JsonWebKeyCurveName.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create key in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --kty
-    parameterValueGroup: EC, EC-HSM, RSA, RSA-HSM, oct
-    summary: The type of key to create. For valid values, see JsonWebKeyType.
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
-    description: ''
-  - name: --protection -p
-    parameterValueGroup: hsm, software
-    summary: Specifies the type of key protection.
-    description: ''
-  - name: --size
-    summary: The key size in bytes. For example, 1024 or 2048.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-  description: The delete key operation cannot be used to remove individual versions of a key. This operation removes the cryptographic material associated with the key, which means the key is not usable for Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt operations. This operation requires the keys/delete permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-  description: Supports importing base64 encoded private keys from PEM files. Supports importing BYOK keys into HSM for premium key vaults.
-  langs:
-  - azurecli
-  parameters:
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create key in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
-    description: ''
-  - name: --protection -p
-    parameterValueGroup: hsm, software
-    summary: Specifies the type of key protection.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --byok-file
-    summary: BYOK file containing the key to be imported. Must not be password protected.
-    description: ''
-  - name: --pem-file
-    summary: PEM file containing the key to be imported.
-    description: ''
-  - name: --pem-password
-    summary: Password of PEM file.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and tags are provided in the response. Individual versions of a key are not listed in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is applicable for vaults enabled for soft-delete. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-  description: The full key identifier, attributes, and tags are provided in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-  description: The Purge Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-  description: The Recover Deleted Key operation is applicable for deleted keys in soft-delete enabled vaults. It recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will return an error. Consider this the inverse of the delete operation on soft-delete enabled vaults. This operation requires the keys/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-  description: 'Imports a previously backed up key into Azure Key Vault, restoring the key, its key identifier, attributes and access control policies. The RESTORE operation may be used to import a previously backed up key. Individual versions of a key cannot be restored. The key is restored in its entirety with the same key name as it had when it was backed up. If the key name is not available in the target Key Vault, the RESTORE operation will be rejected. While the key name is retained during restore, the final key identifier will change if the key is restored to a different vault. Restore will restore all versions and preserve version identifiers. The RESTORE operation is subject to security constraints: The target Key Vault must be owned by the same Microsoft Azure Subscription as the source Key Vault The user must have RESTORE permission in the target Key Vault. This operation requires the keys/restore permission.'
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: Local key backup from which to restore key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-  description: 'In order to perform this operation, the key must already exist in the Key Vault. Note: The cryptographic material of a key itself cannot be changed. This operation requires the keys/update permission.'
-  langs:
-  - azurecli
-  parameters:
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Enable the key.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The key version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-  description: The get key operation is applicable to all key types. If the requested key is symmetric, then no key material is released in the response. This operation requires the keys/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The key version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-  description: The Get Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/get permission. .
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: ext_keyvault-preview_az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: ext_keyvault-preview_az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: ext_keyvault-preview_az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: ext_keyvault-preview_az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/network-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/network-rule.yml
deleted file mode 100644
index 6f8499d8e1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/network-rule.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_network_rule
-  name: az keyvault network-rule
-  summary: Manage vault network ACLs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_network_rule_add
-  - ext_keyvault-preview_az_keyvault_network_rule_list
-  - ext_keyvault-preview_az_keyvault_network_rule_remove
-- uid: ext_keyvault-preview_az_keyvault_network_rule_add
-  name: az keyvault network-rule add
-  summary: Add a network rule to the network ACLs for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_network_rule_list
-  name: az keyvault network-rule list
-  summary: Lists the network rules from the network ACLs for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-  name: az keyvault network-rule remove
-  summary: Removes a network rule from the network ACLs for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_network_rule_add
-  name: az keyvault network-rule add
-  summary: Add a network rule to the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_list
-  name: az keyvault network-rule list
-  summary: Lists the network rules from the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-  name: az keyvault network-rule remove
-  summary: Removes a network rule from the network ACLs for a Key Vault.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage vault network ACLs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/secret.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/secret.yml
deleted file mode 100644
index ac63431af3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/secret.yml
+++ /dev/null
@@ -1,346 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_secret_backup
-  - ext_keyvault-preview_az_keyvault_secret_delete
-  - ext_keyvault-preview_az_keyvault_secret_download
-  - ext_keyvault-preview_az_keyvault_secret_list
-  - ext_keyvault-preview_az_keyvault_secret_list_deleted
-  - ext_keyvault-preview_az_keyvault_secret_list_versions
-  - ext_keyvault-preview_az_keyvault_secret_purge
-  - ext_keyvault-preview_az_keyvault_secret_recover
-  - ext_keyvault-preview_az_keyvault_secret_restore
-  - ext_keyvault-preview_az_keyvault_secret_set
-  - ext_keyvault-preview_az_keyvault_secret_set_attributes
-  - ext_keyvault-preview_az_keyvault_secret_show
-  - ext_keyvault-preview_az_keyvault_secret_show_deleted
-- uid: ext_keyvault-preview_az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-  description: Requests that a backup of the specified secret be downloaded to the client. All versions of the secret will be downloaded. This operation requires the secrets/backup permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-path
-    summary: ''
-    description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-  description: The DELETE operation applies to any secret stored in Azure Key Vault. DELETE cannot be applied to an individual version of a secret. This operation requires the secrets/delete permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: File to receive the secret contents.
-    description: ''
-  - name: --encoding -e
-    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
-    summary: Encoding of the destination file. By default, will look for the 'file-encoding' tag on the secret. Otherwise will assume 'utf-8'.
-    description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The secret version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-  description: The Get Secrets operation is applicable to the entire vault. However, only the base secret identifier and its attributes are provided in the response. Individual secret versions are not listed in the response. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-  description: The Get Deleted Secrets operation returns the secrets that have been deleted for a vault enabled for soft-delete. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-  description: The full secret identifier and attributes are provided in the response. No values are returned for the secrets. This operations requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the secret.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-  description: The purge deleted secret operation removes the secret permanently, without the possibility of recovery. This operation can only be enabled on a soft-delete enabled vault. This operation requires the secrets/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-  description: Recovers the deleted secret in the specified vault. This operation can only be performed on a soft-delete enabled vault. This operation requires the secrets/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-  description: Restores a backed up secret, and all its versions, to a vault. This operation requires the secrets/restore permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-path
-    summary: ''
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --description
-    summary: Description of the secret contents (e.g. password, connection string, etc).
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create secret in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --encoding -e
-    defaultValue: utf-8
-    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
-    summary: Source file encoding. The value is saved as a tag (`file-encoding=&lt;val&gt;`) and used during download to automatically encode the resulting file.
-    description: ''
-  - name: --file -f
-    summary: Source file for secret. Use in conjunction with '--encoding'.
-    description: ''
-  - name: --value
-    summary: Plain text secret value. Cannot be used with '--file' or '--encoding'.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the secret.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-  description: The UPDATE operation changes specified attributes of an existing stored secret. Attributes that are not specified in the request are left unchanged. The value of a secret itself cannot be changed. This operation requires the secrets/set permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --content-type
-    summary: Type of the secret value such as a password.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Enable the secret.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The secret version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-  description: The GET operation is applicable to any secret stored in Azure Key Vault. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The secret version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-  description: The Get Deleted Secret operation returns the specified deleted secret along with its attributes. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: ext_keyvault-preview_az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage secrets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/storage.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/storage.yml
deleted file mode 100644
index 32cb407f64..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/storage.yml
+++ /dev/null
@@ -1,342 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_storage
-  name: az keyvault storage
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_storage_add
-  - ext_keyvault-preview_az_keyvault_storage_backup
-  - ext_keyvault-preview_az_keyvault_storage_list
-  - ext_keyvault-preview_az_keyvault_storage_list_deleted
-  - ext_keyvault-preview_az_keyvault_storage_purge
-  - ext_keyvault-preview_az_keyvault_storage_recover
-  - ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  - ext_keyvault-preview_az_keyvault_storage_remove
-  - ext_keyvault-preview_az_keyvault_storage_restore
-  - ext_keyvault-preview_az_keyvault_storage_show
-  - ext_keyvault-preview_az_keyvault_storage_show_deleted
-  - ext_keyvault-preview_az_keyvault_storage_update
-- uid: ext_keyvault-preview_az_keyvault_storage_add
-  name: az keyvault storage add
-  summary: Creates or updates a new storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a storage account and setup a vault to manage its keys
-    syntax:
-      content: >-
-        $id = az storage account create -g resourcegroup -n storageacct --query id
-
-
-        # assign the Azure Key Vault service the "Storage Account Key Operator Service Role" role. az role assignment create --role "Storage Account Key Operator Service Role" --scope $id \ --assignee cfa8b339-82a2-471a-a3c9-0fc0be7a4093
-
-
-        az keyvault storage add --vault-name vault -n storageacct --active-key-name key1    \ --auto-regenerate-key --regeneration-period P90D  --resource-id $id
-  parameters:
-  - isRequired: true
-    name: --active-key-name
-    summary: Current active storage account key name.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Storage account resource id.
-    description: ''
-  - name: --auto-regenerate-key
-    parameterValueGroup: false, true
-    summary: Whether keyvault should manage the storage account for the user.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --regeneration-period
-    summary: The key regeneration time duration specified in ISO-8601 format, such as "P30D" for rotation every 30 days.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_backup
-  name: az keyvault storage backup
-  summary: Backs up the specified storage account.
-  description: Requests that a backup of the specified storage account be downloaded to the client. This operation requires the storage/backup permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: Local file path in which to store storage account backup.
-    description: ''
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_list
-  name: az keyvault storage list
-  summary: List storage accounts managed by the specified key vault.
-  description: This operation requires the storage/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-  name: az keyvault storage list-deleted
-  summary: Lists deleted storage accounts for the specified vault.
-  description: The Get Deleted Storage Accounts operation returns the storage accounts that have been deleted for a vault enabled for soft-delete. This operation requires the storage/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_purge
-  name: az keyvault storage purge
-  summary: Permanently deletes the specified storage account.
-  description: The purge deleted storage account operation removes the secret permanently, without the possibility of recovery. This operation can only be performed on a soft-delete enabled vault. This operation requires the storage/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_recover
-  name: az keyvault storage recover
-  summary: Recovers the deleted storage account.
-  description: Recovers the deleted storage account in the specified vault. This operation can only be performed on a soft-delete enabled vault. This operation requires the storage/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  name: az keyvault storage regenerate-key
-  summary: Regenerates the specified key value for the given storage account.
-  description: This operation requires the storage/regeneratekey permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: The storage account key name.
-    description: ''
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_remove
-  name: az keyvault storage remove
-  summary: Remove a Key Vault managed Azure Storage Account and all associated SAS definitions. This operation requires the storage/delete permission.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_restore
-  name: az keyvault storage restore
-  summary: Restores a backed up storage account to a vault.
-  description: Restores a backed up storage account to a vault. This operation requires the storage/restore permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-path
-    summary: ''
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_show
-  name: az keyvault storage show
-  summary: Gets information about a specified storage account.
-  description: This operation requires the storage/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-  name: az keyvault storage show-deleted
-  summary: Gets the specified deleted storage account.
-  description: The Get Deleted Storage Account operation returns the specified deleted storage account along with its attributes. This operation requires the storage/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_update
-  name: az keyvault storage update
-  summary: Updates the specified attributes associated with the given storage account.
-  description: This operation requires the storage/set/update permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --active-key-name
-    summary: The current active storage account key name.
-    description: ''
-  - name: --auto-regenerate-key
-    parameterValueGroup: false, true
-    summary: Whether keyvault should manage the storage account for the user.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --regeneration-period
-    summary: The key regeneration time duration specified in ISO-8601 format, such as "P30D" for rotation every 30 days.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_storage_add
-  name: az keyvault storage add
-  summary: Creates or updates a new storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_backup
-  name: az keyvault storage backup
-  summary: Backs up the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_list
-  name: az keyvault storage list
-  summary: List storage accounts managed by the specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-  name: az keyvault storage list-deleted
-  summary: Lists deleted storage accounts for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_purge
-  name: az keyvault storage purge
-  summary: Permanently deletes the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_recover
-  name: az keyvault storage recover
-  summary: Recovers the deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  name: az keyvault storage regenerate-key
-  summary: Regenerates the specified key value for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_remove
-  name: az keyvault storage remove
-  summary: Remove a Key Vault managed Azure Storage Account and all associated SAS definitions. This operation requires the storage/delete permission.
-- uid: ext_keyvault-preview_az_keyvault_storage_restore
-  name: az keyvault storage restore
-  summary: Restores a backed up storage account to a vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-  name: az keyvault storage sas-definition
-  summary: Manage storage account SAS definitions.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_show
-  name: az keyvault storage show
-  summary: Gets information about a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-  name: az keyvault storage show-deleted
-  summary: Gets the specified deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_update
-  name: az keyvault storage update
-  summary: Updates the specified attributes associated with the given storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/storage/sas-definition.yml b/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/storage/sas-definition.yml
deleted file mode 100644
index 7b8a35da09..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/keyvault-preview/keyvault/storage/sas-definition.yml
+++ /dev/null
@@ -1,263 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-  name: az keyvault storage sas-definition
-  summary: Manage storage account SAS definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a sas-definition for an account sas-token
-    syntax:
-      content: >-
-        $sastoken = az storage account generate-sas --expiry 2020-01-01 --permissions rw \ --resource-types sco --services bfqt --https-only --account-name storageacct     \ --account-key 00000000
-
-
-        az keyvault storage sas-definition create --vault-name vault --account-name storageacct   \ -n rwallserviceaccess --validity-period P2D --sas-type account --template-uri $sastoken
-  - summary: Add a sas-definition for a blob sas-token
-    syntax:
-      content: >-
-        $sastoken = az storage blob generate-sas --account-name storageacct --account-key 00000000 \ -c container1 -n blob1 --https-only --permissions rw
-
-
-        $url = az storage blob url --account-name storageacct -c container1 -n blob1
-
-
-        az keyvault storage sas-definition create --vault-name vault --account-name storageacct   \ -n rwblobaccess --validity-period P2D --sas-type service --template-uri $url?$sastoken
-  parameters:
-  - isRequired: true
-    name: --sas-type
-    parameterValueGroup: account, service
-    summary: The type of SAS token the SAS definition will create.
-    description: ''
-  - isRequired: true
-    name: --template-uri
-    summary: The SAS definition token template signed with the key 00000000.  In the case of an account token this is only the sas token itself, for service tokens, the full service endpoint url along with the sas token.  Tokens created according to the SAS definition will have the same properties as the template.
-    description: ''
-  - isRequired: true
-    name: --validity-period
-    summary: The validity period of SAS tokens created according to the SAS definition in ISO-8601, such as "PT12H" for 12 hour tokens.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the SAS definition in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-  description: This operation requires the storage/deletesas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --account-name
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --id
-    summary: Id of the SAS definition.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the SAS definition in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-  description: This operation requires the storage/listsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-  description: The Get Deleted Sas Definitions operation returns the SAS definitions that have been deleted for a vault enabled for soft-delete. This operation requires the storage/listsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-  description: Recovers the deleted SAS definition for the specified storage account. This operation can only be performed on a soft-delete enabled vault. This operation requires the storage/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the SAS definition in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-  description: This operation requires the storage/getsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --account-name
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --id
-    summary: Id of the SAS definition.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the SAS definition in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-  description: The Get Deleted SAS Definition operation returns the specified deleted SAS definition along with its attributes. This operation requires the storage/getsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the SAS definition in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-  description: This operation requires the storage/setsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --sas-type
-    parameterValueGroup: account, service
-    summary: The type of SAS token the SAS definition will create.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --template-uri
-    summary: The SAS definition token template signed with the key 00000000.  In the case of an account token this is only the sas token itself, for service tokens, the full service endpoint url along with the sas token.  Tokens created according to the SAS definition will have the same properties as the template.
-    description: ''
-  - name: --validity-period
-    summary: The validity period of SAS tokens created according to the SAS definition in ISO-8601, such as "PT12H" for 12 hour tokens.
-    description: ''
-  - name: --account-name
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --id
-    summary: Id of the SAS definition.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the SAS definition in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account SAS definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/index.yml
deleted file mode 100644
index 23821f9e6b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az
-  name: kusto
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_kusto_az_kusto
-  name: az kusto
-  summary: Manage Azure Kusto resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto.yml
deleted file mode 100644
index 1eec223967..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto
-  name: az kusto
-  summary: Manage Azure Kusto resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_kusto_az_kusto_attached_database_configuration
-  name: az kusto attached-database-configuration
-  summary: Kusto attached-database-configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_create
-  name: az kusto attached-database-configuration create
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_delete
-  name: az kusto attached-database-configuration delete
-  summary: Deletes the attached database configuration with the given name.
-- uid: ext_kusto_az_kusto_attached_database_configuration_list
-  name: az kusto attached-database-configuration list
-  summary: Returns the list of attached database configurations of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_attached_database_configuration_show
-  name: az kusto attached-database-configuration show
-  summary: Returns an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_update
-  name: az kusto attached-database-configuration update
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_wait
-  name: az kusto attached-database-configuration wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_cluster
-  name: az kusto cluster
-  summary: Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_add_language_extension
-  name: az kusto cluster add-language-extension
-  summary: Add a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_create
-  name: az kusto cluster create
-  summary: Create or update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_delete
-  name: az kusto cluster delete
-  summary: Deletes a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_detach_follower_database
-  name: az kusto cluster detach-follower-database
-  summary: Detaches all followers of a database owned by this cluster.
-- uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  name: az kusto cluster diagnose-virtual-network
-  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
-- uid: ext_kusto_az_kusto_cluster_list
-  name: az kusto cluster list
-  summary: Lists all Kusto clusters within a subscription.
-- uid: ext_kusto_az_kusto_cluster_list_follower_database
-  name: az kusto cluster list-follower-database
-  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
-- uid: ext_kusto_az_kusto_cluster_list_language_extension
-  name: az kusto cluster list-language-extension
-  summary: Returns a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_list_sku
-  name: az kusto cluster list-sku
-  summary: Lists eligible SKUs for Kusto resource provider.
-- uid: ext_kusto_az_kusto_cluster_remove_language_extension
-  name: az kusto cluster remove-language-extension
-  summary: Remove a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_show
-  name: az kusto cluster show
-  summary: Gets a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_start
-  name: az kusto cluster start
-  summary: Starts a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_stop
-  name: az kusto cluster stop
-  summary: Stops a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_update
-  name: az kusto cluster update
-  summary: Update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_wait
-  name: az kusto cluster wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment
-  name: az kusto cluster-principal-assignment
-  summary: Kusto cluster-principal-assignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-  name: az kusto cluster-principal-assignment create
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-  name: az kusto cluster-principal-assignment delete
-  summary: Deletes a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-  name: az kusto cluster-principal-assignment list
-  summary: Lists all Kusto cluster principalAssignments.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-  name: az kusto cluster-principal-assignment show
-  summary: Gets a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-  name: az kusto cluster-principal-assignment update
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-  name: az kusto cluster-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_data_connection
-  name: az kusto data-connection
-  summary: Kusto data-connection.
-- uid: ext_kusto_az_kusto_data_connection_delete
-  name: az kusto data-connection delete
-  summary: Deletes the data connection with the given name.
-- uid: ext_kusto_az_kusto_data_connection_event_grid
-  name: az kusto data-connection event-grid
-  summary: Kusto data-connection sub group event-grid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub
-  name: az kusto data-connection event-hub
-  summary: Kusto data-connection sub group event-hub.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub
-  name: az kusto data-connection iot-hub
-  summary: Kusto data-connection sub group iot-hub.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_list
-  name: az kusto data-connection list
-  summary: Returns the list of data connections of the given Kusto database.
-- uid: ext_kusto_az_kusto_data_connection_show
-  name: az kusto data-connection show
-  summary: Returns a data connection.
-- uid: ext_kusto_az_kusto_data_connection_wait
-  name: az kusto data-connection wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_database
-  name: az kusto database
-  summary: Kusto database.
-- uid: ext_kusto_az_kusto_database_add_principal
-  name: az kusto database add-principal
-  summary: Add Database principals permissions.
-- uid: ext_kusto_az_kusto_database_create
-  name: az kusto database create
-  summary: Creates or updates a database.
-- uid: ext_kusto_az_kusto_database_delete
-  name: az kusto database delete
-  summary: Deletes the database with the given name.
-- uid: ext_kusto_az_kusto_database_list
-  name: az kusto database list
-  summary: Returns the list of databases of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_database_list_principal
-  name: az kusto database list-principal
-  summary: Returns a list of database principals of the given Kusto cluster and database.
-- uid: ext_kusto_az_kusto_database_remove_principal
-  name: az kusto database remove-principal
-  summary: Remove Database principals permissions.
-- uid: ext_kusto_az_kusto_database_show
-  name: az kusto database show
-  summary: Returns a database.
-- uid: ext_kusto_az_kusto_database_update
-  name: az kusto database update
-  summary: Updates a database.
-- uid: ext_kusto_az_kusto_database_wait
-  name: az kusto database wait
-  summary: Wait for a managed Kusto database to reach a desired state.
-- uid: ext_kusto_az_kusto_database_principal_assignment
-  name: az kusto database-principal-assignment
-  summary: Kusto database-principal-assignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_create
-  name: az kusto database-principal-assignment create
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_delete
-  name: az kusto database-principal-assignment delete
-  summary: Deletes a Kusto principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_list
-  name: az kusto database-principal-assignment list
-  summary: Lists all Kusto cluster database principalAssignments.
-- uid: ext_kusto_az_kusto_database_principal_assignment_show
-  name: az kusto database-principal-assignment show
-  summary: Gets a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_update
-  name: az kusto database-principal-assignment update
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_wait
-  name: az kusto database-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kusto resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml
deleted file mode 100644
index a695702159..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml
+++ /dev/null
@@ -1,238 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_attached_database_configuration
-  name: az kusto attached-database-configuration
-  summary: Kusto attached-database-configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_attached_database_configuration_create
-  - ext_kusto_az_kusto_attached_database_configuration_delete
-  - ext_kusto_az_kusto_attached_database_configuration_list
-  - ext_kusto_az_kusto_attached_database_configuration_show
-  - ext_kusto_az_kusto_attached_database_configuration_update
-  - ext_kusto_az_kusto_attached_database_configuration_wait
-- uid: ext_kusto_az_kusto_attached_database_configuration_create
-  name: az kusto attached-database-configuration create
-  summary: Creates or updates an attached database configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsCreateOrUpdate
-    syntax:
-      content: az kusto attached-database-configuration create --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --location "westus" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader" --database-name "Kustodatabase8" --default-principals-modification-kind "Union" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cluster-resource-id
-    summary: The resource id of the cluster where the databases you would like to attach reside.
-    description: ''
-  - name: --database-name
-    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
-    description: ''
-  - name: --default-principals-modification-kind
-    parameterValueGroup: None, Replace, Union
-    summary: The default principals modification kind.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_delete
-  name: az kusto attached-database-configuration delete
-  summary: Deletes the attached database configuration with the given name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsDelete
-    syntax:
-      content: az kusto attached-database-configuration delete --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_list
-  name: az kusto attached-database-configuration list
-  summary: Returns the list of attached database configurations of the given Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoAttachedDatabaseConfigurationsListByCluster
-    syntax:
-      content: az kusto attached-database-configuration list --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_show
-  name: az kusto attached-database-configuration show
-  summary: Returns an attached database configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsGet
-    syntax:
-      content: az kusto attached-database-configuration show --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_update
-  name: az kusto attached-database-configuration update
-  summary: Creates or updates an attached database configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsCreateOrUpdate
-    syntax:
-      content: az kusto attached-database-configuration update --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --location "westus" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader" --database-name "Kustodatabase8" --default-principals-modification-kind "Union" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cluster-resource-id
-    summary: The resource id of the cluster where the databases you would like to attach reside.
-    description: ''
-  - name: --database-name
-    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
-    description: ''
-  - name: --default-principals-modification-kind
-    parameterValueGroup: None, Replace, Union
-    summary: The default principals modification kind.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_wait
-  name: az kusto attached-database-configuration wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_attached_database_configuration_create
-  name: az kusto attached-database-configuration create
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_delete
-  name: az kusto attached-database-configuration delete
-  summary: Deletes the attached database configuration with the given name.
-- uid: ext_kusto_az_kusto_attached_database_configuration_list
-  name: az kusto attached-database-configuration list
-  summary: Returns the list of attached database configurations of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_attached_database_configuration_show
-  name: az kusto attached-database-configuration show
-  summary: Returns an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_update
-  name: az kusto attached-database-configuration update
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_wait
-  name: az kusto attached-database-configuration wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto attached-database-configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml
deleted file mode 100644
index ad68c404cf..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml
+++ /dev/null
@@ -1,240 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_cluster_principal_assignment
-  name: az kusto cluster-principal-assignment
-  summary: Kusto cluster-principal-assignment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_cluster_principal_assignment_create
-  - ext_kusto_az_kusto_cluster_principal_assignment_delete
-  - ext_kusto_az_kusto_cluster_principal_assignment_list
-  - ext_kusto_az_kusto_cluster_principal_assignment_show
-  - ext_kusto_az_kusto_cluster_principal_assignment_update
-  - ext_kusto_az_kusto_cluster_principal_assignment_wait
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-  name: az kusto cluster-principal-assignment create
-  summary: Create a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto cluster-principal-assignment create --cluster-name "kustoclusterrptest4" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "AllDatabasesAdmin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
-    summary: Cluster principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-  name: az kusto cluster-principal-assignment delete
-  summary: Deletes a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsDelete
-    syntax:
-      content: az kusto cluster-principal-assignment delete --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-  name: az kusto cluster-principal-assignment list
-  summary: Lists all Kusto cluster principalAssignments.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoPrincipalAssignmentsList
-    syntax:
-      content: az kusto cluster-principal-assignment list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-  name: az kusto cluster-principal-assignment show
-  summary: Gets a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsGet
-    syntax:
-      content: az kusto cluster-principal-assignment show --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-  name: az kusto cluster-principal-assignment update
-  summary: Create a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto cluster-principal-assignment update --cluster-name "kustoclusterrptest4" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "AllDatabasesAdmin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
-    summary: Cluster principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-  name: az kusto cluster-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-  name: az kusto cluster-principal-assignment create
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-  name: az kusto cluster-principal-assignment delete
-  summary: Deletes a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-  name: az kusto cluster-principal-assignment list
-  summary: Lists all Kusto cluster principalAssignments.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-  name: az kusto cluster-principal-assignment show
-  summary: Gets a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-  name: az kusto cluster-principal-assignment update
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-  name: az kusto cluster-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto cluster-principal-assignment.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster.yml
deleted file mode 100644
index 466f1b9136..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/cluster.yml
+++ /dev/null
@@ -1,515 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_cluster
-  name: az kusto cluster
-  summary: Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_cluster_add_language_extension
-  - ext_kusto_az_kusto_cluster_create
-  - ext_kusto_az_kusto_cluster_delete
-  - ext_kusto_az_kusto_cluster_detach_follower_database
-  - ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  - ext_kusto_az_kusto_cluster_list
-  - ext_kusto_az_kusto_cluster_list_follower_database
-  - ext_kusto_az_kusto_cluster_list_language_extension
-  - ext_kusto_az_kusto_cluster_list_sku
-  - ext_kusto_az_kusto_cluster_remove_language_extension
-  - ext_kusto_az_kusto_cluster_show
-  - ext_kusto_az_kusto_cluster_start
-  - ext_kusto_az_kusto_cluster_stop
-  - ext_kusto_az_kusto_cluster_update
-  - ext_kusto_az_kusto_cluster_wait
-- uid: ext_kusto_az_kusto_cluster_add_language_extension
-  name: az kusto cluster add-language-extension
-  summary: Add a list of language extensions that can run within KQL queries.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterAddLanguageExtensions
-    syntax:
-      content: az kusto cluster add-language-extension --cluster-name "KustoClusterRPTest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_create
-  name: az kusto cluster create
-  summary: Create or update a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersCreateOrUpdate
-    syntax:
-      content: az kusto cluster create --cluster-name "KustoClusterRPTest4" --identity-type "SystemAssigned" --location "westus" --enable-purge true --enable-streaming-ingest true --key-vault-properties key-name="" key-vault-uri="" key-version="" --sku name="Standard_L8s" capacity=2 tier="Standard" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    summary: 'The SKU of the cluster. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: name, capacity, tier.'
-    description: ''
-  - name: --enable-disk-encryption
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the cluster's disks are encrypted.
-    description: ''
-  - name: --enable-purge
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the purge operations are enabled.
-    description: ''
-  - name: --enable-streaming-ingest
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the streaming ingest is enabled.
-    description: ''
-  - name: --identity-type
-    parameterValueGroup: None, SystemAssigned
-    summary: The identity type.
-    description: ''
-  - name: --identity-user-assigned-identities
-    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
-    description: ''
-  - name: --key-vault-properties
-    summary: 'KeyVault properties for the cluster encryption. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: key-name, key-version, key-vault-uri.'
-    description: ''
-  - name: --language-extensions-value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --optimized-autoscale
-    summary: 'Optimized auto scale definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: version, is-enabled, minimum, maximum.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --trusted-external-tenants
-    summary: "The cluster's external tenants. Expect value: value=xx."
-    description: ''
-  - name: --virtual-network-configuration
-    summary: 'Virtual network definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: subnet-id, engine-public-ip-id, data-management-public-ip-id.'
-    description: ''
-  - name: --zones
-    summary: 'The availability zones of the cluster. Expected value: json-string/@json-file.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_delete
-  name: az kusto cluster delete
-  summary: Deletes a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersDelete
-    syntax:
-      content: az kusto cluster delete --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_detach_follower_database
-  name: az kusto cluster detach-follower-database
-  summary: Detaches all followers of a database owned by this cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterDetachFollowerDatabases
-    syntax:
-      content: az kusto cluster detach-follower-database --cluster-name "KustoClusterRPTest4" --attached-database-configuration-name "myAttachedDatabaseConfiguration" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/clusters/leader4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: Resource name of the attached database configuration in the follower cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-resource-id
-    summary: Resource id of the cluster that follows a database owned by this cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  name: az kusto cluster diagnose-virtual-network
-  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterDiagnoseVirtualNetwork
-    syntax:
-      content: az kusto cluster diagnose-virtual-network --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list
-  name: az kusto cluster list
-  summary: Lists all Kusto clusters within a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersListByResourceGroup
-    syntax:
-      content: az kusto cluster list --resource-group "kustorptest"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list_follower_database
-  name: az kusto cluster list-follower-database
-  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterListFollowerDatabases
-    syntax:
-      content: az kusto cluster list-follower-database --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list_language_extension
-  name: az kusto cluster list-language-extension
-  summary: Returns a list of language extensions that can run within KQL queries.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterListLanguageExtensions
-    syntax:
-      content: az kusto cluster list-language-extension --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list_sku
-  name: az kusto cluster list-sku
-  summary: Lists eligible SKUs for Kusto resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersListResourceSkus
-    syntax:
-      content: az kusto cluster list-sku --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_remove_language_extension
-  name: az kusto cluster remove-language-extension
-  summary: Remove a list of language extensions that can run within KQL queries.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterRemoveLanguageExtensions
-    syntax:
-      content: az kusto cluster remove-language-extension --cluster-name "KustoClusterRPTest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_show
-  name: az kusto cluster show
-  summary: Gets a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersGet
-    syntax:
-      content: az kusto cluster show --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_start
-  name: az kusto cluster start
-  summary: Starts a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersStart
-    syntax:
-      content: az kusto cluster start --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_stop
-  name: az kusto cluster stop
-  summary: Stops a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersStop
-    syntax:
-      content: az kusto cluster stop --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_update
-  name: az kusto cluster update
-  summary: Update a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersUpdate
-    syntax:
-      content: az kusto cluster update --cluster-name "KustoClusterRPTest4" --identity-type "SystemAssigned" --location "westus" --enable-purge true --enable-streaming-ingest true --key-vault-properties key-name="keyName" key-vault-uri="https://dummy.keyvault.com" key-version="keyVersion" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enable-disk-encryption
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the cluster's disks are encrypted.
-    description: ''
-  - name: --enable-purge
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the purge operations are enabled.
-    description: ''
-  - name: --enable-streaming-ingest
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the streaming ingest is enabled.
-    description: ''
-  - name: --identity-type
-    parameterValueGroup: None, SystemAssigned
-    summary: The identity type.
-    description: ''
-  - name: --identity-user-assigned-identities
-    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
-    description: ''
-  - name: --key-vault-properties
-    summary: 'KeyVault properties for the cluster encryption. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: key-name, key-version, key-vault-uri.'
-    description: ''
-  - name: --language-extensions-value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --optimized-autoscale
-    summary: 'Optimized auto scale definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: version, is-enabled, minimum, maximum.'
-    description: ''
-  - name: --sku
-    summary: 'The SKU of the cluster. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: name, capacity, tier.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --trusted-external-tenants
-    summary: "The cluster's external tenants. Expect value: value=xx."
-    description: ''
-  - name: --virtual-network-configuration
-    summary: 'Virtual network definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: subnet-id, engine-public-ip-id, data-management-public-ip-id.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_wait
-  name: az kusto cluster wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_cluster_add_language_extension
-  name: az kusto cluster add-language-extension
-  summary: Add a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_create
-  name: az kusto cluster create
-  summary: Create or update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_delete
-  name: az kusto cluster delete
-  summary: Deletes a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_detach_follower_database
-  name: az kusto cluster detach-follower-database
-  summary: Detaches all followers of a database owned by this cluster.
-- uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  name: az kusto cluster diagnose-virtual-network
-  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
-- uid: ext_kusto_az_kusto_cluster_list
-  name: az kusto cluster list
-  summary: Lists all Kusto clusters within a subscription.
-- uid: ext_kusto_az_kusto_cluster_list_follower_database
-  name: az kusto cluster list-follower-database
-  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
-- uid: ext_kusto_az_kusto_cluster_list_language_extension
-  name: az kusto cluster list-language-extension
-  summary: Returns a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_list_sku
-  name: az kusto cluster list-sku
-  summary: Lists eligible SKUs for Kusto resource provider.
-- uid: ext_kusto_az_kusto_cluster_remove_language_extension
-  name: az kusto cluster remove-language-extension
-  summary: Remove a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_show
-  name: az kusto cluster show
-  summary: Gets a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_start
-  name: az kusto cluster start
-  summary: Starts a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_stop
-  name: az kusto cluster stop
-  summary: Stops a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_update
-  name: az kusto cluster update
-  summary: Update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_wait
-  name: az kusto cluster wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection.yml
deleted file mode 100644
index 6eac67a309..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection
-  name: az kusto data-connection
-  summary: Kusto data-connection.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_delete
-  - ext_kusto_az_kusto_data_connection_list
-  - ext_kusto_az_kusto_data_connection_show
-  - ext_kusto_az_kusto_data_connection_wait
-- uid: ext_kusto_az_kusto_data_connection_delete
-  name: az kusto data-connection delete
-  summary: Deletes the data connection with the given name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsDelete
-    syntax:
-      content: az kusto data-connection delete --cluster-name "KustoClusterRPTest4" --data-connection-name "kustoeventhubconnection1" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_list
-  name: az kusto data-connection list
-  summary: Returns the list of data connections of the given Kusto database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesListByCluster
-    syntax:
-      content: az kusto data-connection list --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_show
-  name: az kusto data-connection show
-  summary: Returns a data connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsGet
-    syntax:
-      content: az kusto data-connection show --cluster-name "KustoClusterRPTest4" --data-connection-name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_wait
-  name: az kusto data-connection wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_delete
-  name: az kusto data-connection delete
-  summary: Deletes the data connection with the given name.
-- uid: ext_kusto_az_kusto_data_connection_event_grid
-  name: az kusto data-connection event-grid
-  summary: Kusto data-connection sub group event-grid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub
-  name: az kusto data-connection event-hub
-  summary: Kusto data-connection sub group event-hub.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub
-  name: az kusto data-connection iot-hub
-  summary: Kusto data-connection sub group iot-hub.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_list
-  name: az kusto data-connection list
-  summary: Returns the list of data connections of the given Kusto database.
-- uid: ext_kusto_az_kusto_data_connection_show
-  name: az kusto data-connection show
-  summary: Returns a data connection.
-- uid: ext_kusto_az_kusto_data_connection_wait
-  name: az kusto data-connection wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml
deleted file mode 100644
index f6ecf0cc67..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection_event_grid
-  name: az kusto data-connection event-grid
-  summary: Kusto data-connection sub group event-grid.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_event_grid_create
-  - ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  - ext_kusto_az_kusto_data_connection_event_grid_update
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID where the event grid is configured to send events.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --storage-account-resource-id
-    summary: The resource ID of the storage account where the data resides.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID where the event grid is configured to send events.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --storage-account-resource-id
-    summary: The resource ID of the storage account where the data resides.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID where the event grid is configured to send events.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --storage-account-resource-id
-    summary: The resource ID of the storage account where the data resides.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection sub group event-grid.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml
deleted file mode 100644
index ec1cc8dc9d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml
+++ /dev/null
@@ -1,202 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection_event_hub
-  name: az kusto data-connection event-hub
-  summary: Kusto data-connection sub group event-hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_event_hub_create
-  - ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  - ext_kusto_az_kusto_data_connection_event_hub_update
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsCreateOrUpdate
-    syntax:
-      content: az kusto data-connection event-hub create --cluster-name "KustoClusterRPTest4" --data-connection-name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compression
-    parameterValueGroup: GZip, None
-    summary: The event hub messages compression type.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID of the event hub to be used to create a data connection.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the event hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionValidation
-    syntax:
-      content: az kusto data-connection event-hub data-connection-validation --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --data-connection-name "DataConnections8" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compression
-    parameterValueGroup: GZip, None
-    summary: The event hub messages compression type.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID of the event hub to be used to create a data connection.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the event hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsUpdate
-    syntax:
-      content: az kusto data-connection event-hub update --cluster-name "KustoClusterRPTest4" --data-connection-name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compression
-    parameterValueGroup: GZip, None
-    summary: The event hub messages compression type.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID of the event hub to be used to create a data connection.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the event hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection sub group event-hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml
deleted file mode 100644
index 9e1fa23ae6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection_iot_hub
-  name: az kusto data-connection iot-hub
-  summary: Kusto data-connection sub group iot-hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_iot_hub_create
-  - ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  - ext_kusto_az_kusto_data_connection_iot_hub_update
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The iot hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the iot hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --iot-hub-resource-id
-    summary: The resource ID of the Iot hub to be used to create a data connection.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --shared-access-policy-name
-    summary: The name of the share access policy.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The iot hub consumer group.
-    description: ''
-  - name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the iot hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --iot-hub-resource-id
-    summary: The resource ID of the Iot hub to be used to create a data connection.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --shared-access-policy-name
-    summary: The name of the share access policy.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The iot hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the iot hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --iot-hub-resource-id
-    summary: The resource ID of the Iot hub to be used to create a data connection.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --shared-access-policy-name
-    summary: The name of the share access policy.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection sub group iot-hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml
deleted file mode 100644
index d4f58779cd..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml
+++ /dev/null
@@ -1,264 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_database_principal_assignment
-  name: az kusto database-principal-assignment
-  summary: Kusto database-principal-assignment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_database_principal_assignment_create
-  - ext_kusto_az_kusto_database_principal_assignment_delete
-  - ext_kusto_az_kusto_database_principal_assignment_list
-  - ext_kusto_az_kusto_database_principal_assignment_show
-  - ext_kusto_az_kusto_database_principal_assignment_update
-  - ext_kusto_az_kusto_database_principal_assignment_wait
-- uid: ext_kusto_az_kusto_database_principal_assignment_create
-  name: az kusto database-principal-assignment create
-  summary: Creates a Kusto cluster database principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto database-principal-assignment create --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "Admin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewers, User, Viewer
-    summary: Database principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_delete
-  name: az kusto database-principal-assignment delete
-  summary: Deletes a Kusto principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsDelete
-    syntax:
-      content: az kusto database-principal-assignment delete --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_list
-  name: az kusto database-principal-assignment list
-  summary: Lists all Kusto cluster database principalAssignments.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoPrincipalAssignmentsList
-    syntax:
-      content: az kusto database-principal-assignment list --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_show
-  name: az kusto database-principal-assignment show
-  summary: Gets a Kusto cluster database principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsGet
-    syntax:
-      content: az kusto database-principal-assignment show --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_update
-  name: az kusto database-principal-assignment update
-  summary: Creates a Kusto cluster database principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto database-principal-assignment update --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "Admin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewers, User, Viewer
-    summary: Database principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_wait
-  name: az kusto database-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_database_principal_assignment_create
-  name: az kusto database-principal-assignment create
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_delete
-  name: az kusto database-principal-assignment delete
-  summary: Deletes a Kusto principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_list
-  name: az kusto database-principal-assignment list
-  summary: Lists all Kusto cluster database principalAssignments.
-- uid: ext_kusto_az_kusto_database_principal_assignment_show
-  name: az kusto database-principal-assignment show
-  summary: Gets a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_update
-  name: az kusto database-principal-assignment update
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_wait
-  name: az kusto database-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto database-principal-assignment.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database.yml b/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database.yml
deleted file mode 100644
index 5b06a73295..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/kusto/kusto/database.yml
+++ /dev/null
@@ -1,311 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_database
-  name: az kusto database
-  summary: Kusto database.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_database_add_principal
-  - ext_kusto_az_kusto_database_create
-  - ext_kusto_az_kusto_database_delete
-  - ext_kusto_az_kusto_database_list
-  - ext_kusto_az_kusto_database_list_principal
-  - ext_kusto_az_kusto_database_remove_principal
-  - ext_kusto_az_kusto_database_show
-  - ext_kusto_az_kusto_database_update
-  - ext_kusto_az_kusto_database_wait
-- uid: ext_kusto_az_kusto_database_add_principal
-  name: az kusto database add-principal
-  summary: Add Database principals permissions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabaseAddPrincipals
-    syntax:
-      content: az kusto database add-principal --cluster-name "KustoClusterRPTest4" --database-name "databaseName1" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --value
-    summary: 'The list of Kusto database principals. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: role, name, type, fqn, email, app-id.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_create
-  name: az kusto database create
-  summary: Creates or updates a database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesCreateOrUpdate
-    syntax:
-      content: az kusto database create --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --read-write-database location="westus" soft-delete-period="P1D" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --read-only-following-database
-    summary: 'Class representing a read only following database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: hot-cache-period, location.'
-    description: ''
-  - name: --read-write-database
-    summary: 'Class representing a read write database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: soft-delete-period, hot-cache-period, location.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_delete
-  name: az kusto database delete
-  summary: Deletes the database with the given name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesDelete
-    syntax:
-      content: az kusto database delete --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_database_list
-  name: az kusto database list
-  summary: Returns the list of databases of the given Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesListByCluster
-    syntax:
-      content: az kusto database list --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_list_principal
-  name: az kusto database list-principal
-  summary: Returns a list of database principals of the given Kusto cluster and database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabaseListPrincipals
-    syntax:
-      content: az kusto database list-principal --cluster-name "KustoClusterRPTest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_remove_principal
-  name: az kusto database remove-principal
-  summary: Remove Database principals permissions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabaseRemovePrincipals
-    syntax:
-      content: az kusto database remove-principal --cluster-name "KustoClusterRPTest4" --database-name "databaseName1" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --value
-    summary: 'The list of Kusto database principals. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: role, name, type, fqn, email, app-id.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_show
-  name: az kusto database show
-  summary: Returns a database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesGet
-    syntax:
-      content: az kusto database show --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_update
-  name: az kusto database update
-  summary: Updates a database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesUpdate
-    syntax:
-      content: az kusto database update --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --read-write-database soft-delete-period="P1D" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --read-only-following-database
-    summary: 'Class representing a read only following database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: hot-cache-period, location.'
-    description: ''
-  - name: --read-write-database
-    summary: 'Class representing a read write database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: soft-delete-period, hot-cache-period, location.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_wait
-  name: az kusto database wait
-  summary: Wait for a managed Kusto database to reach a desired state.
-  description: If an operation on a database was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_database_add_principal
-  name: az kusto database add-principal
-  summary: Add Database principals permissions.
-- uid: ext_kusto_az_kusto_database_create
-  name: az kusto database create
-  summary: Creates or updates a database.
-- uid: ext_kusto_az_kusto_database_delete
-  name: az kusto database delete
-  summary: Deletes the database with the given name.
-- uid: ext_kusto_az_kusto_database_list
-  name: az kusto database list
-  summary: Returns the list of databases of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_database_list_principal
-  name: az kusto database list-principal
-  summary: Returns a list of database principals of the given Kusto cluster and database.
-- uid: ext_kusto_az_kusto_database_remove_principal
-  name: az kusto database remove-principal
-  summary: Remove Database principals permissions.
-- uid: ext_kusto_az_kusto_database_show
-  name: az kusto database show
-  summary: Returns a database.
-- uid: ext_kusto_az_kusto_database_update
-  name: az kusto database update
-  summary: Updates a database.
-- uid: ext_kusto_az_kusto_database_wait
-  name: az kusto database wait
-  summary: Wait for a managed Kusto database to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto database.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/index.yml
deleted file mode 100644
index f427a7860e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az
-  name: log-analytics-solution
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics-solution_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor.yml
deleted file mode 100644
index 93bcdbbec2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Manage Azure log analytics.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-  name: az monitor log-analytics solution
-  summary: Commands to manage monitor log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml
deleted file mode 100644
index 525211f569..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Manage Azure log analytics.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-  name: az monitor log-analytics solution
-  summary: Commands to manage monitor log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure log analytics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml
deleted file mode 100644
index d4f1862a24..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml
+++ /dev/null
@@ -1,184 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-  name: az monitor log-analytics solution
-  summary: Commands to manage monitor log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a log-analytics solution for the plan product of OMSGallery/Containers
-    syntax:
-      content: >-
-        az monitor log-analytics solution create --resource-group MyResourceGroup \
-
-        --name Containers({SolutionName}) --tags key=value \
-
-        --plan-publisher Microsoft --plan-product "OMSGallery/Containers" \
-
-        --workspace "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
-
-        Microsoft.OperationalInsights/workspaces/{WorkspaceName}"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --plan-product
-    summary: Product name of the plan for solution. For Microsoft published gallery solution it should be in the format of OMSGallery/<solutionType>. This is case sensitive.
-    description: ''
-  - isRequired: true
-    name: --plan-publisher
-    summary: Publisher name of the plan for solution. For gallery solution, it is Microsoft.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace -w
-    summary: The name or resource ID of the log analytics workspace with which the solution will be linked.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a log-analytics solution
-    syntax:
-      content: az monitor log-analytics solution delete --resource-group MyResourceGroup --name SolutionName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all log-analytics solutions in the current subscription
-    syntax:
-      content: az monitor log-analytics solution list
-  - summary: List all log-analytics solutions in a subscription
-    syntax:
-      content: az monitor log-analytics solution list --subscription MySubscription
-  - summary: List all log-analytics solutions in a resource group
-    syntax:
-      content: az monitor log-analytics solution list --resource-group MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a log-analytics solution
-    syntax:
-      content: az monitor log-analytics solution show --resource-group MyResourceGroup --name SolutionName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a log-analytics solution
-    syntax:
-      content: >-
-        az monitor log-analytics solution update --resource-group MyResourceGroup \
-
-        --name SolutionName --tags key=value
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage monitor log-analytics solution.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/index.yml
deleted file mode 100644
index 360022778e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics_az
-  name: log-analytics
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor.yml
deleted file mode 100644
index 6a9c278e09..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Commands for querying data in Log Analytics workspaces.
-- uid: ext_log-analytics_az_monitor_log_analytics_query
-  name: az monitor log-analytics query
-  summary: Query a Log Analytics workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml b/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml
deleted file mode 100644
index 37b5a2e5fe..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Commands for querying data in Log Analytics workspaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_log-analytics_az_monitor_log_analytics_query
-- uid: ext_log-analytics_az_monitor_log_analytics_query
-  name: az monitor log-analytics query
-  summary: Query a Log Analytics workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a simple query over past 3.5 days.
-    syntax:
-      content: az monitor log-analytics query -w b8317023-66e4-4edc-8a5b-7c002b22f92f --analytics-query "AzureActivity | summarize count() by bin(timestamp, 1h)" -t P3DT12H
-  parameters:
-  - isRequired: true
-    name: --analytics-query
-    summary: Query to execute over Log Analytics data.
-    description: ''
-  - isRequired: true
-    name: --workspace -w
-    summary: GUID of the Log Analytics Workspace.
-    description: ''
-  - name: --timespan -t
-    summary: Timespan over which to query. Defaults to querying all available data.
-    description: ''
-  - name: --workspaces
-    summary: Additional workspaces to union data for querying. Specify additional workspace IDs separated by space.
-    description: ''
-commands:
-- uid: ext_log-analytics_az_monitor_log_analytics_query
-  name: az monitor log-analytics query
-  summary: Query a Log Analytics workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for querying data in Log Analytics workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/logic/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/logic/index.yml
deleted file mode 100644
index bf9370d00c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/logic/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az
-  name: logic
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_logic_az_logic
-  name: az logic
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/logic/logic.yml b/2017-03-09-profile/docs-ref-autogen/ext/logic/logic.yml
deleted file mode 100644
index d34521e756..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/logic/logic.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az_logic
-  name: az logic
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_logic_az_logic_integration_account
-  name: az logic integration-account
-  summary: Logic integration-account.
-- uid: ext_logic_az_logic_integration_account_create
-  name: az logic integration-account create
-  summary: Creates or updates an integration account.
-- uid: ext_logic_az_logic_integration_account_delete
-  name: az logic integration-account delete
-  summary: Deletes an integration account.
-- uid: ext_logic_az_logic_integration_account_import
-  name: az logic integration-account import
-  summary: Import an integration account from a JSON file.
-- uid: ext_logic_az_logic_integration_account_list
-  name: az logic integration-account list
-  summary: Gets a list of integration accounts by subscription.
-- uid: ext_logic_az_logic_integration_account_show
-  name: az logic integration-account show
-  summary: Gets an integration account.
-- uid: ext_logic_az_logic_integration_account_update
-  name: az logic integration-account update
-  summary: Updates an integration account.
-- uid: ext_logic_az_logic_workflow
-  name: az logic workflow
-  summary: Logic workflow.
-- uid: ext_logic_az_logic_workflow_create
-  name: az logic workflow create
-  summary: Creates or updates a workflow using a JSON file for the defintion.
-- uid: ext_logic_az_logic_workflow_delete
-  name: az logic workflow delete
-  summary: Deletes a workflow.
-- uid: ext_logic_az_logic_workflow_list
-  name: az logic workflow list
-  summary: Gets a list of workflows by subscription.
-- uid: ext_logic_az_logic_workflow_show
-  name: az logic workflow show
-  summary: Gets a workflow.
-- uid: ext_logic_az_logic_workflow_update
-  name: az logic workflow update
-  summary: Updates a workflow.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/logic/logic/integration-account.yml b/2017-03-09-profile/docs-ref-autogen/ext/logic/logic/integration-account.yml
deleted file mode 100644
index f03998cb74..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/logic/logic/integration-account.yml
+++ /dev/null
@@ -1,207 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az_logic_integration_account
-  name: az logic integration-account
-  summary: Logic integration-account.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_logic_az_logic_integration_account_create
-  - ext_logic_az_logic_integration_account_delete
-  - ext_logic_az_logic_integration_account_import
-  - ext_logic_az_logic_integration_account_list
-  - ext_logic_az_logic_integration_account_show
-  - ext_logic_az_logic_integration_account_update
-- uid: ext_logic_az_logic_integration_account_create
-  name: az logic integration-account create
-  summary: Creates or updates an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update an integration account
-    syntax:
-      content: az logic integration-account create --location "centralus" --sku name=Standard --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --integration-service-environment
-    summary: The integration service environment. See README.md For more information.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku
-    summary: The integration account sku.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The workflow state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_delete
-  name: az logic integration-account delete
-  summary: Deletes an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an integration account
-    syntax:
-      content: az logic integration-account delete --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_import
-  name: az logic integration-account import
-  summary: Import an integration account from a JSON file.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import an integration account.
-    syntax:
-      content: az logic integration-account import --name "test_integration_account" --resource-group "test_resource_group" --input-path "integration.json"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: Path to a intergration-account JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku
-    summary: The integration account sku.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_list
-  name: az logic integration-account list
-  summary: Gets a list of integration accounts by subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List integration accounts by resource group name
-    syntax:
-      content: az logic integration-account list --resource-group "test_resource_group"
-  parameters:
-  - name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --top
-    summary: The number of items to be included in the result.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_show
-  name: az logic integration-account show
-  summary: Gets an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get integration account by name
-    syntax:
-      content: az logic integration-account show --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_update
-  name: az logic integration-account update
-  summary: Updates an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch an integration account
-    syntax:
-      content: az logic integration-account update --sku name=Basic --tag atag=123 --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --integration-service-environment
-    summary: The integration service environment. See README.md For more information.
-    description: ''
-  - name: --sku
-    summary: The integration account sku.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The workflow state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-commands:
-- uid: ext_logic_az_logic_integration_account_create
-  name: az logic integration-account create
-  summary: Creates or updates an integration account.
-- uid: ext_logic_az_logic_integration_account_delete
-  name: az logic integration-account delete
-  summary: Deletes an integration account.
-- uid: ext_logic_az_logic_integration_account_import
-  name: az logic integration-account import
-  summary: Import an integration account from a JSON file.
-- uid: ext_logic_az_logic_integration_account_list
-  name: az logic integration-account list
-  summary: Gets a list of integration accounts by subscription.
-- uid: ext_logic_az_logic_integration_account_show
-  name: az logic integration-account show
-  summary: Gets an integration account.
-- uid: ext_logic_az_logic_integration_account_update
-  name: az logic integration-account update
-  summary: Updates an integration account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Logic integration-account.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/logic/logic/workflow.yml b/2017-03-09-profile/docs-ref-autogen/ext/logic/logic/workflow.yml
deleted file mode 100644
index 90020ddbd6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/logic/logic/workflow.yml
+++ /dev/null
@@ -1,186 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az_logic_workflow
-  name: az logic workflow
-  summary: Logic workflow.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_logic_az_logic_workflow_create
-  - ext_logic_az_logic_workflow_delete
-  - ext_logic_az_logic_workflow_list
-  - ext_logic_az_logic_workflow_show
-  - ext_logic_az_logic_workflow_update
-- uid: ext_logic_az_logic_workflow_create
-  name: az logic workflow create
-  summary: Creates or updates a workflow using a JSON file for the defintion.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a workflow
-    syntax:
-      content: az logic workflow create --resource-group "test_resource_group" --location "centralus" --name "test_workflow" --definition "workflow.json"
-  parameters:
-  - isRequired: true
-    name: --definition
-    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --access-control
-    summary: The access control configuration controls access to this workflow. See README.md for more information.
-    description: ''
-  - name: --endpoints-configuration
-    summary: The endpoints configuration.
-    description: ''
-  - name: --integration-account
-    summary: The integration account.
-    description: ''
-  - name: --integration-service-environment
-    summary: The integration service environment. See README.md For more information.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-- uid: ext_logic_az_logic_workflow_delete
-  name: az logic workflow delete
-  summary: Deletes a workflow.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a workflow
-    syntax:
-      content: az logic workflow delete --resource-group "test_resource_group" --name "test_workflow"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_logic_az_logic_workflow_list
-  name: az logic workflow list
-  summary: Gets a list of workflows by subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all workflows in a resource group
-    syntax:
-      content: az logic workflow list --resource-group "test_resource_group"
-  - summary: List all workflows in a subscription
-    syntax:
-      content: az logic workflow list
-  parameters:
-  - name: --filter
-    summary: 'The filter to apply on the operation. Options for filters include: State, Trigger, and ReferencedResourceId.'
-    description: ''
-  - name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --top
-    summary: The number of items to be included in the result.
-    description: ''
-- uid: ext_logic_az_logic_workflow_show
-  name: az logic workflow show
-  summary: Gets a workflow.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a workflow
-    syntax:
-      content: az logic workflow show --resource-group "test_resource_group" --name "test_workflow"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-- uid: ext_logic_az_logic_workflow_update
-  name: az logic workflow update
-  summary: Updates a workflow.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch a workflow
-    syntax:
-      content: az logic workflow update --resource-group "test_resource_group" --definition workflow.json --name "test_workflow"
-  parameters:
-  - isRequired: true
-    name: --definition
-    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-commands:
-- uid: ext_logic_az_logic_workflow_create
-  name: az logic workflow create
-  summary: Creates or updates a workflow using a JSON file for the defintion.
-- uid: ext_logic_az_logic_workflow_delete
-  name: az logic workflow delete
-  summary: Deletes a workflow.
-- uid: ext_logic_az_logic_workflow_list
-  name: az logic workflow list
-  summary: Gets a list of workflows by subscription.
-- uid: ext_logic_az_logic_workflow_show
-  name: az logic workflow show
-  summary: Gets a workflow.
-- uid: ext_logic_az_logic_workflow_update
-  name: az logic workflow update
-  summary: Updates a workflow.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Logic workflow.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/maintenance/index.yml
deleted file mode 100644
index 155d554d76..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az
-  name: maintenance
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_maintenance_az_maintenance
-  name: az maintenance
-  summary: Manage Azure Maintenance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance.yml b/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance.yml
deleted file mode 100644
index 68c3bbe7b0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance
-  name: az maintenance
-  summary: Manage Azure Maintenance.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_maintenance_az_maintenance_applyupdate
-  name: az maintenance applyupdate
-  summary: Manage Azure Maintenance update applications.
-- uid: ext_maintenance_az_maintenance_applyupdate_create
-  name: az maintenance applyupdate create
-  summary: Creates a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_get
-  name: az maintenance applyupdate get
-  summary: Gets the state of a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_show
-  name: az maintenance applyupdate show
-  summary: Shows the state of a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_assignment
-  name: az maintenance assignment
-  summary: Manage Azure Maintenance configuration assignment to resource.
-- uid: ext_maintenance_az_maintenance_assignment_create
-  name: az maintenance assignment create
-  summary: Creates a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_delete
-  name: az maintenance assignment delete
-  summary: Delete a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_list
-  name: az maintenance assignment list
-  summary: Lists Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_configuration
-  name: az maintenance configuration
-  summary: Manage Azure Maintenance configurations.
-- uid: ext_maintenance_az_maintenance_configuration_create
-  name: az maintenance configuration create
-  summary: Creates a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_delete
-  name: az maintenance configuration delete
-  summary: Deletes a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_list
-  name: az maintenance configuration list
-  summary: Get Configuration records within a subscription.
-- uid: ext_maintenance_az_maintenance_configuration_show
-  name: az maintenance configuration show
-  summary: Get the details of a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_update
-  name: az maintenance configuration update
-  summary: Creates a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_update
-  name: az maintenance update
-  summary: Azure Maintenance updates.
-- uid: ext_maintenance_az_maintenance_update_list
-  name: az maintenance update list
-  summary: List pending a Maintenance Updates.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml b/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml
deleted file mode 100644
index abb0e4df6f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_applyupdate
-  name: az maintenance applyupdate
-  summary: Manage Azure Maintenance update applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_applyupdate_create
-  - ext_maintenance_az_maintenance_applyupdate_get
-  - ext_maintenance_az_maintenance_applyupdate_show
-- uid: ext_maintenance_az_maintenance_applyupdate_create
-  name: az maintenance applyupdate create
-  summary: Creates a ApplyUpdate request.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creates a ApplyUpdate request.
-    syntax:
-      content: az maintenance applyupdate create -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute
-  parameters:
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_applyupdate_get
-  name: az maintenance applyupdate get
-  summary: Gets the state of a ApplyUpdate request.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets the state of a ApplyUpdate request.
-    syntax:
-      content: az maintenance applyupdate get -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --apply-update-name 7b1b66dc-e93a-4183-81ff-591f1b2d4f07
-  parameters:
-  - isRequired: true
-    name: --apply-update-name
-    summary: Name of apply update resource e.g. default.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_applyupdate_show
-  name: az maintenance applyupdate show
-  summary: Shows the state of a ApplyUpdate request.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Shows the state of a ApplyUpdate request.
-    syntax:
-      content: az maintenance applyupdate show -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --apply-update-name 7b1b66dc-e93a-4183-81ff-591f1b2d4f07
-  parameters:
-  - isRequired: true
-    name: --apply-update-name
-    summary: Name of apply update resource e.g. default.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_applyupdate_create
-  name: az maintenance applyupdate create
-  summary: Creates a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_get
-  name: az maintenance applyupdate get
-  summary: Gets the state of a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_show
-  name: az maintenance applyupdate show
-  summary: Shows the state of a ApplyUpdate request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance update applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml b/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml
deleted file mode 100644
index e16112e4e0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_assignment
-  name: az maintenance assignment
-  summary: Manage Azure Maintenance configuration assignment to resource.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_assignment_create
-  - ext_maintenance_az_maintenance_assignment_delete
-  - ext_maintenance_az_maintenance_assignment_list
-- uid: ext_maintenance_az_maintenance_assignment_create
-  name: az maintenance assignment create
-  summary: Creates a Maintenance Assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Maintenance Assignment.
-    syntax:
-      content: az maintenance assignment create -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --configuration-assignment-name workervms --maintenance-configuration-id "/subscriptions/2b4ce620-bb0f-4964-8428-dea4aefec295/resourcegroups/smdtest/providers/Microsoft.Maintenance/maintenanceConfigurations/workervms" -l eastus2
-  parameters:
-  - isRequired: true
-    name: --configuration-assignment-name
-    summary: Configuration assignment name. Same as the configuration name.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --maintenance-configuration-id
-    summary: Fully qualified id of the maintenance configuration e.g. /subscriptions/2b4ce620-bb0f-4964-8428-dea4aefec295/resourceGroups/smdtest/providers/Microsoft.Maintenance/maintenanceConfigurations/config1.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-id
-    summary: Fully qualified identifier of the Azure resource.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_assignment_delete
-  name: az maintenance assignment delete
-  summary: Delete a Maintenance Assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Maintenance Assignment.
-    syntax:
-      content: az maintenance assignment delete -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --configuration-assignment-name workervms
-  parameters:
-  - isRequired: true
-    name: --configuration-assignment-name
-    summary: Configuration assignment name. Same as the configuration name.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_assignment_list
-  name: az maintenance assignment list
-  summary: Lists Maintenance Assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Maintenance Assignment.
-    syntax:
-      content: az maintenance assignment list -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute
-  parameters:
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_assignment_create
-  name: az maintenance assignment create
-  summary: Creates a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_delete
-  name: az maintenance assignment delete
-  summary: Delete a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_list
-  name: az maintenance assignment list
-  summary: Lists Maintenance Assignment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance configuration assignment to resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml b/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml
deleted file mode 100644
index c6a7c5fa89..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_configuration
-  name: az maintenance configuration
-  summary: Manage Azure Maintenance configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_configuration_create
-  - ext_maintenance_az_maintenance_configuration_delete
-  - ext_maintenance_az_maintenance_configuration_list
-  - ext_maintenance_az_maintenance_configuration_show
-  - ext_maintenance_az_maintenance_configuration_update
-- uid: ext_maintenance_az_maintenance_configuration_create
-  name: az maintenance configuration create
-  summary: Creates a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Maintenance Configuration with the All scope.
-    syntax:
-      content: az maintenance configuration create --name workervms -g MyResourceGroup -l westus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --maintenanceScope
-    defaultValue: All
-    summary: Maintenance Scope e.g. Host, Guest or All.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_maintenance_az_maintenance_configuration_delete
-  name: az maintenance configuration delete
-  summary: Deletes a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Maintenance Configuration.
-    syntax:
-      content: az maintenance configuration delete --name workervms -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_maintenance_az_maintenance_configuration_list
-  name: az maintenance configuration list
-  summary: Get Configuration records within a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get Configuration records within a subscription.
-    syntax:
-      content: az maintenance configuration list --subscription 2b4ce620-bb0f-4964-8428-dea4aefe00000
-  parameters: []
-- uid: ext_maintenance_az_maintenance_configuration_show
-  name: az maintenance configuration show
-  summary: Get the details of a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the Maintenance Configuration.
-    syntax:
-      content: az maintenance configuration show --name workervms -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_maintenance_az_maintenance_configuration_update
-  name: az maintenance configuration update
-  summary: Creates a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Maintenance Configuration with the All scope.
-    syntax:
-      content: az maintenance configuration update --name workervms -g MyResourceGroup -l westus --maintenanceScope All
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --maintenanceScope
-    defaultValue: All
-    summary: Maintenance Scope e.g. Host, Guest or All.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_configuration_create
-  name: az maintenance configuration create
-  summary: Creates a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_delete
-  name: az maintenance configuration delete
-  summary: Deletes a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_list
-  name: az maintenance configuration list
-  summary: Get Configuration records within a subscription.
-- uid: ext_maintenance_az_maintenance_configuration_show
-  name: az maintenance configuration show
-  summary: Get the details of a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_update
-  name: az maintenance configuration update
-  summary: Creates a Maintenance Configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/update.yml b/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/update.yml
deleted file mode 100644
index 00e8f1bb38..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/maintenance/maintenance/update.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_update
-  name: az maintenance update
-  summary: Azure Maintenance updates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_update_list
-- uid: ext_maintenance_az_maintenance_update_list
-  name: az maintenance update list
-  summary: List pending a Maintenance Updates.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List pending a Maintenance Updates.
-    syntax:
-      content: az maintenance update list -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute
-  parameters:
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_update_list
-  name: az maintenance update list
-  summary: List pending a Maintenance Updates.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Azure Maintenance updates.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/managementpartner/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/managementpartner/index.yml
deleted file mode 100644
index 4bf5a41498..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/managementpartner/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_managementpartner_az
-  name: managementpartner
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_managementpartner_az_managementpartner
-  name: az managementpartner
-  summary: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/managementpartner/managementpartner.yml b/2017-03-09-profile/docs-ref-autogen/ext/managementpartner/managementpartner.yml
deleted file mode 100644
index bfc41f9635..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/managementpartner/managementpartner.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_managementpartner_az_managementpartner
-  name: az managementpartner
-  summary: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_managementpartner_az_managementpartner_create
-  - ext_managementpartner_az_managementpartner_delete
-  - ext_managementpartner_az_managementpartner_show
-  - ext_managementpartner_az_managementpartner_update
-- uid: ext_managementpartner_az_managementpartner_create
-  name: az managementpartner create
-  summary: Associates a Microsoft Partner Network(MPN) ID to the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-- uid: ext_managementpartner_az_managementpartner_delete
-  name: az managementpartner delete
-  summary: Delete the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-- uid: ext_managementpartner_az_managementpartner_show
-  name: az managementpartner show
-  summary: Gets the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-- uid: ext_managementpartner_az_managementpartner_update
-  name: az managementpartner update
-  summary: Updates the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-commands:
-- uid: ext_managementpartner_az_managementpartner_create
-  name: az managementpartner create
-  summary: Associates a Microsoft Partner Network(MPN) ID to the current authenticated user or service principal.
-- uid: ext_managementpartner_az_managementpartner_delete
-  name: az managementpartner delete
-  summary: Delete the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-- uid: ext_managementpartner_az_managementpartner_show
-  name: az managementpartner show
-  summary: Gets the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-- uid: ext_managementpartner_az_managementpartner_update
-  name: az managementpartner update
-  summary: Updates the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/index.yml
deleted file mode 100644
index 0355b0fe57..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az
-  name: mesh
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_mesh_az_mesh
-  name: az mesh
-  summary: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh.yml
deleted file mode 100644
index c04ff70256..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh
-  name: az mesh
-  summary: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_mesh_az_mesh_app
-  name: az mesh app
-  summary: Manage Service Fabric Mesh applications.
-- uid: ext_mesh_az_mesh_app_delete
-  name: az mesh app delete
-  summary: Delete a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_app_list
-  name: az mesh app list
-  summary: List Service Fabric Mesh applications.
-- uid: ext_mesh_az_mesh_app_show
-  name: az mesh app show
-  summary: Get the details of a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_code_package_log
-  name: az mesh code-package-log
-  summary: Examine the logs for a codepackage.
-- uid: ext_mesh_az_mesh_code_package_log_get
-  name: az mesh code-package-log get
-  summary: Examine the logs for a codepackage.
-- uid: ext_mesh_az_mesh_deployment
-  name: az mesh deployment
-  summary: Manage Service Fabric Mesh deployments.
-- uid: ext_mesh_az_mesh_deployment_create
-  name: az mesh deployment create
-  summary: Create a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_gateway
-  name: az mesh gateway
-  summary: Manage gateway resources.
-- uid: ext_mesh_az_mesh_gateway_delete
-  name: az mesh gateway delete
-  summary: Delete a gateway resource.
-- uid: ext_mesh_az_mesh_gateway_list
-  name: az mesh gateway list
-  summary: List gateway resources.
-- uid: ext_mesh_az_mesh_gateway_show
-  name: az mesh gateway show
-  summary: Get the details of a gateway.
-- uid: ext_mesh_az_mesh_generate
-  name: az mesh generate
-  summary: Generate Service Fabric Mesh deployment template.
-- uid: ext_mesh_az_mesh_generate_armtemplate
-  name: az mesh generate armtemplate
-  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
-- uid: ext_mesh_az_mesh_network
-  name: az mesh network
-  summary: Manage networks.
-- uid: ext_mesh_az_mesh_network_delete
-  name: az mesh network delete
-  summary: Delete a network.
-- uid: ext_mesh_az_mesh_network_list
-  name: az mesh network list
-  summary: List networks.
-- uid: ext_mesh_az_mesh_network_show
-  name: az mesh network show
-  summary: Get the details of a network.
-- uid: ext_mesh_az_mesh_secret
-  name: az mesh secret
-  summary: Manage secret resources.
-- uid: ext_mesh_az_mesh_secret_delete
-  name: az mesh secret delete
-  summary: Delete a secret.
-- uid: ext_mesh_az_mesh_secret_list
-  name: az mesh secret list
-  summary: List Secrets.
-- uid: ext_mesh_az_mesh_secret_show
-  name: az mesh secret show
-  summary: Get the details of a secret.
-- uid: ext_mesh_az_mesh_secretvalue
-  name: az mesh secretvalue
-  summary: Manage secret values.
-- uid: ext_mesh_az_mesh_secretvalue_delete
-  name: az mesh secretvalue delete
-  summary: Delete a secret version.
-- uid: ext_mesh_az_mesh_secretvalue_list
-  name: az mesh secretvalue list
-  summary: List Secrets versions.
-- uid: ext_mesh_az_mesh_secretvalue_show
-  name: az mesh secretvalue show
-  summary: Get the details of a secret value.
-- uid: ext_mesh_az_mesh_service
-  name: az mesh service
-  summary: Manage Service Fabric Mesh services.
-- uid: ext_mesh_az_mesh_service_list
-  name: az mesh service list
-  summary: Lists all the service resources.
-- uid: ext_mesh_az_mesh_service_show
-  name: az mesh service show
-  summary: Get the details of a service.
-- uid: ext_mesh_az_mesh_service_replica
-  name: az mesh service-replica
-  summary: Manage Service Fabric Mesh service replicas.
-- uid: ext_mesh_az_mesh_service_replica_list
-  name: az mesh service-replica list
-  summary: List the details of service replicas.
-- uid: ext_mesh_az_mesh_service_replica_show
-  name: az mesh service-replica show
-  summary: Gets the given replica of the service of an application.
-- uid: ext_mesh_az_mesh_volume
-  name: az mesh volume
-  summary: Manage volumes.
-- uid: ext_mesh_az_mesh_volume_create
-  name: az mesh volume create
-  summary: Create a volume.
-- uid: ext_mesh_az_mesh_volume_delete
-  name: az mesh volume delete
-  summary: Delete a volume.
-- uid: ext_mesh_az_mesh_volume_list
-  name: az mesh volume list
-  summary: List volumes.
-- uid: ext_mesh_az_mesh_volume_show
-  name: az mesh volume show
-  summary: Get the details of a volume.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/app.yml
deleted file mode 100644
index c51cd065de..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/app.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_app
-  name: az mesh app
-  summary: Manage Service Fabric Mesh applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_app_delete
-  - ext_mesh_az_mesh_app_list
-  - ext_mesh_az_mesh_app_show
-- uid: ext_mesh_az_mesh_app_delete
-  name: az mesh app delete
-  summary: Delete a Service Fabric Mesh application.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_app_list
-  name: az mesh app list
-  summary: List Service Fabric Mesh applications.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_app_show
-  name: az mesh app show
-  summary: Get the details of a Service Fabric Mesh application.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_app_delete
-  name: az mesh app delete
-  summary: Delete a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_app_list
-  name: az mesh app list
-  summary: List Service Fabric Mesh applications.
-- uid: ext_mesh_az_mesh_app_show
-  name: az mesh app show
-  summary: Get the details of a Service Fabric Mesh application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml
deleted file mode 100644
index 9336675013..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_code_package_log
-  name: az mesh code-package-log
-  summary: Examine the logs for a codepackage.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_code_package_log_get
-- uid: ext_mesh_az_mesh_code_package_log_get
-  name: az mesh code-package-log get
-  summary: Examine the logs for a codepackage.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --code-package-name
-    summary: The name of code package of the service.
-    description: ''
-  - isRequired: true
-    name: --replica-name
-    summary: Service Fabric replica name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the service.
-    description: ''
-  - name: --tail
-    summary: Number of lines to show from the end of the logs. Default is 100.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_code_package_log_get
-  name: az mesh code-package-log get
-  summary: Examine the logs for a codepackage.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Examine the logs for a codepackage.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/deployment.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/deployment.yml
deleted file mode 100644
index 2cf7da4256..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/deployment.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_deployment
-  name: az mesh deployment
-  summary: Manage Service Fabric Mesh deployments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_deployment_create
-- uid: ext_mesh_az_mesh_deployment_create
-  name: az mesh deployment create
-  summary: Create a Service Fabric Mesh application.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a deployment with a template file on the remote.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --template-uri https://seabreezequickstart.blob.core.windows.net/templates/quickstart/sbz_rp.linux.json
-  - summary: Create a deployment with a template file on local disk.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --template-file ./appTemplate.json
-  - summary: List of comma separated yaml files or a directory which contains all the yaml files.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml
-  - summary: Create a deployment with yaml files, along with a yaml parameters file, which consists of key/value pairs.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
-  - summary: Create a deployment with parameters in arm json format.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
-  - summary: Create a deployment with parameters passed directly as a json object.
-    syntax:
-      content: "az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --input-yaml-files
-    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
-    description: ''
-  - name: --mode
-    summary: The mode for deployment, can be incremental(resources are only added) or complete(previous resources will be deleted).
-    description: ''
-  - name: --name -n
-    summary: The deployment name. Default to template file base name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --parameters
-    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
-    description: ''
-  - name: --template-file
-    summary: The full file path of creation template.
-    description: ''
-  - name: --template-uri
-    summary: The full file path of creation template on a http or https link.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_deployment_create
-  name: az mesh deployment create
-  summary: Create a Service Fabric Mesh application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh deployments.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/gateway.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/gateway.yml
deleted file mode 100644
index 6fe28dc06b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/gateway.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_gateway
-  name: az mesh gateway
-  summary: Manage gateway resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_gateway_delete
-  - ext_mesh_az_mesh_gateway_list
-  - ext_mesh_az_mesh_gateway_show
-- uid: ext_mesh_az_mesh_gateway_delete
-  name: az mesh gateway delete
-  summary: Delete a gateway resource.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the gateway resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_gateway_list
-  name: az mesh gateway list
-  summary: List gateway resources.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_gateway_show
-  name: az mesh gateway show
-  summary: Get the details of a gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the gateway resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_gateway_delete
-  name: az mesh gateway delete
-  summary: Delete a gateway resource.
-- uid: ext_mesh_az_mesh_gateway_list
-  name: az mesh gateway list
-  summary: List gateway resources.
-- uid: ext_mesh_az_mesh_gateway_show
-  name: az mesh gateway show
-  summary: Get the details of a gateway.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage gateway resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/generate.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/generate.yml
deleted file mode 100644
index 5629bc6970..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/generate.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_generate
-  name: az mesh generate
-  summary: Generate Service Fabric Mesh deployment template.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_generate_armtemplate
-- uid: ext_mesh_az_mesh_generate_armtemplate
-  name: az mesh generate armtemplate
-  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Generate a template file for deployment.
-    syntax:
-      content: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml
-  - summary: Generate a template file for deployment with a yaml parameters file, which consists of key/value pairs.
-    syntax:
-      content: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
-  - summary: Generate a template file for deployment with parameters in arm json format.
-    syntax:
-      content: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
-  - summary: Generate a template file for deployment with parameters passed directly as a json object.
-    syntax:
-      content: "az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
-  parameters:
-  - isRequired: true
-    name: --input-yaml-files
-    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
-    description: ''
-  - name: --parameters
-    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_generate_armtemplate
-  name: az mesh generate armtemplate
-  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Generate Service Fabric Mesh deployment template.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/network.yml
deleted file mode 100644
index 22989256a4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/network.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_network
-  name: az mesh network
-  summary: Manage networks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_network_delete
-  - ext_mesh_az_mesh_network_list
-  - ext_mesh_az_mesh_network_show
-- uid: ext_mesh_az_mesh_network_delete
-  name: az mesh network delete
-  summary: Delete a network.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_network_list
-  name: az mesh network list
-  summary: List networks.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_network_show
-  name: az mesh network show
-  summary: Get the details of a network.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_network_delete
-  name: az mesh network delete
-  summary: Delete a network.
-- uid: ext_mesh_az_mesh_network_list
-  name: az mesh network list
-  summary: List networks.
-- uid: ext_mesh_az_mesh_network_show
-  name: az mesh network show
-  summary: Get the details of a network.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage networks.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secret.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secret.yml
deleted file mode 100644
index 3945eb557a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secret.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_secret
-  name: az mesh secret
-  summary: Manage secret resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_secret_delete
-  - ext_mesh_az_mesh_secret_list
-  - ext_mesh_az_mesh_secret_show
-- uid: ext_mesh_az_mesh_secret_delete
-  name: az mesh secret delete
-  summary: Delete a secret.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the secret.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_secret_list
-  name: az mesh secret list
-  summary: List Secrets.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_secret_show
-  name: az mesh secret show
-  summary: Get the details of a secret.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the secret.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_secret_delete
-  name: az mesh secret delete
-  summary: Delete a secret.
-- uid: ext_mesh_az_mesh_secret_list
-  name: az mesh secret list
-  summary: List Secrets.
-- uid: ext_mesh_az_mesh_secret_show
-  name: az mesh secret show
-  summary: Get the details of a secret.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage secret resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml
deleted file mode 100644
index 1df331581b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_secretvalue
-  name: az mesh secretvalue
-  summary: Manage secret values.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_secretvalue_delete
-  - ext_mesh_az_mesh_secretvalue_list
-  - ext_mesh_az_mesh_secretvalue_show
-- uid: ext_mesh_az_mesh_secretvalue_delete
-  name: az mesh secretvalue delete
-  summary: Delete a secret version.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-resource-name
-    summary: The name of the secret resource.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: The name of the secret version.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_secretvalue_list
-  name: az mesh secretvalue list
-  summary: List Secrets versions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-name -n
-    summary: The name of the secret resource.
-    description: ''
-- uid: ext_mesh_az_mesh_secretvalue_show
-  name: az mesh secretvalue show
-  summary: Get the details of a secret value.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-name -n
-    summary: The name of the secret resource.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: The name of the secret version.
-    description: ''
-  - name: --show-value
-    summary: Pass this flag to receive the value of the secret.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_secretvalue_delete
-  name: az mesh secretvalue delete
-  summary: Delete a secret version.
-- uid: ext_mesh_az_mesh_secretvalue_list
-  name: az mesh secretvalue list
-  summary: List Secrets versions.
-- uid: ext_mesh_az_mesh_secretvalue_show
-  name: az mesh secretvalue show
-  summary: Get the details of a secret value.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage secret values.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service-replica.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service-replica.yml
deleted file mode 100644
index 9d7d6f29b1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service-replica.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_service_replica
-  name: az mesh service-replica
-  summary: Manage Service Fabric Mesh service replicas.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_service_replica_list
-  - ext_mesh_az_mesh_service_replica_show
-- uid: ext_mesh_az_mesh_service_replica_list
-  name: az mesh service-replica list
-  summary: List the details of service replicas.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the service.
-    description: ''
-- uid: ext_mesh_az_mesh_service_replica_show
-  name: az mesh service-replica show
-  summary: Gets the given replica of the service of an application.
-  description: Gets the information about the service replica with the given name. The information include the description and other properties of the service replica.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the service replica.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the service.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_service_replica_list
-  name: az mesh service-replica list
-  summary: List the details of service replicas.
-- uid: ext_mesh_az_mesh_service_replica_show
-  name: az mesh service-replica show
-  summary: Gets the given replica of the service of an application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh service replicas.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service.yml
deleted file mode 100644
index 9efab7fd10..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/service.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_service
-  name: az mesh service
-  summary: Manage Service Fabric Mesh services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_service_list
-  - ext_mesh_az_mesh_service_show
-- uid: ext_mesh_az_mesh_service_list
-  name: az mesh service list
-  summary: Lists all the service resources.
-  description: Gets the information about all services of an application resource. The information include the description and other properties of the Service.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_service_show
-  name: az mesh service show
-  summary: Get the details of a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_service_list
-  name: az mesh service list
-  summary: Lists all the service resources.
-- uid: ext_mesh_az_mesh_service_show
-  name: az mesh service show
-  summary: Get the details of a service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh services.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/volume.yml b/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/volume.yml
deleted file mode 100644
index b3c7bd1fd6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mesh/mesh/volume.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_volume
-  name: az mesh volume
-  summary: Manage volumes.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_volume_create
-  - ext_mesh_az_mesh_volume_delete
-  - ext_mesh_az_mesh_volume_list
-  - ext_mesh_az_mesh_volume_show
-- uid: ext_mesh_az_mesh_volume_create
-  name: az mesh volume create
-  summary: Create a volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a volume with a template file on a remote URL.
-    syntax:
-      content: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-uri https://mystorage.blob.core.windows.net/templates/volumeDescription.json
-  - summary: Create a volume with a template file on local disk.
-    syntax:
-      content: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-file ./volumeDescription.json
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the volume.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --template-file
-    summary: The full file path of creation template.
-    description: ''
-  - name: --template-uri
-    summary: The full file path of creation template on a http or https link.
-    description: ''
-- uid: ext_mesh_az_mesh_volume_delete
-  name: az mesh volume delete
-  summary: Delete a volume.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the volume.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_volume_list
-  name: az mesh volume list
-  summary: List volumes.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_volume_show
-  name: az mesh volume show
-  summary: Get the details of a volume.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the volume.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_volume_create
-  name: az mesh volume create
-  summary: Create a volume.
-- uid: ext_mesh_az_mesh_volume_delete
-  name: az mesh volume delete
-  summary: Delete a volume.
-- uid: ext_mesh_az_mesh_volume_list
-  name: az mesh volume list
-  summary: List volumes.
-- uid: ext_mesh_az_mesh_volume_show
-  name: az mesh volume show
-  summary: Get the details of a volume.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage volumes.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/index.yml
deleted file mode 100644
index 2a2507125e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mixed-reality_az
-  name: mixed-reality
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_mixed-reality_az_spatial_anchors_account
-  name: az spatial-anchors-account
-  summary: Manage Spatial Anchors Accounts.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml b/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml
deleted file mode 100644
index 8d0778be1b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mixed-reality_az_spatial_anchors_account
-  name: az spatial-anchors-account
-  summary: Manage Spatial Anchors Accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mixed-reality_az_spatial_anchors_account_create
-  - ext_mixed-reality_az_spatial_anchors_account_delete
-  - ext_mixed-reality_az_spatial_anchors_account_list
-  - ext_mixed-reality_az_spatial_anchors_account_show
-- uid: ext_mixed-reality_az_spatial_anchors_account_create
-  name: az spatial-anchors-account create
-  summary: Create a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account create -g example -n example -l eastus2
-  - summary: Create a Spatial Anchors Account without Location specified.
-    syntax:
-      content: az spatial-anchors-account create -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_delete
-  name: az spatial-anchors-account delete
-  summary: Delete a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account delete -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_list
-  name: az spatial-anchors-account list
-  summary: List Spatial Anchors Accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spatial Anchors Accounts in Resource Group 'example'.
-    syntax:
-      content: az spatial-anchors-account list -g example
-  - summary: List all Spatial Anchors Accounts in current Subscription.
-    syntax:
-      content: az spatial-anchors-account list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_show
-  name: az spatial-anchors-account show
-  summary: Show a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show properties of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account show -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mixed-reality_az_spatial_anchors_account_create
-  name: az spatial-anchors-account create
-  summary: Create a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_delete
-  name: az spatial-anchors-account delete
-  summary: Delete a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key
-  name: az spatial-anchors-account key
-  summary: Manage developer keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-  name: az spatial-anchors-account key renew
-  summary: Renew one of the keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-  name: az spatial-anchors-account key show
-  summary: Show keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_list
-  name: az spatial-anchors-account list
-  summary: List Spatial Anchors Accounts.
-- uid: ext_mixed-reality_az_spatial_anchors_account_show
-  name: az spatial-anchors-account show
-  summary: Show a Spatial Anchors Account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Spatial Anchors Accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml b/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml
deleted file mode 100644
index f4d27008a0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mixed-reality_az_spatial_anchors_account_key
-  name: az spatial-anchors-account key
-  summary: Manage developer keys of a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mixed-reality_az_spatial_anchors_account_key_renew
-  - ext_mixed-reality_az_spatial_anchors_account_key_show
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-  name: az spatial-anchors-account key renew
-  summary: Renew one of the keys of a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Renew primary key of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account key renew -g example -n example -k primary
-  - summary: Renew secondary key of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account key renew -g example -n example -k secondary
-  parameters:
-  - isRequired: true
-    name: --key -k
-    parameterValueGroup: primary, secondary
-    summary: Key to be regenerated.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-  name: az spatial-anchors-account key show
-  summary: Show keys of a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show primary key and secondary key of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account key show -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-  name: az spatial-anchors-account key renew
-  summary: Renew one of the keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-  name: az spatial-anchors-account key show
-  summary: Show keys of a Spatial Anchors Account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage developer keys of a Spatial Anchors Account.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/index.yml
deleted file mode 100644
index 3ede6ae5de..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az
-  name: netappfiles-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles
-  name: az netappfiles
-  summary: Manage Azure NetApp Files (ANF) Resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml
deleted file mode 100644
index 462c03f228..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles
-  name: az netappfiles
-  summary: Manage Azure NetApp Files (ANF) Resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_account
-  name: az netappfiles account
-  summary: Manage Azure NetApp Files (ANF) Account Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_account_create
-  name: az netappfiles account create
-  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
-- uid: ext_netappfiles-preview_az_netappfiles_account_delete
-  name: az netappfiles account delete
-  summary: Delete the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_list
-  name: az netappfiles account list
-  summary: List ANF accounts.
-- uid: ext_netappfiles-preview_az_netappfiles_account_set
-  name: az netappfiles account set
-  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
-- uid: ext_netappfiles-preview_az_netappfiles_account_show
-  name: az netappfiles account show
-  summary: Get the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_update
-  name: az netappfiles account update
-  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target
-  name: az netappfiles mount-target
-  summary: Manage Azure NetApp Files (ANF) Mount Target Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-  name: az netappfiles mount-target list
-  summary: List the mount targets of an ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_pool
-  name: az netappfiles pool
-  summary: Manage Azure NetApp Files (ANF) Pool Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_create
-  name: az netappfiles pool create
-  summary: Create a new Azure NetApp Files (ANF) pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-  name: az netappfiles pool delete
-  summary: Delete the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_list
-  name: az netappfiles pool list
-  summary: L:ist the ANF pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_show
-  name: az netappfiles pool show
-  summary: Get the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_update
-  name: az netappfiles pool update
-  summary: Update the tags of the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot
-  name: az netappfiles snapshot
-  summary: Manage Azure NetApp Files (ANF) Snapshot Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-  name: az netappfiles snapshot create
-  summary: Create a new Azure NetApp Files (ANF) snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  name: az netappfiles snapshot delete
-  summary: Delete the specified ANF snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-  name: az netappfiles snapshot list
-  summary: List the snapshots of an ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-  name: az netappfiles snapshot show
-  summary: Get the specified ANF snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_volume
-  name: az netappfiles volume
-  summary: Manage Azure NetApp Files (ANF) Volume Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_create
-  name: az netappfiles volume create
-  summary: Create a new Azure NetApp Files (ANF) volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-  name: az netappfiles volume delete
-  summary: Delete the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_list
-  name: az netappfiles volume list
-  summary: List the ANF Pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_show
-  name: az netappfiles volume show
-  summary: Get the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_update
-  name: az netappfiles volume update
-  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml
deleted file mode 100644
index 95d263869e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_account
-  name: az netappfiles account
-  summary: Manage Azure NetApp Files (ANF) Account Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_account_create
-  - ext_netappfiles-preview_az_netappfiles_account_delete
-  - ext_netappfiles-preview_az_netappfiles_account_list
-  - ext_netappfiles-preview_az_netappfiles_account_set
-  - ext_netappfiles-preview_az_netappfiles_account_show
-  - ext_netappfiles-preview_az_netappfiles_account_update
-- uid: ext_netappfiles-preview_az_netappfiles_account_create
-  name: az netappfiles account create
-  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF account
-    syntax:
-      content: az netappfiles account create -g group --account-name name -l location
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --active-directories
-    summary: Active Directories.
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the account.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_delete
-  name: az netappfiles account delete
-  summary: Delete the specified ANF account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF account
-    syntax:
-      content: az netappfiles account delete -g group --account-name name
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_list
-  name: az netappfiles account list
-  summary: List ANF accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List ANF accounts within a resource group
-    syntax:
-      content: az netappfiles account list -g group
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_set
-  name: az netappfiles account set
-  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tags and active directory of an ANF account
-    syntax:
-      content: "az netappfiles account set -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
-  - summary: Remove the active directory from the ANF account
-    syntax:
-      content: az netappfiles account set -g group --account-name name --active-directories '[]' -l westus2
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --active-directories
-    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the account.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_show
-  name: az netappfiles account show
-  summary: Get the specified ANF account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an ANF account
-    syntax:
-      content: az netappfiles account show -g group --account-name name
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_update
-  name: az netappfiles account update
-  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tags and active directory of an ANF account
-    syntax:
-      content: "az netappfiles account update -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --active-directories
-    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the account.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_account_create
-  name: az netappfiles account create
-  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
-- uid: ext_netappfiles-preview_az_netappfiles_account_delete
-  name: az netappfiles account delete
-  summary: Delete the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_list
-  name: az netappfiles account list
-  summary: List ANF accounts.
-- uid: ext_netappfiles-preview_az_netappfiles_account_set
-  name: az netappfiles account set
-  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
-- uid: ext_netappfiles-preview_az_netappfiles_account_show
-  name: az netappfiles account show
-  summary: Get the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_update
-  name: az netappfiles account update
-  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Account Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml
deleted file mode 100644
index 250b84dff7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target
-  name: az netappfiles mount-target
-  summary: Manage Azure NetApp Files (ANF) Mount Target Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_mount_target_list
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-  name: az netappfiles mount-target list
-  summary: List the mount targets of an ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: list the mount targets of an ANF volume
-    syntax:
-      content: az netappfiles mount-target list -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF pool.
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-  name: az netappfiles mount-target list
-  summary: List the mount targets of an ANF volume.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Mount Target Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml
deleted file mode 100644
index 0f34d4cf51..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_pool
-  name: az netappfiles pool
-  summary: Manage Azure NetApp Files (ANF) Pool Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_pool_create
-  - ext_netappfiles-preview_az_netappfiles_pool_delete
-  - ext_netappfiles-preview_az_netappfiles_pool_list
-  - ext_netappfiles-preview_az_netappfiles_pool_show
-  - ext_netappfiles-preview_az_netappfiles_pool_update
-- uid: ext_netappfiles-preview_az_netappfiles_pool_create
-  name: az netappfiles pool create
-  summary: Create a new Azure NetApp Files (ANF) pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF pool
-    syntax:
-      content: az netappfiles pool create -g group --account-name aname --pool-name pname -l location --size 4398046511104 --service-level "Premium"
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-level
-    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - isRequired: true
-    name: --size
-    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the pool.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-  name: az netappfiles pool delete
-  summary: Delete the specified ANF pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF pool
-    syntax:
-      content: az netappfiles pool delete -g group --account-name aname --pool-name pname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_list
-  name: az netappfiles pool list
-  summary: L:ist the ANF pools for the specified account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the pools for the ANF account
-    syntax:
-      content: az netappfiles pool list -g group --account-name name
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_show
-  name: az netappfiles pool show
-  summary: Get the specified ANF pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an ANF pool
-    syntax:
-      content: az netappfiles pool show -g group --account-name aname --pool-name pname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_update
-  name: az netappfiles pool update
-  summary: Update the tags of the specified ANF pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update specific values for an ANF pool
-    syntax:
-      content: az netappfiles pool update -g group --account-name aname --pool-name pname --service-level "Extreme" --tags 'key[=value] key[=value]'
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --service-level
-    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - name: --size
-    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the pool.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_pool_create
-  name: az netappfiles pool create
-  summary: Create a new Azure NetApp Files (ANF) pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-  name: az netappfiles pool delete
-  summary: Delete the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_list
-  name: az netappfiles pool list
-  summary: L:ist the ANF pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_show
-  name: az netappfiles pool show
-  summary: Get the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_update
-  name: az netappfiles pool update
-  summary: Update the tags of the specified ANF pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Pool Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml
deleted file mode 100644
index 2c106681d9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml
+++ /dev/null
@@ -1,169 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot
-  name: az netappfiles snapshot
-  summary: Manage Azure NetApp Files (ANF) Snapshot Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_snapshot_create
-  - ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  - ext_netappfiles-preview_az_netappfiles_snapshot_list
-  - ext_netappfiles-preview_az_netappfiles_snapshot_show
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-  name: az netappfiles snapshot create
-  summary: Create a new Azure NetApp Files (ANF) snapshot.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF snapshot
-    syntax:
-      content: az netappfiles snapshot create -g group --account-name account-name --pool-name pname --volume-name vname --snapshot-name sname -l location --file-system-id volume-uuid
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --snapshot-name -n -s
-    summary: The name of the ANF snapshot.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF volume.
-    description: ''
-  - name: --file-system-id
-    summary: The uuid of the volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  name: az netappfiles snapshot delete
-  summary: Delete the specified ANF snapshot.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF snapshot
-    syntax:
-      content: az netappfiles snapshot delete -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --snapshot-name -n -s
-    summary: The name of the ANF snapshot.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-  name: az netappfiles snapshot list
-  summary: List the snapshots of an ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: list the snapshots of an ANF volume
-    syntax:
-      content: az netappfiles snapshot list -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-  name: az netappfiles snapshot show
-  summary: Get the specified ANF snapshot.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Return the specified ANF snapshot
-    syntax:
-      content: az netappfiles snapshot show -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --snapshot-name -n -s
-    summary: The name of the ANF snapshot.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF volume.
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-  name: az netappfiles snapshot create
-  summary: Create a new Azure NetApp Files (ANF) snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  name: az netappfiles snapshot delete
-  summary: Delete the specified ANF snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-  name: az netappfiles snapshot list
-  summary: List the snapshots of an ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-  name: az netappfiles snapshot show
-  summary: Get the specified ANF snapshot.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Snapshot Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml b/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml
deleted file mode 100644
index 62004ce211..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_volume
-  name: az netappfiles volume
-  summary: Manage Azure NetApp Files (ANF) Volume Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_volume_create
-  - ext_netappfiles-preview_az_netappfiles_volume_delete
-  - ext_netappfiles-preview_az_netappfiles_volume_list
-  - ext_netappfiles-preview_az_netappfiles_volume_show
-  - ext_netappfiles-preview_az_netappfiles_volume_update
-- uid: ext_netappfiles-preview_az_netappfiles_volume_create
-  name: az netappfiles volume create
-  summary: Create a new Azure NetApp Files (ANF) volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF volume
-    syntax:
-      content: "az netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level \"Premium\" --usage-threshold 107374182400 --creation-token \"unique-token\" --subnet-id \"/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default\" --export-policy '[{\"allowed_clients\":\"0.0.0.0/0\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --creation-token
-    summary: A unique file path identifier, from 1 to 80 characters.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-level
-    summary: The service level ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - isRequired: true
-    name: --subnet-id
-    summary: The subnet identifier.
-    description: ''
-  - isRequired: true
-    name: --usage-threshold
-    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-  - name: --export-policy
-    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-  name: az netappfiles volume delete
-  summary: Delete the specified ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF volume
-    syntax:
-      content: az netappfiles volume delete -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_list
-  name: az netappfiles volume list
-  summary: List the ANF Pools for the specified account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the ANF volumes of the pool
-    syntax:
-      content: az netappfiles volume list -g group --account-name aname --pool-name pname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_show
-  name: az netappfiles volume show
-  summary: Get the specified ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Returns the properties of the given ANF volume
-    syntax:
-      content: az netappfiles volume show -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF pool.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_update
-  name: az netappfiles volume update
-  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF volume
-    syntax:
-      content: "az netappfiles volume update -g group --account-name aname --pool-name pname --volume-name vname --service-level level --usage-threshold 107374182400 --tags 'key[=value] key[=value]' --export-policy '[{\"allowed_clients\":\"1.2.3.0/24\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}, {\"allowed_clients\":\"1.2.4.0/24\", \"rule_index\": \"2\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-  - name: --export-policy
-    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
-    description: ''
-  - name: --service-level
-    summary: The service level ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the volume.
-    description: ''
-  - name: --usage-threshold
-    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_volume_create
-  name: az netappfiles volume create
-  summary: Create a new Azure NetApp Files (ANF) volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-  name: az netappfiles volume delete
-  summary: Delete the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_list
-  name: az netappfiles volume list
-  summary: List the ANF Pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_show
-  name: az netappfiles volume show
-  summary: Get the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_update
-  name: az netappfiles volume update
-  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Volume Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/index.yml
deleted file mode 100644
index e43f0a1a1d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az
-  name: notification-hub
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_notification-hub_az_notification_hub
-  name: az notification-hub
-  summary: Manage Notification Hubs.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub.yml
deleted file mode 100644
index 5e8356ca99..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub.yml
+++ /dev/null
@@ -1,388 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub
-  name: az notification-hub
-  summary: Manage Notification Hubs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_check_availability
-  - ext_notification-hub_az_notification_hub_create
-  - ext_notification-hub_az_notification_hub_delete
-  - ext_notification-hub_az_notification_hub_list
-  - ext_notification-hub_az_notification_hub_show
-  - ext_notification-hub_az_notification_hub_test_send
-  - ext_notification-hub_az_notification_hub_update
-- uid: ext_notification-hub_az_notification_hub_check_availability
-  name: az notification-hub check-availability
-  summary: Check the availability of the given notificationHub in a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check the availability of the given notificationHub name
-    syntax:
-      content: >-
-        az notification-hub check-availability --resource-group MyResourceGroup \
-
-        --namespace-name "locp-newns" --name my-hub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name to check.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_create
-  name: az notification-hub create
-  summary: Create a NotificationHub in a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Notification Hub
-    syntax:
-      content: >-
-        az notification-hub create --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --name my-hub --location "South Central US"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --registration-ttl
-    summary: The RegistrationTtl of the created NotificationHub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_delete
-  name: az notification-hub delete
-  summary: Delete a notification hub associated with a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a notification hub
-    syntax:
-      content: >-
-        az notification-hub delete --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --name my-hub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_list
-  name: az notification-hub list
-  summary: List the notification hubs associated with a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the notification hubs
-    syntax:
-      content: az notification-hub list --resource-group MyResourceGroup --namespace-name my-namespace
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_show
-  name: az notification-hub show
-  summary: Show the notification hub information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the Notification Hub info
-    syntax:
-      content: >-
-        az notification-hub show --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --name my-hub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_test_send
-  name: az notification-hub test-send
-  summary: Test send a push notification.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: test send notification with message body
-    syntax:
-      content: >-
-        az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --notification-format gcm \
-
-        --message "test notification"
-  - summary: test send notification from file
-    syntax:
-      content: >-
-        az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --notification-format gcm \
-
-        --payload @path/to/file
-  - summary: test send notification with json string
-    syntax:
-      content: >-
-        az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --notification-format gcm \
-
-        --payload "{\"data\":{\"message\":\"test notification\"}}"
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-format
-    parameterValueGroup: apple, baidu, gcm, template, windows, windowsphone
-    summary: The format of notification message.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --message
-    summary: The message body to send. If not None, payload will be ignored.
-    description: ''
-  - name: --payload
-    summary: The payload for the message in JSON format.
-    description: ''
-  - name: --tag
-    summary: You can send test notifications to a specific set of registrations using this option. Leave this field empty if you like to send push notifications to 10 random registrations on the selected platform.
-    description: ''
-  - name: --title
-    summary: The title of the notification.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_update
-  name: az notification-hub update
-  summary: Update a Notification Hub in a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the Notification Hub
-    syntax:
-      content: >-
-        az notification-hub update --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --name "sdk-notificationHubs-8708"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_authorization_rule
-  name: az notification-hub authorization-rule
-  summary: Commands to manage notification hubs authorization rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-  name: az notification-hub authorization-rule create
-  summary: Create an authorization rule for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-  name: az notification-hub authorization-rule delete
-  summary: Delete a notificationHub authorization rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-  name: az notification-hub authorization-rule list
-  summary: List the authorization rules for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  name: az notification-hub authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  name: az notification-hub authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-  name: az notification-hub authorization-rule show
-  summary: Show an authorization rule for a NotificationHub by name.
-- uid: ext_notification-hub_az_notification_hub_check_availability
-  name: az notification-hub check-availability
-  summary: Check the availability of the given notificationHub in a namespace.
-- uid: ext_notification-hub_az_notification_hub_create
-  name: az notification-hub create
-  summary: Create a NotificationHub in a namespace.
-- uid: ext_notification-hub_az_notification_hub_credential
-  name: az notification-hub credential
-  summary: Commands to manage notification hub credential.
-- uid: ext_notification-hub_az_notification_hub_credential_adm
-  name: az notification-hub credential adm
-  summary: Commands to manage notification hub credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_apns
-  name: az notification-hub credential apns
-  summary: Commands to manage notification hub credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu
-  name: az notification-hub credential baidu
-  summary: Commands to manage notification hub credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm
-  name: az notification-hub credential gcm
-  summary: Commands to manage notification hub credential for Google(GCM/FCM).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-- uid: ext_notification-hub_az_notification_hub_credential_list
-  name: az notification-hub credential list
-  summary: List the PNS Credentials associated with a notification hub .
-- uid: ext_notification-hub_az_notification_hub_credential_mpns
-  name: az notification-hub credential mpns
-  summary: Commands to manage notification hub credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns
-  name: az notification-hub credential wns
-  summary: Commands to manage notification hub credential for Windows(WNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-- uid: ext_notification-hub_az_notification_hub_delete
-  name: az notification-hub delete
-  summary: Delete a notification hub associated with a namespace.
-- uid: ext_notification-hub_az_notification_hub_list
-  name: az notification-hub list
-  summary: List the notification hubs associated with a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace
-  name: az notification-hub namespace
-  summary: Commands to manage notification hub namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-  name: az notification-hub namespace authorization-rule
-  summary: Commands to manage notification hubs namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-- uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-  name: az notification-hub namespace check-availability
-  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
-- uid: ext_notification-hub_az_notification_hub_namespace_create
-  name: az notification-hub namespace create
-  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
-- uid: ext_notification-hub_az_notification_hub_namespace_delete
-  name: az notification-hub namespace delete
-  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_list
-  name: az notification-hub namespace list
-  summary: List available namespaces.
-- uid: ext_notification-hub_az_notification_hub_namespace_show
-  name: az notification-hub namespace show
-  summary: Return the description for the specified namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_update
-  name: az notification-hub namespace update
-  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
-- uid: ext_notification-hub_az_notification_hub_namespace_wait
-  name: az notification-hub namespace wait
-  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
-- uid: ext_notification-hub_az_notification_hub_show
-  name: az notification-hub show
-  summary: Show the notification hub information.
-- uid: ext_notification-hub_az_notification_hub_test_send
-  name: az notification-hub test-send
-  summary: Test send a push notification.
-- uid: ext_notification-hub_az_notification_hub_update
-  name: az notification-hub update
-  summary: Update a Notification Hub in a namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Notification Hubs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml
deleted file mode 100644
index bec7d974d5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_authorization_rule
-  name: az notification-hub authorization-rule
-  summary: Commands to manage notification hubs authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_authorization_rule_create
-  - ext_notification-hub_az_notification_hub_authorization_rule_delete
-  - ext_notification-hub_az_notification_hub_authorization_rule_list
-  - ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  - ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  - ext_notification-hub_az_notification_hub_authorization_rule_show
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-  name: az notification-hub authorization-rule create
-  summary: Create an authorization rule for a NotificationHub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule create --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature --rights Listen Send
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rights
-    summary: The rights associated with the rule.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-  name: az notification-hub authorization-rule delete
-  summary: Delete a notificationHub authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule delete --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-  name: az notification-hub authorization-rule list
-  summary: List the authorization rules for a NotificationHub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List authorization rules
-    syntax:
-      content: >-
-        az notification-hub authorization-rule list --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  name: az notification-hub authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List connectionStrings of the authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule list-keys --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --notification-hub-name my-hub --name "sdk-AuthRules-5800"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  name: az notification-hub authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate the Notification Hub authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature --policy-key "Secondary Key"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --policy-key
-    parameterValueGroup: Primary Key, Secondary Key
-    summary: Name of the key that has to be regenerated for the Notification Hub Authorization Rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-  name: az notification-hub authorization-rule show
-  summary: Show an authorization rule for a NotificationHub by name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the authorization rule information
-    syntax:
-      content: >-
-        az notification-hub authorization-rule show --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-  name: az notification-hub authorization-rule create
-  summary: Create an authorization rule for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-  name: az notification-hub authorization-rule delete
-  summary: Delete a notificationHub authorization rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-  name: az notification-hub authorization-rule list
-  summary: List the authorization rules for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  name: az notification-hub authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  name: az notification-hub authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-  name: az notification-hub authorization-rule show
-  summary: Show an authorization rule for a NotificationHub by name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hubs authorization rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml
deleted file mode 100644
index 66159979ee..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential
-  name: az notification-hub credential
-  summary: Commands to manage notification hub credential.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_list
-- uid: ext_notification-hub_az_notification_hub_credential_list
-  name: az notification-hub credential list
-  summary: List the PNS Credentials associated with a notification hub .
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the PNS Credentials
-    syntax:
-      content: >-
-        az notification-hub credential list --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_adm
-  name: az notification-hub credential adm
-  summary: Commands to manage notification hub credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_apns
-  name: az notification-hub credential apns
-  summary: Commands to manage notification hub credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu
-  name: az notification-hub credential baidu
-  summary: Commands to manage notification hub credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm
-  name: az notification-hub credential gcm
-  summary: Commands to manage notification hub credential for Google(GCM/FCM).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-- uid: ext_notification-hub_az_notification_hub_credential_list
-  name: az notification-hub credential list
-  summary: List the PNS Credentials associated with a notification hub .
-- uid: ext_notification-hub_az_notification_hub_credential_mpns
-  name: az notification-hub credential mpns
-  summary: Commands to manage notification hub credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns
-  name: az notification-hub credential wns
-  summary: Commands to manage notification hub credential for Windows(WNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml
deleted file mode 100644
index a7154af95b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_adm
-  name: az notification-hub credential adm
-  summary: Commands to manage notification hub credential for Amazon(ADM).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_adm_update
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --client-id
-    summary: The client identifier.
-    description: ''
-  - isRequired: true
-    name: --client-secret
-    summary: The credential secret access key.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Amazon(ADM).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml
deleted file mode 100644
index e4eb83ea70..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_apns
-  name: az notification-hub credential apns
-  summary: Commands to manage notification hub credential for Apple(APNS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_apns_update
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update APNS certificate
-    syntax:
-      content: >-
-        az notification-hub credential apns update --namespace-name my-namespace \
-
-        --notification-hub-name my-hub --apns-certificate "/path/to/certificate" \
-
-        --certificate-key "xxxxxx" --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --apns-certificate
-    summary: The APNS certificate.
-    description: ''
-  - name: --app-id
-    summary: The issuer (iss) registered claim key, whose value is your 10-character Team ID, obtained from your developer account.
-    description: ''
-  - name: --app-name
-    summary: The name of the application/bundle id.
-    description: ''
-  - name: --certificate-key
-    summary: The certificate key.
-    description: ''
-  - name: --endpoint
-    defaultValue: gateway.push.apple.com
-    summary: The endpoint of this credential. Example values:"gateway.sandbox.push.apple.com","gateway.push.apple.com".
-    description: ''
-  - name: --key-id
-    summary: A 10-character key identifier (kid) key, obtained from your developer account.
-    description: ''
-  - name: --token
-    summary: Provider Authentication Token, obtained through your developer account.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Apple(APNS).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml
deleted file mode 100644
index 8473e49579..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_baidu
-  name: az notification-hub credential baidu
-  summary: Commands to manage notification hub credential for Baidu(Andrioid China).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_baidu_update
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --api-key
-    summary: Baidu API key.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-key
-    summary: Baidu secret key.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Baidu(Andrioid China).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml
deleted file mode 100644
index 1f3ca22a55..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_gcm
-  name: az notification-hub credential gcm
-  summary: Commands to manage notification hub credential for Google(GCM/FCM).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_gcm_update
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update gcm key
-    syntax:
-      content: >-
-        az notification-hub credential gcm update --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --google-api-key \
-
-        "xxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --google-api-key
-    summary: Google GCM/FCM API key.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Google(GCM/FCM).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml
deleted file mode 100644
index 71cdf0da5c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_mpns
-  name: az notification-hub credential mpns
-  summary: Commands to manage notification hub credential for Windows Phone(MPNS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_mpns_update
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --certificate-key
-    summary: The certificate key for this credential.
-    description: ''
-  - isRequired: true
-    name: --mpns-certificate
-    summary: The MPNS certificate.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Windows Phone(MPNS).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml
deleted file mode 100644
index ac658ffe64..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_wns
-  name: az notification-hub credential wns
-  summary: Commands to manage notification hub credential for Windows(WNS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_wns_update
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --package-sid
-    summary: The package ID for this credential.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-key
-    summary: The secret key.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Windows(WNS).
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml
deleted file mode 100644
index 8128647636..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_namespace
-  name: az notification-hub namespace
-  summary: Commands to manage notification hub namespace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_namespace_check_availability
-  - ext_notification-hub_az_notification_hub_namespace_create
-  - ext_notification-hub_az_notification_hub_namespace_delete
-  - ext_notification-hub_az_notification_hub_namespace_list
-  - ext_notification-hub_az_notification_hub_namespace_show
-  - ext_notification-hub_az_notification_hub_namespace_update
-  - ext_notification-hub_az_notification_hub_namespace_wait
-- uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-  name: az notification-hub namespace check-availability
-  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check name availability of namespace
-    syntax:
-      content: az notification-hub namespace check-availability --name "my-test-space"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name to check.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_create
-  name: az notification-hub namespace create
-  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a namespace
-    syntax:
-      content: >-
-        az notification-hub namespace create --resource-group MyResourceGroup --name \
-
-        my-namespace --location "South Central US" --sku Standard
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: Basic, Free, Standard
-    summary: Name of the notification hub sku.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_delete
-  name: az notification-hub namespace delete
-  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the namespace
-    syntax:
-      content: >-
-        az notification-hub namespace delete --resource-group MyResourceGroup --name \
-
-        my-namespace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_list
-  name: az notification-hub namespace list
-  summary: List available namespaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List available namespaces within a resource group
-    syntax:
-      content: az notification-hub namespace list --resource-group MyResourceGroup
-  - summary: List all the available namespaces within the subscription irrespective of the resourceGroups
-    syntax:
-      content: az notification-hub namespace list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_show
-  name: az notification-hub namespace show
-  summary: Return the description for the specified namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show namespace info
-    syntax:
-      content: >-
-        az notification-hub namespace show --resource-group MyResourceGroup --name \
-
-        my-namespace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_update
-  name: az notification-hub namespace update
-  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the namespace
-    syntax:
-      content: >-
-        az notification-hub namespace update --resource-group MyResourceGroup --name \
-
-        my-namespace --sku Standard
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Free, Standard
-    summary: Name of the notification hub sku.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_wait
-  name: az notification-hub namespace wait
-  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Notification Hub Namesapce is successfully provisioned.
-    syntax:
-      content: az notification-hub namespace wait --resource-group MyResourceGroup --name \ my-namespace --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-  name: az notification-hub namespace authorization-rule
-  summary: Commands to manage notification hubs namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-- uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-  name: az notification-hub namespace check-availability
-  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
-- uid: ext_notification-hub_az_notification_hub_namespace_create
-  name: az notification-hub namespace create
-  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
-- uid: ext_notification-hub_az_notification_hub_namespace_delete
-  name: az notification-hub namespace delete
-  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_list
-  name: az notification-hub namespace list
-  summary: List available namespaces.
-- uid: ext_notification-hub_az_notification_hub_namespace_show
-  name: az notification-hub namespace show
-  summary: Return the description for the specified namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_update
-  name: az notification-hub namespace update
-  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
-- uid: ext_notification-hub_az_notification_hub_namespace_wait
-  name: az notification-hub namespace wait
-  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub namespace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml
deleted file mode 100644
index 02274d4889..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml
+++ /dev/null
@@ -1,214 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-  name: az notification-hub namespace authorization-rule
-  summary: Commands to manage notification hubs namespace authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a namespace authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule create --resource-group \
-
-        MyResourceGroup --namespace-name my-namespace --name "sdk-AuthRules-1788" --rights Listen Send
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rights
-    summary: The rights associated with the rule.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a namespace authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule delete --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --name "RootManageSharedAccessKey"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List authorization rules of the namespace
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule list --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List keys of the namesapce authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule list-keys --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --name "RootManageSharedAccessKey"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate keys of the namesapce authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --name "RootManageSharedAccessKey" --policy-key "Secondary Key"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --policy-key
-    parameterValueGroup: Primary Key, Secondary Key
-    summary: Name of the key that has to be regenerated for the Namespace Authorization Rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show namespace authorization rule info
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule show --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --name "RootManageSharedAccessKey"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hubs namespace authorization rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/index.yml
deleted file mode 100644
index e230d84d4c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az
-  name: peering
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_peering_az_peering
-  name: az peering
-  summary: Commands to manage peering.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering.yml
deleted file mode 100644
index d05d84271a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering
-  name: az peering
-  summary: Commands to manage peering.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_create
-  - ext_peering_az_peering_delete
-  - ext_peering_az_peering_list
-  - ext_peering_az_peering_show
-  - ext_peering_az_peering_update
-- uid: ext_peering_az_peering_create
-  name: az peering create
-  summary: Create peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a direct peering
-    syntax:
-      content: >-
-        az peering create --resource-group "MyResourceGroup" --name "MyPeering" --sku-name \
-
-        "Basic_Direct_Free" --kind "Direct" --direct-direct-peering-type "Edge" \
-
-        --peering-location "peeringLocation0" --location "eastus" \
-
-        --direct-connections bandwidthInMbps=10000 sessionAddressProvider=Peer \
-
-        useForPeeringService=false peeringDBFacilityId=99999 sessionPrefixV4=192.168.0.0/31 \
-
-        sessionPrefixV6=fd00::0/127 maxPrefixesAdvertisedV4=1000 maxPrefixesAdvertisedV6=100 \
-
-        md5AuthenticationKey=test-md5-auth-key \
-
-        connectionIdentifier=5F4CB5C7-6B43-4444-9338-9ABC72606C16 \
-
-        --direct-connections bandwidthInMbps=10000 \
-
-        sessionAddressProvider=Microsoft useForPeeringService=true peeringDBFacilityId=99999 \
-
-        connectionIdentifier=8AB00818-D533-4504-A25A-03A17F61201C \
-
-        --direct-peer-asn /subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Peering/peerAsns/peerAsnName
-  parameters:
-  - isRequired: true
-    name: --kind
-    parameterValueGroup: Direct, Exchange
-    summary: The kind of the peering.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --direct-connections
-    summary: The set of connections that constitute a direct peering.
-    description: ''
-  - name: --direct-direct-peering-type
-    parameterValueGroup: Cdn, Edge, Internal, Transit
-    summary: The type of direct peering.
-    description: ''
-  - name: --direct-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --exchange-connections
-    summary: The set of connections that constitute an exchange peering.
-    description: ''
-  - name: --exchange-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --peering-location
-    summary: The location of the peering.
-    description: ''
-  - name: --sku-family
-    parameterValueGroup: Direct, Exchange
-    summary: The family of the peering SKU.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: Basic_Direct_Free, Basic_Exchange_Free, Premium_Direct_Free, Premium_Direct_Metered, Premium_Direct_Unlimited, Premium_Exchange_Metered
-    summary: The name of the peering SKU.
-    description: ''
-  - name: --sku-size
-    parameterValueGroup: Free, Metered, Unlimited
-    summary: The size of the peering SKU.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: Basic, Premium
-    summary: The tier of the peering SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_peering_az_peering_delete
-  name: az peering delete
-  summary: Delete peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a peering
-    syntax:
-      content: az peering delete --resource-group "MyResourceGroup" --name "MyPeering"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_list
-  name: az peering list
-  summary: List peering.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_show
-  name: az peering show
-  summary: Show peering.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_update
-  name: az peering update
-  summary: Update peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update peering tags
-    syntax:
-      content: az peering update --resource-group "MyResourceGroup" --name "MyPeering"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --direct-connections
-    summary: The set of connections that constitute a direct peering.
-    description: ''
-  - name: --direct-direct-peering-type
-    parameterValueGroup: Cdn, Edge, Internal, Transit
-    summary: The type of direct peering.
-    description: ''
-  - name: --direct-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --exchange-connections
-    summary: The set of connections that constitute an exchange peering.
-    description: ''
-  - name: --exchange-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --kind
-    parameterValueGroup: Direct, Exchange
-    summary: The kind of the peering.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --peering-location
-    summary: The location of the peering.
-    description: ''
-  - name: --sku-family
-    parameterValueGroup: Direct, Exchange
-    summary: The family of the peering SKU.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: Basic_Direct_Free, Basic_Exchange_Free, Premium_Direct_Free, Premium_Direct_Metered, Premium_Direct_Unlimited, Premium_Exchange_Metered
-    summary: The name of the peering SKU.
-    description: ''
-  - name: --sku-size
-    parameterValueGroup: Free, Metered, Unlimited
-    summary: The size of the peering SKU.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: Basic, Premium
-    summary: The tier of the peering SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_peering_az_peering_asn
-  name: az peering asn
-  summary: Commands to manage peer asn.
-- uid: ext_peering_az_peering_asn_create
-  name: az peering asn create
-  summary: Create peer ASN.
-- uid: ext_peering_az_peering_asn_delete
-  name: az peering asn delete
-  summary: Delete peer ASN.
-- uid: ext_peering_az_peering_asn_list
-  name: az peering asn list
-  summary: List peer asn.
-- uid: ext_peering_az_peering_asn_show
-  name: az peering asn show
-  summary: Show peer asn.
-- uid: ext_peering_az_peering_asn_update
-  name: az peering asn update
-  summary: Update peer asn.
-- uid: ext_peering_az_peering_create
-  name: az peering create
-  summary: Create peering.
-- uid: ext_peering_az_peering_delete
-  name: az peering delete
-  summary: Delete peering.
-- uid: ext_peering_az_peering_legacy
-  name: az peering legacy
-  summary: Commands to manage legacy peering.
-- uid: ext_peering_az_peering_legacy_list
-  name: az peering legacy list
-  summary: List legacy peering.
-- uid: ext_peering_az_peering_list
-  name: az peering list
-  summary: List peering.
-- uid: ext_peering_az_peering_location
-  name: az peering location
-  summary: Commands to manage peering location.
-- uid: ext_peering_az_peering_location_list
-  name: az peering location list
-  summary: List peering location.
-- uid: ext_peering_az_peering_service
-  name: az peering service
-  summary: Commands to manage peering service.
-- uid: ext_peering_az_peering_service_create
-  name: az peering service create
-  summary: Create peering service.
-- uid: ext_peering_az_peering_service_delete
-  name: az peering service delete
-  summary: Delete peering service.
-- uid: ext_peering_az_peering_service_list
-  name: az peering service list
-  summary: List peering service.
-- uid: ext_peering_az_peering_service_location
-  name: az peering service location
-  summary: Commands to manage peering service location.
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-- uid: ext_peering_az_peering_service_prefix
-  name: az peering service prefix
-  summary: Commands to manage prefix.
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-- uid: ext_peering_az_peering_service_provider
-  name: az peering service provider
-  summary: Commands to manage peering service provider.
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-- uid: ext_peering_az_peering_service_show
-  name: az peering service show
-  summary: Show peering service.
-- uid: ext_peering_az_peering_service_update
-  name: az peering service update
-  summary: Update peering service.
-- uid: ext_peering_az_peering_show
-  name: az peering show
-  summary: Show peering.
-- uid: ext_peering_az_peering_update
-  name: az peering update
-  summary: Update peering.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/asn.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/asn.yml
deleted file mode 100644
index 13ea420813..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/asn.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_asn
-  name: az peering asn
-  summary: Commands to manage peer asn.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_asn_create
-  - ext_peering_az_peering_asn_delete
-  - ext_peering_az_peering_asn_list
-  - ext_peering_az_peering_asn_show
-  - ext_peering_az_peering_asn_update
-- uid: ext_peering_az_peering_asn_create
-  name: az peering asn create
-  summary: Create peer ASN.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a peer ASN
-    syntax:
-      content: >-
-        az peering asn create --name "MyPeerAsn" --peer-asn "65000" --emails \
-
-        "abc@contoso.com,xyz@contoso.com" --phone "+1 (234) 567-8900" --peer-name "Contoso" \
-
-        --validation-state Approved
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The peer ASN name.
-    description: ''
-  - name: --emails
-    summary: The list of email addresses.
-    description: ''
-  - name: --peer-asn
-    summary: The Autonomous System Number (ASN) of the peer.
-    description: ''
-  - name: --peer-name
-    summary: The name of the peer.
-    description: ''
-  - name: --phone
-    summary: The list of contact numbers.
-    description: ''
-  - name: --validation-state
-    parameterValueGroup: Approved, Failed, None, Pending
-    summary: The validation state of the ASN associated with the peer.
-    description: ''
-- uid: ext_peering_az_peering_asn_delete
-  name: az peering asn delete
-  summary: Delete peer ASN.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a peer ASN
-    syntax:
-      content: az peering asn delete --name "MyPeerAsn"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The peer ASN name.
-    description: ''
-- uid: ext_peering_az_peering_asn_list
-  name: az peering asn list
-  summary: List peer asn.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_peering_az_peering_asn_show
-  name: az peering asn show
-  summary: Show peer asn.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peer-asn-name
-    summary: The peer ASN name.
-    description: ''
-- uid: ext_peering_az_peering_asn_update
-  name: az peering asn update
-  summary: Update peer asn.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The peer ASN name.
-    description: ''
-  - name: --emails
-    summary: The list of email addresses.
-    description: ''
-  - name: --peer-asn
-    summary: The Autonomous System Number (ASN) of the peer.
-    description: ''
-  - name: --peer-name
-    summary: The name of the peer.
-    description: ''
-  - name: --phone
-    summary: The list of contact numbers.
-    description: ''
-  - name: --validation-state
-    parameterValueGroup: Approved, Failed, None, Pending
-    summary: The validation state of the ASN associated with the peer.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_asn_create
-  name: az peering asn create
-  summary: Create peer ASN.
-- uid: ext_peering_az_peering_asn_delete
-  name: az peering asn delete
-  summary: Delete peer ASN.
-- uid: ext_peering_az_peering_asn_list
-  name: az peering asn list
-  summary: List peer asn.
-- uid: ext_peering_az_peering_asn_show
-  name: az peering asn show
-  summary: Show peer asn.
-- uid: ext_peering_az_peering_asn_update
-  name: az peering asn update
-  summary: Update peer asn.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peer asn.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/legacy.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/legacy.yml
deleted file mode 100644
index 5ab1fd4c29..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/legacy.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_legacy
-  name: az peering legacy
-  summary: Commands to manage legacy peering.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_legacy_list
-- uid: ext_peering_az_peering_legacy_list
-  name: az peering legacy list
-  summary: List legacy peering.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --kind
-    summary: The kind of the peering.
-    description: ''
-  - name: --peering-location
-    summary: The location of the peering.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_legacy_list
-  name: az peering legacy list
-  summary: List legacy peering.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage legacy peering.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/location.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/location.yml
deleted file mode 100644
index 0e2ec04bb2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/location.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_location
-  name: az peering location
-  summary: Commands to manage peering location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_location_list
-- uid: ext_peering_az_peering_location_list
-  name: az peering location list
-  summary: List peering location.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --direct-peering-type
-    summary: The type of direct peering.
-    description: ''
-  - name: --kind
-    summary: The kind of the peering.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_location_list
-  name: az peering location list
-  summary: List peering location.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering location.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service.yml
deleted file mode 100644
index 73b898086b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service.yml
+++ /dev/null
@@ -1,191 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service
-  name: az peering service
-  summary: Commands to manage peering service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_create
-  - ext_peering_az_peering_service_delete
-  - ext_peering_az_peering_service_list
-  - ext_peering_az_peering_service_show
-  - ext_peering_az_peering_service_update
-- uid: ext_peering_az_peering_service_create
-  name: az peering service create
-  summary: Create peering service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a  peering service
-    syntax:
-      content: >-
-        az peering service create --resource-group "MyResourceGroup" --name "MyPeeringService" \
-
-        --peering-service-location "state1" --peering-service-provider "serviceProvider1" \
-
-        --location "eastus"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --peering-service-location
-    summary: The PeeringServiceLocation of the Customer.
-    description: ''
-  - isRequired: true
-    name: --peering-service-provider
-    summary: The MAPS Provider Name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_peering_az_peering_service_delete
-  name: az peering service delete
-  summary: Delete peering service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a peering service
-    syntax:
-      content: az peering service delete --resource-group "MyResourceGroup" --name "MyPeeringService"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_list
-  name: az peering service list
-  summary: List peering service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_show
-  name: az peering service show
-  summary: Show peering service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_update
-  name: az peering service update
-  summary: Update peering service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update peering service tags
-    syntax:
-      content: az peering service update --resource-group "MyResourceGroup" --name "MyPeeringService"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --peering-service-location
-    summary: The PeeringServiceLocation of the Customer.
-    description: ''
-  - name: --peering-service-provider
-    summary: The MAPS Provider Name.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_peering_az_peering_service_create
-  name: az peering service create
-  summary: Create peering service.
-- uid: ext_peering_az_peering_service_delete
-  name: az peering service delete
-  summary: Delete peering service.
-- uid: ext_peering_az_peering_service_list
-  name: az peering service list
-  summary: List peering service.
-- uid: ext_peering_az_peering_service_location
-  name: az peering service location
-  summary: Commands to manage peering service location.
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-- uid: ext_peering_az_peering_service_prefix
-  name: az peering service prefix
-  summary: Commands to manage prefix.
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-- uid: ext_peering_az_peering_service_provider
-  name: az peering service provider
-  summary: Commands to manage peering service provider.
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-- uid: ext_peering_az_peering_service_show
-  name: az peering service show
-  summary: Show peering service.
-- uid: ext_peering_az_peering_service_update
-  name: az peering service update
-  summary: Update peering service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/location.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/location.yml
deleted file mode 100644
index c015df73f9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/location.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service_location
-  name: az peering service location
-  summary: Commands to manage peering service location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_location_list
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering service location.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/prefix.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/prefix.yml
deleted file mode 100644
index 80948eef8c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/prefix.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service_prefix
-  name: az peering service prefix
-  summary: Commands to manage prefix.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_prefix_create
-  - ext_peering_az_peering_service_prefix_delete
-  - ext_peering_az_peering_service_prefix_list
-  - ext_peering_az_peering_service_prefix_show
-  - ext_peering_az_peering_service_prefix_update
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a prefix for the peering service
-    syntax:
-      content: >-
-        az peering service prefix create --resource-group "MyResourceGroup" \
-
-        --peering-service-name "MyPeeringService" --name "MyPeeringServicePrefix" --prefix \
-
-        "192.168.1.0/24"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --prefix
-    summary: The prefix from which your traffic originates.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a prefix associated with the peering service
-    syntax:
-      content: >-
-        az peering service prefix delete --resource-group "MyResourceGroup" \
-
-        --peering-service-name "MyPeeringService" --name "MyPeeringServicePrefix"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --prefix-name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: The properties to be expanded.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --prefix
-    summary: The prefix from which your traffic originates.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage prefix.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/provider.yml b/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/provider.yml
deleted file mode 100644
index d742800675..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/peering/peering/service/provider.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service_provider
-  name: az peering service provider
-  summary: Commands to manage peering service provider.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_provider_list
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering service provider.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/portal/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/portal/index.yml
deleted file mode 100644
index 711d1fe975..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/portal/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_portal_az
-  name: portal
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_portal_az_portal
-  name: az portal
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/portal/portal.yml b/2017-03-09-profile/docs-ref-autogen/ext/portal/portal.yml
deleted file mode 100644
index 58bd3cca91..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/portal/portal.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_portal_az_portal
-  name: az portal
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_portal_az_portal_dashboard
-  name: az portal dashboard
-  summary: Manage portal dashboards.
-- uid: ext_portal_az_portal_dashboard_create
-  name: az portal dashboard create
-  summary: Creates or updates a dashboard.
-- uid: ext_portal_az_portal_dashboard_delete
-  name: az portal dashboard delete
-  summary: Deletes a dashboard.
-- uid: ext_portal_az_portal_dashboard_import
-  name: az portal dashboard import
-  summary: Imports a dashboard from a JSON file.
-- uid: ext_portal_az_portal_dashboard_list
-  name: az portal dashboard list
-  summary: Lists the dashboards within a subscription or resource group.
-- uid: ext_portal_az_portal_dashboard_show
-  name: az portal dashboard show
-  summary: Gets details for a single dashboard.
-- uid: ext_portal_az_portal_dashboard_update
-  name: az portal dashboard update
-  summary: Updates an existing dashboard.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/portal/portal/dashboard.yml b/2017-03-09-profile/docs-ref-autogen/ext/portal/portal/dashboard.yml
deleted file mode 100644
index 09f2605403..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/portal/portal/dashboard.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_portal_az_portal_dashboard
-  name: az portal dashboard
-  summary: Manage portal dashboards.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_portal_az_portal_dashboard_create
-  - ext_portal_az_portal_dashboard_delete
-  - ext_portal_az_portal_dashboard_import
-  - ext_portal_az_portal_dashboard_list
-  - ext_portal_az_portal_dashboard_show
-  - ext_portal_az_portal_dashboard_update
-- uid: ext_portal_az_portal_dashboard_create
-  name: az portal dashboard create
-  summary: Creates or updates a dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a Dashboard
-    syntax:
-      content: >-
-        az portal dashboard create --location "eastus" --name "testDashboard" \
-
-        --resource-group "testRG" --input-path "/src/json/properties.json" \
-
-        --tags aKey=aValue anotherKey=anotherValue
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The path to the dashboard properties JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_portal_az_portal_dashboard_delete
-  name: az portal dashboard delete
-  summary: Deletes a dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Dashboard
-    syntax:
-      content: az portal dashboard delete --name "testDashboard" --resource-group "testRG"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_import
-  name: az portal dashboard import
-  summary: Imports a dashboard from a JSON file.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import a Dashboard
-    syntax:
-      content: >-
-        az portal dashboard import --name "testDashboard" --resource-group "testRG" \
-
-        --input-path "/src/json/dashboard.json"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The path to the dashboard json file.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-  - name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_list
-  name: az portal dashboard list
-  summary: Lists the dashboards within a subscription or resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all dashboards in a resourceGroup
-    syntax:
-      content: az portal dashboard list --resource-group "testRG"
-  - summary: List all dashboards in a subscription
-    syntax:
-      content: az portal dashboard list
-  parameters:
-  - name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_show
-  name: az portal dashboard show
-  summary: Gets details for a single dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Dashboard
-    syntax:
-      content: az portal dashboard show --name "testDashboard" --resource-group "testRG"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_update
-  name: az portal dashboard update
-  summary: Updates an existing dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a Dashboard
-    syntax:
-      content: >-
-        az portal dashboard update --name "testDashboard" --resource-group "testRG" \
-
-        --input-path "/src/json/properties.json"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The path to the dashboard properties JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-commands:
-- uid: ext_portal_az_portal_dashboard_create
-  name: az portal dashboard create
-  summary: Creates or updates a dashboard.
-- uid: ext_portal_az_portal_dashboard_delete
-  name: az portal dashboard delete
-  summary: Deletes a dashboard.
-- uid: ext_portal_az_portal_dashboard_import
-  name: az portal dashboard import
-  summary: Imports a dashboard from a JSON file.
-- uid: ext_portal_az_portal_dashboard_list
-  name: az portal dashboard list
-  summary: Lists the dashboards within a subscription or resource group.
-- uid: ext_portal_az_portal_dashboard_show
-  name: az portal dashboard show
-  summary: Gets details for a single dashboard.
-- uid: ext_portal_az_portal_dashboard_update
-  name: az portal dashboard update
-  summary: Updates an existing dashboard.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage portal dashboards.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/index.yml
deleted file mode 100644
index 10da212586..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_powerbidedicated_az
-  name: powerbidedicated
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_powerbidedicated_az_powerbi
-  name: az powerbi
-  summary: Manage PowerBI resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi.yml b/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi.yml
deleted file mode 100644
index 7564c3526f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_powerbidedicated_az_powerbi
-  name: az powerbi
-  summary: Manage PowerBI resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-  name: az powerbi embedded-capacity
-  summary: Manage PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  name: az powerbi embedded-capacity create
-  summary: Create a new PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  name: az powerbi embedded-capacity delete
-  summary: Delete the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  name: az powerbi embedded-capacity list
-  summary: List all the embedded capacities for the given resource group.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  name: az powerbi embedded-capacity show
-  summary: Get details about the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  name: az powerbi embedded-capacity update
-  summary: Update the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-  name: az powerbi embedded-capacity wait
-  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage PowerBI resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml b/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml
deleted file mode 100644
index 9fbadbb006..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml
+++ /dev/null
@@ -1,255 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-  name: az powerbi embedded-capacity
-  summary: Manage PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  name: az powerbi embedded-capacity create
-  summary: Create a new PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new PowerBI embedded capacity.
-    syntax:
-      content: >-
-        az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
-
-        --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
-
-        "azsdktest@microsoft.com" "azsdktest2@microsoft.com"
-  - summary: Create a new PowerBI embedded capacity without waiting.
-    syntax:
-      content: >-
-        az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
-
-        --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
-
-        "azsdktest@microsoft.com" "azsdktest2@microsoft.com" --no-wait
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    parameterValueGroup: A1, A2, A3, A4, A5, A6
-    summary: Name of the SKU level. For more information, please refer to <a href="https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/">https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/</a>.
-    description: ''
-  - name: --administration-members
-    summary: An array of administrator user identities.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: PBIE_Azure
-    summary: The name of the Azure pricing tier to which the SKU applies.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  name: az powerbi embedded-capacity delete
-  summary: Delete the specified PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a capacity in specified resource group.
-    syntax:
-      content: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest"
-  - summary: Delete a capacity in specified resource group without prompt.
-    syntax:
-      content: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" -y
-  - summary: Delete a capacity in specified resource group without waiting.
-    syntax:
-      content: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" --no-wait
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  name: az powerbi embedded-capacity list
-  summary: List all the embedded capacities for the given resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List capacities in resource group
-    syntax:
-      content: az powerbi embedded-capacity list --resource-group "TestRG"
-  - summary: List all capacities in default subscription.
-    syntax:
-      content: az powerbi embedded-capacity list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  name: az powerbi embedded-capacity show
-  summary: Get details about the specified PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details of a capacity
-    syntax:
-      content: az powerbi embedded-capacity show --resource-group "TestRG" --name "azsdktest"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  name: az powerbi embedded-capacity update
-  summary: Update the specified PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update sku name for the specified PowerBI embedded capacity.
-    syntax:
-      content: az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" --sku-name "A1"
-  - summary: Update administrator members the specified PowerBI embedded capacity without waiting.
-    syntax:
-      content: >-
-        az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" \
-
-        --sku-name "A1" --administration-members "azsdktest3@microsoft.com" --no-wait
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --administration-members
-    summary: An array of administrator user identities.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: A1, A2, A3, A4, A5, A6
-    summary: Name of the SKU level. For more information, please refer to <a href="https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/">https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/</a>.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: PBIE_Azure
-    summary: The name of the Azure pricing tier to which the SKU applies.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-  name: az powerbi embedded-capacity wait
-  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until the powerbi embedded capacity is created.
-    syntax:
-      content: az powerbi embedded-capacity wait --resource-group "TestRG" --name "azsdktest" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  name: az powerbi embedded-capacity create
-  summary: Create a new PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  name: az powerbi embedded-capacity delete
-  summary: Delete the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  name: az powerbi embedded-capacity list
-  summary: List all the embedded capacities for the given resource group.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  name: az powerbi embedded-capacity show
-  summary: Get details about the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  name: az powerbi embedded-capacity update
-  summary: Update the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-  name: az powerbi embedded-capacity wait
-  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage PowerBI embedded capacity.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/index.yml
deleted file mode 100644
index b598bf0edd..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az
-  name: privatedns
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network.yml
deleted file mode 100644
index c0db043a32..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network.yml
+++ /dev/null
@@ -1,257 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-- uid: ext_privatedns_az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: ext_privatedns_az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns.yml
deleted file mode 100644
index c50dc6c724..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns.yml
+++ /dev/null
@@ -1,254 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: ext_privatedns_az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS domains in Azure.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/link.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/link.yml
deleted file mode 100644
index 027e46a330..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/link.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS links.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/link/vnet.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/link/vnet.yml
deleted file mode 100644
index b937a1a9d2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/link/vnet.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_link_vnet_create
-  - ext_privatedns_az_network_private_dns_link_vnet_delete
-  - ext_privatedns_az_network_private_dns_link_vnet_list
-  - ext_privatedns_az_network_private_dns_link_vnet_show
-  - ext_privatedns_az_network_private_dns_link_vnet_update
-  - ext_privatedns_az_network_private_dns_link_vnet_wait
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: >-
-        az network private-dns link vnet create -g MyResourceGroup -n MyLinkName -z www.mysite.com \
-            -v MyVirtualNetworkId -e False
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --registration-enabled -e
-    parameterValueGroup: false, true
-    summary: Specify if the link is registration enabled.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --virtual-network -v
-    summary: Name or ID of the virtual network.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-  description: In case of a registration virtual network, all auto-registered DNS records in the zone for the virtual network will also be deleted. This operation cannot be undone.
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: az network private-dns link vnet delete -g MyResourceGroup -z www.mysite.com -n MyLinkName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the virtual network link to the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List virtual network links to the specified Private DNS zone in a resource group.
-    syntax:
-      content: az network private-dns link vnet list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --top
-    summary: The maximum number of virtual network links to return. If not specified, returns up to 100 virtual network links.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a virtual network link to the specified Private DNS zone..
-    syntax:
-      content: az network private-dns link vnet show -g MyResourceGroup -n MyLinkName -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a virtual network link properties to enable registration.
-    syntax:
-      content: az network private-dns link vnet update -g MyResourceGroup -n MyLinkName -z www.mysite.com -e True
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the virtual network link to the Private DNS zone.
-    description: Omit this value to always overwrite the current virtual network link. Specify the last-seen ETag value to prevent accidentally overwritting any concurrent changes.
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --registration-enabled -e
-    parameterValueGroup: false, true
-    summary: Specify if the link is registration enabled.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the virtual network link to the specified Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns link vnet wait -g MyResourceGroup -n MyLinkName -z www.mysite.com --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual network links to the specified Private DNS zone.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set.yml
deleted file mode 100644
index cd95830d57..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set.yml
+++ /dev/null
@@ -1,228 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_list
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all "@" record sets within this zone.
-    syntax:
-      content: >-
-        az network private-dns record-set list -g MyResourceGroup -z www.mysite.com \
-            --query "[?name=='@']"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS records and record sets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/a.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/a.yml
deleted file mode 100644
index f3f9beedc4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/a.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_a_add_record
-  - ext_privatedns_az_network_private_dns_record_set_a_create
-  - ext_privatedns_az_network_private_dns_record_set_a_delete
-  - ext_privatedns_az_network_private_dns_record_set_a_list
-  - ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_a_show
-  - ext_privatedns_az_network_private_dns_record_set_a_update
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an A record.
-    syntax:
-      content: >-
-        az network private-dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
-  - isRequired: true
-    name: --ipv4-address -a
-    summary: IPV4 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty A record set.
-    syntax:
-      content: az network private-dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an A record set and all associated records.
-    syntax:
-      content: az network private-dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all A record sets in a zone.
-    syntax:
-      content: az network private-dns record-set a list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an A record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
-  - isRequired: true
-    name: --ipv4-address -a
-    summary: IPV4 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an A record set.
-    syntax:
-      content: az network private-dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an A record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a update -g MyResourceGroup -n MyRecordSet \
-            -z www.mysite.com --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS A records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/aaaa.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/aaaa.yml
deleted file mode 100644
index 9fc503d211..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/aaaa.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_update
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an AAAA record.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
-  - isRequired: true
-    name: --ipv6-address -a
-    summary: IPV6 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an AAAA record set and all associated records.
-    syntax:
-      content: az network private-dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all AAAA record sets in a zone.
-    syntax:
-      content: az network private-dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an AAAA record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
-  - isRequired: true
-    name: --ipv6-address -a
-    summary: IPV6 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an AAAA record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS AAAA records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/cname.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/cname.yml
deleted file mode 100644
index 5e727c8afe..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/cname.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_cname_create
-  - ext_privatedns_az_network_private_dns_record_set_cname_delete
-  - ext_privatedns_az_network_private_dns_record_set_cname_list
-  - ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  - ext_privatedns_az_network_private_dns_record_set_cname_show
-  - ext_privatedns_az_network_private_dns_record_set_cname_update
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a CNAME record set and its associated record.
-    syntax:
-      content: az network private-dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the CNAME record set in a zone.
-    syntax:
-      content: az network private-dns record-set cname list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a CNAME record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
-  - isRequired: true
-    name: --cname -c
-    summary: Canonical name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the value of a CNAME record.
-    syntax:
-      content: >-
-        az network private-dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
-  - isRequired: true
-    name: --cname -c
-    summary: Canonical name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a CNAME record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS CNAME records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/mx.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/mx.yml
deleted file mode 100644
index 998c2c9d4e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/mx.yml
+++ /dev/null
@@ -1,267 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  - ext_privatedns_az_network_private_dns_record_set_mx_create
-  - ext_privatedns_az_network_private_dns_record_set_mx_delete
-  - ext_privatedns_az_network_private_dns_record_set_mx_list
-  - ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_mx_show
-  - ext_privatedns_az_network_private_dns_record_set_mx_update
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an MX record.
-    syntax:
-      content: >-
-        az network private-dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
-  - isRequired: true
-    name: --exchange -e
-    summary: Exchange metric.
-    description: ''
-  - isRequired: true
-    name: --preference -p
-    summary: Preference metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty MX record set.
-    syntax:
-      content: az network private-dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an MX record set and all associated records.
-    syntax:
-      content: az network private-dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all MX record sets in a zone.
-    syntax:
-      content: az network private-dns record-set mx list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an MX record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
-  - isRequired: true
-    name: --exchange -e
-    summary: Exchange metric.
-    description: ''
-  - isRequired: true
-    name: --preference -p
-    summary: Preference metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an MX record set.
-    syntax:
-      content: az network private-dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an MX record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS MX records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/ptr.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/ptr.yml
deleted file mode 100644
index 8f3d4318c0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/ptr.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  - ext_privatedns_az_network_private_dns_record_set_ptr_create
-  - ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  - ext_privatedns_az_network_private_dns_record_set_ptr_list
-  - ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_ptr_show
-  - ext_privatedns_az_network_private_dns_record_set_ptr_update
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a PTR record.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
-  - isRequired: true
-    name: --ptrdname -d
-    summary: PTR target domain name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a PTR record set and all associated records.
-    syntax:
-      content: az network private-dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all PTR record sets in a zone.
-    syntax:
-      content: az network private-dns record-set ptr list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a PTR record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
-  - isRequired: true
-    name: --ptrdname -d
-    summary: PTR target domain name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a PTR record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS PTR records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/soa.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/soa.yml
deleted file mode 100644
index 4b187748d8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/soa.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_soa_show
-  - ext_privatedns_az_network_private_dns_record_set_soa_update
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an SOA record.
-    syntax:
-      content: az network private-dns record-set soa show -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update properties of an SOA record.
-    syntax:
-      content: >-
-        az network private-dns record-set soa update -g MyResourceGroup -z www.mysite.com \
-            -e myhostmaster.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --email -e
-    summary: Email address.
-    description: ''
-  - name: --expire-time -x
-    summary: Expire time (seconds).
-    description: ''
-  - name: --minimum-ttl -m
-    summary: Minimum TTL (time-to-live, seconds).
-    description: ''
-  - name: --refresh-time -f
-    summary: Refresh value (seconds).
-    description: ''
-  - name: --retry-time -r
-    summary: Retry time (seconds).
-    description: ''
-  - name: --serial-number -s
-    summary: Serial number.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS SOA record.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/srv.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/srv.yml
deleted file mode 100644
index d97ca440b9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/srv.yml
+++ /dev/null
@@ -1,285 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  - ext_privatedns_az_network_private_dns_record_set_srv_create
-  - ext_privatedns_az_network_private_dns_record_set_srv_delete
-  - ext_privatedns_az_network_private_dns_record_set_srv_list
-  - ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_srv_show
-  - ext_privatedns_az_network_private_dns_record_set_srv_update
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an SRV record.
-    syntax:
-      content: >-
-        az network private-dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
-  - isRequired: true
-    name: --port -r
-    summary: Service port.
-    description: ''
-  - isRequired: true
-    name: --priority -p
-    summary: Priority metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --target -t
-    summary: Target domain name.
-    description: ''
-  - isRequired: true
-    name: --weight -w
-    summary: Weight metric.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv create -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an SRV record set and all associated records.
-    syntax:
-      content: az network private-dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all SRV record sets in a zone.
-    syntax:
-      content: az network private-dns record-set srv list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an SRV record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
-  - isRequired: true
-    name: --port -r
-    summary: Service port.
-    description: ''
-  - isRequired: true
-    name: --priority -p
-    summary: Priority metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --target -t
-    summary: Target domain name.
-    description: ''
-  - isRequired: true
-    name: --weight -w
-    summary: Weight metric.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an SRV record set.
-    syntax:
-      content: az network private-dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS SRV records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/txt.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/txt.yml
deleted file mode 100644
index bd68aece07..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/txt.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  - ext_privatedns_az_network_private_dns_record_set_txt_create
-  - ext_privatedns_az_network_private_dns_record_set_txt_delete
-  - ext_privatedns_az_network_private_dns_record_set_txt_list
-  - ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_txt_show
-  - ext_privatedns_az_network_private_dns_record_set_txt_update
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a TXT record.
-    syntax:
-      content: >-
-        az network private-dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --value -v
-    summary: Space-separated list of text values which will be concatenated together.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty TXT record set.
-    syntax:
-      content: az network private-dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a TXT record set and all associated records.
-    syntax:
-      content: az network private-dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all TXT record sets in a zone.
-    syntax:
-      content: az network private-dns record-set txt list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a TXT record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --value -v
-    summary: Space-separated list of text values which will be concatenated together.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a TXT record set.
-    syntax:
-      content: az network private-dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a TXT record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS TXT records.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/zone.yml b/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/zone.yml
deleted file mode 100644
index dca2a22f90..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/privatedns/network/private-dns/zone.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_zone_create
-  - ext_privatedns_az_network_private_dns_zone_delete
-  - ext_privatedns_az_network_private_dns_zone_list
-  - ext_privatedns_az_network_private_dns_zone_show
-  - ext_privatedns_az_network_private_dns_zone_update
-  - ext_privatedns_az_network_private_dns_zone_wait
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone create -g MyResourceGroup -n www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-  description: All DNS records in the zone will also be deleted. This operation cannot be undone. Private DNS zone cannot be deleted unless all virtual network links to it are removed.
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone delete -g MyResourceGroup -n www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Private DNS zones in a resource group.
-    syntax:
-      content: az network private-dns zone list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone show -g MyResourceGroup -n www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a Private DNS zone properties to change the user-defined value of a previously set tag.
-    syntax:
-      content: az network private-dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the Private DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen ETag value to prevent accidentally overwritting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns zone wait -g MyResourceGroup -n www.mysite.com --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS zones.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph.yml b/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph.yml
deleted file mode 100644
index ccd741af6c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_resource-graph_az_graph
-  name: az graph
-  summary: Query the resources managed by Azure Resource Manager.
-  description: Run 'az graph query --help' for detailed help.
-  langs:
-  - azurecli
-  children:
-  - ext_resource-graph_az_graph_query
-- uid: ext_resource-graph_az_graph_query
-  name: az graph query
-  summary: Query the resources managed by Azure Resource Manager.
-  description: See <a href="https://aka.ms/AzureResourceGraph-QueryLanguage">https://aka.ms/AzureResourceGraph-QueryLanguage</a> to learn more about query language and browse examples.
-  langs:
-  - azurecli
-  examples:
-  - summary: Query resources requesting a subset of resource fields.
-    syntax:
-      content: az graph query -q "project id, name, type, location, tags"
-  - summary: Query resources with field selection, filtering and summarizing.
-    syntax:
-      content: az graph query -q "project id, type, location | where type =~ 'Microsoft.Compute/virtualMachines' | summarize count() by location | top 3 by count_"
-  - summary: Request a subset of results, skipping 20 items and getting the next 10.
-    syntax:
-      content: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --first 10 --skip 20
-  - summary: Choose subscriptions to query.
-    syntax:
-      content: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --subscriptions 11111111-1111-1111-1111-111111111111, 22222222-2222-2222-2222-222222222222
-  parameters:
-  - isRequired: true
-    name: --graph-query --q -q
-    summary: Resource Graph query to execute.
-    description: ''
-  - name: --first
-    defaultValue: "100"
-    summary: 'The maximum number of objects to return. Accepted range: 1-5000.'
-    description: ''
-  - name: --include
-    summary: 'Indicates if result should be extended with subscription and tenants names. Possible values: none, displayNames.'
-    description: ''
-  - name: --skip
-    summary: Ignores the first N objects and then gets the remaining objects.
-    description: ''
-  - name: --subscriptions -s
-    summary: List of subscriptions to run query against. By default all accessible subscriptions are queried.
-    description: ''
-commands:
-- uid: ext_resource-graph_az_graph_query
-  name: az graph query
-  summary: Query the resources managed by Azure Resource Manager.
-- uid: ext_resource-graph_az_graph_shared_query
-  name: az graph shared-query
-  summary: Manage shared query of Azure resource graph.
-- uid: ext_resource-graph_az_graph_shared_query_create
-  name: az graph shared-query create
-  summary: Create a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_delete
-  name: az graph shared-query delete
-  summary: Delete a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_list
-  name: az graph shared-query list
-  summary: List all shared query in a resource group.
-- uid: ext_resource-graph_az_graph_shared_query_show
-  name: az graph shared-query show
-  summary: Show the properties of a shared query.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Run 'az graph query --help' for detailed help.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml b/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml
deleted file mode 100644
index 98ed8a3652..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_resource-graph_az_graph_shared_query
-  name: az graph shared-query
-  summary: Manage shared query of Azure resource graph.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_resource-graph_az_graph_shared_query_create
-  - ext_resource-graph_az_graph_shared_query_delete
-  - ext_resource-graph_az_graph_shared_query_list
-  - ext_resource-graph_az_graph_shared_query_show
-- uid: ext_resource-graph_az_graph_shared_query_create
-  name: az graph shared-query create
-  summary: Create a shared query.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a shared query requesting a subset of resource fields.
-    syntax:
-      content: az graph shared-query create -g MyResourceGroup -n MySharedQuery -q "project id, name, type, location, tags" -d "requesting a subset of resource fields." --tags key=value
-  parameters:
-  - isRequired: true
-    name: --description -d
-    summary: Description of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --graph-query --q -q
-    summary: Resource Graph query to execute.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_resource-graph_az_graph_shared_query_delete
-  name: az graph shared-query delete
-  summary: Delete a shared query.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_resource-graph_az_graph_shared_query_list
-  name: az graph shared-query list
-  summary: List all shared query in a resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all shared query in a resource group.
-    syntax:
-      content: az graph shared-query list -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_resource-graph_az_graph_shared_query_show
-  name: az graph shared-query show
-  summary: Show the properties of a shared query.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_resource-graph_az_graph_shared_query_create
-  name: az graph shared-query create
-  summary: Create a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_delete
-  name: az graph shared-query delete
-  summary: Delete a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_list
-  name: az graph shared-query list
-  summary: List all shared query in a resource group.
-- uid: ext_resource-graph_az_graph_shared_query_show
-  name: az graph shared-query show
-  summary: Show the properties of a shared query.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared query of Azure resource graph.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/index.yml
deleted file mode 100644
index 7b091fe685..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/resource-graph/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_resource-graph_az
-  name: resource-graph
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_resource-graph_az_graph
-  name: az graph
-  summary: Query the resources managed by Azure Resource Manager.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/hanainstance.yml b/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/hanainstance.yml
deleted file mode 100644
index c53acf83f1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/hanainstance.yml
+++ /dev/null
@@ -1,208 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az_hanainstance
-  name: az hanainstance
-  summary: (PREVIEW) Manage Azure SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_sap-hana_az_hanainstance_create
-  - ext_sap-hana_az_hanainstance_delete
-  - ext_sap-hana_az_hanainstance_list
-  - ext_sap-hana_az_hanainstance_restart
-  - ext_sap-hana_az_hanainstance_show
-  - ext_sap-hana_az_hanainstance_shutdown
-  - ext_sap-hana_az_hanainstance_start
-  - ext_sap-hana_az_hanainstance_update
-- uid: ext_sap-hana_az_hanainstance_create
-  name: az hanainstance create
-  summary: Create a new SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --ip-address
-    summary: IP address to connect to the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: Location of the SAP HANA instance. Default is the location of target resource group.
-    description: ''
-  - isRequired: true
-    name: --os-computer-name
-    summary: OS computer name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --partner-node-id
-    summary: ARM ID of a HANA Instance on the network to connect the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --ssh-public-key
-    summary: SSH public key to connect to the SAP HANA instance.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_delete
-  name: az hanainstance delete
-  summary: Delete a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_list
-  name: az hanainstance list
-  summary: List SAP HANA Instances.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_restart
-  name: az hanainstance restart
-  summary: Restart a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_show
-  name: az hanainstance show
-  summary: Get the details of a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_shutdown
-  name: az hanainstance shutdown
-  summary: Shutdown a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_start
-  name: az hanainstance start
-  summary: Start a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_update
-  name: az hanainstance update
-  summary: Update the Tags field of a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_sap-hana_az_hanainstance_create
-  name: az hanainstance create
-  summary: Create a new SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_delete
-  name: az hanainstance delete
-  summary: Delete a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_list
-  name: az hanainstance list
-  summary: List SAP HANA Instances.
-- uid: ext_sap-hana_az_hanainstance_restart
-  name: az hanainstance restart
-  summary: Restart a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_show
-  name: az hanainstance show
-  summary: Get the details of a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_shutdown
-  name: az hanainstance shutdown
-  summary: Shutdown a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_start
-  name: az hanainstance start
-  summary: Start a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_update
-  name: az hanainstance update
-  summary: Update the Tags field of a SAP HANA Instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: (PREVIEW) Manage Azure SAP HANA Instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/index.yml
deleted file mode 100644
index b1ce804545..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/index.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az
-  name: sap-hana
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_sap-hana_az_hanainstance
-  name: az hanainstance
-  summary: (PREVIEW) Manage Azure SAP HANA Instance.
-- uid: ext_sap-hana_az_sapmonitor
-  name: az sapmonitor
-  summary: (PREVIEW) Manage Azure SAP Monitor.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor.yml b/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor.yml
deleted file mode 100644
index 8f4e984a33..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az_sapmonitor
-  name: az sapmonitor
-  summary: (PREVIEW) Manage Azure SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_sap-hana_az_sapmonitor_create
-  - ext_sap-hana_az_sapmonitor_delete
-  - ext_sap-hana_az_sapmonitor_list
-  - ext_sap-hana_az_sapmonitor_show
-  - ext_sap-hana_az_sapmonitor_update
-- uid: ext_sap-hana_az_sapmonitor_create
-  name: az sapmonitor create
-  summary: Create a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hana-subnet --hdbsn
-    summary: ARM ID of an Azure Subnet with access to the HANA instance.
-    description: ''
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --region
-    summary: The region to create this SAP monitor on.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --dca --disable_customer_analytics
-    summary: Disable sending analytics to Microsoft.
-    description: ''
-  - name: --hana-db-name --hdb
-    summary: Name of the database itself.
-    description: ''
-  - name: --hana-db-password --hdbpw
-    summary: Password for the HANA database to login for monitoring.
-    description: ''
-  - name: --hana-db-password-key-vault-url --hdpkvu
-    summary: URL to the KeyVault secret that contains the HANA credentials.
-    description: ''
-  - name: --hana-db-sql-port --hdbp
-    summary: The port number of the tenant DB. Used to connect to the DB.
-    description: ''
-  - name: --hana-db-username --hdbun
-    summary: Username for the HANA database to login to for monitoring.
-    description: ''
-  - name: --hana-hostname --hdbhn
-    summary: Hostname of the HANA Instance blade.
-    description: ''
-  - name: --key-vault-id --kvi
-    summary: Key Vault ID containing the HANA credentials.
-    description: ''
-  - name: --lawsid --log-analytics-workspace-arm-id
-    summary: Existing log analytics workspace id to use for log monitoring.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_delete
-  name: az sapmonitor delete
-  summary: Delete a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_list
-  name: az sapmonitor list
-  summary: List SAP Monitors.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_sap-hana_az_sapmonitor_show
-  name: az sapmonitor show
-  summary: Get the details of a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_update
-  name: az sapmonitor update
-  summary: Updates the tags field of a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_sap-hana_az_sapmonitor_create
-  name: az sapmonitor create
-  summary: Create a SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_delete
-  name: az sapmonitor delete
-  summary: Delete a SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_list
-  name: az sapmonitor list
-  summary: List SAP Monitors.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance
-  name: az sapmonitor provider-instance
-  summary: Manage the provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-  name: az sapmonitor provider-instance create
-  summary: Create a new provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-  name: az sapmonitor provider-instance delete
-  summary: Delete a provider instance from the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-  name: az sapmonitor provider-instance list
-  summary: List provider instances for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-  name: az sapmonitor provider-instance show
-  summary: Get the details of a provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_show
-  name: az sapmonitor show
-  summary: Get the details of a SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_update
-  name: az sapmonitor update
-  summary: Updates the tags field of a SAP Monitor.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: (PREVIEW) Manage Azure SAP Monitor.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml b/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml
deleted file mode 100644
index e35b1d56dc..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az_sapmonitor_provider_instance
-  name: az sapmonitor provider-instance
-  summary: Manage the provider instance for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_sap-hana_az_sapmonitor_provider_instance_create
-  - ext_sap-hana_az_sapmonitor_provider_instance_delete
-  - ext_sap-hana_az_sapmonitor_provider_instance_list
-  - ext_sap-hana_az_sapmonitor_provider_instance_show
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-  name: az sapmonitor provider-instance create
-  summary: Create a new provider instance for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-name
-    summary: The name of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-properties
-    summary: The properties of the provider instance (Should be of JSON format).
-    description: ''
-  - isRequired: true
-    name: --provider-instance-type
-    summary: The type of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --provider-instance-metadata
-    summary: The metadata of the provider instance (Should be of JSON format).
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-  name: az sapmonitor provider-instance delete
-  summary: Delete a provider instance from the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-name
-    summary: The name of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-  name: az sapmonitor provider-instance list
-  summary: List provider instances for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-  name: az sapmonitor provider-instance show
-  summary: Get the details of a provider instance for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-name
-    summary: The name of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-  name: az sapmonitor provider-instance create
-  summary: Create a new provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-  name: az sapmonitor provider-instance delete
-  summary: Delete a provider instance from the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-  name: az sapmonitor provider-instance list
-  summary: List provider instances for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-  name: az sapmonitor provider-instance show
-  summary: Get the details of a provider instance for the SAP Monitor.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the provider instance for the SAP Monitor.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/index.yml
deleted file mode 100644
index 6a3ee5e2bb..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az
-  name: spring-cloud
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_spring-cloud_az_spring_cloud
-  name: az spring-cloud
-  summary: Commands to manage Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml
deleted file mode 100644
index 5f183abd81..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml
+++ /dev/null
@@ -1,337 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud
-  name: az spring-cloud
-  summary: Commands to manage Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_create
-  - ext_spring-cloud_az_spring_cloud_delete
-  - ext_spring-cloud_az_spring_cloud_list
-  - ext_spring-cloud_az_spring_cloud_show
-  - ext_spring-cloud_az_spring_cloud_update
-- uid: ext_spring-cloud_az_spring_cloud_create
-  name: az spring-cloud create
-  summary: Create an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new Azure Spring Cloud in westus.
-    syntax:
-      content: az spring-cloud create -n MyService -g MyResourceGroup -l westus
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    summary: Name of SKU, the value is "Basic" or "Standard".
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_delete
-  name: az spring-cloud delete
-  summary: Delete an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_list
-  name: az spring-cloud list
-  summary: List all Azure Spring Cloud in the given resource group, otherwise list the subscription's.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_show
-  name: az spring-cloud show
-  summary: Show the details for an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_update
-  name: az spring-cloud update
-  summary: Update pricing tier of an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update pricing tier.
-    syntax:
-      content: az spring-cloud update -n MyService --sku Standard -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    summary: Name of SKU, the value is "Basic" or "Standard".
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app
-  name: az spring-cloud app
-  summary: Commands to manage apps in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding
-  name: az spring-cloud app binding
-  summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-- uid: ext_spring-cloud_az_spring_cloud_app_create
-  name: az spring-cloud app create
-  summary: Create a new app with a default deployment in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-  name: az spring-cloud app custom-domain
-  summary: Commands to manage custom domains.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_delete
-  name: az spring-cloud app delete
-  summary: Delete an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_deploy
-  name: az spring-cloud app deploy
-  summary: Deploy source code or pre-built binary to an app and update related configurations.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment
-  name: az spring-cloud app deployment
-  summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity
-  name: az spring-cloud app identity
-  summary: Manage an app's managed service identity.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-- uid: ext_spring-cloud_az_spring_cloud_app_list
-  name: az spring-cloud app list
-  summary: List all apps in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_log
-  name: az spring-cloud app log
-  summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_logs
-  name: az spring-cloud app logs
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_restart
-  name: az spring-cloud app restart
-  summary: Restart instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_scale
-  name: az spring-cloud app scale
-  summary: Manually scale an app or its deployments.
-- uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-  name: az spring-cloud app set-deployment
-  summary: Set production deployment of an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_show
-  name: az spring-cloud app show
-  summary: Show the details of an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  name: az spring-cloud app show-deploy-log
-  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_start
-  name: az spring-cloud app start
-  summary: Start instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_stop
-  name: az spring-cloud app stop
-  summary: Stop instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_update
-  name: az spring-cloud app update
-  summary: Update configurations of an app.
-- uid: ext_spring-cloud_az_spring_cloud_certificate
-  name: az spring-cloud certificate
-  summary: Commands to manage certificates.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_add
-  name: az spring-cloud certificate add
-  summary: Add a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_list
-  name: az spring-cloud certificate list
-  summary: List all certificates in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-  name: az spring-cloud certificate remove
-  summary: Remove a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_show
-  name: az spring-cloud certificate show
-  summary: Show a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server
-  name: az spring-cloud config-server
-  summary: Commands to manage Config Server in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-  name: az spring-cloud config-server clear
-  summary: Erase all settings in Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git
-  name: az spring-cloud config-server git
-  summary: Commands to manage Config Server git property in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_set
-  name: az spring-cloud config-server set
-  summary: Set Config Server from a yaml file.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_show
-  name: az spring-cloud config-server show
-  summary: Show Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_create
-  name: az spring-cloud create
-  summary: Create an Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_delete
-  name: az spring-cloud delete
-  summary: Delete an Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_list
-  name: az spring-cloud list
-  summary: List all Azure Spring Cloud in the given resource group, otherwise list the subscription's.
-- uid: ext_spring-cloud_az_spring_cloud_show
-  name: az spring-cloud show
-  summary: Show the details for an Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-  name: az spring-cloud test-endpoint
-  summary: Commands to manage test endpoint in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  name: az spring-cloud test-endpoint disable
-  summary: Disable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  name: az spring-cloud test-endpoint enable
-  summary: Enable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  name: az spring-cloud test-endpoint list
-  summary: List test endpoint keys of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-  name: az spring-cloud test-endpoint renew-key
-  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_update
-  name: az spring-cloud update
-  summary: Update pricing tier of an Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml
deleted file mode 100644
index 6dcf8b495d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml
+++ /dev/null
@@ -1,600 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app
-  name: az spring-cloud app
-  summary: Commands to manage apps in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_create
-  - ext_spring-cloud_az_spring_cloud_app_delete
-  - ext_spring-cloud_az_spring_cloud_app_deploy
-  - ext_spring-cloud_az_spring_cloud_app_list
-  - ext_spring-cloud_az_spring_cloud_app_logs
-  - ext_spring-cloud_az_spring_cloud_app_restart
-  - ext_spring-cloud_az_spring_cloud_app_scale
-  - ext_spring-cloud_az_spring_cloud_app_set_deployment
-  - ext_spring-cloud_az_spring_cloud_app_show
-  - ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  - ext_spring-cloud_az_spring_cloud_app_start
-  - ext_spring-cloud_az_spring_cloud_app_stop
-  - ext_spring-cloud_az_spring_cloud_app_update
-- uid: ext_spring-cloud_az_spring_cloud_app_create
-  name: az spring-cloud app create
-  summary: Create a new app with a default deployment in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an app with the default configuration.
-    syntax:
-      content: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup
-  - summary: Create an public accessible app with 3 instances and 2 cpu cores and 3 GB of memory per instance.
-    syntax:
-      content: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup --is-public true --cpu 2 --memory 3 --instance-count 3
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --assign-identity
-    parameterValueGroup: false, true
-    summary: If true, assign managed service identity.
-    description: ''
-  - name: --cpu
-    defaultValue: "1"
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --enable-persistent-storage
-    parameterValueGroup: false, true
-    summary: If true, mount a 50G disk with default path.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --instance-count
-    defaultValue: "1"
-    summary: Number of instance.
-    description: ''
-  - name: --is-public
-    parameterValueGroup: false, true
-    summary: If true, assign public domain.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --memory
-    defaultValue: "1"
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_delete
-  name: az spring-cloud app delete
-  summary: Delete an app in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deploy
-  name: az spring-cloud app deploy
-  summary: Deploy source code or pre-built binary to an app and update related configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy source code to an app. This will pack current directory, build binary with Pivotal Build Service and then deploy to the app.
-    syntax:
-      content: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup
-  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
-    syntax:
-      content: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
-  - summary: Deploy source code to a specific deployment of an app.
-    syntax:
-      content: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --cpu
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --instance-count
-    summary: Number of instance.
-    description: ''
-  - name: --jar-path
-    summary: If provided, deploy jar, otherwise deploy current folder as tar.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --memory
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-  - name: --target-module
-    summary: Child module to be deployed, required for multiple jar packages built from source code.
-    description: ''
-  - name: --version
-    summary: Deployment version, keep unchanged if not set.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_list
-  name: az spring-cloud app list
-  summary: List all apps in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Query status of persistent storage of all apps
-    syntax:
-      content: az spring-cloud app list -s MyCluster -g MyResourceGroup -o json --query '[].{Name:name, PersistentStorage:properties.persistentDisk}'
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_logs
-  name: az spring-cloud app logs
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --follow  -f
-    summary: Specify if the logs should be streamed.
-    description: ''
-  - name: --instance -i
-    summary: Name of an existing instance of the deployment.
-    description: ''
-  - name: --limit
-    defaultValue: "2048"
-    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
-    description: ''
-  - name: --lines
-    defaultValue: "50"
-    summary: Number of lines to show. Maximum is 10000.
-    description: ''
-  - name: --since
-    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_restart
-  name: az spring-cloud app restart
-  summary: Restart instances of the app, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_scale
-  name: az spring-cloud app scale
-  summary: Manually scale an app or its deployments.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Scale up an app to 4 cpu cores and 8 Gb of memory per instance.
-    syntax:
-      content: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup --cpu 3 --memory 8
-  - summary: Scale out a deployment of the app to 5 instances.
-    syntax:
-      content: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment --instance-count 5
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --cpu
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --instance-count
-    summary: Number of instance.
-    description: ''
-  - name: --memory
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-  name: az spring-cloud app set-deployment
-  summary: Set production deployment of an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Swap a staging deployment of an app to production.
-    syntax:
-      content: az spring-cloud app set-deployment -d green-deployment -n MyApp -s MyCluster -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --deployment -d
-    summary: Name of an existing deployment of the app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_show
-  name: az spring-cloud app show
-  summary: Show the details of an app in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  name: az spring-cloud app show-deploy-log
-  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_start
-  name: az spring-cloud app start
-  summary: Start instances of the app, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_stop
-  name: az spring-cloud app stop
-  summary: Stop instances of the app, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_update
-  name: az spring-cloud app update
-  summary: Update configurations of an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an environment variable for the app.
-    syntax:
-      content: az spring-cloud app update -n MyApp -s MyCluster -g MyResourceGroup --env foo=bar
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --enable-persistent-storage
-    parameterValueGroup: false, true
-    summary: If true, mount a 50G disk with default path.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --https-only
-    parameterValueGroup: false, true
-    summary: If true, access app via https.
-    description: ''
-  - name: --is-public
-    parameterValueGroup: false, true
-    summary: If true, assign endpoint.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding
-  name: az spring-cloud app binding
-  summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-- uid: ext_spring-cloud_az_spring_cloud_app_create
-  name: az spring-cloud app create
-  summary: Create a new app with a default deployment in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-  name: az spring-cloud app custom-domain
-  summary: Commands to manage custom domains.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_delete
-  name: az spring-cloud app delete
-  summary: Delete an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_deploy
-  name: az spring-cloud app deploy
-  summary: Deploy source code or pre-built binary to an app and update related configurations.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment
-  name: az spring-cloud app deployment
-  summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity
-  name: az spring-cloud app identity
-  summary: Manage an app's managed service identity.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-- uid: ext_spring-cloud_az_spring_cloud_app_list
-  name: az spring-cloud app list
-  summary: List all apps in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_log
-  name: az spring-cloud app log
-  summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_logs
-  name: az spring-cloud app logs
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_restart
-  name: az spring-cloud app restart
-  summary: Restart instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_scale
-  name: az spring-cloud app scale
-  summary: Manually scale an app or its deployments.
-- uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-  name: az spring-cloud app set-deployment
-  summary: Set production deployment of an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_show
-  name: az spring-cloud app show
-  summary: Show the details of an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  name: az spring-cloud app show-deploy-log
-  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_start
-  name: az spring-cloud app start
-  summary: Start instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_stop
-  name: az spring-cloud app stop
-  summary: Stop instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_update
-  name: az spring-cloud app update
-  summary: Update configurations of an app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage apps in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml
deleted file mode 100644
index 9096e3f355..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding
-  name: az spring-cloud app binding
-  summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_list
-  - ext_spring-cloud_az_spring_cloud_app_binding_remove
-  - ext_spring-cloud_az_spring_cloud_app_binding_show
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml
deleted file mode 100644
index d6e142f11a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  - ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Bind an Azure Cosmos DB.
-    syntax:
-      content: az spring-cloud app binding cosmos add -n cosmosProduction --app MyApp --resource-id ${COSMOSDB_ID} --api-type mongo --database mymongo -g MyResourceGroup -s MyService
-  parameters:
-  - isRequired: true
-    name: --api-type
-    parameterValueGroup: cassandra, gremlin, mongo, sql, table
-    summary: Type of API.
-    description: ''
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Azure resource ID of the service to bind with.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --collection-name
-    summary: Name of collection. Required for gremlin.
-    description: ''
-  - name: --database-name
-    summary: Name of database. Required for mongo, sql, gremlin.
-    description: ''
-  - name: --key-space
-    summary: Cassandra key space. Required for cassandra.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --collection-name
-    summary: Name of collection. Required for gremlin.
-    description: ''
-  - name: --database-name
-    summary: Name of database. Required for mongo, sql, gremlin.
-    description: ''
-  - name: --key-space
-    summary: Cassandra key space. Required for cassandra.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Cosmos DB bindings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml
deleted file mode 100644
index 364dca8274..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  - ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: Database name.
-    description: ''
-  - isRequired: true
-    name: --key
-    summary: API key of the service.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Azure resource ID of the service to bind with.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - isRequired: true
-    name: --username
-    summary: Username of the database.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --database-name
-    summary: Database name.
-    description: ''
-  - name: --key
-    summary: API key of the service.
-    description: ''
-  - name: --username
-    summary: Username of the database.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Database for MySQL bindings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml
deleted file mode 100644
index e81e83505d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  - ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Azure resource ID of the service to bind with.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --disable-ssl
-    summary: Disable SSL.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --disable-ssl
-    summary: Disable SSL.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Cache for Redis bindings.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml
deleted file mode 100644
index ce19efe1ad..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-  name: az spring-cloud app custom-domain
-  summary: Commands to manage custom domains.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Bind a custom domain to app.
-    syntax:
-      content: az spring-cloud app custom-domain bind --domain-name MyDomainName --certificate MyCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --certificate
-    summary: Certificate name in Azure Spring Cloud.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all custom domains of the app.
-    syntax:
-      content: az spring-cloud app custom-domain list --app MyAppName --service MyCluster --resource-group MyResourceGroup -o table
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Bind custom domain with a specified certificate.
-    syntax:
-      content: az spring-cloud app custom-domain update --domain-name MyDomainName --certificate MCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --certificate
-    summary: Certificate name in Azure Spring Cloud.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage custom domains.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml
deleted file mode 100644
index 60bb7e6713..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment
-  name: az spring-cloud app deployment
-  summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_deployment_create
-  - ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  - ext_spring-cloud_az_spring_cloud_app_deployment_list
-  - ext_spring-cloud_az_spring_cloud_app_deployment_show
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy source code to a new deployment of an app. This will pack current directory, build binary with Pivotal Build Service and then deploy.
-    syntax:
-      content: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup
-  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
-    syntax:
-      content: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of deployment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --cpu
-    defaultValue: "1"
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --instance-count
-    defaultValue: "1"
-    summary: Number of instance.
-    description: ''
-  - name: --jar-path
-    summary: If provided, deploy jar, otherwise deploy current folder as tar.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --memory
-    defaultValue: "1"
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-  - name: --skip-clone-settings
-    summary: Create staging deployment will automatically copy settings from production deployment.
-    description: ''
-  - name: --target-module
-    summary: Child module to be deployed, required for multiple jar packages built from source code.
-    description: ''
-  - name: --version
-    summary: Deployment version, keep unchanged if not set.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of deployment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of deployment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml
deleted file mode 100644
index 2be3edadc0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_identity
-  name: az spring-cloud app identity
-  summary: Manage an app's managed service identity.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_identity_assign
-  - ext_spring-cloud_az_spring_cloud_app_identity_remove
-  - ext_spring-cloud_az_spring_cloud_app_identity_show
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable the system assigned identity.
-    syntax:
-      content: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup
-  - summary: Enable the system assigned identity on an app with the 'Reader' role.
-    syntax:
-      content: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup --role Reader --scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/xxxxx/providers/Microsoft.KeyVault/vaults/xxxxx
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --role
-    summary: Role name or id the managed identity will be assigned.
-    description: ''
-  - name: --scope
-    summary: The scope the managed identity has access to.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove the system assigned identity from an app.
-    syntax:
-      content: az spring-cloud app identity remove -n MyApp -s MyCluster -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Display an app's managed identity info.
-    syntax:
-      content: az spring-cloud app identity show -n MyApp -s MyCluster -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage an app's managed service identity.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml
deleted file mode 100644
index 8f17511c53..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_log
-  name: az spring-cloud app log
-  summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_log_tail
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --follow  -f
-    summary: Specify if the logs should be streamed.
-    description: ''
-  - name: --instance -i
-    summary: Name of an existing instance of the deployment.
-    description: ''
-  - name: --limit
-    defaultValue: "2048"
-    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
-    description: ''
-  - name: --lines
-    defaultValue: "50"
-    summary: Number of lines to show. Maximum is 10000.
-    description: ''
-  - name: --since
-    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml
deleted file mode 100644
index bf1be964c6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_certificate
-  name: az spring-cloud certificate
-  summary: Commands to manage certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_certificate_add
-  - ext_spring-cloud_az_spring_cloud_certificate_list
-  - ext_spring-cloud_az_spring_cloud_certificate_remove
-  - ext_spring-cloud_az_spring_cloud_certificate_show
-- uid: ext_spring-cloud_az_spring_cloud_certificate_add
-  name: az spring-cloud certificate add
-  summary: Add a certificate in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import certificate from key vault.
-    syntax:
-      content: az spring-cloud certificate add --name MyCertName --vault-uri MyKeyVaultUri --vault-certificate-name MyKeyVaultCertName --service MyCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of certificate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - isRequired: true
-    name: --vault-certificate-name
-    summary: The certificate name in key vault.
-    description: ''
-  - isRequired: true
-    name: --vault-uri
-    summary: The key vault uri where store the certificate.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_certificate_list
-  name: az spring-cloud certificate list
-  summary: List all certificates in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all certificates in spring cloud service.
-    syntax:
-      content: az spring-cloud certificate list --service MyCluster --resource-group MyResourceGroup -o table
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-  name: az spring-cloud certificate remove
-  summary: Remove a certificate in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of certificate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_certificate_show
-  name: az spring-cloud certificate show
-  summary: Show a certificate in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of certificate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_certificate_add
-  name: az spring-cloud certificate add
-  summary: Add a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_list
-  name: az spring-cloud certificate list
-  summary: List all certificates in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-  name: az spring-cloud certificate remove
-  summary: Remove a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_show
-  name: az spring-cloud certificate show
-  summary: Show a certificate in Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml
deleted file mode 100644
index 7fdad1263e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_config_server
-  name: az spring-cloud config-server
-  summary: Commands to manage Config Server in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_config_server_clear
-  - ext_spring-cloud_az_spring_cloud_config_server_set
-  - ext_spring-cloud_az_spring_cloud_config_server_show
-- uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-  name: az spring-cloud config-server clear
-  summary: Erase all settings in Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_set
-  name: az spring-cloud config-server set
-  summary: Set Config Server from a yaml file.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-file
-    summary: A yaml file path for the configuration of Spring Cloud config server.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_show
-  name: az spring-cloud config-server show
-  summary: Show Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-  name: az spring-cloud config-server clear
-  summary: Erase all settings in Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git
-  name: az spring-cloud config-server git
-  summary: Commands to manage Config Server git property in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_set
-  name: az spring-cloud config-server set
-  summary: Set Config Server from a yaml file.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_show
-  name: az spring-cloud config-server show
-  summary: Show Config Server.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Config Server in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml
deleted file mode 100644
index 797f3abdd7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git
-  name: az spring-cloud config-server git
-  summary: Commands to manage Config Server git property in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_config_server_git_set
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --uri
-    summary: Uri of the added config.
-    description: ''
-  - name: --host-key
-    summary: Host key of the added config.
-    description: ''
-  - name: --host-key-algorithm
-    summary: Host key algorithm of the added config.
-    description: ''
-  - name: --label
-    summary: Label of the added config.
-    description: ''
-  - name: --password
-    summary: Password of the added config.
-    description: ''
-  - name: --private-key
-    summary: Private_key of the added config.
-    description: ''
-  - name: --search-paths
-    summary: Search_paths of the added config, use , as delimiter for multiple paths.
-    description: ''
-  - name: --strict-host-key-checking
-    summary: Strict_host_key_checking of the added config.
-    description: ''
-  - name: --username
-    summary: Username of the added config.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Config Server git property in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml
deleted file mode 100644
index b4786699b3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --repo-name
-    summary: Uri of the repo.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --uri
-    summary: Uri of the added config.
-    description: ''
-  - name: --host-key
-    summary: Host key of the added config.
-    description: ''
-  - name: --host-key-algorithm
-    summary: Host key algorithm of the added config.
-    description: ''
-  - name: --label
-    summary: Label of the added config.
-    description: ''
-  - name: --password
-    summary: Password of the added config.
-    description: ''
-  - name: --pattern
-    summary: Pattern of the repo, use , as delimiter for multiple patterns.
-    description: ''
-  - name: --private-key
-    summary: Private_key of the added config.
-    description: ''
-  - name: --search-paths
-    summary: Search_paths of the added config, use , as delimiter for multiple paths.
-    description: ''
-  - name: --strict-host-key-checking
-    summary: Strict_host_key_checking of the added config.
-    description: ''
-  - name: --username
-    summary: Username of the added config.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --repo-name
-    summary: Uri of the repo.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --repo-name
-    summary: Uri of the repo.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --host-key
-    summary: Host key of the added config.
-    description: ''
-  - name: --host-key-algorithm
-    summary: Host key algorithm of the added config.
-    description: ''
-  - name: --label
-    summary: Label of the added config.
-    description: ''
-  - name: --password
-    summary: Password of the added config.
-    description: ''
-  - name: --pattern
-    summary: Pattern of the repo, use , as delimiter for multiple patterns.
-    description: ''
-  - name: --private-key
-    summary: Private_key of the added config.
-    description: ''
-  - name: --search-paths
-    summary: Search_paths of the added config, use , as delimiter for multiple paths.
-    description: ''
-  - name: --strict-host-key-checking
-    summary: Strict_host_key_checking of the added config.
-    description: ''
-  - name: --uri
-    summary: Uri of the added config.
-    description: ''
-  - name: --username
-    summary: Username of the added config.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Config Server git repository in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml
deleted file mode 100644
index 3ca88fcf36..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-  name: az spring-cloud test-endpoint
-  summary: Commands to manage test endpoint in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  name: az spring-cloud test-endpoint disable
-  summary: Disable test endpoint of the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  name: az spring-cloud test-endpoint enable
-  summary: Enable test endpoint of the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  name: az spring-cloud test-endpoint list
-  summary: List test endpoint keys of the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --app
-    summary: Name of app.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-  name: az spring-cloud test-endpoint renew-key
-  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    parameterValueGroup: Primary, Secondary
-    summary: Type of test-endpoint key.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  name: az spring-cloud test-endpoint disable
-  summary: Disable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  name: az spring-cloud test-endpoint enable
-  summary: Enable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  name: az spring-cloud test-endpoint list
-  summary: List test endpoint keys of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-  name: az spring-cloud test-endpoint renew-key
-  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage test endpoint in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/index.yml
deleted file mode 100644
index b26a31b676..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az
-  name: storage-or-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-or-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage.yml
deleted file mode 100644
index 688bf830f5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-or-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-- uid: ext_storage-or-preview_az_storage_account_or_policy
-  name: az storage account or-policy
-  summary: Manage storage account Object Replication Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Cloud Storage resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account.yml
deleted file mode 100644
index 55ef4eaf54..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-or-preview_az_storage_account_or_policy
-  name: az storage account or-policy
-  summary: Manage storage account Object Replication Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy.yml
deleted file mode 100644
index 4c67dbc086..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy.yml
+++ /dev/null
@@ -1,228 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage_account_or_policy
-  name: az storage account or-policy
-  summary: Manage storage account Object Replication Policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-or-preview_az_storage_account_or_policy_create
-  - ext_storage-or-preview_az_storage_account_or_policy_delete
-  - ext_storage-or-preview_az_storage_account_or_policy_list
-  - ext_storage-or-preview_az_storage_account_or_policy_show
-  - ext_storage-or-preview_az_storage_account_or_policy_update
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create Object Replication Service Policy for storage account.
-    syntax:
-      content: az storage account or-policy create -g ResourceGroupName -n storageAccountName -d destAccountName -s srcAccountName --destination-container dcont --source-container scont
-  - summary: Create Object Replication Service Policy trough json file for storage account.
-    syntax:
-      content: az storage account or-policy create -g ResourceGroupName -n storageAccountName --policy @policy.json
-  - summary: Create Object Replication Service Policy to source storage account through policy associated with destination storage account.
-    syntax:
-      content: az storage account or-policy show -g ResourceGroupName -n destAccountName --policy-id "3496e652-4cea-4581-b2f7-c86b3971ba92" | az storage account or-policy create -g ResourceGroupName -n srcAccountName -p "@-"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --destination-account -d
-    summary: The destination storage account name. Required when no --policy provided.
-    description: ''
-  - name: --policy -p
-    summary: The object replication policy definition between two storage accounts, in JSON format. Multiple rules can be defined in one policy.
-    description: ''
-  - name: --policy-id
-    defaultValue: default
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - name: --source-account -s
-    summary: The source storage account name. Required when no --policy provided.
-    description: ''
-  - name: --min-creation-time -t
-    summary: "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z."
-    description: ''
-  - name: --prefix-match
-    summary: Optional. Filter the results to replicate only blobs whose names begin with the specified prefix.
-    description: ''
-  - name: --destination-container
-    summary: The destination storage container name. Required when no --policy provided.
-    description: ''
-  - name: --rule-id
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-  - name: --source-container
-    summary: The source storage container name. Required when no --policy provided.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete Object Replication Service Policy associated with the specified storage account.
-    syntax:
-      content: az storage account or-policy delete -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Object Replication Service Policies associated with the specified storage account.
-    syntax:
-      content: az storage account or-policy list -g ResourceGroupName -n StorageAccountName
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties of specified Object Replication Service Policy for storage account.
-    syntax:
-      content: az storage account or-policy show -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update source storage account in Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy update -g ResourceGroupName -n StorageAccountName --source-account newSourceAccount --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  - summary: Update Object Replication Service Policy through json file.
-    syntax:
-      content: az storage account or-policy update -g ResourceGroupName -n StorageAccountName -p @policy.json
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --destination-account -d
-    summary: The destination storage account name. Required when no --policy provided.
-    description: ''
-  - name: --policy -p
-    summary: The object replication policy definition between two storage accounts, in JSON format. Multiple rules can be defined in one policy.
-    description: ''
-  - name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - name: --source-account -s
-    summary: The source storage account name. Required when no --policy provided.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account Object Replication Policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy/rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy/rule.yml
deleted file mode 100644
index 5625f201b5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy/rule.yml
+++ /dev/null
@@ -1,199 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_update
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add rule to the specified Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule add -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" -d destContainer -s srcContainer
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --destination-container -d
-    summary: The destination storage container name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source-container -s
-    summary: The source storage container name.
-    description: ''
-  - name: --min-creation-time -t
-    summary: "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z."
-    description: ''
-  - name: --prefix-match
-    summary: Optional. Filter the results to replicate only blobs whose names begin with the specified prefix.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all the rules in the specified Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule list -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove the specified rule from the specified Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule remove -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" --rule-id "78746d86-d3b7-4397-a99c-0837e6741332"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-id -r
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties of specified rule in Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule show -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" --rule-id "78746d86-d3b7-4397-a99c-0837e6741332"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-id -r
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update rule properties to Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule update -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" --rule-id "78746d86-d3b7-4397-a99c-0837e6741332" --prefix-match blobA blobB
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-id -r
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-  - name: --destination-container -d
-    summary: The destination storage container name.
-    description: ''
-  - name: --source-container -s
-    summary: The source storage container name.
-    description: ''
-  - name: --min-creation-time -t
-    summary: "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z."
-    description: ''
-  - name: --prefix-match
-    summary: Optional. Filter the results to replicate only blobs whose names begin with the specified prefix.
-    description: ''
-commands:
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Object Replication Service Policy Rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/index.yml
deleted file mode 100644
index e6bc277fa3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az
-  name: storage-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage.yml
deleted file mode 100644
index e3b5299507..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-- uid: ext_storage-preview_az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: ext_storage-preview_az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: ext_storage-preview_az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: ext_storage-preview_az_storage_account_failover
-  name: az storage account failover
-  summary: Failover request can be triggered for a storage account in case of availability issues.
-- uid: ext_storage-preview_az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: ext_storage-preview_az_storage_account_management_policy
-  name: az storage account management-policy
-  summary: Manage storage account management policies.
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_network_rule
-  name: az storage account network-rule
-  summary: Manage network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-- uid: ext_storage-preview_az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: ext_storage-preview_az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-- uid: ext_storage-preview_az_storage_account_update
-  name: az storage account update
-  summary: Update the properties of a storage account.
-- uid: ext_storage-preview_az_storage_azcopy
-  name: az storage azcopy
-  summary: '[EXPERIMENTAL] Manage storage operations utilizing AzCopy.'
-- uid: ext_storage-preview_az_storage_azcopy_blob
-  name: az storage azcopy blob
-  summary: Manage object storage for unstructured data (blobs) using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_run_command
-  name: az storage azcopy run-command
-  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
-- uid: ext_storage-preview_az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-- uid: ext_storage-preview_az_storage_blob_access
-  name: az storage blob access
-  summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_directory
-  name: az storage blob directory
-  summary: Manage blob directories in storage account container.
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-- uid: ext_storage-preview_az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: ext_storage-preview_az_storage_blob_move
-  name: az storage blob move
-  summary: Move a blob in a storage container.
-- uid: ext_storage-preview_az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Cloud Storage resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account.yml
deleted file mode 100644
index 502033ce8d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account.yml
+++ /dev/null
@@ -1,363 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_check_name
-  - ext_storage-preview_az_storage_account_create
-  - ext_storage-preview_az_storage_account_delete
-  - ext_storage-preview_az_storage_account_failover
-  - ext_storage-preview_az_storage_account_list
-  - ext_storage-preview_az_storage_account_show
-  - ext_storage-preview_az_storage_account_show_usage
-  - ext_storage-preview_az_storage_account_update
-- uid: ext_storage-preview_az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-  description: The SKU of the storage account defaults to 'Standard_RAGRS'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a storage account 'MyStorageAccount' in resource group 'MyResourceGroup' in the West US region with locally redundant storage.
-    syntax:
-      content: az storage account create -n MyStorageAccount -g MyResourceGroup -l westus --sku Standard_LRS
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --access-tier
-    parameterValueGroup: Cool, Hot
-    summary: The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. It is required for StandardBlob accounts during creation.
-    description: ''
-  - name: --assign-identity
-    summary: Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.
-    description: ''
-  - name: --custom-domain
-    summary: User domain assigned to the storage account. Name is the CNAME source.
-    description: ''
-  - name: --encryption-services
-    parameterValueGroup: blob, file, queue, table
-    summary: Specifies which service(s) to encrypt.
-    description: ''
-  - name: --hierarchical-namespace
-    parameterValueGroup: false, true
-    summary: Allows the blob service to exhibit filesystem semantics.
-    description: ''
-  - name: --https-only
-    parameterValueGroup: false, true
-    summary: Allows https traffic only to storage service.
-    description: ''
-  - name: --kind
-    defaultValue: Storage
-    parameterValueGroup: BlobStorage, BlockBlobStorage, FileStorage, Storage, StorageV2
-    summary: Indicates the type of storage account.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku
-    defaultValue: Standard_RAGRS
-    parameterValueGroup: Premium_LRS, Premium_ZRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS
-    summary: The storage account SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, Logging, Metrics, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a storage account using a resource ID.
-    syntax:
-      content: az storage account delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
-  - summary: Delete a storage account using an account name and resource group.
-    syntax:
-      content: az storage account delete -n MyStorageAccount -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_failover
-  name: az storage account failover
-  summary: Failover request can be triggered for a storage account in case of availability issues.
-  description: >-
-    The failover occurs from the storage account's primary cluster to secondary cluster for (RA-)GRS/GZRS accounts. The secondary
-
-    cluster will become primary after failover. For more information, please refer to
-
-    <a href="https://docs.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance">https://docs.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Failover a storage account.
-    syntax:
-      content: az storage account failover -n mystorageaccount -g MyResourceGroup
-  - summary: Failover a storage account without waiting for complete.
-    syntax:
-      content: >-
-        az storage account failover -n mystorageaccount -g MyResourceGroup --no-wait
-
-        az storage account show -n mystorageaccount --expand geoReplicationStats
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all storage accounts in a subscription.
-    syntax:
-      content: az storage account list
-  - summary: List all storage accounts in a resource group.
-    syntax:
-      content: az storage account list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show properties for a storage account by resource ID.
-    syntax:
-      content: az storage account show --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
-  - summary: Show properties for a storage account using an account name and resource group.
-    syntax:
-      content: az storage account show -g MyResourceGroup -n MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --expand
-    parameterValueGroup: geoReplicationStats
-    summary: May be used to expand the properties within account's properties. By default, data is not included when fetching properties. Currently we only support geoReplicationStats.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current count and limit of the storage accounts under the subscription. (autogenerated)
-    syntax:
-      content: az storage account show-usage --location westus2
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-- uid: ext_storage-preview_az_storage_account_update
-  name: az storage account update
-  summary: Update the properties of a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --access-tier
-    parameterValueGroup: Cool, Hot
-    summary: The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. It is required for StandardBlob accounts during creation.
-    description: ''
-  - name: --assign-identity
-    summary: Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.
-    description: ''
-  - name: --custom-domain
-    summary: User domain assigned to the storage account. Name is the CNAME source. Use "" to clear existing value.
-    description: ''
-  - name: --encryption-services
-    parameterValueGroup: blob, file, queue, table
-    summary: Specifies which service(s) to encrypt.
-    description: ''
-  - name: --https-only
-    parameterValueGroup: false, true
-    summary: Allows https traffic only to storage service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Premium_LRS, Premium_ZRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS
-    summary: The storage account SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --use-subdomain
-    parameterValueGroup: false, true
-    summary: Specify whether to use indirect CNAME validation.
-    description: ''
-  - name: --encryption-key-name
-    summary: The name of the KeyVault key.
-    description: ''
-  - name: --encryption-key-source
-    defaultValue: Microsoft.Storage
-    parameterValueGroup: Microsoft.Keyvault, Microsoft.Storage
-    summary: The default encryption service.
-    description: ''
-  - name: --encryption-key-vault
-    summary: The Uri of the KeyVault.
-    description: ''
-  - name: --encryption-key-version
-    summary: The version of the KeyVault key.
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, Logging, Metrics, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: ext_storage-preview_az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: ext_storage-preview_az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: ext_storage-preview_az_storage_account_failover
-  name: az storage account failover
-  summary: Failover request can be triggered for a storage account in case of availability issues.
-- uid: ext_storage-preview_az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: ext_storage-preview_az_storage_account_management_policy
-  name: az storage account management-policy
-  summary: Manage storage account management policies.
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_network_rule
-  name: az storage account network-rule
-  summary: Manage network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-- uid: ext_storage-preview_az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: ext_storage-preview_az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-- uid: ext_storage-preview_az_storage_account_update
-  name: az storage account update
-  summary: Update the properties of a storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/keys.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/keys.yml
deleted file mode 100644
index d117763e4e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/keys.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_keys_list
-  - ext_storage-preview_az_storage_account_keys_renew
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the access keys for a storage account.
-    syntax:
-      content: az storage account keys list -g MyResourceGroup -n MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-  description: Kerberos key is generated per storage account for Azure Files identity based authentication either with Azure Active Directory Domain Service (Azure AD DS) or Active Directory Domain Service (AD DS). It is used as the password of the identity registered in the domain service that represents the storage account. Kerberos key does not provide access permission to perform any control or data plane read or write operations against the storage account.
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate one of the access keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key primary
-  - summary: Regenerate one of the Kerberos keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key secondary --key-type kerb
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --key
-    parameterValueGroup: primary, secondary
-    summary: The key to regenerate.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/management-policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/management-policy.yml
deleted file mode 100644
index 304d109fe6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/management-policy.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account_management_policy
-  name: az storage account management-policy
-  summary: Manage storage account management policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_management_policy_create
-  - ext_storage-preview_az_storage_account_management_policy_delete
-  - ext_storage-preview_az_storage_account_management_policy_show
-  - ext_storage-preview_az_storage_account_management_policy_update
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --policy
-    summary: 'The Storage Account ManagementPolicies Rules, in JSON format. See more details in: <a href="https://docs.microsoft.com/azure/storage/common/storage-lifecycle-managment-concepts">https://docs.microsoft.com/azure/storage/common/storage-lifecycle-managment-concepts</a>.'
-    description: ''
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account management policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml
deleted file mode 100644
index 402a3e4520..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account_network_rule
-  name: az storage account network-rule
-  summary: Manage network rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_network_rule_add
-  - ext_storage-preview_az_storage_account_network_rule_list
-  - ext_storage-preview_az_storage_account_network_rule_remove
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-  description: Rules can be created for an IPv4 address, address range (CIDR format), or a virtual network subnet.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a rule to allow a specific address-range.
-    syntax:
-      content: az storage account network-rule add -g myRg --account-name mystorageaccount --ip-address 23.45.1.0/24
-  - summary: Create a rule to allow access for a subnet.
-    syntax:
-      content: az storage account network-rule add -g myRg --account-name mystorageaccount --vnet-name myvnet --subnet mysubnet
-  - summary: Create a rule to allow access for a subnet in another resource group.
-    syntax:
-      content: az storage account network-rule add -g myRg --account-name mystorageaccount  --subnet $subnetId
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --action
-    defaultValue: Allow
-    summary: The action of virtual network rule.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List network rules. (autogenerated)
-    syntax:
-      content: az storage account network-rule list --account-name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a network rule. (autogenerated)
-    syntax:
-      content: az storage account network-rule remove --account-name MyAccount --resource-group MyResourceGroup --subnet MySubnetID
-  - summary: Remove a network rule. (autogenerated)
-    syntax:
-      content: az storage account network-rule remove --account-name MyAccount --ip-address 23.45.1.0/24 --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage network rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml
deleted file mode 100644
index 7a12530c96..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_azcopy
-  name: az storage azcopy
-  summary: '[EXPERIMENTAL] Manage storage operations utilizing AzCopy.'
-  description: 'Open issues here: <a href="https://github.com/Azure/azure-storage-azcopy">https://github.com/Azure/azure-storage-azcopy</a>.'
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_azcopy_run_command
-- uid: ext_storage-preview_az_storage_azcopy_run_command
-  name: az storage azcopy run-command
-  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: <COMMAND_ARGS>
-    summary: Command to run using azcopy. Please start commands with "azcopy ".
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_azcopy_blob
-  name: az storage azcopy blob
-  summary: Manage object storage for unstructured data (blobs) using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_run_command
-  name: az storage azcopy run-command
-  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: 'Open issues here: <a href="https://github.com/Azure/azure-storage-azcopy">https://github.com/Azure/azure-storage-azcopy</a>.'
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml
deleted file mode 100644
index 8c5b311804..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_azcopy_blob
-  name: az storage azcopy blob
-  summary: Manage object storage for unstructured data (blobs) using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_azcopy_blob_delete
-  - ext_storage-preview_az_storage_azcopy_blob_download
-  - ext_storage-preview_az_storage_azcopy_blob_sync
-  - ext_storage-preview_az_storage_azcopy_blob_upload
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a single blob from a container.
-    syntax:
-      content: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t TargetBlob
-  - summary: Delete all blobs from a container.
-    syntax:
-      content: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount --recursive
-  - summary: Delete all blobs in a virtual directory.
-    syntax:
-      content: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t "path/to/virtual_directory" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The delete target container.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively delete blobs.
-    description: ''
-  - name: --target -t
-    summary: The delete target path.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Download a single blob from a container.
-    syntax:
-      content: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "path/to/file"
-  - summary: Download a virtual directory from a container.
-    syntax:
-      content: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/virtual_directory" -d "download/path" --recursive
-  - summary: Download the contents of a container onto a local file system.
-    syntax:
-      content: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s * -d "download/path" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The download source container.
-    description: ''
-  - isRequired: true
-    name: --destination -d
-    summary: The destination file path to download to.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively download blobs.
-    description: ''
-  - name: --source -s
-    summary: The download source path.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Sync a single blob to a container.
-    syntax:
-      content: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
-  - summary: Sync a directory to a container.
-    syntax:
-      content: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/directory"
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The sync destination container.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    summary: The source file path to sync from.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --destination -d
-    summary: The sync destination path.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Upload a single blob to a container.
-    syntax:
-      content: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
-  - summary: Upload a directory to a container.
-    syntax:
-      content: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" --recursive
-  - summary: Upload the contents of a directory to a container.
-    syntax:
-      content: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory/*" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The upload destination container.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    summary: The source file path to upload from.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --destination -d
-    summary: The upload destination path.
-    description: ''
-  - name: --recursive -r
-    summary: Recursively upload blobs.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage object storage for unstructured data (blobs) using AzCopy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob.yml
deleted file mode 100644
index 536a62ebc3..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob.yml
+++ /dev/null
@@ -1,214 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_list
-  - ext_storage-preview_az_storage_blob_move
-- uid: ext_storage-preview_az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all storage blobs in a container whose names start with 'foo'; will match names such as 'foo', 'foobar', and 'foo/bar'
-    syntax:
-      content: az storage blob list -c MyContainer --prefix foo
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --delimiter
-    summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
-    description: ''
-  - name: --include
-    defaultValue: mc
-    summary: 'Specifies additional datasets to include: (c)opy-info, (m)etadata, (s)napshots, (d)eleted-soft. Can be combined.'
-    description: ''
-  - name: --marker
-    summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-    description: ''
-  - name: --num-results
-    defaultValue: "5000"
-    summary: Specifies the maximum number of results to return. Provide "\*" to return all.
-    description: ''
-  - name: --prefix
-    summary: Filters the results to return only blobs whose names begin with the specified prefix.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_move
-  name: az storage blob move
-  summary: Move a blob in a storage container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Move a blob in a storage container.
-    syntax:
-      content: az storage blob move -c MyContainer -d DestinationBlobPath -s SourceBlobPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --destination-blob -d
-    summary: The destination blob name. It should be an absolute path under the container. e.g.'topdir1/dirbar'.
-    description: ''
-  - isRequired: true
-    name: --source-blob -s
-    summary: The source blob name. It should be an absolute path under the container. e.g.'topdir1/dirsubfoo'.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Optional. A lease ID for the new_path. The new_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --source-if-match
-    summary: Optional. An ETag value. Specify this header to perform the rename operation only if the source's ETag matches the value specified.
-    description: ''
-  - name: --source-if-modified-since
-    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has been modified since the specified date and time.
-    description: ''
-  - name: --source-if-none-match
-    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the rename operation only if the source's ETag does not match the value specified.
-    description: ''
-  - name: --source-if-unmodified-since
-    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has not been modified since the specified date and time.
-    description: ''
-  - name: --source-lease-id
-    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_access
-  name: az storage blob access
-  summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_directory
-  name: az storage blob directory
-  summary: Manage blob directories in storage account container.
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-- uid: ext_storage-preview_az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: ext_storage-preview_az_storage_blob_move
-  name: az storage blob move
-  summary: Move a blob in a storage container.
-- uid: ext_storage-preview_az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml
deleted file mode 100644
index 85ebde0b29..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_access
-  name: az storage blob access
-  summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_access_set
-  - ext_storage-preview_az_storage_blob_access_show
-  - ext_storage-preview_az_storage_blob_access_update
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the access control properties of a blob.
-    syntax:
-      content: az storage blob access set -a "user::rwx,group::r--,other::---" -b MyBlob -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - isRequired: true
-    name: --blob-name -b
-    summary: The blob name.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the access control properties of a blob.
-    syntax:
-      content: az storage blob access show -b MyBlob -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --blob-name -b
-    summary: The blob name.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --user-principle-names
-    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the access permissions of a blob.
-    syntax:
-      content: az storage blob access update --permissions "rwxrwxrwx" -b MyBlob -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning user of a blob.
-    syntax:
-      content: az storage blob access update --owner [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning group of a blob.
-    syntax:
-      content: az storage blob access update --group [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --blob-name -b
-    summary: The blob name.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --group
-    summary: The owning group for the directory.
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --owner
-    summary: The owning user for the directory.
-    description: ''
-  - name: --permissions
-    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml
deleted file mode 100644
index 5e117873ad..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml
+++ /dev/null
@@ -1,507 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_directory
-  name: az storage blob directory
-  summary: Manage blob directories in storage account container.
-  description: To use the directory commands, please make sure your storage account type is StorageV2.
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_directory_create
-  - ext_storage-preview_az_storage_blob_directory_delete
-  - ext_storage-preview_az_storage_blob_directory_download
-  - ext_storage-preview_az_storage_blob_directory_exists
-  - ext_storage-preview_az_storage_blob_directory_list
-  - ext_storage-preview_az_storage_blob_directory_move
-  - ext_storage-preview_az_storage_blob_directory_show
-  - ext_storage-preview_az_storage_blob_directory_upload
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-  description: Create a storage blob directory which can contain other directories or blobs in a storage container.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  - summary: Create a storage blob directory with permissions and umask.
-    syntax:
-      content: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount --permissions rwxrwxrwx --umask 0000
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the directory to be overwritten has an active lease.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --permissions
-    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission. The sticky bit is also supported. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --umask
-    defaultValue: 0027
-    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. The umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. In this way, the resulting permission is given by p & ^u, where p is the permission and u is the umask. Only 4-digit octal notation (e.g. 0022) is supported here.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-  description: This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, then the delete operation can be atomic and instantaneous; if not, the operation is performed in batches and a continuation token could be returned.
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory delete -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --fail-not-exist
-    summary: Specify whether to throw an exception when the directory doesn't exist.
-    description: ''
-  - name: --lease-id
-    summary: Required if the directory has an active lease.
-    description: ''
-  - name: --marker
-    summary: Optional. When deleting a directory without the Hierarchical Namespace, the number of paths that are deleted with each invocation is limited. If the number of paths to be deleted exceeds this limit, a continuation token is returned. When a continuation token is returned, it must be specified in a subsequent invocation of the delete operation to continue deleting the directory.
-    description: ''
-  - name: --recursive
-    summary: If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Download a single blob in a storage blob directory.
-    syntax:
-      content: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "<local-path>"
-  - summary: Download the entire directory in a storage container.
-    syntax:
-      content: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s SourceDirectoryPath -d "<local-path>" --recursive
-  - summary: Download an entire subdirectory of a storage blob directory.
-    syntax:
-      content: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/subdirectory" -d "<local-path>" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The download source container.
-    description: ''
-  - isRequired: true
-    name: --destination-path -d
-    summary: The destination local directory path to download.
-    description: ''
-  - isRequired: true
-    name: --source-path -s
-    summary: The download source directory path. It should be an absolute path to container.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively download blobs. If enabled, all the blobs including the blobs in subdirectories will be downloaded.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check for the existence of a blob directory in a storage container.
-    syntax:
-      content: az storage blob directory exists -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the snapshot.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List blobs and blob subdirectories in a storage directory.
-    syntax:
-      content: az storage blob directory list -c MyContainer -d DestinationDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --delimiter
-    summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
-    description: ''
-  - name: --include
-    defaultValue: mc
-    summary: Specifies one or more additional datasets to include in the response.
-    description: ''
-  - name: --marker
-    summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-    description: ''
-  - name: --num-results
-    summary: Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify num_results or specifies a value greater than 5,000, the server will return up to 5,000 items. Setting num_results to a value less than or equal to zero results in error response code 400 (Bad Request).
-    description: ''
-  - name: --prefix
-    summary: Filters the results to return only blobs whose names begin with the specified prefix.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-  description: Move a storage directory and all its content (which can contain other directories or blobs) to another storage blob directory in a storage container. This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, the move operation is atomic and no marker is returned; if not, the operation is performed in batches and a continuation token could be returned.
-  langs:
-  - azurecli
-  examples:
-  - summary: Move a storage directory to another storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory move -c MyContainer -d my-new-directory -s dir --account-name MyStorageAccount
-  - summary: Move a storage subdirectory to another storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory move -c MyContainer -d my-new-directory -s dir/subdirectory --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --destination-path -d
-    summary: The destination blob directory path. It can be a directory or subdirectory name, e.g. dir, dir/subdir. If the destination path exists and is empty, the source will be moved into the destination path. If the destination path does not exist, the destination path will be created and overwritten by the source. To control the move operation for nonempty path, you can use --move-mode to determine its behavior.
-    description: ''
-  - isRequired: true
-    name: --source-path -s
-    summary: The source blob directory path.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: A lease ID for destination directory_path. The destination directory_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --move-mode
-    defaultValue: posix
-    parameterValueGroup: legacy, posix
-    summary: Valid only when namespace is enabled. This parameter determines the behavior of the move operation. If the destination directory is empty, for both two mode, the destination directory will be overwritten. But if the destination directory is not empty, in legacy mode the move operation will fail and in posix mode, the source directory will be moved into the destination directory.
-    description: ''
-  - name: --source-if-match
-    summary: Optional. An ETag value. Specify this header to perform the move operation only if the source's ETag matches the value specified.
-    description: ''
-  - name: --source-if-modified-since
-    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has been modified since the specified date and time.
-    description: ''
-  - name: --source-if-none-match
-    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the move operation only if the source's ETag does not match the value specified.
-    description: ''
-  - name: --source-if-unmodified-since
-    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has not been modified since the specified date and time.
-    description: ''
-  - name: --source-lease-id
-    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a storage blob directory properties in a storage container.
-    syntax:
-      content: az storage blob directory show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform theoperation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to performthe operation only if the resource's ETag does not match the value specified. Specify the wildcardcharacter (\*) to perform the operation only if the resource does not exist, and fail the operationif it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Upload a single blob to a storage blob directory.
-    syntax:
-      content: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d directory
-  - summary: Upload a local directory to a storage blob directory.
-    syntax:
-      content: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" -d directory --recursive
-  - summary: Upload a set of files in a local directory to a storage blob directory.
-    syntax:
-      content: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file*" -d directory --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The upload destination container.
-    description: ''
-  - isRequired: true
-    name: --destination-path -d
-    summary: The upload destination directory path. It should be an absolute path to container. If the specified destination path does not exist, a new directory path will be created.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    summary: The source file path to upload from.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively upload blobs. If enabled, all the blobs including the blobs in subdirectories will be uploaded.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To use the directory commands, please make sure your storage account type is StorageV2.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml
deleted file mode 100644
index cd3da18da1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_directory_access_set
-  - ext_storage-preview_az_storage_blob_directory_access_show
-  - ext_storage-preview_az_storage_blob_directory_access_update
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the access control properties of a directory.
-    syntax:
-      content: az storage blob directory access set -a "user::rwx,group::r--,other::---" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the access control properties of a directory.
-    syntax:
-      content: az storage blob directory access show -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --user-principle-names
-    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the access permissions of a directory.
-    syntax:
-      content: az storage blob directory access update --permissions "rwxrwxrwx" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning user of a directory.
-    syntax:
-      content: az storage blob directory access update --owner [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning group of a directory.
-    syntax:
-      content: az storage blob directory access update --group [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --group
-    summary: The owning group for the directory.
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --owner
-    summary: The owning user for the directory.
-    description: ''
-  - name: --permissions
-    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml
deleted file mode 100644
index 84c57e41af..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_directory_metadata_show
-  - ext_storage-preview_az_storage_blob_directory_metadata_update
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show all user-defined metadata for the specified blob directory.
-    syntax:
-      content: az storage blob directory metadata show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --cpk
-    summary: Decrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
-    description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-    syntax:
-      content: az storage blob directory metadata update --metadata tag1=value1 -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --cpk
-    summary: Encrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
-    description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage directory metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml b/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml
deleted file mode 100644
index 40c963999b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_service_properties_show
-  - ext_storage-preview_az_storage_blob_service_properties_update
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --days-retained
-    summary: Number of days that soft-deleted blob will be retained. Must be in range [1,365].
-    description: ''
-  - name: --delete-retention
-    parameterValueGroup: false, true
-    summary: Enables soft-delete.
-    description: ''
-  - name: --404-document
-    summary: Represents the path to the error document that should be shown when an error 404 is issued, in other words, when a browser requests a page that does not exist.
-    description: ''
-  - name: --index-document
-    summary: Represents the name of the index document. This is commonly "index.html".
-    description: ''
-  - name: --static-website
-    parameterValueGroup: false, true
-    summary: Enables static-website.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage blob service properties.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/storagesync/index.yml
deleted file mode 100644
index 73985f32d9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az
-  name: storagesync
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storagesync_az_storagesync
-  name: az storagesync
-  summary: Manage Azure File Sync.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync.yml b/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync.yml
deleted file mode 100644
index 7a294d7d00..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync
-  name: az storagesync
-  summary: Manage Azure File Sync.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_create
-  - ext_storagesync_az_storagesync_delete
-  - ext_storagesync_az_storagesync_list
-  - ext_storagesync_az_storagesync_show
-- uid: ext_storagesync_az_storagesync_create
-  name: az storagesync create
-  summary: Create a new storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
-    syntax:
-      content: >-
-        az storagesync create --resource-group "SampleResourceGroup" \
-
-        --name "SampleStorageSyncService" --location "WestUS" --tags key1=value1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_storagesync_az_storagesync_delete
-  name: az storagesync delete
-  summary: Delete a given storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
-    syntax:
-      content: >-
-        az storagesync delete --resource-group "SampleResourceGroup" \
-
-        --name "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_list
-  name: az storagesync list
-  summary: List all storage sync services in a resource group or a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all storage sync services in a resource group "SampleResourceGroup".
-    syntax:
-      content: az storagesync list --resource-group "SampleResourceGroup"
-  - summary: List all storage sync services in current subscription
-    syntax:
-      content: az storagesync list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_show
-  name: az storagesync show
-  summary: Show the properties for a given storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
-    syntax:
-      content: >-
-        az storagesync show --resource-group "SampleResourceGroup" --name \
-
-        "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_create
-  name: az storagesync create
-  summary: Create a new storage sync service.
-- uid: ext_storagesync_az_storagesync_delete
-  name: az storagesync delete
-  summary: Delete a given storage sync service.
-- uid: ext_storagesync_az_storagesync_list
-  name: az storagesync list
-  summary: List all storage sync services in a resource group or a subscription.
-- uid: ext_storagesync_az_storagesync_registered_server
-  name: az storagesync registered-server
-  summary: Manage registered server.
-- uid: ext_storagesync_az_storagesync_registered_server_delete
-  name: az storagesync registered-server delete
-  summary: Unregister an on-premises server from it's storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_list
-  name: az storagesync registered-server list
-  summary: List all registered servers for a given storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_show
-  name: az storagesync registered-server show
-  summary: Show the properties for a given registered server.
-- uid: ext_storagesync_az_storagesync_registered_server_wait
-  name: az storagesync registered-server wait
-  summary: Place the CLI in a waiting state until a condition of a registered server is met.
-- uid: ext_storagesync_az_storagesync_show
-  name: az storagesync show
-  summary: Show the properties for a given storage sync service.
-- uid: ext_storagesync_az_storagesync_sync_group
-  name: az storagesync sync-group
-  summary: Manage sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-  name: az storagesync sync-group cloud-endpoint
-  summary: Manage cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_create
-  name: az storagesync sync-group create
-  summary: Create a new sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_delete
-  name: az storagesync sync-group delete
-  summary: Delete a given sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_list
-  name: az storagesync sync-group list
-  summary: List all sync groups in a storage sync service.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-  name: az storagesync sync-group server-endpoint
-  summary: Manage server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_show
-  name: az storagesync sync-group show
-  summary: Show the properties for a given sync group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure File Sync.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml b/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml
deleted file mode 100644
index 1a0176d119..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_registered_server
-  name: az storagesync registered-server
-  summary: Manage registered server.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_registered_server_delete
-  - ext_storagesync_az_storagesync_registered_server_list
-  - ext_storagesync_az_storagesync_registered_server_show
-  - ext_storagesync_az_storagesync_registered_server_wait
-- uid: ext_storagesync_az_storagesync_registered_server_delete
-  name: az storagesync registered-server delete
-  summary: Unregister an on-premises server from it's storage sync service.
-  description: Unregister an on-premises server from it's storage sync service which will result in cascading deletes of all server endpoints on this server.
-  langs:
-  - azurecli
-  examples:
-  - summary: Unregister an on-premises server "41166691-ab03-43e9-ab3e-0330eda162ac" from it's storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync registered-server delete --resource-group "SampleResourceGroup" --storage-sync-service \
-
-        "SampleStorageSyncService" --server-id "41166691-ab03-43e9-ab3e-0330eda162ac"
-  parameters:
-  - isRequired: true
-    name: --server-id
-    summary: GUID identifying the on-premises server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_registered_server_list
-  name: az storagesync registered-server list
-  summary: List all registered servers for a given storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all registered servers for storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync registered-server list --resource-group "SampleResourceGroup" --storage-sync-service \
-
-        "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_registered_server_show
-  name: az storagesync registered-server show
-  summary: Show the properties for a given registered server.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for registered server "080d4133-bdb5-40a0-96a0-71a6057bfe9a".
-    syntax:
-      content: >-
-        az storagesync registered-server show --resource-group "SampleResourceGroup" --storage-sync-service \
-
-        "SampleStorageSyncService" --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a"
-  parameters:
-  - isRequired: true
-    name: --server-id
-    summary: GUID identifying the on-premises server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_registered_server_wait
-  name: az storagesync registered-server wait
-  summary: Place the CLI in a waiting state until a condition of a registered server is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until a condition of a registered server is deleted.
-    syntax:
-      content: >-
-        az storagesync registered-server wait --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" \
-
-        --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a" --deleted
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --server-id
-    summary: GUID identifying the on-premises server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service-name
-    summary: Name of Storage Sync Service resource.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_registered_server_delete
-  name: az storagesync registered-server delete
-  summary: Unregister an on-premises server from it's storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_list
-  name: az storagesync registered-server list
-  summary: List all registered servers for a given storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_show
-  name: az storagesync registered-server show
-  summary: Show the properties for a given registered server.
-- uid: ext_storagesync_az_storagesync_registered_server_wait
-  name: az storagesync registered-server wait
-  summary: Place the CLI in a waiting state until a condition of a registered server is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage registered server.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml b/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml
deleted file mode 100644
index 3e7b8bed67..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_sync_group
-  name: az storagesync sync-group
-  summary: Manage sync group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_sync_group_create
-  - ext_storagesync_az_storagesync_sync_group_delete
-  - ext_storagesync_az_storagesync_sync_group_list
-  - ext_storagesync_az_storagesync_sync_group_show
-- uid: ext_storagesync_az_storagesync_sync_group_create
-  name: az storagesync sync-group create
-  summary: Create a new sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group create --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of sync group.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_delete
-  name: az storagesync sync-group delete
-  summary: Delete a given sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group delete --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of sync group.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_list
-  name: az storagesync sync-group list
-  summary: List all sync groups in a storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all sync groups in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group list --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_show
-  name: az storagesync sync-group show
-  summary: Show the properties for a given sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group show --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of sync group.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-  name: az storagesync sync-group cloud-endpoint
-  summary: Manage cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_create
-  name: az storagesync sync-group create
-  summary: Create a new sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_delete
-  name: az storagesync sync-group delete
-  summary: Delete a given sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_list
-  name: az storagesync sync-group list
-  summary: List all sync groups in a storage sync service.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-  name: az storagesync sync-group server-endpoint
-  summary: Manage server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_show
-  name: az storagesync sync-group show
-  summary: Show the properties for a given sync group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage sync group.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml
deleted file mode 100644
index 2192894e86..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml
+++ /dev/null
@@ -1,241 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-  name: az storagesync sync-group cloud-endpoint
-  summary: Manage cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new cloud endpoint "SampleCloudEndpoint" in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint create --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint" --storage-account storageaccountnameorid --azure-file-share-name \
-
-        "cvcloud-afscv-0719-058-a94a1354-a1fd-4e9a-9a50-919fad8c4ba4"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --azure-file-share-name
-    summary: The name of Azure file share.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --storage-account
-    summary: The name or ID of the storage account.
-    description: ''
-  - name: --storage-account-tenant-id
-    summary: The id of the tenant that the storage account is in.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete cloud endpoint "SampleCloudEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint delete --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all cloud endpoints in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint list --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for cloud endpoint "SampleCloudEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint show --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until a condition of a cloud endpoint is created.
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint wait --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service-name
-    summary: Name of Storage Sync Service resource.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: Name of Sync Group resource.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage cloud endpoint.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml
deleted file mode 100644
index 94f911d0e6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml
+++ /dev/null
@@ -1,318 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-  name: az storagesync sync-group server-endpoint
-  summary: Manage server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new server endpoint "SampleServerEndpoint" in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint create --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint" --server-id 91beed22-7e9e-4bda-9313-fec96cf286e0 \
-
-        --server-local-path "d:\abc" --cloud-tiering "off" --volume-free-space-percent 80 --tier-files-older-than-days 20 \
-
-        --offline-data-transfer "on" --offline-data-transfer-share-name "myfileshare"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --registered-server-id --server-id
-    summary: The resource id or GUID of the registered server.
-    description: ''
-  - isRequired: true
-    name: --server-local-path
-    summary: The local path of the registered server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --cloud-tiering
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --offline-data-transfer
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
-    description: ''
-  - name: --offline-data-transfer-share-name
-    summary: The name of Azure file share that is used to transfer data offline.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tier-files-older-than-days
-    summary: The days that the files are older than will be tiered.
-    description: ''
-  - name: --volume-free-space-percent
-    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a server endpoint "SampleServerEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint delete --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all server endpoints in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint list --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for server endpoint "SampleServerEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint show --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties for server endpoint "SampleServerEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint update --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint" --cloud-tiering "off" \
-
-        --volume-free-space-percent "100" --tier-files-older-than-days "0" \
-
-        --offline-data-transfer "off"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --cloud-tiering
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --offline-data-transfer
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
-    description: ''
-  - name: --offline-data-transfer-share-name
-    summary: The name of Azure file share that is used to transfer data offline.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tier-files-older-than-days
-    summary: The days that the files are older than will be tiered.
-    description: ''
-  - name: --volume-free-space-percent
-    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until a condition of a server endpoint is created.
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint wait --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service-name
-    summary: Name of Storage Sync Service resource.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: Name of Sync Group resource.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage server endpoint.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/index.yml
deleted file mode 100644
index 4eaaa88f55..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az
-  name: stream-analytics
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_stream-analytics_az_stream_analytics
-  name: az stream-analytics
-  summary: Manage Stream Analytics.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml
deleted file mode 100644
index 7c0b676229..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics
-  name: az stream-analytics
-  summary: Manage Stream Analytics.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_function
-  name: az stream-analytics function
-  summary: Commands to manage stream-analytics function.
-- uid: ext_stream-analytics_az_stream_analytics_function_create
-  name: az stream-analytics function create
-  summary: Create a function or replaces an already existing function under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_delete
-  name: az stream-analytics function delete
-  summary: Delete a function from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_list
-  name: az stream-analytics function list
-  summary: List all of the functions under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_show
-  name: az stream-analytics function show
-  summary: Get details about the specified function.
-- uid: ext_stream-analytics_az_stream_analytics_function_test
-  name: az stream-analytics function test
-  summary: Test if the information provided for a function is valid.
-- uid: ext_stream-analytics_az_stream_analytics_input
-  name: az stream-analytics input
-  summary: Commands to manage stream-analytics input.
-- uid: ext_stream-analytics_az_stream_analytics_input_create
-  name: az stream-analytics input create
-  summary: Create an input or replaces an already existing input under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_delete
-  name: az stream-analytics input delete
-  summary: Delete an input from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_list
-  name: az stream-analytics input list
-  summary: List all of the inputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_show
-  name: az stream-analytics input show
-  summary: Get details about the specified input.
-- uid: ext_stream-analytics_az_stream_analytics_input_test
-  name: az stream-analytics input test
-  summary: Test an input.
-- uid: ext_stream-analytics_az_stream_analytics_job
-  name: az stream-analytics job
-  summary: Commands to manage stream-analytics streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_create
-  name: az stream-analytics job create
-  summary: Create a streaming job or replaces an already existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_delete
-  name: az stream-analytics job delete
-  summary: Delete a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_list
-  name: az stream-analytics job list
-  summary: List all of the streaming jobs in the specified resource group.
-- uid: ext_stream-analytics_az_stream_analytics_job_show
-  name: az stream-analytics job show
-  summary: Get details about the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_start
-  name: az stream-analytics job start
-  summary: Start a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_stop
-  name: az stream-analytics job stop
-  summary: Stop a running streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_update
-  name: az stream-analytics job update
-  summary: Update existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_wait
-  name: az stream-analytics job wait
-  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
-- uid: ext_stream-analytics_az_stream_analytics_output
-  name: az stream-analytics output
-  summary: Commands to manage stream-analytics output.
-- uid: ext_stream-analytics_az_stream_analytics_output_create
-  name: az stream-analytics output create
-  summary: Create an output or replaces an already existing output under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_delete
-  name: az stream-analytics output delete
-  summary: Delete an output from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_list
-  name: az stream-analytics output list
-  summary: List all of the outputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_show
-  name: az stream-analytics output show
-  summary: Get details about the specified output.
-- uid: ext_stream-analytics_az_stream_analytics_output_test
-  name: az stream-analytics output test
-  summary: Test an output.
-- uid: ext_stream-analytics_az_stream_analytics_quota
-  name: az stream-analytics quota
-  summary: Commands to show quota information.
-- uid: ext_stream-analytics_az_stream_analytics_quota_show
-  name: az stream-analytics quota show
-  summary: Retrieve quota information in a particular region.
-- uid: ext_stream-analytics_az_stream_analytics_transformation
-  name: az stream-analytics transformation
-  summary: Commands to manage stream-analytics transformation.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_create
-  name: az stream-analytics transformation create
-  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_show
-  name: az stream-analytics transformation show
-  summary: Get details about the specified transformation.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_update
-  name: az stream-analytics transformation update
-  summary: Update transformation under an existing streaming job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Stream Analytics.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml
deleted file mode 100644
index 66e158edaa..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_function
-  name: az stream-analytics function
-  summary: Commands to manage stream-analytics function.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_function_create
-  - ext_stream-analytics_az_stream_analytics_function_delete
-  - ext_stream-analytics_az_stream_analytics_function_list
-  - ext_stream-analytics_az_stream_analytics_function_show
-  - ext_stream-analytics_az_stream_analytics_function_test
-- uid: ext_stream-analytics_az_stream_analytics_function_create
-  name: az stream-analytics function create
-  summary: Create a function or replaces an already existing function under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a function
-    syntax:
-      content: >-
-        az stream-analytics function create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyFunctionName --inputs @inputs.json --function-output @output.json --binding \
-
-        @binding.json
-         (below is an example for "inputs.json")
-         [
-             {
-                 "dataType": "Any"
-             }
-         ]
-         (below is an example for "output.json")
-         {
-             "dataType": "Any"
-         }
-         (below is an example of JavascripUDF for "binding.json")
-         {
-             "type": "Microsoft.StreamAnalytics/JavascriptUdf",
-             "properties": {
-                 "script": "function (x, y) { return x + y; }"
-             }
-         }
-         (below is an example of Azure Machine Learning for "binding.json")
-         {
-             "type": "Microsoft.MachineLearning/WebService",
-             "properties": {
-                 "endpoint": "someAzureMLEndpointURL",
-                 "apiKey": "someApiKey==",
-                 "inputs": {
-                     "name": "input1",
-                     "columnNames": [
-                         {
-                             "name": "tweet",
-                             "dataType": "string",
-                             "mapTo": 0
-                         }
-                     ]
-                 },
-                 "outputs": [
-                     {
-                         "name": "Sentiment",
-                         "dataType": "string"
-                     }
-                 ],
-                 "batchSize": 1000
-             }
-         }
-  parameters:
-  - isRequired: true
-    name: --binding
-    summary: The binding of the function.
-    description: ''
-  - isRequired: true
-    name: --function-output
-    summary: The output of the function.
-    description: ''
-  - isRequired: true
-    name: --inputs
-    summary: The inputs of the function.
-    description: ''
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --type
-    defaultValue: Scalar
-    parameterValueGroup: Scalar
-    summary: The udf type of the function.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_delete
-  name: az stream-analytics function delete
-  summary: Delete a function from the streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a function
-    syntax:
-      content: >-
-        az stream-analytics function delete --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyFunctionName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_list
-  name: az stream-analytics function list
-  summary: List all of the functions under the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all functions in a streaming job
-    syntax:
-      content: az stream-analytics function list --resource-group MyResourceGroup --job-name MyJobName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_show
-  name: az stream-analytics function show
-  summary: Get details about the specified function.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details about a function
-    syntax:
-      content: >-
-        az stream-analytics function show --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyFunctionName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_test
-  name: az stream-analytics function test
-  summary: Test if the information provided for a function is valid.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Test the connection for a function
-    syntax:
-      content: >-
-        az stream-analytics function test --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyFunctionName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_function_create
-  name: az stream-analytics function create
-  summary: Create a function or replaces an already existing function under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_delete
-  name: az stream-analytics function delete
-  summary: Delete a function from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_list
-  name: az stream-analytics function list
-  summary: List all of the functions under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_show
-  name: az stream-analytics function show
-  summary: Get details about the specified function.
-- uid: ext_stream-analytics_az_stream_analytics_function_test
-  name: az stream-analytics function test
-  summary: Test if the information provided for a function is valid.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics function.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml
deleted file mode 100644
index 103d70b0c8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_input
-  name: az stream-analytics input
-  summary: Commands to manage stream-analytics input.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_input_create
-  - ext_stream-analytics_az_stream_analytics_input_delete
-  - ext_stream-analytics_az_stream_analytics_input_list
-  - ext_stream-analytics_az_stream_analytics_input_show
-  - ext_stream-analytics_az_stream_analytics_input_test
-- uid: ext_stream-analytics_az_stream_analytics_input_create
-  name: az stream-analytics input create
-  summary: Create an input or replaces an already existing input under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an input
-    syntax:
-      content: >-
-        az stream-analytics input create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyInputName --type Stream --datasource @datasource.json --serialization \
-
-        @serialization.json
-         (below is an example of Blob Storage for "datasource.json")
-         {
-             "type": "Microsoft.Storage/Blob",
-             "properties": {
-                 "storageAccounts": [
-                     {
-                         "accountName": "someAccountName",
-                         "accountKey": "someAccountKey=="
-                     }
-                 ],
-                 "container": "state",
-                 "pathPattern": "{date}/{time}",
-                 "dateFormat": "yyyy/MM/dd",
-                 "timeFormat": "HH",
-                 "sourcePartitionCount": 16
-             }
-         }
-         (below is an example of Event Hub for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/EventHub",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "someSharedAccessPolicyKey==",
-                 "eventHubName": "sdkeventhub",
-                 "consumerGroupName": "sdkconsumergroup"
-             }
-         }
-         (below is an example of Iot Hub for "datasource.json")
-         {
-             "type": "Microsoft.Devices/IotHubs",
-             "properties": {
-                 "iotHubNamespace": "iothub",
-                 "sharedAccessPolicyName": "owner",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "consumerGroupName": "sdkconsumergroup",
-                 "endpoint": "messages/events"
-             }
-         }
-         (below is an example of Csv for "serialization.json")
-         {
-             "type": "Csv",
-             "properties": {
-                 "fieldDelimiter": ",",
-                 "encoding": "UTF8"
-             }
-         }
-         (below is an example of Json for "serialization.json")
-         {
-             "type": "Json",
-             "properties": {
-                 "encoding": "UTF8"
-             }
-         }
-         (below is an example of Avro for "serialization.json")
-         {
-             "type": "Avro"
-         }
-  parameters:
-  - isRequired: true
-    name: --datasource
-    summary: The datasource of the input.
-    description: ''
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --serialization
-    summary: The serialization of the input.
-    description: ''
-  - isRequired: true
-    name: --type
-    parameterValueGroup: Reference, Stream
-    summary: The type of the input.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_delete
-  name: az stream-analytics input delete
-  summary: Delete an input from the streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an input
-    syntax:
-      content: az stream-analytics input delete --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_list
-  name: az stream-analytics input list
-  summary: List all of the inputs under the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all inputs in a streaming job
-    syntax:
-      content: az stream-analytics input list --resource-group MyResourceGroup --job-name MyJobName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_show
-  name: az stream-analytics input show
-  summary: Get details about the specified input.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details about specified input
-    syntax:
-      content: az stream-analytics input show --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_test
-  name: az stream-analytics input test
-  summary: Test an input.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Test the connection for an input
-    syntax:
-      content: az stream-analytics input test --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_input_create
-  name: az stream-analytics input create
-  summary: Create an input or replaces an already existing input under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_delete
-  name: az stream-analytics input delete
-  summary: Delete an input from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_list
-  name: az stream-analytics input list
-  summary: List all of the inputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_show
-  name: az stream-analytics input show
-  summary: Get details about the specified input.
-- uid: ext_stream-analytics_az_stream_analytics_input_test
-  name: az stream-analytics input test
-  summary: Test an input.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics input.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml
deleted file mode 100644
index 6eb6342ac0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml
+++ /dev/null
@@ -1,333 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_job
-  name: az stream-analytics job
-  summary: Commands to manage stream-analytics streaming job.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_job_create
-  - ext_stream-analytics_az_stream_analytics_job_delete
-  - ext_stream-analytics_az_stream_analytics_job_list
-  - ext_stream-analytics_az_stream_analytics_job_show
-  - ext_stream-analytics_az_stream_analytics_job_start
-  - ext_stream-analytics_az_stream_analytics_job_stop
-  - ext_stream-analytics_az_stream_analytics_job_update
-  - ext_stream-analytics_az_stream_analytics_job_wait
-- uid: ext_stream-analytics_az_stream_analytics_job_create
-  name: az stream-analytics job create
-  summary: Create a streaming job or replaces an already existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a streaming job
-    syntax:
-      content: >-
-        az stream-analytics job create --resource-group MyResourceGroup --name MyJobName \
-
-        --location "West US" --output-error-policy "Drop" --events-outoforder-policy "Drop" \
-
-        --events-outoforder-max-delay 5 --events-late-arrival-max-delay 16 --data-locale "en-US"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compatibility-level
-    defaultValue: "1.0"
-    parameterValueGroup: "1.0"
-    summary: Controls certain runtime behaviors of the streaming job.
-    description: ''
-  - name: --data-locale
-    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set <a href="https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx">https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx</a>. Defaults to "en-US" if none specified.
-    description: ''
-  - name: --events-late-arrival-max-delay
-    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
-    description: ''
-  - name: --events-outoforder-max-delay
-    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
-    description: ''
-  - name: --events-outoforder-policy
-    parameterValueGroup: Adjust, Drop
-    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --output-error-policy
-    parameterValueGroup: Drop, Stop
-    summary: Indicates the policy to apply to events that arrive at the output.
-    description: ''
-  - name: --sku
-    defaultValue: Standard
-    parameterValueGroup: Standard
-    summary: The name of the SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_delete
-  name: az stream-analytics job delete
-  summary: Delete a streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a streaming job
-    syntax:
-      content: az stream-analytics job delete --resource-group MyResourceGroup --name MyJobName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_list
-  name: az stream-analytics job list
-  summary: List all of the streaming jobs in the specified resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all streaming jobs in current subscription
-    syntax:
-      content: az stream-analytics job list
-  - summary: List all streaming jobs in a resource group
-    syntax:
-      content: az stream-analytics job list --resource-group MyResourceGroup
-  - summary: List all streaming jobs and expand their inputs, outputs, transformation, and functions
-    syntax:
-      content: az stream-analytics job list --resource-group MyResourceGroup --expand
-  parameters:
-  - name: --expand
-    summary: Expand inputs, transformation, outputs and functions of the streaming job.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_show
-  name: az stream-analytics job show
-  summary: Get details about the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a streaming job
-    syntax:
-      content: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName
-  - summary: Get a streaming job and expand its inputs, outputs, transformation, and functions
-    syntax:
-      content: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName --expand
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Expand inputs, transformation, outputs and functions of the streaming job.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_start
-  name: az stream-analytics job start
-  summary: Start a streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Start a streaming job with LastOutputEventTime output start mode
-    syntax:
-      content: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode LastOutputEventTime
-  - summary: Start a streaming job with JobStartTime output start mode
-    syntax:
-      content: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode JobStartTime
-  - summary: Start a streaming job with CustomTime output start mode
-    syntax:
-      content: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode CustomTime --output-start-time 2020-01-01T00:00:00Z
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --output-start-mode
-    defaultValue: JobStartTime
-    parameterValueGroup: CustomTime, JobStartTime, LastOutputEventTime
-    summary: Output start mode.
-    description: ''
-  - name: --output-start-time
-    summary: Output start time, must have a value if --output-start-mode is set to CustomTime.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_stop
-  name: az stream-analytics job stop
-  summary: Stop a running streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Stop a streaming job
-    syntax:
-      content: az stream-analytics job stop --resource-group MyResourceGroup --name MyJobName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_update
-  name: az stream-analytics job update
-  summary: Update existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a streaming job
-    syntax:
-      content: >-
-        az stream-analytics job update --resource-group MyResourceGroup --name MyJobName \
-
-        --events-outoforder-max-delay 21 --events-late-arrival-max-delay 13
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --data-locale
-    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set <a href="https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx">https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx</a>.
-    description: ''
-  - name: --events-late-arrival-max-delay
-    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
-    description: ''
-  - name: --events-outoforder-max-delay
-    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
-    description: ''
-  - name: --events-outoforder-policy
-    parameterValueGroup: Adjust, Drop
-    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
-    description: ''
-  - name: --output-error-policy
-    parameterValueGroup: Drop, Stop
-    summary: Indicates the policy to apply to events that arrive at the output.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_wait
-  name: az stream-analytics job wait
-  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the streaming job is successfully provisioned.
-    syntax:
-      content: az stream-analytics job wait --resource-group MyResourceGroup --name MyJobName --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: The $expand OData query parameter. This is a comma-separated list of additional streaming job properties to include in the response, beyond the default set returned when this parameter is absent. The default set is all streaming job properties other than 'inputs', 'transformation', 'outputs', and 'functions'.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_job_create
-  name: az stream-analytics job create
-  summary: Create a streaming job or replaces an already existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_delete
-  name: az stream-analytics job delete
-  summary: Delete a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_list
-  name: az stream-analytics job list
-  summary: List all of the streaming jobs in the specified resource group.
-- uid: ext_stream-analytics_az_stream_analytics_job_show
-  name: az stream-analytics job show
-  summary: Get details about the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_start
-  name: az stream-analytics job start
-  summary: Start a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_stop
-  name: az stream-analytics job stop
-  summary: Stop a running streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_update
-  name: az stream-analytics job update
-  summary: Update existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_wait
-  name: az stream-analytics job wait
-  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics streaming job.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml
deleted file mode 100644
index 0a56f5db13..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml
+++ /dev/null
@@ -1,320 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_output
-  name: az stream-analytics output
-  summary: Commands to manage stream-analytics output.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_output_create
-  - ext_stream-analytics_az_stream_analytics_output_delete
-  - ext_stream-analytics_az_stream_analytics_output_list
-  - ext_stream-analytics_az_stream_analytics_output_show
-  - ext_stream-analytics_az_stream_analytics_output_test
-- uid: ext_stream-analytics_az_stream_analytics_output_create
-  name: az stream-analytics output create
-  summary: Create an output or replaces an already existing output under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an output
-    syntax:
-      content: >-
-        az stream-analytics output create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyOutputName --datasource @datasource.json --serialization @serialization.json
-         (below is an example of DataLake for "datasource.json")
-         {
-             "type": "Microsoft.DataLake/Accounts",
-             "properties": {
-                 "accountName": "someaccount",
-                 "tenantId": "cea4e98b-c798-49e7-8c40-4a2b3beb47dd",
-                 "refreshToken": "someRefreshToken==",
-                 "tokenUserPrincipalName": "bobsmith@contoso.com",
-                 "tokenUserDisplayName": "Bob Smith",
-                 "filePathPrefix": "{date}/{time}",
-                 "dateFormat": "yyyy/MM/dd",
-                 "timeFormat": "HH"
-             }
-         }
-         (below is an example of SQL Database for "datasource.json")
-         {
-             "type": "Microsoft.Sql/Server/Database",
-             "properties": {
-                 "server": "someServer",
-                 "database": "someDatabase",
-                 "user": "someUser",
-                 "password": "somePassword",
-                 "table": "someTable"
-             }
-         }
-         (below is an example of Table Storage for "datasource.json")
-         {
-             "type": "Microsoft.Storage/Table",
-             "properties": {
-                 "accountName": "someAccountName",
-                 "accountKey": "accountKey==",
-                 "table": "samples",
-                 "partitionKey": "partitionKey",
-                 "rowKey": "rowKey",
-                 "columnsToRemove": [
-                     "column1",
-                     "column2"
-                 ],
-                 "batchSize": 25
-             }
-         }
-         (below is an example of Blob Storage for "datasource.json")
-         {
-             "type": "Microsoft.Storage/Blob",
-             "properties": {
-                 "storageAccounts": [
-                     {
-                         "accountName": "someAccountName",
-                         "accountKey": "accountKey=="
-                     }
-                 ],
-                 "container": "state",
-                 "pathPattern": "{date}/{time}",
-                 "dateFormat": "yyyy/MM/dd",
-                 "timeFormat": "HH"
-             }
-         }
-         (below is an example of DocumentDB for "datasource.json")
-         {
-             "type": "Microsoft.Storage/DocumentDB",
-             "properties": {
-                 "accountId": "someAccountId",
-                 "accountKey": "accountKey==",
-                 "database": "db01",
-                 "collectionNamePattern": "collection",
-                 "partitionKey": "key",
-                 "documentId": "documentId"
-             }
-         }
-         (below is an example of Event Hub for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/EventHub",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "eventHubName": "sdkeventhub",
-                 "partitionKey": "partitionKey"
-             }
-         }
-         (below is an example of PowerBI for "datasource.json")
-         {
-             "type": "PowerBI",
-             "properties": {
-                 "dataset": "someDataset",
-                 "table": "someTable",
-                 "refreshToken": "someRefreshToken==",
-                 "tokenUserPrincipalName": "bobsmith@contoso.com",
-                 "tokenUserDisplayName": "Bob Smith",
-                 "groupId": "ac40305e-3e8d-43ac-8161-c33799f43e95",
-                 "groupName": "MyPowerBIGroup"
-             }
-         }
-         (below is an example of Service Bus Queue for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/Queue",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "queueName": "sdkqueue",
-                 "propertyColumns": [
-                     "column1",
-                     "column2"
-                 ]
-             }
-         }
-         (below is an example of Service Bus Topic for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/Topic",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "topicName": "sdktopic",
-                 "propertyColumns": [
-                     "column1",
-                     "column2"
-                 ]
-             }
-         }
-         (below is an example of Csv for "serialization.json")
-         {
-             "type": "Csv",
-             "properties": {
-                 "fieldDelimiter": ",",
-                 "encoding": "UTF8"
-             }
-         }
-         (below is an example of Json for "serialization.json")
-         {
-             "type": "Json",
-             "properties": {
-                 "encoding": "UTF8",
-                 "format": "Array"
-             }
-         }
-         (below is an example of Avro for "serialization.json")
-         {
-             "type": "Avro"
-         }
-  parameters:
-  - isRequired: true
-    name: --datasource
-    summary: The datasource of the output.
-    description: ''
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --serialization
-    summary: The serialization of the output.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_delete
-  name: az stream-analytics output delete
-  summary: Delete an output from the streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an output
-    syntax:
-      content: >-
-        az stream-analytics output delete --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyOutputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_list
-  name: az stream-analytics output list
-  summary: List all of the outputs under the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all outputs in a streaming job
-    syntax:
-      content: az stream-analytics output list --resource-group MyResourceGroup --job-name MyJobName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_show
-  name: az stream-analytics output show
-  summary: Get details about the specified output.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details about an output
-    syntax:
-      content: >-
-        az stream-analytics output show --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyOutputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_test
-  name: az stream-analytics output test
-  summary: Test an output.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Test the connection for an output
-    syntax:
-      content: >-
-        az stream-analytics output test --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyOutputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_output_create
-  name: az stream-analytics output create
-  summary: Create an output or replaces an already existing output under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_delete
-  name: az stream-analytics output delete
-  summary: Delete an output from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_list
-  name: az stream-analytics output list
-  summary: List all of the outputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_show
-  name: az stream-analytics output show
-  summary: Get details about the specified output.
-- uid: ext_stream-analytics_az_stream_analytics_output_test
-  name: az stream-analytics output test
-  summary: Test an output.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics output.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml
deleted file mode 100644
index b9fed98dac..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_quota
-  name: az stream-analytics quota
-  summary: Commands to show quota information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_quota_show
-- uid: ext_stream-analytics_az_stream_analytics_quota_show
-  name: az stream-analytics quota show
-  summary: Retrieve quota information in a particular region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List quota information in West US
-    syntax:
-      content: az stream-analytics quota show --location "West US"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_quota_show
-  name: az stream-analytics quota show
-  summary: Retrieve quota information in a particular region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to show quota information.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml b/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml
deleted file mode 100644
index ed30253576..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_transformation
-  name: az stream-analytics transformation
-  summary: Commands to manage stream-analytics transformation.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_transformation_create
-  - ext_stream-analytics_az_stream_analytics_transformation_show
-  - ext_stream-analytics_az_stream_analytics_transformation_update
-- uid: ext_stream-analytics_az_stream_analytics_transformation_create
-  name: az stream-analytics transformation create
-  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a transformation
-    syntax:
-      content: >-
-        az stream-analytics transformation create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name Transformation --streaming-units "6" --transformation-query "Select Id, Name from inputtest"
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the transformation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --streaming-units
-    summary: The number of streaming units that the streaming job uses.
-    description: ''
-  - name: --transformation-query
-    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: <a href="https://msdn.microsoft.com/library/azure/dn834998">https://msdn.microsoft.com/library/azure/dn834998</a> .'
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_transformation_show
-  name: az stream-analytics transformation show
-  summary: Get details about the specified transformation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a transformation
-    syntax:
-      content: >-
-        az stream-analytics transformation show --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name Transformation
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the transformation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_transformation_update
-  name: az stream-analytics transformation update
-  summary: Update transformation under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a transformation
-    syntax:
-      content: >-
-        az stream-analytics transformation update --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name Transformation --transformation-query "New query"
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the transformation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --streaming-units
-    summary: The number of streaming units that the streaming job uses.
-    description: ''
-  - name: --transformation-query
-    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: <a href="https://msdn.microsoft.com/library/azure/dn834998">https://msdn.microsoft.com/library/azure/dn834998</a> .'
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_transformation_create
-  name: az stream-analytics transformation create
-  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_show
-  name: az stream-analytics transformation show
-  summary: Get details about the specified transformation.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_update
-  name: az stream-analytics transformation update
-  summary: Update transformation under an existing streaming job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics transformation.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/subscription/account.yml b/2017-03-09-profile/docs-ref-autogen/ext/subscription/account.yml
deleted file mode 100644
index a7c068d701..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/subscription/account.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_subscription_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_subscription_az_account_create
-- uid: ext_subscription_az_account_create
-  name: az account create
-  summary: Create a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --enrollment-account-name --enrollment-account-object-id
-    summary: The name of the enrollment account which should be used to create a subscription.
-    description: ''
-  - isRequired: true
-    name: --offer-type
-    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
-    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.
-    description: ''
-  - name: --display-name
-    summary: The display name of the subscription.
-    description: ''
-  - name: --owner-object-id
-    summary: The object id(s) of the owner(s) which should be granted access to the new subscription.
-    description: ''
-  - name: --owner-spn
-    summary: The service principal name(s) of the owner(s) which should be granted access to the new subscription.
-    description: ''
-  - name: --owner-upn
-    summary: The user principal name(s) of owner(s) who should be granted access to the new subscription.
-    description: ''
-commands:
-- uid: ext_subscription_az_account_create
-  name: az account create
-  summary: Create a subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure subscription information.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/subscription/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/subscription/index.yml
deleted file mode 100644
index 1a67d7b877..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/subscription/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_subscription_az
-  name: subscription
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_subscription_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/support/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/support/index.yml
deleted file mode 100644
index cf1c23341e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/support/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az
-  name: support
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_support_az_support
-  name: az support
-  summary: Manage Azure support resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/support/support.yml b/2017-03-09-profile/docs-ref-autogen/ext/support/support.yml
deleted file mode 100644
index fa952d9bb9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/support/support.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support
-  name: az support
-  summary: Manage Azure support resource.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_support_az_support_services
-  name: az support services
-  summary: Azure services and related problem categories.
-- uid: ext_support_az_support_services_list
-  name: az support services list
-  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications
-  name: az support services problem-classifications
-  summary: Problem classifications for an Azure service.
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-- uid: ext_support_az_support_services_show
-  name: az support services show
-  summary: Gets a specific Azure service for support ticket creation.
-- uid: ext_support_az_support_tickets
-  name: az support tickets
-  summary: Create and manage Azure support ticket.
-- uid: ext_support_az_support_tickets_communications
-  name: az support tickets communications
-  summary: Manage support ticket communications.
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-- uid: ext_support_az_support_tickets_create
-  name: az support tickets create
-  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
-- uid: ext_support_az_support_tickets_list
-  name: az support tickets list
-  summary: Lists all the support tickets for an Azure subscription.
-- uid: ext_support_az_support_tickets_show
-  name: az support tickets show
-  summary: Gets support ticket details for an Azure subscription.
-- uid: ext_support_az_support_tickets_update
-  name: az support tickets update
-  summary: Updates severity level, status and customer contact information for a support ticket.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure support resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/support/support/services.yml b/2017-03-09-profile/docs-ref-autogen/ext/support/support/services.yml
deleted file mode 100644
index ddcfba5475..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/support/support/services.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_services
-  name: az support services
-  summary: Azure services and related problem categories.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_services_list
-  - ext_support_az_support_services_show
-- uid: ext_support_az_support_services_list
-  name: az support services list
-  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets list of services for which a support ticket can be created.
-    syntax:
-      content: az support services list
-  parameters: []
-- uid: ext_support_az_support_services_show
-  name: az support services show
-  summary: Gets a specific Azure service for support ticket creation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets details of Azure service.
-    syntax:
-      content: az support services show --service-name "ServiceNameGuid"
-  parameters:
-  - isRequired: true
-    name: --service-name
-    summary: Name of Azure service.
-    description: ''
-commands:
-- uid: ext_support_az_support_services_list
-  name: az support services list
-  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications
-  name: az support services problem-classifications
-  summary: Problem classifications for an Azure service.
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-- uid: ext_support_az_support_services_show
-  name: az support services show
-  summary: Gets a specific Azure service for support ticket creation.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Azure services and related problem categories.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/support/support/services/problem-classifications.yml b/2017-03-09-profile/docs-ref-autogen/ext/support/support/services/problem-classifications.yml
deleted file mode 100644
index a873940e6e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/support/support/services/problem-classifications.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_services_problem_classifications
-  name: az support services problem-classifications
-  summary: Problem classifications for an Azure service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_services_problem_classifications_list
-  - ext_support_az_support_services_problem_classifications_show
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets list of problemClassifications for a service for which a support ticket can be created.
-    syntax:
-      content: az support services problem-classifications list --service-name "ServiceNameGuid"
-  parameters:
-  - isRequired: true
-    name: --service-name
-    summary: Name of Azure service.
-    description: ''
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets details of problemClassification for Azure service.
-    syntax:
-      content: >-
-        az support services problem-classifications show \
-          --service-name "ServiceNameGuid" \
-          --problem-classification-name "ProblemClassificationNameGuid"
-  parameters:
-  - isRequired: true
-    name: --problem-classification-name
-    summary: Name of problem classification.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: Name of Azure service.
-    description: ''
-commands:
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Problem classifications for an Azure service.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets.yml b/2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets.yml
deleted file mode 100644
index b834822b42..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets.yml
+++ /dev/null
@@ -1,582 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_tickets
-  name: az support tickets
-  summary: Create and manage Azure support ticket.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_tickets_create
-  - ext_support_az_support_tickets_list
-  - ext_support_az_support_tickets_show
-  - ext_support_az_support_tickets_update
-- uid: ext_support_az_support_tickets_create
-  name: az support tickets create
-  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a ticket for Billing related issues.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "BillingTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "BillingTestTicketName" \
-          --title "BillingTicketTitle"
-  - summary: Create a ticket for Subscription Management related issues.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "SubMgmtTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/SubMgmtServiceNameGuid/problemClassifications/SubMgmtProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "SubMgmtTestTicketName" \
-          --title "SubMgmtTicketTitle"
-  - summary: Create a ticket for Technical issue related to a specific resource.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "TechnicalTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/TechnicalServiceNameGuid/problemClassifications/TechnicalProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "TechnicalTestTicketName" \
-          --title "TechnicalTicketTitle" \
-          --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
-          --technical-resource "/subscriptions/SubscriptionGuid/resourceGroups/RgName/providers/Microsoft.Compute/virtualMachines/RName"
-  - summary: Create a ticket for Billing related issues in admin on behalf of (AOBO) mode.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "BillingTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "BillingTestTicketName" \
-          --title "BillingTicketTitle" \
-          --partner-tenant-id "CSPPartnerTenantIdGuid"
-  - summary: Create a ticket for Generic Quota increase for any Azure Service.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/GenericProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle"
-  - summary: Create a ticket to request Quota increase for Compute VM Cores.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/CoresQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"SKU\":\"DSv3 Series\", \"NewLimit\":104}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0"
-  - summary: Create a ticket to request Quota increase for Low-priority cores for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"LowPriority\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for specific VM family cores for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for Pools for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Pools\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for Active Jobs and Job Schedules for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Jobs\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for number of Batch accounts for a subscription.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":200, \"Type\":\"Account\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Subscription"
-  - summary: Create a ticket to request Quota increase for DTUs for SQL Database.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "DTUs"
-  - summary: Create a ticket to request Quota increase for Servers for SQL Database.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":54000}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Servers"
-  - summary: Create a ticket to request Quota increase for DTUs for SQL Data Warehouse.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "DTUs"
-  - summary: Create a ticket to request Quota increase for Servers for SQL Data Warehouse.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":200}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Servers"
-  - summary: Create a ticket to request Quota increase for specific VM family cores for Machine Learning service.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "BatchAml"
-  - summary: Create a ticket to request Quota increase for Low-priority cores for Machine Learning service.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":200, \"Type\":\"LowPriority\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "BatchAml"
-  parameters:
-  - isRequired: true
-    name: --description
-    summary: Detailed description of the question or issue.
-    description: ''
-  - isRequired: true
-    name: --problem-classification
-    summary: Each Azure service has its own set of issue category called problem classification that corresponds to the type of problem you are experiencing. This parameter is the resource id of ProblemClassification resource.
-    description: ''
-  - isRequired: true
-    name: --severity
-    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
-    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
-    description: ''
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - isRequired: true
-    name: --title
-    summary: Title of the support ticket.
-    description: ''
-  - name: --partner-tenant-id
-    summary: Partner tenant id for Admin On Behalf of (AOBO) scenario. In addition to logging in to the customer tenant, logging in to the partner tenant (PT) using "az login -t PT --allow-no-subscriptions" is required.
-    description: ''
-  - name: --require-24-by-7-response
-    parameterValueGroup: false, true
-    summary: Indicates if this requires a 24x7 response from Azure. Default is false.
-    description: ''
-  - name: --start-time
-    summary: Time in UTC datetime (Y-m-d'T'H:M:S'Z') when the problem started. Default is today.
-    description: ''
-  - isRequired: true
-    name: --contact-country
-    summary: Country of the user. This is the ISO Alpha-3 code.
-    description: ''
-  - isRequired: true
-    name: --contact-email
-    summary: Primary email address.
-    description: ''
-  - isRequired: true
-    name: --contact-first-name
-    summary: First Name.
-    description: ''
-  - isRequired: true
-    name: --contact-language
-    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
-    description: ''
-  - isRequired: true
-    name: --contact-last-name
-    summary: Last Name.
-    description: ''
-  - isRequired: true
-    name: --contact-method
-    parameterValueGroup: email, phone
-    summary: Preferred contact method.
-    description: ''
-  - isRequired: true
-    name: --contact-timezone
-    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
-    description: ''
-  - name: --contact-additional-emails
-    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
-    description: ''
-  - name: --contact-phone-number
-    summary: Phone number. This is required if preferred contact method is phone.
-    description: ''
-  - name: --quota-change-payload
-    summary: Space seperated list of serialized payload of the quota increase request corresponding to regions. Visit <a href="https://aka.ms/supportrpquotarequestpayload">https://aka.ms/supportrpquotarequestpayload</a> for details.
-    description: ''
-  - name: --quota-change-regions
-    summary: Space seperated list of region for which the quota increase request is being made.
-    description: ''
-  - name: --quota-change-subtype
-    summary: 'Required for certain quota types when there is a sub type that you are requesting quota increase for. Example: Batch.'
-    description: ''
-  - name: --quota-change-version
-    summary: Quota change request version.
-    description: ''
-  - name: --technical-resource
-    summary: This is the resource id of the Azure service resource for which the support ticket is created.
-    description: ''
-- uid: ext_support_az_support_tickets_list
-  name: az support tickets list
-  summary: Lists all the support tickets for an Azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List support tickets for a subscription.
-    syntax:
-      content: az support tickets list
-  - summary: List support tickets in open state for a subscription.
-    syntax:
-      content: az support tickets list --filters "Status eq 'Open'"
-  - summary: List support tickets created on or after a certain date and in open state for a subscription.
-    syntax:
-      content: az support tickets list --filters "CreatedDate ge 2020-01-01 and Status eq 'Open'"
-  parameters:
-  - name: --filters
-    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "Status" property using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator. Default is CreatedDate >= one week.
-    description: ''
-- uid: ext_support_az_support_tickets_show
-  name: az support tickets show
-  summary: Gets support ticket details for an Azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details of a subscription ticket.
-    syntax:
-      content: az support tickets show --ticket-name "TestTicketName"
-  parameters:
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-- uid: ext_support_az_support_tickets_update
-  name: az support tickets update
-  summary: Updates severity level, status and customer contact information for a support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update support ticket severity.
-    syntax:
-      content: az support tickets update --ticket-name "TestTicketName" --severity "moderate"
-  - summary: Update support ticket status.
-    syntax:
-      content: az support tickets update --ticket-name "TestTicketName" --status "closed"
-  - summary: Update support ticket customer contact details properties.
-    syntax:
-      content: >-
-        az support tickets update --ticket-name "TestTicketName" \
-          --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "phone" \
-          --contact-phone-number "123-456-7890" \
-          --contact-timezone "Pacific Standard Time"
-  - summary: Update support ticket severity, status and customer contact details properties.
-    syntax:
-      content: >-
-        az support tickets update --ticket-name "TestTicketName" \
-          --status "open" \
-          --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "phone" \
-          --contact-phone-number "123-456-7890" \
-          --contact-timezone "Pacific Standard Time" \
-          --severity "moderate"
-  parameters:
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - name: --severity
-    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
-    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
-    description: ''
-  - name: --status
-    parameterValueGroup: closed, open
-    summary: Status to be updated on the ticket.
-    description: ''
-  - name: --contact-additional-emails
-    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
-    description: ''
-  - name: --contact-country
-    summary: Country of the user. This is the ISO Alpha-3 code.
-    description: ''
-  - name: --contact-email
-    summary: Primary email address.
-    description: ''
-  - name: --contact-first-name
-    summary: First Name.
-    description: ''
-  - name: --contact-language
-    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
-    description: ''
-  - name: --contact-last-name
-    summary: Last Name.
-    description: ''
-  - name: --contact-method
-    parameterValueGroup: email, phone
-    summary: Preferred contact method.
-    description: ''
-  - name: --contact-phone-number
-    summary: Phone number. This is required if preferred contact method is phone.
-    description: ''
-  - name: --contact-timezone
-    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
-    description: ''
-commands:
-- uid: ext_support_az_support_tickets_communications
-  name: az support tickets communications
-  summary: Manage support ticket communications.
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-- uid: ext_support_az_support_tickets_create
-  name: az support tickets create
-  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
-- uid: ext_support_az_support_tickets_list
-  name: az support tickets list
-  summary: Lists all the support tickets for an Azure subscription.
-- uid: ext_support_az_support_tickets_show
-  name: az support tickets show
-  summary: Gets support ticket details for an Azure subscription.
-- uid: ext_support_az_support_tickets_update
-  name: az support tickets update
-  summary: Updates severity level, status and customer contact information for a support ticket.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create and manage Azure support ticket.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets/communications.yml b/2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets/communications.yml
deleted file mode 100644
index bbbd88c6ee..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/support/support/tickets/communications.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_tickets_communications
-  name: az support tickets communications
-  summary: Manage support ticket communications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_tickets_communications_create
-  - ext_support_az_support_tickets_communications_list
-  - ext_support_az_support_tickets_communications_show
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add communication to subscription ticket.
-    syntax:
-      content: >-
-        az support tickets communications create \
-          --ticket-name "TestTicketName" \
-          --communication-name "TestTicketCommunicationName" \
-          --communication-body "TicketCommunicationBody" \
-          --communication-subject "TicketCommunicationSubject"
-  parameters:
-  - isRequired: true
-    name: --communication-name
-    summary: Communication name.
-    description: ''
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - isRequired: true
-    name: --communication-body
-    summary: Text of the communication.
-    description: ''
-  - isRequired: true
-    name: --communication-subject
-    summary: Subject of the communication.
-    description: ''
-  - name: --communication-sender
-    summary: Email address of the sender.
-    description: ''
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List communications for a subscription support ticket.
-    syntax:
-      content: az support tickets communications list --ticket-name "TestTicketName"
-  - summary: List web communications for a subscription support ticket.
-    syntax:
-      content: >-
-        az support tickets communications list \
-          --ticket-name "TestTicketName" \
-          --filters "communicationType eq 'Web'"
-  - summary: List web communication created on or after a specific date for a subscription support ticket.
-    syntax:
-      content: >-
-        az support tickets communications list \
-          --ticket-name "TestTicketName" \
-          --filters "CreatedDate ge 2020-01-01 and communicationType eq 'Web'"
-  parameters:
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - name: --filters
-    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "CommunicationType" using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator.
-    description: ''
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get communication details for a subscription support ticket.
-    syntax:
-      content: >-
-        az support tickets communications show \
-          --ticket-name "TestTicketName" \
-          --communication-name "TestTicketCommunicationName"
-  parameters:
-  - isRequired: true
-    name: --communication-name
-    summary: Communication name.
-    description: ''
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-commands:
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage support ticket communications.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/index.yml
deleted file mode 100644
index 70ff40121d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az
-  name: synapse
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse
-  name: az synapse
-  summary: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse.yml
deleted file mode 100644
index 1b1cb87fa7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse
-  name: az synapse
-  summary: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse_spark
-  name: az synapse spark
-  summary: Manage Spark pools and Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job
-  name: az synapse spark job
-  summary: Manage Synapse Spark batch jobs.
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-- uid: ext_synapse_az_synapse_spark_pool
-  name: az synapse spark pool
-  summary: Manage Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-- uid: ext_synapse_az_synapse_spark_session
-  name: az synapse spark session
-  summary: Manage Synapse Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-- uid: ext_synapse_az_synapse_spark_statement
-  name: az synapse spark statement
-  summary: Manage Synapse Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-- uid: ext_synapse_az_synapse_sql
-  name: az synapse sql
-  summary: Manage SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool
-  name: az synapse sql pool
-  summary: Manage SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-- uid: ext_synapse_az_synapse_workspace
-  name: az synapse workspace
-  summary: Manage Synapse workspaces.
-- uid: ext_synapse_az_synapse_workspace_check_name
-  name: az synapse workspace check-name
-  summary: Check if a Synapse workspace name is available or not.
-- uid: ext_synapse_az_synapse_workspace_create
-  name: az synapse workspace create
-  summary: Create a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_delete
-  name: az synapse workspace delete
-  summary: Delete a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule
-  name: az synapse workspace firewall-rule
-  summary: Manage a workspace's firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-- uid: ext_synapse_az_synapse_workspace_list
-  name: az synapse workspace list
-  summary: List all Synapse workspaces.
-- uid: ext_synapse_az_synapse_workspace_show
-  name: az synapse workspace show
-  summary: Get a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_update
-  name: az synapse workspace update
-  summary: Update a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_wait
-  name: az synapse workspace wait
-  summary: Place the CLI in a waiting state until a condition of the workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark.yml
deleted file mode 100644
index 0e982b4ab9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark
-  name: az synapse spark
-  summary: Manage Spark pools and Spark jobs.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse_spark_job
-  name: az synapse spark job
-  summary: Manage Synapse Spark batch jobs.
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-- uid: ext_synapse_az_synapse_spark_pool
-  name: az synapse spark pool
-  summary: Manage Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-- uid: ext_synapse_az_synapse_spark_session
-  name: az synapse spark session
-  summary: Manage Synapse Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-- uid: ext_synapse_az_synapse_spark_statement
-  name: az synapse spark statement
-  summary: Manage Synapse Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Spark pools and Spark jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/job.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/job.yml
deleted file mode 100644
index 63d6c466ea..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/job.yml
+++ /dev/null
@@ -1,189 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_job
-  name: az synapse spark job
-  summary: Manage Synapse Spark batch jobs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_job_cancel
-  - ext_synapse_az_synapse_spark_job_list
-  - ext_synapse_az_synapse_spark_job_show
-  - ext_synapse_az_synapse_spark_job_submit
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a Spark job.
-    syntax:
-      content: az synapse spark job cancel --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark jobs.
-    syntax:
-      content: az synapse spark job list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --from-index
-    summary: Optional parameter specifying which index the list should begin from.
-    description: ''
-  - name: --size
-    summary: The size of the returned list.By default it is 20 and that is the maximum.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark job.
-    syntax:
-      content: az synapse spark job show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Submit a Java Spark job.
-    syntax:
-      content: >-
-        az synapse spark job submit --name WordCount_Java --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool \
-
-        --main-definition-file abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/wordcount.jar \
-
-        --main-class-name WordCount \
-
-        --command-line-arguments abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/shakespeare.txt \
-
-        abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/result/ \
-
-        --executors 2 --executor-size Small
-  parameters:
-  - isRequired: true
-    name: --executor-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The executor size.
-    description: ''
-  - isRequired: true
-    name: --executors
-    summary: The number of executors.
-    description: ''
-  - isRequired: true
-    name: --main-class-name
-    summary: The fully-qualified identifier or the main class that is in the main definition file.
-    description: ''
-  - isRequired: true
-    name: --main-definition-file
-    summary: The main file used for the job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The Spark job name.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --archives
-    summary: The array of archives.
-    description: ''
-  - name: --command-line-arguments
-    summary: 'Optional arguments to the job (Note: please use storage URIs for file arguments).'
-    description: ''
-  - name: --configuration
-    summary: The configuration of Spark job.
-    description: ''
-  - name: --language
-    defaultValue: Scala
-    parameterValueGroup: CSharp, PySpark, Python, Scala, Spark, SparkDotNet
-    summary: The Spark job language.
-    description: ''
-  - name: --reference-files
-    summary: Additional files used for reference in the main definition file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse Spark batch jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml
deleted file mode 100644
index d2fc8e4def..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml
+++ /dev/null
@@ -1,309 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_pool
-  name: az synapse spark pool
-  summary: Manage Spark pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_pool_create
-  - ext_synapse_az_synapse_spark_pool_delete
-  - ext_synapse_az_synapse_spark_pool_list
-  - ext_synapse_az_synapse_spark_pool_show
-  - ext_synapse_az_synapse_spark_pool_update
-  - ext_synapse_az_synapse_spark_pool_wait
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Spark pool.
-    syntax:
-      content: >-
-        az synapse spark pool create --name testpool --workspace-name testsynapseworkspace --resource-group rg \
-
-        --spark-version 2.4 --node-count 3 --node-size Medium
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --delay
-    summary: The delay time whose unit is minute.
-    description: ''
-  - name: --enable-auto-pause
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto pause.
-    description: ''
-  - name: --enable-auto-scale
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto scale.
-    description: ''
-  - name: --max-node-count
-    summary: The max node count.
-    description: ''
-  - name: --min-node-count
-    summary: The min node count.
-    description: ''
-  - isRequired: true
-    name: --spark-version
-    summary: The supported Spark version is 2.4 now.
-    description: ''
-  - name: --default-spark-log-folder
-    defaultValue: /logs
-    summary: The default Spark log folder.
-    description: ''
-  - name: --spark-events-folder
-    defaultValue: /events
-    summary: The Spark events folder.
-    description: ''
-  - name: --library-requirements-file
-    summary: The library requirements file.
-    description: ''
-  - isRequired: true
-    name: --node-count
-    summary: The number of node.
-    description: ''
-  - isRequired: true
-    name: --node-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The node size.
-    description: ''
-  - name: --node-size-family
-    defaultValue: MemoryOptimized
-    summary: The node size family.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Spark pool.
-    syntax:
-      content: az synapse spark pool delete --name testpool --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark pools.
-    syntax:
-      content: az synapse spark pool list --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark pool.
-    syntax:
-      content: az synapse spark pool show --name testpool --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the Spark pool's tags.
-    syntax:
-      content: >-
-        az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
-
-        --tags key1=value1
-  - summary: Update the Spark pool's auto scale configuration.
-    syntax:
-      content: >-
-        az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
-
-        --enable-auto-scale --min-node-count 3 --max-node-count 100
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --force
-    parameterValueGroup: false, true
-    summary: The flag of force operation.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --delay
-    summary: The delay time whose unit is minute.
-    description: ''
-  - name: --enable-auto-pause
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto pause.
-    description: ''
-  - name: --enable-auto-scale
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto scale.
-    description: ''
-  - name: --max-node-count
-    summary: The max node count.
-    description: ''
-  - name: --min-node-count
-    summary: The min node count.
-    description: ''
-  - name: --library-requirements-file
-    summary: The library requirements file.
-    description: ''
-  - name: --node-count
-    summary: The number of node.
-    description: ''
-  - name: --node-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The node size.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --big-data-pool-name
-    summary: Big Data pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Spark pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/session.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/session.yml
deleted file mode 100644
index 5a9e73e577..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/session.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_session
-  name: az synapse spark session
-  summary: Manage Synapse Spark sessions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_session_cancel
-  - ext_synapse_az_synapse_spark_session_create
-  - ext_synapse_az_synapse_spark_session_list
-  - ext_synapse_az_synapse_spark_session_reset_timeout
-  - ext_synapse_az_synapse_spark_session_show
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a Spark session.
-    syntax:
-      content: az synapse spark session cancel  --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark session job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Spark session.
-    syntax:
-      content: >-
-        az synapse spark session create --name testsession  --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool --executor-size Small --executors 4
-  parameters:
-  - isRequired: true
-    name: --executor-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The executor size.
-    description: ''
-  - isRequired: true
-    name: --executors
-    summary: The number of executors.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The Spark session name.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --configuration
-    summary: The configuration of Spark session.
-    description: ''
-  - name: --reference-files
-    summary: Additional files used for reference in the main definition file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark sessions.
-    syntax:
-      content: az synapse spark session list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --from-index
-    summary: Optional parameter specifying which index the list should begin from.
-    description: ''
-  - name: --size
-    summary: The size of the returned list.By default it is 20 and that is the maximum.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reset a Spark session's timeout time.
-    syntax:
-      content: az synapse spark session reset-timeout --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark session job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark session.
-    syntax:
-      content: az synapse spark session show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark session job.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse Spark sessions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml
deleted file mode 100644
index ea1f4b4fb8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_statement
-  name: az synapse spark statement
-  summary: Manage Synapse Spark statements.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_statement_cancel
-  - ext_synapse_az_synapse_spark_statement_invoke
-  - ext_synapse_az_synapse_spark_statement_list
-  - ext_synapse_az_synapse_spark_statement_show
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a Spark statement.
-    syntax:
-      content: >-
-        az synapse spark statement cancel --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the statement.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Invoke a Spark statement.
-    syntax:
-      content: >-
-        az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool --code "print('hello, Azure CLI')" --language pyspark
-  - summary: Submit a Spark statement by reading code content from file.
-    syntax:
-      content: >-
-        az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool --code @file-path --language pyspark
-  parameters:
-  - isRequired: true
-    name: --code
-    summary: The code of Spark statement. This is either the code contents or use `@&lt;file path&gt;` to load the content from a file.
-    description: ''
-  - isRequired: true
-    name: --language
-    parameterValueGroup: CSharp, PySpark, Python, SQL, Scala, Spark, SparkDotNet
-    summary: The language of Spark statement.
-    description: ''
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark statements.
-    syntax:
-      content: >-
-        az synapse spark statement list --session-id 11 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark statement.
-    syntax:
-      content: >-
-        az synapse spark statement show --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the statement.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse Spark statements.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql.yml
deleted file mode 100644
index 18fae2113c..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_sql
-  name: az synapse sql
-  summary: Manage SQL pools.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse_sql_pool
-  name: az synapse sql pool
-  summary: Manage SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage SQL pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml
deleted file mode 100644
index c70bb93c12..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml
+++ /dev/null
@@ -1,285 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_sql_pool
-  name: az synapse sql pool
-  summary: Manage SQL pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_sql_pool_create
-  - ext_synapse_az_synapse_sql_pool_delete
-  - ext_synapse_az_synapse_sql_pool_list
-  - ext_synapse_az_synapse_sql_pool_pause
-  - ext_synapse_az_synapse_sql_pool_resume
-  - ext_synapse_az_synapse_sql_pool_show
-  - ext_synapse_az_synapse_sql_pool_update
-  - ext_synapse_az_synapse_sql_pool_wait
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a SQL pool.
-    syntax:
-      content: >-
-        az synapse sql pool create --name sqlpoolcli1 --performance-level "DW1000c" \
-
-        --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --performance-level
-    summary: The performance level.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a SQL pool.
-    syntax:
-      content: az synapse sql pool delete --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List SQL pools.
-    syntax:
-      content: az synapse sql pool list --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause a SQL pool.
-    syntax:
-      content: az synapse sql pool pause --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Resume a SQL pool.
-    syntax:
-      content: az synapse sql pool resume --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a SQL pool.
-    syntax:
-      content: az synapse sql pool show --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a SQL pool.
-    syntax:
-      content: >-
-        az synapse sql pool update --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg \
-
-        --tags key1=value1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --performance-level
-    summary: The performance level.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sql-pool-name
-    summary: SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage SQL pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace.yml
deleted file mode 100644
index deceb50b12..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_workspace
-  name: az synapse workspace
-  summary: Manage Synapse workspaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_workspace_check_name
-  - ext_synapse_az_synapse_workspace_create
-  - ext_synapse_az_synapse_workspace_delete
-  - ext_synapse_az_synapse_workspace_list
-  - ext_synapse_az_synapse_workspace_show
-  - ext_synapse_az_synapse_workspace_update
-  - ext_synapse_az_synapse_workspace_wait
-- uid: ext_synapse_az_synapse_workspace_check_name
-  name: az synapse workspace check-name
-  summary: Check if a Synapse workspace name is available or not.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check if a Synapse workspace name is available or not.
-    syntax:
-      content: az synapse workspace check-name --name testsynapseworkspace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name you wanted to check.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_create
-  name: az synapse workspace create
-  summary: Create a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Synapse workspace
-    syntax:
-      content: >-
-        az synapse workspace create --name fromcli4 --resource-group rg \
-          --storage-account testadlsgen2 --file-system testfilesystem \
-          --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
-  - summary: Create a Synapse workspace with storage resource id
-    syntax:
-      content: >-
-        az synapse workspace create --name fromcli4 --resource-group rg \
-          --storage-account /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/testadlsgen2 --file-system testfilesystem \
-          --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
-  parameters:
-  - isRequired: true
-    name: --file-system
-    summary: The file system of the data lake storage account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sql-admin-login-password -p
-    summary: The sql administrator login password.
-    description: ''
-  - isRequired: true
-    name: --sql-admin-login-user -u
-    summary: The sql administrator login user name.
-    description: ''
-  - isRequired: true
-    name: --storage-account
-    summary: The data lake storage account name or resource id.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_delete
-  name: az synapse workspace delete
-  summary: Delete a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Synapse workspace.
-    syntax:
-      content: az synapse workspace delete --name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_list
-  name: az synapse workspace list
-  summary: List all Synapse workspaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Synapse workspaces under a subscription
-    syntax:
-      content: az synapse workspace list
-  - summary: List all Synapse workspaces under a specific resource group
-    syntax:
-      content: az synapse workspace list --resource-group rg
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_show
-  name: az synapse workspace show
-  summary: Get a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Synapse workspace.
-    syntax:
-      content: az synapse workspace show --name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_update
-  name: az synapse workspace update
-  summary: Update a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a Synapse workspace
-    syntax:
-      content: >-
-        az synapse workspace update --name fromcli4 --resource-group rg \
-          --tags key1=value1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sql-admin-login-password -p
-    summary: The sql administrator login password.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_wait
-  name: az synapse workspace wait
-  summary: Place the CLI in a waiting state until a condition of the workspace is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_workspace_check_name
-  name: az synapse workspace check-name
-  summary: Check if a Synapse workspace name is available or not.
-- uid: ext_synapse_az_synapse_workspace_create
-  name: az synapse workspace create
-  summary: Create a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_delete
-  name: az synapse workspace delete
-  summary: Delete a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule
-  name: az synapse workspace firewall-rule
-  summary: Manage a workspace's firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-- uid: ext_synapse_az_synapse_workspace_list
-  name: az synapse workspace list
-  summary: List all Synapse workspaces.
-- uid: ext_synapse_az_synapse_workspace_show
-  name: az synapse workspace show
-  summary: Get a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_update
-  name: az synapse workspace update
-  summary: Update a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_wait
-  name: az synapse workspace wait
-  summary: Place the CLI in a waiting state until a condition of the workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml b/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml
deleted file mode 100644
index 18e26638ca..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_workspace_firewall_rule
-  name: az synapse workspace firewall-rule
-  summary: Manage a workspace's firewall rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_workspace_firewall_rule_create
-  - ext_synapse_az_synapse_workspace_firewall_rule_delete
-  - ext_synapse_az_synapse_workspace_firewall_rule_list
-  - ext_synapse_az_synapse_workspace_firewall_rule_show
-  - ext_synapse_az_synapse_workspace_firewall_rule_wait
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a firewall rule.
-    syntax:
-      content: >-
-        az synapse workspace firewall-rule create --name allowAll --workspace-name testsynapseworkspace \
-
-        --resource-group rg --start-ip-address 0.0.0.0 --end-ip-address 255.255.255.255
-  parameters:
-  - isRequired: true
-    name: --end-ip-address
-    summary: The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --start-ip-address
-    summary: The start IP address of the firewall rule. Must be IPv4 format.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a firewall rule.
-    syntax:
-      content: az synapse workspace firewall-rule delete --name rule1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all firewall rules.
-    syntax:
-      content: az synapse workspace firewall-rule list --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a firewall rule.
-    syntax:
-      content: az synapse workspace firewall-rule show --name rule1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-name
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage a workspace's firewall rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/index.yml
deleted file mode 100644
index d9412427f9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az
-  name: timeseriesinsights
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights
-  name: az timeseriesinsights
-  summary: Manage Azure Time Series Insights.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights.yml
deleted file mode 100644
index a0f38e9243..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights
-  name: az timeseriesinsights
-  summary: Manage Azure Time Series Insights.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-  name: az timeseriesinsights access-policy
-  summary: Commands to manage timeseriesinsights access policy.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  name: az timeseriesinsights access-policy create
-  summary: Create or update an access policy in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  name: az timeseriesinsights access-policy delete
-  summary: Delete the access policy with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  name: az timeseriesinsights access-policy list
-  summary: List all the available access policies associated with the environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  name: az timeseriesinsights access-policy show
-  summary: Show the access policy with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-  name: az timeseriesinsights access-policy update
-  summary: Create or update an access policy in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-  name: az timeseriesinsights environment
-  summary: Commands to manage timeseriesinsights environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  name: az timeseriesinsights environment delete
-  summary: Delete the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  name: az timeseriesinsights environment list
-  summary: List all the available environments associated with the subscription and within the specified resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-  name: az timeseriesinsights environment longterm
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-  name: az timeseriesinsights environment show
-  summary: Show the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-  name: az timeseriesinsights environment standard
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-  name: az timeseriesinsights event-source
-  summary: Commands to manage timeseriesinsights event source.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  name: az timeseriesinsights event-source delete
-  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-  name: az timeseriesinsights event-source eventhub
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-  name: az timeseriesinsights event-source iothub
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  name: az timeseriesinsights event-source list
-  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-  name: az timeseriesinsights event-source show
-  summary: Show the event source with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-  name: az timeseriesinsights reference-data-set
-  summary: Commands to manage timeseriesinsights reference data set.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  name: az timeseriesinsights reference-data-set create
-  summary: Create or update a reference data set in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  name: az timeseriesinsights reference-data-set delete
-  summary: Delete the reference data set with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  name: az timeseriesinsights reference-data-set list
-  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  name: az timeseriesinsights reference-data-set show
-  summary: Show the reference data set with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-  name: az timeseriesinsights reference-data-set update
-  summary: Create or update a reference data set in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Time Series Insights.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/access-policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/access-policy.yml
deleted file mode 100644
index 232f77748b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/access-policy.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-  name: az timeseriesinsights access-policy
-  summary: Commands to manage timeseriesinsights access policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  name: az timeseriesinsights access-policy create
-  summary: Create or update an access policy in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create access-policy
-    syntax:
-      content: az timeseriesinsights access-policy create -g {rg} --environment-name {env} -n ap1 --principal-object-id 001 --description "some description" --roles Contributor Reader
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: A description of the access policy.
-    description: ''
-  - name: --principal-object-id
-    summary: The objectId of the principal in Azure Active Directory.
-    description: ''
-  - name: --roles
-    parameterValueGroup: Contributor, Reader
-    summary: The list of roles the principal is assigned on the environment.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  name: az timeseriesinsights access-policy delete
-  summary: Delete the access policy with the specified name in the specified subscription, resource group, and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete access-policy
-    syntax:
-      content: az timeseriesinsights access-policy delete -g {rg} --environment-name {env} -n {ap}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  name: az timeseriesinsights access-policy list
-  summary: List all the available access policies associated with the environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List access-policy by environment
-    syntax:
-      content: az timeseriesinsights access-policy list -g {rg} --environment-name {env}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  name: az timeseriesinsights access-policy show
-  summary: Show the access policy with the specified name in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get access-policy
-    syntax:
-      content: az timeseriesinsights access-policy show -g {rg} --environment-name {env} -n {ap}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-  name: az timeseriesinsights access-policy update
-  summary: Create or update an access policy in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update access-policy
-    syntax:
-      content: >-
-        az timeseriesinsights access-policy update -g {rg} --environment-name \
-
-        {env} -n {ap} --roles "Reader,Contributor"
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: A description of the access policy.
-    description: ''
-  - name: --roles
-    parameterValueGroup: Contributor, Reader
-    summary: The list of roles the principal is assigned on the environment.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  name: az timeseriesinsights access-policy create
-  summary: Create or update an access policy in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  name: az timeseriesinsights access-policy delete
-  summary: Delete the access policy with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  name: az timeseriesinsights access-policy list
-  summary: List all the available access policies associated with the environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  name: az timeseriesinsights access-policy show
-  summary: Show the access policy with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-  name: az timeseriesinsights access-policy update
-  summary: Create or update an access policy in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights access policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment.yml
deleted file mode 100644
index 46a5daa974..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-  name: az timeseriesinsights environment
-  summary: Commands to manage timeseriesinsights environment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_show
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  name: az timeseriesinsights environment delete
-  summary: Delete the environment with the specified name in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an environments
-    syntax:
-      content: az timeseriesinsights environment delete -g {rg} -n {env}
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  name: az timeseriesinsights environment list
-  summary: List all the available environments associated with the subscription and within the specified resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List environments by resource group
-    syntax:
-      content: az timeseriesinsights environment list -g {rg}
-  - summary: List environments by subscription
-    syntax:
-      content: az timeseriesinsights environment list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-  name: az timeseriesinsights environment show
-  summary: Show the environment with the specified name in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an environments
-    syntax:
-      content: az timeseriesinsights environment show -g {rg} -n {env}
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Setting $expand=status will include the status of the internal services of the environment in the Time Series Insights service.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  name: az timeseriesinsights environment delete
-  summary: Delete the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  name: az timeseriesinsights environment list
-  summary: List all the available environments associated with the subscription and within the specified resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-  name: az timeseriesinsights environment longterm
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-  name: az timeseriesinsights environment show
-  summary: Show the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-  name: az timeseriesinsights environment standard
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights environment.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/longterm.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/longterm.yml
deleted file mode 100644
index 1730f2008a..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/longterm.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-  name: az timeseriesinsights environment longterm
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create storage account and use it to create a longterm environment
-    syntax:
-      content: >-
-        storage=mystorageaccount
-
-        rg={rg}
-
-        az storage account create -g $rg -n $storage --https-only
-
-        key=$(az storage account keys list -g $rg -n $storage --query [0].value --output tsv)
-
-        az timeseriesinsights environment longterm create -g $rg -n {env} --location westus --sku-name L1 --sku-capacity 1 --data-retention 7 --time-series-id-properties DeviceId1 --storage-account-name $storage --storage-management-key $key
-  parameters:
-  - isRequired: true
-    name: --data-retention
-    summary: The number of days the environment's events will be available for query from the warm store.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --time-series-id-properties
-    summary: Required. The list of event properties which will be used to define the environment's time series id.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --sku-capacity
-    summary: The capacity of the sku. For standard environments, this value can be changed to support scale out of environments after they have been created.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    parameterValueGroup: L1, P1, S1, S2
-    summary: The sku determines the type of environment, either standard (S1 or S2) or long-term (L1). For standard environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
-    description: ''
-  - isRequired: true
-    name: --storage-account-name
-    summary: The name of the storage account that will hold the environment's long term data.
-    description: ''
-  - isRequired: true
-    name: --storage-management-key
-    summary: The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update dataRetention
-    syntax:
-      content: az timeseriesinsights environment longterm update -g {rg} -n {env} --data-retention 8
-  - summary: Update storageManagementKey
-    syntax:
-      content: az timeseriesinsights environment longterm update -g {rg} -n {env} --storage-management-key xxx
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --data-retention
-    summary: The number of days the environment's events will be available for query from the warm store.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --storage-management-key
-    summary: The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update a longterm environment in the specified subscription and resource group.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/standard.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/standard.yml
deleted file mode 100644
index 9792903241..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/standard.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-  name: az timeseriesinsights environment standard
-  summary: Create or update a standard environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a standard environment
-    syntax:
-      content: az timeseriesinsights environment standard create -g {rg} -n {env} --location westus --sku-name S1 --sku-capacity 1 --data-retention-time 31 --partition-key DeviceId1 --storage-limit-exceeded-behavior PauseIngress
-  parameters:
-  - isRequired: true
-    name: --data-retention-time
-    summary: The minimum number of days the environment's events will be available for query.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --partition-key-properties
-    summary: The list of event properties which will be used to partition data in the environment.
-    description: ''
-  - name: --storage-limit-exceeded-behavior
-    parameterValueGroup: PauseIngress, PurgeOldData
-    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --sku-capacity
-    summary: The capacity of the sku. For standard environments, this value can be changed to support scale out of environments after they have been created.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    parameterValueGroup: L1, P1, S1, S2
-    summary: The sku determines the type of environment, either standard (S1 or S2) or long-term (L1). For standard environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update sku capacity
-    syntax:
-      content: az timeseriesinsights environment standard update -g {rg} -n {env} --sku-name S1 --sku-capacity 2
-  - summary: Update data retention days
-    syntax:
-      content: az timeseriesinsights environment standard update -g {rg} -n {env} --data-retention-time 8
-  - summary: Update storage limit exceeded behavior
-    syntax:
-      content: az timeseriesinsights environment standard update -g {rg} -n {env} --storage-limit-exceeded-behavior PurgeOldData
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --data-retention-time
-    summary: The minimum number of days the environment's events will be available for query.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --partition-key-properties
-    summary: The list of event properties which will be used to partition data in the environment.
-    description: ''
-  - name: --storage-limit-exceeded-behavior
-    parameterValueGroup: PauseIngress, PurgeOldData
-    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --sku-capacity
-    summary: The capacity of the sku. For standard environments, this value can be changed to support scale out of environments after they have been created.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: L1, P1, S1, S2
-    summary: The sku determines the type of environment, either standard (S1 or S2) or long-term (L1). For standard environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update a standard environment in the specified subscription and resource group.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source.yml
deleted file mode 100644
index ce8abf53f0..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-  name: az timeseriesinsights event-source
-  summary: Commands to manage timeseriesinsights event source.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  name: az timeseriesinsights event-source delete
-  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete event-source
-    syntax:
-      content: az timeseriesinsights event-source delete -g {rg} --environment-name {env} -n es1
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  name: az timeseriesinsights event-source list
-  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List event-source by environment
-    syntax:
-      content: az timeseriesinsights event-source list -g {rg} --environment-name {env}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-  name: az timeseriesinsights event-source show
-  summary: Show the event source with the specified name in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show event-source
-    syntax:
-      content: az timeseriesinsights event-source show -g {rg} --environment-name {env} -n es1
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  name: az timeseriesinsights event-source delete
-  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-  name: az timeseriesinsights event-source eventhub
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-  name: az timeseriesinsights event-source iothub
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  name: az timeseriesinsights event-source list
-  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-  name: az timeseriesinsights event-source show
-  summary: Show the event source with the specified name in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights event source.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/eventhub.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/eventhub.yml
deleted file mode 100644
index 2522f0caa5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/eventhub.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-  name: az timeseriesinsights event-source eventhub
-  summary: Create or update an event hub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an eventhub and use it for event source
-    syntax:
-      content: >-
-        rg={rg}
-
-        ehns={eventhub_namespace}
-
-        eh={eventhub_name}
-
-        az eventhubs namespace create -g $rg -n $ehns
-
-        es_resource_id=$(az eventhubs eventhub create -g $rg -n $eh --namespace-name $ehns --query id --output tsv)
-
-        shared_access_key=$(az eventhubs namespace authorization-rule keys list -g $rg --namespace-name $ehns -n RootManageSharedAccessKey --query primaryKey --output tsv)
-
-        az timeseriesinsights event-source eventhub create -g $rg --environment-name {env} -n es1 --key-name RootManageSharedAccessKey --shared-access-key $shared_access_key --event-source-resource-id $es_resource_id --consumer-group-name '$Default' --timestamp-property-name DeviceId
-  parameters:
-  - isRequired: true
-    name: --consumer-group-name
-    summary: Required. The name of the event hub's consumer group that holds the partitions from which events will be read.
-    description: ''
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --event-source-resource-id
-    summary: Required. The resource id of the event source in Azure Resource Manager.
-    description: ''
-  - isRequired: true
-    name: --key-name
-    summary: Required. The name of the SAS key that grants the Time Series Insights service access to the event hub. The shared access policies for this key must grant 'Listen' permissions to the event hub.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --shared-access-key
-    summary: Required. The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update timestampPropertyName
-    syntax:
-      content: az timeseriesinsights event-source eventhub update -g {rg} --environment-name {env} -n {es} --timestamp-property-name DeviceId1
-  - summary: Update localTimestamp (Currently only Embedded is supported)
-    syntax:
-      content: az timeseriesinsights event-source eventhub update -g {rg} --environment-name {env} -n {es} --local-timestamp-format Embedded
-  - summary: Update sharedAccessKey
-    syntax:
-      content: az timeseriesinsights event-source eventhub update -g {rg} --environment-name {env} -n {es} --shared-access-key {shared_access_key}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --shared-access-key
-    summary: The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-  - name: --local-timestamp-format
-    parameterValueGroup: Embedded, Iana, TimeSpan
-    summary: An enum that represents the format of the local timestamp property that needs to be set. Currently only Embedded is supported.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update an event hub event source under the specified environment.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/iothub.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/iothub.yml
deleted file mode 100644
index 3eefc05dd5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/iothub.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-  name: az timeseriesinsights event-source iothub
-  summary: Create or update an iothub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an iothub and use it for event source
-    syntax:
-      content: >-
-        rg={rg}
-
-        iothub={iothub_name}
-
-        es_resource_id=$(az iot hub create -g $rg -n $iothub --query id --output tsv)
-
-        shared_access_key=$(az iot hub policy list -g $rg --hub-name $iothub --query "[?keyName=='iothubowner'].primaryKey" --output tsv)
-
-        az timeseriesinsights event-source iothub create -g $rg --environment-name {env} -n es2 --consumer-group-name '$Default' --key-name iothubowner --shared-access-key $shared_access_key --event-source-resource-id $es_resource_id --timestamp-property-name DeviceId
-  parameters:
-  - isRequired: true
-    name: --consumer-group-name
-    summary: Required. The name of the iot hub's consumer group that holds the partitions from which events will be read.
-    description: ''
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --event-source-resource-id
-    summary: Required. The resource id of the event source in Azure Resource Manager.
-    description: ''
-  - isRequired: true
-    name: --key-name
-    summary: Required. The name of the Shared Access Policy key that grants the Time Series Insights service access to the iot hub. This shared access policy key must grant 'service connect' permissions to the iot hub.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --shared-access-key
-    summary: Required. The value of the Shared Access Policy key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update timestampPropertyName
-    syntax:
-      content: az timeseriesinsights event-source iothub update -g {rg} --environment-name {env} -n {es} --timestamp-property-name DeviceId1
-  - summary: Update localTimestamp (Currently only Embedded is supported)
-    syntax:
-      content: az timeseriesinsights event-source iothub update -g {rg} --environment-name {env} -n {es} --local-timestamp-format Embedded
-  - summary: Update sharedAccessKey
-    syntax:
-      content: az timeseriesinsights event-source iothub update -g {rg} --environment-name {env} -n {es} --shared-access-key {shared_access_key}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --shared-access-key
-    summary: The value of the shared access key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-  - name: --local-timestamp-format
-    parameterValueGroup: Embedded, Iana, TimeSpan
-    summary: An enum that represents the format of the local timestamp property that needs to be set. Currently only Embedded is supported.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update an iothub event source under the specified environment.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/reference-data-set.yml b/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/reference-data-set.yml
deleted file mode 100644
index 9bf6df19e6..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/reference-data-set.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-  name: az timeseriesinsights reference-data-set
-  summary: Commands to manage timeseriesinsights reference data set.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  name: az timeseriesinsights reference-data-set create
-  summary: Create or update a reference data set in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set create -g {rg} --environment-name {env} -n {rds} --key-properties DeviceId1 String DeviceFloor Double --data-string-comparison-behavior Ordinal
-  parameters:
-  - isRequired: true
-    name: --data-string-comparison-behavior
-    parameterValueGroup: Ordinal, OrdinalIgnoreCase
-    summary: The reference data set key comparison behavior can be set using this property. By default, the value is 'Ordinal' - which means case sensitive key comparison will be performed while joining reference data with events or while adding new reference data. When 'OrdinalIgnoreCase' is set, case insensitive comparison will be used.
-    description: ''
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --key-properties
-    summary: 'The list of key properties for the reference data set. Format: NAME TYPE ...'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  name: az timeseriesinsights reference-data-set delete
-  summary: Delete the reference data set with the specified name in the specified subscription, resource group, and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set delete -g {rg} --environment-name {env} -n {rds}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  name: az timeseriesinsights reference-data-set list
-  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List reference-data-set by environment
-    syntax:
-      content: az timeseriesinsights reference-data-set list -g {rg} --environment-name {env}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  name: az timeseriesinsights reference-data-set show
-  summary: Show the reference data set with the specified name in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set show -g {rg} --environment-name {env} -n {rds}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-  name: az timeseriesinsights reference-data-set update
-  summary: Create or update a reference data set in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set update -g {rg} --environment-name {env} -n {rds} --tags mykey=myvalue
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  name: az timeseriesinsights reference-data-set create
-  summary: Create or update a reference data set in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  name: az timeseriesinsights reference-data-set delete
-  summary: Delete the reference data set with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  name: az timeseriesinsights reference-data-set list
-  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  name: az timeseriesinsights reference-data-set show
-  summary: Show the reference data set with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-  name: az timeseriesinsights reference-data-set update
-  summary: Create or update a reference data set in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights reference data set.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/index.yml
deleted file mode 100644
index b2a277c2f4..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az
-  name: virtual-network-tap
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network.yml
deleted file mode 100644
index 2ecc3603a9..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config
-  name: az network nic vtap-config
-  summary: Manage virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-- uid: ext_virtual-network-tap_az_network_vnet_tap
-  name: az network vnet tap
-  summary: Manage virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml
deleted file mode 100644
index a88c5b83dd..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-  description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config
-  name: az network nic vtap-config
-  summary: Manage virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml
deleted file mode 100644
index f829d8ef7d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config
-  name: az network nic vtap-config
-  summary: Manage virtual network tap configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-network-tap_az_network_nic_vtap_config_create
-  - ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  - ext_virtual-network-tap_az_network_nic_vtap_config_list
-  - ext_virtual-network-tap_az_network_nic_vtap_config_show
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual network tap configuration.
-    description: ''
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vnet-tap
-    summary: Name or ID of the virtual network tap.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual network tap configuration.
-    description: ''
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual network tap configuration.
-    description: ''
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual network tap configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml
deleted file mode 100644
index 072a9e7abe..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-  description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network_vnet_tap
-  name: az network vnet tap
-  summary: Manage virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml
deleted file mode 100644
index 0aa1ca29ba..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_vnet_tap
-  name: az network vnet tap
-  summary: Manage virtual network taps.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-network-tap_az_network_vnet_tap_create
-  - ext_virtual-network-tap_az_network_vnet_tap_delete
-  - ext_virtual-network-tap_az_network_vnet_tap_list
-  - ext_virtual-network-tap_az_network_vnet_tap_show
-  - ext_virtual-network-tap_az_network_vnet_tap_update
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --destination
-    summary: ID of the ILB or NIC IP configuration to receive the tap.
-    description: ''
-  - name: --port
-    summary: The VXLAN port that will receive the tapped traffic.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual network taps.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/index.yml
deleted file mode 100644
index ffab51515b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az
-  name: virtual-wan
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-wan_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network.yml
deleted file mode 100644
index 2992808bd2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network.yml
+++ /dev/null
@@ -1,185 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-wan_az_network_vhub
-  name: az network vhub
-  summary: Manage virtual hubs.
-- uid: ext_virtual-wan_az_network_vhub_connection
-  name: az network vhub connection
-  summary: Manage virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_create
-  name: az network vhub create
-  summary: Create a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_delete
-  name: az network vhub delete
-  summary: Delete a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_list
-  name: az network vhub list
-  summary: List virtual hubs.
-- uid: ext_virtual-wan_az_network_vhub_route
-  name: az network vhub route
-  summary: Manage entries in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table
-  name: az network vhub route-table
-  summary: Manage route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_show
-  name: az network vhub show
-  summary: Get the details of a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_update
-  name: az network vhub update
-  summary: Update settings of a virtual hub.
-- uid: ext_virtual-wan_az_network_vpn_gateway
-  name: az network vpn-gateway
-  summary: Manage VPN gateways.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection
-  name: az network vpn-gateway connection
-  summary: Manage VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_create
-  name: az network vpn-gateway create
-  summary: Create a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_delete
-  name: az network vpn-gateway delete
-  summary: Delete a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_list
-  name: az network vpn-gateway list
-  summary: List VPN gateways.
-- uid: ext_virtual-wan_az_network_vpn_gateway_show
-  name: az network vpn-gateway show
-  summary: Get the details of a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_update
-  name: az network vpn-gateway update
-  summary: Update settings of a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_site
-  name: az network vpn-site
-  summary: Manage VPN site configurations.
-- uid: ext_virtual-wan_az_network_vpn_site_create
-  name: az network vpn-site create
-  summary: Create a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_delete
-  name: az network vpn-site delete
-  summary: Delete a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_download
-  name: az network vpn-site download
-  summary: Provide a SAS-URL to download the configuration for a VPN site.
-- uid: ext_virtual-wan_az_network_vpn_site_list
-  name: az network vpn-site list
-  summary: List VPN site configurations.
-- uid: ext_virtual-wan_az_network_vpn_site_show
-  name: az network vpn-site show
-  summary: Get the details of a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_update
-  name: az network vpn-site update
-  summary: Update settings of a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vwan
-  name: az network vwan
-  summary: Manage virtual WANs.
-- uid: ext_virtual-wan_az_network_vwan_create
-  name: az network vwan create
-  summary: Create a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_delete
-  name: az network vwan delete
-  summary: Delete a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_list
-  name: az network vwan list
-  summary: List virtual WANs.
-- uid: ext_virtual-wan_az_network_vwan_show
-  name: az network vwan show
-  summary: Get the details of a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_update
-  name: az network vwan update
-  summary: Update settings of a virtual WAN.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub.yml
deleted file mode 100644
index 12e57fee05..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub
-  name: az network vhub
-  summary: Manage virtual hubs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_create
-  - ext_virtual-wan_az_network_vhub_delete
-  - ext_virtual-wan_az_network_vhub_list
-  - ext_virtual-wan_az_network_vhub_show
-  - ext_virtual-wan_az_network_vhub_update
-- uid: ext_virtual-wan_az_network_vhub_create
-  name: az network vhub create
-  summary: Create a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address-prefix
-    summary: CIDR address prefix for the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vwan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Standard
-    summary: The sku of the VirtualHub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_delete
-  name: az network vhub delete
-  summary: Delete a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_list
-  name: az network vhub list
-  summary: List virtual hubs.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_show
-  name: az network vhub show
-  summary: Get the details of a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_update
-  name: az network vhub update
-  summary: Update settings of a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --address-prefix
-    summary: CIDR address prefix for the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Standard
-    summary: The sku of the VirtualHub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vwan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_connection
-  name: az network vhub connection
-  summary: Manage virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_create
-  name: az network vhub create
-  summary: Create a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_delete
-  name: az network vhub delete
-  summary: Delete a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_list
-  name: az network vhub list
-  summary: List virtual hubs.
-- uid: ext_virtual-wan_az_network_vhub_route
-  name: az network vhub route
-  summary: Manage entries in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table
-  name: az network vhub route-table
-  summary: Manage route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_show
-  name: az network vhub show
-  summary: Get the details of a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_update
-  name: az network vhub update
-  summary: Update settings of a virtual hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual hubs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml
deleted file mode 100644
index 62ae59c455..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_connection
-  name: az network vhub connection
-  summary: Manage virtual hub VNet connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_connection_create
-  - ext_virtual-wan_az_network_vhub_connection_delete
-  - ext_virtual-wan_az_network_vhub_connection_list
-  - ext_virtual-wan_az_network_vhub_connection_show
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the connection.
-    description: ''
-  - isRequired: true
-    name: --remote-vnet
-    summary: Name of ID of the remote VNet to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --internet-security
-    parameterValueGroup: false, true
-    summary: Enable internet security.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --remote-vnet-transit
-    parameterValueGroup: false, true
-    summary: Enable hub to remote VNet transit.
-    description: ''
-  - name: --use-hub-vnet-gateways
-    parameterValueGroup: false, true
-    summary: Allow remote VNet to use hub's VNet gateways.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual hub VNet connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml
deleted file mode 100644
index eebb69a61d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_route_table
-  name: az network vhub route-table
-  summary: Manage route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_route_table_create
-  - ext_virtual-wan_az_network_vhub_route_table_delete
-  - ext_virtual-wan_az_network_vhub_route_table_list
-  - ext_virtual-wan_az_network_vhub_route_table_show
-  - ext_virtual-wan_az_network_vhub_route_table_update
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a route table in the virtual hub.
-    syntax:
-      content: az network vhub route-table create -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --connections All_Vnets --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type IPAddress --next-hops "10.0.0.68"
-  parameters:
-  - isRequired: true
-    name: --connections
-    parameterValueGroup: All_Branches, All_Vnets
-    summary: List of all connections attached to this route table.
-    description: ''
-  - isRequired: true
-    name: --destination-type
-    parameterValueGroup: CIDR, Service
-    summary: The type of destinations.
-    description: ''
-  - isRequired: true
-    name: --destinations
-    summary: Space-separated list of all destinations.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --next-hop-type
-    parameterValueGroup: IPAddress
-    summary: The type of next hops. Currently it only supports IP Address.
-    description: ''
-  - isRequired: true
-    name: --next-hops
-    summary: Space-separated list of IP address of the next hop.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a route table in the virtual hub.
-    syntax:
-      content: az network vhub route-table delete -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a route table in the virtual hub.
-    syntax:
-      content: az network vhub route-table update -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --connections All_Vnets All_Branches
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --connections
-    parameterValueGroup: All_Branches, All_Vnets
-    summary: List of all connections attached to this route table.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage route table in the virtual hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml
deleted file mode 100644
index 9bb7ae58aa..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_route_table_route_add
-  - ext_virtual-wan_az_network_vhub_route_table_route_list
-  - ext_virtual-wan_az_network_vhub_route_table_route_remove
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a route with CIDR destination into route table of the virtual hub.
-    syntax:
-      content: az network vhub route-table route add -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type IPAddress --next-hops "10.0.0.68"
-  - summary: Add a route with Service destination into route table of the virtual hub.
-    syntax:
-      content: az network vhub route-table route add -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --destination-type Service --destinations Skype Sharepoint --next-hop-type IPAddress --next-hops "10.0.0.68"
-  parameters:
-  - isRequired: true
-    name: --destination-type
-    parameterValueGroup: CIDR, Service
-    summary: The type of destinations.
-    description: ''
-  - isRequired: true
-    name: --destinations
-    summary: Space-separated list of all destinations.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --next-hop-type
-    parameterValueGroup: IPAddress
-    summary: The type of next hops. Currently it only supports IP Address.
-    description: ''
-  - isRequired: true
-    name: --next-hops
-    summary: Space-separated list of IP address of the next hop.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --index
-    summary: List index of the item (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage routes of route table in the virtual hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml
deleted file mode 100644
index 04eb48ced8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_route
-  name: az network vhub route
-  summary: Manage entries in the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_route_add
-  - ext_virtual-wan_az_network_vhub_route_list
-  - ext_virtual-wan_az_network_vhub_route_remove
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address-prefixes
-    summary: Space-separated list of CIDR prefixes.
-    description: ''
-  - isRequired: true
-    name: --next-hop
-    summary: IP address of the next hop.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --index
-    summary: List index of the item (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entries in the virtual hub route table.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml
deleted file mode 100644
index 2e10255266..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_gateway
-  name: az network vpn-gateway
-  summary: Manage VPN gateways.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_gateway_create
-  - ext_virtual-wan_az_network_vpn_gateway_delete
-  - ext_virtual-wan_az_network_vpn_gateway_list
-  - ext_virtual-wan_az_network_vpn_gateway_show
-  - ext_virtual-wan_az_network_vpn_gateway_update
-- uid: ext_virtual-wan_az_network_vpn_gateway_create
-  name: az network vpn-gateway create
-  summary: Create a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub
-    summary: Name or ID of a virtual hub.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --scale-unit
-    summary: The scale unit for this VPN gateway.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_delete
-  name: az network vpn-gateway delete
-  summary: Delete a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_list
-  name: az network vpn-gateway list
-  summary: List VPN gateways.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_show
-  name: az network vpn-gateway show
-  summary: Get the details of a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_update
-  name: az network vpn-gateway update
-  summary: Update settings of a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --scale-unit
-    summary: The scale unit for this VPN gateway.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vhub
-    summary: Name or ID of a virtual hub.
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection
-  name: az network vpn-gateway connection
-  summary: Manage VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_create
-  name: az network vpn-gateway create
-  summary: Create a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_delete
-  name: az network vpn-gateway delete
-  summary: Delete a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_list
-  name: az network vpn-gateway list
-  summary: List VPN gateways.
-- uid: ext_virtual-wan_az_network_vpn_gateway_show
-  name: az network vpn-gateway show
-  summary: Get the details of a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_update
-  name: az network vpn-gateway update
-  summary: Update settings of a VPN gateway.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN gateways.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml
deleted file mode 100644
index b34b1d11cf..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection
-  name: az network vpn-gateway connection
-  summary: Manage VPN gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_gateway_connection_create
-  - ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  - ext_virtual-wan_az_network_vpn_gateway_connection_list
-  - ext_virtual-wan_az_network_vpn_gateway_connection_show
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --remote-vpn-site
-    summary: Name of ID of the remote VPN site.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --connection-bandwidth
-    summary: Expected bandwidth in Mbps.
-    description: ''
-  - name: --enable-bgp
-    parameterValueGroup: false, true
-    summary: Enable BGP.
-    description: ''
-  - name: --internet-security
-    parameterValueGroup: false, true
-    summary: Enable internet security.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --protocol-type
-    parameterValueGroup: IKEv1, IKEv2
-    summary: Connection protocol.
-    description: ''
-  - name: --rate-limiting
-    parameterValueGroup: false, true
-    summary: Enable rate limiting.
-    description: ''
-  - name: --routing-weight
-    summary: Routing weight.
-    description: ''
-  - name: --shared-key
-    summary: Shared key.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN gateway connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml
deleted file mode 100644
index 9426fcb3b7..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml
+++ /dev/null
@@ -1,143 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  - ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  - ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --connection-name
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - isRequired: true
-    name: --dh-group
-    parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
-    summary: DH Groups used in IKE Phase 1 for initial SA.
-    description: ''
-  - isRequired: true
-    name: --ike-encryption
-    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256
-    summary: IKE encryption algorithm (IKE phase 2).
-    description: ''
-  - isRequired: true
-    name: --ike-integrity
-    parameterValueGroup: GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384
-    summary: IKE integrity algorithm (IKE phase 2).
-    description: ''
-  - isRequired: true
-    name: --ipsec-encryption
-    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
-    summary: IPSec encryption algorithm (IKE phase 1).
-    description: ''
-  - isRequired: true
-    name: --ipsec-integrity
-    parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
-    summary: IPSec integrity algorithm (IKE phase 1).
-    description: ''
-  - isRequired: true
-    name: --pfs-group
-    parameterValueGroup: ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM
-    summary: The Pfs Groups used in IKE Phase 2 for new child SA.
-    description: ''
-  - isRequired: true
-    name: --sa-data-size
-    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site-to-site VPN tunnel.
-    description: ''
-  - isRequired: true
-    name: --sa-lifetime
-    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site-to-site VPN tunnel.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --connection-name
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --connection-name
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --index
-    summary: List index of the item (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN gateway connection IPSec policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml
deleted file mode 100644
index f562658fc8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml
+++ /dev/null
@@ -1,237 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_site
-  name: az network vpn-site
-  summary: Manage VPN site configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_site_create
-  - ext_virtual-wan_az_network_vpn_site_delete
-  - ext_virtual-wan_az_network_vpn_site_download
-  - ext_virtual-wan_az_network_vpn_site_list
-  - ext_virtual-wan_az_network_vpn_site_show
-  - ext_virtual-wan_az_network_vpn_site_update
-- uid: ext_virtual-wan_az_network_vpn_site_create
-  name: az network vpn-site create
-  summary: Create a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --ip-address
-    summary: IP address of the VPN site.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --address-prefixes
-    summary: Space-separated list of CIDR address prefixes.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --security-site
-    parameterValueGroup: false, true
-    summary: Whether the VPN site is security-related.
-    description: ''
-  - name: --site-key
-    summary: Key for the VPN site that can be used for connections.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --virtual-wan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-  - name: --device-model
-    summary: Model of the device.
-    description: ''
-  - name: --device-vendor
-    summary: Name of the device vendor.
-    description: ''
-  - name: --link-speed
-    summary: Link speed in Mbps.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_delete
-  name: az network vpn-site delete
-  summary: Delete a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_download
-  name: az network vpn-site download
-  summary: Provide a SAS-URL to download the configuration for a VPN site.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vwan-name
-    summary: Name of the virtual WAN.
-    description: ''
-  - name: --output-blob-sas-url
-    summary: The sas-url to download the configurations for vpn-sites.
-    description: ''
-  - name: --vpn-sites
-    summary: Space-separated list of VPN site names or IDs.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_list
-  name: az network vpn-site list
-  summary: List VPN site configurations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_show
-  name: az network vpn-site show
-  summary: Get the details of a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_update
-  name: az network vpn-site update
-  summary: Update settings of a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --address-prefixes
-    summary: Space-separated list of CIDR address prefixes.
-    description: ''
-  - name: --ip-address
-    summary: IP address of the VPN site.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --security-site
-    parameterValueGroup: false, true
-    summary: Whether the VPN site is security-related.
-    description: ''
-  - name: --site-key
-    summary: Key for the VPN site that can be used for connections.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --virtual-wan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-  - name: --device-model
-    summary: Model of the device.
-    description: ''
-  - name: --device-vendor
-    summary: Name of the device vendor.
-    description: ''
-  - name: --link-speed
-    summary: Link speed in Mbps.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_site_create
-  name: az network vpn-site create
-  summary: Create a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_delete
-  name: az network vpn-site delete
-  summary: Delete a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_download
-  name: az network vpn-site download
-  summary: Provide a SAS-URL to download the configuration for a VPN site.
-- uid: ext_virtual-wan_az_network_vpn_site_list
-  name: az network vpn-site list
-  summary: List VPN site configurations.
-- uid: ext_virtual-wan_az_network_vpn_site_show
-  name: az network vpn-site show
-  summary: Get the details of a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_update
-  name: az network vpn-site update
-  summary: Update settings of a VPN site configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN site configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vwan.yml b/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vwan.yml
deleted file mode 100644
index 01efa98b4e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/virtual-wan/network/vwan.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vwan
-  name: az network vwan
-  summary: Manage virtual WANs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vwan_create
-  - ext_virtual-wan_az_network_vwan_delete
-  - ext_virtual-wan_az_network_vwan_list
-  - ext_virtual-wan_az_network_vwan_show
-  - ext_virtual-wan_az_network_vwan_update
-- uid: ext_virtual-wan_az_network_vwan_create
-  name: az network vwan create
-  summary: Create a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --branch-to-branch-traffic
-    parameterValueGroup: false, true
-    summary: Allow branch-to-branch traffic flow.
-    description: ''
-  - name: --disable-vpn-encryption
-    parameterValueGroup: false, true
-    summary: State of VPN encryption.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --office365-category
-    summary: The office local breakout category.
-    description: ''
-  - name: --security-provider-name
-    summary: The security provider name.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --type
-    parameterValueGroup: Basic, Standard
-    summary: The type of the VirtualWAN.
-    description: ''
-  - name: --vnet-to-vnet-traffic
-    parameterValueGroup: false, true
-    summary: Allow VNet-to-VNet traffic flow.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_delete
-  name: az network vwan delete
-  summary: Delete a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_list
-  name: az network vwan list
-  summary: List virtual WANs.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_show
-  name: az network vwan show
-  summary: Get the details of a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_update
-  name: az network vwan update
-  summary: Update settings of a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --branch-to-branch-traffic
-    parameterValueGroup: false, true
-    summary: Allow branch-to-branch traffic flow.
-    description: ''
-  - name: --disable-vpn-encryption
-    parameterValueGroup: false, true
-    summary: State of VPN encryption.
-    description: ''
-  - name: --office365-category
-    summary: The office local breakout category.
-    description: ''
-  - name: --security-provider-name
-    summary: The security provider name.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --type
-    parameterValueGroup: Basic, Standard
-    summary: The type of the VirtualWAN.
-    description: ''
-  - name: --vnet-to-vnet-traffic
-    parameterValueGroup: false, true
-    summary: Allow VNet-to-VNet traffic flow.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vwan_create
-  name: az network vwan create
-  summary: Create a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_delete
-  name: az network vwan delete
-  summary: Delete a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_list
-  name: az network vwan list
-  summary: List virtual WANs.
-- uid: ext_virtual-wan_az_network_vwan_show
-  name: az network vwan show
-  summary: Get the details of a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_update
-  name: az network vwan update
-  summary: Update settings of a virtual WAN.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual WANs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/index.yml
deleted file mode 100644
index 331eb2bcb2..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vm-repair_az
-  name: vm-repair
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_vm-repair_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm.yml b/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm.yml
deleted file mode 100644
index f3df7d1d07..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vm-repair_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_vm-repair_az_vm_repair
-  name: az vm repair
-  summary: Auto repair commands to fix VMs.
-- uid: ext_vm-repair_az_vm_repair_create
-  name: az vm repair create
-  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
-- uid: ext_vm-repair_az_vm_repair_list_scripts
-  name: az vm repair list-scripts
-  summary: List available scripts. Located <a href="https://github.com/Azure/repair-script-library">https://github.com/Azure/repair-script-library</a>.
-- uid: ext_vm-repair_az_vm_repair_restore
-  name: az vm repair restore
-  summary: Replace source VM's OS disk with data disk from repair VM.
-- uid: ext_vm-repair_az_vm_repair_run
-  name: az vm repair run
-  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Linux or Windows virtual machines.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm/repair.yml b/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm/repair.yml
deleted file mode 100644
index 4eb1652508..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vm-repair/vm/repair.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vm-repair_az_vm_repair
-  name: az vm repair
-  summary: Auto repair commands to fix VMs.
-  description: VM repair scripts will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
-  langs:
-  - azurecli
-  children:
-  - ext_vm-repair_az_vm_repair_create
-  - ext_vm-repair_az_vm_repair_list_scripts
-  - ext_vm-repair_az_vm_repair_restore
-  - ext_vm-repair_az_vm_repair_run
-- uid: ext_vm-repair_az_vm_repair_create
-  name: az vm repair create
-  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a repair VM
-    syntax:
-      content: az vm repair create -g MyResourceGroup -n myVM --verbose
-  - summary: Create a repair VM and set the VM authentication
-    syntax:
-      content: az vm repair create -g MyResourceGroup -n myVM --repair-username username --repair-password password!234 --verbose
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --copy-disk-name
-    summary: Name of OS disk copy.
-    description: ''
-  - name: --repair-group-name
-    summary: Repair resource group name.
-    description: ''
-  - name: --repair-password
-    summary: Admin password for the repair VM.
-    description: ''
-  - name: --repair-username
-    summary: Admin username for repair VM.
-    description: ''
-  - name: --repair-vm-name
-    summary: Name of repair VM.
-    description: ''
-  - name: --unlock-encrypted-vm
-    summary: Option to auto-unlock encrypted VMs using current subscription auth.
-    description: ''
-- uid: ext_vm-repair_az_vm_repair_list_scripts
-  name: az vm repair list-scripts
-  summary: List available scripts. Located <a href="https://github.com/Azure/repair-script-library">https://github.com/Azure/repair-script-library</a>.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List scripts
-    syntax:
-      content: az vm repair list-scripts --verbose
-  - summary: List windows scripts only.
-    syntax:
-      content: az vm repair list-scripts --query "[?starts_with(id, 'win')]"
-  - summary: List scripts with test in its description.
-    syntax:
-      content: az vm repair list-scripts --query "[?contains(description, 'test')]"
-  parameters: []
-- uid: ext_vm-repair_az_vm_repair_restore
-  name: az vm repair restore
-  summary: Replace source VM's OS disk with data disk from repair VM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Restore from the repair VM, command will auto-search for repair-vm
-    syntax:
-      content: az vm repair restore -g MyResourceGroup -n MyVM --verbose
-  - summary: Restore from the repair VM, specify the disk to restore
-    syntax:
-      content: az vm repair restore -g MyResourceGroup -n MyVM --disk-name MyDiskCopy --verbose
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disk-name
-    summary: Name of fixed data disk. Defaults to the first data disk in the repair VM.
-    description: ''
-  - name: --repair-vm-id
-    summary: Repair VM resource id.
-    description: ''
-  - name: --yes
-    summary: Deletes the repair resources without confirmation.
-    description: ''
-- uid: ext_vm-repair_az_vm_repair_run
-  name: az vm repair run
-  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Run the script with <run-id> directly on the VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --verbose
-  - summary: Run the script with <run-id> on the linked repair VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --run-on-repair --verbose
-  - summary: Run a script with parameters on the VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --parameters hello=hi world=earth --verbose
-  - summary: Run a local custom script on the VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --custom-script-file ./file.ps1 --verbose
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --custom-script-file
-    summary: Custom script file to run on VM. Script should be PowerShell for windows, Bash for Linux.
-    description: ''
-  - name: --parameters
-    summary: Space-separated parameters in the format of '[name=]value'. Positional for bash scripts.
-    description: ''
-  - name: --repair-vm-id
-    summary: Repair VM resource id.
-    description: ''
-  - name: --run-id
-    summary: Unique run id for run scripts.
-    description: ''
-  - name: --run-on-repair
-    summary: Script will be run on the linked repair VM.
-    description: ''
-commands:
-- uid: ext_vm-repair_az_vm_repair_create
-  name: az vm repair create
-  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
-- uid: ext_vm-repair_az_vm_repair_list_scripts
-  name: az vm repair list-scripts
-  summary: List available scripts. Located <a href="https://github.com/Azure/repair-script-library">https://github.com/Azure/repair-script-library</a>.
-- uid: ext_vm-repair_az_vm_repair_restore
-  name: az vm repair restore
-  summary: Replace source VM's OS disk with data disk from repair VM.
-- uid: ext_vm-repair_az_vm_repair_run
-  name: az vm repair run
-  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: VM repair scripts will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vmware/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/vmware/index.yml
deleted file mode 100644
index 82366021a1..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vmware/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az
-  name: vmware
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_vmware_az_vmware
-  name: az vmware
-  summary: Commands to manage Azure VMware Solutions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware.yml b/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware.yml
deleted file mode 100644
index 7ccb77020f..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az_vmware
-  name: az vmware
-  summary: Commands to manage Azure VMware Solutions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_vmware_az_vmware_checkquotaavailability
-- uid: ext_vmware_az_vmware_checkquotaavailability
-  name: az vmware checkquotaavailability
-  summary: Return quota for subscription by region.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_vmware_az_vmware_checkquotaavailability
-  name: az vmware checkquotaavailability
-  summary: Return quota for subscription by region.
-- uid: ext_vmware_az_vmware_cluster
-  name: az vmware cluster
-  summary: Commands to manage clusters in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_create
-  name: az vmware cluster create
-  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
-- uid: ext_vmware_az_vmware_cluster_delete
-  name: az vmware cluster delete
-  summary: Delete a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_list
-  name: az vmware cluster list
-  summary: List clusters in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_show
-  name: az vmware cluster show
-  summary: Show details of a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_update
-  name: az vmware cluster update
-  summary: Update a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud
-  name: az vmware private-cloud
-  summary: Commands to manage private clouds.
-- uid: ext_vmware_az_vmware_private_cloud_addauthorization
-  name: az vmware private-cloud addauthorization
-  summary: Add an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-  name: az vmware private-cloud addidentitysource
-  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_create
-  name: az vmware private-cloud create
-  summary: Create a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_delete
-  name: az vmware private-cloud delete
-  summary: Delete a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-  name: az vmware private-cloud deleteauthorization
-  summary: Delete an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  name: az vmware private-cloud deleteidentitysource
-  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_list
-  name: az vmware private-cloud list
-  summary: List the private clouds.
-- uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-  name: az vmware private-cloud listadmincredentials
-  summary: List the admin credentials for the private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_show
-  name: az vmware private-cloud show
-  summary: Show details of a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_update
-  name: az vmware private-cloud update
-  summary: Update a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure VMware Solutions.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/cluster.yml b/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/cluster.yml
deleted file mode 100644
index 1273ac6a19..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/cluster.yml
+++ /dev/null
@@ -1,151 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az_vmware_cluster
-  name: az vmware cluster
-  summary: Commands to manage clusters in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_vmware_az_vmware_cluster_create
-  - ext_vmware_az_vmware_cluster_delete
-  - ext_vmware_az_vmware_cluster_list
-  - ext_vmware_az_vmware_cluster_show
-  - ext_vmware_az_vmware_cluster_update
-- uid: ext_vmware_az_vmware_cluster_create
-  name: az vmware cluster create
-  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --size
-    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_delete
-  name: az vmware cluster delete
-  summary: Delete a cluster in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_list
-  name: az vmware cluster list
-  summary: List clusters in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_show
-  name: az vmware cluster show
-  summary: Show details of a cluster in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_update
-  name: az vmware cluster update
-  summary: Update a cluster in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --size
-    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_vmware_az_vmware_cluster_create
-  name: az vmware cluster create
-  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
-- uid: ext_vmware_az_vmware_cluster_delete
-  name: az vmware cluster delete
-  summary: Delete a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_list
-  name: az vmware cluster list
-  summary: List clusters in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_show
-  name: az vmware cluster show
-  summary: Show details of a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_update
-  name: az vmware cluster update
-  summary: Update a cluster in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage clusters in a private cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml b/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml
deleted file mode 100644
index 59e714a6a5..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml
+++ /dev/null
@@ -1,310 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az_vmware_private_cloud
-  name: az vmware private-cloud
-  summary: Commands to manage private clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_vmware_az_vmware_private_cloud_addauthorization
-  - ext_vmware_az_vmware_private_cloud_addidentitysource
-  - ext_vmware_az_vmware_private_cloud_create
-  - ext_vmware_az_vmware_private_cloud_delete
-  - ext_vmware_az_vmware_private_cloud_deleteauthorization
-  - ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  - ext_vmware_az_vmware_private_cloud_list
-  - ext_vmware_az_vmware_private_cloud_listadmincredentials
-  - ext_vmware_az_vmware_private_cloud_show
-  - ext_vmware_az_vmware_private_cloud_update
-- uid: ext_vmware_az_vmware_private_cloud_addauthorization
-  name: az vmware private-cloud addauthorization
-  summary: Add an authorization to the ExpressRoute for a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the authorization.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-  name: az vmware private-cloud addidentitysource
-  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --alias
-    summary: The domain's NetBIOS name.
-    description: ''
-  - isRequired: true
-    name: --base-group-dn
-    summary: The base distinguished name for groups.
-    description: ''
-  - isRequired: true
-    name: --base-user-dn
-    summary: The base distinguished name for users.
-    description: ''
-  - isRequired: true
-    name: --domain
-    summary: The domain's dns name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the identity source.
-    description: ''
-  - isRequired: true
-    name: --password
-    summary: The password of the Active Directory user with a minimum of read-only access to Base DN for users and groups.
-    description: ''
-  - isRequired: true
-    name: --primary-server
-    summary: Primary server URL.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --username
-    summary: The ID of an Active Directory user with a minimum of read-only access to Base DN for users and group.
-    description: ''
-  - name: --secondary-server
-    summary: Secondary server URL.
-    description: ''
-  - name: --ssl
-    defaultValue: Disabled
-    summary: Protect LDAP communication using SSL certificate (LDAPS). Specify "Enabled" or "Disabled".
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_create
-  name: az vmware private-cloud create
-  summary: Create a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-size
-    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --network-block
-    summary: A subnet at least of size /22. Make sure the CIDR format is conformed to (A.B.C.D/X) where A,B,C,D are between 0 and 255, and X is between 0 and 22.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    summary: The product SKU.
-    description: ''
-  - name: --circuit-primary-subnet
-    summary: A /30 subnet for the primary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
-    description: ''
-  - name: --circuit-secondary-subnet
-    summary: A /30 subnet for the secondary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
-    description: ''
-  - name: --internet
-    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
-    description: ''
-  - name: --nsxt-password
-    summary: NSX-T Manager password.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vcenter-password
-    summary: VCenter admin password.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_delete
-  name: az vmware private-cloud delete
-  summary: Delete a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-  name: az vmware private-cloud deleteauthorization
-  summary: Delete an authorization to the ExpressRoute for a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the authorization.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  name: az vmware private-cloud deleteidentitysource
-  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --alias
-    summary: The domain's NetBIOS name.
-    description: ''
-  - isRequired: true
-    name: --domain
-    summary: The domain's dns name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the identity source.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_list
-  name: az vmware private-cloud list
-  summary: List the private clouds.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-  name: az vmware private-cloud listadmincredentials
-  summary: List the admin credentials for the private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_show
-  name: az vmware private-cloud show
-  summary: Show details of a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_update
-  name: az vmware private-cloud update
-  summary: Update a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cluster-size
-    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
-    description: ''
-  - name: --internet
-    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
-    description: ''
-commands:
-- uid: ext_vmware_az_vmware_private_cloud_addauthorization
-  name: az vmware private-cloud addauthorization
-  summary: Add an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-  name: az vmware private-cloud addidentitysource
-  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_create
-  name: az vmware private-cloud create
-  summary: Create a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_delete
-  name: az vmware private-cloud delete
-  summary: Delete a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-  name: az vmware private-cloud deleteauthorization
-  summary: Delete an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  name: az vmware private-cloud deleteidentitysource
-  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_list
-  name: az vmware private-cloud list
-  summary: List the private clouds.
-- uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-  name: az vmware private-cloud listadmincredentials
-  summary: List the admin credentials for the private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_show
-  name: az vmware private-cloud show
-  summary: Show details of a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_update
-  name: az vmware private-cloud update
-  summary: Update a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage private clouds.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/webapp/index.yml b/2017-03-09-profile/docs-ref-autogen/ext/webapp/index.yml
deleted file mode 100644
index 505618e53b..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/webapp/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az
-  name: webapp
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_webapp_az_webapp
-  name: az webapp
-  summary: Manage web apps.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp.yml b/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp.yml
deleted file mode 100644
index 6eede24874..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp
-  name: az webapp
-  summary: Manage web apps.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_webapp_az_webapp_container
-  name: az webapp container
-  summary: Group of commands related to webapp container operations.
-- uid: ext_webapp_az_webapp_container_up
-  name: az webapp container up
-  summary: Experimental command to create and deploy a container webapp.
-- uid: ext_webapp_az_webapp_remote_connection
-  name: az webapp remote-connection
-  summary: Create a remote connection using a tcp tunnel to your web app.
-- uid: ext_webapp_az_webapp_remote_connection_create
-  name: az webapp remote-connection create
-  summary: Creates a remote connection using a tcp tunnel to your web app.
-- uid: ext_webapp_az_webapp_scan
-  name: az webapp scan
-  summary: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
-- uid: ext_webapp_az_webapp_scan_list_result
-  name: az webapp scan list-result
-  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
-- uid: ext_webapp_az_webapp_scan_show_result
-  name: az webapp scan show-result
-  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
-- uid: ext_webapp_az_webapp_scan_start
-  name: az webapp scan start
-  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
-- uid: ext_webapp_az_webapp_scan_stop
-  name: az webapp scan stop
-  summary: Stops the current executing scan. Does nothing if no scan is executing.
-- uid: ext_webapp_az_webapp_scan_track
-  name: az webapp scan track
-  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage web apps.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/container.yml b/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/container.yml
deleted file mode 100644
index e2046cf8a8..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/container.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp_container
-  name: az webapp container
-  summary: Group of commands related to webapp container operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_webapp_az_webapp_container_up
-- uid: ext_webapp_az_webapp_container_up
-  name: az webapp container up
-  summary: Experimental command to create and deploy a container webapp.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy a container using an image from DockerHub. This example uses nginx.
-    syntax:
-      content: az webapp container up -n AppName -i nginx
-  - summary: Upload files from the current directory to an Azure Container Registry, then build a container image and deploy it to a web app. The Azure Container Registry must already exist.
-    syntax:
-      content: az webapp container up -n AppName --registry-rg ContainerRegistryResourceGroup --registry-name ContainerRegistryName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp. You can configure the default using 'az configure --defaults web=<name>'.
-    description: ''
-  - name: --docker-custom-image-name -i
-    summary: The container image name and optionally the tag name (currently public DockerHub images only).
-    description: ''
-  - name: --dryrun
-    summary: Show summary of the create and deploy operation instead of executing it.
-    description: ''
-  - name: --registry-name
-    summary: The name of the Azure Container Registry.
-    description: ''
-  - name: --registry-rg
-    summary: The resource group of the Azure Container Registry.
-    description: ''
-  - name: --source-location -s
-    summary: The path to the web app source directory.
-    description: ''
-commands:
-- uid: ext_webapp_az_webapp_container_up
-  name: az webapp container up
-  summary: Experimental command to create and deploy a container webapp.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Group of commands related to webapp container operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml b/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml
deleted file mode 100644
index 4599a9c08e..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp_remote_connection
-  name: az webapp remote-connection
-  summary: Create a remote connection using a tcp tunnel to your web app.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_webapp_az_webapp_remote_connection_create
-- uid: ext_webapp_az_webapp_remote_connection_create
-  name: az webapp remote-connection create
-  summary: Creates a remote connection using a tcp tunnel to your web app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --port -p
-    summary: 'Port for the remote connection. Default: Random available port.'
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-commands:
-- uid: ext_webapp_az_webapp_remote_connection_create
-  name: az webapp remote-connection create
-  summary: Creates a remote connection using a tcp tunnel to your web app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create a remote connection using a tcp tunnel to your web app.
diff --git a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/scan.yml b/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/scan.yml
deleted file mode 100644
index 2a96d9621d..0000000000
--- a/2017-03-09-profile/docs-ref-autogen/ext/webapp/webapp/scan.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp_scan
-  name: az webapp scan
-  summary: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_webapp_az_webapp_scan_list_result
-  - ext_webapp_az_webapp_scan_show_result
-  - ext_webapp_az_webapp_scan_start
-  - ext_webapp_az_webapp_scan_stop
-  - ext_webapp_az_webapp_scan_track
-- uid: ext_webapp_az_webapp_scan_list_result
-  name: az webapp scan list-result
-  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-- uid: ext_webapp_az_webapp_scan_show_result
-  name: az webapp scan show-result
-  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --scan-id
-    summary: Unique scan id.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-- uid: ext_webapp_az_webapp_scan_start
-  name: az webapp scan start
-  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-  - name: --timeout
-    summary: Timeout for operation in milliseconds.
-    description: ''
-- uid: ext_webapp_az_webapp_scan_stop
-  name: az webapp scan stop
-  summary: Stops the current executing scan. Does nothing if no scan is executing.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-- uid: ext_webapp_az_webapp_scan_track
-  name: az webapp scan track
-  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --scan-id
-    summary: Unique scan id.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-commands:
-- uid: ext_webapp_az_webapp_scan_list_result
-  name: az webapp scan list-result
-  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
-- uid: ext_webapp_az_webapp_scan_show_result
-  name: az webapp scan show-result
-  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
-- uid: ext_webapp_az_webapp_scan_start
-  name: az webapp scan start
-  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
-- uid: ext_webapp_az_webapp_scan_stop
-  name: az webapp scan stop
-  summary: Stops the current executing scan. Does nothing if no scan is executing.
-- uid: ext_webapp_az_webapp_scan_track
-  name: az webapp scan track
-  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
diff --git a/2017-03-09-profile/docs-ref-autogen/extension.yml b/2017-03-09-profile/docs-ref-autogen/extension.yml
index 40c0f85575..1506486c4e 100644
--- a/2017-03-09-profile/docs-ref-autogen/extension.yml
+++ b/2017-03-09-profile/docs-ref-autogen/extension.yml
@@ -1,192 +1,171 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_extension
-  name: az extension
-  summary: Manage and update CLI extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_extension_add
-  - az_extension_list
-  - az_extension_list_available
-  - az_extension_remove
-  - az_extension_show
-  - az_extension_update
+### YamlMime:AzureCLIGroup
+uid: az_extension
+name: az extension
+summary: Manage and update CLI extensions.
+description: ''
+directCommands:
 - uid: az_extension_add
   name: az extension add
   summary: Add an extension.
-  description: ''
-  langs:
-  - azurecli
+  description: To learn about installing extensions automatically, visit https://aka.ms/AzExtDynamicInstall.
+  syntax: >-
+    az extension add [--name]
+                     [--pip-extra-index-urls]
+                     [--pip-proxy]
+                     [--source]
+                     [--system]
+                     [--upgrade]
+                     [--version]
+                     [--yes]
   examples:
   - summary: Add extension by name
-    syntax:
-      content: az extension add --name anextension
+    syntax: az extension add --name anextension
   - summary: Add extension from URL
-    syntax:
-      content: az extension add --source https://contoso.com/anextension-0.0.1-py2.py3-none-any.whl
+    syntax: az extension add --source https://contoso.com/anextension-0.0.1-py2.py3-none-any.whl
   - summary: Add extension from local disk
-    syntax:
-      content: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl
+    syntax: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl
   - summary: Add extension from local disk and use pip proxy for dependencies
-    syntax:
-      content: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl --pip-proxy https://user:pass@proxy.server:8080
+    syntax: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl --pip-proxy https://user:pass@proxy.server:8080
   - summary: Add extension to system directory
-    syntax:
-      content: az extension add --name anextension --system
-  parameters:
+    syntax: az extension add --name anextension --system
+  - summary: Add a specific version of extension
+    syntax: az extension add --name anextension --version 1.0.0
+  - summary: Upgrade the extension if already installed
+    syntax: az extension add --upgrade --name anextension
+  optionalParameters:
   - name: --name -n
     summary: Name of extension.
     description: ''
+  - name: --pip-extra-index-urls
+    summary: Space-separated list of extra URLs of package indexes to use. This should point to a repository compliant with PEP 503 (the simple repository API) or a local directory laid out in the same format.
+    description: ''
+  - name: --pip-proxy
+    summary: Proxy for pip to use for extension dependencies in the form of [user:passwd@]proxy.server:port.
+    description: ''
   - name: --source -s
     summary: Filepath or URL to an extension.
     description: ''
   - name: --system
     summary: Use a system directory for the extension.
     description: Default path is azure-cli-extensions folder under the CLI running python environment lib path, configurable by environment variable AZURE_EXTENSION_SYS_DIR. On Windows, you may need to open your shell as Administrator to run with the right permission.
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+  - name: --upgrade
+    summary: Update the extension if already installed, otherwise just install the extension.
     description: ''
-  - name: --pip-extra-index-urls
-    summary: Space-separated list of extra URLs of package indexes to use. This should point to a repository compliant with PEP 503 (the simple repository API) or a local directory laid out in the same format.
+  - name: --version
+    defaultValue: latest
+    summary: The specific version of an extension.
     description: ''
-  - name: --pip-proxy
-    summary: Proxy for pip to use for extension dependencies in the form of [user:passwd@]proxy.server:port.
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_list
   name: az extension list
   summary: List the installed extensions.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_extension_list_available
+  syntax: az extension list [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
+- uid: az_extension_list-available
   name: az extension list-available
   summary: List publicly available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: az extension list-available [--show-details]
   examples:
   - summary: List all publicly available extensions
-    syntax:
-      content: az extension list-available
+    syntax: az extension list-available
   - summary: List details on a particular extension
-    syntax:
-      content: az extension list-available --show-details --query anextension
-  parameters:
+    syntax: az extension list-available --show-details --query anextension
+  optionalParameters:
   - name: --show-details -d
     summary: Show the raw data from the extension index.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
+- uid: az_extension_list-versions
+  name: az extension list-versions
+  summary: List available versions for an extension.
+  description: ''
+  syntax: az extension list-versions --name
+  examples:
+  - summary: List available versions for an extension
+    syntax: az extension list-versions --name anextension
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of extension.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_remove
   name: az extension remove
   summary: Remove an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: az extension remove --name
   examples:
   - summary: Remove an extension. (autogenerated)
-    syntax:
-      content: az extension remove --name MyExtension
-  parameters:
+    syntax: az extension remove --name MyExtension
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of extension.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_show
   name: az extension show
   summary: Show an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az extension show --name
+                      [--query-examples]
   examples:
   - summary: Show an extension. (autogenerated)
-    syntax:
-      content: az extension show --name MyExtension
-  parameters:
+    syntax: az extension show --name MyExtension
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of extension.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_update
   name: az extension update
   summary: Update an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az extension update --name
+                        [--pip-extra-index-urls]
+                        [--pip-proxy]
   examples:
   - summary: Update an extension by name
-    syntax:
-      content: az extension update --name anextension
+    syntax: az extension update --name anextension
   - summary: Update an extension by name and use pip proxy for dependencies
-    syntax:
-      content: az extension update --name anextension --pip-proxy https://user:pass@proxy.server:8080
-  parameters:
+    syntax: az extension update --name anextension --pip-proxy https://user:pass@proxy.server:8080
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of extension.
     description: ''
+  optionalParameters:
   - name: --pip-extra-index-urls
     summary: Space-separated list of extra URLs of package indexes to use. This should point to a repository compliant with PEP 503 (the simple repository API) or a local directory laid out in the same format.
     description: ''
   - name: --pip-proxy
     summary: Proxy for pip to use for extension dependencies in the form of [user:passwd@]proxy.server:port.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 commands:
-- uid: az_extension_add
-  name: az extension add
-  summary: Add an extension.
-- uid: az_extension_list
-  name: az extension list
-  summary: List the installed extensions.
-- uid: az_extension_list_available
-  name: az extension list-available
-  summary: List publicly available extensions.
-- uid: az_extension_remove
-  name: az extension remove
-  summary: Remove an extension.
-- uid: az_extension_show
-  name: az extension show
-  summary: Show an extension.
-- uid: az_extension_update
-  name: az extension update
-  summary: Update an extension.
+- az_extension_add
+- az_extension_list
+- az_extension_list-available
+- az_extension_list-versions
+- az_extension_remove
+- az_extension_show
+- az_extension_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -202,10 +181,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/76742362fc9c44ca968859f748ec3bb594d75271/src/azure-cli/azure/cli/command_modules/extension/_help.py
-updated_at: 5/6/2020 11:46:02 AM
-ms.date: 05/06/2020
-description: Manage and update CLI extensions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 09/16/2020
+  description: Manage and update CLI extensions.
diff --git a/2017-03-09-profile/docs-ref-autogen/footprint.yml b/2017-03-09-profile/docs-ref-autogen/footprint.yml
new file mode 100644
index 0000000000..415cf94f61
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/footprint.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint
+name: az footprint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_footprint_experiment
+- az_footprint_experiment_create
+- az_footprint_experiment_delete
+- az_footprint_experiment_list
+- az_footprint_experiment_show
+- az_footprint_experiment_update
+- az_footprint_measurement-endpoint
+- az_footprint_measurement-endpoint_create
+- az_footprint_measurement-endpoint_delete
+- az_footprint_measurement-endpoint_list
+- az_footprint_measurement-endpoint_show
+- az_footprint_measurement-endpoint_update
+- az_footprint_measurement-endpoint-condition
+- az_footprint_measurement-endpoint-condition_create
+- az_footprint_measurement-endpoint-condition_delete
+- az_footprint_measurement-endpoint-condition_list
+- az_footprint_measurement-endpoint-condition_show
+- az_footprint_measurement-endpoint-condition_update
+- az_footprint_profile
+- az_footprint_profile_create
+- az_footprint_profile_delete
+- az_footprint_profile_list
+- az_footprint_profile_show
+- az_footprint_profile_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/footprint/experiment.yml b/2017-03-09-profile/docs-ref-autogen/footprint/experiment.yml
new file mode 100644
index 0000000000..013cf6ec77
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/footprint/experiment.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_experiment
+name: az footprint experiment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint experiment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage experiments under a profile.
+description: ''
+directCommands:
+- uid: az_footprint_experiment_create
+  name: az footprint experiment create
+  summary: Creates or updates a Footprint experiment with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint experiment create --experiment-name
+                                   --profile-name
+                                   --resource-group
+                                   [--description]
+  examples:
+  - summary: Create or update an experiment.
+    syntax: az footprint experiment create --name "fpExp1" --description "An experiment description." --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a Footprint experiment.
+    description: ''
+- uid: az_footprint_experiment_delete
+  name: az footprint experiment delete
+  summary: Deletes an existing Footprint experiment.
+  description: ''
+  syntax: >-
+    az footprint experiment delete --experiment-name
+                                   --profile-name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Delete an experiment.
+    syntax: az footprint experiment delete --name "fpExp1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_experiment_list
+  name: az footprint experiment list
+  summary: Retrieves the information about all experiments under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint experiment list --profile-name
+                                 --resource-group
+  examples:
+  - summary: List all experiments under a Footprint profile.
+    syntax: az footprint experiment list --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_experiment_show
+  name: az footprint experiment show
+  summary: Retrieves the information about a single Footprint experiment.
+  description: ''
+  syntax: >-
+    az footprint experiment show --experiment-name
+                                 --profile-name
+                                 --resource-group
+  examples:
+  - summary: Get the details of an experiment.
+    syntax: az footprint experiment show --name "fpExp1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_experiment_update
+  name: az footprint experiment update
+  summary: Creates or updates a Footprint experiment with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint experiment update --experiment-name
+                                   --profile-name
+                                   --resource-group
+                                   [--description]
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a Footprint experiment.
+    description: ''
+commands:
+- az_footprint_experiment_create
+- az_footprint_experiment_delete
+- az_footprint_experiment_list
+- az_footprint_experiment_show
+- az_footprint_experiment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage experiments under a profile.
diff --git a/2017-03-09-profile/docs-ref-autogen/footprint/measurement-endpoint-condition.yml b/2017-03-09-profile/docs-ref-autogen/footprint/measurement-endpoint-condition.yml
new file mode 100644
index 0000000000..5ce71b9f4e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/footprint/measurement-endpoint-condition.yml
@@ -0,0 +1,207 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_measurement-endpoint-condition
+name: az footprint measurement-endpoint-condition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint measurement-endpoint-condition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage measurement endpoint conditions under a measurement endpoint.
+description: ''
+directCommands:
+- uid: az_footprint_measurement-endpoint-condition_create
+  name: az footprint measurement-endpoint-condition create
+  summary: Creates or updates a measurement endpoint condition under a Footprint measurement with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition create --constant
+                                                       --endpoint-name
+                                                       --name
+                                                       --operator {ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing}
+                                                       --profile-name
+                                                       --resource-group
+                                                       --variable
+  examples:
+  - summary: Create or update a measurement endpoint condition.
+    syntax: az footprint measurement-endpoint-condition create --name "condition0" --endpoint-name "endpoint1" --constant "Edge-Prod-WST" --operator "MatchValueIgnoreCasing" --variable "X-FD-EdgeEnvironment" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --constant
+    summary: The constant of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --operator
+    parameterValueGroup: ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing
+    summary: The operator of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --variable
+    summary: The variable of a Footprint measurement endpoint condition.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_delete
+  name: az footprint measurement-endpoint-condition delete
+  summary: Deletes an existing measurement endpoint condition under a Footprint measurement.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition delete --endpoint-name
+                                                       --name
+                                                       --profile-name
+                                                       --resource-group
+                                                       [--yes]
+  examples:
+  - summary: Delete a measurement endpoint condition.
+    syntax: az footprint measurement-endpoint-condition delete --name "condition0" --endpoint-name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_list
+  name: az footprint measurement-endpoint-condition list
+  summary: Retrieves the information about all measurement endpoint conditions under a Footprint measurement endpoint.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition list --endpoint-name
+                                                     --profile-name
+                                                     --resource-group
+  examples:
+  - summary: List all conditions under a measurement endpoint.
+    syntax: az footprint measurement-endpoint-condition list --endpoint-name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_show
+  name: az footprint measurement-endpoint-condition show
+  summary: Retrieves the information about a single measurement endpoint condition under a Footprint measurement endpoint.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition show --endpoint-name
+                                                     --name
+                                                     --profile-name
+                                                     --resource-group
+  examples:
+  - summary: Get the details of a measurement endpoint condition.
+    syntax: az footprint measurement-endpoint-condition show --name "condition0" --endpoint-name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_update
+  name: az footprint measurement-endpoint-condition update
+  summary: Creates or updates a measurement endpoint condition under a Footprint measurement with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition update --constant
+                                                       --endpoint-name
+                                                       --name
+                                                       --operator {ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing}
+                                                       --profile-name
+                                                       --resource-group
+                                                       --variable
+  requiredParameters:
+  - isRequired: true
+    name: --constant
+    summary: The constant of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --operator
+    parameterValueGroup: ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing
+    summary: The operator of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --variable
+    summary: The variable of a Footprint measurement endpoint condition.
+    description: ''
+commands:
+- az_footprint_measurement-endpoint-condition_create
+- az_footprint_measurement-endpoint-condition_delete
+- az_footprint_measurement-endpoint-condition_list
+- az_footprint_measurement-endpoint-condition_show
+- az_footprint_measurement-endpoint-condition_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage measurement endpoint conditions under a measurement endpoint.
diff --git a/2017-03-09-profile/docs-ref-autogen/footprint/measurement-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/footprint/measurement-endpoint.yml
new file mode 100644
index 0000000000..35f5bc1870
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/footprint/measurement-endpoint.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_measurement-endpoint
+name: az footprint measurement-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint measurement-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage measurement endpoints under a profile.
+description: ''
+directCommands:
+- uid: az_footprint_measurement-endpoint_create
+  name: az footprint measurement-endpoint create
+  summary: Creates or updates a single measurement endpoint under a Footprint profile with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint create --endpoint
+                                             --measurement-endpoint-name
+                                             --measurement-type
+                                             --profile-name
+                                             --resource-group
+                                             --weight
+                                             [--description]
+                                             [--end-time-utc]
+                                             [--experiment-id]
+                                             [--metadata]
+                                             [--object-path]
+                                             [--sample-rate-cold]
+                                             [--sample-rate-hot]
+                                             [--sample-rate-warm]
+                                             [--start-time-utc]
+  examples:
+  - summary: Create or update a measurement endpoint.
+    syntax: az footprint measurement-endpoint create --name "endpoint1" --endpoint "www.contoso.com" --experiment-id "664cdec4f07d4e1083c9b3969ee2c49b" --measurement-type 2 --object-path "/trans.gif" --weight 10 --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint
+    summary: The value of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --measurement-type
+    summary: The type of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --weight
+    summary: The weight of a measurement endpoint, higher weight means higher priority.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a measurement endpoint.
+    description: ''
+  - name: --end-time-utc
+    summary: The end time that a measurement endpoint should be served.
+    description: ''
+  - name: --experiment-id
+    summary: The id of an experiment that a measurement endpoint is part of.
+    description: ''
+  - name: --metadata
+    summary: The metadata of a measurement endpoint.
+    description: ''
+  - name: --object-path
+    summary: The path of the object that a measurement endpoint points to.
+    description: ''
+  - name: --sample-rate-cold
+    summary: The percentual sampling rate for the cold path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-hot
+    summary: The percentual sampling rate for the hot path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-warm
+    summary: The percentual sampling rate for the warm path logging of a measurement endpoint.
+    description: ''
+  - name: --start-time-utc
+    summary: The start time that a measurement endpoint should be served.
+    description: ''
+- uid: az_footprint_measurement-endpoint_delete
+  name: az footprint measurement-endpoint delete
+  summary: Deletes an existing measurement endpoint under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint delete --measurement-endpoint-name
+                                             --profile-name
+                                             --resource-group
+                                             [--yes]
+  examples:
+  - summary: Delete a measurement endpoint.
+    syntax: az footprint measurement-endpoint delete --name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_measurement-endpoint_list
+  name: az footprint measurement-endpoint list
+  summary: Retrieves the information about all measurement endpoints under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint list --profile-name
+                                           --resource-group
+  examples:
+  - summary: List all the measurement endpoints under a Footprint profile.
+    syntax: az footprint measurement-endpoint list --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint_show
+  name: az footprint measurement-endpoint show
+  summary: Retrieves the information about a single measurement endpoint under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint show --measurement-endpoint-name
+                                           --profile-name
+                                           --resource-group
+  examples:
+  - summary: Get the details of a measurement endpoint.
+    syntax: az footprint measurement-endpoint show --name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint_update
+  name: az footprint measurement-endpoint update
+  summary: Creates or updates a single measurement endpoint under a Footprint profile with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint update --endpoint
+                                             --measurement-endpoint-name
+                                             --measurement-type
+                                             --profile-name
+                                             --resource-group
+                                             --weight
+                                             [--description]
+                                             [--end-time-utc]
+                                             [--experiment-id]
+                                             [--metadata]
+                                             [--object-path]
+                                             [--sample-rate-cold]
+                                             [--sample-rate-hot]
+                                             [--sample-rate-warm]
+                                             [--start-time-utc]
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint
+    summary: The value of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --measurement-type
+    summary: The type of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --weight
+    summary: The weight of a measurement endpoint, higher weight means higher priority.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a measurement endpoint.
+    description: ''
+  - name: --end-time-utc
+    summary: The end time that a measurement endpoint should be served.
+    description: ''
+  - name: --experiment-id
+    summary: The id of an experiment that a measurement endpoint is part of.
+    description: ''
+  - name: --metadata
+    summary: The metadata of a measurement endpoint.
+    description: ''
+  - name: --object-path
+    summary: The path of the object that a measurement endpoint points to.
+    description: ''
+  - name: --sample-rate-cold
+    summary: The percentual sampling rate for the cold path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-hot
+    summary: The percentual sampling rate for the hot path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-warm
+    summary: The percentual sampling rate for the warm path logging of a measurement endpoint.
+    description: ''
+  - name: --start-time-utc
+    summary: The start time that a measurement endpoint should be served.
+    description: ''
+commands:
+- az_footprint_measurement-endpoint_create
+- az_footprint_measurement-endpoint_delete
+- az_footprint_measurement-endpoint_list
+- az_footprint_measurement-endpoint_show
+- az_footprint_measurement-endpoint_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage measurement endpoints under a profile.
diff --git a/2017-03-09-profile/docs-ref-autogen/footprint/profile.yml b/2017-03-09-profile/docs-ref-autogen/footprint/profile.yml
new file mode 100644
index 0000000000..2dced4e026
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/footprint/profile.yml
@@ -0,0 +1,162 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_profile
+name: az footprint profile
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint profile** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Footprint profiles.
+description: ''
+directCommands:
+- uid: az_footprint_profile_create
+  name: az footprint profile create
+  summary: Creates or updates a Footprint profile with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint profile create --measurement-count
+                                --name
+                                --resource-group
+                                --start-delay-ms
+                                [--description]
+                                [--location]
+                                [--reporting-endpoints]
+                                [--sample-rate-cold]
+                                [--tags]
+  examples:
+  - summary: Create or update a Footprint profile.
+    syntax: az footprint profile create --location "westus2" --measurement-count 3 --start-delay-ms 5000 --tags key1="value1" key2="value2" --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --measurement-count
+    summary: The number of measurements to perform.
+    description: ''
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start-delay-ms
+    summary: The delay in milliseconds that the clients should wait for until they start performing measurements.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of the Footprint profile.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --reporting-endpoints
+    summary: The endpoints which to upload measurements to.
+    description: ''
+  - name: --sample-rate-cold
+    summary: The default sampling percentage for cold path measurement storage.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_footprint_profile_delete
+  name: az footprint profile delete
+  summary: Deletes an existing Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint profile delete --name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: Delete a Footprint profile.
+    syntax: az footprint profile delete --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_profile_list
+  name: az footprint profile list
+  summary: Retrieves the information about all Footprint profiles under a subscription.
+  description: ''
+  syntax: az footprint profile list [--resource-group]
+  examples:
+  - summary: List all Footprint profiles under a Resource Group.
+    syntax: az footprint profile list --resource-group "rgName"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_profile_show
+  name: az footprint profile show
+  summary: Retrieves the information about a single Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint profile show --name
+                              --resource-group
+  examples:
+  - summary: Get the details of a Footprint profile.
+    syntax: az footprint profile show --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_profile_update
+  name: az footprint profile update
+  summary: Updates an existing Footprint profile resource.
+  description: ''
+  syntax: >-
+    az footprint profile update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update a Footprint profile.
+    syntax: az footprint profile update --tags key1="value1" key2="value2" --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_footprint_profile_create
+- az_footprint_profile_delete
+- az_footprint_profile_list
+- az_footprint_profile_show
+- az_footprint_profile_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Footprint profiles.
diff --git a/2017-03-09-profile/docs-ref-autogen/functionapp.yml b/2017-03-09-profile/docs-ref-autogen/functionapp.yml
new file mode 100644
index 0000000000..5372263b46
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/functionapp.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_functionapp
+name: az functionapp
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az functionapp** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage function apps. To install the Azure Functions Core tools see https://github.com/Azure/azure-functions-core-tools.
+description: ''
+commands:
+- az_functionapp_app
+- az_functionapp_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage function apps. To install the Azure Functions Core tools see https://github.com/Azure/azure-functions-core-tools.
diff --git a/2017-03-09-profile/docs-ref-autogen/functionapp/app.yml b/2017-03-09-profile/docs-ref-autogen/functionapp/app.yml
new file mode 100644
index 0000000000..9001e7ecb0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/functionapp/app.yml
@@ -0,0 +1,61 @@
+### YamlMime:AzureCLIGroup
+uid: az_functionapp_app
+name: az functionapp app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az functionapp app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Functions app.
+description: ''
+directCommands:
+- uid: az_functionapp_app_up
+  name: az functionapp app up
+  summary: Deploy to Azure Functions via GitHub actions.
+  description: ''
+  syntax: >-
+    az functionapp app up [--app-name]
+                          [--branch-name]
+                          [--do-not-wait]
+                          [--repository]
+  examples:
+  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function - Run interactive mode
+    syntax: az functionapp app up
+  - summary: Deploy/Setup GitHub Action for locally checked out GitHub Repository to Azure Function
+    syntax: >-
+      Repository name/url (--repository) will be detected from the local git repository
+
+      az functionapp app up --app-name AzFunctionPythonPreProd
+  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function
+    syntax: az functionapp app up --app-name AzFunctionPythonPreProd --repository https://github.com/azure/deploy-functions
+  optionalParameters:
+  - name: --app-name
+    summary: FunctionApp name in the subscription.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --repository -r
+    summary: GitHub repository URL e.g. https://github.com/azure/azure-cli.
+    description: ''
+commands:
+- az_functionapp_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Functions app.
diff --git a/2017-03-09-profile/docs-ref-autogen/fzf.yml b/2017-03-09-profile/docs-ref-autogen/fzf.yml
new file mode 100644
index 0000000000..5e29bce68f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/fzf.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_fzf
+name: az fzf
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **fzf** extension for Azure CLI and requires version 2.9.0 or higher.  The extension will automatically install the first time you run an **az fzf** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to select active or default objects via fzf.
+description: >-
+  Select your active subscription or set defaults with an easy selection interface (fzf).
+
+
+  Search syntax:
+
+
+  Token    Match type                  Description
+
+  -------  --------------------------  ----------------------------------
+
+  sbtrkt   fuzzy-match                 Items that match sbtrkt
+
+  'wild    exact-match (quoted)        Items that include wild
+
+  ^music   prefix-exact-match          Items that start with music
+
+  .mp3$    suffix-exact-match          Items that end with .mp3
+
+  !fire    inverse-exact-match         Items that do not include fire
+
+  !^music  inverse-prefix-exact-match  Items that do not start with music
+
+  !.mp3$   inverse-suffix-exact-match  Items that do not end with .mp3
+
+
+  More information about search syntax or fzf in general can be found on the fzf project page: https://github.com/junegunn/fzf#search-syntax.
+directCommands:
+- uid: az_fzf_group
+  name: az fzf group
+  summary: Select default resource group.
+  description: ''
+  syntax: >-
+    az fzf group [--filter]
+                 [--no-default]
+  optionalParameters:
+  - name: --filter -f
+    summary: A filter string to pass to fzf.
+    description: ''
+  - name: --no-default -d
+    summary: Don't change the active or default, just return selected item.
+    description: ''
+- uid: az_fzf_install
+  name: az fzf install
+  summary: Download and install the fzf command.
+  description: ''
+  syntax: >-
+    az fzf install [--install-dir]
+                   [--version]
+  optionalParameters:
+  - name: --install-dir -i
+    summary: Path to the directory where fzf should be installed.
+    description: ''
+  - name: --version -v
+    defaultValue: latest
+    summary: Version of fzf to install.
+    description: ''
+- uid: az_fzf_location
+  name: az fzf location
+  summary: Select default location.
+  description: ''
+  syntax: >-
+    az fzf location [--filter]
+                    [--no-default]
+  optionalParameters:
+  - name: --filter -f
+    summary: A filter string to pass to fzf.
+    description: ''
+  - name: --no-default -d
+    summary: Don't change the active or default, just return selected item.
+    description: ''
+- uid: az_fzf_subscription
+  name: az fzf subscription
+  summary: Select default subscription.
+  description: ''
+  syntax: >-
+    az fzf subscription [--filter]
+                        [--no-default]
+  optionalParameters:
+  - name: --filter -f
+    summary: A filter string to pass to fzf.
+    description: ''
+  - name: --no-default -d
+    summary: Don't change the active or default, just return selected item.
+    description: ''
+commands:
+- az_fzf_group
+- az_fzf_install
+- az_fzf_location
+- az_fzf_subscription
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Select your active subscription or set defaults with an easy selection interface (fzf).
+
+
+    Search syntax:
+
+
+    Token    Match type                  Description
+
+    -------  --------------------------  ----------------------------------
+
+    sbtrkt   fuzzy-match                 Items that match sbtrkt
+
+    'wild    exact-match (quoted)        Items that include wild
+
+    ^music   prefix-exact-match          Items that start with music
+
+    .mp3$    suffix-exact-match          Items that end with .mp3
+
+    !fire    inverse-exact-match         Items that do not include fire
+
+    !^music  inverse-prefix-exact-match  Items that do not start with music
+
+    !.mp3$   inverse-suffix-exact-match  Items that do not end with .mp3
+
+
+    More information about search syntax or fzf in general can be found on the fzf project page: https://github.com/junegunn/fzf#search-syntax.
diff --git a/2017-03-09-profile/docs-ref-autogen/graph.yml b/2017-03-09-profile/docs-ref-autogen/graph.yml
new file mode 100644
index 0000000000..ec339b4cac
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/graph.yml
@@ -0,0 +1,79 @@
+### YamlMime:AzureCLIGroup
+uid: az_graph
+name: az graph
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-graph** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az graph** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Query the resources managed by Azure Resource Manager.
+description: Run 'az graph query --help' for detailed help.
+directCommands:
+- uid: az_graph_query
+  name: az graph query
+  summary: Query the resources managed by Azure Resource Manager.
+  description: See https://aka.ms/AzureResourceGraph-QueryLanguage to learn more about query language and browse examples.
+  syntax: >-
+    az graph query --graph-query
+                   [--allow-partial-scopes {false, true}]
+                   [--first]
+                   [--management-groups]
+                   [--skip]
+                   [--skip-token]
+                   [--subscriptions]
+  examples:
+  - summary: Query resources requesting a subset of resource fields.
+    syntax: az graph query -q "project id, name, type, location, tags"
+  - summary: Query resources with field selection, filtering and summarizing.
+    syntax: az graph query -q "project id, type, location | where type =~ 'Microsoft.Compute/virtualMachines' | summarize count() by location | top 3 by count_"
+  - summary: Request a subset of results, skipping 20 items and getting the next 10.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --first 10 --skip 20
+  - summary: Choose subscriptions to query.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --subscriptions 11111111-1111-1111-1111-111111111111 22222222-2222-2222-2222-222222222222
+  - summary: Choose management groups to query.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --management-groups aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb --allow-partial-scopes
+  - summary: Query with the skip token.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --skip-token skip_token_value_from_previous_query_response
+  requiredParameters:
+  - isRequired: true
+    name: --graph-query --q -q
+    summary: Resource Graph query to execute.
+    description: ''
+  optionalParameters:
+  - name: --allow-partial-scopes -a
+    parameterValueGroup: false, true
+    summary: Indicates if query should succeed when only partial number of subscription underneath can be processed by server.
+    description: ''
+  - name: --first
+    summary: 'The maximum number of objects to return. Accepted range: 1-1000.'
+    description: ''
+  - name: --management-groups -m
+    summary: List of management groups to run query against.
+    description: ''
+  - name: --skip
+    summary: Ignores the first N objects and then gets the remaining objects.
+    description: ''
+  - name: --skip-token
+    summary: Skip token to get the next page of the query if applicable.
+    description: ''
+  - name: --subscriptions -s
+    summary: List of subscriptions to run query against. By default all accessible subscriptions are queried.
+    description: ''
+commands:
+- az_graph_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Run 'az graph query --help' for detailed help.
diff --git a/2017-03-09-profile/docs-ref-autogen/group.yml b/2017-03-09-profile/docs-ref-autogen/group.yml
index 95e0690a4e..a25535175a 100644
--- a/2017-03-09-profile/docs-ref-autogen/group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/group.yml
@@ -1,192 +1,187 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group
-  name: az group
-  summary: Manage resource groups and template deployments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_create
-  - az_group_delete
-  - az_group_exists
-  - az_group_export
-  - az_group_list
-  - az_group_show
-  - az_group_update
-  - az_group_wait
+### YamlMime:AzureCLIGroup
+uid: az_group
+name: az group
+summary: Manage resource groups and template deployments.
+description: ''
+directCommands:
 - uid: az_group_create
   name: az group create
   summary: Create a new resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group create --location
+                    --name
+                    [--subscription]
+                    [--tags]
   examples:
   - summary: Create a new resource group in the West US region.
-    syntax:
-      content: az group create -l westus -n MyResourceGroup
-  parameters:
+    syntax: az group create -l westus -n MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name --resource-group -g -n
     summary: Name of the new resource group.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_delete
   name: az group delete
   summary: Delete a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group delete --name
+                    [--no-wait]
+                    [--subscription]
+                    [--yes]
   examples:
   - summary: Delete a resource group.
-    syntax:
-      content: az group delete -n MyResourceGroup
-  parameters:
+    syntax: az group delete -n MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_exists
   name: az group exists
   summary: Check if a resource group exists.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group exists --name
+                    [--subscription]
   examples:
   - summary: Check if 'MyResourceGroup' exists.
-    syntax:
-      content: az group exists -n MyResourceGroup
-  parameters:
+    syntax: az group exists -n MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_export
   name: az group export
   summary: Captures a resource group as a template.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group export --name
+                    [--include-comments]
+                    [--include-parameter-default-value]
+                    [--resource-ids]
+                    [--skip-all-params]
+                    [--skip-resource-name-params]
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --include-comments
     summary: Export template with comments.
     description: ''
   - name: --include-parameter-default-value
     summary: Export template parameter with default value.
     description: ''
+  - name: --resource-ids
+    summary: Space-separated resource ids to filter the export by. To export all resources, do not specify this argument or supply "\*".
+    description: ''
+  - name: --skip-all-params
+    summary: Export template parameter and skip all parameterization.
+    description: ''
+  - name: --skip-resource-name-params
+    summary: Export template and skip resource name parameterization.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_list
   name: az group list
   summary: List resource groups.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group list [--query-examples]
+                  [--subscription]
+                  [--tag]
   examples:
   - summary: List all resource groups located in the West US region.
-    syntax:
-      content: az group list --query "[?location=='westus']"
-  parameters:
-  - name: --tag
-    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
+    syntax: az group list --query "[?location=='westus']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tag
+    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_show
   name: az group show
   summary: Get a resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group show --name
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_update
   name: az group update
   summary: Update a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group update --name
+                    [--add]
+                    [--force-string]
+                    [--remove]
+                    [--set]
+                    [--subscription]
+                    [--tags]
   examples:
   - summary: Update a resource group. (autogenerated)
-    syntax:
-      content: az group update --resource-group MyResourceGroup --set tags.CostCenter='{"Dept":"IT","Environment":"Test"}'
-  parameters:
+    syntax: az group update --resource-group MyResourceGroup --set tags.CostCenter='{"Dept":"IT","Environment":"Test"}'
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
@@ -202,30 +197,35 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_wait
   name: az group wait
   summary: Place the CLI in a waiting state until a condition of the resource group is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group wait --name
+                  [--created]
+                  [--custom]
+                  [--deleted]
+                  [--exists]
+                  [--interval]
+                  [--subscription]
+                  [--timeout]
+                  [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a condition of the resource group is met. (autogenerated)
-    syntax:
-      content: az group wait --created  --resource-group MyResourceGroup
+    syntax: az group wait --created  --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until a condition of the resource group is met. (autogenerated)
-    syntax:
-      content: az group wait --deleted --resource-group MyResourceGroup
-  parameters:
+    syntax: az group wait --deleted --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -242,6 +242,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -249,94 +252,34 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_create
-  name: az group create
-  summary: Create a new resource group.
-- uid: az_group_delete
-  name: az group delete
-  summary: Delete a resource group.
-- uid: az_group_deployment
-  name: az group deployment
-  summary: Manage Azure Resource Manager deployments.
-- uid: az_group_deployment_cancel
-  name: az group deployment cancel
-  summary: Cancel a currently running template deployment.
-- uid: az_group_deployment_create
-  name: az group deployment create
-  summary: Start a deployment.
-- uid: az_group_deployment_delete
-  name: az group deployment delete
-  summary: Delete deployment.
-- uid: az_group_deployment_export
-  name: az group deployment export
-  summary: Export the template used for a deployment.
-- uid: az_group_deployment_list
-  name: az group deployment list
-  summary: Get a list of deployments.
-- uid: az_group_deployment_operation
-  name: az group deployment operation
-  summary: Manage deployment operations.
-- uid: az_group_deployment_operation_list
-  name: az group deployment operation list
-  summary: Gets a list of deployments operations.
-- uid: az_group_deployment_operation_show
-  name: az group deployment operation show
-  summary: Get a deployment's operation.
-- uid: az_group_deployment_show
-  name: az group deployment show
-  summary: Get a deployment.
-- uid: az_group_deployment_validate
-  name: az group deployment validate
-  summary: Validate whether a template is syntactically correct.
-- uid: az_group_deployment_wait
-  name: az group deployment wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
-- uid: az_group_exists
-  name: az group exists
-  summary: Check if a resource group exists.
-- uid: az_group_export
-  name: az group export
-  summary: Captures a resource group as a template.
-- uid: az_group_list
-  name: az group list
-  summary: List resource groups.
-- uid: az_group_lock
-  name: az group lock
-  summary: Manage Azure resource group locks.
-- uid: az_group_lock_create
-  name: az group lock create
-  summary: Create a resource group lock.
-- uid: az_group_lock_delete
-  name: az group lock delete
-  summary: Delete a resource group lock.
-- uid: az_group_lock_list
-  name: az group lock list
-  summary: List lock information in the resource-group.
-- uid: az_group_lock_show
-  name: az group lock show
-  summary: Show the details of a resource group lock.
-- uid: az_group_lock_update
-  name: az group lock update
-  summary: Update a resource group lock.
-- uid: az_group_show
-  name: az group show
-  summary: Get a resource group.
-- uid: az_group_update
-  name: az group update
-  summary: Update a resource group.
-- uid: az_group_wait
-  name: az group wait
-  summary: Place the CLI in a waiting state until a condition of the resource group is met.
+- az_group_create
+- az_group_delete
+- az_group_deployment
+- az_group_deployment_cancel
+- az_group_deployment_create
+- az_group_deployment_delete
+- az_group_deployment_export
+- az_group_deployment_list
+- az_group_deployment_operation
+- az_group_deployment_operation_list
+- az_group_deployment_operation_show
+- az_group_deployment_show
+- az_group_deployment_validate
+- az_group_deployment_wait
+- az_group_exists
+- az_group_export
+- az_group_list
+- az_group_lock
+- az_group_lock_create
+- az_group_lock_delete
+- az_group_lock_list
+- az_group_lock_show
+- az_group_lock_update
+- az_group_show
+- az_group_update
+- az_group_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -352,10 +295,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource groups and template deployments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource groups and template deployments.
diff --git a/2017-03-09-profile/docs-ref-autogen/group/deployment.yml b/2017-03-09-profile/docs-ref-autogen/group/deployment.yml
index 09125397a4..31a27c75f3 100644
--- a/2017-03-09-profile/docs-ref-autogen/group/deployment.yml
+++ b/2017-03-09-profile/docs-ref-autogen/group/deployment.yml
@@ -1,69 +1,66 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group_deployment
-  name: az group deployment
-  summary: Manage Azure Resource Manager deployments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_deployment_cancel
-  - az_group_deployment_create
-  - az_group_deployment_delete
-  - az_group_deployment_export
-  - az_group_deployment_list
-  - az_group_deployment_show
-  - az_group_deployment_validate
-  - az_group_deployment_wait
+### YamlMime:AzureCLIGroup
+uid: az_group_deployment
+name: az group deployment
+summary: Manage Azure Resource Manager deployments.
+description: ''
+directCommands:
 - uid: az_group_deployment_cancel
   name: az group deployment cancel
   summary: Cancel a currently running template deployment.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment cancel --name
+                               --resource-group
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_create
   name: az group deployment create
   summary: Start a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment create --resource-group
+                               [--aux-subs]
+                               [--aux-tenants]
+                               [--handle-extended-json-format]
+                               [--mode {Complete, Incremental}]
+                               [--name]
+                               [--no-prompt {false, true}]
+                               [--no-wait]
+                               [--parameters]
+                               [--rollback-on-error]
+                               [--subscription]
+                               [--template-file]
+                               [--template-uri]
   examples:
   - summary: Create a deployment from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: az group deployment create -g MyResourceGroup --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: az group deployment create -g MyResourceGroup --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
-            --parameters "{ \"location\": { \"value\": \"westus\" } }"
+    syntax: >-
+      az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
+          --parameters "{ \"location\": { \"value\": \"westus\" } }"
   - summary: Create a deployment from a local template, using a local parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
-            --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
+          --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --aux-subs
     summary: Auxiliary subscriptions which will be used during deployment across tenants.
     description: ''
@@ -90,147 +87,151 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: A template file path in the file system.
+    summary: A path to a template file or Bicep file in the file system.
     description: ''
   - name: --template-uri -u
     summary: A uri to a remote template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_delete
   name: az group deployment delete
   summary: Delete deployment.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment delete --name
+                               --resource-group
+                               [--no-wait]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_export
   name: az group deployment export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment export --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Export the template used for a deployment. (autogenerated)
-    syntax:
-      content: az group deployment export --name MyDeployment --resource-group MyResourceGroup
-  parameters:
+    syntax: az group deployment export --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_list
   name: az group deployment list
   summary: Get a list of deployments.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment list --resource-group
+                             [--filter]
+                             [--query-examples]
+                             [--subscription]
+                             [--top]
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --filter
     summary: The filter to apply on the operation.
     description: ''
-  - name: --top
-    summary: Query parameters. If null is passed returns all deployments.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: Query parameters. If null is passed returns all deployments.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_show
   name: az group deployment show
   summary: Get a deployment.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_validate
   name: az group deployment validate
   summary: Validate whether a template is syntactically correct.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment validate --resource-group
+                                 [--handle-extended-json-format]
+                                 [--mode {Complete, Incremental}]
+                                 [--no-prompt {false, true}]
+                                 [--parameters]
+                                 [--rollback-on-error]
+                                 [--subscription]
+                                 [--template-file]
+                                 [--template-uri]
   examples:
   - summary: Validate whether a template is syntactically correct. (autogenerated)
-    syntax:
-      content: >-
-        az group deployment validate --parameters "{ \"location\": { \"value\": \"westus\" } }" \
-            --resource-group MyResourceGroup --template-file storage.json
-  parameters:
+    syntax: >-
+      az group deployment validate --parameters "{ \"location\": { \"value\": \"westus\" } }" \
+          --resource-group MyResourceGroup --template-file storage.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -245,47 +246,50 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: A template file path in the file system.
+    summary: A path to a template file or Bicep file in the file system.
     description: ''
   - name: --template-uri -u
     summary: A uri to a remote template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_wait
   name: az group deployment wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment wait --name
+                             --resource-group
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--interval]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
-    syntax:
-      content: az group deployment wait --name MyDeployment --resource-group MyResourceGroup --updated
+    syntax: az group deployment wait --name MyDeployment --resource-group MyResourceGroup --updated
   - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
-    syntax:
-      content: az group deployment wait --created --name MyDeployment --resource-group MyResourceGroup
-  parameters:
+    syntax: az group deployment wait --created --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -302,6 +306,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -309,49 +316,19 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_deployment_cancel
-  name: az group deployment cancel
-  summary: Cancel a currently running template deployment.
-- uid: az_group_deployment_create
-  name: az group deployment create
-  summary: Start a deployment.
-- uid: az_group_deployment_delete
-  name: az group deployment delete
-  summary: Delete deployment.
-- uid: az_group_deployment_export
-  name: az group deployment export
-  summary: Export the template used for a deployment.
-- uid: az_group_deployment_list
-  name: az group deployment list
-  summary: Get a list of deployments.
-- uid: az_group_deployment_operation
-  name: az group deployment operation
-  summary: Manage deployment operations.
-- uid: az_group_deployment_operation_list
-  name: az group deployment operation list
-  summary: Gets a list of deployments operations.
-- uid: az_group_deployment_operation_show
-  name: az group deployment operation show
-  summary: Get a deployment's operation.
-- uid: az_group_deployment_show
-  name: az group deployment show
-  summary: Get a deployment.
-- uid: az_group_deployment_validate
-  name: az group deployment validate
-  summary: Validate whether a template is syntactically correct.
-- uid: az_group_deployment_wait
-  name: az group deployment wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_group_deployment_cancel
+- az_group_deployment_create
+- az_group_deployment_delete
+- az_group_deployment_export
+- az_group_deployment_list
+- az_group_deployment_operation
+- az_group_deployment_operation_list
+- az_group_deployment_operation_show
+- az_group_deployment_show
+- az_group_deployment_validate
+- az_group_deployment_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -367,10 +344,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager deployments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager deployments.
diff --git a/2017-03-09-profile/docs-ref-autogen/group/deployment/operation.yml b/2017-03-09-profile/docs-ref-autogen/group/deployment/operation.yml
index 58b2bdcb75..a61a1de359 100644
--- a/2017-03-09-profile/docs-ref-autogen/group/deployment/operation.yml
+++ b/2017-03-09-profile/docs-ref-autogen/group/deployment/operation.yml
@@ -1,48 +1,50 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group_deployment_operation
-  name: az group deployment operation
-  summary: Manage deployment operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_deployment_operation_list
-  - az_group_deployment_operation_show
+### YamlMime:AzureCLIGroup
+uid: az_group_deployment_operation
+name: az group deployment operation
+summary: Manage deployment operations.
+description: ''
+directCommands:
 - uid: az_group_deployment_operation_list
   name: az group deployment operation list
   summary: Gets a list of deployments operations.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment operation list --name
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+                                       [--top]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --top
-    summary: Query parameters.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: Query parameters.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_operation_show
   name: az group deployment operation show
   summary: Get a deployment's operation.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment operation show --name
+                                       --operation-ids
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -53,24 +55,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_deployment_operation_list
-  name: az group deployment operation list
-  summary: Gets a list of deployments operations.
-- uid: az_group_deployment_operation_show
-  name: az group deployment operation show
-  summary: Get a deployment's operation.
+- az_group_deployment_operation_list
+- az_group_deployment_operation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -86,10 +83,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/group/lock.yml b/2017-03-09-profile/docs-ref-autogen/group/lock.yml
index fd9a178b35..24542c9e5e 100644
--- a/2017-03-09-profile/docs-ref-autogen/group/lock.yml
+++ b/2017-03-09-profile/docs-ref-autogen/group/lock.yml
@@ -1,28 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group_lock
-  name: az group lock
-  summary: Manage Azure resource group locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_lock_create
-  - az_group_lock_delete
-  - az_group_lock_list
-  - az_group_lock_show
-  - az_group_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_group_lock
+name: az group lock
+summary: Manage Azure resource group locks.
+description: ''
+directCommands:
 - uid: az_group_lock_create
   name: az group lock create
   summary: Create a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock create --lock-type {CanNotDelete, ReadOnly}
+                         --name
+                         --resource-group
+                         [--notes]
+                         [--subscription]
   examples:
   - summary: Create a read-only resource group level lock.
-    syntax:
-      content: az group lock create --lock-type ReadOnly -n lockName -g MyResourceGroup
-  parameters:
+    syntax: az group lock create --lock-type ReadOnly -n lockName -g MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -34,31 +29,29 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes about this lock.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_delete
   name: az group lock delete
   summary: Delete a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock delete [--ids]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Delete a resource group lock
-    syntax:
-      content: az group lock delete --name lockName -g MyResourceGroup
-  parameters:
+    syntax: az group lock delete --name lockName -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -66,83 +59,83 @@ items:
     summary: Name of the lock.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_list
   name: az group lock list
   summary: List lock information in the resource-group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock list [--filter-string]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: List out all locks on the resource group level
-    syntax:
-      content: az group lock list -g MyResourceGroup
-  parameters:
+    syntax: az group lock list -g MyResourceGroup
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_show
   name: az group lock show
   summary: Show the details of a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock show [--ids]
+                       [--name]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: Show a resource group level lock
-    syntax:
-      content: az group lock show -n lockname -g MyResourceGroup
-  parameters:
+    syntax: az group lock show -n lockname -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_update
   name: az group lock update
   summary: Update a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock update [--ids]
+                         [--lock-type {CanNotDelete, ReadOnly}]
+                         [--name]
+                         [--notes]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Update a resource group lock with new notes and type
-    syntax:
-      content: az group lock update --name lockName -g MyResourceGroup --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az group lock update --name lockName -g MyResourceGroup --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -157,33 +150,18 @@ items:
     summary: Notes about this lock.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_lock_create
-  name: az group lock create
-  summary: Create a resource group lock.
-- uid: az_group_lock_delete
-  name: az group lock delete
-  summary: Delete a resource group lock.
-- uid: az_group_lock_list
-  name: az group lock list
-  summary: List lock information in the resource-group.
-- uid: az_group_lock_show
-  name: az group lock show
-  summary: Show the details of a resource group lock.
-- uid: az_group_lock_update
-  name: az group lock update
-  summary: Update a resource group lock.
+- az_group_lock_create
+- az_group_lock_delete
+- az_group_lock_list
+- az_group_lock_show
+- az_group_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -199,10 +177,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure resource group locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure resource group locks.
diff --git a/2017-03-09-profile/docs-ref-autogen/guestconfig.yml b/2017-03-09-profile/docs-ref-autogen/guestconfig.yml
new file mode 100644
index 0000000000..0828c1a963
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/guestconfig.yml
@@ -0,0 +1,46 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig
+name: az guestconfig
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_guestconfig_guest-configuration-assignment
+- az_guestconfig_guest-configuration-assignment_create
+- az_guestconfig_guest-configuration-assignment_delete
+- az_guestconfig_guest-configuration-assignment_list
+- az_guestconfig_guest-configuration-assignment_show
+- az_guestconfig_guest-configuration-assignment_update
+- az_guestconfig_guest-configuration-assignment_wait
+- az_guestconfig_guest-configuration-assignment-report
+- az_guestconfig_guest-configuration-assignment-report_list
+- az_guestconfig_guest-configuration-assignment-report_show
+- az_guestconfig_guest-configuration-hcrp-assignment
+- az_guestconfig_guest-configuration-hcrp-assignment_create
+- az_guestconfig_guest-configuration-hcrp-assignment_delete
+- az_guestconfig_guest-configuration-hcrp-assignment_list
+- az_guestconfig_guest-configuration-hcrp-assignment_show
+- az_guestconfig_guest-configuration-hcrp-assignment_update
+- az_guestconfig_guest-configuration-hcrp-assignment_wait
+- az_guestconfig_guest-configuration-hcrp-assignment-report
+- az_guestconfig_guest-configuration-hcrp-assignment-report_list
+- az_guestconfig_guest-configuration-hcrp-assignment-report_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-assignment-report.yml b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-assignment-report.yml
new file mode 100644
index 0000000000..5b47c3f612
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-assignment-report.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-assignment-report
+name: az guestconfig guest-configuration-assignment-report
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-assignment-report** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-assignment-report.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-assignment-report_list
+  name: az guestconfig guest-configuration-assignment-report list
+  summary: List all reports for the guest configuration assignment, latest report first.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment-report list --guest-configuration-assignment-name
+                                                              --resource-group
+                                                              --vm-name
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-assignment-report list --guest-configuration-assignment-name "AuditSecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment-report_show
+  name: az guestconfig guest-configuration-assignment-report show
+  summary: Get a report for the guest configuration assignment, by reportId.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment-report show --guest-configuration-assignment-name
+                                                              --report-id
+                                                              --resource-group
+                                                              --vm-name
+  examples:
+  - summary: Get a guest configuration assignment report by Id for a virtual machine
+    syntax: az guestconfig guest-configuration-assignment-report show --guest-configuration-assignment-name "AuditSecureProtocol" --report-id "7367cbb8-ae99-47d0-a33b-a283564d2cb1" --resource-group "myResourceGroupName" --vm-name "myvm"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --report-id
+    summary: The GUID for the guest configuration assignment report.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-assignment-report_list
+- az_guestconfig_guest-configuration-assignment-report_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-assignment-report.
diff --git a/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-assignment.yml b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-assignment.yml
new file mode 100644
index 0000000000..ae7def5131
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-assignment.yml
@@ -0,0 +1,331 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-assignment
+name: az guestconfig guest-configuration-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-assignment.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-assignment_create
+  name: az guestconfig guest-configuration-assignment create
+  summary: Creates an association between a VM and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment create --guest-configuration-assignment-name
+                                                         --resource-group
+                                                         --vm-name
+                                                         [--context]
+                                                         [--guest-configuration-configuration-parameter]
+                                                         [--guest-configuration-configuration-setting]
+                                                         [--guest-configuration-name]
+                                                         [--guest-configuration-version]
+                                                         [--latest-assignment-report-assignment]
+                                                         [--location]
+                                                         [--name]
+                                                         [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment create --guest-configuration-assignment-name "WhitelistedApplication" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_delete
+  name: az guestconfig guest-configuration-assignment delete
+  summary: Delete a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment delete --name
+                                                         --resource-group
+                                                         --vm-name
+                                                         [--no-wait]
+  examples:
+  - summary: Delete an guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment delete --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_list
+  name: az guestconfig guest-configuration-assignment list
+  summary: List all guest configuration assignments for a virtual machine.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment list --resource-group
+                                                       --vm-name
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-assignment list --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_show
+  name: az guestconfig guest-configuration-assignment show
+  summary: Get information about a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment show --name
+                                                       --resource-group
+                                                       --vm-name
+  examples:
+  - summary: Get a guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment show --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_update
+  name: az guestconfig guest-configuration-assignment update
+  summary: Creates an association between a VM and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment update --guest-configuration-assignment-name
+                                                         --resource-group
+                                                         --vm-name
+                                                         [--context]
+                                                         [--guest-configuration-configuration-parameter]
+                                                         [--guest-configuration-configuration-setting]
+                                                         [--guest-configuration-name]
+                                                         [--guest-configuration-version]
+                                                         [--latest-assignment-report-assignment]
+                                                         [--location]
+                                                         [--name]
+                                                         [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment update --guest-configuration-assignment-name "WhitelistedApplication" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_wait
+  name: az guestconfig guest-configuration-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the guestconfig guest-configuration-assignment is met.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment wait --name
+                                                       --resource-group
+                                                       --vm-name
+                                                       [--created]
+                                                       [--custom]
+                                                       [--deleted]
+                                                       [--exists]
+                                                       [--interval]
+                                                       [--timeout]
+                                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-assignment is successfully created.
+    syntax: az guestconfig guest-configuration-assignment wait --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName" --created
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-assignment is successfully deleted.
+    syntax: az guestconfig guest-configuration-assignment wait --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-assignment_create
+- az_guestconfig_guest-configuration-assignment_delete
+- az_guestconfig_guest-configuration-assignment_list
+- az_guestconfig_guest-configuration-assignment_show
+- az_guestconfig_guest-configuration-assignment_update
+- az_guestconfig_guest-configuration-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-assignment.
diff --git a/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment-report.yml b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment-report.yml
new file mode 100644
index 0000000000..80f3968ae5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment-report.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-hcrp-assignment-report
+name: az guestconfig guest-configuration-hcrp-assignment-report
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-hcrp-assignment-report** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-hcrp-assignment-report.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-hcrp-assignment-report_list
+  name: az guestconfig guest-configuration-hcrp-assignment-report list
+  summary: List all reports for the guest configuration assignment, latest report first.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment-report list --guest-configuration-assignment-name
+                                                                   --machine-name
+                                                                   --resource-group
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-hcrp-assignment-report list --guest-configuration-assignment-name "AuditSecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment-report_show
+  name: az guestconfig guest-configuration-hcrp-assignment-report show
+  summary: Get a report for the guest configuration assignment, by reportId.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment-report show --guest-configuration-assignment-name
+                                                                   --machine-name
+                                                                   --report-id
+                                                                   --resource-group
+  examples:
+  - summary: Get a guest configuration assignment report by Id for a virtual machine
+    syntax: az guestconfig guest-configuration-hcrp-assignment-report show --guest-configuration-assignment-name "AuditSecureProtocol" --machine-name "myMachineName" --report-id "7367cbb8-ae99-47d0-a33b-a283564d2cb1" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --report-id
+    summary: The GUID for the guest configuration assignment report.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-hcrp-assignment-report_list
+- az_guestconfig_guest-configuration-hcrp-assignment-report_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-hcrp-assignment-report.
diff --git a/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment.yml b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment.yml
new file mode 100644
index 0000000000..1d538f6455
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment.yml
@@ -0,0 +1,331 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-hcrp-assignment
+name: az guestconfig guest-configuration-hcrp-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-hcrp-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-hcrp-assignment.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_create
+  name: az guestconfig guest-configuration-hcrp-assignment create
+  summary: Creates an association between a ARC machine and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment create --guest-configuration-assignment-name
+                                                              --machine-name
+                                                              --resource-group
+                                                              [--context]
+                                                              [--guest-configuration-configuration-parameter]
+                                                              [--guest-configuration-configuration-setting]
+                                                              [--guest-configuration-name]
+                                                              [--guest-configuration-version]
+                                                              [--latest-assignment-report-assignment]
+                                                              [--location]
+                                                              [--name]
+                                                              [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment create --guest-configuration-assignment-name "WhitelistedApplication" --machine-name "myMachineName" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_delete
+  name: az guestconfig guest-configuration-hcrp-assignment delete
+  summary: Delete a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment delete --guest-configuration-assignment-name
+                                                              --machine-name
+                                                              --resource-group
+                                                              [--no-wait]
+  examples:
+  - summary: Delete an guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment delete --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_list
+  name: az guestconfig guest-configuration-hcrp-assignment list
+  summary: List all guest configuration assignments for an ARC machine.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment list --machine-name
+                                                            --resource-group
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-hcrp-assignment list --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_show
+  name: az guestconfig guest-configuration-hcrp-assignment show
+  summary: Get information about a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment show --guest-configuration-assignment-name
+                                                            --machine-name
+                                                            --resource-group
+  examples:
+  - summary: Get a guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment show --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_update
+  name: az guestconfig guest-configuration-hcrp-assignment update
+  summary: Creates an association between a ARC machine and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment update --guest-configuration-assignment-name
+                                                              --machine-name
+                                                              --resource-group
+                                                              [--context]
+                                                              [--guest-configuration-configuration-parameter]
+                                                              [--guest-configuration-configuration-setting]
+                                                              [--guest-configuration-name]
+                                                              [--guest-configuration-version]
+                                                              [--latest-assignment-report-assignment]
+                                                              [--location]
+                                                              [--name]
+                                                              [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment update --guest-configuration-assignment-name "WhitelistedApplication" --machine-name "myMachineName" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_wait
+  name: az guestconfig guest-configuration-hcrp-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the guestconfig guest-configuration-hcrp-assignment is met.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment wait --guest-configuration-assignment-name
+                                                            --machine-name
+                                                            --resource-group
+                                                            [--created]
+                                                            [--custom]
+                                                            [--deleted]
+                                                            [--exists]
+                                                            [--interval]
+                                                            [--timeout]
+                                                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-hcrp-assignment is successfully created.
+    syntax: az guestconfig guest-configuration-hcrp-assignment wait --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName" --created
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-hcrp-assignment is successfully deleted.
+    syntax: az guestconfig guest-configuration-hcrp-assignment wait --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-hcrp-assignment_create
+- az_guestconfig_guest-configuration-hcrp-assignment_delete
+- az_guestconfig_guest-configuration-hcrp-assignment_list
+- az_guestconfig_guest-configuration-hcrp-assignment_show
+- az_guestconfig_guest-configuration-hcrp-assignment_update
+- az_guestconfig_guest-configuration-hcrp-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-hcrp-assignment.
diff --git a/2017-03-09-profile/docs-ref-autogen/hack.yml b/2017-03-09-profile/docs-ref-autogen/hack.yml
new file mode 100644
index 0000000000..6062365234
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hack.yml
@@ -0,0 +1,80 @@
+### YamlMime:AzureCLIGroup
+uid: az_hack
+name: az hack
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hack** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az hack** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage resources commonly used for student hacks.
+description: ''
+directCommands:
+- uid: az_hack_create
+  name: az hack create
+  summary: Create resources commonly used for a student hack, including a website, database, and artificial intelligence.
+  description: ''
+  syntax: >-
+    az hack create --location
+                   --name
+                   --runtime {aspnet, jetty, node, php, python, tomcat}
+                   [--ai]
+                   [--database {cosmosdb, mysql, sql}]
+  examples:
+  - summary: Create website using Python and MySQL
+    syntax: az hack create --name samplename --runtime python --location westus2 --database mysql
+  - summary: Create website using Node.js, SQL and Cognitive Services key
+    syntax: az hack create --name samplename --runtime node --location westus2 --database sql --ai
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Base name of resources; random charagers will be appended.
+    description: ''
+  - isRequired: true
+    name: --runtime -r
+    parameterValueGroup: aspnet, jetty, node, php, python, tomcat
+    summary: Runtime.
+    description: ''
+  optionalParameters:
+  - name: --ai
+    summary: Enable Azure Cognitive Services.
+    description: ''
+  - name: --database -d
+    parameterValueGroup: cosmosdb, mysql, sql
+    summary: Database type - { sql | mysql | cosmosdb }.
+    description: ''
+- uid: az_hack_show
+  name: az hack show
+  summary: Display settings for created resources, including database name and password, Git url, and website url.
+  description: ''
+  syntax: az hack show --name
+  examples:
+  - summary: Display settings
+    syntax: az hack show --name samplename
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the application.
+    description: ''
+commands:
+- az_hack_create
+- az_hack_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage resources commonly used for student hacks.
diff --git a/2017-03-09-profile/docs-ref-autogen/hanainstance.yml b/2017-03-09-profile/docs-ref-autogen/hanainstance.yml
new file mode 100644
index 0000000000..b4d5828597
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hanainstance.yml
@@ -0,0 +1,203 @@
+### YamlMime:AzureCLIGroup
+uid: az_hanainstance
+name: az hanainstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sap-hana** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az hanainstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage Azure SAP HANA Instance.
+description: ''
+directCommands:
+- uid: az_hanainstance_create
+  name: az hanainstance create
+  summary: Create a new SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance create --instance-name
+                           --ip-address
+                           --location
+                           --os-computer-name
+                           --partner-node-id
+                           --resource-group
+                           --ssh-public-key
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --ip-address
+    summary: IP address to connect to the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location of the SAP HANA instance. Default is the location of target resource group.
+    description: ''
+  - isRequired: true
+    name: --os-computer-name
+    summary: OS computer name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --partner-node-id
+    summary: ARM ID of a HANA Instance on the network to connect the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --ssh-public-key
+    summary: SSH public key to connect to the SAP HANA instance.
+    description: ''
+- uid: az_hanainstance_delete
+  name: az hanainstance delete
+  summary: Delete a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance delete --instance-name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_list
+  name: az hanainstance list
+  summary: List SAP HANA Instances.
+  description: ''
+  syntax: az hanainstance list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_restart
+  name: az hanainstance restart
+  summary: Restart a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance restart --instance-name
+                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_show
+  name: az hanainstance show
+  summary: Get the details of a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance show --instance-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_shutdown
+  name: az hanainstance shutdown
+  summary: Shutdown a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance shutdown --instance-name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_start
+  name: az hanainstance start
+  summary: Start a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance start --instance-name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_update
+  name: az hanainstance update
+  summary: Update the Tags field of a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance update --instance-name
+                           --resource-group
+                           [--add]
+                           [--force-string]
+                           [--no-wait]
+                           [--remove]
+                           [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_hanainstance_create
+- az_hanainstance_delete
+- az_hanainstance_list
+- az_hanainstance_restart
+- az_hanainstance_show
+- az_hanainstance_shutdown
+- az_hanainstance_start
+- az_hanainstance_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage Azure SAP HANA Instance.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight.yml
index 8082123ac2..0b0b7c4407 100644
--- a/2017-03-09-profile/docs-ref-autogen/hdinsight.yml
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight.yml
@@ -1,175 +1,308 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight
-  name: az hdinsight
-  summary: Manage HDInsight resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_create
-  - az_hdinsight_delete
-  - az_hdinsight_list
-  - az_hdinsight_list_usage
-  - az_hdinsight_resize
-  - az_hdinsight_rotate_disk_encryption_key
-  - az_hdinsight_show
-  - az_hdinsight_update
-  - az_hdinsight_wait
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight
+name: az hdinsight
+summary: Manage HDInsight resources.
+description: ''
+directCommands:
 - uid: az_hdinsight_create
   name: az hdinsight create
   summary: Create a new cluster.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az hdinsight create --name
+                        --resource-group
+                        --type
+                        [--assign-identity]
+                        [--autoscale-count]
+                        [--autoscale-max-count]
+                        [--autoscale-min-count]
+                        [--autoscale-type {Load, Schedule}]
+                        [--cluster-admin-account]
+                        [--cluster-admin-password]
+                        [--cluster-configurations]
+                        [--cluster-tier {Premium, Standard}]
+                        [--cluster-users-group-dns]
+                        [--component-version]
+                        [--compute-isolation {false, true}]
+                        [--days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}]
+                        [--domain]
+                        [--edgenode-size]
+                        [--enable-private-link {false, true}]
+                        [--encryption-algorithm {RSA-OAEP, RSA-OAEP-256, RSA1_5}]
+                        [--encryption-at-host {false, true}]
+                        [--encryption-in-transit {false, true}]
+                        [--encryption-key-name]
+                        [--encryption-key-version]
+                        [--encryption-vault-uri]
+                        [--esp]
+                        [--headnode-size]
+                        [--host-sku]
+                        [--http-password]
+                        [--http-user]
+                        [--idbroker]
+                        [--kafka-client-group-id]
+                        [--kafka-client-group-name]
+                        [--kafka-management-node-count]
+                        [--kafka-management-node-size]
+                        [--ldaps-urls]
+                        [--location]
+                        [--minimal-tls-version {1.0, 1.1, 1.2}]
+                        [--no-validation-timeout]
+                        [--no-wait]
+                        [--resource-provider-connection {Inbound, Outbound}]
+                        [--ssh-password]
+                        [--ssh-public-key]
+                        [--ssh-user]
+                        [--storage-account]
+                        [--storage-account-key]
+                        [--storage-account-managed-identity]
+                        [--storage-container]
+                        [--storage-filesystem]
+                        [--subnet]
+                        [--subscription]
+                        [--tags]
+                        [--time]
+                        [--timezone]
+                        [--version]
+                        [--vnet-name]
+                        [--workernode-count]
+                        [--workernode-data-disk-size]
+                        [--workernode-data-disk-storage-account-type {premium_lrs, standard_lrs}]
+                        [--workernode-data-disks-per-node]
+                        [--workernode-size]
+                        [--zookeepernode-size]
   examples:
   - summary: Create a cluster with an existing storage account.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" \
+      -p "HttpPassword1234!" \
 
-        --storage-account MyStorageAccount
+      --storage-account MyStorageAccount
   - summary: Create a cluster with minimal tls version.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
+
+      --storage-account MyStorageAccount --minimal-tls-version 1.2
+  - summary: Create a cluster which enables encryption in transit.
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
 
-        -p "HttpPassword1234!" \
+      --storage-account MyStorageAccount --encryption-in-transit true
+  - summary: Create a cluster with encryption at host.
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        --storage-account MyStorageAccount --minimal-tls-version 1.2
+      -p "HttpPassword1234!" \
+
+      --storage-account MyStorageAccount --encryption-at-host true
   - summary: Create a cluster with the Enterprise Security Package (ESP).
-    syntax:
-      content: >-
-        az hdinsight create --esp -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create --esp -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
+
+      --storage-account MyStorageAccount \
 
-        -p "HttpPassword1234!" \
+      --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/subnet1" \
 
-        --storage-account MyStorageAccount \
+      --domain "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.AAD/domainServices/MyDomain.onmicrosoft.com" \
 
-        --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/subnet1" \
+      --assign-identity "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MyMsiRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyMSI" \
 
-        --domain "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.AAD/domainServices/MyDomain.onmicrosoft.com" \
+      --cluster-admin-account MyAdminAccount@MyDomain.onmicrosoft.com \
 
-        --assign-identity "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MyMsiRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyMSI" \
+      --cluster-users-group-dns MyGroup
+  - summary: Create a cluster with the Enterprise Security Package (ESP) and enable HDInsight ID Broker.
+    syntax: >-
+      az hdinsight create --esp --idbroker -t spark -g MyResourceGroup -n MyCluster \
 
-        --cluster-admin-account MyAdminAccount@MyDomain.onmicrosoft.com \
+      -p "HttpPassword1234!" \
 
-        --cluster-users-group-dns MyGroup
+      --storage-account MyStorageAccount \
+
+      --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/subnet1" \
+
+      --domain "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.AAD/domainServices/MyDomain.onmicrosoft.com" \
+
+      --assign-identity "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MyMsiRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyMSI" \
+
+      --cluster-admin-account MyAdminAccount@MyDomain.onmicrosoft.com \
+
+      --cluster-users-group-dns MyGroup
   - summary: Create a Kafka cluster with disk encryption. See https://docs.microsoft.com/azure/hdinsight/kafka/apache-kafka-byok.
-    syntax:
-      content: >-
-        az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
+      -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --encryption-key-name kafkaClusterKey \
+      --encryption-key-name kafkaClusterKey \
 
-        --encryption-key-version 00000000000000000000000000000000 \
+      --encryption-key-version 00000000000000000000000000000000 \
 
-        --encryption-vault-uri https://MyKeyVault.vault.azure.net \
+      --encryption-vault-uri https://MyKeyVault.vault.azure.net \
 
-        --assign-identity MyMSI
+      --assign-identity MyMSI
   - summary: Create a kafka cluster with kafka rest proxy.
-    syntax:
-      content: >-
-        az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
+      -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --kafka-management-node-size "Standard_D4_v2" \
+      --kafka-management-node-size "Standard_D4_v2" \
 
-        --kafka-client-group-id MySecurityGroupId \
+      --kafka-client-group-id MySecurityGroupId \
 
-        --kafka-client-group-name MySecurityGroupName
+      --kafka-client-group-name MySecurityGroupName
 
-        --component-version kafka=2.1
+      --component-version kafka=2.1
   - summary: Create a cluster with Azure Data Lake Storage Gen2
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" \
+      -p "HttpPassword1234!" \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --storage-account-managed-identity MyMSI
+      --storage-account-managed-identity MyMSI
   - summary: Create a cluster with configuration from JSON string.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" \
+      -p "HttpPassword1234!" \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --cluster-configuration {'gateway':{'restAuthCredential.username':'admin'}}
+      --cluster-configuration {'gateway':{'restAuthCredential.username':'admin'}}
   - summary: Create a cluster with configuration from a local file.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
 
-        -p "HttpPassword1234!" \
+      --storage-account MyStorageAccount \
 
-        --storage-account MyStorageAccount \
+      --cluster-configuration @config.json
+  - summary: Create a cluster which Load-based Autoscale.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
 
-        --cluster-configuration @config.json
-  parameters:
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --autoscale-type Load --autoscale-min-workernode-count 3 --autoscale-max-workernode-count 5
+  - summary: Create a cluster which Schedule-based Autoscale.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --autoscale-type Schedule --timezone "Pacific Standard Time" --days Monday \
+
+      --time 09:00 --autoscale-workernode-count 5
+  - summary: Create a cluster with Relay Outbound and Private Link feature.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/fakevnet/subnets/default" \
+
+      --resource-provider-connection Outbound --enable-private-link
+  - summary: Create a cluster with Compute Isolation feature.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --enable-compute-isolation --workernode-size "Standard_E8S_V3" --headnode-size "Standard_E8S_V3"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+  - isRequired: true
+    name: --type -t
+    summary: 'Type of HDInsight cluster, like: hadoop, interactivehive, hbase, kafka, storm, spark, rserver, mlservices. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#cluster-types.'
     description: ''
-  - name: --no-validation-timeout
-    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
+  optionalParameters:
+  - name: --assign-identity
+    summary: The name or ID of user assigned identity.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --autoscale-count --autoscale-workernode-count
+    summary: The scheduled workernode count.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --autoscale-max-count --autoscale-max-workernode-count
+    summary: The max workernode count for Load-based atuoscale.
     description: ''
-  - isRequired: true
-    name: --type -t
-    summary: 'Type of HDInsight cluster, like: hadoop, interactivehive, hbase, kafka, storm, spark, rserver, mlservices. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#cluster-types">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#cluster-types</a>.'
+  - name: --autoscale-min-count --autoscale-min-workernode-count
+    summary: The minimal workernode count for Load-based atuoscale.
+    description: ''
+  - name: --autoscale-type
+    parameterValueGroup: Load, Schedule
+    summary: The autoscale type.
+    description: ''
+  - name: --cluster-admin-account
+    summary: The domain user account that will have admin privileges on the cluster. Required only when create cluster with Enterprise Security Package.
+    description: ''
+  - name: --cluster-admin-password
+    summary: The domain admin password. Required only when create cluster with Enterprise Security Package.
     description: ''
   - name: --cluster-configurations
-    summary: 'Extra configurations of various components. Configurations may be supplied from a file using the `@{path}` syntax or a JSON string. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap</a>.'
+    summary: 'Extra configurations of various components. Configurations may be supplied from a file using the `@{path}` syntax or a JSON string. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap.'
     description: ''
   - name: --cluster-tier
     parameterValueGroup: Premium, Standard
     summary: The tier of the cluster.
     description: ''
+  - name: --cluster-users-group-dns
+    summary: A space-delimited list of Distinguished Names for cluster user groups. Required only when create cluster with Enterprise Security Package.
+    description: ''
   - name: --component-version
-    summary: "The versions of various Hadoop components, in space-separated versions in 'component=version' format. Example: Spark=2.0 Hadoop=2.7.3 See also: <a href=\"https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#hadoop-components-available-with-different-hdinsight-versions\">https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#hadoop-components-available-with-different-hdinsight-versions</a>."
+    summary: "The versions of various Hadoop components, in space-separated versions in 'component=version' format. Example: Spark=2.0 Hadoop=2.7.3 See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#hadoop-components-available-with-different-hdinsight-versions."
     description: ''
-  - name: --esp
-    summary: Specify to create cluster with Enterprise Security Package. If omitted, creating cluster with Enterprise Security Package will not not allowed.
+  - name: --compute-isolation --enable-compute-isolation
+    parameterValueGroup: false, true
+    summary: Indicate whether enable compute isolation or not.
     description: ''
-  - name: --minimal-tls-version
-    parameterValueGroup: 1.0, 1.1, 1.2
-    summary: The minimal supported TLS version.
+  - name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
     description: ''
-  - name: --version -v
-    defaultValue: default
-    summary: 'The HDInsight cluster version. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#supported-hdinsight-versions">https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#supported-hdinsight-versions</a>.'
+  - name: --domain
+    summary: The name or resource ID of the user's Azure Active Directory Domain Service. Required only when create cluster with Enterprise Security Package.
+    description: ''
+  - name: --edgenode-size
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
+    description: ''
+  - name: --enable-private-link
+    parameterValueGroup: false, true
+    summary: Indicate whether enable the private link or not.
     description: ''
   - name: --encryption-algorithm
     defaultValue: RSA-OAEP
     parameterValueGroup: RSA-OAEP, RSA-OAEP-256, RSA1_5
     summary: Algorithm identifier for encryption.
     description: ''
+  - name: --encryption-at-host
+    parameterValueGroup: false, true
+    summary: Indicates whether enable encryption at host or not.
+    description: ''
+  - name: --encryption-in-transit
+    parameterValueGroup: false, true
+    summary: Indicates whether enable encryption in transit.
+    description: ''
   - name: --encryption-key-name
     summary: Key name that is used for enabling disk encryption.
     description: ''
@@ -177,22 +310,16 @@ items:
     summary: Key version that is used for enabling disk encryption.
     description: ''
   - name: --encryption-vault-uri
-    summary: Base key vault URI where the customers key is located eg. <a href="https://myvault.vault.azure.net">https://myvault.vault.azure.net</a>.
-    description: ''
-  - name: --cluster-admin-account
-    summary: The domain user account that will have admin privileges on the cluster. Required only when create cluster with Enterprise Security Package.
-    description: ''
-  - name: --cluster-admin-password
-    summary: The domain admin password. Required only when create cluster with Enterprise Security Package.
+    summary: Base key vault URI where the customers key is located eg. https://myvault.vault.azure.net.
     description: ''
-  - name: --cluster-users-group-dns
-    summary: A space-delimited list of Distinguished Names for cluster user groups. Required only when create cluster with Enterprise Security Package.
+  - name: --esp
+    summary: Specify to create cluster with Enterprise Security Package. If omitted, creating cluster with Enterprise Security Package will not not allowed.
     description: ''
-  - name: --domain
-    summary: The name or resource ID of the user's Azure Active Directory Domain Service. Required only when create cluster with Enterprise Security Package.
+  - name: --headnode-size
+    summary: 'Incoming BREAKING CHANGE: The default value "large" will be removed in next CLI version.The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
     description: ''
-  - name: --ldaps-urls
-    summary: A space-delimited list of LDAPS protocol URLs to communicate with the Active Directory. Required only when create cluster with Enterprise Security Package.
+  - name: --host-sku
+    summary: The dedicated host sku of compute isolation.
     description: ''
   - name: --http-password -p
     summary: HTTP password for the cluster. Will prompt if not given.
@@ -200,55 +327,41 @@ items:
   - name: --http-user -u
     summary: 'HTTP username for the cluster.  Default: admin.'
     description: ''
+  - name: --idbroker
+    summary: Specify to create ESP cluster with HDInsight ID Broker. If omitted, creating ESP cluster with HDInsight ID Broker will not not allowed.
+    description: ''
   - name: --kafka-client-group-id
     summary: The client AAD security group id for Kafka Rest Proxy.
     description: ''
   - name: --kafka-client-group-name
     summary: The client AAD security group name for Kafka Rest Proxy.
     description: ''
-  - name: --assign-identity
-    summary: The name or ID of user assigned identity.
-    description: ''
-  - name: --subnet
-    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: The name of a virtual network.
-    description: ''
-  - name: --edgenode-size
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
-    description: ''
-  - name: --headnode-size
-    defaultValue: large
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
-    description: ''
   - name: --kafka-management-node-count
     defaultValue: "2"
     summary: The number of kafka management node in the cluster.
     description: ''
   - name: --kafka-management-node-size
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
     description: ''
-  - name: --workernode-count -c
-    defaultValue: "3"
-    summary: The number of worker nodes in the cluster.
+  - name: --ldaps-urls
+    summary: A space-delimited list of LDAPS protocol URLs to communicate with the Active Directory. Required only when create cluster with Enterprise Security Package.
     description: ''
-  - name: --workernode-data-disk-size
-    summary: The size of the data disk in GB, e.g. 1023.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --workernode-data-disk-storage-account-type
-    parameterValueGroup: premium_lrs, standard_lrs
-    summary: 'The type of storage account that will be used for the data disks: standard_lrs or premium_lrs.'
+  - name: --minimal-tls-version
+    parameterValueGroup: 1.0, 1.1, 1.2
+    summary: The minimal supported TLS version.
     description: ''
-  - name: --workernode-data-disks-per-node
-    summary: The number of data disks to use per worker node.
+  - name: --no-validation-timeout
+    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
     description: ''
-  - name: --workernode-size
-    defaultValue: large
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --zookeepernode-size
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+  - name: --resource-provider-connection --rp-connection
+    parameterValueGroup: Inbound, Outbound
+    summary: The resource provider connection type.
     description: ''
   - name: --ssh-password -P
     summary: SSH password for the cluster nodes. If none specified, uses the HTTP password.
@@ -275,133 +388,162 @@ items:
   - name: --storage-filesystem
     summary: The storage filesystem the cluster will use. Uses the cluster name if none was specified. (DFS only).
     description: ''
+  - name: --subnet
+    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --time
+    summary: The 24-hour time in the form of xx:xx in days.
+    description: ''
+  - name: --timezone
+    summary: The timezone for schedule autoscale type. Values from `az hdinsight autoscale list-timezones`.
+    description: ''
+  - name: --version -v
+    defaultValue: default
+    summary: 'The HDInsight cluster version. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#supported-hdinsight-versions.'
+    description: ''
+  - name: --vnet-name
+    summary: The name of a virtual network.
+    description: ''
+  - name: --workernode-count -c
+    defaultValue: "3"
+    summary: The number of worker nodes in the cluster.
+    description: ''
+  - name: --workernode-data-disk-size
+    summary: The size of the data disk in GB, e.g. 1023.
+    description: ''
+  - name: --workernode-data-disk-storage-account-type
+    parameterValueGroup: premium_lrs, standard_lrs
+    summary: 'The type of storage account that will be used for the data disks: standard_lrs or premium_lrs.'
+    description: ''
+  - name: --workernode-data-disks-per-node
+    summary: The number of data disks to use per worker node.
+    description: ''
+  - name: --workernode-size
+    summary: 'Incoming BREAKING CHANGE: The default value "large" will be removed in next CLI version.The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
+    description: ''
+  - name: --zookeepernode-size
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_delete
   name: az hdinsight delete
   summary: Deletes the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight delete --name
+                        --resource-group
+                        [--no-wait]
+                        [--subscription]
+                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_list
   name: az hdinsight list
   summary: List HDInsight clusters in a resource group or subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight list [--query-examples]
+                      [--resource-group]
+                      [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_list_usage
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_list-usage
   name: az hdinsight list-usage
   summary: Lists the usages for the specified location.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight list-usage --location
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_resize
   name: az hdinsight resize
-  summary: Resizes the specified HDInsight cluster to the specified size.
+  summary: Resize the specified HDInsight cluster to the specified size.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight resize --name
+                        --resource-group
+                        --workernode-count
+                        [--no-wait]
+                        [--subscription]
+  examples:
+  - summary: Resize the cluster's workernode.
+    syntax: az hdinsight resize --name MyCluster --resource-group rg --workernode-count 5
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --workernode-count -c
     summary: The target worker node instance count for the operation.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_rotate_disk_encryption_key
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_rotate-disk-encryption-key
   name: az hdinsight rotate-disk-encryption-key
   summary: Rotate the disk encryption key of the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  syntax: >-
+    az hdinsight rotate-disk-encryption-key --encryption-key-name
+                                            --encryption-key-version
+                                            --encryption-vault-uri
+                                            --name
+                                            --resource-group
+                                            [--no-wait]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --encryption-key-name
     summary: Key name that is used for enabling disk encryption.
@@ -412,86 +554,108 @@ items:
     description: ''
   - isRequired: true
     name: --encryption-vault-uri
-    summary: Base key vault URI where the customers key is located eg. <a href="https://myvault.vault.azure.net">https://myvault.vault.azure.net</a>.
+    summary: Base key vault URI where the customers key is located eg. https://myvault.vault.azure.net.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_show
   name: az hdinsight show
   summary: Gets the specified cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight show --name
+                      --resource-group
+                      [--query-examples]
+                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_update
   name: az hdinsight update
-  summary: Patch HDInsight cluster with the specified parameters.
+  summary: Update the tags of the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight update --name
+                        --resource-group
+                        [--no-wait]
+                        [--subscription]
+                        [--tags]
+  examples:
+  - summary: Update the tags.
+    syntax: az hdinsight update --name MyCluster --resource-group rg --tags key=value
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_wait
   name: az hdinsight wait
   summary: Place the CLI in a waiting state until an operation is complete.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight wait --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--subscription]
+                      [--timeout]
+                      [--updated]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -508,6 +672,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -515,94 +682,50 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_application
-  name: az hdinsight application
-  summary: Manage HDInsight applications.
-- uid: az_hdinsight_application_create
-  name: az hdinsight application create
-  summary: Create an application for a HDInsight cluster.
-- uid: az_hdinsight_application_delete
-  name: az hdinsight application delete
-  summary: Deletes the specified application on the HDInsight cluster.
-- uid: az_hdinsight_application_list
-  name: az hdinsight application list
-  summary: Lists all of the applications for the HDInsight cluster.
-- uid: az_hdinsight_application_show
-  name: az hdinsight application show
-  summary: Gets properties of the specified application.
-- uid: az_hdinsight_application_wait
-  name: az hdinsight application wait
-  summary: Place the CLI in a waiting state until an operation is complete.
-- uid: az_hdinsight_create
-  name: az hdinsight create
-  summary: Create a new cluster.
-- uid: az_hdinsight_delete
-  name: az hdinsight delete
-  summary: Deletes the specified HDInsight cluster.
-- uid: az_hdinsight_list
-  name: az hdinsight list
-  summary: List HDInsight clusters in a resource group or subscription.
-- uid: az_hdinsight_list_usage
-  name: az hdinsight list-usage
-  summary: Lists the usages for the specified location.
-- uid: az_hdinsight_monitor
-  name: az hdinsight monitor
-  summary: Manage Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_disable
-  name: az hdinsight monitor disable
-  summary: Disable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_enable
-  name: az hdinsight monitor enable
-  summary: Enable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_show
-  name: az hdinsight monitor show
-  summary: Get the status of Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_resize
-  name: az hdinsight resize
-  summary: Resizes the specified HDInsight cluster to the specified size.
-- uid: az_hdinsight_rotate_disk_encryption_key
-  name: az hdinsight rotate-disk-encryption-key
-  summary: Rotate the disk encryption key of the specified HDInsight cluster.
-- uid: az_hdinsight_script_action
-  name: az hdinsight script-action
-  summary: Manage HDInsight script actions.
-- uid: az_hdinsight_script_action_delete
-  name: az hdinsight script-action delete
-  summary: Deletes a specified persisted script action of the cluster.
-- uid: az_hdinsight_script_action_execute
-  name: az hdinsight script-action execute
-  summary: Execute script actions on the specified HDInsight cluster.
-- uid: az_hdinsight_script_action_list
-  name: az hdinsight script-action list
-  summary: Lists all the persisted script actions for the specified cluster.
-- uid: az_hdinsight_script_action_list_execution_history
-  name: az hdinsight script-action list-execution-history
-  summary: Lists all scripts' execution history for the specified cluster.
-- uid: az_hdinsight_script_action_promote
-  name: az hdinsight script-action promote
-  summary: Promotes the specified ad-hoc script execution to a persisted script.
-- uid: az_hdinsight_script_action_show_execution_details
-  name: az hdinsight script-action show-execution-details
-  summary: Gets the script execution detail for the given script execution ID.
-- uid: az_hdinsight_show
-  name: az hdinsight show
-  summary: Gets the specified cluster.
-- uid: az_hdinsight_update
-  name: az hdinsight update
-  summary: Patch HDInsight cluster with the specified parameters.
-- uid: az_hdinsight_wait
-  name: az hdinsight wait
-  summary: Place the CLI in a waiting state until an operation is complete.
+- az_hdinsight_application
+- az_hdinsight_application_create
+- az_hdinsight_application_delete
+- az_hdinsight_application_list
+- az_hdinsight_application_show
+- az_hdinsight_application_wait
+- az_hdinsight_autoscale
+- az_hdinsight_autoscale_condition
+- az_hdinsight_autoscale_condition_create
+- az_hdinsight_autoscale_condition_delete
+- az_hdinsight_autoscale_condition_list
+- az_hdinsight_autoscale_condition_update
+- az_hdinsight_autoscale_condition_wait
+- az_hdinsight_autoscale_create
+- az_hdinsight_autoscale_delete
+- az_hdinsight_autoscale_list-timezones
+- az_hdinsight_autoscale_show
+- az_hdinsight_autoscale_update
+- az_hdinsight_autoscale_wait
+- az_hdinsight_create
+- az_hdinsight_delete
+- az_hdinsight_host
+- az_hdinsight_host_list
+- az_hdinsight_host_restart
+- az_hdinsight_list
+- az_hdinsight_list-usage
+- az_hdinsight_monitor
+- az_hdinsight_monitor_disable
+- az_hdinsight_monitor_enable
+- az_hdinsight_monitor_show
+- az_hdinsight_resize
+- az_hdinsight_rotate-disk-encryption-key
+- az_hdinsight_script-action
+- az_hdinsight_script-action_delete
+- az_hdinsight_script-action_execute
+- az_hdinsight_script-action_list
+- az_hdinsight_script-action_list-execution-history
+- az_hdinsight_script-action_promote
+- az_hdinsight_script-action_show-execution-details
+- az_hdinsight_show
+- az_hdinsight_update
+- az_hdinsight_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -618,10 +741,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage HDInsight resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight/application.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight/application.yml
index b5e485d88c..d4b144eb43 100644
--- a/2017-03-09-profile/docs-ref-autogen/hdinsight/application.yml
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight/application.yml
@@ -1,67 +1,76 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight_application
-  name: az hdinsight application
-  summary: Manage HDInsight applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_application_create
-  - az_hdinsight_application_delete
-  - az_hdinsight_application_list
-  - az_hdinsight_application_show
-  - az_hdinsight_application_wait
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_application
+name: az hdinsight application
+summary: Manage HDInsight applications.
+description: ''
+directCommands:
 - uid: az_hdinsight_application_create
   name: az hdinsight application create
   summary: Create an application for a HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az hdinsight application create --cluster-name
+                                    --name
+                                    --resource-group
+                                    --script-action-name
+                                    --script-uri
+                                    [--access-mode]
+                                    [--destination-port]
+                                    [--disable-gateway-auth {false, true}]
+                                    [--edgenode-size]
+                                    [--marketplace-id]
+                                    [--no-validation-timeout]
+                                    [--script-parameters]
+                                    [--ssh-password]
+                                    [--ssh-public-key]
+                                    [--ssh-user]
+                                    [--sub-domain-suffix]
+                                    [--subnet]
+                                    [--subscription]
+                                    [--tags]
+                                    [--type {CustomApplication, RServer}]
+                                    [--vnet-name]
   examples:
   - summary: Create an application with a script URI.
-    syntax:
-      content: >-
-        az hdinsight application create -g MyResourceGroup -n MyApplication \
+    syntax: >-
+      az hdinsight application create -g MyResourceGroup -n MyApplication \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
 
-        --script-action-name MyScriptAction \
+      --script-action-name MyScriptAction \
 
-        --script-parameters '"-version latest -port 20000"'
+      --script-parameters '"-version latest -port 20000"'
   - summary: Create an application with a script URI and specified edge node size.
-    syntax:
-      content: >-
-        az hdinsight application create -g MyResourceGroup -n MyApplication \
+    syntax: >-
+      az hdinsight application create -g MyResourceGroup -n MyApplication \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
 
-        --script-action-name MyScriptAction \
+      --script-action-name MyScriptAction \
 
-        --script-parameters "-version latest -port 20000" \
+      --script-parameters "-version latest -port 20000" \
 
-        --edgenode-size Standard_D4_v2
+      --edgenode-size Standard_D4_v2
   - summary: Create an application with HTTPS Endpoint.
-    syntax:
-      content: >-
-        az hdinsight application create -g MyResourceGroup -n MyApplication \
+    syntax: >-
+      az hdinsight application create -g MyResourceGroup -n MyApplication \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
 
-        --script-action-name MyScriptAction \
+      --script-action-name MyScriptAction \
 
-        --script-parameters "-version latest -port 20000" \
+      --script-parameters "-version latest -port 20000" \
 
-        --destination-port 8888 \
+      --destination-port 8888 \
 
-        --sub-domain-suffix was
-  parameters:
+      --sub-domain-suffix was
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -72,22 +81,17 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --marketplace-id
-    summary: The marketplace identifier.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --no-validation-timeout
-    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - isRequired: true
+    name: --script-action-name
+    summary: The name of the script action.
     description: ''
-  - name: --type -t
-    defaultValue: CustomApplication
-    parameterValueGroup: CustomApplication, RServer
-    summary: The application type.
+  - isRequired: true
+    name: --script-uri
+    summary: The URI to the script.
     description: ''
+  optionalParameters:
   - name: --access-mode
     defaultValue: WebPage
     summary: The access mode for the application.
@@ -100,18 +104,18 @@ items:
     parameterValueGroup: false, true
     summary: 'Indicates whether to disable gateway authentication. Default is to enable gateway authentication. Default: false.'
     description: ''
-  - name: --sub-domain-suffix
-    summary: The subdomain suffix of the application.
+  - name: --edgenode-size
+    defaultValue: Standard_D3_V2
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
     description: ''
-  - name: --subnet
-    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+  - name: --marketplace-id
+    summary: The marketplace identifier.
     description: ''
-  - name: --vnet-name
-    summary: The name of a virtual network.
+  - name: --no-validation-timeout
+    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
     description: ''
-  - name: --edgenode-size
-    defaultValue: Standard_D3_V2
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+  - name: --script-parameters
+    summary: The parameters for the script.
     description: ''
   - name: --ssh-password -P
     summary: SSH password for the cluster nodes.
@@ -123,33 +127,39 @@ items:
     defaultValue: sshuser
     summary: SSH username for the cluster nodes.
     description: ''
-  - isRequired: true
-    name: --script-action-name
-    summary: The name of the script action.
-    description: ''
-  - isRequired: true
-    name: --script-uri
-    summary: The URI to the script.
+  - name: --sub-domain-suffix
+    summary: The subdomain suffix of the application.
     description: ''
-  - name: --script-parameters
-    summary: The parameters for the script.
+  - name: --subnet
+    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type -t
+    defaultValue: CustomApplication
+    parameterValueGroup: CustomApplication, RServer
+    summary: The application type.
+    description: ''
+  - name: --vnet-name
+    summary: The name of a virtual network.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_delete
   name: az hdinsight application delete
   summary: Deletes the specified application on the HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application delete --cluster-name
+                                    --name
+                                    --resource-group
+                                    [--no-wait]
+                                    [--subscription]
+                                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -160,54 +170,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_list
   name: az hdinsight application list
   summary: Lists all of the applications for the HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application list --cluster-name
+                                  --resource-group
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_show
   name: az hdinsight application show
   summary: Gets properties of the specified application.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application show --cluster-name
+                                  --name
+                                  --resource-group
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -218,24 +230,33 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_wait
   name: az hdinsight application wait
   summary: Place the CLI in a waiting state until an operation is complete.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application wait --cluster-name
+                                  --name
+                                  --resource-group
+                                  [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--interval]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -246,8 +267,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -264,6 +286,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -271,31 +296,13 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_application_create
-  name: az hdinsight application create
-  summary: Create an application for a HDInsight cluster.
-- uid: az_hdinsight_application_delete
-  name: az hdinsight application delete
-  summary: Deletes the specified application on the HDInsight cluster.
-- uid: az_hdinsight_application_list
-  name: az hdinsight application list
-  summary: Lists all of the applications for the HDInsight cluster.
-- uid: az_hdinsight_application_show
-  name: az hdinsight application show
-  summary: Gets properties of the specified application.
-- uid: az_hdinsight_application_wait
-  name: az hdinsight application wait
-  summary: Place the CLI in a waiting state until an operation is complete.
+- az_hdinsight_application_create
+- az_hdinsight_application_delete
+- az_hdinsight_application_list
+- az_hdinsight_application_show
+- az_hdinsight_application_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -311,10 +318,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage HDInsight applications.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight/autoscale.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight/autoscale.yml
new file mode 100644
index 0000000000..c92cc8a051
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight/autoscale.yml
@@ -0,0 +1,280 @@
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_autoscale
+name: az hdinsight autoscale
+summary: Manage HDInsight cluster's Autoscale configuration.
+description: ''
+directCommands:
+- uid: az_hdinsight_autoscale_create
+  name: az hdinsight autoscale create
+  summary: Enable Autoscale for a running cluster.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale create --cluster-name
+                                  --resource-group
+                                  --type {Load, Schedule}
+                                  [--days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}]
+                                  [--max-workernode-count]
+                                  [--min-workernode-count]
+                                  [--no-wait]
+                                  [--subscription]
+                                  [--time]
+                                  [--timezone]
+                                  [--workernode-count]
+                                  [--yes]
+  examples:
+  - summary: Enable Load-based Autoscale for a running cluster.
+    syntax: >-
+      az hdinsight autoscale create --resource-group MyResourceGroup --cluster-name MyCluster --type Load \
+
+      --min-workernode-count 3 --max-workernode-count 5
+  - summary: Enable Schedule-based Autoscale for a running cluster.
+    syntax: >-
+      az hdinsight autoscale create --resource-group MyResourceGroup --cluster-name MyCluster --type Schedule \
+
+      --timezone "Pacific Standard Time" --days Monday Tuesday --time 09:00 --workernode-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Load, Schedule
+    summary: The autoscale type.
+    description: ''
+  optionalParameters:
+  - name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
+    description: ''
+  - name: --max-workernode-count
+    summary: The max workernode count for Load-based atuoscale.
+    description: ''
+  - name: --min-workernode-count
+    summary: The minimal workernode count for Load-based atuoscale.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time
+    summary: The 24-hour time in the form xx:xx in days.
+    description: ''
+  - name: --timezone
+    summary: The timezone for schedule autoscale type. Values from `az hdinsight autoscale list-timezones`.
+    description: ''
+  - name: --workernode-count
+    summary: The schedule workernode count.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_delete
+  name: az hdinsight autoscale delete
+  summary: Disable Autoscale for a running cluster.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale delete --cluster-name
+                                  --resource-group
+                                  [--no-wait]
+                                  [--subscription]
+                                  [--yes]
+  examples:
+  - summary: Disable Autoscale for a running cluster.
+    syntax: az hdinsight autoscale delete --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_list-timezones
+  name: az hdinsight autoscale list-timezones
+  summary: List the available timezone name when enabling Schedule-based Autoscale.
+  description: ''
+  syntax: az hdinsight autoscale list-timezones [--subscription]
+  examples:
+  - summary: List the available timezone name.
+    syntax: az hdinsight autoscale list-timezones
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_show
+  name: az hdinsight autoscale show
+  summary: Get the Autoscale configuration of a specified cluster.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale show --cluster-name
+                                --resource-group
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get the Autoscale configuration.
+    syntax: az hdinsight autoscale show --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_update
+  name: az hdinsight autoscale update
+  summary: Update the Autoscale configuration.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale update --cluster-name
+                                  --resource-group
+                                  [--max-workernode-count]
+                                  [--min-workernode-count]
+                                  [--no-wait]
+                                  [--subscription]
+                                  [--timezone]
+  examples:
+  - summary: Update Load-based Autoscale related configuration.
+    syntax: az hdinsight autoscale update --resource-group MyResourceGroup --cluster-name MyCluster --max-workernode-count 5
+  - summary: Update Schedule-based Autoscale related configuration.
+    syntax: az hdinsight autoscale update --resource-group MyResourceGroup --cluster-name MyCluster --timezone "China Standard Time"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-workernode-count
+    summary: The max workernode count for Load-based atuoscale.
+    description: ''
+  - name: --min-workernode-count
+    summary: The minimal workernode count for Load-based atuoscale.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timezone
+    summary: The timezone for schedule autoscale type. Values from `az hdinsight autoscale list-timezones`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_wait
+  name: az hdinsight autoscale wait
+  summary: Place the CLI in a waiting state until an operation is complete.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale wait --name
+                                --resource-group
+                                [--created]
+                                [--custom]
+                                [--deleted]
+                                [--exists]
+                                [--interval]
+                                [--subscription]
+                                [--timeout]
+                                [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+commands:
+- az_hdinsight_autoscale_condition
+- az_hdinsight_autoscale_condition_create
+- az_hdinsight_autoscale_condition_delete
+- az_hdinsight_autoscale_condition_list
+- az_hdinsight_autoscale_condition_update
+- az_hdinsight_autoscale_condition_wait
+- az_hdinsight_autoscale_create
+- az_hdinsight_autoscale_delete
+- az_hdinsight_autoscale_list-timezones
+- az_hdinsight_autoscale_show
+- az_hdinsight_autoscale_update
+- az_hdinsight_autoscale_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight cluster's Autoscale configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight/autoscale/condition.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight/autoscale/condition.yml
new file mode 100644
index 0000000000..f66c9bb391
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight/autoscale/condition.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_autoscale_condition
+name: az hdinsight autoscale condition
+summary: Manage schedule condition of the HDInsight cluster which enabled Schedule-based Autoscale.
+description: ''
+directCommands:
+- uid: az_hdinsight_autoscale_condition_create
+  name: az hdinsight autoscale condition create
+  summary: Add a new schedule condition.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition create --cluster-name
+                                            --days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}
+                                            --resource-group
+                                            --time
+                                            --workernode-count
+                                            [--no-wait]
+                                            [--subscription]
+  examples:
+  - summary: Add a new schedule condition.
+    syntax: >-
+      az hdinsight autoscale condition create --resource-group MyResourceGroup --cluster-name MyCluster \
+
+      --days Monday Tuesday --time 09:00 --workernode-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --time
+    summary: The 24-hour time in the form xx:xx in days.
+    description: ''
+  - isRequired: true
+    name: --workernode-count
+    summary: The schedule workernode count.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_delete
+  name: az hdinsight autoscale condition delete
+  summary: Delete schedule condition.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition delete --cluster-name
+                                            --index
+                                            --resource-group
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--yes]
+  examples:
+  - summary: Delete a schedule condition.
+    syntax: az hdinsight autoscale condition delete --resource-group MyResourceGroup --cluster-name MyCluster --index 0
+  - summary: Delete multiple schedule conditions.
+    syntax: az hdinsight autoscale condition delete --resource-group MyResourceGroup --cluster-name MyCluster --index 0 1
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: The Space-separated list of condition indices which starts with 0 to delete.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_list
+  name: az hdinsight autoscale condition list
+  summary: List all schedule conditions.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition list --cluster-name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
+  examples:
+  - summary: List all schedule conditions.
+    syntax: az hdinsight autoscale condition list --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_update
+  name: az hdinsight autoscale condition update
+  summary: Update a schedule condition.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition update --cluster-name
+                                            --index
+                                            --resource-group
+                                            [--days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}]
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--time]
+                                            [--workernode-count]
+  examples:
+  - summary: Update a schedule condition.
+    syntax: >-
+      az hdinsight autoscale condition update --resource-group MyResourceGroup --cluster-name MyCluster --index 0 \
+
+      --time 10:00 --workernode-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: The schedule condition index which starts with 0.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time
+    summary: The 24-hour time in the form xx:xx in days.
+    description: ''
+  - name: --workernode-count
+    summary: The schedule workernode count.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_wait
+  name: az hdinsight autoscale condition wait
+  summary: Place the CLI in a waiting state until an operation is complete.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition wait --name
+                                          --resource-group
+                                          [--created]
+                                          [--custom]
+                                          [--deleted]
+                                          [--exists]
+                                          [--interval]
+                                          [--subscription]
+                                          [--timeout]
+                                          [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+commands:
+- az_hdinsight_autoscale_condition_create
+- az_hdinsight_autoscale_condition_delete
+- az_hdinsight_autoscale_condition_list
+- az_hdinsight_autoscale_condition_update
+- az_hdinsight_autoscale_condition_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage schedule condition of the HDInsight cluster which enabled Schedule-based Autoscale.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight/host.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight/host.yml
new file mode 100644
index 0000000000..73871ea0d3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight/host.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_host
+name: az hdinsight host
+summary: Manage HDInsight cluster's virtual hosts.
+description: ''
+directCommands:
+- uid: az_hdinsight_host_list
+  name: az hdinsight host list
+  summary: List the hosts of the specified HDInsight cluster.
+  description: ''
+  syntax: >-
+    az hdinsight host list --cluster-name
+                           --resource-group
+                           [--query-examples]
+                           [--subscription]
+  examples:
+  - summary: List the hosts of the specified HDInsight cluster.
+    syntax: az hdinsight host list --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_host_restart
+  name: az hdinsight host restart
+  summary: Restart the specific hosts of the specified HDInsight cluster.
+  description: ''
+  syntax: >-
+    az hdinsight host restart --cluster-name
+                              --host-names
+                              --resource-group
+                              [--subscription]
+                              [--yes]
+  examples:
+  - summary: Restart the specific hosts of the specified HDInsight cluster.
+    syntax: az hdinsight host restart --resource-group MyResourceGroup --cluster-name MyCluster --host-names hostname1 hostname2
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --host-names
+    summary: A space-delimited list of host names that need to be restarted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+commands:
+- az_hdinsight_host_list
+- az_hdinsight_host_restart
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight cluster's virtual hosts.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight/monitor.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight/monitor.yml
index f1aea24ae4..05f0746b34 100644
--- a/2017-03-09-profile/docs-ref-autogen/hdinsight/monitor.yml
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight/monitor.yml
@@ -1,58 +1,56 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight_monitor
-  name: az hdinsight monitor
-  summary: Manage Azure Monitor logs integration on an HDInsight cluster.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_monitor_disable
-  - az_hdinsight_monitor_enable
-  - az_hdinsight_monitor_show
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_monitor
+name: az hdinsight monitor
+summary: Manage Azure Monitor logs integration on an HDInsight cluster.
+description: ''
+directCommands:
 - uid: az_hdinsight_monitor_disable
   name: az hdinsight monitor disable
   summary: Disable the Azure Monitor logs integration on an HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight monitor disable --name
+                                 --resource-group
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_monitor_enable
   name: az hdinsight monitor enable
   summary: Enable the Azure Monitor logs integration on an HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight monitor enable --name
+                                --resource-group
+                                --workspace
+                                [--no-validation-timeout]
+                                [--primary-key]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --workspace
     summary: The name, resource ID or workspace ID of Log Analytics workspace.
     description: ''
+  optionalParameters:
   - name: --no-validation-timeout
     summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
     description: ''
@@ -62,46 +60,37 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_monitor_show
   name: az hdinsight monitor show
   summary: Get the status of Azure Monitor logs integration on an HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight monitor show --name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_monitor_disable
-  name: az hdinsight monitor disable
-  summary: Disable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_enable
-  name: az hdinsight monitor enable
-  summary: Enable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_show
-  name: az hdinsight monitor show
-  summary: Get the status of Azure Monitor logs integration on an HDInsight cluster.
+- az_hdinsight_monitor_disable
+- az_hdinsight_monitor_enable
+- az_hdinsight_monitor_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -117,10 +106,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage Azure Monitor logs integration on an HDInsight cluster.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage Azure Monitor logs integration on an HDInsight cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/hdinsight/script-action.yml b/2017-03-09-profile/docs-ref-autogen/hdinsight/script-action.yml
index 41a9fd70fb..61be864f19 100644
--- a/2017-03-09-profile/docs-ref-autogen/hdinsight/script-action.yml
+++ b/2017-03-09-profile/docs-ref-autogen/hdinsight/script-action.yml
@@ -1,25 +1,19 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight_script_action
-  name: az hdinsight script-action
-  summary: Manage HDInsight script actions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_script_action_delete
-  - az_hdinsight_script_action_execute
-  - az_hdinsight_script_action_list
-  - az_hdinsight_script_action_list_execution_history
-  - az_hdinsight_script_action_promote
-  - az_hdinsight_script_action_show_execution_details
-- uid: az_hdinsight_script_action_delete
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_script-action
+name: az hdinsight script-action
+summary: Manage HDInsight script actions.
+description: ''
+directCommands:
+- uid: az_hdinsight_script-action_delete
   name: az hdinsight script-action delete
   summary: Deletes a specified persisted script action of the cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action delete --cluster-name
+                                      --name
+                                      --resource-group
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -30,37 +24,39 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_execute
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_execute
   name: az hdinsight script-action execute
   summary: Execute script actions on the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az hdinsight script-action execute --cluster-name
+                                       --name
+                                       --resource-group
+                                       --roles
+                                       --script-uri
+                                       [--persist-on-success]
+                                       [--script-parameters]
+                                       [--subscription]
   examples:
   - summary: Execute a script action and persist on success.
-    syntax:
-      content: >-
-        az hdinsight script-action execute -g MyResourceGroup -n MyScriptActionName \
+    syntax: >-
+      az hdinsight script-action execute -g MyResourceGroup -n MyScriptActionName \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxgiraphconfigactionv01/giraph-installer-v01.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxgiraphconfigactionv01/giraph-installer-v01.sh \
 
-        --roles headnode workernode \
+      --roles headnode workernode \
 
-        --persist-on-success
-  parameters:
+      --persist-on-success
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -71,7 +67,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --roles
@@ -81,6 +77,7 @@ items:
     name: --script-uri
     summary: The URI to the script.
     description: ''
+  optionalParameters:
   - name: --persist-on-success
     summary: If the scripts needs to be persisted.
     description: ''
@@ -90,67 +87,65 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_list
   name: az hdinsight script-action list
   summary: Lists all the persisted script actions for the specified cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action list --cluster-name
+                                    --resource-group
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_list_execution_history
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_list-execution-history
   name: az hdinsight script-action list-execution-history
   summary: Lists all scripts' execution history for the specified cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action list-execution-history --cluster-name
+                                                      --resource-group
+                                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_promote
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_promote
   name: az hdinsight script-action promote
   summary: Promotes the specified ad-hoc script execution to a persisted script.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action promote --cluster-name
+                                       --execution-id
+                                       --resource-group
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -161,24 +156,23 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_show_execution_details
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_show-execution-details
   name: az hdinsight script-action show-execution-details
   summary: Gets the script execution detail for the given script execution ID.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action show-execution-details --cluster-name
+                                                      --execution-id
+                                                      --resource-group
+                                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -189,36 +183,20 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_script_action_delete
-  name: az hdinsight script-action delete
-  summary: Deletes a specified persisted script action of the cluster.
-- uid: az_hdinsight_script_action_execute
-  name: az hdinsight script-action execute
-  summary: Execute script actions on the specified HDInsight cluster.
-- uid: az_hdinsight_script_action_list
-  name: az hdinsight script-action list
-  summary: Lists all the persisted script actions for the specified cluster.
-- uid: az_hdinsight_script_action_list_execution_history
-  name: az hdinsight script-action list-execution-history
-  summary: Lists all scripts' execution history for the specified cluster.
-- uid: az_hdinsight_script_action_promote
-  name: az hdinsight script-action promote
-  summary: Promotes the specified ad-hoc script execution to a persisted script.
-- uid: az_hdinsight_script_action_show_execution_details
-  name: az hdinsight script-action show-execution-details
-  summary: Gets the script execution detail for the given script execution ID.
+- az_hdinsight_script-action_delete
+- az_hdinsight_script-action_execute
+- az_hdinsight_script-action_list
+- az_hdinsight_script-action_list-execution-history
+- az_hdinsight_script-action_promote
+- az_hdinsight_script-action_show-execution-details
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -234,10 +212,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage HDInsight script actions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight script actions.
diff --git a/2017-03-09-profile/docs-ref-autogen/healthbot.yml b/2017-03-09-profile/docs-ref-autogen/healthbot.yml
new file mode 100644
index 0000000000..b59bbb074a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthbot.yml
@@ -0,0 +1,214 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthbot
+name: az healthbot
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthbot** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az healthbot** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage bot with healthbot.
+description: ''
+directCommands:
+- uid: az_healthbot_create
+  name: az healthbot create
+  summary: Create a new HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot create --bot-name
+                        --resource-group
+                        --sku {C0, F0, S1}
+                        [--location]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: BotCreate
+    syntax: az healthbot create --name "samplebotname" --location "East US" --sku "F0" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: C0, F0, S1
+    summary: The name of the HealthBot SKU.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthbot_delete
+  name: az healthbot delete
+  summary: Delete a HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot delete --bot-name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: BotDelete
+    syntax: az healthbot delete --name "samplebotname" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_healthbot_list
+  name: az healthbot list
+  summary: Returns all the resources of a particular type belonging to a resource group And Returns all the resources of a particular type belonging to a subscription.
+  description: ''
+  syntax: az healthbot list [--resource-group]
+  examples:
+  - summary: List Bots by Resource Group
+    syntax: az healthbot list --resource-group "OneResourceGroupName"
+  - summary: List Bots by Subscription
+    syntax: az healthbot list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_healthbot_show
+  name: az healthbot show
+  summary: Get a HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot show --bot-name
+                      --resource-group
+  examples:
+  - summary: ResourceInfoGet
+    syntax: az healthbot show --name "samplebotname" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_healthbot_update
+  name: az healthbot update
+  summary: Patch a HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot update --bot-name
+                        --resource-group
+                        [--sku {C0, F0, S1}]
+                        [--tags]
+  examples:
+  - summary: BotUpdate
+    syntax: az healthbot update --bot-name "samplebotname" --name "F0" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: C0, F0, S1
+    summary: The name of the HealthBot SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthbot_wait
+  name: az healthbot wait
+  summary: Place the CLI in a waiting state until a condition of the healthbot is met.
+  description: ''
+  syntax: >-
+    az healthbot wait --bot-name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the healthbot is successfully created.
+    syntax: az healthbot wait --name "samplebotname" --resource-group "healthbotClient" --created
+  - summary: Pause executing next line of CLI script until the healthbot is successfully deleted.
+    syntax: az healthbot wait --name "samplebotname" --resource-group "healthbotClient" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_healthbot_create
+- az_healthbot_delete
+- az_healthbot_list
+- az_healthbot_show
+- az_healthbot_update
+- az_healthbot_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage bot with healthbot.
diff --git a/2017-03-09-profile/docs-ref-autogen/healthcareapis.yml b/2017-03-09-profile/docs-ref-autogen/healthcareapis.yml
new file mode 100644
index 0000000000..493b29545c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthcareapis.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis
+name: az healthcareapis
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_healthcareapis_acr
+- az_healthcareapis_acr_add
+- az_healthcareapis_acr_list
+- az_healthcareapis_acr_remove
+- az_healthcareapis_acr_reset
+- az_healthcareapis_operation-result
+- az_healthcareapis_operation-result_show
+- az_healthcareapis_private-endpoint-connection
+- az_healthcareapis_private-endpoint-connection_create
+- az_healthcareapis_private-endpoint-connection_delete
+- az_healthcareapis_private-endpoint-connection_list
+- az_healthcareapis_private-endpoint-connection_show
+- az_healthcareapis_private-endpoint-connection_update
+- az_healthcareapis_private-endpoint-connection_wait
+- az_healthcareapis_private-link-resource
+- az_healthcareapis_private-link-resource_list
+- az_healthcareapis_private-link-resource_show
+- az_healthcareapis_service
+- az_healthcareapis_service_create
+- az_healthcareapis_service_delete
+- az_healthcareapis_service_list
+- az_healthcareapis_service_show
+- az_healthcareapis_service_update
+- az_healthcareapis_service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/healthcareapis/acr.yml b/2017-03-09-profile/docs-ref-autogen/healthcareapis/acr.yml
new file mode 100644
index 0000000000..326afade8a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthcareapis/acr.yml
@@ -0,0 +1,125 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_acr
+name: az healthcareapis acr
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis acr** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis acr.
+description: ''
+directCommands:
+- uid: az_healthcareapis_acr_add
+  name: az healthcareapis acr add
+  summary: Add a list of registries to the service, repeated ones will be ignored.
+  description: ''
+  syntax: >-
+    az healthcareapis acr add --resource-group
+                              --resource-name
+                              [--login-servers]
+  examples:
+  - summary: Acr_Add
+    syntax: az healthcareapis acr add --login-servers "test1.azurecr.io test2.azurecr.io test3.azurecr.io" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --login-servers
+    summary: The list of login servers that shallbe added to the service instance.
+    description: ''
+- uid: az_healthcareapis_acr_list
+  name: az healthcareapis acr list
+  summary: Lists all container registries associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis acr list --resource-group
+                               --resource-name
+  examples:
+  - summary: Acr_List
+    syntax: az healthcareapis acr list --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_acr_remove
+  name: az healthcareapis acr remove
+  summary: Remove a list of registries from the service, non-existing ones will be ignored.
+  description: ''
+  syntax: >-
+    az healthcareapis acr remove --resource-group
+                                 --resource-name
+                                 [--login-servers]
+  examples:
+  - summary: Acr_Remove
+    syntax: az healthcareapis acr remove --login-servers "test1.azurecr.io test2.azurecr.io"  --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --login-servers
+    summary: The list of login servers that shallbe removed from the service instance.
+    description: ''
+- uid: az_healthcareapis_acr_reset
+  name: az healthcareapis acr reset
+  summary: Reset the container registries associated with the service to a new list.
+  description: ''
+  syntax: >-
+    az healthcareapis acr reset --resource-group
+                                --resource-name
+                                [--login-servers]
+  examples:
+  - summary: Acr_Reset
+    syntax: az healthcareapis acr reset --login-servers "test1.azurecr.io" --resource-group "rgname" --resource-name "service1"
+  - summary: Acr_Reset_To_Empty
+    syntax: az healthcareapis acr reset --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --login-servers
+    summary: The list of login servers to substitute for the existing one.
+    description: ''
+commands:
+- az_healthcareapis_acr_add
+- az_healthcareapis_acr_list
+- az_healthcareapis_acr_remove
+- az_healthcareapis_acr_reset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis acr.
diff --git a/2017-03-09-profile/docs-ref-autogen/healthcareapis/operation-result.yml b/2017-03-09-profile/docs-ref-autogen/healthcareapis/operation-result.yml
new file mode 100644
index 0000000000..198ff65f42
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthcareapis/operation-result.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_operation-result
+name: az healthcareapis operation-result
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis operation-result** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis operation-result.
+description: ''
+directCommands:
+- uid: az_healthcareapis_operation-result_show
+  name: az healthcareapis operation-result show
+  summary: Get the operation result for a long running operation.
+  description: ''
+  syntax: >-
+    az healthcareapis operation-result show --location-name
+                                            --operation-result-id
+  examples:
+  - summary: Get operation result
+    syntax: az healthcareapis operation-result show --location-name "westus" --operation-result-id "exampleid"
+  requiredParameters:
+  - isRequired: true
+    name: --location-name
+    summary: The location of the operation.
+    description: ''
+  - isRequired: true
+    name: --operation-result-id
+    summary: The ID of the operation result to get.
+    description: ''
+commands:
+- az_healthcareapis_operation-result_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis operation-result.
diff --git a/2017-03-09-profile/docs-ref-autogen/healthcareapis/private-endpoint-connection.yml b/2017-03-09-profile/docs-ref-autogen/healthcareapis/private-endpoint-connection.yml
new file mode 100644
index 0000000000..3b077f3166
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthcareapis/private-endpoint-connection.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_private-endpoint-connection
+name: az healthcareapis private-endpoint-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis private-endpoint-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis private-endpoint-connection.
+description: ''
+directCommands:
+- uid: az_healthcareapis_private-endpoint-connection_create
+  name: az healthcareapis private-endpoint-connection create
+  summary: Update the state of the specified private endpoint connection associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection create --name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--no-wait]
+                                                         [--private-link-service-connection-state-actions-required]
+                                                         [--private-link-service-connection-state-description]
+                                                         [--private-link-service-connection-state-status {Approved, Pending, Rejected}]
+  examples:
+  - summary: PrivateEndpointConnection_CreateOrUpdate
+    syntax: az healthcareapis private-endpoint-connection create --name "myConnection" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-link-service-connection-state-actions-required
+    summary: A message indicating if changes on the service provider require any updates on the consumer.
+    description: ''
+  - name: --private-link-service-connection-state-description
+    summary: The reason for approval/rejection of the connection.
+    description: ''
+  - name: --private-link-service-connection-state-status
+    parameterValueGroup: Approved, Pending, Rejected
+    summary: Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_delete
+  name: az healthcareapis private-endpoint-connection delete
+  summary: Deletes a private endpoint connection.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection delete --name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--no-wait]
+                                                         [--yes]
+  examples:
+  - summary: PrivateEndpointConnections_Delete
+    syntax: az healthcareapis private-endpoint-connection delete --name "myConnection" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_list
+  name: az healthcareapis private-endpoint-connection list
+  summary: Lists all private endpoint connections for a service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection list --resource-group
+                                                       --resource-name
+  examples:
+  - summary: PrivateEndpointConnection_List
+    syntax: az healthcareapis private-endpoint-connection list --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_show
+  name: az healthcareapis private-endpoint-connection show
+  summary: Gets the specified private endpoint connection associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection show --name
+                                                       --resource-group
+                                                       --resource-name
+  examples:
+  - summary: PrivateEndpointConnection_GetConnection
+    syntax: az healthcareapis private-endpoint-connection show --name "myConnection" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_update
+  name: az healthcareapis private-endpoint-connection update
+  summary: Update the state of the specified private endpoint connection associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection update --name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--no-wait]
+                                                         [--private-link-service-connection-state-actions-required]
+                                                         [--private-link-service-connection-state-description]
+                                                         [--private-link-service-connection-state-status {Approved, Pending, Rejected}]
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-link-service-connection-state-actions-required
+    summary: A message indicating if changes on the service provider require any updates on the consumer.
+    description: ''
+  - name: --private-link-service-connection-state-description
+    summary: The reason for approval/rejection of the connection.
+    description: ''
+  - name: --private-link-service-connection-state-status
+    parameterValueGroup: Approved, Pending, Rejected
+    summary: Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_wait
+  name: az healthcareapis private-endpoint-connection wait
+  summary: Place the CLI in a waiting state until a condition of the healthcareapis private-endpoint-connection is met.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection wait --name
+                                                       --resource-group
+                                                       --resource-name
+                                                       [--created]
+                                                       [--custom]
+                                                       [--deleted]
+                                                       [--exists]
+                                                       [--interval]
+                                                       [--timeout]
+                                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the healthcareapis private-endpoint-connection is successfully created.
+    syntax: az healthcareapis private-endpoint-connection wait --name "myConnection" --resource-group "rgname" --resource-name "service1" --created
+  - summary: Pause executing next line of CLI script until the healthcareapis private-endpoint-connection is successfully updated.
+    syntax: az healthcareapis private-endpoint-connection wait --name "myConnection" --resource-group "rgname" --resource-name "service1" --updated
+  - summary: Pause executing next line of CLI script until the healthcareapis private-endpoint-connection is successfully deleted.
+    syntax: az healthcareapis private-endpoint-connection wait --name "myConnection" --resource-group "rgname" --resource-name "service1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_healthcareapis_private-endpoint-connection_create
+- az_healthcareapis_private-endpoint-connection_delete
+- az_healthcareapis_private-endpoint-connection_list
+- az_healthcareapis_private-endpoint-connection_show
+- az_healthcareapis_private-endpoint-connection_update
+- az_healthcareapis_private-endpoint-connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis private-endpoint-connection.
diff --git a/2017-03-09-profile/docs-ref-autogen/healthcareapis/private-link-resource.yml b/2017-03-09-profile/docs-ref-autogen/healthcareapis/private-link-resource.yml
new file mode 100644
index 0000000000..30c11b268d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthcareapis/private-link-resource.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_private-link-resource
+name: az healthcareapis private-link-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis private-link-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis private-link-resource.
+description: ''
+directCommands:
+- uid: az_healthcareapis_private-link-resource_list
+  name: az healthcareapis private-link-resource list
+  summary: Gets the private link resources that need to be created for a service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-link-resource list --resource-group
+                                                 --resource-name
+  examples:
+  - summary: PrivateLinkResources_ListGroupIds
+    syntax: az healthcareapis private-link-resource list --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_private-link-resource_show
+  name: az healthcareapis private-link-resource show
+  summary: Gets a private link resource that need to be created for a service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-link-resource show --group-name
+                                                 --resource-group
+                                                 --resource-name
+  examples:
+  - summary: PrivateLinkResources_Get
+    syntax: az healthcareapis private-link-resource show --group-name "fhir" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: The name of the private link resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+commands:
+- az_healthcareapis_private-link-resource_list
+- az_healthcareapis_private-link-resource_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis private-link-resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/healthcareapis/service.yml b/2017-03-09-profile/docs-ref-autogen/healthcareapis/service.yml
new file mode 100644
index 0000000000..a10c69f24e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/healthcareapis/service.yml
@@ -0,0 +1,305 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_service
+name: az healthcareapis service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis service.
+description: ''
+directCommands:
+- uid: az_healthcareapis_service_create
+  name: az healthcareapis service create
+  summary: Create the metadata of a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service create --kind {fhir, fhir-R4, fhir-Stu3}
+                                     --location
+                                     --resource-group
+                                     --resource-name
+                                     [--access-policies]
+                                     [--authentication-configuration]
+                                     [--cors-configuration]
+                                     [--cosmos-db-configuration]
+                                     [--etag]
+                                     [--export-configuration-storage-account-name]
+                                     [--identity-type {None, SystemAssigned}]
+                                     [--no-wait]
+                                     [--private-endpoint-connections]
+                                     [--public-network-access {Disabled, Enabled}]
+                                     [--tags]
+  examples:
+  - summary: Create or Update a service with all parameters
+    syntax: az healthcareapis service create --resource-group "rg1" --resource-name "service1" --identity-type "SystemAssigned" --kind "fhir-R4" --location "westus2" --access-policies object-id="c487e7d1-3210-41a3-8ccc-e9372b78da47" --access-policies object-id="5b307da8-43d4-492b-8b66-b0294ade872f" --authentication-configuration audience="https://azurehealthcareapis.com" authority="https://login.microsoftonline.com/abfde7b2-df0f-47e6-aabf-2462b07508dc" smart-proxy-enabled=true --cors-configuration allow-credentials=false headers="*" max-age=1440 methods="DELETE" methods="GET" methods="OPTIONS" methods="PATCH" methods="POST" methods="PUT" origins="*" --cosmos-db-configuration key-vault-key-uri="https://my-vault.vault.azure.net/keys/my-key" offer-throughput=1000 --export-configuration-storage-account-name "existingStorageAccount" --public-network-access "Disabled"
+  - summary: Create or Update a service with minimum parameters
+    syntax: az healthcareapis service create --resource-group "rg1" --resource-name "service2" --kind "fhir-R4" --location "westus2" --access-policies object-id="c487e7d1-3210-41a3-8ccc-e9372b78da47"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: fhir, fhir-R4, fhir-Stu3
+    summary: The kind of the service.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --access-policies
+    summary: The access policies of the service instance.
+    description: >-
+      Usage: --access-policies object-id=XX
+
+
+      object-id: Required. An Azure AD object ID (User or Apps) that is allowed access to the FHIR service.
+
+
+      Multiple actions can be specified by using more than one --access-policies argument.
+  - name: --authentication-configuration
+    summary: The authentication configuration for the service instance.
+    description: >-
+      Usage: --authentication-configuration authority=XX audience=XX smart-proxy-enabled=XX
+
+
+      authority: The authority url for the service
+
+      audience: The audience url for the service
+
+      smart-proxy-enabled: If the SMART on FHIR proxy is enabled.
+  - name: --cors-configuration
+    summary: The settings for the CORS configuration of the service instance.
+    description: >-
+      Usage: --cors-configuration origins=XX headers=XX methods=XX max-age=XX allow-credentials=XX
+
+
+      origins: The origins to be allowed via CORS.
+
+      headers: The headers to be allowed via CORS.
+
+      methods: The methods to be allowed via CORS.
+
+      max-age: The max age to be allowed via CORS.
+
+      allow-credentials: If credentials are allowed via CORS.
+  - name: --cosmos-db-configuration
+    summary: The settings for the Cosmos DB database backing the service.
+    description: >-
+      Usage: --cosmos-db-configuration offer-throughput=XX key-vault-key-uri=XX
+
+
+      offer-throughput: The provisioned throughput for the backing database.
+
+      key-vault-key-uri: The URI of the customer-managed key for the backing database.
+  - name: --etag
+    summary: An etag associated with the resource, used for optimistic concurrency when editing it.
+    description: ''
+  - name: --export-configuration-storage-account-name
+    summary: The name of the default export storage account.
+    description: ''
+  - name: --identity-type
+    parameterValueGroup: None, SystemAssigned
+    summary: Type of identity being specified, currently SystemAssigned and None are allowed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-endpoint-connections
+    summary: The list of private endpoint connections that are set up for this resource.
+    description: >-
+      Usage: --private-endpoint-connections status=XX description=XX actions-required=XX
+
+
+      status: Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+
+      description: The reason for approval/rejection of the connection.
+
+      actions-required: A message indicating if changes on the service provider require any updates on the consumer.
+
+
+      Multiple actions can be specified by using more than one --private-endpoint-connections argument.
+  - name: --public-network-access
+    parameterValueGroup: Disabled, Enabled
+    summary: Control permission for data plane traffic coming from public networks while private endpoint is enabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthcareapis_service_delete
+  name: az healthcareapis service delete
+  summary: Delete a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service delete --resource-group
+                                     --resource-name
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete service
+    syntax: az healthcareapis service delete --resource-group "rg1" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_healthcareapis_service_list
+  name: az healthcareapis service list
+  summary: Get all the service instances in a resource group. And Get all the service instances in a subscription.
+  description: ''
+  syntax: az healthcareapis service list [--resource-group]
+  examples:
+  - summary: List all services in resource group
+    syntax: az healthcareapis service list --resource-group "rgname"
+  - summary: List all services in subscription
+    syntax: az healthcareapis service list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_healthcareapis_service_show
+  name: az healthcareapis service show
+  summary: Get the metadata of a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service show --resource-group
+                                   --resource-name
+  examples:
+  - summary: Get metadata
+    syntax: az healthcareapis service show --resource-group "rg1" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_service_update
+  name: az healthcareapis service update
+  summary: Update the metadata of a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service update --resource-group
+                                     --resource-name
+                                     [--no-wait]
+                                     [--public-network-access {Disabled, Enabled}]
+                                     [--tags]
+  examples:
+  - summary: Patch service
+    syntax: az healthcareapis service update --resource-group "rg1" --resource-name "service1" --tags tag1="value1" tag2="value2"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --public-network-access
+    parameterValueGroup: Disabled, Enabled
+    summary: Control permission for data plane traffic coming from public networks while private endpoint is enabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthcareapis_service_wait
+  name: az healthcareapis service wait
+  summary: Place the CLI in a waiting state until a condition of the healthcareapis service is met.
+  description: ''
+  syntax: >-
+    az healthcareapis service wait --resource-group
+                                   --resource-name
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the healthcareapis service is successfully created.
+    syntax: az healthcareapis service wait --resource-group "rg1" --resource-name "service1" --created
+  - summary: Pause executing next line of CLI script until the healthcareapis service is successfully updated.
+    syntax: az healthcareapis service wait --resource-group "rg1" --resource-name "service1" --updated
+  - summary: Pause executing next line of CLI script until the healthcareapis service is successfully deleted.
+    syntax: az healthcareapis service wait --resource-group "rg1" --resource-name "service1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_healthcareapis_service_create
+- az_healthcareapis_service_delete
+- az_healthcareapis_service_list
+- az_healthcareapis_service_show
+- az_healthcareapis_service_update
+- az_healthcareapis_service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis service.
diff --git a/2017-03-09-profile/docs-ref-autogen/hpc-cache.yml b/2017-03-09-profile/docs-ref-autogen/hpc-cache.yml
new file mode 100644
index 0000000000..11b90cfe3a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hpc-cache.yml
@@ -0,0 +1,333 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache
+name: az hpc-cache
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache.
+description: ''
+directCommands:
+- uid: az_hpc-cache_create
+  name: az hpc-cache create
+  summary: Create or update a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache create --cache-size-gb
+                        --location
+                        --name
+                        --resource-group
+                        --sku-name
+                        --subnet
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Caches_CreateOrUpdate
+    syntax: az hpc-cache create --resource-group "scgroup" --name "sc1" --location "eastus" --cache-size-gb "3072" --subnet "/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.Network/virtualNetworks/{virtual_network_name}/subnets/{subnet_name}" --sku-name "Standard_2G"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-size-gb
+    summary: The size of this Cache, in GB.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku-name
+    summary: SKU name for this Cache.
+    description: ''
+  - isRequired: true
+    name: --subnet
+    summary: Subnet used for the Cache.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_hpc-cache_delete
+  name: az hpc-cache delete
+  summary: Schedule a Cache for deletion.
+  description: ''
+  syntax: >-
+    az hpc-cache delete --name
+                        --resource-group
+                        [--no-wait]
+  examples:
+  - summary: Caches_Delete
+    syntax: az hpc-cache delete --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_hpc-cache_flush
+  name: az hpc-cache flush
+  summary: Tell a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors returned until the flush is complete.
+  description: ''
+  syntax: >-
+    az hpc-cache flush --name
+                       --resource-group
+  examples:
+  - summary: Caches_Flush
+    syntax: az hpc-cache flush --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_list
+  name: az hpc-cache list
+  summary: Return all Caches the user has access to under a resource group.
+  description: ''
+  syntax: az hpc-cache list [--resource-group]
+  examples:
+  - summary: Caches_List
+    syntax: az hpc-cache list
+  - summary: Caches_ListByResourceGroup
+    syntax: az hpc-cache list --resource-group "scgroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_show
+  name: az hpc-cache show
+  summary: Return a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache show --name
+                      --resource-group
+  examples:
+  - summary: Caches_Get
+    syntax: az hpc-cache show --resource-group "scgroup" --name "sc1"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_start
+  name: az hpc-cache start
+  summary: Tell a Stopped state Cache to transition to Active state.
+  description: ''
+  syntax: >-
+    az hpc-cache start --name
+                       --resource-group
+                       [--no-wait]
+  examples:
+  - summary: Caches_Start
+    syntax: az hpc-cache start --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_hpc-cache_stop
+  name: az hpc-cache stop
+  summary: Tell an Active Cache to transition to Stopped state.
+  description: ''
+  syntax: >-
+    az hpc-cache stop --name
+                      --resource-group
+                      [--no-wait]
+  examples:
+  - summary: Caches_Stop
+    syntax: az hpc-cache stop --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_hpc-cache_update
+  name: az hpc-cache update
+  summary: Update a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache update --name
+                        --resource-group
+                        [--cache-size-gb]
+                        [--location]
+                        [--sku-name]
+                        [--subnet]
+                        [--tags]
+  examples:
+  - summary: Caches_Update
+    syntax: az hpc-cache update --resource-group "scgroup" --name "sc1" --tags "key=val"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cache-size-gb
+    summary: The size of this Cache, in GB.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku-name
+    summary: SKU name for this Cache.
+    description: ''
+  - name: --subnet
+    summary: Subnet used for the Cache.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_hpc-cache_upgrade-firmware
+  name: az hpc-cache upgrade-firmware
+  summary: Upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect.
+  description: ''
+  syntax: >-
+    az hpc-cache upgrade-firmware --name
+                                  --resource-group
+  examples:
+  - summary: Caches_UpgradeFirmware
+    syntax: az hpc-cache upgrade-firmware --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_wait
+  name: az hpc-cache wait
+  summary: Wait a hpc Cache to specified state.
+  description: ''
+  syntax: >-
+    az hpc-cache wait --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Caches_Wait
+    syntax: az hpc-cache wait --resource-group "scgroup" --name "sc" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_hpc-cache_blob-storage-target
+- az_hpc-cache_blob-storage-target_add
+- az_hpc-cache_blob-storage-target_update
+- az_hpc-cache_create
+- az_hpc-cache_delete
+- az_hpc-cache_flush
+- az_hpc-cache_list
+- az_hpc-cache_nfs-storage-target
+- az_hpc-cache_nfs-storage-target_add
+- az_hpc-cache_nfs-storage-target_update
+- az_hpc-cache_show
+- az_hpc-cache_skus
+- az_hpc-cache_skus_list
+- az_hpc-cache_start
+- az_hpc-cache_stop
+- az_hpc-cache_storage-target
+- az_hpc-cache_storage-target_list
+- az_hpc-cache_storage-target_remove
+- az_hpc-cache_storage-target_show
+- az_hpc-cache_update
+- az_hpc-cache_upgrade-firmware
+- az_hpc-cache_usage-model
+- az_hpc-cache_usage-model_list
+- az_hpc-cache_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache.
diff --git a/2017-03-09-profile/docs-ref-autogen/hpc-cache/blob-storage-target.yml b/2017-03-09-profile/docs-ref-autogen/hpc-cache/blob-storage-target.yml
new file mode 100644
index 0000000000..39aefd4b7a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hpc-cache/blob-storage-target.yml
@@ -0,0 +1,103 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_blob-storage-target
+name: az hpc-cache blob-storage-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache blob-storage-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to create hpc cache blob storage target.
+description: ''
+directCommands:
+- uid: az_hpc-cache_blob-storage-target_add
+  name: az hpc-cache blob-storage-target add
+  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache blob-storage-target add --cache-name
+                                         --container-name
+                                         --name
+                                         --resource-group
+                                         --storage-account
+                                         --virtual-namespace-path
+  examples:
+  - summary: StorageTargets_CreateOrUpdate
+    syntax: az hpc-cache blob-storage-target add --resource-group "scgroup" --cache-name "sc1" --name "st1" --storage-account "/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.Storage/storageAccounts/{acount_name}" --container-name "cn" --virtual-namespace-path "/test"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --container-name
+    summary: Name of target storage container.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-account
+    summary: Resource ID or Name of target storage account.
+    description: ''
+  - isRequired: true
+    name: --virtual-namespace-path -v
+    summary: Path to create for this storage target in the client-facing virtual filesystem.
+    description: ''
+- uid: az_hpc-cache_blob-storage-target_update
+  name: az hpc-cache blob-storage-target update
+  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache blob-storage-target update --cache-name
+                                            --name
+                                            --resource-group
+                                            [--container-name]
+                                            [--storage-account]
+                                            [--virtual-namespace-path]
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container-name
+    summary: Name of target storage container.
+    description: ''
+  - name: --storage-account
+    summary: Resource ID or Name of target storage account.
+    description: ''
+  - name: --virtual-namespace-path -v
+    summary: Path to create for this storage target in the client-facing virtual filesystem.
+    description: ''
+commands:
+- az_hpc-cache_blob-storage-target_add
+- az_hpc-cache_blob-storage-target_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to create hpc cache blob storage target.
diff --git a/2017-03-09-profile/docs-ref-autogen/hpc-cache/nfs-storage-target.yml b/2017-03-09-profile/docs-ref-autogen/hpc-cache/nfs-storage-target.yml
new file mode 100644
index 0000000000..51713b7209
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hpc-cache/nfs-storage-target.yml
@@ -0,0 +1,103 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_nfs-storage-target
+name: az hpc-cache nfs-storage-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache nfs-storage-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to create hpc cache nfs storage target.
+description: ''
+directCommands:
+- uid: az_hpc-cache_nfs-storage-target_add
+  name: az hpc-cache nfs-storage-target add
+  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache nfs-storage-target add --cache-name
+                                        --junction
+                                        --name
+                                        --nfs3-target
+                                        --nfs3-usage-model
+                                        --resource-group
+  examples:
+  - summary: StorageTargets_CreateOrUpdate
+    syntax: az hpc-cache nfs-storage-target add --resource-group "scgroup" --cache-name "sc1" --name "st1" --nfs3-target 10.7.0.24 --nfs3-usage-model WRITE_AROUND --junction namespace-path="/nt2" nfs-export="/export/a" target-path="/1" --junction namespace-path="/nt3" nfs-export="/export/b"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --junction
+    summary: 'List of Cache namespace junctions to target for namespace associations.The sub parameters contains: (1) --namespace-path: Namespace path on a Cache for a Storage Target (2) --nfs-export: NFS export where targetPath exists (3) --target-path(Optional): Path in Storage Target to which namespacePath points.'
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --nfs3-target
+    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
+    description: ''
+  - isRequired: true
+    name: --nfs3-usage-model
+    summary: Identify the primary usage model to be used for this Storage Target. You can use command `az hpc-cache usage-model list` to see the names of usage models. For more details about usage models, please refer to https://docs.microsoft.com/azure/hpc-cache/hpc-cache-add-storage?tabs=azure-cli#choose-a-usage-model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_nfs-storage-target_update
+  name: az hpc-cache nfs-storage-target update
+  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache nfs-storage-target update --cache-name
+                                           --name
+                                           --resource-group
+                                           [--junction]
+                                           [--nfs3-target]
+                                           [--nfs3-usage-model]
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --junction
+    summary: 'List of Cache namespace junctions to target for namespace associations.The sub parameters contains: (1) --namespace-path: Namespace path on a Cache for a Storage Target (2) --nfs-export: NFS export where targetPath exists (3) --target-path(Optional): Path in Storage Target to which namespacePath points.'
+    description: ''
+  - name: --nfs3-target
+    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
+    description: ''
+  - name: --nfs3-usage-model
+    summary: Identify the primary usage model to be used for this Storage Target. You can use command `az hpc-cache usage-model list` to see the names of usage models. For more details about usage models, please refer to https://docs.microsoft.com/azure/hpc-cache/hpc-cache-add-storage?tabs=azure-cli#choose-a-usage-model.
+    description: ''
+commands:
+- az_hpc-cache_nfs-storage-target_add
+- az_hpc-cache_nfs-storage-target_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to create hpc cache nfs storage target.
diff --git a/2017-03-09-profile/docs-ref-autogen/hpc-cache/skus.yml b/2017-03-09-profile/docs-ref-autogen/hpc-cache/skus.yml
new file mode 100644
index 0000000000..cf6c82c9a2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hpc-cache/skus.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_skus
+name: az hpc-cache skus
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache skus** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache skus.
+description: ''
+directCommands:
+- uid: az_hpc-cache_skus_list
+  name: az hpc-cache skus list
+  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
+  description: ''
+  syntax: az hpc-cache skus list
+  examples:
+  - summary: Skus_List
+    syntax: az hpc-cache skus list
+commands:
+- az_hpc-cache_skus_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache skus.
diff --git a/2017-03-09-profile/docs-ref-autogen/hpc-cache/storage-target.yml b/2017-03-09-profile/docs-ref-autogen/hpc-cache/storage-target.yml
new file mode 100644
index 0000000000..001b05afc7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hpc-cache/storage-target.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_storage-target
+name: az hpc-cache storage-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache storage-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache storage target.
+description: ''
+directCommands:
+- uid: az_hpc-cache_storage-target_list
+  name: az hpc-cache storage-target list
+  summary: Return a list of Storage Targets for the specified Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache storage-target list --cache-name
+                                     --resource-group
+  examples:
+  - summary: StorageTargets_List
+    syntax: az hpc-cache storage-target list --resource-group "scgroup" --cache-name "sc1"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_storage-target_remove
+  name: az hpc-cache storage-target remove
+  summary: Remove a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
+  description: ''
+  syntax: >-
+    az hpc-cache storage-target remove --cache-name
+                                       --name
+                                       --resource-group
+  examples:
+  - summary: StorageTargets_Delete
+    syntax: az hpc-cache storage-target remove --resource-group "scgroup" --cache-name "sc1" --name "st1"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_storage-target_show
+  name: az hpc-cache storage-target show
+  summary: Return a Storage Target from a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache storage-target show --cache-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: StorageTargets_Get
+    syntax: az hpc-cache storage-target show --resource-group "scgroup" --cache-name "sc1" --name "st1"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_hpc-cache_storage-target_list
+- az_hpc-cache_storage-target_remove
+- az_hpc-cache_storage-target_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache storage target.
diff --git a/2017-03-09-profile/docs-ref-autogen/hpc-cache/usage-model.yml b/2017-03-09-profile/docs-ref-autogen/hpc-cache/usage-model.yml
new file mode 100644
index 0000000000..79de9018b0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/hpc-cache/usage-model.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_usage-model
+name: az hpc-cache usage-model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache usage-model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache usage model.
+description: ''
+directCommands:
+- uid: az_hpc-cache_usage-model_list
+  name: az hpc-cache usage-model list
+  summary: Get the list of Cache Usage Models available to this subscription.
+  description: ''
+  syntax: az hpc-cache usage-model list
+  examples:
+  - summary: UsageModels_List
+    syntax: az hpc-cache usage-model list
+commands:
+- az_hpc-cache_usage-model_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache usage model.
diff --git a/2017-03-09-profile/docs-ref-autogen/image.yml b/2017-03-09-profile/docs-ref-autogen/image.yml
index 8a619845d0..402ed0f4a0 100644
--- a/2017-03-09-profile/docs-ref-autogen/image.yml
+++ b/2017-03-09-profile/docs-ref-autogen/image.yml
@@ -1,64 +1,106 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image
-  name: az image
-  summary: Manage custom virtual machine images.
+### YamlMime:AzureCLIGroup
+uid: az_image
+name: az image
+summary: Manage custom virtual machine images.
+description: ''
+directCommands:
+- uid: az_image_copy
+  name: az image copy
+  summary: Copy a managed image (or vm) to other regions. It requires the source disk to be available.
   description: ''
-  langs:
-  - azurecli
-  children: []
+  syntax: >-
+    az image copy --source-object-name
+                  --source-resource-group
+                  --target-location
+                  --target-resource-group
+                  [--cleanup]
+                  [--export-as-snapshot]
+                  [--parallel-degree]
+                  [--source-type {image, vm}]
+                  [--tags]
+                  [--target-name]
+                  [--target-subscription]
+                  [--temporary-resource-group-name]
+                  [--timeout]
+  examples:
+  - summary: Copy an image to several regions and cleanup at the end.
+    syntax: >-
+      az image copy --source-resource-group mySources-rg --source-object-name myImage \
+          --target-location uksouth northeurope --target-resource-group "images-repo-rg" --cleanup
+  - summary: Use an already generalized vm to create images in other regions.
+    syntax: >-
+      az image copy --source-resource-group mySources-rg --source-object-name myVm \
+          --source-type vm --target-location uksouth northeurope --target-resource-group "images-repo-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --source-object-name
+    summary: The name of the image or vm resource.
+    description: ''
+  - isRequired: true
+    name: --source-resource-group
+    summary: Name of the resource group of the source resource.
+    description: ''
+  - isRequired: true
+    name: --target-location
+    summary: Space separated location list to create the image in (e.g. westeurope etc.).
+    description: ''
+  - isRequired: true
+    name: --target-resource-group
+    summary: Name of the resource group to create images in.
+    description: ''
+  optionalParameters:
+  - name: --cleanup
+    summary: Include this switch to delete temporary resources upon completion.
+    description: ''
+  - name: --export-as-snapshot
+    summary: Include this switch to export the copies as snapshots instead of images.
+    description: ''
+  - name: --parallel-degree
+    defaultValue: "-1"
+    summary: Number of parallel copy operations.
+    description: ''
+  - name: --source-type
+    defaultValue: image
+    parameterValueGroup: image, vm
+    summary: Image or vm.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-name
+    summary: Name of the final image that will be created.
+    description: ''
+  - name: --target-subscription
+    summary: Name or ID of the subscription where the final image should be created.
+    description: ''
+  - name: --temporary-resource-group-name --temporary_resource_group_name
+    defaultValue: image-copy-rg
+    summary: Resource Group name where temporary storage account will be created. --temporary_resource_group_name will be deprecated in 0.2.7.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Time in seconds for the copy operation to finish. Increase this time if you are going to copy large images (disks) like 512GB or more.
+    description: ''
 commands:
-- uid: az_image_builder
-  name: az image builder
-  summary: Manage and build image builder templates.
-- uid: az_image_builder_create
-  name: az image builder create
-  summary: Create an image builder template.
-- uid: az_image_builder_customizer
-  name: az image builder customizer
-  summary: Manage image builder template customizers.
-- uid: az_image_builder_customizer_add
-  name: az image builder customizer add
-  summary: Add an image builder customizer to an image builder template.
-- uid: az_image_builder_customizer_clear
-  name: az image builder customizer clear
-  summary: Remove all image builder customizers from an image builder template.
-- uid: az_image_builder_customizer_remove
-  name: az image builder customizer remove
-  summary: Remove an image builder customizer from an image builder template.
-- uid: az_image_builder_delete
-  name: az image builder delete
-  summary: Delete image builder template.
-- uid: az_image_builder_list
-  name: az image builder list
-  summary: List image builder templates.
-- uid: az_image_builder_output
-  name: az image builder output
-  summary: Manage image builder template output distributors.
-- uid: az_image_builder_output_add
-  name: az image builder output add
-  summary: Add an image builder output distributor to an image builder template.
-- uid: az_image_builder_output_clear
-  name: az image builder output clear
-  summary: Remove all image builder output distributors from an image builder template.
-- uid: az_image_builder_output_remove
-  name: az image builder output remove
-  summary: Remove an image builder output distributor from an image builder template.
-- uid: az_image_builder_run
-  name: az image builder run
-  summary: Build an image builder template.
-- uid: az_image_builder_show
-  name: az image builder show
-  summary: Show an image builder template.
-- uid: az_image_builder_show_runs
-  name: az image builder show-runs
-  summary: Show an image builder template's run outputs.
-- uid: az_image_builder_update
-  name: az image builder update
-  summary: Update an image builder template.
-- uid: az_image_builder_wait
-  name: az image builder wait
-  summary: Place the CLI in a waiting state until a condition of the template is met.
+- az_image_builder
+- az_image_builder_cancel
+- az_image_builder_create
+- az_image_builder_customizer
+- az_image_builder_customizer_add
+- az_image_builder_customizer_clear
+- az_image_builder_customizer_remove
+- az_image_builder_delete
+- az_image_builder_list
+- az_image_builder_output
+- az_image_builder_output_add
+- az_image_builder_output_clear
+- az_image_builder_output_remove
+- az_image_builder_run
+- az_image_builder_show
+- az_image_builder_show-runs
+- az_image_builder_update
+- az_image_builder_wait
+- az_image_copy
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -74,4 +116,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage custom virtual machine images.
+metadata:
+  description: Manage custom virtual machine images.
diff --git a/2017-03-09-profile/docs-ref-autogen/image/builder.yml b/2017-03-09-profile/docs-ref-autogen/image/builder.yml
index 2bde5db12e..a1bd23eb33 100644
--- a/2017-03-09-profile/docs-ref-autogen/image/builder.yml
+++ b/2017-03-09-profile/docs-ref-autogen/image/builder.yml
@@ -1,136 +1,188 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image_builder
-  name: az image builder
-  summary: Manage and build image builder templates.
+### YamlMime:AzureCLIGroup
+uid: az_image_builder
+name: az image builder
+summary: Manage and build image builder templates.
+description: ''
+directCommands:
+- uid: az_image_builder_cancel
+  name: az image builder cancel
+  summary: Cancel the long running image build based on the image template.
   description: ''
-  langs:
-  - azurecli
-  children:
-  - az_image_builder_create
-  - az_image_builder_delete
-  - az_image_builder_list
-  - az_image_builder_run
-  - az_image_builder_show
-  - az_image_builder_show_runs
-  - az_image_builder_update
-  - az_image_builder_wait
+  syntax: >-
+    az image builder cancel [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+  examples:
+  - summary: Cancel an image build.
+    syntax: az image builder cancel -n mytemplate -g my-group
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the image template.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
 - uid: az_image_builder_create
   name: az image builder create
   summary: Create an image builder template.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder create --name
+                            --resource-group
+                            [--build-timeout]
+                            [--checksum]
+                            [--defer]
+                            [--identity]
+                            [--image-source]
+                            [--image-template]
+                            [--location]
+                            [--managed-image-destinations]
+                            [--no-wait]
+                            [--os-disk-size]
+                            [--scripts]
+                            [--shared-image-destinations]
+                            [--subnet]
+                            [--subscription]
+                            [--tags]
+                            [--vm-size]
+                            [--vnet]
   examples:
   - summary: Create an image builder template from an UbuntuLTS 18.04 image. Distribute it as a managed image and a shared image gallery image version
-    syntax:
-      content: >-
-        scripts="https://my-script-url.net/customize_script.sh"
+    syntax: >-
+      scripts="https://my-script-url.net/customize_script.sh"
 
-        imagesource="Canonical:UbuntuServer:18.04-LTS:18.04.201903060"
+      imagesource="Canonical:UbuntuServer:18.04-LTS:18.04.201903060"
 
 
-        az image builder create --image-source $imagesource -n mytemplate -g my-group \
-            --scripts $scripts --managed-image-destinations image_1=westus \
-            --shared-image-destinations my_shared_gallery/linux_image_def=westus,brazilsouth
+      az image builder create --image-source $imagesource -n mytemplate -g my-group \
+          --scripts $scripts --managed-image-destinations image_1=westus \
+          --shared-image-destinations my_shared_gallery/linux_image_def=westus,brazilsouth \
+          --identity myidentity
   - summary: Create an image builder template using an image template file.
-    syntax:
-      content: az image builder create -g my-group -n mytemplate --image-template filename
+    syntax: az image builder create -g my-group -n mytemplate --image-template filename
   - summary: "[Advanced] Create an image template with multiple customizers and distributors using the CLI's object cache via --defer. Supports features such as: customizer and output names, powershell exit codes, inline scripts, windows restart, file customizers, artifact tags and vhd output distributors."
-    syntax:
-      content: >-
-        script="https://my-script-url.com/customize_script.ps1"
+    syntax: >-
+      script="https://my-script-url.com/customize_script.ps1"
 
-        imagesource="MicrosoftWindowsServer:WindowsServer:2019-Datacenter:2019.0.20190214"
+      imagesource="MicrosoftWindowsServer:WindowsServer:2019-Datacenter:2019.0.20190214"
 
 
-        # create and update template object in local cli cache. Defers put request to ARM
+      # create and update template object in local cli cache. Defers put request to ARM
 
-        # Cache object ttl set via az configure.
+      # Cache object ttl set via az configure.
 
-        az image builder create --image-source $imagesource -n mytemplate \
-            -g my-group --scripts $script --defer
+      az image builder create --image-source $imagesource -n mytemplate \
+          -g my-group --scripts $script --identity myidentity --defer
 
-        # add customizers
+      # add customizers
 
-        az image builder customizer add -n mytemplate -g my-group  \
-            --customizer-name my-pwsh-script --exit-codes 0 1 --inline-script \
-            "mkdir c:\buildActions" "echo Azure-Image-Builder-Was-Here \
-             > c:\buildActions\Output.txt" --type powershell --defer
+      az image builder customizer add -n mytemplate -g my-group  \
+          --customizer-name my-pwsh-script --exit-codes 0 1 --inline-script \
+          "mkdir c:\buildActions" "echo Azure-Image-Builder-Was-Here \
+           > c:\buildActions\Output.txt" --type powershell --defer
 
-        az image builder customizer add -n mytemplate -g my-group \
-            --customizer-name my-file-customizer --type file \
-            --file-source "https://my-file-source.net/file.txt"  \
-            --dest-path "c:\buildArtifacts\file.txt" --defer
+      az image builder customizer add -n mytemplate -g my-group \
+          --customizer-name my-file-customizer --type file \
+          --file-source "https://my-file-source.net/file.txt"  \
+          --dest-path "c:\buildArtifacts\file.txt" --defer
 
-        # add distributors
+      # add distributors
 
-        az image builder output add -n mytemplate -g my-group --is-vhd \
-            --output-name my-win-image-vhd --artifact-tags "is_vhd=True" --defer
+      az image builder output add -n mytemplate -g my-group --is-vhd \
+          --output-name my-win-image-vhd --artifact-tags "is_vhd=True" --defer
 
-        az image builder output add -n mytemplate -g my-group \
-            --output-name my-win-image-managed --managed-image winImage \
-            --managed-image-location eastus \
-            --artifact-tags "is_vhd=False" --defer
+      az image builder output add -n mytemplate -g my-group \
+          --output-name my-win-image-managed --managed-image winImage \
+          --managed-image-location eastus \
+          --artifact-tags "is_vhd=False" --defer
 
-        # Stop deferring put request to ARM. Create the template from the object cache.
+      # Stop deferring put request to ARM. Create the template from the object cache.
 
-        # Cache object will be deleted.
+      # Cache object will be deleted.
 
-        az image builder update -n mytemplate -g my-group
-  parameters:
+      az image builder update -n mytemplate -g my-group
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the image template.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --build-timeout
     summary: The Maximum duration to wait while building the image template, in minutes. Default is 60.
     description: ''
+  - name: --checksum
+    summary: The SHA256 checksum of the Red Hat ISO image.
+    description: ''
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
+  - name: --identity
+    summary: List of user assigned identities (name or ID, space delimited) of the image template.
+    description: ''
+  - name: --image-source -i
+    summary: The base image to customize. Must be a valid platform image URN, platform image alias, Red Hat ISO image URI, managed image name/ID, or shared image version ID.
+    description: ''
+    valueFrom: az vm image list, az vm image show
   - name: --image-template
-    summary: 'Local path or URL to an image template file. When using --image-template, all other parameters are ignored except -g and -n. Reference: <a href="https://docs.microsoft.com/en-us/azure/virtual-machines/linux/image-builder-json">https://docs.microsoft.com/en-us/azure/virtual-machines/linux/image-builder-json</a>.'
+    summary: 'Local path or URL to an image template file. When using --image-template, all other parameters are ignored except -g and -n. Reference: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/image-builder-json.'
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-image-destinations
+    summary: Managed image output distributor information. Space-separated list of key-value pairs. E.g "image_1=westus2 image_2=westus". Each key is the name or resource ID of the managed image to be created. Each value is the location of the image.
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --os-disk-size
+    summary: Size of the OS disk in GB. Omit or specify 0 to use Azure's default OS disk size.
     description: ''
   - name: --scripts
     summary: "Space-separated list of shell or powershell scripts to customize the image with. Each script must be a publicly accessible URL. Infers type of script from file extension ('.sh' or'.ps1') or from source type. More more customizer options and flexibility, see: 'az image template customizer add'."
     description: ''
-  - name: --checksum
-    summary: The SHA256 checksum of the Red Hat ISO image.
-    description: ''
-  - name: --image-source -i
-    summary: The base image to customize. Must be a valid platform image URN, platform image alias, Red Hat ISO image URI, managed image name/ID, or shared image version ID.
-    description: ''
-    valueFrom: az vm image list, az vm image show
-  - name: --managed-image-destinations
-    summary: Managed image output distributor information. Space-separated list of key-value pairs. E.g "image_1=westus2 image_2=westus". Each key is the name or resource ID of the managed image to be created. Each value is the location of the image.
-    description: ''
   - name: --shared-image-destinations
     summary: Shared image gallery (sig) output distributor information. Space-separated list of key-value pairs. E.g "my_gallery_1/image_def_1=eastus,westus  my_gallery_2/image_def_2=uksouth,canadaeast,francesouth." Each key is the sig image definition ID or sig gallery name and sig image definition delimited by a "/". Each value is a comma-delimited list of replica locations.
     description: ''
+  - name: --subnet
+    summary: Name or ID of subnet to deploy the build virtual machine.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vm-size
+    summary: Size of the virtual machine used to build, customize and capture images. Omit or specify empty string to use the default (Standard_D1_v2).
+    description: ''
+  - name: --vnet
+    summary: Name of VNET to deploy the build virtual machine. You should only specify it when subnet is a name.
+    description: ''
 - uid: az_image_builder_delete
   name: az image builder delete
   summary: Delete image builder template.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder delete [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+  examples:
+  - summary: Delete image builder template. (autogenerated)
+    syntax: az image builder delete --name MyImageTemplate --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -138,7 +190,7 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -147,11 +199,16 @@ items:
   name: az image builder list
   summary: List image builder templates.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder list [--query-examples]
+                          [--resource-group]
+                          [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -160,31 +217,34 @@ items:
   name: az image builder run
   summary: Build an image builder template.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder run [--ids]
+                         [--name]
+                         [--no-wait]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Start a template build run and then wait for it to finish.
-    syntax:
-      content: >-
-        az image builder run -n mytemplate -g my-group --no-wait
+    syntax: >-
+      az image builder run -n mytemplate -g my-group --no-wait
 
 
-        az image builder wait -n mytemplate -g aibmdi \
-            --custom "lastRunStatus.runState!='running'"
+      az image builder wait -n mytemplate -g aibmdi \
+          --custom "lastRunStatus.runState!='running'"
 
-        az image builder show -n mytemplate -g my-group
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+      az image builder show -n mytemplate -g my-group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -193,54 +253,63 @@ items:
   name: az image builder show
   summary: Show an image builder template.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder show [--ids]
+                          [--name]
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Show an image builder template (autogenerated)
-    syntax:
-      content: az image builder show --name mytemplate  --resource-group my-group
-  parameters:
+    syntax: az image builder show --name mytemplate  --resource-group my-group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_image_builder_show_runs
+- uid: az_image_builder_show-runs
   name: az image builder show-runs
   summary: Show an image builder template's run outputs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder show-runs [--ids]
+                               [--name]
+                               [--output-name]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Run a template build run and then view its run outputs.
-    syntax:
-      content: >-
-        az image builder run -n mytemplate -g my-group --no-wait
+    syntax: >-
+      az image builder run -n mytemplate -g my-group --no-wait
 
 
-        az image builder wait -n mytemplate -g aibmdi \
-            --custom "lastRunStatus.runState!='running'"
+      az image builder wait -n mytemplate -g aibmdi \
+          --custom "lastRunStatus.runState!='running'"
 
-        az image builder show-runs -n mytemplate -g my-group
-  parameters:
-  - name: --output-name
-    summary: Name of the image builder run output.
-    description: ''
+      az image builder show-runs -n mytemplate -g my-group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
+  - name: --output-name
+    summary: Name of the image builder run output.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -249,85 +318,89 @@ items:
   name: az image builder update
   summary: Update an image builder template.
   description: Updating an image builder templates is currently unsupported. This command can be used in conjunction with --defer to update an image template object within the CLI cache. Without --defer it retrieves the specified image template from the cache and sends a request to Azure to create the image template.
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder update [--add]
+                            [--defer]
+                            [--force-string]
+                            [--ids]
+                            [--name]
+                            [--remove]
+                            [--resource-group]
+                            [--set]
+                            [--subscription]
   examples:
   - summary: Create a template resource from a template object in the cli cache.
-    syntax:
-      content: >-
-        # create and write template object to local cli cache
+    syntax: >-
+      # create and write template object to local cli cache
 
-        az image builder create --image-source {image_source} -n mytemplate -g my-group \
-            --scripts {script} --managed-image-destinations image_1=westus --defer
+      az image builder create --image-source {image_source} -n mytemplate -g my-group \
+          --scripts {script} --managed-image-destinations image_1=westus --identity myidentity --defer
 
-        # add customizers and outputs to local cache template object via az image template output / customizer add
+      # add customizers and outputs to local cache template object via az image template output / customizer add
 
-        # one can also update cache object properties through generic update options, such as: --set
+      # one can also update cache object properties through generic update options, such as: --set
 
-        az image builder output add -n mytemplate -g my-group --output-name my-win-image-managed \
-            --artifact-tags "is_vhd=False"  --managed-image winImage --managed-image-location eastus --defer
+      az image builder output add -n mytemplate -g my-group --output-name my-win-image-managed \
+          --artifact-tags "is_vhd=False"  --managed-image winImage --managed-image-location eastus --defer
 
-        # send template create request to azure to create template resource
+      # send template create request to azure to create template resource
 
-        az image builder update -n mytemplate -g my-group
-  parameters:
+      az image builder update -n mytemplate -g my-group
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
 - uid: az_image_builder_wait
   name: az image builder wait
   summary: Place the CLI in a waiting state until a condition of the template is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder wait [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--ids]
+                          [--interval]
+                          [--name]
+                          [--resource-group]
+                          [--subscription]
+                          [--timeout]
+                          [--updated]
   examples:
   - summary: Start a template build run and then wait for it to finish.
-    syntax:
-      content: >-
-        az image builder run -n mytemplate -g my-group --no-wait
+    syntax: >-
+      az image builder run -n mytemplate -g my-group --no-wait
 
 
-        az image builder wait -n mytemplate -g aibmdi \
-            --custom "lastRunStatus.runState!='running'"
+      az image builder wait -n mytemplate -g aibmdi \
+          --custom "lastRunStatus.runState!='running'"
 
-        az image builder show -n mytemplate -g my-group
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the image template.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+      az image builder show -n mytemplate -g my-group
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -340,10 +413,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The name of the image template.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -352,54 +437,23 @@ items:
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
 commands:
-- uid: az_image_builder_create
-  name: az image builder create
-  summary: Create an image builder template.
-- uid: az_image_builder_customizer
-  name: az image builder customizer
-  summary: Manage image builder template customizers.
-- uid: az_image_builder_customizer_add
-  name: az image builder customizer add
-  summary: Add an image builder customizer to an image builder template.
-- uid: az_image_builder_customizer_clear
-  name: az image builder customizer clear
-  summary: Remove all image builder customizers from an image builder template.
-- uid: az_image_builder_customizer_remove
-  name: az image builder customizer remove
-  summary: Remove an image builder customizer from an image builder template.
-- uid: az_image_builder_delete
-  name: az image builder delete
-  summary: Delete image builder template.
-- uid: az_image_builder_list
-  name: az image builder list
-  summary: List image builder templates.
-- uid: az_image_builder_output
-  name: az image builder output
-  summary: Manage image builder template output distributors.
-- uid: az_image_builder_output_add
-  name: az image builder output add
-  summary: Add an image builder output distributor to an image builder template.
-- uid: az_image_builder_output_clear
-  name: az image builder output clear
-  summary: Remove all image builder output distributors from an image builder template.
-- uid: az_image_builder_output_remove
-  name: az image builder output remove
-  summary: Remove an image builder output distributor from an image builder template.
-- uid: az_image_builder_run
-  name: az image builder run
-  summary: Build an image builder template.
-- uid: az_image_builder_show
-  name: az image builder show
-  summary: Show an image builder template.
-- uid: az_image_builder_show_runs
-  name: az image builder show-runs
-  summary: Show an image builder template's run outputs.
-- uid: az_image_builder_update
-  name: az image builder update
-  summary: Update an image builder template.
-- uid: az_image_builder_wait
-  name: az image builder wait
-  summary: Place the CLI in a waiting state until a condition of the template is met.
+- az_image_builder_cancel
+- az_image_builder_create
+- az_image_builder_customizer
+- az_image_builder_customizer_add
+- az_image_builder_customizer_clear
+- az_image_builder_customizer_remove
+- az_image_builder_delete
+- az_image_builder_list
+- az_image_builder_output
+- az_image_builder_output_add
+- az_image_builder_output_clear
+- az_image_builder_output_remove
+- az_image_builder_run
+- az_image_builder_show
+- az_image_builder_show-runs
+- az_image_builder_update
+- az_image_builder_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -415,4 +469,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and build image builder templates.
+metadata:
+  description: Manage and build image builder templates.
diff --git a/2017-03-09-profile/docs-ref-autogen/image/builder/customizer.yml b/2017-03-09-profile/docs-ref-autogen/image/builder/customizer.yml
index be9f39532b..cf3024394e 100644
--- a/2017-03-09-profile/docs-ref-autogen/image/builder/customizer.yml
+++ b/2017-03-09-profile/docs-ref-autogen/image/builder/customizer.yml
@@ -1,84 +1,92 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image_builder_customizer
-  name: az image builder customizer
-  summary: Manage image builder template customizers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_image_builder_customizer_add
-  - az_image_builder_customizer_clear
-  - az_image_builder_customizer_remove
+### YamlMime:AzureCLIGroup
+uid: az_image_builder_customizer
+name: az image builder customizer
+summary: Manage image builder template customizers.
+description: ''
+directCommands:
 - uid: az_image_builder_customizer_add
   name: az image builder customizer add
   summary: Add an image builder customizer to an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder customizer add --customizer-name
+                                    --type {file, powershell, shell, windows-restart, windows-update}
+                                    [--defer]
+                                    [--dest-path]
+                                    [--exit-codes]
+                                    [--file-source]
+                                    [--filters]
+                                    [--ids]
+                                    [--inline-script]
+                                    [--name]
+                                    [--resource-group]
+                                    [--restart-check-command]
+                                    [--restart-command]
+                                    [--restart-timeout]
+                                    [--script-url]
+                                    [--search-criteria]
+                                    [--subscription]
+                                    [--update-limit]
   examples:
   - summary: Add an inline shell customizer to an image template in the cli object cache
-    syntax:
-      content: >-
-        az image builder customizer add -n mytemplate -g my-group \
-            --inline-script "sudo mkdir /buildArtifacts" \
-                            "sudo cp /tmp/index.html /buildArtifacts/index.html" \
-            --customizer-name shell-script-inline --type shell --defer
+    syntax: >-
+      az image builder customizer add -n mytemplate -g my-group \
+          --inline-script "sudo mkdir /buildArtifacts" \
+                          "sudo cp /tmp/index.html /buildArtifacts/index.html" \
+          --customizer-name shell-script-inline --type shell --defer
   - summary: Add a file customizer to an image template in the cli object cache
-    syntax:
-      content: >-
-        az image builder customizer add -n mytemplate -g my-group \
-            --customizer-name my-file --type file \
-            --file-source "https://my-remote-file.html" --dest-path "/tmp/index.html" --defer
+    syntax: >-
+      az image builder customizer add -n mytemplate -g my-group \
+          --customizer-name my-file --type file \
+          --file-source "https://my-remote-file.html" --dest-path "/tmp/index.html" --defer
   - summary: Add a windows restart customizer to an image template in the cli object cache
-    syntax:
-      content: >-
-        az image builder customizer add -n mytemplate -g my-group \
+    syntax: >-
+      az image builder customizer add -n mytemplate -g my-group \
 
-        --customizer-name shell-script-url \
+      --customizer-name shell-script-url \
 
-        --restart-check-command "echo Azure-Image-Builder-Restarted-the-VM  > \
-                                c:\buildArtifacts\restart.txt" \
-            --type windows-restart --restart-timeout 10m --defer
-  parameters:
+      --restart-check-command "echo Azure-Image-Builder-Restarted-the-VM  > \
+                              c:\buildArtifacts\restart.txt" \
+          --type windows-restart --restart-timeout 10m --defer
+  - summary: Add a windows update customizer to an image template in the cli object cache.
+    syntax: az image builder customizer add -n mytemplate -g my-group --customizer-name win_update --type windows-update --search-criteria IsInstalled=0 --filters "exclude:\$_.Title -like \'*Preview*\'" "include:\$true" --update-limit 20 --defer
+  requiredParameters:
   - isRequired: true
     name: --customizer-name
     summary: Name of the customizer.
     description: ''
   - isRequired: true
     name: --type -t
-    parameterValueGroup: file, powershell, shell, windows-restart
+    parameterValueGroup: file, powershell, shell, windows-restart, windows-update
     summary: Type of customizer to be added to the image template.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the image template.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
   - name: --dest-path
     summary: The absolute destination path where the file specified in --file-source will be downloaded to in the image.
     description: ''
+  - name: --exit-codes -e
+    summary: Space-separated list of valid exit codes, as integers.
+    description: ''
   - name: --file-source
     summary: The URI of the file to be downloaded into the image. It can be a github link, SAS URI for Azure Storage, etc.
     description: ''
-  - name: --exit-codes -e
-    summary: Space-separated list of valid exit codes, as integers.
+  - name: --filters
+    summary: Space delimited filters to select updates to apply. Omit or specify empty array to use the default (no filter).
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --inline-script
     summary: Space-separated list of inline script lines to customize the image with.
     description: ''
-  - name: --script-url
-    summary: URL of script to customize the image with. The URL must be publicly accessible.
+  - name: --name -n
+    summary: The name of the image template.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --restart-check-command
     summary: Command to verify that restart succeeded.
@@ -90,13 +98,29 @@ items:
     defaultValue: 5m
     summary: Restart timeout specified as a string consisting of a magnitude and unit, e.g. '5m' (5 minutes) or '2h' (2 hours).
     description: ''
+  - name: --script-url
+    summary: URL of script to customize the image with. The URL must be publicly accessible.
+    description: ''
+  - name: --search-criteria
+    summary: Criteria to search updates. Omit or specify empty string to use the default (search all). Refer to above link for examples and detailed description of this field.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --update-limit
+    summary: Maximum number of updates to apply at a time. Omit or specify 0 to use the default (1000).
+    description: ''
 - uid: az_image_builder_customizer_clear
   name: az image builder customizer clear
   summary: Remove all image builder customizers from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder customizer clear [--defer]
+                                      [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -107,7 +131,7 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -116,13 +140,19 @@ items:
   name: az image builder customizer remove
   summary: Remove an image builder customizer from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder customizer remove --customizer-name
+                                       [--defer]
+                                       [--ids]
+                                       [--name]
+                                       [--resource-group]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --customizer-name
     summary: Name of the customizer.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -133,21 +163,15 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_image_builder_customizer_add
-  name: az image builder customizer add
-  summary: Add an image builder customizer to an image builder template.
-- uid: az_image_builder_customizer_clear
-  name: az image builder customizer clear
-  summary: Remove all image builder customizers from an image builder template.
-- uid: az_image_builder_customizer_remove
-  name: az image builder customizer remove
-  summary: Remove an image builder customizer from an image builder template.
+- az_image_builder_customizer_add
+- az_image_builder_customizer_clear
+- az_image_builder_customizer_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -163,4 +187,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage image builder template customizers.
+metadata:
+  description: Manage image builder template customizers.
diff --git a/2017-03-09-profile/docs-ref-autogen/image/builder/output.yml b/2017-03-09-profile/docs-ref-autogen/image/builder/output.yml
index a118ef0666..57b90f5e81 100644
--- a/2017-03-09-profile/docs-ref-autogen/image/builder/output.yml
+++ b/2017-03-09-profile/docs-ref-autogen/image/builder/output.yml
@@ -1,59 +1,62 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image_builder_output
-  name: az image builder output
-  summary: Manage image builder template output distributors.
-  description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
-  langs:
-  - azurecli
-  children:
-  - az_image_builder_output_add
-  - az_image_builder_output_clear
-  - az_image_builder_output_remove
+### YamlMime:AzureCLIGroup
+uid: az_image_builder_output
+name: az image builder output
+summary: Manage image builder template output distributors.
+description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
+directCommands:
 - uid: az_image_builder_output_add
   name: az image builder output add
   summary: Add an image builder output distributor to an image builder template.
   description: Must be used with --defer. The output distributor can be a managed image, a gallery image, or as a VHD blob.
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder output add [--artifact-tags]
+                                [--defer]
+                                [--gallery-image-definition]
+                                [--gallery-name]
+                                [--gallery-replication-regions]
+                                [--ids]
+                                [--is-vhd]
+                                [--managed-image]
+                                [--managed-image-location]
+                                [--name]
+                                [--output-name]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Add a managed image distributor to an image template in the cli object cache. Specify a run output name.
-    syntax:
-      content: >-
-        az image builder output add -n mytemplate -g my-group \
-            --managed-image my_desired_image_name --output-name managed_image_run_01 --defer
+    syntax: >-
+      az image builder output add -n mytemplate -g my-group \
+          --managed-image my_desired_image_name --output-name managed_image_run_01 --defer
   - summary: Add a shared image gallery distributor to an image template in the cli object cache. Specify its replication regions.
-    syntax:
-      content: >-
-        az image builder output add -n mytemplate -g my-group --gallery-name my_shared_gallery \
-            --gallery-replication-regions westus brazilsouth \
-            --gallery-image-definition linux_image_def --defer
+    syntax: >-
+      az image builder output add -n mytemplate -g my-group --gallery-name my_shared_gallery \
+          --gallery-replication-regions westus brazilsouth \
+          --gallery-image-definition linux_image_def --defer
   - summary: Add a VHD distributor to an image template in the cli object cache.
-    syntax:
-      content: >-
-        az image builder output add -n mytemplate -g my-group \
-            --output-name my_vhd_image --is-vhd  --defer
-  parameters:
+    syntax: >-
+      az image builder output add -n mytemplate -g my-group \
+          --output-name my_vhd_image --is-vhd  --defer
+  optionalParameters:
   - name: --artifact-tags
     summary: 'Tags that will be applied to the output artifact once it has been created by the distributor. space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
-  - name: --output-name
-    summary: Name of the image builder run output. Defaults to the name of the managed image or sig image definition.
+  - name: --gallery-image-definition
+    summary: Name or ID of the existing SIG image definition to create the customized image version with.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+  - name: --gallery-name
+    summary: Shared image gallery name, if image definition name and not ID was provided.
     description: ''
-  - name: --name -n
-    summary: The name of the image template.
+  - name: --gallery-replication-regions
+    summary: Space-separated list of regions to replicate the image version into. Defaults to resource group's location.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --is-vhd
+    summary: The output is a VHD distributor.
     description: ''
   - name: --managed-image
     summary: Name or ID of the customized managed image to be created.
@@ -61,25 +64,29 @@ items:
   - name: --managed-image-location
     summary: Location where the customized image will be created. Defaults to resource group's location.
     description: ''
-  - name: --gallery-image-definition
-    summary: Name or ID of the existing SIG image definition to create the customized image version with.
+  - name: --name -n
+    summary: The name of the image template.
     description: ''
-  - name: --gallery-name
-    summary: Shared image gallery name, if image definition name and not ID was provided.
+  - name: --output-name
+    summary: Name of the image builder run output. Defaults to the name of the managed image or sig image definition.
     description: ''
-  - name: --gallery-replication-regions
-    summary: Space-separated list of regions to replicate the image version into. Defaults to resource group's location.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --is-vhd
-    summary: The output is a VHD distributor.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_image_builder_output_clear
   name: az image builder output clear
   summary: Remove all image builder output distributors from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder output clear [--defer]
+                                  [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -90,7 +97,7 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -99,13 +106,19 @@ items:
   name: az image builder output remove
   summary: Remove an image builder output distributor from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder output remove --output-name
+                                   [--defer]
+                                   [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --output-name
     summary: Name of the image builder run output.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -116,21 +129,15 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_image_builder_output_add
-  name: az image builder output add
-  summary: Add an image builder output distributor to an image builder template.
-- uid: az_image_builder_output_clear
-  name: az image builder output clear
-  summary: Remove all image builder output distributors from an image builder template.
-- uid: az_image_builder_output_remove
-  name: az image builder output remove
-  summary: Remove an image builder output distributor from an image builder template.
+- az_image_builder_output_add
+- az_image_builder_output_clear
+- az_image_builder_output_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -146,4 +153,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
+metadata:
+  description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
diff --git a/2017-03-09-profile/docs-ref-autogen/import-export.yml b/2017-03-09-profile/docs-ref-autogen/import-export.yml
new file mode 100644
index 0000000000..ea5f3ce3b9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/import-export.yml
@@ -0,0 +1,266 @@
+### YamlMime:AzureCLIGroup
+uid: az_import-export
+name: az import-export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **import-export** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az import-export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Import Export.
+description: ''
+directCommands:
+- uid: az_import-export_create
+  name: az import-export create
+  summary: Creates a new job or updates an existing job in the specified subscription.
+  description: ''
+  syntax: >-
+    az import-export create --name
+                            --resource-group
+                            [--backup-drive-manifest {false, true}]
+                            [--cancel-requested {false, true}]
+                            [--client-tenant-id]
+                            [--delivery-package]
+                            [--diagnostics-path]
+                            [--drive-list]
+                            [--export]
+                            [--incomplete-blob-list-uri]
+                            [--location]
+                            [--log-level]
+                            [--percent-complete]
+                            [--return-address]
+                            [--return-package]
+                            [--return-shipping]
+                            [--shipping-information]
+                            [--state]
+                            [--storage-account]
+                            [--tags]
+                            [--type]
+  examples:
+  - summary: Create an import job
+    syntax: >-
+      az import-export create --resource-group "myResourceGroup" --name "myJob"
+
+      --location "West US" --backup-drive-manifest true --diagnostics-path "waimportexport"
+
+      --drive-list bit-locker-key=238810-662376-448998-450120-652806-203390-606320-483076
+
+      drive-header-hash= drive-id=9CA995BB manifest-file=\\DriveManifest.xml
+
+      manifest-hash=109B21108597EF36D5785F08303F3638 --type "Import" --log-level "Verbose"
+
+      --return-address city=Redmond country-or-region=USA email=Test@contoso.com phone=4250000000
+
+      postal-code=98007 recipient-name=Tests state-or-province=wa street-address1=Street1
+
+      street-address2=street2 --storage-account "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-\
+
+      xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-drive-manifest
+    parameterValueGroup: false, true
+    summary: Default value is false. Indicates whether the manifest files on the drives should be copied to block blobs.
+    description: ''
+  - name: --cancel-requested
+    parameterValueGroup: false, true
+    summary: Indicates whether a request has been submitted to cancel the job.
+    description: ''
+  - name: --client-tenant-id
+    summary: The tenant ID of the client making the request.
+    description: ''
+  - name: --delivery-package
+    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
+    description: ''
+  - name: --diagnostics-path
+    summary: The virtual blob directory to which the copy logs and backups of drive manifest files (if enabled) will be stored.
+    description: ''
+  - name: --drive-list
+    summary: List of up to ten drives that comprise the job. The drive list is a required element for an import job; it is not specified for export jobs.
+    description: ''
+  - name: --export
+    summary: A property containing information about the blobs to be exported for an export job. This property is required for export jobs, but must not be specified for import jobs.
+    description: ''
+  - name: --incomplete-blob-list-uri
+    summary: A blob path that points to a block blob containing a list of blob names that were not exported due to insufficient drive space. If all blobs were exported successfully, then this element is not included in the response.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-level
+    summary: Default value is Error. Indicates whether error logging or verbose logging will be enabled.
+    description: ''
+  - name: --percent-complete
+    summary: Overall percentage completed for the job.
+    description: ''
+  - name: --return-address
+    summary: Specifies the return address information for the job.
+    description: ''
+  - name: --return-package
+    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
+    description: ''
+  - name: --return-shipping
+    summary: Specifies the return carrier and customer's account with the carrier.
+    description: ''
+  - name: --shipping-information
+    summary: Contains information about the Microsoft datacenter to which the drives should be shipped.
+    description: ''
+  - name: --state
+    summary: Current state of the job.
+    description: ''
+  - name: --storage-account
+    summary: Name or ID of the storage account where data will be imported to or exported from.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: The type of job.
+    description: ''
+- uid: az_import-export_delete
+  name: az import-export delete
+  summary: Deletes an existing job. Only jobs in the Creating or Completed states can be deleted.
+  description: ''
+  syntax: >-
+    az import-export delete --name
+                            --resource-group
+  examples:
+  - summary: Delete job
+    syntax: az import-export delete --resource-group "myResourceGroup" --name "myJob"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_import-export_list
+  name: az import-export list
+  summary: Returns all active and completed jobs in a subscription.
+  description: ''
+  syntax: az import-export list [--resource-group]
+  examples:
+  - summary: List jobs in a resource group
+    syntax: az import-export list --resource-group "myResourceGroup"
+  - summary: List jobs in current subscription
+    syntax: az import-export list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_import-export_show
+  name: az import-export show
+  summary: Gets information about an existing job.
+  description: ''
+  syntax: >-
+    az import-export show --name
+                          --resource-group
+  examples:
+  - summary: Get job
+    syntax: az import-export show --resource-group "myResourceGroup" --name "myJob"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_import-export_update
+  name: az import-export update
+  summary: Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.
+  description: ''
+  syntax: >-
+    az import-export update --name
+                            --resource-group
+                            [--backup-drive-manifest {false, true}]
+                            [--cancel-requested {false, true}]
+                            [--delivery-package]
+                            [--drive-list]
+                            [--log-level]
+                            [--return-address]
+                            [--return-shipping]
+                            [--state]
+                            [--tags]
+  examples:
+  - summary: Update job
+    syntax: >-
+      az import-export update --resource-group "myResourceGroup" --name "myJob"
+
+      --backup-drive-manifest true --log-level "Verbose" --state ""
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-drive-manifest
+    parameterValueGroup: false, true
+    summary: Indicates whether the manifest files on the drives should be copied to block blobs.
+    description: ''
+  - name: --cancel-requested
+    parameterValueGroup: false, true
+    summary: If specified, the value must be true. The service will attempt to cancel the job.
+    description: ''
+  - name: --delivery-package
+    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
+    description: ''
+  - name: --drive-list
+    summary: List of drives that comprise the job.
+    description: ''
+  - name: --log-level
+    summary: Indicates whether error logging or verbose logging is enabled.
+    description: ''
+  - name: --return-address
+    summary: Specifies the return address information for the job.
+    description: ''
+  - name: --return-shipping
+    summary: Specifies the return carrier and customer's account with the carrier.
+    description: ''
+  - name: --state
+    summary: If specified, the value must be Shipping, which tells the Import/Export service that the package for the job has been shipped. The ReturnAddress and DeliveryPackage properties must have been set either in this request or in a previous request, otherwise the request will fail.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_import-export_bit-locker-key
+- az_import-export_bit-locker-key_list
+- az_import-export_create
+- az_import-export_delete
+- az_import-export_list
+- az_import-export_location
+- az_import-export_location_list
+- az_import-export_location_show
+- az_import-export_show
+- az_import-export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Import Export.
diff --git a/2017-03-09-profile/docs-ref-autogen/import-export/bit-locker-key.yml b/2017-03-09-profile/docs-ref-autogen/import-export/bit-locker-key.yml
new file mode 100644
index 0000000000..a349965c29
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/import-export/bit-locker-key.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_import-export_bit-locker-key
+name: az import-export bit-locker-key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **import-export** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az import-export bit-locker-key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Import-export bit-locker-key.
+description: ''
+directCommands:
+- uid: az_import-export_bit-locker-key_list
+  name: az import-export bit-locker-key list
+  summary: Returns the BitLocker Keys for all drives in the specified job.
+  description: ''
+  syntax: >-
+    az import-export bit-locker-key list --job-name
+                                         --resource-group
+  examples:
+  - summary: List BitLocker Keys for drives in a job
+    syntax: az import-export bit-locker-key list --resource-group "myResourceGroup" --job-name "myJob"
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_import-export_bit-locker-key_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Import-export bit-locker-key.
diff --git a/2017-03-09-profile/docs-ref-autogen/import-export/location.yml b/2017-03-09-profile/docs-ref-autogen/import-export/location.yml
new file mode 100644
index 0000000000..90937f002c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/import-export/location.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_import-export_location
+name: az import-export location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **import-export** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az import-export location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Import-export location.
+description: ''
+directCommands:
+- uid: az_import-export_location_list
+  name: az import-export location list
+  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
+  description: ''
+  syntax: az import-export location list
+  examples:
+  - summary: List locations to which you can ship the disks
+    syntax: az import-export location list
+- uid: az_import-export_location_show
+  name: az import-export location show
+  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
+  description: ''
+  syntax: az import-export location show --location
+  examples:
+  - summary: Show details about a location
+    syntax: az import-export location show --location "West US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az import-export location list`.'
+    description: ''
+commands:
+- az_import-export_location_list
+- az_import-export_location_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Import-export location.
diff --git a/2017-03-09-profile/docs-ref-autogen/internet-analyzer.yml b/2017-03-09-profile/docs-ref-autogen/internet-analyzer.yml
new file mode 100644
index 0000000000..f9df7dfce2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/internet-analyzer.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer
+name: az internet-analyzer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage internet analyzer.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_show-scorecard
+  name: az internet-analyzer show-scorecard
+  summary: Show latency scorecard for a test.
+  description: ''
+  syntax: >-
+    az internet-analyzer show-scorecard --aggregation-interval
+                                        --profile-name
+                                        --resource-group
+                                        --test-name
+                                        [--country]
+                                        [--end-date-time-utc]
+  requiredParameters:
+  - isRequired: true
+    name: --aggregation-interval
+    summary: The aggregation interval of the Latency Scorecard.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --test-name
+    summary: The name of the Internet Analyzer test.
+    description: ''
+  optionalParameters:
+  - name: --country
+    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - https://www.iso.org/iso-3166-country-codes.html.
+    description: ''
+  - name: --end-date-time-utc
+    summary: The end DateTime of the Latency Scorecard in UTC.
+    description: ''
+- uid: az_internet-analyzer_show-timeseries
+  name: az internet-analyzer show-timeseries
+  summary: Show timeseries for a test.
+  description: ''
+  syntax: >-
+    az internet-analyzer show-timeseries --aggregation-interval
+                                         --end-date-time-utc
+                                         --endpoint
+                                         --profile-name
+                                         --resource-group
+                                         --start-date-time-utc
+                                         --test-name
+                                         --timeseries-type
+                                         [--country]
+  requiredParameters:
+  - isRequired: true
+    name: --aggregation-interval
+    summary: The aggregation interval of the Timeseries.
+    description: ''
+  - isRequired: true
+    name: --end-date-time-utc
+    summary: The end DateTime of the Timeseries in UTC.
+    description: ''
+  - isRequired: true
+    name: --endpoint
+    summary: The specific endpoint.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start-date-time-utc
+    summary: The start DateTime of the Timeseries in UTC.
+    description: ''
+  - isRequired: true
+    name: --test-name
+    summary: The name of the Internet Analyzer test.
+    description: ''
+  - isRequired: true
+    name: --timeseries-type
+    summary: The type of Timeseries.
+    description: ''
+  optionalParameters:
+  - name: --country
+    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - https://www.iso.org/iso-3166-country-codes.html.
+    description: ''
+commands:
+- az_internet-analyzer_preconfigured-endpoint
+- az_internet-analyzer_preconfigured-endpoint_list
+- az_internet-analyzer_profile
+- az_internet-analyzer_profile_create
+- az_internet-analyzer_profile_delete
+- az_internet-analyzer_profile_list
+- az_internet-analyzer_profile_show
+- az_internet-analyzer_profile_update
+- az_internet-analyzer_show-scorecard
+- az_internet-analyzer_show-timeseries
+- az_internet-analyzer_test
+- az_internet-analyzer_test_create
+- az_internet-analyzer_test_delete
+- az_internet-analyzer_test_list
+- az_internet-analyzer_test_show
+- az_internet-analyzer_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage internet analyzer.
diff --git a/2017-03-09-profile/docs-ref-autogen/internet-analyzer/preconfigured-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/internet-analyzer/preconfigured-endpoint.yml
new file mode 100644
index 0000000000..9870e5a072
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/internet-analyzer/preconfigured-endpoint.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer_preconfigured-endpoint
+name: az internet-analyzer preconfigured-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer preconfigured-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage preconfigured endpoints.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_preconfigured-endpoint_list
+  name: az internet-analyzer preconfigured-endpoint list
+  summary: List preconfigured endpoints.
+  description: ''
+  syntax: >-
+    az internet-analyzer preconfigured-endpoint list --profile-name
+                                                     --resource-group
+  examples:
+  - summary: Gets a list of Preconfigured Endpoints
+    syntax: >-
+      az internet-analyzer preconfigured-endpoint list --resource-group "MyResourceGroup" \
+
+      --profile-name "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile for which to list preconfigured endpoints.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_internet-analyzer_preconfigured-endpoint_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage preconfigured endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/internet-analyzer/profile.yml b/2017-03-09-profile/docs-ref-autogen/internet-analyzer/profile.yml
new file mode 100644
index 0000000000..9c1abbcffe
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/internet-analyzer/profile.yml
@@ -0,0 +1,156 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer_profile
+name: az internet-analyzer profile
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer profile** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage internet analyzer profile.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_profile_create
+  name: az internet-analyzer profile create
+  summary: Create internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile create --name
+                                        --resource-group
+                                        [--enabled-state {Disabled, Enabled}]
+                                        [--location]
+                                        [--tags]
+  examples:
+  - summary: Creates an Internet Analyzer Profile in a Resource Group
+    syntax: >-
+      az internet-analyzer profile create --resource-group "MyResourceGroup" --name "MyProfile" \
+
+      --location "WestUs" --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to be created.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The state of the Experiment.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_internet-analyzer_profile_delete
+  name: az internet-analyzer profile delete
+  summary: Delete internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile delete --name
+                                        --resource-group
+  examples:
+  - summary: Deletes an Internet Analyzer Profile in a Resource Group
+    syntax: az internet-analyzer profile delete --resource-group "MyResourceGroup" --name "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to be deleted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_profile_list
+  name: az internet-analyzer profile list
+  summary: List internet analyzer profiles.
+  description: ''
+  syntax: az internet-analyzer profile list --resource-group
+  examples:
+  - summary: List Internet Analyzer Profiles in a Resource Group
+    syntax: az internet-analyzer profile list --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_profile_show
+  name: az internet-analyzer profile show
+  summary: Show internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile show --name
+                                      --resource-group
+  examples:
+  - summary: Gets an Internet Analyzer Profile by Profile Id
+    syntax: az internet-analyzer profile show --resource-group "MyResourceGroup" --name "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to show.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_profile_update
+  name: az internet-analyzer profile update
+  summary: Update internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile update --name
+                                        --resource-group
+                                        [--enabled-state {Disabled, Enabled}]
+                                        [--location]
+                                        [--tags]
+  examples:
+  - summary: Updates an Internet Analyzer Profile in a Resource Group
+    syntax: >-
+      az internet-analyzer profile update --resource-group "MyResourceGroup" --name "MyProfile" \
+
+      --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to be updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The state of the Experiment.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_internet-analyzer_profile_create
+- az_internet-analyzer_profile_delete
+- az_internet-analyzer_profile_list
+- az_internet-analyzer_profile_show
+- az_internet-analyzer_profile_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage internet analyzer profile.
diff --git a/2017-03-09-profile/docs-ref-autogen/internet-analyzer/test.yml b/2017-03-09-profile/docs-ref-autogen/internet-analyzer/test.yml
new file mode 100644
index 0000000000..147f04d76b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/internet-analyzer/test.yml
@@ -0,0 +1,235 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer_test
+name: az internet-analyzer test
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer test** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage tests.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_test_create
+  name: az internet-analyzer test create
+  summary: Create test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test create --name
+                                     --profile-name
+                                     --resource-group
+                                     [--description]
+                                     [--enabled-state {Disabled, Enabled}]
+                                     [--endpoint-a-endpoint]
+                                     [--endpoint-a-name]
+                                     [--endpoint-b-endpoint]
+                                     [--endpoint-b-name]
+                                     [--location]
+                                     [--tags]
+  examples:
+  - summary: Creates a test
+    syntax: >-
+      az internet-analyzer test create --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment" --description "this is my first experiment!" \
+
+      --endpoint-a-name "endpoint A" --endpoint-a-endpoint "endpointA.net" --endpoint-b-name \
+
+      "endpoint B" --endpoint-b-endpoint "endpointB.net" --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to be created.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the new test should be created.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of the details or intents of the test.
+    description: ''
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The initial of the test.
+    description: ''
+  - name: --endpoint-a-endpoint
+    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-a-name
+    summary: The name of the control endpoint.
+    description: ''
+  - name: --endpoint-b-endpoint
+    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-b-name
+    summary: The name of the other endpoint.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_internet-analyzer_test_delete
+  name: az internet-analyzer test delete
+  summary: Delete test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test delete --name
+                                     --profile-name
+                                     --resource-group
+  examples:
+  - summary: Deletes a test
+    syntax: >-
+      az internet-analyzer test delete --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to delete.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_test_list
+  name: az internet-analyzer test list
+  summary: List tests.
+  description: ''
+  syntax: >-
+    az internet-analyzer test list --profile-name
+                                   --resource-group
+  examples:
+  - summary: Gets a list of tests
+    syntax: >-
+      az internet-analyzer test list --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile for which to list tests.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_test_show
+  name: az internet-analyzer test show
+  summary: Show test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test show --name
+                                   --profile-name
+                                   --resource-group
+  examples:
+  - summary: Gets a test by name
+    syntax: >-
+      az internet-analyzer test show --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to show.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_test_update
+  name: az internet-analyzer test update
+  summary: Update test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test update --name
+                                     --profile-name
+                                     --resource-group
+                                     [--description]
+                                     [--enabled-state {Disabled, Enabled}]
+                                     [--endpoint-a-endpoint]
+                                     [--endpoint-a-name]
+                                     [--endpoint-b-endpoint]
+                                     [--endpoint-b-name]
+                                     [--location]
+                                     [--tags]
+  examples:
+  - summary: Updates a test
+    syntax: >-
+      az internet-analyzer test update --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment" --description "string" --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to be updated.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of the details or intents of the test.
+    description: ''
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The state of the Experiment.
+    description: ''
+  - name: --endpoint-a-endpoint
+    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-a-name
+    summary: The name of the control endpoint.
+    description: ''
+  - name: --endpoint-b-endpoint
+    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-b-name
+    summary: The name of the other endpoint.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_internet-analyzer_test_create
+- az_internet-analyzer_test_delete
+- az_internet-analyzer_test_list
+- az_internet-analyzer_test_show
+- az_internet-analyzer_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage tests.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot.yml b/2017-03-09-profile/docs-ref-autogen/iot.yml
new file mode 100644
index 0000000000..c68468a468
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot.yml
@@ -0,0 +1,186 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot
+name: az iot
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
+description: >-
+  Review the extension wiki tips to maximize usage
+
+  https://github.com/Azure/azure-iot-cli-extension/wiki/Tips.
+commands:
+- az_iot_central
+- az_iot_central_api-token
+- az_iot_central_api-token_create
+- az_iot_central_api-token_delete
+- az_iot_central_api-token_list
+- az_iot_central_api-token_show
+- az_iot_central_device
+- az_iot_central_device_command
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+- az_iot_central_device_compute-device-key
+- az_iot_central_device_create
+- az_iot_central_device_delete
+- az_iot_central_device_manual-failback
+- az_iot_central_device_manual-failover
+- az_iot_central_device_registration-info
+- az_iot_central_device_show
+- az_iot_central_device_show-credentials
+- az_iot_central_device_twin
+- az_iot_central_device_twin_show
+- az_iot_central_device-template
+- az_iot_central_device-template_create
+- az_iot_central_device-template_delete
+- az_iot_central_device-template_show
+- az_iot_central_diagnostics
+- az_iot_central_diagnostics_monitor-events
+- az_iot_central_diagnostics_monitor-properties
+- az_iot_central_diagnostics_registration-summary
+- az_iot_central_diagnostics_validate-messages
+- az_iot_central_diagnostics_validate-properties
+- az_iot_central_user
+- az_iot_central_user_create
+- az_iot_central_user_delete
+- az_iot_central_user_list
+- az_iot_central_user_show
+- az_iot_device
+- az_iot_device_c2d-message
+- az_iot_device_c2d-message_abandon
+- az_iot_device_c2d-message_complete
+- az_iot_device_c2d-message_purge
+- az_iot_device_c2d-message_receive
+- az_iot_device_c2d-message_reject
+- az_iot_device_c2d-message_send
+- az_iot_device_send-d2c-message
+- az_iot_device_simulate
+- az_iot_device_upload-file
+- az_iot_dps
+- az_iot_dps_compute-device-key
+- az_iot_dps_enrollment
+- az_iot_dps_enrollment_create
+- az_iot_dps_enrollment_delete
+- az_iot_dps_enrollment_list
+- az_iot_dps_enrollment_show
+- az_iot_dps_enrollment_update
+- az_iot_dps_enrollment-group
+- az_iot_dps_enrollment-group_create
+- az_iot_dps_enrollment-group_delete
+- az_iot_dps_enrollment-group_list
+- az_iot_dps_enrollment-group_show
+- az_iot_dps_enrollment-group_update
+- az_iot_dps_registration
+- az_iot_dps_registration_delete
+- az_iot_dps_registration_list
+- az_iot_dps_registration_show
+- az_iot_edge
+- az_iot_edge_deployment
+- az_iot_edge_deployment_create
+- az_iot_edge_deployment_delete
+- az_iot_edge_deployment_list
+- az_iot_edge_deployment_show
+- az_iot_edge_deployment_show-metric
+- az_iot_edge_deployment_update
+- az_iot_edge_set-modules
+- az_iot_hub
+- az_iot_hub_configuration
+- az_iot_hub_configuration_create
+- az_iot_hub_configuration_delete
+- az_iot_hub_configuration_list
+- az_iot_hub_configuration_show
+- az_iot_hub_configuration_show-metric
+- az_iot_hub_configuration_update
+- az_iot_hub_connection-string
+- az_iot_hub_connection-string_show
+- az_iot_hub_device-identity
+- az_iot_hub_device-identity_children
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+- az_iot_hub_device-identity_connection-string
+- az_iot_hub_device-identity_connection-string_show
+- az_iot_hub_device-identity_create
+- az_iot_hub_device-identity_delete
+- az_iot_hub_device-identity_export
+- az_iot_hub_device-identity_import
+- az_iot_hub_device-identity_list
+- az_iot_hub_device-identity_parent
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+- az_iot_hub_device-identity_renew-key
+- az_iot_hub_device-identity_show
+- az_iot_hub_device-identity_update
+- az_iot_hub_device-twin
+- az_iot_hub_device-twin_replace
+- az_iot_hub_device-twin_show
+- az_iot_hub_device-twin_update
+- az_iot_hub_digital-twin
+- az_iot_hub_digital-twin_invoke-command
+- az_iot_hub_digital-twin_show
+- az_iot_hub_digital-twin_update
+- az_iot_hub_distributed-tracing
+- az_iot_hub_distributed-tracing_show
+- az_iot_hub_distributed-tracing_update
+- az_iot_hub_generate-sas-token
+- az_iot_hub_invoke-device-method
+- az_iot_hub_invoke-module-method
+- az_iot_hub_job
+- az_iot_hub_job_cancel
+- az_iot_hub_job_create
+- az_iot_hub_job_list
+- az_iot_hub_job_show
+- az_iot_hub_module-identity
+- az_iot_hub_module-identity_connection-string
+- az_iot_hub_module-identity_connection-string_show
+- az_iot_hub_module-identity_create
+- az_iot_hub_module-identity_delete
+- az_iot_hub_module-identity_list
+- az_iot_hub_module-identity_show
+- az_iot_hub_module-identity_update
+- az_iot_hub_module-twin
+- az_iot_hub_module-twin_replace
+- az_iot_hub_module-twin_show
+- az_iot_hub_module-twin_update
+- az_iot_hub_monitor-events
+- az_iot_hub_monitor-feedback
+- az_iot_hub_query
+- az_iot_product
+- az_iot_product_requirement
+- az_iot_product_requirement_list
+- az_iot_product_test
+- az_iot_product_test_case
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+- az_iot_product_test_create
+- az_iot_product_test_run
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+- az_iot_product_test_search
+- az_iot_product_test_show
+- az_iot_product_test_task
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+- az_iot_product_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Review the extension wiki tips to maximize usage
+
+    https://github.com/Azure/azure-iot-cli-extension/wiki/Tips.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central.yml b/2017-03-09-profile/docs-ref-autogen/iot/central.yml
new file mode 100644
index 0000000000..b65713da79
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central
+name: az iot central
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Central resources.
+description: >-
+  IoT Central is an IoT application platform that reduces the burden and cost of developing,
+
+  managing, and maintaining enterprise-grade IoT solutions. Choosing to build with IoT Central
+
+  gives you the opportunity to focus time, money, and energy on transforming your business
+
+  with IoT data, rather than just maintaining and updating a complex and continually evolving
+
+  IoT infrastructure.
+
+
+  IoT Central documentation is available at https://aka.ms/iotcentral-documentation
+
+  Additional information on CLI commands is available at https://aka.ms/azure-cli-iot-ext.
+commands:
+- az_iot_central_api-token
+- az_iot_central_api-token_create
+- az_iot_central_api-token_delete
+- az_iot_central_api-token_list
+- az_iot_central_api-token_show
+- az_iot_central_device
+- az_iot_central_device_command
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+- az_iot_central_device_compute-device-key
+- az_iot_central_device_create
+- az_iot_central_device_delete
+- az_iot_central_device_manual-failback
+- az_iot_central_device_manual-failover
+- az_iot_central_device_registration-info
+- az_iot_central_device_show
+- az_iot_central_device_show-credentials
+- az_iot_central_device_twin
+- az_iot_central_device_twin_show
+- az_iot_central_device-template
+- az_iot_central_device-template_create
+- az_iot_central_device-template_delete
+- az_iot_central_device-template_show
+- az_iot_central_diagnostics
+- az_iot_central_diagnostics_monitor-events
+- az_iot_central_diagnostics_monitor-properties
+- az_iot_central_diagnostics_registration-summary
+- az_iot_central_diagnostics_validate-messages
+- az_iot_central_diagnostics_validate-properties
+- az_iot_central_user
+- az_iot_central_user_create
+- az_iot_central_user_delete
+- az_iot_central_user_list
+- az_iot_central_user_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    IoT Central is an IoT application platform that reduces the burden and cost of developing,
+
+    managing, and maintaining enterprise-grade IoT solutions. Choosing to build with IoT Central
+
+    gives you the opportunity to focus time, money, and energy on transforming your business
+
+    with IoT data, rather than just maintaining and updating a complex and continually evolving
+
+    IoT infrastructure.
+
+
+    IoT Central documentation is available at https://aka.ms/iotcentral-documentation
+
+    Additional information on CLI commands is available at https://aka.ms/azure-cli-iot-ext.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/api-token.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/api-token.yml
new file mode 100644
index 0000000000..30e64c6399
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/api-token.yml
@@ -0,0 +1,173 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_api-token
+name: az iot central api-token
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central api-token** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage API tokens for your IoT Central application.
+description: IoT Central allows you to generate and manage API tokens to be used to access the IoT Central API. More information about APIs can be found at https://aka.ms/iotcentraldocsapi.
+directCommands:
+- uid: az_iot_central_api-token_create
+  name: az iot central api-token create
+  summary: Generate an API token associated with your IoT Central application.
+  description: "Note: Write down your token once it's been generated as you won't be able to retrieve it again."
+  syntax: >-
+    az iot central api-token create --app-id
+                                    --role {admin, builder, operator}
+                                    --tkid
+                                    [--api-version {1.0, preview}]
+                                    [--central-api-uri]
+                                    [--token]
+  examples:
+  - summary: Add new API token
+    syntax: az iot central api-token create --token-id {tokenId} --app-id {appId} --role admin
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --role -r
+    parameterValueGroup: admin, builder, operator
+    summary: The role that will be associated with this token. You can specify one of the built-in roles, or specify the role ID of a custom role. See more at https://aka.ms/iotcentral-customrolesdocs.
+    description: ''
+  - isRequired: true
+    name: --tkid --token-id
+    summary: The IoT Central ID associated with this token, [0-9a-zA-Z-] allowed, max length limit to 40. Specify an ID that you'll then use when modifying or deleting this token later via the CLI or API.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_api-token_delete
+  name: az iot central api-token delete
+  summary: Delete an API token associated with your IoT Central application.
+  description: ''
+  syntax: >-
+    az iot central api-token delete --app-id
+                                    --tkid
+                                    [--api-version {1.0, preview}]
+                                    [--central-api-uri]
+                                    [--token]
+  examples:
+  - summary: Delete an API token
+    syntax: az iot central api-token delete --app-id {appid} --token-id {tokenId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --tkid --token-id
+    summary: The IoT Central ID associated with this token, [0-9a-zA-Z-] allowed, max length limit to 40. Specify an ID that you'll then use when modifying or deleting this token later via the CLI or API.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_api-token_list
+  name: az iot central api-token list
+  summary: List all API tokens associated with your IoT Central application.
+  description: Information in the list contains basic information about the tokens in the application and does not include token values.
+  syntax: >-
+    az iot central api-token list --app-id
+                                  [--api-version {1.0, preview}]
+                                  [--central-api-uri]
+                                  [--token]
+  examples:
+  - summary: List of API tokens
+    syntax: az iot central api-token list --app-id {appid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_api-token_show
+  name: az iot central api-token show
+  summary: Get details for an API token associated with your IoT Central application.
+  description: List details, like its associated role, for an API token in your IoT Central app.
+  syntax: >-
+    az iot central api-token show --app-id
+                                  --tkid
+                                  [--api-version {1.0, preview}]
+                                  [--central-api-uri]
+                                  [--token]
+  examples:
+  - summary: Get API token
+    syntax: az iot central api-token show --app-id {appid} --token-id {tokenId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --tkid --token-id
+    summary: The IoT Central ID associated with this token, [0-9a-zA-Z-] allowed, max length limit to 40. Specify an ID that you'll then use when modifying or deleting this token later via the CLI or API.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_api-token_create
+- az_iot_central_api-token_delete
+- az_iot_central_api-token_list
+- az_iot_central_api-token_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: IoT Central allows you to generate and manage API tokens to be used to access the IoT Central API. More information about APIs can be found at https://aka.ms/iotcentraldocsapi.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/device-template.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/device-template.yml
new file mode 100644
index 0000000000..5c87fc0948
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/device-template.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device-template
+name: az iot central device-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure IoT Central device templates.
+description: ''
+directCommands:
+- uid: az_iot_central_device-template_create
+  name: az iot central device-template create
+  summary: Create a device template in IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device-template create --app-id
+                                          --content
+                                          --device-template-id
+                                          [--api-version {1.0, preview}]
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Create a device template with payload read from a file
+    syntax: az iot central device-template create --app-id {appid} --content {pathtofile} --device-template-id {devicetemplateid}
+  - summary: Create a device template with payload read from raw json
+    syntax: az iot central device-template create --app-id {appid} --content {json} --device-template-id {devicetemplateid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --content -k
+    summary: 'The device template definition. Provide path to JSON file or raw stringified JSON. [File Path Example: ./path/to/file.json] [Example of stringified JSON: {<Device Template JSON>}]. The request body must contain CapabilityModel.'
+    description: ''
+  - isRequired: true
+    name: --device-template-id --dtid
+    summary: Unique ID for the Device template.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device-template_delete
+  name: az iot central device-template delete
+  summary: Delete a device template from IoT Central.
+  description: 'Note: this is expected to fail if any devices are still associated to this template.'
+  syntax: >-
+    az iot central device-template delete --app-id
+                                          --device-template-id
+                                          [--api-version {1.0, preview}]
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Delete a device template from IoT Central
+    syntax: az iot central device-template delete --app-id {appid} --device-template-id {devicetemplateid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-template-id --dtid
+    summary: 'The ID of the target device template. Example: somedevicetemplate.'
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device-template_show
+  name: az iot central device-template show
+  summary: Get a device template from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device-template show --app-id
+                                        --device-template-id
+                                        [--api-version {1.0, preview}]
+                                        [--central-api-uri]
+                                        [--token]
+  examples:
+  - summary: Get a device template
+    syntax: az iot central device-template show --app-id {appid} --device-template-id {devicetemplateid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-template-id --dtid
+    summary: 'The ID of the target device template. Example: somedevicetemplate.'
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device-template_create
+- az_iot_central_device-template_delete
+- az_iot_central_device-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure IoT Central device templates.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/device.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/device.yml
new file mode 100644
index 0000000000..c1e9433f53
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/device.yml
@@ -0,0 +1,300 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device
+name: az iot central device
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure IoT Central devices.
+description: ''
+directCommands:
+- uid: az_iot_central_device_compute-device-key
+  name: az iot central device compute-device-key
+  summary: Generate a derived device SAS key.
+  description: Generate a derived device key from a group-level SAS key.
+  syntax: >-
+    az iot central device compute-device-key --device-id
+                                             --pk
+  examples:
+  - summary: Basic usage
+    syntax: az iot central device compute-device-key --pk {primaryKey} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - isRequired: true
+    name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+- uid: az_iot_central_device_create
+  name: az iot central device create
+  summary: Create a device in IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device create --app-id
+                                 --device-id
+                                 [--api-version {1.0, preview}]
+                                 [--central-api-uri]
+                                 [--device-name]
+                                 [--simulated {false, true}]
+                                 [--template]
+                                 [--token]
+  examples:
+  - summary: Create a device
+    syntax: az iot central device create --app-id {appid} --device-id {deviceid}
+  - summary: Create a simulated device
+    syntax: az iot central device create --app-id {appid} --device-id {deviceid} --template {devicetemplateid} --simulated
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: "Provide a unique identifier for the device. A case-sensitive string (up to 128 characters long) of ASCII 7-bit alphanumeric characters plus certain special characters: - . + % _ # \\* ? ! ( ) , : = @ $ '."
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --device-name
+    summary: 'Human readable device name. Example: Fridge.'
+    description: ''
+  - name: --simulated
+    parameterValueGroup: false, true
+    summary: Add this flag if you would like IoT Central to set this up as a simulated device. --template is required if this is true.
+    description: ''
+  - name: --template
+    summary: 'Central template id. Example: dtmi:ojpkindbz:modelDefinition:iild3tm_uo.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_delete
+  name: az iot central device delete
+  summary: Delete a device from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device delete --app-id
+                                 --device-id
+                                 [--api-version {1.0, preview}]
+                                 [--central-api-uri]
+                                 [--token]
+  examples:
+  - summary: Delete a device
+    syntax: az iot central device delete --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_manual-failback
+  name: az iot central device manual-failback
+  summary: Reverts the previously executed failover command by moving the device back to it's original IoT Hub.
+  description: For more information about high availability visit https://github.com/iot-for-all/iot-central-high-availability-clients#readme.
+  syntax: >-
+    az iot central device manual-failback --app-id
+                                          --device-id
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Reverts the previously executed failover command by moving the device back to it's original IoT Hub
+    syntax: az iot central device manual-failback --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_manual-failover
+  name: az iot central device manual-failover
+  summary: Execute a manual failover of device across multiple IoT Hubs to validate device firmware's ability to reconnect using DPS to a different IoT Hub.
+  description: For more information about high availability and default value for ttl-minutes visit https://github.com/iot-for-all/iot-central-high-availability-clients#readme.
+  syntax: >-
+    az iot central device manual-failover --app-id
+                                          --device-id
+                                          [--central-api-uri]
+                                          [--token]
+                                          [--ttl]
+  examples:
+  - summary: Execute a manual failover of device across multiple IoT Hubs to validate device firmware's ability to reconnect using DPS to a different IoT Hub.
+    syntax: az iot central device manual-failover --app-id {appid} --device-id {deviceid} --ttl-minutes {ttl_minutes}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+  - name: --ttl --ttl-minutes
+    summary: A positive integer. TTL in minutes to move device back to the original hub.Has default value in backend. See documentation on what the latest backend default time to live valueby visiting https://github.com/iot-for-all/iot-central-high-availability-clients#readme.
+    description: ''
+- uid: az_iot_central_device_registration-info
+  name: az iot central device registration-info
+  summary: Get registration info on device(s) from IoT Central.
+  description: 'Note: This command can take a significant amount of time to return if no device id is specified and your app contains a lot of devices.'
+  syntax: >-
+    az iot central device registration-info --app-id
+                                            --device-id
+                                            [--central-api-uri]
+                                            [--token]
+  examples:
+  - summary: Get registration info on specified device
+    syntax: az iot central device registration-info --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_show
+  name: az iot central device show
+  summary: Get a device from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device show --app-id
+                               --device-id
+                               [--api-version {1.0, preview}]
+                               [--central-api-uri]
+                               [--token]
+  examples:
+  - summary: Get a device
+    syntax: az iot central device show --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_show-credentials
+  name: az iot central device show-credentials
+  summary: Get device credentials from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device show-credentials --app-id
+                                           --device-id
+                                           [--central-api-uri]
+                                           [--token]
+  examples:
+  - summary: Get device credentials for a device
+    syntax: az iot central device show-credentials --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device_command
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+- az_iot_central_device_compute-device-key
+- az_iot_central_device_create
+- az_iot_central_device_delete
+- az_iot_central_device_manual-failback
+- az_iot_central_device_manual-failover
+- az_iot_central_device_registration-info
+- az_iot_central_device_show
+- az_iot_central_device_show-credentials
+- az_iot_central_device_twin
+- az_iot_central_device_twin_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure IoT Central devices.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/device/command.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/device/command.yml
new file mode 100644
index 0000000000..b34d2c3afd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/device/command.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device_command
+name: az iot central device command
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device command** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Run device commands.
+description: ''
+directCommands:
+- uid: az_iot_central_device_command_history
+  name: az iot central device command history
+  summary: Get the details for the latest command request and response sent to the device.
+  description: >-
+    Lists the most recent command request and response that was sent to the device from IoT Central.
+
+    Any update that the device performs to the device properties as a result of the command execution are not included in the response.
+  syntax: >-
+    az iot central device command history --app-id
+                                          --cn
+                                          --device-id
+                                          --interface-id
+                                          [--api-version {1.0, preview}]
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Show command response
+    syntax: az iot central device command history --app-id {appid} --device-id {deviceid} --interface-id {interfaceid} --command-name {commandname}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --cn --command-name
+    summary: The command name as specified in the device template. Command name could be different from the Display Name of the command.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - isRequired: true
+    name: --interface-id -i
+    summary: The name of the interface as specified in the device template. You can find it by navigating to Device Template and view the interface identity under the corresponding device capability.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_command_run
+  name: az iot central device command run
+  summary: Run a command on a device and view associated response. Does NOT monitor property updates that the command may perform.
+  description: >-
+    Note: payload should be nested under "request".
+
+    i.e. if your device expects the payload in a shape {"key": "value"}
+
+    payload should be {"request": {"key": "value"}}.
+
+    --content can also be pointed at a filepath like this (.../path/to/payload.json).
+  syntax: >-
+    az iot central device command run --app-id
+                                      --cn
+                                      --content
+                                      --device-id
+                                      --interface-id
+                                      [--api-version {1.0, preview}]
+                                      [--central-api-uri]
+                                      [--token]
+  examples:
+  - summary: Run command response
+    syntax: az iot central device command run --app-id {appid} --device-id {deviceid} --interface-id {interfaceid} --command-name {commandname} --content {payload}
+  - summary: Short Run command response
+    syntax: az iot central device command run -n {appid} -d {deviceid} -i {interfaceid} --cn {commandname} -k {payload}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --cn --command-name
+    summary: The command name as specified in the device template. Command name could be different from the Display Name of the command.
+    description: ''
+  - isRequired: true
+    name: --content -k
+    summary: "Configuration for request. Provide path to JSON file or raw stringified JSON. [File Path Example: ./path/to/file.json] [Stringified JSON Example: {'a': 'b'}]."
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - isRequired: true
+    name: --interface-id -i
+    summary: The name of the interface as specified in the device template. You can find it by navigating to Device Template and view the interface identity under the corresponding device capability.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Run device commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/device/twin.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/device/twin.yml
new file mode 100644
index 0000000000..05b43362cc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/device/twin.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device_twin
+name: az iot central device twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Central device twins.
+description: ''
+directCommands:
+- uid: az_iot_central_device_twin_show
+  name: az iot central device twin show
+  summary: Get the device twin from IoT Hub.
+  description: ''
+  syntax: >-
+    az iot central device twin show --app-id
+                                    --device-id
+                                    [--central-api-uri]
+                                    [--token]
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device_twin_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Central device twins.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/diagnostics.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/diagnostics.yml
new file mode 100644
index 0000000000..d05bff06b6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/diagnostics.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_diagnostics
+name: az iot central diagnostics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central diagnostics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Perform application and device level diagnostics.
+description: ''
+directCommands:
+- uid: az_iot_central_diagnostics_monitor-events
+  name: az iot central diagnostics monitor-events
+  summary: View device telemetry messages sent to the IoT Central app.
+  description: >-
+    Shows the telemetry data sent to IoT Central application. By default,
+
+    it shows all the data sent by all devices. Use the --device-id parameter
+
+    to filter to a specific device.
+  syntax: >-
+    az iot central diagnostics monitor-events --app-id
+                                              [--central-api-uri]
+                                              [--cg]
+                                              [--device-id]
+                                              [--enqueued-time]
+                                              [--module-id]
+                                              [--properties {all, anno, app, sys}]
+                                              [--repair {false, true}]
+                                              [--timeout]
+                                              [--token]
+                                              [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics monitor-events --app-id {app_id}
+  - summary: Basic usage when filtering on target device
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id}
+  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d Device*d
+  - summary: Basic usage when filtering on module.
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -m {module_id}
+  - summary: Basic usage when filtering targeted modules with a wildcard in the ID
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -m Module*
+  - summary: Filter device and specify an Event Hub consumer group to bind to.
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
+  - summary: Receive message annotations (message headers)
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id} --properties anno
+  - summary: Receive message annotations + system properties. Never time out.
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
+  - summary: Receive all message attributes from all device messages
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} --props all
+  - summary: Receive all messages and parse message payload as JSON
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} --output json
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --cg --consumer-group -c
+    defaultValue: $Default
+    summary: Specify the consumer group to use when connecting to event hub endpoint.
+    description: ''
+  - name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - name: --enqueued-time --et -e
+    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
+    description: ''
+  - name: --module-id -m
+    summary: Provide IoT Edge Module ID if the device type is IoT Edge.
+    description: ''
+  - name: --properties --props -p
+    parameterValueGroup: all, anno, app, sys
+    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --timeout --to -t
+    defaultValue: "300"
+    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_central_diagnostics_monitor-properties
+  name: az iot central diagnostics monitor-properties
+  summary: View desired and reported properties sent to/from the IoT Central app.
+  description: >-
+    Polls device-twin from central and compares it to the last device-twin
+
+    Parses out properties from device-twin, and detects if changes were made
+
+    Prints subset of properties that were changed within the polling interval.
+  syntax: >-
+    az iot central diagnostics monitor-properties --app-id
+                                                  --device-id
+                                                  [--central-api-uri]
+                                                  [--token]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics monitor-properties --app-id {app_id} -d {device_id}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_diagnostics_registration-summary
+  name: az iot central diagnostics registration-summary
+  summary: View the registration summary of all the devices in an app.
+  description: >-
+    Note: This command can take a significant amount of time to return
+
+    if your app contains a lot of devices.
+  syntax: >-
+    az iot central diagnostics registration-summary --app-id
+                                                    [--central-api-uri]
+                                                    [--token]
+  examples:
+  - summary: Registration summary
+    syntax: az iot central diagnostics registration-summary --app-id {appid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_diagnostics_validate-messages
+  name: az iot central diagnostics validate-messages
+  summary: Validate messages sent to the IoT Hub for an IoT Central app.
+  description: Performs validations on the telemetry messages and reports back data that is not modeled in the device template or data where the data type doesn’t match what is defined in the device template.
+  syntax: >-
+    az iot central diagnostics validate-messages --app-id
+                                                 [--central-api-uri]
+                                                 [--cg]
+                                                 [--device-id]
+                                                 [--dr]
+                                                 [--enqueued-time]
+                                                 [--max-messages]
+                                                 [--minimum-severity {error, info, warning}]
+                                                 [--module-id]
+                                                 [--properties {all, anno, app, sys}]
+                                                 [--repair {false, true}]
+                                                 [--style {csv, json, scroll}]
+                                                 [--timeout]
+                                                 [--token]
+                                                 [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics validate-messages --app-id {app_id}
+  - summary: Output errors as they are detected
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} --style scroll
+  - summary: Basic usage when filtering on target device
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -d {device_id}
+  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -d Device*
+  - summary: Basic usage when filtering on module.
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -m {module_id}
+  - summary: Basic usage when filtering targeted modules with a wildcard in the ID
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -m Module*
+  - summary: Filter device and specify an Event Hub consumer group to bind to.
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -d {device_id} --cg {consumer_group_name}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --cg --consumer-group -c
+    defaultValue: $Default
+    summary: Specify the consumer group to use when connecting to event hub endpoint.
+    description: ''
+  - name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - name: --dr --duration
+    defaultValue: "300"
+    summary: Maximum duration to receive messages from target device before terminating connection.Use 0 for infinity.
+    description: ''
+  - name: --enqueued-time --et -e
+    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
+    description: ''
+  - name: --max-messages --mm
+    defaultValue: "10"
+    summary: Maximum number of messages to recieve from target device before terminating connection.Use 0 for infinity.
+    description: ''
+  - name: --minimum-severity
+    defaultValue: warning
+    parameterValueGroup: error, info, warning
+    summary: Minimum severity of issue required for reporting.
+    description: ''
+  - name: --module-id -m
+    summary: Provide IoT Edge Module ID if the device type is IoT Edge.
+    description: ''
+  - name: --properties --props -p
+    parameterValueGroup: all, anno, app, sys
+    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --style
+    defaultValue: scroll
+    parameterValueGroup: csv, json, scroll
+    summary: Indicate output stylescroll = deliver errors as they arrive, json = summarize results as json, csv = summarize results as csv.
+    description: ''
+  - name: --timeout --to -t
+    defaultValue: "300"
+    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_central_diagnostics_validate-properties
+  name: az iot central diagnostics validate-properties
+  summary: Validate reported properties sent to the IoT Central application.
+  description: >-
+    Performs validations on reported property updates:
+
+    1) Warning - Properties sent by device that are not modeled in central.
+
+    2) Warning - Properties with same name declared in multiple interfaces
+
+    should have interface name included as part of the property update.
+  syntax: >-
+    az iot central diagnostics validate-properties --app-id
+                                                   --device-id
+                                                   [--central-api-uri]
+                                                   [--minimum-severity {error, info, warning}]
+                                                   [--token]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics validate-properties --app-id {app_id} -d {device_id}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --minimum-severity
+    defaultValue: warning
+    parameterValueGroup: error, info, warning
+    summary: Minimum severity of issue required for reporting.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_diagnostics_monitor-events
+- az_iot_central_diagnostics_monitor-properties
+- az_iot_central_diagnostics_registration-summary
+- az_iot_central_diagnostics_validate-messages
+- az_iot_central_diagnostics_validate-properties
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Perform application and device level diagnostics.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/central/user.yml b/2017-03-09-profile/docs-ref-autogen/iot/central/user.yml
new file mode 100644
index 0000000000..b41f98dd1d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/central/user.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_user
+name: az iot central user
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central user** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure IoT Central users.
+description: ''
+directCommands:
+- uid: az_iot_central_user_create
+  name: az iot central user create
+  summary: Add a user to the application.
+  description: ''
+  syntax: >-
+    az iot central user create --app-id
+                               --assignee
+                               --role {admin, builder, operator}
+                               [--api-version {1.0, preview}]
+                               [--central-api-uri]
+                               [--email]
+                               [--object-id]
+                               [--tenant-id]
+                               [--token]
+  examples:
+  - summary: Add a user by email to the application
+    syntax: az iot central user create --user-id {userId} --app-id {appId} --email {emailAddress} --role admin
+  - summary: Add a service-principal to the application
+    syntax: az iot central user create --user-id {userId} --app-id {appId} --tenant-id {tenantId} --object-id {objectId} --role operator
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --assignee --user-id
+    summary: ID associated with the user.
+    description: ''
+  - isRequired: true
+    name: --role -r
+    parameterValueGroup: admin, builder, operator
+    summary: The role that will be associated with this token. You can specify one of the built-in roles, or specify the role ID of a custom role. See more at https://aka.ms/iotcentral-customrolesdocs.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --email
+    summary: Email address of user to be added to the app.
+    description: ''
+  - name: --object-id --oid
+    summary: Object ID for service principal to be added to the app. Tenant ID must also be specified.
+    description: ''
+  - name: --tenant-id --tnid
+    summary: Tenant ID for service principal to be added to the app. Object ID must also be specified.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_user_delete
+  name: az iot central user delete
+  summary: Delete a user from the application.
+  description: ''
+  syntax: >-
+    az iot central user delete --app-id
+                               --assignee
+                               [--api-version {1.0, preview}]
+                               [--central-api-uri]
+                               [--token]
+  examples:
+  - summary: Delete a user
+    syntax: az iot central user delete --app-id {appid} --user-id {userId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --assignee --user-id
+    summary: ID associated with the user.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_user_list
+  name: az iot central user list
+  summary: Get list of users in an application.
+  description: ''
+  syntax: >-
+    az iot central user list --app-id
+                             [--api-version {1.0, preview}]
+                             [--central-api-uri]
+                             [--token]
+  examples:
+  - summary: List of users
+    syntax: az iot central user list --app-id {appid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_user_show
+  name: az iot central user show
+  summary: Get the details of a user by ID.
+  description: ''
+  syntax: >-
+    az iot central user show --app-id
+                             --assignee
+                             [--api-version {1.0, preview}]
+                             [--central-api-uri]
+                             [--token]
+  examples:
+  - summary: Get details of user
+    syntax: az iot central user show --app-id {appid} --user-id {userId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --assignee --user-id
+    summary: ID associated with the user.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_user_create
+- az_iot_central_user_delete
+- az_iot_central_user_list
+- az_iot_central_user_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure IoT Central users.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/device.yml b/2017-03-09-profile/docs-ref-autogen/iot/device.yml
new file mode 100644
index 0000000000..89bdca28c4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/device.yml
@@ -0,0 +1,210 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_device
+name: az iot device
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot device** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
+description: ''
+directCommands:
+- uid: az_iot_device_send-d2c-message
+  name: az iot device send-d2c-message
+  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
+  description: ''
+  syntax: >-
+    az iot device send-d2c-message --device-id
+                                   [--da]
+                                   [--hub-name]
+                                   [--login]
+                                   [--mc]
+                                   [--properties]
+                                   [--qos {0, 1}]
+                                   [--resource-group]
+  examples:
+  - summary: Basic usage
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id}
+  - summary: Basic usage with custom data
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id} --data {message_body}
+  - summary: Send application properties
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props 'key0=value0;key1=value1'
+  - summary: Send system properties (Message Id and Correlation Id)
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props '$.mid=<id>;$.cid=<id>'
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --da --data
+    defaultValue: Ping from Az CLI IoT Extension
+    summary: Message body.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --mc --msg-count
+    defaultValue: "1"
+    summary: Number of device messages to send to IoT Hub.
+    description: ''
+  - name: --properties --props -p
+    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.'
+    description: ''
+  - name: --qos
+    defaultValue: "1"
+    parameterValueGroup: 0, 1
+    summary: Quality of Service. 0 = At most once, 1 = At least once. 2 (Exactly once) is not supported.This command parameter has been deprecated and will be removed in the next release.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_simulate
+  name: az iot device simulate
+  summary: >-
+    Simulate a device in an Azure IoT Hub.
+
+
+    While the device simulation is running, the device will automatically receive
+
+    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
+
+    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
+
+    selection which can be complete, reject or abandon.
+
+
+    Note: The command by default will set content-type to application/json and content-encoding
+
+    to utf-8. This can be overriden.
+  description: ''
+  syntax: >-
+    az iot device simulate --device-id
+                           [--da]
+                           [--hub-name]
+                           [--login]
+                           [--mc]
+                           [--mi]
+                           [--properties]
+                           [--proto {http, mqtt}]
+                           [--receive-settle {abandon, complete, reject}]
+                           [--resource-group]
+  examples:
+  - summary: Basic usage (mqtt)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id}
+  - summary: Basic usage (mqtt) with sending mixed properties
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --properties "myprop=myvalue;$.ct=application/json"
+  - summary: Basic usage (http)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --protocol http
+  - summary: Basic usage (http) with sending mixed properties
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --protocol http --properties "iothub-app-myprop=myvalue;content-type=application/json;iothub-correlationid=12345"
+  - summary: Choose total message count and interval between messages
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --msg-count 1000 --msg-interval 5
+  - summary: Reject c2d messages (http only)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --rs reject --protocol http
+  - summary: Abandon c2d messages (http only)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --rs abandon --protocol http
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --da --data
+    defaultValue: Ping from Az CLI IoT Extension
+    summary: Message body.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --mc --msg-count
+    defaultValue: "100"
+    summary: Number of device messages to send to IoT Hub.
+    description: ''
+  - name: --mi --msg-interval
+    defaultValue: "3"
+    summary: Delay in seconds between device-to-cloud messages.
+    description: ''
+  - name: --properties --props -p
+    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.  For http messaging - application properties are sent using iothub-app-<name>=value, for instance iothub-app-myprop=myvalue. System properties are generally prefixed with iothub-<name> like iothub-correlationid but there are exceptions such as content-type and content-encoding.'
+    description: ''
+  - name: --proto --protocol
+    defaultValue: mqtt
+    parameterValueGroup: http, mqtt
+    summary: Indicates device-to-cloud message protocol.
+    description: ''
+  - name: --receive-settle --rs
+    defaultValue: complete
+    parameterValueGroup: abandon, complete, reject
+    summary: Indicates how to settle received cloud-to-device messages. Supported with HTTP only.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_upload-file
+  name: az iot device upload-file
+  summary: Upload a local file as a device to a pre-configured blob storage container.
+  description: ''
+  syntax: >-
+    az iot device upload-file --content-type
+                              --device-id
+                              --file-path
+                              [--hub-name]
+                              [--login]
+                              [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --content-type --ct
+    summary: MIME Type of file.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --file-path --fp
+    summary: Path to file for upload.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_device_c2d-message
+- az_iot_device_c2d-message_abandon
+- az_iot_device_c2d-message_complete
+- az_iot_device_c2d-message_purge
+- az_iot_device_c2d-message_receive
+- az_iot_device_c2d-message_reject
+- az_iot_device_c2d-message_send
+- az_iot_device_send-d2c-message
+- az_iot_device_simulate
+- az_iot_device_upload-file
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Leverage device-to-cloud and cloud-to-device messaging capabilities.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/device/c2d-message.yml b/2017-03-09-profile/docs-ref-autogen/iot/device/c2d-message.yml
new file mode 100644
index 0000000000..954bfe1adf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/device/c2d-message.yml
@@ -0,0 +1,294 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_device_c2d-message
+name: az iot device c2d-message
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot device c2d-message** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Cloud-to-device messaging commands.
+description: ''
+directCommands:
+- uid: az_iot_device_c2d-message_abandon
+  name: az iot device c2d-message abandon
+  summary: Abandon a cloud-to-device message.
+  description: ''
+  syntax: >-
+    az iot device c2d-message abandon --device-id
+                                      --etag
+                                      [--hub-name]
+                                      [--login]
+                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_complete
+  name: az iot device c2d-message complete
+  summary: Complete a cloud-to-device message.
+  description: ''
+  syntax: >-
+    az iot device c2d-message complete --device-id
+                                       --etag
+                                       [--hub-name]
+                                       [--login]
+                                       [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_purge
+  name: az iot device c2d-message purge
+  summary: Purge cloud-to-device message queue for a target device.
+  description: ''
+  syntax: >-
+    az iot device c2d-message purge --device-id
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_receive
+  name: az iot device c2d-message receive
+  summary: Receive a cloud-to-device message.
+  description: 'Note: Only one message ack argument [--complete, --reject, --abandon] will be accepted.'
+  syntax: >-
+    az iot device c2d-message receive --device-id
+                                      [--abandon {false, true}]
+                                      [--complete {false, true}]
+                                      [--hub-name]
+                                      [--lock-timeout]
+                                      [--login]
+                                      [--reject {false, true}]
+                                      [--resource-group]
+  examples:
+  - summary: Basic usage
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group}
+  - summary: Receive a message and set a lock timeout of 30 seconds for that message
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group} --lt {30}
+  - summary: Receive a message and ack it as 'complete' after it is received
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group} --complete
+  - summary: Receive a message and reject it after it is received
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group} --reject
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --abandon
+    parameterValueGroup: false, true
+    summary: Abandon the cloud-to-device message after receipt.
+    description: ''
+  - name: --complete
+    parameterValueGroup: false, true
+    summary: Complete the cloud-to-device message after receipt.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --lock-timeout --lt
+    defaultValue: "60"
+    summary: Specifies the amount of time a message will be invisible to other receive calls.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --reject
+    parameterValueGroup: false, true
+    summary: Reject the cloud-to-device message after receipt.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_reject
+  name: az iot device c2d-message reject
+  summary: Reject or deadletter a cloud-to-device message.
+  description: ''
+  syntax: >-
+    az iot device c2d-message reject --device-id
+                                     --etag
+                                     [--hub-name]
+                                     [--login]
+                                     [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_send
+  name: az iot device c2d-message send
+  summary: Send a cloud-to-device message.
+  description: >-
+    EXPERIMENTAL requires Python 3.4+
+
+    This command relies on and may install dependent Cython package (uamqp) upon first execution.
+
+    https://github.com/Azure/azure-uamqp-python.
+  syntax: >-
+    az iot device c2d-message send --device-id
+                                   [--ack {full, negative, positive}]
+                                   [--auth-type {key, login}]
+                                   [--ce]
+                                   [--cid]
+                                   [--content-type]
+                                   [--da]
+                                   [--expiry]
+                                   [--hub-name]
+                                   [--login]
+                                   [--message-id]
+                                   [--properties]
+                                   [--repair {false, true}]
+                                   [--resource-group]
+                                   [--uid]
+                                   [--wait {false, true}]
+                                   [--yes {false, true}]
+  examples:
+  - summary: Basic usage with default message body
+    syntax: az iot device c2d-message send -d {device_id} -n {iothub_name}
+  - summary: Send cloud-to-device message with custom data and properties.
+    syntax: az iot device c2d-message send -d {device_id} -n {iothub_name} --data 'Hello World' --props 'key0=value0;key1=value1'
+  - summary: Send a C2D message and wait for device acknowledgement
+    syntax: az iot device c2d-message send -d {device_id} -n {iothub_name} --ack full --wait
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --ack
+    parameterValueGroup: full, negative, positive
+    summary: 'Request the delivery of per-message feedback regarding the final state of that message. The description of ack values is as follows. Positive: If the c2d message reaches the Completed state, IoT Hub generates a feedback message. Negative: If the c2d message reaches the Dead lettered state, IoT Hub generates a feedback message. Full: IoT Hub generates a feedback message in either case. By default, no ack is requested.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --ce --content-encoding
+    defaultValue: utf-8
+    summary: The content encoding associated with the C2D message.
+    description: ''
+  - name: --cid --correlation-id
+    summary: The correlation Id associated with the C2D message.
+    description: ''
+  - name: --content-type --ct
+    summary: The content type associated with the C2D message.
+    description: ''
+  - name: --da --data
+    defaultValue: Ping from Az CLI IoT Extension
+    summary: Message body.
+    description: ''
+  - name: --expiry --expiry-time-utc
+    summary: Units are milliseconds since unix epoch. If no time is indicated the default IoT Hub C2D message TTL is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --message-id --mid
+    summary: The C2D message Id. If no message Id is provided a UUID will be generated.
+    description: ''
+  - name: --properties --props -p
+    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d.'
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --uid --user-id
+    summary: The C2D message, user Id property.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: If set the c2d send operation will block until device feedback has been received.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+commands:
+- az_iot_device_c2d-message_abandon
+- az_iot_device_c2d-message_complete
+- az_iot_device_c2d-message_purge
+- az_iot_device_c2d-message_receive
+- az_iot_device_c2d-message_reject
+- az_iot_device_c2d-message_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Cloud-to-device messaging commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/dps.yml b/2017-03-09-profile/docs-ref-autogen/iot/dps.yml
new file mode 100644
index 0000000000..619c5ff4e6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/dps.yml
@@ -0,0 +1,64 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps
+name: az iot dps
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
+description: ''
+directCommands:
+- uid: az_iot_dps_compute-device-key
+  name: az iot dps compute-device-key
+  summary: Generate a derived device SAS key.
+  description: Generate a derived device key from a DPS enrollment group symmetric key.
+  syntax: >-
+    az iot dps compute-device-key --key
+                                  --registration-id
+  examples:
+  - summary: Basic usage
+    syntax: az iot dps compute-device-key --key {enrollement_group_symmetric_key} --registration-id {registration_id}
+  requiredParameters:
+  - isRequired: true
+    name: --key --symmetric-key
+    summary: The symmetric shared access key for the enrollment group.
+    description: ''
+  - isRequired: true
+    name: --registration-id
+    summary: ID of device registration.
+    description: ''
+commands:
+- az_iot_dps_compute-device-key
+- az_iot_dps_enrollment
+- az_iot_dps_enrollment_create
+- az_iot_dps_enrollment_delete
+- az_iot_dps_enrollment_list
+- az_iot_dps_enrollment_show
+- az_iot_dps_enrollment_update
+- az_iot_dps_enrollment-group
+- az_iot_dps_enrollment-group_create
+- az_iot_dps_enrollment-group_delete
+- az_iot_dps_enrollment-group_list
+- az_iot_dps_enrollment-group_show
+- az_iot_dps_enrollment-group_update
+- az_iot_dps_registration
+- az_iot_dps_registration_delete
+- az_iot_dps_registration_list
+- az_iot_dps_registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/dps/enrollment-group.yml b/2017-03-09-profile/docs-ref-autogen/iot/dps/enrollment-group.yml
new file mode 100644
index 0000000000..f3413f50fc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/dps/enrollment-group.yml
@@ -0,0 +1,326 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps_enrollment-group
+name: az iot dps enrollment-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps enrollment-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure IoT Hub Device Provisioning Service.
+description: ''
+directCommands:
+- uid: az_iot_dps_enrollment-group_create
+  name: az iot dps enrollment-group create
+  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group create --dps-name
+                                       --enrollment-id
+                                       --resource-group
+                                       [--allocation-policy {custom, geolatency, hashed, static}]
+                                       [--api-version]
+                                       [--ca-name]
+                                       [--certificate-path]
+                                       [--edge-enabled {false, true}]
+                                       [--hn]
+                                       [--ih]
+                                       [--initial-twin-properties]
+                                       [--initial-twin-tags]
+                                       [--pk]
+                                       [--provisioning-status {disabled, enabled}]
+                                       [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                       [--scn]
+                                       [--scp]
+                                       [--secondary-key]
+                                       [--webhook-url]
+  examples:
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using an intermediate certificate as primary certificate'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using a CA certificate {certificate_name} as secondary certificate'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name}
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service 'MyDps' in the resource group '{resource_group_name}' with provisioning status 'enabled', target IoT Hub '{iothub_host_name}', initial twin properties '{"location":{"region":"US"}}' and initial twin tags '{"version_dps":"1"}' using an intermediate certificate as primary certificate'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem --provisioning-status enabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --initial-twin-tags "{'version_dps':'1'}"
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} with attestation type 'symmetrickey'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {primary_key} --secondary-key {secondary_key}
+  - summary: Create an enrollment group '{enrollment_id}' with custom allocation policy,
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy custom --webhook-url {webhook_url} --api-version {api_version}
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --ca-name --cn --root-ca-name
+    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scn --secondary-ca-name --secondary-root-ca-name
+    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+- uid: az_iot_dps_enrollment-group_delete
+  name: az iot dps enrollment-group delete
+  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group delete --dps-name
+                                       --enrollment-id
+                                       --resource-group
+                                       [--etag]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+- uid: az_iot_dps_enrollment-group_list
+  name: az iot dps enrollment-group list
+  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group list --dps-name
+                                     --resource-group
+                                     [--top]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --top
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_dps_enrollment-group_show
+  name: az iot dps enrollment-group show
+  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group show --dps-name
+                                     --enrollment-id
+                                     --resource-group
+                                     [--keys {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot dps enrollment-group show --dps-name {dps_name} -g {resource_group} --enrollment-id {enrollment_id}
+  - summary: Include full attestation information in results for a symmetric key enrollment-group
+    syntax: az iot dps enrollment-group show --dps-name {dps_name} -g {resource_group} --enrollment-id {symmetric_key_enrollment_id} --show-keys
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --keys --show-keys
+    parameterValueGroup: false, true
+    summary: Include attestation keys and information in enrollment group results.
+    description: ''
+- uid: az_iot_dps_enrollment-group_update
+  name: az iot dps enrollment-group update
+  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group update --dps-name
+                                       --enrollment-id
+                                       --resource-group
+                                       [--allocation-policy {custom, geolatency, hashed, static}]
+                                       [--api-version]
+                                       [--ca-name]
+                                       [--certificate-path]
+                                       [--edge-enabled {false, true}]
+                                       [--etag]
+                                       [--hn]
+                                       [--ih]
+                                       [--initial-twin-properties]
+                                       [--initial-twin-tags]
+                                       [--pk]
+                                       [--provisioning-status {disabled, enabled}]
+                                       [--rc {false, true}]
+                                       [--remove-secondary-certificate {false, true}]
+                                       [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                       [--scn]
+                                       [--scp]
+                                       [--secondary-key]
+                                       [--webhook-url]
+  examples:
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with initial twin properties and initial twin tags.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-properties "{'location':{'region':'USA'}}" --initial-twin-tags "{'version_dps':'2'}" --etag AAAAAAAAAAA=
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary intermediate certificate and remove existing secondary intermediate certificate.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --remove-secondary-certificate --etag AAAAAAAAAAA=
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new secondary CA certificate '{certificate_name}' and remove existing primary CA certificate.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name} --remove-certificate --etag AAAAAAAAAAA=
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary key.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --ca-name --cn --root-ca-name
+    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --rc --remove-certificate
+    parameterValueGroup: false, true
+    summary: Remove current primary certificate.
+    description: ''
+  - name: --remove-secondary-certificate --rsc
+    parameterValueGroup: false, true
+    summary: Remove current secondary certificate.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scn --secondary-ca-name --secondary-root-ca-name
+    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+commands:
+- az_iot_dps_enrollment-group_create
+- az_iot_dps_enrollment-group_delete
+- az_iot_dps_enrollment-group_list
+- az_iot_dps_enrollment-group_show
+- az_iot_dps_enrollment-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure IoT Hub Device Provisioning Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/dps/enrollment.yml b/2017-03-09-profile/docs-ref-autogen/iot/dps/enrollment.yml
new file mode 100644
index 0000000000..8fcf0fae5d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/dps/enrollment.yml
@@ -0,0 +1,342 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps_enrollment
+name: az iot dps enrollment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps enrollment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
+description: ''
+directCommands:
+- uid: az_iot_dps_enrollment_create
+  name: az iot dps enrollment create
+  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment create --at {symmetricKey, tpm, x509}
+                                 --dps-name
+                                 --enrollment-id
+                                 --resource-group
+                                 [--allocation-policy {custom, geolatency, hashed, static}]
+                                 [--api-version]
+                                 [--certificate-path]
+                                 [--device-id]
+                                 [--edge-enabled {false, true}]
+                                 [--ek]
+                                 [--hn]
+                                 [--ih]
+                                 [--initial-twin-properties]
+                                 [--initial-twin-tags]
+                                 [--pk]
+                                 [--provisioning-status {disabled, enabled}]
+                                 [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                 [--scp]
+                                 [--secondary-key]
+                                 [--webhook-url]
+  examples:
+  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}'
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem
+  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with provisioning status 'disabled', target IoT Hub '{iothub_host_name}', device id '{device_id}', initial twin properties '{"location":{"region":"US"}}' and initial twin tags '{"version":"1"}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem --provisioning-status disabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --initial-twin-tags "{'version':'1'}" --device-id {device_id}
+  - summary: Create an enrollment 'MyEnrollment' with attestation type 'tpm' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
+  - summary: Create an enrollment 'MyEnrollment' with attestation type 'symmetrickey' in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --primary-key {primary_key} --secondary-key {secondary_key}
+  - summary: Create an enrollment 'MyEnrollment' with reprovision in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --reprovision-policy {reprovision_type} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
+  - summary: Create an enrollment 'MyEnrollment' with static allocation policy in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy static --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs {iot_hub_host_name}
+  - summary: Create an enrollment 'MyEnrollment' with hashed allocation policy and multiple hubs in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy hashed --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2}"
+  - summary: Create an enrollment 'MyEnrollment' with custom allocation policy,
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --allocation-policy custom --webhook-url {webhook_url} --api-version {api_version}
+  requiredParameters:
+  - isRequired: true
+    name: --at --attestation-type
+    parameterValueGroup: symmetricKey, tpm, x509
+    summary: Attestation Mechanism.
+    description: ''
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --device-id -d
+    summary: IoT Hub Device ID.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device. When choosing tpm as attestation type, endorsement key is required.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+- uid: az_iot_dps_enrollment_delete
+  name: az iot dps enrollment delete
+  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment delete --dps-name
+                                 --enrollment-id
+                                 --resource-group
+                                 [--etag]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+- uid: az_iot_dps_enrollment_list
+  name: az iot dps enrollment list
+  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment list --dps-name
+                               --resource-group
+                               [--top]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --top
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_dps_enrollment_show
+  name: az iot dps enrollment show
+  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment show --dps-name
+                               --enrollment-id
+                               --resource-group
+                               [--keys {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot dps enrollment show --dps-name {dps_name} -g {resource_group} --enrollment-id {enrollment_id}
+  - summary: Include full attestation information in results for a symmetric key enrollment
+    syntax: az iot dps enrollment show --dps-name {dps_name} -g {resource_group} --enrollment-id {symmetric_key_enrollment_id} --show-keys
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --keys --show-keys
+    parameterValueGroup: false, true
+    summary: Include attestation keys and information in enrollment results.
+    description: ''
+- uid: az_iot_dps_enrollment_update
+  name: az iot dps enrollment update
+  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment update --dps-name
+                                 --enrollment-id
+                                 --resource-group
+                                 [--allocation-policy {custom, geolatency, hashed, static}]
+                                 [--api-version]
+                                 [--certificate-path]
+                                 [--device-id]
+                                 [--edge-enabled {false, true}]
+                                 [--ek]
+                                 [--etag]
+                                 [--hn]
+                                 [--ih]
+                                 [--initial-twin-properties]
+                                 [--initial-twin-tags]
+                                 [--pk]
+                                 [--provisioning-status {disabled, enabled}]
+                                 [--rc {false, true}]
+                                 [--remove-secondary-certificate {false, true}]
+                                 [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                 [--scp]
+                                 [--secondary-key]
+                                 [--webhook-url]
+  examples:
+  - summary: Update enrollment '{enrollment_id}' with a new x509 certificate in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new endorsement key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new primary key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new reprovision type in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --reprovision-policy {reprovision_type} --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new allocation policy in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy geolatency --etag AAAAAAAAAAA= --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2} {iot_hub_host_name3}"
+  - summary: Update enrollment '{enrollment_id}' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with initial twin properties '{"location":{"region":"USA"}}' and initial twin tags '{"version":"2"}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-properties "{'location':{'region':'USA'}}" --initial-twin-tags "{'version1':'2'}"
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate.
+    description: ''
+  - name: --device-id -d
+    summary: IoT Hub Device ID.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --rc --remove-certificate
+    parameterValueGroup: false, true
+    summary: Remove current primary certificate.
+    description: ''
+  - name: --remove-secondary-certificate --rsc
+    parameterValueGroup: false, true
+    summary: Remove current secondary certificate.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+commands:
+- az_iot_dps_enrollment_create
+- az_iot_dps_enrollment_delete
+- az_iot_dps_enrollment_list
+- az_iot_dps_enrollment_show
+- az_iot_dps_enrollment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/dps/registration.yml b/2017-03-09-profile/docs-ref-autogen/iot/dps/registration.yml
new file mode 100644
index 0000000000..75d6e0b705
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/dps/registration.yml
@@ -0,0 +1,99 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps_registration
+name: az iot dps registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure IoT Hub Device Provisioning Service registrations.
+description: ''
+directCommands:
+- uid: az_iot_dps_registration_delete
+  name: az iot dps registration delete
+  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps registration delete --dps-name
+                                   --registration-id
+                                   --resource-group
+                                   [--etag]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --registration-id
+    summary: ID of device registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+- uid: az_iot_dps_registration_list
+  name: az iot dps registration list
+  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
+  description: ''
+  syntax: >-
+    az iot dps registration list --dps-name
+                                 --enrollment-id
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_dps_registration_show
+  name: az iot dps registration show
+  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps registration show --dps-name
+                                 --registration-id
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --registration-id
+    summary: ID of device registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_dps_registration_delete
+- az_iot_dps_registration_list
+- az_iot_dps_registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure IoT Hub Device Provisioning Service registrations.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/edge.yml b/2017-03-09-profile/docs-ref-autogen/iot/edge.yml
new file mode 100644
index 0000000000..551cf2387f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/edge.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_edge
+name: az iot edge
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot edge** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT solutions on the Edge.
+description: ''
+directCommands:
+- uid: az_iot_edge_set-modules
+  name: az iot edge set-modules
+  summary: Set edge modules on a single device.
+  description: >-
+    Modules content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
+
+
+    Note: Upon execution the command will output the collection of modules applied to the device.
+  syntax: >-
+    az iot edge set-modules --content
+                            --device-id
+                            [--auth-type {key, login}]
+                            [--hub-name]
+                            [--login]
+                            [--resource-group]
+  examples:
+  - summary: Test edge modules while in development by setting modules on a target device.
+    syntax: az iot edge set-modules --hub-name {iothub_name} --device-id {device_id} --content ../modules_content.json
+  requiredParameters:
+  - isRequired: true
+    name: --content -k
+    summary: IoT Edge deployment content. Provide file path or raw json.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_edge_deployment
+- az_iot_edge_deployment_create
+- az_iot_edge_deployment_delete
+- az_iot_edge_deployment_list
+- az_iot_edge_deployment_show
+- az_iot_edge_deployment_show-metric
+- az_iot_edge_deployment_update
+- az_iot_edge_set-modules
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT solutions on the Edge.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/edge/deployment.yml b/2017-03-09-profile/docs-ref-autogen/iot/edge/deployment.yml
new file mode 100644
index 0000000000..aa3945e56f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/edge/deployment.yml
@@ -0,0 +1,312 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_edge_deployment
+name: az iot edge deployment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot edge deployment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Edge deployments at scale.
+description: ''
+directCommands:
+- uid: az_iot_edge_deployment_create
+  name: az iot edge deployment create
+  summary: Create an IoT Edge deployment in a target IoT Hub.
+  description: >-
+    Deployment content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
+
+
+    Edge deployments can be created with user defined metrics for on demand evaluation.
+
+    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
+  syntax: >-
+    az iot edge deployment create --content
+                                  --deployment-id
+                                  [--auth-type {key, login}]
+                                  [--hub-name]
+                                  [--lab]
+                                  [--layered {false, true}]
+                                  [--login]
+                                  [--metrics]
+                                  [--no-validation {false, true}]
+                                  [--pri]
+                                  [--resource-group]
+                                  [--target-condition]
+  examples:
+  - summary: Create a deployment with labels (bash syntax example) that applies for devices in 'building 9' and the environment is 'test'.
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{"key0":"value0", "key1":"value1"}' --target-condition "tags.building=9 and tags.environment='test'" --priority 3
+  - summary: Create a deployment with labels (powershell syntax example) that applies for devices tagged with environment 'dev'.
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels "{'key':'value'}" --target-condition "tags.environment='dev'"
+  - summary: Create a layered deployment that applies for devices tagged with environment 'dev'. Both user metrics and modules content defined inline (powershell syntax example).
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content "{'modulesContent':{'`$edgeAgent':{'properties.desired.modules.mymodule0':{ }},'`$edgeHub':{'properties.desired.routes.myroute0':'FROM /messages/* INTO `$upstream'}}}" --target-condition "tags.environment='dev'" --priority 10 --metrics "{'queries':{'mymetrik':'SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200'}}" --layered
+  - summary: Create a layered deployment that applies for devices in 'building 9' and environment 'test'. Both user metrics and modules content defined inline (bash syntax example).
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content '{"modulesContent":{"$edgeAgent":{"properties.desired.modules.mymodule0":{ }},"$edgeHub":{"properties.desired.routes.myroute0":"FROM /messages/* INTO $upstream"}}}' --target-condition "tags.building=9 and tags.environment='test'" --metrics '{"queries":{"mymetrik":"SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200"}}' --layered
+  - summary: Create a layered deployment that applies for devices in 'building 9' and environment 'test'. Both user metrics and modules content defined from file.
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content layered_modules_content.json --target-condition "tags.building=9 and tags.environment='test'" --metrics metrics_content.json --layered
+  requiredParameters:
+  - isRequired: true
+    name: --content -k
+    summary: IoT Edge deployment content. Provide file path or raw json.
+    description: ''
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --lab --labels
+    summary: "Map of labels to be applied to target deployment. Use the following format: '{\"key0\":\"value0\", \"key1\":\"value1\"}'."
+    description: ''
+  - name: --layered
+    parameterValueGroup: false, true
+    summary: Layered deployments allow you to define desired properties in $edgeAgent, $edgeHub and user modules that will layer on top of a base deployment. For example the routes specified in a layered deployment will merge with routes of the base deployment. Routes with the same name will be overwritten based on deployment priority.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metrics -m
+    summary: IoT Edge deployment metric definitions. Provide file path or raw json.
+    description: ''
+  - name: --no-validation
+    parameterValueGroup: false, true
+    summary: Disables client side schema validation for edge deployment creation.
+    description: ''
+  - name: --pri --priority
+    summary: Weight of deployment in case of competing rules (highest wins).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --target-condition --tc -t
+    summary: Target condition in which an Edge deployment applies to.
+    description: ''
+- uid: az_iot_edge_deployment_delete
+  name: az iot edge deployment delete
+  summary: Delete an IoT Edge deployment.
+  description: ''
+  syntax: >-
+    az iot edge deployment delete --deployment-id
+                                  [--auth-type {key, login}]
+                                  [--etag]
+                                  [--hub-name]
+                                  [--login]
+                                  [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_edge_deployment_list
+  name: az iot edge deployment list
+  summary: List IoT Edge deployments in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot edge deployment list [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+                                [--top]
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of deployments to return. By default all deployments are returned.
+    description: ''
+- uid: az_iot_edge_deployment_show
+  name: az iot edge deployment show
+  summary: Get the details of an IoT Edge deployment.
+  description: ''
+  syntax: >-
+    az iot edge deployment show --deployment-id
+                                [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_edge_deployment_show-metric
+  name: az iot edge deployment show-metric
+  summary: Evaluate a target system metric defined in an IoT Edge deployment.
+  description: ''
+  syntax: >-
+    az iot edge deployment show-metric --deployment-id
+                                       --metric-id
+                                       [--auth-type {key, login}]
+                                       [--hub-name]
+                                       [--login]
+                                       [--metric-type {system, user}]
+                                       [--resource-group]
+  examples:
+  - summary: Evaluate the 'appliedCount' system metric
+    syntax: az iot edge deployment show-metric -m appliedCount -d {deployment_name} -n {iothub_name} --mt system
+  - summary: Evaluate the 'myCustomMetric' user metric
+    syntax: az iot edge deployment show-metric -m myCustomMetric -d {deployment_name} -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  - isRequired: true
+    name: --metric-id -m
+    summary: Target metric for evaluation.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metric-type --mt
+    defaultValue: user
+    parameterValueGroup: system, user
+    summary: Indicates which metric collection should be used to lookup a metric.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_edge_deployment_update
+  name: az iot edge deployment update
+  summary: >-
+    Update specified properties of an IoT Edge deployment.
+
+
+    Use --set followed by property assignments for updating a deployment.
+
+
+    Note: IoT Edge deployment content is immutable. Deployment properties that can be
+
+    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
+  description: ''
+  syntax: >-
+    az iot edge deployment update --deployment-id
+                                  [--add]
+                                  [--auth-type {key, login}]
+                                  [--etag]
+                                  [--force-string]
+                                  [--hub-name]
+                                  [--login]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+  examples:
+  - summary: Alter the labels and target condition of an existing edge deployment
+    syntax: az iot edge deployment update -d {deployment_name} -n {iothub_name} --set labels='{"purpose":"dev", "owners":"IoTEngineering"}' targetCondition='tags.building=9'
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_iot_edge_deployment_create
+- az_iot_edge_deployment_delete
+- az_iot_edge_deployment_list
+- az_iot_edge_deployment_show
+- az_iot_edge_deployment_show-metric
+- az_iot_edge_deployment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Edge deployments at scale.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub.yml
new file mode 100644
index 0000000000..d0929df3b8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub.yml
@@ -0,0 +1,435 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub
+name: az iot hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage entities in an Azure IoT Hub.
+description: ''
+directCommands:
+- uid: az_iot_hub_generate-sas-token
+  name: az iot hub generate-sas-token
+  summary: Generate a SAS token for a target IoT Hub, device or module.
+  description: For device SAS tokens, the policy parameter is used to access the the device registry only. Therefore the policy should have read access to the registry. For IoT Hub tokens the policy is part of the SAS.
+  syntax: >-
+    az iot hub generate-sas-token [--auth-type {key, login}]
+                                  [--device-id]
+                                  [--du]
+                                  [--hub-name]
+                                  [--key-type {primary, secondary}]
+                                  [--login]
+                                  [--module-id]
+                                  [--pn]
+                                  [--resource-group]
+  examples:
+  - summary: Generate an IoT Hub SAS token using the iothubowner policy and primary key.
+    syntax: az iot hub generate-sas-token -n {iothub_name}
+  - summary: Generate an IoT Hub SAS token using the registryRead policy and secondary key.
+    syntax: az iot hub generate-sas-token -n {iothub_name} --policy registryRead --key-type secondary
+  - summary: Generate a device SAS token using the iothubowner policy to access the {iothub_name} device registry.
+    syntax: az iot hub generate-sas-token -d {device_id} -n {iothub_name}
+  - summary: Generate a device SAS token using an IoT Hub connection string (with registry access)
+    syntax: az iot hub generate-sas-token -d {device_id} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - name: --du --duration
+    defaultValue: "3600"
+    summary: Valid token duration in seconds.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --module-id -m
+    summary: Target Module.
+    description: ''
+  - name: --pn --policy-name
+    defaultValue: iothubowner
+    summary: Shared access policy with operation permissions for target IoT Hub entity.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_invoke-device-method
+  name: az iot hub invoke-device-method
+  summary: Invoke a device method.
+  description: ''
+  syntax: >-
+    az iot hub invoke-device-method --device-id
+                                    --method-name
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--method-payload]
+                                    [--resource-group]
+                                    [--timeout]
+  examples:
+  - summary: Invoke a direct method on device from the cloud.
+    syntax: az iot hub invoke-device-method --hub-name {iothub_name} --device-id {device_id} --method-name Reboot --method-payload '{"version":"1.0"}'
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --method-name --mn
+    summary: Target method for invocation.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --method-payload --mp
+    defaultValue: '{}'
+    summary: Json payload to be passed to method. Must be file path or raw json.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --timeout --to
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait for device method result.
+    description: ''
+- uid: az_iot_hub_invoke-module-method
+  name: az iot hub invoke-module-method
+  summary: Invoke an Edge module method.
+  description: ''
+  syntax: >-
+    az iot hub invoke-module-method --device-id
+                                    --method-name
+                                    --module-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--method-payload]
+                                    [--resource-group]
+                                    [--timeout]
+  examples:
+  - summary: Invoke a direct method on edge device using a module from the cloud.
+    syntax: "az iot hub invoke-module-method -n {iothub_name} -d {device_id} -m '$edgeAgent' --method-name 'RestartModule' --method-payload '{\"schemaVersion\": \"1.0\"}'"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --method-name --mn
+    summary: Target method for invocation.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --method-payload --mp
+    defaultValue: '{}'
+    summary: Json payload to be passed to method. Must be file path or raw json.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --timeout --to
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait for device method result.
+    description: ''
+- uid: az_iot_hub_monitor-events
+  name: az iot hub monitor-events
+  summary: Monitor device telemetry & messages sent to an IoT Hub.
+  description: >-
+    EXPERIMENTAL requires Python 3.5+
+
+    This command relies on and may install dependent Cython package (uamqp) upon first execution.
+
+    https://github.com/Azure/azure-uamqp-python.
+  syntax: >-
+    az iot hub monitor-events [--cg]
+                              [--content-type]
+                              [--device-id]
+                              [--device-query]
+                              [--enqueued-time]
+                              [--hub-name]
+                              [--interface]
+                              [--login]
+                              [--module-id]
+                              [--properties {all, anno, app, sys}]
+                              [--repair {false, true}]
+                              [--resource-group]
+                              [--timeout]
+                              [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot hub monitor-events -n {iothub_name}
+  - summary: Basic usage with an IoT Hub connection string
+    syntax: az iot hub monitor-events -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
+  - summary: Basic usage when filtering on target device
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id}
+  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
+    syntax: az iot hub monitor-events -n {iothub_name} -d Device*
+  - summary: Filter devices using IoT Hub query language
+    syntax: az iot hub monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
+  - summary: Filter device and specify an Event Hub consumer group to bind to.
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id} --cg {consumer_group_name}
+  - summary: Receive message annotations (message headers)
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno
+  - summary: Receive message annotations + system properties. Never time out.
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno sys --timeout 0
+  - summary: Receive all message attributes from all device messages
+    syntax: az iot hub monitor-events -n {iothub_name} --props all
+  - summary: Receive all messages and parse message payload as JSON
+    syntax: az iot hub monitor-events -n {iothub_name} --content-type application/json
+  optionalParameters:
+  - name: --cg --consumer-group -c
+    defaultValue: $Default
+    summary: Specify the consumer group to use when connecting to event hub endpoint.
+    description: ''
+  - name: --content-type --ct
+    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
+    description: ''
+  - name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - name: --device-query -q
+    summary: Specify a custom query to filter devices.
+    description: ''
+  - name: --enqueued-time --et -e
+    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --interface -i
+    summary: 'Target interface identifier to filter on. For example: dtmi:com:example:TemperatureController;1.'
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --module-id -m
+    summary: Target Module.
+    description: ''
+  - name: --properties --props -p
+    parameterValueGroup: all, anno, app, sys
+    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --timeout --to -t
+    defaultValue: "300"
+    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_hub_monitor-feedback
+  name: az iot hub monitor-feedback
+  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
+  description: >-
+    EXPERIMENTAL requires Python 3.4+
+
+    This command relies on and may install dependent Cython package (uamqp) upon first execution.
+
+    https://github.com/Azure/azure-uamqp-python.
+  syntax: >-
+    az iot hub monitor-feedback [--auth-type {key, login}]
+                                [--device-id]
+                                [--hub-name]
+                                [--login]
+                                [--repair {false, true}]
+                                [--resource-group]
+                                [--wait-on-msg]
+                                [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot hub monitor-feedback -n {iothub_name}
+  - summary: Basic usage with an IoT Hub connection string
+    syntax: az iot hub monitor-feedback -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
+  - summary: Basic usage when filtering on target device
+    syntax: az iot hub monitor-feedback -n {iothub_name} -d {device_id}
+  - summary: Exit feedback monitor upon receiving a message with specific id (uuid)
+    syntax: az iot hub monitor-feedback -n {iothub_name} -d {device_id} -w {message_id}
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --wait-on-msg -w
+    summary: Feedback monitor will block until a message with specific id (uuid) is received.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_hub_query
+  name: az iot hub query
+  summary: Query an IoT Hub using a powerful SQL-like language.
+  description: Query an IoT Hub using a powerful SQL-like language to retrieve information regarding device and module twins, jobs and message routing. See https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language for more information.
+  syntax: >-
+    az iot hub query --query-command
+                     [--auth-type {key, login}]
+                     [--hub-name]
+                     [--login]
+                     [--resource-group]
+                     [--top]
+  examples:
+  - summary: Query all device twin data in an Azure IoT Hub.
+    syntax: az iot hub query -n {iothub_name} -q "select * from devices"
+  - summary: Query all module twin data on target device.
+    syntax: az iot hub query -n {iothub_name} -q "select * from devices.modules where devices.deviceId = '{device_id}'"
+  requiredParameters:
+  - isRequired: true
+    name: --query-command -q
+    summary: User query to be executed.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of elements to return. By default query has no cap.
+    description: ''
+commands:
+- az_iot_hub_configuration
+- az_iot_hub_configuration_create
+- az_iot_hub_configuration_delete
+- az_iot_hub_configuration_list
+- az_iot_hub_configuration_show
+- az_iot_hub_configuration_show-metric
+- az_iot_hub_configuration_update
+- az_iot_hub_connection-string
+- az_iot_hub_connection-string_show
+- az_iot_hub_device-identity
+- az_iot_hub_device-identity_children
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+- az_iot_hub_device-identity_connection-string
+- az_iot_hub_device-identity_connection-string_show
+- az_iot_hub_device-identity_create
+- az_iot_hub_device-identity_delete
+- az_iot_hub_device-identity_export
+- az_iot_hub_device-identity_import
+- az_iot_hub_device-identity_list
+- az_iot_hub_device-identity_parent
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+- az_iot_hub_device-identity_renew-key
+- az_iot_hub_device-identity_show
+- az_iot_hub_device-identity_update
+- az_iot_hub_device-twin
+- az_iot_hub_device-twin_replace
+- az_iot_hub_device-twin_show
+- az_iot_hub_device-twin_update
+- az_iot_hub_digital-twin
+- az_iot_hub_digital-twin_invoke-command
+- az_iot_hub_digital-twin_show
+- az_iot_hub_digital-twin_update
+- az_iot_hub_distributed-tracing
+- az_iot_hub_distributed-tracing_show
+- az_iot_hub_distributed-tracing_update
+- az_iot_hub_generate-sas-token
+- az_iot_hub_invoke-device-method
+- az_iot_hub_invoke-module-method
+- az_iot_hub_job
+- az_iot_hub_job_cancel
+- az_iot_hub_job_create
+- az_iot_hub_job_list
+- az_iot_hub_job_show
+- az_iot_hub_module-identity
+- az_iot_hub_module-identity_connection-string
+- az_iot_hub_module-identity_connection-string_show
+- az_iot_hub_module-identity_create
+- az_iot_hub_module-identity_delete
+- az_iot_hub_module-identity_list
+- az_iot_hub_module-identity_show
+- az_iot_hub_module-identity_update
+- az_iot_hub_module-twin
+- az_iot_hub_module-twin_replace
+- az_iot_hub_module-twin_show
+- az_iot_hub_module-twin_update
+- az_iot_hub_monitor-events
+- az_iot_hub_monitor-feedback
+- az_iot_hub_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage entities in an Azure IoT Hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/configuration.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/configuration.yml
new file mode 100644
index 0000000000..e2161c47a8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/configuration.yml
@@ -0,0 +1,309 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_configuration
+name: az iot hub configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT automatic device management configuration at scale.
+description: ''
+directCommands:
+- uid: az_iot_hub_configuration_create
+  name: az iot hub configuration create
+  summary: Create an IoT automatic device management configuration in a target IoT Hub.
+  description: >-
+    Configuration content is json and slighty varies based on device or module intent.
+
+
+    Device configurations are in the form of {"deviceContent":{...}} or {"content":{"deviceContent":{...}}}
+
+
+    Module configurations are in the form of {"moduleContent":{...}} or {"content":{"moduleContent":{...}}}
+
+
+    Configurations can be defined with user provided metrics for on demand evaluation.
+
+    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
+
+
+    Note: Target condition for modules must start with "from devices.modules where".
+  syntax: >-
+    az iot hub configuration create --config-id
+                                    --content
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--lab]
+                                    [--login]
+                                    [--metrics]
+                                    [--pri]
+                                    [--resource-group]
+                                    [--target-condition]
+  examples:
+  - summary: Create a device configuration with a priority of 3 that applies on condition when a device is tagged in building 9 and the environment is 'test'.
+    syntax: az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition "tags.building=9 and tags.environment='test'" --priority 3
+  - summary: Create a device configuration with labels and provide user metrics inline (bash syntax example)
+    syntax: "az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition \"tags.building=9\" --labels '{\"key0\":\"value0\", \"key1\":\"value1\"}' --priority 10 --metrics '{\"metrics\": {\"queries\": {\"mymetric\": \"select deviceId from devices where tags.location='US'\"}}}'"
+  - summary: Create a module configuration with labels and provide user metrics inline (cmd syntax example)
+    syntax: "az iot hub configuration create -c {config_name} -n {iothub_name} --content module_content.json --target-condition \"from devices.modules where tags.building=9\" --labels \"{\\\"key0\\\":\\\"value0\\\", \\\"key1\\\":\\\"value1\\\"}\" --metrics \"{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\": \\\"select moduleId from devices.modules where tags.location='US'\\\"}}}\""
+  - summary: Create a module configuration with content and user metrics inline (powershell syntax example)
+    syntax: "az iot hub configuration create -c {config_name} -n {iothub_name} --content '{\\\"moduleContent\\\": {\\\"properties.desired.chillerWaterSettings\\\": {\\\"temperature\\\": 38, \\\"pressure\\\": 78}}}' --target-condition \"from devices.modules where tags.building=9\" --priority 1 --metrics '{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\":\\\"select moduleId from devices.modules where tags.location=''US''\\\"}}}'"
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  - isRequired: true
+    name: --content -k
+    summary: Device configuration content. Provide file path or raw json.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --lab --labels
+    summary: 'Map of labels to be applied to target configuration. Format example: {"key0":"value0", "key1":"value1"}.'
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metrics -m
+    summary: Device configuration metric definitions. Provide file path or raw json.
+    description: ''
+  - name: --pri --priority
+    summary: Weight of the device configuration in case of competing rules (highest wins).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --target-condition --tc -t
+    summary: Target condition in which a device configuration applies to.
+    description: ''
+- uid: az_iot_hub_configuration_delete
+  name: az iot hub configuration delete
+  summary: Delete an IoT device configuration.
+  description: ''
+  syntax: >-
+    az iot hub configuration delete --config-id
+                                    [--auth-type {key, login}]
+                                    [--etag]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_configuration_list
+  name: az iot hub configuration list
+  summary: List IoT automatic device management configurations in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub configuration list [--auth-type {key, login}]
+                                  [--hub-name]
+                                  [--login]
+                                  [--resource-group]
+                                  [--top]
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of configurations to return. By default all configurations are returned.
+    description: ''
+- uid: az_iot_hub_configuration_show
+  name: az iot hub configuration show
+  summary: Get the details of an IoT automatic device management configuration.
+  description: ''
+  syntax: >-
+    az iot hub configuration show --config-id
+                                  [--auth-type {key, login}]
+                                  [--hub-name]
+                                  [--login]
+                                  [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_configuration_show-metric
+  name: az iot hub configuration show-metric
+  summary: Evaluate a target user or system metric defined in an IoT device configuration.
+  description: ''
+  syntax: >-
+    az iot hub configuration show-metric --config-id
+                                         --metric-id
+                                         [--auth-type {key, login}]
+                                         [--hub-name]
+                                         [--login]
+                                         [--metric-type {system, user}]
+                                         [--resource-group]
+  examples:
+  - summary: Evaluate the user defined 'warningLimit' metric
+    syntax: az iot hub configuration show-metric -m warningLimit -c {configuration_name} -n {iothub_name}
+  - summary: Evaluate the system 'appliedCount' metric
+    syntax: az iot hub configuration show-metric --metric-id appliedCount -c {configuration_name} -n {iothub_name} --metric-type system
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  - isRequired: true
+    name: --metric-id -m
+    summary: Target metric for evaluation.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metric-type --mt
+    defaultValue: user
+    parameterValueGroup: system, user
+    summary: Indicates which metric collection should be used to lookup a metric.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_configuration_update
+  name: az iot hub configuration update
+  summary: >-
+    Update specified properties of an IoT automatic device management configuration.
+
+
+    Use --set followed by property assignments for updating a configuration.
+
+
+    Note: Configuration content is immutable. Configuration properties that can be
+
+    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
+  description: ''
+  syntax: >-
+    az iot hub configuration update --config-id
+                                    [--add]
+                                    [--auth-type {key, login}]
+                                    [--etag]
+                                    [--force-string]
+                                    [--hub-name]
+                                    [--login]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+  examples:
+  - summary: Alter the priority of a device configuration and update its target condition
+    syntax: az iot hub configuration update -c {configuration_name} -n {iothub_name} --set priority=10 targetCondition="tags.building=43 and tags.environment='dev'"
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_iot_hub_configuration_create
+- az_iot_hub_configuration_delete
+- az_iot_hub_configuration_list
+- az_iot_hub_configuration_show
+- az_iot_hub_configuration_show-metric
+- az_iot_hub_configuration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT automatic device management configuration at scale.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/connection-string.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/connection-string.yml
new file mode 100644
index 0000000000..ba6801b208
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/connection-string.yml
@@ -0,0 +1,76 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_connection-string
+name: az iot hub connection-string
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub connection-string** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Hub connection strings.
+description: ''
+directCommands:
+- uid: az_iot_hub_connection-string_show
+  name: az iot hub connection-string show
+  summary: Show the connection strings for the specified IoT Hubs using the given policy name and key.
+  description: ''
+  syntax: >-
+    az iot hub connection-string show [--all]
+                                      [--default-eventhub {false, true}]
+                                      [--hub-name]
+                                      [--key-type {primary, secondary}]
+                                      [--pn]
+                                      [--resource-group]
+  examples:
+  - summary: Show the connection strings for all active state IoT Hubs in a subscription using the default policy and primary key.
+    syntax: az iot hub connection-string show
+  - summary: Show the connection strings for all active state IoT Hubs in a resource group using the default policy and primary key.
+    syntax: az iot hub connection-string show --resource-group MyResourceGroup
+  - summary: Show all connection strings of the given IoT Hub using primary key.
+    syntax: az iot hub connection-string show -n MyIotHub --all
+  - summary: Show the connection string of the given IoT Hub using the default policy and primary key.
+    syntax: az iot hub connection-string show -n MyIotHub
+  - summary: Show the connection string of the given IoT Hub using policy 'service' and secondary key.
+    syntax: az iot hub connection-string show -n MyIotHub --policy-name service --key-type secondary
+  - summary: Show the eventhub compatible connection string of the given IoT Hub's default eventhub.
+    syntax: az iot hub connection-string show -n MyIotHub --default-eventhub
+  optionalParameters:
+  - name: --all --show-all
+    summary: Show all shared access policies for the respective IoT Hub.
+    description: ''
+  - name: --default-eventhub --eh
+    parameterValueGroup: false, true
+    summary: 'Flag indicating the connection string returned is for the default EventHub endpoint. Default: false.'
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --pn --policy-name
+    defaultValue: iothubowner
+    summary: Shared access policy with operation permissions for target IoT Hub entity.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_connection-string_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Hub connection strings.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity.yml
new file mode 100644
index 0000000000..44dbd8480f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity.yml
@@ -0,0 +1,451 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity
+name: az iot hub device-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT devices.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_create
+  name: az iot hub device-identity create
+  summary: Create a device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub device-identity create --device-id
+                                      [--am {shared_private_key, x509_ca, x509_thumbprint}]
+                                      [--auth-type {key, login}]
+                                      [--edge-enabled {false, true}]
+                                      [--hub-name]
+                                      [--login]
+                                      [--od]
+                                      [--primary-thumbprint]
+                                      [--resource-group]
+                                      [--secondary-thumbprint]
+                                      [--sta {disabled, enabled}]
+                                      [--star]
+                                      [--valid-days]
+  examples:
+  - summary: Create an edge enabled IoT device with default authorization (shared private key).
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee
+  - summary: Create an IoT device with self-signed certificate authorization, generate a cert valid for 10 days then use its thumbprint.
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --valid-days 10
+  - summary: Create an IoT device with self-signed certificate authorization, generate a cert of default expiration (365 days) and output to target directory.
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --output-dir /path/to/output
+  - summary: Create an IoT device with self-signed certificate authorization and explicitly provide primary and secondary thumbprints.
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --ptp {thumbprint_1} --stp {thumbprint_2}
+  - summary: Create an IoT device with root CA authorization with disabled status and reason
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_ca --status disabled --status-reason 'for reasons'
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --am --auth-method
+    defaultValue: shared_private_key
+    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
+    summary: The authorization type an entity is to be created with.
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --od --output-dir
+    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
+    description: ''
+  - name: --primary-thumbprint --ptp
+    summary: Explicit self-signed certificate thumbprint to use for primary key.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --secondary-thumbprint --stp
+    summary: Explicit self-signed certificate thumbprint to use for secondary key.
+    description: ''
+  - name: --sta --status
+    defaultValue: enabled
+    parameterValueGroup: disabled, enabled
+    summary: Set device status upon creation.
+    description: ''
+  - name: --star --status-reason
+    summary: Description for device status.
+    description: ''
+  - name: --valid-days --vd
+    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
+    description: ''
+- uid: az_iot_hub_device-identity_delete
+  name: az iot hub device-identity delete
+  summary: Delete an IoT Hub device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity delete --device-id
+                                      [--auth-type {key, login}]
+                                      [--etag]
+                                      [--hub-name]
+                                      [--login]
+                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_export
+  name: az iot hub device-identity export
+  summary: Export all device identities from an IoT Hub to an Azure Storage blob container. For inline blob container SAS uri input, please review the input rules of your environment.
+  description: For more information, see https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities.
+  syntax: >-
+    az iot hub device-identity export --bcu
+                                      --hub-name
+                                      [--auth-type {identity, key}]
+                                      [--identity]
+                                      [--ik {false, true}]
+                                      [--resource-group]
+  examples:
+  - summary: Export all device identities to a configured blob container and include device keys. Uses an inline SAS uri example.
+    syntax: az iot hub device-identity export -n {iothub_name} --ik --bcu 'https://mystorageaccount.blob.core.windows.net/devices?sv=2019-02-02&st=2020-08-23T22%3A35%3A00Z&se=2020-08-24T22%3A35%3A00Z&sr=c&sp=rwd&sig=VrmJ5sQtW3kLzYg10VqmALGCp4vtYKSLNjZDDJBSh9s%3D'
+  - summary: Export all device identities to a configured blob container using a file path which contains the SAS uri.
+    syntax: az iot hub device-identity export -n {iothub_name} --bcu {sas_uri_filepath}
+  - summary: Export all device identities to a configured blob container and include device keys. Uses system assigned identity that has Storage Blob Data Contributor roles for the storage account. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity export -n {iothub_name} --ik --bcu 'https://mystorageaccount.blob.core.windows.net/devices' --auth-type identity --identity [system]
+  - summary: Export all device identities to a configured blob container and include device keys. Uses user assigned managed identity that has Storage Blob Data Contributor roles for the storage account and contributor for the IoT hub. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity export -n {iothub_name} --ik --bcu 'https://mystorageaccount.blob.core.windows.net/devices' --auth-type identity --identity {managed_identity_resource_id}
+  requiredParameters:
+  - isRequired: true
+    name: --bcu --blob-container-uri
+    summary: 'Blob Shared Access Signature URI with write, read, and delete access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication an https:// URI is still required - but no SAS token is necessary. Input for this argument can be inline or from a file path.'
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type --storage-authentication-type
+    parameterValueGroup: identity, key
+    summary: Authentication type for communicating with the storage container.
+    description: ''
+  - name: --identity
+    summary: Managed identity type to determine if system assigned managed identity or user assigned managed identity is used. For system assigned managed identity, use [system]. For user assigned managed identity, provide the user assigned managed identity resource id. This identity requires a Storage Blob Data Contributor roles for the Storage Account.
+    description: ''
+  - name: --ik --include-keys
+    parameterValueGroup: false, true
+    summary: If set, keys are exported normally. Otherwise, keys are set to null in export output.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_import
+  name: az iot hub device-identity import
+  summary: Import device identities to an IoT Hub from a blob. For inline blob container SAS uri input, please review the input rules of your environment.
+  description: For more information, see https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities.
+  syntax: >-
+    az iot hub device-identity import --hub-name
+                                      --ibcu
+                                      --obcu
+                                      [--auth-type {identity, key}]
+                                      [--identity]
+                                      [--resource-group]
+  examples:
+  - summary: Import all device identities from a blob using an inline SAS uri.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri} --obcu {output_sas_uri}
+  - summary: Import all device identities from a blob using a file path which contains SAS uri.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri_filepath} --obcu {output_sas_uri_filepath}
+  - summary: Import all device identities from a blob using system assigned identity that has Storage Blob Data Contributor roles for both storage accounts. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri} --obcu {output_sas_uri} --auth-type identity --identity [system]
+  - summary: Import all device identities from a blob using user assigned managed identity that has Storage Blob Data Contributor roles for both storage accounts and contributor for the IoT hub. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri} --obcu {output_sas_uri} --auth-type identity --identity {managed_identity_resource_id}
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - isRequired: true
+    name: --ibcu --input-blob-container-uri
+    summary: 'Blob Shared Access Signature URI with read access to a blob container. This blob contains the operations to be performed on the identity registry. Note: when using Identity-based authentication an https:// URI is still required - but no SAS token is necessary. Input for this argument can be inline or from a file path.'
+    description: ''
+  - isRequired: true
+    name: --obcu --output-blob-container-uri
+    summary: 'Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication an https:// URI without the SAS token is still required. Input for this argument can be inline or from a file path.'
+    description: ''
+  optionalParameters:
+  - name: --auth-type --storage-authentication-type
+    parameterValueGroup: identity, key
+    summary: Authentication type for communicating with the storage container.
+    description: ''
+  - name: --identity
+    summary: Managed identity type to determine if system assigned managed identity or user assigned managed identity is used. For system assigned managed identity, use [system]. For user assigned managed identity, provide the user assigned managed identity resource id. This identity requires a Storage Blob Data Contributor role for the target Storage Account and Contributor role for the IoT Hub.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_list
+  name: az iot hub device-identity list
+  summary: List devices in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub device-identity list [--auth-type {key, login}]
+                                    [--edge-enabled {false, true}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+                                    [--top]
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    defaultValue: "1000"
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_hub_device-identity_renew-key
+  name: az iot hub device-identity renew-key
+  summary: Renew target keys of an IoT Hub device with sas authentication.
+  description: ''
+  syntax: >-
+    az iot hub device-identity renew-key --device-id
+                                         --hub-name
+                                         --key-type {primary, secondary, swap}
+                                         [--auth-type {key, login}]
+                                         [--etag]
+                                         [--login]
+                                         [--resource-group]
+  examples:
+  - summary: Renew the primary key.
+    syntax: az iot hub device-identity renew-key -d {device_id} -n {iothub_name} --kt primary
+  - summary: Swap the primary and secondary keys.
+    syntax: az iot hub device-identity renew-key -d {device_id} -n {iothub_name} --kt swap
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - isRequired: true
+    name: --key-type --kt
+    parameterValueGroup: primary, secondary, swap
+    summary: Target key type to regenerate.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_show
+  name: az iot hub device-identity show
+  summary: Get the details of an IoT Hub device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity show --device-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_update
+  name: az iot hub device-identity update
+  summary: Update an IoT Hub device.
+  description: Use --set followed by property assignments for updating a device. Leverage parameters returned from 'iot hub device-identity show'.
+  syntax: >-
+    az iot hub device-identity update --device-id
+                                      [--add]
+                                      [--am {shared_private_key, x509_ca, x509_thumbprint}]
+                                      [--auth-type {key, login}]
+                                      [--edge-enabled {false, true}]
+                                      [--etag]
+                                      [--force-string]
+                                      [--hub-name]
+                                      [--login]
+                                      [--pk]
+                                      [--primary-thumbprint]
+                                      [--remove]
+                                      [--resource-group]
+                                      [--secondary-key]
+                                      [--secondary-thumbprint]
+                                      [--set]
+                                      [--sta {disabled, enabled}]
+                                      [--star]
+  examples:
+  - summary: Turn on edge capabilities for device
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --set capabilities.iotEdge=true
+  - summary: Turn on edge capabilities for device using convenience argument.
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --ee
+  - summary: Disable device status
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled
+  - summary: Disable device status using convenience argument.
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --status disabled
+  - summary: In one command
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled capabilities.iotEdge=true
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --am --auth-method
+    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
+    summary: The authorization type an entity is to be created with.
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --primary-thumbprint --ptp
+    summary: Explicit self-signed certificate thumbprint to use for primary key.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --secondary-thumbprint --stp
+    summary: Explicit self-signed certificate thumbprint to use for secondary key.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sta --status
+    parameterValueGroup: disabled, enabled
+    summary: Set device status upon creation.
+    description: ''
+  - name: --star --status-reason
+    summary: Description for device status.
+    description: ''
+commands:
+- az_iot_hub_device-identity_children
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+- az_iot_hub_device-identity_connection-string
+- az_iot_hub_device-identity_connection-string_show
+- az_iot_hub_device-identity_create
+- az_iot_hub_device-identity_delete
+- az_iot_hub_device-identity_export
+- az_iot_hub_device-identity_import
+- az_iot_hub_device-identity_list
+- az_iot_hub_device-identity_parent
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+- az_iot_hub_device-identity_renew-key
+- az_iot_hub_device-identity_show
+- az_iot_hub_device-identity_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT devices.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/children.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/children.yml
new file mode 100644
index 0000000000..668ffe8004
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/children.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity_children
+name: az iot hub device-identity children
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity children** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device's children device.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_children_add
+  name: az iot hub device-identity children add
+  summary: Add specified space-separated list of device ids as children of specified edge device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity children add --child-list
+                                            --device-id
+                                            [--auth-type {key, login}]
+                                            [--force]
+                                            [--hub-name]
+                                            [--login]
+                                            [--resource-group]
+  examples:
+  - summary: Add devices as a children to the edge device.
+    syntax: az iot hub device-identity children add -d {edge_device_id} --child-list {space_separated_device_id} -n {iothub_name}
+  - summary: Add devices as children to the edge device and overwrites children devices' original parent.
+    syntax: az iot hub device-identity children add -d {edge_device_id} --child-list {space_separated_device_id} -n {iothub_name} -f
+  requiredParameters:
+  - isRequired: true
+    name: --child-list --cl
+    summary: Child device list (space separated).
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --force -f
+    summary: Overwrites the child device's parent device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_children_list
+  name: az iot hub device-identity children list
+  summary: Outputs list of assigned child devices.
+  description: ''
+  syntax: >-
+    az iot hub device-identity children list --device-id
+                                             [--auth-type {key, login}]
+                                             [--hub-name]
+                                             [--login]
+                                             [--resource-group]
+  examples:
+  - summary: Show all assigned children devices as list.
+    syntax: az iot hub device-identity children list -d {edge_device_id} -n {iothub_name}
+  - summary: Show all assigned children devices as list whose device ID contains substring of 'test'.
+    syntax: az iot hub device-identity children list -d {edge_device_id} -n {iothub_name} --query "[?contains(@,'test')]"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_children_remove
+  name: az iot hub device-identity children remove
+  summary: Remove devices as children from specified edge device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity children remove --device-id
+                                               [--auth-type {key, login}]
+                                               [--child-list]
+                                               [--hub-name]
+                                               [--login]
+                                               [--remove-all]
+                                               [--resource-group]
+  examples:
+  - summary: Remove all mentioned devices as children of specified device.
+    syntax: az iot hub device-identity children remove -d {edge_device_id} --child-list {space_separated_device_id} -n {iothub_name}
+  - summary: Remove all devices as children specified edge device.
+    syntax: az iot hub device-identity children remove -d {edge_device_id} --remove-all
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --child-list --cl
+    summary: Child device list (space separated).
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove-all -a
+    summary: To remove all children.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device's children device.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/connection-string.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/connection-string.yml
new file mode 100644
index 0000000000..43c654f6b8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/connection-string.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity_connection-string
+name: az iot hub device-identity connection-string
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity connection-string** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device's connection string.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_connection-string_show
+  name: az iot hub device-identity connection-string show
+  summary: Show a given IoT Hub device connection string.
+  description: ''
+  syntax: >-
+    az iot hub device-identity connection-string show --device-id
+                                                      [--auth-type {key, login}]
+                                                      [--hub-name]
+                                                      [--key-type {primary, secondary}]
+                                                      [--login]
+                                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_device-identity_connection-string_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device's connection string.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/parent.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/parent.yml
new file mode 100644
index 0000000000..dd792f4ee0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-identity/parent.yml
@@ -0,0 +1,107 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity_parent
+name: az iot hub device-identity parent
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity parent** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device's parent device.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_parent_set
+  name: az iot hub device-identity parent set
+  summary: Set the parent device of the specified device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity parent set --device-id
+                                          --parent-device-id
+                                          [--auth-type {key, login}]
+                                          [--force]
+                                          [--hub-name]
+                                          [--login]
+                                          [--resource-group]
+  examples:
+  - summary: Set the parent device of the specified device.
+    syntax: az iot hub device-identity parent set -d {device_id} --pd {edge_device_id} -n {iothub_name}
+  - summary: Set the parent device of the specified device and overwrites its original parent.
+    syntax: az iot hub device-identity parent set -d {device_id} --pd {edge_device_id} --force -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --parent-device-id --pd
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --force -f
+    summary: Overwrites the device's parent device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_parent_show
+  name: az iot hub device-identity parent show
+  summary: Get the parent device of the specified device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity parent show --device-id
+                                           [--auth-type {key, login}]
+                                           [--hub-name]
+                                           [--login]
+                                           [--resource-group]
+  examples:
+  - summary: Get the parent device of the specified device.
+    syntax: az iot hub device-identity parent show -d {device_id} -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device's parent device.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/device-twin.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-twin.yml
new file mode 100644
index 0000000000..0890ba92aa
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/device-twin.yml
@@ -0,0 +1,168 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-twin
+name: az iot hub device-twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device twin configuration.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-twin_replace
+  name: az iot hub device-twin replace
+  summary: Replace device twin definition with target json.
+  description: Input json directly or use a file path.
+  syntax: >-
+    az iot hub device-twin replace --device-id
+                                   --json
+                                   [--auth-type {key, login}]
+                                   [--etag]
+                                   [--hub-name]
+                                   [--login]
+                                   [--resource-group]
+  examples:
+  - summary: Replace device twin with file contents.
+    syntax: az iot hub device-twin replace -d {device_id} -n {iothub_name} -j ../mydevicetwin.json
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --json -j
+    summary: Json to replace existing twin with. Provide file path or raw json.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-twin_show
+  name: az iot hub device-twin show
+  summary: Get a device twin definition.
+  description: ''
+  syntax: >-
+    az iot hub device-twin show --device-id
+                                [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-twin_update
+  name: az iot hub device-twin update
+  summary: Update device twin desired properties and tags.
+  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
+  syntax: >-
+    az iot hub device-twin update --device-id
+                                  [--add]
+                                  [--auth-type {key, login}]
+                                  [--desired]
+                                  [--etag]
+                                  [--force-string]
+                                  [--hub-name]
+                                  [--login]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--tags]
+  examples:
+  - summary: Patch device twin desired properties.
+    syntax: az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
+  - summary: Patch device twin tags.
+    syntax: "az iot hub device-twin update -n {iothub_name} -d {device_id} --tags '{\"country\": \"USA\"}'"
+  - summary: Patch removal of 'critical' desired property from parent 'temperature'
+    syntax: "az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --desired
+    summary: Twin desired properties.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: Twin tags.
+    description: ''
+commands:
+- az_iot_hub_device-twin_replace
+- az_iot_hub_device-twin_show
+- az_iot_hub_device-twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device twin configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/digital-twin.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/digital-twin.yml
new file mode 100644
index 0000000000..e3123e8194
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/digital-twin.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_digital-twin
+name: az iot hub digital-twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub digital-twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manipulate and interact with the digital twin of an IoT Hub device.
+description: ''
+directCommands:
+- uid: az_iot_hub_digital-twin_invoke-command
+  name: az iot hub digital-twin invoke-command
+  summary: Invoke a root or component level command of a digital twin device.
+  description: ''
+  syntax: >-
+    az iot hub digital-twin invoke-command --cn
+                                           --device-id
+                                           [--component-path]
+                                           [--connect-timeout]
+                                           [--hub-name]
+                                           [--login]
+                                           [--payload]
+                                           [--resource-group]
+                                           [--response-timeout]
+  examples:
+  - summary: Invoke root level command "reboot" which takes a payload that includes the "delay" property.
+    syntax: az iot hub digital-twin invoke-command --command-name reboot -n {iothub_name} -d {device_id} --payload '{"delay":5}'
+  - summary: Invoke command "getMaxMinReport" on component "thermostat1" that takes no input.
+    syntax: az iot hub digital-twin invoke-command --cn getMaxMinReport -n {iothub_name} -d {device_id} --component-path thermostat1
+  requiredParameters:
+  - isRequired: true
+    name: --cn --command-name
+    summary: Digital twin command name.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --component-path
+    summary: 'Digital twin component path. For example: thermostat1.'
+    description: ''
+  - name: --connect-timeout --cto
+    summary: Maximum interval of time, in seconds, that IoT Hub will attempt to connect to the device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --payload
+    defaultValue: '{}'
+    summary: JSON payload input for command. Provide file path or inline JSON.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --response-timeout --rto
+    summary: Maximum interval of time, in seconds, that the digital twin command will wait for the result.
+    description: ''
+- uid: az_iot_hub_digital-twin_show
+  name: az iot hub digital-twin show
+  summary: Show the digital twin of an IoT Hub device.
+  description: ''
+  syntax: >-
+    az iot hub digital-twin show --device-id
+                                 [--hub-name]
+                                 [--login]
+                                 [--resource-group]
+  examples:
+  - summary: Show the target device digital twin.
+    syntax: az iot hub digital-twin show -n {iothub_name} -d {device_id}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_digital-twin_update
+  name: az iot hub digital-twin update
+  summary: Update the read-write properties of a digital twin device via JSON patch specification.
+  description: Currently operations are limited to add, replace and remove.
+  syntax: >-
+    az iot hub digital-twin update --device-id
+                                   --json-patch
+                                   [--etag]
+                                   [--hub-name]
+                                   [--login]
+                                   [--resource-group]
+  examples:
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: "az iot hub digital-twin update --hub-name {iothub_name} --device-id {device_id} --json-patch '{\"op\":\"add\", \"path\":\"/thermostat1/targetTemperature\", \"value\": 54}'"
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: >-
+      az iot hub digital-twin update -n {iothub_name} -d {device_id} --json-patch '[
+        {"op":"remove", "path":"/thermostat1/targetTemperature"},
+        {"op":"add", "path":"/thermostat2/targetTemperature", "value": 22}
+      ]'
+  - summary: Update a digital twin property via JSON patch specification defined in a file.
+    syntax: az iot hub digital-twin update -n {iothub_name} -d {device_id} --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_digital-twin_invoke-command
+- az_iot_hub_digital-twin_show
+- az_iot_hub_digital-twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manipulate and interact with the digital twin of an IoT Hub device.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/distributed-tracing.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/distributed-tracing.yml
new file mode 100644
index 0000000000..6100040a1d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/distributed-tracing.yml
@@ -0,0 +1,101 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_distributed-tracing
+name: az iot hub distributed-tracing
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub distributed-tracing** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage distributed settings per-device.
+description: ''
+directCommands:
+- uid: az_iot_hub_distributed-tracing_show
+  name: az iot hub distributed-tracing show
+  summary: Get the distributed tracing settings for a device.
+  description: ''
+  syntax: >-
+    az iot hub distributed-tracing show --device-id
+                                        --hub-name
+                                        [--auth-type {key, login}]
+                                        [--resource-group]
+  examples:
+  - summary: Get the distributed tracing settings for a device
+    syntax: az iot hub distributed-tracing show -d {device_id} -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_distributed-tracing_update
+  name: az iot hub distributed-tracing update
+  summary: Update the distributed tracing options for a device.
+  description: ''
+  syntax: >-
+    az iot hub distributed-tracing update --device-id
+                                          --hub-name
+                                          --sampling-mode {off, on}
+                                          --sampling-rate
+                                          [--auth-type {key, login}]
+                                          [--resource-group]
+  examples:
+  - summary: Update the distributed tracing options for a device
+    syntax: az iot hub distributed-tracing update -d {device_id} --sm on --sr 50 -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - isRequired: true
+    name: --sampling-mode --sm
+    parameterValueGroup: off, on
+    summary: Turns sampling for distributed tracing on and off. 1 is On and, 2 is Off.
+    description: ''
+  - isRequired: true
+    name: --sampling-rate --sr
+    summary: Controls the amount of messages sampled for adding trace context. This value isa percentage. Only values from 0 to 100 (inclusive) are permitted.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_distributed-tracing_show
+- az_iot_hub_distributed-tracing_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage distributed settings per-device.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/job.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/job.yml
new file mode 100644
index 0000000000..d22cdb9738
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/job.yml
@@ -0,0 +1,247 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_job
+name: az iot hub job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Hub jobs (v2).
+description: ''
+directCommands:
+- uid: az_iot_hub_job_cancel
+  name: az iot hub job cancel
+  summary: Cancel an IoT Hub job.
+  description: ''
+  syntax: >-
+    az iot hub job cancel --job-id
+                          [--auth-type {key, login}]
+                          [--hub-name]
+                          [--login]
+                          [--resource-group]
+  examples:
+  - summary: Cancel an IoT Hub job.
+    syntax: az iot hub job cancel --hub-name {iothub_name} --job-id {job_id}
+  requiredParameters:
+  - isRequired: true
+    name: --job-id
+    summary: IoT Hub job Id.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_job_create
+  name: az iot hub job create
+  summary: Create and schedule an IoT Hub job for execution.
+  description: >-
+    When scheduling a twin update job, the twin patch is a required argument.
+
+    When scheduling a device method job, the method name and payload are required arguments.
+  syntax: >-
+    az iot hub job create --job-id
+                          --job-type {scheduleDeviceMethod, scheduleUpdateTwin}
+                          [--auth-type {key, login}]
+                          [--duration]
+                          [--hub-name]
+                          [--interval]
+                          [--login]
+                          [--mct]
+                          [--method-name]
+                          [--method-payload]
+                          [--method-response-timeout]
+                          [--patch]
+                          [--query-condition]
+                          [--resource-group]
+                          [--start]
+                          [--ttl]
+                          [--wait {false, true}]
+  examples:
+  - summary: Create and schedule a job to update the twin tags of all devices.
+    syntax: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}'"
+  - summary: Schedule job and block for result of "completed", "failed" or "cancelled". Specify poll interval in seconds.
+    syntax: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}' --wait --poll-interval 30"
+  - summary: Create a job to update a desired twin property on a subset of devices, scheduled to run at an arbitrary future time.
+    syntax: "az iot hub job create --job-id {job_name} --job-type scheduleUpdateTwin -n {iothub_name} --twin-patch '{\"properties\":{\"desired\": {\"temperatureF\": 65}}}' --start-time \"2020-01-08T12:19:56.868Z\" --query-condition \"deviceId IN ['MyDevice1', 'MyDevice2', 'MyDevice3']\""
+  - summary: Create and schedule a job to invoke a device method for a set of devices meeting a query condition.
+    syntax: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -n {iothub_name} --method-name setSyncIntervalSec --method-payload 30 --query-condition "properties.reported.settings.syncIntervalSec != 30"
+  - summary: Create and schedule a job to invoke a device method for all devices.
+    syntax: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -q "*" -n {iothub_name} --method-name setSyncIntervalSec --method-payload '{"version":"1.0"}'
+  requiredParameters:
+  - isRequired: true
+    name: --job-id
+    summary: IoT Hub job Id.
+    description: ''
+  - isRequired: true
+    name: --job-type --jt
+    parameterValueGroup: scheduleDeviceMethod, scheduleUpdateTwin
+    summary: The type of scheduled job.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --duration --poll-duration
+    defaultValue: "600"
+    summary: Total duration in seconds where job status will be checked if --wait flag is passed in.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --interval --poll-interval
+    defaultValue: "10"
+    summary: Interval in seconds that job status will be checked if --wait flag is passed in.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --mct --method-connect-timeout
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait on device connection.
+    description: ''
+  - name: --method-name --mn
+    summary: Target method for invocation.
+    description: ''
+  - name: --method-payload --mp
+    summary: Json payload to be passed to method. Must be file path or raw json.
+    description: ''
+  - name: --method-response-timeout --mrt
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait for device method result.
+    description: ''
+  - name: --patch --twin-patch
+    summary: The desired twin patch. Provide file path or raw json.
+    description: ''
+  - name: --query-condition -q
+    summary: 'Condition for device query to get devices to execute the job on. Required if job type is scheduleDeviceMethod or scheduleUpdateTwin. Note: The service will prefix "SELECT \* FROM devices WHERE " to the input.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start --start-time
+    summary: The scheduled start of the job in ISO 8601 date time format. If no start time is provided, the job is queued for asap execution.
+    description: ''
+  - name: --ttl
+    defaultValue: "3600"
+    summary: Max execution time in seconds, before job is terminated.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: Block until the created job is in a completed, failed or cancelled state. Will regularly poll on interval specified by --poll-interval.
+    description: ''
+- uid: az_iot_hub_job_list
+  name: az iot hub job list
+  summary: List the historical jobs of an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub job list [--auth-type {key, login}]
+                        [--hub-name]
+                        [--job-status {cancelled, completed, enqueued, failed, queued, running, scheduled, unknown}]
+                        [--job-type {export, import, scheduleDeviceMethod, scheduleUpdateTwin}]
+                        [--login]
+                        [--resource-group]
+                        [--top]
+  examples:
+  - summary: List all archived jobs within retention period (max of 30 days).
+    syntax: az iot hub job list --hub-name {iothub_name}
+  - summary: List all archived jobs projecting specific properties
+    syntax: az iot hub job list --hub-name {iothub_name} --query "[*].[jobId,type,status,startTime,endTime]"
+  - summary: List only update twin type jobs
+    syntax: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod
+  - summary: List device method jobs which have status "scheduled"
+    syntax: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod --job-status scheduled
+  - summary: List device export jobs which have status "completed"
+    syntax: az iot hub job list --hub-name {iothub_name} --job-type export --job-status completed
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --job-status --js
+    parameterValueGroup: cancelled, completed, enqueued, failed, queued, running, scheduled, unknown
+    summary: The status of a scheduled job.
+    description: ''
+  - name: --job-type --jt
+    parameterValueGroup: export, import, scheduleDeviceMethod, scheduleUpdateTwin
+    summary: The type of scheduled job.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_hub_job_show
+  name: az iot hub job show
+  summary: Show details of an existing IoT Hub job.
+  description: ''
+  syntax: >-
+    az iot hub job show --job-id
+                        [--auth-type {key, login}]
+                        [--hub-name]
+                        [--login]
+                        [--resource-group]
+  examples:
+  - summary: Show the details of a created job.
+    syntax: az iot hub job show --hub-name {iothub_name} --job-id {job_id}
+  requiredParameters:
+  - isRequired: true
+    name: --job-id
+    summary: IoT Hub job Id.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_job_cancel
+- az_iot_hub_job_create
+- az_iot_hub_job_list
+- az_iot_hub_job_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Hub jobs (v2).
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/module-identity.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/module-identity.yml
new file mode 100644
index 0000000000..e2d65796d3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/module-identity.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_module-identity
+name: az iot hub module-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub module-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device modules.
+description: ''
+directCommands:
+- uid: az_iot_hub_module-identity_create
+  name: az iot hub module-identity create
+  summary: Create a module on a target IoT device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity create --device-id
+                                      --module-id
+                                      [--am {shared_private_key, x509_ca, x509_thumbprint}]
+                                      [--auth-type {key, login}]
+                                      [--hub-name]
+                                      [--login]
+                                      [--od]
+                                      [--primary-thumbprint]
+                                      [--resource-group]
+                                      [--secondary-thumbprint]
+                                      [--valid-days]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --am --auth-method
+    defaultValue: shared_private_key
+    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
+    summary: The authorization type an entity is to be created with.
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --od --output-dir
+    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
+    description: ''
+  - name: --primary-thumbprint --ptp
+    summary: Explicit self-signed certificate thumbprint to use for primary key.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --secondary-thumbprint --stp
+    summary: Explicit self-signed certificate thumbprint to use for secondary key.
+    description: ''
+  - name: --valid-days --vd
+    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
+    description: ''
+- uid: az_iot_hub_module-identity_delete
+  name: az iot hub module-identity delete
+  summary: Delete a device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity delete --device-id
+                                      --module-id
+                                      [--auth-type {key, login}]
+                                      [--etag]
+                                      [--hub-name]
+                                      [--login]
+                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-identity_list
+  name: az iot hub module-identity list
+  summary: List modules located on an IoT device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity list --device-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+                                    [--top]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    defaultValue: "1000"
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_hub_module-identity_show
+  name: az iot hub module-identity show
+  summary: Get the details of an IoT device module in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity show --device-id
+                                    --module-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-identity_update
+  name: az iot hub module-identity update
+  summary: Update an IoT Hub device module.
+  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-identity show'.
+  syntax: >-
+    az iot hub module-identity update --device-id
+                                      --module-id
+                                      [--add]
+                                      [--auth-type {key, login}]
+                                      [--etag]
+                                      [--force-string]
+                                      [--hub-name]
+                                      [--login]
+                                      [--remove]
+                                      [--resource-group]
+                                      [--set]
+  examples:
+  - summary: Regenerate module symmetric authentication keys
+    syntax: az iot hub module-identity update -m {module_name} -d {device_id} -n {iothub_name} --set authentication.symmetricKey.primaryKey="" authentication.symmetricKey.secondaryKey=""
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_iot_hub_module-identity_connection-string
+- az_iot_hub_module-identity_connection-string_show
+- az_iot_hub_module-identity_create
+- az_iot_hub_module-identity_delete
+- az_iot_hub_module-identity_list
+- az_iot_hub_module-identity_show
+- az_iot_hub_module-identity_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device modules.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/module-identity/connection-string.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/module-identity/connection-string.yml
new file mode 100644
index 0000000000..2dc0b63e8c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/module-identity/connection-string.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_module-identity_connection-string
+name: az iot hub module-identity connection-string
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub module-identity connection-string** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device module's connection string.
+description: ''
+directCommands:
+- uid: az_iot_hub_module-identity_connection-string_show
+  name: az iot hub module-identity connection-string show
+  summary: Show a target IoT device module connection string.
+  description: ''
+  syntax: >-
+    az iot hub module-identity connection-string show --device-id
+                                                      --module-id
+                                                      [--auth-type {key, login}]
+                                                      [--hub-name]
+                                                      [--key-type {primary, secondary}]
+                                                      [--login]
+                                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_module-identity_connection-string_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device module's connection string.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/hub/module-twin.yml b/2017-03-09-profile/docs-ref-autogen/iot/hub/module-twin.yml
new file mode 100644
index 0000000000..411f1e3619
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/hub/module-twin.yml
@@ -0,0 +1,183 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_module-twin
+name: az iot hub module-twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub module-twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device module twin configuration.
+description: ''
+directCommands:
+- uid: az_iot_hub_module-twin_replace
+  name: az iot hub module-twin replace
+  summary: Replace a module twin definition with target json.
+  description: Input json directly or use a file path.
+  syntax: >-
+    az iot hub module-twin replace --device-id
+                                   --json
+                                   --module-id
+                                   [--auth-type {key, login}]
+                                   [--etag]
+                                   [--hub-name]
+                                   [--login]
+                                   [--resource-group]
+  examples:
+  - summary: Replace a module twin with file contents.
+    syntax: az iot hub module-twin replace -d {device_id} -n {iothub_name} -m {module_name} -j ../mymodtwin.json
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --json -j
+    summary: Json to replace existing twin with. Provide file path or raw json.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-twin_show
+  name: az iot hub module-twin show
+  summary: Show a module twin definition.
+  description: ''
+  syntax: >-
+    az iot hub module-twin show --device-id
+                                --module-id
+                                [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-twin_update
+  name: az iot hub module-twin update
+  summary: Update module twin desired properties and tags.
+  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
+  syntax: >-
+    az iot hub module-twin update --device-id
+                                  --module-id
+                                  [--add]
+                                  [--auth-type {key, login}]
+                                  [--desired]
+                                  [--etag]
+                                  [--force-string]
+                                  [--hub-name]
+                                  [--login]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--tags]
+  examples:
+  - summary: Patch module twin desired properties.
+    syntax: az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
+  - summary: Patch module twin tags.
+    syntax: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --tags '{\"country\": \"USA\"}'"
+  - summary: Patch removal of 'critical' desired property from parent 'temperature'
+    syntax: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --desired
+    summary: Twin desired properties.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: Twin tags.
+    description: ''
+commands:
+- az_iot_hub_module-twin_replace
+- az_iot_hub_module-twin_show
+- az_iot_hub_module-twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device module twin configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/product.yml b/2017-03-09-profile/docs-ref-autogen/iot/product.yml
new file mode 100644
index 0000000000..97f32422a5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/product.yml
@@ -0,0 +1,44 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product
+name: az iot product
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage device testing for product certification.
+description: ''
+commands:
+- az_iot_product_requirement
+- az_iot_product_requirement_list
+- az_iot_product_test
+- az_iot_product_test_case
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+- az_iot_product_test_create
+- az_iot_product_test_run
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+- az_iot_product_test_search
+- az_iot_product_test_show
+- az_iot_product_test_task
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+- az_iot_product_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage device testing for product certification.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/product/requirement.yml b/2017-03-09-profile/docs-ref-autogen/iot/product/requirement.yml
new file mode 100644
index 0000000000..4a8174feda
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/product/requirement.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_requirement
+name: az iot product requirement
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product requirement** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product certification requirements.
+description: ''
+directCommands:
+- uid: az_iot_product_requirement_list
+  name: az iot product requirement list
+  summary: Discover information about provisioning attestation methods that are supported for each badge type.
+  description: ''
+  syntax: >-
+    az iot product requirement list [--badge-type {IotDevice, IotEdgeCompatible, Pnp}]
+                                    [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product requirement list
+  optionalParameters:
+  - name: --badge-type --bt
+    defaultValue: IotDevice
+    parameterValueGroup: IotDevice, IotEdgeCompatible, Pnp
+    summary: The type of certification badge.
+    description: ''
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+commands:
+- az_iot_product_requirement_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product certification requirements.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/product/test.yml b/2017-03-09-profile/docs-ref-autogen/iot/product/test.yml
new file mode 100644
index 0000000000..68934052d8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/product/test.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test
+name: az iot product test
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage device tests for product certification.
+description: ''
+directCommands:
+- uid: az_iot_product_test_create
+  name: az iot product test create
+  summary: Create a new product test for product certification.
+  description: ''
+  syntax: >-
+    az iot product test create [--at {ConnectionString, SymmetricKey, TPM, X509}]
+                               [--badge-type {IotDevice, IotEdgeCompatible, Pnp}]
+                               [--base-url]
+                               [--certificate-path]
+                               [--cf]
+                               [--connection-string]
+                               [--device-type {DevKit, FinishedProduct}]
+                               [--ek]
+                               [--models]
+                               [--product-id]
+                               [--skip-provisioning]
+                               [--validation-type {Certification, Test}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test create --configuration-file {configuration_file}
+  - summary: Do not have service create provisioning configuration
+    syntax: az iot product test create --configuration-file {configuration_file} --skip-provisioning
+  - summary: Creating test with symmetric key attestation
+    syntax: az iot product test create --attestation-type SymmetricKey --device-type {device_type}
+  - summary: Creating test with TPM attestation
+    syntax: az iot product test create --attestation-type TPM --device-type {device_type} --endorsement-key {endorsement_key}
+  - summary: Creating test with x509 attestation
+    syntax: az iot product test create --attestation-type x509 --device-type {device_type} --certificate-path {certificate_path}
+  - summary: Creating test for Edge module
+    syntax: az iot product test create --attestation-type ConnectionString --device-type {device_type} --badge-type IotEdgeCompatible --connection-string {connection_string}
+  - summary: Creating test with symmetric key attestation and specified validation type
+    syntax: az iot product test create --attestation-type SymmetricKey --device-type {device_type} --validation-type Certification --product-id {product_id}
+  optionalParameters:
+  - name: --at --attestation-type
+    parameterValueGroup: ConnectionString, SymmetricKey, TPM, X509
+    summary: How the device will authenticate to testing service Device Provisioning Service.
+    description: ''
+  - name: --badge-type --bt
+    defaultValue: IotDevice
+    parameterValueGroup: IotDevice, IotEdgeCompatible, Pnp
+    summary: The type of certification badge.
+    description: ''
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --cf --configuration-file
+    summary: Path to device test JSON file. If not specified, attestation and device definition parameters must be specified.
+    description: ''
+  - name: --connection-string --cs
+    summary: Edge module connection stringWhen choosing IotEdgeCompatible badge type, connection string and attestaion-type of connection string are required.
+    description: ''
+  - name: --device-type --dt
+    parameterValueGroup: DevKit, FinishedProduct
+    summary: Defines the type of device to be tested.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device. When choosing TPM as attestation type, endorsement key is required.
+    description: ''
+  - name: --models -m
+    summary: Path containing Azure IoT Plug and Play interfaces implemented by the device being tested. When badge type is Pnp, models is required.
+    description: ''
+  - name: --product-id -p
+    summary: The submitted product id. Required when validation-type is 'Certification'.
+    description: ''
+  - name: --skip-provisioning --sp
+    summary: Determines whether the service skips generating provisioning configuration. Only applies to SymmetricKey and ConnectionString provisioning types.
+    description: ''
+  - name: --validation-type --vt
+    defaultValue: Test
+    parameterValueGroup: Certification, Test
+    summary: The type of validations testing to be performed.
+    description: ''
+- uid: az_iot_product_test_search
+  name: az iot product test search
+  summary: Search product repository for testing data.
+  description: ''
+  syntax: >-
+    az iot product test search [--base-url]
+                               [--certificate-name]
+                               [--product-id]
+                               [--registration-id]
+  examples:
+  - summary: Search by product id
+    syntax: az iot product test search --product-id {product_id}
+  - summary: Search by DPS registration
+    syntax: az iot product test search --registration-id {registration_id}
+  - summary: Search by x509 certifcate common name (CN)
+    syntax: az iot product test search --certificate-name {certificate_name}
+  - summary: Search by multiple values
+    syntax: az iot product test search --product-id {product_id} --certificate-name {certificate_name}
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --certificate-name --cn
+    summary: The x509 Certificate Common Name (cn) used for Device Provisioning Service attestation.
+    description: ''
+  - name: --product-id -p
+    summary: The submitted product id.
+    description: ''
+  - name: --registration-id -r
+    summary: The regstration Id for Device Provisioning Service.
+    description: ''
+- uid: az_iot_product_test_show
+  name: az iot product test show
+  summary: View product test data.
+  description: ''
+  syntax: >-
+    az iot product test show --test-id
+                             [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test show --test-id {test_id}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+- uid: az_iot_product_test_update
+  name: az iot product test update
+  summary: Update the product certification test data.
+  description: ''
+  syntax: >-
+    az iot product test update --test-id
+                               [--at {ConnectionString, SymmetricKey, TPM, X509}]
+                               [--badge-type {IotDevice, IotEdgeCompatible, Pnp}]
+                               [--base-url]
+                               [--certificate-path]
+                               [--cf]
+                               [--connection-string]
+                               [--ek]
+                               [--models]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test update --test-id {test_id} --configuration-file {configuration_file}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --at --attestation-type
+    parameterValueGroup: ConnectionString, SymmetricKey, TPM, X509
+    summary: How the device will authenticate to testing service Device Provisioning Service.
+    description: ''
+  - name: --badge-type --bt
+    parameterValueGroup: IotDevice, IotEdgeCompatible, Pnp
+    summary: The type of certification badge.
+    description: ''
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --cf --configuration-file
+    summary: Path to device test JSON file. If not specified, attestation and device definition parameters must be specified.
+    description: ''
+  - name: --connection-string --cs
+    summary: Edge module connection stringWhen choosing IotEdgeCompatible badge type, connection string and attestaion-type of connection string are required.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device. When choosing TPM as attestation type, endorsement key is required.
+    description: ''
+  - name: --models -m
+    summary: Path containing Azure IoT Plug and Play interfaces implemented by the device being tested. When badge type is Pnp, models is required.
+    description: ''
+commands:
+- az_iot_product_test_case
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+- az_iot_product_test_create
+- az_iot_product_test_run
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+- az_iot_product_test_search
+- az_iot_product_test_show
+- az_iot_product_test_task
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+- az_iot_product_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage device tests for product certification.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/product/test/case.yml b/2017-03-09-profile/docs-ref-autogen/iot/product/test/case.yml
new file mode 100644
index 0000000000..39ea40cfcb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/product/test/case.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test_case
+name: az iot product test case
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test case** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product testing certification test cases.
+description: ''
+directCommands:
+- uid: az_iot_product_test_case_list
+  name: az iot product test case list
+  summary: List the test cases of a product certification test.
+  description: ''
+  syntax: >-
+    az iot product test case list --test-id
+                                  [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test case list --test-id {test_id}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+- uid: az_iot_product_test_case_update
+  name: az iot product test case update
+  summary: Update the product certification test case data.
+  description: ''
+  syntax: >-
+    az iot product test case update --cf
+                                    --test-id
+                                    [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test case update --test-id {test_id} --configuration-file {configuration_file}
+  requiredParameters:
+  - isRequired: true
+    name: --cf --configuration-file
+    summary: The file path for test case configuration JSON.
+    description: ''
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+commands:
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product testing certification test cases.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/product/test/run.yml b/2017-03-09-profile/docs-ref-autogen/iot/product/test/run.yml
new file mode 100644
index 0000000000..434108c1f1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/product/test/run.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test_run
+name: az iot product test run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product testing certification test runs.
+description: ''
+directCommands:
+- uid: az_iot_product_test_run_show
+  name: az iot product test run show
+  summary: Show the status of a testing run.
+  description: ''
+  syntax: >-
+    az iot product test run show --test-id
+                                 [--base-url]
+                                 [--interval]
+                                 [--run-id]
+                                 [--wait {false, true}]
+  examples:
+  - summary: Latest product test run
+    syntax: az iot product test run show --test-id {test_id}
+  - summary: Testing status by --run-id
+    syntax: az iot product test run show --test-id {test_id} --run-id {run_id}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --interval --poll-interval
+    defaultValue: "3"
+    summary: Used in conjunction with --wait. Specifies how frequently (in seconds) polling occurs.
+    description: ''
+  - name: --run-id -r
+    summary: The generated Id of a test run.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: Wait until test run status is "started" or "running".
+    description: ''
+- uid: az_iot_product_test_run_submit
+  name: az iot product test run submit
+  summary: Submit a completed test run to the partner/product service.
+  description: ''
+  syntax: >-
+    az iot product test run submit --run-id
+                                   --test-id
+                                   [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test run submit --test-id {test_id} --run-id {run_id}
+  requiredParameters:
+  - isRequired: true
+    name: --run-id -r
+    summary: The generated Id of a test run.
+    description: ''
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+commands:
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product testing certification test runs.
diff --git a/2017-03-09-profile/docs-ref-autogen/iot/product/test/task.yml b/2017-03-09-profile/docs-ref-autogen/iot/product/test/task.yml
new file mode 100644
index 0000000000..cdba5281e7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/iot/product/test/task.yml
@@ -0,0 +1,124 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test_task
+name: az iot product test task
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test task** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product testing certification tasks.
+description: ''
+directCommands:
+- uid: az_iot_product_test_task_create
+  name: az iot product test task create
+  summary: Queue a new testing task. Only one testing task can be running at a time.
+  description: ''
+  syntax: >-
+    az iot product test task create --test-id
+                                    [--base-url]
+                                    [--interval]
+                                    [--type {GenerateTestCases, QueueTestRun}]
+                                    [--wait {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test task create --test-id {test_id}
+  - summary: Wait for completion and return test case
+    syntax: az iot product test task create --test-id {test_id} --wait
+  - summary: Wait for completion with custom polling interval to completion and return test case
+    syntax: az iot product test task create --test-id {test_id} --wait --poll-interval 5
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --interval --poll-interval
+    defaultValue: "3"
+    summary: Used in conjunction with --wait. Sepcifies how frequently (in seconds) polling occurs.
+    description: ''
+  - name: --type
+    defaultValue: QueueTestRun
+    parameterValueGroup: GenerateTestCases, QueueTestRun
+    summary: The type of task for the device test.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: Wait for task completion and return test case data when available.
+    description: ''
+- uid: az_iot_product_test_task_delete
+  name: az iot product test task delete
+  summary: Cancel a running task matching the specified --task-id.
+  description: ''
+  syntax: >-
+    az iot product test task delete --task-id
+                                    --test-id
+                                    [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test task delete --test-id {test_id} --task-id {task_id}
+  requiredParameters:
+  - isRequired: true
+    name: --task-id
+    summary: The generated Id of the testing task.
+    description: ''
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+- uid: az_iot_product_test_task_show
+  name: az iot product test task show
+  summary: Show the status of a testing task. Use --running for current running task or --task-id.
+  description: ''
+  syntax: >-
+    az iot product test task show --test-id
+                                  [--base-url]
+                                  [--running {false, true}]
+                                  [--task-id]
+  examples:
+  - summary: Task status by --task-id
+    syntax: az iot product test task show --test-id {test_id} --task-id {task_id}
+  - summary: Currently running task of product test
+    syntax: az iot product test task show --test-id {test_id} --running
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --running
+    parameterValueGroup: false, true
+    summary: Get the running tasks of a device test.
+    description: ''
+  - name: --task-id
+    summary: The generated Id of the testing task.
+    description: ''
+commands:
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product testing certification tasks.
diff --git a/2017-03-09-profile/docs-ref-autogen/k8s-configuration.yml b/2017-03-09-profile/docs-ref-autogen/k8s-configuration.yml
new file mode 100644
index 0000000000..ec3b8615a7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/k8s-configuration.yml
@@ -0,0 +1,310 @@
+### YamlMime:AzureCLIGroup
+uid: az_k8s-configuration
+name: az k8s-configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **k8s-configuration** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az k8s-configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Kubernetes configuration.
+description: ''
+directCommands:
+- uid: az_k8s-configuration_create
+  name: az k8s-configuration create
+  summary: Create a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration create --cluster-name
+                                --cluster-type {connectedClusters, managedClusters}
+                                --name
+                                --repository-url
+                                --resource-group
+                                --scope {cluster, namespace}
+                                [--enable-helm-operator {false, true}]
+                                [--helm-operator-chart-version]
+                                [--helm-operator-params]
+                                [--https-key]
+                                [--https-user]
+                                [--operator-instance-name]
+                                [--operator-namespace]
+                                [--operator-params]
+                                [--operator-type]
+                                [--ssh-known-hosts]
+                                [--ssh-known-hosts-file]
+                                [--ssh-private-key]
+                                [--ssh-private-key-file]
+  examples:
+  - summary: Create a Kubernetes configuration
+    syntax: >-
+      az k8s-configuration create --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyGitConfig --operator-instance-name OperatorInst01 \
+
+      --operator-namespace OperatorNamespace01 --operator-type flux --operator-params "'--git-readonly'" \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --enable-helm-operator  \
+
+      --helm-operator-chart-version 1.2.0 --scope namespace --helm-operator-params '--set helm.versions=v3' \
+
+      --ssh-private-key '' --ssh-private-key-file '' --https-user '' --https-key '' \
+
+      --ssh-known-hosts '' --ssh-known-hosts-file ''
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scope
+    parameterValueGroup: cluster, namespace
+    summary: Specify scope of the operator to be 'namespace' or 'cluster'.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator --enable-hop
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-chart-version --hop-chart-version
+    defaultValue: 1.2.0
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-params --hop-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --https-key
+    summary: Specify HTTPS token/password for private repository sync.
+    description: ''
+  - name: --https-user
+    summary: Specify HTTPS username for private repository sync.
+    description: ''
+  - name: --operator-instance-name
+    summary: Instance name of the Operator.
+    description: ''
+  - name: --operator-namespace
+    defaultValue: default
+    summary: Namespace in which to install the Operator.
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --operator-type
+    defaultValue: flux
+    summary: Type of the operator. Valid value is 'flux'.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-private-key
+    summary: Specify Base64-encoded private ssh key for private repository sync.
+    description: ''
+  - name: --ssh-private-key-file
+    summary: Specify filepath to private ssh key for private repository sync.
+    description: ''
+- uid: az_k8s-configuration_delete
+  name: az k8s-configuration delete
+  summary: Delete a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration delete --cluster-name
+                                --cluster-type {connectedClusters, managedClusters}
+                                --name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: Delete a Kubernetes configuration
+    syntax: >-
+      az k8s-configuration delete --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_k8s-configuration_list
+  name: az k8s-configuration list
+  summary: List Kubernetes configurations.
+  description: ''
+  syntax: >-
+    az k8s-configuration list --cluster-name
+                              --cluster-type {connectedClusters, managedClusters}
+                              --resource-group
+  examples:
+  - summary: List all Kubernetes configurations of a cluster
+    syntax: >-
+      az k8s-configuration list --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8s-configuration_show
+  name: az k8s-configuration show
+  summary: Show details of a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration show --cluster-name
+                              --cluster-type {connectedClusters, managedClusters}
+                              --name
+                              --resource-group
+  examples:
+  - summary: Show a Kubernetes configuration
+    syntax: >-
+      az k8s-configuration show --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8s-configuration_update
+  name: az k8s-configuration update
+  summary: Update a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration update --cluster-name
+                                --cluster-type {connectedClusters, managedClusters}
+                                --name
+                                --resource-group
+                                [--enable-helm-operator {false, true}]
+                                [--helm-operator-chart-version]
+                                [--helm-operator-params]
+                                [--operator-params]
+                                [--repository-url]
+                                [--ssh-known-hosts]
+                                [--ssh-known-hosts-file]
+  examples:
+  - summary: Update an existing Kubernetes configuration
+    syntax: >-
+      az k8s-configuration update --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \
+
+      --helm-operator-chart-version 1.2.0 --helm-operator-params '--set helm.versions=v3'
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator --enable-hop
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-chart-version --hop-chart-version
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-params --hop-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+commands:
+- az_k8s-configuration_create
+- az_k8s-configuration_delete
+- az_k8s-configuration_list
+- az_k8s-configuration_show
+- az_k8s-configuration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Kubernetes configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/k8s-extension.yml b/2017-03-09-profile/docs-ref-autogen/k8s-extension.yml
new file mode 100644
index 0000000000..8076d6d4d0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/k8s-extension.yml
@@ -0,0 +1,192 @@
+### YamlMime:AzureCLIGroup
+uid: az_k8s-extension
+name: az k8s-extension
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **k8s-extension** extension for Azure CLI and requires version 2.24.0 or higher.  The extension will automatically install the first time you run an **az k8s-extension** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage K8s-extensions.
+description: ''
+directCommands:
+- uid: az_k8s-extension_create
+  name: az k8s-extension create
+  summary: Create a K8s-extension.
+  description: ''
+  syntax: >-
+    az k8s-extension create --cluster-name
+                            --cluster-type {appliances, connectedClusters, managedClusters}
+                            --extension-type
+                            --name
+                            --resource-group
+                            [--auto-upgrade {false, true}]
+                            [--config]
+                            [--config-file]
+                            [--config-protected]
+                            [--config-protected-file]
+                            [--release-namespace]
+                            [--release-train]
+                            [--scope {cluster, namespace}]
+                            [--tags]
+                            [--target-namespace]
+                            [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --extension-type
+    summary: Name of the extension type.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the extension instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade --auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: Automatically upgrade minor version of the extension instance.
+    description: ''
+  - name: --config --configuration-settings
+    summary: Configuration Settings as key=value pair.  Repeat parameter for each setting.
+    description: ''
+  - name: --config-file --configuration-settings-file
+    summary: JSON file path for configuration-settings.
+    description: ''
+  - name: --config-protected --configuration-protected-settings
+    summary: Configuration Protected Settings as key=value pair.  Repeat parameter for each setting.
+    description: ''
+  - name: --config-protected-file --configuration-protected-settings-file
+    summary: JSON file path for configuration-protected-settings.
+    description: ''
+  - name: --release-namespace
+    summary: Specify the namespace to install the extension release.
+    description: ''
+  - name: --release-train
+    summary: Specify the release train for the extension type.
+    description: ''
+  - name: --scope
+    parameterValueGroup: cluster, namespace
+    summary: Specify the extension scope.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-namespace
+    summary: Specify the target namespace to install to for the extension instance. This parameter is required if extension scope is set to 'namespace'.
+    description: ''
+  - name: --version
+    summary: Specify the version to install for the extension instance if --auto-upgrade-minor-version is not enabled.
+    description: ''
+- uid: az_k8s-extension_delete
+  name: az k8s-extension delete
+  summary: Delete a K8s-extension.
+  description: ''
+  syntax: >-
+    az k8s-extension delete --cluster-name
+                            --cluster-type {appliances, connectedClusters, managedClusters}
+                            --name
+                            --resource-group
+                            [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the extension instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_k8s-extension_list
+  name: az k8s-extension list
+  summary: List K8s-extensions.
+  description: ''
+  syntax: >-
+    az k8s-extension list --cluster-name
+                          --cluster-type {appliances, connectedClusters, managedClusters}
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8s-extension_show
+  name: az k8s-extension show
+  summary: Show details of a K8s-extension.
+  description: ''
+  syntax: >-
+    az k8s-extension show --cluster-name
+                          --cluster-type {appliances, connectedClusters, managedClusters}
+                          --name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the extension instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_k8s-extension_create
+- az_k8s-extension_delete
+- az_k8s-extension_list
+- az_k8s-extension_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage K8s-extensions.
diff --git a/2017-03-09-profile/docs-ref-autogen/k8sconfiguration.yml b/2017-03-09-profile/docs-ref-autogen/k8sconfiguration.yml
new file mode 100644
index 0000000000..f1c4855338
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/k8sconfiguration.yml
@@ -0,0 +1,310 @@
+### YamlMime:AzureCLIGroup
+uid: az_k8sconfiguration
+name: az k8sconfiguration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **k8sconfiguration** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az k8sconfiguration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Kubernetes configuration.
+description: ''
+directCommands:
+- uid: az_k8sconfiguration_create
+  name: az k8sconfiguration create
+  summary: Create a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration create --cluster-name
+                               --cluster-type {connectedClusters, managedClusters}
+                               --name
+                               --repository-url
+                               --resource-group
+                               --scope {cluster, namespace}
+                               [--enable-helm-operator {false, true}]
+                               [--helm-operator-params]
+                               [--helm-operator-version]
+                               [--https-key]
+                               [--https-user]
+                               [--operator-instance-name]
+                               [--operator-namespace]
+                               [--operator-params]
+                               [--operator-type]
+                               [--ssh-known-hosts]
+                               [--ssh-known-hosts-file]
+                               [--ssh-private-key]
+                               [--ssh-private-key-file]
+  examples:
+  - summary: Create a Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration create --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyGitConfig --operator-instance-name OperatorInst01 \
+
+      --operator-namespace OperatorNamespace01 --operator-type flux --operator-params "'--git-readonly'" \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --enable-helm-operator  \
+
+      --helm-operator-version 1.2.0 --scope namespace --helm-operator-params '--set helm.versions=v3' \
+
+      --ssh-private-key '' --ssh-private-key-file '' --https-user '' --https-key '' \
+
+      --ssh-known-hosts '' --ssh-known-hosts-file ''
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scope
+    parameterValueGroup: cluster, namespace
+    summary: Specify scope of the operator to be 'namespace' or 'cluster'.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-version
+    defaultValue: 1.2.0
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --https-key
+    summary: Specify HTTPS token/password for private repository sync.
+    description: ''
+  - name: --https-user
+    summary: Specify HTTPS username for private repository sync.
+    description: ''
+  - name: --operator-instance-name
+    summary: Instance name of the Operator.
+    description: ''
+  - name: --operator-namespace
+    defaultValue: default
+    summary: Namespace in which to install the Operator.
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --operator-type
+    defaultValue: flux
+    summary: Type of the operator. Valid value is 'flux'.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-private-key
+    summary: Specify Base64-encoded private ssh key for private repository sync.
+    description: ''
+  - name: --ssh-private-key-file
+    summary: Specify filepath to private ssh key for private repository sync.
+    description: ''
+- uid: az_k8sconfiguration_delete
+  name: az k8sconfiguration delete
+  summary: Delete a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration delete --cluster-name
+                               --cluster-type {connectedClusters, managedClusters}
+                               --name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration delete --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_k8sconfiguration_list
+  name: az k8sconfiguration list
+  summary: List Kubernetes configurations.
+  description: ''
+  syntax: >-
+    az k8sconfiguration list --cluster-name
+                             --cluster-type {connectedClusters, managedClusters}
+                             --resource-group
+  examples:
+  - summary: List all Kubernetes configurations of a cluster
+    syntax: >-
+      az k8sconfiguration list --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8sconfiguration_show
+  name: az k8sconfiguration show
+  summary: Show details of a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration show --cluster-name
+                             --cluster-type {connectedClusters, managedClusters}
+                             --name
+                             --resource-group
+  examples:
+  - summary: Show a Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration show --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8sconfiguration_update
+  name: az k8sconfiguration update
+  summary: Update a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration update --cluster-name
+                               --cluster-type {connectedClusters, managedClusters}
+                               --name
+                               --resource-group
+                               [--enable-helm-operator {false, true}]
+                               [--helm-operator-params]
+                               [--helm-operator-version]
+                               [--operator-params]
+                               [--repository-url]
+                               [--ssh-known-hosts]
+                               [--ssh-known-hosts-file]
+  examples:
+  - summary: Update an existing Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration update --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \
+
+      --helm-operator-version 1.2.0 --helm-operator-params '--set helm.versions=v3'
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-version
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+commands:
+- az_k8sconfiguration_create
+- az_k8sconfiguration_delete
+- az_k8sconfiguration_list
+- az_k8sconfiguration_show
+- az_k8sconfiguration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Kubernetes configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault.yml b/2017-03-09-profile/docs-ref-autogen/keyvault.yml
index 11db381376..1a9570a962 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault.yml
@@ -1,55 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault
-  name: az keyvault
-  summary: Manage KeyVault keys, secrets, and certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_create
-  - az_keyvault_delete
-  - az_keyvault_delete_policy
-  - az_keyvault_list
-  - az_keyvault_list_deleted
-  - az_keyvault_purge
-  - az_keyvault_recover
-  - az_keyvault_set_policy
-  - az_keyvault_show
-  - az_keyvault_update
+### YamlMime:AzureCLIGroup
+uid: az_keyvault
+name: az keyvault
+summary: Manage KeyVault keys, secrets, and certificates.
+description: ''
+directCommands:
 - uid: az_keyvault_create
   name: az keyvault create
-  summary: Create a key vault.
+  summary: Create a Vault or HSM.
   description: If `--enable-rbac-authorization` is not specified, then default permissions are created for the current user or service principal unless the `--no-self-perms` flag is specified.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault create --resource-group
+                       [--administrators]
+                       [--enable-purge-protection {false, true}]
+                       [--enable-rbac-authorization {false, true}]
+                       [--enable-soft-delete {false, true}]
+                       [--enabled-for-deployment {false, true}]
+                       [--enabled-for-disk-encryption {false, true}]
+                       [--enabled-for-template-deployment {false, true}]
+                       [--hsm-name]
+                       [--location]
+                       [--name]
+                       [--network-acls]
+                       [--network-acls-ips]
+                       [--network-acls-vnets]
+                       [--no-self-perms {false, true}]
+                       [--no-wait]
+                       [--retention-days]
+                       [--sku]
+                       [--subscription]
+                       [--tags]
   examples:
-  - summary: Create a key vault. (autogenerated)
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup
   - summary: Create a key vault with network ACLs specified (use --network-acls to specify IP and VNet rules by using a JSON string).
-    syntax:
-      content: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\", \"/subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVNet/subnets/MySubnet\"]}"'
+    syntax: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\", \"/subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVNet/subnets/MySubnet\"]}"'
   - summary: Create a key vault with network ACLs specified (use --network-acls to specify IP and VNet rules by using a JSON file).
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls network-acls-example.json
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls network-acls-example.json
   - summary: Create a key vault with network ACLs specified (use --network-acls-ips to specify IP rules).
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-ips 3.4.5.0/24 4.5.6.0/24
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-ips 3.4.5.0/24 4.5.6.0/24
   - summary: Create a key vault with network ACLs specified (use --network-acls-vnets to specify VNet rules).
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4
   - summary: Create a key vault with network ACLs specified (use --network-acls, --network-acls-ips and --network-acls-vnets together, redundant rules will be removed, finally there will be 4 IP rules and 3 VNet rules).
-    syntax:
-      content: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\"]}" --network-acls-ips 3.4.5.0/24 4.5.6.0/24 --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4'
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
+    syntax: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\"]}" --network-acls-ips 3.4.5.0/24 4.5.6.0/24 --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4'
+  - summary: Create a key vault. (autogenerated)
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --administrators
+    summary: '[HSM Only] Administrator role for data plane operations for Managed HSM. It accepts a space separated list of OIDs that will be assigned.'
     description: ''
   - name: --enable-purge-protection
     parameterValueGroup: false, true
@@ -61,41 +61,31 @@ items:
     description: ''
   - name: --enable-soft-delete
     parameterValueGroup: false, true
-    summary: Property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value.
+    summary: "[Vault Only] Property to specify whether the 'soft delete' functionality is enabled for this key vault. If it's not set to any value (true or false) when creating new key vault, it will be set to true by default. Once set to true, it cannot be reverted to false."
     description: ''
   - name: --enabled-for-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.
+    summary: '[Vault Only] Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.'
     description: ''
   - name: --enabled-for-disk-encryption
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.
+    summary: '[Vault Only] Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.'
     description: ''
   - name: --enabled-for-template-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-self-perms
-    parameterValueGroup: false, true
-    summary: Don't add permissions for the current user/service principal in the new vault.
+    summary: '[Vault Only] Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.'
     description: ''
-  - name: --retention-days
-    defaultValue: "90"
-    summary: Soft delete data retention days. It accepts >=7 and <=90.
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
     description: ''
-  - name: --sku
-    defaultValue: standard
-    parameterValueGroup: premium, standard
-    summary: Required. SKU details.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --name -n
+    summary: Name of the Vault.
     description: ''
   - name: --network-acls
-    summary: 'Network ACLs. It accepts a JSON filename or a JSON string. JSON format: `{"ip":[&lt;ip1&gt;, &lt;ip2&gt;...],"vnet":[&lt;vnet_name_1&gt;/&lt;subnet_name_1&gt;,&lt;subnet_id2&gt;...]}`.'
+    summary: 'Network ACLs. It accepts a JSON filename or a JSON string. JSON format: `{"ip":[<ip1>, <ip2>...],"vnet":[<vnet_name_1>/<subnet_name_1>,<subnet_id2>...]}`.'
     description: ''
   - name: --network-acls-ips
     summary: Network ACLs IP rules. Space-separated list of IP addresses.
@@ -103,29 +93,49 @@ items:
   - name: --network-acls-vnets
     summary: Network ACLS VNet rules. Space-separated list of Vnet/subnet pairs or subnet resource ids.
     description: ''
+  - name: --no-self-perms
+    parameterValueGroup: false, true
+    summary: "[Vault Only] Don't add permissions for the current user/service principal in the new vault."
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --retention-days
+    defaultValue: "90"
+    summary: Soft delete data retention days. It accepts >=7 and <=90.
+    description: ''
+  - name: --sku
+    summary: 'Required. SKU details. Allowed values for Vault: premium, standard. Default: standard. Allowed values for HSM: Standard_B1, Custom_B32. Default: Standard_B1.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_delete
   name: az keyvault delete
-  summary: Delete a key vault.
+  summary: Delete a Vault or HSM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault delete [--hsm-name]
+                       [--name]
+                       [--no-wait]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: Delete a key vault. (autogenerated)
-    syntax:
-      content: az keyvault delete --name MyKeyVault --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
+    syntax: az keyvault delete --name MyKeyVault --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --name -n
+    summary: Name of the Vault.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
     summary: Proceed only if Key Vault belongs to the specified resource group.
@@ -133,22 +143,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_delete_policy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_delete-policy
   name: az keyvault delete-policy
   summary: Delete security policy settings for a Key Vault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault delete-policy --name
+                              [--application-id]
+                              [--no-wait]
+                              [--object-id]
+                              [--resource-group]
+                              [--spn]
+                              [--subscription]
+                              [--upn]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --application-id
+    summary: Application ID of the client making request on behalf of a principal. Exposed for compound identity using on-behalf-of authentication flow.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --object-id
     summary: A GUID that identifies the principal that will receive permissions.
@@ -159,125 +178,144 @@ items:
   - name: --spn
     summary: Name of a service principal that will receive permissions.
     description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --upn
+    summary: Name of a user principal that will receive permissions.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_list
   name: az keyvault list
-  summary: List key vaults.
+  summary: List Vaults and/or HSMs.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault list [--query-examples]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --resource-type
+    summary: When --resource-type is not present the command will list all Vaults and HSMs. Possible values for --resource-type are vault and hsm.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_list_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_list-deleted
   name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
+  summary: Get information about the deleted Vaults or HSMs in a subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault list-deleted [--resource-type]
+                             [--subscription]
+  optionalParameters:
+  - name: --resource-type
+    summary: When --resource-type is not present the command will list all deleted Vaults and HSMs. Possible values for --resource-type are vault and hsm.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_purge
   name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-  description: Aka Purges the deleted Azure key vault.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the deleted vault.
+  summary: Permanently delete the specified Vault or HSM. Aka Purges the deleted Vault or HSM.
+  description: ''
+  syntax: >-
+    az keyvault purge [--hsm-name]
+                      [--location]
+                      [--name]
+                      [--no-wait]
+                      [--subscription]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the deleted HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
     description: ''
   - name: --location -l
-    summary: Location of the deleted vault.
+    summary: Location of the deleted Vault or HSM.
+    description: ''
+  - name: --name -n
+    summary: Name of the deleted Vault.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_recover
   name: az keyvault recover
-  summary: Recover a key vault.
-  description: Recovers a previously deleted key vault for which soft delete was enabled.
-  langs:
-  - azurecli
+  summary: Recover a Vault or HSM.
+  description: Recover a previously deleted Vault or HSM for which soft delete was enabled.
+  syntax: >-
+    az keyvault recover [--hsm-name]
+                        [--location]
+                        [--name]
+                        [--no-wait]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Recover a key vault. (autogenerated)
-    syntax:
-      content: az keyvault recover --location westus2 --name MyKeyVault --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the deleted vault.
+    syntax: az keyvault recover --location westus2 --name MyKeyVault --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the deleted HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
     description: ''
   - name: --location -l
-    summary: Location of the deleted vault.
+    summary: Location of the deleted Vault or HSM.
+    description: ''
+  - name: --name -n
+    summary: Name of the deleted Vault.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Resource group of the deleted vault.
+    summary: Resource group of the deleted Vault or HSM.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_set_policy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_set-policy
   name: az keyvault set-policy
   summary: Update security policy settings for a Key Vault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault set-policy --name
+                           [--application-id]
+                           [--certificate-permissions {create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, setissuers, update}]
+                           [--key-permissions {backup, create, decrypt, delete, encrypt, get, import, list, purge, recover, restore, sign, unwrapKey, update, verify, wrapKey}]
+                           [--no-wait]
+                           [--object-id]
+                           [--resource-group]
+                           [--secret-permissions {backup, delete, get, list, purge, recover, restore, set}]
+                           [--spn]
+                           [--storage-permissions {backup, delete, deletesas, get, getsas, list, listsas, purge, recover, regeneratekey, restore, set, setsas, update}]
+                           [--subscription]
+                           [--upn]
+  examples:
+  - summary: Assign key permissions `get`, `list`, `import` and secret permissions `backup`, `restore` to an object id.
+    syntax: az keyvault set-policy -n MyVault --key-permissions get list import --secret-permissions backup restore --object-id {GUID}
+  - summary: Assign key permissions `get`, `list` to a UPN (User Principal Name).
+    syntax: az keyvault set-policy -n MyVault --key-permissions get list --upn {UPN}
+  - summary: Assign key permissions `get`, `list` to a SPN (Service Principal Name).
+    syntax: az keyvault set-policy -n MyVault --key-permissions get list --spn {SPN}
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --spn
-    summary: Name of a service principal that will receive permissions.
-    description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
+  optionalParameters:
+  - name: --application-id
+    summary: Application ID of the client making request on behalf of a principal. Exposed for compound identity using on-behalf-of authentication flow.
     description: ''
   - name: --certificate-permissions
     parameterValueGroup: create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, setissuers, update
@@ -287,13 +325,22 @@ items:
     parameterValueGroup: backup, create, decrypt, delete, encrypt, get, import, list, purge, recover, restore, sign, unwrapKey, update, verify, wrapKey
     summary: Space-separated list of key permissions to assign.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --object-id
     summary: A GUID that identifies the principal that will receive permissions.
     description: ''
+  - name: --resource-group -g
+    summary: Proceed only if Key Vault belongs to the specified resource group.
+    description: ''
   - name: --secret-permissions
     parameterValueGroup: backup, delete, get, list, purge, recover, restore, set
     summary: Space-separated list of secret permissions to assign.
     description: ''
+  - name: --spn
+    summary: Name of a service principal that will receive permissions.
+    description: ''
   - name: --storage-permissions
     parameterValueGroup: backup, delete, deletesas, get, getsas, list, listsas, purge, recover, regeneratekey, restore, set, setsas, update
     summary: Space-separated list of storage permissions to assign.
@@ -301,26 +348,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --upn
+    summary: Name of a user principal that will receive permissions.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_show
   name: az keyvault show
-  summary: Show details of a key vault.
+  summary: Show details of a Vault or HSM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault show [--hsm-name]
+                     [--name]
+                     [--query-examples]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Show details of a key vault. (autogenerated)
-    syntax:
-      content: az keyvault show --name MyKeyVault
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
+    syntax: az keyvault show --name MyKeyVault
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --name -n
+    summary: Name of the Vault.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
     summary: Proceed only if Key Vault belongs to the specified resource group.
@@ -328,26 +381,64 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_show-deleted
+  name: az keyvault show-deleted
+  summary: Show details of a deleted Vault or HSM.
+  description: ''
+  syntax: >-
+    az keyvault show-deleted [--hsm-name]
+                             [--location]
+                             [--name]
+                             [--subscription]
+  examples:
+  - summary: Show details of a deleted key vault.
+    syntax: az keyvault show-deleted --name MyKeyVault
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the deleted HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --location -l
+    summary: Location of the deleted Vault or HSM.
+    description: ''
+  - name: --name -n
+    summary: Name of the deleted Vault.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_update
   name: az keyvault update
-  summary: Update the properties of a key vault.
+  summary: Update the properties of a Vault.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault update --name
+                       [--add]
+                       [--enable-purge-protection {false, true}]
+                       [--enable-rbac-authorization {false, true}]
+                       [--enable-soft-delete {false, true}]
+                       [--enabled-for-deployment {false, true}]
+                       [--enabled-for-disk-encryption {false, true}]
+                       [--enabled-for-template-deployment {false, true}]
+                       [--force-string]
+                       [--no-wait]
+                       [--remove]
+                       [--resource-group]
+                       [--retention-days]
+                       [--set]
+                       [--subscription]
   examples:
-  - summary: Update the properties of a key vault. (autogenerated)
-    syntax:
-      content: az keyvault update --enabled-for-disk-encryption true --name MyKeyVault --resource-group MyResourceGroup
-  parameters:
+  - summary: Update the properties of a Vault. (autogenerated)
+    syntax: az keyvault update --enabled-for-disk-encryption true --name MyKeyVault --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --enable-purge-protection
     parameterValueGroup: false, true
@@ -359,19 +450,28 @@ items:
     description: ''
   - name: --enable-soft-delete
     parameterValueGroup: false, true
-    summary: Property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value.
+    summary: "[Vault Only] Property to specify whether the 'soft delete' functionality is enabled for this key vault. If it's not set to any value (true or false) when creating new key vault, it will be set to true by default. Once set to true, it cannot be reverted to false."
     description: ''
   - name: --enabled-for-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.
+    summary: '[Vault Only] Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.'
     description: ''
   - name: --enabled-for-disk-encryption
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.
+    summary: '[Vault Only] Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.'
     description: ''
   - name: --enabled-for-template-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.
+    summary: '[Vault Only] Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
     summary: Proceed only if Key Vault belongs to the specified resource group.
@@ -379,241 +479,144 @@ items:
   - name: --retention-days
     summary: Soft delete data retention days. It accepts >=7 and <=90.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_wait
+  name: az keyvault wait
+  summary: Place the CLI in a waiting state until a condition of the Vault is met.
+  description: ''
+  syntax: >-
+    az keyvault wait --name
+                     [--created]
+                     [--custom]
+                     [--deleted]
+                     [--exists]
+                     [--interval]
+                     [--resource-group]
+                     [--subscription]
+                     [--timeout]
+                     [--updated]
+  examples:
+  - summary: Pause CLI until the vault is created.
+    syntax: az keyvault wait --name MyVault --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vault.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Proceed only if Key Vault belongs to the specified resource group.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-- uid: az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-- uid: az_keyvault_create
-  name: az keyvault create
-  summary: Create a key vault.
-- uid: az_keyvault_delete
-  name: az keyvault delete
-  summary: Delete a key vault.
-- uid: az_keyvault_delete_policy
-  name: az keyvault delete-policy
-  summary: Delete security policy settings for a Key Vault.
-- uid: az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-- uid: az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: az_keyvault_key_download
-  name: az keyvault key download
-  summary: Downloads the public part of a stored key.
-- uid: az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-- uid: az_keyvault_list
-  name: az keyvault list
-  summary: List key vaults.
-- uid: az_keyvault_list_deleted
-  name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
-- uid: az_keyvault_purge
-  name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-- uid: az_keyvault_recover
-  name: az keyvault recover
-  summary: Recover a key vault.
-- uid: az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-- uid: az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-- uid: az_keyvault_set_policy
-  name: az keyvault set-policy
-  summary: Update security policy settings for a Key Vault.
-- uid: az_keyvault_show
-  name: az keyvault show
-  summary: Show details of a key vault.
-- uid: az_keyvault_update
-  name: az keyvault update
-  summary: Update the properties of a key vault.
+- az_keyvault_certificate
+- az_keyvault_certificate_contact
+- az_keyvault_certificate_contact_add
+- az_keyvault_certificate_contact_delete
+- az_keyvault_certificate_contact_list
+- az_keyvault_certificate_create
+- az_keyvault_certificate_delete
+- az_keyvault_certificate_download
+- az_keyvault_certificate_get-default-policy
+- az_keyvault_certificate_import
+- az_keyvault_certificate_issuer
+- az_keyvault_certificate_issuer_admin
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
+- az_keyvault_certificate_issuer_create
+- az_keyvault_certificate_issuer_delete
+- az_keyvault_certificate_issuer_list
+- az_keyvault_certificate_issuer_show
+- az_keyvault_certificate_issuer_update
+- az_keyvault_certificate_list
+- az_keyvault_certificate_list-deleted
+- az_keyvault_certificate_list-versions
+- az_keyvault_certificate_pending
+- az_keyvault_certificate_pending_delete
+- az_keyvault_certificate_pending_merge
+- az_keyvault_certificate_pending_show
+- az_keyvault_certificate_purge
+- az_keyvault_certificate_recover
+- az_keyvault_certificate_set-attributes
+- az_keyvault_certificate_show
+- az_keyvault_certificate_show-deleted
+- az_keyvault_create
+- az_keyvault_delete
+- az_keyvault_delete-policy
+- az_keyvault_key
+- az_keyvault_key_backup
+- az_keyvault_key_create
+- az_keyvault_key_decrypt
+- az_keyvault_key_delete
+- az_keyvault_key_download
+- az_keyvault_key_encrypt
+- az_keyvault_key_get-policy-template
+- az_keyvault_key_import
+- az_keyvault_key_list
+- az_keyvault_key_list-deleted
+- az_keyvault_key_list-versions
+- az_keyvault_key_purge
+- az_keyvault_key_recover
+- az_keyvault_key_restore
+- az_keyvault_key_set-attributes
+- az_keyvault_key_show
+- az_keyvault_key_show-deleted
+- az_keyvault_list
+- az_keyvault_list-deleted
+- az_keyvault_purge
+- az_keyvault_recover
+- az_keyvault_secret
+- az_keyvault_secret_backup
+- az_keyvault_secret_delete
+- az_keyvault_secret_download
+- az_keyvault_secret_list
+- az_keyvault_secret_list-deleted
+- az_keyvault_secret_list-versions
+- az_keyvault_secret_purge
+- az_keyvault_secret_recover
+- az_keyvault_secret_restore
+- az_keyvault_secret_set
+- az_keyvault_secret_set-attributes
+- az_keyvault_secret_show
+- az_keyvault_secret_show-deleted
+- az_keyvault_set-policy
+- az_keyvault_show
+- az_keyvault_show-deleted
+- az_keyvault_update
+- az_keyvault_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -629,10 +632,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage KeyVault keys, secrets, and certificates.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage KeyVault keys, secrets, and certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate.yml
index a69834e63d..cd89a05f0b 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate.yml
@@ -1,154 +1,137 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_create
-  - az_keyvault_certificate_delete
-  - az_keyvault_certificate_download
-  - az_keyvault_certificate_get_default_policy
-  - az_keyvault_certificate_import
-  - az_keyvault_certificate_list
-  - az_keyvault_certificate_list_deleted
-  - az_keyvault_certificate_list_versions
-  - az_keyvault_certificate_purge
-  - az_keyvault_certificate_recover
-  - az_keyvault_certificate_set_attributes
-  - az_keyvault_certificate_show
-  - az_keyvault_certificate_show_deleted
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate
+name: az keyvault certificate
+summary: Manage certificates.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_create
   name: az keyvault certificate create
   summary: Create a Key Vault certificate.
   description: Certificates can be used as a secrets for provisioned virtual machines.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault certificate create --name
+                                   --policy
+                                   --vault-name
+                                   [--disabled {false, true}]
+                                   [--subscription]
+                                   [--tags]
+                                   [--validity]
   examples:
   - summary: Create a self-signed certificate with the default policy and add it to a virtual machine.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
-  parameters:
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the certificate.
+    description: ''
   - isRequired: true
     name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file(e.g. @my_policy.json).
+    summary: JSON encoded policy definition. Use @{file} to load from a file(e.g. @my_policy.json).
     description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --disabled
     parameterValueGroup: false, true
     summary: Create certificate in disabled state.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --validity
     summary: Number of months the certificate is valid for. Overrides the value specified with --policy/-p.
     description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_delete
   name: az keyvault certificate delete
   summary: Deletes a certificate from a specified key vault.
   description: Deletes all versions of a certificate object along with its associated policy. Delete certificate cannot be used to remove individual versions of a certificate object. This operation requires the certificates/delete permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate delete [--id]
+                                   [--name]
+                                   [--subscription]
+                                   [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_download
   name: az keyvault certificate download
   summary: Download the public portion of a Key Vault certificate.
   description: The certificate formatted as either PEM or DER. PEM is the default.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault certificate download --file
+                                     [--encoding {DER, PEM}]
+                                     [--id]
+                                     [--name]
+                                     [--subscription]
+                                     [--vault-name]
+                                     [--version]
   examples:
   - summary: Download a certificate as PEM and check its fingerprint in openssl.
-    syntax:
-      content: >-
-        az keyvault certificate download --vault-name vault -n cert-name -f cert.pem && \
+    syntax: >-
+      az keyvault certificate download --vault-name vault -n cert-name -f cert.pem && \
 
-        openssl x509 -in cert.pem -inform PEM  -noout -sha1 -fingerprint
+      openssl x509 -in cert.pem -inform PEM  -noout -sha1 -fingerprint
   - summary: Download a certificate as DER and check its fingerprint in openssl.
-    syntax:
-      content: >-
-        az keyvault certificate download --vault-name vault -n cert-name -f cert.crt -e DER && \
+    syntax: >-
+      az keyvault certificate download --vault-name vault -n cert-name -f cert.crt -e DER && \
 
-        openssl x509 -in cert.crt -inform DER  -noout -sha1 -fingerprint
-  parameters:
+      openssl x509 -in cert.crt -inform DER  -noout -sha1 -fingerprint
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the binary certificate contents.
     description: ''
+  optionalParameters:
   - name: --encoding -e
     defaultValue: PEM
     parameterValueGroup: DER, PEM
     summary: Encoding of the certificate. DER will create a binary DER formatted x509 certificate, and PEM will create a base64 PEM x509 certificate.
     description: ''
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The certificate version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_get_default_policy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_get-default-policy
   name: az keyvault certificate get-default-policy
   summary: Get the default policy for self-signed certificates.
   description: >-
@@ -157,63 +140,73 @@ items:
     The default policy can also be used as a starting point to create derivative policies.
 
 
-    For more details, see: <a href="https://docs.microsoft.com/rest/api/keyvault/certificates-and-policies">https://docs.microsoft.com/rest/api/keyvault/certificates-and-policies</a>.
-  langs:
-  - azurecli
+    For more details, see: https://docs.microsoft.com/azure/key-vault/certificates/about-certificates#certificate-policy.
+  syntax: >-
+    az keyvault certificate get-default-policy [--scaffold]
+                                               [--subscription]
   examples:
   - summary: Create a self-signed certificate with the default policy
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
-  parameters:
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
+  optionalParameters:
   - name: --scaffold
     summary: Create a fully formed policy structure with default values.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_import
   name: az keyvault certificate import
   summary: Import a certificate into KeyVault.
   description: Certificates can also be used as a secrets in provisioned virtual machines.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault certificate import --file
+                                   --name
+                                   --vault-name
+                                   [--disabled {false, true}]
+                                   [--password]
+                                   [--policy]
+                                   [--subscription]
+                                   [--tags]
   examples:
   - summary: Create a service principal with a certificate, add the certificate to Key Vault and provision a VM with that certificate.
-    syntax:
-      content: >-
-        service_principal=$(az ad sp create-for-rbac --create-cert)
+    syntax: >-
+      service_principal=$(az ad sp create-for-rbac --create-cert)
 
 
-        cert_file=$(echo $service_principal | jq .fileWithCertAndPrivateKey -r)
+      cert_file=$(echo $service_principal | jq .fileWithCertAndPrivateKey -r)
 
 
-        az keyvault create -g my-group -n vaultname
+      az keyvault create -g my-group -n vaultname
 
 
-        az keyvault certificate import --vault-name vaultname -n cert_name -f cert_file
+      az keyvault certificate import --vault-name vaultname -n cert_name -f cert_file
 
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
-  parameters:
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: PKCS12 file or PEM file containing the certificate and private key.
     description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the certificate.
+    description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --disabled
     parameterValueGroup: false, true
     summary: Import the certificate in disabled state.
@@ -222,337 +215,266 @@ items:
     summary: If the private key in certificate is encrypted, the password used for encryption.
     description: ''
   - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file(e.g. @my_policy.json).
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+    summary: JSON encoded policy definition. Use @{file} to load from a file(e.g. @my_policy.json).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_list
   name: az keyvault certificate list
   summary: List certificates in a specified key vault.
   description: The GetCertificates operation returns the set of certificates resources in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate list [--id]
+                                 [--maxresults]
+                                 [--query-examples]
+                                 [--subscription]
+                                 [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_list_deleted
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_list-deleted
   name: az keyvault certificate list-deleted
   summary: Lists the deleted certificates in the specified vault currently available for recovery.
   description: The GetDeletedCertificates operation retrieves the certificates in the current vault which are in a deleted state and ready for recovery or purging. This operation includes deletion-specific information. This operation requires the certificates/get/list permission. This operation can only be enabled on soft-delete enabled vaults.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
+  syntax: >-
+    az keyvault certificate list-deleted --vault-name
+                                         [--id]
+                                         [--maxresults]
+                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --maxresults
+    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_list-versions
   name: az keyvault certificate list-versions
   summary: List the versions of a certificate.
   description: The GetCertificateVersions operation returns the versions of a certificate in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate list-versions [--id]
+                                          [--maxresults]
+                                          [--name]
+                                          [--subscription]
+                                          [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_purge
   name: az keyvault certificate purge
   summary: Permanently deletes the specified deleted certificate.
   description: The PurgeDeletedCertificate operation performs an irreversible deletion of the specified certificate, without possibility for recovery. The operation is not available if the recovery level does not specify 'Purgeable'. This operation requires the certificate/purge permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate purge [--id]
+                                  [--name]
+                                  [--subscription]
+                                  [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_recover
   name: az keyvault certificate recover
   summary: Recovers the deleted certificate back to its current version under /certificates.
   description: The RecoverDeletedCertificate operation performs the reversal of the Delete operation. The operation is applicable in vaults enabled for soft-delete, and must be issued during the retention interval (available in the deleted certificate's attributes). This operation requires the certificates/recover permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate recover [--id]
+                                    [--name]
+                                    [--subscription]
+                                    [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_set_attributes
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_set-attributes
   name: az keyvault certificate set-attributes
   summary: Updates the specified attributes associated with the given certificate.
   description: The UpdateCertificate operation applies the specified update on the given certificate; the only elements updated are the certificate's attributes. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate set-attributes [--enabled {false, true}]
+                                           [--id]
+                                           [--name]
+                                           [--policy]
+                                           [--subscription]
+                                           [--tags]
+                                           [--vault-name]
+                                           [--version]
+  optionalParameters:
   - name: --enabled
     parameterValueGroup: false, true
     summary: Enable the certificate.
     description: ''
-  - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file(e.g. @my_policy.json).
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
+  - name: --policy -p
+    summary: JSON encoded policy definition. Use @{file} to load from a file(e.g. @my_policy.json).
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The certificate version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_show
   name: az keyvault certificate show
   summary: Gets information about a certificate.
   description: Gets information about a specific certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate show [--id]
+                                 [--name]
+                                 [--query-examples]
+                                 [--subscription]
+                                 [--vault-name]
+                                 [--version]
+  optionalParameters:
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The certificate version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_show_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_show-deleted
   name: az keyvault certificate show-deleted
   summary: Retrieves information about the specified deleted certificate.
   description: The GetDeletedCertificate operation retrieves the deleted certificate information plus its attributes, such as retention interval, scheduled permanent deletion and the current deletion recovery level. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate show-deleted [--id]
+                                         [--name]
+                                         [--subscription]
+                                         [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
+- az_keyvault_certificate_contact
+- az_keyvault_certificate_contact_add
+- az_keyvault_certificate_contact_delete
+- az_keyvault_certificate_contact_list
+- az_keyvault_certificate_create
+- az_keyvault_certificate_delete
+- az_keyvault_certificate_download
+- az_keyvault_certificate_get-default-policy
+- az_keyvault_certificate_import
+- az_keyvault_certificate_issuer
+- az_keyvault_certificate_issuer_admin
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
+- az_keyvault_certificate_issuer_create
+- az_keyvault_certificate_issuer_delete
+- az_keyvault_certificate_issuer_list
+- az_keyvault_certificate_issuer_show
+- az_keyvault_certificate_issuer_update
+- az_keyvault_certificate_list
+- az_keyvault_certificate_list-deleted
+- az_keyvault_certificate_list-versions
+- az_keyvault_certificate_pending
+- az_keyvault_certificate_pending_delete
+- az_keyvault_certificate_pending_merge
+- az_keyvault_certificate_pending_show
+- az_keyvault_certificate_purge
+- az_keyvault_certificate_recover
+- az_keyvault_certificate_set-attributes
+- az_keyvault_certificate_show
+- az_keyvault_certificate_show-deleted
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -568,10 +490,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage certificates.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/contact.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/contact.yml
index 67f4cbee92..a46714780b 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/contact.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/contact.yml
@@ -1,99 +1,86 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_contact_add
-  - az_keyvault_certificate_contact_delete
-  - az_keyvault_certificate_contact_list
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_contact
+name: az keyvault certificate contact
+summary: Manage contacts for certificate management.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_contact_add
   name: az keyvault certificate contact add
   summary: Add a contact to the specified vault to receive notifications of certificate operations.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate contact add --email
+                                        --vault-name
+                                        [--name]
+                                        [--phone]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Contact e-mail address. Must be unique.
     description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --name
     summary: Full contact name.
     description: ''
   - name: --phone
     summary: Contact phone number.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_contact_delete
   name: az keyvault certificate contact delete
   summary: Remove a certificate contact from the specified vault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate contact delete --email
+                                           --vault-name
+                                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Contact e-mail address. Must be unique.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_contact_list
   name: az keyvault certificate contact list
   summary: Lists the certificate contacts for a specified key vault.
   description: The GetCertificateContacts operation returns the set of certificate contact resources in the specified key vault. This operation requires the certificates/managecontacts permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate contact list --vault-name
+                                         [--query-examples]
+                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
+- az_keyvault_certificate_contact_add
+- az_keyvault_certificate_contact_delete
+- az_keyvault_certificate_contact_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -109,10 +96,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage contacts for certificate management.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage contacts for certificate management.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer.yml
index 237a4ffb94..b65c0c1d08 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_issuer_create
-  - az_keyvault_certificate_issuer_delete
-  - az_keyvault_certificate_issuer_list
-  - az_keyvault_certificate_issuer_show
-  - az_keyvault_certificate_issuer_update
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_issuer
+name: az keyvault certificate issuer
+summary: Manage certificate issuer information.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_issuer_create
   name: az keyvault certificate issuer create
   summary: Create a certificate issuer record.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer create --issuer-name
+                                          --provider-name
+                                          --vault-name
+                                          [--account-id]
+                                          [--disabled {false, true}]
+                                          [--organization-id]
+                                          [--password]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
@@ -27,171 +26,154 @@ items:
     name: --provider-name
     summary: The certificate provider name. Must be registered with your tenant ID and in your region.
     description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Set issuer to disabled state.
-    description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --account-id
     summary: The issuer account id/username/etc.
     description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Set issuer to disabled state.
     description: ''
   - name: --organization-id
     summary: The organization id.
     description: ''
+  - name: --password
+    summary: The issuer account password/secret/etc.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_delete
   name: az keyvault certificate issuer delete
   summary: Deletes the specified certificate issuer.
   description: The DeleteCertificateIssuer operation permanently removes the specified certificate issuer from the vault. This operation requires the certificates/manageissuers/deleteissuers permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer delete --issuer-name
+                                          --vault-name
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_list
   name: az keyvault certificate issuer list
   summary: List certificate issuers for a specified key vault.
   description: The GetCertificateIssuers operation returns the set of certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer list --vault-name
+                                        [--maxresults]
+                                        [--query-examples]
+                                        [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_show
   name: az keyvault certificate issuer show
   summary: Lists the specified certificate issuer.
   description: The GetCertificateIssuer operation returns the specified certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer show --issuer-name
+                                        --vault-name
+                                        [--query-examples]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_update
   name: az keyvault certificate issuer update
   summary: Update a certificate issuer record.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer update --issuer-name
+                                          --vault-name
+                                          [--account-id]
+                                          [--enabled {false, true}]
+                                          [--organization-id]
+                                          [--password]
+                                          [--provider-name]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Set issuer enabled state.
-    description: ''
-  - name: --provider-name
-    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
-    description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --account-id
     summary: The issuer account id/username/etc.
     description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
+  - name: --enabled
+    parameterValueGroup: false, true
+    summary: Set issuer enabled state.
     description: ''
   - name: --organization-id
     summary: The organization id.
     description: ''
+  - name: --password
+    summary: The issuer account password/secret/etc.
+    description: ''
+  - name: --provider-name
+    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
+- az_keyvault_certificate_issuer_admin
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
+- az_keyvault_certificate_issuer_create
+- az_keyvault_certificate_issuer_delete
+- az_keyvault_certificate_issuer_list
+- az_keyvault_certificate_issuer_show
+- az_keyvault_certificate_issuer_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -207,10 +189,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage certificate issuer information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage certificate issuer information.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer/admin.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer/admin.yml
index 46a0cbdc18..d3a1e159b6 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer/admin.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/issuer/admin.yml
@@ -1,22 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_issuer_admin_add
-  - az_keyvault_certificate_issuer_admin_delete
-  - az_keyvault_certificate_issuer_admin_list
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_issuer_admin
+name: az keyvault certificate issuer admin
+summary: Manage admin information for certificate issuers.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_issuer_admin_add
   name: az keyvault certificate issuer admin add
   summary: Add admin details for a specified certificate issuer.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer admin add --email
+                                             --issuer-name
+                                             --vault-name
+                                             [--first-name]
+                                             [--last-name]
+                                             [--phone]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Admin e-mail address. Must be unique within the vault.
@@ -25,6 +25,11 @@ items:
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --first-name
     summary: Admin first name.
     description: ''
@@ -34,26 +39,20 @@ items:
   - name: --phone
     summary: Admin phone number.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_admin_delete
   name: az keyvault certificate issuer admin delete
   summary: Remove admin details for the specified certificate issuer.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer admin delete --email
+                                                --issuer-name
+                                                --vault-name
+                                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Admin e-mail address. Must be unique within the vault.
@@ -64,51 +63,43 @@ items:
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_admin_list
   name: az keyvault certificate issuer admin list
   summary: List admins for a specified certificate issuer.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer admin list --issuer-name
+                                              --vault-name
+                                              [--query-examples]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -124,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage admin information for certificate issuers.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage admin information for certificate issuers.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/pending.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/pending.yml
index 78a649da2b..7cad3b8fce 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/pending.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/certificate/pending.yml
@@ -1,50 +1,58 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_pending_delete
-  - az_keyvault_certificate_pending_merge
-  - az_keyvault_certificate_pending_show
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_pending
+name: az keyvault certificate pending
+summary: Manage pending certificate creation operations.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_pending_delete
   name: az keyvault certificate pending delete
   summary: Deletes the creation operation for a specific certificate.
   description: Deletes the creation operation for a specified certificate that is in the process of being created. The certificate is no longer created. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate pending delete --name
+                                           --vault-name
+                                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the pending certificate.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_pending_merge
   name: az keyvault certificate pending merge
   summary: Merges a certificate or a certificate chain with a key pair existing on the server.
   description: The MergeCertificate operation performs the merging of a certificate or certificate chain with a key pair currently available in the service. This operation requires the certificates/create permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate pending merge --file
+                                          --name
+                                          --vault-name
+                                          [--disabled {false, true}]
+                                          [--expires]
+                                          [--not-before]
+                                          [--subscription]
+                                          [--tags]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File containing the certificate or certificate chain to merge.
     description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pending certificate.
+    description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --disabled
     parameterValueGroup: false, true
     summary: Create certificate in disabled state.
@@ -55,60 +63,43 @@ items:
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_pending_show
   name: az keyvault certificate pending show
   summary: Gets the creation operation of a certificate.
   description: Gets the creation operation associated with a specified certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate pending show --name
+                                         --vault-name
+                                         [--query-examples]
+                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the pending certificate.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
+- az_keyvault_certificate_pending_delete
+- az_keyvault_certificate_pending_merge
+- az_keyvault_certificate_pending_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -124,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage pending certificate creation operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage pending certificate creation operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/key.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/key.yml
index 8a01790b06..d8cfaeed16 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/key.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/key.yml
@@ -1,65 +1,65 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_key_backup
-  - az_keyvault_key_create
-  - az_keyvault_key_delete
-  - az_keyvault_key_download
-  - az_keyvault_key_import
-  - az_keyvault_key_list
-  - az_keyvault_key_list_deleted
-  - az_keyvault_key_list_versions
-  - az_keyvault_key_purge
-  - az_keyvault_key_recover
-  - az_keyvault_key_restore
-  - az_keyvault_key_set_attributes
-  - az_keyvault_key_show
-  - az_keyvault_key_show_deleted
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_key
+name: az keyvault key
+summary: Manage keys.
+description: ''
+directCommands:
 - uid: az_keyvault_key_backup
   name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-  description: The Key Backup operation exports a key from Azure Key Vault in a protected form. Note that this operation does NOT return key material in a form that can be used outside the Azure Key Vault system, the returned key material is either protected to a Azure Key Vault HSM or to Azure Key Vault itself. The intent of this operation is to allow a client to GENERATE a key in one Azure Key Vault instance, BACKUP the key, and then RESTORE it into another Azure Key Vault instance. The BACKUP operation may be used to export, in protected form, any key type from Azure Key Vault. Individual versions of a key cannot be backed up. BACKUP / RESTORE can be performed within geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical area. This operation requires the key/backup permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Request that a backup of the specified key be downloaded to the client.
+  description: The Key Backup operation exports a key from Vault or HSM in a protected form. Note that this operation does NOT return key material in a form that can be used outside the Vault or HSM system, the returned key material is either protected to a HSM or to Vault itself. The intent of this operation is to allow a client to GENERATE a key in one Vault or HSM instance, BACKUP the key, and then RESTORE it into another Vault or HSM instance. The BACKUP operation may be used to export, in protected form, any key type from Vault or HSM. Individual versions of a key cannot be backed up. BACKUP / RESTORE can be performed within geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical area. This operation requires the key/backup permission.
+  syntax: >-
+    az keyvault key backup --file
+                           [--hsm-name]
+                           [--id]
+                           [--name]
+                           [--subscription]
+                           [--vault-name]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: Local file path in which to store key backup.
     description: ''
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_create
   name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-  description: The create key operation can be used to create any key type in Azure Key Vault. If the named key already exists, Azure Key Vault creates a new version of the key. It requires the keys/create permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Create a new key, stores it, then returns key parameters and attributes to the client.
+  description: The create key operation can be used to create any key type in Vault or HSM. If the named key already exists, Vault or HSM creates a new version of the key. It requires the keys/create permission.
+  syntax: >-
+    az keyvault key create [--curve {P-256, P-384, P-521, SECP256K1}]
+                           [--disabled {false, true}]
+                           [--expires]
+                           [--hsm-name]
+                           [--id]
+                           [--kty {EC, EC-HSM, RSA, RSA-HSM, oct, oct-HSM}]
+                           [--name]
+                           [--not-before]
+                           [--ops {decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey}]
+                           [--protection {hsm, software}]
+                           [--size]
+                           [--subscription]
+                           [--tags]
+                           [--vault-name]
+  optionalParameters:
   - name: --curve
     parameterValueGroup: P-256, P-384, P-521, SECP256K1
-    summary: 'Elliptic curve name. For valid values, see: <a href="https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeycurvename">https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeycurvename</a>.'
+    summary: 'Elliptic curve name. For valid values, see: https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeycurvename.'
     description: ''
   - name: --disabled
     parameterValueGroup: false, true
@@ -68,15 +68,24 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --kty
-    parameterValueGroup: EC, EC-HSM, RSA, RSA-HSM, oct
-    summary: 'The type of key to create. For valid values, see: <a href="https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeytype">https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeytype</a>.'
+    parameterValueGroup: EC, EC-HSM, RSA, RSA-HSM, oct, oct-HSM
+    summary: 'The type of key to create. For valid values, see: https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeytype.'
+    description: ''
+  - name: --name -n
+    summary: Name of the key.
     description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
   - name: --ops
-    parameterValueGroup: decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey
+    parameterValueGroup: decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey
     summary: Space-separated list of permitted JSON web key operations.
     description: ''
   - name: --protection -p
@@ -84,104 +93,235 @@ items:
     summary: Specifies the type of key protection.
     description: ''
   - name: --size
-    summary: 'The key size in bits. For example: 2048, 3072, or 4096 for RSA.'
+    summary: 'The key size in bits. For example: 2048, 3072, or 4096 for RSA. 128, 192, or 256 for oct.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_decrypt
+  name: az keyvault key decrypt
+  summary: Decrypt a single block of encrypted data.
+  description: The DECRYPT operation decrypts a well-formed block of ciphertext using the target encryption key and specified algorithm. This operation is the reverse of the ENCRYPT operation; only a single block of data may be decrypted, the size of this block is dependent on the target key and the algorithm to be used. The DECRYPT operation applies to asymmetric and symmetric keys stored in Vault or HSM since it uses the private portion of the key. This operation requires the keys/decrypt permission.
+  syntax: >-
+    az keyvault key decrypt --algorithm {RSA-OAEP, RSA-OAEP-256, RSA1_5}
+                            --value
+                            [--data-type {base64, plaintext}]
+                            [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--subscription]
+                            [--vault-name]
+                            [--version]
+  requiredParameters:
   - isRequired: true
-    name: --name -n
-    summary: Name of the key.
+    name: --algorithm -a
+    parameterValueGroup: RSA-OAEP, RSA-OAEP-256, RSA1_5
+    summary: Algorithm identifier.
     description: ''
   - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+    name: --value
+    summary: The value to be decrypted, which should be the result of "az keyvault encrypt".
+    description: ''
+  optionalParameters:
+  - name: --data-type
+    defaultValue: base64
+    parameterValueGroup: base64, plaintext
+    summary: The type of the original data.
+    description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. Required if --id is not specified.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  - name: --version -v
+    summary: The key version. If omitted, uses the latest version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_delete
   name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
+  summary: Delete a key of any type from storage in Vault or HSM.
   description: The delete key operation cannot be used to remove individual versions of a key. This operation removes the cryptographic material associated with the key, which means the key is not usable for Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt operations. This operation requires the keys/delete permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault key delete [--hsm-name]
+                           [--id]
+                           [--name]
+                           [--subscription]
+                           [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_download
   name: az keyvault key download
-  summary: Downloads the public part of a stored key.
+  summary: Download the public part of a stored key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault key download --file
+                             [--encoding {DER, PEM}]
+                             [--hsm-name]
+                             [--id]
+                             [--name]
+                             [--subscription]
+                             [--vault-name]
+                             [--version]
   examples:
-  - summary: Save the key with PEM encoding
-    syntax:
-      content: az keyvault key download --vault-name MyKeyVault -n MyKey -e PEM -f mykey.pem
-  - summary: Save the key with DER encoding
-    syntax:
-      content: az keyvault key download --vault-name MyKeyVault -n MyKey -e DER -f mykey.der
-  parameters:
+  - summary: Save the key with PEM encoding.
+    syntax: az keyvault key download --vault-name MyKeyVault -n MyKey -e PEM -f mykey.pem
+  - summary: Save the key with DER encoding.
+    syntax: az keyvault key download --vault-name MyKeyVault -n MyKey -e DER -f mykey.der
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the key contents.
     description: ''
+  optionalParameters:
   - name: --encoding -e
     defaultValue: PEM
     parameterValueGroup: DER, PEM
     summary: 'Encoding of the key, default: PEM.'
     description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. Required if --id is not specified.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  - name: --version -v
+    summary: The key version. If omitted, uses the latest version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_encrypt
+  name: az keyvault key encrypt
+  summary: Encrypt an arbitrary sequence of bytes using an encryption key that is stored in a Vault or HSM.
+  description: The ENCRYPT operation encrypts an arbitrary sequence of bytes using an encryption key that is stored in Vault or HSM. Note that the ENCRYPT operation only supports a single block of data, the size of which is dependent on the target key and the encryption algorithm to be used. The ENCRYPT operation is only strictly necessary for symmetric keys stored in Vault pr HSM since protection with an asymmetric key can be performed using public portion of the key. This operation is supported for asymmetric keys as a convenience for callers that have a key-reference but do not have access to the public key material. This operation requires the keys/encrypt permission.
+  syntax: >-
+    az keyvault key encrypt --algorithm {RSA-OAEP, RSA-OAEP-256, RSA1_5}
+                            --value
+                            [--data-type {base64, plaintext}]
+                            [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--subscription]
+                            [--vault-name]
+                            [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --algorithm -a
+    parameterValueGroup: RSA-OAEP, RSA-OAEP-256, RSA1_5
+    summary: Algorithm identifier.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: The value to be encrypted. Default data type is Base64 encoded string.
+    description: ''
+  optionalParameters:
+  - name: --data-type
+    defaultValue: base64
+    parameterValueGroup: base64, plaintext
+    summary: The type of the original data.
+    description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The key version. If omitted, uses the latest version.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_get-policy-template
+  name: az keyvault key get-policy-template
+  summary: Return policy template as JSON encoded policy definition.
+  description: ''
+  syntax: az keyvault key get-policy-template [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_import
   name: az keyvault key import
   summary: Import a private key.
-  description: Supports importing base64 encoded private keys from PEM files. Supports importing BYOK keys into HSM for premium key vaults.
-  langs:
-  - azurecli
-  parameters:
+  description: Supports importing base64 encoded private keys from PEM files or strings. Supports importing BYOK keys into HSM for premium key vaults.
+  syntax: >-
+    az keyvault key import [--byok-file]
+                           [--byok-string]
+                           [--curve {P-256, P-256K, P-384, P-521}]
+                           [--disabled {false, true}]
+                           [--expires]
+                           [--hsm-name]
+                           [--id]
+                           [--kty {EC, RSA}]
+                           [--name]
+                           [--not-before]
+                           [--ops {decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey}]
+                           [--pem-file]
+                           [--pem-password]
+                           [--pem-string]
+                           [--protection {hsm, software}]
+                           [--subscription]
+                           [--tags]
+                           [--vault-name]
+  optionalParameters:
+  - name: --byok-file
+    summary: BYOK file containing the key to be imported. Must not be password protected.
+    description: ''
+  - name: --byok-string
+    summary: BYOK string containing the key to be imported. Must not be password protected.
+    description: ''
+  - name: --curve
+    parameterValueGroup: P-256, P-256K, P-384, P-521
+    summary: The curve name of the key to import (only for BYOK).
+    description: ''
   - name: --disabled
     parameterValueGroup: false, true
     summary: Create key in disabled state.
@@ -189,30 +329,26 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
     description: ''
-  - name: --protection -p
-    parameterValueGroup: hsm, software
-    summary: Specifies the type of key protection.
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --kty
+    defaultValue: RSA
+    parameterValueGroup: EC, RSA
+    summary: The type of key to import (only for BYOK).
     description: ''
-  - isRequired: true
-    name: --name -n
+  - name: --name -n
     summary: Name of the key.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --not-before
+    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
-  - name: --byok-file
-    summary: BYOK file containing the key to be imported. Must not be password protected.
+  - name: --ops
+    parameterValueGroup: decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey
+    summary: Space-separated list of permitted JSON web key operations.
     description: ''
   - name: --pem-file
     summary: PEM file containing the key to be imported.
@@ -220,170 +356,243 @@ items:
   - name: --pem-password
     summary: Password of PEM file.
     description: ''
+  - name: --pem-string
+    summary: PEM string containing the key to be imported.
+    description: ''
+  - name: --protection -p
+    parameterValueGroup: hsm, software
+    summary: Specifies the type of key protection.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_list
   name: az keyvault key list
-  summary: List keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and tags are provided in the response. Individual versions of a key are not listed in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: List keys in the specified Vault or HSM.
+  description: Retrieve a list of the keys in the Vault or HSM as JSON Web Key structures that contain the public part of a stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and tags are provided in the response. Individual versions of a key are not listed in the response. This operation requires the keys/list permission.
+  syntax: >-
+    az keyvault key list [--hsm-name]
+                         [--id]
+                         [--include-managed {false, true}]
+                         [--maxresults]
+                         [--query-examples]
+                         [--subscription]
+                         [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --include-managed
+    parameterValueGroup: false, true
+    summary: 'Include managed keys. Default: false.'
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_list_deleted
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_list-deleted
   name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is applicable for vaults enabled for soft-delete. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: List the deleted keys in the specified Vault or HSM.
+  description: Retrieve a list of the keys in the Vault or HSM as JSON Web Key structures that contain the public part of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is applicable for vaults enabled for soft-delete. While the operation can be invoked on any Vault or HSM, it will return an error if invoked on a non soft-delete enabled Vault or HSM. This operation requires the keys/list permission.
+  syntax: >-
+    az keyvault key list-deleted [--hsm-name]
+                                 [--id]
+                                 [--maxresults]
+                                 [--subscription]
+                                 [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_list_versions
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_list-versions
   name: az keyvault key list-versions
   summary: Retrieves a list of individual key versions with the same key name.
   description: The full key identifier, attributes, and tags are provided in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+  syntax: >-
+    az keyvault key list-versions [--hsm-name]
+                                  [--id]
+                                  [--maxresults]
+                                  [--name]
+                                  [--subscription]
+                                  [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
     description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --maxresults
+    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_purge
   name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-  description: The Purge Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/purge permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Permanently delete the specified key.
+  description: The Purge Deleted Key operation is applicable for soft-delete enabled Vaults or HSMs. While the operation can be invoked on any Vault or HSM, it will return an error if invoked on a non soft-delete enabled Vault or HSM. This operation requires the keys/purge permission.
+  syntax: >-
+    az keyvault key purge [--hsm-name]
+                          [--id]
+                          [--name]
+                          [--subscription]
+                          [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_recover
   name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-  description: The Recover Deleted Key operation is applicable for deleted keys in soft-delete enabled vaults. It recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will return an error. Consider this the inverse of the delete operation on soft-delete enabled vaults. This operation requires the keys/recover permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Recover the deleted key to its latest version.
+  description: The Recover Deleted Key operation is applicable for deleted keys in soft-delete enabled Vaults or HSMs. It recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will return an error. Consider this the inverse of the delete operation on soft-delete enabled Vaults or HSMs. This operation requires the keys/recover permission.
+  syntax: >-
+    az keyvault key recover [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--subscription]
+                            [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_restore
   name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-  description: 'Imports a previously backed up key into Azure Key Vault, restoring the key, its key identifier, attributes and access control policies. The RESTORE operation may be used to import a previously backed up key. Individual versions of a key cannot be restored. The key is restored in its entirety with the same key name as it had when it was backed up. If the key name is not available in the target Key Vault, the RESTORE operation will be rejected. While the key name is retained during restore, the final key identifier will change if the key is restored to a different vault. Restore will restore all versions and preserve version identifiers. The RESTORE operation is subject to security constraints: The target Key Vault must be owned by the same Microsoft Azure Subscription as the source Key Vault The user must have RESTORE permission in the target Key Vault. This operation requires the keys/restore permission.'
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
+  summary: Restore a backed up key to a Vault or HSM.
+  description: Import a previously backed up key into Vault or HSM, restoring the key, its key identifier, attributes and access control policies. The RESTORE operation may be used to import a previously backed up key. Individual versions of a key cannot be restored. The key is restored in its entirety with the same key name as it had when it was backed up. If the key name is not available in the target Key Vault, the RESTORE operation will be rejected. While the key name is retained during restore, the final key identifier will change if the key is restored to a different Vault or HSM. Restore will restore all versions and preserve version identifiers. The RESTORE operation is subject to security constraints. The target Vault or HSM must be owned by the same Microsoft Azure Subscription as the source Vault or HSM. The user must have RESTORE permission in the target Vault or HSM. This operation requires the keys/restore permission.
+  syntax: >-
+    az keyvault key restore [--backup-folder]
+                            [--blob-container-name]
+                            [--file]
+                            [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--no-wait]
+                            [--storage-account-name]
+                            [--storage-container-SAS-token]
+                            [--storage-resource-uri]
+                            [--subscription]
+                            [--vault-name]
+  optionalParameters:
+  - name: --backup-folder
+    summary: Name of the blob container which contains the backup.
+    description: ''
+  - name: --blob-container-name
+    summary: Name of Blob Container.
+    description: ''
+  - name: --file -f
     summary: Local key backup from which to restore key.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. (Only for restoring from storage account).
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-name
+    summary: Name of Azure Storage Account.
+    description: ''
+  - name: --storage-container-SAS-token -t
+    summary: The SAS token pointing to an Azure Blob storage container.
+    description: ''
+  - name: --storage-resource-uri -u
+    summary: Azure Blob storage container Uri. If specified, all other 'Storage Id' arguments should be omitted.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_set_attributes
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_set-attributes
   name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-  description: 'In order to perform this operation, the key must already exist in the Key Vault. Note: The cryptographic material of a key itself cannot be changed. This operation requires the keys/update permission.'
-  langs:
-  - azurecli
-  parameters:
+  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Vault or HSM.
+  description: In order to perform this operation, the key must already exist in the Vault or HSM. The cryptographic material of a key itself cannot be changed. This operation requires the keys/update permission.
+  syntax: >-
+    az keyvault key set-attributes [--enabled {false, true}]
+                                   [--expires]
+                                   [--hsm-name]
+                                   [--id]
+                                   [--name]
+                                   [--not-before]
+                                   [--ops {decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey}]
+                                   [--subscription]
+                                   [--tags]
+                                   [--vault-name]
+                                   [--version]
+  optionalParameters:
   - name: --enabled
     parameterValueGroup: false, true
     summary: Enable the key.
@@ -391,133 +600,115 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. Required if --id is not specified.
+    description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
   - name: --ops
-    parameterValueGroup: decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey
+    parameterValueGroup: decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey
     summary: Space-separated list of permitted JSON web key operations.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The key version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_show
   name: az keyvault key show
   summary: Gets the public part of a stored key.
   description: The get key operation is applicable to all key types. If the requested key is symmetric, then no key material is released in the response. This operation requires the keys/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault key show [--hsm-name]
+                         [--id]
+                         [--name]
+                         [--query-examples]
+                         [--subscription]
+                         [--vault-name]
+                         [--version]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The key version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_show_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_show-deleted
   name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-  description: The Get Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/get permission. .
-  langs:
-  - azurecli
-  parameters:
+  summary: Get the public part of a deleted key.
+  description: The Get Deleted Key operation is applicable for soft-delete enabled Vaults or HSMs. While the operation can be invoked on any Vault or HSM, it will return an error if invoked on a non soft-delete enabled Vault or HSM. This operation requires the keys/get permission.
+  syntax: >-
+    az keyvault key show-deleted [--hsm-name]
+                                 [--id]
+                                 [--name]
+                                 [--subscription]
+                                 [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: az_keyvault_key_download
-  name: az keyvault key download
-  summary: Downloads the public part of a stored key.
-- uid: az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
+- az_keyvault_key_backup
+- az_keyvault_key_create
+- az_keyvault_key_decrypt
+- az_keyvault_key_delete
+- az_keyvault_key_download
+- az_keyvault_key_encrypt
+- az_keyvault_key_get-policy-template
+- az_keyvault_key_import
+- az_keyvault_key_list
+- az_keyvault_key_list-deleted
+- az_keyvault_key_list-versions
+- az_keyvault_key_purge
+- az_keyvault_key_recover
+- az_keyvault_key_restore
+- az_keyvault_key_set-attributes
+- az_keyvault_key_show
+- az_keyvault_key_show-deleted
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -533,10 +724,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage keys.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/keyvault/secret.yml b/2017-03-09-profile/docs-ref-autogen/keyvault/secret.yml
index b710fc8da4..4ab771fe2f 100644
--- a/2017-03-09-profile/docs-ref-autogen/keyvault/secret.yml
+++ b/2017-03-09-profile/docs-ref-autogen/keyvault/secret.yml
@@ -1,270 +1,282 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_secret_backup
-  - az_keyvault_secret_delete
-  - az_keyvault_secret_download
-  - az_keyvault_secret_list
-  - az_keyvault_secret_list_deleted
-  - az_keyvault_secret_list_versions
-  - az_keyvault_secret_purge
-  - az_keyvault_secret_recover
-  - az_keyvault_secret_restore
-  - az_keyvault_secret_set
-  - az_keyvault_secret_set_attributes
-  - az_keyvault_secret_show
-  - az_keyvault_secret_show_deleted
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_secret
+name: az keyvault secret
+summary: Manage secrets.
+description: ''
+directCommands:
 - uid: az_keyvault_secret_backup
   name: az keyvault secret backup
   summary: Backs up the specified secret.
   description: Requests that a backup of the specified secret be downloaded to the client. All versions of the secret will be downloaded. This operation requires the secrets/backup permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret backup --file
+                              [--id]
+                              [--name]
+                              [--subscription]
+                              [--vault-name]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the secret contents.
     description: ''
+  optionalParameters:
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_delete
   name: az keyvault secret delete
   summary: Deletes a secret from a specified key vault.
   description: The DELETE operation applies to any secret stored in Azure Key Vault. DELETE cannot be applied to an individual version of a secret. This operation requires the secrets/delete permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret delete [--id]
+                              [--name]
+                              [--subscription]
+                              [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_download
   name: az keyvault secret download
   summary: Download a secret from a KeyVault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret download --file
+                                [--encoding {ascii, base64, hex, utf-16be, utf-16le, utf-8}]
+                                [--id]
+                                [--name]
+                                [--subscription]
+                                [--vault-name]
+                                [--version]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the secret contents.
     description: ''
+  optionalParameters:
   - name: --encoding -e
     parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
     summary: Encoding of the secret. By default, will look for the 'file-encoding' tag on the secret. Otherwise will assume 'utf-8'.
     description: ''
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The secret version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_list
   name: az keyvault secret list
   summary: List secrets in a specified key vault.
   description: The Get Secrets operation is applicable to the entire vault. However, only the base secret identifier and its attributes are provided in the response. Individual secret versions are not listed in the response. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret list [--id]
+                            [--include-managed {false, true}]
+                            [--maxresults]
+                            [--query-examples]
+                            [--subscription]
+                            [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --include-managed
+    parameterValueGroup: false, true
+    summary: 'Include managed secrets. Default: false.'
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_list_deleted
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_list-deleted
   name: az keyvault secret list-deleted
   summary: Lists deleted secrets for the specified vault.
   description: The Get Deleted Secrets operation returns the secrets that have been deleted for a vault enabled for soft-delete. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
+  syntax: >-
+    az keyvault secret list-deleted --vault-name
+                                    [--id]
+                                    [--maxresults]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --maxresults
+    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_list-versions
   name: az keyvault secret list-versions
   summary: List all versions of the specified secret.
   description: The full secret identifier and attributes are provided in the response. No values are returned for the secrets. This operations requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret list-versions [--id]
+                                     [--maxresults]
+                                     [--name]
+                                     [--subscription]
+                                     [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
     description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_purge
   name: az keyvault secret purge
   summary: Permanently deletes the specified secret.
   description: The purge deleted secret operation removes the secret permanently, without the possibility of recovery. This operation can only be enabled on a soft-delete enabled vault. This operation requires the secrets/purge permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret purge [--id]
+                             [--name]
+                             [--subscription]
+                             [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_recover
   name: az keyvault secret recover
   summary: Recovers the deleted secret to the latest version.
   description: Recovers the deleted secret in the specified vault. This operation can only be performed on a soft-delete enabled vault. This operation requires the secrets/recover permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret recover [--id]
+                               [--name]
+                               [--subscription]
+                               [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_restore
   name: az keyvault secret restore
   summary: Restores a backed up secret to a vault.
   description: Restores a backed up secret, and all its versions, to a vault. This operation requires the secrets/restore permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret restore --file
+                               --vault-name
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the secret contents.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_set
   name: az keyvault secret set
   summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret set --name
+                           --vault-name
+                           [--description]
+                           [--disabled {false, true}]
+                           [--encoding {ascii, base64, hex, utf-16be, utf-16le, utf-8}]
+                           [--expires]
+                           [--file]
+                           [--not-before]
+                           [--subscription]
+                           [--tags]
+                           [--value]
+  examples:
+  - summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
+    syntax: az keyvault secret set --name MySecretName --vault-name MyKeyVault --value MyVault
+  - summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault through a file.
+    syntax: az keyvault secret set --name MySecretName --vault-name MyKeyVault --file /path/to/file --encoding MyEncoding
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the secret contents (e.g. password, connection string, etc).
     description: ''
@@ -272,50 +284,46 @@ items:
     parameterValueGroup: false, true
     summary: Create secret in disabled state.
     description: ''
+  - name: --encoding -e
+    defaultValue: utf-8
+    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
+    summary: Source file encoding. The value is saved as a tag (`file-encoding=<val>`) and used during download to automatically encode the resulting file.
+    description: ''
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --file -f
+    summary: Source file for secret. Use in conjunction with '--encoding'.
+    description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --encoding -e
-    defaultValue: utf-8
-    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
-    summary: Source file encoding. The value is saved as a tag (`file-encoding=&lt;val&gt;`) and used during download to automatically encode the resulting file.
-    description: ''
-  - name: --file -f
-    summary: Source file for secret. Use in conjunction with '--encoding'.
-    description: ''
   - name: --value
     summary: Plain text secret value. Cannot be used with '--file' or '--encoding'.
     description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the secret.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_set_attributes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_set-attributes
   name: az keyvault secret set-attributes
   summary: Updates the attributes associated with a specified secret in a given key vault.
   description: The UPDATE operation changes specified attributes of an existing stored secret. Attributes that are not specified in the request are left unchanged. The value of a secret itself cannot be changed. This operation requires the secrets/set permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret set-attributes [--content-type]
+                                      [--enabled {false, true}]
+                                      [--expires]
+                                      [--id]
+                                      [--name]
+                                      [--not-before]
+                                      [--subscription]
+                                      [--tags]
+                                      [--vault-name]
+                                      [--version]
+  optionalParameters:
   - name: --content-type
     summary: Type of the secret value such as a password.
     description: ''
@@ -326,126 +334,96 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --id
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the secret. Required if --id is not specified.
+    description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The secret version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_show
   name: az keyvault secret show
   summary: Get a specified secret from a given key vault.
   description: The GET operation is applicable to any secret stored in Azure Key Vault. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret show [--id]
+                            [--name]
+                            [--query-examples]
+                            [--subscription]
+                            [--vault-name]
+                            [--version]
+  optionalParameters:
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The secret version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_show_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_show-deleted
   name: az keyvault secret show-deleted
   summary: Gets the specified deleted secret.
   description: The Get Deleted Secret operation returns the specified deleted secret along with its attributes. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret show-deleted [--id]
+                                    [--name]
+                                    [--subscription]
+                                    [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
+- az_keyvault_secret_backup
+- az_keyvault_secret_delete
+- az_keyvault_secret_download
+- az_keyvault_secret_list
+- az_keyvault_secret_list-deleted
+- az_keyvault_secret_list-versions
+- az_keyvault_secret_purge
+- az_keyvault_secret_recover
+- az_keyvault_secret_restore
+- az_keyvault_secret_set
+- az_keyvault_secret_set-attributes
+- az_keyvault_secret_show
+- az_keyvault_secret_show-deleted
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -461,10 +439,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage secrets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage secrets.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto.yml b/2017-03-09-profile/docs-ref-autogen/kusto.yml
new file mode 100644
index 0000000000..bc47bb13e6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto.yml
@@ -0,0 +1,100 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto
+name: az kusto
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Kusto resources.
+description: This module will not be supported starting January 1, 2021. Please execute "az extension add -n kusto" to install the supported Kusto extension.
+commands:
+- az_kusto_attached-database-configuration
+- az_kusto_attached-database-configuration_create
+- az_kusto_attached-database-configuration_delete
+- az_kusto_attached-database-configuration_list
+- az_kusto_attached-database-configuration_show
+- az_kusto_attached-database-configuration_update
+- az_kusto_attached-database-configuration_wait
+- az_kusto_cluster
+- az_kusto_cluster_add-language-extension
+- az_kusto_cluster_create
+- az_kusto_cluster_delete
+- az_kusto_cluster_detach-follower-database
+- az_kusto_cluster_diagnose-virtual-network
+- az_kusto_cluster_list
+- az_kusto_cluster_list-follower-database
+- az_kusto_cluster_list-language-extension
+- az_kusto_cluster_list-sku
+- az_kusto_cluster_remove-language-extension
+- az_kusto_cluster_show
+- az_kusto_cluster_start
+- az_kusto_cluster_stop
+- az_kusto_cluster_update
+- az_kusto_cluster_wait
+- az_kusto_cluster-principal-assignment
+- az_kusto_cluster-principal-assignment_create
+- az_kusto_cluster-principal-assignment_delete
+- az_kusto_cluster-principal-assignment_list
+- az_kusto_cluster-principal-assignment_show
+- az_kusto_cluster-principal-assignment_update
+- az_kusto_cluster-principal-assignment_wait
+- az_kusto_database
+- az_kusto_database_add-principal
+- az_kusto_database_create
+- az_kusto_database_delete
+- az_kusto_database_list
+- az_kusto_database_list-principal
+- az_kusto_database_remove-principal
+- az_kusto_database_show
+- az_kusto_database_update
+- az_kusto_database_wait
+- az_kusto_database-principal-assignment
+- az_kusto_database-principal-assignment_create
+- az_kusto_database-principal-assignment_delete
+- az_kusto_database-principal-assignment_list
+- az_kusto_database-principal-assignment_show
+- az_kusto_database-principal-assignment_update
+- az_kusto_database-principal-assignment_wait
+- az_kusto_data-connection
+- az_kusto_data-connection_delete
+- az_kusto_data-connection_event-grid
+- az_kusto_data-connection_event-grid_create
+- az_kusto_data-connection_event-grid_data-connection-validation
+- az_kusto_data-connection_event-grid_update
+- az_kusto_data-connection_event-hub
+- az_kusto_data-connection_event-hub_create
+- az_kusto_data-connection_event-hub_data-connection-validation
+- az_kusto_data-connection_event-hub_update
+- az_kusto_data-connection_iot-hub
+- az_kusto_data-connection_iot-hub_create
+- az_kusto_data-connection_iot-hub_data-connection-validation
+- az_kusto_data-connection_iot-hub_update
+- az_kusto_data-connection_list
+- az_kusto_data-connection_show
+- az_kusto_data-connection_wait
+- az_kusto_operation-result
+- az_kusto_operation-result_show
+- az_kusto_script
+- az_kusto_script_create
+- az_kusto_script_delete
+- az_kusto_script_list
+- az_kusto_script_show
+- az_kusto_script_update
+- az_kusto_script_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: This module will not be supported starting January 1, 2021. Please execute "az extension add -n kusto" to install the supported Kusto extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/attached-database-configuration.yml b/2017-03-09-profile/docs-ref-autogen/kusto/attached-database-configuration.yml
new file mode 100644
index 0000000000..d7a1306b14
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/attached-database-configuration.yml
@@ -0,0 +1,279 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_attached-database-configuration
+name: az kusto attached-database-configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto attached-database-configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage attached database configuration with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_attached-database-configuration_create
+  name: az kusto attached-database-configuration create
+  summary: Create an attached database configuration.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration create --attached-database-configuration-name
+                                                    --cluster-name
+                                                    --resource-group
+                                                    [--cluster-resource-id]
+                                                    [--database-name]
+                                                    [--default-principals-modification-kind {None, Replace, Union}]
+                                                    [--location]
+                                                    [--no-wait]
+                                                    [--table-level-sharing-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cluster-resource-id
+    summary: The resource id of the cluster where the databases you would like to attach reside.
+    description: ''
+  - name: --database-name
+    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
+    description: ''
+  - name: --default-principals-modification-kind
+    parameterValueGroup: None, Replace, Union
+    summary: The default principals modification kind.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-level-sharing-properties --tls
+    summary: Table level sharing specifications.
+    description: ''
+- uid: az_kusto_attached-database-configuration_delete
+  name: az kusto attached-database-configuration delete
+  summary: Deletes the attached database configuration with the given name.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration delete --attached-database-configuration-name
+                                                    --cluster-name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--yes]
+  examples:
+  - summary: AttachedDatabaseConfigurationsDelete
+    syntax: az kusto attached-database-configuration delete --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_attached-database-configuration_list
+  name: az kusto attached-database-configuration list
+  summary: Returns the list of attached database configurations of the given Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration list --cluster-name
+                                                  --resource-group
+  examples:
+  - summary: KustoAttachedDatabaseConfigurationsListByCluster
+    syntax: az kusto attached-database-configuration list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_attached-database-configuration_show
+  name: az kusto attached-database-configuration show
+  summary: Returns an attached database configuration.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration show --attached-database-configuration-name
+                                                  --cluster-name
+                                                  --resource-group
+  examples:
+  - summary: AttachedDatabaseConfigurationsGet
+    syntax: az kusto attached-database-configuration show --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_attached-database-configuration_update
+  name: az kusto attached-database-configuration update
+  summary: Update an attached database configuration.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration update --attached-database-configuration-name
+                                                    --cluster-name
+                                                    --resource-group
+                                                    [--add]
+                                                    [--cluster-resource-id]
+                                                    [--database-name]
+                                                    [--default-principals-modification-kind {None, Replace, Union}]
+                                                    [--force-string]
+                                                    [--location]
+                                                    [--no-wait]
+                                                    [--remove]
+                                                    [--set]
+                                                    [--table-level-sharing-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --cluster-resource-id
+    summary: The resource id of the cluster where the databases you would like to attach reside.
+    description: ''
+  - name: --database-name
+    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
+    description: ''
+  - name: --default-principals-modification-kind
+    parameterValueGroup: None, Replace, Union
+    summary: The default principals modification kind.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --table-level-sharing-properties --tls
+    summary: Table level sharing specifications.
+    description: ''
+- uid: az_kusto_attached-database-configuration_wait
+  name: az kusto attached-database-configuration wait
+  summary: Place the CLI in a waiting state until a condition of the kusto attached-database-configuration is met.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration wait --attached-database-configuration-name
+                                                  --cluster-name
+                                                  --resource-group
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto attached-database-configuration is successfully created.
+    syntax: az kusto attached-database-configuration wait --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto attached-database-configuration is successfully updated.
+    syntax: az kusto attached-database-configuration wait --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto attached-database-configuration is successfully deleted.
+    syntax: az kusto attached-database-configuration wait --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_attached-database-configuration_create
+- az_kusto_attached-database-configuration_delete
+- az_kusto_attached-database-configuration_list
+- az_kusto_attached-database-configuration_show
+- az_kusto_attached-database-configuration_update
+- az_kusto_attached-database-configuration_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage attached database configuration with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/cluster-principal-assignment.yml b/2017-03-09-profile/docs-ref-autogen/kusto/cluster-principal-assignment.yml
new file mode 100644
index 0000000000..2d42a11283
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/cluster-principal-assignment.yml
@@ -0,0 +1,276 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_cluster-principal-assignment
+name: az kusto cluster-principal-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto cluster-principal-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cluster principal assignment with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_cluster-principal-assignment_create
+  name: az kusto cluster-principal-assignment create
+  summary: Create a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment create --cluster-name
+                                                 --principal-assignment-name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--principal-id]
+                                                 [--principal-type {App, Group, User}]
+                                                 [--role {AllDatabasesAdmin, AllDatabasesViewer}]
+                                                 [--tenant-id]
+  examples:
+  - summary: KustoClusterPrincipalAssignmentsCreateOrUpdate
+    syntax: az kusto cluster-principal-assignment create --cluster-name "kustoclusterrptest4" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "AllDatabasesAdmin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --role
+    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
+    summary: Cluster principal role.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_delete
+  name: az kusto cluster-principal-assignment delete
+  summary: Deletes a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment delete --cluster-name
+                                                 --principal-assignment-name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--yes]
+  examples:
+  - summary: KustoClusterPrincipalAssignmentsDelete
+    syntax: az kusto cluster-principal-assignment delete --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_list
+  name: az kusto cluster-principal-assignment list
+  summary: Lists all Kusto cluster principalAssignments.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment list --cluster-name
+                                               --resource-group
+  examples:
+  - summary: KustoPrincipalAssignmentsList
+    syntax: az kusto cluster-principal-assignment list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_show
+  name: az kusto cluster-principal-assignment show
+  summary: Gets a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment show --cluster-name
+                                               --principal-assignment-name
+                                               --resource-group
+  examples:
+  - summary: KustoClusterPrincipalAssignmentsGet
+    syntax: az kusto cluster-principal-assignment show --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_update
+  name: az kusto cluster-principal-assignment update
+  summary: Update a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment update --cluster-name
+                                                 --principal-assignment-name
+                                                 --resource-group
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--no-wait]
+                                                 [--principal-id]
+                                                 [--principal-type {App, Group, User}]
+                                                 [--remove]
+                                                 [--role {AllDatabasesAdmin, AllDatabasesViewer}]
+                                                 [--set]
+                                                 [--tenant-id]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --role
+    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
+    summary: Cluster principal role.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_wait
+  name: az kusto cluster-principal-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the kusto cluster-principal-assignment is met.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment wait --cluster-name
+                                               --principal-assignment-name
+                                               --resource-group
+                                               [--created]
+                                               [--custom]
+                                               [--deleted]
+                                               [--exists]
+                                               [--interval]
+                                               [--timeout]
+                                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto cluster-principal-assignment is successfully created.
+    syntax: az kusto cluster-principal-assignment wait --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto cluster-principal-assignment is successfully updated.
+    syntax: az kusto cluster-principal-assignment wait --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto cluster-principal-assignment is successfully deleted.
+    syntax: az kusto cluster-principal-assignment wait --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_cluster-principal-assignment_create
+- az_kusto_cluster-principal-assignment_delete
+- az_kusto_cluster-principal-assignment_list
+- az_kusto_cluster-principal-assignment_show
+- az_kusto_cluster-principal-assignment_update
+- az_kusto_cluster-principal-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cluster principal assignment with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/cluster.yml b/2017-03-09-profile/docs-ref-autogen/kusto/cluster.yml
new file mode 100644
index 0000000000..5ec905fb74
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/cluster.yml
@@ -0,0 +1,666 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_cluster
+name: az kusto cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cluster with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_cluster_add-language-extension
+  name: az kusto cluster add-language-extension
+  summary: Add a list of language extensions that can run within KQL queries.
+  description: ''
+  syntax: >-
+    az kusto cluster add-language-extension --cluster-name
+                                            --resource-group
+                                            [--no-wait]
+                                            [--value]
+  examples:
+  - summary: KustoClusterAddLanguageExtensions
+    syntax: az kusto cluster add-language-extension --name "kustoclusterrptest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --value
+    summary: The list of language extensions.
+    description: >-
+      Usage: --value language-extension-name=XX
+
+
+      language-extension-name: The language extension name.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_cluster_create
+  name: az kusto cluster create
+  summary: Create a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster create --cluster-name
+                            --resource-group
+                            --sku
+                            [--enable-disk-encryption {false, true}]
+                            [--enable-double-encryption {false, true}]
+                            [--enable-purge {false, true}]
+                            [--enable-streaming-ingest {false, true}]
+                            [--engine-type {V2, V3}]
+                            [--if-match]
+                            [--if-none-match]
+                            [--key-vault-properties]
+                            [--location]
+                            [--no-wait]
+                            [--optimized-autoscale]
+                            [--tags]
+                            [--trusted-external-tenants]
+                            [--type {None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned}]
+                            [--uai]
+                            [--virtual-network-configuration]
+                            [--zones]
+  examples:
+  - summary: KustoClustersCreateOrUpdate
+    syntax: az kusto cluster create --name "kustoclusterrptest4" --type "SystemAssigned" --location "westus" --enable-double-encryption false --enable-purge true --enable-streaming-ingest true --sku name="Standard_L8s" capacity=2 tier="Standard" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The SKU of the cluster.
+    description: >-
+      Usage: --sku name=XX capacity=XX tier=XX
+
+
+      name: Required. SKU name.
+
+      capacity: The number of instances of the cluster.
+
+      tier: Required. SKU tier.
+  optionalParameters:
+  - name: --enable-disk-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the cluster's disks are encrypted.
+    description: ''
+  - name: --enable-double-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if double encryption is enabled.
+    description: ''
+  - name: --enable-purge
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the purge operations are enabled.
+    description: ''
+  - name: --enable-streaming-ingest
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the streaming ingest is enabled.
+    description: ''
+  - name: --engine-type
+    parameterValueGroup: V2, V3
+    summary: The engine type.
+    description: ''
+  - name: --if-match
+    summary: The ETag of the cluster. Omit this value to always overwrite the current cluster. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --if-none-match
+    summary: Set to '\*' to allow a new cluster to be created, but to prevent updating an existing cluster. Other values will result in a 412 Pre-condition Failed response.
+    description: ''
+  - name: --key-vault-properties
+    summary: KeyVault properties for the cluster encryption.
+    description: >-
+      Usage: --key-vault-properties key-name=XX key-version=XX key-vault-uri=XX user-identity=XX
+
+
+      key-name: Required. The name of the key vault key.
+
+      key-version: The version of the key vault key.
+
+      key-vault-uri: Required. The Uri of the key vault.
+
+      user-identity: The user assigned identity (ARM resource id) that has access to the key.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --optimized-autoscale
+    summary: Optimized auto scale definition.
+    description: >-
+      Usage: --optimized-autoscale version=XX is-enabled=XX minimum=XX maximum=XX
+
+
+      version: Required. The version of the template defined, for instance 1.
+
+      is-enabled: Required. A boolean value that indicate if the optimized autoscale feature is enabled or not.
+
+      minimum: Required. Minimum allowed instances count.
+
+      maximum: Required. Maximum allowed instances count.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --trusted-external-tenants
+    summary: The cluster's external tenants.
+    description: >-
+      Usage: --trusted-external-tenants value=XX
+
+
+      value: GUID representing an external tenant.
+
+
+      Multiple actions can be specified by using more than one --trusted-external-tenants argument.
+  - name: --type
+    parameterValueGroup: None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned
+    summary: The type of managed identity used. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user-assigned identities. The type 'None' will remove all identities.
+    description: ''
+  - name: --uai --user-assigned-identities
+    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
+    description: ''
+  - name: --virtual-network-configuration
+    summary: Virtual network definition.
+    description: >-
+      Usage: --virtual-network-configuration subnet-id=XX engine-public-ip-id=XX data-management-public-ip-id=XX
+
+
+      subnet-id: Required. The subnet resource id.
+
+      engine-public-ip-id: Required. Engine service's public IP address resource id.
+
+      data-management-public-ip-id: Required. Data management's service public IP address resource id.
+  - name: --zones
+    summary: The availability zones of the cluster.
+    description: ''
+- uid: az_kusto_cluster_delete
+  name: az kusto cluster delete
+  summary: Deletes a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster delete --cluster-name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: KustoClustersDelete
+    syntax: az kusto cluster delete --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_cluster_detach-follower-database
+  name: az kusto cluster detach-follower-database
+  summary: Detaches all followers of a database owned by this cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster detach-follower-database --attached-database-configuration-name
+                                              --cluster-name
+                                              --cluster-resource-id
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: KustoClusterDetachFollowerDatabases
+    syntax: az kusto cluster detach-follower-database --name "kustoclusterrptest4" --attached-database-configuration-name "myAttachedDatabaseConfiguration" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/clusters/leader4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name
+    summary: Resource name of the attached database configuration in the follower cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-resource-id
+    summary: Resource id of the cluster that follows a database owned by this cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_diagnose-virtual-network
+  name: az kusto cluster diagnose-virtual-network
+  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
+  description: ''
+  syntax: >-
+    az kusto cluster diagnose-virtual-network --cluster-name
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: KustoClusterDiagnoseVirtualNetwork
+    syntax: az kusto cluster diagnose-virtual-network --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_list
+  name: az kusto cluster list
+  summary: Lists all Kusto clusters within a resource group. And Lists all Kusto clusters within a subscription.
+  description: ''
+  syntax: az kusto cluster list [--resource-group]
+  examples:
+  - summary: KustoClustersListByResourceGroup
+    syntax: az kusto cluster list --resource-group "kustorptest"
+  - summary: KustoClustersList
+    syntax: az kusto cluster list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_list-follower-database
+  name: az kusto cluster list-follower-database
+  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster list-follower-database --cluster-name
+                                            --resource-group
+  examples:
+  - summary: KustoClusterListFollowerDatabases
+    syntax: az kusto cluster list-follower-database --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_list-language-extension
+  name: az kusto cluster list-language-extension
+  summary: Returns a list of language extensions that can run within KQL queries.
+  description: ''
+  syntax: >-
+    az kusto cluster list-language-extension --cluster-name
+                                             --resource-group
+  examples:
+  - summary: KustoClusterListLanguageExtensions
+    syntax: az kusto cluster list-language-extension --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_list-sku
+  name: az kusto cluster list-sku
+  summary: Returns the SKUs available for the provided resource. And Lists eligible SKUs for Kusto resource provider.
+  description: ''
+  syntax: >-
+    az kusto cluster list-sku [--cluster-name]
+                              [--resource-group]
+  examples:
+  - summary: KustoClustersListResourceSkus
+    syntax: az kusto cluster list-sku --name "kustoclusterrptest4" --resource-group "kustorptest"
+  - summary: KustoClustersListSkus
+    syntax: az kusto cluster list-sku
+  optionalParameters:
+  - name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_remove-language-extension
+  name: az kusto cluster remove-language-extension
+  summary: Remove a list of language extensions that can run within KQL queries.
+  description: ''
+  syntax: >-
+    az kusto cluster remove-language-extension --cluster-name
+                                               --resource-group
+                                               [--no-wait]
+                                               [--value]
+  examples:
+  - summary: KustoClusterRemoveLanguageExtensions
+    syntax: az kusto cluster remove-language-extension --name "kustoclusterrptest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --value
+    summary: The list of language extensions.
+    description: >-
+      Usage: --value language-extension-name=XX
+
+
+      language-extension-name: The language extension name.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_cluster_show
+  name: az kusto cluster show
+  summary: Gets a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster show --cluster-name
+                          --resource-group
+  examples:
+  - summary: KustoClustersGet
+    syntax: az kusto cluster show --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_start
+  name: az kusto cluster start
+  summary: Starts a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster start --cluster-name
+                           --resource-group
+                           [--no-wait]
+  examples:
+  - summary: KustoClustersStart
+    syntax: az kusto cluster start --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_stop
+  name: az kusto cluster stop
+  summary: Stops a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster stop --cluster-name
+                          --resource-group
+                          [--no-wait]
+  examples:
+  - summary: KustoClustersStop
+    syntax: az kusto cluster stop --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_update
+  name: az kusto cluster update
+  summary: Update a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster update --cluster-name
+                            --resource-group
+                            [--enable-disk-encryption {false, true}]
+                            [--enable-double-encryption {false, true}]
+                            [--enable-purge {false, true}]
+                            [--enable-streaming-ingest {false, true}]
+                            [--engine-type {V2, V3}]
+                            [--if-match]
+                            [--key-vault-properties]
+                            [--location]
+                            [--no-wait]
+                            [--optimized-autoscale]
+                            [--sku]
+                            [--tags]
+                            [--trusted-external-tenants]
+                            [--type {None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned}]
+                            [--uai]
+                            [--virtual-network-configuration]
+  examples:
+  - summary: KustoClustersUpdate
+    syntax: az kusto cluster update --name "kustoclusterrptest4" --type "SystemAssigned" --location "westus" --enable-purge true --enable-streaming-ingest true --engine-type "V2" --key-vault-properties key-name="keyName" key-vault-uri="https://dummy.keyvault.com" key-version="keyVersion" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-disk-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the cluster's disks are encrypted.
+    description: ''
+  - name: --enable-double-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if double encryption is enabled.
+    description: ''
+  - name: --enable-purge
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the purge operations are enabled.
+    description: ''
+  - name: --enable-streaming-ingest
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the streaming ingest is enabled.
+    description: ''
+  - name: --engine-type
+    parameterValueGroup: V2, V3
+    summary: The engine type.
+    description: ''
+  - name: --if-match
+    summary: The ETag of the cluster. Omit this value to always overwrite the current cluster. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --key-vault-properties
+    summary: KeyVault properties for the cluster encryption.
+    description: >-
+      Usage: --key-vault-properties key-name=XX key-version=XX key-vault-uri=XX user-identity=XX
+
+
+      key-name: Required. The name of the key vault key.
+
+      key-version: The version of the key vault key.
+
+      key-vault-uri: Required. The Uri of the key vault.
+
+      user-identity: The user assigned identity (ARM resource id) that has access to the key.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --optimized-autoscale
+    summary: Optimized auto scale definition.
+    description: >-
+      Usage: --optimized-autoscale version=XX is-enabled=XX minimum=XX maximum=XX
+
+
+      version: Required. The version of the template defined, for instance 1.
+
+      is-enabled: Required. A boolean value that indicate if the optimized autoscale feature is enabled or not.
+
+      minimum: Required. Minimum allowed instances count.
+
+      maximum: Required. Maximum allowed instances count.
+  - name: --sku
+    summary: The SKU of the cluster.
+    description: >-
+      Usage: --sku name=XX capacity=XX tier=XX
+
+
+      name: Required. SKU name.
+
+      capacity: The number of instances of the cluster.
+
+      tier: Required. SKU tier.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --trusted-external-tenants
+    summary: The cluster's external tenants.
+    description: >-
+      Usage: --trusted-external-tenants value=XX
+
+
+      value: GUID representing an external tenant.
+
+
+      Multiple actions can be specified by using more than one --trusted-external-tenants argument.
+  - name: --type
+    parameterValueGroup: None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned
+    summary: The type of managed identity used. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user-assigned identities. The type 'None' will remove all identities.
+    description: ''
+  - name: --uai --user-assigned-identities
+    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
+    description: ''
+  - name: --virtual-network-configuration
+    summary: Virtual network definition.
+    description: >-
+      Usage: --virtual-network-configuration subnet-id=XX engine-public-ip-id=XX data-management-public-ip-id=XX
+
+
+      subnet-id: Required. The subnet resource id.
+
+      engine-public-ip-id: Required. Engine service's public IP address resource id.
+
+      data-management-public-ip-id: Required. Data management's service public IP address resource id.
+- uid: az_kusto_cluster_wait
+  name: az kusto cluster wait
+  summary: Place the CLI in a waiting state until a condition of the kusto cluster is met.
+  description: ''
+  syntax: >-
+    az kusto cluster wait --cluster-name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto cluster is successfully created.
+    syntax: az kusto cluster wait --name "kustoclusterrptest4" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto cluster is successfully updated.
+    syntax: az kusto cluster wait --name "kustoclusterrptest4" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto cluster is successfully deleted.
+    syntax: az kusto cluster wait --name "kustoclusterrptest4" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_cluster_add-language-extension
+- az_kusto_cluster_create
+- az_kusto_cluster_delete
+- az_kusto_cluster_detach-follower-database
+- az_kusto_cluster_diagnose-virtual-network
+- az_kusto_cluster_list
+- az_kusto_cluster_list-follower-database
+- az_kusto_cluster_list-language-extension
+- az_kusto_cluster_list-sku
+- az_kusto_cluster_remove-language-extension
+- az_kusto_cluster_show
+- az_kusto_cluster_start
+- az_kusto_cluster_stop
+- az_kusto_cluster_update
+- az_kusto_cluster_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cluster with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/data-connection.yml b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection.yml
new file mode 100644
index 0000000000..b7ec94af98
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection.yml
@@ -0,0 +1,197 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection
+name: az kusto data-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_delete
+  name: az kusto data-connection delete
+  summary: Deletes the data connection with the given name.
+  description: ''
+  syntax: >-
+    az kusto data-connection delete --cluster-name
+                                    --data-connection-name
+                                    --database-name
+                                    --resource-group
+                                    [--no-wait]
+                                    [--yes]
+  examples:
+  - summary: KustoDataConnectionsDelete
+    syntax: az kusto data-connection delete --cluster-name "kustoclusterrptest4" --name "kustoeventhubconnection1" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_data-connection_list
+  name: az kusto data-connection list
+  summary: Returns the list of data connections of the given Kusto database.
+  description: ''
+  syntax: >-
+    az kusto data-connection list --cluster-name
+                                  --database-name
+                                  --resource-group
+  examples:
+  - summary: KustoDatabasesListByCluster
+    syntax: az kusto data-connection list --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_data-connection_show
+  name: az kusto data-connection show
+  summary: Returns a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection show --cluster-name
+                                  --data-connection-name
+                                  --database-name
+                                  --resource-group
+  examples:
+  - summary: KustoDataConnectionsGet
+    syntax: az kusto data-connection show --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_data-connection_wait
+  name: az kusto data-connection wait
+  summary: Place the CLI in a waiting state until a condition of the kusto data-connection is met.
+  description: ''
+  syntax: >-
+    az kusto data-connection wait --cluster-name
+                                  --data-connection-name
+                                  --database-name
+                                  --resource-group
+                                  [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--interval]
+                                  [--timeout]
+                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto data-connection is successfully created.
+    syntax: az kusto data-connection wait --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto data-connection is successfully deleted.
+    syntax: az kusto data-connection wait --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_data-connection_delete
+- az_kusto_data-connection_event-grid
+- az_kusto_data-connection_event-grid_create
+- az_kusto_data-connection_event-grid_data-connection-validation
+- az_kusto_data-connection_event-grid_update
+- az_kusto_data-connection_event-hub
+- az_kusto_data-connection_event-hub_create
+- az_kusto_data-connection_event-hub_data-connection-validation
+- az_kusto_data-connection_event-hub_update
+- az_kusto_data-connection_iot-hub
+- az_kusto_data-connection_iot-hub_create
+- az_kusto_data-connection_iot-hub_data-connection-validation
+- az_kusto_data-connection_iot-hub_update
+- az_kusto_data-connection_list
+- az_kusto_data-connection_show
+- az_kusto_data-connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/event-grid.yml b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/event-grid.yml
new file mode 100644
index 0000000000..950ecf1374
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/event-grid.yml
@@ -0,0 +1,240 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection_event-grid
+name: az kusto data-connection event-grid
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection event-grid** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto sub group event-grid.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_event-grid_create
+  name: az kusto data-connection event-grid create
+  summary: Create a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-grid create --cluster-name
+                                               --data-connection-name
+                                               --database-name
+                                               --resource-group
+                                               [--blob-storage-event-type {Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed}]
+                                               [--consumer-group]
+                                               [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                               [--event-hub-resource-id]
+                                               [--ignore-first-record {false, true}]
+                                               [--location]
+                                               [--mapping-rule-name]
+                                               [--no-wait]
+                                               [--storage-account-resource-id]
+                                               [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --blob-storage-event-type
+    parameterValueGroup: Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed
+    summary: The name of blob storage event type to process.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID where the event grid is configured to send events.
+    description: ''
+  - name: --ignore-first-record
+    parameterValueGroup: false, true
+    summary: A Boolean value that, if set to true, indicates that ingestion should ignore the first record of every file.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-resource-id
+    summary: The resource ID of the storage account where the data resides.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-grid_data-connection-validation
+  name: az kusto data-connection event-grid data-connection-validation
+  summary: Checks that the data connection parameters are valid.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-grid data-connection-validation --cluster-name
+                                                                   --database-name
+                                                                   --resource-group
+                                                                   [--blob-storage-event-type {Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed}]
+                                                                   [--consumer-group]
+                                                                   [--data-connection-name]
+                                                                   [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                                                   [--event-hub-resource-id]
+                                                                   [--ignore-first-record {false, true}]
+                                                                   [--location]
+                                                                   [--mapping-rule-name]
+                                                                   [--no-wait]
+                                                                   [--storage-account-resource-id]
+                                                                   [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --blob-storage-event-type
+    parameterValueGroup: Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed
+    summary: The name of blob storage event type to process.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID where the event grid is configured to send events.
+    description: ''
+  - name: --ignore-first-record
+    parameterValueGroup: false, true
+    summary: A Boolean value that, if set to true, indicates that ingestion should ignore the first record of every file.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-resource-id
+    summary: The resource ID of the storage account where the data resides.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-grid_update
+  name: az kusto data-connection event-grid update
+  summary: Updates a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-grid update --cluster-name
+                                               --data-connection-name
+                                               --database-name
+                                               --resource-group
+                                               [--blob-storage-event-type {Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed}]
+                                               [--consumer-group]
+                                               [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                               [--event-hub-resource-id]
+                                               [--ignore-first-record {false, true}]
+                                               [--location]
+                                               [--mapping-rule-name]
+                                               [--no-wait]
+                                               [--storage-account-resource-id]
+                                               [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --blob-storage-event-type
+    parameterValueGroup: Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed
+    summary: The name of blob storage event type to process.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID where the event grid is configured to send events.
+    description: ''
+  - name: --ignore-first-record
+    parameterValueGroup: false, true
+    summary: A Boolean value that, if set to true, indicates that ingestion should ignore the first record of every file.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-resource-id
+    summary: The resource ID of the storage account where the data resides.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+commands:
+- az_kusto_data-connection_event-grid_create
+- az_kusto_data-connection_event-grid_data-connection-validation
+- az_kusto_data-connection_event-grid_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto sub group event-grid.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/event-hub.yml b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/event-hub.yml
new file mode 100644
index 0000000000..6d37b40cf0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/event-hub.yml
@@ -0,0 +1,246 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection_event-hub
+name: az kusto data-connection event-hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection event-hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto sub group event-hub.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_event-hub_create
+  name: az kusto data-connection event-hub create
+  summary: Create a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-hub create --cluster-name
+                                              --data-connection-name
+                                              --database-name
+                                              --resource-group
+                                              [--compression {GZip, None}]
+                                              [--consumer-group]
+                                              [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                              [--event-hub-resource-id]
+                                              [--event-system-properties]
+                                              [--location]
+                                              [--managed-identity-resource-id]
+                                              [--mapping-rule-name]
+                                              [--no-wait]
+                                              [--table-name]
+  examples:
+  - summary: KustoDataConnectionsCreateOrUpdate
+    syntax: az kusto data-connection event-hub create --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --managed-identity-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentityTest1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compression
+    parameterValueGroup: GZip, None
+    summary: The event hub messages compression type.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID of the event hub to be used to create a data connection.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the event hub.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-identity-resource-id --mi-rid
+    summary: The resource ID of a managed identity (system or user assigned) to be used to authenticate with event hub.
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-hub_data-connection-validation
+  name: az kusto data-connection event-hub data-connection-validation
+  summary: Checks that the data connection parameters are valid.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-hub data-connection-validation --cluster-name
+                                                                  --database-name
+                                                                  --resource-group
+                                                                  [--compression {GZip, None}]
+                                                                  [--consumer-group]
+                                                                  [--data-connection-name]
+                                                                  [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                                                  [--event-hub-resource-id]
+                                                                  [--event-system-properties]
+                                                                  [--location]
+                                                                  [--managed-identity-resource-id]
+                                                                  [--mapping-rule-name]
+                                                                  [--no-wait]
+                                                                  [--table-name]
+  examples:
+  - summary: KustoDataConnectionValidation
+    syntax: az kusto data-connection event-hub data-connection-validation --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --name "DataConnections8" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --managed-identity-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentityTest1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compression
+    parameterValueGroup: GZip, None
+    summary: The event hub messages compression type.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID of the event hub to be used to create a data connection.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the event hub.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-identity-resource-id --mi-rid
+    summary: The resource ID of a managed identity (system or user assigned) to be used to authenticate with event hub.
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-hub_update
+  name: az kusto data-connection event-hub update
+  summary: Updates a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-hub update --cluster-name
+                                              --data-connection-name
+                                              --database-name
+                                              --resource-group
+                                              [--compression {GZip, None}]
+                                              [--consumer-group]
+                                              [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                              [--event-hub-resource-id]
+                                              [--event-system-properties]
+                                              [--location]
+                                              [--managed-identity-resource-id]
+                                              [--mapping-rule-name]
+                                              [--no-wait]
+                                              [--table-name]
+  examples:
+  - summary: KustoDataConnectionsUpdate
+    syntax: az kusto data-connection event-hub update --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --managed-identity-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentityTest1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compression
+    parameterValueGroup: GZip, None
+    summary: The event hub messages compression type.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID of the event hub to be used to create a data connection.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the event hub.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-identity-resource-id --mi-rid
+    summary: The resource ID of a managed identity (system or user assigned) to be used to authenticate with event hub.
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+commands:
+- az_kusto_data-connection_event-hub_create
+- az_kusto_data-connection_event-hub_data-connection-validation
+- az_kusto_data-connection_event-hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto sub group event-hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/iot-hub.yml b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/iot-hub.yml
new file mode 100644
index 0000000000..8da72b7d4f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/data-connection/iot-hub.yml
@@ -0,0 +1,222 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection_iot-hub
+name: az kusto data-connection iot-hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection iot-hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto sub group iot-hub.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_iot-hub_create
+  name: az kusto data-connection iot-hub create
+  summary: Create a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection iot-hub create --cluster-name
+                                            --data-connection-name
+                                            --database-name
+                                            --resource-group
+                                            [--consumer-group]
+                                            [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                            [--event-system-properties]
+                                            [--iot-hub-resource-id]
+                                            [--location]
+                                            [--mapping-rule-name]
+                                            [--no-wait]
+                                            [--shared-access-policy-name]
+                                            [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consumer-group
+    summary: The iot hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the iot hub.
+    description: ''
+  - name: --iot-hub-resource-id
+    summary: The resource ID of the Iot hub to be used to create a data connection.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --shared-access-policy-name
+    summary: The name of the share access policy.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_iot-hub_data-connection-validation
+  name: az kusto data-connection iot-hub data-connection-validation
+  summary: Checks that the data connection parameters are valid.
+  description: ''
+  syntax: >-
+    az kusto data-connection iot-hub data-connection-validation --cluster-name
+                                                                --database-name
+                                                                --resource-group
+                                                                [--consumer-group]
+                                                                [--data-connection-name]
+                                                                [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                                                [--event-system-properties]
+                                                                [--iot-hub-resource-id]
+                                                                [--location]
+                                                                [--mapping-rule-name]
+                                                                [--no-wait]
+                                                                [--shared-access-policy-name]
+                                                                [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consumer-group
+    summary: The iot hub consumer group.
+    description: ''
+  - name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the iot hub.
+    description: ''
+  - name: --iot-hub-resource-id
+    summary: The resource ID of the Iot hub to be used to create a data connection.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --shared-access-policy-name
+    summary: The name of the share access policy.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_iot-hub_update
+  name: az kusto data-connection iot-hub update
+  summary: Updates a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection iot-hub update --cluster-name
+                                            --data-connection-name
+                                            --database-name
+                                            --resource-group
+                                            [--consumer-group]
+                                            [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                            [--event-system-properties]
+                                            [--iot-hub-resource-id]
+                                            [--location]
+                                            [--mapping-rule-name]
+                                            [--no-wait]
+                                            [--shared-access-policy-name]
+                                            [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consumer-group
+    summary: The iot hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the iot hub.
+    description: ''
+  - name: --iot-hub-resource-id
+    summary: The resource ID of the Iot hub to be used to create a data connection.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --shared-access-policy-name
+    summary: The name of the share access policy.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+commands:
+- az_kusto_data-connection_iot-hub_create
+- az_kusto_data-connection_iot-hub_data-connection-validation
+- az_kusto_data-connection_iot-hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto sub group iot-hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/database-principal-assignment.yml b/2017-03-09-profile/docs-ref-autogen/kusto/database-principal-assignment.yml
new file mode 100644
index 0000000000..036160c5a2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/database-principal-assignment.yml
@@ -0,0 +1,306 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_database-principal-assignment
+name: az kusto database-principal-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto database-principal-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage database principal assignment with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_database-principal-assignment_create
+  name: az kusto database-principal-assignment create
+  summary: Creates a Kusto cluster database principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment create --cluster-name
+                                                  --database-name
+                                                  --principal-assignment-name
+                                                  --resource-group
+                                                  [--no-wait]
+                                                  [--principal-id]
+                                                  [--principal-type {App, Group, User}]
+                                                  [--role {Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer}]
+                                                  [--tenant-id]
+  examples:
+  - summary: KustoDatabasePrincipalAssignmentsCreateOrUpdate
+    syntax: az kusto database-principal-assignment create --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "Admin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --role
+    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer
+    summary: Database principal role.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_database-principal-assignment_delete
+  name: az kusto database-principal-assignment delete
+  summary: Deletes a Kusto principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment delete --cluster-name
+                                                  --database-name
+                                                  --principal-assignment-name
+                                                  --resource-group
+                                                  [--no-wait]
+                                                  [--yes]
+  examples:
+  - summary: KustoDatabasePrincipalAssignmentsDelete
+    syntax: az kusto database-principal-assignment delete --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_database-principal-assignment_list
+  name: az kusto database-principal-assignment list
+  summary: Lists all Kusto cluster database principalAssignments.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment list --cluster-name
+                                                --database-name
+                                                --resource-group
+  examples:
+  - summary: KustoPrincipalAssignmentsList
+    syntax: az kusto database-principal-assignment list --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database-principal-assignment_show
+  name: az kusto database-principal-assignment show
+  summary: Gets a Kusto cluster database principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment show --cluster-name
+                                                --database-name
+                                                --principal-assignment-name
+                                                --resource-group
+  examples:
+  - summary: KustoDatabasePrincipalAssignmentsGet
+    syntax: az kusto database-principal-assignment show --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database-principal-assignment_update
+  name: az kusto database-principal-assignment update
+  summary: Update a Kusto cluster database principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment update --cluster-name
+                                                  --database-name
+                                                  --principal-assignment-name
+                                                  --resource-group
+                                                  [--add]
+                                                  [--force-string]
+                                                  [--no-wait]
+                                                  [--principal-id]
+                                                  [--principal-type {App, Group, User}]
+                                                  [--remove]
+                                                  [--role {Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer}]
+                                                  [--set]
+                                                  [--tenant-id]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --role
+    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer
+    summary: Database principal role.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_database-principal-assignment_wait
+  name: az kusto database-principal-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the kusto database-principal-assignment is met.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment wait --cluster-name
+                                                --database-name
+                                                --principal-assignment-name
+                                                --resource-group
+                                                [--created]
+                                                [--custom]
+                                                [--deleted]
+                                                [--exists]
+                                                [--interval]
+                                                [--timeout]
+                                                [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto database-principal-assignment is successfully created.
+    syntax: az kusto database-principal-assignment wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto database-principal-assignment is successfully updated.
+    syntax: az kusto database-principal-assignment wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto database-principal-assignment is successfully deleted.
+    syntax: az kusto database-principal-assignment wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_database-principal-assignment_create
+- az_kusto_database-principal-assignment_delete
+- az_kusto_database-principal-assignment_list
+- az_kusto_database-principal-assignment_show
+- az_kusto_database-principal-assignment_update
+- az_kusto_database-principal-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage database principal assignment with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/database.yml b/2017-03-09-profile/docs-ref-autogen/kusto/database.yml
new file mode 100644
index 0000000000..529c767b83
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/database.yml
@@ -0,0 +1,398 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_database
+name: az kusto database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage database with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_database_add-principal
+  name: az kusto database add-principal
+  summary: Add Database principals permissions.
+  description: ''
+  syntax: >-
+    az kusto database add-principal --cluster-name
+                                    --database-name
+                                    --resource-group
+                                    [--value]
+  examples:
+  - summary: KustoDatabaseAddPrincipals
+    syntax: az kusto database add-principal --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --value
+    summary: The list of Kusto database principals.
+    description: >-
+      Usage: --value role=XX name=XX type=XX fqn=XX email=XX app-id=XX
+
+
+      role: Required. Database principal role.
+
+      name: Required. Database principal name.
+
+      type: Required. Database principal type.
+
+      fqn: Database principal fully qualified name.
+
+      email: Database principal email if exists.
+
+      app-id: Application id - relevant only for application principal type.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_database_create
+  name: az kusto database create
+  summary: Create a database.
+  description: ''
+  syntax: >-
+    az kusto database create --cluster-name
+                             --database-name
+                             --resource-group
+                             [--no-wait]
+                             [--read-only-following-database]
+                             [--read-write-database]
+  examples:
+  - summary: Kusto ReadWrite database create or update
+    syntax: az kusto database create --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --read-write-database location="westus" soft-delete-period="P1D" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --read-only-following-database
+    summary: Class representing a read only following database.
+    description: >-
+      Usage: --read-only-following-database hot-cache-period=XX location=XX kind=XX
+
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+  - name: --read-write-database
+    summary: Class representing a read write database.
+    description: >-
+      Usage: --read-write-database soft-delete-period=XX hot-cache-period=XX location=XX kind=XX
+
+
+      soft-delete-period: The time the data should be kept before it stops being accessible to queries in TimeSpan.
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+- uid: az_kusto_database_delete
+  name: az kusto database delete
+  summary: Deletes the database with the given name.
+  description: ''
+  syntax: >-
+    az kusto database delete --cluster-name
+                             --database-name
+                             --resource-group
+                             [--no-wait]
+                             [--yes]
+  examples:
+  - summary: KustoDatabasesDelete
+    syntax: az kusto database delete --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_database_list
+  name: az kusto database list
+  summary: Returns the list of databases of the given Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto database list --cluster-name
+                           --resource-group
+  examples:
+  - summary: KustoDatabasesListByCluster
+    syntax: az kusto database list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database_list-principal
+  name: az kusto database list-principal
+  summary: Returns a list of database principals of the given Kusto cluster and database.
+  description: ''
+  syntax: >-
+    az kusto database list-principal --cluster-name
+                                     --database-name
+                                     --resource-group
+  examples:
+  - summary: KustoDatabaseListPrincipals
+    syntax: az kusto database list-principal --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database_remove-principal
+  name: az kusto database remove-principal
+  summary: Remove Database principals permissions.
+  description: ''
+  syntax: >-
+    az kusto database remove-principal --cluster-name
+                                       --database-name
+                                       --resource-group
+                                       [--value]
+  examples:
+  - summary: KustoDatabaseRemovePrincipals
+    syntax: az kusto database remove-principal --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --value
+    summary: The list of Kusto database principals.
+    description: >-
+      Usage: --value role=XX name=XX type=XX fqn=XX email=XX app-id=XX
+
+
+      role: Required. Database principal role.
+
+      name: Required. Database principal name.
+
+      type: Required. Database principal type.
+
+      fqn: Database principal fully qualified name.
+
+      email: Database principal email if exists.
+
+      app-id: Application id - relevant only for application principal type.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_database_show
+  name: az kusto database show
+  summary: Returns a database.
+  description: ''
+  syntax: >-
+    az kusto database show --cluster-name
+                           --database-name
+                           --resource-group
+  examples:
+  - summary: KustoDatabasesGet
+    syntax: az kusto database show --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database_update
+  name: az kusto database update
+  summary: Updates a database.
+  description: ''
+  syntax: >-
+    az kusto database update --cluster-name
+                             --database-name
+                             --resource-group
+                             [--no-wait]
+                             [--read-only-following-database]
+                             [--read-write-database]
+  examples:
+  - summary: Kusto ReadWrite database create or update
+    syntax: az kusto database update --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --read-write-database location="westus" soft-delete-period="P1D" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --read-only-following-database
+    summary: Class representing a read only following database.
+    description: >-
+      Usage: --read-only-following-database hot-cache-period=XX location=XX kind=XX
+
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+  - name: --read-write-database
+    summary: Class representing a read write database.
+    description: >-
+      Usage: --read-write-database soft-delete-period=XX hot-cache-period=XX location=XX kind=XX
+
+
+      soft-delete-period: The time the data should be kept before it stops being accessible to queries in TimeSpan.
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+- uid: az_kusto_database_wait
+  name: az kusto database wait
+  summary: Place the CLI in a waiting state until a condition of the kusto database is met.
+  description: ''
+  syntax: >-
+    az kusto database wait --cluster-name
+                           --database-name
+                           --resource-group
+                           [--created]
+                           [--custom]
+                           [--deleted]
+                           [--exists]
+                           [--interval]
+                           [--timeout]
+                           [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto database is successfully created.
+    syntax: az kusto database wait --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto database is successfully updated.
+    syntax: az kusto database wait --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto database is successfully deleted.
+    syntax: az kusto database wait --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_database_add-principal
+- az_kusto_database_create
+- az_kusto_database_delete
+- az_kusto_database_list
+- az_kusto_database_list-principal
+- az_kusto_database_remove-principal
+- az_kusto_database_show
+- az_kusto_database_update
+- az_kusto_database_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage database with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/operation-result.yml b/2017-03-09-profile/docs-ref-autogen/kusto/operation-result.yml
new file mode 100644
index 0000000000..6bf20d9d14
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/operation-result.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_operation-result
+name: az kusto operation-result
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto operation-result** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage operation result with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_operation-result_show
+  name: az kusto operation-result show
+  summary: Returns operation results.
+  description: ''
+  syntax: >-
+    az kusto operation-result show --location
+                                   --operation-id
+  examples:
+  - summary: KustoOperationResultsGet
+    syntax: az kusto operation-result show --operation-id "30972f1b-b61d-4fd8-bd34-3dcfa24670f3" --location "westus"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The Guid of the operation ID.
+    description: ''
+commands:
+- az_kusto_operation-result_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage operation result with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/kusto/script.yml b/2017-03-09-profile/docs-ref-autogen/kusto/script.yml
new file mode 100644
index 0000000000..e60724c511
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/kusto/script.yml
@@ -0,0 +1,291 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_script
+name: az kusto script
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto script** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage script with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_script_create
+  name: az kusto script create
+  summary: Creates a Kusto database script.
+  description: ''
+  syntax: >-
+    az kusto script create --cluster-name
+                           --database-name
+                           --name
+                           --resource-group
+                           [--continue-on-errors {false, true}]
+                           [--force-update-tag]
+                           [--no-wait]
+                           [--script-url]
+                           [--script-url-sas-token]
+  examples:
+  - summary: KustoScriptsCreateOrUpdate
+    syntax: az kusto script create --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --continue-on-errors true --force-update-tag "2bcf3c21-ffd1-4444-b9dd-e52e00ee53fe" --script-url "https://mysa.blob.core.windows.net/container/script.txt" --script-url-sas-token "?sv=2019-02-02&st=2019-04-29T22%3A18%3A26Z&se=2019-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=********************************" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continue-on-errors
+    parameterValueGroup: false, true
+    summary: Flag that indicates whether to continue if one of the command fails.
+    description: ''
+  - name: --force-update-tag
+    summary: A unique string. If changed the script will be applied again.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --script-url
+    summary: The url to the KQL script blob file.
+    description: ''
+  - name: --script-url-sas-token
+    summary: The SaS token.
+    description: ''
+- uid: az_kusto_script_delete
+  name: az kusto script delete
+  summary: Deletes a Kusto principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto script delete --cluster-name
+                           --database-name
+                           --name
+                           --resource-group
+                           [--no-wait]
+                           [--yes]
+  examples:
+  - summary: KustoScriptsDelete
+    syntax: az kusto script delete --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_script_list
+  name: az kusto script list
+  summary: Returns the list of database scripts for given database.
+  description: ''
+  syntax: >-
+    az kusto script list --cluster-name
+                         --database-name
+                         --resource-group
+  examples:
+  - summary: KustoScriptsList
+    syntax: az kusto script list --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_script_show
+  name: az kusto script show
+  summary: Gets a Kusto cluster database script.
+  description: ''
+  syntax: >-
+    az kusto script show --cluster-name
+                         --database-name
+                         --name
+                         --resource-group
+  examples:
+  - summary: KustoScriptsGet
+    syntax: az kusto script show --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_script_update
+  name: az kusto script update
+  summary: Updates a database script.
+  description: ''
+  syntax: >-
+    az kusto script update --cluster-name
+                           --database-name
+                           --name
+                           --resource-group
+                           [--continue-on-errors {false, true}]
+                           [--force-update-tag]
+                           [--no-wait]
+                           [--script-url]
+                           [--script-url-sas-token]
+  examples:
+  - summary: KustoScriptsUpdate
+    syntax: az kusto script update --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --continue-on-errors true --force-update-tag "2bcf3c21-ffd1-4444-b9dd-e52e00ee53fe" --script-url "https://mysa.blob.core.windows.net/container/script.txt" --script-url-sas-token "?sv=2019-02-02&st=2019-04-29T22%3A18%3A26Z&se=2019-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=********************************" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continue-on-errors
+    parameterValueGroup: false, true
+    summary: Flag that indicates whether to continue if one of the command fails.
+    description: ''
+  - name: --force-update-tag
+    summary: A unique string. If changed the script will be applied again.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --script-url
+    summary: The url to the KQL script blob file.
+    description: ''
+  - name: --script-url-sas-token
+    summary: The SaS token.
+    description: ''
+- uid: az_kusto_script_wait
+  name: az kusto script wait
+  summary: Place the CLI in a waiting state until a condition of the kusto script is met.
+  description: ''
+  syntax: >-
+    az kusto script wait --cluster-name
+                         --database-name
+                         --name
+                         --resource-group
+                         [--created]
+                         [--custom]
+                         [--deleted]
+                         [--exists]
+                         [--interval]
+                         [--timeout]
+                         [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto script is successfully created.
+    syntax: az kusto script wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1" --created
+  - summary: Pause executing next line of CLI script until the kusto script is successfully updated.
+    syntax: az kusto script wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1" --updated
+  - summary: Pause executing next line of CLI script until the kusto script is successfully deleted.
+    syntax: az kusto script wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_script_create
+- az_kusto_script_delete
+- az_kusto_script_list
+- az_kusto_script_show
+- az_kusto_script_update
+- az_kusto_script_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage script with kusto.
diff --git a/2017-03-09-profile/docs-ref-autogen/local-context.yml b/2017-03-09-profile/docs-ref-autogen/local-context.yml
index 4adaa15b9e..5be2c8f0f1 100644
--- a/2017-03-09-profile/docs-ref-autogen/local-context.yml
+++ b/2017-03-09-profile/docs-ref-autogen/local-context.yml
@@ -1,36 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_local_context
-  name: az local-context
-  summary: Manage Local Context.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_local_context_delete
-  - az_local_context_off
-  - az_local_context_on
-  - az_local_context_show
-- uid: az_local_context_delete
+### YamlMime:AzureCLIGroup
+uid: az_local-context
+name: az local-context
+summary: Manage Local Context.
+description: ''
+directCommands:
+- uid: az_local-context_delete
   name: az local-context delete
   summary: Delete local context data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az local-context delete [--all]
+                            [--name]
+                            [--purge]
+                            [--recursive]
+                            [--subscription]
+                            [--yes]
   examples:
   - summary: Delete resource_group_name from local context
-    syntax:
-      content: az local-context delete --name resource_group_name
+    syntax: az local-context delete --name resource_group_name
   - summary: Clear all local context data
-    syntax:
-      content: az local-context delete --all
+    syntax: az local-context delete --all
   - summary: Delete local context persistence file
-    syntax:
-      content: az local-context delete --all --purge
+    syntax: az local-context delete --all --purge
   - summary: Delete local context persistence file recursively
-    syntax:
-      content: az local-context delete --all --purge --recursive
-  parameters:
+    syntax: az local-context delete --all --purge --recursive
+  optionalParameters:
   - name: --all
     summary: Clear all local context data. Either --name or --all can be specified.
     description: ''
@@ -41,67 +35,60 @@ items:
     summary: Delete local context file from working directory. Only available when --all is specified.
     description: ''
   - name: --recursive
-    summary: Indicates this is recursive delete of local context. Only available when --all is specified.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation. Only available when --all is specified.
+    summary: Indicate this is recursive delete of local context. Only available when --all is specified.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_local_context_off
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Only available when --all is specified.
+    description: ''
+- uid: az_local-context_off
   name: az local-context off
   summary: Turn off local context.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az local-context off [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_local_context_on
+- uid: az_local-context_on
   name: az local-context on
   summary: Turn on local context.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az local-context on [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_local_context_show
+- uid: az_local-context_show
   name: az local-context show
   summary: Show local context data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az local-context show [--name]
+                          [--query-examples]
+                          [--subscription]
   examples:
   - summary: Show all local context value
-    syntax:
-      content: az local-context show
+    syntax: az local-context show
   - summary: Show resource_group_name local context value
-    syntax:
-      content: az local-context show --name resource_group_name
-  parameters:
+    syntax: az local-context show --name resource_group_name
+  optionalParameters:
   - name: --name -n
     summary: Space-separated list of local context parameter names.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_local_context_delete
-  name: az local-context delete
-  summary: Delete local context data.
-- uid: az_local_context_off
-  name: az local-context off
-  summary: Turn off local context.
-- uid: az_local_context_on
-  name: az local-context on
-  summary: Turn on local context.
-- uid: az_local_context_show
-  name: az local-context show
-  summary: Show local context data.
+- az_local-context_delete
+- az_local-context_off
+- az_local-context_on
+- az_local-context_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -117,4 +104,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Local Context.
+metadata:
+  description: Manage Local Context.
diff --git a/2017-03-09-profile/docs-ref-autogen/lock.yml b/2017-03-09-profile/docs-ref-autogen/lock.yml
index ed4dd9b438..baa966e5da 100644
--- a/2017-03-09-profile/docs-ref-autogen/lock.yml
+++ b/2017-03-09-profile/docs-ref-autogen/lock.yml
@@ -1,38 +1,35 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_lock
-  name: az lock
-  summary: Manage Azure locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_lock_create
-  - az_lock_delete
-  - az_lock_list
-  - az_lock_show
-  - az_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_lock
+name: az lock
+summary: Manage Azure locks.
+description: ''
+directCommands:
 - uid: az_lock_create
   name: az lock create
   summary: Create a lock.
   description: 'Locks can exist at three different scopes: subscription, resource group and resource.'
-  langs:
-  - azurecli
+  syntax: >-
+    az lock create --lock-type {CanNotDelete, ReadOnly}
+                   --name
+                   [--namespace]
+                   [--notes]
+                   [--parent]
+                   [--resource]
+                   [--resource-group]
+                   [--resource-type]
+                   [--subscription]
   examples:
   - summary: Create a read-only subscription level lock.
-    syntax:
-      content: az lock create --name lockName --resource-group group --lock-type ReadOnly
+    syntax: az lock create --name lockName --resource-group group --lock-type ReadOnly
   - summary: Create a read-only resource level lock on a vnet resource.
-    syntax:
-      content: >-
-        az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
-            Microsoft.Network/virtualNetworks --resource myVnet
+    syntax: >-
+      az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
+          Microsoft.Network/virtualNetworks --resource myVnet
   - summary: Create a read-only resource level lock on a subnet resource with a specific parent.
-    syntax:
-      content: >-
-        az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
-            Microsoft.Network/subnets --parent virtualNetworks/myVnet --resource mySubnet
-  parameters:
+    syntax: >-
+      az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
+          Microsoft.Network/subnets --parent virtualNetworks/myVnet --resource mySubnet
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -42,6 +39,7 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
+  optionalParameters:
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
@@ -55,7 +53,7 @@ items:
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -63,23 +61,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_delete
   name: az lock delete
   summary: Delete a lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock delete [--ids]
+                   [--name]
+                   [--namespace]
+                   [--parent]
+                   [--resource]
+                   [--resource-group]
+                   [--resource-type]
+                   [--subscription]
   examples:
   - summary: Delete a resource group-level lock
-    syntax:
-      content: az lock delete --name lockName --resource-group group
-  parameters:
+    syntax: az lock delete --name lockName --resource-group group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -96,7 +95,7 @@ items:
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -104,26 +103,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_list
   name: az lock list
   summary: List lock information.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock list [--filter-string]
+                 [--namespace]
+                 [--parent]
+                 [--query-examples]
+                 [--resource]
+                 [--resource-group]
+                 [--resource-type]
+                 [--subscription]
   examples:
   - summary: List out the locks on a vnet resource. Includes locks in the associated group and subscription.
-    syntax:
-      content: az lock list --resource myvnet --resource-type Microsoft.Network/virtualNetworks -g group
+    syntax: az lock list --resource myvnet --resource-type Microsoft.Network/virtualNetworks -g group
   - summary: List out all locks on the subscription level
-    syntax:
-      content: az lock list
-  parameters:
+    syntax: az lock list
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
@@ -133,11 +132,14 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -145,26 +147,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_show
   name: az lock show
   summary: Show the properties of a lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock show [--ids]
+                 [--name]
+                 [--namespace]
+                 [--parent]
+                 [--query-examples]
+                 [--resource]
+                 [--resource-group]
+                 [--resource-type]
+                 [--subscription]
   examples:
   - summary: Show a subscription level lock
-    syntax:
-      content: az lock show -n lockname
+    syntax: az lock show -n lockname
   - summary: Show the properties of a lock (autogenerated)
-    syntax:
-      content: az lock show --name lockname --resource-group MyResourceGroup --resource-name MyResource --resource-type Microsoft.Network/virtualNetworks
-  parameters:
+    syntax: az lock show --name lockname --resource-group MyResourceGroup --resource-name MyResource --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -177,11 +180,14 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -189,23 +195,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_update
   name: az lock update
   summary: Update a lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock update [--ids]
+                   [--lock-type {CanNotDelete, ReadOnly}]
+                   [--name]
+                   [--namespace]
+                   [--notes]
+                   [--parent]
+                   [--resource]
+                   [--resource-group]
+                   [--resource-type]
+                   [--subscription]
   examples:
   - summary: Update a resource group level lock with new notes and type
-    syntax:
-      content: az lock update --name lockName --resource-group group --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az lock update --name lockName --resource-group group --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -229,7 +238,7 @@ items:
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -237,28 +246,13 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_lock_create
-  name: az lock create
-  summary: Create a lock.
-- uid: az_lock_delete
-  name: az lock delete
-  summary: Delete a lock.
-- uid: az_lock_list
-  name: az lock list
-  summary: List lock information.
-- uid: az_lock_show
-  name: az lock show
-  summary: Show the properties of a lock.
-- uid: az_lock_update
-  name: az lock update
-  summary: Update a lock.
+- az_lock_create
+- az_lock_delete
+- az_lock_list
+- az_lock_show
+- az_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -274,10 +268,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure locks.
diff --git a/2017-03-09-profile/docs-ref-autogen/logic.yml b/2017-03-09-profile/docs-ref-autogen/logic.yml
new file mode 100644
index 0000000000..d713e0f20f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/logic.yml
@@ -0,0 +1,39 @@
+### YamlMime:AzureCLIGroup
+uid: az_logic
+name: az logic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **logic** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az logic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_logic_integration-account
+- az_logic_integration-account_create
+- az_logic_integration-account_delete
+- az_logic_integration-account_import
+- az_logic_integration-account_list
+- az_logic_integration-account_show
+- az_logic_integration-account_update
+- az_logic_workflow
+- az_logic_workflow_create
+- az_logic_workflow_delete
+- az_logic_workflow_list
+- az_logic_workflow_show
+- az_logic_workflow_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/logic/integration-account.yml b/2017-03-09-profile/docs-ref-autogen/logic/integration-account.yml
new file mode 100644
index 0000000000..10527d10e8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/logic/integration-account.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_logic_integration-account
+name: az logic integration-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **logic** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az logic integration-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Logic integration-account.
+description: ''
+directCommands:
+- uid: az_logic_integration-account_create
+  name: az logic integration-account create
+  summary: Creates or updates an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account create --name
+                                        --resource-group
+                                        [--integration-service-environment]
+                                        [--location]
+                                        [--sku]
+                                        [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                                        [--tags]
+  examples:
+  - summary: Create or update an integration account
+    syntax: az logic integration-account create --location "centralus" --sku name=Standard --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --integration-service-environment
+    summary: The integration service environment. See README.md For more information.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The integration account sku.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The workflow state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+- uid: az_logic_integration-account_delete
+  name: az logic integration-account delete
+  summary: Deletes an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account delete --name
+                                        --resource-group
+                                        [--yes]
+  examples:
+  - summary: Delete an integration account
+    syntax: az logic integration-account delete --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_logic_integration-account_import
+  name: az logic integration-account import
+  summary: Import an integration account from a JSON file.
+  description: ''
+  syntax: >-
+    az logic integration-account import --input-path
+                                        --name
+                                        --resource-group
+                                        [--location]
+                                        [--sku]
+                                        [--tags]
+  examples:
+  - summary: Import an integration account.
+    syntax: az logic integration-account import --name "test_integration_account" --resource-group "test_resource_group" --input-path "integration.json"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: Path to a intergration-account JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The integration account sku.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+- uid: az_logic_integration-account_list
+  name: az logic integration-account list
+  summary: Gets a list of integration accounts by subscription.
+  description: ''
+  syntax: >-
+    az logic integration-account list [--resource-group]
+                                      [--top]
+  examples:
+  - summary: List integration accounts by resource group name
+    syntax: az logic integration-account list --resource-group "test_resource_group"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  - name: --top
+    summary: The number of items to be included in the result.
+    description: ''
+- uid: az_logic_integration-account_show
+  name: az logic integration-account show
+  summary: Gets an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account show --name
+                                      --resource-group
+  examples:
+  - summary: Get integration account by name
+    syntax: az logic integration-account show --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+- uid: az_logic_integration-account_update
+  name: az logic integration-account update
+  summary: Updates an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account update --name
+                                        --resource-group
+                                        [--integration-service-environment]
+                                        [--sku]
+                                        [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                                        [--tags]
+  examples:
+  - summary: Patch an integration account
+    syntax: az logic integration-account update --sku name=Basic --tag atag=123 --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --integration-service-environment
+    summary: The integration service environment. See README.md For more information.
+    description: ''
+  - name: --sku
+    summary: The integration account sku.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The workflow state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+commands:
+- az_logic_integration-account_create
+- az_logic_integration-account_delete
+- az_logic_integration-account_import
+- az_logic_integration-account_list
+- az_logic_integration-account_show
+- az_logic_integration-account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Logic integration-account.
diff --git a/2017-03-09-profile/docs-ref-autogen/logic/workflow.yml b/2017-03-09-profile/docs-ref-autogen/logic/workflow.yml
new file mode 100644
index 0000000000..c777b7d6d5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/logic/workflow.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_logic_workflow
+name: az logic workflow
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **logic** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az logic workflow** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Logic workflow.
+description: ''
+directCommands:
+- uid: az_logic_workflow_create
+  name: az logic workflow create
+  summary: Creates or updates a workflow using a JSON file for the defintion.
+  description: ''
+  syntax: >-
+    az logic workflow create --definition
+                             --location
+                             --name
+                             --resource-group
+                             [--access-control]
+                             [--endpoints-configuration]
+                             [--integration-account]
+                             [--integration-service-environment]
+                             [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                             [--tags]
+  examples:
+  - summary: Create or update a workflow
+    syntax: az logic workflow create --resource-group "test_resource_group" --location "centralus" --name "test_workflow" --definition "workflow.json"
+  requiredParameters:
+  - isRequired: true
+    name: --definition
+    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --access-control
+    summary: The access control configuration controls access to this workflow. See README.md for more information.
+    description: ''
+  - name: --endpoints-configuration
+    summary: The endpoints configuration.
+    description: ''
+  - name: --integration-account
+    summary: The integration account.
+    description: ''
+  - name: --integration-service-environment
+    summary: The integration service environment.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+- uid: az_logic_workflow_delete
+  name: az logic workflow delete
+  summary: Deletes a workflow.
+  description: ''
+  syntax: >-
+    az logic workflow delete --name
+                             --resource-group
+                             [--yes]
+  examples:
+  - summary: Delete a workflow
+    syntax: az logic workflow delete --resource-group "test_resource_group" --name "test_workflow"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_logic_workflow_list
+  name: az logic workflow list
+  summary: Gets a list of workflows by subscription.
+  description: ''
+  syntax: >-
+    az logic workflow list [--filter]
+                           [--resource-group]
+                           [--top]
+  examples:
+  - summary: List all workflows in a resource group
+    syntax: az logic workflow list --resource-group "test_resource_group"
+  - summary: List all workflows in a subscription
+    syntax: az logic workflow list
+  optionalParameters:
+  - name: --filter
+    summary: 'The filter to apply on the operation. Options for filters include: State, Trigger, and ReferencedResourceId.'
+    description: ''
+  - name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  - name: --top
+    summary: The number of items to be included in the result.
+    description: ''
+- uid: az_logic_workflow_show
+  name: az logic workflow show
+  summary: Gets a workflow.
+  description: ''
+  syntax: >-
+    az logic workflow show --name
+                           --resource-group
+  examples:
+  - summary: Get a workflow
+    syntax: az logic workflow show --resource-group "test_resource_group" --name "test_workflow"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+- uid: az_logic_workflow_update
+  name: az logic workflow update
+  summary: Updates a workflow.
+  description: ''
+  syntax: >-
+    az logic workflow update --name
+                             --resource-group
+                             [--definition]
+                             [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                             [--tags]
+  examples:
+  - summary: Patch a workflow
+    syntax: az logic workflow update --resource-group "test_resource_group" --definition workflow.json --name "test_workflow"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --definition
+    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+commands:
+- az_logic_workflow_create
+- az_logic_workflow_delete
+- az_logic_workflow_list
+- az_logic_workflow_show
+- az_logic_workflow_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Logic workflow.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance.yml b/2017-03-09-profile/docs-ref-autogen/maintenance.yml
new file mode 100644
index 0000000000..a94b64c35f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance
+name: az maintenance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_maintenance_applyupdate
+- az_maintenance_applyupdate_create
+- az_maintenance_applyupdate_get-parent
+- az_maintenance_applyupdate_list
+- az_maintenance_applyupdate_show
+- az_maintenance_applyupdate_show-parent
+- az_maintenance_applyupdate_update
+- az_maintenance_applyupdate-for-resource-group
+- az_maintenance_applyupdate-for-resource-group_list
+- az_maintenance_assignment
+- az_maintenance_assignment_create
+- az_maintenance_assignment_delete
+- az_maintenance_assignment_list
+- az_maintenance_assignment_list-parent
+- az_maintenance_assignment_update
+- az_maintenance_configuration
+- az_maintenance_configuration_create
+- az_maintenance_configuration_delete
+- az_maintenance_configuration_list
+- az_maintenance_configuration_show
+- az_maintenance_configuration_update
+- az_maintenance_configuration-for-resource-group
+- az_maintenance_configuration-for-resource-group_list
+- az_maintenance_public-configuration
+- az_maintenance_public-configuration_list
+- az_maintenance_public-configuration_show
+- az_maintenance_update
+- az_maintenance_update_list
+- az_maintenance_update_list-parent
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/applyupdate-for-resource-group.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/applyupdate-for-resource-group.yml
new file mode 100644
index 0000000000..0052f19a27
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/applyupdate-for-resource-group.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_applyupdate-for-resource-group
+name: az maintenance applyupdate-for-resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance applyupdate-for-resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage apply update for resource group with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_applyupdate-for-resource-group_list
+  name: az maintenance applyupdate-for-resource-group list
+  summary: Get Configuration records within a subscription and resource group.
+  description: ''
+  syntax: az maintenance applyupdate-for-resource-group list --resource-group
+  examples:
+  - summary: ApplyUpdatesResourceGroup_List
+    syntax: az maintenance applyupdate-for-resource-group list --resource-group "examplerg"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_maintenance_applyupdate-for-resource-group_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage apply update for resource group with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/applyupdate.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/applyupdate.yml
new file mode 100644
index 0000000000..f212e7e747
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/applyupdate.yml
@@ -0,0 +1,230 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_applyupdate
+name: az maintenance applyupdate
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance applyupdate** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage apply update with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_applyupdate_create
+  name: az maintenance applyupdate create
+  summary: Apply maintenance updates to resource with parent And Apply maintenance updates to resource.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate create --provider-name
+                                      --resource-group
+                                      --resource-name
+                                      --resource-type
+                                      [--resource-parent-name]
+                                      [--resource-parent-type]
+  examples:
+  - summary: ApplyUpdates_CreateOrUpdateParent
+    syntax: az maintenance applyupdate create --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  - summary: ApplyUpdates_CreateOrUpdate
+    syntax: az maintenance applyupdate create --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+- uid: az_maintenance_applyupdate_get-parent
+  name: az maintenance applyupdate get-parent
+  summary: Track maintenance updates to resource with parent.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate get-parent --apply-update-name
+                                          --provider-name
+                                          --resource-group
+                                          --resource-name
+                                          --resource-parent-name
+                                          --resource-parent-type
+                                          --resource-type
+  examples:
+  - summary: ApplyUpdates_GetParent
+    syntax: az maintenance applyupdate get-parent --name "e9b9685d-78e4-44c4-a81c-64a14f9b87b6" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --apply-update-name --name -n
+    summary: ApplyUpdate Id.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_applyupdate_list
+  name: az maintenance applyupdate list
+  summary: Get Configuration records within a subscription.
+  description: ''
+  syntax: az maintenance applyupdate list
+  examples:
+  - summary: ApplyUpdates_List
+    syntax: az maintenance applyupdate list
+- uid: az_maintenance_applyupdate_show
+  name: az maintenance applyupdate show
+  summary: Track maintenance updates to resource.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate show --apply-update-name
+                                    --provider-name
+                                    --resource-group
+                                    --resource-name
+                                    --resource-type
+  examples:
+  - summary: ApplyUpdates_Get
+    syntax: az maintenance applyupdate show --name "e9b9685d-78e4-44c4-a81c-64a14f9b87b6" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --apply-update-name --name -n
+    summary: ApplyUpdate Id.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_applyupdate_show-parent
+  name: az maintenance applyupdate show-parent
+  summary: Track maintenance updates to resource with parent.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate show-parent --apply-update-name
+                                           --provider-name
+                                           --resource-group
+                                           --resource-name
+                                           --resource-parent-name
+                                           --resource-parent-type
+                                           --resource-type
+  examples:
+  - summary: ApplyUpdates_GetParent
+    syntax: az maintenance applyupdate show-parent --name "e9b9685d-78e4-44c4-a81c-64a14f9b87b6" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --apply-update-name --name -n
+    summary: ApplyUpdate Id.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_applyupdate_update
+  name: az maintenance applyupdate update
+  summary: Apply maintenance updates to resource.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate update --provider-name
+                                      --resource-group
+                                      --resource-name
+                                      --resource-type
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+commands:
+- az_maintenance_applyupdate_create
+- az_maintenance_applyupdate_get-parent
+- az_maintenance_applyupdate_list
+- az_maintenance_applyupdate_show
+- az_maintenance_applyupdate_show-parent
+- az_maintenance_applyupdate_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage apply update with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/assignment.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/assignment.yml
new file mode 100644
index 0000000000..50e8204bc3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/assignment.yml
@@ -0,0 +1,251 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_assignment
+name: az maintenance assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage configuration assignment with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_assignment_create
+  name: az maintenance assignment create
+  summary: Register configuration for resource. And Register configuration for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment create --configuration-assignment-name
+                                     --provider-name
+                                     --resource-group
+                                     --resource-name
+                                     --resource-type
+                                     [--config-id]
+                                     [--location]
+                                     [--resource-id]
+                                     [--resource-parent-name]
+                                     [--resource-parent-type]
+  examples:
+  - summary: ConfigurationAssignments_CreateOrUpdateParent
+    syntax: az maintenance assignment create --maintenance-configuration-id "/subscriptions/5b4b650e-28b9-4790-b3ab-ddbd88d727c4/resourcegroups/examplerg/providers/Microsoft.Maintenance/maintenanceConfigurations/policy1" --name "workervmPolicy" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  - summary: ConfigurationAssignments_CreateOrUpdate
+    syntax: az maintenance assignment create --maintenance-configuration-id "/subscriptions/5b4b650e-28b9-4790-b3ab-ddbd88d727c4/resourcegroups/examplerg/providers/Microsoft.Maintenance/maintenanceConfigurations/configuration1" --name "workervmConfiguration" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-assignment-name --name -n
+    summary: Configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --config-id --maintenance-configuration-id
+    summary: The maintenance configuration Id.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-id
+    summary: The unique resourceId.
+    description: ''
+  - name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+- uid: az_maintenance_assignment_delete
+  name: az maintenance assignment delete
+  summary: Unregister configuration for resource. And Unregister configuration for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment delete --configuration-assignment-name
+                                     --provider-name
+                                     --resource-group
+                                     --resource-name
+                                     --resource-type
+                                     [--resource-parent-name]
+                                     [--resource-parent-type]
+                                     [--yes]
+  examples:
+  - summary: ConfigurationAssignments_DeleteParent
+    syntax: az maintenance assignment delete --name "workervmConfiguration" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  - summary: ConfigurationAssignments_Delete
+    syntax: az maintenance assignment delete --name "workervmConfiguration" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-assignment-name --name -n
+    summary: Unique configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_maintenance_assignment_list
+  name: az maintenance assignment list
+  summary: List configurationAssignments for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment list --provider-name
+                                   --resource-group
+                                   --resource-name
+                                   --resource-type
+  examples:
+  - summary: ConfigurationAssignments_List
+    syntax: az maintenance assignment list --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_assignment_list-parent
+  name: az maintenance assignment list-parent
+  summary: List configurationAssignments for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment list-parent --provider-name
+                                          --resource-group
+                                          --resource-name
+                                          --resource-parent-name
+                                          --resource-parent-type
+                                          --resource-type
+  examples:
+  - summary: ConfigurationAssignments_ListParent
+    syntax: az maintenance assignment list-parent --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtestvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_assignment_update
+  name: az maintenance assignment update
+  summary: Register configuration for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment update --configuration-assignment-name
+                                     --provider-name
+                                     --resource-group
+                                     --resource-name
+                                     --resource-type
+                                     [--config-id]
+                                     [--location]
+                                     [--resource-id]
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-assignment-name --name -n
+    summary: Configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --config-id --maintenance-configuration-id
+    summary: The maintenance configuration Id.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-id
+    summary: The unique resourceId.
+    description: ''
+commands:
+- az_maintenance_assignment_create
+- az_maintenance_assignment_delete
+- az_maintenance_assignment_list
+- az_maintenance_assignment_list-parent
+- az_maintenance_assignment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage configuration assignment with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/configuration-for-resource-group.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/configuration-for-resource-group.yml
new file mode 100644
index 0000000000..3d647a8e25
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/configuration-for-resource-group.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_configuration-for-resource-group
+name: az maintenance configuration-for-resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance configuration-for-resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage maintenance configuration for resource group with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_configuration-for-resource-group_list
+  name: az maintenance configuration-for-resource-group list
+  summary: Get Configuration records within a subscription and resource group.
+  description: ''
+  syntax: az maintenance configuration-for-resource-group list --resource-group
+  examples:
+  - summary: MaintenanceConfigurationsResourceGroup_List
+    syntax: az maintenance configuration-for-resource-group list --resource-group "examplerg"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_maintenance_configuration-for-resource-group_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage maintenance configuration for resource group with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/configuration.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/configuration.yml
new file mode 100644
index 0000000000..98d64f8ada
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/configuration.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_configuration
+name: az maintenance configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage maintenance configuration with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_configuration_create
+  name: az maintenance configuration create
+  summary: Create configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration create --resource-group
+                                        --resource-name
+                                        [--duration]
+                                        [--expiration-date-time]
+                                        [--extension-properties]
+                                        [--location]
+                                        [--maintenance-scope {All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance}]
+                                        [--maintenance-window-recur-every]
+                                        [--maintenance-window-start-date-time]
+                                        [--maintenance-window-time-zone]
+                                        [--namespace]
+                                        [--tags]
+                                        [--visibility {Custom, Public}]
+  examples:
+  - summary: MaintenanceConfigurations_CreateOrUpdateForResource
+    syntax: az maintenance configuration create --location "westus2" --maintenance-scope "Host" --maintenance-window-duration "05:00" --maintenance-window-expiration-date-time "9999-12-31 00:00" --maintenance-window-recur-every "Day" --maintenance-window-start-date-time "2025-04-30 08:00" --maintenance-window-time-zone "Pacific Standard Time" --namespace "Microsoft.Maintenance" --visibility "Custom" --resource-group "examplerg" --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+  optionalParameters:
+  - name: --duration --maintenance-window-duration
+    summary: 'Duration of the maintenance window in HH:mm format. If not provided, default value will be used based on maintenance scope provided. Example: 05:00.'
+    description: ''
+  - name: --expiration-date-time --maintenance-window-expiration-date-time
+    summary: Effective expiration date of the maintenance window in YYYY-MM-DD hh:mm format. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone. Expiration date must be set to a future date. If not provided, it will be set to the maximum datetime 9999-12-31 23:59:59.
+    description: ''
+  - name: --extension-properties
+    summary: 'Gets or sets extensionProperties of the maintenanceConfiguration Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --maintenance-scope
+    parameterValueGroup: All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance
+    summary: Gets or sets maintenanceScope of the configuration.
+    description: ''
+  - name: --maintenance-window-recur-every --recur-every
+    summary: "Rate at which a Maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules. Daily schedule are formatted as recurEvery: [Frequency as integer]['Day(s)']. If no frequency is provided, the default frequency is 1. Daily schedule examples are recurEvery: Day, recurEvery: 3Days.  Weekly schedule are formatted as recurEvery: [Frequency as integer]['Week(s)'] [Optional comma separated list of weekdays Monday-Sunday]. Weekly schedule examples are recurEvery: 3Weeks, recurEvery: Week Saturday,Sunday. Monthly schedules are formatted as [Frequency as integer]['Month(s)'] [Comma separated list of month days] or [Frequency as integer]['Month(s)'] [Week of Month (First, Second, Third, Fourth, Last)] [Weekday Monday-Sunday]. Monthly schedule examples are recurEvery: Month, recurEvery: 2Months, recurEvery: Month day23,day24, recurEvery: Month Last Sunday, recurEvery: Month Fourth Monday."
+    description: ''
+  - name: --maintenance-window-start-date-time --start-date-time
+    summary: Effective start date of the maintenance window in YYYY-MM-DD hh:mm format. The start date can be set to either the current date or future date. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone.
+    description: ''
+  - name: --maintenance-window-time-zone --time-zone
+    summary: 'Name of the timezone. List of timezones can be obtained by executing [System.TimeZoneInfo]::GetSystemTimeZones() in PowerShell. Example: Pacific Standard Time, UTC, W. Europe Standard Time, Korea Standard Time, Cen. Australia Standard Time.'
+    description: ''
+  - name: --namespace
+    summary: Gets or sets namespace of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --visibility
+    parameterValueGroup: Custom, Public
+    summary: Gets or sets the visibility of the configuration.
+    description: ''
+- uid: az_maintenance_configuration_delete
+  name: az maintenance configuration delete
+  summary: Delete Configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration delete --resource-group
+                                        --resource-name
+                                        [--yes]
+  examples:
+  - summary: MaintenanceConfigurations_DeleteForResource
+    syntax: az maintenance configuration delete --resource-group "examplerg" --resource-name "example1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_maintenance_configuration_list
+  name: az maintenance configuration list
+  summary: Get Configuration records within a subscription.
+  description: ''
+  syntax: az maintenance configuration list
+  examples:
+  - summary: MaintenanceConfigurations_List
+    syntax: az maintenance configuration list
+- uid: az_maintenance_configuration_show
+  name: az maintenance configuration show
+  summary: Get Configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration show --resource-group
+                                      --resource-name
+  examples:
+  - summary: MaintenanceConfigurations_GetForResource
+    syntax: az maintenance configuration show --resource-group "examplerg" --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+- uid: az_maintenance_configuration_update
+  name: az maintenance configuration update
+  summary: Patch configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration update --resource-group
+                                        --resource-name
+                                        [--duration]
+                                        [--expiration-date-time]
+                                        [--extension-properties]
+                                        [--location]
+                                        [--maintenance-scope {All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance}]
+                                        [--maintenance-window-recur-every]
+                                        [--maintenance-window-start-date-time]
+                                        [--maintenance-window-time-zone]
+                                        [--namespace]
+                                        [--tags]
+                                        [--visibility {Custom, Public}]
+  examples:
+  - summary: MaintenanceConfigurations_UpdateForResource
+    syntax: az maintenance configuration update --location "westus2" --maintenance-scope "Host" --maintenance-window-duration "05:00" --maintenance-window-expiration-date-time "9999-12-31 00:00" --maintenance-window-recur-every "Month Third Sunday" --maintenance-window-start-date-time "2025-04-30 08:00" --maintenance-window-time-zone "Pacific Standard Time" --namespace "Microsoft.Maintenance" --visibility "Custom" --resource-group "examplerg" --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+  optionalParameters:
+  - name: --duration --maintenance-window-duration
+    summary: 'Duration of the maintenance window in HH:mm format. If not provided, default value will be used based on maintenance scope provided. Example: 05:00.'
+    description: ''
+  - name: --expiration-date-time --maintenance-window-expiration-date-time
+    summary: Effective expiration date of the maintenance window in YYYY-MM-DD hh:mm format. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone. Expiration date must be set to a future date. If not provided, it will be set to the maximum datetime 9999-12-31 23:59:59.
+    description: ''
+  - name: --extension-properties
+    summary: 'Gets or sets extensionProperties of the maintenanceConfiguration Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --maintenance-scope
+    parameterValueGroup: All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance
+    summary: Gets or sets maintenanceScope of the configuration.
+    description: ''
+  - name: --maintenance-window-recur-every --recur-every
+    summary: "Rate at which a Maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules. Daily schedule are formatted as recurEvery: [Frequency as integer]['Day(s)']. If no frequency is provided, the default frequency is 1. Daily schedule examples are recurEvery: Day, recurEvery: 3Days.  Weekly schedule are formatted as recurEvery: [Frequency as integer]['Week(s)'] [Optional comma separated list of weekdays Monday-Sunday]. Weekly schedule examples are recurEvery: 3Weeks, recurEvery: Week Saturday,Sunday. Monthly schedules are formatted as [Frequency as integer]['Month(s)'] [Comma separated list of month days] or [Frequency as integer]['Month(s)'] [Week of Month (First, Second, Third, Fourth, Last)] [Weekday Monday-Sunday]. Monthly schedule examples are recurEvery: Month, recurEvery: 2Months, recurEvery: Month day23,day24, recurEvery: Month Last Sunday, recurEvery: Month Fourth Monday."
+    description: ''
+  - name: --maintenance-window-start-date-time --start-date-time
+    summary: Effective start date of the maintenance window in YYYY-MM-DD hh:mm format. The start date can be set to either the current date or future date. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone.
+    description: ''
+  - name: --maintenance-window-time-zone --time-zone
+    summary: 'Name of the timezone. List of timezones can be obtained by executing [System.TimeZoneInfo]::GetSystemTimeZones() in PowerShell. Example: Pacific Standard Time, UTC, W. Europe Standard Time, Korea Standard Time, Cen. Australia Standard Time.'
+    description: ''
+  - name: --namespace
+    summary: Gets or sets namespace of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --visibility
+    parameterValueGroup: Custom, Public
+    summary: Gets or sets the visibility of the configuration.
+    description: ''
+commands:
+- az_maintenance_configuration_create
+- az_maintenance_configuration_delete
+- az_maintenance_configuration_list
+- az_maintenance_configuration_show
+- az_maintenance_configuration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage maintenance configuration with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/public-configuration.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/public-configuration.yml
new file mode 100644
index 0000000000..83128fb541
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/public-configuration.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_public-configuration
+name: az maintenance public-configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance public-configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage public maintenance configuration with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_public-configuration_list
+  name: az maintenance public-configuration list
+  summary: Get Public Maintenance Configuration records.
+  description: ''
+  syntax: az maintenance public-configuration list
+  examples:
+  - summary: PublicMaintenanceConfigurations_List
+    syntax: az maintenance public-configuration list
+- uid: az_maintenance_public-configuration_show
+  name: az maintenance public-configuration show
+  summary: Get Public Maintenance Configuration record.
+  description: ''
+  syntax: az maintenance public-configuration show --resource-name
+  examples:
+  - summary: PublicMaintenanceConfigurations_GetForResource
+    syntax: az maintenance public-configuration show --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+commands:
+- az_maintenance_public-configuration_list
+- az_maintenance_public-configuration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage public maintenance configuration with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/maintenance/update.yml b/2017-03-09-profile/docs-ref-autogen/maintenance/update.yml
new file mode 100644
index 0000000000..0e4aec021a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/maintenance/update.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_update
+name: az maintenance update
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance update** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage update with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_update_list
+  name: az maintenance update list
+  summary: Get updates to resources.
+  description: ''
+  syntax: >-
+    az maintenance update list --provider-name
+                               --resource-group
+                               --resource-name
+                               --resource-type
+  examples:
+  - summary: Updates_List
+    syntax: az maintenance update list --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_update_list-parent
+  name: az maintenance update list-parent
+  summary: Get updates to resources.
+  description: ''
+  syntax: >-
+    az maintenance update list-parent --provider-name
+                                      --resource-group
+                                      --resource-name
+                                      --resource-parent-name
+                                      --resource-parent-type
+                                      --resource-type
+  examples:
+  - summary: Updates_ListParent
+    syntax: az maintenance update list-parent --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+commands:
+- az_maintenance_update_list
+- az_maintenance_update_list-parent
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage update with maintenance.
diff --git a/2017-03-09-profile/docs-ref-autogen/managed-cassandra.yml b/2017-03-09-profile/docs-ref-autogen/managed-cassandra.yml
new file mode 100644
index 0000000000..da5eca0188
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/managed-cassandra.yml
@@ -0,0 +1,39 @@
+### YamlMime:AzureCLIGroup
+uid: az_managed-cassandra
+name: az managed-cassandra
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az managed-cassandra** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_managed-cassandra_cluster
+- az_managed-cassandra_cluster_create
+- az_managed-cassandra_cluster_delete
+- az_managed-cassandra_cluster_list
+- az_managed-cassandra_cluster_node-status
+- az_managed-cassandra_cluster_show
+- az_managed-cassandra_cluster_update
+- az_managed-cassandra_datacenter
+- az_managed-cassandra_datacenter_create
+- az_managed-cassandra_datacenter_delete
+- az_managed-cassandra_datacenter_list
+- az_managed-cassandra_datacenter_show
+- az_managed-cassandra_datacenter_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/managed-cassandra/cluster.yml b/2017-03-09-profile/docs-ref-autogen/managed-cassandra/cluster.yml
new file mode 100644
index 0000000000..5e032d69aa
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/managed-cassandra/cluster.yml
@@ -0,0 +1,276 @@
+### YamlMime:AzureCLIGroup
+uid: az_managed-cassandra_cluster
+name: az managed-cassandra cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az managed-cassandra cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Azure Managed Cassandra Cluster.
+description: ''
+directCommands:
+- uid: az_managed-cassandra_cluster_create
+  name: az managed-cassandra cluster create
+  summary: Create a Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster create --cluster-name
+                                        --delegated-management-subnet-id
+                                        --location
+                                        --resource-group
+                                        [--authentication-method]
+                                        [--cassandra-version]
+                                        [--client-certificates]
+                                        [--cluster-name-override]
+                                        [--external-gossip-certificates]
+                                        [--external-seed-nodes]
+                                        [--hours-between-backups]
+                                        [--identity]
+                                        [--initial-cassandra-admin-password]
+                                        [--no-wait]
+                                        [--repair-enabled]
+                                        [--restore-from-backup-id]
+                                        [--tags]
+  examples:
+  - summary: Create a Managed Cassandra Cluster in a given Subscription and ResourceGroup. Either a cassandra admin password or external seed needs are required.
+    syntax: >-
+      az managed-cassandra cluster create \
+
+      --resource-group MyResourceGroup \
+
+      --cluster-name MyCluster \
+
+      --location MyLocation \
+
+      --initial-cassandra-admin-password password \
+
+      --delegated-management-subnet-id /subscriptions/94d9b402-77b4-4049-b4c1-947bc6b7729b/resourceGroups/My-vnet/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-subnet
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --delegated-management-subnet-id -s
+    summary: The resource id of a subnet where the ip address of the cassandra management server will be allocated. This subnet must have connectivity to the delegated_subnet_id subnet of each data center.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the Cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --authentication-method
+    summary: Authentication mode can be None or Cassandra. If None, no authentication will be required to connect to the Cassandra API. If Cassandra, then passwords will be used.
+    description: ''
+  - name: --cassandra-version
+    summary: The version of Cassandra chosen.
+    description: ''
+  - name: --client-certificates
+    summary: If specified, enables client certificate authentication to the Cassandra API.
+    description: ''
+  - name: --cluster-name-override
+    summary: If a cluster must have a name that is not a valid azure resource name, this field can be specified to choose the Cassandra cluster name. Otherwise, the resource name will be used as the cluster name.
+    description: ''
+  - name: --external-gossip-certificates -e
+    summary: A list of certificates that the managed cassandra data center's should accept.
+    description: ''
+  - name: --external-seed-nodes
+    summary: A list of ip addresses of the seed nodes of on-premise data centers.
+    description: ''
+  - name: --hours-between-backups
+    summary: The number of hours between backup attempts.
+    description: ''
+  - name: --identity
+    summary: Identity used to authenticate.
+    description: ''
+  - name: --initial-cassandra-admin-password -i
+    summary: The intial password to be configured when a cluster is created for authentication_method Cassandra.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --repair-enabled
+    summary: Enables automatic repair.
+    description: ''
+  - name: --restore-from-backup-id
+    summary: The resource id of a backup. If provided on create, the backup will be used to prepopulate the cluster. The cluster data center count and node counts must match the backup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_managed-cassandra_cluster_delete
+  name: az managed-cassandra cluster delete
+  summary: Deletes a Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster delete --cluster-name
+                                        --resource-group
+                                        [--no-wait]
+                                        [--yes]
+  examples:
+  - summary: Deletes a Managed Cassandra Cluster in the given Subscription and ResourceGroup.
+    syntax: az managed-cassandra cluster delete --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_managed-cassandra_cluster_list
+  name: az managed-cassandra cluster list
+  summary: List the Managed Cassandra Clusters in a ResourceGroup and Subscription. If the ResourceGroup is not specified all the clusters in this Subscription are returned.
+  description: ''
+  syntax: az managed-cassandra cluster list [--resource-group]
+  examples:
+  - summary: List all Managed Cassandra Clusters in a given Subscription and ResourceGroup.
+    syntax: az managed-cassandra cluster list --resource-group MyResourceGroup
+  - summary: List all Managed Cassandra Clusters in a given Subscription.
+    syntax: az managed-cassandra cluster list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_cluster_node-status
+  name: az managed-cassandra cluster node-status
+  summary: Gets Status of all the nodes in all the datacenters in a given Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster node-status --cluster-name
+                                             --resource-group
+                                             [--no-wait]
+  examples:
+  - summary: This command gets the status of all the nodes in this cluster. By default a json is returned.
+    syntax: az managed-cassandra cluster node-status --resource-group MyResourceGroup --cluster-name MyCluster
+  - summary: This command gets the status of all the nodes in this cluster. When a table output is specified only one token is displayed. Use json output to get all the tokens.
+    syntax: az managed-cassandra cluster node-status --resource-group MyResourceGroup --cluster-name MyCluster --output table
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_managed-cassandra_cluster_show
+  name: az managed-cassandra cluster show
+  summary: Get a Managed Cassandra Cluster Resource.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster show --cluster-name
+                                      --resource-group
+  examples:
+  - summary: Gets a Managed Cassandra Cluster Resource. ProvisioningState tells the state of this cluster. If the cluster doesnot exist a NotFound response is returned.
+    syntax: az managed-cassandra cluster show --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_cluster_update
+  name: az managed-cassandra cluster update
+  summary: Update a Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster update --cluster-name
+                                        --resource-group
+                                        [--authentication-method]
+                                        [--cassandra-version]
+                                        [--client-certificates]
+                                        [--external-gossip-certificates]
+                                        [--external-seed-nodes]
+                                        [--hours-between-backups]
+                                        [--identity]
+                                        [--no-wait]
+                                        [--repair-enabled]
+                                        [--tags]
+  examples:
+  - summary: Update External Seed Nodes of a given cluster.
+    syntax: az managed-cassandra cluster update --resource-group MyResourceGroup --cluster-name MyCluster --external-seed-nodes 127.0.0.1 127.0.0.2
+  - summary: Update External Gossip Certificates of a given cluster. Certs can be passed in as strings or the file locations.
+    syntax: az managed-cassandra cluster update --resource-group MyResourceGroup --cluster-name MyCluster --external-gossip-certificates C:/MyFolder/test.pem BeginCert-MLXCF-EndCert
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --authentication-method
+    summary: Authentication mode can be None or Cassandra. If None, no authentication will be required to connect to the Cassandra API. If Cassandra, then passwords will be used.
+    description: ''
+  - name: --cassandra-version
+    summary: The version of Cassandra chosen.
+    description: ''
+  - name: --client-certificates
+    summary: If specified, enables client certificate authentication to the Cassandra API.
+    description: ''
+  - name: --external-gossip-certificates -e
+    summary: A list of certificates that the managed cassandra data center's should accept.
+    description: ''
+  - name: --external-seed-nodes
+    summary: A list of ip addresses of the seed nodes of on-premise data centers.
+    description: ''
+  - name: --hours-between-backups
+    summary: The number of hours between backup attempts.
+    description: ''
+  - name: --identity
+    summary: Identity used to authenticate.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --repair-enabled
+    summary: Enables automatic repair.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_managed-cassandra_cluster_create
+- az_managed-cassandra_cluster_delete
+- az_managed-cassandra_cluster_list
+- az_managed-cassandra_cluster_node-status
+- az_managed-cassandra_cluster_show
+- az_managed-cassandra_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure Managed Cassandra Cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/managed-cassandra/datacenter.yml b/2017-03-09-profile/docs-ref-autogen/managed-cassandra/datacenter.yml
new file mode 100644
index 0000000000..235e4476dc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/managed-cassandra/datacenter.yml
@@ -0,0 +1,211 @@
+### YamlMime:AzureCLIGroup
+uid: az_managed-cassandra_datacenter
+name: az managed-cassandra datacenter
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az managed-cassandra datacenter** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Azure Managed Cassandra DataCenter.
+description: ''
+directCommands:
+- uid: az_managed-cassandra_datacenter_create
+  name: az managed-cassandra datacenter create
+  summary: Create a Datacenter in an Azure Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter create --cluster-name
+                                           --data-center-location
+                                           --data-center-name
+                                           --delegated-subnet-id
+                                           --node-count
+                                           --resource-group
+                                           [--base64-encoded-cassandra-yaml-fragment]
+                                           [--no-wait]
+  examples:
+  - summary: Create a Managed Cassandra Datacenter in a Cassandra Cluster. Each datacenter should atleast have 3 nodes.
+    syntax: >-
+      az managed-cassandra datacenter create \
+
+      --resource-group MyResourceGroup \
+
+      --cluster-name MyCluster \
+
+      --data-center-name MyDataCenter \
+
+      --data-center-location westus2 \
+
+      --node-count 3 \
+
+      --delegated-subnet-id /subscriptions/94d9b402-77b4-4049-b4c1-947bc6b7729b/resourceGroups/My-vnet/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-subnet
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-location -l
+    summary: Azure Location of the Datacenter.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --delegated-subnet-id -s
+    summary: The resource id of a subnet where ip addresses of the Cassandra virtual machines will be allocated. This must be in the same region as data_center_location.
+    description: ''
+  - isRequired: true
+    name: --node-count -n
+    summary: The number of Cassandra virtual machines in this data center. The minimum value is 3.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --base64-encoded-cassandra-yaml-fragment -b
+    summary: This is a Base64 encoded yaml file that is a subset of cassandra.yaml.  Supported fields will be honored and others will be ignored.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_managed-cassandra_datacenter_delete
+  name: az managed-cassandra datacenter delete
+  summary: Deletes a Managed Cassandra Datacenter.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter delete --cluster-name
+                                           --data-center-name
+                                           --resource-group
+                                           [--no-wait]
+                                           [--yes]
+  examples:
+  - summary: Deletes a Managed Cassandra Datacenter in the given Cluster.
+    syntax: az managed-cassandra datacenter delete --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter
+  - summary: Deletes a Managed Cassandra Datacenter in the given Cluster without waiting for the long-running operation to finish.
+    syntax: az managed-cassandra datacenter delete --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_managed-cassandra_datacenter_list
+  name: az managed-cassandra datacenter list
+  summary: List the Managed Cassandra Datacenters in a given Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter list --cluster-name
+                                         --resource-group
+  examples:
+  - summary: List all Managed Cassandra DataCenters in a given Cluster.
+    syntax: az managed-cassandra datacenter list --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_datacenter_show
+  name: az managed-cassandra datacenter show
+  summary: Get a Managed Cassandra DataCenter Resource.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter show --cluster-name
+                                         --data-center-name
+                                         --resource-group
+  examples:
+  - summary: Gets a Managed Cassandra Datacenter Resource. ProvisioningState tells the state of this datacenter. If the datacenter does not exist a NotFound response is returned.
+    syntax: az managed-cassandra datacenter show --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_datacenter_update
+  name: az managed-cassandra datacenter update
+  summary: Update a Datacenter in an Azure Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter update --cluster-name
+                                           --data-center-name
+                                           --resource-group
+                                           [--base64-encoded-cassandra-yaml-fragment]
+                                           [--no-wait]
+                                           [--node-count]
+  examples:
+  - summary: Scale the number of nodes in a datacenter. This is a scale up operation assuming that the create datacenter was done with 3 nodes. Each datacenter should atleast have 3 nodes.
+    syntax: az managed-cassandra datacenter update --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter --node-count 6
+  - summary: Scale the number of nodes in a datacenter. This is a scale down operation assuming that the create datacenter was done with 3 nodes, followed by a scale up to 6 nodes. Each datacenter should atleast have 3 nodes.
+    syntax: az managed-cassandra datacenter update --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter --node-count 4
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --base64-encoded-cassandra-yaml-fragment -b
+    summary: This is a Base64 encoded yaml file that is a subset of cassandra.yaml.  Supported fields will be honored and others will be ignored.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -n
+    summary: The number of Cassandra virtual machines in this data center. The minimum value is 3.
+    description: ''
+commands:
+- az_managed-cassandra_datacenter_create
+- az_managed-cassandra_datacenter_delete
+- az_managed-cassandra_datacenter_list
+- az_managed-cassandra_datacenter_show
+- az_managed-cassandra_datacenter_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure Managed Cassandra DataCenter.
diff --git a/2017-03-09-profile/docs-ref-autogen/managementpartner.yml b/2017-03-09-profile/docs-ref-autogen/managementpartner.yml
new file mode 100644
index 0000000000..4153a32ffe
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/managementpartner.yml
@@ -0,0 +1,71 @@
+### YamlMime:AzureCLIGroup
+uid: az_managementpartner
+name: az managementpartner
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **managementpartner** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az managementpartner** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
+description: ''
+directCommands:
+- uid: az_managementpartner_create
+  name: az managementpartner create
+  summary: Associates a Microsoft Partner Network(MPN) ID to the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner create --partner-id
+  requiredParameters:
+  - isRequired: true
+    name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+- uid: az_managementpartner_delete
+  name: az managementpartner delete
+  summary: Delete the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner delete --partner-id
+  requiredParameters:
+  - isRequired: true
+    name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+- uid: az_managementpartner_show
+  name: az managementpartner show
+  summary: Gets the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner show [--partner-id]
+  optionalParameters:
+  - name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+- uid: az_managementpartner_update
+  name: az managementpartner update
+  summary: Updates the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner update --partner-id
+  requiredParameters:
+  - isRequired: true
+    name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+commands:
+- az_managementpartner_create
+- az_managementpartner_delete
+- az_managementpartner_show
+- az_managementpartner_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh.yml b/2017-03-09-profile/docs-ref-autogen/mesh.yml
new file mode 100644
index 0000000000..76800b24e8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh.yml
@@ -0,0 +1,64 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh
+name: az mesh
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
+description: ''
+commands:
+- az_mesh_app
+- az_mesh_app_delete
+- az_mesh_app_list
+- az_mesh_app_show
+- az_mesh_code-package-log
+- az_mesh_code-package-log_get
+- az_mesh_deployment
+- az_mesh_deployment_create
+- az_mesh_gateway
+- az_mesh_gateway_delete
+- az_mesh_gateway_list
+- az_mesh_gateway_show
+- az_mesh_generate
+- az_mesh_generate_armtemplate
+- az_mesh_network
+- az_mesh_network_delete
+- az_mesh_network_list
+- az_mesh_network_show
+- az_mesh_secret
+- az_mesh_secret_delete
+- az_mesh_secret_list
+- az_mesh_secret_show
+- az_mesh_secretvalue
+- az_mesh_secretvalue_delete
+- az_mesh_secretvalue_list
+- az_mesh_secretvalue_show
+- az_mesh_service
+- az_mesh_service_list
+- az_mesh_service_show
+- az_mesh_service-replica
+- az_mesh_service-replica_list
+- az_mesh_service-replica_show
+- az_mesh_volume
+- az_mesh_volume_create
+- az_mesh_volume_delete
+- az_mesh_volume_list
+- az_mesh_volume_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/app.yml b/2017-03-09-profile/docs-ref-autogen/mesh/app.yml
new file mode 100644
index 0000000000..91e8db0fab
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/app.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_app
+name: az mesh app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh applications.
+description: ''
+directCommands:
+- uid: az_mesh_app_delete
+  name: az mesh app delete
+  summary: Delete a Service Fabric Mesh application.
+  description: ''
+  syntax: >-
+    az mesh app delete --name
+                       --resource-group
+                       [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_app_list
+  name: az mesh app list
+  summary: List Service Fabric Mesh applications.
+  description: ''
+  syntax: az mesh app list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_app_show
+  name: az mesh app show
+  summary: Get the details of a Service Fabric Mesh application.
+  description: ''
+  syntax: >-
+    az mesh app show --name
+                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_app_delete
+- az_mesh_app_list
+- az_mesh_app_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/code-package-log.yml b/2017-03-09-profile/docs-ref-autogen/mesh/code-package-log.yml
new file mode 100644
index 0000000000..e08944ec37
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/code-package-log.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_code-package-log
+name: az mesh code-package-log
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh code-package-log** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Examine the logs for a codepackage.
+description: ''
+directCommands:
+- uid: az_mesh_code-package-log_get
+  name: az mesh code-package-log get
+  summary: Examine the logs for a codepackage.
+  description: ''
+  syntax: >-
+    az mesh code-package-log get --app-name
+                                 --code-package-name
+                                 --replica-name
+                                 --resource-group
+                                 --service-name
+                                 [--tail]
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --code-package-name
+    summary: The name of code package of the service.
+    description: ''
+  - isRequired: true
+    name: --replica-name
+    summary: Service Fabric replica name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the service.
+    description: ''
+  optionalParameters:
+  - name: --tail
+    summary: Number of lines to show from the end of the logs. Default is 100.
+    description: ''
+commands:
+- az_mesh_code-package-log_get
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Examine the logs for a codepackage.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/deployment.yml b/2017-03-09-profile/docs-ref-autogen/mesh/deployment.yml
new file mode 100644
index 0000000000..7e408afcd4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/deployment.yml
@@ -0,0 +1,82 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_deployment
+name: az mesh deployment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh deployment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh deployments.
+description: ''
+directCommands:
+- uid: az_mesh_deployment_create
+  name: az mesh deployment create
+  summary: Create a Service Fabric Mesh application.
+  description: ''
+  syntax: >-
+    az mesh deployment create --resource-group
+                              [--input-yaml-files]
+                              [--mode]
+                              [--name]
+                              [--no-wait]
+                              [--parameters]
+                              [--template-file]
+                              [--template-uri]
+  examples:
+  - summary: Create a deployment with a template file on the remote.
+    syntax: az mesh deployment create --resource-group mygroup --template-uri https://seabreezequickstart.blob.core.windows.net/templates/quickstart/sbz_rp.linux.json
+  - summary: Create a deployment with a template file on local disk.
+    syntax: az mesh deployment create --resource-group mygroup --template-file ./appTemplate.json
+  - summary: List of comma separated yaml files or a directory which contains all the yaml files.
+    syntax: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml
+  - summary: Create a deployment with yaml files, along with a yaml parameters file, which consists of key/value pairs.
+    syntax: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
+  - summary: Create a deployment with parameters in arm json format.
+    syntax: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
+  - summary: Create a deployment with parameters passed directly as a json object.
+    syntax: "az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-yaml-files
+    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
+    description: ''
+  - name: --mode
+    summary: The mode for deployment, can be incremental(resources are only added) or complete(previous resources will be deleted).
+    description: ''
+  - name: --name -n
+    summary: The deployment name. Default to template file base name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --parameters
+    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
+    description: ''
+  - name: --template-file
+    summary: The full file path of creation template.
+    description: ''
+  - name: --template-uri
+    summary: The full file path of creation template on a http or https link.
+    description: ''
+commands:
+- az_mesh_deployment_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh deployments.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/gateway.yml b/2017-03-09-profile/docs-ref-autogen/mesh/gateway.yml
new file mode 100644
index 0000000000..7229c95cbc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/gateway.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_gateway
+name: az mesh gateway
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh gateway** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage gateway resources.
+description: ''
+directCommands:
+- uid: az_mesh_gateway_delete
+  name: az mesh gateway delete
+  summary: Delete a gateway resource.
+  description: ''
+  syntax: >-
+    az mesh gateway delete --name
+                           --resource-group
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the gateway resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_gateway_list
+  name: az mesh gateway list
+  summary: List gateway resources.
+  description: ''
+  syntax: az mesh gateway list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_gateway_show
+  name: az mesh gateway show
+  summary: Get the details of a gateway.
+  description: ''
+  syntax: >-
+    az mesh gateway show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the gateway resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_gateway_delete
+- az_mesh_gateway_list
+- az_mesh_gateway_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage gateway resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/generate.yml b/2017-03-09-profile/docs-ref-autogen/mesh/generate.yml
new file mode 100644
index 0000000000..5209801ad6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/generate.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_generate
+name: az mesh generate
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh generate** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Generate Service Fabric Mesh deployment template.
+description: ''
+directCommands:
+- uid: az_mesh_generate_armtemplate
+  name: az mesh generate armtemplate
+  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
+  description: ''
+  syntax: >-
+    az mesh generate armtemplate --input-yaml-files
+                                 [--parameters]
+  examples:
+  - summary: Generate a template file for deployment.
+    syntax: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml
+  - summary: Generate a template file for deployment with a yaml parameters file, which consists of key/value pairs.
+    syntax: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
+  - summary: Generate a template file for deployment with parameters in arm json format.
+    syntax: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
+  - summary: Generate a template file for deployment with parameters passed directly as a json object.
+    syntax: "az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
+  requiredParameters:
+  - isRequired: true
+    name: --input-yaml-files
+    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
+    description: ''
+  optionalParameters:
+  - name: --parameters
+    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
+    description: ''
+commands:
+- az_mesh_generate_armtemplate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Generate Service Fabric Mesh deployment template.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/network.yml b/2017-03-09-profile/docs-ref-autogen/mesh/network.yml
new file mode 100644
index 0000000000..0737d62035
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/network.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_network
+name: az mesh network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage networks.
+description: ''
+directCommands:
+- uid: az_mesh_network_delete
+  name: az mesh network delete
+  summary: Delete a network.
+  description: ''
+  syntax: >-
+    az mesh network delete --name
+                           --resource-group
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_network_list
+  name: az mesh network list
+  summary: List networks.
+  description: ''
+  syntax: az mesh network list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_network_show
+  name: az mesh network show
+  summary: Get the details of a network.
+  description: ''
+  syntax: >-
+    az mesh network show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_network_delete
+- az_mesh_network_list
+- az_mesh_network_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage networks.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/secret.yml b/2017-03-09-profile/docs-ref-autogen/mesh/secret.yml
new file mode 100644
index 0000000000..d2a254fb2a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/secret.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_secret
+name: az mesh secret
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh secret** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage secret resources.
+description: ''
+directCommands:
+- uid: az_mesh_secret_delete
+  name: az mesh secret delete
+  summary: Delete a secret.
+  description: ''
+  syntax: >-
+    az mesh secret delete --name
+                          --resource-group
+                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the secret.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_secret_list
+  name: az mesh secret list
+  summary: List Secrets.
+  description: ''
+  syntax: az mesh secret list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_secret_show
+  name: az mesh secret show
+  summary: Get the details of a secret.
+  description: ''
+  syntax: >-
+    az mesh secret show --name
+                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the secret.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_secret_delete
+- az_mesh_secret_list
+- az_mesh_secret_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage secret resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/secretvalue.yml b/2017-03-09-profile/docs-ref-autogen/mesh/secretvalue.yml
new file mode 100644
index 0000000000..f3e42b2a52
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/secretvalue.yml
@@ -0,0 +1,99 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_secretvalue
+name: az mesh secretvalue
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh secretvalue** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage secret values.
+description: ''
+directCommands:
+- uid: az_mesh_secretvalue_delete
+  name: az mesh secretvalue delete
+  summary: Delete a secret version.
+  description: ''
+  syntax: >-
+    az mesh secretvalue delete --resource-group
+                               --secret-resource-name
+                               --version
+                               [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-resource-name
+    summary: The name of the secret resource.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: The name of the secret version.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_secretvalue_list
+  name: az mesh secretvalue list
+  summary: List Secrets versions.
+  description: ''
+  syntax: >-
+    az mesh secretvalue list --resource-group
+                             --secret-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-name -n
+    summary: The name of the secret resource.
+    description: ''
+- uid: az_mesh_secretvalue_show
+  name: az mesh secretvalue show
+  summary: Get the details of a secret value.
+  description: ''
+  syntax: >-
+    az mesh secretvalue show --resource-group
+                             --secret-name
+                             --version
+                             [--show-value]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-name -n
+    summary: The name of the secret resource.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: The name of the secret version.
+    description: ''
+  optionalParameters:
+  - name: --show-value
+    summary: Pass this flag to receive the value of the secret.
+    description: ''
+commands:
+- az_mesh_secretvalue_delete
+- az_mesh_secretvalue_list
+- az_mesh_secretvalue_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage secret values.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/service-replica.yml b/2017-03-09-profile/docs-ref-autogen/mesh/service-replica.yml
new file mode 100644
index 0000000000..55faee9562
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/service-replica.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_service-replica
+name: az mesh service-replica
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh service-replica** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh service replicas.
+description: ''
+directCommands:
+- uid: az_mesh_service-replica_list
+  name: az mesh service-replica list
+  summary: List the details of service replicas.
+  description: ''
+  syntax: >-
+    az mesh service-replica list --app-name
+                                 --resource-group
+                                 --service-name
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the service.
+    description: ''
+- uid: az_mesh_service-replica_show
+  name: az mesh service-replica show
+  summary: Gets the given replica of the service of an application.
+  description: Gets the information about the service replica with the given name. The information include the description and other properties of the service replica.
+  syntax: >-
+    az mesh service-replica show --app-name
+                                 --name
+                                 --resource-group
+                                 --service-name
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the service replica.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the service.
+    description: ''
+commands:
+- az_mesh_service-replica_list
+- az_mesh_service-replica_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh service replicas.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/service.yml b/2017-03-09-profile/docs-ref-autogen/mesh/service.yml
new file mode 100644
index 0000000000..36118589ca
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/service.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_service
+name: az mesh service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh services.
+description: ''
+directCommands:
+- uid: az_mesh_service_list
+  name: az mesh service list
+  summary: Lists all the service resources.
+  description: Gets the information about all services of an application resource. The information include the description and other properties of the Service.
+  syntax: >-
+    az mesh service list --app-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_service_show
+  name: az mesh service show
+  summary: Get the details of a service.
+  description: ''
+  syntax: >-
+    az mesh service show --app-name
+                         --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_service_list
+- az_mesh_service_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh services.
diff --git a/2017-03-09-profile/docs-ref-autogen/mesh/volume.yml b/2017-03-09-profile/docs-ref-autogen/mesh/volume.yml
new file mode 100644
index 0000000000..ab938838cc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mesh/volume.yml
@@ -0,0 +1,113 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_volume
+name: az mesh volume
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh volume** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage volumes.
+description: ''
+directCommands:
+- uid: az_mesh_volume_create
+  name: az mesh volume create
+  summary: Create a volume.
+  description: ''
+  syntax: >-
+    az mesh volume create --location
+                          --name
+                          --resource-group
+                          [--template-file]
+                          [--template-uri]
+  examples:
+  - summary: Create a volume with a template file on a remote URL.
+    syntax: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-uri https://mystorage.blob.core.windows.net/templates/volumeDescription.json
+  - summary: Create a volume with a template file on local disk.
+    syntax: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-file ./volumeDescription.json
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the volume.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --template-file
+    summary: The full file path of creation template.
+    description: ''
+  - name: --template-uri
+    summary: The full file path of creation template on a http or https link.
+    description: ''
+- uid: az_mesh_volume_delete
+  name: az mesh volume delete
+  summary: Delete a volume.
+  description: ''
+  syntax: >-
+    az mesh volume delete --name
+                          --resource-group
+                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the volume.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_volume_list
+  name: az mesh volume list
+  summary: List volumes.
+  description: ''
+  syntax: az mesh volume list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_volume_show
+  name: az mesh volume show
+  summary: Get the details of a volume.
+  description: ''
+  syntax: >-
+    az mesh volume show --name
+                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the volume.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_volume_create
+- az_mesh_volume_delete
+- az_mesh_volume_list
+- az_mesh_volume_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage volumes.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1).yml b/2017-03-09-profile/docs-ref-autogen/ml(v1).yml
new file mode 100644
index 0000000000..e4c302d88c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1).yml
@@ -0,0 +1,171 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)
+name: az ml
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Machine Learning resources.
+description: ''
+commands:
+- az_ml(v1)_computetarget
+- az_ml(v1)_computetarget_amlcompute
+- az_ml(v1)_computetarget_amlcompute_identity
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+- az_ml(v1)_computetarget_attach
+- az_ml(v1)_computetarget_attach_aks
+- az_ml(v1)_computetarget_attach_kubernetes
+- az_ml(v1)_computetarget_attach_remote
+- az_ml(v1)_computetarget_computeinstance
+- az_ml(v1)_computetarget_computeinstance_restart
+- az_ml(v1)_computetarget_computeinstance_start
+- az_ml(v1)_computetarget_computeinstance_stop
+- az_ml(v1)_computetarget_create
+- az_ml(v1)_computetarget_create_aks
+- az_ml(v1)_computetarget_create_amlcompute
+- az_ml(v1)_computetarget_create_computeinstance
+- az_ml(v1)_computetarget_create_datafactory
+- az_ml(v1)_computetarget_delete
+- az_ml(v1)_computetarget_detach
+- az_ml(v1)_computetarget_get-credentials
+- az_ml(v1)_computetarget_list
+- az_ml(v1)_computetarget_show
+- az_ml(v1)_computetarget_update
+- az_ml(v1)_computetarget_update_aks
+- az_ml(v1)_computetarget_update_amlcompute
+- az_ml(v1)_dataset
+- az_ml(v1)_dataset_archive
+- az_ml(v1)_dataset_deprecate
+- az_ml(v1)_dataset_list
+- az_ml(v1)_dataset_reactivate
+- az_ml(v1)_dataset_register
+- az_ml(v1)_dataset_show
+- az_ml(v1)_dataset_unregister
+- az_ml(v1)_datastore
+- az_ml(v1)_datastore_attach-adls
+- az_ml(v1)_datastore_attach-adls-gen2
+- az_ml(v1)_datastore_attach-blob
+- az_ml(v1)_datastore_attach-dbfs
+- az_ml(v1)_datastore_attach-file
+- az_ml(v1)_datastore_attach-mysqldb
+- az_ml(v1)_datastore_attach-psqldb
+- az_ml(v1)_datastore_attach-sqldb
+- az_ml(v1)_datastore_detach
+- az_ml(v1)_datastore_download
+- az_ml(v1)_datastore_list
+- az_ml(v1)_datastore_set-default
+- az_ml(v1)_datastore_show
+- az_ml(v1)_datastore_show-default
+- az_ml(v1)_datastore_upload
+- az_ml(v1)_endpoint
+- az_ml(v1)_endpoint_realtime
+- az_ml(v1)_endpoint_realtime_create-version
+- az_ml(v1)_endpoint_realtime_delete
+- az_ml(v1)_endpoint_realtime_delete-version
+- az_ml(v1)_endpoint_realtime_get-access-token
+- az_ml(v1)_endpoint_realtime_get-keys
+- az_ml(v1)_endpoint_realtime_get-logs
+- az_ml(v1)_endpoint_realtime_list
+- az_ml(v1)_endpoint_realtime_regen-key
+- az_ml(v1)_endpoint_realtime_run
+- az_ml(v1)_endpoint_realtime_show
+- az_ml(v1)_endpoint_realtime_update
+- az_ml(v1)_endpoint_realtime_update-version
+- az_ml(v1)_environment
+- az_ml(v1)_environment_download
+- az_ml(v1)_environment_list
+- az_ml(v1)_environment_register
+- az_ml(v1)_environment_scaffold
+- az_ml(v1)_environment_show
+- az_ml(v1)_experiment
+- az_ml(v1)_experiment_list
+- az_ml(v1)_folder
+- az_ml(v1)_folder_attach
+- az_ml(v1)_model
+- az_ml(v1)_model_delete
+- az_ml(v1)_model_deploy
+- az_ml(v1)_model_download
+- az_ml(v1)_model_list
+- az_ml(v1)_model_package
+- az_ml(v1)_model_profile
+- az_ml(v1)_model_register
+- az_ml(v1)_model_show
+- az_ml(v1)_model_update
+- az_ml(v1)_pipeline
+- az_ml(v1)_pipeline_clone
+- az_ml(v1)_pipeline_clone-draft
+- az_ml(v1)_pipeline_create
+- az_ml(v1)_pipeline_create-draft
+- az_ml(v1)_pipeline_create-schedule
+- az_ml(v1)_pipeline_delete-draft
+- az_ml(v1)_pipeline_disable
+- az_ml(v1)_pipeline_disable-schedule
+- az_ml(v1)_pipeline_enable
+- az_ml(v1)_pipeline_enable-schedule
+- az_ml(v1)_pipeline_get
+- az_ml(v1)_pipeline_last-pipeline-run
+- az_ml(v1)_pipeline_list
+- az_ml(v1)_pipeline_list-drafts
+- az_ml(v1)_pipeline_list-steps
+- az_ml(v1)_pipeline_pipeline-runs-list
+- az_ml(v1)_pipeline_publish-draft
+- az_ml(v1)_pipeline_show
+- az_ml(v1)_pipeline_show-draft
+- az_ml(v1)_pipeline_show-schedule
+- az_ml(v1)_pipeline_submit-draft
+- az_ml(v1)_pipeline_update-draft
+- az_ml(v1)_pipeline_update-schedule
+- az_ml(v1)_run
+- az_ml(v1)_run_cancel
+- az_ml(v1)_run_download-logs
+- az_ml(v1)_run_list
+- az_ml(v1)_run_monitor-logs
+- az_ml(v1)_run_monitor-tensorboard
+- az_ml(v1)_run_show
+- az_ml(v1)_run_submit-hyperdrive
+- az_ml(v1)_run_submit-pipeline
+- az_ml(v1)_run_submit-script
+- az_ml(v1)_run_update
+- az_ml(v1)_service
+- az_ml(v1)_service_delete
+- az_ml(v1)_service_get-access-token
+- az_ml(v1)_service_get-keys
+- az_ml(v1)_service_get-logs
+- az_ml(v1)_service_list
+- az_ml(v1)_service_regen-key
+- az_ml(v1)_service_run
+- az_ml(v1)_service_show
+- az_ml(v1)_service_update
+- az_ml(v1)_workspace
+- az_ml(v1)_workspace_create
+- az_ml(v1)_workspace_delete
+- az_ml(v1)_workspace_list
+- az_ml(v1)_workspace_list-keys
+- az_ml(v1)_workspace_private-endpoint
+- az_ml(v1)_workspace_private-endpoint_add
+- az_ml(v1)_workspace_private-endpoint_delete
+- az_ml(v1)_workspace_private-endpoint_list
+- az_ml(v1)_workspace_share
+- az_ml(v1)_workspace_show
+- az_ml(v1)_workspace_sync-keys
+- az_ml(v1)_workspace_update
+- az_ml(v1)_workspace_update-dependencies
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Machine Learning resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget.yml
new file mode 100644
index 0000000000..9048a378c1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget
+name: az ml computetarget
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Computetarget subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_delete
+  name: az ml computetarget delete
+  summary: Delete a compute target (aks or amlcompute or computeinstance).
+  description: ''
+  syntax: >-
+    az ml computetarget delete --name
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+                               [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the enviroment to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_detach
+  name: az ml computetarget detach
+  summary: Detach a compute target (aks or remote) from a workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget detach --name
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+                               [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to detach.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the enviroment to detach.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_get-credentials
+  name: az ml computetarget get-credentials
+  summary: Get credentials for a compute target (aks or remote).
+  description: ''
+  syntax: >-
+    az ml computetarget get-credentials --name
+                                        [--path]
+                                        [--resource-group]
+                                        [--subscription-id]
+                                        [--workspace-name]
+                                        [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to retrieve keys for.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to get credentials for.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_list
+  name: az ml computetarget list
+  summary: List all the compute targets attached to a workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget list [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+                             [-v]
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_show
+  name: az ml computetarget show
+  summary: Show details of a specific compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget show --name
+                             [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+                             [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to show.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_amlcompute
+- az_ml(v1)_computetarget_amlcompute_identity
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+- az_ml(v1)_computetarget_attach
+- az_ml(v1)_computetarget_attach_aks
+- az_ml(v1)_computetarget_attach_kubernetes
+- az_ml(v1)_computetarget_attach_remote
+- az_ml(v1)_computetarget_computeinstance
+- az_ml(v1)_computetarget_computeinstance_restart
+- az_ml(v1)_computetarget_computeinstance_start
+- az_ml(v1)_computetarget_computeinstance_stop
+- az_ml(v1)_computetarget_create
+- az_ml(v1)_computetarget_create_aks
+- az_ml(v1)_computetarget_create_amlcompute
+- az_ml(v1)_computetarget_create_computeinstance
+- az_ml(v1)_computetarget_create_datafactory
+- az_ml(v1)_computetarget_delete
+- az_ml(v1)_computetarget_detach
+- az_ml(v1)_computetarget_get-credentials
+- az_ml(v1)_computetarget_list
+- az_ml(v1)_computetarget_show
+- az_ml(v1)_computetarget_update
+- az_ml(v1)_computetarget_update_aks
+- az_ml(v1)_computetarget_update_amlcompute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Computetarget subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/amlcompute.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/amlcompute.yml
new file mode 100644
index 0000000000..89adbbb43b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/amlcompute.yml
@@ -0,0 +1,30 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_amlcompute
+name: az ml computetarget amlcompute
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget amlcompute** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_ml(v1)_computetarget_amlcompute_identity
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/amlcompute/identity.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/amlcompute/identity.yml
new file mode 100644
index 0000000000..4ccc3152d3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/amlcompute/identity.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_amlcompute_identity
+name: az ml computetarget amlcompute identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget amlcompute identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: AzureML compute target identity commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_amlcompute_identity_assign
+  name: az ml computetarget amlcompute identity assign
+  summary: Assign identity to an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget amlcompute identity assign --identities
+                                                   --name
+                                                   [--path]
+                                                   [--resource-group]
+                                                   [--subscription-id]
+                                                   [--workspace-name]
+                                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --identities
+    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie 'ResourceID1,ResourceID2') to set user assigned identities.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_amlcompute_identity_remove
+  name: az ml computetarget amlcompute identity remove
+  summary: Remove identity from an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget amlcompute identity remove --identities
+                                                   --name
+                                                   [--path]
+                                                   [--resource-group]
+                                                   [--subscription-id]
+                                                   [--workspace-name]
+                                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --identities
+    summary: Use '[system]' to remove a system assigned identity else input resource IDs separated by commas (ie 'ResourceID1,ResourceID2') to remove user assigned identities.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_amlcompute_identity_show
+  name: az ml computetarget amlcompute identity show
+  summary: Display identities of an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget amlcompute identity show --name
+                                                 [--path]
+                                                 [--resource-group]
+                                                 [--subscription-id]
+                                                 [--workspace-name]
+                                                 [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: AzureML compute target identity commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/attach.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/attach.yml
new file mode 100644
index 0000000000..b347be5be6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/attach.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_attach
+name: az ml computetarget attach
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget attach** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Attach subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_attach_aks
+  name: az ml computetarget attach aks
+  summary: Attach an AKS cluster to the workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget attach aks --compute-resource-id
+                                   --name
+                                   [--resource-group]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --compute-resource-id -i
+    summary: Resource ID of the compute object to attach to the workspace.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specifies the compute target name. Must be unique to the workspace.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
+    description: ''
+- uid: az_ml(v1)_computetarget_attach_kubernetes
+  name: az ml computetarget attach kubernetes
+  summary: Attach a KubernetesCompute as a compute target to the workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget attach kubernetes --compute-resource-id
+                                          --name
+                                          [--amlk8s-config]
+                                          [--resource-group]
+                                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --compute-resource-id -i
+    summary: Resource ID of the compute object to attach to the workspace.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specifies the compute target name. Must be unique to the workspace.
+    description: ''
+  optionalParameters:
+  - name: --amlk8s-config
+    summary: The json file for amlk8s configuration.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
+    description: ''
+- uid: az_ml(v1)_computetarget_attach_remote
+  name: az ml computetarget attach remote
+  summary: Attach a remote machine without Docker as a compute target to the workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget attach remote --address
+                                      --name
+                                      --ssh-port
+                                      --username
+                                      [--password]
+                                      [--private-key-file]
+                                      [--private-key-passphrase]
+                                      [--resource-group]
+                                      [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --address -a
+    summary: DNS name or IP address of the target.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specifies the compute target name. Must be unique to the workspace.
+    description: ''
+  - isRequired: true
+    name: --ssh-port
+    defaultValue: "22"
+    summary: Ssh port that can be use to connect to the compute.
+    description: ''
+  - isRequired: true
+    name: --username -u
+    summary: The username for the remote machine being attached. Must also provide either a password or public and private key files.
+    description: ''
+  optionalParameters:
+  - name: --password -p
+    summary: The password for the remote machine being attached. Must either provide a password or public and private key files.
+    description: ''
+  - name: --private-key-file
+    summary: Path to a file containing the private key information for the remote machine being attached.
+    description: ''
+  - name: --private-key-passphrase
+    summary: Passphrase for private key specified with the --private-key-file option.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_attach_aks
+- az_ml(v1)_computetarget_attach_kubernetes
+- az_ml(v1)_computetarget_attach_remote
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Attach subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/computeinstance.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/computeinstance.yml
new file mode 100644
index 0000000000..23d5d4d823
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/computeinstance.yml
@@ -0,0 +1,139 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_computeinstance
+name: az ml computetarget computeinstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget computeinstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: AzureML compute instance commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_computeinstance_restart
+  name: az ml computetarget computeinstance restart
+  summary: Restart a compute instance.
+  description: ''
+  syntax: >-
+    az ml computetarget computeinstance restart --name
+                                                [--no-wait]
+                                                [--path]
+                                                [--resource-group]
+                                                [--subscription-id]
+                                                [--workspace-name]
+                                                [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to restart.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to restart.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_computeinstance_start
+  name: az ml computetarget computeinstance start
+  summary: Start a compute instance.
+  description: ''
+  syntax: >-
+    az ml computetarget computeinstance start --name
+                                              [--no-wait]
+                                              [--path]
+                                              [--resource-group]
+                                              [--subscription-id]
+                                              [--workspace-name]
+                                              [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to start.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to start.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_computeinstance_stop
+  name: az ml computetarget computeinstance stop
+  summary: Stop a compute instance.
+  description: ''
+  syntax: >-
+    az ml computetarget computeinstance stop --name
+                                             [--no-wait]
+                                             [--path]
+                                             [--resource-group]
+                                             [--subscription-id]
+                                             [--workspace-name]
+                                             [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to stop.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to stop.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_computeinstance_restart
+- az_ml(v1)_computetarget_computeinstance_start
+- az_ml(v1)_computetarget_computeinstance_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: AzureML compute instance commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/create.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/create.yml
new file mode 100644
index 0000000000..bc83c548f1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/create.yml
@@ -0,0 +1,351 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_create
+name: az ml computetarget create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Create a compute target (aks or amlcompute or computeinstance).
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_create_aks
+  name: az ml computetarget create aks
+  summary: Create an AKS compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget create aks --name
+                                   [--agent-count]
+                                   [--cluster-purpose]
+                                   [--dns-service-ip]
+                                   [--docker-bridge-cidr]
+                                   [--load-balancer-subnet]
+                                   [--load-balancer-type]
+                                   [--location]
+                                   [--no-wait]
+                                   [--path]
+                                   [--resource-group]
+                                   [--service-cidr]
+                                   [--ssl-cert-file]
+                                   [--ssl-cname]
+                                   [--ssl-key-file]
+                                   [--ssl-leaf-domain-label]
+                                   [--ssl-overwrite-domain]
+                                   [--subnet-name]
+                                   [--subscription-id]
+                                   [--vm-size]
+                                   [--vnet-name]
+                                   [--vnet-resourcegroup-name]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --agent-count -a
+    summary: 'Number of agents to provision with the AKS cluster. Default: 3.'
+    description: ''
+  - name: --cluster-purpose
+    summary: 'Targeted purpose of the cluster. This is used when provisioning AzureML components to ensure the desired level of fault-tolerance and QoS. Accepted values are "FastProd" and "DevTest". Further detail of the use cases can be found here: https://aka.ms/azureml-create-new-aks-cluster.'
+    description: ''
+  - name: --dns-service-ip
+    summary: Containers DNS server IP address.
+    description: ''
+  - name: --docker-bridge-cidr
+    summary: A CIDR notation IP for Docker bridge.
+    description: ''
+  - name: --load-balancer-subnet
+    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
+    description: ''
+  - name: --load-balancer-type
+    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
+    description: ''
+  - name: --location -l
+    summary: Location to provision cluster in. If not specified, will default to workspace location.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --service-cidr
+    summary: A CIDR notation IP range from which to assign service cluster IPs.
+    description: ''
+  - name: --ssl-cert-file
+    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
+    description: ''
+  - name: --ssl-cname
+    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
+    description: ''
+  - name: --ssl-key-file
+    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
+    description: ''
+  - name: --ssl-leaf-domain-label
+    summary: Leaf domain label to use for the auto generated certificate.
+    description: ''
+  - name: --ssl-overwrite-domain
+    summary: When set overwrites the existing leaf domain label.
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --vm-size -s
+    summary: 'VM size to use for the compute target. A full list of options can be found here: https://aka.ms/azureml-aks-details Default: Standard_D3_v2.'
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --vnet-resourcegroup-name
+    summary: Name of the resource group where the virtual network is located.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_create_amlcompute
+  name: az ml computetarget create amlcompute
+  summary: Create an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget create amlcompute --max-nodes
+                                          --name
+                                          --vm-size
+                                          [--admin-user-password]
+                                          [--admin-user-ssh-key]
+                                          [--admin-username]
+                                          [--assign-identity]
+                                          [--description]
+                                          [--idle-seconds-before-scaledown]
+                                          [--min-nodes]
+                                          [--no-wait]
+                                          [--path]
+                                          [--remote-login-port-public-access]
+                                          [--resource-group]
+                                          [--subnet-name]
+                                          [--subscription-id]
+                                          [--tag]
+                                          [--vm-priority]
+                                          [--vnet-name]
+                                          [--vnet-resourcegroup-name]
+                                          [--workspace-name]
+                                          [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --max-nodes
+    summary: 'Maximum number of nodes to use. Default: 4.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  - isRequired: true
+    name: --vm-size -s
+    summary: 'VM size to use for the compute target. More details can be found here: https://aka.ms/azureml-vm-details Default: Standard_NC6.'
+    description: ''
+  optionalParameters:
+  - name: --admin-user-password
+    summary: Password of the administrator user account.
+    description: ''
+  - name: --admin-user-ssh-key
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --admin-username
+    summary: Name of the administrator user account which can be used to SSH into nodes.
+    description: ''
+  - name: --assign-identity
+    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie 'ResourceID1,ResourceID2') to set user assigned identities.
+    description: ''
+  - name: --description
+    summary: Description of the compute target.
+    description: ''
+  - name: --idle-seconds-before-scaledown
+    summary: 'Node idle time in seconds before scaling down the cluster. Default: 120.'
+    description: ''
+  - name: --min-nodes
+    summary: 'Minimum number of nodes to use. Default: 0.'
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --remote-login-port-public-access
+    summary: 'State of the public SSH port. Possible values are: Enabled or Disabled.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --vm-priority -p
+    summary: "VM priority to use for the compute target. (Options are 'dedicated', 'lowpriority') Default: dedicated."
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --vnet-resourcegroup-name
+    summary: Name of the resource group where the virtual network is located.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_create_computeinstance
+  name: az ml computetarget create computeinstance
+  summary: Create an AzureML compute instance target.
+  description: ''
+  syntax: >-
+    az ml computetarget create computeinstance --name
+                                               --vm-size
+                                               [--admin-user-ssh-public-key]
+                                               [--description]
+                                               [--no-wait]
+                                               [--path]
+                                               [--resource-group]
+                                               [--ssh-public-access]
+                                               [--subnet-name]
+                                               [--subscription-id]
+                                               [--tag]
+                                               [--user-object-id]
+                                               [--user-tenant-id]
+                                               [--vnet-name]
+                                               [--vnet-resourcegroup-name]
+                                               [--workspace-name]
+                                               [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to create.
+    description: ''
+  - isRequired: true
+    name: --vm-size -s
+    summary: 'VM size to use for the compute target. More details can be found here: https://aka.ms/azureml-vm-details Default: Standard_NC6.'
+    description: ''
+  optionalParameters:
+  - name: --admin-user-ssh-public-key
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --description
+    summary: Description of the compute target.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --ssh-public-access
+    summary: 'State of the public SSH port. Possible values are: True or False.'
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --user-object-id
+    summary: The AAD Object ID of the assigned user of this compute instance (preview).
+    description: ''
+  - name: --user-tenant-id
+    summary: The AAD Tenant ID of the assigned user of this compute instance (preview).
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --vnet-resourcegroup-name
+    summary: Name of the resource group where the virtual network is located.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_create_datafactory
+  name: az ml computetarget create datafactory
+  summary: Create a data factory compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget create datafactory --name
+                                           [--location]
+                                           [--no-wait]
+                                           [--path]
+                                           [--resource-group]
+                                           [--subscription-id]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: Location to provision cluster in. If not specified, will default to workspace location.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_create_aks
+- az_ml(v1)_computetarget_create_amlcompute
+- az_ml(v1)_computetarget_create_computeinstance
+- az_ml(v1)_computetarget_create_datafactory
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Create a compute target (aks or amlcompute or computeinstance).
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/update.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/update.yml
new file mode 100644
index 0000000000..d9aae44a2f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/computetarget/update.yml
@@ -0,0 +1,146 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_update
+name: az ml computetarget update
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget update** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Update a compute target (aks or amlcompute).
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_update_aks
+  name: az ml computetarget update aks
+  summary: Update an AKS compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget update aks --name
+                                   [--load-balancer-subnet]
+                                   [--load-balancer-type]
+                                   [--no-wait]
+                                   [--path]
+                                   [--resource-group]
+                                   [--ssl-cert-file]
+                                   [--ssl-cname]
+                                   [--ssl-disable]
+                                   [--ssl-key-file]
+                                   [--ssl-leaf-domain-label]
+                                   [--ssl-overwrite-domain]
+                                   [--ssl-renew]
+                                   [--subscription-id]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to update.
+    description: ''
+  optionalParameters:
+  - name: --load-balancer-subnet
+    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
+    description: ''
+  - name: --load-balancer-type
+    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --ssl-cert-file
+    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
+    description: ''
+  - name: --ssl-cname
+    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
+    description: ''
+  - name: --ssl-disable
+    summary: Disable SSL validation.
+    description: ''
+  - name: --ssl-key-file
+    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
+    description: ''
+  - name: --ssl-leaf-domain-label
+    summary: Leaf domain label to use for the auto generated certificate.
+    description: ''
+  - name: --ssl-overwrite-domain
+    summary: When set overwrites the existing leaf domain label.
+    description: ''
+  - name: --ssl-renew
+    summary: Refreshes the auto generated certificate. If provided, the existing SSL configuration must be auto.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_update_amlcompute
+  name: az ml computetarget update amlcompute
+  summary: Update an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget update amlcompute --name
+                                          [--idle-seconds-before-scaledown]
+                                          [--max-nodes]
+                                          [--min-nodes]
+                                          [--path]
+                                          [--resource-group]
+                                          [--subscription-id]
+                                          [--workspace-name]
+                                          [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --idle-seconds-before-scaledown
+    summary: Node idle time in seconds before scaling down the cluster.
+    description: ''
+  - name: --max-nodes
+    summary: Maximum number of nodes to use.
+    description: ''
+  - name: --min-nodes
+    summary: Minimum number of nodes to use.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_update_aks
+- az_ml(v1)_computetarget_update_amlcompute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Update a compute target (aks or amlcompute).
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/dataset.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/dataset.yml
new file mode 100644
index 0000000000..8a189a7d8a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/dataset.yml
@@ -0,0 +1,283 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_dataset
+name: az ml dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for managing datasets in Azure Machine Learning Workspace.
+description: ''
+directCommands:
+- uid: az_ml(v1)_dataset_archive
+  name: az ml dataset archive
+  summary: Archive an active or deprecated dataset.
+  description: ''
+  syntax: >-
+    az ml dataset archive [--id]
+                          [--name]
+                          [--output-metadata-file]
+                          [--path]
+                          [--resource-group]
+                          [--subscription-id]
+                          [--workspace-name]
+  optionalParameters:
+  - name: --id -i
+    summary: Dataset ID (guid).
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_deprecate
+  name: az ml dataset deprecate
+  summary: Deprecate an active dataset in a workspace by another dataset.
+  description: ''
+  syntax: >-
+    az ml dataset deprecate --deprecate-by-id
+                            [--id]
+                            [--name]
+                            [--output-metadata-file]
+                            [--path]
+                            [--resource-group]
+                            [--subscription-id]
+                            [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --deprecate-by-id -d
+    summary: Dataset ID (guid) which is the intended replacement for this Dataset.
+    description: ''
+  optionalParameters:
+  - name: --id -i
+    summary: Dataset ID (guid).
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_list
+  name: az ml dataset list
+  summary: List all datasets in the workspace.
+  description: ''
+  syntax: >-
+    az ml dataset list [--output-metadata-file]
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_reactivate
+  name: az ml dataset reactivate
+  summary: Reactivate an archived or deprecated dataset.
+  description: ''
+  syntax: >-
+    az ml dataset reactivate [--id]
+                             [--name]
+                             [--output-metadata-file]
+                             [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+  optionalParameters:
+  - name: --id -i
+    summary: Dataset ID (guid).
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_register
+  name: az ml dataset register
+  summary: Register a new dataset from the specified file.
+  description: ''
+  syntax: >-
+    az ml dataset register [--file]
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--show-template]
+                           [--skip-validation]
+                           [--subscription-id]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --file -f
+    summary: Specification file for dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --show-template
+    summary: Show template of dataset specification file.
+    description: ''
+  - name: --skip-validation
+    summary: Skip validation that ensures data can be loaded from the dataset before registration.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_show
+  name: az ml dataset show
+  summary: Get details of a dataset by its id or registration name.
+  description: ''
+  syntax: >-
+    az ml dataset show [--id]
+                       [--name]
+                       [--output-metadata-file]
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--version]
+                       [--workspace-name]
+  optionalParameters:
+  - name: --id -i
+    summary: ID of the dataset saved to workspace.
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version -v
+    defaultValue: latest
+    summary: Registration version of the dataset.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_unregister
+  name: az ml dataset unregister
+  summary: Unregister all versions under the specified registration name.
+  description: ''
+  syntax: >-
+    az ml dataset unregister [--name]
+                             [--output-metadata-file]
+                             [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+  optionalParameters:
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_dataset_archive
+- az_ml(v1)_dataset_deprecate
+- az_ml(v1)_dataset_list
+- az_ml(v1)_dataset_reactivate
+- az_ml(v1)_dataset_register
+- az_ml(v1)_dataset_show
+- az_ml(v1)_dataset_unregister
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for managing datasets in Azure Machine Learning Workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/datastore.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/datastore.yml
new file mode 100644
index 0000000000..c3f8d487ef
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/datastore.yml
@@ -0,0 +1,889 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_datastore
+name: az ml datastore
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml datastore** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for managing and using datastores with the Azure ML Workspace.
+description: ''
+directCommands:
+- uid: az_ml(v1)_datastore_attach-adls
+  name: az ml datastore attach-adls
+  summary: Attach an ADLS datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-adls --client-id
+                                --client-secret
+                                --name
+                                --store-name
+                                --tenant-id
+                                [--adls-resource-group]
+                                [--adls-subscription-id]
+                                [--authority-url]
+                                [--grant-workspace-msi-access]
+                                [--include-secret]
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--resource-url]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --client-id
+    summary: The service principal's client/application ID.
+    description: ''
+  - isRequired: true
+    name: --client-secret
+    summary: The service principal's secret.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --store-name -c
+    summary: The ADLS store name.
+    description: ''
+  - isRequired: true
+    name: --tenant-id
+    summary: The service principal Tenant ID.
+    description: ''
+  optionalParameters:
+  - name: --adls-resource-group
+    summary: The resource group the ADLS store belongs to.
+    description: ''
+  - name: --adls-subscription-id
+    summary: The ID of the subscription the ADLS store belongs to.
+    description: ''
+  - name: --authority-url
+    defaultValue: https://login.microsoftonline.com
+    summary: Authority url used to authenticate the user.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --resource-url
+    defaultValue: https://datalake.azure.net/
+    summary: Determines what operations will be performed on the data lake store.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-adls-gen2
+  name: az ml datastore attach-adls-gen2
+  summary: Attach a ADLS Gen2 datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-adls-gen2 --account-name
+                                     --client-id
+                                     --client-secret
+                                     --file-system
+                                     --name
+                                     --tenant-id
+                                     [--adlsgen2-account-resource-group]
+                                     [--adlsgen2-account-subscription-id]
+                                     [--authority-url]
+                                     [--endpoint]
+                                     [--grant-workspace-msi-access]
+                                     [--include-secret]
+                                     [--output-metadata-file]
+                                     [--path]
+                                     [--protocol]
+                                     [--resource-group]
+                                     [--resource-url]
+                                     [--subscription-id]
+                                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the storage account.
+    description: ''
+  - isRequired: true
+    name: --client-id
+    summary: The service principal's client/application ID.
+    description: ''
+  - isRequired: true
+    name: --client-secret
+    summary: The service principal's secret.
+    description: ''
+  - isRequired: true
+    name: --file-system -c
+    summary: The file system name of the ADLS Gen2.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --tenant-id
+    summary: The service principal Tenant ID.
+    description: ''
+  optionalParameters:
+  - name: --adlsgen2-account-resource-group
+    summary: The resource group of the ADLS Gen2 storage account.
+    description: ''
+  - name: --adlsgen2-account-subscription-id
+    summary: The subscription ID of the ADLS Gen2 storage account.
+    description: ''
+  - name: --authority-url
+    defaultValue: https://login.microsoftonline.com
+    summary: Authority url used to authenticate the user.
+    description: ''
+  - name: --endpoint
+    defaultValue: core.windows.net
+    summary: The endpoint of the storage account. Defaults to core.windows.net.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --protocol
+    defaultValue: https
+    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --resource-url
+    defaultValue: https://storage.azure.com/
+    summary: Determines what operations will be performed on the data lake store.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-blob
+  name: az ml datastore attach-blob
+  summary: Attach a blob storage datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-blob --account-name
+                                --container-name
+                                --name
+                                [--account-key]
+                                [--endpoint]
+                                [--grant-workspace-msi-access]
+                                [--include-secret]
+                                [--output-metadata-file]
+                                [--path]
+                                [--protocol]
+                                [--resource-group]
+                                [--sas-token]
+                                [--storage-account-resource-group]
+                                [--storage-account-subscription-id]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the storage account.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The blob container name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --account-key -k
+    summary: The storage account key.
+    description: ''
+  - name: --endpoint
+    defaultValue: core.windows.net
+    summary: The endpoint of the storage account. Defaults to core.windows.net.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --protocol
+    defaultValue: https
+    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --sas-token
+    summary: A SAS token for the blob container.
+    description: ''
+  - name: --storage-account-resource-group
+    summary: The resource group of the storage account.
+    description: ''
+  - name: --storage-account-subscription-id
+    summary: The subscription ID of the storage account.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-dbfs
+  name: az ml datastore attach-dbfs
+  summary: Attach a Databricks File System datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-dbfs --name
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-file
+  name: az ml datastore attach-file
+  summary: Attach a file share datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-file --account-name
+                                --name
+                                --share-name
+                                [--account-key]
+                                [--endpoint]
+                                [--include-secret]
+                                [--output-metadata-file]
+                                [--path]
+                                [--protocol]
+                                [--resource-group]
+                                [--sas-token]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the storage account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --share-name -c
+    summary: The file share name.
+    description: ''
+  optionalParameters:
+  - name: --account-key -k
+    summary: The storage account key.
+    description: ''
+  - name: --endpoint
+    defaultValue: core.windows.net
+    summary: The endpoint of the storage account. Defaults to core.windows.net.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --protocol
+    defaultValue: https
+    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --sas-token
+    summary: A SAS token for the blob container.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-mysqldb
+  name: az ml datastore attach-mysqldb
+  summary: Attach an Azure MySQL datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-mysqldb --database-name
+                                   --name
+                                   --password
+                                   --server-name
+                                   --user-id
+                                   [--endpoint]
+                                   [--include-secret]
+                                   [--output-metadata-file]
+                                   [--path]
+                                   [--port]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --database-name -d
+    summary: The database name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --password -p
+    summary: The password.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The SQL/PostgreSQL/MySQL server name.
+    description: ''
+  - isRequired: true
+    name: --user-id -u
+    summary: The user ID.
+    description: ''
+  optionalParameters:
+  - name: --endpoint
+    defaultValue: mysql.database.azure.com
+    summary: The endpoint of the server. Defaults to mysql.database.azure.com.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --port
+    defaultValue: "5432"
+    summary: The port number.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-psqldb
+  name: az ml datastore attach-psqldb
+  summary: Attach an Azure PostgreSQL datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-psqldb --database-name
+                                  --name
+                                  --password
+                                  --server-name
+                                  --user-id
+                                  [--endpoint]
+                                  [--enforce-ssl]
+                                  [--include-secret]
+                                  [--output-metadata-file]
+                                  [--path]
+                                  [--port]
+                                  [--resource-group]
+                                  [--subscription-id]
+                                  [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --database-name -d
+    summary: The database name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --password -p
+    summary: The password.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The SQL/PostgreSQL/MySQL server name.
+    description: ''
+  - isRequired: true
+    name: --user-id -u
+    summary: The user ID.
+    description: ''
+  optionalParameters:
+  - name: --endpoint
+    defaultValue: postgres.database.azure.com
+    summary: The endpoint of the server. Defaults to postgres.database.azure.com.
+    description: ''
+  - name: --enforce-ssl
+    defaultValue: "1"
+    summary: This sets the ssl value of the server. Defaults to true if not set.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --port
+    defaultValue: "5432"
+    summary: The port number.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-sqldb
+  name: az ml datastore attach-sqldb
+  summary: Attach an Azure SQL datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-sqldb --database-name
+                                 --name
+                                 --server-name
+                                 [--authority-url]
+                                 [--client-id]
+                                 [--client-secret]
+                                 [--endpoint]
+                                 [--grant-workspace-msi-access]
+                                 [--include-secret]
+                                 [--output-metadata-file]
+                                 [--password]
+                                 [--path]
+                                 [--resource-group]
+                                 [--resource-url]
+                                 [--sql-resource-group]
+                                 [--sql-subscription-id]
+                                 [--subscription-id]
+                                 [--tenant-id]
+                                 [--username]
+                                 [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --database-name -d
+    summary: The database name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The SQL/PostgreSQL/MySQL server name.
+    description: ''
+  optionalParameters:
+  - name: --authority-url
+    defaultValue: https://login.microsoftonline.com
+    summary: Authority url used to authenticate the user.
+    description: ''
+  - name: --client-id
+    summary: The service principal/application ID.
+    description: ''
+  - name: --client-secret
+    summary: The service principal's secret.
+    description: ''
+  - name: --endpoint
+    defaultValue: database.windows.net
+    summary: The endpoint of the sql server. Defaults to database.windows.net.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --password
+    summary: The password of the database user to access the database.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --resource-url
+    defaultValue: https://database.windows.net/
+    summary: Determines what operations will be performed on the database.
+    description: ''
+  - name: --sql-resource-group
+    summary: The resource group of the Azure Sql Server.
+    description: ''
+  - name: --sql-subscription-id
+    summary: The subscription ID of the Azure Sql Server.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tenant-id
+    summary: The service principal Tenant ID.
+    description: ''
+  - name: --username
+    summary: The username of the database user to access the database.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_detach
+  name: az ml datastore detach
+  summary: Detach a datastore by name.
+  description: ''
+  syntax: >-
+    az ml datastore detach --name
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_download
+  name: az ml datastore download
+  summary: Download files from a Datastore.
+  description: ''
+  syntax: >-
+    az ml datastore download --name
+                             --target-path
+                             [--hide-progress]
+                             [--output-metadata-file]
+                             [--overwrite]
+                             [--path]
+                             [--prefix]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --target-path -d
+    summary: Target path for the downloaded files.
+    description: ''
+  optionalParameters:
+  - name: --hide-progress
+    summary: Whether to hide progress of operation.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite target files if they exist.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --prefix -p
+    summary: Path filter for files to download. If none is provided, downloads everything.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_list
+  name: az ml datastore list
+  summary: List datastores in the workspace.
+  description: ''
+  syntax: >-
+    az ml datastore list [--include-secret]
+                         [--output-metadata-file]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+  optionalParameters:
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_set-default
+  name: az ml datastore set-default
+  summary: Set the workspace default datastore by name.
+  description: ''
+  syntax: >-
+    az ml datastore set-default --name
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_show
+  name: az ml datastore show
+  summary: Show a single datastore by name.
+  description: ''
+  syntax: >-
+    az ml datastore show --name
+                         [--include-secret]
+                         [--output-metadata-file]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_show-default
+  name: az ml datastore show-default
+  summary: Show the workspace default datastore.
+  description: ''
+  syntax: >-
+    az ml datastore show-default [--include-secret]
+                                 [--output-metadata-file]
+                                 [--path]
+                                 [--resource-group]
+                                 [--subscription-id]
+                                 [--workspace-name]
+  optionalParameters:
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_upload
+  name: az ml datastore upload
+  summary: Upload files to a Datastore.
+  description: ''
+  syntax: >-
+    az ml datastore upload --name
+                           --src-path
+                           [--hide-progress]
+                           [--output-metadata-file]
+                           [--overwrite]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--target-path]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --src-path -p
+    summary: Path from which to upload data.
+    description: ''
+  optionalParameters:
+  - name: --hide-progress
+    summary: Whether to hide progress of operation.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite target files if they exist.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --target-path -u
+    summary: Path to upload data in the container. Uploads to the root by default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_datastore_attach-adls
+- az_ml(v1)_datastore_attach-adls-gen2
+- az_ml(v1)_datastore_attach-blob
+- az_ml(v1)_datastore_attach-dbfs
+- az_ml(v1)_datastore_attach-file
+- az_ml(v1)_datastore_attach-mysqldb
+- az_ml(v1)_datastore_attach-psqldb
+- az_ml(v1)_datastore_attach-sqldb
+- az_ml(v1)_datastore_detach
+- az_ml(v1)_datastore_download
+- az_ml(v1)_datastore_list
+- az_ml(v1)_datastore_set-default
+- az_ml(v1)_datastore_show
+- az_ml(v1)_datastore_show-default
+- az_ml(v1)_datastore_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for managing and using datastores with the Azure ML Workspace.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/endpoint.yml
new file mode 100644
index 0000000000..0e3a7987d3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/endpoint.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_endpoint
+name: az ml endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage machine learning endpoints.
+description: ''
+commands:
+- az_ml(v1)_endpoint_realtime
+- az_ml(v1)_endpoint_realtime_create-version
+- az_ml(v1)_endpoint_realtime_delete
+- az_ml(v1)_endpoint_realtime_delete-version
+- az_ml(v1)_endpoint_realtime_get-access-token
+- az_ml(v1)_endpoint_realtime_get-keys
+- az_ml(v1)_endpoint_realtime_get-logs
+- az_ml(v1)_endpoint_realtime_list
+- az_ml(v1)_endpoint_realtime_regen-key
+- az_ml(v1)_endpoint_realtime_run
+- az_ml(v1)_endpoint_realtime_show
+- az_ml(v1)_endpoint_realtime_update
+- az_ml(v1)_endpoint_realtime_update-version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage machine learning endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/endpoint/realtime.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/endpoint/realtime.yml
new file mode 100644
index 0000000000..7d0235c4a3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/endpoint/realtime.yml
@@ -0,0 +1,807 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_endpoint_realtime
+name: az ml endpoint realtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml endpoint realtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage operationalized realtime endpoints.
+description: ''
+directCommands:
+- uid: az_ml(v1)_endpoint_realtime_create-version
+  name: az ml endpoint realtime create-version
+  summary: Create a version for realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime create-version --name
+                                           --version-name
+                                           [--add-property]
+                                           [--add-tag]
+                                           [--ar]
+                                           [--as]
+                                           [--at]
+                                           [--autoscale-max-replicas]
+                                           [--autoscale-min-replicas]
+                                           [--cc]
+                                           [--ccl]
+                                           [--cf]
+                                           [--collect-model-data]
+                                           [--cvt]
+                                           [--dc]
+                                           [--description]
+                                           [--ed]
+                                           [--entry-script]
+                                           [--environment-name]
+                                           [--environment-version]
+                                           [--failure-threshold]
+                                           [--gb]
+                                           [--gbl]
+                                           [--gc]
+                                           [--ic]
+                                           [--id]
+                                           [--is-default]
+                                           [--max-request-wait-time]
+                                           [--model]
+                                           [--model-metadata-file]
+                                           [--no-wait]
+                                           [--nr]
+                                           [--path]
+                                           [--period-seconds]
+                                           [--replica-max-concurrent-requests]
+                                           [--resource-group]
+                                           [--scoring-timeout-ms]
+                                           [--sd]
+                                           [--st]
+                                           [--subscription-id]
+                                           [--timeout-seconds]
+                                           [--tp]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name.
+    description: ''
+  - isRequired: true
+    name: --version-name --vn
+    summary: The version name to create in an Endpoint.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --cvt --is-control-version-type
+    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON file containing deployment metadata.
+    description: ''
+  - name: --description -d
+    summary: Description of the service.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --is-default
+    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --tp --traffic-percentile
+    summary: The traffic percentile this version takes in Endpoint.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_delete
+  name: az ml endpoint realtime delete
+  summary: Delete a realtime endpoint and its version from the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime delete --name
+                                   [--path]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_delete-version
+  name: az ml endpoint realtime delete-version
+  summary: Delete a version for realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime delete-version --name
+                                           --version-name
+                                           [--no-wait]
+                                           [--path]
+                                           [--resource-group]
+                                           [--subscription-id]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name.
+    description: ''
+  - isRequired: true
+    name: --version-name --vn
+    summary: The version name to delete.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_get-access-token
+  name: az ml endpoint realtime get-access-token
+  summary: Get a token to issue requests a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime get-access-token --name
+                                             [--path]
+                                             [--resource-group]
+                                             [--subscription-id]
+                                             [--workspace-name]
+                                             [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_get-keys
+  name: az ml endpoint realtime get-keys
+  summary: Get keys to issue requests against a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime get-keys --name
+                                     [--path]
+                                     [--resource-group]
+                                     [--subscription-id]
+                                     [--workspace-name]
+                                     [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_get-logs
+  name: az ml endpoint realtime get-logs
+  summary: Get logs for a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime get-logs --name
+                                     [--init]
+                                     [--num_lines]
+                                     [--path]
+                                     [--resource-group]
+                                     [--subscription-id]
+                                     [--workspace-name]
+                                     [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --init -i
+    summary: Get logs of init container instead of the scoring container.
+    description: ''
+  - name: --num_lines -l
+    defaultValue: "5000"
+    summary: Number of log lines to return from tail (default is 5000).
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_list
+  name: az ml endpoint realtime list
+  summary: List realtime endpoints in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime list [--compute-type]
+                                 [--model-id]
+                                 [--model-name]
+                                 [--path]
+                                 [--property]
+                                 [--resource-group]
+                                 [--subscription-id]
+                                 [--tag]
+                                 [--workspace-name]
+                                 [-v]
+  optionalParameters:
+  - name: --compute-type -c
+    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS', 'AKSENDPOINT').
+    description: ''
+  - name: --model-id
+    summary: If provided, will only show services that have the specified model id.
+    description: ''
+  - name: --model-name
+    summary: If provided, will only show services that have the specified model name.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoints to list.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_regen-key
+  name: az ml endpoint realtime regen-key
+  summary: Regenerate keys for a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime regen-key --key
+                                      --name
+                                      [--path]
+                                      [--resource-group]
+                                      [--set-key]
+                                      [--subscription-id]
+                                      [--workspace-name]
+                                      [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --key -k
+    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --set-key -s
+    summary: Provide auth value for the specified key.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_run
+  name: az ml endpoint realtime run
+  summary: Run a realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime run --name
+                                [--input-data]
+                                [--path]
+                                [--resource-group]
+                                [--subscription-id]
+                                [--workspace-name]
+                                [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name to score against.
+    description: ''
+  optionalParameters:
+  - name: --input-data -d
+    summary: The data to use for calling the endpoint.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to run.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_show
+  name: az ml endpoint realtime show
+  summary: Show details for a realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime show --name
+                                 [--path]
+                                 [--resource-group]
+                                 [--subscription-id]
+                                 [--workspace-name]
+                                 [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint to show.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_update
+  name: az ml endpoint realtime update
+  summary: Update a realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime update --name
+                                   [--add-property]
+                                   [--add-tag]
+                                   [--ae]
+                                   [--ai]
+                                   [--description]
+                                   [--no-wait]
+                                   [--path]
+                                   [--remove-tag]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--token-auth-enabled]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name to update.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ae --auth-enabled
+    summary: Whether or not to enable key auth for this Endpoint. Defaults to False.
+    description: ''
+  - name: --ai --enable-app-insights
+    summary: Whether or not to enable AppInsights for this Endpoint. Defaults to False.
+    description: ''
+  - name: --description -d
+    summary: Description of the endpoint.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --remove-tag
+    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --token-auth-enabled
+    summary: Whether or not to enable token auth for this Endpoint. Defaults to False.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the Endpoint to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_update-version
+  name: az ml endpoint realtime update-version
+  summary: Update a version for realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime update-version --name
+                                           --version-name
+                                           [--add-property]
+                                           [--add-tag]
+                                           [--ar]
+                                           [--as]
+                                           [--at]
+                                           [--autoscale-max-replicas]
+                                           [--autoscale-min-replicas]
+                                           [--cc]
+                                           [--ccl]
+                                           [--cf]
+                                           [--collect-model-data]
+                                           [--cvt]
+                                           [--dc]
+                                           [--description]
+                                           [--ed]
+                                           [--entry-script]
+                                           [--environment-name]
+                                           [--environment-version]
+                                           [--failure-threshold]
+                                           [--gb]
+                                           [--gbl]
+                                           [--gc]
+                                           [--ic]
+                                           [--id]
+                                           [--is-default]
+                                           [--max-request-wait-time]
+                                           [--model]
+                                           [--model-metadata-file]
+                                           [--no-wait]
+                                           [--nr]
+                                           [--path]
+                                           [--period-seconds]
+                                           [--replica-max-concurrent-requests]
+                                           [--resource-group]
+                                           [--scoring-timeout-ms]
+                                           [--sd]
+                                           [--st]
+                                           [--subscription-id]
+                                           [--timeout-seconds]
+                                           [--tp]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name.
+    description: ''
+  - isRequired: true
+    name: --version-name --vn
+    summary: The version name to create in an Endpoint.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --cvt --is-control-version-type
+    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON file containing deployment metadata.
+    description: ''
+  - name: --description -d
+    summary: Description of the service.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --is-default
+    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --tp --traffic-percentile
+    summary: The traffic percentile this version takes in Endpoint.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_endpoint_realtime_create-version
+- az_ml(v1)_endpoint_realtime_delete
+- az_ml(v1)_endpoint_realtime_delete-version
+- az_ml(v1)_endpoint_realtime_get-access-token
+- az_ml(v1)_endpoint_realtime_get-keys
+- az_ml(v1)_endpoint_realtime_get-logs
+- az_ml(v1)_endpoint_realtime_list
+- az_ml(v1)_endpoint_realtime_regen-key
+- az_ml(v1)_endpoint_realtime_run
+- az_ml(v1)_endpoint_realtime_show
+- az_ml(v1)_endpoint_realtime_update
+- az_ml(v1)_endpoint_realtime_update-version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage operationalized realtime endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/environment.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/environment.yml
new file mode 100644
index 0000000000..86781057d2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/environment.yml
@@ -0,0 +1,214 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_environment
+name: az ml environment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml environment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage environments.
+description: ''
+directCommands:
+- uid: az_ml(v1)_environment_download
+  name: az ml environment download
+  summary: Download an environment definition to a specified directory.
+  description: ''
+  syntax: >-
+    az ml environment download --directory
+                               --name
+                               [--output-metadata-file]
+                               [--overwrite]
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--version]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --directory -d
+    summary: Directory for the environment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite any existing destination folder.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_list
+  name: az ml environment list
+  summary: List environments in a workspace.
+  description: ''
+  syntax: >-
+    az ml environment list [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_register
+  name: az ml environment register
+  summary: Register an environment definition from a specified directory.
+  description: ''
+  syntax: >-
+    az ml environment register --directory
+                               [--output-metadata-file]
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --directory -d
+    summary: Directory for the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_scaffold
+  name: az ml environment scaffold
+  summary: Scaffold the files for a default environment definition in the specified directory.
+  description: ''
+  syntax: >-
+    az ml environment scaffold --directory
+                               --name
+                               [--output-metadata-file]
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --directory -d
+    summary: Directory for the environment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_show
+  name: az ml environment show
+  summary: Show an environment by name and optionally version.
+  description: ''
+  syntax: >-
+    az ml environment show --name
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--version]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_environment_download
+- az_ml(v1)_environment_list
+- az_ml(v1)_environment_register
+- az_ml(v1)_environment_scaffold
+- az_ml(v1)_environment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage environments.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/experiment.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/experiment.yml
new file mode 100644
index 0000000000..9b63212389
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/experiment.yml
@@ -0,0 +1,56 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_experiment
+name: az ml experiment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml experiment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage experiments.
+description: ''
+directCommands:
+- uid: az_ml(v1)_experiment_list
+  name: az ml experiment list
+  summary: List experiments in a workspace.
+  description: ''
+  syntax: >-
+    az ml experiment list [--output-metadata-file]
+                          [--path]
+                          [--resource-group]
+                          [--subscription-id]
+                          [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_experiment_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage experiments.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/folder.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/folder.yml
new file mode 100644
index 0000000000..175e64ab66
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/folder.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_folder
+name: az ml folder
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml folder** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Folder subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_folder_attach
+  name: az ml folder attach
+  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
+  description: ''
+  syntax: >-
+    az ml folder attach [--experiment-name]
+                        [--output-metadata-file]
+                        [--path]
+                        [--resource-group]
+                        [--subscription-id]
+                        [--workspace-name]
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_folder_attach
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Folder subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/model.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/model.yml
new file mode 100644
index 0000000000..ef5129652e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/model.yml
@@ -0,0 +1,828 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_model
+name: az ml model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage machine learning models.
+description: ''
+directCommands:
+- uid: az_ml(v1)_model_delete
+  name: az ml model delete
+  summary: Delete a model from the workspace.
+  description: ''
+  syntax: >-
+    az ml model delete --model-id
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --model-id -i
+    summary: ID of model to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_deploy
+  name: az ml model deploy
+  summary: Deploy model(s) from the workspace.
+  description: ''
+  syntax: >-
+    az ml model deploy --name
+                       [--ae]
+                       [--ai]
+                       [--ar]
+                       [--as]
+                       [--at]
+                       [--autoscale-max-replicas]
+                       [--autoscale-min-replicas]
+                       [--base-image]
+                       [--base-image-registry]
+                       [--cc]
+                       [--ccl]
+                       [--cf]
+                       [--collect-model-data]
+                       [--compute-target]
+                       [--compute-type]
+                       [--cuda-version]
+                       [--dc]
+                       [--description]
+                       [--dn]
+                       [--ds]
+                       [--ed]
+                       [--eg]
+                       [--entry-script]
+                       [--environment-name]
+                       [--environment-version]
+                       [--failure-threshold]
+                       [--gb]
+                       [--gbl]
+                       [--gc]
+                       [--ic]
+                       [--id]
+                       [--key-name]
+                       [--key-version]
+                       [--kp]
+                       [--ks]
+                       [--lo]
+                       [--max-request-wait-time]
+                       [--model]
+                       [--model-metadata-file]
+                       [--namespace]
+                       [--no-wait]
+                       [--nr]
+                       [--overwrite]
+                       [--path]
+                       [--period-seconds]
+                       [--pi]
+                       [--po]
+                       [--property]
+                       [--replica-max-concurrent-requests]
+                       [--resource-group]
+                       [--rt]
+                       [--sc]
+                       [--scoring-timeout-ms]
+                       [--sd]
+                       [--se]
+                       [--sk]
+                       [--sp]
+                       [--st]
+                       [--subnet-name]
+                       [--subscription-id]
+                       [--tag]
+                       [--timeout-seconds]
+                       [--token-auth-enabled]
+                       [--tp]
+                       [--vault-base-url]
+                       [--version-name]
+                       [--vnet-name]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the service deployed.
+    description: ''
+  optionalParameters:
+  - name: --ae --auth-enabled
+    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
+    description: ''
+  - name: --ai --enable-app-insights
+    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --base-image --bi
+    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
+    description: ''
+  - name: --base-image-registry --ir
+    summary: Image registry that contains the base image.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --compute-target --ct
+    summary: Name of compute target. Only applicable when deploying to AKS.
+    description: ''
+  - name: --compute-type --cp
+    summary: Compute type of service to deploy.
+    description: ''
+  - name: --cuda-version --cv
+    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON or YAML file containing deployment metadata.
+    description: ''
+  - name: --description
+    summary: Description of the service deployed.
+    description: ''
+  - name: --dn --dns-name-label
+    summary: The dns name for this Webservice.
+    description: ''
+  - name: --ds --extra-docker-file-steps
+    summary: Path to local file containing additional Docker steps to run when setting up image.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --eg --enable-gpu
+    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --key-name
+    summary: Key name for for encryption properties in customer-managed keys (CMK) for ACI.
+    description: ''
+  - name: --key-version
+    summary: Key version for for encryption properties in customer-managed keys (CMK) for ACI.
+    description: ''
+  - name: --kp --primary-key
+    summary: A primary auth key to use for this Webservice.
+    description: ''
+  - name: --ks --secondary-key
+    summary: A secondary auth key to use for this Webservice.
+    description: ''
+  - name: --lo --location
+    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&products=container-instances.'
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --namespace
+    summary: "Kubernetes namespace in which to deploy the service: up to 63 lowercase alphanumeric ('a'-'z', '0'-'9') and hyphen ('-') characters. The first and last characters cannot be hyphens. Only applicable when deploying to AKS."
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite the existing service if name conflicts.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --pi --profile-input
+    summary: Path to a JSON file containing profiling results.
+    description: ''
+  - name: --po --port
+    summary: The local port on which to expose the service's HTTP endpoint.
+    description: ''
+  - name: --property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --rt --runtime
+    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
+    description: ''
+  - name: --sc --ssl-cname
+    summary: The cname for if SSL is enabled.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --se --ssl-enabled
+    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
+    description: ''
+  - name: --sk --ssl-key-pem-file
+    summary: The key file needed if SSL is enabled.
+    description: ''
+  - name: --sp --ssl-cert-pem-file
+    summary: The cert file needed if SSL is enabled.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --token-auth-enabled
+    summary: Whether or not to enable token auth for this Webservice. Ignored if not deploying to AKS. Defaults to False.
+    description: ''
+  - name: --tp --traffic-percentile
+    summary: The amount of traffic the version takes in an endpoint. Can be a decimal. Defaults to 0.
+    description: ''
+  - name: --vault-base-url
+    summary: Vault base url for encryption properties in customer-managed keys (CMK) for ACI.
+    description: ''
+  - name: --version-name --vn
+    summary: The version name in an endpoint. Defaults to endpoint name for the first version.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_download
+  name: az ml model download
+  summary: Download a model from the workspace.
+  description: ''
+  syntax: >-
+    az ml model download --model-id
+                         --target-dir
+                         [--overwrite]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --model-id -i
+    summary: ID of model.
+    description: ''
+  - isRequired: true
+    name: --target-dir -t
+    summary: Target directory to download the model file to.
+    description: ''
+  optionalParameters:
+  - name: --overwrite
+    summary: Overwrite if the same name file exists in target directory.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing model to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_list
+  name: az ml model list
+  summary: List models in the workspace.
+  description: ''
+  syntax: >-
+    az ml model list [--dataset-id]
+                     [--latest]
+                     [--model-name]
+                     [--path]
+                     [--property]
+                     [--resource-group]
+                     [--run-id]
+                     [--subscription-id]
+                     [--tag]
+                     [--workspace-name]
+                     [-v]
+  optionalParameters:
+  - name: --dataset-id
+    summary: If provided, will only show models with the specified dataset ID.
+    description: ''
+  - name: --latest -l
+    summary: If provided, will only return models with the latest version.
+    description: ''
+  - name: --model-name -n
+    summary: An optional model name to filter the list by.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --run-id
+    summary: If provided, will only show models with the specified Run ID.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing models to list.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_package
+  name: az ml model package
+  summary: Package a model in the workspace.
+  description: ''
+  syntax: >-
+    az ml model package [--cf]
+                        [--ed]
+                        [--entry-script]
+                        [--environment-name]
+                        [--environment-version]
+                        [--ic]
+                        [--il]
+                        [--image-name]
+                        [--model]
+                        [--model-metadata-file]
+                        [--no-wait]
+                        [--output-path]
+                        [--path]
+                        [--resource-group]
+                        [--rt]
+                        [--sd]
+                        [--subscription-id]
+                        [--workspace-name]
+                        [-v]
+  optionalParameters:
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the package.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for packaging. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for packaging.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for packaging.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --il --image-label
+    summary: Label to give the built package image.
+    description: ''
+  - name: --image-name --in
+    summary: Name to give the built package image.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be packaged. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --output-path
+    summary: Output path for docker context. If an output path is passed, instead of building an image in the workspace ACR, a dockerfile and the necessary build context will be writen to that path.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --rt --runtime
+    summary: Which runtime to use for package. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_profile
+  name: az ml model profile
+  summary: Profile model(s) in the workspace.
+  description: ''
+  syntax: >-
+    az ml model profile --name
+                        [--base-image]
+                        [--base-image-registry]
+                        [--cc]
+                        [--cf]
+                        [--description]
+                        [--ed]
+                        [--entry-script]
+                        [--environment-name]
+                        [--environment-version]
+                        [--gb]
+                        [--ic]
+                        [--idi]
+                        [--model]
+                        [--model-metadata-file]
+                        [--output-metadata-file]
+                        [--resource-group]
+                        [--sd]
+                        [--subscription-id]
+                        [--workspace-name]
+                        [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the model profile.
+    description: ''
+  optionalParameters:
+  - name: --base-image --bi
+    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
+    description: ''
+  - name: --base-image-registry --ir
+    summary: Image registry that contains the base image.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: Double value for maximum CPU to use when profiling.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --description
+    summary: Description of the model profile.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --gb --memory-in-gb
+    summary: Double value for maximum Memory to use when profiling.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --idi --input-dataset-id
+    summary: ID of the Tabular Dataset to be used as input for the profile.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Path to a JSON file where profile results metadata will be written. Used as input for model deployment.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_register
+  name: az ml model register
+  summary: Register a model to the workspace.
+  description: ''
+  syntax: >-
+    az ml model register --name
+                         [--asset-path]
+                         [--cc]
+                         [--description]
+                         [--experiment-name]
+                         [--gb]
+                         [--gc]
+                         [--model-framework]
+                         [--model-framework-version]
+                         [--model-path]
+                         [--output-metadata-file]
+                         [--path]
+                         [--property]
+                         [--resource-group]
+                         [--run-id]
+                         [--run-metadata-file]
+                         [--sample-input-dataset-id]
+                         [--sample-output-dataset-id]
+                         [--subscription-id]
+                         [--tag]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of model to register.
+    description: ''
+  optionalParameters:
+  - name: --asset-path
+    summary: The cloud path where the experiement run stores the model file.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --description -d
+    summary: Description of the model.
+    description: ''
+  - name: --experiment-name
+    summary: The name of the experiment.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The default number of GPUs to allocate for this model.
+    description: ''
+  - name: --model-framework
+    summary: 'Framework of the model to register. Currently supported frameworks: TensorFlow, ScikitLearn, Onnx, Custom, Multi.'
+    description: ''
+  - name: --model-framework-version
+    summary: Framework version of the model to register (e.g. 1.0.0, 2.4.1).
+    description: ''
+  - name: --model-path -p
+    summary: Full path of the model file to register.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Path to a JSON file where model registration metadata will be written. Used as input for model deployment.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --run-id -r
+    summary: The ID for the experiment run where model is registered from.
+    description: ''
+  - name: --run-metadata-file -f
+    summary: Path to a JSON file containing experiement run metadata.
+    description: ''
+  - name: --sample-input-dataset-id
+    summary: The ID for the sample input dataset.
+    description: ''
+  - name: --sample-output-dataset-id
+    summary: The ID for the sample output dataset.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to register this model with.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_show
+  name: az ml model show
+  summary: Show a model in the workspace.
+  description: ''
+  syntax: >-
+    az ml model show [--model-id]
+                     [--model-name]
+                     [--path]
+                     [--resource-group]
+                     [--run-id]
+                     [--subscription-id]
+                     [--version]
+                     [--workspace-name]
+                     [-v]
+  optionalParameters:
+  - name: --model-id -i
+    summary: ID of model to show.
+    description: ''
+  - name: --model-name -n
+    summary: Name of model to show.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --run-id
+    summary: If provided, will only show models with the specified Run ID.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version
+    summary: If provided, will only show models with the specified name and version.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing model to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_update
+  name: az ml model update
+  summary: Update a model in the workspace.
+  description: ''
+  syntax: >-
+    az ml model update --model-id
+                       [--add-property]
+                       [--add-tag]
+                       [--cc]
+                       [--description]
+                       [--gb]
+                       [--gc]
+                       [--path]
+                       [--remove-tag]
+                       [--resource-group]
+                       [--sample-input-dataset-id]
+                       [--sample-output-dataset-id]
+                       [--subscription-id]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --model-id -i
+    summary: ID of model.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --description
+    summary: Description to update the model with. Will replace the current description.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The default number of GPUs to allocate for this model.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --remove-tag
+    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --sample-input-dataset-id
+    summary: The ID for the sample input dataset.
+    description: ''
+  - name: --sample-output-dataset-id
+    summary: The ID for the sample output dataset.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_model_delete
+- az_ml(v1)_model_deploy
+- az_ml(v1)_model_download
+- az_ml(v1)_model_list
+- az_ml(v1)_model_package
+- az_ml(v1)_model_profile
+- az_ml(v1)_model_register
+- az_ml(v1)_model_show
+- az_ml(v1)_model_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage machine learning models.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/pipeline.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/pipeline.yml
new file mode 100644
index 0000000000..1620169d90
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/pipeline.yml
@@ -0,0 +1,653 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_pipeline
+name: az ml pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Pipeline subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_pipeline_clone
+  name: az ml pipeline clone
+  summary: Generate yml definition describing the pipeline run, supported only for ModuleStep for now.
+  description: ''
+  syntax: >-
+    az ml pipeline clone --path
+                         --pipeline-run-id
+                         [--output-file]
+                         [--resource-group]
+                         [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --path -p
+    summary: File path to save pipeline yaml to.
+    description: ''
+  - isRequired: true
+    name: --pipeline-run-id -i
+    summary: ID of the PipelineRun to clone (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_clone-draft
+  name: az ml pipeline clone-draft
+  summary: Create a pipeline draft from an existing pipeline.
+  description: ''
+  syntax: >-
+    az ml pipeline clone-draft [--experiment-name]
+                               [--pipeline-draft-id]
+                               [--pipeline-id]
+                               [--pipeline-run-id]
+                               [--resource-group]
+                               [--workspace-name]
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name of the specified PipelineRun.
+    description: ''
+  - name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to create PipelineDraft from.
+    description: ''
+  - name: --pipeline-id -p
+    summary: ID of the PublishedPipeline to create PipelineDraft from.
+    description: ''
+  - name: --pipeline-run-id -r
+    summary: ID of the PipelineRun to create PipelineDraft from.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_create
+  name: az ml pipeline create
+  summary: Create a pipeline from a yaml definition.
+  description: ''
+  syntax: >-
+    az ml pipeline create --name
+                          --pipeline-yaml
+                          [--continue]
+                          [--description]
+                          [--output-file]
+                          [--resource-group]
+                          [--version]
+                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name to assign to the pipeline.
+    description: ''
+  - isRequired: true
+    name: --pipeline-yaml -y
+    summary: YAML file which defines a pipeline.
+    description: ''
+  optionalParameters:
+  - name: --continue -c
+    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
+    description: ''
+  - name: --description -d
+    summary: Description text of the pipeline.
+    description: ''
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --version -v
+    summary: Version string of the pipeline.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_create-draft
+  name: az ml pipeline create-draft
+  summary: Create a pipeline draft from a yml definition.
+  description: ''
+  syntax: >-
+    az ml pipeline create-draft --experiment_name
+                                --name
+                                --pipeline-yaml
+                                [--continue]
+                                [--description]
+                                [--parameters]
+                                [--properties]
+                                [--resource-group]
+                                [--tags]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --experiment_name -e
+    summary: Experiment name for the pipeline draft.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name to assign to the pipeline draft.
+    description: ''
+  - isRequired: true
+    name: --pipeline-yaml -y
+    summary: YAML file which defines the pipeline draft.
+    description: ''
+  optionalParameters:
+  - name: --continue -c
+    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
+    description: ''
+  - name: --description -d
+    summary: Description text of the pipeline draft.
+    description: ''
+  - name: --parameters
+    summary: PipelineParameters for the draft with 'key=value' syntax.
+    description: ''
+  - name: --properties -p
+    summary: Properties for the draft with 'key=value' syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --tags -t
+    summary: Tags for the draft with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_create-schedule
+  name: az ml pipeline create-schedule
+  summary: Create a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline create-schedule --experiment-name
+                                   --name
+                                   --pipeline-id
+                                   [--resource-group]
+                                   [--schedule-yaml]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name -e
+    summary: Name of experiment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of schedule.
+    description: ''
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to create schedule (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --schedule-yaml -y
+    summary: Schedule  YAML input.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_delete-draft
+  name: az ml pipeline delete-draft
+  summary: Delete a pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline delete-draft --pipeline-draft-id
+                                [--resource-group]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to delete (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_disable
+  name: az ml pipeline disable
+  summary: Disable a pipeline from running.
+  description: ''
+  syntax: >-
+    az ml pipeline disable --pipeline-id
+                           [--output-file]
+                           [--resource-group]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to disable (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_disable-schedule
+  name: az ml pipeline disable-schedule
+  summary: Disable a schedule from running.
+  description: ''
+  syntax: >-
+    az ml pipeline disable-schedule --schedule-id
+                                    [--resource-group]
+                                    [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_enable
+  name: az ml pipeline enable
+  summary: Enable a pipeline and allow it to run.
+  description: ''
+  syntax: >-
+    az ml pipeline enable --pipeline-id
+                          [--output-file]
+                          [--resource-group]
+                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to enable (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_enable-schedule
+  name: az ml pipeline enable-schedule
+  summary: Enable a schedule and allow it to run.
+  description: ''
+  syntax: >-
+    az ml pipeline enable-schedule --schedule-id
+                                   [--resource-group]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_get
+  name: az ml pipeline get
+  summary: Generate yml definition describing the pipeline.
+  description: ''
+  syntax: >-
+    az ml pipeline get --path
+                       [--pipeline-draft-id]
+                       [--pipeline-id]
+                       [--resource-group]
+                       [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --path -p
+    summary: File path to save Pipeline yaml to.
+    description: ''
+  optionalParameters:
+  - name: --pipeline-draft-id -d
+    summary: ID of the PipelineDraft to get (guid).
+    description: ''
+  - name: --pipeline-id -i
+    summary: ID of the Pipeline to get (guid).
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_last-pipeline-run
+  name: az ml pipeline last-pipeline-run
+  summary: Show last pipeline run for a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline last-pipeline-run --schedule-id
+                                     [--resource-group]
+                                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_list
+  name: az ml pipeline list
+  summary: List all pipelines and respective schedules in the workspace.
+  description: ''
+  syntax: >-
+    az ml pipeline list [--output-file]
+                        [--resource-group]
+                        [--workspace-name]
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_list-drafts
+  name: az ml pipeline list-drafts
+  summary: List pipeline drafts in the workspace.
+  description: ''
+  syntax: >-
+    az ml pipeline list-drafts [--resource-group]
+                               [--tags]
+                               [--workspace-name]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --tags -t
+    summary: Tags for a draft with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_list-steps
+  name: az ml pipeline list-steps
+  summary: List the step runs generated from a pipeline run.
+  description: ''
+  syntax: >-
+    az ml pipeline list-steps --run
+                              [--output-file]
+                              [--resource-group]
+                              [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_pipeline-runs-list
+  name: az ml pipeline pipeline-runs-list
+  summary: List pipeline runs generated from a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline pipeline-runs-list --schedule-id
+                                      [--resource-group]
+                                      [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_publish-draft
+  name: az ml pipeline publish-draft
+  summary: Publish a pipeline draft as a published pipeline.
+  description: ''
+  syntax: >-
+    az ml pipeline publish-draft --pipeline-draft-id
+                                 [--resource-group]
+                                 [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to publish.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_show
+  name: az ml pipeline show
+  summary: Show details of a pipeline and respective schedules.
+  description: ''
+  syntax: >-
+    az ml pipeline show --pipeline-id
+                        [--output-file]
+                        [--resource-group]
+                        [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_show-draft
+  name: az ml pipeline show-draft
+  summary: Show details of a pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline show-draft --pipeline-draft-id
+                              [--resource-group]
+                              [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_show-schedule
+  name: az ml pipeline show-schedule
+  summary: Show details of a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline show-schedule --schedule-id
+                                 [--resource-group]
+                                 [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_submit-draft
+  name: az ml pipeline submit-draft
+  summary: Submit a run from the pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline submit-draft --pipeline-draft-id
+                                [--resource-group]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to use to submit run.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_update-draft
+  name: az ml pipeline update-draft
+  summary: Update a pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline update-draft [--continue]
+                                [--description]
+                                [--experiment_name]
+                                [--name]
+                                [--parameters]
+                                [--pipeline-draft-id]
+                                [--pipeline-yaml]
+                                [--resource-group]
+                                [--tags]
+                                [--workspace-name]
+  optionalParameters:
+  - name: --continue -c
+    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
+    description: ''
+  - name: --description -d
+    summary: Description text of the pipeline draft.
+    description: ''
+  - name: --experiment_name -e
+    summary: Experiment name for the pipeline draft.
+    description: ''
+  - name: --name -n
+    summary: Name to assign to the pipeline draft.
+    description: ''
+  - name: --parameters
+    summary: PipelineParameters for the draft with 'key=value' syntax.
+    description: ''
+  - name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to update.
+    description: ''
+  - name: --pipeline-yaml -y
+    summary: YAML file which defines the pipeline draft.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --tags -t
+    summary: Tags for the draft with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_update-schedule
+  name: az ml pipeline update-schedule
+  summary: Update a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline update-schedule --schedule-id
+                                   [--name]
+                                   [--resource-group]
+                                   [--schedule-yaml]
+                                   [--status]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the schedule to show (guid).
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --schedule-yaml -y
+    summary: Schedule  YAML input.
+    description: ''
+  - name: --status -t
+    summary: Status of the schedule to show (guid).
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_pipeline_clone
+- az_ml(v1)_pipeline_clone-draft
+- az_ml(v1)_pipeline_create
+- az_ml(v1)_pipeline_create-draft
+- az_ml(v1)_pipeline_create-schedule
+- az_ml(v1)_pipeline_delete-draft
+- az_ml(v1)_pipeline_disable
+- az_ml(v1)_pipeline_disable-schedule
+- az_ml(v1)_pipeline_enable
+- az_ml(v1)_pipeline_enable-schedule
+- az_ml(v1)_pipeline_get
+- az_ml(v1)_pipeline_last-pipeline-run
+- az_ml(v1)_pipeline_list
+- az_ml(v1)_pipeline_list-drafts
+- az_ml(v1)_pipeline_list-steps
+- az_ml(v1)_pipeline_pipeline-runs-list
+- az_ml(v1)_pipeline_publish-draft
+- az_ml(v1)_pipeline_show
+- az_ml(v1)_pipeline_show-draft
+- az_ml(v1)_pipeline_show-schedule
+- az_ml(v1)_pipeline_submit-draft
+- az_ml(v1)_pipeline_update-draft
+- az_ml(v1)_pipeline_update-schedule
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Pipeline subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/run.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/run.yml
new file mode 100644
index 0000000000..464f131854
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/run.yml
@@ -0,0 +1,501 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_run
+name: az ml run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for submitting, updating, and monitoring runs.
+description: ''
+directCommands:
+- uid: az_ml(v1)_run_cancel
+  name: az ml run cancel
+  summary: Cancel run.
+  description: ''
+  syntax: >-
+    az ml run cancel --run
+                     [--experiment-name]
+                     [--output-metadata-file]
+                     [--path]
+                     [--resource-group]
+                     [--subscription-id]
+                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_download-logs
+  name: az ml run download-logs
+  summary: Download log files.
+  description: ''
+  syntax: >-
+    az ml run download-logs --output-dir
+                            --run
+                            [--experiment-name]
+                            [--output-metadata-file]
+                            [--path]
+                            [--resource-group]
+                            [--subscription-id]
+                            [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --output-dir -d
+    summary: Output directory to download log files to.
+    description: ''
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_list
+  name: az ml run list
+  summary: List runs.
+  description: ''
+  syntax: >-
+    az ml run list [--compute-target-name]
+                   [--experiment-name]
+                   [--last]
+                   [--minimal]
+                   [--output-metadata-file]
+                   [--parent-run-id]
+                   [--path]
+                   [--pipeline-run-id]
+                   [--resource-group]
+                   [--status {Completed, Failed, Finalizing, Preparing, Provisioning, Queued, Running, Starting}]
+                   [--subscription-id]
+                   [--tags]
+                   [--workspace-name]
+  optionalParameters:
+  - name: --compute-target-name
+    summary: The compute target name.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --last
+    defaultValue: "10"
+    summary: Fetch the latest N elements.
+    description: ''
+  - name: --minimal
+    summary: Flag to provide minimum properties for run output.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --parent-run-id
+    summary: Parent Run ID.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --pipeline-run-id
+    summary: Pipeline Run ID.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --status
+    parameterValueGroup: Completed, Failed, Finalizing, Preparing, Provisioning, Queued, Running, Starting
+    summary: Status of the run.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tags
+    summary: Tags for a run with 'key[=value]' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_monitor-logs
+  name: az ml run monitor-logs
+  summary: Monitor the logs for an existing run.
+  description: ''
+  syntax: >-
+    az ml run monitor-logs --run
+                           [--experiment-name]
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_monitor-tensorboard
+  name: az ml run monitor-tensorboard
+  summary: Monitor an existing run using tensorboard.
+  description: ''
+  syntax: >-
+    az ml run monitor-tensorboard --run
+                                  [--experiment-name]
+                                  [--local-directory]
+                                  [--output-metadata-file]
+                                  [--path]
+                                  [--resource-group]
+                                  [--subscription-id]
+                                  [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --local-directory
+    summary: Local Directory to stage tensorboard files being monitored.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_show
+  name: az ml run show
+  summary: Show run.
+  description: ''
+  syntax: >-
+    az ml run show --run
+                   [--experiment-name]
+                   [--output-metadata-file]
+                   [--path]
+                   [--resource-group]
+                   [--subscription-id]
+                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_submit-hyperdrive
+  name: az ml run submit-hyperdrive
+  summary: Submit a hyper parameter sweep using run config.
+  description: ''
+  syntax: >-
+    az ml run submit-hyperdrive --hyperdrive-configuration-name
+                                [--async]
+                                [--conda-dependencies]
+                                [--ct]
+                                [--experiment-name]
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--run-configuration-name]
+                                [--source-directory]
+                                [--subscription-id]
+                                [--workspace-name]
+                                [<USER_SCRIPT_AND_ARGUMENTS>]
+  requiredParameters:
+  - isRequired: true
+    name: --hyperdrive-configuration-name
+    summary: The full name of the hyperdrive configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
+    description: ''
+  optionalParameters:
+  - name: --async
+    summary: Disable output streaming.
+    description: ''
+  - name: --conda-dependencies -d
+    summary: Override the default Conda dependencies file.
+    description: ''
+  - name: --ct --target
+    summary: The name of the compute target to use for the run.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --run-configuration-name -c
+    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
+    description: ''
+  - name: --source-directory
+    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+  - name: <USER_SCRIPT_AND_ARGUMENTS>
+    summary: The run submit arguments, like script name and script arguments.
+    description: ''
+- uid: az_ml(v1)_run_submit-pipeline
+  name: az ml run submit-pipeline
+  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
+  description: ''
+  syntax: >-
+    az ml run submit-pipeline [--datapaths]
+                              [--experiment-name]
+                              [--output-metadata-file]
+                              [--output_file]
+                              [--parameters]
+                              [--path]
+                              [--pipeline-id]
+                              [--pipeline-yaml]
+                              [--resource-group]
+                              [--subscription-id]
+                              [--workspace-name]
+  optionalParameters:
+  - name: --datapaths -d
+    summary: Comma-separated list of name=datastore/path pairs for datapath parameter assignments.
+    description: ''
+  - name: --experiment-name -n
+    summary: Experiment name for run submission. If unspecified, use the pipeline name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --output_file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --parameters -p
+    summary: Comma-separated list of name=value pairs for pipeline parameter assignments.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --pipeline-id -i
+    summary: ID of a pipeline to submit (guid).
+    description: ''
+  - name: --pipeline-yaml -y
+    summary: YAML file which defines a pipeline.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_submit-script
+  name: az ml run submit-script
+  summary: Submit a script for execution.
+  description: ''
+  syntax: >-
+    az ml run submit-script [--async]
+                            [--conda-dependencies]
+                            [--ct]
+                            [--experiment-name]
+                            [--output-metadata-file]
+                            [--path]
+                            [--resource-group]
+                            [--run-configuration-name]
+                            [--source-directory]
+                            [--subscription-id]
+                            [--workspace-name]
+                            [<USER_SCRIPT_AND_ARGUMENTS>]
+  optionalParameters:
+  - name: --async
+    summary: Disable output streaming.
+    description: ''
+  - name: --conda-dependencies -d
+    summary: Override the default Conda dependencies file.
+    description: ''
+  - name: --ct --target
+    summary: The name of the compute target to use for the run.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --run-configuration-name -c
+    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
+    description: ''
+  - name: --source-directory
+    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+  - name: <USER_SCRIPT_AND_ARGUMENTS>
+    summary: The run submit arguments, like script name and script arguments.
+    description: ''
+- uid: az_ml(v1)_run_update
+  name: az ml run update
+  summary: Update the run by adding tags.
+  description: ''
+  syntax: >-
+    az ml run update --run
+                     [--add-tag]
+                     [--experiment-name]
+                     [--output-metadata-file]
+                     [--path]
+                     [--resource-group]
+                     [--subscription-id]
+                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --add-tag
+    summary: Tag the entitiy with 'key[=value]' syntax.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_run_cancel
+- az_ml(v1)_run_download-logs
+- az_ml(v1)_run_list
+- az_ml(v1)_run_monitor-logs
+- az_ml(v1)_run_monitor-tensorboard
+- az_ml(v1)_run_show
+- az_ml(v1)_run_submit-hyperdrive
+- az_ml(v1)_run_submit-pipeline
+- az_ml(v1)_run_submit-script
+- az_ml(v1)_run_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for submitting, updating, and monitoring runs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/service.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/service.yml
new file mode 100644
index 0000000000..6611a0c030
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/service.yml
@@ -0,0 +1,577 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_service
+name: az ml service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage operationalized services.
+description: ''
+directCommands:
+- uid: az_ml(v1)_service_delete
+  name: az ml service delete
+  summary: Delete a service from the workspace.
+  description: ''
+  syntax: >-
+    az ml service delete --name
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The service name to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_get-access-token
+  name: az ml service get-access-token
+  summary: Get a token to issue requests a service.
+  description: ''
+  syntax: >-
+    az ml service get-access-token --name
+                                   [--path]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_get-keys
+  name: az ml service get-keys
+  summary: Get keys to issue requests against a service.
+  description: ''
+  syntax: >-
+    az ml service get-keys --name
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_get-logs
+  name: az ml service get-logs
+  summary: Get logs for a service.
+  description: ''
+  syntax: >-
+    az ml service get-logs --name
+                           [--init]
+                           [--num_lines]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --init -i
+    summary: Get logs of init container instead of the scoring container.
+    description: ''
+  - name: --num_lines -l
+    defaultValue: "5000"
+    summary: Number of log lines to return from tail (default is 5000).
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_list
+  name: az ml service list
+  summary: List services in the workspace.
+  description: ''
+  syntax: >-
+    az ml service list [--compute-type]
+                       [--image-digest]
+                       [--model-id]
+                       [--model-name]
+                       [--path]
+                       [--property]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--tag]
+                       [--workspace-name]
+                       [-v]
+  optionalParameters:
+  - name: --compute-type -c
+    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS').
+    description: ''
+  - name: --image-digest
+    summary: If provided, will only show services that have the specified image digest.
+    description: ''
+  - name: --model-id
+    summary: If provided, will only show services that have the specified model id.
+    description: ''
+  - name: --model-name
+    summary: If provided, will only show services that have the specified model name.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the services to list.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_regen-key
+  name: az ml service regen-key
+  summary: Regenerate keys for a service.
+  description: ''
+  syntax: >-
+    az ml service regen-key --key
+                            --name
+                            [--path]
+                            [--resource-group]
+                            [--set-key]
+                            [--subscription-id]
+                            [--workspace-name]
+                            [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --key -k
+    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --set-key -s
+    summary: Provide auth value for the specified key.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_run
+  name: az ml service run
+  summary: Run a service in the workspace.
+  description: ''
+  syntax: >-
+    az ml service run --name
+                      [--input-data]
+                      [--path]
+                      [--resource-group]
+                      [--subscription-id]
+                      [--workspace-name]
+                      [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The service name to score against.
+    description: ''
+  optionalParameters:
+  - name: --input-data -d
+    summary: The data to use for calling the web service.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to run.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_show
+  name: az ml service show
+  summary: Show details for a service in the workspace.
+  description: ''
+  syntax: >-
+    az ml service show --name
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webservice to show.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_update
+  name: az ml service update
+  summary: Update a service in the workspace.
+  description: ''
+  syntax: >-
+    az ml service update --name
+                         [--add-property]
+                         [--add-tag]
+                         [--ae]
+                         [--ai]
+                         [--ar]
+                         [--as]
+                         [--at]
+                         [--autoscale-max-replicas]
+                         [--autoscale-min-replicas]
+                         [--base-image]
+                         [--base-image-registry]
+                         [--cc]
+                         [--ccl]
+                         [--cf]
+                         [--collect-model-data]
+                         [--cuda-version]
+                         [--dc]
+                         [--description]
+                         [--dn]
+                         [--ds]
+                         [--ed]
+                         [--eg]
+                         [--entry-script]
+                         [--environment-name]
+                         [--environment-version]
+                         [--failure-threshold]
+                         [--gb]
+                         [--gbl]
+                         [--gc]
+                         [--ic]
+                         [--id]
+                         [--kp]
+                         [--ks]
+                         [--lo]
+                         [--max-request-wait-time]
+                         [--model]
+                         [--model-metadata-file]
+                         [--no-wait]
+                         [--nr]
+                         [--path]
+                         [--period-seconds]
+                         [--po]
+                         [--remove-tag]
+                         [--replica-max-concurrent-requests]
+                         [--resource-group]
+                         [--rt]
+                         [--sc]
+                         [--scoring-timeout-ms]
+                         [--sd]
+                         [--se]
+                         [--sk]
+                         [--sp]
+                         [--st]
+                         [--subscription-id]
+                         [--timeout-seconds]
+                         [--token-auth-enabled]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The service name to update.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ae --auth-enabled
+    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
+    description: ''
+  - name: --ai --enable-app-insights
+    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --base-image --bi
+    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
+    description: ''
+  - name: --base-image-registry --ir
+    summary: Image registry that contains the base image.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --cuda-version --cv
+    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON file containing deployment metadata.
+    description: ''
+  - name: --description -d
+    summary: Description of the service.
+    description: ''
+  - name: --dn --dns-name-label
+    summary: The dns name for this Webservice.
+    description: ''
+  - name: --ds --extra-docker-file-steps
+    summary: Path to local file containing additional Docker steps to run when setting up image.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --eg --enable-gpu
+    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --kp --primary-key
+    summary: A primary auth key to use for this Webservice.
+    description: ''
+  - name: --ks --secondary-key
+    summary: A secondary auth key to use for this Webservice.
+    description: ''
+  - name: --lo --location
+    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&products=container-instances.'
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --po --port
+    summary: The local port on which to expose the service's HTTP endpoint.
+    description: ''
+  - name: --remove-tag
+    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --rt --runtime
+    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
+    description: ''
+  - name: --sc --ssl-cname
+    summary: The cname for if SSL is enabled. Only applicable when updating an ACI service.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --se --ssl-enabled
+    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
+    description: ''
+  - name: --sk --ssl-key-pem-file
+    summary: The key file needed if SSL is enabled.
+    description: ''
+  - name: --sp --ssl-cert-pem-file
+    summary: The cert file needed if SSL is enabled.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --token-auth-enabled
+    summary: Whether or not to enable token auth for this Webservice. Only available for AKS web services. Defaults to False.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_service_delete
+- az_ml(v1)_service_get-access-token
+- az_ml(v1)_service_get-keys
+- az_ml(v1)_service_get-logs
+- az_ml(v1)_service_list
+- az_ml(v1)_service_regen-key
+- az_ml(v1)_service_run
+- az_ml(v1)_service_show
+- az_ml(v1)_service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage operationalized services.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/workspace.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/workspace.yml
new file mode 100644
index 0000000000..41b5900f47
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/workspace.yml
@@ -0,0 +1,401 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_workspace
+name: az ml workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Workspace subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_workspace_create
+  name: az ml workspace create
+  summary: Create a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace create --workspace-name
+                           [--adb-workspace]
+                           [--application-insights]
+                           [--cmk-keyvault]
+                           [--container-registry]
+                           [--exist-ok]
+                           [--friendly-name]
+                           [--hbi-workspace]
+                           [--keyvault]
+                           [--location]
+                           [--pe-auto-approval]
+                           [--pe-name]
+                           [--pe-resource-group]
+                           [--pe-subnet-name]
+                           [--pe-subscription-id]
+                           [--pe-vnet-name]
+                           [--primary-user-assigned-identity]
+                           [--resource-cmk-uri]
+                           [--resource-group]
+                           [--sku]
+                           [--storage-account]
+                           [--system_datastores_auth_mode]
+                           [--tags]
+                           [--user-assigned-identity-for-cmk-encryption]
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+  optionalParameters:
+  - name: --adb-workspace
+    summary: Adb Workspace to be linked with this workspace.
+    description: ''
+  - name: --application-insights
+    summary: Application Insights to be associated with this workspace.
+    description: ''
+  - name: --cmk-keyvault
+    summary: The key vault containing the customer managed key in the Azure resource ID format.
+    description: ''
+  - name: --container-registry
+    summary: Container Registry to be associated with this workspace.
+    description: ''
+  - name: --exist-ok
+    summary: Do not fail if workspace exists.
+    description: ''
+  - name: --friendly-name -f
+    summary: Friendly name for this workspace.
+    description: ''
+  - name: --hbi-workspace
+    summary: Specifies whether the customer data is of High Business Impact(HBI), i.e., contains sensitive business information.
+    description: ''
+  - name: --keyvault
+    summary: Key Vault to be associated with this workspace.
+    description: ''
+  - name: --location -l
+    summary: Location for resource.
+    description: ''
+  - name: --pe-auto-approval
+    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
+    description: ''
+  - name: --pe-name
+    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
+    description: ''
+  - name: --pe-resource-group
+    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
+    description: ''
+  - name: --pe-subnet-name
+    defaultValue: default
+    summary: Name of the existing subnet to create the workspace private endpoint in.
+    description: ''
+  - name: --pe-subscription-id
+    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
+    description: ''
+  - name: --pe-vnet-name
+    summary: Name of the existing vnet to create the workspace private endpoint in.
+    description: ''
+  - name: --primary-user-assigned-identity
+    summary: The resourceId of the user assigned identity that used to represent workspace identity.
+    description: ''
+  - name: --resource-cmk-uri
+    summary: The key URI of the customer managed key to encrypt the data at rest.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --sku
+    defaultValue: basic
+    summary: SKU/edition of a workspace -can be a 'basic' workspace or a feature rich 'enterprise' workspace.
+    description: ''
+  - name: --storage-account
+    summary: Storage account to be associated with this workspace.
+    description: ''
+  - name: --system_datastores_auth_mode
+    defaultValue: accessKey
+    summary: Determines whether or not to use credentials for the system datastores of the workspace                'workspaceblobstore' and 'workspacefilestore'. The default value is 'accessKey', in which case,                the workspace will create the system datastores with credentials.  If set to 'identity',                the workspace will create the system datastores with no credentials.
+    description: ''
+  - name: --tags -t
+    summary: Tags associated with this workspace with 'key=value' syntax.
+    description: ''
+  - name: --user-assigned-identity-for-cmk-encryption
+    summary: The resourceId of the user assigned identity that needs to be used to access the encryption key.
+    description: ''
+  - name: --yes -y
+    summary: Create a resource group for this workspace.
+    description: ''
+- uid: az_ml(v1)_workspace_delete
+  name: az ml workspace delete
+  summary: Delete a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace delete [--all-resources]
+                           [--no-wait]
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --all-resources
+    summary: Deletes resources which this workspace depends on like storage, acr, kv and app insights.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the workspace deletion to complete.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_list
+  name: az ml workspace list
+  summary: List workspaces.
+  description: ''
+  syntax: az ml workspace list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+- uid: az_ml(v1)_workspace_list-keys
+  name: az ml workspace list-keys
+  summary: List workspace keys for dependent resources such as storage, acr, and app insights.
+  description: ''
+  syntax: >-
+    az ml workspace list-keys [--output-metadata-file]
+                              [--path]
+                              [--resource-group]
+                              [--subscription-id]
+                              [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_share
+  name: az ml workspace share
+  summary: Share a workspace with another user with a given role.
+  description: ''
+  syntax: >-
+    az ml workspace share --role
+                          --user
+                          [--output-metadata-file]
+                          [--path]
+                          [--resource-group]
+                          [--subscription-id]
+                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --role
+    summary: Role to assign to this user.
+    description: ''
+  - isRequired: true
+    name: --user
+    summary: User with whom to share this workspace.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_show
+  name: az ml workspace show
+  summary: Show a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace show [--output-metadata-file]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_sync-keys
+  name: az ml workspace sync-keys
+  summary: Sync workspace keys for dependent resources such as storage, acr, and app insights.
+  description: ''
+  syntax: >-
+    az ml workspace sync-keys [--output-metadata-file]
+                              [--path]
+                              [--resource-group]
+                              [--subscription-id]
+                              [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_update
+  name: az ml workspace update
+  summary: Update a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace update [--allow-public-access]
+                           [--description]
+                           [--friendly-name]
+                           [--image-build-compute]
+                           [--output-metadata-file]
+                           [--path]
+                           [--primary-user-assigned-identity]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--tags]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --allow-public-access
+    summary: Allow public access to private link workspace.
+    description: ''
+  - name: --description -d
+    summary: Description of this workspace.
+    description: ''
+  - name: --friendly-name -f
+    summary: Friendly name.
+    description: ''
+  - name: --image-build-compute
+    summary: Compute target for image build.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --primary-user-assigned-identity
+    summary: The resourceId of the user assigned identity that used to represent workspace identity.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tags
+    summary: Tags associated with this workspace with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_update-dependencies
+  name: az ml workspace update-dependencies
+  summary: Update workspace dependent resources.
+  description: ''
+  syntax: >-
+    az ml workspace update-dependencies [--acr]
+                                        [--force]
+                                        [--output-metadata-file]
+                                        [--path]
+                                        [--resource-group]
+                                        [--subscription-id]
+                                        [--workspace-name]
+  optionalParameters:
+  - name: --acr
+    summary: The arm id of the container registry that you want to update this workspace with.
+    description: ''
+  - name: --force
+    summary: Force update dependent resources without user's confirmation.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_workspace_create
+- az_ml(v1)_workspace_delete
+- az_ml(v1)_workspace_list
+- az_ml(v1)_workspace_list-keys
+- az_ml(v1)_workspace_private-endpoint
+- az_ml(v1)_workspace_private-endpoint_add
+- az_ml(v1)_workspace_private-endpoint_delete
+- az_ml(v1)_workspace_private-endpoint_list
+- az_ml(v1)_workspace_share
+- az_ml(v1)_workspace_show
+- az_ml(v1)_workspace_sync-keys
+- az_ml(v1)_workspace_update
+- az_ml(v1)_workspace_update-dependencies
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Workspace subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml(v1)/workspace/private-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ml(v1)/workspace/private-endpoint.yml
new file mode 100644
index 0000000000..e729238b49
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml(v1)/workspace/private-endpoint.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_workspace_private-endpoint
+name: az ml workspace private-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml workspace private-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Workspace private endpoint subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_workspace_private-endpoint_add
+  name: az ml workspace private-endpoint add
+  summary: Add private endpoint to a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace private-endpoint add [--output-metadata-file]
+                                         [--path]
+                                         [--pe-auto-approval]
+                                         [--pe-location]
+                                         [--pe-name]
+                                         [--pe-resource-group]
+                                         [--pe-subnet-name]
+                                         [--pe-subscription-id]
+                                         [--pe-vnet-name]
+                                         [--resource-group]
+                                         [--subscription-id]
+                                         [--tags]
+                                         [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --pe-auto-approval
+    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
+    description: ''
+  - name: --pe-location
+    summary: Location of the workspace private endpoint. If not specified it will be the same location of the workspace.
+    description: ''
+  - name: --pe-name
+    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
+    description: ''
+  - name: --pe-resource-group
+    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
+    description: ''
+  - name: --pe-subnet-name
+    defaultValue: default
+    summary: Name of the existing subnet to create the workspace private endpoint in.
+    description: ''
+  - name: --pe-subscription-id
+    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
+    description: ''
+  - name: --pe-vnet-name
+    summary: Name of the existing vnet to create the workspace private endpoint in.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tags
+    summary: Tags associated with this private endpoint with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_private-endpoint_delete
+  name: az ml workspace private-endpoint delete
+  summary: Delete the specified private endpoint Connection in the workspace.
+  description: ''
+  syntax: >-
+    az ml workspace private-endpoint delete [--output-metadata-file]
+                                            [--pe-connection-name]
+                                            [--resource-group]
+                                            [--subscription-id]
+                                            [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --pe-connection-name
+    summary: The name of the Private EndPoint Connection.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_private-endpoint_list
+  name: az ml workspace private-endpoint list
+  summary: List all private endpoints in a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace private-endpoint list [--output-metadata-file]
+                                          [--path]
+                                          [--resource-group]
+                                          [--subscription-id]
+                                          [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_workspace_private-endpoint_add
+- az_ml(v1)_workspace_private-endpoint_delete
+- az_ml(v1)_workspace_private-endpoint_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Workspace private endpoint subgroup commands.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml.yml b/2017-03-09-profile/docs-ref-autogen/ml.yml
new file mode 100644
index 0000000000..2d92021a09
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml
+name: az ml
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_ml_code
+- az_ml_code_show
+- az_ml_compute
+- az_ml_compute_attach
+- az_ml_compute_create
+- az_ml_compute_delete
+- az_ml_compute_detach
+- az_ml_compute_list
+- az_ml_compute_list-sizes
+- az_ml_compute_list-usage
+- az_ml_compute_restart
+- az_ml_compute_show
+- az_ml_compute_start
+- az_ml_compute_stop
+- az_ml_compute_update
+- az_ml_data
+- az_ml_data_create
+- az_ml_data_delete
+- az_ml_data_list
+- az_ml_data_show
+- az_ml_data_update
+- az_ml_datastore
+- az_ml_datastore_create
+- az_ml_datastore_delete
+- az_ml_datastore_list
+- az_ml_datastore_show
+- az_ml_datastore_update
+- az_ml_endpoint
+- az_ml_endpoint_create
+- az_ml_endpoint_delete
+- az_ml_endpoint_get-credentials
+- az_ml_endpoint_get-logs
+- az_ml_endpoint_invoke
+- az_ml_endpoint_list
+- az_ml_endpoint_list-jobs
+- az_ml_endpoint_regenerate-keys
+- az_ml_endpoint_show
+- az_ml_endpoint_update
+- az_ml_environment
+- az_ml_environment_create
+- az_ml_environment_delete
+- az_ml_environment_list
+- az_ml_environment_show
+- az_ml_environment_update
+- az_ml_job
+- az_ml_job_cancel
+- az_ml_job_create
+- az_ml_job_download
+- az_ml_job_list
+- az_ml_job_show
+- az_ml_job_stream
+- az_ml_job_update
+- az_ml_model
+- az_ml_model_create
+- az_ml_model_delete
+- az_ml_model_list
+- az_ml_model_show
+- az_ml_model_update
+- az_ml_workspace
+- az_ml_workspace_create
+- az_ml_workspace_delete
+- az_ml_workspace_list
+- az_ml_workspace_list-keys
+- az_ml_workspace_show
+- az_ml_workspace_sync-keys
+- az_ml_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/code.yml b/2017-03-09-profile/docs-ref-autogen/ml/code.yml
new file mode 100644
index 0000000000..aefc9ad532
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/code.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_code
+name: az ml code
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml code** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML code assets.
+description: ''
+directCommands:
+- uid: az_ml_code_show
+  name: az ml code show
+  summary: Show details for a code asset.
+  description: ''
+  syntax: >-
+    az ml code show --name
+                    --resource-group
+                    --version
+                    --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the code asset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the code asset.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+commands:
+- az_ml_code_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure ML code assets.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/compute.yml b/2017-03-09-profile/docs-ref-autogen/ml/compute.yml
new file mode 100644
index 0000000000..8ef8793758
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/compute.yml
@@ -0,0 +1,481 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_compute
+name: az ml compute
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml compute** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML compute resources.
+description: Azure ML compute targets are designated compute resources where you can run your jobs for training or deploy your models for inference.
+directCommands:
+- uid: az_ml_compute_attach
+  name: az ml compute attach
+  summary: Attach an existing compute resource to a workspace.
+  description: AKS clusters and remote VMs can be attached as compute targets.
+  syntax: >-
+    az ml compute attach --resource-group
+                         --workspace-name
+                         [--admin-username]
+                         [--file]
+                         [--name]
+                         [--no-wait]
+                         [--resource-id]
+                         [--ssh-key-value]
+                         [--type]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin-username
+    summary: Name of the administrator user account that can be used to SSH into the node(s).
+    description: ''
+  - name: --file
+    summary: Local path to the YAML file containing the Azure ML compute specification.
+    description: ''
+  - name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-id
+    summary: The fully qualified ID of the resource, including the resource name and resource type.
+    description: ''
+  - name: --ssh-key-value
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --type -t
+    summary: 'The type of compute target. Allowed values: AKS, RemoteVM.'
+    description: ''
+- uid: az_ml_compute_create
+  name: az ml compute create
+  summary: Create a compute target.
+  description: You can create an AmlCompute cluster, which is Azure ML's managed compute infrastructure, or a compute instance, which is a managed cloud-based workstation.
+  syntax: >-
+    az ml compute create --resource-group
+                         --workspace-name
+                         [--admin-password]
+                         [--admin-username]
+                         [--description]
+                         [--file]
+                         [--identity-type]
+                         [--idle-time-before-scale-down]
+                         [--max-instances]
+                         [--min-instances]
+                         [--name]
+                         [--no-wait]
+                         [--priority]
+                         [--public-ip]
+                         [--set]
+                         [--size]
+                         [--ssh-key-value]
+                         [--subnet]
+                         [--type]
+                         [--user-assigned-identities]
+                         [--user-object-id]
+                         [--user-tenant-id]
+                         [--vnet-name]
+  examples:
+  - summary: Create a compute target from a YAML specification file
+    syntax: az ml compute create --file compute.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Create an AmlCompute target using command options
+    syntax: az ml compute create --name nc6-cluster --size Standard_NC6 --min-instances 0 --max-instances 5 --type AmlCompute --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin-password
+    summary: Password for the administrator user account if authentication type is 'Password'.
+    description: ''
+  - name: --admin-username
+    summary: Name of the administrator user account that can be used to SSH into the node(s).
+    description: ''
+  - name: --description
+    summary: Description of the compute target.
+    description: ''
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML compute specification.
+    description: ''
+  - name: --identity-type
+    summary: 'The type of managed identity. Allowed values: SystemAssigned, UserAssigned.'
+    description: ''
+  - name: --idle-time-before-scale-down -s
+    summary: Idle time in seconds before scaling down the cluster.
+    description: ''
+  - name: --max-instances
+    summary: The maximum number of nodes to use on the cluster.
+    description: ''
+  - name: --min-instances
+    summary: 'The minimum number of nodes to use on the cluster. Default: 0.'
+    description: ''
+  - name: --name -n
+    summary: Name of the compute target. Required if --file/-f is not provided.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --priority
+    summary: 'VM priority. Allowed values: Dedicated, LowPriority.'
+    description: ''
+  - name: --public-ip
+    summary: Public IP Address of this ComputeInstance (only applies to ComputeInstance).
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --size
+    summary: 'VM size to use for the compute target. More details can be found here: https://aka.ms/azureml-vm-details.'
+    description: ''
+  - name: --ssh-key-value
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --subnet
+    summary: Name of the subnet.
+    description: ''
+  - name: --type -t
+    summary: 'The type of compute target. Required if --file/-f is not provided. Allowed values: AmlCompute, ComputeInstance.'
+    description: ''
+  - name: --user-assigned-identities -i
+    summary: Comma-separated resource IDs (e.g. 'ResourceID1,ResourceID2') to set user-assigned managed identities. Only supported if --identity-type is 'UserAssigned'.
+    description: ''
+  - name: --user-object-id
+    summary: AAD object ID of the assigned user.
+    description: ''
+  - name: --user-tenant-id
+    summary: AAD tenant ID of the assigned user.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+- uid: az_ml_compute_delete
+  name: az ml compute delete
+  summary: Delete a compute target.
+  description: ''
+  syntax: >-
+    az ml compute delete --name
+                         --resource-group
+                         --workspace-name
+                         [--no-wait]
+                         [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_compute_detach
+  name: az ml compute detach
+  summary: Detach a previously attached compute resource from a workspace.
+  description: ''
+  syntax: >-
+    az ml compute detach --name
+                         --resource-group
+                         --workspace-name
+                         [--no-wait]
+                         [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_compute_list
+  name: az ml compute list
+  summary: List the compute targets in a workspace.
+  description: ''
+  syntax: >-
+    az ml compute list --resource-group
+                       --workspace-name
+                       [--max-results]
+                       [--type]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --type
+    summary: 'The type of compute target. Allowed values: AmlCompute, ComputeInstance.'
+    description: ''
+- uid: az_ml_compute_list-sizes
+  name: az ml compute list-sizes
+  summary: List the VM sizes available by location.
+  description: ''
+  syntax: >-
+    az ml compute list-sizes --resource-group
+                             --workspace-name
+                             [--location]
+                             [--type]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --type -t
+    summary: 'The type of compute target. Allowed values: AmlCompute, ComputeInstance.'
+    description: ''
+- uid: az_ml_compute_list-usage
+  name: az ml compute list-usage
+  summary: List the available usage resources for VMs.
+  description: ''
+  syntax: >-
+    az ml compute list-usage --resource-group
+                             --workspace-name
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: Defaults to workspace location.
+    description: ''
+- uid: az_ml_compute_restart
+  name: az ml compute restart
+  summary: Restart a ComputeInstance target.
+  description: ''
+  syntax: >-
+    az ml compute restart --name
+                          --resource-group
+                          --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_compute_show
+  name: az ml compute show
+  summary: Show details for a compute target.
+  description: ''
+  syntax: >-
+    az ml compute show --name
+                       --resource-group
+                       --workspace-name
+  examples:
+  - summary: Show details for a compute target
+    syntax: az ml compute show --name nc6-cluster --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_compute_start
+  name: az ml compute start
+  summary: Start a ComputeInstance target.
+  description: --no-wait option is recommended.
+  syntax: >-
+    az ml compute start --name
+                        --resource-group
+                        --workspace-name
+                        [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_ml_compute_stop
+  name: az ml compute stop
+  summary: Stop a ComputeInstance target.
+  description: --no-wait option is recommended.
+  syntax: >-
+    az ml compute stop --name
+                       --resource-group
+                       --workspace-name
+                       [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_ml_compute_update
+  name: az ml compute update
+  summary: Update a compute target.
+  description: The 'tags', 'description', 'max_instances', 'min_instances', 'idle_time_before_scale_down', 'identity_type', and 'user_assigned_identities' properties can be updated.
+  syntax: >-
+    az ml compute update --name
+                         --resource-group
+                         --workspace-name
+                         [--add]
+                         [--force-string]
+                         [--identity-type]
+                         [--idle-time-before-scale-down]
+                         [--max-instances]
+                         [--min-instances]
+                         [--remove]
+                         [--set]
+                         [--user-assigned-identities]
+  examples:
+  - summary: Update the minimum number of nodes for an AmlCompute cluster
+    syntax: az ml compute update --name nc6-cluster --min-instances 1 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --identity-type
+    summary: 'The type of managed identity. Allowed values: SystemAssigned, UserAssigned.'
+    description: ''
+  - name: --idle-time-before-scale-down -s
+    summary: Idle time in seconds before scaling down the cluster.
+    description: ''
+  - name: --max-instances
+    summary: Maximum number of nodes to use.
+    description: ''
+  - name: --min-instances
+    summary: Minimum number of nodes to use.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --user-assigned-identities -i
+    summary: Comma-separated resource IDs (e.g. 'ResourceID1,ResourceID2') to set user-assigned managed identities. Only supported if --identity-type is 'UserAssigned'.
+    description: ''
+commands:
+- az_ml_compute_attach
+- az_ml_compute_create
+- az_ml_compute_delete
+- az_ml_compute_detach
+- az_ml_compute_list
+- az_ml_compute_list-sizes
+- az_ml_compute_list-usage
+- az_ml_compute_restart
+- az_ml_compute_show
+- az_ml_compute_start
+- az_ml_compute_stop
+- az_ml_compute_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML compute targets are designated compute resources where you can run your jobs for training or deploy your models for inference.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/data.yml b/2017-03-09-profile/docs-ref-autogen/ml/data.yml
new file mode 100644
index 0000000000..3f23d56ea8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/data.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_data
+name: az ml data
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml data** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML data assets.
+description: Azure ML data assets are references to file(s) in your storage services or public URLs along with any corresponding metadata. They are not copies of your data.  You can use these data assets to access relevant data during model training and mount or download the referenced data to your compute target.
+directCommands:
+- uid: az_ml_data_create
+  name: az ml data create
+  summary: Create a data asset.
+  description: >-
+    Data assets can be defined from files on your local machine or as references to files in cloud storage. The created data asset will be tracked in the workspace under the specified name and version.
+
+
+    To create a data asset from file(s) on your local machine, specify the 'local_path' field in your YAML config. Azure ML will upload these file(s) to the blob container that backs the workspace's default datastore (named 'workspaceblobstore'). The created data asset will then point to that uploaded data.
+
+
+    To create a data asset that references file(s) in cloud storage, specify the 'datastore' that corresponds to the storage service and the 'path' to the file(s) in storage in your YAML config.
+
+
+    You can also create a data asset directly from a storage URL or public URL. To do so, specify the URL to the 'path' field in your YAML config.
+  syntax: >-
+    az ml data create --resource-group
+                      --workspace-name
+                      [--file]
+                      [--name]
+                      [--set]
+                      [--version]
+  examples:
+  - summary: Create a data asset from a YAML specification file
+    syntax: az ml data create --file data.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML data specification.
+    description: ''
+  - name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the data asset.
+    description: ''
+- uid: az_ml_data_delete
+  name: az ml data delete
+  summary: Delete a data asset.
+  description: ''
+  syntax: >-
+    az ml data delete --name
+                      --resource-group
+                      --version
+                      --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the data asset.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_data_list
+  name: az ml data list
+  summary: List data assets in a workspace.
+  description: ''
+  syntax: >-
+    az ml data list --resource-group
+                    --workspace-name
+                    [--max-results]
+                    [--name]
+  examples:
+  - summary: List all the data assets in a workspace
+    syntax: az ml data list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the data asset versions for the specified name in a workspace
+    syntax: az ml data list --name my-data --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --name -n
+    summary: Name of the data asset. If provided, all the data versions under this name will be returned.
+    description: ''
+- uid: az_ml_data_show
+  name: az ml data show
+  summary: Shows details for a data asset.
+  description: ''
+  syntax: >-
+    az ml data show --name
+                    --resource-group
+                    --workspace-name
+                    [--version]
+  examples:
+  - summary: Show details for a data asset with the specified name and version
+    syntax: az ml data show --name my-data --version 1 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Show details for the latest version of a data asset with the specified name
+    syntax: az ml data show --name my-data --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --version -v
+    summary: Version of the data asset. If omitted, the latest version is shown.
+    description: ''
+- uid: az_ml_data_update
+  name: az ml data update
+  summary: Update a data asset.
+  description: Only the 'description' and 'tags' properties can be updated.
+  syntax: >-
+    az ml data update --resource-group
+                      --workspace-name
+                      [--add]
+                      [--force-string]
+                      [--name]
+                      [--remove]
+                      [--set]
+                      [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the data asset.
+    description: ''
+commands:
+- az_ml_data_create
+- az_ml_data_delete
+- az_ml_data_list
+- az_ml_data_show
+- az_ml_data_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML data assets are references to file(s) in your storage services or public URLs along with any corresponding metadata. They are not copies of your data.  You can use these data assets to access relevant data during model training and mount or download the referenced data to your compute target.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/datastore.yml b/2017-03-09-profile/docs-ref-autogen/ml/datastore.yml
new file mode 100644
index 0000000000..ddbef77fe1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/datastore.yml
@@ -0,0 +1,188 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_datastore
+name: az ml datastore
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml datastore** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML datastores.
+description: >-
+  Azure ML datastores securely link your Azure storage services to your workspace so that you can access your storage without having to hardcode the connection information into your scripts. The connection secrets, like the storage service's authentication credentials, are stored in your workspace's Key Vault.
+
+
+  When you create a workspace, an Azure Storage account is automatically created as an associated resource. A blob container is created in this account, and its connection information is stored as a datastore named 'workspaceblobstore'. This serves as the workspace's default datastore, and the blob container is used to store your workspace artifacts and machine learning job logs and outputs.
+directCommands:
+- uid: az_ml_datastore_create
+  name: az ml datastore create
+  summary: Create a datastore.
+  description: This connects the underlying Azure storage service to the workspace. The storage service types that can currently be connected to by creating a datastore include Azure Blob storage, Azure File Share, Azure Data Lake Storage Gen1 and Azure Data Lake Storage Gen2.
+  syntax: >-
+    az ml datastore create --file
+                           --resource-group
+                           --workspace-name
+                           [--name]
+                           [--set]
+  examples:
+  - summary: Create a datastore from a YAML specification file
+    syntax: az ml datastore create --file blobstore.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML datastore specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the datastore. This overwrites the 'name' field in the YAML file provided to --file/-f.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_ml_datastore_delete
+  name: az ml datastore delete
+  summary: Delete a datastore.
+  description: This deletes the connection information to the storage service from the workspace but does not delete the underlying data in storage.
+  syntax: >-
+    az ml datastore delete --name
+                           --resource-group
+                           --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_datastore_list
+  name: az ml datastore list
+  summary: List datastores in a workspace.
+  description: ''
+  syntax: >-
+    az ml datastore list --resource-group
+                         --workspace-name
+                         [--include-secrets]
+                         [--max-results]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-secrets -i
+    summary: Whether to include the connection secrets for the datastore.
+    description: ''
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_ml_datastore_show
+  name: az ml datastore show
+  summary: Show details for a datastore.
+  description: ''
+  syntax: >-
+    az ml datastore show --name
+                         --resource-group
+                         --workspace-name
+                         [--include-secrets]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-secrets -i
+    summary: Whether to include the connection secrets for the datastore.
+    description: ''
+- uid: az_ml_datastore_update
+  name: az ml datastore update
+  summary: Update a datastore.
+  description: The 'description', 'tags', and 'credential' properties can be updated.
+  syntax: >-
+    az ml datastore update --resource-group
+                           --workspace-name
+                           [--add]
+                           [--file]
+                           [--force-string]
+                           [--name]
+                           [--remove]
+                           [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML datastore specification.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --name -n
+    summary: Name of the datastore. This overwrites the 'name' field in the YAML file provided to --file/-f.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_ml_datastore_create
+- az_ml_datastore_delete
+- az_ml_datastore_list
+- az_ml_datastore_show
+- az_ml_datastore_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Azure ML datastores securely link your Azure storage services to your workspace so that you can access your storage without having to hardcode the connection information into your scripts. The connection secrets, like the storage service's authentication credentials, are stored in your workspace's Key Vault.
+
+
+    When you create a workspace, an Azure Storage account is automatically created as an associated resource. A blob container is created in this account, and its connection information is stored as a datastore named 'workspaceblobstore'. This serves as the workspace's default datastore, and the blob container is used to store your workspace artifacts and machine learning job logs and outputs.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/endpoint.yml b/2017-03-09-profile/docs-ref-autogen/ml/endpoint.yml
new file mode 100644
index 0000000000..9fdecc5c92
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/endpoint.yml
@@ -0,0 +1,524 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_endpoint
+name: az ml endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML endpoints.
+description: >-
+  Azure ML endpoints provide a simple interface for creating and managing model deployments. Each endpoint can have one or more deployments, enabling the traffic from a single scoring endpoint to be served to multiple deployments if needed. This is useful for scenarios such as controlled rollout.
+
+
+  Azure ML supports two types of endpoints: online and batch. Online endpoints support real-time inference, while batch endpoints are used for offline batch scoring.
+directCommands:
+- uid: az_ml_endpoint_create
+  name: az ml endpoint create
+  summary: Create an endpoint.
+  description: To create an endpoint, provide a YAML file with either an online or batch endpoint configuration. The endpoint can have one or more deployments defined. A deployment configuration will typically include the model to deploy, the scoring code, the environment encapsulating the scoring dependencies, the compute configuration, and any additional settings.
+  syntax: >-
+    az ml endpoint create --file
+                          --resource-group
+                          --workspace-name
+                          [--local {false, true}]
+                          [--name]
+                          [--no-wait]
+                          [--set]
+                          [--type]
+  examples:
+  - summary: Create an endpoint from a YAML specification file
+    syntax: az ml endpoint create --file endpoint.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML endpoint specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to create the endpoint locally. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --type -t
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_delete
+  name: az ml endpoint delete
+  summary: Delete an endpoint or a specific deployment.
+  description: ''
+  syntax: >-
+    az ml endpoint delete --name
+                          --resource-group
+                          --workspace-name
+                          [--deployment]
+                          [--local {false, true}]
+                          [--no-wait]
+                          [--type]
+                          [--yes]
+  examples:
+  - summary: Delete an online endpoint, including all its deployments
+    syntax: az ml endpoint delete --name my-online-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Delete a specific deployment for a batch endpoint. This does not delete the endpoint itself.
+    syntax: az ml endpoint delete --name my-batch-endpoint --deployment my-deployment --type batch --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of the deployment to delete.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to delete the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_endpoint_get-credentials
+  name: az ml endpoint get-credentials
+  summary: List the token/keys for an online endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint get-credentials --name
+                                   --resource-group
+                                   --workspace-name
+                                   [--type]
+  examples:
+  - summary: List the keys for an online endpoint
+    syntax: az ml endpoint get-credentials --name my-online-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --type -t
+    defaultValue: online
+    summary: The type of endpoint. Only online endpoints are currently supported.
+    description: ''
+- uid: az_ml_endpoint_get-logs
+  name: az ml endpoint get-logs
+  summary: Get the container logs for an online deployment.
+  description: ''
+  syntax: >-
+    az ml endpoint get-logs --deployment
+                            --name
+                            --resource-group
+                            --workspace-name
+                            [--container]
+                            [--lines]
+                            [--local {false, true}]
+                            [--type]
+  examples:
+  - summary: Get the container logs for an online deployment
+    syntax: az ml endpoint get-logs --name my-online-endpoint --deployment my-deployment --lines 100 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --deployment -d
+    summary: Name of the deployment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container -c
+    summary: 'The type of container from which to retrieve logs. Allowed values: inference-server, storage-initializer.'
+    description: ''
+  - name: --lines -l
+    defaultValue: "5000"
+    summary: The maximum number of lines to tail.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to get logs from the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_invoke
+  name: az ml endpoint invoke
+  summary: Invoke an endpoint.
+  description: You can test an endpoint by invoking it with some request data. For online endpoints, this will be real-time inference and the scoring results will be returned immediately. For batch endpoints, invocation will trigger an asynchronous batch scoring job.
+  syntax: >-
+    az ml endpoint invoke --name
+                          --resource-group
+                          --workspace-name
+                          [--deployment]
+                          [--input-data]
+                          [--input-datastore]
+                          [--input-local-path]
+                          [--input-path]
+                          [--instance-count]
+                          [--local {false, true}]
+                          [--mini-batch-size]
+                          [--output-datastore]
+                          [--output-path]
+                          [--request-file]
+                          [--set]
+                          [--type]
+  examples:
+  - summary: Invoke an online endpoint with some request data
+    syntax: az ml endpoint invoke --name my-online-endpoint --request-file sample_request.json --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke an online endpoint, targeting a specific deployment
+    syntax: az ml endpoint invoke --name my-online-endpoint --deployment my-deployment --request-file sample_request.json --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from a registered Azure ML data asset (and override default deployment setting for mini_batch_size)
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-data azureml:mnist-data:1 --mini-batch-size 64 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from a storage URL
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-path https://pipelinedata.blob.core.windows.net/sampledata/mnist --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from a path on a datastore
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-datastore my-datastore --input-path mnist --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from local files
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-local-path ./mnist --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of the deployment to target.
+    description: ''
+  - name: --input-data -i
+    summary: Input data asset. Format should be azureml:<data-name>:<data-version>.
+    description: ''
+  - name: --input-datastore -u
+    summary: Datastore to which --input-path/-p is relative or files in --input-local-path/-l will be uploaded. Defaults to the workspace's default datastore.
+    description: ''
+  - name: --input-local-path -l
+    summary: Local path to the input data. The file(s) will be uploaded and registered as an Azure ML data asset.
+    description: ''
+  - name: --input-path -p
+    summary: URL or path on the datastore where the input data is located.
+    description: ''
+  - name: --instance-count -c
+    summary: Number of instances the prediction will run on.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Invoke the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --mini-batch-size -m
+    summary: Size of each mini batch that the input data will be split into for prediction.
+    description: ''
+  - name: --output-datastore -s
+    summary: Datastore to which --output-path/-x is relative. Defaults to the workspace's default datastore.
+    description: ''
+  - name: --output-path -x
+    summary: Path on the datastore where output files will be uploaded to.
+    description: ''
+  - name: --request-file -r
+    summary: Local path to the JSON file containing the request data.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_list
+  name: az ml endpoint list
+  summary: List endpoints in a workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint list --resource-group
+                        --workspace-name
+                        [--local {false, true}]
+                        [--type]
+  examples:
+  - summary: List all the online endpoints in a workspace
+    syntax: az ml endpoint list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the batch endpoints in a workspace
+    syntax: az ml endpoint list --type batch --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to show all local endpoints. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_list-jobs
+  name: az ml endpoint list-jobs
+  summary: List the batch scoring jobs for a batch endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint list-jobs --name
+                             --resource-group
+                             --workspace-name
+                             [--deployment]
+                             [--type]
+  examples:
+  - summary: List all the batch scoring jobs for an endpoint
+    syntax: az ml endpoint list-jobs --name my-batch-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List the batch scoring jobs for a specific deployment
+    syntax: az ml endpoint list-jobs --name my-batch-endpoint --deployment my-deployment --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of the deployment to target.
+    description: ''
+  - name: --type -t
+    defaultValue: batch
+    summary: The type of endpoint. Only batch endpoints are supported.
+    description: ''
+- uid: az_ml_endpoint_regenerate-keys
+  name: az ml endpoint regenerate-keys
+  summary: Regenerate the keys for an online endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint regenerate-keys --name
+                                   --resource-group
+                                   --workspace-name
+                                   [--key-type]
+                                   [--type]
+  examples:
+  - summary: Regenerate the keys for an online endpoint
+    syntax: az ml endpoint regenerate-keys --name my-online-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-type
+    defaultValue: primary
+    summary: 'The type of key to regenerate. Allowed values: primary, secondary.'
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: The type of the endpoint. Only online endpoints are supported.
+    description: ''
+- uid: az_ml_endpoint_show
+  name: az ml endpoint show
+  summary: Show details for an endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint show --name
+                        --resource-group
+                        --workspace-name
+                        [--local {false, true}]
+                        [--type]
+  examples:
+  - summary: Show the details for a batch endpoint
+    syntax: az ml endpoint show --name my-batch-endpoint --type batch --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to show only the local endpoints. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_update
+  name: az ml endpoint update
+  summary: Update an endpoint.
+  description: The 'description', 'tags', and 'traffic' properties of an endpoint can be updated. In addition, new deployments can be added to an endpoint, and existing deployments can be updated.
+  syntax: >-
+    az ml endpoint update --resource-group
+                          --workspace-name
+                          [--add]
+                          [--deployment]
+                          [--deployment-file]
+                          [--file]
+                          [--force-string]
+                          [--instance-count]
+                          [--local {false, true}]
+                          [--name]
+                          [--no-wait]
+                          [--remove]
+                          [--set]
+                          [--traffic]
+                          [--type]
+  examples:
+  - summary: Update an endpoint from a YAML specification file
+    syntax: az ml endpoint update --file updated_endpoint.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Add a new deployment to an existing endpoint
+    syntax: az ml endpoint update --name my-batch-endpoint --type batch --deployment my-new-deployment --deployment-file new_deployment.yml  --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Update the traffic settings for an endpoint
+    syntax: az ml endpoint update --name my-batch-endpoint --type batch --traffic my-new-deployment:100 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --deployment -d
+    summary: Name of the deployment to update.
+    description: ''
+  - name: --deployment-file -e
+    summary: Local path to the YAML file containing the Azure ML deployment specification to update. If specified, --deployment/-d must also be provided.
+    description: ''
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML endpoint specification.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --instance-count -i
+    summary: Instance count for the deployment. If specified, --deployment/-d must also be provided.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to update the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --traffic -r
+    summary: Traffic settings for the endpoint.
+    description: ''
+  - name: --type -t
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+commands:
+- az_ml_endpoint_create
+- az_ml_endpoint_delete
+- az_ml_endpoint_get-credentials
+- az_ml_endpoint_get-logs
+- az_ml_endpoint_invoke
+- az_ml_endpoint_list
+- az_ml_endpoint_list-jobs
+- az_ml_endpoint_regenerate-keys
+- az_ml_endpoint_show
+- az_ml_endpoint_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Azure ML endpoints provide a simple interface for creating and managing model deployments. Each endpoint can have one or more deployments, enabling the traffic from a single scoring endpoint to be served to multiple deployments if needed. This is useful for scenarios such as controlled rollout.
+
+
+    Azure ML supports two types of endpoints: online and batch. Online endpoints support real-time inference, while batch endpoints are used for offline batch scoring.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/environment.yml b/2017-03-09-profile/docs-ref-autogen/ml/environment.yml
new file mode 100644
index 0000000000..34d898815f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/environment.yml
@@ -0,0 +1,204 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_environment
+name: az ml environment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml environment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML environments.
+description: Azure ML environments define the execution environment for jobs and endpoint deployments, encapsulating the dependencies for training and inference. These environment definitions are built into Docker images.
+directCommands:
+- uid: az_ml_environment_create
+  name: az ml environment create
+  summary: Create an environment.
+  description: >-
+    Environments can be defined from a Docker image, Dockerfile, or Conda file. Azure ML maintains a set of CPU and GPU Docker images that you can use as base images. For information on these images, see https://github.com/Azure/AzureML-Containers.
+
+
+    The created environment will be tracked in the workspace under the specified name and version.
+  syntax: >-
+    az ml environment create --file
+                             --resource-group
+                             --workspace-name
+                             [--name]
+                             [--set]
+                             [--version]
+  examples:
+  - summary: Create an environment from a YAML specification file
+    syntax: az ml environment create --file my_env.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML environment specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+- uid: az_ml_environment_delete
+  name: az ml environment delete
+  summary: Delete an environment.
+  description: ''
+  syntax: >-
+    az ml environment delete --name
+                             --resource-group
+                             --version
+                             --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the environment.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_environment_list
+  name: az ml environment list
+  summary: List environments in a workspace.
+  description: ''
+  syntax: >-
+    az ml environment list --resource-group
+                           --workspace-name
+                           [--max-results]
+                           [--name]
+  examples:
+  - summary: List all the environments in a workspace
+    syntax: az ml environment list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the environment versions for the specified name in a workspace
+    syntax: az ml environment list --name my-env --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --name -n
+    summary: Name of the environment. If provided, all the environment versions under this name will be returned.
+    description: ''
+- uid: az_ml_environment_show
+  name: az ml environment show
+  summary: Show details for an environment.
+  description: ''
+  syntax: >-
+    az ml environment show --name
+                           --resource-group
+                           --workspace-name
+                           [--version]
+  examples:
+  - summary: Show details for an environment with the specified name and version
+    syntax: az ml environment show --name my-env --version 1 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Show details for the latest version of an environment with the specified name
+    syntax: az ml environment show --name my-env --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --version -v
+    summary: Version of the environment. If omitted, the latest version is shown.
+    description: ''
+- uid: az_ml_environment_update
+  name: az ml environment update
+  summary: Update an environment.
+  description: Only the 'description' and 'tags' properties can be updated.
+  syntax: >-
+    az ml environment update --name
+                             --resource-group
+                             --workspace-name
+                             [--add]
+                             [--force-string]
+                             [--remove]
+                             [--set]
+                             [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+commands:
+- az_ml_environment_create
+- az_ml_environment_delete
+- az_ml_environment_list
+- az_ml_environment_show
+- az_ml_environment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML environments define the execution environment for jobs and endpoint deployments, encapsulating the dependencies for training and inference. These environment definitions are built into Docker images.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/job.yml b/2017-03-09-profile/docs-ref-autogen/ml/job.yml
new file mode 100644
index 0000000000..d7609e3718
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/job.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_job
+name: az ml job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML jobs.
+description: >-
+  An Azure ML job executes a task against a specified compute target. You can configure jobs to scale out model training on Azure. Azure ML supports different job types with different capabilities. For example, the most basic job, a command job, executes a command in a Docker container and can be leveraged for single-node and distributed training. A sweep job executes a hyperparameter sweep over a specified search space for tuning a model's hyperparameters.
+
+
+  Jobs also enable systematic tracking for your ML experimentation and workflows. Once a job is created, Azure ML maintains a run record for the job that includes the metadata, any metrics, logs, and artifacts generated during the job, code that was executed, and the Azure ML environment used. All of your jobs' run records can be viewed in Azure ML studio.
+directCommands:
+- uid: az_ml_job_cancel
+  name: az ml job cancel
+  summary: Cancel a job.
+  description: ''
+  syntax: >-
+    az ml job cancel --name
+                     --resource-group
+                     --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_job_create
+  name: az ml job create
+  summary: Create a job.
+  description: To create a job, you will typically need to configure any code to be run, an environment encapsulating the dependencies, a compute target to execute the job on, and any additional job-specific settings. When a job is created, it is submitted for execution against the specified compute resource.
+  syntax: >-
+    az ml job create --file
+                     --resource-group
+                     --workspace-name
+                     [--name]
+                     [--save-as]
+                     [--set]
+                     [--stream]
+                     [--web]
+  examples:
+  - summary: Create a job from a YAML specification file
+    syntax: az ml job create --file job.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Create a job from a YAML specification file and open the job's run details in the Azure ML studio portal
+    syntax: az ml job create --file job.yml --web --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML job specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the job.
+    description: ''
+  - name: --save-as -a
+    summary: File to which the created job's state in YAML format will be written.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --stream -s
+    summary: Indicates whether to stream the job's logs to the console.
+    description: ''
+  - name: --web -e
+    summary: Show the job's run details in Azure ML studio in a web browser.
+    description: ''
+- uid: az_ml_job_download
+  name: az ml job download
+  summary: Download all job-related files.
+  description: The files will be downloaded in a folder named after the job's name.
+  syntax: >-
+    az ml job download --name
+                       --resource-group
+                       --workspace-name
+                       [--download-path]
+                       [--outputs]
+  examples:
+  - summary: Download a job's files, including outputs, to the current working directory
+    syntax: az ml job download --name my-job --outputs --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --download-path -p
+    summary: Path to download the job files to. If omitted, job files will be downloaded to the current directory.
+    description: ''
+  - name: --outputs -u
+    summary: Indicates whether to download the outputs of the job. By default outputs will not be downloaded.
+    description: ''
+- uid: az_ml_job_list
+  name: az ml job list
+  summary: List jobs in a workspace.
+  description: ''
+  syntax: >-
+    az ml job list --resource-group
+                   --workspace-name
+                   [--max-results]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_ml_job_show
+  name: az ml job show
+  summary: Show details for a job.
+  description: ''
+  syntax: >-
+    az ml job show --name
+                   --resource-group
+                   --workspace-name
+                   [--include-logs]
+                   [--web]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-logs -l
+    summary: Indicates whether to list all the paths of the job's logs.
+    description: ''
+  - name: --web -e
+    summary: Show the job's run details in Azure ML studio in a web browser.
+    description: ''
+- uid: az_ml_job_stream
+  name: az ml job stream
+  summary: Stream job logs to the console.
+  description: ''
+  syntax: >-
+    az ml job stream --name
+                     --resource-group
+                     --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_job_update
+  name: az ml job update
+  summary: Update a job.
+  description: Only the 'tags' and 'properties' properties can be updated.
+  syntax: >-
+    az ml job update --name
+                     --resource-group
+                     --workspace-name
+                     [--add]
+                     [--force-string]
+                     [--remove]
+                     [--set]
+                     [--web]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --web -e
+    summary: Show the job's run details in Azure ML studio in a web browser.
+    description: ''
+commands:
+- az_ml_job_cancel
+- az_ml_job_create
+- az_ml_job_download
+- az_ml_job_list
+- az_ml_job_show
+- az_ml_job_stream
+- az_ml_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    An Azure ML job executes a task against a specified compute target. You can configure jobs to scale out model training on Azure. Azure ML supports different job types with different capabilities. For example, the most basic job, a command job, executes a command in a Docker container and can be leveraged for single-node and distributed training. A sweep job executes a hyperparameter sweep over a specified search space for tuning a model's hyperparameters.
+
+
+    Jobs also enable systematic tracking for your ML experimentation and workflows. Once a job is created, Azure ML maintains a run record for the job that includes the metadata, any metrics, logs, and artifacts generated during the job, code that was executed, and the Azure ML environment used. All of your jobs' run records can be viewed in Azure ML studio.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/model.yml b/2017-03-09-profile/docs-ref-autogen/ml/model.yml
new file mode 100644
index 0000000000..1df8465d85
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/model.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_model
+name: az ml model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML models.
+description: Azure ML models consist of the binary file(s) that represent a machine learning model and any corresponding metadata.  These models can be used in endpoint deployments for real-time and batch inference.
+directCommands:
+- uid: az_ml_model_create
+  name: az ml model create
+  summary: Create a model.
+  description: Models can be created from a local file or directory. The created model will be tracked in the workspace under the specified name and version.
+  syntax: >-
+    az ml model create --resource-group
+                       --workspace-name
+                       [--file]
+                       [--local-path]
+                       [--name]
+                       [--set]
+                       [--version]
+  examples:
+  - summary: Create a model from a YAML specification file
+    syntax: az ml model create --file model.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Create a model from a local folder using command options
+    syntax: az ml model create --name my-model --version 1 --local-path ./my-model --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML model specification. --name/-n and --version/-v must be provided if YAML file is not having name and version.
+    description: ''
+  - name: --local-path -l
+    summary: Path to the model file(s). This can be either a file or a directory. If specified, --name/-n and --version/-v must also be provided.
+    description: ''
+  - name: --name -n
+    summary: Name of the model.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the model.
+    description: ''
+- uid: az_ml_model_delete
+  name: az ml model delete
+  summary: Delete a model.
+  description: ''
+  syntax: >-
+    az ml model delete --name
+                       --resource-group
+                       --version
+                       --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the model.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_model_list
+  name: az ml model list
+  summary: List models in a workspace.
+  description: ''
+  syntax: >-
+    az ml model list --resource-group
+                     --workspace-name
+                     [--max-results]
+                     [--name]
+  examples:
+  - summary: List all the models in a workspace
+    syntax: az ml model list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the model versions for the specified name in a workspace
+    syntax: az ml model list --name my-model --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --name -n
+    summary: Name of the model. If provided, all the model versions under this name will be returned.
+    description: ''
+- uid: az_ml_model_show
+  name: az ml model show
+  summary: Show details for a model.
+  description: ''
+  syntax: >-
+    az ml model show --name
+                     --resource-group
+                     --workspace-name
+                     [--version]
+  examples:
+  - summary: Show details for a model with the specified name and version
+    syntax: az ml model show --name my-model --version 1 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Show details for the latest version of a model with the specified name
+    syntax: az ml model show --name my-model --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --version -v
+    summary: Version of the model. If omitted, the latest version is shown.
+    description: ''
+- uid: az_ml_model_update
+  name: az ml model update
+  summary: Update a model.
+  description: The 'description', 'tags', 'properties', and 'flavors' properties can be updated.
+  syntax: >-
+    az ml model update --name
+                       --resource-group
+                       --workspace-name
+                       [--add]
+                       [--force-string]
+                       [--remove]
+                       [--set]
+                       [--version]
+  examples:
+  - summary: Update a model's flavors
+    syntax: az ml model update --name my-model --version 1 --set flavors.python_function.python_version=3.8 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the model.
+    description: ''
+commands:
+- az_ml_model_create
+- az_ml_model_delete
+- az_ml_model_list
+- az_ml_model_show
+- az_ml_model_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML models consist of the binary file(s) that represent a machine learning model and any corresponding metadata.  These models can be used in endpoint deployments for real-time and batch inference.
diff --git a/2017-03-09-profile/docs-ref-autogen/ml/workspace.yml b/2017-03-09-profile/docs-ref-autogen/ml/workspace.yml
new file mode 100644
index 0000000000..e0ee30b9b7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ml/workspace.yml
@@ -0,0 +1,185 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_workspace
+name: az ml workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML workspaces.
+description: An Azure ML workspace is the top-level resource for Azure Machine Learning. It provides a centralized place to track the assets and resources used in your ML workflows, along with the logs and artifacts produced from your training jobs.
+directCommands:
+- uid: az_ml_workspace_create
+  name: az ml workspace create
+  summary: Create a workspace.
+  description: 'When a workspace is created, several Azure resources that will be used by Azure ML also get created by default: Azure Storage, Azure Container Registry, Azure Key Vault, and Azure Application Insights. You can instead use existing Azure resource instances for those when creating the workspace by specifying the resource IDs in the workspace configuration YAML file.'
+  syntax: >-
+    az ml workspace create --resource-group
+                           [--file,]
+                           [--no-wait]
+                           [--set]
+                           [--workspace-name]
+  examples:
+  - summary: Create a workspace from a YAML specification file.
+    syntax: az ml workspace create --file workspace.yml --resource-group my-resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file, -f
+    summary: Local path to the YAML file containing the Azure ML workspace specification.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for workspace creation to finish.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_delete
+  name: az ml workspace delete
+  summary: Delete a workspace.
+  description: By default the dependent resources associated with the workspace (Azure Storage, Azure Container Registry, Azure Key Vault, Azure Application Insights) are not deleted. To delete those as well, include --all-resources.
+  syntax: >-
+    az ml workspace delete --resource-group
+                           --workspace-name
+                           [--all-resources]
+                           [--no-wait]
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --all-resources
+    summary: Delete all the dependent resources associated with the workspace (Azure Storage account, Azure Container Registry, Azure Application Insights, Azure Key Vault).
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_workspace_list
+  name: az ml workspace list
+  summary: List all the workspaces in a subscription.
+  description: The list of workspaces can be filtered by resource group.
+  syntax: az ml workspace list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ml_workspace_list-keys
+  name: az ml workspace list-keys
+  summary: List workspace keys for dependent resources such as Azure Storage, Azure Container Registry, and Azure Application Insights.
+  description: ''
+  syntax: >-
+    az ml workspace list-keys --resource-group
+                              --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_show
+  name: az ml workspace show
+  summary: Show details for a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace show --resource-group
+                         --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_sync-keys
+  name: az ml workspace sync-keys
+  summary: Sync workspace keys for dependent resources such as Azure Storage, Azure Container Registry, and Azure Application Insights.
+  description: If the keys for any resource in the workspace are changed, it can take around an hour for them to automatically be updated. This command triggers the workspace to immediately synchronize keys. A possible scenario is needing immediate access to storage after regenerating the storage keys.
+  syntax: >-
+    az ml workspace sync-keys --resource-group
+                              --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_update
+  name: az ml workspace update
+  summary: Update a workspace.
+  description: The 'description', 'tags', 'friendly_name', and 'container_registry' properties can be updated.
+  syntax: >-
+    az ml workspace update --resource-group
+                           [--add]
+                           [--force-string]
+                           [--remove]
+                           [--set]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+commands:
+- az_ml_workspace_create
+- az_ml_workspace_delete
+- az_ml_workspace_list
+- az_ml_workspace_list-keys
+- az_ml_workspace_show
+- az_ml_workspace_sync-keys
+- az_ml_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: An Azure ML workspace is the top-level resource for Azure Machine Learning. It provides a centralized place to track the assets and resources used in your ML workflows, along with the logs and artifacts produced from your training jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor.yml b/2017-03-09-profile/docs-ref-autogen/monitor.yml
new file mode 100644
index 0000000000..282676307e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor.yml
@@ -0,0 +1,119 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor
+name: az monitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alertsmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az monitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the Azure Monitor Service.
+description: ''
+commands:
+- az_monitor_action-rule
+- az_monitor_action-rule_create
+- az_monitor_action-rule_delete
+- az_monitor_action-rule_list
+- az_monitor_action-rule_show
+- az_monitor_action-rule_update
+- az_monitor_app-insights
+- az_monitor_app-insights_api-key
+- az_monitor_app-insights_api-key_create
+- az_monitor_app-insights_api-key_delete
+- az_monitor_app-insights_api-key_show
+- az_monitor_app-insights_component
+- az_monitor_app-insights_component_billing
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+- az_monitor_app-insights_component_connect-webapp
+- az_monitor_app-insights_component_continues-export
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+- az_monitor_app-insights_component_create
+- az_monitor_app-insights_component_delete
+- az_monitor_app-insights_component_linked-storage
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+- az_monitor_app-insights_component_show
+- az_monitor_app-insights_component_update
+- az_monitor_app-insights_component_update-tags
+- az_monitor_app-insights_events
+- az_monitor_app-insights_events_show
+- az_monitor_app-insights_metrics
+- az_monitor_app-insights_metrics_get-metadata
+- az_monitor_app-insights_metrics_show
+- az_monitor_app-insights_query
+- az_monitor_data-collection
+- az_monitor_data-collection_rule
+- az_monitor_data-collection_rule_association
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+- az_monitor_data-collection_rule_create
+- az_monitor_data-collection_rule_data-flow
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+- az_monitor_data-collection_rule_delete
+- az_monitor_data-collection_rule_list
+- az_monitor_data-collection_rule_log-analytics
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+- az_monitor_data-collection_rule_performance-counter
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+- az_monitor_data-collection_rule_show
+- az_monitor_data-collection_rule_syslog
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+- az_monitor_data-collection_rule_update
+- az_monitor_data-collection_rule_windows-event-log
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+- az_monitor_log-analytics
+- az_monitor_log-analytics_query
+- az_monitor_log-analytics_solution
+- az_monitor_log-analytics_solution_create
+- az_monitor_log-analytics_solution_delete
+- az_monitor_log-analytics_solution_list
+- az_monitor_log-analytics_solution_show
+- az_monitor_log-analytics_solution_update
+- az_monitor_scheduled-query
+- az_monitor_scheduled-query_create
+- az_monitor_scheduled-query_delete
+- az_monitor_scheduled-query_list
+- az_monitor_scheduled-query_show
+- az_monitor_scheduled-query_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the Azure Monitor Service.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/action-rule.yml b/2017-03-09-profile/docs-ref-autogen/monitor/action-rule.yml
new file mode 100644
index 0000000000..573c4e1c2a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/action-rule.yml
@@ -0,0 +1,284 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_action-rule
+name: az monitor action-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alertsmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az monitor action-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage action rule.
+description: ''
+directCommands:
+- uid: az_monitor_action-rule_create
+  name: az monitor action-rule create
+  summary: Create an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule create --name
+                                  --resource-group
+                                  --rule-type {ActionGroup, Diagnostics, Suppression}
+                                  [--alert-context]
+                                  [--alert-description]
+                                  [--alert-rule]
+                                  [--description]
+                                  [--location]
+                                  [--monitor-condition]
+                                  [--monitor-service]
+                                  [--scope]
+                                  [--scope-type {Resource, ResourceGroup}]
+                                  [--severity]
+                                  [--status {Disabled, Enabled}]
+                                  [--suppression-end-date]
+                                  [--suppression-end-time]
+                                  [--suppression-recurrence]
+                                  [--suppression-recurrence-type {Always, Daily, Monthly, Once, Weekly}]
+                                  [--suppression-start-date]
+                                  [--suppression-start-time]
+                                  [--tags]
+                                  [--target-resource-type]
+  examples:
+  - summary: Create an action rule to suppress notifications for all Sev4 alerts on all VMs within the subscription every weekend
+    syntax: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --severity Equals Sev4 --target-resource-type Equals Microsoft.Compute/VirtualMachines --suppression-recurrence-type Weekly --suppression-recurrence 0 6 --suppression-start-date 12/09/2018 --suppression-end-date 12/18/2018 --suppression-start-time 06:00:00 --suppression-end-time 14:00:00
+  - summary: Create an action rule to suppress notifications for all log alerts generated for Computer-01 in subscription indefinitely as it's going through maintenance
+    syntax: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
+  - summary: Create an action rule to suppress notifications in a resource group
+    syntax: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --scope-type ResourceGroup --scope /subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/rg --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-type
+    parameterValueGroup: ActionGroup, Diagnostics, Suppression
+    summary: Indicate type of action rule.
+    description: ''
+  optionalParameters:
+  - name: --alert-context
+    summary: Filter alerts by alert context (payload).
+    description: ''
+  - name: --alert-description
+    summary: Filter alerts by alert rule description.
+    description: ''
+  - name: --alert-rule
+    summary: Filter alerts by alert rule name or ID.
+    description: ''
+  - name: --description
+    summary: Description of action rule.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --monitor-condition
+    summary: Filter alerts by monitor condition.
+    description: ''
+  - name: --monitor-service
+    summary: Filter alerts by monitor service.
+    description: ''
+  - name: --scope
+    summary: List of ARM IDs (space-delimited) of the given scope type which will be the target of the given action rule.
+    description: ''
+  - name: --scope-type
+    parameterValueGroup: Resource, ResourceGroup
+    summary: Type of target scope.
+    description: ''
+  - name: --severity
+    summary: Filter alerts by severity. All filters should follow format "operator value1 value2 ... valueN". Operator is one of Equals, NotEquals, Contains and DoesNotContain.
+    description: ''
+  - name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Indicate if the given action rule is enabled or disabled. Default to enabled.
+    description: ''
+  - name: --suppression-end-date
+    summary: 'End date for suppression. Format: MM/DD/YYYY.'
+    description: ''
+  - name: --suppression-end-time
+    summary: 'End time for suppression. Format: hh:mm:ss.'
+    description: ''
+  - name: --suppression-recurrence
+    summary: List of recurrence pattern values, delimited by space. If --suppression-recurrence-type is Weekly, allowed values range from 0 to 6. 0 stands for Sunday, 1 stands for Monday, ..., 6 stands for Saturday. If --suppression-recurrence-type is Monthly, allowed values range from 1 to 31, stands for day of month.
+    description: ''
+  - name: --suppression-recurrence-type
+    parameterValueGroup: Always, Daily, Monthly, Once, Weekly
+    summary: Specifies when the suppression should be applied.
+    description: ''
+  - name: --suppression-start-date
+    summary: 'Start date for suppression. Format: MM/DD/YYYY.'
+    description: ''
+  - name: --suppression-start-time
+    summary: 'Start time for suppression. Format: hh:mm:ss.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-resource-type
+    summary: Filter alerts by target resource type.
+    description: ''
+- uid: az_monitor_action-rule_delete
+  name: az monitor action-rule delete
+  summary: Delete an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule delete --name
+                                  --resource-group
+  examples:
+  - summary: Delete an action rule
+    syntax: az monitor action-rule delete --resource-group rg --name rule
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_action-rule_list
+  name: az monitor action-rule list
+  summary: List all action rules of the subscription, created in given resource group and given input filters.
+  description: ''
+  syntax: >-
+    az monitor action-rule list [--action-group]
+                                [--alert-rule-id]
+                                [--description]
+                                [--impacted-scope]
+                                [--monitor-service]
+                                [--name]
+                                [--resource-group]
+                                [--severity]
+                                [--target-resource]
+                                [--target-resource-group]
+                                [--target-resource-type]
+  examples:
+  - summary: List action rules of the subscription
+    syntax: az monitor action-rule list
+  - summary: List action rules of the resource group
+    syntax: az monitor action-rule list --resource-group rg
+  optionalParameters:
+  - name: --action-group
+    summary: Filter by action group configured as part of action rule.
+    description: ''
+  - name: --alert-rule-id
+    summary: Filter by alert rule ID.
+    description: ''
+  - name: --description
+    summary: Filter by alert rule description.
+    description: ''
+  - name: --impacted-scope
+    summary: Filter by impacted/target scope (provide comma separated list for multiple scopes). The value should be an well constructed ARM id of the scope.
+    description: ''
+  - name: --monitor-service
+    summary: Filter by monitor service which generates the alert instance. Default value is select all.
+    description: ''
+  - name: --name
+    summary: Filter by action rule name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --severity
+    summary: Filter by severity. Default value is select all.
+    description: ''
+  - name: --target-resource
+    summary: Filter by target resource (which is full ARM ID). Default value is select all.
+    description: ''
+  - name: --target-resource-group
+    summary: Filter by target resource group name. Default value is select all.
+    description: ''
+  - name: --target-resource-type
+    summary: Filter by target resource type. Default value is select all.
+    description: ''
+- uid: az_monitor_action-rule_show
+  name: az monitor action-rule show
+  summary: Get an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule show --name
+                                --resource-group
+  examples:
+  - summary: Get an action rule
+    syntax: az monitor action-rule show --resource-group rg --name rule
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_action-rule_update
+  name: az monitor action-rule update
+  summary: Update an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule update --name
+                                  --resource-group
+                                  [--add]
+                                  [--force-string]
+                                  [--location]
+                                  [--remove]
+                                  [--set]
+                                  [--status {Disabled, Enabled}]
+                                  [--tags]
+  examples:
+  - summary: Update an action rule
+    syntax: az monitor action-rule update --resource-group rg --name rule --status Disabled
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Indicates if the given action rule is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_monitor_action-rule_create
+- az_monitor_action-rule_delete
+- az_monitor_action-rule_list
+- az_monitor_action-rule_show
+- az_monitor_action-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage action rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights.yml
new file mode 100644
index 0000000000..5e3821b907
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights
+name: az monitor app-insights
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for querying data in Application Insights applications.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_query
+  name: az monitor app-insights query
+  summary: Execute a query over data in your application.
+  description: ''
+  syntax: >-
+    az monitor app-insights query --analytics-query
+                                  --apps
+                                  [--end-time]
+                                  [--offset]
+                                  [--resource-group]
+                                  [--start-time]
+  examples:
+  - summary: Execute a simple query over past 1 hour and 30 minutes.
+    syntax: az monitor app-insights query --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --analytics-query 'requests | summarize count() by bin(timestamp, 1h)' --offset 1h30m
+  requiredParameters:
+  - isRequired: true
+    name: --analytics-query
+    summary: Query to execute over Application Insights data.
+    description: ''
+  - isRequired: true
+    name: --apps -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  optionalParameters:
+  - name: --end-time
+    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --offset
+    defaultValue: 1h
+    summary: 'Time offset of the query range, in ##d##h format.'
+    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start-time
+    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+commands:
+- az_monitor_app-insights_api-key
+- az_monitor_app-insights_api-key_create
+- az_monitor_app-insights_api-key_delete
+- az_monitor_app-insights_api-key_show
+- az_monitor_app-insights_component
+- az_monitor_app-insights_component_billing
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+- az_monitor_app-insights_component_connect-webapp
+- az_monitor_app-insights_component_continues-export
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+- az_monitor_app-insights_component_create
+- az_monitor_app-insights_component_delete
+- az_monitor_app-insights_component_linked-storage
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+- az_monitor_app-insights_component_show
+- az_monitor_app-insights_component_update
+- az_monitor_app-insights_component_update-tags
+- az_monitor_app-insights_events
+- az_monitor_app-insights_events_show
+- az_monitor_app-insights_metrics
+- az_monitor_app-insights_metrics_get-metadata
+- az_monitor_app-insights_metrics_show
+- az_monitor_app-insights_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for querying data in Application Insights applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/api-key.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/api-key.yml
new file mode 100644
index 0000000000..ba8aa7e636
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/api-key.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_api-key
+name: az monitor app-insights api-key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights api-key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Operations on API keys associated with an Application Insights component.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_api-key_create
+  name: az monitor app-insights api-key create
+  summary: Create a new API key for use with an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights api-key create --api-key
+                                           --app
+                                           --resource-group
+                                           [--read-properties]
+                                           [--write-properties]
+  examples:
+  - summary: Create a component with kind web and location.
+    syntax: az monitor app-insights api-key create --api-key cli-demo --read-properties ReadTelemetry --write-properties WriteAnnotations -g demoRg --app testApp
+  - summary: Create a component with kind web and location without any permission
+    syntax: az monitor app-insights api-key create --api-key cli-demo --read-properties '""' --write-properties '""' -g demoRg --app testApp
+  requiredParameters:
+  - isRequired: true
+    name: --api-key
+    summary: Name of the API key to create.
+    description: ''
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --read-properties
+    summary: A space seperated list of names of read Roles for this API key to inherit.
+    description: ''
+  - name: --write-properties
+    summary: A space seperated list of names of write Roles for this API key to inherit.
+    description: ''
+- uid: az_monitor_app-insights_api-key_delete
+  name: az monitor app-insights api-key delete
+  summary: Delete an API key from an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights api-key delete --api-key
+                                           --app
+                                           --resource-group
+  examples:
+  - summary: Delete API Key.
+    syntax: az monitor app-insights api-key delete --app demoApp -g demoRg --api-key demo-key
+  requiredParameters:
+  - isRequired: true
+    name: --api-key
+    summary: Name of the API key to delete. Can be found using `api-key show`.
+    description: ''
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_api-key_show
+  name: az monitor app-insights api-key show
+  summary: Get all keys or a specific API key associated with an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights api-key show --app
+                                         --resource-group
+                                         [--api-key]
+  examples:
+  - summary: Fetch API Key.
+    syntax: az monitor app-insights api-key show --app demoApp -g demoRg --api-key demo-key
+  - summary: Fetch API Keys.
+    syntax: az monitor app-insights api-key show --app demoApp -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --api-key
+    summary: Name of the API key to fetch. Can be found using `api-key show`.
+    description: ''
+commands:
+- az_monitor_app-insights_api-key_create
+- az_monitor_app-insights_api-key_delete
+- az_monitor_app-insights_api-key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Operations on API keys associated with an Application Insights component.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component.yml
new file mode 100644
index 0000000000..1413785b33
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component
+name: az monitor app-insights component
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage an Application Insights component or its subcomponents.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_connect-webapp
+  name: az monitor app-insights component connect-webapp
+  summary: Connect AI to a web app.
+  description: ''
+  syntax: >-
+    az monitor app-insights component connect-webapp --name
+                                                     --resource-group
+                                                     [--enable-debugger {false, true}]
+                                                     [--enable-profiler {false, true}]
+  examples:
+  - summary: Connect AI to a web app and enable both profiler and snapshot debugger for the web app.
+    syntax: az monitor app-insights component connect-webapp -g myRG -n myApp --enable-profiler --enable-snapshot-debugger
+  - summary: Connect AI to a web app using resource id and enable profiler and disable snapshot debugger for the web app.
+    syntax: az monitor app-insights component connect-webapp --ids /subscriptions/mySub/resourceGroups/myRG/providers/Microsoft.Web/sites/myApp --enable-profiler --enable-snapshot-debugger false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the web app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-debugger --enable-snapshot-debugger
+    parameterValueGroup: false, true
+    summary: Enable snapshot debugger when an exception is thrown. Currently it is only supported for .NET/.NET Core Web Apps.
+    description: ''
+  - name: --enable-profiler
+    parameterValueGroup: false, true
+    summary: Enable collecting profiling traces that help you see where time is spent in code. Currently it is only supported for .NET/.NET Core Web Apps.
+    description: ''
+- uid: az_monitor_app-insights_component_create
+  name: az monitor app-insights component create
+  summary: Create a new Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component create --app
+                                             --location
+                                             --resource-group
+                                             [--application-type]
+                                             [--ingestion-access {Disabled, Enabled}]
+                                             [--kind]
+                                             [--query-access {Disabled, Enabled}]
+                                             [--retention-time]
+                                             [--tags]
+                                             [--workspace]
+  examples:
+  - summary: Create a component with kind web and location.
+    syntax: az monitor app-insights component create --app demoApp --location westus2 --kind web -g demoRg --application-type web --retention-time 120
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-type
+    defaultValue: web
+    summary: Type of application being monitored.
+    description: ''
+  - name: --ingestion-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights ingestion.
+    description: ''
+  - name: --kind -k
+    defaultValue: web
+    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
+    description: ''
+  - name: --query-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights query.
+    description: ''
+  - name: --retention-time
+    summary: 'Retention in days for Application Insights. The value can be one of the following values: 30,60,90,120,180,270,365,550,730. It can be set only when Application Insights is not connected to a Log Analytics workspace.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --workspace
+    summary: Name or resource ID of a log analytics workspace.
+    description: ''
+- uid: az_monitor_app-insights_component_delete
+  name: az monitor app-insights component delete
+  summary: Delete a new Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component delete --app
+                                             --resource-group
+  examples:
+  - summary: Delete a component with kind web and location.
+    syntax: az monitor app-insights component delete --app demoApp -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_show
+  name: az monitor app-insights component show
+  summary: Get an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component show [--app]
+                                           [--resource-group]
+  examples:
+  - summary: Get a component by name.
+    syntax: az monitor app-insights component show --app demoApp -g demoRg
+  - summary: List components in a resource group.
+    syntax: az monitor app-insights component show -g demoRg
+  - summary: List components in the currently selected subscription.
+    syntax: az monitor app-insights component show
+  optionalParameters:
+  - name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_update
+  name: az monitor app-insights component update
+  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
+  description: ''
+  syntax: >-
+    az monitor app-insights component update --app
+                                             --resource-group
+                                             [--ingestion-access {Disabled, Enabled}]
+                                             [--kind]
+                                             [--query-access {Disabled, Enabled}]
+                                             [--retention-time]
+                                             [--workspace]
+  examples:
+  - summary: Update a component with kind web.
+    syntax: az monitor app-insights component update --app demoApp -k web -g demoRg --retention-time 120
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --ingestion-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights ingestion.
+    description: ''
+  - name: --kind -k
+    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
+    description: ''
+  - name: --query-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights query.
+    description: ''
+  - name: --retention-time
+    summary: 'Retention in days for Application Insights. The value can be one of the following values: 30,60,90,120,180,270,365,550,730. It can be set only when Application Insights is not connected to a Log Analytics workspace.'
+    description: ''
+  - name: --workspace
+    summary: Name or resource ID of a log analytics workspace.
+    description: ''
+- uid: az_monitor_app-insights_component_update-tags
+  name: az monitor app-insights component update-tags
+  summary: Update tags on an existing Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component update-tags --app
+                                                  --resource-group
+                                                  --tags
+  examples:
+  - summary: Update the tag 'name' to equal 'value'.
+    syntax: az monitor app-insights component update-tags --app demoApp --tags name=value -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_monitor_app-insights_component_billing
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+- az_monitor_app-insights_component_connect-webapp
+- az_monitor_app-insights_component_continues-export
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+- az_monitor_app-insights_component_create
+- az_monitor_app-insights_component_delete
+- az_monitor_app-insights_component_linked-storage
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+- az_monitor_app-insights_component_show
+- az_monitor_app-insights_component_update
+- az_monitor_app-insights_component_update-tags
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage an Application Insights component or its subcomponents.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/billing.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/billing.yml
new file mode 100644
index 0000000000..63111d2975
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/billing.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component_billing
+name: az monitor app-insights component billing
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component billing** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage an Application Insights component billing features.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_billing_show
+  name: az monitor app-insights component billing show
+  summary: Show the billing features of an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component billing show --app
+                                                   --resource-group
+  examples:
+  - summary: Show the billing features of an application insights component
+    syntax: az monitor app-insights component billing show --app demoApp -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_billing_update
+  name: az monitor app-insights component billing update
+  summary: Update the billing features of an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component billing update --app
+                                                     --resource-group
+                                                     [--cap]
+                                                     [--stop {false, true}]
+  examples:
+  - summary: Update the daily cap of the billing features
+    syntax: az monitor app-insights component billing update --app demoApp -g demoRg --cap 200 --stop
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cap
+    summary: Daily data volume cap in GB.
+    description: ''
+  - name: --stop -s
+    parameterValueGroup: false, true
+    summary: Do not send a notification email when the daily data volume cap is met.
+    description: ''
+commands:
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage an Application Insights component billing features.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/continues-export.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/continues-export.yml
new file mode 100644
index 0000000000..216f8c9750
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/continues-export.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component_continues-export
+name: az monitor app-insights component continues-export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component continues-export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Continuous Export configurations for an Application Insights component.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_continues-export_create
+  name: az monitor app-insights component continues-export create
+  summary: Create a Continuous Export configuration for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export create --app
+                                                              --dest-account
+                                                              --dest-container
+                                                              --dest-sas
+                                                              --dest-sub-id
+                                                              --record-types {Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests}
+                                                              --resource-group
+                                                              [--dest-type {Blob}]
+                                                              [--is-enabled {false, true}]
+  examples:
+  - summary: Create a Continuous Export configuration.
+    syntax: >-
+      az monitor app-insights component continues-export create -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --record-types Requests Event Exceptions Metrics PageViews \
+
+      --dest-account account --dest-container container --dest-sub-id sub-id \
+
+      --dest-sas se=2020-10-27&sp=w&sv=2018-11-09&sr=c
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --dest-account
+    summary: The name of destination storage account.
+    description: ''
+  - isRequired: true
+    name: --dest-container
+    summary: The name of the destination storage container.
+    description: ''
+  - isRequired: true
+    name: --dest-sas
+    summary: The SAS token for the destination storage container. It must grant write permission.
+    description: ''
+  - isRequired: true
+    name: --dest-sub-id
+    summary: The subscription ID of the destination storage account.
+    description: ''
+  - isRequired: true
+    name: --record-types
+    parameterValueGroup: Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests
+    summary: The document types to be exported, as comma separated values. Allowed values include 'Requests', 'Event', 'Exceptions', 'Metrics', 'PageViews', 'PageViewPerformance', 'Rdd', 'PerformanceCounters', 'Availability', 'Messages'.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dest-type
+    defaultValue: Blob
+    parameterValueGroup: Blob
+    summary: The Continuous Export destination type. This has to be 'Blob'.
+    description: ''
+  - name: --is-enabled
+    defaultValue: "true"
+    parameterValueGroup: false, true
+    summary: Set to 'true' to create a Continuous Export configuration as enabled, otherwise set it to 'false'.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_delete
+  name: az monitor app-insights component continues-export delete
+  summary: Delete a specific Continuous Export configuration of an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export delete --app
+                                                              --id
+                                                              --resource-group
+                                                              [--yes]
+  examples:
+  - summary: Delete a Continuous Export configuration by ID.
+    syntax: >-
+      az monitor app-insights component continues-export delete -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --id
+    summary: The Continuous Export configuration ID. This is unique within a Application Insights component.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_list
+  name: az monitor app-insights component continues-export list
+  summary: List Continuous Export configurations for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export list --app
+                                                            --resource-group
+  examples:
+  - summary: ExportConfigurationsList
+    syntax: >-
+      az monitor app-insights component continues-export list -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_show
+  name: az monitor app-insights component continues-export show
+  summary: Get a specific Continuous Export configuration of an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export show --app
+                                                            --id
+                                                            --resource-group
+  examples:
+  - summary: Get a Continuous Export configuration by ID.
+    syntax: >-
+      az monitor app-insights component continues-export show -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --id
+    summary: The Continuous Export configuration ID. This is unique within a Application Insights component.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_update
+  name: az monitor app-insights component continues-export update
+  summary: Update a Continuous Export configuration for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export update --app
+                                                              --id
+                                                              --resource-group
+                                                              [--dest-account]
+                                                              [--dest-container]
+                                                              [--dest-sas]
+                                                              [--dest-sub-id]
+                                                              [--dest-type {Blob}]
+                                                              [--is-enabled {false, true}]
+                                                              [--record-types {Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests}]
+  examples:
+  - summary: Update a Continuous Export configuration record-types.
+    syntax: >-
+      az monitor app-insights component continues-export update -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid \
+
+      --record-types Requests Event Exceptions Metrics PageViews
+  - summary: Update a Continuous Export configuration storage destination.
+    syntax: >-
+      az monitor app-insights component continues-export update -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid \
+
+      --dest-account account --dest-container container --dest-sub-id sub-id \
+
+      --dest-sas se=2020-10-27&sp=w&sv=2018-11-09&sr=c
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --id
+    summary: The Continuous Export configuration ID. This is unique within a Application Insights component.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dest-account
+    summary: The name of destination storage account.
+    description: ''
+  - name: --dest-container
+    summary: The name of the destination storage container.
+    description: ''
+  - name: --dest-sas
+    summary: The SAS token for the destination storage container. It must grant write permission.
+    description: ''
+  - name: --dest-sub-id
+    summary: The subscription ID of the destination storage account.
+    description: ''
+  - name: --dest-type
+    parameterValueGroup: Blob
+    summary: The Continuous Export destination type. This has to be 'Blob'.
+    description: ''
+  - name: --is-enabled
+    parameterValueGroup: false, true
+    summary: Set to 'true' to create a Continuous Export configuration as enabled, otherwise set it to 'false'.
+    description: ''
+  - name: --record-types
+    parameterValueGroup: Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests
+    summary: The document types to be exported, as comma separated values. Allowed values include 'Requests', 'Event', 'Exceptions', 'Metrics', 'PageViews', 'PageViewPerformance', 'Rdd', 'PerformanceCounters', 'Availability', 'Messages'.
+    description: ''
+commands:
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Continuous Export configurations for an Application Insights component.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/linked-storage.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/linked-storage.yml
new file mode 100644
index 0000000000..af92c32aa7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/component/linked-storage.yml
@@ -0,0 +1,106 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component_linked-storage
+name: az monitor app-insights component linked-storage
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component linked-storage** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage linked storage account for an Application Insights component.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_linked-storage_link
+  name: az monitor app-insights component linked-storage link
+  summary: Link a storage account with an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage link --app
+                                                          --resource-group
+                                                          --storage-account
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-account -s
+    summary: Name or ID of a linked storage account.
+    description: ''
+- uid: az_monitor_app-insights_component_linked-storage_show
+  name: az monitor app-insights component linked-storage show
+  summary: Show the details of linked storage account for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage show --app
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_linked-storage_unlink
+  name: az monitor app-insights component linked-storage unlink
+  summary: Unlink a storage account with an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage unlink --app
+                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_linked-storage_update
+  name: az monitor app-insights component linked-storage update
+  summary: Update the linked storage account for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage update --app
+                                                            --resource-group
+                                                            --storage-account
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-account -s
+    summary: Name or ID of a linked storage account.
+    description: ''
+commands:
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage linked storage account for an Application Insights component.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/events.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/events.yml
new file mode 100644
index 0000000000..cc9cae880a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/events.yml
@@ -0,0 +1,72 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_events
+name: az monitor app-insights events
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights events** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Retrieve events from an application.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_events_show
+  name: az monitor app-insights events show
+  summary: List events by type or view a single event from an application, specified by type and ID.
+  description: ''
+  syntax: >-
+    az monitor app-insights events show --app
+                                        --type
+                                        [--end-time]
+                                        [--event]
+                                        [--offset]
+                                        [--resource-group]
+                                        [--start-time]
+  examples:
+  - summary: Get an availability result by ID.
+    syntax: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --event b2cf08df-bf42-4278-8d2c-5b55f85901fe
+  - summary: List availability results from the last 24 hours.
+    syntax: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --offset 24h
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: The type of events to retrieve.
+    description: ''
+  optionalParameters:
+  - name: --end-time
+    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --event
+    summary: GUID of the event to retrieve. This could be obtained by first listing and filtering events, then selecting an event of interest.
+    description: ''
+  - name: --offset
+    defaultValue: 1h
+    summary: 'Time offset of the query range, in ##d##h format.'
+    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start-time
+    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+commands:
+- az_monitor_app-insights_events_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Retrieve events from an application.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/metrics.yml b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/metrics.yml
new file mode 100644
index 0000000000..bfdc02d42d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/app-insights/metrics.yml
@@ -0,0 +1,110 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_metrics
+name: az monitor app-insights metrics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights metrics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Retrieve metrics from an application.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_metrics_get-metadata
+  name: az monitor app-insights metrics get-metadata
+  summary: Get the metadata for metrics on a particular application.
+  description: ''
+  syntax: >-
+    az monitor app-insights metrics get-metadata --app
+                                                 [--resource-group]
+  examples:
+  - summary: Views the metadata for the provided app.
+    syntax: az monitor app-insights metrics get-metadata --app e292531c-eb03-4079-9bb0-fe6b56b99f8b
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_metrics_show
+  name: az monitor app-insights metrics show
+  summary: View the value of a single metric.
+  description: ''
+  syntax: >-
+    az monitor app-insights metrics show --app
+                                         --metrics
+                                         [--aggregation]
+                                         [--end-time]
+                                         [--filter]
+                                         [--interval]
+                                         [--offset]
+                                         [--orderby]
+                                         [--resource-group]
+                                         [--segment]
+                                         [--start-time]
+                                         [--top]
+  examples:
+  - summary: View the count of availabilityResults events.
+    syntax: az monitor app-insights metrics show --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --metric availabilityResults/count
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --metrics -m
+    summary: The metric to retrieve. May be either a standard AI metric or an application-specific custom metric.
+    description: ''
+  optionalParameters:
+  - name: --aggregation
+    summary: The aggregation to use when computing the metric values. To retrieve more than one aggregation at a time, separate them with a comma. If no aggregation is specified, then the default aggregation for the metric is used.
+    description: ''
+  - name: --end-time
+    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --filter
+    summary: An expression used to filter the results.  This value should be a valid OData filter expression where the keys of each clause should be applicable dimensions for the metric you are retrieving.
+    description: ''
+  - name: --interval
+    summary: 'The interval over which to aggregate metrics, in ##h##m format.'
+    description: ''
+  - name: --offset
+    defaultValue: 1h
+    summary: 'Time offset of the query range, in ##d##h format.'
+    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
+  - name: --orderby
+    summary: The aggregation function and direction to sort the segments by.  This value is only valid when segment is specified.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --segment
+    summary: The name of the dimension to segment the metric values by. This dimension must be applicable to the metric you are retrieving. To segment by more than one dimension at a time, separate them with a comma (,). In this case, the metric data will be segmented in the order the dimensions are listed in the parameter.
+    description: ''
+  - name: --start-time
+    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --top
+    summary: The number of segments to return.  This value is only valid when segment is specified.
+    description: ''
+commands:
+- az_monitor_app-insights_metrics_get-metadata
+- az_monitor_app-insights_metrics_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Retrieve metrics from an application.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection.yml
new file mode 100644
index 0000000000..d68f425b2e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection
+name: az monitor data-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data collection for monitor control service.
+description: ''
+commands:
+- az_monitor_data-collection_rule
+- az_monitor_data-collection_rule_association
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+- az_monitor_data-collection_rule_create
+- az_monitor_data-collection_rule_data-flow
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+- az_monitor_data-collection_rule_delete
+- az_monitor_data-collection_rule_list
+- az_monitor_data-collection_rule_log-analytics
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+- az_monitor_data-collection_rule_performance-counter
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+- az_monitor_data-collection_rule_show
+- az_monitor_data-collection_rule_syslog
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+- az_monitor_data-collection_rule_update
+- az_monitor_data-collection_rule_windows-event-log
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data collection for monitor control service.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule.yml
new file mode 100644
index 0000000000..c8bb4376ee
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule.yml
@@ -0,0 +1,365 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule
+name: az monitor data-collection rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data collection rule for monitor control service.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_create
+  name: az monitor data-collection rule create
+  summary: Create a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule create --name
+                                           --resource-group
+                                           [--data-flows]
+                                           [--description]
+                                           [--extensions]
+                                           [--location]
+                                           [--log-analytics]
+                                           [--monitor-metrics]
+                                           [--performance-counters]
+                                           [--syslog]
+                                           [--tags]
+                                           [--windows-event-logs]
+  examples:
+  - summary: Create data collection rule
+    syntax: az monitor data-collection rule create --resource-group "myResourceGroup" --location "eastus" --name "myCollectionRule" --data-flows destinations="centralWorkspace" streams="Microsoft-Perf" streams="Microsoft-Syslog" streams="Microsoft-WindowsEvent" --log-analytics name="centralWorkspace" resource-id="/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace" --performance-counters name="cloudTeamCoreCounters" counter-specifiers="\\Processor(_Total)\\% Processor Time" counter-specifiers="\\Memory\\Committed Bytes" counter-specifiers="\\LogicalDisk(_Total)\\Free Megabytes" counter-specifiers="\\PhysicalDisk(_Total)\\Avg. Disk Queue Length" sampling-frequency=15 transfer-period="PT1M" streams="Microsoft-Perf" --performance-counters name="appTeamExtraCounters" counter-specifiers="\\Process(_Total)\\Thread Count" sampling-frequency=30 transfer-period="PT5M" streams="Microsoft-Perf" --syslog name="cronSyslog" facility-names="cron" log-levels="Debug" log-levels="Critical" log-levels="Emergency" streams="Microsoft-Syslog" --syslog name="syslogBase" facility-names="syslog" log-levels="Alert" log-levels="Critical" log-levels="Emergency" streams="Microsoft-Syslog" --windows-event-logs name="cloudSecurityTeamEvents" transfer-period="PT1M" streams="Microsoft-WindowsEvent" x-path-queries="Security!" --windows-event-logs name="appTeam1AppEvents" transfer-period="PT5M" streams="Microsoft-WindowsEvent" x-path-queries="System![System[(Level = 1 or Level = 2 or Level = 3)]]" x-path-queries="Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-flows
+    summary: The specification of data flows.
+    description: >-
+      Usage: --data-flows streams=XX1 streams=XX2 destinations=XX1 destinations=XX2
+
+
+      streams: Required. List of streams for this data flow.
+
+      destinations: Required. List of destinations for this data flow.
+
+
+      Multiple actions can be specified by using more than one --data-flows argument.
+  - name: --description
+    summary: Description of the data collection rule.
+    description: ''
+  - name: --extensions
+    summary: 'The list of Azure VM extension data source configurations. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-analytics
+    summary: List of Log Analytics destinations.
+    description: >-
+      Usage: --log-analytics resource-id=XX name=XX
+
+
+      resource-id: Required. The resource ID of the Log Analytics workspace.
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --log-analytics argument.
+  - name: --monitor-metrics
+    summary: Azure Monitor Metrics destination.
+    description: >-
+      Usage: --monitor-metrics name=XX
+
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+  - name: --performance-counters
+    summary: The list of performance counter data source configurations.
+    description: >-
+      Usage: --performance-counters streams=XX1 streams=XX2 transfer-period=XX sampling-frequency=XX counter-specifiers=XX1 counter-specifiers=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      sampling-frequency: Required. The number of seconds between consecutive counter measurements (samples).
+
+      counter-specifiers: Required. A list of specifier names of the performance counters you want to collect. Use a wildcard (*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --performance-counters argument.
+  - name: --syslog
+    summary: The list of Syslog data source configurations.
+    description: >-
+      Usage: --syslog streams=XX1 streams=XX2 facility-names=XX1 facility-names=XX2 log-levels=XX1 log-levels=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      facility-names: Required. The list of facility names.
+
+      log-levels: The log levels to collect.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --syslog argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --windows-event-logs
+    summary: The list of Windows Event Log data source configurations.
+    description: >-
+      Usage: --windows-event-logs streams=XX1 streams=XX2 transfer-period=XX x-path-queries=XX1 x-path-queries=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      x-path-queries: Required. A list of Windows Event Log queries in XPATH format.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --windows-event-logs argument.
+- uid: az_monitor_data-collection_rule_delete
+  name: az monitor data-collection rule delete
+  summary: Deletes a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule delete --name
+                                           --resource-group
+                                           [--yes]
+  examples:
+  - summary: Delete data collection rule
+    syntax: az monitor data-collection rule delete --name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_data-collection_rule_list
+  name: az monitor data-collection rule list
+  summary: List all data collection rules in the specified resource group. And Lists all data collection rules in the specified subscription.
+  description: ''
+  syntax: az monitor data-collection rule list [--resource-group]
+  examples:
+  - summary: List data collection rules by resource group
+    syntax: az monitor data-collection rule list --resource-group "myResourceGroup"
+  - summary: List data collection rules by subscription
+    syntax: az monitor data-collection rule list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_data-collection_rule_show
+  name: az monitor data-collection rule show
+  summary: Return the specified data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule show --name
+                                         --resource-group
+  examples:
+  - summary: Get data collection rule
+    syntax: az monitor data-collection rule show --name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_data-collection_rule_update
+  name: az monitor data-collection rule update
+  summary: Update a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule update --name
+                                           --resource-group
+                                           [--data-flows]
+                                           [--description]
+                                           [--extensions]
+                                           [--log-analytics]
+                                           [--monitor-metrics]
+                                           [--performance-counters]
+                                           [--syslog]
+                                           [--tags]
+                                           [--windows-event-logs]
+  examples:
+  - summary: Update data collection rule
+    syntax: az monitor data-collection rule update --resource-group "myResourceGroup" --name "myCollectionRule" --data-flows destinations="centralWorkspace" streams="Microsoft-Perf" streams="Microsoft-Syslog" streams="Microsoft-WindowsEvent" --log-analytics name="centralWorkspace" resource-id="/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace" --performance-counters name="appTeamExtraCounters" counter-specifiers="\\Process(_Total)\\Thread Count" sampling-frequency=30 transfer-period="PT5M" streams="Microsoft-Perf" --syslog name="cronSyslog" facility-names="cron" log-levels="Debug" log-levels="Critical" log-levels="Emergency" streams="Microsoft-Syslog" --windows-event-logs name="cloudSecurityTeamEvents" transfer-period="PT1M" streams="Microsoft-WindowsEvent" x-path-queries="Security!"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-flows
+    summary: The specification of data flows.
+    description: >-
+      Usage: --data-flows streams=XX1 streams=XX2 destinations=XX1 destinations=XX2
+
+
+      streams: Required. List of streams for this data flow.
+
+      destinations: Required. List of destinations for this data flow.
+
+
+      Multiple actions can be specified by using more than one --data-flows argument.
+  - name: --description
+    summary: Description of the data collection rule.
+    description: ''
+  - name: --extensions
+    summary: 'The list of Azure VM extension data source configurations. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --log-analytics
+    summary: List of Log Analytics destinations.
+    description: >-
+      Usage: --log-analytics resource-id=XX name=XX
+
+
+      resource-id: Required. The resource ID of the Log Analytics workspace.
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --log-analytics argument.
+  - name: --monitor-metrics
+    summary: Azure Monitor Metrics destination.
+    description: >-
+      Usage: --monitor-metrics name=XX
+
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+  - name: --performance-counters
+    summary: The list of performance counter data source configurations.
+    description: >-
+      Usage: --performance-counters streams=XX1 streams=XX2 transfer-period=XX sampling-frequency=XX counter-specifiers=XX1 counter-specifiers=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      sampling-frequency: Required. The number of seconds between consecutive counter measurements (samples).
+
+      counter-specifiers: Required. A list of specifier names of the performance counters you want to collect. Use a wildcard (*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --performance-counters argument.
+  - name: --syslog
+    summary: The list of Syslog data source configurations.
+    description: >-
+      Usage: --syslog streams=XX1 streams=XX2 facility-names=XX1 facility-names=XX2 log-levels=XX1 log-levels=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      facility-names: Required. The list of facility names.
+
+      log-levels: The log levels to collect.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --syslog argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --windows-event-logs
+    summary: The list of Windows Event Log data source configurations.
+    description: >-
+      Usage: --windows-event-logs streams=XX1 streams=XX2 transfer-period=XX x-path-queries=XX1 x-path-queries=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      x-path-queries: Required. A list of Windows Event Log queries in XPATH format.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --windows-event-logs argument.
+commands:
+- az_monitor_data-collection_rule_association
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+- az_monitor_data-collection_rule_create
+- az_monitor_data-collection_rule_data-flow
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+- az_monitor_data-collection_rule_delete
+- az_monitor_data-collection_rule_list
+- az_monitor_data-collection_rule_log-analytics
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+- az_monitor_data-collection_rule_performance-counter
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+- az_monitor_data-collection_rule_show
+- az_monitor_data-collection_rule_syslog
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+- az_monitor_data-collection_rule_update
+- az_monitor_data-collection_rule_windows-event-log
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data collection rule for monitor control service.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/association.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/association.yml
new file mode 100644
index 0000000000..d145962db5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/association.yml
@@ -0,0 +1,155 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_association
+name: az monitor data-collection rule association
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule association** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data collection rule association for monitor control service.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_association_create
+  name: az monitor data-collection rule association create
+  summary: Create an association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association create --name
+                                                       --resource
+                                                       [--description]
+                                                       [--rule-id]
+  examples:
+  - summary: Create association
+    syntax: az monitor data-collection rule association create --name "myAssociation" --rule-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Insights/dataCollectionRules/myCollectionRule" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the association.
+    description: ''
+  - name: --rule-id
+    summary: The resource ID of the data collection rule that is to be associated.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_delete
+  name: az monitor data-collection rule association delete
+  summary: Delete an association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association delete --name
+                                                       --resource
+                                                       [--yes]
+  examples:
+  - summary: Delete association
+    syntax: az monitor data-collection rule association delete --name "myAssociation" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_list
+  name: az monitor data-collection rule association list
+  summary: List associations for the specified data collection rule. And Lists associations for the specified resource.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association list [--resource]
+                                                     [--resource-group]
+                                                     [--rule-name]
+  examples:
+  - summary: List associations for specified data collection rule
+    syntax: az monitor data-collection rule association list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  - summary: List associations for specified resource
+    syntax: az monitor data-collection rule association list --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  optionalParameters:
+  - name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_show
+  name: az monitor data-collection rule association show
+  summary: Return the specified association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association show --name
+                                                     --resource
+  examples:
+  - summary: Get association
+    syntax: az monitor data-collection rule association show --name "myAssociation" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_update
+  name: az monitor data-collection rule association update
+  summary: Update an association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association update --name
+                                                       --resource
+                                                       [--description]
+                                                       [--rule-id]
+  examples:
+  - summary: Update association
+    syntax: az monitor data-collection rule association update --name "myAssociation" --rule-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Insights/dataCollectionRules/myCollectionRule" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the association.
+    description: ''
+  - name: --rule-id
+    summary: The resource ID of the data collection rule that is to be associated.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data collection rule association for monitor control service.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/data-flow.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/data-flow.yml
new file mode 100644
index 0000000000..3131f92e1d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/data-flow.yml
@@ -0,0 +1,79 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_data-flow
+name: az monitor data-collection rule data-flow
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule data-flow** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data flows.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_data-flow_add
+  name: az monitor data-collection rule data-flow add
+  summary: Add a data flow.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule data-flow add --destinations
+                                                  --resource-group
+                                                  --rule-name
+                                                  --streams {Microsoft-AntiMalwareStatus, Microsoft-Auditd, Microsoft-CISCOASA, Microsoft-CommonSecurityLog, Microsoft-ComputerGroup, Microsoft-Event, Microsoft-FirewallLog, Microsoft-HealthStateChange, Microsoft-Heartbeat, Microsoft-InsightsMetrics, Microsoft-OperationLog, Microsoft-Perf, Microsoft-ProcessInvestigator, Microsoft-ProtectionStatus, Microsoft-RomeDetectionEvent, Microsoft-SecurityBaseline, Microsoft-SecurityBaselineSummary, Microsoft-SecurityEvent, Microsoft-Syslog, Microsoft-WindowsEvent}
+  examples:
+  - summary: Add a data flow
+    syntax: az monitor data-collection rule data-flow add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --destinations XX3 XX4 --streams "Microsoft-Perf" "Microsoft-WindowsEvent"
+  requiredParameters:
+  - isRequired: true
+    name: --destinations
+    summary: List of destinations for this data flow.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-AntiMalwareStatus, Microsoft-Auditd, Microsoft-CISCOASA, Microsoft-CommonSecurityLog, Microsoft-ComputerGroup, Microsoft-Event, Microsoft-FirewallLog, Microsoft-HealthStateChange, Microsoft-Heartbeat, Microsoft-InsightsMetrics, Microsoft-OperationLog, Microsoft-Perf, Microsoft-ProcessInvestigator, Microsoft-ProtectionStatus, Microsoft-RomeDetectionEvent, Microsoft-SecurityBaseline, Microsoft-SecurityBaselineSummary, Microsoft-SecurityEvent, Microsoft-Syslog, Microsoft-WindowsEvent
+    summary: List of streams for this data flow.
+    description: ''
+- uid: az_monitor_data-collection_rule_data-flow_list
+  name: az monitor data-collection rule data-flow list
+  summary: List data flows.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule data-flow list --resource-group
+                                                   --rule-name
+  examples:
+  - summary: List data flows
+    syntax: az monitor data-collection rule data-flow list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data flows.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/log-analytics.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/log-analytics.yml
new file mode 100644
index 0000000000..9ffbd9e480
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/log-analytics.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_log-analytics
+name: az monitor data-collection rule log-analytics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule log-analytics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Log Analytics destinations.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_log-analytics_add
+  name: az monitor data-collection rule log-analytics add
+  summary: Add Log Analytics destinations of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics add --name
+                                                      --resource-group
+                                                      --resource-id
+                                                      --rule-name
+  examples:
+  - summary: Add Log Analytics destinations of a data collection rule
+    syntax: az monitor data-collection rule log-analytics add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "workspace2" --resource-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/workspace2"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: The resource ID of the Log Analytics workspace.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_delete
+  name: az monitor data-collection rule log-analytics delete
+  summary: Delete a Log Analytics destinations of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics delete --name
+                                                         --resource-group
+                                                         --rule-name
+  examples:
+  - summary: Delete a Log Analytics destinations of a data collection rule
+    syntax: az monitor data-collection rule log-analytics delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "workspace2"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_list
+  name: az monitor data-collection rule log-analytics list
+  summary: List Log Analytics destinations of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics list --resource-group
+                                                       --rule-name
+  examples:
+  - summary: List Log Analytics destinations of a data collection rule
+    syntax: az monitor data-collection rule log-analytics list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_show
+  name: az monitor data-collection rule log-analytics show
+  summary: Show a Log Analytics destination of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics show --name
+                                                       --resource-group
+                                                       --rule-name
+  examples:
+  - summary: Show a Log Analytics destination of a data collection rule
+    syntax: az monitor data-collection rule log-analytics show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "centralWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_update
+  name: az monitor data-collection rule log-analytics update
+  summary: Update a Log Analytics destination of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics update --name
+                                                         --resource-group
+                                                         --rule-name
+                                                         [--resource-id]
+  examples:
+  - summary: Update a Log Analytics destination of a data collection rule
+    syntax: az monitor data-collection rule log-analytics update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "workspace2" --resource-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/anotherWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --resource-id
+    summary: The resource ID of the Log Analytics workspace.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Log Analytics destinations.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/performance-counter.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/performance-counter.yml
new file mode 100644
index 0000000000..a36b805297
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/performance-counter.yml
@@ -0,0 +1,189 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_performance-counter
+name: az monitor data-collection rule performance-counter
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule performance-counter** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Log performance counter data source.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_performance-counter_add
+  name: az monitor data-collection rule performance-counter add
+  summary: Add a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter add --counter-specifiers
+                                                            --name
+                                                            --resource-group
+                                                            --rule-name
+                                                            --sampling-frequency
+                                                            --streams {Microsoft-InsightsMetrics, Microsoft-Perf}
+                                                            --transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}
+  examples:
+  - summary: Add a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "team2ExtraCounters" --streams "Microsoft-Perf" --counter-specifiers "\\Process(_Total)\\Thread Count" "\\LogicalDisk(_Total)\\Free Megabytes" --sampling-frequency 30 --transfer-period PT15M
+  requiredParameters:
+  - isRequired: true
+    name: --counter-specifiers
+    summary: A list of specifier names of the performance counters you want to collect.Use a wildcard (\*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --sampling-frequency
+    summary: The number of seconds between consecutive counter measurements (samples).
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-InsightsMetrics, Microsoft-Perf
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - isRequired: true
+    name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_delete
+  name: az monitor data-collection rule performance-counter delete
+  summary: Delete a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter delete --name
+                                                               --resource-group
+                                                               --rule-name
+  examples:
+  - summary: Delete a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "team2ExtraCounters"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_list
+  name: az monitor data-collection rule performance-counter list
+  summary: List Log performance counter data sources.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter list --resource-group
+                                                             --rule-name
+  examples:
+  - summary: List Log performance counter data sources
+    syntax: az monitor data-collection rule performance-counter list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_show
+  name: az monitor data-collection rule performance-counter show
+  summary: Show a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter show --name
+                                                             --resource-group
+                                                             --rule-name
+  examples:
+  - summary: Show a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeamExtraCounters"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_update
+  name: az monitor data-collection rule performance-counter update
+  summary: Update a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter update --name
+                                                               --resource-group
+                                                               --rule-name
+                                                               [--counter-specifiers]
+                                                               [--sampling-frequency]
+                                                               [--streams {Microsoft-InsightsMetrics, Microsoft-Perf}]
+                                                               [--transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}]
+  examples:
+  - summary: Update a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "team2ExtraCounters" --transfer-period PT1M
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --counter-specifiers
+    summary: A list of specifier names of the performance counters you want to collect.Use a wildcard (\*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+    description: ''
+  - name: --sampling-frequency
+    summary: The number of seconds between consecutive counter measurements (samples).
+    description: ''
+  - name: --streams
+    parameterValueGroup: Microsoft-InsightsMetrics, Microsoft-Perf
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Log performance counter data source.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/syslog.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/syslog.yml
new file mode 100644
index 0000000000..492b79b165
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/syslog.yml
@@ -0,0 +1,182 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_syslog
+name: az monitor data-collection rule syslog
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule syslog** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Syslog data source.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_syslog_add
+  name: az monitor data-collection rule syslog add
+  summary: Add a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog add --facility-names {UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user}
+                                               --name
+                                               --resource-group
+                                               --rule-name
+                                               --streams {Microsoft-Syslog}
+                                               [--log-levels {Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning}]
+  examples:
+  - summary: Add a Syslog data source
+    syntax: az monitor data-collection rule syslog add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase" --facility-names "syslog" --log-levels "Alert" "Critical" --streams "Microsoft-Syslog"
+  requiredParameters:
+  - isRequired: true
+    name: --facility-names
+    parameterValueGroup: UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user
+    summary: The list of facility names.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-Syslog
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  optionalParameters:
+  - name: --log-levels
+    parameterValueGroup: Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning
+    summary: The log levels to collect.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_delete
+  name: az monitor data-collection rule syslog delete
+  summary: Delete a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog delete --name
+                                                  --resource-group
+                                                  --rule-name
+  examples:
+  - summary: Delete a Syslog data source
+    syntax: az monitor data-collection rule syslog delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_list
+  name: az monitor data-collection rule syslog list
+  summary: List Syslog data sources.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog list --resource-group
+                                                --rule-name
+  examples:
+  - summary: List Syslog data sources
+    syntax: az monitor data-collection rule syslog list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_show
+  name: az monitor data-collection rule syslog show
+  summary: Show a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog show --name
+                                                --resource-group
+                                                --rule-name
+  examples:
+  - summary: Show a Syslog data source
+    syntax: az monitor data-collection rule syslog show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_update
+  name: az monitor data-collection rule syslog update
+  summary: Update a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog update --name
+                                                  --resource-group
+                                                  --rule-name
+                                                  [--facility-names {UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user}]
+                                                  [--log-levels {Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning}]
+                                                  [--streams {Microsoft-Syslog}]
+  examples:
+  - summary: Update a Syslog data source
+    syntax: az monitor data-collection rule syslog update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase" --facility-names "syslog" --log-levels "Emergency" "Critical"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --facility-names
+    parameterValueGroup: UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user
+    summary: The list of facility names.
+    description: ''
+  - name: --log-levels
+    parameterValueGroup: Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning
+    summary: The log levels to collect.
+    description: ''
+  - name: --streams
+    parameterValueGroup: Microsoft-Syslog
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Syslog data source.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/windows-event-log.yml b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/windows-event-log.yml
new file mode 100644
index 0000000000..883ba9fbf2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/data-collection/rule/windows-event-log.yml
@@ -0,0 +1,180 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_windows-event-log
+name: az monitor data-collection rule windows-event-log
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule windows-event-log** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Windows Event Log data source.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_windows-event-log_add
+  name: az monitor data-collection rule windows-event-log add
+  summary: Add a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log add --name
+                                                          --resource-group
+                                                          --rule-name
+                                                          --streams {Microsoft-Event, Microsoft-WindowsEvent}
+                                                          --transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}
+                                                          --x-path-queries
+  examples:
+  - summary: Add a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents" --transfer-period "PT1M" --streams "Microsoft-WindowsEvent" --x-path-queries "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" "System![System[(Level = 1 or Level = 2 or Level = 3)]]"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-Event, Microsoft-WindowsEvent
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - isRequired: true
+    name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+  - isRequired: true
+    name: --x-path-queries
+    summary: A list of Windows Event Log queries in XPATH format.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_delete
+  name: az monitor data-collection rule windows-event-log delete
+  summary: Delete a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log delete --name
+                                                             --resource-group
+                                                             --rule-name
+  examples:
+  - summary: Delete a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_list
+  name: az monitor data-collection rule windows-event-log list
+  summary: List Windows Event Log data sources.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log list --resource-group
+                                                           --rule-name
+  examples:
+  - summary: List Windows Event Log data sources
+    syntax: az monitor data-collection rule windows-event-log list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_show
+  name: az monitor data-collection rule windows-event-log show
+  summary: Show a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log show --name
+                                                           --resource-group
+                                                           --rule-name
+  examples:
+  - summary: Show a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_update
+  name: az monitor data-collection rule windows-event-log update
+  summary: Update a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log update --name
+                                                             --resource-group
+                                                             --rule-name
+                                                             [--streams {Microsoft-Event, Microsoft-WindowsEvent}]
+                                                             [--transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}]
+                                                             [--x-path-queries]
+  examples:
+  - summary: Update a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents" --x-path-queries "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --streams
+    parameterValueGroup: Microsoft-Event, Microsoft-WindowsEvent
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+  - name: --x-path-queries
+    summary: A list of Windows Event Log queries in XPATH format.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Windows Event Log data source.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/log-analytics.yml b/2017-03-09-profile/docs-ref-autogen/monitor/log-analytics.yml
new file mode 100644
index 0000000000..c5aa4289dc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/log-analytics.yml
@@ -0,0 +1,68 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_log-analytics
+name: az monitor log-analytics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **log-analytics** extension for Azure CLI and requires version 2.0.0 or higher.  The extension will automatically install the first time you run an **az monitor log-analytics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for querying data in Log Analytics workspaces.
+description: ''
+directCommands:
+- uid: az_monitor_log-analytics_query
+  name: az monitor log-analytics query
+  summary: Query a Log Analytics workspace.
+  description: ''
+  syntax: >-
+    az monitor log-analytics query --analytics-query
+                                   --workspace
+                                   [--timespan]
+                                   [--workspaces]
+  examples:
+  - summary: Execute a simple query over past 3.5 days.
+    syntax: az monitor log-analytics query -w workspace-customId --analytics-query "AzureActivity | summarize count() by bin(timestamp, 1h)" -t P3DT12H
+  - summary: Execute a saved query in workspace
+    syntax: >-
+      QUERY=$(az monitor log-analytics workspace saved-search show -g resource-group --workspace-name workspace-name -n query-name --query query --output tsv)
+
+      az monitor log-analytics query -w workspace-customId --analytics-query "$QUERY"
+  requiredParameters:
+  - isRequired: true
+    name: --analytics-query
+    summary: Query to execute over Log Analytics data.
+    description: ''
+  - isRequired: true
+    name: --workspace -w
+    summary: GUID of the Log Analytics Workspace.
+    description: ''
+  optionalParameters:
+  - name: --timespan -t
+    summary: Timespan over which to query. Defaults to querying all available data.
+    description: ''
+  - name: --workspaces
+    summary: Additional workspaces to union data for querying. Specify additional workspace IDs separated by space.
+    description: ''
+commands:
+- az_monitor_log-analytics_query
+- az_monitor_log-analytics_solution
+- az_monitor_log-analytics_solution_create
+- az_monitor_log-analytics_solution_delete
+- az_monitor_log-analytics_solution_list
+- az_monitor_log-analytics_solution_show
+- az_monitor_log-analytics_solution_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for querying data in Log Analytics workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/log-analytics/solution.yml b/2017-03-09-profile/docs-ref-autogen/monitor/log-analytics/solution.yml
new file mode 100644
index 0000000000..2144b9de4a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/log-analytics/solution.yml
@@ -0,0 +1,179 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_log-analytics_solution
+name: az monitor log-analytics solution
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **log-analytics-solution** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az monitor log-analytics solution** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage monitor log-analytics solution.
+description: ''
+directCommands:
+- uid: az_monitor_log-analytics_solution_create
+  name: az monitor log-analytics solution create
+  summary: Create a log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution create --resource-group
+                                             --solution-type
+                                             --workspace
+                                             [--name]
+                                             [--no-wait]
+                                             [--plan-product]
+                                             [--plan-publisher]
+                                             [--tags]
+  examples:
+  - summary: Create a log-analytics solution of type Containers
+    syntax: >-
+      az monitor log-analytics solution create --resource-group MyResourceGroup \
+
+      --solution-type Containers --tags key=value \
+
+      --workspace "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
+
+      Microsoft.OperationalInsights/workspaces/{WorkspaceName}"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-type -t
+    summary: 'Type of the log-analytics solution. The most used are: SecurityCenterFree, Security, Updates, ContainerInsights, ServiceMap, AzureActivity, ChangeTracking, VMInsights, SecurityInsights, NetworkMonitoring, SQLVulnerabilityAssessment, SQLAdvancedThreatProtection, AntiMalware, AzureAutomation, LogicAppsManagement, SQLDataClassification.'
+    description: ''
+  - isRequired: true
+    name: --workspace -w
+    summary: The name or resource ID of the log analytics workspace with which the solution will be linked.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --plan-product
+    summary: Product name of the plan for solution. It should be in the format of OMSGallery/<solutionType>. This is case sensitive.
+    description: ''
+  - name: --plan-publisher
+    summary: Publisher name of the plan for solution. For gallery solution, it is Microsoft.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_monitor_log-analytics_solution_delete
+  name: az monitor log-analytics solution delete
+  summary: Delete a log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution delete --name
+                                             --resource-group
+                                             [--no-wait]
+                                             [--yes]
+  examples:
+  - summary: Delete a log-analytics solution
+    syntax: az monitor log-analytics solution delete --resource-group MyResourceGroup --name SolutionName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_log-analytics_solution_list
+  name: az monitor log-analytics solution list
+  summary: List all of the log-analytics solutions in the specified subscription or resource group.
+  description: ''
+  syntax: az monitor log-analytics solution list [--resource-group]
+  examples:
+  - summary: List all log-analytics solutions in the current subscription
+    syntax: az monitor log-analytics solution list
+  - summary: List all log-analytics solutions in a subscription
+    syntax: az monitor log-analytics solution list --subscription MySubscription
+  - summary: List all log-analytics solutions in a resource group
+    syntax: az monitor log-analytics solution list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_log-analytics_solution_show
+  name: az monitor log-analytics solution show
+  summary: Get details about the specified log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution show --name
+                                           --resource-group
+  examples:
+  - summary: Get a log-analytics solution
+    syntax: az monitor log-analytics solution show --resource-group MyResourceGroup --name SolutionName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_log-analytics_solution_update
+  name: az monitor log-analytics solution update
+  summary: Update an existing log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution update --name
+                                             --resource-group
+                                             [--no-wait]
+                                             [--tags]
+  examples:
+  - summary: Update a log-analytics solution
+    syntax: >-
+      az monitor log-analytics solution update --resource-group MyResourceGroup \
+
+      --name SolutionName --tags key=value
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_monitor_log-analytics_solution_create
+- az_monitor_log-analytics_solution_delete
+- az_monitor_log-analytics_solution_list
+- az_monitor_log-analytics_solution_show
+- az_monitor_log-analytics_solution_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage monitor log-analytics solution.
diff --git a/2017-03-09-profile/docs-ref-autogen/monitor/scheduled-query.yml b/2017-03-09-profile/docs-ref-autogen/monitor/scheduled-query.yml
new file mode 100644
index 0000000000..b24a4f01da
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/monitor/scheduled-query.yml
@@ -0,0 +1,299 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_scheduled-query
+name: az monitor scheduled-query
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **scheduled-query** extension for Azure CLI and requires version 2.20.0 or higher.  The extension will automatically install the first time you run an **az monitor scheduled-query** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage scheduled queries.
+description: ''
+directCommands:
+- uid: az_monitor_scheduled-query_create
+  name: az monitor scheduled-query create
+  summary: Create a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query create --condition
+                                      --name
+                                      --resource-group
+                                      --scopes
+                                      [--action]
+                                      [--auto-mitigate {false, true}]
+                                      [--check-ws-alerts-storage {false, true}]
+                                      [--condition-query]
+                                      [--description]
+                                      [--disabled {false, true}]
+                                      [--display-name]
+                                      [--evaluation-frequency]
+                                      [--location]
+                                      [--mad]
+                                      [--severity]
+                                      [--skip-query-validation {false, true}]
+                                      [--tags]
+                                      [--target-resource-type]
+                                      [--window-size]
+  examples:
+  - summary: Create a scheduled query for a VM.
+    syntax: az monitor scheduled-query create -g {rg} -n {name1} --scopes {vm_id} --condition "count 'Placeholder_1' > 360 resource id _ResourceID at least 1 violations out of 5 aggregated points" --condition-query Placeholder_1="union Event, Syslog | where TimeGenerated > ago(1h) | where EventLevelName=='Error' or SeverityLevel=='err'" --description "Test rule"
+  - summary: Create a scheduled query for VMs in a resource group.
+    syntax: az monitor scheduled-query create -g {rg} -n {name1} --scopes {rg_id} --condition "count 'Placeholder_1' > 360 resource id _ResourceID at least 1 violations out of 5 aggregated points" --condition-query Placeholder_1="union Event, Syslog | where TimeGenerated > ago(1h) | where EventLevelName=='Error' or SeverityLevel=='err'" --description "Test rule"
+  requiredParameters:
+  - isRequired: true
+    name: --condition
+    summary: The condition which triggers the rule.
+    description: >-
+      Usage:  --condition {avg,min,max,total,count} ["METRIC COLUMN" from]
+                          "QUERY_PLACEHOLDER" {=,!=,>,>=,<,<=} THRESHOLD
+                          [resource id RESOURCEID]
+                          [where DIMENSION {includes,excludes} VALUE [or VALUE ...]
+                          [and   DIMENSION {includes,excludes} VALUE [or VALUE ...] ...]]
+                          [at least MinTimeToFail violations out of EvaluationPeriod aggregated points]'
+      Query placeholders can be defined in --condition-query argument
+
+      Dimensions can be queried by adding the 'where' keyword and multiple dimensions can be queried by combining them with the 'and' keyword.
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scopes
+    summary: Space-separated list of scopes the rule applies to. The resources specified in this parameter must be of the same type and exist in the same location.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action group and optional webhook properties to fire when the alert is triggered.
+    description: >-
+      Usage:   --action ACTION_GROUP_NAME_OR_ID [KEY=VAL [KEY=VAL ...]]
+
+
+      Multiple action groups can be specified by using more than one `--action` argument.
+  - name: --auto-mitigate
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: The flag that indicates whether the alert should be automatically resolved or not. The default is true.
+    description: ''
+  - name: --check-ws-alerts-storage --cwas
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether this scheduled query rule should be stored in the customer's storage.
+    description: ''
+  - name: --condition-query
+    summary: Query deteils to replace the placeholders in `--condition` argument.
+    description: ''
+  - name: --description
+    summary: Free-text description of the rule.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Disable the scheduled query.
+    description: ''
+  - name: --display-name
+    summary: The display name of the alert rule.
+    description: ''
+  - name: --evaluation-frequency
+    defaultValue: 5m
+    summary: Frequency with which to evaluate the rule in "##h##m##s" format.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mad --mute-actions-duration
+    summary: Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired.
+    description: ''
+  - name: --severity
+    defaultValue: "2"
+    summary: Severity of the alert from 0 (critical) to 4 (verbose).
+    description: ''
+  - name: --skip-query-validation
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether the provided query should be validated or not.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-resource-type --type
+    summary: The resource type of the target resource(s) in scopes. This must be provided when scopes is resource group or subscription.
+    description: ''
+  - name: --window-size
+    defaultValue: 5m
+    summary: Time over which to aggregate metrics in "##h##m##s" format.
+    description: ''
+- uid: az_monitor_scheduled-query_delete
+  name: az monitor scheduled-query delete
+  summary: Delete a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query delete --name
+                                      --resource-group
+                                      [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_scheduled-query_list
+  name: az monitor scheduled-query list
+  summary: List all scheduled queries.
+  description: ''
+  syntax: az monitor scheduled-query list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_scheduled-query_show
+  name: az monitor scheduled-query show
+  summary: Show detail of a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query show --name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_scheduled-query_update
+  name: az monitor scheduled-query update
+  summary: Update a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query update --name
+                                      --resource-group
+                                      [--action]
+                                      [--add]
+                                      [--auto-mitigate {false, true}]
+                                      [--check-ws-alerts-storage {false, true}]
+                                      [--condition]
+                                      [--condition-query]
+                                      [--description]
+                                      [--disabled {false, true}]
+                                      [--display-name]
+                                      [--evaluation-frequency]
+                                      [--force-string]
+                                      [--mad]
+                                      [--remove]
+                                      [--set]
+                                      [--severity]
+                                      [--skip-query-validation {false, true}]
+                                      [--tags]
+                                      [--window-size]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action group and optional webhook properties to fire when the alert is triggered.
+    description: >-
+      Usage:   --action ACTION_GROUP_NAME_OR_ID [KEY=VAL [KEY=VAL ...]]
+
+
+      Multiple action groups can be specified by using more than one `--action` argument.
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auto-mitigate
+    parameterValueGroup: false, true
+    summary: The flag that indicates whether the alert should be automatically resolved or not. The default is true.
+    description: ''
+  - name: --check-ws-alerts-storage --cwas
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether this scheduled query rule should be stored in the customer's storage.
+    description: ''
+  - name: --condition
+    summary: The condition which triggers the rule.
+    description: >-
+      Usage:  --condition {avg,min,max,total,count} ["METRIC COLUMN" from]
+                          "QUERY_PLACEHOLDER" {=,!=,>,>=,<,<=} THRESHOLD
+                          [resource id RESOURCEID]
+                          [where DIMENSION {includes,excludes} VALUE [or VALUE ...]
+                          [and   DIMENSION {includes,excludes} VALUE [or VALUE ...] ...]]
+                          [at least MinTimeToFail violations out of EvaluationPeriod aggregated points]'
+
+      Query placeholders can be defined in --condition-query argument
+
+      Dimensions can be queried by adding the 'where' keyword and multiple dimensions can be queried by combining them with the 'and' keyword.
+  - name: --condition-query
+    summary: Query deteils to replace the placeholders in `--condition` argument.
+    description: ''
+  - name: --description
+    summary: Free-text description of the rule.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Disable the scheduled query.
+    description: ''
+  - name: --display-name
+    summary: The display name of the alert rule.
+    description: ''
+  - name: --evaluation-frequency
+    summary: Frequency with which to evaluate the rule in "##h##m##s" format.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --mad --mute-actions-duration
+    summary: Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --severity
+    summary: Severity of the alert from 0 (critical) to 4 (verbose).
+    description: ''
+  - name: --skip-query-validation
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether the provided query should be validated or not.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --window-size
+    summary: Time over which to aggregate metrics in "##h##m##s" format.
+    description: ''
+commands:
+- az_monitor_scheduled-query_create
+- az_monitor_scheduled-query_delete
+- az_monitor_scheduled-query_list
+- az_monitor_scheduled-query_show
+- az_monitor_scheduled-query_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage scheduled queries.
diff --git a/2017-03-09-profile/docs-ref-autogen/mysql.yml b/2017-03-09-profile/docs-ref-autogen/mysql.yml
new file mode 100644
index 0000000000..c3297be9ae
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mysql.yml
@@ -0,0 +1,164 @@
+### YamlMime:AzureCLIGroup
+uid: az_mysql
+name: az mysql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **db-up** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az mysql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for MySQL servers.
+description: ''
+directCommands:
+- uid: az_mysql_down
+  name: az mysql down
+  summary: Delete the MySQL server and its cached information.
+  description: ''
+  syntax: >-
+    az mysql down [--delete-group]
+                  [--no-wait]
+                  [--resource-group]
+                  [--server-name]
+                  [--yes]
+  examples:
+  - summary: Delete the server and the cached data, aside from the resource group.
+    syntax: az mysql down
+  - summary: Delete the resource group and the full cache.
+    syntax: az mysql down --delete-group
+  optionalParameters:
+  - name: --delete-group
+    summary: Delete the resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mysql_show-connection-string
+  name: az mysql show-connection-string
+  summary: Show the connection strings for a MySQL server database.
+  description: ''
+  syntax: >-
+    az mysql show-connection-string [--admin-password]
+                                    [--admin-user]
+                                    [--database-name]
+                                    [--server-name]
+  optionalParameters:
+  - name: --admin-password -p
+    defaultValue: '{password}'
+    summary: The login password of the administrator.
+    description: ''
+  - name: --admin-user -u
+    defaultValue: '{login}'
+    summary: The login username of the administrator.
+    description: ''
+  - name: --database-name -d
+    defaultValue: '{database}'
+    summary: The name of a database.
+    description: ''
+  - name: --server-name -s
+    defaultValue: '{server}'
+    summary: Name of the server.
+    description: ''
+- uid: az_mysql_up
+  name: az mysql up
+  summary: Set up an Azure Database for MySQL server and configurations.
+  description: ''
+  syntax: >-
+    az mysql up [--admin-password]
+                [--admin-user]
+                [--backup-retention]
+                [--database-name]
+                [--generate-password]
+                [--geo-redundant-backup {Disabled, Enabled}]
+                [--location]
+                [--resource-group]
+                [--server-name]
+                [--sku-name]
+                [--ssl-enforcement {Disabled, Enabled}]
+                [--storage-size]
+                [--tags]
+                [--version]
+  examples:
+  - summary: Ensure that a Azure Database for MySQL server is up and running and configured for immediate use.
+    syntax: az mysql up
+  - summary: To override default names, provide parameters indicating desired values/existing resources.
+    syntax: az mysql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
+  optionalParameters:
+  - name: --admin-password -p
+    summary: 'The login password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.Your password cannot contain all or part of the login name. Part of a login name is defined as three or more consecutive alphanumeric characters.'
+    description: ''
+  - name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - name: --backup-retention
+    summary: The number of days a backup is retained.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database to initialize.
+    description: ''
+  - name: --generate-password
+    summary: Generate a password.
+    description: ''
+  - name: --geo-redundant-backup
+    defaultValue: Disabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable Geo-redundant or not for server backup.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --sku-name
+    defaultValue: GP_Gen5_2
+    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
+    description: ''
+  - name: --ssl-enforcement
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable ssl enforcement or not when connect to server.
+    description: ''
+  - name: --storage-size
+    summary: The max storage size of the server. Unit is megabytes.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --version
+    defaultValue: "5.7"
+    summary: Server version.
+    description: ''
+commands:
+- az_mysql_down
+- az_mysql_flexible-server
+- az_mysql_flexible-server_connect
+- az_mysql_flexible-server_execute
+- az_mysql_show-connection-string
+- az_mysql_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for MySQL servers.
diff --git a/2017-03-09-profile/docs-ref-autogen/mysql/flexible-server.yml b/2017-03-09-profile/docs-ref-autogen/mysql/flexible-server.yml
new file mode 100644
index 0000000000..a923af012d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/mysql/flexible-server.yml
@@ -0,0 +1,97 @@
+### YamlMime:AzureCLIGroup
+uid: az_mysql_flexible-server
+name: az mysql flexible-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **rdbms-connect** extension for Azure CLI and requires version 2.19.0 or higher.  The extension will automatically install the first time you run an **az mysql flexible-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for MySQL Flexible Servers.
+description: ''
+directCommands:
+- uid: az_mysql_flexible-server_connect
+  name: az mysql flexible-server connect
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az mysql flexible-server connect --admin-user
+                                     --name
+                                     [--admin-password]
+                                     [--database-name]
+                                     [--interactive]
+                                     [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --interactive
+    summary: Pass this parameter to connect to database in interactive mode.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+- uid: az_mysql_flexible-server_execute
+  name: az mysql flexible-server execute
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az mysql flexible-server execute --admin-password
+                                     --admin-user
+                                     --name
+                                     [--database-name]
+                                     [--file-path]
+                                     [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --file-path -f
+    summary: The path of the sql file to execute.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+commands:
+- az_mysql_flexible-server_connect
+- az_mysql_flexible-server_execute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for MySQL Flexible Servers.
diff --git a/2017-03-09-profile/docs-ref-autogen/netappfiles.yml b/2017-03-09-profile/docs-ref-autogen/netappfiles.yml
new file mode 100644
index 0000000000..72b4e658b4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/netappfiles.yml
@@ -0,0 +1,53 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles
+name: az netappfiles
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Resources.
+description: ''
+commands:
+- az_netappfiles_account
+- az_netappfiles_account_create
+- az_netappfiles_account_delete
+- az_netappfiles_account_list
+- az_netappfiles_account_set
+- az_netappfiles_account_show
+- az_netappfiles_account_update
+- az_netappfiles_mount-target
+- az_netappfiles_mount-target_list
+- az_netappfiles_pool
+- az_netappfiles_pool_create
+- az_netappfiles_pool_delete
+- az_netappfiles_pool_list
+- az_netappfiles_pool_show
+- az_netappfiles_pool_update
+- az_netappfiles_snapshot
+- az_netappfiles_snapshot_create
+- az_netappfiles_snapshot_delete
+- az_netappfiles_snapshot_list
+- az_netappfiles_snapshot_show
+- az_netappfiles_volume
+- az_netappfiles_volume_create
+- az_netappfiles_volume_delete
+- az_netappfiles_volume_list
+- az_netappfiles_volume_show
+- az_netappfiles_volume_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/netappfiles/account.yml b/2017-03-09-profile/docs-ref-autogen/netappfiles/account.yml
new file mode 100644
index 0000000000..a4eaa53bd8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/netappfiles/account.yml
@@ -0,0 +1,202 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_account
+name: az netappfiles account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Account Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_account_create
+  name: az netappfiles account create
+  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
+  description: ''
+  syntax: >-
+    az netappfiles account create --account-name
+                                  --location
+                                  --resource-group
+                                  [--active-directories]
+                                  [--tags]
+  examples:
+  - summary: Create an ANF account
+    syntax: az netappfiles account create -g group --account-name name -l location
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --active-directories
+    summary: Active Directories.
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the account.
+    description: ''
+- uid: az_netappfiles_account_delete
+  name: az netappfiles account delete
+  summary: Delete the specified ANF account.
+  description: ''
+  syntax: >-
+    az netappfiles account delete --account-name
+                                  --resource-group
+  examples:
+  - summary: Delete an ANF account
+    syntax: az netappfiles account delete -g group --account-name name
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_account_list
+  name: az netappfiles account list
+  summary: List ANF accounts.
+  description: ''
+  syntax: az netappfiles account list --resource-group
+  examples:
+  - summary: List ANF accounts within a resource group
+    syntax: az netappfiles account list -g group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_account_set
+  name: az netappfiles account set
+  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
+  description: ''
+  syntax: >-
+    az netappfiles account set --account-name
+                               --location
+                               --resource-group
+                               [--active-directories]
+                               [--tags]
+  examples:
+  - summary: Update the tags and active directory of an ANF account
+    syntax: "az netappfiles account set -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
+  - summary: Remove the active directory from the ANF account
+    syntax: az netappfiles account set -g group --account-name name --active-directories '[]' -l westus2
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --active-directories
+    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the account.
+    description: ''
+- uid: az_netappfiles_account_show
+  name: az netappfiles account show
+  summary: Get the specified ANF account.
+  description: ''
+  syntax: >-
+    az netappfiles account show --account-name
+                                --resource-group
+  examples:
+  - summary: Get an ANF account
+    syntax: az netappfiles account show -g group --account-name name
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_account_update
+  name: az netappfiles account update
+  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
+  description: ''
+  syntax: >-
+    az netappfiles account update --account-name
+                                  --location
+                                  --resource-group
+                                  [--active-directories]
+                                  [--add]
+                                  [--force-string]
+                                  [--remove]
+                                  [--set]
+                                  [--tags]
+  examples:
+  - summary: Update the tags and active directory of an ANF account
+    syntax: "az netappfiles account update -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --active-directories
+    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the account.
+    description: ''
+commands:
+- az_netappfiles_account_create
+- az_netappfiles_account_delete
+- az_netappfiles_account_list
+- az_netappfiles_account_set
+- az_netappfiles_account_show
+- az_netappfiles_account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Account Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/netappfiles/mount-target.yml b/2017-03-09-profile/docs-ref-autogen/netappfiles/mount-target.yml
new file mode 100644
index 0000000000..5e963a759e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/netappfiles/mount-target.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_mount-target
+name: az netappfiles mount-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles mount-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Mount Target Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_mount-target_list
+  name: az netappfiles mount-target list
+  summary: List the mount targets of an ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles mount-target list --account-name
+                                     --pool-name
+                                     --resource-group
+                                     --volume-name
+  examples:
+  - summary: list the mount targets of an ANF volume
+    syntax: az netappfiles mount-target list -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF pool.
+    description: ''
+commands:
+- az_netappfiles_mount-target_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Mount Target Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/netappfiles/pool.yml b/2017-03-09-profile/docs-ref-autogen/netappfiles/pool.yml
new file mode 100644
index 0000000000..e88c688f7f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/netappfiles/pool.yml
@@ -0,0 +1,201 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_pool
+name: az netappfiles pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Pool Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_pool_create
+  name: az netappfiles pool create
+  summary: Create a new Azure NetApp Files (ANF) pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool create --account-name
+                               --location
+                               --pool-name
+                               --resource-group
+                               --service-level
+                               --size
+                               [--tags]
+  examples:
+  - summary: Create an ANF pool
+    syntax: az netappfiles pool create -g group --account-name aname --pool-name pname -l location --size 4398046511104 --service-level "Premium"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-level
+    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - isRequired: true
+    name: --size
+    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: A list of space separated tags to apply to the pool.
+    description: ''
+- uid: az_netappfiles_pool_delete
+  name: az netappfiles pool delete
+  summary: Delete the specified ANF pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool delete --account-name
+                               --pool-name
+                               --resource-group
+  examples:
+  - summary: Delete an ANF pool
+    syntax: az netappfiles pool delete -g group --account-name aname --pool-name pname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_pool_list
+  name: az netappfiles pool list
+  summary: L:ist the ANF pools for the specified account.
+  description: ''
+  syntax: >-
+    az netappfiles pool list --account-name
+                             --resource-group
+  examples:
+  - summary: List the pools for the ANF account
+    syntax: az netappfiles pool list -g group --account-name name
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_pool_show
+  name: az netappfiles pool show
+  summary: Get the specified ANF pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool show --account-name
+                             --pool-name
+                             --resource-group
+  examples:
+  - summary: Get an ANF pool
+    syntax: az netappfiles pool show -g group --account-name aname --pool-name pname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_pool_update
+  name: az netappfiles pool update
+  summary: Update the tags of the specified ANF pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool update --account-name
+                               --pool-name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--location]
+                               [--remove]
+                               [--service-level]
+                               [--set]
+                               [--size]
+                               [--tags]
+  examples:
+  - summary: Update specific values for an ANF pool
+    syntax: az netappfiles pool update -g group --account-name aname --pool-name pname --service-level "Extreme" --tags 'key[=value] key[=value]'
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --service-level
+    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --size
+    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the pool.
+    description: ''
+commands:
+- az_netappfiles_pool_create
+- az_netappfiles_pool_delete
+- az_netappfiles_pool_list
+- az_netappfiles_pool_show
+- az_netappfiles_pool_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Pool Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/netappfiles/snapshot.yml b/2017-03-09-profile/docs-ref-autogen/netappfiles/snapshot.yml
new file mode 100644
index 0000000000..60624ae7ab
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/netappfiles/snapshot.yml
@@ -0,0 +1,173 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_snapshot
+name: az netappfiles snapshot
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles snapshot** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Snapshot Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_snapshot_create
+  name: az netappfiles snapshot create
+  summary: Create a new Azure NetApp Files (ANF) snapshot.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot create --account-name
+                                   --location
+                                   --pool-name
+                                   --resource-group
+                                   --snapshot-name
+                                   --volume-name
+                                   [--file-system-id]
+  examples:
+  - summary: Create an ANF snapshot
+    syntax: az netappfiles snapshot create -g group --account-name account-name --pool-name pname --volume-name vname --snapshot-name sname -l location --file-system-id volume-uuid
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --snapshot-name -n -s
+    summary: The name of the ANF snapshot.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF volume.
+    description: ''
+  optionalParameters:
+  - name: --file-system-id
+    summary: The uuid of the volume.
+    description: ''
+- uid: az_netappfiles_snapshot_delete
+  name: az netappfiles snapshot delete
+  summary: Delete the specified ANF snapshot.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot delete --account-name
+                                   --pool-name
+                                   --resource-group
+                                   --snapshot-name
+                                   --volume-name
+  examples:
+  - summary: Delete an ANF snapshot
+    syntax: az netappfiles snapshot delete -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --snapshot-name -n -s
+    summary: The name of the ANF snapshot.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF volume.
+    description: ''
+- uid: az_netappfiles_snapshot_list
+  name: az netappfiles snapshot list
+  summary: List the snapshots of an ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot list --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --volume-name
+  examples:
+  - summary: list the snapshots of an ANF volume
+    syntax: az netappfiles snapshot list -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+- uid: az_netappfiles_snapshot_show
+  name: az netappfiles snapshot show
+  summary: Get the specified ANF snapshot.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot show --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --snapshot-name
+                                 --volume-name
+  examples:
+  - summary: Return the specified ANF snapshot
+    syntax: az netappfiles snapshot show -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --snapshot-name -n -s
+    summary: The name of the ANF snapshot.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF volume.
+    description: ''
+commands:
+- az_netappfiles_snapshot_create
+- az_netappfiles_snapshot_delete
+- az_netappfiles_snapshot_list
+- az_netappfiles_snapshot_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Snapshot Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/netappfiles/volume.yml b/2017-03-09-profile/docs-ref-autogen/netappfiles/volume.yml
new file mode 100644
index 0000000000..31a24ba5bf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/netappfiles/volume.yml
@@ -0,0 +1,240 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_volume
+name: az netappfiles volume
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles volume** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Volume Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_volume_create
+  name: az netappfiles volume create
+  summary: Create a new Azure NetApp Files (ANF) volume.
+  description: ''
+  syntax: >-
+    az netappfiles volume create --account-name
+                                 --creation-token
+                                 --location
+                                 --pool-name
+                                 --resource-group
+                                 --service-level
+                                 --subnet-id
+                                 --usage-threshold
+                                 --volume-name
+                                 [--export-policy]
+                                 [--tags]
+  examples:
+  - summary: Create an ANF volume
+    syntax: "az netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level \"Premium\" --usage-threshold 107374182400 --creation-token \"unique-token\" --subnet-id \"/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default\" --export-policy '[{\"allowed_clients\":\"0.0.0.0/0\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --creation-token
+    summary: A unique file path identifier, from 1 to 80 characters.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-level
+    summary: The service level ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - isRequired: true
+    name: --subnet-id
+    summary: The subnet identifier.
+    description: ''
+  - isRequired: true
+    name: --usage-threshold
+    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+  optionalParameters:
+  - name: --export-policy
+    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the volume.
+    description: ''
+- uid: az_netappfiles_volume_delete
+  name: az netappfiles volume delete
+  summary: Delete the specified ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles volume delete --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --volume-name
+  examples:
+  - summary: Delete an ANF volume
+    syntax: az netappfiles volume delete -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+- uid: az_netappfiles_volume_list
+  name: az netappfiles volume list
+  summary: List the ANF Pools for the specified account.
+  description: ''
+  syntax: >-
+    az netappfiles volume list --account-name
+                               --pool-name
+                               --resource-group
+  examples:
+  - summary: List the ANF volumes of the pool
+    syntax: az netappfiles volume list -g group --account-name aname --pool-name pname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_volume_show
+  name: az netappfiles volume show
+  summary: Get the specified ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles volume show --account-name
+                               --pool-name
+                               --resource-group
+                               --volume-name
+  examples:
+  - summary: Returns the properties of the given ANF volume
+    syntax: az netappfiles volume show -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF pool.
+    description: ''
+- uid: az_netappfiles_volume_update
+  name: az netappfiles volume update
+  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
+  description: ''
+  syntax: >-
+    az netappfiles volume update --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --volume-name
+                                 [--add]
+                                 [--export-policy]
+                                 [--force-string]
+                                 [--remove]
+                                 [--service-level]
+                                 [--set]
+                                 [--tags]
+                                 [--usage-threshold]
+  examples:
+  - summary: Create an ANF volume
+    syntax: "az netappfiles volume update -g group --account-name aname --pool-name pname --volume-name vname --service-level level --usage-threshold 107374182400 --tags 'key[=value] key[=value]' --export-policy '[{\"allowed_clients\":\"1.2.3.0/24\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}, {\"allowed_clients\":\"1.2.4.0/24\", \"rule_index\": \"2\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --export-policy
+    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --service-level
+    summary: The service level ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the volume.
+    description: ''
+  - name: --usage-threshold
+    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
+    description: ''
+commands:
+- az_netappfiles_volume_create
+- az_netappfiles_volume_delete
+- az_netappfiles_volume_list
+- az_netappfiles_volume_show
+- az_netappfiles_volume_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Volume Resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/network.yml b/2017-03-09-profile/docs-ref-autogen/network.yml
index d13c2ffcba..1724e89444 100644
--- a/2017-03-09-profile/docs-ref-autogen/network.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network.yml
@@ -1,1391 +1,824 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_list_service_aliases
-  - az_network_list_usages
-- uid: az_network_list_service_aliases
+### YamlMime:AzureCLIGroup
+uid: az_network
+name: az network
+summary: Manage Azure Network resources.
+description: ''
+directCommands:
+- uid: az_network_list-service-aliases
   name: az network list-service-aliases
   summary: List available service aliases in the region which can be used for Service Endpoint Policies.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network list-service-aliases --location
+                                    [--resource-group]
+                                    [--subscription]
+  examples:
+  - summary: List available service aliases in the region which can be used for Service Endpoint Policies. (autogenerated)
+    syntax: az network list-service-aliases --location westus2
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_list_usages
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_list-usages
   name: az network list-usages
   summary: List the number of network resources in a region that are used against a subscription quota.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network list-usages --location
+                           [--subscription]
   examples:
   - summary: List the provisioned network resources in East US region within a subscription.
-    syntax:
-      content: az network list-usages --location eastus -o table
-  parameters:
+    syntax: az network list-usages --location eastus -o table
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway
-  name: az network application-gateway
-  summary: Manage application-level routing and load balancing services.
-- uid: az_network_application_gateway_address_pool
-  name: az network application-gateway address-pool
-  summary: Manage address pools of an application gateway.
-- uid: az_network_application_gateway_address_pool_create
-  name: az network application-gateway address-pool create
-  summary: Create an address pool.
-- uid: az_network_application_gateway_address_pool_delete
-  name: az network application-gateway address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_application_gateway_address_pool_list
-  name: az network application-gateway address-pool list
-  summary: List address pools.
-- uid: az_network_application_gateway_address_pool_show
-  name: az network application-gateway address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_application_gateway_address_pool_update
-  name: az network application-gateway address-pool update
-  summary: Update an address pool.
-- uid: az_network_application_gateway_auth_cert
-  name: az network application-gateway auth-cert
-  summary: Manage authorization certificates of an application gateway.
-- uid: az_network_application_gateway_auth_cert_create
-  name: az network application-gateway auth-cert create
-  summary: Create an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_delete
-  name: az network application-gateway auth-cert delete
-  summary: Delete an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_list
-  name: az network application-gateway auth-cert list
-  summary: List authorization certificates.
-- uid: az_network_application_gateway_auth_cert_show
-  name: az network application-gateway auth-cert show
-  summary: Show an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_update
-  name: az network application-gateway auth-cert update
-  summary: Update an authorization certificate.
-- uid: az_network_application_gateway_create
-  name: az network application-gateway create
-  summary: Create an application gateway.
-- uid: az_network_application_gateway_delete
-  name: az network application-gateway delete
-  summary: Delete an application gateway.
-- uid: az_network_application_gateway_frontend_ip
-  name: az network application-gateway frontend-ip
-  summary: Manage frontend IP addresses of an application gateway.
-- uid: az_network_application_gateway_frontend_ip_create
-  name: az network application-gateway frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_delete
-  name: az network application-gateway frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_list
-  name: az network application-gateway frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_application_gateway_frontend_ip_show
-  name: az network application-gateway frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_update
-  name: az network application-gateway frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_application_gateway_frontend_port
-  name: az network application-gateway frontend-port
-  summary: Manage frontend ports of an application gateway.
-- uid: az_network_application_gateway_frontend_port_create
-  name: az network application-gateway frontend-port create
-  summary: Create a frontend port.
-- uid: az_network_application_gateway_frontend_port_delete
-  name: az network application-gateway frontend-port delete
-  summary: Delete a frontend port.
-- uid: az_network_application_gateway_frontend_port_list
-  name: az network application-gateway frontend-port list
-  summary: List frontend ports.
-- uid: az_network_application_gateway_frontend_port_show
-  name: az network application-gateway frontend-port show
-  summary: Get the details of a frontend port.
-- uid: az_network_application_gateway_frontend_port_update
-  name: az network application-gateway frontend-port update
-  summary: Update a frontend port.
-- uid: az_network_application_gateway_http_listener
-  name: az network application-gateway http-listener
-  summary: Manage HTTP listeners of an application gateway.
-- uid: az_network_application_gateway_http_listener_create
-  name: az network application-gateway http-listener create
-  summary: Create an HTTP listener.
-- uid: az_network_application_gateway_http_listener_delete
-  name: az network application-gateway http-listener delete
-  summary: Delete an HTTP listener.
-- uid: az_network_application_gateway_http_listener_list
-  name: az network application-gateway http-listener list
-  summary: List HTTP listeners.
-- uid: az_network_application_gateway_http_listener_show
-  name: az network application-gateway http-listener show
-  summary: Get the details of an HTTP listener.
-- uid: az_network_application_gateway_http_listener_update
-  name: az network application-gateway http-listener update
-  summary: Update an HTTP listener.
-- uid: az_network_application_gateway_http_settings
-  name: az network application-gateway http-settings
-  summary: Manage HTTP settings of an application gateway.
-- uid: az_network_application_gateway_http_settings_create
-  name: az network application-gateway http-settings create
-  summary: Create HTTP settings.
-- uid: az_network_application_gateway_http_settings_delete
-  name: az network application-gateway http-settings delete
-  summary: Delete HTTP settings.
-- uid: az_network_application_gateway_http_settings_list
-  name: az network application-gateway http-settings list
-  summary: List HTTP settings.
-- uid: az_network_application_gateway_http_settings_show
-  name: az network application-gateway http-settings show
-  summary: Get the details of a gateway's HTTP settings.
-- uid: az_network_application_gateway_http_settings_update
-  name: az network application-gateway http-settings update
-  summary: Update HTTP settings.
-- uid: az_network_application_gateway_list
-  name: az network application-gateway list
-  summary: List application gateways.
-- uid: az_network_application_gateway_probe
-  name: az network application-gateway probe
-  summary: Manage probes to gather and evaluate information on a gateway.
-- uid: az_network_application_gateway_probe_create
-  name: az network application-gateway probe create
-  summary: Create a probe.
-- uid: az_network_application_gateway_probe_delete
-  name: az network application-gateway probe delete
-  summary: Delete a probe.
-- uid: az_network_application_gateway_probe_list
-  name: az network application-gateway probe list
-  summary: List probes.
-- uid: az_network_application_gateway_probe_show
-  name: az network application-gateway probe show
-  summary: Get the details of a probe.
-- uid: az_network_application_gateway_probe_update
-  name: az network application-gateway probe update
-  summary: Update a probe.
-- uid: az_network_application_gateway_rewrite_rule
-  name: az network application-gateway rewrite-rule
-  summary: Manage rewrite rules of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
-- uid: az_network_application_gateway_rule
-  name: az network application-gateway rule
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_application_gateway_rule_create
-  name: az network application-gateway rule create
-  summary: Create a rule.
-- uid: az_network_application_gateway_rule_delete
-  name: az network application-gateway rule delete
-  summary: Delete a rule.
-- uid: az_network_application_gateway_rule_list
-  name: az network application-gateway rule list
-  summary: List rules.
-- uid: az_network_application_gateway_rule_show
-  name: az network application-gateway rule show
-  summary: Get the details of a rule.
-- uid: az_network_application_gateway_rule_update
-  name: az network application-gateway rule update
-  summary: Update a rule.
-- uid: az_network_application_gateway_show
-  name: az network application-gateway show
-  summary: Get the details of an application gateway.
-- uid: az_network_application_gateway_ssl_cert
-  name: az network application-gateway ssl-cert
-  summary: Manage SSL certificates of an application gateway.
-- uid: az_network_application_gateway_ssl_cert_create
-  name: az network application-gateway ssl-cert create
-  summary: Upload an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_delete
-  name: az network application-gateway ssl-cert delete
-  summary: Delete an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_list
-  name: az network application-gateway ssl-cert list
-  summary: List SSL certificates.
-- uid: az_network_application_gateway_ssl_cert_show
-  name: az network application-gateway ssl-cert show
-  summary: Get the details of an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_update
-  name: az network application-gateway ssl-cert update
-  summary: Update an SSL certificate.
-- uid: az_network_application_gateway_ssl_policy
-  name: az network application-gateway ssl-policy
-  summary: Manage the SSL policy of an application gateway.
-- uid: az_network_application_gateway_ssl_policy_set
-  name: az network application-gateway ssl-policy set
-  summary: Update or clear SSL policy settings.
-- uid: az_network_application_gateway_ssl_policy_show
-  name: az network application-gateway ssl-policy show
-  summary: Get the details of gateway's SSL policy settings.
-- uid: az_network_application_gateway_start
-  name: az network application-gateway start
-  summary: Start an application gateway.
-- uid: az_network_application_gateway_stop
-  name: az network application-gateway stop
-  summary: Stop an application gateway.
-- uid: az_network_application_gateway_update
-  name: az network application-gateway update
-  summary: Update an application gateway.
-- uid: az_network_application_gateway_url_path_map
-  name: az network application-gateway url-path-map
-  summary: Manage URL path maps of an application gateway.
-- uid: az_network_application_gateway_url_path_map_create
-  name: az network application-gateway url-path-map create
-  summary: Create a URL path map.
-- uid: az_network_application_gateway_url_path_map_delete
-  name: az network application-gateway url-path-map delete
-  summary: Delete a URL path map.
-- uid: az_network_application_gateway_url_path_map_list
-  name: az network application-gateway url-path-map list
-  summary: List URL path maps.
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
-- uid: az_network_application_gateway_url_path_map_show
-  name: az network application-gateway url-path-map show
-  summary: Get the details of a URL path map.
-- uid: az_network_application_gateway_url_path_map_update
-  name: az network application-gateway url-path-map update
-  summary: Update a URL path map.
-- uid: az_network_application_gateway_waf_config
-  name: az network application-gateway waf-config
-  summary: Configure the settings of a web application firewall.
-- uid: az_network_application_gateway_waf_config_set
-  name: az network application-gateway waf-config set
-  summary: Update the firewall configuration of a web application.
-- uid: az_network_application_gateway_waf_config_show
-  name: az network application-gateway waf-config show
-  summary: Get the firewall configuration of a web application.
-- uid: az_network_application_gateway_wait
-  name: az network application-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the application gateway is met.
-- uid: az_network_bastion
-  name: az network bastion
-  summary: Manage Azure bastion host.
-- uid: az_network_bastion_create
-  name: az network bastion create
-  summary: Create a Azure bastion host machine.
-- uid: az_network_bastion_list
-  name: az network bastion list
-  summary: List all Azure bastion host machines.
-- uid: az_network_dns
-  name: az network dns
-  summary: Manage DNS domains in Azure.
-- uid: az_network_dns_record_set
-  name: az network dns record-set
-  summary: Manage DNS records and record sets.
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_dns_record_set_list
-  name: az network dns record-set list
-  summary: List all record sets within a DNS zone.
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_dns_zone
-  name: az network dns zone
-  summary: Manage DNS zones.
-- uid: az_network_dns_zone_create
-  name: az network dns zone create
-  summary: Create a DNS zone.
-- uid: az_network_dns_zone_delete
-  name: az network dns zone delete
-  summary: Delete a DNS zone and all associated records.
-- uid: az_network_dns_zone_export
-  name: az network dns zone export
-  summary: Export a DNS zone as a DNS zone file.
-- uid: az_network_dns_zone_import
-  name: az network dns zone import
-  summary: Create a DNS zone using a DNS zone file.
-- uid: az_network_dns_zone_list
-  name: az network dns zone list
-  summary: List DNS zones.
-- uid: az_network_dns_zone_show
-  name: az network dns zone show
-  summary: Get a DNS zone parameters. Does not show DNS records within the zone.
-- uid: az_network_dns_zone_update
-  name: az network dns zone update
-  summary: Update a DNS zone properties. Does not modify DNS records within the zone.
-- uid: az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-- uid: az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: az_network_express_route_list_route_tables
-  name: az network express-route list-route-tables
-  summary: Show the current routing table of an ExpressRoute circuit peering.
-- uid: az_network_express_route_peering
-  name: az network express-route peering
-  summary: Manage ExpressRoute peering of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
-- uid: az_network_express_route_peering_create
-  name: az network express-route peering create
-  summary: Create peering settings for an ExpressRoute circuit.
-- uid: az_network_express_route_peering_delete
-  name: az network express-route peering delete
-  summary: Delete peering settings.
-- uid: az_network_express_route_peering_list
-  name: az network express-route peering list
-  summary: List peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_show
-  name: az network express-route peering show
-  summary: Get the details of an express route peering.
-- uid: az_network_express_route_peering_update
-  name: az network express-route peering update
-  summary: Update peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: az_network_lb
-  name: az network lb
-  summary: Manage and configure load balancers.
-- uid: az_network_lb_address_pool
-  name: az network lb address-pool
-  summary: Manage address pools of a load balancer.
-- uid: az_network_lb_address_pool_create
-  name: az network lb address-pool create
-  summary: Create an address pool.
-- uid: az_network_lb_address_pool_delete
-  name: az network lb address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_lb_address_pool_list
-  name: az network lb address-pool list
-  summary: List address pools.
-- uid: az_network_lb_address_pool_show
-  name: az network lb address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_lb_create
-  name: az network lb create
-  summary: Create a load balancer.
-- uid: az_network_lb_delete
-  name: az network lb delete
-  summary: Delete a load balancer.
-- uid: az_network_lb_frontend_ip
-  name: az network lb frontend-ip
-  summary: Manage frontend IP addresses of a load balancer.
-- uid: az_network_lb_frontend_ip_create
-  name: az network lb frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_lb_frontend_ip_delete
-  name: az network lb frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_lb_frontend_ip_list
-  name: az network lb frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_lb_frontend_ip_show
-  name: az network lb frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_lb_frontend_ip_update
-  name: az network lb frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_lb_inbound_nat_pool
-  name: az network lb inbound-nat-pool
-  summary: Manage inbound NAT address pools of a load balancer.
-- uid: az_network_lb_inbound_nat_pool_create
-  name: az network lb inbound-nat-pool create
-  summary: Create an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_delete
-  name: az network lb inbound-nat-pool delete
-  summary: Delete an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_list
-  name: az network lb inbound-nat-pool list
-  summary: List inbound NAT address pools.
-- uid: az_network_lb_inbound_nat_pool_show
-  name: az network lb inbound-nat-pool show
-  summary: Get the details of an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_update
-  name: az network lb inbound-nat-pool update
-  summary: Update an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_rule
-  name: az network lb inbound-nat-rule
-  summary: Manage inbound NAT rules of a load balancer.
-- uid: az_network_lb_inbound_nat_rule_create
-  name: az network lb inbound-nat-rule create
-  summary: Create an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_delete
-  name: az network lb inbound-nat-rule delete
-  summary: Delete an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_list
-  name: az network lb inbound-nat-rule list
-  summary: List inbound NAT rules.
-- uid: az_network_lb_inbound_nat_rule_show
-  name: az network lb inbound-nat-rule show
-  summary: Get the details of an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_update
-  name: az network lb inbound-nat-rule update
-  summary: Update an inbound NAT rule.
-- uid: az_network_lb_list
-  name: az network lb list
-  summary: List load balancers.
-- uid: az_network_lb_probe
-  name: az network lb probe
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_lb_probe_create
-  name: az network lb probe create
-  summary: Create a probe.
-- uid: az_network_lb_probe_delete
-  name: az network lb probe delete
-  summary: Delete a probe.
-- uid: az_network_lb_probe_list
-  name: az network lb probe list
-  summary: List probes.
-- uid: az_network_lb_probe_show
-  name: az network lb probe show
-  summary: Get the details of a probe.
-- uid: az_network_lb_probe_update
-  name: az network lb probe update
-  summary: Update a probe.
-- uid: az_network_lb_rule
-  name: az network lb rule
-  summary: Manage load balancing rules.
-- uid: az_network_lb_rule_create
-  name: az network lb rule create
-  summary: Create a load balancing rule.
-- uid: az_network_lb_rule_delete
-  name: az network lb rule delete
-  summary: Delete a load balancing rule.
-- uid: az_network_lb_rule_list
-  name: az network lb rule list
-  summary: List load balancing rules.
-- uid: az_network_lb_rule_show
-  name: az network lb rule show
-  summary: Get the details of a load balancing rule.
-- uid: az_network_lb_rule_update
-  name: az network lb rule update
-  summary: Update a load balancing rule.
-- uid: az_network_lb_show
-  name: az network lb show
-  summary: Get the details of a load balancer.
-- uid: az_network_lb_update
-  name: az network lb update
-  summary: Update a load balancer.
-- uid: az_network_list_service_aliases
-  name: az network list-service-aliases
-  summary: List available service aliases in the region which can be used for Service Endpoint Policies.
-- uid: az_network_list_usages
-  name: az network list-usages
-  summary: List the number of network resources in a region that are used against a subscription quota.
-- uid: az_network_local_gateway
-  name: az network local-gateway
-  summary: Manage local gateways.
-- uid: az_network_local_gateway_create
-  name: az network local-gateway create
-  summary: Create a local VPN gateway.
-- uid: az_network_local_gateway_delete
-  name: az network local-gateway delete
-  summary: Delete a local VPN gateway.
-- uid: az_network_local_gateway_list
-  name: az network local-gateway list
-  summary: List all local VPN gateways in a resource group.
-- uid: az_network_local_gateway_show
-  name: az network local-gateway show
-  summary: Get the details of a local VPN gateway.
-- uid: az_network_local_gateway_update
-  name: az network local-gateway update
-  summary: Update a local VPN gateway.
-- uid: az_network_local_gateway_wait
-  name: az network local-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the local gateway is met.
-- uid: az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-- uid: az_network_nic_create
-  name: az network nic create
-  summary: Create a network interface.
-- uid: az_network_nic_delete
-  name: az network nic delete
-  summary: Delete a network interface.
-- uid: az_network_nic_ip_config
-  name: az network nic ip-config
-  summary: Manage IP configurations of a network interface.
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
-- uid: az_network_nic_ip_config_create
-  name: az network nic ip-config create
-  summary: Create an IP configuration.
-- uid: az_network_nic_ip_config_delete
-  name: az network nic ip-config delete
-  summary: Delete an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
-- uid: az_network_nic_ip_config_list
-  name: az network nic ip-config list
-  summary: List the IP configurations of a NIC.
-- uid: az_network_nic_ip_config_show
-  name: az network nic ip-config show
-  summary: Show the details of an IP configuration.
-- uid: az_network_nic_ip_config_update
-  name: az network nic ip-config update
-  summary: Update an IP configuration.
-- uid: az_network_nic_list
-  name: az network nic list
-  summary: List network interfaces.
-- uid: az_network_nic_show
-  name: az network nic show
-  summary: Get the details of a network interface.
-- uid: az_network_nic_update
-  name: az network nic update
-  summary: Update a network interface.
-- uid: az_network_nic_wait
-  name: az network nic wait
-  summary: Place the CLI in a waiting state until a condition of the network interface is met.
-- uid: az_network_nsg
-  name: az network nsg
-  summary: Manage Azure Network Security Groups (NSGs).
-- uid: az_network_nsg_create
-  name: az network nsg create
-  summary: Create a network security group.
-- uid: az_network_nsg_delete
-  name: az network nsg delete
-  summary: Delete a network security group.
-- uid: az_network_nsg_list
-  name: az network nsg list
-  summary: List network security groups.
-- uid: az_network_nsg_rule
-  name: az network nsg rule
-  summary: Manage network security group rules.
-- uid: az_network_nsg_rule_create
-  name: az network nsg rule create
-  summary: Create a network security group rule.
-- uid: az_network_nsg_rule_delete
-  name: az network nsg rule delete
-  summary: Delete a network security group rule.
-- uid: az_network_nsg_rule_list
-  name: az network nsg rule list
-  summary: List all rules in a network security group.
-- uid: az_network_nsg_rule_show
-  name: az network nsg rule show
-  summary: Get the details of a network security group rule.
-- uid: az_network_nsg_rule_update
-  name: az network nsg rule update
-  summary: Update a network security group rule.
-- uid: az_network_nsg_show
-  name: az network nsg show
-  summary: Get information about a network security group.
-- uid: az_network_nsg_update
-  name: az network nsg update
-  summary: Update a network security group.
-- uid: az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-- uid: az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: az_network_private_dns_zone_export
-  name: az network private-dns zone export
-  summary: Export a Private DNS zone as a DNS zone file.
-- uid: az_network_private_dns_zone_import
-  name: az network private-dns zone import
-  summary: Create a Private DNS zone using a DNS zone file.
-- uid: az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-- uid: az_network_private_endpoint
-  name: az network private-endpoint
-  summary: Manage private endpoints.
-- uid: az_network_private_endpoint_list
-  name: az network private-endpoint list
-  summary: List private endpoints.
-- uid: az_network_private_endpoint_connection
-  name: az network private-endpoint-connection
-  summary: Manage private endpoint connections.
-- uid: az_network_private_endpoint_connection_approve
-  name: az network private-endpoint-connection approve
-  summary: Approve a private endpoint connection.
-- uid: az_network_private_endpoint_connection_delete
-  name: az network private-endpoint-connection delete
-  summary: Delete a private endpoint connection.
-- uid: az_network_private_endpoint_connection_list
-  name: az network private-endpoint-connection list
-  summary: List all private endpoint connections.
-- uid: az_network_private_endpoint_connection_reject
-  name: az network private-endpoint-connection reject
-  summary: Reject a private endpoint connection.
-- uid: az_network_private_endpoint_connection_show
-  name: az network private-endpoint-connection show
-  summary: Show a private endpoint connection.
-- uid: az_network_private_link_resource
-  name: az network private-link-resource
-  summary: Manage private link resources.
-- uid: az_network_private_link_resource_list
-  name: az network private-link-resource list
-  summary: List all private link resources.
-- uid: az_network_private_link_service
-  name: az network private-link-service
-  summary: Manage private link services.
-- uid: az_network_private_link_service_connection
-  name: az network private-link-service connection
-  summary: Manage private link service endpoint connections.
-- uid: az_network_private_link_service_connection_update
-  name: az network private-link-service connection update
-  summary: Update a private link service endpoint connection.
-- uid: az_network_private_link_service_create
-  name: az network private-link-service create
-  summary: Create a private link service.
-- uid: az_network_private_link_service_list
-  name: az network private-link-service list
-  summary: List private link services.
-- uid: az_network_profile
-  name: az network profile
-  summary: Manage network profiles.
-- uid: az_network_profile_list
-  name: az network profile list
-  summary: List network profiles.
-- uid: az_network_public_ip
-  name: az network public-ip
-  summary: Manage public IP addresses.
-- uid: az_network_public_ip_create
-  name: az network public-ip create
-  summary: Create a public IP address.
-- uid: az_network_public_ip_delete
-  name: az network public-ip delete
-  summary: Delete a public IP address.
-- uid: az_network_public_ip_list
-  name: az network public-ip list
-  summary: List public IP addresses.
-- uid: az_network_public_ip_prefix
-  name: az network public-ip prefix
-  summary: Manage public IP prefix resources.
-- uid: az_network_public_ip_prefix_create
-  name: az network public-ip prefix create
-  summary: Create a public IP prefix resource.
-- uid: az_network_public_ip_prefix_list
-  name: az network public-ip prefix list
-  summary: List public IP prefix resources.
-- uid: az_network_public_ip_show
-  name: az network public-ip show
-  summary: Get the details of a public IP address.
-- uid: az_network_public_ip_update
-  name: az network public-ip update
-  summary: Update a public IP address.
-- uid: az_network_route_table
-  name: az network route-table
-  summary: Manage route tables.
-- uid: az_network_route_table_create
-  name: az network route-table create
-  summary: Create a route table.
-- uid: az_network_route_table_delete
-  name: az network route-table delete
-  summary: Delete a route table.
-- uid: az_network_route_table_list
-  name: az network route-table list
-  summary: List route tables.
-- uid: az_network_route_table_route
-  name: az network route-table route
-  summary: Manage routes in a route table.
-- uid: az_network_route_table_route_create
-  name: az network route-table route create
-  summary: Create a route in a route table.
-- uid: az_network_route_table_route_delete
-  name: az network route-table route delete
-  summary: Delete a route from a route table.
-- uid: az_network_route_table_route_list
-  name: az network route-table route list
-  summary: List routes in a route table.
-- uid: az_network_route_table_route_show
-  name: az network route-table route show
-  summary: Get the details of a route in a route table.
-- uid: az_network_route_table_route_update
-  name: az network route-table route update
-  summary: Update a route in a route table.
-- uid: az_network_route_table_show
-  name: az network route-table show
-  summary: Get the details of a route table.
-- uid: az_network_route_table_update
-  name: az network route-table update
-  summary: Update a route table.
-- uid: az_network_security_partner_provider
-  name: az network security-partner-provider
-  summary: Manage Azure security partner provider.
-- uid: az_network_security_partner_provider_create
-  name: az network security-partner-provider create
-  summary: Create a Azure security partner provider.
-- uid: az_network_security_partner_provider_list
-  name: az network security-partner-provider list
-  summary: List all Azure security partner provider.
-- uid: az_network_service_endpoint
-  name: az network service-endpoint
-  summary: Manage policies related to service endpoints.
-- uid: az_network_service_endpoint_policy
-  name: az network service-endpoint policy
-  summary: Manage service endpoint policies.
-- uid: az_network_service_endpoint_policy_create
-  name: az network service-endpoint policy create
-  summary: Create a service endpoint policy.
-- uid: az_network_service_endpoint_policy_list
-  name: az network service-endpoint policy list
-  summary: List service endpoint policies.
-- uid: az_network_service_endpoint_policy_definition
-  name: az network service-endpoint policy-definition
-  summary: Manage service endpoint policy definitions.
-- uid: az_network_service_endpoint_policy_definition_create
-  name: az network service-endpoint policy-definition create
-  summary: Create a service endpoint policy definition.
-- uid: az_network_traffic_manager
-  name: az network traffic-manager
-  summary: Manage the routing of incoming traffic.
-- uid: az_network_traffic_manager_endpoint
-  name: az network traffic-manager endpoint
-  summary: Manage Azure Traffic Manager end points.
-- uid: az_network_traffic_manager_endpoint_create
-  name: az network traffic-manager endpoint create
-  summary: Create a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_delete
-  name: az network traffic-manager endpoint delete
-  summary: Delete a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_list
-  name: az network traffic-manager endpoint list
-  summary: List traffic manager endpoints.
-- uid: az_network_traffic_manager_endpoint_show
-  name: az network traffic-manager endpoint show
-  summary: Get the details of a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  name: az network traffic-manager endpoint show-geographic-hierarchy
-  summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-- uid: az_network_traffic_manager_endpoint_update
-  name: az network traffic-manager endpoint update
-  summary: Update a traffic manager endpoint.
-- uid: az_network_traffic_manager_profile
-  name: az network traffic-manager profile
-  summary: Manage Azure Traffic Manager profiles.
-- uid: az_network_traffic_manager_profile_check_dns
-  name: az network traffic-manager profile check-dns
-  summary: Check the availability of a relative DNS name.
-- uid: az_network_traffic_manager_profile_create
-  name: az network traffic-manager profile create
-  summary: Create a traffic manager profile.
-- uid: az_network_traffic_manager_profile_delete
-  name: az network traffic-manager profile delete
-  summary: Delete a traffic manager profile.
-- uid: az_network_traffic_manager_profile_list
-  name: az network traffic-manager profile list
-  summary: List traffic manager profiles.
-- uid: az_network_traffic_manager_profile_show
-  name: az network traffic-manager profile show
-  summary: Get the details of a traffic manager profile.
-- uid: az_network_traffic_manager_profile_update
-  name: az network traffic-manager profile update
-  summary: Update a traffic manager profile.
-- uid: az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-- uid: az_network_vnet_create
-  name: az network vnet create
-  summary: Create a virtual network.
-- uid: az_network_vnet_delete
-  name: az network vnet delete
-  summary: Delete a virtual network.
-- uid: az_network_vnet_list
-  name: az network vnet list
-  summary: List virtual networks.
-- uid: az_network_vnet_show
-  name: az network vnet show
-  summary: Get the details of a virtual network.
-- uid: az_network_vnet_subnet
-  name: az network vnet subnet
-  summary: Manage subnets in an Azure Virtual Network.
-- uid: az_network_vnet_subnet_create
-  name: az network vnet subnet create
-  summary: Create a subnet and associate an existing NSG and route table.
-- uid: az_network_vnet_subnet_delete
-  name: az network vnet subnet delete
-  summary: Delete a subnet.
-- uid: az_network_vnet_subnet_list
-  name: az network vnet subnet list
-  summary: List the subnets in a virtual network.
-- uid: az_network_vnet_subnet_show
-  name: az network vnet subnet show
-  summary: Show details of a subnet.
-- uid: az_network_vnet_subnet_update
-  name: az network vnet subnet update
-  summary: Update a subnet.
-- uid: az_network_vnet_update
-  name: az network vnet update
-  summary: Update a virtual network.
-- uid: az_network_vnet_gateway
-  name: az network vnet-gateway
-  summary: Use an Azure Virtual Network Gateway to establish secure, cross-premises connectivity.
-- uid: az_network_vnet_gateway_revoked_cert
-  name: az network vnet-gateway revoked-cert
-  summary: Manage revoked certificates in a virtual network gateway.
-- uid: az_network_vnet_gateway_revoked_cert_create
-  name: az network vnet-gateway revoked-cert create
-  summary: Revoke a certificate.
-- uid: az_network_vnet_gateway_revoked_cert_delete
-  name: az network vnet-gateway revoked-cert delete
-  summary: Delete a revoked certificate.
-- uid: az_network_vnet_gateway_root_cert
-  name: az network vnet-gateway root-cert
-  summary: Manage root certificates of a virtual network gateway.
-- uid: az_network_vnet_gateway_root_cert_create
-  name: az network vnet-gateway root-cert create
-  summary: Upload a root certificate.
-- uid: az_network_vnet_gateway_root_cert_delete
-  name: az network vnet-gateway root-cert delete
-  summary: Delete a root certificate.
-- uid: az_network_vnet_gateway_vpn_client
-  name: az network vnet-gateway vpn-client
-  summary: Download a VPN client configuration required to connect to Azure via point-to-site.
-- uid: az_network_vnet_gateway_vpn_client_generate
-  name: az network vnet-gateway vpn-client generate
-  summary: Generate VPN client configuration.
-- uid: az_network_vpn_connection
-  name: az network vpn-connection
-  summary: Manage VPN connections.
-- uid: az_network_vpn_connection_create
-  name: az network vpn-connection create
-  summary: Create a VPN connection.
-- uid: az_network_vpn_connection_delete
-  name: az network vpn-connection delete
-  summary: Delete a VPN connection.
-- uid: az_network_vpn_connection_list
-  name: az network vpn-connection list
-  summary: List all VPN connections in a resource group.
-- uid: az_network_vpn_connection_shared_key
-  name: az network vpn-connection shared-key
-  summary: Manage VPN shared keys.
-- uid: az_network_vpn_connection_shared_key_reset
-  name: az network vpn-connection shared-key reset
-  summary: Reset a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_show
-  name: az network vpn-connection shared-key show
-  summary: Retrieve a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_update
-  name: az network vpn-connection shared-key update
-  summary: Update a VPN connection shared key.
-- uid: az_network_vpn_connection_show
-  name: az network vpn-connection show
-  summary: Get the details of a VPN connection.
-- uid: az_network_vpn_connection_update
-  name: az network vpn-connection update
-  summary: Update a VPN connection.
-- uid: az_network_vrouter
-  name: az network vrouter
-  summary: Manage the virtual router.
-- uid: az_network_vrouter_create
-  name: az network vrouter create
-  summary: Create a virtual router.
-- uid: az_network_vrouter_list
-  name: az network vrouter list
-  summary: List all virtual routers under a subscription or a resource group.
-- uid: az_network_vrouter_peering
-  name: az network vrouter peering
-  summary: Manage the virtual router peering.
-- uid: az_network_vrouter_peering_create
-  name: az network vrouter peering create
-  summary: Create a virtual router peering.
+- az_network_application-gateway
+- az_network_application-gateway_address-pool
+- az_network_application-gateway_address-pool_create
+- az_network_application-gateway_address-pool_delete
+- az_network_application-gateway_address-pool_list
+- az_network_application-gateway_address-pool_show
+- az_network_application-gateway_address-pool_update
+- az_network_application-gateway_auth-cert
+- az_network_application-gateway_auth-cert_create
+- az_network_application-gateway_auth-cert_delete
+- az_network_application-gateway_auth-cert_list
+- az_network_application-gateway_auth-cert_show
+- az_network_application-gateway_auth-cert_update
+- az_network_application-gateway_create
+- az_network_application-gateway_delete
+- az_network_application-gateway_frontend-ip
+- az_network_application-gateway_frontend-ip_create
+- az_network_application-gateway_frontend-ip_delete
+- az_network_application-gateway_frontend-ip_list
+- az_network_application-gateway_frontend-ip_show
+- az_network_application-gateway_frontend-ip_update
+- az_network_application-gateway_frontend-port
+- az_network_application-gateway_frontend-port_create
+- az_network_application-gateway_frontend-port_delete
+- az_network_application-gateway_frontend-port_list
+- az_network_application-gateway_frontend-port_show
+- az_network_application-gateway_frontend-port_update
+- az_network_application-gateway_http-listener
+- az_network_application-gateway_http-listener_create
+- az_network_application-gateway_http-listener_delete
+- az_network_application-gateway_http-listener_list
+- az_network_application-gateway_http-listener_show
+- az_network_application-gateway_http-listener_update
+- az_network_application-gateway_http-settings
+- az_network_application-gateway_http-settings_create
+- az_network_application-gateway_http-settings_delete
+- az_network_application-gateway_http-settings_list
+- az_network_application-gateway_http-settings_show
+- az_network_application-gateway_http-settings_update
+- az_network_application-gateway_list
+- az_network_application-gateway_probe
+- az_network_application-gateway_probe_create
+- az_network_application-gateway_probe_delete
+- az_network_application-gateway_probe_list
+- az_network_application-gateway_probe_show
+- az_network_application-gateway_probe_update
+- az_network_application-gateway_rewrite-rule
+- az_network_application-gateway_rewrite-rule_set
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
+- az_network_application-gateway_rule
+- az_network_application-gateway_rule_create
+- az_network_application-gateway_rule_delete
+- az_network_application-gateway_rule_list
+- az_network_application-gateway_rule_show
+- az_network_application-gateway_rule_update
+- az_network_application-gateway_show
+- az_network_application-gateway_ssl-cert
+- az_network_application-gateway_ssl-cert_create
+- az_network_application-gateway_ssl-cert_delete
+- az_network_application-gateway_ssl-cert_list
+- az_network_application-gateway_ssl-cert_show
+- az_network_application-gateway_ssl-cert_update
+- az_network_application-gateway_ssl-policy
+- az_network_application-gateway_ssl-policy_set
+- az_network_application-gateway_ssl-policy_show
+- az_network_application-gateway_start
+- az_network_application-gateway_stop
+- az_network_application-gateway_update
+- az_network_application-gateway_url-path-map
+- az_network_application-gateway_url-path-map_create
+- az_network_application-gateway_url-path-map_delete
+- az_network_application-gateway_url-path-map_list
+- az_network_application-gateway_url-path-map_rule
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
+- az_network_application-gateway_url-path-map_show
+- az_network_application-gateway_url-path-map_update
+- az_network_application-gateway_waf-config
+- az_network_application-gateway_waf-config_set
+- az_network_application-gateway_waf-config_show
+- az_network_application-gateway_wait
+- az_network_bastion
+- az_network_bastion_create
+- az_network_bastion_list
+- az_network_cross-connection
+- az_network_cross-connection_list
+- az_network_cross-connection_list-arp-tables
+- az_network_cross-connection_list-route-tables
+- az_network_cross-connection_peering
+- az_network_cross-connection_peering_create
+- az_network_cross-connection_peering_delete
+- az_network_cross-connection_peering_list
+- az_network_cross-connection_peering_show
+- az_network_cross-connection_peering_update
+- az_network_cross-connection_show
+- az_network_cross-connection_summarize-route-table
+- az_network_cross-connection_update
+- az_network_cross-connection_wait
+- az_network_cross-region-lb
+- az_network_cross-region-lb_address-pool
+- az_network_cross-region-lb_address-pool_address
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+- az_network_cross-region-lb_address-pool_create
+- az_network_cross-region-lb_address-pool_delete
+- az_network_cross-region-lb_create
+- az_network_cross-region-lb_delete
+- az_network_cross-region-lb_frontend-ip
+- az_network_cross-region-lb_frontend-ip_create
+- az_network_cross-region-lb_frontend-ip_delete
+- az_network_cross-region-lb_frontend-ip_list
+- az_network_cross-region-lb_frontend-ip_show
+- az_network_cross-region-lb_frontend-ip_update
+- az_network_cross-region-lb_list
+- az_network_cross-region-lb_probe
+- az_network_cross-region-lb_probe_create
+- az_network_cross-region-lb_probe_delete
+- az_network_cross-region-lb_probe_list
+- az_network_cross-region-lb_probe_show
+- az_network_cross-region-lb_probe_update
+- az_network_cross-region-lb_rule
+- az_network_cross-region-lb_rule_create
+- az_network_cross-region-lb_rule_delete
+- az_network_cross-region-lb_rule_list
+- az_network_cross-region-lb_rule_show
+- az_network_cross-region-lb_rule_update
+- az_network_cross-region-lb_show
+- az_network_cross-region-lb_update
+- az_network_cross-region-lb_wait
+- az_network_dns
+- az_network_dns_record-set
+- az_network_dns_record-set_a
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
+- az_network_dns_record-set_aaaa
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
+- az_network_dns_record-set_cname
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
+- az_network_dns_record-set_list
+- az_network_dns_record-set_mx
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
+- az_network_dns_record-set_ns
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
+- az_network_dns_record-set_ptr
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
+- az_network_dns_record-set_soa
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
+- az_network_dns_record-set_srv
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
+- az_network_dns_record-set_txt
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
+- az_network_dns_zone
+- az_network_dns_zone_create
+- az_network_dns_zone_delete
+- az_network_dns_zone_export
+- az_network_dns_zone_import
+- az_network_dns_zone_list
+- az_network_dns_zone_show
+- az_network_dns_zone_update
+- az_network_express-route
+- az_network_express-route_create
+- az_network_express-route_gateway
+- az_network_express-route_gateway_connection
+- az_network_express-route_gateway_connection_create
+- az_network_express-route_gateway_create
+- az_network_express-route_gateway_list
+- az_network_express-route_list
+- az_network_express-route_peering
+- az_network_express-route_peering_connection
+- az_network_express-route_peering_connection_create
+- az_network_express-route_peering_create
+- az_network_express-route_peering_delete
+- az_network_express-route_peering_list
+- az_network_express-route_peering_show
+- az_network_express-route_peering_update
+- az_network_express-route_port
+- az_network_express-route_port_create
+- az_network_express-route_port_generate-loa
+- az_network_express-route_port_list
+- az_network_firewall
+- az_network_firewall_application-rule
+- az_network_firewall_application-rule_collection
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+- az_network_firewall_application-rule_create
+- az_network_firewall_application-rule_delete
+- az_network_firewall_application-rule_list
+- az_network_firewall_application-rule_show
+- az_network_firewall_create
+- az_network_firewall_delete
+- az_network_firewall_ip-config
+- az_network_firewall_ip-config_create
+- az_network_firewall_ip-config_delete
+- az_network_firewall_ip-config_list
+- az_network_firewall_ip-config_show
+- az_network_firewall_list
+- az_network_firewall_list-fqdn-tags
+- az_network_firewall_management-ip-config
+- az_network_firewall_management-ip-config_show
+- az_network_firewall_management-ip-config_update
+- az_network_firewall_nat-rule
+- az_network_firewall_nat-rule_collection
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+- az_network_firewall_nat-rule_create
+- az_network_firewall_nat-rule_delete
+- az_network_firewall_nat-rule_list
+- az_network_firewall_nat-rule_show
+- az_network_firewall_network-rule
+- az_network_firewall_network-rule_collection
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+- az_network_firewall_network-rule_create
+- az_network_firewall_network-rule_delete
+- az_network_firewall_network-rule_list
+- az_network_firewall_network-rule_show
+- az_network_firewall_policy
+- az_network_firewall_policy_create
+- az_network_firewall_policy_delete
+- az_network_firewall_policy_intrusion-detection
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+- az_network_firewall_policy_list
+- az_network_firewall_policy_rule-collection-group
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+- az_network_firewall_policy_show
+- az_network_firewall_policy_update
+- az_network_firewall_show
+- az_network_firewall_threat-intel-allowlist
+- az_network_firewall_threat-intel-allowlist_create
+- az_network_firewall_threat-intel-allowlist_delete
+- az_network_firewall_threat-intel-allowlist_show
+- az_network_firewall_threat-intel-allowlist_update
+- az_network_firewall_update
+- az_network_front-door
+- az_network_front-door_backend-pool
+- az_network_front-door_backend-pool_backend
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+- az_network_front-door_backend-pool_create
+- az_network_front-door_backend-pool_delete
+- az_network_front-door_backend-pool_list
+- az_network_front-door_backend-pool_show
+- az_network_front-door_check-custom-domain
+- az_network_front-door_check-name-availability
+- az_network_front-door_create
+- az_network_front-door_delete
+- az_network_front-door_frontend-endpoint
+- az_network_front-door_frontend-endpoint_create
+- az_network_front-door_frontend-endpoint_delete
+- az_network_front-door_frontend-endpoint_disable-https
+- az_network_front-door_frontend-endpoint_enable-https
+- az_network_front-door_frontend-endpoint_list
+- az_network_front-door_frontend-endpoint_show
+- az_network_front-door_frontend-endpoint_wait
+- az_network_front-door_list
+- az_network_front-door_load-balancing
+- az_network_front-door_load-balancing_create
+- az_network_front-door_load-balancing_delete
+- az_network_front-door_load-balancing_list
+- az_network_front-door_load-balancing_show
+- az_network_front-door_load-balancing_update
+- az_network_front-door_probe
+- az_network_front-door_probe_create
+- az_network_front-door_probe_delete
+- az_network_front-door_probe_list
+- az_network_front-door_probe_show
+- az_network_front-door_probe_update
+- az_network_front-door_purge-endpoint
+- az_network_front-door_routing-rule
+- az_network_front-door_routing-rule_create
+- az_network_front-door_routing-rule_delete
+- az_network_front-door_routing-rule_list
+- az_network_front-door_routing-rule_show
+- az_network_front-door_routing-rule_update
+- az_network_front-door_rules-engine
+- az_network_front-door_rules-engine_delete
+- az_network_front-door_rules-engine_list
+- az_network_front-door_rules-engine_rule
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+- az_network_front-door_rules-engine_show
+- az_network_front-door_show
+- az_network_front-door_update
+- az_network_front-door_waf-policy
+- az_network_front-door_waf-policy_create
+- az_network_front-door_waf-policy_delete
+- az_network_front-door_waf-policy_list
+- az_network_front-door_waf-policy_managed-rule-definition
+- az_network_front-door_waf-policy_managed-rule-definition_list
+- az_network_front-door_waf-policy_managed-rules
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+- az_network_front-door_waf-policy_rule
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+- az_network_front-door_waf-policy_show
+- az_network_front-door_waf-policy_update
+- az_network_front-door_wait
+- az_network_ip-group
+- az_network_ip-group_create
+- az_network_ip-group_delete
+- az_network_ip-group_list
+- az_network_ip-group_show
+- az_network_ip-group_update
+- az_network_lb
+- az_network_lb_address-pool
+- az_network_lb_address-pool_address
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+- az_network_lb_address-pool_create
+- az_network_lb_address-pool_delete
+- az_network_lb_address-pool_list
+- az_network_lb_address-pool_show
+- az_network_lb_create
+- az_network_lb_delete
+- az_network_lb_frontend-ip
+- az_network_lb_frontend-ip_create
+- az_network_lb_frontend-ip_delete
+- az_network_lb_frontend-ip_list
+- az_network_lb_frontend-ip_show
+- az_network_lb_frontend-ip_update
+- az_network_lb_inbound-nat-pool
+- az_network_lb_inbound-nat-pool_create
+- az_network_lb_inbound-nat-pool_delete
+- az_network_lb_inbound-nat-pool_list
+- az_network_lb_inbound-nat-pool_show
+- az_network_lb_inbound-nat-pool_update
+- az_network_lb_inbound-nat-rule
+- az_network_lb_inbound-nat-rule_create
+- az_network_lb_inbound-nat-rule_delete
+- az_network_lb_inbound-nat-rule_list
+- az_network_lb_inbound-nat-rule_show
+- az_network_lb_inbound-nat-rule_update
+- az_network_lb_list
+- az_network_lb_probe
+- az_network_lb_probe_create
+- az_network_lb_probe_delete
+- az_network_lb_probe_list
+- az_network_lb_probe_show
+- az_network_lb_probe_update
+- az_network_lb_rule
+- az_network_lb_rule_create
+- az_network_lb_rule_delete
+- az_network_lb_rule_list
+- az_network_lb_rule_show
+- az_network_lb_rule_update
+- az_network_lb_show
+- az_network_lb_update
+- az_network_lb_wait
+- az_network_list-service-aliases
+- az_network_list-usages
+- az_network_local-gateway
+- az_network_local-gateway_create
+- az_network_local-gateway_delete
+- az_network_local-gateway_list
+- az_network_local-gateway_show
+- az_network_local-gateway_update
+- az_network_local-gateway_wait
+- az_network_nic
+- az_network_nic_create
+- az_network_nic_delete
+- az_network_nic_ip-config
+- az_network_nic_ip-config_address-pool
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
+- az_network_nic_ip-config_create
+- az_network_nic_ip-config_delete
+- az_network_nic_ip-config_inbound-nat-rule
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
+- az_network_nic_ip-config_list
+- az_network_nic_ip-config_show
+- az_network_nic_ip-config_update
+- az_network_nic_list
+- az_network_nic_show
+- az_network_nic_update
+- az_network_nic_vtap-config
+- az_network_nic_vtap-config_create
+- az_network_nic_vtap-config_delete
+- az_network_nic_vtap-config_list
+- az_network_nic_vtap-config_show
+- az_network_nic_wait
+- az_network_nsg
+- az_network_nsg_create
+- az_network_nsg_delete
+- az_network_nsg_list
+- az_network_nsg_rule
+- az_network_nsg_rule_create
+- az_network_nsg_rule_delete
+- az_network_nsg_rule_list
+- az_network_nsg_rule_show
+- az_network_nsg_rule_update
+- az_network_nsg_show
+- az_network_nsg_update
+- az_network_p2s-vpn-gateway
+- az_network_p2s-vpn-gateway_connection
+- az_network_p2s-vpn-gateway_connection_list
+- az_network_p2s-vpn-gateway_connection_show
+- az_network_p2s-vpn-gateway_create
+- az_network_p2s-vpn-gateway_delete
+- az_network_p2s-vpn-gateway_list
+- az_network_p2s-vpn-gateway_show
+- az_network_p2s-vpn-gateway_update
+- az_network_p2s-vpn-gateway_vpn-client
+- az_network_p2s-vpn-gateway_vpn-client_generate
+- az_network_p2s-vpn-gateway_wait
+- az_network_private-dns
+- az_network_private-dns_link
+- az_network_private-dns_link_vnet
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
+- az_network_private-dns_record-set
+- az_network_private-dns_record-set_a
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
+- az_network_private-dns_record-set_aaaa
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
+- az_network_private-dns_record-set_cname
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
+- az_network_private-dns_record-set_list
+- az_network_private-dns_record-set_mx
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
+- az_network_private-dns_record-set_ptr
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
+- az_network_private-dns_record-set_soa
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
+- az_network_private-dns_record-set_srv
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
+- az_network_private-dns_record-set_txt
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
+- az_network_private-dns_zone
+- az_network_private-dns_zone_create
+- az_network_private-dns_zone_delete
+- az_network_private-dns_zone_export
+- az_network_private-dns_zone_import
+- az_network_private-dns_zone_list
+- az_network_private-dns_zone_show
+- az_network_private-dns_zone_update
+- az_network_private-dns_zone_wait
+- az_network_private-endpoint
+- az_network_private-endpoint_list
+- az_network_private-endpoint-connection
+- az_network_private-endpoint-connection_approve
+- az_network_private-endpoint-connection_delete
+- az_network_private-endpoint-connection_list
+- az_network_private-endpoint-connection_reject
+- az_network_private-endpoint-connection_show
+- az_network_private-link-resource
+- az_network_private-link-resource_list
+- az_network_private-link-service
+- az_network_private-link-service_connection
+- az_network_private-link-service_connection_update
+- az_network_private-link-service_create
+- az_network_private-link-service_list
+- az_network_profile
+- az_network_profile_list
+- az_network_public-ip
+- az_network_public-ip_create
+- az_network_public-ip_delete
+- az_network_public-ip_list
+- az_network_public-ip_prefix
+- az_network_public-ip_prefix_create
+- az_network_public-ip_prefix_list
+- az_network_public-ip_show
+- az_network_public-ip_update
+- az_network_route-table
+- az_network_route-table_create
+- az_network_route-table_delete
+- az_network_route-table_list
+- az_network_route-table_route
+- az_network_route-table_route_create
+- az_network_route-table_route_delete
+- az_network_route-table_route_list
+- az_network_route-table_route_show
+- az_network_route-table_route_update
+- az_network_route-table_show
+- az_network_route-table_update
+- az_network_security-partner-provider
+- az_network_security-partner-provider_create
+- az_network_security-partner-provider_list
+- az_network_service-endpoint
+- az_network_service-endpoint_policy
+- az_network_service-endpoint_policy_create
+- az_network_service-endpoint_policy_list
+- az_network_service-endpoint_policy-definition
+- az_network_service-endpoint_policy-definition_create
+- az_network_traffic-manager
+- az_network_traffic-manager_endpoint
+- az_network_traffic-manager_endpoint_create
+- az_network_traffic-manager_endpoint_delete
+- az_network_traffic-manager_endpoint_list
+- az_network_traffic-manager_endpoint_show
+- az_network_traffic-manager_endpoint_show-geographic-hierarchy
+- az_network_traffic-manager_endpoint_update
+- az_network_traffic-manager_profile
+- az_network_traffic-manager_profile_check-dns
+- az_network_traffic-manager_profile_create
+- az_network_traffic-manager_profile_delete
+- az_network_traffic-manager_profile_list
+- az_network_traffic-manager_profile_show
+- az_network_traffic-manager_profile_update
+- az_network_vhub
+- az_network_vhub_connection
+- az_network_vhub_connection_create
+- az_network_vhub_connection_delete
+- az_network_vhub_connection_list
+- az_network_vhub_connection_show
+- az_network_vhub_connection_update
+- az_network_vhub_connection_wait
+- az_network_vhub_create
+- az_network_vhub_delete
+- az_network_vhub_get-effective-routes
+- az_network_vhub_list
+- az_network_vhub_route
+- az_network_vhub_route_add
+- az_network_vhub_route_list
+- az_network_vhub_route_remove
+- az_network_vhub_route_reset
+- az_network_vhub_route-table
+- az_network_vhub_route-table_create
+- az_network_vhub_route-table_delete
+- az_network_vhub_route-table_list
+- az_network_vhub_route-table_route
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+- az_network_vhub_route-table_show
+- az_network_vhub_route-table_update
+- az_network_vhub_route-table_wait
+- az_network_vhub_show
+- az_network_vhub_update
+- az_network_virtual-appliance
+- az_network_virtual-appliance_create
+- az_network_virtual-appliance_list
+- az_network_virtual-appliance_site
+- az_network_virtual-appliance_site_create
+- az_network_vnet
+- az_network_vnet_create
+- az_network_vnet_delete
+- az_network_vnet_list
+- az_network_vnet_show
+- az_network_vnet_subnet
+- az_network_vnet_subnet_create
+- az_network_vnet_subnet_delete
+- az_network_vnet_subnet_list
+- az_network_vnet_subnet_show
+- az_network_vnet_subnet_update
+- az_network_vnet_tap
+- az_network_vnet_tap_create
+- az_network_vnet_tap_delete
+- az_network_vnet_tap_list
+- az_network_vnet_tap_show
+- az_network_vnet_tap_update
+- az_network_vnet_update
+- az_network_vnet-gateway
+- az_network_vnet-gateway_revoked-cert
+- az_network_vnet-gateway_revoked-cert_create
+- az_network_vnet-gateway_revoked-cert_delete
+- az_network_vnet-gateway_root-cert
+- az_network_vnet-gateway_root-cert_create
+- az_network_vnet-gateway_root-cert_delete
+- az_network_vnet-gateway_vpn-client
+- az_network_vnet-gateway_vpn-client_generate
+- az_network_vpn-connection
+- az_network_vpn-connection_create
+- az_network_vpn-connection_delete
+- az_network_vpn-connection_list
+- az_network_vpn-connection_shared-key
+- az_network_vpn-connection_shared-key_reset
+- az_network_vpn-connection_shared-key_show
+- az_network_vpn-connection_shared-key_update
+- az_network_vpn-connection_show
+- az_network_vpn-connection_update
+- az_network_vpn-gateway
+- az_network_vpn-gateway_connection
+- az_network_vpn-gateway_connection_create
+- az_network_vpn-gateway_connection_delete
+- az_network_vpn-gateway_connection_ipsec-policy
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+- az_network_vpn-gateway_connection_list
+- az_network_vpn-gateway_connection_show
+- az_network_vpn-gateway_connection_update
+- az_network_vpn-gateway_connection_wait
+- az_network_vpn-gateway_create
+- az_network_vpn-gateway_delete
+- az_network_vpn-gateway_list
+- az_network_vpn-gateway_show
+- az_network_vpn-gateway_update
+- az_network_vpn-server-config
+- az_network_vpn-server-config_create
+- az_network_vpn-server-config_delete
+- az_network_vpn-server-config_ipsec-policy
+- az_network_vpn-server-config_ipsec-policy_add
+- az_network_vpn-server-config_ipsec-policy_list
+- az_network_vpn-server-config_ipsec-policy_remove
+- az_network_vpn-server-config_ipsec-policy_wait
+- az_network_vpn-server-config_list
+- az_network_vpn-server-config_set
+- az_network_vpn-server-config_show
+- az_network_vpn-server-config_wait
+- az_network_vpn-site
+- az_network_vpn-site_create
+- az_network_vpn-site_delete
+- az_network_vpn-site_download
+- az_network_vpn-site_list
+- az_network_vpn-site_show
+- az_network_vpn-site_update
+- az_network_vrouter
+- az_network_vrouter_create
+- az_network_vrouter_delete
+- az_network_vrouter_list
+- az_network_vrouter_peering
+- az_network_vrouter_peering_create
+- az_network_vrouter_peering_delete
+- az_network_vrouter_peering_list
+- az_network_vrouter_peering_show
+- az_network_vrouter_show
+- az_network_vwan
+- az_network_vwan_create
+- az_network_vwan_delete
+- az_network_vwan_list
+- az_network_vwan_show
+- az_network_vwan_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1401,10 +834,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure Network resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Network resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway.yml
index daa67ba322..d2d92e0aca 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway.yml
@@ -1,61 +1,64 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway
-  name: az network application-gateway
-  summary: Manage application-level routing and load balancing services.
-  description: To learn more about Application Gateway, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_create
-  - az_network_application_gateway_delete
-  - az_network_application_gateway_list
-  - az_network_application_gateway_show
-  - az_network_application_gateway_start
-  - az_network_application_gateway_stop
-  - az_network_application_gateway_update
-  - az_network_application_gateway_wait
-- uid: az_network_application_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway
+name: az network application-gateway
+summary: Manage application-level routing and load balancing services.
+description: To learn more about Application Gateway, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli.
+directCommands:
+- uid: az_network_application-gateway_create
   name: az network application-gateway create
   summary: Create an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway create --name
+                                          --resource-group
+                                          [--capacity]
+                                          [--cert-file]
+                                          [--cert-password]
+                                          [--enable-private-link]
+                                          [--frontend-port]
+                                          [--http-settings-cookie-based-affinity {Disabled, Enabled}]
+                                          [--http-settings-port]
+                                          [--http-settings-protocol {Http, Https}]
+                                          [--identity]
+                                          [--key-vault-secret-id]
+                                          [--location]
+                                          [--no-wait]
+                                          [--private-ip-address]
+                                          [--private-link-ip-address]
+                                          [--private-link-primary {false, true}]
+                                          [--private-link-subnet]
+                                          [--private-link-subnet-prefix]
+                                          [--public-ip-address]
+                                          [--public-ip-address-allocation]
+                                          [--routing-rule-type {Basic, PathBasedRouting}]
+                                          [--servers]
+                                          [--sku {Standard_Large, Standard_Medium, Standard_Small}]
+                                          [--subnet]
+                                          [--subnet-address-prefix]
+                                          [--subscription]
+                                          [--tags]
+                                          [--validate]
+                                          [--vnet-address-prefix]
+                                          [--vnet-name]
+                                          [--zones {1, 2, 3}]
   examples:
   - summary: Create an application gateway with VMs as backend servers.
-    syntax:
-      content: >-
-        az network application-gateway create -g MyResourceGroup -n MyAppGateway --capacity 2 --sku Standard_Medium \
-            --vnet-name MyVNet --subnet MySubnet --http-settings-cookie-based-affinity Enabled \
-            --public-ip-address MyAppGatewayPublicIp --servers 10.0.0.4 10.0.0.5
+    syntax: >-
+      az network application-gateway create -g MyResourceGroup -n MyAppGateway --capacity 2 --sku Standard_Medium \
+          --vnet-name MyVNet --subnet MySubnet --http-settings-cookie-based-affinity Enabled \
+          --public-ip-address MyAppGatewayPublicIp --servers 10.0.0.4 10.0.0.5
   - summary: Create an application gateway. (autogenerated)
-    syntax:
-      content: az network application-gateway create --capacity 2 --frontend-port MyFrontendPort --http-settings-cookie-based-affinity Enabled --http-settings-port 80 --http-settings-protocol Http --location westus2 --name MyAppGateway --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup --sku Standard_Small --subnet MySubnet --vnet-name MyVNet
-  parameters:
+    syntax: az network application-gateway create --capacity 2 --frontend-port MyFrontendPort --http-settings-cookie-based-affinity Enabled --http-settings-port 80 --http-settings-protocol Http --location westus2 --name MyAppGateway --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup --sku Standard_Small --subnet MySubnet --vnet-name MyVNet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --capacity
     defaultValue: "2"
     summary: The number of instances to use with the application gateway.
@@ -66,6 +69,9 @@ items:
   - name: --cert-password
     summary: The certificate password.
     description: ''
+  - name: --enable-private-link
+    summary: Enable Private Link feature for this application gateway. If both public IP and private IP are enbaled, taking effect only in public frontend IP.
+    description: ''
   - name: --frontend-port
     summary: The front end port number.
     description: ''
@@ -83,9 +89,43 @@ items:
     parameterValueGroup: Http, Https
     summary: The HTTP settings protocol.
     description: ''
+  - name: --identity
+    summary: Name or ID of the ManagedIdentity Resource.
+    description: ''
   - name: --key-vault-secret-id
     summary: Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in Azure KeyVault. You need enable soft delete for keyvault to use this feature.
     description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-ip-address
+    summary: Static private IP address to use.
+    description: ''
+  - name: --private-link-ip-address
+    summary: The static private IP address of a subnet for Private Link. If omitting, a dynamic one will be created.
+    description: ''
+  - name: --private-link-primary
+    parameterValueGroup: false, true
+    summary: Whether the IP configuration is primary or not.
+    description: ''
+  - name: --private-link-subnet
+    defaultValue: PrivateLinkDefaultSubnet
+    summary: The name of the subnet within the same vnet of an application gateway.
+    description: ''
+  - name: --private-link-subnet-prefix
+    defaultValue: 10.0.1.0/24
+    summary: The CIDR prefix to use when creating a new subnet.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of a public IP address. Uses existing resource or creates new if specified, or none if omitted.
+    description: ''
+  - name: --public-ip-address-allocation
+    defaultValue: Dynamic
+    summary: The kind of IP allocation to use when creating a new public IP.
+    description: ''
   - name: --routing-rule-type
     defaultValue: Basic
     parameterValueGroup: Basic, PathBasedRouting
@@ -99,19 +139,6 @@ items:
     parameterValueGroup: Standard_Large, Standard_Medium, Standard_Small
     summary: The name of the SKU.
     description: ''
-  - name: --identity
-    summary: Name or ID of the ManagedIdentity Resource.
-    description: ''
-  - name: --private-ip-address
-    summary: Static private IP address to use.
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of a public IP address. Uses existing resource or creates new if specified, or none if omitted.
-    description: ''
-  - name: --public-ip-address-allocation
-    defaultValue: Dynamic
-    summary: The kind of IP allocation to use when creating a new public IP.
-    description: ''
   - name: --subnet
     defaultValue: default
     summary: Name or ID of the subnet. Will create resource if it does not exist. If name specified, also specify --vnet-name. If you want to use an existing subnet in other resource group or subscription, please provide the ID instead of the name of the subnet.
@@ -120,6 +147,15 @@ items:
     defaultValue: 10.0.0.0/24
     summary: The CIDR prefix to use when creating a new subnet.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
   - name: --vnet-address-prefix
     defaultValue: 10.0.0.0/16
     summary: The CIDR prefix to use when creating a new VNet.
@@ -127,110 +163,106 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_delete
   name: az network application-gateway delete
   summary: Delete an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway delete [--ids]
+                                          [--name]
+                                          [--no-wait]
+                                          [--resource-group]
+                                          [--subscription]
   examples:
   - summary: Delete an application gateway.
-    syntax:
-      content: az network application-gateway delete -g MyResourceGroup -n MyAppGateway
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway delete -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the application gateway.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_list
   name: az network application-gateway list
   summary: List application gateways.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway list [--query-examples]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: List application gateways.
-    syntax:
-      content: az network application-gateway list -g MyResourceGroup
-  parameters:
+    syntax: az network application-gateway list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_show
   name: az network application-gateway show
   summary: Get the details of an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway show [--ids]
+                                        [--name]
+                                        [--query-examples]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Get the details of an application gateway.
-    syntax:
-      content: az network application-gateway show -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway show -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the application gateway.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_start
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_start
   name: az network application-gateway start
   summary: Start an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway start [--ids]
+                                         [--name]
+                                         [--resource-group]
+                                         [--subscription]
   examples:
   - summary: Start an application gateway.
-    syntax:
-      content: az network application-gateway start -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway start -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -238,28 +270,25 @@ items:
     summary: Name of the application gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_stop
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_stop
   name: az network application-gateway stop
   summary: Stop an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway stop [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Stop an application gateway.
-    syntax:
-      content: az network application-gateway stop -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway stop -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -267,40 +296,41 @@ items:
     summary: Name of the application gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_update
   name: az network application-gateway update
   summary: Update an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway update [--add]
+                                          [--capacity]
+                                          [--force-string]
+                                          [--ids]
+                                          [--name]
+                                          [--no-wait]
+                                          [--remove]
+                                          [--resource-group]
+                                          [--set]
+                                          [--sku {Standard_Large, Standard_Medium, Standard_Small}]
+                                          [--subscription]
+                                          [--tags]
   examples:
   - summary: Update an application gateway. (autogenerated)
-    syntax:
-      content: az network application-gateway update --name MyApplicationGateway --resource-group MyResourceGroup --set useRemoteGateways=true
-  parameters:
+    syntax: az network application-gateway update --name MyApplicationGateway --resource-group MyResourceGroup --set useRemoteGateways=true
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --capacity
     summary: The number of instances to use with the application gateway.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Standard_Large, Standard_Medium, Standard_Small
-    summary: The name of the SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -308,53 +338,49 @@ items:
   - name: --name -n
     summary: Name of the application gateway.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_wait
+  - name: --sku
+    parameterValueGroup: Standard_Large, Standard_Medium, Standard_Small
+    summary: The name of the SKU.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_wait
   name: az network application-gateway wait
   summary: Place the CLI in a waiting state until a condition of the application gateway is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway wait [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--ids]
+                                        [--interval]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
+                                        [--timeout]
+                                        [--updated]
   examples:
   - summary: Place the CLI in a waiting state until the application gateway is created.
-    syntax:
-      content: az network application-gateway wait -g MyResourceGroup -n MyAppGateway --created
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the application gateway.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network application-gateway wait -g MyResourceGroup -n MyAppGateway --created
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -367,10 +393,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the application gateway.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -378,265 +416,92 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_address_pool
-  name: az network application-gateway address-pool
-  summary: Manage address pools of an application gateway.
-- uid: az_network_application_gateway_address_pool_create
-  name: az network application-gateway address-pool create
-  summary: Create an address pool.
-- uid: az_network_application_gateway_address_pool_delete
-  name: az network application-gateway address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_application_gateway_address_pool_list
-  name: az network application-gateway address-pool list
-  summary: List address pools.
-- uid: az_network_application_gateway_address_pool_show
-  name: az network application-gateway address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_application_gateway_address_pool_update
-  name: az network application-gateway address-pool update
-  summary: Update an address pool.
-- uid: az_network_application_gateway_auth_cert
-  name: az network application-gateway auth-cert
-  summary: Manage authorization certificates of an application gateway.
-- uid: az_network_application_gateway_auth_cert_create
-  name: az network application-gateway auth-cert create
-  summary: Create an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_delete
-  name: az network application-gateway auth-cert delete
-  summary: Delete an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_list
-  name: az network application-gateway auth-cert list
-  summary: List authorization certificates.
-- uid: az_network_application_gateway_auth_cert_show
-  name: az network application-gateway auth-cert show
-  summary: Show an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_update
-  name: az network application-gateway auth-cert update
-  summary: Update an authorization certificate.
-- uid: az_network_application_gateway_create
-  name: az network application-gateway create
-  summary: Create an application gateway.
-- uid: az_network_application_gateway_delete
-  name: az network application-gateway delete
-  summary: Delete an application gateway.
-- uid: az_network_application_gateway_frontend_ip
-  name: az network application-gateway frontend-ip
-  summary: Manage frontend IP addresses of an application gateway.
-- uid: az_network_application_gateway_frontend_ip_create
-  name: az network application-gateway frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_delete
-  name: az network application-gateway frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_list
-  name: az network application-gateway frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_application_gateway_frontend_ip_show
-  name: az network application-gateway frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_update
-  name: az network application-gateway frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_application_gateway_frontend_port
-  name: az network application-gateway frontend-port
-  summary: Manage frontend ports of an application gateway.
-- uid: az_network_application_gateway_frontend_port_create
-  name: az network application-gateway frontend-port create
-  summary: Create a frontend port.
-- uid: az_network_application_gateway_frontend_port_delete
-  name: az network application-gateway frontend-port delete
-  summary: Delete a frontend port.
-- uid: az_network_application_gateway_frontend_port_list
-  name: az network application-gateway frontend-port list
-  summary: List frontend ports.
-- uid: az_network_application_gateway_frontend_port_show
-  name: az network application-gateway frontend-port show
-  summary: Get the details of a frontend port.
-- uid: az_network_application_gateway_frontend_port_update
-  name: az network application-gateway frontend-port update
-  summary: Update a frontend port.
-- uid: az_network_application_gateway_http_listener
-  name: az network application-gateway http-listener
-  summary: Manage HTTP listeners of an application gateway.
-- uid: az_network_application_gateway_http_listener_create
-  name: az network application-gateway http-listener create
-  summary: Create an HTTP listener.
-- uid: az_network_application_gateway_http_listener_delete
-  name: az network application-gateway http-listener delete
-  summary: Delete an HTTP listener.
-- uid: az_network_application_gateway_http_listener_list
-  name: az network application-gateway http-listener list
-  summary: List HTTP listeners.
-- uid: az_network_application_gateway_http_listener_show
-  name: az network application-gateway http-listener show
-  summary: Get the details of an HTTP listener.
-- uid: az_network_application_gateway_http_listener_update
-  name: az network application-gateway http-listener update
-  summary: Update an HTTP listener.
-- uid: az_network_application_gateway_http_settings
-  name: az network application-gateway http-settings
-  summary: Manage HTTP settings of an application gateway.
-- uid: az_network_application_gateway_http_settings_create
-  name: az network application-gateway http-settings create
-  summary: Create HTTP settings.
-- uid: az_network_application_gateway_http_settings_delete
-  name: az network application-gateway http-settings delete
-  summary: Delete HTTP settings.
-- uid: az_network_application_gateway_http_settings_list
-  name: az network application-gateway http-settings list
-  summary: List HTTP settings.
-- uid: az_network_application_gateway_http_settings_show
-  name: az network application-gateway http-settings show
-  summary: Get the details of a gateway's HTTP settings.
-- uid: az_network_application_gateway_http_settings_update
-  name: az network application-gateway http-settings update
-  summary: Update HTTP settings.
-- uid: az_network_application_gateway_list
-  name: az network application-gateway list
-  summary: List application gateways.
-- uid: az_network_application_gateway_probe
-  name: az network application-gateway probe
-  summary: Manage probes to gather and evaluate information on a gateway.
-- uid: az_network_application_gateway_probe_create
-  name: az network application-gateway probe create
-  summary: Create a probe.
-- uid: az_network_application_gateway_probe_delete
-  name: az network application-gateway probe delete
-  summary: Delete a probe.
-- uid: az_network_application_gateway_probe_list
-  name: az network application-gateway probe list
-  summary: List probes.
-- uid: az_network_application_gateway_probe_show
-  name: az network application-gateway probe show
-  summary: Get the details of a probe.
-- uid: az_network_application_gateway_probe_update
-  name: az network application-gateway probe update
-  summary: Update a probe.
-- uid: az_network_application_gateway_rewrite_rule
-  name: az network application-gateway rewrite-rule
-  summary: Manage rewrite rules of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
-- uid: az_network_application_gateway_rule
-  name: az network application-gateway rule
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_application_gateway_rule_create
-  name: az network application-gateway rule create
-  summary: Create a rule.
-- uid: az_network_application_gateway_rule_delete
-  name: az network application-gateway rule delete
-  summary: Delete a rule.
-- uid: az_network_application_gateway_rule_list
-  name: az network application-gateway rule list
-  summary: List rules.
-- uid: az_network_application_gateway_rule_show
-  name: az network application-gateway rule show
-  summary: Get the details of a rule.
-- uid: az_network_application_gateway_rule_update
-  name: az network application-gateway rule update
-  summary: Update a rule.
-- uid: az_network_application_gateway_show
-  name: az network application-gateway show
-  summary: Get the details of an application gateway.
-- uid: az_network_application_gateway_ssl_cert
-  name: az network application-gateway ssl-cert
-  summary: Manage SSL certificates of an application gateway.
-- uid: az_network_application_gateway_ssl_cert_create
-  name: az network application-gateway ssl-cert create
-  summary: Upload an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_delete
-  name: az network application-gateway ssl-cert delete
-  summary: Delete an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_list
-  name: az network application-gateway ssl-cert list
-  summary: List SSL certificates.
-- uid: az_network_application_gateway_ssl_cert_show
-  name: az network application-gateway ssl-cert show
-  summary: Get the details of an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_update
-  name: az network application-gateway ssl-cert update
-  summary: Update an SSL certificate.
-- uid: az_network_application_gateway_ssl_policy
-  name: az network application-gateway ssl-policy
-  summary: Manage the SSL policy of an application gateway.
-- uid: az_network_application_gateway_ssl_policy_set
-  name: az network application-gateway ssl-policy set
-  summary: Update or clear SSL policy settings.
-- uid: az_network_application_gateway_ssl_policy_show
-  name: az network application-gateway ssl-policy show
-  summary: Get the details of gateway's SSL policy settings.
-- uid: az_network_application_gateway_start
-  name: az network application-gateway start
-  summary: Start an application gateway.
-- uid: az_network_application_gateway_stop
-  name: az network application-gateway stop
-  summary: Stop an application gateway.
-- uid: az_network_application_gateway_update
-  name: az network application-gateway update
-  summary: Update an application gateway.
-- uid: az_network_application_gateway_url_path_map
-  name: az network application-gateway url-path-map
-  summary: Manage URL path maps of an application gateway.
-- uid: az_network_application_gateway_url_path_map_create
-  name: az network application-gateway url-path-map create
-  summary: Create a URL path map.
-- uid: az_network_application_gateway_url_path_map_delete
-  name: az network application-gateway url-path-map delete
-  summary: Delete a URL path map.
-- uid: az_network_application_gateway_url_path_map_list
-  name: az network application-gateway url-path-map list
-  summary: List URL path maps.
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
-- uid: az_network_application_gateway_url_path_map_show
-  name: az network application-gateway url-path-map show
-  summary: Get the details of a URL path map.
-- uid: az_network_application_gateway_url_path_map_update
-  name: az network application-gateway url-path-map update
-  summary: Update a URL path map.
-- uid: az_network_application_gateway_waf_config
-  name: az network application-gateway waf-config
-  summary: Configure the settings of a web application firewall.
-- uid: az_network_application_gateway_waf_config_set
-  name: az network application-gateway waf-config set
-  summary: Update the firewall configuration of a web application.
-- uid: az_network_application_gateway_waf_config_show
-  name: az network application-gateway waf-config show
-  summary: Get the firewall configuration of a web application.
-- uid: az_network_application_gateway_wait
-  name: az network application-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the application gateway is met.
+- az_network_application-gateway_address-pool
+- az_network_application-gateway_address-pool_create
+- az_network_application-gateway_address-pool_delete
+- az_network_application-gateway_address-pool_list
+- az_network_application-gateway_address-pool_show
+- az_network_application-gateway_address-pool_update
+- az_network_application-gateway_auth-cert
+- az_network_application-gateway_auth-cert_create
+- az_network_application-gateway_auth-cert_delete
+- az_network_application-gateway_auth-cert_list
+- az_network_application-gateway_auth-cert_show
+- az_network_application-gateway_auth-cert_update
+- az_network_application-gateway_create
+- az_network_application-gateway_delete
+- az_network_application-gateway_frontend-ip
+- az_network_application-gateway_frontend-ip_create
+- az_network_application-gateway_frontend-ip_delete
+- az_network_application-gateway_frontend-ip_list
+- az_network_application-gateway_frontend-ip_show
+- az_network_application-gateway_frontend-ip_update
+- az_network_application-gateway_frontend-port
+- az_network_application-gateway_frontend-port_create
+- az_network_application-gateway_frontend-port_delete
+- az_network_application-gateway_frontend-port_list
+- az_network_application-gateway_frontend-port_show
+- az_network_application-gateway_frontend-port_update
+- az_network_application-gateway_http-listener
+- az_network_application-gateway_http-listener_create
+- az_network_application-gateway_http-listener_delete
+- az_network_application-gateway_http-listener_list
+- az_network_application-gateway_http-listener_show
+- az_network_application-gateway_http-listener_update
+- az_network_application-gateway_http-settings
+- az_network_application-gateway_http-settings_create
+- az_network_application-gateway_http-settings_delete
+- az_network_application-gateway_http-settings_list
+- az_network_application-gateway_http-settings_show
+- az_network_application-gateway_http-settings_update
+- az_network_application-gateway_list
+- az_network_application-gateway_probe
+- az_network_application-gateway_probe_create
+- az_network_application-gateway_probe_delete
+- az_network_application-gateway_probe_list
+- az_network_application-gateway_probe_show
+- az_network_application-gateway_probe_update
+- az_network_application-gateway_rewrite-rule
+- az_network_application-gateway_rewrite-rule_set
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
+- az_network_application-gateway_rule
+- az_network_application-gateway_rule_create
+- az_network_application-gateway_rule_delete
+- az_network_application-gateway_rule_list
+- az_network_application-gateway_rule_show
+- az_network_application-gateway_rule_update
+- az_network_application-gateway_show
+- az_network_application-gateway_ssl-cert
+- az_network_application-gateway_ssl-cert_create
+- az_network_application-gateway_ssl-cert_delete
+- az_network_application-gateway_ssl-cert_list
+- az_network_application-gateway_ssl-cert_show
+- az_network_application-gateway_ssl-cert_update
+- az_network_application-gateway_ssl-policy
+- az_network_application-gateway_ssl-policy_set
+- az_network_application-gateway_ssl-policy_show
+- az_network_application-gateway_start
+- az_network_application-gateway_stop
+- az_network_application-gateway_update
+- az_network_application-gateway_url-path-map
+- az_network_application-gateway_url-path-map_create
+- az_network_application-gateway_url-path-map_delete
+- az_network_application-gateway_url-path-map_list
+- az_network_application-gateway_url-path-map_rule
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
+- az_network_application-gateway_url-path-map_show
+- az_network_application-gateway_url-path-map_update
+- az_network_application-gateway_waf-config
+- az_network_application-gateway_waf-config_set
+- az_network_application-gateway_waf-config_show
+- az_network_application-gateway_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -652,10 +517,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Application Gateway, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Application Gateway, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/address-pool.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/address-pool.yml
index 41ad5e69f8..ad89175e67 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/address-pool.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/address-pool.yml
@@ -1,30 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_address_pool
-  name: az network application-gateway address-pool
-  summary: Manage address pools of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_address_pool_create
-  - az_network_application_gateway_address_pool_delete
-  - az_network_application_gateway_address_pool_list
-  - az_network_application_gateway_address_pool_show
-  - az_network_application_gateway_address_pool_update
-- uid: az_network_application_gateway_address_pool_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_address-pool
+name: az network application-gateway address-pool
+summary: Manage address pools of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_address-pool_create
   name: az network application-gateway address-pool create
   summary: Create an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool create --gateway-name
+                                                       --name
+                                                       --resource-group
+                                                       [--no-wait]
+                                                       [--servers]
+                                                       [--subscription]
   examples:
   - summary: Create an address pool with two endpoints.
-    syntax:
-      content: >-
-        az network application-gateway address-pool create -g MyResourceGroup \
-            --gateway-name MyAppGateway -n MyAddressPool --servers 10.0.0.4 10.0.0.5
-  parameters:
+    syntax: >-
+      az network application-gateway address-pool create -g MyResourceGroup \
+          --gateway-name MyAppGateway -n MyAddressPool --servers 10.0.0.4 10.0.0.5
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -35,8 +31,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -46,26 +43,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_delete
   name: az network application-gateway address-pool delete
   summary: Delete an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool delete [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--resource-group]
+                                                       [--subscription]
   examples:
   - summary: Delete an address pool.
-    syntax:
-      content: az network application-gateway address-pool delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway address-pool delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -75,57 +68,60 @@ items:
   - name: --name -n
     summary: The name of the backend address pool.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_list
   name: az network application-gateway address-pool list
   summary: List address pools.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool list --gateway-name
+                                                     --resource-group
+                                                     [--query-examples]
+                                                     [--subscription]
   examples:
   - summary: List address pools.
-    syntax:
-      content: az network application-gateway address-pool list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway address-pool list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_show
   name: az network application-gateway address-pool show
   summary: Get the details of an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool show [--gateway-name]
+                                                     [--ids]
+                                                     [--name]
+                                                     [--query-examples]
+                                                     [--resource-group]
+                                                     [--subscription]
   examples:
   - summary: Get the details of an address pool.
-    syntax:
-      content: az network application-gateway address-pool show -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
-  parameters:
+    syntax: az network application-gateway address-pool show -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -135,34 +131,49 @@ items:
   - name: --name -n
     summary: The name of the backend address pool.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_update
   name: az network application-gateway address-pool update
   summary: Update an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool update [--add]
+                                                       [--force-string]
+                                                       [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--remove]
+                                                       [--resource-group]
+                                                       [--servers]
+                                                       [--set]
+                                                       [--subscription]
   examples:
-  - summary: Update an address pool, add server.
-    syntax:
-      content: az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAddressPool --servers 10.0.0.4 10.0.0.5 10.0.0.6
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - summary: Update backend address pool.
+    syntax: az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAddressPool --servers 10.0.0.4 10.0.0.5 10.0.0.6
+  - summary: Add to the backend address pool by using backend server IP address.
+    syntax: >-
+      az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool \
+          --add backendAddresses ipAddress=10.0.0.4
+  - summary: Remove an existing ip of the backend address pool("0" is the index).
+    syntax: >-
+      az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool \
+          --remove backendAddresses 0
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --servers
-    summary: Space-separated list of IP addresses or DNS names corresponding to backend servers.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -173,46 +184,31 @@ items:
   - name: --name -n
     summary: The name of the backend address pool.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --servers
+    summary: Space-separated list of IP addresses or DNS names corresponding to backend servers.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_address_pool_create
-  name: az network application-gateway address-pool create
-  summary: Create an address pool.
-- uid: az_network_application_gateway_address_pool_delete
-  name: az network application-gateway address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_application_gateway_address_pool_list
-  name: az network application-gateway address-pool list
-  summary: List address pools.
-- uid: az_network_application_gateway_address_pool_show
-  name: az network application-gateway address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_application_gateway_address_pool_update
-  name: az network application-gateway address-pool update
-  summary: Update an address pool.
+- az_network_application-gateway_address-pool_create
+- az_network_application-gateway_address-pool_delete
+- az_network_application-gateway_address-pool_list
+- az_network_application-gateway_address-pool_show
+- az_network_application-gateway_address-pool_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -228,10 +224,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage address pools of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/auth-cert.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/auth-cert.yml
index 8e8c044971..f6812274f6 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/auth-cert.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/auth-cert.yml
@@ -1,30 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_auth_cert
-  name: az network application-gateway auth-cert
-  summary: Manage authorization certificates of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_auth_cert_create
-  - az_network_application_gateway_auth_cert_delete
-  - az_network_application_gateway_auth_cert_list
-  - az_network_application_gateway_auth_cert_show
-  - az_network_application_gateway_auth_cert_update
-- uid: az_network_application_gateway_auth_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_auth-cert
+name: az network application-gateway auth-cert
+summary: Manage authorization certificates of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_auth-cert_create
   name: az network application-gateway auth-cert create
   summary: Create an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert create --cert-file
+                                                    --gateway-name
+                                                    --name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--subscription]
   examples:
   - summary: Create an authorization certificate.
-    syntax:
-      content: >-
-        az network application-gateway auth-cert create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyAuthCert --cert-file /path/to/cert/file
-  parameters:
+    syntax: >-
+      az network application-gateway auth-cert create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyAuthCert --cert-file /path/to/cert/file
+  requiredParameters:
   - isRequired: true
     name: --cert-file
     summary: Certificate file path.
@@ -39,34 +35,31 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_delete
   name: az network application-gateway auth-cert delete
   summary: Delete an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert delete [--gateway-name]
+                                                    [--ids]
+                                                    [--name]
+                                                    [--no-wait]
+                                                    [--resource-group]
+                                                    [--subscription]
   examples:
   - summary: Delete an authorization certificate.
-    syntax:
-      content: az network application-gateway auth-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway auth-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -76,57 +69,64 @@ items:
   - name: --name -n
     summary: The name of the authentication certificate.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_list
   name: az network application-gateway auth-cert list
   summary: List authorization certificates.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert list --gateway-name
+                                                  --resource-group
+                                                  [--query-examples]
+                                                  [--subscription]
   examples:
   - summary: List authorization certificates.
-    syntax:
-      content: az network application-gateway auth-cert list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway auth-cert list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_show
   name: az network application-gateway auth-cert show
   summary: Show an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert show [--gateway-name]
+                                                  [--ids]
+                                                  [--name]
+                                                  [--query-examples]
+                                                  [--resource-group]
+                                                  [--subscription]
   examples:
   - summary: Show an authorization certificate.
-    syntax:
-      content: az network application-gateway auth-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
-  parameters:
+    syntax: az network application-gateway auth-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
+  - summary: View expiry date of an authorization certificate. It is in Base-64 encoded X.509(.CER) format.
+    syntax: >-
+      az network application-gateway auth-cert show -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyAuthCert --query data -o tsv | base64 -d | openssl x509 -enddate -noout
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -136,35 +136,46 @@ items:
   - name: --name -n
     summary: The name of the authentication certificate.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_update
   name: az network application-gateway auth-cert update
   summary: Update an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert update --cert-file
+                                                    [--add]
+                                                    [--force-string]
+                                                    [--gateway-name]
+                                                    [--ids]
+                                                    [--name]
+                                                    [--no-wait]
+                                                    [--remove]
+                                                    [--resource-group]
+                                                    [--set]
+                                                    [--subscription]
   examples:
   - summary: Update authorization certificates to use a new cert file.
-    syntax:
-      content: az network application-gateway auth-cert update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAuthCert --cert-file /path/to/new/cert/file
-  parameters:
+    syntax: az network application-gateway auth-cert update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAuthCert --cert-file /path/to/new/cert/file
+  requiredParameters:
   - isRequired: true
     name: --cert-file
     summary: Certificate file path.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -175,46 +186,28 @@ items:
   - name: --name -n
     summary: The name of the authentication certificate.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_auth_cert_create
-  name: az network application-gateway auth-cert create
-  summary: Create an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_delete
-  name: az network application-gateway auth-cert delete
-  summary: Delete an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_list
-  name: az network application-gateway auth-cert list
-  summary: List authorization certificates.
-- uid: az_network_application_gateway_auth_cert_show
-  name: az network application-gateway auth-cert show
-  summary: Show an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_update
-  name: az network application-gateway auth-cert update
-  summary: Update an authorization certificate.
+- az_network_application-gateway_auth-cert_create
+- az_network_application-gateway_auth-cert_delete
+- az_network_application-gateway_auth-cert_list
+- az_network_application-gateway_auth-cert_show
+- az_network_application-gateway_auth-cert_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -230,10 +223,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage authorization certificates of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage authorization certificates of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-ip.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-ip.yml
index bb53433bea..b3b125b41d 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-ip.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-ip.yml
@@ -1,33 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_frontend_ip
-  name: az network application-gateway frontend-ip
-  summary: Manage frontend IP addresses of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_frontend_ip_create
-  - az_network_application_gateway_frontend_ip_delete
-  - az_network_application_gateway_frontend_ip_list
-  - az_network_application_gateway_frontend_ip_show
-  - az_network_application_gateway_frontend_ip_update
-- uid: az_network_application_gateway_frontend_ip_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_frontend-ip
+name: az network application-gateway frontend-ip
+summary: Manage frontend IP addresses of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_frontend-ip_create
   name: az network application-gateway frontend-ip create
   summary: Create a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip create --gateway-name
+                                                      --name
+                                                      --resource-group
+                                                      [--no-wait]
+                                                      [--private-ip-address]
+                                                      [--public-ip-address]
+                                                      [--subnet]
+                                                      [--subscription]
+                                                      [--vnet-name]
   examples:
   - summary: Create a frontend IP address.
-    syntax:
-      content: >-
-        az network application-gateway frontend-ip create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyFrontendIp --public-ip-address MyPublicIpAddress
+    syntax: >-
+      az network application-gateway frontend-ip create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyFrontendIp --public-ip-address MyPublicIpAddress
   - summary: Create a frontend IP address. (autogenerated)
-    syntax:
-      content: az network application-gateway frontend-ip create --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup --subnet MySubnet --vnet-name MyVnet
-  parameters:
+    syntax: az network application-gateway frontend-ip create --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup --subnet MySubnet --vnet-name MyVnet
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -38,8 +36,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -52,32 +51,28 @@ items:
   - name: --subnet
     summary: The name or ID of the subnet.
     description: ''
-  - name: --vnet-name
-    summary: The name of the virtual network corresponding to the subnet.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_delete
+  - name: --vnet-name
+    summary: The name of the virtual network corresponding to the subnet.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_delete
   name: az network application-gateway frontend-ip delete
   summary: Delete a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip delete [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--no-wait]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Delete a frontend IP address.
-    syntax:
-      content: az network application-gateway frontend-ip delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway frontend-ip delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -87,57 +82,60 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_list
   name: az network application-gateway frontend-ip list
   summary: List frontend IP addresses.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip list --gateway-name
+                                                    --resource-group
+                                                    [--query-examples]
+                                                    [--subscription]
   examples:
   - summary: List frontend IP addresses.
-    syntax:
-      content: az network application-gateway frontend-ip list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway frontend-ip list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_show
   name: az network application-gateway frontend-ip show
   summary: Get the details of a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip show [--gateway-name]
+                                                    [--ids]
+                                                    [--name]
+                                                    [--query-examples]
+                                                    [--resource-group]
+                                                    [--subscription]
   examples:
   - summary: Get the details of a frontend IP address.
-    syntax:
-      content: az network application-gateway frontend-ip show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
-  parameters:
+    syntax: az network application-gateway frontend-ip show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -147,46 +145,44 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_update
   name: az network application-gateway frontend-ip update
   summary: Update a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip update [--add]
+                                                      [--force-string]
+                                                      [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--no-wait]
+                                                      [--private-ip-address]
+                                                      [--public-ip-address]
+                                                      [--remove]
+                                                      [--resource-group]
+                                                      [--set]
+                                                      [--subnet]
+                                                      [--subscription]
+                                                      [--vnet-name]
   examples:
-  - summary: Update a frontend IP address to use a new IP address.
-    syntax:
-      content: az network application-gateway frontend-ip update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyFrontendIp --public-ip-address MyNewPublicIpAddress
   - summary: Update a frontend IP address. (autogenerated)
-    syntax:
-      content: az network application-gateway frontend-ip update --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --private-ip-address
-    summary: Static private IP address to use.
-    description: ''
-  - name: --public-ip-address
-    summary: The name or ID of the public IP address.
-    description: ''
-  - name: --subnet
-    summary: The name or ID of the subnet.
+    syntax: az network application-gateway frontend-ip update --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --vnet-name
-    summary: The name of the virtual network corresponding to the subnet.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -197,46 +193,40 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --private-ip-address
+    summary: Static private IP address to use.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --public-ip-address
+    summary: The name or ID of the public IP address.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subnet
+    summary: The name or ID of the subnet.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The name of the virtual network corresponding to the subnet.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_frontend_ip_create
-  name: az network application-gateway frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_delete
-  name: az network application-gateway frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_list
-  name: az network application-gateway frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_application_gateway_frontend_ip_show
-  name: az network application-gateway frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_update
-  name: az network application-gateway frontend-ip update
-  summary: Update a frontend IP address.
+- az_network_application-gateway_frontend-ip_create
+- az_network_application-gateway_frontend-ip_delete
+- az_network_application-gateway_frontend-ip_list
+- az_network_application-gateway_frontend-ip_show
+- az_network_application-gateway_frontend-ip_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -252,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage frontend IP addresses of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend IP addresses of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-port.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-port.yml
index 3f7a9318d3..1131e8cce3 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-port.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/frontend-port.yml
@@ -1,30 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_frontend_port
-  name: az network application-gateway frontend-port
-  summary: Manage frontend ports of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_frontend_port_create
-  - az_network_application_gateway_frontend_port_delete
-  - az_network_application_gateway_frontend_port_list
-  - az_network_application_gateway_frontend_port_show
-  - az_network_application_gateway_frontend_port_update
-- uid: az_network_application_gateway_frontend_port_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_frontend-port
+name: az network application-gateway frontend-port
+summary: Manage frontend ports of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_frontend-port_create
   name: az network application-gateway frontend-port create
   summary: Create a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port create --gateway-name
+                                                        --name
+                                                        --port
+                                                        --resource-group
+                                                        [--no-wait]
+                                                        [--subscription]
   examples:
   - summary: Create a frontend port.
-    syntax:
-      content: >-
-        az network application-gateway frontend-port create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyFrontendPort --port 8080
-  parameters:
+    syntax: >-
+      az network application-gateway frontend-port create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyFrontendPort --port 8080
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -39,34 +35,31 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_delete
   name: az network application-gateway frontend-port delete
   summary: Delete a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port delete [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Delete a frontend port.
-    syntax:
-      content: az network application-gateway frontend-port delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway frontend-port delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -76,57 +69,60 @@ items:
   - name: --name -n
     summary: The name of the frontend port.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_list
   name: az network application-gateway frontend-port list
   summary: List frontend ports.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port list --gateway-name
+                                                      --resource-group
+                                                      [--query-examples]
+                                                      [--subscription]
   examples:
   - summary: List frontend ports.
-    syntax:
-      content: az network application-gateway frontend-port list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway frontend-port list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_show
   name: az network application-gateway frontend-port show
   summary: Get the details of a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port show [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--query-examples]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Get the details of a frontend port.
-    syntax:
-      content: az network application-gateway frontend-port show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
-  parameters:
+    syntax: az network application-gateway frontend-port show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -136,36 +132,43 @@ items:
   - name: --name -n
     summary: The name of the frontend port.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_update
   name: az network application-gateway frontend-port update
   summary: Update a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port update [--add]
+                                                        [--force-string]
+                                                        [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--port]
+                                                        [--remove]
+                                                        [--resource-group]
+                                                        [--set]
+                                                        [--subscription]
   examples:
   - summary: Update a frontend port to use a different port.
-    syntax:
-      content: >-
-        az network application-gateway frontend-port update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyFrontendPort --port 8081
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+    syntax: >-
+      az network application-gateway frontend-port update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyFrontendPort --port 8081
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --port
-    summary: The port number.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -176,46 +179,31 @@ items:
   - name: --name -n
     summary: The name of the frontend port.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --port
+    summary: The port number.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_frontend_port_create
-  name: az network application-gateway frontend-port create
-  summary: Create a frontend port.
-- uid: az_network_application_gateway_frontend_port_delete
-  name: az network application-gateway frontend-port delete
-  summary: Delete a frontend port.
-- uid: az_network_application_gateway_frontend_port_list
-  name: az network application-gateway frontend-port list
-  summary: List frontend ports.
-- uid: az_network_application_gateway_frontend_port_show
-  name: az network application-gateway frontend-port show
-  summary: Get the details of a frontend port.
-- uid: az_network_application_gateway_frontend_port_update
-  name: az network application-gateway frontend-port update
-  summary: Update a frontend port.
+- az_network_application-gateway_frontend-port_create
+- az_network_application-gateway_frontend-port_delete
+- az_network_application-gateway_frontend-port_list
+- az_network_application-gateway_frontend-port_show
+- az_network_application-gateway_frontend-port_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -231,10 +219,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage frontend ports of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend ports of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-listener.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-listener.yml
index 3b208600f5..48653af99d 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-listener.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-listener.yml
@@ -1,30 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_http_listener
-  name: az network application-gateway http-listener
-  summary: Manage HTTP listeners of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_http_listener_create
-  - az_network_application_gateway_http_listener_delete
-  - az_network_application_gateway_http_listener_list
-  - az_network_application_gateway_http_listener_show
-  - az_network_application_gateway_http_listener_update
-- uid: az_network_application_gateway_http_listener_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_http-listener
+name: az network application-gateway http-listener
+summary: Manage HTTP listeners of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_http-listener_create
   name: az network application-gateway http-listener create
   summary: Create an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener create --frontend-port
+                                                        --gateway-name
+                                                        --name
+                                                        --resource-group
+                                                        [--frontend-ip]
+                                                        [--host-name]
+                                                        [--no-wait]
+                                                        [--ssl-cert]
+                                                        [--subscription]
   examples:
   - summary: Create an HTTP listener.
-    syntax:
-      content: >-
-        az network application-gateway http-listener create -g MyResourceGroup --gateway-name MyAppGateway \
-            --frontend-port MyFrontendPort -n MyHttpListener --frontend-ip MyAppGatewayPublicIp
-  parameters:
+    syntax: >-
+      az network application-gateway http-listener create -g MyResourceGroup --gateway-name MyAppGateway \
+          --frontend-port MyFrontendPort -n MyHttpListener --frontend-ip MyAppGatewayPublicIp
+  requiredParameters:
   - isRequired: true
     name: --frontend-port
     summary: The name or ID of the frontend port.
@@ -39,8 +38,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --frontend-ip
     summary: The name or ID of the frontend IP configuration. If only one exists, omit to use as default.
     description: ''
@@ -56,26 +56,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_delete
   name: az network application-gateway http-listener delete
   summary: Delete an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener delete [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Delete an HTTP listener.
-    syntax:
-      content: az network application-gateway http-listener delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway http-listener delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -85,57 +81,60 @@ items:
   - name: --name -n
     summary: The name of the HTTP listener.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_list
   name: az network application-gateway http-listener list
   summary: List HTTP listeners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener list --gateway-name
+                                                      --resource-group
+                                                      [--query-examples]
+                                                      [--subscription]
   examples:
   - summary: List HTTP listeners.
-    syntax:
-      content: az network application-gateway http-listener list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway http-listener list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_show
   name: az network application-gateway http-listener show
   summary: Get the details of an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener show [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--query-examples]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Get the details of an HTTP listener.
-    syntax:
-      content: az network application-gateway http-listener show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
-  parameters:
+    syntax: az network application-gateway http-listener show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -145,95 +144,90 @@ items:
   - name: --name -n
     summary: The name of the HTTP listener.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_update
   name: az network application-gateway http-listener update
   summary: Update an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener update [--add]
+                                                        [--force-string]
+                                                        [--frontend-ip]
+                                                        [--frontend-port]
+                                                        [--gateway-name]
+                                                        [--host-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--remove]
+                                                        [--resource-group]
+                                                        [--set]
+                                                        [--ssl-cert]
+                                                        [--subscription]
   examples:
   - summary: Update an HTTP listener to use a different hostname.
-    syntax:
-      content: >-
-        az network application-gateway http-listener update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyHttpListener --host-name www.mynewhost.com
-  parameters:
+    syntax: >-
+      az network application-gateway http-listener update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyHttpListener --host-name www.mynewhost.com
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip
     summary: The name or ID of the frontend IP configuration.
     description: ''
   - name: --frontend-port
     summary: The name or ID of the frontend port.
     description: ''
-  - name: --host-name
-    summary: Host name to use for multisite gateways.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --ssl-cert
-    summary: The name or ID of the SSL certificate to use.
-    description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
+  - name: --host-name
+    summary: Host name to use for multisite gateways.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the HTTP listener.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --ssl-cert
+    summary: The name or ID of the SSL certificate to use.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_http_listener_create
-  name: az network application-gateway http-listener create
-  summary: Create an HTTP listener.
-- uid: az_network_application_gateway_http_listener_delete
-  name: az network application-gateway http-listener delete
-  summary: Delete an HTTP listener.
-- uid: az_network_application_gateway_http_listener_list
-  name: az network application-gateway http-listener list
-  summary: List HTTP listeners.
-- uid: az_network_application_gateway_http_listener_show
-  name: az network application-gateway http-listener show
-  summary: Get the details of an HTTP listener.
-- uid: az_network_application_gateway_http_listener_update
-  name: az network application-gateway http-listener update
-  summary: Update an HTTP listener.
+- az_network_application-gateway_http-listener_create
+- az_network_application-gateway_http-listener_delete
+- az_network_application-gateway_http-listener_list
+- az_network_application-gateway_http-listener_show
+- az_network_application-gateway_http-listener_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -249,10 +243,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage HTTP listeners of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage HTTP listeners of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-settings.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-settings.yml
index 5bd21df28b..19da3fd747 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-settings.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/http-settings.yml
@@ -1,33 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_http_settings
-  name: az network application-gateway http-settings
-  summary: Manage HTTP settings of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_http_settings_create
-  - az_network_application_gateway_http_settings_delete
-  - az_network_application_gateway_http_settings_list
-  - az_network_application_gateway_http_settings_show
-  - az_network_application_gateway_http_settings_update
-- uid: az_network_application_gateway_http_settings_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_http-settings
+name: az network application-gateway http-settings
+summary: Manage HTTP settings of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_http-settings_create
   name: az network application-gateway http-settings create
   summary: Create HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings create --gateway-name
+                                                        --name
+                                                        --port
+                                                        --resource-group
+                                                        [--cookie-based-affinity {Disabled, Enabled}]
+                                                        [--no-wait]
+                                                        [--probe]
+                                                        [--protocol {Http, Https}]
+                                                        [--subscription]
+                                                        [--timeout]
   examples:
   - summary: Create HTTP settings.
-    syntax:
-      content: >-
-        az network application-gateway http-settings create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyHttpSettings --port 80 --protocol Http --cookie-based-affinity Disabled --timeout 30
+    syntax: >-
+      az network application-gateway http-settings create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyHttpSettings --port 80 --protocol Http --cookie-based-affinity Disabled --timeout 30
   - summary: Create HTTP settings. (autogenerated)
-    syntax:
-      content: az network application-gateway http-settings create --gateway-name MyAppGateway --host-name MyHost --name MyHttpSettings --port 80 --probe MyNewProbe --protocol Http --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway http-settings create --gateway-name MyAppGateway --host-name MyHost --name MyHttpSettings --port 80 --probe MyNewProbe --protocol Http --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -42,8 +41,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --cookie-based-affinity
     parameterValueGroup: Disabled, Enabled
     summary: Enable or disable cookie-based affinity.
@@ -59,32 +59,28 @@ items:
     parameterValueGroup: Http, Https
     summary: The HTTP settings protocol.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_delete
+  - name: --timeout
+    summary: Request timeout in seconds.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_delete
   name: az network application-gateway http-settings delete
   summary: Delete HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings delete [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Delete HTTP settings.
-    syntax:
-      content: az network application-gateway http-settings delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway http-settings delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -94,57 +90,60 @@ items:
   - name: --name -n
     summary: The name of the backed HTTP settings.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_list
   name: az network application-gateway http-settings list
   summary: List HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings list --gateway-name
+                                                      --resource-group
+                                                      [--query-examples]
+                                                      [--subscription]
   examples:
   - summary: List HTTP settings.
-    syntax:
-      content: az network application-gateway http-settings list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway http-settings list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_show
   name: az network application-gateway http-settings show
   summary: Get the details of a gateway's HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings show [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--query-examples]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Get the details of a gateway's HTTP settings.
-    syntax:
-      content: az network application-gateway http-settings show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
-  parameters:
+    syntax: az network application-gateway http-settings show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -154,53 +153,55 @@ items:
   - name: --name -n
     summary: The name of the backed HTTP settings.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_update
   name: az network application-gateway http-settings update
   summary: Update HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings update [--add]
+                                                        [--cookie-based-affinity {Disabled, Enabled}]
+                                                        [--force-string]
+                                                        [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--port]
+                                                        [--probe]
+                                                        [--protocol {Http, Https}]
+                                                        [--remove]
+                                                        [--resource-group]
+                                                        [--set]
+                                                        [--subscription]
+                                                        [--timeout]
   examples:
   - summary: Update HTTP settings to use a new probe.
-    syntax:
-      content: >-
-        az network application-gateway http-settings update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyHttpSettings --probe MyNewProbe
+    syntax: >-
+      az network application-gateway http-settings update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyHttpSettings --probe MyNewProbe
+  - summary: Update HTTP settings. (autogenerated)
+    syntax: az network application-gateway http-settings update --enable-probe true --gateway-name MyAppGateway --name MyHttpSettings --probe MyNewProbe --resource-group MyResourceGroup
   - summary: Update HTTP settings. (autogenerated)
-    syntax:
-      content: az network application-gateway http-settings update --enable-probe true --gateway-name MyAppGateway --name MyHttpSettings --probe MyNewProbe --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway http-settings update --gateway-name MyAppGateway --host-name-from-backend-pool true --name MyHttpSettings --port 80 --probe MyNewProbe --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --cookie-based-affinity
     parameterValueGroup: Disabled, Enabled
     summary: Enable or disable cookie-based affinity.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --port
-    summary: The port number.
-    description: ''
-  - name: --probe
-    summary: Name or ID of the probe to associate with the HTTP settings.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Https
-    summary: The HTTP settings protocol.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -211,46 +212,41 @@ items:
   - name: --name -n
     summary: The name of the backed HTTP settings.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --port
+    summary: The port number.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --probe
+    summary: Name or ID of the probe to associate with the HTTP settings.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: Http, Https
+    summary: The HTTP settings protocol.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_http_settings_create
-  name: az network application-gateway http-settings create
-  summary: Create HTTP settings.
-- uid: az_network_application_gateway_http_settings_delete
-  name: az network application-gateway http-settings delete
-  summary: Delete HTTP settings.
-- uid: az_network_application_gateway_http_settings_list
-  name: az network application-gateway http-settings list
-  summary: List HTTP settings.
-- uid: az_network_application_gateway_http_settings_show
-  name: az network application-gateway http-settings show
-  summary: Get the details of a gateway's HTTP settings.
-- uid: az_network_application_gateway_http_settings_update
-  name: az network application-gateway http-settings update
-  summary: Update HTTP settings.
+- az_network_application-gateway_http-settings_create
+- az_network_application-gateway_http-settings_delete
+- az_network_application-gateway_http-settings_list
+- az_network_application-gateway_http-settings_show
+- az_network_application-gateway_http-settings_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -266,10 +262,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage HTTP settings of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage HTTP settings of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/probe.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/probe.yml
index 31fa80c00a..6eda29aa7a 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/probe.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/probe.yml
@@ -1,30 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_probe
-  name: az network application-gateway probe
-  summary: Manage probes to gather and evaluate information on a gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_probe_create
-  - az_network_application_gateway_probe_delete
-  - az_network_application_gateway_probe_list
-  - az_network_application_gateway_probe_show
-  - az_network_application_gateway_probe_update
-- uid: az_network_application_gateway_probe_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_probe
+name: az network application-gateway probe
+summary: Manage probes to gather and evaluate information on a gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_probe_create
   name: az network application-gateway probe create
   summary: Create a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe create --gateway-name
+                                                --host
+                                                --name
+                                                --path
+                                                --protocol {Http, Https}
+                                                --resource-group
+                                                [--interval]
+                                                [--no-wait]
+                                                [--subscription]
+                                                [--threshold]
+                                                [--timeout]
   examples:
   - summary: Create an application gateway probe.
-    syntax:
-      content: >-
-        az network application-gateway probe create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyProbe --protocol https --host 127.0.0.1 --path /path/to/probe
-  parameters:
+    syntax: >-
+      az network application-gateway probe create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyProbe --protocol https --host 127.0.0.1 --path /path/to/probe
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -48,8 +49,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --interval
     defaultValue: "30"
     summary: The time interval in seconds between consecutive probes.
@@ -57,6 +59,9 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --threshold
     defaultValue: "8"
     summary: The number of failed probes after which the back end server is marked down.
@@ -65,32 +70,24 @@ items:
     defaultValue: "120"
     summary: The probe timeout in seconds.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_delete
   name: az network application-gateway probe delete
   summary: Delete a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe delete [--gateway-name]
+                                                [--ids]
+                                                [--name]
+                                                [--no-wait]
+                                                [--resource-group]
+                                                [--subscription]
   examples:
   - summary: Delete a probe.
-    syntax:
-      content: az network application-gateway probe delete -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
+    syntax: az network application-gateway probe delete -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
   - summary: Delete a probe. (autogenerated)
-    syntax:
-      content: az network application-gateway probe delete --gateway-name MyAppGateway --name MyProbe --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway probe delete --gateway-name MyAppGateway --name MyProbe --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -100,57 +97,60 @@ items:
   - name: --name -n
     summary: The name of the probe.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_list
   name: az network application-gateway probe list
   summary: List probes.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe list --gateway-name
+                                              --resource-group
+                                              [--query-examples]
+                                              [--subscription]
   examples:
   - summary: List probes.
-    syntax:
-      content: az network application-gateway probe list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway probe list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_show
   name: az network application-gateway probe show
   summary: Get the details of a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe show [--gateway-name]
+                                              [--ids]
+                                              [--name]
+                                              [--query-examples]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: Get the details of a probe.
-    syntax:
-      content: az network application-gateway probe show -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
-  parameters:
+    syntax: az network application-gateway probe show -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -160,37 +160,66 @@ items:
   - name: --name -n
     summary: The name of the probe.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_update
   name: az network application-gateway probe update
   summary: Update a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe update [--add]
+                                                [--force-string]
+                                                [--gateway-name]
+                                                [--host]
+                                                [--ids]
+                                                [--interval]
+                                                [--name]
+                                                [--no-wait]
+                                                [--path]
+                                                [--protocol {Http, Https}]
+                                                [--remove]
+                                                [--resource-group]
+                                                [--set]
+                                                [--subscription]
+                                                [--threshold]
+                                                [--timeout]
   examples:
   - summary: Update an application gateway probe with a timeout of 60 seconds.
-    syntax:
-      content: >-
-        az network application-gateway probe update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyProbe --timeout 60
-  parameters:
+    syntax: >-
+      az network application-gateway probe update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyProbe --timeout 60
+  - summary: Update a probe. (autogenerated)
+    syntax: az network application-gateway probe update --gateway-name MyAppGateway --host 127.0.0.1 --name MyProbe --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
   - name: --host
     summary: The name of the host to send the probe.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     summary: The time interval in seconds between consecutive probes.
     description: ''
+  - name: --name -n
+    summary: The name of the probe.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -201,61 +230,31 @@ items:
     parameterValueGroup: Http, Https
     summary: The HTTP settings protocol.
     description: ''
-  - name: --threshold
-    summary: The number of failed probes after which the back end server is marked down.
-    description: ''
-  - name: --timeout
-    summary: The probe timeout in seconds.
-    description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the probe.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --threshold
+    summary: The number of failed probes after which the back end server is marked down.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --timeout
+    summary: The probe timeout in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_probe_create
-  name: az network application-gateway probe create
-  summary: Create a probe.
-- uid: az_network_application_gateway_probe_delete
-  name: az network application-gateway probe delete
-  summary: Delete a probe.
-- uid: az_network_application_gateway_probe_list
-  name: az network application-gateway probe list
-  summary: List probes.
-- uid: az_network_application_gateway_probe_show
-  name: az network application-gateway probe show
-  summary: Get the details of a probe.
-- uid: az_network_application_gateway_probe_update
-  name: az network application-gateway probe update
-  summary: Update a probe.
+- az_network_application-gateway_probe_create
+- az_network_application-gateway_probe_delete
+- az_network_application-gateway_probe_list
+- az_network_application-gateway_probe_show
+- az_network_application-gateway_probe_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -271,10 +270,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage probes to gather and evaluate information on a gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage probes to gather and evaluate information on a gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule.yml
index 5db57537d6..a473507134 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule.yml
@@ -1,31 +1,15 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_rewrite_rule
-  name: az network application-gateway rewrite-rule
-  summary: Manage rewrite rules of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_rewrite-rule
+name: az network application-gateway rewrite-rule
+summary: Manage rewrite rules of an application gateway.
+description: ''
 commands:
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
+- az_network_application-gateway_rewrite-rule_set
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -41,10 +25,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage rewrite rules of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage rewrite rules of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml
index e54b636713..19ec4392f3 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml
@@ -1,28 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_rewrite_rule_set_create
-  - az_network_application_gateway_rewrite_rule_set_delete
-  - az_network_application_gateway_rewrite_rule_set_list
-  - az_network_application_gateway_rewrite_rule_set_show
-  - az_network_application_gateway_rewrite_rule_set_update
-- uid: az_network_application_gateway_rewrite_rule_set_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_rewrite-rule_set
+name: az network application-gateway rewrite-rule set
+summary: Manage rewrite rule sets of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_rewrite-rule_set_create
   name: az network application-gateway rewrite-rule set create
   summary: Create a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rewrite-rule set create --gateway-name
+                                                           --item-name
+                                                           --resource-group
+                                                           [--no-wait]
+                                                           [--subscription]
   examples:
   - summary: Create a rewrite rule set. (autogenerated)
-    syntax:
-      content: az network application-gateway rewrite-rule set create --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rewrite-rule set create --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -33,124 +28,139 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_delete
   name: az network application-gateway rewrite-rule set delete
   summary: Delete a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network application-gateway rewrite-rule set delete --item-name
+                                                           --resource-group
+                                                           --resource-name
+                                                           [--no-wait]
+                                                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --item-name
     summary: ''
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-name
     summary: ''
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_list
   name: az network application-gateway rewrite-rule set list
   summary: List rewrite rule sets.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rewrite-rule set list --resource-group
+                                                         --resource-name
+                                                         [--query-examples]
+                                                         [--subscription]
   examples:
   - summary: List rewrite rule sets. (autogenerated)
-    syntax:
-      content: az network application-gateway rewrite-rule set list --gateway-name MyGateway --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rewrite-rule set list --gateway-name MyGateway --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-name
     summary: ''
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_show
   name: az network application-gateway rewrite-rule set show
   summary: Get the details of a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rewrite-rule set show --item-name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--query-examples]
+                                                         [--subscription]
   examples:
   - summary: Get the details of a rewrite rule set. (autogenerated)
-    syntax:
-      content: az network application-gateway rewrite-rule set show --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rewrite-rule set show --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --item-name
     summary: ''
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-name
     summary: ''
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_update
   name: az network application-gateway rewrite-rule set update
   summary: Update a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network application-gateway rewrite-rule set update --item-name
+                                                           [--add]
+                                                           [--force-string]
+                                                           [--gateway-name]
+                                                           [--ids]
+                                                           [--no-wait]
+                                                           [--remove]
+                                                           [--resource-group]
+                                                           [--set]
+                                                           [--subscription]
+  examples:
+  - summary: Update a rewrite rule set. (autogenerated)
+    syntax: az network application-gateway rewrite-rule set update --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --item-name
     summary: ''
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -158,46 +168,28 @@ items:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -213,10 +205,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage rewrite rule sets of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage rewrite rule sets of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rule.yml
index f2bddd7a51..e5c766f305 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/rule.yml
@@ -1,30 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_rule
-  name: az network application-gateway rule
-  summary: Evaluate probe information and define routing rules.
-  description: For more information, visit, <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_rule_create
-  - az_network_application_gateway_rule_delete
-  - az_network_application_gateway_rule_list
-  - az_network_application_gateway_rule_show
-  - az_network_application_gateway_rule_update
-- uid: az_network_application_gateway_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_rule
+name: az network application-gateway rule
+summary: Evaluate probe information and define routing rules.
+description: For more information, visit, https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli.
+directCommands:
+- uid: az_network_application-gateway_rule_create
   name: az network application-gateway rule create
   summary: Create a rule.
   description: Rules are executed in the order in which they are created.
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule create --gateway-name
+                                               --name
+                                               --resource-group
+                                               [--address-pool]
+                                               [--http-listener]
+                                               [--http-settings]
+                                               [--no-wait]
+                                               [--priority]
+                                               [--rule-type]
+                                               [--subscription]
+                                               [--url-path-map]
   examples:
   - summary: Create a basic rule.
-    syntax:
-      content: >-
-        az network application-gateway rule create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyRule --http-listener MyBackendListener --rule-type Basic --address-pool MyAddressPool --http-settings MyHttpSettings
-  parameters:
+    syntax: >-
+      az network application-gateway rule create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyRule --http-listener MyBackendListener --rule-type Basic --address-pool MyAddressPool --http-settings MyHttpSettings
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -35,8 +36,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --address-pool
     summary: The name or ID of the backend address pool. If only one exists, omit to use as default.
     description: ''
@@ -49,36 +51,35 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --priority
+    summary: Priority of the request routing rule. Range from 1 to 2000.
+    description: ''
   - name: --rule-type
     defaultValue: Basic
     summary: The rule type (Basic, PathBasedRouting).
     description: ''
-  - name: --url-path-map
-    summary: The name or ID of the URL path map.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_delete
+  - name: --url-path-map
+    summary: The name or ID of the URL path map.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_delete
   name: az network application-gateway rule delete
   summary: Delete a rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule delete [--gateway-name]
+                                               [--ids]
+                                               [--name]
+                                               [--no-wait]
+                                               [--resource-group]
+                                               [--subscription]
   examples:
   - summary: Delete a rule.
-    syntax:
-      content: az network application-gateway rule delete -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway rule delete -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -88,57 +89,60 @@ items:
   - name: --name -n
     summary: The name of the request routing rule.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_list
   name: az network application-gateway rule list
   summary: List rules.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule list --gateway-name
+                                             --resource-group
+                                             [--query-examples]
+                                             [--subscription]
   examples:
   - summary: List rules.
-    syntax:
-      content: az network application-gateway rule list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway rule list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_show
   name: az network application-gateway rule show
   summary: Get the details of a rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule show [--gateway-name]
+                                             [--ids]
+                                             [--name]
+                                             [--query-examples]
+                                             [--resource-group]
+                                             [--subscription]
   examples:
   - summary: Get the details of a rule.
-    syntax:
-      content: az network application-gateway rule show -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
-  parameters:
+    syntax: az network application-gateway rule show -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -148,101 +152,100 @@ items:
   - name: --name -n
     summary: The name of the request routing rule.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_update
   name: az network application-gateway rule update
   summary: Update a rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule update [--add]
+                                               [--address-pool]
+                                               [--force-string]
+                                               [--gateway-name]
+                                               [--http-listener]
+                                               [--http-settings]
+                                               [--ids]
+                                               [--name]
+                                               [--no-wait]
+                                               [--priority]
+                                               [--remove]
+                                               [--resource-group]
+                                               [--rule-type]
+                                               [--set]
+                                               [--subscription]
+                                               [--url-path-map]
   examples:
   - summary: Update a rule use a new HTTP listener.
-    syntax:
-      content: >-
-        az network application-gateway rule update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyRule --http-listener MyNewBackendListener
+    syntax: >-
+      az network application-gateway rule update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyRule --http-listener MyNewBackendListener
   - summary: Update a rule. (autogenerated)
-    syntax:
-      content: az network application-gateway rule update --address-pool MyAddressPool --gateway-name MyAppGateway --name MyRule --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rule update --address-pool MyAddressPool --gateway-name MyAppGateway --name MyRule --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-pool
     summary: The name or ID of the backend address pool.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
   - name: --http-listener
     summary: The name or ID of the HTTP listener.
     description: ''
   - name: --http-settings
     summary: The name or ID of the backend HTTP settings.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --rule-type
-    summary: The rule type (Basic, PathBasedRouting).
-    description: ''
-  - name: --url-path-map
-    summary: The name or ID of the URL path map.
-    description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the request routing rule.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --priority
+    summary: Priority of the request routing rule. Range from 1 to 2000.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --rule-type
+    summary: The rule type (Basic, PathBasedRouting).
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --url-path-map
+    summary: The name or ID of the URL path map.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_rule_create
-  name: az network application-gateway rule create
-  summary: Create a rule.
-- uid: az_network_application_gateway_rule_delete
-  name: az network application-gateway rule delete
-  summary: Delete a rule.
-- uid: az_network_application_gateway_rule_list
-  name: az network application-gateway rule list
-  summary: List rules.
-- uid: az_network_application_gateway_rule_show
-  name: az network application-gateway rule show
-  summary: Get the details of a rule.
-- uid: az_network_application_gateway_rule_update
-  name: az network application-gateway rule update
-  summary: Update a rule.
+- az_network_application-gateway_rule_create
+- az_network_application-gateway_rule_delete
+- az_network_application-gateway_rule_list
+- az_network_application-gateway_rule_show
+- az_network_application-gateway_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -258,10 +261,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information, visit, <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information, visit, https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-cert.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-cert.yml
index 361fb98a39..ff399ec930 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-cert.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-cert.yml
@@ -1,67 +1,63 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_ssl_cert
-  name: az network application-gateway ssl-cert
-  summary: Manage SSL certificates of an application gateway.
-  description: For more information visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_ssl_cert_create
-  - az_network_application_gateway_ssl_cert_delete
-  - az_network_application_gateway_ssl_cert_list
-  - az_network_application_gateway_ssl_cert_show
-  - az_network_application_gateway_ssl_cert_update
-- uid: az_network_application_gateway_ssl_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_ssl-cert
+name: az network application-gateway ssl-cert
+summary: Manage SSL certificates of an application gateway.
+description: For more information visit https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli.
+directCommands:
+- uid: az_network_application-gateway_ssl-cert_create
   name: az network application-gateway ssl-cert create
   summary: Upload an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert create --gateway-name
+                                                   --name
+                                                   --resource-group
+                                                   [--cert-file]
+                                                   [--cert-password]
+                                                   [--key-vault-secret-id]
+                                                   [--no-wait]
+                                                   [--subscription]
   examples:
   - summary: Upload an SSL certificate via --cert-file and --cert-password.
-    syntax:
-      content: >-
-        az network application-gateway ssl-cert create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MySSLCert --cert-file \path\to\cert\file --cert-password Abc123
+    syntax: >-
+      az network application-gateway ssl-cert create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MySSLCert --cert-file \path\to\cert\file --cert-password Abc123
   - summary: Upload an SSL certificate via --key-vault-secret-id of a KeyVault Secret
-    syntax:
-      content: >-
-        openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-          -out azure-cli-app-tls.crt \
-          -keyout azure-cli-app-tls.key \
-          -subj "/CN=azure-cli-app"
+    syntax: >-
+      openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+        -out azure-cli-app-tls.crt \
+        -keyout azure-cli-app-tls.key \
+        -subj "/CN=azure-cli-app"
 
-        openssl pkcs12 -export \
-          -in azure-cli-tls.crt \
-          -inkey sample-app-tls.key \
-          -passout pass: -out azure-cli-cert.pfx
+      openssl pkcs12 -export \
+        -in azure-cli-tls.crt \
+        -inkey sample-app-tls.key \
+        -passout pass: -out azure-cli-cert.pfx
 
-        SecretValue=$(cat azure-cli-cert.pfx | base64)
+      SecretValue=$(cat azure-cli-cert.pfx | base64)
 
 
-        az keyvault secret set --vault-name MyKeyVault --name MySecret --value ${SecretValue}
+      az keyvault secret set --vault-name MyKeyVault --name MySecret --value ${SecretValue}
 
 
-        az network application-gateway ssl-cert create \
-          --resource-group MyResourceGroup \
-          --gateway-name MyAppGateway \
-          -n MySSLCert \
-          --key-vault-secret-id MySecretSecretID
+      az network application-gateway ssl-cert create \
+        --resource-group MyResourceGroup \
+        --gateway-name MyAppGateway \
+        -n MySSLCert \
+        --key-vault-secret-id MySecretSecretID
   - summary: Upload an SSL certificate via --key-vault-secret-id of a KeyVault Certificate
-    syntax:
-      content: >-
-        az keyvault certificate create \
-          --vault-name MyKeyVault \
-          --name MyCertificate \
-          --policy "$(az keyvault certificate get-default-policy)" \
+    syntax: >-
+      az keyvault certificate create \
+        --vault-name MyKeyVault \
+        --name MyCertificate \
+        --policy "$(az keyvault certificate get-default-policy)" \
 
-        az network application-gateway ssl-cert create \
-          --resource-group MyResourceGroup \
-          --gateway-name MyAppGateway \
-          -n MySSLCert \
-          --key-vault-secret-id MyCertificateSecretID
-  parameters:
+      az network application-gateway ssl-cert create \
+        --resource-group MyResourceGroup \
+        --gateway-name MyAppGateway \
+        -n MySSLCert \
+        --key-vault-secret-id MyCertificateSecretID
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -72,8 +68,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --cert-file
     summary: The path to the PFX certificate file.
     description: ''
@@ -89,26 +86,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_delete
   name: az network application-gateway ssl-cert delete
   summary: Delete an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert delete [--gateway-name]
+                                                   [--ids]
+                                                   [--name]
+                                                   [--no-wait]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: Delete an SSL certificate.
-    syntax:
-      content: az network application-gateway ssl-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway ssl-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -118,57 +111,67 @@ items:
   - name: --name -n
     summary: The name of the SSL certificate.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_list
   name: az network application-gateway ssl-cert list
   summary: List SSL certificates.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert list --gateway-name
+                                                 --resource-group
+                                                 [--query-examples]
+                                                 [--subscription]
   examples:
   - summary: List SSL certificates.
-    syntax:
-      content: az network application-gateway ssl-cert list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway ssl-cert list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_show
   name: az network application-gateway ssl-cert show
   summary: Get the details of an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert show [--gateway-name]
+                                                 [--ids]
+                                                 [--name]
+                                                 [--query-examples]
+                                                 [--resource-group]
+                                                 [--subscription]
   examples:
   - summary: Get the details of an SSL certificate.
-    syntax:
-      content: az network application-gateway ssl-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
-  parameters:
+    syntax: az network application-gateway ssl-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
+  - summary: Display the expiry date of SSL certificate. The certificate is returned in PKCS7 format from which the expiration date needs to be retrieved.
+    syntax: >-
+      publiccert=`az network application-gateway ssl-cert show -g MyResourceGroup --gateway-name MyAppGateway --name mywebsite.com --query publicCertData -o tsv`
+
+      echo "-----BEGIN CERTIFICATE-----" >> public.cert; echo "${publiccert}" >> public.cert; echo "-----END CERTIFICATE-----" >> public.cert
+
+      cat public.cert | fold -w 64 | openssl pkcs7 -print_certs | openssl x509 -noout -enddate
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -178,42 +181,51 @@ items:
   - name: --name -n
     summary: The name of the SSL certificate.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_update
   name: az network application-gateway ssl-cert update
   summary: Update an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert update [--add]
+                                                   [--cert-file]
+                                                   [--cert-password]
+                                                   [--force-string]
+                                                   [--gateway-name]
+                                                   [--ids]
+                                                   [--key-vault-secret-id]
+                                                   [--name]
+                                                   [--no-wait]
+                                                   [--remove]
+                                                   [--resource-group]
+                                                   [--set]
+                                                   [--subscription]
   examples:
   - summary: Change a gateway SSL certificate and password.
-    syntax:
-      content: >-
-        az network application-gateway ssl-cert update -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert \
-            --cert-file \path\to\new\cert\file --cert-password Abc123Abc123
-  parameters:
+    syntax: >-
+      az network application-gateway ssl-cert update -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert \
+          --cert-file \path\to\new\cert\file --cert-password Abc123Abc123
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --cert-file
     summary: The path to the PFX certificate file.
     description: ''
   - name: --cert-password
     summary: Certificate password.
     description: ''
-  - name: --key-vault-secret-id
-    summary: Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in Azure KeyVault.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -221,49 +233,34 @@ items:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --key-vault-secret-id
+    summary: Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in Azure KeyVault.
+    description: ''
   - name: --name -n
     summary: The name of the SSL certificate.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_ssl_cert_create
-  name: az network application-gateway ssl-cert create
-  summary: Upload an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_delete
-  name: az network application-gateway ssl-cert delete
-  summary: Delete an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_list
-  name: az network application-gateway ssl-cert list
-  summary: List SSL certificates.
-- uid: az_network_application_gateway_ssl_cert_show
-  name: az network application-gateway ssl-cert show
-  summary: Get the details of an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_update
-  name: az network application-gateway ssl-cert update
-  summary: Update an SSL certificate.
+- az_network_application-gateway_ssl-cert_create
+- az_network_application-gateway_ssl-cert_delete
+- az_network_application-gateway_ssl-cert_list
+- az_network_application-gateway_ssl-cert_show
+- az_network_application-gateway_ssl-cert_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -279,10 +276,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information visit https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-policy.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-policy.yml
index 8ba4f181a4..0f1db309ac 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/ssl-policy.yml
@@ -1,33 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_ssl_policy
-  name: az network application-gateway ssl-policy
-  summary: Manage the SSL policy of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_ssl_policy_set
-  - az_network_application_gateway_ssl_policy_show
-- uid: az_network_application_gateway_ssl_policy_set
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_ssl-policy
+name: az network application-gateway ssl-policy
+summary: Manage the SSL policy of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_ssl-policy_set
   name: az network application-gateway ssl-policy set
   summary: Update or clear SSL policy settings.
   description: To view the predefined policies, use `az network application-gateway ssl-policy predefined list`.
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-policy set [--clear]
+                                                  [--disabled-ssl-protocols]
+                                                  [--gateway-name]
+                                                  [--ids]
+                                                  [--no-wait]
+                                                  [--resource-group]
+                                                  [--subscription]
   examples:
   - summary: Set a predefined SSL policy.
-    syntax:
-      content: >-
-        az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
-            -n AppGwSslPolicy20170401S --policy-type Predefined
+    syntax: >-
+      az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
+          -n AppGwSslPolicy20170401S --policy-type Predefined
   - summary: Set a custom SSL policy with TLSv1_2 and the cipher suites below.
-    syntax:
-      content: >-
-        az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
-            --policy-type Custom --min-protocol-version TLSv1_2 \
-            --cipher-suites TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 TLS_RSA_WITH_AES_128_GCM_SHA256
-  parameters:
+    syntax: >-
+      az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
+          --policy-type Custom --min-protocol-version TLSv1_2 \
+          --cipher-suites TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 TLS_RSA_WITH_AES_128_GCM_SHA256
+  optionalParameters:
   - name: --clear
     summary: Clear SSL policy.
     description: ''
@@ -35,63 +34,55 @@ items:
     summary: Space-separated list of protocols to disable.
     description: ''
     valueFrom: az network application-gateway ssl-policy list-options
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_policy_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-policy_show
   name: az network application-gateway ssl-policy show
   summary: Get the details of gateway's SSL policy settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-policy show [--gateway-name]
+                                                   [--ids]
+                                                   [--query-examples]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: Get the details of a gateway's SSL policy settings.
-    syntax:
-      content: az network application-gateway ssl-policy show -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway ssl-policy show -g MyResourceGroup --gateway-name MyAppGateway
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_ssl_policy_set
-  name: az network application-gateway ssl-policy set
-  summary: Update or clear SSL policy settings.
-- uid: az_network_application_gateway_ssl_policy_show
-  name: az network application-gateway ssl-policy show
-  summary: Get the details of gateway's SSL policy settings.
+- az_network_application-gateway_ssl-policy_set
+- az_network_application-gateway_ssl-policy_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -107,10 +98,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the SSL policy of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the SSL policy of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map.yml
index 33c7843b87..52ae4600d4 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map.yml
@@ -1,31 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_url_path_map
-  name: az network application-gateway url-path-map
-  summary: Manage URL path maps of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_url_path_map_create
-  - az_network_application_gateway_url_path_map_delete
-  - az_network_application_gateway_url_path_map_list
-  - az_network_application_gateway_url_path_map_show
-  - az_network_application_gateway_url_path_map_update
-- uid: az_network_application_gateway_url_path_map_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_url-path-map
+name: az network application-gateway url-path-map
+summary: Manage URL path maps of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_url-path-map_create
   name: az network application-gateway url-path-map create
   summary: Create a URL path map.
-  description: The map must be created with at least one rule. This command requires the creation of the first rule at the time the map is created. To learn more visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-create-url-route-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-create-url-route-cli</a>.
-  langs:
-  - azurecli
+  description: The map must be created with at least one rule. This command requires the creation of the first rule at the time the map is created. To learn more visit https://docs.microsoft.com/azure/application-gateway/application-gateway-create-url-route-cli.
+  syntax: >-
+    az network application-gateway url-path-map create --gateway-name
+                                                       --name
+                                                       --paths
+                                                       --resource-group
+                                                       [--address-pool]
+                                                       [--default-address-pool]
+                                                       [--default-http-settings]
+                                                       [--http-settings]
+                                                       [--no-wait]
+                                                       [--rule-name]
+                                                       [--subscription]
   examples:
   - summary: Create a URL path map with a rule.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyUrlPathMap --rule-name MyUrlPathMapRule1 --paths /mypath1/* --address-pool MyAddressPool \
-            --default-address-pool MyAddressPool --http-settings MyHttpSettings --default-http-settings MyHttpSettings
-  parameters:
+    syntax: >-
+      az network application-gateway url-path-map create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyUrlPathMap --rule-name MyUrlPathMapRule1 --paths /mypath1/* --address-pool MyAddressPool \
+          --default-address-pool MyAddressPool --http-settings MyHttpSettings --default-http-settings MyHttpSettings
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -34,9 +35,17 @@ items:
     name: --name -n
     summary: The name of the URL path map.
     description: ''
+  - isRequired: true
+    name: --paths
+    summary: 'Space-separated list of paths to associate with the rule. Valid paths start and end with "/" (ex: "/bar/").'
+    description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --address-pool
+    summary: The name or ID of the backend address pool to use with the created rule.
     description: ''
   - name: --default-address-pool
     summary: The name or ID of the default backend address pool, if different from --address-pool.
@@ -44,19 +53,12 @@ items:
   - name: --default-http-settings
     summary: The name or ID of the default HTTP settings, if different from --http-settings.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - isRequired: true
-    name: --paths
-    summary: 'Space-separated list of paths to associate with the rule. Valid paths start and end with "/" (ex: "/bar/").'
-    description: ''
-  - name: --address-pool
-    summary: The name or ID of the backend address pool to use with the created rule.
-    description: ''
   - name: --http-settings
     summary: The name or ID of the HTTP settings to use with the created rule.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --rule-name
     defaultValue: default
     summary: The name of the url-path-map rule.
@@ -64,26 +66,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_delete
   name: az network application-gateway url-path-map delete
   summary: Delete a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map delete [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--resource-group]
+                                                       [--subscription]
   examples:
   - summary: Delete a URL path map.
-    syntax:
-      content: az network application-gateway url-path-map delete -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway url-path-map delete -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -93,57 +91,60 @@ items:
   - name: --name -n
     summary: The name of the URL path map.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_list
   name: az network application-gateway url-path-map list
   summary: List URL path maps.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map list --gateway-name
+                                                     --resource-group
+                                                     [--query-examples]
+                                                     [--subscription]
   examples:
   - summary: List URL path maps.
-    syntax:
-      content: az network application-gateway url-path-map list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway url-path-map list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_show
   name: az network application-gateway url-path-map show
   summary: Get the details of a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map show [--gateway-name]
+                                                     [--ids]
+                                                     [--name]
+                                                     [--query-examples]
+                                                     [--resource-group]
+                                                     [--subscription]
   examples:
   - summary: Get the details of a URL path map.
-    syntax:
-      content: az network application-gateway url-path-map show -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
-  parameters:
+    syntax: az network application-gateway url-path-map show -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -153,42 +154,52 @@ items:
   - name: --name -n
     summary: The name of the URL path map.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_update
   name: az network application-gateway url-path-map update
   summary: Update a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map update [--add]
+                                                       [--default-address-pool]
+                                                       [--default-http-settings]
+                                                       [--force-string]
+                                                       [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--remove]
+                                                       [--resource-group]
+                                                       [--set]
+                                                       [--subscription]
   examples:
   - summary: Update a URL path map to use new default HTTP settings.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyUrlPathMap --default-http-settings MyNewHttpSettings
+    syntax: >-
+      az network application-gateway url-path-map update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyUrlPathMap --default-http-settings MyNewHttpSettings
   - summary: Update a URL path map. (autogenerated)
-    syntax:
-      content: az network application-gateway url-path-map update --default-address-pool MyAddressPool --default-http-settings MyNewHttpSettings --gateway-name MyAppGateway --name MyUrlPathMap --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway url-path-map update --default-address-pool MyAddressPool --default-http-settings MyNewHttpSettings --gateway-name MyAppGateway --name MyUrlPathMap --remove tags.no_80 --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --default-address-pool
     summary: The name or ID of the default backend address pool.
     description: ''
   - name: --default-http-settings
     summary: The name or ID of the default HTTP settings.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -199,55 +210,31 @@ items:
   - name: --name -n
     summary: The name of the URL path map.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_url_path_map_create
-  name: az network application-gateway url-path-map create
-  summary: Create a URL path map.
-- uid: az_network_application_gateway_url_path_map_delete
-  name: az network application-gateway url-path-map delete
-  summary: Delete a URL path map.
-- uid: az_network_application_gateway_url_path_map_list
-  name: az network application-gateway url-path-map list
-  summary: List URL path maps.
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
-- uid: az_network_application_gateway_url_path_map_show
-  name: az network application-gateway url-path-map show
-  summary: Get the details of a URL path map.
-- uid: az_network_application_gateway_url_path_map_update
-  name: az network application-gateway url-path-map update
-  summary: Update a URL path map.
+- az_network_application-gateway_url-path-map_create
+- az_network_application-gateway_url-path-map_delete
+- az_network_application-gateway_url-path-map_list
+- az_network_application-gateway_url-path-map_rule
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
+- az_network_application-gateway_url-path-map_show
+- az_network_application-gateway_url-path-map_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -263,10 +250,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage URL path maps of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage URL path maps of an application gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml
index 73fb064aa5..6d862c66c3 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml
@@ -1,28 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_url_path_map_rule_create
-  - az_network_application_gateway_url_path_map_rule_delete
-- uid: az_network_application_gateway_url_path_map_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_url-path-map_rule
+name: az network application-gateway url-path-map rule
+summary: Manage the rules of a URL path map.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_url-path-map_rule_create
   name: az network application-gateway url-path-map rule create
   summary: Create a rule for a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map rule create --gateway-name
+                                                            --name
+                                                            --path-map-name
+                                                            --paths
+                                                            --resource-group
+                                                            [--address-pool]
+                                                            [--http-settings]
+                                                            [--no-wait]
+                                                            [--subscription]
   examples:
   - summary: Create a rule for a URL path map.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map rule create -g MyResourceGroup \
-            --gateway-name MyAppGateway -n MyUrlPathMapRule2 --path-map-name MyUrlPathMap \
-            --paths /mypath2/* --address-pool MyAddressPool --http-settings MyHttpSettings
-  parameters:
+    syntax: >-
+      az network application-gateway url-path-map rule create -g MyResourceGroup \
+          --gateway-name MyAppGateway -n MyUrlPathMapRule2 --path-map-name MyUrlPathMap \
+          --paths /mypath2/* --address-pool MyAddressPool --http-settings MyHttpSettings
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -41,8 +43,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --address-pool
     summary: The name or ID of the backend address pool to use with the created rule.
     description: ''
@@ -55,28 +58,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_rule_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_rule_delete
   name: az network application-gateway url-path-map rule delete
   summary: Delete a rule of a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map rule delete [--gateway-name]
+                                                            [--ids]
+                                                            [--name]
+                                                            [--no-wait]
+                                                            [--path-map-name]
+                                                            [--resource-group]
+                                                            [--subscription]
   examples:
   - summary: Delete a rule of a URL path map.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map rule delete -g MyResourceGroup --gateway-name MyAppGateway \
-            --path-map-name MyUrlPathMap -n MyUrlPathMapRule2
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: >-
+      az network application-gateway url-path-map rule delete -g MyResourceGroup --gateway-name MyAppGateway \
+          --path-map-name MyUrlPathMap -n MyUrlPathMapRule2
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
@@ -86,28 +86,22 @@ items:
   - name: --name -n
     summary: The name of the url-path-map rule.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --path-map-name
     summary: The name of the URL path map.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -123,10 +117,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the rules of a URL path map.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the rules of a URL path map.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/waf-config.yml b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/waf-config.yml
index c6629ac571..16f4ec2330 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/application-gateway/waf-config.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/application-gateway/waf-config.yml
@@ -1,103 +1,93 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_waf_config
-  name: az network application-gateway waf-config
-  summary: Configure the settings of a web application firewall.
-  description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_waf_config_set
-  - az_network_application_gateway_waf_config_show
-- uid: az_network_application_gateway_waf_config_set
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_waf-config
+name: az network application-gateway waf-config
+summary: Configure the settings of a web application firewall.
+description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli.
+directCommands:
+- uid: az_network_application-gateway_waf-config_set
   name: az network application-gateway waf-config set
   summary: Update the firewall configuration of a web application.
-  description: This command is only applicable to application gateways with an SKU type of WAF. To learn more, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli</a>.
-  langs:
-  - azurecli
+  description: This command is only applicable to application gateways with an SKU type of WAF. To learn more, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli.
+  syntax: >-
+    az network application-gateway waf-config set --enabled {false, true}
+                                                  [--gateway-name]
+                                                  [--ids]
+                                                  [--no-wait]
+                                                  [--resource-group]
+                                                  [--subscription]
   examples:
   - summary: Configure WAF on an application gateway in detection mode with default values
-    syntax:
-      content: >-
-        az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
-            --enabled true --firewall-mode Detection --rule-set-version 3.0
+    syntax: >-
+      az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
+          --enabled true --firewall-mode Detection --rule-set-version 3.0
   - summary: Disable rules for validation of request body parsing and SQL injection.
-    syntax:
-      content: >-
-        az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
-            --enabled true --rule-set-type OWASP --rule-set-version 3.0 \
-            --disabled-rule-groups REQUEST-942-APPLICATION-ATTACK-SQLI \
-            --disabled-rules 920130 920140
+    syntax: >-
+      az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
+          --enabled true --rule-set-type OWASP --rule-set-version 3.0 \
+          --disabled-rule-groups REQUEST-942-APPLICATION-ATTACK-SQLI \
+          --disabled-rules 920130 920140
   - summary: Configure WAF on an application gateway with exclusions.
-    syntax:
-      content: >-
-        az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
-            --enabled true --firewall-mode Detection --rule-set-version 3.0 \
-            --exclusion "RequestHeaderNames StartsWith x-header" \
-            --exclusion "RequestArgNames Equals IgnoreThis"
-  parameters:
+    syntax: >-
+      az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
+          --enabled true --firewall-mode Detection --rule-set-version 3.0 \
+          --exclusion "RequestHeaderNames StartsWith x-header" \
+          --exclusion "RequestArgNames Equals IgnoreThis"
+  requiredParameters:
   - isRequired: true
     name: --enabled
     parameterValueGroup: false, true
     summary: Specify whether the application firewall is enabled.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_waf_config_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_waf-config_show
   name: az network application-gateway waf-config show
   summary: Get the firewall configuration of a web application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway waf-config show [--gateway-name]
+                                                   [--ids]
+                                                   [--query-examples]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: Get the firewall configuration of a web application.
-    syntax:
-      content: az network application-gateway waf-config show -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway waf-config show -g MyResourceGroup --gateway-name MyAppGateway
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_waf_config_set
-  name: az network application-gateway waf-config set
-  summary: Update the firewall configuration of a web application.
-- uid: az_network_application_gateway_waf_config_show
-  name: az network application-gateway waf-config show
-  summary: Get the firewall configuration of a web application.
+- az_network_application-gateway_waf-config_set
+- az_network_application-gateway_waf-config_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -113,10 +103,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/bastion.yml b/2017-03-09-profile/docs-ref-autogen/network/bastion.yml
index 4e6322640f..209bfe150f 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/bastion.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/bastion.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_bastion
-  name: az network bastion
-  summary: Manage Azure bastion host.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_bastion_create
-  - az_network_bastion_list
+### YamlMime:AzureCLIGroup
+uid: az_network_bastion
+name: az network bastion
+summary: Manage Azure bastion host.
+description: ''
+directCommands:
 - uid: az_network_bastion_create
   name: az network bastion create
   summary: Create a Azure bastion host machine.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network bastion create --name
+                              --public-ip-address
+                              --resource-group
+                              --vnet-name
+                              [--location]
+                              [--subscription]
+  examples:
+  - summary: Create a Azure bastion host machine. (autogenerated)
+    syntax: az network bastion create --location westus2 --name MyBastionHost --public-ip-address MyPublicIpAddress --resource-group MyResourceGroup --vnet-name MyVnet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the Bastion Host.
@@ -26,50 +29,42 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: Name of the virtual network. It must have a subnet called AzureBastionSubnet.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_bastion_list
   name: az network bastion list
   summary: List all Azure bastion host machines.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network bastion list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_bastion_create
-  name: az network bastion create
-  summary: Create a Azure bastion host machine.
-- uid: az_network_bastion_list
-  name: az network bastion list
-  summary: List all Azure bastion host machines.
+- az_network_bastion_create
+- az_network_bastion_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -85,10 +80,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure bastion host.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure bastion host.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-connection.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-connection.yml
new file mode 100644
index 0000000000..9ee6d24883
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-connection.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-connection
+name: az network cross-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **express-route-cross-connection** extension for Azure CLI and requires version 2.0.41 or higher.  The extension will automatically install the first time you run an **az network cross-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage customers' ExpressRoute circuits.
+description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli.
+directCommands:
+- uid: az_network_cross-connection_list
+  name: az network cross-connection list
+  summary: List all ExpressRoute cross-connections for the current subscription.
+  description: ''
+  syntax: az network cross-connection list [--resource-group]
+  examples:
+  - summary: List all ExpressRoute cross-connections for the current subscription.
+    syntax: az network cross-connection list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_list-arp-tables
+  name: az network cross-connection list-arp-tables
+  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
+  description: ''
+  syntax: >-
+    az network cross-connection list-arp-tables --name
+                                                --path {primary, secondary}
+                                                --peering-name
+                                                --resource-group
+  examples:
+  - summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection.
+    syntax: >-
+      az network cross-connection list-arp-tables -g MyResourceGroup -n MyCircuit \
+          --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_list-route-tables
+  name: az network cross-connection list-route-tables
+  summary: Show the current routing table of an ExpressRoute cross-connection peering.
+  description: ''
+  syntax: >-
+    az network cross-connection list-route-tables --name
+                                                  --path {primary, secondary}
+                                                  --peering-name
+                                                  --resource-group
+  examples:
+  - summary: Show the current routing table of an ExpressRoute cross-connection peering.
+    syntax: >-
+      az network cross-connection list-route-tables -g MyResourceGroup -n MyCircuit \
+          --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_show
+  name: az network cross-connection show
+  summary: Get the details of an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection show --name
+                                     --resource-group
+  examples:
+  - summary: Get the details of an ExpressRoute cross-connection.
+    syntax: az network cross-connection show -n MyCircuit -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_summarize-route-table
+  name: az network cross-connection summarize-route-table
+  summary: Gets the route table summary associated with the express route cross connection in a resource group.
+  description: ''
+  syntax: >-
+    az network cross-connection summarize-route-table --name
+                                                      --path {primary, secondary}
+                                                      --peering-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_update
+  name: az network cross-connection update
+  summary: Update settings of an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection update --name
+                                       --resource-group
+                                       [--add]
+                                       [--force-string]
+                                       [--no-wait]
+                                       [--notes]
+                                       [--provisioning-state {NotProvisioned, Provisioned, Provisioning}]
+                                       [--remove]
+                                       [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notes
+    summary: Service provider notes.
+    description: ''
+  - name: --provisioning-state
+    parameterValueGroup: NotProvisioned, Provisioned, Provisioning
+    summary: Provisioning state of the customer ExpressRoute circuit.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_network_cross-connection_wait
+  name: az network cross-connection wait
+  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
+  description: ''
+  syntax: >-
+    az network cross-connection wait --name
+                                     --resource-group
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--timeout]
+                                     [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the ExpressRoute cross-connection is successfully provisioned.
+    syntax: az network cross-connection wait -n MyCircuit -g MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_cross-connection_list
+- az_network_cross-connection_list-arp-tables
+- az_network_cross-connection_list-route-tables
+- az_network_cross-connection_peering
+- az_network_cross-connection_peering_create
+- az_network_cross-connection_peering_delete
+- az_network_cross-connection_peering_list
+- az_network_cross-connection_peering_show
+- az_network_cross-connection_peering_update
+- az_network_cross-connection_show
+- az_network_cross-connection_summarize-route-table
+- az_network_cross-connection_update
+- az_network_cross-connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-connection/peering.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-connection/peering.yml
new file mode 100644
index 0000000000..317fe1298b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-connection/peering.yml
@@ -0,0 +1,244 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-connection_peering
+name: az network cross-connection peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **express-route-cross-connection** extension for Azure CLI and requires version 2.0.41 or higher.  The extension will automatically install the first time you run an **az network cross-connection peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
+description: ''
+directCommands:
+- uid: az_network_cross-connection_peering_create
+  name: az network cross-connection peering create
+  summary: Create peering settings for an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection peering create --cross-connection-name
+                                               --peer-asn
+                                               --peering-type {AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+                                               --primary-peer-subnet
+                                               --resource-group
+                                               --secondary-peer-subnet
+                                               --vlan-id
+                                               [--advertised-public-prefixes]
+                                               [--customer-asn]
+                                               [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                               [--shared-key]
+  examples:
+  - summary: Create Microsoft Peering settings with IPv4 configuration.
+    syntax: >-
+      az network cross-connection peering create -g MyResourceGroup --cross-connection-name MyCircuit \
+          --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
+          --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
+          --advertised-public-prefixes 101.0.0.0/30
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --peer-asn
+    summary: Autonomous system number of the customer/connectivity provider.
+    description: ''
+  - isRequired: true
+    name: --peering-type
+    parameterValueGroup: AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering
+    summary: BGP peering type for the circuit.
+    description: ''
+  - isRequired: true
+    name: --primary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for primary interface.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secondary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for secondary interface.
+    description: ''
+  - isRequired: true
+    name: --vlan-id
+    summary: Identifier used to identify the customer.
+    description: ''
+  optionalParameters:
+  - name: --advertised-public-prefixes
+    summary: Space-separated list of prefixes to be advertised through the BGP peering.
+    description: ''
+  - name: --customer-asn
+    summary: Autonomous system number of the customer.
+    description: ''
+  - name: --routing-registry-name
+    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
+    summary: Internet Routing Registry / Regional Internet Registry.
+    description: ''
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
+- uid: az_network_cross-connection_peering_delete
+  name: az network cross-connection peering delete
+  summary: Delete peering settings.
+  description: ''
+  syntax: >-
+    az network cross-connection peering delete --cross-connection-name
+                                               --name
+                                               --resource-group
+  examples:
+  - summary: Delete private peering.
+    syntax: az network cross-connection peering delete -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_peering_list
+  name: az network cross-connection peering list
+  summary: List peering settings of an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection peering list --cross-connection-name
+                                             --resource-group
+  examples:
+  - summary: List peering settings of an ExpressRoute cross-connection.
+    syntax: az network cross-connection peering list -g MyResourceGroup --cross-connection-name MyCircuit
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_peering_show
+  name: az network cross-connection peering show
+  summary: Get the details of an express route peering.
+  description: ''
+  syntax: >-
+    az network cross-connection peering show --cross-connection-name
+                                             --name
+                                             --resource-group
+  examples:
+  - summary: Get private peering details of an ExpressRoute cross-connection.
+    syntax: az network cross-connection peering show -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_peering_update
+  name: az network cross-connection peering update
+  summary: Update peering settings for an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection peering update --cross-connection-name
+                                               --name
+                                               --resource-group
+                                               [--add]
+                                               [--advertised-public-prefixes]
+                                               [--customer-asn]
+                                               [--force-string]
+                                               [--ip-version {IPv4, IPv6}]
+                                               [--peer-asn]
+                                               [--primary-peer-subnet]
+                                               [--remove]
+                                               [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                               [--secondary-peer-subnet]
+                                               [--set]
+                                               [--shared-key]
+                                               [--vlan-id]
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --advertised-public-prefixes
+    summary: Space-separated list of prefixes to be advertised through the BGP peering.
+    description: ''
+  - name: --customer-asn
+    summary: Autonomous system number of the customer.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ip-version
+    defaultValue: IPv4
+    parameterValueGroup: IPv4, IPv6
+    summary: The IP version to update Microsoft Peering settings for.
+    description: ''
+  - name: --peer-asn
+    summary: Autonomous system number of the customer/connectivity provider.
+    description: ''
+  - name: --primary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for primary interface.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --routing-registry-name
+    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
+    summary: Internet Routing Registry / Regional Internet Registry.
+    description: ''
+  - name: --secondary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for secondary interface.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
+  - name: --vlan-id
+    summary: Identifier used to identify the customer.
+    description: ''
+commands:
+- az_network_cross-connection_peering_create
+- az_network_cross-connection_peering_delete
+- az_network_cross-connection_peering_list
+- az_network_cross-connection_peering_show
+- az_network_cross-connection_peering_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ExpressRoute peering of an ExpressRoute cross-connection.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb.yml
new file mode 100644
index 0000000000..7c2b6e9160
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb.yml
@@ -0,0 +1,298 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb
+name: az network cross-region-lb
+summary: Manage and configure cross-region load balancers.
+description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
+directCommands:
+- uid: az_network_cross-region-lb_create
+  name: az network cross-region-lb create
+  summary: Create a cross-region load balancer.
+  description: ''
+  syntax: >-
+    az network cross-region-lb create --name
+                                      --resource-group
+                                      [--address-allocation {Dynamic, Static}]
+                                      [--backend-pool-name]
+                                      [--frontend-ip-name]
+                                      [--location]
+                                      [--no-wait]
+                                      [--public-ip-address]
+                                      [--public-ip-dns-name]
+                                      [--subscription]
+                                      [--tags]
+                                      [--validate]
+  examples:
+  - summary: Create a basic load balancer.
+    syntax: az network cross-region-lb create -g MyResourceGroup -n MyLb
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --address-allocation --public-ip-address-allocation
+    parameterValueGroup: Dynamic, Static
+    summary: IP allocation method.
+    description: ''
+  - name: --backend-pool-name
+    summary: The name of the backend address pool.
+    description: ''
+  - name: --frontend-ip-name
+    defaultValue: LoadBalancerFrontEnd
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP address, or "" for none. Uses existing resource if available or will create a new resource with defaults if omitted.
+    description: ''
+  - name: --public-ip-dns-name
+    summary: Globally unique DNS name for a new public IP.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_delete
+  name: az network cross-region-lb delete
+  summary: Deletes the specified load balancer.
+  description: ''
+  syntax: >-
+    az network cross-region-lb delete [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_list
+  name: az network cross-region-lb list
+  summary: List load balancers.
+  description: ''
+  syntax: >-
+    az network cross-region-lb list [--query-examples]
+                                    [--resource-group]
+                                    [--subscription]
+  examples:
+  - summary: List load balancers.
+    syntax: az network cross-region-lb list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_show
+  name: az network cross-region-lb show
+  summary: Gets the specified load balancer.
+  description: ''
+  syntax: >-
+    az network cross-region-lb show [--expand]
+                                    [--ids]
+                                    [--name]
+                                    [--query-examples]
+                                    [--resource-group]
+                                    [--subscription]
+  optionalParameters:
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_update
+  name: az network cross-region-lb update
+  summary: Update a cross-region load balancer.
+  description: This command can only be used to update the tags for a load balancer. Name and resource group are immutable and cannot be updated.
+  syntax: >-
+    az network cross-region-lb update [--add]
+                                      [--force-string]
+                                      [--ids]
+                                      [--name]
+                                      [--remove]
+                                      [--resource-group]
+                                      [--set]
+                                      [--subscription]
+  examples:
+  - summary: Update the tags of a load balancer.
+    syntax: az network cross-region-lb update -g MyResourceGroup -n MyLb --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_wait
+  name: az network cross-region-lb wait
+  summary: Place the CLI in a waiting state until a condition of the cross-region load balancer is met.
+  description: ''
+  syntax: >-
+    az network cross-region-lb wait [--created]
+                                    [--custom]
+                                    [--deleted]
+                                    [--exists]
+                                    [--expand]
+                                    [--ids]
+                                    [--interval]
+                                    [--name]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--timeout]
+                                    [--updated]
+  examples:
+  - summary: Wait for load balancer to return as created.
+    syntax: az network cross-region-lb wait -g MyResourceGroup -n MyLB --created
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_address-pool
+- az_network_cross-region-lb_address-pool_address
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+- az_network_cross-region-lb_address-pool_create
+- az_network_cross-region-lb_address-pool_delete
+- az_network_cross-region-lb_create
+- az_network_cross-region-lb_delete
+- az_network_cross-region-lb_frontend-ip
+- az_network_cross-region-lb_frontend-ip_create
+- az_network_cross-region-lb_frontend-ip_delete
+- az_network_cross-region-lb_frontend-ip_list
+- az_network_cross-region-lb_frontend-ip_show
+- az_network_cross-region-lb_frontend-ip_update
+- az_network_cross-region-lb_list
+- az_network_cross-region-lb_probe
+- az_network_cross-region-lb_probe_create
+- az_network_cross-region-lb_probe_delete
+- az_network_cross-region-lb_probe_list
+- az_network_cross-region-lb_probe_show
+- az_network_cross-region-lb_probe_update
+- az_network_cross-region-lb_rule
+- az_network_cross-region-lb_rule_create
+- az_network_cross-region-lb_rule_delete
+- az_network_cross-region-lb_rule_list
+- az_network_cross-region-lb_rule_show
+- az_network_cross-region-lb_rule_update
+- az_network_cross-region-lb_show
+- az_network_cross-region-lb_update
+- az_network_cross-region-lb_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/address-pool.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/address-pool.yml
new file mode 100644
index 0000000000..ed376bef56
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/address-pool.yml
@@ -0,0 +1,128 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_address-pool
+name: az network cross-region-lb address-pool
+summary: Manage address pools of a cross-region load balancer.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_address-pool_create
+  name: az network cross-region-lb address-pool create
+  summary: Create an address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool create --lb-name
+                                                   --name
+                                                   --resource-group
+                                                   [--backend-address]
+                                                   [--backend-addresses-config-file]
+                                                   [--subscription]
+  examples:
+  - summary: Create an address pool.
+    syntax: az network cross-region-lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  - summary: Create an address pool with several backend addresses using key-value arguments.
+    syntax: az network cross-region-lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --backend-address name=addr1 frontend-ip-address=/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb1 --backend-address name=addr2 frontend-ip-address=/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb2
+  - summary: Create an address pool with several backend addresses using config file
+    syntax: az network cross-region-lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --backend-addresses-config-file @config_file.json
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-address
+    summary: Backend addresses information for backend address pool.
+    description: >-
+      Usage: --backend-address name=addr1 frontend-ip-address=regional_lb_resource_id
+
+
+      name: Required. The name of the backend address.
+
+      frontend-ip-address: Required. Resource id of a regional load balancer.
+
+
+      Multiple backend addresses can be specified by using more than one `--backend-address` argument.
+  - name: --backend-addresses-config-file --config-file
+    summary: A config file used to set backend addresses. This argument is for experienced users. You may encounter parse errors if the json file is invalid.
+    description: >-
+      Usage: --backend-addresses-config-file @"{config_file.json}"
+
+
+      A example config file is
+
+      [
+        {
+          "name": "address1",
+          "frontendIpAddress": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb1"
+        },
+        {
+          "name": "address2",
+          "frontendIpAddress": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb2"
+        }
+      ].
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_address-pool_delete
+  name: az network cross-region-lb address-pool delete
+  summary: Delete an address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool delete --lb-name
+                                                   --name
+                                                   --resource-group
+                                                   [--subscription]
+  examples:
+  - summary: Delete an address pool.
+    syntax: az network cross-region-lb address-pool delete -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_address-pool_address
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+- az_network_cross-region-lb_address-pool_create
+- az_network_cross-region-lb_address-pool_delete
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools of a cross-region load balancer.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/address-pool/address.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/address-pool/address.yml
new file mode 100644
index 0000000000..7912b5e25c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/address-pool/address.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_address-pool_address
+name: az network cross-region-lb address-pool address
+summary: Manage backend addresses of the cross-region load balance backend address pool.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_address-pool_address_add
+  name: az network cross-region-lb address-pool address add
+  summary: Add one backend address into the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool address add --frontend-ip-address
+                                                        --lb-name
+                                                        --name
+                                                        --pool-name
+                                                        --resource-group
+                                                        [--subscription]
+  examples:
+  - summary: Add one backend address into the load balance backend address pool.
+    syntax: az network cross-region-lb address-pool address add -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress --frontend-ip-address /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb2
+  requiredParameters:
+  - isRequired: true
+    name: --frontend-ip-address
+    summary: Resource id of the frontend ip configuration defined in regional loadbalancer.
+    description: ''
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_address-pool_address_list
+  name: az network cross-region-lb address-pool address list
+  summary: List all backend addresses of the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool address list --lb-name
+                                                         --pool-name
+                                                         --resource-group
+                                                         [--query-examples]
+                                                         [--subscription]
+  examples:
+  - summary: List all backend addresses of the load balance backend address pool.
+    syntax: az network cross-region-lb address-pool address list -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_address-pool_address_remove
+  name: az network cross-region-lb address-pool address remove
+  summary: Remove one backend address from the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool address remove --lb-name
+                                                           --name
+                                                           --pool-name
+                                                           --resource-group
+                                                           [--subscription]
+  examples:
+  - summary: Remove one backend address from the load balance backend address pool.
+    syntax: az network cross-region-lb address-pool address remove -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage backend addresses of the cross-region load balance backend address pool.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/frontend-ip.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/frontend-ip.yml
new file mode 100644
index 0000000000..ff5fb441c5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/frontend-ip.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_frontend-ip
+name: az network cross-region-lb frontend-ip
+summary: Manage frontend IP addresses of a cross-region load balancer.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_frontend-ip_create
+  name: az network cross-region-lb frontend-ip create
+  summary: Create a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip create --lb-name
+                                                  --name
+                                                  --resource-group
+                                                  [--public-ip-address]
+                                                  [--subscription]
+  examples:
+  - summary: Create a frontend ip address for a public load balancer.
+    syntax: az network cross-region-lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb --public-ip-address MyFrontendIp
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --public-ip-address
+    summary: Name or ID of the existing public IP to associate with the configuration.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_delete
+  name: az network cross-region-lb frontend-ip delete
+  summary: Delete a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip delete --lb-name
+                                                  --name
+                                                  --resource-group
+                                                  [--subscription]
+  examples:
+  - summary: Delete a frontend IP address.
+    syntax: az network cross-region-lb frontend-ip delete -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_list
+  name: az network cross-region-lb frontend-ip list
+  summary: List frontend IP addresses.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip list --lb-name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
+  examples:
+  - summary: List frontend IP addresses.
+    syntax: az network cross-region-lb frontend-ip list -g MyResourceGroup --lb-name MyLb
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_show
+  name: az network cross-region-lb frontend-ip show
+  summary: Get the details of a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip show --lb-name
+                                                --name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
+  examples:
+  - summary: Get the details of a frontend IP address.
+    syntax: az network cross-region-lb frontend-ip show -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_update
+  name: az network cross-region-lb frontend-ip update
+  summary: Update a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip update [--add]
+                                                  [--force-string]
+                                                  [--ids]
+                                                  [--lb-name]
+                                                  [--name]
+                                                  [--public-ip-address]
+                                                  [--remove]
+                                                  [--resource-group]
+                                                  [--set]
+                                                  [--subscription]
+  examples:
+  - summary: Update the frontend IP address of a public load balancer.
+    syntax: az network cross-region-lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --public-ip-address MyNewPublicIp
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the existing public IP to associate with the configuration.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_frontend-ip_create
+- az_network_cross-region-lb_frontend-ip_delete
+- az_network_cross-region-lb_frontend-ip_list
+- az_network_cross-region-lb_frontend-ip_show
+- az_network_cross-region-lb_frontend-ip_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend IP addresses of a cross-region load balancer.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/probe.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/probe.yml
new file mode 100644
index 0000000000..c43613a3db
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/probe.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_probe
+name: az network cross-region-lb probe
+summary: Evaluate probe information and define routing rules.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_probe_create
+  name: az network cross-region-lb probe create
+  summary: Create a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe create --lb-name
+                                            --name
+                                            --port
+                                            --protocol {Http, Tcp}
+                                            --resource-group
+                                            [--interval]
+                                            [--path]
+                                            [--subscription]
+                                            [--threshold]
+  examples:
+  - summary: Create a probe on a load balancer over HTTP and port 80.
+    syntax: >-
+      az network cross-region-lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol http --port 80 --path /
+  - summary: Create a probe on a load balancer over TCP on port 443.
+    syntax: >-
+      az network cross-region-lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol tcp --port 443
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - isRequired: true
+    name: --port
+    summary: The port to interrogate.
+    description: ''
+  - isRequired: true
+    name: --protocol
+    parameterValueGroup: Http, Tcp
+    summary: The protocol to probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --interval
+    summary: Probing time interval in seconds.
+    description: ''
+  - name: --path
+    summary: The endpoint to interrogate (http only).
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_delete
+  name: az network cross-region-lb probe delete
+  summary: Delete a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe delete --lb-name
+                                            --name
+                                            --resource-group
+                                            [--subscription]
+  examples:
+  - summary: Delete a probe.
+    syntax: az network cross-region-lb probe delete -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_list
+  name: az network cross-region-lb probe list
+  summary: List probes.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe list --lb-name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
+  examples:
+  - summary: List probes.
+    syntax: az network cross-region-lb probe list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_show
+  name: az network cross-region-lb probe show
+  summary: Get the details of a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe show --lb-name
+                                          --name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
+  examples:
+  - summary: Get the details of a probe.
+    syntax: az network cross-region-lb probe show -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_update
+  name: az network cross-region-lb probe update
+  summary: Update a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe update [--add]
+                                            [--force-string]
+                                            [--ids]
+                                            [--interval]
+                                            [--lb-name]
+                                            [--name]
+                                            [--path]
+                                            [--port]
+                                            [--protocol {Http, Tcp}]
+                                            [--remove]
+                                            [--resource-group]
+                                            [--set]
+                                            [--subscription]
+                                            [--threshold]
+  examples:
+  - summary: Update a probe with a different port and interval.
+    syntax: az network cross-region-lb probe update -g MyResourceGroup --lb-name MyLb -n MyProbe --port 81 --interval 10
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    summary: Probing time interval in seconds.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - name: --path
+    summary: The endpoint to interrogate (http only).
+    description: ''
+  - name: --port
+    summary: The port to interrogate.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Http, Tcp
+    summary: The protocol to probe.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_probe_create
+- az_network_cross-region-lb_probe_delete
+- az_network_cross-region-lb_probe_list
+- az_network_cross-region-lb_probe_show
+- az_network_cross-region-lb_probe_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Evaluate probe information and define routing rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/rule.yml
new file mode 100644
index 0000000000..48ddb8d8d8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/cross-region-lb/rule.yml
@@ -0,0 +1,297 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_rule
+name: az network cross-region-lb rule
+summary: Manage cross-region load balancing rules.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_rule_create
+  name: az network cross-region-lb rule create
+  summary: Create a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule create --backend-port
+                                           --frontend-port
+                                           --lb-name
+                                           --name
+                                           --protocol {Tcp, Udp}
+                                           --resource-group
+                                           [--backend-pool-name]
+                                           [--floating-ip {false, true}]
+                                           [--frontend-ip-name]
+                                           [--idle-timeout]
+                                           [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                                           [--probe-name]
+                                           [--subscription]
+  examples:
+  - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port.
+    syntax: >-
+      az network cross-region-lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --frontend-port 80 \
+          --backend-pool-name MyAddressPool --backend-port 80
+  - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port with the floating ip feature.
+    syntax: >-
+      az network cross-region-lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --backend-pool-name MyAddressPool  \
+          --floating-ip true --frontend-port 80 --backend-port 80
+  - summary: Create an HA ports load balancing rule that assigns a frontend IP and port to use all available backend IPs in a pool on the same port.
+    syntax: >-
+      az network cross-region-lb rule create -g MyResourceGroup --lb-name MyLb -n MyHAPortsRule \
+          --protocol All --frontend-port 0 --backend-port 0 --frontend-ip-name MyFrontendIp \
+          --backend-pool-name MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --backend-port
+    summary: Port number.
+    description: ''
+  - isRequired: true
+    name: --frontend-port
+    summary: Port number.
+    description: ''
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - isRequired: true
+    name: --protocol
+    parameterValueGroup: Tcp, Udp
+    summary: Network transport protocol.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - name: --floating-ip
+    parameterValueGroup: false, true
+    summary: Enable floating IP.
+    description: ''
+  - name: --frontend-ip-name
+    summary: The name of the frontend IP configuration. If only one exists, omit to use as default.
+    description: ''
+  - name: --idle-timeout
+    summary: Idle timeout in minutes.
+    description: ''
+  - name: --load-distribution
+    defaultValue: default
+    parameterValueGroup: Default, SourceIP, SourceIPProtocol
+    summary: Affinity rule settings.
+    description: ''
+  - name: --probe-name
+    summary: Name of an existing probe to associate with this rule.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_delete
+  name: az network cross-region-lb rule delete
+  summary: Delete a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule delete --lb-name
+                                           --name
+                                           --resource-group
+                                           [--subscription]
+  examples:
+  - summary: Delete a load balancing rule.
+    syntax: az network cross-region-lb rule delete -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_list
+  name: az network cross-region-lb rule list
+  summary: List load balancing rules.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule list --lb-name
+                                         --resource-group
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: List load balancing rules.
+    syntax: az network cross-region-lb rule list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_show
+  name: az network cross-region-lb rule show
+  summary: Get the details of a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule show --lb-name
+                                         --name
+                                         --resource-group
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get the details of a load balancing rule.
+    syntax: az network cross-region-lb rule show -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_update
+  name: az network cross-region-lb rule update
+  summary: Update a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule update [--add]
+                                           [--backend-pool-name]
+                                           [--backend-port]
+                                           [--floating-ip {false, true}]
+                                           [--force-string]
+                                           [--frontend-ip-name]
+                                           [--frontend-port]
+                                           [--idle-timeout]
+                                           [--ids]
+                                           [--lb-name]
+                                           [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                                           [--name]
+                                           [--probe-name]
+                                           [--protocol {Tcp, Udp}]
+                                           [--remove]
+                                           [--resource-group]
+                                           [--set]
+                                           [--subscription]
+  examples:
+  - summary: Update a load balancing rule to change the protocol to UDP.
+    syntax: az network cross-region-lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Udp
+  - summary: Update a load balancing rule to support HA ports.
+    syntax: az network cross-region-lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule \ --protocol All --frontend-port 0 --backend-port 0
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --backend-pool-name
+    summary: The name of the backend address pool.
+    description: ''
+  - name: --backend-port
+    summary: Port number.
+    description: ''
+  - name: --floating-ip
+    parameterValueGroup: false, true
+    summary: Enable floating IP.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --frontend-ip-name
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - name: --frontend-port
+    summary: Port number.
+    description: ''
+  - name: --idle-timeout
+    summary: Idle timeout in minutes.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - name: --load-distribution
+    parameterValueGroup: Default, SourceIP, SourceIPProtocol
+    summary: Affinity rule settings.
+    description: ''
+  - name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - name: --probe-name
+    summary: Name of an existing probe to associate with this rule.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Tcp, Udp
+    summary: Network transport protocol.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_rule_create
+- az_network_cross-region-lb_rule_delete
+- az_network_cross-region-lb_rule_list
+- az_network_cross-region-lb_rule_show
+- az_network_cross-region-lb_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage cross-region load balancing rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns.yml b/2017-03-09-profile/docs-ref-autogen/network/dns.yml
index 385acd4861..3ca99ce37c 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns.yml
@@ -1,241 +1,85 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns
-  name: az network dns
-  summary: Manage DNS domains in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_dns
+name: az network dns
+summary: Manage DNS domains in Azure.
+description: ''
 commands:
-- uid: az_network_dns_record_set
-  name: az network dns record-set
-  summary: Manage DNS records and record sets.
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_dns_record_set_list
-  name: az network dns record-set list
-  summary: List all record sets within a DNS zone.
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_dns_zone
-  name: az network dns zone
-  summary: Manage DNS zones.
-- uid: az_network_dns_zone_create
-  name: az network dns zone create
-  summary: Create a DNS zone.
-- uid: az_network_dns_zone_delete
-  name: az network dns zone delete
-  summary: Delete a DNS zone and all associated records.
-- uid: az_network_dns_zone_export
-  name: az network dns zone export
-  summary: Export a DNS zone as a DNS zone file.
-- uid: az_network_dns_zone_import
-  name: az network dns zone import
-  summary: Create a DNS zone using a DNS zone file.
-- uid: az_network_dns_zone_list
-  name: az network dns zone list
-  summary: List DNS zones.
-- uid: az_network_dns_zone_show
-  name: az network dns zone show
-  summary: Get a DNS zone parameters. Does not show DNS records within the zone.
-- uid: az_network_dns_zone_update
-  name: az network dns zone update
-  summary: Update a DNS zone properties. Does not modify DNS records within the zone.
+- az_network_dns_record-set
+- az_network_dns_record-set_a
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
+- az_network_dns_record-set_aaaa
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
+- az_network_dns_record-set_cname
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
+- az_network_dns_record-set_list
+- az_network_dns_record-set_mx
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
+- az_network_dns_record-set_ns
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
+- az_network_dns_record-set_ptr
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
+- az_network_dns_record-set_soa
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
+- az_network_dns_record-set_srv
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
+- az_network_dns_record-set_txt
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
+- az_network_dns_zone
+- az_network_dns_zone_create
+- az_network_dns_zone_delete
+- az_network_dns_zone_export
+- az_network_dns_zone_import
+- az_network_dns_zone_list
+- az_network_dns_zone_show
+- az_network_dns_zone_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -251,10 +95,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS domains in Azure.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS domains in Azure.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set.yml
index 3c21904b09..93b7593948 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set.yml
@@ -1,243 +1,106 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set
-  name: az network dns record-set
-  summary: Manage DNS records and record sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_list
-- uid: az_network_dns_record_set_list
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set
+name: az network dns record-set
+summary: Manage DNS records and record sets.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_list
   name: az network dns record-set list
   summary: List all record sets within a DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set list --resource-group
+                                   --zone-name
+                                   [--query-examples]
+                                   [--subscription]
   examples:
   - summary: List all "@" record sets within this zone.
-    syntax:
-      content: az network dns record-set list -g MyResourceGroup -z www.mysite.com --query "[?name=='@']"
-  parameters:
+    syntax: az network dns record-set list -g MyResourceGroup -z www.mysite.com --query "[?name=='@']"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_dns_record_set_list
-  name: az network dns record-set list
-  summary: List all record sets within a DNS zone.
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_dns_record-set_a
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
+- az_network_dns_record-set_aaaa
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
+- az_network_dns_record-set_cname
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
+- az_network_dns_record-set_list
+- az_network_dns_record-set_mx
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
+- az_network_dns_record-set_ns
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
+- az_network_dns_record-set_ptr
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
+- az_network_dns_record-set_soa
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
+- az_network_dns_record-set_srv
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
+- az_network_dns_record-set_txt
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -253,10 +116,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS records and record sets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS records and record sets.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/a.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/a.yml
index c2f9136c04..58ddf16245 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/a.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/a.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_a_add_record
-  - az_network_dns_record_set_a_create
-  - az_network_dns_record_set_a_delete
-  - az_network_dns_record_set_a_list
-  - az_network_dns_record_set_a_remove_record
-  - az_network_dns_record_set_a_show
-  - az_network_dns_record_set_a_update
-- uid: az_network_dns_record_set_a_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_a
+name: az network dns record-set a
+summary: Manage DNS A records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_a_add-record
   name: az network dns record-set a add-record
   summary: Add an A record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a add-record --ipv4-address
+                                           --record-set-name
+                                           --resource-group
+                                           --zone-name
+                                           [--if-none-match]
+                                           [--subscription]
+                                           [--ttl]
   examples:
   - summary: Add an A record.
-    syntax:
-      content: >-
-        az network dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPv4 address in string notation.
@@ -37,56 +32,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_create
   name: az network dns record-set a create
   summary: Create an empty A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a create --name
+                                       --resource-group
+                                       --zone-name
+                                       [--if-match]
+                                       [--if-none-match]
+                                       [--metadata]
+                                       [--subscription]
+                                       [--ttl]
   examples:
   - summary: Create an empty A record set.
-    syntax:
-      content: az network dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty A record set. (autogenerated)
-    syntax:
-      content: az network dns record-set a create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set a create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -94,98 +91,98 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_delete
   name: az network dns record-set a delete
   summary: Delete an A record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a delete --name
+                                       --resource-group
+                                       --zone-name
+                                       [--if-match]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete an A record set and all associated records.
-    syntax:
-      content: az network dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_list
   name: az network dns record-set a list
   summary: List all A record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a list --resource-group
+                                     --zone-name
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: List all A record sets in a zone.
-    syntax:
-      content: az network dns record-set a list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set a list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_remove-record
   name: az network dns record-set a remove-record
   summary: Remove an A record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a remove-record --ipv4-address
+                                              --record-set-name
+                                              --resource-group
+                                              --zone-name
+                                              [--keep-empty-record-set]
+                                              [--subscription]
   examples:
   - summary: Remove an A record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPv4 address in string notation.
@@ -196,86 +193,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_show
   name: az network dns record-set a show
   summary: Get the details of an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a show --name
+                                     --resource-group
+                                     --zone-name
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Get the details of an A record set.
-    syntax:
-      content: az network dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_update
   name: az network dns record-set a update
   summary: Update an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a update --name
+                                       --resource-group
+                                       --zone-name
+                                       [--add]
+                                       [--force-string]
+                                       [--if-match]
+                                       [--if-none-match]
+                                       [--metadata]
+                                       [--remove]
+                                       [--set]
+                                       [--subscription]
   examples:
   - summary: Update an A record set.
-    syntax:
-      content: >-
-        az network dns record-set a update -g MyResourceGroup -n MyRecordSet \
-            -z www.mysite.com --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set a update -g MyResourceGroup -n MyRecordSet \
+          -z www.mysite.com --metadata owner=WebTeam
   - summary: Update an A record set. (autogenerated)
-    syntax:
-      content: az network dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -283,12 +293,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -298,34 +302,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -341,10 +326,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS A records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS A records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/aaaa.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/aaaa.yml
index 9c2fa01e33..975da88814 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/aaaa.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/aaaa.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_aaaa_add_record
-  - az_network_dns_record_set_aaaa_create
-  - az_network_dns_record_set_aaaa_delete
-  - az_network_dns_record_set_aaaa_list
-  - az_network_dns_record_set_aaaa_remove_record
-  - az_network_dns_record_set_aaaa_show
-  - az_network_dns_record_set_aaaa_update
-- uid: az_network_dns_record_set_aaaa_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_aaaa
+name: az network dns record-set aaaa
+summary: Manage DNS AAAA records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_aaaa_add-record
   name: az network dns record-set aaaa add-record
   summary: Add an AAAA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa add-record --ipv6-address
+                                              --record-set-name
+                                              --resource-group
+                                              --zone-name
+                                              [--if-none-match]
+                                              [--subscription]
+                                              [--ttl]
   examples:
   - summary: Add an AAAA record.
-    syntax:
-      content: >-
-        az network dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPv6 address in string notation.
@@ -37,53 +32,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_create
   name: az network dns record-set aaaa create
   summary: Create an empty AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa create --name
+                                          --resource-group
+                                          --zone-name
+                                          [--if-match]
+                                          [--if-none-match]
+                                          [--metadata]
+                                          [--subscription]
+                                          [--ttl]
   examples:
   - summary: Create an empty AAAA record set.
-    syntax:
-      content: az network dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -91,101 +89,100 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_delete
   name: az network dns record-set aaaa delete
   summary: Delete an AAAA record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa delete --name
+                                          --resource-group
+                                          --zone-name
+                                          [--if-match]
+                                          [--subscription]
+                                          [--yes]
   examples:
   - summary: Delete an AAAA record set and all associated records.
-    syntax:
-      content: az network dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_list
   name: az network dns record-set aaaa list
   summary: List all AAAA record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa list --resource-group
+                                        --zone-name
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: List all AAAA record sets in a zone.
-    syntax:
-      content: az network dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
+    syntax: az network dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
   - summary: List all AAAA record sets in a zone. (autogenerated)
-    syntax:
-      content: az network dns record-set aaaa list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set aaaa list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_remove-record
   name: az network dns record-set aaaa remove-record
   summary: Remove AAAA record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa remove-record --ipv6-address
+                                                 --record-set-name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--keep-empty-record-set]
+                                                 [--subscription]
   examples:
   - summary: Remove an AAAA record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPv6 address in string notation.
@@ -196,83 +193,97 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_show
   name: az network dns record-set aaaa show
   summary: Get the details of an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa show --name
+                                        --resource-group
+                                        --zone-name
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: Get the details of an AAAA record set.
-    syntax:
-      content: az network dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_update
   name: az network dns record-set aaaa update
   summary: Update an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa update --name
+                                          --resource-group
+                                          --zone-name
+                                          [--add]
+                                          [--force-string]
+                                          [--if-match]
+                                          [--if-none-match]
+                                          [--metadata]
+                                          [--remove]
+                                          [--set]
+                                          [--subscription]
   examples:
   - summary: Update an AAAA record set.
-    syntax:
-      content: >-
-        az network dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -280,12 +291,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -295,34 +300,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -338,10 +324,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS AAAA records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS AAAA records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/cname.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/cname.yml
index 3947a98bc9..35324b314b 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/cname.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/cname.yml
@@ -1,46 +1,43 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_cname_create
-  - az_network_dns_record_set_cname_delete
-  - az_network_dns_record_set_cname_list
-  - az_network_dns_record_set_cname_remove_record
-  - az_network_dns_record_set_cname_set_record
-  - az_network_dns_record_set_cname_show
-- uid: az_network_dns_record_set_cname_create
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_cname
+name: az network dns record-set cname
+summary: Manage DNS CNAME records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_cname_create
   name: az network dns record-set cname create
   summary: Create an empty CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname create --name
+                                           --resource-group
+                                           --zone-name
+                                           [--if-match]
+                                           [--if-none-match]
+                                           [--metadata]
+                                           [--subscription]
+                                           [--ttl]
   examples:
   - summary: Create an empty CNAME record set.
-    syntax:
-      content: az network dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty CNAME record set. (autogenerated)
-    syntax:
-      content: az network dns record-set cname create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set cname create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -48,101 +45,101 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_delete
   name: az network dns record-set cname delete
   summary: Delete a CNAME record set and its associated record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname delete --name
+                                           --resource-group
+                                           --zone-name
+                                           [--if-match]
+                                           [--subscription]
+                                           [--yes]
   examples:
   - summary: Delete a CNAME record set and its associated record.
-    syntax:
-      content: az network dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_list
   name: az network dns record-set cname list
   summary: List the CNAME record set in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname list --resource-group
+                                         --zone-name
+                                         [--query-examples]
+                                         [--subscription]
   examples:
   - summary: List the CNAME record set in a zone.
-    syntax:
-      content: az network dns record-set cname list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set cname list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_remove-record
   name: az network dns record-set cname remove-record
   summary: Remove a CNAME record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname remove-record --cname
+                                                  --record-set-name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--keep-empty-record-set]
+                                                  [--subscription]
   examples:
   - summary: Remove a CNAME record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
-    summary: Canonical name.
+    summary: Value of the cname record-set. It should be Canonical name.
     description: ''
   - isRequired: true
     name: --record-set-name -n
@@ -150,40 +147,41 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_set_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_set-record
   name: az network dns record-set cname set-record
   summary: Set the value of a CNAME record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname set-record --cname
+                                               --record-set-name
+                                               --resource-group
+                                               --zone-name
+                                               [--if-none-match]
+                                               [--subscription]
+                                               [--ttl]
   examples:
   - summary: Set the value of a CNAME record.
-    syntax:
-      content: >-
-        az network dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
-    summary: Canonical name.
+    summary: Value of the cname record-set. It should be Canonical name.
     description: ''
   - isRequired: true
     name: --record-set-name -n
@@ -191,79 +189,65 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_show
   name: az network dns record-set cname show
   summary: Get the details of a CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname show --name
+                                         --resource-group
+                                         --zone-name
+                                         [--query-examples]
+                                         [--subscription]
   examples:
   - summary: Get the details of a CNAME record set.
-    syntax:
-      content: az network dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -279,10 +263,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS CNAME records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS CNAME records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/mx.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/mx.yml
index 7f4ea8ccec..d286923240 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/mx.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/mx.yml
@@ -1,32 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_mx_add_record
-  - az_network_dns_record_set_mx_create
-  - az_network_dns_record_set_mx_delete
-  - az_network_dns_record_set_mx_list
-  - az_network_dns_record_set_mx_remove_record
-  - az_network_dns_record_set_mx_show
-  - az_network_dns_record_set_mx_update
-- uid: az_network_dns_record_set_mx_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_mx
+name: az network dns record-set mx
+summary: Manage DNS MX records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_mx_add-record
   name: az network dns record-set mx add-record
   summary: Add an MX record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx add-record --exchange
+                                            --preference
+                                            --record-set-name
+                                            --resource-group
+                                            --zone-name
+                                            [--if-none-match]
+                                            [--subscription]
+                                            [--ttl]
   examples:
   - summary: Add an MX record.
-    syntax:
-      content: >-
-        az network dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -41,56 +37,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_create
   name: az network dns record-set mx create
   summary: Create an empty MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx create --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--subscription]
+                                        [--ttl]
   examples:
   - summary: Create an empty MX record set.
-    syntax:
-      content: az network dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty MX record set. (autogenerated)
-    syntax:
-      content: az network dns record-set mx create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set mx create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -98,98 +96,101 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_delete
   name: az network dns record-set mx delete
   summary: Delete an MX record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx delete --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--subscription]
+                                        [--yes]
   examples:
   - summary: Delete an MX record set and all associated records.
-    syntax:
-      content: az network dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_list
   name: az network dns record-set mx list
   summary: List all MX record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx list --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List all MX record sets in a zone.
-    syntax:
-      content: az network dns record-set mx list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set mx list -g MyResourceGroup -z www.mysite.com
+  - summary: List all MX record sets in a zone (autogenerated)
+    syntax: az network dns record-set mx list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_remove-record
   name: az network dns record-set mx remove-record
   summary: Remove an MX record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx remove-record --exchange
+                                               --preference
+                                               --record-set-name
+                                               --resource-group
+                                               --zone-name
+                                               [--keep-empty-record-set]
+                                               [--subscription]
   examples:
   - summary: Remove an MX record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -204,86 +205,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_show
   name: az network dns record-set mx show
   summary: Get the details of an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx show --name
+                                      --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: Get the details of an MX record set.
-    syntax:
-      content: az network dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_update
   name: az network dns record-set mx update
   summary: Update an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx update --name
+                                        --resource-group
+                                        --zone-name
+                                        [--add]
+                                        [--force-string]
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--remove]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update an MX record set.
-    syntax:
-      content: >-
-        az network dns record-set mx update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set mx update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
   - summary: Update an MX record set. (autogenerated)
-    syntax:
-      content: az network dns record-set mx update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set mx update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -291,12 +305,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -306,34 +314,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -349,10 +338,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS MX records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS MX records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ns.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ns.yml
index 78abdad69a..b25f790474 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ns.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ns.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_ns_add_record
-  - az_network_dns_record_set_ns_create
-  - az_network_dns_record_set_ns_delete
-  - az_network_dns_record_set_ns_list
-  - az_network_dns_record_set_ns_remove_record
-  - az_network_dns_record_set_ns_show
-  - az_network_dns_record_set_ns_update
-- uid: az_network_dns_record_set_ns_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_ns
+name: az network dns record-set ns
+summary: Manage DNS NS records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_ns_add-record
   name: az network dns record-set ns add-record
   summary: Add an NS record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns add-record --nsdname
+                                            --record-set-name
+                                            --resource-group
+                                            --zone-name
+                                            [--if-none-match]
+                                            [--subscriptionid]
+                                            [--ttl]
   examples:
   - summary: Add an NS record.
-    syntax:
-      content: >-
-        az network dns record-set ns add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d ns.mysite.com
-  parameters:
+    syntax: >-
+      az network dns record-set ns add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d ns.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --nsdname -d
     summary: Name server domain name.
@@ -37,12 +32,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
@@ -53,40 +49,41 @@ items:
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_create
   name: az network dns record-set ns create
   summary: Create an empty NS record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns create --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--subscription]
+                                        [--ttl]
   examples:
   - summary: Create an empty NS record set.
-    syntax:
-      content: az network dns record-set ns create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set ns create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty NS record set. (autogenerated)
-    syntax:
-      content: az network dns record-set ns create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set ns create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -94,98 +91,102 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_delete
   name: az network dns record-set ns delete
   summary: Delete an NS record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns delete --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--subscription]
+                                        [--yes]
   examples:
   - summary: Delete an NS record set and all associated records.
-    syntax:
-      content: az network dns record-set ns delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ns delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Delete an NS record set and all associated records. (autogenerated)
+    syntax: az network dns record-set ns delete --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --yes --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_list
   name: az network dns record-set ns list
   summary: List all NS record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns list --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List all NS record sets in a zone.
-    syntax:
-      content: az network dns record-set ns list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set ns list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_remove-record
   name: az network dns record-set ns remove-record
   summary: Remove an NS record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns remove-record --nsdname
+                                               --record-set-name
+                                               --resource-group
+                                               --zone-name
+                                               [--keep-empty-record-set]
+                                               [--subscription]
   examples:
   - summary: Remove an NS record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set ns remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d ns.mysite.com
-  parameters:
+    syntax: >-
+      az network dns record-set ns remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d ns.mysite.com
+  - summary: Remove an NS record from its record set. (autogenerated)
+    syntax: az network dns record-set ns remove-record --keep-empty-record-set --nsdname ns.mysite.com --record-set-name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --nsdname -d
     summary: Name server domain name.
@@ -196,86 +197,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_show
   name: az network dns record-set ns show
   summary: Get the details of an NS record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns show --name
+                                      --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: Get the details of an NS record set.
-    syntax:
-      content: az network dns record-set ns show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ns show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_update
   name: az network dns record-set ns update
   summary: Update an NS record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns update --name
+                                        --resource-group
+                                        --zone-name
+                                        [--add]
+                                        [--force-string]
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--remove]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update an NS record set.
-    syntax:
-      content: >-
-        az network dns record-set ns update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set ns update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
   - summary: Update an NS record set. (autogenerated)
-    syntax:
-      content: az network dns record-set ns update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set ns update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -283,12 +297,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -298,34 +306,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -341,10 +330,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS NS records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS NS records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ptr.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ptr.yml
index 5bbd8a3bf6..a5f07fcb9c 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ptr.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/ptr.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_ptr_add_record
-  - az_network_dns_record_set_ptr_create
-  - az_network_dns_record_set_ptr_delete
-  - az_network_dns_record_set_ptr_list
-  - az_network_dns_record_set_ptr_remove_record
-  - az_network_dns_record_set_ptr_show
-  - az_network_dns_record_set_ptr_update
-- uid: az_network_dns_record_set_ptr_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_ptr
+name: az network dns record-set ptr
+summary: Manage DNS PTR records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_ptr_add-record
   name: az network dns record-set ptr add-record
   summary: Add a PTR record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr add-record --ptrdname
+                                             --record-set-name
+                                             --resource-group
+                                             --zone-name
+                                             [--if-none-match]
+                                             [--subscription]
+                                             [--ttl]
   examples:
   - summary: Add a PTR record.
-    syntax:
-      content: >-
-        az network dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -37,53 +32,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_create
   name: az network dns record-set ptr create
   summary: Create an empty PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr create --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--subscription]
+                                         [--ttl]
   examples:
   - summary: Create an empty PTR record set.
-    syntax:
-      content: az network dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Create an empty PTR record set. (autogenerated)
+    syntax: az network dns record-set ptr create --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -91,101 +91,102 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_delete
   name: az network dns record-set ptr delete
   summary: Delete a PTR record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr delete --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--subscription]
+                                         [--yes]
   examples:
   - summary: Delete a PTR record set and all associated records.
-    syntax:
-      content: az network dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Delete a PTR record set and all associated records. (autogenerated)
+    syntax: az network dns record-set ptr delete --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --yes --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_list
   name: az network dns record-set ptr list
   summary: List all PTR record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr list --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List all PTR record sets in a zone.
-    syntax:
-      content: az network dns record-set ptr list -g MyResourceGroup -z www.mysite.com
+    syntax: az network dns record-set ptr list -g MyResourceGroup -z www.mysite.com
   - summary: List all PTR record sets in a zone. (autogenerated)
-    syntax:
-      content: az network dns record-set ptr list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set ptr list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_remove-record
   name: az network dns record-set ptr remove-record
   summary: Remove a PTR record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr remove-record --ptrdname
+                                                --record-set-name
+                                                --resource-group
+                                                --zone-name
+                                                [--keep-empty-record-set]
+                                                [--subscription]
   examples:
   - summary: Remove a PTR record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -196,83 +197,97 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_show
   name: az network dns record-set ptr show
   summary: Get the details of a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr show --name
+                                       --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of a PTR record set.
-    syntax:
-      content: az network dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_update
   name: az network dns record-set ptr update
   summary: Update a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr update --name
+                                         --resource-group
+                                         --zone-name
+                                         [--add]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--remove]
+                                         [--set]
+                                         [--subscription]
   examples:
   - summary: Update a PTR record set.
-    syntax:
-      content: >-
-        az network dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -280,12 +295,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -295,34 +304,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -338,10 +328,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS PTR records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS PTR records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/soa.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/soa.yml
index dd5f1a94f6..f9ce77793b 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/soa.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/soa.yml
@@ -1,63 +1,73 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_soa_show
-  - az_network_dns_record_set_soa_update
-- uid: az_network_dns_record_set_soa_show
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_soa
+name: az network dns record-set soa
+summary: Manage a DNS SOA record.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_soa_show
   name: az network dns record-set soa show
   summary: Get the details of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set soa show --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of an SOA record.
-    syntax:
-      content: az network dns record-set soa show -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set soa show -g MyResourceGroup -z www.mysite.com
+  - summary: Get the details of an SOA record (autogenerated)
+    syntax: az network dns record-set soa show --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_soa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_soa_update
   name: az network dns record-set soa update
   summary: Update properties of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set soa update --resource-group
+                                         --zone-name
+                                         [--email]
+                                         [--expire-time]
+                                         [--host]
+                                         [--if-none-match]
+                                         [--minimum-ttl]
+                                         [--refresh-time]
+                                         [--retry-time]
+                                         [--serial-number]
+                                         [--subscription]
   examples:
   - summary: Update properties of an SOA record.
-    syntax:
-      content: >-
-        az network dns record-set soa update -g MyResourceGroup -z www.mysite.com \
-            -e myhostmaster.mysite.com
-  parameters:
+    syntax: >-
+      az network dns record-set soa update -g MyResourceGroup -z www.mysite.com \
+          -e myhostmaster.mysite.com
+  - summary: Update properties of an SOA record. (autogenerated)
+    syntax: az network dns record-set soa update --email myhostmaster.mysite.com --only-show-errors --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --email -e
     summary: Email address.
     description: ''
@@ -86,19 +96,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -114,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage a DNS SOA record.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage a DNS SOA record.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/srv.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/srv.yml
index 8fb6ec7ec4..465b7641bf 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/srv.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/srv.yml
@@ -1,32 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_srv_add_record
-  - az_network_dns_record_set_srv_create
-  - az_network_dns_record_set_srv_delete
-  - az_network_dns_record_set_srv_list
-  - az_network_dns_record_set_srv_remove_record
-  - az_network_dns_record_set_srv_show
-  - az_network_dns_record_set_srv_update
-- uid: az_network_dns_record_set_srv_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_srv
+name: az network dns record-set srv
+summary: Manage DNS SRV records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_srv_add-record
   name: az network dns record-set srv add-record
   summary: Add an SRV record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv add-record --port
+                                             --priority
+                                             --record-set-name
+                                             --resource-group
+                                             --target
+                                             --weight
+                                             --zone-name
+                                             [--if-none-match]
+                                             [--subscription]
   examples:
   - summary: Add an SRV record.
-    syntax:
-      content: >-
-        az network dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -41,7 +38,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -55,45 +52,50 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_create
   name: az network dns record-set srv create
   summary: Create an empty SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv create --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--subscription]
+                                         [--ttl]
   examples:
   - summary: Create an empty SRV record set.
-    syntax:
-      content: >-
-        az network dns record-set srv create -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet
-  parameters:
+    syntax: >-
+      az network dns record-set srv create -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet
+  - summary: Create an empty SRV record set. (autogenerated)
+    syntax: az network dns record-set srv create --metadata owner=WebTeam --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -101,98 +103,101 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_delete
   name: az network dns record-set srv delete
   summary: Delete an SRV record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv delete --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--subscription]
+                                         [--yes]
   examples:
   - summary: Delete an SRV record set and all associated records.
-    syntax:
-      content: az network dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_list
   name: az network dns record-set srv list
   summary: List all SRV record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv list --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List all SRV record sets in a zone.
-    syntax:
-      content: az network dns record-set srv list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set srv list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_remove-record
   name: az network dns record-set srv remove-record
   summary: Remove an SRV record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv remove-record --port
+                                                --priority
+                                                --record-set-name
+                                                --resource-group
+                                                --target
+                                                --weight
+                                                --zone-name
+                                                [--keep-empty-record-set]
+                                                [--subscription]
   examples:
   - summary: Remove an SRV record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -207,7 +212,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -221,77 +226,91 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_show
   name: az network dns record-set srv show
   summary: Get the details of an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv show --name
+                                       --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of an SRV record set.
-    syntax:
-      content: az network dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_update
   name: az network dns record-set srv update
   summary: Update an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv update --name
+                                         --resource-group
+                                         --zone-name
+                                         [--add]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--remove]
+                                         [--set]
+                                         [--subscription]
   examples:
   - summary: Update an SRV record set.
-    syntax:
-      content: >-
-        az network dns record-set srv update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set srv update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -299,12 +318,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -314,34 +327,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -357,10 +351,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS SRV records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS SRV records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/txt.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/txt.yml
index 90d03537e1..da9585d8e5 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/txt.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/record-set/txt.yml
@@ -1,39 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_txt_add_record
-  - az_network_dns_record_set_txt_create
-  - az_network_dns_record_set_txt_delete
-  - az_network_dns_record_set_txt_list
-  - az_network_dns_record_set_txt_remove_record
-  - az_network_dns_record_set_txt_show
-  - az_network_dns_record_set_txt_update
-- uid: az_network_dns_record_set_txt_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_txt
+name: az network dns record-set txt
+summary: Manage DNS TXT records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_txt_add-record
   name: az network dns record-set txt add-record
   summary: Add a TXT record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt add-record --record-set-name
+                                             --resource-group
+                                             --value
+                                             --zone-name
+                                             [--if-none-match]
+                                             [--subscription]
   examples:
   - summary: Add a TXT record.
-    syntax:
-      content: >-
-        az network dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -43,46 +37,48 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_create
   name: az network dns record-set txt create
   summary: Create an empty TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt create --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--subscription]
+                                         [--ttl]
   examples:
   - summary: Create an empty TXT record set.
-    syntax:
-      content: az network dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty TXT record set. (autogenerated)
-    syntax:
-      content: az network dns record-set txt create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -90,105 +86,105 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_delete
   name: az network dns record-set txt delete
   summary: Delete a TXT record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt delete --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--subscription]
+                                         [--yes]
   examples:
   - summary: Delete a TXT record set and all associated records.
-    syntax:
-      content: az network dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_list
   name: az network dns record-set txt list
   summary: List all TXT record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt list --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List all TXT record sets in a zone.
-    syntax:
-      content: az network dns record-set txt list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_remove-record
   name: az network dns record-set txt remove-record
   summary: Remove a TXT record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt remove-record --record-set-name
+                                                --resource-group
+                                                --value
+                                                --zone-name
+                                                [--keep-empty-record-set]
+                                                [--subscription]
   examples:
   - summary: Remove a TXT record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -198,83 +194,95 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_show
   name: az network dns record-set txt show
   summary: Get the details of a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt show --name
+                                       --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of a TXT record set.
-    syntax:
-      content: az network dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Get the details of a TXT record set. (autogenerated)
-    syntax:
-      content: az network dns record-set txt show --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt show --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_update
   name: az network dns record-set txt update
   summary: Update a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt update --name
+                                         --resource-group
+                                         --zone-name
+                                         [--add]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--remove]
+                                         [--set]
+                                         [--subscription]
   examples:
   - summary: Update a TXT record set.
-    syntax:
-      content: >-
-        az network dns record-set txt update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set txt update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
   - summary: Update a TXT record set. (autogenerated)
-    syntax:
-      content: az network dns record-set txt update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -282,12 +290,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -297,34 +299,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -340,10 +323,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS TXT records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS TXT records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/dns/zone.yml b/2017-03-09-profile/docs-ref-autogen/network/dns/zone.yml
index 6e4c5192be..6048e6c1a7 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/dns/zone.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/dns/zone.yml
@@ -1,59 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_zone
-  name: az network dns zone
-  summary: Manage DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_zone_create
-  - az_network_dns_zone_delete
-  - az_network_dns_zone_export
-  - az_network_dns_zone_import
-  - az_network_dns_zone_list
-  - az_network_dns_zone_show
-  - az_network_dns_zone_update
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_zone
+name: az network dns zone
+summary: Manage DNS zones.
+description: ''
+directCommands:
 - uid: az_network_dns_zone_create
   name: az network dns zone create
   summary: Create a DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone create --name
+                               --resource-group
+                               [--if-none-match]
+                               [--parent-name]
+                               [--registration-vnets]
+                               [--resolution-vnets]
+                               [--subscription]
+                               [--tags]
+                               [--zone-type {Private, Public}]
   examples:
   - summary: Create a DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network dns zone create -g MyResourceGroup -n www.mysite.com
+    syntax: az network dns zone create -g MyResourceGroup -n www.mysite.com
   - summary: Create a DNS zone with delegation in the parent within the same subscription and resource group
-    syntax:
-      content: az network dns zone create -g MyResourceGroup -n books.mysite.com -p mysite.com
+    syntax: az network dns zone create -g MyResourceGroup -n books.mysite.com -p mysite.com
   - summary: Create a DNS zone with delegation in the parent in different subscription
-    syntax:
-      content: az network dns zone create -g MyResourceGroup -n books.mysite.com -p "/subscriptions/**67e2/resourceGroups/OtherRg/providers/Microsoft.Network/dnszones/mysite.com"
-  parameters:
+    syntax: az network dns zone create -g MyResourceGroup -n books.mysite.com -p "/subscriptions/**67e2/resourceGroups/OtherRg/providers/Microsoft.Network/dnszones/mysite.com"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Only create a DNS zone if one doesn't exist that matches the given name.
     description: ''
   - name: --parent-name -p
     summary: Specify if parent zone exists for this zone and delegation for the child zone in the parent is to be added.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --zone-type
-    defaultValue: Public
-    summary: Type of DNS zone to create.
-    description: ''
   - name: --registration-vnets
-    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: <a href="https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits">https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits</a>.'
+    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits.'
     description: ''
   - name: --resolution-vnets
     summary: Space-separated names or IDs of virtual networks that resolve records in this DNS zone.
@@ -61,88 +50,90 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zone-type
+    defaultValue: Public
+    parameterValueGroup: Private, Public
+    summary: Type of DNS zone to create.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_delete
   name: az network dns zone delete
   summary: Delete a DNS zone and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone delete --name
+                               --resource-group
+                               [--if-match]
+                               [--subscription]
+                               [--yes]
   examples:
   - summary: Delete a DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network dns zone delete -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network dns zone delete -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_export
   name: az network dns zone export
   summary: Export a DNS zone as a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone export --name
+                               --resource-group
+                               [--file-name]
+                               [--subscription]
   examples:
   - summary: Export a DNS zone as a DNS zone file.
-    syntax:
-      content: az network dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
-  parameters:
+    syntax: az network dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --file-name -f
     summary: Path to the DNS zone file to save.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_import
   name: az network dns zone import
   summary: Create a DNS zone using a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone import --file-name
+                               --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Import a local zone file into a DNS zone resource.
-    syntax:
-      content: az network dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
-  parameters:
+    syntax: az network dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
+  requiredParameters:
   - isRequired: true
     name: --file-name -f
     summary: Path to the DNS zone file to import.
@@ -153,145 +144,136 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_list
   name: az network dns zone list
   summary: List DNS zones.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone list [--query-examples]
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: List DNS zones in a resource group.
-    syntax:
-      content: az network dns zone list -g MyResourceGroup
-  parameters:
+    syntax: az network dns zone list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_show
   name: az network dns zone show
   summary: Get a DNS zone parameters. Does not show DNS records within the zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List DNS zones in a resource group.
-    syntax:
-      content: az network dns zone show -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network dns zone show -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_update
   name: az network dns zone update
   summary: Update a DNS zone properties. Does not modify DNS records within the zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone update --name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--if-match]
+                               [--registration-vnets]
+                               [--remove]
+                               [--resolution-vnets]
+                               [--set]
+                               [--subscription]
+                               [--tags]
+                               [--zone-type {Private, Public}]
   examples:
   - summary: Update a DNS zone properties to change the user-defined value of a previously set tag.
-    syntax:
-      content: az network dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
-  parameters:
+    syntax: az network dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
+  - summary: Update a DNS zone properties (autogenerated)
+    syntax: az network dns zone update --name www.mysite.com --remove tags.no_80 --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: Update only if the resource with the same ETAG exists.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --zone-type
-    summary: Type of DNS zone to create.
-    description: ''
-  - name: --registration-vnets
-    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: <a href="https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits">https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits</a>.'
-    description: ''
-  - name: --resolution-vnets
-    summary: Space-separated names or IDs of virtual networks that resolve records in this DNS zone.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: Update only if the resource with the same ETAG exists.
+    description: ''
+  - name: --registration-vnets
+    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits.'
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resolution-vnets
+    summary: Space-separated names or IDs of virtual networks that resolve records in this DNS zone.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zone-type
+    parameterValueGroup: Private, Public
+    summary: Type of DNS zone to create.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_zone_create
-  name: az network dns zone create
-  summary: Create a DNS zone.
-- uid: az_network_dns_zone_delete
-  name: az network dns zone delete
-  summary: Delete a DNS zone and all associated records.
-- uid: az_network_dns_zone_export
-  name: az network dns zone export
-  summary: Export a DNS zone as a DNS zone file.
-- uid: az_network_dns_zone_import
-  name: az network dns zone import
-  summary: Create a DNS zone using a DNS zone file.
-- uid: az_network_dns_zone_list
-  name: az network dns zone list
-  summary: List DNS zones.
-- uid: az_network_dns_zone_show
-  name: az network dns zone show
-  summary: Get a DNS zone parameters. Does not show DNS records within the zone.
-- uid: az_network_dns_zone_update
-  name: az network dns zone update
-  summary: Update a DNS zone properties. Does not modify DNS records within the zone.
+- az_network_dns_zone_create
+- az_network_dns_zone_delete
+- az_network_dns_zone_export
+- az_network_dns_zone_import
+- az_network_dns_zone_list
+- az_network_dns_zone_show
+- az_network_dns_zone_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -307,10 +289,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS zones.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS zones.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/express-route.yml b/2017-03-09-profile/docs-ref-autogen/network/express-route.yml
index 258e643133..f387f0c980 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/express-route.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/express-route.yml
@@ -1,26 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-  description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_create
-  - az_network_express_route_list
-  - az_network_express_route_list_route_tables
-- uid: az_network_express_route_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route
+name: az network express-route
+summary: Manage dedicated private network fiber connections to Azure.
+description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/azure/expressroute/howto-circuit-cli.
+directCommands:
+- uid: az_network_express-route_create
   name: az network express-route create
   summary: Create an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route create --bandwidth
+                                    --name
+                                    --peering-location
+                                    --provider
+                                    --resource-group
+                                    [--location]
+                                    [--no-wait]
+                                    [--sku-family {MeteredData, UnlimitedData}]
+                                    [--sku-tier {Premium, Standard}]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Create an ExpressRoute circuit.
-    syntax:
-      content: az network express-route create --bandwidth 200 -n MyCircuit --peering-location "Silicon Valley" -g MyResourceGroup --provider "Equinix" -l "West US" --sku-family MeteredData --sku-tier Standard
-  parameters:
+    syntax: az network express-route create --bandwidth 200 -n MyCircuit --peering-location "Silicon Valley" -g MyResourceGroup --provider "Equinix" -l "West US" --sku-family MeteredData --sku-tier Standard
+  requiredParameters:
   - isRequired: true
     name: --bandwidth
     summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
@@ -42,10 +45,11 @@ items:
     valueFrom: az network express-route list-service-providers
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -60,139 +64,55 @@ items:
     parameterValueGroup: Premium, Standard
     summary: SKU Tier of ExpressRoute circuit.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_list
   name: az network express-route list
   summary: List all ExpressRoute circuits for the current subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route list [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: List all ExpressRoute circuits for the current subscription.
-    syntax:
-      content: az network express-route list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_list_route_tables
-  name: az network express-route list-route-tables
-  summary: Show the current routing table of an ExpressRoute circuit peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current routing table of an ExpressRoute circuit peering.
-    syntax:
-      content: >-
-        az network express-route list-route-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: ExpressRoute circuit name.
+    syntax: az network express-route list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: az_network_express_route_list_route_tables
-  name: az network express-route list-route-tables
-  summary: Show the current routing table of an ExpressRoute circuit peering.
-- uid: az_network_express_route_peering
-  name: az network express-route peering
-  summary: Manage ExpressRoute peering of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
-- uid: az_network_express_route_peering_create
-  name: az network express-route peering create
-  summary: Create peering settings for an ExpressRoute circuit.
-- uid: az_network_express_route_peering_delete
-  name: az network express-route peering delete
-  summary: Delete peering settings.
-- uid: az_network_express_route_peering_list
-  name: az network express-route peering list
-  summary: List peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_show
-  name: az network express-route peering show
-  summary: Get the details of an express route peering.
-- uid: az_network_express_route_peering_update
-  name: az network express-route peering update
-  summary: Update peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
+- az_network_express-route_create
+- az_network_express-route_gateway
+- az_network_express-route_gateway_connection
+- az_network_express-route_gateway_connection_create
+- az_network_express-route_gateway_create
+- az_network_express-route_gateway_list
+- az_network_express-route_list
+- az_network_express-route_peering
+- az_network_express-route_peering_connection
+- az_network_express-route_peering_connection_create
+- az_network_express-route_peering_create
+- az_network_express-route_peering_delete
+- az_network_express-route_peering_list
+- az_network_express-route_peering_show
+- az_network_express-route_peering_update
+- az_network_express-route_port
+- az_network_express-route_port_create
+- az_network_express-route_port_generate-loa
+- az_network_express-route_port_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -208,10 +128,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/azure/expressroute/howto-circuit-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway.yml b/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway.yml
index a43f6c14ee..4f2b17904d 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway.yml
@@ -1,72 +1,61 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_gateway_create
-  - az_network_express_route_gateway_list
-- uid: az_network_express_route_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_gateway
+name: az network express-route gateway
+summary: Manage ExpressRoute gateways.
+description: ''
+directCommands:
+- uid: az_network_express-route_gateway_create
   name: az network express-route gateway create
   summary: Create an ExpressRoute gateway.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route gateway create --resource-group
+                                            [--location]
+                                            [--subscription]
+                                            [--tags]
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_gateway_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_gateway_list
   name: az network express-route gateway list
   summary: List ExpressRoute gateways.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route gateway list [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
+  examples:
+  - summary: List ExpressRoute gateways. (autogenerated)
+    syntax: az network express-route gateway list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
+- az_network_express-route_gateway_connection
+- az_network_express-route_gateway_connection_create
+- az_network_express-route_gateway_create
+- az_network_express-route_gateway_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -82,10 +71,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute gateways.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute gateways.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway/connection.yml b/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway/connection.yml
index e9f4edec5b..8d3ccd1539 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway/connection.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/express-route/gateway/connection.yml
@@ -1,37 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_gateway_connection_create
-- uid: az_network_express_route_gateway_connection_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_gateway_connection
+name: az network express-route gateway connection
+summary: Manage ExpressRoute gateway connections.
+description: ''
+directCommands:
+- uid: az_network_express-route_gateway_connection_create
   name: az network express-route gateway connection create
   summary: Create an ExpressRoute gateway connection.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route gateway connection create --resource-group
+                                                       [--subscription]
+  examples:
+  - summary: Create an ExpressRoute gateway connection.
+    syntax: az network express-route gateway connection create --gateway-name MyGateway -n MyExpressRouteConnection -g MyResourceGroup --peering /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/expressRouteCircuits/MyCircuit/peerings/AzurePrivatePeering --associated-route-table /MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 --propagated-route-tables /MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 /MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable2 --labels label1 label2
+  - summary: Create an ExpressRoute gateway connection. (autogenerated)
+    syntax: az network express-route gateway connection create --gateway-name MyGateway --name MyExpressRouteConnection --peering /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/expressRouteCircuits/MyCircuit/peerings/AzurePrivatePeering --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
+- az_network_express-route_gateway_connection_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -47,10 +43,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute gateway connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute gateway connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/express-route/peering.yml b/2017-03-09-profile/docs-ref-autogen/network/express-route/peering.yml
index b466fd0eb9..96f50d0325 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/express-route/peering.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/express-route/peering.yml
@@ -1,32 +1,41 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_peering
-  name: az network express-route peering
-  summary: Manage ExpressRoute peering of an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_peering_create
-  - az_network_express_route_peering_delete
-  - az_network_express_route_peering_list
-  - az_network_express_route_peering_show
-  - az_network_express_route_peering_update
-- uid: az_network_express_route_peering_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_peering
+name: az network express-route peering
+summary: Manage ExpressRoute peering of an ExpressRoute circuit.
+description: ''
+directCommands:
+- uid: az_network_express-route_peering_create
   name: az network express-route peering create
   summary: Create peering settings for an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering create --circuit-name
+                                            --peer-asn
+                                            --peering-type {AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+                                            --primary-peer-subnet
+                                            --resource-group
+                                            --secondary-peer-subnet
+                                            --vlan-id
+                                            [--advertised-public-prefixes]
+                                            [--customer-asn]
+                                            [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                            [--shared-key]
+                                            [--subscription]
   examples:
   - summary: Create Microsoft Peering settings with IPv4 configuration.
-    syntax:
-      content: >-
-        az network express-route peering create -g MyResourceGroup --circuit-name MyCircuit \
-            --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
-            --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
-            --advertised-public-prefixes 101.0.0.0/30
-  parameters:
+    syntax: >-
+      az network express-route peering create -g MyResourceGroup --circuit-name MyCircuit \
+          --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
+          --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
+          --advertised-public-prefixes 101.0.0.0/30
+  - summary: Create Microsoft Peering settings with IPv6 configuration.
+    syntax: >-
+      az network express-route peering create -g MyResourceGroup --circuit-name MyCircuit \
+          --peering-type AzurePrivatePeering --peer-asn 10002 --vlan-id 103 --ip-version ipv6\
+          --primary-peer-subnet 2002:db00::/126 --secondary-peer-subnet 2003:db00::/126
+  - summary: Create peering settings for an ExpressRoute circuit. (autogenerated)
+    syntax: az network express-route peering create --circuit-name MyCircuit --peer-asn 10002 --peering-type AzurePublicPeering --primary-peer-subnet 101.0.0.0/30 --resource-group MyResourceGroup --secondary-peer-subnet 102.0.0.0/30 --shared-key Abc123 --vlan-id 103
+  requiredParameters:
   - isRequired: true
     name: --circuit-name
     summary: ExpressRoute circuit name.
@@ -42,23 +51,21 @@ items:
     description: ''
   - isRequired: true
     name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for primary interface.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for secondary interface.
     description: ''
   - isRequired: true
     name: --vlan-id
     summary: Identifier used to identify the customer.
     description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
-    description: ''
+  optionalParameters:
   - name: --advertised-public-prefixes
     summary: Space-separated list of prefixes to be advertised through the BGP peering.
     description: ''
@@ -69,26 +76,27 @@ items:
     parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
     summary: Internet Routing Registry / Regional Internet Registry.
     description: ''
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_delete
   name: az network express-route peering delete
   summary: Delete peering settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering delete [--circuit-name]
+                                            [--ids]
+                                            [--name]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: Delete private peering.
-    syntax:
-      content: az network express-route peering delete -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
-  parameters:
+    syntax: az network express-route peering delete -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
+  optionalParameters:
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
@@ -99,56 +107,56 @@ items:
     summary: The name of the peering.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_list
   name: az network express-route peering list
   summary: List peering settings of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering list --circuit-name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
   examples:
   - summary: List peering settings of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route peering list -g MyResourceGroup --circuit-name MyCircuit
-  parameters:
+    syntax: az network express-route peering list -g MyResourceGroup --circuit-name MyCircuit
+  requiredParameters:
   - isRequired: true
     name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_show
   name: az network express-route peering show
   summary: Get the details of an express route peering.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering show [--circuit-name]
+                                          [--ids]
+                                          [--name]
+                                          [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
   examples:
   - summary: Get private peering details of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route peering show -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
-  parameters:
+    syntax: az network express-route peering show -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
+  optionalParameters:
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
@@ -158,105 +166,103 @@ items:
   - name: --name -n
     summary: The name of the peering.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_update
   name: az network express-route peering update
   summary: Update peering settings of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --peer-asn
-    summary: Autonomous system number of the customer/connectivity provider.
-    description: ''
-  - name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
-    description: ''
-  - name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
-    description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
+  syntax: >-
+    az network express-route peering update [--add]
+                                            [--advertised-public-prefixes]
+                                            [--circuit-name]
+                                            [--customer-asn]
+                                            [--force-string]
+                                            [--ids]
+                                            [--name]
+                                            [--peer-asn]
+                                            [--primary-peer-subnet]
+                                            [--remove]
+                                            [--resource-group]
+                                            [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                            [--secondary-peer-subnet]
+                                            [--set]
+                                            [--shared-key]
+                                            [--subscription]
+                                            [--vlan-id]
+  examples:
+  - summary: Update peering settings of an ExpressRoute circuit. (autogenerated)
+    syntax: az network express-route peering update --circuit-name MyCircuit --name MyPeering --peer-asn 10002 --primary-peer-subnet 2002:db00::/126 --resource-group MyResourceGroup --secondary-peer-subnet 2003:db00::/126 --shared-key Abc123 --vlan-id 103
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --vlan-id
-    summary: Identifier used to identify the customer.
+  - name: --advertised-public-prefixes
+    summary: Space-separated list of prefixes to be advertised through the BGP peering.
     description: ''
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
+  - name: --customer-asn
+    summary: Autonomous system number of the customer.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the peering.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --peer-asn
+    summary: Autonomous system number of the customer/connectivity provider.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --primary-peer-subnet
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for primary interface.
     description: ''
-  - name: --advertised-public-prefixes
-    summary: Space-separated list of prefixes to be advertised through the BGP peering.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
-  - name: --customer-asn
-    summary: Autonomous system number of the customer.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --routing-registry-name
     parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
     summary: Internet Routing Registry / Regional Internet Registry.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --secondary-peer-subnet
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for secondary interface.
     description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vlan-id
+    summary: Identifier used to identify the customer.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
-- uid: az_network_express_route_peering_create
-  name: az network express-route peering create
-  summary: Create peering settings for an ExpressRoute circuit.
-- uid: az_network_express_route_peering_delete
-  name: az network express-route peering delete
-  summary: Delete peering settings.
-- uid: az_network_express_route_peering_list
-  name: az network express-route peering list
-  summary: List peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_show
-  name: az network express-route peering show
-  summary: Get the details of an express route peering.
-- uid: az_network_express_route_peering_update
-  name: az network express-route peering update
-  summary: Update peering settings of an ExpressRoute circuit.
+- az_network_express-route_peering_connection
+- az_network_express-route_peering_connection_create
+- az_network_express-route_peering_create
+- az_network_express-route_peering_delete
+- az_network_express-route_peering_list
+- az_network_express-route_peering_show
+- az_network_express-route_peering_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -272,10 +278,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute peering of an ExpressRoute circuit.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute peering of an ExpressRoute circuit.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/express-route/peering/connection.yml b/2017-03-09-profile/docs-ref-autogen/network/express-route/peering/connection.yml
index f66f98912c..d08520d45a 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/express-route/peering/connection.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/express-route/peering/connection.yml
@@ -1,27 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_peering_connection_create
-- uid: az_network_express_route_peering_connection_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_peering_connection
+name: az network express-route peering connection
+summary: Manage ExpressRoute circuit connections.
+description: ''
+directCommands:
+- uid: az_network_express-route_peering_connection_create
   name: az network express-route peering connection create
   summary: Create connections between two ExpressRoute circuits.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering connection create --address-prefix
+                                                       --circuit-name
+                                                       --name
+                                                       --peer-circuit
+                                                       --peering-name
+                                                       --resource-group
+                                                       [--authorization-key]
+                                                       [--subscription]
   examples:
   - summary: Create connection between two ExpressRoute circuits with AzurePrivatePeering settings.
-    syntax:
-      content: >-
-        az network express-route peering connection create -g MyResourceGroup --circuit-name \
-            MyCircuit --peering-name AzurePrivatePeering -n myConnection --peer-circuit \
-            MyOtherCircuit --address-prefix 104.0.0.0/29
-  parameters:
+    syntax: >-
+      az network express-route peering connection create -g MyResourceGroup --circuit-name \
+          MyCircuit --peering-name AzurePrivatePeering -n myConnection --peer-circuit \
+          MyOtherCircuit --address-prefix 104.0.0.0/29
+  requiredParameters:
   - isRequired: true
     name: --address-prefix
     summary: /29 IP address space to carve out customer addresses for tunnels.
@@ -44,24 +46,18 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --authorization-key
     summary: The authorization key used when the peer circuit is in another subscription.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
+- az_network_express-route_peering_connection_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -77,10 +73,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute circuit connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute circuit connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/express-route/port.yml b/2017-03-09-profile/docs-ref-autogen/network/express-route/port.yml
index fe3d2dd084..33fe53c77a 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/express-route/port.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/express-route/port.yml
@@ -1,70 +1,80 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_port_create
-  - az_network_express_route_port_list
-- uid: az_network_express_route_port_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_port
+name: az network express-route port
+summary: Manage ExpressRoute ports.
+description: ''
+directCommands:
+- uid: az_network_express-route_port_create
   name: az network express-route port create
   summary: Create an ExpressRoute port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route port create --resource-group
+                                         [--location]
+                                         [--subscription]
+                                         [--tags]
   examples:
   - summary: Create an ExpressRoute port. (autogenerated)
-    syntax:
-      content: az network express-route port create --bandwidth 200 --encapsulation Dot1Q --location westus2 --name MyExpressRoutePort --peering-location westus --resource-group MyResourceGroup
-  parameters:
+    syntax: az network express-route port create --bandwidth 200 --encapsulation Dot1Q --location westus2 --name MyExpressRoutePort --peering-location westus --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_port_generate-loa
+  name: az network express-route port generate-loa
+  summary: Generate and download a letter of authorization for the requested ExpressRoutePort.
+  description: ''
+  syntax: >-
+    az network express-route port generate-loa --resource-group
+                                               [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_port_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_port_list
   name: az network express-route port list
   summary: List ExpressRoute ports.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route port list [--query-examples]
+                                       [--resource-group]
+                                       [--subscription]
+  examples:
+  - summary: List ExpressRoute ports. (autogenerated)
+    syntax: az network express-route port list --resource-group myresourcegroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
+- az_network_express-route_port_create
+- az_network_express-route_port_generate-loa
+- az_network_express-route_port_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -80,10 +90,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute ports.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute ports.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall.yml
new file mode 100644
index 0000000000..05f126b664
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall.yml
@@ -0,0 +1,305 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall
+name: az network firewall
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewalls.
+description: ''
+directCommands:
+- uid: az_network_firewall_create
+  name: az network firewall create
+  summary: Create an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall create --name
+                               --resource-group
+                               [--allow-active-ftp {false, true}]
+                               [--count]
+                               [--dns-servers]
+                               [--enable-dns-proxy {false, true}]
+                               [--firewall-policy]
+                               [--location]
+                               [--private-ranges]
+                               [--sku {AZFW_Hub, AZFW_VNet}]
+                               [--tags]
+                               [--threat-intel-mode {Alert, Deny, Off}]
+                               [--tier {Premium, Standard}]
+                               [--vhub]
+                               [--zones {1, 2, 3}]
+  examples:
+  - summary: Create a Azure firewall with private ranges
+    syntax: az network firewall create -g MyResourceGroup -n MyFirewall --private-ranges 10.0.0.0 10.0.0.0/16 IANAPrivateRanges
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allow-active-ftp
+    parameterValueGroup: false, true
+    summary: Allow Active FTP. By default it is false. It's only allowed for azure firewall on virtual network.
+    description: ''
+  - name: --count --public-ip-count
+    summary: Number of Public IP Address associated with azure firewall. It's used to add public ip addresses into this firewall.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --firewall-policy --policy
+    summary: Name or ID of the firewallPolicy associated with this azure firewall.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --private-ranges
+    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
+    description: ''
+  - name: --sku
+    parameterValueGroup: AZFW_Hub, AZFW_VNet
+    summary: SKU of Azure firewall. This field cannot be updated after the creation. The default sku in server end is AZFW_VNet. If you want to attach azure firewall to vhub, you should set sku to AZFW_Hub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+  - name: --tier
+    defaultValue: Standard
+    parameterValueGroup: Premium, Standard
+    summary: Tier of an azure firewall. --tier will take effect only when --sku is set.
+    description: ''
+  - name: --vhub --virtual-hub
+    summary: Name or ID of the virtualHub to which the firewall belongs.
+    description: ''
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
+    description: ''
+- uid: az_network_firewall_delete
+  name: az network firewall delete
+  summary: Delete an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_list
+  name: az network firewall list
+  summary: List Azure Firewalls.
+  description: ''
+  syntax: az network firewall list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_list-fqdn-tags
+  name: az network firewall list-fqdn-tags
+  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
+  description: 'keyword callable clsA custom type or function that will be passed the direct response :return: An iterator like instance of either AzureFirewallFqdnTagListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.network.v2020_07_01.models.AzureFirewallFqdnTagListResult] :raises: ~azure.core.exceptions.HttpResponseError.'
+  syntax: az network firewall list-fqdn-tags
+- uid: az_network_firewall_show
+  name: az network firewall show
+  summary: Get the details of an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall show --name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_update
+  name: az network firewall update
+  summary: Update an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall update --name
+                               --resource-group
+                               [--add]
+                               [--allow-active-ftp {false, true}]
+                               [--count]
+                               [--dns-servers]
+                               [--enable-dns-proxy {false, true}]
+                               [--firewall-policy]
+                               [--force-string]
+                               [--private-ranges]
+                               [--public-ips]
+                               [--remove]
+                               [--set]
+                               [--tags]
+                               [--threat-intel-mode {Alert, Deny, Off}]
+                               [--vhub]
+                               [--zones {1, 2, 3}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --allow-active-ftp
+    parameterValueGroup: false, true
+    summary: Allow Active FTP. By default it is false. It's only allowed for azure firewall on virtual network.
+    description: ''
+  - name: --count --public-ip-count
+    summary: Number of Public IP Address associated with azure firewall. It's used to add public ip addresses into this firewall.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --firewall-policy --policy
+    summary: Name or ID of the firewallPolicy associated with this azure firewall.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --private-ranges
+    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
+    description: ''
+  - name: --public-ips
+    summary: Space-separated list of Public IP addresses associated with azure firewall. It's used to delete public ip addresses from this firewall.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+  - name: --vhub --virtual-hub
+    summary: Name or ID of the virtualHub to which the firewall belongs.
+    description: ''
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
+    description: ''
+commands:
+- az_network_firewall_application-rule
+- az_network_firewall_application-rule_collection
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+- az_network_firewall_application-rule_create
+- az_network_firewall_application-rule_delete
+- az_network_firewall_application-rule_list
+- az_network_firewall_application-rule_show
+- az_network_firewall_create
+- az_network_firewall_delete
+- az_network_firewall_ip-config
+- az_network_firewall_ip-config_create
+- az_network_firewall_ip-config_delete
+- az_network_firewall_ip-config_list
+- az_network_firewall_ip-config_show
+- az_network_firewall_list
+- az_network_firewall_list-fqdn-tags
+- az_network_firewall_management-ip-config
+- az_network_firewall_management-ip-config_show
+- az_network_firewall_management-ip-config_update
+- az_network_firewall_nat-rule
+- az_network_firewall_nat-rule_collection
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+- az_network_firewall_nat-rule_create
+- az_network_firewall_nat-rule_delete
+- az_network_firewall_nat-rule_list
+- az_network_firewall_nat-rule_show
+- az_network_firewall_network-rule
+- az_network_firewall_network-rule_collection
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+- az_network_firewall_network-rule_create
+- az_network_firewall_network-rule_delete
+- az_network_firewall_network-rule_list
+- az_network_firewall_network-rule_show
+- az_network_firewall_policy
+- az_network_firewall_policy_create
+- az_network_firewall_policy_delete
+- az_network_firewall_policy_intrusion-detection
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+- az_network_firewall_policy_list
+- az_network_firewall_policy_rule-collection-group
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+- az_network_firewall_policy_show
+- az_network_firewall_policy_update
+- az_network_firewall_show
+- az_network_firewall_threat-intel-allowlist
+- az_network_firewall_threat-intel-allowlist_create
+- az_network_firewall_threat-intel-allowlist_delete
+- az_network_firewall_threat-intel-allowlist_show
+- az_network_firewall_threat-intel-allowlist_update
+- az_network_firewall_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewalls.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/application-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/application-rule.yml
new file mode 100644
index 0000000000..92fbf232b1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/application-rule.yml
@@ -0,0 +1,170 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_application-rule
+name: az network firewall application-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall application-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall application rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_application-rule_create
+  name: az network firewall application-rule create
+  summary: Create an Azure Firewall application rule.
+  description: ''
+  syntax: >-
+    az network firewall application-rule create --collection-name
+                                                --firewall-name
+                                                --name
+                                                --protocols
+                                                --resource-group
+                                                [--action {Allow, Deny}]
+                                                [--description]
+                                                [--fqdn-tags]
+                                                [--priority]
+                                                [--source-addresses]
+                                                [--source-ip-groups]
+                                                [--target-fqdns]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application rule.
+    description: ''
+  - isRequired: true
+    name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Deny
+    summary: The action to apply for the rule collection. Supply only if you want to create the collection.
+    description: ''
+  - name: --description
+    summary: Rule description.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule collection from 100 (high) to 65000 (low). Supply only if you want to create the collection.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of fully qualified domain names (FDQN).
+    description: ''
+- uid: az_network_firewall_application-rule_delete
+  name: az network firewall application-rule delete
+  summary: Delete an Azure Firewall application rule.
+  description: ''
+  syntax: >-
+    az network firewall application-rule delete --collection-name
+                                                --firewall-name
+                                                --name
+                                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_list
+  name: az network firewall application-rule list
+  summary: List Azure Firewall application rules.
+  description: ''
+  syntax: >-
+    az network firewall application-rule list --collection-name
+                                              --firewall-name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_show
+  name: az network firewall application-rule show
+  summary: Get the details of an Azure Firewall application rule.
+  description: ''
+  syntax: >-
+    az network firewall application-rule show --collection-name
+                                              --firewall-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_application-rule_collection
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+- az_network_firewall_application-rule_create
+- az_network_firewall_application-rule_delete
+- az_network_firewall_application-rule_list
+- az_network_firewall_application-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall application rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/application-rule/collection.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/application-rule/collection.yml
new file mode 100644
index 0000000000..29177f48c5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/application-rule/collection.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_application-rule_collection
+name: az network firewall application-rule collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall application-rule collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall application rule collections.
+description: Collections are created as part of the `az network firewall application-rule create` command.
+directCommands:
+- uid: az_network_firewall_application-rule_collection_delete
+  name: az network firewall application-rule collection delete
+  summary: Delete an Azure Firewall application rule collection.
+  description: ''
+  syntax: >-
+    az network firewall application-rule collection delete --collection-name
+                                                           --firewall-name
+                                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_collection_list
+  name: az network firewall application-rule collection list
+  summary: List Azure Firewall application rule collections.
+  description: ''
+  syntax: >-
+    az network firewall application-rule collection list --firewall-name
+                                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_collection_show
+  name: az network firewall application-rule collection show
+  summary: Get the details of an Azure Firewall application rule collection.
+  description: ''
+  syntax: >-
+    az network firewall application-rule collection show --collection-name
+                                                         --firewall-name
+                                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Collections are created as part of the `az network firewall application-rule create` command.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/ip-config.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/ip-config.yml
new file mode 100644
index 0000000000..bf97b81624
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/ip-config.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_ip-config
+name: az network firewall ip-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall ip-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall IP configurations.
+description: ''
+directCommands:
+- uid: az_network_firewall_ip-config_create
+  name: az network firewall ip-config create
+  summary: Create an Azure Firewall IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall ip-config create --firewall-name
+                                         --name
+                                         --public-ip-address
+                                         --resource-group
+                                         [--m-name]
+                                         [--m-public-ip-address]
+                                         [--m-vnet-name]
+                                         [--vnet-name]
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IP configuration.
+    description: ''
+  - isRequired: true
+    name: --public-ip-address
+    summary: Name or ID of the public IP to use.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --m-name
+    summary: Name of the management IP configuration.
+    description: ''
+  - name: --m-public-ip-address
+    summary: Name or ID of the public IP to use for management ip configuation.
+    description: ''
+  - name: --m-vnet-name
+    summary: The virtual network (VNet) name for management ip configuation. It should contain one subnet called "AzureFirewallManagementSubnet".
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallSubnet".
+    description: ''
+- uid: az_network_firewall_ip-config_delete
+  name: az network firewall ip-config delete
+  summary: Delete an Azure Firewall IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall ip-config delete --firewall-name
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_ip-config_list
+  name: az network firewall ip-config list
+  summary: List Azure Firewall IP configurations.
+  description: ''
+  syntax: >-
+    az network firewall ip-config list --firewall-name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_ip-config_show
+  name: az network firewall ip-config show
+  summary: Get the details of an Azure Firewall IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall ip-config show --firewall-name
+                                       --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_ip-config_create
+- az_network_firewall_ip-config_delete
+- az_network_firewall_ip-config_list
+- az_network_firewall_ip-config_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall IP configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/management-ip-config.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/management-ip-config.yml
new file mode 100644
index 0000000000..0694e0f492
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/management-ip-config.yml
@@ -0,0 +1,87 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_management-ip-config
+name: az network firewall management-ip-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall management-ip-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall Management IP configurations.
+description: ''
+directCommands:
+- uid: az_network_firewall_management-ip-config_show
+  name: az network firewall management-ip-config show
+  summary: Get the details of an Azure Firewall Management IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall management-ip-config show --firewall-name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_management-ip-config_update
+  name: az network firewall management-ip-config update
+  summary: Update an Azure Firewall Management IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall management-ip-config update --firewall-name
+                                                    --resource-group
+                                                    [--add]
+                                                    [--force-string]
+                                                    [--public-ip-address]
+                                                    [--remove]
+                                                    [--set]
+                                                    [--vnet-name]
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP to use.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallManagementSubnet".
+    description: ''
+commands:
+- az_network_firewall_management-ip-config_show
+- az_network_firewall_management-ip-config_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall Management IP configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/nat-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/nat-rule.yml
new file mode 100644
index 0000000000..f68dda9483
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/nat-rule.yml
@@ -0,0 +1,186 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_nat-rule
+name: az network firewall nat-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall nat-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall NAT rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_nat-rule_create
+  name: az network firewall nat-rule create
+  summary: Create an Azure Firewall NAT rule.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule create --collection-name
+                                        --dest-addr
+                                        --destination-ports
+                                        --firewall-name
+                                        --name
+                                        --protocols {Any, ICMP, TCP, UDP}
+                                        --resource-group
+                                        --translated-port
+                                        [--action {Dnat, Snat}]
+                                        [--description]
+                                        [--priority]
+                                        [--source-addresses]
+                                        [--source-ip-groups]
+                                        [--translated-address]
+                                        [--translated-fqdn]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
+    description: ''
+  - isRequired: true
+    name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
+    description: ''
+  - isRequired: true
+    name: --destination-ports
+    summary: Space-separated list of destination ports. Use '\*' to match all.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the NAT rule.
+    description: ''
+  - isRequired: true
+    name: --protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of protocols.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --translated-port
+    summary: Translated port for this NAT rule.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Dnat, Snat
+    summary: The action to apply for the rule collection. Supply only if you want to create the collection.
+    description: ''
+  - name: --description
+    summary: Rule description.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule collection from 100 (high) to 65000 (low). Supply only if you want to create the collection.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule.
+    description: ''
+  - name: --translated-fqdn
+    summary: Translated FQDN for this NAT rule.
+    description: ''
+- uid: az_network_firewall_nat-rule_delete
+  name: az network firewall nat-rule delete
+  summary: Delete an Azure Firewall NAT rule.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule delete --collection-name
+                                        --firewall-name
+                                        --name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the NAT rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_list
+  name: az network firewall nat-rule list
+  summary: List Azure Firewall NAT rules.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule list --collection-name
+                                      --firewall-name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_show
+  name: az network firewall nat-rule show
+  summary: Get the details of an Azure Firewall NAT rule.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule show --collection-name
+                                      --firewall-name
+                                      --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the NAT rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_nat-rule_collection
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+- az_network_firewall_nat-rule_create
+- az_network_firewall_nat-rule_delete
+- az_network_firewall_nat-rule_list
+- az_network_firewall_nat-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall NAT rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/nat-rule/collection.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/nat-rule/collection.yml
new file mode 100644
index 0000000000..59ade1ea7f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/nat-rule/collection.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_nat-rule_collection
+name: az network firewall nat-rule collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall nat-rule collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall NAT rules.
+description: Collections are created as part of the `az network firewall nat-rule create` command.
+directCommands:
+- uid: az_network_firewall_nat-rule_collection_delete
+  name: az network firewall nat-rule collection delete
+  summary: Delete an Azure Firewall NAT rule collection.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule collection delete --collection-name
+                                                   --firewall-name
+                                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_collection_list
+  name: az network firewall nat-rule collection list
+  summary: List Azure Firewall NAT rule collections.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule collection list --firewall-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_collection_show
+  name: az network firewall nat-rule collection show
+  summary: Get the details of an Azure Firewall NAT rule collection.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule collection show --collection-name
+                                                 --firewall-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Collections are created as part of the `az network firewall nat-rule create` command.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/network-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/network-rule.yml
new file mode 100644
index 0000000000..7790a66016
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/network-rule.yml
@@ -0,0 +1,180 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_network-rule
+name: az network firewall network-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall network-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall network rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_network-rule_create
+  name: az network firewall network-rule create
+  summary: Create an Azure Firewall network rule.
+  description: ''
+  syntax: >-
+    az network firewall network-rule create --collection-name
+                                            --destination-ports
+                                            --firewall-name
+                                            --name
+                                            --protocols {Any, ICMP, TCP, UDP}
+                                            --resource-group
+                                            [--action {Allow, Deny}]
+                                            [--description]
+                                            [--dest-addr]
+                                            [--destination-fqdns]
+                                            [--destination-ip-groups]
+                                            [--priority]
+                                            [--source-addresses]
+                                            [--source-ip-groups]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
+    description: ''
+  - isRequired: true
+    name: --destination-ports
+    summary: Space-separated list of destination ports. Use '\*' to match all.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network rule.
+    description: ''
+  - isRequired: true
+    name: --protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of protocols.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Deny
+    summary: The action to apply for the rule collection. Supply only if you want to create the collection.
+    description: ''
+  - name: --description
+    summary: Rule description.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --destination-fqdns
+    summary: Space-separated list of destination FQDNs.
+    description: ''
+  - name: --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule collection from 100 (high) to 65000 (low). Supply only if you want to create the collection.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+- uid: az_network_firewall_network-rule_delete
+  name: az network firewall network-rule delete
+  summary: Delete an Azure Firewall network rule. If you want to delete the last rule in a collection, please delete the collection instead.
+  description: ''
+  syntax: >-
+    az network firewall network-rule delete --collection-name
+                                            --firewall-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_list
+  name: az network firewall network-rule list
+  summary: List Azure Firewall network rules.
+  description: ''
+  syntax: >-
+    az network firewall network-rule list --collection-name
+                                          --firewall-name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_show
+  name: az network firewall network-rule show
+  summary: Get the details of an Azure Firewall network rule.
+  description: ''
+  syntax: >-
+    az network firewall network-rule show --collection-name
+                                          --firewall-name
+                                          --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_network-rule_collection
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+- az_network_firewall_network-rule_create
+- az_network_firewall_network-rule_delete
+- az_network_firewall_network-rule_list
+- az_network_firewall_network-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall network rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/network-rule/collection.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/network-rule/collection.yml
new file mode 100644
index 0000000000..aa375de356
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/network-rule/collection.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_network-rule_collection
+name: az network firewall network-rule collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall network-rule collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall network rule collections.
+description: Collections are created as part of the `az network firewall network-rule create` command.
+directCommands:
+- uid: az_network_firewall_network-rule_collection_delete
+  name: az network firewall network-rule collection delete
+  summary: Delete an Azure Firewall network rule collection.
+  description: ''
+  syntax: >-
+    az network firewall network-rule collection delete --collection-name
+                                                       --firewall-name
+                                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_collection_list
+  name: az network firewall network-rule collection list
+  summary: List Azure Firewall network rule collections.
+  description: ''
+  syntax: >-
+    az network firewall network-rule collection list --firewall-name
+                                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_collection_show
+  name: az network firewall network-rule collection show
+  summary: Get the details of an Azure Firewall network rule collection.
+  description: ''
+  syntax: >-
+    az network firewall network-rule collection show --collection-name
+                                                     --firewall-name
+                                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Collections are created as part of the `az network firewall network-rule create` command.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/policy.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy.yml
new file mode 100644
index 0000000000..ca551d4620
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy.yml
@@ -0,0 +1,252 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy
+name: az network firewall policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure firewall policy.
+description: ''
+directCommands:
+- uid: az_network_firewall_policy_create
+  name: az network firewall policy create
+  summary: Create an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy create --name
+                                      --resource-group
+                                      [--base-policy]
+                                      [--cert-name]
+                                      [--dns-servers]
+                                      [--enable-dns-proxy {false, true}]
+                                      [--fqdns]
+                                      [--identity]
+                                      [--idps-mode {Alert, Deny, Off}]
+                                      [--ip-addresses]
+                                      [--key-vault-secret-id]
+                                      [--location]
+                                      [--sku {Premium, Standard}]
+                                      [--tags]
+                                      [--threat-intel-mode {Alert, Deny, Off}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --base-policy
+    summary: The name or ID of parent firewall policy from which rules are inherited.
+    description: ''
+  - name: --cert-name
+    summary: Name of the CA certificate.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --identity
+    summary: Name or ID of the ManagedIdentity Resource.
+    description: ''
+  - name: --idps-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: IDPS mode.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+  - name: --key-vault-secret-id
+    summary: Secret Id of (base-64 encoded unencrypted pfx) Secret or Certificate object stored in KeyVault.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Premium, Standard
+    summary: SKU of Firewall policy.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+- uid: az_network_firewall_policy_delete
+  name: az network firewall policy delete
+  summary: Delete an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy delete --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_list
+  name: az network firewall policy list
+  summary: List all Azure firewall policies.
+  description: ''
+  syntax: az network firewall policy list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_show
+  name: az network firewall policy show
+  summary: Show an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy show --name
+                                    --resource-group
+                                    [--expand]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+- uid: az_network_firewall_policy_update
+  name: az network firewall policy update
+  summary: Update an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy update --name
+                                      --resource-group
+                                      [--add]
+                                      [--cert-name]
+                                      [--dns-servers]
+                                      [--enable-dns-proxy {false, true}]
+                                      [--force-string]
+                                      [--fqdns]
+                                      [--identity]
+                                      [--idps-mode {Alert, Deny, Off}]
+                                      [--ip-addresses]
+                                      [--key-vault-secret-id]
+                                      [--remove]
+                                      [--set]
+                                      [--sku {Premium, Standard}]
+                                      [--tags]
+                                      [--threat-intel-mode {Alert, Deny, Off}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --cert-name
+    summary: Name of the CA certificate.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --identity
+    summary: Name or ID of the ManagedIdentity Resource.
+    description: ''
+  - name: --idps-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: IDPS mode.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+  - name: --key-vault-secret-id
+    summary: Secret Id of (base-64 encoded unencrypted pfx) Secret or Certificate object stored in KeyVault.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Premium, Standard
+    summary: SKU of Firewall policy.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+commands:
+- az_network_firewall_policy_create
+- az_network_firewall_policy_delete
+- az_network_firewall_policy_intrusion-detection
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+- az_network_firewall_policy_list
+- az_network_firewall_policy_rule-collection-group
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+- az_network_firewall_policy_show
+- az_network_firewall_policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure firewall policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/intrusion-detection.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/intrusion-detection.yml
new file mode 100644
index 0000000000..44de901d7e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/intrusion-detection.yml
@@ -0,0 +1,131 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_intrusion-detection
+name: az network firewall policy intrusion-detection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy intrusion-detection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage intrusion signature rules and bypass rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_policy_intrusion-detection_add
+  name: az network firewall policy intrusion-detection add
+  summary: Add overrided intrusion signature or a bypass rule for intrusion detection.
+  description: ''
+  syntax: >-
+    az network firewall policy intrusion-detection add --policy-name
+                                                       --resource-group
+                                                       [--mode {Alert, Deny, Off}]
+                                                       [--rule-description]
+                                                       [--rule-dest-addresses]
+                                                       [--rule-dest-ip-groups]
+                                                       [--rule-dest-ports]
+                                                       [--rule-name]
+                                                       [--rule-protocol {ANY, ICMP, TCP, UDP}]
+                                                       [--rule-src-addresses]
+                                                       [--rule-src-ip-groups]
+                                                       [--signature-id]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The signature state.
+    description: ''
+  - name: --rule-description
+    summary: Description of the bypass traffic rule.
+    description: ''
+  - name: --rule-dest-addresses
+    summary: Space-separated list of destination IP addresses or ranges for this rule.
+    description: ''
+  - name: --rule-dest-ip-groups
+    summary: Space-separated list of destination IpGroups for this rule.
+    description: ''
+  - name: --rule-dest-ports
+    summary: Space-separated list of destination ports or ranges.
+    description: ''
+  - name: --rule-name
+    summary: Name of the bypass traffic rule.
+    description: ''
+  - name: --rule-protocol
+    parameterValueGroup: ANY, ICMP, TCP, UDP
+    summary: The rule bypass protocol.
+    description: ''
+  - name: --rule-src-addresses
+    summary: Space-separated list of source IP addresses or ranges for this rule.
+    description: ''
+  - name: --rule-src-ip-groups
+    summary: Space-separated list of source IpGroups for this rule.
+    description: ''
+  - name: --signature-id
+    summary: Signature id.
+    description: ''
+- uid: az_network_firewall_policy_intrusion-detection_list
+  name: az network firewall policy intrusion-detection list
+  summary: List all intrusion detection configuration.
+  description: ''
+  syntax: >-
+    az network firewall policy intrusion-detection list --policy-name
+                                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_intrusion-detection_remove
+  name: az network firewall policy intrusion-detection remove
+  summary: Remove overrided intrusion signature or a bypass rule.
+  description: ''
+  syntax: >-
+    az network firewall policy intrusion-detection remove --policy-name
+                                                          --resource-group
+                                                          [--rule-name]
+                                                          [--signature-id]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --rule-name
+    summary: Name of the bypass traffic rule.
+    description: ''
+  - name: --signature-id
+    summary: Signature id.
+    description: ''
+commands:
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage intrusion signature rules and bypass rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group.yml
new file mode 100644
index 0000000000..74887e1bdc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group.yml
@@ -0,0 +1,172 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_rule-collection-group
+name: az network firewall policy rule-collection-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy rule-collection-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure firewall policy rule collection group.
+description: ''
+directCommands:
+- uid: az_network_firewall_policy_rule-collection-group_create
+  name: az network firewall policy rule-collection-group create
+  summary: Create an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group create --name
+                                                            --policy-name
+                                                            --priority
+                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --priority
+    summary: Priority of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_delete
+  name: az network firewall policy rule-collection-group delete
+  summary: Delete an Azure Firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group delete --name
+                                                            --policy-name
+                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_list
+  name: az network firewall policy rule-collection-group list
+  summary: List all Azure firewall policy rule collection groups.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group list --policy-name
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_show
+  name: az network firewall policy rule-collection-group show
+  summary: Show an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group show --name
+                                                          --policy-name
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_update
+  name: az network firewall policy rule-collection-group update
+  summary: Update an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group update --name
+                                                            --policy-name
+                                                            --resource-group
+                                                            [--add]
+                                                            [--force-string]
+                                                            [--priority]
+                                                            [--remove]
+                                                            [--set]
+                                                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --priority
+    summary: Priority of the Firewall Policy Rule Collection Group.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure firewall policy rule collection group.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection.yml
new file mode 100644
index 0000000000..e6c512936d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection.yml
@@ -0,0 +1,275 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_rule-collection-group_collection
+name: az network firewall policy rule-collection-group collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy rule-collection-group collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
+description: >-
+  Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are three kinds of rules which are application rule, network rule and nat rule.
+
+  NAT collection support having a list of nat rule. Filter collection support including a list of rules(network rule or application rule) in it. But all of rules should be the same type.
+directCommands:
+- uid: az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+  name: az network firewall policy rule-collection-group collection add-filter-collection
+  summary: Add a filter collection into an Azure firewall policy rule collection group.
+  description: Common Rule Arguments are used for both Network rule and Application rule. If you want to add more rules into filter collection, please use "az network policy rule-collection-group collection rule add/remove".
+  syntax: >-
+    az network firewall policy rule-collection-group collection add-filter-collection --collection-priority
+                                                                                      --name
+                                                                                      --policy-name
+                                                                                      --rcg-name
+                                                                                      --resource-group
+                                                                                      [--action {Allow, Deny}]
+                                                                                      [--description]
+                                                                                      [--dest-addr]
+                                                                                      [--dest-ipg]
+                                                                                      [--destination-ports]
+                                                                                      [--enable-tls-insp {false, true}]
+                                                                                      [--fqdn-tags]
+                                                                                      [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                                      [--protocols]
+                                                                                      [--rule-name]
+                                                                                      [--rule-type {ApplicationRule, NatRule, NetworkRule}]
+                                                                                      [--source-addresses]
+                                                                                      [--source-ip-groups]
+                                                                                      [--target-fqdns]
+                                                                                      [--target-urls]
+                                                                                      [--web-categories]
+  examples:
+  - summary: Add a filter collection with Network rule into the rule collection group
+    syntax: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name network_rule --rule-type NetworkRule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --destination-ports 12003 12004 --ip-protocols TCP UDP --collection-priority 11002
+  - summary: Add a filter collection with Application rule into the rule collection group
+    syntax: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name application_rule --rule-type ApplicationRule --description "test" --destination-addresses "202.120.36.15" "202.120.36.16" --source-addresses "202.120.36.13" "202.120.36.14" --protocols Http=12800 Https=12801 --fqdn-tags AzureBackup HDInsight --collection-priority 11100
+  requiredParameters:
+  - isRequired: true
+    name: --collection-priority
+    summary: The priority of the rule in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Deny
+    summary: The action type of a rule collection.
+    description: ''
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --dest-ipg --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --enable-tls-insp --enable-tls-inspection
+    parameterValueGroup: false, true
+    summary: Enable flag to terminate TLS connection for this rule.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags for this rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - name: --rule-name
+    summary: The name of rule.
+    description: ''
+  - name: --rule-type
+    parameterValueGroup: ApplicationRule, NatRule, NetworkRule
+    summary: The type of rule.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of FQDNs for this rule.
+    description: ''
+  - name: --target-urls
+    summary: Space-separated list of target urls for this rule.
+    description: ''
+  - name: --web-categories
+    summary: Space-separated list of web categories for this rule.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+  name: az network firewall policy rule-collection-group collection add-nat-collection
+  summary: Add a NAT collection into an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group collection add-nat-collection --collection-priority
+                                                                                   --name
+                                                                                   --policy-name
+                                                                                   --rcg-name
+                                                                                   --resource-group
+                                                                                   [--action {DNAT, SNAT}]
+                                                                                   [--description]
+                                                                                   [--dest-addr]
+                                                                                   [--destination-ports]
+                                                                                   [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                                   [--rule-name]
+                                                                                   [--source-addresses]
+                                                                                   [--source-ip-groups]
+                                                                                   [--translated-address]
+                                                                                   [--translated-fqdn]
+                                                                                   [--translated-port]
+  examples:
+  - summary: Add a NAT collection into the rule collection group
+    syntax: az network firewall policy rule-collection-group collection add-nat-collection -n nat_collection --collection-priority 10003 --policy-name {policy} -g {rg} --rule-collection-group-name {collectiongroup} --action DNAT --rule-name network_rule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --translated-address 128.1.1.1 --translated-port 1234 --destination-ports 12000 12001 --ip-protocols TCP UDP
+  requiredParameters:
+  - isRequired: true
+    name: --collection-priority
+    summary: The priority of the rule in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: DNAT, SNAT
+    summary: The action type of a rule collection.
+    description: ''
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --rule-name
+    summary: The name of rule.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule collection.
+    description: ''
+  - name: --translated-fqdn
+    summary: Translated FQDN for this NAT rule collection.
+    description: ''
+  - name: --translated-port
+    summary: Translated port for this NAT rule collection.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_list
+  name: az network firewall policy rule-collection-group collection list
+  summary: List all rule collections of an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group collection list --policy-name
+                                                                     --rcg-name
+                                                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_remove
+  name: az network firewall policy rule-collection-group collection remove
+  summary: Remove a rule collection from an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group collection remove --name
+                                                                       --policy-name
+                                                                       --rcg-name
+                                                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are three kinds of rules which are application rule, network rule and nat rule.
+
+    NAT collection support having a list of nat rule. Filter collection support including a list of rules(network rule or application rule) in it. But all of rules should be the same type.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection/rule.yml
new file mode 100644
index 0000000000..39216bb787
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection/rule.yml
@@ -0,0 +1,290 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_rule-collection-group_collection_rule
+name: az network firewall policy rule-collection-group collection rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy rule-collection-group collection rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
+description: >-
+  Filter collection supports having a list of network rules or application rules.
+
+  NatRule collection supports including a list of nat rules.
+directCommands:
+- uid: az_network_firewall_policy_rule-collection-group_collection_rule_add
+  name: az network firewall policy rule-collection-group collection rule add
+  summary: Add a rule into an Azure firewall policy rule collection.
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
+  syntax: >-
+    az network firewall policy rule-collection-group collection rule add --collection-name
+                                                                         --name
+                                                                         --policy-name
+                                                                         --rcg-name
+                                                                         --resource-group
+                                                                         --rule-type {ApplicationRule, NatRule, NetworkRule}
+                                                                         [--description]
+                                                                         [--dest-addr]
+                                                                         [--dest-ipg]
+                                                                         [--destination-ports]
+                                                                         [--enable-tls-insp {false, true}]
+                                                                         [--fqdn-tags]
+                                                                         [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                         [--protocols]
+                                                                         [--source-addresses]
+                                                                         [--source-ip-groups]
+                                                                         [--target-fqdns]
+                                                                         [--target-urls]
+                                                                         [--translated-address]
+                                                                         [--translated-port]
+                                                                         [--web-categories]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name
+    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-type
+    parameterValueGroup: ApplicationRule, NatRule, NetworkRule
+    summary: The type of rule.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --dest-ipg --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --enable-tls-insp --enable-tls-inspection
+    parameterValueGroup: false, true
+    summary: Enable flag to terminate TLS connection for this rule.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags for this rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of FQDNs for this rule.
+    description: ''
+  - name: --target-urls
+    summary: Space-separated list of target urls for this rule.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule collection.
+    description: ''
+  - name: --translated-port
+    summary: Translated port for this NAT rule collection.
+    description: ''
+  - name: --web-categories
+    summary: Space-separated list of web categories for this rule.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_rule_remove
+  name: az network firewall policy rule-collection-group collection rule remove
+  summary: Remove a rule from an Azure firewall policy rule collection.
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
+  syntax: >-
+    az network firewall policy rule-collection-group collection rule remove --collection-name
+                                                                            --name
+                                                                            --policy-name
+                                                                            --rcg-name
+                                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name
+    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_rule_update
+  name: az network firewall policy rule-collection-group collection rule update
+  summary: Update a rule of an Azure firewall policy rule collection.
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
+  syntax: >-
+    az network firewall policy rule-collection-group collection rule update --collection-name
+                                                                            --name
+                                                                            --policy-name
+                                                                            --rcg-name
+                                                                            --resource-group
+                                                                            [--add]
+                                                                            [--description]
+                                                                            [--dest-addr]
+                                                                            [--dest-ipg]
+                                                                            [--destination-ports]
+                                                                            [--enable-tls-insp {false, true}]
+                                                                            [--force-string]
+                                                                            [--fqdn-tags]
+                                                                            [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                            [--protocols]
+                                                                            [--remove]
+                                                                            [--set]
+                                                                            [--source-addresses]
+                                                                            [--source-ip-groups]
+                                                                            [--target-fqdns]
+                                                                            [--target-urls]
+                                                                            [--translated-address]
+                                                                            [--translated-port]
+                                                                            [--web-categories]
+  examples:
+  - summary: Update a rule of an Azure firewall policy rule collection.
+    syntax: az network firewall policy rule-collection-group collection rule update -g {rg} --policy-name {policy} --rule-collection-group-name {rcg} --collection-name {cn} -n {rule_name} --target-fqdns XXX
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name
+    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --dest-ipg --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --enable-tls-insp --enable-tls-inspection
+    parameterValueGroup: false, true
+    summary: Enable flag to terminate TLS connection for this rule.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags for this rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of FQDNs for this rule.
+    description: ''
+  - name: --target-urls
+    summary: Space-separated list of target urls for this rule.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule collection.
+    description: ''
+  - name: --translated-port
+    summary: Translated port for this NAT rule collection.
+    description: ''
+  - name: --web-categories
+    summary: Space-separated list of web categories for this rule.
+    description: ''
+commands:
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/firewall/threat-intel-allowlist.yml b/2017-03-09-profile/docs-ref-autogen/network/firewall/threat-intel-allowlist.yml
new file mode 100644
index 0000000000..fd99421e64
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/firewall/threat-intel-allowlist.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_threat-intel-allowlist
+name: az network firewall threat-intel-allowlist
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall threat-intel-allowlist** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall Threat Intelligence Allow List.
+description: ''
+directCommands:
+- uid: az_network_firewall_threat-intel-allowlist_create
+  name: az network firewall threat-intel-allowlist create
+  summary: Create an Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist create --name
+                                                      --resource-group
+                                                      [--fqdns]
+                                                      [--ip-addresses]
+  examples:
+  - summary: Create a threat intelligence allow list
+    syntax: az network firewall threat-intel-allowlist create -g MyResourceGroup -n MyFirewall --ip-addresses 10.0.0.0 10.0.0.1 --fqdns *.microsoft.com www.bing.com *google.com
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+- uid: az_network_firewall_threat-intel-allowlist_delete
+  name: az network firewall threat-intel-allowlist delete
+  summary: Delete an Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist delete --name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_threat-intel-allowlist_show
+  name: az network firewall threat-intel-allowlist show
+  summary: Get the details of an Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist show --name
+                                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_threat-intel-allowlist_update
+  name: az network firewall threat-intel-allowlist update
+  summary: Update Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist update --name
+                                                      --resource-group
+                                                      [--add]
+                                                      [--force-string]
+                                                      [--fqdns]
+                                                      [--ip-addresses]
+                                                      [--remove]
+                                                      [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_network_firewall_threat-intel-allowlist_create
+- az_network_firewall_threat-intel-allowlist_delete
+- az_network_firewall_threat-intel-allowlist_show
+- az_network_firewall_threat-intel-allowlist_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall Threat Intelligence Allow List.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door.yml
new file mode 100644
index 0000000000..83247c1ac7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door.yml
@@ -0,0 +1,417 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door
+name: az network front-door
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Doors.
+description: ''
+directCommands:
+- uid: az_network_front-door_check-custom-domain
+  name: az network front-door check-custom-domain
+  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
+  description: ''
+  syntax: >-
+    az network front-door check-custom-domain --host-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --host-name
+    summary: Required. The host name of the custom domain. Must be a domain name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_check-name-availability
+  name: az network front-door check-name-availability
+  summary: Check the availability of a Front Door resource name.
+  description: ''
+  syntax: >-
+    az network front-door check-name-availability --name
+                                                  --resource-type {Microsoft.Network/frontDoors, Microsoft.Network/frontDoors/frontendEndpoints}
+  examples:
+  - summary: Check the availability of a Front Door resource name.
+    syntax: az network front-door check-name-availability --name frontdoor1 --resource-type Microsoft.Network/frontDoors
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The resource name to be validated.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    parameterValueGroup: Microsoft.Network/frontDoors, Microsoft.Network/frontDoors/frontendEndpoints
+    summary: The type of the resource whose name is to be validated.
+    description: ''
+- uid: az_network_front-door_create
+  name: az network front-door create
+  summary: Create a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door create --backend-address
+                                 --name
+                                 --resource-group
+                                 [--accepted-protocols]
+                                 [--backend-host-header]
+                                 [--disabled {false, true}]
+                                 [--enforce-certificate-name-check {Disabled, Enabled}]
+                                 [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                 [--friendly-name]
+                                 [--frontend-host-name]
+                                 [--interval]
+                                 [--no-wait]
+                                 [--path]
+                                 [--patterns]
+                                 [--probeMethod {GET, HEAD}]
+                                 [--protocol {Http, Https}]
+                                 [--send-recv-timeout]
+                                 [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --backend-address
+    summary: FQDN of the backend endpoint.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accepted-protocols
+    summary: 'Space-separated list of protocols to accept. Default: Http.'
+    description: ''
+  - name: --backend-host-header
+    summary: Host header sent to the backend.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --enforce-certificate-name-check
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
+    description: ''
+  - name: --forwarding-protocol
+    defaultValue: MatchRequest
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of the Front Door.
+    description: ''
+  - name: --frontend-host-name
+    summary: Domain name of the frontend endpoint.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Interval in seconds between probes.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --path
+    defaultValue: /
+    summary: Path to probe.
+    description: ''
+  - name: --patterns
+    summary: "Space-separated list of patterns to match. Default: '/\\*'."
+    description: ''
+  - name: --probeMethod
+    defaultValue: HEAD
+    parameterValueGroup: GET, HEAD
+    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
+    description: ''
+  - name: --protocol
+    defaultValue: Https
+    parameterValueGroup: Http, Https
+    summary: Protocol to use for sending probes.
+    description: ''
+  - name: --send-recv-timeout
+    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_front-door_delete
+  name: az network front-door delete
+  summary: Delete a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door delete --name
+                                 --resource-group
+                                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_front-door_list
+  name: az network front-door list
+  summary: List Front Doors.
+  description: ''
+  syntax: az network front-door list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_purge-endpoint
+  name: az network front-door purge-endpoint
+  summary: Removes a content from Front Door.
+  description: ''
+  syntax: >-
+    az network front-door purge-endpoint --content-paths
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --content-paths
+    summary: The path to the content to be purged. Can describe a file path or a wildcard directory.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_show
+  name: az network front-door show
+  summary: Get the details of a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door show --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_update
+  name: az network front-door update
+  summary: Update settings of a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door update --name
+                                 --resource-group
+                                 [--add]
+                                 [--enforce-certificate-name-check {Disabled, Enabled}]
+                                 [--force-string]
+                                 [--remove]
+                                 [--send-recv-timeout]
+                                 [--set]
+                                 [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --enforce-certificate-name-check
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --send-recv-timeout
+    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_front-door_wait
+  name: az network front-door wait
+  summary: Place the CLI in a waiting state until a condition of the Front Door is met.
+  description: ''
+  syntax: >-
+    az network front-door wait --name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Wait until a front door is created.
+    syntax: az network front-door wait -g MyResourceGroup --name frontdoor1 --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_front-door_backend-pool
+- az_network_front-door_backend-pool_backend
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+- az_network_front-door_backend-pool_create
+- az_network_front-door_backend-pool_delete
+- az_network_front-door_backend-pool_list
+- az_network_front-door_backend-pool_show
+- az_network_front-door_check-custom-domain
+- az_network_front-door_check-name-availability
+- az_network_front-door_create
+- az_network_front-door_delete
+- az_network_front-door_frontend-endpoint
+- az_network_front-door_frontend-endpoint_create
+- az_network_front-door_frontend-endpoint_delete
+- az_network_front-door_frontend-endpoint_disable-https
+- az_network_front-door_frontend-endpoint_enable-https
+- az_network_front-door_frontend-endpoint_list
+- az_network_front-door_frontend-endpoint_show
+- az_network_front-door_frontend-endpoint_wait
+- az_network_front-door_list
+- az_network_front-door_load-balancing
+- az_network_front-door_load-balancing_create
+- az_network_front-door_load-balancing_delete
+- az_network_front-door_load-balancing_list
+- az_network_front-door_load-balancing_show
+- az_network_front-door_load-balancing_update
+- az_network_front-door_probe
+- az_network_front-door_probe_create
+- az_network_front-door_probe_delete
+- az_network_front-door_probe_list
+- az_network_front-door_probe_show
+- az_network_front-door_probe_update
+- az_network_front-door_purge-endpoint
+- az_network_front-door_routing-rule
+- az_network_front-door_routing-rule_create
+- az_network_front-door_routing-rule_delete
+- az_network_front-door_routing-rule_list
+- az_network_front-door_routing-rule_show
+- az_network_front-door_routing-rule_update
+- az_network_front-door_rules-engine
+- az_network_front-door_rules-engine_delete
+- az_network_front-door_rules-engine_list
+- az_network_front-door_rules-engine_rule
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+- az_network_front-door_rules-engine_show
+- az_network_front-door_show
+- az_network_front-door_update
+- az_network_front-door_waf-policy
+- az_network_front-door_waf-policy_create
+- az_network_front-door_waf-policy_delete
+- az_network_front-door_waf-policy_list
+- az_network_front-door_waf-policy_managed-rule-definition
+- az_network_front-door_waf-policy_managed-rule-definition_list
+- az_network_front-door_waf-policy_managed-rules
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+- az_network_front-door_waf-policy_rule
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+- az_network_front-door_waf-policy_show
+- az_network_front-door_waf-policy_update
+- az_network_front-door_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Doors.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/backend-pool.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/backend-pool.yml
new file mode 100644
index 0000000000..8caef02025
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/backend-pool.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_backend-pool
+name: az network front-door backend-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door backend-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door backend pools.
+description: ''
+directCommands:
+- uid: az_network_front-door_backend-pool_create
+  name: az network front-door backend-pool create
+  summary: Create a Front Door backend pool.
+  description: Since a backend pool must contain a backend, this command also creates the first backend. To add additional backends, use the `az network front-door backend-pool backend add` command.
+  syntax: >-
+    az network front-door backend-pool create --address
+                                              --front-door-name
+                                              --load-balancing
+                                              --name
+                                              --probe
+                                              --resource-group
+                                              [--backend-host-header]
+                                              [--disabled {false, true}]
+                                              [--http-port]
+                                              [--https-port]
+                                              [--priority]
+                                              [--weight]
+  requiredParameters:
+  - isRequired: true
+    name: --address
+    summary: FQDN of the backend endpoint.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --load-balancing
+    summary: Name or ID of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --probe
+    summary: Name or ID of the probe settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-host-header
+    summary: Host header sent to the backend.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --http-port
+    defaultValue: "80"
+    summary: HTTP TCP port number.
+    description: ''
+  - name: --https-port
+    defaultValue: "443"
+    summary: HTTPS TCP port number.
+    description: ''
+  - name: --priority
+    defaultValue: "1"
+    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
+    description: ''
+  - name: --weight
+    defaultValue: "50"
+    summary: Weight of this endpoint for load balancing purposes.
+    description: ''
+- uid: az_network_front-door_backend-pool_delete
+  name: az network front-door backend-pool delete
+  summary: Delete a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool delete --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_backend-pool_list
+  name: az network front-door backend-pool list
+  summary: List Front Door backend pools.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool list --front-door-name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_backend-pool_show
+  name: az network front-door backend-pool show
+  summary: Get the details of a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool show --front-door-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_backend-pool_backend
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+- az_network_front-door_backend-pool_create
+- az_network_front-door_backend-pool_delete
+- az_network_front-door_backend-pool_list
+- az_network_front-door_backend-pool_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door backend pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/backend-pool/backend.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/backend-pool/backend.yml
new file mode 100644
index 0000000000..1e533acda0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/backend-pool/backend.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_backend-pool_backend
+name: az network front-door backend-pool backend
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door backend-pool backend** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage backends of Front Door backend pools.
+description: ''
+directCommands:
+- uid: az_network_front-door_backend-pool_backend_add
+  name: az network front-door backend-pool backend add
+  summary: Add a backend to a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool backend add --address
+                                                   --front-door-name
+                                                   --pool-name
+                                                   --resource-group
+                                                   [--backend-host-header]
+                                                   [--disabled {false, true}]
+                                                   [--http-port]
+                                                   [--https-port]
+                                                   [--priority]
+                                                   [--private-link-alias]
+                                                   [--private-link-approval-message]
+                                                   [--private-link-location]
+                                                   [--private-link-resource-id]
+                                                   [--weight]
+  requiredParameters:
+  - isRequired: true
+    name: --address
+    summary: FQDN of the backend endpoint.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-host-header
+    summary: Host header sent to the backend.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --http-port
+    defaultValue: "80"
+    summary: HTTP TCP port number.
+    description: ''
+  - name: --https-port
+    defaultValue: "443"
+    summary: HTTPS TCP port number.
+    description: ''
+  - name: --priority
+    defaultValue: "1"
+    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
+    description: ''
+  - name: --private-link-alias
+    summary: The Alias of the Private Link resource. Populating this optional field indicates that this backend is 'Private'.
+    description: ''
+  - name: --private-link-approval-message
+    summary: A custom message to be included in the approval request to connect to the Private Link.
+    description: ''
+  - name: --private-link-location
+    summary: The location of the Private Link resource. Required only if 'privateLinkResourceId' is populated.
+    description: ''
+  - name: --private-link-resource-id
+    summary: The Resource Id of the Private Link. Populating this optional field indicates that this backend is 'Private'.
+    description: ''
+  - name: --weight
+    defaultValue: "50"
+    summary: Weight of this endpoint for load balancing purposes.
+    description: ''
+- uid: az_network_front-door_backend-pool_backend_list
+  name: az network front-door backend-pool backend list
+  summary: List backends of a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool backend list --front-door-name
+                                                    --pool-name
+                                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_backend-pool_backend_remove
+  name: az network front-door backend-pool backend remove
+  summary: Remove a backend from a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool backend remove --front-door-name
+                                                      --index
+                                                      --pool-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: Index of the backend to remove (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage backends of Front Door backend pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/frontend-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/frontend-endpoint.yml
new file mode 100644
index 0000000000..82513715a9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/frontend-endpoint.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_frontend-endpoint
+name: az network front-door frontend-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door frontend-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door frontend endpoints.
+description: ''
+directCommands:
+- uid: az_network_front-door_frontend-endpoint_create
+  name: az network front-door frontend-endpoint create
+  summary: Create a Front Door frontend endpoint.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint create --front-door-name
+                                                   --host-name
+                                                   --name
+                                                   --resource-group
+                                                   [--session-affinity-enabled {Disabled, Enabled}]
+                                                   [--session-affinity-ttl]
+                                                   [--waf-policy]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --host-name
+    summary: Domain name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --session-affinity-enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to allow session affinity on this host.
+    description: ''
+  - name: --session-affinity-ttl
+    summary: The TTL to use in seconds for session affinity.
+    description: ''
+  - name: --waf-policy
+    summary: Name or ID of a web application firewall policy.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_delete
+  name: az network front-door frontend-endpoint delete
+  summary: Delete a Front Door frontend endpoint.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint delete --front-door-name
+                                                   --name
+                                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_disable-https
+  name: az network front-door frontend-endpoint disable-https
+  summary: Disable HTTPS protocol for a custom domain.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint disable-https --front-door-name
+                                                          --name
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_enable-https
+  name: az network front-door frontend-endpoint enable-https
+  summary: Enable HTTPS protocol for a custom domain.
+  description: HTTPS protocol for a custom domain can be enabled using Front Door managed certificate or using your own certificate in Azure Key Vault. For Azure Key Vault, right permissions need to be set for Front Door to access the Key vault. Learn more at https://aka.ms/FrontDoorCustomDomain.
+  syntax: >-
+    az network front-door frontend-endpoint enable-https --front-door-name
+                                                         --name
+                                                         --resource-group
+                                                         [--certificate-source {AzureKeyVault, FrontDoor}]
+                                                         [--minimum-tls-version {1.0, 1.2}]
+                                                         [--secret-name]
+                                                         [--secret-version]
+                                                         [--vault-id]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --certificate-source
+    defaultValue: FrontDoor
+    parameterValueGroup: AzureKeyVault, FrontDoor
+    summary: Certificate source to enable HTTPS.
+    description: ''
+  - name: --minimum-tls-version
+    defaultValue: "1.2"
+    parameterValueGroup: 1.0, 1.2
+    summary: The minimum TLS version required from the clients to establish an SSL handshake with Front Door.
+    description: ''
+  - name: --secret-name
+    summary: The name of the Key Vault secret representing the full certificate PFX.
+    description: ''
+  - name: --secret-version
+    summary: The version of the Key Vault secret representing the full certificate PFX, the "Latest" version will always be used if not specified and your certificate will be auto-rotated when a new version of secret generated.
+    description: ''
+  - name: --vault-id
+    summary: The resource id of the Key Vault containing the SSL certificate.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_list
+  name: az network front-door frontend-endpoint list
+  summary: List Front Door frontend endpoints.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint list --front-door-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_show
+  name: az network front-door frontend-endpoint show
+  summary: Get the details of a Front Door frontend endpoint.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint show --front-door-name
+                                                 --name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_wait
+  name: az network front-door frontend-endpoint wait
+  summary: Place the CLI in a waiting state until a condition of the Front Door frontend endpoint is met.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint wait --front-door-name
+                                                 --name
+                                                 --resource-group
+                                                 [--created]
+                                                 [--custom]
+                                                 [--deleted]
+                                                 [--exists]
+                                                 [--interval]
+                                                 [--timeout]
+                                                 [--updated]
+  examples:
+  - summary: Wait until a front endpoint's certificate is deployed.
+    syntax: az network front-door frontend-endpoint wait -g MyResourceGroup --name endpoint1 --front-door-name frontdoor1 --custom "customHttpsProvisioningState=='Enabled'"
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_front-door_frontend-endpoint_create
+- az_network_front-door_frontend-endpoint_delete
+- az_network_front-door_frontend-endpoint_disable-https
+- az_network_front-door_frontend-endpoint_enable-https
+- az_network_front-door_frontend-endpoint_list
+- az_network_front-door_frontend-endpoint_show
+- az_network_front-door_frontend-endpoint_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door frontend endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/load-balancing.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/load-balancing.yml
new file mode 100644
index 0000000000..f513fdb524
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/load-balancing.yml
@@ -0,0 +1,177 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_load-balancing
+name: az network front-door load-balancing
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door load-balancing** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door load-balancing settings.
+description: ''
+directCommands:
+- uid: az_network_front-door_load-balancing_create
+  name: az network front-door load-balancing create
+  summary: Create Front Door load-balancing settings.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing create --front-door-name
+                                                --name
+                                                --resource-group
+                                                --sample-size
+                                                --successful-samples-required
+                                                [--additional-latency]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sample-size
+    summary: The number of samples to consider for load balancing decisions.
+    description: ''
+  - isRequired: true
+    name: --successful-samples-required -s
+    summary: The number of samples within the sample period that must succeed.
+    description: ''
+  optionalParameters:
+  - name: --additional-latency
+    summary: The additional latency in milliseconds for probes to fall in the lowest latency bucket.
+    description: ''
+- uid: az_network_front-door_load-balancing_delete
+  name: az network front-door load-balancing delete
+  summary: Delete Front Door load-balancing settings.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing delete --front-door-name
+                                                --name
+                                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_load-balancing_list
+  name: az network front-door load-balancing list
+  summary: List Front Door load-balancing settingss.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing list --front-door-name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_load-balancing_show
+  name: az network front-door load-balancing show
+  summary: Get the details of a Front Door load-balancing settings bundle.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing show --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_load-balancing_update
+  name: az network front-door load-balancing update
+  summary: Update Front Door load-balancing settings.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing update --front-door-name
+                                                --name
+                                                --resource-group
+                                                [--add]
+                                                [--additional-latency]
+                                                [--force-string]
+                                                [--remove]
+                                                [--sample-size]
+                                                [--set]
+                                                [--successful-samples-required]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --additional-latency
+    summary: The additional latency in milliseconds for probes to fall in the lowest latency bucket.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --sample-size
+    summary: The number of samples to consider for load balancing decisions.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --successful-samples-required -s
+    summary: The number of samples within the sample period that must succeed.
+    description: ''
+commands:
+- az_network_front-door_load-balancing_create
+- az_network_front-door_load-balancing_delete
+- az_network_front-door_load-balancing_list
+- az_network_front-door_load-balancing_show
+- az_network_front-door_load-balancing_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door load-balancing settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/probe.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/probe.yml
new file mode 100644
index 0000000000..5dfccbbe32
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/probe.yml
@@ -0,0 +1,185 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_probe
+name: az network front-door probe
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door probe** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door health probe settings.
+description: ''
+directCommands:
+- uid: az_network_front-door_probe_create
+  name: az network front-door probe create
+  summary: Create Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe create --front-door-name
+                                       --interval
+                                       --name
+                                       --path
+                                       --resource-group
+                                       [--enabled {Disabled, Enabled}]
+                                       [--probeMethod {GET, HEAD}]
+                                       [--protocol {Http, Https}]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --interval
+    summary: Interval in seconds between probes.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --path
+    summary: Path to probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled status.
+    description: ''
+  - name: --probeMethod
+    defaultValue: HEAD
+    parameterValueGroup: GET, HEAD
+    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Http, Https
+    summary: Protocol to use for sending probes.
+    description: ''
+- uid: az_network_front-door_probe_delete
+  name: az network front-door probe delete
+  summary: Delete Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe delete --front-door-name
+                                       --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_probe_list
+  name: az network front-door probe list
+  summary: List Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe list --front-door-name
+                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_probe_show
+  name: az network front-door probe show
+  summary: Get the details of a Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe show --front-door-name
+                                     --name
+                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_probe_update
+  name: az network front-door probe update
+  summary: Update Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe update --front-door-name
+                                       --name
+                                       --resource-group
+                                       [--enabled {Disabled, Enabled}]
+                                       [--interval]
+                                       [--path]
+                                       [--probeMethod {GET, HEAD}]
+                                       [--protocol {Http, Https}]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled status.
+    description: ''
+  - name: --interval
+    summary: Interval in seconds between probes.
+    description: ''
+  - name: --path
+    summary: Path to probe.
+    description: ''
+  - name: --probeMethod
+    parameterValueGroup: GET, HEAD
+    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Http, Https
+    summary: Protocol to use for sending probes.
+    description: ''
+commands:
+- az_network_front-door_probe_create
+- az_network_front-door_probe_delete
+- az_network_front-door_probe_list
+- az_network_front-door_probe_show
+- az_network_front-door_probe_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door health probe settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/routing-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/routing-rule.yml
new file mode 100644
index 0000000000..0674c908ee
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/routing-rule.yml
@@ -0,0 +1,333 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_routing-rule
+name: az network front-door routing-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door routing-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door routing rules.
+description: ''
+directCommands:
+- uid: az_network_front-door_routing-rule_create
+  name: az network front-door routing-rule create
+  summary: Create a Front Door routing rule.
+  description: >-
+    Create a Front Door routing rule to either forward the requests to a backend or redirect the users to a different URL.
+
+
+    Example 1: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Forward --backend-pool DefaultBackendPool -n forwardRoutingrule1 --patterns /forward1
+
+
+    Example 2: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Redirect --custom-host redirecthost.com -n redirectRouteRule1 --patterns /redirect1 --custom-query-string querystring.
+  syntax: >-
+    az network front-door routing-rule create --front-door-name
+                                              --frontend-endpoints
+                                              --name
+                                              --resource-group
+                                              --route-type {Forward, Redirect}
+                                              [--accepted-protocols]
+                                              [--backend-pool]
+                                              [--cache-duration]
+                                              [--caching {Disabled, Enabled}]
+                                              [--custom-forwarding-path]
+                                              [--custom-fragment]
+                                              [--custom-host]
+                                              [--custom-path]
+                                              [--custom-query-string]
+                                              [--disabled {false, true}]
+                                              [--dynamic-compression {Disabled, Enabled}]
+                                              [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--patterns]
+                                              [--query-parameter-strip-directive {StripAll, StripAllExcept, StripNone, StripOnly}]
+                                              [--query-parameters]
+                                              [--redirect-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--redirect-type {Found, Moved, PermanentRedirect, TemporaryRedirect}]
+                                              [--rules-engine]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --frontend-endpoints
+    summary: Space-separated list of frontend endpoint names or IDs.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --route-type
+    parameterValueGroup: Forward, Redirect
+    summary: Route type to define how Front Door should handle requests for this route i.e. forward them to a backend or redirect the users to a different URL.
+    description: ''
+  optionalParameters:
+  - name: --accepted-protocols
+    summary: 'Space-separated list of protocols to accept. Default: Http.'
+    description: ''
+  - name: --backend-pool
+    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
+    description: ''
+  - name: --cache-duration
+    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
+    description: ''
+  - name: --caching
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to enable caching for this route.
+    description: ''
+  - name: --custom-forwarding-path
+    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
+    description: ''
+  - name: --custom-fragment
+    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
+    description: ''
+  - name: --custom-host
+    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
+    description: ''
+  - name: --custom-path
+    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
+    description: ''
+  - name: --custom-query-string
+    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --dynamic-compression
+    parameterValueGroup: Disabled, Enabled
+    summary: Use dynamic compression for cached content.
+    description: ''
+  - name: --forwarding-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --patterns
+    summary: "Space-separated list of patterns to match. Default: '/\\*'."
+    description: ''
+  - name: --query-parameter-strip-directive
+    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
+    summary: Treatment of URL query terms when forming the cache key.
+    description: ''
+  - name: --query-parameters
+    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
+    description: ''
+  - name: --redirect-protocol
+    defaultValue: MatchRequest
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: The protocol of the destination to where the traffic is redirected.
+    description: ''
+  - name: --redirect-type
+    defaultValue: Moved
+    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
+    summary: The redirect type the rule will use when redirecting traffic.
+    description: ''
+  - name: --rules-engine
+    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
+    description: ''
+- uid: az_network_front-door_routing-rule_delete
+  name: az network front-door routing-rule delete
+  summary: Delete a Front Door routing rule.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule delete --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_routing-rule_list
+  name: az network front-door routing-rule list
+  summary: List Front Door routing rules.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule list --front-door-name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_routing-rule_show
+  name: az network front-door routing-rule show
+  summary: Get the details of a Front Door routing rule.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule show --front-door-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_routing-rule_update
+  name: az network front-door routing-rule update
+  summary: Update a Front Door routing rule.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule update --front-door-name
+                                              --name
+                                              --resource-group
+                                              [--accepted-protocols]
+                                              [--add]
+                                              [--backend-pool]
+                                              [--cache-duration]
+                                              [--caching {Disabled, Enabled}]
+                                              [--custom-forwarding-path]
+                                              [--custom-fragment]
+                                              [--custom-host]
+                                              [--custom-path]
+                                              [--custom-query-string]
+                                              [--dynamic-compression {Disabled, Enabled}]
+                                              [--enabled {Disabled, Enabled}]
+                                              [--force-string]
+                                              [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--frontend-endpoints]
+                                              [--patterns]
+                                              [--query-parameter-strip-directive {StripAll, StripAllExcept, StripNone, StripOnly}]
+                                              [--query-parameters]
+                                              [--redirect-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--redirect-type {Found, Moved, PermanentRedirect, TemporaryRedirect}]
+                                              [--remove]
+                                              [--rules-engine]
+                                              [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accepted-protocols
+    summary: 'Space-separated list of protocols to accept. Default: Http.'
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --backend-pool
+    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
+    description: ''
+  - name: --cache-duration
+    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
+    description: ''
+  - name: --caching
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to enable caching for this route.
+    description: ''
+  - name: --custom-forwarding-path
+    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
+    description: ''
+  - name: --custom-fragment
+    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
+    description: ''
+  - name: --custom-host
+    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
+    description: ''
+  - name: --custom-path
+    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
+    description: ''
+  - name: --custom-query-string
+    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
+    description: ''
+  - name: --dynamic-compression
+    parameterValueGroup: Disabled, Enabled
+    summary: Use dynamic compression for cached content.
+    description: ''
+  - name: --enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled status.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --forwarding-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --frontend-endpoints
+    summary: Space-separated list of frontend endpoint names or IDs.
+    description: ''
+  - name: --patterns
+    summary: "Space-separated list of patterns to match. Default: '/\\*'."
+    description: ''
+  - name: --query-parameter-strip-directive
+    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
+    summary: Treatment of URL query terms when forming the cache key.
+    description: ''
+  - name: --query-parameters
+    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
+    description: ''
+  - name: --redirect-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: The protocol of the destination to where the traffic is redirected.
+    description: ''
+  - name: --redirect-type
+    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
+    summary: The redirect type the rule will use when redirecting traffic.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --rules-engine
+    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_network_front-door_routing-rule_create
+- az_network_front-door_routing-rule_delete
+- az_network_front-door_routing-rule_list
+- az_network_front-door_routing-rule_show
+- az_network_front-door_routing-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door routing rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine.yml
new file mode 100644
index 0000000000..540224e052
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine.yml
@@ -0,0 +1,103 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine
+name: az network front-door rules-engine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door rules engines.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_delete
+  name: az network front-door rules-engine delete
+  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine delete --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Rules Engine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_rules-engine_list
+  name: az network front-door rules-engine list
+  summary: Lists all of the Rules Engine Configurations within a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine list --front-door-name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_rules-engine_show
+  name: az network front-door rules-engine show
+  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine show --front-door-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Rules Engine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_delete
+- az_network_front-door_rules-engine_list
+- az_network_front-door_rules-engine_rule
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+- az_network_front-door_rules-engine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door rules engines.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule.yml
new file mode 100644
index 0000000000..f147293adc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule.yml
@@ -0,0 +1,234 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine_rule
+name: az network front-door rules-engine rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Rules Engine rules.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_rule_create
+  name: az network front-door rules-engine rule create
+  summary: Create a Rules Engine rule for a Front Door.
+  description: This command allows creating Rules Engine configuration with Header action type. To add additional actions like Route overrides, use the `az network front-door rules-engine rule action add` command.
+  syntax: >-
+    az network front-door rules-engine rule create --action-type {RequestHeader, ResponseHeader}
+                                                   --front-door-name
+                                                   --name
+                                                   --priority
+                                                   --resource-group
+                                                   --rules-engine-name
+                                                   [--header-action {Append, Delete, Overwrite}]
+                                                   [--header-name]
+                                                   [--header-value]
+                                                   [--match-processing-behavior {Continue, Stop}]
+                                                   [--match-values]
+                                                   [--match-variable {IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri}]
+                                                   [--negate-condition {false, true}]
+                                                   [--operator {Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual}]
+                                                   [--selector]
+                                                   [--transforms {Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode}]
+  requiredParameters:
+  - isRequired: true
+    name: --action-type
+    parameterValueGroup: RequestHeader, ResponseHeader
+    summary: Action type to apply for a rule.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --priority
+    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --header-action
+    parameterValueGroup: Append, Delete, Overwrite
+    summary: Header action type for the requests.
+    description: ''
+  - name: --header-name
+    summary: Name of the header to modify.
+    description: ''
+  - name: --header-value
+    summary: Value of the header.
+    description: ''
+  - name: --match-processing-behavior
+    parameterValueGroup: Continue, Stop
+    summary: Whether to stop processing rules after conditions in a rule is satisfied.
+    description: ''
+  - name: --match-values
+    summary: Space-separated list of values to match against.
+    description: ''
+  - name: --match-variable
+    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
+    summary: Name of the match condition.
+    description: ''
+  - name: --negate-condition
+    parameterValueGroup: false, true
+    summary: Applies "Not" to the operator.
+    description: ''
+  - name: --operator
+    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
+    summary: Operator of the match condition.
+    description: ''
+  - name: --selector
+    summary: Optional selector for the match condition variable.
+    description: ''
+  - name: --transforms
+    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
+    summary: Space-separated list of transforms to apply.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_delete
+  name: az network front-door rules-engine rule delete
+  summary: Delete a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule delete --front-door-name
+                                                   --name
+                                                   --resource-group
+                                                   --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_list
+  name: az network front-door rules-engine rule list
+  summary: List rules of a Rules Engine configuration.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule list --front-door-name
+                                                 --name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Rules Engine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_show
+  name: az network front-door rules-engine rule show
+  summary: Get the details of a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule show --front-door-name
+                                                 --name
+                                                 --resource-group
+                                                 --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_update
+  name: az network front-door rules-engine rule update
+  summary: Update Rules Engine configuration of a rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule update --front-door-name
+                                                   --name
+                                                   --resource-group
+                                                   --rules-engine-name
+                                                   [--match-processing-behavior {Continue, Stop}]
+                                                   [--priority]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --match-processing-behavior
+    parameterValueGroup: Continue, Stop
+    summary: Whether to stop processing rules after conditions in a rule is satisfied.
+    description: ''
+  - name: --priority
+    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Rules Engine rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule/action.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule/action.yml
new file mode 100644
index 0000000000..01b0b38ee8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule/action.yml
@@ -0,0 +1,204 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine_rule_action
+name: az network front-door rules-engine rule action
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine rule action** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Rules Engine actions for Front Door.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_rule_action_add
+  name: az network front-door rules-engine rule action add
+  summary: Add an action to a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule action add --action-type {ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader}
+                                                       --front-door-name
+                                                       --name
+                                                       --resource-group
+                                                       --rules-engine-name
+                                                       [--backend-pool]
+                                                       [--cache-duration]
+                                                       [--caching {Disabled, Enabled}]
+                                                       [--custom-forwarding-path]
+                                                       [--custom-fragment]
+                                                       [--custom-host]
+                                                       [--custom-path]
+                                                       [--custom-query-string]
+                                                       [--dynamic-compression {Disabled, Enabled}]
+                                                       [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                                       [--header-action {Append, Delete, Overwrite}]
+                                                       [--header-name]
+                                                       [--header-value]
+                                                       [--query-parameter-strip-directive {StripAll, StripAllExcept, StripNone, StripOnly}]
+                                                       [--query-parameters]
+                                                       [--redirect-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                                       [--redirect-type {Found, Moved, PermanentRedirect, TemporaryRedirect}]
+  requiredParameters:
+  - isRequired: true
+    name: --action-type
+    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
+    summary: Action type to apply for a rule.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --backend-pool
+    summary: Name or ID of a backend pool.
+    description: ''
+  - name: --cache-duration
+    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
+    description: ''
+  - name: --caching
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to enable caching for this route.
+    description: ''
+  - name: --custom-forwarding-path
+    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
+    description: ''
+  - name: --custom-fragment
+    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
+    description: ''
+  - name: --custom-host
+    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
+    description: ''
+  - name: --custom-path
+    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
+    description: ''
+  - name: --custom-query-string
+    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
+    description: ''
+  - name: --dynamic-compression
+    parameterValueGroup: Disabled, Enabled
+    summary: Use dynamic compression for cached content.
+    description: ''
+  - name: --forwarding-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --header-action
+    parameterValueGroup: Append, Delete, Overwrite
+    summary: Header action type for the requests.
+    description: ''
+  - name: --header-name
+    summary: Name of the header to modify.
+    description: ''
+  - name: --header-value
+    summary: Value of the header.
+    description: ''
+  - name: --query-parameter-strip-directive
+    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
+    summary: Treatment of URL query terms when forming the cache key.
+    description: ''
+  - name: --query-parameters
+    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
+    description: ''
+  - name: --redirect-protocol
+    defaultValue: MatchRequest
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: The protocol of the destination to where the traffic is redirected.
+    description: ''
+  - name: --redirect-type
+    defaultValue: Moved
+    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
+    summary: The redirect type the rule will use when redirecting traffic.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_action_list
+  name: az network front-door rules-engine rule action list
+  summary: Show all actions that apply for a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule action list --front-door-name
+                                                        --name
+                                                        --resource-group
+                                                        --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_action_remove
+  name: az network front-door rules-engine rule action remove
+  summary: Remove an action from a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule action remove --action-type {ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader}
+                                                          --front-door-name
+                                                          --name
+                                                          --resource-group
+                                                          --rules-engine-name
+                                                          [--index]
+  requiredParameters:
+  - isRequired: true
+    name: --action-type
+    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
+    summary: Action type to apply for a rule.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --index
+    summary: 0-based index of the request or response header action to remove. Index parameter is not required for "ForwardRouteOverride" or "RedirectRouteOverride" action remove.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Rules Engine actions for Front Door.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule/condition.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule/condition.yml
new file mode 100644
index 0000000000..1186953e0c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/rules-engine/rule/condition.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine_rule_condition
+name: az network front-door rules-engine rule condition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine rule condition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Rules Engine match conditions for Front Door.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_rule_condition_add
+  name: az network front-door rules-engine rule condition add
+  summary: Add a match condition to a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule condition add --front-door-name
+                                                          --name
+                                                          --resource-group
+                                                          --rules-engine-name
+                                                          [--match-values]
+                                                          [--match-variable {IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri}]
+                                                          [--negate-condition {false, true}]
+                                                          [--operator {Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual}]
+                                                          [--selector]
+                                                          [--transforms {Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode}]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --match-values
+    summary: Space-separated list of values to match against.
+    description: ''
+  - name: --match-variable
+    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
+    summary: Name of the match condition.
+    description: ''
+  - name: --negate-condition
+    parameterValueGroup: false, true
+    summary: Applies "Not" to the operator.
+    description: ''
+  - name: --operator
+    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
+    summary: Operator of the match condition.
+    description: ''
+  - name: --selector
+    summary: Optional selector for the match condition variable.
+    description: ''
+  - name: --transforms
+    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
+    summary: Space-separated list of transforms to apply.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_condition_list
+  name: az network front-door rules-engine rule condition list
+  summary: Show all match conditions associated with a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule condition list --front-door-name
+                                                           --name
+                                                           --resource-group
+                                                           --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_condition_remove
+  name: az network front-door rules-engine rule condition remove
+  summary: Remove a match condition from a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule condition remove --front-door-name
+                                                             --index
+                                                             --name
+                                                             --resource-group
+                                                             --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: 0-based index of the match condition to remove.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Rules Engine match conditions for Front Door.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy.yml
new file mode 100644
index 0000000000..cc050f2621
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy.yml
@@ -0,0 +1,221 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy
+name: az network front-door waf-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage WebApplication Firewall (WAF) policies.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_create
+  name: az network front-door waf-policy create
+  summary: Create a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy create --name
+                                            --resource-group
+                                            [--custom-block-response-body]
+                                            [--custom-block-response-status-code]
+                                            [--disabled {false, true}]
+                                            [--mode {Detection, Prevention}]
+                                            [--redirect-url]
+                                            [--request-body-check {Disabled, Enabled}]
+                                            [--sku {Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor}]
+                                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-block-response-body
+    summary: Body to return for blocked requests.
+    description: ''
+  - name: --custom-block-response-status-code
+    summary: HTTP status to return for blocked requests.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --mode
+    parameterValueGroup: Detection, Prevention
+    summary: Firewall policy mode.
+    description: ''
+  - name: --redirect-url
+    summary: URL used for redirect rule action.
+    description: ''
+  - name: --request-body-check
+    parameterValueGroup: Disabled, Enabled
+    summary: Disabled or Enabled status. Default value is Disabled.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor
+    summary: SKU of Firewall policy. This field cannot be updated after creation. Default value is Classic_AzureFrontDoor.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_front-door_waf-policy_delete
+  name: az network front-door waf-policy delete
+  summary: Delete a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy delete --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_list
+  name: az network front-door waf-policy list
+  summary: List WAF policies.
+  description: ''
+  syntax: az network front-door waf-policy list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_show
+  name: az network front-door waf-policy show
+  summary: Get the details of a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy show --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_update
+  name: az network front-door waf-policy update
+  summary: Update settings of a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy update --name
+                                            --resource-group
+                                            [--add]
+                                            [--custom-block-response-body]
+                                            [--custom-block-response-status-code]
+                                            [--disabled {false, true}]
+                                            [--force-string]
+                                            [--mode {Detection, Prevention}]
+                                            [--redirect-url]
+                                            [--remove]
+                                            [--request-body-check {Disabled, Enabled}]
+                                            [--set]
+                                            [--sku {Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor}]
+                                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --custom-block-response-body
+    summary: Body to return for blocked requests.
+    description: ''
+  - name: --custom-block-response-status-code
+    summary: HTTP status to return for blocked requests.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --mode
+    parameterValueGroup: Detection, Prevention
+    summary: Firewall policy mode.
+    description: ''
+  - name: --redirect-url
+    summary: URL used for redirect rule action.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --request-body-check
+    parameterValueGroup: Disabled, Enabled
+    summary: Disabled or Enabled status. Default value is Disabled.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor
+    summary: SKU of Firewall policy. This field cannot be updated after creation. Default value is Classic_AzureFrontDoor.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_network_front-door_waf-policy_create
+- az_network_front-door_waf-policy_delete
+- az_network_front-door_waf-policy_list
+- az_network_front-door_waf-policy_managed-rule-definition
+- az_network_front-door_waf-policy_managed-rule-definition_list
+- az_network_front-door_waf-policy_managed-rules
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+- az_network_front-door_waf-policy_rule
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+- az_network_front-door_waf-policy_show
+- az_network_front-door_waf-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage WebApplication Firewall (WAF) policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rule-definition.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rule-definition.yml
new file mode 100644
index 0000000000..8305fae7f1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rule-definition.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rule-definition
+name: az network front-door waf-policy managed-rule-definition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rule-definition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Learn about available managed rule sets.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rule-definition_list
+  name: az network front-door waf-policy managed-rule-definition list
+  summary: Show a detailed list of available managed rule sets.
+  description: ''
+  syntax: az network front-door waf-policy managed-rule-definition list
+commands:
+- az_network_front-door_waf-policy_managed-rule-definition_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Learn about available managed rule sets.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules.yml
new file mode 100644
index 0000000000..dfec7355bc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules.yml
@@ -0,0 +1,102 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rules
+name: az network front-door waf-policy managed-rules
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rules** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Change and view managed rule sets associated with your WAF policy.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rules_add
+  name: az network front-door waf-policy managed-rules add
+  summary: Add a managed rule set to a WAF policy.
+  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available managed rulesets.
+  syntax: >-
+    az network front-door waf-policy managed-rules add --policy-name
+                                                       --resource-group
+                                                       --type
+                                                       --version
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to apply.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Rule set version.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_list
+  name: az network front-door waf-policy managed-rules list
+  summary: Show which managed rule sets are applied to a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules list --policy-name
+                                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_remove
+  name: az network front-door waf-policy managed-rules remove
+  summary: Remove a managed rule set from a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules remove --policy-name
+                                                          --resource-group
+                                                          --type
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to remove.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Change and view managed rule sets associated with your WAF policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules/exclusion.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules/exclusion.yml
new file mode 100644
index 0000000000..b7d9ca1e7f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules/exclusion.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rules_exclusion
+name: az network front-door waf-policy managed-rules exclusion
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rules exclusion** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
+description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rules_exclusion_add
+  name: az network front-door waf-policy managed-rules exclusion add
+  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
+  description: Prevents the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules exclusion add --match-variable
+                                                                 --operator
+                                                                 --policy-name
+                                                                 --resource-group
+                                                                 --type
+                                                                 --value
+                                                                 [--rule-group-id]
+                                                                 [--rule-id]
+  requiredParameters:
+  - isRequired: true
+    name: --match-variable
+    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
+    description: ''
+  - isRequired: true
+    name: --operator
+    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to exclusion.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Values to match the variable name against.
+    description: ''
+  optionalParameters:
+  - name: --rule-group-id
+    summary: ID of the rule group containing the rule to exclusion.
+    description: ''
+  - name: --rule-id
+    summary: ID of the rule to apply exclusion.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_exclusion_list
+  name: az network front-door waf-policy managed-rules exclusion list
+  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules exclusion list --policy-name
+                                                                  --resource-group
+                                                                  --type
+                                                                  [--rule-group-id]
+                                                                  [--rule-id]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the exclusions to list.
+    description: ''
+  optionalParameters:
+  - name: --rule-group-id
+    summary: ID of the rule group containing the exclusions to list.
+    description: ''
+  - name: --rule-id
+    summary: ID of the rule to list exclusion for.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_exclusion_remove
+  name: az network front-door waf-policy managed-rules exclusion remove
+  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
+  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules exclusion remove --match-variable
+                                                                    --operator
+                                                                    --policy-name
+                                                                    --resource-group
+                                                                    --type
+                                                                    --value
+                                                                    [--rule-group-id]
+                                                                    [--rule-id]
+  requiredParameters:
+  - isRequired: true
+    name: --match-variable
+    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
+    description: ''
+  - isRequired: true
+    name: --operator
+    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the exclusion to remove.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Values to match the variable name against.
+    description: ''
+  optionalParameters:
+  - name: --rule-group-id
+    summary: ID of the rule group containing the exclusion to remove.
+    description: ''
+  - name: --rule-id
+    summary: ID of the rule to remove from exclusion.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules/override.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules/override.yml
new file mode 100644
index 0000000000..32b8bc7ab7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/managed-rules/override.yml
@@ -0,0 +1,125 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rules_override
+name: az network front-door waf-policy managed-rules override
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rules override** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: View and alter overrides on managed rules within a managed rule set.
+description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rules_override_add
+  name: az network front-door waf-policy managed-rules override add
+  summary: Add an override on a managed rule within a managed rule set.
+  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules override add --policy-name
+                                                                --resource-group
+                                                                --rule-group-id
+                                                                --rule-id
+                                                                --type
+                                                                [--action {Allow, Block, Log, Redirect}]
+                                                                [--disabled {false, true}]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-group-id
+    summary: ID of the rule group containing the rule to override.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: ID of the rule to override.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to override.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Block, Log, Redirect
+    summary: Action for applied rulesets.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Whether to disable the rule.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_override_list
+  name: az network front-door waf-policy managed-rules override list
+  summary: List the overrides on managed rules within a managed rule set.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules override list --policy-name
+                                                                 --resource-group
+                                                                 --type
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the overrides to list.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_override_remove
+  name: az network front-door waf-policy managed-rules override remove
+  summary: Remove an override on a managed rule within a managed rule set.
+  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules override remove --policy-name
+                                                                   --resource-group
+                                                                   --rule-group-id
+                                                                   --rule-id
+                                                                   --type
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-group-id
+    summary: ID of the rule group containing the override to remove.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: ID of the rule override to remove.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the override to remove.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/rule.yml
new file mode 100644
index 0000000000..84266b6aac
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/rule.yml
@@ -0,0 +1,191 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_rule
+name: az network front-door waf-policy rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage WAF policy custom rules.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_rule_create
+  name: az network front-door waf-policy rule create
+  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule create --action {Allow, Block, Log, Redirect}
+                                                 --name
+                                                 --policy-name
+                                                 --priority
+                                                 --resource-group
+                                                 --rule-type {MatchRule, RateLimitRule}
+                                                 [--disabled {false, true}]
+                                                 [--rate-limit-duration]
+                                                 [--rate-limit-threshold]
+  requiredParameters:
+  - isRequired: true
+    name: --action
+    parameterValueGroup: Allow, Block, Log, Redirect
+    summary: Rule action.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --priority
+    summary: Priority of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-type
+    parameterValueGroup: MatchRule, RateLimitRule
+    summary: Type of rule.
+    description: ''
+  optionalParameters:
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Whether to disable the rule.
+    description: ''
+  - name: --rate-limit-duration
+    summary: Rate limit duration in minutes.
+    description: ''
+  - name: --rate-limit-threshold
+    summary: Rate limit threshold.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_delete
+  name: az network front-door waf-policy rule delete
+  summary: Delete a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule delete --name
+                                                 --policy-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_list
+  name: az network front-door waf-policy rule list
+  summary: List WAF policy custom rules.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule list --policy-name
+                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_show
+  name: az network front-door waf-policy rule show
+  summary: Get the details of a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule show --name
+                                               --policy-name
+                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_update
+  name: az network front-door waf-policy rule update
+  summary: Alter the details of a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule update --name
+                                                 --policy-name
+                                                 --resource-group
+                                                 [--action {Allow, Block, Log, Redirect}]
+                                                 [--disabled {false, true}]
+                                                 [--priority]
+                                                 [--rate-limit-duration]
+                                                 [--rate-limit-threshold]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Block, Log, Redirect
+    summary: Rule action.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Whether to disable the rule.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule.
+    description: ''
+  - name: --rate-limit-duration
+    summary: Rate limit duration in minutes.
+    description: ''
+  - name: --rate-limit-threshold
+    summary: Rate limit threshold.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage WAF policy custom rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/rule/match-condition.yml b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/rule/match-condition.yml
new file mode 100644
index 0000000000..28327cdb12
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/front-door/waf-policy/rule/match-condition.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_rule_match-condition
+name: az network front-door waf-policy rule match-condition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy rule match-condition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Alter match-conditions associated with a WAF policy custom rule.
+description: Note that at least one match-condition must be associated with a custom rule.
+directCommands:
+- uid: az_network_front-door_waf-policy_rule_match-condition_add
+  name: az network front-door waf-policy rule match-condition add
+  summary: Add a match-condition to a WAF policy custom rule.
+  description: >-
+    Usage:   [--negate] --match-variable VARIABLE[.selector] --operator OPERATOR --value [VALUE [VALUE ...]]
+
+      Variable allowed values: RemoteAddr, RequestMethod, QueryString, PostArgs, RequestUri, RequestHeader, RequestBody, Cookies, SocketAddr
+
+      Operator allowed values: Any, IPMatch, GeoMatch, Equal, Contains, LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, BeginsWith, EndsWith, RegEx.
+  syntax: >-
+    az network front-door waf-policy rule match-condition add --match-variable
+                                                              --name
+                                                              --operator
+                                                              --policy-name
+                                                              --resource-group
+                                                              --values
+                                                              [--negate {false, true}]
+                                                              [--transforms {Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode}]
+  requiredParameters:
+  - isRequired: true
+    name: --match-variable
+    summary: Variable[.Selector] Request variable to test with optional selector.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --operator
+    summary: Operator used to compare the variable to the values.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --values
+    summary: Space-separated list of values to match against.
+    description: ''
+  optionalParameters:
+  - name: --negate
+    parameterValueGroup: false, true
+    summary: Applies "Not" to the operator.
+    description: ''
+  - name: --transforms
+    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
+    summary: Space-separated list of transforms to apply.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_match-condition_list
+  name: az network front-door waf-policy rule match-condition list
+  summary: Show all match-conditions associated with a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule match-condition list --name
+                                                               --policy-name
+                                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_match-condition_remove
+  name: az network front-door waf-policy rule match-condition remove
+  summary: Remove a match-condition from a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule match-condition remove --index
+                                                                 --name
+                                                                 --policy-name
+                                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: 0-based index of the match condition to remove.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Note that at least one match-condition must be associated with a custom rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/ip-group.yml b/2017-03-09-profile/docs-ref-autogen/network/ip-group.yml
new file mode 100644
index 0000000000..f8861300c3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/ip-group.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_ip-group
+name: az network ip-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ip-group** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network ip-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage IpGroup.
+description: ''
+directCommands:
+- uid: az_network_ip-group_create
+  name: az network ip-group create
+  summary: Create an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group create --ip-addresses
+                               --name
+                               --resource-group
+                               [--location]
+                               [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --ip-addresses
+    summary: Space-separated list of IpAddress or IpAddressPrefix.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_ip-group_delete
+  name: az network ip-group delete
+  summary: Delete an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_ip-group_list
+  name: az network ip-group list
+  summary: List all of IpGroup.
+  description: ''
+  syntax: az network ip-group list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_ip-group_show
+  name: az network ip-group show
+  summary: Show details of an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group show --name
+                             --resource-group
+                             [--expand]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
+    description: ''
+- uid: az_network_ip-group_update
+  name: az network ip-group update
+  summary: Update an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group update --name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--ip-addresses]
+                               [--remove]
+                               [--set]
+                               [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IpAddress or IpAddressPrefix.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_network_ip-group_create
+- az_network_ip-group_delete
+- az_network_ip-group_list
+- az_network_ip-group_show
+- az_network_ip-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage IpGroup.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb.yml b/2017-03-09-profile/docs-ref-autogen/network/lb.yml
index 127a958ee0..bf27c7ed53 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb.yml
@@ -1,48 +1,52 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb
-  name: az network lb
-  summary: Manage and configure load balancers.
-  description: To learn more about Azure Load Balancer visit <a href="https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli">https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_create
-  - az_network_lb_delete
-  - az_network_lb_list
-  - az_network_lb_show
-  - az_network_lb_update
+### YamlMime:AzureCLIGroup
+uid: az_network_lb
+name: az network lb
+summary: Manage and configure load balancers.
+description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
+directCommands:
 - uid: az_network_lb_create
   name: az network lb create
   summary: Create a load balancer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb create --name
+                         --resource-group
+                         [--backend-pool-name]
+                         [--frontend-ip-name]
+                         [--location]
+                         [--no-wait]
+                         [--private-ip-address]
+                         [--public-ip-address]
+                         [--public-ip-address-allocation {Dynamic, Static}]
+                         [--public-ip-dns-name]
+                         [--subnet]
+                         [--subnet-address-prefix]
+                         [--subscription]
+                         [--tags]
+                         [--validate]
+                         [--vnet-address-prefix]
+                         [--vnet-name]
   examples:
   - summary: Create a basic load balancer.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic
   - summary: Create a basic load balancer on a specific virtual network and subnet. If a virtual network with the same name is found in the same resource group, the load balancer will utilize this virtual network.  If one is not found a new one will be created.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic --vnet-name MyVnet --subnet MySubnet
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic --vnet-name MyVnet --subnet MySubnet
   - summary: Create a basic load balancer on a subnet of a pre-existing virtual network. The subnet can be in arbitary resource group or subscription by providing the ID of the subnet.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic --subnet {subnetID}
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic --subnet {subnetID}
   - summary: Create a basic zone flavored internal load balancer, through provisioning a zonal public ip.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic --public-ip-zone 2
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic --public-ip-zone 2
   - summary: Create a standard zone flavored public-facing load balancer, through provisioning a zonal frontend ip configuration and Vnet.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Standard --frontend-ip-zone 1 --vnet-name MyVnet --subnet MySubnet
-  parameters:
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Standard --frontend-ip-zone 1 --vnet-name MyVnet --subnet MySubnet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The load balancer name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --backend-pool-name
     summary: The name of the backend address pool.
     description: ''
@@ -51,7 +55,7 @@ items:
     summary: The name of the frontend IP configuration.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -59,12 +63,6 @@ items:
   - name: --private-ip-address
     summary: Static private IP address to use.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
   - name: --public-ip-address
     summary: Name or ID of the public IP address, or "" for none. Uses existing resource if available or will create a new resource with defaults if omitted.
     description: ''
@@ -82,6 +80,15 @@ items:
     defaultValue: 10.0.0.0/24
     summary: The CIDR address prefix to use when creating a new subnet.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
   - name: --vnet-address-prefix
     defaultValue: 10.0.0.0/16
     summary: The CIDR address prefix to use when creating a new VNet.
@@ -89,26 +96,20 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_delete
   name: az network lb delete
   summary: Delete a load balancer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb delete [--ids]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Delete a load balancer.
-    syntax:
-      content: az network lb delete -g MyResourceGroup -n MyLb
-  parameters:
+    syntax: az network lb delete -g MyResourceGroup -n MyLb
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -116,51 +117,49 @@ items:
     summary: The load balancer name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_list
   name: az network lb list
   summary: List load balancers.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb list [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: List load balancers.
-    syntax:
-      content: az network lb list -g MyResourceGroup
-  parameters:
+    syntax: az network lb list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_show
   name: az network lb show
   summary: Get the details of a load balancer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb show [--expand]
+                       [--ids]
+                       [--name]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: Get the details of a load balancer.
-    syntax:
-      content: az network lb show -g MyResourceGroup -n MyLb
-  parameters:
+    syntax: az network lb show -g MyResourceGroup -n MyLb
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -170,180 +169,164 @@ items:
   - name: --name -n
     summary: The load balancer name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_update
   name: az network lb update
   summary: Update a load balancer.
   description: This command can only be used to update the tags for a load balancer. Name and resource group are immutable and cannot be updated.
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb update [--add]
+                         [--force-string]
+                         [--ids]
+                         [--name]
+                         [--remove]
+                         [--resource-group]
+                         [--set]
+                         [--subscription]
   examples:
   - summary: Update the tags of a load balancer.
-    syntax:
-      content: az network lb update -g MyResourceGroup -n MyLb --set tags.CostCenter=MyBusinessGroup
-  parameters:
+    syntax: az network lb update -g MyResourceGroup -n MyLb --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The load balancer name.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_wait
+  name: az network lb wait
+  summary: Place the CLI in a waiting state until a condition of the load balancer is met.
+  description: ''
+  syntax: >-
+    az network lb wait [--created]
+                       [--custom]
+                       [--deleted]
+                       [--exists]
+                       [--expand]
+                       [--ids]
+                       [--interval]
+                       [--name]
+                       [--resource-group]
+                       [--subscription]
+                       [--timeout]
+                       [--updated]
+  examples:
+  - summary: Wait for load balancer to return as created.
+    syntax: az network lb wait -g MyResourceGroup -n MyLB --created
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --deleted
+    summary: Wait until deleted.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --exists
+    summary: Wait until the resource exists.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_address_pool
-  name: az network lb address-pool
-  summary: Manage address pools of a load balancer.
-- uid: az_network_lb_address_pool_create
-  name: az network lb address-pool create
-  summary: Create an address pool.
-- uid: az_network_lb_address_pool_delete
-  name: az network lb address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_lb_address_pool_list
-  name: az network lb address-pool list
-  summary: List address pools.
-- uid: az_network_lb_address_pool_show
-  name: az network lb address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_lb_create
-  name: az network lb create
-  summary: Create a load balancer.
-- uid: az_network_lb_delete
-  name: az network lb delete
-  summary: Delete a load balancer.
-- uid: az_network_lb_frontend_ip
-  name: az network lb frontend-ip
-  summary: Manage frontend IP addresses of a load balancer.
-- uid: az_network_lb_frontend_ip_create
-  name: az network lb frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_lb_frontend_ip_delete
-  name: az network lb frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_lb_frontend_ip_list
-  name: az network lb frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_lb_frontend_ip_show
-  name: az network lb frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_lb_frontend_ip_update
-  name: az network lb frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_lb_inbound_nat_pool
-  name: az network lb inbound-nat-pool
-  summary: Manage inbound NAT address pools of a load balancer.
-- uid: az_network_lb_inbound_nat_pool_create
-  name: az network lb inbound-nat-pool create
-  summary: Create an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_delete
-  name: az network lb inbound-nat-pool delete
-  summary: Delete an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_list
-  name: az network lb inbound-nat-pool list
-  summary: List inbound NAT address pools.
-- uid: az_network_lb_inbound_nat_pool_show
-  name: az network lb inbound-nat-pool show
-  summary: Get the details of an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_update
-  name: az network lb inbound-nat-pool update
-  summary: Update an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_rule
-  name: az network lb inbound-nat-rule
-  summary: Manage inbound NAT rules of a load balancer.
-- uid: az_network_lb_inbound_nat_rule_create
-  name: az network lb inbound-nat-rule create
-  summary: Create an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_delete
-  name: az network lb inbound-nat-rule delete
-  summary: Delete an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_list
-  name: az network lb inbound-nat-rule list
-  summary: List inbound NAT rules.
-- uid: az_network_lb_inbound_nat_rule_show
-  name: az network lb inbound-nat-rule show
-  summary: Get the details of an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_update
-  name: az network lb inbound-nat-rule update
-  summary: Update an inbound NAT rule.
-- uid: az_network_lb_list
-  name: az network lb list
-  summary: List load balancers.
-- uid: az_network_lb_probe
-  name: az network lb probe
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_lb_probe_create
-  name: az network lb probe create
-  summary: Create a probe.
-- uid: az_network_lb_probe_delete
-  name: az network lb probe delete
-  summary: Delete a probe.
-- uid: az_network_lb_probe_list
-  name: az network lb probe list
-  summary: List probes.
-- uid: az_network_lb_probe_show
-  name: az network lb probe show
-  summary: Get the details of a probe.
-- uid: az_network_lb_probe_update
-  name: az network lb probe update
-  summary: Update a probe.
-- uid: az_network_lb_rule
-  name: az network lb rule
-  summary: Manage load balancing rules.
-- uid: az_network_lb_rule_create
-  name: az network lb rule create
-  summary: Create a load balancing rule.
-- uid: az_network_lb_rule_delete
-  name: az network lb rule delete
-  summary: Delete a load balancing rule.
-- uid: az_network_lb_rule_list
-  name: az network lb rule list
-  summary: List load balancing rules.
-- uid: az_network_lb_rule_show
-  name: az network lb rule show
-  summary: Get the details of a load balancing rule.
-- uid: az_network_lb_rule_update
-  name: az network lb rule update
-  summary: Update a load balancing rule.
-- uid: az_network_lb_show
-  name: az network lb show
-  summary: Get the details of a load balancer.
-- uid: az_network_lb_update
-  name: az network lb update
-  summary: Update a load balancer.
+- az_network_lb_address-pool
+- az_network_lb_address-pool_address
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+- az_network_lb_address-pool_create
+- az_network_lb_address-pool_delete
+- az_network_lb_address-pool_list
+- az_network_lb_address-pool_show
+- az_network_lb_create
+- az_network_lb_delete
+- az_network_lb_frontend-ip
+- az_network_lb_frontend-ip_create
+- az_network_lb_frontend-ip_delete
+- az_network_lb_frontend-ip_list
+- az_network_lb_frontend-ip_show
+- az_network_lb_frontend-ip_update
+- az_network_lb_inbound-nat-pool
+- az_network_lb_inbound-nat-pool_create
+- az_network_lb_inbound-nat-pool_delete
+- az_network_lb_inbound-nat-pool_list
+- az_network_lb_inbound-nat-pool_show
+- az_network_lb_inbound-nat-pool_update
+- az_network_lb_inbound-nat-rule
+- az_network_lb_inbound-nat-rule_create
+- az_network_lb_inbound-nat-rule_delete
+- az_network_lb_inbound-nat-rule_list
+- az_network_lb_inbound-nat-rule_show
+- az_network_lb_inbound-nat-rule_update
+- az_network_lb_list
+- az_network_lb_probe
+- az_network_lb_probe_create
+- az_network_lb_probe_delete
+- az_network_lb_probe_list
+- az_network_lb_probe_show
+- az_network_lb_probe_update
+- az_network_lb_rule
+- az_network_lb_rule_create
+- az_network_lb_rule_delete
+- az_network_lb_rule_list
+- az_network_lb_rule_show
+- az_network_lb_rule_update
+- az_network_lb_show
+- az_network_lb_update
+- az_network_lb_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -359,10 +342,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Azure Load Balancer visit <a href="https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli">https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool.yml
index 8ab737c708..d633decd45 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool.yml
@@ -1,59 +1,110 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_address_pool
-  name: az network lb address-pool
-  summary: Manage address pools of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_address_pool_create
-  - az_network_lb_address_pool_delete
-  - az_network_lb_address_pool_list
-  - az_network_lb_address_pool_show
-- uid: az_network_lb_address_pool_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_address-pool
+name: az network lb address-pool
+summary: Manage address pools of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_address-pool_create
   name: az network lb address-pool create
   summary: Create an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool create --lb-name
+                                      --name
+                                      --resource-group
+                                      [--backend-address]
+                                      [--backend-addresses-config-file]
+                                      [--subscription]
+                                      [--vnet]
   examples:
   - summary: Create an address pool.
-    syntax:
-      content: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool
-  parameters:
+    syntax: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  - summary: Create an address pool with several backend addresses using key-value arguments.
+    syntax: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --vnet {VnetResourceId} --backend-address name=addr1 ip-address=10.0.0.1 --backend-address name=addr2 ip-address=10.0.0.3
+  - summary: Create an address pool with several backend addresses using config file
+    syntax: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --backend-addresses-config-file @config_file.json
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The load balancer name.
     description: ''
   - isRequired: true
     name: --name -n
-    summary: The name of the backend address pool.
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
+  - name: --backend-address
+    summary: Backend addresses information for backend address pool. If it's used, --vnet is required or subnet is required.
+    description: >-
+      Usage1: --backend-address name=addr1 ip-address=10.0.0.1 --vnet MyVnet
+
+      Usage2: --backend-address name=addr1 ip-address=10.0.0.1 subnet=/subscriptions/000/resourceGroups/MyRg/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet1
+
+      Usage3: --backend-address name=addr1 ip-address=10.0.0.1 subnet=subnet1 --vnet MyVnet
+
+
+      name: Required. The name of the backend address.
+
+      ip-address: Required. Ip Address within the Virtual Network.
+
+      subnet: Name or Id of the subnet.
+
+
+      Multiple backend addresses can be specified by using more than one `--backend-address` argument.
+  - name: --backend-addresses-config-file
+    summary: A config file used to set backend addresses. This argument is for experienced users. You may encounter parse errors if the json file is invalid.
+    description: >-
+      Usage: --backend-addresses-config-file @"{config_file.json}"
+
+
+      A example config file is
+
+      [
+        {
+          "name": "address1",
+          "virtualNetwork": "clitestvnet",
+          "ipAddress": "10.0.0.4"
+        },
+        {
+          "name": "address2",
+          "virtualNetwork": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/virtualNetworks/clitestvnet",
+          "ipAddress": "10.0.0.5"
+        },
+        {
+          "name": "address3",
+          "subnet": "subnet3",
+          "ipAddress": "10.0.0.6"
+        },
+        {
+          "name": "address4",
+          "subnet": "/subscriptions/000/resourceGroups/MyRg/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet4",
+          "ipAddress": "10.0.0.7"
+        }
+      ].
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_address_pool_delete
+  - name: --vnet
+    summary: Name or Id of the virtual network applied to all backend addresses.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_delete
   name: az network lb address-pool delete
   summary: Delete an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool delete --lb-name
+                                      --name
+                                      --resource-group
+                                      [--subscription]
   examples:
   - summary: Delete an address pool.
-    syntax:
-      content: az network lb address-pool delete -g MyResourceGroup --lb-name MyLb -n MyAddressPool
-  parameters:
+    syntax: az network lb address-pool delete -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -64,56 +115,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_address_pool_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_list
   name: az network lb address-pool list
   summary: List address pools.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool list --lb-name
+                                    --resource-group
+                                    [--query-examples]
+                                    [--subscription]
   examples:
   - summary: List address pools.
-    syntax:
-      content: az network lb address-pool list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb address-pool list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_address_pool_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_show
   name: az network lb address-pool show
   summary: Get the details of an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool show --lb-name
+                                    --name
+                                    --resource-group
+                                    [--query-examples]
+                                    [--subscription]
   examples:
   - summary: Get the details of an address pool.
-    syntax:
-      content: az network lb address-pool show -g MyResourceGroup --lb-name MyLb -n MyAddressPool
-  parameters:
+    syntax: az network lb address-pool show -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -124,30 +175,25 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_address_pool_create
-  name: az network lb address-pool create
-  summary: Create an address pool.
-- uid: az_network_lb_address_pool_delete
-  name: az network lb address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_lb_address_pool_list
-  name: az network lb address-pool list
-  summary: List address pools.
-- uid: az_network_lb_address_pool_show
-  name: az network lb address-pool show
-  summary: Get the details of an address pool.
+- az_network_lb_address-pool_address
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+- az_network_lb_address-pool_create
+- az_network_lb_address-pool_delete
+- az_network_lb_address-pool_list
+- az_network_lb_address-pool_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -163,10 +209,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage address pools of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools of a load balancer.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool/address.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool/address.yml
new file mode 100644
index 0000000000..de25a33618
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/address-pool/address.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_address-pool_address
+name: az network lb address-pool address
+summary: Manage backend addresses of the load balance backend address pool.
+description: ''
+directCommands:
+- uid: az_network_lb_address-pool_address_add
+  name: az network lb address-pool address add
+  summary: Add one backend address into the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network lb address-pool address add --ip-address
+                                           --lb-name
+                                           --name
+                                           --pool-name
+                                           --resource-group
+                                           [--subscription]
+                                           [--vnet]
+  examples:
+  - summary: Add one backend address into the load balance backend address pool.
+    syntax: az network lb address-pool address add -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress --vnet MyVnet --ip-address 10.0.0.1
+  - summary: Add one backend address into the load balance backend address pool with subnet.
+    syntax: az network lb address-pool address add -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress --subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRg/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet2 --ip-address 10.0.0.1
+  requiredParameters:
+  - isRequired: true
+    name: --ip-address
+    summary: Ip Address within the Virtual Network.
+    description: ''
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet
+    summary: Name or Id of the virtual network.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_address_list
+  name: az network lb address-pool address list
+  summary: List all backend addresses of the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network lb address-pool address list --lb-name
+                                            --pool-name
+                                            --resource-group
+                                            [--query-examples]
+                                            [--subscription]
+  examples:
+  - summary: List all backend addresses of the load balance backend address pool.
+    syntax: az network lb address-pool address list -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_address_remove
+  name: az network lb address-pool address remove
+  summary: Remove one backend address from the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network lb address-pool address remove --lb-name
+                                              --name
+                                              --pool-name
+                                              --resource-group
+                                              [--subscription]
+  examples:
+  - summary: Remove one backend address from the load balance backend address pool.
+    syntax: az network lb address-pool address remove -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage backend addresses of the load balance backend address pool.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/frontend-ip.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/frontend-ip.yml
index ac3af43574..f64c8f472c 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb/frontend-ip.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/frontend-ip.yml
@@ -1,33 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_frontend_ip
-  name: az network lb frontend-ip
-  summary: Manage frontend IP addresses of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_frontend_ip_create
-  - az_network_lb_frontend_ip_delete
-  - az_network_lb_frontend_ip_list
-  - az_network_lb_frontend_ip_show
-  - az_network_lb_frontend_ip_update
-- uid: az_network_lb_frontend_ip_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_frontend-ip
+name: az network lb frontend-ip
+summary: Manage frontend IP addresses of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_frontend-ip_create
   name: az network lb frontend-ip create
   summary: Create a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip create --lb-name
+                                     --name
+                                     --resource-group
+                                     [--private-ip-address]
+                                     [--public-ip-address]
+                                     [--subnet]
+                                     [--subscription]
+                                     [--vnet-name]
   examples:
   - summary: Create a frontend ip address for a public load balancer.
-    syntax:
-      content: az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb --public-ip-address MyFrontendIp
+    syntax: az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb --public-ip-address MyFrontendIp
   - summary: Create a frontend ip address for an internal load balancer.
-    syntax:
-      content: >-
-        az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb \
-            --private-ip-address 10.10.10.100 --subnet MySubnet --vnet-name MyVnet
-  parameters:
+    syntax: >-
+      az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb \
+          --private-ip-address 10.10.10.100 --subnet MySubnet --vnet-name MyVnet
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The load balancer name.
@@ -38,8 +35,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --private-ip-address
     summary: Static private IP address to associate with the configuration.
     description: ''
@@ -49,29 +47,26 @@ items:
   - name: --subnet
     summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_delete
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_delete
   name: az network lb frontend-ip delete
   summary: Delete a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip delete --lb-name
+                                     --name
+                                     --resource-group
+                                     [--subscription]
   examples:
   - summary: Delete a frontend IP address.
-    syntax:
-      content: az network lb frontend-ip delete -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
-  parameters:
+    syntax: az network lb frontend-ip delete -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -82,59 +77,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_list
   name: az network lb frontend-ip list
   summary: List frontend IP addresses.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip list --lb-name
+                                   --resource-group
+                                   [--query-examples]
+                                   [--subscription]
   examples:
   - summary: List frontend IP addresses.
-    syntax:
-      content: az network lb frontend-ip list -g MyResourceGroup --lb-name MyLb
-  parameters:
+    syntax: az network lb frontend-ip list -g MyResourceGroup --lb-name MyLb
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_show
   name: az network lb frontend-ip show
   summary: Get the details of a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip show --lb-name
+                                   --name
+                                   --resource-group
+                                   [--query-examples]
+                                   [--subscription]
   examples:
   - summary: Get the details of a frontend IP address.
-    syntax:
-      content: az network lb frontend-ip show -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+    syntax: az network lb frontend-ip show -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
   - summary: Get the details of a frontend IP address (autogenerated)
-    syntax:
-      content: az network lb frontend-ip show --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network lb frontend-ip show --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -145,45 +139,47 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_update
   name: az network lb frontend-ip update
   summary: Update a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip update [--add]
+                                     [--force-string]
+                                     [--ids]
+                                     [--lb-name]
+                                     [--name]
+                                     [--private-ip-address]
+                                     [--public-ip-address]
+                                     [--remove]
+                                     [--resource-group]
+                                     [--set]
+                                     [--subnet]
+                                     [--subscription]
+                                     [--vnet-name]
   examples:
   - summary: Update the frontend IP address of a public load balancer.
-    syntax:
-      content: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --public-ip-address MyNewPublicIp
+    syntax: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --public-ip-address MyNewPublicIp
   - summary: Update the frontend IP address of an internal load balancer.
-    syntax:
-      content: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --private-ip-address 10.10.10.50
+    syntax: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --private-ip-address 10.10.10.50
   - summary: Update a frontend IP address. (autogenerated)
-    syntax:
-      content: az network lb frontend-ip update --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
-  parameters:
-  - name: --private-ip-address
-    summary: Static private IP address to associate with the configuration. Use "" to remove the static address and use a dynamic address instead.
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the existing public IP to associate with the configuration.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    syntax: az network lb frontend-ip update --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -194,46 +190,37 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --private-ip-address
+    summary: Static private IP address to associate with the configuration. Use ""('""' in PowerShell) to remove the static address and use a dynamic address instead.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --public-ip-address
+    summary: Name or ID of the existing public IP to associate with the configuration.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subnet
+    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_frontend_ip_create
-  name: az network lb frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_lb_frontend_ip_delete
-  name: az network lb frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_lb_frontend_ip_list
-  name: az network lb frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_lb_frontend_ip_show
-  name: az network lb frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_lb_frontend_ip_update
-  name: az network lb frontend-ip update
-  summary: Update a frontend IP address.
+- az_network_lb_frontend-ip_create
+- az_network_lb_frontend-ip_delete
+- az_network_lb_frontend-ip_list
+- az_network_lb_frontend-ip_show
+- az_network_lb_frontend-ip_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -249,10 +236,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage frontend IP addresses of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend IP addresses of a load balancer.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-pool.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-pool.yml
index 0dfb6f6714..ef301723e1 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-pool.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-pool.yml
@@ -1,33 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_inbound_nat_pool
-  name: az network lb inbound-nat-pool
-  summary: Manage inbound NAT address pools of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_inbound_nat_pool_create
-  - az_network_lb_inbound_nat_pool_delete
-  - az_network_lb_inbound_nat_pool_list
-  - az_network_lb_inbound_nat_pool_show
-  - az_network_lb_inbound_nat_pool_update
-- uid: az_network_lb_inbound_nat_pool_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_inbound-nat-pool
+name: az network lb inbound-nat-pool
+summary: Manage inbound NAT address pools of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_inbound-nat-pool_create
   name: az network lb inbound-nat-pool create
   summary: Create an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool create --backend-port
+                                          --frontend-port-range-end
+                                          --frontend-port-range-start
+                                          --lb-name
+                                          --name
+                                          --protocol {Tcp, Udp}
+                                          --resource-group
+                                          [--floating-ip {false, true}]
+                                          [--frontend-ip-name]
+                                          [--idle-timeout]
+                                          [--subscription]
   examples:
   - summary: Create an inbound NAT address pool.
-    syntax:
-      content: >-
-        az network lb inbound-nat-pool create -g MyResourceGroup --lb-name MyLb \
+    syntax: >-
+      az network lb inbound-nat-pool create -g MyResourceGroup --lb-name MyLb \
 
-        -n MyNatPool --protocol Tcp --frontend-port-range-start 80 --frontend-port-range-end 89 \
+      -n MyNatPool --protocol Tcp --frontend-port-range-start 80 --frontend-port-range-end 89 \
 
-        --backend-port 80 --frontend-ip-name MyFrontendIp
-  parameters:
+      --backend-port 80 --frontend-ip-name MyFrontendIp
+  requiredParameters:
   - isRequired: true
     name: --backend-port
     summary: Port number.
@@ -55,8 +56,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --floating-ip
     parameterValueGroup: false, true
     summary: Enable floating IP.
@@ -70,23 +72,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_delete
   name: az network lb inbound-nat-pool delete
   summary: Delete an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool delete --lb-name
+                                          --name
+                                          --resource-group
+                                          [--subscription]
   examples:
   - summary: Delete an inbound NAT address pool.
-    syntax:
-      content: az network lb inbound-nat-pool delete -g MyResourceGroup --lb-name MyLb -n MyNatPool
-  parameters:
+    syntax: az network lb inbound-nat-pool delete -g MyResourceGroup --lb-name MyLb -n MyNatPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -97,56 +96,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_list
   name: az network lb inbound-nat-pool list
   summary: List inbound NAT address pools.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool list --lb-name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: List inbound NAT address pools.
-    syntax:
-      content: az network lb inbound-nat-pool list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb inbound-nat-pool list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_show
   name: az network lb inbound-nat-pool show
   summary: Get the details of an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool show --lb-name
+                                        --name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: Get the details of an inbound NAT address pool.
-    syntax:
-      content: az network lb inbound-nat-pool show -g MyResourceGroup --lb-name MyLb -n MyNatPool
-  parameters:
+    syntax: az network lb inbound-nat-pool show -g MyResourceGroup --lb-name MyLb -n MyNatPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -157,36 +156,52 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_update
   name: az network lb inbound-nat-pool update
   summary: Update an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool update [--add]
+                                          [--backend-port]
+                                          [--floating-ip {false, true}]
+                                          [--force-string]
+                                          [--frontend-ip-name]
+                                          [--frontend-port-range-end]
+                                          [--frontend-port-range-start]
+                                          [--idle-timeout]
+                                          [--ids]
+                                          [--lb-name]
+                                          [--name]
+                                          [--protocol {Tcp, Udp}]
+                                          [--remove]
+                                          [--resource-group]
+                                          [--set]
+                                          [--subscription]
   examples:
   - summary: Update an inbound NAT address pool to a different backend port.
-    syntax:
-      content: >-
-        az network lb inbound-nat-pool update -g MyResourceGroup --lb-name MyLb -n MyNatPool \
-            --protocol Tcp --backend-port 8080
+    syntax: >-
+      az network lb inbound-nat-pool update -g MyResourceGroup --lb-name MyLb -n MyNatPool \
+          --protocol Tcp --backend-port 8080
   - summary: Update an inbound NAT address pool. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-pool update --backend-port 8080 --enable-tcp-reset true --frontend-port-range-end 89 --frontend-port-range-start 80 --lb-name MyLb --name MyNatPool --resource-group MyResourceGroup
+    syntax: az network lb inbound-nat-pool update --backend-port 8080 --enable-tcp-reset true --frontend-port-range-end 89 --frontend-port-range-start 80 --lb-name MyLb --name MyNatPool --resource-group MyResourceGroup
   - summary: Update an inbound NAT address pool. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-pool update --enable-tcp-reset true --lb-name MyLb --name MyNatPool --protocol Udp --resource-group MyResourceGroup
-  parameters:
+    syntax: az network lb inbound-nat-pool update --enable-tcp-reset true --lb-name MyLb --name MyNatPool --protocol Udp --resource-group MyResourceGroup
+  - summary: Update an inbound NAT address pool. (autogenerated)
+    syntax: az network lb inbound-nat-pool update --backend-port 8080 --floating-ip true --frontend-port-range-end 89 --frontend-port-range-start 80 --lb-name MyLb --name MyNatPool --protocol Udp --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --backend-port
     summary: Port number.
     description: ''
@@ -194,6 +209,9 @@ items:
     parameterValueGroup: false, true
     summary: Enable floating IP.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip-name
     summary: The name of the frontend IP configuration.
     description: ''
@@ -206,10 +224,6 @@ items:
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
-  - name: --protocol
-    parameterValueGroup: Tcp, Udp
-    summary: Network transport protocol.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -219,46 +233,29 @@ items:
   - name: --name -n
     summary: The name of the inbound NAT pool.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: Tcp, Udp
+    summary: Network transport protocol.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_inbound_nat_pool_create
-  name: az network lb inbound-nat-pool create
-  summary: Create an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_delete
-  name: az network lb inbound-nat-pool delete
-  summary: Delete an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_list
-  name: az network lb inbound-nat-pool list
-  summary: List inbound NAT address pools.
-- uid: az_network_lb_inbound_nat_pool_show
-  name: az network lb inbound-nat-pool show
-  summary: Get the details of an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_update
-  name: az network lb inbound-nat-pool update
-  summary: Update an inbound NAT address pool.
+- az_network_lb_inbound-nat-pool_create
+- az_network_lb_inbound-nat-pool_delete
+- az_network_lb_inbound-nat-pool_list
+- az_network_lb_inbound-nat-pool_show
+- az_network_lb_inbound-nat-pool_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -274,10 +271,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage inbound NAT address pools of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage inbound NAT address pools of a load balancer.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-rule.yml
index 568ead027f..6816b51ffd 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/inbound-nat-rule.yml
@@ -1,35 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_inbound_nat_rule
-  name: az network lb inbound-nat-rule
-  summary: Manage inbound NAT rules of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_inbound_nat_rule_create
-  - az_network_lb_inbound_nat_rule_delete
-  - az_network_lb_inbound_nat_rule_list
-  - az_network_lb_inbound_nat_rule_show
-  - az_network_lb_inbound_nat_rule_update
-- uid: az_network_lb_inbound_nat_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_inbound-nat-rule
+name: az network lb inbound-nat-rule
+summary: Manage inbound NAT rules of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_inbound-nat-rule_create
   name: az network lb inbound-nat-rule create
   summary: Create an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule create --backend-port
+                                          --frontend-port
+                                          --lb-name
+                                          --name
+                                          --protocol {Tcp, Udp}
+                                          --resource-group
+                                          [--floating-ip {false, true}]
+                                          [--frontend-ip-name]
+                                          [--idle-timeout]
+                                          [--subscription]
   examples:
   - summary: Create a basic inbound NAT rule for port 80.
-    syntax:
-      content: >-
-        az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule \
-            --protocol Tcp --frontend-port 80 --backend-port 80
+    syntax: >-
+      az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule \
+          --protocol Tcp --frontend-port 80 --backend-port 80
   - summary: Create a basic inbound NAT rule for a specific frontend IP and enable floating IP for NAT Rule.
-    syntax:
-      content: >-
-        az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule --protocol Tcp \
-            --frontend-port 5432 --backend-port 3389 --frontend-ip-name MyFrontendIp --floating-ip true
-  parameters:
+    syntax: >-
+      az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule --protocol Tcp \
+          --frontend-port 5432 --backend-port 3389 --frontend-ip-name MyFrontendIp --floating-ip true
+  requiredParameters:
   - isRequired: true
     name: --backend-port
     summary: Port number.
@@ -53,8 +52,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --floating-ip
     parameterValueGroup: false, true
     summary: Enable floating IP.
@@ -68,23 +68,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_delete
   name: az network lb inbound-nat-rule delete
   summary: Delete an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule delete --lb-name
+                                          --name
+                                          --resource-group
+                                          [--subscription]
   examples:
   - summary: Delete an inbound NAT rule.
-    syntax:
-      content: az network lb inbound-nat-rule delete -g MyResourceGroup --lb-name MyLb -n MyNatRule
-  parameters:
+    syntax: az network lb inbound-nat-rule delete -g MyResourceGroup --lb-name MyLb -n MyNatRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -95,56 +92,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_list
   name: az network lb inbound-nat-rule list
   summary: List inbound NAT rules.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule list --lb-name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: List inbound NAT rules.
-    syntax:
-      content: az network lb inbound-nat-rule list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb inbound-nat-rule list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_show
   name: az network lb inbound-nat-rule show
   summary: Get the details of an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule show --lb-name
+                                        --name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: Get the details of an inbound NAT rule.
-    syntax:
-      content: az network lb inbound-nat-rule show -g MyResourceGroup --lb-name MyLb -n MyNatRule
-  parameters:
+    syntax: az network lb inbound-nat-rule show -g MyResourceGroup --lb-name MyLb -n MyNatRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -155,36 +152,49 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_update
   name: az network lb inbound-nat-rule update
   summary: Update an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule update [--add]
+                                          [--backend-port]
+                                          [--floating-ip {false, true}]
+                                          [--force-string]
+                                          [--frontend-ip-name]
+                                          [--frontend-port]
+                                          [--idle-timeout]
+                                          [--ids]
+                                          [--lb-name]
+                                          [--name]
+                                          [--protocol {Tcp, Udp}]
+                                          [--remove]
+                                          [--resource-group]
+                                          [--set]
+                                          [--subscription]
   examples:
   - summary: Update an inbound NAT rule to disable floating IP and modify idle timeout duration.
-    syntax:
-      content: >-
-        az network lb inbound-nat-rule update -g MyResourceGroup --lb-name MyLb -n MyNatRule \
-            --floating-ip false --idle-timeout 5
+    syntax: >-
+      az network lb inbound-nat-rule update -g MyResourceGroup --lb-name MyLb -n MyNatRule \
+          --floating-ip false --idle-timeout 5
   - summary: Update an inbound NAT rule. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-rule update --backend-port 3389 --frontend-port 5432 --lb-name MyLb --name MyNatRule --protocol Udp --resource-group MyResourceGroup
+    syntax: az network lb inbound-nat-rule update --backend-port 3389 --frontend-port 5432 --lb-name MyLb --name MyNatRule --protocol Udp --resource-group MyResourceGroup
   - summary: Update an inbound NAT rule. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-rule update --lb-name MyLb --name MyNatRule --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
-  parameters:
+    syntax: az network lb inbound-nat-rule update --lb-name MyLb --name MyNatRule --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --backend-port
     summary: Port number.
     description: ''
@@ -192,6 +202,9 @@ items:
     parameterValueGroup: false, true
     summary: Enable floating IP.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip-name
     summary: The name of the frontend IP configuration.
     description: ''
@@ -201,10 +214,6 @@ items:
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
-  - name: --protocol
-    parameterValueGroup: Tcp, Udp
-    summary: Network transport protocol.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -214,46 +223,29 @@ items:
   - name: --name -n
     summary: The name of the inbound NAT rule.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: Tcp, Udp
+    summary: Network transport protocol.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_inbound_nat_rule_create
-  name: az network lb inbound-nat-rule create
-  summary: Create an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_delete
-  name: az network lb inbound-nat-rule delete
-  summary: Delete an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_list
-  name: az network lb inbound-nat-rule list
-  summary: List inbound NAT rules.
-- uid: az_network_lb_inbound_nat_rule_show
-  name: az network lb inbound-nat-rule show
-  summary: Get the details of an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_update
-  name: az network lb inbound-nat-rule update
-  summary: Update an inbound NAT rule.
+- az_network_lb_inbound-nat-rule_create
+- az_network_lb_inbound-nat-rule_delete
+- az_network_lb_inbound-nat-rule_list
+- az_network_lb_inbound-nat-rule_show
+- az_network_lb_inbound-nat-rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -269,10 +261,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage inbound NAT rules of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage inbound NAT rules of a load balancer.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/probe.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/probe.yml
index 8cf02b6311..a22bd3fd69 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb/probe.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/probe.yml
@@ -1,35 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_probe
-  name: az network lb probe
-  summary: Evaluate probe information and define routing rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_probe_create
-  - az_network_lb_probe_delete
-  - az_network_lb_probe_list
-  - az_network_lb_probe_show
-  - az_network_lb_probe_update
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_probe
+name: az network lb probe
+summary: Evaluate probe information and define routing rules.
+description: ''
+directCommands:
 - uid: az_network_lb_probe_create
   name: az network lb probe create
   summary: Create a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe create --lb-name
+                               --name
+                               --port
+                               --protocol {Http, Tcp}
+                               --resource-group
+                               [--interval]
+                               [--path]
+                               [--subscription]
+                               [--threshold]
   examples:
   - summary: Create a probe on a load balancer over HTTP and port 80.
-    syntax:
-      content: >-
-        az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
-            --protocol http --port 80 --path /
+    syntax: >-
+      az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol http --port 80 --path /
   - summary: Create a probe on a load balancer over TCP on port 443.
-    syntax:
-      content: >-
-        az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
-            --protocol tcp --port 443
-  parameters:
+    syntax: >-
+      az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol tcp --port 443
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The load balancer name.
@@ -49,37 +47,35 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --interval
     summary: Probing time interval in seconds.
     description: ''
   - name: --path
     summary: The endpoint to interrogate (http only).
     description: ''
-  - name: --threshold
-    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_delete
   name: az network lb probe delete
   summary: Delete a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe delete --lb-name
+                               --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Delete a probe.
-    syntax:
-      content: az network lb probe delete -g MyResourceGroup --lb-name MyLb -n MyProbe
-  parameters:
+    syntax: az network lb probe delete -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -90,56 +86,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_list
   name: az network lb probe list
   summary: List probes.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe list --lb-name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List probes.
-    syntax:
-      content: az network lb probe list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb probe list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_show
   name: az network lb probe show
   summary: Get the details of a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe show --lb-name
+                             --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get the details of a probe.
-    syntax:
-      content: az network lb probe show -g MyResourceGroup --lb-name MyLb -n MyProbe
-  parameters:
+    syntax: az network lb probe show -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -150,93 +146,91 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_update
   name: az network lb probe update
   summary: Update a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe update [--add]
+                               [--force-string]
+                               [--ids]
+                               [--interval]
+                               [--lb-name]
+                               [--name]
+                               [--path]
+                               [--port]
+                               [--protocol {Http, Tcp}]
+                               [--remove]
+                               [--resource-group]
+                               [--set]
+                               [--subscription]
+                               [--threshold]
   examples:
   - summary: Update a probe with a different port and interval.
-    syntax:
-      content: az network lb probe update -g MyResourceGroup --lb-name MyLb -n MyProbe --port 81 --interval 10
-  parameters:
-  - name: --interval
-    summary: Probing time interval in seconds.
-    description: ''
-  - name: --path
-    summary: The endpoint to interrogate (http only).
-    description: ''
-  - name: --port
-    summary: The port to interrogate.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Tcp
-    summary: The protocol to probe.
+    syntax: az network lb probe update -g MyResourceGroup --lb-name MyLb -n MyProbe --port 81 --interval 10
+  - summary: Update a probe. (autogenerated)
+    syntax: az network lb probe update --lb-name MyLb --name MyProbe --port 81 --protocol Http --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --threshold
-    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --interval
+    summary: Probing time interval in seconds.
+    description: ''
   - name: --lb-name
     summary: The load balancer name.
     description: ''
   - name: --name -n
     summary: The name of the probe.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --path
+    summary: The endpoint to interrogate (http only).
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --port
+    summary: The port to interrogate.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: Http, Tcp
+    summary: The protocol to probe.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_probe_create
-  name: az network lb probe create
-  summary: Create a probe.
-- uid: az_network_lb_probe_delete
-  name: az network lb probe delete
-  summary: Delete a probe.
-- uid: az_network_lb_probe_list
-  name: az network lb probe list
-  summary: List probes.
-- uid: az_network_lb_probe_show
-  name: az network lb probe show
-  summary: Get the details of a probe.
-- uid: az_network_lb_probe_update
-  name: az network lb probe update
-  summary: Update a probe.
+- az_network_lb_probe_create
+- az_network_lb_probe_delete
+- az_network_lb_probe_list
+- az_network_lb_probe_show
+- az_network_lb_probe_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -252,10 +246,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Evaluate probe information and define routing rules.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Evaluate probe information and define routing rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/lb/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/lb/rule.yml
index fbd343c019..b181f44559 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/lb/rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/lb/rule.yml
@@ -1,43 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_rule
-  name: az network lb rule
-  summary: Manage load balancing rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_rule_create
-  - az_network_lb_rule_delete
-  - az_network_lb_rule_list
-  - az_network_lb_rule_show
-  - az_network_lb_rule_update
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_rule
+name: az network lb rule
+summary: Manage load balancing rules.
+description: ''
+directCommands:
 - uid: az_network_lb_rule_create
   name: az network lb rule create
   summary: Create a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule create --backend-port
+                              --frontend-port
+                              --lb-name
+                              --name
+                              --protocol {Tcp, Udp}
+                              --resource-group
+                              [--backend-pool-name]
+                              [--floating-ip {false, true}]
+                              [--frontend-ip-name]
+                              [--idle-timeout]
+                              [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                              [--probe-name]
+                              [--subscription]
   examples:
   - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port.
-    syntax:
-      content: >-
-        az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
-            --frontend-ip-name MyFrontEndIp --frontend-port 80 \
-            --backend-pool-name MyAddressPool --backend-port 80
+    syntax: >-
+      az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --frontend-port 80 \
+          --backend-pool-name MyAddressPool --backend-port 80
   - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port with the floating ip feature.
-    syntax:
-      content: >-
-        az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
-            --frontend-ip-name MyFrontEndIp --backend-pool-name MyAddressPool  \
-            --floating-ip true --frontend-port 80 --backend-port 80
+    syntax: >-
+      az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --backend-pool-name MyAddressPool  \
+          --floating-ip true --frontend-port 80 --backend-port 80
   - summary: Create an HA ports load balancing rule that assigns a frontend IP and port to use all available backend IPs in a pool on the same port.
-    syntax:
-      content: >-
-        az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyHAPortsRule \
-            --protocol All --frontend-port 0 --backend-port 0 --frontend-ip-name MyFrontendIp \
-            --backend-pool-name MyAddressPool
-  parameters:
+    syntax: >-
+      az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyHAPortsRule \
+          --protocol All --frontend-port 0 --backend-port 0 --frontend-ip-name MyFrontendIp \
+          --backend-pool-name MyAddressPool
+  requiredParameters:
   - isRequired: true
     name: --backend-port
     summary: Port number.
@@ -61,8 +62,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --backend-pool-name
     summary: The name of the backend address pool. If only one exists, omit to use as default.
     description: ''
@@ -87,23 +89,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_delete
   name: az network lb rule delete
   summary: Delete a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule delete --lb-name
+                              --name
+                              --resource-group
+                              [--subscription]
   examples:
   - summary: Delete a load balancing rule.
-    syntax:
-      content: az network lb rule delete -g MyResourceGroup --lb-name MyLb -n MyLbRule
-  parameters:
+    syntax: az network lb rule delete -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -114,56 +113,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_list
   name: az network lb rule list
   summary: List load balancing rules.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule list --lb-name
+                            --resource-group
+                            [--query-examples]
+                            [--subscription]
   examples:
   - summary: List load balancing rules.
-    syntax:
-      content: az network lb rule list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb rule list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_show
   name: az network lb rule show
   summary: Get the details of a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule show --lb-name
+                            --name
+                            --resource-group
+                            [--query-examples]
+                            [--subscription]
   examples:
   - summary: Get the details of a load balancing rule.
-    syntax:
-      content: az network lb rule show -g MyResourceGroup --lb-name MyLb -n MyLbRule
-  parameters:
+    syntax: az network lb rule show -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -174,34 +173,52 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_update
   name: az network lb rule update
   summary: Update a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule update [--add]
+                              [--backend-pool-name]
+                              [--backend-port]
+                              [--floating-ip {false, true}]
+                              [--force-string]
+                              [--frontend-ip-name]
+                              [--frontend-port]
+                              [--idle-timeout]
+                              [--ids]
+                              [--lb-name]
+                              [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                              [--name]
+                              [--probe-name]
+                              [--protocol {Tcp, Udp}]
+                              [--remove]
+                              [--resource-group]
+                              [--set]
+                              [--subscription]
   examples:
   - summary: Update a load balancing rule to change the protocol to UDP.
-    syntax:
-      content: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Udp
+    syntax: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Udp
   - summary: Update a load balancing rule to support HA ports.
-    syntax:
-      content: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule \ --protocol All --frontend-port 0 --backend-port 0
+    syntax: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule \ --protocol All --frontend-port 0 --backend-port 0
+  - summary: Update a load balancing rule. (autogenerated)
+    syntax: az network lb rule update --disable-outbound-snat true --lb-name MyLb --name MyLbRule --resource-group MyResourceGroup
   - summary: Update a load balancing rule. (autogenerated)
-    syntax:
-      content: az network lb rule update --disable-outbound-snat true --lb-name MyLb --name MyLbRule --resource-group MyResourceGroup
-  parameters:
+    syntax: az network lb rule update --idle-timeout 5 --lb-name MyLb --name MyLbRule --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --backend-pool-name
     summary: The name of the backend address pool.
     description: ''
@@ -212,6 +229,9 @@ items:
     parameterValueGroup: false, true
     summary: Enable floating IP.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip-name
     summary: The name of the frontend IP configuration.
     description: ''
@@ -221,11 +241,20 @@ items:
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
   - name: --load-distribution
     defaultValue: default
     parameterValueGroup: Default, SourceIP, SourceIPProtocol
     summary: Affinity rule settings.
     description: ''
+  - name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
   - name: --probe-name
     summary: Name of an existing probe to associate with this rule.
     description: ''
@@ -233,55 +262,25 @@ items:
     parameterValueGroup: Tcp, Udp
     summary: Network transport protocol.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --lb-name
-    summary: The load balancer name.
-    description: ''
-  - name: --name -n
-    summary: The name of the load balancing rule.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_rule_create
-  name: az network lb rule create
-  summary: Create a load balancing rule.
-- uid: az_network_lb_rule_delete
-  name: az network lb rule delete
-  summary: Delete a load balancing rule.
-- uid: az_network_lb_rule_list
-  name: az network lb rule list
-  summary: List load balancing rules.
-- uid: az_network_lb_rule_show
-  name: az network lb rule show
-  summary: Get the details of a load balancing rule.
-- uid: az_network_lb_rule_update
-  name: az network lb rule update
-  summary: Update a load balancing rule.
+- az_network_lb_rule_create
+- az_network_lb_rule_delete
+- az_network_lb_rule_list
+- az_network_lb_rule_show
+- az_network_lb_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -297,10 +296,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage load balancing rules.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage load balancing rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/local-gateway.yml b/2017-03-09-profile/docs-ref-autogen/network/local-gateway.yml
index ad861c20b0..689256798e 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/local-gateway.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/local-gateway.yml
@@ -1,31 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_local_gateway
-  name: az network local-gateway
-  summary: Manage local gateways.
-  description: 'For more information on local gateways, visit: <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet</a>.'
-  langs:
-  - azurecli
-  children:
-  - az_network_local_gateway_create
-  - az_network_local_gateway_delete
-  - az_network_local_gateway_list
-  - az_network_local_gateway_show
-  - az_network_local_gateway_update
-  - az_network_local_gateway_wait
-- uid: az_network_local_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_local-gateway
+name: az network local-gateway
+summary: Manage local gateways.
+description: 'For more information on local gateways, visit: https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet.'
+directCommands:
+- uid: az_network_local-gateway_create
   name: az network local-gateway create
   summary: Create a local VPN gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway create --gateway-ip-address
+                                    --name
+                                    --resource-group
+                                    [--asn]
+                                    [--bgp-peering-address]
+                                    [--local-address-prefixes]
+                                    [--location]
+                                    [--no-wait]
+                                    [--peer-weight]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Create a Local Network Gateway to represent your on-premises site.
-    syntax:
-      content: >-
-        az network local-gateway create -g MyResourceGroup -n MyLocalGateway \
-            --gateway-ip-address 23.99.221.164 --local-address-prefixes 10.0.0.0/24 20.0.0.0/24
-  parameters:
+    syntax: >-
+      az network local-gateway create -g MyResourceGroup -n MyLocalGateway \
+          --gateway-ip-address 23.99.221.164 --local-address-prefixes 10.0.0.0/24 20.0.0.0/24
+  requiredParameters:
   - isRequired: true
     name: --gateway-ip-address
     summary: Gateway's public IP address. (e.g. 10.1.1.1).
@@ -36,216 +36,214 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: Autonomous System Number to use for the BGP settings.
+    description: ''
+  - name: --bgp-peering-address
+    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
     description: ''
   - name: --local-address-prefixes
     summary: List of CIDR block prefixes representing the address space of the OnPremise VPN's subnet.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --asn
-    summary: Autonomous System Number to use for the BGP settings.
-    description: ''
-  - name: --bgp-peering-address
-    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
-    description: ''
   - name: --peer-weight
     summary: Weight (0-100) added to routes learned through BGP peering.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_delete
   name: az network local-gateway delete
   summary: Delete a local VPN gateway.
-  description: 'In order to delete a Local Network Gateway, you must first delete ALL Connection objects in Azure that are connected to the Gateway. After deleting the Gateway, proceed to delete other resources now not in use. For more information, follow the order of instructions on this page: <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal</a>.'
-  langs:
-  - azurecli
+  description: 'In order to delete a Local Network Gateway, you must first delete ALL Connection objects in Azure that are connected to the Gateway. After deleting the Gateway, proceed to delete other resources now not in use. For more information, follow the order of instructions on this page: https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal.'
+  syntax: >-
+    az network local-gateway delete [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Create a Local Network Gateway to represent your on-premises site.
-    syntax:
-      content: az network local-gateway delete -g MyResourceGroup -n MyLocalGateway
+    syntax: az network local-gateway delete -g MyResourceGroup -n MyLocalGateway
   - summary: Delete a local VPN gateway. (autogenerated)
-    syntax:
-      content: az network local-gateway delete --name MyLocalGateway --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network local-gateway delete --name MyLocalGateway --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the local network gateway.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_list
   name: az network local-gateway list
   summary: List all local VPN gateways in a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway list --resource-group
+                                  [--query-examples]
+                                  [--subscription]
   examples:
   - summary: List all local VPN gateways in a resource group.
-    syntax:
-      content: az network local-gateway list -g MyResourceGroup
-  parameters:
+    syntax: az network local-gateway list -g MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_show
   name: az network local-gateway show
   summary: Get the details of a local VPN gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway show [--ids]
+                                  [--name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Get the details of a local VPN gateway.
-    syntax:
-      content: az network local-gateway show -g MyResourceGroup -n MyLocalGateway
-  parameters:
+    syntax: az network local-gateway show -g MyResourceGroup -n MyLocalGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the local network gateway.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_update
   name: az network local-gateway update
   summary: Update a local VPN gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway update [--add]
+                                    [--asn]
+                                    [--bgp-peering-address]
+                                    [--force-string]
+                                    [--gateway-ip-address]
+                                    [--ids]
+                                    [--local-address-prefixes]
+                                    [--name]
+                                    [--no-wait]
+                                    [--peer-weight]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Update a Local Network Gateway provisioned with a 10.0.0.0/24 address prefix with additional prefixes.
-    syntax:
-      content: >-
-        az network local-gateway update -g MyResourceGroup -n MyLocalGateway \
-            --local-address-prefixes 10.0.0.0/24 20.0.0.0/24 30.0.0.0/24
+    syntax: >-
+      az network local-gateway update -g MyResourceGroup -n MyLocalGateway \
+          --local-address-prefixes 10.0.0.0/24 20.0.0.0/24 30.0.0.0/24
   - summary: Update a local VPN gateway. (autogenerated)
-    syntax:
-      content: az network local-gateway update --gateway-ip-address 23.99.221.164 --name MyLocalGateway --resource-group MyResourceGroup
-  parameters:
-  - name: --gateway-ip-address
-    summary: Gateway's public IP address. (e.g. 10.1.1.1).
+    syntax: az network local-gateway update --gateway-ip-address 23.99.221.164 --name MyLocalGateway --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --local-address-prefixes
-    summary: List of CIDR block prefixes representing the address space of the OnPremise VPN's subnet.
+  - name: --asn
+    summary: Autonomous System Number to use for the BGP settings.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --bgp-peering-address
+    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-ip-address
+    summary: Gateway's public IP address. (e.g. 10.1.1.1).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --local-address-prefixes
+    summary: List of CIDR block prefixes representing the address space of the OnPremise VPN's subnet.
+    description: ''
   - name: --name -n
     summary: Name of the local network gateway.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --asn
-    summary: Autonomous System Number to use for the BGP settings.
-    description: ''
-  - name: --bgp-peering-address
-    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --peer-weight
     summary: Weight (0-100) added to routes learned through BGP peering.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_wait
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_wait
   name: az network local-gateway wait
   summary: Place the CLI in a waiting state until a condition of the local gateway is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway wait [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--ids]
+                                  [--interval]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
   examples:
   - summary: Wait for Local Network Gateway to return as created.
-    syntax:
-      content: az network local-gateway wait -g MyResourceGroup -n MyLocalGateway --created
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the local network gateway.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network local-gateway wait -g MyResourceGroup -n MyLocalGateway --created
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -258,10 +256,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the local network gateway.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -269,31 +279,14 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_local_gateway_create
-  name: az network local-gateway create
-  summary: Create a local VPN gateway.
-- uid: az_network_local_gateway_delete
-  name: az network local-gateway delete
-  summary: Delete a local VPN gateway.
-- uid: az_network_local_gateway_list
-  name: az network local-gateway list
-  summary: List all local VPN gateways in a resource group.
-- uid: az_network_local_gateway_show
-  name: az network local-gateway show
-  summary: Get the details of a local VPN gateway.
-- uid: az_network_local_gateway_update
-  name: az network local-gateway update
-  summary: Update a local VPN gateway.
-- uid: az_network_local_gateway_wait
-  name: az network local-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the local gateway is met.
+- az_network_local-gateway_create
+- az_network_local-gateway_delete
+- az_network_local-gateway_list
+- az_network_local-gateway_show
+- az_network_local-gateway_update
+- az_network_local-gateway_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -309,10 +302,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: 'For more information on local gateways, visit: <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet</a>.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: 'For more information on local gateways, visit: https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet.'
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nic.yml b/2017-03-09-profile/docs-ref-autogen/network/nic.yml
index 2b2bb1283f..42b91fe832 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/nic.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/nic.yml
@@ -1,57 +1,85 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-  description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_create
-  - az_network_nic_delete
-  - az_network_nic_list
-  - az_network_nic_show
-  - az_network_nic_update
-  - az_network_nic_wait
+### YamlMime:AzureCLIGroup
+uid: az_network_nic
+name: az network nic
+summary: Manage network interfaces.
+description: To learn more about network interfaces in Azure visit https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface.
+directCommands:
 - uid: az_network_nic_create
   name: az network nic create
   summary: Create a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic create --name
+                          --resource-group
+                          --subnet
+                          [--app-gateway-address-pools]
+                          [--dns-servers]
+                          [--gateway-name]
+                          [--internal-dns-name]
+                          [--ip-forwarding {false, true}]
+                          [--lb-address-pools]
+                          [--lb-inbound-nat-rules]
+                          [--lb-name]
+                          [--location]
+                          [--network-security-group]
+                          [--no-wait]
+                          [--private-ip-address]
+                          [--public-ip-address]
+                          [--subscription]
+                          [--tags]
+                          [--vnet-name]
   examples:
   - summary: Create a network interface for a specified subnet on a specified virtual network.
-    syntax:
-      content: az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic
+    syntax: az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic
   - summary: Create a network interface for a specified subnet on a virtual network which allows
-    syntax:
-      content: >-
-        az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
-            --ip-forwarding --network-security-group MyNsg
+    syntax: >-
+      az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
+          --ip-forwarding --network-security-group MyNsg
   - summary: Create a network interface for a specified subnet on a virtual network with network security group and application security groups.
-    syntax:
-      content: >-
-        az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
-            --network-security-group MyNsg --application-security-groups Web App
-  parameters:
+    syntax: >-
+      az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
+          --network-security-group MyNsg --application-security-groups Web App
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The network interface (NIC).
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --subnet
     summary: Name or ID of an existing subnet. If name specified, also specify --vnet-name. If you want to use an existing subnet in other resource group, please provide the ID instead of the name of the subnet.
     description: ''
+  optionalParameters:
+  - name: --app-gateway-address-pools
+    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --gateway-name
+    summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
+    description: ''
+  - name: --internal-dns-name
+    summary: The internal DNS name label.
+    description: ''
   - name: --ip-forwarding
     parameterValueGroup: false, true
     summary: Enable IP forwarding.
     description: ''
+  - name: --lb-address-pools
+    summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
+    description: ''
+  - name: --lb-inbound-nat-rules
+    summary: Space-separated list of names or IDs of load balancer inbound NAT rules to associate with the NIC. If names are used, --lb-name must be specified.
+    description: ''
+  - name: --lb-name
+    summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --network-security-group
     summary: Name or ID of an existing network security group, or none by default.
@@ -65,108 +93,83 @@ items:
   - name: --public-ip-address
     summary: Name or ID of an existing public IP address, or none by default.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --app-gateway-address-pools
-    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
-    description: ''
-  - name: --gateway-name
-    summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
-    description: ''
-  - name: --dns-servers
-    summary: Space-separated list of DNS server IP addresses.
-    description: ''
-  - name: --internal-dns-name
-    summary: The internal DNS name label.
-    description: ''
-  - name: --lb-address-pools
-    summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
-    description: ''
-  - name: --lb-inbound-nat-rules
-    summary: Space-separated list of names or IDs of load balancer inbound NAT rules to associate with the NIC. If names are used, --lb-name must be specified.
-    description: ''
-  - name: --lb-name
-    summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_delete
   name: az network nic delete
   summary: Delete a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic delete [--ids]
+                          [--name]
+                          [--no-wait]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Delete a network interface.
-    syntax:
-      content: az network nic delete -g MyResourceGroup -n MyNic
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network nic delete -g MyResourceGroup -n MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The network interface (NIC).
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_list
   name: az network nic list
   summary: List network interfaces.
   description: To list network interfaces attached to VMs in VM scale sets use 'az vmss nic list' or 'az vmss nic list-vm-nics'.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic list [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: List all NICs by internal DNS suffix.
-    syntax:
-      content: az network nic list --query "[?dnsSettings.internalDomainNameSuffix=`{dnsSuffix}`]"
-  parameters:
+    syntax: az network nic list --query "[?dnsSettings.internalDomainNameSuffix=`{dnsSuffix}`]"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_show
   name: az network nic show
   summary: Get the details of a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic show [--expand]
+                        [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Get the internal domain name suffix of a NIC.
-    syntax:
-      content: az network nic show -g MyResourceGroup -n MyNic --query "dnsSettings.internalDomainNameSuffix"
-  parameters:
+    syntax: az network nic show -g MyResourceGroup -n MyNic --query "dnsSettings.internalDomainNameSuffix"
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -176,104 +179,104 @@ items:
   - name: --name -n
     summary: The network interface (NIC).
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_update
   name: az network nic update
   summary: Update a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic update [--add]
+                          [--dns-servers]
+                          [--force-string]
+                          [--ids]
+                          [--internal-dns-name]
+                          [--ip-forwarding {false, true}]
+                          [--name]
+                          [--network-security-group]
+                          [--no-wait]
+                          [--remove]
+                          [--resource-group]
+                          [--set]
+                          [--subscription]
   examples:
   - summary: Update a network interface to use a different network security group.
-    syntax:
-      content: az network nic update -g MyResourceGroup -n MyNic --network-security-group MyNewNsg
+    syntax: az network nic update -g MyResourceGroup -n MyNic --network-security-group MyNewNsg
   - summary: Update a network interface. (autogenerated)
-    syntax:
-      content: az network nic update --accelerated-networking true --name MyNic --resource-group MyResourceGroup
-  parameters:
-  - name: --ip-forwarding
-    parameterValueGroup: false, true
-    summary: Enable IP forwarding.
+    syntax: az network nic update --accelerated-networking true --name MyNic --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --network-security-group
-    summary: Name or ID of the associated network security group.
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses. Use ""('""' in PowerShell) to revert to default Azure servers.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --name -n
-    summary: The network interface (NIC).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --dns-servers
-    summary: Space-separated list of DNS server IP addresses. Use "" to revert to default Azure servers.
-    description: ''
   - name: --internal-dns-name
     summary: The internal DNS name label.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --ip-forwarding
+    parameterValueGroup: false, true
+    summary: Enable IP forwarding.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --name -n
+    summary: The network interface (NIC).
+    description: ''
+  - name: --network-security-group
+    summary: Name or ID of the associated network security group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_wait
   name: az network nic wait
   summary: Place the CLI in a waiting state until a condition of the network interface is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic wait [--created]
+                        [--custom]
+                        [--deleted]
+                        [--exists]
+                        [--expand]
+                        [--ids]
+                        [--interval]
+                        [--name]
+                        [--resource-group]
+                        [--subscription]
+                        [--timeout]
+                        [--updated]
   examples:
   - summary: Pause CLI until the network interface is created.
-    syntax:
-      content: az network nic wait -g MyResourceGroup -n MyNic --created
-  parameters:
-  - name: --expand
-    summary: Expands referenced resources.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The network interface (NIC).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network nic wait -g MyResourceGroup -n MyNic --created
+  - summary: Place the CLI in a waiting state until a condition of the network interface is met. (autogenerated)
+    syntax: az network nic wait --deleted --name MyNic --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -286,10 +289,25 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The network interface (NIC).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -297,67 +315,31 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_create
-  name: az network nic create
-  summary: Create a network interface.
-- uid: az_network_nic_delete
-  name: az network nic delete
-  summary: Delete a network interface.
-- uid: az_network_nic_ip_config
-  name: az network nic ip-config
-  summary: Manage IP configurations of a network interface.
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
-- uid: az_network_nic_ip_config_create
-  name: az network nic ip-config create
-  summary: Create an IP configuration.
-- uid: az_network_nic_ip_config_delete
-  name: az network nic ip-config delete
-  summary: Delete an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
-- uid: az_network_nic_ip_config_list
-  name: az network nic ip-config list
-  summary: List the IP configurations of a NIC.
-- uid: az_network_nic_ip_config_show
-  name: az network nic ip-config show
-  summary: Show the details of an IP configuration.
-- uid: az_network_nic_ip_config_update
-  name: az network nic ip-config update
-  summary: Update an IP configuration.
-- uid: az_network_nic_list
-  name: az network nic list
-  summary: List network interfaces.
-- uid: az_network_nic_show
-  name: az network nic show
-  summary: Get the details of a network interface.
-- uid: az_network_nic_update
-  name: az network nic update
-  summary: Update a network interface.
-- uid: az_network_nic_wait
-  name: az network nic wait
-  summary: Place the CLI in a waiting state until a condition of the network interface is met.
+- az_network_nic_create
+- az_network_nic_delete
+- az_network_nic_ip-config
+- az_network_nic_ip-config_address-pool
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
+- az_network_nic_ip-config_create
+- az_network_nic_ip-config_delete
+- az_network_nic_ip-config_inbound-nat-rule
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
+- az_network_nic_ip-config_list
+- az_network_nic_ip-config_show
+- az_network_nic_ip-config_update
+- az_network_nic_list
+- az_network_nic_show
+- az_network_nic_update
+- az_network_nic_vtap-config
+- az_network_nic_vtap-config_create
+- az_network_nic_vtap-config_delete
+- az_network_nic_vtap-config_list
+- az_network_nic_vtap-config_show
+- az_network_nic_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -373,10 +355,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about network interfaces in Azure visit https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config.yml b/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config.yml
index 66613e9855..d635a68e42 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config.yml
@@ -1,31 +1,35 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic_ip_config
-  name: az network nic ip-config
-  summary: Manage IP configurations of a network interface.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_ip_config_create
-  - az_network_nic_ip_config_delete
-  - az_network_nic_ip_config_list
-  - az_network_nic_ip_config_show
-  - az_network_nic_ip_config_update
-- uid: az_network_nic_ip_config_create
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_ip-config
+name: az network nic ip-config
+summary: Manage IP configurations of a network interface.
+description: ''
+directCommands:
+- uid: az_network_nic_ip-config_create
   name: az network nic ip-config create
   summary: Create an IP configuration.
   description: You must have the Microsoft.Network/AllowMultipleIpConfigurationsPerNic feature enabled for your subscription. Only one configuration may be designated as the primary IP configuration per NIC, using the `--make-primary` flag.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config create --name
+                                    --nic-name
+                                    --resource-group
+                                    [--app-gateway-address-pools]
+                                    [--gateway-name]
+                                    [--lb-address-pools]
+                                    [--lb-inbound-nat-rules]
+                                    [--lb-name]
+                                    [--make-primary]
+                                    [--private-ip-address]
+                                    [--private-ip-address-version]
+                                    [--public-ip-address]
+                                    [--subnet]
+                                    [--subscription]
+                                    [--vnet-name]
   examples:
   - summary: Create a primary IP configuration for a NIC.
-    syntax:
-      content: az network nic ip-config create -g MyResourceGroup -n MyIpConfig --nic-name MyNic --make-primary
+    syntax: az network nic ip-config create -g MyResourceGroup -n MyIpConfig --nic-name MyNic --make-primary
   - summary: Create an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config create --name MyIpConfig --nic-name MyNic --private-ip-address 10.0.0.9 --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config create --name MyIpConfig --nic-name MyNic --private-ip-address 10.0.0.9 --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the IP configuration.
@@ -36,26 +40,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --make-primary
-    summary: Set to make this configuration the primary one for the NIC.
-    description: ''
-  - name: --private-ip-address
-    summary: Static IP address to use or "" to use a dynamic address.
-    description: ''
-  - name: --private-ip-address-version
-    summary: ''
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the public IP to use.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
-    description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --app-gateway-address-pools
     summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
     description: ''
@@ -71,26 +58,42 @@ items:
   - name: --lb-name
     summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
     description: ''
+  - name: --make-primary
+    summary: Set to make this configuration the primary one for the NIC.
+    description: ''
+  - name: --private-ip-address
+    summary: Static IP address to use or ""('""' in PowerShell) to use a dynamic address.
+    description: ''
+  - name: --private-ip-address-version
+    summary: ''
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP to use.
+    description: ''
+  - name: --subnet
+    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_delete
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_delete
   name: az network nic ip-config delete
   summary: Delete an IP configuration.
   description: A NIC must have at least one IP configuration.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config delete [--ids]
+                                    [--name]
+                                    [--nic-name]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Delete an IP configuration.
-    syntax:
-      content: az network nic ip-config delete -g MyResourceGroup -n MyIpConfig --nic-name MyNic
-  parameters:
+    syntax: az network nic ip-config delete -g MyResourceGroup -n MyIpConfig --nic-name MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -101,56 +104,56 @@ items:
     summary: The network interface (NIC).
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_list
   name: az network nic ip-config list
   summary: List the IP configurations of a NIC.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config list --nic-name
+                                  --resource-group
+                                  [--query-examples]
+                                  [--subscription]
   examples:
   - summary: List the IP configurations of a NIC.
-    syntax:
-      content: az network nic ip-config list -g MyResourceGroup --nic-name MyNic
-  parameters:
+    syntax: az network nic ip-config list -g MyResourceGroup --nic-name MyNic
+  requiredParameters:
   - isRequired: true
     name: --nic-name
     summary: The network interface (NIC).
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_show
   name: az network nic ip-config show
   summary: Show the details of an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config show [--ids]
+                                  [--name]
+                                  [--nic-name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Show the details of an IP configuration of a NIC.
-    syntax:
-      content: az network nic ip-config show -g MyResourceGroup -n MyIpConfig --nic-name MyNic
-  parameters:
+    syntax: az network nic ip-config show -g MyResourceGroup -n MyIpConfig --nic-name MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -160,56 +163,61 @@ items:
   - name: --nic-name
     summary: The network interface (NIC).
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_update
   name: az network nic ip-config update
   summary: Update an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config update [--add]
+                                    [--app-gateway-address-pools]
+                                    [--force-string]
+                                    [--gateway-name]
+                                    [--ids]
+                                    [--lb-address-pools]
+                                    [--lb-inbound-nat-rules]
+                                    [--lb-name]
+                                    [--make-primary]
+                                    [--name]
+                                    [--nic-name]
+                                    [--private-ip-address]
+                                    [--private-ip-address-version]
+                                    [--public-ip-address]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+                                    [--subnet]
+                                    [--subscription]
+                                    [--vnet-name]
   examples:
   - summary: Update a NIC to use a new private IP address.
-    syntax:
-      content: >-
-        az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --private-ip-address 10.0.0.9
+    syntax: >-
+      az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --private-ip-address 10.0.0.9
   - summary: Make an IP configuration the default for the supplied NIC.
-    syntax:
-      content: >-
-        az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --make-primary
+    syntax: >-
+      az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --make-primary
   - summary: Update an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config update --name MyIpConfig --nic-name MyNic --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup
-  parameters:
-  - name: --make-primary
-    summary: Set to make this configuration the primary one for the NIC.
-    description: ''
-  - name: --private-ip-address
-    summary: Static IP address to use or "" to use a dynamic address.
-    description: ''
-  - name: --private-ip-address-version
-    summary: ''
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the public IP to use.
+    syntax: az network nic ip-config update --name MyIpConfig --nic-name MyNic --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --subnet
-    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+  - name: --app-gateway-address-pools
+    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
@@ -217,21 +225,6 @@ items:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --name -n
-    summary: The name of the IP configuration.
-    description: ''
-  - name: --nic-name
-    summary: The network interface (NIC).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --app-gateway-address-pools
-    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
-    description: ''
   - name: --lb-address-pools
     summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
     description: ''
@@ -241,58 +234,55 @@ items:
   - name: --lb-name
     summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --make-primary
+    summary: Set to make this configuration the primary one for the NIC.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --name -n
+    summary: The name of the IP configuration.
+    description: ''
+  - name: --nic-name
+    summary: The network interface (NIC).
+    description: ''
+  - name: --private-ip-address
+    summary: Static IP address to use or ""('""' in PowerShell) to use a dynamic address.
+    description: ''
+  - name: --private-ip-address-version
+    summary: ''
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP to use.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subnet
+    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
-- uid: az_network_nic_ip_config_create
-  name: az network nic ip-config create
-  summary: Create an IP configuration.
-- uid: az_network_nic_ip_config_delete
-  name: az network nic ip-config delete
-  summary: Delete an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
-- uid: az_network_nic_ip_config_list
-  name: az network nic ip-config list
-  summary: List the IP configurations of a NIC.
-- uid: az_network_nic_ip_config_show
-  name: az network nic ip-config show
-  summary: Show the details of an IP configuration.
-- uid: az_network_nic_ip_config_update
-  name: az network nic ip-config update
-  summary: Update an IP configuration.
+- az_network_nic_ip-config_address-pool
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
+- az_network_nic_ip-config_create
+- az_network_nic_ip-config_delete
+- az_network_nic_ip-config_inbound-nat-rule
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
+- az_network_nic_ip-config_list
+- az_network_nic_ip-config_show
+- az_network_nic_ip-config_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -308,10 +298,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage IP configurations of a network interface.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage IP configurations of a network interface.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/address-pool.yml b/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/address-pool.yml
index 7fda258d4e..87419fb8fb 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/address-pool.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/address-pool.yml
@@ -1,30 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_ip_config_address_pool_add
-  - az_network_nic_ip_config_address_pool_remove
-- uid: az_network_nic_ip_config_address_pool_add
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_ip-config_address-pool
+name: az network nic ip-config address-pool
+summary: Manage address pools in an IP configuration.
+description: ''
+directCommands:
+- uid: az_network_nic_ip-config_address-pool_add
   name: az network nic ip-config address-pool add
   summary: Add an address pool to an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config address-pool add --address-pool
+                                              --ip-config-name
+                                              --nic-name
+                                              --resource-group
+                                              [--gateway-name]
+                                              [--lb-name]
+                                              [--subscription]
   examples:
   - summary: Add an address pool to an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config address-pool add -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --address-pool MyAddressPool
+    syntax: >-
+      az network nic ip-config address-pool add -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --address-pool MyAddressPool
   - summary: Add an address pool to an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config address-pool add --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config address-pool add --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --address-pool
     summary: The name or ID of an existing backend address pool.
@@ -39,8 +38,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --gateway-name
     summary: The name of an application gateway containing the address pool (Omit if suppying an address pool ID).
     description: ''
@@ -50,28 +50,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_address_pool_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_address-pool_remove
   name: az network nic ip-config address-pool remove
   summary: Remove an address pool of an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config address-pool remove --address-pool
+                                                 --ip-config-name
+                                                 --nic-name
+                                                 --resource-group
+                                                 [--gateway-name]
+                                                 [--lb-name]
+                                                 [--subscription]
   examples:
   - summary: Remove an address pool of an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config address-pool remove -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --address-pool MyAddressPool
+    syntax: >-
+      az network nic ip-config address-pool remove -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --address-pool MyAddressPool
   - summary: Remove an address pool of an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config address-pool remove --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config address-pool remove --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --address-pool
     summary: The name or ID of an existing backend address pool.
@@ -86,8 +85,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --gateway-name
     summary: The name of an application gateway containing the address pool (Omit if suppying an address pool ID).
     description: ''
@@ -97,19 +97,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -125,10 +116,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage address pools in an IP configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools in an IP configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml b/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml
index a4dcb86483..3869f0486c 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml
@@ -1,30 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_ip_config_inbound_nat_rule_add
-  - az_network_nic_ip_config_inbound_nat_rule_remove
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_ip-config_inbound-nat-rule
+name: az network nic ip-config inbound-nat-rule
+summary: Manage inbound NAT rules of an IP configuration.
+description: ''
+directCommands:
+- uid: az_network_nic_ip-config_inbound-nat-rule_add
   name: az network nic ip-config inbound-nat-rule add
   summary: Add an inbound NAT rule to an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config inbound-nat-rule add --inbound-nat-rule
+                                                  --ip-config-name
+                                                  --nic-name
+                                                  --resource-group
+                                                  [--lb-name]
+                                                  [--subscription]
   examples:
   - summary: Add an inbound NAT rule to an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config inbound-nat-rule add -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --inbound-nat-rule MyNatRule
+    syntax: >-
+      az network nic ip-config inbound-nat-rule add -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --inbound-nat-rule MyNatRule
   - summary: Add an inbound NAT rule to an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config inbound-nat-rule add --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config inbound-nat-rule add --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --inbound-nat-rule
     summary: The name or ID of an existing inbound NAT rule.
@@ -39,36 +37,35 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --lb-name
     summary: The name of the load balancer associated with the NAT rule (Omit if suppying a NAT rule ID).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_inbound-nat-rule_remove
   name: az network nic ip-config inbound-nat-rule remove
   summary: Remove an inbound NAT rule of an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config inbound-nat-rule remove --inbound-nat-rule
+                                                     --ip-config-name
+                                                     --nic-name
+                                                     --resource-group
+                                                     [--lb-name]
+                                                     [--subscription]
   examples:
   - summary: Remove an inbound NAT rule of an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config inbound-nat-rule remove -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --inbound-nat-rule MyNatRule
+    syntax: >-
+      az network nic ip-config inbound-nat-rule remove -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --inbound-nat-rule MyNatRule
   - summary: Remove an inbound NAT rule of an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config inbound-nat-rule remove --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config inbound-nat-rule remove --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --inbound-nat-rule
     summary: The name or ID of an existing inbound NAT rule.
@@ -83,27 +80,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --lb-name
     summary: The name of the load balancer associated with the NAT rule (Omit if suppying a NAT rule ID).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -119,10 +108,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage inbound NAT rules of an IP configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage inbound NAT rules of an IP configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nic/vtap-config.yml b/2017-03-09-profile/docs-ref-autogen/network/nic/vtap-config.yml
new file mode 100644
index 0000000000..5ca58e6ce0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/nic/vtap-config.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_vtap-config
+name: az network nic vtap-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-network-tap** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az network nic vtap-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual network tap configurations.
+description: ''
+directCommands:
+- uid: az_network_nic_vtap-config_create
+  name: az network nic vtap-config create
+  summary: Create a virtual network tap configuration.
+  description: ''
+  syntax: >-
+    az network nic vtap-config create --name
+                                      --nic-name
+                                      --resource-group
+                                      --vnet-tap
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual network tap configuration.
+    description: ''
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vnet-tap
+    summary: Name or ID of the virtual network tap.
+    description: ''
+- uid: az_network_nic_vtap-config_delete
+  name: az network nic vtap-config delete
+  summary: Delete a virtual network tap configuration.
+  description: ''
+  syntax: >-
+    az network nic vtap-config delete --name
+                                      --nic-name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual network tap configuration.
+    description: ''
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_nic_vtap-config_list
+  name: az network nic vtap-config list
+  summary: List virtual network tap configurations.
+  description: ''
+  syntax: >-
+    az network nic vtap-config list --nic-name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_nic_vtap-config_show
+  name: az network nic vtap-config show
+  summary: Get details of a virtual network tap configuration.
+  description: ''
+  syntax: >-
+    az network nic vtap-config show --name
+                                    --nic-name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual network tap configuration.
+    description: ''
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_nic_vtap-config_create
+- az_network_nic_vtap-config_delete
+- az_network_nic_vtap-config_list
+- az_network_nic_vtap-config_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual network tap configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nsg.yml b/2017-03-09-profile/docs-ref-autogen/network/nsg.yml
index 6f50e8f3a8..74e37304a2 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/nsg.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/nsg.yml
@@ -1,62 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nsg
-  name: az network nsg
-  summary: Manage Azure Network Security Groups (NSGs).
-  description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli">https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_nsg_create
-  - az_network_nsg_delete
-  - az_network_nsg_list
-  - az_network_nsg_show
-  - az_network_nsg_update
+### YamlMime:AzureCLIGroup
+uid: az_network_nsg
+name: az network nsg
+summary: Manage Azure Network Security Groups (NSGs).
+description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
+directCommands:
 - uid: az_network_nsg_create
   name: az network nsg create
   summary: Create a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg create --name
+                          --resource-group
+                          [--location]
+                          [--subscription]
+                          [--tags]
   examples:
   - summary: Create an NSG in a resource group within a region with tags.
-    syntax:
-      content: az network nsg create -g MyResourceGroup -n MyNsg --tags super_secure no_80 no_22
-  parameters:
+    syntax: az network nsg create -g MyResourceGroup -n MyNsg --tags super_secure no_80 no_22
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the network security group.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_delete
   name: az network nsg delete
   summary: Delete a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg delete [--ids]
+                          [--name]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Delete an NSG in a resource group.
-    syntax:
-      content: az network nsg delete -g MyResourceGroup -n MyNsg
-  parameters:
+    syntax: az network nsg delete -g MyResourceGroup -n MyNsg
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -64,57 +57,53 @@ items:
     summary: Name of the network security group.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_list
   name: az network nsg list
   summary: List network security groups.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg list [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: List all NSGs in the 'westus' region.
-    syntax:
-      content: az network nsg list --query "[?location=='westus']"
-  parameters:
+    syntax: az network nsg list --query "[?location=='westus']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_show
   name: az network nsg show
   summary: Get information about a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg show [--expand]
+                        [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Get basic information about an NSG.
-    syntax:
-      content: az network nsg show -g MyResourceGroup -n MyNsg
+    syntax: az network nsg show -g MyResourceGroup -n MyNsg
   - summary: Get the default security rules of an NSG and format the output as a table.
-    syntax:
-      content: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[]" -o table
+    syntax: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[]" -o table
   - summary: Get all default NSG rules with "Allow" access and format the output as a table.
-    syntax:
-      content: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[?access=='Allow']" -o table
-  parameters:
+    syntax: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[?access=='Allow']" -o table
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -124,96 +113,72 @@ items:
   - name: --name -n
     summary: Name of the network security group.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_update
   name: az network nsg update
   summary: Update a network security group.
   description: This command can only be used to update the tags of an NSG. Name and resource group are immutable and cannot be updated.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg update [--add]
+                          [--force-string]
+                          [--ids]
+                          [--name]
+                          [--remove]
+                          [--resource-group]
+                          [--set]
+                          [--subscription]
   examples:
   - summary: Remove a tag of an NSG.
-    syntax:
-      content: az network nsg update -g MyResourceGroup -n MyNsg --remove tags.no_80
+    syntax: az network nsg update -g MyResourceGroup -n MyNsg --remove tags.no_80
   - summary: Update a network security group. (autogenerated)
-    syntax:
-      content: az network nsg update --name MyNsg --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the network security group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network nsg update --name MyNsg --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Name of the network security group.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nsg_create
-  name: az network nsg create
-  summary: Create a network security group.
-- uid: az_network_nsg_delete
-  name: az network nsg delete
-  summary: Delete a network security group.
-- uid: az_network_nsg_list
-  name: az network nsg list
-  summary: List network security groups.
-- uid: az_network_nsg_rule
-  name: az network nsg rule
-  summary: Manage network security group rules.
-- uid: az_network_nsg_rule_create
-  name: az network nsg rule create
-  summary: Create a network security group rule.
-- uid: az_network_nsg_rule_delete
-  name: az network nsg rule delete
-  summary: Delete a network security group rule.
-- uid: az_network_nsg_rule_list
-  name: az network nsg rule list
-  summary: List all rules in a network security group.
-- uid: az_network_nsg_rule_show
-  name: az network nsg rule show
-  summary: Get the details of a network security group rule.
-- uid: az_network_nsg_rule_update
-  name: az network nsg rule update
-  summary: Update a network security group rule.
-- uid: az_network_nsg_show
-  name: az network nsg show
-  summary: Get information about a network security group.
-- uid: az_network_nsg_update
-  name: az network nsg update
-  summary: Update a network security group.
+- az_network_nsg_create
+- az_network_nsg_delete
+- az_network_nsg_list
+- az_network_nsg_rule
+- az_network_nsg_rule_create
+- az_network_nsg_rule_delete
+- az_network_nsg_rule_list
+- az_network_nsg_rule_show
+- az_network_nsg_rule_update
+- az_network_nsg_show
+- az_network_nsg_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -229,10 +194,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli">https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/nsg/rule.yml b/2017-03-09-profile/docs-ref-autogen/network/nsg/rule.yml
index aae8dae97c..b5d767ff64 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/nsg/rule.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/nsg/rule.yml
@@ -1,47 +1,47 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nsg_rule
-  name: az network nsg rule
-  summary: Manage network security group rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nsg_rule_create
-  - az_network_nsg_rule_delete
-  - az_network_nsg_rule_list
-  - az_network_nsg_rule_show
-  - az_network_nsg_rule_update
+### YamlMime:AzureCLIGroup
+uid: az_network_nsg_rule
+name: az network nsg rule
+summary: Manage network security group rules.
+description: ''
+directCommands:
 - uid: az_network_nsg_rule_create
   name: az network nsg rule create
   summary: Create a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule create --name
+                               --nsg-name
+                               --priority
+                               --resource-group
+                               [--access {Allow, Deny}]
+                               [--description]
+                               [--destination-address-prefix]
+                               [--destination-port-range]
+                               [--direction {Inbound, Outbound}]
+                               [--protocol {*, Tcp, Udp}]
+                               [--source-address-prefix]
+                               [--source-port-range]
+                               [--subscription]
   examples:
   - summary: Create a basic "Allow" NSG rule with the highest priority.
-    syntax:
-      content: az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 100
+    syntax: az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 100
   - summary: Create a "Deny" rule over TCP for a specific IP address range with the lowest priority.
-    syntax:
-      content: >-
-        az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 4096 \
-            --source-address-prefixes 208.130.28/24 --source-port-ranges 80 \
-            --destination-address-prefixes '*' --destination-port-ranges 80 8080 --access Deny \
-            --protocol Tcp --description "Deny from specific IP address ranges on 80 and 8080."
+    syntax: >-
+      az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 4096 \
+          --source-address-prefixes 208.130.28/24 --source-port-ranges 80 \
+          --destination-address-prefixes '*' --destination-port-ranges 80 8080 --access Deny \
+          --protocol Tcp --description "Deny from specific IP address ranges on 80 and 8080."
   - summary: Create a security rule using service tags. For more details visit https://aka.ms/servicetags
-    syntax:
-      content: >-
-        az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithTags \
-            --priority 400 --source-address-prefixes VirtualNetwork --destination-address-prefixes Storage \
-            --destination-port-ranges * --direction Outbound --access Allow --protocol Tcp --description "Allow VirtualNetwork to Storage."
+    syntax: >-
+      az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithTags \
+          --priority 400 --source-address-prefixes VirtualNetwork --destination-address-prefixes Storage \
+          --destination-port-ranges '*' --direction Outbound --access Allow --protocol Tcp --description "Allow VirtualNetwork to Storage."
   - summary: Create a security rule using application security groups. https://aka.ms/applicationsecuritygroups
-    syntax:
-      content: >-
-        az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithAsg \
-            --priority 500 --source-address-prefixes Internet --destination-port-ranges 80 8080 \
-            --destination-asgs Web --access Allow --protocol Tcp --description "Allow Internet to Web ASG on ports 80,8080."
-  parameters:
+    syntax: >-
+      az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithAsg \
+          --priority 500 --source-address-prefixes Internet --destination-port-ranges 80 8080 \
+          --destination-asgs Web --access Allow --protocol Tcp --description "Allow Internet to Web ASG on ports 80,8080."
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the network security group rule.
@@ -56,8 +56,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --access
     defaultValue: Allow
     parameterValueGroup: Allow, Deny
@@ -66,6 +67,14 @@ items:
   - name: --description
     summary: Rule description.
     description: ''
+  - name: --destination-address-prefix
+    defaultValue: ''
+    summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
+    description: ''
+  - name: --destination-port-range
+    defaultValue: "80"
+    summary: Port or port range between 0-65535. Use '\*' to match all ports.
+    description: ''
   - name: --direction
     defaultValue: Inbound
     parameterValueGroup: Inbound, Outbound
@@ -76,14 +85,6 @@ items:
     parameterValueGroup: '*, Tcp, Udp'
     summary: Network protocol this rule applies to.
     description: ''
-  - name: --destination-address-prefix
-    defaultValue: ''
-    summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
-    description: ''
-  - name: --destination-port-range
-    defaultValue: "80"
-    summary: Port or port range between 0-65535. Use '\*' to match all ports.
-    description: ''
   - name: --source-address-prefix
     defaultValue: ''
     summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
@@ -95,23 +96,21 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_delete
   name: az network nsg rule delete
   summary: Delete a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule delete [--ids]
+                               [--name]
+                               [--nsg-name]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Delete a network security group rule.
-    syntax:
-      content: az network nsg rule delete -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
-  parameters:
+    syntax: az network nsg rule delete -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -122,59 +121,60 @@ items:
     summary: Name of the network security group.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_list
   name: az network nsg rule list
   summary: List all rules in a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule list --nsg-name
+                             --resource-group
+                             [--include-default]
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List all rules in a network security group.
-    syntax:
-      content: az network nsg rule list -g MyResourceGroup --nsg-name MyNsg
-  parameters:
+    syntax: az network nsg rule list -g MyResourceGroup --nsg-name MyNsg
+  requiredParameters:
   - isRequired: true
     name: --nsg-name
     summary: Name of the network security group.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --include-default
     summary: Include default security rules in the output.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_show
   name: az network nsg rule show
   summary: Get the details of a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule show [--ids]
+                             [--name]
+                             [--nsg-name]
+                             [--query-examples]
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: Get the details of a network security group rule.
-    syntax:
-      content: az network nsg rule show -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
-  parameters:
+    syntax: az network nsg rule show -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -184,49 +184,67 @@ items:
   - name: --nsg-name
     summary: Name of the network security group.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_update
   name: az network nsg rule update
   summary: Update a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule update [--access {Allow, Deny}]
+                               [--add]
+                               [--description]
+                               [--destination-address-prefix]
+                               [--destination-port-range]
+                               [--direction {Inbound, Outbound}]
+                               [--force-string]
+                               [--ids]
+                               [--name]
+                               [--nsg-name]
+                               [--priority]
+                               [--protocol {*, Tcp, Udp}]
+                               [--remove]
+                               [--resource-group]
+                               [--set]
+                               [--source-address-prefix]
+                               [--source-port-range]
+                               [--subscription]
   examples:
   - summary: Update an NSG rule with a new wildcard destination address prefix.
-    syntax:
-      content: az network nsg rule update -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --destination-address-prefix '*'
+    syntax: az network nsg rule update -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --destination-address-prefix '*'
   - summary: Update a network security group rule. (autogenerated)
-    syntax:
-      content: az network nsg rule update --name MyNsgRule --nsg-name MyNsg --resource-group MyResourceGroup --source-address-prefixes 208.130.28/24
-  parameters:
+    syntax: az network nsg rule update --name MyNsgRule --nsg-name MyNsg --resource-group MyResourceGroup --source-address-prefixes 208.130.28/24
+  optionalParameters:
   - name: --access
     parameterValueGroup: Allow, Deny
     summary: ''
     description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --description
     summary: Rule description.
     description: ''
+  - name: --destination-address-prefix
+    summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
+    description: ''
+  - name: --destination-port-range
+    summary: Port or port range between 0-65535. Use '\*' to match all ports.
+    description: ''
   - name: --direction
     parameterValueGroup: Inbound, Outbound
     summary: ''
     description: ''
-  - name: --priority
-    summary: Rule priority, between 100 (highest priority) and 4096 (lowest priority). Must be unique for each rule in the collection.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: '*, Tcp, Udp'
-    summary: Network protocol this rule applies to.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -237,17 +255,21 @@ items:
   - name: --nsg-name
     summary: Name of the network security group.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --priority
+    summary: Rule priority, between 100 (highest priority) and 4096 (lowest priority). Must be unique for each rule in the collection.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --protocol
+    parameterValueGroup: '*, Tcp, Udp'
+    summary: Network protocol this rule applies to.
     description: ''
-  - name: --destination-address-prefix
-    summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
-  - name: --destination-port-range
-    summary: Port or port range between 0-65535. Use '\*' to match all ports.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --source-address-prefix
     summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
@@ -255,40 +277,16 @@ items:
   - name: --source-port-range
     summary: Port or port range between 0-65535. Use '\*' to match all ports.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nsg_rule_create
-  name: az network nsg rule create
-  summary: Create a network security group rule.
-- uid: az_network_nsg_rule_delete
-  name: az network nsg rule delete
-  summary: Delete a network security group rule.
-- uid: az_network_nsg_rule_list
-  name: az network nsg rule list
-  summary: List all rules in a network security group.
-- uid: az_network_nsg_rule_show
-  name: az network nsg rule show
-  summary: Get the details of a network security group rule.
-- uid: az_network_nsg_rule_update
-  name: az network nsg rule update
-  summary: Update a network security group rule.
+- az_network_nsg_rule_create
+- az_network_nsg_rule_delete
+- az_network_nsg_rule_list
+- az_network_nsg_rule_show
+- az_network_nsg_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -304,10 +302,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage network security group rules.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage network security group rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway.yml b/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway.yml
new file mode 100644
index 0000000000..bc593b2195
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway.yml
@@ -0,0 +1,273 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_p2s-vpn-gateway
+name: az network p2s-vpn-gateway
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network p2s-vpn-gateway** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage point-to-site VPN gateway.
+description: ''
+directCommands:
+- uid: az_network_p2s-vpn-gateway_create
+  name: az network p2s-vpn-gateway create
+  summary: Create a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway create --name
+                                      --resource-group
+                                      --scale-unit
+                                      --vhub
+                                      [--address-space]
+                                      [--associated]
+                                      [--config-name]
+                                      [--labels]
+                                      [--location]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--tags]
+                                      [--vpn-server-config]
+  examples:
+  - summary: Create a point-to-site VPN gateway.
+    syntax: az network p2s-vpn-gateway create -g MyRG -n MyP2SVPNGateway --scale-unit 2 --vhub MyVhub --vpn-server-config MyVPNServerConfig --address-space 10.0.0.0/24 11.0.0.0/24
+  - summary: Create a point-to-site VPN gateway with routing configuration.
+    syntax: az network p2s-vpn-gateway create -g MyRG -n MyP2SVPNGateway --scale-unit 2 --vhub MyVhub --vpn-server-config MyVPNServerConfig --address-space 10.0.0.0/24 11.0.0.0/24 --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable2 --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --vhub
+    summary: Name or ID of a virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --address-space
+    summary: Address space for P2S VpnClient. Space-separated list of IP address ranges.
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --config-name
+    defaultValue: P2SConnectionConfigDefault
+    summary: Name or p2s connection configuration.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vpn-server-config
+    summary: Name or ID of a vpn server configuration.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_delete
+  name: az network p2s-vpn-gateway delete
+  summary: Delete a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway delete --name
+                                      --resource-group
+                                      [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_list
+  name: az network p2s-vpn-gateway list
+  summary: List all point-to-site VPN gateway.
+  description: ''
+  syntax: az network p2s-vpn-gateway list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_show
+  name: az network p2s-vpn-gateway show
+  summary: Show the details of a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway show --name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_update
+  name: az network p2s-vpn-gateway update
+  summary: Update settings of a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway update --name
+                                      --resource-group
+                                      [--add]
+                                      [--address-space]
+                                      [--associated]
+                                      [--config-name]
+                                      [--force-string]
+                                      [--labels]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--remove]
+                                      [--scale-unit]
+                                      [--set]
+                                      [--tags]
+                                      [--vpn-server-config]
+  examples:
+  - summary: Update settings of a point-to-site VPN gateway with routing configuration.
+    syntax: az network p2s-vpn-gateway update -g MyRG -n MyP2SVPNGateway --labels Newlabel1 Newlabel2 Newlabel3
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-space
+    summary: Address space for P2S VpnClient. Space-separated list of IP address ranges.
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --config-name
+    summary: Name or p2s connection configuration.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vpn-server-config
+    summary: Name or ID of a vpn server configuration.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_wait
+  name: az network p2s-vpn-gateway wait
+  summary: Place the CLI in a waiting state until a condition of the point-to-site VPN gateway is met.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway wait --name
+                                    --resource-group
+                                    [--created]
+                                    [--custom]
+                                    [--deleted]
+                                    [--exists]
+                                    [--interval]
+                                    [--timeout]
+                                    [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_p2s-vpn-gateway_connection
+- az_network_p2s-vpn-gateway_connection_list
+- az_network_p2s-vpn-gateway_connection_show
+- az_network_p2s-vpn-gateway_create
+- az_network_p2s-vpn-gateway_delete
+- az_network_p2s-vpn-gateway_list
+- az_network_p2s-vpn-gateway_show
+- az_network_p2s-vpn-gateway_update
+- az_network_p2s-vpn-gateway_vpn-client
+- az_network_p2s-vpn-gateway_vpn-client_generate
+- az_network_p2s-vpn-gateway_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage point-to-site VPN gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway/connection.yml b/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway/connection.yml
new file mode 100644
index 0000000000..ad0b196c75
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway/connection.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_p2s-vpn-gateway_connection
+name: az network p2s-vpn-gateway connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network p2s-vpn-gateway connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage point-to-site VPN gateway connections.
+description: ''
+directCommands:
+- uid: az_network_p2s-vpn-gateway_connection_list
+  name: az network p2s-vpn-gateway connection list
+  summary: List all connections for a given point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway connection list --gateway-name
+                                               --resource-group
+  examples:
+  - summary: List all connections for a given point-to-site VPN gateway
+    syntax: az network p2s-vpn-gateway connection list -g MyRG --gateway-name MyP2SVPNGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the P2S VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_connection_show
+  name: az network p2s-vpn-gateway connection show
+  summary: Show the details of a point-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway connection show --gateway-name
+                                               --name
+                                               --resource-group
+  examples:
+  - summary: Show the details of a point-to-site VPN gateway connection
+    syntax: az network p2s-vpn-gateway connection show -g MyRG -n connection --gateway-name MyP2SVPNGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the P2S VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_p2s-vpn-gateway_connection_list
+- az_network_p2s-vpn-gateway_connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage point-to-site VPN gateway connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway/vpn-client.yml b/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway/vpn-client.yml
new file mode 100644
index 0000000000..5f4f153990
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/p2s-vpn-gateway/vpn-client.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_p2s-vpn-gateway_vpn-client
+name: az network p2s-vpn-gateway vpn-client
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network p2s-vpn-gateway vpn-client** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Download a VPN client configuration required to connect to Azure via point-to-site.
+description: ''
+directCommands:
+- uid: az_network_p2s-vpn-gateway_vpn-client_generate
+  name: az network p2s-vpn-gateway vpn-client generate
+  summary: Generate VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway vpn-client generate --name
+                                                   --resource-group
+                                                   [--authentication-method {EAPMSCHAPv2, EAPTLS}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --authentication-method
+    parameterValueGroup: EAPMSCHAPv2, EAPTLS
+    summary: VPN client authentication method.
+    description: ''
+commands:
+- az_network_p2s-vpn-gateway_vpn-client_generate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Download a VPN client configuration required to connect to Azure via point-to-site.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns.yml
index 967d4d2f39..0441c1801e 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns.yml
@@ -1,247 +1,87 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns
+name: az network private-dns
+summary: Manage Private DNS domains in Azure.
+description: ''
 commands:
-- uid: az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: az_network_private_dns_zone_export
-  name: az network private-dns zone export
-  summary: Export a Private DNS zone as a DNS zone file.
-- uid: az_network_private_dns_zone_import
-  name: az network private-dns zone import
-  summary: Create a Private DNS zone using a DNS zone file.
-- uid: az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
+- az_network_private-dns_link
+- az_network_private-dns_link_vnet
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
+- az_network_private-dns_record-set
+- az_network_private-dns_record-set_a
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
+- az_network_private-dns_record-set_aaaa
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
+- az_network_private-dns_record-set_cname
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
+- az_network_private-dns_record-set_list
+- az_network_private-dns_record-set_mx
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
+- az_network_private-dns_record-set_ptr
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
+- az_network_private-dns_record-set_soa
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
+- az_network_private-dns_record-set_srv
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
+- az_network_private-dns_record-set_txt
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
+- az_network_private-dns_zone
+- az_network_private-dns_zone_create
+- az_network_private-dns_zone_delete
+- az_network_private-dns_zone_export
+- az_network_private-dns_zone_import
+- az_network_private-dns_zone_list
+- az_network_private-dns_zone_show
+- az_network_private-dns_zone_update
+- az_network_private-dns_zone_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -257,10 +97,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS domains in Azure.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS domains in Azure.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/link.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/link.yml
index 1740b3e823..91db1bec1e 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/link.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/link.yml
@@ -1,34 +1,16 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_link
+name: az network private-dns link
+summary: Manage Private DNS links.
+description: ''
 commands:
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
+- az_network_private-dns_link_vnet
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -44,10 +26,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS links.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS links.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/link/vnet.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/link/vnet.yml
index d9a5dfbd6d..14890c90a3 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/link/vnet.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/link/vnet.yml
@@ -1,34 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_link_vnet_create
-  - az_network_private_dns_link_vnet_delete
-  - az_network_private_dns_link_vnet_list
-  - az_network_private_dns_link_vnet_show
-  - az_network_private_dns_link_vnet_update
-  - az_network_private_dns_link_vnet_wait
-- uid: az_network_private_dns_link_vnet_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_link_vnet
+name: az network private-dns link vnet
+summary: Manage virtual network links to the specified Private DNS zone.
+description: ''
+directCommands:
+- uid: az_network_private-dns_link_vnet_create
   name: az network private-dns link vnet create
   summary: Create a virtual network link to the specified Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet create --name
+                                            --registration-enabled {false, true}
+                                            --resource-group
+                                            --virtual-network
+                                            --zone-name
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--tags]
   examples:
   - summary: Create a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: >-
-        az network private-dns link vnet create -g MyResourceGroup -n MyLinkName -z www.mysite.com \
-            -v MyVirtualNetworkId -e False
+    syntax: >-
+      az network private-dns link vnet create -g MyResourceGroup -n MyLinkName -z www.mysite.com \
+          -v MyVirtualNetworkId -e False
   - summary: Create a virtual network link to the specified Private DNS zone. (autogenerated)
-    syntax:
-      content: az network private-dns link vnet create --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --subscription MySubscription --tags CostCenter=Marketing --virtual-network MyVirtualNetworkId --zone-name www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet create --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --subscription MySubscription --tags CostCenter=Marketing --virtual-network MyVirtualNetworkId --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
@@ -40,7 +36,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --virtual-network -v
@@ -50,151 +46,168 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_delete
+  - name: --tags
+    summary: Resource tags for the virtual network link.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_delete
   name: az network private-dns link vnet delete
   summary: Delete a virtual network link to the specified Private DNS zone.
   description: In case of a registration virtual network, all auto-registered DNS records in the zone for the virtual network will also be deleted. This operation cannot be undone.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet delete --name
+                                            --resource-group
+                                            --zone-name
+                                            [--if-match]
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--yes]
   examples:
   - summary: Delete a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: az network private-dns link vnet delete -g MyResourceGroup -z www.mysite.com -n MyLinkName
-  parameters:
+    syntax: az network private-dns link vnet delete -g MyResourceGroup -z www.mysite.com -n MyLinkName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the virtual network link to the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_list
   name: az network private-dns link vnet list
   summary: List the virtual network links to the specified Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet list --resource-group
+                                          --zone-name
+                                          [--query-examples]
+                                          [--subscription]
+                                          [--top]
   examples:
   - summary: List virtual network links to the specified Private DNS zone in a resource group.
-    syntax:
-      content: az network private-dns link vnet list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --top
-    summary: The maximum number of virtual network links to return. If not specified, returns up to 100 virtual network links.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_show
+  - name: --top
+    summary: The maximum number of virtual network links to return. If not specified, returns up to 100 virtual network links.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_show
   name: az network private-dns link vnet show
   summary: Get a virtual network link to the specified Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet show --name
+                                          --resource-group
+                                          --zone-name
+                                          [--query-examples]
+                                          [--subscription]
   examples:
   - summary: Get a virtual network link to the specified Private DNS zone..
-    syntax:
-      content: az network private-dns link vnet show -g MyResourceGroup -n MyLinkName -z www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet show -g MyResourceGroup -n MyLinkName -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_update
   name: az network private-dns link vnet update
   summary: Update a virtual network link's properties. Does not modify virtual network within the link.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet update --name
+                                            --resource-group
+                                            --zone-name
+                                            [--add]
+                                            [--force-string]
+                                            [--if-match]
+                                            [--no-wait]
+                                            [--registration-enabled {false, true}]
+                                            [--remove]
+                                            [--set]
+                                            [--subscription]
+                                            [--tags]
   examples:
   - summary: Update a virtual network link properties to enable registration.
-    syntax:
-      content: az network private-dns link vnet update -g MyResourceGroup -n MyLinkName -z www.mysite.com -e True
+    syntax: az network private-dns link vnet update -g MyResourceGroup -n MyLinkName -z www.mysite.com -e True
   - summary: Update a virtual network link's properties (autogenerated)
-    syntax:
-      content: az network private-dns link vnet update --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --tags CostCenter=Marketing --zone-name www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet update --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --tags CostCenter=Marketing --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
     summary: The ETag of the virtual network link to the Private DNS zone.
     description: Omit this value to always overwrite the current virtual network link. Specify the last-seen ETag value to prevent accidentally overwritting any concurrent changes.
@@ -205,15 +218,6 @@ items:
     parameterValueGroup: false, true
     summary: Specify if the link is registration enabled.
     description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -223,35 +227,43 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_wait
+  - name: --tags
+    summary: Resource tags for the virtual network link.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_wait
   name: az network private-dns link vnet wait
   summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet wait --name
+                                          --resource-group
+                                          --zone-name
+                                          [--created]
+                                          [--custom]
+                                          [--deleted]
+                                          [--exists]
+                                          [--interval]
+                                          [--subscription]
+                                          [--timeout]
+                                          [--updated]
   examples:
   - summary: Pause executing next line of CLI script until the virtual network link to the specified Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns link vnet wait -g MyResourceGroup -n MyLinkName -z www.mysite.com --created
-  parameters:
+    syntax: az network private-dns link vnet wait -g MyResourceGroup -n MyLinkName -z www.mysite.com --created
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -268,6 +280,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -275,34 +290,14 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -318,10 +313,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage virtual network links to the specified Private DNS zone.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage virtual network links to the specified Private DNS zone.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set.yml
index 7cd87d347a..842eaddf12 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set.yml
@@ -1,224 +1,101 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_list
-- uid: az_network_private_dns_record_set_list
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set
+name: az network private-dns record-set
+summary: Manage Private DNS records and record sets.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_list
   name: az network private-dns record-set list
   summary: List all record sets within a Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set list --resource-group
+                                           --zone-name
+                                           [--query-examples]
+                                           [--subscription]
   examples:
   - summary: List all "@" record sets within this zone.
-    syntax:
-      content: >-
-        az network private-dns record-set list -g MyResourceGroup -z www.mysite.com \
-            --query "[?name=='@']"
-  parameters:
+    syntax: >-
+      az network private-dns record-set list -g MyResourceGroup -z www.mysite.com \
+          --query "[?name=='@']"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_private-dns_record-set_a
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
+- az_network_private-dns_record-set_aaaa
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
+- az_network_private-dns_record-set_cname
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
+- az_network_private-dns_record-set_list
+- az_network_private-dns_record-set_mx
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
+- az_network_private-dns_record-set_ptr
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
+- az_network_private-dns_record-set_soa
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
+- az_network_private-dns_record-set_srv
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
+- az_network_private-dns_record-set_txt
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -234,10 +111,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS records and record sets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS records and record sets.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/a.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/a.yml
index 83d31afa0a..6b91830cde 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/a.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/a.yml
@@ -1,32 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_a_add_record
-  - az_network_private_dns_record_set_a_create
-  - az_network_private_dns_record_set_a_delete
-  - az_network_private_dns_record_set_a_list
-  - az_network_private_dns_record_set_a_remove_record
-  - az_network_private_dns_record_set_a_show
-  - az_network_private_dns_record_set_a_update
-- uid: az_network_private_dns_record_set_a_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_a
+name: az network private-dns record-set a
+summary: Manage Private DNS A records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_a_add-record
   name: az network private-dns record-set a add-record
   summary: Add an A record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a add-record --ipv4-address
+                                                   --record-set-name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--subscription]
   examples:
   - summary: Add an A record.
-    syntax:
-      content: >-
-        az network private-dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPV4 address in string notation.
@@ -37,139 +30,140 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_create
   name: az network private-dns record-set a create
   summary: Create an empty A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a create --name
+                                               --resource-group
+                                               --zone-name
+                                               [--metadata]
+                                               [--subscription]
+                                               [--ttl]
   examples:
   - summary: Create an empty A record set.
-    syntax:
-      content: az network private-dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_delete
   name: az network private-dns record-set a delete
   summary: Delete an A record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a delete --name
+                                               --resource-group
+                                               --zone-name
+                                               [--if-match]
+                                               [--subscription]
+                                               [--yes]
   examples:
   - summary: Delete an A record set and all associated records.
-    syntax:
-      content: az network private-dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_list
   name: az network private-dns record-set a list
   summary: List all A record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a list --resource-group
+                                             --zone-name
+                                             [--query-examples]
+                                             [--subscription]
   examples:
   - summary: List all A record sets in a zone.
-    syntax:
-      content: az network private-dns record-set a list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set a list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_remove-record
   name: az network private-dns record-set a remove-record
   summary: Remove an A record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a remove-record --ipv4-address
+                                                      --record-set-name
+                                                      --resource-group
+                                                      --zone-name
+                                                      [--keep-empty-record-set]
+                                                      [--subscription]
   examples:
   - summary: Remove an A record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPV4 address in string notation.
@@ -180,96 +174,102 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_show
   name: az network private-dns record-set a show
   summary: Get the details of an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a show --name
+                                             --resource-group
+                                             --zone-name
+                                             [--query-examples]
+                                             [--subscription]
   examples:
   - summary: Get the details of an A record set.
-    syntax:
-      content: az network private-dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_update
   name: az network private-dns record-set a update
   summary: Update an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a update --name
+                                               --resource-group
+                                               --zone-name
+                                               [--add]
+                                               [--force-string]
+                                               [--if-match]
+                                               [--metadata]
+                                               [--remove]
+                                               [--set]
+                                               [--subscription]
   examples:
   - summary: Update an A record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a update -g MyResourceGroup -n MyRecordSet \
-            -z www.mysite.com --metadata owner=WebTeam
+    syntax: >-
+      az network private-dns record-set a update -g MyResourceGroup -n MyRecordSet \
+          -z www.mysite.com --metadata owner=WebTeam
   - summary: Update an A record set. (autogenerated)
-    syntax:
-      content: az network private-dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set useRemoteGateways=true --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set useRemoteGateways=true --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -279,34 +279,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -322,10 +303,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS A records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS A records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/aaaa.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/aaaa.yml
index cca24af755..221f877f11 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/aaaa.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/aaaa.yml
@@ -1,32 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_aaaa_add_record
-  - az_network_private_dns_record_set_aaaa_create
-  - az_network_private_dns_record_set_aaaa_delete
-  - az_network_private_dns_record_set_aaaa_list
-  - az_network_private_dns_record_set_aaaa_remove_record
-  - az_network_private_dns_record_set_aaaa_show
-  - az_network_private_dns_record_set_aaaa_update
-- uid: az_network_private_dns_record_set_aaaa_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_aaaa
+name: az network private-dns record-set aaaa
+summary: Manage Private DNS AAAA records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_aaaa_add-record
   name: az network private-dns record-set aaaa add-record
   summary: Add an AAAA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa add-record --ipv6-address
+                                                      --record-set-name
+                                                      --resource-group
+                                                      --zone-name
+                                                      [--subscription]
   examples:
   - summary: Add an AAAA record.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPV6 address in string notation.
@@ -37,139 +30,140 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_create
   name: az network private-dns record-set aaaa create
   summary: Create an empty AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa create --name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--metadata]
+                                                  [--subscription]
+                                                  [--ttl]
   examples:
   - summary: Create an empty AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_delete
   name: az network private-dns record-set aaaa delete
   summary: Delete an AAAA record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa delete --name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--if-match]
+                                                  [--subscription]
+                                                  [--yes]
   examples:
   - summary: Delete an AAAA record set and all associated records.
-    syntax:
-      content: az network private-dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_list
   name: az network private-dns record-set aaaa list
   summary: List all AAAA record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa list --resource-group
+                                                --zone-name
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: List all AAAA record sets in a zone.
-    syntax:
-      content: az network private-dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_remove-record
   name: az network private-dns record-set aaaa remove-record
   summary: Remove AAAA record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa remove-record --ipv6-address
+                                                         --record-set-name
+                                                         --resource-group
+                                                         --zone-name
+                                                         [--keep-empty-record-set]
+                                                         [--subscription]
   examples:
   - summary: Remove an AAAA record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPV6 address in string notation.
@@ -180,93 +174,100 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_show
   name: az network private-dns record-set aaaa show
   summary: Get the details of an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa show --name
+                                                --resource-group
+                                                --zone-name
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: Get the details of an AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_update
   name: az network private-dns record-set aaaa update
   summary: Update an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa update --name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--add]
+                                                  [--force-string]
+                                                  [--if-match]
+                                                  [--metadata]
+                                                  [--remove]
+                                                  [--set]
+                                                  [--subscription]
   examples:
   - summary: Update an AAAA record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +277,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +301,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS AAAA records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS AAAA records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/cname.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/cname.yml
index ec4599b4c2..aceab0b1ee 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/cname.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/cname.yml
@@ -1,137 +1,136 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_cname_create
-  - az_network_private_dns_record_set_cname_delete
-  - az_network_private_dns_record_set_cname_list
-  - az_network_private_dns_record_set_cname_remove_record
-  - az_network_private_dns_record_set_cname_set_record
-  - az_network_private_dns_record_set_cname_show
-  - az_network_private_dns_record_set_cname_update
-- uid: az_network_private_dns_record_set_cname_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_cname
+name: az network private-dns record-set cname
+summary: Manage Private DNS CNAME records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_cname_create
   name: az network private-dns record-set cname create
   summary: Create an empty CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname create --name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--metadata]
+                                                   [--subscription]
+                                                   [--ttl]
   examples:
   - summary: Create an empty CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Create an empty CNAME record set (autogenerated)
+    syntax: az network private-dns record-set cname create --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --ttl 300 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_delete
   name: az network private-dns record-set cname delete
   summary: Delete a CNAME record set and its associated record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname delete --name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--if-match]
+                                                   [--subscription]
+                                                   [--yes]
   examples:
   - summary: Delete a CNAME record set and its associated record.
-    syntax:
-      content: az network private-dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Delete a CNAME record set and its associated record. (autogenerated)
+    syntax: az network private-dns record-set cname delete --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --yes --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_list
   name: az network private-dns record-set cname list
   summary: List the CNAME record set in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname list --resource-group
+                                                 --zone-name
+                                                 [--query-examples]
+                                                 [--subscription]
   examples:
   - summary: List the CNAME record set in a zone.
-    syntax:
-      content: az network private-dns record-set cname list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set cname list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_remove-record
   name: az network private-dns record-set cname remove-record
   summary: Remove a CNAME record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname remove-record --cname
+                                                          --record-set-name
+                                                          --resource-group
+                                                          --zone-name
+                                                          [--keep-empty-record-set]
+                                                          [--subscription]
   examples:
   - summary: Remove a CNAME record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
     summary: Canonical name.
@@ -142,37 +141,36 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_set_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_set-record
   name: az network private-dns record-set cname set-record
   summary: Set the value of a CNAME record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname set-record --cname
+                                                       --record-set-name
+                                                       --resource-group
+                                                       --zone-name
+                                                       [--subscription]
   examples:
   - summary: Set the value of a CNAME record.
-    syntax:
-      content: >-
-        az network private-dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
     summary: Canonical name.
@@ -183,90 +181,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_show
   name: az network private-dns record-set cname show
   summary: Get the details of a CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname show --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--query-examples]
+                                                 [--subscription]
   examples:
   - summary: Get the details of a CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Get the details of a CNAME record set (autogenerated)
+    syntax: az network private-dns record-set cname show --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_update
   name: az network private-dns record-set cname update
   summary: Update a CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname update --name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--add]
+                                                   [--force-string]
+                                                   [--if-match]
+                                                   [--metadata]
+                                                   [--remove]
+                                                   [--set]
+                                                   [--subscription]
   examples:
   - summary: Update a CNAME record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set cname update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +283,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +307,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS CNAME records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS CNAME records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/mx.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/mx.yml
index 311dad72ff..e909fb5c23 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/mx.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/mx.yml
@@ -1,32 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_mx_add_record
-  - az_network_private_dns_record_set_mx_create
-  - az_network_private_dns_record_set_mx_delete
-  - az_network_private_dns_record_set_mx_list
-  - az_network_private_dns_record_set_mx_remove_record
-  - az_network_private_dns_record_set_mx_show
-  - az_network_private_dns_record_set_mx_update
-- uid: az_network_private_dns_record_set_mx_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_mx
+name: az network private-dns record-set mx
+summary: Manage Private DNS MX records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_mx_add-record
   name: az network private-dns record-set mx add-record
   summary: Add an MX record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx add-record --exchange
+                                                    --preference
+                                                    --record-set-name
+                                                    --resource-group
+                                                    --zone-name
+                                                    [--subscription]
   examples:
   - summary: Add an MX record.
-    syntax:
-      content: >-
-        az network private-dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -41,139 +35,141 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_create
   name: az network private-dns record-set mx create
   summary: Create an empty MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx create --name
+                                                --resource-group
+                                                --zone-name
+                                                [--metadata]
+                                                [--subscription]
+                                                [--ttl]
   examples:
   - summary: Create an empty MX record set.
-    syntax:
-      content: az network private-dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_delete
   name: az network private-dns record-set mx delete
   summary: Delete an MX record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx delete --name
+                                                --resource-group
+                                                --zone-name
+                                                [--if-match]
+                                                [--subscription]
+                                                [--yes]
   examples:
   - summary: Delete an MX record set and all associated records.
-    syntax:
-      content: az network private-dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_list
   name: az network private-dns record-set mx list
   summary: List all MX record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx list --resource-group
+                                              --zone-name
+                                              [--query-examples]
+                                              [--subscription]
   examples:
   - summary: List all MX record sets in a zone.
-    syntax:
-      content: az network private-dns record-set mx list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set mx list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_remove-record
   name: az network private-dns record-set mx remove-record
   summary: Remove an MX record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx remove-record --exchange
+                                                       --preference
+                                                       --record-set-name
+                                                       --resource-group
+                                                       --zone-name
+                                                       [--keep-empty-record-set]
+                                                       [--subscription]
   examples:
   - summary: Remove an MX record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -188,93 +184,100 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_show
   name: az network private-dns record-set mx show
   summary: Get the details of an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx show --name
+                                              --resource-group
+                                              --zone-name
+                                              [--query-examples]
+                                              [--subscription]
   examples:
   - summary: Get the details of an MX record set.
-    syntax:
-      content: az network private-dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_update
   name: az network private-dns record-set mx update
   summary: Update an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx update --name
+                                                --resource-group
+                                                --zone-name
+                                                [--add]
+                                                [--force-string]
+                                                [--if-match]
+                                                [--metadata]
+                                                [--remove]
+                                                [--set]
+                                                [--subscription]
   examples:
   - summary: Update an MX record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set mx update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -284,34 +287,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -327,10 +311,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS MX records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS MX records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/ptr.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/ptr.yml
index 7e5fb2c52e..f3211f2f53 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/ptr.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/ptr.yml
@@ -1,32 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_ptr_add_record
-  - az_network_private_dns_record_set_ptr_create
-  - az_network_private_dns_record_set_ptr_delete
-  - az_network_private_dns_record_set_ptr_list
-  - az_network_private_dns_record_set_ptr_remove_record
-  - az_network_private_dns_record_set_ptr_show
-  - az_network_private_dns_record_set_ptr_update
-- uid: az_network_private_dns_record_set_ptr_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_ptr
+name: az network private-dns record-set ptr
+summary: Manage Private DNS PTR records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_ptr_add-record
   name: az network private-dns record-set ptr add-record
   summary: Add a PTR record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr add-record --ptrdname
+                                                     --record-set-name
+                                                     --resource-group
+                                                     --zone-name
+                                                     [--subscription]
   examples:
   - summary: Add a PTR record.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -37,139 +30,140 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_create
   name: az network private-dns record-set ptr create
   summary: Create an empty PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr create --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--metadata]
+                                                 [--subscription]
+                                                 [--ttl]
   examples:
   - summary: Create an empty PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_delete
   name: az network private-dns record-set ptr delete
   summary: Delete a PTR record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr delete --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--if-match]
+                                                 [--subscription]
+                                                 [--yes]
   examples:
   - summary: Delete a PTR record set and all associated records.
-    syntax:
-      content: az network private-dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_list
   name: az network private-dns record-set ptr list
   summary: List all PTR record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr list --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: List all PTR record sets in a zone.
-    syntax:
-      content: az network private-dns record-set ptr list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set ptr list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_remove-record
   name: az network private-dns record-set ptr remove-record
   summary: Remove a PTR record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr remove-record --ptrdname
+                                                        --record-set-name
+                                                        --resource-group
+                                                        --zone-name
+                                                        [--keep-empty-record-set]
+                                                        [--subscription]
   examples:
   - summary: Remove a PTR record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -180,93 +174,100 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_show
   name: az network private-dns record-set ptr show
   summary: Get the details of a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr show --name
+                                               --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of a PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_update
   name: az network private-dns record-set ptr update
   summary: Update a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr update --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--if-match]
+                                                 [--metadata]
+                                                 [--remove]
+                                                 [--set]
+                                                 [--subscription]
   examples:
   - summary: Update a PTR record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +277,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +301,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS PTR records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS PTR records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/soa.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/soa.yml
index 20fe18afb8..e54a73ffdb 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/soa.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/soa.yml
@@ -1,63 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_soa_show
-  - az_network_private_dns_record_set_soa_update
-- uid: az_network_private_dns_record_set_soa_show
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_soa
+name: az network private-dns record-set soa
+summary: Manage Private DNS SOA record.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_soa_show
   name: az network private-dns record-set soa show
   summary: Get the details of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set soa show --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of an SOA record.
-    syntax:
-      content: az network private-dns record-set soa show -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set soa show -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_soa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_soa_update
   name: az network private-dns record-set soa update
   summary: Update properties of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set soa update --resource-group
+                                                 --zone-name
+                                                 [--email]
+                                                 [--expire-time]
+                                                 [--host]
+                                                 [--minimum-ttl]
+                                                 [--refresh-time]
+                                                 [--retry-time]
+                                                 [--serial-number]
+                                                 [--subscription]
   examples:
   - summary: Update properties of an SOA record.
-    syntax:
-      content: >-
-        az network private-dns record-set soa update -g MyResourceGroup -z www.mysite.com \
-            -e myhostmaster.mysite.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set soa update -g MyResourceGroup -z www.mysite.com \
+          -e myhostmaster.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --email -e
     summary: Email address.
     description: ''
@@ -82,19 +87,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -110,10 +106,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS SOA record.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS SOA record.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/srv.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/srv.yml
index 657c650962..03b496f650 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/srv.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/srv.yml
@@ -1,32 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_srv_add_record
-  - az_network_private_dns_record_set_srv_create
-  - az_network_private_dns_record_set_srv_delete
-  - az_network_private_dns_record_set_srv_list
-  - az_network_private_dns_record_set_srv_remove_record
-  - az_network_private_dns_record_set_srv_show
-  - az_network_private_dns_record_set_srv_update
-- uid: az_network_private_dns_record_set_srv_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_srv
+name: az network private-dns record-set srv
+summary: Manage Private DNS SRV records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_srv_add-record
   name: az network private-dns record-set srv add-record
   summary: Add an SRV record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv add-record --port
+                                                     --priority
+                                                     --record-set-name
+                                                     --resource-group
+                                                     --target
+                                                     --weight
+                                                     --zone-name
+                                                     [--subscription]
   examples:
   - summary: Add an SRV record.
-    syntax:
-      content: >-
-        az network private-dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -41,7 +37,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -55,135 +51,141 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_create
   name: az network private-dns record-set srv create
   summary: Create an empty SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv create --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--metadata]
+                                                 [--subscription]
+                                                 [--ttl]
   examples:
   - summary: Create an empty SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv create -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv create -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet
+  - summary: Create an empty SRV record set. (autogenerated)
+    syntax: az network private-dns record-set srv create --name MyRecordSet --resource-group MyResourceGroup --ttl 300 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_delete
   name: az network private-dns record-set srv delete
   summary: Delete an SRV record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv delete --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--if-match]
+                                                 [--subscription]
+                                                 [--yes]
   examples:
   - summary: Delete an SRV record set and all associated records.
-    syntax:
-      content: az network private-dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_list
   name: az network private-dns record-set srv list
   summary: List all SRV record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv list --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: List all SRV record sets in a zone.
-    syntax:
-      content: az network private-dns record-set srv list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set srv list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_remove-record
   name: az network private-dns record-set srv remove-record
   summary: Remove an SRV record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv remove-record --port
+                                                        --priority
+                                                        --record-set-name
+                                                        --resource-group
+                                                        --target
+                                                        --weight
+                                                        --zone-name
+                                                        [--keep-empty-record-set]
+                                                        [--subscription]
   examples:
   - summary: Remove an SRV record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -198,7 +200,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -212,87 +214,94 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_show
   name: az network private-dns record-set srv show
   summary: Get the details of an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv show --name
+                                               --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of an SRV record set.
-    syntax:
-      content: az network private-dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_update
   name: az network private-dns record-set srv update
   summary: Update an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv update --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--if-match]
+                                                 [--metadata]
+                                                 [--remove]
+                                                 [--set]
+                                                 [--subscription]
   examples:
   - summary: Update an SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -302,34 +311,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -345,10 +335,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS SRV records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS SRV records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/txt.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/txt.yml
index 577e902cc7..eb3566b41f 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/txt.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/record-set/txt.yml
@@ -1,39 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_txt_add_record
-  - az_network_private_dns_record_set_txt_create
-  - az_network_private_dns_record_set_txt_delete
-  - az_network_private_dns_record_set_txt_list
-  - az_network_private_dns_record_set_txt_remove_record
-  - az_network_private_dns_record_set_txt_show
-  - az_network_private_dns_record_set_txt_update
-- uid: az_network_private_dns_record_set_txt_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_txt
+name: az network private-dns record-set txt
+summary: Manage Private DNS TXT records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_txt_add-record
   name: az network private-dns record-set txt add-record
   summary: Add a TXT record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt add-record --record-set-name
+                                                     --resource-group
+                                                     --value
+                                                     --zone-name
+                                                     [--subscription]
   examples:
   - summary: Add a TXT record.
-    syntax:
-      content: >-
-        az network private-dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -43,140 +36,141 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_create
   name: az network private-dns record-set txt create
   summary: Create an empty TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt create --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--metadata]
+                                                 [--subscription]
+                                                 [--ttl]
   examples:
   - summary: Create an empty TXT record set.
-    syntax:
-      content: az network private-dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_delete
   name: az network private-dns record-set txt delete
   summary: Delete a TXT record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt delete --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--if-match]
+                                                 [--subscription]
+                                                 [--yes]
   examples:
   - summary: Delete a TXT record set and all associated records.
-    syntax:
-      content: az network private-dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_list
   name: az network private-dns record-set txt list
   summary: List all TXT record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt list --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: List all TXT record sets in a zone.
-    syntax:
-      content: az network private-dns record-set txt list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set txt list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_remove-record
   name: az network private-dns record-set txt remove-record
   summary: Remove a TXT record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt remove-record --record-set-name
+                                                        --resource-group
+                                                        --value
+                                                        --zone-name
+                                                        [--keep-empty-record-set]
+                                                        [--subscription]
   examples:
   - summary: Remove a TXT record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -186,87 +180,94 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_show
   name: az network private-dns record-set txt show
   summary: Get the details of a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt show --name
+                                               --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of a TXT record set.
-    syntax:
-      content: az network private-dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_update
   name: az network private-dns record-set txt update
   summary: Update a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt update --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--if-match]
+                                                 [--metadata]
+                                                 [--remove]
+                                                 [--set]
+                                                 [--subscription]
   examples:
   - summary: Update a TXT record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set txt update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +277,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +301,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS TXT records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS TXT records.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-dns/zone.yml b/2017-03-09-profile/docs-ref-autogen/network/private-dns/zone.yml
index d112f6b8dd..ef143f96a6 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-dns/zone.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-dns/zone.yml
@@ -1,133 +1,121 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_zone_create
-  - az_network_private_dns_zone_delete
-  - az_network_private_dns_zone_export
-  - az_network_private_dns_zone_import
-  - az_network_private_dns_zone_list
-  - az_network_private_dns_zone_show
-  - az_network_private_dns_zone_update
-  - az_network_private_dns_zone_wait
-- uid: az_network_private_dns_zone_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_zone
+name: az network private-dns zone
+summary: Manage Private DNS zones.
+description: ''
+directCommands:
+- uid: az_network_private-dns_zone_create
   name: az network private-dns zone create
   summary: Create a Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone create --name
+                                       --resource-group
+                                       [--no-wait]
+                                       [--subscription]
+                                       [--tags]
   examples:
   - summary: Create a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone create -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network private-dns zone create -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_delete
+  - name: --tags
+    summary: Resource tags for the Private DNS zone.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_delete
   name: az network private-dns zone delete
   summary: Delete a Private DNS zone.
   description: All DNS records in the zone will also be deleted. This operation cannot be undone. Private DNS zone cannot be deleted unless all virtual network links to it are removed.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone delete --name
+                                       --resource-group
+                                       [--if-match]
+                                       [--no-wait]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone delete -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network private-dns zone delete -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_export
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_export
   name: az network private-dns zone export
   summary: Export a Private DNS zone as a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone export --name
+                                       --resource-group
+                                       [--file-name]
+                                       [--subscription]
   examples:
   - summary: Export a Private DNS zone as a DNS zone file.
-    syntax:
-      content: az network private-dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
-  parameters:
+    syntax: az network private-dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --file-name -f
     summary: Path to the Private DNS zone file to save.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_import
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_import
   name: az network private-dns zone import
   summary: Create a Private DNS zone using a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone import --file-name
+                                       --name
+                                       --resource-group
+                                       [--subscription]
   examples:
   - summary: Import a local zone file into a Private DNS zone resource.
-    syntax:
-      content: az network private-dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
-  parameters:
+    syntax: az network private-dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
+  requiredParameters:
   - isRequired: true
     name: --file-name -f
     summary: Path to the Private DNS zone file to import.
@@ -138,102 +126,104 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_list
   name: az network private-dns zone list
   summary: List Private DNS zones.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone list [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: List Private DNS zones in a resource group.
-    syntax:
-      content: az network private-dns zone list -g MyResourceGroup
-  parameters:
+    syntax: az network private-dns zone list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_show
   name: az network private-dns zone show
   summary: Get a Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone show --name
+                                     --resource-group
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Get a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone show -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network private-dns zone show -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_update
   name: az network private-dns zone update
   summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone update --name
+                                       --resource-group
+                                       [--add]
+                                       [--force-string]
+                                       [--if-match]
+                                       [--no-wait]
+                                       [--remove]
+                                       [--set]
+                                       [--subscription]
+                                       [--tags]
   examples:
   - summary: Update a Private DNS zone properties to change the user-defined value of a previously set tag.
-    syntax:
-      content: az network private-dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
-  parameters:
+    syntax: az network private-dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the Private DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen ETag value to prevent accidentally overwriting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the Private DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen ETag value to prevent accidentally overwriting any concurrent changes.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -243,31 +233,38 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_wait
+  - name: --tags
+    summary: Resource tags for the Private DNS zone.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_wait
   name: az network private-dns zone wait
   summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone wait --name
+                                     --resource-group
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--subscription]
+                                     [--timeout]
+                                     [--updated]
   examples:
   - summary: Pause executing next line of CLI script until the Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns zone wait -g MyResourceGroup -n www.mysite.com --created
-  parameters:
+    syntax: az network private-dns zone wait -g MyResourceGroup -n www.mysite.com --created
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -284,6 +281,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -291,40 +291,16 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: az_network_private_dns_zone_export
-  name: az network private-dns zone export
-  summary: Export a Private DNS zone as a DNS zone file.
-- uid: az_network_private_dns_zone_import
-  name: az network private-dns zone import
-  summary: Create a Private DNS zone using a DNS zone file.
-- uid: az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
+- az_network_private-dns_zone_create
+- az_network_private-dns_zone_delete
+- az_network_private-dns_zone_export
+- az_network_private-dns_zone_import
+- az_network_private-dns_zone_list
+- az_network_private-dns_zone_show
+- az_network_private-dns_zone_update
+- az_network_private-dns_zone_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -340,10 +316,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS zones.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS zones.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-endpoint-connection.yml b/2017-03-09-profile/docs-ref-autogen/network/private-endpoint-connection.yml
index 0c4b4e942c..69878861e3 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-endpoint-connection.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-endpoint-connection.yml
@@ -1,34 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_endpoint_connection
-  name: az network private-endpoint-connection
-  summary: Manage private endpoint connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_endpoint_connection_approve
-  - az_network_private_endpoint_connection_delete
-  - az_network_private_endpoint_connection_list
-  - az_network_private_endpoint_connection_reject
-  - az_network_private_endpoint_connection_show
-- uid: az_network_private_endpoint_connection_approve
+### YamlMime:AzureCLIGroup
+uid: az_network_private-endpoint-connection
+name: az network private-endpoint-connection
+summary: Manage private endpoint connections.
+description: ''
+directCommands:
+- uid: az_network_private-endpoint-connection_approve
   name: az network private-endpoint-connection approve
   summary: Approve a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection approve [--description]
+                                                   [--id]
+                                                   [--name]
+                                                   [--resource-group]
+                                                   [--resource-name]
+                                                   [--subscription]
+                                                   [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: Approve a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Approved"
+    syntax: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Approved"
   - summary: Approve a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Approved"
+    syntax: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Approved"
   - summary: Approve a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection approve --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Approved"
-  parameters:
+    syntax: az network private-endpoint-connection approve --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Approved"
+  optionalParameters:
   - name: --description -d
     summary: Comments for the approval.
     description: ''
@@ -39,41 +34,39 @@ items:
     summary: Name of the private endpoint connection.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_delete
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_delete
   name: az network private-endpoint-connection delete
   summary: Delete a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection delete [--id]
+                                                  [--name]
+                                                  [--resource-group]
+                                                  [--resource-name]
+                                                  [--subscription]
+                                                  [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
+                                                  [--yes]
   examples:
   - summary: Delete a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
   - summary: Delete a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
   - summary: Delete a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection delete --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
-  parameters:
+    syntax: az network private-endpoint-connection delete --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
+  optionalParameters:
   - name: --id
     summary: ID of the private endpoint connection.
     description: ''
@@ -81,83 +74,81 @@ items:
     summary: Name of the private endpoint connection.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
     summary: Type of the resource.
     description: ''
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_list
   name: az network private-endpoint-connection list
   summary: List all private endpoint connections.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection list [--id]
+                                                [--name]
+                                                [--query-examples]
+                                                [--resource-group]
+                                                [--subscription]
+                                                [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: List all private endpoint connections for a storage account.
-    syntax:
-      content: az network private-endpoint-connection list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-endpoint-connection list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
   - summary: List all private endpoint connections for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-endpoint-connection list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
   - summary: List all private endpoint connections for an ACR.
-    syntax:
-      content: az network private-endpoint-connection list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
-  parameters:
+    syntax: az network private-endpoint-connection list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
+  optionalParameters:
   - name: --id
     summary: ID of the resource.
     description: ''
   - name: --name -n
-    summary: Name of the resource.
+    summary: Name of the resource. If provided, --type and --resource-group must be provided too.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
+  - name: --resource-group -g
+    summary: Name of resource group. If provided, --name and --type must be provided too.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_reject
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource. If provided, --name and --resource-group must be provided too.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_reject
   name: az network private-endpoint-connection reject
   summary: Reject a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection reject [--description]
+                                                  [--id]
+                                                  [--name]
+                                                  [--resource-group]
+                                                  [--resource-name]
+                                                  [--subscription]
+                                                  [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: Reject a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Rejected"
+    syntax: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Rejected"
   - summary: Reject a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Rejected"
+    syntax: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Rejected"
   - summary: Reject a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection reject --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Rejected"
-  parameters:
+    syntax: az network private-endpoint-connection reject --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Rejected"
+  optionalParameters:
   - name: --description -d
     summary: Comments for the rejection.
     description: ''
@@ -168,82 +159,68 @@ items:
     summary: Name of the private endpoint connection.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_show
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_show
   name: az network private-endpoint-connection show
   summary: Show a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection show [--id]
+                                                [--name]
+                                                [--query-examples]
+                                                [--resource-group]
+                                                [--resource-name]
+                                                [--subscription]
+                                                [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: Show a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
   - summary: Show a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
   - summary: Show a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection show --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
-  parameters:
+    syntax: az network private-endpoint-connection show --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
+  optionalParameters:
   - name: --id
     summary: ID of the private endpoint connection.
     description: ''
   - name: --name -n
     summary: Name of the private endpoint connection.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_endpoint_connection_approve
-  name: az network private-endpoint-connection approve
-  summary: Approve a private endpoint connection.
-- uid: az_network_private_endpoint_connection_delete
-  name: az network private-endpoint-connection delete
-  summary: Delete a private endpoint connection.
-- uid: az_network_private_endpoint_connection_list
-  name: az network private-endpoint-connection list
-  summary: List all private endpoint connections.
-- uid: az_network_private_endpoint_connection_reject
-  name: az network private-endpoint-connection reject
-  summary: Reject a private endpoint connection.
-- uid: az_network_private_endpoint_connection_show
-  name: az network private-endpoint-connection show
-  summary: Show a private endpoint connection.
+- az_network_private-endpoint-connection_approve
+- az_network_private-endpoint-connection_delete
+- az_network_private-endpoint-connection_list
+- az_network_private-endpoint-connection_reject
+- az_network_private-endpoint-connection_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -259,10 +236,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private endpoint connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private endpoint connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/network/private-endpoint.yml
index 66bf38d4da..59eba26c0c 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-endpoint.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-endpoint.yml
@@ -1,36 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_endpoint
-  name: az network private-endpoint
-  summary: Manage private endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_endpoint_list
-- uid: az_network_private_endpoint_list
+### YamlMime:AzureCLIGroup
+uid: az_network_private-endpoint
+name: az network private-endpoint
+summary: Manage private endpoints.
+description: ''
+directCommands:
+- uid: az_network_private-endpoint_list
   name: az network private-endpoint list
   summary: List private endpoints.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network private-endpoint list [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_endpoint_list
-  name: az network private-endpoint list
-  summary: List private endpoints.
+- az_network_private-endpoint_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -46,10 +40,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private endpoints.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-link-resource.yml b/2017-03-09-profile/docs-ref-autogen/network/private-link-resource.yml
index 628d0ca4cf..6c49d567f7 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-link-resource.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-link-resource.yml
@@ -1,56 +1,50 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_link_resource
-  name: az network private-link-resource
-  summary: Manage private link resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_link_resource_list
-- uid: az_network_private_link_resource_list
+### YamlMime:AzureCLIGroup
+uid: az_network_private-link-resource
+name: az network private-link-resource
+summary: Manage private link resources.
+description: ''
+directCommands:
+- uid: az_network_private-link-resource_list
   name: az network private-link-resource list
   summary: List all private link resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-link-resource list [--id]
+                                          [--name]
+                                          [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: List all private link resources for a storage account.
-    syntax:
-      content: az network private-link-resource list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-link-resource list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
   - summary: List all private link resources for a keyvault.
-    syntax:
-      content: az network private-link-resource list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-link-resource list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
   - summary: List all private link resources for an ACR.
-    syntax:
-      content: az network private-link-resource list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
-  parameters:
+    syntax: az network private-link-resource list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
+  optionalParameters:
   - name: --id
     summary: ID of the resource.
     description: ''
   - name: --name -n
-    summary: Name of the resource.
+    summary: Name of the resource. If provided, --type and --resource-group must be provided too.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
+  - name: --resource-group -g
+    summary: Name of resource group. If provided, --name and --type must be provided too.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource. If provided, --name and --resource-group must be provided too.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_link_resource_list
-  name: az network private-link-resource list
-  summary: List all private link resources.
+- az_network_private-link-resource_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -66,10 +60,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private link resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private link resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-link-service.yml b/2017-03-09-profile/docs-ref-autogen/network/private-link-service.yml
index 802b7d6ff1..128ffe0499 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-link-service.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-link-service.yml
@@ -1,25 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_link_service
-  name: az network private-link-service
-  summary: Manage private link services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_link_service_create
-  - az_network_private_link_service_list
-- uid: az_network_private_link_service_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-link-service
+name: az network private-link-service
+summary: Manage private link services.
+description: ''
+directCommands:
+- uid: az_network_private-link-service_create
   name: az network private-link-service create
   summary: Create a private link service.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-link-service create --lb-frontend-ip-configs
+                                           --name
+                                           --resource-group
+                                           --subnet
+                                           [--auto-approval]
+                                           [--fqdns]
+                                           [--lb-name]
+                                           [--location]
+                                           [--private-ip-address]
+                                           [--private-ip-address-version]
+                                           [--private-ip-allocation-method {Dynamic, Static}]
+                                           [--public-ip-address]
+                                           [--subscription]
+                                           [--tags]
+                                           [--visibility]
+                                           [--vnet-name]
   examples:
   - summary: Create a private link service
-    syntax:
-      content: az network private-link-service create -g MyResourceGroup -n MyPLSName --vnet-name MyVnetName --subnet MySubnet --lb-name MyLBName --lb-frontend-ip-configs LoadBalancerFrontEnd -l centralus
-  parameters:
+    syntax: az network private-link-service create -g MyResourceGroup -n MyPLSName --vnet-name MyVnetName --subnet MySubnet --lb-name MyLBName --lb-frontend-ip-configs LoadBalancerFrontEnd -l centralus
+  requiredParameters:
   - isRequired: true
     name: --lb-frontend-ip-configs
     summary: Space-separated list of names or IDs of load balancer frontend IP configurations to link to. If names are used, also supply `--lb-name`.
@@ -30,8 +39,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --subnet
+    summary: Name or ID of subnet to use. If name provided, also supply `--vnet-name`.
     description: ''
+  optionalParameters:
   - name: --auto-approval
     summary: Space-separated list of subscription IDs to auto-approve.
     description: ''
@@ -42,17 +56,7 @@ items:
     summary: Name of the load balancer to retrieve frontend IP configs from. Ignored if a frontend IP configuration ID is supplied.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --visibility
-    summary: Space-separated list of subscription IDs for which the private link service is visible.
-    description: ''
-  - isRequired: true
-    name: --subnet
-    summary: Name or ID of subnet to use. If name provided, also supply `--vnet-name`.
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --private-ip-address
     summary: Static private IP address to use.
@@ -67,50 +71,43 @@ items:
   - name: --public-ip-address
     summary: Name or ID of the a public IP address to use.
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_link_service_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --visibility
+    summary: Space-separated list of subscription IDs for which the private link service is visible.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-link-service_list
   name: az network private-link-service list
   summary: List private link services.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network private-link-service list [--query-examples]
+                                         [--resource-group]
+                                         [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_link_service_connection
-  name: az network private-link-service connection
-  summary: Manage private link service endpoint connections.
-- uid: az_network_private_link_service_connection_update
-  name: az network private-link-service connection update
-  summary: Update a private link service endpoint connection.
-- uid: az_network_private_link_service_create
-  name: az network private-link-service create
-  summary: Create a private link service.
-- uid: az_network_private_link_service_list
-  name: az network private-link-service list
-  summary: List private link services.
+- az_network_private-link-service_connection
+- az_network_private-link-service_connection_update
+- az_network_private-link-service_create
+- az_network_private-link-service_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -126,10 +123,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private link services.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private link services.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/private-link-service/connection.yml b/2017-03-09-profile/docs-ref-autogen/network/private-link-service/connection.yml
index 4ee8a31b02..08e7241ad5 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/private-link-service/connection.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/private-link-service/connection.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_link_service_connection
-  name: az network private-link-service connection
-  summary: Manage private link service endpoint connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_link_service_connection_update
-- uid: az_network_private_link_service_connection_update
+### YamlMime:AzureCLIGroup
+uid: az_network_private-link-service_connection
+name: az network private-link-service connection
+summary: Manage private link service endpoint connections.
+description: ''
+directCommands:
+- uid: az_network_private-link-service_connection_update
   name: az network private-link-service connection update
   summary: Update a private link service endpoint connection.
   description: To update the connection status, the name of the connection should be provided. Please obtain this name by running 'az network private-link-service show -g MyResourceGroup -n MyPLSName'. The connection name is under the 'privateEndpointConnections' filed.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-link-service connection update --connection-status {Approved, Rejected, Removed}
+                                                      --name
+                                                      --resource-group
+                                                      --service-name
+                                                      [--action-required]
+                                                      [--description]
+                                                      [--subscription]
   examples:
   - summary: Update the endpoint connections status of private link service
-    syntax:
-      content: az network private-link-service connection update -g MyResourceGroup -n MyEndpointName.f072a430-2d82-4470-ab30-d23fcfee58d1 --service-name MyPLSName --connection-status Rejected
-  parameters:
+    syntax: az network private-link-service connection update -g MyResourceGroup -n MyEndpointName.f072a430-2d82-4470-ab30-d23fcfee58d1 --service-name MyPLSName --connection-status Rejected
+  requiredParameters:
   - isRequired: true
     name: --connection-status
     parameterValueGroup: Approved, Rejected, Removed
@@ -30,12 +31,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --service-name
     summary: Name of the private link service.
     description: ''
+  optionalParameters:
   - name: --action-required
     summary: A message indicating if changes on the service provider require any updates on the consumer.
     description: ''
@@ -45,16 +47,9 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_link_service_connection_update
-  name: az network private-link-service connection update
-  summary: Update a private link service endpoint connection.
+- az_network_private-link-service_connection_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -70,10 +65,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private link service endpoint connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private link service endpoint connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/profile.yml b/2017-03-09-profile/docs-ref-autogen/network/profile.yml
index 7ea8b95010..d3e7ca6f14 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/profile.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/profile.yml
@@ -1,40 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_profile
-  name: az network profile
-  summary: Manage network profiles.
-  description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
-  langs:
-  - azurecli
-  children:
-  - az_network_profile_list
+### YamlMime:AzureCLIGroup
+uid: az_network_profile
+name: az network profile
+summary: Manage network profiles.
+description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
+directCommands:
 - uid: az_network_profile_list
   name: az network profile list
   summary: List network profiles.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network profile list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: List network profiles (autogenerated)
-    syntax:
-      content: az network profile list --resource-group MyResourceGroup
-  parameters:
+    syntax: az network profile list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_profile_list
-  name: az network profile list
-  summary: List network profiles.
+- az_network_profile_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -50,10 +43,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/public-ip.yml b/2017-03-09-profile/docs-ref-autogen/network/public-ip.yml
index 3cfe6c1ef7..b914dec2a4 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/public-ip.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/public-ip.yml
@@ -1,42 +1,40 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_public_ip
-  name: az network public-ip
-  summary: Manage public IP addresses.
-  description: To learn more about public IP addresses visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address">https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_public_ip_create
-  - az_network_public_ip_delete
-  - az_network_public_ip_list
-  - az_network_public_ip_show
-  - az_network_public_ip_update
-- uid: az_network_public_ip_create
+### YamlMime:AzureCLIGroup
+uid: az_network_public-ip
+name: az network public-ip
+summary: Manage public IP addresses.
+description: To learn more about public IP addresses visit https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address.
+directCommands:
+- uid: az_network_public-ip_create
   name: az network public-ip create
   summary: Create a public IP address.
-  description: '[Coming breaking change] In the coming release, the default behavior will be changed as follows when sku is Standard and zone is not provided: For zonal regions, you will get a zone-redundant IP indicated by zones:["1","2","3"]; For non-zonal regions, you will get a non zone-redundant IP indicated by zones:[].'
-  langs:
-  - azurecli
+  description: ''
+  syntax: >-
+    az network public-ip create --name
+                                --resource-group
+                                [--allocation-method {Dynamic, Static}]
+                                [--dns-name]
+                                [--idle-timeout]
+                                [--location]
+                                [--reverse-fqdn]
+                                [--subscription]
+                                [--tags]
   examples:
   - summary: Create a basic public IP resource.
-    syntax:
-      content: az network public-ip create -g MyResourceGroup -n MyIp
+    syntax: az network public-ip create -g MyResourceGroup -n MyIp
   - summary: Create a static public IP resource for a DNS name label.
-    syntax:
-      content: az network public-ip create -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
+    syntax: az network public-ip create -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
   - summary: Create a public IP resource in an availability zone in the current resource group region.
-    syntax:
-      content: az network public-ip create -g MyResourceGroup -n MyIp --zone 2
-  parameters:
+    syntax: az network public-ip create -g MyResourceGroup -n MyIp --zone 2
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the public IP address.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --allocation-method
     parameterValueGroup: Dynamic, Static
     summary: IP address allocation method.
@@ -49,34 +47,31 @@ items:
     summary: Idle timeout in minutes.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --reverse-fqdn
     summary: Reverse FQDN (fully qualified domain name).
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_delete
   name: az network public-ip delete
   summary: Delete a public IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip delete [--ids]
+                                [--name]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Delete a public IP address.
-    syntax:
-      content: az network public-ip delete -g MyResourceGroup -n MyIp
-  parameters:
+    syntax: az network public-ip delete -g MyResourceGroup -n MyIp
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -84,60 +79,55 @@ items:
     summary: The name of the public IP address.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_list
   name: az network public-ip list
   summary: List public IP addresses.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip list [--query-examples]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: List all public IPs in a subscription.
-    syntax:
-      content: az network public-ip list
+    syntax: az network public-ip list
   - summary: List all public IPs in a resource group.
-    syntax:
-      content: az network public-ip list -g MyResourceGroup
+    syntax: az network public-ip list -g MyResourceGroup
   - summary: List all public IPs of a domain name label.
-    syntax:
-      content: az network public-ip list -g MyResourceGroup --query "[?dnsSettings.domainNameLabel=='MyLabel']"
-  parameters:
+    syntax: az network public-ip list -g MyResourceGroup --query "[?dnsSettings.domainNameLabel=='MyLabel']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_show
   name: az network public-ip show
   summary: Get the details of a public IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip show [--expand]
+                              [--ids]
+                              [--name]
+                              [--query-examples]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: Get information about a public IP resource.
-    syntax:
-      content: az network public-ip show -g MyResourceGroup -n MyIp
+    syntax: az network public-ip show -g MyResourceGroup -n MyIp
   - summary: Get the FQDN and IP address of a public IP resource.
-    syntax:
-      content: 'az network public-ip show -g MyResourceGroup -n MyIp --query "{fqdn: dnsSettings.fqdn, address: ipAddress}"'
-  parameters:
+    syntax: 'az network public-ip show -g MyResourceGroup -n MyIp --query "{fqdn: dnsSettings.fqdn, address: ipAddress}"'
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -147,29 +137,41 @@ items:
   - name: --name -n
     summary: The name of the public IP address.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_update
   name: az network public-ip update
   summary: Update a public IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip update [--add]
+                                [--allocation-method {Dynamic, Static}]
+                                [--dns-name]
+                                [--force-string]
+                                [--idle-timeout]
+                                [--ids]
+                                [--name]
+                                [--remove]
+                                [--resource-group]
+                                [--reverse-fqdn]
+                                [--set]
+                                [--subscription]
+                                [--tags]
   examples:
   - summary: Update a public IP resource with a DNS name label and static allocation.
-    syntax:
-      content: az network public-ip update -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
-  parameters:
+    syntax: az network public-ip update -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --allocation-method
     parameterValueGroup: Dynamic, Static
     summary: IP address allocation method.
@@ -177,70 +179,46 @@ items:
   - name: --dns-name
     summary: Globally unique DNS entry.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
-  - name: --reverse-fqdn
-    summary: Reverse FQDN (fully qualified domain name).
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the public IP address.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --reverse-fqdn
+    summary: Reverse FQDN (fully qualified domain name).
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_public_ip_create
-  name: az network public-ip create
-  summary: Create a public IP address.
-- uid: az_network_public_ip_delete
-  name: az network public-ip delete
-  summary: Delete a public IP address.
-- uid: az_network_public_ip_list
-  name: az network public-ip list
-  summary: List public IP addresses.
-- uid: az_network_public_ip_prefix
-  name: az network public-ip prefix
-  summary: Manage public IP prefix resources.
-- uid: az_network_public_ip_prefix_create
-  name: az network public-ip prefix create
-  summary: Create a public IP prefix resource.
-- uid: az_network_public_ip_prefix_list
-  name: az network public-ip prefix list
-  summary: List public IP prefix resources.
-- uid: az_network_public_ip_show
-  name: az network public-ip show
-  summary: Get the details of a public IP address.
-- uid: az_network_public_ip_update
-  name: az network public-ip update
-  summary: Update a public IP address.
+- az_network_public-ip_create
+- az_network_public-ip_delete
+- az_network_public-ip_list
+- az_network_public-ip_prefix
+- az_network_public-ip_prefix_create
+- az_network_public-ip_prefix_list
+- az_network_public-ip_show
+- az_network_public-ip_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -256,10 +234,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about public IP addresses visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address">https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about public IP addresses visit https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/public-ip/prefix.yml b/2017-03-09-profile/docs-ref-autogen/network/public-ip/prefix.yml
index 962e4f0d6f..85c45a7564 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/public-ip/prefix.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/public-ip/prefix.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_public_ip_prefix
-  name: az network public-ip prefix
-  summary: Manage public IP prefix resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_public_ip_prefix_create
-  - az_network_public_ip_prefix_list
-- uid: az_network_public_ip_prefix_create
+### YamlMime:AzureCLIGroup
+uid: az_network_public-ip_prefix
+name: az network public-ip prefix
+summary: Manage public IP prefix resources.
+description: ''
+directCommands:
+- uid: az_network_public-ip_prefix_create
   name: az network public-ip prefix create
   summary: Create a public IP prefix resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip prefix create --length
+                                       --name
+                                       --resource-group
+                                       [--location]
+                                       [--subscription]
+                                       [--tags]
+                                       [--zone {1, 2, 3}]
   examples:
   - summary: Create a public IP prefix resource. (autogenerated)
-    syntax:
-      content: az network public-ip prefix create --length 28 --location westus2 --name MyPublicIPPrefix --resource-group MyResourceGroup
-  parameters:
+    syntax: az network public-ip prefix create --length 28 --location westus2 --name MyPublicIPPrefix --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --length
-    summary: Length of the prefix (i.e. `XX.XX.XX.XX/&lt;Length&gt;`).
+    summary: Length of the prefix (i.e. `XX.XX.XX.XX/<Length>`).
     description: ''
   - isRequired: true
     name: --name -n
@@ -30,10 +30,14 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -42,41 +46,29 @@ items:
     parameterValueGroup: 1, 2, 3
     summary: Availability zone into which to provision the resource.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_prefix_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_prefix_list
   name: az network public-ip prefix list
   summary: List public IP prefix resources.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network public-ip prefix list [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_public_ip_prefix_create
-  name: az network public-ip prefix create
-  summary: Create a public IP prefix resource.
-- uid: az_network_public_ip_prefix_list
-  name: az network public-ip prefix list
-  summary: List public IP prefix resources.
+- az_network_public-ip_prefix_create
+- az_network_public-ip_prefix_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -92,10 +84,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage public IP prefix resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage public IP prefix resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/route-table.yml b/2017-03-09-profile/docs-ref-autogen/network/route-table.yml
index e434f8cfcd..c45ae4c29a 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/route-table.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/route-table.yml
@@ -1,62 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_route_table
-  name: az network route-table
-  summary: Manage route tables.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_route_table_create
-  - az_network_route_table_delete
-  - az_network_route_table_list
-  - az_network_route_table_show
-  - az_network_route_table_update
-- uid: az_network_route_table_create
+### YamlMime:AzureCLIGroup
+uid: az_network_route-table
+name: az network route-table
+summary: Manage route tables.
+description: ''
+directCommands:
+- uid: az_network_route-table_create
   name: az network route-table create
   summary: Create a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table create --name
+                                  --resource-group
+                                  [--location]
+                                  [--subscription]
+                                  [--tags]
   examples:
   - summary: Create a route table.
-    syntax:
-      content: az network route-table create -g MyResourceGroup -n MyRouteTable
-  parameters:
+    syntax: az network route-table create -g MyResourceGroup -n MyRouteTable
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the route table.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_delete
   name: az network route-table delete
   summary: Delete a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table delete [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Delete a route table.
-    syntax:
-      content: az network route-table delete -g MyResourceGroup -n MyRouteTable
-  parameters:
+    syntax: az network route-table delete -g MyResourceGroup -n MyRouteTable
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -64,51 +57,49 @@ items:
     summary: Name of the route table.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_list
   name: az network route-table list
   summary: List route tables.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table list [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: List all route tables in a subscription.
-    syntax:
-      content: az network route-table list -g MyResourceGroup
-  parameters:
+    syntax: az network route-table list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_show
   name: az network route-table show
   summary: Get the details of a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table show [--expand]
+                                [--ids]
+                                [--name]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Get the details of a route table.
-    syntax:
-      content: az network route-table show -g MyResourceGroup -n MyRouteTable
-  parameters:
+    syntax: az network route-table show -g MyResourceGroup -n MyRouteTable
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -118,31 +109,39 @@ items:
   - name: --name -n
     summary: Name of the route table.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_update
   name: az network route-table update
   summary: Update a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table update [--add]
+                                  [--force-string]
+                                  [--ids]
+                                  [--name]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--subscription]
+                                  [--tags]
   examples:
   - summary: Update a route table to disable BGP route propogation.
-    syntax:
-      content: az network route-table update -g MyResourceGroup -n MyRouteTable --disable-bgp-route-propagation true
-  parameters:
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    syntax: az network route-table update -g MyResourceGroup -n MyRouteTable --disable-bgp-route-propagation true
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -150,64 +149,34 @@ items:
   - name: --name -n
     summary: Name of the route table.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_route_table_create
-  name: az network route-table create
-  summary: Create a route table.
-- uid: az_network_route_table_delete
-  name: az network route-table delete
-  summary: Delete a route table.
-- uid: az_network_route_table_list
-  name: az network route-table list
-  summary: List route tables.
-- uid: az_network_route_table_route
-  name: az network route-table route
-  summary: Manage routes in a route table.
-- uid: az_network_route_table_route_create
-  name: az network route-table route create
-  summary: Create a route in a route table.
-- uid: az_network_route_table_route_delete
-  name: az network route-table route delete
-  summary: Delete a route from a route table.
-- uid: az_network_route_table_route_list
-  name: az network route-table route list
-  summary: List routes in a route table.
-- uid: az_network_route_table_route_show
-  name: az network route-table route show
-  summary: Get the details of a route in a route table.
-- uid: az_network_route_table_route_update
-  name: az network route-table route update
-  summary: Update a route in a route table.
-- uid: az_network_route_table_show
-  name: az network route-table show
-  summary: Get the details of a route table.
-- uid: az_network_route_table_update
-  name: az network route-table update
-  summary: Update a route table.
+- az_network_route-table_create
+- az_network_route-table_delete
+- az_network_route-table_list
+- az_network_route-table_route
+- az_network_route-table_route_create
+- az_network_route-table_route_delete
+- az_network_route-table_route_list
+- az_network_route-table_route_show
+- az_network_route-table_route_update
+- az_network_route-table_show
+- az_network_route-table_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -223,10 +192,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage route tables.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage route tables.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/route-table/route.yml b/2017-03-09-profile/docs-ref-autogen/network/route-table/route.yml
index 83bcbedfd9..0ffc865778 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/route-table/route.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/route-table/route.yml
@@ -1,30 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_route_table_route
-  name: az network route-table route
-  summary: Manage routes in a route table.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_route_table_route_create
-  - az_network_route_table_route_delete
-  - az_network_route_table_route_list
-  - az_network_route_table_route_show
-  - az_network_route_table_route_update
-- uid: az_network_route_table_route_create
+### YamlMime:AzureCLIGroup
+uid: az_network_route-table_route
+name: az network route-table route
+summary: Manage routes in a route table.
+description: ''
+directCommands:
+- uid: az_network_route-table_route_create
   name: az network route-table route create
   summary: Create a route in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route create --address-prefix
+                                        --name
+                                        --next-hop-type {Internet, None, VirtualAppliance, VirtualNetworkGateway, VnetLocal}
+                                        --resource-group
+                                        --route-table-name
+                                        [--next-hop-ip-address]
+                                        [--subscription]
   examples:
   - summary: Create a route that forces all inbound traffic to a Network Virtual Appliance.
-    syntax:
-      content: >-
-        az network route-table route create -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute \
-            --next-hop-type VirtualAppliance --address-prefix 10.0.0.0/16 --next-hop-ip-address 10.0.100.4
-  parameters:
+    syntax: >-
+      az network route-table route create -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute \
+          --next-hop-type VirtualAppliance --address-prefix 10.0.0.0/16 --next-hop-ip-address 10.0.100.4
+  requiredParameters:
   - isRequired: true
     name: --address-prefix
     summary: The destination CIDR to which the route applies.
@@ -40,35 +37,34 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --route-table-name
     summary: Route table name.
     description: ''
+  optionalParameters:
   - name: --next-hop-ip-address
     summary: The IP address packets should be forwarded to when using the VirtualAppliance hop type.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_delete
   name: az network route-table route delete
   summary: Delete a route from a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route delete [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--route-table-name]
+                                        [--subscription]
   examples:
   - summary: Delete a route from a route table.
-    syntax:
-      content: az network route-table route delete -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute
-  parameters:
+    syntax: az network route-table route delete -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -76,7 +72,7 @@ items:
     summary: Route name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --route-table-name
     summary: Route table name.
@@ -84,59 +80,62 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_list
   name: az network route-table route list
   summary: List routes in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route list --resource-group
+                                      --route-table-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List routes in a route table.
-    syntax:
-      content: az network route-table route list -g MyResourceGroup --route-table-name MyRouteTable
-  parameters:
+    syntax: az network route-table route list -g MyResourceGroup --route-table-name MyRouteTable
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --route-table-name
     summary: Route table name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_show
   name: az network route-table route show
   summary: Get the details of a route in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route show [--ids]
+                                      [--name]
+                                      [--query-examples]
+                                      [--resource-group]
+                                      [--route-table-name]
+                                      [--subscription]
   examples:
   - summary: Get the details of a route in a route table.
-    syntax:
-      content: az network route-table route show -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute -o table
-  parameters:
+    syntax: az network route-table route show -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute -o table
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Route name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --route-table-name
     summary: Route table name.
@@ -144,29 +143,45 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_update
   name: az network route-table route update
   summary: Update a route in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route update [--add]
+                                        [--address-prefix]
+                                        [--force-string]
+                                        [--ids]
+                                        [--name]
+                                        [--next-hop-ip-address]
+                                        [--next-hop-type {Internet, None, VirtualAppliance, VirtualNetworkGateway, VnetLocal}]
+                                        [--remove]
+                                        [--resource-group]
+                                        [--route-table-name]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update a route in a route table to change the next hop ip address.
-    syntax:
-      content: az network route-table route update -g MyResourceGroup --route-table-name MyRouteTable \ -n MyRoute --next-hop-ip-address 10.0.100.5
+    syntax: az network route-table route update -g MyResourceGroup --route-table-name MyRouteTable \ -n MyRoute --next-hop-ip-address 10.0.100.5
   - summary: Update a route in a route table. (autogenerated)
-    syntax:
-      content: az network route-table route update --address-prefix 10.0.0.0/16 --name MyRoute --next-hop-ip-address 10.0.100.5 --next-hop-type VirtualNetworkGateway --route-table-name MyRouteTable
-  parameters:
+    syntax: az network route-table route update --address-prefix 10.0.0.0/16 --name MyRoute --next-hop-ip-address 10.0.100.5 --next-hop-type VirtualNetworkGateway --resource-group MyResourceGroup --route-table-name MyRouteTable
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-prefix
     summary: The destination CIDR to which the route applies.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Route name.
+    description: ''
   - name: --next-hop-ip-address
     summary: The IP address packets should be forwarded to when using the VirtualAppliance hop type.
     description: ''
@@ -174,55 +189,28 @@ items:
     parameterValueGroup: Internet, None, VirtualAppliance, VirtualNetworkGateway, VnetLocal
     summary: The type of Azure hop the packet should be sent to.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Route name.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --route-table-name
     summary: Route table name.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_route_table_route_create
-  name: az network route-table route create
-  summary: Create a route in a route table.
-- uid: az_network_route_table_route_delete
-  name: az network route-table route delete
-  summary: Delete a route from a route table.
-- uid: az_network_route_table_route_list
-  name: az network route-table route list
-  summary: List routes in a route table.
-- uid: az_network_route_table_route_show
-  name: az network route-table route show
-  summary: Get the details of a route in a route table.
-- uid: az_network_route_table_route_update
-  name: az network route-table route update
-  summary: Update a route in a route table.
+- az_network_route-table_route_create
+- az_network_route-table_route_delete
+- az_network_route-table_route_list
+- az_network_route-table_route_show
+- az_network_route-table_route_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -238,10 +226,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage routes in a route table.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage routes in a route table.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/security-partner-provider.yml b/2017-03-09-profile/docs-ref-autogen/network/security-partner-provider.yml
index 6bcfb74a9e..c6502c096a 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/security-partner-provider.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/security-partner-provider.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_security_partner_provider
-  name: az network security-partner-provider
-  summary: Manage Azure security partner provider.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_security_partner_provider_create
-  - az_network_security_partner_provider_list
-- uid: az_network_security_partner_provider_create
+### YamlMime:AzureCLIGroup
+uid: az_network_security-partner-provider
+name: az network security-partner-provider
+summary: Manage Azure security partner provider.
+description: ''
+directCommands:
+- uid: az_network_security-partner-provider_create
   name: az network security-partner-provider create
   summary: Create a Azure security partner provider.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network security-partner-provider create --name
+                                                --provider
+                                                --resource-group
+                                                --vhub
+                                                [--location]
+                                                [--subscription]
+                                                [--tags]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the Security Partner Provider.
@@ -26,53 +27,45 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vhub
     summary: Name or ID of the virtual hub to which the Security Partner Provider belongs.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_security_partner_provider_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_security-partner-provider_list
   name: az network security-partner-provider list
   summary: List all Azure security partner provider.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network security-partner-provider list [--query-examples]
+                                              [--resource-group]
+                                              [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_security_partner_provider_create
-  name: az network security-partner-provider create
-  summary: Create a Azure security partner provider.
-- uid: az_network_security_partner_provider_list
-  name: az network security-partner-provider list
-  summary: List all Azure security partner provider.
+- az_network_security-partner-provider_create
+- az_network_security-partner-provider_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -88,10 +81,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure security partner provider.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure security partner provider.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/service-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/network/service-endpoint.yml
index 2b3d0c127b..d807023bef 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/service-endpoint.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/service-endpoint.yml
@@ -1,28 +1,14 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_service_endpoint
-  name: az network service-endpoint
-  summary: Manage policies related to service endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_service-endpoint
+name: az network service-endpoint
+summary: Manage policies related to service endpoints.
+description: ''
 commands:
-- uid: az_network_service_endpoint_policy
-  name: az network service-endpoint policy
-  summary: Manage service endpoint policies.
-- uid: az_network_service_endpoint_policy_create
-  name: az network service-endpoint policy create
-  summary: Create a service endpoint policy.
-- uid: az_network_service_endpoint_policy_list
-  name: az network service-endpoint policy list
-  summary: List service endpoint policies.
-- uid: az_network_service_endpoint_policy_definition
-  name: az network service-endpoint policy-definition
-  summary: Manage service endpoint policy definitions.
-- uid: az_network_service_endpoint_policy_definition_create
-  name: az network service-endpoint policy-definition create
-  summary: Create a service endpoint policy definition.
+- az_network_service-endpoint_policy
+- az_network_service-endpoint_policy_create
+- az_network_service-endpoint_policy_list
+- az_network_service-endpoint_policy-definition
+- az_network_service-endpoint_policy-definition_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -38,10 +24,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage policies related to service endpoints.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage policies related to service endpoints.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy-definition.yml b/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy-definition.yml
index 23ed7e6b51..59eff69437 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy-definition.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy-definition.yml
@@ -1,20 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_service_endpoint_policy_definition
-  name: az network service-endpoint policy-definition
-  summary: Manage service endpoint policy definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_service_endpoint_policy_definition_create
-- uid: az_network_service_endpoint_policy_definition_create
+### YamlMime:AzureCLIGroup
+uid: az_network_service-endpoint_policy-definition
+name: az network service-endpoint policy-definition
+summary: Manage service endpoint policy definitions.
+description: ''
+directCommands:
+- uid: az_network_service-endpoint_policy-definition_create
   name: az network service-endpoint policy-definition create
   summary: Create a service endpoint policy definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network service-endpoint policy-definition create --name
+                                                         --policy-name
+                                                         --resource-group
+                                                         --service
+                                                         --service-resources
+                                                         [--description]
+                                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the service endpoint policy definition.
@@ -25,7 +27,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --service
@@ -36,22 +38,16 @@ items:
     name: --service-resources
     summary: Space-separated list of service resources the definition applies to.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the policy definition.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_service_endpoint_policy_definition_create
-  name: az network service-endpoint policy-definition create
-  summary: Create a service endpoint policy definition.
+- az_network_service-endpoint_policy-definition_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -67,10 +63,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage service endpoint policy definitions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage service endpoint policy definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy.yml b/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy.yml
index c961275bf5..50680bb0a5 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/service-endpoint/policy.yml
@@ -1,78 +1,67 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_service_endpoint_policy
-  name: az network service-endpoint policy
-  summary: Manage service endpoint policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_service_endpoint_policy_create
-  - az_network_service_endpoint_policy_list
-- uid: az_network_service_endpoint_policy_create
+### YamlMime:AzureCLIGroup
+uid: az_network_service-endpoint_policy
+name: az network service-endpoint policy
+summary: Manage service endpoint policies.
+description: ''
+directCommands:
+- uid: az_network_service-endpoint_policy_create
   name: az network service-endpoint policy create
   summary: Create a service endpoint policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network service-endpoint policy create --name
+                                              --resource-group
+                                              [--location]
+                                              [--subscription]
+                                              [--tags]
   examples:
   - summary: Create a service endpoint policy. (autogenerated)
-    syntax:
-      content: az network service-endpoint policy create --name MyServiceEndpointPolicy --resource-group MyResourceGroup
-  parameters:
+    syntax: az network service-endpoint policy create --name MyServiceEndpointPolicy --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the service endpoint policy.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_service_endpoint_policy_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_service-endpoint_policy_list
   name: az network service-endpoint policy list
   summary: List service endpoint policies.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network service-endpoint policy list [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: List service endpoint policies. (autogenerated)
-    syntax:
-      content: az network service-endpoint policy list --resource-group MyResourceGroup
-  parameters:
+    syntax: az network service-endpoint policy list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_service_endpoint_policy_create
-  name: az network service-endpoint policy create
-  summary: Create a service endpoint policy.
-- uid: az_network_service_endpoint_policy_list
-  name: az network service-endpoint policy list
-  summary: List service endpoint policies.
+- az_network_service-endpoint_policy_create
+- az_network_service-endpoint_policy_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -88,10 +77,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage service endpoint policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage service endpoint policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/traffic-manager.yml b/2017-03-09-profile/docs-ref-autogen/network/traffic-manager.yml
index b67ecf5d31..2a199efab6 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/traffic-manager.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/traffic-manager.yml
@@ -1,55 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_traffic_manager
-  name: az network traffic-manager
-  summary: Manage the routing of incoming traffic.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_traffic-manager
+name: az network traffic-manager
+summary: Manage the routing of incoming traffic.
+description: ''
 commands:
-- uid: az_network_traffic_manager_endpoint
-  name: az network traffic-manager endpoint
-  summary: Manage Azure Traffic Manager end points.
-- uid: az_network_traffic_manager_endpoint_create
-  name: az network traffic-manager endpoint create
-  summary: Create a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_delete
-  name: az network traffic-manager endpoint delete
-  summary: Delete a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_list
-  name: az network traffic-manager endpoint list
-  summary: List traffic manager endpoints.
-- uid: az_network_traffic_manager_endpoint_show
-  name: az network traffic-manager endpoint show
-  summary: Get the details of a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  name: az network traffic-manager endpoint show-geographic-hierarchy
-  summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-- uid: az_network_traffic_manager_endpoint_update
-  name: az network traffic-manager endpoint update
-  summary: Update a traffic manager endpoint.
-- uid: az_network_traffic_manager_profile
-  name: az network traffic-manager profile
-  summary: Manage Azure Traffic Manager profiles.
-- uid: az_network_traffic_manager_profile_check_dns
-  name: az network traffic-manager profile check-dns
-  summary: Check the availability of a relative DNS name.
-- uid: az_network_traffic_manager_profile_create
-  name: az network traffic-manager profile create
-  summary: Create a traffic manager profile.
-- uid: az_network_traffic_manager_profile_delete
-  name: az network traffic-manager profile delete
-  summary: Delete a traffic manager profile.
-- uid: az_network_traffic_manager_profile_list
-  name: az network traffic-manager profile list
-  summary: List traffic manager profiles.
-- uid: az_network_traffic_manager_profile_show
-  name: az network traffic-manager profile show
-  summary: Get the details of a traffic manager profile.
-- uid: az_network_traffic_manager_profile_update
-  name: az network traffic-manager profile update
-  summary: Update a traffic manager profile.
+- az_network_traffic-manager_endpoint
+- az_network_traffic-manager_endpoint_create
+- az_network_traffic-manager_endpoint_delete
+- az_network_traffic-manager_endpoint_list
+- az_network_traffic-manager_endpoint_show
+- az_network_traffic-manager_endpoint_show-geographic-hierarchy
+- az_network_traffic-manager_endpoint_update
+- az_network_traffic-manager_profile
+- az_network_traffic-manager_profile_check-dns
+- az_network_traffic-manager_profile_create
+- az_network_traffic-manager_profile_delete
+- az_network_traffic-manager_profile_list
+- az_network_traffic-manager_profile_show
+- az_network_traffic-manager_profile_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -65,10 +33,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the routing of incoming traffic.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the routing of incoming traffic.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/endpoint.yml b/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/endpoint.yml
index 2b31a0a71e..cebc113b51 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/endpoint.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/endpoint.yml
@@ -1,31 +1,36 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_traffic_manager_endpoint
-  name: az network traffic-manager endpoint
-  summary: Manage Azure Traffic Manager end points.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_traffic_manager_endpoint_create
-  - az_network_traffic_manager_endpoint_delete
-  - az_network_traffic_manager_endpoint_list
-  - az_network_traffic_manager_endpoint_show
-  - az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  - az_network_traffic_manager_endpoint_update
-- uid: az_network_traffic_manager_endpoint_create
+### YamlMime:AzureCLIGroup
+uid: az_network_traffic-manager_endpoint
+name: az network traffic-manager endpoint
+summary: Manage Azure Traffic Manager end points.
+description: ''
+directCommands:
+- uid: az_network_traffic-manager_endpoint_create
   name: az network traffic-manager endpoint create
   summary: Create a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint create --name
+                                               --profile-name
+                                               --resource-group
+                                               --type {azureEndpoints, externalEndpoints, nestedEndpoints}
+                                               [--custom-headers]
+                                               [--endpoint-location]
+                                               [--endpoint-monitor-status]
+                                               [--endpoint-status {Disabled, Enabled}]
+                                               [--geo-mapping]
+                                               [--min-child-endpoints]
+                                               [--priority]
+                                               [--subnets]
+                                               [--subscription]
+                                               [--target]
+                                               [--target-resource-id]
+                                               [--weight]
   examples:
   - summary: Create an endpoint for a performance profile to point to an Azure Web App endpoint.
-    syntax:
-      content: >-
-        az network traffic-manager endpoint create -g MyResourceGroup --profile-name MyTmProfile \
-            -n MyEndpoint --type azureEndpoints --target-resource-id $MyWebApp1Id --endpoint-status enabled
-  parameters:
+    syntax: >-
+      az network traffic-manager endpoint create -g MyResourceGroup --profile-name MyTmProfile \
+          -n MyEndpoint --type azureEndpoints --target-resource-id $MyWebApp1Id --endpoint-status enabled
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Endpoint name.
@@ -36,13 +41,14 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --type -t
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
+  optionalParameters:
   - name: --custom-headers
     summary: Space-separated list of custom headers in KEY=VALUE format.
     description: ''
@@ -69,6 +75,9 @@ items:
   - name: --subnets
     summary: Space-separated list of subnet CIDR prefixes (10.0.0.0/24) or subnet ranges (10.0.0.0-11.0.0.0).
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target
     summary: Fully-qualified DNS name of the endpoint.
     description: ''
@@ -78,29 +87,24 @@ items:
   - name: --weight
     summary: Weight of the endpoint when using the 'Weighted' traffic routing method. Values range from 1 to 1000.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_delete
   name: az network traffic-manager endpoint delete
   summary: Delete a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint delete [--ids]
+                                               [--name]
+                                               [--profile-name]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
   examples:
   - summary: Delete a traffic manager endpoint.
-    syntax:
-      content: az network traffic-manager endpoint delete -g MyResourceGroup \ --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
+    syntax: az network traffic-manager endpoint delete -g MyResourceGroup \ --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
   - summary: Delete a traffic manager endpoint. (autogenerated)
-    syntax:
-      content: az network traffic-manager endpoint delete --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription --type azureEndpoints
-  parameters:
+    syntax: az network traffic-manager endpoint delete --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription --type azureEndpoints
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -111,7 +115,7 @@ items:
     summary: Name of parent profile.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -120,57 +124,59 @@ items:
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_list
   name: az network traffic-manager endpoint list
   summary: List traffic manager endpoints.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint list --profile-name
+                                             --resource-group
+                                             [--query-examples]
+                                             [--subscription]
+                                             [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
   examples:
   - summary: List traffic manager endpoints.
-    syntax:
-      content: az network traffic-manager endpoint list -g MyResourceGroup --profile-name MyTmProfile
-  parameters:
+    syntax: az network traffic-manager endpoint list -g MyResourceGroup --profile-name MyTmProfile
+  requiredParameters:
   - isRequired: true
     name: --profile-name
     summary: Name of parent profile.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --type -t
-    parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
-    summary: Endpoint type.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_show
+  - name: --type -t
+    parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
+    summary: Endpoint type.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_show
   name: az network traffic-manager endpoint show
   summary: Get the details of a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint show [--ids]
+                                             [--name]
+                                             [--profile-name]
+                                             [--query-examples]
+                                             [--resource-group]
+                                             [--subscription]
+                                             [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
   examples:
   - summary: Get the details of a traffic manager endpoint.
-    syntax:
-      content: >-
-        az network traffic-manager endpoint show -g MyResourceGroup \
-            --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
-  parameters:
+    syntax: >-
+      az network traffic-manager endpoint show -g MyResourceGroup \
+          --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -180,8 +186,11 @@ items:
   - name: --profile-name
     summary: Name of parent profile.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -190,49 +199,57 @@ items:
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_show-geographic-hierarchy
   name: az network traffic-manager endpoint show-geographic-hierarchy
   summary: Get the default geographic hierarchy used by the geographic traffic routing method.
   description: ''
-  langs:
-  - azurecli
+  syntax: az network traffic-manager endpoint show-geographic-hierarchy [--subscription]
   examples:
   - summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-    syntax:
-      content: az network traffic-manager endpoint show-geographic-hierarchy
-  parameters:
+    syntax: az network traffic-manager endpoint show-geographic-hierarchy
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_update
   name: az network traffic-manager endpoint update
   summary: Update a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint update [--add]
+                                               [--custom-headers]
+                                               [--endpoint-location]
+                                               [--endpoint-monitor-status]
+                                               [--endpoint-status {Disabled, Enabled}]
+                                               [--force-string]
+                                               [--geo-mapping]
+                                               [--ids]
+                                               [--min-child-endpoints]
+                                               [--name]
+                                               [--priority]
+                                               [--profile-name]
+                                               [--remove]
+                                               [--resource-group]
+                                               [--set]
+                                               [--subnets]
+                                               [--subscription]
+                                               [--target]
+                                               [--target-resource-id]
+                                               [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
+                                               [--weight]
   examples:
   - summary: Update a traffic manager endpoint to change its weight.
-    syntax:
-      content: az network traffic-manager endpoint update -g MyResourceGroup --profile-name MyTmProfile \ -n MyEndpoint --weight 20 --type azureEndpoints
+    syntax: az network traffic-manager endpoint update -g MyResourceGroup --profile-name MyTmProfile \ -n MyEndpoint --weight 20 --type azureEndpoints
   - summary: Update a traffic manager endpoint. (autogenerated)
-    syntax:
-      content: az network traffic-manager endpoint update --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --target webserver.mysite.com --type azureEndpoints
+    syntax: az network traffic-manager endpoint update --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --target webserver.mysite.com --type azureEndpoints
   - summary: Update a traffic manager endpoint. (autogenerated)
-    syntax:
-      content: az network traffic-manager endpoint update --endpoint-status Enabled --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --type azureEndpoints
-  parameters:
+    syntax: az network traffic-manager endpoint update --endpoint-status Enabled --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --type azureEndpoints
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --custom-headers
     summary: Space-separated list of custom headers in KEY=VALUE format.
     description: ''
@@ -246,83 +263,63 @@ items:
     parameterValueGroup: Disabled, Enabled
     summary: The status of the endpoint. If enabled the endpoint is probed for endpoint health and included in the traffic routing method.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --geo-mapping
     summary: Space-separated list of country/region codes mapped to this endpoint when using the 'Geographic' routing method.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --min-child-endpoints
     summary: The minimum number of endpoints that must be available in the child profile for the parent profile to be considered available. Only applicable to an endpoint of type 'NestedEndpoints'.
     description: ''
+  - name: --name -n
+    summary: Endpoint name.
+    description: ''
   - name: --priority
     summary: Priority of the endpoint when using the 'Priority' traffic routing method. Values range from 1 to 1000, with lower values representing higher priority.
     description: ''
+  - name: --profile-name
+    summary: Name of parent profile.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
   - name: --subnets
     summary: Space-separated list of subnet CIDR prefixes (10.0.0.0/24) or subnet ranges (10.0.0.0-11.0.0.0).
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target
     summary: Fully-qualified DNS name of the endpoint.
     description: ''
   - name: --target-resource-id
     summary: The Azure Resource URI of the endpoint. Not applicable for endpoints of type 'ExternalEndpoints'.
     description: ''
-  - name: --weight
-    summary: Weight of the endpoint when using the 'Weighted' traffic routing method. Values range from 1 to 1000.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Endpoint name.
-    description: ''
-  - name: --profile-name
-    summary: Name of parent profile.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
   - name: --type -t
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --weight
+    summary: Weight of the endpoint when using the 'Weighted' traffic routing method. Values range from 1 to 1000.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_traffic_manager_endpoint_create
-  name: az network traffic-manager endpoint create
-  summary: Create a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_delete
-  name: az network traffic-manager endpoint delete
-  summary: Delete a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_list
-  name: az network traffic-manager endpoint list
-  summary: List traffic manager endpoints.
-- uid: az_network_traffic_manager_endpoint_show
-  name: az network traffic-manager endpoint show
-  summary: Get the details of a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  name: az network traffic-manager endpoint show-geographic-hierarchy
-  summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-- uid: az_network_traffic_manager_endpoint_update
-  name: az network traffic-manager endpoint update
-  summary: Update a traffic manager endpoint.
+- az_network_traffic-manager_endpoint_create
+- az_network_traffic-manager_endpoint_delete
+- az_network_traffic-manager_endpoint_list
+- az_network_traffic-manager_endpoint_show
+- az_network_traffic-manager_endpoint_show-geographic-hierarchy
+- az_network_traffic-manager_endpoint_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -338,10 +335,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure Traffic Manager end points.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Traffic Manager end points.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/profile.yml b/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/profile.yml
index a0e48135f4..89272c3802 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/profile.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/traffic-manager/profile.yml
@@ -1,62 +1,64 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_traffic_manager_profile
-  name: az network traffic-manager profile
-  summary: Manage Azure Traffic Manager profiles.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_traffic_manager_profile_check_dns
-  - az_network_traffic_manager_profile_create
-  - az_network_traffic_manager_profile_delete
-  - az_network_traffic_manager_profile_list
-  - az_network_traffic_manager_profile_show
-  - az_network_traffic_manager_profile_update
-- uid: az_network_traffic_manager_profile_check_dns
+### YamlMime:AzureCLIGroup
+uid: az_network_traffic-manager_profile
+name: az network traffic-manager profile
+summary: Manage Azure Traffic Manager profiles.
+description: ''
+directCommands:
+- uid: az_network_traffic-manager_profile_check-dns
   name: az network traffic-manager profile check-dns
   summary: Check the availability of a relative DNS name.
   description: This checks for the avabilility of dns prefixes for trafficmanager.net.
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile check-dns --name
+                                                 [--subscription]
   examples:
   - summary: Check the availability of 'mywebapp.trafficmanager.net' in Azure.
-    syntax:
-      content: az network traffic-manager profile check-dns -n mywebapp
-  parameters:
+    syntax: az network traffic-manager profile check-dns -n mywebapp
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: DNS prefix to verify availability for.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_create
   name: az network traffic-manager profile create
   summary: Create a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile create --name
+                                              --resource-group
+                                              --routing-method {Geographic, Multivalue, Performance, Priority, Subnet, Weighted}
+                                              --unique-dns-name
+                                              [--custom-headers]
+                                              [--interval]
+                                              [--max-failures]
+                                              [--max-return]
+                                              [--path]
+                                              [--port]
+                                              [--protocol {HTTP, HTTPS, TCP}]
+                                              [--status {Disabled, Enabled}]
+                                              [--status-code-ranges]
+                                              [--subscription]
+                                              [--tags]
+                                              [--timeout]
+                                              [--ttl]
   examples:
   - summary: Create a traffic manager profile with performance routing.
-    syntax:
-      content: >-
-        az network traffic-manager profile create -g MyResourceGroup -n MyTmProfile --routing-method Performance \
-            --unique-dns-name mywebapp --ttl 30 --protocol HTTP --port 80 --path "/"
-  parameters:
+    syntax: >-
+      az network traffic-manager profile create -g MyResourceGroup -n MyTmProfile --routing-method Performance \
+          --unique-dns-name mywebapp --ttl 30 --protocol HTTP --port 80 --path "/"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Traffic manager profile name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --routing-method
@@ -65,20 +67,9 @@ items:
     description: ''
   - isRequired: true
     name: --unique-dns-name
-    summary: Relative DNS name for the traffic manager profile. Resulting FQDN will be `&lt;unique-dns-name&gt;.trafficmanager.net` and must be globally unique.
-    description: ''
-  - name: --status
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Status of the Traffic Manager profile.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --ttl
-    defaultValue: "30"
-    summary: DNS config time-to-live in seconds.
+    summary: Relative DNS name for the traffic manager profile. Resulting FQDN will be `<unique-dns-name>.trafficmanager.net` and must be globally unique.
     description: ''
+  optionalParameters:
   - name: --custom-headers
     summary: Space-separated list of NAME=VALUE pairs.
     description: ''
@@ -88,8 +79,11 @@ items:
   - name: --max-failures
     summary: The number of consecutive failed health checks tolerated before an endpoint is considered degraded.
     description: ''
+  - name: --max-return
+    summary: Maximum number of endpoints to be returned for MultiValue routing type.
+    description: ''
   - name: --path
-    summary: Path to monitor. Use "" for none.
+    summary: Path to monitor. Use ""('""' in PowerShell) for none.
     description: ''
   - name: --port
     defaultValue: "80"
@@ -100,35 +94,43 @@ items:
     parameterValueGroup: HTTP, HTTPS, TCP
     summary: Monitor protocol.
     description: ''
+  - name: --status
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Status of the Traffic Manager profile.
+    description: ''
   - name: --status-code-ranges
     summary: Space-separated list of status codes in MIN-MAX or VAL format.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
   - name: --timeout
     summary: The time in seconds allowed for endpoints to respond to a health check.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --ttl
+    defaultValue: "30"
+    summary: DNS config time-to-live in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_delete
   name: az network traffic-manager profile delete
   summary: Delete a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile delete [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: Delete a traffic manager profile.
-    syntax:
-      content: az network traffic-manager profile delete -g MyResourceGroup -n MyTmProfile
+    syntax: az network traffic-manager profile delete -g MyResourceGroup -n MyTmProfile
   - summary: Delete a traffic manager profile. (autogenerated)
-    syntax:
-      content: az network traffic-manager profile delete --name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network traffic-manager profile delete --name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -136,120 +138,122 @@ items:
     summary: The name of the Traffic Manager profile to be deleted.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_list
   name: az network traffic-manager profile list
   summary: List traffic manager profiles.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile list [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: List traffic manager profiles.
-    syntax:
-      content: az network traffic-manager profile list -g MyResourceGroup
-  parameters:
+    syntax: az network traffic-manager profile list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_show
   name: az network traffic-manager profile show
   summary: Get the details of a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile show [--ids]
+                                            [--name]
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: Get the details of a traffic manager profile.
-    syntax:
-      content: az network traffic-manager profile show -g MyResourceGroup -n MyTmProfile
-  parameters:
+    syntax: az network traffic-manager profile show -g MyResourceGroup -n MyTmProfile
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the Traffic Manager profile.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_update
   name: az network traffic-manager profile update
   summary: Update a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile update [--add]
+                                              [--custom-headers]
+                                              [--force-string]
+                                              [--ids]
+                                              [--interval]
+                                              [--max-failures]
+                                              [--max-return]
+                                              [--name]
+                                              [--path]
+                                              [--port]
+                                              [--protocol {HTTP, HTTPS, TCP}]
+                                              [--remove]
+                                              [--resource-group]
+                                              [--routing-method {Geographic, Multivalue, Performance, Priority, Subnet, Weighted}]
+                                              [--set]
+                                              [--status {Disabled, Enabled}]
+                                              [--status-code-ranges]
+                                              [--subscription]
+                                              [--tags]
+                                              [--timeout]
+                                              [--ttl]
   examples:
   - summary: Update a traffic manager profile to change the TTL to 300.
-    syntax:
-      content: az network traffic-manager profile update -g MyResourceGroup -n MyTmProfile --ttl 300
+    syntax: az network traffic-manager profile update -g MyResourceGroup -n MyTmProfile --ttl 300
   - summary: Update a traffic manager profile. (autogenerated)
-    syntax:
-      content: az network traffic-manager profile update --name MyTmProfile --resource-group MyResourceGroup --status Enabled
-  parameters:
-  - name: --routing-method
-    parameterValueGroup: Geographic, Multivalue, Performance, Priority, Subnet, Weighted
-    summary: Routing method.
-    description: ''
-  - name: --status
-    parameterValueGroup: Disabled, Enabled
-    summary: Status of the Traffic Manager profile.
+    syntax: az network traffic-manager profile update --name MyTmProfile --resource-group MyResourceGroup --status Enabled
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --custom-headers
+    summary: Space-separated list of NAME=VALUE pairs.
     description: ''
-  - name: --ttl
-    summary: DNS config time-to-live in seconds.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --name -n
-    summary: The name of the Traffic Manager profile.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --custom-headers
-    summary: Space-separated list of NAME=VALUE pairs.
-    description: ''
   - name: --interval
     summary: The interval in seconds at which health checks are conducted.
     description: ''
   - name: --max-failures
     summary: The number of consecutive failed health checks tolerated before an endpoint is considered degraded.
     description: ''
+  - name: --max-return
+    summary: Maximum number of endpoints to be returned for MultiValue routing type.
+    description: ''
+  - name: --name -n
+    summary: The name of the Traffic Manager profile.
+    description: ''
   - name: --path
-    summary: Path to monitor. Use "" for none.
+    summary: Path to monitor. Use ""('""' in PowerShell) for none.
     description: ''
   - name: --port
     summary: Port to monitor.
@@ -258,49 +262,46 @@ items:
     parameterValueGroup: HTTP, HTTPS, TCP
     summary: Monitor protocol.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --routing-method
+    parameterValueGroup: Geographic, Multivalue, Performance, Priority, Subnet, Weighted
+    summary: Routing method.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Status of the Traffic Manager profile.
+    description: ''
   - name: --status-code-ranges
     summary: Space-separated list of status codes in MIN-MAX or VAL format.
     description: ''
-  - name: --timeout
-    summary: The time in seconds allowed for endpoints to respond to a health check.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --timeout
+    summary: The time in seconds allowed for endpoints to respond to a health check.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --ttl
+    summary: DNS config time-to-live in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_traffic_manager_profile_check_dns
-  name: az network traffic-manager profile check-dns
-  summary: Check the availability of a relative DNS name.
-- uid: az_network_traffic_manager_profile_create
-  name: az network traffic-manager profile create
-  summary: Create a traffic manager profile.
-- uid: az_network_traffic_manager_profile_delete
-  name: az network traffic-manager profile delete
-  summary: Delete a traffic manager profile.
-- uid: az_network_traffic_manager_profile_list
-  name: az network traffic-manager profile list
-  summary: List traffic manager profiles.
-- uid: az_network_traffic_manager_profile_show
-  name: az network traffic-manager profile show
-  summary: Get the details of a traffic manager profile.
-- uid: az_network_traffic_manager_profile_update
-  name: az network traffic-manager profile update
-  summary: Update a traffic manager profile.
+- az_network_traffic-manager_profile_check-dns
+- az_network_traffic-manager_profile_create
+- az_network_traffic-manager_profile_delete
+- az_network_traffic-manager_profile_list
+- az_network_traffic-manager_profile_show
+- az_network_traffic-manager_profile_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -316,10 +317,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure Traffic Manager profiles.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Traffic Manager profiles.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vhub.yml b/2017-03-09-profile/docs-ref-autogen/network/vhub.yml
new file mode 100644
index 0000000000..fc63c06184
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vhub.yml
@@ -0,0 +1,230 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub
+name: az network vhub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual hubs.
+description: ''
+directCommands:
+- uid: az_network_vhub_create
+  name: az network vhub create
+  summary: Create a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub create --address-prefix
+                           --name
+                           --resource-group
+                           --vwan
+                           [--location]
+                           [--no-wait]
+                           [--sku {Basic, Standard}]
+                           [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --address-prefix
+    summary: CIDR address prefix for the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vwan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The sku of the VirtualHub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_vhub_delete
+  name: az network vhub delete
+  summary: Delete a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub delete --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vhub_get-effective-routes
+  name: az network vhub get-effective-routes
+  summary: Get the effective routes configured for the Virtual Hub resource or the specified resource.
+  description: ''
+  syntax: >-
+    az network vhub get-effective-routes --name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--resource-id]
+                                         [--resource-type]
+  examples:
+  - summary: Get the effective routes configured for route table in the virtual hub.
+    syntax: az network vhub get-effective-routes --resource-type RouteTable --resource-id /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable -g MyRG -n MyHub
+  - summary: Get the effective routes configured for P2S connection in the virtual hub.
+    syntax: az network vhub get-effective-routes --resource-type P2SConnection --resource-id /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/p2sVpnGateways/MyGateway/p2sConnectionConfigurations/MyConnection -g MyRG -n MyHub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-id
+    summary: The resource whose effective routes are being requested.
+    description: ''
+  - name: --resource-type
+    summary: The type of the specified resource like RouteTable, ExpressRouteConnection, HubVirtualNetworkConnection, VpnConnection and P2SConnection.
+    description: ''
+- uid: az_network_vhub_list
+  name: az network vhub list
+  summary: List virtual hubs.
+  description: ''
+  syntax: az network vhub list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vhub_show
+  name: az network vhub show
+  summary: Get the details of a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vhub_update
+  name: az network vhub update
+  summary: Update settings of a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub update --name
+                           --resource-group
+                           [--add]
+                           [--address-prefix]
+                           [--force-string]
+                           [--no-wait]
+                           [--remove]
+                           [--set]
+                           [--sku {Basic, Standard}]
+                           [--tags]
+                           [--vwan]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-prefix
+    summary: CIDR address prefix for the virtual hub.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The sku of the VirtualHub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vwan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+commands:
+- az_network_vhub_connection
+- az_network_vhub_connection_create
+- az_network_vhub_connection_delete
+- az_network_vhub_connection_list
+- az_network_vhub_connection_show
+- az_network_vhub_connection_update
+- az_network_vhub_connection_wait
+- az_network_vhub_create
+- az_network_vhub_delete
+- az_network_vhub_get-effective-routes
+- az_network_vhub_list
+- az_network_vhub_route
+- az_network_vhub_route_add
+- az_network_vhub_route_list
+- az_network_vhub_route_remove
+- az_network_vhub_route_reset
+- az_network_vhub_route-table
+- az_network_vhub_route-table_create
+- az_network_vhub_route-table_delete
+- az_network_vhub_route-table_list
+- az_network_vhub_route-table_route
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+- az_network_vhub_route-table_show
+- az_network_vhub_route-table_update
+- az_network_vhub_route-table_wait
+- az_network_vhub_show
+- az_network_vhub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual hubs.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vhub/connection.yml b/2017-03-09-profile/docs-ref-autogen/network/vhub/connection.yml
new file mode 100644
index 0000000000..7850bd5c9b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vhub/connection.yml
@@ -0,0 +1,299 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_connection
+name: az network vhub connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual hub VNet connections.
+description: ''
+directCommands:
+- uid: az_network_vhub_connection_create
+  name: az network vhub connection create
+  summary: Create a virtual hub VNet connection.
+  description: ''
+  syntax: >-
+    az network vhub connection create --name
+                                      --remote-vnet
+                                      --resource-group
+                                      --vhub-name
+                                      [--address-prefixes]
+                                      [--associated]
+                                      [--internet-security {false, true}]
+                                      [--labels]
+                                      [--next-hop]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--remote-vnet-transit {false, true}]
+                                      [--route-name]
+                                      [--use-hub-vnet-gateways {false, true}]
+  examples:
+  - summary: Create a virtual hub VNet connection without routing configuration.
+    syntax: az network vhub connection create -n MyConnection --vhub-name MyHub -g MyRG --remote-vnet MyVNet
+  - summary: Create a virtual hub VNet connection with routing configuration.
+    syntax: az network vhub connection create -n MyConnection --vhub-name MyHub -g MyRG --remote-vnet MyVNet --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable2 --labels label1 label2 --route-name route1 --next-hop 70.0.0.2 --address-prefixes 10.80.0.0/16 10.90.0.0/16
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --remote-vnet
+    summary: Name of ID of the remote VNet to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --address-prefixes
+    summary: Space-separated list of all address prefixes.
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --internet-security
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: Enable internet security and default is enabled.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --next-hop
+    summary: The ip address of the next hop.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remote-vnet-transit
+    parameterValueGroup: false, true
+    summary: Enable hub to remote VNet transit.
+    description: ''
+  - name: --route-name
+    summary: The name of the Static Route that is unique within a Vnet Route.
+    description: ''
+  - name: --use-hub-vnet-gateways
+    parameterValueGroup: false, true
+    summary: Allow remote VNet to use hub's VNet gateways.
+    description: ''
+- uid: az_network_vhub_connection_delete
+  name: az network vhub connection delete
+  summary: Delete a virtual hub VNet connection.
+  description: ''
+  syntax: >-
+    az network vhub connection delete --name
+                                      --resource-group
+                                      --vhub-name
+                                      [--no-wait]
+                                      [--yes]
+  examples:
+  - summary: Delete a virtual hub VNet connection.
+    syntax: az network vhub connection delete -n MyConnection --vhub-name MyHub -g MyRG
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_network_vhub_connection_list
+  name: az network vhub connection list
+  summary: List virtual hub VNet connections.
+  description: ''
+  syntax: >-
+    az network vhub connection list --resource-group
+                                    --vhub-name
+  examples:
+  - summary: List VNet connections in a given virtual hub.
+    syntax: az network vhub connection list --vhub-name MyHub -g MyRG
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_connection_show
+  name: az network vhub connection show
+  summary: Get the details of a virtual hub VNet connection.
+  description: ''
+  syntax: >-
+    az network vhub connection show --name
+                                    --resource-group
+                                    --vhub-name
+  examples:
+  - summary: Get the details of a virtual hub VNet connection.
+    syntax: az network vhub connection show -n MyConnection --vhub-name MyHub -g MyRG
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_connection_update
+  name: az network vhub connection update
+  summary: Update settings of a virtual hub connection.
+  description: ''
+  syntax: >-
+    az network vhub connection update --name
+                                      --resource-group
+                                      --vhub-name
+                                      [--add]
+                                      [--associated]
+                                      [--force-string]
+                                      [--labels]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--remove]
+                                      [--set]
+  examples:
+  - summary: Add labels of a virtual hub connection.
+    syntax: az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --labels Newlabel1 Newlabel2
+  - summary: Add labels for propagatedRouteTables of a virtual hub connection.
+    syntax: az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --add routingConfiguration.propagatedRouteTables.labels Newlabel1 Newlabel2
+  - summary: Reset labels of a virtual hub connection.
+    syntax: az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --set routingConfiguration.propagatedRouteTables.labels[0]=Newlabel
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_network_vhub_connection_wait
+  name: az network vhub connection wait
+  summary: Place the CLI in a waiting state until a condition of virtual hub VNet connection is met.
+  description: ''
+  syntax: >-
+    az network vhub connection wait --name
+                                    --resource-group
+                                    --vhub-name
+                                    [--created]
+                                    [--custom]
+                                    [--deleted]
+                                    [--exists]
+                                    [--interval]
+                                    [--timeout]
+                                    [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vhub_connection_create
+- az_network_vhub_connection_delete
+- az_network_vhub_connection_list
+- az_network_vhub_connection_show
+- az_network_vhub_connection_update
+- az_network_vhub_connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual hub VNet connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vhub/route-table.yml b/2017-03-09-profile/docs-ref-autogen/network/vhub/route-table.yml
new file mode 100644
index 0000000000..914b61c441
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vhub/route-table.yml
@@ -0,0 +1,256 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_route-table
+name: az network vhub route-table
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub route-table** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage route table in the virtual hub.
+description: ''
+directCommands:
+- uid: az_network_vhub_route-table_create
+  name: az network vhub route-table create
+  summary: Create a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table create --name
+                                       --resource-group
+                                       --vhub-name
+                                       [--connections {All_Branches, All_Vnets}]
+                                       [--destination-type {CIDR, ResourceId, Service}]
+                                       [--destinations]
+                                       [--labels]
+                                       [--next-hop]
+                                       [--next-hop-type {IPAddress, ResourceId}]
+                                       [--next-hops]
+                                       [--no-wait]
+                                       [--route-name]
+  examples:
+  - summary: Create a v3 route table in the virtual hub.
+    syntax: az network vhub route-table create -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --route-name MyRoute --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type ResourceId --next-hop /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/azureFirewalls/MyFirewall --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --connections
+    parameterValueGroup: All_Branches, All_Vnets
+    summary: List of all connections attached to this route table.
+    description: ''
+  - name: --destination-type
+    parameterValueGroup: CIDR, ResourceId, Service
+    summary: The type of destinations.
+    description: ''
+  - name: --destinations
+    summary: Space-separated list of all destinations.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of all labels associated with this route table.
+    description: ''
+  - name: --next-hop
+    summary: The resource ID of the next hop.
+    description: ''
+  - name: --next-hop-type
+    parameterValueGroup: IPAddress, ResourceId
+    summary: The type of next hop. If --next-hops (v2) is provided, it should be IPAddress; if --next-hop (v3) is provided, it should be ResourceId.
+    description: ''
+  - name: --next-hops
+    summary: Space-separated list of IP address of the next hop. Currently only one next hop is allowed for every route.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --route-name
+    summary: The name of the route.
+    description: ''
+- uid: az_network_vhub_route-table_delete
+  name: az network vhub route-table delete
+  summary: Delete a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table delete --name
+                                       --resource-group
+                                       --vhub-name
+  examples:
+  - summary: Delete a route table in the virtual hub.
+    syntax: az network vhub route-table delete -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_list
+  name: az network vhub route-table list
+  summary: List all route tables in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table list --resource-group
+                                     --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_show
+  name: az network vhub route-table show
+  summary: Show a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table show --name
+                                     --resource-group
+                                     --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_update
+  name: az network vhub route-table update
+  summary: Update a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table update --name
+                                       --resource-group
+                                       --vhub-name
+                                       [--connections {All_Branches, All_Vnets}]
+                                       [--labels]
+                                       [--no-wait]
+  examples:
+  - summary: Update the labels for a v3 route table in the virtual hub.
+    syntax: az network vhub route-table update -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --connections
+    parameterValueGroup: All_Branches, All_Vnets
+    summary: List of all connections attached to this route table.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of all labels associated with this route table.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vhub_route-table_wait
+  name: az network vhub route-table wait
+  summary: Place the CLI in a waiting state until a condition of the vhub route-table is met.
+  description: ''
+  syntax: >-
+    az network vhub route-table wait --name
+                                     --resource-group
+                                     --vhub-name
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--timeout]
+                                     [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the route table is successfully provisioned.
+    syntax: az network vhub route-table wait -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vhub_route-table_create
+- az_network_vhub_route-table_delete
+- az_network_vhub_route-table_list
+- az_network_vhub_route-table_route
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+- az_network_vhub_route-table_show
+- az_network_vhub_route-table_update
+- az_network_vhub_route-table_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage route table in the virtual hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vhub/route-table/route.yml b/2017-03-09-profile/docs-ref-autogen/network/vhub/route-table/route.yml
new file mode 100644
index 0000000000..01c91c0173
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vhub/route-table/route.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_route-table_route
+name: az network vhub route-table route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub route-table route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage routes of route table in the virtual hub.
+description: ''
+directCommands:
+- uid: az_network_vhub_route-table_route_add
+  name: az network vhub route-table route add
+  summary: Add a route into route table of the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table route add --destination-type {CIDR, ResourceId, Service}
+                                          --destinations
+                                          --name
+                                          --next-hop-type {IPAddress, ResourceId}
+                                          --resource-group
+                                          --vhub-name
+                                          [--next-hop]
+                                          [--next-hops]
+                                          [--no-wait]
+                                          [--route-name]
+  examples:
+  - summary: Add a route with firewall as next hop into route table of the virtual hub (route table v3).
+    syntax: az network vhub route-table route add -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type ResourceId --next-hop /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/azureFirewalls/MyFirewall
+  requiredParameters:
+  - isRequired: true
+    name: --destination-type
+    parameterValueGroup: CIDR, ResourceId, Service
+    summary: The type of destinations.
+    description: ''
+  - isRequired: true
+    name: --destinations
+    summary: Space-separated list of all destinations.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --next-hop-type
+    parameterValueGroup: IPAddress, ResourceId
+    summary: The type of next hop. If --next-hops (v2) is provided, it should be IPAddress; if --next-hop (v3) is provided, it should be ResourceId.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --next-hop
+    summary: The resource ID of the next hop.
+    description: ''
+  - name: --next-hops
+    summary: Space-separated list of IP address of the next hop. Currently only one next hop is allowed for every route.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --route-name
+    summary: The name of the route.
+    description: ''
+- uid: az_network_vhub_route-table_route_list
+  name: az network vhub route-table route list
+  summary: List routes in the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route-table route list --name
+                                           --resource-group
+                                           --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_route_remove
+  name: az network vhub route-table route remove
+  summary: Remove a route from route table of the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table route remove --index
+                                             --name
+                                             --resource-group
+                                             --vhub-name
+                                             [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: List index of the item (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage routes of route table in the virtual hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vhub/route.yml b/2017-03-09-profile/docs-ref-autogen/network/vhub/route.yml
new file mode 100644
index 0000000000..7f6db8e970
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vhub/route.yml
@@ -0,0 +1,126 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_route
+name: az network vhub route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage entries in the virtual hub route table.
+description: ''
+directCommands:
+- uid: az_network_vhub_route_add
+  name: az network vhub route add
+  summary: Add a route to the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route add --address-prefixes
+                              --next-hop
+                              --resource-group
+                              --vhub-name
+                              [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --address-prefixes
+    summary: Space-separated list of CIDR prefixes.
+    description: ''
+  - isRequired: true
+    name: --next-hop
+    summary: IP address of the next hop.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vhub_route_list
+  name: az network vhub route list
+  summary: List routes in the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route list --resource-group
+                               --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route_remove
+  name: az network vhub route remove
+  summary: Remove a route from the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route remove --index
+                                 --resource-group
+                                 --vhub-name
+                                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: List index of the item (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vhub_route_reset
+  name: az network vhub route reset
+  summary: Reset virtual hub route when the route state is failed.
+  description: ''
+  syntax: >-
+    az network vhub route reset --resource-group
+                                --vhub-name
+                                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_network_vhub_route_add
+- az_network_vhub_route_list
+- az_network_vhub_route_remove
+- az_network_vhub_route_reset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage entries in the virtual hub route table.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/virtual-appliance.yml b/2017-03-09-profile/docs-ref-autogen/network/virtual-appliance.yml
new file mode 100644
index 0000000000..6eeb13fe9c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/virtual-appliance.yml
@@ -0,0 +1,118 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_virtual-appliance
+name: az network virtual-appliance
+summary: Manage Azure Network Virtual Appliance.
+description: ''
+directCommands:
+- uid: az_network_virtual-appliance_create
+  name: az network virtual-appliance create
+  summary: Create an Azure network virtual appliance.
+  description: ''
+  syntax: >-
+    az network virtual-appliance create --name
+                                        --resource-group
+                                        --scale-unit
+                                        --vendor
+                                        --version
+                                        --vhub
+                                        [--asn]
+                                        [--boot-blobs]
+                                        [--cloud-blobs]
+                                        [--cloud-init-config]
+                                        [--location]
+                                        [--subscription]
+                                        [--tags]
+  examples:
+  - summary: Create an Azure network virtual appliance.
+    syntax: az network virtual-appliance create -n MyName -g MyRG --vhub {vhubID} --vendor "barracudasdwanrelease" --scale-unit 2 -v latest --asn 10000 --init-config "echo $hello" --boot-blobs {blobUrl1} {blobUrl2} --cloud-blobs {blobUrl3} {blobUrl4}
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of Network Virtual Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scale-unit
+    summary: Virtual Appliance Scale Unit.
+    description: ''
+  - isRequired: true
+    name: --vendor
+    summary: Virtual Appliance Vendor.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Virtual Appliance Version.
+    description: ''
+  - isRequired: true
+    name: --vhub
+    summary: Name or ID of the virtual hub to which the Security Partner Provider belongs.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: VirtualAppliance ASN. The valid value ranges from 1 to 4294967295.
+    description: ''
+  - name: --boot-blobs --boot-strap-config-blobs
+    summary: Space-separated list of BootStrapConfigurationBlobs storage URLs.
+    description: ''
+  - name: --cloud-blobs --cloud-init-config-blobs
+    summary: Space-separated list of CloudInitConfigurationBlob storage URLs.
+    description: ''
+  - name: --cloud-init-config --init-config
+    summary: CloudInitConfiguration scripts that will be run during cloud initialization.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_virtual-appliance_list
+  name: az network virtual-appliance list
+  summary: List all Azure network virtual appliance.
+  description: ''
+  syntax: >-
+    az network virtual-appliance list [--query-examples]
+                                      [--resource-group]
+                                      [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_virtual-appliance_create
+- az_network_virtual-appliance_list
+- az_network_virtual-appliance_site
+- az_network_virtual-appliance_site_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Network Virtual Appliance.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/virtual-appliance/site.yml b/2017-03-09-profile/docs-ref-autogen/network/virtual-appliance/site.yml
new file mode 100644
index 0000000000..ebd5c60735
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/virtual-appliance/site.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_virtual-appliance_site
+name: az network virtual-appliance site
+summary: Manage Azure Network Virtual Appliance Site.
+description: ''
+directCommands:
+- uid: az_network_virtual-appliance_site_create
+  name: az network virtual-appliance site create
+  summary: Create an Azure network virtual appliance site.
+  description: ''
+  syntax: >-
+    az network virtual-appliance site create --address-prefix
+                                             --appliance-name
+                                             --name
+                                             --resource-group
+                                             [--allow {false, true}]
+                                             [--default {false, true}]
+                                             [--optimize {false, true}]
+                                             [--subscription]
+  examples:
+  - summary: Create an Azure network virtual appliance site.
+    syntax: az network virtual-appliance site create -n MyName -g MyRG --appliance-name MyAppliance --address-prefix 10.0.0.0/24 --allow --default --optimize
+  requiredParameters:
+  - isRequired: true
+    name: --address-prefix
+    summary: Address Prefix of Network Virtual Appliance Site.
+    description: ''
+  - isRequired: true
+    name: --appliance-name
+    summary: The name of Network Virtual Appliance.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of Network Virtual Appliance Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allow
+    parameterValueGroup: false, true
+    summary: Flag to control breakout of o365 allow category.
+    description: ''
+  - name: --default
+    parameterValueGroup: false, true
+    summary: Flag to control breakout of o365 default category.
+    description: ''
+  - name: --optimize
+    parameterValueGroup: false, true
+    summary: Flag to control breakout of o365 optimize category.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_virtual-appliance_site_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Network Virtual Appliance Site.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway.yml
index c40499f45d..b76196f2bb 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway.yml
@@ -1,37 +1,17 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway
-  name: az network vnet-gateway
-  summary: Use an Azure Virtual Network Gateway to establish secure, cross-premises connectivity.
-  description: To learn more about Azure Virtual Network Gateways, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>.
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway
+name: az network vnet-gateway
+summary: Use an Azure Virtual Network Gateway to establish secure, cross-premises connectivity.
+description: To learn more about Azure Virtual Network Gateways, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli.
 commands:
-- uid: az_network_vnet_gateway_revoked_cert
-  name: az network vnet-gateway revoked-cert
-  summary: Manage revoked certificates in a virtual network gateway.
-- uid: az_network_vnet_gateway_revoked_cert_create
-  name: az network vnet-gateway revoked-cert create
-  summary: Revoke a certificate.
-- uid: az_network_vnet_gateway_revoked_cert_delete
-  name: az network vnet-gateway revoked-cert delete
-  summary: Delete a revoked certificate.
-- uid: az_network_vnet_gateway_root_cert
-  name: az network vnet-gateway root-cert
-  summary: Manage root certificates of a virtual network gateway.
-- uid: az_network_vnet_gateway_root_cert_create
-  name: az network vnet-gateway root-cert create
-  summary: Upload a root certificate.
-- uid: az_network_vnet_gateway_root_cert_delete
-  name: az network vnet-gateway root-cert delete
-  summary: Delete a root certificate.
-- uid: az_network_vnet_gateway_vpn_client
-  name: az network vnet-gateway vpn-client
-  summary: Download a VPN client configuration required to connect to Azure via point-to-site.
-- uid: az_network_vnet_gateway_vpn_client_generate
-  name: az network vnet-gateway vpn-client generate
-  summary: Generate VPN client configuration.
+- az_network_vnet-gateway_revoked-cert
+- az_network_vnet-gateway_revoked-cert_create
+- az_network_vnet-gateway_revoked-cert_delete
+- az_network_vnet-gateway_root-cert
+- az_network_vnet-gateway_root-cert_create
+- az_network_vnet-gateway_root-cert_delete
+- az_network_vnet-gateway_vpn-client
+- az_network_vnet-gateway_vpn-client_generate
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -47,10 +27,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Azure Virtual Network Gateways, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Azure Virtual Network Gateways, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml
index 2ba649e9ce..af65bade8c 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml
@@ -1,27 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway_revoked_cert
-  name: az network vnet-gateway revoked-cert
-  summary: Manage revoked certificates in a virtual network gateway.
-  description: Prevent machines using this certificate from accessing Azure through this gateway.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_revoked_cert_create
-  - az_network_vnet_gateway_revoked_cert_delete
-- uid: az_network_vnet_gateway_revoked_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway_revoked-cert
+name: az network vnet-gateway revoked-cert
+summary: Manage revoked certificates in a virtual network gateway.
+description: Prevent machines using this certificate from accessing Azure through this gateway.
+directCommands:
+- uid: az_network_vnet-gateway_revoked-cert_create
   name: az network vnet-gateway revoked-cert create
   summary: Revoke a certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway revoked-cert create --gateway-name
+                                                --name
+                                                --resource-group
+                                                --thumbprint
+                                                [--subscription]
   examples:
   - summary: Revoke a certificate.
-    syntax:
-      content: >-
-        az network vnet-gateway revoked-cert create -g MyResourceGroup -n MyRootCertificate \
-            --gateway-name MyVnetGateway --thumbprint abc123
-  parameters:
+    syntax: >-
+      az network vnet-gateway revoked-cert create -g MyResourceGroup -n MyRootCertificate \
+          --gateway-name MyVnetGateway --thumbprint abc123
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -32,35 +30,32 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --thumbprint
     summary: Certificate thumbprint.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_revoked_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_revoked-cert_delete
   name: az network vnet-gateway revoked-cert delete
   summary: Delete a revoked certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway revoked-cert delete --gateway-name
+                                                --name
+                                                --resource-group
+                                                [--subscription]
   examples:
   - summary: Delete a revoked certificate.
-    syntax:
-      content: az network vnet-gateway revoked-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
+    syntax: az network vnet-gateway revoked-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
   - summary: Delete a revoked certificate. (autogenerated)
-    syntax:
-      content: az network vnet-gateway revoked-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vnet-gateway revoked-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -71,24 +66,16 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_revoked_cert_create
-  name: az network vnet-gateway revoked-cert create
-  summary: Revoke a certificate.
-- uid: az_network_vnet_gateway_revoked_cert_delete
-  name: az network vnet-gateway revoked-cert delete
-  summary: Delete a revoked certificate.
+- az_network_vnet-gateway_revoked-cert_create
+- az_network_vnet-gateway_revoked-cert_delete
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +91,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Prevent machines using this certificate from accessing Azure through this gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Prevent machines using this certificate from accessing Azure through this gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/root-cert.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/root-cert.yml
index 6e4e2febc1..cc643ec99e 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/root-cert.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/root-cert.yml
@@ -1,27 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway_root_cert
-  name: az network vnet-gateway root-cert
-  summary: Manage root certificates of a virtual network gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_root_cert_create
-  - az_network_vnet_gateway_root_cert_delete
-- uid: az_network_vnet_gateway_root_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway_root-cert
+name: az network vnet-gateway root-cert
+summary: Manage root certificates of a virtual network gateway.
+description: ''
+directCommands:
+- uid: az_network_vnet-gateway_root-cert_create
   name: az network vnet-gateway root-cert create
   summary: Upload a root certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway root-cert create --gateway-name
+                                             --name
+                                             --public-cert-data
+                                             --resource-group
+                                             [--subscription]
   examples:
   - summary: Add a Root Certificate to the list of certs allowed to connect to this Gateway.
-    syntax:
-      content: >-
-        az network vnet-gateway root-cert create -g MyResourceGroup -n MyRootCertificate \
-            --gateway-name MyVnetGateway --public-cert-data MyCertificateData
-  parameters:
+    syntax: >-
+      az network vnet-gateway root-cert create -g MyResourceGroup -n MyRootCertificate \
+          --gateway-name MyVnetGateway --public-cert-data MyCertificateData
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -36,31 +34,28 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_root_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_root-cert_delete
   name: az network vnet-gateway root-cert delete
   summary: Delete a root certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway root-cert delete --gateway-name
+                                             --name
+                                             --resource-group
+                                             [--subscription]
   examples:
   - summary: Remove a certificate from the list of Root Certificates whose children are allowed to access this Gateway.
-    syntax:
-      content: az network vnet-gateway root-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
+    syntax: az network vnet-gateway root-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
   - summary: Delete a root certificate. (autogenerated)
-    syntax:
-      content: az network vnet-gateway root-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vnet-gateway root-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -71,24 +66,16 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_root_cert_create
-  name: az network vnet-gateway root-cert create
-  summary: Upload a root certificate.
-- uid: az_network_vnet_gateway_root_cert_delete
-  name: az network vnet-gateway root-cert delete
-  summary: Delete a root certificate.
+- az_network_vnet-gateway_root-cert_create
+- az_network_vnet-gateway_root-cert_delete
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +91,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage root certificates of a virtual network gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage root certificates of a virtual network gateway.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/vpn-client.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/vpn-client.yml
index b736cb706c..c6bf315531 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/vpn-client.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet-gateway/vpn-client.yml
@@ -1,36 +1,42 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway_vpn_client
-  name: az network vnet-gateway vpn-client
-  summary: Download a VPN client configuration required to connect to Azure via point-to-site.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_vpn_client_generate
-- uid: az_network_vnet_gateway_vpn_client_generate
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway_vpn-client
+name: az network vnet-gateway vpn-client
+summary: Download a VPN client configuration required to connect to Azure via point-to-site.
+description: ''
+directCommands:
+- uid: az_network_vnet-gateway_vpn-client_generate
   name: az network vnet-gateway vpn-client generate
   summary: Generate VPN client configuration.
   description: The command outputs a URL to a zip file for the generated VPN client configuration.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway vpn-client generate [--authentication-method]
+                                                [--client-root-certificates]
+                                                [--ids]
+                                                [--name]
+                                                [--processor-architecture {Amd64, X86}]
+                                                [--radius-server-auth-certificate]
+                                                [--resource-group]
+                                                [--subscription]
   examples:
   - summary: Create the VPN client configuration for RADIUS with EAP-MSCHAV2 authentication.
-    syntax:
-      content: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --authentication-method EAPMSCHAPv2
+    syntax: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --authentication-method EAPMSCHAPv2
   - summary: Create the VPN client configuration for AMD64 architecture.
-    syntax:
-      content: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --processor-architecture Amd64
+    syntax: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --processor-architecture Amd64
   - summary: Generate VPN client configuration. (autogenerated)
-    syntax:
-      content: az network vnet-gateway vpn-client generate --name MyVnetGateway --processor-architecture Amd64 --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vnet-gateway vpn-client generate --name MyVnetGateway --processor-architecture Amd64 --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --authentication-method
     summary: Method used to authenticate with the generated client.
     description: ''
   - name: --client-root-certificates
     summary: Space-separated list of client root certificate public certificate data in Base-64 format. Optional for external Radius-based auth with EAPTLS.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Name of the VNet gateway.
+    description: ''
   - name: --processor-architecture
     parameterValueGroup: Amd64, X86
     summary: Processor architecture of the target system.
@@ -38,28 +44,15 @@ items:
   - name: --radius-server-auth-certificate
     summary: Public certificate data for the Radius server auth certificate in Base-64 format. Required only if external Radius auth has been configured with EAPTLS auth.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the VNet gateway.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_vpn_client_generate
-  name: az network vnet-gateway vpn-client generate
-  summary: Generate VPN client configuration.
+- az_network_vnet-gateway_vpn-client_generate
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +68,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Download a VPN client configuration required to connect to Azure via point-to-site.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Download a VPN client configuration required to connect to Azure via point-to-site.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet.yml
index 00c11a44cf..432c946445 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vnet.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet.yml
@@ -1,44 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-  description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_create
-  - az_network_vnet_delete
-  - az_network_vnet_list
-  - az_network_vnet_show
-  - az_network_vnet_update
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet
+name: az network vnet
+summary: Manage Azure Virtual Networks.
+description: To learn more about Virtual Networks visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network.
+directCommands:
 - uid: az_network_vnet_create
   name: az network vnet create
   summary: Create a virtual network.
-  description: You may also create a subnet at the same time by specifying a subnet name and (optionally) an address prefix. To learn about how to create a virtual network visit <a href="https://docs.microsoft.com/azure/virtual-network/manage-virtual-network#create-a-virtual-network">https://docs.microsoft.com/azure/virtual-network/manage-virtual-network#create-a-virtual-network</a>.
-  langs:
-  - azurecli
+  description: You may also create a subnet at the same time by specifying a subnet name and (optionally) an address prefix. To learn about how to create a virtual network visit https://docs.microsoft.com/azure/virtual-network/manage-virtual-network#create-a-virtual-network.
+  syntax: >-
+    az network vnet create --name
+                           --resource-group
+                           [--address-prefixes]
+                           [--defer]
+                           [--dns-servers]
+                           [--location]
+                           [--network-security-group]
+                           [--subnet-name]
+                           [--subnet-prefix]
+                           [--subscription]
+                           [--tags]
   examples:
   - summary: Create a virtual network.
-    syntax:
-      content: az network vnet create -g MyResourceGroup -n MyVnet
+    syntax: az network vnet create -g MyResourceGroup -n MyVnet
   - summary: Create a virtual network with a specific address prefix and one subnet.
-    syntax:
-      content: >-
-        az network vnet create -g MyResourceGroup -n MyVnet --address-prefix 10.0.0.0/16 \
-            --subnet-name MySubnet --subnet-prefix 10.0.0.0/24
+    syntax: >-
+      az network vnet create -g MyResourceGroup -n MyVnet --address-prefix 10.0.0.0/16 \
+          --subnet-name MySubnet --subnet-prefix 10.0.0.0/24
   - summary: Create a virtual network. (autogenerated)
-    syntax:
-      content: az network vnet create --address-prefixes 10.0.0.0/16 --name MyVirtualNetwork --resource-group MyResourceGroup --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
-  parameters:
+    syntax: az network vnet create --address-prefixes 10.0.0.0/16 --name MyVirtualNetwork --resource-group MyResourceGroup --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The virtual network (VNet) name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --address-prefixes
     defaultValue: 10.0.0.0/16
     summary: Space-separated list of IP address prefixes for the VNet.
@@ -50,10 +50,10 @@ items:
     summary: Space-separated list of DNS server IP addresses.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --network-security-group --nsg
+    summary: Name or ID of a network security group (NSG).
     description: ''
   - name: --subnet-name
     summary: Name of a new subnet to create within the VNet.
@@ -64,23 +64,23 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_delete
   name: az network vnet delete
   summary: Delete a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet delete [--ids]
+                           [--name]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Delete a virtual network.
-    syntax:
-      content: az network vnet delete -g MyResourceGroup -n myVNet
-  parameters:
+    syntax: az network vnet delete -g MyResourceGroup -n myVNet
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -88,57 +88,53 @@ items:
     summary: The virtual network (VNet) name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_list
   name: az network vnet list
   summary: List virtual networks.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet list [--query-examples]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: List all virtual networks in a subscription.
-    syntax:
-      content: az network vnet list
+    syntax: az network vnet list
   - summary: List all virtual networks in a resource group.
-    syntax:
-      content: az network vnet list -g MyResourceGroup
+    syntax: az network vnet list -g MyResourceGroup
   - summary: List virtual networks in a subscription which specify a certain address prefix.
-    syntax:
-      content: az network vnet list --query "[?contains(addressSpace.addressPrefixes, '10.0.0.0/16')]"
-  parameters:
+    syntax: az network vnet list --query "[?contains(addressSpace.addressPrefixes, '10.0.0.0/16')]"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_show
   name: az network vnet show
   summary: Get the details of a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet show [--expand]
+                         [--ids]
+                         [--name]
+                         [--query-examples]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Get details for MyVNet.
-    syntax:
-      content: az network vnet show -g MyResourceGroup -n MyVNet
-  parameters:
+    syntax: az network vnet show -g MyResourceGroup -n MyVNet
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -148,32 +144,43 @@ items:
   - name: --name -n
     summary: The virtual network (VNet) name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_update
   name: az network vnet update
   summary: Update a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet update [--add]
+                           [--address-prefixes]
+                           [--defer]
+                           [--dns-servers]
+                           [--force-string]
+                           [--ids]
+                           [--name]
+                           [--remove]
+                           [--resource-group]
+                           [--set]
+                           [--subscription]
   examples:
   - summary: Update a virtual network with the IP address of a DNS server.
-    syntax:
-      content: az network vnet update -g MyResourceGroup -n MyVNet --dns-servers 10.2.0.8
+    syntax: az network vnet update -g MyResourceGroup -n MyVNet --dns-servers 10.2.0.8
+  - summary: Update a virtual network to delete DNS server.
+    syntax: az network vnet update -g MyResourceGroup -n MyVNet --dns-servers ''
   - summary: Update a virtual network. (autogenerated)
-    syntax:
-      content: az network vnet update --address-prefixes 40.1.0.0/24 --name MyVNet --resource-group MyResourceGroup
-  parameters:
+    syntax: az network vnet update --address-prefixes 40.1.0.0/24 --name MyVNet --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-prefixes
     summary: Space-separated list of IP address prefixes for the VNet.
     description: ''
@@ -183,70 +190,46 @@ items:
   - name: --dns-servers
     summary: Space-separated list of DNS server IP addresses.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_create
-  name: az network vnet create
-  summary: Create a virtual network.
-- uid: az_network_vnet_delete
-  name: az network vnet delete
-  summary: Delete a virtual network.
-- uid: az_network_vnet_list
-  name: az network vnet list
-  summary: List virtual networks.
-- uid: az_network_vnet_show
-  name: az network vnet show
-  summary: Get the details of a virtual network.
-- uid: az_network_vnet_subnet
-  name: az network vnet subnet
-  summary: Manage subnets in an Azure Virtual Network.
-- uid: az_network_vnet_subnet_create
-  name: az network vnet subnet create
-  summary: Create a subnet and associate an existing NSG and route table.
-- uid: az_network_vnet_subnet_delete
-  name: az network vnet subnet delete
-  summary: Delete a subnet.
-- uid: az_network_vnet_subnet_list
-  name: az network vnet subnet list
-  summary: List the subnets in a virtual network.
-- uid: az_network_vnet_subnet_show
-  name: az network vnet subnet show
-  summary: Show details of a subnet.
-- uid: az_network_vnet_subnet_update
-  name: az network vnet subnet update
-  summary: Update a subnet.
-- uid: az_network_vnet_update
-  name: az network vnet update
-  summary: Update a virtual network.
+- az_network_vnet_create
+- az_network_vnet_delete
+- az_network_vnet_list
+- az_network_vnet_show
+- az_network_vnet_subnet
+- az_network_vnet_subnet_create
+- az_network_vnet_subnet_delete
+- az_network_vnet_subnet_list
+- az_network_vnet_subnet_show
+- az_network_vnet_subnet_update
+- az_network_vnet_tap
+- az_network_vnet_tap_create
+- az_network_vnet_tap_delete
+- az_network_vnet_tap_list
+- az_network_vnet_tap_show
+- az_network_vnet_tap_update
+- az_network_vnet_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -262,10 +245,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Virtual Networks visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet/subnet.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet/subnet.yml
index 69b69e9da0..1166e7793f 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vnet/subnet.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet/subnet.yml
@@ -1,33 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_subnet
-  name: az network vnet subnet
-  summary: Manage subnets in an Azure Virtual Network.
-  description: To learn more about subnets visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_subnet_create
-  - az_network_vnet_subnet_delete
-  - az_network_vnet_subnet_list
-  - az_network_vnet_subnet_show
-  - az_network_vnet_subnet_update
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet_subnet
+name: az network vnet subnet
+summary: Manage subnets in an Azure Virtual Network.
+description: To learn more about subnets visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
+directCommands:
 - uid: az_network_vnet_subnet_create
   name: az network vnet subnet create
   summary: Create a subnet and associate an existing NSG and route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet create --address-prefix
+                                  --name
+                                  --resource-group
+                                  --vnet-name
+                                  [--defer]
+                                  [--network-security-group]
+                                  [--route-table]
+                                  [--subscription]
   examples:
   - summary: Create new subnet attached to an NSG with a custom route table.
-    syntax:
-      content: >-
-        az network vnet subnet create -g MyResourceGroup --vnet-name MyVnet -n MySubnet \
-            --address-prefixes 10.0.0.0/24 --network-security-group MyNsg --route-table MyRouteTable
+    syntax: >-
+      az network vnet subnet create -g MyResourceGroup --vnet-name MyVnet -n MySubnet \
+          --address-prefixes 10.0.0.0/24 --network-security-group MyNsg --route-table MyRouteTable
   - summary: Create new subnet attached to a NAT gateway.
-    syntax:
-      content: az network vnet subnet create -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
-  parameters:
+    syntax: az network vnet subnet create -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
+  requiredParameters:
   - isRequired: true
     name: --address-prefix
     summary: Address prefix in CIDR format.
@@ -38,16 +35,17 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
-  - name: --network-security-group
+  - name: --network-security-group --nsg
     summary: Name or ID of a network security group (NSG).
     description: ''
   - name: --route-table
@@ -56,26 +54,23 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_delete
   name: az network vnet subnet delete
   summary: Delete a subnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet delete [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--vnet-name]
   examples:
   - summary: Delete a subnet.
-    syntax:
-      content: az network vnet subnet delete -g MyResourceGroup -n MySubnet
+    syntax: az network vnet subnet delete -g MyResourceGroup -n MySubnet
   - summary: Delete a subnet. (autogenerated)
-    syntax:
-      content: az network vnet subnet delete --name MySubnet --resource-group MyResourceGroup --vnet-name MyVnet
-  parameters:
+    syntax: az network vnet subnet delete --name MySubnet --resource-group MyResourceGroup --vnet-name MyVnet
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -83,7 +78,7 @@ items:
     summary: The subnet name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -91,51 +86,52 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_list
   name: az network vnet subnet list
   summary: List the subnets in a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet list --resource-group
+                                --vnet-name
+                                [--query-examples]
+                                [--subscription]
   examples:
   - summary: List the subnets in a virtual network.
-    syntax:
-      content: az network vnet subnet list -g MyResourceGroup --vnet-name MyVNet
-  parameters:
+    syntax: az network vnet subnet list -g MyResourceGroup --vnet-name MyVNet
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_show
   name: az network vnet subnet show
   summary: Show details of a subnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet show [--expand]
+                                [--ids]
+                                [--name]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
+                                [--vnet-name]
   examples:
   - summary: Show the details of a subnet associated with a virtual network.
-    syntax:
-      content: az network vnet subnet show -g MyResourceGroup -n MySubnet --vnet-name MyVNet
-  parameters:
+    syntax: az network vnet subnet show -g MyResourceGroup -n MySubnet --vnet-name MyVNet
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -145,8 +141,11 @@ items:
   - name: --name -n
     summary: The subnet name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -154,37 +153,40 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_update
   name: az network vnet subnet update
   summary: Update a subnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet update [--add]
+                                  [--address-prefix]
+                                  [--force-string]
+                                  [--ids]
+                                  [--name]
+                                  [--network-security-group]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--route-table]
+                                  [--set]
+                                  [--subscription]
+                                  [--vnet-name]
   examples:
   - summary: Associate a network security group to a subnet.
-    syntax:
-      content: az network vnet subnet update -g MyResourceGroup -n MySubnet --vnet-name MyVNet --network-security-group MyNsg
+    syntax: az network vnet subnet update -g MyResourceGroup -n MySubnet --vnet-name MyVNet --network-security-group MyNsg
   - summary: Update subnet with NAT gateway.
-    syntax:
-      content: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
+    syntax: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
   - summary: Disable the private endpoint network policies
-    syntax:
-      content: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --disable-private-endpoint-network-policies
-  parameters:
+    syntax: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --disable-private-endpoint-network-policies
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-prefix
     summary: Address prefix in CIDR format.
     description: ''
-  - name: --network-security-group
-    summary: Name or ID of a network security group (NSG). Use empty string "" to detach it.
-    description: ''
-  - name: --route-table
-    summary: Name or ID of a route table to associate with the subnet. Use empty string "" to detach it. You can also append "--remove routeTable" in "az network vnet subnet update" to detach it.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -192,8 +194,20 @@ items:
   - name: --name -n
     summary: The subnet name.
     description: ''
+  - name: --network-security-group --nsg
+    summary: Name or ID of a network security group (NSG). Use empty string ""('""' in PowerShell) to detach it.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --route-table
+    summary: Name or ID of a route table to associate with the subnet. Use empty string ""('""' in PowerShell) to detach it. You can also append "--remove routeTable" in "az network vnet subnet update" to detach it.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -201,40 +215,13 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_subnet_create
-  name: az network vnet subnet create
-  summary: Create a subnet and associate an existing NSG and route table.
-- uid: az_network_vnet_subnet_delete
-  name: az network vnet subnet delete
-  summary: Delete a subnet.
-- uid: az_network_vnet_subnet_list
-  name: az network vnet subnet list
-  summary: List the subnets in a virtual network.
-- uid: az_network_vnet_subnet_show
-  name: az network vnet subnet show
-  summary: Show details of a subnet.
-- uid: az_network_vnet_subnet_update
-  name: az network vnet subnet update
-  summary: Update a subnet.
+- az_network_vnet_subnet_create
+- az_network_vnet_subnet_delete
+- az_network_vnet_subnet_list
+- az_network_vnet_subnet_show
+- az_network_vnet_subnet_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -250,10 +237,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about subnets visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about subnets visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vnet/tap.yml b/2017-03-09-profile/docs-ref-autogen/network/vnet/tap.yml
new file mode 100644
index 0000000000..a98cce60bd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vnet/tap.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet_tap
+name: az network vnet tap
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-network-tap** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az network vnet tap** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual network taps.
+description: ''
+directCommands:
+- uid: az_network_vnet_tap_create
+  name: az network vnet tap create
+  summary: Create a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap create --destination
+                               --name
+                               --resource-group
+                               [--location]
+                               [--port]
+                               [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --destination
+    summary: ID of the ILB or NIC IP configuration to receive the tap.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --port
+    summary: The VXLAN port that will receive the tapped traffic.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_vnet_tap_delete
+  name: az network vnet tap delete
+  summary: Delete a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vnet_tap_list
+  name: az network vnet tap list
+  summary: List virtual network taps.
+  description: ''
+  syntax: az network vnet tap list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vnet_tap_show
+  name: az network vnet tap show
+  summary: Get the details of a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap show --name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vnet_tap_update
+  name: az network vnet tap update
+  summary: Update settings of a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap update --name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--remove]
+                               [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_network_vnet_tap_create
+- az_network_vnet_tap_delete
+- az_network_vnet_tap_list
+- az_network_vnet_tap_show
+- az_network_vnet_tap_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual network taps.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-connection.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-connection.yml
index f2e7243d1a..5601a51d95 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vpn-connection.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-connection.yml
@@ -1,54 +1,65 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vpn_connection
-  name: az network vpn-connection
-  summary: Manage VPN connections.
-  description: For more information on site-to-site connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>. For more information on Vnet-to-Vnet connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vpn_connection_create
-  - az_network_vpn_connection_delete
-  - az_network_vpn_connection_list
-  - az_network_vpn_connection_show
-  - az_network_vpn_connection_update
-- uid: az_network_vpn_connection_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-connection
+name: az network vpn-connection
+summary: Manage VPN connections.
+description: For more information on site-to-site connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli. For more information on Vnet-to-Vnet connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli.
+directCommands:
+- uid: az_network_vpn-connection_create
   name: az network vpn-connection create
   summary: Create a VPN connection.
   description: The VPN Gateway and Local Network Gateway must be provisioned before creating the connection between them.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection create --name
+                                     --resource-group
+                                     --vnet-gateway1
+                                     [--authorization-key]
+                                     [--enable-bgp]
+                                     [--express-route-circuit2]
+                                     [--local-gateway2]
+                                     [--location]
+                                     [--routing-weight]
+                                     [--shared-key]
+                                     [--subscription]
+                                     [--tags]
+                                     [--validate]
+                                     [--vnet-gateway2]
   examples:
   - summary: Create a site-to-site connection between an Azure virtual network and an on-premises local network gateway.
-    syntax:
-      content: az network vpn-connection create -g MyResourceGroup -n MyConnection --vnet-gateway1 MyVnetGateway --local-gateway2 MyLocalGateway --shared-key Abc123
+    syntax: az network vpn-connection create -g MyResourceGroup -n MyConnection --vnet-gateway1 MyVnetGateway --local-gateway2 MyLocalGateway --shared-key Abc123
+  - summary: Create a VPN connection with --ingress-nat-rule.
+    syntax: az network vpn-connection create -g MyResourceGroup -n MyConnection --vnet-gateway1 MyVnetGateway --local-gateway2 MyLocalGateway --shared-key Abc123 --ingress-nat-rule /subscriptions/000/resourceGroups/TestBGPRG1/providers/Microsoft.Network/virtualNetworkGateways/gwx/natRules/nat
   - summary: Create a VPN connection. (autogenerated)
-    syntax:
-      content: az network vpn-connection create --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway --vnet-gateway2 /subscriptions/{subscriptionID}/resourceGroups/TestBGPRG1/providers/Microsoft.Network/virtualNetworkGateways/VNet1GW
+    syntax: az network vpn-connection create --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway --vnet-gateway2 /subscriptions/{subscriptionID}/resourceGroups/TestBGPRG1/providers/Microsoft.Network/virtualNetworkGateways/VNet1GW
   - summary: Create a VPN connection. (autogenerated)
-    syntax:
-      content: az network vpn-connection create --local-gateway2 MyLocalGateway --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway
-  parameters:
+    syntax: az network vpn-connection create --local-gateway2 MyLocalGateway --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Connection name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-gateway1
     summary: Name or ID of the source virtual network gateway.
     description: ''
+  optionalParameters:
   - name: --authorization-key
     summary: The authorization key for the VPN connection.
     description: ''
   - name: --enable-bgp
     summary: Enable BGP for this VPN connection.
     description: ''
+  - name: --express-route-circuit2
+    summary: Name or ID of the destination ExpressRoute to connect to using an 'ExpressRoute' connection.
+    description: ''
+  - name: --local-gateway2
+    summary: Name or ID of the destination local network gateway to connect to using an 'IPSec' connection.
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --routing-weight
     defaultValue: "10"
@@ -57,41 +68,32 @@ items:
   - name: --shared-key
     summary: Shared IPSec key.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --validate
     summary: Display and validate the ARM template but do not create any resources.
     description: ''
-  - name: --express-route-circuit2
-    summary: Name or ID of the destination ExpressRoute to connect to using an 'ExpressRoute' connection.
-    description: ''
-  - name: --local-gateway2
-    summary: Name or ID of the destination local network gateway to connect to using an 'IPSec' connection.
-    description: ''
   - name: --vnet-gateway2
     summary: Name or ID of the destination virtual network gateway to connect to using a 'Vnet2Vnet' connection.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_delete
   name: az network vpn-connection delete
   summary: Delete a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection delete [--ids]
+                                     [--name]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: Delete a VPN connection.
-    syntax:
-      content: az network vpn-connection delete -g MyResourceGroup -n MyConnection
-  parameters:
+    syntax: az network vpn-connection delete -g MyResourceGroup -n MyConnection
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -99,96 +101,104 @@ items:
     summary: Connection name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_list
   name: az network vpn-connection list
-  summary: List all VPN connections in a resource group.
+  summary: List all VPN connections.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection list --resource-group
+                                   [--query-examples]
+                                   [--subscription]
+                                   [--vnet-gateway]
   examples:
   - summary: List all VPN connections in a resource group.
-    syntax:
-      content: az network vpn-connection list -g MyResourceGroup
-  parameters:
+    syntax: az network vpn-connection list -g MyResourceGroup
+  - summary: List all VPN connections in a virtual network gateway.
+    syntax: az network vpn-connection list -g MyResourceGroup --vnet-gateway MyVnetGateway
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_show
+  - name: --vnet-gateway
+    summary: Name of the VNet gateway.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_show
   name: az network vpn-connection show
   summary: Get the details of a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection show [--ids]
+                                   [--name]
+                                   [--query-examples]
+                                   [--resource-group]
+                                   [--subscription]
   examples:
   - summary: View the details of a VPN connection.
-    syntax:
-      content: az network vpn-connection show -g MyResourceGroup -n MyConnection
-  parameters:
+    syntax: az network vpn-connection show -g MyResourceGroup -n MyConnection
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Connection name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_update
   name: az network vpn-connection update
   summary: Update a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection update [--add]
+                                     [--enable-bgp {false, true}]
+                                     [--force-string]
+                                     [--ids]
+                                     [--name]
+                                     [--remove]
+                                     [--resource-group]
+                                     [--routing-weight]
+                                     [--set]
+                                     [--shared-key]
+                                     [--subscription]
+                                     [--tags]
   examples:
   - summary: Add BGP to an existing connection.
-    syntax:
-      content: az network vpn-connection update -g MyResourceGroup -n MyConnection --enable-bgp True
+    syntax: az network vpn-connection update -g MyResourceGroup -n MyConnection --enable-bgp True
   - summary: Update a VPN connection. (autogenerated)
-    syntax:
-      content: az network vpn-connection update --name MyConnection --resource-group MyResourceGroup --use-policy-based-traffic-selectors true
-  parameters:
+    syntax: az network vpn-connection update --name MyConnection --resource-group MyResourceGroup --use-policy-based-traffic-selectors true
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --enable-bgp
     parameterValueGroup: false, true
     summary: Enable BGP (Border Gateway Protocol).
     description: ''
-  - name: --routing-weight
-    summary: Connection routing weight.
-    description: ''
-  - name: --shared-key
-    summary: Shared IPSec key.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -196,58 +206,38 @@ items:
   - name: --name -n
     summary: Connection name.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --routing-weight
+    summary: Connection routing weight.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --shared-key
+    summary: Shared IPSec key.
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vpn_connection_create
-  name: az network vpn-connection create
-  summary: Create a VPN connection.
-- uid: az_network_vpn_connection_delete
-  name: az network vpn-connection delete
-  summary: Delete a VPN connection.
-- uid: az_network_vpn_connection_list
-  name: az network vpn-connection list
-  summary: List all VPN connections in a resource group.
-- uid: az_network_vpn_connection_shared_key
-  name: az network vpn-connection shared-key
-  summary: Manage VPN shared keys.
-- uid: az_network_vpn_connection_shared_key_reset
-  name: az network vpn-connection shared-key reset
-  summary: Reset a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_show
-  name: az network vpn-connection shared-key show
-  summary: Retrieve a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_update
-  name: az network vpn-connection shared-key update
-  summary: Update a VPN connection shared key.
-- uid: az_network_vpn_connection_show
-  name: az network vpn-connection show
-  summary: Get the details of a VPN connection.
-- uid: az_network_vpn_connection_update
-  name: az network vpn-connection update
-  summary: Update a VPN connection.
+- az_network_vpn-connection_create
+- az_network_vpn-connection_delete
+- az_network_vpn-connection_list
+- az_network_vpn-connection_shared-key
+- az_network_vpn-connection_shared-key_reset
+- az_network_vpn-connection_shared-key_show
+- az_network_vpn-connection_shared-key_update
+- az_network_vpn-connection_show
+- az_network_vpn-connection_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -263,10 +253,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information on site-to-site connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>. For more information on Vnet-to-Vnet connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information on site-to-site connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli. For more information on Vnet-to-Vnet connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-connection/shared-key.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-connection/shared-key.yml
index fe944b8049..762dac1201 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vpn-connection/shared-key.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-connection/shared-key.yml
@@ -1,29 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vpn_connection_shared_key
-  name: az network vpn-connection shared-key
-  summary: Manage VPN shared keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vpn_connection_shared_key_reset
-  - az_network_vpn_connection_shared_key_show
-  - az_network_vpn_connection_shared_key_update
-- uid: az_network_vpn_connection_shared_key_reset
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-connection_shared-key
+name: az network vpn-connection shared-key
+summary: Manage VPN shared keys.
+description: ''
+directCommands:
+- uid: az_network_vpn-connection_shared-key_reset
   name: az network vpn-connection shared-key reset
   summary: Reset a VPN connection shared key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection shared-key reset --key-length
+                                               [--connection-name]
+                                               [--ids]
+                                               [--resource-group]
+                                               [--subscription]
   examples:
   - summary: Reset the shared key on a connection.
-    syntax:
-      content: az network vpn-connection shared-key reset -g MyResourceGroup --connection-name MyConnection --key-length 128
-  parameters:
-  - name: --key-length
-    summary: The virtual network connection reset shared key length.
-    description: ''
+    syntax: az network vpn-connection shared-key reset -g MyResourceGroup --connection-name MyConnection --key-length 128
+  - summary: Reset a VPN connection shared key. (autogenerated)
+    syntax: az network vpn-connection shared-key reset --connection-name MyConnection --key-length 128 --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
+  - isRequired: true
+    name: --key-length
+    summary: The virtual network connection reset shared key length, should between 1 and 128.
+    description: ''
+  optionalParameters:
   - name: --connection-name
     summary: Connection name.
     description: ''
@@ -31,106 +32,98 @@ items:
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_shared_key_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_shared-key_show
   name: az network vpn-connection shared-key show
   summary: Retrieve a VPN connection shared key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection shared-key show [--connection-name]
+                                              [--ids]
+                                              [--query-examples]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: View the shared key of a connection.
-    syntax:
-      content: az network vpn-connection shared-key show -g MyResourceGroup --connection-name MyConnection
+    syntax: az network vpn-connection shared-key show -g MyResourceGroup --connection-name MyConnection
   - summary: Retrieve a VPN connection shared key. (autogenerated)
-    syntax:
-      content: az network vpn-connection shared-key show --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vpn-connection shared-key show --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --connection-name
     summary: Connection name.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_shared_key_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_shared-key_update
   name: az network vpn-connection shared-key update
   summary: Update a VPN connection shared key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection shared-key update --value
+                                                [--add]
+                                                [--connection-name]
+                                                [--force-string]
+                                                [--ids]
+                                                [--remove]
+                                                [--resource-group]
+                                                [--set]
+                                                [--subscription]
   examples:
   - summary: Change the shared key for the connection to "Abc123".
-    syntax:
-      content: az network vpn-connection shared-key update -g MyResourceGroup --connection-name MyConnection --value Abc123
+    syntax: az network vpn-connection shared-key update -g MyResourceGroup --connection-name MyConnection --value Abc123
   - summary: Update a VPN connection shared key. (autogenerated)
-    syntax:
-      content: az network vpn-connection shared-key update --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription --value Abc123
-  parameters:
-  - name: --value
+    syntax: az network vpn-connection shared-key update --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription --value Abc123
+  requiredParameters:
+  - isRequired: true
+    name: --value
     summary: The virtual network connection shared key value.
     description: ''
-  - name: --connection-name
-    summary: Connection name.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --connection-name
+    summary: Connection name.
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vpn_connection_shared_key_reset
-  name: az network vpn-connection shared-key reset
-  summary: Reset a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_show
-  name: az network vpn-connection shared-key show
-  summary: Retrieve a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_update
-  name: az network vpn-connection shared-key update
-  summary: Update a VPN connection shared key.
+- az_network_vpn-connection_shared-key_reset
+- az_network_vpn-connection_shared-key_show
+- az_network_vpn-connection_shared-key_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -146,10 +139,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage VPN shared keys.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage VPN shared keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway.yml
new file mode 100644
index 0000000000..a94a631b86
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway.yml
@@ -0,0 +1,196 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-gateway
+name: az network vpn-gateway
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-gateway** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage site-to-site VPN gateways.
+description: ''
+directCommands:
+- uid: az_network_vpn-gateway_create
+  name: az network vpn-gateway create
+  summary: Create a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway create --name
+                                  --resource-group
+                                  --vhub
+                                  [--asn]
+                                  [--bgp-peering-address]
+                                  [--location]
+                                  [--no-wait]
+                                  [--peer-weight]
+                                  [--scale-unit]
+                                  [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub
+    summary: Name or ID of a virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_vpn-gateway_delete
+  name: az network vpn-gateway delete
+  summary: Delete a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway delete --name
+                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_list
+  name: az network vpn-gateway list
+  summary: List site-to-site VPN gateways.
+  description: ''
+  syntax: az network vpn-gateway list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_show
+  name: az network vpn-gateway show
+  summary: Get the details of a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway show --name
+                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_update
+  name: az network vpn-gateway update
+  summary: Update settings of a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway update --name
+                                  --resource-group
+                                  [--add]
+                                  [--asn]
+                                  [--bgp-peering-address]
+                                  [--force-string]
+                                  [--no-wait]
+                                  [--peer-weight]
+                                  [--remove]
+                                  [--scale-unit]
+                                  [--set]
+                                  [--tags]
+                                  [--vhub]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vhub
+    summary: Name or ID of a virtual hub.
+    description: ''
+commands:
+- az_network_vpn-gateway_connection
+- az_network_vpn-gateway_connection_create
+- az_network_vpn-gateway_connection_delete
+- az_network_vpn-gateway_connection_ipsec-policy
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+- az_network_vpn-gateway_connection_list
+- az_network_vpn-gateway_connection_show
+- az_network_vpn-gateway_connection_update
+- az_network_vpn-gateway_connection_wait
+- az_network_vpn-gateway_create
+- az_network_vpn-gateway_delete
+- az_network_vpn-gateway_list
+- az_network_vpn-gateway_show
+- az_network_vpn-gateway_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage site-to-site VPN gateways.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway/connection.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway/connection.yml
new file mode 100644
index 0000000000..d33d6d5bf7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway/connection.yml
@@ -0,0 +1,296 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-gateway_connection
+name: az network vpn-gateway connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-gateway connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage site-to-site VPN gateway connections.
+description: ''
+directCommands:
+- uid: az_network_vpn-gateway_connection_create
+  name: az network vpn-gateway connection create
+  summary: Create a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection create --gateway-name
+                                             --name
+                                             --remote-vpn-site
+                                             --resource-group
+                                             [--associated]
+                                             [--connection-bandwidth]
+                                             [--enable-bgp {false, true}]
+                                             [--internet-security {false, true}]
+                                             [--labels]
+                                             [--no-wait]
+                                             [--propagated]
+                                             [--protocol-type {IKEv1, IKEv2}]
+                                             [--rate-limiting {false, true}]
+                                             [--routing-weight]
+                                             [--shared-key]
+  examples:
+  - summary: Create a site-to-site VPN gateway connection
+    syntax: az network vpn-gateway connection create -g MyRG -n MyConnection --gateway-name MyGateway --remote-vpn-site /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/vpnSites/MyVPNSite --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable2 --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --remote-vpn-site
+    summary: Name of ID of the remote VPN site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --connection-bandwidth
+    summary: Expected bandwidth in Mbps.
+    description: ''
+  - name: --enable-bgp
+    parameterValueGroup: false, true
+    summary: Enable BGP.
+    description: ''
+  - name: --internet-security
+    parameterValueGroup: false, true
+    summary: Enable internet security.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --protocol-type
+    parameterValueGroup: IKEv1, IKEv2
+    summary: Connection protocol.
+    description: ''
+  - name: --rate-limiting
+    parameterValueGroup: false, true
+    summary: Enable rate limiting.
+    description: ''
+  - name: --routing-weight
+    summary: Routing weight.
+    description: ''
+  - name: --shared-key
+    summary: Shared key.
+    description: ''
+- uid: az_network_vpn-gateway_connection_delete
+  name: az network vpn-gateway connection delete
+  summary: Delete a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection delete --gateway-name
+                                             --name
+                                             --resource-group
+  examples:
+  - summary: Delete a site-to-site VPN gateway connection
+    syntax: az network vpn-gateway connection delete -g MyRG -n MyConnection --gateway-name MyGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_list
+  name: az network vpn-gateway connection list
+  summary: List site-to-site VPN gateway connections.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection list --gateway-name
+                                           --resource-group
+  examples:
+  - summary: List all connections for a given site-to-site VPN gateway
+    syntax: az network vpn-gateway connection list -g MyRG --gateway-name MyGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_show
+  name: az network vpn-gateway connection show
+  summary: Get the details of a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection show --gateway-name
+                                           --name
+                                           --resource-group
+  examples:
+  - summary: Get the details of a site-to-site VPN gateway connection
+    syntax: az network vpn-gateway connection show -g MyRG -n MyConnection --gateway-name MyGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_update
+  name: az network vpn-gateway connection update
+  summary: Update settings of VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection update --gateway-name
+                                             --name
+                                             --resource-group
+                                             [--add]
+                                             [--associated]
+                                             [--force-string]
+                                             [--labels]
+                                             [--no-wait]
+                                             [--propagated]
+                                             [--remove]
+                                             [--set]
+  examples:
+  - summary: Update settings of VPN gateway connection.
+    syntax: az network vpn-gateway connection update -g MyRG -n MyConnection --gateway-name MyGateway --labels NewLabel1 NewLabels2
+  - summary: Add labels of VPN gateway connection.
+    syntax: az network vpn-gateway connection update -g MyRG -n MyConnection --gateway-name MyGateway --add routingConfiguration.propagatedRouteTables.labels Newlabel1 Newlabel2
+  - summary: Reset labels of VPN gateway connection.
+    syntax: az network vpn-gateway connection update -g MyRG -n MyConnection --gateway-name MyGateway --set routingConfiguration.propagatedRouteTables.labels[0]=Newlabel1
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_network_vpn-gateway_connection_wait
+  name: az network vpn-gateway connection wait
+  summary: Place the CLI in a waiting state until a condition of the site-to-site VPN gateway connection is met.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection wait --gateway-name
+                                           --name
+                                           --resource-group
+                                           [--created]
+                                           [--custom]
+                                           [--deleted]
+                                           [--exists]
+                                           [--interval]
+                                           [--timeout]
+                                           [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vpn-gateway_connection_create
+- az_network_vpn-gateway_connection_delete
+- az_network_vpn-gateway_connection_ipsec-policy
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+- az_network_vpn-gateway_connection_list
+- az_network_vpn-gateway_connection_show
+- az_network_vpn-gateway_connection_update
+- az_network_vpn-gateway_connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage site-to-site VPN gateway connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway/connection/ipsec-policy.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway/connection/ipsec-policy.yml
new file mode 100644
index 0000000000..b385eaaabf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-gateway/connection/ipsec-policy.yml
@@ -0,0 +1,155 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-gateway_connection_ipsec-policy
+name: az network vpn-gateway connection ipsec-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-gateway connection ipsec-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage site-to-site VPN gateway connection IPSec policies.
+description: ''
+directCommands:
+- uid: az_network_vpn-gateway_connection_ipsec-policy_add
+  name: az network vpn-gateway connection ipsec-policy add
+  summary: Add an IPSec policy to a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection ipsec-policy add --connection-name
+                                                       --dh-group {DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+                                                       --gateway-name
+                                                       --ike-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256}
+                                                       --ike-integrity {GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384}
+                                                       --ipsec-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None}
+                                                       --ipsec-integrity {GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256}
+                                                       --pfs-group {ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM}
+                                                       --resource-group
+                                                       --sa-data-size
+                                                       --sa-lifetime
+                                                       [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --connection-name
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --dh-group
+    parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
+    summary: DH Groups used in IKE Phase 1 for initial SA.
+    description: ''
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --ike-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256
+    summary: IKE encryption algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ike-integrity
+    parameterValueGroup: GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384
+    summary: IKE integrity algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ipsec-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
+    summary: IPSec encryption algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --ipsec-integrity
+    parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
+    summary: IPSec integrity algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --pfs-group
+    parameterValueGroup: ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM
+    summary: The Pfs Groups used in IKE Phase 2 for new child SA.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sa-data-size
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site-to-site VPN tunnel.
+    description: ''
+  - isRequired: true
+    name: --sa-lifetime
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site-to-site VPN tunnel.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vpn-gateway_connection_ipsec-policy_list
+  name: az network vpn-gateway connection ipsec-policy list
+  summary: List site-to-site VPN gateway connection IPSec policies.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection ipsec-policy list --connection-name
+                                                        --gateway-name
+                                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-name
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_ipsec-policy_remove
+  name: az network vpn-gateway connection ipsec-policy remove
+  summary: Remove an IPSec policy from a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection ipsec-policy remove --connection-name
+                                                          --gateway-name
+                                                          --index
+                                                          --resource-group
+                                                          [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --connection-name
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: List index of the item (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage site-to-site VPN gateway connection IPSec policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-server-config.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-server-config.yml
new file mode 100644
index 0000000000..5203a168ee
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-server-config.yml
@@ -0,0 +1,272 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-server-config
+name: az network vpn-server-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-server-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VPN server configuration.
+description: ''
+directCommands:
+- uid: az_network_vpn-server-config_create
+  name: az network vpn-server-config create
+  summary: Create a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config create --name
+                                        --resource-group
+                                        [--aad-audience]
+                                        [--aad-issuer]
+                                        [--aad-tenant]
+                                        [--auth-types {AAD, Certificate, Radius}]
+                                        [--location]
+                                        [--no-wait]
+                                        [--protocols {IkeV2, OpenVPN}]
+                                        [--radius-client-root-certs]
+                                        [--radius-server-root-certs]
+                                        [--radius-servers]
+                                        [--vpn-client-revoked-certs]
+                                        [--vpn-client-root-certs]
+  examples:
+  - summary: Create a VPN server configuration with VPN auth type
+    syntax: az network vpn-server-config create -n MyVPNServerConfig -g MyRG --vpn-client-root-certs "ApplicationGatewayAuthCert.cer" --vpn-client-revoked-certs "ApplicationGatewayAuthCert.pem"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-audience
+    summary: AAD Vpn authentication parameter AAD audience.
+    description: ''
+  - name: --aad-issuer
+    summary: AAD Vpn authentication parameter AAD issuer.
+    description: ''
+  - name: --aad-tenant
+    summary: AAD Vpn authentication parameter AAD tenant.
+    description: ''
+  - name: --auth-types
+    parameterValueGroup: AAD, Certificate, Radius
+    summary: List of VPN authentication types for the VpnServerConfiguration.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protocols
+    parameterValueGroup: IkeV2, OpenVPN
+    summary: VPN protocols for the VpnServerConfiguration.
+    description: ''
+  - name: --radius-client-root-certs
+    summary: List of Radius client root certificate file paths.
+    description: ''
+  - name: --radius-server-root-certs
+    summary: List of Radius server root certificate file paths.
+    description: ''
+  - name: --radius-servers
+    summary: Radius Server configuration.
+    description: ''
+  - name: --vpn-client-revoked-certs
+    summary: List of VPN client revoked certificate file paths.
+    description: ''
+  - name: --vpn-client-root-certs
+    summary: List of VPN client root certificate file paths.
+    description: ''
+- uid: az_network_vpn-server-config_delete
+  name: az network vpn-server-config delete
+  summary: Delete a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config delete --name
+                                        --resource-group
+                                        [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_network_vpn-server-config_list
+  name: az network vpn-server-config list
+  summary: List all VPN server configuration.
+  description: ''
+  syntax: az network vpn-server-config list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-server-config_set
+  name: az network vpn-server-config set
+  summary: Set settings of a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config set --name
+                                     --resource-group
+                                     [--aad-audience]
+                                     [--aad-issuer]
+                                     [--aad-tenant]
+                                     [--auth-types {AAD, Certificate, Radius}]
+                                     [--location]
+                                     [--no-wait]
+                                     [--protocols {IkeV2, OpenVPN}]
+                                     [--radius-client-root-certs]
+                                     [--radius-server-root-certs]
+                                     [--radius-servers]
+                                     [--vpn-client-revoked-certs]
+                                     [--vpn-client-root-certs]
+  examples:
+  - summary: Set a VPN server configuration with Radius auth type
+    syntax: az network vpn-server-config set -n MyVPNServerConfig -g MyRG --radius-client-root-certs "ApplicationGatewayAuthCert.cer" --radius-server-root-certs "ApplicationGatewayAuthCert.pem" --radius-servers address=test1 secret=clitest score=10 --radius-servers address=test2 secret=clitest score=10
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-audience
+    summary: AAD Vpn authentication parameter AAD audience.
+    description: ''
+  - name: --aad-issuer
+    summary: AAD Vpn authentication parameter AAD issuer.
+    description: ''
+  - name: --aad-tenant
+    summary: AAD Vpn authentication parameter AAD tenant.
+    description: ''
+  - name: --auth-types
+    parameterValueGroup: AAD, Certificate, Radius
+    summary: List of VPN authentication types for the VpnServerConfiguration.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protocols
+    parameterValueGroup: IkeV2, OpenVPN
+    summary: VPN protocols for the VpnServerConfiguration.
+    description: ''
+  - name: --radius-client-root-certs
+    summary: List of Radius client root certificate file paths.
+    description: ''
+  - name: --radius-server-root-certs
+    summary: List of Radius server root certificate file paths.
+    description: ''
+  - name: --radius-servers
+    summary: Radius Server configuration.
+    description: ''
+  - name: --vpn-client-revoked-certs
+    summary: List of VPN client revoked certificate file paths.
+    description: ''
+  - name: --vpn-client-root-certs
+    summary: List of VPN client root certificate file paths.
+    description: ''
+- uid: az_network_vpn-server-config_show
+  name: az network vpn-server-config show
+  summary: Show the details of a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config show --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-server-config_wait
+  name: az network vpn-server-config wait
+  summary: Place the CLI in a waiting state until a condition of the VPN server configuration is met.
+  description: ''
+  syntax: >-
+    az network vpn-server-config wait --name
+                                      --resource-group
+                                      [--created]
+                                      [--custom]
+                                      [--deleted]
+                                      [--exists]
+                                      [--interval]
+                                      [--timeout]
+                                      [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vpn-server-config_create
+- az_network_vpn-server-config_delete
+- az_network_vpn-server-config_ipsec-policy
+- az_network_vpn-server-config_ipsec-policy_add
+- az_network_vpn-server-config_ipsec-policy_list
+- az_network_vpn-server-config_ipsec-policy_remove
+- az_network_vpn-server-config_ipsec-policy_wait
+- az_network_vpn-server-config_list
+- az_network_vpn-server-config_set
+- az_network_vpn-server-config_show
+- az_network_vpn-server-config_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VPN server configuration.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-server-config/ipsec-policy.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-server-config/ipsec-policy.yml
new file mode 100644
index 0000000000..188d186a56
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-server-config/ipsec-policy.yml
@@ -0,0 +1,188 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-server-config_ipsec-policy
+name: az network vpn-server-config ipsec-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-server-config ipsec-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VPN server configuration IPSec policies.
+description: ''
+directCommands:
+- uid: az_network_vpn-server-config_ipsec-policy_add
+  name: az network vpn-server-config ipsec-policy add
+  summary: Add an IPSec policy to a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy add --dh-group {DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+                                                  --ike-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256}
+                                                  --ike-integrity {GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384}
+                                                  --ipsec-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None}
+                                                  --ipsec-integrity {GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256}
+                                                  --name
+                                                  --pfs-group {ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM}
+                                                  --resource-group
+                                                  --sa-data-size
+                                                  --sa-lifetime
+                                                  [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --dh-group
+    parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
+    summary: DH Groups used in IKE Phase 1 for initial SA.
+    description: ''
+  - isRequired: true
+    name: --ike-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256
+    summary: IKE encryption algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ike-integrity
+    parameterValueGroup: GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384
+    summary: IKE integrity algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ipsec-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
+    summary: IPSec encryption algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --ipsec-integrity
+    parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
+    summary: IPSec integrity algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --pfs-group
+    parameterValueGroup: ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM
+    summary: The Pfs Groups used in IKE Phase 2 for new child SA.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sa-data-size
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site-to-site VPN tunnel.
+    description: ''
+  - isRequired: true
+    name: --sa-lifetime
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site-to-site VPN tunnel.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vpn-server-config_ipsec-policy_list
+  name: az network vpn-server-config ipsec-policy list
+  summary: List VPN server configuration IPSec policies.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy list --name
+                                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-server-config_ipsec-policy_remove
+  name: az network vpn-server-config ipsec-policy remove
+  summary: Remove an IPSec policy from a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy remove --index
+                                                     --name
+                                                     --resource-group
+                                                     [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: List index of the ipsec policy(starting with 0).
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vpn-server-config_ipsec-policy_wait
+  name: az network vpn-server-config ipsec-policy wait
+  summary: Place the CLI in a waiting state until a condition of the IPSec policy of a VPN server configuration is met.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy wait --name
+                                                   --resource-group
+                                                   [--created]
+                                                   [--custom]
+                                                   [--deleted]
+                                                   [--exists]
+                                                   [--interval]
+                                                   [--timeout]
+                                                   [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vpn-server-config_ipsec-policy_add
+- az_network_vpn-server-config_ipsec-policy_list
+- az_network_vpn-server-config_ipsec-policy_remove
+- az_network_vpn-server-config_ipsec-policy_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VPN server configuration IPSec policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vpn-site.yml b/2017-03-09-profile/docs-ref-autogen/network/vpn-site.yml
new file mode 100644
index 0000000000..9005b5ce11
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vpn-site.yml
@@ -0,0 +1,257 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-site
+name: az network vpn-site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VPN site configurations.
+description: ''
+directCommands:
+- uid: az_network_vpn-site_create
+  name: az network vpn-site create
+  summary: Create a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site create --ip-address
+                               --name
+                               --resource-group
+                               [--address-prefixes]
+                               [--asn]
+                               [--bgp-peering-address]
+                               [--device-model]
+                               [--device-vendor]
+                               [--link-speed]
+                               [--location]
+                               [--no-wait]
+                               [--peer-weight]
+                               [--security-site {false, true}]
+                               [--site-key]
+                               [--tags]
+                               [--virtual-wan]
+  requiredParameters:
+  - isRequired: true
+    name: --ip-address
+    summary: IP address of the VPN site.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --address-prefixes
+    summary: Space-separated list of CIDR address prefixes.
+    description: ''
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --device-model
+    summary: Model of the device.
+    description: ''
+  - name: --device-vendor
+    summary: Name of the device vendor.
+    description: ''
+  - name: --link-speed
+    summary: Link speed in Mbps.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --security-site
+    parameterValueGroup: false, true
+    summary: Whether the VPN site is security-related.
+    description: ''
+  - name: --site-key
+    summary: Key for the VPN site that can be used for connections.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-wan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+- uid: az_network_vpn-site_delete
+  name: az network vpn-site delete
+  summary: Delete a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-site_download
+  name: az network vpn-site download
+  summary: Provide a SAS-URL to download the configuration for a VPN site.
+  description: ''
+  syntax: >-
+    az network vpn-site download --request
+                                 --resource-group
+                                 --vwan-name
+  requiredParameters:
+  - isRequired: true
+    name: --request
+    summary: Parameters supplied to download vpn-sites configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vwan-name
+    summary: Name of the virtual WAN.
+    description: ''
+- uid: az_network_vpn-site_list
+  name: az network vpn-site list
+  summary: List VPN site configurations.
+  description: ''
+  syntax: az network vpn-site list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-site_show
+  name: az network vpn-site show
+  summary: Get the details of a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site show --name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-site_update
+  name: az network vpn-site update
+  summary: Update settings of a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site update --name
+                               --resource-group
+                               [--add]
+                               [--address-prefixes]
+                               [--asn]
+                               [--bgp-peering-address]
+                               [--device-model]
+                               [--device-vendor]
+                               [--force-string]
+                               [--ip-address]
+                               [--link-speed]
+                               [--no-wait]
+                               [--peer-weight]
+                               [--remove]
+                               [--security-site {false, true}]
+                               [--set]
+                               [--site-key]
+                               [--tags]
+                               [--virtual-wan]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-prefixes
+    summary: Space-separated list of CIDR address prefixes.
+    description: ''
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --device-model
+    summary: Model of the device.
+    description: ''
+  - name: --device-vendor
+    summary: Name of the device vendor.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ip-address
+    summary: IP address of the VPN site.
+    description: ''
+  - name: --link-speed
+    summary: Link speed in Mbps.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --security-site
+    parameterValueGroup: false, true
+    summary: Whether the VPN site is security-related.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --site-key
+    summary: Key for the VPN site that can be used for connections.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-wan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+commands:
+- az_network_vpn-site_create
+- az_network_vpn-site_delete
+- az_network_vpn-site_download
+- az_network_vpn-site_list
+- az_network_vpn-site_show
+- az_network_vpn-site_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VPN site configurations.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vrouter.yml b/2017-03-09-profile/docs-ref-autogen/network/vrouter.yml
index 25fe39a8d9..9ad4caf07d 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vrouter.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vrouter.yml
@@ -1,80 +1,124 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vrouter
-  name: az network vrouter
-  summary: Manage the virtual router.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vrouter_create
-  - az_network_vrouter_list
+### YamlMime:AzureCLIGroup
+uid: az_network_vrouter
+name: az network vrouter
+summary: Manage the virtual router. This feature supports both VirtualHub and VirtualRouter. Considering VirtualRouter is deprecated, we recommend to create VirtualRouter with --hosted-subnet instead.
+description: ''
+directCommands:
 - uid: az_network_vrouter_create
   name: az network vrouter create
   summary: Create a virtual router.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hosted-gateway
-    summary: Name or ID of the virtual network gateway with ExpressRouter on which VirtualRouter is hosted.
-    description: ''
+  syntax: >-
+    az network vrouter create --name
+                              --resource-group
+                              [--hosted-gateway]
+                              [--hosted-subnet]
+                              [--location]
+                              [--subscription]
+                              [--tags]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Virtual Router.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --hosted-gateway
+    summary: Name or ID of the virtual network gateway with ExpressRouter on which VirtualRouter is hosted.
+    description: ''
+  - name: --hosted-subnet
+    summary: The ID of a subnet where VirtualRouter would be deployed.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_delete
+  name: az network vrouter delete
+  summary: Delete a virtual router under a resource group.
+  description: ''
+  syntax: >-
+    az network vrouter delete --name
+                              --resource-group
+                              [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vrouter_list
   name: az network vrouter list
   summary: List all virtual routers under a subscription or a resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network vrouter list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_show
+  name: az network vrouter show
+  summary: Show a virtual router.
+  description: ''
+  syntax: >-
+    az network vrouter show --name
+                            --resource-group
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vrouter_create
-  name: az network vrouter create
-  summary: Create a virtual router.
-- uid: az_network_vrouter_list
-  name: az network vrouter list
-  summary: List all virtual routers under a subscription or a resource group.
-- uid: az_network_vrouter_peering
-  name: az network vrouter peering
-  summary: Manage the virtual router peering.
-- uid: az_network_vrouter_peering_create
-  name: az network vrouter peering create
-  summary: Create a virtual router peering.
+- az_network_vrouter_create
+- az_network_vrouter_delete
+- az_network_vrouter_list
+- az_network_vrouter_peering
+- az_network_vrouter_peering_create
+- az_network_vrouter_peering_delete
+- az_network_vrouter_peering_list
+- az_network_vrouter_peering_show
+- az_network_vrouter_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -90,10 +134,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the virtual router.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the virtual router. This feature supports both VirtualHub and VirtualRouter. Considering VirtualRouter is deprecated, we recommend to create VirtualRouter with --hosted-subnet instead.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vrouter/peering.yml b/2017-03-09-profile/docs-ref-autogen/network/vrouter/peering.yml
index 78e37a6785..82c17d0256 100644
--- a/2017-03-09-profile/docs-ref-autogen/network/vrouter/peering.yml
+++ b/2017-03-09-profile/docs-ref-autogen/network/vrouter/peering.yml
@@ -1,20 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vrouter_peering
-  name: az network vrouter peering
-  summary: Manage the virtual router peering.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vrouter_peering_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vrouter_peering
+name: az network vrouter peering
+summary: Manage the virtual router peering.
+description: ''
+directCommands:
 - uid: az_network_vrouter_peering_create
   name: az network vrouter peering create
   summary: Create a virtual router peering.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network vrouter peering create --name
+                                      --peer-asn
+                                      --peer-ip
+                                      --resource-group
+                                      --vrouter-name
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Virtual Router Peering.
@@ -29,25 +30,106 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vrouter-name
+    summary: The name of the Virtual Router.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_peering_delete
+  name: az network vrouter peering delete
+  summary: Delete a virtual router peering.
+  description: ''
+  syntax: >-
+    az network vrouter peering delete --name
+                                      --resource-group
+                                      --vrouter-name
+                                      [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router Peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vrouter-name
     summary: The name of the Virtual Router.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_peering_list
+  name: az network vrouter peering list
+  summary: List all virtual router peerings under a resource group.
+  description: ''
+  syntax: >-
+    az network vrouter peering list --resource-group
+                                    --vrouter-name
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vrouter-name
+    summary: The name of the Virtual Router.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_peering_show
+  name: az network vrouter peering show
+  summary: Show a virtual router peering.
+  description: ''
+  syntax: >-
+    az network vrouter peering show --name
+                                    --resource-group
+                                    --vrouter-name
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router Peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vrouter-name
+    summary: The name of the Virtual Router.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vrouter_peering_create
-  name: az network vrouter peering create
-  summary: Create a virtual router peering.
+- az_network_vrouter_peering_create
+- az_network_vrouter_peering_delete
+- az_network_vrouter_peering_list
+- az_network_vrouter_peering_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -63,10 +145,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the virtual router peering.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the virtual router peering.
diff --git a/2017-03-09-profile/docs-ref-autogen/network/vwan.yml b/2017-03-09-profile/docs-ref-autogen/network/vwan.yml
new file mode 100644
index 0000000000..e5c25f10ef
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/network/vwan.yml
@@ -0,0 +1,182 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vwan
+name: az network vwan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vwan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual WANs.
+description: ''
+directCommands:
+- uid: az_network_vwan_create
+  name: az network vwan create
+  summary: Create a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan create --name
+                           --resource-group
+                           [--branch-to-branch-traffic {false, true}]
+                           [--disable-vpn-encryption {false, true}]
+                           [--location]
+                           [--office365-category]
+                           [--security-provider-name]
+                           [--tags]
+                           [--type {Basic, Standard}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --branch-to-branch-traffic
+    parameterValueGroup: false, true
+    summary: Allow branch-to-branch traffic flow.
+    description: ''
+  - name: --disable-vpn-encryption
+    parameterValueGroup: false, true
+    summary: State of VPN encryption.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --office365-category
+    summary: The office local breakout category.
+    description: ''
+  - name: --security-provider-name
+    summary: The security provider name.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: Basic, Standard
+    summary: The type of the VirtualWAN.
+    description: ''
+- uid: az_network_vwan_delete
+  name: az network vwan delete
+  summary: Delete a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan delete --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vwan_list
+  name: az network vwan list
+  summary: List virtual WANs.
+  description: ''
+  syntax: az network vwan list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vwan_show
+  name: az network vwan show
+  summary: Get the details of a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vwan_update
+  name: az network vwan update
+  summary: Update settings of a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan update --name
+                           --resource-group
+                           [--add]
+                           [--branch-to-branch-traffic {false, true}]
+                           [--disable-vpn-encryption {false, true}]
+                           [--force-string]
+                           [--office365-category]
+                           [--remove]
+                           [--security-provider-name]
+                           [--set]
+                           [--tags]
+                           [--type {Basic, Standard}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --branch-to-branch-traffic
+    parameterValueGroup: false, true
+    summary: Allow branch-to-branch traffic flow.
+    description: ''
+  - name: --disable-vpn-encryption
+    parameterValueGroup: false, true
+    summary: State of VPN encryption.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --office365-category
+    summary: The office local breakout category.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --security-provider-name
+    summary: The security provider name.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: Basic, Standard
+    summary: The type of the VirtualWAN.
+    description: ''
+commands:
+- az_network_vwan_create
+- az_network_vwan_delete
+- az_network_vwan_list
+- az_network_vwan_show
+- az_network_vwan_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual WANs.
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub.yml
new file mode 100644
index 0000000000..f0f4b330b0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub
+name: az notification-hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Notification Hubs.
+description: ''
+directCommands:
+- uid: az_notification-hub_check-availability
+  name: az notification-hub check-availability
+  summary: Check the availability of the given notificationHub in a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub check-availability --name
+                                           --namespace-name
+                                           --resource-group
+  examples:
+  - summary: Check the availability of the given notificationHub name
+    syntax: >-
+      az notification-hub check-availability --resource-group MyResourceGroup \
+
+      --namespace-name "locp-newns" --name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name to check.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_create
+  name: az notification-hub create
+  summary: Create a NotificationHub in a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub create --location
+                               --name
+                               --namespace-name
+                               --resource-group
+                               [--registration-ttl]
+                               [--tags]
+  examples:
+  - summary: Create a Notification Hub
+    syntax: >-
+      az notification-hub create --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --name my-hub --location "South Central US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --registration-ttl
+    summary: The RegistrationTtl of the created NotificationHub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_notification-hub_delete
+  name: az notification-hub delete
+  summary: Delete a notification hub associated with a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub delete --name
+                               --namespace-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a notification hub
+    syntax: >-
+      az notification-hub delete --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_notification-hub_list
+  name: az notification-hub list
+  summary: List the notification hubs associated with a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub list --namespace-name
+                             --resource-group
+  examples:
+  - summary: List the notification hubs
+    syntax: az notification-hub list --resource-group MyResourceGroup --namespace-name my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_show
+  name: az notification-hub show
+  summary: Show the notification hub information.
+  description: ''
+  syntax: >-
+    az notification-hub show --name
+                             --namespace-name
+                             --resource-group
+  examples:
+  - summary: Show the Notification Hub info
+    syntax: >-
+      az notification-hub show --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_test-send
+  name: az notification-hub test-send
+  summary: Test send a push notification.
+  description: ''
+  syntax: >-
+    az notification-hub test-send --namespace-name
+                                  --notification-format {apple, baidu, gcm, template, windows, windowsphone}
+                                  --notification-hub-name
+                                  --resource-group
+                                  [--message]
+                                  [--payload]
+                                  [--tag]
+                                  [--title]
+  examples:
+  - summary: test send notification with message body
+    syntax: >-
+      az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --notification-format gcm \
+
+      --message "test notification"
+  - summary: test send notification from file
+    syntax: >-
+      az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --notification-format gcm \
+
+      --payload @path/to/file
+  - summary: test send notification with json string
+    syntax: >-
+      az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --notification-format gcm \
+
+      --payload "{\"data\":{\"message\":\"test notification\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-format
+    parameterValueGroup: apple, baidu, gcm, template, windows, windowsphone
+    summary: The format of notification message.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --message
+    summary: The message body to send. If not None, payload will be ignored.
+    description: ''
+  - name: --payload
+    summary: The payload for the message in JSON format.
+    description: ''
+  - name: --tag
+    summary: You can send test notifications to a specific set of registrations using this option. Leave this field empty if you like to send push notifications to 10 random registrations on the selected platform.
+    description: ''
+  - name: --title
+    summary: The title of the notification.
+    description: ''
+- uid: az_notification-hub_update
+  name: az notification-hub update
+  summary: Update a Notification Hub in a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub update --name
+                               --namespace-name
+                               --resource-group
+                               [--tags]
+  examples:
+  - summary: Update the Notification Hub
+    syntax: >-
+      az notification-hub update --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --name "sdk-notificationHubs-8708"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_notification-hub_authorization-rule
+- az_notification-hub_authorization-rule_create
+- az_notification-hub_authorization-rule_delete
+- az_notification-hub_authorization-rule_list
+- az_notification-hub_authorization-rule_list-keys
+- az_notification-hub_authorization-rule_regenerate-keys
+- az_notification-hub_authorization-rule_show
+- az_notification-hub_check-availability
+- az_notification-hub_create
+- az_notification-hub_credential
+- az_notification-hub_credential_adm
+- az_notification-hub_credential_adm_update
+- az_notification-hub_credential_apns
+- az_notification-hub_credential_apns_update
+- az_notification-hub_credential_baidu
+- az_notification-hub_credential_baidu_update
+- az_notification-hub_credential_gcm
+- az_notification-hub_credential_gcm_update
+- az_notification-hub_credential_list
+- az_notification-hub_credential_mpns
+- az_notification-hub_credential_mpns_update
+- az_notification-hub_credential_wns
+- az_notification-hub_credential_wns_update
+- az_notification-hub_delete
+- az_notification-hub_list
+- az_notification-hub_namespace
+- az_notification-hub_namespace_authorization-rule
+- az_notification-hub_namespace_authorization-rule_create
+- az_notification-hub_namespace_authorization-rule_delete
+- az_notification-hub_namespace_authorization-rule_list
+- az_notification-hub_namespace_authorization-rule_list-keys
+- az_notification-hub_namespace_authorization-rule_regenerate-keys
+- az_notification-hub_namespace_authorization-rule_show
+- az_notification-hub_namespace_check-availability
+- az_notification-hub_namespace_create
+- az_notification-hub_namespace_delete
+- az_notification-hub_namespace_list
+- az_notification-hub_namespace_show
+- az_notification-hub_namespace_update
+- az_notification-hub_namespace_wait
+- az_notification-hub_show
+- az_notification-hub_test-send
+- az_notification-hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Notification Hubs.
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/authorization-rule.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/authorization-rule.yml
new file mode 100644
index 0000000000..c8cd0ff962
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/authorization-rule.yml
@@ -0,0 +1,240 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_authorization-rule
+name: az notification-hub authorization-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub authorization-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hubs authorization rule.
+description: ''
+directCommands:
+- uid: az_notification-hub_authorization-rule_create
+  name: az notification-hub authorization-rule create
+  summary: Create an authorization rule for a NotificationHub.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule create --name
+                                                  --namespace-name
+                                                  --notification-hub-name
+                                                  --resource-group
+                                                  --rights
+  examples:
+  - summary: Create an authorization rule
+    syntax: >-
+      az notification-hub authorization-rule create --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature --rights Listen Send
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rights
+    summary: The rights associated with the rule.
+    description: ''
+- uid: az_notification-hub_authorization-rule_delete
+  name: az notification-hub authorization-rule delete
+  summary: Delete a notificationHub authorization rule.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule delete --name
+                                                  --namespace-name
+                                                  --notification-hub-name
+                                                  --resource-group
+  examples:
+  - summary: Delete the authorization rule
+    syntax: >-
+      az notification-hub authorization-rule delete --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_list
+  name: az notification-hub authorization-rule list
+  summary: List the authorization rules for a NotificationHub.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule list --namespace-name
+                                                --notification-hub-name
+                                                --resource-group
+  examples:
+  - summary: List authorization rules
+    syntax: >-
+      az notification-hub authorization-rule list --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_list-keys
+  name: az notification-hub authorization-rule list-keys
+  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule list-keys --name
+                                                     --namespace-name
+                                                     --notification-hub-name
+                                                     --resource-group
+  examples:
+  - summary: List connectionStrings of the authorization rule
+    syntax: >-
+      az notification-hub authorization-rule list-keys --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --notification-hub-name my-hub --name "sdk-AuthRules-5800"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_regenerate-keys
+  name: az notification-hub authorization-rule regenerate-keys
+  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule regenerate-keys --name
+                                                           --namespace-name
+                                                           --notification-hub-name
+                                                           --policy-key {Primary Key, Secondary Key}
+                                                           --resource-group
+  examples:
+  - summary: Regenerate the Notification Hub authorization rule
+    syntax: >-
+      az notification-hub authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature --policy-key "Secondary Key"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --policy-key
+    parameterValueGroup: Primary Key, Secondary Key
+    summary: Name of the key that has to be regenerated for the Notification Hub Authorization Rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_show
+  name: az notification-hub authorization-rule show
+  summary: Show an authorization rule for a NotificationHub by name.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule show --name
+                                                --namespace-name
+                                                --notification-hub-name
+                                                --resource-group
+  examples:
+  - summary: Show the authorization rule information
+    syntax: >-
+      az notification-hub authorization-rule show --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_authorization-rule_create
+- az_notification-hub_authorization-rule_delete
+- az_notification-hub_authorization-rule_list
+- az_notification-hub_authorization-rule_list-keys
+- az_notification-hub_authorization-rule_regenerate-keys
+- az_notification-hub_authorization-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hubs authorization rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential.yml
new file mode 100644
index 0000000000..00ffabd2a6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential.yml
@@ -0,0 +1,68 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential
+name: az notification-hub credential
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential.
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_list
+  name: az notification-hub credential list
+  summary: List the PNS Credentials associated with a notification hub .
+  description: ''
+  syntax: >-
+    az notification-hub credential list --namespace-name
+                                        --notification-hub-name
+                                        --resource-group
+  examples:
+  - summary: List the PNS Credentials
+    syntax: >-
+      az notification-hub credential list --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_adm
+- az_notification-hub_credential_adm_update
+- az_notification-hub_credential_apns
+- az_notification-hub_credential_apns_update
+- az_notification-hub_credential_baidu
+- az_notification-hub_credential_baidu_update
+- az_notification-hub_credential_gcm
+- az_notification-hub_credential_gcm_update
+- az_notification-hub_credential_list
+- az_notification-hub_credential_mpns
+- az_notification-hub_credential_mpns_update
+- az_notification-hub_credential_wns
+- az_notification-hub_credential_wns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential.
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/adm.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/adm.yml
new file mode 100644
index 0000000000..c5e6974667
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/adm.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_adm
+name: az notification-hub credential adm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential adm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Amazon(ADM).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_adm_update
+  name: az notification-hub credential adm update
+  summary: Update credential for Amazon(ADM).
+  description: ''
+  syntax: >-
+    az notification-hub credential adm update --client-id
+                                              --client-secret
+                                              --namespace-name
+                                              --notification-hub-name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --client-id
+    summary: The client identifier.
+    description: ''
+  - isRequired: true
+    name: --client-secret
+    summary: The credential secret access key.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_adm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Amazon(ADM).
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/apns.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/apns.yml
new file mode 100644
index 0000000000..9521314e97
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/apns.yml
@@ -0,0 +1,88 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_apns
+name: az notification-hub credential apns
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential apns** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Apple(APNS).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_apns_update
+  name: az notification-hub credential apns update
+  summary: Update credential for Apple(APNS).
+  description: ''
+  syntax: >-
+    az notification-hub credential apns update --namespace-name
+                                               --notification-hub-name
+                                               --resource-group
+                                               [--apns-certificate]
+                                               [--app-id]
+                                               [--app-name]
+                                               [--certificate-key]
+                                               [--endpoint]
+                                               [--key-id]
+                                               [--token]
+  examples:
+  - summary: Update APNS certificate
+    syntax: >-
+      az notification-hub credential apns update --namespace-name my-namespace \
+
+      --notification-hub-name my-hub --apns-certificate "/path/to/certificate" \
+
+      --certificate-key "xxxxxx" --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --apns-certificate
+    summary: The APNS certificate.
+    description: ''
+  - name: --app-id
+    summary: The issuer (iss) registered claim key, whose value is your 10-character Team ID, obtained from your developer account.
+    description: ''
+  - name: --app-name
+    summary: The name of the application/bundle id.
+    description: ''
+  - name: --certificate-key
+    summary: The certificate key.
+    description: ''
+  - name: --endpoint
+    defaultValue: gateway.push.apple.com
+    summary: The endpoint of this credential. Example values:"gateway.sandbox.push.apple.com","gateway.push.apple.com".
+    description: ''
+  - name: --key-id
+    summary: A 10-character key identifier (kid) key, obtained from your developer account.
+    description: ''
+  - name: --token
+    summary: Provider Authentication Token, obtained through your developer account.
+    description: ''
+commands:
+- az_notification-hub_credential_apns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Apple(APNS).
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/baidu.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/baidu.yml
new file mode 100644
index 0000000000..f769100f46
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/baidu.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_baidu
+name: az notification-hub credential baidu
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential baidu** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Baidu(Andrioid China).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_baidu_update
+  name: az notification-hub credential baidu update
+  summary: Update credential for Baidu(Andrioid China).
+  description: ''
+  syntax: >-
+    az notification-hub credential baidu update --api-key
+                                                --namespace-name
+                                                --notification-hub-name
+                                                --resource-group
+                                                --secret-key
+  requiredParameters:
+  - isRequired: true
+    name: --api-key
+    summary: Baidu API key.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-key
+    summary: Baidu secret key.
+    description: ''
+commands:
+- az_notification-hub_credential_baidu_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Baidu(Andrioid China).
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/gcm.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/gcm.yml
new file mode 100644
index 0000000000..46f43e189c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/gcm.yml
@@ -0,0 +1,63 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_gcm
+name: az notification-hub credential gcm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential gcm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Google(GCM/FCM).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_gcm_update
+  name: az notification-hub credential gcm update
+  summary: Update the Google GCM/FCM API key.
+  description: ''
+  syntax: >-
+    az notification-hub credential gcm update --google-api-key
+                                              --namespace-name
+                                              --notification-hub-name
+                                              --resource-group
+  examples:
+  - summary: Update gcm key
+    syntax: >-
+      az notification-hub credential gcm update --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --google-api-key \
+
+      "xxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --google-api-key
+    summary: Google GCM/FCM API key.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_gcm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Google(GCM/FCM).
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/mpns.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/mpns.yml
new file mode 100644
index 0000000000..a6f250bedd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/mpns.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_mpns
+name: az notification-hub credential mpns
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential mpns** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Windows Phone(MPNS).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_mpns_update
+  name: az notification-hub credential mpns update
+  summary: Update credential for Windows Phone(MPNS).
+  description: ''
+  syntax: >-
+    az notification-hub credential mpns update --certificate-key
+                                               --mpns-certificate
+                                               --namespace-name
+                                               --notification-hub-name
+                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --certificate-key
+    summary: The certificate key for this credential.
+    description: ''
+  - isRequired: true
+    name: --mpns-certificate
+    summary: The MPNS certificate.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_mpns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Windows Phone(MPNS).
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/wns.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/wns.yml
new file mode 100644
index 0000000000..d4a42d471a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/credential/wns.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_wns
+name: az notification-hub credential wns
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential wns** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Windows(WNS).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_wns_update
+  name: az notification-hub credential wns update
+  summary: Update credential for Windows(WNS).
+  description: ''
+  syntax: >-
+    az notification-hub credential wns update --namespace-name
+                                              --notification-hub-name
+                                              --package-sid
+                                              --resource-group
+                                              --secret-key
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --package-sid
+    summary: The package ID for this credential.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-key
+    summary: The secret key.
+    description: ''
+commands:
+- az_notification-hub_credential_wns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Windows(WNS).
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/namespace.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/namespace.yml
new file mode 100644
index 0000000000..41bd002e3a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/namespace.yml
@@ -0,0 +1,241 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_namespace
+name: az notification-hub namespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub namespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub namespace.
+description: ''
+directCommands:
+- uid: az_notification-hub_namespace_check-availability
+  name: az notification-hub namespace check-availability
+  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
+  description: ''
+  syntax: az notification-hub namespace check-availability --name
+  examples:
+  - summary: Check name availability of namespace
+    syntax: az notification-hub namespace check-availability --name "my-test-space"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name to check.
+    description: ''
+- uid: az_notification-hub_namespace_create
+  name: az notification-hub namespace create
+  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+  description: ''
+  syntax: >-
+    az notification-hub namespace create --name
+                                         --resource-group
+                                         --sku {Basic, Free, Standard}
+                                         [--location]
+                                         [--tags]
+  examples:
+  - summary: Create a namespace
+    syntax: >-
+      az notification-hub namespace create --resource-group MyResourceGroup --name \
+
+      my-namespace --location "South Central US" --sku Standard
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: Basic, Free, Standard
+    summary: Name of the notification hub sku.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_notification-hub_namespace_delete
+  name: az notification-hub namespace delete
+  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace delete --name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete the namespace
+    syntax: >-
+      az notification-hub namespace delete --resource-group MyResourceGroup --name \
+
+      my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_notification-hub_namespace_list
+  name: az notification-hub namespace list
+  summary: List available namespaces.
+  description: ''
+  syntax: az notification-hub namespace list [--resource-group]
+  examples:
+  - summary: List available namespaces within a resource group
+    syntax: az notification-hub namespace list --resource-group MyResourceGroup
+  - summary: List all the available namespaces within the subscription irrespective of the resourceGroups
+    syntax: az notification-hub namespace list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_show
+  name: az notification-hub namespace show
+  summary: Return the description for the specified namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace show --name
+                                       --resource-group
+  examples:
+  - summary: Show namespace info
+    syntax: >-
+      az notification-hub namespace show --resource-group MyResourceGroup --name \
+
+      my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_update
+  name: az notification-hub namespace update
+  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
+  description: ''
+  syntax: >-
+    az notification-hub namespace update --name
+                                         --resource-group
+                                         [--sku {Basic, Free, Standard}]
+                                         [--tags]
+  examples:
+  - summary: Update the namespace
+    syntax: >-
+      az notification-hub namespace update --resource-group MyResourceGroup --name \
+
+      my-namespace --sku Standard
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: Basic, Free, Standard
+    summary: Name of the notification hub sku.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_notification-hub_namespace_wait
+  name: az notification-hub namespace wait
+  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
+  description: ''
+  syntax: >-
+    az notification-hub namespace wait --name
+                                       --resource-group
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Notification Hub Namesapce is successfully provisioned.
+    syntax: az notification-hub namespace wait --resource-group MyResourceGroup --name \ my-namespace --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_notification-hub_namespace_authorization-rule
+- az_notification-hub_namespace_authorization-rule_create
+- az_notification-hub_namespace_authorization-rule_delete
+- az_notification-hub_namespace_authorization-rule_list
+- az_notification-hub_namespace_authorization-rule_list-keys
+- az_notification-hub_namespace_authorization-rule_regenerate-keys
+- az_notification-hub_namespace_authorization-rule_show
+- az_notification-hub_namespace_check-availability
+- az_notification-hub_namespace_create
+- az_notification-hub_namespace_delete
+- az_notification-hub_namespace_list
+- az_notification-hub_namespace_show
+- az_notification-hub_namespace_update
+- az_notification-hub_namespace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub namespace.
diff --git a/2017-03-09-profile/docs-ref-autogen/notification-hub/namespace/authorization-rule.yml b/2017-03-09-profile/docs-ref-autogen/notification-hub/namespace/authorization-rule.yml
new file mode 100644
index 0000000000..95fb1791bd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/notification-hub/namespace/authorization-rule.yml
@@ -0,0 +1,207 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_namespace_authorization-rule
+name: az notification-hub namespace authorization-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub namespace authorization-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hubs namespace authorization rule.
+description: ''
+directCommands:
+- uid: az_notification-hub_namespace_authorization-rule_create
+  name: az notification-hub namespace authorization-rule create
+  summary: Create an authorization rule for a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule create --name
+                                                            --namespace-name
+                                                            --resource-group
+                                                            --rights
+  examples:
+  - summary: Create a namespace authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule create --resource-group \
+
+      MyResourceGroup --namespace-name my-namespace --name "sdk-AuthRules-1788" --rights Listen Send
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rights
+    summary: The rights associated with the rule.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_delete
+  name: az notification-hub namespace authorization-rule delete
+  summary: Delete a namespace authorization rule.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule delete --name
+                                                            --namespace-name
+                                                            --resource-group
+                                                            [--yes]
+  examples:
+  - summary: Delete a namespace authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule delete --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --name "RootManageSharedAccessKey"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_list
+  name: az notification-hub namespace authorization-rule list
+  summary: List the authorization rules for a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule list --namespace-name
+                                                          --resource-group
+  examples:
+  - summary: List authorization rules of the namespace
+    syntax: >-
+      az notification-hub namespace authorization-rule list --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_list-keys
+  name: az notification-hub namespace authorization-rule list-keys
+  summary: List the Primary and Secondary ConnectionStrings to the namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule list-keys --name
+                                                               --namespace-name
+                                                               --resource-group
+  examples:
+  - summary: List keys of the namesapce authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule list-keys --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --name "RootManageSharedAccessKey"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_regenerate-keys
+  name: az notification-hub namespace authorization-rule regenerate-keys
+  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule regenerate-keys --name
+                                                                     --namespace-name
+                                                                     --policy-key {Primary Key, Secondary Key}
+                                                                     --resource-group
+  examples:
+  - summary: Regenerate keys of the namesapce authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --name "RootManageSharedAccessKey" --policy-key "Secondary Key"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --policy-key
+    parameterValueGroup: Primary Key, Secondary Key
+    summary: Name of the key that has to be regenerated for the Namespace Authorization Rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_show
+  name: az notification-hub namespace authorization-rule show
+  summary: Show an authorization rule for a namespace by name.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule show --name
+                                                          --namespace-name
+                                                          --resource-group
+  examples:
+  - summary: Show namespace authorization rule info
+    syntax: >-
+      az notification-hub namespace authorization-rule show --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --name "RootManageSharedAccessKey"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_namespace_authorization-rule_create
+- az_notification-hub_namespace_authorization-rule_delete
+- az_notification-hub_namespace_authorization-rule_list
+- az_notification-hub_namespace_authorization-rule_list-keys
+- az_notification-hub_namespace_authorization-rule_regenerate-keys
+- az_notification-hub_namespace_authorization-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hubs namespace authorization rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure.yml b/2017-03-09-profile/docs-ref-autogen/offazure.yml
new file mode 100644
index 0000000000..1282ba9c68
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure
+name: az offazure
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage on-premise resources for migrate.
+description: ''
+commands:
+- az_offazure_hyperv
+- az_offazure_hyperv_cluster
+- az_offazure_hyperv_cluster_list
+- az_offazure_hyperv_cluster_show
+- az_offazure_hyperv_host
+- az_offazure_hyperv_host_list
+- az_offazure_hyperv_host_show
+- az_offazure_hyperv_machine
+- az_offazure_hyperv_machine_list
+- az_offazure_hyperv_machine_show
+- az_offazure_hyperv_run-as-account
+- az_offazure_hyperv_run-as-account_list
+- az_offazure_hyperv_run-as-account_show
+- az_offazure_hyperv_site
+- az_offazure_hyperv_site_create
+- az_offazure_hyperv_site_delete
+- az_offazure_hyperv_site_show
+- az_offazure_vmware
+- az_offazure_vmware_machine
+- az_offazure_vmware_machine_list
+- az_offazure_vmware_machine_show
+- az_offazure_vmware_run-as-account
+- az_offazure_vmware_run-as-account_list
+- az_offazure_vmware_run-as-account_show
+- az_offazure_vmware_site
+- az_offazure_vmware_site_create
+- az_offazure_vmware_site_delete
+- az_offazure_vmware_site_show
+- az_offazure_vmware_vcenter
+- az_offazure_vmware_vcenter_list
+- az_offazure_vmware_vcenter_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage on-premise resources for migrate.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/hyperv.yml b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv.yml
new file mode 100644
index 0000000000..9cc3a6c144
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv.yml
@@ -0,0 +1,43 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv
+name: az offazure hyperv
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V on-premise resources.
+description: ''
+commands:
+- az_offazure_hyperv_cluster
+- az_offazure_hyperv_cluster_list
+- az_offazure_hyperv_cluster_show
+- az_offazure_hyperv_host
+- az_offazure_hyperv_host_list
+- az_offazure_hyperv_host_show
+- az_offazure_hyperv_machine
+- az_offazure_hyperv_machine_list
+- az_offazure_hyperv_machine_show
+- az_offazure_hyperv_run-as-account
+- az_offazure_hyperv_run-as-account_list
+- az_offazure_hyperv_run-as-account_show
+- az_offazure_hyperv_site
+- az_offazure_hyperv_site_create
+- az_offazure_hyperv_site_delete
+- az_offazure_hyperv_site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V on-premise resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/cluster.yml b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/cluster.yml
new file mode 100644
index 0000000000..ac999837e2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/cluster.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_cluster
+name: az offazure hyperv cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V cluster.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_cluster_list
+  name: az offazure hyperv cluster list
+  summary: Get all clusters on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv cluster list --resource-group
+                                    --site-name
+  examples:
+  - summary: List clusters by site
+    syntax: az offazure hyperv cluster list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_cluster_show
+  name: az offazure hyperv cluster show
+  summary: Get the details of a Hyper-V cluster.
+  description: ''
+  syntax: >-
+    az offazure hyperv cluster show --cluster-name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a cluster
+    syntax: az offazure hyperv cluster show --cluster-name MyClusterName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_cluster_list
+- az_offazure_hyperv_cluster_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/host.yml b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/host.yml
new file mode 100644
index 0000000000..4d80bc63c0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/host.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_host
+name: az offazure hyperv host
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv host** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V host.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_host_list
+  name: az offazure hyperv host list
+  summary: Get all hosts on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv host list --resource-group
+                                 --site-name
+  examples:
+  - summary: List hosts by site
+    syntax: az offazure hyperv host list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_host_show
+  name: az offazure hyperv host show
+  summary: Get the details of a Hyper-V host.
+  description: ''
+  syntax: >-
+    az offazure hyperv host show --host-name
+                                 --resource-group
+                                 --site-name
+  examples:
+  - summary: Get a host
+    syntax: az offazure hyperv host show --host-name MyHostName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --host-name --name -n
+    summary: Name of the host.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_host_list
+- az_offazure_hyperv_host_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V host.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/machine.yml b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/machine.yml
new file mode 100644
index 0000000000..060cbc18b4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/machine.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_machine
+name: az offazure hyperv machine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv machine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V machine.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_machine_list
+  name: az offazure hyperv machine list
+  summary: List all machines on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv machine list --resource-group
+                                    --site-name
+  examples:
+  - summary: List machines by site
+    syntax: az offazure hyperv machine list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_machine_show
+  name: az offazure hyperv machine show
+  summary: Get the details of a machine.
+  description: ''
+  syntax: >-
+    az offazure hyperv machine show --machine-name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a machine.
+    syntax: az offazure hyperv machine show --machine-name MyMachineName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: Name of the machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_machine_list
+- az_offazure_hyperv_machine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V machine.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/run-as-account.yml b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/run-as-account.yml
new file mode 100644
index 0000000000..6087e3dd8a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/run-as-account.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_run-as-account
+name: az offazure hyperv run-as-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv run-as-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V run-as-account.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_run-as-account_list
+  name: az offazure hyperv run-as-account list
+  summary: List all run-as-accounts on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv run-as-account list --resource-group
+                                           --site-name
+  examples:
+  - summary: List run-as-accounts by site
+    syntax: az offazure hyperv run-as-account list --resource-group MyResourceGroup                  --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_run-as-account_show
+  name: az offazure hyperv run-as-account show
+  summary: Get the details of a run-as-account.
+  description: ''
+  syntax: >-
+    az offazure hyperv run-as-account show --account-name
+                                           --resource-group
+                                           --site-name
+  examples:
+  - summary: Get a run-as-account.
+    syntax: az offazure hyperv run-as-account show --account-name MyAccount --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --account-name --name -n
+    summary: Name of the run-as-account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_run-as-account_list
+- az_offazure_hyperv_run-as-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V run-as-account.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/site.yml b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/site.yml
new file mode 100644
index 0000000000..366683bb34
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/hyperv/site.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_site
+name: az offazure hyperv site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V site.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_site_create
+  name: az offazure hyperv site create
+  summary: Create a Hyper-V site.
+  description: ''
+  syntax: >-
+    az offazure hyperv site create --name
+                                   --resource-group
+                                   [--agent]
+                                   [--appliance-name]
+                                   [--identity]
+                                   [--location]
+                                   [--solution-id]
+                                   [--tags]
+  examples:
+  - summary: Create a Hyper-V site
+    syntax: az offazure hyperv site create --resource-group MyResourceGroup --site-name MySiteName                  --location centralus
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the Hyper-V Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent
+    summary: On-premises agent details.
+    description: >-
+      Usage: --agent key-vault-uri=XX key-vault-id=XX
+
+
+      key-vault-uri: Key vault URI.
+
+      key-vault-id: Key vault ARM Id.
+  - name: --appliance-name
+    summary: Name of the appliance.
+    description: ''
+  - name: --identity
+    summary: Service principal identity details used by agent for communication to the service.
+    description: >-
+      Usage: --identity tenant-id=XX application-id=XX object-id=XX audience=XX aad-authority=XX raw-cert-data=XX
+
+
+      tenant-id: Tenant Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      application-id: Application/client Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      object-id: Object Id of the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      audience: Intended audience for the service principal.
+
+      aad-authority: AAD Authority URL which was used to request the token for the service principal.
+
+      raw-cert-data: Raw certificate data for building certificate expiry flows.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --solution-id
+    summary: ARM ID of migration hub solution for SDS.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_offazure_hyperv_site_delete
+  name: az offazure hyperv site delete
+  summary: Delete a Hyper-V site.
+  description: ''
+  syntax: >-
+    az offazure hyperv site delete --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Delete a Hyper-V site.
+    syntax: az offazure hyperv site delete --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the Hyper-V Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_offazure_hyperv_site_show
+  name: az offazure hyperv site show
+  summary: Get the details of a site.
+  description: ''
+  syntax: >-
+    az offazure hyperv site show --name
+                                 --resource-group
+  examples:
+  - summary: Get a Hyper-V site
+    syntax: az offazure hyperv site show --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the Hyper-V Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_offazure_hyperv_site_create
+- az_offazure_hyperv_site_delete
+- az_offazure_hyperv_site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V site.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/vmware.yml b/2017-03-09-profile/docs-ref-autogen/offazure/vmware.yml
new file mode 100644
index 0000000000..5c74092003
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/vmware.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware
+name: az offazure vmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware on-premise resources.
+description: ''
+commands:
+- az_offazure_vmware_machine
+- az_offazure_vmware_machine_list
+- az_offazure_vmware_machine_show
+- az_offazure_vmware_run-as-account
+- az_offazure_vmware_run-as-account_list
+- az_offazure_vmware_run-as-account_show
+- az_offazure_vmware_site
+- az_offazure_vmware_site_create
+- az_offazure_vmware_site_delete
+- az_offazure_vmware_site_show
+- az_offazure_vmware_vcenter
+- az_offazure_vmware_vcenter_list
+- az_offazure_vmware_vcenter_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware on-premise resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/vmware/machine.yml b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/machine.yml
new file mode 100644
index 0000000000..79785634a3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/machine.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_machine
+name: az offazure vmware machine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware machine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware machine.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_machine_list
+  name: az offazure vmware machine list
+  summary: List all machines on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure vmware machine list --resource-group
+                                    --site-name
+  examples:
+  - summary: List VMware machines by site
+    syntax: az offazure vmware machine list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_vmware_machine_show
+  name: az offazure vmware machine show
+  summary: Get the details of a machine.
+  description: ''
+  syntax: >-
+    az offazure vmware machine show --machine-name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a VMware machine.
+    syntax: az offazure vmware machine show --name MyMachineName --resource-group MyResourceGroup                  --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: Name of the machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+commands:
+- az_offazure_vmware_machine_list
+- az_offazure_vmware_machine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware machine.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/vmware/run-as-account.yml b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/run-as-account.yml
new file mode 100644
index 0000000000..50f7f777a1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/run-as-account.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_run-as-account
+name: az offazure vmware run-as-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware run-as-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware run-as-account.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_run-as-account_list
+  name: az offazure vmware run-as-account list
+  summary: List all run-as-accounts on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure vmware run-as-account list --resource-group
+                                           --site-name
+  examples:
+  - summary: List VMware run-as-accounts by site.
+    syntax: az offazure vmware run-as-account list --resource-group MyResourceGroup                  --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+- uid: az_offazure_vmware_run-as-account_show
+  name: az offazure vmware run-as-account show
+  summary: Get the details of a run-as-account.
+  description: ''
+  syntax: >-
+    az offazure vmware run-as-account show --account-name
+                                           --resource-group
+                                           --site-name
+  examples:
+  - summary: Get a VMware run-as-account.
+    syntax: az offazure vmware run-as-account show --account-name MyAccountName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --account-name --name -n
+    summary: Name of the run-as-account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+commands:
+- az_offazure_vmware_run-as-account_list
+- az_offazure_vmware_run-as-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware run-as-account.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/vmware/site.yml b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/site.yml
new file mode 100644
index 0000000000..dd555002ea
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/site.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_site
+name: az offazure vmware site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware site.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_site_create
+  name: az offazure vmware site create
+  summary: Create a site for VMware resources.
+  description: ''
+  syntax: >-
+    az offazure vmware site create --name
+                                   --resource-group
+                                   [--agent]
+                                   [--appliance-name]
+                                   [--identity]
+                                   [--location]
+                                   [--solution-id]
+                                   [--tags]
+  examples:
+  - summary: Create a VMware site
+    syntax: az offazure vmware site create -g MyResourceGroup --site-name MySiteName --location centralus
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the VMware site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent
+    summary: On-premises agent details.
+    description: >-
+      Usage: --agent key-vault-uri=XX key-vault-id=XX
+
+
+      key-vault-uri: Key vault URI.
+
+      key-vault-id: Key vault ARM Id.
+  - name: --appliance-name
+    summary: Name of the appliance.
+    description: ''
+  - name: --identity
+    summary: Service principal identity details used by agent for communication to the service.
+    description: >-
+      Usage: --identity tenant-id=XX application-id=XX object-id=XX audience=XX aad-authority=XX raw-cert-data=XX
+
+
+      tenant-id: Tenant Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      application-id: Application/client Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      object-id: Object Id of the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      audience: Intended audience for the service principal.
+
+      aad-authority: AAD Authority URL which was used to request the token for the service principal.
+
+      raw-cert-data: Raw certificate data for building certificate expiry flows.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --solution-id
+    summary: ARM ID of migration hub solution for SDS.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_offazure_vmware_site_delete
+  name: az offazure vmware site delete
+  summary: Delete a VMware site.
+  description: ''
+  syntax: >-
+    az offazure vmware site delete --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Delete a VMware site
+    syntax: az offazure vmware site delete --resource-group MyResourceGroup --name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the VMware site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_offazure_vmware_site_show
+  name: az offazure vmware site show
+  summary: Get the details of a VMware site.
+  description: ''
+  syntax: >-
+    az offazure vmware site show --name
+                                 --resource-group
+  examples:
+  - summary: Get a VMware site
+    syntax: az offazure vmware site show --resource-group MyResourceGroup --name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the VMware site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_offazure_vmware_site_create
+- az_offazure_vmware_site_delete
+- az_offazure_vmware_site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware site.
diff --git a/2017-03-09-profile/docs-ref-autogen/offazure/vmware/vcenter.yml b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/vcenter.yml
new file mode 100644
index 0000000000..fdbe2361a3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/offazure/vmware/vcenter.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_vcenter
+name: az offazure vmware vcenter
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware vcenter** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware vCenter.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_vcenter_list
+  name: az offazure vmware vcenter list
+  summary: List all vCenters on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure vmware vcenter list --resource-group
+                                    --site-name
+  examples:
+  - summary: List VMware vCenters by site
+    syntax: az offazure vmware vcenter list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+- uid: az_offazure_vmware_vcenter_show
+  name: az offazure vmware vcenter show
+  summary: Get the details of a vCenter.
+  description: ''
+  syntax: >-
+    az offazure vmware vcenter show --name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a VMware vCenter.
+    syntax: az offazure vmware vcenter show --resource-group MyResourceGroup --site-name MySiteName                  --name MyVCenterName
+  requiredParameters:
+  - isRequired: true
+    name: --name --vcenter-name -n
+    summary: VCenter ARM name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+commands:
+- az_offazure_vmware_vcenter_list
+- az_offazure_vmware_vcenter_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware vCenter.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering.yml b/2017-03-09-profile/docs-ref-autogen/peering.yml
new file mode 100644
index 0000000000..90048733f9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering.yml
@@ -0,0 +1,74 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering
+name: az peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage peering.
+description: ''
+commands:
+- az_peering_asn
+- az_peering_asn_create
+- az_peering_asn_delete
+- az_peering_asn_list
+- az_peering_asn_show
+- az_peering_legacy
+- az_peering_legacy_list
+- az_peering_location
+- az_peering_location_list
+- az_peering_peering
+- az_peering_peering_create
+- az_peering_peering_delete
+- az_peering_peering_list
+- az_peering_peering_show
+- az_peering_peering_update
+- az_peering_received-route
+- az_peering_received-route_list
+- az_peering_registered-asn
+- az_peering_registered-asn_create
+- az_peering_registered-asn_delete
+- az_peering_registered-asn_list
+- az_peering_registered-asn_show
+- az_peering_registered-asn_update
+- az_peering_registered-prefix
+- az_peering_registered-prefix_create
+- az_peering_registered-prefix_delete
+- az_peering_registered-prefix_list
+- az_peering_registered-prefix_show
+- az_peering_registered-prefix_update
+- az_peering_service
+- az_peering_service_country
+- az_peering_service_country_list
+- az_peering_service_create
+- az_peering_service_delete
+- az_peering_service_list
+- az_peering_service_location
+- az_peering_service_location_list
+- az_peering_service_prefix
+- az_peering_service_prefix_create
+- az_peering_service_prefix_delete
+- az_peering_service_prefix_list
+- az_peering_service_prefix_show
+- az_peering_service_prefix_update
+- az_peering_service_provider
+- az_peering_service_provider_list
+- az_peering_service_show
+- az_peering_service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage peering.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/asn.yml b/2017-03-09-profile/docs-ref-autogen/peering/asn.yml
new file mode 100644
index 0000000000..4a4b190ed0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/asn.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_asn
+name: az peering asn
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering asn** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering asn.
+description: ''
+directCommands:
+- uid: az_peering_asn_create
+  name: az peering asn create
+  summary: Creates a new peer ASN or updates an existing peer ASN with the specified name under the given subscription.
+  description: ''
+  syntax: >-
+    az peering asn create --peer-asn-name
+                          [--peer-asn]
+                          [--peer-contact-detail]
+                          [--peer-name]
+                          [--validation-state {Approved, Failed, None, Pending}]
+  examples:
+  - summary: Create a peer ASN
+    syntax: az peering asn create --peer-asn 65000 --peer-contact-detail email="noc@contoso.com" phone="+1 (234) 567-8999" role="Noc" --peer-contact-detail email="abc@contoso.com" phone="+1 (234) 567-8900" role="Policy" --peer-contact-detail email="xyz@contoso.com" phone="+1 (234) 567-8900" role="Technical" --peer-name "Contoso" --peer-asn-name "peerAsnName"
+  requiredParameters:
+  - isRequired: true
+    name: --peer-asn-name
+    summary: The peer ASN name.
+    description: ''
+  optionalParameters:
+  - name: --peer-asn
+    summary: The Autonomous System Number (ASN) of the peer.
+    description: ''
+  - name: --peer-contact-detail
+    summary: 'The contact details of the peer. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: role, email, phone.'
+    description: ''
+  - name: --peer-name
+    summary: The name of the peer.
+    description: ''
+  - name: --validation-state
+    parameterValueGroup: Approved, Failed, None, Pending
+    summary: The validation state of the ASN associated with the peer.
+    description: ''
+- uid: az_peering_asn_delete
+  name: az peering asn delete
+  summary: Deletes an existing peer ASN with the specified name under the given subscription.
+  description: ''
+  syntax: az peering asn delete --peer-asn-name
+  examples:
+  - summary: Delete a peer ASN
+    syntax: az peering asn delete --peer-asn-name "peerAsnName"
+  requiredParameters:
+  - isRequired: true
+    name: --peer-asn-name
+    summary: The peer ASN name.
+    description: ''
+- uid: az_peering_asn_list
+  name: az peering asn list
+  summary: Lists all of the peer ASNs under the given subscription.
+  description: ''
+  syntax: az peering asn list
+  examples:
+  - summary: List peer ASNs in a subscription
+    syntax: az peering asn list
+- uid: az_peering_asn_show
+  name: az peering asn show
+  summary: Gets the peer ASN with the specified name under the given subscription.
+  description: ''
+  syntax: az peering asn show --peer-asn-name
+  examples:
+  - summary: Get a peer ASN
+    syntax: az peering asn show --peer-asn-name "peerAsnName"
+  requiredParameters:
+  - isRequired: true
+    name: --peer-asn-name
+    summary: The peer ASN name.
+    description: ''
+commands:
+- az_peering_asn_create
+- az_peering_asn_delete
+- az_peering_asn_list
+- az_peering_asn_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering asn.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/legacy.yml b/2017-03-09-profile/docs-ref-autogen/peering/legacy.yml
new file mode 100644
index 0000000000..6814c3a5e4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/legacy.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_legacy
+name: az peering legacy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering legacy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering legacy.
+description: ''
+directCommands:
+- uid: az_peering_legacy_list
+  name: az peering legacy list
+  summary: Lists all of the legacy peerings under the given subscription matching the specified kind and location.
+  description: ''
+  syntax: >-
+    az peering legacy list --kind {Direct, Exchange}
+                           --peering-location
+                           [--asn]
+  examples:
+  - summary: List legacy peerings
+    syntax: az peering legacy list --kind "Exchange" --peering-location "peeringLocation0"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: Direct, Exchange
+    summary: The kind of the peering.
+    description: ''
+  - isRequired: true
+    name: --peering-location
+    summary: The location of the peering.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: The ASN number associated with a legacy peering.
+    description: ''
+commands:
+- az_peering_legacy_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering legacy.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/location.yml b/2017-03-09-profile/docs-ref-autogen/peering/location.yml
new file mode 100644
index 0000000000..997c676762
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/location.yml
@@ -0,0 +1,52 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_location
+name: az peering location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering location.
+description: ''
+directCommands:
+- uid: az_peering_location_list
+  name: az peering location list
+  summary: Lists all of the available peering locations for the specified kind of peering.
+  description: ''
+  syntax: >-
+    az peering location list --kind {Direct, Exchange}
+                             [--direct-peering-type {Cdn, Edge, Internal, Ix, IxRs, Transit}]
+  examples:
+  - summary: List direct peering locations
+    syntax: az peering location list --kind "Direct"
+  - summary: List exchange peering locations
+    syntax: az peering location list --kind "Exchange"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: Direct, Exchange
+    summary: The kind of the peering.
+    description: ''
+  optionalParameters:
+  - name: --direct-peering-type
+    parameterValueGroup: Cdn, Edge, Internal, Ix, IxRs, Transit
+    summary: The type of direct peering.
+    description: ''
+commands:
+- az_peering_location_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering location.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/peering.yml b/2017-03-09-profile/docs-ref-autogen/peering/peering.yml
new file mode 100644
index 0000000000..bceb09ffc1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/peering.yml
@@ -0,0 +1,163 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_peering
+name: az peering peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering peering.
+description: ''
+directCommands:
+- uid: az_peering_peering_create
+  name: az peering peering create
+  summary: Creates a new peering or updates an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering create --kind {Direct, Exchange}
+                              --location
+                              --peering-name
+                              --resource-group
+                              --sku
+                              [--direct]
+                              [--exchange]
+                              [--peering-location]
+                              [--tags]
+  examples:
+  - summary: Create a direct peering
+    syntax: az peering peering create --kind "Direct" --location "eastus" --direct "{\"connections\":[{\"bandwidthInMbps\":10000,\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"md5AuthenticationKey\":\"test-md5-auth-key\",\"sessionPrefixV4\":\"192.168.0.0/31\",\"sessionPrefixV6\":\"fd00::0/127\"},\"connectionIdentifier\":\"5F4CB5C7-6B43-4444-9338-9ABC72606C16\",\"peeringDBFacilityId\":99999,\"sessionAddressProvider\":\"Peer\",\"useForPeeringService\":false},{\"bandwidthInMbps\":10000,\"connectionIdentifier\":\"8AB00818-D533-4504-A25A-03A17F61201C\",\"peeringDBFacilityId\":99999,\"sessionAddressProvider\":\"Microsoft\",\"useForPeeringService\":true}],\"directPeeringType\":\"Edge\",\"peerAsn\":{\"id\":\"/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1\"}}" --peering-location "peeringLocation0" --sku name="Basic_Direct_Free" --peering-name "peeringName" --resource-group "rgName"
+  - summary: Create a peering with exchange route server
+    syntax: az peering peering create --kind "Direct" --location "eastus" --direct "{\"connections\":[{\"bandwidthInMbps\":10000,\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"microsoftSessionIPv4Address\":\"192.168.0.123\",\"peerSessionIPv4Address\":\"192.168.0.234\",\"sessionPrefixV4\":\"192.168.0.0/24\"},\"connectionIdentifier\":\"5F4CB5C7-6B43-4444-9338-9ABC72606C16\",\"peeringDBFacilityId\":99999,\"sessionAddressProvider\":\"Peer\",\"useForPeeringService\":true}],\"directPeeringType\":\"IxRs\",\"peerAsn\":{\"id\":\"/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1\"}}" --peering-location "peeringLocation0" --sku name="Premium_Direct_Free" --peering-name "peeringName" --resource-group "rgName"
+  - summary: Create an exchange peering
+    syntax: az peering peering create --kind "Exchange" --location "eastus" --exchange "{\"connections\":[{\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"md5AuthenticationKey\":\"test-md5-auth-key\",\"peerSessionIPv4Address\":\"192.168.2.1\",\"peerSessionIPv6Address\":\"fd00::1\"},\"connectionIdentifier\":\"CE495334-0E94-4E51-8164-8116D6CD284D\",\"peeringDBFacilityId\":99999},{\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"md5AuthenticationKey\":\"test-md5-auth-key\",\"peerSessionIPv4Address\":\"192.168.2.2\",\"peerSessionIPv6Address\":\"fd00::2\"},\"connectionIdentifier\":\"CDD8E673-CB07-47E6-84DE-3739F778762B\",\"peeringDBFacilityId\":99999}],\"peerAsn\":{\"id\":\"/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1\"}}" --peering-location "peeringLocation0" --sku name="Basic_Exchange_Free" --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: Direct, Exchange
+    summary: The kind of the peering.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: 'The SKU that defines the tier and kind of the peering. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: name, tier, family, size.'
+    description: ''
+  optionalParameters:
+  - name: --direct
+    summary: 'The properties that define a direct peering. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --exchange
+    summary: 'The properties that define an exchange peering. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --peering-location
+    summary: The location of the peering.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_peering_peering_delete
+  name: az peering peering delete
+  summary: Deletes an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering delete --peering-name
+                              --resource-group
+  examples:
+  - summary: Delete a peering
+    syntax: az peering peering delete --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_peering_list
+  name: az peering peering list
+  summary: Lists all of the peerings under the given subscription.
+  description: ''
+  syntax: az peering peering list [--resource-group]
+  examples:
+  - summary: List peerings in a resource group
+    syntax: az peering peering list --resource-group "rgName"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_peering_show
+  name: az peering peering show
+  summary: Gets an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering show --peering-name
+                            --resource-group
+  examples:
+  - summary: Get a peering
+    syntax: az peering peering show --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_peering_update
+  name: az peering peering update
+  summary: Updates tags for a peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering update --peering-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Update peering tags
+    syntax: az peering peering update --peering-name "peeringName" --resource-group "rgName" --tags tags={"tag0":"value0","tag1":"value1"}
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_peering_peering_create
+- az_peering_peering_delete
+- az_peering_peering_list
+- az_peering_peering_show
+- az_peering_peering_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering peering.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/received-route.yml b/2017-03-09-profile/docs-ref-autogen/peering/received-route.yml
new file mode 100644
index 0000000000..e95e80aeba
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/received-route.yml
@@ -0,0 +1,69 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_received-route
+name: az peering received-route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering received-route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering received-route.
+description: ''
+directCommands:
+- uid: az_peering_received-route_list
+  name: az peering received-route list
+  summary: Lists the prefixes received over the specified peering under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering received-route list --peering-name
+                                   --resource-group
+                                   [--as-path]
+                                   [--origin-as-validation-state]
+                                   [--prefix]
+                                   [--rpki-validation-state]
+                                   [--skip-token]
+  examples:
+  - summary: Lists the prefixes received over the specified peering under the given subscription and resource group.
+    syntax: az peering received-route list --as-path "123 456" --origin-as-validation-state "Valid" --peering-name "peeringName" --prefix "1.1.1.0/24" --resource-group "rgName" --rpki-validation-state "Valid"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --as-path
+    summary: The optional AS path that can be used to filter the routes.
+    description: ''
+  - name: --origin-as-validation-state
+    summary: The optional origin AS validation state that can be used to filter the routes.
+    description: ''
+  - name: --prefix
+    summary: The optional prefix that can be used to filter the routes.
+    description: ''
+  - name: --rpki-validation-state
+    summary: The optional RPKI validation state that can be used to filter the routes.
+    description: ''
+  - name: --skip-token
+    summary: The optional page continuation token that is used in the event of paginated result.
+    description: ''
+commands:
+- az_peering_received-route_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering received-route.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/registered-asn.yml b/2017-03-09-profile/docs-ref-autogen/peering/registered-asn.yml
new file mode 100644
index 0000000000..4e883dd2fb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/registered-asn.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_registered-asn
+name: az peering registered-asn
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering registered-asn** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering registered-asn.
+description: ''
+directCommands:
+- uid: az_peering_registered-asn_create
+  name: az peering registered-asn create
+  summary: Creates a new registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn create --peering-name
+                                     --registered-asn-name
+                                     --resource-group
+                                     [--asn]
+  examples:
+  - summary: Create or update a registered ASN for the peering
+    syntax: az peering registered-asn create --peering-name "peeringName" --asn 65000 --registered-asn-name "registeredAsnName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: The customer's ASN from which traffic originates.
+    description: ''
+- uid: az_peering_registered-asn_delete
+  name: az peering registered-asn delete
+  summary: Deletes an existing registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn delete --peering-name
+                                     --registered-asn-name
+                                     --resource-group
+  examples:
+  - summary: Deletes a registered ASN associated with the peering
+    syntax: az peering registered-asn delete --peering-name "peeringName" --registered-asn-name "registeredAsnName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the registered ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-asn_list
+  name: az peering registered-asn list
+  summary: Lists all registered ASNs under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn list --peering-name
+                                   --resource-group
+  examples:
+  - summary: List all the registered ASNs associated with the peering
+    syntax: az peering registered-asn list --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-asn_show
+  name: az peering registered-asn show
+  summary: Gets an existing registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn show --peering-name
+                                   --registered-asn-name
+                                   --resource-group
+  examples:
+  - summary: Get a registered ASN associated with the peering
+    syntax: az peering registered-asn show --peering-name "peeringName" --registered-asn-name "registeredAsnName0" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the registered ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-asn_update
+  name: az peering registered-asn update
+  summary: Creates a new registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn update --peering-name
+                                     --registered-asn-name
+                                     --resource-group
+                                     [--asn]
+  examples:
+  - summary: Create or update a registered ASN for the peering
+    syntax: az peering registered-asn update --peering-name "peeringName" --asn 65000 --registered-asn-name "registeredAsnName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: The customer's ASN from which traffic originates.
+    description: ''
+commands:
+- az_peering_registered-asn_create
+- az_peering_registered-asn_delete
+- az_peering_registered-asn_list
+- az_peering_registered-asn_show
+- az_peering_registered-asn_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering registered-asn.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/registered-prefix.yml b/2017-03-09-profile/docs-ref-autogen/peering/registered-prefix.yml
new file mode 100644
index 0000000000..09aaeda6d1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/registered-prefix.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_registered-prefix
+name: az peering registered-prefix
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering registered-prefix** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering registered-prefix.
+description: ''
+directCommands:
+- uid: az_peering_registered-prefix_create
+  name: az peering registered-prefix create
+  summary: Creates a new registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix create --peering-name
+                                        --registered-prefix-name
+                                        --resource-group
+                                        [--prefix]
+  examples:
+  - summary: Create or update a registered prefix for the peering
+    syntax: az peering registered-prefix create --peering-name "peeringName" --prefix "10.22.20.0/24" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --prefix
+    summary: The customer's prefix from which traffic originates.
+    description: ''
+- uid: az_peering_registered-prefix_delete
+  name: az peering registered-prefix delete
+  summary: Deletes an existing registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix delete --peering-name
+                                        --registered-prefix-name
+                                        --resource-group
+  examples:
+  - summary: Deletes a registered prefix associated with the peering
+    syntax: az peering registered-prefix delete --peering-name "peeringName" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-prefix_list
+  name: az peering registered-prefix list
+  summary: Lists all registered prefixes under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix list --peering-name
+                                      --resource-group
+  examples:
+  - summary: List all the registered prefixes associated with the peering
+    syntax: az peering registered-prefix list --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-prefix_show
+  name: az peering registered-prefix show
+  summary: Gets an existing registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix show --peering-name
+                                      --registered-prefix-name
+                                      --resource-group
+  examples:
+  - summary: Get a registered prefix associated with the peering
+    syntax: az peering registered-prefix show --peering-name "peeringName" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-prefix_update
+  name: az peering registered-prefix update
+  summary: Creates a new registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix update --peering-name
+                                        --registered-prefix-name
+                                        --resource-group
+                                        [--prefix]
+  examples:
+  - summary: Create or update a registered prefix for the peering
+    syntax: az peering registered-prefix update --peering-name "peeringName" --prefix "10.22.20.0/24" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --prefix
+    summary: The customer's prefix from which traffic originates.
+    description: ''
+commands:
+- az_peering_registered-prefix_create
+- az_peering_registered-prefix_delete
+- az_peering_registered-prefix_list
+- az_peering_registered-prefix_show
+- az_peering_registered-prefix_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering registered-prefix.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/service.yml b/2017-03-09-profile/docs-ref-autogen/peering/service.yml
new file mode 100644
index 0000000000..1a2f668727
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/service.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service
+name: az peering service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service.
+description: ''
+directCommands:
+- uid: az_peering_service_create
+  name: az peering service create
+  summary: Creates a new peering service or updates an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service create --location
+                              --peering-service-name
+                              --resource-group
+                              [--peering-service-location]
+                              [--peering-service-provider]
+                              [--sku]
+                              [--tags]
+  examples:
+  - summary: Create a  peering service
+    syntax: az peering service create --location "eastus" --peering-service-location "state1" --peering-service-provider "serviceProvider1" --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --peering-service-location
+    summary: The PeeringServiceLocation of the Customer.
+    description: ''
+  - name: --peering-service-provider
+    summary: The MAPS Provider Name.
+    description: ''
+  - name: --sku
+    summary: 'The SKU that defines the type of the peering service. Expect value: name=xx.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_peering_service_delete
+  name: az peering service delete
+  summary: Deletes an existing peering service with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service delete --peering-service-name
+                              --resource-group
+  examples:
+  - summary: Delete a peering service
+    syntax: az peering service delete --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_list
+  name: az peering service list
+  summary: Lists all of the peerings under the given subscription.
+  description: ''
+  syntax: az peering service list [--resource-group]
+  examples:
+  - summary: List peering services in a resource group
+    syntax: az peering service list --resource-group "rgName"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_show
+  name: az peering service show
+  summary: Gets an existing peering service with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service show --peering-service-name
+                            --resource-group
+  examples:
+  - summary: Get a peering service
+    syntax: az peering service show --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_update
+  name: az peering service update
+  summary: Updates tags for a peering service with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service update --peering-service-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Update peering service tags
+    syntax: az peering service update --peering-service-name "peeringServiceName" --resource-group "rgName" --tags tags={"tag0":"value0","tag1":"value1"}
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_peering_service_country
+- az_peering_service_country_list
+- az_peering_service_create
+- az_peering_service_delete
+- az_peering_service_list
+- az_peering_service_location
+- az_peering_service_location_list
+- az_peering_service_prefix
+- az_peering_service_prefix_create
+- az_peering_service_prefix_delete
+- az_peering_service_prefix_list
+- az_peering_service_prefix_show
+- az_peering_service_prefix_update
+- az_peering_service_provider
+- az_peering_service_provider_list
+- az_peering_service_show
+- az_peering_service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/service/country.yml b/2017-03-09-profile/docs-ref-autogen/peering/service/country.yml
new file mode 100644
index 0000000000..27e3f96115
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/service/country.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_country
+name: az peering service country
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service country** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service country.
+description: ''
+directCommands:
+- uid: az_peering_service_country_list
+  name: az peering service country list
+  summary: Lists all of the available countries for peering service.
+  description: ''
+  syntax: az peering service country list
+  examples:
+  - summary: List peering service countries
+    syntax: az peering service country list
+commands:
+- az_peering_service_country_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service country.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/service/location.yml b/2017-03-09-profile/docs-ref-autogen/peering/service/location.yml
new file mode 100644
index 0000000000..5ab435b6f4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/service/location.yml
@@ -0,0 +1,41 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_location
+name: az peering service location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service location.
+description: ''
+directCommands:
+- uid: az_peering_service_location_list
+  name: az peering service location list
+  summary: Lists all of the available locations for peering service.
+  description: ''
+  syntax: az peering service location list [--country]
+  examples:
+  - summary: List peering service locations
+    syntax: az peering service location list
+  optionalParameters:
+  - name: --country
+    summary: The country of interest, in which the locations are to be present.
+    description: ''
+commands:
+- az_peering_service_location_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service location.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/service/prefix.yml b/2017-03-09-profile/docs-ref-autogen/peering/service/prefix.yml
new file mode 100644
index 0000000000..0e8d1e6695
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/service/prefix.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_prefix
+name: az peering service prefix
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service prefix** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service prefix.
+description: ''
+directCommands:
+- uid: az_peering_service_prefix_create
+  name: az peering service prefix create
+  summary: Creates a new prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix create --peering-service-name
+                                     --prefix-name
+                                     --resource-group
+                                     [--peering-service-prefix-key]
+                                     [--prefix]
+  examples:
+  - summary: Create or update a prefix for the peering service
+    syntax: az peering service prefix create --peering-service-name "peeringServiceName" --peering-service-prefix-key "00000000-0000-0000-0000-000000000000" --prefix "192.168.1.0/24" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --peering-service-prefix-key
+    summary: The peering service prefix key.
+    description: ''
+  - name: --prefix
+    summary: The prefix from which your traffic originates.
+    description: ''
+- uid: az_peering_service_prefix_delete
+  name: az peering service prefix delete
+  summary: Deletes an existing prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix delete --peering-service-name
+                                     --prefix-name
+                                     --resource-group
+  examples:
+  - summary: Delete a prefix associated with the peering service
+    syntax: az peering service prefix delete --peering-service-name "peeringServiceName" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_prefix_list
+  name: az peering service prefix list
+  summary: Lists all prefixes under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix list --peering-service-name
+                                   --resource-group
+                                   [--expand]
+  examples:
+  - summary: List all the prefixes associated with the peering service
+    syntax: az peering service prefix list --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The properties to be expanded.
+    description: ''
+- uid: az_peering_service_prefix_show
+  name: az peering service prefix show
+  summary: Gets an existing prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix show --peering-service-name
+                                   --prefix-name
+                                   --resource-group
+                                   [--expand]
+  examples:
+  - summary: Get a prefix associated with the peering service
+    syntax: az peering service prefix show --peering-service-name "peeringServiceName" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The properties to be expanded.
+    description: ''
+- uid: az_peering_service_prefix_update
+  name: az peering service prefix update
+  summary: Creates a new prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix update --peering-service-name
+                                     --prefix-name
+                                     --resource-group
+                                     [--peering-service-prefix-key]
+                                     [--prefix]
+  examples:
+  - summary: Create or update a prefix for the peering service
+    syntax: az peering service prefix update --peering-service-name "peeringServiceName" --peering-service-prefix-key "00000000-0000-0000-0000-000000000000" --prefix "192.168.1.0/24" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --peering-service-prefix-key
+    summary: The peering service prefix key.
+    description: ''
+  - name: --prefix
+    summary: The prefix from which your traffic originates.
+    description: ''
+commands:
+- az_peering_service_prefix_create
+- az_peering_service_prefix_delete
+- az_peering_service_prefix_list
+- az_peering_service_prefix_show
+- az_peering_service_prefix_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service prefix.
diff --git a/2017-03-09-profile/docs-ref-autogen/peering/service/provider.yml b/2017-03-09-profile/docs-ref-autogen/peering/service/provider.yml
new file mode 100644
index 0000000000..660cb08a99
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/peering/service/provider.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_provider
+name: az peering service provider
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service provider** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service provider.
+description: ''
+directCommands:
+- uid: az_peering_service_provider_list
+  name: az peering service provider list
+  summary: Lists all of the available peering service locations for the specified kind of peering.
+  description: ''
+  syntax: az peering service provider list
+  examples:
+  - summary: List peering service providers
+    syntax: az peering service provider list
+commands:
+- az_peering_service_provider_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service provider.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines.yml b/2017-03-09-profile/docs-ref-autogen/pipelines.yml
index 7c1c0caf96..63ec8f1a9c 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines.yml
@@ -1,62 +1,62 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_create
-  - az_pipelines_delete
-  - az_pipelines_list
-  - az_pipelines_run
-  - az_pipelines_show
-  - az_pipelines_update
+### YamlMime:AzureCLIGroup
+uid: az_pipelines
+name: az pipelines
+summary: Manage Azure Pipelines.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_pipelines_create
   name: az pipelines create
   summary: Create a new Azure Pipeline (YAML based).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az pipelines create --name
+                        [--branch]
+                        [--description]
+                        [--detect {false, true}]
+                        [--folder-path]
+                        [--org]
+                        [--project]
+                        [--queue-id]
+                        [--repository]
+                        [--repository-type {github, tfsgit}]
+                        [--service-connection]
+                        [--skip-first-run {false, true}]
+                        [--subscription]
+                        [--yaml-path]
   examples:
   - summary: Create an Azure Pipeline from local checkout repository context
-    syntax:
-      content: >-
-        Repository name/url (--repository), type (--repository-type) and branch name (--branch) will be detected from the local git repository
+    syntax: >-
+      Repository name/url (--repository), type (--repository-type) and branch name (--branch) will be detected from the local git repository
 
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
   - summary: Create an Azure Pipeline for a repository hosted on Github using clone url
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+    syntax: >-
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository https://github.com/SampleOrg/SampleRepo --branch master
+      --repository https://github.com/SampleOrg/SampleRepo --branch master
   - summary: Create an Azure Pipeline for a repository hosted on Github organization SampleOrg, repository name SampleRepo
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+    syntax: >-
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository SampleOrg/SampleRepoName --branch master --repository-type github
+      --repository SampleOrg/SampleRepoName --branch master --repository-type github
   - summary: Create an Azure Pipeline for a repository hosted in a Azure Repo in the same project
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+    syntax: >-
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository SampleRepoName --branch master --repository-type tfsgit
+      --repository SampleRepoName --branch master --repository-type tfsgit
   - summary: Create an Azure Pipeline for a repository with the pipeline yaml already checked in into the repository
-    syntax:
-      content: >-
-        Service connection required for non Azure Repos can be optionally provided in the command to run it non interatively
+    syntax: >-
+      Service connection required for non Azure Repos can be optionally provided in the command to run it non interatively
 
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository https://github.com/SampleOrg/SampleRepo --branch master --yml-path azure-pipelines.yml [--service-connection SERVICE_CONNECTION]
-  parameters:
+      --repository https://github.com/SampleOrg/SampleRepo --branch master --yml-path azure-pipelines.yml [--service-connection SERVICE_CONNECTION]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new pipeline.
     description: ''
+  optionalParameters:
   - name: --branch
     summary: Branch name for which the pipeline will be configured. If omitted, it will be auto-detected from local repository.
     description: ''
@@ -71,7 +71,7 @@ items:
     summary: Path of the folder where the pipeline needs to be created. Default is root folder. e.g. "user1/test_pipelines".
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -93,46 +93,62 @@ items:
     parameterValueGroup: false, true
     summary: Specify this flag to prevent the first run being triggered by the command. Command will return a pipeline if run is skipped else it will output a pipeline run.
     description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo (if yaml is already present in the repo).
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yaml-path --yml-path
+    summary: Path of the pipelines yaml file in the repo (if yaml is already present in the repo).
+    description: ''
 - uid: az_pipelines_delete
   name: az pipelines delete
   summary: Delete a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines delete --id
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--subscription]
+                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pipeline.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_pipelines_list
   name: az pipelines list
   summary: List pipelines.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines list [--detect {false, true}]
+                      [--folder-path]
+                      [--name]
+                      [--org]
+                      [--project]
+                      [--query-examples]
+                      [--query-order {ModifiedAsc, ModifiedDesc, NameAsc, NameDesc, None}]
+                      [--repository]
+                      [--repository-type {bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol}]
+                      [--subscription]
+                      [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -144,11 +160,14 @@ items:
     summary: 'Limit results to pipelines with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     parameterValueGroup: ModifiedAsc, ModifiedDesc, NameAsc, NameDesc, None
     summary: Order of the results.
@@ -160,19 +179,29 @@ items:
     parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
     summary: Limit results to pipelines associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
     description: ''
-  - name: --top
-    summary: Maximum number of pipelines to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of pipelines to list.
+    description: ''
 - uid: az_pipelines_run
   name: az pipelines run
   summary: Queue (run) a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines run [--branch]
+                     [--commit-id]
+                     [--detect {false, true}]
+                     [--folder-path]
+                     [--id]
+                     [--name]
+                     [--open]
+                     [--org]
+                     [--project]
+                     [--subscription]
+                     [--variables]
+  optionalParameters:
   - name: --branch
     summary: 'Name of the branch on which the pipeline run is to be queued. Example: refs/heads/master or master or refs/pull/1/merge.'
     description: ''
@@ -196,24 +225,32 @@ items:
     summary: Open the pipeline results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --variables
+    summary: Space separated "name=value" pairs for the variables you would like to set.
+    description: ''
 - uid: az_pipelines_show
   name: az pipelines show
   summary: Get the details of a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines show [--detect {false, true}]
+                      [--folder-path]
+                      [--id]
+                      [--name]
+                      [--open]
+                      [--org]
+                      [--project]
+                      [--query-examples]
+                      [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -231,11 +268,14 @@ items:
     summary: Open the pipeline summary page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -243,9 +283,20 @@ items:
   name: az pipelines update
   summary: Update a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines update [--branch]
+                        [--description]
+                        [--detect {false, true}]
+                        [--id]
+                        [--name]
+                        [--new-folder-path]
+                        [--new-name]
+                        [--org]
+                        [--project]
+                        [--queue-id]
+                        [--subscription]
+                        [--yaml-path]
+  optionalParameters:
   - name: --branch
     summary: Branch name for which the pipeline will be configured.
     description: ''
@@ -269,7 +320,7 @@ items:
     summary: New updated name of the pipeline.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -277,208 +328,78 @@ items:
   - name: --queue-id
     summary: Queue id of the agent pool where the pipeline needs to run.
     description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yaml-path --yml-path
+    summary: Path of the pipelines yaml file in the repo.
+    description: ''
 commands:
-- uid: az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-- uid: az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-- uid: az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-- uid: az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-- uid: az_pipelines_create
-  name: az pipelines create
-  summary: Create a new Azure Pipeline (YAML based).
-- uid: az_pipelines_delete
-  name: az pipelines delete
-  summary: Delete a pipeline.
-- uid: az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-- uid: az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-- uid: az_pipelines_list
-  name: az pipelines list
-  summary: List pipelines.
-- uid: az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-- uid: az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-- uid: az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-- uid: az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-- uid: az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-- uid: az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-- uid: az_pipelines_run
-  name: az pipelines run
-  summary: Queue (run) a pipeline.
-- uid: az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-- uid: az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-- uid: az_pipelines_show
-  name: az pipelines show
-  summary: Get the details of a pipeline.
-- uid: az_pipelines_update
-  name: az pipelines update
-  summary: Update a pipeline.
-- uid: az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-- uid: az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-- uid: az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-- uid: az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
+- az_pipelines_agent
+- az_pipelines_agent_list
+- az_pipelines_agent_show
+- az_pipelines_build
+- az_pipelines_build_definition
+- az_pipelines_build_definition_list
+- az_pipelines_build_definition_show
+- az_pipelines_build_list
+- az_pipelines_build_queue
+- az_pipelines_build_show
+- az_pipelines_build_tag
+- az_pipelines_build_tag_add
+- az_pipelines_build_tag_delete
+- az_pipelines_build_tag_list
+- az_pipelines_create
+- az_pipelines_delete
+- az_pipelines_folder
+- az_pipelines_folder_create
+- az_pipelines_folder_delete
+- az_pipelines_folder_list
+- az_pipelines_folder_update
+- az_pipelines_list
+- az_pipelines_pool
+- az_pipelines_pool_list
+- az_pipelines_pool_show
+- az_pipelines_queue
+- az_pipelines_queue_list
+- az_pipelines_queue_show
+- az_pipelines_release
+- az_pipelines_release_create
+- az_pipelines_release_definition
+- az_pipelines_release_definition_list
+- az_pipelines_release_definition_show
+- az_pipelines_release_list
+- az_pipelines_release_show
+- az_pipelines_run
+- az_pipelines_runs
+- az_pipelines_runs_artifact
+- az_pipelines_runs_artifact_download
+- az_pipelines_runs_artifact_list
+- az_pipelines_runs_artifact_upload
+- az_pipelines_runs_list
+- az_pipelines_runs_show
+- az_pipelines_runs_tag
+- az_pipelines_runs_tag_add
+- az_pipelines_runs_tag_delete
+- az_pipelines_runs_tag_list
+- az_pipelines_show
+- az_pipelines_update
+- az_pipelines_variable
+- az_pipelines_variable_create
+- az_pipelines_variable_delete
+- az_pipelines_variable_list
+- az_pipelines_variable_update
+- az_pipelines_variable-group
+- az_pipelines_variable-group_create
+- az_pipelines_variable-group_delete
+- az_pipelines_variable-group_list
+- az_pipelines_variable-group_show
+- az_pipelines_variable-group_update
+- az_pipelines_variable-group_variable
+- az_pipelines_variable-group_variable_create
+- az_pipelines_variable-group_variable_delete
+- az_pipelines_variable-group_variable_list
+- az_pipelines_variable-group_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -494,4 +415,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/agent.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/agent.yml
index c7d5618f35..e8651264c7 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/agent.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/agent.yml
@@ -1,25 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_agent_list
-  - az_pipelines_agent_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_agent
+name: az pipelines agent
+summary: Manage agents.
+description: ''
+directCommands:
 - uid: az_pipelines_agent_list
   name: az pipelines agent list
   summary: Get a list of agents in a pool.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines agent list --pool-id
+                            [--agent-name]
+                            [--demands]
+                            [--detect {false, true}]
+                            [--include-assigned-request {false, true}]
+                            [--include-capabilities {false, true}]
+                            [--include-last-completed-request {false, true}]
+                            [--org]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --pool-id
     summary: The agent pool containing the agents.
     description: ''
+  optionalParameters:
   - name: --agent-name
     summary: Filter on agent name.
     description: ''
@@ -43,7 +48,10 @@ items:
     summary: Whether to include details about the agents' most recent completed work.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -52,9 +60,17 @@ items:
   name: az pipelines agent show
   summary: Show agent details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines agent show --agent-id
+                            --pool-id
+                            [--detect {false, true}]
+                            [--include-assigned-request {false, true}]
+                            [--include-capabilities {false, true}]
+                            [--include-last-completed-request {false, true}]
+                            [--org]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --agent-id --id
     summary: The agent ID to get information about.
@@ -63,6 +79,7 @@ items:
     name: --pool-id
     summary: The agent pool containing the agent.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -80,18 +97,17 @@ items:
     summary: Whether to include details about the agents' most recent completed work.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
+- az_pipelines_agent_list
+- az_pipelines_agent_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -107,4 +123,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agents.
+metadata:
+  description: Manage agents.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/build.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/build.yml
index 97f403fc19..5fbf0e659b 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/build.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/build.yml
@@ -1,22 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_build_list
-  - az_pipelines_build_queue
-  - az_pipelines_build_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_build
+name: az pipelines build
+summary: Manage builds.
+description: ''
+directCommands:
 - uid: az_pipelines_build_list
   name: az pipelines build list
   summary: List build results.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build list [--branch]
+                            [--definition-ids]
+                            [--detect {false, true}]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--reason {all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset}]
+                            [--requested-for]
+                            [--result {canceled, failed, none, partiallySucceeded, succeeded}]
+                            [--status {all, cancelling, completed, inProgress, none, notStarted, postponed}]
+                            [--subscription]
+                            [--tags]
+                            [--top]
+  optionalParameters:
   - name: --branch
     summary: Filter by builds for this branch.
     description: ''
@@ -28,11 +34,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --reason
     parameterValueGroup: all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset
     summary: Limit to builds with this reason.
@@ -48,22 +57,32 @@ items:
     parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
     summary: Limit to builds with this status.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: Limit to builds with each of the specified tags. Space separated.
     description: ''
   - name: --top
     summary: Maximum number of builds to list.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_pipelines_build_queue
   name: az pipelines build queue
   summary: Request (queue) a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build queue [--branch]
+                             [--commit-id]
+                             [--definition-id]
+                             [--definition-name]
+                             [--detect {false, true}]
+                             [--open]
+                             [--org]
+                             [--project]
+                             [--queue-id]
+                             [--subscription]
+                             [--variables]
+  optionalParameters:
   - name: --branch
     summary: 'Branch to build. Required if there is not a default branch set up on the definition. Example: refs/heads/master or master or refs/pull/1/merge.'
     description: ''
@@ -84,7 +103,7 @@ items:
     summary: Open the build results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -92,23 +111,30 @@ items:
   - name: --queue-id
     summary: Queue Id of the pool that will be used to queue the build.
     description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --variables
+    summary: Space separated "name=value" pairs for the variables you would like to set.
+    description: ''
 - uid: az_pipelines_build_show
   name: az pipelines build show
   summary: Get the details of a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build show --id
+                            [--detect {false, true}]
+                            [--open]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the build.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -117,45 +143,28 @@ items:
     summary: Open the build results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
+- az_pipelines_build_definition
+- az_pipelines_build_definition_list
+- az_pipelines_build_definition_show
+- az_pipelines_build_list
+- az_pipelines_build_queue
+- az_pipelines_build_show
+- az_pipelines_build_tag
+- az_pipelines_build_tag_add
+- az_pipelines_build_tag_delete
+- az_pipelines_build_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -171,4 +180,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage builds.
+metadata:
+  description: Manage builds.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/build/definition.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/build/definition.yml
index cd62e774ba..4e5f264372 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/build/definition.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/build/definition.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_build_definition_list
-  - az_pipelines_build_definition_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_build_definition
+name: az pipelines build definition
+summary: Manage build definitions.
+description: ''
+directCommands:
 - uid: az_pipelines_build_definition_list
   name: az pipelines build definition list
   summary: List build definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build definition list [--detect {false, true}]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--query-examples]
+                                       [--repository]
+                                       [--repository-type {bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol}]
+                                       [--subscription]
+                                       [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -24,11 +27,14 @@ items:
     summary: 'Limit results to definitions with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository
     summary: Limit results to definitions associated with this repository.
     description: ''
@@ -36,19 +42,26 @@ items:
     parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
     summary: Limit results to definitions associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
     description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of definitions to list.
+    description: ''
 - uid: az_pipelines_build_definition_show
   name: az pipelines build definition show
   summary: Get the details of a build definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build definition show [--detect {false, true}]
+                                       [--id]
+                                       [--name]
+                                       [--open]
+                                       [--org]
+                                       [--project]
+                                       [--query-examples]
+                                       [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -63,21 +76,20 @@ items:
     summary: Open the definition summary page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
+- az_pipelines_build_definition_list
+- az_pipelines_build_definition_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -93,4 +105,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build definitions.
+metadata:
+  description: Manage build definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/build/tag.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/build/tag.yml
index 906776a4de..7e57d98962 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/build/tag.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/build/tag.yml
@@ -1,22 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_build_tag_add
-  - az_pipelines_build_tag_delete
-  - az_pipelines_build_tag_list
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_build_tag
+name: az pipelines build tag
+summary: Manage build tags.
+description: ''
+directCommands:
 - uid: az_pipelines_build_tag_add
   name: az pipelines build tag add
   summary: Add tag(s) for a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build tag add --build-id
+                               --tags
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --build-id
     summary: ID of the build.
@@ -25,12 +24,13 @@ items:
     name: --tags
     summary: Tag(s) to be added to the build. [Comma seperated values].
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -42,9 +42,14 @@ items:
   name: az pipelines build tag delete
   summary: Delete a build tag.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build tag delete --build-id
+                                  --tag
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --build-id
     summary: ID of the build.
@@ -53,12 +58,13 @@ items:
     name: --tag
     summary: Tag to be deleted from the build.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -70,36 +76,39 @@ items:
   name: az pipelines build tag list
   summary: Get tags for a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build tag list --build-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --build-id
     summary: ID of the build.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
+- az_pipelines_build_tag_add
+- az_pipelines_build_tag_delete
+- az_pipelines_build_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -115,4 +124,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build tags.
+metadata:
+  description: Manage build tags.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/folder.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/folder.yml
index b673c523c4..20f6aac0d6 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/folder.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/folder.yml
@@ -1,27 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_folder_create
-  - az_pipelines_folder_delete
-  - az_pipelines_folder_list
-  - az_pipelines_folder_update
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_folder
+name: az pipelines folder
+summary: Manage folders for organizing pipelines.
+description: ''
+directCommands:
 - uid: az_pipelines_folder_create
   name: az pipelines folder create
   summary: Create a folder.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder create --path
+                               [--description]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Full path of the folder.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the folder.
     description: ''
@@ -30,7 +29,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -42,42 +41,54 @@ items:
   name: az pipelines folder delete
   summary: Delete a folder.
   description: This will delete all pipelines in the folder.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder delete --path
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Full path of the folder.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_pipelines_folder_list
   name: az pipelines folder list
   summary: List all folders.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder list [--detect {false, true}]
+                             [--org]
+                             [--path]
+                             [--project]
+                             [--query-examples]
+                             [--query-order {Asc, Desc, None}]
+                             [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Full path of the folder.
@@ -85,6 +96,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     parameterValueGroup: Asc, Desc, None
     summary: Order in which folders are returned.
@@ -96,13 +110,20 @@ items:
   name: az pipelines folder update
   summary: Update a folder name or description.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder update --path
+                               [--detect {false, true}]
+                               [--new-description]
+                               [--new-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Full path of the folder.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -114,7 +135,7 @@ items:
     summary: New full path of the folder.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -123,18 +144,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
+- az_pipelines_folder_create
+- az_pipelines_folder_delete
+- az_pipelines_folder_list
+- az_pipelines_folder_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -150,4 +163,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage folders for organizing pipelines.
+metadata:
+  description: Manage folders for organizing pipelines.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/pool.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/pool.yml
index 9e21723417..53472b2d4b 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/pool.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/pool.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_pool_list
-  - az_pipelines_pool_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_pool
+name: az pipelines pool
+summary: Manage agent pools.
+description: ''
+directCommands:
 - uid: az_pipelines_pool_list
   name: az pipelines pool list
   summary: List agent pools.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines pool list [--action {manage, none, use}]
+                           [--detect {false, true}]
+                           [--org]
+                           [--pool-name]
+                           [--pool-type {automation, deployment}]
+                           [--query-examples]
+                           [--subscription]
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter the list with user action permitted.
@@ -25,7 +26,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pool-name
     summary: Filter the list with matching pool name.
@@ -34,6 +35,9 @@ items:
     parameterValueGroup: automation, deployment
     summary: Filter the list with type of pool.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -41,13 +45,19 @@ items:
   name: az pipelines pool show
   summary: Show agent pool details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines pool show --id
+                           [--action {manage, none, use}]
+                           [--detect {false, true}]
+                           [--org]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --pool-id
     summary: Id of the pool to list the details.
     description: ''
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter the list with user action permitted.
@@ -57,18 +67,17 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
+- az_pipelines_pool_list
+- az_pipelines_pool_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -84,4 +93,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent pools.
+metadata:
+  description: Manage agent pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/queue.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/queue.yml
index d9c5a7a257..000178013e 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/queue.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/queue.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_queue_list
-  - az_pipelines_queue_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_queue
+name: az pipelines queue
+summary: Manage agent queues.
+description: ''
+directCommands:
 - uid: az_pipelines_queue_list
   name: az pipelines queue list
   summary: List agent queues.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines queue list [--action {manage, none, use}]
+                            [--detect {false, true}]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--queue-name]
+                            [--subscription]
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter by whether the calling user has use or manage permissions.
@@ -25,11 +26,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --queue-name
     summary: Filter the list with matching queue name regex. e.g. \*ubuntu\* for queue with name 'Hosted Ubuntu 1604'.
     description: ''
@@ -40,13 +44,20 @@ items:
   name: az pipelines queue show
   summary: Show details of agent queue.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines queue show --id
+                            [--action {manage, none, use}]
+                            [--detect {false, true}]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --queue-id
     summary: Id of the agent queue to get information about.
     description: ''
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter by whether the calling user has use or manage permissions.
@@ -56,21 +67,20 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
+- az_pipelines_queue_list
+- az_pipelines_queue_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -86,4 +96,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent queues.
+metadata:
+  description: Manage agent queues.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/release.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/release.yml
index 3abf5e02f3..c695830fe7 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/release.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/release.yml
@@ -1,22 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_release_create
-  - az_pipelines_release_list
-  - az_pipelines_release_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_release
+name: az pipelines release
+summary: Manage releases.
+description: ''
+directCommands:
 - uid: az_pipelines_release_create
   name: az pipelines release create
   summary: Request (create) a release.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release create [--artifact-metadata-list]
+                                [--definition-id]
+                                [--definition-name]
+                                [--description]
+                                [--detect {false, true}]
+                                [--open]
+                                [--org]
+                                [--project]
+                                [--subscription]
+  optionalParameters:
   - name: --artifact-metadata-list
     summary: Space separated "alias=version_id" pairs.
     description: ''
@@ -37,7 +39,7 @@ items:
     summary: Open the release results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -49,9 +51,17 @@ items:
   name: az pipelines release list
   summary: List release results.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release list [--definition-id]
+                              [--detect {false, true}]
+                              [--org]
+                              [--project]
+                              [--query-examples]
+                              [--source-branch]
+                              [--status]
+                              [--subscription]
+                              [--top]
+  optionalParameters:
   - name: --definition-id
     summary: ID of definition to list releases for.
     description: ''
@@ -60,34 +70,44 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --source-branch
     summary: Filter releases for this branch.
     description: ''
   - name: --status
     summary: Limit to releases with this status.
     description: ''
-  - name: --top
-    summary: Maximum number of releases to list. Default is 50.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of releases to list. Default is 50.
+    description: ''
 - uid: az_pipelines_release_show
   name: az pipelines release show
   summary: Get the details of a release.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release show --id
+                              [--detect {false, true}]
+                              [--open]
+                              [--org]
+                              [--project]
+                              [--query-examples]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the release.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -96,33 +116,24 @@ items:
     summary: Open the release results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
+- az_pipelines_release_create
+- az_pipelines_release_definition
+- az_pipelines_release_definition_list
+- az_pipelines_release_definition_show
+- az_pipelines_release_list
+- az_pipelines_release_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -138,4 +149,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage releases.
+metadata:
+  description: Manage releases.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/release/definition.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/release/definition.yml
index 9aa1222374..a73132637c 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/release/definition.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/release/definition.yml
@@ -1,23 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_release_definition_list
-  - az_pipelines_release_definition_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_release_definition
+name: az pipelines release definition
+summary: Manage release definitions.
+description: ''
+directCommands:
 - uid: az_pipelines_release_definition_list
   name: az pipelines release definition list
   summary: List release definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release definition list [--artifact-source-id]
+                                         [--artifact-type {build, externaltfsbuild, git, github, jenkins, tfvc}]
+                                         [--detect {false, true}]
+                                         [--name]
+                                         [--org]
+                                         [--project]
+                                         [--query-examples]
+                                         [--subscription]
+                                         [--top]
+  optionalParameters:
   - name: --artifact-source-id
-    summary: Limit results to definitions associated with this artifact_source_id. e.g. For build it would be {projectGuid}:{BuildDefinitionId}, for Jenkins it would be {JenkinsConnectionId}:{JenkinsDefinitionId}, for TfsOnPrem it would be {TfsOnPremConnectionId}:{ProjectName}:{TfsOnPremDefinitionId}. For third-party artifacts e.g. TeamCity, BitBucket you may refer 'uniqueSourceIdentifier' inside vss-extension.json at <a href="https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions">https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions</a>.
+    summary: Limit results to definitions associated with this artifact_source_id. e.g. For build it would be {projectGuid}:{BuildDefinitionId}, for Jenkins it would be {JenkinsConnectionId}:{JenkinsDefinitionId}, for TfsOnPrem it would be {TfsOnPremConnectionId}:{ProjectName}:{TfsOnPremDefinitionId}. For third-party artifacts e.g. TeamCity, BitBucket you may refer 'uniqueSourceIdentifier' inside vss-extension.json at https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions.
     description: ''
   - name: --artifact-type
     parameterValueGroup: build, externaltfsbuild, git, github, jenkins, tfvc
@@ -31,24 +34,34 @@ items:
     summary: 'Limit results to definitions with this name or contains this name. Example: "FabCI".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of definitions to list.
+    description: ''
 - uid: az_pipelines_release_definition_show
   name: az pipelines release definition show
   summary: Get the details of a release definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release definition show [--detect {false, true}]
+                                         [--id]
+                                         [--name]
+                                         [--open]
+                                         [--org]
+                                         [--project]
+                                         [--query-examples]
+                                         [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -63,21 +76,20 @@ items:
     summary: Open the definition summary page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
+- az_pipelines_release_definition_list
+- az_pipelines_release_definition_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -93,4 +105,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage release definitions.
+metadata:
+  description: Manage release definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/runs.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/runs.yml
index 2c0926795f..e30318d054 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/runs.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/runs.yml
@@ -1,21 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_runs_list
-  - az_pipelines_runs_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_runs
+name: az pipelines runs
+summary: Manage pipeline runs.
+description: ''
+directCommands:
 - uid: az_pipelines_runs_list
   name: az pipelines runs list
   summary: List the pipeline runs in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs list [--branch]
+                           [--detect {false, true}]
+                           [--org]
+                           [--pipeline-ids]
+                           [--project]
+                           [--query-examples]
+                           [--query-order {FinishTimeAsc, FinishTimeDesc, QueueTimeAsc, QueueTimeDesc, StartTimeAsc, StartTimeDesc}]
+                           [--reason {all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset}]
+                           [--requested-for]
+                           [--result {canceled, failed, none, partiallySucceeded, succeeded}]
+                           [--status {all, cancelling, completed, inProgress, none, notStarted, postponed}]
+                           [--subscription]
+                           [--tags]
+                           [--top]
+  optionalParameters:
   - name: --branch
     summary: Filter by builds for this branch.
     description: ''
@@ -24,7 +32,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-ids
     summary: IDs (space separated) of definitions to list builds for.
@@ -32,6 +40,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     parameterValueGroup: FinishTimeAsc, FinishTimeDesc, QueueTimeAsc, QueueTimeDesc, StartTimeAsc, StartTimeDesc
     summary: Order of pipeline runs.
@@ -51,26 +62,33 @@ items:
     parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
     summary: Limit to builds with this status.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: Limit to builds with each of the specified tags. Space separated.
     description: ''
   - name: --top
     summary: Maximum number of builds to list.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_pipelines_runs_show
   name: az pipelines runs show
   summary: Show details of a pipeline run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs show --id
+                           [--detect {false, true}]
+                           [--open]
+                           [--org]
+                           [--project]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pipeline run.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -79,45 +97,28 @@ items:
     summary: Open the build results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
+- az_pipelines_runs_artifact
+- az_pipelines_runs_artifact_download
+- az_pipelines_runs_artifact_list
+- az_pipelines_runs_artifact_upload
+- az_pipelines_runs_list
+- az_pipelines_runs_show
+- az_pipelines_runs_tag
+- az_pipelines_runs_tag_add
+- az_pipelines_runs_tag_delete
+- az_pipelines_runs_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -133,4 +134,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline runs.
+metadata:
+  description: Manage pipeline runs.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/runs/artifact.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/runs/artifact.yml
index 5bd7176ea3..2fca9caadb 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/runs/artifact.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/runs/artifact.yml
@@ -1,22 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_runs_artifact_download
-  - az_pipelines_runs_artifact_list
-  - az_pipelines_runs_artifact_upload
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_runs_artifact
+name: az pipelines runs artifact
+summary: Manage pipeline run artifacts.
+description: ''
+directCommands:
 - uid: az_pipelines_runs_artifact_download
   name: az pipelines runs artifact download
   summary: Download a pipeline artifact.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs artifact download --artifact-name
+                                        --path
+                                        --run-id
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--project]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --artifact-name
     summary: Name of the artifact to download.
@@ -29,12 +29,13 @@ items:
     name: --run-id
     summary: ID of the run that the artifact is associated to.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -46,23 +47,32 @@ items:
   name: az pipelines runs artifact list
   summary: List artifacts associated with a run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs artifact list --run-id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the run that the artifact is associated to.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -70,9 +80,15 @@ items:
   name: az pipelines runs artifact upload
   summary: Upload a pipeline artifact.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs artifact upload --artifact-name
+                                      --path
+                                      --run-id
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --artifact-name
     summary: Name of the artifact to upload.
@@ -85,12 +101,13 @@ items:
     name: --run-id
     summary: ID of the run that the artifact is associated to.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -99,15 +116,9 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
+- az_pipelines_runs_artifact_download
+- az_pipelines_runs_artifact_list
+- az_pipelines_runs_artifact_upload
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -123,4 +134,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run artifacts.
+metadata:
+  description: Manage pipeline run artifacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/runs/tag.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/runs/tag.yml
index 8bf44f59cd..094858d90a 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/runs/tag.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/runs/tag.yml
@@ -1,22 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_runs_tag_add
-  - az_pipelines_runs_tag_delete
-  - az_pipelines_runs_tag_list
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_runs_tag
+name: az pipelines runs tag
+summary: Manage pipeline run tags.
+description: ''
+directCommands:
 - uid: az_pipelines_runs_tag_add
   name: az pipelines runs tag add
   summary: Add tag(s) for a pipeline run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs tag add --run-id
+                              --tags
+                              [--detect {false, true}]
+                              [--org]
+                              [--project]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the pipeline run.
@@ -25,12 +24,13 @@ items:
     name: --tags
     summary: Tag(s) to be added to the pipeline run. [Comma seperated values].
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -42,9 +42,14 @@ items:
   name: az pipelines runs tag delete
   summary: Delete a pipeline run tag.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs tag delete --run-id
+                                 --tag
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the pipeline run.
@@ -53,12 +58,13 @@ items:
     name: --tag
     summary: Tag to be deleted from the pipeline run.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -70,36 +76,39 @@ items:
   name: az pipelines runs tag list
   summary: Get tags for a pipeline run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs tag list --run-id
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--query-examples]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the  pipeline run.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
+- az_pipelines_runs_tag_add
+- az_pipelines_runs_tag_delete
+- az_pipelines_runs_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -115,4 +124,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run tags.
+metadata:
+  description: Manage pipeline run tags.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group.yml
index 5c14256a36..6daf067a12 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_variable_group_create
-  - az_pipelines_variable_group_delete
-  - az_pipelines_variable_group_list
-  - az_pipelines_variable_group_show
-  - az_pipelines_variable_group_update
-- uid: az_pipelines_variable_group_create
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_variable-group
+name: az pipelines variable-group
+summary: Manage variable groups.
+description: ''
+directCommands:
+- uid: az_pipelines_variable-group_create
   name: az pipelines variable-group create
   summary: Create a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group create --name
+                                       --variables
+                                       [--authorize {false, true}]
+                                       [--description]
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable group.
@@ -27,6 +26,7 @@ items:
     name: --variables
     summary: Variables in format key=value space separated pairs. Secret variables should be managed using `az pipelines variable-group variable` commands.
     description: ''
+  optionalParameters:
   - name: --authorize
     parameterValueGroup: false, true
     summary: Whether the variable group should be accessible by all pipelines.
@@ -39,7 +39,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,40 +47,55 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_delete
+- uid: az_pipelines_variable-group_delete
   name: az pipelines variable-group delete
   summary: Delete a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group delete --group-id
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+                                       [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_pipelines_variable-group_list
   name: az pipelines variable-group list
   summary: List variable groups.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group list [--action {manage, none, use}]
+                                     [--continuation-token]
+                                     [--detect {false, true}]
+                                     [--group-name]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--query-order {Asc, Desc}]
+                                     [--subscription]
+                                     [--top]
+  optionalParameters:
   - name: --action --action-filter
     parameterValueGroup: manage, none, use
     summary: Action filter for the variable group. It specifies the action which can be performed on the variable groups.
@@ -96,57 +111,77 @@ items:
     summary: Name of the variable group. Wildcards are accepted. e.g. var_group\*.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     defaultValue: Desc
     parameterValueGroup: Asc, Desc
     summary: Gets the results in the defined order.
     description: ''
-  - name: --top
-    summary: Number of variable groups to get.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_show
+  - name: --top
+    summary: Number of variable groups to get.
+    description: ''
+- uid: az_pipelines_variable-group_show
   name: az pipelines variable-group show
   summary: Show variable group details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group show --group-id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: ID of the variable group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_update
+- uid: az_pipelines_variable-group_update
   name: az pipelines variable-group update
   summary: Update a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group update --group-id
+                                       [--authorize {false, true}]
+                                       [--description]
+                                       [--detect {false, true}]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
     description: ''
+  optionalParameters:
   - name: --authorize
     parameterValueGroup: false, true
     summary: Whether the variable group should be accessible by all pipelines.
@@ -162,7 +197,7 @@ items:
     summary: New name of the variable group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -171,36 +206,16 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
+- az_pipelines_variable-group_create
+- az_pipelines_variable-group_delete
+- az_pipelines_variable-group_list
+- az_pipelines_variable-group_show
+- az_pipelines_variable-group_update
+- az_pipelines_variable-group_variable
+- az_pipelines_variable-group_variable_create
+- az_pipelines_variable-group_variable_delete
+- az_pipelines_variable-group_variable_list
+- az_pipelines_variable-group_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -216,4 +231,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variable groups.
+metadata:
+  description: Manage variable groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group/variable.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group/variable.yml
index 7ffe37c9b2..1e88643a42 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group/variable.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/variable-group/variable.yml
@@ -1,23 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_variable_group_variable_create
-  - az_pipelines_variable_group_variable_delete
-  - az_pipelines_variable_group_variable_list
-  - az_pipelines_variable_group_variable_update
-- uid: az_pipelines_variable_group_variable_create
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_variable-group_variable
+name: az pipelines variable-group variable
+summary: Manage variables in a variable group.
+description: ''
+directCommands:
+- uid: az_pipelines_variable-group_variable_create
   name: az pipelines variable-group variable create
   summary: Add a variable to a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable create --group-id
+                                                --name
+                                                [--detect {false, true}]
+                                                [--org]
+                                                [--project]
+                                                [--secret {false, true}]
+                                                [--subscription]
+                                                [--value]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
@@ -26,12 +26,13 @@ items:
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -40,19 +41,25 @@ items:
     parameterValueGroup: false, true
     summary: If the value of the variable is a secret.
     description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_variable_delete
+  - name: --value
+    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
+    description: ''
+- uid: az_pipelines_variable-group_variable_delete
   name: az pipelines variable-group variable delete
   summary: Delete a variable from variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable delete --group-id
+                                                --name
+                                                [--detect {false, true}]
+                                                [--org]
+                                                [--project]
+                                                [--subscription]
+                                                [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
@@ -61,53 +68,72 @@ items:
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_variable_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_pipelines_variable-group_variable_list
   name: az pipelines variable-group variable list
   summary: List the variables in a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable list --group-id
+                                              [--detect {false, true}]
+                                              [--org]
+                                              [--project]
+                                              [--query-examples]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_variable_update
+- uid: az_pipelines_variable-group_variable_update
   name: az pipelines variable-group variable update
   summary: Update a variable in a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable update --group-id
+                                                --name
+                                                [--detect {false, true}]
+                                                [--new-name]
+                                                [--org]
+                                                [--project]
+                                                [--prompt-value {false, true}]
+                                                [--secret {false, true}]
+                                                [--subscription]
+                                                [--value]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
@@ -116,6 +142,7 @@ items:
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -124,7 +151,7 @@ items:
     summary: New name of the variable.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -137,25 +164,17 @@ items:
     parameterValueGroup: false, true
     summary: If the value of the variable is a secret.
     description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --value
+    summary: New value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
+    description: ''
 commands:
-- uid: az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
+- az_pipelines_variable-group_variable_create
+- az_pipelines_variable-group_variable_delete
+- az_pipelines_variable-group_variable_list
+- az_pipelines_variable-group_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -171,4 +190,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variables in a variable group.
+metadata:
+  description: Manage variables in a variable group.
diff --git a/2017-03-09-profile/docs-ref-autogen/pipelines/variable.yml b/2017-03-09-profile/docs-ref-autogen/pipelines/variable.yml
index 45b5d9ad9d..0f747467fd 100644
--- a/2017-03-09-profile/docs-ref-autogen/pipelines/variable.yml
+++ b/2017-03-09-profile/docs-ref-autogen/pipelines/variable.yml
@@ -1,27 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_variable_create
-  - az_pipelines_variable_delete
-  - az_pipelines_variable_list
-  - az_pipelines_variable_update
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_variable
+name: az pipelines variable
+summary: Manage pipeline variables.
+description: ''
+directCommands:
 - uid: az_pipelines_variable_create
   name: az pipelines variable create
   summary: Add a variable to a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable create --name
+                                 [--allow-override {false, true}]
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--pipeline-id]
+                                 [--pipeline-name]
+                                 [--project]
+                                 [--secret {false, true}]
+                                 [--subscription]
+                                 [--value]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --allow-override
     parameterValueGroup: false, true
     summary: Indicates whether the value can be set at queue time.
@@ -31,7 +34,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -46,29 +49,37 @@ items:
     parameterValueGroup: false, true
     summary: Indicates whether the variable's value is a secret.
     description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with <problematic ids="id30" refid="id29">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> or user will be prompted to enter it via standard input. e.g. A variable named `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --value
+    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with <problematic ids="id30" refid="id29">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> or user will be prompted to enter it via standard input. e.g. A variable named `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
+    description: ''
 - uid: az_pipelines_variable_delete
   name: az pipelines variable delete
   summary: Delete a variable from pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable delete --name
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--pipeline-id]
+                                 [--pipeline-name]
+                                 [--project]
+                                 [--subscription]
+                                 [--yes]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -79,25 +90,31 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_pipelines_variable_list
   name: az pipelines variable list
   summary: List the variables in a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable list [--detect {false, true}]
+                               [--org]
+                               [--pipeline-id]
+                               [--pipeline-name]
+                               [--project]
+                               [--query-examples]
+                               [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -108,6 +125,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -115,13 +135,25 @@ items:
   name: az pipelines variable update
   summary: Update a variable in a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable update --name
+                                 [--allow-override {false, true}]
+                                 [--detect {false, true}]
+                                 [--new-name]
+                                 [--org]
+                                 [--pipeline-id]
+                                 [--pipeline-name]
+                                 [--project]
+                                 [--prompt-value {false, true}]
+                                 [--secret {false, true}]
+                                 [--subscription]
+                                 [--value]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --allow-override
     parameterValueGroup: false, true
     summary: Indicates whether the value can be set at queue time.
@@ -134,7 +166,7 @@ items:
     summary: New name of the variable.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -153,25 +185,17 @@ items:
     parameterValueGroup: false, true
     summary: If the value of the variable is a secret.
     description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, use --prompt-value parameter, to be prompted to enter it via standard input. For non-interactive consoles it can be picked from environment variable prefixed with <problematic ids="id32" refid="id31">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> e.g. A variable nameed `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --value
+    summary: New value of the variable. For secret variables, use --prompt-value parameter, to be prompted to enter it via standard input. For non-interactive consoles it can be picked from environment variable prefixed with <problematic ids="id32" refid="id31">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> e.g. A variable nameed `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
+    description: ''
 commands:
-- uid: az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
+- az_pipelines_variable_create
+- az_pipelines_variable_delete
+- az_pipelines_variable_list
+- az_pipelines_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -187,4 +211,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline variables.
+metadata:
+  description: Manage pipeline variables.
diff --git a/2017-03-09-profile/docs-ref-autogen/policy.yml b/2017-03-09-profile/docs-ref-autogen/policy.yml
index 8264f6b2e0..2a465ac223 100644
--- a/2017-03-09-profile/docs-ref-autogen/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/policy.yml
@@ -1,46 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_policy
-  name: az policy
-  summary: Manage resource policies.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_policy
+name: az policy
+summary: Manage resource policies.
+description: ''
 commands:
-- uid: az_policy_assignment
-  name: az policy assignment
-  summary: Manage resource policy assignments.
-- uid: az_policy_assignment_create
-  name: az policy assignment create
-  summary: Create a resource policy assignment.
-- uid: az_policy_assignment_delete
-  name: az policy assignment delete
-  summary: Delete a resource policy assignment.
-- uid: az_policy_assignment_list
-  name: az policy assignment list
-  summary: List resource policy assignments.
-- uid: az_policy_assignment_show
-  name: az policy assignment show
-  summary: Show a resource policy assignment.
-- uid: az_policy_definition
-  name: az policy definition
-  summary: Manage resource policy definitions.
-- uid: az_policy_definition_create
-  name: az policy definition create
-  summary: Create a policy definition.
-- uid: az_policy_definition_delete
-  name: az policy definition delete
-  summary: Delete a policy definition.
-- uid: az_policy_definition_list
-  name: az policy definition list
-  summary: List policy definitions.
-- uid: az_policy_definition_show
-  name: az policy definition show
-  summary: Show a policy definition.
-- uid: az_policy_definition_update
-  name: az policy definition update
-  summary: Update a policy definition.
+- az_policy_assignment
+- az_policy_assignment_create
+- az_policy_assignment_delete
+- az_policy_assignment_list
+- az_policy_assignment_show
+- az_policy_definition
+- az_policy_definition_create
+- az_policy_definition_delete
+- az_policy_definition_list
+- az_policy_definition_show
+- az_policy_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -56,10 +30,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/policy/assignment.yml b/2017-03-09-profile/docs-ref-autogen/policy/assignment.yml
index 8f70a61d2f..d3cc1fc6ca 100644
--- a/2017-03-09-profile/docs-ref-autogen/policy/assignment.yml
+++ b/2017-03-09-profile/docs-ref-autogen/policy/assignment.yml
@@ -1,50 +1,43 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_policy_assignment
-  name: az policy assignment
-  summary: Manage resource policy assignments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_policy_assignment_create
-  - az_policy_assignment_delete
-  - az_policy_assignment_list
-  - az_policy_assignment_show
+### YamlMime:AzureCLIGroup
+uid: az_policy_assignment
+name: az policy assignment
+summary: Manage resource policy assignments.
+description: ''
+directCommands:
 - uid: az_policy_assignment_create
   name: az policy assignment create
   summary: Create a resource policy assignment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy assignment create [--display-name]
+                                [--name]
+                                [--not-scopes]
+                                [--policy]
+                                [--resource-group]
+                                [--scope]
   examples:
   - summary: Create a resource policy assignment at scope
-    syntax:
-      content: >-
-        Valid scopes are management group, subscription, resource group, and resource, for example
-           management group:  /providers/Microsoft.Management/managementGroups/MyManagementGroup
-           subscription:      /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333
-           resource group:    /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup
-           resource:          /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM
-             az policy assignment create --scope \
-                "/providers/Microsoft.Management/managementGroups/MyManagementGroup" \
-                    --policy {PolicyName} -p "{ \"allowedLocations\": \
-                        { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
+    syntax: >-
+      Valid scopes are management group, subscription, resource group, and resource, for example
+         management group:  /providers/Microsoft.Management/managementGroups/MyManagementGroup
+         subscription:      /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333
+         resource group:    /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup
+         resource:          /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM
+           az policy assignment create --scope \
+              "/providers/Microsoft.Management/managementGroups/MyManagementGroup" \
+                  --policy {PolicyName} -p "{ \"allowedLocations\": \
+                      { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
   - summary: Create a resource policy assignment and provide rule parameter values.
-    syntax:
-      content: >-
-        az policy assignment create --policy {PolicyName} -p "{ \"allowedLocations\": \
-            { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
+    syntax: >-
+      az policy assignment create --policy {PolicyName} -p "{ \"allowedLocations\": \
+          { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
   - summary: Create a resource policy assignment with a system assigned identity.
-    syntax:
-      content: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity
+    syntax: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity
   - summary: Create a resource policy assignment with a system assigned identity. The identity will have 'Contributor' role access to the subscription.
-    syntax:
-      content: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity --identity-scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --role Contributor
+    syntax: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity --identity-scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --role Contributor
   - summary: Create a resource policy assignment with an enforcement mode. It indicates whether a policy effect will be enforced or not during assignment creation and update. Please visit https://aka.ms/azure-policyAssignment-enforcement-mode for more information.
-    syntax:
-      content: az policy assignment create --name myPolicy --policy {PolicyName} --enforcement-mode 'DoNotEnforce'
-  parameters:
+    syntax: az policy assignment create --name myPolicy --policy {PolicyName} --enforcement-mode 'DoNotEnforce'
+  optionalParameters:
   - name: --display-name
     summary: Display name of the policy assignment.
     description: ''
@@ -63,101 +56,87 @@ items:
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_assignment_delete
   name: az policy assignment delete
   summary: Delete a resource policy assignment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy assignment delete --name
+                                [--resource-group]
+                                [--scope]
   examples:
   - summary: Delete a resource policy assignment. (autogenerated)
-    syntax:
-      content: az policy assignment delete --name MyPolicyAssignment
-  parameters:
+    syntax: az policy assignment delete --name MyPolicyAssignment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the policy assignment.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
     summary: The resource group where the policy will be applied.
     description: ''
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_assignment_list
   name: az policy assignment list
   summary: List resource policy assignments.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az policy assignment list [--disable-scope-strict-match]
+                              [--query-examples]
+                              [--resource-group]
+                              [--scope]
+  optionalParameters:
   - name: --disable-scope-strict-match
     summary: Include policy assignments either inherited from parent scope or at child scope.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: The resource group where the policy will be applied.
     description: ''
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_assignment_show
   name: az policy assignment show
   summary: Show a resource policy assignment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy assignment show --name
+                              [--query-examples]
+                              [--resource-group]
+                              [--scope]
   examples:
   - summary: Show a resource policy assignment. (autogenerated)
-    syntax:
-      content: az policy assignment show --name MyPolicyAssignment
-  parameters:
+    syntax: az policy assignment show --name MyPolicyAssignment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the policy assignment.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: The resource group where the policy will be applied.
     description: ''
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_policy_assignment_create
-  name: az policy assignment create
-  summary: Create a resource policy assignment.
-- uid: az_policy_assignment_delete
-  name: az policy assignment delete
-  summary: Delete a resource policy assignment.
-- uid: az_policy_assignment_list
-  name: az policy assignment list
-  summary: List resource policy assignments.
-- uid: az_policy_assignment_show
-  name: az policy assignment show
-  summary: Show a resource policy assignment.
+- az_policy_assignment_create
+- az_policy_assignment_delete
+- az_policy_assignment_list
+- az_policy_assignment_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -173,10 +152,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource policy assignments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource policy assignments.
diff --git a/2017-03-09-profile/docs-ref-autogen/policy/definition.yml b/2017-03-09-profile/docs-ref-autogen/policy/definition.yml
index 53451fbc05..fd89e465d5 100644
--- a/2017-03-09-profile/docs-ref-autogen/policy/definition.yml
+++ b/2017-03-09-profile/docs-ref-autogen/policy/definition.yml
@@ -1,62 +1,56 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_policy_definition
-  name: az policy definition
-  summary: Manage resource policy definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_policy_definition_create
-  - az_policy_definition_delete
-  - az_policy_definition_list
-  - az_policy_definition_show
-  - az_policy_definition_update
+### YamlMime:AzureCLIGroup
+uid: az_policy_definition
+name: az policy definition
+summary: Manage resource policy definitions.
+description: ''
+directCommands:
 - uid: az_policy_definition_create
   name: az policy definition create
   summary: Create a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition create --name
+                                [--description]
+                                [--display-name]
+                                [--management-group]
+                                [--rules]
+                                [--subscription]
   examples:
   - summary: Create a read-only policy.
-    syntax:
-      content: >-
-        az policy definition create --name readOnlyStorage --rules "{ \"if\": \
-            { \"field\": \"type\", \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
-                \"then\": { \"effect\": \"deny\" } }"
+    syntax: >-
+      az policy definition create --name readOnlyStorage --rules "{ \"if\": \
+          { \"field\": \"type\", \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
+              \"then\": { \"effect\": \"deny\" } }"
   - summary: Create a policy parameter definition.
-    syntax:
-      content: >-
-        az policy definition create --name allowedLocations \
-            --rules "{ \"if\": { \"allOf\": [ \
-                { \"field\": \"location\",\"notIn\": \"[parameters('listOfAllowedLocations')]\" }, \
-                    { \"field\": \"location\", \"notEquals\": \"global\" }, \
-                        { \"field\": \"type\", \"notEquals\": \
-                            \"Microsoft.AzureActiveDirectory/b2cDirectories\"} \
-                                ] }, \"then\": { \"effect\": \"deny\" } }" \
-            --params "{ \"allowedLocations\": { \
-                \"type\": \"array\", \"metadata\": { \"description\": \
-                    \"The list of locations that can be specified when deploying resources\", \
-                        \"strongType\": \"location\", \"displayName\": \"Allowed locations\" } } }"
+    syntax: >-
+      az policy definition create --name allowedLocations \
+          --rules "{ \"if\": { \"allOf\": [ \
+              { \"field\": \"location\",\"notIn\": \"[parameters('listOfAllowedLocations')]\" }, \
+                  { \"field\": \"location\", \"notEquals\": \"global\" }, \
+                      { \"field\": \"type\", \"notEquals\": \
+                          \"Microsoft.AzureActiveDirectory/b2cDirectories\"} \
+                              ] }, \"then\": { \"effect\": \"deny\" } }" \
+          --params "{ \"allowedLocations\": { \
+              \"type\": \"array\", \"metadata\": { \"description\": \
+                  \"The list of locations that can be specified when deploying resources\", \
+                      \"strongType\": \"location\", \"displayName\": \"Allowed locations\" } } }"
   - summary: Create a read-only policy that can be applied within a management group.
-    syntax:
-      content: >-
-        az policy definition create -n readOnlyStorage --management-group "MyManagementGroup" \
-            --rules "{ \"if\": { \"field\": \"type\", \
-                \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
-                    \"then\": { \"effect\": \"deny\" } }"
+    syntax: >-
+      az policy definition create -n readOnlyStorage --management-group "MyManagementGroup" \
+          --rules "{ \"if\": { \"field\": \"type\", \
+              \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
+                  \"then\": { \"effect\": \"deny\" } }"
   - summary: Create a policy definition with mode. The mode 'Indexed' indicates the policy should be evaluated only for resource types that support tags and location.
-    syntax:
-      content: >-
-        az policy definition create --name TagsPolicyDefinition --subscription "MySubscription" \
-            --mode Indexed --rules "{ \"if\": { \"field\": \"tags\", \"exists\": \"false\" }, \
-                \"then\": { \"effect\": \"deny\" } }"
-  parameters:
+    syntax: >-
+      az policy definition create --name TagsPolicyDefinition --subscription "MySubscription" \
+          --mode Indexed --rules "{ \"if\": { \"field\": \"tags\", \"exists\": \"false\" }, \
+              \"then\": { \"effect\": \"deny\" } }"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the new policy definition.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of policy definition.
     description: ''
@@ -72,100 +66,98 @@ items:
   - name: --subscription
     summary: Name or id of the subscription the new policy definition can be assigned in.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_delete
   name: az policy definition delete
   summary: Delete a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition delete --name
+                                [--management-group]
+                                [--subscription]
   examples:
   - summary: Delete a policy definition. (autogenerated)
-    syntax:
-      content: az policy definition delete --name MyPolicyDefinition
-  parameters:
+    syntax: az policy definition delete --name MyPolicyDefinition
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The policy definition name.
     description: ''
+  optionalParameters:
   - name: --management-group
     summary: The name of the management group of the policy [set] definition.
     description: ''
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_list
   name: az policy definition list
   summary: List policy definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az policy definition list [--management-group]
+                              [--query-examples]
+                              [--subscription]
+  optionalParameters:
   - name: --management-group
     summary: The name of the management group of the policy [set] definition.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_show
   name: az policy definition show
   summary: Show a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition show --name
+                              [--management-group]
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Show a policy definition. (autogenerated)
-    syntax:
-      content: az policy definition show --name MyPolicyDefinition
-  parameters:
+    syntax: az policy definition show --name MyPolicyDefinition
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The policy definition name.
     description: ''
+  optionalParameters:
   - name: --management-group
     summary: The name of the management group of the policy [set] definition.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_update
   name: az policy definition update
   summary: Update a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition update --name
+                                [--description]
+                                [--display-name]
+                                [--management-group]
+                                [--rules]
+                                [--subscription]
   examples:
   - summary: Update a policy definition. (autogenerated)
-    syntax:
-      content: az policy definition update --name MyPolicyDefinition
-  parameters:
+    syntax: az policy definition update --name MyPolicyDefinition
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The policy definition name.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of policy definition.
     description: ''
@@ -181,28 +173,13 @@ items:
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_policy_definition_create
-  name: az policy definition create
-  summary: Create a policy definition.
-- uid: az_policy_definition_delete
-  name: az policy definition delete
-  summary: Delete a policy definition.
-- uid: az_policy_definition_list
-  name: az policy definition list
-  summary: List policy definitions.
-- uid: az_policy_definition_show
-  name: az policy definition show
-  summary: Show a policy definition.
-- uid: az_policy_definition_update
-  name: az policy definition update
-  summary: Update a policy definition.
+- az_policy_definition_create
+- az_policy_definition_delete
+- az_policy_definition_list
+- az_policy_definition_show
+- az_policy_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -218,10 +195,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource policy definitions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource policy definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/portal.yml b/2017-03-09-profile/docs-ref-autogen/portal.yml
new file mode 100644
index 0000000000..b350b445b5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/portal.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_portal
+name: az portal
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **portal** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az portal** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_portal_dashboard
+- az_portal_dashboard_create
+- az_portal_dashboard_delete
+- az_portal_dashboard_import
+- az_portal_dashboard_list
+- az_portal_dashboard_show
+- az_portal_dashboard_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/portal/dashboard.yml b/2017-03-09-profile/docs-ref-autogen/portal/dashboard.yml
new file mode 100644
index 0000000000..56b829231a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/portal/dashboard.yml
@@ -0,0 +1,183 @@
+### YamlMime:AzureCLIGroup
+uid: az_portal_dashboard
+name: az portal dashboard
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **portal** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az portal dashboard** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage portal dashboards.
+description: ''
+directCommands:
+- uid: az_portal_dashboard_create
+  name: az portal dashboard create
+  summary: Creates or updates a dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard create --input-path
+                               --name
+                               --resource-group
+                               [--location]
+                               [--tags]
+  examples:
+  - summary: Create or update a Dashboard
+    syntax: >-
+      az portal dashboard create --location "eastus" --name "testDashboard" \
+
+      --resource-group "testRG" --input-path "/src/json/properties.json" \
+
+      --tags aKey=aValue anotherKey=anotherValue
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The path to the dashboard properties JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_portal_dashboard_delete
+  name: az portal dashboard delete
+  summary: Deletes a dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard delete --name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Dashboard
+    syntax: az portal dashboard delete --name "testDashboard" --resource-group "testRG"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_portal_dashboard_import
+  name: az portal dashboard import
+  summary: Imports a dashboard from a JSON file.
+  description: ''
+  syntax: >-
+    az portal dashboard import --input-path
+                               --resource-group
+                               [--name]
+  examples:
+  - summary: Import a Dashboard
+    syntax: >-
+      az portal dashboard import --name "testDashboard" --resource-group "testRG" \
+
+      --input-path "/src/json/dashboard.json"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The path to the dashboard json file.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+- uid: az_portal_dashboard_list
+  name: az portal dashboard list
+  summary: Lists the dashboards within a subscription or resource group.
+  description: ''
+  syntax: az portal dashboard list [--resource-group]
+  examples:
+  - summary: List all dashboards in a resourceGroup
+    syntax: az portal dashboard list --resource-group "testRG"
+  - summary: List all dashboards in a subscription
+    syntax: az portal dashboard list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+- uid: az_portal_dashboard_show
+  name: az portal dashboard show
+  summary: Gets details for a single dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard show --name
+                             --resource-group
+  examples:
+  - summary: Get a Dashboard
+    syntax: az portal dashboard show --name "testDashboard" --resource-group "testRG"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_portal_dashboard_update
+  name: az portal dashboard update
+  summary: Updates an existing dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard update --input-path
+                               --name
+                               --resource-group
+  examples:
+  - summary: Update a Dashboard
+    syntax: >-
+      az portal dashboard update --name "testDashboard" --resource-group "testRG" \
+
+      --input-path "/src/json/properties.json"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The path to the dashboard properties JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+commands:
+- az_portal_dashboard_create
+- az_portal_dashboard_delete
+- az_portal_dashboard_import
+- az_portal_dashboard_list
+- az_portal_dashboard_show
+- az_portal_dashboard_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage portal dashboards.
diff --git a/2017-03-09-profile/docs-ref-autogen/postgres.yml b/2017-03-09-profile/docs-ref-autogen/postgres.yml
new file mode 100644
index 0000000000..b93e611767
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/postgres.yml
@@ -0,0 +1,164 @@
+### YamlMime:AzureCLIGroup
+uid: az_postgres
+name: az postgres
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **db-up** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az postgres** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for PostgreSQL servers.
+description: ''
+directCommands:
+- uid: az_postgres_down
+  name: az postgres down
+  summary: Delete the PostgreSQL server and its cached information.
+  description: ''
+  syntax: >-
+    az postgres down [--delete-group]
+                     [--no-wait]
+                     [--resource-group]
+                     [--server-name]
+                     [--yes]
+  examples:
+  - summary: Delete the server and the cached data, aside from the resource group.
+    syntax: az postgres down
+  - summary: Delete the resource group and the full cache.
+    syntax: az postgres down --delete-group
+  optionalParameters:
+  - name: --delete-group
+    summary: Delete the resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_postgres_show-connection-string
+  name: az postgres show-connection-string
+  summary: Show the connection strings for a PostgreSQL server database.
+  description: ''
+  syntax: >-
+    az postgres show-connection-string [--admin-password]
+                                       [--admin-user]
+                                       [--database-name]
+                                       [--server-name]
+  optionalParameters:
+  - name: --admin-password -p
+    defaultValue: '{password}'
+    summary: The login password of the administrator.
+    description: ''
+  - name: --admin-user -u
+    defaultValue: '{login}'
+    summary: The login username of the administrator.
+    description: ''
+  - name: --database-name -d
+    defaultValue: '{database}'
+    summary: The name of a database.
+    description: ''
+  - name: --server-name -s
+    defaultValue: '{server}'
+    summary: Name of the server.
+    description: ''
+- uid: az_postgres_up
+  name: az postgres up
+  summary: Set up an Azure Database for PostgreSQL server and configurations.
+  description: ''
+  syntax: >-
+    az postgres up [--admin-password]
+                   [--admin-user]
+                   [--backup-retention]
+                   [--database-name]
+                   [--generate-password]
+                   [--geo-redundant-backup {Disabled, Enabled}]
+                   [--location]
+                   [--resource-group]
+                   [--server-name]
+                   [--sku-name]
+                   [--ssl-enforcement {Disabled, Enabled}]
+                   [--storage-size]
+                   [--tags]
+                   [--version]
+  examples:
+  - summary: Ensure that a Azure Database for PostgreSQL server is up and running and configured for immediate use.
+    syntax: az postgres up
+  - summary: To override default names, provide parameters indicating desired values/existing resources.
+    syntax: az postgres up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
+  optionalParameters:
+  - name: --admin-password -p
+    summary: 'The login password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.Your password cannot contain all or part of the login name. Part of a login name is defined as three or more consecutive alphanumeric characters.'
+    description: ''
+  - name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - name: --backup-retention
+    summary: The number of days a backup is retained.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database to initialize.
+    description: ''
+  - name: --generate-password
+    summary: Generate a password.
+    description: ''
+  - name: --geo-redundant-backup
+    defaultValue: Disabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable Geo-redundant or not for server backup.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --sku-name
+    defaultValue: GP_Gen5_2
+    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
+    description: ''
+  - name: --ssl-enforcement
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable ssl enforcement or not when connect to server.
+    description: ''
+  - name: --storage-size
+    summary: The max storage size of the server. Unit is megabytes.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --version
+    defaultValue: "10"
+    summary: Server version.
+    description: ''
+commands:
+- az_postgres_down
+- az_postgres_flexible-server
+- az_postgres_flexible-server_connect
+- az_postgres_flexible-server_execute
+- az_postgres_show-connection-string
+- az_postgres_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for PostgreSQL servers.
diff --git a/2017-03-09-profile/docs-ref-autogen/postgres/flexible-server.yml b/2017-03-09-profile/docs-ref-autogen/postgres/flexible-server.yml
new file mode 100644
index 0000000000..8b4849f0e9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/postgres/flexible-server.yml
@@ -0,0 +1,97 @@
+### YamlMime:AzureCLIGroup
+uid: az_postgres_flexible-server
+name: az postgres flexible-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **rdbms-connect** extension for Azure CLI and requires version 2.19.0 or higher.  The extension will automatically install the first time you run an **az postgres flexible-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for PostgreSQL Flexible Servers.
+description: ''
+directCommands:
+- uid: az_postgres_flexible-server_connect
+  name: az postgres flexible-server connect
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az postgres flexible-server connect --admin-user
+                                        --name
+                                        [--admin-password]
+                                        [--database-name]
+                                        [--interactive]
+                                        [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --interactive
+    summary: Pass this parameter to connect to database in interactive mode.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+- uid: az_postgres_flexible-server_execute
+  name: az postgres flexible-server execute
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az postgres flexible-server execute --admin-password
+                                        --admin-user
+                                        --name
+                                        [--database-name]
+                                        [--file-path]
+                                        [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --file-path -f
+    summary: The path of the sql file to execute.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+commands:
+- az_postgres_flexible-server_connect
+- az_postgres_flexible-server_execute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for PostgreSQL Flexible Servers.
diff --git a/2017-03-09-profile/docs-ref-autogen/powerbi.yml b/2017-03-09-profile/docs-ref-autogen/powerbi.yml
new file mode 100644
index 0000000000..8c5a7febf7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/powerbi.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_powerbi
+name: az powerbi
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **powerbidedicated** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az powerbi** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage PowerBI resources.
+description: ''
+commands:
+- az_powerbi_embedded-capacity
+- az_powerbi_embedded-capacity_create
+- az_powerbi_embedded-capacity_delete
+- az_powerbi_embedded-capacity_list
+- az_powerbi_embedded-capacity_show
+- az_powerbi_embedded-capacity_update
+- az_powerbi_embedded-capacity_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage PowerBI resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/powerbi/embedded-capacity.yml b/2017-03-09-profile/docs-ref-autogen/powerbi/embedded-capacity.yml
new file mode 100644
index 0000000000..e3978cb23e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/powerbi/embedded-capacity.yml
@@ -0,0 +1,257 @@
+### YamlMime:AzureCLIGroup
+uid: az_powerbi_embedded-capacity
+name: az powerbi embedded-capacity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **powerbidedicated** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az powerbi embedded-capacity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage PowerBI embedded capacity.
+description: ''
+directCommands:
+- uid: az_powerbi_embedded-capacity_create
+  name: az powerbi embedded-capacity create
+  summary: Create a new PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity create --administration-members
+                                        --location
+                                        --name
+                                        --resource-group
+                                        --sku-name {A1, A2, A3, A4, A5, A6}
+                                        [--no-wait]
+                                        [--sku-tier {PBIE_Azure}]
+                                        [--tags]
+  examples:
+  - summary: Create a new PowerBI embedded capacity.
+    syntax: >-
+      az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
+
+      --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
+
+      "azsdktest@microsoft.com" "azsdktest2@microsoft.com"
+  - summary: Create a new PowerBI embedded capacity without waiting.
+    syntax: >-
+      az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
+
+      --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
+
+      "azsdktest@microsoft.com" "azsdktest2@microsoft.com" --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --administration-members
+    summary: An array of administrator user identities.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku-name
+    parameterValueGroup: A1, A2, A3, A4, A5, A6
+    summary: Name of the SKU level. For more information, please refer to https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-tier
+    parameterValueGroup: PBIE_Azure
+    summary: The name of the Azure pricing tier to which the SKU applies.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_powerbi_embedded-capacity_delete
+  name: az powerbi embedded-capacity delete
+  summary: Delete the specified PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity delete --name
+                                        --resource-group
+                                        [--no-wait]
+                                        [--yes]
+  examples:
+  - summary: Delete a capacity in specified resource group.
+    syntax: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest"
+  - summary: Delete a capacity in specified resource group without prompt.
+    syntax: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" -y
+  - summary: Delete a capacity in specified resource group without waiting.
+    syntax: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_powerbi_embedded-capacity_list
+  name: az powerbi embedded-capacity list
+  summary: List all the embedded capacities for the given resource group.
+  description: ''
+  syntax: az powerbi embedded-capacity list [--resource-group]
+  examples:
+  - summary: List capacities in resource group
+    syntax: az powerbi embedded-capacity list --resource-group "TestRG"
+  - summary: List all capacities in default subscription.
+    syntax: az powerbi embedded-capacity list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_powerbi_embedded-capacity_show
+  name: az powerbi embedded-capacity show
+  summary: Get details about the specified PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity show --name
+                                      --resource-group
+  examples:
+  - summary: Get details of a capacity
+    syntax: az powerbi embedded-capacity show --resource-group "TestRG" --name "azsdktest"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_powerbi_embedded-capacity_update
+  name: az powerbi embedded-capacity update
+  summary: Update the specified PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity update --name
+                                        --resource-group
+                                        [--administration-members]
+                                        [--no-wait]
+                                        [--sku-name {A1, A2, A3, A4, A5, A6}]
+                                        [--sku-tier {PBIE_Azure}]
+                                        [--tags]
+  examples:
+  - summary: Update sku name for the specified PowerBI embedded capacity.
+    syntax: az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" --sku-name "A1"
+  - summary: Update administrator members the specified PowerBI embedded capacity without waiting.
+    syntax: >-
+      az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" \
+
+      --sku-name "A1" --administration-members "azsdktest3@microsoft.com" --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --administration-members
+    summary: An array of administrator user identities.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-name
+    parameterValueGroup: A1, A2, A3, A4, A5, A6
+    summary: Name of the SKU level. For more information, please refer to https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/.
+    description: ''
+  - name: --sku-tier
+    parameterValueGroup: PBIE_Azure
+    summary: The name of the Azure pricing tier to which the SKU applies.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_powerbi_embedded-capacity_wait
+  name: az powerbi embedded-capacity wait
+  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity wait --name
+                                      --resource-group
+                                      [--created]
+                                      [--custom]
+                                      [--deleted]
+                                      [--exists]
+                                      [--interval]
+                                      [--timeout]
+                                      [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until the powerbi embedded capacity is created.
+    syntax: az powerbi embedded-capacity wait --resource-group "TestRG" --name "azsdktest" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_powerbi_embedded-capacity_create
+- az_powerbi_embedded-capacity_delete
+- az_powerbi_embedded-capacity_list
+- az_powerbi_embedded-capacity_show
+- az_powerbi_embedded-capacity_update
+- az_powerbi_embedded-capacity_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage PowerBI embedded capacity.
diff --git a/2017-03-09-profile/docs-ref-autogen/provider.yml b/2017-03-09-profile/docs-ref-autogen/provider.yml
index 84c7026018..9e504be79f 100644
--- a/2017-03-09-profile/docs-ref-autogen/provider.yml
+++ b/2017-03-09-profile/docs-ref-autogen/provider.yml
@@ -1,138 +1,124 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_provider
-  name: az provider
-  summary: Manage resource providers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_provider_list
-  - az_provider_register
-  - az_provider_show
-  - az_provider_unregister
+### YamlMime:AzureCLIGroup
+uid: az_provider
+name: az provider
+summary: Manage resource providers.
+description: ''
+directCommands:
 - uid: az_provider_list
   name: az provider list
   summary: Gets a list of resource providers.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider list [--expand]
+                     [--query-examples]
+                     [--subscription]
   examples:
   - summary: Display all resource types for the network resource provider.
-    syntax:
-      content: az provider list --query [?namespace=='Microsoft.Network'].resourceTypes[].resourceType
-  parameters:
+    syntax: az provider list --query [?namespace=='Microsoft.Network'].resourceTypes[].resourceType
+  optionalParameters:
   - name: --expand
     summary: The $expand query parameter. e.g. To include property aliases in response, use $expand=resourceTypes/aliases.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_register
   name: az provider register
   summary: Register a provider.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider register --namespace
+                         [--accept-terms]
+                         [--management-group-id]
+                         [--subscription]
+                         [--wait]
   examples:
   - summary: Register a provider. (autogenerated)
-    syntax:
-      content: az provider register --namespace 'Microsoft.PolicyInsights'
-  parameters:
+    syntax: az provider register --namespace 'Microsoft.PolicyInsights'
+  - summary: Register a provider from RPaaS.
+    syntax: az provider register -n 'Microsoft.Confluent' --accept-terms
+  - summary: Register a management group.
+    syntax: az provider register --namespace Microsoft.Automation -m mgID
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
-  - name: --wait
-    summary: Wait for the registration to finish.
+  optionalParameters:
+  - name: --accept-terms
+    summary: Accept market place terms and RP terms for RPaaS. Required when registering RPs from RPaaS, such as 'Microsoft.Confluent' and 'Microsoft.Datadog'.
+    description: ''
+  - name: --management-group-id -m
+    summary: The management group id to register.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --wait
+    summary: Wait for the registration to finish.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_show
   name: az provider show
   summary: Gets a resource provider.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az provider show --namespace
+                     [--expand]
+                     [--query-examples]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
+  optionalParameters:
   - name: --expand
     summary: The $expand query parameter. e.g. To include property aliases in response, use $expand=resourceTypes/aliases.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_unregister
   name: az provider unregister
   summary: Unregister a provider.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider unregister --namespace
+                           [--subscription]
+                           [--wait]
   examples:
   - summary: Unregister a provider. (autogenerated)
-    syntax:
-      content: az provider unregister --namespace Microsoft.Automation
-  parameters:
+    syntax: az provider unregister --namespace Microsoft.Automation
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
-  - name: --wait
-    summary: Wait for unregistration to finish.
-    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --wait
+    summary: Wait for unregistration to finish.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_provider_list
-  name: az provider list
-  summary: Gets a list of resource providers.
-- uid: az_provider_operation
-  name: az provider operation
-  summary: Get provider operations metadatas.
-- uid: az_provider_operation_list
-  name: az provider operation list
-  summary: Get operations from all providers.
-- uid: az_provider_operation_show
-  name: az provider operation show
-  summary: Get an individual provider's operations.
-- uid: az_provider_register
-  name: az provider register
-  summary: Register a provider.
-- uid: az_provider_show
-  name: az provider show
-  summary: Gets a resource provider.
-- uid: az_provider_unregister
-  name: az provider unregister
-  summary: Unregister a provider.
+- az_provider_list
+- az_provider_operation
+- az_provider_operation_list
+- az_provider_operation_show
+- az_provider_register
+- az_provider_show
+- az_provider_unregister
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -148,10 +134,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource providers.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource providers.
diff --git a/2017-03-09-profile/docs-ref-autogen/provider/operation.yml b/2017-03-09-profile/docs-ref-autogen/provider/operation.yml
index f7c9493cd1..f95ebb466e 100644
--- a/2017-03-09-profile/docs-ref-autogen/provider/operation.yml
+++ b/2017-03-09-profile/docs-ref-autogen/provider/operation.yml
@@ -1,61 +1,51 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_provider_operation
-  name: az provider operation
-  summary: Get provider operations metadatas.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_provider_operation_list
-  - az_provider_operation_show
+### YamlMime:AzureCLIGroup
+uid: az_provider_operation
+name: az provider operation
+summary: Get provider operations metadatas.
+description: ''
+directCommands:
 - uid: az_provider_operation_list
   name: az provider operation list
   summary: Get operations from all providers.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az provider operation list [--query-examples]
+                               [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_operation_show
   name: az provider operation show
   summary: Get an individual provider's operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider operation show --namespace
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Get an individual provider's operations. (autogenerated)
-    syntax:
-      content: az provider operation show --namespace Microsoft.Storage
-  parameters:
+    syntax: az provider operation show --namespace Microsoft.Storage
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_provider_operation_list
-  name: az provider operation list
-  summary: Get operations from all providers.
-- uid: az_provider_operation_show
-  name: az provider operation show
-  summary: Get an individual provider's operations.
+- az_provider_operation_list
+- az_provider_operation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -71,10 +61,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Get provider operations metadatas.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Get provider operations metadatas.
diff --git a/2017-03-09-profile/docs-ref-autogen/providerhub.yml b/2017-03-09-profile/docs-ref-autogen/providerhub.yml
new file mode 100644
index 0000000000..58327e9e75
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/providerhub.yml
@@ -0,0 +1,52 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub
+name: az providerhub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_providerhub_custom-rollout
+- az_providerhub_custom-rollout_create
+- az_providerhub_custom-rollout_list
+- az_providerhub_custom-rollout_show
+- az_providerhub_default-rollout
+- az_providerhub_default-rollout_create
+- az_providerhub_default-rollout_delete
+- az_providerhub_default-rollout_list
+- az_providerhub_default-rollout_show
+- az_providerhub_default-rollout_stop
+- az_providerhub_default-rollout_wait
+- az_providerhub_manifest
+- az_providerhub_manifest_checkin
+- az_providerhub_manifest_generate
+- az_providerhub_provider-registration
+- az_providerhub_provider-registration_create
+- az_providerhub_provider-registration_delete
+- az_providerhub_provider-registration_generate-operation
+- az_providerhub_provider-registration_list
+- az_providerhub_provider-registration_show
+- az_providerhub_provider-registration_wait
+- az_providerhub_resource-type-registration
+- az_providerhub_resource-type-registration_create
+- az_providerhub_resource-type-registration_delete
+- az_providerhub_resource-type-registration_list
+- az_providerhub_resource-type-registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/providerhub/custom-rollout.yml b/2017-03-09-profile/docs-ref-autogen/providerhub/custom-rollout.yml
new file mode 100644
index 0000000000..1e6e80c224
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/providerhub/custom-rollout.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_custom-rollout
+name: az providerhub custom-rollout
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub custom-rollout** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage custom rollout with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_custom-rollout_create
+  name: az providerhub custom-rollout create
+  summary: Create the rollout details.
+  description: ''
+  syntax: >-
+    az providerhub custom-rollout create --canary
+                                         --provider-namespace
+                                         --rollout-name
+  examples:
+  - summary: CustomRollouts_CreateOrUpdate
+    syntax: az providerhub custom-rollout create --provider-namespace "Microsoft.Contoso" --rollout-name "canaryTesting99" --canary regions="EastUS2EUAP"
+  requiredParameters:
+  - isRequired: true
+    name: --canary
+    summary: The canary regions to apply the manifest.
+    description: >-
+      Usage: --canary regions=XX
+
+
+      regions: Required. Comma separated list of canary regions.
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+- uid: az_providerhub_custom-rollout_list
+  name: az providerhub custom-rollout list
+  summary: Gets the list of the custom rollouts for the given provider.
+  description: ''
+  syntax: az providerhub custom-rollout list --provider-namespace
+  examples:
+  - summary: CustomRollouts_ListByProviderRegistration
+    syntax: az providerhub custom-rollout list --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_custom-rollout_show
+  name: az providerhub custom-rollout show
+  summary: Gets the custom rollout details.
+  description: ''
+  syntax: >-
+    az providerhub custom-rollout show --provider-namespace
+                                       --rollout-name
+  examples:
+  - summary: CustomRollouts_Get
+    syntax: az providerhub custom-rollout show --provider-namespace "Microsoft.Contoso" --rollout-name "canaryTesting99"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+commands:
+- az_providerhub_custom-rollout_create
+- az_providerhub_custom-rollout_list
+- az_providerhub_custom-rollout_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage custom rollout with providerhub.
diff --git a/2017-03-09-profile/docs-ref-autogen/providerhub/default-rollout.yml b/2017-03-09-profile/docs-ref-autogen/providerhub/default-rollout.yml
new file mode 100644
index 0000000000..e9d3326ecd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/providerhub/default-rollout.yml
@@ -0,0 +1,192 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_default-rollout
+name: az providerhub default-rollout
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub default-rollout** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage default rollout with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_default-rollout_create
+  name: az providerhub default-rollout create
+  summary: Create the rollout details.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout create --provider-namespace
+                                          --rollout-name
+                                          --row2-wait-duration
+                                          [--no-wait]
+                                          [--skip-regions]
+  examples:
+  - summary: DefaultRollouts_CreateOrUpdate
+    syntax: az providerhub default-rollout create --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10" --skip-regions "brazilus, centraluseuap" --row2-wait-duration "PT24H"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+  - isRequired: true
+    name: --row2-wait-duration
+    summary: Optional. The wait duration before rolling out to the Rest of the World Two regions.
+    description: 'Usage: --row2-wait-duration "PT24H".'
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --skip-regions
+    summary: Optional. The canary regions to skip applying the manifest in.
+    description: 'Usage: --skip-regions "brazilus, centraluseuap".'
+- uid: az_providerhub_default-rollout_delete
+  name: az providerhub default-rollout delete
+  summary: Deletes the rollout resource. Rollout must be in terminal state.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout delete --provider-namespace
+                                          --rollout-name
+                                          [--yes]
+  examples:
+  - summary: DefaultRollouts_Delete
+    syntax: az providerhub default-rollout delete --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_providerhub_default-rollout_list
+  name: az providerhub default-rollout list
+  summary: Gets the list of the rollouts for the given provider.
+  description: ''
+  syntax: az providerhub default-rollout list --provider-namespace
+  examples:
+  - summary: DefaultRollouts_ListByProviderRegistration
+    syntax: az providerhub default-rollout list --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_default-rollout_show
+  name: az providerhub default-rollout show
+  summary: Gets the default rollout details.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout show --provider-namespace
+                                        --rollout-name
+  examples:
+  - summary: DefaultRollouts_Get
+    syntax: az providerhub default-rollout show --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+- uid: az_providerhub_default-rollout_stop
+  name: az providerhub default-rollout stop
+  summary: Stops or cancels the rollout, if in progress.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout stop --provider-namespace
+                                        --rollout-name
+  examples:
+  - summary: DefaultRollouts_Stop
+    syntax: az providerhub default-rollout stop --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+- uid: az_providerhub_default-rollout_wait
+  name: az providerhub default-rollout wait
+  summary: Place the CLI in a waiting state until a condition of the providerhub default-rollout is met.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout wait --provider-namespace
+                                        --rollout-name
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--interval]
+                                        [--timeout]
+                                        [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the providerhub default-rollout is successfully created.
+    syntax: az providerhub default-rollout wait --provider-namespace "Microsoft.Contoso" --rollout-name "2020week10" --created
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_providerhub_default-rollout_create
+- az_providerhub_default-rollout_delete
+- az_providerhub_default-rollout_list
+- az_providerhub_default-rollout_show
+- az_providerhub_default-rollout_stop
+- az_providerhub_default-rollout_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage default rollout with providerhub.
diff --git a/2017-03-09-profile/docs-ref-autogen/providerhub/manifest.yml b/2017-03-09-profile/docs-ref-autogen/providerhub/manifest.yml
new file mode 100644
index 0000000000..d1c1c73cdd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/providerhub/manifest.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_manifest
+name: az providerhub manifest
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub manifest** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage manifest with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_manifest_checkin
+  name: az providerhub manifest checkin
+  summary: Checkin the manifest.
+  description: ''
+  syntax: >-
+    az providerhub manifest checkin --arm-manifest-location
+                                    --environment
+                                    --provider-namespace
+  examples:
+  - summary: CheckinManifest
+    syntax: az providerhub manifest checkin --provider-namespace "Microsoft.Contoso" --environment "Canary" --arm-manifest-location "EastUS2EUAP"
+  requiredParameters:
+  - isRequired: true
+    name: --arm-manifest-location
+    summary: The baseline ARM manifest location.
+    description: ''
+  - isRequired: true
+    name: --environment
+    summary: The environment to checkin the manifest.
+    description: ''
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_manifest_generate
+  name: az providerhub manifest generate
+  summary: Generates the manifest for the given provider.
+  description: ''
+  syntax: az providerhub manifest generate --provider-namespace
+  examples:
+  - summary: GenerateManifest
+    syntax: az providerhub manifest generate --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+commands:
+- az_providerhub_manifest_checkin
+- az_providerhub_manifest_generate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage manifest with providerhub.
diff --git a/2017-03-09-profile/docs-ref-autogen/providerhub/provider-registration.yml b/2017-03-09-profile/docs-ref-autogen/providerhub/provider-registration.yml
new file mode 100644
index 0000000000..bf78d89837
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/providerhub/provider-registration.yml
@@ -0,0 +1,290 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_provider-registration
+name: az providerhub provider-registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub provider-registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage provider registration with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_provider-registration_create
+  name: az providerhub provider-registration create
+  summary: Create the provider registration.
+  description: ''
+  syntax: >-
+    az providerhub provider-registration create --provider-namespace
+                                                [--capabilities]
+                                                [--incident-contact-email]
+                                                [--incident-routing-service]
+                                                [--incident-routing-team]
+                                                [--lighthouse-authorizations]
+                                                [--managed-by-tenant-id]
+                                                [--manifest-owners]
+                                                [--metadata]
+                                                [--namespace]
+                                                [--no-wait]
+                                                [--opt-in-headers {ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership}]
+                                                [--provider-authentication]
+                                                [--provider-authorizations]
+                                                [--provider-type {AuthorizationFree, External, Hidden, Internal, LegacyRegistrationRequired, NotSpecified, RegistrationFree, TenantOnly}]
+                                                [--provider-version]
+                                                [--providerhub-metadata-provider-authorizations]
+                                                [--providerhub-metadata-rp-authentication]
+                                                [--required-features-policy {All, Any}]
+                                                [--resource-access-policy {AcisActionAllowed, AcisReadAllowed, NotSpecified}]
+                                                [--schema-owners]
+                                                [--service-tree-infos]
+                                                [--template-deployment-options]
+  examples:
+  - summary: ProviderRegistrations_CreateOrUpdate
+    syntax: az providerhub provider-registration create --capabilities effect="Allow" quota-id="CSP_2015-05-01" --capabilities effect="Allow" quota-id="CSP_MG_2017-12-01" --incident-contact-email "helpme@contoso.com" --incident-routing-service "Contoso Resource Provider" --incident-routing-team "Contoso Triage" --provider-type "Internal" --provider-version "2.0" --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  optionalParameters:
+  - name: --capabilities
+    summary: The resource provider capabilities.
+    description: >-
+      Usage: --capabilities quota-id=XX effect=XX required-features=XX
+
+
+      Multiple actions can be specified by using more than one --capabilities argument.
+  - name: --incident-contact-email
+    summary: The email address of contacts for incidents related to the RP.
+    description: 'Usage: --incident-contact-email "helpme@contoso.com".'
+  - name: --incident-routing-service
+    summary: The service in IcM when creating or transferring incidents to the RP.
+    description: 'Usage: --incident-routing-service "Contoso Resource Provider".'
+  - name: --incident-routing-team
+    summary: The team in IcM when creating or transferring incidents to the RP.
+    description: 'Usage: --incident-routing-team "Contoso Triage".'
+  - name: --lighthouse-authorizations
+    summary: The lighthouse authorizations.
+    description: >-
+      Usage: --lighthouse-authorizations principal-id=XX role-definition-id=XX
+
+
+      principal-id: Required. The principal ID.
+
+      role-definition-id: Required. The role definition ID.
+  - name: --managed-by-tenant-id
+    summary: The managed by tenant ID.
+    description: 'Usage: --managed-by-tenant-id "00000000-0000-0000-0000-000000000000".'
+  - name: --manifest-owners
+    summary: Specifies an array of required ACIS claims to modify the resource provider's manifest content via ACIS.
+    description: >-
+      Usage: --manifest-owners "SPARTA-PlatformServiceAdministrator"
+
+       Multiple actions can be specified by using more than one --manifest-owners argument.
+  - name: --metadata
+    summary: The metadata.
+    description: ''
+  - name: --namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: 'Usage: --namespace "Microsoft.Contoso".'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --opt-in-headers
+    parameterValueGroup: ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership
+    summary: The opt-in headers.
+    description: 'Usage: --opt-in-headers "SignedUserToken".'
+  - name: --provider-authentication
+    summary: Used to set alternative audiences or resources that ARM should accept from the token while authenticating requests for the provider.
+    description: >-
+      Usage: --provider-authentication allowed-audiences=XX
+
+
+      allowed-audiences: Required. The allowed audiences.
+  - name: --provider-authorizations
+    summary: The resource provider authorizations.
+    description: >-
+      Usage: --provider-authorizations application-id=XX role-definition-id=XX managed-by-role-definition-id=XX
+
+
+      application-id: Required. The application ID.
+
+      role-definition-id: Required. The role definition ID.
+
+      managed-by-role-definition-id: Required. The managed by role definition ID.
+  - name: --provider-type
+    parameterValueGroup: AuthorizationFree, External, Hidden, Internal, LegacyRegistrationRequired, NotSpecified, RegistrationFree, TenantOnly
+    summary: The provider type.
+    description: 'Usage: --provider-type "Internal".'
+  - name: --provider-version
+    defaultValue: "2.0"
+    summary: The provider version.
+    description: 'Usage: --provider-version "2.0".'
+  - name: --providerhub-metadata-provider-authorizations
+    summary: The provider authorizations.
+    description: >-
+      Usage: --providerhub-metadata-provider-authorizations application-id=XX role-definition-id=XX managed-by-role-definition-id=XX
+
+
+      application-id: Required. The application ID.
+
+      role-definition-id: Required. The role definition ID.
+
+      managed-by-role-definition-id: Required. The managed by role definition ID.
+  - name: --providerhub-metadata-rp-authentication
+    summary: Used to set alternative audiences or resources that ARM should accept from the token while authenticating requests for the provider. Only available to tenant level providers.
+    description: >-
+      Usage: --providerhub-metadata-rp-authentication allowed-audiences=XX
+
+
+      allowed-audiences: Required. The allowed audiences.
+  - name: --required-features-policy
+    parameterValueGroup: All, Any
+    summary: The accepted values are "Any" or "All". If the value is "All", then only the subscriptions registered to all the corresponding feature flag will be allowed.​.
+    description: 'Usage: --required-features-policy "All".'
+  - name: --resource-access-policy
+    parameterValueGroup: AcisActionAllowed, AcisReadAllowed, NotSpecified
+    summary: The resource access policy.
+    description: 'Usage: --resource-access-policy "AcisReadAllowed, AcisActionAllowed".'
+  - name: --schema-owners
+    summary: Specifies an array of needed ACIS claims to modify the resource provider schema via ACIS.
+    description: >-
+      Usage: --schema-owners "Contoso schema owners"
+
+       Multiple actions can be specified by using more than one --schema-owners argument.
+  - name: --service-tree-infos
+    summary: The ServiceTree information for the resource provider.
+    description: >-
+      Usage: --service-tree-infos service-id=XX component-id=XX
+
+
+      service-id: Required. The service ID.
+
+      component-id: Required. The component ID.
+  - name: --template-deployment-options
+    summary: The template deployment options.
+    description: 'Usage: --template-deployment-options preflight-supported=XX preflight-options=XX.'
+- uid: az_providerhub_provider-registration_delete
+  name: az providerhub provider-registration delete
+  summary: Deletes a provider registration.
+  description: ''
+  syntax: >-
+    az providerhub provider-registration delete --provider-namespace
+                                                [--yes]
+  examples:
+  - summary: ProviderRegistrations_Delete
+    syntax: az providerhub provider-registration delete --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_providerhub_provider-registration_generate-operation
+  name: az providerhub provider-registration generate-operation
+  summary: Generates the operations api for the given provider.
+  description: ''
+  syntax: az providerhub provider-registration generate-operation --provider-namespace
+  examples:
+  - summary: ProviderRegistrations_GenerateOperations
+    syntax: az providerhub provider-registration generate-operation --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_provider-registration_list
+  name: az providerhub provider-registration list
+  summary: Gets the list of the provider registrations in the subscription.
+  description: ''
+  syntax: az providerhub provider-registration list [--resource-group]
+  examples:
+  - summary: ProviderRegistrations_List
+    syntax: az providerhub provider-registration list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_providerhub_provider-registration_show
+  name: az providerhub provider-registration show
+  summary: Gets the provider registration details.
+  description: ''
+  syntax: az providerhub provider-registration show --provider-namespace
+  examples:
+  - summary: ProviderRegistrations_Get
+    syntax: az providerhub provider-registration show --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_provider-registration_wait
+  name: az providerhub provider-registration wait
+  summary: Place the CLI in a waiting state until a condition of the providerhub provider-registration is met.
+  description: ''
+  syntax: >-
+    az providerhub provider-registration wait --provider-namespace
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the providerhub provider-registration is successfully created.
+    syntax: az providerhub provider-registration wait --provider-namespace "Microsoft.Contoso" --created
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_providerhub_provider-registration_create
+- az_providerhub_provider-registration_delete
+- az_providerhub_provider-registration_generate-operation
+- az_providerhub_provider-registration_list
+- az_providerhub_provider-registration_show
+- az_providerhub_provider-registration_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage provider registration with providerhub.
diff --git a/2017-03-09-profile/docs-ref-autogen/providerhub/resource-type-registration.yml b/2017-03-09-profile/docs-ref-autogen/providerhub/resource-type-registration.yml
new file mode 100644
index 0000000000..e9c685bb2c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/providerhub/resource-type-registration.yml
@@ -0,0 +1,360 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_resource-type-registration
+name: az providerhub resource-type-registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub resource-type-registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage resource type registration with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_resource-type-registration_create
+  name: az providerhub resource-type-registration create
+  summary: Create a resource type.
+  description: ''
+  syntax: >-
+    az providerhub resource-type-registration create --provider-namespace
+                                                     --resource-type
+                                                     [--allowed-unauthorized-actions]
+                                                     [--authorization-action-mappings]
+                                                     [--check-name-availability-specifications]
+                                                     [--default-api-version]
+                                                     [--disallowed-action-verbs]
+                                                     [--enable-async-operation {false, true}]
+                                                     [--enable-third-party-s2s {false, true}]
+                                                     [--endpoints]
+                                                     [--extended-locations]
+                                                     [--identity-management]
+                                                     [--is-pure-proxy {false, true}]
+                                                     [--linked-access-checks]
+                                                     [--logging-rules]
+                                                     [--marketplace-type {AddOn, Bypass, NotSpecified, Store}]
+                                                     [--opt-in-headers {ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership}]
+                                                     [--regionality {Global, NotSpecified, Regional}]
+                                                     [--required-features]
+                                                     [--required-features-policy {All, Any}]
+                                                     [--resource-creation-begin]
+                                                     [--resource-deletion-policy {CascadeDeleteAll, CascadeDeleteProxyOnlyChildren, NotSpecified}]
+                                                     [--resource-move-policy]
+                                                     [--resource-patch-begin]
+                                                     [--routing-type {CascadeExtension, Default, Extension, Failover, Fanout, HostBased, LocationBased, ProxyOnly, Tenant}]
+                                                     [--service-tree-infos]
+                                                     [--subscription-state-rules]
+                                                     [--swagger-specifications]
+                                                     [--template-deployment-options]
+                                                     [--throttling-rules]
+  examples:
+  - summary: ResourceTypeRegistration_CreateOrUpdate
+    syntax: az providerhub resource-type-registration create --endpoints api-versions="2020-01-01-preview,2019-01-01" locations="West US, West Central US" required-features="Microsoft.Contoso/SampleApp" --regionality "regional" --routing-type "Default" --swagger-specifications api-versions="2020-06-01-preview" swagger-spec-folder-uri="https://rp-swagger-spec-uri.com/" --provider-namespace "Microsoft.Contoso" --resource-type "testResourceType"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The resource type.
+    description: ''
+  optionalParameters:
+  - name: --allowed-unauthorized-actions
+    summary: The allowed unauthorized actions.
+    description: 'Usage: --allowed-unauthorized-actions "Microsoft.Contoso/rpResourceType/read, Microsoft.Contoso/rpResourceType/delete".'
+  - name: --authorization-action-mappings
+    summary: Allows RP to override action verb for RBAC purposes at ARM.
+    description: >-
+      Usage: --authorization-action-mappings original=XX desired=XX
+
+
+      original: Required. The original action name.
+
+      desired: Required. The desired action name.
+
+
+      Multiple actions can be specified by using more than one --authorization-action-mappings argument.
+  - name: --check-name-availability-specifications
+    summary: Name availability checks feature at the platform level.
+    description: >-
+      Usage: --check-name-availability-specifications enable-default-validation=XX resource-types-with-custom-validation=XX
+
+
+      enable-default-validation: Boolean indicating whether RP has chosen to opt-out of RPaaS to perform check name.
+
+      resource-types-with-custom-validation: The types which needs additional validation from the RP.
+  - name: --default-api-version
+    summary: The default API version for the endpoint.
+    description: 'Usage: --default-api-version "2021-01-01".'
+  - name: --disallowed-action-verbs
+    summary: The disallowed action verbs.
+    description: 'Usage: --disallowed-action-verbs "read".'
+  - name: --enable-async-operation
+    parameterValueGroup: false, true
+    summary: Indicates whether the async operation is enabled for this resource type.
+    description: 'Usage: --enable-async-operation "false".'
+  - name: --enable-third-party-s2s
+    parameterValueGroup: false, true
+    summary: Indicates whether third party s2s is enabled for this resource type.
+    description: 'Usage: --enable-third-party-s2s "false".'
+  - name: --endpoints
+    summary: The resource type endpoints.
+    description: >-
+      Usage: --endpoints api-versions=XX locations=XX required-features=XX
+
+
+      api-versions: Required. Comma separated list of API versions.
+
+      locations: Required. Comma separated list of locations.
+
+      required-features: Required. Comma separated list of required features.
+
+
+      Multiple actions can be specified by using more than one --endpoints argument.
+  - name: --extended-locations
+    summary: The extended location options.
+    description: >-
+      Usage: --extended-locations type=XX supported-policy=XX
+
+
+      type: The extended location type.
+
+      supported-policy: The supported policy.
+
+
+      Multiple actions can be specified by using more than one --extended-locations argument.
+  - name: --identity-management
+    summary: MSI related settings.
+    description: >-
+      Usage: --identity-management type=XX application-id=XX
+
+
+      type: The type of the identity management.
+
+      application-id: The application ID that handles the identity.
+  - name: --is-pure-proxy
+    parameterValueGroup: false, true
+    summary: Indicates whether this is a PureProxy resource type.
+    description: 'Usage: --is-pure-proxy "false".'
+  - name: --linked-access-checks
+    summary: Enables additional Role Based Access Control (RBAC) checks on related resources.
+    description: >-
+      Usage: --linked-access-checks action-name=XX linked-property=XX linked-action=XX linked-action-verb=XX linked-type=XX
+
+
+      action-name: The action name.
+
+      linked-property: The linked property.
+
+      linked-action: The linked action.
+
+      linked-action-verb: The linked action verb.
+
+      linked-type: The linked type.
+
+
+      Multiple actions can be specified by using more than one --linked-access-checks argument.
+  - name: --logging-rules
+    summary: The logging rules.
+    description: >-
+      Usage: --logging-rules action=XX direction=XX detail-level=XX
+
+
+      action: Required. The action name.
+
+      direction: Required. The direction.
+
+      detail-level: Required. The detail level.
+
+
+      Multiple actions can be specified by using more than one --logging-rules argument.
+  - name: --marketplace-type
+    parameterValueGroup: AddOn, Bypass, NotSpecified, Store
+    summary: The type of marketplace behavior for the resource type.
+    description: 'Usage: --marketplace-type "AddOn".'
+  - name: --opt-in-headers
+    parameterValueGroup: ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership
+    summary: The opt-in headers.
+    description: 'Usage: --opt-in-headers "SignedUserToken".'
+  - name: --regionality
+    parameterValueGroup: Global, NotSpecified, Regional
+    summary: The regionality of the resource type.
+    description: 'Usage: --regionality "Regional".'
+  - name: --required-features
+    summary: The required features.
+    description: 'Usage: --required-features "Microsoft.Contoso/feature1, Microsoft.Contoso/feature2".'
+  - name: --required-features-policy
+    parameterValueGroup: All, Any
+    summary: The accepted values are "Any" or "All". If the value is "All", then only the subscriptions registered to all the corresponding feature flag will be allowed.​.
+    description: 'Usage: --required-features-policy "All".'
+  - name: --resource-creation-begin
+    summary: Extension options for handling the resource creation begin extension request.
+    description: >-
+      Usage: --resource-creation-begin request=XX response=XX
+
+
+      request: The comma separated list of extension option types.
+
+      response: The comma separated list of extension option types.
+  - name: --resource-deletion-policy
+    parameterValueGroup: CascadeDeleteAll, CascadeDeleteProxyOnlyChildren, NotSpecified
+    summary: The resource deletion policy.
+    description: 'Usage: --resource-deletion-policy "CascadeDeleteAll".'
+  - name: --resource-move-policy
+    summary: The resource move policy.
+    description: >-
+      Usage: --resource-move-policy validation-required=XX cross-resource-group-move-enabled=XX cross-subscription-move-enabled=XX
+
+
+      validation-required: Boolean indicating whether validation is required for moving the resource.
+
+      cross-resource-group-move-enabled: Boolean indicating whether moving resources across resource groups is allowed.
+
+      cross-subscription-move-enabled: Boolean indicating whether moving resources across subscriptions is allowed.
+  - name: --resource-patch-begin
+    summary: Extension options for handling the resource patch begin extension request.
+    description: >-
+      Usage: --resource-patch-begin request=XX response=XX
+
+
+      request: The comma separated list of extension option types.
+
+      response: The comma separated list of extension option types.
+  - name: --routing-type
+    parameterValueGroup: CascadeExtension, Default, Extension, Failover, Fanout, HostBased, LocationBased, ProxyOnly, Tenant
+    summary: The resource routing type.​.
+    description: 'Usage: --routing-type "Default".'
+  - name: --service-tree-infos
+    summary: The ServiceTree information for the resource provider.
+    description: >-
+      Usage: --service-tree-infos service-id=XX component-id=XX
+
+
+      service-id: Required. The service ID.
+
+      component-id: Required. The component ID.
+
+
+      Multiple actions can be specified by using more than one --service-tree-infos argument.
+  - name: --subscription-state-rules
+    summary: The subscription state rules.
+    description: >-
+      Usage: --subscription-state-rules state=XX allowed-actions=XX
+
+
+      state: The subscription state.
+
+      allowed-actions: The allowed actions.
+
+
+      Multiple actions can be specified by using more than one --subscription-state-rules argument.
+  - name: --swagger-specifications
+    summary: The Swagger spec of the resource type.
+    description: >-
+      Usage: --swagger-specifications api-versions=XX swagger-spec-folder-uri=XX
+
+
+      api-versions: Required. The resource type API versions, separated by commas.
+
+      swagger-spec-folder-uri: Required. The Swagger spec URI.
+
+
+      Multiple actions can be specified by using more than one --swagger-specifications argument.
+  - name: --template-deployment-options
+    summary: The template deployment options.
+    description: >-
+      Usage: --template-deployment-options preflight-supported=XX preflight-options=XX
+
+
+      preflight-supported: Boolean indicating whether preflight validation is supported.
+
+      preflight-options: The preflight options.
+  - name: --throttling-rules
+    summary: Enables setting individual limits for different actions in terms of number of requests or number of resources (for collection read requests only).
+    description: >-
+      Usage: --throttling-rules action=XX metrics=XX required-features=XX
+
+
+      action: Required. The action name.
+
+      metrics: Required. The throttling metrics.
+
+      required-features: The throttling rule required features.
+
+
+      Multiple actions can be specified by using more than one --throttling-rules argument.
+- uid: az_providerhub_resource-type-registration_delete
+  name: az providerhub resource-type-registration delete
+  summary: Deletes a resource type.
+  description: ''
+  syntax: >-
+    az providerhub resource-type-registration delete --provider-namespace
+                                                     --resource-type
+                                                     [--yes]
+  examples:
+  - summary: ResourceTypeRegistration_Delete
+    syntax: az providerhub resource-type-registration delete --provider-namespace "Microsoft.Contoso" --resource-type "testResourceType"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The resource type.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_providerhub_resource-type-registration_list
+  name: az providerhub resource-type-registration list
+  summary: Gets the list of the resource types for the given provider.
+  description: ''
+  syntax: az providerhub resource-type-registration list --provider-namespace
+  examples:
+  - summary: ResourceTypeRegistrations_ListByProviderRegistration
+    syntax: az providerhub resource-type-registration list --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_resource-type-registration_show
+  name: az providerhub resource-type-registration show
+  summary: Gets a resource type details in the given subscription and provider.
+  description: ''
+  syntax: >-
+    az providerhub resource-type-registration show --provider-namespace
+                                                   --resource-type
+  examples:
+  - summary: ResourceTypeRegistrations_Get
+    syntax: az providerhub resource-type-registration show --provider-namespace "Microsoft.Contoso" --resource-type "testResourceType"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The resource type.
+    description: ''
+commands:
+- az_providerhub_resource-type-registration_create
+- az_providerhub_resource-type-registration_delete
+- az_providerhub_resource-type-registration_list
+- az_providerhub_resource-type-registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage resource type registration with providerhub.
diff --git a/2017-03-09-profile/docs-ref-autogen/quantum.yml b/2017-03-09-profile/docs-ref-autogen/quantum.yml
new file mode 100644
index 0000000000..f076428e25
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/quantum.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum
+name: az quantum
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Quantum Workspaces and submit jobs to Azure Quantum Providers.
+description: ''
+directCommands:
+- uid: az_quantum_execute
+  name: az quantum execute
+  summary: Submit a job to run on Azure Quantum, and waits for the result.
+  description: ''
+  syntax: >-
+    az quantum execute [--job-name]
+                       [--location]
+                       [--no-build]
+                       [--project]
+                       [--resource-group]
+                       [--shots]
+                       [--storage]
+                       [--target-id]
+                       [--workspace-name]
+                       [<PROGRAM_ARGS>]
+  examples:
+  - summary: Submit the Q# program from the current folder and wait for the result.
+    syntax: az quantum execute -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --job-name
+    summary: A friendly name to give to this run of the program.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-build
+    summary: If specified, the Q# program is not built before submitting.
+    description: ''
+  - name: --project
+    summary: The location of the Q# project to submit. Defaults to current folder.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --shots
+    summary: The number of times to run the Q# program on the given target.
+    description: ''
+  - name: --storage
+    summary: If specified, the ConnectionString of an Azure Storage is used to store job data and results.
+    description: ''
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+  - name: <PROGRAM_ARGS>
+    summary: List of arguments expected by the Q# operation specified as --name=value after `--`.
+    description: ''
+- uid: az_quantum_run
+  name: az quantum run
+  summary: Equivalent to `az quantum execute`.
+  description: ''
+  syntax: >-
+    az quantum run [--job-name]
+                   [--location]
+                   [--no-build]
+                   [--project]
+                   [--resource-group]
+                   [--shots]
+                   [--storage]
+                   [--target-id]
+                   [--workspace-name]
+                   [<PROGRAM_ARGS>]
+  examples:
+  - summary: Submit the Q# program from the current folder and wait for the result.
+    syntax: az quantum run -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --job-name
+    summary: A friendly name to give to this run of the program.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-build
+    summary: If specified, the Q# program is not built before submitting.
+    description: ''
+  - name: --project
+    summary: The location of the Q# project to submit. Defaults to current folder.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --shots
+    summary: The number of times to run the Q# program on the given target.
+    description: ''
+  - name: --storage
+    summary: If specified, the ConnectionString of an Azure Storage is used to store job data and results.
+    description: ''
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+  - name: <PROGRAM_ARGS>
+    summary: List of arguments expected by the Q# operation specified as --name=value after `--`.
+    description: ''
+commands:
+- az_quantum_execute
+- az_quantum_job
+- az_quantum_job_list
+- az_quantum_job_output
+- az_quantum_job_show
+- az_quantum_job_submit
+- az_quantum_job_wait
+- az_quantum_offerings
+- az_quantum_offerings_accept-terms
+- az_quantum_offerings_list
+- az_quantum_offerings_show-terms
+- az_quantum_run
+- az_quantum_target
+- az_quantum_target_clear
+- az_quantum_target_list
+- az_quantum_target_set
+- az_quantum_target_show
+- az_quantum_workspace
+- az_quantum_workspace_clear
+- az_quantum_workspace_create
+- az_quantum_workspace_delete
+- az_quantum_workspace_list
+- az_quantum_workspace_quotas
+- az_quantum_workspace_set
+- az_quantum_workspace_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Quantum Workspaces and submit jobs to Azure Quantum Providers.
diff --git a/2017-03-09-profile/docs-ref-autogen/quantum/job.yml b/2017-03-09-profile/docs-ref-autogen/quantum/job.yml
new file mode 100644
index 0000000000..ddc95de9af
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/quantum/job.yml
@@ -0,0 +1,197 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_job
+name: az quantum job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage jobs for Azure Quantum.
+description: ''
+directCommands:
+- uid: az_quantum_job_list
+  name: az quantum job list
+  summary: Get the list of jobs in a Quantum Workspace.
+  description: ''
+  syntax: >-
+    az quantum job list [--location]
+                        [--resource-group]
+                        [--workspace-name]
+  examples:
+  - summary: Get the list of jobs from an Azure Quantum workspace.
+    syntax: az quantum job list -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_job_output
+  name: az quantum job output
+  summary: Get the results of running a Q# job.
+  description: ''
+  syntax: >-
+    az quantum job output --job-id
+                          [--location]
+                          [--resource-group]
+                          [--workspace-name]
+  examples:
+  - summary: Print the results of a successful Azure Quantum job.
+    syntax: >-
+      az quantum job output -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -j yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy -o table
+  requiredParameters:
+  - isRequired: true
+    name: --job-id -j
+    summary: Job unique identifier in GUID format.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_job_show
+  name: az quantum job show
+  summary: Get the job's status and details.
+  description: ''
+  syntax: >-
+    az quantum job show --job-id
+                        [--location]
+                        [--resource-group]
+                        [--workspace-name]
+  examples:
+  - summary: Get the status of an Azure Quantum job.
+    syntax: >-
+      az quantum job show -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -j yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy --query status
+  requiredParameters:
+  - isRequired: true
+    name: --job-id -j
+    summary: Job unique identifier in GUID format.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_job_submit
+  name: az quantum job submit
+  summary: Submit a Q# project to run on Azure Quantum.
+  description: ''
+  syntax: >-
+    az quantum job submit [--job-name]
+                          [--location]
+                          [--no-build]
+                          [--project]
+                          [--resource-group]
+                          [--shots]
+                          [--storage]
+                          [--target-id]
+                          [--workspace-name]
+                          [<PROGRAM_ARGS>]
+  examples:
+  - summary: Submit the Q# program from the current folder.
+    syntax: >-
+      az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation \
+         -l MyLocation --job-name MyJob
+  optionalParameters:
+  - name: --job-name
+    summary: A friendly name to give to this run of the program.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-build
+    summary: If specified, the Q# program is not built before submitting.
+    description: ''
+  - name: --project
+    summary: The location of the Q# project to submit. Defaults to current folder.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --shots
+    summary: The number of times to run the Q# program on the given target.
+    description: ''
+  - name: --storage
+    summary: If specified, the ConnectionString of an Azure Storage is used to store job data and results.
+    description: ''
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+  - name: <PROGRAM_ARGS>
+    summary: List of arguments expected by the Q# operation specified as --name=value after `--`.
+    description: ''
+- uid: az_quantum_job_wait
+  name: az quantum job wait
+  summary: Place the CLI in a waiting state until the job finishes running.
+  description: ''
+  syntax: >-
+    az quantum job wait --job-id
+                        [--location]
+                        [--max-poll-wait-secs]
+                        [--resource-group]
+                        [--workspace-name]
+  examples:
+  - summary: Wait for completion of a job for 60 seconds.
+    syntax: >-
+      az quantum job wait -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -j yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy --max-poll-wait-secs 60 -o table
+  requiredParameters:
+  - isRequired: true
+    name: --job-id -j
+    summary: Job unique identifier in GUID format.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --max-poll-wait-secs
+    defaultValue: "5"
+    summary: Poll time in seconds to query Azure Quantum for results of the corresponding job.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+commands:
+- az_quantum_job_list
+- az_quantum_job_output
+- az_quantum_job_show
+- az_quantum_job_submit
+- az_quantum_job_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage jobs for Azure Quantum.
diff --git a/2017-03-09-profile/docs-ref-autogen/quantum/offerings.yml b/2017-03-09-profile/docs-ref-autogen/quantum/offerings.yml
new file mode 100644
index 0000000000..434e3d170c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/quantum/offerings.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_offerings
+name: az quantum offerings
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum offerings** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage provider offerings for Azure Quantum.
+description: ''
+directCommands:
+- uid: az_quantum_offerings_accept-terms
+  name: az quantum offerings accept-terms
+  summary: Accept the terms of a provider and SKU combination to enable it for workspace creation.
+  description: ''
+  syntax: >-
+    az quantum offerings accept-terms [--location]
+                                      [--provider-id]
+                                      [--sku]
+  examples:
+  - summary: Once terms have been reviewed, accept the invoking this command.
+    syntax: az quantum offerings accept-terms -p MyProviderId -k MySKU -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --provider-id -p
+    summary: Identifier of an Azure Quantum provider.
+    description: ''
+  - name: --sku -k
+    summary: Identify a plan or SKU offered by an Azure Quantum provider.
+    description: ''
+- uid: az_quantum_offerings_list
+  name: az quantum offerings list
+  summary: Get the list of all provider offerings available on the given location.
+  description: ''
+  syntax: az quantum offerings list [--location]
+  examples:
+  - summary: List offerings available in an Azure location.
+    syntax: az quantum offerings list -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_quantum_offerings_show-terms
+  name: az quantum offerings show-terms
+  summary: Show the terms of a provider and SKU combination including license URL and acceptance status.
+  description: ''
+  syntax: >-
+    az quantum offerings show-terms [--location]
+                                    [--provider-id]
+                                    [--sku]
+  examples:
+  - summary: Use a Provider Id and SKU from `az quantum offerings list` to review the terms.
+    syntax: az quantum offerings show-terms -p MyProviderId -k MySKU -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --provider-id -p
+    summary: Identifier of an Azure Quantum provider.
+    description: ''
+  - name: --sku -k
+    summary: Identify a plan or SKU offered by an Azure Quantum provider.
+    description: ''
+commands:
+- az_quantum_offerings_accept-terms
+- az_quantum_offerings_list
+- az_quantum_offerings_show-terms
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage provider offerings for Azure Quantum.
diff --git a/2017-03-09-profile/docs-ref-autogen/quantum/target.yml b/2017-03-09-profile/docs-ref-autogen/quantum/target.yml
new file mode 100644
index 0000000000..b5f9a65967
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/quantum/target.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_target
+name: az quantum target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage targets for Azure Quantum workspaces.
+description: ''
+directCommands:
+- uid: az_quantum_target_clear
+  name: az quantum target clear
+  summary: Clear the default target-id.
+  description: ''
+  syntax: az quantum target clear
+  examples:
+  - summary: Clear the default target-id.
+    syntax: az quantum target clear
+- uid: az_quantum_target_list
+  name: az quantum target list
+  summary: Get the list of providers and their targets in an Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum target list [--location]
+                           [--resource-group]
+                           [--workspace-name]
+  examples:
+  - summary: Get the list of targets available in a Azure Quantum workspaces
+    syntax: az quantum target list -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_target_set
+  name: az quantum target set
+  summary: Select the default target to use when submitting jobs to Azure Quantum.
+  description: ''
+  syntax: az quantum target set [--target-id]
+  examples:
+  - summary: Select a default when submitting jobs to Azure Quantum.
+    syntax: az quantum target set -t target-id
+  optionalParameters:
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+- uid: az_quantum_target_show
+  name: az quantum target show
+  summary: Get the details of the given (or current) target to use when submitting jobs to Azure Quantum.
+  description: ''
+  syntax: az quantum target show [--target-id]
+  examples:
+  - summary: Show the currently selected default target
+    syntax: az quantum target show
+  optionalParameters:
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+commands:
+- az_quantum_target_clear
+- az_quantum_target_list
+- az_quantum_target_set
+- az_quantum_target_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage targets for Azure Quantum workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/quantum/workspace.yml b/2017-03-09-profile/docs-ref-autogen/quantum/workspace.yml
new file mode 100644
index 0000000000..59ddda3d5c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/quantum/workspace.yml
@@ -0,0 +1,183 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_workspace
+name: az quantum workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Quantum workspaces.
+description: ''
+directCommands:
+- uid: az_quantum_workspace_clear
+  name: az quantum workspace clear
+  summary: Clear the default Azure Quantum workspace.
+  description: ''
+  syntax: az quantum workspace clear
+  examples:
+  - summary: Clear the default Azure Quantum workspace if previously set.
+    syntax: az quantum workspace clear
+- uid: az_quantum_workspace_create
+  name: az quantum workspace create
+  summary: Create a new Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace create [--location]
+                                [--provider-sku-list]
+                                [--resource-group]
+                                [--skip-role-assignment]
+                                [--storage-account]
+                                [--workspace-name]
+  examples:
+  - summary: Create a new Azure Quantum workspace with a specific list of providers.
+    syntax: >-
+      az quantum workspace create -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -r "MyProvider1 / MySKU1, MyProvider2 / MySKU2" -a MyStorageAccountName
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --provider-sku-list -r
+    summary: Comma separated list of Provider/SKU pairs.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --skip-role-assignment
+    summary: Skip the role assignment step for the quantum workspace in the storage account.
+    description: ''
+  - name: --storage-account -a
+    summary: Name of the storage account to be used by a quantum workspace.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_delete
+  name: az quantum workspace delete
+  summary: Delete the given (or current) Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace delete [--resource-group]
+                                [--workspace-name]
+  examples:
+  - summary: Delete an Azure Quantum workspace by name and group.
+    syntax: az quantum workspace delete -g MyResourceGroup -w MyWorkspace
+  - summary: Delete and clear the default Azure Quantum workspace (if one has been set).
+    syntax: az quantum workspace delete
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_list
+  name: az quantum workspace list
+  summary: Get the list of Azure Quantum workspaces available.
+  description: ''
+  syntax: >-
+    az quantum workspace list [--location]
+                              [--resource-group]
+                              [--tag]
+  examples:
+  - summary: Get the list of all Azure Quantum workspaces available.
+    syntax: az quantum workspace list
+  - summary: Get the list Azure Quantum workspaces available in a location.
+    syntax: az quantum workspace list -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --tag
+    summary: Show only quantum workspaces that have associated the specified tag.
+    description: ''
+- uid: az_quantum_workspace_quotas
+  name: az quantum workspace quotas
+  summary: List the quotas for the given (or current) Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace quotas [--location]
+                                [--resource-group]
+                                [--workspace-name]
+  examples:
+  - summary: List the quota information of the default workspace if set.
+    syntax: az quantum workspace quotas
+  - summary: List the quota information of a specified Azure Quantum workspace.
+    syntax: az quantum workspace quotas -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_set
+  name: az quantum workspace set
+  summary: Select a default Azure Quantum workspace for future commands.
+  description: ''
+  syntax: >-
+    az quantum workspace set [--location]
+                             [--resource-group]
+                             [--workspace-name]
+  examples:
+  - summary: Set the default Azure Quantum workspace.
+    syntax: az quantum workspace set -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_show
+  name: az quantum workspace show
+  summary: Get the details of the given (or current) Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace show [--resource-group]
+                              [--workspace-name]
+  examples:
+  - summary: Show the currently selected default Azure Quantum workspace.
+    syntax: az quantum workspace show
+  - summary: Show the details of a provided Azure Quantum workspace.
+    syntax: az quantum workspace show -g MyResourceGroup -w MyWorkspace
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+commands:
+- az_quantum_workspace_clear
+- az_quantum_workspace_create
+- az_quantum_workspace_delete
+- az_quantum_workspace_list
+- az_quantum_workspace_quotas
+- az_quantum_workspace_set
+- az_quantum_workspace_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Quantum workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/redisenterprise.yml b/2017-03-09-profile/docs-ref-autogen/redisenterprise.yml
new file mode 100644
index 0000000000..300f510cf9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/redisenterprise.yml
@@ -0,0 +1,310 @@
+### YamlMime:AzureCLIGroup
+uid: az_redisenterprise
+name: az redisenterprise
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **redisenterprise** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az redisenterprise** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage dedicated Redis Enterprise caches for your Azure applications.
+description: ''
+directCommands:
+- uid: az_redisenterprise_create
+  name: az redisenterprise create
+  summary: Create new Redis Enterprise cache instance.
+  description: Create or update an existing (overwrite/recreate, with potential downtime) cache cluster with an associated database.
+  syntax: >-
+    az redisenterprise create --cluster-name
+                              --resource-group
+                              --sku {EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50}
+                              [--capacity]
+                              [--client-protocol {Encrypted, Plaintext}]
+                              [--clustering-policy {EnterpriseCluster, OSSCluster}]
+                              [--eviction-policy {AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL}]
+                              [--location]
+                              [--minimum-tls-version {1.0, 1.1, 1.2}]
+                              [--modules]
+                              [--no-database]
+                              [--no-wait]
+                              [--persistence]
+                              [--port]
+                              [--tags]
+                              [--zones]
+  examples:
+  - summary: Create new Redis Enterprise cache cluster with database.
+    syntax: az redisenterprise create --cluster-name "cache1" --location "East US" --minimum-tls-version "1.2" --sku "Enterprise_E20" --capacity 4 --tags tag1="value1" --zones "1" "2" "3" --client-protocol "Encrypted" --clustering-policy "EnterpriseCluster" --eviction-policy "NoEviction" --modules name="RedisBloom" args="ERROR_RATE 0.00 INITIAL_SIZE 400" --modules name="RedisTimeSeries" args="RETENTION_POLICY 20" --modules name="RediSearch" --persistence aof-enabled=true aof-frequency="1s" --port 10000 --resource-group "rg1"
+  - summary: Create new Redis Enterprise cache cluster without database (warning - the cache will not be usable until you create a database).
+    syntax: az redisenterprise create --cluster-name "cache1" --location "West US" --minimum-tls-version "1.2" --sku "EnterpriseFlash_F300" --capacity 3 --tags tag1="value1" --zones "1" "2" "3" --resource-group "rg1" --no-database
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50
+    summary: The type of RedisEnterprise cluster to deploy.
+    description: ''
+  optionalParameters:
+  - name: --capacity
+    summary: The size of the RedisEnterprise cluster. Defaults to 2 or 3 depending on SKU. Valid values are (2, 4, 6, ...) for Enterprise SKUs and (3, 9, 15, ...) for Flash SKUs.
+    description: ''
+  - name: --client-protocol
+    parameterValueGroup: Encrypted, Plaintext
+    summary: Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is TLS-encrypted.
+    description: ''
+  - name: --clustering-policy
+    parameterValueGroup: EnterpriseCluster, OSSCluster
+    summary: Clustering policy - default is OSSCluster. Specified at create time.
+    description: ''
+  - name: --eviction-policy
+    parameterValueGroup: AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL
+    summary: Redis eviction policy - default is VolatileLRU.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --minimum-tls-version
+    parameterValueGroup: 1.0, 1.1, 1.2
+    summary: The minimum TLS version for the cluster to support.
+    description: ''
+  - name: --modules
+    summary: Optional set of redis modules to enable in this database - modules can only be added at creation time.
+    description: >-
+      Usage: --modules name=XX args=XX
+
+
+      name: Required. The name of the module, e.g. 'RedisBloom', 'RediSearch', 'RedisTimeSeries'
+
+      args: Configuration options for the module, e.g. 'ERROR_RATE 0.00 INITIAL_SIZE 400'.
+
+
+      Multiple actions can be specified by using more than one --modules argument.
+  - name: --no-database
+    summary: 'Advanced. Do not automatically create a default database. Warning: the cache will not be usable until you create a database.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --persistence
+    summary: Persistence settings.
+    description: >-
+      Usage: --persistence aof-enabled=XX aof-frequency=XX rdb-enabled=XX rdb-frequency=XX
+
+
+      aof-enabled: Sets whether AOF is enabled.  Allowed values: true, false.
+
+      aof-frequency: Sets the frequency at which data is written to disk.  Allowed values: 1s, always.
+
+      rdb-enabled: Sets whether RDB is enabled.  Allowed values: true, false.
+
+      rdb-frequency: Sets the frequency at which a snapshot of the database is created.  Allowed values: 1h, 6h, 12h.
+
+
+      After enabling persistence, you will be unable to disable it. Support for disabling persistence after enabling will be added at a later date.
+  - name: --port
+    summary: TCP port of the database endpoint. Specified at create time. Defaults to an available port.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zones -z
+    summary: The Availability Zones where this cluster will be deployed.
+    description: ''
+- uid: az_redisenterprise_delete
+  name: az redisenterprise delete
+  summary: Delete a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise delete --cluster-name
+                              --resource-group
+                              [--no-wait]
+                              [--yes]
+  examples:
+  - summary: Delete a Redis Enterprise cache.
+    syntax: az redisenterprise delete --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_redisenterprise_list
+  name: az redisenterprise list
+  summary: List Redis Enterprise caches.
+  description: List details about all caches within current Subscription or provided Resource Group.
+  syntax: az redisenterprise list [--resource-group]
+  examples:
+  - summary: List all Redis Enterprise caches in a resource group.
+    syntax: az redisenterprise list --resource-group "rg1"
+  - summary: List all Redis Enterprise caches within the current subscription.
+    syntax: az redisenterprise list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_show
+  name: az redisenterprise show
+  summary: Get information about a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise show --cluster-name
+                            --resource-group
+  examples:
+  - summary: Get information about a Redis Enterprise cache.
+    syntax: az redisenterprise show --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_update
+  name: az redisenterprise update
+  summary: Update an existing Redis Enterprise cache cluster.
+  description: ''
+  syntax: >-
+    az redisenterprise update --cluster-name
+                              --resource-group
+                              [--capacity]
+                              [--minimum-tls-version {1.0, 1.1, 1.2}]
+                              [--no-wait]
+                              [--sku {EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50}]
+                              [--tags]
+  examples:
+  - summary: Update an existing Redis Enterprise cache cluster.
+    syntax: az redisenterprise update --cluster-name "cache1" --minimum-tls-version "1.2" --sku "EnterpriseFlash_F300" --capacity 9 --tags tag1="value1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --capacity
+    summary: The size of the RedisEnterprise cluster. Defaults to 2 or 3 depending on SKU. Valid values are (2, 4, 6, ...) for Enterprise SKUs and (3, 9, 15, ...) for Flash SKUs.
+    description: ''
+  - name: --minimum-tls-version
+    parameterValueGroup: 1.0, 1.1, 1.2
+    summary: The minimum TLS version for the cluster to support.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    parameterValueGroup: EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50
+    summary: The type of RedisEnterprise cluster to deploy.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_redisenterprise_wait
+  name: az redisenterprise wait
+  summary: Place the CLI in a waiting state until a condition of the Redis Enterprise cache cluster is met.
+  description: ''
+  syntax: >-
+    az redisenterprise wait --cluster-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Redis Enterprise cache cluster is successfully created.
+    syntax: az redisenterprise wait --cluster-name "cache1" --resource-group "rg1" --created
+  - summary: Pause executing next line of CLI script until the Redis Enterprise cache cluster is successfully updated.
+    syntax: az redisenterprise wait --cluster-name "cache1" --resource-group "rg1" --updated
+  - summary: Pause executing next line of CLI script until the Redis Enterprise cache is successfully deleted.
+    syntax: az redisenterprise wait --cluster-name "cache1" --resource-group "rg1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_redisenterprise_create
+- az_redisenterprise_database
+- az_redisenterprise_database_create
+- az_redisenterprise_database_delete
+- az_redisenterprise_database_export
+- az_redisenterprise_database_import
+- az_redisenterprise_database_list
+- az_redisenterprise_database_list-keys
+- az_redisenterprise_database_regenerate-key
+- az_redisenterprise_database_show
+- az_redisenterprise_database_update
+- az_redisenterprise_database_wait
+- az_redisenterprise_delete
+- az_redisenterprise_list
+- az_redisenterprise_operation-status
+- az_redisenterprise_operation-status_show
+- az_redisenterprise_show
+- az_redisenterprise_update
+- az_redisenterprise_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage dedicated Redis Enterprise caches for your Azure applications.
diff --git a/2017-03-09-profile/docs-ref-autogen/redisenterprise/database.yml b/2017-03-09-profile/docs-ref-autogen/redisenterprise/database.yml
new file mode 100644
index 0000000000..c792ef2df6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/redisenterprise/database.yml
@@ -0,0 +1,389 @@
+### YamlMime:AzureCLIGroup
+uid: az_redisenterprise_database
+name: az redisenterprise database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **redisenterprise** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az redisenterprise database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Redis Enterprise databases.
+description: ''
+directCommands:
+- uid: az_redisenterprise_database_create
+  name: az redisenterprise database create
+  summary: Create new database for a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise database create --cluster-name
+                                       --resource-group
+                                       [--client-protocol {Encrypted, Plaintext}]
+                                       [--clustering-policy {EnterpriseCluster, OSSCluster}]
+                                       [--eviction-policy {AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL}]
+                                       [--modules]
+                                       [--no-wait]
+                                       [--persistence]
+                                       [--port]
+  examples:
+  - summary: Create new database for a Redis Enterprise cache.
+    syntax: az redisenterprise database create --cluster-name "cache1" --client-protocol "Encrypted" --clustering-policy "EnterpriseCluster" --eviction-policy "AllKeysLRU" --modules name="RedisBloom" args="ERROR_RATE 0.00 INITIAL_SIZE 400" --modules name="RedisTimeSeries" args="RETENTION_POLICY 20" --modules name="RediSearch" --persistence aof-enabled=true aof-frequency="1s" --port 10000 --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --client-protocol
+    parameterValueGroup: Encrypted, Plaintext
+    summary: Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is TLS-encrypted.
+    description: ''
+  - name: --clustering-policy
+    parameterValueGroup: EnterpriseCluster, OSSCluster
+    summary: Clustering policy - default is OSSCluster. Specified at create time.
+    description: ''
+  - name: --eviction-policy
+    parameterValueGroup: AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL
+    summary: Redis eviction policy - default is VolatileLRU.
+    description: ''
+  - name: --modules
+    summary: Optional set of redis modules to enable in this database - modules can only be added at creation time.
+    description: >-
+      Usage: --modules name=XX args=XX
+
+
+      name: Required. The name of the module, e.g. 'RedisBloom', 'RediSearch', 'RedisTimeSeries'
+
+      args: Configuration options for the module, e.g. 'ERROR_RATE 0.00 INITIAL_SIZE 400'.
+
+
+      Multiple actions can be specified by using more than one --modules argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --persistence
+    summary: Persistence settings.
+    description: >-
+      Usage: --persistence aof-enabled=XX aof-frequency=XX rdb-enabled=XX rdb-frequency=XX
+
+
+      aof-enabled: Sets whether AOF is enabled.  Allowed values: true, false.
+
+      aof-frequency: Sets the frequency at which data is written to disk.  Allowed values: 1s, always.
+
+      rdb-enabled: Sets whether RDB is enabled.  Allowed values: true, false.
+
+      rdb-frequency: Sets the frequency at which a snapshot of the database is created.  Allowed values: 1h, 6h, 12h.
+
+
+      After enabling persistence, you will be unable to disable it. Support for disabling persistence after enabling will be added at a later date.
+  - name: --port
+    summary: TCP port of the database endpoint. Specified at create time. Defaults to an available port.
+    description: ''
+- uid: az_redisenterprise_database_delete
+  name: az redisenterprise database delete
+  summary: Delete a single database in a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise database delete --cluster-name
+                                       --resource-group
+                                       [--no-wait]
+                                       [--yes]
+  examples:
+  - summary: Delete a single database in a Redis Enterprise cache.
+    syntax: az redisenterprise database delete --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_redisenterprise_database_export
+  name: az redisenterprise database export
+  summary: Export data stored in a Redis Enterprise database.
+  description: Export data stored in a Redis Enterprise database to a target database file.
+  syntax: >-
+    az redisenterprise database export --cluster-name
+                                       --resource-group
+                                       --sas-uri
+                                       [--no-wait]
+  examples:
+  - summary: Export data stored in a Redis Enterprise database to a target database file.
+    syntax: az redisenterprise database export --cluster-name "cache1" --sas-uri "https://contosostorage.blob.core.window.net/urlToBlobContainer?sasKeyParameters" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sas-uri
+    summary: SAS URI for the target directory to export to.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_redisenterprise_database_import
+  name: az redisenterprise database import
+  summary: Import data into a Redis Enterprise database.
+  description: Import data from a database file into a target Redis Enterprise database.
+  syntax: >-
+    az redisenterprise database import --cluster-name
+                                       --resource-group
+                                       --sas-uri
+                                       [--no-wait]
+  examples:
+  - summary: Import data from a database file into a target Redis Enterprise database.
+    syntax: az redisenterprise database import --cluster-name "cache1" --sas-uri "https://contosostorage.blob.core.window.net/urltoBlobFile?sasKeyParameters" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sas-uri
+    summary: SAS URI for the target blob to import from.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_redisenterprise_database_list
+  name: az redisenterprise database list
+  summary: List all databases in a Redis Enterprise cache.
+  description: List details about all databases in the specified Redis Enterprise cache.
+  syntax: >-
+    az redisenterprise database list --cluster-name
+                                     --resource-group
+  examples:
+  - summary: List all databases in the specified Redis Enterprise cache.
+    syntax: az redisenterprise database list --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_database_list-keys
+  name: az redisenterprise database list-keys
+  summary: Retrieve all access keys for a Redis Enterprise database.
+  description: ''
+  syntax: >-
+    az redisenterprise database list-keys --cluster-name
+                                          --resource-group
+  examples:
+  - summary: Retrieve all access keys for a Redis Enterprise database.
+    syntax: az redisenterprise database list-keys --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_database_regenerate-key
+  name: az redisenterprise database regenerate-key
+  summary: Regenerate an access key for a Redis Enterprise database.
+  description: ''
+  syntax: >-
+    az redisenterprise database regenerate-key --cluster-name
+                                               --key-type {Primary, Secondary}
+                                               --resource-group
+                                               [--no-wait]
+  examples:
+  - summary: Regenerate an access key for a Redis Enterprise database.
+    syntax: az redisenterprise database regenerate-key --cluster-name "cache1" --key-type "Primary" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --key-type
+    parameterValueGroup: Primary, Secondary
+    summary: Which access key to regenerate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_redisenterprise_database_show
+  name: az redisenterprise database show
+  summary: Get information about a database in a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise database show --cluster-name
+                                     --resource-group
+  examples:
+  - summary: Get information about a database in a Redis Enterprise cache.
+    syntax: az redisenterprise database show --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_database_update
+  name: az redisenterprise database update
+  summary: Update an existing Redis Enterprise database.
+  description: ''
+  syntax: >-
+    az redisenterprise database update --cluster-name
+                                       --resource-group
+                                       [--client-protocol {Encrypted, Plaintext}]
+                                       [--eviction-policy {AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL}]
+                                       [--no-wait]
+                                       [--persistence]
+  examples:
+  - summary: Update an existing Redis Enterprise database.
+    syntax: az redisenterprise database update --cluster-name "cache1" --client-protocol "Encrypted" --eviction-policy "AllKeysLRU" --persistence rdb-enabled=true rdb-frequency="12h" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --client-protocol
+    parameterValueGroup: Encrypted, Plaintext
+    summary: Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols.
+    description: ''
+  - name: --eviction-policy
+    parameterValueGroup: AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL
+    summary: Redis eviction policy.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --persistence
+    summary: Persistence settings.
+    description: >-
+      Usage: --persistence aof-enabled=XX aof-frequency=XX rdb-enabled=XX rdb-frequency=XX
+
+
+      aof-enabled: Sets whether AOF is enabled.  Allowed values: true, false.
+
+      aof-frequency: Sets the frequency at which data is written to disk.  Allowed values: 1s, always.
+
+      rdb-enabled: Sets whether RDB is enabled.  Allowed values: true, false.
+
+      rdb-frequency: Sets the frequency at which a snapshot of the database is created.  Allowed values: 1h, 6h, 12h.
+
+
+      After enabling persistence, you will be unable to disable it. Support for disabling persistence after enabling will be added at a later date.
+- uid: az_redisenterprise_database_wait
+  name: az redisenterprise database wait
+  summary: Place the CLI in a waiting state until a condition of the Redis Enterprise database is met.
+  description: ''
+  syntax: >-
+    az redisenterprise database wait --cluster-name
+                                     --resource-group
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--timeout]
+                                     [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Redis Enterprise database is successfully created.
+    syntax: az redisenterprise database wait --cluster-name "cache1" --resource-group "rg1" --created
+  - summary: Pause executing next line of CLI script until the Redis Enterprise database is successfully updated.
+    syntax: az redisenterprise database wait --cluster-name "cache1" --resource-group "rg1" --updated
+  - summary: Pause executing next line of CLI script until the Redis Enterprise database is successfully deleted.
+    syntax: az redisenterprise database wait --cluster-name "cache1" --resource-group "rg1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_redisenterprise_database_create
+- az_redisenterprise_database_delete
+- az_redisenterprise_database_export
+- az_redisenterprise_database_import
+- az_redisenterprise_database_list
+- az_redisenterprise_database_list-keys
+- az_redisenterprise_database_regenerate-key
+- az_redisenterprise_database_show
+- az_redisenterprise_database_update
+- az_redisenterprise_database_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Redis Enterprise databases.
diff --git a/2017-03-09-profile/docs-ref-autogen/redisenterprise/operation-status.yml b/2017-03-09-profile/docs-ref-autogen/redisenterprise/operation-status.yml
new file mode 100644
index 0000000000..572cc57000
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/redisenterprise/operation-status.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_redisenterprise_operation-status
+name: az redisenterprise operation-status
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **redisenterprise** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az redisenterprise operation-status** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Redis Enterprise operation status.
+description: ''
+directCommands:
+- uid: az_redisenterprise_operation-status_show
+  name: az redisenterprise operation-status show
+  summary: Get the status of an operation.
+  description: ''
+  syntax: >-
+    az redisenterprise operation-status show --location
+                                             --operation-id
+  examples:
+  - summary: Get the status of an operation.
+    syntax: az redisenterprise operation-status show --operation-id "testoperationid" --location "West US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The operation's unique identifier.
+    description: ''
+commands:
+- az_redisenterprise_operation-status_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Redis Enterprise operation status.
diff --git a/2017-03-09-profile/docs-ref-autogen/reference-index.yml b/2017-03-09-profile/docs-ref-autogen/reference-index.yml
index 0c42e7d8a7..c7b2b6935d 100644
--- a/2017-03-09-profile/docs-ref-autogen/reference-index.yml
+++ b/2017-03-09-profile/docs-ref-autogen/reference-index.yml
@@ -1,35 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az
-  name: az
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_configure
-  - az_feedback
-  - az_find
-  - az_interactive
-  - az_login
-  - az_logout
-  - az_rest
-  - az_self_test
-  - az_version
+### YamlMime:AzureCLIGroup
+uid: az
+name: az
+summary: ''
+description: ''
+directCommands:
 - uid: az_configure
   name: az configure
   summary: Manage Azure CLI configuration. This command is interactive.
-  description: ''
-  langs:
-  - azurecli
+  description: For automation scenarios or to set all available options, use the new `az config`.
+  syntax: >-
+    az configure [--defaults]
+                 [--list-defaults {false, true}]
+                 [--scope {global, local}]
   examples:
   - summary: Set default resource group, webapp and VM names.
-    syntax:
-      content: az configure --defaults group=myRG web=myweb vm=myvm
+    syntax: az configure --defaults group=myRG web=myweb vm=myvm
   - summary: Clear default webapp and VM names.
-    syntax:
-      content: az configure --defaults vm='' web=''
-  parameters:
+    syntax: az configure --defaults vm='' web=''
+  optionalParameters:
   - name: --defaults -d
     summary: Space-separated 'name=value' pairs for common argument defaults.
     description: ''
@@ -42,58 +30,38 @@ items:
     parameterValueGroup: global, local
     summary: Scope of defaults. Using "local" for settings only effective under current folder.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/configure/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/configure/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/configure/_help.py
 - uid: az_feedback
   name: az feedback
-  summary: Send feedback to the Azure CLI Team!
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/feedback/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/feedback/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  summary: Send feedback to the Azure CLI Team.
+  description: This command is interactive. If possible, it launches the default web browser to open GitHub issue creation page with the body auto-generated and pre-filled. You will have a chance to edit the issue body before submitting it.
+  syntax: az feedback
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/feedback/_help.py
 - uid: az_find
   name: az find
   summary: I'm an AI robot, my advice is based on our Azure documentation as well as the usage patterns of Azure CLI and Azure ARM users. Using me improves Azure products and documentation.
   description: ''
-  langs:
-  - azurecli
+  syntax: az find [<CLI_TERM>]
   examples:
   - summary: Give me any Azure CLI group and I’ll show the most popular commands within the group.
-    syntax:
-      content: az find "az storage"
+    syntax: az find "az storage"
   - summary: Give me any Azure CLI command and I’ll show the most popular parameters and subcommands.
-    syntax:
-      content: az find "az monitor activity-log list"
+    syntax: az find "az monitor activity-log list"
   - summary: You can also enter a search term, and I'll try to help find the best commands.
-    syntax:
-      content: az find "arm template"
-  parameters:
+    syntax: az find "arm template"
+  optionalParameters:
   - name: <CLI_TERM>
     summary: An Azure CLI command or group for which you need an example.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/find/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/find/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/find/_help.py
 - uid: az_interactive
   name: az interactive
   summary: Start interactive mode. Installs the Interactive extension if not installed already.
-  description: 'For more information on interactive mode, see: <a href="https://azure.microsoft.com/blog/welcome-to-azure-cli-shell/">https://azure.microsoft.com/blog/welcome-to-azure-cli-shell/</a>.'
-  langs:
-  - azurecli
-  parameters:
+  description: 'For more information on interactive mode, see: https://azure.microsoft.com/blog/welcome-to-azure-cli-shell/.'
+  syntax: >-
+    az interactive [--style {bg, br, contrast, default, grey, halloween, neon, none, pastel, primary, purple, quiet}]
+                   [--update]
+  optionalParameters:
   - name: --style -s
     parameterValueGroup: bg, br, contrast, default, grey, halloween, neon, none, pastel, primary, purple, quiet
     summary: The colors of the shell.
@@ -105,34 +73,42 @@ items:
   name: az login
   summary: Log in to Azure.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az login [--allow-no-subscriptions]
+             [--identity]
+             [--password]
+             [--scope]
+             [--service-principal]
+             [--tenant]
+             [--use-cert-sn-issuer]
+             [--use-device-code]
+             [--username]
   examples:
   - summary: Log in interactively.
-    syntax:
-      content: az login
+    syntax: az login
   - summary: Log in with user name and password. This doesn't work with Microsoft accounts or accounts that have two-factor authentication enabled. Use -p=secret if the first character of the password is '-'.
-    syntax:
-      content: az login -u johndoe@contoso.com -p VerySecret
+    syntax: az login -u johndoe@contoso.com -p VerySecret
   - summary: Log in with a service principal using client secret. Use -p=secret if the first character of the password is '-'.
-    syntax:
-      content: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p VerySecret --tenant contoso.onmicrosoft.com
+    syntax: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p VerySecret --tenant contoso.onmicrosoft.com
   - summary: Log in with a service principal using client certificate.
-    syntax:
-      content: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p ~/mycertfile.pem --tenant contoso.onmicrosoft.com
+    syntax: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p ~/mycertfile.pem --tenant contoso.onmicrosoft.com
   - summary: Log in using a VM's system assigned identity
-    syntax:
-      content: az login --identity
+    syntax: az login --identity
   - summary: Log in using a VM's user assigned identity. Client or object ids of the service identity also work
-    syntax:
-      content: az login --identity -u /subscriptions/<subscriptionId>/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
-  parameters:
+    syntax: az login --identity -u /subscriptions/<subscriptionId>/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+  optionalParameters:
   - name: --allow-no-subscriptions
     summary: Support access tenants without subscriptions. It's uncommon but useful to run tenant level commands, such as 'az ad'.
     description: ''
+  - name: --identity -i
+    summary: Log in using the Virtual Machine's identity.
+    description: ''
   - name: --password -p
     summary: Credentials like user password, or for a service principal, provide client secret or a pem file with key and public certificate. Will prompt if not given.
     description: ''
+  - name: --scope
+    summary: Used in the /authorize request. It can cover only one static resource.
+    description: ''
   - name: --service-principal
     summary: The credential representing a service principal.
     description: ''
@@ -148,60 +124,78 @@ items:
   - name: --username -u
     summary: User name, service principal, or managed service identity ID.
     description: ''
-  - name: --identity -i
-    summary: Log in using the Virtual Machine's identity.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_logout
   name: az logout
   summary: Log out to remove access to Azure subscriptions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az logout [--username]
+  optionalParameters:
   - name: --username
     summary: Account user, if missing, logout the current active account.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_next
+  name: az next
+  summary: Recommend the possible next set of commands to take.
+  description: >-
+    There are some custom configurations:
+
+
+    [1] az config set next.execute_in_prompt=True/False
+        Turn on/off the step of executing recommended commands in interactive mode. Turn on by default.
+
+    [2] az config set next.filter_type=True/False
+        Turn on/off the step of filtering recommendation type. Turn off by default.
+
+    [3] az config set next.output=json/jsonc/none/table/tsv/yaml/yamlc/status
+        Set default output format. Status is the default.
+
+    [4] az config set next.num_limit={amount_limit}
+        Set the limit of recommended items. 5 is the default.
+
+    [5] az config set next.show_arguments=True/False
+        Show/hide the arguments of recommended items. False is the default.
+
+    [6] az config set next.print_help=True/False
+        Enable/disable whether to print help actively before executing each command. False is the default.
+  syntax: az next
 - uid: az_rest
   name: az rest
   summary: Invoke a custom request.
   description: >-
-    This command automatically authenticates using the credential logged in: If Authorization header is not set, it attaches header `Authorization: Bearer &lt;token&gt;`, where `&lt;token&gt;` is retrieved from AAD. The target resource of the token is derived from --url if --url starts with an endpoint from `az cloud show --query endpoints`. You may also use --resource for a custom resource.
+    This command automatically authenticates using the logged-in credential: If Authorization header is not set, it attaches header `Authorization: Bearer <token>`, where `<token>` is retrieved from AAD. The target resource of the token is derived from --url if --url starts with an endpoint from `az cloud show --query endpoints`. You may also use --resource for a custom resource.
 
     If Content-Type header is not set and --body is a valid JSON string, Content-Type header will default to application/json.
-  langs:
-  - azurecli
+  syntax: >-
+    az rest --uri
+            [--body]
+            [--headers]
+            [--method {delete, get, head, options, patch, post, put}]
+            [--output-file]
+            [--resource]
+            [--skip-authorization-header]
+            [--subscription]
+            [--uri-parameters]
   examples:
   - summary: Get Audit log through Microsoft Graph
-    syntax:
-      content: az rest --method get --uri https://graph.microsoft.com/beta/auditLogs/directoryAudits
+    syntax: az rest --method get --url https://graph.microsoft.com/beta/auditLogs/directoryAudits
   - summary: Update a Azure Active Directory Graph User's display name
-    syntax:
-      content: 'az rest --method patch --uri "https://graph.microsoft.com/v1.0/users/johndoe@azuresdkteam.onmicrosoft.com" --body "{\"displayName\": \"jondoe2\"}"'
+    syntax: 'az rest --method patch --url "https://graph.microsoft.com/v1.0/users/johndoe@azuresdkteam.onmicrosoft.com" --body "{\"displayName\": \"jondoe2\"}"'
   - summary: Get a virtual machine
-    syntax:
-      content: az rest --method get --uri /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}?api-version=2019-03-01
+    syntax: az rest --method get --uri /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}?api-version=2019-03-01
   - summary: Create a public IP address from body.json file
-    syntax:
-      content: az rest --method put --uri https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}?api-version=2019-09-01 --body @body.json
-  parameters:
+    syntax: az rest --method put --url https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}?api-version=2019-09-01 --body @body.json
+  - summary: List the top three resources (Bash)
+    syntax: az rest --method get --url https://management.azure.com/subscriptions/{subscriptionId}/resources?api-version=2019-07-01 --url-parameters \$top=3
+  requiredParameters:
   - isRequired: true
     name: --uri --url -u
     summary: Request URL. If it doesn't start with a host, CLI assumes it as an Azure resource ID and prefixes it with the ARM endpoint of the current cloud shown by `az cloud show --query endpoints.resourceManager`. Common token {subscriptionId} will be replaced with the current subscription ID specified by `az account set`.
     description: ''
+  optionalParameters:
   - name: --body -b
-    summary: Request body. Use @{file} to load from a file. For quoting issues in different terminals, see <a href="https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#quoting-issues">https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#quoting-issues</a>.
+    summary: Request body. Use @{file} to load from a file. For quoting issues in different terminals, see https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#quoting-issues.
     description: ''
   - name: --headers
     summary: Space-separated headers in KEY=VALUE format or JSON string. Use @{file} to load from a file.
@@ -220,147 +214,184 @@ items:
   - name: --skip-authorization-header
     summary: Do not auto-append Authorization header.
     description: ''
-  - name: --uri-parameters
-    summary: Space-separated queries in KEY=VALUE format or JSON string. Use @{file} to load from a file.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_self_test
+  - name: --uri-parameters --url-parameters
+    summary: Query parameters in the URL. Space-separated queries in KEY=VALUE format or JSON string. Use @{file} to load from a file.
+    description: ''
+- uid: az_self-test
   name: az self-test
   summary: Runs a self-test of the CLI.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az self-test [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_upgrade
+  name: az upgrade
+  summary: Upgrade Azure CLI and extensions.
+  description: ''
+  syntax: >-
+    az upgrade [--all {false, true}]
+               [--subscription]
+               [--yes]
+  optionalParameters:
+  - name: --all
+    defaultValue: "true"
+    parameterValueGroup: false, true
+    summary: Enable updating extensions as well.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for checking release notes.
+    description: ''
 - uid: az_version
   name: az version
   summary: Show the versions of Azure CLI modules and extensions in JSON format by default or format configured by --output.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az version [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_account
-  name: az account
-  summary: Manage Azure subscription information.
-- uid: az_ad
-  name: az ad
-  summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
-- uid: az_appconfig
-  name: az appconfig
-  summary: Manage App Configurations.
-- uid: az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-- uid: az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-- uid: az_cache
-  name: az cache
-  summary: Commands to manage CLI objects cached using the `--defer` argument.
-- uid: az_cloud
-  name: az cloud
-  summary: Manage registered Azure clouds.
-- uid: az_configure
-  name: az configure
-  summary: Manage Azure CLI configuration. This command is interactive.
-- uid: az_deployment
-  name: az deployment
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-- uid: az_deployment_scripts
-  name: az deployment-scripts
-  summary: Manage deployment scripts at subscription or resource group scope.
-- uid: az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-- uid: az_extension
-  name: az extension
-  summary: Manage and update CLI extensions.
-- uid: az_feedback
-  name: az feedback
-  summary: Send feedback to the Azure CLI Team!
-- uid: az_find
-  name: az find
-  summary: I'm an AI robot, my advice is based on our Azure documentation as well as the usage patterns of Azure CLI and Azure ARM users. Using me improves Azure products and documentation.
-- uid: az_group
-  name: az group
-  summary: Manage resource groups and template deployments.
-- uid: az_hdinsight
-  name: az hdinsight
-  summary: Manage HDInsight resources.
-- uid: az_image
-  name: az image
-  summary: Manage custom virtual machine images.
-- uid: az_interactive
-  name: az interactive
-  summary: Start interactive mode. Installs the Interactive extension if not installed already.
-- uid: az_keyvault
-  name: az keyvault
-  summary: Manage KeyVault keys, secrets, and certificates.
-- uid: az_local_context
-  name: az local-context
-  summary: Manage Local Context.
-- uid: az_lock
-  name: az lock
-  summary: Manage Azure locks.
-- uid: az_login
-  name: az login
-  summary: Log in to Azure.
-- uid: az_logout
-  name: az logout
-  summary: Log out to remove access to Azure subscriptions.
-- uid: az_network
-  name: az network
-  summary: Manage Azure Network resources.
-- uid: az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-- uid: az_policy
-  name: az policy
-  summary: Manage resource policies.
-- uid: az_provider
-  name: az provider
-  summary: Manage resource providers.
-- uid: az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-- uid: az_resource
-  name: az resource
-  summary: Manage Azure resources.
-- uid: az_rest
-  name: az rest
-  summary: Invoke a custom request.
-- uid: az_role
-  name: az role
-  summary: Manage user roles for access control with Azure Active Directory and service principals.
-- uid: az_security
-  name: az security
-  summary: Manage your security posture with Azure Security Center.
-- uid: az_self_test
-  name: az self-test
-  summary: Runs a self-test of the CLI.
-- uid: az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-- uid: az_tag
-  name: az tag
-  summary: Manage resource tags.
-- uid: az_version
-  name: az version
-  summary: Show the versions of Azure CLI modules and extensions in JSON format by default or format configured by --output.
-- uid: az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-- uid: az_vmss
-  name: az vmss
-  summary: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
+- az_account
+- az_acr
+- az_ad
+- az_ai-examples
+- az_aks
+- az_alias
+- az_appconfig
+- az_arcappliance
+- az_artifacts
+- az_attestation
+- az_automation
+- az_baremetalinstance
+- az_batch
+- az_bicep
+- az_blockchain
+- az_blueprint
+- az_boards
+- az_cache
+- az_cli-translator
+- az_cloud
+- az_cloud-service
+- az_codespace
+- az_communication
+- az_config
+- az_configure
+- az_confluent
+- az_connectedk8s
+- az_connectedmachine
+- az_container
+- az_cosmosdb
+- az_costmanagement
+- az_csvmware
+- az_customlocation
+- az_custom-providers
+- az_databox
+- az_databricks
+- az_datadog
+- az_datafactory
+- az_datashare
+- az_dedicated-hsm
+- az_demo
+- az_deployment
+- az_deployment-scripts
+- az_desktopvirtualization
+- az_devops
+- az_disk-pool
+- az_dms
+- az_dt
+- az_eventgrid
+- az_extension
+- az_feedback
+- az_find
+- az_footprint
+- az_functionapp
+- az_fzf
+- az_graph
+- az_group
+- az_guestconfig
+- az_hack
+- az_hanainstance
+- az_hdinsight
+- az_healthbot
+- az_healthcareapis
+- az_hpc-cache
+- az_image
+- az_import-export
+- az_interactive
+- az_internet-analyzer
+- az_iot
+- az_k8sconfiguration
+- az_k8s-configuration
+- az_k8s-extension
+- az_keyvault
+- az_kusto
+- az_local-context
+- az_lock
+- az_logic
+- az_login
+- az_logout
+- az_maintenance
+- az_managed-cassandra
+- az_managementpartner
+- az_mesh
+- az_ml
+- az_ml(v1)
+- az_monitor
+- az_mysql
+- az_netappfiles
+- az_network
+- az_next
+- az_notification-hub
+- az_offazure
+- az_peering
+- az_pipelines
+- az_policy
+- az_portal
+- az_postgres
+- az_powerbi
+- az_provider
+- az_providerhub
+- az_quantum
+- az_redisenterprise
+- az_remote-rendering-account
+- az_repos
+- az_resource
+- az_resource-mover
+- az_rest
+- az_role
+- az_sapmonitor
+- az_security
+- az_self-test
+- az_sentinel
+- az_spatial-anchors-account
+- az_spring-cloud
+- az_sql
+- az_ssh
+- az_sshkey
+- az_stack-hci
+- az_storage
+- az_storagesync
+- az_stream-analytics
+- az_support
+- az_synapse
+- az_tag
+- az_term
+- az_tsi
+- az_upgrade
+- az_version
+- az_vm
+- az_vmss
+- az_vmware
+- az_webapp
+- az_webpubsub
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -376,9 +407,6 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
diff --git a/2017-03-09-profile/docs-ref-autogen/remote-rendering-account.yml b/2017-03-09-profile/docs-ref-autogen/remote-rendering-account.yml
new file mode 100644
index 0000000000..da3493699e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/remote-rendering-account.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_remote-rendering-account
+name: az remote-rendering-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az remote-rendering-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage remote rendering account with mixed reality.
+description: ''
+directCommands:
+- uid: az_remote-rendering-account_create
+  name: az remote-rendering-account create
+  summary: Create a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account create --name
+                                       --resource-group
+                                       [--kind]
+                                       [--location]
+                                       [--sku]
+                                       [--storage-account-name]
+                                       [--tags]
+  examples:
+  - summary: Create remote rendering account
+    syntax: az remote-rendering-account create -n "MyAccount" --location "eastus2euap" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_remote-rendering-account_delete
+  name: az remote-rendering-account delete
+  summary: Delete a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account delete --name
+                                       --resource-group
+  examples:
+  - summary: Delete remote rendering account
+    syntax: az remote-rendering-account delete -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_remote-rendering-account_list
+  name: az remote-rendering-account list
+  summary: List resources by resource group and list remote rendering accounts by subscription.
+  description: ''
+  syntax: az remote-rendering-account list [--resource-group]
+  examples:
+  - summary: List remote rendering accounts by resource group
+    syntax: az remote-rendering-account list --resource-group "MyResourceGroup"
+  - summary: List remote rendering accounts by subscription
+    syntax: az remote-rendering-account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_remote-rendering-account_show
+  name: az remote-rendering-account show
+  summary: Retrieve a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account show --name
+                                     --resource-group
+  examples:
+  - summary: Get remote rendering account
+    syntax: az remote-rendering-account show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_remote-rendering-account_update
+  name: az remote-rendering-account update
+  summary: Update a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account update --name
+                                       --resource-group
+                                       [--kind]
+                                       [--location]
+                                       [--sku]
+                                       [--storage-account-name]
+                                       [--tags]
+  examples:
+  - summary: Update remote rendering account
+    syntax: az remote-rendering-account update -n "MyAccount" --tags hero="romeo" heroine="juliet" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_remote-rendering-account_create
+- az_remote-rendering-account_delete
+- az_remote-rendering-account_key
+- az_remote-rendering-account_key_renew
+- az_remote-rendering-account_key_show
+- az_remote-rendering-account_list
+- az_remote-rendering-account_show
+- az_remote-rendering-account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage remote rendering account with mixed reality.
diff --git a/2017-03-09-profile/docs-ref-autogen/remote-rendering-account/key.yml b/2017-03-09-profile/docs-ref-autogen/remote-rendering-account/key.yml
new file mode 100644
index 0000000000..15b71ebf56
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/remote-rendering-account/key.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_remote-rendering-account_key
+name: az remote-rendering-account key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az remote-rendering-account key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage developer keys of a remote rendering account.
+description: ''
+directCommands:
+- uid: az_remote-rendering-account_key_renew
+  name: az remote-rendering-account key renew
+  summary: Regenerate specified key of a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account key renew --name
+                                          --resource-group
+                                          [--key {primary, secondary}]
+  examples:
+  - summary: Regenerate remote rendering account keys
+    syntax: az remote-rendering-account key renew -n "MyAccount" -k primary --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key -k
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Key to be regenerated.
+    description: ''
+- uid: az_remote-rendering-account_key_show
+  name: az remote-rendering-account key show
+  summary: List both of the 2 keys of a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account key show --name
+                                         --resource-group
+  examples:
+  - summary: List remote rendering account key
+    syntax: az remote-rendering-account key show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_remote-rendering-account_key_renew
+- az_remote-rendering-account_key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage developer keys of a remote rendering account.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos.yml b/2017-03-09-profile/docs-ref-autogen/repos.yml
index 3a91e6eb5e..250c017d40 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos.yml
@@ -1,28 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_repos_create
-  - az_repos_delete
-  - az_repos_list
-  - az_repos_show
-  - az_repos_update
+### YamlMime:AzureCLIGroup
+uid: az_repos
+name: az repos
+summary: Manage Azure Repos.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_repos_create
   name: az repos create
   summary: Create a Git repository in a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos create --name
+                    [--detect {false, true}]
+                    [--open]
+                    [--org]
+                    [--project]
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name for the new repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -31,7 +29,7 @@ items:
     summary: Open the repository page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -43,46 +41,59 @@ items:
   name: az repos delete
   summary: Delete a Git repository in a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos delete --id
+                    [--detect {false, true}]
+                    [--org]
+                    [--project]
+                    [--subscription]
+                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_repos_list
   name: az repos list
   summary: List Git repositories of a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos list [--detect {false, true}]
+                  [--org]
+                  [--project]
+                  [--query-examples]
+                  [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -90,13 +101,20 @@ items:
   name: az repos show
   summary: Get the details of a Git repository.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos show --repository
+                  [--detect {false, true}]
+                  [--open]
+                  [--org]
+                  [--project]
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --repository -r
     summary: Name or ID of the repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -105,11 +123,14 @@ items:
     summary: Open the repository page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -117,13 +138,20 @@ items:
   name: az repos update
   summary: Update the Git repository.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos update --repository
+                    [--default-branch]
+                    [--detect {false, true}]
+                    [--name]
+                    [--org]
+                    [--project]
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --repository -r
     summary: Name or ID of the repository.
     description: ''
+  optionalParameters:
   - name: --default-branch
     summary: "Default branch to be set for the repository. Example: 'refs/heads/live' or 'live'."
     description: ''
@@ -135,7 +163,7 @@ items:
     summary: New name for the repository.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -144,189 +172,67 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_create
-  name: az repos create
-  summary: Create a Git repository in a team project.
-- uid: az_repos_delete
-  name: az repos delete
-  summary: Delete a Git repository in a team project.
-- uid: az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-- uid: az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-- uid: az_repos_list
-  name: az repos list
-  summary: List Git repositories of a team project.
-- uid: az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-- uid: az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-- uid: az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-- uid: az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-- uid: az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-- uid: az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-- uid: az_repos_show
-  name: az repos show
-  summary: Get the details of a Git repository.
-- uid: az_repos_update
-  name: az repos update
-  summary: Update the Git repository.
+- az_repos_create
+- az_repos_delete
+- az_repos_import
+- az_repos_import_create
+- az_repos_list
+- az_repos_policy
+- az_repos_policy_approver-count
+- az_repos_policy_approver-count_create
+- az_repos_policy_approver-count_update
+- az_repos_policy_build
+- az_repos_policy_build_create
+- az_repos_policy_build_update
+- az_repos_policy_case-enforcement
+- az_repos_policy_case-enforcement_create
+- az_repos_policy_case-enforcement_update
+- az_repos_policy_comment-required
+- az_repos_policy_comment-required_create
+- az_repos_policy_comment-required_update
+- az_repos_policy_create
+- az_repos_policy_delete
+- az_repos_policy_file-size
+- az_repos_policy_file-size_create
+- az_repos_policy_file-size_update
+- az_repos_policy_list
+- az_repos_policy_merge-strategy
+- az_repos_policy_merge-strategy_create
+- az_repos_policy_merge-strategy_update
+- az_repos_policy_required-reviewer
+- az_repos_policy_required-reviewer_create
+- az_repos_policy_required-reviewer_update
+- az_repos_policy_show
+- az_repos_policy_update
+- az_repos_policy_work-item-linking
+- az_repos_policy_work-item-linking_create
+- az_repos_policy_work-item-linking_update
+- az_repos_pr
+- az_repos_pr_checkout
+- az_repos_pr_create
+- az_repos_pr_list
+- az_repos_pr_policy
+- az_repos_pr_policy_list
+- az_repos_pr_policy_queue
+- az_repos_pr_reviewer
+- az_repos_pr_reviewer_add
+- az_repos_pr_reviewer_list
+- az_repos_pr_reviewer_remove
+- az_repos_pr_set-vote
+- az_repos_pr_show
+- az_repos_pr_update
+- az_repos_pr_work-item
+- az_repos_pr_work-item_add
+- az_repos_pr_work-item_list
+- az_repos_pr_work-item_remove
+- az_repos_ref
+- az_repos_ref_create
+- az_repos_ref_delete
+- az_repos_ref_list
+- az_repos_ref_lock
+- az_repos_ref_unlock
+- az_repos_show
+- az_repos_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -342,4 +248,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/import.yml b/2017-03-09-profile/docs-ref-autogen/repos/import.yml
index db02953c64..0f76682e34 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/import.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/import.yml
@@ -1,24 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_import_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_import
+name: az repos import
+summary: Manage Git repositories import.
+description: ''
+directCommands:
 - uid: az_repos_import_create
   name: az repos import create
   summary: Create a git import request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos import create --git-source-url
+                           [--detect {false, true}]
+                           [--git-service-endpoint-id]
+                           [--org]
+                           [--project]
+                           [--repository]
+                           [--requires-authorization]
+                           [--subscription]
+                           [--user-name]
+  requiredParameters:
   - isRequired: true
     name: --git-source-url --git-url
     summary: Url of the source git repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -27,7 +32,7 @@ items:
     summary: Service Endpoint for connection to external endpoint.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -38,16 +43,14 @@ items:
   - name: --requires-authorization
     summary: Flag to tell if source git repository is private.
     description: ''
-  - name: --user-name
-    summary: User name in case source git repository is private.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --user-name
+    summary: User name in case source git repository is private.
+    description: ''
 commands:
-- uid: az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
+- az_repos_import_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -63,4 +66,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git repositories import.
+metadata:
+  description: Manage Git repositories import.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy.yml
index 97a36edcbb..22eba56aac 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy.yml
@@ -1,34 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_create
-  - az_repos_policy_delete
-  - az_repos_policy_list
-  - az_repos_policy_show
-  - az_repos_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy
+name: az repos policy
+summary: Manage branch policy.
+description: ''
+directCommands:
 - uid: az_repos_policy_create
   name: az repos policy create
   summary: Create a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
+  description: Recommended when creating policies using multiple scopes for a policy. See https://aka.ms/azure-devops-cli-docs-policy-file for more information.
+  syntax: >-
+    az repos policy create --config
+                           [--detect {false, true}]
+                           [--org]
+                           [--project]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --config --policy-configuration
     summary: Local file path for configuration file. Please use / backslash when typing in directory path.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -40,36 +37,48 @@ items:
   name: az repos policy delete
   summary: Delete a policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy delete --id
+                           [--detect {false, true}]
+                           [--org]
+                           [--project]
+                           [--subscription]
+                           [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_repos_policy_list
   name: az repos policy list
   summary: List all policies in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy list [--branch]
+                         [--detect {false, true}]
+                         [--org]
+                         [--project]
+                         [--query-examples]
+                         [--repository-id]
+                         [--subscription]
+  optionalParameters:
   - name: --branch
     summary: 'Branch name to filter results by exact match of branch name. The --repository-id parameter is required to use the branch filter. For example: --branch master.'
     description: ''
@@ -78,11 +87,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository-id
     summary: ID of the repository to filter results by exact match of the repository ID. For example --repository-ID e556f204-53c9-4153-9cd9-ef41a11e3345.
     description: ''
@@ -93,33 +105,47 @@ items:
   name: az repos policy show
   summary: Show policy details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy show --id
+                         [--detect {false, true}]
+                         [--org]
+                         [--project]
+                         [--query-examples]
+                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_repos_policy_update
   name: az repos policy update
   summary: Update a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
+  description: Recommended when creating policies using multiple scopes for a policy. See https://aka.ms/azure-devops-cli-docs-policy-file for more information.
+  syntax: >-
+    az repos policy update --config
+                           --id
+                           [--detect {false, true}]
+                           [--org]
+                           [--project]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --config --policy-configuration
     summary: Local file path for configuration file. Please use / backslash when typing in directory path.
@@ -128,12 +154,13 @@ items:
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -142,93 +169,35 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
+- az_repos_policy_approver-count
+- az_repos_policy_approver-count_create
+- az_repos_policy_approver-count_update
+- az_repos_policy_build
+- az_repos_policy_build_create
+- az_repos_policy_build_update
+- az_repos_policy_case-enforcement
+- az_repos_policy_case-enforcement_create
+- az_repos_policy_case-enforcement_update
+- az_repos_policy_comment-required
+- az_repos_policy_comment-required_create
+- az_repos_policy_comment-required_update
+- az_repos_policy_create
+- az_repos_policy_delete
+- az_repos_policy_file-size
+- az_repos_policy_file-size_create
+- az_repos_policy_file-size_update
+- az_repos_policy_list
+- az_repos_policy_merge-strategy
+- az_repos_policy_merge-strategy_create
+- az_repos_policy_merge-strategy_update
+- az_repos_policy_required-reviewer
+- az_repos_policy_required-reviewer_create
+- az_repos_policy_required-reviewer_update
+- az_repos_policy_show
+- az_repos_policy_update
+- az_repos_policy_work-item-linking
+- az_repos_policy_work-item-linking_create
+- az_repos_policy_work-item-linking_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -244,4 +213,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage branch policy.
+metadata:
+  description: Manage branch policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/approver-count.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/approver-count.yml
index 23e1a5aa71..6f27782c1e 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/approver-count.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/approver-count.yml
@@ -1,21 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_approver_count_create
-  - az_repos_policy_approver_count_update
-- uid: az_repos_policy_approver_count_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_approver-count
+name: az repos policy approver-count
+summary: Manage approver count policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_approver-count_create
   name: az repos policy approver-count create
   summary: Create approver count policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy approver-count create --allow-downvotes {false, true}
+                                          --blocking {false, true}
+                                          --branch
+                                          --creator-vote-counts {false, true}
+                                          --enabled {false, true}
+                                          --minimum-approver-count
+                                          --repository-id
+                                          --reset-on-source-push {false, true}
+                                          [--branch-match-type {exact, prefix}]
+                                          [--detect {false, true}]
+                                          [--org]
+                                          [--project]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --allow-downvotes
     parameterValueGroup: false, true
@@ -53,6 +60,7 @@ items:
     parameterValueGroup: false, true
     summary: Whether to reset source on push.
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -63,7 +71,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -71,17 +79,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_approver_count_update
+- uid: az_repos_policy_approver-count_update
   name: az repos policy approver-count update
   summary: Update approver count policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy approver-count update --id
+                                          [--allow-downvotes {false, true}]
+                                          [--blocking {false, true}]
+                                          [--branch]
+                                          [--branch-match-type {exact, prefix}]
+                                          [--creator-vote-counts {false, true}]
+                                          [--detect {false, true}]
+                                          [--enabled {false, true}]
+                                          [--minimum-approver-count]
+                                          [--org]
+                                          [--project]
+                                          [--repository-id]
+                                          [--reset-on-source-push {false, true}]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --allow-downvotes
     parameterValueGroup: false, true
     summary: Whether to allow downvotes or not.
@@ -113,7 +135,7 @@ items:
     summary: 'Minimum number of approvers required. For example: 2.'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -129,12 +151,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
+- az_repos_policy_approver-count_create
+- az_repos_policy_approver-count_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -150,4 +168,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage approver count policy.
+metadata:
+  description: Manage approver count policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/build.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/build.yml
index aa66419e88..22a2c238d0 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/build.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/build.yml
@@ -1,21 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_build_create
-  - az_repos_policy_build_update
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_build
+name: az repos policy build
+summary: Manage build policy.
+description: ''
+directCommands:
 - uid: az_repos_policy_build_create
   name: az repos policy build create
   summary: Create build policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy build create --blocking {false, true}
+                                 --branch
+                                 --build-definition-id
+                                 --display-name
+                                 --enabled {false, true}
+                                 --manual-queue-only {false, true}
+                                 --queue-on-source-update-only {false, true}
+                                 --repository-id
+                                 --valid-duration
+                                 [--branch-match-type {exact, prefix}]
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--path-filter]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -56,6 +65,7 @@ items:
     name: --valid-duration
     summary: Policy validity duration (in minutes).
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -66,7 +76,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -81,13 +91,29 @@ items:
   name: az repos policy build update
   summary: Update build policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy build update --id
+                                 [--blocking {false, true}]
+                                 [--branch]
+                                 [--branch-match-type {exact, prefix}]
+                                 [--build-definition-id]
+                                 [--detect {false, true}]
+                                 [--display-name]
+                                 [--enabled {false, true}]
+                                 [--manual-queue-only {false, true}]
+                                 [--org]
+                                 [--path-filter]
+                                 [--project]
+                                 [--queue-on-source-update-only {false, true}]
+                                 [--repository-id]
+                                 [--subscription]
+                                 [--valid-duration]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -118,7 +144,7 @@ items:
     summary: Whether to allow only manual queue of builds.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -133,19 +159,15 @@ items:
   - name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
-  - name: --valid-duration
-    summary: Policy validity duration (in minutes).
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --valid-duration
+    summary: Policy validity duration (in minutes).
+    description: ''
 commands:
-- uid: az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
+- az_repos_policy_build_create
+- az_repos_policy_build_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -161,4 +183,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build policy.
+metadata:
+  description: Manage build policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/case-enforcement.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/case-enforcement.yml
index 5c7bdcf073..d2f5d64083 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/case-enforcement.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/case-enforcement.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_case_enforcement_create
-  - az_repos_policy_case_enforcement_update
-- uid: az_repos_policy_case_enforcement_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_case-enforcement
+name: az repos policy case-enforcement
+summary: Manage case enforcement policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_case-enforcement_create
   name: az repos policy case-enforcement create
   summary: Create case enforcement policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy case-enforcement create --blocking {false, true}
+                                            --enabled {false, true}
+                                            --repository-id
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -30,12 +31,13 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -43,17 +45,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_case_enforcement_update
+- uid: az_repos_policy_case-enforcement_update
   name: az repos policy case-enforcement update
   summary: Update case enforcement policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy case-enforcement update --id
+                                            [--blocking {false, true}]
+                                            [--detect {false, true}]
+                                            [--enabled {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--repository-id]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -67,7 +77,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -79,12 +89,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
+- az_repos_policy_case-enforcement_create
+- az_repos_policy_case-enforcement_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -100,4 +106,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage case enforcement policy.
+metadata:
+  description: Manage case enforcement policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/comment-required.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/comment-required.yml
index 4c94a046fe..666e866ba1 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/comment-required.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/comment-required.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_comment_required_create
-  - az_repos_policy_comment_required_update
-- uid: az_repos_policy_comment_required_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_comment-required
+name: az repos policy comment-required
+summary: Manage comment required policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_comment-required_create
   name: az repos policy comment-required create
   summary: Create comment resolution required policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy comment-required create --blocking {false, true}
+                                            --branch
+                                            --enabled {false, true}
+                                            --repository-id
+                                            [--branch-match-type {exact, prefix}]
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -34,6 +37,7 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -44,7 +48,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,17 +56,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_comment_required_update
+- uid: az_repos_policy_comment-required_update
   name: az repos policy comment-required update
   summary: Update comment resolution required policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy comment-required update --id
+                                            [--blocking {false, true}]
+                                            [--branch]
+                                            [--branch-match-type {exact, prefix}]
+                                            [--detect {false, true}]
+                                            [--enabled {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--repository-id]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -83,7 +97,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -95,12 +109,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
+- az_repos_policy_comment-required_create
+- az_repos_policy_comment-required_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,4 +126,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage comment required policy.
+metadata:
+  description: Manage comment required policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/file-size.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/file-size.yml
index 58482060e4..937a501e79 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/file-size.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/file-size.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_file_size_create
-  - az_repos_policy_file_size_update
-- uid: az_repos_policy_file_size_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_file-size
+name: az repos policy file-size
+summary: Manage file size policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_file-size_create
   name: az repos policy file-size create
   summary: Create file size policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy file-size create --blocking {false, true}
+                                     --enabled {false, true}
+                                     --maximum-git-blob-size
+                                     --repository-id
+                                     --use-uncompressed-size {false, true}
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -39,12 +42,13 @@ items:
     parameterValueGroup: false, true
     summary: Whether to use uncompressed size.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,17 +56,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_file_size_update
+- uid: az_repos_policy_file-size_update
   name: az repos policy file-size update
   summary: Update file size policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy file-size update --id
+                                     [--blocking {false, true}]
+                                     [--detect {false, true}]
+                                     [--enabled {false, true}]
+                                     [--maximum-git-blob-size]
+                                     [--org]
+                                     [--project]
+                                     [--repository-id]
+                                     [--subscription]
+                                     [--use-uncompressed-size {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -79,7 +93,7 @@ items:
     summary: Maximum git blob size in bytes. For example, to specify a 10byte limit, --maximum-git-blob-size 10.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -87,20 +101,16 @@ items:
   - name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-uncompressed-size
     parameterValueGroup: false, true
     summary: Whether to use uncompressed size.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
+- az_repos_policy_file-size_create
+- az_repos_policy_file-size_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,4 +126,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage file size policy.
+metadata:
+  description: Manage file size policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/merge-strategy.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/merge-strategy.yml
index 51c84dbd7d..5e7a1517d9 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/merge-strategy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/merge-strategy.yml
@@ -1,21 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_merge_strategy_create
-  - az_repos_policy_merge_strategy_update
-- uid: az_repos_policy_merge_strategy_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_merge-strategy
+name: az repos policy merge-strategy
+summary: Manage merge strategy policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_merge-strategy_create
   name: az repos policy merge-strategy create
   summary: Create merge strategy policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy merge-strategy create --blocking {false, true}
+                                          --branch
+                                          --enabled {false, true}
+                                          --repository-id
+                                          [--allow-no-fast-forward {false, true}]
+                                          [--allow-rebase {false, true}]
+                                          [--allow-rebase-merge {false, true}]
+                                          [--allow-squash {false, true}]
+                                          [--branch-match-type {exact, prefix}]
+                                          [--detect {false, true}]
+                                          [--org]
+                                          [--project]
+                                          [--subscription]
+                                          [--use-squash-merge {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -34,6 +42,7 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --allow-no-fast-forward
     parameterValueGroup: false, true
     summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
@@ -60,29 +69,44 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-squash-merge
     parameterValueGroup: false, true
     summary: Whether to squash merge always. This option does not work for allowing other merge types.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-- uid: az_repos_policy_merge_strategy_update
+- uid: az_repos_policy_merge-strategy_update
   name: az repos policy merge-strategy update
   summary: Update merge strategy policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy merge-strategy update --id
+                                          [--allow-no-fast-forward {false, true}]
+                                          [--allow-rebase {false, true}]
+                                          [--allow-rebase-merge {false, true}]
+                                          [--allow-squash {false, true}]
+                                          [--blocking {false, true}]
+                                          [--branch]
+                                          [--branch-match-type {exact, prefix}]
+                                          [--detect {false, true}]
+                                          [--enabled {false, true}]
+                                          [--org]
+                                          [--project]
+                                          [--repository-id]
+                                          [--subscription]
+                                          [--use-squash-merge {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --allow-no-fast-forward
     parameterValueGroup: false, true
     summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
@@ -119,7 +143,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -127,20 +151,16 @@ items:
   - name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-squash-merge
     parameterValueGroup: false, true
     summary: Whether to squash merge always. This option does not work for allowing other merge types.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
+- az_repos_policy_merge-strategy_create
+- az_repos_policy_merge-strategy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -156,4 +176,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage merge strategy policy.
+metadata:
+  description: Manage merge strategy policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/required-reviewer.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/required-reviewer.yml
index a4801b04f0..16cf941448 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/required-reviewer.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/required-reviewer.yml
@@ -1,21 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_required_reviewer_create
-  - az_repos_policy_required_reviewer_update
-- uid: az_repos_policy_required_reviewer_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_required-reviewer
+name: az repos policy required-reviewer
+summary: Manage required reviewer policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_required-reviewer_create
   name: az repos policy required-reviewer create
   summary: Create required reviewer policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy required-reviewer create --blocking {false, true}
+                                             --branch
+                                             --enabled {false, true}
+                                             --message
+                                             --repository-id
+                                             --required-reviewer-ids
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--path-filter]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -42,6 +48,7 @@ items:
     name: --required-reviewer-ids
     summary: "Required reviewers email addresses separated by ';'. For example: john@contoso.com;alice@contoso.com."
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -52,7 +59,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -63,17 +70,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_required_reviewer_update
+- uid: az_repos_policy_required-reviewer_update
   name: az repos policy required-reviewer update
   summary: Update required reviewer policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy required-reviewer update --id
+                                             [--blocking {false, true}]
+                                             [--branch]
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--enabled {false, true}]
+                                             [--message]
+                                             [--org]
+                                             [--path-filter]
+                                             [--project]
+                                             [--repository-id]
+                                             [--required-reviewer-ids]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -97,7 +117,7 @@ items:
     summary: Message.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -115,12 +135,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
+- az_repos_policy_required-reviewer_create
+- az_repos_policy_required-reviewer_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -136,4 +152,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage required reviewer policy.
+metadata:
+  description: Manage required reviewer policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/policy/work-item-linking.yml b/2017-03-09-profile/docs-ref-autogen/repos/policy/work-item-linking.yml
index d58ba18449..1de60f3b07 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/policy/work-item-linking.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/policy/work-item-linking.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_work_item_linking_create
-  - az_repos_policy_work_item_linking_update
-- uid: az_repos_policy_work_item_linking_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_work-item-linking
+name: az repos policy work-item-linking
+summary: Manage work item linking policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_work-item-linking_create
   name: az repos policy work-item-linking create
   summary: Create work item linking policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy work-item-linking create --blocking {false, true}
+                                             --branch
+                                             --enabled {false, true}
+                                             --repository-id
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -34,6 +37,7 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -44,7 +48,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,17 +56,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_work_item_linking_update
+- uid: az_repos_policy_work-item-linking_update
   name: az repos policy work-item-linking update
   summary: Update work item linking policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy work-item-linking update --id
+                                             [--blocking {false, true}]
+                                             [--branch]
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--enabled {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--repository-id]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -83,7 +97,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -95,12 +109,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
+- az_repos_policy_work-item-linking_create
+- az_repos_policy_work-item-linking_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,4 +126,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item linking policy.
+metadata:
+  description: Manage work item linking policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/pr.yml b/2017-03-09-profile/docs-ref-autogen/repos/pr.yml
index 0e1442cefc..d6f09199d1 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/pr.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/pr.yml
@@ -1,29 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_checkout
-  - az_repos_pr_create
-  - az_repos_pr_list
-  - az_repos_pr_set_vote
-  - az_repos_pr_show
-  - az_repos_pr_update
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr
+name: az repos pr
+summary: Manage pull requests.
+description: ''
+directCommands:
 - uid: az_repos_pr_checkout
   name: az repos pr checkout
   summary: Checkout the PR source branch locally, if no local changes are present.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr checkout --id
+                         [--remote-name]
+                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --remote-name
     defaultValue: origin
     summary: Name of git remote against which PR is raised.
@@ -35,9 +29,28 @@ items:
   name: az repos pr create
   summary: Create a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr create [--auto-complete {false, true}]
+                       [--bypass-policy {false, true}]
+                       [--bypass-policy-reason]
+                       [--delete-source-branch {false, true}]
+                       [--description]
+                       [--detect {false, true}]
+                       [--draft {false, true}]
+                       [--merge-commit-message]
+                       [--open]
+                       [--org]
+                       [--project]
+                       [--repository]
+                       [--reviewers]
+                       [--source-branch]
+                       [--squash {false, true}]
+                       [--subscription]
+                       [--target-branch]
+                       [--title]
+                       [--transition-work-items {false, true}]
+                       [--work-items]
+  optionalParameters:
   - name: --auto-complete
     parameterValueGroup: false, true
     summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
@@ -71,7 +84,7 @@ items:
     summary: Open the pull request in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -89,6 +102,9 @@ items:
     parameterValueGroup: false, true
     summary: Squash the commits in the source branch when merging into the target branch.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target-branch -t
     summary: Name of the target branch. If not specified, defaults to the default branch of the target repository.
     description: ''
@@ -102,16 +118,26 @@ items:
   - name: --work-items
     summary: IDs of the work items to link to the new pull request. Space separated.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_repos_pr_list
   name: az repos pr list
   summary: List pull requests.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr list [--creator]
+                     [--detect {false, true}]
+                     [--include-links]
+                     [--org]
+                     [--project]
+                     [--query-examples]
+                     [--repository]
+                     [--reviewer]
+                     [--skip]
+                     [--source-branch]
+                     [--status {abandoned, active, all, completed}]
+                     [--subscription]
+                     [--target-branch]
+                     [--top]
+  optionalParameters:
   - name: --creator
     summary: Limit results to pull requests created by this user.
     description: ''
@@ -123,11 +149,14 @@ items:
     summary: Include _links for each pull request.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository -r
     summary: Name or ID of the repository.
     description: ''
@@ -144,22 +173,26 @@ items:
     parameterValueGroup: abandoned, active, all, completed
     summary: Limit results to pull requests with this status.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target-branch -t
     summary: Limit results to pull requests that target this branch.
     description: ''
   - name: --top
     summary: Maximum number of pull requests to list.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-- uid: az_repos_pr_set_vote
+- uid: az_repos_pr_set-vote
   name: az repos pr set-vote
   summary: Vote on a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr set-vote --id
+                         --vote {approve, approve-with-suggestions, reject, reset, wait-for-author}
+                         [--detect {false, true}]
+                         [--org]
+                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -169,12 +202,13 @@ items:
     parameterValueGroup: approve, approve-with-suggestions, reject, reset, wait-for-author
     summary: New vote value for the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -183,13 +217,19 @@ items:
   name: az repos pr show
   summary: Get the details of a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr show --id
+                     [--detect {false, true}]
+                     [--open]
+                     [--org]
+                     [--query-examples]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -198,7 +238,10 @@ items:
     summary: Open the pull request in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -207,13 +250,28 @@ items:
   name: az repos pr update
   summary: Update a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr update --id
+                       [--auto-complete {false, true}]
+                       [--bypass-policy {false, true}]
+                       [--bypass-policy-reason]
+                       [--delete-source-branch {false, true}]
+                       [--description]
+                       [--detect {false, true}]
+                       [--draft {false, true}]
+                       [--merge-commit-message]
+                       [--org]
+                       [--squash {false, true}]
+                       [--status {abandoned, active, completed}]
+                       [--subscription]
+                       [--title]
+                       [--transition-work-items {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --auto-complete
     parameterValueGroup: false, true
     summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
@@ -244,7 +302,7 @@ items:
     summary: Message displayed when commits are merged.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --squash
     parameterValueGroup: false, true
@@ -254,6 +312,9 @@ items:
     parameterValueGroup: abandoned, active, completed
     summary: Set the new state of pull request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --title
     summary: New title for the pull request.
     description: ''
@@ -261,61 +322,24 @@ items:
     parameterValueGroup: false, true
     summary: Transition any work items linked to the pull request into the next logical state. (e.g. Active -> Resolved).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
+- az_repos_pr_checkout
+- az_repos_pr_create
+- az_repos_pr_list
+- az_repos_pr_policy
+- az_repos_pr_policy_list
+- az_repos_pr_policy_queue
+- az_repos_pr_reviewer
+- az_repos_pr_reviewer_add
+- az_repos_pr_reviewer_list
+- az_repos_pr_reviewer_remove
+- az_repos_pr_set-vote
+- az_repos_pr_show
+- az_repos_pr_update
+- az_repos_pr_work-item
+- az_repos_pr_work-item_add
+- az_repos_pr_work-item_list
+- az_repos_pr_work-item_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -331,4 +355,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull requests.
+metadata:
+  description: Manage pull requests.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/pr/policy.yml b/2017-03-09-profile/docs-ref-autogen/repos/pr/policy.yml
index e3a3307bd3..ec4d200093 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/pr/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/pr/policy.yml
@@ -1,48 +1,57 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_policy_list
-  - az_repos_pr_policy_queue
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr_policy
+name: az repos pr policy
+summary: Manage pull request policy.
+description: ''
+directCommands:
 - uid: az_repos_pr_policy_list
   name: az repos pr policy list
   summary: List policies of a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr policy list --id
+                            [--detect {false, true}]
+                            [--org]
+                            [--query-examples]
+                            [--skip]
+                            [--subscription]
+                            [--top]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: Number of policies to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of policies to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of policies to list.
+    description: ''
 - uid: az_repos_pr_policy_queue
   name: az repos pr policy queue
   summary: Queue an evaluation of a policy for a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr policy queue --evaluation-id
+                             --id
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --evaluation-id -e
     summary: ID of the policy evaluation to queue.
@@ -51,23 +60,20 @@ items:
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
+- az_repos_pr_policy_list
+- az_repos_pr_policy_queue
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -83,4 +89,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request policy.
+metadata:
+  description: Manage pull request policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/pr/reviewer.yml b/2017-03-09-profile/docs-ref-autogen/repos/pr/reviewer.yml
index 9d22a65707..582499e289 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/pr/reviewer.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/pr/reviewer.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_reviewer_add
-  - az_repos_pr_reviewer_list
-  - az_repos_pr_reviewer_remove
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr_reviewer
+name: az repos pr reviewer
+summary: Manage pull request reviewers.
+description: ''
+directCommands:
 - uid: az_repos_pr_reviewer_add
   name: az repos pr reviewer add
   summary: Add one or more reviewers to a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr reviewer add --id
+                             --reviewers
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -25,12 +23,13 @@ items:
     name: --reviewers
     summary: Users or groups to include as reviewers on a pull request. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -39,19 +38,27 @@ items:
   name: az repos pr reviewer list
   summary: List reviewers of a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr reviewer list --id
+                              [--detect {false, true}]
+                              [--org]
+                              [--query-examples]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -60,9 +67,13 @@ items:
   name: az repos pr reviewer remove
   summary: Remove one or more reviewers from a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr reviewer remove --id
+                                --reviewers
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -71,26 +82,21 @@ items:
     name: --reviewers
     summary: Users or groups to remove as reviewers on a pull request. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
+- az_repos_pr_reviewer_add
+- az_repos_pr_reviewer_list
+- az_repos_pr_reviewer_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,4 +112,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request reviewers.
+metadata:
+  description: Manage pull request reviewers.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/pr/work-item.yml b/2017-03-09-profile/docs-ref-autogen/repos/pr/work-item.yml
index 52af9b7aee..69b23242d8 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/pr/work-item.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/pr/work-item.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_work_item_add
-  - az_repos_pr_work_item_list
-  - az_repos_pr_work_item_remove
-- uid: az_repos_pr_work_item_add
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr_work-item
+name: az repos pr work-item
+summary: Manage work items associated with pull requests.
+description: ''
+directCommands:
+- uid: az_repos_pr_work-item_add
   name: az repos pr work-item add
   summary: Link one or more work items to a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr work-item add --id
+                              --work-items
+                              [--detect {false, true}]
+                              [--org]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -25,44 +23,57 @@ items:
     name: --work-items
     summary: IDs of the work items to link. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_pr_work_item_list
+- uid: az_repos_pr_work-item_list
   name: az repos pr work-item list
   summary: List linked work items for a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr work-item list --id
+                               [--detect {false, true}]
+                               [--org]
+                               [--query-examples]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_pr_work_item_remove
+- uid: az_repos_pr_work-item_remove
   name: az repos pr work-item remove
   summary: Unlink one or more work items from a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr work-item remove --id
+                                 --work-items
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -71,26 +82,21 @@ items:
     name: --work-items
     summary: IDs of the work items to unlink. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
+- az_repos_pr_work-item_add
+- az_repos_pr_work-item_list
+- az_repos_pr_work-item_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,4 +112,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items associated with pull requests.
+metadata:
+  description: Manage work items associated with pull requests.
diff --git a/2017-03-09-profile/docs-ref-autogen/repos/ref.yml b/2017-03-09-profile/docs-ref-autogen/repos/ref.yml
index a79e64ce8e..270b227c4e 100644
--- a/2017-03-09-profile/docs-ref-autogen/repos/ref.yml
+++ b/2017-03-09-profile/docs-ref-autogen/repos/ref.yml
@@ -1,24 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_ref_create
-  - az_repos_ref_delete
-  - az_repos_ref_list
-  - az_repos_ref_lock
-  - az_repos_ref_unlock
+### YamlMime:AzureCLIGroup
+uid: az_repos_ref
+name: az repos ref
+summary: Manage Git references.
+description: ''
+directCommands:
 - uid: az_repos_ref_create
   name: az repos ref create
   summary: Create a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref create --name
+                        --object-id
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--repository]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to create (example: heads/my_branch or tags/my_tag).'
@@ -27,12 +25,13 @@ items:
     name: --object-id
     summary: Id of the object to create the reference from.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,9 +46,15 @@ items:
   name: az repos ref delete
   summary: Delete a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref delete --name
+                        --object-id
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--repository]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to delete (example: heads/my_branch).'
@@ -58,12 +63,13 @@ items:
     name: --object-id
     summary: Id of the reference to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -78,9 +84,15 @@ items:
   name: az repos ref list
   summary: List the references.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref list [--detect {false, true}]
+                      [--filter]
+                      [--org]
+                      [--project]
+                      [--query-examples]
+                      [--repository]
+                      [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -89,11 +101,14 @@ items:
     summary: 'A filter to apply to the refs (starts with). Example: head or heads/ for the branches.'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository -r
     summary: Name or ID of the repository.
     description: ''
@@ -104,19 +119,25 @@ items:
   name: az repos ref lock
   summary: Lock a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref lock --name
+                      [--detect {false, true}]
+                      [--org]
+                      [--project]
+                      [--repository]
+                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to update (example: heads/my_branch).'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -131,19 +152,25 @@ items:
   name: az repos ref unlock
   summary: Unlock a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref unlock --name
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--repository]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to update (example: heads/my_branch).'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -155,21 +182,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
+- az_repos_ref_create
+- az_repos_ref_delete
+- az_repos_ref_list
+- az_repos_ref_lock
+- az_repos_ref_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -185,4 +202,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git references.
+metadata:
+  description: Manage Git references.
diff --git a/2017-03-09-profile/docs-ref-autogen/resource-mover.yml b/2017-03-09-profile/docs-ref-autogen/resource-mover.yml
new file mode 100644
index 0000000000..e4d4f110b1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/resource-mover.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_resource-mover
+name: az resource-mover
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-mover** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az resource-mover** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Move resources in Azure.
+description: ''
+commands:
+- az_resource-mover_move-collection
+- az_resource-mover_move-collection_bulk-remove
+- az_resource-mover_move-collection_commit
+- az_resource-mover_move-collection_create
+- az_resource-mover_move-collection_delete
+- az_resource-mover_move-collection_discard
+- az_resource-mover_move-collection_initiate-move
+- az_resource-mover_move-collection_list
+- az_resource-mover_move-collection_list-required-for
+- az_resource-mover_move-collection_list-unresolved-dependency
+- az_resource-mover_move-collection_prepare
+- az_resource-mover_move-collection_resolve-dependency
+- az_resource-mover_move-collection_show
+- az_resource-mover_move-collection_update
+- az_resource-mover_move-collection_wait
+- az_resource-mover_move-resource
+- az_resource-mover_move-resource_add
+- az_resource-mover_move-resource_delete
+- az_resource-mover_move-resource_list
+- az_resource-mover_move-resource_show
+- az_resource-mover_move-resource_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Move resources in Azure.
diff --git a/2017-03-09-profile/docs-ref-autogen/resource-mover/move-collection.yml b/2017-03-09-profile/docs-ref-autogen/resource-mover/move-collection.yml
new file mode 100644
index 0000000000..9cb1238525
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/resource-mover/move-collection.yml
@@ -0,0 +1,502 @@
+### YamlMime:AzureCLIGroup
+uid: az_resource-mover_move-collection
+name: az resource-mover move-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-mover** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az resource-mover move-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage move-collection.
+description: ''
+directCommands:
+- uid: az_resource-mover_move-collection_bulk-remove
+  name: az resource-mover move-collection bulk-remove
+  summary: Remove the set of move-resources from move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection bulk-remove --move-collection-name
+                                                  --resource-group
+                                                  [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                                  [--move-resources]
+                                                  [--no-wait]
+                                                  [--validate-only {false, true}]
+  examples:
+  - summary: Remove a move-resource in a move-collection.
+    syntax: az resource-mover move-collection bulk-remove --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: Name of the move-collection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_commit
+  name: az resource-mover move-collection commit
+  summary: Commit the set of resources. The commit operation is triggered on the move-resources in the move-state 'CommitPending' or 'CommitFailed', on a successful completion the move-resource's move-state do a transition to Committed.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection commit --move-collection-name
+                                             --resource-group
+                                             [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                             [--move-resources]
+                                             [--no-wait]
+                                             [--validate-only {false, true}]
+  examples:
+  - summary: Commit a move-resource.
+    syntax: az resource-mover move-collection commit --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_create
+  name: az resource-mover move-collection create
+  summary: Create a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection create --move-collection-name
+                                             --resource-group
+                                             [--identity]
+                                             [--location]
+                                             [--source-region]
+                                             [--tags]
+                                             [--target-region]
+  examples:
+  - summary: Create a move-collection with system assigned identity.
+    syntax: az resource-mover move-collection create --identity type=SystemAssigned --location eastus2 --source-region eastus --target-region westus --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    summary: Define the MSI properties of the move-collection.
+    description: >-
+      Usage: --identity type=XX principal-id=XX tenant-id=XX
+
+
+      type: The type of identity used for the resource mover service.
+
+      principal-id: The principal id.
+
+      tenant-id: The tenant id.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --source-region
+    summary: The source region.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-region
+    summary: The target region.
+    description: ''
+- uid: az_resource-mover_move-collection_delete
+  name: az resource-mover move-collection delete
+  summary: Delete a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection delete --move-collection-name
+                                             --resource-group
+                                             [--no-wait]
+                                             [--yes]
+  examples:
+  - summary: Delete a move-collection.
+    syntax: az resource-mover move-collection delete --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_resource-mover_move-collection_discard
+  name: az resource-mover move-collection discard
+  summary: Discard the set of resources. The discard operation is triggered on the move-resources in the move-state 'CommitPending' or 'DiscardFailed', on a successful completion the move-resource's move-state do a transition to MovePending.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection discard --move-collection-name
+                                              --resource-group
+                                              [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                              [--move-resources]
+                                              [--no-wait]
+                                              [--validate-only {false, true}]
+  examples:
+  - summary: Discard a remove-resource.
+    syntax: az resource-mover move-collection discard --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_initiate-move
+  name: az resource-mover move-collection initiate-move
+  summary: Move the set of resources. The move operation is triggered after the move-resources are in the move-state 'MovePending' or 'MoveFailed', on a successful completion the move-resource's move-state do a transition to CommitPending.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection initiate-move --move-collection-name
+                                                    --resource-group
+                                                    [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                                    [--move-resources]
+                                                    [--no-wait]
+                                                    [--validate-only {false, true}]
+  examples:
+  - summary: Move the set of resources.
+    syntax: az resource-mover move-collection initiate-move --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_list
+  name: az resource-mover move-collection list
+  summary: List details of the move-collections.
+  description: ''
+  syntax: az resource-mover move-collection list [--resource-group]
+  examples:
+  - summary: List all move-collections.
+    syntax: az resource-mover move-collection list
+  - summary: List all move-collections by resource group.
+    syntax: az resource-mover move-collection list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-collection_list-required-for
+  name: az resource-mover move-collection list-required-for
+  summary: List the move-resources for which an arm resource is required for.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection list-required-for --move-collection-name
+                                                        --resource-group
+                                                        --source-id
+  examples:
+  - summary: List the move-resources for which an arm resource is required for.
+    syntax: az resource-mover move-collection list-required-for --name MyMoveCollection --resource-group MyResourceGroup --source-id "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/nic1"
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The Move Collection Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source-id
+    summary: The sourceId for which the api is invoked.
+    description: ''
+- uid: az_resource-mover_move-collection_list-unresolved-dependency
+  name: az resource-mover move-collection list-unresolved-dependency
+  summary: List the details of the unresolved dependencies in a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection list-unresolved-dependency --move-collection-name
+                                                                 --resource-group
+                                                                 [--dependency-level {Descendant, Direct}]
+  examples:
+  - summary: List the unresolved dependencies.
+    syntax: az resource-mover move-collection list-unresolved-dependency --move-collection-name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dependency-level
+    parameterValueGroup: Descendant, Direct
+    summary: The dependency level.
+    description: ''
+- uid: az_resource-mover_move-collection_prepare
+  name: az resource-mover move-collection prepare
+  summary: Prepare the set of resources. The prepare operation is on the move-resources that are in the move-state 'PreparePending' or 'PrepareFailed', on a successful completion the move-resource's move-state do a transition to MovePending.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection prepare --move-collection-name
+                                              --resource-group
+                                              [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                              [--move-resources]
+                                              [--no-wait]
+                                              [--validate-only {false, true}]
+  examples:
+  - summary: Prepare a move-resource.
+    syntax: az resource-mover move-collection prepare --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_resolve-dependency
+  name: az resource-mover move-collection resolve-dependency
+  summary: Compute, resolve and validate the dependencies of the move-resources in the move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection resolve-dependency --move-collection-name
+                                                         --resource-group
+                                                         [--no-wait]
+  examples:
+  - summary: Resolve the dependency of the move-resources.
+    syntax: az resource-mover move-collection resolve-dependency --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_resource-mover_move-collection_show
+  name: az resource-mover move-collection show
+  summary: Get the details of a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection show --move-collection-name
+                                           --resource-group
+  examples:
+  - summary: Show information about a move-collection.
+    syntax: az resource-mover move-collection show --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-collection_update
+  name: az resource-mover move-collection update
+  summary: Update a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection update --move-collection-name
+                                             --resource-group
+                                             [--identity]
+                                             [--tags]
+  examples:
+  - summary: Update a move-collection.
+    syntax: az resource-mover move-collection update --identity type=SystemAssigned --tags key1=value1 --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    summary: Define the MSI properties of the move-collection.
+    description: >-
+      Usage: --identity type=XX principal-id=XX tenant-id=XX
+
+
+      type: The type of identity used for the resource mover service.
+
+      principal-id: The principal id.
+
+      tenant-id: The tenant id.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_resource-mover_move-collection_wait
+  name: az resource-mover move-collection wait
+  summary: Place the CLI in a waiting state until a condition of the move-collection is met.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection wait --move-collection-name
+                                           --resource-group
+                                           [--created]
+                                           [--custom]
+                                           [--deleted]
+                                           [--exists]
+                                           [--interval]
+                                           [--timeout]
+                                           [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the move-collection is successfully deleted.
+    syntax: az resource-mover move-collection wait --name MyMoveCollection --resource-group MyResourceGroup --deleted
+  - summary: Pause executing next line of CLI script until the move-collection is successfully created.
+    syntax: az resource-mover move-collection wait --name MyMoveCollection --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_resource-mover_move-collection_bulk-remove
+- az_resource-mover_move-collection_commit
+- az_resource-mover_move-collection_create
+- az_resource-mover_move-collection_delete
+- az_resource-mover_move-collection_discard
+- az_resource-mover_move-collection_initiate-move
+- az_resource-mover_move-collection_list
+- az_resource-mover_move-collection_list-required-for
+- az_resource-mover_move-collection_list-unresolved-dependency
+- az_resource-mover_move-collection_prepare
+- az_resource-mover_move-collection_resolve-dependency
+- az_resource-mover_move-collection_show
+- az_resource-mover_move-collection_update
+- az_resource-mover_move-collection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage move-collection.
diff --git a/2017-03-09-profile/docs-ref-autogen/resource-mover/move-resource.yml b/2017-03-09-profile/docs-ref-autogen/resource-mover/move-resource.yml
new file mode 100644
index 0000000000..1ae0264b3e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/resource-mover/move-resource.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_resource-mover_move-resource
+name: az resource-mover move-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-mover** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az resource-mover move-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage move-resource.
+description: ''
+directCommands:
+- uid: az_resource-mover_move-resource_add
+  name: az resource-mover move-resource add
+  summary: Create or update a move-resource to the move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource add --move-collection-name
+                                        --move-resource-name
+                                        --resource-group
+                                        [--depends-on-overrides]
+                                        [--existing-target-id]
+                                        [--no-wait]
+                                        [--resource-settings]
+                                        [--source-id]
+  examples:
+  - summary: Add a vNet as a move-resource to the move-collection.
+    syntax: >-
+      az resource-mover move-resource add --resource-group MyResourceGroup --move-collection-name MyMoveCollection --name MoveResourceName
+
+      --source-id "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/MyVNet"
+
+      --resource-settings '{
+          "resourceType": "Microsoft.Network/virtualNetworks",
+          "targetResourceName": "MyVNet-target"
+      }'
+  - summary: Add a vNet as a move-resource to the move-collection.
+    syntax: >-
+      az resource-mover move-resource add --resource-group MyResourceGroup --move-collection-name MyMoveCollection --name MoveResourceName
+
+      --source-id "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/MyVNet"
+
+      --resource-settings @resource-settings.json
+  - summary: Add a VM as a move-resource to the move-collection.
+    syntax: >-
+      az resource-mover move-resource add --resource-group MyResourceGroup --move-collection-name MyMoveCollection --name MoveResourceName
+
+      --source-id "/subscriptions/subID/resourceGroups/eastusRG/providers/Microsoft.Compute/virtualMachines/MyVM"
+
+      --depends-on-overrides id="/subscriptions/subID/resourceGroups/eastusRG/providers/Microsoft.Network/networkInterfaces/MyNIC" target-id="/subscriptions/subID/resourceGroups/westusRG/providers/Microsoft.Network/networkInterfaces/MyNIC"
+
+      --resource-settings '{
+          "resourceType": "Microsoft.Compute/virtualMachines",
+          "targetAvailabilitySetId": "/subscriptions/subID/resourceGroups/eastusRG/providers/Microsoft.Compute/availabilitySets/MyAVSet",
+          "targetAvailabilityZone": "2",
+          "targetResourceName": "MyVM-target",
+          "targetVmSize": null
+      }'
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --depends-on-overrides
+    summary: The move-resource dependencies overrides.
+    description: >-
+      Usage: --depends-on-overrides id=XX target-id=XX
+
+
+      id: The ARM ID of the dependent resource.
+
+      target-id: The resource ARM ID of either the move-resource or the resource ARM ID of the dependent resource.
+
+
+      Multiple actions can be specified by using more than one --depends-on-overrides argument.
+  - name: --existing-target-id
+    summary: The existing target ARM Id of the resource.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-settings
+    summary: 'The resource settings. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --source-id
+    summary: The Source ARM Id of the resource.
+    description: ''
+- uid: az_resource-mover_move-resource_delete
+  name: az resource-mover move-resource delete
+  summary: Delete a move-resource from the move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource delete --move-collection-name
+                                           --move-resource-name
+                                           --resource-group
+                                           [--no-wait]
+                                           [--yes]
+  examples:
+  - summary: Delete a move-resource from the move-collection.
+    syntax: az resource-mover move-resource delete --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_resource-mover_move-resource_list
+  name: az resource-mover move-resource list
+  summary: List the move-resources in a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource list --move-collection-name
+                                         --resource-group
+  examples:
+  - summary: List the move-resources in a move-collection.
+    syntax: az resource-mover move-resource list --move-collection-name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-resource_show
+  name: az resource-mover move-resource show
+  summary: Get the details of a move-resource.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource show --move-collection-name
+                                         --move-resource-name
+                                         --resource-group
+  examples:
+  - summary: Get the details of a move-resource.
+    syntax: az resource-mover move-resource show --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-resource_wait
+  name: az resource-mover move-resource wait
+  summary: Place the CLI in a waiting state until a condition of the move-resource is met.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource wait --move-collection-name
+                                         --move-resource-name
+                                         --resource-group
+                                         [--created]
+                                         [--custom]
+                                         [--deleted]
+                                         [--exists]
+                                         [--interval]
+                                         [--timeout]
+                                         [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the move-resource is successfully created.
+    syntax: az resource-mover move-resource wait --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup --created
+  - summary: Pause executing next line of CLI script until the move-resource is successfully deleted.
+    syntax: az resource-mover move-resource wait --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_resource-mover_move-resource_add
+- az_resource-mover_move-resource_delete
+- az_resource-mover_move-resource_list
+- az_resource-mover_move-resource_show
+- az_resource-mover_move-resource_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage move-resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/resource.yml b/2017-03-09-profile/docs-ref-autogen/resource.yml
index 9487c8b3c8..cf634653fd 100644
--- a/2017-03-09-profile/docs-ref-autogen/resource.yml
+++ b/2017-03-09-profile/docs-ref-autogen/resource.yml
@@ -1,61 +1,63 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_resource
-  name: az resource
-  summary: Manage Azure resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_resource_create
-  - az_resource_delete
-  - az_resource_invoke_action
-  - az_resource_list
-  - az_resource_move
-  - az_resource_show
-  - az_resource_tag
-  - az_resource_update
-  - az_resource_wait
+### YamlMime:AzureCLIGroup
+uid: az_resource
+name: az resource
+summary: Manage Azure resources.
+description: ''
+directCommands:
 - uid: az_resource_create
   name: az resource create
   summary: Create a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource create --properties
+                       [--api-version]
+                       [--id]
+                       [--is-full-object]
+                       [--latest-include-preview]
+                       [--location]
+                       [--name]
+                       [--namespace]
+                       [--parent]
+                       [--resource-group]
+                       [--resource-type]
+                       [--subscription]
   examples:
   - summary: Create an API app by providing a full JSON configuration.
-    syntax:
-      content: >-
-        az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites \
-            --is-full-object --properties "{ \"kind\": \"api\", \"location\": \
-                \"West US\", \"properties\": { \"serverFarmId\": \
-                    \"/subscriptions/{SubID}/resourcegroups/{ResourceGroup} \
-                        /providers/Microsoft.Web/serverfarms/{ServicePlan}\" } }"
+    syntax: >-
+      az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites \
+          --is-full-object --properties "{ \"kind\": \"api\", \"location\": \
+              \"West US\", \"properties\": { \"serverFarmId\": \
+                  \"/subscriptions/{SubID}/resourcegroups/{ResourceGroup} \
+                      /providers/Microsoft.Web/serverfarms/{ServicePlan}\" } }"
   - summary: Create a resource by loading JSON configuration from a file.
-    syntax:
-      content: az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites --is-full-object --properties @jsonConfigFile
+    syntax: az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites --is-full-object --properties @jsonConfigFile
   - summary: Create a web app with the minimum required configuration information.
-    syntax:
-      content: >-
-        az resource create -g myRG -n myWeb --resource-type Microsoft.web/sites \
-            --properties "{ \"serverFarmId\":\"/subscriptions/{SubID}/resourcegroups/ \
-                {ResourceGroup}/providers/Microsoft.Web/serverfarms/{ServicePlan}\" }"
-  parameters:
+    syntax: >-
+      az resource create -g myRG -n myWeb --resource-type Microsoft.web/sites \
+          --properties "{ \"serverFarmId\":\"/subscriptions/{SubID}/resourcegroups/ \
+              {ResourceGroup}/providers/Microsoft.Web/serverfarms/{ServicePlan}\" }"
+  - summary: Create a resource by using the latest api-version whether this version is a preview version.
+    syntax: az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites --is-full-object --properties @jsonConfigFile --latest-include-preview
+  requiredParameters:
   - isRequired: true
     name: --properties -p
     summary: A JSON-formatted string containing resource properties.
     description: ''
+  optionalParameters:
+  - name: --api-version
+    summary: The api version of the resource (omit for the latest stable version).
+    description: ''
   - name: --id
     summary: Resource ID.
     description: ''
   - name: --is-full-object
-    summary: Indicates that the properties object includes other options such as location, tags, sku, and/or plan.
+    summary: Indicate that the properties object includes other options such as location, tags, sku, and/or plan.
     description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
     description: ''
-  - name: --api-version
-    summary: The api version of the resource (omit for latest).
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
@@ -67,7 +69,7 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -75,35 +77,40 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_delete
   name: az resource delete
   summary: Delete a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource delete [--api-version]
+                       [--ids]
+                       [--latest-include-preview]
+                       [--name]
+                       [--namespace]
+                       [--parent]
+                       [--resource-group]
+                       [--resource-type]
+                       [--subscription]
   examples:
   - summary: Delete a virtual machine named 'MyVm'.
-    syntax:
-      content: az resource delete -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
+    syntax: az resource delete -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
   - summary: Delete a web app using a resource identifier.
-    syntax:
-      content: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
+    syntax: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
   - summary: Delete a subnet using a resource identifier.
-    syntax:
-      content: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
-  parameters:
+    syntax: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
+  - summary: Delete a virtual machine named 'MyVm' by using the latest api-version whether this version is a preview version.
+    syntax: az resource delete -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" --latest-include-preview
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -114,7 +121,7 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -122,49 +129,52 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_resource_invoke_action
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
+- uid: az_resource_invoke-action
   name: az resource invoke-action
   summary: Invoke an action on the resource.
-  description: A list of possible actions corresponding to a resource can be found at <a href="https://docs.microsoft.com/rest/api/">https://docs.microsoft.com/rest/api/</a>. All POST requests are actions that can be invoked and are specified at the end of the URI path. For instance, to stop a VM, the request URI is <a href="https://management.azure.com/subscriptions">https://management.azure.com/subscriptions</a>/{SubscriptionId}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VM}/powerOff?api-version={APIVersion} and the corresponding action is `powerOff`. This can be found at <a href="https://docs.microsoft.com/rest/api/compute/virtualmachines/virtualmachines-stop">https://docs.microsoft.com/rest/api/compute/virtualmachines/virtualmachines-stop</a>.
-  langs:
-  - azurecli
+  description: A list of possible actions corresponding to a resource can be found at https://docs.microsoft.com/rest/api/. All POST requests are actions that can be invoked and are specified at the end of the URI path. For instance, to stop a VM, the request URI is https://management.azure.com/subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VM}/powerOff?api-version={APIVersion} and the corresponding action is `powerOff`. This can be found at https://docs.microsoft.com/rest/api/compute/virtualmachines/virtualmachines-stop.
+  syntax: >-
+    az resource invoke-action --action
+                              [--api-version]
+                              [--ids]
+                              [--latest-include-preview]
+                              [--name]
+                              [--namespace]
+                              [--parent]
+                              [--request-body]
+                              [--resource-group]
+                              [--resource-type]
+                              [--subscription]
   examples:
   - summary: Power-off a vm, specified by Id.
-    syntax:
-      content: >-
-        az resource invoke-action --action powerOff \
-          --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VMName}
+    syntax: >-
+      az resource invoke-action --action powerOff \
+        --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VMName}
   - summary: Capture information for a stopped vm.
-    syntax:
-      content: >-
-        az resource invoke-action --action capture \
-          --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
-            Microsoft.Compute/virtualMachines/{VMName} \
-          --request-body "{ \"vhdPrefix\": \"myPrefix\", \"destinationContainerName\": \
-            \"myContainer\", \"overwriteVhds\": true }"
+    syntax: >-
+      az resource invoke-action --action capture \
+        --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
+          Microsoft.Compute/virtualMachines/{VMName} \
+        --request-body "{ \"vhdPrefix\": \"myPrefix\", \"destinationContainerName\": \
+          \"myContainer\", \"overwriteVhds\": true }"
   - summary: Invoke an action on the resource. (autogenerated)
-    syntax:
-      content: az resource invoke-action --action capture --name MyResource --resource-group MyResourceGroup --resource-type Microsoft.web/sites
-  parameters:
+    syntax: az resource invoke-action --action capture --name MyResource --resource-group MyResourceGroup --resource-type Microsoft.web/sites
+  requiredParameters:
   - isRequired: true
     name: --action
     summary: The action that will be invoked on the specified resource.
     description: ''
-  - name: --request-body
-    summary: JSON encoded parameter arguments for the action that will be passed along in the post request body. Use @{file} to load from a file.
-    description: ''
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -174,8 +184,11 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --request-body
+    summary: JSON encoded parameter arguments for the action that will be passed along in the post request body. Use @{file} to load from a file.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -183,49 +196,46 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_list
   name: az resource list
   summary: List resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource list [--location]
+                     [--name]
+                     [--namespace]
+                     [--query-examples]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
+                     [--tag]
   examples:
   - summary: List all resources in the West US region.
-    syntax:
-      content: az resource list --location westus
+    syntax: az resource list --location westus
   - summary: List all resources with the name 'resourceName'.
-    syntax:
-      content: az resource list --name 'resourceName'
+    syntax: az resource list --name 'resourceName'
   - summary: List all resources with the tag 'test'.
-    syntax:
-      content: az resource list --tag test
+    syntax: az resource list --tag test
   - summary: List all resources with a tag that starts with 'test'.
-    syntax:
-      content: az resource list --tag 'test*'
+    syntax: az resource list --tag 'test*'
   - summary: List all resources with the tag 'test' that have the value 'example'.
-    syntax:
-      content: az resource list --tag test=example
-  parameters:
+    syntax: az resource list --tag test=example
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
-  - name: --tag
-    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -233,19 +243,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tag
+    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_move
   name: az resource move
   summary: Moves resources from one resource group to another(can be under different subscription).
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az resource move --destination-group
+                     --ids
+                     [--destination-subscription-id]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --destination-group
     summary: The destination resource group name.
@@ -254,51 +265,57 @@ items:
     name: --ids
     summary: The space-separated resource ids to be moved.
     description: ''
+  optionalParameters:
   - name: --destination-subscription-id
     summary: The destination subscription identifier.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_show
   name: az resource show
   summary: Get the details of a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource show [--api-version]
+                     [--ids]
+                     [--include-response-body {false, true}]
+                     [--latest-include-preview]
+                     [--name]
+                     [--namespace]
+                     [--parent]
+                     [--query-examples]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
   examples:
   - summary: Show a virtual machine resource named 'MyVm'.
-    syntax:
-      content: az resource show -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
+    syntax: az resource show -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
   - summary: Show a web app using a resource identifier.
-    syntax:
-      content: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
+    syntax: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
   - summary: Show a subnet.
-    syntax:
-      content: az resource show -g MyResourceGroup -n MySubnet --namespace Microsoft.Network --parent virtualnetworks/MyVnet --resource-type subnets
+    syntax: az resource show -g MyResourceGroup -n MySubnet --namespace Microsoft.Network --parent virtualnetworks/MyVnet --resource-type subnets
   - summary: Show a subnet using a resource identifier.
-    syntax:
-      content: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
+    syntax: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
   - summary: Show an application gateway path rule.
-    syntax:
-      content: az resource show -g MyResourceGroup --namespace Microsoft.Network --parent applicationGateways/ag1/urlPathMaps/map1 --resource-type pathRules -n rule1
-  parameters:
-  - name: --include-response-body
-    parameterValueGroup: false, true
-    summary: Use if the default command output doesn't capture all of the property data.
-    description: ''
+    syntax: az resource show -g MyResourceGroup --namespace Microsoft.Network --parent applicationGateways/ag1/urlPathMaps/map1 --resource-type pathRules -n rule1
+  - summary: Show a virtual machine resource named 'MyVm' by using the latest api-version whether this version is a preview version.
+    syntax: az resource show -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" --latest-include-preview
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --include-response-body
+    parameterValueGroup: false, true
+    summary: Use if the default command output doesn't capture all of the property data.
+    description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -308,8 +325,11 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -317,42 +337,50 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_tag
   name: az resource tag
   summary: Tag a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource tag --tags
+                    [--api-version]
+                    [--ids]
+                    [--is-incremental]
+                    [--latest-include-preview]
+                    [--name]
+                    [--namespace]
+                    [--parent]
+                    [--resource-group]
+                    [--resource-type]
+                    [--subscription]
   examples:
   - summary: Tag the virtual machine 'MyVm' with the key 'vmlist' and value 'vm1'.
-    syntax:
-      content: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
+    syntax: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
   - summary: Tag a web app with the key 'vmlist' and value 'vm1', using a resource identifier.
-    syntax:
-      content: az resource tag --tags vmlist=vm1 --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
+    syntax: az resource tag --tags vmlist=vm1 --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
   - summary: Tag the virtual machine 'MyVm' with the key 'vmlist' and value 'vm1' incrementally. It doesn't empty the existing tags.
-    syntax:
-      content: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" -i
-  parameters:
+    syntax: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" -i
+  - summary: Tag the virtual machine 'MyVm' with the key 'vmlist' and value 'vm1' by using the latest api-version whether this version is a preview version.
+    syntax: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" --latest-include-preview
+  requiredParameters:
   - isRequired: true
     name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --is-incremental -i
-    summary: The option to add tags incrementally without deleting the original tags. If the key of new tag and original tag are duplicated, the original value will be overwritten.
-    description: ''
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --is-incremental -i
+    summary: The option to add tags incrementally without deleting the original tags. If the key of new tag and original tag are duplicated, the original value will be overwritten.
+    description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -363,7 +391,7 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -371,33 +399,53 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_update
   name: az resource update
   summary: Update a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource update [--add]
+                       [--api-version]
+                       [--force-string]
+                       [--ids]
+                       [--include-response-body {false, true}]
+                       [--latest-include-preview]
+                       [--name]
+                       [--namespace]
+                       [--parent]
+                       [--remove]
+                       [--resource-group]
+                       [--resource-type]
+                       [--set]
+                       [--subscription]
   examples:
+  - summary: Update a webapp by using the latest api-version whether this version is a preview version.
+    syntax: az resource update --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp} --set tags.key=value --latest-include-preview
   - summary: Update a resource. (autogenerated)
-    syntax:
-      content: az resource update --ids $id --set properties.connectionType=Proxy
-  parameters:
-  - name: --include-response-body
-    parameterValueGroup: false, true
-    summary: Use if the default command output doesn't capture all of the property data.
+    syntax: az resource update --ids $id --set properties.connectionType=Proxy
+  - summary: Update a resource. (autogenerated)
+    syntax: az resource update --name myresource --resource-group myresourcegroup --resource-type subnets --set tags.key=value
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --include-response-body
+    parameterValueGroup: false, true
+    summary: Use if the default command output doesn't capture all of the property data.
+    description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -407,60 +455,77 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_wait
   name: az resource wait
   summary: Place the CLI in a waiting state until a condition of a resources is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource wait [--api-version]
+                     [--created]
+                     [--custom]
+                     [--deleted]
+                     [--exists]
+                     [--ids]
+                     [--include-response-body {false, true}]
+                     [--interval]
+                     [--name]
+                     [--namespace]
+                     [--parent]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
+                     [--timeout]
+                     [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a condition of a resources is met. (autogenerated)
-    syntax:
-      content: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
+    syntax: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
   - summary: Place the CLI in a waiting state until a condition of a resources is met. (autogenerated)
-    syntax:
-      content: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp} --include-response-body true
+    syntax: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp} --include-response-body true
   - summary: Place the CLI in a waiting state until a condition of a resources is met. (autogenerated)
-    syntax:
-      content: az resource wait --exists --name MyResource --resource-group MyResourceGroup --resource-type subnets
-  parameters:
-  - name: --include-response-body
-    parameterValueGroup: false, true
-    summary: Use if the default command output doesn't capture all of the property data.
-    description: ''
+    syntax: az resource wait --exists --name MyResource --resource-group MyResourceGroup --resource-type subnets
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
+    description: ''
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --include-response-body
+    parameterValueGroup: false, true
+    summary: Use if the default command output doesn't capture all of the property data.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -471,26 +536,13 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --timeout
     defaultValue: "3600"
@@ -499,79 +551,29 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_resource_create
-  name: az resource create
-  summary: Create a resource.
-- uid: az_resource_delete
-  name: az resource delete
-  summary: Delete a resource.
-- uid: az_resource_invoke_action
-  name: az resource invoke-action
-  summary: Invoke an action on the resource.
-- uid: az_resource_link
-  name: az resource link
-  summary: Manage links between resources.
-- uid: az_resource_link_create
-  name: az resource link create
-  summary: Create a new link between resources.
-- uid: az_resource_link_delete
-  name: az resource link delete
-  summary: Delete a link between resources.
-- uid: az_resource_link_list
-  name: az resource link list
-  summary: List resource links.
-- uid: az_resource_link_show
-  name: az resource link show
-  summary: Gets a resource link with the specified ID.
-- uid: az_resource_link_update
-  name: az resource link update
-  summary: Update link between resources.
-- uid: az_resource_list
-  name: az resource list
-  summary: List resources.
-- uid: az_resource_lock
-  name: az resource lock
-  summary: Manage Azure resource level locks.
-- uid: az_resource_lock_create
-  name: az resource lock create
-  summary: Create a resource-level lock.
-- uid: az_resource_lock_delete
-  name: az resource lock delete
-  summary: Delete a resource-level lock.
-- uid: az_resource_lock_list
-  name: az resource lock list
-  summary: List lock information in the resource-level.
-- uid: az_resource_lock_show
-  name: az resource lock show
-  summary: Show the details of a resource-level lock.
-- uid: az_resource_lock_update
-  name: az resource lock update
-  summary: Update a resource-level lock.
-- uid: az_resource_move
-  name: az resource move
-  summary: Moves resources from one resource group to another(can be under different subscription).
-- uid: az_resource_show
-  name: az resource show
-  summary: Get the details of a resource.
-- uid: az_resource_tag
-  name: az resource tag
-  summary: Tag a resource.
-- uid: az_resource_update
-  name: az resource update
-  summary: Update a resource.
-- uid: az_resource_wait
-  name: az resource wait
-  summary: Place the CLI in a waiting state until a condition of a resources is met.
+- az_resource_create
+- az_resource_delete
+- az_resource_invoke-action
+- az_resource_link
+- az_resource_link_create
+- az_resource_link_delete
+- az_resource_link_list
+- az_resource_link_show
+- az_resource_link_update
+- az_resource_list
+- az_resource_lock
+- az_resource_lock_create
+- az_resource_lock_delete
+- az_resource_lock_list
+- az_resource_lock_show
+- az_resource_lock_update
+- az_resource_move
+- az_resource_show
+- az_resource_tag
+- az_resource_update
+- az_resource_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -587,10 +589,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/resource/link.yml b/2017-03-09-profile/docs-ref-autogen/resource/link.yml
index 9a391d9c5f..bff6bfd9e6 100644
--- a/2017-03-09-profile/docs-ref-autogen/resource/link.yml
+++ b/2017-03-09-profile/docs-ref-autogen/resource/link.yml
@@ -1,28 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_resource_link
-  name: az resource link
-  summary: Manage links between resources.
-  description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
-  langs:
-  - azurecli
-  children:
-  - az_resource_link_create
-  - az_resource_link_delete
-  - az_resource_link_list
-  - az_resource_link_show
-  - az_resource_link_update
+### YamlMime:AzureCLIGroup
+uid: az_resource_link
+name: az resource link
+summary: Manage links between resources.
+description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
+directCommands:
 - uid: az_resource_link_create
   name: az resource link create
   summary: Create a new link between resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link create --link
+                            --target
+                            [--notes]
+                            [--subscription]
   examples:
   - summary: Create a link from {SourceID} to {ResourceID} with notes
-    syntax:
-      content: az resource link create --link {SourceID} --target {ResourceID} --notes "SourceID depends on ResourceID"
-  parameters:
+    syntax: az resource link create --link {SourceID} --target {ResourceID} --notes "SourceID depends on ResourceID"
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
@@ -31,137 +25,117 @@ items:
     name: --target
     summary: Fully-qualified resource ID of the resource link target.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes for the link.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_delete
   name: az resource link delete
   summary: Delete a link between resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link delete --link
+                            [--subscription]
   examples:
   - summary: Delete link {LinkID}
-    syntax:
-      content: az resource link delete --link {LinkID}
-  parameters:
+    syntax: az resource link delete --link {LinkID}
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
     description: 'Format: /subscriptions/{SubID}/resourceGroups/{ResourceGroupID}/providers/{ProviderNamespace}/{ResourceType}/{ResourceName}/providers/Microsoft.Resources/links/{LinkName}.'
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_list
   name: az resource link list
   summary: List resource links.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link list [--filter]
+                          [--query-examples]
+                          [--scope]
+                          [--subscription]
   examples:
   - summary: List links, filtering with {filter-string}
-    syntax:
-      content: az resource link list --filter {filter-string}
+    syntax: az resource link list --filter {filter-string}
   - summary: List all links for resource group {ResourceGroup} in subscription {SubID}
-    syntax:
-      content: az resource link list --scope /subscriptions/{SubID}/resourceGroups/{ResourceGroup}
-  parameters:
+    syntax: az resource link list --scope /subscriptions/{SubID}/resourceGroups/{ResourceGroup}
+  optionalParameters:
   - name: --filter
     summary: Filter string for limiting results.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     summary: Fully-qualified scope for retrieving links.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_show
   name: az resource link show
   summary: Gets a resource link with the specified ID.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az resource link show --link
+                          [--query-examples]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_update
   name: az resource link update
   summary: Update link between resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link update --link
+                            [--notes]
+                            [--subscription]
+                            [--target]
   examples:
   - summary: Update the notes for {LinkID} notes "some notes to explain this link"
-    syntax:
-      content: az resource link update --link {LinkID} --notes "some notes to explain this link"
-  parameters:
+    syntax: az resource link update --link {LinkID} --notes "some notes to explain this link"
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
     description: 'Format: /subscriptions/{SubID}/resourceGroups/{ResourceGroupID}/providers/{ProviderNamespace}/{ResourceType}/{ResourceName}/providers/Microsoft.Resources/links/{LinkName}.'
+  optionalParameters:
   - name: --notes
     summary: Notes for the link.
     description: ''
-  - name: --target
-    summary: Fully-qualified resource ID of the resource link target.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --target
+    summary: Fully-qualified resource ID of the resource link target.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_resource_link_create
-  name: az resource link create
-  summary: Create a new link between resources.
-- uid: az_resource_link_delete
-  name: az resource link delete
-  summary: Delete a link between resources.
-- uid: az_resource_link_list
-  name: az resource link list
-  summary: List resource links.
-- uid: az_resource_link_show
-  name: az resource link show
-  summary: Gets a resource link with the specified ID.
-- uid: az_resource_link_update
-  name: az resource link update
-  summary: Update link between resources.
+- az_resource_link_create
+- az_resource_link_delete
+- az_resource_link_list
+- az_resource_link_show
+- az_resource_link_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -177,10 +151,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
diff --git a/2017-03-09-profile/docs-ref-autogen/resource/lock.yml b/2017-03-09-profile/docs-ref-autogen/resource/lock.yml
index 592b464af0..c5b0aabcbf 100644
--- a/2017-03-09-profile/docs-ref-autogen/resource/lock.yml
+++ b/2017-03-09-profile/docs-ref-autogen/resource/lock.yml
@@ -1,31 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_resource_lock
-  name: az resource lock
-  summary: Manage Azure resource level locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_resource_lock_create
-  - az_resource_lock_delete
-  - az_resource_lock_list
-  - az_resource_lock_show
-  - az_resource_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_resource_lock
+name: az resource lock
+summary: Manage Azure resource level locks.
+description: ''
+directCommands:
 - uid: az_resource_lock_create
   name: az resource lock create
   summary: Create a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock create --lock-type {CanNotDelete, ReadOnly}
+                            --name
+                            [--namespace]
+                            [--notes]
+                            [--parent]
+                            [--resource]
+                            [--resource-group]
+                            [--resource-type]
+                            [--subscription]
   examples:
   - summary: Create a read-only resource level lock on a vnet.
-    syntax:
-      content: az resource lock create --lock-type ReadOnly -n lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+    syntax: az resource lock create --lock-type ReadOnly -n lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
   - summary: Create a read-only resource level lock on a vnet using a vnet id.
-    syntax:
-      content: az resource lock create --lock-type ReadOnly -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VNETName}
-  parameters:
+    syntax: az resource lock create --lock-type ReadOnly -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VNETName}
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -35,59 +33,56 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --notes
-    summary: Notes about this lock.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
+  optionalParameters:
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
+  - name: --notes
+    summary: Notes about this lock.
+    description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_delete
   name: az resource lock delete
   summary: Delete a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock delete [--ids]
+                            [--name]
+                            [--namespace]
+                            [--parent]
+                            [--resource]
+                            [--resource-group]
+                            [--resource-type]
+                            [--subscription]
   examples:
   - summary: Delete a resource level lock
-    syntax:
-      content: az resource lock delete --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+    syntax: az resource lock delete --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
   - summary: Delete a resource level lock on a vnet using a vnet id.
-    syntax:
-      content: az resource lock delete -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VMName}
+    syntax: az resource lock delete -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VMName}
   - summary: Delete a resource-level lock. (autogenerated)
-    syntax:
-      content: az resource lock delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
-  parameters:
+    syntax: az resource lock delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
@@ -97,108 +92,125 @@ items:
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_list
   name: az resource lock list
   summary: List lock information in the resource-level.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock list [--filter-string]
+                          [--namespace]
+                          [--parent]
+                          [--query-examples]
+                          [--resource]
+                          [--resource-group]
+                          [--resource-type]
+                          [--subscription]
   examples:
   - summary: List out all locks on a vnet
-    syntax:
-      content: az resource lock list -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
-  parameters:
+    syntax: az resource lock list -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_show
   name: az resource lock show
   summary: Show the details of a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock show [--ids]
+                          [--name]
+                          [--namespace]
+                          [--parent]
+                          [--query-examples]
+                          [--resource]
+                          [--resource-group]
+                          [--resource-type]
+                          [--subscription]
   examples:
   - summary: Show a resource level lock
-    syntax:
-      content: az resource lock show -n lockname -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
-  parameters:
+    syntax: az resource lock show -n lockname -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_update
   name: az resource lock update
   summary: Update a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock update [--ids]
+                            [--lock-type {CanNotDelete, ReadOnly}]
+                            [--name]
+                            [--namespace]
+                            [--notes]
+                            [--parent]
+                            [--resource]
+                            [--resource-group]
+                            [--resource-type]
+                            [--subscription]
   examples:
   - summary: Update a resource level lock with new notes and type
-    syntax:
-      content: az resource lock update --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az resource lock update --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks --notes newNotesHere --lock-type CanNotDelete
+  - summary: Update a resource-level lock. (autogenerated)
+    syntax: az resource lock update --lock-type CanNotDelete --name lockName --namespace Microsoft.Network --resource-group MyResourceGroup --resource-name myvnet --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -209,49 +221,34 @@ items:
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --notes
-    summary: Notes about this lock.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
+  - name: --notes
+    summary: Notes about this lock.
+    description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_resource_lock_create
-  name: az resource lock create
-  summary: Create a resource-level lock.
-- uid: az_resource_lock_delete
-  name: az resource lock delete
-  summary: Delete a resource-level lock.
-- uid: az_resource_lock_list
-  name: az resource lock list
-  summary: List lock information in the resource-level.
-- uid: az_resource_lock_show
-  name: az resource lock show
-  summary: Show the details of a resource-level lock.
-- uid: az_resource_lock_update
-  name: az resource lock update
-  summary: Update a resource-level lock.
+- az_resource_lock_create
+- az_resource_lock_delete
+- az_resource_lock_list
+- az_resource_lock_show
+- az_resource_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -267,10 +264,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure resource level locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure resource level locks.
diff --git a/2017-03-09-profile/docs-ref-autogen/role.yml b/2017-03-09-profile/docs-ref-autogen/role.yml
index ef303df531..ec64993703 100644
--- a/2017-03-09-profile/docs-ref-autogen/role.yml
+++ b/2017-03-09-profile/docs-ref-autogen/role.yml
@@ -1,43 +1,19 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_role
-  name: az role
-  summary: Manage user roles for access control with Azure Active Directory and service principals.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_role
+name: az role
+summary: Manage user roles for access control with Azure Active Directory and service principals.
+description: ''
 commands:
-- uid: az_role_assignment
-  name: az role assignment
-  summary: Manage role assignments.
-- uid: az_role_assignment_create
-  name: az role assignment create
-  summary: Create a new role assignment for a user, group, or service principal.
-- uid: az_role_assignment_delete
-  name: az role assignment delete
-  summary: Delete role assignments.
-- uid: az_role_assignment_list
-  name: az role assignment list
-  summary: List role assignments.
-- uid: az_role_assignment_list_changelogs
-  name: az role assignment list-changelogs
-  summary: List changelogs for role assignments.
-- uid: az_role_definition
-  name: az role definition
-  summary: Manage role definitions.
-- uid: az_role_definition_create
-  name: az role definition create
-  summary: Create a custom role definition.
-- uid: az_role_definition_delete
-  name: az role definition delete
-  summary: Delete a role definition.
-- uid: az_role_definition_list
-  name: az role definition list
-  summary: List role definitions.
-- uid: az_role_definition_update
-  name: az role definition update
-  summary: Update a role definition.
+- az_role_assignment
+- az_role_assignment_create
+- az_role_assignment_delete
+- az_role_assignment_list
+- az_role_assignment_list-changelogs
+- az_role_definition
+- az_role_definition_create
+- az_role_definition_delete
+- az_role_definition_list
+- az_role_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -53,10 +29,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage user roles for access control with Azure Active Directory and service principals.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage user roles for access control with Azure Active Directory and service principals.
diff --git a/2017-03-09-profile/docs-ref-autogen/role/assignment.yml b/2017-03-09-profile/docs-ref-autogen/role/assignment.yml
index dbb77a39c6..3809ee615f 100644
--- a/2017-03-09-profile/docs-ref-autogen/role/assignment.yml
+++ b/2017-03-09-profile/docs-ref-autogen/role/assignment.yml
@@ -1,42 +1,36 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_role_assignment
-  name: az role assignment
-  summary: Manage role assignments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_role_assignment_create
-  - az_role_assignment_delete
-  - az_role_assignment_list
-  - az_role_assignment_list_changelogs
+### YamlMime:AzureCLIGroup
+uid: az_role_assignment
+name: az role assignment
+summary: Manage role assignments.
+description: ''
+directCommands:
 - uid: az_role_assignment_create
   name: az role assignment create
   summary: Create a new role assignment for a user, group, or service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role assignment create --role
+                              [--assignee]
+                              [--assignee-object-id]
+                              [--resource-group]
+                              [--scope]
+                              [--subscription]
   examples:
   - summary: Create role assignment for an assignee.
-    syntax:
-      content: az role assignment create --assignee sp_name --role a_role
+    syntax: az role assignment create --assignee sp_name --role a_role
   - summary: Create a new role assignment for a user, group, or service principal. (autogenerated)
-    syntax:
-      content: az role assignment create --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role" --scope $id
-  parameters:
+    syntax: az role assignment create --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role" --scope $id
+  requiredParameters:
   - isRequired: true
     name: --role
     summary: Role name or id.
     description: ''
+  optionalParameters:
   - name: --assignee
     summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
     description: ''
   - name: --assignee-object-id
-    summary: Use this parameter instead of '--assignee' to bypass graph permission issues. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
-    description: ''
-  - name: --assignee-principal-type
-    summary: ''
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
     description: ''
   - name: --resource-group -g
     summary: Use it only if the role or assignment was added at the level of a resource group.
@@ -47,23 +41,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_assignment_delete
   name: az role assignment delete
   summary: Delete role assignments.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role assignment delete [--assignee]
+                              [--ids]
+                              [--include-inherited]
+                              [--resource-group]
+                              [--role]
+                              [--scope]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Delete role assignments. (autogenerated)
-    syntax:
-      content: az role assignment delete --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role"
-  parameters:
+    syntax: az role assignment delete --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role"
+  optionalParameters:
   - name: --assignee
     summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
     description: ''
@@ -82,25 +77,29 @@ items:
   - name: --scope
     summary: Scope at which the role assignment or definition applies to, e.g., /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333, /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup, or /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM.
     description: ''
-  - name: --yes -y
-    summary: Continue to delete all assignments under the subscription.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Continue to delete all assignments under the subscription.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_assignment_list
   name: az role assignment list
   summary: List role assignments.
   description: By default, only assignments scoped to subscription will be displayed. To view assignments scoped by resource or group, use `--all`.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az role assignment list [--all]
+                            [--assignee]
+                            [--include-classic-administrators {false, true}]
+                            [--include-groups]
+                            [--include-inherited]
+                            [--query-examples]
+                            [--resource-group]
+                            [--role]
+                            [--scope]
+                            [--subscription]
+  optionalParameters:
   - name: --all
     summary: Show all assignments under the current subscription.
     description: ''
@@ -117,6 +116,9 @@ items:
   - name: --include-inherited
     summary: Include assignments applied on parent scopes.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: Use it only if the role or assignment was added at the level of a resource group.
     description: ''
@@ -129,19 +131,16 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_role_assignment_list_changelogs
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_role_assignment_list-changelogs
   name: az role assignment list-changelogs
   summary: List changelogs for role assignments.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az role assignment list-changelogs [--end-time]
+                                       [--start-time]
+                                       [--subscription]
+  optionalParameters:
   - name: --end-time
     summary: The end time of the query in the format of %Y-%m-%dT%H:%M:%SZ, e.g. 2000-12-31T12:59:59Z. Defaults to the current time.
     description: ''
@@ -151,25 +150,12 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_role_assignment_create
-  name: az role assignment create
-  summary: Create a new role assignment for a user, group, or service principal.
-- uid: az_role_assignment_delete
-  name: az role assignment delete
-  summary: Delete role assignments.
-- uid: az_role_assignment_list
-  name: az role assignment list
-  summary: List role assignments.
-- uid: az_role_assignment_list_changelogs
-  name: az role assignment list-changelogs
-  summary: List changelogs for role assignments.
+- az_role_assignment_create
+- az_role_assignment_delete
+- az_role_assignment_list
+- az_role_assignment_list-changelogs
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -185,10 +171,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage role assignments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage role assignments.
diff --git a/2017-03-09-profile/docs-ref-autogen/role/definition.yml b/2017-03-09-profile/docs-ref-autogen/role/definition.yml
index 2c8e0833d9..54da24f2b3 100644
--- a/2017-03-09-profile/docs-ref-autogen/role/definition.yml
+++ b/2017-03-09-profile/docs-ref-autogen/role/definition.yml
@@ -1,81 +1,73 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_role_definition
-  name: az role definition
-  summary: Manage role definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_role_definition_create
-  - az_role_definition_delete
-  - az_role_definition_list
-  - az_role_definition_update
+### YamlMime:AzureCLIGroup
+uid: az_role_definition
+name: az role definition
+summary: Manage role definitions.
+description: ''
+directCommands:
 - uid: az_role_definition_create
   name: az role definition create
   summary: Create a custom role definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role definition create --role-definition
+                              [--subscription]
   examples:
-  - summary: Create a role with read-only access to storage and network resources, and the ability to start or restart VMs.
-    syntax:
-      content: >-
-        az role definition create --role-definition '{ \
-            "Name": "Contoso On-call", \
-            "Description": "Perform VM actions and read storage and network information.", \
-            "Actions": [ \
-                "Microsoft.Compute/*/read", \
-                    "Microsoft.Compute/virtualMachines/start/action", \
-                    "Microsoft.Compute/virtualMachines/restart/action", \
-                    "Microsoft.Network/*/read", \
-                "Microsoft.Storage/*/read", \
-                    "Microsoft.Authorization/*/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/resources/read", \
-                "Microsoft.Insights/alertRules/*", \
-                    "Microsoft.Support/*" \
-            ], \
-            "DataActions": [ \
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*" \
-            ], \
-            "NotDataActions": [ \
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write" \
-            ], \
-            "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"] \
-        }'
+  - summary: Create a role with read-only access to storage and network resources, and the ability to start or restart VMs. (Bash)
+    syntax: >-
+      az role definition create --role-definition '{
+          "Name": "Contoso On-call",
+          "Description": "Perform VM actions and read storage and network information.",
+          "Actions": [
+              "Microsoft.Compute/*/read",
+                  "Microsoft.Compute/virtualMachines/start/action",
+                  "Microsoft.Compute/virtualMachines/restart/action",
+                  "Microsoft.Network/*/read",
+              "Microsoft.Storage/*/read",
+                  "Microsoft.Authorization/*/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/resources/read",
+              "Microsoft.Insights/alertRules/*",
+                  "Microsoft.Support/*"
+          ],
+          "DataActions": [
+              "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*"
+          ],
+          "NotDataActions": [
+              "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write"
+          ],
+          "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]
+      }'
   - summary: Create a role from a file containing a JSON description.
-    syntax:
-      content: az role definition create --role-definition @ad-role.json
-  parameters:
+    syntax: az role definition create --role-definition @ad-role.json
+  requiredParameters:
   - isRequired: true
     name: --role-definition
     summary: Description of a role as JSON, or a path to a file containing a JSON description.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_definition_delete
   name: az role definition delete
   summary: Delete a role definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role definition delete --name
+                              [--custom-role-only {false, true}]
+                              [--resource-group]
+                              [--scope]
+                              [--subscription]
   examples:
   - summary: Delete a role definition. (autogenerated)
-    syntax:
-      content: az role definition delete --name MyRole
-  parameters:
+    syntax: az role definition delete --name MyRole
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The role's name.
     description: ''
+  optionalParameters:
   - name: --custom-role-only
     parameterValueGroup: false, true
     summary: Custom roles only(vs. build-in ones).
@@ -89,19 +81,19 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_definition_list
   name: az role definition list
   summary: List role definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az role definition list [--custom-role-only {false, true}]
+                            [--name]
+                            [--query-examples]
+                            [--resource-group]
+                            [--scope]
+                            [--subscription]
+  optionalParameters:
   - name: --custom-role-only
     parameterValueGroup: false, true
     summary: Custom roles only(vs. build-in ones).
@@ -109,6 +101,9 @@ items:
   - name: --name -n
     summary: The role's name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: Use it only if the role or assignment was added at the level of a resource group.
     description: ''
@@ -118,74 +113,57 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_definition_update
   name: az role definition update
   summary: Update a role definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role definition update --role-definition
+                              [--subscription]
   examples:
-  - summary: Update a role using the output of "az role definition list"
-    syntax:
-      content: >-
-        az role definition update --role-definition '{ \
-            "roleName": "Contoso On-call", \
-            "Description": "Perform VM actions and read storage and network information.", \
-            "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/providers/Microsoft.Authorization/roleDefinitions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", \
-            "roleType": "CustomRole", \
-            "type": "Microsoft.Authorization/roleDefinitions", \
-            "Actions": [ \
-                "Microsoft.Compute/*/read", \
-                    "Microsoft.Compute/virtualMachines/start/action", \
-                    "Microsoft.Compute/virtualMachines/restart/action", \
-                    "Microsoft.Network/*/read", \
-                "Microsoft.Storage/*/read", \
-                    "Microsoft.Authorization/*/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/resources/read", \
-                "Microsoft.Support/*" \
-                ], \
-                "DataActions": [ \
-                    "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*" \
-            ], \
-            "NotDataActions": [ \
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write" \
-            ], \
-            "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"] \
-        }'
-  parameters:
+  - summary: Update a role using the output of "az role definition list". (Bash)
+    syntax: >-
+      az role definition update --role-definition '{
+          "roleName": "Contoso On-call",
+          "Description": "Perform VM actions and read storage and network information.",
+          "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/providers/Microsoft.Authorization/roleDefinitions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+          "roleType": "CustomRole",
+          "type": "Microsoft.Authorization/roleDefinitions",
+          "Actions": [
+              "Microsoft.Compute/*/read",
+                  "Microsoft.Compute/virtualMachines/start/action",
+                  "Microsoft.Compute/virtualMachines/restart/action",
+                  "Microsoft.Network/*/read",
+              "Microsoft.Storage/*/read",
+                  "Microsoft.Authorization/*/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/resources/read",
+              "Microsoft.Support/*"
+              ],
+              "DataActions": [
+                  "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*"
+          ],
+          "NotDataActions": [
+              "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write"
+          ],
+          "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]
+      }'
+  requiredParameters:
   - isRequired: true
     name: --role-definition
     summary: Description of an existing role as JSON, or a path to a file containing a JSON description.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_role_definition_create
-  name: az role definition create
-  summary: Create a custom role definition.
-- uid: az_role_definition_delete
-  name: az role definition delete
-  summary: Delete a role definition.
-- uid: az_role_definition_list
-  name: az role definition list
-  summary: List role definitions.
-- uid: az_role_definition_update
-  name: az role definition update
-  summary: Update a role definition.
+- az_role_definition_create
+- az_role_definition_delete
+- az_role_definition_list
+- az_role_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -201,10 +179,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage role definitions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage role definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/sapmonitor.yml b/2017-03-09-profile/docs-ref-autogen/sapmonitor.yml
new file mode 100644
index 0000000000..a31f3acb4e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sapmonitor.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_sapmonitor
+name: az sapmonitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sap-hana** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az sapmonitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage Azure SAP Monitor.
+description: ''
+directCommands:
+- uid: az_sapmonitor_create
+  name: az sapmonitor create
+  summary: Create a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor create --hana-subnet
+                         --monitor-name
+                         --region
+                         --resource-group
+                         [--dca]
+                         [--lawsid]
+                         [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --hana-subnet --hdbsn
+    summary: ARM ID of an Azure Subnet with access to the HANA instance.
+    description: ''
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --region
+    summary: The region to create this SAP monitor on.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dca --disable_customer_analytics
+    summary: Disable sending analytics to Microsoft.
+    description: ''
+  - name: --lawsid --log-analytics-workspace-arm-id
+    summary: Existing log analytics workspace id to use for log monitoring.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_sapmonitor_delete
+  name: az sapmonitor delete
+  summary: Delete a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor delete --monitor-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_list
+  name: az sapmonitor list
+  summary: List SAP Monitors.
+  description: ''
+  syntax: az sapmonitor list
+- uid: az_sapmonitor_show
+  name: az sapmonitor show
+  summary: Get the details of a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor show --monitor-name
+                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_update
+  name: az sapmonitor update
+  summary: Updates the tags field of a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor update --monitor-name
+                         --resource-group
+                         [--add]
+                         [--force-string]
+                         [--no-wait]
+                         [--remove]
+                         [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_sapmonitor_create
+- az_sapmonitor_delete
+- az_sapmonitor_list
+- az_sapmonitor_provider-instance
+- az_sapmonitor_provider-instance_create
+- az_sapmonitor_provider-instance_delete
+- az_sapmonitor_provider-instance_list
+- az_sapmonitor_provider-instance_show
+- az_sapmonitor_show
+- az_sapmonitor_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage Azure SAP Monitor.
diff --git a/2017-03-09-profile/docs-ref-autogen/sapmonitor/provider-instance.yml b/2017-03-09-profile/docs-ref-autogen/sapmonitor/provider-instance.yml
new file mode 100644
index 0000000000..9c9ca6d472
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sapmonitor/provider-instance.yml
@@ -0,0 +1,126 @@
+### YamlMime:AzureCLIGroup
+uid: az_sapmonitor_provider-instance
+name: az sapmonitor provider-instance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sap-hana** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az sapmonitor provider-instance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the provider instance for the SAP Monitor.
+description: ''
+directCommands:
+- uid: az_sapmonitor_provider-instance_create
+  name: az sapmonitor provider-instance create
+  summary: Create a new provider instance for the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance create --monitor-name
+                                           --provider-instance-name
+                                           --provider-instance-properties
+                                           --provider-instance-type
+                                           --resource-group
+                                           [--provider-instance-metadata]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-name
+    summary: The name of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-properties
+    summary: The properties of the provider instance (Should be of JSON format).
+    description: ''
+  - isRequired: true
+    name: --provider-instance-type
+    summary: The type of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --provider-instance-metadata
+    summary: The metadata of the provider instance (Should be of JSON format).
+    description: ''
+- uid: az_sapmonitor_provider-instance_delete
+  name: az sapmonitor provider-instance delete
+  summary: Delete a provider instance from the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance delete --monitor-name
+                                           --provider-instance-name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-name
+    summary: The name of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_provider-instance_list
+  name: az sapmonitor provider-instance list
+  summary: List provider instances for the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance list --monitor-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_provider-instance_show
+  name: az sapmonitor provider-instance show
+  summary: Get the details of a provider instance for the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance show --monitor-name
+                                         --provider-instance-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-name
+    summary: The name of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_sapmonitor_provider-instance_create
+- az_sapmonitor_provider-instance_delete
+- az_sapmonitor_provider-instance_list
+- az_sapmonitor_provider-instance_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the provider instance for the SAP Monitor.
diff --git a/2017-03-09-profile/docs-ref-autogen/security.yml b/2017-03-09-profile/docs-ref-autogen/security.yml
index d7f30feb27..d505c0f489 100644
--- a/2017-03-09-profile/docs-ref-autogen/security.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security.yml
@@ -1,154 +1,125 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security
-  name: az security
-  summary: Manage your security posture with Azure Security Center.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_security
+name: az security
+summary: Manage your security posture with Azure Security Center.
+description: ''
 commands:
-- uid: az_security_alert
-  name: az security alert
-  summary: View security alerts.
-- uid: az_security_alert_list
-  name: az security alert list
-  summary: List security alerts.
-- uid: az_security_alert_show
-  name: az security alert show
-  summary: Shows a security alert.
-- uid: az_security_alert_update
-  name: az security alert update
-  summary: Updates a security alert status.
-- uid: az_security_atp
-  name: az security atp
-  summary: View and manage Advanced Threat Protection settings.
-- uid: az_security_atp_storage
-  name: az security atp storage
-  summary: View and manage Advanced Threat Protection settings for storage accounts.
-- uid: az_security_atp_storage_show
-  name: az security atp storage show
-  summary: Display Advanced Threat Protection settings for a storage account.
-- uid: az_security_atp_storage_update
-  name: az security atp storage update
-  summary: Toggle status of Advanced Threat Protection for a storage account.
-- uid: az_security_auto_provisioning_setting
-  name: az security auto-provisioning-setting
-  summary: View your auto provisioning settings.
-- uid: az_security_auto_provisioning_setting_list
-  name: az security auto-provisioning-setting list
-  summary: List the auto provisioning settings.
-- uid: az_security_auto_provisioning_setting_show
-  name: az security auto-provisioning-setting show
-  summary: Shows an auto provisioning setting.
-- uid: az_security_auto_provisioning_setting_update
-  name: az security auto-provisioning-setting update
-  summary: Updates your automatic provisioning settings on the subscription.
-- uid: az_security_contact
-  name: az security contact
-  summary: View your security contacts.
-- uid: az_security_contact_create
-  name: az security contact create
-  summary: Creates a security contact.
-- uid: az_security_contact_delete
-  name: az security contact delete
-  summary: Deletes a security contact.
-- uid: az_security_contact_list
-  name: az security contact list
-  summary: List security contact.
-- uid: az_security_contact_show
-  name: az security contact show
-  summary: Shows a security contact.
-- uid: az_security_discovered_security_solution
-  name: az security discovered-security-solution
-  summary: View your discovered security solutions.
-- uid: az_security_discovered_security_solution_list
-  name: az security discovered-security-solution list
-  summary: List the discovered security solutions.
-- uid: az_security_discovered_security_solution_show
-  name: az security discovered-security-solution show
-  summary: Shows a discovered security solution.
-- uid: az_security_external_security_solution
-  name: az security external-security-solution
-  summary: View your external security solutions.
-- uid: az_security_external_security_solution_list
-  name: az security external-security-solution list
-  summary: List the external security solutions.
-- uid: az_security_external_security_solution_show
-  name: az security external-security-solution show
-  summary: Shows an external security solution.
-- uid: az_security_jit_policy
-  name: az security jit-policy
-  summary: Manage your Just in Time network access policies.
-- uid: az_security_jit_policy_list
-  name: az security jit-policy list
-  summary: List your Just in Time network access policies.
-- uid: az_security_jit_policy_show
-  name: az security jit-policy show
-  summary: Shows a Just in Time network access policy.
-- uid: az_security_location
-  name: az security location
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_location_list
-  name: az security location list
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_location_show
-  name: az security location show
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_pricing
-  name: az security pricing
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_create
-  name: az security pricing create
-  summary: Updates the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_list
-  name: az security pricing list
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_show
-  name: az security pricing show
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_setting
-  name: az security setting
-  summary: View your security settings.
-- uid: az_security_setting_list
-  name: az security setting list
-  summary: List security settings.
-- uid: az_security_setting_show
-  name: az security setting show
-  summary: Shows a security setting.
-- uid: az_security_task
-  name: az security task
-  summary: View security tasks (recommendations).
-- uid: az_security_task_list
-  name: az security task list
-  summary: List security tasks (recommendations).
-- uid: az_security_task_show
-  name: az security task show
-  summary: Shows a security task (recommendation).
-- uid: az_security_topology
-  name: az security topology
-  summary: Shows the network topology in your subscription.
-- uid: az_security_topology_list
-  name: az security topology list
-  summary: Shows the network topology in your subscription.
-- uid: az_security_topology_show
-  name: az security topology show
-  summary: Shows the network topology in your subscription.
-- uid: az_security_workspace_setting
-  name: az security workspace-setting
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_create
-  name: az security workspace-setting create
-  summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_delete
-  name: az security workspace-setting delete
-  summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace.
-- uid: az_security_workspace_setting_list
-  name: az security workspace-setting list
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_show
-  name: az security workspace-setting show
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+- az_security_adaptive_network_hardenings
+- az_security_adaptive_network_hardenings_list
+- az_security_adaptive_network_hardenings_show
+- az_security_adaptive-application-controls
+- az_security_adaptive-application-controls_list
+- az_security_adaptive-application-controls_show
+- az_security_alert
+- az_security_alert_list
+- az_security_alert_show
+- az_security_alert_update
+- az_security_allowed_connections
+- az_security_allowed_connections_list
+- az_security_allowed_connections_show
+- az_security_assessment
+- az_security_assessment_create
+- az_security_assessment_delete
+- az_security_assessment_list
+- az_security_assessment_show
+- az_security_assessment-metadata
+- az_security_assessment-metadata_create
+- az_security_assessment-metadata_delete
+- az_security_assessment-metadata_list
+- az_security_assessment-metadata_show
+- az_security_atp
+- az_security_atp_storage
+- az_security_atp_storage_show
+- az_security_atp_storage_update
+- az_security_auto-provisioning-setting
+- az_security_auto-provisioning-setting_list
+- az_security_auto-provisioning-setting_show
+- az_security_auto-provisioning-setting_update
+- az_security_contact
+- az_security_contact_create
+- az_security_contact_delete
+- az_security_contact_list
+- az_security_contact_show
+- az_security_discovered-security-solution
+- az_security_discovered-security-solution_list
+- az_security_discovered-security-solution_show
+- az_security_external-security-solution
+- az_security_external-security-solution_list
+- az_security_external-security-solution_show
+- az_security_iot-alerts
+- az_security_iot-alerts_delete
+- az_security_iot-alerts_list
+- az_security_iot-alerts_show
+- az_security_iot-analytics
+- az_security_iot-analytics_list
+- az_security_iot-analytics_show
+- az_security_iot-recommendations
+- az_security_iot-recommendations_list
+- az_security_iot-recommendations_show
+- az_security_iot-solution
+- az_security_iot-solution_create
+- az_security_iot-solution_delete
+- az_security_iot-solution_list
+- az_security_iot-solution_show
+- az_security_iot-solution_update
+- az_security_jit-policy
+- az_security_jit-policy_list
+- az_security_jit-policy_show
+- az_security_location
+- az_security_location_list
+- az_security_location_show
+- az_security_pricing
+- az_security_pricing_create
+- az_security_pricing_list
+- az_security_pricing_show
+- az_security_regulatory-compliance-assessments
+- az_security_regulatory-compliance-assessments_list
+- az_security_regulatory-compliance-assessments_show
+- az_security_regulatory-compliance-controls
+- az_security_regulatory-compliance-controls_list
+- az_security_regulatory-compliance-controls_show
+- az_security_regulatory-compliance-standards
+- az_security_regulatory-compliance-standards_list
+- az_security_regulatory-compliance-standards_show
+- az_security_secure-score-control-definitions
+- az_security_secure-score-control-definitions_list
+- az_security_secure-score-controls
+- az_security_secure-score-controls_list
+- az_security_secure-score-controls_list_by_score
+- az_security_secure-scores
+- az_security_secure-scores_list
+- az_security_secure-scores_show
+- az_security_setting
+- az_security_setting_list
+- az_security_setting_show
+- az_security_sub-assessment
+- az_security_sub-assessment_list
+- az_security_sub-assessment_show
+- az_security_task
+- az_security_task_list
+- az_security_task_show
+- az_security_topology
+- az_security_topology_list
+- az_security_topology_show
+- az_security_va
+- az_security_va_sql
+- az_security_va_sql_baseline
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+- az_security_va_sql_results
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+- az_security_va_sql_scans
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+- az_security_workspace-setting
+- az_security_workspace-setting_create
+- az_security_workspace-setting_delete
+- az_security_workspace-setting_list
+- az_security_workspace-setting_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -164,10 +135,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Manage your security posture with Azure Security Center.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Manage your security posture with Azure Security Center.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/adaptive-application-controls.yml b/2017-03-09-profile/docs-ref-autogen/security/adaptive-application-controls.yml
new file mode 100644
index 0000000000..097dde5afd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/adaptive-application-controls.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_adaptive-application-controls
+name: az security adaptive-application-controls
+summary: Enable control which applications can run on your Azure and non-Azure machines (Windows and Linux).
+description: ''
+directCommands:
+- uid: az_security_adaptive-application-controls_list
+  name: az security adaptive-application-controls list
+  summary: Adaptive Application Controls - List.
+  description: ''
+  syntax: >-
+    az security adaptive-application-controls list [--query-examples]
+                                                   [--subscription]
+  examples:
+  - summary: list all application control VM/server groups.
+    syntax: az security adaptive-application-controls list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_adaptive-application-controls_show
+  name: az security adaptive-application-controls show
+  summary: Adaptive Application Controls - Get.
+  description: ''
+  syntax: >-
+    az security adaptive-application-controls show --group-name
+                                                   [--query-examples]
+                                                   [--subscription]
+  examples:
+  - summary: Get a single application control VM/server group.
+    syntax: az security adaptive-application-controls show --group-name GROUP1
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: Name of an application control VM/server group.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_adaptive-application-controls_list
+- az_security_adaptive-application-controls_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Enable control which applications can run on your Azure and non-Azure machines (Windows and Linux).
diff --git a/2017-03-09-profile/docs-ref-autogen/security/adaptive_network_hardenings.yml b/2017-03-09-profile/docs-ref-autogen/security/adaptive_network_hardenings.yml
new file mode 100644
index 0000000000..8d6ae159f6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/adaptive_network_hardenings.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_adaptive_network_hardenings
+name: az security adaptive_network_hardenings
+summary: View all Adaptive Network Hardening resources.
+description: ''
+directCommands:
+- uid: az_security_adaptive_network_hardenings_list
+  name: az security adaptive_network_hardenings list
+  summary: Gets a list of Adaptive Network Hardenings resources in scope of an extended resource.
+  description: ''
+  syntax: >-
+    az security adaptive_network_hardenings list --resource-group
+                                                 --resource-name
+                                                 --resource-namespace
+                                                 --resource-type
+                                                 [--query-examples]
+                                                 [--subscription]
+  examples:
+  - summary: Adaptive Network Hardenings - List By Extended Resource
+    syntax: az security adaptive_network_hardenings list --resource-group 'RG1' --resource-type 'virtualMachines' --resource-namespace 'Microsoft.Compute' --resource-name 'VM1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Name of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-namespace
+    summary: The Namespace of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The type of the resource.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_adaptive_network_hardenings_show
+  name: az security adaptive_network_hardenings show
+  summary: Gets a single Adaptive Network Hardening resource.
+  description: ''
+  syntax: >-
+    az security adaptive_network_hardenings show --adaptive-network-hardenings-resource-name
+                                                 --resource-group
+                                                 --resource-name
+                                                 --resource-namespace
+                                                 --resource-type
+                                                 [--query-examples]
+                                                 [--subscription]
+  examples:
+  - summary: Adaptive Network Hardenings - Get.
+    syntax: az security adaptive_network_hardenings show --resource-group 'RG1' --resource-type 'virtualMachines' --resource-namespace 'Microsoft.Compute' --resource-name 'VM1' --adaptive-network-hardenings-resource-name 'default'
+  requiredParameters:
+  - isRequired: true
+    name: --adaptive-network-hardenings-resource-name
+    summary: Adaptive Network Hardening resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Name of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-namespace
+    summary: The Namespace of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The type of the resource.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_adaptive_network_hardenings_list
+- az_security_adaptive_network_hardenings_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View all Adaptive Network Hardening resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/alert.yml b/2017-03-09-profile/docs-ref-autogen/security/alert.yml
index fa137b2395..00844ec22a 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/alert.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/alert.yml
@@ -1,58 +1,53 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_alert
-  name: az security alert
-  summary: View security alerts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_alert_list
-  - az_security_alert_show
-  - az_security_alert_update
+### YamlMime:AzureCLIGroup
+uid: az_security_alert
+name: az security alert
+summary: View security alerts.
+description: ''
+directCommands:
 - uid: az_security_alert_list
   name: az security alert list
   summary: List security alerts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security alert list [--location]
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Get security alerts on a subscription scope.
-    syntax:
-      content: az security alert list
+    syntax: az security alert list
   - summary: Get security alerts on a resource group scope.
-    syntax:
-      content: az security alert list -g "myRg"
-  parameters:
+    syntax: az security alert list -g "myRg"
+  optionalParameters:
   - name: --location -l
     summary: Location of the resource.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_alert_show
   name: az security alert show
   summary: Shows a security alert.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security alert show --location
+                           --name
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Get a security alert on a subscription scope.
-    syntax:
-      content: az security alert show --location "centralus" -n "alertName"
+    syntax: az security alert show --location "centralus" -n "alertName"
   - summary: Get a security alert on a resource group scope.
-    syntax:
-      content: az security alert show -g "myRg" --location "centralus" -n "alertName"
-  parameters:
+    syntax: az security alert show -g "myRg" --location "centralus" -n "alertName"
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: Location of the resource.
@@ -61,38 +56,37 @@ items:
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_alert_update
   name: az security alert update
   summary: Updates a security alert status.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security alert update --location
+                             --name
+                             --status
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: Dismiss a security alert on a subscription scope.
-    syntax:
-      content: az security alert update --location "centralus" -n "alertName" --status "dismiss"
+    syntax: az security alert update --location "centralus" -n "alertName" --status "dismiss"
   - summary: Dismiss a security alert on a resource group scope.
-    syntax:
-      content: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "dismiss"
+    syntax: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "dismiss"
   - summary: Activate a security alert on a subscritpion scope.
-    syntax:
-      content: az security alert update --location "centralus" -n "alertName" --status "activate"
+    syntax: az security alert update --location "centralus" -n "alertName" --status "activate"
   - summary: Activate a security alert on a resource group scope.
-    syntax:
-      content: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "activate"
-  parameters:
+    syntax: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "activate"
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: Location of the resource.
@@ -105,28 +99,18 @@ items:
     name: --status
     summary: Target status of the alert. possible values are "dismiss" and "activate".
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_alert_list
-  name: az security alert list
-  summary: List security alerts.
-- uid: az_security_alert_show
-  name: az security alert show
-  summary: Shows a security alert.
-- uid: az_security_alert_update
-  name: az security alert update
-  summary: Updates a security alert status.
+- az_security_alert_list
+- az_security_alert_show
+- az_security_alert_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -142,10 +126,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View security alerts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View security alerts.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/allowed_connections.yml b/2017-03-09-profile/docs-ref-autogen/security/allowed_connections.yml
new file mode 100644
index 0000000000..fa4ab73497
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/allowed_connections.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_allowed_connections
+name: az security allowed_connections
+summary: View all possible traffic between resources for the subscription and location, based on connection type.
+description: ''
+directCommands:
+- uid: az_security_allowed_connections_list
+  name: az security allowed_connections list
+  summary: List of all possible traffic between resources for the subscription.
+  description: ''
+  syntax: >-
+    az security allowed_connections list [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get possible traffic between resources at the subscription level.
+    syntax: az security allowed_connections list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_allowed_connections_show
+  name: az security allowed_connections show
+  summary: List all possible traffic between resources for the subscription and location, based on connection type.
+  description: ''
+  syntax: >-
+    az security allowed_connections show --name
+                                         --resource-group
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get all possible traffic between resources for the subscription and location, based on connection type.
+    syntax: az security allowed_connections show --name Internal --resource-group mygroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_allowed_connections_list
+- az_security_allowed_connections_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View all possible traffic between resources for the subscription and location, based on connection type.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/assessment-metadata.yml b/2017-03-09-profile/docs-ref-autogen/security/assessment-metadata.yml
new file mode 100644
index 0000000000..aed6848405
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/assessment-metadata.yml
@@ -0,0 +1,131 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_assessment-metadata
+name: az security assessment-metadata
+summary: View your security assessment metadata.
+description: ''
+directCommands:
+- uid: az_security_assessment-metadata_create
+  name: az security assessment-metadata create
+  summary: Creates a customer managed security assessment type.
+  description: ''
+  syntax: >-
+    az security assessment-metadata create --description
+                                           --display-name
+                                           --name
+                                           --severity
+                                           [--remediation-description]
+                                           [--subscription]
+  examples:
+  - summary: Creates a security assessment type.
+    syntax: az security assessment-metadata create -n "4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d" --display-name  "Resource should be secured" --severity "high" --description "The resource should be secured according to my company security policy"
+  requiredParameters:
+  - isRequired: true
+    name: --description
+    summary: Detailed string that will help users to understand the assessment and how it is calculated.
+    description: ''
+  - isRequired: true
+    name: --display-name
+    summary: Human readable title for this object.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --severity
+    summary: Indicates the importance of the security risk if the assessment is unhealthy.
+    description: ''
+  optionalParameters:
+  - name: --remediation-description
+    summary: Detailed string that will help users to understand the different ways to mitigate or fix the security issue.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment-metadata_delete
+  name: az security assessment-metadata delete
+  summary: Deletes a security assessment type and all it's assessment results.
+  description: ''
+  syntax: >-
+    az security assessment-metadata delete --name
+                                           [--subscription]
+  examples:
+  - summary: Deletes a security assessment type.
+    syntax: az security assessment-metadata delete -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment-metadata_list
+  name: az security assessment-metadata list
+  summary: List all security assessment results.
+  description: ''
+  syntax: >-
+    az security assessment-metadata list [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get security assessment metadata.
+    syntax: az security assessment-metadata list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment-metadata_show
+  name: az security assessment-metadata show
+  summary: Shows a security assessment.
+  description: ''
+  syntax: >-
+    az security assessment-metadata show --name
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get a security assessment metadata.
+    syntax: az security assessment-metadata show -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_assessment-metadata_create
+- az_security_assessment-metadata_delete
+- az_security_assessment-metadata_list
+- az_security_assessment-metadata_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security assessment metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/assessment.yml b/2017-03-09-profile/docs-ref-autogen/security/assessment.yml
new file mode 100644
index 0000000000..05be37bbae
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/assessment.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_assessment
+name: az security assessment
+summary: View your security assessment results.
+description: ''
+directCommands:
+- uid: az_security_assessment_create
+  name: az security assessment create
+  summary: Creates a customer managed security assessment.
+  description: ''
+  syntax: >-
+    az security assessment create --name
+                                  --status-code
+                                  [--additional-data]
+                                  [--assessed-resource-id]
+                                  [--status-cause]
+                                  [--status-description]
+                                  [--subscription]
+  examples:
+  - summary: Creates a security assessment.
+    syntax: az security assessment create -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d' --status-code  'unhealthy'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --status-code
+    summary: Progremmatic code for the result of the assessment. can be "Healthy", "Unhealthy" or "NotApplicable".
+    description: ''
+  optionalParameters:
+  - name: --additional-data
+    summary: Data that is attached to the assessment result for better investigations or status clarity.
+    description: ''
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --status-cause
+    summary: Progremmatic code for the cause of the assessment result.
+    description: ''
+  - name: --status-description
+    summary: Human readable description of the cause of the assessment result.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment_delete
+  name: az security assessment delete
+  summary: Deletes a security assessment.
+  description: ''
+  syntax: >-
+    az security assessment delete --name
+                                  [--assessed-resource-id]
+                                  [--subscription]
+  examples:
+  - summary: Deletes a security assessment.
+    syntax: az security assessment delete -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment_list
+  name: az security assessment list
+  summary: List all security assessment results.
+  description: ''
+  syntax: >-
+    az security assessment list [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get security assessments.
+    syntax: az security assessment list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment_show
+  name: az security assessment show
+  summary: Shows a security assessment.
+  description: ''
+  syntax: >-
+    az security assessment show --name
+                                [--assessed-resource-id]
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get a security assessment.
+    syntax: az security assessment show -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_assessment_create
+- az_security_assessment_delete
+- az_security_assessment_list
+- az_security_assessment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security assessment results.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/atp.yml b/2017-03-09-profile/docs-ref-autogen/security/atp.yml
index 0d889ec72f..31ef901037 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/atp.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/atp.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_atp
-  name: az security atp
-  summary: View and manage Advanced Threat Protection settings.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_security_atp
+name: az security atp
+summary: View and manage Advanced Threat Protection settings.
+description: ''
 commands:
-- uid: az_security_atp_storage
-  name: az security atp storage
-  summary: View and manage Advanced Threat Protection settings for storage accounts.
-- uid: az_security_atp_storage_show
-  name: az security atp storage show
-  summary: Display Advanced Threat Protection settings for a storage account.
-- uid: az_security_atp_storage_update
-  name: az security atp storage update
-  summary: Toggle status of Advanced Threat Protection for a storage account.
+- az_security_atp_storage
+- az_security_atp_storage_show
+- az_security_atp_storage_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,10 +22,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View and manage Advanced Threat Protection settings.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View and manage Advanced Threat Protection settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/atp/storage.yml b/2017-03-09-profile/docs-ref-autogen/security/atp/storage.yml
index c3bf919b5c..ba21a8cb0d 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/atp/storage.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/atp/storage.yml
@@ -1,56 +1,53 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_atp_storage
-  name: az security atp storage
-  summary: View and manage Advanced Threat Protection settings for storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_atp_storage_show
-  - az_security_atp_storage_update
+### YamlMime:AzureCLIGroup
+uid: az_security_atp_storage
+name: az security atp storage
+summary: View and manage Advanced Threat Protection settings for storage accounts.
+description: ''
+directCommands:
 - uid: az_security_atp_storage_show
   name: az security atp storage show
   summary: Display Advanced Threat Protection settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security atp storage show --resource-group
+                                 --storage-account
+                                 [--query-examples]
+                                 [--subscription]
   examples:
   - summary: Retrieve Advanced Threat Protection settings for a storage account on a subscription scope.
-    syntax:
-      content: az security atp storage show --resource-group MyResourceGroup --storage-account MyStorageAccount
-  parameters:
+    syntax: az security atp storage show --resource-group MyResourceGroup --storage-account MyStorageAccount
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --storage-account
     summary: Name of an existing storage account.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_atp_storage_update
   name: az security atp storage update
   summary: Toggle status of Advanced Threat Protection for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security atp storage update --is-enabled {false, true}
+                                   --resource-group
+                                   --storage-account
+                                   [--subscription]
   examples:
   - summary: Enable Advanced Threat Protection for a storage account on a subscription scope.
-    syntax:
-      content: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled true
+    syntax: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled true
   - summary: Disable Advanced Threat Protection for a storage account on a subscription scope.
-    syntax:
-      content: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled false
-  parameters:
+    syntax: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled false
+  requiredParameters:
   - isRequired: true
     name: --is-enabled
     parameterValueGroup: false, true
@@ -58,28 +55,20 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --storage-account
     summary: Name of an existing storage account.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_atp_storage_show
-  name: az security atp storage show
-  summary: Display Advanced Threat Protection settings for a storage account.
-- uid: az_security_atp_storage_update
-  name: az security atp storage update
-  summary: Toggle status of Advanced Threat Protection for a storage account.
+- az_security_atp_storage_show
+- az_security_atp_storage_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -95,10 +84,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View and manage Advanced Threat Protection settings for storage accounts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View and manage Advanced Threat Protection settings for storage accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/auto-provisioning-setting.yml b/2017-03-09-profile/docs-ref-autogen/security/auto-provisioning-setting.yml
index b5f06b3819..7f49441f98 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/auto-provisioning-setting.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/auto-provisioning-setting.yml
@@ -1,76 +1,67 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_auto_provisioning_setting
-  name: az security auto-provisioning-setting
-  summary: View your auto provisioning settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_auto_provisioning_setting_list
-  - az_security_auto_provisioning_setting_show
-  - az_security_auto_provisioning_setting_update
-- uid: az_security_auto_provisioning_setting_list
+### YamlMime:AzureCLIGroup
+uid: az_security_auto-provisioning-setting
+name: az security auto-provisioning-setting
+summary: View your auto provisioning settings.
+description: ''
+directCommands:
+- uid: az_security_auto-provisioning-setting_list
   name: az security auto-provisioning-setting list
   summary: List the auto provisioning settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security auto-provisioning-setting list [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get auto provisioning settings.
-    syntax:
-      content: az security auto-provisioning-setting list
-  parameters:
+    syntax: az security auto-provisioning-setting list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_auto_provisioning_setting_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_auto-provisioning-setting_show
   name: az security auto-provisioning-setting show
   summary: Shows an auto provisioning setting.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security auto-provisioning-setting show --name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get an auto provisioning setting.
-    syntax:
-      content: az security auto-provisioning-setting show -n "default"
-  parameters:
+    syntax: az security auto-provisioning-setting show -n "default"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_auto_provisioning_setting_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_auto-provisioning-setting_update
   name: az security auto-provisioning-setting update
   summary: Updates your automatic provisioning settings on the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security auto-provisioning-setting update --auto-provision
+                                                 --name
+                                                 [--subscription]
   examples:
   - summary: Turns on automatic provisioning on the subscription.
-    syntax:
-      content: az security auto-provisioning-setting update -n "default" --auto-provision "On"
+    syntax: az security auto-provisioning-setting update -n "default" --auto-provision "On"
   - summary: Turns off automatic provisioning on the subscription.
-    syntax:
-      content: az security auto-provisioning-setting update -n "default" --auto-provision "Off"
+    syntax: az security auto-provisioning-setting update -n "default" --auto-provision "Off"
   - summary: Updates your automatic provisioning settings on the subscription. (autogenerated)
-    syntax:
-      content: az security auto-provisioning-setting update --auto-provision "Off" --name "default" --subscription MySubscription
-  parameters:
+    syntax: az security auto-provisioning-setting update --auto-provision "Off" --name "default" --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --auto-provision
     summary: Automatic provisioning toggle. possible values are "On" or "Off".
@@ -79,25 +70,15 @@ items:
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_auto_provisioning_setting_list
-  name: az security auto-provisioning-setting list
-  summary: List the auto provisioning settings.
-- uid: az_security_auto_provisioning_setting_show
-  name: az security auto-provisioning-setting show
-  summary: Shows an auto provisioning setting.
-- uid: az_security_auto_provisioning_setting_update
-  name: az security auto-provisioning-setting update
-  summary: Updates your automatic provisioning settings on the subscription.
+- az_security_auto-provisioning-setting_list
+- az_security_auto-provisioning-setting_show
+- az_security_auto-provisioning-setting_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -113,10 +94,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your auto provisioning settings.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your auto provisioning settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/contact.yml b/2017-03-09-profile/docs-ref-autogen/security/contact.yml
index 8d10a3b3d5..c9d0b72337 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/contact.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/contact.yml
@@ -1,27 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_contact
-  name: az security contact
-  summary: View your security contacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_contact_create
-  - az_security_contact_delete
-  - az_security_contact_list
-  - az_security_contact_show
+### YamlMime:AzureCLIGroup
+uid: az_security_contact
+name: az security contact
+summary: View your security contacts.
+description: ''
+directCommands:
 - uid: az_security_contact_create
   name: az security contact create
   summary: Creates a security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact create --email
+                               --name
+                               [--alert-notifications]
+                               [--alerts-admins]
+                               [--phone]
+                               [--subscription]
   examples:
   - summary: Creates a security contact.
-    syntax:
-      content: az security contact create -n "default1" --email 'john@contoso.com' --phone '(214)275-4038' --alert-notifications 'on' --alerts-admins 'on'
-  parameters:
+    syntax: az security contact create -n "default1" --email 'john@contoso.com' --phone '(214)275-4038' --alert-notifications 'on' --alerts-admins 'on'
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: E-mail of the security contact.
@@ -30,6 +27,7 @@ items:
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --alert-notifications
     summary: Whether to send mail notifications to the security contacts.
     description: ''
@@ -42,93 +40,74 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_contact_delete
   name: az security contact delete
   summary: Deletes a security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact delete --name
+                               [--subscription]
   examples:
   - summary: Deletes a security contact.
-    syntax:
-      content: az security contact delete -n "default1"
-  parameters:
+    syntax: az security contact delete -n "default1"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_contact_list
   name: az security contact list
   summary: List security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact list [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get security contacts.
-    syntax:
-      content: az security contact list
-  parameters:
+    syntax: az security contact list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_contact_show
   name: az security contact show
   summary: Shows a security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact show --name
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get a security contact.
-    syntax:
-      content: az security contact show -n "default1"
-  parameters:
+    syntax: az security contact show -n "default1"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_contact_create
-  name: az security contact create
-  summary: Creates a security contact.
-- uid: az_security_contact_delete
-  name: az security contact delete
-  summary: Deletes a security contact.
-- uid: az_security_contact_list
-  name: az security contact list
-  summary: List security contact.
-- uid: az_security_contact_show
-  name: az security contact show
-  summary: Shows a security contact.
+- az_security_contact_create
+- az_security_contact_delete
+- az_security_contact_list
+- az_security_contact_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -144,10 +123,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your security contacts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security contacts.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/discovered-security-solution.yml b/2017-03-09-profile/docs-ref-autogen/security/discovered-security-solution.yml
index 37977c9db2..bccd5ae3e6 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/discovered-security-solution.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/discovered-security-solution.yml
@@ -1,69 +1,59 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_discovered_security_solution
-  name: az security discovered-security-solution
-  summary: View your discovered security solutions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_discovered_security_solution_list
-  - az_security_discovered_security_solution_show
-- uid: az_security_discovered_security_solution_list
+### YamlMime:AzureCLIGroup
+uid: az_security_discovered-security-solution
+name: az security discovered-security-solution
+summary: View your discovered security solutions.
+description: ''
+directCommands:
+- uid: az_security_discovered-security-solution_list
   name: az security discovered-security-solution list
   summary: List the discovered security solutions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security discovered-security-solution list [--query-examples]
+                                                  [--subscription]
   examples:
   - summary: Get discovered security solutions.
-    syntax:
-      content: az security discovered-security-solution list
-  parameters:
+    syntax: az security discovered-security-solution list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_discovered_security_solution_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_discovered-security-solution_show
   name: az security discovered-security-solution show
   summary: Shows a discovered security solution.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security discovered-security-solution show --name
+                                                  --resource-group
+                                                  [--query-examples]
+                                                  [--subscription]
   examples:
   - summary: Get a discovered security solution.
-    syntax:
-      content: az security discovered-security-solution show -n ContosoWAF2 -g myService1
-  parameters:
+    syntax: az security discovered-security-solution show -n ContosoWAF2 -g myService1
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_discovered_security_solution_list
-  name: az security discovered-security-solution list
-  summary: List the discovered security solutions.
-- uid: az_security_discovered_security_solution_show
-  name: az security discovered-security-solution show
-  summary: Shows a discovered security solution.
+- az_security_discovered-security-solution_list
+- az_security_discovered-security-solution_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -79,10 +69,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your discovered security solutions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your discovered security solutions.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/external-security-solution.yml b/2017-03-09-profile/docs-ref-autogen/security/external-security-solution.yml
index 4318da78ca..ca1f16735e 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/external-security-solution.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/external-security-solution.yml
@@ -1,69 +1,59 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_external_security_solution
-  name: az security external-security-solution
-  summary: View your external security solutions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_external_security_solution_list
-  - az_security_external_security_solution_show
-- uid: az_security_external_security_solution_list
+### YamlMime:AzureCLIGroup
+uid: az_security_external-security-solution
+name: az security external-security-solution
+summary: View your external security solutions.
+description: ''
+directCommands:
+- uid: az_security_external-security-solution_list
   name: az security external-security-solution list
   summary: List the external security solutions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security external-security-solution list [--query-examples]
+                                                [--subscription]
   examples:
   - summary: Get external security solutions.
-    syntax:
-      content: az security external-security-solution list
-  parameters:
+    syntax: az security external-security-solution list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_external_security_solution_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_external-security-solution_show
   name: az security external-security-solution show
   summary: Shows an external security solution.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security external-security-solution show --name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: Get an external security solution.
-    syntax:
-      content: az security external-security-solution show -n aad_defaultworkspace-20ff7fc3-e762-44dd-bd96-b71116dcdc23-eus -g defaultresourcegroup-eus
-  parameters:
+    syntax: az security external-security-solution show -n aad_defaultworkspace-20ff7fc3-e762-44dd-bd96-b71116dcdc23-eus -g defaultresourcegroup-eus
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_external_security_solution_list
-  name: az security external-security-solution list
-  summary: List the external security solutions.
-- uid: az_security_external_security_solution_show
-  name: az security external-security-solution show
-  summary: Shows an external security solution.
+- az_security_external-security-solution_list
+- az_security_external-security-solution_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -79,10 +69,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your external security solutions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your external security solutions.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/iot-alerts.yml b/2017-03-09-profile/docs-ref-autogen/security/iot-alerts.yml
new file mode 100644
index 0000000000..434f7ad9ed
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/iot-alerts.yml
@@ -0,0 +1,122 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-alerts
+name: az security iot-alerts
+summary: View IoT Security aggregated alerts.
+description: ''
+directCommands:
+- uid: az_security_iot-alerts_delete
+  name: az security iot-alerts delete
+  summary: Dismiss an aggregated IoT Security Alert.
+  description: ''
+  syntax: >-
+    az security iot-alerts delete --name
+                                  --resource-group
+                                  --solution-name
+                                  [--subscription]
+  examples:
+  - summary: Dismiss an aggregated IoT Security Alert.
+    syntax: az security iot-alerts delete --solution-name 'IoT-Hub1' --resource-group 'rg1' --name 'IoT_CryptoMiner/2020-06-24'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-alerts_list
+  name: az security iot-alerts list
+  summary: List all yours IoT Security solution aggregated alerts.
+  description: ''
+  syntax: >-
+    az security iot-alerts list --resource-group
+                                --solution-name
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get list of all IoT Security solution aggregated alerts.
+    syntax: az security iot-alerts list --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-alerts_show
+  name: az security iot-alerts show
+  summary: Shows a single aggregated alert of yours IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-alerts show --name
+                                --resource-group
+                                --solution-name
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get an IoT Security solution aggregated alert.
+    syntax: az security iot-alerts show --solution-name 'IoT-Hub1' --resource-group 'rg1' --name 'IoT_CryptoMiner/2020-06-24'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-alerts_delete
+- az_security_iot-alerts_list
+- az_security_iot-alerts_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View IoT Security aggregated alerts.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/iot-analytics.yml b/2017-03-09-profile/docs-ref-autogen/security/iot-analytics.yml
new file mode 100644
index 0000000000..fe67a98d05
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/iot-analytics.yml
@@ -0,0 +1,86 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-analytics
+name: az security iot-analytics
+summary: View IoT Security Analytics metrics.
+description: ''
+directCommands:
+- uid: az_security_iot-analytics_list
+  name: az security iot-analytics list
+  summary: List all IoT security Analytics metrics.
+  description: ''
+  syntax: >-
+    az security iot-analytics list --resource-group
+                                   --solution-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get List of all IoT security Analytics metrics.
+    syntax: az security iot-analytics list --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-analytics_show
+  name: az security iot-analytics show
+  summary: Shows IoT Security Analytics metrics.
+  description: ''
+  syntax: >-
+    az security iot-analytics show --resource-group
+                                   --solution-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get an IoT Security Analytics metrics.
+    syntax: az security iot-analytics show --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-analytics_list
+- az_security_iot-analytics_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View IoT Security Analytics metrics.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/iot-recommendations.yml b/2017-03-09-profile/docs-ref-autogen/security/iot-recommendations.yml
new file mode 100644
index 0000000000..b0bb32255e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/iot-recommendations.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-recommendations
+name: az security iot-recommendations
+summary: View IoT Security aggregated recommendations.
+description: ''
+directCommands:
+- uid: az_security_iot-recommendations_list
+  name: az security iot-recommendations list
+  summary: List all yours IoT Security solution aggregated recommendations.
+  description: ''
+  syntax: >-
+    az security iot-recommendations list --resource-group
+                                         --solution-name
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get list of all IoT Security solution aggregated recommendations.
+    syntax: az security iot-recommendations list --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-recommendations_show
+  name: az security iot-recommendations show
+  summary: Shows a single aggregated recommendation of yours IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-recommendations show --name
+                                         --resource-group
+                                         --solution-name
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get an IoT Security solution aggregated recommendation.
+    syntax: az security iot-recommendations show --solution-name 'IoT-Hub1' --resource-group 'rg1' --name 'IoT_PermissiveFirewallPolicy'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-recommendations_list
+- az_security_iot-recommendations_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View IoT Security aggregated recommendations.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/iot-solution.yml b/2017-03-09-profile/docs-ref-autogen/security/iot-solution.yml
new file mode 100644
index 0000000000..f10d65fb92
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/iot-solution.yml
@@ -0,0 +1,180 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-solution
+name: az security iot-solution
+summary: Manage your IoT Security solution.
+description: ''
+directCommands:
+- uid: az_security_iot-solution_create
+  name: az security iot-solution create
+  summary: Create your IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution create --display-name
+                                    --iot-hubs
+                                    --location
+                                    --resource-group
+                                    --solution-name
+                                    [--subscription]
+  examples:
+  - summary: create an IoT Security solution on existing IoT Hub.
+    syntax: az security iot-solution create --solution-name 'IoT-Hub1' --resource-group 'rg1' --iot-hubs /subscriptions/subscriptionId/resourcegroups/rg1/providers/Microsoft.Devices/IotHubs/IoT-Hub1 --display-name "Solution Default" --location "eastus"
+  requiredParameters:
+  - isRequired: true
+    name: --display-name
+    summary: Resource display name.
+    description: ''
+  - isRequired: true
+    name: --iot-hubs
+    summary: IoT Hub resource IDs.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_delete
+  name: az security iot-solution delete
+  summary: Delete your IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution delete --resource-group
+                                    --solution-name
+                                    [--subscription]
+  examples:
+  - summary: Delete an IoT Security solutions.
+    syntax: az security iot-solution delete --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_list
+  name: az security iot-solution list
+  summary: List all IoT Security solutions.
+  description: ''
+  syntax: >-
+    az security iot-solution list [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
+  examples:
+  - summary: Get List of all IoT Security solutions in subscription.
+    syntax: az security iot-solution list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_show
+  name: az security iot-solution show
+  summary: Shows a IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution show --resource-group
+                                  --solution-name
+                                  [--query-examples]
+                                  [--subscription]
+  examples:
+  - summary: Get an IoT Security solutions.
+    syntax: az security iot-solution show --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_update
+  name: az security iot-solution update
+  summary: Update your IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution update --resource-group
+                                    --solution-name
+                                    [--display-name]
+                                    [--iot-hubs]
+                                    [--subscription]
+  examples:
+  - summary: Update your IoT Security solution.
+    syntax: az security iot-solution update --solution-name 'IoT-Hub1' --resource-group 'rg1' --iot-hubs /subscriptions/subscriptionId/resourcegroups/rg1/providers/Microsoft.Devices/IotHubs/IoT-Hub1 --display-name "Solution Default"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --display-name
+    summary: Resource display name.
+    description: ''
+  - name: --iot-hubs
+    summary: IoT Hub resource IDs.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-solution_create
+- az_security_iot-solution_delete
+- az_security_iot-solution_list
+- az_security_iot-solution_show
+- az_security_iot-solution_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Manage your IoT Security solution.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/jit-policy.yml b/2017-03-09-profile/docs-ref-autogen/security/jit-policy.yml
index 6ae37368ac..fd64e1f06d 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/jit-policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/jit-policy.yml
@@ -1,51 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_jit_policy
-  name: az security jit-policy
-  summary: Manage your Just in Time network access policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_jit_policy_list
-  - az_security_jit_policy_show
-- uid: az_security_jit_policy_list
+### YamlMime:AzureCLIGroup
+uid: az_security_jit-policy
+name: az security jit-policy
+summary: Manage your Just in Time network access policies.
+description: ''
+directCommands:
+- uid: az_security_jit-policy_list
   name: az security jit-policy list
   summary: List your Just in Time network access policies.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security jit-policy list [--location]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Get all the Just in Time network access policies.
-    syntax:
-      content: az security jit-policy list
-  parameters:
+    syntax: az security jit-policy list
+  optionalParameters:
   - name: --location -l
     summary: Location of the resource.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_jit_policy_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_jit-policy_show
   name: az security jit-policy show
   summary: Shows a Just in Time network access policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security jit-policy show --location
+                                --name
+                                --resource-group
+                                [--query-examples]
+                                [--subscription]
   examples:
   - summary: Get a Just in Time network access policy.
-    syntax:
-      content: az security jit-policy show -l northeurope -n default -g myService1
-  parameters:
+    syntax: az security jit-policy show -l northeurope -n default -g myService1
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: Location of the resource.
@@ -56,24 +54,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_jit_policy_list
-  name: az security jit-policy list
-  summary: List your Just in Time network access policies.
-- uid: az_security_jit_policy_show
-  name: az security jit-policy show
-  summary: Shows a Just in Time network access policy.
+- az_security_jit-policy_list
+- az_security_jit-policy_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -89,10 +82,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Manage your Just in Time network access policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Manage your Just in Time network access policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/location.yml b/2017-03-09-profile/docs-ref-autogen/security/location.yml
index bf19239561..8c75a45f6f 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/location.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/location.yml
@@ -1,65 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_location
-  name: az security location
-  summary: Shows the Azure Security Center Home region location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_location_list
-  - az_security_location_show
+### YamlMime:AzureCLIGroup
+uid: az_security_location
+name: az security location
+summary: Shows the Azure Security Center Home region location.
+description: ''
+directCommands:
 - uid: az_security_location_list
   name: az security location list
   summary: Shows the Azure Security Center Home region location.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security location list [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the Azure Security Center Home region location.
-    syntax:
-      content: az security location list
-  parameters:
+    syntax: az security location list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_location_show
   name: az security location show
   summary: Shows the Azure Security Center Home region location.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security location show --name
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the Azure Security Center Home region location.
-    syntax:
-      content: az security location show -n centralus
-  parameters:
+    syntax: az security location show -n centralus
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_location_list
-  name: az security location list
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_location_show
-  name: az security location show
-  summary: Shows the Azure Security Center Home region location.
+- az_security_location_list
+- az_security_location_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +64,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the Azure Security Center Home region location.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Shows the Azure Security Center Home region location.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/pricing.yml b/2017-03-09-profile/docs-ref-autogen/security/pricing.yml
index 81f0dc080b..a0862ac6b1 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/pricing.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/pricing.yml
@@ -1,29 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_pricing
-  name: az security pricing
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_pricing_create
-  - az_security_pricing_list
-  - az_security_pricing_show
+### YamlMime:AzureCLIGroup
+uid: az_security_pricing
+name: az security pricing
+summary: Enables managing the Azure Defender plan for the subscription.
+description: ''
+directCommands:
 - uid: az_security_pricing_create
   name: az security pricing create
-  summary: Updates the Azure Security Center Pricing tier for the subscription.
+  summary: Updates the Azure defender plan for the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security pricing create --name
+                               --tier
+                               [--subscription]
   examples:
-  - summary: Updates the Azure Security Center Pricing tier for the subscription.
-    syntax:
-      content: az security pricing create -n default --tier 'standard'
-  - summary: Updates the Azure Security Center Pricing tier for the subscription. (autogenerated)
-    syntax:
-      content: az security pricing create --name default --subscription MySubscription --tier 'standard'
-  parameters:
+  - summary: Updates the Azure defender plan for the subscription.
+    syntax: az security pricing create -n VirtualMachines --tier 'standard'
+  - summary: Updates the Azure defender plan for the subscription. (autogenerated)
+    syntax: az security pricing create -n VirtualMachines --tier 'standard'
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
@@ -32,75 +26,57 @@ items:
     name: --tier
     summary: Pricing tier type.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_pricing_list
   name: az security pricing list
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
+  summary: Shows the Azure Defender plans for the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security pricing list [--query-examples]
+                             [--subscription]
   examples:
-  - summary: Shows the Azure Security Center Pricing tier for the subscription.
-    syntax:
-      content: az security pricing list
-  parameters:
+  - summary: Shows the Azure Defender plans for the subscription.
+    syntax: az security pricing list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_pricing_show
   name: az security pricing show
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
+  summary: Shows the Azure Defender plan for the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security pricing show --name
+                             [--query-examples]
+                             [--subscription]
   examples:
-  - summary: Shows the Azure Security Center Pricing tier for the subscription.
-    syntax:
-      content: az security pricing show -n default
-  parameters:
+  - summary: Shows the Azure Defender plan for the subscription
+    syntax: az security pricing show -n VirtualMachines
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_pricing_create
-  name: az security pricing create
-  summary: Updates the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_list
-  name: az security pricing list
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_show
-  name: az security pricing show
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
+- az_security_pricing_create
+- az_security_pricing_list
+- az_security_pricing_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,10 +92,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the Azure Security Center Pricing tier for the subscription.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Enables managing the Azure Defender plan for the subscription.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-assessments.yml b/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-assessments.yml
new file mode 100644
index 0000000000..ad1eb4711f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-assessments.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_regulatory-compliance-assessments
+name: az security regulatory-compliance-assessments
+summary: Regulatory compliance assessments.
+description: ''
+directCommands:
+- uid: az_security_regulatory-compliance-assessments_list
+  name: az security regulatory-compliance-assessments list
+  summary: Get details and state of assessments mapped to selected regulatory compliance control.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-assessments list --control-name
+                                                       --standard-name
+                                                       [--query-examples]
+                                                       [--subscription]
+  examples:
+  - summary: Get state of mapped assessments.
+    syntax: az security regulatory-compliance-assessments list --standard-name 'Azure-CIS-1.1.0' --control-name '1.1'
+  requiredParameters:
+  - isRequired: true
+    name: --control-name
+    summary: The compliance control name.
+    description: ''
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_regulatory-compliance-assessments_show
+  name: az security regulatory-compliance-assessments show
+  summary: Shows supported regulatory compliance details and state for selected assessment.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-assessments show --control-name
+                                                       --name
+                                                       --standard-name
+                                                       [--query-examples]
+                                                       [--subscription]
+  examples:
+  - summary: Get selected regulatory compliance control details and state.
+    syntax: az security regulatory-compliance-assessments show --standard-name 'Azure-CIS-1.1.0' --control-name '1.1' -n '94290b00-4d0c-d7b4-7cea-064a9554e681'
+  requiredParameters:
+  - isRequired: true
+    name: --control-name
+    summary: The compliance control name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_regulatory-compliance-assessments_list
+- az_security_regulatory-compliance-assessments_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Regulatory compliance assessments.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-controls.yml b/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-controls.yml
new file mode 100644
index 0000000000..665bedf541
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-controls.yml
@@ -0,0 +1,81 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_regulatory-compliance-controls
+name: az security regulatory-compliance-controls
+summary: Regulatory compliance controls.
+description: ''
+directCommands:
+- uid: az_security_regulatory-compliance-controls_list
+  name: az security regulatory-compliance-controls list
+  summary: List supported of regulatory compliance controls details and state for selected standard.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-controls list --standard-name
+                                                    [--query-examples]
+                                                    [--subscription]
+  examples:
+  - summary: Get regulatory compliance controls list.
+    syntax: az security regulatory-compliance-controls list --standard-name 'Azure-CIS-1.1.0'
+  requiredParameters:
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_regulatory-compliance-controls_show
+  name: az security regulatory-compliance-controls show
+  summary: Shows a regulatory compliance details state for selected standard.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-controls show --name
+                                                    --standard-name
+                                                    [--query-examples]
+                                                    [--subscription]
+  examples:
+  - summary: Get selected regulatory compliance control details and state.
+    syntax: az security regulatory-compliance-controls show --standard-name 'Azure-CIS-1.1.0' -n '1.1'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_regulatory-compliance-controls_list
+- az_security_regulatory-compliance-controls_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Regulatory compliance controls.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-standards.yml b/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-standards.yml
new file mode 100644
index 0000000000..737e63b7a1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/regulatory-compliance-standards.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_regulatory-compliance-standards
+name: az security regulatory-compliance-standards
+summary: Regulatory compliance standards.
+description: ''
+directCommands:
+- uid: az_security_regulatory-compliance-standards_list
+  name: az security regulatory-compliance-standards list
+  summary: List supported regulatory compliance standards details and state results.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-standards list [--query-examples]
+                                                     [--subscription]
+  examples:
+  - summary: Get regulatory compliance standards list.
+    syntax: az security regulatory-compliance-standards list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_regulatory-compliance-standards_show
+  name: az security regulatory-compliance-standards show
+  summary: Shows a regulatory compliance details state for selected standard.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-standards show --name
+                                                     [--query-examples]
+                                                     [--subscription]
+  examples:
+  - summary: Get regulatory compliance standard details.
+    syntax: az security regulatory-compliance-standards show -n 'Azure-CIS-1.1.0'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_regulatory-compliance-standards_list
+- az_security_regulatory-compliance-standards_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Regulatory compliance standards.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/secure-score-control-definitions.yml b/2017-03-09-profile/docs-ref-autogen/security/secure-score-control-definitions.yml
new file mode 100644
index 0000000000..5e1135f0bb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/secure-score-control-definitions.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_secure-score-control-definitions
+name: az security secure-score-control-definitions
+summary: Secure score control definitions.
+description: ''
+directCommands:
+- uid: az_security_secure-score-control-definitions_list
+  name: az security secure-score-control-definitions list
+  summary: Get details of secure score control definitions.
+  description: ''
+  syntax: >-
+    az security secure-score-control-definitions list [--query-examples]
+                                                      [--subscription]
+  examples:
+  - summary: Get secure score control definitions.
+    syntax: az security secure-score-control-definitions list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_secure-score-control-definitions_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Secure score control definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/secure-score-controls.yml b/2017-03-09-profile/docs-ref-autogen/security/secure-score-controls.yml
new file mode 100644
index 0000000000..17a331bf11
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/secure-score-controls.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_secure-score-controls
+name: az security secure-score-controls
+summary: Secure score controls.
+description: ''
+directCommands:
+- uid: az_security_secure-score-controls_list
+  name: az security secure-score-controls list
+  summary: List supported of secure score controls details and state for scope.
+  description: ''
+  syntax: >-
+    az security secure-score-controls list [--query-examples]
+                                           [--subscription]
+  examples:
+  - summary: Get secure score controls list.
+    syntax: az security secure-score-controls list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_secure-score-controls_list_by_score
+  name: az security secure-score-controls list_by_score
+  summary: List supported of secure score controls details and state for selected score.
+  description: ''
+  syntax: >-
+    az security secure-score-controls list_by_score --name
+                                                    [--subscription]
+  examples:
+  - summary: Get secure score controls list.
+    syntax: az security secure-score-controls list_by_score -n 'ascScore'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_secure-score-controls_list
+- az_security_secure-score-controls_list_by_score
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Secure score controls.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/secure-scores.yml b/2017-03-09-profile/docs-ref-autogen/security/secure-scores.yml
new file mode 100644
index 0000000000..29e882f7f1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/secure-scores.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_secure-scores
+name: az security secure-scores
+summary: Secure scores.
+description: ''
+directCommands:
+- uid: az_security_secure-scores_list
+  name: az security secure-scores list
+  summary: List of secure-scores details and state results.
+  description: ''
+  syntax: >-
+    az security secure-scores list [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get secure scores list.
+    syntax: az security secure-scores list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_secure-scores_show
+  name: az security secure-scores show
+  summary: Shows a secure score details for selected initiative.
+  description: ''
+  syntax: >-
+    az security secure-scores show --name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get secure score details.
+    syntax: az security secure-scores show -n 'ascScore'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_secure-scores_list
+- az_security_secure-scores_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Secure scores.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/setting.yml b/2017-03-09-profile/docs-ref-autogen/security/setting.yml
index 02dcafe82d..827ff009a4 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/setting.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/setting.yml
@@ -1,65 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_setting
-  name: az security setting
-  summary: View your security settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_setting_list
-  - az_security_setting_show
+### YamlMime:AzureCLIGroup
+uid: az_security_setting
+name: az security setting
+summary: View your security settings.
+description: ''
+directCommands:
 - uid: az_security_setting_list
   name: az security setting list
   summary: List security settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security setting list [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get security settings.
-    syntax:
-      content: az security setting list
-  parameters:
+    syntax: az security setting list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_setting_show
   name: az security setting show
   summary: Shows a security setting.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security setting show --name
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get a security setting.
-    syntax:
-      content: az security setting show -n "MCAS"
-  parameters:
+    syntax: az security setting show -n "MCAS"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_setting_list
-  name: az security setting list
-  summary: List security settings.
-- uid: az_security_setting_show
-  name: az security setting show
-  summary: Shows a security setting.
+- az_security_setting_list
+- az_security_setting_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +64,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your security settings.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/sub-assessment.yml b/2017-03-09-profile/docs-ref-autogen/security/sub-assessment.yml
new file mode 100644
index 0000000000..70efbda6dc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/sub-assessment.yml
@@ -0,0 +1,87 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_sub-assessment
+name: az security sub-assessment
+summary: View your security sub assessments.
+description: ''
+directCommands:
+- uid: az_security_sub-assessment_list
+  name: az security sub-assessment list
+  summary: List all security sub assessment results.
+  description: ''
+  syntax: >-
+    az security sub-assessment list [--assessed-resource-id]
+                                    [--assessment-name]
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get security sub assessments.
+    syntax: az security sub-assessment list
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --assessment-name
+    summary: Name of the assessment resource.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_sub-assessment_show
+  name: az security sub-assessment show
+  summary: Shows a security sub assessment.
+  description: ''
+  syntax: >-
+    az security sub-assessment show --assessment-name
+                                    --name
+                                    [--assessed-resource-id]
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get a security sub assessment.
+    syntax: az security sub-assessment show --assessed-resource-id '/subscriptions/f8b197db-3b2b-4404-a3a3-0dfec293d0d0/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1' --assessment-name '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d' -n 'd7c4d9ec-227c-4fb3-acf9-25fdd97c1bf1'
+  requiredParameters:
+  - isRequired: true
+    name: --assessment-name
+    summary: Name of the assessment resource.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_sub-assessment_list
+- az_security_sub-assessment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security sub assessments.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/task.yml b/2017-03-09-profile/docs-ref-autogen/security/task.yml
index ce36941fe0..570ab3f5db 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/task.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/task.yml
@@ -1,77 +1,66 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_task
-  name: az security task
-  summary: View security tasks (recommendations).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_task_list
-  - az_security_task_show
+### YamlMime:AzureCLIGroup
+uid: az_security_task
+name: az security task
+summary: View security tasks (recommendations).
+description: ''
+directCommands:
 - uid: az_security_task_list
   name: az security task list
   summary: List security tasks (recommendations).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security task list [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Get security tasks (recommendations) on a subscription scope.
-    syntax:
-      content: az security task list
+    syntax: az security task list
   - summary: Get security tasks (recommendations) on a resource group scope.
-    syntax:
-      content: az security task list -g "myRg"
-  parameters:
+    syntax: az security task list -g "myRg"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_task_show
   name: az security task show
   summary: Shows a security task (recommendation).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security task show --name
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Get a security task (recommendation) on a subscription scope.
-    syntax:
-      content: az security task show -n "taskName"
+    syntax: az security task show -n "taskName"
   - summary: Get a security task (recommendation) on a resource group scope.
-    syntax:
-      content: az security task show -g "myRg" -n "taskName"
-  parameters:
+    syntax: az security task show -g "myRg" -n "taskName"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_task_list
-  name: az security task list
-  summary: List security tasks (recommendations).
-- uid: az_security_task_show
-  name: az security task show
-  summary: Shows a security task (recommendation).
+- az_security_task_list
+- az_security_task_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -87,10 +76,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View security tasks (recommendations).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View security tasks (recommendations).
diff --git a/2017-03-09-profile/docs-ref-autogen/security/topology.yml b/2017-03-09-profile/docs-ref-autogen/security/topology.yml
index 3f6ff9629e..f2937008d1 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/topology.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/topology.yml
@@ -1,69 +1,59 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_topology
-  name: az security topology
-  summary: Shows the network topology in your subscription.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_topology_list
-  - az_security_topology_show
+### YamlMime:AzureCLIGroup
+uid: az_security_topology
+name: az security topology
+summary: Shows the network topology in your subscription.
+description: ''
+directCommands:
 - uid: az_security_topology_list
   name: az security topology list
   summary: Shows the network topology in your subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security topology list [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the network topology in your subscription.
-    syntax:
-      content: az security topology list
-  parameters:
+    syntax: az security topology list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_topology_show
   name: az security topology show
   summary: Shows the network topology in your subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security topology show --name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the network topology in your subscription.
-    syntax:
-      content: az security topology show -n default -g myService1
-  parameters:
+    syntax: az security topology show -n default -g myService1
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_topology_list
-  name: az security topology list
-  summary: Shows the network topology in your subscription.
-- uid: az_security_topology_show
-  name: az security topology show
-  summary: Shows the network topology in your subscription.
+- az_security_topology_list
+- az_security_topology_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -79,10 +69,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the network topology in your subscription.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Shows the network topology in your subscription.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/va.yml b/2017-03-09-profile/docs-ref-autogen/security/va.yml
new file mode 100644
index 0000000000..0ee0897e72
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/va.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va
+name: az security va
+summary: ''
+description: ''
+commands:
+- az_security_va_sql
+- az_security_va_sql_baseline
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+- az_security_va_sql_results
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+- az_security_va_sql_scans
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
diff --git a/2017-03-09-profile/docs-ref-autogen/security/va/sql.yml b/2017-03-09-profile/docs-ref-autogen/security/va/sql.yml
new file mode 100644
index 0000000000..54828381ee
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/va/sql.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql
+name: az security va sql
+summary: View Sql Vulnerability Assessment scan results and manage baseline.
+description: ''
+commands:
+- az_security_va_sql_baseline
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+- az_security_va_sql_results
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+- az_security_va_sql_scans
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View Sql Vulnerability Assessment scan results and manage baseline.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/va/sql/baseline.yml b/2017-03-09-profile/docs-ref-autogen/security/va/sql/baseline.yml
new file mode 100644
index 0000000000..81d5824479
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/va/sql/baseline.yml
@@ -0,0 +1,325 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql_baseline
+name: az security va sql baseline
+summary: View and manage Sql Vulnerability Assessment baseline.
+description: ''
+directCommands:
+- uid: az_security_va_sql_baseline_delete
+  name: az security va sql baseline delete
+  summary: Delete Sql Vulnerability Assessment rule baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline delete --database-name
+                                       --rule-id
+                                       --server-name
+                                       --vm-resource-id
+                                       --workspace-id
+                                       [--agent-id]
+                                       [--subscription]
+                                       [--vm-name]
+                                       [--vm-uuid]
+  examples:
+  - summary: Delete Sql Vulnerability Assessment rule baseline on an Azure virtual machine.
+    syntax: az security va sql baseline delete --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999
+  - summary: Delete Sql Vulnerability Assessment rule baseline on an On-Premise machine.
+    syntax: az security va sql baseline delete --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_list
+  name: az security va sql baseline list
+  summary: View Sql Vulnerability Assessment baseline for all rules.
+  description: ''
+  syntax: >-
+    az security va sql baseline list --database-name
+                                     --server-name
+                                     --vm-resource-id
+                                     --workspace-id
+                                     [--agent-id]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--vm-name]
+                                     [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment baseline for all rules on an Azure virtual machine.
+    syntax: az security va sql baseline list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName
+  - summary: View Sql Vulnerability Assessment baseline for all rules on an On-Premise machine.
+    syntax: az security va sql baseline list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_set
+  name: az security va sql baseline set
+  summary: Sets Sql Vulnerability Assessment baseline. Replaces the current baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline set --database-name
+                                    --server-name
+                                    --vm-resource-id
+                                    --workspace-id
+                                    [--agent-id]
+                                    [--baseline]
+                                    [--latest {false, true}]
+                                    [--subscription]
+                                    [--vm-name]
+                                    [--vm-uuid]
+  examples:
+  - summary: Sets Sql Vulnerability Assessment baseline on an Azure virtual machine. Replaces the current baseline with latest scan results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --latest
+  - summary: Sets Sql Vulnerability Assessment baseline on an Azure virtual machine. Replaces the current baseline with provided results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --baseline rule=VA9999 Line1_col1 Line1_col2 Line1_col3 --baseline rule=VA8888 Line1_col1 Line1_col2 --baseline rule=VA9999 Line2_col1 Line2_col2 Line2_col3
+  - summary: Sets Sql Vulnerability Assessment baseline on an On-Premise machine. Replaces the current baseline with latest scan results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --latest
+  - summary: Sets Sql Vulnerability Assessment baseline on an On-Premise machine. Replaces the current baseline with provided results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --baseline rule=VA9999 Line1_col1 Line1_col2 Line1_col3 --baseline rule=VA8888 Line1_col1 Line1_col2 --baseline rule=VA9999 Line2_col1 Line2_col2 Line2_col3
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --baseline -b
+    summary: 'Baseline records to be set. The following example will set a baseline for two rules: --baseline rule=VA1111 line1_w1 line1_w2 --baseline rule=VA2222 line1_w1 line1_w2 line1_w3 --baseline rule=VA1111 line2_w1 line2_w2.'
+    description: ''
+  - name: --latest
+    parameterValueGroup: false, true
+    summary: Use this argument without parameters to set baseline upon latest scan results.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_show
+  name: az security va sql baseline show
+  summary: View Sql Vulnerability Assessment rule baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline show --database-name
+                                     --rule-id
+                                     --server-name
+                                     --vm-resource-id
+                                     --workspace-id
+                                     [--agent-id]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--vm-name]
+                                     [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment rule baseline on an Azure virtual machine.
+    syntax: az security va sql baseline show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999
+  - summary: View Sql Vulnerability Assessment rule baseline on an On-Premise machine.
+    syntax: az security va sql baseline show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_update
+  name: az security va sql baseline update
+  summary: Update Sql Vulnerability Assessment rule baseline. Replaces the current rule baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline update --database-name
+                                       --rule-id
+                                       --server-name
+                                       --vm-resource-id
+                                       --workspace-id
+                                       [--agent-id]
+                                       [--baseline]
+                                       [--latest {false, true}]
+                                       [--subscription]
+                                       [--vm-name]
+                                       [--vm-uuid]
+  examples:
+  - summary: Update Sql Vulnerability Assessment rule baseline on an Azure virtual machine. Replaces the current rule baseline with latest scan results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999 --latest
+  - summary: Update Sql Vulnerability Assessment rule baseline on an Azure virtual machine. Replaces the current rule baseline with provided results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999 --baseline Line1_Col1 Line1_Col2 --baseline Line2_Col1 Line2_Col2
+  - summary: Update Sql Vulnerability Assessment rule baseline on an On-Premise machine. Replaces the current rule baseline with latest scan results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999 --latest
+  - summary: Update Sql Vulnerability Assessment rule baseline on an On-Premise machine. Replaces the current rule baseline with provided results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999 --baseline Line1_Col1 Line1_Col2 --baseline Line2_Col1 Line2_Col2
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --baseline -b
+    summary: 'Baseline records to be set. The following example will set a baseline with two records: --baseline line1_w1 line1_w2 line1_w3 --baseline line2_w1 line2_w2 line2_w3.'
+    description: ''
+  - name: --latest
+    parameterValueGroup: false, true
+    summary: Use this argument without parameters to set baseline upon latest scan results.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View and manage Sql Vulnerability Assessment baseline.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/va/sql/results.yml b/2017-03-09-profile/docs-ref-autogen/security/va/sql/results.yml
new file mode 100644
index 0000000000..b69612ce2a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/va/sql/results.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql_results
+name: az security va sql results
+summary: View Sql Vulnerability Assessment scan results.
+description: ''
+directCommands:
+- uid: az_security_va_sql_results_list
+  name: az security va sql results list
+  summary: View all Sql Vulnerability Assessment scan results.
+  description: ''
+  syntax: >-
+    az security va sql results list --database-name
+                                    --scan-id
+                                    --server-name
+                                    --vm-resource-id
+                                    --workspace-id
+                                    [--agent-id]
+                                    [--query-examples]
+                                    [--subscription]
+                                    [--vm-name]
+                                    [--vm-uuid]
+  examples:
+  - summary: View all Sql Vulnerability Assessment scan results on an Azure virtual machine.
+    syntax: az security va sql results list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --scan-id MyScanId
+  - summary: View all Sql Vulnerability Assessment scan results on an On-Premise machine.
+    syntax: az security va sql results list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --scan-id MyScanId
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: The ID of the scan.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_results_show
+  name: az security va sql results show
+  summary: View Sql Vulnerability Assessment scan results.
+  description: ''
+  syntax: >-
+    az security va sql results show --database-name
+                                    --rule-id
+                                    --scan-id
+                                    --server-name
+                                    --vm-resource-id
+                                    --workspace-id
+                                    [--agent-id]
+                                    [--query-examples]
+                                    [--subscription]
+                                    [--vm-name]
+                                    [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment scan results on an Azure virtual machine.
+    syntax: az security va sql results show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --scan-id MyScanId --rule-id VA9999
+  - summary: View Sql Vulnerability Assessment scan results on an On-Premise machine.
+    syntax: az security va sql results show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --scan-id MyScanId --rule-id VA9999
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: The ID of the scan.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View Sql Vulnerability Assessment scan results.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/va/sql/scans.yml b/2017-03-09-profile/docs-ref-autogen/security/va/sql/scans.yml
new file mode 100644
index 0000000000..511474cb6f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/security/va/sql/scans.yml
@@ -0,0 +1,139 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql_scans
+name: az security va sql scans
+summary: View Sql Vulnerability Assessment scan summaries.
+description: ''
+directCommands:
+- uid: az_security_va_sql_scans_list
+  name: az security va sql scans list
+  summary: List all Sql Vulnerability Assessment scan summaries.
+  description: ''
+  syntax: >-
+    az security va sql scans list --database-name
+                                  --server-name
+                                  --vm-resource-id
+                                  --workspace-id
+                                  [--agent-id]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--vm-name]
+                                  [--vm-uuid]
+  examples:
+  - summary: List all Sql Vulnerability Assessment scan summaries on an Azure virtual machine.
+    syntax: az security va sql scans list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName
+  - summary: List all Sql Vulnerability Assessment scan summaries on an On-Premise machine.
+    syntax: az security va sql scans list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_scans_show
+  name: az security va sql scans show
+  summary: View Sql Vulnerability Assessment scan summaries.
+  description: ''
+  syntax: >-
+    az security va sql scans show --database-name
+                                  --scan-id
+                                  --server-name
+                                  --vm-resource-id
+                                  --workspace-id
+                                  [--agent-id]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--vm-name]
+                                  [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment scan summary on an Azure virtual machine.
+    syntax: az security va sql scans show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --scan-id MyScanId
+  - summary: View Sql Vulnerability Assessment scan summary on an On-Premise machine.
+    syntax: az security va sql scans show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --scan-id MyScanId
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: The ID of the scan.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View Sql Vulnerability Assessment scan summaries.
diff --git a/2017-03-09-profile/docs-ref-autogen/security/workspace-setting.yml b/2017-03-09-profile/docs-ref-autogen/security/workspace-setting.yml
index 691efafeb3..950af0a53f 100644
--- a/2017-03-09-profile/docs-ref-autogen/security/workspace-setting.yml
+++ b/2017-03-09-profile/docs-ref-autogen/security/workspace-setting.yml
@@ -1,27 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_workspace_setting
-  name: az security workspace-setting
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_workspace_setting_create
-  - az_security_workspace_setting_delete
-  - az_security_workspace_setting_list
-  - az_security_workspace_setting_show
-- uid: az_security_workspace_setting_create
+### YamlMime:AzureCLIGroup
+uid: az_security_workspace-setting
+name: az security workspace-setting
+summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+description: ''
+directCommands:
+- uid: az_security_workspace-setting_create
   name: az security workspace-setting create
   summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting create --name
+                                         --target-workspace
+                                         [--subscription]
   examples:
   - summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data
-    syntax:
-      content: az security workspace-setting create -n default --target-workspace '/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace'
-  parameters:
+    syntax: az security workspace-setting create -n default --target-workspace '/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace'
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
@@ -30,96 +24,78 @@ items:
     name: --target-workspace
     summary: An ID of the workspace resource that will hold the security data.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_workspace_setting_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_workspace-setting_delete
   name: az security workspace-setting delete
   summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting delete --name
+                                         [--subscription]
   examples:
   - summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace
-    syntax:
-      content: az security workspace-setting delete -n default
-  parameters:
+    syntax: az security workspace-setting delete -n default
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_workspace_setting_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_workspace-setting_list
   name: az security workspace-setting list
   summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting list [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data
-    syntax:
-      content: az security workspace-setting list
-  parameters:
+    syntax: az security workspace-setting list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_workspace_setting_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_workspace-setting_show
   name: az security workspace-setting show
   summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting show --name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data
-    syntax:
-      content: az security workspace-setting show -n default
-  parameters:
+    syntax: az security workspace-setting show -n default
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_workspace_setting_create
-  name: az security workspace-setting create
-  summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_delete
-  name: az security workspace-setting delete
-  summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace.
-- uid: az_security_workspace_setting_list
-  name: az security workspace-setting list
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_show
-  name: az security workspace-setting show
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+- az_security_workspace-setting_create
+- az_security_workspace-setting_delete
+- az_security_workspace-setting_list
+- az_security_workspace-setting_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -135,10 +111,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel.yml b/2017-03-09-profile/docs-ref-autogen/sentinel.yml
new file mode 100644
index 0000000000..91cb140453
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel
+name: az sentinel
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_sentinel_action
+- az_sentinel_action_list
+- az_sentinel_alert-rule
+- az_sentinel_alert-rule_create
+- az_sentinel_alert-rule_delete
+- az_sentinel_alert-rule_get-action
+- az_sentinel_alert-rule_list
+- az_sentinel_alert-rule_show
+- az_sentinel_alert-rule_update
+- az_sentinel_alert-rule-template
+- az_sentinel_alert-rule-template_list
+- az_sentinel_alert-rule-template_show
+- az_sentinel_bookmark
+- az_sentinel_bookmark_create
+- az_sentinel_bookmark_delete
+- az_sentinel_bookmark_list
+- az_sentinel_bookmark_show
+- az_sentinel_bookmark_update
+- az_sentinel_data-connector
+- az_sentinel_data-connector_create
+- az_sentinel_data-connector_delete
+- az_sentinel_data-connector_list
+- az_sentinel_data-connector_show
+- az_sentinel_data-connector_update
+- az_sentinel_incident
+- az_sentinel_incident_create
+- az_sentinel_incident_delete
+- az_sentinel_incident_list
+- az_sentinel_incident_show
+- az_sentinel_incident_update
+- az_sentinel_incident-comment
+- az_sentinel_incident-comment_create
+- az_sentinel_incident-comment_list
+- az_sentinel_incident-comment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/action.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/action.yml
new file mode 100644
index 0000000000..159a81e6fb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/action.yml
@@ -0,0 +1,53 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_action
+name: az sentinel action
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel action** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel action.
+description: ''
+directCommands:
+- uid: az_sentinel_action_list
+  name: az sentinel action list
+  summary: Gets all actions of alert rule.
+  description: ''
+  syntax: >-
+    az sentinel action list --resource-group
+                            --rule-id
+                            --workspace-name
+  examples:
+  - summary: Get all actions of alert rule.
+    syntax: az sentinel action list --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+commands:
+- az_sentinel_action_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel action.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/alert-rule-template.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/alert-rule-template.yml
new file mode 100644
index 0000000000..a4697abf63
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/alert-rule-template.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_alert-rule-template
+name: az sentinel alert-rule-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel alert-rule-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel alert-rule-template.
+description: ''
+directCommands:
+- uid: az_sentinel_alert-rule-template_list
+  name: az sentinel alert-rule-template list
+  summary: Gets all alert rule templates.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule-template list --resource-group
+                                         --workspace-name
+  examples:
+  - summary: Get all alert rule templates.
+    syntax: az sentinel alert-rule-template list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule-template_show
+  name: az sentinel alert-rule-template show
+  summary: Gets the alert rule template.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule-template show --alert-rule-template-id
+                                         --resource-group
+                                         --workspace-name
+  examples:
+  - summary: Get alert rule template by Id.
+    syntax: az sentinel alert-rule-template show --alert-rule-template-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --alert-rule-template-id
+    summary: Alert rule template ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+commands:
+- az_sentinel_alert-rule-template_list
+- az_sentinel_alert-rule-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel alert-rule-template.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/alert-rule.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/alert-rule.yml
new file mode 100644
index 0000000000..6ed23c034e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/alert-rule.yml
@@ -0,0 +1,378 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_alert-rule
+name: az sentinel alert-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel alert-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel alert-rule.
+description: ''
+directCommands:
+- uid: az_sentinel_alert-rule_create
+  name: az sentinel alert-rule create
+  summary: Creates or updates the action of alert rule. And Create the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule create --resource-group
+                                  --rule-id
+                                  --workspace-name
+                                  [--action-id]
+                                  [--etag]
+                                  [--fusion-alert-rule]
+                                  [--logic-app-resource-id]
+                                  [--microsoft-security-incident-creation-alert-rule]
+                                  [--scheduled-alert-rule]
+                                  [--trigger-uri]
+  examples:
+  - summary: Creates or updates an action of alert rule.
+    syntax: az sentinel alert-rule create --etag "{etag}" --logic-app-resource-id "/subscriptions/{subs}/resourceGroups/myRg/providers/Microsoft.Logic/workflows/MyAlerts" --trigger-uri "https://xxx.northcentralus.logic.azure.com:443/workflows/xxx/triggers/manual/paths/invoke?api-version=2016-10-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=signature" --action-id "{action-id}" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  - summary: Creates or updates a Fusion alert rule.
+    syntax: az sentinel alert-rule create --fusion-alert-rule etag="{etag}" alert-rule-template-name="{name}" enabled=true --resource-group "myRg" --rule-id "myFirstFusionRule" --workspace-name "myWorkspace"
+  - summary: Creates or updates a MicrosoftSecurityIncidentCreation rule.
+    syntax: az sentinel alert-rule create --microsoft-security-incident-creation-alert-rule etag="{etag}" product-filter="Microsoft Cloud App Security" display-name="testing displayname" enabled=true --resource-group "myRg" --rule-id "microsoftSecurityIncidentCreationRuleExample" --workspace-name "myWorkspace"
+  - summary: Creates or updates a Scheduled alert rule.
+    syntax: az sentinel alert-rule create --scheduled-alert-rule etag="{etag}" query="ProtectionStatus | extend HostCustomEntity = Computer | extend IPCustomEntity = ComputerIP_Hidden" query-frequency="PT1H" query-period="P2DT1H30M" severity="High" trigger-operator="GreaterThan" trigger-threshold=0 description="" display-name="Rule2" enabled=true suppression-duration="PT1H" suppression-enabled=false tactics="Persistence" tactics="LateralMovement" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --action-id
+    summary: Action ID.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --fusion-alert-rule
+    summary: Represents Fusion alert rule.
+    description: >-
+      Usage: --fusion-alert-rule alert-rule-template-name=XX enabled=XX kind=XX etag=XX
+
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --logic-app-resource-id
+    summary: Logic App Resource Id, /subscriptions/{my-subscription}/resourceGroups/{my-resource-group}/providers/Microsoft.Logic/workflows/{my-workflow-id}.
+    description: ''
+  - name: --microsoft-security-incident-creation-alert-rule
+    summary: Represents MicrosoftSecurityIncidentCreation rule.
+    description: >-
+      Usage: --microsoft-security-incident-creation-alert-rule display-names-filter=XX display-names-exclude-filter=XX product-filter=XX severities-filter=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX kind=XX etag=XX
+
+
+      display-names-filter: the alerts' displayNames on which the cases will be generated
+
+      display-names-exclude-filter: the alerts' displayNames on which the cases will not be generated
+
+      product-filter: The alerts' productName on which the cases will be generated
+
+      severities-filter: the alerts' severities on which the cases will be generated
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --scheduled-alert-rule
+    summary: Represents scheduled alert rule.
+    description: >-
+      Usage: --scheduled-alert-rule query=XX query-frequency=XX query-period=XX severity=XX trigger-operator=XX trigger-threshold=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX suppression-duration=XX suppression-enabled=XX tactics=XX kind=XX etag=XX
+
+
+      query: The query that creates alerts for this rule.
+
+      query-frequency: The frequency (in ISO 8601 duration format) for this alert rule to run.
+
+      query-period: The period (in ISO 8601 duration format) that this alert rule looks at.
+
+      severity: The severity for alerts created by this alert rule.
+
+      trigger-operator: The operation against the threshold that triggers alert rule.
+
+      trigger-threshold: The threshold triggers this alert rule.
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      suppression-duration: The suppression (in ISO 8601 duration format) to wait since last time this alert rule been triggered.
+
+      suppression-enabled: Determines whether the suppression for this alert rule is enabled or disabled.
+
+      tactics: The tactics of the alert rule
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --trigger-uri
+    summary: Logic App Callback URL for this specific workflow.
+    description: ''
+- uid: az_sentinel_alert-rule_delete
+  name: az sentinel alert-rule delete
+  summary: Delete the action of alert rule. And Delete the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule delete --resource-group
+                                  --rule-id
+                                  --workspace-name
+                                  [--action-id]
+                                  [--yes]
+  examples:
+  - summary: Delete an action of alert rule.
+    syntax: az sentinel alert-rule delete --action-id "{action-id}" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  - summary: Delete an alert rule.
+    syntax: az sentinel alert-rule delete --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --action-id
+    summary: Action ID.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_alert-rule_get-action
+  name: az sentinel alert-rule get-action
+  summary: Gets the action of alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule get-action --action-id
+                                      --resource-group
+                                      --rule-id
+                                      --workspace-name
+  examples:
+  - summary: Get an action of alert rule.
+    syntax: az sentinel alert-rule get-action --action-id "{action-id}" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --action-id
+    summary: Action ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule_list
+  name: az sentinel alert-rule list
+  summary: Gets all alert rules.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule list --resource-group
+                                --workspace-name
+  examples:
+  - summary: Get all alert rules.
+    syntax: az sentinel alert-rule list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule_show
+  name: az sentinel alert-rule show
+  summary: Gets the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule show --resource-group
+                                --rule-id
+                                --workspace-name
+  examples:
+  - summary: Get an alert rule.
+    syntax: az sentinel alert-rule show --resource-group "myRg" --rule-id "myFirstFusionRule" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule_update
+  name: az sentinel alert-rule update
+  summary: Update the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule update --resource-group
+                                  --rule-id
+                                  --workspace-name
+                                  [--add]
+                                  [--force-string]
+                                  [--fusion-alert-rule]
+                                  [--microsoft-security-incident-creation-alert-rule]
+                                  [--remove]
+                                  [--scheduled-alert-rule]
+                                  [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fusion-alert-rule
+    summary: Represents Fusion alert rule.
+    description: >-
+      Usage: --fusion-alert-rule alert-rule-template-name=XX enabled=XX kind=XX etag=XX
+
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --microsoft-security-incident-creation-alert-rule
+    summary: Represents MicrosoftSecurityIncidentCreation rule.
+    description: >-
+      Usage: --microsoft-security-incident-creation-alert-rule display-names-filter=XX display-names-exclude-filter=XX product-filter=XX severities-filter=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX kind=XX etag=XX
+
+
+      display-names-filter: the alerts' displayNames on which the cases will be generated
+
+      display-names-exclude-filter: the alerts' displayNames on which the cases will not be generated
+
+      product-filter: The alerts' productName on which the cases will be generated
+
+      severities-filter: the alerts' severities on which the cases will be generated
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --scheduled-alert-rule
+    summary: Represents scheduled alert rule.
+    description: >-
+      Usage: --scheduled-alert-rule query=XX query-frequency=XX query-period=XX severity=XX trigger-operator=XX trigger-threshold=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX suppression-duration=XX suppression-enabled=XX tactics=XX kind=XX etag=XX
+
+
+      query: The query that creates alerts for this rule.
+
+      query-frequency: The frequency (in ISO 8601 duration format) for this alert rule to run.
+
+      query-period: The period (in ISO 8601 duration format) that this alert rule looks at.
+
+      severity: The severity for alerts created by this alert rule.
+
+      trigger-operator: The operation against the threshold that triggers alert rule.
+
+      trigger-threshold: The threshold triggers this alert rule.
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      suppression-duration: The suppression (in ISO 8601 duration format) to wait since last time this alert rule been triggered.
+
+      suppression-enabled: Determines whether the suppression for this alert rule is enabled or disabled.
+
+      tactics: The tactics of the alert rule
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_sentinel_alert-rule_create
+- az_sentinel_alert-rule_delete
+- az_sentinel_alert-rule_get-action
+- az_sentinel_alert-rule_list
+- az_sentinel_alert-rule_show
+- az_sentinel_alert-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel alert-rule.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/bookmark.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/bookmark.yml
new file mode 100644
index 0000000000..1b605c0351
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/bookmark.yml
@@ -0,0 +1,252 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_bookmark
+name: az sentinel bookmark
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel bookmark** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel bookmark.
+description: ''
+directCommands:
+- uid: az_sentinel_bookmark_create
+  name: az sentinel bookmark create
+  summary: Create the bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark create --bookmark-id
+                                --resource-group
+                                --workspace-name
+                                [--created]
+                                [--display-name]
+                                [--etag]
+                                [--incident-info]
+                                [--labels]
+                                [--notes]
+                                [--query-result]
+                                [--updated]
+                                [--updated-by-object-id]
+                                [-q]
+  examples:
+  - summary: Creates or updates a bookmark.
+    syntax: az sentinel bookmark create --etag "{etag}" --created "2019-01-01T13:15:30Z" --display-name "My bookmark" --labels "Tag1" --labels "Tag2" --notes "Found a suspicious activity" -q "SecurityEvent | where TimeGenerated > ago(1d) and TimeGenerated < ago(2d)" --query-result "Security Event query result" --updated "2019-01-01T13:15:30Z" --bookmark-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time the bookmark was created.
+    description: ''
+  - name: --display-name
+    summary: The display name of the bookmark.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --incident-info
+    summary: Describes an incident that relates to bookmark.
+    description: >-
+      Usage: --incident-info incident-id=XX severity=XX title=XX relation-name=XX
+
+
+      incident-id: Required. Incident Id
+
+      severity: Required. The severity of the incident
+
+      title: Required. The title of the incident
+
+      relation-name: Required. Relation Name.
+  - name: --labels
+    summary: List of labels relevant to this bookmark.
+    description: ''
+  - name: --notes
+    summary: The notes of the bookmark.
+    description: ''
+  - name: --query-result
+    summary: The query result of the bookmark.
+    description: ''
+  - name: --updated
+    summary: The last time the bookmark was updated.
+    description: ''
+  - name: --updated-by-object-id
+    summary: The object id of the user.
+    description: ''
+  - name: -q
+    summary: The query of the bookmark.
+    description: ''
+- uid: az_sentinel_bookmark_delete
+  name: az sentinel bookmark delete
+  summary: Delete the bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark delete --bookmark-id
+                                --resource-group
+                                --workspace-name
+                                [--yes]
+  examples:
+  - summary: Delete a bookmark.
+    syntax: az sentinel bookmark delete --bookmark-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_bookmark_list
+  name: az sentinel bookmark list
+  summary: Gets all bookmarks.
+  description: ''
+  syntax: >-
+    az sentinel bookmark list --resource-group
+                              --workspace-name
+  examples:
+  - summary: Get all bookmarks.
+    syntax: az sentinel bookmark list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_bookmark_show
+  name: az sentinel bookmark show
+  summary: Gets a bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark show --bookmark-id
+                              --resource-group
+                              --workspace-name
+  examples:
+  - summary: Get a bookmark.
+    syntax: az sentinel bookmark show --bookmark-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_bookmark_update
+  name: az sentinel bookmark update
+  summary: Update the bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark update --bookmark-id
+                                --resource-group
+                                --workspace-name
+                                [--created]
+                                [--display-name]
+                                [--etag]
+                                [--incident-info]
+                                [--labels]
+                                [--notes]
+                                [--query-result]
+                                [--updated]
+                                [--updated-by-object-id]
+                                [-q]
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time the bookmark was created.
+    description: ''
+  - name: --display-name
+    summary: The display name of the bookmark.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --incident-info
+    summary: Describes an incident that relates to bookmark.
+    description: >-
+      Usage: --incident-info incident-id=XX severity=XX title=XX relation-name=XX
+
+
+      incident-id: Required. Incident Id
+
+      severity: Required. The severity of the incident
+
+      title: Required. The title of the incident
+
+      relation-name: Required. Relation Name.
+  - name: --labels
+    summary: List of labels relevant to this bookmark.
+    description: ''
+  - name: --notes
+    summary: The notes of the bookmark.
+    description: ''
+  - name: --query-result
+    summary: The query result of the bookmark.
+    description: ''
+  - name: --updated
+    summary: The last time the bookmark was updated.
+    description: ''
+  - name: --updated-by-object-id
+    summary: The object id of the user.
+    description: ''
+  - name: -q
+    summary: The query of the bookmark.
+    description: ''
+commands:
+- az_sentinel_bookmark_create
+- az_sentinel_bookmark_delete
+- az_sentinel_bookmark_list
+- az_sentinel_bookmark_show
+- az_sentinel_bookmark_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel bookmark.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/data-connector.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/data-connector.yml
new file mode 100644
index 0000000000..76fdbbaedd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/data-connector.yml
@@ -0,0 +1,400 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_data-connector
+name: az sentinel data-connector
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel data-connector** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel data-connector.
+description: ''
+directCommands:
+- uid: az_sentinel_data-connector_create
+  name: az sentinel data-connector create
+  summary: Create the data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector create --data-connector-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--aad-data-connector]
+                                      [--aatp-data-connector]
+                                      [--asc-data-connector]
+                                      [--aws-cloud-trail-data-connector]
+                                      [--mcas-data-connector]
+                                      [--mdatp-data-connector]
+                                      [--office-data-connector]
+                                      [--ti-data-connector]
+  examples:
+  - summary: Creates or updates an Office365 data connector.
+    syntax: az sentinel data-connector create --office-data-connector etag="{etag}"                tenant-id="{tenant-id}" --data-connector-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --aad-data-connector
+    summary: Represents AAD (Azure Active Directory) data connector.
+    description: >-
+      Usage: --aad-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aatp-data-connector
+    summary: Represents AATP (Azure Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --aatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --asc-data-connector
+    summary: Represents ASC (Azure Security Center) data connector.
+    description: >-
+      Usage: --asc-data-connector subscription-id=XX state=XX kind=XX etag=XX
+
+
+      subscription-id: The subscription id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aws-cloud-trail-data-connector
+    summary: Represents Amazon Web Services CloudTrail data connector.
+    description: >-
+      Usage: --aws-cloud-trail-data-connector aws-role-arn=XX state=XX kind=XX etag=XX
+
+
+      aws-role-arn: The Aws Role Arn (with CloudTrailReadOnly policy) that is used to access the Aws account.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --mcas-data-connector
+    summary: Represents MCAS (Microsoft Cloud App Security) data connector.
+    description: >-
+      Usage: --mcas-data-connector tenant-id=XX state-data-types-alerts-state=XX state-data-types-discovery-logs-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-alerts-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-discovery-logs-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --mdatp-data-connector
+    summary: Represents MDATP (Microsoft Defender Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --mdatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --office-data-connector
+    summary: Represents office data connector.
+    description: >-
+      Usage: --office-data-connector tenant-id=XX state-data-types-share-point-state=XX state-data-types-exchange-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-share-point-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-exchange-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --ti-data-connector
+    summary: Represents threat intelligence data connector.
+    description: >-
+      Usage: --ti-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+- uid: az_sentinel_data-connector_delete
+  name: az sentinel data-connector delete
+  summary: Delete the data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector delete --data-connector-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--yes]
+  examples:
+  - summary: Delete a data connector.
+    syntax: az sentinel data-connector delete --data-connector-id "{id}" --resource-group "myRg"                --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_data-connector_list
+  name: az sentinel data-connector list
+  summary: Gets all data connectors.
+  description: ''
+  syntax: >-
+    az sentinel data-connector list --resource-group
+                                    --workspace-name
+  examples:
+  - summary: Get all data connectors.
+    syntax: az sentinel data-connector list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_data-connector_show
+  name: az sentinel data-connector show
+  summary: Gets a data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector show --data-connector-id
+                                    --resource-group
+                                    --workspace-name
+  examples:
+  - summary: Get a data connector.
+    syntax: az sentinel data-connector show --data-connector-id "{id}" --resource-group "myRg"                --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_data-connector_update
+  name: az sentinel data-connector update
+  summary: Update the data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector update --data-connector-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--aad-data-connector]
+                                      [--aatp-data-connector]
+                                      [--add]
+                                      [--asc-data-connector]
+                                      [--aws-cloud-trail-data-connector]
+                                      [--force-string]
+                                      [--mcas-data-connector]
+                                      [--mdatp-data-connector]
+                                      [--office-data-connector]
+                                      [--remove]
+                                      [--set]
+                                      [--ti-data-connector]
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --aad-data-connector
+    summary: Represents AAD (Azure Active Directory) data connector.
+    description: >-
+      Usage: --aad-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aatp-data-connector
+    summary: Represents AATP (Azure Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --aatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --asc-data-connector
+    summary: Represents ASC (Azure Security Center) data connector.
+    description: >-
+      Usage: --asc-data-connector subscription-id=XX state=XX kind=XX etag=XX
+
+
+      subscription-id: The subscription id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aws-cloud-trail-data-connector
+    summary: Represents Amazon Web Services CloudTrail data connector.
+    description: >-
+      Usage: --aws-cloud-trail-data-connector aws-role-arn=XX state=XX kind=XX etag=XX
+
+
+      aws-role-arn: The Aws Role Arn (with CloudTrailReadOnly policy) that is used to access the Aws account.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --mcas-data-connector
+    summary: Represents MCAS (Microsoft Cloud App Security) data connector.
+    description: >-
+      Usage: --mcas-data-connector tenant-id=XX state-data-types-alerts-state=XX state-data-types-discovery-logs-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-alerts-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-discovery-logs-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --mdatp-data-connector
+    summary: Represents MDATP (Microsoft Defender Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --mdatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --office-data-connector
+    summary: Represents office data connector.
+    description: >-
+      Usage: --office-data-connector tenant-id=XX state-data-types-share-point-state=XX state-data-types-exchange-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-share-point-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-exchange-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --ti-data-connector
+    summary: Represents threat intelligence data connector.
+    description: >-
+      Usage: --ti-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+commands:
+- az_sentinel_data-connector_create
+- az_sentinel_data-connector_delete
+- az_sentinel_data-connector_list
+- az_sentinel_data-connector_show
+- az_sentinel_data-connector_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel data-connector.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/incident-comment.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/incident-comment.yml
new file mode 100644
index 0000000000..6318b8a8fd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/incident-comment.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_incident-comment
+name: az sentinel incident-comment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel incident-comment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel incident-comment.
+description: ''
+directCommands:
+- uid: az_sentinel_incident-comment_create
+  name: az sentinel incident-comment create
+  summary: Creates the incident comment.
+  description: ''
+  syntax: >-
+    az sentinel incident-comment create --incident-comment-id
+                                        --incident-id
+                                        --resource-group
+                                        --workspace-name
+                                        [--message]
+  examples:
+  - summary: Creates an incident comment.
+    syntax: az sentinel incident-comment create --message "Some message" --incident-comment-id "4bb36b7b-26ff-4d1c-9cbe-0d8ab3da0014" --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-comment-id
+    summary: Incident comment ID.
+    description: ''
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --message
+    summary: The comment message.
+    description: ''
+- uid: az_sentinel_incident-comment_list
+  name: az sentinel incident-comment list
+  summary: Gets all incident comments.
+  description: ''
+  syntax: >-
+    az sentinel incident-comment list --incident-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--filter]
+                                      [--orderby]
+                                      [--skip-token]
+                                      [--top]
+  examples:
+  - summary: Get all incident comments.
+    syntax: az sentinel incident-comment list --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: Filters the results, based on a Boolean condition. Optional.
+    description: ''
+  - name: --orderby
+    summary: Sorts the results. Optional.
+    description: ''
+  - name: --skip-token
+    summary: Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.
+    description: ''
+  - name: --top
+    summary: Returns only the first n results. Optional.
+    description: ''
+- uid: az_sentinel_incident-comment_show
+  name: az sentinel incident-comment show
+  summary: Gets an incident comment.
+  description: ''
+  syntax: >-
+    az sentinel incident-comment show --incident-comment-id
+                                      --incident-id
+                                      --resource-group
+                                      --workspace-name
+  examples:
+  - summary: Get an incident comment.
+    syntax: az sentinel incident-comment show --incident-comment-id "{comment-id}" --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-comment-id
+    summary: Incident comment ID.
+    description: ''
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+commands:
+- az_sentinel_incident-comment_create
+- az_sentinel_incident-comment_list
+- az_sentinel_incident-comment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel incident-comment.
diff --git a/2017-03-09-profile/docs-ref-autogen/sentinel/incident.yml b/2017-03-09-profile/docs-ref-autogen/sentinel/incident.yml
new file mode 100644
index 0000000000..c267f311fd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sentinel/incident.yml
@@ -0,0 +1,307 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_incident
+name: az sentinel incident
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel incident** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel incident.
+description: ''
+directCommands:
+- uid: az_sentinel_incident_create
+  name: az sentinel incident create
+  summary: Create the incident.
+  description: ''
+  syntax: >-
+    az sentinel incident create --incident-id
+                                --resource-group
+                                --workspace-name
+                                [--classification {BenignPositive, FalsePositive, TruePositive, Undetermined}]
+                                [--classification-comment]
+                                [--classification-reason {InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected}]
+                                [--description]
+                                [--etag]
+                                [--first-activity-time-utc]
+                                [--labels]
+                                [--last-activity-time-utc]
+                                [--owner]
+                                [--severity {High, Informational, Low, Medium}]
+                                [--status {Active, Closed, New}]
+                                [--title]
+  examples:
+  - summary: Creates or updates an incident.
+    syntax: az sentinel incident create --etag "{etag}" --description "This is a demo incident" --classification "FalsePositive" --classification-comment "Not a malicious activity" --classification-reason "IncorrectAlertLogic" --first-activity-time-utc "2019-01-01T13:00:30Z" --last-activity-time-utc "2019-01-01T13:05:30Z" --owner object-id="{oid}" --severity "High" --status "Closed" --title "My incident" --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --classification
+    parameterValueGroup: BenignPositive, FalsePositive, TruePositive, Undetermined
+    summary: The reason the incident was closed.
+    description: ''
+  - name: --classification-comment
+    summary: Describes the reason the incident was closed.
+    description: ''
+  - name: --classification-reason
+    parameterValueGroup: InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected
+    summary: The classification reason the incident was closed with.
+    description: ''
+  - name: --description
+    summary: The description of the incident.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --first-activity-time-utc
+    summary: The time of the first activity in the incident.
+    description: ''
+  - name: --labels
+    summary: List of labels relevant to this incident.
+    description: >-
+      Usage: --labels label-name=XX
+
+
+      label-name: Required. The name of the label
+
+
+      Multiple actions can be specified by using more than one --labels argument.
+  - name: --last-activity-time-utc
+    summary: The time of the last activity in the incident.
+    description: ''
+  - name: --owner
+    summary: Describes a user that the incident is assigned to.
+    description: >-
+      Usage: --owner email=XX assigned-to=XX object-id=XX user-principal-name=XX
+
+
+      email: The email of the user the incident is assigned to.
+
+      assigned-to: The name of the user the incident is assigned to.
+
+      object-id: The object id of the user the incident is assigned to.
+
+      user-principal-name: The user principal name of the user the incident is assigned to.
+  - name: --severity
+    parameterValueGroup: High, Informational, Low, Medium
+    summary: The severity of the incident.
+    description: ''
+  - name: --status
+    parameterValueGroup: Active, Closed, New
+    summary: The status of the incident.
+    description: ''
+  - name: --title
+    summary: The title of the incident.
+    description: ''
+- uid: az_sentinel_incident_delete
+  name: az sentinel incident delete
+  summary: Delete the incident.
+  description: ''
+  syntax: >-
+    az sentinel incident delete --incident-id
+                                --resource-group
+                                --workspace-name
+                                [--yes]
+  examples:
+  - summary: Delete an incident.
+    syntax: az sentinel incident delete --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_incident_list
+  name: az sentinel incident list
+  summary: Gets all incidents.
+  description: ''
+  syntax: >-
+    az sentinel incident list --resource-group
+                              --workspace-name
+                              [--filter]
+                              [--orderby]
+                              [--skip-token]
+                              [--top]
+  examples:
+  - summary: Get all incidents.
+    syntax: az sentinel incident list --orderby "properties/createdTimeUtc desc" --top 1 --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: Filters the results, based on a Boolean condition. Optional.
+    description: ''
+  - name: --orderby
+    summary: Sorts the results. Optional.
+    description: ''
+  - name: --skip-token
+    summary: Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.
+    description: ''
+  - name: --top
+    summary: Returns only the first n results. Optional.
+    description: ''
+- uid: az_sentinel_incident_show
+  name: az sentinel incident show
+  summary: Gets an incident.
+  description: ''
+  syntax: >-
+    az sentinel incident show --incident-id
+                              --resource-group
+                              --workspace-name
+  examples:
+  - summary: Get an incident.
+    syntax: az sentinel incident show --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_incident_update
+  name: az sentinel incident update
+  summary: Update the incident.
+  description: ''
+  syntax: >-
+    az sentinel incident update --incident-id
+                                --resource-group
+                                --workspace-name
+                                [--classification {BenignPositive, FalsePositive, TruePositive, Undetermined}]
+                                [--classification-comment]
+                                [--classification-reason {InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected}]
+                                [--description]
+                                [--etag]
+                                [--first-activity-time-utc]
+                                [--labels]
+                                [--last-activity-time-utc]
+                                [--owner]
+                                [--severity {High, Informational, Low, Medium}]
+                                [--status {Active, Closed, New}]
+                                [--title]
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --classification
+    parameterValueGroup: BenignPositive, FalsePositive, TruePositive, Undetermined
+    summary: The reason the incident was closed.
+    description: ''
+  - name: --classification-comment
+    summary: Describes the reason the incident was closed.
+    description: ''
+  - name: --classification-reason
+    parameterValueGroup: InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected
+    summary: The classification reason the incident was closed with.
+    description: ''
+  - name: --description
+    summary: The description of the incident.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --first-activity-time-utc
+    summary: The time of the first activity in the incident.
+    description: ''
+  - name: --labels
+    summary: List of labels relevant to this incident.
+    description: >-
+      Usage: --labels label-name=XX
+
+
+      label-name: Required. The name of the label
+
+
+      Multiple actions can be specified by using more than one --labels argument.
+  - name: --last-activity-time-utc
+    summary: The time of the last activity in the incident.
+    description: ''
+  - name: --owner
+    summary: Describes a user that the incident is assigned to.
+    description: >-
+      Usage: --owner email=XX assigned-to=XX object-id=XX user-principal-name=XX
+
+
+      email: The email of the user the incident is assigned to.
+
+      assigned-to: The name of the user the incident is assigned to.
+
+      object-id: The object id of the user the incident is assigned to.
+
+      user-principal-name: The user principal name of the user the incident is assigned to.
+  - name: --severity
+    parameterValueGroup: High, Informational, Low, Medium
+    summary: The severity of the incident.
+    description: ''
+  - name: --status
+    parameterValueGroup: Active, Closed, New
+    summary: The status of the incident.
+    description: ''
+  - name: --title
+    summary: The title of the incident.
+    description: ''
+commands:
+- az_sentinel_incident_create
+- az_sentinel_incident_delete
+- az_sentinel_incident_list
+- az_sentinel_incident_show
+- az_sentinel_incident_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel incident.
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/API Management.yml b/2017-03-09-profile/docs-ref-autogen/service-page/API Management.yml
new file mode 100644
index 0000000000..026202def3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/API Management.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-API_Management
+name: API Management
+commands:
+- az_apim
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure API for FHIR.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure API for FHIR.yml
new file mode 100644
index 0000000000..1c533bfc6a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure API for FHIR.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_API_for_FHIR
+name: Azure API for FHIR
+commands:
+- az_healthcareapis
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Active Directory.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Active Directory.yml
new file mode 100644
index 0000000000..e400d19d89
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Active Directory.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Active_Directory
+name: Azure Active Directory
+commands:
+- az_ad
+- az_identity
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Advisor.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Advisor.yml
new file mode 100644
index 0000000000..0139838877
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Advisor.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Advisor
+name: Azure Advisor
+commands:
+- az_advisor
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure App Configuration.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure App Configuration.yml
new file mode 100644
index 0000000000..3fb8225b0c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure App Configuration.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_App_Configuration
+name: Azure App Configuration
+commands:
+- az_appconfig
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure App Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure App Service.yml
new file mode 100644
index 0000000000..c5b50b25a9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure App Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_App_Service
+name: Azure App Service
+commands:
+- az_appservice
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Application Insights.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Application Insights.yml
new file mode 100644
index 0000000000..ec454b8062
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Application Insights.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Application_Insights
+name: Azure Application Insights
+commands:
+- az_find
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Arc for VMware PrivateCloud.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Arc for VMware PrivateCloud.yml
new file mode 100644
index 0000000000..53afdbd096
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Arc for VMware PrivateCloud.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Arc_for_VMware_PrivateCloud
+name: Azure Arc for VMware PrivateCloud
+commands:
+- az_connectedvmware
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Arc.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Arc.yml
new file mode 100644
index 0000000000..c413ababb4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Arc.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Arc
+name: Azure Arc
+commands:
+- az_connectedmachine
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Artifacts.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Artifacts.yml
new file mode 100644
index 0000000000..575378dd34
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Artifacts.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Artifacts
+name: Azure Artifacts
+commands:
+- az_artifacts
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Attestation.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Attestation.yml
new file mode 100644
index 0000000000..a94703073c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Attestation.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Attestation
+name: Azure Attestation
+commands:
+- az_attestation
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Automation.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Automation.yml
new file mode 100644
index 0000000000..f216e23704
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Automation.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Automation
+name: Azure Automation
+commands:
+- az_automation
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Backup.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Backup.yml
new file mode 100644
index 0000000000..a9fba9eb4c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Backup.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Backup
+name: Azure Backup
+commands:
+- az_backup
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Batch.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Batch.yml
new file mode 100644
index 0000000000..a38b6de3f9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Batch.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Batch
+name: Azure Batch
+commands:
+- az_batch
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Blockchain.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Blockchain.yml
new file mode 100644
index 0000000000..1fda3d4d4e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Blockchain.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Blockchain
+name: Azure Blockchain
+commands:
+- az_blockchain
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Blueprint.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Blueprint.yml
new file mode 100644
index 0000000000..48ed016176
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Blueprint.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Blueprint
+name: Azure Blueprint
+commands:
+- az_blueprint
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Boards.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Boards.yml
new file mode 100644
index 0000000000..d60431267d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Boards.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Boards
+name: Azure Boards
+commands:
+- az_boards
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Bot Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Bot Service.yml
new file mode 100644
index 0000000000..219ce56ba5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Bot Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Bot_Service
+name: Azure Bot Service
+commands:
+- az_bot
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Bot.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Bot.yml
new file mode 100644
index 0000000000..72eb95c738
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Bot.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Bot
+name: Azure Bot
+commands:
+- az_healthbot
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure CLI.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure CLI.yml
new file mode 100644
index 0000000000..3d16597f0b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure CLI.yml	
@@ -0,0 +1,25 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_CLI
+name: Azure CLI
+commands:
+- az_account
+- az_alias
+- az_cache
+- az_cli-translator
+- az_cloud
+- az_config
+- az_configure
+- az_demo
+- az_extension
+- az_feedback
+- az_fzf
+- az_interactive
+- az_local-context
+- az_login
+- az_logout
+- az_next
+- az_rest
+- az_self-test
+- az_upgrade
+- az_version
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cache for Redis.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cache for Redis.yml
new file mode 100644
index 0000000000..6f4bf4590b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cache for Redis.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cache_for_Redis
+name: Azure Cache for Redis
+commands:
+- az_redis
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cloud Services (extended support).yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cloud Services (extended support).yml
new file mode 100644
index 0000000000..fcc9172d48
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cloud Services (extended support).yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cloud_Services_(extended_support)
+name: Azure Cloud Services (extended support)
+commands:
+- az_cloud-service
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cognitive Search.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cognitive Search.yml
new file mode 100644
index 0000000000..403be5e7a5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cognitive Search.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cognitive_Search
+name: Azure Cognitive Search
+commands:
+- az_search
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cognitive Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cognitive Service.yml
new file mode 100644
index 0000000000..9889d5a61d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cognitive Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cognitive_Service
+name: Azure Cognitive Service
+commands:
+- az_cognitiveservices
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Communication Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Communication Service.yml
new file mode 100644
index 0000000000..0cc8464e8a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Communication Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Communication_Service
+name: Azure Communication Service
+commands:
+- az_communication
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Instances.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Instances.yml
new file mode 100644
index 0000000000..857865fe17
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Instances.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Container_Instances
+name: Azure Container Instances
+commands:
+- az_container
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Registries.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Registries.yml
new file mode 100644
index 0000000000..9a82832b1b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Registries.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Container_Registries
+name: Azure Container Registries
+commands:
+- az_acr
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Services.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Services.yml
new file mode 100644
index 0000000000..fc0a0995cf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Container Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Container_Services
+name: Azure Container Services
+commands:
+- az_acs
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cosmos DB.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cosmos DB.yml
new file mode 100644
index 0000000000..84a1452f05
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cosmos DB.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cosmos_DB
+name: Azure Cosmos DB
+commands:
+- az_cosmosdb
+- az_managed-cassandra
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cost Management + Billing.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cost Management + Billing.yml
new file mode 100644
index 0000000000..2e7e6f4fec
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Cost Management + Billing.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cost_Management_+_Billing
+name: Azure Cost Management + Billing
+commands:
+- az_billing
+- az_consumption
+- az_costmanagement
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Custom Providers.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Custom Providers.yml
new file mode 100644
index 0000000000..a617834136
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Custom Providers.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Custom_Providers
+name: Azure Custom Providers
+commands:
+- az_custom-providers
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Explorer (Kusto).yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Explorer (Kusto).yml
new file mode 100644
index 0000000000..19dd397078
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Explorer (Kusto).yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Explorer_(Kusto)
+name: Azure Data Explorer (Kusto)
+commands:
+- az_kusto
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Explorer.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Explorer.yml
new file mode 100644
index 0000000000..b3fbf9b5b9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Explorer.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Explorer
+name: Azure Data Explorer
+commands:
+- az_kusto
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Factory.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Factory.yml
new file mode 100644
index 0000000000..e8b588b662
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Factory.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Factory
+name: Azure Data Factory
+commands:
+- az_datafactory
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Lake Analytics.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Lake Analytics.yml
new file mode 100644
index 0000000000..eaf6f6169d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Lake Analytics.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Lake_Analytics
+name: Azure Data Lake Analytics
+commands:
+- az_dla
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Lake Storage.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Lake Storage.yml
new file mode 100644
index 0000000000..208ec81824
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Lake Storage.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Lake_Storage
+name: Azure Data Lake Storage
+commands:
+- az_dls
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Migration.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Migration.yml
new file mode 100644
index 0000000000..acd6ef254d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Migration.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Migration
+name: Azure Data Migration
+commands:
+- az_dms
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Share.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Share.yml
new file mode 100644
index 0000000000..7ee5f914f5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Data Share.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Share
+name: Azure Data Share
+commands:
+- az_datashare
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database Migration Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database Migration Service.yml
new file mode 100644
index 0000000000..dfc4f019b1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database Migration Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_Migration_Service
+name: Azure Database Migration Service
+commands:
+- az_dms
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for MariaDB.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for MariaDB.yml
new file mode 100644
index 0000000000..c0074f76b4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for MariaDB.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_for_MariaDB
+name: Azure Database for MariaDB
+commands:
+- az_mariadb
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for MySQL.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for MySQL.yml
new file mode 100644
index 0000000000..417f7086e8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for MySQL.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_for_MySQL
+name: Azure Database for MySQL
+commands:
+- az_mysql
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for PostgreSQL.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for PostgreSQL.yml
new file mode 100644
index 0000000000..9d591b253e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Database for PostgreSQL.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_for_PostgreSQL
+name: Azure Database for PostgreSQL
+commands:
+- az_postgres
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Databox.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Databox.yml
new file mode 100644
index 0000000000..c21dee6296
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Databox.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Databox
+name: Azure Databox
+commands:
+- az_databox
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Databricks.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Databricks.yml
new file mode 100644
index 0000000000..48a7d09ef4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Databricks.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Databricks
+name: Azure Databricks
+commands:
+- az_databricks
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Dedicated HSM.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Dedicated HSM.yml
new file mode 100644
index 0000000000..fc131a0c99
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Dedicated HSM.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Dedicated_HSM
+name: Azure Dedicated HSM
+commands:
+- az_dedicated-hsm
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure DevOps.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure DevOps.yml
new file mode 100644
index 0000000000..d00cb3fdbe
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure DevOps.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_DevOps
+name: Azure DevOps
+commands:
+- az_devops
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure DevTest Labs.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure DevTest Labs.yml
new file mode 100644
index 0000000000..c8a580ccd6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure DevTest Labs.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_DevTest_Labs
+name: Azure DevTest Labs
+commands:
+- az_lab
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Digital Twins.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Digital Twins.yml
new file mode 100644
index 0000000000..c66c9aaf0f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Digital Twins.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Digital_Twins
+name: Azure Digital Twins
+commands:
+- az_dt
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Disk Pool Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Disk Pool Service.yml
new file mode 100644
index 0000000000..76690b3d4e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Disk Pool Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Disk_Pool_Service
+name: Azure Disk Pool Service
+commands:
+- az_disk-pool
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Disk Storage.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Disk Storage.yml
new file mode 100644
index 0000000000..f0433b2073
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Disk Storage.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Disk_Storage
+name: Azure Disk Storage
+commands:
+- az_disk
+- az_disk-access
+- az_disk-encryption-set
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Event Grid.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Event Grid.yml
new file mode 100644
index 0000000000..c85dd6c3df
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Event Grid.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Event_Grid
+name: Azure Event Grid
+commands:
+- az_eventgrid
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Event Hubs.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Event Hubs.yml
new file mode 100644
index 0000000000..ce37f69506
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Event Hubs.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Event_Hubs
+name: Azure Event Hubs
+commands:
+- az_eventhubs
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure File Sync.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure File Sync.yml
new file mode 100644
index 0000000000..3a7f61a336
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure File Sync.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_File_Sync
+name: Azure File Sync
+commands:
+- az_storagesync
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Front Door.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Front Door.yml
new file mode 100644
index 0000000000..bb14b19e1c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Front Door.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Front_Door
+name: Azure Front Door
+commands:
+- az_afd
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Functions.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Functions.yml
new file mode 100644
index 0000000000..8b7b6509e6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Functions.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Functions
+name: Azure Functions
+commands:
+- az_functionapp
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure HDInsight.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure HDInsight.yml
new file mode 100644
index 0000000000..72973efff3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure HDInsight.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_HDInsight
+name: Azure HDInsight
+commands:
+- az_hdinsight
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure HPC Cache.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure HPC Cache.yml
new file mode 100644
index 0000000000..78a8341845
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure HPC Cache.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_HPC_Cache
+name: Azure HPC Cache
+commands:
+- az_hpc-cache
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure IoT.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure IoT.yml
new file mode 100644
index 0000000000..72720515ba
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure IoT.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_IoT
+name: Azure IoT
+commands:
+- az_iot
+- az_iotcentral
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Key Vault.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Key Vault.yml
new file mode 100644
index 0000000000..13f029142a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Key Vault.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Key_Vault
+name: Azure Key Vault
+commands:
+- az_keyvault
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Configuration Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Configuration Service.yml
new file mode 100644
index 0000000000..8ba4f8dbb3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Configuration Service.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Kubernetes_Configuration_Service
+name: Azure Kubernetes Configuration Service
+commands:
+- az_k8sconfiguration
+- az_k8s-configuration
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Extension Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Extension Service.yml
new file mode 100644
index 0000000000..638de54846
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Extension Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Kubernetes_Extension_Service
+name: Azure Kubernetes Extension Service
+commands:
+- az_k8s-extension
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Service.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Service.yml
new file mode 100644
index 0000000000..f684ca8a1c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Kubernetes Service.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Kubernetes_Service
+name: Azure Kubernetes Service
+commands:
+- az_aks
+- az_connectedk8s
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Lab Services.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Lab Services.yml
new file mode 100644
index 0000000000..236cda57b3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Lab Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Lab_Services
+name: Azure Lab Services
+commands:
+- az_hack
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Logic Apps.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Logic Apps.yml
new file mode 100644
index 0000000000..45f55f6007
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Logic Apps.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Logic_Apps
+name: Azure Logic Apps
+commands:
+- az_logic
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Machine Learning.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Machine Learning.yml
new file mode 100644
index 0000000000..3ee08582c1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Machine Learning.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Machine_Learning
+name: Azure Machine Learning
+commands:
+- az_batchai
+- az_ml
+- az_ml(v1)
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Managed Applications.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Managed Applications.yml
new file mode 100644
index 0000000000..90046988d8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Managed Applications.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Managed_Applications
+name: Azure Managed Applications
+commands:
+- az_managedapp
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Managed Services.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Managed Services.yml
new file mode 100644
index 0000000000..f7ed43c627
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Managed Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Managed_Services
+name: Azure Managed Services
+commands:
+- az_managedservices
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Maps.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Maps.yml
new file mode 100644
index 0000000000..f4be4224d1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Maps.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Maps
+name: Azure Maps
+commands:
+- az_maps
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Marketplace Ordering.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Marketplace Ordering.yml
new file mode 100644
index 0000000000..aa90b05c98
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Marketplace Ordering.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Marketplace_Ordering
+name: Azure Marketplace Ordering
+commands:
+- az_term
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Media Services.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Media Services.yml
new file mode 100644
index 0000000000..cb079b0a4a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Media Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Media_Services
+name: Azure Media Services
+commands:
+- az_ams
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Migrate.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Migrate.yml
new file mode 100644
index 0000000000..2f99d9f75f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Migrate.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Migrate
+name: Azure Migrate
+commands:
+- az_offazure
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Monitor.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Monitor.yml
new file mode 100644
index 0000000000..b06bf2d7eb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Monitor.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Monitor
+name: Azure Monitor
+commands:
+- az_footprint
+- az_monitor
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure NetApp Files.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure NetApp Files.yml
new file mode 100644
index 0000000000..bd856f3f47
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure NetApp Files.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_NetApp_Files
+name: Azure NetApp Files
+commands:
+- az_netappfiles
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Network.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Network.yml
new file mode 100644
index 0000000000..e6b0053c83
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Network.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Network
+name: Azure Network
+commands:
+- az_internet-analyzer
+- az_network
+- az_peering
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Notification Hubs.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Notification Hubs.yml
new file mode 100644
index 0000000000..fcc2db277c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Notification Hubs.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Notification_Hubs
+name: Azure Notification Hubs
+commands:
+- az_notification-hub
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Pipelines.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Pipelines.yml
new file mode 100644
index 0000000000..7d83a4b474
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Pipelines.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Pipelines
+name: Azure Pipelines
+commands:
+- az_pipelines
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Policy.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Policy.yml
new file mode 100644
index 0000000000..a105b6a0d4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Policy.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Policy
+name: Azure Policy
+commands:
+- az_guestconfig
+- az_policy
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Providers.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Providers.yml
new file mode 100644
index 0000000000..13603c1ae5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Providers.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Providers
+name: Azure Providers
+commands:
+- az_providerhub
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Quantum.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Quantum.yml
new file mode 100644
index 0000000000..edf71621fb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Quantum.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Quantum
+name: Azure Quantum
+commands:
+- az_quantum
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Red Hat OpenShift.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Red Hat OpenShift.yml
new file mode 100644
index 0000000000..cd61c33d91
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Red Hat OpenShift.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Red_Hat_OpenShift
+name: Azure Red Hat OpenShift
+commands:
+- az_aro
+- az_openshift
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Relay.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Relay.yml
new file mode 100644
index 0000000000..9995f428b3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Relay.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Relay
+name: Azure Relay
+commands:
+- az_relay
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Remote Rendering.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Remote Rendering.yml
new file mode 100644
index 0000000000..35dc5a52fc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Remote Rendering.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Remote_Rendering
+name: Azure Remote Rendering
+commands:
+- az_remote-rendering-account
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Repos.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Repos.yml
new file mode 100644
index 0000000000..321f7e055b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Repos.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Repos
+name: Azure Repos
+commands:
+- az_repos
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Reservations.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Reservations.yml
new file mode 100644
index 0000000000..2b8aab196d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Reservations.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Reservations
+name: Azure Reservations
+commands:
+- az_reservations
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Graph.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Graph.yml
new file mode 100644
index 0000000000..e613e02da1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Graph.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Resource_Graph
+name: Azure Resource Graph
+commands:
+- az_graph
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Manager.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Manager.yml
new file mode 100644
index 0000000000..9eb37dd7a8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Manager.yml	
@@ -0,0 +1,14 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Resource_Manager
+name: Azure Resource Manager
+commands:
+- az_deployment
+- az_deploymentmanager
+- az_deployment-scripts
+- az_group
+- az_lock
+- az_provider
+- az_resource
+- az_tag
+- az_ts
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Mover.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Mover.yml
new file mode 100644
index 0000000000..5d963a4ab0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Resource Mover.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Resource_Mover
+name: Azure Resource Mover
+commands:
+- az_resource-mover
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure SQL Server.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure SQL Server.yml
new file mode 100644
index 0000000000..9a3ee066a7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure SQL Server.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_SQL_Server
+name: Azure SQL Server
+commands:
+- az_sql
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure SQL.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure SQL.yml
new file mode 100644
index 0000000000..afa5a88322
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure SQL.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_SQL
+name: Azure SQL
+commands:
+- az_sql
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Security Center.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Security Center.yml
new file mode 100644
index 0000000000..2275d0b973
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Security Center.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Security_Center
+name: Azure Security Center
+commands:
+- az_security
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Sentinel.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Sentinel.yml
new file mode 100644
index 0000000000..3dc2f1c250
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Sentinel.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Sentinel
+name: Azure Sentinel
+commands:
+- az_sentinel
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Bus Messaging.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Bus Messaging.yml
new file mode 100644
index 0000000000..8f45721300
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Bus Messaging.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Service_Bus_Messaging
+name: Azure Service Bus Messaging
+commands:
+- az_servicebus
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Fabric Mesh.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Fabric Mesh.yml
new file mode 100644
index 0000000000..889e25961b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Fabric Mesh.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Service_Fabric_Mesh
+name: Azure Service Fabric Mesh
+commands:
+- az_mesh
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Fabric.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Fabric.yml
new file mode 100644
index 0000000000..07a6e2b3a4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Service Fabric.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Service_Fabric
+name: Azure Service Fabric
+commands:
+- az_sf
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure SignalR.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure SignalR.yml
new file mode 100644
index 0000000000..4f5711810d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure SignalR.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_SignalR
+name: Azure SignalR
+commands:
+- az_signalr
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Spatial Anchors.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Spatial Anchors.yml
new file mode 100644
index 0000000000..9960e968dc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Spatial Anchors.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Spatial_Anchors
+name: Azure Spatial Anchors
+commands:
+- az_spatial-anchors-account
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Spring Cloud.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Spring Cloud.yml
new file mode 100644
index 0000000000..2fccc61809
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Spring Cloud.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Spring_Cloud
+name: Azure Spring Cloud
+commands:
+- az_spring-cloud
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stack Edge.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stack Edge.yml
new file mode 100644
index 0000000000..df3253f32e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stack Edge.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Stack_Edge
+name: Azure Stack Edge
+commands:
+- az_databoxedge
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stack HCI.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stack HCI.yml
new file mode 100644
index 0000000000..4af5298c3e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stack HCI.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Stack_HCI
+name: Azure Stack HCI
+commands:
+- az_stack-hci
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Storage.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Storage.yml
new file mode 100644
index 0000000000..43a5079d76
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Storage.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Storage
+name: Azure Storage
+commands:
+- az_import-export
+- az_snapshot
+- az_storage
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stream Analytics.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stream Analytics.yml
new file mode 100644
index 0000000000..2e9a11d5d4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Stream Analytics.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Stream_Analytics
+name: Azure Stream Analytics
+commands:
+- az_stream-analytics
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Support.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Support.yml
new file mode 100644
index 0000000000..f0bdab06d2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Support.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Support
+name: Azure Support
+commands:
+- az_support
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Synapse Analytics.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Synapse Analytics.yml
new file mode 100644
index 0000000000..882cdadd8d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Synapse Analytics.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Synapse_Analytics
+name: Azure Synapse Analytics
+commands:
+- az_synapse
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Time Series Insights.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Time Series Insights.yml
new file mode 100644
index 0000000000..fbee1d484a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Time Series Insights.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Time_Series_Insights
+name: Azure Time Series Insights
+commands:
+- az_tsi
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure VMWare Solution.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure VMWare Solution.yml
new file mode 100644
index 0000000000..7a069d488a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure VMWare Solution.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_VMWare_Solution
+name: Azure VMWare Solution
+commands:
+- az_csvmware
+- az_vmware
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Virtual Machine scale sets.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Virtual Machine scale sets.yml
new file mode 100644
index 0000000000..07d71301b0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Virtual Machine scale sets.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Virtual_Machine_scale_sets
+name: Azure Virtual Machine scale sets
+commands:
+- az_vmss
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Virtual Machines.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Virtual Machines.yml
new file mode 100644
index 0000000000..33a95ecbca
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Virtual Machines.yml	
@@ -0,0 +1,13 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Virtual_Machines
+name: Azure Virtual Machines
+commands:
+- az_desktopvirtualization
+- az_image
+- az_maintenance
+- az_ppg
+- az_sig
+- az_ssh
+- az_sshkey
+- az_vm
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Web Apps.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Web Apps.yml
new file mode 100644
index 0000000000..d0c0d8515e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Web Apps.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Web_Apps
+name: Azure Web Apps
+commands:
+- az_staticwebapp
+- az_webapp
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure Web PubSub.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Web PubSub.yml
new file mode 100644
index 0000000000..e538369aa7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure Web PubSub.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Web_PubSub
+name: Azure Web PubSub
+commands:
+- az_webpubsub
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure portal.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure portal.yml
new file mode 100644
index 0000000000..e4237e56a5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure portal.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Portal
+name: Azure Portal
+commands:
+- az_portal
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure resource providers.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure resource providers.yml
new file mode 100644
index 0000000000..8157908727
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure resource providers.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_resource_providers
+name: Azure resource providers
+commands:
+- az_feature
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Azure role-based access Control.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Azure role-based access Control.yml
new file mode 100644
index 0000000000..bdacbd8a01
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Azure role-based access Control.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_role-based_access_Control
+name: Azure role-based access Control
+commands:
+- az_role
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Bicep.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Bicep.yml
new file mode 100644
index 0000000000..e90629469d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Bicep.yml
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Bicep
+name: Bicep
+commands:
+- az_bicep
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Content Delivery Network.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Content Delivery Network.yml
new file mode 100644
index 0000000000..d79c9308a0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Content Delivery Network.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Content_Delivery_Network
+name: Content Delivery Network
+commands:
+- az_cdn
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/List A - Z.yml b/2017-03-09-profile/docs-ref-autogen/service-page/List A - Z.yml
new file mode 100644
index 0000000000..a340122a65
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/List A - Z.yml	
@@ -0,0 +1,128 @@
+### YamlMime:AzureCLIGroup
+uid: sp-List_A_-_Z
+name: All Azure CLI Command Reference List A - Z
+summary: These are all the command groups for Azure CLI 2.0
+commands:
+- az_account
+- az_acr
+- az_ad
+- az_ai-examples
+- az_aks
+- az_alias
+- az_appconfig
+- az_arcappliance
+- az_artifacts
+- az_attestation
+- az_automation
+- az_baremetalinstance
+- az_batch
+- az_bicep
+- az_blockchain
+- az_blueprint
+- az_boards
+- az_cache
+- az_cli-translator
+- az_cloud
+- az_cloud-service
+- az_codespace
+- az_communication
+- az_config
+- az_confluent
+- az_connectedk8s
+- az_connectedmachine
+- az_container
+- az_cosmosdb
+- az_costmanagement
+- az_csvmware
+- az_customlocation
+- az_custom-providers
+- az_databox
+- az_databricks
+- az_datadog
+- az_datafactory
+- az_datashare
+- az_dedicated-hsm
+- az_demo
+- az_deployment
+- az_deployment-scripts
+- az_desktopvirtualization
+- az_devops
+- az_disk-pool
+- az_dms
+- az_dt
+- az_eventgrid
+- az_extension
+- az_footprint
+- az_functionapp
+- az_fzf
+- az_graph
+- az_group
+- az_guestconfig
+- az_hack
+- az_hanainstance
+- az_hdinsight
+- az_healthbot
+- az_healthcareapis
+- az_hpc-cache
+- az_image
+- az_import-export
+- az_internet-analyzer
+- az_iot
+- az_k8sconfiguration
+- az_k8s-configuration
+- az_k8s-extension
+- az_keyvault
+- az_kusto
+- az_local-context
+- az_lock
+- az_logic
+- az_maintenance
+- az_managed-cassandra
+- az_managementpartner
+- az_mesh
+- az_ml(v1)
+- az_ml
+- az_monitor
+- az_mysql
+- az_netappfiles
+- az_network
+- az_notification-hub
+- az_offazure
+- az_peering
+- az_pipelines
+- az_policy
+- az_portal
+- az_postgres
+- az_powerbi
+- az_provider
+- az_providerhub
+- az_quantum
+- az_redisenterprise
+- az_remote-rendering-account
+- az_repos
+- az_resource
+- az_resource-mover
+- az_role
+- az_sapmonitor
+- az_security
+- az_sentinel
+- az_spatial-anchors-account
+- az_spring-cloud
+- az_sql
+- az_ssh
+- az_sshkey
+- az_stack-hci
+- az_storage
+- az_storagesync
+- az_stream-analytics
+- az_support
+- az_synapse
+- az_tag
+- az_term
+- az_tsi
+- az_vm
+- az_vmss
+- az_vmware
+- az_webapp
+- az_webpubsub
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft AI.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft AI.yml
new file mode 100644
index 0000000000..b7eaaa3269
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft AI.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_AI
+name: Microsoft AI
+commands:
+- az_ai-examples
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Partner Network.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Partner Network.yml
new file mode 100644
index 0000000000..3c895a91b9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Partner Network.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_Partner_Network
+name: Microsoft Partner Network
+commands:
+- az_managementpartner
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Partner Services.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Partner Services.yml
new file mode 100644
index 0000000000..eb423cfb6a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Partner Services.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_Partner_Services
+name: Microsoft Partner Services
+commands:
+- az_confluent
+- az_datadog
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Windows.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Windows.yml
new file mode 100644
index 0000000000..78b5971130
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Microsoft Windows.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_Windows
+name: Microsoft Windows
+commands:
+- az_baremetalinstance
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Power BI.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Power BI.yml
new file mode 100644
index 0000000000..febb9c9863
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Power BI.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Power_BI
+name: Power BI
+commands:
+- az_powerbi
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/SAP HANA on Azure.yml b/2017-03-09-profile/docs-ref-autogen/service-page/SAP HANA on Azure.yml
new file mode 100644
index 0000000000..5b587a371a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/SAP HANA on Azure.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-SAP_HANA_on_Azure
+name: SAP HANA on Azure
+commands:
+- az_hanainstance
+- az_sapmonitor
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/service-page/Visual Studio.yml b/2017-03-09-profile/docs-ref-autogen/service-page/Visual Studio.yml
new file mode 100644
index 0000000000..7834ab743b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/service-page/Visual Studio.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Visual_Studio
+name: Visual Studio
+commands:
+- az_codespace
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/spatial-anchors-account.yml b/2017-03-09-profile/docs-ref-autogen/spatial-anchors-account.yml
new file mode 100644
index 0000000000..c3c4b5a96b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spatial-anchors-account.yml
@@ -0,0 +1,232 @@
+### YamlMime:AzureCLIGroup
+uid: az_spatial-anchors-account
+name: az spatial-anchors-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az spatial-anchors-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage spatial anchor account with mixed reality.
+description: ''
+directCommands:
+- uid: az_spatial-anchors-account_create
+  name: az spatial-anchors-account create
+  summary: Create a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account create --name
+                                      --resource-group
+                                      [--kind]
+                                      [--location]
+                                      [--sku]
+                                      [--storage-account-name]
+                                      [--tags]
+  examples:
+  - summary: Create spatial anchor account
+    syntax: az spatial-anchors-account create -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_spatial-anchors-account_delete
+  name: az spatial-anchors-account delete
+  summary: Delete a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account delete --name
+                                      --resource-group
+  examples:
+  - summary: Delete spatial anchors account
+    syntax: az spatial-anchors-account delete -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spatial-anchors-account_list
+  name: az spatial-anchors-account list
+  summary: List resources by resource group and list spatial anchors accounts by subscription.
+  description: ''
+  syntax: az spatial-anchors-account list [--resource-group]
+  examples:
+  - summary: List spatial anchor accounts by resource group
+    syntax: az spatial-anchors-account list --resource-group "MyResourceGroup"
+  - summary: List spatial anchors accounts by subscription
+    syntax: az spatial-anchors-account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spatial-anchors-account_show
+  name: az spatial-anchors-account show
+  summary: Retrieve a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account show --name
+                                    --resource-group
+  examples:
+  - summary: Get spatial anchors account
+    syntax: az spatial-anchors-account show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spatial-anchors-account_update
+  name: az spatial-anchors-account update
+  summary: Update a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account update --name
+                                      --resource-group
+                                      [--add]
+                                      [--force-string]
+                                      [--kind]
+                                      [--location]
+                                      [--remove]
+                                      [--set]
+                                      [--sku]
+                                      [--storage-account-name]
+                                      [--tags]
+  examples:
+  - summary: Update spatial anchors account
+    syntax: az spatial-anchors-account update -n "MyAccount" --resource-group "MyResourceGroup" --location "eastus2euap" --tags hero="romeo" heroine="juliet"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_spatial-anchors-account_create
+- az_spatial-anchors-account_delete
+- az_spatial-anchors-account_key
+- az_spatial-anchors-account_key_renew
+- az_spatial-anchors-account_key_show
+- az_spatial-anchors-account_list
+- az_spatial-anchors-account_show
+- az_spatial-anchors-account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage spatial anchor account with mixed reality.
diff --git a/2017-03-09-profile/docs-ref-autogen/spatial-anchors-account/key.yml b/2017-03-09-profile/docs-ref-autogen/spatial-anchors-account/key.yml
new file mode 100644
index 0000000000..4bbf0a2aa3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spatial-anchors-account/key.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_spatial-anchors-account_key
+name: az spatial-anchors-account key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az spatial-anchors-account key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage developer keys of a spatial anchors account.
+description: ''
+directCommands:
+- uid: az_spatial-anchors-account_key_renew
+  name: az spatial-anchors-account key renew
+  summary: Regenerate specified key of a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account key renew --name
+                                         --resource-group
+                                         [--key {primary, secondary}]
+  examples:
+  - summary: Regenerate spatial anchors account keys
+    syntax: az spatial-anchors-account key renew -n "MyAccount" -k primary --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key -k
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Key to be regenerated.
+    description: ''
+- uid: az_spatial-anchors-account_key_show
+  name: az spatial-anchors-account key show
+  summary: List both of the 2 keys of a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account key show --name
+                                        --resource-group
+  examples:
+  - summary: List spatial anchor account key
+    syntax: az spatial-anchors-account key show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_spatial-anchors-account_key_renew
+- az_spatial-anchors-account_key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage developer keys of a spatial anchors account.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud.yml
new file mode 100644
index 0000000000..e0dcae9444
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud.yml
@@ -0,0 +1,296 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud
+name: az spring-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_create
+  name: az spring-cloud create
+  summary: Create an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud create --name
+                           --resource-group
+                           [--app-insights]
+                           [--app-insights-key]
+                           [--app-network-resource-group]
+                           [--app-subnet]
+                           [--disable-app-insights {false, true}]
+                           [--disable-distributed-tracing {false, true}]
+                           [--enable-java-agent {false, true}]
+                           [--location]
+                           [--no-wait]
+                           [--reserved-cidr-range]
+                           [--service-runtime-network-resource-group]
+                           [--service-runtime-subnet]
+                           [--sku]
+                           [--tags]
+                           [--vnet]
+  examples:
+  - summary: Create a new Azure Spring Cloud in westus.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup -l westus
+  - summary: Create a new Azure Spring Cloud in westus with an existing Application Insights by using the instrumentation key.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup -l westus --app-insights-key MyInstrumentationKey
+  - summary: Create a new Azure Spring Cloud in westus with an existing Application Insights and enable Java In-Process Agent.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup -l westus --enable-java-agent true --app-insights MyInstrumentationName
+  - summary: Create a new Azure Spring Cloud with distributed tracing disabled.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup --disable-app-insights
+  - summary: Create a new Azure Spring Cloud with VNet-injected via giving VNet name in current resource group
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup --vnet MyVNet --app-subnet MyAppSubnet --service-runtime-subnet MyServiceRuntimeSubnet
+  - summary: Create a new Azure Spring Cloud with VNet-injected via giving subnets resource ID
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup --app-subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyVnetRg/providers/Microsoft.Network/VirtualNetworks/test-vnet/subnets/app --service-runtime-subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyVnetRg/providers/Microsoft.Network/VirtualNetworks/test-vnet/subnets/svc --reserved-cidr-range 10.0.0.0/16,10.1.0.0/16,10.2.0.1/16
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-insights
+    summary: Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.
+    description: ''
+  - name: --app-insights-key
+    summary: Instrumentation key of the existing Application Insights.
+    description: ''
+  - name: --app-network-resource-group --app-nrg
+    summary: The resource group where all network resources for apps will be created in.
+    description: ''
+  - name: --app-subnet
+    summary: 'The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud app. Required when deploying into a Virtual Network. Smaller subnet sizes are supported, please refer: https://aka.ms/azure-spring-cloud-smaller-subnet-vnet-docs.'
+    description: ''
+  - name: --disable-app-insights
+    parameterValueGroup: false, true
+    summary: Disable Application Insights, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --disable-distributed-tracing
+    parameterValueGroup: false, true
+    summary: Disable distributed tracing, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --enable-java-agent
+    parameterValueGroup: false, true
+    summary: Enable java in-process agent.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --reserved-cidr-range
+    summary: Comma-separated list of IP address ranges in CIDR format. The IP ranges are reserved to host underlying Azure Spring Cloud infrastructure, which should be 3 at least /16 unused IP ranges, must not overlap with any Subnet IP ranges.
+    description: ''
+  - name: --service-runtime-network-resource-group --svc-nrg
+    summary: The resource group where all network resources for Azure Spring Cloud service runtime will be created in.
+    description: ''
+  - name: --service-runtime-subnet --svc-subnet
+    summary: The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud service runtime. Required when deploying into a Virtual Network.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    summary: Name of SKU, the value is "Basic" or "Standard".
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet
+    summary: The name or ID of an existing Virtual Network into which to deploy the Spring Cloud instance.
+    description: ''
+- uid: az_spring-cloud_delete
+  name: az spring-cloud delete
+  summary: Delete an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud delete --name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_list
+  name: az spring-cloud list
+  summary: List all Azure Spring Cloud in the given resource group, otherwise list the subscription's.
+  description: ''
+  syntax: az spring-cloud list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_show
+  name: az spring-cloud show
+  summary: Show the details for an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_update
+  name: az spring-cloud update
+  summary: Update an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud update --name
+                           --resource-group
+                           [--app-insights]
+                           [--app-insights-key]
+                           [--disable-app-insights {false, true}]
+                           [--disable-distributed-tracing {false, true}]
+                           [--no-wait]
+                           [--sku]
+                           [--tags]
+  examples:
+  - summary: Update pricing tier.
+    syntax: az spring-cloud update -n MyService --sku Standard -g MyResourceGroup
+  - summary: Enable the distributed tracing of the existing Azure Spring Cloud.
+    syntax: az spring-cloud update -n MyService -g MyResourceGroup --disable-app-insights false
+  - summary: Update the tags of the existing Azure Spring Cloud.
+    syntax: az spring-cloud update -n MyService -g MyResourceGroup --tags key1=value1 key2=value2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-insights
+    summary: Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.
+    description: ''
+  - name: --app-insights-key
+    summary: Instrumentation key of the existing Application Insights.
+    description: ''
+  - name: --disable-app-insights
+    parameterValueGroup: false, true
+    summary: Disable Application Insights, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --disable-distributed-tracing
+    parameterValueGroup: false, true
+    summary: Disable distributed tracing, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: Name of SKU, the value is "Basic" or "Standard".
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_spring-cloud_app
+- az_spring-cloud_app_binding
+- az_spring-cloud_app_binding_cosmos
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+- az_spring-cloud_app_binding_list
+- az_spring-cloud_app_binding_mysql
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+- az_spring-cloud_app_binding_redis
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+- az_spring-cloud_app_binding_remove
+- az_spring-cloud_app_binding_show
+- az_spring-cloud_app_create
+- az_spring-cloud_app_custom-domain
+- az_spring-cloud_app_custom-domain_bind
+- az_spring-cloud_app_custom-domain_list
+- az_spring-cloud_app_custom-domain_show
+- az_spring-cloud_app_custom-domain_unbind
+- az_spring-cloud_app_custom-domain_update
+- az_spring-cloud_app_delete
+- az_spring-cloud_app_deploy
+- az_spring-cloud_app_deployment
+- az_spring-cloud_app_deployment_create
+- az_spring-cloud_app_deployment_delete
+- az_spring-cloud_app_deployment_list
+- az_spring-cloud_app_deployment_show
+- az_spring-cloud_app_identity
+- az_spring-cloud_app_identity_assign
+- az_spring-cloud_app_identity_remove
+- az_spring-cloud_app_identity_show
+- az_spring-cloud_app_list
+- az_spring-cloud_app_log
+- az_spring-cloud_app_log_tail
+- az_spring-cloud_app_logs
+- az_spring-cloud_app_restart
+- az_spring-cloud_app_scale
+- az_spring-cloud_app_set-deployment
+- az_spring-cloud_app_show
+- az_spring-cloud_app_show-deploy-log
+- az_spring-cloud_app_start
+- az_spring-cloud_app_stop
+- az_spring-cloud_app_unset-deployment
+- az_spring-cloud_app_update
+- az_spring-cloud_app-insights
+- az_spring-cloud_app-insights_show
+- az_spring-cloud_app-insights_update
+- az_spring-cloud_certificate
+- az_spring-cloud_certificate_add
+- az_spring-cloud_certificate_list
+- az_spring-cloud_certificate_remove
+- az_spring-cloud_certificate_show
+- az_spring-cloud_config-server
+- az_spring-cloud_config-server_clear
+- az_spring-cloud_config-server_git
+- az_spring-cloud_config-server_git_repo
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+- az_spring-cloud_config-server_git_set
+- az_spring-cloud_config-server_set
+- az_spring-cloud_config-server_show
+- az_spring-cloud_create
+- az_spring-cloud_delete
+- az_spring-cloud_list
+- az_spring-cloud_show
+- az_spring-cloud_test-endpoint
+- az_spring-cloud_test-endpoint_disable
+- az_spring-cloud_test-endpoint_enable
+- az_spring-cloud_test-endpoint_list
+- az_spring-cloud_test-endpoint_renew-key
+- az_spring-cloud_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app-insights.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app-insights.yml
new file mode 100644
index 0000000000..947b728028
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app-insights.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app-insights
+name: az spring-cloud app-insights
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app-insights** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to management Application Insights in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app-insights_show
+  name: az spring-cloud app-insights show
+  summary: Show Application Insights settings.
+  description: ''
+  syntax: >-
+    az spring-cloud app-insights show --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_app-insights_update
+  name: az spring-cloud app-insights update
+  summary: Update Application Insights settings.
+  description: ''
+  syntax: >-
+    az spring-cloud app-insights update --name
+                                        --resource-group
+                                        [--app-insights]
+                                        [--app-insights-key]
+                                        [--disable {false, true}]
+                                        [--sampling-rate]
+  examples:
+  - summary: Enable Application Insights and Java In-process Agent.
+    syntax: az spring-cloud app-insights update -n MyService -g MyResourceGroup --app-insights-key MyInstrumentationKey --sampling-rate 100
+  - summary: Disable Application Insights.
+    syntax: az spring-cloud app-insights update -n MyService -g MyResourceGroup --disable
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-insights
+    summary: Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.
+    description: ''
+  - name: --app-insights-key
+    summary: Instrumentation key of the existing Application Insights.
+    description: ''
+  - name: --disable
+    parameterValueGroup: false, true
+    summary: Disable Application Insights.
+    description: ''
+  - name: --sampling-rate
+    summary: Sampling Rate of application insights. Maximum is 100.
+    description: ''
+commands:
+- az_spring-cloud_app-insights_show
+- az_spring-cloud_app-insights_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to management Application Insights in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app.yml
new file mode 100644
index 0000000000..a615640828
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app.yml
@@ -0,0 +1,613 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app
+name: az spring-cloud app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage apps in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_create
+  name: az spring-cloud app create
+  summary: Create a new app with a default deployment in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app create --name
+                               --resource-group
+                               --service
+                               [--assign-endpoint {false, true}]
+                               [--assign-identity {false, true}]
+                               [--cpu]
+                               [--enable-persistent-storage {false, true}]
+                               [--env]
+                               [--instance-count]
+                               [--jvm-options]
+                               [--memory]
+                               [--runtime-version {Java_11, Java_8, NetCore_31}]
+  examples:
+  - summary: Create an app with the default configuration.
+    syntax: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup
+  - summary: Create an public accessible app with 3 instances and 2 cpu cores and 3 GB of memory per instance.
+    syntax: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup --assign-endpoint true --cpu 2 --memory 3 --instance-count 3
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --assign-endpoint
+    parameterValueGroup: false, true
+    summary: If true, assign endpoint URL for direct access.
+    description: ''
+  - name: --assign-identity
+    parameterValueGroup: false, true
+    summary: If true, assign managed service identity.
+    description: ''
+  - name: --cpu
+    defaultValue: "1"
+    summary: Number of virtual cpu cores per instance.
+    description: ''
+  - name: --enable-persistent-storage
+    parameterValueGroup: false, true
+    summary: If true, mount a 50G (Standard Pricing tier) or 1G (Basic Pricing tier) disk with default path.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --instance-count
+    defaultValue: "1"
+    summary: Number of instance.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --memory
+    defaultValue: "1"
+    summary: Number of GB of memory per instance.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+- uid: az_spring-cloud_app_delete
+  name: az spring-cloud app delete
+  summary: Delete an app in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app delete --name
+                               --resource-group
+                               --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_deploy
+  name: az spring-cloud app deploy
+  summary: Deploy source code or pre-built binary to an app and update related configurations.
+  description: ''
+  syntax: >-
+    az spring-cloud app deploy --name
+                               --resource-group
+                               --service
+                               [--artifact-path]
+                               [--deployment]
+                               [--env]
+                               [--jvm-options]
+                               [--main-entry]
+                               [--no-wait]
+                               [--runtime-version {Java_11, Java_8, NetCore_31}]
+                               [--target-module]
+                               [--version]
+  examples:
+  - summary: Deploy source code to an app. This will pack current directory, build binary with Pivotal Build Service and then deploy to the app.
+    syntax: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup
+  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
+    syntax: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
+  - summary: Deploy source code to a specific deployment of an app.
+    syntax: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --artifact-path --jar-path -p
+    summary: If provided, deploy pre-built artifact (jar or netcore zip), otherwise deploy current folder as tar.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --main-entry -m
+    summary: A string containing the path to the .NET executable relative to zip root.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+  - name: --target-module
+    summary: Child module to be deployed, required for multiple jar packages built from source code.
+    description: ''
+  - name: --version
+    summary: Deployment version, keep unchanged if not set.
+    description: ''
+- uid: az_spring-cloud_app_list
+  name: az spring-cloud app list
+  summary: List all apps in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app list --resource-group
+                             --service
+  examples:
+  - summary: Query status of persistent storage of all apps
+    syntax: az spring-cloud app list -s MyCluster -g MyResourceGroup -o json --query '[].{Name:name, PersistentStorage:properties.persistentDisk}'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_logs
+  name: az spring-cloud app logs
+  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
+  description: ''
+  syntax: >-
+    az spring-cloud app logs --name
+                             --resource-group
+                             --service
+                             [--deployment]
+                             [--follow]
+                             [--format-json]
+                             [--instance]
+                             [--limit]
+                             [--lines]
+                             [--since]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --follow  -f
+    summary: Specify if the logs should be streamed.
+    description: ''
+  - name: --format-json
+    summary: Format JSON logs if structured log is enabled.
+    description: ''
+  - name: --instance -i
+    summary: Name of an existing instance of the deployment.
+    description: ''
+  - name: --limit
+    defaultValue: "2048"
+    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
+    description: ''
+  - name: --lines
+    defaultValue: "50"
+    summary: Number of lines to show. Maximum is 10000.
+    description: ''
+  - name: --since
+    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
+    description: ''
+- uid: az_spring-cloud_app_restart
+  name: az spring-cloud app restart
+  summary: Restart instances of the app, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app restart --name
+                                --resource-group
+                                --service
+                                [--deployment]
+                                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_scale
+  name: az spring-cloud app scale
+  summary: Manually scale an app or its deployments.
+  description: ''
+  syntax: >-
+    az spring-cloud app scale --name
+                              --resource-group
+                              --service
+                              [--cpu]
+                              [--deployment]
+                              [--instance-count]
+                              [--memory]
+                              [--no-wait]
+  examples:
+  - summary: Scale up an app to 4 cpu cores and 8 Gb of memory per instance.
+    syntax: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup --cpu 3 --memory 8
+  - summary: Scale out a deployment of the app to 5 instances.
+    syntax: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment --instance-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --cpu
+    summary: Number of virtual cpu cores per instance.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --instance-count
+    summary: Number of instance.
+    description: ''
+  - name: --memory
+    summary: Number of GB of memory per instance.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_set-deployment
+  name: az spring-cloud app set-deployment
+  summary: Set production deployment of an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app set-deployment --deployment
+                                       --name
+                                       --resource-group
+                                       --service
+                                       [--no-wait]
+  examples:
+  - summary: Swap a staging deployment of an app to production.
+    syntax: az spring-cloud app set-deployment -d green-deployment -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --deployment -d
+    summary: Name of an existing deployment of the app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_show
+  name: az spring-cloud app show
+  summary: Show the details of an app in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app show --name
+                             --resource-group
+                             --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_show-deploy-log
+  name: az spring-cloud app show-deploy-log
+  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app show-deploy-log --name
+                                        --resource-group
+                                        --service
+                                        [--deployment]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+- uid: az_spring-cloud_app_start
+  name: az spring-cloud app start
+  summary: Start instances of the app, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app start --name
+                              --resource-group
+                              --service
+                              [--deployment]
+                              [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_stop
+  name: az spring-cloud app stop
+  summary: Stop instances of the app, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app stop --name
+                             --resource-group
+                             --service
+                             [--deployment]
+                             [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_unset-deployment
+  name: az spring-cloud app unset-deployment
+  summary: Unset production deployment of an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app unset-deployment --name
+                                         --resource-group
+                                         --service
+                                         [--no-wait]
+  examples:
+  - summary: Swap the production deployment of an app to staging if the app has the production deployment.
+    syntax: az spring-cloud app unset-deployment -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_update
+  name: az spring-cloud app update
+  summary: Update configurations of an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app update --name
+                               --resource-group
+                               --service
+                               [--assign-endpoint {false, true}]
+                               [--deployment]
+                               [--enable-end-to-end-tls {false, true}]
+                               [--enable-persistent-storage {false, true}]
+                               [--env]
+                               [--https-only {false, true}]
+                               [--jvm-options]
+                               [--main-entry]
+                               [--runtime-version {Java_11, Java_8, NetCore_31}]
+  examples:
+  - summary: Add an environment variable for the app.
+    syntax: az spring-cloud app update -n MyApp -s MyCluster -g MyResourceGroup --env foo=bar
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --assign-endpoint
+    parameterValueGroup: false, true
+    summary: If true, assign endpoint URL for direct access.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --enable-end-to-end-tls
+    parameterValueGroup: false, true
+    summary: If true, enable end to end tls.
+    description: ''
+  - name: --enable-persistent-storage
+    parameterValueGroup: false, true
+    summary: If true, mount a 50G (Standard Pricing tier) or 1G (Basic Pricing tier) disk with default path.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --https-only
+    parameterValueGroup: false, true
+    summary: If true, access app via https.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --main-entry -m
+    summary: The path to the .NET executable relative to zip root.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+commands:
+- az_spring-cloud_app_binding
+- az_spring-cloud_app_binding_cosmos
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+- az_spring-cloud_app_binding_list
+- az_spring-cloud_app_binding_mysql
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+- az_spring-cloud_app_binding_redis
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+- az_spring-cloud_app_binding_remove
+- az_spring-cloud_app_binding_show
+- az_spring-cloud_app_create
+- az_spring-cloud_app_custom-domain
+- az_spring-cloud_app_custom-domain_bind
+- az_spring-cloud_app_custom-domain_list
+- az_spring-cloud_app_custom-domain_show
+- az_spring-cloud_app_custom-domain_unbind
+- az_spring-cloud_app_custom-domain_update
+- az_spring-cloud_app_delete
+- az_spring-cloud_app_deploy
+- az_spring-cloud_app_deployment
+- az_spring-cloud_app_deployment_create
+- az_spring-cloud_app_deployment_delete
+- az_spring-cloud_app_deployment_list
+- az_spring-cloud_app_deployment_show
+- az_spring-cloud_app_identity
+- az_spring-cloud_app_identity_assign
+- az_spring-cloud_app_identity_remove
+- az_spring-cloud_app_identity_show
+- az_spring-cloud_app_list
+- az_spring-cloud_app_log
+- az_spring-cloud_app_log_tail
+- az_spring-cloud_app_logs
+- az_spring-cloud_app_restart
+- az_spring-cloud_app_scale
+- az_spring-cloud_app_set-deployment
+- az_spring-cloud_app_show
+- az_spring-cloud_app_show-deploy-log
+- az_spring-cloud_app_start
+- az_spring-cloud_app_stop
+- az_spring-cloud_app_unset-deployment
+- az_spring-cloud_app_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage apps in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding.yml
new file mode 100644
index 0000000000..b27d5b8c85
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding.yml
@@ -0,0 +1,113 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding
+name: az spring-cloud app binding
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_list
+  name: az spring-cloud app binding list
+  summary: List all service bindings in an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding list --app
+                                     --resource-group
+                                     --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_binding_remove
+  name: az spring-cloud app binding remove
+  summary: Remove a service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding remove --app
+                                       --name
+                                       --resource-group
+                                       --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_binding_show
+  name: az spring-cloud app binding show
+  summary: Show the details of a service binding.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding show --app
+                                     --name
+                                     --resource-group
+                                     --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_cosmos
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+- az_spring-cloud_app_binding_list
+- az_spring-cloud_app_binding_mysql
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+- az_spring-cloud_app_binding_redis
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+- az_spring-cloud_app_binding_remove
+- az_spring-cloud_app_binding_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/cosmos.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/cosmos.yml
new file mode 100644
index 0000000000..e343816de0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/cosmos.yml
@@ -0,0 +1,122 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding_cosmos
+name: az spring-cloud app binding cosmos
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding cosmos** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Cosmos DB bindings.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_cosmos_add
+  name: az spring-cloud app binding cosmos add
+  summary: Bind an Azure Cosmos DB with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding cosmos add --api-type {cassandra, gremlin, mongo, sql, table}
+                                           --app
+                                           --name
+                                           --resource-group
+                                           --resource-id
+                                           --service
+                                           [--collection-name]
+                                           [--database-name]
+                                           [--key-space]
+  examples:
+  - summary: Bind an Azure Cosmos DB.
+    syntax: az spring-cloud app binding cosmos add -n cosmosProduction --app MyApp --resource-id ${COSMOSDB_ID} --api-type mongo --database mymongo -g MyResourceGroup -s MyService
+  requiredParameters:
+  - isRequired: true
+    name: --api-type
+    parameterValueGroup: cassandra, gremlin, mongo, sql, table
+    summary: Type of API.
+    description: ''
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: Azure resource ID of the service to bind with.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --collection-name
+    summary: Name of collection. Required for gremlin.
+    description: ''
+  - name: --database-name
+    summary: Name of database. Required for mongo, sql, gremlin.
+    description: ''
+  - name: --key-space
+    summary: Cassandra key space. Required for cassandra.
+    description: ''
+- uid: az_spring-cloud_app_binding_cosmos_update
+  name: az spring-cloud app binding cosmos update
+  summary: Update an Azure Cosmos DB service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding cosmos update --app
+                                              --name
+                                              --resource-group
+                                              --service
+                                              [--collection-name]
+                                              [--database-name]
+                                              [--key-space]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --collection-name
+    summary: Name of collection. Required for gremlin.
+    description: ''
+  - name: --database-name
+    summary: Name of database. Required for mongo, sql, gremlin.
+    description: ''
+  - name: --key-space
+    summary: Cassandra key space. Required for cassandra.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Cosmos DB bindings.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/mysql.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/mysql.yml
new file mode 100644
index 0000000000..0c76f9ed26
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/mysql.yml
@@ -0,0 +1,115 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding_mysql
+name: az spring-cloud app binding mysql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding mysql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Database for MySQL bindings.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_mysql_add
+  name: az spring-cloud app binding mysql add
+  summary: Bind an Azure Database for MySQL with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding mysql add --app
+                                          --database-name
+                                          --key
+                                          --name
+                                          --resource-group
+                                          --resource-id
+                                          --service
+                                          --username
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: Database name.
+    description: ''
+  - isRequired: true
+    name: --key
+    summary: API key of the service.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: Azure resource ID of the service to bind with.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  - isRequired: true
+    name: --username
+    summary: Username of the database.
+    description: ''
+- uid: az_spring-cloud_app_binding_mysql_update
+  name: az spring-cloud app binding mysql update
+  summary: Update an Azure Database for MySQL service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding mysql update --app
+                                             --name
+                                             --resource-group
+                                             --service
+                                             [--database-name]
+                                             [--key]
+                                             [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --database-name
+    summary: Database name.
+    description: ''
+  - name: --key
+    summary: API key of the service.
+    description: ''
+  - name: --username
+    summary: Username of the database.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Database for MySQL bindings.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/redis.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/redis.yml
new file mode 100644
index 0000000000..a779084689
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/binding/redis.yml
@@ -0,0 +1,99 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding_redis
+name: az spring-cloud app binding redis
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding redis** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Cache for Redis bindings.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_redis_add
+  name: az spring-cloud app binding redis add
+  summary: Bind an Azure Cache for Redis with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding redis add --app
+                                          --name
+                                          --resource-group
+                                          --resource-id
+                                          --service
+                                          [--disable-ssl {false, true}]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: Azure resource ID of the service to bind with.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --disable-ssl
+    parameterValueGroup: false, true
+    summary: If true, disable SSL. If false, enable SSL.
+    description: ''
+- uid: az_spring-cloud_app_binding_redis_update
+  name: az spring-cloud app binding redis update
+  summary: Update an Azure Cache for Redis service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding redis update --app
+                                             --name
+                                             --resource-group
+                                             --service
+                                             [--disable-ssl {false, true}]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --disable-ssl
+    parameterValueGroup: false, true
+    summary: If true, disable SSL. If false, enable SSL.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Cache for Redis bindings.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/custom-domain.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/custom-domain.yml
new file mode 100644
index 0000000000..f5b1d7d26d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/custom-domain.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_custom-domain
+name: az spring-cloud app custom-domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app custom-domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage custom domains.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_custom-domain_bind
+  name: az spring-cloud app custom-domain bind
+  summary: Bind a custom domain with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain bind --app
+                                           --domain-name
+                                           --resource-group
+                                           --service
+                                           [--certificate]
+                                           [--enable-end-to-end-tls {false, true}]
+  examples:
+  - summary: Bind a custom domain to app.
+    syntax: az spring-cloud app custom-domain bind --domain-name MyDomainName --certificate MyCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --certificate
+    summary: Certificate name in Azure Spring Cloud.
+    description: ''
+  - name: --enable-end-to-end-tls
+    parameterValueGroup: false, true
+    summary: If true, enable end to end tls.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_list
+  name: az spring-cloud app custom-domain list
+  summary: List all custom domains of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain list --app
+                                           --resource-group
+                                           --service
+  examples:
+  - summary: List all custom domains of the app.
+    syntax: az spring-cloud app custom-domain list --app MyAppName --service MyCluster --resource-group MyResourceGroup -o table
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_show
+  name: az spring-cloud app custom-domain show
+  summary: Show details of a custom domain.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain show --app
+                                           --domain-name
+                                           --resource-group
+                                           --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_unbind
+  name: az spring-cloud app custom-domain unbind
+  summary: Unbind a custom-domain of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain unbind --app
+                                             --domain-name
+                                             --resource-group
+                                             --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_update
+  name: az spring-cloud app custom-domain update
+  summary: Update a custom domain of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain update --app
+                                             --domain-name
+                                             --resource-group
+                                             --service
+                                             [--certificate]
+                                             [--enable-end-to-end-tls {false, true}]
+  examples:
+  - summary: Bind custom domain with a specified certificate.
+    syntax: az spring-cloud app custom-domain update --domain-name MyDomainName --certificate MCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --certificate
+    summary: Certificate name in Azure Spring Cloud.
+    description: ''
+  - name: --enable-end-to-end-tls
+    parameterValueGroup: false, true
+    summary: If true, enable end to end tls.
+    description: ''
+commands:
+- az_spring-cloud_app_custom-domain_bind
+- az_spring-cloud_app_custom-domain_list
+- az_spring-cloud_app_custom-domain_show
+- az_spring-cloud_app_custom-domain_unbind
+- az_spring-cloud_app_custom-domain_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage custom domains.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/deployment.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/deployment.yml
new file mode 100644
index 0000000000..d6cb139133
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/deployment.yml
@@ -0,0 +1,186 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_deployment
+name: az spring-cloud app deployment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app deployment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_deployment_create
+  name: az spring-cloud app deployment create
+  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use `az spring-cloud app deploy/update --deployment <staging deployment>`.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment create --app
+                                          --name
+                                          --resource-group
+                                          --service
+                                          [--artifact-path]
+                                          [--cpu]
+                                          [--env]
+                                          [--instance-count]
+                                          [--jvm-options]
+                                          [--main-entry]
+                                          [--memory]
+                                          [--no-wait]
+                                          [--runtime-version {Java_11, Java_8, NetCore_31}]
+                                          [--skip-clone-settings]
+                                          [--target-module]
+                                          [--version]
+  examples:
+  - summary: Deploy source code to a new deployment of an app. This will pack current directory, build binary with Pivotal Build Service and then deploy.
+    syntax: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup
+  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
+    syntax: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of deployment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --artifact-path --jar-path -p
+    summary: If provided, deploy pre-built artifact (jar or netcore zip), otherwise deploy current folder as tar.
+    description: ''
+  - name: --cpu
+    summary: Number of virtual cpu cores per instance.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --instance-count
+    summary: Number of instance.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --main-entry -m
+    summary: A string containing the path to the .NET executable relative to zip root.
+    description: ''
+  - name: --memory
+    summary: Number of GB of memory per instance.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+  - name: --skip-clone-settings
+    summary: Create staging deployment will automatically copy settings from production deployment.
+    description: ''
+  - name: --target-module
+    summary: Child module to be deployed, required for multiple jar packages built from source code.
+    description: ''
+  - name: --version
+    summary: Deployment version, keep unchanged if not set.
+    description: ''
+- uid: az_spring-cloud_app_deployment_delete
+  name: az spring-cloud app deployment delete
+  summary: Delete a deployment of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment delete --app
+                                          --name
+                                          --resource-group
+                                          --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of deployment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_deployment_list
+  name: az spring-cloud app deployment list
+  summary: List all deployments in an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment list --app
+                                        --resource-group
+                                        --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_deployment_show
+  name: az spring-cloud app deployment show
+  summary: Show details of a deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment show --app
+                                        --name
+                                        --resource-group
+                                        --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of deployment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_app_deployment_create
+- az_spring-cloud_app_deployment_delete
+- az_spring-cloud_app_deployment_list
+- az_spring-cloud_app_deployment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/identity.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/identity.yml
new file mode 100644
index 0000000000..743be5fed5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/identity.yml
@@ -0,0 +1,114 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_identity
+name: az spring-cloud app identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage an app's managed service identity.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_identity_assign
+  name: az spring-cloud app identity assign
+  summary: Enable managed service identity on an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app identity assign --name
+                                        --resource-group
+                                        --service
+                                        [--role]
+                                        [--scope]
+  examples:
+  - summary: Enable the system assigned identity.
+    syntax: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup
+  - summary: Enable the system assigned identity on an app with the 'Reader' role.
+    syntax: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup --role Reader --scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/xxxxx/providers/Microsoft.KeyVault/vaults/xxxxx
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --role
+    summary: Role name or id the managed identity will be assigned.
+    description: ''
+  - name: --scope
+    summary: The scope the managed identity has access to.
+    description: ''
+- uid: az_spring-cloud_app_identity_remove
+  name: az spring-cloud app identity remove
+  summary: Remove managed service identity from an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app identity remove --name
+                                        --resource-group
+                                        --service
+  examples:
+  - summary: Remove the system assigned identity from an app.
+    syntax: az spring-cloud app identity remove -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_identity_show
+  name: az spring-cloud app identity show
+  summary: Display app's managed identity info.
+  description: ''
+  syntax: >-
+    az spring-cloud app identity show --name
+                                      --resource-group
+                                      --service
+  examples:
+  - summary: Display an app's managed identity info.
+    syntax: az spring-cloud app identity show -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_app_identity_assign
+- az_spring-cloud_app_identity_remove
+- az_spring-cloud_app_identity_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage an app's managed service identity.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/log.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/log.yml
new file mode 100644
index 0000000000..2480245f21
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/app/log.yml
@@ -0,0 +1,81 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_log
+name: az spring-cloud app log
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app log** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_log_tail
+  name: az spring-cloud app log tail
+  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
+  description: ''
+  syntax: >-
+    az spring-cloud app log tail --name
+                                 --resource-group
+                                 --service
+                                 [--deployment]
+                                 [--follow]
+                                 [--format-json]
+                                 [--instance]
+                                 [--limit]
+                                 [--lines]
+                                 [--since]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --follow  -f
+    summary: Specify if the logs should be streamed.
+    description: ''
+  - name: --format-json
+    summary: Format JSON logs if structured log is enabled.
+    description: ''
+  - name: --instance -i
+    summary: Name of an existing instance of the deployment.
+    description: ''
+  - name: --limit
+    defaultValue: "2048"
+    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
+    description: ''
+  - name: --lines
+    defaultValue: "50"
+    summary: Number of lines to show. Maximum is 10000.
+    description: ''
+  - name: --since
+    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
+    description: ''
+commands:
+- az_spring-cloud_app_log_tail
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/certificate.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/certificate.yml
new file mode 100644
index 0000000000..2cc8bda2d1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/certificate.yml
@@ -0,0 +1,127 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_certificate
+name: az spring-cloud certificate
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud certificate** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage certificates.
+description: ''
+directCommands:
+- uid: az_spring-cloud_certificate_add
+  name: az spring-cloud certificate add
+  summary: Add a certificate in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate add --name
+                                    --resource-group
+                                    --service
+                                    --vault-certificate-name
+                                    --vault-uri
+  examples:
+  - summary: Import certificate from key vault.
+    syntax: az spring-cloud certificate add --name MyCertName --vault-uri MyKeyVaultUri --vault-certificate-name MyKeyVaultCertName --service MyCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of certificate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  - isRequired: true
+    name: --vault-certificate-name
+    summary: The certificate name in key vault.
+    description: ''
+  - isRequired: true
+    name: --vault-uri
+    summary: The key vault uri where store the certificate.
+    description: ''
+- uid: az_spring-cloud_certificate_list
+  name: az spring-cloud certificate list
+  summary: List all certificates in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate list --resource-group
+                                     --service
+  examples:
+  - summary: List all certificates in spring cloud service.
+    syntax: az spring-cloud certificate list --service MyCluster --resource-group MyResourceGroup -o table
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_certificate_remove
+  name: az spring-cloud certificate remove
+  summary: Remove a certificate in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate remove --name
+                                       --resource-group
+                                       --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of certificate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_certificate_show
+  name: az spring-cloud certificate show
+  summary: Show a certificate in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate show --name
+                                     --resource-group
+                                     --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of certificate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_certificate_add
+- az_spring-cloud_certificate_list
+- az_spring-cloud_certificate_remove
+- az_spring-cloud_certificate_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server.yml
new file mode 100644
index 0000000000..75929d265c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_config-server
+name: az spring-cloud config-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud config-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Config Server in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_config-server_clear
+  name: az spring-cloud config-server clear
+  summary: Erase all settings in Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server clear --name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_config-server_set
+  name: az spring-cloud config-server set
+  summary: Set Config Server from a yaml file.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server set --config-file
+                                      --name
+                                      --resource-group
+                                      [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: A yaml file path for the configuration of Spring Cloud config server.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_config-server_show
+  name: az spring-cloud config-server show
+  summary: Show Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server show --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_spring-cloud_config-server_clear
+- az_spring-cloud_config-server_git
+- az_spring-cloud_config-server_git_repo
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+- az_spring-cloud_config-server_git_set
+- az_spring-cloud_config-server_set
+- az_spring-cloud_config-server_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Config Server in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server/git.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server/git.yml
new file mode 100644
index 0000000000..963e1f394c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server/git.yml
@@ -0,0 +1,88 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_config-server_git
+name: az spring-cloud config-server git
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud config-server git** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Config Server git property in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_config-server_git_set
+  name: az spring-cloud config-server git set
+  summary: Set git property of Config Server, will totally override the old one.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git set --name
+                                          --resource-group
+                                          --uri
+                                          [--host-key]
+                                          [--host-key-algorithm]
+                                          [--label]
+                                          [--password]
+                                          [--private-key]
+                                          [--search-paths]
+                                          [--strict-host-key-checking]
+                                          [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --uri
+    summary: Uri of the added config.
+    description: ''
+  optionalParameters:
+  - name: --host-key
+    summary: Host key of the added config.
+    description: ''
+  - name: --host-key-algorithm
+    summary: Host key algorithm of the added config.
+    description: ''
+  - name: --label
+    summary: Label of the added config.
+    description: ''
+  - name: --password
+    summary: Password of the added config.
+    description: ''
+  - name: --private-key
+    summary: Private_key of the added config.
+    description: ''
+  - name: --search-paths
+    summary: Search_paths of the added config, use , as delimiter for multiple paths.
+    description: ''
+  - name: --strict-host-key-checking
+    summary: Strict_host_key_checking of the added config.
+    description: ''
+  - name: --username
+    summary: Username of the added config.
+    description: ''
+commands:
+- az_spring-cloud_config-server_git_repo
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+- az_spring-cloud_config-server_git_set
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Config Server git property in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server/git/repo.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server/git/repo.yml
new file mode 100644
index 0000000000..7106842be8
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/config-server/git/repo.yml
@@ -0,0 +1,194 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_config-server_git_repo
+name: az spring-cloud config-server git repo
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud config-server git repo** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Config Server git repository in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_config-server_git_repo_add
+  name: az spring-cloud config-server git repo add
+  summary: Add a new repository of git property of Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo add --name
+                                               --repo-name
+                                               --resource-group
+                                               --uri
+                                               [--host-key]
+                                               [--host-key-algorithm]
+                                               [--label]
+                                               [--password]
+                                               [--pattern]
+                                               [--private-key]
+                                               [--search-paths]
+                                               [--strict-host-key-checking]
+                                               [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --repo-name
+    summary: Name of the repo.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --uri
+    summary: Uri of the added config.
+    description: ''
+  optionalParameters:
+  - name: --host-key
+    summary: Host key of the added config.
+    description: ''
+  - name: --host-key-algorithm
+    summary: Host key algorithm of the added config.
+    description: ''
+  - name: --label
+    summary: Label of the added config.
+    description: ''
+  - name: --password
+    summary: Password of the added config.
+    description: ''
+  - name: --pattern
+    summary: Pattern of the repo, use , as delimiter for multiple patterns.
+    description: ''
+  - name: --private-key
+    summary: Private_key of the added config.
+    description: ''
+  - name: --search-paths
+    summary: Search_paths of the added config, use , as delimiter for multiple paths.
+    description: ''
+  - name: --strict-host-key-checking
+    summary: Strict_host_key_checking of the added config.
+    description: ''
+  - name: --username
+    summary: Username of the added config.
+    description: ''
+- uid: az_spring-cloud_config-server_git_repo_list
+  name: az spring-cloud config-server git repo list
+  summary: List all repositories of git property of Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo list --name
+                                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_config-server_git_repo_remove
+  name: az spring-cloud config-server git repo remove
+  summary: Remove an existing repository of git property of Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo remove --name
+                                                  --repo-name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --repo-name
+    summary: Name of the repo.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_config-server_git_repo_update
+  name: az spring-cloud config-server git repo update
+  summary: Override an existing repository of git property of Config Server, will totally override the old one.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo update --name
+                                                  --repo-name
+                                                  --resource-group
+                                                  [--host-key]
+                                                  [--host-key-algorithm]
+                                                  [--label]
+                                                  [--password]
+                                                  [--pattern]
+                                                  [--private-key]
+                                                  [--search-paths]
+                                                  [--strict-host-key-checking]
+                                                  [--uri]
+                                                  [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --repo-name
+    summary: Name of the repo.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --host-key
+    summary: Host key of the added config.
+    description: ''
+  - name: --host-key-algorithm
+    summary: Host key algorithm of the added config.
+    description: ''
+  - name: --label
+    summary: Label of the added config.
+    description: ''
+  - name: --password
+    summary: Password of the added config.
+    description: ''
+  - name: --pattern
+    summary: Pattern of the repo, use , as delimiter for multiple patterns.
+    description: ''
+  - name: --private-key
+    summary: Private_key of the added config.
+    description: ''
+  - name: --search-paths
+    summary: Search_paths of the added config, use , as delimiter for multiple paths.
+    description: ''
+  - name: --strict-host-key-checking
+    summary: Strict_host_key_checking of the added config.
+    description: ''
+  - name: --uri
+    summary: Uri of the added config.
+    description: ''
+  - name: --username
+    summary: Username of the added config.
+    description: ''
+commands:
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Config Server git repository in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/spring-cloud/test-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/spring-cloud/test-endpoint.yml
new file mode 100644
index 0000000000..0803da2997
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/spring-cloud/test-endpoint.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_test-endpoint
+name: az spring-cloud test-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud test-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage test endpoint in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_test-endpoint_disable
+  name: az spring-cloud test-endpoint disable
+  summary: Disable test endpoint of the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint disable --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_test-endpoint_enable
+  name: az spring-cloud test-endpoint enable
+  summary: Enable test endpoint of the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint enable --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_test-endpoint_list
+  name: az spring-cloud test-endpoint list
+  summary: List test endpoint keys of the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint list --name
+                                       --resource-group
+                                       [--app]
+                                       [--deployment]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app
+    summary: Name of app.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+- uid: az_spring-cloud_test-endpoint_renew-key
+  name: az spring-cloud test-endpoint renew-key
+  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint renew-key --name
+                                            --resource-group
+                                            --type {Primary, Secondary}
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Primary, Secondary
+    summary: Type of test-endpoint key.
+    description: ''
+commands:
+- az_spring-cloud_test-endpoint_disable
+- az_spring-cloud_test-endpoint_enable
+- az_spring-cloud_test-endpoint_list
+- az_spring-cloud_test-endpoint_renew-key
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage test endpoint in Azure Spring Cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/sql.yml b/2017-03-09-profile/docs-ref-autogen/sql.yml
new file mode 100644
index 0000000000..a8783f16af
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sql.yml
@@ -0,0 +1,109 @@
+### YamlMime:AzureCLIGroup
+uid: az_sql
+name: az sql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **db-up** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az sql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure SQL Databases and Data Warehouses.
+description: ''
+directCommands:
+- uid: az_sql_down
+  name: az sql down
+  summary: Delete the SQL server and its cached information.
+  description: ''
+  syntax: >-
+    az sql down [--delete-group]
+                [--no-wait]
+                [--resource-group]
+                [--server-name]
+                [--yes]
+  examples:
+  - summary: Delete the server and the cached data, aside from the resource group.
+    syntax: az sql down
+  - summary: Delete the resource group and the full cache.
+    syntax: az sql down --delete-group
+  optionalParameters:
+  - name: --delete-group
+    summary: Delete the resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sql_up
+  name: az sql up
+  summary: Set up an Azure Database for SQL server and configurations.
+  description: ''
+  syntax: >-
+    az sql up [--admin-password]
+              [--admin-user]
+              [--database-name]
+              [--generate-password]
+              [--location]
+              [--resource-group]
+              [--server-name]
+              [--tags]
+              [--version]
+  examples:
+  - summary: Ensure that a Azure Database for SQL server is up and running and configured for immediate use.
+    syntax: az sql up
+  - summary: To override default names, provide parameters indicating desired values/existing resources.
+    syntax: az sql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
+  optionalParameters:
+  - name: --admin-password -p
+    summary: 'The login password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.Your password cannot contain all or part of the login name. Part of a login name is defined as three or more consecutive alphanumeric characters.'
+    description: ''
+  - name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database to initialize.
+    description: ''
+  - name: --generate-password
+    summary: Generate a password.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --version
+    defaultValue: "12.0"
+    summary: Server version.
+    description: ''
+commands:
+- az_sql_down
+- az_sql_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure SQL Databases and Data Warehouses.
diff --git a/2017-03-09-profile/docs-ref-autogen/ssh.yml b/2017-03-09-profile/docs-ref-autogen/ssh.yml
new file mode 100644
index 0000000000..1c4cb4e483
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/ssh.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_ssh
+name: az ssh
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ssh** extension for Azure CLI and requires version 2.4.0 or higher.  The extension will automatically install the first time you run an **az ssh** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: SSH into resources (Azure VMs, etc) using AAD issued openssh certificates.
+description: ''
+directCommands:
+- uid: az_ssh_cert
+  name: az ssh cert
+  summary: Create an SSH RSA certificate signed by AAD.
+  description: ''
+  syntax: >-
+    az ssh cert [--file]
+                [--public-key-file]
+  examples:
+  - summary: Create a short lived ssh certificate signed by AAD
+    syntax: az ssh cert --public-key-file ./id_rsa.pub --file ./id_rsa-aadcert.pub
+  optionalParameters:
+  - name: --file -f
+    summary: The file path to write the SSH cert to, defaults to public key path with -aadcert.pub appened.
+    description: ''
+  - name: --public-key-file -p
+    summary: The RSA public key file path.
+    description: ''
+- uid: az_ssh_config
+  name: az ssh config
+  summary: Create an SSH config for resources (Azure VMs, etc) which can then be used by clients that support OpenSSH configs and certificates.
+  description: Other software (git/rsync/etc) that support setting an SSH command can be set to use the config file by setting the command to 'ssh -F /path/to/config' e.g. rsync -e 'ssh -F /path/to/config'.
+  syntax: >-
+    az ssh config --file
+                  [--ip]
+                  [--name]
+                  [--overwrite]
+                  [--prefer-private-ip]
+                  [--private-key-file]
+                  [--public-key-file]
+                  [--resource-group]
+  examples:
+  - summary: Give a resource group and VM for which to create a config, and save in a local file
+    syntax: az ssh config --resource-group myResourceGroup --vm-name myVm --file ./sshconfig
+  - summary: Give the public IP (or hostname) of a VM for which to create a config and then ssh
+    syntax: >-
+      az ssh config --ip 1.2.3.4 --file ./sshconfig
+
+      ssh -F ./sshconfig 1.2.3.4
+  - summary: Create a generic config for use with any host
+    syntax: >-
+      #Bash
+
+      az ssh config --ip \* --file ./sshconfig
+
+      #PowerShell
+
+      az ssh config --ip * --file ./sshconfig
+  - summary: Examples with other software
+    syntax: >-
+      #Bash
+
+      az ssh config --ip \* --file ./sshconfig
+
+      rsync -e 'ssh -F ./sshconfig' -avP directory/ myvm:~/directory
+
+      GIT_SSH_COMMAND="ssh -F ./sshconfig" git clone myvm:~/gitrepo
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The file path to write the SSH config to.
+    description: ''
+  optionalParameters:
+  - name: --ip
+    summary: The public IP address (or hostname) of the VM.
+    description: ''
+  - name: --name --vm-name -n
+    summary: The name of the VM.
+    description: ''
+  - name: --overwrite
+    summary: Overwrites the config file if this flag is set.
+    description: ''
+  - name: --prefer-private-ip
+    summary: Will use a private IP if available. By default only public IPs are used.
+    description: ''
+  - name: --private-key-file -i
+    summary: The RSA private key file path.
+    description: ''
+  - name: --public-key-file -p
+    summary: The RSA public key file path.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ssh_vm
+  name: az ssh vm
+  summary: SSH into Azure VMs using an ssh certificate.
+  description: ''
+  syntax: >-
+    az ssh vm [--ip]
+              [--name]
+              [--prefer-private-ip]
+              [--private-key-file]
+              [--public-key-file]
+              [--resource-group]
+  examples:
+  - summary: Give a resource group and VM to SSH to
+    syntax: az ssh vm --resource-group myResourceGroup --vm-name myVm
+  - summary: Give the public IP (or hostname) of a VM to SSH to
+    syntax: az ssh vm --ip 1.2.3.4
+  - summary: Using a custom private key file
+    syntax: az ssh vm --ip 1.2.3.4 --private-key-file key --public-key-file key.pub
+  optionalParameters:
+  - name: --ip
+    summary: The public IP address (or hostname) of the VM.
+    description: ''
+  - name: --name --vm-name -n
+    summary: The name of the VM.
+    description: ''
+  - name: --prefer-private-ip
+    summary: Will use a private IP if available. By default only public IPs are used.
+    description: ''
+  - name: --private-key-file -i
+    summary: The RSA private key file path.
+    description: ''
+  - name: --public-key-file -p
+    summary: The RSA public key file path.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_ssh_cert
+- az_ssh_config
+- az_ssh_vm
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: SSH into resources (Azure VMs, etc) using AAD issued openssh certificates.
diff --git a/2017-03-09-profile/docs-ref-autogen/sshkey.yml b/2017-03-09-profile/docs-ref-autogen/sshkey.yml
new file mode 100644
index 0000000000..e87c1a17fc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/sshkey.yml
@@ -0,0 +1,172 @@
+### YamlMime:AzureCLIGroup
+uid: az_sshkey
+name: az sshkey
+summary: Manage ssh public key with vm.
+description: ''
+directCommands:
+- uid: az_sshkey_create
+  name: az sshkey create
+  summary: Create a new SSH public key resource.
+  description: ''
+  syntax: >-
+    az sshkey create --name
+                     --resource-group
+                     [--location]
+                     [--public-key]
+                     [--subscription]
+                     [--tags]
+  examples:
+  - summary: Create a new SSH public key resource.
+    syntax: az sshkey create --location "westus" --public-key "{ssh-rsa public key}" --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  - summary: Create a new SSH public key resource using public key in a file.
+    syntax: az sshkey create --location "westus" --public-key "@filename" --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  - summary: Create a new SSH public key resource with auto-generated value.
+    syntax: az sshkey create --location "westus" --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --public-key
+    summary: SSH public key used to authenticate to a virtual machine through ssh. If this property is not initially provided when the resource is created, the publicKey property will be populated when generateKeyPair is called. If the public key is provided upon resource creation, the provided public key needs to be at least 2048-bit and in ssh-rsa format.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_sshkey_delete
+  name: az sshkey delete
+  summary: Delete an SSH public key.
+  description: ''
+  syntax: >-
+    az sshkey delete [--ids]
+                     [--name]
+                     [--resource-group]
+                     [--subscription]
+                     [--yes]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sshkey_list
+  name: az sshkey list
+  summary: List all of the SSH public keys.
+  description: ''
+  syntax: >-
+    az sshkey list [--query-examples]
+                   [--resource-group]
+                   [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_sshkey_show
+  name: az sshkey show
+  summary: Retrieve information about an SSH public key.
+  description: ''
+  syntax: >-
+    az sshkey show [--ids]
+                   [--name]
+                   [--query-examples]
+                   [--resource-group]
+                   [--subscription]
+  examples:
+  - summary: Get an ssh public key.
+    syntax: az sshkey show --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_sshkey_update
+  name: az sshkey update
+  summary: Update an SSH public key resource.
+  description: ''
+  syntax: >-
+    az sshkey update [--ids]
+                     [--name]
+                     [--public-key]
+                     [--resource-group]
+                     [--subscription]
+                     [--tags]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - name: --public-key
+    summary: SSH public key used to authenticate to a virtual machine through ssh. If this property is not initially provided when the resource is created, the publicKey property will be populated when generateKeyPair is called. If the public key is provided upon resource creation, the provided public key needs to be at least 2048-bit and in ssh-rsa format.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_sshkey_create
+- az_sshkey_delete
+- az_sshkey_list
+- az_sshkey_show
+- az_sshkey_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ssh public key with vm.
diff --git a/2017-03-09-profile/docs-ref-autogen/stack-hci.yml b/2017-03-09-profile/docs-ref-autogen/stack-hci.yml
new file mode 100644
index 0000000000..ac4f3e4074
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stack-hci.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_stack-hci
+name: az stack-hci
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stack-hci** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stack-hci** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_stack-hci_cluster
+- az_stack-hci_cluster_create
+- az_stack-hci_cluster_delete
+- az_stack-hci_cluster_list
+- az_stack-hci_cluster_show
+- az_stack-hci_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2017-03-09-profile/docs-ref-autogen/stack-hci/cluster.yml b/2017-03-09-profile/docs-ref-autogen/stack-hci/cluster.yml
new file mode 100644
index 0000000000..465e6e4dd6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stack-hci/cluster.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_stack-hci_cluster
+name: az stack-hci cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stack-hci** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stack-hci cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stack-hci cluster.
+description: ''
+directCommands:
+- uid: az_stack-hci_cluster_create
+  name: az stack-hci cluster create
+  summary: Create an HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster create --aad-client-id
+                                --name
+                                --resource-group
+                                [--aad-tenant-id]
+                                [--location]
+                                [--tags]
+  examples:
+  - summary: Create an HCI cluster
+    syntax: az stack-hci cluster create --location "East US" --aad-client-id "24a6e53d-04e5-44d2-b7cc-1b732a847dfc" --aad-tenant-id "7e589cc1-a8b6-4dff-91bd-5ec0fa18db94" --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --aad-client-id
+    summary: App ID of cluster AAD identity.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-tenant-id
+    summary: Tenant ID of cluster AAD identity. Default is the current tenant ID.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_stack-hci_cluster_delete
+  name: az stack-hci cluster delete
+  summary: Delete an HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster delete --name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: Delete an HCI cluster
+    syntax: az stack-hci cluster delete --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_stack-hci_cluster_list
+  name: az stack-hci cluster list
+  summary: List all HCI clusters in a subscription.
+  description: ''
+  syntax: az stack-hci cluster list [--resource-group]
+  examples:
+  - summary: List all HCI clusters in a resource group
+    syntax: az stack-hci cluster list --resource-group "test-rg"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stack-hci_cluster_show
+  name: az stack-hci cluster show
+  summary: Get HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster show --name
+                              --resource-group
+  examples:
+  - summary: Get a HCI cluster
+    syntax: az stack-hci cluster show --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stack-hci_cluster_update
+  name: az stack-hci cluster update
+  summary: Update an HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update an HCI cluster
+    syntax: az stack-hci cluster update --tags tag1="value1" tag2="value2" --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_stack-hci_cluster_create
+- az_stack-hci_cluster_delete
+- az_stack-hci_cluster_list
+- az_stack-hci_cluster_show
+- az_stack-hci_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stack-hci cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage.yml b/2017-03-09-profile/docs-ref-autogen/storage.yml
index e095065a6a..999493770c 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage.yml
@@ -1,118 +1,96 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_copy
-  - az_storage_remove
+### YamlMime:AzureCLIGroup
+uid: az_storage
+name: az storage
+summary: Manage Azure Cloud Storage resources.
+description: ''
+directCommands:
 - uid: az_storage_copy
   name: az storage copy
   summary: Copy files or directories to or from Azure storage.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage copy --destination
+                    --source
+                    [--blob-type {AppendBlob, BlockBlob, PageBlob}]
+                    [--content-type]
+                    [--exclude-path]
+                    [--exclude-pattern]
+                    [--follow-symlinks]
+                    [--include-path]
+                    [--include-pattern]
+                    [--preserve-s2s-access-tier {false, true}]
+                    [--put-md5]
+                    [--recursive]
+                    [--subscription]
   examples:
   - summary: Upload a single file to Azure Blob using url.
-    syntax:
-      content: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob]
+    syntax: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob]
   - summary: Upload a single file to Azure Blob using account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/file.txt --destination-account-name mystorageaccount --destination-container mycontainer
+    syntax: az storage copy -s /path/to/file.txt --destination-account-name mystorageaccount --destination-container mycontainer
   - summary: Upload a single file to Azure Blob with MD5 hash of the file content and save it as the blob's Content-MD5 property.
-    syntax:
-      content: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob] --put-md5
+    syntax: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob] --put-md5
   - summary: Upload an entire directory to Azure Blob using url.
-    syntax:
-      content: az storage copy -s /path/to/dir -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/to/dir -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
   - summary: Upload an entire directory to Azure Blob using account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/dir --destination-account-name mystorageaccount --destination-container mycontainer --recursive
+    syntax: az storage copy -s /path/to/dir --destination-account-name mystorageaccount --destination-container mycontainer --recursive
   - summary: Upload a set of files to Azure Blob using wildcards with url.
-    syntax:
-      content: az storage copy -s /path/*foo/*bar/*.pdf -d https://[account].blob.core.windows.net/[container]/[path/to/directory]
+    syntax: az storage copy -s /path/*foo/*bar/*.pdf -d https://[account].blob.core.windows.net/[container]/[path/to/directory]
   - summary: Upload a set of files to Azure Blob using wildcards with account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-container mycontainer
+    syntax: az storage copy -s /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-container mycontainer
   - summary: Upload files and directories to Azure Blob using wildcards with url.
-    syntax:
-      content: az storage copy -s /path/*foo/*bar* -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/*foo/*bar* -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
   - summary: Upload files and directories to Azure Blob using wildcards with account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar* --destination-account-name mystorageaccount --destination-container mycontainer --recursive
+    syntax: az storage copy -s /path/*foo/*bar* --destination-account-name mystorageaccount --destination-container mycontainer --recursive
   - summary: Download a single file from Azure Blob using url, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/blob] -d /path/to/file.txt
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/blob] -d /path/to/file.txt
   - summary: Download an entire directory from Azure Blob, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/directory] -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/directory] -d /path/to/dir --recursive
   - summary: Download a subset of containers within a storage account by using a wildcard symbol (*) in the container name, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container*name] -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container*name] -d /path/to/dir --recursive
   - summary: Download a subset of files from Azure Blob. (Only jpg files and file names don't start with test will be included.)
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container] --include-pattern "*.jpg" --exclude-pattern test* -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container] --include-pattern "*.jpg" --exclude-pattern test* -d /path/to/dir --recursive
   - summary: Copy a single blob to another blob, and you can also specify the storage account and container information of source and destination as above.
-    syntax:
-      content: az storage copy -s https://[srcaccount].blob.core.windows.net/[container]/[path/to/blob] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
+    syntax: az storage copy -s https://[srcaccount].blob.core.windows.net/[container]/[path/to/blob] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
   - summary: Copy an entire account data from blob account to another blob account, and you can also specify the storage account and container information of source and destination as above.
-    syntax:
-      content: az storage copy -s https://[srcaccount].blob.core.windows.net -d https://[destaccount].blob.core.windows.net --recursive
+    syntax: az storage copy -s https://[srcaccount].blob.core.windows.net -d https://[destaccount].blob.core.windows.net --recursive
   - summary: Copy a single object from S3 with access key to blob, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://s3.amazonaws.com/[bucket]/[object] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
+    syntax: az storage copy -s https://s3.amazonaws.com/[bucket]/[object] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
   - summary: Copy an entire directory from S3 with access key to blob virtual directory, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://s3.amazonaws.com/[bucket]/[folder] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/directory] --recursive
+    syntax: az storage copy -s https://s3.amazonaws.com/[bucket]/[folder] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/directory] --recursive
   - summary: Copy all buckets in S3 service with access key to blob account, and you can also specify your storage account information as above.
-    syntax:
-      content: az storage copy -s https://s3.amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
+    syntax: az storage copy -s https://s3.amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
   - summary: Copy all buckets in a S3 region with access key to blob account, and you can also specify your storage account information as above.
-    syntax:
-      content: az storage copy -s https://s3-[region].amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
+    syntax: az storage copy -s https://s3-[region].amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
   - summary: Upload a single file to Azure File Share using url.
-    syntax:
-      content: az storage copy -s /path/to/file.txt -d https://[account].file.core.windows.net/[share]/[path/to/file]
+    syntax: az storage copy -s /path/to/file.txt -d https://[account].file.core.windows.net/[share]/[path/to/file]
   - summary: Upload a single file to Azure File Share using account name and share name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/file.txt --destination-account-name mystorageaccount --destination-share myshare
+    syntax: az storage copy -s /path/to/file.txt --destination-account-name mystorageaccount --destination-share myshare
   - summary: Upload an entire directory to Azure File Share using url.
-    syntax:
-      content: az storage copy -s /path/to/dir -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/to/dir -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
   - summary: Upload an entire directory to Azure File Share using account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/dir --destination-account-name mystorageaccount --destination-share myshare --recursive
+    syntax: az storage copy -s /path/to/dir --destination-account-name mystorageaccount --destination-share myshare --recursive
   - summary: Upload a set of files to Azure File Share using wildcards with account name and share name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-share myshare
+    syntax: az storage copy -s /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-share myshare
   - summary: Upload files and directories to Azure File Share using wildcards with url.
-    syntax:
-      content: az storage copy -s /path/*foo/*bar* -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/*foo/*bar* -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
   - summary: Upload files and directories to Azure File Share using wildcards with account name and share name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar* --destination-account-name mystorageaccount --destination-share myshare --recursive
+    syntax: az storage copy -s /path/*foo/*bar* --destination-account-name mystorageaccount --destination-share myshare --recursive
   - summary: Download a single file from Azure File Share using url, and you can also specify your storage account and share information as above.
-    syntax:
-      content: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/file] -d /path/to/file.txt
+    syntax: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/file] -d /path/to/file.txt
   - summary: Download an entire directory from Azure File Share, and you can also specify your storage account and share information as above.
-    syntax:
-      content: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/directory] -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/directory] -d /path/to/dir --recursive
   - summary: Download a set of files from Azure File Share using wildcards, and you can also specify your storage account and share information as above.
-    syntax:
-      content: az storage copy -s https://[account].file.core.windows.net/[share]/ --include-pattern foo* -d /path/to/dir --recursive
-  parameters:
-  - name: --destination -d
+    syntax: az storage copy -s https://[account].file.core.windows.net/[share]/ --include-pattern foo* -d /path/to/dir --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --destination -d
     summary: The path/url of copy destination. It can be a local path, an url to azure storage server. If you provide destination parameter here, you do not need to provide arguments in copy destination arguments group and copy destination arguments will be deprecated in future.
     description: ''
-  - name: --recursive -r
-    summary: Look into sub-directories recursively.
-    description: ''
-  - name: --source -s
+  - isRequired: true
+    name: --source -s
     summary: The path/url of copy source. It can be a local path, an url to azure storage server or AWS S3 buckets. If you provide source parameter here, you do not need to provide arguments in copy source arguments group and copy source arguments will be deprecated in future.
     description: ''
+  optionalParameters:
   - name: --blob-type
     parameterValueGroup: AppendBlob, BlockBlob, PageBlob
     summary: The type of blob at the destination.
@@ -137,105 +115,68 @@ items:
     description: ''
   - name: --preserve-s2s-access-tier
     parameterValueGroup: false, true
-    summary: Preserve access tier during service to service copy. Please refer to <a href="https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers">https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers</a> to ensure destination storage account support setting access tier. In the cases that setting access tier is not supported, please use `--preserve-s2s-access-tier false` to bypass copying access tier. (Default true).
+    summary: Preserve access tier during service to service copy. Please refer to https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers to ensure destination storage account support setting access tier. In the cases that setting access tier is not supported, please use `--preserve-s2s-access-tier false` to bypass copying access tier. (Default true).
     description: ''
   - name: --put-md5
     summary: Create an MD5 hash of each file, and save the hash as the Content-MD5 property of the destination blob/file.Only available when uploading.
     description: ''
-  - name: --destination-account-name
-    summary: Storage account name of copy destination.
-    description: ''
-  - name: --destination-blob
-    summary: Blob name in blob container of copy destination storage account.
-    description: ''
-  - name: --destination-container
-    summary: Container name of copy destination storage account.
-    description: ''
-  - name: --destination-file-path
-    summary: File path in file share of copy destination storage account.
-    description: ''
-  - name: --destination-local-path
-    summary: Local file path.
-    description: ''
-  - name: --destination-share
-    summary: File share name of copy destination storage account.
-    description: ''
-  - name: --source-account-name
-    summary: Storage account name of copy source.
-    description: ''
-  - name: --source-blob
-    summary: Blob name in blob container of copy source storage account.
-    description: ''
-  - name: --source-container
-    summary: Container name of copy source storage account.
-    description: ''
-  - name: --source-file-path
-    summary: File path in file share of copy source storage account.
-    description: ''
-  - name: --source-local-path
-    summary: Local file path.
-    description: ''
-  - name: --source-share
-    summary: File share name of copy source storage account.
+  - name: --recursive -r
+    summary: Look into sub-directories recursively.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_remove
   name: az storage remove
   summary: Delete blobs or files from Azure Storage.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage remove [--account-key]
+                      [--account-name]
+                      [--connection-string]
+                      [--container-name]
+                      [--exclude-path]
+                      [--exclude-pattern]
+                      [--include-path]
+                      [--include-pattern]
+                      [--name]
+                      [--path]
+                      [--recursive]
+                      [--sas-token]
+                      [--share-name]
+                      [--subscription]
   examples:
   - summary: Remove a single blob.
-    syntax:
-      content: az storage remove -c MyContainer -n MyBlob
+    syntax: az storage remove -c mycontainer -n MyBlob
   - summary: Remove an entire virtual directory.
-    syntax:
-      content: az storage remove -c MyContainer -n path/to/directory --recursive
+    syntax: az storage remove -c mycontainer -n path/to/directory --recursive
   - summary: Remove only the top blobs inside a virtual directory but not its sub-directories.
-    syntax:
-      content: az storage remove -c MyContainer --recursive
+    syntax: az storage remove -c mycontainer --recursive
   - summary: Remove all the blobs in a Storage Container.
-    syntax:
-      content: az storage remove -c MyContainer -n path/to/directory
+    syntax: az storage remove -c mycontainer -n path/to/directory
   - summary: Remove a subset of blobs in a virtual directory (For example, only jpg and pdf files, or if the blob name is "exactName" and file names don't start with "test").
-    syntax:
-      content: az storage remove -c MyContainer --include-path path/to/directory --include-pattern "*.jpg;*.pdf;exactName" --exclude-pattern "test*" --recursive
+    syntax: az storage remove -c mycontainer --include-path path/to/directory --include-pattern "*.jpg;*.pdf;exactName" --exclude-pattern "test*" --recursive
   - summary: Remove an entire virtual directory but exclude certain blobs from the scope (For example, every blob that starts with foo or ends with bar).
-    syntax:
-      content: az storage remove -c MyContainer --include-path path/to/directory --exclude-pattern "foo*;*bar" --recursive
+    syntax: az storage remove -c mycontainer --include-path path/to/directory --exclude-pattern "foo*;*bar" --recursive
   - summary: Remove a single file.
-    syntax:
-      content: az storage remove -s MyShare -p MyFile
+    syntax: az storage remove -s MyShare -p MyFile
   - summary: Remove an entire directory.
-    syntax:
-      content: az storage remove -s MyShare -p path/to/directory --recursive
+    syntax: az storage remove -s MyShare -p path/to/directory --recursive
   - summary: Remove all the files in a Storage File Share.
-    syntax:
-      content: az storage remove -s MyShare --recursive
-  parameters:
-  - name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --name -n
-    summary: The blob name.
+    syntax: az storage remove -s MyShare --recursive
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --path -p
-    summary: The path to the file within the file share.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --recursive -r
-    summary: Look into sub-directories recursively.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --share-name -s
-    summary: The file share name.
+  - name: --container-name -c
+    summary: The container name.
     description: ''
   - name: --exclude-path
     summary: 'Exclude these paths. This option does not support wildcard characters (\*). Checks relative path prefix. For example: myFolder;myFolder/subDirName/file.pdf.'
@@ -249,538 +190,254 @@ items:
   - name: --include-pattern
     summary: 'Include only these files where the name matches the pattern list. For example: \*.jpg;\*.pdf;exactName. This option supports wildcard characters (\*).'
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+  - name: --name -n
+    summary: The blob name.
     description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --path -p
+    summary: The path to the file within the file share.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --recursive -r
+    summary: Look into sub-directories recursively.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --share-name -s
+    summary: The file share name.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-- uid: az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: az_storage_account_generate_sas
-  name: az storage account generate-sas
-  summary: Generates a shared access signature for the account.
-- uid: az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: az_storage_account_show_connection_string
-  name: az storage account show-connection-string
-  summary: Get the connection string for a storage account.
-- uid: az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-- uid: az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-- uid: az_storage_blob_copy
-  name: az storage blob copy
-  summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_cancel
-  name: az storage blob copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_copy_start
-  name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_delete
-  name: az storage blob delete
-  summary: Mark a blob or snapshot for deletion.
-- uid: az_storage_blob_delete_batch
-  name: az storage blob delete-batch
-  summary: Delete blobs from a blob container recursively.
-- uid: az_storage_blob_download
-  name: az storage blob download
-  summary: Downloads a blob to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_blob_download_batch
-  name: az storage blob download-batch
-  summary: Download blobs from a blob container recursively.
-- uid: az_storage_blob_exists
-  name: az storage blob exists
-  summary: Check for the existence of a blob in a container.
-- uid: az_storage_blob_generate_sas
-  name: az storage blob generate-sas
-  summary: Generate a shared access signature for the blob.
-- uid: az_storage_blob_lease
-  name: az storage blob lease
-  summary: Manage storage blob leases.
-- uid: az_storage_blob_lease_acquire
-  name: az storage blob lease acquire
-  summary: Acquires a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_break
-  name: az storage blob lease break
-  summary: Breaks a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_change
-  name: az storage blob lease change
-  summary: Changes a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_release
-  name: az storage blob lease release
-  summary: Releases a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_renew
-  name: az storage blob lease renew
-  summary: Renews a lock on a blob for write and delete operations.
-- uid: az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: az_storage_blob_metadata
-  name: az storage blob metadata
-  summary: Manage blob metadata.
-- uid: az_storage_blob_metadata_show
-  name: az storage blob metadata show
-  summary: Returns all user-defined metadata for the specified blob or snapshot.
-- uid: az_storage_blob_metadata_update
-  name: az storage blob metadata update
-  summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
-- uid: az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-- uid: az_storage_blob_set_tier
-  name: az storage blob set-tier
-  summary: Set the block or page tiers on the blob.
-- uid: az_storage_blob_show
-  name: az storage blob show
-  summary: Get the details of a blob.
-- uid: az_storage_blob_snapshot
-  name: az storage blob snapshot
-  summary: Creates a read-only snapshot of a blob.
-- uid: az_storage_blob_sync
-  name: az storage blob sync
-  summary: Sync blobs recursively to a storage blob container.
-- uid: az_storage_blob_update
-  name: az storage blob update
-  summary: Sets system properties on the blob.
-- uid: az_storage_blob_upload
-  name: az storage blob upload
-  summary: Upload a file to a storage blob.
-- uid: az_storage_blob_upload_batch
-  name: az storage blob upload-batch
-  summary: Upload files from a local directory to a blob container.
-- uid: az_storage_blob_url
-  name: az storage blob url
-  summary: Create the url to access a blob.
-- uid: az_storage_container
-  name: az storage container
-  summary: Manage blob storage containers.
-- uid: az_storage_container_create
-  name: az storage container create
-  summary: Create a container in a storage account.
-- uid: az_storage_container_delete
-  name: az storage container delete
-  summary: Marks the specified container for deletion.
-- uid: az_storage_container_exists
-  name: az storage container exists
-  summary: Check for the existence of a storage container.
-- uid: az_storage_container_generate_sas
-  name: az storage container generate-sas
-  summary: Generate a SAS token for a storage container.
-- uid: az_storage_container_lease
-  name: az storage container lease
-  summary: Manage blob storage container leases.
-- uid: az_storage_container_lease_acquire
-  name: az storage container lease acquire
-  summary: Acquires a lock on a container for delete operations.
-- uid: az_storage_container_lease_break
-  name: az storage container lease break
-  summary: Breaks a lock on a container for delete operations.
-- uid: az_storage_container_lease_change
-  name: az storage container lease change
-  summary: Changes the lease ID for a lock on a container for delete operations.
-- uid: az_storage_container_lease_release
-  name: az storage container lease release
-  summary: Releases a lock on a container for delete operations, to free the lease if it is no longer needed so that another client may immediately acquire a lease against the container.
-- uid: az_storage_container_lease_renew
-  name: az storage container lease renew
-  summary: Renews a lock on a container for delete operations.
-- uid: az_storage_container_list
-  name: az storage container list
-  summary: List containers in a storage account.
-- uid: az_storage_container_metadata
-  name: az storage container metadata
-  summary: Manage container metadata.
-- uid: az_storage_container_metadata_show
-  name: az storage container metadata show
-  summary: Returns all user-defined metadata for the specified container.
-- uid: az_storage_container_metadata_update
-  name: az storage container metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified container.
-- uid: az_storage_container_policy
-  name: az storage container policy
-  summary: Manage container stored access policies.
-- uid: az_storage_container_policy_create
-  name: az storage container policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_container_policy_delete
-  name: az storage container policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_container_policy_list
-  name: az storage container policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_container_policy_show
-  name: az storage container policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_container_set_permission
-  name: az storage container set-permission
-  summary: Sets the permissions for the specified container or stored access  policies that may be used with Shared Access Signatures.
-- uid: az_storage_container_show
-  name: az storage container show
-  summary: Returns all user-defined metadata and system properties for the specified container.
-- uid: az_storage_container_show_permission
-  name: az storage container show-permission
-  summary: Gets the permissions for the specified container.
-- uid: az_storage_copy
-  name: az storage copy
-  summary: Copy files or directories to or from Azure storage.
-- uid: az_storage_cors
-  name: az storage cors
-  summary: Manage storage service Cross-Origin Resource Sharing (CORS).
-- uid: az_storage_cors_add
-  name: az storage cors add
-  summary: Add a CORS rule to a storage account.
-- uid: az_storage_cors_clear
-  name: az storage cors clear
-  summary: Remove all CORS rules from a storage account.
-- uid: az_storage_cors_list
-  name: az storage cors list
-  summary: List all CORS rules for a storage account.
-- uid: az_storage_directory
-  name: az storage directory
-  summary: Manage file storage directories.
-- uid: az_storage_directory_create
-  name: az storage directory create
-  summary: Creates a new directory under the specified share or parent directory.
-- uid: az_storage_directory_delete
-  name: az storage directory delete
-  summary: Deletes the specified empty directory.
-- uid: az_storage_directory_exists
-  name: az storage directory exists
-  summary: Check for the existence of a storage directory.
-- uid: az_storage_directory_list
-  name: az storage directory list
-  summary: List directories in a share.
-- uid: az_storage_directory_metadata
-  name: az storage directory metadata
-  summary: Manage file storage directory metadata.
-- uid: az_storage_directory_metadata_show
-  name: az storage directory metadata show
-  summary: Returns all user-defined metadata for the specified directory.
-- uid: az_storage_directory_metadata_update
-  name: az storage directory metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified directory.
-- uid: az_storage_directory_show
-  name: az storage directory show
-  summary: Returns all user-defined metadata and system properties for the specified directory.
-- uid: az_storage_entity
-  name: az storage entity
-  summary: Manage table storage entities.
-- uid: az_storage_entity_delete
-  name: az storage entity delete
-  summary: Deletes an existing entity in a table.
-- uid: az_storage_entity_insert
-  name: az storage entity insert
-  summary: Insert an entity into a table.
-- uid: az_storage_entity_merge
-  name: az storage entity merge
-  summary: Updates an existing entity by merging the entity's properties.
-- uid: az_storage_entity_query
-  name: az storage entity query
-  summary: List entities which satisfy a query.
-- uid: az_storage_entity_replace
-  name: az storage entity replace
-  summary: Updates an existing entity in a table.
-- uid: az_storage_entity_show
-  name: az storage entity show
-  summary: Get an entity from the specified table.
-- uid: az_storage_file
-  name: az storage file
-  summary: Manage file shares that use the SMB 3.0 protocol.
-- uid: az_storage_file_copy
-  name: az storage file copy
-  summary: Manage file copy operations.
-- uid: az_storage_file_copy_cancel
-  name: az storage file copy cancel
-  summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
-- uid: az_storage_file_copy_start
-  name: az storage file copy start
-  summary: Copy a file asynchronously.
-- uid: az_storage_file_copy_start_batch
-  name: az storage file copy start-batch
-  summary: Copy multiple files or blobs to a file share.
-- uid: az_storage_file_delete
-  name: az storage file delete
-  summary: Marks the specified file for deletion.
-- uid: az_storage_file_delete_batch
-  name: az storage file delete-batch
-  summary: Delete files from an Azure Storage File Share.
-- uid: az_storage_file_download
-  name: az storage file download
-  summary: Downloads a file to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_file_download_batch
-  name: az storage file download-batch
-  summary: Download files from an Azure Storage File Share to a local directory in a batch operation.
-- uid: az_storage_file_exists
-  name: az storage file exists
-  summary: Check for the existence of a file.
-- uid: az_storage_file_generate_sas
-  name: az storage file generate-sas
-  summary: Generates a shared access signature for the file.
-- uid: az_storage_file_list
-  name: az storage file list
-  summary: List files and directories in a share.
-- uid: az_storage_file_metadata
-  name: az storage file metadata
-  summary: Manage file metadata.
-- uid: az_storage_file_metadata_show
-  name: az storage file metadata show
-  summary: Returns all user-defined metadata for the specified file.
-- uid: az_storage_file_metadata_update
-  name: az storage file metadata update
-  summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
-- uid: az_storage_file_resize
-  name: az storage file resize
-  summary: Resizes a file to the specified size.
-- uid: az_storage_file_show
-  name: az storage file show
-  summary: Returns all user-defined metadata, standard HTTP properties, and system properties for the file.
-- uid: az_storage_file_update
-  name: az storage file update
-  summary: Sets system properties on the file.
-- uid: az_storage_file_upload
-  name: az storage file upload
-  summary: Upload a file to a share that uses the SMB 3.0 protocol.
-- uid: az_storage_file_upload_batch
-  name: az storage file upload-batch
-  summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
-- uid: az_storage_file_url
-  name: az storage file url
-  summary: Create the url to access a file.
-- uid: az_storage_logging
-  name: az storage logging
-  summary: Manage storage service logging information.
-- uid: az_storage_logging_off
-  name: az storage logging off
-  summary: Turn off logging for a storage account.
-- uid: az_storage_logging_show
-  name: az storage logging show
-  summary: Show logging settings for a storage account.
-- uid: az_storage_logging_update
-  name: az storage logging update
-  summary: Update logging settings for a storage account.
-- uid: az_storage_message
-  name: az storage message
-  summary: Manage queue storage messages.
-- uid: az_storage_message_clear
-  name: az storage message clear
-  summary: Deletes all messages from the specified queue.
-- uid: az_storage_message_delete
-  name: az storage message delete
-  summary: Deletes the specified message.
-- uid: az_storage_message_get
-  name: az storage message get
-  summary: Retrieves one or more messages from the front of the queue.
-- uid: az_storage_message_peek
-  name: az storage message peek
-  summary: Retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.
-- uid: az_storage_message_put
-  name: az storage message put
-  summary: Adds a new message to the back of the message queue.
-- uid: az_storage_message_update
-  name: az storage message update
-  summary: Updates the visibility timeout of a message.
-- uid: az_storage_metrics
-  name: az storage metrics
-  summary: Manage storage service metrics.
-- uid: az_storage_metrics_show
-  name: az storage metrics show
-  summary: Show metrics settings for a storage account.
-- uid: az_storage_metrics_update
-  name: az storage metrics update
-  summary: Update metrics settings for a storage account.
-- uid: az_storage_queue
-  name: az storage queue
-  summary: Manage shared access policies of a storage table.
-- uid: az_storage_queue_create
-  name: az storage queue create
-  summary: Creates a queue under the given account.
-- uid: az_storage_queue_delete
-  name: az storage queue delete
-  summary: Deletes the specified queue and any messages it contains.
-- uid: az_storage_queue_exists
-  name: az storage queue exists
-  summary: Returns a boolean indicating whether the queue exists.
-- uid: az_storage_queue_generate_sas
-  name: az storage queue generate-sas
-  summary: Generates a shared access signature for the queue.
-- uid: az_storage_queue_list
-  name: az storage queue list
-  summary: List queues in a storage account.
-- uid: az_storage_queue_metadata
-  name: az storage queue metadata
-  summary: Manage the metadata for a storage queue.
-- uid: az_storage_queue_metadata_show
-  name: az storage queue metadata show
-  summary: Retrieves user-defined metadata and queue properties on the specified queue.
-- uid: az_storage_queue_metadata_update
-  name: az storage queue metadata update
-  summary: Sets user-defined metadata on the specified queue.
-- uid: az_storage_queue_policy
-  name: az storage queue policy
-  summary: Manage shared access policies for a storage queue.
-- uid: az_storage_queue_policy_create
-  name: az storage queue policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_queue_policy_delete
-  name: az storage queue policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_queue_policy_list
-  name: az storage queue policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_queue_policy_show
-  name: az storage queue policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_queue_policy_update
-  name: az storage queue policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_remove
-  name: az storage remove
-  summary: Delete blobs or files from Azure Storage.
-- uid: az_storage_share
-  name: az storage share
-  summary: Manage file shares.
-- uid: az_storage_share_create
-  name: az storage share create
-  summary: Creates a new share under the specified account.
-- uid: az_storage_share_delete
-  name: az storage share delete
-  summary: Marks the specified share for deletion.
-- uid: az_storage_share_exists
-  name: az storage share exists
-  summary: Check for the existence of a file share.
-- uid: az_storage_share_generate_sas
-  name: az storage share generate-sas
-  summary: Generates a shared access signature for the share.
-- uid: az_storage_share_list
-  name: az storage share list
-  summary: List the file shares in a storage account.
-- uid: az_storage_share_metadata
-  name: az storage share metadata
-  summary: Manage the metadata of a file share.
-- uid: az_storage_share_metadata_show
-  name: az storage share metadata show
-  summary: Returns all user-defined metadata for the specified share.
-- uid: az_storage_share_metadata_update
-  name: az storage share metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified share.
-- uid: az_storage_share_policy
-  name: az storage share policy
-  summary: Manage shared access policies of a storage file share.
-- uid: az_storage_share_policy_create
-  name: az storage share policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_share_policy_delete
-  name: az storage share policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_share_policy_list
-  name: az storage share policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_share_policy_show
-  name: az storage share policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_share_policy_update
-  name: az storage share policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_share_show
-  name: az storage share show
-  summary: Returns all user-defined metadata and system properties for the specified share.
-- uid: az_storage_share_stats
-  name: az storage share stats
-  summary: Gets the approximate size of the data stored on the share, rounded up to the nearest gigabyte.
-- uid: az_storage_share_update
-  name: az storage share update
-  summary: Sets service-defined properties for the specified share.
-- uid: az_storage_share_url
-  name: az storage share url
-  summary: Create a URI to access a file share.
-- uid: az_storage_table
-  name: az storage table
-  summary: Manage NoSQL key-value storage.
-- uid: az_storage_table_create
-  name: az storage table create
-  summary: Creates a new table in the storage account.
-- uid: az_storage_table_delete
-  name: az storage table delete
-  summary: Deletes the specified table and any data it contains.
-- uid: az_storage_table_exists
-  name: az storage table exists
-  summary: Returns a boolean indicating whether the table exists.
-- uid: az_storage_table_generate_sas
-  name: az storage table generate-sas
-  summary: Generates a shared access signature for the table.
-- uid: az_storage_table_list
-  name: az storage table list
-  summary: List tables in a storage account.
-- uid: az_storage_table_policy
-  name: az storage table policy
-  summary: Manage shared access policies of a storage table.
-- uid: az_storage_table_policy_create
-  name: az storage table policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_table_policy_delete
-  name: az storage table policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_table_policy_list
-  name: az storage table policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_table_policy_show
-  name: az storage table policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_table_policy_update
-  name: az storage table policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_account
+- az_storage_account_blob-inventory-policy
+- az_storage_account_blob-inventory-policy_create
+- az_storage_account_blob-inventory-policy_delete
+- az_storage_account_blob-inventory-policy_show
+- az_storage_account_blob-inventory-policy_update
+- az_storage_account_blob-service-properties
+- az_storage_account_blob-service-properties_show
+- az_storage_account_blob-service-properties_update
+- az_storage_account_check-name
+- az_storage_account_create
+- az_storage_account_delete
+- az_storage_account_file-service-properties
+- az_storage_account_file-service-properties_show
+- az_storage_account_file-service-properties_update
+- az_storage_account_generate-sas
+- az_storage_account_keys
+- az_storage_account_keys_list
+- az_storage_account_keys_renew
+- az_storage_account_list
+- az_storage_account_network-rule
+- az_storage_account_network-rule_add
+- az_storage_account_network-rule_list
+- az_storage_account_network-rule_remove
+- az_storage_account_show
+- az_storage_account_show-connection-string
+- az_storage_account_show-usage
+- az_storage_azcopy
+- az_storage_azcopy_blob
+- az_storage_azcopy_blob_delete
+- az_storage_azcopy_blob_download
+- az_storage_azcopy_blob_sync
+- az_storage_azcopy_blob_upload
+- az_storage_azcopy_run-command
+- az_storage_blob
+- az_storage_blob_access
+- az_storage_blob_access_set
+- az_storage_blob_access_show
+- az_storage_blob_access_update
+- az_storage_blob_copy
+- az_storage_blob_copy_cancel
+- az_storage_blob_copy_start
+- az_storage_blob_copy_start-batch
+- az_storage_blob_delete
+- az_storage_blob_delete-batch
+- az_storage_blob_directory
+- az_storage_blob_directory_access
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+- az_storage_blob_directory_create
+- az_storage_blob_directory_delete
+- az_storage_blob_directory_download
+- az_storage_blob_directory_exists
+- az_storage_blob_directory_list
+- az_storage_blob_directory_metadata
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+- az_storage_blob_directory_move
+- az_storage_blob_directory_show
+- az_storage_blob_directory_upload
+- az_storage_blob_download
+- az_storage_blob_download-batch
+- az_storage_blob_exists
+- az_storage_blob_filter
+- az_storage_blob_generate-sas
+- az_storage_blob_lease
+- az_storage_blob_lease_acquire
+- az_storage_blob_lease_break
+- az_storage_blob_lease_change
+- az_storage_blob_lease_release
+- az_storage_blob_lease_renew
+- az_storage_blob_list
+- az_storage_blob_metadata
+- az_storage_blob_metadata_show
+- az_storage_blob_metadata_update
+- az_storage_blob_move
+- az_storage_blob_service-properties
+- az_storage_blob_service-properties_delete-policy
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+- az_storage_blob_service-properties_show
+- az_storage_blob_service-properties_update
+- az_storage_blob_set-tier
+- az_storage_blob_show
+- az_storage_blob_snapshot
+- az_storage_blob_sync
+- az_storage_blob_tag
+- az_storage_blob_tag_list
+- az_storage_blob_tag_set
+- az_storage_blob_undelete
+- az_storage_blob_update
+- az_storage_blob_upload
+- az_storage_blob_upload-batch
+- az_storage_blob_url
+- az_storage_container
+- az_storage_container_create
+- az_storage_container_delete
+- az_storage_container_exists
+- az_storage_container_generate-sas
+- az_storage_container_lease
+- az_storage_container_lease_acquire
+- az_storage_container_lease_break
+- az_storage_container_lease_change
+- az_storage_container_lease_release
+- az_storage_container_lease_renew
+- az_storage_container_list
+- az_storage_container_metadata
+- az_storage_container_metadata_show
+- az_storage_container_metadata_update
+- az_storage_container_policy
+- az_storage_container_policy_create
+- az_storage_container_policy_delete
+- az_storage_container_policy_list
+- az_storage_container_policy_show
+- az_storage_container_restore
+- az_storage_container_set-permission
+- az_storage_container_show
+- az_storage_container_show-permission
+- az_storage_copy
+- az_storage_cors
+- az_storage_cors_add
+- az_storage_cors_clear
+- az_storage_cors_list
+- az_storage_directory
+- az_storage_directory_create
+- az_storage_directory_delete
+- az_storage_directory_exists
+- az_storage_directory_list
+- az_storage_directory_metadata
+- az_storage_directory_metadata_show
+- az_storage_directory_metadata_update
+- az_storage_directory_show
+- az_storage_entity
+- az_storage_entity_delete
+- az_storage_entity_insert
+- az_storage_entity_merge
+- az_storage_entity_query
+- az_storage_entity_replace
+- az_storage_entity_show
+- az_storage_file
+- az_storage_file_copy
+- az_storage_file_copy_cancel
+- az_storage_file_copy_start
+- az_storage_file_copy_start-batch
+- az_storage_file_delete
+- az_storage_file_delete-batch
+- az_storage_file_download
+- az_storage_file_download-batch
+- az_storage_file_exists
+- az_storage_file_generate-sas
+- az_storage_file_list
+- az_storage_file_metadata
+- az_storage_file_metadata_show
+- az_storage_file_metadata_update
+- az_storage_file_resize
+- az_storage_file_show
+- az_storage_file_update
+- az_storage_file_upload
+- az_storage_file_upload-batch
+- az_storage_file_url
+- az_storage_fs
+- az_storage_fs_list-deleted-path
+- az_storage_fs_service-properties
+- az_storage_fs_service-properties_show
+- az_storage_fs_service-properties_update
+- az_storage_fs_undelete-path
+- az_storage_logging
+- az_storage_logging_off
+- az_storage_logging_show
+- az_storage_logging_update
+- az_storage_message
+- az_storage_message_clear
+- az_storage_message_delete
+- az_storage_message_get
+- az_storage_message_peek
+- az_storage_message_put
+- az_storage_message_update
+- az_storage_metrics
+- az_storage_metrics_show
+- az_storage_metrics_update
+- az_storage_queue
+- az_storage_queue_create
+- az_storage_queue_delete
+- az_storage_queue_exists
+- az_storage_queue_generate-sas
+- az_storage_queue_list
+- az_storage_queue_metadata
+- az_storage_queue_metadata_show
+- az_storage_queue_metadata_update
+- az_storage_queue_policy
+- az_storage_queue_policy_create
+- az_storage_queue_policy_delete
+- az_storage_queue_policy_list
+- az_storage_queue_policy_show
+- az_storage_queue_policy_update
+- az_storage_remove
+- az_storage_share
+- az_storage_share_create
+- az_storage_share_delete
+- az_storage_share_exists
+- az_storage_share_generate-sas
+- az_storage_share_list
+- az_storage_share_metadata
+- az_storage_share_metadata_show
+- az_storage_share_metadata_update
+- az_storage_share_policy
+- az_storage_share_policy_create
+- az_storage_share_policy_delete
+- az_storage_share_policy_list
+- az_storage_share_policy_show
+- az_storage_share_policy_update
+- az_storage_share_show
+- az_storage_share_stats
+- az_storage_share_update
+- az_storage_share_url
+- az_storage_table
+- az_storage_table_create
+- az_storage_table_delete
+- az_storage_table_exists
+- az_storage_table_generate-sas
+- az_storage_table_list
+- az_storage_table_policy
+- az_storage_table_policy_create
+- az_storage_table_policy_delete
+- az_storage_table_policy_list
+- az_storage_table_policy_show
+- az_storage_table_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -796,10 +453,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage Azure Cloud Storage resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage Azure Cloud Storage resources.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/account.yml b/2017-03-09-profile/docs-ref-autogen/storage/account.yml
index 41f13be393..e704531531 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/account.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/account.yml
@@ -1,115 +1,167 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_account_check_name
-  - az_storage_account_create
-  - az_storage_account_delete
-  - az_storage_account_generate_sas
-  - az_storage_account_list
-  - az_storage_account_show
-  - az_storage_account_show_connection_string
-  - az_storage_account_show_usage
-- uid: az_storage_account_check_name
+### YamlMime:AzureCLIGroup
+uid: az_storage_account
+name: az storage account
+summary: Manage storage accounts.
+description: ''
+directCommands:
+- uid: az_storage_account_check-name
   name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
+  summary: Check that the storage account name is valid and is not already in use.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage account check-name --name
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: ''
+    summary: The name of the storage account within the specified resource group.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_create
   name: az storage account create
   summary: Create a storage account.
   description: The SKU of the storage account defaults to 'Standard_RAGRS'.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account create --name
+                              --resource-group
+                              [--access-tier {Cool, Hot}]
+                              [--allow-blob-public-access]
+                              [--allow-cross-tenant-replication]
+                              [--allow-shared-key-access]
+                              [--custom-domain]
+                              [--default-share-permission]
+                              [--edge-zone]
+                              [--encryption-key-name]
+                              [--encryption-key-source]
+                              [--encryption-key-vault]
+                              [--encryption-key-version]
+                              [--https-only {false, true}]
+                              [--identity-type]
+                              [--key-expiration-period-in-days]
+                              [--key-vault-user-identity-id]
+                              [--kind {BlobStorage, Storage}]
+                              [--location]
+                              [--min-tls-version]
+                              [--require-infrastructure-encryption]
+                              [--sas-expiration-period]
+                              [--sku {Premium_LRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS}]
+                              [--subscription]
+                              [--tags]
+                              [--user-identity-id]
   examples:
   - summary: Create a storage account 'mystorageaccount' in resource group 'MyResourceGroup' in the West US region with locally redundant storage.
-    syntax:
-      content: az storage account create -n mystorageaccount -g MyResourceGroup -l westus --account-type Standard_LRS
+    syntax: az storage account create -n mystorageaccount -g MyResourceGroup -l westus --account-type Standard_LRS
   - summary: Create a storage account 'mystorageaccount' in resource group 'MyResourceGroup' in the eastus2euap region with account-scoped encryption key enabled for Table Service.
-    syntax:
-      content: az storage account create -n mystorageaccount -g MyResourceGroup --kind StorageV2 -l eastus2euap -t Account
-  parameters:
+    syntax: az storage account create -n mystorageaccount -g MyResourceGroup --kind StorageV2 -l eastus2euap -t Account
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The storage account name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --access-tier
     parameterValueGroup: Cool, Hot
     summary: The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. It is required for StandardBlob accounts during creation.
     description: ''
+  - name: --allow-blob-public-access
+    summary: ''
+    description: ''
+  - name: --allow-cross-tenant-replication
+    summary: ''
+    description: ''
+  - name: --allow-shared-key-access
+    summary: ''
+    description: ''
   - name: --custom-domain
     summary: User domain assigned to the storage account. Name is the CNAME source.
     description: ''
+  - name: --default-share-permission
+    summary: ''
+    description: ''
+  - name: --edge-zone
+    summary: ''
+    description: ''
+  - name: --encryption-key-name
+    summary: ''
+    description: ''
+  - name: --encryption-key-source
+    summary: ''
+    description: ''
+  - name: --encryption-key-vault
+    summary: ''
+    description: ''
+  - name: --encryption-key-version
+    summary: ''
+    description: ''
   - name: --https-only
     parameterValueGroup: false, true
     summary: Allow https traffic only to storage service if set to true. The default value is false.
     description: ''
+  - name: --identity-type
+    summary: ''
+    description: ''
+  - name: --key-expiration-period-in-days
+    summary: ''
+    description: ''
+  - name: --key-vault-user-identity-id
+    summary: ''
+    description: ''
   - name: --kind
     defaultValue: Storage
     parameterValueGroup: BlobStorage, Storage
-    summary: Indicates the type of storage account.
+    summary: Indicate the type of storage account.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --min-tls-version
+    summary: ''
+    description: ''
+  - name: --require-infrastructure-encryption
+    summary: ''
+    description: ''
+  - name: --sas-expiration-period
+    summary: ''
     description: ''
   - name: --sku
     defaultValue: Standard_RAGRS
     parameterValueGroup: Premium_LRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS
     summary: The storage account SKU.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --user-identity-id
+    summary: ''
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_delete
   name: az storage account delete
   summary: Delete a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account delete [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Delete a storage account using a resource ID.
-    syntax:
-      content: az storage account delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
+    syntax: az storage account delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
   - summary: Delete a storage account using an account name and resource group.
-    syntax:
-      content: az storage account delete -n MyStorageAccount -g MyResourceGroup
-  parameters:
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az storage account delete -n MyStorageAccount -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -117,40 +169,46 @@ items:
     summary: The storage account name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_account_generate_sas
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_account_generate-sas
   name: az storage account generate-sas
-  summary: Generates a shared access signature for the account.
+  summary: Generate a shared access signature for the storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account generate-sas --expiry
+                                    --permissions
+                                    --resource-types
+                                    --services
+                                    [--account-key]
+                                    [--account-name]
+                                    [--connection-string]
+                                    [--https-only]
+                                    [--ids]
+                                    [--ip]
+                                    [--start]
+                                    [--subscription]
   examples:
   - summary: Generate a sas token for the account that is valid for queue and table services on Linux.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
+      az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
   - summary: Generate a sas token for the account that is valid for queue and table services on MacOS.
-    syntax:
-      content: >-
-        end=`date -v+30M '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -v+30M '+%Y-%m-%dT%H:%MZ'`
 
-        az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
+      az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
   - summary: Generate a shared access signature for the account (autogenerated)
-    syntax:
-      content: az storage account generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2020-01-01 --https-only --permissions acuw --resource-types co --services bfqt
-  parameters:
+    syntax: az storage account generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2020-01-01 --https-only --permissions acuw --resource-types co --services bfqt
+  requiredParameters:
   - isRequired: true
     name: --expiry
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes invalid.
@@ -167,119 +225,127 @@ items:
     name: --services
     summary: 'The storage services the SAS is applicable for. Allowed values: (b)lob (f)ile (q)ueue (t)able. Can be combined.'
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Must be used in conjunction with either storage account key or a SAS token. Environment Variable: AZURE_STORAGE_ACCOUNT.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --https-only
     summary: Only permit requests made with the HTTPS protocol. If omitted, requests from both the HTTP and HTTPS protocol are permitted.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --ip
     summary: Specifies the IP address or range of IP addresses from which to accept requests. Supports only IPv4 style addresses.
     description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Defaults to the time of the request.
     description: ''
-  - name: --account-name
-    summary: 'Storage account name. Must be used in conjunction with either storage account key or a SAS token. Environment Variable: AZURE_STORAGE_ACCOUNT.'
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_list
   name: az storage account list
   summary: List storage accounts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: List all storage accounts in a subscription.
-    syntax:
-      content: az storage account list
+    syntax: az storage account list
   - summary: List all storage accounts in a resource group.
-    syntax:
-      content: az storage account list -g MyResourceGroup
-  parameters:
+    syntax: az storage account list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_show
   name: az storage account show
   summary: Show storage account properties.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account show [--ids]
+                            [--name]
+                            [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Show properties for a storage account by resource ID.
-    syntax:
-      content: az storage account show --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
+    syntax: az storage account show --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
   - summary: Show properties for a storage account using an account name and resource group.
-    syntax:
-      content: az storage account show -g MyResourceGroup -n MyStorageAccount
-  parameters:
+    syntax: az storage account show -g MyResourceGroup -n MyStorageAccount
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The storage account name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_account_show_connection_string
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_account_show-connection-string
   name: az storage account show-connection-string
   summary: Get the connection string for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account show-connection-string [--blob-endpoint]
+                                              [--file-endpoint]
+                                              [--ids]
+                                              [--key {primary, secondary}]
+                                              [--name]
+                                              [--protocol {http, https}]
+                                              [--queue-endpoint]
+                                              [--resource-group]
+                                              [--sas-token]
+                                              [--subscription]
+                                              [--table-endpoint]
   examples:
   - summary: Get a connection string for a storage account.
-    syntax:
-      content: az storage account show-connection-string -g MyResourceGroup -n MyStorageAccount
+    syntax: az storage account show-connection-string -g MyResourceGroup -n MyStorageAccount
   - summary: Get the connection string for a storage account. (autogenerated)
-    syntax:
-      content: az storage account show-connection-string --name MyStorageAccount --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az storage account show-connection-string --name MyStorageAccount --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --blob-endpoint
     summary: Custom endpoint for blobs.
     description: ''
   - name: --file-endpoint
     summary: Custom endpoint for files.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --key
     defaultValue: primary
     parameterValueGroup: primary, secondary
     summary: The key to use.
     description: ''
+  - name: --name -n
+    summary: The storage account name.
+    description: ''
   - name: --protocol
     defaultValue: https
     parameterValueGroup: http, https
@@ -288,84 +354,59 @@ items:
   - name: --queue-endpoint
     summary: Custom endpoint for queues.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --sas-token
     summary: The SAS token to be used in the connection-string.
     description: ''
-  - name: --table-endpoint
-    summary: Custom endpoint for tables.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_account_show_usage
+  - name: --table-endpoint
+    summary: Custom endpoint for tables.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_account_show-usage
   name: az storage account show-usage
   summary: Show the current count and limit of the storage accounts under the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: az storage account show-usage [--subscription]
   examples:
   - summary: Show the current count and limit of the storage accounts under the subscription. (autogenerated)
-    syntax:
-      content: az storage account show-usage --location westus2
-  parameters:
+    syntax: az storage account show-usage --location westus2
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: az_storage_account_generate_sas
-  name: az storage account generate-sas
-  summary: Generates a shared access signature for the account.
-- uid: az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: az_storage_account_show_connection_string
-  name: az storage account show-connection-string
-  summary: Get the connection string for a storage account.
-- uid: az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
+- az_storage_account_blob-inventory-policy
+- az_storage_account_blob-inventory-policy_create
+- az_storage_account_blob-inventory-policy_delete
+- az_storage_account_blob-inventory-policy_show
+- az_storage_account_blob-inventory-policy_update
+- az_storage_account_blob-service-properties
+- az_storage_account_blob-service-properties_show
+- az_storage_account_blob-service-properties_update
+- az_storage_account_check-name
+- az_storage_account_create
+- az_storage_account_delete
+- az_storage_account_file-service-properties
+- az_storage_account_file-service-properties_show
+- az_storage_account_file-service-properties_update
+- az_storage_account_generate-sas
+- az_storage_account_keys
+- az_storage_account_keys_list
+- az_storage_account_keys_renew
+- az_storage_account_list
+- az_storage_account_network-rule
+- az_storage_account_network-rule_add
+- az_storage_account_network-rule_list
+- az_storage_account_network-rule_remove
+- az_storage_account_show
+- az_storage_account_show-connection-string
+- az_storage_account_show-usage
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -381,10 +422,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage accounts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage accounts.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/account/blob-inventory-policy.yml b/2017-03-09-profile/docs-ref-autogen/storage/account/blob-inventory-policy.yml
new file mode 100644
index 0000000000..cc7a3570b7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/account/blob-inventory-policy.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_blob-inventory-policy
+name: az storage account blob-inventory-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage account blob-inventory-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage storage account Blob Inventory Policy.
+description: ''
+directCommands:
+- uid: az_storage_account_blob-inventory-policy_create
+  name: az storage account blob-inventory-policy create
+  summary: Create Blob Inventory Policy for storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy create --account-name
+                                                    --policy
+                                                    [--resource-group]
+  examples:
+  - summary: Create Blob Inventory Policy trough json file for storage account.
+    syntax: az storage account blob-inventory-policy create -g ResourceGroupName --account-name storageAccountName --policy @policy.json
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  - isRequired: true
+    name: --policy
+    summary: 'The Storage Account Blob Inventory Policy, string in JSON format or json file path. See more details in: {https://review.docs.microsoft.com/en-us/azure/storage/blobs/blob-inventory?branch=pr-en-us-135665}.'
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_blob-inventory-policy_delete
+  name: az storage account blob-inventory-policy delete
+  summary: Delete Blob Inventory Policy associated with the specified storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy delete --account-name
+                                                    [--resource-group]
+                                                    [--yes]
+  examples:
+  - summary: Delete Blob Inventory Policy associated with the specified storage account without prompt.
+    syntax: az storage account blob-inventory-policy delete -g ResourceGroupName --account-name storageAccountName -y
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storage_account_blob-inventory-policy_show
+  name: az storage account blob-inventory-policy show
+  summary: Show Blob Inventory Policy properties associated with the specified storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy show --account-name
+                                                  [--resource-group]
+  examples:
+  - summary: Show Blob Inventory Policy properties associated with the specified storage account without prompt.
+    syntax: az storage account blob-inventory-policy show -g ResourceGroupName --account-name storageAccountName
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_blob-inventory-policy_update
+  name: az storage account blob-inventory-policy update
+  summary: Update Blob Inventory Policy associated with the specified storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy update --account-name
+                                                    [--add]
+                                                    [--force-string]
+                                                    [--remove]
+                                                    [--resource-group]
+                                                    [--set]
+  examples:
+  - summary: Update Blob Inventory Policy associated with the specified storage account.
+    syntax: az storage account blob-inventory-policy update -g ResourceGroupName --account-name storageAccountName --set "policy.rules[0].name=newname"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_storage_account_blob-inventory-policy_create
+- az_storage_account_blob-inventory-policy_delete
+- az_storage_account_blob-inventory-policy_show
+- az_storage_account_blob-inventory-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage storage account Blob Inventory Policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/account/blob-service-properties.yml b/2017-03-09-profile/docs-ref-autogen/storage/account/blob-service-properties.yml
new file mode 100644
index 0000000000..a05e53fcc4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/account/blob-service-properties.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_blob-service-properties
+name: az storage account blob-service-properties
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-blob-preview** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az storage account blob-service-properties** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the properties of a storage account's blob service.
+description: ''
+directCommands:
+- uid: az_storage_account_blob-service-properties_show
+  name: az storage account blob-service-properties show
+  summary: Show the properties of a storage account's blob service.
+  description: Show the properties of a storage account's blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+  syntax: >-
+    az storage account blob-service-properties show --account-name
+                                                    [--resource-group]
+  examples:
+  - summary: Show the properties of the storage account 'mystorageaccount' in resource group 'MyResourceGroup'.
+    syntax: az storage account blob-service-properties show -n mystorageaccount -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_blob-service-properties_update
+  name: az storage account blob-service-properties update
+  summary: Update the properties of a storage account's blob service.
+  description: Update the properties of a storage account's blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+  syntax: >-
+    az storage account blob-service-properties update --account-name
+                                                      [--add]
+                                                      [--change-feed-days]
+                                                      [--container-days]
+                                                      [--container-retention {false, true}]
+                                                      [--default-service-version]
+                                                      [--delete-retention-days]
+                                                      [--enable-change-feed {false, true}]
+                                                      [--enable-delete-retention {false, true}]
+                                                      [--enable-last-access-tracking {false, true}]
+                                                      [--enable-restore-policy {false, true}]
+                                                      [--enable-versioning {false, true}]
+                                                      [--force-string]
+                                                      [--remove]
+                                                      [--resource-group]
+                                                      [--restore-days]
+                                                      [--set]
+  examples:
+  - summary: Enable change feed and set change feed retention days to infinite for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-change-feed true -n mystorageaccount -g myresourcegroup
+  - summary: Enable change feed and set change feed retention days to 100 for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-change-feed --change-feed-days 100 -n mystorageaccount -g myresourcegroup
+  - summary: Disable change feed for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-change-feed false -n mystorageaccount -g myresourcegroup
+  - summary: Enable delete retention policy and set delete retention days to 100 for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-delete-retention true --delete-retention-days 100 -n mystorageaccount -g myresourcegroup
+  - summary: Enable versioning for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-versioning -n mystorageaccount -g myresourcegroup
+  - summary: Set default version for incoming request for storage account 'mystorageaccount'.
+    syntax: az storage account blob-service-properties update --default-service-version 2020-04-08 -n mystorageaccount -g myresourcegroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --change-feed-days --change-feed-retention-days
+    summary: Indicate the duration of changeFeed retention in days. Minimum value is 1 day and maximum value is 146000 days (400 years). A null value indicates an infinite retention of the change feed.(Use `--enable-change-feed` without `--change-feed-days` to indicate null).
+    description: ''
+  - name: --container-days --container-delete-retention-days
+    summary: Indicate the number of days that the deleted container should be retained. The minimum specified value can be 1 and the maximum value can be 365.
+    description: ''
+  - name: --container-retention --enable-container-delete-retention
+    parameterValueGroup: false, true
+    summary: Enable container delete retention policy for container soft delete when set to true. Disable container delete retention policy when set to false.
+    description: ''
+  - name: --default-service-version -d
+    summary: Indicate the default version to use for requests to the Blob service if an incoming request's version is not specified.
+    description: ''
+  - name: --delete-retention-days
+    summary: Indicate the number of days that the deleted blob should be retained. The value must be in range [1,365]. It must be provided when `--enable-delete-retention` is true.
+    description: ''
+  - name: --enable-change-feed
+    parameterValueGroup: false, true
+    summary: Indicate whether change feed event logging is enabled. If it is true, you enable the storage account to begin capturing changes. The default value is true. You can see more details in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-change-feed?tabs=azure-portal#register-by-using-azure-cli.
+    description: ''
+  - name: --enable-delete-retention
+    parameterValueGroup: false, true
+    summary: Indicate whether delete retention policy is enabled for the blob service.
+    description: ''
+  - name: --enable-last-access-tracking -t
+    parameterValueGroup: false, true
+    summary: When set to true last access time based tracking policy is enabled.
+    description: ''
+  - name: --enable-restore-policy
+    parameterValueGroup: false, true
+    summary: Enable blob restore policy when it set to true.
+    description: ''
+  - name: --enable-versioning
+    parameterValueGroup: false, true
+    summary: Versioning is enabled if set to true.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --restore-days
+    summary: The number of days for the blob can be restored. It should be greater than zero and less than Delete Retention Days.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_storage_account_blob-service-properties_show
+- az_storage_account_blob-service-properties_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the properties of a storage account's blob service.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/account/file-service-properties.yml b/2017-03-09-profile/docs-ref-autogen/storage/account/file-service-properties.yml
new file mode 100644
index 0000000000..e430d0d39d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/account/file-service-properties.yml
@@ -0,0 +1,122 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_file-service-properties
+name: az storage account file-service-properties
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage account file-service-properties** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the properties of file service in storage account.
+description: ''
+directCommands:
+- uid: az_storage_account_file-service-properties_show
+  name: az storage account file-service-properties show
+  summary: Show the properties of file service in storage account.
+  description: Show the properties of file service in storage account.
+  syntax: >-
+    az storage account file-service-properties show --account-name
+                                                    [--resource-group]
+  examples:
+  - summary: Show the properties of file service in storage account.
+    syntax: az storage account file-service-properties show -n mystorageaccount -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_file-service-properties_update
+  name: az storage account file-service-properties update
+  summary: Update the properties of file service in storage account.
+  description: Update the properties of file service in storage account.
+  syntax: >-
+    az storage account file-service-properties update --account-name
+                                                      [--add]
+                                                      [--auth-methods]
+                                                      [--channel-encryption]
+                                                      [--delete-retention-days]
+                                                      [--enable-delete-retention {false, true}]
+                                                      [--enable-smb-multichannel {false, true}]
+                                                      [--force-string]
+                                                      [--kerb-ticket-encryption]
+                                                      [--remove]
+                                                      [--resource-group]
+                                                      [--set]
+                                                      [--versions]
+  examples:
+  - summary: Enable soft delete policy and set delete retention days to 100 for file service in storage account.
+    syntax: az storage account file-service-properties update --enable-delete-retention true --delete-retention-days 100 -n mystorageaccount -g MyResourceGroup
+  - summary: Disable soft delete policy for file service.
+    syntax: az storage account file-service-properties update --enable-delete-retention false -n mystorageaccount -g MyResourceGroup
+  - summary: Enable SMB Multichannel setting for file service.
+    syntax: az storage account file-service-properties update --enable-smb-multichannel -n mystorageaccount -g MyResourceGroup
+  - summary: Disable SMB Multichannel setting for file service.
+    syntax: az storage account file-service-properties update --enable-smb-multichannel false -n mystorageaccount -g MyResourceGroup
+  - summary: Set secured SMB setting for file service.
+    syntax: az storage account file-service-properties update --versions SMB2.1;SMB3.0;SMB3.1.1 --auth-methods NTLMv2;Kerberos --kerb-ticket-encryption RC4-HMAC;AES-256 --channel-encryption AES-CCM-128;AES-GCM-128;AES-GCM-256 -n mystorageaccount -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-methods
+    summary: SMB authentication methods supported by server. Valid values are NTLMv2, Kerberos. Should be passed as a string with delimiter ';'.
+    description: ''
+  - name: --channel-encryption
+    summary: SMB channel encryption supported by server. Valid values are AES-CCM-128, AES-GCM-128, AES-GCM-256. Should be passed as a string with delimiter ';'.
+    description: ''
+  - name: --delete-retention-days
+    summary: Indicate the number of days that the deleted item should be retained. The minimum specified value can be 1 and the maximum value can be 365.
+    description: ''
+  - name: --enable-delete-retention
+    parameterValueGroup: false, true
+    summary: Enable file service properties for share soft delete.
+    description: ''
+  - name: --enable-smb-multichannel --mc
+    parameterValueGroup: false, true
+    summary: Set SMB Multichannel setting for file service. Applies to Premium FileStorage only.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --kerb-ticket-encryption -k
+    summary: Kerberos ticket encryption supported by server. Valid values are RC4-HMAC, AES-256. Should be passed as a string with delimiter ';'.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --versions
+    summary: SMB protocol versions supported by server. Valid values are SMB2.1, SMB3.0, SMB3.1.1. Should be passed as a string with delimiter ';'.
+    description: ''
+commands:
+- az_storage_account_file-service-properties_show
+- az_storage_account_file-service-properties_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the properties of file service in storage account.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/account/keys.yml b/2017-03-09-profile/docs-ref-autogen/storage/account/keys.yml
index d328766a90..5ce854451a 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/account/keys.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/account/keys.yml
@@ -1,58 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_account_keys_list
-  - az_storage_account_keys_renew
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_keys
+name: az storage account keys
+summary: Manage storage account keys.
+description: ''
+directCommands:
 - uid: az_storage_account_keys_list
   name: az storage account keys list
   summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account keys list --account-name
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List the access keys for a storage account.
-    syntax:
-      content: az storage account keys list -g MyResourceGroup -n MyStorageAccount
+    syntax: az storage account keys list -g MyResourceGroup -n MyStorageAccount
   - summary: List the access keys and Kerberos keys (if active directory enabled) for a storage account.
-    syntax:
-      content: az storage account keys list -g MyResourceGroup -n MyStorageAccount --expand-key-type kerb
-  parameters:
+    syntax: az storage account keys list -g MyResourceGroup -n MyStorageAccount --expand-key-type kerb
+  requiredParameters:
   - isRequired: true
     name: --account-name -n
     summary: The storage account name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_keys_renew
   name: az storage account keys renew
   summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
   description: Kerberos key is generated per storage account for Azure Files identity based authentication either with Azure Active Directory Domain Service (Azure AD DS) or Active Directory Domain Service (AD DS). It is used as the password of the identity registered in the domain service that represents the storage account. Kerberos key does not provide access permission to perform any control or data plane read or write operations against the storage account.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account keys renew --account-name
+                                  --key {primary, secondary}
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Regenerate one of the access keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key primary
+    syntax: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key primary
   - summary: Regenerate one of the Kerberos keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key secondary --key-type kerb
-  parameters:
+    syntax: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key secondary --key-type kerb
+  requiredParameters:
   - isRequired: true
     name: --account-name -n
     summary: The storage account name.
@@ -62,25 +58,17 @@ items:
     parameterValueGroup: primary, secondary
     summary: The key options to regenerate.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
+- az_storage_account_keys_list
+- az_storage_account_keys_renew
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -96,10 +84,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage account keys.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage account keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/account/network-rule.yml b/2017-03-09-profile/docs-ref-autogen/storage/account/network-rule.yml
new file mode 100644
index 0000000000..f805ab1aaa
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/account/network-rule.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_network-rule
+name: az storage account network-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage account network-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage network rules.
+description: ''
+directCommands:
+- uid: az_storage_account_network-rule_add
+  name: az storage account network-rule add
+  summary: Add a network rule.
+  description: Rules can be created for an IPv4 address, address range (CIDR format), or a virtual network subnet.
+  syntax: >-
+    az storage account network-rule add --account-name
+                                        --resource-group
+                                        [--action]
+                                        [--ip-address]
+                                        [--resource-id]
+                                        [--subnet]
+                                        [--tenant-id]
+                                        [--vnet-name]
+  examples:
+  - summary: Create a rule to allow a specific address-range.
+    syntax: az storage account network-rule add -g myRg --account-name mystorageaccount --ip-address 23.45.1.0/24
+  - summary: Create a rule to allow access for a subnet.
+    syntax: az storage account network-rule add -g myRg --account-name mystorageaccount --vnet-name myvnet --subnet mysubnet
+  - summary: Create a rule to allow access for a subnet in another resource group.
+    syntax: az storage account network-rule add -g myRg --account-name mystorageaccount  --subnet $subnetId
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    defaultValue: Allow
+    summary: The action of virtual network rule.
+    description: ''
+  - name: --ip-address
+    summary: IPv4 address or CIDR range.
+    description: ''
+  - name: --resource-id
+    summary: The resource id to add in network rule.
+    description: ''
+  - name: --subnet
+    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id to add in network rule.
+    description: ''
+  - name: --vnet-name
+    summary: Name of a virtual network.
+    description: ''
+- uid: az_storage_account_network-rule_list
+  name: az storage account network-rule list
+  summary: List network rules.
+  description: ''
+  syntax: >-
+    az storage account network-rule list --account-name
+                                         --resource-group
+  examples:
+  - summary: List network rules. (autogenerated)
+    syntax: az storage account network-rule list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_network-rule_remove
+  name: az storage account network-rule remove
+  summary: Remove a network rule.
+  description: ''
+  syntax: >-
+    az storage account network-rule remove --account-name
+                                           --resource-group
+                                           [--ip-address]
+                                           [--resource-id]
+                                           [--subnet]
+                                           [--tenant-id]
+                                           [--vnet-name]
+  examples:
+  - summary: Remove a network rule. (autogenerated)
+    syntax: az storage account network-rule remove --account-name MyAccount --resource-group MyResourceGroup --subnet MySubnetID
+  - summary: Remove a network rule. (autogenerated)
+    syntax: az storage account network-rule remove --account-name MyAccount --ip-address 23.45.1.0/24 --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --ip-address
+    summary: IPv4 address or CIDR range.
+    description: ''
+  - name: --resource-id
+    summary: The resource id to add in network rule.
+    description: ''
+  - name: --subnet
+    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id to add in network rule.
+    description: ''
+  - name: --vnet-name
+    summary: Name of a virtual network.
+    description: ''
+commands:
+- az_storage_account_network-rule_add
+- az_storage_account_network-rule_list
+- az_storage_account_network-rule_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage network rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/azcopy.yml b/2017-03-09-profile/docs-ref-autogen/storage/azcopy.yml
new file mode 100644
index 0000000000..b3fc397ae4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/azcopy.yml
@@ -0,0 +1,43 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_azcopy
+name: az storage azcopy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage azcopy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: '[EXPERIMENTAL] Manage storage operations utilizing AzCopy.'
+description: 'Open issues here: https://github.com/Azure/azure-storage-azcopy.'
+directCommands:
+- uid: az_storage_azcopy_run-command
+  name: az storage azcopy run-command
+  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
+  description: ''
+  syntax: az storage azcopy run-command [<COMMAND_ARGS>]
+  optionalParameters:
+  - name: <COMMAND_ARGS>
+    summary: Command to run using azcopy. Please start commands with "azcopy ".
+    description: ''
+commands:
+- az_storage_azcopy_blob
+- az_storage_azcopy_blob_delete
+- az_storage_azcopy_blob_download
+- az_storage_azcopy_blob_sync
+- az_storage_azcopy_blob_upload
+- az_storage_azcopy_run-command
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: 'Open issues here: https://github.com/Azure/azure-storage-azcopy.'
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/azcopy/blob.yml b/2017-03-09-profile/docs-ref-autogen/storage/azcopy/blob.yml
new file mode 100644
index 0000000000..ef4be977e2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/azcopy/blob.yml
@@ -0,0 +1,233 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_azcopy_blob
+name: az storage azcopy blob
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage azcopy blob** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage object storage for unstructured data (blobs) using AzCopy.
+description: ''
+directCommands:
+- uid: az_storage_azcopy_blob_delete
+  name: az storage azcopy blob delete
+  summary: Delete blobs from a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob delete --container
+                                  [--account-key]
+                                  [--account-name]
+                                  [--auth-mode {key, login}]
+                                  [--connection-string]
+                                  [--recursive]
+                                  [--sas-token]
+                                  [--target]
+  examples:
+  - summary: Delete a single blob from a container.
+    syntax: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t TargetBlob
+  - summary: Delete all blobs from a container.
+    syntax: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount --recursive
+  - summary: Delete all blobs in a virtual directory.
+    syntax: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t "path/to/virtual_directory" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The delete target container.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively delete blobs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --target -t
+    summary: The delete target path.
+    description: ''
+- uid: az_storage_azcopy_blob_download
+  name: az storage azcopy blob download
+  summary: Download blobs from a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob download --container
+                                    --destination
+                                    [--account-key]
+                                    [--account-name]
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--recursive]
+                                    [--sas-token]
+                                    [--source]
+  examples:
+  - summary: Download a single blob from a container.
+    syntax: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "path/to/file"
+  - summary: Download a virtual directory from a container.
+    syntax: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/virtual_directory" -d "download/path" --recursive
+  - summary: Download the contents of a container onto a local file system.
+    syntax: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s * -d "download/path" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The download source container.
+    description: ''
+  - isRequired: true
+    name: --destination -d
+    summary: The destination file path to download to.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively download blobs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --source -s
+    summary: The download source path.
+    description: ''
+- uid: az_storage_azcopy_blob_sync
+  name: az storage azcopy blob sync
+  summary: Sync blobs recursively to a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob sync --container
+                                --source
+                                [--account-key]
+                                [--account-name]
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--destination]
+                                [--sas-token]
+  examples:
+  - summary: Sync a single blob to a container.
+    syntax: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
+  - summary: Sync a directory to a container.
+    syntax: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The sync destination container.
+    description: ''
+  - isRequired: true
+    name: --source -s
+    summary: The source file path to sync from.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination -d
+    summary: The sync destination path.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_azcopy_blob_upload
+  name: az storage azcopy blob upload
+  summary: Upload blobs to a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob upload --container
+                                  --source
+                                  [--account-key]
+                                  [--account-name]
+                                  [--auth-mode {key, login}]
+                                  [--connection-string]
+                                  [--destination]
+                                  [--recursive]
+                                  [--sas-token]
+  examples:
+  - summary: Upload a single blob to a container.
+    syntax: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
+  - summary: Upload a directory to a container.
+    syntax: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" --recursive
+  - summary: Upload the contents of a directory to a container.
+    syntax: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory/*" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The upload destination container.
+    description: ''
+  - isRequired: true
+    name: --source -s
+    summary: The source file path to upload from.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination -d
+    summary: The upload destination path.
+    description: ''
+  - name: --recursive -r
+    summary: Recursively upload blobs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+commands:
+- az_storage_azcopy_blob_delete
+- az_storage_azcopy_blob_download
+- az_storage_azcopy_blob_sync
+- az_storage_azcopy_blob_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage object storage for unstructured data (blobs) using AzCopy.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob.yml
index 443b94749e..83e1bea2bc 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/blob.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob.yml
@@ -1,41 +1,35 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_delete
-  - az_storage_blob_delete_batch
-  - az_storage_blob_download
-  - az_storage_blob_download_batch
-  - az_storage_blob_exists
-  - az_storage_blob_generate_sas
-  - az_storage_blob_list
-  - az_storage_blob_set_tier
-  - az_storage_blob_show
-  - az_storage_blob_snapshot
-  - az_storage_blob_sync
-  - az_storage_blob_update
-  - az_storage_blob_upload
-  - az_storage_blob_upload_batch
-  - az_storage_blob_url
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob
+name: az storage blob
+summary: Manage object storage for unstructured data (blobs).
+description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+directCommands:
 - uid: az_storage_blob_delete
   name: az storage blob delete
   summary: Mark a blob or snapshot for deletion.
   description: The blob is marked for later deletion during garbage collection.  In order to delete a blob, all of its snapshots must also be deleted. Both can be removed at the same time.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob delete --container-name
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--delete-snapshots {include, only}]
+                           [--if-match]
+                           [--if-modified-since]
+                           [--if-none-match]
+                           [--if-unmodified-since]
+                           [--lease-id]
+                           [--sas-token]
+                           [--snapshot]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Delete a blob.
-    syntax:
-      content: az storage blob delete -c mycontainer -n MyBlob
+    syntax: az storage blob delete -c mycontainer -n MyBlob
   - summary: Delete a blob using login credentials.
-    syntax:
-      content: az storage blob delete -c mycontainer -n MyBlob --account-name mystorageaccount --auth-mode login
-  parameters:
+    syntax: az storage blob delete -c mycontainer -n MyBlob --account-name mystorageaccount --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -44,18 +38,19 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --delete-snapshots
-    parameterValueGroup: include, only
-    summary: Required if the blob has associated snapshots.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to delete.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --delete-snapshots
+    parameterValueGroup: include, only
+    summary: Required if the blob has associated snapshots.
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -69,54 +64,69 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to delete.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_delete_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_delete-batch
   name: az storage blob delete-batch
   summary: Delete blobs from a blob container recursively.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob delete-batch --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--delete-snapshots {include, only}]
+                                 [--dryrun]
+                                 [--if-match]
+                                 [--if-modified-since]
+                                 [--if-none-match]
+                                 [--if-unmodified-since]
+                                 [--lease-id]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--timeout]
   examples:
   - summary: Delete all blobs ending with ".py" in a container that have not been modified for 10 days.
-    syntax:
-      content: >-
-        date=`date -d "10 days ago" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      date=`date -d "10 days ago" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage blob delete-batch -s mycontainer --account-name mystorageaccount --pattern *.py --if-unmodified-since $date --auth-mode login
+      az storage blob delete-batch -s mycontainer --account-name mystorageaccount --pattern *.py --if-unmodified-since $date --auth-mode login
   - summary: Delete all the blobs in a directory named "dir" in a container named "mycontainer".
-    syntax:
-      content: az storage blob delete-batch -s mycontainer --pattern dir/*
+    syntax: az storage blob delete-batch -s mycontainer --pattern dir/*
   - summary: Delete the blobs with the format 'cli-2018-xx-xx.txt' or 'cli-2019-xx-xx.txt' in a container.
-    syntax:
-      content: az storage blob delete-batch -s mycontainer --pattern cli-201[89]-??-??.txt
+    syntax: az storage blob delete-batch -s mycontainer --pattern cli-201[89]-??-??.txt
   - summary: Delete all blobs with the format 'cli-201x-xx-xx.txt' except cli-2018-xx-xx.txt' and 'cli-2019-xx-xx.txt' in a container.
-    syntax:
-      content: az storage blob delete-batch -s mycontainer --pattern cli-201[!89]-??-??.txt
-  parameters:
+    syntax: az storage blob delete-batch -s mycontainer --pattern cli-201[!89]-??-??.txt
+  requiredParameters:
   - isRequired: true
     name: --source -s
     summary: The blob container from where the files will be deleted.
     description: The source can be the container URL or the container name. When the source is the container URL, the storage account name will be parsed from the URL.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --delete-snapshots
     parameterValueGroup: include, only
     summary: Required if the blob has associated snapshots.
@@ -124,15 +134,6 @@ items:
   - name: --dryrun
     summary: Show the summary of the operations to be taken instead of actually deleting the file(s).
     description: If this is specified, it will ignore all the Precondition Arguments that include --if-modified-since and --if-unmodified-since. So the file(s) will be deleted with the command without --dryrun may be different from the result list with --dryrun flag on.
-  - name: --lease-id
-    summary: The active lease id for the blob.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'. You can also try "az stroage remove" command with --include and --exclude with azure cli >= 2.0.70 to match multiple patterns.
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
     description: ''
@@ -145,34 +146,52 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: The active lease id for the blob.
     description: ''
+  - name: --pattern
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'. You can also try "az storage remove" command with --include and --exclude with azure cli >= 2.0.70 to match multiple patterns.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_download
   name: az storage blob download
   summary: Downloads a blob to a file path, with automatic chunking and progress notifications.
   description: Returns an instance of Blob with  properties and metadata.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob download --container-name
+                             --file
+                             --name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--end-range]
+                             [--if-match]
+                             [--if-modified-since]
+                             [--if-none-match]
+                             [--if-unmodified-since]
+                             [--lease-id]
+                             [--max-connections]
+                             [--max-retries]
+                             [--no-progress]
+                             [--open-mode]
+                             [--range-get-content-md5]
+                             [--retry-interval]
+                             [--sas-token]
+                             [--snapshot]
+                             [--socket-timeout]
+                             [--start-range]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -185,9 +204,31 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --end-range
     summary: 'End of byte range to use for downloading a section of the blob. If end_range is given, start_range must be provided. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of blob.'
     description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --lease-id
     summary: Required if the blob has an active lease.
     description: ''
@@ -213,6 +254,9 @@ items:
     defaultValue: "1.0"
     summary: Sleep time in secs between retries.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --snapshot
     summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
     description: ''
@@ -222,62 +266,40 @@ items:
   - name: --start-range
     summary: 'Start of byte range to use for downloading a section of the blob. If no end_range is given, all bytes after the start_range will be downloaded. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of blob.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_download_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_download-batch
   name: az storage blob download-batch
   summary: Download blobs from a blob container recursively.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob download-batch --destination
+                                   --source
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--dryrun]
+                                   [--max-connections]
+                                   [--no-progress]
+                                   [--pattern]
+                                   [--sas-token]
+                                   [--socket-timeout]
+                                   [--subscription]
   examples:
   - summary: Download all blobs that end with .py
-    syntax:
-      content: az storage blob download-batch -d . --pattern *.py -s mycontainer --account-name mystorageaccount --account-key 00000000
+    syntax: az storage blob download-batch -d . --pattern *.py -s mycontainer --account-name mystorageaccount --account-key 00000000
   - summary: Download all blobs in a directory named "dir" from container named "mycontainer".
-    syntax:
-      content: az storage blob download-batch -d . -s mycontainer --pattern dir/*
+    syntax: az storage blob download-batch -d . -s mycontainer --pattern dir/*
   - summary: Download all blobs with the format 'cli-2018-xx-xx.txt' or 'cli-2019-xx-xx.txt' in container to current path.
-    syntax:
-      content: az storage blob download-batch -d . -s mycontainer --pattern cli-201[89]-??-??.txt
+    syntax: az storage blob download-batch -d . -s mycontainer --pattern cli-201[89]-??-??.txt
   - summary: Download all blobs with the format 'cli-201x-xx-xx.txt' except cli-2018-xx-xx.txt' and 'cli-2019-xx-xx.txt' in container to current path.
-    syntax:
-      content: az storage blob download-batch -d . -s mycontainer --pattern cli-201[!89]-??-??.txt
-  parameters:
+    syntax: az storage blob download-batch -d . -s mycontainer --pattern cli-201[!89]-??-??.txt
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The existing destination folder for this download operation.
@@ -286,6 +308,16 @@ items:
     name: --source -s
     summary: The blob container from where the files will be downloaded.
     description: The source can be the container URL or the container name. When the source is the container URL, the storage account name will be parsed from the URL.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --dryrun
     summary: Show the summary of the operations to be taken instead of actually downloading the file(s).
     description: ''
@@ -297,43 +329,36 @@ items:
     summary: Include this flag to disable progress reporting for the command.
     description: ''
   - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
     description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --socket-timeout
-    summary: The socket timeout(secs), used by the service to regulate data flow.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --socket-timeout
+    summary: The socket timeout(secs), used by the service to regulate data flow.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_exists
   name: az storage blob exists
   summary: Check for the existence of a blob in a container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob exists --container-name
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--snapshot]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Check for the existence of a blob in a container. (autogenerated)
-    syntax:
-      content: az storage blob exists --account-key 00000000 --account-name MyAccount --container-name MyContainer --name MyBlob
-  parameters:
+    syntax: az storage blob exists --account-key 00000000 --account-name MyAccount --container-name mycontainer --name MyBlob
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -342,50 +367,100 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --snapshot
     summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the snapshot.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_filter
+  name: az storage blob filter
+  summary: List blobs across all containers whose tags match a given search expression.
+  description: Filter blobs searches across all containers within a storage account but can be scoped within the expression to a single container.
+  syntax: >-
+    az storage blob filter --tag-filter
+                           [--account-key]
+                           [--account-name]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--sas-token]
+  requiredParameters:
+  - isRequired: true
+    name: --tag-filter
+    summary: The expression to find blobs whose tags matches the specified condition. eg. ""yourtagname"='firsttag' and "yourtagname2"='secondtag'" To specify a container, eg. "@container='containerName' and "Name"='C'".
+    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_generate_sas
+- uid: az_storage_blob_generate-sas
   name: az storage blob generate-sas
   summary: Generate a shared access signature for the blob.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob generate-sas --container-name
+                                 --name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--cache-control]
+                                 [--connection-string]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-type]
+                                 [--expiry]
+                                 [--full-uri]
+                                 [--https-only]
+                                 [--ip]
+                                 [--permissions]
+                                 [--policy-name]
+                                 [--sas-token]
+                                 [--start]
+                                 [--subscription]
   examples:
   - summary: Generate a sas token for a blob with read-only permissions.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+
+      az storage blob generate-sas -c myycontainer -n MyBlob --permissions r --expiry $end --https-only
+  - summary: Generate a sas token for a blob with ip range specified.
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage blob generate-sas -c myycontainer -n MyBlob --permissions r --expiry $end --https-only
+      az storage blob generate-sas -c myycontainer -n MyBlob --ip "176.134.171.0-176.134.171.255" --permissions r --expiry $end --https-only
   - summary: Generate a shared access signature for the blob. (autogenerated)
-    syntax:
-      content: az storage blob generate-sas --account-key 00000000 --account-name MyStorageAccount --container-name MyContainer --expiry 2018-01-01T00:00:00Z --name MyBlob --permissions r
-  parameters:
+    syntax: az storage blob generate-sas --account-key 00000000 --account-name MyStorageAccount --container-name mycontainer --expiry 2018-01-01T00:00:00Z --name MyBlob --permissions r
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -394,9 +469,19 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessedusing this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessedusing this shared access signature.
     description: ''
@@ -427,50 +512,57 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the container's ACL.
     description: ''
-  - name: --start
-    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_list
   name: az storage blob list
   summary: List blobs in a given container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob list --container-name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--delimiter]
+                         [--include]
+                         [--marker]
+                         [--num-results]
+                         [--prefix]
+                         [--query-examples]
+                         [--sas-token]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: List all storage blobs in a container whose names start with 'foo'; will match names such as 'foo', 'foobar', and 'foo/bar'
-    syntax:
-      content: az storage blob list -c MyContainer --prefix foo
-  parameters:
+    syntax: az storage blob list -c mycontainer --prefix foo
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --delimiter
     summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
     description: ''
   - name: --include
-    summary: 'Specifies additional datasets to include: (c)opy-info, (m)etadata, (s)napshots, (d)eleted-soft. Can be combined.'
+    summary: Specifies one or more additional datasets to include in the response.
     description: ''
   - name: --marker
     summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
@@ -482,41 +574,112 @@ items:
   - name: --prefix
     summary: Filters the results to return only blobs whose names begin with the specified prefix.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_move
+  name: az storage blob move
+  summary: Move a blob in a storage container.
+  description: ''
+  syntax: >-
+    az storage blob move --container-name
+                         --destination-blob
+                         --source-blob
+                         [--account-key]
+                         [--account-name]
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--lease-id]
+                         [--sas-token]
+                         [--source-if-match]
+                         [--source-if-modified-since]
+                         [--source-if-none-match]
+                         [--source-if-unmodified-since]
+                         [--source-lease-id]
+                         [--timeout]
+  examples:
+  - summary: Move a blob in a storage container.
+    syntax: az storage blob move -c MyContainer -d DestinationBlobPath -s SourceBlobPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --destination-blob -d
+    summary: The destination blob name. It should be an absolute path under the container. e.g.'topdir1/dirbar'.
+    description: ''
+  - isRequired: true
+    name: --source-blob -s
+    summary: The source blob name. It should be an absolute path under the container. e.g.'topdir1/dirsubfoo'.
+    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: Optional. A lease ID for the new_path. The new_path must have an active lease and the lease ID must match.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --source-if-match
+    summary: Optional. An ETag value. Specify this header to perform the rename operation only if the source's ETag matches the value specified.
+    description: ''
+  - name: --source-if-modified-since
+    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has been modified since the specified date and time.
+    description: ''
+  - name: --source-if-none-match
+    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the rename operation only if the source's ETag does not match the value specified.
+    description: ''
+  - name: --source-if-unmodified-since
+    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has not been modified since the specified date and time.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_set_tier
+  - name: --source-lease-id
+    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_set-tier
   name: az storage blob set-tier
   summary: Set the block or page tiers on the blob.
   description: For block blob this command only supports block blob on standard storage accounts. For page blob, this command only supports for page blobs on premium accounts.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob set-tier --container-name
+                             --name
+                             --tier
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+                             [--type {block, page}]
   examples:
   - summary: Set the block or page tiers on the blob. (autogenerated)
-    syntax:
-      content: az storage blob set-tier --account-key 00000000 --account-name MyAccount --container-name MyContainer --name MyBlob --tier P10
-  parameters:
+    syntax: az storage blob set-tier --account-key 00000000 --account-name MyAccount --container-name mycontainer --name MyBlob --tier P10
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -529,14 +692,7 @@ items:
     name: --tier
     summary: The tier value to set the blob to.
     description: ''
-  - name: --timeout
-    summary: The timeout parameter is expressed in seconds. This method may make multiple calls to the Azure service and the timeout will apply to each call individually.
-    description: ''
-  - name: --type -t
-    defaultValue: block
-    parameterValueGroup: block, page
-    summary: The blob type.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -552,26 +708,41 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: The timeout parameter is expressed in seconds. This method may make multiple calls to the Azure service and the timeout will apply to each call individually.
+    description: ''
+  - name: --type -t
+    defaultValue: block
+    parameterValueGroup: block, page
+    summary: The blob type.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_show
   name: az storage blob show
   summary: Get the details of a blob.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob show --container-name
+                         --name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--if-match]
+                         [--if-modified-since]
+                         [--if-none-match]
+                         [--if-unmodified-since]
+                         [--lease-id]
+                         [--query-examples]
+                         [--sas-token]
+                         [--snapshot]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: Show all properties of a blob.
-    syntax:
-      content: az storage blob show -c MyContainer -n MyBlob
+    syntax: az storage blob show -c mycontainer -n MyBlob
   - summary: Get the details of a blob (autogenerated)
-    syntax:
-      content: az storage blob show --account-name mystorageccount --account-key 00000000 --container-name MyContainer --name MyBlob
-  parameters:
+    syntax: az storage blob show --account-name mystorageccount --account-key 00000000 --container-name mycontainer --name MyBlob
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -580,14 +751,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -601,34 +773,45 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_snapshot
   name: az storage blob snapshot
   summary: Creates a read-only snapshot of a blob.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob snapshot --container-name
+                             --name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--if-match]
+                             [--if-modified-since]
+                             [--if-none-match]
+                             [--if-unmodified-since]
+                             [--lease-id]
+                             [--metadata]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -637,14 +820,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -658,14 +842,11 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -673,26 +854,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_sync
   name: az storage blob sync
   summary: Sync blobs recursively to a storage blob container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob sync --container
+                         --source
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--destination]
+                         [--exclude-path]
+                         [--exclude-pattern]
+                         [--include-pattern]
+                         [--sas-token]
+                         [--subscription]
   examples:
   - summary: Sync a single blob to a container.
-    syntax:
-      content: az storage blob sync -c mycontainer -s "path/to/file" -d NewBlob
+    syntax: az storage blob sync -c mycontainer -s "path/to/file" -d NewBlob
   - summary: Sync a directory to a container.
-    syntax:
-      content: az storage blob sync -c mycontainer --account-name mystorageccount --account-key 00000000 -s "path/to/directory"
-  parameters:
+    syntax: az storage blob sync -c mycontainer --account-name mystorageccount --account-key 00000000 -s "path/to/directory"
+  requiredParameters:
   - isRequired: true
     name: --container -c
     summary: The sync destination container.
@@ -701,8 +888,18 @@ items:
     name: --source -s
     summary: The source file path to sync from.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --destination -d
-    summary: The destination path that will be appended to the blob name.
+    summary: The destination path that will be prepended to the blob name.
     description: ''
   - name: --exclude-path
     summary: 'Exclude these paths. This option does not support wildcard characters (\*). Checks relative path prefix. For example: myFolder;myFolder/subDirName/file.pdf.'
@@ -713,34 +910,85 @@ items:
   - name: --include-pattern
     summary: 'Include only these files where the name matches the pattern list. For example: \*.jpg;\*.pdf;exactName. This option supports wildcard characters (\*).'
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_undelete
+  name: az storage blob undelete
+  summary: Restore soft-deleted blobs or snapshots.
+  description: Operation will only be successful if used within the specified number of days set in the delete retention policy.
+  syntax: >-
+    az storage blob undelete [--account-key]
+                             [--account-name]
+                             [--auth-mode {key, login}]
+                             [--blob-url]
+                             [--connection-string]
+                             [--container-name]
+                             [--name]
+                             [--sas-token]
+                             [--timeout]
+  examples:
+  - summary: Restore soft-deleted blob.
+    syntax: az storage blob undelete -n myblob -c mycontainer --account-name mystorageaccount --account-key 0000-0000
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --blob-url
+    summary: The full endpoint URL to the Blob, including SAS token and snapshot if used. This could be either the primary endpoint, or the secondary endpoint depending on the current `location_mode`.
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --container-name -c
+    summary: The container name.
+    description: ''
+  - name: --name -n
+    summary: The blob name.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
 - uid: az_storage_blob_update
   name: az storage blob update
   summary: Sets system properties on the blob.
   description: If one property is set for the content_settings, all properties will be overriden.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob update --container-name
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--clear-content-settings {false, true}]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--if-match]
+                           [--if-modified-since]
+                           [--if-none-match]
+                           [--if-unmodified-since]
+                           [--lease-id]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -749,11 +997,21 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --clear-content-settings
     parameterValueGroup: false, true
     summary: If this flag is set, then if any one or more of the following properties (--content-cache-control, --content-disposition, --content-encoding, --content-language, --content-md5, --content-type) is set, then all of these properties are set together. If a value is not provided for a given property when at least one of the properties listed below is set, then that property will be cleared.
     description: ''
-  - name: --content-cache-control
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -771,12 +1029,6 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
     description: ''
@@ -789,14 +1041,8 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -804,23 +1050,48 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_upload
   name: az storage blob upload
   summary: Upload a file to a storage blob.
   description: Creates a new blob from a file path, or updates the content of an existing blob with automatic chunking and progress notifications.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob upload --container-name
+                           --file
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--encryption-scope]
+                           [--if-match]
+                           [--if-modified-since]
+                           [--if-none-match]
+                           [--if-unmodified-since]
+                           [--lease-id]
+                           [--max-connections]
+                           [--maxsize-condition]
+                           [--metadata]
+                           [--no-progress]
+                           [--sas-token]
+                           [--socket-timeout]
+                           [--subscription]
+                           [--timeout]
+                           [--type {append, block, page}]
   examples:
   - summary: Upload to a blob.
-    syntax:
-      content: az storage blob upload -f /path/to/file -c MyContainer -n MyBlob
-  parameters:
+    syntax: az storage blob upload -f /path/to/file -c mycontainer -n MyBlob
+  - summary: Upload a file to a storage blob. (autogenerated)
+    syntax: az storage blob upload --account-name mystorageaccount --account-key 0000-0000 --container-name mycontainer --file /path/to/file --name myblob
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -833,7 +1104,17 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --content-cache-control
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -854,6 +1135,18 @@ items:
   - name: --encryption-scope
     summary: A predefined encryption scope used to encrypt the data on the service.
     description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --lease-id
     summary: Required if the blob has an active lease.
     description: ''
@@ -870,9 +1163,15 @@ items:
   - name: --no-progress
     summary: Include this flag to disable progress reporting for the command.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --socket-timeout
     summary: The socket timeout(secs), used by the service to regulate data flow.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
@@ -880,59 +1179,50 @@ items:
     parameterValueGroup: append, block, page
     summary: Defaults to 'page' for \*.vhd files, or 'block' otherwise.
     description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_upload_batch
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_upload-batch
   name: az storage blob upload-batch
   summary: Upload files from a local directory to a blob container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob upload-batch --destination
+                                 --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--content-cache]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-md5]
+                                 [--content-type]
+                                 [--destination-path]
+                                 [--dryrun]
+                                 [--if-match]
+                                 [--if-modified-since]
+                                 [--if-none-match]
+                                 [--if-unmodified-since]
+                                 [--lease-id]
+                                 [--max-connections]
+                                 [--maxsize-condition]
+                                 [--metadata]
+                                 [--no-progress]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--socket-timeout]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--type {append, block, page}]
   examples:
   - summary: Upload all files that end with .py unless blob exists and has been modified since given date.
-    syntax:
-      content: az storage blob upload-batch -d mycontainer --account-name mystorageaccount --account-key 00000000 -s <path-to-directory> --pattern *.py --if-unmodified-since 2018-08-27T20:51Z
+    syntax: az storage blob upload-batch -d mycontainer --account-name mystorageaccount --account-key 00000000 -s <path-to-directory> --pattern *.py --if-unmodified-since 2018-08-27T20:51Z
   - summary: Upload all files from local path directory to a container named "mycontainer".
-    syntax:
-      content: az storage blob upload-batch -d mycontainer -s <path-to-directory>
+    syntax: az storage blob upload-batch -d mycontainer -s <path-to-directory>
   - summary: Upload all files with the format 'cli-2018-xx-xx.txt' or 'cli-2019-xx-xx.txt' in local path directory.
-    syntax:
-      content: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[89]-??-??.txt
+    syntax: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[89]-??-??.txt
   - summary: Upload all files with the format 'cli-201x-xx-xx.txt' except cli-2018-xx-xx.txt' and 'cli-2019-xx-xx.txt' in a container.
-    syntax:
-      content: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[!89]-??-??.txt
-  parameters:
+    syntax: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[!89]-??-??.txt
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The blob container where the files will be uploaded.
@@ -941,39 +1231,17 @@ items:
     name: --source -s
     summary: The directory where the files to be uploaded are located.
     description: ''
-  - name: --destination-path
-    summary: The destination path that will be appended to the blob name.
-    description: ''
-  - name: --dryrun
-    summary: Show the summary of the operations to be taken instead of actually uploading the file(s).
-    description: ''
-  - name: --lease-id
-    summary: The active lease id for the blob.
-    description: ''
-  - name: --max-connections
-    defaultValue: "2"
-    summary: Maximum number of parallel connections to use when the blob size exceeds 64MB.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --no-progress
-    summary: Include this flag to disable progress reporting for the command.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --socket-timeout
-    summary: The socket timeout(secs), used by the service to regulate data flow.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --type -t
-    parameterValueGroup: append, block, page
-    summary: Defaults to 'page' for \*.vhd files, or 'block' otherwise. The setting will override blob types for every file.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --content-cache-control
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -991,8 +1259,11 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
-  - name: --maxsize-condition
-    summary: The max length in bytes permitted for an append blob.
+  - name: --destination-path
+    summary: The destination path that will be prepended to the blob name.
+    description: ''
+  - name: --dryrun
+    summary: Show the summary of the operations to be taken instead of actually uploading the file(s).
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -1006,41 +1277,62 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+  - name: --lease-id
+    summary: The active lease id for the blob.
     description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --max-connections
+    defaultValue: "2"
+    summary: Maximum number of parallel connections to use when the blob size exceeds 64MB.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --maxsize-condition
+    summary: The max length in bytes permitted for an append blob.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --no-progress
+    summary: Include this flag to disable progress reporting for the command.
+    description: ''
+  - name: --pattern
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --socket-timeout
+    summary: The socket timeout(secs), used by the service to regulate data flow.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --type -t
+    parameterValueGroup: append, block, page
+    summary: Defaults to 'page' for \*.vhd files, or 'block' otherwise. The setting will override blob types for every file.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_url
   name: az storage blob url
   summary: Create the url to access a blob.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob url --container-name
+                        --name
+                        [--account-key]
+                        [--account-name]
+                        [--connection-string]
+                        [--protocol {http, https}]
+                        [--sas-token]
+                        [--snapshot]
+                        [--subscription]
   examples:
   - summary: Create the url to access a blob (autogenerated)
-    syntax:
-      content: az storage blob url --connection-string $connectionString --container-name container1 --name blob1
+    syntax: az storage blob url --connection-string $connectionString --container-name container1 --name blob1
   - summary: Create the url to access a blob (autogenerated)
-    syntax:
-      content: az storage blob url --account-name storageacct --account-key 00000000 --container-name container1 --name blob1
-  parameters:
+    syntax: az storage blob url --account-name storageacct --account-key 00000000 --container-name container1 --name blob1
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -1049,14 +1341,7 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --protocol
-    defaultValue: https
-    parameterValueGroup: http, https
-    summary: Protocol to use.
-    description: ''
-  - name: --snapshot
-    summary: An string value that uniquely identifies the snapshot. The value ofthis query parameter indicates the snapshot version.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -1066,112 +1351,82 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --protocol
+    defaultValue: https
+    parameterValueGroup: http, https
+    summary: Protocol to use.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: An string value that uniquely identifies the snapshot. The value ofthis query parameter indicates the snapshot version.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_copy
-  name: az storage blob copy
-  summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_cancel
-  name: az storage blob copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_copy_start
-  name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_delete
-  name: az storage blob delete
-  summary: Mark a blob or snapshot for deletion.
-- uid: az_storage_blob_delete_batch
-  name: az storage blob delete-batch
-  summary: Delete blobs from a blob container recursively.
-- uid: az_storage_blob_download
-  name: az storage blob download
-  summary: Downloads a blob to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_blob_download_batch
-  name: az storage blob download-batch
-  summary: Download blobs from a blob container recursively.
-- uid: az_storage_blob_exists
-  name: az storage blob exists
-  summary: Check for the existence of a blob in a container.
-- uid: az_storage_blob_generate_sas
-  name: az storage blob generate-sas
-  summary: Generate a shared access signature for the blob.
-- uid: az_storage_blob_lease
-  name: az storage blob lease
-  summary: Manage storage blob leases.
-- uid: az_storage_blob_lease_acquire
-  name: az storage blob lease acquire
-  summary: Acquires a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_break
-  name: az storage blob lease break
-  summary: Breaks a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_change
-  name: az storage blob lease change
-  summary: Changes a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_release
-  name: az storage blob lease release
-  summary: Releases a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_renew
-  name: az storage blob lease renew
-  summary: Renews a lock on a blob for write and delete operations.
-- uid: az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: az_storage_blob_metadata
-  name: az storage blob metadata
-  summary: Manage blob metadata.
-- uid: az_storage_blob_metadata_show
-  name: az storage blob metadata show
-  summary: Returns all user-defined metadata for the specified blob or snapshot.
-- uid: az_storage_blob_metadata_update
-  name: az storage blob metadata update
-  summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
-- uid: az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-- uid: az_storage_blob_set_tier
-  name: az storage blob set-tier
-  summary: Set the block or page tiers on the blob.
-- uid: az_storage_blob_show
-  name: az storage blob show
-  summary: Get the details of a blob.
-- uid: az_storage_blob_snapshot
-  name: az storage blob snapshot
-  summary: Creates a read-only snapshot of a blob.
-- uid: az_storage_blob_sync
-  name: az storage blob sync
-  summary: Sync blobs recursively to a storage blob container.
-- uid: az_storage_blob_update
-  name: az storage blob update
-  summary: Sets system properties on the blob.
-- uid: az_storage_blob_upload
-  name: az storage blob upload
-  summary: Upload a file to a storage blob.
-- uid: az_storage_blob_upload_batch
-  name: az storage blob upload-batch
-  summary: Upload files from a local directory to a blob container.
-- uid: az_storage_blob_url
-  name: az storage blob url
-  summary: Create the url to access a blob.
+- az_storage_blob_access
+- az_storage_blob_access_set
+- az_storage_blob_access_show
+- az_storage_blob_access_update
+- az_storage_blob_copy
+- az_storage_blob_copy_cancel
+- az_storage_blob_copy_start
+- az_storage_blob_copy_start-batch
+- az_storage_blob_delete
+- az_storage_blob_delete-batch
+- az_storage_blob_directory
+- az_storage_blob_directory_access
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+- az_storage_blob_directory_create
+- az_storage_blob_directory_delete
+- az_storage_blob_directory_download
+- az_storage_blob_directory_exists
+- az_storage_blob_directory_list
+- az_storage_blob_directory_metadata
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+- az_storage_blob_directory_move
+- az_storage_blob_directory_show
+- az_storage_blob_directory_upload
+- az_storage_blob_download
+- az_storage_blob_download-batch
+- az_storage_blob_exists
+- az_storage_blob_filter
+- az_storage_blob_generate-sas
+- az_storage_blob_lease
+- az_storage_blob_lease_acquire
+- az_storage_blob_lease_break
+- az_storage_blob_lease_change
+- az_storage_blob_lease_release
+- az_storage_blob_lease_renew
+- az_storage_blob_list
+- az_storage_blob_metadata
+- az_storage_blob_metadata_show
+- az_storage_blob_metadata_update
+- az_storage_blob_move
+- az_storage_blob_service-properties
+- az_storage_blob_service-properties_delete-policy
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+- az_storage_blob_service-properties_show
+- az_storage_blob_service-properties_update
+- az_storage_blob_set-tier
+- az_storage_blob_show
+- az_storage_blob_snapshot
+- az_storage_blob_sync
+- az_storage_blob_tag
+- az_storage_blob_tag_list
+- az_storage_blob_tag_set
+- az_storage_blob_undelete
+- az_storage_blob_update
+- az_storage_blob_upload
+- az_storage_blob_upload-batch
+- az_storage_blob_url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1187,10 +1442,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/access.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/access.yml
new file mode 100644
index 0000000000..b1c258486d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/access.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_access
+name: az storage blob access
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob access** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
+description: ''
+directCommands:
+- uid: az_storage_blob_access_set
+  name: az storage blob access set
+  summary: Set the access control properties of a blob.
+  description: ''
+  syntax: >-
+    az storage blob access set --acl-spec
+                               --blob-name
+                               --container-name
+                               [--account-key]
+                               [--account-name]
+                               [--auth-mode {key, login}]
+                               [--connection-string]
+                               [--if-match]
+                               [--if-modified-since]
+                               [--if-none-match]
+                               [--if-unmodified-since]
+                               [--lease-id]
+                               [--sas-token]
+                               [--timeout]
+  examples:
+  - summary: Set the access control properties of a blob.
+    syntax: az storage blob access set -a "user::rwx,group::r--,other::---" -b MyBlob -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - isRequired: true
+    name: --blob-name -b
+    summary: The blob name.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_access_show
+  name: az storage blob access show
+  summary: Show the access control properties of a blob.
+  description: ''
+  syntax: >-
+    az storage blob access show --blob-name
+                                --container-name
+                                [--account-key]
+                                [--account-name]
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--if-match]
+                                [--if-modified-since]
+                                [--if-none-match]
+                                [--if-unmodified-since]
+                                [--lease-id]
+                                [--sas-token]
+                                [--timeout]
+                                [--user-principle-names]
+  examples:
+  - summary: Show the access control properties of a blob.
+    syntax: az storage blob access show -b MyBlob -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --blob-name -b
+    summary: The blob name.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --user-principle-names
+    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
+    description: ''
+- uid: az_storage_blob_access_update
+  name: az storage blob access update
+  summary: Update the access control properties of a blob.
+  description: ''
+  syntax: >-
+    az storage blob access update --blob-name
+                                  --container-name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--acl-spec]
+                                  [--auth-mode {key, login}]
+                                  [--connection-string]
+                                  [--group]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--lease-id]
+                                  [--owner]
+                                  [--permissions]
+                                  [--sas-token]
+                                  [--timeout]
+  examples:
+  - summary: Update the access permissions of a blob.
+    syntax: az storage blob access update --permissions "rwxrwxrwx" -b MyBlob -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning user of a blob.
+    syntax: az storage blob access update --owner [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning group of a blob.
+    syntax: az storage blob access update --group [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --blob-name -b
+    summary: The blob name.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --group
+    summary: The owning group for the directory.
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --owner
+    summary: The owning user for the directory.
+    description: ''
+  - name: --permissions
+    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_blob_access_set
+- az_storage_blob_access_show
+- az_storage_blob_access_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/copy.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/copy.yml
index d860af8b01..210c5c82e4 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/blob/copy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/copy.yml
@@ -1,22 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_copy
-  name: az storage blob copy
-  summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_copy_cancel
-  - az_storage_blob_copy_start
-  - az_storage_blob_copy_start_batch
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_copy
+name: az storage blob copy
+summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
+description: ''
+directCommands:
 - uid: az_storage_blob_copy_cancel
   name: az storage blob copy cancel
   summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob copy cancel --copy-id
+                                --destination-blob
+                                --destination-container
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--lease-id]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --copy-id
     summary: Copy identifier provided in the copy.id of the original copy_blob operation.
@@ -29,12 +32,7 @@ items:
     name: --destination-container -c
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: Required if the destination blob has an active infinite lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -44,32 +42,58 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: Required if the destination blob has an active infinite lease.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_copy_start
   name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
+  summary: Copy a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob copy start --destination-blob
+                               --destination-container
+                               [--account-key]
+                               [--account-name]
+                               [--connection-string]
+                               [--destination-if-match]
+                               [--destination-if-modified-since]
+                               [--destination-if-none-match]
+                               [--destination-if-unmodified-since]
+                               [--destination-lease-id]
+                               [--metadata]
+                               [--sas-token]
+                               [--source-account-key]
+                               [--source-account-name]
+                               [--source-blob]
+                               [--source-container]
+                               [--source-if-match]
+                               [--source-if-modified-since]
+                               [--source-if-none-match]
+                               [--source-if-unmodified-since]
+                               [--source-lease-id]
+                               [--source-path]
+                               [--source-sas]
+                               [--source-share]
+                               [--source-snapshot]
+                               [--source-uri]
+                               [--subscription]
+                               [--timeout]
   examples:
-  - summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs. (autogenerated)
-    syntax:
-      content: az storage blob copy start --account-key 00000000 --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --source-uri https://storage.blob.core.windows.net/photos
-  - summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs (autogenerated)
-    syntax:
-      content: az storage blob copy start --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --sas-token $sas --source-uri https://storage.blob.core.windows.net/photos
-  parameters:
+  - summary: Copy a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
+    syntax: az storage blob copy start --account-key 00000000 --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --source-uri https://storage.blob.core.windows.net/photos
+  - summary: Copy a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
+    syntax: az storage blob copy start --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --sas-token $sas --source-uri https://storage.blob.core.windows.net/photos
+  requiredParameters:
   - isRequired: true
     name: --destination-blob -b
     summary: Name of the destination blob. If the exists, it will be overwritten.
@@ -78,14 +102,36 @@ items:
     name: --destination-container -c
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination-if-match
+    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value matches the ETag value for an existing destination blob. If the ETag for the destination blob does not match the ETag specified for If-Match, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-modified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has been modified since the specified date/time. If the destination blob has not been modified, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value does not match the ETag value for the destination blob. Specify the wildcard character (\*) to perform the operation only if the destination blob does not exist. If the specified condition isn't met, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-unmodified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has not been modified since the specified date/time. If the destination blob has been modified, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
   - name: --destination-lease-id
     summary: The lease ID specified for this header must match the lease ID of the destination blob. If the request does not include the lease ID or it is not valid, the operation fails with status code 412 (Precondition Failed).
     description: ''
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --source-account-key
     summary: The storage account key of the source blob.
@@ -99,6 +145,18 @@ items:
   - name: --source-container
     summary: The container name for the source storage account.
     description: ''
+  - name: --source-if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the source blob only if its ETag matches the value specified. If the ETag values do not match, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+    description: ''
+  - name: --source-if-modified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has been modified since the specified date/time.
+    description: ''
+  - name: --source-if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the blob only if its ETag does not match the value specified. If the values are identical, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+    description: ''
+  - name: --source-if-unmodified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has not been modified since the specified date/time.
+    description: ''
   - name: --source-lease-id
     summary: Specify this to perform the Copy Blob operation only if the lease ID given matches the active lease ID of the source blob.
     description: ''
@@ -115,32 +173,39 @@ items:
     summary: The blob snapshot for the source storage account.
     description: ''
   - name: --source-uri -u
-    summary: 'URL up to 2 KB in length that specifies a blob. A source blob in the same account can be private, but a blob in another account must be public or accept credentials included in this URL, such as a Shared Access Signature. Examples: <a href="https://myaccount.blob.core.windows.net/mycontainer/myblob">https://myaccount.blob.core.windows.net/mycontainer/myblob</a> <a href="https://myaccount.blob.core.windows.net/mycontainer/myblob">https://myaccount.blob.core.windows.net/mycontainer/myblob</a>?snapshot=&lt;DateTime&gt;.'
-    description: ''
-  - name: --destination-if-match
-    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value matches the ETag value for an existing destination blob. If the ETag for the destination blob does not match the ETag specified for If-Match, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-modified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has been modified since the specified date/time. If the destination blob has not been modified, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value does not match the ETag value for the destination blob. Specify the wildcard character (\*) to perform the operation only if the destination blob does not exist. If the specified condition isn't met, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-unmodified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has not been modified since the specified date/time. If the destination blob has been modified, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --source-if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the source blob only if its ETag matches the value specified. If the ETag values do not match, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+    summary: 'A URL of up to 2 KB in length that specifies an Azure file or blob. The value should be URL-encoded as it would appear in a request URI. If the source is in another account, the source must either be public or must be authenticated via a shared access signature. If the source is public, no authentication is required. Examples: `https://myaccount.blob.core.windows.net/mycontainer/myblob`, `https://myaccount.blob.core.windows.net/mycontainer/myblob?snapshot=<DateTime>`, `https://otheraccount.blob.core.windows.net/mycontainer/myblob?sastoken`.'
     description: ''
-  - name: --source-if-modified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has been modified since the specified date/time.
-    description: ''
-  - name: --source-if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the blob only if its ETag does not match the value specified. If the values are identical, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --source-if-unmodified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has not been modified since the specified date/time.
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_copy_start-batch
+  name: az storage blob copy start-batch
+  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
+  description: ''
+  syntax: >-
+    az storage blob copy start-batch [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--destination-container]
+                                     [--destination-path]
+                                     [--dryrun]
+                                     [--pattern]
+                                     [--sas-token]
+                                     [--source-account-key]
+                                     [--source-account-name]
+                                     [--source-container]
+                                     [--source-sas]
+                                     [--source-share]
+                                     [--source-uri]
+                                     [--subscription]
+  examples:
+  - summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs. (autogenerated)
+    syntax: az storage blob copy start-batch --account-key 00000000 --account-name MyAccount --destination-container MyDestinationContainer --source-account-key MySourceKey --source-account-name MySourceAccount --source-container MySourceContainer
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -150,41 +215,21 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs. (autogenerated)
-    syntax:
-      content: az storage blob copy start-batch --account-key 00000000 --account-name MyAccount --destination-container MyDestinationContainer --source-account-key MySourceKey --source-account-name MySourceAccount --source-container MySourceContainer
-  parameters:
   - name: --destination-container -c
     summary: The blob container where the selected source files or blobs will be copied to.
     description: ''
   - name: --destination-path
-    summary: The destination path that will be appended to the blob name.
+    summary: The destination path that will be prepended to the blob name.
     description: ''
   - name: --dryrun
     summary: List the files or blobs to be uploaded. No actual data transfer will occur.
     description: ''
   - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
     description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --source-account-key
     summary: The account key for the source storage account.
     description: ''
@@ -203,37 +248,14 @@ items:
   - name: --source-uri
     summary: A URI specifying a file share or blob container from which the files or blobs are copied.
     description: If the source is in another account, the source must either be public or be authenticated by using a shared access signature.
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_copy_cancel
-  name: az storage blob copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_copy_start
-  name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
+- az_storage_blob_copy_cancel
+- az_storage_blob_copy_start
+- az_storage_blob_copy_start-batch
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -249,10 +271,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/directory.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/directory.yml
new file mode 100644
index 0000000000..caa542c0c3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/directory.yml
@@ -0,0 +1,555 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_directory
+name: az storage blob directory
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob directory** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage blob directories in storage account container.
+description: To use the directory commands, please make sure your storage account type is StorageV2.
+directCommands:
+- uid: az_storage_blob_directory_create
+  name: az storage blob directory create
+  summary: Create a storage blob directory in a storage container.
+  description: Create a storage blob directory which can contain other directories or blobs in a storage container.
+  syntax: >-
+    az storage blob directory create --container-name
+                                     --directory-path
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--lease-id]
+                                     [--metadata]
+                                     [--permissions]
+                                     [--sas-token]
+                                     [--timeout]
+                                     [--umask]
+  examples:
+  - summary: Create a storage blob directory in a storage container.
+    syntax: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  - summary: Create a storage blob directory with permissions and umask.
+    syntax: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount --permissions rwxrwxrwx --umask 0000
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --lease-id
+    summary: Required if the directory to be overwritten has an active lease.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --permissions
+    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission. The sticky bit is also supported. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --umask
+    defaultValue: "0027"
+    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. The umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. In this way, the resulting permission is given by p & ^u, where p is the permission and u is the umask. Only 4-digit octal notation (e.g. 0022) is supported here.
+    description: ''
+- uid: az_storage_blob_directory_delete
+  name: az storage blob directory delete
+  summary: Delete a storage blob directory in a storage container.
+  description: This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, then the delete operation can be atomic and instantaneous; if not, the operation is performed in batches and a continuation token could be returned.
+  syntax: >-
+    az storage blob directory delete --container-name
+                                     --directory-path
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--fail-not-exist]
+                                     [--if-match]
+                                     [--if-modified-since]
+                                     [--if-none-match]
+                                     [--if-unmodified-since]
+                                     [--lease-id]
+                                     [--marker]
+                                     [--recursive]
+                                     [--sas-token]
+                                     [--timeout]
+  examples:
+  - summary: Delete a storage blob directory in a storage container.
+    syntax: az storage blob directory delete -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --fail-not-exist
+    summary: Specify whether to throw an exception when the directory doesn't exist.
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the directory has an active lease.
+    description: ''
+  - name: --marker
+    summary: Optional. When deleting a directory without the Hierarchical Namespace, the number of paths that are deleted with each invocation is limited. If the number of paths to be deleted exceeds this limit, a continuation token is returned. When a continuation token is returned, it must be specified in a subsequent invocation of the delete operation to continue deleting the directory.
+    description: ''
+  - name: --recursive
+    summary: If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_download
+  name: az storage blob directory download
+  summary: Download blobs to a local file path.
+  description: ''
+  syntax: >-
+    az storage blob directory download --container
+                                       --destination-path
+                                       --source-path
+                                       [--account-key]
+                                       [--account-name]
+                                       [--auth-mode {key, login}]
+                                       [--connection-string]
+                                       [--recursive]
+                                       [--sas-token]
+  examples:
+  - summary: Download a single blob in a storage blob directory.
+    syntax: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "<local-path>"
+  - summary: Download the entire directory in a storage container.
+    syntax: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s SourceDirectoryPath -d "<local-path>" --recursive
+  - summary: Download an entire subdirectory of a storage blob directory.
+    syntax: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/subdirectory" -d "<local-path>" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The download source container.
+    description: ''
+  - isRequired: true
+    name: --destination-path -d
+    summary: The destination local directory path to download.
+    description: ''
+  - isRequired: true
+    name: --source-path -s
+    summary: The download source directory path. It should be an absolute path to container.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively download blobs. If enabled, all the blobs including the blobs in subdirectories will be downloaded.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_blob_directory_exists
+  name: az storage blob directory exists
+  summary: Check for the existence of a blob directory in a storage container.
+  description: ''
+  syntax: >-
+    az storage blob directory exists --container-name
+                                     --directory-path
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--sas-token]
+                                     [--snapshot]
+                                     [--timeout]
+  examples:
+  - summary: Check for the existence of a blob directory in a storage container.
+    syntax: az storage blob directory exists -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the snapshot.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_list
+  name: az storage blob directory list
+  summary: List blobs and blob subdirectories in a storage directory.
+  description: ''
+  syntax: >-
+    az storage blob directory list --container-name
+                                   --directory-path
+                                   [--account-key]
+                                   [--account-name]
+                                   [--auth-mode {key, login}]
+                                   [--connection-string]
+                                   [--delimiter]
+                                   [--include]
+                                   [--marker]
+                                   [--num-results]
+                                   [--prefix]
+                                   [--sas-token]
+                                   [--timeout]
+  examples:
+  - summary: List blobs and blob subdirectories in a storage directory.
+    syntax: az storage blob directory list -c MyContainer -d DestinationDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --delimiter
+    summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
+    description: ''
+  - name: --include
+    defaultValue: mc
+    summary: Specifies one or more additional datasets to include in the response.
+    description: ''
+  - name: --marker
+    summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
+    description: ''
+  - name: --num-results
+    defaultValue: "5000"
+    summary: Specifies the maximum number of results to return. Provide "\*" to return all.
+    description: ''
+  - name: --prefix
+    summary: Filters the results to return only blobs whose names begin with the specified prefix.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_move
+  name: az storage blob directory move
+  summary: Move a storage directory to another storage blob directory in a storage container.
+  description: Move a storage directory and all its content (which can contain other directories or blobs) to another storage blob directory in a storage container. This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, the move operation is atomic and no marker is returned; if not, the operation is performed in batches and a continuation token could be returned.
+  syntax: >-
+    az storage blob directory move --container-name
+                                   --destination-path
+                                   --source-path
+                                   [--account-key]
+                                   [--account-name]
+                                   [--auth-mode {key, login}]
+                                   [--connection-string]
+                                   [--lease-id]
+                                   [--move-mode {legacy, posix}]
+                                   [--sas-token]
+                                   [--source-if-match]
+                                   [--source-if-modified-since]
+                                   [--source-if-none-match]
+                                   [--source-if-unmodified-since]
+                                   [--source-lease-id]
+                                   [--timeout]
+  examples:
+  - summary: Move a storage directory to another storage blob directory in a storage container.
+    syntax: az storage blob directory move -c MyContainer -d my-new-directory -s dir --account-name MyStorageAccount
+  - summary: Move a storage subdirectory to another storage blob directory in a storage container.
+    syntax: az storage blob directory move -c MyContainer -d my-new-directory -s dir/subdirectory --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --destination-path -d
+    summary: The destination blob directory path. It can be a directory or subdirectory name, e.g. dir, dir/subdir. If the destination path exists and is empty, the source will be moved into the destination path. If the destination path does not exist, the destination path will be created and overwritten by the source. To control the move operation for nonempty path, you can use --move-mode to determine its behavior.
+    description: ''
+  - isRequired: true
+    name: --source-path -s
+    summary: The source blob directory path.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --lease-id
+    summary: A lease ID for destination directory_path. The destination directory_path must have an active lease and the lease ID must match.
+    description: ''
+  - name: --move-mode
+    defaultValue: posix
+    parameterValueGroup: legacy, posix
+    summary: Valid only when namespace is enabled. This parameter determines the behavior of the move operation. If the destination directory is empty, for both two mode, the destination directory will be overwritten. But if the destination directory is not empty, in legacy mode the move operation will fail and in posix mode, the source directory will be moved into the destination directory.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --source-if-match
+    summary: Optional. An ETag value. Specify this header to perform the move operation only if the source's ETag matches the value specified.
+    description: ''
+  - name: --source-if-modified-since
+    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has been modified since the specified date and time.
+    description: ''
+  - name: --source-if-none-match
+    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the move operation only if the source's ETag does not match the value specified.
+    description: ''
+  - name: --source-if-unmodified-since
+    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has not been modified since the specified date and time.
+    description: ''
+  - name: --source-lease-id
+    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_show
+  name: az storage blob directory show
+  summary: Show a storage blob directory properties in a storage container.
+  description: ''
+  syntax: >-
+    az storage blob directory show --container-name
+                                   --directory-path
+                                   [--account-key]
+                                   [--account-name]
+                                   [--auth-mode {key, login}]
+                                   [--connection-string]
+                                   [--if-match]
+                                   [--if-modified-since]
+                                   [--if-none-match]
+                                   [--if-unmodified-since]
+                                   [--lease-id]
+                                   [--sas-token]
+                                   [--timeout]
+  examples:
+  - summary: Show a storage blob directory properties in a storage container.
+    syntax: az storage blob directory show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform theoperation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to performthe operation only if the resource's ETag does not match the value specified. Specify the wildcardcharacter (\*) to perform the operation only if the resource does not exist, and fail the operationif it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_upload
+  name: az storage blob directory upload
+  summary: Upload blobs or subdirectories to a storage blob directory.
+  description: ''
+  syntax: >-
+    az storage blob directory upload --container
+                                     --destination-path
+                                     --source
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--recursive]
+                                     [--sas-token]
+  examples:
+  - summary: Upload a single blob to a storage blob directory.
+    syntax: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d directory
+  - summary: Upload a local directory to a storage blob directory.
+    syntax: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" -d directory --recursive
+  - summary: Upload a set of files in a local directory to a storage blob directory.
+    syntax: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file*" -d directory --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The upload destination container.
+    description: ''
+  - isRequired: true
+    name: --destination-path -d
+    summary: The upload destination directory path. It should be an absolute path to container. If the specified destination path does not exist, a new directory path will be created.
+    description: ''
+  - isRequired: true
+    name: --source -s
+    summary: The source file path to upload from.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively upload blobs. If enabled, all the blobs including the blobs in subdirectories will be uploaded.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+commands:
+- az_storage_blob_directory_access
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+- az_storage_blob_directory_create
+- az_storage_blob_directory_delete
+- az_storage_blob_directory_download
+- az_storage_blob_directory_exists
+- az_storage_blob_directory_list
+- az_storage_blob_directory_metadata
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+- az_storage_blob_directory_move
+- az_storage_blob_directory_show
+- az_storage_blob_directory_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: To use the directory commands, please make sure your storage account type is StorageV2.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/directory/access.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/directory/access.yml
new file mode 100644
index 0000000000..754b33c564
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/directory/access.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_directory_access
+name: az storage blob directory access
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob directory access** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
+description: ''
+directCommands:
+- uid: az_storage_blob_directory_access_set
+  name: az storage blob directory access set
+  summary: Set the access control properties of a directory.
+  description: ''
+  syntax: >-
+    az storage blob directory access set --acl-spec
+                                         --container-name
+                                         --directory-path
+                                         [--account-key]
+                                         [--account-name]
+                                         [--auth-mode {key, login}]
+                                         [--connection-string]
+                                         [--if-match]
+                                         [--if-modified-since]
+                                         [--if-none-match]
+                                         [--if-unmodified-since]
+                                         [--lease-id]
+                                         [--sas-token]
+                                         [--timeout]
+  examples:
+  - summary: Set the access control properties of a directory.
+    syntax: az storage blob directory access set -a "user::rwx,group::r--,other::---" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_access_show
+  name: az storage blob directory access show
+  summary: Show the access control properties of a directory.
+  description: ''
+  syntax: >-
+    az storage blob directory access show --container-name
+                                          --directory-path
+                                          [--account-key]
+                                          [--account-name]
+                                          [--auth-mode {key, login}]
+                                          [--connection-string]
+                                          [--if-match]
+                                          [--if-modified-since]
+                                          [--if-none-match]
+                                          [--if-unmodified-since]
+                                          [--lease-id]
+                                          [--sas-token]
+                                          [--timeout]
+                                          [--user-principle-names]
+  examples:
+  - summary: Show the access control properties of a directory.
+    syntax: az storage blob directory access show -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --user-principle-names
+    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
+    description: ''
+- uid: az_storage_blob_directory_access_update
+  name: az storage blob directory access update
+  summary: Update the access control properties of a directory.
+  description: ''
+  syntax: >-
+    az storage blob directory access update --container-name
+                                            --directory-path
+                                            [--account-key]
+                                            [--account-name]
+                                            [--acl-spec]
+                                            [--auth-mode {key, login}]
+                                            [--connection-string]
+                                            [--group]
+                                            [--if-match]
+                                            [--if-modified-since]
+                                            [--if-none-match]
+                                            [--if-unmodified-since]
+                                            [--lease-id]
+                                            [--owner]
+                                            [--permissions]
+                                            [--sas-token]
+                                            [--timeout]
+  examples:
+  - summary: Update the access permissions of a directory.
+    syntax: az storage blob directory access update --permissions "rwxrwxrwx" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning user of a directory.
+    syntax: az storage blob directory access update --owner [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning group of a directory.
+    syntax: az storage blob directory access update --group [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --group
+    summary: The owning group for the directory.
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --owner
+    summary: The owning user for the directory.
+    description: ''
+  - name: --permissions
+    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/directory/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/directory/metadata.yml
new file mode 100644
index 0000000000..0bcade77b2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/directory/metadata.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_directory_metadata
+name: az storage blob directory metadata
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob directory metadata** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage directory metadata.
+description: ''
+directCommands:
+- uid: az_storage_blob_directory_metadata_show
+  name: az storage blob directory metadata show
+  summary: Show all user-defined metadata for the specified blob directory.
+  description: ''
+  syntax: >-
+    az storage blob directory metadata show --container-name
+                                            --directory-path
+                                            [--account-key]
+                                            [--account-name]
+                                            [--auth-mode {key, login}]
+                                            [--connection-string]
+                                            [--cpk]
+                                            [--if-match]
+                                            [--if-modified-since]
+                                            [--if-none-match]
+                                            [--if-unmodified-since]
+                                            [--lease-id]
+                                            [--sas-token]
+                                            [--snapshot]
+                                            [--timeout]
+  examples:
+  - summary: Show all user-defined metadata for the specified blob directory.
+    syntax: az storage blob directory metadata show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --cpk
+    summary: Decrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_metadata_update
+  name: az storage blob directory metadata update
+  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
+  description: ''
+  syntax: >-
+    az storage blob directory metadata update --container-name
+                                              --directory-path
+                                              [--account-key]
+                                              [--account-name]
+                                              [--auth-mode {key, login}]
+                                              [--connection-string]
+                                              [--cpk]
+                                              [--if-match]
+                                              [--if-modified-since]
+                                              [--if-none-match]
+                                              [--if-unmodified-since]
+                                              [--lease-id]
+                                              [--metadata]
+                                              [--sas-token]
+                                              [--timeout]
+  examples:
+  - summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
+    syntax: az storage blob directory metadata update --metadata tag1=value1 -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --cpk
+    summary: Encrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage directory metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/lease.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/lease.yml
index 19358e2dbb..16eb44874e 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/blob/lease.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/lease.yml
@@ -1,24 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_lease
-  name: az storage blob lease
-  summary: Manage storage blob leases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_lease_acquire
-  - az_storage_blob_lease_break
-  - az_storage_blob_lease_change
-  - az_storage_blob_lease_release
-  - az_storage_blob_lease_renew
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_lease
+name: az storage blob lease
+summary: Manage storage blob leases.
+description: ''
+directCommands:
 - uid: az_storage_blob_lease_acquire
   name: az storage blob lease acquire
-  summary: Acquires a lock on a blob for write and delete operations.
-  description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  summary: Request a new lease.
+  description: ''
+  syntax: >-
+    az storage blob lease acquire --blob-name
+                                  --container-name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--lease-duration]
+                                  [--proposed-lease-id]
+                                  [--sas-token]
+                                  [--subscription]
+                                  [--timeout]
+  examples:
+  - summary: Request a new lease.
+    syntax: az storage blob lease acquire -b myblob -c mycontainer --account-name mystorageaccount --account-key 0000-0000
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -27,15 +35,15 @@ items:
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-duration
-    defaultValue: "-1"
-    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --proposed-lease-id
-    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -49,14 +57,12 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-duration
+    defaultValue: "-1"
+    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --proposed-lease-id
+    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -64,19 +70,29 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_break
   name: az storage blob lease break
   summary: Breaks a lock on a blob for write and delete operations.
   description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob lease break --blob-name
+                                --container-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--if-match]
+                                [--if-modified-since]
+                                [--if-none-match]
+                                [--if-unmodified-since]
+                                [--lease-break-period]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -85,11 +101,15 @@ items:
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-break-period
-    summary: For a break operation, this is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -103,14 +123,8 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-break-period
+    summary: For a break operation, this is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -118,19 +132,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_change
   name: az storage blob lease change
   summary: Changes a lock on a blob for write and delete operations.
   description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob lease change --blob-name
+                                 --container-name
+                                 --lease-id
+                                 --proposed-lease-id
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--if-match]
+                                 [--if-modified-since]
+                                 [--if-none-match]
+                                 [--if-unmodified-since]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -147,8 +172,15 @@ items:
     name: --proposed-lease-id
     summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -162,34 +194,35 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_release
   name: az storage blob lease release
   summary: Releases a lock on a blob for write and delete operations.
   description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob lease release --blob-name
+                                  --container-name
+                                  --lease-id
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--sas-token]
+                                  [--subscription]
+                                  [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -202,8 +235,15 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -217,34 +257,38 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_renew
   name: az storage blob lease renew
-  summary: Renews a lock on a blob for write and delete operations.
-  description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  summary: Renew the lease.
+  description: ''
+  syntax: >-
+    az storage blob lease renew --blob-name
+                                --container-name
+                                --lease-id
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--if-match]
+                                [--if-modified-since]
+                                [--if-none-match]
+                                [--if-unmodified-since]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  examples:
+  - summary: Renew the lease.
+    syntax: az storage blob lease renew -b myblob -c mycontainer --lease-id "32fe23cd-4779-4919-adb3-357e76c9b1bb" --account-name mystorageaccount --account-key 0000-0000
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -257,8 +301,15 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -272,43 +323,22 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_lease_acquire
-  name: az storage blob lease acquire
-  summary: Acquires a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_break
-  name: az storage blob lease break
-  summary: Breaks a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_change
-  name: az storage blob lease change
-  summary: Changes a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_release
-  name: az storage blob lease release
-  summary: Releases a lock on a blob for write and delete operations.
-- uid: az_storage_blob_lease_renew
-  name: az storage blob lease renew
-  summary: Renews a lock on a blob for write and delete operations.
+- az_storage_blob_lease_acquire
+- az_storage_blob_lease_break
+- az_storage_blob_lease_change
+- az_storage_blob_lease_release
+- az_storage_blob_lease_renew
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -324,10 +354,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage blob leases.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage blob leases.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/metadata.yml
index f58ea692b1..3042caa51c 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/blob/metadata.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/metadata.yml
@@ -1,21 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_metadata
-  name: az storage blob metadata
-  summary: Manage blob metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_metadata_show
-  - az_storage_blob_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_metadata
+name: az storage blob metadata
+summary: Manage blob metadata.
+description: ''
+directCommands:
 - uid: az_storage_blob_metadata_show
   name: az storage blob metadata show
   summary: Returns all user-defined metadata for the specified blob or snapshot.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob metadata show --container-name
+                                  --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--lease-id]
+                                  [--query-examples]
+                                  [--sas-token]
+                                  [--snapshot]
+                                  [--subscription]
+                                  [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -24,14 +33,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -45,34 +55,45 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_metadata_update
   name: az storage blob metadata update
   summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob metadata update --container-name
+                                    --name
+                                    [--account-key]
+                                    [--account-name]
+                                    [--connection-string]
+                                    [--if-match]
+                                    [--if-modified-since]
+                                    [--if-none-match]
+                                    [--if-unmodified-since]
+                                    [--lease-id]
+                                    [--metadata]
+                                    [--sas-token]
+                                    [--subscription]
+                                    [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -81,14 +102,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -102,14 +124,11 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -117,19 +136,13 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_metadata_show
-  name: az storage blob metadata show
-  summary: Returns all user-defined metadata for the specified blob or snapshot.
-- uid: az_storage_blob_metadata_update
-  name: az storage blob metadata update
-  summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
+- az_storage_blob_metadata_show
+- az_storage_blob_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -145,10 +158,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties.yml
index f05dd14e99..2a71b3f054 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties.yml
@@ -1,24 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_service_properties_show
-  - az_storage_blob_service_properties_update
-- uid: az_storage_blob_service_properties_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_service-properties
+name: az storage blob service-properties
+summary: Manage storage blob service properties.
+description: ''
+directCommands:
+- uid: az_storage_blob_service-properties_show
   name: az storage blob service-properties show
   summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  syntax: >-
+    az storage blob service-properties show [--account-key]
+                                            [--account-name]
+                                            [--connection-string]
+                                            [--query-examples]
+                                            [--sas-token]
+                                            [--subscription]
+                                            [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -28,72 +26,75 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_service_properties_update
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_service-properties_update
   name: az storage blob service-properties update
   summary: Update storage blob service properties.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob service-properties update [--account-key]
+                                              [--account-name]
+                                              [--add]
+                                              [--connection-string]
+                                              [--force-string]
+                                              [--remove]
+                                              [--sas-token]
+                                              [--set]
+                                              [--subscription]
+                                              [--timeout]
   examples:
   - summary: Update storage blob service properties. (autogenerated)
-    syntax:
-      content: az storage blob service-properties update --404-document error.html --account-name mystorageccount --account-key 00000000 --index-document index.html --static-website true
-  parameters:
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage blob service-properties update --404-document error.html --account-name mystorageccount --account-key 00000000 --index-document index.html --static-website true
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
+- az_storage_blob_service-properties_delete-policy
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+- az_storage_blob_service-properties_show
+- az_storage_blob_service-properties_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -109,10 +110,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage blob service properties.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage blob service properties.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties/delete-policy.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties/delete-policy.yml
new file mode 100644
index 0000000000..8b995822c5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/service-properties/delete-policy.yml
@@ -0,0 +1,101 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_service-properties_delete-policy
+name: az storage blob service-properties delete-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-blob-preview** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az storage blob service-properties delete-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage storage blob delete-policy service properties.
+description: ''
+directCommands:
+- uid: az_storage_blob_service-properties_delete-policy_show
+  name: az storage blob service-properties delete-policy show
+  summary: Show the storage blob delete-policy.
+  description: ''
+  syntax: >-
+    az storage blob service-properties delete-policy show [--account-key]
+                                                          [--account-name]
+                                                          [--auth-mode {key, login}]
+                                                          [--connection-string]
+                                                          [--sas-token]
+  examples:
+  - summary: Show the storage blob delete-policy. (autogenerated)
+    syntax: az storage blob service-properties delete-policy show --account-name mystorageccount --account-key 00000000
+  - summary: Show the storage blob delete-policy. (autogenerated)
+    syntax: az storage blob service-properties delete-policy show --account-name mystorageccount --auth-mode login
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_blob_service-properties_delete-policy_update
+  name: az storage blob service-properties delete-policy update
+  summary: Update the storage blob delete-policy.
+  description: ''
+  syntax: >-
+    az storage blob service-properties delete-policy update [--account-key]
+                                                            [--account-name]
+                                                            [--auth-mode {key, login}]
+                                                            [--connection-string]
+                                                            [--days-retained]
+                                                            [--enable {false, true}]
+                                                            [--sas-token]
+  examples:
+  - summary: Update the storage blob delete-policy. (autogenerated)
+    syntax: az storage blob service-properties delete-policy update --account-name mystorageccount --account-key 00000000 --days-retained 7 --enable true
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --days-retained
+    summary: Number of days that soft-deleted blob will be retained. Must be in range [1,365].
+    description: ''
+  - name: --enable
+    parameterValueGroup: false, true
+    summary: Enables/disables soft-delete.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+commands:
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage storage blob delete-policy service properties.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/blob/tag.yml b/2017-03-09-profile/docs-ref-autogen/storage/blob/tag.yml
new file mode 100644
index 0000000000..c72e5d9826
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/blob/tag.yml
@@ -0,0 +1,142 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_tag
+name: az storage blob tag
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-blob-preview** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az storage blob tag** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage blob tags.
+description: ''
+directCommands:
+- uid: az_storage_blob_tag_list
+  name: az storage blob tag list
+  summary: Get tags on a blob or specific blob version, or snapshot.
+  description: ''
+  syntax: >-
+    az storage blob tag list [--account-key]
+                             [--account-name]
+                             [--auth-mode {key, login}]
+                             [--blob-url]
+                             [--connection-string]
+                             [--container-name]
+                             [--name]
+                             [--sas-token]
+                             [--snapshot]
+                             [--tags-condition]
+                             [--timeout]
+                             [--version-id]
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --blob-url
+    summary: The full endpoint URL to the Blob, including SAS token and snapshot if used. This could be either the primary endpoint, or the secondary endpoint depending on the current `location_mode`.
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --container-name -c
+    summary: The container name.
+    description: ''
+  - name: --name -n
+    summary: The blob name.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
+  - name: --tags-condition
+    summary: Specify a SQL where clause on blob tags to operate only on blobs with a matching value.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --version-id
+    summary: An optional blob version ID. This parameter is only for versioning enabled account.
+    description: ''
+- uid: az_storage_blob_tag_set
+  name: az storage blob tag set
+  summary: Set tags on a blob or specific blob version, but not snapshot.
+  description: Each call to this operation replaces all existing tags attached to the blob. To remove all tags from the blob, call this operation with no tags set.
+  syntax: >-
+    az storage blob tag set --tags
+                            [--account-key]
+                            [--account-name]
+                            [--auth-mode {key, login}]
+                            [--blob-url]
+                            [--connection-string]
+                            [--container-name]
+                            [--name]
+                            [--sas-token]
+                            [--tags-condition]
+                            [--timeout]
+                            [--version-id]
+  requiredParameters:
+  - isRequired: true
+    name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Tags are case-sensitive. The tag set may contain at most 10 tags.  Tag keys must be between 1 and 128 characters, and tag values must be between 0 and 256 characters. Valid tag key and value characters include: lowercase and uppercase letters, digits (0-9), space (` `), plus (+), minus (-), period (.), solidus (/), colon (:), equals (=), underscore (_).'
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --blob-url
+    summary: The full endpoint URL to the Blob, including SAS token and snapshot if used. This could be either the primary endpoint, or the secondary endpoint depending on the current `location_mode`.
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --container-name -c
+    summary: The container name.
+    description: ''
+  - name: --name -n
+    summary: The blob name.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --tags-condition
+    summary: Specify a SQL where clause on blob tags to operate only on blobs with a matching value.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --version-id
+    summary: An optional blob version ID. This parameter is only for versioning enabled account.
+    description: ''
+commands:
+- az_storage_blob_tag_list
+- az_storage_blob_tag_set
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage blob tags.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/container.yml b/2017-03-09-profile/docs-ref-autogen/storage/container.yml
index 6fde9544ae..0d0749aa94 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/container.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/container.yml
@@ -1,72 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container
-  name: az storage container
-  summary: Manage blob storage containers.
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_create
-  - az_storage_container_delete
-  - az_storage_container_exists
-  - az_storage_container_generate_sas
-  - az_storage_container_list
-  - az_storage_container_set_permission
-  - az_storage_container_show
-  - az_storage_container_show_permission
+### YamlMime:AzureCLIGroup
+uid: az_storage_container
+name: az storage container
+summary: Manage blob storage containers.
+description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+directCommands:
 - uid: az_storage_container_create
   name: az storage container create
   summary: Create a container in a storage account.
   description: By default, container data is private ("off") to the account owner. Use "blob" to allow public read access for blobs. Use "container" to allow public read and list access to the entire container. You can configure the --public-access using `az storage container set-permission -n CONTAINER_NAME --public-access blob/container/off`.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container create --name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--default-encryption-scope]
+                                [--fail-on-exist]
+                                [--metadata]
+                                [--prevent-encryption-scope-override {false, true}]
+                                [--public-access {blob, container, off}]
+                                [--resource-group]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Create a storage container in a storage account.
-    syntax:
-      content: az storage container create -n MyStorageContainer
+    syntax: az storage container create -n mystoragecontainer
   - summary: Create a storage container in a storage account and return an error if the container already exists.
-    syntax:
-      content: az storage container create -n MyStorageContainer --fail-on-exist
+    syntax: az storage container create -n mystoragecontainer --fail-on-exist
   - summary: Create a storage container in a storage account and allow public read access for blobs.
-    syntax:
-      content: az storage container create -n MyStorageContainer --public-access blob
-  parameters:
+    syntax: az storage container create -n mystoragecontainer --public-access blob
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT.'
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --default-encryption-scope -d
+    summary: Default the container to use specified encryption scope for all writes.
+    description: ''
   - name: --fail-on-exist
     summary: Throw an exception if the container already exists.
     description: ''
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --public-access
-    parameterValueGroup: blob, container, off
-    summary: Specifies whether data in the container may be accessed publicly.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --default-encryption-scope -d
-    summary: Default the container to use specified encryption scope for all writes.
-    description: ''
   - name: --prevent-encryption-scope-override -p
     parameterValueGroup: false, true
     summary: Block override of encryption scope from the container default.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+  - name: --public-access
+    parameterValueGroup: blob, container, off
+    summary: Specifies whether data in the container may be accessed publicly.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -74,53 +70,59 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_delete
   name: az storage container delete
   summary: Marks the specified container for deletion.
   description: The container and any blobs contained within it are later deleted during garbage collection.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container delete --name
+                                [--account-key]
+                                [--account-name]
+                                [--bypass-immutability-policy]
+                                [--connection-string]
+                                [--fail-not-exist]
+                                [--if-modified-since]
+                                [--if-unmodified-since]
+                                [--lease-id]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Marks the specified container for deletion. (autogenerated)
-    syntax:
-      content: az storage container delete --account-key 00000000 --account-name MyAccount --name MyContainer
-  parameters:
+    syntax: az storage container delete --account-key 00000000 --account-name MyAccount --name mycontainer
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --bypass-immutability-policy
     summary: Bypasses upcoming service behavior that will block a container from being deleted if it has a immutability-policy. Specifying this will ignore arguments aside from those used to identify the container ("--name", "--account-name").
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --fail-not-exist
     summary: Throw an exception if the container does not exist.
     description: ''
-  - name: --lease-id
-    summary: If specified, delete_container only succeeds if the container's lease is active and matches this ID. Required if the container has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --if-modified-since
     summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: If specified, delete_container only succeeds if the container's lease is active and matches this ID. Required if the container has an active lease.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -128,30 +130,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_exists
   name: az storage container exists
   summary: Check for the existence of a storage container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container exists --name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Check for the existence of a storage container. (autogenerated)
-    syntax:
-      content: az storage container exists --account-name mystorageccount --account-key 00000000 --name mycontainer
-  parameters:
+    syntax: az storage container exists --account-name mystorageccount --account-key 00000000 --name mycontainer
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -167,38 +170,62 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_generate-sas
   name: az storage container generate-sas
   summary: Generate a SAS token for a storage container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container generate-sas --name
+                                      [--account-key]
+                                      [--account-name]
+                                      [--cache-control]
+                                      [--connection-string]
+                                      [--content-disposition]
+                                      [--content-encoding]
+                                      [--content-language]
+                                      [--content-type]
+                                      [--expiry]
+                                      [--https-only]
+                                      [--ip]
+                                      [--permissions]
+                                      [--policy-name]
+                                      [--sas-token]
+                                      [--start]
+                                      [--subscription]
   examples:
   - summary: Generate a sas token for blob container and use it to upload a blob.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        sas=`az storage container generate-sas -n mycontainer --https-only --permissions dlrw --expiry $end -o tsv`
+      sas=`az storage container generate-sas -n mycontainer --https-only --permissions dlrw --expiry $end -o tsv`
 
-        az storage blob upload -n MyBlob -c mycontainer -f file.txt --sas-token $sas
+      az storage blob upload -n MyBlob -c mycontainer -f file.txt --sas-token $sas
   - summary: Generate a shared access signature for the container (autogenerated)
-    syntax:
-      content: az storage container generate-sas --account-key 00000000 --account-name mystorageaccount --expiry 2020-01-01 --name mycontainer --permissions dlrw
-  parameters:
+    syntax: az storage container generate-sas --account-key 00000000 --account-name mystorageaccount --expiry 2020-01-01 --name mycontainer --permissions dlrw
+  - summary: Generate a SAS token for a storage container. (autogenerated)
+    syntax: az storage container generate-sas --account-name mystorageaccount --as-user --auth-mode login --expiry 2020-01-01 --name container1 --permissions dlrw
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessedusing this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessedusing this shared access signature.
     description: ''
@@ -226,9 +253,33 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the container's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_list
+  name: az storage container list
+  summary: List containers in a storage account.
+  description: ''
+  syntax: >-
+    az storage container list [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--include-metadata]
+                              [--marker]
+                              [--num-results]
+                              [--prefix]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -238,25 +289,6 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_list
-  name: az storage container list
-  summary: List containers in a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
   - name: --include-metadata
     summary: Specifies that container metadata be returned in the response.
     description: ''
@@ -270,50 +302,91 @@ items:
   - name: --prefix
     summary: Filters the results to return only containers whose names begin with the specified prefix.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_restore
+  name: az storage container restore
+  summary: Restores soft-deleted container.
+  description: "Operation will only be successful if used within the specified number of days set in the delete retention policy.  .. versionadded:: 12.4.0     This operation was introduced in API version '2019-12-12'."
+  syntax: >-
+    az storage container restore --deleted-version
+                                 --name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--sas-token]
+                                 [--timeout]
+  requiredParameters:
+  - isRequired: true
+    name: --deleted-version
+    summary: Specify the version of the deleted container to restore.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specify the name of the deleted container to restore.
+    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_set_permission
+- uid: az_storage_container_set-permission
   name: az storage container set-permission
   summary: Sets the permissions for the specified container or stored access  policies that may be used with Shared Access Signatures.
   description: The permissions indicate whether blobs in a container may be accessed publicly.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container set-permission --name
+                                        [--account-key]
+                                        [--account-name]
+                                        [--connection-string]
+                                        [--if-modified-since]
+                                        [--if-unmodified-since]
+                                        [--lease-id]
+                                        [--public-access {blob, container, off}]
+                                        [--sas-token]
+                                        [--subscription]
+                                        [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, set_container_acl only succeeds if the container's lease is active and matches this ID.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --public-access
-    parameterValueGroup: blob, container, off
-    summary: Specifies whether data in the container may be accessed publicly.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-modified-since
     summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
@@ -321,14 +394,12 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: If specified, set_container_acl only succeeds if the container's lease is active and matches this ID.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --public-access
+    parameterValueGroup: blob, container, off
+    summary: Specifies whether data in the container may be accessed publicly.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -336,29 +407,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_show
   name: az storage container show
   summary: Returns all user-defined metadata and system properties for the specified container.
   description: The data returned does not include the container's list of blobs.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container show --name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--lease-id]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, get_container_properties only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -368,35 +440,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: If specified, get_container_properties only succeeds if the container's lease is active and matches this ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_show_permission
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_show-permission
   name: az storage container show-permission
   summary: Gets the permissions for the specified container.
   description: The permissions indicate whether container data may be accessed publicly.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container show-permission --name
+                                         [--account-key]
+                                         [--account-name]
+                                         [--connection-string]
+                                         [--lease-id]
+                                         [--sas-token]
+                                         [--subscription]
+                                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, get_container_acl only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -406,85 +484,43 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: If specified, get_container_acl only succeeds if the container's lease is active and matches this ID.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_create
-  name: az storage container create
-  summary: Create a container in a storage account.
-- uid: az_storage_container_delete
-  name: az storage container delete
-  summary: Marks the specified container for deletion.
-- uid: az_storage_container_exists
-  name: az storage container exists
-  summary: Check for the existence of a storage container.
-- uid: az_storage_container_generate_sas
-  name: az storage container generate-sas
-  summary: Generate a SAS token for a storage container.
-- uid: az_storage_container_lease
-  name: az storage container lease
-  summary: Manage blob storage container leases.
-- uid: az_storage_container_lease_acquire
-  name: az storage container lease acquire
-  summary: Acquires a lock on a container for delete operations.
-- uid: az_storage_container_lease_break
-  name: az storage container lease break
-  summary: Breaks a lock on a container for delete operations.
-- uid: az_storage_container_lease_change
-  name: az storage container lease change
-  summary: Changes the lease ID for a lock on a container for delete operations.
-- uid: az_storage_container_lease_release
-  name: az storage container lease release
-  summary: Releases a lock on a container for delete operations, to free the lease if it is no longer needed so that another client may immediately acquire a lease against the container.
-- uid: az_storage_container_lease_renew
-  name: az storage container lease renew
-  summary: Renews a lock on a container for delete operations.
-- uid: az_storage_container_list
-  name: az storage container list
-  summary: List containers in a storage account.
-- uid: az_storage_container_metadata
-  name: az storage container metadata
-  summary: Manage container metadata.
-- uid: az_storage_container_metadata_show
-  name: az storage container metadata show
-  summary: Returns all user-defined metadata for the specified container.
-- uid: az_storage_container_metadata_update
-  name: az storage container metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified container.
-- uid: az_storage_container_policy
-  name: az storage container policy
-  summary: Manage container stored access policies.
-- uid: az_storage_container_policy_create
-  name: az storage container policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_container_policy_delete
-  name: az storage container policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_container_policy_list
-  name: az storage container policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_container_policy_show
-  name: az storage container policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_container_set_permission
-  name: az storage container set-permission
-  summary: Sets the permissions for the specified container or stored access  policies that may be used with Shared Access Signatures.
-- uid: az_storage_container_show
-  name: az storage container show
-  summary: Returns all user-defined metadata and system properties for the specified container.
-- uid: az_storage_container_show_permission
-  name: az storage container show-permission
-  summary: Gets the permissions for the specified container.
+- az_storage_container_create
+- az_storage_container_delete
+- az_storage_container_exists
+- az_storage_container_generate-sas
+- az_storage_container_lease
+- az_storage_container_lease_acquire
+- az_storage_container_lease_break
+- az_storage_container_lease_change
+- az_storage_container_lease_release
+- az_storage_container_lease_renew
+- az_storage_container_list
+- az_storage_container_metadata
+- az_storage_container_metadata_show
+- az_storage_container_metadata_update
+- az_storage_container_policy
+- az_storage_container_policy_create
+- az_storage_container_policy_delete
+- az_storage_container_policy_list
+- az_storage_container_policy_show
+- az_storage_container_restore
+- az_storage_container_set-permission
+- az_storage_container_show
+- az_storage_container_show-permission
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -500,10 +536,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/container/lease.yml b/2017-03-09-profile/docs-ref-autogen/storage/container/lease.yml
index 2f6d7f1cf3..e18c236bbc 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/container/lease.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/container/lease.yml
@@ -1,37 +1,39 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container_lease
-  name: az storage container lease
-  summary: Manage blob storage container leases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_lease_acquire
-  - az_storage_container_lease_break
-  - az_storage_container_lease_change
-  - az_storage_container_lease_release
-  - az_storage_container_lease_renew
+### YamlMime:AzureCLIGroup
+uid: az_storage_container_lease
+name: az storage container lease
+summary: Manage blob storage container leases.
+description: ''
+directCommands:
 - uid: az_storage_container_lease_acquire
   name: az storage container lease acquire
   summary: Acquires a lock on a container for delete operations.
   description: The lock duration can be 15 to 60 seconds or infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease acquire --container-name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--if-modified-since]
+                                       [--if-unmodified-since]
+                                       [--lease-duration]
+                                       [--proposed-lease-id]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-duration
-    defaultValue: "-1"
-    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --proposed-lease-id
-    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-modified-since
     summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
@@ -39,14 +41,12 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-duration
+    defaultValue: "-1"
+    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --proposed-lease-id
+    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -54,35 +54,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_break
   name: az storage container lease break
   summary: Breaks a lock on a container for delete operations.
   description: Use to end the lease but ensure that another client cannot acquire a new lease until the current lease period has expired. The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease break --container-name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--if-modified-since]
+                                     [--if-unmodified-since]
+                                     [--lease-break-period]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-break-period
-    summary: This is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -92,25 +88,42 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-break-period
+    summary: This is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_change
   name: az storage container lease change
   summary: Changes the lease ID for a lock on a container for delete operations.
   description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease change --container-name
+                                      --lease-id
+                                      --proposed-lease-id
+                                      [--account-key]
+                                      [--account-name]
+                                      [--connection-string]
+                                      [--if-modified-since]
+                                      [--if-unmodified-since]
+                                      [--sas-token]
+                                      [--subscription]
+                                      [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -123,15 +136,7 @@ items:
     name: --proposed-lease-id
     summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -141,25 +146,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_release
   name: az storage container lease release
   summary: Releases a lock on a container for delete operations, to free the lease if it is no longer needed so that another client may immediately acquire a lease against the container.
   description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease release --container-name
+                                       --lease-id
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--if-modified-since]
+                                       [--if-unmodified-since]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -168,15 +186,7 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -186,25 +196,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_renew
   name: az storage container lease renew
   summary: Renews a lock on a container for delete operations.
   description: The lock duration can be 15 to 60 seconds, or can be infinite.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease renew --container-name
+                                     --lease-id
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--if-modified-since]
+                                     [--if-unmodified-since]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -213,15 +236,7 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -231,34 +246,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_lease_acquire
-  name: az storage container lease acquire
-  summary: Acquires a lock on a container for delete operations.
-- uid: az_storage_container_lease_break
-  name: az storage container lease break
-  summary: Breaks a lock on a container for delete operations.
-- uid: az_storage_container_lease_change
-  name: az storage container lease change
-  summary: Changes the lease ID for a lock on a container for delete operations.
-- uid: az_storage_container_lease_release
-  name: az storage container lease release
-  summary: Releases a lock on a container for delete operations, to free the lease if it is no longer needed so that another client may immediately acquire a lease against the container.
-- uid: az_storage_container_lease_renew
-  name: az storage container lease renew
-  summary: Renews a lock on a container for delete operations.
+- az_storage_container_lease_acquire
+- az_storage_container_lease_break
+- az_storage_container_lease_change
+- az_storage_container_lease_release
+- az_storage_container_lease_renew
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -274,10 +283,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob storage container leases.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob storage container leases.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/container/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/container/metadata.yml
index f483df2c1d..eba57bef1e 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/container/metadata.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/container/metadata.yml
@@ -1,31 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container_metadata
-  name: az storage container metadata
-  summary: Manage container metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_metadata_show
-  - az_storage_container_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_container_metadata
+name: az storage container metadata
+summary: Manage container metadata.
+description: ''
+directCommands:
 - uid: az_storage_container_metadata_show
   name: az storage container metadata show
   summary: Returns all user-defined metadata for the specified container.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container metadata show --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--lease-id]
+                                       [--query-examples]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, get_container_metadata only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -35,41 +33,43 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: If specified, get_container_metadata only succeeds if the container's lease is active and matches this ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_metadata_update
   name: az storage container metadata update
   summary: Sets one or more user-defined name-value pairs for the specified container.
   description: Each call to this operation replaces all existing metadata attached to the container. To remove all metadata from the container, call this operation with no metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container metadata update --name
+                                         [--account-key]
+                                         [--account-name]
+                                         [--connection-string]
+                                         [--if-modified-since]
+                                         [--lease-id]
+                                         [--metadata]
+                                         [--sas-token]
+                                         [--subscription]
+                                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, set_container_metadata only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -79,25 +79,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: If specified, set_container_metadata only succeeds if the container's lease is active and matches this ID.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_metadata_show
-  name: az storage container metadata show
-  summary: Returns all user-defined metadata for the specified container.
-- uid: az_storage_container_metadata_update
-  name: az storage container metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified container.
+- az_storage_container_metadata_show
+- az_storage_container_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -113,10 +116,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage container metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage container metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/container/policy.yml b/2017-03-09-profile/docs-ref-autogen/storage/container/policy.yml
index 27ef67f5ae..3079e2653d 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/container/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/container/policy.yml
@@ -1,23 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container_policy
-  name: az storage container policy
-  summary: Manage container stored access policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_policy_create
-  - az_storage_container_policy_delete
-  - az_storage_container_policy_list
-  - az_storage_container_policy_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_container_policy
+name: az storage container policy
+summary: Manage container stored access policies.
+description: ''
+directCommands:
 - uid: az_storage_container_policy_create
   name: az storage container policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy create --container-name
+                                       --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--expiry]
+                                       [--lease-id]
+                                       [--permissions]
+                                       [--sas-token]
+                                       [--start]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -26,18 +29,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -47,25 +39,39 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_delete
   name: az storage container policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy delete --container-name
+                                       --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--lease-id]
+                                       [--sas-token]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -74,9 +80,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -86,32 +90,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_list
   name: az storage container policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy list --container-name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--lease-id]
+                                     [--query-examples]
+                                     [--sas-token]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -121,25 +128,34 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_show
   name: az storage container policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy show --container-name
+                                     --name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--lease-id]
+                                     [--query-examples]
+                                     [--sas-token]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -148,9 +164,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -160,31 +174,24 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_policy_create
-  name: az storage container policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_container_policy_delete
-  name: az storage container policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_container_policy_list
-  name: az storage container policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_container_policy_show
-  name: az storage container policy show
-  summary: Show a stored access policy on a containing object.
+- az_storage_container_policy_create
+- az_storage_container_policy_delete
+- az_storage_container_policy_list
+- az_storage_container_policy_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +207,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage container stored access policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage container stored access policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/cors.yml b/2017-03-09-profile/docs-ref-autogen/storage/cors.yml
index 3a428386bb..d0a84d2a2c 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/cors.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/cors.yml
@@ -1,22 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_cors
-  name: az storage cors
-  summary: Manage storage service Cross-Origin Resource Sharing (CORS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_cors_add
-  - az_storage_cors_clear
-  - az_storage_cors_list
+### YamlMime:AzureCLIGroup
+uid: az_storage_cors
+name: az storage cors
+summary: Manage storage service Cross-Origin Resource Sharing (CORS).
+description: ''
+directCommands:
 - uid: az_storage_cors_add
   name: az storage cors add
   summary: Add a CORS rule to a storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage cors add --methods {DELETE, GET, HEAD, MERGE, OPTIONS, POST, PUT}
+                        --origins
+                        --services
+                        [--account-key]
+                        [--account-name]
+                        [--allowed-headers]
+                        [--connection-string]
+                        [--exposed-headers]
+                        [--max-age]
+                        [--sas-token]
+                        [--subscription]
+                        [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --methods
     parameterValueGroup: DELETE, GET, HEAD, MERGE, OPTIONS, POST, PUT
@@ -30,57 +35,56 @@ items:
     name: --services
     summary: 'The storage service(s) to add rules to. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
     description: ''
-  - name: --allowed-headers
-    summary: Space-separated list of response headers allowed to be part of the cross-origin request.
-    description: ''
-  - name: --exposed-headers
-    summary: Space-separated list of response headers to expose to CORS clients.
-    description: ''
-  - name: --max-age
-    summary: The maximum number of seconds the client/browser should cache a preflight response.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --allowed-headers
+    summary: Space-separated list of response headers allowed to be part of the cross-origin request.
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --exposed-headers
+    summary: Space-separated list of response headers to expose to CORS clients.
+    description: ''
+  - name: --max-age
+    summary: The maximum number of seconds the client/browser should cache a preflight response.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_cors_clear
   name: az storage cors clear
   summary: Remove all CORS rules from a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage cors clear --services
+                          [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
   examples:
   - summary: Remove all CORS rules from a storage account. (autogenerated)
-    syntax:
-      content: az storage cors clear --account-name MyAccount --services bfqt
-  parameters:
+    syntax: az storage cors clear --account-name MyAccount --services bfqt
+  requiredParameters:
   - isRequired: true
     name: --services
     summary: 'The storage service(s) to remove rules from. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -96,30 +100,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_cors_list
   name: az storage cors list
   summary: List all CORS rules for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage cors list [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--query-examples]
+                         [--sas-token]
+                         [--services]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: List all CORS rules for a storage account. (autogenerated)
-    syntax:
-      content: az storage cors list --account-name MyAccount
-  parameters:
-  - name: --services
-    defaultValue: bqft
-    summary: 'The storage service(s) to list rules for. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage cors list --account-key 00000000 --account-name mystorageaccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -129,28 +130,27 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bqft
+    summary: 'The storage service(s) to list rules for. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_cors_add
-  name: az storage cors add
-  summary: Add a CORS rule to a storage account.
-- uid: az_storage_cors_clear
-  name: az storage cors clear
-  summary: Remove all CORS rules from a storage account.
-- uid: az_storage_cors_list
-  name: az storage cors list
-  summary: List all CORS rules for a storage account.
+- az_storage_cors_add
+- az_storage_cors_clear
+- az_storage_cors_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -166,10 +166,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage service Cross-Origin Resource Sharing (CORS).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage service Cross-Origin Resource Sharing (CORS).
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/directory.yml b/2017-03-09-profile/docs-ref-autogen/storage/directory.yml
index e2543ae7c8..3eb1d8ae02 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/directory.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/directory.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_directory
-  name: az storage directory
-  summary: Manage file storage directories.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_directory_create
-  - az_storage_directory_delete
-  - az_storage_directory_exists
-  - az_storage_directory_list
-  - az_storage_directory_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_directory
+name: az storage directory
+summary: Manage file storage directories.
+description: ''
+directCommands:
 - uid: az_storage_directory_create
   name: az storage directory create
   summary: Creates a new directory under the specified share or parent directory.
   description: If the directory with the same name already exists, the operation fails on the service. By default, the exception is swallowed by the client. To expose the exception, specify True for fail_on_exists.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory create --name
+                                --share-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--fail-on-exist]
+                                [--metadata]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -27,15 +28,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --fail-on-exist
-    summary: Specify whether to throw an exception when the directory exists. False by default.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Specify whether to throw an exception when the directory exists. False by default.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_delete
   name: az storage directory delete
   summary: Deletes the specified empty directory.
   description: Note that the directory must be empty before it can be deleted. Attempting to delete directories  that are not empty will fail.  If the directory does not exist, the operation fails on the service. By default, the exception is swallowed by the client. To expose the exception, specify True for fail_not_exist.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory delete --name
+                                --share-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--fail-not-exist]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -72,12 +77,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --fail-not-exist
-    summary: Specify whether to throw an exception when the directory doesn't exist.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,29 +87,36 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specify whether to throw an exception when the directory doesn't exist.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_exists
   name: az storage directory exists
   summary: Check for the existence of a storage directory.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage directory exists --name
+                                --share-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Check for the existence of a storage directory. (autogenerated)
-    syntax:
-      content: az storage directory exists --account-key 00000000 --account-name MyAccount --name MyDirectory --share-name MyShare
-  parameters:
+    syntax: az storage directory exists --account-key 00000000 --account-name MyAccount --name MyDirectory --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -118,9 +125,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -136,33 +141,33 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_list
   name: az storage directory list
   summary: List directories in a share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage directory list --share-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--name]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
   examples:
   - summary: List directories in a share. (autogenerated)
-    syntax:
-      content: az storage directory list --account-key 00000000 --account-name MyAccount --share-name MyShare
-  parameters:
+    syntax: az storage directory list --account-key 00000000 --account-name MyAccount --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --name -n
-    summary: The directory name.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -172,25 +177,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --name -n
+    summary: The directory name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_show
   name: az storage directory show
   summary: Returns all user-defined metadata and system properties for the specified directory.
   description: The data returned does not include the directory's list of files.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory show --name
+                              --share-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -199,9 +216,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -211,43 +226,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_directory_create
-  name: az storage directory create
-  summary: Creates a new directory under the specified share or parent directory.
-- uid: az_storage_directory_delete
-  name: az storage directory delete
-  summary: Deletes the specified empty directory.
-- uid: az_storage_directory_exists
-  name: az storage directory exists
-  summary: Check for the existence of a storage directory.
-- uid: az_storage_directory_list
-  name: az storage directory list
-  summary: List directories in a share.
-- uid: az_storage_directory_metadata
-  name: az storage directory metadata
-  summary: Manage file storage directory metadata.
-- uid: az_storage_directory_metadata_show
-  name: az storage directory metadata show
-  summary: Returns all user-defined metadata for the specified directory.
-- uid: az_storage_directory_metadata_update
-  name: az storage directory metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified directory.
-- uid: az_storage_directory_show
-  name: az storage directory show
-  summary: Returns all user-defined metadata and system properties for the specified directory.
+- az_storage_directory_create
+- az_storage_directory_delete
+- az_storage_directory_exists
+- az_storage_directory_list
+- az_storage_directory_metadata
+- az_storage_directory_metadata_show
+- az_storage_directory_metadata_update
+- az_storage_directory_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -263,10 +263,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file storage directories.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file storage directories.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/directory/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/directory/metadata.yml
index 73608bfe21..5bfbc0c148 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/directory/metadata.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/directory/metadata.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_directory_metadata
-  name: az storage directory metadata
-  summary: Manage file storage directory metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_directory_metadata_show
-  - az_storage_directory_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_directory_metadata
+name: az storage directory metadata
+summary: Manage file storage directory metadata.
+description: ''
+directCommands:
 - uid: az_storage_directory_metadata_show
   name: az storage directory metadata show
   summary: Returns all user-defined metadata for the specified directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory metadata show --name
+                                       --share-name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--query-examples]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -24,9 +27,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -36,25 +37,34 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_metadata_update
   name: az storage directory metadata update
   summary: Sets one or more user-defined name-value pairs for the specified directory.
   description: Each call to this operation replaces all existing metadata attached to the directory. To remove all metadata from the directory, call this operation with no metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory metadata update --name
+                                         --share-name
+                                         [--account-key]
+                                         [--account-name]
+                                         [--connection-string]
+                                         [--metadata]
+                                         [--sas-token]
+                                         [--subscription]
+                                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -63,12 +73,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -78,25 +83,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_directory_metadata_show
-  name: az storage directory metadata show
-  summary: Returns all user-defined metadata for the specified directory.
-- uid: az_storage_directory_metadata_update
-  name: az storage directory metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified directory.
+- az_storage_directory_metadata_show
+- az_storage_directory_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -112,10 +114,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file storage directory metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file storage directory metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/entity.yml b/2017-03-09-profile/docs-ref-autogen/storage/entity.yml
index 59269d34cd..dd4a34e0d9 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/entity.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/entity.yml
@@ -1,25 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_entity
-  name: az storage entity
-  summary: Manage table storage entities.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_entity_delete
-  - az_storage_entity_insert
-  - az_storage_entity_merge
-  - az_storage_entity_query
-  - az_storage_entity_replace
-  - az_storage_entity_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_entity
+name: az storage entity
+summary: Manage table storage entities.
+description: ''
+directCommands:
 - uid: az_storage_entity_delete
   name: az storage entity delete
   summary: Deletes an existing entity in a table.
   description: Throws if the entity does not exist.  When an entity is successfully deleted, the entity is immediately marked  for deletion and is no longer accessible to clients. The entity is later  removed from the Table service during garbage collection.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity delete --partition-key
+                             --row-key
+                             --table-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--if-match]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --partition-key
     summary: The PartitionKey of the entity.
@@ -32,13 +32,7 @@ items:
     name: --table-name -t
     summary: The name of the table containing the entity to delete.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    defaultValue: ''
-    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The delete operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional delete, set If-Match to the wildcard character (\*).
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -48,29 +42,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-match
+    defaultValue: ''
+    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The delete operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional delete, set If-Match to the wildcard character (\*).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_insert
   name: az storage entity insert
   summary: Insert an entity into a table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage entity insert --entity
+                             --table-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--if-exists {fail, merge, replace}]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
   examples:
   - summary: Insert an entity into a table. (autogenerated)
-    syntax:
-      content: az storage entity insert --connection-string $connectionString --entity PartitionKey=AAA RowKey=BBB Content=ASDF2 --if-exists fail --table-name MyTable
-  parameters:
+    syntax: az storage entity insert --connection-string $connectionString --entity PartitionKey=AAA RowKey=BBB Content=ASDF2 --if-exists fail --table-name MyTable
+  requiredParameters:
   - isRequired: true
     name: --entity -e
     summary: Space-separated list of key=value pairs. Must contain a PartitionKey and a RowKey.
@@ -79,14 +82,7 @@ items:
     name: --table-name -t
     summary: The name of the table to insert the entity into.
     description: ''
-  - name: --if-exists
-    defaultValue: fail
-    parameterValueGroup: fail, merge, replace
-    summary: Behavior when an entity already exists for the specified PartitionKey and RowKey.
-    description: ''
-  - name: --timeout
-    summary: The server timeout, expressed in seconds.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -96,25 +92,36 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-exists
+    defaultValue: fail
+    parameterValueGroup: fail, merge, replace
+    summary: Behavior when an entity already exists for the specified PartitionKey and RowKey.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: The server timeout, expressed in seconds.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_merge
   name: az storage entity merge
   summary: Updates an existing entity by merging the entity's properties.
   description: Throws  if the entity does not exist.   This operation does not replace the existing entity as the update_entity operation does. A property cannot be removed with merge_entity.  Any properties with null values are ignored. All other properties will be  updated or added.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity merge --entity
+                            --table-name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--if-match]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --entity -e
     summary: The entity to merge. Could be a dict or an entity object. Must contain a PartitionKey and a RowKey.
@@ -123,13 +130,7 @@ items:
     name: --table-name -t
     summary: The name of the table containing the entity to merge.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    defaultValue: ''
-    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The merge operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional merge, set If-Match to the wildcard character (\*).
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -139,53 +140,51 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-match
+    defaultValue: ''
+    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The merge operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional merge, set If-Match to the wildcard character (\*).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_query
   name: az storage entity query
   summary: List entities which satisfy a query.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage entity query --table-name
+                            [--accept {full, minimal, none}]
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--filter]
+                            [--marker]
+                            [--num-results]
+                            [--sas-token]
+                            [--select]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: List entities which satisfy a query. (autogenerated)
-    syntax:
-      content: az storage entity query --table-name MyTable
-  parameters:
+    syntax: az storage entity query --table-name MyTable
+  requiredParameters:
   - isRequired: true
     name: --table-name -t
     summary: The name of the table to query.
     description: ''
+  optionalParameters:
   - name: --accept
     defaultValue: minimal
     parameterValueGroup: full, minimal, none
     summary: Specifies how much metadata to include in the response payload.
     description: ''
-  - name: --filter
-    summary: Returns only entities that satisfy the specified filter. Note that no more than 15 discrete comparisons are permitted within a $filter string. See <a href="http://msdn.microsoft.com/en-us/library/windowsazure/dd894031.aspx">http://msdn.microsoft.com/en-us/library/windowsazure/dd894031.aspx</a> for more information on constructing filters.
-    description: ''
-  - name: --marker
-    summary: Space-separated list of key=value pairs. Must contain a nextpartitionkey and a nextrowkey.
-    description: This value can be retrieved from the next_marker field of a previous generator object if max_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-  - name: --num-results
-    summary: The maximum number of entities to return.
-    description: ''
-  - name: --select
-    summary: Space-separated list of properties to return for each entity.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -195,25 +194,43 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --filter
+    summary: Returns only entities that satisfy the specified filter. Note that no more than 15 discrete comparisons are permitted within a $filter string. See http://msdn.microsoft.com/en-us/library/windowsazure/dd894031.aspx for more information on constructing filters.
+    description: ''
+  - name: --marker
+    summary: Space-separated list of key=value pairs. Must contain a nextpartitionkey and a nextrowkey.
+    description: This value can be retrieved from the next_marker field of a previous generator object if max_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
+  - name: --num-results
+    summary: The maximum number of entities to return.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --select
+    summary: Space-separated list of properties to return for each entity.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_replace
   name: az storage entity replace
   summary: Updates an existing entity in a table.
   description: Throws if the entity does not exist.  The update_entity operation replaces the entire entity and can be used to  remove properties.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity replace --entity
+                              --table-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--if-match]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --entity -e
     summary: The entity to update. Could be a dict or an entity object. Must contain a PartitionKey and a RowKey.
@@ -222,13 +239,7 @@ items:
     name: --table-name -t
     summary: The name of the table containing the entity to update.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    defaultValue: ''
-    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The update operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional update, set If-Match to the wildcard character (\*).
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -238,25 +249,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-match
+    defaultValue: ''
+    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The update operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional update, set If-Match to the wildcard character (\*).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_show
   name: az storage entity show
   summary: Get an entity from the specified table.
   description: Throws if the entity does not exist.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity show --partition-key
+                           --row-key
+                           --table-name
+                           [--accept]
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--query-examples]
+                           [--sas-token]
+                           [--select]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --partition-key
     summary: The PartitionKey of the entity.
@@ -269,16 +293,11 @@ items:
     name: --table-name -t
     summary: The name of the table to get the entity from.
     description: ''
+  optionalParameters:
   - name: --accept
     defaultValue: application/json;odata=minimalmetadata
     summary: Specifies the accepted content type of the response payload. See TablePayloadFormat for possible values.
     description: ''
-  - name: --select
-    summary: Space-separated list of properties to return for each entity.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -288,37 +307,29 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --select
+    summary: Space-separated list of properties to return for each entity.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_entity_delete
-  name: az storage entity delete
-  summary: Deletes an existing entity in a table.
-- uid: az_storage_entity_insert
-  name: az storage entity insert
-  summary: Insert an entity into a table.
-- uid: az_storage_entity_merge
-  name: az storage entity merge
-  summary: Updates an existing entity by merging the entity's properties.
-- uid: az_storage_entity_query
-  name: az storage entity query
-  summary: List entities which satisfy a query.
-- uid: az_storage_entity_replace
-  name: az storage entity replace
-  summary: Updates an existing entity in a table.
-- uid: az_storage_entity_show
-  name: az storage entity show
-  summary: Get an entity from the specified table.
+- az_storage_entity_delete
+- az_storage_entity_insert
+- az_storage_entity_merge
+- az_storage_entity_query
+- az_storage_entity_replace
+- az_storage_entity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -334,10 +345,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage table storage entities.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage table storage entities.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/file.yml b/2017-03-09-profile/docs-ref-autogen/storage/file.yml
index 06939a69e7..285c1cfcf0 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/file.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/file.yml
@@ -1,32 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_file
-  name: az storage file
-  summary: Manage file shares that use the SMB 3.0 protocol.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_file_delete
-  - az_storage_file_delete_batch
-  - az_storage_file_download
-  - az_storage_file_download_batch
-  - az_storage_file_exists
-  - az_storage_file_generate_sas
-  - az_storage_file_list
-  - az_storage_file_resize
-  - az_storage_file_show
-  - az_storage_file_update
-  - az_storage_file_upload
-  - az_storage_file_upload_batch
-  - az_storage_file_url
+### YamlMime:AzureCLIGroup
+uid: az_storage_file
+name: az storage file
+summary: Manage file shares that use the SMB 3.0 protocol.
+description: ''
+directCommands:
 - uid: az_storage_file_delete
   name: az storage file delete
   summary: Marks the specified file for deletion.
   description: The file is later deleted during garbage collection.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file delete --path
+                           --share-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -35,9 +26,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -53,39 +42,35 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_delete_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_delete-batch
   name: az storage file delete-batch
   summary: Delete files from an Azure Storage File Share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file delete-batch --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--dryrun]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--timeout]
   examples:
   - summary: Delete files from an Azure Storage File Share. (autogenerated)
-    syntax:
-      content: az storage file delete-batch --account-key 00000000 --account-name MyAccount --source /path/to/file
+    syntax: az storage file delete-batch --account-key 00000000 --account-name MyAccount --source /path/to/file
   - summary: Delete files from an Azure Storage File Share. (autogenerated)
-    syntax:
-      content: az storage file delete-batch --account-key 00000000 --account-name MyAccount --pattern *.py --source /path/to/file
-  parameters:
+    syntax: az storage file delete-batch --account-key 00000000 --account-name MyAccount --pattern *.py --source /path/to/file
+  requiredParameters:
   - isRequired: true
     name: --source -s
     summary: The source of the file delete operation. The source can be the file share URL or the share name.
     description: ''
-  - name: --dryrun
-    summary: List the files and blobs to be deleted. No actual data deletion will occur.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -95,25 +80,45 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --dryrun
+    summary: List the files and blobs to be deleted. No actual data deletion will occur.
+    description: ''
+  - name: --pattern
+    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_download
   name: az storage file download
   summary: Downloads a file to a file path, with automatic chunking and progress notifications.
   description: Returns an instance of File with properties and metadata.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file download --path
+                             --share-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--dest]
+                             [--end-range]
+                             [--max-connections]
+                             [--max-retries]
+                             [--no-progress]
+                             [--open-mode]
+                             [--range-get-content-md5]
+                             [--retry-interval]
+                             [--sas-token]
+                             [--start-range]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -122,6 +127,16 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --dest
     summary: Path of the file to write to. The source filename will be used if not specified.
     description: ''
@@ -150,44 +165,40 @@ items:
     defaultValue: "1.0"
     summary: Sleep time in secs between retries.
     description: ''
-  - name: --start-range
-    summary: 'Start of byte range to use for downloading a section of the file. If no end_range is given, all bytes after the start_range will be downloaded. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of file.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start-range
+    summary: 'Start of byte range to use for downloading a section of the file. If no end_range is given, all bytes after the start_range will be downloaded. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of file.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_download_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_download-batch
   name: az storage file download-batch
   summary: Download files from an Azure Storage File Share to a local directory in a batch operation.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file download-batch --destination
+                                   --source
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--dryrun]
+                                   [--max-connections]
+                                   [--no-progress]
+                                   [--pattern]
+                                   [--sas-token]
+                                   [--snapshot]
+                                   [--subscription]
   examples:
   - summary: Download files from an Azure Storage File Share to a local directory in a batch operation. (autogenerated)
-    syntax:
-      content: az storage file download-batch --account-key 00000000 --account-name MyAccount --destination . --no-progress --source /path/to/file
-  parameters:
+    syntax: az storage file download-batch --account-key 00000000 --account-name MyAccount --destination . --no-progress --source /path/to/file
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The local directory where the files are downloaded to. This directory must already exist.
@@ -196,22 +207,7 @@ items:
     name: --source -s
     summary: The source of the file download operation. The source can be the file share URL or the share name.
     description: ''
-  - name: --dryrun
-    summary: List the files and blobs to be downloaded. No actual data transfer will occur.
-    description: ''
-  - name: --no-progress
-    summary: Include this flag to disable progress reporting for the command.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --max-connections
-    defaultValue: "1"
-    summary: The maximum number of parallel connections to use. Default value is 1.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -221,32 +217,48 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --dryrun
+    summary: List the files and blobs to be downloaded. No actual data transfer will occur.
+    description: ''
+  - name: --max-connections
+    defaultValue: "1"
+    summary: The maximum number of parallel connections to use. Default value is 1.
+    description: ''
+  - name: --no-progress
+    summary: Include this flag to disable progress reporting for the command.
+    description: ''
+  - name: --pattern
+    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_exists
   name: az storage file exists
   summary: Check for the existence of a file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file exists --path
+                           --share-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Check for the existence of a file. (autogenerated)
-    syntax:
-      content: az storage file exists --account-key 00000000 --account-name MyAccount --path path/file.txt --share-name MyShare
+    syntax: az storage file exists --account-key 00000000 --account-name MyAccount --path path/file.txt --share-name MyShare
   - summary: Check for the existence of a file. (autogenerated)
-    syntax:
-      content: az storage file exists --connection-string $connectionString --path path/file.txt --share-name MyShare
-  parameters:
+    syntax: az storage file exists --connection-string $connectionString --path path/file.txt --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -255,9 +267,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -273,29 +283,44 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_generate-sas
   name: az storage file generate-sas
   summary: Generates a shared access signature for the file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file generate-sas --path
+                                 --share-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--cache-control]
+                                 [--connection-string]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-type]
+                                 [--expiry]
+                                 [--https-only]
+                                 [--ip]
+                                 [--permissions]
+                                 [--policy-name]
+                                 [--sas-token]
+                                 [--start]
+                                 [--subscription]
   examples:
   - summary: Generate a sas token for a file.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage file generate-sas -p path/file.txt -s MyShare --account-name MyStorageAccount --permissions rcdw --https-only --expiry $end
+      az storage file generate-sas -p path/file.txt -s MyShare --account-name MyStorageAccount --permissions rcdw --https-only --expiry $end
+  - summary: Generate a shared access signature for the file. (autogenerated)
+    syntax: az storage file generate-sas --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --path path/file.txt --permissions rcdw --share-name MyShare --start 2019-01-01T12:20Z
   - summary: Generate a shared access signature for the file. (autogenerated)
-    syntax:
-      content: az storage file generate-sas --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --path path/file.txt --permissions rcdw --share-name MyShare --start 2019-01-01T12:20Z
-  parameters:
+    syntax: az storage file generate-sas --account-key 00000000 --account-name mystorageaccount --expiry 2037-12-31T23:59:00Z --https-only --path path/file.txt --permissions rcdw --share-name myshare
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -304,9 +329,19 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessed using this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessed using this shared access signature.
     description: ''
@@ -334,45 +369,52 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the container's ACL.
     description: ''
-  - name: --start
-    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_list
   name: az storage file list
   summary: List files and directories in a share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file list --share-name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--exclude-dir]
+                         [--marker]
+                         [--num-results]
+                         [--path]
+                         [--query-examples]
+                         [--sas-token]
+                         [--snapshot]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: List files and directories in a share. (autogenerated)
-    syntax:
-      content: az storage file list --share-name MyShare
-  parameters:
+    syntax: az storage file list --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --exclude-dir
     summary: List only files in the given share.
     description: ''
@@ -386,40 +428,37 @@ items:
   - name: --path -p
     summary: The directory path within the file share.
     description: ''
-  - name: --snapshot
-    summary: ''
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: ''
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_resize
   name: az storage file resize
   summary: Resizes a file to the specified size.
   description: If the specified byte value is less than the current size of the file, then all ranges above the specified byte value are cleared.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file resize --path
+                           --share-name
+                           --size
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -432,9 +471,7 @@ items:
     name: --size
     summary: The length to resize the file to.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -450,19 +487,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_show
   name: az storage file show
   summary: Returns all user-defined metadata, standard HTTP properties, and system properties for the file.
   description: Returns an instance of File with FileProperties and a metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file show --path
+                         --share-name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--query-examples]
+                         [--sas-token]
+                         [--subscription]
+                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -471,9 +514,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -483,25 +524,40 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_update
   name: az storage file update
   summary: Sets system properties on the file.
   description: If one property is set for the content_settings, all properties will be overriden.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file update --path
+                           --share-name
+                           [--account-key]
+                           [--account-name]
+                           [--clear-content-settings {false, true}]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -510,11 +566,21 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --clear-content-settings
     parameterValueGroup: false, true
     summary: If this flag is set, then if any one or more of the following properties (--content-cache-control, --content-disposition, --content-encoding, --content-language, --content-md5, --content-type) is set, then all of these properties are set together. If a value is not provided for a given property when at least one of the properties listed below is set, then that property will be cleared.
     description: ''
-  - name: --content-cache-control
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -532,44 +598,47 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_upload
   name: az storage file upload
   summary: Upload a file to a share that uses the SMB 3.0 protocol.
   description: Creates or updates an Azure file from a source path with automatic chunking and progress notifications.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file upload --share-name
+                           --source
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--max-connections]
+                           [--max-retries]
+                           [--metadata]
+                           [--no-progress]
+                           [--path]
+                           [--retry-interval]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Upload to a local file to a share.
-    syntax:
-      content: az storage file upload -s MyShare --source /path/to/file
+    syntax: az storage file upload -s MyShare --source /path/to/file
   - summary: Upload a file to a share that uses the SMB 3.0 protocol. (autogenerated)
-    syntax:
-      content: az storage file upload --account-key 00000000 --account-name MyStorageAccount --path path/file.txt --share-name MyShare --source /path/to/file
-  parameters:
+    syntax: az storage file upload --account-key 00000000 --account-name MyStorageAccount --path path/file.txt --share-name MyShare --source /path/to/file
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
@@ -578,7 +647,17 @@ items:
     name: --source
     summary: Path of the local file to upload as the file content.
     description: ''
-  - name: --content-cache-control
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -617,41 +696,46 @@ items:
     defaultValue: "1.0"
     summary: Sleep time in secs between retries.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_upload_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_upload-batch
   name: az storage file upload-batch
   summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file upload-batch --destination
+                                 --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--content-cache]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-md5]
+                                 [--content-type]
+                                 [--destination-path]
+                                 [--dryrun]
+                                 [--max-connections]
+                                 [--metadata]
+                                 [--no-progress]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--subscription]
   examples:
-  - summary: Upload files from a local directory to an Azure Storage File Share in a batch operation. (autogenerated)
-    syntax:
-      content: az storage file upload-batch --account-key 00000000 --account-name MyAccount --destination . --source /path/to/file
-  parameters:
+  - summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
+    syntax: az storage file upload-batch --destination myshare --source . --account-name myaccount --account-key 00000000
+  - summary: Upload files from a local directory to an Azure Storage File Share with url in a batch operation.
+    syntax: az storage file upload-batch --destination https://myaccount.file.core.windows.net/myshare --source . --account-key 00000000
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The destination of the upload operation.
@@ -660,22 +744,17 @@ items:
     name: --source -s
     summary: The directory to upload files from.
     description: ''
-  - name: --destination-path
-    summary: The directory where the source data is copied to. If omitted, data is copied to the root directory.
-    description: ''
-  - name: --dryrun
-    summary: List the files and blobs to be uploaded. No actual data transfer will occur.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --no-progress
-    summary: Include this flag to disable progress reporting for the command.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --pattern
-    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --content-cache-control
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -693,42 +772,49 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
+  - name: --destination-path
+    summary: The directory where the source data is copied to. If omitted, data is copied to the root directory.
+    description: ''
+  - name: --dryrun
+    summary: List the files and blobs to be uploaded. No actual data transfer will occur.
+    description: ''
   - name: --max-connections
     defaultValue: "1"
     summary: The maximum number of parallel connections to use. Default value is 1.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --no-progress
+    summary: Include this flag to disable progress reporting for the command.
     description: ''
+  - name: --pattern
+    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_url
   name: az storage file url
   summary: Create the url to access a file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file url --path
+                        --share-name
+                        [--account-key]
+                        [--account-name]
+                        [--connection-string]
+                        [--protocol {http, https}]
+                        [--sas-token]
+                        [--subscription]
   examples:
   - summary: Create the url to access a file. (autogenerated)
-    syntax:
-      content: az storage file url --account-name MyAccount --path path/file.txt --share-name MyShare
-  parameters:
+    syntax: az storage file url --account-key 00000000 --account-name mystorageaccount --path path/file.txt --share-name myshare
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -737,11 +823,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --protocol
-    defaultValue: https
-    parameterValueGroup: http, https
-    summary: Protocol to use.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -751,79 +833,39 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --protocol
+    defaultValue: https
+    parameterValueGroup: http, https
+    summary: Protocol to use.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_file_copy
-  name: az storage file copy
-  summary: Manage file copy operations.
-- uid: az_storage_file_copy_cancel
-  name: az storage file copy cancel
-  summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
-- uid: az_storage_file_copy_start
-  name: az storage file copy start
-  summary: Copy a file asynchronously.
-- uid: az_storage_file_copy_start_batch
-  name: az storage file copy start-batch
-  summary: Copy multiple files or blobs to a file share.
-- uid: az_storage_file_delete
-  name: az storage file delete
-  summary: Marks the specified file for deletion.
-- uid: az_storage_file_delete_batch
-  name: az storage file delete-batch
-  summary: Delete files from an Azure Storage File Share.
-- uid: az_storage_file_download
-  name: az storage file download
-  summary: Downloads a file to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_file_download_batch
-  name: az storage file download-batch
-  summary: Download files from an Azure Storage File Share to a local directory in a batch operation.
-- uid: az_storage_file_exists
-  name: az storage file exists
-  summary: Check for the existence of a file.
-- uid: az_storage_file_generate_sas
-  name: az storage file generate-sas
-  summary: Generates a shared access signature for the file.
-- uid: az_storage_file_list
-  name: az storage file list
-  summary: List files and directories in a share.
-- uid: az_storage_file_metadata
-  name: az storage file metadata
-  summary: Manage file metadata.
-- uid: az_storage_file_metadata_show
-  name: az storage file metadata show
-  summary: Returns all user-defined metadata for the specified file.
-- uid: az_storage_file_metadata_update
-  name: az storage file metadata update
-  summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
-- uid: az_storage_file_resize
-  name: az storage file resize
-  summary: Resizes a file to the specified size.
-- uid: az_storage_file_show
-  name: az storage file show
-  summary: Returns all user-defined metadata, standard HTTP properties, and system properties for the file.
-- uid: az_storage_file_update
-  name: az storage file update
-  summary: Sets system properties on the file.
-- uid: az_storage_file_upload
-  name: az storage file upload
-  summary: Upload a file to a share that uses the SMB 3.0 protocol.
-- uid: az_storage_file_upload_batch
-  name: az storage file upload-batch
-  summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
-- uid: az_storage_file_url
-  name: az storage file url
-  summary: Create the url to access a file.
+- az_storage_file_copy
+- az_storage_file_copy_cancel
+- az_storage_file_copy_start
+- az_storage_file_copy_start-batch
+- az_storage_file_delete
+- az_storage_file_delete-batch
+- az_storage_file_download
+- az_storage_file_download-batch
+- az_storage_file_exists
+- az_storage_file_generate-sas
+- az_storage_file_list
+- az_storage_file_metadata
+- az_storage_file_metadata_show
+- az_storage_file_metadata_update
+- az_storage_file_resize
+- az_storage_file_show
+- az_storage_file_update
+- az_storage_file_upload
+- az_storage_file_upload-batch
+- az_storage_file_url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -839,10 +881,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file shares that use the SMB 3.0 protocol.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file shares that use the SMB 3.0 protocol.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/file/copy.yml b/2017-03-09-profile/docs-ref-autogen/storage/file/copy.yml
index 840d1ae1ac..c8c0207661 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/file/copy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/file/copy.yml
@@ -1,22 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_file_copy
-  name: az storage file copy
-  summary: Manage file copy operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_file_copy_cancel
-  - az_storage_file_copy_start
-  - az_storage_file_copy_start_batch
+### YamlMime:AzureCLIGroup
+uid: az_storage_file_copy
+name: az storage file copy
+summary: Manage file copy operations.
+description: ''
+directCommands:
 - uid: az_storage_file_copy_cancel
   name: az storage file copy cancel
   summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file copy cancel --copy-id
+                                --destination-path
+                                --destination-share
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --copy-id
     summary: Copy identifier provided in the copy.id of the original copy_file operation.
@@ -29,9 +31,7 @@ items:
     name: --destination-share -s
     summary: Name of the destination share. The share must exist.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -47,29 +47,42 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_copy_start
   name: az storage file copy start
   summary: Copy a file asynchronously.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file copy start --destination-path
+                               --destination-share
+                               [--account-key]
+                               [--account-name]
+                               [--connection-string]
+                               [--file-snapshot]
+                               [--metadata]
+                               [--sas-token]
+                               [--source-account-key]
+                               [--source-account-name]
+                               [--source-blob]
+                               [--source-container]
+                               [--source-path]
+                               [--source-sas]
+                               [--source-share]
+                               [--source-snapshot]
+                               [--source-uri]
+                               [--subscription]
+                               [--timeout]
   examples:
   - summary: Copy a file asynchronously.
-    syntax:
-      content: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --account-key 00000000
+    syntax: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --account-key 00000000
   - summary: Copy a file asynchronously from source uri to destination storage account with sas token.
-    syntax:
-      content: az storage file copy start --source-uri "https://srcaccount.file.core.windows.net/myshare/mydir/myfile?<sastoken>" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destinaition-sas>
+    syntax: az storage file copy start --source-uri "https://srcaccount.file.core.windows.net/myshare/mydir/myfile?<sastoken>" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destination-sas>
   - summary: Copy a file asynchronously from file snapshot to destination storage account with sas token.
-    syntax:
-      content: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --file-snapshot "2020-03-02T13:51:54.0000000Z" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destinaition-sas>
-  parameters:
+    syntax: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --file-snapshot "2020-03-02T13:51:54.0000000Z" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destination-sas>
+  requiredParameters:
   - isRequired: true
     name: --destination-path -p
     summary: The path to the file within the file share.
@@ -78,15 +91,25 @@ items:
     name: --destination-share -s
     summary: Name of the destination share. The share must exist.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --file-snapshot
     summary: The file snapshot for the source storage account.
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --source-account-key
     summary: The storage account key of the source blob.
     description: ''
@@ -112,43 +135,52 @@ items:
     summary: The blob snapshot for the source storage account.
     description: ''
   - name: --source-uri -u
-    summary: 'Specifies the URL of the source blob or file, up to 2 KB in length. A source file in the same account can be private, but a file in another account must be public or accept credentials included in this URL, such as a Shared Access Signature. Examples: <a href="https://myaccount.file.core.windows.net/myshare/mydirectory/myfile">https://myaccount.file.core.windows.net/myshare/mydirectory/myfile</a>.'
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    summary: 'Specifies the URL of the source blob or file, up to 2 KB in length. A source file in the same account can be private, but a file in another account must be public or accept credentials included in this URL, such as a Shared Access Signature. Examples: https://myaccount.file.core.windows.net/myshare/mydirectory/myfile.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_copy_start_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_copy_start-batch
   name: az storage file copy start-batch
   summary: Copy multiple files or blobs to a file share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file copy start-batch [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--destination-path]
+                                     [--destination-share]
+                                     [--dryrun]
+                                     [--metadata]
+                                     [--pattern]
+                                     [--sas-token]
+                                     [--source-account-key]
+                                     [--source-account-name]
+                                     [--source-container]
+                                     [--source-sas]
+                                     [--source-share]
+                                     [--source-uri]
+                                     [--subscription]
+                                     [--timeout]
   examples:
   - summary: Copy all files in a file share to another storage account.
-    syntax:
-      content: az storage file copy start-batch --source-account-name srcaccount --source-account-key 00000000 --source-share srcshare --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --account-key 00000000
+    syntax: az storage file copy start-batch --source-account-name srcaccount --source-account-key 00000000 --source-share srcshare --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --account-key 00000000
   - summary: Copy all files in a file share to another storage account. with sas token.
-    syntax:
-      content: az storage file copy start-batch --source-uri "https://srcaccount.file.core.windows.net/myshare?<sastoken>" --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --sas-token <destinaition-sas>
-  parameters:
+    syntax: az storage file copy start-batch --source-uri "https://srcaccount.file.core.windows.net/myshare?<sastoken>" --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --sas-token <destination-sas>
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --destination-path
     summary: The directory where the source data is copied to. If omitted, data is copied to the root directory.
     description: ''
@@ -162,10 +194,10 @@ items:
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
   - name: --pattern
-    summary: The pattern used for globbing files and blobs. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
+    summary: The pattern used for globbing files and blobs. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
     description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --source-account-key
     summary: The account key for the source storage account. If omitted, the active login is used to determine the account key.
@@ -185,37 +217,17 @@ items:
   - name: --source-uri
     summary: A URI that specifies a the source file share or blob container.
     description: If the source is in another account, the source must either be public or authenticated via a shared access signature.
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_file_copy_cancel
-  name: az storage file copy cancel
-  summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
-- uid: az_storage_file_copy_start
-  name: az storage file copy start
-  summary: Copy a file asynchronously.
-- uid: az_storage_file_copy_start_batch
-  name: az storage file copy start-batch
-  summary: Copy multiple files or blobs to a file share.
+- az_storage_file_copy_cancel
+- az_storage_file_copy_start
+- az_storage_file_copy_start-batch
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -231,10 +243,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file copy operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file copy operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/file/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/file/metadata.yml
index 55fe03cc3d..b89f21b2df 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/file/metadata.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/file/metadata.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_file_metadata
-  name: az storage file metadata
-  summary: Manage file metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_file_metadata_show
-  - az_storage_file_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_file_metadata
+name: az storage file metadata
+summary: Manage file metadata.
+description: ''
+directCommands:
 - uid: az_storage_file_metadata_show
   name: az storage file metadata show
   summary: Returns all user-defined metadata for the specified file.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file metadata show --path
+                                  --share-name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--query-examples]
+                                  [--sas-token]
+                                  [--subscription]
+                                  [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -24,9 +27,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -36,25 +37,34 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_metadata_update
   name: az storage file metadata update
   summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file metadata update --path
+                                    --share-name
+                                    [--account-key]
+                                    [--account-name]
+                                    [--connection-string]
+                                    [--metadata]
+                                    [--sas-token]
+                                    [--subscription]
+                                    [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -63,12 +73,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -78,25 +83,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_file_metadata_show
-  name: az storage file metadata show
-  summary: Returns all user-defined metadata for the specified file.
-- uid: az_storage_file_metadata_update
-  name: az storage file metadata update
-  summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
+- az_storage_file_metadata_show
+- az_storage_file_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -112,10 +114,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file metadata.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/fs.yml b/2017-03-09-profile/docs-ref-autogen/storage/fs.yml
new file mode 100644
index 0000000000..7d6bcfcc69
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/fs.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_fs
+name: az storage fs
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage fs** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage file systems in Azure Data Lake Storage Gen2 account.
+description: ''
+directCommands:
+- uid: az_storage_fs_list-deleted-path
+  name: az storage fs list-deleted-path
+  summary: List the deleted (file or directory) paths under the specified file system.
+  description: ''
+  syntax: >-
+    az storage fs list-deleted-path --file-system
+                                    [--account-key]
+                                    [--account-name]
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--marker]
+                                    [--num-results]
+                                    [--path-prefix]
+                                    [--sas-token]
+                                    [--timeout]
+  examples:
+  - summary: List the deleted (file or directory) paths under the specified file system..
+    syntax: az storage fs list-deleted-path -f myfilesystem --account-name mystorageccount --account-key 00000000
+  requiredParameters:
+  - isRequired: true
+    name: --file-system -f
+    summary: File system name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --marker
+    summary: A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. If specified, this generator will begin returning results from the point where the previous generator stopped.
+    description: ''
+  - name: --num-results
+    summary: Specify the maximum number to return.
+    description: ''
+  - name: --path-prefix
+    summary: Filter the results to return only paths under the specified path.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_fs_undelete-path
+  name: az storage fs undelete-path
+  summary: Restore soft-deleted path.
+  description: Operation will only be successful if used within the specified number of days set in the delete retention policy.
+  syntax: >-
+    az storage fs undelete-path --deleted-path-name
+                                --deletion-id
+                                --file-system
+                                [--account-key]
+                                [--account-name]
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--sas-token]
+                                [--timeout]
+  examples:
+  - summary: Restore soft-deleted path.
+    syntax: az storage fs undelete-path -f myfilesystem --deleted-path-name dir --deletion-id 0000 --account-name mystorageccount --account-key 00000000
+  requiredParameters:
+  - isRequired: true
+    name: --deleted-path-name
+    summary: Specifies the path (file or directory) to restore.
+    description: ''
+  - isRequired: true
+    name: --deletion-id
+    summary: 'Specifies the version of the deleted path to restore. :keyword int timeout: The timeout parameter is expressed in seconds.'
+    description: ''
+  - isRequired: true
+    name: --file-system -f
+    summary: File system name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_fs_list-deleted-path
+- az_storage_fs_service-properties
+- az_storage_fs_service-properties_show
+- az_storage_fs_service-properties_update
+- az_storage_fs_undelete-path
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage file systems in Azure Data Lake Storage Gen2 account.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/fs/service-properties.yml b/2017-03-09-profile/docs-ref-autogen/storage/fs/service-properties.yml
new file mode 100644
index 0000000000..b68773644e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storage/fs/service-properties.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_fs_service-properties
+name: az storage fs service-properties
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage fs service-properties** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage storage datalake service properties.
+description: ''
+directCommands:
+- uid: az_storage_fs_service-properties_show
+  name: az storage fs service-properties show
+  summary: Show the properties of a storage account's datalake service, including Azure Storage Analytics.
+  description: ''
+  syntax: >-
+    az storage fs service-properties show [--account-key]
+                                          [--account-name]
+                                          [--auth-mode {key, login}]
+                                          [--connection-string]
+                                          [--sas-token]
+  examples:
+  - summary: Show the properties of a storage account's datalake service
+    syntax: az storage fs service-properties show --account-name mystorageccount --account-key 00000000
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_fs_service-properties_update
+  name: az storage fs service-properties update
+  summary: Update the properties of a storage account's datalake service, including Azure Storage Analytics.
+  description: ''
+  syntax: >-
+    az storage fs service-properties update [--404-document]
+                                            [--account-key]
+                                            [--account-name]
+                                            [--auth-mode {key, login}]
+                                            [--connection-string]
+                                            [--delete-retention {false, true}]
+                                            [--delete-retention-period]
+                                            [--index-document]
+                                            [--sas-token]
+                                            [--static-website {false, true}]
+  examples:
+  - summary: Update the properties of a storage account's datalake service
+    syntax: az storage fs service-properties update --delete-retention --delete-retention-period 7 --account-name mystorageccount --account-key 00000000
+  optionalParameters:
+  - name: --404-document
+    summary: Represent the path to the error document that should be shown when an error 404 is issued, in other words, when a browser requests a page that does not exist.
+    description: ''
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --delete-retention
+    parameterValueGroup: false, true
+    summary: Enable soft-delete.
+    description: ''
+  - name: --delete-retention-period --period
+    summary: Number of days that soft-deleted fs will be retained. Must be in range [1,365].
+    description: ''
+  - name: --index-document
+    summary: Represent the name of the index document. This is commonly "index.html".
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --static-website
+    parameterValueGroup: false, true
+    summary: Enable static-website.
+    description: ''
+commands:
+- az_storage_fs_service-properties_show
+- az_storage_fs_service-properties_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage storage datalake service properties.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/logging.yml b/2017-03-09-profile/docs-ref-autogen/storage/logging.yml
index 43299d17db..aae411ca1e 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/logging.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/logging.yml
@@ -1,33 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_logging
-  name: az storage logging
-  summary: Manage storage service logging information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_logging_off
-  - az_storage_logging_show
-  - az_storage_logging_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_logging
+name: az storage logging
+summary: Manage storage service logging information.
+description: ''
+directCommands:
 - uid: az_storage_logging_off
   name: az storage logging off
   summary: Turn off logging for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage logging off [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--services]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Turn off logging for a storage account.
-    syntax:
-      content: az storage logging off --account-name MyAccount
-  parameters:
-  - name: --services
-    defaultValue: bqt
-    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage logging off --account-name MyAccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -40,33 +32,34 @@ items:
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bqt
+    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_logging_show
   name: az storage logging show
   summary: Show logging settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage logging show [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--query-examples]
+                            [--sas-token]
+                            [--services]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Show logging settings for a storage account. (autogenerated)
-    syntax:
-      content: az storage logging show --account-name MyAccount --services qt
-  parameters:
-  - name: --services
-    defaultValue: bqt
-    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage logging show --account-name MyAccount --services qt
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -76,25 +69,39 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bqt
+    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_logging_update
   name: az storage logging update
   summary: Update logging settings for a storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage logging update --log
+                              --retention
+                              --services
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+                              [--version]
+  requiredParameters:
   - isRequired: true
     name: --log
     summary: 'The operations for which to enable logging: (r)ead (w)rite (d)elete. Can be combined.'
@@ -107,12 +114,7 @@ items:
     name: --services
     summary: 'The storage service(s) for which to update logging info: (b)lob (q)ueue (t)able. Can be combined.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --version
-    summary: Version of the logging schema.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -128,22 +130,17 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --version
+    summary: Version of the logging schema.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_logging_off
-  name: az storage logging off
-  summary: Turn off logging for a storage account.
-- uid: az_storage_logging_show
-  name: az storage logging show
-  summary: Show logging settings for a storage account.
-- uid: az_storage_logging_update
-  name: az storage logging update
-  summary: Update logging settings for a storage account.
+- az_storage_logging_off
+- az_storage_logging_show
+- az_storage_logging_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -159,10 +156,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage service logging information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage service logging information.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/message.yml b/2017-03-09-profile/docs-ref-autogen/storage/message.yml
index 8588fdeb45..ee7c00a49c 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/message.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/message.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_message
-  name: az storage message
-  summary: Manage queue storage messages.
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_message_clear
-  - az_storage_message_delete
-  - az_storage_message_get
-  - az_storage_message_peek
-  - az_storage_message_put
-  - az_storage_message_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_message
+name: az storage message
+summary: Manage queue storage messages.
+description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+directCommands:
 - uid: az_storage_message_clear
   name: az storage message clear
   summary: Deletes all messages from the specified queue.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message clear --queue-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -42,19 +37,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_delete
   name: az storage message delete
   summary: Deletes the specified message.
   description: 'Normally after a client retrieves a message with the get_messages operation,  the client is expected to process and delete the message. To delete the  message, you must have two items of data: id and pop_receipt. The  id is returned from the previous get_messages operation. The  pop_receipt is returned from the most recent get_messages() or  update_message() operation. In order for the delete_message operation  to succeed, the pop_receipt specified on the request must match the  pop_receipt returned from the get_messages() or update_message()  operation.'
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message delete --id
+                              --pop-receipt
+                              --queue-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The message id identifying the message to delete.
@@ -67,9 +68,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -85,32 +84,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_get
   name: az storage message get
   summary: Retrieves one or more messages from the front of the queue.
   description: When a message is retrieved from the queue, the response includes the message  content and a pop_receipt value, which is required to delete the message.  The message is not automatically deleted from the queue, but after it has  been retrieved, it is not visible to other clients for the time interval  specified by the visibility_timeout parameter.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message get --queue-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--num-messages]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+                           [--visibility-timeout]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --num-messages
-    summary: A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --visibility-timeout
-    summary: Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 1 second, and cannot be larger than 7 days. The visibility timeout of a message can be set to a value later than the expiry time.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -120,35 +117,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --num-messages
+    summary: A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --visibility-timeout
+    summary: Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 1 second, and cannot be larger than 7 days. The visibility timeout of a message can be set to a value later than the expiry time.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_peek
   name: az storage message peek
   summary: Retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.
   description: Only messages that are visible may be retrieved. When a message is retrieved  for the first time with a call to get_messages, its dequeue_count property  is set to 1. If it is not deleted and is subsequently retrieved again, the  dequeue_count property is incremented. The client may use this value to  determine how many times a message has been retrieved. Note that a call  to peek_messages does not increment the value of DequeueCount, but returns  this value for the client to read.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message peek --queue-name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--num-messages]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --num-messages
-    summary: A nonzero integer value that specifies the number of messages to peek from the queue, up to a maximum of 32. By default, a single message is peeked from the queue with this operation.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -158,25 +161,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --num-messages
+    summary: A nonzero integer value that specifies the number of messages to peek from the queue, up to a maximum of 32. By default, a single message is peeked from the queue with this operation.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_put
   name: az storage message put
   summary: Adds a new message to the back of the message queue.
   description: The visibility timeout specifies the time that the message will be  invisible. After the timeout expires, the message will become visible.  If a visibility timeout is not specified, the default value of 0 is used.  The message time-to-live specifies how long a message will remain in the  queue. The message will be deleted from the queue when the time-to-live  period expires.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message put --content
+                           --queue-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--time-to-live]
+                           [--timeout]
+                           [--visibility-timeout]
+  requiredParameters:
   - isRequired: true
     name: --content
     summary: Message content, up to 64KB in size.
@@ -185,15 +198,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --time-to-live
-    summary: Specifies the time-to-live interval for the message, in seconds. The maximum time-to-live allowed is 7 days. If this parameter is omitted, the default time-to-live is 7 days.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --visibility-timeout
-    summary: If not specified, the default value is 0. Specifies the new visibility timeout value, in seconds, relative to server time. The value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. visibility_timeout should be set to a value smaller than the time-to-live value.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -209,19 +214,33 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --time-to-live
+    summary: Specifies the time-to-live interval for the message, in seconds. The maximum time-to-live allowed is 7 days. If this parameter is omitted, the default time-to-live is 7 days.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --visibility-timeout
+    summary: If not specified, the default value is 0. Specifies the new visibility timeout value, in seconds, relative to server time. The value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. visibility_timeout should be set to a value smaller than the time-to-live value.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_update
   name: az storage message update
   summary: Updates the visibility timeout of a message.
   description: You can also use this operation to update the contents of a message.  This operation can be used to continually extend the invisibility of a  queue message. This functionality can be useful if you want a worker role  to “lease” a queue message. For example, if a worker role calls get_messages  and recognizes that it needs more time to process a message, it can  continually extend the message’s invisibility until it is processed. If  the worker role were to fail during processing, eventually the message  would become visible again and another worker role could process it.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message update --id
+                              --pop-receipt
+                              --queue-name
+                              --visibility-timeout
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--content]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The message id identifying the message to update.
@@ -238,12 +257,7 @@ items:
     name: --visibility-timeout
     summary: Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. A message can be updated until it has been deleted or has expired.
     description: ''
-  - name: --content
-    summary: Message content, up to 64KB in size.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -253,37 +267,26 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --content
+    summary: Message content, up to 64KB in size.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_message_clear
-  name: az storage message clear
-  summary: Deletes all messages from the specified queue.
-- uid: az_storage_message_delete
-  name: az storage message delete
-  summary: Deletes the specified message.
-- uid: az_storage_message_get
-  name: az storage message get
-  summary: Retrieves one or more messages from the front of the queue.
-- uid: az_storage_message_peek
-  name: az storage message peek
-  summary: Retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.
-- uid: az_storage_message_put
-  name: az storage message put
-  summary: Adds a new message to the back of the message queue.
-- uid: az_storage_message_update
-  name: az storage message update
-  summary: Updates the visibility timeout of a message.
+- az_storage_message_clear
+- az_storage_message_delete
+- az_storage_message_get
+- az_storage_message_peek
+- az_storage_message_put
+- az_storage_message_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -299,10 +302,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/metrics.yml b/2017-03-09-profile/docs-ref-autogen/storage/metrics.yml
index ab73363829..748f4eb664 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/metrics.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/metrics.yml
@@ -1,37 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_metrics
-  name: az storage metrics
-  summary: Manage storage service metrics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_metrics_show
-  - az_storage_metrics_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_metrics
+name: az storage metrics
+summary: Manage storage service metrics.
+description: ''
+directCommands:
 - uid: az_storage_metrics_show
   name: az storage metrics show
   summary: Show metrics settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage metrics show [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--interval {both, hour, minute}]
+                            [--query-examples]
+                            [--sas-token]
+                            [--services]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Show metrics settings for a storage account. (autogenerated)
-    syntax:
-      content: az storage metrics show --account-key 00000000 --account-name MyAccount
-  parameters:
-  - name: --interval
-    defaultValue: both
-    parameterValueGroup: both, hour, minute
-    summary: Filter the set of metrics to retrieve by time interval.
-    description: ''
-  - name: --services
-    defaultValue: bfqt
-    summary: 'The storage services from which to retrieve metrics info: (b)lob (q)ueue (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage metrics show --account-key 00000000 --account-name MyAccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -41,29 +31,50 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --interval
+    defaultValue: both
+    parameterValueGroup: both, hour, minute
+    summary: Filter the set of metrics to retrieve by time interval.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bfqt
+    summary: 'The storage services from which to retrieve metrics info: (b)lob (q)ueue (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_metrics_update
   name: az storage metrics update
   summary: Update metrics settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage metrics update --retention
+                              --services
+                              [--account-key]
+                              [--account-name]
+                              [--api {false, true}]
+                              [--connection-string]
+                              [--hour {false, true}]
+                              [--minute {false, true}]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
   examples:
   - summary: Update metrics settings for a storage account. (autogenerated)
-    syntax:
-      content: az storage metrics update --account-name MyAccount --api true --hour true --minute true --retention 10 --services bfqt
-  parameters:
+    syntax: az storage metrics update --account-name MyAccount --api true --hour true --minute true --retention 10 --services bfqt
+  - summary: Update metrics settings for a storage account by connection string. (autogenerated)
+    syntax: az storage metrics update --api true --connection-string $connectionString --hour true --minute true --retention 10 --services bfqt
+  requiredParameters:
   - isRequired: true
     name: --retention
     summary: Number of days for which to retain metrics. 0 to disable. Applies to both hour and minute metrics if both are specified.
@@ -72,10 +83,20 @@ items:
     name: --services
     summary: 'The storage services from which to retrieve metrics info: (b)lob (q)ueue (t)able. Can be combined.'
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --api
     parameterValueGroup: false, true
     summary: Specify whether to include API in metrics. Applies to both hour and minute metrics if both are specified. Must be specified if hour or minute metrics are enabled and being updated.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --hour
     parameterValueGroup: false, true
     summary: Update the hourly metrics.
@@ -84,37 +105,19 @@ items:
     parameterValueGroup: false, true
     summary: Update the by-minute metrics.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_metrics_show
-  name: az storage metrics show
-  summary: Show metrics settings for a storage account.
-- uid: az_storage_metrics_update
-  name: az storage metrics update
-  summary: Update metrics settings for a storage account.
+- az_storage_metrics_show
+- az_storage_metrics_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -130,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage service metrics.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage service metrics.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/queue.yml b/2017-03-09-profile/docs-ref-autogen/storage/queue.yml
index 6fe641e84d..b18c7168aa 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/queue.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/queue.yml
@@ -1,37 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_queue
-  name: az storage queue
-  summary: Manage shared access policies of a storage table.
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_queue_create
-  - az_storage_queue_delete
-  - az_storage_queue_exists
-  - az_storage_queue_generate_sas
-  - az_storage_queue_list
+### YamlMime:AzureCLIGroup
+uid: az_storage_queue
+name: az storage queue
+summary: Manage storage queues.
+description: ''
+directCommands:
 - uid: az_storage_queue_create
   name: az storage queue create
   summary: Creates a queue under the given account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue create --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-on-exist]
+                            [--metadata]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --fail-on-exist
-    summary: Specifies whether to throw an exception if the queue already exists.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -41,35 +33,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Specifies whether to throw an exception if the queue already exists.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_delete
   name: az storage queue delete
   summary: Deletes the specified queue and any messages it contains.
   description: When a queue is successfully deleted, it is immediately marked for deletion  and is no longer accessible to clients. The queue is later removed from  the Queue service during garbage collection.  Note that deleting a queue is likely to take at least 40 seconds to complete.  If an operation is attempted against the queue while it was being deleted,  an AzureConflictHttpError will be thrown.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue delete --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-not-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --fail-not-exist
-    summary: Specifies whether to throw an exception if the queue doesn't exist.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -79,32 +77,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specifies whether to throw an exception if the queue doesn't exist.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_exists
   name: az storage queue exists
   summary: Returns a boolean indicating whether the queue exists.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue exists --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -120,23 +123,42 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_queue_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_queue_generate-sas
   name: az storage queue generate-sas
   summary: Generates a shared access signature for the queue.
   description: Use the returned signature with the sas_token parameter of QueueService.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue generate-sas --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--expiry]
+                                  [--https-only]
+                                  [--ip]
+                                  [--permissions]
+                                  [--policy-name]
+                                  [--sas-token]
+                                  [--start]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --expiry
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes invalid. Do not use if a stored access policy is referenced with --id that specifies this value.
     description: ''
@@ -152,9 +174,36 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the share's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_queue_list
+  name: az storage queue list
+  summary: List queues in a storage account.
+  description: ''
+  syntax: >-
+    az storage queue list [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--include-metadata]
+                          [--marker]
+                          [--num-results]
+                          [--prefix]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  examples:
+  - summary: List queues whose names begin with 'myprefix' under the storage account 'mystorageaccount'(account name)
+    syntax: az storage queue list --prefix myprefix --account-name mystorageaccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -164,25 +213,6 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_queue_list
-  name: az storage queue list
-  summary: List queues in a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
   - name: --include-metadata
     summary: Specifies that container metadata be returned in the response.
     description: ''
@@ -195,17 +225,8 @@ items:
   - name: --prefix
     summary: Filters the results to return only queues with names that begin with the specified prefix.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -213,55 +234,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_queue_create
-  name: az storage queue create
-  summary: Creates a queue under the given account.
-- uid: az_storage_queue_delete
-  name: az storage queue delete
-  summary: Deletes the specified queue and any messages it contains.
-- uid: az_storage_queue_exists
-  name: az storage queue exists
-  summary: Returns a boolean indicating whether the queue exists.
-- uid: az_storage_queue_generate_sas
-  name: az storage queue generate-sas
-  summary: Generates a shared access signature for the queue.
-- uid: az_storage_queue_list
-  name: az storage queue list
-  summary: List queues in a storage account.
-- uid: az_storage_queue_metadata
-  name: az storage queue metadata
-  summary: Manage the metadata for a storage queue.
-- uid: az_storage_queue_metadata_show
-  name: az storage queue metadata show
-  summary: Retrieves user-defined metadata and queue properties on the specified queue.
-- uid: az_storage_queue_metadata_update
-  name: az storage queue metadata update
-  summary: Sets user-defined metadata on the specified queue.
-- uid: az_storage_queue_policy
-  name: az storage queue policy
-  summary: Manage shared access policies for a storage queue.
-- uid: az_storage_queue_policy_create
-  name: az storage queue policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_queue_policy_delete
-  name: az storage queue policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_queue_policy_list
-  name: az storage queue policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_queue_policy_show
-  name: az storage queue policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_queue_policy_update
-  name: az storage queue policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_queue_create
+- az_storage_queue_delete
+- az_storage_queue_exists
+- az_storage_queue_generate-sas
+- az_storage_queue_list
+- az_storage_queue_metadata
+- az_storage_queue_metadata_show
+- az_storage_queue_metadata_update
+- az_storage_queue_policy
+- az_storage_queue_policy_create
+- az_storage_queue_policy_delete
+- az_storage_queue_policy_list
+- az_storage_queue_policy_show
+- az_storage_queue_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -277,10 +268,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage queues.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/queue/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/queue/metadata.yml
index e01082a00d..d418ae5332 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/queue/metadata.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/queue/metadata.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_queue_metadata
-  name: az storage queue metadata
-  summary: Manage the metadata for a storage queue.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_queue_metadata_show
-  - az_storage_queue_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_queue_metadata
+name: az storage queue metadata
+summary: Manage the metadata for a storage queue.
+description: ''
+directCommands:
 - uid: az_storage_queue_metadata_show
   name: az storage queue metadata show
   summary: Retrieves user-defined metadata and queue properties on the specified queue.
   description: Metadata is associated with the queue as name-value pairs.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue metadata show --name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--query-examples]
+                                   [--sas-token]
+                                   [--subscription]
+                                   [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -32,35 +32,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_metadata_update
   name: az storage queue metadata update
   summary: Sets user-defined metadata on the specified queue.
   description: Metadata is associated with the queue as name-value pairs.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue metadata update --name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--metadata]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -70,25 +73,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_queue_metadata_show
-  name: az storage queue metadata show
-  summary: Retrieves user-defined metadata and queue properties on the specified queue.
-- uid: az_storage_queue_metadata_update
-  name: az storage queue metadata update
-  summary: Sets user-defined metadata on the specified queue.
+- az_storage_queue_metadata_show
+- az_storage_queue_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +104,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage the metadata for a storage queue.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage the metadata for a storage queue.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/queue/policy.yml b/2017-03-09-profile/docs-ref-autogen/storage/queue/policy.yml
index a7b5a6c2ad..0c83d78191 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/queue/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/queue/policy.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_queue_policy
-  name: az storage queue policy
-  summary: Manage shared access policies for a storage queue.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_queue_policy_create
-  - az_storage_queue_policy_delete
-  - az_storage_queue_policy_list
-  - az_storage_queue_policy_show
-  - az_storage_queue_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_queue_policy
+name: az storage queue policy
+summary: Manage shared access policies for a storage queue.
+description: ''
+directCommands:
 - uid: az_storage_queue_policy_create
   name: az storage queue policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy create --name
+                                   --queue-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -27,15 +28,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_delete
   name: az storage queue policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy delete --name
+                                   --queue-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--sas-token]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -72,6 +75,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,23 +91,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_list
   name: az storage queue policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy list --queue-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -113,25 +119,30 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_show
   name: az storage queue policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy show --name
+                                 --queue-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -140,6 +151,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -149,25 +161,32 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_update
   name: az storage queue policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy update --name
+                                   --queue-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -176,15 +195,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -194,34 +205,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_queue_policy_create
-  name: az storage queue policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_queue_policy_delete
-  name: az storage queue policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_queue_policy_list
-  name: az storage queue policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_queue_policy_show
-  name: az storage queue policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_queue_policy_update
-  name: az storage queue policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_queue_policy_create
+- az_storage_queue_policy_delete
+- az_storage_queue_policy_list
+- az_storage_queue_policy_show
+- az_storage_queue_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -237,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage shared access policies for a storage queue.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage shared access policies for a storage queue.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/share.yml b/2017-03-09-profile/docs-ref-autogen/storage/share.yml
index 1ba684519d..54d8d5e1c7 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/share.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/share.yml
@@ -1,48 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_share
-  name: az storage share
-  summary: Manage file shares.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_share_create
-  - az_storage_share_delete
-  - az_storage_share_exists
-  - az_storage_share_generate_sas
-  - az_storage_share_list
-  - az_storage_share_show
-  - az_storage_share_stats
-  - az_storage_share_update
-  - az_storage_share_url
+### YamlMime:AzureCLIGroup
+uid: az_storage_share
+name: az storage share
+summary: Manage file shares.
+description: ''
+directCommands:
 - uid: az_storage_share_create
   name: az storage share create
   summary: Creates a new share under the specified account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share create --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-on-exist]
+                            [--metadata]
+                            [--quota]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Creates a new share under the specified account. (autogenerated)
-    syntax:
-      content: az storage share create --account-name MyAccount --name MyFileShare
-  parameters:
+    syntax: az storage share create --account-name MyAccount --name MyFileShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --fail-on-exist
-    summary: Specify whether to throw an exception when the share exists. False by default.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --quota
-    summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120).
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -52,35 +37,44 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Specify whether to throw an exception when the share exists. False by default.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --quota
+    summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_delete
   name: az storage share delete
   summary: Marks the specified share for deletion.
   description: If the share does not exist, the operation fails on the service. By  default, the exception is swallowed by the client. To expose the exception, specify True for fail_not_exist.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share delete --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-not-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --fail-not-exist
-    summary: Specify whether to throw an exception when the share doesn't exist. False by default.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -90,39 +84,42 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specify whether to throw an exception when the share doesn't exist. False by default.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_exists
   name: az storage share exists
   summary: Check for the existence of a file share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share exists --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Check for the existence of a file share. (autogenerated)
-    syntax:
-      content: az storage share exists --account-key 00000000 --account-name MyAccount --name MyFileShare
+    syntax: az storage share exists --account-key 00000000 --account-name MyAccount --name MyFileShare
   - summary: Check for the existence of a file share (autogenerated)
-    syntax:
-      content: az storage share exists --connection-string $connectionString --name MyFileShare
-  parameters:
+    syntax: az storage share exists --connection-string $connectionString --name MyFileShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -138,41 +135,62 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_share_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_share_generate-sas
   name: az storage share generate-sas
   summary: Generates a shared access signature for the share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share generate-sas --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--cache-control]
+                                  [--connection-string]
+                                  [--content-disposition]
+                                  [--content-encoding]
+                                  [--content-language]
+                                  [--content-type]
+                                  [--expiry]
+                                  [--https-only]
+                                  [--ip]
+                                  [--permissions]
+                                  [--policy-name]
+                                  [--sas-token]
+                                  [--start]
+                                  [--subscription]
   examples:
   - summary: Generate a sas token for a fileshare and use it to upload a file.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        sas=`az storage share generate-sas -n MyShare --account-name MyStorageAccount --https-only --permissions dlrw --expiry $end -o tsv`
+      sas=`az storage share generate-sas -n MyShare --account-name MyStorageAccount --https-only --permissions dlrw --expiry $end -o tsv`
 
-        az storage file upload -s MyShare --account-name MyStorageAccount --source file.txt  --sas-token $sas
+      az storage file upload -s MyShare --account-name MyStorageAccount --source file.txt  --sas-token $sas
   - summary: Generate a shared access signature for the share. (autogenerated)
-    syntax:
-      content: az storage share generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --name MyShare --permissions dlrw
+    syntax: az storage share generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --name MyShare --permissions dlrw
   - summary: Generate a shared access signature for the share. (autogenerated)
-    syntax:
-      content: az storage share generate-sas --connection-string $connectionString --expiry 2019-02-01T12:20Z --name MyShare --permissions dlrw
-  parameters:
+    syntax: az storage share generate-sas --connection-string $connectionString --expiry 2019-02-01T12:20Z --name MyShare --permissions dlrw
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessed using this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessed using this shared access signature.
     description: ''
@@ -200,9 +218,33 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the share's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_share_list
+  name: az storage share list
+  summary: List the file shares in a storage account.
+  description: ''
+  syntax: >-
+    az storage share list [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--include-metadata]
+                          [--marker]
+                          [--num-results]
+                          [--prefix]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -212,25 +254,6 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_share_list
-  name: az storage share list
-  summary: List the file shares in a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
   - name: --include-metadata
     summary: Specifies that share metadata be returned in the response.
     description: ''
@@ -244,17 +267,8 @@ items:
   - name: --prefix
     summary: Filters the results to return only shares whose names begin with the specified prefix.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -262,26 +276,29 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_show
   name: az storage share show
   summary: Returns all user-defined metadata and system properties for the specified share.
   description: The data returned does not include the shares's list of files or directories.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share show --name
+                          [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -291,32 +308,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_stats
   name: az storage share stats
   summary: Gets the approximate size of the data stored on the share, rounded up to the nearest gigabyte.
   description: Note that this value may not include all recently created or recently resized files.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share stats --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -332,19 +354,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_update
   name: az storage share update
   summary: Sets service-defined properties for the specified share.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share update --name
+                            --quota
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
@@ -353,9 +380,7 @@ items:
     name: --quota
     summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5 TB (5120 GB).
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -371,35 +396,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_url
   name: az storage share url
   summary: Create a URI to access a file share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share url --name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--protocol {http, https}]
+                         [--sas-token]
+                         [--subscription]
+                         [--unc]
   examples:
   - summary: Create a URI to access a file share. (autogenerated)
-    syntax:
-      content: az storage share url --account-key 00000000 --account-name MyAccount --name MyFileShare
-  parameters:
+    syntax: az storage share url --account-key 00000000 --account-name MyAccount --name MyFileShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --protocol
-    defaultValue: https
-    parameterValueGroup: http, https
-    summary: Protocol to use.
-    description: ''
-  - name: --unc
-    summary: Output UNC network path.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -409,73 +431,40 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --protocol
+    defaultValue: https
+    parameterValueGroup: http, https
+    summary: Protocol to use.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --unc
+    summary: Output UNC network path.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_share_create
-  name: az storage share create
-  summary: Creates a new share under the specified account.
-- uid: az_storage_share_delete
-  name: az storage share delete
-  summary: Marks the specified share for deletion.
-- uid: az_storage_share_exists
-  name: az storage share exists
-  summary: Check for the existence of a file share.
-- uid: az_storage_share_generate_sas
-  name: az storage share generate-sas
-  summary: Generates a shared access signature for the share.
-- uid: az_storage_share_list
-  name: az storage share list
-  summary: List the file shares in a storage account.
-- uid: az_storage_share_metadata
-  name: az storage share metadata
-  summary: Manage the metadata of a file share.
-- uid: az_storage_share_metadata_show
-  name: az storage share metadata show
-  summary: Returns all user-defined metadata for the specified share.
-- uid: az_storage_share_metadata_update
-  name: az storage share metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified share.
-- uid: az_storage_share_policy
-  name: az storage share policy
-  summary: Manage shared access policies of a storage file share.
-- uid: az_storage_share_policy_create
-  name: az storage share policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_share_policy_delete
-  name: az storage share policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_share_policy_list
-  name: az storage share policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_share_policy_show
-  name: az storage share policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_share_policy_update
-  name: az storage share policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_share_show
-  name: az storage share show
-  summary: Returns all user-defined metadata and system properties for the specified share.
-- uid: az_storage_share_stats
-  name: az storage share stats
-  summary: Gets the approximate size of the data stored on the share, rounded up to the nearest gigabyte.
-- uid: az_storage_share_update
-  name: az storage share update
-  summary: Sets service-defined properties for the specified share.
-- uid: az_storage_share_url
-  name: az storage share url
-  summary: Create a URI to access a file share.
+- az_storage_share_create
+- az_storage_share_delete
+- az_storage_share_exists
+- az_storage_share_generate-sas
+- az_storage_share_list
+- az_storage_share_metadata
+- az_storage_share_metadata_show
+- az_storage_share_metadata_update
+- az_storage_share_policy
+- az_storage_share_policy_create
+- az_storage_share_policy_delete
+- az_storage_share_policy_list
+- az_storage_share_policy_show
+- az_storage_share_policy_update
+- az_storage_share_show
+- az_storage_share_stats
+- az_storage_share_update
+- az_storage_share_url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -491,10 +480,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file shares.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file shares.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/share/metadata.yml b/2017-03-09-profile/docs-ref-autogen/storage/share/metadata.yml
index 8d28a53aae..5a2ff9006c 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/share/metadata.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/share/metadata.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_share_metadata
-  name: az storage share metadata
-  summary: Manage the metadata of a file share.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_share_metadata_show
-  - az_storage_share_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_share_metadata
+name: az storage share metadata
+summary: Manage the metadata of a file share.
+description: ''
+directCommands:
 - uid: az_storage_share_metadata_show
   name: az storage share metadata show
   summary: Returns all user-defined metadata for the specified share.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share metadata show --name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--query-examples]
+                                   [--sas-token]
+                                   [--subscription]
+                                   [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -32,35 +32,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_metadata_update
   name: az storage share metadata update
   summary: Sets one or more user-defined name-value pairs for the specified share.
   description: Each call to this operation replaces all existing metadata attached to the share. To remove all metadata from the share, call this operation with no metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share metadata update --name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--metadata]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -70,25 +73,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_share_metadata_show
-  name: az storage share metadata show
-  summary: Returns all user-defined metadata for the specified share.
-- uid: az_storage_share_metadata_update
-  name: az storage share metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified share.
+- az_storage_share_metadata_show
+- az_storage_share_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +104,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage the metadata of a file share.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage the metadata of a file share.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/share/policy.yml b/2017-03-09-profile/docs-ref-autogen/storage/share/policy.yml
index 7c95de47c3..a0d0588118 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/share/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/share/policy.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_share_policy
-  name: az storage share policy
-  summary: Manage shared access policies of a storage file share.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_share_policy_create
-  - az_storage_share_policy_delete
-  - az_storage_share_policy_list
-  - az_storage_share_policy_show
-  - az_storage_share_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_share_policy
+name: az storage share policy
+summary: Manage shared access policies of a storage file share.
+description: ''
+directCommands:
 - uid: az_storage_share_policy_create
   name: az storage share policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy create --name
+                                   --share-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -27,15 +28,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_delete
   name: az storage share policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy delete --name
+                                   --share-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--sas-token]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -72,6 +75,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,23 +91,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_list
   name: az storage share policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy list --share-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -113,25 +119,30 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_show
   name: az storage share policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy show --name
+                                 --share-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -140,6 +151,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -149,25 +161,32 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_update
   name: az storage share policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy update --name
+                                   --share-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -176,15 +195,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -194,34 +205,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_share_policy_create
-  name: az storage share policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_share_policy_delete
-  name: az storage share policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_share_policy_list
-  name: az storage share policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_share_policy_show
-  name: az storage share policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_share_policy_update
-  name: az storage share policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_share_policy_create
+- az_storage_share_policy_delete
+- az_storage_share_policy_list
+- az_storage_share_policy_show
+- az_storage_share_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -237,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage shared access policies of a storage file share.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage shared access policies of a storage file share.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/table.yml b/2017-03-09-profile/docs-ref-autogen/storage/table.yml
index 51d622f8c4..e6b440e470 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/table.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/table.yml
@@ -1,34 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_table
-  name: az storage table
-  summary: Manage NoSQL key-value storage.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_table_create
-  - az_storage_table_delete
-  - az_storage_table_exists
-  - az_storage_table_generate_sas
-  - az_storage_table_list
+### YamlMime:AzureCLIGroup
+uid: az_storage_table
+name: az storage table
+summary: Manage NoSQL key-value storage.
+description: ''
+directCommands:
 - uid: az_storage_table_create
   name: az storage table create
   summary: Creates a new table in the storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table create --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-on-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the table to create. The table name may contain only alphanumeric characters and cannot begin with a numeric character. It is case-insensitive and must be from 3 to 63 characters long.
     description: ''
-  - name: --fail-on-exist
-    summary: Throw an exception if the table already exists.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -38,35 +32,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Throw an exception if the table already exists.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_delete
   name: az storage table delete
   summary: Deletes the specified table and any data it contains.
   description: When a table is successfully deleted, it is immediately marked for deletion  and is no longer accessible to clients. The table is later removed from  the Table service during garbage collection.  Note that deleting a table is likely to take at least 40 seconds to complete.  If an operation is attempted against the table while it was being deleted,  an AzureConflictHttpError will be thrown.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table delete --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-not-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the table to delete.
     description: ''
-  - name: --fail-not-exist
-    summary: Specifies whether to throw an exception if the table doesn't exist.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -76,32 +73,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specifies whether to throw an exception if the table doesn't exist.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_exists
   name: az storage table exists
   summary: Returns a boolean indicating whether the table exists.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table exists --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of table to check for existence.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -117,23 +119,46 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_table_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_table_generate-sas
   name: az storage table generate-sas
   summary: Generates a shared access signature for the table.
   description: Use the returned signature with the sas_token parameter of TableService.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table generate-sas --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--end-pk]
+                                  [--end-rk]
+                                  [--expiry]
+                                  [--https-only]
+                                  [--ip]
+                                  [--permissions]
+                                  [--policy-name]
+                                  [--sas-token]
+                                  [--start]
+                                  [--start-pk]
+                                  [--start-rk]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the table to create a SAS token for.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --end-pk
     summary: The maximum partition key accessible with this shared access signature. endpk must accompany endrk. Key values are inclusive. If omitted, there is no upper bound on the table entities that can be accessed.
     description: ''
@@ -155,6 +180,9 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the table's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
@@ -164,43 +192,25 @@ items:
   - name: --start-rk
     summary: The minimum row key accessible with this shared access signature. startpk must accompany startrk. Key values are inclusive. If omitted, there is no lower bound on the table entities that can be accessed.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_list
   name: az storage table list
   summary: List tables in a storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --marker
-    summary: An opaque continuation object. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-    description: ''
-  - name: --num-results
-    summary: The maximum number of tables to return.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  syntax: >-
+    az storage table list [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--marker]
+                          [--num-results]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -210,52 +220,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --marker
+    summary: An opaque continuation object. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
+    description: ''
+  - name: --num-results
+    summary: The maximum number of tables to return.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_table_create
-  name: az storage table create
-  summary: Creates a new table in the storage account.
-- uid: az_storage_table_delete
-  name: az storage table delete
-  summary: Deletes the specified table and any data it contains.
-- uid: az_storage_table_exists
-  name: az storage table exists
-  summary: Returns a boolean indicating whether the table exists.
-- uid: az_storage_table_generate_sas
-  name: az storage table generate-sas
-  summary: Generates a shared access signature for the table.
-- uid: az_storage_table_list
-  name: az storage table list
-  summary: List tables in a storage account.
-- uid: az_storage_table_policy
-  name: az storage table policy
-  summary: Manage shared access policies of a storage table.
-- uid: az_storage_table_policy_create
-  name: az storage table policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_table_policy_delete
-  name: az storage table policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_table_policy_list
-  name: az storage table policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_table_policy_show
-  name: az storage table policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_table_policy_update
-  name: az storage table policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_table_create
+- az_storage_table_delete
+- az_storage_table_exists
+- az_storage_table_generate-sas
+- az_storage_table_list
+- az_storage_table_policy
+- az_storage_table_policy_create
+- az_storage_table_policy_delete
+- az_storage_table_policy_list
+- az_storage_table_policy_show
+- az_storage_table_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -271,10 +266,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage NoSQL key-value storage.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage NoSQL key-value storage.
diff --git a/2017-03-09-profile/docs-ref-autogen/storage/table/policy.yml b/2017-03-09-profile/docs-ref-autogen/storage/table/policy.yml
index 66fea260c4..b079e94dd4 100644
--- a/2017-03-09-profile/docs-ref-autogen/storage/table/policy.yml
+++ b/2017-03-09-profile/docs-ref-autogen/storage/table/policy.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_table_policy
-  name: az storage table policy
-  summary: Manage shared access policies of a storage table.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_table_policy_create
-  - az_storage_table_policy_delete
-  - az_storage_table_policy_list
-  - az_storage_table_policy_show
-  - az_storage_table_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_table_policy
+name: az storage table policy
+summary: Manage shared access policies of a storage table.
+description: ''
+directCommands:
 - uid: az_storage_table_policy_create
   name: az storage table policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy create --name
+                                   --table-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -27,15 +28,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_delete
   name: az storage table policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy delete --name
+                                   --table-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--sas-token]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -72,6 +75,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,23 +91,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_list
   name: az storage table policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy list --table-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --table-name -t
     summary: The container name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -113,25 +119,30 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_show
   name: az storage table policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy show --name
+                                 --table-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -140,6 +151,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -149,25 +161,32 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_update
   name: az storage table policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy update --name
+                                   --table-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -176,15 +195,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -194,34 +205,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_table_policy_create
-  name: az storage table policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_table_policy_delete
-  name: az storage table policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_table_policy_list
-  name: az storage table policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_table_policy_show
-  name: az storage table policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_table_policy_update
-  name: az storage table policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_table_policy_create
+- az_storage_table_policy_delete
+- az_storage_table_policy_list
+- az_storage_table_policy_show
+- az_storage_table_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -237,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage shared access policies of a storage table.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage shared access policies of a storage table.
diff --git a/2017-03-09-profile/docs-ref-autogen/storagesync.yml b/2017-03-09-profile/docs-ref-autogen/storagesync.yml
new file mode 100644
index 0000000000..050c7c2802
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storagesync.yml
@@ -0,0 +1,148 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync
+name: az storagesync
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure File Sync.
+description: ''
+directCommands:
+- uid: az_storagesync_create
+  name: az storagesync create
+  summary: Create a new storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync create --name
+                          --resource-group
+                          [--location]
+                          [--tags]
+  examples:
+  - summary: Create a new storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
+    syntax: >-
+      az storagesync create --resource-group "SampleResourceGroup" \
+
+      --name "SampleStorageSyncService" --location "WestUS" --tags key1=value1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_storagesync_delete
+  name: az storagesync delete
+  summary: Delete a given storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync delete --name
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: Delete a storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
+    syntax: >-
+      az storagesync delete --resource-group "SampleResourceGroup" \
+
+      --name "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_list
+  name: az storagesync list
+  summary: List all storage sync services in a resource group or a subscription.
+  description: ''
+  syntax: az storagesync list [--resource-group]
+  examples:
+  - summary: List all storage sync services in a resource group "SampleResourceGroup".
+    syntax: az storagesync list --resource-group "SampleResourceGroup"
+  - summary: List all storage sync services in current subscription
+    syntax: az storagesync list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_show
+  name: az storagesync show
+  summary: Show the properties for a given storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync show --name
+                        [--resource-group]
+  examples:
+  - summary: Show the properties for storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
+    syntax: >-
+      az storagesync show --resource-group "SampleResourceGroup" --name \
+
+      "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_storagesync_create
+- az_storagesync_delete
+- az_storagesync_list
+- az_storagesync_registered-server
+- az_storagesync_registered-server_delete
+- az_storagesync_registered-server_list
+- az_storagesync_registered-server_show
+- az_storagesync_registered-server_wait
+- az_storagesync_show
+- az_storagesync_sync-group
+- az_storagesync_sync-group_cloud-endpoint
+- az_storagesync_sync-group_cloud-endpoint_create
+- az_storagesync_sync-group_cloud-endpoint_delete
+- az_storagesync_sync-group_cloud-endpoint_list
+- az_storagesync_sync-group_cloud-endpoint_show
+- az_storagesync_sync-group_cloud-endpoint_wait
+- az_storagesync_sync-group_create
+- az_storagesync_sync-group_delete
+- az_storagesync_sync-group_list
+- az_storagesync_sync-group_server-endpoint
+- az_storagesync_sync-group_server-endpoint_create
+- az_storagesync_sync-group_server-endpoint_delete
+- az_storagesync_sync-group_server-endpoint_list
+- az_storagesync_sync-group_server-endpoint_show
+- az_storagesync_sync-group_server-endpoint_update
+- az_storagesync_sync-group_server-endpoint_wait
+- az_storagesync_sync-group_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure File Sync.
diff --git a/2017-03-09-profile/docs-ref-autogen/storagesync/registered-server.yml b/2017-03-09-profile/docs-ref-autogen/storagesync/registered-server.yml
new file mode 100644
index 0000000000..6bad156c85
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storagesync/registered-server.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_registered-server
+name: az storagesync registered-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync registered-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage registered server.
+description: ''
+directCommands:
+- uid: az_storagesync_registered-server_delete
+  name: az storagesync registered-server delete
+  summary: Unregister an on-premises server from it's storage sync service.
+  description: Unregister an on-premises server from it's storage sync service which will result in cascading deletes of all server endpoints on this server.
+  syntax: >-
+    az storagesync registered-server delete --server-id
+                                            --storage-sync-service
+                                            [--no-wait]
+                                            [--resource-group]
+                                            [--yes]
+  examples:
+  - summary: Unregister an on-premises server "41166691-ab03-43e9-ab3e-0330eda162ac" from it's storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync registered-server delete --resource-group "SampleResourceGroup" --storage-sync-service \
+
+      "SampleStorageSyncService" --server-id "41166691-ab03-43e9-ab3e-0330eda162ac"
+  requiredParameters:
+  - isRequired: true
+    name: --server-id
+    summary: GUID identifying the on-premises server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_registered-server_list
+  name: az storagesync registered-server list
+  summary: List all registered servers for a given storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync registered-server list --storage-sync-service
+                                          [--resource-group]
+  examples:
+  - summary: List all registered servers for storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync registered-server list --resource-group "SampleResourceGroup" --storage-sync-service \
+
+      "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_registered-server_show
+  name: az storagesync registered-server show
+  summary: Show the properties for a given registered server.
+  description: ''
+  syntax: >-
+    az storagesync registered-server show --server-id
+                                          --storage-sync-service
+                                          [--resource-group]
+  examples:
+  - summary: Show the properties for registered server "080d4133-bdb5-40a0-96a0-71a6057bfe9a".
+    syntax: >-
+      az storagesync registered-server show --resource-group "SampleResourceGroup" --storage-sync-service \
+
+      "SampleStorageSyncService" --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a"
+  requiredParameters:
+  - isRequired: true
+    name: --server-id
+    summary: GUID identifying the on-premises server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_registered-server_wait
+  name: az storagesync registered-server wait
+  summary: Place the CLI in a waiting state until a condition of a registered server is met.
+  description: ''
+  syntax: >-
+    az storagesync registered-server wait --resource-group
+                                          --server-id
+                                          --storage-sync-service-name
+                                          [--created]
+                                          [--custom]
+                                          [--deleted]
+                                          [--exists]
+                                          [--interval]
+                                          [--timeout]
+                                          [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a condition of a registered server is deleted.
+    syntax: >-
+      az storagesync registered-server wait --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" \
+
+      --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --server-id
+    summary: GUID identifying the on-premises server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service-name
+    summary: Name of Storage Sync Service resource.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_storagesync_registered-server_delete
+- az_storagesync_registered-server_list
+- az_storagesync_registered-server_show
+- az_storagesync_registered-server_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage registered server.
diff --git a/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group.yml b/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group.yml
new file mode 100644
index 0000000000..48011d32da
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_sync-group
+name: az storagesync sync-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync sync-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage sync group.
+description: ''
+directCommands:
+- uid: az_storagesync_sync-group_create
+  name: az storagesync sync-group create
+  summary: Create a new sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group create --name
+                                     --storage-sync-service
+                                     [--resource-group]
+  examples:
+  - summary: Create a new sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group create --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of sync group.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_delete
+  name: az storagesync sync-group delete
+  summary: Delete a given sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group delete --name
+                                     --storage-sync-service
+                                     [--resource-group]
+                                     [--yes]
+  examples:
+  - summary: Delete sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group delete --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of sync group.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_sync-group_list
+  name: az storagesync sync-group list
+  summary: List all sync groups in a storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync sync-group list --storage-sync-service
+                                   [--resource-group]
+  examples:
+  - summary: List all sync groups in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group list --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_show
+  name: az storagesync sync-group show
+  summary: Show the properties for a given sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group show --name
+                                   --storage-sync-service
+                                   [--resource-group]
+  examples:
+  - summary: Show the properties for sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group show --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of sync group.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_storagesync_sync-group_cloud-endpoint
+- az_storagesync_sync-group_cloud-endpoint_create
+- az_storagesync_sync-group_cloud-endpoint_delete
+- az_storagesync_sync-group_cloud-endpoint_list
+- az_storagesync_sync-group_cloud-endpoint_show
+- az_storagesync_sync-group_cloud-endpoint_wait
+- az_storagesync_sync-group_create
+- az_storagesync_sync-group_delete
+- az_storagesync_sync-group_list
+- az_storagesync_sync-group_server-endpoint
+- az_storagesync_sync-group_server-endpoint_create
+- az_storagesync_sync-group_server-endpoint_delete
+- az_storagesync_sync-group_server-endpoint_list
+- az_storagesync_sync-group_server-endpoint_show
+- az_storagesync_sync-group_server-endpoint_update
+- az_storagesync_sync-group_server-endpoint_wait
+- az_storagesync_sync-group_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage sync group.
diff --git a/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group/cloud-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group/cloud-endpoint.yml
new file mode 100644
index 0000000000..c5056b4678
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group/cloud-endpoint.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_sync-group_cloud-endpoint
+name: az storagesync sync-group cloud-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync sync-group cloud-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud endpoint.
+description: ''
+directCommands:
+- uid: az_storagesync_sync-group_cloud-endpoint_create
+  name: az storagesync sync-group cloud-endpoint create
+  summary: Create a new cloud endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint create --name
+                                                    --storage-sync-service
+                                                    --sync-group-name
+                                                    [--azure-file-share-name]
+                                                    [--no-wait]
+                                                    [--resource-group]
+                                                    [--storage-account]
+                                                    [--storage-account-tenant-id]
+  examples:
+  - summary: Create a new cloud endpoint "SampleCloudEndpoint" in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint create --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint" --storage-account storageaccountnameorid --azure-file-share-name \
+
+      "cvcloud-afscv-0719-058-a94a1354-a1fd-4e9a-9a50-919fad8c4ba4"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --azure-file-share-name
+    summary: The name of Azure file share.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --storage-account
+    summary: The name or ID of the storage account.
+    description: ''
+  - name: --storage-account-tenant-id
+    summary: The id of the tenant that the storage account is in.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_delete
+  name: az storagesync sync-group cloud-endpoint delete
+  summary: Delete a given cloud endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint delete --name
+                                                    --storage-sync-service
+                                                    --sync-group-name
+                                                    [--no-wait]
+                                                    [--resource-group]
+                                                    [--yes]
+  examples:
+  - summary: Delete cloud endpoint "SampleCloudEndpoint".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint delete --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_list
+  name: az storagesync sync-group cloud-endpoint list
+  summary: List all cloud endpoints in a sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint list --storage-sync-service
+                                                  --sync-group-name
+                                                  [--resource-group]
+  examples:
+  - summary: List all cloud endpoints in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint list --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_show
+  name: az storagesync sync-group cloud-endpoint show
+  summary: Show the properties for a given cloud endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint show --name
+                                                  --storage-sync-service
+                                                  --sync-group-name
+                                                  [--resource-group]
+  examples:
+  - summary: Show the properties for cloud endpoint "SampleCloudEndpoint".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint show --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_wait
+  name: az storagesync sync-group cloud-endpoint wait
+  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint wait --name
+                                                  --resource-group
+                                                  --storage-sync-service-name
+                                                  --sync-group-name
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a condition of a cloud endpoint is created.
+    syntax: >-
+      az storagesync sync-group cloud-endpoint wait --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service-name
+    summary: Name of Storage Sync Service resource.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: Name of Sync Group resource.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_storagesync_sync-group_cloud-endpoint_create
+- az_storagesync_sync-group_cloud-endpoint_delete
+- az_storagesync_sync-group_cloud-endpoint_list
+- az_storagesync_sync-group_cloud-endpoint_show
+- az_storagesync_sync-group_cloud-endpoint_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud endpoint.
diff --git a/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group/server-endpoint.yml b/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group/server-endpoint.yml
new file mode 100644
index 0000000000..84ee6f4de9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/storagesync/sync-group/server-endpoint.yml
@@ -0,0 +1,342 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_sync-group_server-endpoint
+name: az storagesync sync-group server-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync sync-group server-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage server endpoint.
+description: ''
+directCommands:
+- uid: az_storagesync_sync-group_server-endpoint_create
+  name: az storagesync sync-group server-endpoint create
+  summary: Create a new server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint create --name
+                                                     --registered-server-id
+                                                     --server-local-path
+                                                     --storage-sync-service
+                                                     --sync-group-name
+                                                     [--cloud-tiering {off, on}]
+                                                     [--no-wait]
+                                                     [--offline-data-transfer {off, on}]
+                                                     [--offline-data-transfer-share-name]
+                                                     [--resource-group]
+                                                     [--tier-files-older-than-days]
+                                                     [--volume-free-space-percent]
+  examples:
+  - summary: Create a new server endpoint "SampleServerEndpoint" in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group server-endpoint create --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint" --server-id 91beed22-7e9e-4bda-9313-fec96cf286e0 \
+
+      --server-local-path "d:\abc" --cloud-tiering "off" --volume-free-space-percent 80 --tier-files-older-than-days 20 \
+
+      --offline-data-transfer "on" --offline-data-transfer-share-name "myfileshare"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --registered-server-id --server-id
+    summary: The resource id or GUID of the registered server.
+    description: ''
+  - isRequired: true
+    name: --server-local-path
+    summary: The local path of the registered server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --cloud-tiering
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offline-data-transfer
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
+    description: ''
+  - name: --offline-data-transfer-share-name
+    summary: The name of Azure file share that is used to transfer data offline.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --tier-files-older-than-days
+    summary: The days that the files are older than will be tiered.
+    description: ''
+  - name: --volume-free-space-percent
+    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_delete
+  name: az storagesync sync-group server-endpoint delete
+  summary: Delete a given server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint delete --name
+                                                     --storage-sync-service
+                                                     --sync-group-name
+                                                     [--no-wait]
+                                                     [--resource-group]
+                                                     [--yes]
+  examples:
+  - summary: Delete a server endpoint "SampleServerEndpoint".
+    syntax: >-
+      az storagesync sync-group server-endpoint delete --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_list
+  name: az storagesync sync-group server-endpoint list
+  summary: List all server endpoints in a sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint list --storage-sync-service
+                                                   --sync-group-name
+                                                   [--resource-group]
+  examples:
+  - summary: List all server endpoints in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group server-endpoint list --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_show
+  name: az storagesync sync-group server-endpoint show
+  summary: Show the properties for a given server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint show --name
+                                                   --storage-sync-service
+                                                   --sync-group-name
+                                                   [--resource-group]
+  examples:
+  - summary: Show the properties for server endpoint "SampleServerEndpoint".
+    syntax: >-
+      az storagesync sync-group server-endpoint show --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_update
+  name: az storagesync sync-group server-endpoint update
+  summary: Update the properties for a given server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint update --name
+                                                     --storage-sync-service
+                                                     --sync-group-name
+                                                     [--cloud-tiering {off, on}]
+                                                     [--no-wait]
+                                                     [--offline-data-transfer {off, on}]
+                                                     [--offline-data-transfer-share-name]
+                                                     [--resource-group]
+                                                     [--tier-files-older-than-days]
+                                                     [--volume-free-space-percent]
+  examples:
+  - summary: Update the properties for server endpoint "SampleServerEndpoint".
+    syntax: >-
+      az storagesync sync-group server-endpoint update --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint" --cloud-tiering "off" \
+
+      --volume-free-space-percent "100" --tier-files-older-than-days "0" \
+
+      --offline-data-transfer "off"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --cloud-tiering
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offline-data-transfer
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
+    description: ''
+  - name: --offline-data-transfer-share-name
+    summary: The name of Azure file share that is used to transfer data offline.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --tier-files-older-than-days
+    summary: The days that the files are older than will be tiered.
+    description: ''
+  - name: --volume-free-space-percent
+    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_wait
+  name: az storagesync sync-group server-endpoint wait
+  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint wait --name
+                                                   --resource-group
+                                                   --storage-sync-service-name
+                                                   --sync-group-name
+                                                   [--created]
+                                                   [--custom]
+                                                   [--deleted]
+                                                   [--exists]
+                                                   [--interval]
+                                                   [--timeout]
+                                                   [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a condition of a server endpoint is created.
+    syntax: >-
+      az storagesync sync-group server-endpoint wait --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service-name
+    summary: Name of Storage Sync Service resource.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: Name of Sync Group resource.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_storagesync_sync-group_server-endpoint_create
+- az_storagesync_sync-group_server-endpoint_delete
+- az_storagesync_sync-group_server-endpoint_list
+- az_storagesync_sync-group_server-endpoint_show
+- az_storagesync_sync-group_server-endpoint_update
+- az_storagesync_sync-group_server-endpoint_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage server endpoint.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics.yml
new file mode 100644
index 0000000000..bf1f12f4f6
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics
+name: az stream-analytics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Stream Analytics.
+description: ''
+commands:
+- az_stream-analytics_function
+- az_stream-analytics_function_create
+- az_stream-analytics_function_delete
+- az_stream-analytics_function_list
+- az_stream-analytics_function_show
+- az_stream-analytics_function_test
+- az_stream-analytics_input
+- az_stream-analytics_input_create
+- az_stream-analytics_input_delete
+- az_stream-analytics_input_list
+- az_stream-analytics_input_show
+- az_stream-analytics_input_test
+- az_stream-analytics_job
+- az_stream-analytics_job_create
+- az_stream-analytics_job_delete
+- az_stream-analytics_job_list
+- az_stream-analytics_job_show
+- az_stream-analytics_job_start
+- az_stream-analytics_job_stop
+- az_stream-analytics_job_update
+- az_stream-analytics_job_wait
+- az_stream-analytics_output
+- az_stream-analytics_output_create
+- az_stream-analytics_output_delete
+- az_stream-analytics_output_list
+- az_stream-analytics_output_show
+- az_stream-analytics_output_test
+- az_stream-analytics_quota
+- az_stream-analytics_quota_show
+- az_stream-analytics_transformation
+- az_stream-analytics_transformation_create
+- az_stream-analytics_transformation_show
+- az_stream-analytics_transformation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Stream Analytics.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics/function.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics/function.yml
new file mode 100644
index 0000000000..13ce634c47
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics/function.yml
@@ -0,0 +1,231 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_function
+name: az stream-analytics function
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics function** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics function.
+description: ''
+directCommands:
+- uid: az_stream-analytics_function_create
+  name: az stream-analytics function create
+  summary: Create a function or replaces an already existing function under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics function create --binding
+                                        --function-output
+                                        --inputs
+                                        --job-name
+                                        --name
+                                        --resource-group
+                                        [--type {Scalar}]
+  examples:
+  - summary: Create a function
+    syntax: >-
+      az stream-analytics function create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyFunctionName --inputs @inputs.json --function-output @output.json --binding \
+
+      @binding.json
+       (below is an example for "inputs.json")
+       [
+           {
+               "dataType": "Any"
+           }
+       ]
+       (below is an example for "output.json")
+       {
+           "dataType": "Any"
+       }
+       (below is an example of JavascripUDF for "binding.json")
+       {
+           "type": "Microsoft.StreamAnalytics/JavascriptUdf",
+           "properties": {
+               "script": "function (x, y) { return x + y; }"
+           }
+       }
+       (below is an example of Azure Machine Learning for "binding.json")
+       {
+           "type": "Microsoft.MachineLearning/WebService",
+           "properties": {
+               "endpoint": "someAzureMLEndpointURL",
+               "apiKey": "someApiKey==",
+               "inputs": {
+                   "name": "input1",
+                   "columnNames": [
+                       {
+                           "name": "tweet",
+                           "dataType": "string",
+                           "mapTo": 0
+                       }
+                   ]
+               },
+               "outputs": [
+                   {
+                       "name": "Sentiment",
+                       "dataType": "string"
+                   }
+               ],
+               "batchSize": 1000
+           }
+       }
+  requiredParameters:
+  - isRequired: true
+    name: --binding
+    summary: The binding of the function.
+    description: ''
+  - isRequired: true
+    name: --function-output
+    summary: The output of the function.
+    description: ''
+  - isRequired: true
+    name: --inputs
+    summary: The inputs of the function.
+    description: ''
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --type
+    defaultValue: Scalar
+    parameterValueGroup: Scalar
+    summary: The udf type of the function.
+    description: ''
+- uid: az_stream-analytics_function_delete
+  name: az stream-analytics function delete
+  summary: Delete a function from the streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics function delete --job-name
+                                        --name
+                                        --resource-group
+  examples:
+  - summary: Delete a function
+    syntax: >-
+      az stream-analytics function delete --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyFunctionName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_function_list
+  name: az stream-analytics function list
+  summary: List all of the functions under the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics function list --job-name
+                                      --resource-group
+  examples:
+  - summary: List all functions in a streaming job
+    syntax: az stream-analytics function list --resource-group MyResourceGroup --job-name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_function_show
+  name: az stream-analytics function show
+  summary: Get details about the specified function.
+  description: ''
+  syntax: >-
+    az stream-analytics function show --job-name
+                                      --name
+                                      --resource-group
+  examples:
+  - summary: Get details about a function
+    syntax: >-
+      az stream-analytics function show --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyFunctionName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_function_test
+  name: az stream-analytics function test
+  summary: Test if the information provided for a function is valid.
+  description: ''
+  syntax: >-
+    az stream-analytics function test --job-name
+                                      --name
+                                      --resource-group
+                                      [--no-wait]
+  examples:
+  - summary: Test the connection for a function
+    syntax: >-
+      az stream-analytics function test --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyFunctionName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_stream-analytics_function_create
+- az_stream-analytics_function_delete
+- az_stream-analytics_function_list
+- az_stream-analytics_function_show
+- az_stream-analytics_function_test
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics function.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics/input.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics/input.yml
new file mode 100644
index 0000000000..52ca83422a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics/input.yml
@@ -0,0 +1,232 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_input
+name: az stream-analytics input
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics input** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics input.
+description: ''
+directCommands:
+- uid: az_stream-analytics_input_create
+  name: az stream-analytics input create
+  summary: Create an input or replaces an already existing input under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics input create --datasource
+                                     --job-name
+                                     --name
+                                     --resource-group
+                                     --serialization
+                                     --type {Reference, Stream}
+  examples:
+  - summary: Create an input
+    syntax: >-
+      az stream-analytics input create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyInputName --type Stream --datasource @datasource.json --serialization \
+
+      @serialization.json
+       (below is an example of Blob Storage for "datasource.json")
+       {
+           "type": "Microsoft.Storage/Blob",
+           "properties": {
+               "storageAccounts": [
+                   {
+                       "accountName": "someAccountName",
+                       "accountKey": "someAccountKey=="
+                   }
+               ],
+               "container": "state",
+               "pathPattern": "{date}/{time}",
+               "dateFormat": "yyyy/MM/dd",
+               "timeFormat": "HH",
+               "sourcePartitionCount": 16
+           }
+       }
+       (below is an example of Event Hub for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/EventHub",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "someSharedAccessPolicyKey==",
+               "eventHubName": "sdkeventhub",
+               "consumerGroupName": "sdkconsumergroup"
+           }
+       }
+       (below is an example of Iot Hub for "datasource.json")
+       {
+           "type": "Microsoft.Devices/IotHubs",
+           "properties": {
+               "iotHubNamespace": "iothub",
+               "sharedAccessPolicyName": "owner",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "consumerGroupName": "sdkconsumergroup",
+               "endpoint": "messages/events"
+           }
+       }
+       (below is an example of Csv for "serialization.json")
+       {
+           "type": "Csv",
+           "properties": {
+               "fieldDelimiter": ",",
+               "encoding": "UTF8"
+           }
+       }
+       (below is an example of Json for "serialization.json")
+       {
+           "type": "Json",
+           "properties": {
+               "encoding": "UTF8"
+           }
+       }
+       (below is an example of Avro for "serialization.json")
+       {
+           "type": "Avro"
+       }
+  requiredParameters:
+  - isRequired: true
+    name: --datasource
+    summary: The datasource of the input.
+    description: ''
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --serialization
+    summary: The serialization of the input.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Reference, Stream
+    summary: The type of the input.
+    description: ''
+- uid: az_stream-analytics_input_delete
+  name: az stream-analytics input delete
+  summary: Delete an input from the streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics input delete --job-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: Delete an input
+    syntax: az stream-analytics input delete --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_input_list
+  name: az stream-analytics input list
+  summary: List all of the inputs under the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics input list --job-name
+                                   --resource-group
+  examples:
+  - summary: List all inputs in a streaming job
+    syntax: az stream-analytics input list --resource-group MyResourceGroup --job-name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_input_show
+  name: az stream-analytics input show
+  summary: Get details about the specified input.
+  description: ''
+  syntax: >-
+    az stream-analytics input show --job-name
+                                   --name
+                                   --resource-group
+  examples:
+  - summary: Get details about specified input
+    syntax: az stream-analytics input show --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_input_test
+  name: az stream-analytics input test
+  summary: Test an input.
+  description: ''
+  syntax: >-
+    az stream-analytics input test --job-name
+                                   --name
+                                   --resource-group
+                                   [--no-wait]
+  examples:
+  - summary: Test the connection for an input
+    syntax: az stream-analytics input test --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_stream-analytics_input_create
+- az_stream-analytics_input_delete
+- az_stream-analytics_input_list
+- az_stream-analytics_input_show
+- az_stream-analytics_input_test
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics input.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics/job.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics/job.yml
new file mode 100644
index 0000000000..ba171e1553
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics/job.yml
@@ -0,0 +1,343 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_job
+name: az stream-analytics job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics streaming job.
+description: ''
+directCommands:
+- uid: az_stream-analytics_job_create
+  name: az stream-analytics job create
+  summary: Create a streaming job or replaces an already existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job create --name
+                                   --resource-group
+                                   [--compatibility-level {1.0}]
+                                   [--data-locale]
+                                   [--events-late-arrival-max-delay]
+                                   [--events-outoforder-max-delay]
+                                   [--events-outoforder-policy {Adjust, Drop}]
+                                   [--location]
+                                   [--no-wait]
+                                   [--output-error-policy {Drop, Stop}]
+                                   [--sku {Standard}]
+                                   [--tags]
+  examples:
+  - summary: Create a streaming job
+    syntax: >-
+      az stream-analytics job create --resource-group MyResourceGroup --name MyJobName \
+
+      --location "West US" --output-error-policy "Drop" --events-outoforder-policy "Drop" \
+
+      --events-outoforder-max-delay 5 --events-late-arrival-max-delay 16 --data-locale "en-US"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compatibility-level
+    defaultValue: "1.0"
+    parameterValueGroup: "1.0"
+    summary: Controls certain runtime behaviors of the streaming job.
+    description: ''
+  - name: --data-locale
+    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx. Defaults to "en-US" if none specified.
+    description: ''
+  - name: --events-late-arrival-max-delay
+    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
+    description: ''
+  - name: --events-outoforder-max-delay
+    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
+    description: ''
+  - name: --events-outoforder-policy
+    parameterValueGroup: Adjust, Drop
+    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --output-error-policy
+    parameterValueGroup: Drop, Stop
+    summary: Indicates the policy to apply to events that arrive at the output.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    parameterValueGroup: Standard
+    summary: The name of the SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_stream-analytics_job_delete
+  name: az stream-analytics job delete
+  summary: Delete a streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job delete --name
+                                   --resource-group
+                                   [--no-wait]
+  examples:
+  - summary: Delete a streaming job
+    syntax: az stream-analytics job delete --resource-group MyResourceGroup --name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_stream-analytics_job_list
+  name: az stream-analytics job list
+  summary: List all of the streaming jobs in the specified resource group.
+  description: ''
+  syntax: >-
+    az stream-analytics job list [--expand]
+                                 [--resource-group]
+  examples:
+  - summary: List all streaming jobs in current subscription
+    syntax: az stream-analytics job list
+  - summary: List all streaming jobs in a resource group
+    syntax: az stream-analytics job list --resource-group MyResourceGroup
+  - summary: List all streaming jobs and expand their inputs, outputs, transformation, and functions
+    syntax: az stream-analytics job list --resource-group MyResourceGroup --expand
+  optionalParameters:
+  - name: --expand
+    summary: Expand inputs, transformation, outputs and functions of the streaming job.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_job_show
+  name: az stream-analytics job show
+  summary: Get details about the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job show --name
+                                 --resource-group
+                                 [--expand]
+  examples:
+  - summary: Get a streaming job
+    syntax: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName
+  - summary: Get a streaming job and expand its inputs, outputs, transformation, and functions
+    syntax: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName --expand
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Expand inputs, transformation, outputs and functions of the streaming job.
+    description: ''
+- uid: az_stream-analytics_job_start
+  name: az stream-analytics job start
+  summary: Start a streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job start --name
+                                  --resource-group
+                                  [--no-wait]
+                                  [--output-start-mode {CustomTime, JobStartTime, LastOutputEventTime}]
+                                  [--output-start-time]
+  examples:
+  - summary: Start a streaming job with LastOutputEventTime output start mode
+    syntax: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode LastOutputEventTime
+  - summary: Start a streaming job with JobStartTime output start mode
+    syntax: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode JobStartTime
+  - summary: Start a streaming job with CustomTime output start mode
+    syntax: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode CustomTime --output-start-time 2020-01-01T00:00:00Z
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --output-start-mode
+    defaultValue: JobStartTime
+    parameterValueGroup: CustomTime, JobStartTime, LastOutputEventTime
+    summary: Output start mode.
+    description: ''
+  - name: --output-start-time
+    summary: Output start time, must have a value if --output-start-mode is set to CustomTime.
+    description: ''
+- uid: az_stream-analytics_job_stop
+  name: az stream-analytics job stop
+  summary: Stop a running streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job stop --name
+                                 --resource-group
+                                 [--no-wait]
+  examples:
+  - summary: Stop a streaming job
+    syntax: az stream-analytics job stop --resource-group MyResourceGroup --name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_stream-analytics_job_update
+  name: az stream-analytics job update
+  summary: Update existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job update --name
+                                   --resource-group
+                                   [--data-locale]
+                                   [--events-late-arrival-max-delay]
+                                   [--events-outoforder-max-delay]
+                                   [--events-outoforder-policy {Adjust, Drop}]
+                                   [--output-error-policy {Drop, Stop}]
+                                   [--tags]
+  examples:
+  - summary: Update a streaming job
+    syntax: >-
+      az stream-analytics job update --resource-group MyResourceGroup --name MyJobName \
+
+      --events-outoforder-max-delay 21 --events-late-arrival-max-delay 13
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-locale
+    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx.
+    description: ''
+  - name: --events-late-arrival-max-delay
+    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
+    description: ''
+  - name: --events-outoforder-max-delay
+    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
+    description: ''
+  - name: --events-outoforder-policy
+    parameterValueGroup: Adjust, Drop
+    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
+    description: ''
+  - name: --output-error-policy
+    parameterValueGroup: Drop, Stop
+    summary: Indicates the policy to apply to events that arrive at the output.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_stream-analytics_job_wait
+  name: az stream-analytics job wait
+  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
+  description: ''
+  syntax: >-
+    az stream-analytics job wait --name
+                                 --resource-group
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--expand]
+                                 [--interval]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the streaming job is successfully provisioned.
+    syntax: az stream-analytics job wait --resource-group MyResourceGroup --name MyJobName --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: The $expand OData query parameter. This is a comma-separated list of additional streaming job properties to include in the response, beyond the default set returned when this parameter is absent. The default set is all streaming job properties other than 'inputs', 'transformation', 'outputs', and 'functions'.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_stream-analytics_job_create
+- az_stream-analytics_job_delete
+- az_stream-analytics_job_list
+- az_stream-analytics_job_show
+- az_stream-analytics_job_start
+- az_stream-analytics_job_stop
+- az_stream-analytics_job_update
+- az_stream-analytics_job_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics streaming job.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics/output.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics/output.yml
new file mode 100644
index 0000000000..133d89d5cf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics/output.yml
@@ -0,0 +1,316 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_output
+name: az stream-analytics output
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics output** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics output.
+description: ''
+directCommands:
+- uid: az_stream-analytics_output_create
+  name: az stream-analytics output create
+  summary: Create an output or replaces an already existing output under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics output create --datasource
+                                      --job-name
+                                      --name
+                                      --resource-group
+                                      [--serialization]
+  examples:
+  - summary: Create an output
+    syntax: >-
+      az stream-analytics output create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyOutputName --datasource @datasource.json --serialization @serialization.json
+       (below is an example of DataLake for "datasource.json")
+       {
+           "type": "Microsoft.DataLake/Accounts",
+           "properties": {
+               "accountName": "someaccount",
+               "tenantId": "cea4e98b-c798-49e7-8c40-4a2b3beb47dd",
+               "refreshToken": "someRefreshToken==",
+               "tokenUserPrincipalName": "bobsmith@contoso.com",
+               "tokenUserDisplayName": "Bob Smith",
+               "filePathPrefix": "{date}/{time}",
+               "dateFormat": "yyyy/MM/dd",
+               "timeFormat": "HH"
+           }
+       }
+       (below is an example of SQL Database for "datasource.json")
+       {
+           "type": "Microsoft.Sql/Server/Database",
+           "properties": {
+               "server": "someServer",
+               "database": "someDatabase",
+               "user": "someUser",
+               "password": "somePassword",
+               "table": "someTable"
+           }
+       }
+       (below is an example of Table Storage for "datasource.json")
+       {
+           "type": "Microsoft.Storage/Table",
+           "properties": {
+               "accountName": "someAccountName",
+               "accountKey": "accountKey==",
+               "table": "samples",
+               "partitionKey": "partitionKey",
+               "rowKey": "rowKey",
+               "columnsToRemove": [
+                   "column1",
+                   "column2"
+               ],
+               "batchSize": 25
+           }
+       }
+       (below is an example of Blob Storage for "datasource.json")
+       {
+           "type": "Microsoft.Storage/Blob",
+           "properties": {
+               "storageAccounts": [
+                   {
+                       "accountName": "someAccountName",
+                       "accountKey": "accountKey=="
+                   }
+               ],
+               "container": "state",
+               "pathPattern": "{date}/{time}",
+               "dateFormat": "yyyy/MM/dd",
+               "timeFormat": "HH"
+           }
+       }
+       (below is an example of DocumentDB for "datasource.json")
+       {
+           "type": "Microsoft.Storage/DocumentDB",
+           "properties": {
+               "accountId": "someAccountId",
+               "accountKey": "accountKey==",
+               "database": "db01",
+               "collectionNamePattern": "collection",
+               "partitionKey": "key",
+               "documentId": "documentId"
+           }
+       }
+       (below is an example of Event Hub for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/EventHub",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "eventHubName": "sdkeventhub",
+               "partitionKey": "partitionKey"
+           }
+       }
+       (below is an example of PowerBI for "datasource.json")
+       {
+           "type": "PowerBI",
+           "properties": {
+               "dataset": "someDataset",
+               "table": "someTable",
+               "refreshToken": "someRefreshToken==",
+               "tokenUserPrincipalName": "bobsmith@contoso.com",
+               "tokenUserDisplayName": "Bob Smith",
+               "groupId": "ac40305e-3e8d-43ac-8161-c33799f43e95",
+               "groupName": "MyPowerBIGroup"
+           }
+       }
+       (below is an example of Service Bus Queue for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/Queue",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "queueName": "sdkqueue",
+               "propertyColumns": [
+                   "column1",
+                   "column2"
+               ]
+           }
+       }
+       (below is an example of Service Bus Topic for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/Topic",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "topicName": "sdktopic",
+               "propertyColumns": [
+                   "column1",
+                   "column2"
+               ]
+           }
+       }
+       (below is an example of Csv for "serialization.json")
+       {
+           "type": "Csv",
+           "properties": {
+               "fieldDelimiter": ",",
+               "encoding": "UTF8"
+           }
+       }
+       (below is an example of Json for "serialization.json")
+       {
+           "type": "Json",
+           "properties": {
+               "encoding": "UTF8",
+               "format": "Array"
+           }
+       }
+       (below is an example of Avro for "serialization.json")
+       {
+           "type": "Avro"
+       }
+  requiredParameters:
+  - isRequired: true
+    name: --datasource
+    summary: The datasource of the output.
+    description: ''
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --serialization
+    summary: The serialization of the output.
+    description: ''
+- uid: az_stream-analytics_output_delete
+  name: az stream-analytics output delete
+  summary: Delete an output from the streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics output delete --job-name
+                                      --name
+                                      --resource-group
+  examples:
+  - summary: Delete an output
+    syntax: >-
+      az stream-analytics output delete --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyOutputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_output_list
+  name: az stream-analytics output list
+  summary: List all of the outputs under the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics output list --job-name
+                                    --resource-group
+  examples:
+  - summary: List all outputs in a streaming job
+    syntax: az stream-analytics output list --resource-group MyResourceGroup --job-name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_output_show
+  name: az stream-analytics output show
+  summary: Get details about the specified output.
+  description: ''
+  syntax: >-
+    az stream-analytics output show --job-name
+                                    --name
+                                    --resource-group
+  examples:
+  - summary: Get details about an output
+    syntax: >-
+      az stream-analytics output show --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyOutputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_output_test
+  name: az stream-analytics output test
+  summary: Test an output.
+  description: ''
+  syntax: >-
+    az stream-analytics output test --job-name
+                                    --name
+                                    --resource-group
+                                    [--no-wait]
+  examples:
+  - summary: Test the connection for an output
+    syntax: >-
+      az stream-analytics output test --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyOutputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_stream-analytics_output_create
+- az_stream-analytics_output_delete
+- az_stream-analytics_output_list
+- az_stream-analytics_output_show
+- az_stream-analytics_output_test
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics output.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics/quota.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics/quota.yml
new file mode 100644
index 0000000000..5c1a78559d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics/quota.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_quota
+name: az stream-analytics quota
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics quota** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to show quota information.
+description: ''
+directCommands:
+- uid: az_stream-analytics_quota_show
+  name: az stream-analytics quota show
+  summary: Retrieve quota information in a particular region.
+  description: ''
+  syntax: az stream-analytics quota show --location
+  examples:
+  - summary: List quota information in West US
+    syntax: az stream-analytics quota show --location "West US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_stream-analytics_quota_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to show quota information.
diff --git a/2017-03-09-profile/docs-ref-autogen/stream-analytics/transformation.yml b/2017-03-09-profile/docs-ref-autogen/stream-analytics/transformation.yml
new file mode 100644
index 0000000000..1c8d3e4e03
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/stream-analytics/transformation.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_transformation
+name: az stream-analytics transformation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics transformation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics transformation.
+description: ''
+directCommands:
+- uid: az_stream-analytics_transformation_create
+  name: az stream-analytics transformation create
+  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics transformation create --job-name
+                                              --name
+                                              --resource-group
+                                              [--streaming-units]
+                                              [--transformation-query]
+  examples:
+  - summary: Create a transformation
+    syntax: >-
+      az stream-analytics transformation create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name Transformation --streaming-units "6" --transformation-query "Select Id, Name from inputtest"
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the transformation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --streaming-units
+    summary: The number of streaming units that the streaming job uses.
+    description: ''
+  - name: --transformation-query
+    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: https://msdn.microsoft.com/library/azure/dn834998 .'
+    description: ''
+- uid: az_stream-analytics_transformation_show
+  name: az stream-analytics transformation show
+  summary: Get details about the specified transformation.
+  description: ''
+  syntax: >-
+    az stream-analytics transformation show --job-name
+                                            --name
+                                            --resource-group
+  examples:
+  - summary: Get a transformation
+    syntax: >-
+      az stream-analytics transformation show --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name Transformation
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the transformation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_transformation_update
+  name: az stream-analytics transformation update
+  summary: Update transformation under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics transformation update --job-name
+                                              --name
+                                              --resource-group
+                                              [--streaming-units]
+                                              [--transformation-query]
+  examples:
+  - summary: Update a transformation
+    syntax: >-
+      az stream-analytics transformation update --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name Transformation --transformation-query "New query"
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the transformation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --streaming-units
+    summary: The number of streaming units that the streaming job uses.
+    description: ''
+  - name: --transformation-query
+    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: https://msdn.microsoft.com/library/azure/dn834998 .'
+    description: ''
+commands:
+- az_stream-analytics_transformation_create
+- az_stream-analytics_transformation_show
+- az_stream-analytics_transformation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics transformation.
diff --git a/2017-03-09-profile/docs-ref-autogen/support.yml b/2017-03-09-profile/docs-ref-autogen/support.yml
new file mode 100644
index 0000000000..e1e6b04c88
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/support.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_support
+name: az support
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure support resource.
+description: ''
+commands:
+- az_support_services
+- az_support_services_list
+- az_support_services_problem-classifications
+- az_support_services_problem-classifications_list
+- az_support_services_problem-classifications_show
+- az_support_services_show
+- az_support_tickets
+- az_support_tickets_communications
+- az_support_tickets_communications_create
+- az_support_tickets_communications_list
+- az_support_tickets_communications_show
+- az_support_tickets_create
+- az_support_tickets_list
+- az_support_tickets_show
+- az_support_tickets_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure support resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/support/services.yml b/2017-03-09-profile/docs-ref-autogen/support/services.yml
new file mode 100644
index 0000000000..36f2446588
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/support/services.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_services
+name: az support services
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support services** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Azure services and related problem categories.
+description: ''
+directCommands:
+- uid: az_support_services_list
+  name: az support services list
+  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
+  description: ''
+  syntax: az support services list
+  examples:
+  - summary: Gets list of services for which a support ticket can be created.
+    syntax: az support services list
+- uid: az_support_services_show
+  name: az support services show
+  summary: Gets a specific Azure service for support ticket creation.
+  description: ''
+  syntax: az support services show --service-name
+  examples:
+  - summary: Gets details of Azure service.
+    syntax: az support services show --service-name "ServiceNameGuid"
+  requiredParameters:
+  - isRequired: true
+    name: --service-name
+    summary: Name of Azure service.
+    description: ''
+commands:
+- az_support_services_list
+- az_support_services_problem-classifications
+- az_support_services_problem-classifications_list
+- az_support_services_problem-classifications_show
+- az_support_services_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure services and related problem categories.
diff --git a/2017-03-09-profile/docs-ref-autogen/support/services/problem-classifications.yml b/2017-03-09-profile/docs-ref-autogen/support/services/problem-classifications.yml
new file mode 100644
index 0000000000..efa6090afb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/support/services/problem-classifications.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_services_problem-classifications
+name: az support services problem-classifications
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support services problem-classifications** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Problem classifications for an Azure service.
+description: ''
+directCommands:
+- uid: az_support_services_problem-classifications_list
+  name: az support services problem-classifications list
+  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
+  description: ''
+  syntax: az support services problem-classifications list --service-name
+  examples:
+  - summary: Gets list of problemClassifications for a service for which a support ticket can be created.
+    syntax: az support services problem-classifications list --service-name "ServiceNameGuid"
+  requiredParameters:
+  - isRequired: true
+    name: --service-name
+    summary: Name of Azure service.
+    description: ''
+- uid: az_support_services_problem-classifications_show
+  name: az support services problem-classifications show
+  summary: Gets the problem classification details for an Azure service.
+  description: ''
+  syntax: >-
+    az support services problem-classifications show --problem-classification-name
+                                                     --service-name
+  examples:
+  - summary: Gets details of problemClassification for Azure service.
+    syntax: >-
+      az support services problem-classifications show \
+        --service-name "ServiceNameGuid" \
+        --problem-classification-name "ProblemClassificationNameGuid"
+  requiredParameters:
+  - isRequired: true
+    name: --problem-classification-name
+    summary: Name of problem classification.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: Name of Azure service.
+    description: ''
+commands:
+- az_support_services_problem-classifications_list
+- az_support_services_problem-classifications_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Problem classifications for an Azure service.
diff --git a/2017-03-09-profile/docs-ref-autogen/support/tickets.yml b/2017-03-09-profile/docs-ref-autogen/support/tickets.yml
new file mode 100644
index 0000000000..2b72af14d2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/support/tickets.yml
@@ -0,0 +1,571 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_tickets
+name: az support tickets
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support tickets** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Create and manage Azure support ticket.
+description: ''
+directCommands:
+- uid: az_support_tickets_create
+  name: az support tickets create
+  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
+  description: ''
+  syntax: >-
+    az support tickets create --contact-country
+                              --contact-email
+                              --contact-first-name
+                              --contact-language
+                              --contact-last-name
+                              --contact-method {email, phone}
+                              --contact-timezone
+                              --description
+                              --problem-classification
+                              --severity {critical, highestcriticalimpact, minimal, moderate}
+                              --ticket-name
+                              --title
+                              [--contact-additional-emails]
+                              [--contact-phone-number]
+                              [--partner-tenant-id]
+                              [--quota-change-payload]
+                              [--quota-change-regions]
+                              [--quota-change-subtype]
+                              [--quota-change-version]
+                              [--require-24-by-7-response {false, true}]
+                              [--start-time]
+                              [--technical-resource]
+  examples:
+  - summary: Create a ticket for Billing related issues.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "BillingTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "BillingTestTicketName" \
+        --title "BillingTicketTitle"
+  - summary: Create a ticket for Subscription Management related issues.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "SubMgmtTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/SubMgmtServiceNameGuid/problemClassifications/SubMgmtProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "SubMgmtTestTicketName" \
+        --title "SubMgmtTicketTitle"
+  - summary: Create a ticket for Technical issue related to a specific resource.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "TechnicalTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/TechnicalServiceNameGuid/problemClassifications/TechnicalProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "TechnicalTestTicketName" \
+        --title "TechnicalTicketTitle" \
+        --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
+        --technical-resource "/subscriptions/SubscriptionGuid/resourceGroups/RgName/providers/Microsoft.Compute/virtualMachines/RName"
+  - summary: Create a ticket for Billing related issues in admin on behalf of (AOBO) mode.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "BillingTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "BillingTestTicketName" \
+        --title "BillingTicketTitle" \
+        --partner-tenant-id "CSPPartnerTenantIdGuid"
+  - summary: Create a ticket for Generic Quota increase for any Azure Service.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/GenericProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle"
+  - summary: Create a ticket to request Quota increase for Compute VM Cores.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/CoresQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"SKU\":\"DSv3 Series\", \"NewLimit\":104}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0"
+  - summary: Create a ticket to request Quota increase for Low-priority cores for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"LowPriority\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for specific VM family cores for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for Pools for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Pools\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for Active Jobs and Job Schedules for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Jobs\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for number of Batch accounts for a subscription.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":200, \"Type\":\"Account\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Subscription"
+  - summary: Create a ticket to request Quota increase for DTUs for SQL Database.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "DTUs"
+  - summary: Create a ticket to request Quota increase for Servers for SQL Database.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":54000}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Servers"
+  - summary: Create a ticket to request Quota increase for DTUs for SQL Data Warehouse.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "DTUs"
+  - summary: Create a ticket to request Quota increase for Servers for SQL Data Warehouse.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":200}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Servers"
+  - summary: Create a ticket to request Quota increase for specific VM family cores for Machine Learning service.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "BatchAml"
+  - summary: Create a ticket to request Quota increase for Low-priority cores for Machine Learning service.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":200, \"Type\":\"LowPriority\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "BatchAml"
+  requiredParameters:
+  - isRequired: true
+    name: --contact-country
+    summary: Country of the user. This is the ISO Alpha-3 code.
+    description: ''
+  - isRequired: true
+    name: --contact-email
+    summary: Primary email address.
+    description: ''
+  - isRequired: true
+    name: --contact-first-name
+    summary: First Name.
+    description: ''
+  - isRequired: true
+    name: --contact-language
+    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
+    description: ''
+  - isRequired: true
+    name: --contact-last-name
+    summary: Last Name.
+    description: ''
+  - isRequired: true
+    name: --contact-method
+    parameterValueGroup: email, phone
+    summary: Preferred contact method.
+    description: ''
+  - isRequired: true
+    name: --contact-timezone
+    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
+    description: ''
+  - isRequired: true
+    name: --description
+    summary: Detailed description of the question or issue.
+    description: ''
+  - isRequired: true
+    name: --problem-classification
+    summary: Each Azure service has its own set of issue category called problem classification that corresponds to the type of problem you are experiencing. This parameter is the resource id of ProblemClassification resource.
+    description: ''
+  - isRequired: true
+    name: --severity
+    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
+    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
+    description: ''
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  - isRequired: true
+    name: --title
+    summary: Title of the support ticket.
+    description: ''
+  optionalParameters:
+  - name: --contact-additional-emails
+    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
+    description: ''
+  - name: --contact-phone-number
+    summary: Phone number. This is required if preferred contact method is phone.
+    description: ''
+  - name: --partner-tenant-id
+    summary: Partner tenant id for Admin On Behalf of (AOBO) scenario. In addition to logging in to the customer tenant, logging in to the partner tenant (PT) using "az login -t PT --allow-no-subscriptions" is required.
+    description: ''
+  - name: --quota-change-payload
+    summary: Space seperated list of serialized payload of the quota increase request corresponding to regions. Visit https://aka.ms/supportrpquotarequestpayload for details.
+    description: ''
+  - name: --quota-change-regions
+    summary: Space seperated list of region for which the quota increase request is being made.
+    description: ''
+  - name: --quota-change-subtype
+    summary: 'Required for certain quota types when there is a sub type that you are requesting quota increase for. Example: Batch.'
+    description: ''
+  - name: --quota-change-version
+    summary: Quota change request version.
+    description: ''
+  - name: --require-24-by-7-response
+    parameterValueGroup: false, true
+    summary: Indicates if this requires a 24x7 response from Azure. Default is false.
+    description: ''
+  - name: --start-time
+    summary: Time in UTC datetime (Y-m-d'T'H:M:S'Z') when the problem started. Default is today.
+    description: ''
+  - name: --technical-resource
+    summary: This is the resource id of the Azure service resource for which the support ticket is created.
+    description: ''
+- uid: az_support_tickets_list
+  name: az support tickets list
+  summary: Lists all the support tickets for an Azure subscription.
+  description: ''
+  syntax: az support tickets list [--filters]
+  examples:
+  - summary: List support tickets for a subscription.
+    syntax: az support tickets list
+  - summary: List support tickets in open state for a subscription.
+    syntax: az support tickets list --filters "Status eq 'Open'"
+  - summary: List support tickets created on or after a certain date and in open state for a subscription.
+    syntax: az support tickets list --filters "CreatedDate ge 2020-01-01 and Status eq 'Open'"
+  optionalParameters:
+  - name: --filters
+    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "Status" property using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator. Default is CreatedDate >= one week.
+    description: ''
+- uid: az_support_tickets_show
+  name: az support tickets show
+  summary: Gets support ticket details for an Azure subscription.
+  description: ''
+  syntax: az support tickets show --ticket-name
+  examples:
+  - summary: Get details of a subscription ticket.
+    syntax: az support tickets show --ticket-name "TestTicketName"
+  requiredParameters:
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+- uid: az_support_tickets_update
+  name: az support tickets update
+  summary: Updates severity level, status and customer contact information for a support ticket.
+  description: ''
+  syntax: >-
+    az support tickets update --ticket-name
+                              [--contact-additional-emails]
+                              [--contact-country]
+                              [--contact-email]
+                              [--contact-first-name]
+                              [--contact-language]
+                              [--contact-last-name]
+                              [--contact-method {email, phone}]
+                              [--contact-phone-number]
+                              [--contact-timezone]
+                              [--severity {critical, highestcriticalimpact, minimal, moderate}]
+                              [--status {closed, open}]
+  examples:
+  - summary: Update support ticket severity.
+    syntax: az support tickets update --ticket-name "TestTicketName" --severity "moderate"
+  - summary: Update support ticket status.
+    syntax: az support tickets update --ticket-name "TestTicketName" --status "closed"
+  - summary: Update support ticket customer contact details properties.
+    syntax: >-
+      az support tickets update --ticket-name "TestTicketName" \
+        --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "phone" \
+        --contact-phone-number "123-456-7890" \
+        --contact-timezone "Pacific Standard Time"
+  - summary: Update support ticket severity, status and customer contact details properties.
+    syntax: >-
+      az support tickets update --ticket-name "TestTicketName" \
+        --status "open" \
+        --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "phone" \
+        --contact-phone-number "123-456-7890" \
+        --contact-timezone "Pacific Standard Time" \
+        --severity "moderate"
+  requiredParameters:
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  optionalParameters:
+  - name: --contact-additional-emails
+    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
+    description: ''
+  - name: --contact-country
+    summary: Country of the user. This is the ISO Alpha-3 code.
+    description: ''
+  - name: --contact-email
+    summary: Primary email address.
+    description: ''
+  - name: --contact-first-name
+    summary: First Name.
+    description: ''
+  - name: --contact-language
+    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
+    description: ''
+  - name: --contact-last-name
+    summary: Last Name.
+    description: ''
+  - name: --contact-method
+    parameterValueGroup: email, phone
+    summary: Preferred contact method.
+    description: ''
+  - name: --contact-phone-number
+    summary: Phone number. This is required if preferred contact method is phone.
+    description: ''
+  - name: --contact-timezone
+    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
+    description: ''
+  - name: --severity
+    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
+    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
+    description: ''
+  - name: --status
+    parameterValueGroup: closed, open
+    summary: Status to be updated on the ticket.
+    description: ''
+commands:
+- az_support_tickets_communications
+- az_support_tickets_communications_create
+- az_support_tickets_communications_list
+- az_support_tickets_communications_show
+- az_support_tickets_create
+- az_support_tickets_list
+- az_support_tickets_show
+- az_support_tickets_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Create and manage Azure support ticket.
diff --git a/2017-03-09-profile/docs-ref-autogen/support/tickets/communications.yml b/2017-03-09-profile/docs-ref-autogen/support/tickets/communications.yml
new file mode 100644
index 0000000000..4a4b82e569
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/support/tickets/communications.yml
@@ -0,0 +1,121 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_tickets_communications
+name: az support tickets communications
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support tickets communications** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage support ticket communications.
+description: ''
+directCommands:
+- uid: az_support_tickets_communications_create
+  name: az support tickets communications create
+  summary: Adds a new customer communication to an Azure support ticket.
+  description: ''
+  syntax: >-
+    az support tickets communications create --communication-body
+                                             --communication-name
+                                             --communication-subject
+                                             --ticket-name
+                                             [--communication-sender]
+  examples:
+  - summary: Add communication to subscription ticket.
+    syntax: >-
+      az support tickets communications create \
+        --ticket-name "TestTicketName" \
+        --communication-name "TestTicketCommunicationName" \
+        --communication-body "TicketCommunicationBody" \
+        --communication-subject "TicketCommunicationSubject"
+  requiredParameters:
+  - isRequired: true
+    name: --communication-body
+    summary: Text of the communication.
+    description: ''
+  - isRequired: true
+    name: --communication-name
+    summary: Communication name.
+    description: ''
+  - isRequired: true
+    name: --communication-subject
+    summary: Subject of the communication.
+    description: ''
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  optionalParameters:
+  - name: --communication-sender
+    summary: Email address of the sender.
+    description: ''
+- uid: az_support_tickets_communications_list
+  name: az support tickets communications list
+  summary: Lists all communications (attachments not included) for a support ticket.
+  description: ''
+  syntax: >-
+    az support tickets communications list --ticket-name
+                                           [--filters]
+  examples:
+  - summary: List communications for a subscription support ticket.
+    syntax: az support tickets communications list --ticket-name "TestTicketName"
+  - summary: List web communications for a subscription support ticket.
+    syntax: >-
+      az support tickets communications list \
+        --ticket-name "TestTicketName" \
+        --filters "communicationType eq 'Web'"
+  - summary: List web communication created on or after a specific date for a subscription support ticket.
+    syntax: >-
+      az support tickets communications list \
+        --ticket-name "TestTicketName" \
+        --filters "CreatedDate ge 2020-01-01 and communicationType eq 'Web'"
+  requiredParameters:
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "CommunicationType" using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator.
+    description: ''
+- uid: az_support_tickets_communications_show
+  name: az support tickets communications show
+  summary: Gets communication details for a support ticket.
+  description: ''
+  syntax: >-
+    az support tickets communications show --communication-name
+                                           --ticket-name
+  examples:
+  - summary: Get communication details for a subscription support ticket.
+    syntax: >-
+      az support tickets communications show \
+        --ticket-name "TestTicketName" \
+        --communication-name "TestTicketCommunicationName"
+  requiredParameters:
+  - isRequired: true
+    name: --communication-name
+    summary: Communication name.
+    description: ''
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+commands:
+- az_support_tickets_communications_create
+- az_support_tickets_communications_list
+- az_support_tickets_communications_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage support ticket communications.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse.yml b/2017-03-09-profile/docs-ref-autogen/synapse.yml
new file mode 100644
index 0000000000..3e9a79d507
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse.yml
@@ -0,0 +1,201 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse
+name: az synapse
+summary: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
+description: ''
+commands:
+- az_synapse_activity-run
+- az_synapse_activity-run_query-by-pipeline-run
+- az_synapse_data-flow
+- az_synapse_data-flow_create
+- az_synapse_data-flow_delete
+- az_synapse_data-flow_list
+- az_synapse_data-flow_set
+- az_synapse_data-flow_show
+- az_synapse_dataset
+- az_synapse_dataset_create
+- az_synapse_dataset_delete
+- az_synapse_dataset_list
+- az_synapse_dataset_set
+- az_synapse_dataset_show
+- az_synapse_integration-runtime
+- az_synapse_integration-runtime_create
+- az_synapse_integration-runtime_delete
+- az_synapse_integration-runtime_get-connection-info
+- az_synapse_integration-runtime_get-monitoring-data
+- az_synapse_integration-runtime_get-status
+- az_synapse_integration-runtime_list
+- az_synapse_integration-runtime_list-auth-key
+- az_synapse_integration-runtime_regenerate-auth-key
+- az_synapse_integration-runtime_show
+- az_synapse_integration-runtime_sync-credentials
+- az_synapse_integration-runtime_update
+- az_synapse_integration-runtime_upgrade
+- az_synapse_integration-runtime_wait
+- az_synapse_integration-runtime-node
+- az_synapse_integration-runtime-node_delete
+- az_synapse_integration-runtime-node_get-ip-address
+- az_synapse_integration-runtime-node_show
+- az_synapse_integration-runtime-node_update
+- az_synapse_linked-service
+- az_synapse_linked-service_create
+- az_synapse_linked-service_delete
+- az_synapse_linked-service_list
+- az_synapse_linked-service_set
+- az_synapse_linked-service_show
+- az_synapse_notebook
+- az_synapse_notebook_create
+- az_synapse_notebook_delete
+- az_synapse_notebook_export
+- az_synapse_notebook_import
+- az_synapse_notebook_list
+- az_synapse_notebook_set
+- az_synapse_notebook_show
+- az_synapse_pipeline
+- az_synapse_pipeline_create
+- az_synapse_pipeline_create-run
+- az_synapse_pipeline_delete
+- az_synapse_pipeline_list
+- az_synapse_pipeline_set
+- az_synapse_pipeline_show
+- az_synapse_pipeline-run
+- az_synapse_pipeline-run_cancel
+- az_synapse_pipeline-run_query-by-workspace
+- az_synapse_pipeline-run_show
+- az_synapse_role
+- az_synapse_role_assignment
+- az_synapse_role_assignment_create
+- az_synapse_role_assignment_delete
+- az_synapse_role_assignment_list
+- az_synapse_role_assignment_show
+- az_synapse_role_definition
+- az_synapse_role_definition_list
+- az_synapse_role_definition_show
+- az_synapse_role_scope
+- az_synapse_role_scope_list
+- az_synapse_spark
+- az_synapse_spark_job
+- az_synapse_spark_job_cancel
+- az_synapse_spark_job_list
+- az_synapse_spark_job_show
+- az_synapse_spark_job_submit
+- az_synapse_spark_pool
+- az_synapse_spark_pool_create
+- az_synapse_spark_pool_delete
+- az_synapse_spark_pool_list
+- az_synapse_spark_pool_show
+- az_synapse_spark_pool_update
+- az_synapse_spark_pool_wait
+- az_synapse_spark_session
+- az_synapse_spark_session_cancel
+- az_synapse_spark_session_create
+- az_synapse_spark_session_list
+- az_synapse_spark_session_reset-timeout
+- az_synapse_spark_session_show
+- az_synapse_spark_statement
+- az_synapse_spark_statement_cancel
+- az_synapse_spark_statement_invoke
+- az_synapse_spark_statement_list
+- az_synapse_spark_statement_show
+- az_synapse_sql
+- az_synapse_sql_ad-admin
+- az_synapse_sql_ad-admin_create
+- az_synapse_sql_ad-admin_delete
+- az_synapse_sql_ad-admin_show
+- az_synapse_sql_ad-admin_update
+- az_synapse_sql_ad-admin_wait
+- az_synapse_sql_audit-policy
+- az_synapse_sql_audit-policy_show
+- az_synapse_sql_audit-policy_update
+- az_synapse_sql_audit-policy_wait
+- az_synapse_sql_pool
+- az_synapse_sql_pool_audit-policy
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+- az_synapse_sql_pool_classification
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+- az_synapse_sql_pool_create
+- az_synapse_sql_pool_delete
+- az_synapse_sql_pool_list
+- az_synapse_sql_pool_list-deleted
+- az_synapse_sql_pool_pause
+- az_synapse_sql_pool_restore
+- az_synapse_sql_pool_resume
+- az_synapse_sql_pool_show
+- az_synapse_sql_pool_show-connection-string
+- az_synapse_sql_pool_tde
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+- az_synapse_sql_pool_threat-policy
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+- az_synapse_sql_pool_update
+- az_synapse_sql_pool_wait
+- az_synapse_trigger
+- az_synapse_trigger_create
+- az_synapse_trigger_delete
+- az_synapse_trigger_get-event-subscription-status
+- az_synapse_trigger_list
+- az_synapse_trigger_set
+- az_synapse_trigger_show
+- az_synapse_trigger_start
+- az_synapse_trigger_stop
+- az_synapse_trigger_subscribe-to-event
+- az_synapse_trigger_unsubscribe-from-event
+- az_synapse_trigger-run
+- az_synapse_trigger-run_query-by-workspace
+- az_synapse_trigger-run_rerun
+- az_synapse_workspace
+- az_synapse_workspace_check-name
+- az_synapse_workspace_create
+- az_synapse_workspace_delete
+- az_synapse_workspace_firewall-rule
+- az_synapse_workspace_firewall-rule_create
+- az_synapse_workspace_firewall-rule_delete
+- az_synapse_workspace_firewall-rule_list
+- az_synapse_workspace_firewall-rule_show
+- az_synapse_workspace_firewall-rule_update
+- az_synapse_workspace_firewall-rule_wait
+- az_synapse_workspace_key
+- az_synapse_workspace_key_create
+- az_synapse_workspace_key_delete
+- az_synapse_workspace_key_list
+- az_synapse_workspace_key_show
+- az_synapse_workspace_key_update
+- az_synapse_workspace_key_wait
+- az_synapse_workspace_list
+- az_synapse_workspace_managed-identity
+- az_synapse_workspace_managed-identity_grant-sql-access
+- az_synapse_workspace_managed-identity_revoke-sql-access
+- az_synapse_workspace_managed-identity_show-sql-access
+- az_synapse_workspace_managed-identity_wait
+- az_synapse_workspace_show
+- az_synapse_workspace_update
+- az_synapse_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/activity-run.yml b/2017-03-09-profile/docs-ref-autogen/synapse/activity-run.yml
new file mode 100644
index 0000000000..ef5614a651
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/activity-run.yml
@@ -0,0 +1,82 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_activity-run
+name: az synapse activity-run
+summary: Synapse activity-run.
+description: ''
+directCommands:
+- uid: az_synapse_activity-run_query-by-pipeline-run
+  name: az synapse activity-run query-by-pipeline-run
+  summary: Query activity runs based on input filter conditions.
+  description: ''
+  syntax: >-
+    az synapse activity-run query-by-pipeline-run --last-updated-after
+                                                  --last-updated-before
+                                                  --name
+                                                  --run-id
+                                                  --workspace-name
+                                                  [--continuation-token]
+                                                  [--filters]
+                                                  [--order-by]
+                                                  [--subscription]
+  examples:
+  - summary: Query activity runs based on input filter conditions.
+    syntax: >-
+      az synapse activity-run query-by-pipeline-run --workspace-name testsynapseworkspace \
+        --last-updated-after "2020-09-03T00:36:44.3345758Z" --last-updated-before "2020-09-03T00:49:48.3686473Z" \
+        --name testpipeline --run-id "53eeed66-ec46-11ea-8bd5-448500a5b1ac"
+  requiredParameters:
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: ''
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_activity-run_query-by-pipeline-run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Synapse activity-run.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/data-flow.yml b/2017-03-09-profile/docs-ref-autogen/synapse/data-flow.yml
new file mode 100644
index 0000000000..5ac043d18e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/data-flow.yml
@@ -0,0 +1,193 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_data-flow
+name: az synapse data-flow
+summary: Manage Synapse's data flows.
+description: ''
+directCommands:
+- uid: az_synapse_data-flow_create
+  name: az synapse data-flow create
+  summary: Create a data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow create --file
+                                --name
+                                --workspace-name
+                                [--no-wait]
+                                [--subscription]
+  examples:
+  - summary: Create a data flow.
+    syntax: >-
+      az synapse data-flow create --workspace-name testsynapseworkspace \
+        --name testdataflow --file @path/dataflow.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_delete
+  name: az synapse data-flow delete
+  summary: Delete a data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow delete --name
+                                --workspace-name
+                                [--no-wait]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a data flow.
+    syntax: >-
+      az synapse data-flow delete --workspace-name testsynapseworkspace \
+        --name testdataflow
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_list
+  name: az synapse data-flow list
+  summary: List data flows.
+  description: ''
+  syntax: >-
+    az synapse data-flow list --workspace-name
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: List data flows.
+    syntax: az synapse data-flow list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_set
+  name: az synapse data-flow set
+  summary: Set an exist data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow set --file
+                             --name
+                             --workspace-name
+                             [--no-wait]
+                             [--subscription]
+  examples:
+  - summary: Set an exist data flow.
+    syntax: >-
+      az synapse data-flow set --workspace-name testsynapseworkspace \
+        --name testdataflow --file @path/dataflow.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_show
+  name: az synapse data-flow show
+  summary: Get a data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow show --name
+                              --workspace-name
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: Get a data flow.
+    syntax: >-
+      az synapse data-flow show --workspace-name testsynapseworkspace \
+        --name testdataflow
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_data-flow_create
+- az_synapse_data-flow_delete
+- az_synapse_data-flow_list
+- az_synapse_data-flow_set
+- az_synapse_data-flow_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's data flows.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/dataset.yml b/2017-03-09-profile/docs-ref-autogen/synapse/dataset.yml
new file mode 100644
index 0000000000..8875207187
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/dataset.yml
@@ -0,0 +1,193 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_dataset
+name: az synapse dataset
+summary: Manage Synapse's datasets.
+description: ''
+directCommands:
+- uid: az_synapse_dataset_create
+  name: az synapse dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset create --file
+                              --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+  examples:
+  - summary: Create a dataset.
+    syntax: >-
+      az synapse dataset create --workspace-name testsynapseworkspace \
+        --name testdataset --file @path/dataset.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_delete
+  name: az synapse dataset delete
+  summary: Delete a dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset delete --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+                              [--yes]
+  examples:
+  - summary: Delete a dataset.
+    syntax: >-
+      az synapse dataset delete --workspace-name testsynapseworkspace \
+        --name testdataset
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_list
+  name: az synapse dataset list
+  summary: List datasets.
+  description: ''
+  syntax: >-
+    az synapse dataset list --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: List datasets.
+    syntax: az synapse dataset list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_set
+  name: az synapse dataset set
+  summary: Set an exist dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset set --file
+                           --name
+                           --workspace-name
+                           [--no-wait]
+                           [--subscription]
+  examples:
+  - summary: Set an exist dataset.
+    syntax: >-
+      az synapse dataset set --workspace-name testsynapseworkspace \
+        --name testdataset --file @path/dataset.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_show
+  name: az synapse dataset show
+  summary: Get a dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset show --name
+                            --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: Get a dataset.
+    syntax: >-
+      az synapse dataset show --workspace-name testsynapseworkspace \
+        --name testdataset
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_dataset_create
+- az_synapse_dataset_delete
+- az_synapse_dataset_list
+- az_synapse_dataset_set
+- az_synapse_dataset_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's datasets.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/integration-runtime-node.yml b/2017-03-09-profile/docs-ref-autogen/synapse/integration-runtime-node.yml
new file mode 100644
index 0000000000..5b257482d4
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/integration-runtime-node.yml
@@ -0,0 +1,201 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_integration-runtime-node
+name: az synapse integration-runtime-node
+summary: Manage Synapse's self-hosted integration runtime nodes.
+description: ''
+directCommands:
+- uid: az_synapse_integration-runtime-node_delete
+  name: az synapse integration-runtime-node delete
+  summary: Remove a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node delete --node-name
+                                               [--ids]
+                                               [--name]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--workspace-name]
+                                               [--yes]
+  examples:
+  - summary: Remove a self-hosted integration runtime node.
+    syntax: >-
+      az synapse integration-runtime-node delete --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode
+  requiredParameters:
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime-node_get-ip-address
+  name: az synapse integration-runtime-node get-ip-address
+  summary: Get self-hosted integration runtime node ip.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node get-ip-address --node-name
+                                                       [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Get self-hosted integration runtime node ip.
+    syntax: >-
+      az synapse integration-runtime-node get-ip-address --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode
+  requiredParameters:
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime-node_show
+  name: az synapse integration-runtime-node show
+  summary: Get self-hosted integration runtime node information.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node show --node-name
+                                             [--ids]
+                                             [--name]
+                                             [--query-examples]
+                                             [--resource-group]
+                                             [--subscription]
+                                             [--workspace-name]
+  examples:
+  - summary: Get self-hosted integration runtime node information.
+    syntax: >-
+      az synapse integration-runtime-node show --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode
+  requiredParameters:
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime-node_update
+  name: az synapse integration-runtime-node update
+  summary: Update self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node update --auto-update {Off, On}
+                                               --node-name
+                                               --update-delay-offset
+                                               [--ids]
+                                               [--name]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--workspace-name]
+  examples:
+  - summary: Update self-hosted integration runtime node.
+    syntax: >-
+      az synapse integration-runtime-node update --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode --auto-update On --update-delay-offset 'PT03H'
+  requiredParameters:
+  - isRequired: true
+    name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enable or disable the self-hosted integration runtime auto-update.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --update-delay-offset
+    summary: The time of the day for the self-hosted integration runtime auto-update.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_integration-runtime-node_delete
+- az_synapse_integration-runtime-node_get-ip-address
+- az_synapse_integration-runtime-node_show
+- az_synapse_integration-runtime-node_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's self-hosted integration runtime nodes.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/integration-runtime.yml b/2017-03-09-profile/docs-ref-autogen/synapse/integration-runtime.yml
new file mode 100644
index 0000000000..b936a8496a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/integration-runtime.yml
@@ -0,0 +1,553 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_integration-runtime
+name: az synapse integration-runtime
+summary: Manage Synapse's integration runtimes.
+description: ''
+directCommands:
+- uid: az_synapse_integration-runtime_create
+  name: az synapse integration-runtime create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime create --name
+                                          --resource-group
+                                          --type {Managed, SelfHosted}
+                                          --workspace-name
+                                          [--compute-type {ComputeOptimized, General, MemoryOptimized}]
+                                          [--core-count]
+                                          [--description]
+                                          [--if-match]
+                                          [--location]
+                                          [--no-wait]
+                                          [--subscription]
+                                          [--time-to-live]
+  examples:
+  - summary: Create an integration runtime.
+    syntax: >-
+      az synapse integration-runtime create --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime --type Managed
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Managed, SelfHosted
+    summary: The integration runtime type.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --compute-type
+    defaultValue: General
+    parameterValueGroup: ComputeOptimized, General, MemoryOptimized
+    summary: Compute type of the data flow cluster which will execute data flow job.
+    description: ''
+  - name: --core-count
+    defaultValue: "8"
+    summary: Core count of the data flow cluster which will execute data flow job.
+    description: ''
+  - name: --description
+    summary: The integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --location -l
+    defaultValue: AutoResolve
+    summary: The integration runtime location.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time-to-live
+    summary: Time to live (in minutes) setting of the data flow cluster which will execute data flow job.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_delete
+  name: az synapse integration-runtime delete
+  summary: Delete an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime delete [--ids]
+                                          [--name]
+                                          [--no-wait]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--workspace-name]
+                                          [--yes]
+  examples:
+  - summary: Delete an integration runtime.
+    syntax: >-
+      az synapse integration-runtime delete --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_get-connection-info
+  name: az synapse integration-runtime get-connection-info
+  summary: Get the integration runtime connection infomation.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime get-connection-info [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Get the integration runtime connection infomation.
+    syntax: >-
+      az synapse integration-runtime get-connection-info --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_get-monitoring-data
+  name: az synapse integration-runtime get-monitoring-data
+  summary: Get metric data for a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime get-monitoring-data [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Get metric data for a self-hosted integration runtime.
+    syntax: >-
+      az synapse integration-runtime get-monitoring-data --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_get-status
+  name: az synapse integration-runtime get-status
+  summary: Gets detailed status information for an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime get-status [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Gets detailed status information for an integration runtime.
+    syntax: >-
+      az synapse integration-runtime get-status --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_list
+  name: az synapse integration-runtime list
+  summary: List integration runtimes.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime list --resource-group
+                                        --workspace-name
+                                        [--query-examples]
+                                        [--subscription]
+  examples:
+  - summary: List integration runtimes.
+    syntax: az synapse integration-runtime list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_list-auth-key
+  name: az synapse integration-runtime list-auth-key
+  summary: Get keys for a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime list-auth-key --name
+                                                 --resource-group
+                                                 --workspace-name
+                                                 [--subscription]
+  examples:
+  - summary: Get keys for a self-hosted integration runtime.
+    syntax: >-
+      az synapse integration-runtime list-auth-key --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_regenerate-auth-key
+  name: az synapse integration-runtime regenerate-auth-key
+  summary: Regenerate self-hosted integration runtime key.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime regenerate-auth-key [--ids]
+                                                       [--key-name {authKey1, authKey2}]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Regenerate self-hosted integration runtime key.
+    syntax: >-
+      az synapse integration-runtime regenerate-auth-key --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --key-name authKey1
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --key-name
+    defaultValue: default
+    parameterValueGroup: authKey1, authKey2
+    summary: The name of the authentication key to regenerate.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_show
+  name: az synapse integration-runtime show
+  summary: Get an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime show [--ids]
+                                        [--if-none-match]
+                                        [--name]
+                                        [--query-examples]
+                                        [--resource-group]
+                                        [--subscription]
+                                        [--workspace-name]
+  examples:
+  - summary: Get an integration runtime.
+    syntax: >-
+      az synapse integration-runtime show --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_sync-credentials
+  name: az synapse integration-runtime sync-credentials
+  summary: Synchronize credentials among integration runtime nodes.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime sync-credentials [--ids]
+                                                    [--name]
+                                                    [--resource-group]
+                                                    [--subscription]
+                                                    [--workspace-name]
+  examples:
+  - summary: Synchronize credentials among integration runtime nodes.
+    syntax: >-
+      az synapse integration-runtime sync-credentials --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_update
+  name: az synapse integration-runtime update
+  summary: Update an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime update --auto-update {Off, On}
+                                          --update-delay-offset
+                                          [--ids]
+                                          [--name]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--workspace-name]
+  examples:
+  - summary: Update an integration runtime.
+    syntax: >-
+      az synapse integration-runtime update --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime --auto-update On --update-delay-offset '"PT03H"'
+  requiredParameters:
+  - isRequired: true
+    name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enable or disable the self-hosted integration runtime auto-update.
+    description: ''
+  - isRequired: true
+    name: --update-delay-offset
+    summary: The time of the day for the self-hosted integration runtime auto-update.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_upgrade
+  name: az synapse integration-runtime upgrade
+  summary: Upgrade self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime upgrade [--ids]
+                                           [--name]
+                                           [--resource-group]
+                                           [--subscription]
+                                           [--workspace-name]
+  examples:
+  - summary: Upgrade self-hosted integration runtime.
+    syntax: >-
+      az synapse integration-runtime upgrade --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_wait
+  name: az synapse integration-runtime wait
+  summary: Place the CLI in a waiting state until a condition of a integration runtime is met.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime wait --name
+                                        --resource-group
+                                        --workspace-name
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--if-none-match]
+                                        [--interval]
+                                        [--subscription]
+                                        [--timeout]
+                                        [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_integration-runtime_create
+- az_synapse_integration-runtime_delete
+- az_synapse_integration-runtime_get-connection-info
+- az_synapse_integration-runtime_get-monitoring-data
+- az_synapse_integration-runtime_get-status
+- az_synapse_integration-runtime_list
+- az_synapse_integration-runtime_list-auth-key
+- az_synapse_integration-runtime_regenerate-auth-key
+- az_synapse_integration-runtime_show
+- az_synapse_integration-runtime_sync-credentials
+- az_synapse_integration-runtime_update
+- az_synapse_integration-runtime_upgrade
+- az_synapse_integration-runtime_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's integration runtimes.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/linked-service.yml b/2017-03-09-profile/docs-ref-autogen/synapse/linked-service.yml
new file mode 100644
index 0000000000..ee30941a8e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/linked-service.yml
@@ -0,0 +1,193 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_linked-service
+name: az synapse linked-service
+summary: Manage Synapse's linked services.
+description: ''
+directCommands:
+- uid: az_synapse_linked-service_create
+  name: az synapse linked-service create
+  summary: Create a linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service create --file
+                                     --name
+                                     --workspace-name
+                                     [--no-wait]
+                                     [--subscription]
+  examples:
+  - summary: Create a linked service.
+    syntax: >-
+      az synapse linked-service create --workspace-name testsynapseworkspace \
+        --name testlinkedservice --file @path/linkedservice.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_delete
+  name: az synapse linked-service delete
+  summary: Delete a linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service delete --name
+                                     --workspace-name
+                                     [--no-wait]
+                                     [--subscription]
+                                     [--yes]
+  examples:
+  - summary: Delete a linked service.
+    syntax: >-
+      az synapse linked-service delete --workspace-name testsynapseworkspace \
+        --name testlinkedservice
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_list
+  name: az synapse linked-service list
+  summary: List linked services.
+  description: ''
+  syntax: >-
+    az synapse linked-service list --workspace-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: List linked services.
+    syntax: az synapse linked-service list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_set
+  name: az synapse linked-service set
+  summary: Set an exist linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service set --file
+                                  --name
+                                  --workspace-name
+                                  [--no-wait]
+                                  [--subscription]
+  examples:
+  - summary: Set an exist linked service.
+    syntax: >-
+      az synapse linked-service set --workspace-name testsynapseworkspace \
+        --name testlinkedservice --file @path/linkedservice.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_show
+  name: az synapse linked-service show
+  summary: Get a linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service show --name
+                                   --workspace-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get a linked service.
+    syntax: >-
+      az synapse linked-service show --workspace-name testsynapseworkspace \
+        --name testlinkedservice
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_linked-service_create
+- az_synapse_linked-service_delete
+- az_synapse_linked-service_list
+- az_synapse_linked-service_set
+- az_synapse_linked-service_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's linked services.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/notebook.yml b/2017-03-09-profile/docs-ref-autogen/synapse/notebook.yml
new file mode 100644
index 0000000000..fb4cb267c1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/notebook.yml
@@ -0,0 +1,311 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_notebook
+name: az synapse notebook
+summary: Manage Synapse's notebooks.
+description: ''
+directCommands:
+- uid: az_synapse_notebook_create
+  name: az synapse notebook create
+  summary: Create a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook create --file
+                               --name
+                               --workspace-name
+                               [--executor-count]
+                               [--executor-size {Large, Medium, Small}]
+                               [--no-wait]
+                               [--spark-pool-name]
+                               [--subscription]
+  examples:
+  - summary: Create a notebook.
+    syntax: >-
+      az synapse notebook create --workspace-name testsynapseworkspace \
+        --name testnotebook --file @path/notebook.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --executor-count
+    defaultValue: "2"
+    summary: Number of executors to be allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --executor-size
+    defaultValue: Small
+    parameterValueGroup: Large, Medium, Small
+    summary: Number of core and memory to be used for executors allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_delete
+  name: az synapse notebook delete
+  summary: Delete a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook delete --name
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+                               [--yes]
+  examples:
+  - summary: Delete a notebook.
+    syntax: >-
+      az synapse notebook delete --workspace-name testsynapseworkspace \
+        --name testnotebook
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_export
+  name: az synapse notebook export
+  summary: Export notebooks.
+  description: ''
+  syntax: >-
+    az synapse notebook export --output-folder
+                               --workspace-name
+                               [--name]
+                               [--subscription]
+  examples:
+  - summary: Export a notebook.
+    syntax: >-
+      az synapse notebook export --workspace-name testsynapseworkspace \
+        --name testnotebook --output-folder C:/output
+  - summary: Export all notebooks under a workspace.
+    syntax: >-
+      az synapse notebook export --workspace-name testsynapseworkspace \
+        --output-folder C:/output
+  requiredParameters:
+  - isRequired: true
+    name: --output-folder
+    summary: The folder where the notebook should be placed.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The notebook name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_import
+  name: az synapse notebook import
+  summary: Import a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook import --file
+                               --name
+                               --workspace-name
+                               [--executor-count]
+                               [--executor-size {Large, Medium, Small}]
+                               [--no-wait]
+                               [--spark-pool-name]
+                               [--subscription]
+  examples:
+  - summary: Import a notebook.
+    syntax: >-
+      az synapse notebook import --workspace-name testsynapseworkspace \
+        --name testnotebook --file @path/notebook.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --executor-count
+    defaultValue: "2"
+    summary: Number of executors to be allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --executor-size
+    defaultValue: Small
+    parameterValueGroup: Large, Medium, Small
+    summary: Number of core and memory to be used for executors allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_list
+  name: az synapse notebook list
+  summary: List notebooks.
+  description: ''
+  syntax: >-
+    az synapse notebook list --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: List notebooks.
+    syntax: az synapse notebook list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_set
+  name: az synapse notebook set
+  summary: Set an exist notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook set --file
+                            --name
+                            --workspace-name
+                            [--executor-count]
+                            [--executor-size {Large, Medium, Small}]
+                            [--no-wait]
+                            [--spark-pool-name]
+                            [--subscription]
+  examples:
+  - summary: Set an exist notebook.
+    syntax: >-
+      az synapse notebook set --workspace-name testsynapseworkspace \
+        --name testnotebook --file @path/notebook.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --executor-count
+    defaultValue: "2"
+    summary: Number of executors to be allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --executor-size
+    defaultValue: Small
+    parameterValueGroup: Large, Medium, Small
+    summary: Number of core and memory to be used for executors allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_show
+  name: az synapse notebook show
+  summary: Get a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook show --name
+                             --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: Get a notebook.
+    syntax: >-
+      az synapse notebook show --workspace-name testsynapseworkspace \
+        --name testnotebook
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_notebook_create
+- az_synapse_notebook_delete
+- az_synapse_notebook_export
+- az_synapse_notebook_import
+- az_synapse_notebook_list
+- az_synapse_notebook_set
+- az_synapse_notebook_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's notebooks.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/pipeline-run.yml b/2017-03-09-profile/docs-ref-autogen/synapse/pipeline-run.yml
new file mode 100644
index 0000000000..2461da7dfc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/pipeline-run.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_pipeline-run
+name: az synapse pipeline-run
+summary: Manage Synapse's pipeline run.
+description: ''
+directCommands:
+- uid: az_synapse_pipeline-run_cancel
+  name: az synapse pipeline-run cancel
+  summary: Cancel a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az synapse pipeline-run cancel --run-id
+                                   --workspace-name
+                                   [--is-recursive {false, true}]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Cancel a pipeline run by its run ID.
+    syntax: >-
+      az synapse pipeline-run cancel --workspace-name testsynapseworkspace \
+        --run-id "16ac5348-ff82-4f95-a80d-638c1d47b721"
+  requiredParameters:
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --is-recursive
+    parameterValueGroup: false, true
+    summary: If true, cancel all the Child pipelines that are triggered by the current pipeline.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline-run_query-by-workspace
+  name: az synapse pipeline-run query-by-workspace
+  summary: Query pipeline runs in the workspace based on input filter conditions.
+  description: ''
+  syntax: >-
+    az synapse pipeline-run query-by-workspace --last-updated-after
+                                               --last-updated-before
+                                               --workspace-name
+                                               [--continuation-token]
+                                               [--filters]
+                                               [--order-by]
+                                               [--subscription]
+  examples:
+  - summary: Query pipeline runs in the workspace based on input filter conditions.
+    syntax: >-
+      az synapse pipeline-run query-by-workspace --workspace-name testsynapseworkspace --filters \
+        operand="PipelineName" operator="Equals" values="testpipeline" --last-updated-after "2020-09-03T00:36:44.3345758Z" \
+        --last-updated-before "2020-09-03T00:49:48.3686473Z"
+  requiredParameters:
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: ''
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline-run_show
+  name: az synapse pipeline-run show
+  summary: Get a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az synapse pipeline-run show --run-id
+                                 --workspace-name
+                                 [--query-examples]
+                                 [--subscription]
+  examples:
+  - summary: Get a pipeline run by its run ID.
+    syntax: >-
+      az synapse pipeline-run show --workspace-name testsynapseworkspace \
+        --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_pipeline-run_cancel
+- az_synapse_pipeline-run_query-by-workspace
+- az_synapse_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's pipeline run.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/pipeline.yml b/2017-03-09-profile/docs-ref-autogen/synapse/pipeline.yml
new file mode 100644
index 0000000000..836b1fe989
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/pipeline.yml
@@ -0,0 +1,238 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_pipeline
+name: az synapse pipeline
+summary: Manage Synapse's pipelines.
+description: ''
+directCommands:
+- uid: az_synapse_pipeline_create
+  name: az synapse pipeline create
+  summary: Create a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline create --file
+                               --name
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+  examples:
+  - summary: Create a pipeline.
+    syntax: >-
+      az synapse pipeline create --workspace-name testsynapseworkspace \
+        --name testpipeline --file @path/pipeline.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_create-run
+  name: az synapse pipeline create-run
+  summary: Creates a run of a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline create-run --name
+                                   --workspace-name
+                                   [--is-recovery {false, true}]
+                                   [--parameters]
+                                   [--reference-pipeline-run-id]
+                                   [--start-activity-name]
+                                   [--subscription]
+  examples:
+  - summary: Pipelines_CreateRun
+    syntax: >-
+      az synapse pipeline create-run --workspace-name testsynapseworkspace --name "myPipeline" \
+        --parameters "{\"OutputBlobNameList\":[\"exampleoutput.csv\"]}"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --is-recovery
+    parameterValueGroup: false, true
+    summary: Recovery mode flag. If recovery mode is set to true, the specified referenced pipeline run and the new run will be grouped under the same groupId.
+    description: ''
+  - name: --parameters
+    summary: Parameters for pipeline run. Can be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - name: --reference-pipeline-run-id --run-id
+    summary: The pipeline run ID for rerun. If run ID is specified, the parameters of the specified run will be used to create a new run.
+    description: ''
+  - name: --start-activity-name
+    summary: In recovery mode, the rerun will start from this activity. If not specified, all activities will run.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_delete
+  name: az synapse pipeline delete
+  summary: Delete a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline delete --name
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+                               [--yes]
+  examples:
+  - summary: Delete a pipeline.
+    syntax: >-
+      az synapse pipeline delete --workspace-name testsynapseworkspace \
+        --name testpipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_list
+  name: az synapse pipeline list
+  summary: List pipelines.
+  description: ''
+  syntax: >-
+    az synapse pipeline list --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: List pipelines.
+    syntax: az synapse pipeline list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_set
+  name: az synapse pipeline set
+  summary: Set an exist pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline set --file
+                            --name
+                            --workspace-name
+                            [--no-wait]
+                            [--subscription]
+  examples:
+  - summary: Set an exist pipeline.
+    syntax: >-
+      az synapse pipeline set --workspace-name testsynapseworkspace \
+        --name testpipeline --file @path/pipeline.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_show
+  name: az synapse pipeline show
+  summary: Get a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline show --name
+                             --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: Get a pipeline.
+    syntax: >-
+      az synapse pipeline show --workspace-name testsynapseworkspace \
+        --name testpipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_pipeline_create
+- az_synapse_pipeline_create-run
+- az_synapse_pipeline_delete
+- az_synapse_pipeline_list
+- az_synapse_pipeline_set
+- az_synapse_pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's pipelines.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/role.yml b/2017-03-09-profile/docs-ref-autogen/synapse/role.yml
new file mode 100644
index 0000000000..ab18fe4176
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/role.yml
@@ -0,0 +1,35 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role
+name: az synapse role
+summary: Manage Synapse's role assignments and definitions.
+description: ''
+commands:
+- az_synapse_role_assignment
+- az_synapse_role_assignment_create
+- az_synapse_role_assignment_delete
+- az_synapse_role_assignment_list
+- az_synapse_role_assignment_show
+- az_synapse_role_definition
+- az_synapse_role_definition_list
+- az_synapse_role_definition_show
+- az_synapse_role_scope
+- az_synapse_role_scope_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role assignments and definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/role/assignment.yml b/2017-03-09-profile/docs-ref-autogen/synapse/role/assignment.yml
new file mode 100644
index 0000000000..53d99fd7b5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/role/assignment.yml
@@ -0,0 +1,302 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role_assignment
+name: az synapse role assignment
+summary: Manage Synapse's role assignments.
+description: ''
+directCommands:
+- uid: az_synapse_role_assignment_create
+  name: az synapse role assignment create
+  summary: Create a role assignment.
+  description: ''
+  syntax: >-
+    az synapse role assignment create --role
+                                      --workspace-name
+                                      [--assignee]
+                                      [--assignee-object-id]
+                                      [--assignee-principal-type {Group, ServicePrincipal, User}]
+                                      [--assignment-id]
+                                      [--item]
+                                      [--item-type {bigDataPools, credentials, integrationRuntimes, linkedServices}]
+                                      [--scope]
+                                      [--subscription]
+  examples:
+  - summary: Create a role assignment using service principal name.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee sp_name
+  - summary: Create a role assignment using user principal name.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee username@contoso.com
+  - summary: Create a role assignment using objectId of the User, Group or Service Principal.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee 00000000-0000-0000-0000-000000000000
+  - summary: Create a role assignment at scope.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --scope "workspaces/{workspaceName}" --role "Synapse Administrator" --assignee username@contoso.com
+  - summary: Create a role assignment at scope that combination of item type and item name.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --item-type "bigDataPools" --item "bigDataPoolName" --role "Synapse Administrator" \
+
+      --assignee username@contoso.com
+  requiredParameters:
+  - isRequired: true
+    name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user or service principal. Supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --assignee-object-id
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
+    description: ''
+  - name: --assignee-principal-type --assignee-type
+    parameterValueGroup: Group, ServicePrincipal, User
+    summary: Use with --assignee-object-id to avoid errors caused by propagation latency in AAD Graph.
+    description: ''
+  - name: --assignment-id
+    summary: Custom role assignment id in guid format, if not specified, assignment id will be randomly generated.
+    description: ''
+  - name: --item
+    summary: Item granted access in the workspace. Using with --item-type to combine the scope of assignment.
+    description: ''
+  - name: --item-type
+    parameterValueGroup: bigDataPools, credentials, integrationRuntimes, linkedServices
+    summary: Item type granted access in the workspace. Using with --item to combine the scope of assignment.
+    description: ''
+  - name: --scope
+    summary: A scope defines the resources or artifacts that the access applies to. Synapse supports hierarchical scopes. Permissions granted at a higher-level scope are inherited by objects at a lower level. In Synapse RBAC, the top-level scope is a workspace. Assigning a role with workspace scope grants permissions to all applicable objects in the workspace.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_assignment_delete
+  name: az synapse role assignment delete
+  summary: Delete role assignments of workspace.
+  description: ''
+  syntax: >-
+    az synapse role assignment delete --workspace-name
+                                      [--assignee]
+                                      [--assignee-object-id]
+                                      [--ids]
+                                      [--item]
+                                      [--item-type {bigDataPools, credentials, integrationRuntimes, linkedServices}]
+                                      [--role]
+                                      [--scope]
+                                      [--subscription]
+                                      [--yes]
+  examples:
+  - summary: Delete role assignments by role and assignee.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee sp_name
+  - summary: Delete role assignments by role id/name.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator"
+  - summary: Delete role assignments by service principal name.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --assignee sp_name
+  - summary: Delete role assignments by user principal name.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --assignee username@contoso.com
+  - summary: Delete role assignments by objectId of the User, Group or Service Principal.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --assignee 00000000-0000-0000-0000-000000000001
+  - summary: Delete role assignments by ids.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --ids 10000000-0000-0000-0000-10000000-10000000-0000-0000-0000-10000000
+  - summary: Delete role assignments by scope.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --scope "workspaces/testsynapseworkspace/linkedServices/testlinkedServices"
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user or service principal. Supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --assignee-object-id
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
+    description: ''
+  - name: --ids
+    summary: Space-separated role assignment ids. You should not provide --role or --assignee when --ids is provided.
+    description: ''
+  - name: --item
+    summary: Item granted access in the workspace. Using with --item-type to combine the scope of assignment.Using az role assignment with filter condition before executing delete operation to be clearly aware of which assignments will be deleted.
+    description: ''
+  - name: --item-type
+    parameterValueGroup: bigDataPools, credentials, integrationRuntimes, linkedServices
+    summary: Item type granted access in the workspace. Using with --item to combine the scope of assignment.Using az role assignment with filter condition before executing delete operation to be clearly aware of which assignments will be deleted.
+    description: ''
+  - name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - name: --scope
+    summary: A scope defines the resources or artifacts that the access applies to. Synapse supports hierarchical scopes. Permissions granted at a higher-level scope are inherited by objects at a lower level. In Synapse RBAC, the top-level scope is a workspace. Using az role assignment with filter condition before executing delete operation to be clearly aware of which assignments will be deleted.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_assignment_list
+  name: az synapse role assignment list
+  summary: List role assignments.
+  description: ''
+  syntax: >-
+    az synapse role assignment list --workspace-name
+                                    [--assignee]
+                                    [--assignee-object-id]
+                                    [--item]
+                                    [--item-type {bigDataPools, credentials, integrationRuntimes, linkedServices}]
+                                    [--query-examples]
+                                    [--role]
+                                    [--scope]
+                                    [--subscription]
+  examples:
+  - summary: List role assignments.
+    syntax: az synapse role assignment list --workspace-name testsynapseworkspace
+  - summary: List role assignments by role id/name.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --role "Synapse Apache Spark Administrator"
+  - summary: List role assignments by assignee.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --assignee sp_name
+  - summary: List role assignments by objectId of the User, Group or Service Principal.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --assignee-object-id 00000000-0000-0000-0000-000000000000
+  - summary: List role assignments by scope.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --scope "workspaces/{workspaceName}"
+  - summary: List role assignments by item type and item name.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --item-type "bigDataPools" --item "bigDataPoolName"
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user or service principal. Supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --assignee-object-id
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
+    description: ''
+  - name: --item
+    summary: Item granted access in the workspace. Using with --item-type to combine the scope of assignment.
+    description: ''
+  - name: --item-type
+    parameterValueGroup: bigDataPools, credentials, integrationRuntimes, linkedServices
+    summary: Item type granted access in the workspace. Using with --item to combine the scope of assignment.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - name: --scope
+    summary: A scope defines the resources or artifacts that the access applies to. Synapse supports hierarchical scopes. Permissions granted at a higher-level scope are inherited by objects at a lower level. In Synapse RBAC, the top-level scope is a workspace. Assigning a role with workspace scope grants permissions to all applicable objects in the workspace.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_assignment_show
+  name: az synapse role assignment show
+  summary: Get a role assignment by id.
+  description: ''
+  syntax: >-
+    az synapse role assignment show --id
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get a role assignment by id.
+    syntax: >-
+      az synapse role assignment show --workspace-name testsynapseworkspace \
+
+      --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the role that is assigned to the principal.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_role_assignment_create
+- az_synapse_role_assignment_delete
+- az_synapse_role_assignment_list
+- az_synapse_role_assignment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role assignments.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/role/definition.yml b/2017-03-09-profile/docs-ref-autogen/synapse/role/definition.yml
new file mode 100644
index 0000000000..c8b2d1b556
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/role/definition.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role_definition
+name: az synapse role definition
+summary: Manage Synapse's role definitions.
+description: ''
+directCommands:
+- uid: az_synapse_role_definition_list
+  name: az synapse role definition list
+  summary: List role definitions.
+  description: ''
+  syntax: >-
+    az synapse role definition list --workspace-name
+                                    [--is-built-in {false, true}]
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: List role definitions.
+    syntax: az synapse role definition list --workspace-name testsynapseworkspace
+  - summary: List role definitions built-in by Synapse.
+    syntax: az synapse role definition list --workspace-name testsynapseworkspace --is-built-in True
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --is-built-in
+    parameterValueGroup: false, true
+    summary: Is a Synapse Built-In Role or not.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_definition_show
+  name: az synapse role definition show
+  summary: Get role definition by role id/name.
+  description: ''
+  syntax: >-
+    az synapse role definition show --role
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get role definition by role id.
+    syntax: >-
+      az synapse role definition show --workspace-name testsynapseworkspace \
+
+      --role 00000000-0000-0000-0000-000000000000
+  - summary: Get role definition by role name.
+    syntax: >-
+      az synapse role definition show --workspace-name testsynapseworkspace \
+
+      --role "Synapse SQL Administrator"
+  requiredParameters:
+  - isRequired: true
+    name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_role_definition_list
+- az_synapse_role_definition_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role definitions.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/role/scope.yml b/2017-03-09-profile/docs-ref-autogen/synapse/role/scope.yml
new file mode 100644
index 0000000000..494b144be9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/role/scope.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role_scope
+name: az synapse role scope
+summary: Manage Synapse's role scopes.
+description: ''
+directCommands:
+- uid: az_synapse_role_scope_list
+  name: az synapse role scope list
+  summary: List role scopes.
+  description: ''
+  syntax: >-
+    az synapse role scope list --workspace-name
+                               [--query-examples]
+                               [--subscription]
+  examples:
+  - summary: List role scopes.
+    syntax: az synapse role scope list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_role_scope_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role scopes.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/spark.yml b/2017-03-09-profile/docs-ref-autogen/synapse/spark.yml
new file mode 100644
index 0000000000..5a94807d16
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/spark.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark
+name: az synapse spark
+summary: Manage Spark pools and Spark jobs.
+description: ''
+commands:
+- az_synapse_spark_job
+- az_synapse_spark_job_cancel
+- az_synapse_spark_job_list
+- az_synapse_spark_job_show
+- az_synapse_spark_job_submit
+- az_synapse_spark_pool
+- az_synapse_spark_pool_create
+- az_synapse_spark_pool_delete
+- az_synapse_spark_pool_list
+- az_synapse_spark_pool_show
+- az_synapse_spark_pool_update
+- az_synapse_spark_pool_wait
+- az_synapse_spark_session
+- az_synapse_spark_session_cancel
+- az_synapse_spark_session_create
+- az_synapse_spark_session_list
+- az_synapse_spark_session_reset-timeout
+- az_synapse_spark_session_show
+- az_synapse_spark_statement
+- az_synapse_spark_statement_cancel
+- az_synapse_spark_statement_invoke
+- az_synapse_spark_statement_list
+- az_synapse_spark_statement_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Spark pools and Spark jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/spark/job.yml b/2017-03-09-profile/docs-ref-autogen/synapse/spark/job.yml
new file mode 100644
index 0000000000..dd865497ec
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/spark/job.yml
@@ -0,0 +1,225 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_job
+name: az synapse spark job
+summary: Manage Synapse Spark batch jobs.
+description: ''
+directCommands:
+- uid: az_synapse_spark_job_cancel
+  name: az synapse spark job cancel
+  summary: Cancel a Spark job.
+  description: ''
+  syntax: >-
+    az synapse spark job cancel --livy-id
+                                --spark-pool-name
+                                --workspace-name
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Cancel a Spark job.
+    syntax: az synapse spark job cancel --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_job_list
+  name: az synapse spark job list
+  summary: List all Spark jobs.
+  description: ''
+  syntax: >-
+    az synapse spark job list --spark-pool-name
+                              --workspace-name
+                              [--from-index]
+                              [--query-examples]
+                              [--size]
+                              [--subscription]
+  examples:
+  - summary: List all Spark jobs.
+    syntax: az synapse spark job list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --from-index
+    summary: Optional parameter specifying which index the list should begin from.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --size
+    summary: The size of the returned list.By default it is 20 and that is the maximum.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_job_show
+  name: az synapse spark job show
+  summary: Get a Spark job.
+  description: ''
+  syntax: >-
+    az synapse spark job show --livy-id
+                              --spark-pool-name
+                              --workspace-name
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: Get a Spark job.
+    syntax: az synapse spark job show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_job_submit
+  name: az synapse spark job submit
+  summary: Submit a Spark job.
+  description: ''
+  syntax: >-
+    az synapse spark job submit --executor-size {Large, Medium, Small}
+                                --executors
+                                --main-class-name
+                                --main-definition-file
+                                --name
+                                --spark-pool-name
+                                --workspace-name
+                                [--archives]
+                                [--arguments]
+                                [--configuration]
+                                [--language {CSharp, PySpark, Python, Scala, Spark, SparkDotNet}]
+                                [--reference-files]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Submit a Java Spark job.
+    syntax: >-
+      az synapse spark job submit --name WordCount_Java --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool \
+
+      --main-definition-file abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/wordcount.jar \
+
+      --main-class-name WordCount \
+
+      --arguments abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/shakespeare.txt \
+
+      abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/result/ \
+
+      --executors 2 --executor-size Small
+  requiredParameters:
+  - isRequired: true
+    name: --executor-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The executor size.
+    description: ''
+  - isRequired: true
+    name: --executors
+    summary: The number of executors.
+    description: ''
+  - isRequired: true
+    name: --main-class-name
+    summary: The fully-qualified identifier or the main class that is in the main definition file.
+    description: ''
+  - isRequired: true
+    name: --main-definition-file
+    summary: The main file used for the job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The Spark job name.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --archives
+    summary: The array of archives.
+    description: ''
+  - name: --arguments
+    summary: 'Optional arguments to the job (Note: please use storage URIs for file arguments).'
+    description: ''
+  - name: --configuration
+    summary: The configuration of Spark job.
+    description: ''
+  - name: --language
+    defaultValue: Scala
+    parameterValueGroup: CSharp, PySpark, Python, Scala, Spark, SparkDotNet
+    summary: The Spark job language.
+    description: ''
+  - name: --reference-files
+    summary: Additional files used for reference in the main definition file.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_job_cancel
+- az_synapse_spark_job_list
+- az_synapse_spark_job_show
+- az_synapse_spark_job_submit
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse Spark batch jobs.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/spark/pool.yml b/2017-03-09-profile/docs-ref-autogen/synapse/spark/pool.yml
new file mode 100644
index 0000000000..3ebc2047cb
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/spark/pool.yml
@@ -0,0 +1,376 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_pool
+name: az synapse spark pool
+summary: Manage Spark pools.
+description: ''
+directCommands:
+- uid: az_synapse_spark_pool_create
+  name: az synapse spark pool create
+  summary: Create a Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool create --name
+                                 --node-count
+                                 --node-size {Large, Medium, Small}
+                                 --resource-group
+                                 --spark-version
+                                 --workspace-name
+                                 [--delay]
+                                 [--enable-auto-pause {false, true}]
+                                 [--enable-auto-scale {false, true}]
+                                 [--library-requirements]
+                                 [--max-node-count]
+                                 [--min-node-count]
+                                 [--no-wait]
+                                 [--node-size-family]
+                                 [--spark-events-folder]
+                                 [--spark-log-folder]
+                                 [--subscription]
+                                 [--tags]
+  examples:
+  - summary: Create a Spark pool.
+    syntax: >-
+      az synapse spark pool create --name testpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --spark-version 2.4 --node-count 3 --node-size Medium
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --node-count
+    summary: The number of node.
+    description: ''
+  - isRequired: true
+    name: --node-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The node size.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --spark-version
+    summary: The supported Spark version is 2.4 now.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --delay
+    summary: The delay time whose unit is minute.
+    description: ''
+  - name: --enable-auto-pause
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto pause.
+    description: ''
+  - name: --enable-auto-scale
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto scale.
+    description: ''
+  - name: --library-requirements
+    summary: The library requirements file.
+    description: ''
+  - name: --max-node-count
+    summary: The max node count.
+    description: ''
+  - name: --min-node-count
+    summary: The min node count.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-size-family
+    defaultValue: MemoryOptimized
+    summary: The node size family.
+    description: ''
+  - name: --spark-events-folder
+    defaultValue: /events
+    summary: The Spark events folder.
+    description: ''
+  - name: --spark-log-folder
+    defaultValue: /logs
+    summary: The default Spark log folder.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_delete
+  name: az synapse spark pool delete
+  summary: Delete a Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool delete [--ids]
+                                 [--name]
+                                 [--no-wait]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--workspace-name]
+                                 [--yes]
+  examples:
+  - summary: Delete a Spark pool.
+    syntax: az synapse spark pool delete --name testpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_list
+  name: az synapse spark pool list
+  summary: List all Spark pools.
+  description: ''
+  syntax: >-
+    az synapse spark pool list --resource-group
+                               --workspace-name
+                               [--query-examples]
+                               [--subscription]
+  examples:
+  - summary: List all Spark pools.
+    syntax: az synapse spark pool list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_show
+  name: az synapse spark pool show
+  summary: Get a Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool show [--ids]
+                               [--name]
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
+                               [--workspace-name]
+  examples:
+  - summary: Get a Spark pool.
+    syntax: az synapse spark pool show --name testpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_update
+  name: az synapse spark pool update
+  summary: Update the Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool update [--delay]
+                                 [--enable-auto-pause {false, true}]
+                                 [--enable-auto-scale {false, true}]
+                                 [--force {false, true}]
+                                 [--ids]
+                                 [--library-requirements]
+                                 [--max-node-count]
+                                 [--min-node-count]
+                                 [--name]
+                                 [--no-wait]
+                                 [--node-count]
+                                 [--node-size {Large, Medium, Small}]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--tags]
+                                 [--workspace-name]
+  examples:
+  - summary: Update the Spark pool's tags.
+    syntax: >-
+      az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --tags key1=value1
+  - summary: Update the Spark pool's auto scale configuration.
+    syntax: >-
+      az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --enable-auto-scale --min-node-count 3 --max-node-count 100
+  optionalParameters:
+  - name: --delay
+    summary: The delay time whose unit is minute.
+    description: ''
+  - name: --enable-auto-pause
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto pause.
+    description: ''
+  - name: --enable-auto-scale
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto scale.
+    description: ''
+  - name: --force
+    parameterValueGroup: false, true
+    summary: The flag of force operation.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --library-requirements
+    summary: The library requirements file.
+    description: ''
+  - name: --max-node-count
+    summary: The max node count.
+    description: ''
+  - name: --min-node-count
+    summary: The min node count.
+    description: ''
+  - name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count
+    summary: The number of node.
+    description: ''
+  - name: --node-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The node size.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_wait
+  name: az synapse spark pool wait
+  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
+  description: ''
+  syntax: >-
+    az synapse spark pool wait --big-data-pool-name
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--ids]
+                               [--interval]
+                               [--resource-group]
+                               [--subscription]
+                               [--timeout]
+                               [--updated]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --big-data-pool-name
+    summary: Big Data pool name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_pool_create
+- az_synapse_spark_pool_delete
+- az_synapse_spark_pool_list
+- az_synapse_spark_pool_show
+- az_synapse_spark_pool_update
+- az_synapse_spark_pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Spark pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/spark/session.yml b/2017-03-09-profile/docs-ref-autogen/synapse/spark/session.yml
new file mode 100644
index 0000000000..6aeda8fc79
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/spark/session.yml
@@ -0,0 +1,222 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_session
+name: az synapse spark session
+summary: Manage Synapse Spark sessions.
+description: ''
+directCommands:
+- uid: az_synapse_spark_session_cancel
+  name: az synapse spark session cancel
+  summary: Cancel a Spark session.
+  description: ''
+  syntax: >-
+    az synapse spark session cancel --livy-id
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--subscription]
+                                    [--yes]
+  examples:
+  - summary: Cancel a Spark session.
+    syntax: az synapse spark session cancel  --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark session job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_create
+  name: az synapse spark session create
+  summary: Create a Spark session.
+  description: ''
+  syntax: >-
+    az synapse spark session create --executor-size {Large, Medium, Small}
+                                    --executors
+                                    --name
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--configuration]
+                                    [--reference-files]
+                                    [--subscription]
+                                    [--tags]
+  examples:
+  - summary: Create a Spark session.
+    syntax: >-
+      az synapse spark session create --name testsession  --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool --executor-size Small --executors 4
+  requiredParameters:
+  - isRequired: true
+    name: --executor-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The executor size.
+    description: ''
+  - isRequired: true
+    name: --executors
+    summary: The number of executors.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The Spark session name.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --configuration
+    summary: The configuration of Spark session.
+    description: ''
+  - name: --reference-files
+    summary: Additional files used for reference in the main definition file.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_list
+  name: az synapse spark session list
+  summary: List all Spark sessions.
+  description: ''
+  syntax: >-
+    az synapse spark session list --spark-pool-name
+                                  --workspace-name
+                                  [--from-index]
+                                  [--query-examples]
+                                  [--size]
+                                  [--subscription]
+  examples:
+  - summary: List all Spark sessions.
+    syntax: az synapse spark session list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --from-index
+    summary: Optional parameter specifying which index the list should begin from.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --size
+    summary: The size of the returned list.By default it is 20 and that is the maximum.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_reset-timeout
+  name: az synapse spark session reset-timeout
+  summary: Reset a Spark session timeout time.
+  description: ''
+  syntax: >-
+    az synapse spark session reset-timeout --livy-id
+                                           --spark-pool-name
+                                           --workspace-name
+                                           [--subscription]
+  examples:
+  - summary: Reset a Spark session's timeout time.
+    syntax: az synapse spark session reset-timeout --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark session job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_show
+  name: az synapse spark session show
+  summary: Get a Spark session.
+  description: ''
+  syntax: >-
+    az synapse spark session show --livy-id
+                                  --spark-pool-name
+                                  --workspace-name
+                                  [--query-examples]
+                                  [--subscription]
+  examples:
+  - summary: Get a Spark session.
+    syntax: az synapse spark session show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark session job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_session_cancel
+- az_synapse_spark_session_create
+- az_synapse_spark_session_list
+- az_synapse_spark_session_reset-timeout
+- az_synapse_spark_session_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse Spark sessions.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/spark/statement.yml b/2017-03-09-profile/docs-ref-autogen/synapse/spark/statement.yml
new file mode 100644
index 0000000000..95cedd02cf
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/spark/statement.yml
@@ -0,0 +1,200 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_statement
+name: az synapse spark statement
+summary: Manage Synapse Spark statements.
+description: ''
+directCommands:
+- uid: az_synapse_spark_statement_cancel
+  name: az synapse spark statement cancel
+  summary: Cancel a Spark statement.
+  description: ''
+  syntax: >-
+    az synapse spark statement cancel --livy-id
+                                      --session-id
+                                      --spark-pool-name
+                                      --workspace-name
+                                      [--subscription]
+                                      [--yes]
+  examples:
+  - summary: Cancel a Spark statement.
+    syntax: >-
+      az synapse spark statement cancel --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the statement.
+    description: ''
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_statement_invoke
+  name: az synapse spark statement invoke
+  summary: Invoke a Spark statement.
+  description: ''
+  syntax: >-
+    az synapse spark statement invoke --code
+                                      --language {CSharp, PySpark, Python, SQL, Scala, Spark, SparkDotNet}
+                                      --session-id
+                                      --spark-pool-name
+                                      --workspace-name
+                                      [--subscription]
+  examples:
+  - summary: Invoke a Spark statement.
+    syntax: >-
+      az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool --code "print('hello, Azure CLI')" --language pyspark
+  - summary: Submit a Spark statement by reading code content from file.
+    syntax: >-
+      az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool --code @file-path --language pyspark
+  requiredParameters:
+  - isRequired: true
+    name: --code
+    summary: The code of Spark statement. This is either the code contents or use `@<file path>` to load the content from a file.
+    description: ''
+  - isRequired: true
+    name: --language
+    parameterValueGroup: CSharp, PySpark, Python, SQL, Scala, Spark, SparkDotNet
+    summary: The language of Spark statement.
+    description: ''
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_statement_list
+  name: az synapse spark statement list
+  summary: List all Spark statements.
+  description: ''
+  syntax: >-
+    az synapse spark statement list --session-id
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: List all Spark statements.
+    syntax: >-
+      az synapse spark statement list --session-id 11 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_statement_show
+  name: az synapse spark statement show
+  summary: Get a Spark statement.
+  description: ''
+  syntax: >-
+    az synapse spark statement show --livy-id
+                                    --session-id
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get a Spark statement.
+    syntax: >-
+      az synapse spark statement show --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the statement.
+    description: ''
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_statement_cancel
+- az_synapse_spark_statement_invoke
+- az_synapse_spark_statement_list
+- az_synapse_spark_statement_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse Spark statements.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql.yml
new file mode 100644
index 0000000000..dc83a3cd70
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql
+name: az synapse sql
+summary: Manage SQL pools.
+description: ''
+commands:
+- az_synapse_sql_ad-admin
+- az_synapse_sql_ad-admin_create
+- az_synapse_sql_ad-admin_delete
+- az_synapse_sql_ad-admin_show
+- az_synapse_sql_ad-admin_update
+- az_synapse_sql_ad-admin_wait
+- az_synapse_sql_audit-policy
+- az_synapse_sql_audit-policy_show
+- az_synapse_sql_audit-policy_update
+- az_synapse_sql_audit-policy_wait
+- az_synapse_sql_pool
+- az_synapse_sql_pool_audit-policy
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+- az_synapse_sql_pool_classification
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+- az_synapse_sql_pool_create
+- az_synapse_sql_pool_delete
+- az_synapse_sql_pool_list
+- az_synapse_sql_pool_list-deleted
+- az_synapse_sql_pool_pause
+- az_synapse_sql_pool_restore
+- az_synapse_sql_pool_resume
+- az_synapse_sql_pool_show
+- az_synapse_sql_pool_show-connection-string
+- az_synapse_sql_pool_tde
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+- az_synapse_sql_pool_threat-policy
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+- az_synapse_sql_pool_update
+- az_synapse_sql_pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/ad-admin.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/ad-admin.yml
new file mode 100644
index 0000000000..3b0c7879d3
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/ad-admin.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_ad-admin
+name: az synapse sql ad-admin
+summary: Manage SQL Active Directory administrator.
+description: ''
+directCommands:
+- uid: az_synapse_sql_ad-admin_create
+  name: az synapse sql ad-admin create
+  summary: Create the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin create --display-name
+                                   --object-id
+                                   --resource-group
+                                   --workspace-name
+                                   [--no-wait]
+                                   [--subscription]
+  examples:
+  - summary: Create the SQL Azure Active admin.
+    syntax: >-
+      az synapse sql ad-admin create --workspace-name testsynapseworkspace --resource-group rg \
+
+      --display-name youraccount@yourdomain --object-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --display-name -u
+    summary: Display name of the Azure AD administrator user or group.
+    description: ''
+  - isRequired: true
+    name: --object-id -i
+    summary: The unique ID of the Azure AD administrator.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_delete
+  name: az synapse sql ad-admin delete
+  summary: Delete the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin delete --resource-group
+                                   --workspace-name
+                                   [--no-wait]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Delete the SQL Azure Active admin.
+    syntax: az synapse sql ad-admin delete --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_show
+  name: az synapse sql ad-admin show
+  summary: Get the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin show --resource-group
+                                 --workspace-name
+                                 [--query-examples]
+                                 [--subscription]
+  examples:
+  - summary: Get the SQL Azure Active admin.
+    syntax: az synapse sql ad-admin show --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_update
+  name: az synapse sql ad-admin update
+  summary: Update the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin update --resource-group
+                                   --workspace-name
+                                   [--add]
+                                   [--display-name]
+                                   [--force-string]
+                                   [--no-wait]
+                                   [--object-id]
+                                   [--remove]
+                                   [--set]
+                                   [--subscription]
+  examples:
+  - summary: Update the SQL Azure Active admin.
+    syntax: >-
+      az synapse sql ad-admin update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --display-name youraccount@yourdomain --object-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --display-name -u
+    summary: Display name of the Azure AD administrator user or group.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --object-id -i
+    summary: The unique ID of the Azure AD administrator.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_wait
+  name: az synapse sql ad-admin wait
+  summary: Place the CLI in a waiting state until a condition is met.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin wait --resource-group
+                                 --workspace-name
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_ad-admin_create
+- az_synapse_sql_ad-admin_delete
+- az_synapse_sql_ad-admin_show
+- az_synapse_sql_ad-admin_update
+- az_synapse_sql_ad-admin_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL Active Directory administrator.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/audit-policy.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/audit-policy.yml
new file mode 100644
index 0000000000..6933de228b
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/audit-policy.yml
@@ -0,0 +1,237 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_audit-policy
+name: az synapse sql audit-policy
+summary: Manage SQL auditing policy.
+description: ''
+directCommands:
+- uid: az_synapse_sql_audit-policy_show
+  name: az synapse sql audit-policy show
+  summary: Get a SQL's auditing policy.
+  description: ''
+  syntax: >-
+    az synapse sql audit-policy show --blob-auditing-policy-name
+                                     --resource-group
+                                     --workspace-name
+                                     [--query-examples]
+                                     [--subscription]
+  examples:
+  - summary: Get a SQL's auditing policy.
+    syntax: >-
+      az synapse sql audit-policy show --workspace-name testsynapseworkspace --resource-group rg \
+
+      --blob-auditing-policy-name bapolicyname
+  requiredParameters:
+  - isRequired: true
+    name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_audit-policy_update
+  name: az synapse sql audit-policy update
+  summary: Update a SQL's auditing policy.
+  description: If the policy is being enabled, `--storage-account` or both `--storage-endpoint` and `--storage-key` must be specified.
+  syntax: >-
+    az synapse sql audit-policy update --resource-group
+                                       --workspace-name
+                                       [--actions]
+                                       [--add]
+                                       [--blob-auditing-policy-name]
+                                       [--enable-azure-monitor {false, true}]
+                                       [--force-string]
+                                       [--no-wait]
+                                       [--queue-delay-milliseconds]
+                                       [--remove]
+                                       [--retention-days]
+                                       [--set]
+                                       [--state {Disabled, Enabled}]
+                                       [--storage-account]
+                                       [--storage-endpoint]
+                                       [--storage-key]
+                                       [--storage-subscription]
+                                       [--subscription]
+                                       [--use-secondary-key {false, true}]
+  examples:
+  - summary: Enable by storage account name.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-account mystorageaccount --blob-auditing-policy-name bapolicyname
+  - summary: Enable by storage endpoint and key.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-endpoint https://mystorage.blob.core.windows.net --storage-key MYKEY== \
+
+      --blob-auditing-policy-name bapolicyname
+  - summary: Set the list of audit actions.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --actions FAILED_DATABASE_AUTHENTICATION_GROUP 'UPDATE on database::mydb by public' \
+
+      --blob-auditing-policy-name bapolicyname
+  - summary: Disable an auditing policy.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Disabled --blob-auditing-policy-name bapolicyname
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --actions
+    summary: List of actions and action groups to audit.
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - name: --enable-azure-monitor
+    parameterValueGroup: false, true
+    summary: Whether enabling azure monitor target or not.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --queue-delay-milliseconds --queue-delay-time
+    summary: The amount of time in milliseconds that can elapse before audit actions are forced to be processed.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --retention-days
+    summary: The number of days to retain audit logs.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    parameterValueGroup: Disabled, Enabled
+    summary: Auditing policy state.
+    description: ''
+  - name: --storage-account
+    summary: Name of the storage account.
+    description: ''
+  - name: --storage-endpoint
+    summary: The storage account endpoint.
+    description: ''
+  - name: --storage-key
+    summary: Access key for the storage account.
+    description: ''
+  - name: --storage-subscription
+    summary: The subscription id of storage account.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --use-secondary-key
+    parameterValueGroup: false, true
+    summary: Indicates whether using the secondary storeage key or not.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_audit-policy_wait
+  name: az synapse sql audit-policy wait
+  summary: Place the CLI in a waiting state until a condition is met.
+  description: ''
+  syntax: >-
+    az synapse sql audit-policy wait --blob-auditing-policy-name
+                                     --resource-group
+                                     --workspace-name
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--subscription]
+                                     [--timeout]
+                                     [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_audit-policy_show
+- az_synapse_sql_audit-policy_update
+- az_synapse_sql_audit-policy_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL auditing policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool.yml
new file mode 100644
index 0000000000..2077b56211
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool.yml
@@ -0,0 +1,480 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool
+name: az synapse sql pool
+summary: Manage SQL pools.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_create
+  name: az synapse sql pool create
+  summary: Create a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool create --name
+                               --performance-level
+                               --resource-group
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+                               [--tags]
+  examples:
+  - summary: Create a SQL pool.
+    syntax: >-
+      az synapse sql pool create --name sqlpool --performance-level "DW1000c" \
+
+      --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --performance-level
+    summary: The performance level.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_delete
+  name: az synapse sql pool delete
+  summary: Delete a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool delete [--ids]
+                               [--name]
+                               [--no-wait]
+                               [--resource-group]
+                               [--subscription]
+                               [--workspace-name]
+                               [--yes]
+  examples:
+  - summary: Delete a SQL pool.
+    syntax: az synapse sql pool delete --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_list
+  name: az synapse sql pool list
+  summary: List all SQL pools.
+  description: ''
+  syntax: >-
+    az synapse sql pool list --resource-group
+                             --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: List SQL pools.
+    syntax: az synapse sql pool list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_list-deleted
+  name: az synapse sql pool list-deleted
+  summary: List all deleted SQL pools.
+  description: ''
+  syntax: >-
+    az synapse sql pool list-deleted --resource-group
+                                     --workspace-name
+                                     [--subscription]
+  examples:
+  - summary: List deleted SQL pools.
+    syntax: az synapse sql pool list-deleted --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_pause
+  name: az synapse sql pool pause
+  summary: Pause a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool pause [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+                              [--workspace-name]
+  examples:
+  - summary: Pause a SQL pool.
+    syntax: az synapse sql pool pause --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_restore
+  name: az synapse sql pool restore
+  summary: Create a new SQL pool by restoring from a backup.
+  description: ''
+  syntax: >-
+    az synapse sql pool restore --dest-name
+                                [--deleted-time]
+                                [--ids]
+                                [--name]
+                                [--performance-level]
+                                [--resource-group]
+                                [--subscription]
+                                [--time]
+                                [--workspace-name]
+  examples:
+  - summary: Create a new SQL pool by restoring an existing SQL pool's restore point.
+    syntax: >-
+      az synapse sql pool restore --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --dest-name newsqlpool --time 2020-11-25T02:47:37
+  requiredParameters:
+  - isRequired: true
+    name: --dest-name --destination-name
+    summary: Name of the sql pool that will be created as the restore destination.
+    description: ''
+  optionalParameters:
+  - name: --deleted-time
+    summary: 'If specified, restore from a deleted database instead of from an existing database. Must match the deleted time of a deleted database in the same server. Either --time or --deleted-time (or both) must be specified. Time should be in following format: "YYYY-MM-DDTHH:MM:SS".'
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --performance-level
+    summary: The performance level.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time -t
+    summary: "The point in time of the source database that will be restored to create the new database. Must be greater than or equal to the source database's earliestRestoreDate value. Either --time or --deleted-time (or both) must be specified. Time should be in following format: \"YYYY-MM-DDTHH:MM:SS\"."
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_resume
+  name: az synapse sql pool resume
+  summary: Resume a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool resume [--ids]
+                               [--name]
+                               [--resource-group]
+                               [--subscription]
+                               [--workspace-name]
+  examples:
+  - summary: Resume a SQL pool.
+    syntax: az synapse sql pool resume --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_show
+  name: az synapse sql pool show
+  summary: Get a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool show [--ids]
+                             [--name]
+                             [--query-examples]
+                             [--resource-group]
+                             [--subscription]
+                             [--workspace-name]
+  examples:
+  - summary: Get a SQL pool.
+    syntax: az synapse sql pool show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_show-connection-string
+  name: az synapse sql pool show-connection-string
+  summary: Generate a connection string to a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool show-connection-string --client {ado.net, jdbc, odbc, php, php_pdo}
+                                               [--auth-type {ADIntegrated, ADPassword, SqlPassword}]
+                                               [--ids]
+                                               [--name]
+                                               [--subscription]
+                                               [--workspace-name]
+  examples:
+  - summary: Generate connection string for ado.net
+    syntax: az synapse sql pool show-connection-string --name sqlpool --workspace-name testsynapseworkspace -c ado.net
+  requiredParameters:
+  - isRequired: true
+    name: --client -c
+    parameterValueGroup: ado.net, jdbc, odbc, php, php_pdo
+    summary: Type of client connection provider.
+    description: ''
+  optionalParameters:
+  - name: --auth-type -a
+    defaultValue: SqlPassword
+    parameterValueGroup: ADIntegrated, ADPassword, SqlPassword
+    summary: Type of authentication.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    defaultValue: <sql pool name>
+    summary: The SQL pool name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    defaultValue: <workspace name>
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_update
+  name: az synapse sql pool update
+  summary: Update a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool update [--ids]
+                               [--name]
+                               [--performance-level]
+                               [--resource-group]
+                               [--subscription]
+                               [--tags]
+                               [--workspace-name]
+  examples:
+  - summary: Update a SQL pool.
+    syntax: >-
+      az synapse sql pool update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --tags key1=value1
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --performance-level
+    summary: The performance level.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_wait
+  name: az synapse sql pool wait
+  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
+  description: ''
+  syntax: >-
+    az synapse sql pool wait --sql-pool-name
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--ids]
+                             [--interval]
+                             [--resource-group]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
+                             [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --sql-pool-name
+    summary: SQL pool name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_audit-policy
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+- az_synapse_sql_pool_classification
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+- az_synapse_sql_pool_create
+- az_synapse_sql_pool_delete
+- az_synapse_sql_pool_list
+- az_synapse_sql_pool_list-deleted
+- az_synapse_sql_pool_pause
+- az_synapse_sql_pool_restore
+- az_synapse_sql_pool_resume
+- az_synapse_sql_pool_show
+- az_synapse_sql_pool_show-connection-string
+- az_synapse_sql_pool_tde
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+- az_synapse_sql_pool_threat-policy
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+- az_synapse_sql_pool_update
+- az_synapse_sql_pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL pools.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/audit-policy.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/audit-policy.yml
new file mode 100644
index 0000000000..cb1fd84b27
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/audit-policy.yml
@@ -0,0 +1,173 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_audit-policy
+name: az synapse sql pool audit-policy
+summary: Manage a SQL pool's auditing policy.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_audit-policy_show
+  name: az synapse sql pool audit-policy show
+  summary: Get a SQL pool's auditing policy.
+  description: ''
+  syntax: >-
+    az synapse sql pool audit-policy show [--ids]
+                                          [--name]
+                                          [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--workspace-name]
+  examples:
+  - summary: Get a SQL pool's auditing policy.
+    syntax: az synapse sql pool audit-policy show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_audit-policy_update
+  name: az synapse sql pool audit-policy update
+  summary: Update a SQL pool's auditing policy.
+  description: If the policy is being enabled, `--storage-account` or both `--storage-endpoint` and `--storage-key` must be specified.
+  syntax: >-
+    az synapse sql pool audit-policy update [--actions]
+                                            [--add]
+                                            [--blob-auditing-policy-name]
+                                            [--enable-azure-monitor {false, true}]
+                                            [--force-string]
+                                            [--ids]
+                                            [--name]
+                                            [--remove]
+                                            [--resource-group]
+                                            [--retention-days]
+                                            [--set]
+                                            [--state {Disabled, Enabled}]
+                                            [--storage-account]
+                                            [--storage-endpoint]
+                                            [--storage-key]
+                                            [--storage-subscription]
+                                            [--subscription]
+                                            [--use-secondary-key {false, true}]
+                                            [--workspace-name]
+  examples:
+  - summary: Enable by storage account name.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-account mystorageaccount --blob-auditing-policy-name bapname
+  - summary: Enable by storage endpoint and key.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-endpoint https://mystorage.blob.core.windows.net --storage-key MYKEY== \
+
+      --blob-auditing-policy-name bapname
+  - summary: Set the list of audit actions.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --actions FAILED_DATABASE_AUTHENTICATION_GROUP 'UPDATE on database::mydb by public' \
+
+      --blob-auditing-policy-name bapname
+  - summary: Disable an auditing policy.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Disabled --blob-auditing-policy-name bapname
+  optionalParameters:
+  - name: --actions
+    summary: List of actions and action groups to audit.
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - name: --enable-azure-monitor
+    parameterValueGroup: false, true
+    summary: Whether enabling azure monitor target or not.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --retention-days
+    summary: The number of days to retain audit logs.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    parameterValueGroup: Disabled, Enabled
+    summary: Auditing policy state.
+    description: ''
+  - name: --storage-account
+    summary: Name of the storage account.
+    description: ''
+  - name: --storage-endpoint
+    summary: The storage account endpoint.
+    description: ''
+  - name: --storage-key
+    summary: Access key for the storage account.
+    description: ''
+  - name: --storage-subscription
+    summary: The subscription id of storage account.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --use-secondary-key
+    parameterValueGroup: false, true
+    summary: Indicates whether using the secondary storeage key or not.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a SQL pool's auditing policy.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/classification.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/classification.yml
new file mode 100644
index 0000000000..4292dafb76
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/classification.yml
@@ -0,0 +1,294 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_classification
+name: az synapse sql pool classification
+summary: Manage sensitivity classifications.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_classification_create
+  name: az synapse sql pool classification create
+  summary: Create a column's sensitivity classification.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification create --column
+                                              --information-type
+                                              --label
+                                              --name
+                                              --resource-group
+                                              --schema
+                                              --table
+                                              --workspace-name
+                                              [--subscription]
+  examples:
+  - summary: Create sensitivity classification for a given column.
+    syntax: >-
+      az synapse sql pool classification create --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn \
+
+      --information-type Name --label "Confidential - GDPR"
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --information-type
+    summary: The information type.
+    description: ''
+  - isRequired: true
+    name: --label
+    summary: The label name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_delete
+  name: az synapse sql pool classification delete
+  summary: Delete the sensitivity classification of a given column.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification delete --column
+                                              --schema
+                                              --table
+                                              [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Delete the sensitivity classification of a given column.
+    syntax: >-
+      az synapse sql pool classification delete --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_list
+  name: az synapse sql pool classification list
+  summary: Get the sensitivity classifications of a given SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification list --name
+                                            --resource-group
+                                            --workspace-name
+                                            [--filter]
+                                            [--query-examples]
+                                            [--subscription]
+  examples:
+  - summary: List the sensitivity classification of a given SQL pool.
+    syntax: az synapse sql pool classification list --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: An OData filter expression that filters elements in the collection.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_show
+  name: az synapse sql pool classification show
+  summary: Get the sensitivity classification of a given column.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification show --column
+                                            --schema
+                                            --table
+                                            [--ids]
+                                            [--name]
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
+                                            [--workspace-name]
+  examples:
+  - summary: Get the sensitivity classification of a given column.
+    syntax: >-
+      az synapse sql pool classification show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_update
+  name: az synapse sql pool classification update
+  summary: Update a column's sensitivity classification.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification update --column
+                                              --schema
+                                              --table
+                                              [--ids]
+                                              [--information-type]
+                                              [--label]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Update sensitivity classification for a given column.
+    syntax: >-
+      az synapse sql pool classification update --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn \
+
+      --information-type Name --label "Confidential - GDPR"
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --information-type
+    summary: The information type.
+    description: ''
+  - name: --label
+    summary: The label name.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage sensitivity classifications.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/classification/recommendation.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/classification/recommendation.yml
new file mode 100644
index 0000000000..f8803a8385
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/classification/recommendation.yml
@@ -0,0 +1,177 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_classification_recommendation
+name: az synapse sql pool classification recommendation
+summary: Manage sensitivity classification recommendations.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_classification_recommendation_disable
+  name: az synapse sql pool classification recommendation disable
+  summary: Disable sensitivity recommendations for a given column(recommendations are enabled by default on all columns).
+  description: ''
+  syntax: >-
+    az synapse sql pool classification recommendation disable --column
+                                                              --schema
+                                                              --table
+                                                              [--ids]
+                                                              [--name]
+                                                              [--resource-group]
+                                                              [--subscription]
+                                                              [--workspace-name]
+  examples:
+  - summary: Disable sensitivity recommendations for a given column.
+    syntax: >-
+      az synapse sql pool classification recommendation disable --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_recommendation_enable
+  name: az synapse sql pool classification recommendation enable
+  summary: Enable sensitivity recommendations for a given column(recommendations are enabled by default on all columns).
+  description: ''
+  syntax: >-
+    az synapse sql pool classification recommendation enable --column
+                                                             --schema
+                                                             --table
+                                                             [--ids]
+                                                             [--name]
+                                                             [--resource-group]
+                                                             [--subscription]
+                                                             [--workspace-name]
+  examples:
+  - summary: Enable sensitivity recommendations for a given column.
+    syntax: >-
+      az synapse sql pool classification recommendation enable --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_recommendation_list
+  name: az synapse sql pool classification recommendation list
+  summary: List the recommended sensitivity classifications of a given SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification recommendation list --name
+                                                           --resource-group
+                                                           --workspace-name
+                                                           [--filter]
+                                                           [--included-disabled {false, true}]
+                                                           [--query-examples]
+                                                           [--skip-token]
+                                                           [--subscription]
+  examples:
+  - summary: List the recommended sensitivity classifications of a given SQL pool.
+    syntax: >-
+      az synapse sql pool classification recommendation list --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: An OData filter expression that filters elements in the collection.
+    description: ''
+  - name: --included-disabled
+    parameterValueGroup: false, true
+    summary: Indicates whether the result should include disabled recommendations.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --skip-token
+    summary: An OData query option to indicate how many elements to skip in the collection.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage sensitivity classification recommendations.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/tde.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/tde.yml
new file mode 100644
index 0000000000..5468d98bbe
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/tde.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_tde
+name: az synapse sql pool tde
+summary: Manage a SQL pool's transparent data encryption.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_tde_set
+  name: az synapse sql pool tde set
+  summary: Set a SQL pool's transparent data encryption configuration.
+  description: ''
+  syntax: >-
+    az synapse sql pool tde set --status {Disabled, Enabled}
+                                --transparent-data-encryption-name
+                                [--ids]
+                                [--name]
+                                [--resource-group]
+                                [--subscription]
+                                [--workspace-name]
+  examples:
+  - summary: Set a SQL pool's transparent data encryption configuration. (autogenerated)
+    syntax: >-
+      az synapse sql pool tde set --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --status Enabled --transparent-data-encryption-name tdename
+  requiredParameters:
+  - isRequired: true
+    name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Status of the transparent data encryption.
+    description: ''
+  - isRequired: true
+    name: --transparent-data-encryption-name -d
+    summary: Name of the transparent data encryption.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_tde_show
+  name: az synapse sql pool tde show
+  summary: Get a SQL pool's transparent data encryption configuration.
+  description: ''
+  syntax: >-
+    az synapse sql pool tde show --transparent-data-encryption-name
+                                 [--ids]
+                                 [--name]
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--workspace-name]
+  examples:
+  - summary: Get a SQL pool's transparent data encryption configuration. (autogenerated)
+    syntax: >-
+      az synapse sql pool tde show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --transparent-data-encryption-name tdename
+  requiredParameters:
+  - isRequired: true
+    name: --transparent-data-encryption-name -d
+    summary: Name of the transparent data encryption.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a SQL pool's transparent data encryption.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/threat-policy.yml b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/threat-policy.yml
new file mode 100644
index 0000000000..06cf2a249c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/sql/pool/threat-policy.yml
@@ -0,0 +1,182 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_threat-policy
+name: az synapse sql pool threat-policy
+summary: Manage a SQL pool's threat detection policies.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_threat-policy_show
+  name: az synapse sql pool threat-policy show
+  summary: Get a SQL pool's threat detection policy.
+  description: ''
+  syntax: >-
+    az synapse sql pool threat-policy show --security-alert-policy-name
+                                           [--ids]
+                                           [--name]
+                                           [--query-examples]
+                                           [--resource-group]
+                                           [--subscription]
+                                           [--workspace-name]
+  examples:
+  - summary: Get a SQL pool's threat detection policy.
+    syntax: >-
+      az synapse sql pool threat-policy show --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --security-alert-policy-name threatpolicy
+  requiredParameters:
+  - isRequired: true
+    name: --security-alert-policy-name -s
+    summary: Name of the security alert policy.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_threat-policy_update
+  name: az synapse sql pool threat-policy update
+  summary: Update a SQL pool's threat detection policy.
+  description: If the policy is being enabled, storage_account or both storage_endpoint and storage_account_access_key must be specified.
+  syntax: >-
+    az synapse sql pool threat-policy update [--add]
+                                             [--disabled-alerts]
+                                             [--email-account-admins {false, true}]
+                                             [--email-addresses]
+                                             [--force-string]
+                                             [--ids]
+                                             [--name]
+                                             [--remove]
+                                             [--resource-group]
+                                             [--retention-days]
+                                             [--security-alert-policy-name]
+                                             [--set]
+                                             [--state {Disabled, Enabled, New}]
+                                             [--storage-account]
+                                             [--storage-endpoint]
+                                             [--storage-key]
+                                             [--subscription]
+                                             [--workspace-name]
+  examples:
+  - summary: Enable by storage account name.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-account mystorageaccount --security-alert-policy-name threatpolicy
+  - summary: Enable by storage endpoint and key.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-endpoint https://mystorage.blob.core.windows.net --storage-key MYKEY== \
+
+      --security-alert-policy-name threatpolicy
+  - summary: Disable a subset of alert types.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --disabled-alerts Sql_Injection_Vulnerability Access_Anomaly --security-alert-policy-name threatpolicy
+  - summary: Configure email recipients for a policy.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --email-addresses me@examlee.comyou@example.com --email-account-admins true \
+
+      --security-alert-policy-name threatpolicy
+  - summary: Disable a threat policy.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Disabled --security-alert-policy-name threatpolicy
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --disabled-alerts
+    summary: List of disabled alerts.
+    description: ''
+  - name: --email-account-admins
+    parameterValueGroup: false, true
+    summary: Whether the alert is sent to the account administrators.
+    description: ''
+  - name: --email-addresses
+    summary: List of email addresses that alerts are sent to.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --retention-days
+    summary: The number of days to retain threat detection logs.
+    description: ''
+  - name: --security-alert-policy-name -s
+    summary: Name of the security alert policy.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    parameterValueGroup: Disabled, Enabled, New
+    summary: Threat detection policy state.
+    description: ''
+  - name: --storage-account
+    summary: Name of the storage account.
+    description: ''
+  - name: --storage-endpoint
+    summary: The storage account endpoint.
+    description: ''
+  - name: --storage-key
+    summary: Access key for the storage account.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a SQL pool's threat detection policies.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/trigger-run.yml b/2017-03-09-profile/docs-ref-autogen/synapse/trigger-run.yml
new file mode 100644
index 0000000000..ca59126a5f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/trigger-run.yml
@@ -0,0 +1,105 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_trigger-run
+name: az synapse trigger-run
+summary: Synapse trigger-run.
+description: ''
+directCommands:
+- uid: az_synapse_trigger-run_query-by-workspace
+  name: az synapse trigger-run query-by-workspace
+  summary: Query trigger runs in the workspace based on input filter conditions.
+  description: ''
+  syntax: >-
+    az synapse trigger-run query-by-workspace --last-updated-after
+                                              --last-updated-before
+                                              --workspace-name
+                                              [--continuation-token]
+                                              [--filters]
+                                              [--order-by]
+                                              [--subscription]
+  examples:
+  - summary: Query trigger runs in the workspace based on input filter conditions.
+    syntax: >-
+      az synapse trigger-run query-by-workspace --workspace-name testsynapseworkspace --filters \
+        operand="TriggerName" operator="Equals" values="testtrigger" --last-updated-after "2020-09-03T00:36:44.3345758Z" \
+        --last-updated-before "2020-09-03T00:49:48.3686473Z"
+  requiredParameters:
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: ''
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger-run_rerun
+  name: az synapse trigger-run rerun
+  summary: Rerun single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az synapse trigger-run rerun --name
+                                 --run-id
+                                 --workspace-name
+                                 [--subscription]
+  examples:
+  - summary: Rerun single trigger instance by runId.
+    syntax: >-
+      az synapse trigger-run rerun --workspace-name testsynapseworkspace \
+        --name testtrigger --run-id 08586024068106001417583731803CU31
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The trigger run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_trigger-run_query-by-workspace
+- az_synapse_trigger-run_rerun
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Synapse trigger-run.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/trigger.yml b/2017-03-09-profile/docs-ref-autogen/synapse/trigger.yml
new file mode 100644
index 0000000000..d6090bf70e
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/trigger.yml
@@ -0,0 +1,349 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_trigger
+name: az synapse trigger
+summary: Manage Synapse's triggers.
+description: ''
+directCommands:
+- uid: az_synapse_trigger_create
+  name: az synapse trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger create --file
+                              --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+  examples:
+  - summary: Create a trigger.
+    syntax: >-
+      az synapse trigger create --workspace-name testsynapseworkspace \
+        --name testtrigger --file @path/trigger.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_delete
+  name: az synapse trigger delete
+  summary: Delete a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger delete --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+                              [--yes]
+  examples:
+  - summary: Delete a trigger.
+    syntax: >-
+      az synapse trigger delete --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_get-event-subscription-status
+  name: az synapse trigger get-event-subscription-status
+  summary: Get a trigger's event subscription status.
+  description: ''
+  syntax: >-
+    az synapse trigger get-event-subscription-status --name
+                                                     --workspace-name
+                                                     [--subscription]
+  examples:
+  - summary: Get a trigger's event subscription status.
+    syntax: >-
+      az synapse trigger get-event-subscription-status --workspace-name testsynapseworkspace \
+        --name eventtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_list
+  name: az synapse trigger list
+  summary: List triggers.
+  description: ''
+  syntax: >-
+    az synapse trigger list --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: List triggers.
+    syntax: az synapse trigger list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_set
+  name: az synapse trigger set
+  summary: Set an exist trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger set --file
+                           --name
+                           --workspace-name
+                           [--no-wait]
+                           [--subscription]
+  examples:
+  - summary: Set an exist trigger.
+    syntax: >-
+      az synapse trigger set --workspace-name testsynapseworkspace \
+        --name testtrigger --file @path/trigger.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_show
+  name: az synapse trigger show
+  summary: Get a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger show --name
+                            --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: Get a trigger.
+    syntax: >-
+      az synapse trigger show --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_start
+  name: az synapse trigger start
+  summary: Starts a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger start --name
+                             --workspace-name
+                             [--no-wait]
+                             [--subscription]
+  examples:
+  - summary: Starts a trigger.
+    syntax: >-
+      az synapse trigger start --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_stop
+  name: az synapse trigger stop
+  summary: Stops a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger stop --name
+                            --workspace-name
+                            [--no-wait]
+                            [--subscription]
+  examples:
+  - summary: Stops a trigger.
+    syntax: >-
+      az synapse trigger stop --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_subscribe-to-event
+  name: az synapse trigger subscribe-to-event
+  summary: Subscribe event trigger to events.
+  description: ''
+  syntax: >-
+    az synapse trigger subscribe-to-event --name
+                                          --workspace-name
+                                          [--no-wait]
+                                          [--subscription]
+  examples:
+  - summary: Subscribe event trigger to events.
+    syntax: >-
+      az synapse trigger subscribe-to-event --workspace-name testsynapseworkspace \
+        --name eventtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_unsubscribe-from-event
+  name: az synapse trigger unsubscribe-from-event
+  summary: Unsubscribe event trigger from events.
+  description: ''
+  syntax: >-
+    az synapse trigger unsubscribe-from-event --name
+                                              --workspace-name
+                                              [--no-wait]
+                                              [--subscription]
+  examples:
+  - summary: Unsubscribe event trigger from events.
+    syntax: >-
+      az synapse trigger unsubscribe-from-event --workspace-name testsynapseworkspace \
+        --name eventtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_trigger_create
+- az_synapse_trigger_delete
+- az_synapse_trigger_get-event-subscription-status
+- az_synapse_trigger_list
+- az_synapse_trigger_set
+- az_synapse_trigger_show
+- az_synapse_trigger_start
+- az_synapse_trigger_stop
+- az_synapse_trigger_subscribe-to-event
+- az_synapse_trigger_unsubscribe-from-event
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's triggers.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/workspace.yml b/2017-03-09-profile/docs-ref-autogen/synapse/workspace.yml
new file mode 100644
index 0000000000..f9771a9c7f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/workspace.yml
@@ -0,0 +1,354 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace
+name: az synapse workspace
+summary: Manage Synapse workspaces.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_check-name
+  name: az synapse workspace check-name
+  summary: Check if a Synapse workspace name is available or not.
+  description: ''
+  syntax: >-
+    az synapse workspace check-name --name
+                                    [--subscription]
+  examples:
+  - summary: Check if a Synapse workspace name is available or not.
+    syntax: az synapse workspace check-name --name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name you wanted to check.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_create
+  name: az synapse workspace create
+  summary: Create a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace create --file-system
+                                --name
+                                --resource-group
+                                --sql-admin-login-password
+                                --sql-admin-login-user
+                                --storage-account
+                                [--allowed-tenant-ids]
+                                [--cmk]
+                                [--enable-managed-virtual-network {false, true}]
+                                [--key-name]
+                                [--location]
+                                [--no-wait]
+                                [--prevent-data-exfiltration {false, true}]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Create a Synapse workspace
+    syntax: >-
+      az synapse workspace create --name fromcli4 --resource-group rg \
+        --storage-account testadlsgen2 --file-system testfilesystem \
+        --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
+  - summary: Create a Synapse workspace with storage resource id
+    syntax: >-
+      az synapse workspace create --name fromcli4 --resource-group rg \
+        --storage-account /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/testadlsgen2 --file-system testfilesystem \
+        --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
+  - summary: Create a Synapse workspace using customer-managed key
+    syntax: >-
+      az synapse workspace create --name fromcli4 --resource-group rg \
+        --storage-account testadlsgen2 --file-system testfilesystem \
+        --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US" \
+        --key-identifier https://{keyvaultname}.vault.azure.net/keys/{keyname} --key-name testcmk
+  requiredParameters:
+  - isRequired: true
+    name: --file-system
+    summary: The file system of the data lake storage account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The workspace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sql-admin-login-password -p
+    summary: The sql administrator login password.
+    description: ''
+  - isRequired: true
+    name: --sql-admin-login-user -u
+    summary: The sql administrator login user name.
+    description: ''
+  - isRequired: true
+    name: --storage-account
+    summary: The data lake storage account name or resource id.
+    description: ''
+  optionalParameters:
+  - name: --allowed-tenant-ids
+    summary: The approved Azure AD tenants which outbound data traffic allowed to. The Azure AD tenant of the current user will be included by default. Use ('' in PowerShell) to disable all allowed tenant ids.
+    description: ''
+  - name: --cmk --key-identifier
+    summary: 'The customer-managed key used to encrypt all data at rest in the workspace. Key identifier should be in the format of: https://{keyvaultname}.vault.azure.net/keys/{keyname}.'
+    description: ''
+  - name: --enable-managed-virtual-network --enable-managed-vnet
+    parameterValueGroup: false, true
+    summary: The flag indicates whether enable managed virtual network.
+    description: ''
+  - name: --key-name
+    defaultValue: default
+    summary: The workspace customer-managed key display name. All existing keys can be found using "az synapse workspace key list" cmdlet.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prevent-data-exfiltration --prevent-exfiltration
+    parameterValueGroup: false, true
+    summary: The flag indicates whether enable data exfiltration.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_delete
+  name: az synapse workspace delete
+  summary: Delete a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace delete [--ids]
+                                [--name]
+                                [--no-wait]
+                                [--resource-group]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a Synapse workspace.
+    syntax: az synapse workspace delete --name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_list
+  name: az synapse workspace list
+  summary: List all Synapse workspaces.
+  description: ''
+  syntax: >-
+    az synapse workspace list [--query-examples]
+                              [--resource-group]
+                              [--subscription]
+  examples:
+  - summary: List all Synapse workspaces under a subscription
+    syntax: az synapse workspace list
+  - summary: List all Synapse workspaces under a specific resource group
+    syntax: az synapse workspace list --resource-group rg
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_show
+  name: az synapse workspace show
+  summary: Get a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace show [--ids]
+                              [--name]
+                              [--query-examples]
+                              [--resource-group]
+                              [--subscription]
+  examples:
+  - summary: Get a Synapse workspace.
+    syntax: az synapse workspace show --name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_update
+  name: az synapse workspace update
+  summary: Update a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace update [--allowed-tenant-ids]
+                                [--ids]
+                                [--key-name]
+                                [--name]
+                                [--no-wait]
+                                [--resource-group]
+                                [--sql-admin-login-password]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Update a Synapse workspace
+    syntax: >-
+      az synapse workspace update --name fromcli4 --resource-group rg \
+        --tags key1=value1
+  optionalParameters:
+  - name: --allowed-tenant-ids
+    summary: The approved Azure AD tenants which outbound data traffic allowed to. The Azure AD tenant of the current user will be included by default. Use ('' in PowerShell) to disable all allowed tenant ids.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --key-name
+    summary: The workspace customer-managed key display name. All existing keys can be found using "az synapse workspace key list" cmdlet.
+    description: ''
+  - name: --name -n
+    summary: The workspace name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sql-admin-login-password -p
+    summary: The sql administrator login password.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_wait
+  name: az synapse workspace wait
+  summary: Place the CLI in a waiting state until a condition of the workspace is met.
+  description: ''
+  syntax: >-
+    az synapse workspace wait --resource-group
+                              --workspace-name
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--subscription]
+                              [--timeout]
+                              [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_check-name
+- az_synapse_workspace_create
+- az_synapse_workspace_delete
+- az_synapse_workspace_firewall-rule
+- az_synapse_workspace_firewall-rule_create
+- az_synapse_workspace_firewall-rule_delete
+- az_synapse_workspace_firewall-rule_list
+- az_synapse_workspace_firewall-rule_show
+- az_synapse_workspace_firewall-rule_update
+- az_synapse_workspace_firewall-rule_wait
+- az_synapse_workspace_key
+- az_synapse_workspace_key_create
+- az_synapse_workspace_key_delete
+- az_synapse_workspace_key_list
+- az_synapse_workspace_key_show
+- az_synapse_workspace_key_update
+- az_synapse_workspace_key_wait
+- az_synapse_workspace_list
+- az_synapse_workspace_managed-identity
+- az_synapse_workspace_managed-identity_grant-sql-access
+- az_synapse_workspace_managed-identity_revoke-sql-access
+- az_synapse_workspace_managed-identity_show-sql-access
+- az_synapse_workspace_managed-identity_wait
+- az_synapse_workspace_show
+- az_synapse_workspace_update
+- az_synapse_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse workspaces.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/workspace/firewall-rule.yml b/2017-03-09-profile/docs-ref-autogen/synapse/workspace/firewall-rule.yml
new file mode 100644
index 0000000000..5ed693c723
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/workspace/firewall-rule.yml
@@ -0,0 +1,284 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace_firewall-rule
+name: az synapse workspace firewall-rule
+summary: Manage a workspace's firewall rules.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_firewall-rule_create
+  name: az synapse workspace firewall-rule create
+  summary: Create a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule create --end-ip-address
+                                              --name
+                                              --resource-group
+                                              --start-ip-address
+                                              --workspace-name
+                                              [--no-wait]
+                                              [--subscription]
+  examples:
+  - summary: Create a firewall rule.
+    syntax: >-
+      az synapse workspace firewall-rule create --name allowAll --workspace-name testsynapseworkspace \
+
+      --resource-group rg --start-ip-address 0.0.0.0 --end-ip-address 255.255.255.255
+  requiredParameters:
+  - isRequired: true
+    name: --end-ip-address
+    summary: The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start-ip-address
+    summary: The start IP address of the firewall rule. Must be IPv4 format.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_delete
+  name: az synapse workspace firewall-rule delete
+  summary: Delete a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule delete [--ids]
+                                              [--name]
+                                              [--no-wait]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+                                              [--yes]
+  examples:
+  - summary: Delete a firewall rule.
+    syntax: az synapse workspace firewall-rule delete --name rule1 --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_list
+  name: az synapse workspace firewall-rule list
+  summary: List all firewall rules.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule list --resource-group
+                                            --workspace-name
+                                            [--query-examples]
+                                            [--subscription]
+  examples:
+  - summary: List all firewall rules.
+    syntax: az synapse workspace firewall-rule list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_show
+  name: az synapse workspace firewall-rule show
+  summary: Get a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule show [--ids]
+                                            [--name]
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
+                                            [--workspace-name]
+  examples:
+  - summary: Get a firewall rule.
+    syntax: az synapse workspace firewall-rule show --name rule1 --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_update
+  name: az synapse workspace firewall-rule update
+  summary: Update a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule update [--end-ip-address]
+                                              [--ids]
+                                              [--name]
+                                              [--no-wait]
+                                              [--resource-group]
+                                              [--start-ip-address]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Update a firewall rule.
+    syntax: >-
+      az synapse workspace firewall-rule update --name allowAll --workspace-name testsynapseworkspace \
+
+      --resource-group rg --start-ip-address 172.0.0.0
+  optionalParameters:
+  - name: --end-ip-address
+    summary: The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start-ip-address
+    summary: The start IP address of the firewall rule. Must be IPv4 format.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_wait
+  name: az synapse workspace firewall-rule wait
+  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule wait --rule-name
+                                            [--created]
+                                            [--custom]
+                                            [--deleted]
+                                            [--exists]
+                                            [--ids]
+                                            [--interval]
+                                            [--resource-group]
+                                            [--subscription]
+                                            [--timeout]
+                                            [--updated]
+                                            [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --rule-name
+    summary: The IP firewall rule name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_firewall-rule_create
+- az_synapse_workspace_firewall-rule_delete
+- az_synapse_workspace_firewall-rule_list
+- az_synapse_workspace_firewall-rule_show
+- az_synapse_workspace_firewall-rule_update
+- az_synapse_workspace_firewall-rule_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a workspace's firewall rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/workspace/key.yml b/2017-03-09-profile/docs-ref-autogen/synapse/workspace/key.yml
new file mode 100644
index 0000000000..c9ded1573f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/workspace/key.yml
@@ -0,0 +1,283 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace_key
+name: az synapse workspace key
+summary: Manage workspace's keys.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_key_create
+  name: az synapse workspace key create
+  summary: Create a workspace's key.
+  description: ''
+  syntax: >-
+    az synapse workspace key create --key-identifier
+                                    --name
+                                    --resource-group
+                                    --workspace-name
+                                    [--no-wait]
+                                    [--subscription]
+  examples:
+  - summary: Create a workspace's key.
+    syntax: >-
+      az synapse workspace key create --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg --key-identifier https://{keyvaultname}.vault.azure.net/keys/{keyname}
+  requiredParameters:
+  - isRequired: true
+    name: --key-identifier
+    summary: 'The Key Vault Url of the workspace encryption key. should be in the format of: https://{keyvaultname}.vault.azure.net/keys/{keyname}.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_delete
+  name: az synapse workspace key delete
+  summary: Delete a workspace's key. The key at active status can't be deleted.
+  description: ''
+  syntax: >-
+    az synapse workspace key delete [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--workspace-name]
+                                    [--yes]
+  examples:
+  - summary: Delete a workspace's key.
+    syntax: >-
+      az synapse workspace key delete --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_list
+  name: az synapse workspace key list
+  summary: List keys under specified workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace key list --resource-group
+                                  --workspace-name
+                                  [--query-examples]
+                                  [--subscription]
+  examples:
+  - summary: List keys under specified workspace.
+    syntax: az synapse workspace key list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_show
+  name: az synapse workspace key show
+  summary: Show a workspace's key by name.
+  description: ''
+  syntax: >-
+    az synapse workspace key show [--ids]
+                                  [--name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--workspace-name]
+  examples:
+  - summary: Show a workspace's key.
+    syntax: >-
+      az synapse workspace key show --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_update
+  name: az synapse workspace key update
+  summary: Update a workspace's key or update the state of key to change the workspace state from pending to success state when the workspace is first being provisioned.
+  description: ''
+  syntax: >-
+    az synapse workspace key update --key-identifier
+                                    [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--workspace-name]
+  examples:
+  - summary: Update a workspace's key.
+    syntax: >-
+      az synapse workspace key update --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg --key-identifier https://{keyvaultname}.vault.azure.net/keys/{keyname}
+  requiredParameters:
+  - isRequired: true
+    name: --key-identifier
+    summary: 'The Key Vault Url of the workspace encryption key. should be in the format of: https://{keyvaultname}.vault.azure.net/keys/{keyname}.'
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_wait
+  name: az synapse workspace key wait
+  summary: Place the CLI in a waiting state until a condition of a workspace key is met.
+  description: ''
+  syntax: >-
+    az synapse workspace key wait --key-name
+                                  [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--ids]
+                                  [--interval]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
+                                  [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: The name of the workspace key.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_key_create
+- az_synapse_workspace_key_delete
+- az_synapse_workspace_key_list
+- az_synapse_workspace_key_show
+- az_synapse_workspace_key_update
+- az_synapse_workspace_key_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage workspace's keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/synapse/workspace/managed-identity.yml b/2017-03-09-profile/docs-ref-autogen/synapse/workspace/managed-identity.yml
new file mode 100644
index 0000000000..ee63673a0a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/synapse/workspace/managed-identity.yml
@@ -0,0 +1,178 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace_managed-identity
+name: az synapse workspace managed-identity
+summary: Manage workspace's managed-identity.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_managed-identity_grant-sql-access
+  name: az synapse workspace managed-identity grant-sql-access
+  summary: Grant workspace's sql-access to managed-identity.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity grant-sql-access [--ids]
+                                                           [--no-wait]
+                                                           [--resource-group]
+                                                           [--subscription]
+                                                           [--workspace-name]
+  examples:
+  - summary: Grant workspace's sql-access to managed-identity.
+    syntax: >-
+      az synapse workspace managed-identity grant-sql-access --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_managed-identity_revoke-sql-access
+  name: az synapse workspace managed-identity revoke-sql-access
+  summary: Revoke workspace's sql-access to managed-identity.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity revoke-sql-access [--ids]
+                                                            [--no-wait]
+                                                            [--resource-group]
+                                                            [--subscription]
+                                                            [--workspace-name]
+  examples:
+  - summary: Revoke workspace's sql-access to managed-identity.
+    syntax: >-
+      az synapse workspace managed-identity revoke-sql-access --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_managed-identity_show-sql-access
+  name: az synapse workspace managed-identity show-sql-access
+  summary: Show workspace's sql-access state to managed-identity.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity show-sql-access [--ids]
+                                                          [--resource-group]
+                                                          [--subscription]
+                                                          [--workspace-name]
+  examples:
+  - summary: Show workspace's sql-access state to managed-identity.
+    syntax: >-
+      az synapse workspace managed-identity show-sql-access --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_managed-identity_wait
+  name: az synapse workspace managed-identity wait
+  summary: Place the CLI in a waiting state until a condition of sql-access state to managed-identity is met.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity wait [--created]
+                                               [--custom]
+                                               [--deleted]
+                                               [--exists]
+                                               [--ids]
+                                               [--interval]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--timeout]
+                                               [--updated]
+                                               [--workspace-name]
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_managed-identity_grant-sql-access
+- az_synapse_workspace_managed-identity_revoke-sql-access
+- az_synapse_workspace_managed-identity_show-sql-access
+- az_synapse_workspace_managed-identity_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage workspace's managed-identity.
diff --git a/2017-03-09-profile/docs-ref-autogen/tag.yml b/2017-03-09-profile/docs-ref-autogen/tag.yml
index 34b2e639cb..1f9bd1fe9b 100644
--- a/2017-03-09-profile/docs-ref-autogen/tag.yml
+++ b/2017-03-09-profile/docs-ref-autogen/tag.yml
@@ -1,137 +1,140 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_tag
-  name: az tag
-  summary: Manage resource tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_tag_add_value
-  - az_tag_create
-  - az_tag_delete
-  - az_tag_list
-  - az_tag_remove_value
-- uid: az_tag_add_value
+### YamlMime:AzureCLIGroup
+uid: az_tag
+name: az tag
+summary: Tag Management on a resource.
+description: ''
+directCommands:
+- uid: az_tag_add-value
   name: az tag add-value
-  summary: Create a subscription resource tag value.
+  summary: Create a tag value.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az tag add-value --name
+                     --value
+                     [--subscription]
+  examples:
+  - summary: Create a tag value.
+    syntax: az tag add-value --name MyTag --value MyValue
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: The name of the tag.
+    summary: The tag name.
     description: ''
   - isRequired: true
     name: --value
-    summary: The value of the tag.
+    summary: The tag value.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_tag_create
   name: az tag create
-  summary: Create a subscription resource tag.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the tag.
+  summary: Create tags on a specific resource.
+  description: The az tag create command with an id creates or updates the entire set of tags on a resource, resource group or subscription. This operation allows adding or replacing the entire set of tags on the specified resource, resource group or subscription. The specified entity can have a maximum of 50 tags.
+  syntax: >-
+    az tag create [--name]
+                  [--subscription]
+                  [--tags]
+  examples:
+  - summary: Create a tag in the subscription.
+    syntax: az tag create --name MyTag
+  - summary: Create or update the entire set of tags on a subscription.
+    syntax: az tag create --resource-id /subscriptions/{subId} --tags Dept=Finance Status=Normal
+  - summary: Create or update the entire set of tags on a resource group.
+    syntax: az tag create --resource-id /subscriptions/{sub-id}/resourcegroups/{rg} --tags Dept=Finance Status=Normal
+  - summary: Create or update the entire set of tags on a resource.
+    syntax: az tag create --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName} --tags Dept=Finance Status=Normal
+  optionalParameters:
+  - name: --name -n
+    summary: The name of the tag to create.
     description: ''
   - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    summary: Name or ID of subscription. You can configure the default subscription using az account set -s NAME_OR_ID.
+    description: ''
+  - name: --tags
+    summary: The tags to be applied on the resource.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_tag_delete
   name: az tag delete
-  summary: Delete a subscription resource tag.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the tag.
+  summary: Delete tags on a specific resource.
+  description: The az tag delete command with an id deletes the entire set of tags on a resource, resource group or subscription.
+  syntax: >-
+    az tag delete [--name]
+                  [--subscription]
+                  [--yes]
+  examples:
+  - summary: Delete a tag from the subscription.
+    syntax: az tag delete --name MyTag
+  - summary: Delete the entire set of tags on a subscription.
+    syntax: az tag delete --resource-id /subscriptions/{sub-id}
+  - summary: Delete the entire set of tags on a resource group.
+    syntax: az tag delete --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}
+  - summary: Delete the entire set of tags on a resource.
+    syntax: az tag delete --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName}
+  optionalParameters:
+  - name: --name -n
+    summary: The name of the tag to be deleted.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_tag_list
   name: az tag list
-  summary: Get a list of subscription resource tags.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
+  summary: List the entire set of tags on a specific resource.
+  description: The az tag list command with an id lists the entire set of tags on a resource, resource group or subscription.
+  syntax: >-
+    az tag list [--query-examples]
+                [--subscription]
+  examples:
+  - summary: List the entire set of tags on a subscription.
+    syntax: az tag list --resource-id /subscriptions/{sub-id}
+  - summary: List the entire set of tags on a resource group.
+    syntax: az tag list --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}
+  - summary: List the entire set of tags on a resource.
+    syntax: az tag list --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName}
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_tag_remove_value
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
+- uid: az_tag_remove-value
   name: az tag remove-value
   summary: Delete a subscription resource tag value.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az tag remove-value --name
+                        --value
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: The name of the tag.
+    summary: The tag name.
     description: ''
   - isRequired: true
     name: --value
-    summary: The value of the tag.
+    summary: The tag value.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_tag_add_value
-  name: az tag add-value
-  summary: Create a subscription resource tag value.
-- uid: az_tag_create
-  name: az tag create
-  summary: Create a subscription resource tag.
-- uid: az_tag_delete
-  name: az tag delete
-  summary: Delete a subscription resource tag.
-- uid: az_tag_list
-  name: az tag list
-  summary: Get a list of subscription resource tags.
-- uid: az_tag_remove_value
-  name: az tag remove-value
-  summary: Delete a subscription resource tag value.
+- az_tag_add-value
+- az_tag_create
+- az_tag_delete
+- az_tag_list
+- az_tag_remove-value
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -147,10 +150,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource tags.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Tag Management on a resource.
diff --git a/2017-03-09-profile/docs-ref-autogen/term.yml b/2017-03-09-profile/docs-ref-autogen/term.yml
new file mode 100644
index 0000000000..dce9d5570a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/term.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_term
+name: az term
+summary: Manage marketplace agreement with marketplaceordering.
+description: ''
+directCommands:
+- uid: az_term_accept
+  name: az term accept
+  summary: Accept marketplace terms.
+  description: ''
+  syntax: >-
+    az term accept --plan
+                   --product
+                   --publisher
+                   [--subscription]
+  examples:
+  - summary: Set marketplace terms.
+    syntax: az term accept --product "windows-data-science-vm" --plan "windows2016" --publisher "microsoft-ads"
+  requiredParameters:
+  - isRequired: true
+    name: --plan
+    summary: Plan identifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --product
+    summary: Offer identifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --publisher
+    summary: Publisher identifier string of image being deployed.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/marketplaceordering/_help.py
+- uid: az_term_show
+  name: az term show
+  summary: Get marketplace terms.
+  description: ''
+  syntax: >-
+    az term show --plan
+                 --product
+                 --publisher
+                 [--query-examples]
+                 [--subscription]
+  examples:
+  - summary: Get marketeplace terms.
+    syntax: az term show --product "windows-data-science-vm" --plan "windows2016" --publisher "microsoft-ads"
+  requiredParameters:
+  - isRequired: true
+    name: --plan
+    summary: Plan identifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --product
+    summary: Offeridentifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --publisher
+    summary: Publisher identifier string of image being deployed.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/marketplaceordering/_help.py
+commands:
+- az_term_accept
+- az_term_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/28/2021
+  description: Manage marketplace agreement with marketplaceordering.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi.yml b/2017-03-09-profile/docs-ref-autogen/tsi.yml
new file mode 100644
index 0000000000..8f8c67676f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi
+name: az tsi
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Time Series Insights.
+description: ''
+commands:
+- az_tsi_access-policy
+- az_tsi_access-policy_create
+- az_tsi_access-policy_delete
+- az_tsi_access-policy_list
+- az_tsi_access-policy_show
+- az_tsi_access-policy_update
+- az_tsi_environment
+- az_tsi_environment_delete
+- az_tsi_environment_gen1
+- az_tsi_environment_gen1_create
+- az_tsi_environment_gen1_update
+- az_tsi_environment_gen2
+- az_tsi_environment_gen2_create
+- az_tsi_environment_gen2_update
+- az_tsi_environment_list
+- az_tsi_environment_show
+- az_tsi_environment_wait
+- az_tsi_event-source
+- az_tsi_event-source_delete
+- az_tsi_event-source_eventhub
+- az_tsi_event-source_eventhub_create
+- az_tsi_event-source_eventhub_update
+- az_tsi_event-source_iothub
+- az_tsi_event-source_iothub_create
+- az_tsi_event-source_iothub_update
+- az_tsi_event-source_list
+- az_tsi_event-source_show
+- az_tsi_reference-data-set
+- az_tsi_reference-data-set_create
+- az_tsi_reference-data-set_delete
+- az_tsi_reference-data-set_list
+- az_tsi_reference-data-set_show
+- az_tsi_reference-data-set_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Time Series Insights.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/access-policy.yml b/2017-03-09-profile/docs-ref-autogen/tsi/access-policy.yml
new file mode 100644
index 0000000000..a666cb7d7c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/access-policy.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_access-policy
+name: az tsi access-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi access-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage access policy with timeseriesinsights.
+description: ''
+directCommands:
+- uid: az_tsi_access-policy_create
+  name: az tsi access-policy create
+  summary: Create an access policy in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi access-policy create --access-policy-name
+                                --environment-name
+                                --resource-group
+                                [--description]
+                                [--principal-object-id]
+                                [--roles]
+  examples:
+  - summary: AccessPoliciesCreate
+    syntax: az tsi access-policy create --name "ap1" --environment-name "env1" --description "some description" --principal-object-id "aGuid" --roles Reader Contributor --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: An description of the access policy.
+    description: ''
+  - name: --principal-object-id
+    summary: The objectId of the principal in Azure Active Directory.
+    description: ''
+    valueFrom: az ad user, az ad sp
+  - name: --roles
+    summary: The list of roles the principal is assigned on the environment.
+    description: ''
+- uid: az_tsi_access-policy_delete
+  name: az tsi access-policy delete
+  summary: Delete the access policy.
+  description: ''
+  syntax: >-
+    az tsi access-policy delete --access-policy-name
+                                --environment-name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: AccessPoliciesDelete
+    syntax: az tsi access-policy delete --name "ap1" --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_access-policy_list
+  name: az tsi access-policy list
+  summary: List all the available access policies associated with the environment.
+  description: ''
+  syntax: >-
+    az tsi access-policy list --environment-name
+                              --resource-group
+  examples:
+  - summary: AccessPoliciesByEnvironment
+    syntax: az tsi access-policy list --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_access-policy_show
+  name: az tsi access-policy show
+  summary: Show the access policy with the specified name in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi access-policy show --access-policy-name
+                              --environment-name
+                              --resource-group
+  examples:
+  - summary: AccessPoliciesGet
+    syntax: az tsi access-policy show --name "ap1" --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_access-policy_update
+  name: az tsi access-policy update
+  summary: Update the access policy.
+  description: ''
+  syntax: >-
+    az tsi access-policy update --access-policy-name
+                                --environment-name
+                                --resource-group
+                                [--description]
+                                [--roles]
+  examples:
+  - summary: AccessPoliciesUpdate
+    syntax: az tsi access-policy update --name "ap1" --roles "Reader" --roles "Contributor" --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: An description of the access policy.
+    description: ''
+  - name: --roles
+    summary: The list of roles the principal is assigned on the environment.
+    description: ''
+commands:
+- az_tsi_access-policy_create
+- az_tsi_access-policy_delete
+- az_tsi_access-policy_list
+- az_tsi_access-policy_show
+- az_tsi_access-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage access policy with timeseriesinsights.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/environment.yml b/2017-03-09-profile/docs-ref-autogen/tsi/environment.yml
new file mode 100644
index 0000000000..f16e995300
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/environment.yml
@@ -0,0 +1,156 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_environment
+name: az tsi environment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi environment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage environment with Azure Time Series Insights.
+description: ''
+directCommands:
+- uid: az_tsi_environment_delete
+  name: az tsi environment delete
+  summary: Delete the environment with the specified name in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment delete --environment-name
+                              --resource-group
+                              [--yes]
+  examples:
+  - summary: EnvironmentsDelete
+    syntax: az tsi environment delete --name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_environment_list
+  name: az tsi environment list
+  summary: List all the available environments associated with the subscription and within the specified     resource group.
+  description: ''
+  syntax: az tsi environment list [--resource-group]
+  examples:
+  - summary: EnvironmentsByResourceGroup
+    syntax: az tsi environment list --resource-group "rg1"
+  - summary: EnvironmentsBySubscription
+    syntax: az tsi environment list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_environment_show
+  name: az tsi environment show
+  summary: Show the environment with the specified name in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment show --environment-name
+                            --resource-group
+                            [--expand]
+  examples:
+  - summary: EnvironmentsGet
+    syntax: az tsi environment show --name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Setting $expand=status will include the status of the internal services of the environment in the Time Series Insights service.
+    description: ''
+- uid: az_tsi_environment_wait
+  name: az tsi environment wait
+  summary: Place the CLI in a waiting state until a condition of the timeseriesinsights environment is met.
+  description: ''
+  syntax: >-
+    az tsi environment wait --environment-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--expand]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the timeseriesinsights environment is successfully created.
+    syntax: az tsi environment wait --name "env1" --resource-group "rg1" --created
+  - summary: Pause executing next line of CLI script until the timeseriesinsights environment is successfully updated.
+    syntax: az tsi environment wait --name "env1" --resource-group "rg1" --updated
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: Setting $expand=status will include the status of the internal services of the environment in the Time Series Insights service.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_tsi_environment_delete
+- az_tsi_environment_gen1
+- az_tsi_environment_gen1_create
+- az_tsi_environment_gen1_update
+- az_tsi_environment_gen2
+- az_tsi_environment_gen2_create
+- az_tsi_environment_gen2_update
+- az_tsi_environment_list
+- az_tsi_environment_show
+- az_tsi_environment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage environment with Azure Time Series Insights.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/environment/gen1.yml b/2017-03-09-profile/docs-ref-autogen/tsi/environment/gen1.yml
new file mode 100644
index 0000000000..c23c21c14d
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/environment/gen1.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_environment_gen1
+name: az tsi environment gen1
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi environment gen1** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage a gen1 environment in the specified subscription and resource group.
+description: ''
+directCommands:
+- uid: az_tsi_environment_gen1_create
+  name: az tsi environment gen1 create
+  summary: Create a gen1 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen1 create --data-retention-time
+                                   --environment-name
+                                   --location
+                                   --resource-group
+                                   --sku
+                                   [--exceeded-behavior {PauseIngress, PurgeOldData}]
+                                   [--key-properties]
+                                   [--no-wait]
+                                   [--tags]
+  examples:
+  - summary: EnvironmentsGen1Create
+    syntax: az tsi environment gen1 create --name "env1" --location westus --data-retention-time "P31D" --partition-key-properties name="DeviceId1" type="String" --sku name="S1" capacity=1 --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --data-retention-time
+    summary: ISO8601 timespan specifying the minimum number of days the environment's events will be available for query.
+    description: ''
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The sku determines the type of environment, either S1 or S2. For Gen1 environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
+    description: >-
+      Usage: --sku name=XX capacity=XX
+
+
+      name: Required. The name of this SKU.
+
+      capacity: Required. The capacity of the sku. This value can be changed to support scale out of             environments after they have been created.
+  optionalParameters:
+  - name: --exceeded-behavior --storage-limit-exceeded-behavior
+    parameterValueGroup: PauseIngress, PurgeOldData
+    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
+    description: ''
+  - name: --key-properties --partition-key-properties
+    summary: The list of event properties which will be used to partition data in the environment. Currently, only a single partition key property is supported.
+    description: >-
+      Usage: --partition-key-properties name=XX type=XX
+
+
+      name: The name of the property.
+
+      type: The type of the property.
+
+
+      Multiple actions can be specified by using more than one --partition-key-properties argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_tsi_environment_gen1_update
+  name: az tsi environment gen1 update
+  summary: Update a gen1 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen1 update --environment-name
+                                   --resource-group
+                                   [--data-retention-time]
+                                   [--exceeded-behavior {PauseIngress, PurgeOldData}]
+                                   [--no-wait]
+                                   [--sku]
+                                   [--tags]
+  examples:
+  - summary: EnvironmentsGen1Update
+    syntax: az tsi environment gen1 update --name "env1" --sku name="S1" capacity=2                --resource-group "rg1" --data-retention-time "P30D" --storage-limit-exceeded-behavior PurgeOldData
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-retention-time
+    summary: ISO8601 timespan specifying the minimum number of days the environment's events will be available for query.
+    description: ''
+  - name: --exceeded-behavior --storage-limit-exceeded-behavior
+    parameterValueGroup: PauseIngress, PurgeOldData
+    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: The sku determines the type of environment, either S1 or S2. For Gen1 environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
+    description: >-
+      Usage: --sku name=XX capacity=XX
+
+
+      name: Required. The name of this SKU.
+
+      capacity: Required. The capacity of the sku. This value can be changed to support scale out of             environments after they have been created.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_tsi_environment_gen1_create
+- az_tsi_environment_gen1_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage a gen1 environment in the specified subscription and resource group.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/environment/gen2.yml b/2017-03-09-profile/docs-ref-autogen/tsi/environment/gen2.yml
new file mode 100644
index 0000000000..6146c2bcef
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/environment/gen2.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_environment_gen2
+name: az tsi environment gen2
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi environment gen2** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage a gen2 environment in the specified subscription and resource group.
+description: ''
+directCommands:
+- uid: az_tsi_environment_gen2_create
+  name: az tsi environment gen2 create
+  summary: Create a gen2 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen2 create --environment-name
+                                   --id-properties
+                                   --location
+                                   --resource-group
+                                   --sku
+                                   --storage-config
+                                   [--no-wait]
+                                   [--tags]
+                                   [--warm-store-config]
+  examples:
+  - summary: EnvironmentsGen2Create
+    syntax: az tsi environment gen2 create --name "env2" --location westus --resource-group "rg1"                --sku name="L1" capacity=1 --time-series-id-properties name=idName type=String                --storage-configuration account-name=your-account-name management-key=your-account-key
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --id-properties --time-series-id-properties
+    summary: The list of event properties which will be used to define the environment's time series id.
+    description: >-
+      Usage: --time-series-id-properties name=XX type=String
+
+
+      name: The name of the property.
+
+      type: The type of the property.
+
+
+      Multiple actions can be specified by using more than one --time-series-id-properties argument.
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The sku determines the type of environment, L1.
+    description: >-
+      Usage: --sku name=XX capacity=XX
+
+
+      name: Required. The name of this SKU.
+
+      capacity: Required. The capacity of the sku.
+  - isRequired: true
+    name: --storage-config --storage-configuration
+    summary: The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data.
+    description: >-
+      Usage: --storage-configuration account-name=XX management-key=XX
+
+
+      account-name: Required. The name of the storage account that will hold the environment's Gen2 data.
+
+      management-key: Required. The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --warm-store-config --warm-store-configuration
+    summary: The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query.
+    description: >-
+      Usage: --warm-store-configuration data-retention=XX
+
+
+      data-retention: Required. ISO8601 timespan specifying the number of days the environment's events will be available for query from the warm store.
+- uid: az_tsi_environment_gen2_update
+  name: az tsi environment gen2 update
+  summary: Update a gen2 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen2 update --environment-name
+                                   --resource-group
+                                   [--no-wait]
+                                   [--storage-config]
+                                   [--tags]
+                                   [--warm-store-config]
+  examples:
+  - summary: EnvironmentsGen2Update
+    syntax: az tsi environment gen2 update --name "env2" --resource-group "rg1"                --warm-store-configuration data-retention=P30D                --storage-configuration account-name=your-account-name management-key=your-account-key
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-config --storage-configuration
+    summary: The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data.
+    description: >-
+      Usage: --storage-configuration account-name=XX management-key=XX
+
+
+      account-name: Required. The name of the storage account that will hold the environment's Gen2 data.
+
+      management-key: Required. The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --warm-store-config --warm-store-configuration
+    summary: The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query.
+    description: >-
+      Usage: --warm-store-configuration data-retention=XX
+
+
+      data-retention: Required. ISO8601 timespan specifying the number of days the environment's events will be available for query from the warm store.
+commands:
+- az_tsi_environment_gen2_create
+- az_tsi_environment_gen2_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage a gen2 environment in the specified subscription and resource group.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/event-source.yml b/2017-03-09-profile/docs-ref-autogen/tsi/event-source.yml
new file mode 100644
index 0000000000..4fc277cff9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/event-source.yml
@@ -0,0 +1,109 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_event-source
+name: az tsi event-source
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi event-source** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event source with timeseriesinsights.
+description: ''
+directCommands:
+- uid: az_tsi_event-source_delete
+  name: az tsi event-source delete
+  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
+  description: ''
+  syntax: >-
+    az tsi event-source delete --environment-name
+                               --event-source-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: DeleteEventSource
+    syntax: az tsi event-source delete --environment-name "env1" --name "es1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_event-source_list
+  name: az tsi event-source list
+  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
+  description: ''
+  syntax: >-
+    az tsi event-source list --environment-name
+                             --resource-group
+  examples:
+  - summary: ListEventSourcesByEnvironment
+    syntax: az tsi event-source list --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_event-source_show
+  name: az tsi event-source show
+  summary: Show the event source with the specified name in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source show --environment-name
+                             --event-source-name
+                             --resource-group
+  examples:
+  - summary: GetEventHubEventSource
+    syntax: az tsi event-source show --environment-name "env1" --name "es1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_tsi_event-source_delete
+- az_tsi_event-source_eventhub
+- az_tsi_event-source_eventhub_create
+- az_tsi_event-source_eventhub_update
+- az_tsi_event-source_iothub
+- az_tsi_event-source_iothub_create
+- az_tsi_event-source_iothub_update
+- az_tsi_event-source_list
+- az_tsi_event-source_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event source with timeseriesinsights.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/event-source/eventhub.yml b/2017-03-09-profile/docs-ref-autogen/tsi/event-source/eventhub.yml
new file mode 100644
index 0000000000..63c1d57372
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/event-source/eventhub.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_event-source_eventhub
+name: az tsi event-source eventhub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi event-source eventhub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event source with timeseriesinsights sub group event-hub.
+description: ''
+directCommands:
+- uid: az_tsi_event-source_eventhub_create
+  name: az tsi event-source eventhub create
+  summary: Create an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source eventhub create --consumer-group-name
+                                        --environment-name
+                                        --event-hub-name
+                                        --event-source-name
+                                        --event-source-resource-id
+                                        --key-name
+                                        --location
+                                        --namespace
+                                        --resource-group
+                                        --shared-access-key
+                                        [--local-timestamp]
+                                        [--tags]
+                                        [--timestamp-property-name]
+  examples:
+  - summary: CreateEventHubEventSource
+    syntax: az tsi event-source eventhub create --environment-name "env1" --name "es1" --location westus --consumer-group-name "cgn" --event-hub-name "ehn" --event-source-resource-id "somePathInArm" --key-name "managementKey" --service-bus-namespace "sbn" --shared-access-key "someSecretvalue" --timestamp-property-name "someTimestampProperty" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --consumer-group-name
+    summary: The name of the event hub's consumer group that holds the partitions from which events will be read.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-hub-name
+    summary: The name of the event hub.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --event-source-resource-id --resource-id
+    summary: The resource id of the event source in Azure Resource Manager.
+    description: ''
+  - isRequired: true
+    name: --key-name --shared-access-policy-name
+    summary: The name of the SAS key that grants the Time Series Insights service access to the event hub. The shared access policies for this key must grant 'Listen' permissions to the event hub.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --namespace --service-bus-namespace
+    summary: The name of the service bus that contains the event hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --shared-access-key
+    summary: The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+- uid: az_tsi_event-source_eventhub_update
+  name: az tsi event-source eventhub update
+  summary: Update an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source eventhub update --environment-name
+                                        --event-source-name
+                                        --resource-group
+                                        [--local-timestamp]
+                                        [--shared-access-key]
+                                        [--tags]
+                                        [--timestamp-property-name]
+  examples:
+  - summary: UpdateEventHubEventSource
+    syntax: az tsi event-source eventhub update --environment-name "env1" --name "es1" --shared-access-key "someSecretvalue" --timestamp-property-name "someTimestampProperty" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --shared-access-key
+    summary: The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+commands:
+- az_tsi_event-source_eventhub_create
+- az_tsi_event-source_eventhub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event source with timeseriesinsights sub group event-hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/event-source/iothub.yml b/2017-03-09-profile/docs-ref-autogen/tsi/event-source/iothub.yml
new file mode 100644
index 0000000000..3d6605b5ec
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/event-source/iothub.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_event-source_iothub
+name: az tsi event-source iothub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi event-source iothub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event source with timeseriesinsights sub group iot-hub.
+description: ''
+directCommands:
+- uid: az_tsi_event-source_iothub_create
+  name: az tsi event-source iothub create
+  summary: Create an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source iothub create --consumer-group-name
+                                      --environment-name
+                                      --event-source-name
+                                      --event-source-resource-id
+                                      --iot-hub-name
+                                      --key-name
+                                      --location
+                                      --resource-group
+                                      --shared-access-key
+                                      [--local-timestamp]
+                                      [--tags]
+                                      [--timestamp-property-name]
+  examples:
+  - summary: CreateIotHubEventSource
+    syntax: az tsi event-source iothub create -g "rg" --environment-name "env1" --name "eventsource" --consumer-group-name "consumer-group" --iot-hub-name "iothub" --location westus --key-name "key-name" --shared-access-key "someSecretvalue" --event-source-resource-id "resource-id"
+  requiredParameters:
+  - isRequired: true
+    name: --consumer-group-name
+    summary: The name of the iot hub's consumer group that holds the partitions from which events will be read.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --event-source-resource-id --resource-id
+    summary: The resource id of the event source in Azure Resource Manager.
+    description: ''
+  - isRequired: true
+    name: --iot-hub-name
+    summary: The name of the iot hub.
+    description: ''
+  - isRequired: true
+    name: --key-name --shared-access-policy-name
+    summary: The name of the Shared Access Policy key that grants the Time Series Insights service access to the iot hub. This shared access policy key must grant 'service connect' permissions to the iot hub.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --shared-access-key
+    summary: The value of the Shared Access Policy key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+- uid: az_tsi_event-source_iothub_update
+  name: az tsi event-source iothub update
+  summary: Update an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source iothub update --environment-name
+                                      --event-source-name
+                                      --resource-group
+                                      [--local-timestamp]
+                                      [--shared-access-key]
+                                      [--tags]
+                                      [--timestamp-property-name]
+  examples:
+  - summary: UpdateIotHubEventSource
+    syntax: az tsi event-source iothub update -g "rg" --environment-name "env1" --name "eventsource"  --timestamp-property-name timestampProp --shared-access-key "someSecretvalue" --tags test=tag
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --shared-access-key
+    summary: The value of the Shared Access Policy key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+commands:
+- az_tsi_event-source_iothub_create
+- az_tsi_event-source_iothub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event source with timeseriesinsights sub group iot-hub.
diff --git a/2017-03-09-profile/docs-ref-autogen/tsi/reference-data-set.yml b/2017-03-09-profile/docs-ref-autogen/tsi/reference-data-set.yml
new file mode 100644
index 0000000000..773c684ef1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/tsi/reference-data-set.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_reference-data-set
+name: az tsi reference-data-set
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi reference-data-set** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage reference data set with timeseriesinsights.
+description: ''
+directCommands:
+- uid: az_tsi_reference-data-set_create
+  name: az tsi reference-data-set create
+  summary: Create a reference data set in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set create --environment-name
+                                     --key-properties
+                                     --location
+                                     --name
+                                     --resource-group
+                                     [--comparison-behavior {Ordinal, OrdinalIgnoreCase}]
+                                     [--tags]
+  examples:
+  - summary: ReferenceDataSetsCreate
+    syntax: az tsi reference-data-set create --environment-name "env1" --location westus --key-properties name="DeviceId1" type="String" --key-properties name="DeviceFloor" type="Double" --name "rds1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --key-properties
+    summary: The list of key properties for the reference data set.
+    description: >-
+      Usage: --key-properties name=XX type=XX
+
+
+      name: The name of the key property.
+
+      type: The type of the key property.
+
+
+      Multiple actions can be specified by using more than one --key-properties argument.
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --comparison-behavior --data-string-comparison-behavior
+    parameterValueGroup: Ordinal, OrdinalIgnoreCase
+    summary: The reference data set key comparison behavior can be set using this property. By default, the value is 'Ordinal' - which means case sensitive key comparison will be performed while joining reference data with events or while adding new reference data. When 'OrdinalIgnoreCase' is set, case insensitive comparison will be used.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_tsi_reference-data-set_delete
+  name: az tsi reference-data-set delete
+  summary: Delete the reference data set.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set delete --environment-name
+                                     --name
+                                     --resource-group
+                                     [--yes]
+  examples:
+  - summary: ReferenceDataSetsDelete
+    syntax: az tsi reference-data-set delete --environment-name "env1" --name "rds1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_reference-data-set_list
+  name: az tsi reference-data-set list
+  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set list --environment-name
+                                   --resource-group
+  examples:
+  - summary: ReferenceDataSetsListByEnvironment
+    syntax: az tsi reference-data-set list --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_reference-data-set_show
+  name: az tsi reference-data-set show
+  summary: Show the reference data set with the specified name in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set show --environment-name
+                                   --name
+                                   --resource-group
+  examples:
+  - summary: ReferenceDataSetsGet
+    syntax: az tsi reference-data-set show --environment-name "env1" --name "rds1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_reference-data-set_update
+  name: az tsi reference-data-set update
+  summary: Update the reference data set.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set update --environment-name
+                                     --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: ReferenceDataSetsUpdate
+    syntax: az tsi reference-data-set update --environment-name "env1" --name "rds1" --tags someKey="someValue" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_tsi_reference-data-set_create
+- az_tsi_reference-data-set_delete
+- az_tsi_reference-data-set_list
+- az_tsi_reference-data-set_show
+- az_tsi_reference-data-set_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage reference data set with timeseriesinsights.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm.yml b/2017-03-09-profile/docs-ref-autogen/vm.yml
index a4b8c29ed0..aa3e7f2191 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm.yml
@@ -1,207 +1,251 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_auto_shutdown
-  - az_vm_capture
-  - az_vm_create
-  - az_vm_deallocate
-  - az_vm_delete
-  - az_vm_generalize
-  - az_vm_get_instance_view
-  - az_vm_list
-  - az_vm_list_ip_addresses
-  - az_vm_list_sizes
-  - az_vm_list_usage
-  - az_vm_list_vm_resize_options
-  - az_vm_open_port
-  - az_vm_redeploy
-  - az_vm_resize
-  - az_vm_restart
-  - az_vm_show
-  - az_vm_start
-  - az_vm_stop
-  - az_vm_update
-  - az_vm_wait
-- uid: az_vm_auto_shutdown
+### YamlMime:AzureCLIGroup
+uid: az_vm
+name: az vm
+summary: Manage Linux or Windows virtual machines.
+description: ''
+directCommands:
+- uid: az_vm_auto-shutdown
   name: az vm auto-shutdown
   summary: Manage auto-shutdown for VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm auto-shutdown [--email]
+                        [--ids]
+                        [--location]
+                        [--name]
+                        [--off]
+                        [--resource-group]
+                        [--subscription]
+                        [--time]
+                        [--webhook]
   examples:
   - summary: Create auto-shutdown schedule for a VM.
-    syntax:
-      content: az vm auto-shutdown -g MyResourceGroup -n MyVm --time 1730 --email "foo@bar.com" --webhook "https://example.com/"
+    syntax: az vm auto-shutdown -g MyResourceGroup -n MyVm --time 1730 --email "foo@bar.com" --webhook "https://example.com/"
   - summary: Delete auto-shutdown schedule for a VM.
-    syntax:
-      content: az vm auto-shutdown -g MyResourceGroup -n MyVm --off
-  parameters:
+    syntax: az vm auto-shutdown -g MyResourceGroup -n MyVm --off
+  optionalParameters:
   - name: --email
     summary: The email recipient to send notifications to (can be a list of semi-colon separated email addresses).
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --off
     summary: Turn off auto-shutdown for VM. Configuration will be cleared.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --time
     summary: 'The UTC time of day the schedule will occur every day. Format: hhmm. Example: 1730.'
     description: ''
   - name: --webhook
     summary: The webhook URL to which the notification will be sent.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_capture
   name: az vm capture
   summary: Capture information for a stopped VM.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image.
+  syntax: >-
+    az vm capture --vhd-name-prefix
+                  [--ids]
+                  [--name]
+                  [--overwrite]
+                  [--resource-group]
+                  [--storage-container]
+                  [--subscription]
   examples:
   - summary: Deallocate, generalize, and capture a stopped virtual machine.
-    syntax:
-      content: >-
-        az vm deallocate -g MyResourceGroup -n MyVm
+    syntax: >-
+      az vm deallocate -g MyResourceGroup -n MyVm
 
-        az vm generalize -g MyResourceGroup -n MyVm
+      az vm generalize -g MyResourceGroup -n MyVm
 
-        az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
+      az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
   - summary: Deallocate, generalize, and capture multiple stopped virtual machines.
-    syntax:
-      content: >-
-        vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: >-
+      vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 
-        az vm deallocate --ids {vms_ids}
+      az vm deallocate --ids {vms_ids}
 
-        az vm generalize --ids {vms_ids}
+      az vm generalize --ids {vms_ids}
 
-        az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
-  parameters:
+      az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
+  requiredParameters:
   - isRequired: true
     name: --vhd-name-prefix
     summary: The VHD name prefix specify for the VM disks.
     description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
   - name: --overwrite
     defaultValue: "1"
     summary: Overwrite the existing disk file.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --storage-container
     defaultValue: vhds
     summary: The storage account container name in which to save the disks.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_create
   name: az vm create
   summary: Create an Azure Virtual Machine.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-quick-create-cli">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-quick-create-cli</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/linux/quick-create-cli.
+  syntax: >-
+    az vm create --name
+                 --resource-group
+                 [--admin-password]
+                 [--admin-username]
+                 [--assign-identity]
+                 [--attach-data-disks]
+                 [--attach-os-disk]
+                 [--authentication-type {all, password, ssh}]
+                 [--availability-set]
+                 [--boot-diagnostics-storage]
+                 [--computer-name]
+                 [--count]
+                 [--custom-data]
+                 [--data-disk-caching]
+                 [--data-disk-sizes-gb]
+                 [--encryption-at-host {false, true}]
+                 [--eviction-policy]
+                 [--generate-ssh-keys]
+                 [--image]
+                 [--license-type {None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server}]
+                 [--location]
+                 [--nics]
+                 [--no-wait]
+                 [--nsg]
+                 [--nsg-rule {NONE, RDP, SSH}]
+                 [--os-disk-caching {None, ReadOnly, ReadWrite}]
+                 [--os-disk-name]
+                 [--os-disk-size-gb]
+                 [--os-type {linux, windows}]
+                 [--plan-name]
+                 [--plan-product]
+                 [--plan-promotion-code]
+                 [--plan-publisher]
+                 [--private-ip-address]
+                 [--public-ip-address]
+                 [--public-ip-address-allocation {dynamic, static}]
+                 [--public-ip-address-dns-name]
+                 [--public-ip-sku]
+                 [--role]
+                 [--scope]
+                 [--secrets]
+                 [--size]
+                 [--specialized {false, true}]
+                 [--ssh-dest-key-path]
+                 [--ssh-key-name]
+                 [--ssh-key-values]
+                 [--storage-account]
+                 [--storage-container-name]
+                 [--storage-sku]
+                 [--subnet]
+                 [--subnet-address-prefix]
+                 [--subscription]
+                 [--tags]
+                 [--use-unmanaged-disk]
+                 [--validate]
+                 [--vmss]
+                 [--vnet-address-prefix]
+                 [--vnet-name]
+                 [--workspace]
   examples:
   - summary: Create a default Ubuntu VM with automatic SSH authentication.
-    syntax:
-      content: az vm create -n MyVm -g MyResourceGroup --image UbuntuLTS
+    syntax: az vm create -n MyVm -g MyResourceGroup --image UbuntuLTS
   - summary: Create a default RedHat VM with automatic SSH authentication using an image URN.
-    syntax:
-      content: az vm create -n MyVm -g MyResourceGroup --image RedHat:RHEL:7-RAW:7.4.2018010506
+    syntax: az vm create -n MyVm -g MyResourceGroup --image RedHat:RHEL:7-RAW:7.4.2018010506
   - summary: Create a default Windows Server VM with a private IP address.
-    syntax:
-      content: az vm create -n MyVm -g MyResourceGroup --public-ip-address "" --image Win2012R2Datacenter
+    syntax: az vm create -n MyVm -g MyResourceGroup --public-ip-address "" --image Win2012R2Datacenter
   - summary: Create a VM from a custom managed image.
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --image MyImage
+    syntax: az vm create -g MyResourceGroup -n MyVm --image MyImage
   - summary: Create a VM from a specialized image version.
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --image $id --specialized
+    syntax: az vm create -g MyResourceGroup -n MyVm --image $id --specialized
   - summary: Create a VM by attaching to a managed operating system disk.
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --attach-os-disk MyOsDisk --os-type linux
-  - summary: 'Create an Ubuntu Linux VM using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init.'
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --image debian --custom-data MyCloudInitScript.yml
+    syntax: az vm create -g MyResourceGroup -n MyVm --attach-os-disk MyOsDisk --os-type linux
+  - summary: 'Create an Ubuntu Linux VM using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/linux/using-cloud-init.'
+    syntax: az vm create -g MyResourceGroup -n MyVm --image debian --custom-data MyCloudInitScript.yml
   - summary: Create a Debian VM with SSH key authentication and a public DNS entry, located on an existing virtual network and availability set.
-    syntax:
-      content: >-
-        az vm create -n MyVm -g MyResourceGroup --image debian --vnet-name MyVnet --subnet subnet1 \
-            --availability-set MyAvailabilitySet --public-ip-address-dns-name MyUniqueDnsName \
-            --ssh-key-values @key-file
+    syntax: >-
+      az vm create -n MyVm -g MyResourceGroup --image debian --vnet-name MyVnet --subnet subnet1 \
+          --availability-set MyAvailabilitySet --public-ip-address-dns-name MyUniqueDnsName \
+          --ssh-key-values @key-file
   - summary: Create a simple Ubuntu Linux VM with a public IP address, DNS entry, two data disks (10GB and 20GB), and then generate ssh key pairs.
-    syntax:
-      content: >-
-        az vm create -n MyVm -g MyResourceGroup --public-ip-address-dns-name MyUniqueDnsName \
-            --image ubuntults --data-disk-sizes-gb 10 20 --size Standard_DS2_v2 \
-            --generate-ssh-keys
+    syntax: >-
+      az vm create -n MyVm -g MyResourceGroup --public-ip-address-dns-name MyUniqueDnsName \
+          --image ubuntults --data-disk-sizes-gb 10 20 --size Standard_DS2_v2 \
+          --generate-ssh-keys
   - summary: Create a Debian VM using Key Vault secrets.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
   - summary: Create a CentOS VM with a system assigned identity. The VM will have a 'Contributor' role with access to a storage account.
-    syntax:
-      content: az vm create -n MyVm -g rg1 --image centos --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
+    syntax: az vm create -n MyVm -g rg1 --image centos --assign-identity [system] --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
   - summary: Create a debian VM with a user assigned identity.
-    syntax:
-      content: az vm create -n MyVm -g rg1 --image debian --assign-identity  /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+    syntax: az vm create -n MyVm -g rg1 --image debian --assign-identity /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
   - summary: Create a debian VM with both system and user assigned identity.
-    syntax:
-      content: az vm create -n MyVm -g rg1 --image debian --assign-identity  [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
-  parameters:
+    syntax: az vm create -n MyVm -g rg1 --image debian --assign-identity [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+  - summary: Create multiple VMs. In this example, 3 VMs are created. They are MyVm0, MyVm1, MyVm2.
+    syntax: az vm create -n MyVm -g MyResourceGroup --image centos --count 3
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the virtual machine.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin-password
+    summary: Password for the VM if authentication type is 'Password'.
+    description: ''
+  - name: --admin-username
+    summary: Username for the VM. Default value is current username of OS. If the default value is system reserved, then default value will be set to azureuser. Please refer to https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/createorupdate#osprofile to get a full list of reserved values.
+    description: ''
+  - name: --assign-identity
+    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+    description: ''
+  - name: --attach-data-disks
+    summary: Attach existing data disks to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
+    description: ''
+  - name: --attach-os-disk
+    summary: Attach an existing OS disk to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
+    description: ''
+  - name: --authentication-type
+    parameterValueGroup: all, password, ssh
+    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
     description: ''
   - name: --availability-set
     summary: Name or ID of an existing availability set to add the VM to. None by default.
@@ -212,75 +256,65 @@ items:
   - name: --computer-name
     summary: The host OS name of the virtual machine. Defaults to the name of the VM.
     description: ''
+  - name: --count
+    summary: Number of virtual machines to create. Value range is [2, 250], inclusive. Don't specify this parameter if you want to create a normal single VM. The VMs are created in parallel. The output of this command is an array of VMs instead of one single VM. Each VM has its own public IP, NIC. VNET and NSG are shared. It is recommended that no existing public IP, NIC, VNET and NSG are in resource group. When --count is specified, --attach-data-disks, --attach-os-disk, --boot-diagnostics-storage, --computer-name, --host, --host-group, --nics, --os-disk-name, --private-ip-address, --public-ip-address, --public-ip-address-dns-name, --storage-account, --storage-container-name, --subnet, --use-unmanaged-disk, --vnet-name are not allowed.
+    description: ''
   - name: --custom-data
     summary: Custom init script file or text (cloud-init, cloud-config, etc..).
     description: ''
+  - name: --data-disk-caching
+    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `<lun>=<vaule1> <lun>=<value2>` to configure individual disk.
+    description: ''
+  - name: --data-disk-sizes-gb
+    summary: Space-separated empty managed data disk sizes in GB to create.
+    description: ''
+  - name: --encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable Host Encryption for the VM or VMSS. This will enable the encryption for all the disks including Resource/Temp disk at host itself.
+    description: ''
   - name: --eviction-policy
     summary: ''
     description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
+    description: ''
   - name: --image
-    summary: 'The name of the operating system image as a URN alias, URN, custom image name or ID, custom image version ID, or VHD blob URI. This parameter is required unless using `--attach-os-disk.` Valid URN format: "Publisher:Offer:Sku:Version".'
+    summary: 'The name of the operating system image as a URN alias, URN, custom image name or ID, custom image version ID, or VHD blob URI. This parameter is required unless using `--attach-os-disk.` Valid URN format: "Publisher:Offer:Sku:Version". For more information, see https://docs.microsoft.com/azure/virtual-machines/linux/cli-ps-findimage.'
     description: ''
     valueFrom: az vm image list, az vm image show
   - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
+    parameterValueGroup: None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server
     summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
   - name: --location -l
     summary: Location in which to create VM and related resources. If default location is not configured, will default to the resource group's location.
     description: ''
+  - name: --nics
+    summary: Names or IDs of existing NICs to attach to the VM. The first NIC will be designated as primary. If omitted, a new NIC will be created. If an existing NIC is specified, do not specify subnet, VNet, public IP or NSG.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --public-ip-sku
-    summary: ''
-    description: ''
-  - name: --secrets
-    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
-    description: ''
-  - name: --size
-    defaultValue: Standard_DS1_v2
-    summary: The VM size to be created. See <a href="https://azure.microsoft.com/pricing/details/virtual-machines/">https://azure.microsoft.com/pricing/details/virtual-machines/</a> for size info.
-    description: ''
-    valueFrom: az vm list-sizes
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
-  - name: --vmss
-    summary: Name or ID of an existing virtual machine scale set that the virtual machine should be assigned to. None by default.
-    description: ''
-  - name: --admin-password
-    summary: Password for the VM if authentication type is 'Password'.
-    description: ''
-  - name: --admin-username
-    defaultValue: your_system_user_login_name
-    summary: Username for the VM.
-    description: ''
-  - name: --authentication-type
-    parameterValueGroup: all, password, ssh
-    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
-    description: ''
-  - name: --generate-ssh-keys
-    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
+  - name: --nsg
+    summary: The name to use when creating a new Network Security Group (default) or referencing an existing one. Can also reference an existing NSG by ID or specify "" for none ('""' in Azure CLI using PowerShell or --% operator).
     description: ''
-  - name: --ssh-dest-key-path
-    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+  - name: --nsg-rule
+    parameterValueGroup: NONE, RDP, SSH
+    summary: NSG rule to create when creating a new NSG. Defaults to open ports for allowing RDP on Windows and allowing SSH on Linux. NONE represents no NSG rule.
     description: ''
-  - name: --ssh-key-values
-    summary: Space-separated list of SSH public keys or public key file paths.
+  - name: --os-disk-caching
+    parameterValueGroup: None, ReadOnly, ReadWrite
+    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
     description: ''
-  - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+  - name: --os-disk-name
+    summary: The name of the new VM OS disk.
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
+  - name: --os-disk-size-gb
+    summary: OS disk size in GB to create.
     description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
+  - name: --os-type
+    parameterValueGroup: linux, windows
+    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
     description: ''
   - name: --plan-name
     summary: Plan name.
@@ -294,19 +328,6 @@ items:
   - name: --plan-publisher
     summary: Plan publisher.
     description: ''
-  - name: --workspace
-    summary: Name or ID of Log Analytics Workspace. If you specify the workspace through its name, the workspace should be in the same resource group with the vm, otherwise a new workspace will be created.
-    description: ''
-  - name: --nics
-    summary: Names or IDs of existing NICs to attach to the VM. The first NIC will be designated as primary. If omitted, a new NIC will be created. If an existing NIC is specified, do not specify subnet, VNet, public IP or NSG.
-    description: ''
-  - name: --nsg
-    summary: The name to use when creating a new Network Security Group (default) or referencing an existing one. Can also reference an existing NSG by ID or specify "" for none ('""' in Azure CLI using PowerShell or --% operator).
-    description: ''
-  - name: --nsg-rule
-    parameterValueGroup: NONE, RDP, SSH
-    summary: NSG rule to create when creating a new NSG. Defaults to open ports for allowing RDP on Windows and allowing SSH on Linux. NONE represents no NSG rule.
-    description: ''
   - name: --private-ip-address
     summary: Static private IP address (e.g. 10.0.0.5).
     description: ''
@@ -320,50 +341,37 @@ items:
   - name: --public-ip-address-dns-name
     summary: Globally unique DNS name for a newly created public IP.
     description: ''
-  - name: --subnet
-    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
-    description: ''
-  - name: --subnet-address-prefix
-    defaultValue: 10.0.0.0/24
-    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vnet-address-prefix
-    defaultValue: 10.0.0.0/16
-    summary: The IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network when creating a new one or referencing an existing one.
-    description: ''
-  - name: --attach-data-disks
-    summary: Attach existing data disks to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
-    description: ''
-  - name: --attach-os-disk
-    summary: Attach an existing OS disk to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
-    description: ''
-  - name: --data-disk-caching
-    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `&lt;lun&gt;=&lt;vaule1&gt; &lt;lun&gt;=&lt;value2&gt;` to configure individual disk.
-    description: ''
-  - name: --data-disk-sizes-gb
-    summary: Space-separated empty managed data disk sizes in GB to create.
+  - name: --public-ip-sku
+    summary: ''
     description: ''
-  - name: --os-disk-caching
-    parameterValueGroup: None, ReadOnly, ReadWrite
-    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
     description: ''
-  - name: --os-disk-name
-    summary: The name of the new VM OS disk.
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
-  - name: --os-disk-size-gb
-    summary: OS disk size in GB to create.
+  - name: --secrets
+    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
     description: ''
-  - name: --os-type
-    parameterValueGroup: linux, windows
-    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
+  - name: --size
+    defaultValue: Standard_DS1_v2
+    summary: The VM size to be created. See https://azure.microsoft.com/pricing/details/virtual-machines/ for size info.
     description: ''
+    valueFrom: az vm list-sizes
   - name: --specialized
     parameterValueGroup: false, true
     summary: Indicate whether the source image is specialized.
     description: ''
+  - name: --ssh-dest-key-path
+    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+    description: ''
+  - name: --ssh-key-name
+    summary: Use it as public key in virtual machine. It should be an existing SSH key resource in Azure.
+    description: ''
+  - name: --ssh-key-values
+    summary: Space-separated list of SSH public keys or public key file paths.
+    description: ''
   - name: --storage-account
     summary: Only applicable when used with `--use-unmanaged-disk`. The name to use when creating a new storage account or referencing an existing one. If omitted, an appropriate storage account in the same resource group and location will be used, or a new one will be created.
     description: ''
@@ -373,204 +381,215 @@ items:
   - name: --storage-sku
     summary: 'The SKU of the storage account with which to persist VM. Use a singular sku that would be applied across all disks, or specify individual disks. Usage: [--storage-sku SKU | --storage-sku ID=SKU ID=SKU ID=SKU...], where each ID is "os" or a 0-indexed lun. Allowed values: Premium_LRS, Standard_LRS.'
     description: ''
-  - name: --use-unmanaged-disk
-    summary: Do not use managed disk to persist VM.
+  - name: --subnet
+    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
+    description: ''
+  - name: --subnet-address-prefix
+    defaultValue: 10.0.0.0/24
+    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --use-unmanaged-disk
+    summary: Do not use managed disk to persist VM.
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
+  - name: --vmss
+    summary: Name or ID of an existing virtual machine scale set that the virtual machine should be assigned to. None by default.
+    description: ''
+  - name: --vnet-address-prefix
+    defaultValue: 10.0.0.0/16
+    summary: The IP address prefix to use when creating a new VNet in CIDR format.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network when creating a new one or referencing an existing one.
+    description: ''
+  - name: --workspace
+    summary: Name or ID of Log Analytics Workspace. If you specify the workspace through its name, the workspace should be in the same resource group with the vm, otherwise a new workspace will be created.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_deallocate
   name: az vm deallocate
   summary: Deallocate a VM.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image.
+  syntax: >-
+    az vm deallocate [--ids]
+                     [--name]
+                     [--no-wait]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Deallocate, generalize, and capture a stopped virtual machine.
-    syntax:
-      content: >-
-        az vm deallocate -g MyResourceGroup -n MyVm
+    syntax: >-
+      az vm deallocate -g MyResourceGroup -n MyVm
 
-        az vm generalize -g MyResourceGroup -n MyVm
+      az vm generalize -g MyResourceGroup -n MyVm
 
-        az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
+      az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
   - summary: Deallocate, generalize, and capture multiple stopped virtual machines.
-    syntax:
-      content: >-
-        vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: >-
+      vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 
-        az vm deallocate --ids {vms_ids}
+      az vm deallocate --ids {vms_ids}
 
-        az vm generalize --ids {vms_ids}
+      az vm generalize --ids {vms_ids}
 
-        az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
+      az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
   - summary: Deallocate a VM. (autogenerated)
-    syntax:
-      content: az vm deallocate --name MyVm --no-wait --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm deallocate --name MyVm --no-wait --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_delete
   name: az vm delete
   summary: Delete a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm delete [--ids]
+                 [--name]
+                 [--no-wait]
+                 [--resource-group]
+                 [--subscription]
+                 [--yes]
   examples:
   - summary: Delete a VM without a prompt for confirmation.
-    syntax:
-      content: az vm delete -g MyResourceGroup -n MyVm --yes
+    syntax: az vm delete -g MyResourceGroup -n MyVm --yes
   - summary: Delete all VMs in a resource group.
-    syntax:
-      content: az vm delete --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az vm delete --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_generalize
   name: az vm generalize
   summary: Mark a VM as generalized, allowing it to be imaged for multiple deployments.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image.
+  syntax: >-
+    az vm generalize [--ids]
+                     [--name]
+                     [--no-wait]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Deallocate, generalize, and capture a stopped virtual machine.
-    syntax:
-      content: >-
-        az vm deallocate -g MyResourceGroup -n MyVm
+    syntax: >-
+      az vm deallocate -g MyResourceGroup -n MyVm
 
-        az vm generalize -g MyResourceGroup -n MyVm
+      az vm generalize -g MyResourceGroup -n MyVm
 
-        az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
+      az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
   - summary: Deallocate, generalize, and capture multiple stopped virtual machines.
-    syntax:
-      content: >-
-        vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: >-
+      vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 
-        az vm deallocate --ids {vms_ids}
+      az vm deallocate --ids ${vms_ids}
 
-        az vm generalize --ids {vms_ids}
+      az vm generalize --ids ${vms_ids}
 
-        az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+      az vm capture --ids ${vms_ids} --vhd-name-prefix MyPrefix
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_get_instance_view
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_get-instance-view
   name: az vm get-instance-view
   summary: Get instance information about a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm get-instance-view [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Use a resource group and name to get instance view information of a VM.
-    syntax:
-      content: az vm get-instance-view -g MyResourceGroup -n MyVm
+    syntax: az vm get-instance-view -g MyResourceGroup -n MyVm
   - summary: Get instance views for all VMs in a resource group.
-    syntax:
-      content: az vm get-instance-view --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm get-instance-view --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_list
   name: az vm list
   summary: List details of Virtual Machines.
-  description: For more information on querying information about Virtual Machines, see <a href="https://docs.microsoft.com/cli/azure/query-az-cli2">https://docs.microsoft.com/cli/azure/query-az-cli2</a>.
-  langs:
-  - azurecli
+  description: '`--resource-group` can pass in an empty string as a parameter, which will output all VM information under the subscription. For more information on querying information about Virtual Machines, see https://docs.microsoft.com/cli/azure/query-az-cli2.'
+  syntax: >-
+    az vm list [--query-examples]
+               [--resource-group]
+               [--show-details]
+               [--subscription]
   examples:
   - summary: List all VMs.
-    syntax:
-      content: az vm list
+    syntax: az vm list
   - summary: List all VMs by resource group.
-    syntax:
-      content: az vm list -g MyResourceGroup
+    syntax: az vm list -g MyResourceGroup
   - summary: List all VMs by resource group with details.
-    syntax:
-      content: az vm list -g MyResourceGroup -d
-  parameters:
+    syntax: az vm list -g MyResourceGroup -d
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --show-details -d
     summary: Show public ip address, FQDN, and power states. command will run slow.
@@ -578,148 +597,140 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_ip_addresses
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-ip-addresses
   name: az vm list-ip-addresses
   summary: List IP addresses associated with a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-ip-addresses [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Get the IP addresses for a VM.
-    syntax:
-      content: az vm list-ip-addresses -g MyResourceGroup -n MyVm
+    syntax: az vm list-ip-addresses -g MyResourceGroup -n MyVm
   - summary: Get IP addresses for all VMs in a resource group.
-    syntax:
-      content: az vm list-ip-addresses --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm list-ip-addresses --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_sizes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-sizes
   name: az vm list-sizes
   summary: List available sizes for VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-sizes --location
+                     [--subscription]
   examples:
   - summary: List the available VM sizes in the West US region.
-    syntax:
-      content: az vm list-sizes -l westus
-  parameters:
+    syntax: az vm list-sizes -l westus
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_usage
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-usage
   name: az vm list-usage
   summary: List available usage resources for VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-usage --location
+                     [--subscription]
   examples:
   - summary: Get the compute resource usage for the West US region.
-    syntax:
-      content: az vm list-usage -l westus
-  parameters:
+    syntax: az vm list-usage -l westus
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_vm_resize_options
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-vm-resize-options
   name: az vm list-vm-resize-options
   summary: List available resizing options for VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-vm-resize-options [--ids]
+                                 [--name]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List all available VM sizes for resizing.
-    syntax:
-      content: az vm list-vm-resize-options -g MyResourceGroup -n MyVm
+    syntax: az vm list-vm-resize-options -g MyResourceGroup -n MyVm
   - summary: List available sizes for all VMs in a resource group.
-    syntax:
-      content: az vm list-vm-resize-options --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm list-vm-resize-options --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_open_port
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_open-port
   name: az vm open-port
   summary: Opens a VM to inbound traffic on specified ports.
   description: Adds a security rule to the network security group (NSG) that is attached to the VM's network interface (NIC) or subnet. The existing NSG will be used or a new one will be created. The rule name is 'open-port-{port}' and will overwrite an existing rule with this name. For multi-NIC VMs, or for more fine-grained control, use the appropriate network commands directly (nsg rule create, etc).
-  langs:
-  - azurecli
+  syntax: >-
+    az vm open-port --port
+                    [--apply-to-subnet]
+                    [--ids]
+                    [--name]
+                    [--nsg-name]
+                    [--priority]
+                    [--resource-group]
+                    [--subscription]
   examples:
   - summary: Open all ports on a VM to inbound traffic.
-    syntax:
-      content: az vm open-port -g MyResourceGroup -n MyVm --port '*'
+    syntax: az vm open-port -g MyResourceGroup -n MyVm --port '*'
   - summary: Open a range of ports on a VM to inbound traffic with the highest priority.
-    syntax:
-      content: az vm open-port -g MyResourceGroup -n MyVm --port 80-100 --priority 100
+    syntax: az vm open-port -g MyResourceGroup -n MyVm --port 80-100 --priority 100
+  - summary: Open ports 555, 557, 558, and 559 to inbound traffic with the highest priority.
+    syntax: az vm open-port -g MyResourceGroup -n MyVm --port 555,557-559 --priority 100
   - summary: Open all ports for all VMs in a resource group.
-    syntax:
-      content: az vm open-port --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv) --port '*'
-  parameters:
+    syntax: az vm open-port --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv) --port '*'
+  requiredParameters:
   - isRequired: true
     name: --port
-    summary: "The port or port range (ex: 80-100) to open inbound traffic to. Use '\\*' to allow traffic to all ports."
+    summary: "The port or port range (ex: 80-100) to open inbound traffic to. Use '\\*' to allow traffic to all ports. Use comma separated values to specify more than one port or port range."
     description: ''
+  optionalParameters:
   - name: --apply-to-subnet
     summary: Allow inbound traffic on the subnet instead of the NIC.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the virtual machine to open inbound traffic on.
+    description: ''
   - name: --nsg-name
     summary: The name of the network security group to create if one does not exist. Ignored if an NSG already exists.
     description: ''
@@ -727,289 +738,283 @@ items:
     defaultValue: "900"
     summary: Rule priority, between 100 (highest priority) and 4096 (lowest priority). Must be unique for each rule in the collection.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the virtual machine to open inbound traffic on.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_redeploy
   name: az vm redeploy
   summary: Redeploy an existing VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm redeploy [--ids]
+                   [--name]
+                   [--no-wait]
+                   [--resource-group]
+                   [--subscription]
   examples:
   - summary: Redeploy a VM.
-    syntax:
-      content: az vm redeploy -g MyResourceGroup -n MyVm
+    syntax: az vm redeploy -g MyResourceGroup -n MyVm
   - summary: Redeploy all VMs in a resource group.
-    syntax:
-      content: az vm redeploy --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm redeploy --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_resize
   name: az vm resize
   summary: Update a VM's size.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm resize --size
+                 [--ids]
+                 [--name]
+                 [--no-wait]
+                 [--resource-group]
+                 [--subscription]
   examples:
   - summary: Resize a VM.
-    syntax:
-      content: az vm resize -g MyResourceGroup -n MyVm --size Standard_DS3_v2
+    syntax: az vm resize -g MyResourceGroup -n MyVm --size Standard_DS3_v2
   - summary: Resize all VMs in a resource group.
-    syntax:
-      content: az vm resize --size Standard_DS3_v2 --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm resize --size Standard_DS3_v2 --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  requiredParameters:
   - isRequired: true
     name: --size
     summary: The VM size.
     description: ''
     valueFrom: az vm list-vm-resize-options
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_restart
   name: az vm restart
   summary: Restart VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm restart [--force]
+                  [--ids]
+                  [--name]
+                  [--no-wait]
+                  [--resource-group]
+                  [--subscription]
   examples:
   - summary: Restart a VM.
-    syntax:
-      content: az vm restart -g MyResourceGroup -n MyVm
+    syntax: az vm restart -g MyResourceGroup -n MyVm
   - summary: Restart all VMs in a resource group.
-    syntax:
-      content: az vm restart --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm restart --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --force
     summary: Force the VM to restart by redeploying it. Use if the VM is unresponsive.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_show
   name: az vm show
   summary: Get the details of a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm show [--ids]
+               [--name]
+               [--query-examples]
+               [--resource-group]
+               [--show-details]
+               [--subscription]
   examples:
   - summary: Show information about a VM.
-    syntax:
-      content: az vm show -g MyResourceGroup -n MyVm -d
+    syntax: az vm show -g MyResourceGroup -n MyVm -d
   - summary: Get the details for all VMs in a resource group.
-    syntax:
-      content: az vm show -d --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --show-details -d
-    summary: Show public ip address, FQDN, and power states. command will run slow.
-    description: ''
+    syntax: az vm show -d --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --show-details -d
+    summary: Show public ip address, FQDN, and power states. command will run slow.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_start
   name: az vm start
   summary: Start a stopped VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm start [--ids]
+                [--name]
+                [--no-wait]
+                [--resource-group]
+                [--subscription]
   examples:
   - summary: Start a stopped VM.
-    syntax:
-      content: az vm start -g MyResourceGroup -n MyVm
+    syntax: az vm start -g MyResourceGroup -n MyVm
   - summary: Start all VMs in a resource group.
-    syntax:
-      content: az vm start --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm start --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Start a stopped VM. (autogenerated)
-    syntax:
-      content: az vm start --name MyVm --no-wait --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm start --name MyVm --no-wait --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_stop
   name: az vm stop
   summary: Power off (stop) a running VM.
   description: The VM will continue to be billed. To avoid this, you can deallocate the VM through "az vm deallocate".
-  langs:
-  - azurecli
+  syntax: >-
+    az vm stop [--ids]
+               [--name]
+               [--no-wait]
+               [--resource-group]
+               [--subscription]
   examples:
   - summary: Power off (stop) a running VM.
-    syntax:
-      content: az vm stop --resource-group MyResourceGroup --name MyVm
+    syntax: az vm stop --resource-group MyResourceGroup --name MyVm
   - summary: Power off a running VM without shutting down.
-    syntax:
-      content: az vm stop --resource-group MyResourceGroup --name MyVm --skip-shutdown
+    syntax: az vm stop --resource-group MyResourceGroup --name MyVm --skip-shutdown
   - summary: Power off VMs in a resource group.
-    syntax:
-      content: az vm stop --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm stop --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_update
   name: az vm update
   summary: Update the properties of a VM.
   description: Update VM objects and properties using paths that correspond to 'az vm show'.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm update [--add]
+                 [--disk-caching]
+                 [--force-string]
+                 [--ids]
+                 [--license-type {None, RHEL_BYOS, RHEL_ELS_6, SLES_BYOS, Windows_Client, Windows_Server}]
+                 [--name]
+                 [--no-wait]
+                 [--remove]
+                 [--resource-group]
+                 [--set]
+                 [--subscription]
+                 [--workspace]
   examples:
   - summary: Add or update a tag.
-    syntax:
-      content: az vm update -n name -g group --set tags.tagName=tagValue
+    syntax: az vm update -n name -g group --set tags.tagName=tagValue
   - summary: Remove a tag.
-    syntax:
-      content: az vm update -n name -g group --remove tags.tagName
+    syntax: az vm update -n name -g group --remove tags.tagName
   - summary: Set the primary NIC of a VM.
-    syntax:
-      content: az vm update -n name -g group --set networkProfile.networkInterfaces[1].primary=false networkProfile.networkInterfaces[0].primary=true
+    syntax: az vm update -n name -g group --set networkProfile.networkInterfaces[1].primary=false networkProfile.networkInterfaces[0].primary=true
   - summary: Add a new non-primary NIC to a VM.
-    syntax:
-      content: az vm update -n name -g group --add networkProfile.networkInterfaces primary=false id={NIC_ID}
+    syntax: az vm update -n name -g group --add networkProfile.networkInterfaces primary=false id={NIC_ID}
   - summary: Remove the fourth NIC from a VM.
-    syntax:
-      content: az vm update -n name -g group --remove networkProfile.networkInterfaces 3
-  parameters:
+    syntax: az vm update -n name -g group --remove networkProfile.networkInterfaces 3
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --disk-caching
     summary: Use singular value to apply across, or specify individual disks, e.g. 'os=ReadWrite 0=None 1=ReadOnly' should enable update os disk and 2 data disks.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
+    parameterValueGroup: None, RHEL_BYOS, RHEL_ELS_6, SLES_BYOS, Windows_Client, Windows_Server
     summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -1017,50 +1022,29 @@ items:
   - name: --workspace
     summary: Name or ID of Log Analytics Workspace. If you specify the workspace through its name, the workspace should be in the same resource group with the vm, otherwise a new workspace will be created.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_wait
   name: az vm wait
   summary: Place the CLI in a waiting state until a condition of the VM is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm wait [--created]
+               [--custom]
+               [--deleted]
+               [--exists]
+               [--ids]
+               [--interval]
+               [--name]
+               [--resource-group]
+               [--subscription]
+               [--timeout]
+               [--updated]
   examples:
   - summary: Wait until a VM is created.
-    syntax:
-      content: az vm wait -g MyResourceGroup -n MyVm --created
+    syntax: az vm wait -g MyResourceGroup -n MyVm --created
   - summary: Wait until all VMs in a resource group are deleted.
-    syntax:
-      content: az vm wait --deleted --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az vm wait --deleted --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -1073,10 +1057,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -1084,271 +1080,103 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_auto_shutdown
-  name: az vm auto-shutdown
-  summary: Manage auto-shutdown for VM.
-- uid: az_vm_availability_set
-  name: az vm availability-set
-  summary: Group resources into availability sets.
-- uid: az_vm_availability_set_create
-  name: az vm availability-set create
-  summary: Create an Azure Availability Set.
-- uid: az_vm_availability_set_delete
-  name: az vm availability-set delete
-  summary: Delete an availability set.
-- uid: az_vm_availability_set_list
-  name: az vm availability-set list
-  summary: List availability sets.
-- uid: az_vm_availability_set_list_sizes
-  name: az vm availability-set list-sizes
-  summary: List VM sizes for an availability set.
-- uid: az_vm_availability_set_show
-  name: az vm availability-set show
-  summary: Get information for an availability set.
-- uid: az_vm_availability_set_update
-  name: az vm availability-set update
-  summary: Update an Azure Availability Set.
-- uid: az_vm_boot_diagnostics
-  name: az vm boot-diagnostics
-  summary: Troubleshoot the startup of an Azure Virtual Machine.
-- uid: az_vm_boot_diagnostics_disable
-  name: az vm boot-diagnostics disable
-  summary: Disable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_enable
-  name: az vm boot-diagnostics enable
-  summary: Enable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_get_boot_log
-  name: az vm boot-diagnostics get-boot-log
-  summary: Get the boot diagnostics log from a VM.
-- uid: az_vm_capture
-  name: az vm capture
-  summary: Capture information for a stopped VM.
-- uid: az_vm_create
-  name: az vm create
-  summary: Create an Azure Virtual Machine.
-- uid: az_vm_deallocate
-  name: az vm deallocate
-  summary: Deallocate a VM.
-- uid: az_vm_delete
-  name: az vm delete
-  summary: Delete a VM.
-- uid: az_vm_diagnostics
-  name: az vm diagnostics
-  summary: Configure the Azure Virtual Machine diagnostics extension.
-- uid: az_vm_diagnostics_get_default_config
-  name: az vm diagnostics get-default-config
-  summary: Get the default configuration settings for a VM.
-- uid: az_vm_diagnostics_set
-  name: az vm diagnostics set
-  summary: Configure the Azure VM diagnostics extension.
-- uid: az_vm_encryption
-  name: az vm encryption
-  summary: Manage encryption of VM disks.
-- uid: az_vm_encryption_disable
-  name: az vm encryption disable
-  summary: Disable disk encryption on the OS disk and/or data disks. Decrypt mounted disks.
-- uid: az_vm_encryption_enable
-  name: az vm encryption enable
-  summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks.
-- uid: az_vm_encryption_show
-  name: az vm encryption show
-  summary: Show encryption status.
-- uid: az_vm_extension
-  name: az vm extension
-  summary: Manage extensions on VMs.
-- uid: az_vm_extension_delete
-  name: az vm extension delete
-  summary: Remove an extension attached to a VM.
-- uid: az_vm_extension_image
-  name: az vm extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vm_extension_image_list
-  name: az vm extension image list
-  summary: List the information on available extensions.
-- uid: az_vm_extension_image_list_names
-  name: az vm extension image list-names
-  summary: List the names of available extensions.
-- uid: az_vm_extension_image_list_versions
-  name: az vm extension image list-versions
-  summary: List the versions for available extensions.
-- uid: az_vm_extension_image_show
-  name: az vm extension image show
-  summary: Display information for an extension.
-- uid: az_vm_extension_list
-  name: az vm extension list
-  summary: List the extensions attached to a VM.
-- uid: az_vm_extension_set
-  name: az vm extension set
-  summary: Set extensions for a VM.
-- uid: az_vm_extension_show
-  name: az vm extension show
-  summary: Display information about extensions attached to a VM.
-- uid: az_vm_extension_wait
-  name: az vm extension wait
-  summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met.
-- uid: az_vm_generalize
-  name: az vm generalize
-  summary: Mark a VM as generalized, allowing it to be imaged for multiple deployments.
-- uid: az_vm_get_instance_view
-  name: az vm get-instance-view
-  summary: Get instance information about a VM.
-- uid: az_vm_identity
-  name: az vm identity
-  summary: Manage service identities of a VM.
-- uid: az_vm_identity_assign
-  name: az vm identity assign
-  summary: Enable managed service identity on a VM.
-- uid: az_vm_identity_show
-  name: az vm identity show
-  summary: Display VM's managed identity info.
-- uid: az_vm_image
-  name: az vm image
-  summary: Information on available virtual machine images.
-- uid: az_vm_image_accept_terms
-  name: az vm image accept-terms
-  summary: Accept Azure Marketplace term so that the image can be used to create VMs.
-- uid: az_vm_image_list
-  name: az vm image list
-  summary: List the VM/VMSS images available in the Azure Marketplace.
-- uid: az_vm_image_list_offers
-  name: az vm image list-offers
-  summary: List the VM image offers available in the Azure Marketplace.
-- uid: az_vm_image_list_publishers
-  name: az vm image list-publishers
-  summary: List the VM image publishers available in the Azure Marketplace.
-- uid: az_vm_image_list_skus
-  name: az vm image list-skus
-  summary: List the VM image SKUs available in the Azure Marketplace.
-- uid: az_vm_image_show
-  name: az vm image show
-  summary: Get the details for a VM image available in the Azure Marketplace.
-- uid: az_vm_image_terms
-  name: az vm image terms
-  summary: Manage Azure Marketplace image terms.
-- uid: az_vm_image_terms_accept
-  name: az vm image terms accept
-  summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-- uid: az_vm_image_terms_cancel
-  name: az vm image terms cancel
-  summary: Cancel Azure Marketplace image terms.
-- uid: az_vm_image_terms_show
-  name: az vm image terms show
-  summary: Get the details of Azure Marketplace image terms.
-- uid: az_vm_list
-  name: az vm list
-  summary: List details of Virtual Machines.
-- uid: az_vm_list_ip_addresses
-  name: az vm list-ip-addresses
-  summary: List IP addresses associated with a VM.
-- uid: az_vm_list_sizes
-  name: az vm list-sizes
-  summary: List available sizes for VMs.
-- uid: az_vm_list_usage
-  name: az vm list-usage
-  summary: List available usage resources for VMs.
-- uid: az_vm_list_vm_resize_options
-  name: az vm list-vm-resize-options
-  summary: List available resizing options for VMs.
-- uid: az_vm_monitor
-  name: az vm monitor
-  summary: Manage monitor aspect for a vm.
-- uid: az_vm_monitor_log
-  name: az vm monitor log
-  summary: Manage log analytics workspace for a vm.
-- uid: az_vm_monitor_log_show
-  name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
-- uid: az_vm_nic
-  name: az vm nic
-  summary: Manage network interfaces. See also `az network nic`.
-- uid: az_vm_nic_add
-  name: az vm nic add
-  summary: Add existing NICs to a VM.
-- uid: az_vm_nic_list
-  name: az vm nic list
-  summary: List the NICs available on a VM.
-- uid: az_vm_nic_remove
-  name: az vm nic remove
-  summary: Remove NICs from a VM.
-- uid: az_vm_nic_set
-  name: az vm nic set
-  summary: Configure settings of a NIC attached to a VM.
-- uid: az_vm_nic_show
-  name: az vm nic show
-  summary: Display information for a NIC attached to a VM.
-- uid: az_vm_open_port
-  name: az vm open-port
-  summary: Opens a VM to inbound traffic on specified ports.
-- uid: az_vm_redeploy
-  name: az vm redeploy
-  summary: Redeploy an existing VM.
-- uid: az_vm_resize
-  name: az vm resize
-  summary: Update a VM's size.
-- uid: az_vm_restart
-  name: az vm restart
-  summary: Restart VMs.
-- uid: az_vm_secret
-  name: az vm secret
-  summary: Manage VM secrets.
-- uid: az_vm_secret_add
-  name: az vm secret add
-  summary: Add a secret to a VM.
-- uid: az_vm_secret_format
-  name: az vm secret format
-  summary: Transform secrets into a form that can be used by VMs and VMSSes.
-- uid: az_vm_secret_list
-  name: az vm secret list
-  summary: List secrets on a VM.
-- uid: az_vm_secret_remove
-  name: az vm secret remove
-  summary: Remove a secret from a VM.
-- uid: az_vm_show
-  name: az vm show
-  summary: Get the details of a VM.
-- uid: az_vm_start
-  name: az vm start
-  summary: Start a stopped VM.
-- uid: az_vm_stop
-  name: az vm stop
-  summary: Power off (stop) a running VM.
-- uid: az_vm_unmanaged_disk
-  name: az vm unmanaged-disk
-  summary: Manage the unmanaged data disks attached to a VM.
-- uid: az_vm_unmanaged_disk_attach
-  name: az vm unmanaged-disk attach
-  summary: Attach an unmanaged persistent disk to a VM.
-- uid: az_vm_unmanaged_disk_detach
-  name: az vm unmanaged-disk detach
-  summary: Detach an unmanaged disk from a VM.
-- uid: az_vm_unmanaged_disk_list
-  name: az vm unmanaged-disk list
-  summary: List unmanaged disks of a VM.
-- uid: az_vm_update
-  name: az vm update
-  summary: Update the properties of a VM.
-- uid: az_vm_user
-  name: az vm user
-  summary: Manage user accounts for a VM.
-- uid: az_vm_user_delete
-  name: az vm user delete
-  summary: Delete a user account from a VM.
-- uid: az_vm_user_reset_ssh
-  name: az vm user reset-ssh
-  summary: Reset the SSH configuration on a VM.
-- uid: az_vm_user_update
-  name: az vm user update
-  summary: Update a user account.
-- uid: az_vm_wait
-  name: az vm wait
-  summary: Place the CLI in a waiting state until a condition of the VM is met.
+- az_vm_aem
+- az_vm_aem_delete
+- az_vm_aem_set
+- az_vm_aem_verify
+- az_vm_auto-shutdown
+- az_vm_availability-set
+- az_vm_availability-set_create
+- az_vm_availability-set_delete
+- az_vm_availability-set_list
+- az_vm_availability-set_list-sizes
+- az_vm_availability-set_show
+- az_vm_availability-set_update
+- az_vm_boot-diagnostics
+- az_vm_boot-diagnostics_disable
+- az_vm_boot-diagnostics_enable
+- az_vm_boot-diagnostics_get-boot-log
+- az_vm_capture
+- az_vm_create
+- az_vm_deallocate
+- az_vm_delete
+- az_vm_diagnostics
+- az_vm_diagnostics_get-default-config
+- az_vm_diagnostics_set
+- az_vm_encryption
+- az_vm_encryption_disable
+- az_vm_encryption_enable
+- az_vm_encryption_show
+- az_vm_extension
+- az_vm_extension_delete
+- az_vm_extension_image
+- az_vm_extension_image_list
+- az_vm_extension_image_list-names
+- az_vm_extension_image_list-versions
+- az_vm_extension_image_show
+- az_vm_extension_list
+- az_vm_extension_set
+- az_vm_extension_show
+- az_vm_extension_wait
+- az_vm_generalize
+- az_vm_get-instance-view
+- az_vm_identity
+- az_vm_identity_assign
+- az_vm_identity_show
+- az_vm_image
+- az_vm_image_accept-terms
+- az_vm_image_list
+- az_vm_image_list-offers
+- az_vm_image_list-publishers
+- az_vm_image_list-skus
+- az_vm_image_show
+- az_vm_image_terms
+- az_vm_image_terms_accept
+- az_vm_image_terms_cancel
+- az_vm_image_terms_show
+- az_vm_list
+- az_vm_list-ip-addresses
+- az_vm_list-sizes
+- az_vm_list-usage
+- az_vm_list-vm-resize-options
+- az_vm_monitor
+- az_vm_monitor_log
+- az_vm_monitor_log_show
+- az_vm_nic
+- az_vm_nic_add
+- az_vm_nic_list
+- az_vm_nic_remove
+- az_vm_nic_set
+- az_vm_nic_show
+- az_vm_open-port
+- az_vm_redeploy
+- az_vm_repair
+- az_vm_repair_create
+- az_vm_repair_list-scripts
+- az_vm_repair_restore
+- az_vm_repair_run
+- az_vm_resize
+- az_vm_restart
+- az_vm_secret
+- az_vm_secret_add
+- az_vm_secret_format
+- az_vm_secret_list
+- az_vm_secret_remove
+- az_vm_show
+- az_vm_start
+- az_vm_stop
+- az_vm_unmanaged-disk
+- az_vm_unmanaged-disk_attach
+- az_vm_unmanaged-disk_detach
+- az_vm_unmanaged-disk_list
+- az_vm_update
+- az_vm_user
+- az_vm_user_delete
+- az_vm_user_reset-ssh
+- az_vm_user_update
+- az_vm_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1364,10 +1192,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage Linux or Windows virtual machines.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage Linux or Windows virtual machines.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/aem.yml b/2017-03-09-profile/docs-ref-autogen/vm/aem.yml
new file mode 100644
index 0000000000..f0f5bad17c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vm/aem.yml
@@ -0,0 +1,102 @@
+### YamlMime:AzureCLIGroup
+uid: az_vm_aem
+name: az vm aem
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aem** extension for Azure CLI and requires version 2.19.1 or higher.  The extension will automatically install the first time you run an **az vm aem** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Enhanced Monitoring Extension for SAP.
+description: ''
+directCommands:
+- uid: az_vm_aem_delete
+  name: az vm aem delete
+  summary: Remove Azure Enhanced Monitoring Extension.
+  description: ''
+  syntax: >-
+    az vm aem delete --name
+                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vm_aem_set
+  name: az vm aem set
+  summary: Configure Azure Enhanced Monitoring Extension.
+  description: It can take up to 15 minutes for the monitoring data to appear in the SAP system.
+  syntax: >-
+    az vm aem set --name
+                  --resource-group
+                  [--install-new-extension]
+                  [--set-access-to-individual-resources]
+                  [--skip-storage-analytics]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --install-new-extension -i
+    summary: Install the new VM Extension for SAP.
+    description: ''
+  - name: --set-access-to-individual-resources -s
+    summary: Set the access of the VM identity to the individual resources, e.g. data disks instead of the complete resource group.
+    description: ''
+  - name: --skip-storage-analytics
+    summary: Skip enabling analytics on storage accounts.
+    description: ''
+- uid: az_vm_aem_verify
+  name: az vm aem verify
+  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
+  description: ''
+  syntax: >-
+    az vm aem verify --name
+                     --resource-group
+                     [--skip-storage-check]
+                     [--wait-time-in-minutes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --skip-storage-check
+    summary: Disables the test for table content.
+    description: ''
+  - name: --wait-time-in-minutes
+    defaultValue: "15"
+    summary: Maximum minutes to wait for the storage metrics to be available.
+    description: ''
+commands:
+- az_vm_aem_delete
+- az_vm_aem_set
+- az_vm_aem_verify
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Enhanced Monitoring Extension for SAP.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/availability-set.yml b/2017-03-09-profile/docs-ref-autogen/vm/availability-set.yml
index c0ee2f2a98..a9b7734aef 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/availability-set.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/availability-set.yml
@@ -1,39 +1,38 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_availability_set
-  name: az vm availability-set
-  summary: Group resources into availability sets.
-  description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
-  langs:
-  - azurecli
-  children:
-  - az_vm_availability_set_create
-  - az_vm_availability_set_delete
-  - az_vm_availability_set_list
-  - az_vm_availability_set_list_sizes
-  - az_vm_availability_set_show
-  - az_vm_availability_set_update
-- uid: az_vm_availability_set_create
+### YamlMime:AzureCLIGroup
+uid: az_vm_availability-set
+name: az vm availability-set
+summary: Group resources into availability sets.
+description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
+directCommands:
+- uid: az_vm_availability-set_create
   name: az vm availability-set create
   summary: Create an Azure Availability Set.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability</a>.
-  langs:
-  - azurecli
+  description: For more information, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability.
+  syntax: >-
+    az vm availability-set create --name
+                                  --resource-group
+                                  [--location]
+                                  [--no-wait]
+                                  [--platform-fault-domain-count]
+                                  [--platform-update-domain-count]
+                                  [--subscription]
+                                  [--tags]
+                                  [--validate]
   examples:
   - summary: Create an availability set.
-    syntax:
-      content: az vm availability-set create -n MyAvSet -g MyResourceGroup --platform-fault-domain-count 2 --platform-update-domain-count 2
-  parameters:
+    syntax: az vm availability-set create -n MyAvSet -g MyResourceGroup --platform-fault-domain-count 2 --platform-update-domain-count 2
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the availability set.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -45,32 +44,29 @@ items:
   - name: --platform-update-domain-count
     summary: Update Domain count. If unspecified, the server will pick the most optimal number like 5.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --validate
     summary: Generate and validate the ARM template without creating any resources.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_delete
   name: az vm availability-set delete
   summary: Delete an availability set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set delete [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Delete an availability set.
-    syntax:
-      content: az vm availability-set delete -n MyAvSet -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set delete -n MyAvSet -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -78,51 +74,47 @@ items:
     summary: Name of the availability set.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_list
   name: az vm availability-set list
   summary: List availability sets.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set list [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: List availability sets.
-    syntax:
-      content: az vm availability-set list -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_list_sizes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_list-sizes
   name: az vm availability-set list-sizes
   summary: List VM sizes for an availability set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set list-sizes [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
   examples:
   - summary: List VM sizes for an availability set.
-    syntax:
-      content: az vm availability-set list-sizes -n MyAvSet -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set list-sizes -n MyAvSet -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -130,115 +122,99 @@ items:
     summary: Name of the availability set.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_show
   name: az vm availability-set show
   summary: Get information for an availability set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set show [--ids]
+                                [--name]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Get information about an availability set.
-    syntax:
-      content: az vm availability-set show -n MyAvSet -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set show -n MyAvSet -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the availability set.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_update
   name: az vm availability-set update
   summary: Update an Azure Availability Set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set update [--add]
+                                  [--availability-set-name]
+                                  [--force-string]
+                                  [--ids]
+                                  [--name]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--subscription]
   examples:
   - summary: Update an availability set.
-    syntax:
-      content: az vm availability-set update -n MyAvSet -g MyResourceGroup
+    syntax: az vm availability-set update -n MyAvSet -g MyResourceGroup
   - summary: Update an availability set tag.
-    syntax:
-      content: az vm availability-set update -n MyAvSet -g MyResourceGroup --set tags.foo=value
+    syntax: az vm availability-set update -n MyAvSet -g MyResourceGroup --set tags.foo=value
   - summary: Remove an availability set tag.
-    syntax:
-      content: az vm availability-set update -n MyAvSet -g MyResourceGroup --remove tags.foo
-  parameters:
+    syntax: az vm availability-set update -n MyAvSet -g MyResourceGroup --remove tags.foo
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --availability-set-name
     summary: Name of the availability set.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the availability set.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_availability_set_create
-  name: az vm availability-set create
-  summary: Create an Azure Availability Set.
-- uid: az_vm_availability_set_delete
-  name: az vm availability-set delete
-  summary: Delete an availability set.
-- uid: az_vm_availability_set_list
-  name: az vm availability-set list
-  summary: List availability sets.
-- uid: az_vm_availability_set_list_sizes
-  name: az vm availability-set list-sizes
-  summary: List VM sizes for an availability set.
-- uid: az_vm_availability_set_show
-  name: az vm availability-set show
-  summary: Get information for an availability set.
-- uid: az_vm_availability_set_update
-  name: az vm availability-set update
-  summary: Update an Azure Availability Set.
+- az_vm_availability-set_create
+- az_vm_availability-set_delete
+- az_vm_availability-set_list
+- az_vm_availability-set_list-sizes
+- az_vm_availability-set_show
+- az_vm_availability-set_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -254,10 +230,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/boot-diagnostics.yml b/2017-03-09-profile/docs-ref-autogen/vm/boot-diagnostics.yml
index 73e5ac1fea..7eb6931808 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/boot-diagnostics.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/boot-diagnostics.yml
@@ -1,125 +1,101 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_boot_diagnostics
-  name: az vm boot-diagnostics
-  summary: Troubleshoot the startup of an Azure Virtual Machine.
-  description: Use this feature to troubleshoot boot failures for custom or platform images.
-  langs:
-  - azurecli
-  children:
-  - az_vm_boot_diagnostics_disable
-  - az_vm_boot_diagnostics_enable
-  - az_vm_boot_diagnostics_get_boot_log
-- uid: az_vm_boot_diagnostics_disable
+### YamlMime:AzureCLIGroup
+uid: az_vm_boot-diagnostics
+name: az vm boot-diagnostics
+summary: Troubleshoot the startup of an Azure Virtual Machine.
+description: Use this feature to troubleshoot boot failures for custom or platform images.
+directCommands:
+- uid: az_vm_boot-diagnostics_disable
   name: az vm boot-diagnostics disable
   summary: Disable the boot diagnostics on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm boot-diagnostics disable [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
   examples:
   - summary: Disable boot diagnostics on all VMs in a resource group.
-    syntax:
-      content: az vm boot-diagnostics disable --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm boot-diagnostics disable --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Disable the boot diagnostics on a VM
-    syntax:
-      content: az vm boot-diagnostics disable --ids $(az vm list --resource-group MyResourceGroup --query "[].id" -o tsv) --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm boot-diagnostics disable --ids $(az vm list --resource-group MyResourceGroup --query "[].id" -o tsv) --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_boot_diagnostics_enable
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_boot-diagnostics_enable
   name: az vm boot-diagnostics enable
   summary: Enable the boot diagnostics on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm boot-diagnostics enable [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--storage]
+                                  [--subscription]
   examples:
   - summary: Enable boot diagnostics on all VMs in a resource group.
-    syntax:
-      content: az vm boot-diagnostics enable --storage https://mystor.blob.core.windows.net/ --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm boot-diagnostics enable --storage https://mystor.blob.core.windows.net/ --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Enable the boot diagnostics on a VM. (autogenerated)
-    syntax:
-      content: az vm boot-diagnostics enable --name MyVirtualMachine --resource-group MyResourceGroup --storage https://mystor.blob.core.windows.net/
-  parameters:
-  - isRequired: true
-    name: --storage
-    summary: Name or URI of a storage account (e.g. <a href="https://your_storage_account_name.blob.core.windows.net/">https://your_storage_account_name.blob.core.windows.net/</a>).
-    description: ''
+    syntax: az vm boot-diagnostics enable --name MyVirtualMachine --resource-group MyResourceGroup --storage https://mystor.blob.core.windows.net/
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --storage
+    summary: Name or URI of a storage account (e.g. https://your_storage_account_name.blob.core.windows.net/). If it's not specified, managed storage will be used.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_boot_diagnostics_get_boot_log
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_boot-diagnostics_get-boot-log
   name: az vm boot-diagnostics get-boot-log
   summary: Get the boot diagnostics log from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm boot-diagnostics get-boot-log [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Get diagnostics logs for all VMs in a resource group.
-    syntax:
-      content: az vm boot-diagnostics get-boot-log --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm boot-diagnostics get-boot-log --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Get the boot diagnostics log from a VM. (autogenerated)
-    syntax:
-      content: az vm boot-diagnostics get-boot-log --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm boot-diagnostics get-boot-log --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_boot_diagnostics_disable
-  name: az vm boot-diagnostics disable
-  summary: Disable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_enable
-  name: az vm boot-diagnostics enable
-  summary: Enable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_get_boot_log
-  name: az vm boot-diagnostics get-boot-log
-  summary: Get the boot diagnostics log from a VM.
+- az_vm_boot-diagnostics_disable
+- az_vm_boot-diagnostics_enable
+- az_vm_boot-diagnostics_get-boot-log
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -135,10 +111,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Use this feature to troubleshoot boot failures for custom or platform images.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Use this feature to troubleshoot boot failures for custom or platform images.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/diagnostics.yml b/2017-03-09-profile/docs-ref-autogen/vm/diagnostics.yml
index 7e6cabfef4..bf7976ad93 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/diagnostics.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/diagnostics.yml
@@ -1,161 +1,152 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_diagnostics
-  name: az vm diagnostics
-  summary: Configure the Azure Virtual Machine diagnostics extension.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_diagnostics_get_default_config
-  - az_vm_diagnostics_set
-- uid: az_vm_diagnostics_get_default_config
+### YamlMime:AzureCLIGroup
+uid: az_vm_diagnostics
+name: az vm diagnostics
+summary: Configure the Azure Virtual Machine diagnostics extension.
+description: ''
+directCommands:
+- uid: az_vm_diagnostics_get-default-config
   name: az vm diagnostics get-default-config
   summary: Get the default configuration settings for a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm diagnostics get-default-config [--is-windows-os]
+                                         [--subscription]
   examples:
   - summary: Get the default diagnostics for a Linux VM and override the storage account name and the VM resource ID.
-    syntax:
-      content: >-
-        az vm diagnostics get-default-config \
-            | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#MyStorageAccount#g" \
-            | sed "s#__VM_OR_VMSS_RESOURCE_ID__#MyVmResourceId#g"
+    syntax: >-
+      az vm diagnostics get-default-config \
+          | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#MyStorageAccount#g" \
+          | sed "s#__VM_OR_VMSS_RESOURCE_ID__#MyVmResourceId#g"
   - summary: Get the default diagnostics for a Windows VM.
-    syntax:
-      content: az vm diagnostics get-default-config --is-windows-os
-  parameters:
+    syntax: az vm diagnostics get-default-config --is-windows-os
+  optionalParameters:
   - name: --is-windows-os
     summary: For Windows VMs.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_diagnostics_set
   name: az vm diagnostics set
   summary: Configure the Azure VM diagnostics extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm diagnostics set --settings
+                          [--ids]
+                          [--no-auto-upgrade {false, true}]
+                          [--no-auto-upgrade-minor-version {false, true}]
+                          [--protected-settings]
+                          [--resource-group]
+                          [--subscription]
+                          [--version]
+                          [--vm-name]
   examples:
   - summary: Set up default diagnostics on a Linux VM for Azure Portal VM metrics graphs and syslog collection.
-    syntax:
-      content: >-
-        # Set the following 3 parameters first.
+    syntax: >-
+      # Set the following 3 parameters first.
 
-        my_resource_group={Resource group name containing your Linux VM and the storage account}
+      my_resource_group={Resource group name containing your Linux VM and the storage account}
 
-        my_linux_vm={Your Azure Linux VM name}
+      my_linux_vm={Your Azure Linux VM name}
 
-        my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
+      my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
 
 
-        my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_linux_vm --query "id" -o tsv)
+      my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_linux_vm --query "id" -o tsv)
 
 
-        default_config=$(az vm diagnostics get-default-config \
-            | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
-            | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
+      default_config=$(az vm diagnostics get-default-config \
+          | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
+          | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
 
-        storage_sastoken=$(az storage account generate-sas \
-            --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
-            --permissions wlacu --resource-types co --services bt -o tsv)
+      storage_sastoken=$(az storage account generate-sas \
+          --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
+          --permissions wlacu --resource-types co --services bt -o tsv)
 
-        protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
-            'storageAccountSasToken': '$storage_sastoken'}"
+      protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
+          'storageAccountSasToken': '$storage_sastoken'}"
 
-        az vm diagnostics set --settings "$default_config" \
-            --protected-settings "$protected_settings" \
-            --resource-group $my_resource_group --vm-name $my_linux_vm
+      az vm diagnostics set --settings "$default_config" \
+          --protected-settings "$protected_settings" \
+          --resource-group $my_resource_group --vm-name $my_linux_vm
   - summary: Set up default diagnostics on a Windows VM.
-    syntax:
-      content: >-
-        # Set the following 3 parameters first.
+    syntax: >-
+      # Set the following 3 parameters first.
 
-        my_resource_group={Resource group name containing your Windows VM and the storage account}
+      my_resource_group={Resource group name containing your Windows VM and the storage account}
 
-        my_windows_vm={Your Azure Windows VM name}
+      my_windows_vm={Your Azure Windows VM name}
 
-        my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
+      my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
 
 
-        my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_windows_vm --query "id" -o tsv)
+      my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_windows_vm --query "id" -o tsv)
 
 
-        default_config=$(az vm diagnostics get-default-config  --is-windows-os \
-            | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
-            | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
+      default_config=$(az vm diagnostics get-default-config  --is-windows-os \
+          | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
+          | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
 
-        # Please use the same options, the WAD diagnostic extension has strict
+      # Please use the same options, the WAD diagnostic extension has strict
 
-        # expectations of the sas token's format. Set the expiry as desired.
+      # expectations of the sas token's format. Set the expiry as desired.
 
-        storage_sastoken=$(az storage account generate-sas \
-            --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
-            --permissions acuw --resource-types co --services bt --https-only --output tsv)
+      storage_sastoken=$(az storage account generate-sas \
+          --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
+          --permissions acuw --resource-types co --services bt --https-only --output tsv)
 
-        protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
-            'storageAccountSasToken': '$storage_sastoken'}"
+      protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
+          'storageAccountSasToken': '$storage_sastoken'}"
 
-        az vm diagnostics set --settings "$default_config" \
-            --protected-settings "$protected_settings" \
-            --resource-group $my_resource_group --vm-name $my_windows_vm
+      az vm diagnostics set --settings "$default_config" \
+          --protected-settings "$protected_settings" \
+          --resource-group $my_resource_group --vm-name $my_windows_vm
 
-        # # Alternatively, if the WAD extension has issues parsing the sas token,
+      # # Alternatively, if the WAD extension has issues parsing the sas token,
 
-        # # one can use a storage account key instead.
+      # # one can use a storage account key instead.
 
-        storage_account_key=$(az storage account keys list --account-name {my_storage_account} \
-          --query [0].value -o tsv)
-        protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
-          'storageAccountKey': '$storage_account_key'}"
-  parameters:
+      storage_account_key=$(az storage account keys list --account-name {my_storage_account} \
+        --query [0].value -o tsv)
+      protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
+        'storageAccountKey': '$storage_account_key'}"
+  requiredParameters:
   - isRequired: true
     name: --settings
     summary: Json string or a file path, which defines data to be collected.
     description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --protected-settings
     summary: Json string or a file path containing private configurations such as storage account keys, etc.
     description: ''
-  - name: --version
-    summary: Version of the diagnostics extension. Will use the latest if not specfied.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version
+    summary: Version of the diagnostics extension. Will use the latest if not specfied.
+    description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_diagnostics_get_default_config
-  name: az vm diagnostics get-default-config
-  summary: Get the default configuration settings for a VM.
-- uid: az_vm_diagnostics_set
-  name: az vm diagnostics set
-  summary: Configure the Azure VM diagnostics extension.
+- az_vm_diagnostics_get-default-config
+- az_vm_diagnostics_set
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -171,10 +162,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Configure the Azure Virtual Machine diagnostics extension.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Configure the Azure Virtual Machine diagnostics extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/encryption.yml b/2017-03-09-profile/docs-ref-autogen/vm/encryption.yml
index 2eabf62112..64f854130b 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/encryption.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/encryption.yml
@@ -1,57 +1,50 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_encryption
-  name: az vm encryption
-  summary: Manage encryption of VM disks.
-  description: >-
-    For more information, see:
+### YamlMime:AzureCLIGroup
+uid: az_vm_encryption
+name: az vm encryption
+summary: Manage encryption of VM disks.
+description: >-
+  For more information, see:
 
-    <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>".
-  langs:
-  - azurecli
-  children:
-  - az_vm_encryption_disable
-  - az_vm_encryption_enable
-  - az_vm_encryption_show
+  https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview".
+directCommands:
 - uid: az_vm_encryption_disable
   name: az vm encryption disable
   summary: Disable disk encryption on the OS disk and/or data disks. Decrypt mounted disks.
   description: >-
     For Linux VMs, disabling encryption is only permitted on data volumes.
 
-    For Windows VMS, disabling encryption is permitted on both OS and data volumes.
-  langs:
-  - azurecli
+    For Windows VMs, disabling encryption is permitted on both OS and data volumes.
+  syntax: >-
+    az vm encryption disable [--force]
+                             [--ids]
+                             [--name]
+                             [--resource-group]
+                             [--subscription]
+                             [--volume-type {ALL, DATA, OS}]
   examples:
   - summary: Disable disk encryption on the OS disk and/or data disks. (autogenerated)
-    syntax:
-      content: az vm encryption disable --name MyVirtualMachine --resource-group MyResourceGroup --volume-type DATA
-  parameters:
+    syntax: az vm encryption disable --name MyVirtualMachine --resource-group MyResourceGroup --volume-type DATA
+  optionalParameters:
   - name: --force
     summary: Continue by ignoring client side validation errors.
     description: ''
-  - name: --volume-type
-    parameterValueGroup: ALL, DATA, OS
-    summary: Type of volume that the encryption operation is performed on.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --volume-type
+    parameterValueGroup: ALL, DATA, OS
+    summary: Type of volume that the encryption operation is performed on.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_encryption_enable
   name: az vm encryption enable
   summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks.
@@ -60,27 +53,51 @@ items:
 
     For more information, see:
 
-    <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>.
-  langs:
-  - azurecli
+    https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview.
+  syntax: >-
+    az vm encryption enable --disk-encryption-keyvault
+                            [--aad-client-cert-thumbprint]
+                            [--aad-client-id]
+                            [--aad-client-secret]
+                            [--encrypt-format-all]
+                            [--force]
+                            [--ids]
+                            [--key-encryption-algorithm]
+                            [--key-encryption-key]
+                            [--key-encryption-keyvault]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+                            [--volume-type {ALL, DATA, OS}]
   examples:
   - summary: encrypt a VM using a key vault in the same resource group
-    syntax:
-      content: az vm encryption enable -g MyResourceGroup -n MyVm --disk-encryption-keyvault MyVault
+    syntax: az vm encryption enable -g MyResourceGroup -n MyVm --disk-encryption-keyvault MyVault
   - summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks. (autogenerated)
-    syntax:
-      content: az vm encryption enable --disk-encryption-keyvault MyVault --name MyVm --resource-group MyResourceGroup --volume-type DATA
-  parameters:
+    syntax: az vm encryption enable --disk-encryption-keyvault MyVault --name MyVm --resource-group MyResourceGroup --volume-type DATA
+  requiredParameters:
   - isRequired: true
     name: --disk-encryption-keyvault
     summary: Name or ID of the key vault where the generated encryption key will be placed.
     description: ''
+  optionalParameters:
+  - name: --aad-client-cert-thumbprint
+    summary: Thumbprint of the AAD app certificate with permissions to write secrets to the key vault.
+    description: ''
+  - name: --aad-client-id
+    summary: Client ID of an AAD app with permissions to write secrets to the key vault.
+    description: ''
+  - name: --aad-client-secret
+    summary: Client secret of the AAD app with permissions to write secrets to the key vault.
+    description: ''
   - name: --encrypt-format-all
     summary: Encrypts-formats data disks instead of encrypting them. Encrypt-formatting is a lot faster than in-place encryption but wipes out the partition getting encrypt-formatted.
     description: ''
   - name: --force
     summary: Continue by ignoring client side validation errors.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --key-encryption-algorithm
     defaultValue: RSA-OAEP
     summary: ''
@@ -91,76 +108,54 @@ items:
   - name: --key-encryption-keyvault
     summary: Name or ID of the key vault containing the key encryption key used to encrypt the disk encryption key. If missing, CLI will use `--disk-encryption-keyvault`.
     description: ''
-  - name: --volume-type
-    parameterValueGroup: ALL, DATA, OS
-    summary: Type of volume that the encryption operation is performed on.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --aad-client-cert-thumbprint
-    summary: Thumbprint of the AAD app certificate with permissions to write secrets to the key vault.
-    description: ''
-  - name: --aad-client-id
-    summary: Client ID of an AAD app with permissions to write secrets to the key vault.
-    description: ''
-  - name: --aad-client-secret
-    summary: Client secret of the AAD app with permissions to write secrets to the key vault.
+  - name: --volume-type
+    parameterValueGroup: ALL, DATA, OS
+    summary: Type of volume that the encryption operation is performed on.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_encryption_show
   name: az vm encryption show
   summary: Show encryption status.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm encryption show [--ids]
+                          [--name]
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Show encryption status. (autogenerated)
-    syntax:
-      content: az vm encryption show --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm encryption show --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_encryption_disable
-  name: az vm encryption disable
-  summary: Disable disk encryption on the OS disk and/or data disks. Decrypt mounted disks.
-- uid: az_vm_encryption_enable
-  name: az vm encryption enable
-  summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks.
-- uid: az_vm_encryption_show
-  name: az vm encryption show
-  summary: Show encryption status.
+- az_vm_encryption_disable
+- az_vm_encryption_enable
+- az_vm_encryption_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,13 +171,10 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: >-
-  For more information, see:
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: >-
+    For more information, see:
 
-  <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>".
+    https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview".
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/extension.yml b/2017-03-09-profile/docs-ref-autogen/vm/extension.yml
index 8d961c82d4..80c9c53c56 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/extension.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/extension.yml
@@ -1,102 +1,110 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_extension
-  name: az vm extension
-  summary: Manage extensions on VMs.
-  description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
-  langs:
-  - azurecli
-  children:
-  - az_vm_extension_delete
-  - az_vm_extension_list
-  - az_vm_extension_set
-  - az_vm_extension_show
-  - az_vm_extension_wait
+### YamlMime:AzureCLIGroup
+uid: az_vm_extension
+name: az vm extension
+summary: Manage extensions on VMs.
+description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
+directCommands:
 - uid: az_vm_extension_delete
   name: az vm extension delete
   summary: Remove an extension attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension delete [--ids]
+                           [--name]
+                           [--no-wait]
+                           [--resource-group]
+                           [--subscription]
+                           [--vm-name]
   examples:
   - summary: Use a VM name and extension to delete an extension from a VM.
-    syntax:
-      content: az vm extension delete -g MyResourceGroup --vm-name MyVm -n extension_name
+    syntax: az vm extension delete -g MyResourceGroup --vm-name MyVm -n extension_name
   - summary: Delete extensions with IDs containing the string "MyExtension" from a VM.
-    syntax:
-      content: >-
-        az vm extension delete --ids \
-            $(az resource list --query "[?contains(name, 'MyExtension')].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: >-
+      az vm extension delete --ids \
+          $(az resource list --query "[?contains(name, 'MyExtension')].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the extension.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_list
   name: az vm extension list
   summary: List the extensions attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension list --resource-group
+                         --vm-name
+                         [--query-examples]
+                         [--subscription]
   examples:
   - summary: List attached extensions to a named VM.
-    syntax:
-      content: az vm extension list -g MyResourceGroup --vm-name MyVm
-  parameters:
+    syntax: az vm extension list -g MyResourceGroup --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_set
   name: az vm extension set
   summary: Set extensions for a VM.
   description: Get extension details from `az vm extension image list`.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension set --name
+                        --publisher
+                        [--enable-auto-upgrade {false, true}]
+                        [--extension-instance-name]
+                        [--force-update]
+                        [--ids]
+                        [--no-auto-upgrade {false, true}]
+                        [--no-auto-upgrade-minor-version {false, true}]
+                        [--no-wait]
+                        [--protected-settings]
+                        [--resource-group]
+                        [--settings]
+                        [--subscription]
+                        [--version]
+                        [--vm-name]
   examples:
   - summary: Add a user account to a Linux VM.
-    syntax:
-      content: >-
-        az vm extension set -n VMAccessForLinux --publisher Microsoft.OSTCExtensions --version 1.4 \
-            --vm-name MyVm --resource-group MyResourceGroup \
-            --protected-settings '{"username":"user1", "ssh_key":"ssh_rsa ..."}'
+    syntax: >-
+      az vm extension set -n VMAccessForLinux --publisher Microsoft.OSTCExtensions --version 1.4 \
+          --vm-name MyVm --resource-group MyResourceGroup \
+          --protected-settings '{"username":"user1", "ssh_key":"ssh_rsa ..."}'
   - summary: Add a customScript extension to VM(s) specified by --ids.
-    syntax:
-      content: az vm extension set -n customScript --publisher Microsoft.Azure.Extensions --ids {vm_id}
-  parameters:
+    syntax: az vm extension set -n customScript --publisher Microsoft.Azure.Extensions --ids {vm_id}
+  - summary: Add an extension and enable automatic upgrade by the platform if there is a newer version of the extension available.
+    syntax: >-
+      az vm extension set -n extName --publisher publisher --vm-name MyVM -g MyResourceGroup \
+
+      --enable-auto-upgrade true
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
@@ -106,57 +114,66 @@ items:
     name: --publisher
     summary: The name of the extension publisher.
     description: ''
+  optionalParameters:
+  - name: --enable-auto-upgrade
+    parameterValueGroup: false, true
+    summary: Indicate the extension should be automatically upgraded by the platform if there is a newer version of the extension available.
+    description: ''
   - name: --extension-instance-name
     summary: 'Name of extension instance, which can be customized. Default: name of the extension.'
     description: ''
   - name: --force-update
     summary: Force to update even if the extension configuration has not changed.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --protected-settings
     summary: Protected settings in JSON format for sensitive information like credentials. A JSON file path is also accepted.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --settings
     summary: Extension settings in JSON format. A JSON file path is also accepted.
     description: ''
-  - name: --version
-    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version
+    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade-minor-version.
+    description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_show
   name: az vm extension show
   summary: Display information about extensions attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension show [--expand]
+                         [--ids]
+                         [--name]
+                         [--query-examples]
+                         [--resource-group]
+                         [--subscription]
+                         [--vm-name]
   examples:
   - summary: Use VM name and extension name to show the extensions attached to a VM.
-    syntax:
-      content: az vm extension show -g MyResourceGroup --vm-name MyVm -n extension_name
-  parameters:
+    syntax: az vm extension show -g MyResourceGroup --vm-name MyVm -n extension_name
+  optionalParameters:
   - name: --expand
     summary: The expand expression to apply on the operation.
     description: ''
@@ -166,56 +183,45 @@ items:
   - name: --name -n
     summary: Name of the extension.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_wait
   name: az vm extension wait
   summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension wait [--created]
+                         [--custom]
+                         [--deleted]
+                         [--exists]
+                         [--expand]
+                         [--ids]
+                         [--interval]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
+                         [--timeout]
+                         [--updated]
+                         [--vm-name]
   examples:
   - summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met. (autogenerated)
-    syntax:
-      content: az vm extension wait --created --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
+    syntax: az vm extension wait --created --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
   - summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met. (autogenerated)
-    syntax:
-      content: az vm extension wait --exists --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
+    syntax: az vm extension wait --exists --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
   - summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met. (autogenerated)
-    syntax:
-      content: az vm extension wait --ids @- --name MyExtension --subscription MySubscription --updated --vm-name MyVm
-  parameters:
-  - name: --expand
-    summary: The expand expression to apply on the operation.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the extension.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
+    syntax: az vm extension wait --ids @- --name MyExtension --subscription MySubscription --updated --vm-name MyVm
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -228,10 +234,25 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --expand
+    summary: The expand expression to apply on the operation.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the extension.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -239,43 +260,21 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vm-name
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_extension_delete
-  name: az vm extension delete
-  summary: Remove an extension attached to a VM.
-- uid: az_vm_extension_image
-  name: az vm extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vm_extension_image_list
-  name: az vm extension image list
-  summary: List the information on available extensions.
-- uid: az_vm_extension_image_list_names
-  name: az vm extension image list-names
-  summary: List the names of available extensions.
-- uid: az_vm_extension_image_list_versions
-  name: az vm extension image list-versions
-  summary: List the versions for available extensions.
-- uid: az_vm_extension_image_show
-  name: az vm extension image show
-  summary: Display information for an extension.
-- uid: az_vm_extension_list
-  name: az vm extension list
-  summary: List the extensions attached to a VM.
-- uid: az_vm_extension_set
-  name: az vm extension set
-  summary: Set extensions for a VM.
-- uid: az_vm_extension_show
-  name: az vm extension show
-  summary: Display information about extensions attached to a VM.
-- uid: az_vm_extension_wait
-  name: az vm extension wait
-  summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met.
+- az_vm_extension_delete
+- az_vm_extension_image
+- az_vm_extension_image_list
+- az_vm_extension_image_list-names
+- az_vm_extension_image_list-versions
+- az_vm_extension_image_show
+- az_vm_extension_list
+- az_vm_extension_set
+- az_vm_extension_show
+- az_vm_extension_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -291,10 +290,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/extension/image.yml b/2017-03-09-profile/docs-ref-autogen/vm/extension/image.yml
index d6cbb5f238..1064c45e69 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/extension/image.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/extension/image.yml
@@ -1,36 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_extension_image
-  name: az vm extension image
-  summary: Find the available VM extensions for a subscription and region.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_extension_image_list
-  - az_vm_extension_image_list_names
-  - az_vm_extension_image_list_versions
-  - az_vm_extension_image_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_extension_image
+name: az vm extension image
+summary: Find the available VM extensions for a subscription and region.
+description: ''
+directCommands:
 - uid: az_vm_extension_image_list
   name: az vm extension image list
   summary: List the information on available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image list [--latest]
+                               [--location]
+                               [--name]
+                               [--publisher]
+                               [--query-examples]
+                               [--subscription]
+                               [--version]
   examples:
   - summary: List the unique publishers for extensions.
-    syntax:
-      content: az vm extension image list --query "[].publisher" -o tsv | sort -u
+    syntax: az vm extension image list --query "[].publisher" -o tsv | sort -u
   - summary: Find extensions with "Docker" in the name.
-    syntax:
-      content: az vm extension image list --query "[].name" -o tsv | sort -u | grep Docker
+    syntax: az vm extension image list --query "[].name" -o tsv | sort -u | grep Docker
   - summary: List extension names where the publisher name starts with "Microsoft.Azure.App".
-    syntax:
-      content: >-
-        az vm extension image list --query \
-            "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
-            -o tsv | sort -u | xargs -I{} az vm extension image list-names --publisher {} -l westus
-  parameters:
+    syntax: >-
+      az vm extension image list --query \
+          "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
+          -o tsv | sort -u | xargs -I{} az vm extension image list-names --publisher {} -l westus
+  optionalParameters:
   - name: --latest
     summary: Show the latest version only.
     description: ''
@@ -43,69 +39,68 @@ items:
   - name: --publisher -p
     summary: Image publisher name.
     description: ''
-  - name: --version
-    summary: Extension version.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_extension_image_list_names
+  - name: --version
+    summary: Extension version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_extension_image_list-names
   name: az vm extension image list-names
   summary: List the names of available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image list-names --location
+                                     --publisher
+                                     [--subscription]
   examples:
   - summary: Find Docker extensions by publisher and location.
-    syntax:
-      content: >-
-        az vm extension image list-names --publisher Microsoft.Azure.Extensions \
-            -l westus --query "[?starts_with(name, 'Docker')]"
+    syntax: >-
+      az vm extension image list-names --publisher Microsoft.Azure.Extensions \
+          -l westus --query "[?starts_with(name, 'Docker')]"
   - summary: Find CustomScript extensions by publisher and location.
-    syntax:
-      content: >-
-        az vm extension image list-names --publisher Microsoft.Azure.Extensions \
-            -l westus --query "[?starts_with(name, 'Custom')]"
-  parameters:
+    syntax: >-
+      az vm extension image list-names --publisher Microsoft.Azure.Extensions \
+          -l westus --query "[?starts_with(name, 'Custom')]"
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_extension_image_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_extension_image_list-versions
   name: az vm extension image list-versions
   summary: List the versions for available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image list-versions --location
+                                        --name
+                                        --publisher
+                                        [--filter]
+                                        [--orderby]
+                                        [--subscription]
+                                        [--top]
   examples:
   - summary: Find the available versions for the Docker extension.
-    syntax:
-      content: >-
-        az vm extension image list-versions --publisher Microsoft.Azure.Extensions \
-            -l westus -n DockerExtension -otable
-  parameters:
+    syntax: >-
+      az vm extension image list-versions --publisher Microsoft.Azure.Extensions \
+          -l westus -n DockerExtension -otable
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -115,56 +110,55 @@ items:
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --filter
     summary: The filter to apply on the operation.
     description: ''
   - name: --orderby
     summary: The $orderby odata query option.
     description: ''
-  - name: --top
-    summary: The $top odata query option.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: The $top odata query option.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_image_show
   name: az vm extension image show
   summary: Display information for an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image show --location
+                               --name
+                               --publisher
+                               --version
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Show the CustomScript extension version 2.0.2.
-    syntax:
-      content: >-
-        az vm extension image show -l westus -n CustomScript \
-          --publisher Microsoft.Azure.Extensions --version 2.0.2
+    syntax: >-
+      az vm extension image show -l westus -n CustomScript \
+        --publisher Microsoft.Azure.Extensions --version 2.0.2
   - summary: Show the latest version of the Docker extension.
-    syntax:
-      content: >-
-        publisher=Microsoft.Azure.Extensions
+    syntax: >-
+      publisher=Microsoft.Azure.Extensions
 
-        extension=DockerExtension
+      extension=DockerExtension
 
-        location=westus
+      location=westus
 
 
-        latest=$(az vm extension image list-versions \
-          --publisher {publisher} -l {location} -n {extension} \
-          --query "[].name" -o tsv | sort | tail -n 1)
+      latest=$(az vm extension image list-versions \
+        --publisher ${publisher} -l ${location} -n ${extension} \
+        --query "[].name" -o tsv | sort | tail -n 1)
 
-        az vm extension image show -l {location} \
-          --publisher {publisher} -n {extension} --version {latest}
-  parameters:
+      az vm extension image show -l ${location} \
+        --publisher ${publisher} -n ${extension} --version ${latest}
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -178,28 +172,19 @@ items:
     name: --version
     summary: Extension version.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_extension_image_list
-  name: az vm extension image list
-  summary: List the information on available extensions.
-- uid: az_vm_extension_image_list_names
-  name: az vm extension image list-names
-  summary: List the names of available extensions.
-- uid: az_vm_extension_image_list_versions
-  name: az vm extension image list-versions
-  summary: List the versions for available extensions.
-- uid: az_vm_extension_image_show
-  name: az vm extension image show
-  summary: Display information for an extension.
+- az_vm_extension_image_list
+- az_vm_extension_image_list-names
+- az_vm_extension_image_list-versions
+- az_vm_extension_image_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -215,10 +200,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Find the available VM extensions for a subscription and region.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Find the available VM extensions for a subscription and region.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/identity.yml b/2017-03-09-profile/docs-ref-autogen/vm/identity.yml
index 56d2f89ded..7ab627d9e3 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/identity.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/identity.yml
@@ -1,92 +1,83 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_identity
-  name: az vm identity
-  summary: Manage service identities of a VM.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_identity_assign
-  - az_vm_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_identity
+name: az vm identity
+summary: Manage service identities of a VM.
+description: ''
+directCommands:
 - uid: az_vm_identity_assign
   name: az vm identity assign
   summary: Enable managed service identity on a VM.
   description: This is required to authenticate and interact with other Azure services using bearer tokens.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm identity assign [--identities]
+                          [--ids]
+                          [--name]
+                          [--resource-group]
+                          [--role]
+                          [--scope]
+                          [--subscription]
   examples:
   - summary: Enable the system assigned identity on a VM with the 'Reader' role.
-    syntax:
-      content: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
+    syntax: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
   - summary: Enable the system assigned identity and a user assigned identity on a VM.
-    syntax:
-      content: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --identities [system] myAssignedId
-  parameters:
+    syntax: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --identities [system] myAssignedId
+  optionalParameters:
   - name: --identities
     summary: "Space-separated identities to assign. Use '[system]' to refer to the system assigned identity. Default: '[system]'."
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
-    description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
+    description: ''
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_identity_show
   name: az vm identity show
   summary: Display VM's managed identity info.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm identity show [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: display VM's managed identity info. (autogenerated)
-    syntax:
-      content: az vm identity show --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm identity show --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_identity_assign
-  name: az vm identity assign
-  summary: Enable managed service identity on a VM.
-- uid: az_vm_identity_show
-  name: az vm identity show
-  summary: Display VM's managed identity info.
+- az_vm_identity_assign
+- az_vm_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +93,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage service identities of a VM.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage service identities of a VM.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/image.yml b/2017-03-09-profile/docs-ref-autogen/vm/image.yml
index 5794ba621a..7e0ca0432e 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/image.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/image.yml
@@ -1,29 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_image
-  name: az vm image
-  summary: Information on available virtual machine images.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_image_accept_terms
-  - az_vm_image_list
-  - az_vm_image_list_offers
-  - az_vm_image_list_publishers
-  - az_vm_image_list_skus
-  - az_vm_image_show
-- uid: az_vm_image_accept_terms
+### YamlMime:AzureCLIGroup
+uid: az_vm_image
+name: az vm image
+summary: Information on available virtual machine images.
+description: ''
+directCommands:
+- uid: az_vm_image_accept-terms
   name: az vm image accept-terms
   summary: Accept Azure Marketplace term so that the image can be used to create VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image accept-terms [--offer]
+                             [--plan]
+                             [--publisher]
+                             [--subscription]
+                             [--urn]
   examples:
   - summary: Accept Azure Marketplace term so that the image can be used to create VMs. (autogenerated)
-    syntax:
-      content: az vm image accept-terms --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image accept-terms --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -33,40 +27,38 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_list
   name: az vm image list
   summary: List the VM/VMSS images available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list [--all]
+                     [--location]
+                     [--offer]
+                     [--publisher]
+                     [--query-examples]
+                     [--sku]
+                     [--subscription]
   examples:
   - summary: List all available images.
-    syntax:
-      content: az vm image list --all
+    syntax: az vm image list --all
   - summary: List all offline cached CentOS images.
-    syntax:
-      content: az vm image list -f CentOS
+    syntax: az vm image list -f CentOS
   - summary: List all CentOS images.
-    syntax:
-      content: az vm image list -f CentOS --all
-  parameters:
+    syntax: az vm image list -f CentOS --all
+  optionalParameters:
   - name: --all
     summary: Retrieve image list from live Azure service rather using an offline image list.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --offer -f
     summary: Image offer name, partial name is accepted.
@@ -74,91 +66,82 @@ items:
   - name: --publisher -p
     summary: Image publisher name, partial name is accepted.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sku -s
     summary: Image sku name, partial name is accepted.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_image_list_offers
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_image_list-offers
   name: az vm image list-offers
   summary: List the VM image offers available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list-offers --location
+                            --publisher
+                            [--subscription]
   examples:
   - summary: List all offers from Microsoft in the West US region.
-    syntax:
-      content: az vm image list-offers -l westus -p MicrosoftWindowsServer
+    syntax: az vm image list-offers -l westus -p MicrosoftWindowsServer
   - summary: List all offers from OpenLocic in the West US region.
-    syntax:
-      content: az vm image list-offers -l westus -p OpenLogic
-  parameters:
+    syntax: az vm image list-offers -l westus -p OpenLogic
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --publisher -p
     summary: A valid image publisher.
     description: ''
     valueFrom: az vm image list-publishers
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_image_list_publishers
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_image_list-publishers
   name: az vm image list-publishers
   summary: List the VM image publishers available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list-publishers --location
+                                [--subscription]
   examples:
   - summary: List all publishers in the West US region.
-    syntax:
-      content: az vm image list-publishers -l westus
+    syntax: az vm image list-publishers -l westus
   - summary: List all publishers with names starting with "Open" in westus.
-    syntax:
-      content: az vm image list-publishers -l westus --query "[?starts_with(name, 'Open')]"
-  parameters:
+    syntax: az vm image list-publishers -l westus --query "[?starts_with(name, 'Open')]"
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_image_list_skus
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_image_list-skus
   name: az vm image list-skus
   summary: List the VM image SKUs available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list-skus --location
+                          --offer
+                          --publisher
+                          [--subscription]
   examples:
   - summary: List all skus available for CentOS published by OpenLogic in the West US region.
-    syntax:
-      content: az vm image list-skus -l westus -f CentOS -p OpenLogic
-  parameters:
+    syntax: az vm image list-skus -l westus -f CentOS -p OpenLogic
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --offer -f
@@ -169,34 +152,35 @@ items:
     summary: A valid image publisher.
     description: ''
     valueFrom: az vm image list-publishers
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_show
   name: az vm image show
   summary: Get the details for a VM image available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image show [--location]
+                     [--offer]
+                     [--publisher]
+                     [--query-examples]
+                     [--sku]
+                     [--subscription]
+                     [--urn]
+                     [--version]
   examples:
   - summary: Show information for the latest available CentOS image from OpenLogic.
-    syntax:
-      content: >-
-        latest=$(az vm image list -p OpenLogic -s 7.3 --all --query \
-            "[?offer=='CentOS'].version" -o tsv | sort -u | tail -n 1)
-        az vm image show -l westus -f CentOS -p OpenLogic --sku 7.3 --version {latest}
+    syntax: >-
+      latest=$(az vm image list -p OpenLogic -s 7.3 --all --query \
+          "[?offer=='CentOS'].version" -o tsv | sort -u | tail -n 1)
+      az vm image show -l westus -f CentOS -p OpenLogic --sku 7.3 --version ${latest}
   - summary: Get the details for a VM image available in the Azure Marketplace. (autogenerated)
-    syntax:
-      content: az vm image show --location westus --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image show --location westus --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --offer -f
     summary: Image offer.
@@ -204,55 +188,33 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sku -s
     summary: Image sku.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --urn
     summary: URN, in format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
     description: ''
   - name: --version
     summary: Image sku's version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_image_accept_terms
-  name: az vm image accept-terms
-  summary: Accept Azure Marketplace term so that the image can be used to create VMs.
-- uid: az_vm_image_list
-  name: az vm image list
-  summary: List the VM/VMSS images available in the Azure Marketplace.
-- uid: az_vm_image_list_offers
-  name: az vm image list-offers
-  summary: List the VM image offers available in the Azure Marketplace.
-- uid: az_vm_image_list_publishers
-  name: az vm image list-publishers
-  summary: List the VM image publishers available in the Azure Marketplace.
-- uid: az_vm_image_list_skus
-  name: az vm image list-skus
-  summary: List the VM image SKUs available in the Azure Marketplace.
-- uid: az_vm_image_show
-  name: az vm image show
-  summary: Get the details for a VM image available in the Azure Marketplace.
-- uid: az_vm_image_terms
-  name: az vm image terms
-  summary: Manage Azure Marketplace image terms.
-- uid: az_vm_image_terms_accept
-  name: az vm image terms accept
-  summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-- uid: az_vm_image_terms_cancel
-  name: az vm image terms cancel
-  summary: Cancel Azure Marketplace image terms.
-- uid: az_vm_image_terms_show
-  name: az vm image terms show
-  summary: Get the details of Azure Marketplace image terms.
+- az_vm_image_accept-terms
+- az_vm_image_list
+- az_vm_image_list-offers
+- az_vm_image_list-publishers
+- az_vm_image_list-skus
+- az_vm_image_show
+- az_vm_image_terms
+- az_vm_image_terms_accept
+- az_vm_image_terms_cancel
+- az_vm_image_terms_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -268,10 +230,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Information on available virtual machine images.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Information on available virtual machine images.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/image/terms.yml b/2017-03-09-profile/docs-ref-autogen/vm/image/terms.yml
index de0fbeec4a..b621b99fa7 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/image/terms.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/image/terms.yml
@@ -1,26 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_image_terms
-  name: az vm image terms
-  summary: Manage Azure Marketplace image terms.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_image_terms_accept
-  - az_vm_image_terms_cancel
-  - az_vm_image_terms_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_image_terms
+name: az vm image terms
+summary: Manage Azure Marketplace image terms.
+description: ''
+directCommands:
 - uid: az_vm_image_terms_accept
   name: az vm image terms accept
   summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image terms accept [--offer]
+                             [--plan]
+                             [--publisher]
+                             [--subscription]
+                             [--urn]
   examples:
   - summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-    syntax:
-      content: az vm image terms accept --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image terms accept --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -30,32 +27,29 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_terms_cancel
   name: az vm image terms cancel
   summary: Cancel Azure Marketplace image terms.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image terms cancel [--offer]
+                             [--plan]
+                             [--publisher]
+                             [--subscription]
+                             [--urn]
   examples:
   - summary: Cancel Azure Marketplace image terms.
-    syntax:
-      content: az vm image terms cancel --urn publisher:offer:sku:version
+    syntax: az vm image terms cancel --urn publisher:offer:sku:version
   - summary: Cancel Azure Marketplace image terms. (autogenerated)
-    syntax:
-      content: az vm image terms cancel --subscription MySubscription --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image terms cancel --subscription MySubscription --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -65,29 +59,28 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_terms_show
   name: az vm image terms show
   summary: Get the details of Azure Marketplace image terms.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image terms show [--offer]
+                           [--plan]
+                           [--publisher]
+                           [--query-examples]
+                           [--subscription]
+                           [--urn]
   examples:
   - summary: Get the details of Azure Marketplace image terms.
-    syntax:
-      content: az vm image terms show --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image terms show --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -97,28 +90,20 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_image_terms_accept
-  name: az vm image terms accept
-  summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-- uid: az_vm_image_terms_cancel
-  name: az vm image terms cancel
-  summary: Cancel Azure Marketplace image terms.
-- uid: az_vm_image_terms_show
-  name: az vm image terms show
-  summary: Get the details of Azure Marketplace image terms.
+- az_vm_image_terms_accept
+- az_vm_image_terms_cancel
+- az_vm_image_terms_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -134,10 +119,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage Azure Marketplace image terms.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage Azure Marketplace image terms.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/monitor.yml b/2017-03-09-profile/docs-ref-autogen/vm/monitor.yml
index e70c63323b..6c1f70b1ea 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/monitor.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/monitor.yml
@@ -1,19 +1,11 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_monitor
-  name: az vm monitor
-  summary: Manage monitor aspect for a vm.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_vm_monitor
+name: az vm monitor
+summary: Manage monitor aspect for a vm.
+description: ''
 commands:
-- uid: az_vm_monitor_log
-  name: az vm monitor log
-  summary: Manage log analytics workspace for a vm.
-- uid: az_vm_monitor_log_show
-  name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
+- az_vm_monitor_log
+- az_vm_monitor_log_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -29,10 +21,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage monitor aspect for a vm.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage monitor aspect for a vm.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/monitor/log.yml b/2017-03-09-profile/docs-ref-autogen/vm/monitor/log.yml
index 4922baab91..a97458db05 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/monitor/log.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/monitor/log.yml
@@ -1,49 +1,51 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_monitor_log
-  name: az vm monitor log
-  summary: Manage log analytics workspace for a vm.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_monitor_log_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_monitor_log
+name: az vm monitor log
+summary: Manage log analytics workspace for a vm.
+description: ''
+directCommands:
 - uid: az_vm_monitor_log_show
   name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
+  summary: Execute a query against the Log Analytics workspace linked with a VM.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vm monitor log show --analytics-query
+                           [--ids]
+                           [--name]
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
+                           [--timespan]
+  examples:
+  - summary: Get performance log for a VM linked with a workspace
+    syntax: az vm monitor log show --name myVM -g myRG -q "Perf | limit 10"
+  requiredParameters:
   - isRequired: true
     name: --analytics-query -q
     summary: Query to execute over Log Analytics data.
     description: ''
-  - name: --timespan
-    summary: Timespan over which to query. Defaults to querying all available data.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timespan
+    summary: Timespan over which to query. Defaults to querying all available data.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_monitor_log_show
-  name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
+- az_vm_monitor_log_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -59,10 +61,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage log analytics workspace for a vm.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage log analytics workspace for a vm.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/nic.yml b/2017-03-09-profile/docs-ref-autogen/vm/nic.yml
index 1d11e61bcf..5115a1820f 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/nic.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/nic.yml
@@ -1,201 +1,182 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_nic
-  name: az vm nic
-  summary: Manage network interfaces. See also `az network nic`.
-  description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview</a>.
-  langs:
-  - azurecli
-  children:
-  - az_vm_nic_add
-  - az_vm_nic_list
-  - az_vm_nic_remove
-  - az_vm_nic_set
-  - az_vm_nic_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_nic
+name: az vm nic
+summary: Manage network interfaces. See also `az network nic`.
+description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview.
+directCommands:
 - uid: az_vm_nic_add
   name: az vm nic add
   summary: Add existing NICs to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic add --nics
+                  --resource-group
+                  --vm-name
+                  [--primary-nic]
+                  [--subscription]
   examples:
   - summary: Add two NICs to a VM.
-    syntax:
-      content: az vm nic add -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
-  parameters:
+    syntax: az vm nic add -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
+  requiredParameters:
   - isRequired: true
     name: --nics
     summary: Names or IDs of NICs.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --primary-nic
     summary: Name or ID of the primary NIC. If missing, the first NIC in the list will be the primary.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_list
   name: az vm nic list
   summary: List the NICs available on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic list --resource-group
+                   --vm-name
+                   [--query-examples]
+                   [--subscription]
   examples:
   - summary: List all of the NICs on a VM.
-    syntax:
-      content: az vm nic list -g MyResourceGroup --vm-name MyVm
-  parameters:
+    syntax: az vm nic list -g MyResourceGroup --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_remove
   name: az vm nic remove
   summary: Remove NICs from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic remove --nics
+                     --resource-group
+                     --vm-name
+                     [--primary-nic]
+                     [--subscription]
   examples:
   - summary: Remove two NICs from a VM.
-    syntax:
-      content: az vm nic remove -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
-  parameters:
+    syntax: az vm nic remove -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
+  requiredParameters:
   - isRequired: true
     name: --nics
     summary: Names or IDs of NICs.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --primary-nic
     summary: Name or ID of the primary NIC. If missing, the first NIC in the list will be the primary.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_set
   name: az vm nic set
   summary: Configure settings of a NIC attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic set --nics
+                  --resource-group
+                  --vm-name
+                  [--primary-nic]
+                  [--subscription]
   examples:
   - summary: Set a NIC on a VM to be the primary interface.
-    syntax:
-      content: az vm nic set -g MyResourceGroup --vm-name MyVm --nic nic_name1 nic_name2 --primary-nic nic_name2
+    syntax: az vm nic set -g MyResourceGroup --vm-name MyVm --nic nic_name1 nic_name2 --primary-nic nic_name2
   - summary: Configure settings of a NIC attached to a VM. (autogenerated)
-    syntax:
-      content: az vm nic set --nics nic_name1 nic_name2 --primary-nic nic_name2 --resource-group MyResourceGroup --vm-name MyVm
-  parameters:
+    syntax: az vm nic set --nics nic_name1 nic_name2 --primary-nic nic_name2 --resource-group MyResourceGroup --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --nics
     summary: Names or IDs of NICs.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --primary-nic
     summary: Name or ID of the primary NIC. If missing, the first NIC in the list will be the primary.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_show
   name: az vm nic show
   summary: Display information for a NIC attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic show --nic
+                   --resource-group
+                   --vm-name
+                   [--query-examples]
+                   [--subscription]
   examples:
   - summary: Show details of a NIC on a VM.
-    syntax:
-      content: az vm nic show -g MyResourceGroup --vm-name MyVm --nic nic_name1
-  parameters:
+    syntax: az vm nic show -g MyResourceGroup --vm-name MyVm --nic nic_name1
+  requiredParameters:
   - isRequired: true
     name: --nic
     summary: NIC name or ID.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_nic_add
-  name: az vm nic add
-  summary: Add existing NICs to a VM.
-- uid: az_vm_nic_list
-  name: az vm nic list
-  summary: List the NICs available on a VM.
-- uid: az_vm_nic_remove
-  name: az vm nic remove
-  summary: Remove NICs from a VM.
-- uid: az_vm_nic_set
-  name: az vm nic set
-  summary: Configure settings of a NIC attached to a VM.
-- uid: az_vm_nic_show
-  name: az vm nic show
-  summary: Display information for a NIC attached to a VM.
+- az_vm_nic_add
+- az_vm_nic_list
+- az_vm_nic_remove
+- az_vm_nic_set
+- az_vm_nic_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,10 +192,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/repair.yml b/2017-03-09-profile/docs-ref-autogen/vm/repair.yml
new file mode 100644
index 0000000000..c954935efa
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vm/repair.yml
@@ -0,0 +1,174 @@
+### YamlMime:AzureCLIGroup
+uid: az_vm_repair
+name: az vm repair
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vm-repair** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az vm repair** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Auto repair commands to fix VMs.
+description: VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
+directCommands:
+- uid: az_vm_repair_create
+  name: az vm repair create
+  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
+  description: ''
+  syntax: >-
+    az vm repair create --name
+                        --resource-group
+                        [--copy-disk-name]
+                        [--enable-nested]
+                        [--repair-group-name]
+                        [--repair-password]
+                        [--repair-username]
+                        [--repair-vm-name]
+                        [--unlock-encrypted-vm]
+  examples:
+  - summary: Create a repair VM
+    syntax: az vm repair create -g MyResourceGroup -n myVM --verbose
+  - summary: Create a repair VM and set the VM authentication
+    syntax: az vm repair create -g MyResourceGroup -n myVM --repair-username username --repair-password password!234 --verbose
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --copy-disk-name
+    summary: Name of OS disk copy.
+    description: ''
+  - name: --enable-nested
+    summary: Enable nested hyperv.
+    description: ''
+  - name: --repair-group-name
+    summary: Repair resource group name.
+    description: ''
+  - name: --repair-password
+    summary: Admin password for the repair VM.
+    description: ''
+  - name: --repair-username
+    summary: Admin username for repair VM.
+    description: ''
+  - name: --repair-vm-name
+    summary: Name of repair VM.
+    description: ''
+  - name: --unlock-encrypted-vm
+    summary: Option to auto-unlock encrypted VMs using current subscription auth.
+    description: ''
+- uid: az_vm_repair_list-scripts
+  name: az vm repair list-scripts
+  summary: List available scripts. Located https://github.com/Azure/repair-script-library.
+  description: ''
+  syntax: az vm repair list-scripts
+  examples:
+  - summary: List scripts
+    syntax: az vm repair list-scripts --verbose
+  - summary: List windows scripts only.
+    syntax: az vm repair list-scripts --query "[?starts_with(id, 'win')]"
+  - summary: List scripts with test in its description.
+    syntax: az vm repair list-scripts --query "[?contains(description, 'test')]"
+- uid: az_vm_repair_restore
+  name: az vm repair restore
+  summary: Replace source VM's OS disk with data disk from repair VM.
+  description: ''
+  syntax: >-
+    az vm repair restore --name
+                         --resource-group
+                         [--disk-name]
+                         [--repair-vm-id]
+                         [--yes]
+  examples:
+  - summary: Restore from the repair VM, command will auto-search for repair-vm
+    syntax: az vm repair restore -g MyResourceGroup -n MyVM --verbose
+  - summary: Restore from the repair VM, specify the disk to restore
+    syntax: az vm repair restore -g MyResourceGroup -n MyVM --disk-name MyDiskCopy --verbose
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disk-name
+    summary: Name of fixed data disk. Defaults to the first data disk in the repair VM.
+    description: ''
+  - name: --repair-vm-id
+    summary: Repair VM resource id.
+    description: ''
+  - name: --yes
+    summary: Deletes the repair resources without confirmation.
+    description: ''
+- uid: az_vm_repair_run
+  name: az vm repair run
+  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
+  description: ''
+  syntax: >-
+    az vm repair run --name
+                     --resource-group
+                     [--custom-script-file]
+                     [--parameters]
+                     [--repair-vm-id]
+                     [--run-id]
+                     [--run-on-repair]
+  examples:
+  - summary: Run the script with <run-id> directly on the VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --verbose
+  - summary: Run the script with <run-id> on the linked repair VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --run-on-repair --verbose
+  - summary: Run a script with parameters on the VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --parameters hello=hi world=earth --verbose
+  - summary: Run a local custom script on the VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --custom-script-file ./file.ps1 --verbose
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-script-file
+    summary: Custom script file to run on VM. Script should be PowerShell for windows, Bash for Linux.
+    description: ''
+  - name: --parameters
+    summary: Space-separated parameters in the format of '[name=]value'. Positional for bash scripts.
+    description: ''
+  - name: --repair-vm-id
+    summary: Repair VM resource id.
+    description: ''
+  - name: --run-id
+    summary: Unique run id for run scripts.
+    description: ''
+  - name: --run-on-repair
+    summary: Script will be run on the linked repair VM.
+    description: ''
+commands:
+- az_vm_repair_create
+- az_vm_repair_list-scripts
+- az_vm_repair_restore
+- az_vm_repair_run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/secret.yml b/2017-03-09-profile/docs-ref-autogen/vm/secret.yml
index d268a39b20..3941f64342 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/secret.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/secret.yml
@@ -1,27 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_secret
-  name: az vm secret
-  summary: Manage VM secrets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_secret_add
-  - az_vm_secret_format
-  - az_vm_secret_list
-  - az_vm_secret_remove
+### YamlMime:AzureCLIGroup
+uid: az_vm_secret
+name: az vm secret
+summary: Manage VM secrets.
+description: ''
+directCommands:
 - uid: az_vm_secret_add
   name: az vm secret add
   summary: Add a secret to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm secret add --certificate
+                     --keyvault
+                     [--certificate-store]
+                     [--ids]
+                     [--name]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Add a secret to a VM. (autogenerated)
-    syntax:
-      content: az vm secret add --certificate {certificate} --keyvault {keyvault} --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm secret add --certificate {certificate} --keyvault {keyvault} --name MyVirtualMachine --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --certificate
     summary: Key vault certificate name or its full secret URL.
@@ -30,6 +28,7 @@ items:
     name: --keyvault
     summary: Name or ID of the key vault.
     description: ''
+  optionalParameters:
   - name: --certificate-store
     summary: 'Windows certificate store names. Default: My.'
     description: ''
@@ -37,45 +36,44 @@ items:
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_secret_format
   name: az vm secret format
   summary: Transform secrets into a form that can be used by VMs and VMSSes.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm secret format --secrets
+                        [--certificate-store]
+                        [--keyvault]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Create a self-signed certificate with the default policy, and add it to a virtual machine.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
-  parameters:
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
+  requiredParameters:
   - isRequired: true
     name: --secrets -s
     summary: Space-separated list of key vault secret URIs. Perhaps, produced by 'az keyvault secret list-versions --vault-name vaultname -n cert1 --query "[?attributes.enabled].id" -o tsv'.
     description: 'The command will attempt to resolve the vault ID for each secret. If it is unable to do so, specify the vault ID to use for *all* secrets using: --keyvault NAME --resource-group NAME | --keyvault ID.'
+  optionalParameters:
   - name: --certificate-store
     summary: 'Windows certificate store names. Default: My.'
     description: ''
@@ -83,56 +81,58 @@ items:
     summary: Name or ID of the key vault.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_secret_list
   name: az vm secret list
   summary: List secrets on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm secret list --name
+                      --resource-group
+                      [--query-examples]
+                      [--subscription]
   examples:
   - summary: List secrets on a VM. (autogenerated)
-    syntax:
-      content: az vm secret list --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm secret list --name MyVirtualMachine --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_secret_remove
   name: az vm secret remove
   summary: Remove a secret from a VM.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vm secret remove --keyvault
+                        [--certificate]
+                        [--ids]
+                        [--name]
+                        [--resource-group]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --keyvault
     summary: Name or ID of the key vault.
     description: ''
+  optionalParameters:
   - name: --certificate
     summary: Key vault certificate name or its full secret URL.
     description: ''
@@ -140,33 +140,20 @@ items:
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_secret_add
-  name: az vm secret add
-  summary: Add a secret to a VM.
-- uid: az_vm_secret_format
-  name: az vm secret format
-  summary: Transform secrets into a form that can be used by VMs and VMSSes.
-- uid: az_vm_secret_list
-  name: az vm secret list
-  summary: List secrets on a VM.
-- uid: az_vm_secret_remove
-  name: az vm secret remove
-  summary: Remove a secret from a VM.
+- az_vm_secret_add
+- az_vm_secret_format
+- az_vm_secret_list
+- az_vm_secret_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -182,10 +169,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage VM secrets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage VM secrets.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/unmanaged-disk.yml b/2017-03-09-profile/docs-ref-autogen/vm/unmanaged-disk.yml
index 23028a97c7..4ba31f3b68 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/unmanaged-disk.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/unmanaged-disk.yml
@@ -1,55 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_unmanaged_disk
-  name: az vm unmanaged-disk
-  summary: Manage the unmanaged data disks attached to a VM.
-  description: >-
-    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+### YamlMime:AzureCLIGroup
+uid: az_vm_unmanaged-disk
+name: az vm unmanaged-disk
+summary: Manage the unmanaged data disks attached to a VM.
+description: >-
+  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
 
-    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
 
-    For more information, see:
+  For more information, see:
 
-    - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+  - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-    - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+  - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-    - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
-  langs:
-  - azurecli
-  children:
-  - az_vm_unmanaged_disk_attach
-  - az_vm_unmanaged_disk_detach
-  - az_vm_unmanaged_disk_list
-- uid: az_vm_unmanaged_disk_attach
+  - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
+directCommands:
+- uid: az_vm_unmanaged-disk_attach
   name: az vm unmanaged-disk attach
   summary: Attach an unmanaged persistent disk to a VM.
   description: This allows for the preservation of data, even if the VM is reprovisioned due to maintenance or resizing.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm unmanaged-disk attach --resource-group
+                                --vm-name
+                                [--caching {None, ReadOnly, ReadWrite}]
+                                [--lun]
+                                [--name]
+                                [--new]
+                                [--size-gb]
+                                [--subscription]
+                                [--vhd-uri]
   examples:
   - summary: Attach a new default sized (1023 GB) unmanaged data disk to a VM.
-    syntax:
-      content: az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --new
+    syntax: az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --new
   - summary: Attach an existing data disk to a VM as unmanaged.
-    syntax:
-      content: >-
-        az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --name MyDataDisk \
-            --vhd-uri https://mystorage.blob.core.windows.net/vhds/d1.vhd
+    syntax: >-
+      az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --name MyDataDisk \
+          --vhd-uri https://mystorage.blob.core.windows.net/vhds/d1.vhd
   - summary: Attach an unmanaged persistent disk to a VM. (autogenerated)
-    syntax:
-      content: az vm unmanaged-disk attach --name MyDataDisk --new --resource-group MyResourceGroup --size-gb 50 --vm-name MyVm
-  parameters:
+    syntax: az vm unmanaged-disk attach --name MyDataDisk --new --resource-group MyResourceGroup --size-gb 50 --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --caching
     parameterValueGroup: None, ReadOnly, ReadWrite
     summary: Disk caching policy.
@@ -67,93 +67,80 @@ items:
     defaultValue: "1023"
     summary: 'Size in GB. Max size: 4095 GB (certain preview disks can be larger).'
     description: ''
-  - name: --vhd-uri
-    summary: 'Virtual hard disk URI. For example: <a href="https://mystorage.blob.core.windows.net/vhds/d1.vhd">https://mystorage.blob.core.windows.net/vhds/d1.vhd</a>.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_unmanaged_disk_detach
+  - name: --vhd-uri
+    summary: 'Virtual hard disk URI. For example: https://mystorage.blob.core.windows.net/vhds/d1.vhd.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_unmanaged-disk_detach
   name: az vm unmanaged-disk detach
   summary: Detach an unmanaged disk from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm unmanaged-disk detach --name
+                                --resource-group
+                                --vm-name
+                                [--subscription]
   examples:
   - summary: Detach a data disk from a VM.
-    syntax:
-      content: az vm unmanaged-disk detach -g MyResourceGroup --vm-name MyVm -n disk_name
-  parameters:
+    syntax: az vm unmanaged-disk detach -g MyResourceGroup --vm-name MyVm -n disk_name
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The data disk name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_unmanaged_disk_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_unmanaged-disk_list
   name: az vm unmanaged-disk list
   summary: List unmanaged disks of a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm unmanaged-disk list --name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: List the unmanaged disks attached to a VM.
-    syntax:
-      content: az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm
+    syntax: az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm
   - summary: List unmanaged disks with names containing the string "data_disk".
-    syntax:
-      content: >-
-        az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm \
-            --query "[?contains(name, 'data_disk')]" --output table
-  parameters:
+    syntax: >-
+      az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm \
+          --query "[?contains(name, 'data_disk')]" --output table
+  requiredParameters:
   - isRequired: true
     name: --name --vm-name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_unmanaged_disk_attach
-  name: az vm unmanaged-disk attach
-  summary: Attach an unmanaged persistent disk to a VM.
-- uid: az_vm_unmanaged_disk_detach
-  name: az vm unmanaged-disk detach
-  summary: Detach an unmanaged disk from a VM.
-- uid: az_vm_unmanaged_disk_list
-  name: az vm unmanaged-disk list
-  summary: List unmanaged disks of a VM.
+- az_vm_unmanaged-disk_attach
+- az_vm_unmanaged-disk_detach
+- az_vm_unmanaged-disk_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -169,23 +156,20 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: >-
-  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: >-
+    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
 
-  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
 
-  For more information, see:
+    For more information, see:
 
-  - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+    - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-  - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+    - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-  - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
+    - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
diff --git a/2017-03-09-profile/docs-ref-autogen/vm/user.yml b/2017-03-09-profile/docs-ref-autogen/vm/user.yml
index 31ff8707a0..3cddeaa3b6 100644
--- a/2017-03-09-profile/docs-ref-autogen/vm/user.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vm/user.yml
@@ -1,147 +1,131 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_user
-  name: az vm user
-  summary: Manage user accounts for a VM.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_user_delete
-  - az_vm_user_reset_ssh
-  - az_vm_user_update
+### YamlMime:AzureCLIGroup
+uid: az_vm_user
+name: az vm user
+summary: Manage user accounts for a VM.
+description: ''
+directCommands:
 - uid: az_vm_user_delete
   name: az vm user delete
   summary: Delete a user account from a VM.
   description: Also deletes the user home directory on Linux VMs.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm user delete --username
+                      [--ids]
+                      [--name]
+                      [--no-wait]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: Delete a user account.
-    syntax:
-      content: az vm user delete -u username -n MyVm -g MyResourceGroup
+    syntax: az vm user delete -u username -n MyVm -g MyResourceGroup
   - summary: Delete a user on all VMs in a resource group.
-    syntax:
-      content: az vm user delete -u username --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm user delete -u username --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  requiredParameters:
   - isRequired: true
     name: --username -u
     summary: The user name.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_user_reset_ssh
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_user_reset-ssh
   name: az vm user reset-ssh
   summary: Reset the SSH configuration on a VM.
   description: The extension will restart the SSH service, open the SSH port on your VM, and reset the SSH configuration to default values. The user account (name, password, and SSH keys) are not changed.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm user reset-ssh [--ids]
+                         [--name]
+                         [--no-wait]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Reset the SSH configuration.
-    syntax:
-      content: az vm user reset-ssh -n MyVm -g MyResourceGroup
+    syntax: az vm user reset-ssh -n MyVm -g MyResourceGroup
   - summary: Reset the SSH server on all VMs in a resource group.
-    syntax:
-      content: az vm user reset-ssh --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm user reset-ssh --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_user_update
   name: az vm user update
   summary: Update a user account.
   description: This command uses VMAccessForLinux 1.5 for Linux operating system and VMAccessAgent 2.4 for Window operating system.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm user update --username
+                      [--ids]
+                      [--name]
+                      [--no-wait]
+                      [--password]
+                      [--resource-group]
+                      [--ssh-key-value]
+                      [--subscription]
   examples:
   - summary: Update a Windows user account. If username does not exist, a new user will be created.
-    syntax:
-      content: az vm user update -u username -p password -n MyVm -g MyResourceGroup
+    syntax: az vm user update -u username -p password -n MyVm -g MyResourceGroup
   - summary: Update a Linux user account. ("$(< filename)" syntax is not supported on Command Prompt or PowerShell.)
-    syntax:
-      content: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" -n MyVm -g MyResourceGroup
+    syntax: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" -n MyVm -g MyResourceGroup
   - summary: Update a user on all VMs in a resource group. ("$(< filename)" syntax is not supported on Command Prompt or PowerShell.)
-    syntax:
-      content: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  requiredParameters:
   - isRequired: true
     name: --username -u
     summary: The user name.
     description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --password -p
     summary: The user password.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --ssh-key-value
     summary: SSH public key file value or public key file path. This command appends the new public key text to the ~/.ssh/authorized_keys file for the admin user on the VM. This does not replace or remove any existing SSH keys.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_user_delete
-  name: az vm user delete
-  summary: Delete a user account from a VM.
-- uid: az_vm_user_reset_ssh
-  name: az vm user reset-ssh
-  summary: Reset the SSH configuration on a VM.
-- uid: az_vm_user_update
-  name: az vm user update
-  summary: Update a user account.
+- az_vm_user_delete
+- az_vm_user_reset-ssh
+- az_vm_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -157,10 +141,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage user accounts for a VM.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage user accounts for a VM.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmss.yml b/2017-03-09-profile/docs-ref-autogen/vmss.yml
index ff6f9c8ba6..4dbdb1c087 100644
--- a/2017-03-09-profile/docs-ref-autogen/vmss.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vmss.yml
@@ -1,92 +1,153 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss
-  name: az vmss
-  summary: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_create
-  - az_vmss_deallocate
-  - az_vmss_delete
-  - az_vmss_delete_instances
-  - az_vmss_get_instance_view
-  - az_vmss_list
-  - az_vmss_list_instance_connection_info
-  - az_vmss_list_instance_public_ips
-  - az_vmss_list_instances
-  - az_vmss_list_skus
-  - az_vmss_restart
-  - az_vmss_scale
-  - az_vmss_set_orchestration_service_state
-  - az_vmss_show
-  - az_vmss_start
-  - az_vmss_stop
-  - az_vmss_update
-  - az_vmss_update_instances
-  - az_vmss_wait
+### YamlMime:AzureCLIGroup
+uid: az_vmss
+name: az vmss
+summary: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
+description: ''
+directCommands:
 - uid: az_vmss_create
   name: az vmss create
   summary: Create an Azure Virtual Machine Scale Set.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli">https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli.
+  syntax: >-
+    az vmss create --name
+                   --resource-group
+                   [--admin-password]
+                   [--admin-username]
+                   [--app-gateway]
+                   [--app-gateway-capacity]
+                   [--app-gateway-sku]
+                   [--app-gateway-subnet-address-prefix]
+                   [--assign-identity]
+                   [--authentication-type {all, password, ssh}]
+                   [--backend-pool-name]
+                   [--backend-port]
+                   [--computer-name-prefix]
+                   [--custom-data]
+                   [--data-disk-caching]
+                   [--data-disk-sizes-gb]
+                   [--disable-overprovision]
+                   [--encryption-at-host {false, true}]
+                   [--generate-ssh-keys]
+                   [--health-probe]
+                   [--image]
+                   [--instance-count]
+                   [--lb]
+                   [--lb-nat-pool-name]
+                   [--license-type {None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server}]
+                   [--location]
+                   [--no-wait]
+                   [--nsg]
+                   [--orchestration-mode {Flexible, Uniform}]
+                   [--os-disk-caching {None, ReadOnly, ReadWrite}]
+                   [--os-disk-name]
+                   [--os-disk-size-gb]
+                   [--os-type {linux, windows}]
+                   [--plan-name]
+                   [--plan-product]
+                   [--plan-promotion-code]
+                   [--plan-publisher]
+                   [--public-ip-address]
+                   [--public-ip-address-allocation {dynamic, static}]
+                   [--public-ip-address-dns-name]
+                   [--role]
+                   [--scale-in-policy]
+                   [--scope]
+                   [--secrets]
+                   [--single-placement-group {false, true}]
+                   [--specialized {false, true}]
+                   [--ssh-dest-key-path]
+                   [--ssh-key-values]
+                   [--storage-container-name]
+                   [--storage-sku]
+                   [--subnet]
+                   [--subnet-address-prefix]
+                   [--subscription]
+                   [--tags]
+                   [--upgrade-policy-mode {Automatic, Manual}]
+                   [--use-unmanaged-disk]
+                   [--validate]
+                   [--vm-sku]
+                   [--vnet-address-prefix]
+                   [--vnet-name]
   examples:
   - summary: Create a Windows VM scale set with 5 instances, a load balancer, a public IP address, a 2GB data disk and 40GB OS disk.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --instance-count 5 --image Win2016Datacenter --data-disk-sizes-gb 2 --os-disk-size-gb 40
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --instance-count 5 --image Win2016Datacenter --data-disk-sizes-gb 2 --os-disk-size-gb 40
   - summary: Create a Linux VM scale set with an auto-generated ssh key pair, a public IP address, a DNS entry, an existing load balancer, and an existing virtual network.
-    syntax:
-      content: >-
-        az vmss create -n MyVmss -g MyResourceGroup --public-ip-address-dns-name my-globally-dns-name \
-            --load-balancer MyLoadBalancer --vnet-name MyVnet --subnet MySubnet --image UbuntuLTS \
-            --generate-ssh-keys
+    syntax: >-
+      az vmss create -n MyVmss -g MyResourceGroup --public-ip-address-dns-name my-globally-dns-name \
+          --load-balancer MyLoadBalancer --vnet-name MyVnet --subnet MySubnet --image UbuntuLTS \
+          --generate-ssh-keys
   - summary: Create a Linux VM scale set from a custom image using the default existing public SSH key.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --image MyImage
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --image MyImage
   - summary: Create a Linux VM scale set with a load balancer and custom DNS servers. Each VM has a public-ip address and a custom domain name.
-    syntax:
-      content: >-
-        az vmss create -n MyVmss -g MyResourceGroup --image centos \
-            --public-ip-per-vm --vm-domain-name myvmss --dns-servers 10.0.0.6 10.0.0.5
-  - summary: 'Create a Linux VM scale set using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init'
-    syntax:
-      content: az vmss create -g MyResourceGroup -n MyVmss --image debian --custom-data MyCloudInitScript.yml
+    syntax: >-
+      az vmss create -n MyVmss -g MyResourceGroup --image centos \
+          --public-ip-per-vm --vm-domain-name myvmss --dns-servers 10.0.0.6 10.0.0.5
+  - summary: 'Create a Linux VM scale set using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/linux/using-cloud-init'
+    syntax: az vmss create -g MyResourceGroup -n MyVmss --image debian --custom-data MyCloudInitScript.yml
   - summary: Create a Linux VM scale set from a specialized image version.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --image $id --specialized
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --image $id --specialized
   - summary: Create a Debian VM scaleset using Key Vault secrets.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vmss create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
+      az vmss create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
   - summary: Create a VM scaleset with system assigned identity. The VM will have a 'Contributor' Role with access to a storage account.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --image centos --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --image centos --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
   - summary: Create a debian VM scaleset with a user assigned identity.
-    syntax:
-      content: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+    syntax: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
   - summary: Create a debian VM scaleset with both system and user assigned identity.
-    syntax:
-      content: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
-  parameters:
+    syntax: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the virtual machine scale set.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin-password
+    summary: Password for the VM if authentication type is 'Password'.
+    description: ''
+  - name: --admin-username
+    summary: Username for the VM. Default value is current username of OS. If the default value is system reserved, then default value will be set to azureuser. Please refer to https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/createorupdate#osprofile to get a full list of reserved values.
+    description: ''
+  - name: --app-gateway
+    summary: Name to use when creating a new application gateway (default) or referencing an existing one. Can also reference an existing application gateway by ID or specify "" for none.
+    description: ''
+  - name: --app-gateway-capacity
+    defaultValue: "10"
+    summary: The number of instances to use when creating a new application gateway.
+    description: ''
+  - name: --app-gateway-sku
+    defaultValue: Standard_Large
+    summary: SKU when creating a new application gateway.
+    description: ''
+  - name: --app-gateway-subnet-address-prefix
+    summary: The subnet IP address prefix to use when creating a new application gateway in CIDR format.
+    description: ''
+  - name: --assign-identity
+    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+    description: ''
+  - name: --authentication-type
+    parameterValueGroup: all, password, ssh
+    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
+    description: ''
+  - name: --backend-pool-name
+    summary: Name to use for the backend pool when creating a new load balancer or application gateway.
+    description: ''
+  - name: --backend-port
+    summary: When creating a new load balancer, backend port to open with NAT rules (Defaults to 22 on Linux and 3389 on Windows). When creating an application gateway, the backend port to use for the backend HTTP settings.
     description: ''
   - name: --computer-name-prefix
     summary: Computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long.
@@ -94,8 +155,21 @@ items:
   - name: --custom-data
     summary: Custom init script file or text (cloud-init, cloud-config, etc..).
     description: ''
+  - name: --data-disk-caching
+    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `<lun>=<vaule1> <lun>=<value2>` to configure individual disk.
+    description: ''
+  - name: --data-disk-sizes-gb
+    summary: Space-separated empty managed data disk sizes in GB to create.
+    description: ''
   - name: --disable-overprovision
-    summary: Overprovision option (see <a href="https://azure.microsoft.com/documentation/articles/virtual-machine-scale-sets-overview/">https://azure.microsoft.com/documentation/articles/virtual-machine-scale-sets-overview/</a> for details).
+    summary: Overprovision option (see https://azure.microsoft.com/documentation/articles/virtual-machine-scale-sets-overview/ for details).
+    description: ''
+  - name: --encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable Host Encryption for the VM or VMSS. This will enable the encryption for all the disks including Resource/Temp disk at host itself.
+    description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
     description: ''
   - name: --health-probe
     summary: Probe name from the existing load balancer, mainly used for rolling upgrade or automatic repairs.
@@ -108,8 +182,14 @@ items:
     defaultValue: "2"
     summary: Number of VMs in the scale set.
     description: ''
+  - name: --lb --load-balancer
+    summary: Name to use when creating a new load balancer (default) or referencing an existing one. Can also reference an existing load balancer by ID or specify "" for none.
+    description: ''
+  - name: --lb-nat-pool-name --nat-pool-name
+    summary: Name to use for the NAT pool when creating a new load balancer.
+    description: ''
   - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
+    parameterValueGroup: None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server
     summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
   - name: --location -l
@@ -118,64 +198,27 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --orchestration-mode
-    defaultValue: ScaleSetVM
-    parameterValueGroup: ScaleSetVM, VM
-    summary: Choose how virtual machines are managed by the scale set. In VM mode, you manually create and add a virtual machine of any configuration to the scale set. In ScaleSetVM mode, you define a virtual machine model and Azure will generate identical instances based on that model.
-    description: ''
-  - name: --scale-in-policy
-    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
-    description: ''
-  - name: --secrets
-    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
-    description: ''
-  - name: --single-placement-group
-    parameterValueGroup: false, true
-    summary: Limit the scale set to a single placement group. See <a href="https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups">https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups</a> for details.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --upgrade-policy-mode
-    defaultValue: manual
-    parameterValueGroup: Automatic, Manual
-    summary: ''
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
-  - name: --vm-sku
-    summary: Size of VMs in the scale set. Default to "Standard_DS1_v2". See <a href="https://azure.microsoft.com/pricing/details/virtual-machines/">https://azure.microsoft.com/pricing/details/virtual-machines/</a> for size info.
-    description: ''
-  - name: --admin-password
-    summary: Password for the VM if authentication type is 'Password'.
-    description: ''
-  - name: --admin-username
-    defaultValue: your_system_user_login_name
-    summary: Username for the VM.
-    description: ''
-  - name: --authentication-type
-    parameterValueGroup: all, password, ssh
-    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
-    description: ''
-  - name: --generate-ssh-keys
-    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
+  - name: --nsg
+    summary: Name or ID of an existing Network Security Group.
     description: ''
-  - name: --ssh-dest-key-path
-    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+  - name: --orchestration-mode
+    defaultValue: Uniform
+    parameterValueGroup: Flexible, Uniform
+    summary: Choose how virtual machines are managed by the scale set. In Uniform mode, you define a virtual machine model and Azure will generate identical instances based on that model. In Flexible mode, you manually create and add a virtual machine of any configuration to the scale set or generate identical instances based on virtual machine model defined for the scale set.
     description: ''
-  - name: --ssh-key-values
-    summary: Space-separated list of SSH public keys or public key file paths.
+  - name: --os-disk-caching
+    parameterValueGroup: None, ReadOnly, ReadWrite
+    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
     description: ''
-  - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+  - name: --os-disk-name
+    summary: The name of the new VM OS disk.
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
+  - name: --os-disk-size-gb
+    summary: OS disk size in GB to create.
     description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
+  - name: --os-type
+    parameterValueGroup: linux, windows
+    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
     description: ''
   - name: --plan-name
     summary: Plan name.
@@ -189,9 +232,6 @@ items:
   - name: --plan-publisher
     summary: Plan publisher.
     description: ''
-  - name: --nsg
-    summary: Name or ID of an existing Network Security Group.
-    description: ''
   - name: --public-ip-address
     summary: Name of the public IP address when creating one (default) or referencing an existing one. Can also reference an existing public IP by ID or specify "" for None ('""' in Azure CLI using PowerShell or --% operator).
     description: ''
@@ -202,69 +242,33 @@ items:
   - name: --public-ip-address-dns-name
     summary: Globally unique DNS name for a newly created public IP.
     description: ''
-  - name: --subnet
-    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
-    description: ''
-  - name: --subnet-address-prefix
-    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vnet-address-prefix
-    defaultValue: 10.0.0.0/16
-    summary: The IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network when creating a new one or referencing an existing one.
-    description: ''
-  - name: --app-gateway
-    summary: Name to use when creating a new application gateway (default) or referencing an existing one. Can also reference an existing application gateway by ID or specify "" for none.
-    description: ''
-  - name: --app-gateway-capacity
-    defaultValue: "10"
-    summary: The number of instances to use when creating a new application gateway.
-    description: ''
-  - name: --app-gateway-sku
-    defaultValue: Standard_Large
-    summary: SKU when creating a new application gateway.
-    description: ''
-  - name: --app-gateway-subnet-address-prefix
-    summary: The subnet IP address prefix to use when creating a new application gateway in CIDR format.
-    description: ''
-  - name: --backend-pool-name
-    summary: Name to use for the backend pool when creating a new load balancer or application gateway.
-    description: ''
-  - name: --backend-port
-    summary: When creating a new load balancer, backend port to open with NAT rules (Defaults to 22 on Linux and 3389 on Windows). When creating an application gateway, the backend port to use for the backend HTTP settings.
-    description: ''
-  - name: --lb --load-balancer
-    summary: Name to use when creating a new load balancer (default) or referencing an existing one. Can also reference an existing load balancer by ID or specify "" for none.
-    description: ''
-  - name: --lb-nat-pool-name --nat-pool-name
-    summary: Name to use for the NAT pool when creating a new load balancer.
-    description: ''
-  - name: --data-disk-caching
-    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `&lt;lun&gt;=&lt;vaule1&gt; &lt;lun&gt;=&lt;value2&gt;` to configure individual disk.
-    description: ''
-  - name: --data-disk-sizes-gb
-    summary: Space-separated empty managed data disk sizes in GB to create.
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
     description: ''
-  - name: --os-disk-caching
-    parameterValueGroup: None, ReadOnly, ReadWrite
-    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
+  - name: --scale-in-policy
+    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
     description: ''
-  - name: --os-disk-name
-    summary: The name of the new VM OS disk.
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
-  - name: --os-disk-size-gb
-    summary: OS disk size in GB to create.
+  - name: --secrets
+    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
     description: ''
-  - name: --os-type
-    parameterValueGroup: linux, windows
-    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
+  - name: --single-placement-group
+    parameterValueGroup: false, true
+    summary: Limit the scale set to a single placement group. See https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups for details.
     description: ''
   - name: --specialized
     parameterValueGroup: false, true
     summary: Indicate whether the source image is specialized.
     description: ''
+  - name: --ssh-dest-key-path
+    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+    description: ''
+  - name: --ssh-key-values
+    summary: Space-separated list of SSH public keys or public key file paths.
+    description: ''
   - name: --storage-container-name
     defaultValue: vhds
     summary: 'Only applicable when used with `--use-unmanaged-disk`. Name of the storage container for the VM OS disk. Default: vhds.'
@@ -272,37 +276,63 @@ items:
   - name: --storage-sku
     summary: 'The SKU of the storage account with which to persist VM. Use a singular sku that would be applied across all disks, or specify individual disks. Usage: [--storage-sku SKU | --storage-sku ID=SKU ID=SKU ID=SKU...], where each ID is "os" or a 0-indexed lun. Allowed values: Premium_LRS, Standard_LRS.'
     description: ''
-  - name: --use-unmanaged-disk
-    summary: Do not use managed disk to persist VM.
+  - name: --subnet
+    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
+    description: ''
+  - name: --subnet-address-prefix
+    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --upgrade-policy-mode
+    defaultValue: manual
+    parameterValueGroup: Automatic, Manual
+    summary: ''
+    description: ''
+  - name: --use-unmanaged-disk
+    summary: Do not use managed disk to persist VM.
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
+  - name: --vm-sku
+    summary: Size of VMs in the scale set. Default to "Standard_DS1_v2". See https://azure.microsoft.com/pricing/details/virtual-machines/ for size info.
+    description: ''
+  - name: --vnet-address-prefix
+    defaultValue: 10.0.0.0/16
+    summary: The IP address prefix to use when creating a new VNet in CIDR format.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network when creating a new one or referencing an existing one.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_deallocate
   name: az vmss deallocate
   summary: Deallocate VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss deallocate --name
+                       --resource-group
+                       [--instance-ids]
+                       [--no-wait]
+                       [--subscription]
   examples:
   - summary: Deallocate VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss deallocate --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss deallocate --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -312,86 +342,82 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_delete
   name: az vmss delete
   summary: Deletes a VM scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  syntax: >-
+    az vmss delete [--ids]
+                   [--name]
+                   [--no-wait]
+                   [--resource-group]
+                   [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_delete_instances
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_delete-instances
   name: az vmss delete-instances
   summary: Delete VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss delete-instances --instance-ids
+                             --name
+                             --resource-group
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Delete VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss delete-instances --instance-ids 0 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss delete-instances --instance-ids 0 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_get_instance_view
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_get-instance-view
   name: az vmss get-instance-view
   summary: View an instance of a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss get-instance-view [--ids]
+                              [--instance-id]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: View an instance of a VMSS. (autogenerated)
-    syntax:
-      content: az vmss get-instance-view --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss get-instance-view --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -399,175 +425,170 @@ items:
     summary: A VM instance ID or "\*" to list instance view for all VMs in a scale set.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_list
   name: az vmss list
   summary: List VMSS.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss list [--query-examples]
+                 [--resource-group]
+                 [--subscription]
+  examples:
+  - summary: List VMSS (autogenerated)
+    syntax: az vmss list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_instance_connection_info
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-instance-connection-info
   name: az vmss list-instance-connection-info
   summary: Get the IP address and port number used to connect to individual VM instances within a set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss list-instance-connection-info [--ids]
+                                          [--name]
+                                          [--resource-group]
+                                          [--subscription]
   examples:
   - summary: Get the IP address and port number used to connect to individual VM instances within a set. (autogenerated)
-    syntax:
-      content: az vmss list-instance-connection-info --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss list-instance-connection-info --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_instance_public_ips
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-instance-public-ips
   name: az vmss list-instance-public-ips
   summary: List public IP addresses of VM instances within a set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss list-instance-public-ips [--ids]
+                                     [--name]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: List public IP addresses of VM instances within a set. (autogenerated)
-    syntax:
-      content: az vmss list-instance-public-ips --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss list-instance-public-ips --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_instances
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-instances
   name: az vmss list-instances
   summary: Gets a list of all virtual machines in a VM scale sets.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss list-instances [--expand]
+                           [--filter]
+                           [--ids]
+                           [--name]
+                           [--resource-group]
+                           [--select]
+                           [--subscription]
+  optionalParameters:
   - name: --expand
-    summary: The expand expression to apply to the operation.
+    summary: The expand expression to apply to the operation. Allowed values are 'instanceView'.
     description: ''
   - name: --filter
-    summary: The filter to apply to the operation.
-    description: ''
-  - name: --select
-    summary: The list parameters.
+    summary: The filter to apply to the operation. Allowed values are 'startswith(instanceView/statuses/code, 'PowerState') eq true', 'properties/latestModelApplied eq true', 'properties/latestModelApplied eq false'.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --select
+    summary: The list parameters. Allowed values are 'instanceView', 'instanceView/statuses'.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_skus
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-skus
   name: az vmss list-skus
   summary: Gets a list of SKUs available for your VM scale set, including the minimum and maximum VM instances allowed for each SKU.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss list-skus [--ids]
+                      [--name]
+                      [--resource-group]
+                      [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_restart
   name: az vmss restart
   summary: Restart VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss restart --name
+                    --resource-group
+                    [--instance-ids]
+                    [--no-wait]
+                    [--subscription]
   examples:
   - summary: Restart VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss restart --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss restart --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -577,59 +598,59 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_scale
   name: az vmss scale
   summary: Change the number of VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss scale --new-capacity
+                  [--ids]
+                  [--name]
+                  [--no-wait]
+                  [--resource-group]
+                  [--subscription]
   examples:
   - summary: Change the number of VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss scale --name MyScaleSet --new-capacity 6 --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss scale --name MyScaleSet --new-capacity 6 --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --new-capacity
     summary: Number of VMs in the VMSS.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_set_orchestration_service_state
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_set-orchestration-service-state
   name: az vmss set-orchestration-service-state
   summary: Change ServiceState property for a given service within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss set-orchestration-service-state --action
+                                            --service-name
+                                            [--ids]
+                                            [--name]
+                                            [--no-wait]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: Change ServiceState property for AutomaticRepairs
-    syntax:
-      content: az vmss set-orchestration-service-state --service-name AutomaticRepairs --action Resume --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss set-orchestration-service-state --service-name AutomaticRepairs --action Resume --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --action
     summary: The action to be performed.
@@ -638,77 +659,79 @@ items:
     name: --service-name
     summary: The name of the orchestration service.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_show
   name: az vmss show
   summary: Get details on VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss show --name
+                 --resource-group
+                 [--instance-id]
+                 [--query-examples]
+                 [--subscription]
   examples:
   - summary: Get details on VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss show --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss show --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-id
     summary: VM instance ID. If missing, show the VMSS.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_start
   name: az vmss start
   summary: Start VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss start --name
+                  --resource-group
+                  [--instance-ids]
+                  [--no-wait]
+                  [--subscription]
   examples:
   - summary: Start VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss start --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss start --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -718,34 +741,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_stop
   name: az vmss stop
   summary: Power off (stop) VMs within a VMSS.
   description: The VMs will continue to be billed. To avoid this, you can deallocate VM instances within a VMSS through "az vmss deallocate".
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss stop --name
+                 --resource-group
+                 [--instance-ids]
+                 [--no-wait]
+                 [--subscription]
   examples:
   - summary: Power off VMs within a VMSS without shutting down.
-    syntax:
-      content: az vmss stop --name MyScaleSet --resource-group MyResourceGroup --skip-shutdown
+    syntax: az vmss stop --name MyScaleSet --resource-group MyResourceGroup --skip-shutdown
   - summary: Power off (stop) VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss stop --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss stop --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -755,44 +776,43 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_update
   name: az vmss update
-  summary: Update a VMSS.
+  summary: Update a VMSS. Run 'az vmss update-instances' command to roll out the changes to VMs if you have not configured upgrade policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss update [--add]
+                   [--force-string]
+                   [--ids]
+                   [--instance-id]
+                   [--license-type {None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server}]
+                   [--name]
+                   [--no-wait]
+                   [--remove]
+                   [--resource-group]
+                   [--scale-in-policy]
+                   [--set]
+                   [--subscription]
   examples:
   - summary: Update a VMSS' license type for Azure Hybrid Benefit.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --license-type windows_server
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --license-type windows_server
   - summary: Update a VM instance's protection policies.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --protect-from-scale-set-actions False --protect-from-scale-in
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --protect-from-scale-set-actions False --protect-from-scale-in
   - summary: Update a VM instance's protection policies.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --set protectionPolicy.protectFromScaleIn=True protectionPolicy.protectFromScaleSetActions=False
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --set protectionPolicy.protectFromScaleIn=True protectionPolicy.protectFromScaleSetActions=False
   - summary: Update a VM instance's Read-Write IOPS of the managed disk.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskIOPSReadWrite=444
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskIOPSReadWrite=444
   - summary: Update a VM instance's bandwidth in MB per second of the managed disk.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskMBpsReadWrite=66
-  parameters:
-  - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
-    summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskMBpsReadWrite=66
+  - summary: Update a VM to use a custom image.
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.imageReference.id=imageID
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --scale-in-policy
-    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -800,100 +820,91 @@ items:
   - name: --instance-id
     summary: Update the VM instance with this ID. If missing, Update the VMSS.
     description: ''
-  - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --license-type
+    parameterValueGroup: None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server
+    summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --name -n
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --scale-in-policy
+    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_update_instances
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_update-instances
   name: az vmss update-instances
   summary: Upgrade VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss update-instances --instance-ids
+                             --name
+                             --resource-group
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Upgrade VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss update-instances --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss update-instances --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_wait
   name: az vmss wait
   summary: Place the CLI in a waiting state until a condition of a scale set is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss wait [--created]
+                 [--custom]
+                 [--deleted]
+                 [--exists]
+                 [--ids]
+                 [--instance-id]
+                 [--interval]
+                 [--name]
+                 [--resource-group]
+                 [--subscription]
+                 [--timeout]
+                 [--updated]
   examples:
   - summary: Place the CLI in a waiting state until the VMSS has been updated.
-    syntax:
-      content: az vmss wait --updated --name MyScaleSet --resource-group MyResourceGroup
+    syntax: az vmss wait --updated --name MyScaleSet --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until the VMSS instance has been updated.
-    syntax:
-      content: az vmss wait --updated --instance-id 1 --name MyScaleSet --resource-group MyResourceGroup
+    syntax: az vmss wait --updated --instance-id 1 --name MyScaleSet --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until a condition of a scale set is met. (autogenerated)
-    syntax:
-      content: az vmss wait --created --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --instance-id
-    summary: Wait on the VM instance with this ID. If missing, Wait on the VMSS.
-    description: ''
-  - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az vmss wait --created --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -906,10 +917,25 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --instance-id
+    summary: Wait on the VM instance with this ID. If missing, Wait on the VMSS.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -917,130 +943,47 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_create
-  name: az vmss create
-  summary: Create an Azure Virtual Machine Scale Set.
-- uid: az_vmss_deallocate
-  name: az vmss deallocate
-  summary: Deallocate VMs within a VMSS.
-- uid: az_vmss_delete
-  name: az vmss delete
-  summary: Deletes a VM scale set.
-- uid: az_vmss_delete_instances
-  name: az vmss delete-instances
-  summary: Delete VMs within a VMSS.
-- uid: az_vmss_diagnostics
-  name: az vmss diagnostics
-  summary: Configure the Azure Virtual Machine Scale Set diagnostics extension.
-- uid: az_vmss_diagnostics_get_default_config
-  name: az vmss diagnostics get-default-config
-  summary: Show the default config file which defines data to be collected.
-- uid: az_vmss_diagnostics_set
-  name: az vmss diagnostics set
-  summary: Enable diagnostics on a VMSS.
-- uid: az_vmss_extension
-  name: az vmss extension
-  summary: Manage extensions on a VM scale set.
-- uid: az_vmss_extension_delete
-  name: az vmss extension delete
-  summary: Delete an extension from a VMSS.
-- uid: az_vmss_extension_image
-  name: az vmss extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vmss_extension_image_list
-  name: az vmss extension image list
-  summary: List the information on available extensions.
-- uid: az_vmss_extension_image_list_names
-  name: az vmss extension image list-names
-  summary: Gets a list of virtual machine extension image types.
-- uid: az_vmss_extension_image_list_versions
-  name: az vmss extension image list-versions
-  summary: Gets a list of virtual machine extension image versions.
-- uid: az_vmss_extension_image_show
-  name: az vmss extension image show
-  summary: Gets a virtual machine extension image.
-- uid: az_vmss_extension_list
-  name: az vmss extension list
-  summary: List extensions associated with a VMSS.
-- uid: az_vmss_extension_set
-  name: az vmss extension set
-  summary: Add an extension to a VMSS or update an existing extension.
-- uid: az_vmss_extension_show
-  name: az vmss extension show
-  summary: Show details on a VMSS extension.
-- uid: az_vmss_get_instance_view
-  name: az vmss get-instance-view
-  summary: View an instance of a VMSS.
-- uid: az_vmss_identity
-  name: az vmss identity
-  summary: Manage service identities of a VM scaleset.
-- uid: az_vmss_identity_assign
-  name: az vmss identity assign
-  summary: Enable managed service identity on a VMSS.
-- uid: az_vmss_identity_show
-  name: az vmss identity show
-  summary: Display VM scaleset's managed identity info.
-- uid: az_vmss_list
-  name: az vmss list
-  summary: List VMSS.
-- uid: az_vmss_list_instance_connection_info
-  name: az vmss list-instance-connection-info
-  summary: Get the IP address and port number used to connect to individual VM instances within a set.
-- uid: az_vmss_list_instance_public_ips
-  name: az vmss list-instance-public-ips
-  summary: List public IP addresses of VM instances within a set.
-- uid: az_vmss_list_instances
-  name: az vmss list-instances
-  summary: Gets a list of all virtual machines in a VM scale sets.
-- uid: az_vmss_list_skus
-  name: az vmss list-skus
-  summary: Gets a list of SKUs available for your VM scale set, including the minimum and maximum VM instances allowed for each SKU.
-- uid: az_vmss_nic
-  name: az vmss nic
-  summary: Manage network interfaces of a VMSS.
-- uid: az_vmss_nic_list
-  name: az vmss nic list
-  summary: Gets all network interfaces in a virtual machine scale set.
-- uid: az_vmss_nic_list_vm_nics
-  name: az vmss nic list-vm-nics
-  summary: Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
-- uid: az_vmss_nic_show
-  name: az vmss nic show
-  summary: Get the specified network interface in a virtual machine scale set.
-- uid: az_vmss_restart
-  name: az vmss restart
-  summary: Restart VMs within a VMSS.
-- uid: az_vmss_scale
-  name: az vmss scale
-  summary: Change the number of VMs within a VMSS.
-- uid: az_vmss_set_orchestration_service_state
-  name: az vmss set-orchestration-service-state
-  summary: Change ServiceState property for a given service within a VMSS.
-- uid: az_vmss_show
-  name: az vmss show
-  summary: Get details on VMs within a VMSS.
-- uid: az_vmss_start
-  name: az vmss start
-  summary: Start VMs within a VMSS.
-- uid: az_vmss_stop
-  name: az vmss stop
-  summary: Power off (stop) VMs within a VMSS.
-- uid: az_vmss_update
-  name: az vmss update
-  summary: Update a VMSS.
-- uid: az_vmss_update_instances
-  name: az vmss update-instances
-  summary: Upgrade VMs within a VMSS.
-- uid: az_vmss_wait
-  name: az vmss wait
-  summary: Place the CLI in a waiting state until a condition of a scale set is met.
+- az_vmss_create
+- az_vmss_deallocate
+- az_vmss_delete
+- az_vmss_delete-instances
+- az_vmss_diagnostics
+- az_vmss_diagnostics_get-default-config
+- az_vmss_diagnostics_set
+- az_vmss_extension
+- az_vmss_extension_delete
+- az_vmss_extension_image
+- az_vmss_extension_image_list
+- az_vmss_extension_image_list-names
+- az_vmss_extension_image_list-versions
+- az_vmss_extension_image_show
+- az_vmss_extension_list
+- az_vmss_extension_set
+- az_vmss_extension_show
+- az_vmss_get-instance-view
+- az_vmss_identity
+- az_vmss_identity_assign
+- az_vmss_identity_show
+- az_vmss_list
+- az_vmss_list-instance-connection-info
+- az_vmss_list-instance-public-ips
+- az_vmss_list-instances
+- az_vmss_list-skus
+- az_vmss_nic
+- az_vmss_nic_list
+- az_vmss_nic_list-vm-nics
+- az_vmss_nic_show
+- az_vmss_restart
+- az_vmss_scale
+- az_vmss_set-orchestration-service-state
+- az_vmss_show
+- az_vmss_start
+- az_vmss_stop
+- az_vmss_update
+- az_vmss_update-instances
+- az_vmss_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1056,10 +999,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
diff --git a/2017-03-09-profile/docs-ref-autogen/vmss/diagnostics.yml b/2017-03-09-profile/docs-ref-autogen/vmss/diagnostics.yml
index 09a1bf851c..d4b9f5111b 100644
--- a/2017-03-09-profile/docs-ref-autogen/vmss/diagnostics.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vmss/diagnostics.yml
@@ -1,47 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_diagnostics
-  name: az vmss diagnostics
-  summary: Configure the Azure Virtual Machine Scale Set diagnostics extension.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_diagnostics_get_default_config
-  - az_vmss_diagnostics_set
-- uid: az_vmss_diagnostics_get_default_config
+### YamlMime:AzureCLIGroup
+uid: az_vmss_diagnostics
+name: az vmss diagnostics
+summary: Configure the Azure Virtual Machine Scale Set diagnostics extension.
+description: ''
+directCommands:
+- uid: az_vmss_diagnostics_get-default-config
   name: az vmss diagnostics get-default-config
   summary: Show the default config file which defines data to be collected.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss diagnostics get-default-config [--is-windows-os]
+                                           [--subscription]
+  optionalParameters:
   - name: --is-windows-os
     summary: For Windows VMs.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_diagnostics_set
   name: az vmss diagnostics set
   summary: Enable diagnostics on a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss diagnostics set --resource-group
+                            --settings
+                            --vmss-name
+                            [--no-auto-upgrade {false, true}]
+                            [--no-auto-upgrade-minor-version {false, true}]
+                            [--protected-settings]
+                            [--subscription]
+                            [--version]
   examples:
   - summary: Enable diagnostics on a VMSS. (autogenerated)
-    syntax:
-      content: "az vmss diagnostics set --protected-settings {protected-settings} --resource-group MyResourceGroup --settings '{\"commandToExecute\": \"echo testing\"}' --vmss-name MyVmss"
-  parameters:
+    syntax: "az vmss diagnostics set --protected-settings {protected-settings} --resource-group MyResourceGroup --settings '{\"commandToExecute\": \"echo testing\"}' --vmss-name MyVmss"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --settings
@@ -51,32 +48,28 @@ items:
     name: --vmss-name
     summary: Scale set name.
     description: ''
+  optionalParameters:
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --protected-settings
     summary: Json string or a file path containing private configurations such as storage account keys, etc.
     description: ''
-  - name: --version
-    summary: Version of the diagnostics extension. Will use the latest if not specfied.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --version
+    summary: Version of the diagnostics extension. Will use the latest if not specfied.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_diagnostics_get_default_config
-  name: az vmss diagnostics get-default-config
-  summary: Show the default config file which defines data to be collected.
-- uid: az_vmss_diagnostics_set
-  name: az vmss diagnostics set
-  summary: Enable diagnostics on a VMSS.
+- az_vmss_diagnostics_get-default-config
+- az_vmss_diagnostics_set
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -92,10 +85,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Configure the Azure Virtual Machine Scale Set diagnostics extension.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Configure the Azure Virtual Machine Scale Set diagnostics extension.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmss/extension.yml b/2017-03-09-profile/docs-ref-autogen/vmss/extension.yml
index 032a93e64b..1886b1263c 100644
--- a/2017-03-09-profile/docs-ref-autogen/vmss/extension.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vmss/extension.yml
@@ -1,94 +1,99 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_extension
-  name: az vmss extension
-  summary: Manage extensions on a VM scale set.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_extension_delete
-  - az_vmss_extension_list
-  - az_vmss_extension_set
-  - az_vmss_extension_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_extension
+name: az vmss extension
+summary: Manage extensions on a VM scale set.
+description: ''
+directCommands:
 - uid: az_vmss_extension_delete
   name: az vmss extension delete
   summary: Delete an extension from a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension delete --name
+                             --resource-group
+                             --vmss-name
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Delete an extension from a VMSS. (autogenerated)
-    syntax:
-      content: az vmss extension delete --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
-  parameters:
+    syntax: az vmss extension delete --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_list
   name: az vmss extension list
   summary: List extensions associated with a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension list --resource-group
+                           --vmss-name
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: List extensions associated with a VMSS. (autogenerated)
-    syntax:
-      content: az vmss extension list --resource-group MyResourceGroup --vmss-name MyVmss
-  parameters:
+    syntax: az vmss extension list --resource-group MyResourceGroup --vmss-name MyVmss
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_set
   name: az vmss extension set
   summary: Add an extension to a VMSS or update an existing extension.
   description: Get extension details from `az vmss extension image list`.
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension set --name
+                          --publisher
+                          --resource-group
+                          --vmss-name
+                          [--enable-auto-upgrade {false, true}]
+                          [--no-auto-upgrade {false, true}]
+                          [--no-auto-upgrade-minor-version {false, true}]
+                          [--no-wait]
+                          [--protected-settings]
+                          [--settings]
+                          [--subscription]
+                          [--version]
   examples:
   - summary: Set an extension which depends on two previously set extensions. That is, When a VMSS instance is created or reimaged, the customScript extension will be provisioned only after all extensions that it depends on have been provisioned. The extension need not depend on the other extensions for pre-requisite configurations.
-    syntax:
-      content: >-
-        az vmss extension set --vmss-name my-vmss --name customScript --resource-group my-group \
-            --version 2.0 --publisher Microsoft.Azure.Extensions \
-            --provision-after-extensions NetworkWatcherAgentLinux VMAccessForLinux  \
-            --settings '{"commandToExecute": "echo testing"}'
-  parameters:
+    syntax: >-
+      az vmss extension set --vmss-name my-vmss --name customScript --resource-group my-group \
+          --version 2.0 --publisher Microsoft.Azure.Extensions \
+          --provision-after-extensions NetworkWatcherAgentLinux VMAccessForLinux  \
+          --settings '{"commandToExecute": "echo testing"}'
+  - summary: Add an extension and enable automatic upgrade by the platform if there is a newer version of the extension available.
+    syntax: az vmss extension set -n extName --publisher publisher --vmss-name my-vmss -g my-group \ --enable-auto-upgrade true
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
@@ -100,16 +105,25 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-auto-upgrade
+    parameterValueGroup: false, true
+    summary: Indicate the extension should be automatically upgraded by the platform if there is a newer version of the extension available.
     description: ''
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -119,78 +133,57 @@ items:
   - name: --settings
     summary: Extension settings in JSON format. A JSON file path is also accepted.
     description: ''
-  - name: --version
-    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --version
+    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade-minor-version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_show
   name: az vmss extension show
   summary: Show details on a VMSS extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension show --name
+                           --resource-group
+                           --vmss-name
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: Show details on a VMSS extension. (autogenerated)
-    syntax:
-      content: az vmss extension show --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
-  parameters:
+    syntax: az vmss extension show --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_extension_delete
-  name: az vmss extension delete
-  summary: Delete an extension from a VMSS.
-- uid: az_vmss_extension_image
-  name: az vmss extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vmss_extension_image_list
-  name: az vmss extension image list
-  summary: List the information on available extensions.
-- uid: az_vmss_extension_image_list_names
-  name: az vmss extension image list-names
-  summary: Gets a list of virtual machine extension image types.
-- uid: az_vmss_extension_image_list_versions
-  name: az vmss extension image list-versions
-  summary: Gets a list of virtual machine extension image versions.
-- uid: az_vmss_extension_image_show
-  name: az vmss extension image show
-  summary: Gets a virtual machine extension image.
-- uid: az_vmss_extension_list
-  name: az vmss extension list
-  summary: List extensions associated with a VMSS.
-- uid: az_vmss_extension_set
-  name: az vmss extension set
-  summary: Add an extension to a VMSS or update an existing extension.
-- uid: az_vmss_extension_show
-  name: az vmss extension show
-  summary: Show details on a VMSS extension.
+- az_vmss_extension_delete
+- az_vmss_extension_image
+- az_vmss_extension_image_list
+- az_vmss_extension_image_list-names
+- az_vmss_extension_image_list-versions
+- az_vmss_extension_image_show
+- az_vmss_extension_list
+- az_vmss_extension_set
+- az_vmss_extension_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -206,10 +199,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage extensions on a VM scale set.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage extensions on a VM scale set.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmss/extension/image.yml b/2017-03-09-profile/docs-ref-autogen/vmss/extension/image.yml
index c4c7fade20..7bf2e62ec3 100644
--- a/2017-03-09-profile/docs-ref-autogen/vmss/extension/image.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vmss/extension/image.yml
@@ -1,36 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_extension_image
-  name: az vmss extension image
-  summary: Find the available VM extensions for a subscription and region.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_extension_image_list
-  - az_vmss_extension_image_list_names
-  - az_vmss_extension_image_list_versions
-  - az_vmss_extension_image_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_extension_image
+name: az vmss extension image
+summary: Find the available VM extensions for a subscription and region.
+description: ''
+directCommands:
 - uid: az_vmss_extension_image_list
   name: az vmss extension image list
   summary: List the information on available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension image list [--latest]
+                                 [--location]
+                                 [--name]
+                                 [--publisher]
+                                 [--query-examples]
+                                 [--subscription]
+                                 [--version]
   examples:
   - summary: List the unique publishers for extensions.
-    syntax:
-      content: az vmss extension image list --query "[].publisher" -o tsv | sort -u
+    syntax: az vmss extension image list --query "[].publisher" -o tsv | sort -u
   - summary: Find extensions with "Docker" in the name.
-    syntax:
-      content: az vmss extension image list --query "[].name" -o tsv | sort -u | grep Docker
+    syntax: az vmss extension image list --query "[].name" -o tsv | sort -u | grep Docker
   - summary: List extension names where the publisher name starts with "Microsoft.Azure.App".
-    syntax:
-      content: >-
-        az vmss extension image list --query \
-            "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
-            -o tsv | sort -u | xargs -I{} az vmss extension image list-names --publisher {} -l westus
-  parameters:
+    syntax: >-
+      az vmss extension image list --query \
+          "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
+          -o tsv | sort -u | xargs -I{} az vmss extension image list-names --publisher {} -l westus
+  optionalParameters:
   - name: --latest
     summary: Show the latest version only.
     description: ''
@@ -43,52 +39,54 @@ items:
   - name: --publisher -p
     summary: Image publisher name.
     description: ''
-  - name: --version
-    summary: Extension version.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_extension_image_list_names
+  - name: --version
+    summary: Extension version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_extension_image_list-names
   name: az vmss extension image list-names
   summary: Gets a list of virtual machine extension image types.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss extension image list-names --location
+                                       --publisher
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_extension_image_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_extension_image_list-versions
   name: az vmss extension image list-versions
   summary: Gets a list of virtual machine extension image versions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss extension image list-versions --location
+                                          --name
+                                          --publisher
+                                          [--filter]
+                                          [--orderby]
+                                          [--subscription]
+                                          [--top]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -98,34 +96,35 @@ items:
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --filter
     summary: The filter to apply on the operation.
     description: ''
   - name: --orderby
     summary: The $orderby odata query option.
     description: ''
-  - name: --top
-    summary: The $top odata query option.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: The $top odata query option.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_image_show
   name: az vmss extension image show
   summary: Gets a virtual machine extension image.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss extension image show --location
+                                 --name
+                                 --publisher
+                                 --version
+                                 [--query-examples]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -139,28 +138,19 @@ items:
     name: --version
     summary: Extension version.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_extension_image_list
-  name: az vmss extension image list
-  summary: List the information on available extensions.
-- uid: az_vmss_extension_image_list_names
-  name: az vmss extension image list-names
-  summary: Gets a list of virtual machine extension image types.
-- uid: az_vmss_extension_image_list_versions
-  name: az vmss extension image list-versions
-  summary: Gets a list of virtual machine extension image versions.
-- uid: az_vmss_extension_image_show
-  name: az vmss extension image show
-  summary: Gets a virtual machine extension image.
+- az_vmss_extension_image_list
+- az_vmss_extension_image_list-names
+- az_vmss_extension_image_list-versions
+- az_vmss_extension_image_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,10 +166,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Find the available VM extensions for a subscription and region.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Find the available VM extensions for a subscription and region.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmss/identity.yml b/2017-03-09-profile/docs-ref-autogen/vmss/identity.yml
index f7267fa823..1eb175cddd 100644
--- a/2017-03-09-profile/docs-ref-autogen/vmss/identity.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vmss/identity.yml
@@ -1,92 +1,83 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_identity
-  name: az vmss identity
-  summary: Manage service identities of a VM scaleset.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_identity_assign
-  - az_vmss_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_identity
+name: az vmss identity
+summary: Manage service identities of a VM scaleset.
+description: ''
+directCommands:
 - uid: az_vmss_identity_assign
   name: az vmss identity assign
   summary: Enable managed service identity on a VMSS.
   description: This is required to authenticate and interact with other Azure services using bearer tokens.
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss identity assign [--identities]
+                            [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--role]
+                            [--scope]
+                            [--subscription]
   examples:
   - summary: Enable system assigned identity on a VMSS with the 'Owner' role.
-    syntax:
-      content: az vmss identity assign -g MyResourceGroup -n MyVmss --role Owner --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
+    syntax: az vmss identity assign -g MyResourceGroup -n MyVmss --role Owner --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
   - summary: Enable managed service identity on a VMSS. (autogenerated)
-    syntax:
-      content: az vmss identity assign --identities readerId writerId --name MyVmss --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss identity assign --identities readerId writerId --name MyVmss --resource-group MyResourceGroup
+  optionalParameters:
   - name: --identities
     summary: "Space-separated identities to assign. Use '[system]' to refer to the system assigned identity. Default: '[system]'."
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
-    description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
+    description: ''
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_identity_show
   name: az vmss identity show
   summary: Display VM scaleset's managed identity info.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss identity show [--ids]
+                          [--name]
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: display VM scaleset's managed identity info. (autogenerated)
-    syntax:
-      content: az vmss identity show --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss identity show --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_identity_assign
-  name: az vmss identity assign
-  summary: Enable managed service identity on a VMSS.
-- uid: az_vmss_identity_show
-  name: az vmss identity show
-  summary: Display VM scaleset's managed identity info.
+- az_vmss_identity_assign
+- az_vmss_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +93,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage service identities of a VM scaleset.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage service identities of a VM scaleset.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmss/nic.yml b/2017-03-09-profile/docs-ref-autogen/vmss/nic.yml
index eabd7977ee..8d0596d448 100644
--- a/2017-03-09-profile/docs-ref-autogen/vmss/nic.yml
+++ b/2017-03-09-profile/docs-ref-autogen/vmss/nic.yml
@@ -1,46 +1,46 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_nic
-  name: az vmss nic
-  summary: Manage network interfaces of a VMSS.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_nic_list
-  - az_vmss_nic_list_vm_nics
-  - az_vmss_nic_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_nic
+name: az vmss nic
+summary: Manage network interfaces of a VMSS.
+description: ''
+directCommands:
 - uid: az_vmss_nic_list
   name: az vmss nic list
   summary: Gets all network interfaces in a virtual machine scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss nic list --resource-group
+                     --vmss-name
+                     [--query-examples]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_nic_list_vm_nics
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_nic_list-vm-nics
   name: az vmss nic list-vm-nics
   summary: Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss nic list-vm-nics [--ids]
+                             [--instance-id]
+                             [--resource-group]
+                             [--subscription]
+                             [--vmss-name]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -48,7 +48,7 @@ items:
     summary: The virtual machine index.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -56,19 +56,21 @@ items:
   - name: --vmss-name
     summary: Scale set name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_nic_show
   name: az vmss nic show
   summary: Get the specified network interface in a virtual machine scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss nic show [--expand]
+                     [--ids]
+                     [--instance-id]
+                     [--name]
+                     [--query-examples]
+                     [--resource-group]
+                     [--subscription]
+                     [--vmss-name]
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -81,8 +83,11 @@ items:
   - name: --name -n
     summary: The network interface (NIC).
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -90,22 +95,11 @@ items:
   - name: --vmss-name
     summary: Scale set name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_nic_list
-  name: az vmss nic list
-  summary: Gets all network interfaces in a virtual machine scale set.
-- uid: az_vmss_nic_list_vm_nics
-  name: az vmss nic list-vm-nics
-  summary: Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
-- uid: az_vmss_nic_show
-  name: az vmss nic show
-  summary: Get the specified network interface in a virtual machine scale set.
+- az_vmss_nic_list
+- az_vmss_nic_list-vm-nics
+- az_vmss_nic_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -121,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage network interfaces of a VMSS.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage network interfaces of a VMSS.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware.yml b/2017-03-09-profile/docs-ref-autogen/vmware.yml
new file mode 100644
index 0000000000..0cef810548
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware
+name: az vmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure VMware Solution.
+description: ''
+commands:
+- az_vmware_authorization
+- az_vmware_authorization_create
+- az_vmware_authorization_delete
+- az_vmware_authorization_list
+- az_vmware_authorization_show
+- az_vmware_cluster
+- az_vmware_cluster_create
+- az_vmware_cluster_delete
+- az_vmware_cluster_list
+- az_vmware_cluster_show
+- az_vmware_cluster_update
+- az_vmware_datastore
+- az_vmware_datastore_create
+- az_vmware_datastore_delete
+- az_vmware_datastore_list
+- az_vmware_datastore_show
+- az_vmware_hcx-enterprise-site
+- az_vmware_hcx-enterprise-site_create
+- az_vmware_hcx-enterprise-site_delete
+- az_vmware_hcx-enterprise-site_list
+- az_vmware_hcx-enterprise-site_show
+- az_vmware_location
+- az_vmware_location_checkquotaavailability
+- az_vmware_location_checktrialavailability
+- az_vmware_private-cloud
+- az_vmware_private-cloud_addidentitysource
+- az_vmware_private-cloud_create
+- az_vmware_private-cloud_delete
+- az_vmware_private-cloud_deleteidentitysource
+- az_vmware_private-cloud_list
+- az_vmware_private-cloud_listadmincredentials
+- az_vmware_private-cloud_show
+- az_vmware_private-cloud_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure VMware Solution.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware/authorization.yml b/2017-03-09-profile/docs-ref-autogen/vmware/authorization.yml
new file mode 100644
index 0000000000..db50af1441
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware/authorization.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_authorization
+name: az vmware authorization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware authorization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage the authorizations of an ExpressRoute Circuit for a private cloud.
+description: ''
+directCommands:
+- uid: az_vmware_authorization_create
+  name: az vmware authorization create
+  summary: Create an authorization for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization create --name
+                                   --private-cloud
+                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the authorization.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_authorization_delete
+  name: az vmware authorization delete
+  summary: Delete an authorization for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization delete --name
+                                   --private-cloud
+                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the authorization.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_authorization_list
+  name: az vmware authorization list
+  summary: List authorizations for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization list --private-cloud
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_authorization_show
+  name: az vmware authorization show
+  summary: Show details of an authorization for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization show --name
+                                 --private-cloud
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the authorization.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_vmware_authorization_create
+- az_vmware_authorization_delete
+- az_vmware_authorization_list
+- az_vmware_authorization_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage the authorizations of an ExpressRoute Circuit for a private cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware/cluster.yml b/2017-03-09-profile/docs-ref-autogen/vmware/cluster.yml
new file mode 100644
index 0000000000..57f5e9df2a
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware/cluster.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_cluster
+name: az vmware cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage clusters in a private cloud.
+description: ''
+directCommands:
+- uid: az_vmware_cluster_create
+  name: az vmware cluster create
+  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
+  description: ''
+  syntax: >-
+    az vmware cluster create --name
+                             --private-cloud
+                             --resource-group
+                             --size
+                             --sku
+                             [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --size
+    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The product SKU.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_vmware_cluster_delete
+  name: az vmware cluster delete
+  summary: Delete a cluster in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster delete --name
+                             --private-cloud
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_cluster_list
+  name: az vmware cluster list
+  summary: List clusters in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster list --private-cloud
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_cluster_show
+  name: az vmware cluster show
+  summary: Show details of a cluster in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster show --name
+                           --private-cloud
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_cluster_update
+  name: az vmware cluster update
+  summary: Update a cluster in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster update --name
+                             --private-cloud
+                             --resource-group
+                             --size
+                             [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --size
+    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_vmware_cluster_create
+- az_vmware_cluster_delete
+- az_vmware_cluster_list
+- az_vmware_cluster_show
+- az_vmware_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage clusters in a private cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware/datastore.yml b/2017-03-09-profile/docs-ref-autogen/vmware/datastore.yml
new file mode 100644
index 0000000000..f4315252da
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware/datastore.yml
@@ -0,0 +1,164 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_datastore
+name: az vmware datastore
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware datastore** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage a datastore in a private cloud cluster.
+description: ''
+directCommands:
+- uid: az_vmware_datastore_create
+  name: az vmware datastore create
+  summary: Create a datastore in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore create --cluster
+                               --name
+                               --private-cloud
+                               --resource-group
+                               [--endpoints]
+                               [--lun-name]
+                               [--nfs-file-path]
+                               [--nfs-provider-ip]
+  examples:
+  - summary: Create a new Microsoft.StoragePool provided disk pool based iSCSI datastore.
+    syntax: az vmware datastore create --name iSCSIDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud --endpoints 10.10.0.1:3260 --lun-name lun0
+  - summary: Create a new Microsoft.StoragePool provided disk pool based iSCSI datastore with multiple endpoints.
+    syntax: az vmware datastore create --name iSCSIDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud --endpoints 10.10.0.1:3260 10.10.0.2:3260 --lun-name lun0
+  - summary: Create a new Microsoft.NetApp provided NetApp volume based NFSv3 datastore.
+    syntax: az vmware datastore create --name ANFDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud --nfs-file-path ANFVol1FilePath --nfs-provider-ip 10.10.0.1
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --endpoints
+    summary: ISCSI provider target IP address list.
+    description: ''
+  - name: --lun-name
+    summary: Name of the LUN to be used.
+    description: ''
+  - name: --nfs-file-path
+    summary: File path through which the NFS volume is exposed by the provider.
+    description: ''
+  - name: --nfs-provider-ip
+    summary: IP address of the NFS provider.
+    description: ''
+- uid: az_vmware_datastore_delete
+  name: az vmware datastore delete
+  summary: Delete a datastore in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore delete --cluster
+                               --name
+                               --private-cloud
+                               --resource-group
+  examples:
+  - summary: Delete an iSCSI or NFS based datastore.
+    syntax: az vmware datastore delete --name MyCloudSANDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_datastore_list
+  name: az vmware datastore list
+  summary: List datastores in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore list --cluster
+                             --private-cloud
+                             --resource-group
+  examples:
+  - summary: List all iSCSI or NFS based datastores under Cluster-1.
+    syntax: az vmware datastore list --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_datastore_show
+  name: az vmware datastore show
+  summary: Show details of a datastore in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore show --cluster
+                             --name
+                             --private-cloud
+                             --resource-group
+  examples:
+  - summary: Show the details of an iSCSI or NFS based datastore.
+    syntax: az vmware datastore show --name MyCloudSANDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_vmware_datastore_create
+- az_vmware_datastore_delete
+- az_vmware_datastore_list
+- az_vmware_datastore_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage a datastore in a private cloud cluster.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware/hcx-enterprise-site.yml b/2017-03-09-profile/docs-ref-autogen/vmware/hcx-enterprise-site.yml
new file mode 100644
index 0000000000..217eba5222
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware/hcx-enterprise-site.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_hcx-enterprise-site
+name: az vmware hcx-enterprise-site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware hcx-enterprise-site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage HCX Enterprise Sites in a private cloud.
+description: ''
+directCommands:
+- uid: az_vmware_hcx-enterprise-site_create
+  name: az vmware hcx-enterprise-site create
+  summary: Create an HCX Enterprise Site in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site create --name
+                                         --private-cloud
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the HCX Enterprise Site.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_hcx-enterprise-site_delete
+  name: az vmware hcx-enterprise-site delete
+  summary: Delete an HCX Enterprise Site in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site delete --name
+                                         --private-cloud
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the HCX Enterprise Site.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_hcx-enterprise-site_list
+  name: az vmware hcx-enterprise-site list
+  summary: List HCX Enterprise Sites in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site list --private-cloud
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_hcx-enterprise-site_show
+  name: az vmware hcx-enterprise-site show
+  summary: Show details of an HCX Enterprise Site in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site show --name
+                                       --private-cloud
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the HCX Enterprise Site.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_vmware_hcx-enterprise-site_create
+- az_vmware_hcx-enterprise-site_delete
+- az_vmware_hcx-enterprise-site_list
+- az_vmware_hcx-enterprise-site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage HCX Enterprise Sites in a private cloud.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware/location.yml b/2017-03-09-profile/docs-ref-autogen/vmware/location.yml
new file mode 100644
index 0000000000..1ef3454d59
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware/location.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_location
+name: az vmware location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to check availability by location.
+description: ''
+directCommands:
+- uid: az_vmware_location_checkquotaavailability
+  name: az vmware location checkquotaavailability
+  summary: Return quota for subscription by region.
+  description: ''
+  syntax: az vmware location checkquotaavailability --location
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_vmware_location_checktrialavailability
+  name: az vmware location checktrialavailability
+  summary: Return trial status for subscription by region.
+  description: ''
+  syntax: az vmware location checktrialavailability --location
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_vmware_location_checkquotaavailability
+- az_vmware_location_checktrialavailability
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to check availability by location.
diff --git a/2017-03-09-profile/docs-ref-autogen/vmware/private-cloud.yml b/2017-03-09-profile/docs-ref-autogen/vmware/private-cloud.yml
new file mode 100644
index 0000000000..34e55c4e15
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/vmware/private-cloud.yml
@@ -0,0 +1,285 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_private-cloud
+name: az vmware private-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware private-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage private clouds.
+description: ''
+directCommands:
+- uid: az_vmware_private-cloud_addidentitysource
+  name: az vmware private-cloud addidentitysource
+  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud addidentitysource --alias
+                                              --base-group-dn
+                                              --base-user-dn
+                                              --domain
+                                              --name
+                                              --password
+                                              --primary-server
+                                              --private-cloud
+                                              --resource-group
+                                              --username
+                                              [--secondary-server]
+                                              [--ssl]
+  requiredParameters:
+  - isRequired: true
+    name: --alias
+    summary: The domain's NetBIOS name.
+    description: ''
+  - isRequired: true
+    name: --base-group-dn
+    summary: The base distinguished name for groups.
+    description: ''
+  - isRequired: true
+    name: --base-user-dn
+    summary: The base distinguished name for users.
+    description: ''
+  - isRequired: true
+    name: --domain
+    summary: The domain's dns name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the identity source.
+    description: ''
+  - isRequired: true
+    name: --password
+    summary: The password of the Active Directory user with a minimum of read-only access to Base DN for users and groups.
+    description: ''
+  - isRequired: true
+    name: --primary-server
+    summary: Primary server URL.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --username
+    summary: The ID of an Active Directory user with a minimum of read-only access to Base DN for users and group.
+    description: ''
+  optionalParameters:
+  - name: --secondary-server
+    summary: Secondary server URL.
+    description: ''
+  - name: --ssl
+    defaultValue: Disabled
+    summary: Protect LDAP communication using SSL certificate (LDAPS). Specify "Enabled" or "Disabled".
+    description: ''
+- uid: az_vmware_private-cloud_create
+  name: az vmware private-cloud create
+  summary: Create a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud create --cluster-size
+                                   --location
+                                   --name
+                                   --network-block
+                                   --resource-group
+                                   --sku
+                                   [--accept-eula]
+                                   [--circuit-primary-subnet]
+                                   [--circuit-secondary-subnet]
+                                   [--internet]
+                                   [--nsxt-password]
+                                   [--tags]
+                                   [--vcenter-password]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-size
+    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --network-block
+    summary: A subnet at least of size /22. Make sure the CIDR format is conformed to (A.B.C.D/X) where A,B,C,D are between 0 and 255, and X is between 0 and 22.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The product SKU.
+    description: ''
+  optionalParameters:
+  - name: --accept-eula
+    summary: Accept the end-user license agreement without prompting.
+    description: ''
+  - name: --circuit-primary-subnet
+    summary: A /30 subnet for the primary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
+    description: ''
+  - name: --circuit-secondary-subnet
+    summary: A /30 subnet for the secondary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
+    description: ''
+  - name: --internet
+    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
+    description: ''
+  - name: --nsxt-password
+    summary: NSX-T Manager password.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vcenter-password
+    summary: VCenter admin password.
+    description: ''
+- uid: az_vmware_private-cloud_delete
+  name: az vmware private-cloud delete
+  summary: Delete a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud delete --name
+                                   --resource-group
+                                   [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes
+    summary: Deletes without confirmation.
+    description: ''
+- uid: az_vmware_private-cloud_deleteidentitysource
+  name: az vmware private-cloud deleteidentitysource
+  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud deleteidentitysource --alias
+                                                 --domain
+                                                 --name
+                                                 --private-cloud
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --alias
+    summary: The domain's NetBIOS name.
+    description: ''
+  - isRequired: true
+    name: --domain
+    summary: The domain's dns name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the identity source.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_list
+  name: az vmware private-cloud list
+  summary: List the private clouds.
+  description: ''
+  syntax: az vmware private-cloud list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_listadmincredentials
+  name: az vmware private-cloud listadmincredentials
+  summary: List the admin credentials for the private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud listadmincredentials --private-cloud
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_show
+  name: az vmware private-cloud show
+  summary: Show details of a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud show --name
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_update
+  name: az vmware private-cloud update
+  summary: Update a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud update --name
+                                   --resource-group
+                                   [--cluster-size]
+                                   [--internet]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cluster-size
+    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
+    description: ''
+  - name: --internet
+    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
+    description: ''
+commands:
+- az_vmware_private-cloud_addidentitysource
+- az_vmware_private-cloud_create
+- az_vmware_private-cloud_delete
+- az_vmware_private-cloud_deleteidentitysource
+- az_vmware_private-cloud_list
+- az_vmware_private-cloud_listadmincredentials
+- az_vmware_private-cloud_show
+- az_vmware_private-cloud_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage private clouds.
diff --git a/2017-03-09-profile/docs-ref-autogen/webapp.yml b/2017-03-09-profile/docs-ref-autogen/webapp.yml
new file mode 100644
index 0000000000..964d78c0c1
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webapp.yml
@@ -0,0 +1,105 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp
+name: az webapp
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage web apps.
+description: ''
+directCommands:
+- uid: az_webapp_deploy
+  name: az webapp deploy
+  summary: Deploys a provided artifact to Azure Web Apps.
+  description: ''
+  syntax: >-
+    az webapp deploy --name
+                     --resource-group
+                     [--async {false, true}]
+                     [--clean {false, true}]
+                     [--ignore-stack {false, true}]
+                     [--restart {false, true}]
+                     [--slot]
+                     [--src-path]
+                     [--src-url]
+                     [--target-path]
+                     [--timeout]
+                     [--type]
+  examples:
+  - summary: Deploy a war file asynchronously.
+    syntax: az webapp deploy --resource-group ResouceGroup --name AppName --src-path SourcePath --type war --async IsAsync
+  - summary: Deploy a static text file to wwwroot/staticfiles/test.txt
+    syntax: az webapp deploy --resource-group ResouceGroup --name AppName --src-path SourcePath --type static --target-path staticfiles/test.txt
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --async
+    parameterValueGroup: false, true
+    summary: Asynchronous deployment.
+    description: ''
+  - name: --clean
+    parameterValueGroup: false, true
+    summary: Clean or not. default is target-type specific.
+    description: ''
+  - name: --ignore-stack
+    parameterValueGroup: false, true
+    summary: Should override the default stack check.
+    description: ''
+  - name: --restart
+    parameterValueGroup: false, true
+    summary: Restart or not. default behavior is to restart.
+    description: ''
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+  - name: --src-path
+    summary: 'Path of the file to be deployed. Example: /mnt/apps/myapp.war.'
+    description: ''
+  - name: --src-url
+    summary: 'Url to download the package from. Example: http://mysite.com/files/myapp.war?key=123.'
+    description: ''
+  - name: --target-path
+    summary: Target path relative to wwwroot to which the file will be deployed to.
+    description: ''
+  - name: --timeout
+    summary: Timeout for operation in milliseconds.
+    description: ''
+  - name: --type
+    summary: Type of deployment requested.
+    description: ''
+commands:
+- az_webapp_container
+- az_webapp_container_up
+- az_webapp_deploy
+- az_webapp_remote-connection
+- az_webapp_remote-connection_create
+- az_webapp_scan
+- az_webapp_scan_list-result
+- az_webapp_scan_show-result
+- az_webapp_scan_start
+- az_webapp_scan_stop
+- az_webapp_scan_track
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage web apps.
diff --git a/2017-03-09-profile/docs-ref-autogen/webapp/container.yml b/2017-03-09-profile/docs-ref-autogen/webapp/container.yml
new file mode 100644
index 0000000000..896b73acbc
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webapp/container.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp_container
+name: az webapp container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Group of commands related to webapp container operations.
+description: ''
+directCommands:
+- uid: az_webapp_container_up
+  name: az webapp container up
+  summary: Experimental command to create and deploy a container webapp.
+  description: ''
+  syntax: >-
+    az webapp container up --name
+                           [--docker-custom-image-name]
+                           [--dryrun]
+                           [--registry-name]
+                           [--registry-rg]
+                           [--source-location]
+  examples:
+  - summary: Deploy a container using an image from DockerHub. This example uses nginx.
+    syntax: az webapp container up -n AppName -i nginx
+  - summary: Upload files from the current directory to an Azure Container Registry, then build a container image and deploy it to a web app. The Azure Container Registry must already exist.
+    syntax: az webapp container up -n AppName --registry-rg ContainerRegistryResourceGroup --registry-name ContainerRegistryName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp. You can configure the default using 'az configure --defaults web=<name>'.
+    description: ''
+  optionalParameters:
+  - name: --docker-custom-image-name -i
+    summary: The container image name and optionally the tag name (currently public DockerHub images only).
+    description: ''
+  - name: --dryrun
+    summary: Show summary of the create and deploy operation instead of executing it.
+    description: ''
+  - name: --registry-name
+    summary: The name of the Azure Container Registry.
+    description: ''
+  - name: --registry-rg
+    summary: The resource group of the Azure Container Registry.
+    description: ''
+  - name: --source-location -s
+    summary: The path to the web app source directory.
+    description: ''
+commands:
+- az_webapp_container_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Group of commands related to webapp container operations.
diff --git a/2017-03-09-profile/docs-ref-autogen/webapp/remote-connection.yml b/2017-03-09-profile/docs-ref-autogen/webapp/remote-connection.yml
new file mode 100644
index 0000000000..6e4211ab30
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webapp/remote-connection.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp_remote-connection
+name: az webapp remote-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp remote-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Create a remote connection using a tcp tunnel to your web app.
+description: ''
+directCommands:
+- uid: az_webapp_remote-connection_create
+  name: az webapp remote-connection create
+  summary: Creates a remote connection using a tcp tunnel to your web app.
+  description: ''
+  syntax: >-
+    az webapp remote-connection create --name
+                                       --resource-group
+                                       [--port]
+                                       [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --port -p
+    summary: 'Port for the remote connection. Default: Random available port.'
+    description: ''
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+commands:
+- az_webapp_remote-connection_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Create a remote connection using a tcp tunnel to your web app.
diff --git a/2017-03-09-profile/docs-ref-autogen/webapp/scan.yml b/2017-03-09-profile/docs-ref-autogen/webapp/scan.yml
new file mode 100644
index 0000000000..ead3c8b051
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webapp/scan.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp_scan
+name: az webapp scan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp scan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
+description: ''
+directCommands:
+- uid: az_webapp_scan_list-result
+  name: az webapp scan list-result
+  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
+  description: ''
+  syntax: >-
+    az webapp scan list-result --name
+                               --resource-group
+                               [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+- uid: az_webapp_scan_show-result
+  name: az webapp scan show-result
+  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
+  description: ''
+  syntax: >-
+    az webapp scan show-result --name
+                               --resource-group
+                               --scan-id
+                               [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: Unique scan id.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+- uid: az_webapp_scan_start
+  name: az webapp scan start
+  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
+  description: ''
+  syntax: >-
+    az webapp scan start --name
+                         --resource-group
+                         [--slot]
+                         [--timeout]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+  - name: --timeout
+    summary: Timeout for operation in milliseconds.
+    description: ''
+- uid: az_webapp_scan_stop
+  name: az webapp scan stop
+  summary: Stops the current executing scan. Does nothing if no scan is executing.
+  description: ''
+  syntax: >-
+    az webapp scan stop --name
+                        --resource-group
+                        [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+- uid: az_webapp_scan_track
+  name: az webapp scan track
+  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
+  description: ''
+  syntax: >-
+    az webapp scan track --name
+                         --resource-group
+                         --scan-id
+                         [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: Unique scan id.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+commands:
+- az_webapp_scan_list-result
+- az_webapp_scan_show-result
+- az_webapp_scan_start
+- az_webapp_scan_stop
+- az_webapp_scan_track
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub.yml
new file mode 100644
index 0000000000..2056bfb9b0
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub.yml
@@ -0,0 +1,213 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub
+name: az webpubsub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub.
+description: ''
+directCommands:
+- uid: az_webpubsub_create
+  name: az webpubsub create
+  summary: Create a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub create --name
+                        --resource-group
+                        --sku {Free_F1, Standard_S1}
+                        [--location]
+                        [--tags]
+                        [--unit-count]
+  examples:
+  - summary: Create a WebPubSub Service with Standard SKU and unit 2.
+    syntax: az webpubsub create -n MyWebPubSub -g MyResourceGroup --sku Standard_S1 --unit-count 2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: Free_F1, Standard_S1
+    summary: The sku name of the signalr service.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --unit-count
+    defaultValue: "1"
+    summary: The number of signalr service unit count.
+    description: ''
+- uid: az_webpubsub_delete
+  name: az webpubsub delete
+  summary: Delete a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub delete --name
+                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_list
+  name: az webpubsub list
+  summary: List Webpubsub.
+  description: ''
+  syntax: az webpubsub list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_restart
+  name: az webpubsub restart
+  summary: Restart a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub restart --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_show
+  name: az webpubsub show
+  summary: Show details of a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub show --name
+                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_update
+  name: az webpubsub update
+  summary: Update a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub update --name
+                        --resource-group
+                        [--add]
+                        [--force-string]
+                        [--remove]
+                        [--set]
+                        [--sku {Free_F1, Standard_S1}]
+                        [--tags]
+                        [--unit-count]
+  examples:
+  - summary: Update a WebPubSub Service to unit 10.
+    syntax: az webpubsub update -n MyWebPubSub -g MyResourceGroup --sku Standard_S1 --unit-count 10
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Free_F1, Standard_S1
+    summary: The sku name of the signalr service.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --unit-count
+    summary: The number of signalr service unit count.
+    description: ''
+commands:
+- az_webpubsub_client
+- az_webpubsub_client_start
+- az_webpubsub_create
+- az_webpubsub_delete
+- az_webpubsub_event-handler
+- az_webpubsub_event-handler_clear
+- az_webpubsub_event-handler_hub
+- az_webpubsub_event-handler_hub_remove
+- az_webpubsub_event-handler_hub_update
+- az_webpubsub_event-handler_show
+- az_webpubsub_event-handler_update
+- az_webpubsub_key
+- az_webpubsub_key_regenerate
+- az_webpubsub_key_show
+- az_webpubsub_list
+- az_webpubsub_network-rule
+- az_webpubsub_network-rule_show
+- az_webpubsub_network-rule_update
+- az_webpubsub_restart
+- az_webpubsub_service
+- az_webpubsub_service_broadcast
+- az_webpubsub_service_connection
+- az_webpubsub_service_connection_close
+- az_webpubsub_service_connection_exist
+- az_webpubsub_service_connection_send
+- az_webpubsub_service_group
+- az_webpubsub_service_group_add-connection
+- az_webpubsub_service_group_add-user
+- az_webpubsub_service_group_remove-connection
+- az_webpubsub_service_group_remove-user
+- az_webpubsub_service_group_send
+- az_webpubsub_service_permission
+- az_webpubsub_service_permission_check
+- az_webpubsub_service_permission_grant
+- az_webpubsub_service_permission_revoke
+- az_webpubsub_service_user
+- az_webpubsub_service_user_exist
+- az_webpubsub_service_user_send
+- az_webpubsub_show
+- az_webpubsub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/client.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/client.yml
new file mode 100644
index 0000000000..1349ca2b9c
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/client.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_client
+name: az webpubsub client
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub client** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage client connections.
+description: ''
+directCommands:
+- uid: az_webpubsub_client_start
+  name: az webpubsub client start
+  summary: Start a interactive client connection.
+  description: ''
+  syntax: >-
+    az webpubsub client start --hub-name
+                              --name
+                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub which client connects to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_client_start
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage client connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/event-handler.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/event-handler.yml
new file mode 100644
index 0000000000..199451d74f
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/event-handler.yml
@@ -0,0 +1,90 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_event-handler
+name: az webpubsub event-handler
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub event-handler** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub event handler settings.
+description: ''
+directCommands:
+- uid: az_webpubsub_event-handler_clear
+  name: az webpubsub event-handler clear
+  summary: Clear event handler settings for WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler clear --name
+                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_event-handler_show
+  name: az webpubsub event-handler show
+  summary: Show event handler settings for WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler show --name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_event-handler_update
+  name: az webpubsub event-handler update
+  summary: Update event handler settings for WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler update --items
+                                      --name
+                                      --resource-group
+  examples:
+  - summary: Update event handler to handler connect event.
+    syntax: "az webpubsub event-handler update -n MyWebPubSub -g MyResourceGroup --items '{\"myHub\": [{\"urlTemplate\": \"http://host.com\", \"systemEventPattern\": \"connect\"}]}'"
+  requiredParameters:
+  - isRequired: true
+    name: --items
+    summary: A JSON-formatted string containing event handler items.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_event-handler_clear
+- az_webpubsub_event-handler_hub
+- az_webpubsub_event-handler_hub_remove
+- az_webpubsub_event-handler_hub_update
+- az_webpubsub_event-handler_show
+- az_webpubsub_event-handler_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub event handler settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/event-handler/hub.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/event-handler/hub.yml
new file mode 100644
index 0000000000..b3b7c913fd
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/event-handler/hub.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_event-handler_hub
+name: az webpubsub event-handler hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub event-handler hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub hub settings.
+description: ''
+directCommands:
+- uid: az_webpubsub_event-handler_hub_remove
+  name: az webpubsub event-handler hub remove
+  summary: Remove a hub's event handler settings.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler hub remove --hub-name
+                                          --name
+                                          --resource-group
+  examples:
+  - summary: Remove all event handler settings in a hub
+    syntax: az webpubsub event-handler hub remove -n MyWebPubSub -g MyResourceGroup --hub-name MyHub
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub whose event handler settings need to delete.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_event-handler_hub_update
+  name: az webpubsub event-handler hub update
+  summary: Update a hub's event handler settings.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler hub update --hub-name
+                                          --name
+                                          --resource-group
+                                          --template
+  examples:
+  - summary: Update two event handler settings in a hub
+    syntax: az webpubsub event-handler hub update -n MyWebPubSub -g MyResourceGroup --hub-name MyHub --template url-template='http://host.com user-event-pattern="MyEvent" --template url-template="http://host2.com" system-event-pattern="connect"'
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub whose event handler settings need to delete.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: Template item for event handler settings. Use key=value pattern to set properties. Supported keys are "url-template", "user-event-pattern", "system-event-pattern".
+    description: ''
+commands:
+- az_webpubsub_event-handler_hub_remove
+- az_webpubsub_event-handler_hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub hub settings.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/key.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/key.yml
new file mode 100644
index 0000000000..fee44b95f5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/key.yml
@@ -0,0 +1,74 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_key
+name: az webpubsub key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub keys.
+description: ''
+directCommands:
+- uid: az_webpubsub_key_regenerate
+  name: az webpubsub key regenerate
+  summary: Regenerate keys for a WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub key regenerate --key-type {primary, secondary}
+                                --name
+                                --resource-group
+  examples:
+  - summary: Regenerate the primary key for a WebPubSub Service.
+    syntax: az webpubsub key regenerate -n MyWebPubSub -g MyResourceGroup --key-type primary --query primaryKey -o tsv
+  requiredParameters:
+  - isRequired: true
+    name: --key-type
+    parameterValueGroup: primary, secondary
+    summary: The name of access key to regenerate.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_key_show
+  name: az webpubsub key show
+  summary: Show connetion strings and keys for a WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub key show --name
+                          --resource-group
+  examples:
+  - summary: Get the primary key for a WebPubSub Service.
+    syntax: az webpubsub key show -n MyWebPubSub -g MyResourceGroup --query primaryKey -o tsv
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_key_regenerate
+- az_webpubsub_key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub keys.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/network-rule.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/network-rule.yml
new file mode 100644
index 0000000000..26b5e340b7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/network-rule.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_network-rule
+name: az webpubsub network-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub network-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub network rules.
+description: ''
+directCommands:
+- uid: az_webpubsub_network-rule_show
+  name: az webpubsub network-rule show
+  summary: Get the Network access control of WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub network-rule show --name
+                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_network-rule_update
+  name: az webpubsub network-rule update
+  summary: Update the Network access control of WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub network-rule update --name
+                                     --resource-group
+                                     [--allow {ClientConnection, RESTAPI, ServerConnection, Trace}]
+                                     [--connection-name]
+                                     [--deny {ClientConnection, RESTAPI, ServerConnection, Trace}]
+                                     [--public-network {false, true}]
+  examples:
+  - summary: Set allowing RESTAPI only for public network.
+    syntax: az webpubsub network-rule update --public-network -n MyWebPubSub -g MyResourceGroup --allow RESTAPI
+  - summary: Set allowing client connection and server connection for a private endpoint connection
+    syntax: az webpubsub network-rule update --connection-name MyPrivateEndpointConnection -n MyWebPubSub -g MyResourceGroup --allow ClientConnection ServerConnection
+  - summary: Set denying client connection for both public network and private endpoint connections
+    syntax: az webpubsub network-rule update --public-network --connection-name MyPrivateEndpointConnection1 MyPrivateEndpointConnection2 -n MyWebPubSub -g MyResourceGroup --deny ClientConnection
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allow
+    parameterValueGroup: ClientConnection, RESTAPI, ServerConnection, Trace
+    summary: The allowed virtual network rule. Space-separeted list of scope to assign.
+    description: ''
+  - name: --connection-name
+    summary: Space-separeted list of private endpoint connection name.
+    description: ''
+  - name: --deny
+    parameterValueGroup: ClientConnection, RESTAPI, ServerConnection, Trace
+    summary: The denied virtual network rule. Space-separeted list of scope to assign.
+    description: ''
+  - name: --public-network
+    parameterValueGroup: false, true
+    summary: Set rules for public network.
+    description: ''
+commands:
+- az_webpubsub_network-rule_show
+- az_webpubsub_network-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub network rules.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/service.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/service.yml
new file mode 100644
index 0000000000..3a3b17d3b5
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/service.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service
+name: az webpubsub service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_broadcast
+  name: az webpubsub service broadcast
+  summary: Broadcast messages to hub.
+  description: ''
+  syntax: >-
+    az webpubsub service broadcast --hub-name
+                                   --name
+                                   --payload
+                                   --resource-group
+  examples:
+  - summary: Send a message to hub
+    syntax: az webpubsub service broadcast -n MyWebPubSub -g MyResourceGroup --hub-name MyHub --payload MyPayload
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_broadcast
+- az_webpubsub_service_connection
+- az_webpubsub_service_connection_close
+- az_webpubsub_service_connection_exist
+- az_webpubsub_service_connection_send
+- az_webpubsub_service_group
+- az_webpubsub_service_group_add-connection
+- az_webpubsub_service_group_add-user
+- az_webpubsub_service_group_remove-connection
+- az_webpubsub_service_group_remove-user
+- az_webpubsub_service_group_send
+- az_webpubsub_service_permission
+- az_webpubsub_service_permission_check
+- az_webpubsub_service_permission_grant
+- az_webpubsub_service_permission_revoke
+- az_webpubsub_service_user
+- az_webpubsub_service_user_exist
+- az_webpubsub_service_user_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/service/connection.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/connection.yml
new file mode 100644
index 0000000000..11662a38b9
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/connection.yml
@@ -0,0 +1,114 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_connection
+name: az webpubsub service connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service connections.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_connection_close
+  name: az webpubsub service connection close
+  summary: Close a specific client connection.
+  description: ''
+  syntax: >-
+    az webpubsub service connection close --connection-id
+                                          --hub-name
+                                          --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_connection_exist
+  name: az webpubsub service connection exist
+  summary: Check whether client connection exists.
+  description: ''
+  syntax: >-
+    az webpubsub service connection exist --connection-id
+                                          --hub-name
+                                          --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_connection_send
+  name: az webpubsub service connection send
+  summary: Send a message to connection.
+  description: ''
+  syntax: >-
+    az webpubsub service connection send --connection-id
+                                         --hub-name
+                                         --name
+                                         --payload
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_connection_close
+- az_webpubsub_service_connection_exist
+- az_webpubsub_service_connection_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service connections.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/service/group.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/group.yml
new file mode 100644
index 0000000000..929676eb29
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/group.yml
@@ -0,0 +1,188 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_group
+name: az webpubsub service group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service groups.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_group_add-connection
+  name: az webpubsub service group add-connection
+  summary: Add a connection to group.
+  description: ''
+  syntax: >-
+    az webpubsub service group add-connection --connection-id
+                                              --group-name
+                                              --hub-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_group_add-user
+  name: az webpubsub service group add-user
+  summary: Add a user to group.
+  description: ''
+  syntax: >-
+    az webpubsub service group add-user --group-name
+                                        --hub-name
+                                        --name
+                                        --resource-group
+                                        --user-id
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+- uid: az_webpubsub_service_group_remove-connection
+  name: az webpubsub service group remove-connection
+  summary: Remove a connection from group.
+  description: ''
+  syntax: >-
+    az webpubsub service group remove-connection --connection-id
+                                                 --group-name
+                                                 --hub-name
+                                                 --name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_group_remove-user
+  name: az webpubsub service group remove-user
+  summary: Remove a user from group.
+  description: ''
+  syntax: >-
+    az webpubsub service group remove-user --hub-name
+                                           --name
+                                           --resource-group
+                                           --user-id
+                                           [--group-name]
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+  optionalParameters:
+  - name: --group-name
+    summary: The group name.
+    description: ''
+- uid: az_webpubsub_service_group_send
+  name: az webpubsub service group send
+  summary: Send a message to group.
+  description: ''
+  syntax: >-
+    az webpubsub service group send --group-name
+                                    --hub-name
+                                    --name
+                                    --payload
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_group_add-connection
+- az_webpubsub_service_group_add-user
+- az_webpubsub_service_group_remove-connection
+- az_webpubsub_service_group_remove-user
+- az_webpubsub_service_group_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service groups.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/service/permission.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/permission.yml
new file mode 100644
index 0000000000..3f86a71bd7
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/permission.yml
@@ -0,0 +1,142 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_permission
+name: az webpubsub service permission
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service permission** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service permissions.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_permission_check
+  name: az webpubsub service permission check
+  summary: Check if a connection has permission to the specified group.
+  description: ''
+  syntax: >-
+    az webpubsub service permission check --connection-id
+                                          --group-name
+                                          --hub-name
+                                          --name
+                                          --permission {joinLeaveGroup, sendToGroup}
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --permission
+    parameterValueGroup: joinLeaveGroup, sendToGroup
+    summary: The permission.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_permission_grant
+  name: az webpubsub service permission grant
+  summary: Grant a group permission to the connection.
+  description: ''
+  syntax: >-
+    az webpubsub service permission grant --connection-id
+                                          --group-name
+                                          --hub-name
+                                          --name
+                                          --permission {joinLeaveGroup, sendToGroup}
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --permission
+    parameterValueGroup: joinLeaveGroup, sendToGroup
+    summary: The permission.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_permission_revoke
+  name: az webpubsub service permission revoke
+  summary: Revoke a group permission from the connection.
+  description: ''
+  syntax: >-
+    az webpubsub service permission revoke --connection-id
+                                           --group-name
+                                           --hub-name
+                                           --name
+                                           --permission {joinLeaveGroup, sendToGroup}
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --permission
+    parameterValueGroup: joinLeaveGroup, sendToGroup
+    summary: The permission.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_permission_check
+- az_webpubsub_service_permission_grant
+- az_webpubsub_service_permission_revoke
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service permissions.
diff --git a/2017-03-09-profile/docs-ref-autogen/webpubsub/service/user.yml b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/user.yml
new file mode 100644
index 0000000000..303aa424d2
--- /dev/null
+++ b/2017-03-09-profile/docs-ref-autogen/webpubsub/service/user.yml
@@ -0,0 +1,87 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_user
+name: az webpubsub service user
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service user** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service users.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_user_exist
+  name: az webpubsub service user exist
+  summary: Check if there are any client connections connected for the given user.
+  description: ''
+  syntax: >-
+    az webpubsub service user exist --hub-name
+                                    --name
+                                    --resource-group
+                                    --user-id
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+- uid: az_webpubsub_service_user_send
+  name: az webpubsub service user send
+  summary: Send a message to user.
+  description: ''
+  syntax: >-
+    az webpubsub service user send --hub-name
+                                   --name
+                                   --payload
+                                   --resource-group
+                                   --user-id
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+commands:
+- az_webpubsub_service_user_exist
+- az_webpubsub_service_user_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service users.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/TOC.yml b/2018-03-01-hybrid/docs-ref-autogen/TOC.yml
index 0e7f38686c..5cb2e0ac18 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/TOC.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/TOC.yml
@@ -1,14415 +1,4602 @@
 - name: Reference
+  displayName: Reference
   items:
-  - name: Overview
+  - name: List A - Z
     uid: az
-  - name: configure
-    uid: az_configure
-    displayName: az configure
-  - name: feedback
-    uid: az_feedback
-    displayName: az feedback
-  - name: find
-    uid: az_find
-    displayName: az find
-  - name: interactive
-    uid: az_interactive
-    displayName: az interactive
-  - name: login
-    uid: az_login
-    displayName: az login
-  - name: logout
-    uid: az_logout
-    displayName: az logout
-  - name: rest
-    uid: az_rest
-    displayName: az rest
-  - name: self-test
-    uid: az_self_test
-    displayName: az self-test
-  - name: version
-    uid: az_version
-    displayName: az version
+    displayName: List A - Z
+  - name: API Management
+    uid: sp-API_Management
+    displayName: API Management
+    items: []
   - name: Azure Active Directory
-    displayName: az ad
     items:
-    - name: Overview
-      uid: az_ad
-      displayName: az ad
-    - name: Applications
-      displayName: az ad app
-      items:
-      - name: Overview
-        uid: az_ad_app
-        displayName: az ad app
-      - name: create
-        uid: az_ad_app_create
-        displayName: az ad app create
-      - name: delete
-        uid: az_ad_app_delete
-        displayName: az ad app delete
-      - name: list
-        uid: az_ad_app_list
-        displayName: az ad app list
-      - name: show
-        uid: az_ad_app_show
-        displayName: az ad app show
-      - name: update
-        uid: az_ad_app_update
-        displayName: az ad app update
-      - name: credential
-        displayName: az ad app credential
+    - name: Summary
+      uid: sp-Azure_Active_Directory
+      displayName: Azure Active Directory
+    - name: ad - Azure Active Directory
+      items:
+      - name: Summary
+        uid: az_ad
+        displayName: az ad
+      - name: app
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_app
+          displayName: az ad app
+        - name: credential
           uid: az_ad_app_credential
           displayName: az ad app credential
-        - name: delete
-          uid: az_ad_app_credential_delete
-          displayName: az ad app credential delete
-        - name: list
-          uid: az_ad_app_credential_list
-          displayName: az ad app credential list
-        - name: reset
-          uid: az_ad_app_credential_reset
-          displayName: az ad app credential reset
-      - name: owner
-        displayName: az ad app owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_app_owner
           displayName: az ad app owner
-        - name: add
-          uid: az_ad_app_owner_add
-          displayName: az ad app owner add
-        - name: list
-          uid: az_ad_app_owner_list
-          displayName: az ad app owner list
-        - name: remove
-          uid: az_ad_app_owner_remove
-          displayName: az ad app owner remove
-      - name: permission
-        displayName: az ad app permission
-        items:
-        - name: Overview
+          items: []
+        - name: permission
           uid: az_ad_app_permission
           displayName: az ad app permission
-        - name: add
-          uid: az_ad_app_permission_add
-          displayName: az ad app permission add
-        - name: admin-consent
-          uid: az_ad_app_permission_admin_consent
-          displayName: az ad app permission admin-consent
-        - name: delete
-          uid: az_ad_app_permission_delete
-          displayName: az ad app permission delete
-        - name: grant
-          uid: az_ad_app_permission_grant
-          displayName: az ad app permission grant
-        - name: list
-          uid: az_ad_app_permission_list
-          displayName: az ad app permission list
-        - name: list-grants
-          uid: az_ad_app_permission_list_grants
-          displayName: az ad app permission list-grants
-    - name: Groups
-      displayName: az ad group
-      items:
-      - name: Overview
-        uid: az_ad_group
-        displayName: az ad group
-      - name: create
-        uid: az_ad_group_create
-        displayName: az ad group create
-      - name: delete
-        uid: az_ad_group_delete
-        displayName: az ad group delete
-      - name: get-member-groups
-        uid: az_ad_group_get_member_groups
-        displayName: az ad group get-member-groups
-      - name: list
-        uid: az_ad_group_list
-        displayName: az ad group list
-      - name: show
-        uid: az_ad_group_show
-        displayName: az ad group show
-      - name: member
-        displayName: az ad group member
+          items: []
+      - name: ds
+        uid: az_ad_ds
+        displayName: az ad ds
+        items: []
+      - name: group
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_group
+          displayName: az ad group
+        - name: member
           uid: az_ad_group_member
           displayName: az ad group member
-        - name: add
-          uid: az_ad_group_member_add
-          displayName: az ad group member add
-        - name: check
-          uid: az_ad_group_member_check
-          displayName: az ad group member check
-        - name: list
-          uid: az_ad_group_member_list
-          displayName: az ad group member list
-        - name: remove
-          uid: az_ad_group_member_remove
-          displayName: az ad group member remove
-      - name: owner
-        displayName: az ad group owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_group_owner
           displayName: az ad group owner
-        - name: add
-          uid: az_ad_group_owner_add
-          displayName: az ad group owner add
-        - name: list
-          uid: az_ad_group_owner_list
-          displayName: az ad group owner list
-        - name: remove
-          uid: az_ad_group_owner_remove
-          displayName: az ad group owner remove
-    - name: Service principals
-      displayName: az ad sp
-      items:
-      - name: Overview
-        uid: az_ad_sp
-        displayName: az ad sp
-      - name: create
-        uid: az_ad_sp_create
-        displayName: az ad sp create
-      - name: create-for-rbac
-        uid: az_ad_sp_create_for_rbac
-        displayName: az ad sp create-for-rbac
-      - name: delete
-        uid: az_ad_sp_delete
-        displayName: az ad sp delete
-      - name: list
-        uid: az_ad_sp_list
-        displayName: az ad sp list
-      - name: show
-        uid: az_ad_sp_show
-        displayName: az ad sp show
-      - name: update
-        uid: az_ad_sp_update
-        displayName: az ad sp update
-      - name: credential
-        displayName: az ad sp credential
+          items: []
+      - name: signed-in-user
+        uid: az_ad_signed-in-user
+        displayName: az ad signed-in-user
+        items: []
+      - name: ad sp - service principals
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_sp
+          displayName: az ad sp
+        - name: credential
           uid: az_ad_sp_credential
           displayName: az ad sp credential
-        - name: delete
-          uid: az_ad_sp_credential_delete
-          displayName: az ad sp credential delete
-        - name: list
-          uid: az_ad_sp_credential_list
-          displayName: az ad sp credential list
-        - name: reset
-          uid: az_ad_sp_credential_reset
-          displayName: az ad sp credential reset
-      - name: owner
-        displayName: az ad sp owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_sp_owner
           displayName: az ad sp owner
-        - name: list
-          uid: az_ad_sp_owner_list
-          displayName: az ad sp owner list
-    - name: Users
-      displayName: az ad user
-      items:
-      - name: Overview
+          items: []
+      - name: user
         uid: az_ad_user
         displayName: az ad user
-      - name: create
-        uid: az_ad_user_create
-        displayName: az ad user create
-      - name: delete
-        uid: az_ad_user_delete
-        displayName: az ad user delete
-      - name: get-member-groups
-        uid: az_ad_user_get_member_groups
-        displayName: az ad user get-member-groups
-      - name: list
-        uid: az_ad_user_list
-        displayName: az ad user list
-      - name: show
-        uid: az_ad_user_show
-        displayName: az ad user show
-      - name: update
-        uid: az_ad_user_update
-        displayName: az ad user update
-    - name: signed-in-user
-      displayName: az ad signed-in-user
+        items: []
+  - name: Azure Advisor
+    uid: sp-Azure_Advisor
+    displayName: Azure Advisor
+    items: []
+  - name: Azure API for FHIR
+    items:
+    - name: Summary
+      uid: sp-Azure_API_for_FHIR
+      displayName: Azure API for FHIR
+    - name: healthcareapis
       items:
-      - name: Overview
-        uid: az_ad_signed_in_user
-        displayName: az ad signed-in-user
-      - name: list-owned-objects
-        uid: az_ad_signed_in_user_list_owned_objects
-        displayName: az ad signed-in-user list-owned-objects
-      - name: show
-        uid: az_ad_signed_in_user_show
-        displayName: az ad signed-in-user show
-  - name: Cloud management
-    displayName: az cloud
+      - name: Summary
+        uid: az_healthcareapis
+        displayName: az healthcareapis
+      - name: acr
+        uid: az_healthcareapis_acr
+        displayName: az healthcareapis acr
+        items: []
+      - name: operation-result
+        uid: az_healthcareapis_operation-result
+        displayName: az healthcareapis operation-result
+        items: []
+      - name: private-endpoint-connection
+        uid: az_healthcareapis_private-endpoint-connection
+        displayName: az healthcareapis private-endpoint-connection
+        items: []
+      - name: private-link-resource
+        uid: az_healthcareapis_private-link-resource
+        displayName: az healthcareapis private-link-resource
+        items: []
+      - name: service
+        uid: az_healthcareapis_service
+        displayName: az healthcareapis service
+        items: []
+  - name: Azure App Configuration
     items:
-    - name: Overview
-      uid: az_cloud
-      displayName: az cloud
-    - name: list
-      uid: az_cloud_list
-      displayName: az cloud list
-    - name: list-profiles
-      uid: az_cloud_list_profiles
-      displayName: az cloud list-profiles
-    - name: register
-      uid: az_cloud_register
-      displayName: az cloud register
-    - name: set
-      uid: az_cloud_set
-      displayName: az cloud set
-    - name: show
-      uid: az_cloud_show
-      displayName: az cloud show
-    - name: unregister
-      uid: az_cloud_unregister
-      displayName: az cloud unregister
-    - name: update
-      uid: az_cloud_update
-      displayName: az cloud update
-  - name: HDInsight
-    displayName: az hdinsight
+    - name: Summary
+      uid: sp-Azure_App_Configuration
+      displayName: Azure App Configuration
+    - name: appconfig
+      items:
+      - name: Summary
+        uid: az_appconfig
+        displayName: az appconfig
+      - name: credential
+        uid: az_appconfig_credential
+        displayName: az appconfig credential
+        items: []
+      - name: feature
+        items:
+        - name: Summary
+          uid: az_appconfig_feature
+          displayName: az appconfig feature
+        - name: filter
+          uid: az_appconfig_feature_filter
+          displayName: az appconfig feature filter
+          items: []
+      - name: identity
+        uid: az_appconfig_identity
+        displayName: az appconfig identity
+        items: []
+      - name: kv
+        uid: az_appconfig_kv
+        displayName: az appconfig kv
+        items: []
+      - name: revision
+        uid: az_appconfig_revision
+        displayName: az appconfig revision
+        items: []
+  - name: Azure App Service
+    uid: sp-Azure_App_Service
+    displayName: Azure App Service
+    items: []
+  - name: Azure Application Insights
+    uid: sp-Azure_Application_Insights
+    displayName: Azure Application Insights
+    items: []
+  - name: Azure Arc
     items:
-    - name: Overview
-      uid: az_hdinsight
-      displayName: az hdinsight
-    - name: create
-      uid: az_hdinsight_create
-      displayName: az hdinsight create
-    - name: delete
-      uid: az_hdinsight_delete
-      displayName: az hdinsight delete
-    - name: list
-      uid: az_hdinsight_list
-      displayName: az hdinsight list
-    - name: list-usage
-      uid: az_hdinsight_list_usage
-      displayName: az hdinsight list-usage
-    - name: resize
-      uid: az_hdinsight_resize
-      displayName: az hdinsight resize
-    - name: rotate-disk-encryption-key
-      uid: az_hdinsight_rotate_disk_encryption_key
-      displayName: az hdinsight rotate-disk-encryption-key
-    - name: show
-      uid: az_hdinsight_show
-      displayName: az hdinsight show
-    - name: update
-      uid: az_hdinsight_update
-      displayName: az hdinsight update
-    - name: wait
-      uid: az_hdinsight_wait
-      displayName: az hdinsight wait
-    - name: application
-      displayName: az hdinsight application
+    - name: Summary
+      uid: sp-Azure_Arc
+      displayName: Azure Arc
+    - name: connectedmachine
       items:
-      - name: Overview
-        uid: az_hdinsight_application
-        displayName: az hdinsight application
-      - name: create
-        uid: az_hdinsight_application_create
-        displayName: az hdinsight application create
-      - name: delete
-        uid: az_hdinsight_application_delete
-        displayName: az hdinsight application delete
-      - name: list
-        uid: az_hdinsight_application_list
-        displayName: az hdinsight application list
-      - name: show
-        uid: az_hdinsight_application_show
-        displayName: az hdinsight application show
-      - name: wait
-        uid: az_hdinsight_application_wait
-        displayName: az hdinsight application wait
-    - name: monitor
-      displayName: az hdinsight monitor
+      - name: Summary
+        uid: az_connectedmachine
+        displayName: az connectedmachine
+      - name: extension
+        uid: az_connectedmachine_extension
+        displayName: az connectedmachine extension
+        items: []
+  - name: Azure Arc for VMware PrivateCloud
+    uid: sp-Azure_Arc_for_VMware_PrivateCloud
+    displayName: Azure Arc for VMware PrivateCloud
+    items: []
+  - name: Azure Artifacts
+    items:
+    - name: Summary
+      uid: sp-Azure_Artifacts
+      displayName: Azure Artifacts
+    - name: artifacts
       items:
-      - name: Overview
-        uid: az_hdinsight_monitor
-        displayName: az hdinsight monitor
-      - name: disable
-        uid: az_hdinsight_monitor_disable
-        displayName: az hdinsight monitor disable
-      - name: enable
-        uid: az_hdinsight_monitor_enable
-        displayName: az hdinsight monitor enable
-      - name: show
-        uid: az_hdinsight_monitor_show
-        displayName: az hdinsight monitor show
-    - name: script-action
-      displayName: az hdinsight script-action
+      - name: Summary
+        uid: az_artifacts
+        displayName: az artifacts
+      - name: universal
+        uid: az_artifacts_universal
+        displayName: az artifacts universal
+        items: []
+  - name: Azure Attestation
+    items:
+    - name: Summary
+      uid: sp-Azure_Attestation
+      displayName: Azure Attestation
+    - name: attestation
+      items:
+      - name: Summary
+        uid: az_attestation
+        displayName: az attestation
+      - name: policy
+        uid: az_attestation_policy
+        displayName: az attestation policy
+        items: []
+      - name: signer
+        uid: az_attestation_signer
+        displayName: az attestation signer
+        items: []
+  - name: Azure Automation
+    items:
+    - name: Summary
+      uid: sp-Azure_Automation
+      displayName: Azure Automation
+    - name: automation
+      items:
+      - name: Summary
+        uid: az_automation
+        displayName: az automation
+      - name: account
+        uid: az_automation_account
+        displayName: az automation account
+        items: []
+      - name: job
+        uid: az_automation_job
+        displayName: az automation job
+        items: []
+      - name: runbook
+        uid: az_automation_runbook
+        displayName: az automation runbook
+        items: []
+  - name: Azure Backup
+    uid: sp-Azure_Backup
+    displayName: Azure Backup
+    items: []
+  - name: Azure Batch
+    items:
+    - name: Summary
+      uid: sp-Azure_Batch
+      displayName: Azure Batch
+    - name: batch
       items:
-      - name: Overview
-        uid: az_hdinsight_script_action
-        displayName: az hdinsight script-action
-      - name: delete
-        uid: az_hdinsight_script_action_delete
-        displayName: az hdinsight script-action delete
-      - name: execute
-        uid: az_hdinsight_script_action_execute
-        displayName: az hdinsight script-action execute
-      - name: list
-        uid: az_hdinsight_script_action_list
-        displayName: az hdinsight script-action list
-      - name: list-execution-history
-        uid: az_hdinsight_script_action_list_execution_history
-        displayName: az hdinsight script-action list-execution-history
-      - name: promote
-        uid: az_hdinsight_script_action_promote
-        displayName: az hdinsight script-action promote
-      - name: show-execution-details
-        uid: az_hdinsight_script_action_show_execution_details
-        displayName: az hdinsight script-action show-execution-details
-  - name: Key Vault
-    displayName: az keyvault
+      - name: Summary
+        uid: az_batch
+        displayName: az batch
+      - name: file
+        uid: az_batch_file
+        displayName: az batch file
+        items: []
+      - name: job
+        uid: az_batch_job
+        displayName: az batch job
+        items: []
+      - name: pool
+        uid: az_batch_pool
+        displayName: az batch pool
+        items: []
+  - name: Azure Blockchain
     items:
-    - name: Overview
-      uid: az_keyvault
-      displayName: az keyvault
-    - name: create
-      uid: az_keyvault_create
-      displayName: az keyvault create
-    - name: delete
-      uid: az_keyvault_delete
-      displayName: az keyvault delete
-    - name: delete-policy
-      uid: az_keyvault_delete_policy
-      displayName: az keyvault delete-policy
-    - name: list
-      uid: az_keyvault_list
-      displayName: az keyvault list
-    - name: list-deleted
-      uid: az_keyvault_list_deleted
-      displayName: az keyvault list-deleted
-    - name: purge
-      uid: az_keyvault_purge
-      displayName: az keyvault purge
-    - name: recover
-      uid: az_keyvault_recover
-      displayName: az keyvault recover
-    - name: set-policy
-      uid: az_keyvault_set_policy
-      displayName: az keyvault set-policy
-    - name: show
-      uid: az_keyvault_show
-      displayName: az keyvault show
-    - name: update
-      uid: az_keyvault_update
-      displayName: az keyvault update
-    - name: Certificates
-      displayName: az keyvault certificate
+    - name: Summary
+      uid: sp-Azure_Blockchain
+      displayName: Azure Blockchain
+    - name: blockchain
       items:
-      - name: Overview
-        uid: az_keyvault_certificate
-        displayName: az keyvault certificate
-      - name: create
-        uid: az_keyvault_certificate_create
-        displayName: az keyvault certificate create
-      - name: delete
-        uid: az_keyvault_certificate_delete
-        displayName: az keyvault certificate delete
-      - name: download
-        uid: az_keyvault_certificate_download
-        displayName: az keyvault certificate download
-      - name: get-default-policy
-        uid: az_keyvault_certificate_get_default_policy
-        displayName: az keyvault certificate get-default-policy
-      - name: import
-        uid: az_keyvault_certificate_import
-        displayName: az keyvault certificate import
-      - name: list
-        uid: az_keyvault_certificate_list
-        displayName: az keyvault certificate list
-      - name: list-deleted
-        uid: az_keyvault_certificate_list_deleted
-        displayName: az keyvault certificate list-deleted
-      - name: list-versions
-        uid: az_keyvault_certificate_list_versions
-        displayName: az keyvault certificate list-versions
-      - name: purge
-        uid: az_keyvault_certificate_purge
-        displayName: az keyvault certificate purge
-      - name: recover
-        uid: az_keyvault_certificate_recover
-        displayName: az keyvault certificate recover
-      - name: set-attributes
-        uid: az_keyvault_certificate_set_attributes
-        displayName: az keyvault certificate set-attributes
-      - name: show
-        uid: az_keyvault_certificate_show
-        displayName: az keyvault certificate show
-      - name: show-deleted
-        uid: az_keyvault_certificate_show_deleted
-        displayName: az keyvault certificate show-deleted
-      - name: Contacts
-        displayName: az keyvault certificate contact
+      - name: Summary
+        uid: az_blockchain
+        displayName: az blockchain
+      - name: consortium
+        uid: az_blockchain_consortium
+        displayName: az blockchain consortium
+        items: []
+      - name: member
+        uid: az_blockchain_member
+        displayName: az blockchain member
+        items: []
+      - name: transaction-node
+        uid: az_blockchain_transaction-node
+        displayName: az blockchain transaction-node
+        items: []
+  - name: Azure Blueprint
+    items:
+    - name: Summary
+      uid: sp-Azure_Blueprint
+      displayName: Azure Blueprint
+    - name: blueprint
+      items:
+      - name: Summary
+        uid: az_blueprint
+        displayName: az blueprint
+      - name: artifact
         items:
-        - name: Overview
-          uid: az_keyvault_certificate_contact
-          displayName: az keyvault certificate contact
-        - name: add
-          uid: az_keyvault_certificate_contact_add
-          displayName: az keyvault certificate contact add
-        - name: delete
-          uid: az_keyvault_certificate_contact_delete
-          displayName: az keyvault certificate contact delete
-        - name: list
-          uid: az_keyvault_certificate_contact_list
-          displayName: az keyvault certificate contact list
-      - name: Issuers
-        displayName: az keyvault certificate issuer
+        - name: Summary
+          uid: az_blueprint_artifact
+          displayName: az blueprint artifact
+        - name: policy
+          uid: az_blueprint_artifact_policy
+          displayName: az blueprint artifact policy
+          items: []
+        - name: role
+          uid: az_blueprint_artifact_role
+          displayName: az blueprint artifact role
+          items: []
+        - name: template
+          uid: az_blueprint_artifact_template
+          displayName: az blueprint artifact template
+          items: []
+      - name: assignment
+        uid: az_blueprint_assignment
+        displayName: az blueprint assignment
+        items: []
+      - name: resource-group
+        uid: az_blueprint_resource-group
+        displayName: az blueprint resource-group
+        items: []
+      - name: version
         items:
-        - name: Overview
-          uid: az_keyvault_certificate_issuer
-          displayName: az keyvault certificate issuer
-        - name: create
-          uid: az_keyvault_certificate_issuer_create
-          displayName: az keyvault certificate issuer create
-        - name: delete
-          uid: az_keyvault_certificate_issuer_delete
-          displayName: az keyvault certificate issuer delete
-        - name: list
-          uid: az_keyvault_certificate_issuer_list
-          displayName: az keyvault certificate issuer list
-        - name: show
-          uid: az_keyvault_certificate_issuer_show
-          displayName: az keyvault certificate issuer show
-        - name: update
-          uid: az_keyvault_certificate_issuer_update
-          displayName: az keyvault certificate issuer update
-        - name: Administration
-          displayName: az keyvault certificate issuer admin
-          items:
-          - name: Overview
-            uid: az_keyvault_certificate_issuer_admin
-            displayName: az keyvault certificate issuer admin
-          - name: add
-            uid: az_keyvault_certificate_issuer_admin_add
-            displayName: az keyvault certificate issuer admin add
-          - name: delete
-            uid: az_keyvault_certificate_issuer_admin_delete
-            displayName: az keyvault certificate issuer admin delete
-          - name: list
-            uid: az_keyvault_certificate_issuer_admin_list
-            displayName: az keyvault certificate issuer admin list
-      - name: Pending
-        displayName: az keyvault certificate pending
+        - name: Summary
+          uid: az_blueprint_version
+          displayName: az blueprint version
+        - name: artifact
+          uid: az_blueprint_version_artifact
+          displayName: az blueprint version artifact
+          items: []
+  - name: Azure Boards
+    items:
+    - name: Summary
+      uid: sp-Azure_Boards
+      displayName: Azure Boards
+    - name: boards
+      items:
+      - name: Summary
+        uid: az_boards
+        displayName: az boards
+      - name: area
         items:
-        - name: Overview
-          uid: az_keyvault_certificate_pending
-          displayName: az keyvault certificate pending
-        - name: delete
-          uid: az_keyvault_certificate_pending_delete
-          displayName: az keyvault certificate pending delete
-        - name: merge
-          uid: az_keyvault_certificate_pending_merge
-          displayName: az keyvault certificate pending merge
-        - name: show
-          uid: az_keyvault_certificate_pending_show
-          displayName: az keyvault certificate pending show
-    - name: Keys
-      displayName: az keyvault key
+        - name: Summary
+          uid: az_boards_area
+          displayName: az boards area
+        - name: project
+          uid: az_boards_area_project
+          displayName: az boards area project
+          items: []
+        - name: team
+          uid: az_boards_area_team
+          displayName: az boards area team
+          items: []
+      - name: iteration
+        items:
+        - name: Summary
+          uid: az_boards_iteration
+          displayName: az boards iteration
+        - name: project
+          uid: az_boards_iteration_project
+          displayName: az boards iteration project
+          items: []
+        - name: team
+          uid: az_boards_iteration_team
+          displayName: az boards iteration team
+          items: []
+      - name: work-item
+        items:
+        - name: Summary
+          uid: az_boards_work-item
+          displayName: az boards work-item
+        - name: relation
+          uid: az_boards_work-item_relation
+          displayName: az boards work-item relation
+          items: []
+  - name: Azure Bot
+    items:
+    - name: Summary
+      uid: sp-Azure_Bot
+      displayName: Azure Bot
+    - name: healthbot
+      uid: az_healthbot
+      displayName: az healthbot
+      items: []
+  - name: Azure Bot Service
+    uid: sp-Azure_Bot_Service
+    displayName: Azure Bot Service
+    items: []
+  - name: Azure Cache for Redis
+    uid: sp-Azure_Cache_for_Redis
+    displayName: Azure Cache for Redis
+    items: []
+  - name: Azure CLI
+    items:
+    - name: Summary
+      uid: sp-Azure_CLI
+      displayName: Azure CLI
+    - name: account
       items:
-      - name: Overview
-        uid: az_keyvault_key
-        displayName: az keyvault key
-      - name: backup
-        uid: az_keyvault_key_backup
-        displayName: az keyvault key backup
-      - name: create
-        uid: az_keyvault_key_create
-        displayName: az keyvault key create
-      - name: delete
-        uid: az_keyvault_key_delete
-        displayName: az keyvault key delete
-      - name: download
-        uid: az_keyvault_key_download
-        displayName: az keyvault key download
-      - name: import
-        uid: az_keyvault_key_import
-        displayName: az keyvault key import
-      - name: list
-        uid: az_keyvault_key_list
-        displayName: az keyvault key list
-      - name: list-deleted
-        uid: az_keyvault_key_list_deleted
-        displayName: az keyvault key list-deleted
-      - name: list-versions
-        uid: az_keyvault_key_list_versions
-        displayName: az keyvault key list-versions
-      - name: purge
-        uid: az_keyvault_key_purge
-        displayName: az keyvault key purge
-      - name: recover
-        uid: az_keyvault_key_recover
-        displayName: az keyvault key recover
-      - name: restore
-        uid: az_keyvault_key_restore
-        displayName: az keyvault key restore
-      - name: set-attributes
-        uid: az_keyvault_key_set_attributes
-        displayName: az keyvault key set-attributes
-      - name: show
-        uid: az_keyvault_key_show
-        displayName: az keyvault key show
-      - name: show-deleted
-        uid: az_keyvault_key_show_deleted
-        displayName: az keyvault key show-deleted
-    - name: Secrets
-      displayName: az keyvault secret
+      - name: Summary
+        uid: az_account
+        displayName: az account
+      - name: alias
+        uid: az_account_alias
+        displayName: az account alias
+        items: []
+      - name: lock
+        uid: az_account_lock
+        displayName: az account lock
+        items: []
+      - name: management-group
+        items:
+        - name: Summary
+          uid: az_account_management-group
+          displayName: az account management-group
+        - name: subscription
+          uid: az_account_management-group_subscription
+          displayName: az account management-group subscription
+          items: []
+      - name: subscription
+        uid: az_account_subscription
+        displayName: az account subscription
+        items: []
+      - name: tenant
+        uid: az_account_tenant
+        displayName: az account tenant
+        items: []
+    - name: alias
+      uid: az_alias
+      displayName: az alias
+      items: []
+    - name: cache
+      uid: az_cache
+      displayName: az cache
+      items: []
+    - name: cli-translator
+      items:
+      - name: Summary
+        uid: az_cli-translator
+        displayName: az cli-translator
+      - name: arm
+        uid: az_cli-translator_arm
+        displayName: az cli-translator arm
+        items: []
+    - name: cloud
+      uid: az_cloud
+      displayName: az cloud
+      items: []
+    - name: config
+      items:
+      - name: Summary
+        uid: az_config
+        displayName: az config
+      - name: param-persist
+        uid: az_config_param-persist
+        displayName: az config param-persist
+        items: []
+    - name: demo
+      uid: az_demo
+      displayName: az demo
+      items: []
+    - name: extension
+      uid: az_extension
+      displayName: az extension
+      items: []
+    - name: fzf
+      uid: az_fzf
+      displayName: az fzf
+      items: []
+    - name: local-context
+      uid: az_local-context
+      displayName: az local-context
+      items: []
+  - name: Azure Cloud Services (extended support)
+    items:
+    - name: Summary
+      uid: sp-Azure_Cloud_Services_(extended_support)
+      displayName: Azure Cloud Services (extended support)
+    - name: cloud-service
+      items:
+      - name: Summary
+        uid: az_cloud-service
+        displayName: az cloud-service
+      - name: role
+        uid: az_cloud-service_role
+        displayName: az cloud-service role
+        items: []
+      - name: role-instance
+        uid: az_cloud-service_role-instance
+        displayName: az cloud-service role-instance
+        items: []
+      - name: update-domain
+        uid: az_cloud-service_update-domain
+        displayName: az cloud-service update-domain
+        items: []
+  - name: Azure Cognitive Search
+    uid: sp-Azure_Cognitive_Search
+    displayName: Azure Cognitive Search
+    items: []
+  - name: Azure Cognitive Service
+    uid: sp-Azure_Cognitive_Service
+    displayName: Azure Cognitive Service
+    items: []
+  - name: Azure Communication Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Communication_Service
+      displayName: Azure Communication Service
+    - name: communication
+      uid: az_communication
+      displayName: az communication
+      items: []
+  - name: Azure Container Instances
+    items:
+    - name: Summary
+      uid: sp-Azure_Container_Instances
+      displayName: Azure Container Instances
+    - name: container
       items:
-      - name: Overview
-        uid: az_keyvault_secret
-        displayName: az keyvault secret
-      - name: backup
-        uid: az_keyvault_secret_backup
-        displayName: az keyvault secret backup
-      - name: delete
-        uid: az_keyvault_secret_delete
-        displayName: az keyvault secret delete
-      - name: download
-        uid: az_keyvault_secret_download
-        displayName: az keyvault secret download
-      - name: list
-        uid: az_keyvault_secret_list
-        displayName: az keyvault secret list
-      - name: list-deleted
-        uid: az_keyvault_secret_list_deleted
-        displayName: az keyvault secret list-deleted
-      - name: list-versions
-        uid: az_keyvault_secret_list_versions
-        displayName: az keyvault secret list-versions
-      - name: purge
-        uid: az_keyvault_secret_purge
-        displayName: az keyvault secret purge
-      - name: recover
-        uid: az_keyvault_secret_recover
-        displayName: az keyvault secret recover
-      - name: restore
-        uid: az_keyvault_secret_restore
-        displayName: az keyvault secret restore
-      - name: set
-        uid: az_keyvault_secret_set
-        displayName: az keyvault secret set
-      - name: set-attributes
-        uid: az_keyvault_secret_set_attributes
-        displayName: az keyvault secret set-attributes
-      - name: show
-        uid: az_keyvault_secret_show
-        displayName: az keyvault secret show
-      - name: show-deleted
-        uid: az_keyvault_secret_show_deleted
-        displayName: az keyvault secret show-deleted
-  - name: Locks
-    displayName: az lock
+      - name: Summary
+        uid: az_container
+        displayName: az container
+      - name: app
+        uid: az_container_app
+        displayName: az container app
+        items: []
+  - name: Azure Container Registries
     items:
-    - name: Overview
-      uid: az_lock
-      displayName: az lock
-    - name: create
-      uid: az_lock_create
-      displayName: az lock create
-    - name: delete
-      uid: az_lock_delete
-      displayName: az lock delete
-    - name: list
-      uid: az_lock_list
-      displayName: az lock list
-    - name: show
-      uid: az_lock_show
-      displayName: az lock show
-    - name: update
-      uid: az_lock_update
-      displayName: az lock update
-  - name: Managed App
-    displayName: az managedapp
+    - name: Summary
+      uid: sp-Azure_Container_Registries
+      displayName: Azure Container Registries
+    - name: acr
+      items:
+      - name: Summary
+        uid: az_acr
+        displayName: az acr
+      - name: export-pipeline
+        uid: az_acr_export-pipeline
+        displayName: az acr export-pipeline
+        items: []
+      - name: import-pipeline
+        uid: az_acr_import-pipeline
+        displayName: az acr import-pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_acr_pipeline-run
+        displayName: az acr pipeline-run
+        items: []
+  - name: Azure Container Services
+    uid: sp-Azure_Container_Services
+    displayName: Azure Container Services
+    items: []
+  - name: Azure Cosmos DB
+    items:
+    - name: Summary
+      uid: sp-Azure_Cosmos_DB
+      displayName: Azure Cosmos DB
+    - name: cosmosdb
+      items:
+      - name: Summary
+        uid: az_cosmosdb
+        displayName: az cosmosdb
+      - name: mongodb
+        items:
+        - name: Summary
+          uid: az_cosmosdb_mongodb
+          displayName: az cosmosdb mongodb
+        - name: restorable-collection
+          uid: az_cosmosdb_mongodb_restorable-collection
+          displayName: az cosmosdb mongodb restorable-collection
+          items: []
+        - name: restorable-database
+          uid: az_cosmosdb_mongodb_restorable-database
+          displayName: az cosmosdb mongodb restorable-database
+          items: []
+        - name: restorable-resource
+          uid: az_cosmosdb_mongodb_restorable-resource
+          displayName: az cosmosdb mongodb restorable-resource
+          items: []
+      - name: restorable-database-account
+        uid: az_cosmosdb_restorable-database-account
+        displayName: az cosmosdb restorable-database-account
+        items: []
+      - name: sql
+        items:
+        - name: Summary
+          uid: az_cosmosdb_sql
+          displayName: az cosmosdb sql
+        - name: restorable-container
+          uid: az_cosmosdb_sql_restorable-container
+          displayName: az cosmosdb sql restorable-container
+          items: []
+        - name: restorable-database
+          uid: az_cosmosdb_sql_restorable-database
+          displayName: az cosmosdb sql restorable-database
+          items: []
+        - name: restorable-resource
+          uid: az_cosmosdb_sql_restorable-resource
+          displayName: az cosmosdb sql restorable-resource
+          items: []
+    - name: managed-cassandra
+      items:
+      - name: Summary
+        uid: az_managed-cassandra
+        displayName: az managed-cassandra
+      - name: cluster
+        uid: az_managed-cassandra_cluster
+        displayName: az managed-cassandra cluster
+        items: []
+      - name: datacenter
+        uid: az_managed-cassandra_datacenter
+        displayName: az managed-cassandra datacenter
+        items: []
+  - name: Azure Cost Management + Billing
     items:
-    - name: Overview
-      uid: az_managedapp
-      displayName: az managedapp
-    - name: create
-      uid: az_managedapp_create
-      displayName: az managedapp create
-    - name: delete
-      uid: az_managedapp_delete
-      displayName: az managedapp delete
-    - name: list
-      uid: az_managedapp_list
-      displayName: az managedapp list
-    - name: show
-      uid: az_managedapp_show
-      displayName: az managedapp show
-    - name: Definition
-      displayName: az managedapp definition
+    - name: Summary
+      uid: sp-Azure_Cost_Management_+_Billing
+      displayName: Azure Cost Management + Billing
+    - name: costmanagement
       items:
-      - name: Overview
-        uid: az_managedapp_definition
-        displayName: az managedapp definition
-      - name: create
-        uid: az_managedapp_definition_create
-        displayName: az managedapp definition create
-      - name: delete
-        uid: az_managedapp_definition_delete
-        displayName: az managedapp definition delete
-      - name: list
-        uid: az_managedapp_definition_list
-        displayName: az managedapp definition list
-      - name: show
-        uid: az_managedapp_definition_show
-        displayName: az managedapp definition show
-  - name: Managed Disks
-    displayName: az disk
+      - name: Summary
+        uid: az_costmanagement
+        displayName: az costmanagement
+      - name: export
+        uid: az_costmanagement_export
+        displayName: az costmanagement export
+        items: []
+  - name: Azure Custom Providers
     items:
-    - name: Overview
-      uid: az_disk
-      displayName: az disk
-    - name: create
-      uid: az_disk_create
-      displayName: az disk create
-    - name: delete
-      uid: az_disk_delete
-      displayName: az disk delete
-    - name: grant-access
-      uid: az_disk_grant_access
-      displayName: az disk grant-access
-    - name: list
-      uid: az_disk_list
-      displayName: az disk list
-    - name: revoke-access
-      uid: az_disk_revoke_access
-      displayName: az disk revoke-access
-    - name: show
-      uid: az_disk_show
-      displayName: az disk show
-    - name: update
-      uid: az_disk_update
-      displayName: az disk update
-    - name: wait
-      uid: az_disk_wait
-      displayName: az disk wait
-  - name: Networking
-    displayName: az network
+    - name: Summary
+      uid: sp-Azure_Custom_Providers
+      displayName: Azure Custom Providers
+    - name: custom-providers
+      items:
+      - name: Summary
+        uid: az_custom-providers
+        displayName: az custom-providers
+      - name: resource-provider
+        uid: az_custom-providers_resource-provider
+        displayName: az custom-providers resource-provider
+        items: []
+  - name: Azure Data Explorer
     items:
-    - name: Overview
-      uid: az_network
-      displayName: az network
-    - name: list-service-aliases
-      uid: az_network_list_service_aliases
-      displayName: az network list-service-aliases
-    - name: list-usages
-      uid: az_network_list_usages
-      displayName: az network list-usages
-    - name: Application Gateway
-      displayName: az network application-gateway
+    - name: Summary
+      uid: sp-Azure_Data_Explorer
+      displayName: Azure Data Explorer
+    - name: kusto
       items:
-      - name: Overview
-        uid: az_network_application_gateway
-        displayName: az network application-gateway
-      - name: create
-        uid: az_network_application_gateway_create
-        displayName: az network application-gateway create
-      - name: delete
-        uid: az_network_application_gateway_delete
-        displayName: az network application-gateway delete
-      - name: list
-        uid: az_network_application_gateway_list
-        displayName: az network application-gateway list
-      - name: show
-        uid: az_network_application_gateway_show
-        displayName: az network application-gateway show
-      - name: show-backend-health
-        uid: az_network_application_gateway_show_backend_health
-        displayName: az network application-gateway show-backend-health
-      - name: start
-        uid: az_network_application_gateway_start
-        displayName: az network application-gateway start
-      - name: stop
-        uid: az_network_application_gateway_stop
-        displayName: az network application-gateway stop
-      - name: update
-        uid: az_network_application_gateway_update
-        displayName: az network application-gateway update
-      - name: wait
-        uid: az_network_application_gateway_wait
-        displayName: az network application-gateway wait
-      - name: Address pools
-        displayName: az network application-gateway address-pool
+      - name: Summary
+        uid: az_kusto
+        displayName: az kusto
+      - name: attached-database-configuration
+        uid: az_kusto_attached-database-configuration
+        displayName: az kusto attached-database-configuration
+        items: []
+      - name: cluster
+        uid: az_kusto_cluster
+        displayName: az kusto cluster
+        items: []
+      - name: cluster-principal-assignment
+        uid: az_kusto_cluster-principal-assignment
+        displayName: az kusto cluster-principal-assignment
+        items: []
+      - name: database
+        uid: az_kusto_database
+        displayName: az kusto database
+        items: []
+      - name: database-principal-assignment
+        uid: az_kusto_database-principal-assignment
+        displayName: az kusto database-principal-assignment
+        items: []
+      - name: data-connection
         items:
-        - name: Overview
-          uid: az_network_application_gateway_address_pool
-          displayName: az network application-gateway address-pool
-        - name: create
-          uid: az_network_application_gateway_address_pool_create
-          displayName: az network application-gateway address-pool create
-        - name: delete
-          uid: az_network_application_gateway_address_pool_delete
-          displayName: az network application-gateway address-pool delete
-        - name: list
-          uid: az_network_application_gateway_address_pool_list
-          displayName: az network application-gateway address-pool list
-        - name: show
-          uid: az_network_application_gateway_address_pool_show
-          displayName: az network application-gateway address-pool show
-        - name: update
-          uid: az_network_application_gateway_address_pool_update
-          displayName: az network application-gateway address-pool update
-      - name: Authorization certificates
-        displayName: az network application-gateway auth-cert
+        - name: Summary
+          uid: az_kusto_data-connection
+          displayName: az kusto data-connection
+        - name: event-grid
+          uid: az_kusto_data-connection_event-grid
+          displayName: az kusto data-connection event-grid
+          items: []
+        - name: event-hub
+          uid: az_kusto_data-connection_event-hub
+          displayName: az kusto data-connection event-hub
+          items: []
+        - name: iot-hub
+          uid: az_kusto_data-connection_iot-hub
+          displayName: az kusto data-connection iot-hub
+          items: []
+      - name: operation-result
+        uid: az_kusto_operation-result
+        displayName: az kusto operation-result
+        items: []
+      - name: script
+        uid: az_kusto_script
+        displayName: az kusto script
+        items: []
+  - name: Azure Data Explorer (Kusto)
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Explorer_(Kusto)
+      displayName: Azure Data Explorer (Kusto)
+    - name: kusto
+      items:
+      - name: Summary
+        uid: az_kusto
+        displayName: az kusto
+      - name: attached-database-configuration
+        uid: az_kusto_attached-database-configuration
+        displayName: az kusto attached-database-configuration
+        items: []
+      - name: cluster
+        uid: az_kusto_cluster
+        displayName: az kusto cluster
+        items: []
+      - name: cluster-principal-assignment
+        uid: az_kusto_cluster-principal-assignment
+        displayName: az kusto cluster-principal-assignment
+        items: []
+      - name: database
+        uid: az_kusto_database
+        displayName: az kusto database
+        items: []
+      - name: database-principal-assignment
+        uid: az_kusto_database-principal-assignment
+        displayName: az kusto database-principal-assignment
+        items: []
+      - name: data-connection
         items:
-        - name: Overview
-          uid: az_network_application_gateway_auth_cert
-          displayName: az network application-gateway auth-cert
-        - name: create
-          uid: az_network_application_gateway_auth_cert_create
-          displayName: az network application-gateway auth-cert create
-        - name: delete
-          uid: az_network_application_gateway_auth_cert_delete
-          displayName: az network application-gateway auth-cert delete
-        - name: list
-          uid: az_network_application_gateway_auth_cert_list
-          displayName: az network application-gateway auth-cert list
-        - name: show
-          uid: az_network_application_gateway_auth_cert_show
-          displayName: az network application-gateway auth-cert show
-        - name: update
-          uid: az_network_application_gateway_auth_cert_update
-          displayName: az network application-gateway auth-cert update
-      - name: Front-end IP addresses
-        displayName: az network application-gateway frontend-ip
+        - name: Summary
+          uid: az_kusto_data-connection
+          displayName: az kusto data-connection
+        - name: event-grid
+          uid: az_kusto_data-connection_event-grid
+          displayName: az kusto data-connection event-grid
+          items: []
+        - name: event-hub
+          uid: az_kusto_data-connection_event-hub
+          displayName: az kusto data-connection event-hub
+          items: []
+        - name: iot-hub
+          uid: az_kusto_data-connection_iot-hub
+          displayName: az kusto data-connection iot-hub
+          items: []
+      - name: operation-result
+        uid: az_kusto_operation-result
+        displayName: az kusto operation-result
+        items: []
+      - name: script
+        uid: az_kusto_script
+        displayName: az kusto script
+        items: []
+  - name: Azure Data Factory
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Factory
+      displayName: Azure Data Factory
+    - name: datafactory
+      items:
+      - name: Summary
+        uid: az_datafactory
+        displayName: az datafactory
+      - name: activity-run
+        uid: az_datafactory_activity-run
+        displayName: az datafactory activity-run
+        items: []
+      - name: dataset
+        uid: az_datafactory_dataset
+        displayName: az datafactory dataset
+        items: []
+      - name: integration-runtime
+        items:
+        - name: Summary
+          uid: az_datafactory_integration-runtime
+          displayName: az datafactory integration-runtime
+        - name: linked-integration-runtime
+          uid: az_datafactory_integration-runtime_linked-integration-runtime
+          displayName: az datafactory integration-runtime linked-integration-runtime
+          items: []
+        - name: managed
+          uid: az_datafactory_integration-runtime_managed
+          displayName: az datafactory integration-runtime managed
+          items: []
+        - name: self-hosted
+          uid: az_datafactory_integration-runtime_self-hosted
+          displayName: az datafactory integration-runtime self-hosted
+          items: []
+      - name: integration-runtime-node
+        uid: az_datafactory_integration-runtime-node
+        displayName: az datafactory integration-runtime-node
+        items: []
+      - name: linked-service
+        uid: az_datafactory_linked-service
+        displayName: az datafactory linked-service
+        items: []
+      - name: pipeline
+        uid: az_datafactory_pipeline
+        displayName: az datafactory pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_datafactory_pipeline-run
+        displayName: az datafactory pipeline-run
+        items: []
+      - name: trigger
+        uid: az_datafactory_trigger
+        displayName: az datafactory trigger
+        items: []
+      - name: trigger-run
+        uid: az_datafactory_trigger-run
+        displayName: az datafactory trigger-run
+        items: []
+  - name: Azure Data Lake Analytics
+    uid: sp-Azure_Data_Lake_Analytics
+    displayName: Azure Data Lake Analytics
+    items: []
+  - name: Azure Data Lake Storage
+    uid: sp-Azure_Data_Lake_Storage
+    displayName: Azure Data Lake Storage
+    items: []
+  - name: Azure Data Migration
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Migration
+      displayName: Azure Data Migration
+    - name: dms
+      items:
+      - name: Summary
+        uid: az_dms
+        displayName: az dms
+      - name: project
         items:
-        - name: Overview
-          uid: az_network_application_gateway_frontend_ip
-          displayName: az network application-gateway frontend-ip
-        - name: create
-          uid: az_network_application_gateway_frontend_ip_create
-          displayName: az network application-gateway frontend-ip create
-        - name: delete
-          uid: az_network_application_gateway_frontend_ip_delete
-          displayName: az network application-gateway frontend-ip delete
-        - name: list
-          uid: az_network_application_gateway_frontend_ip_list
-          displayName: az network application-gateway frontend-ip list
-        - name: show
-          uid: az_network_application_gateway_frontend_ip_show
-          displayName: az network application-gateway frontend-ip show
-        - name: update
-          uid: az_network_application_gateway_frontend_ip_update
-          displayName: az network application-gateway frontend-ip update
-      - name: Front-end ports
-        displayName: az network application-gateway frontend-port
+        - name: Summary
+          uid: az_dms_project
+          displayName: az dms project
+        - name: task
+          uid: az_dms_project_task
+          displayName: az dms project task
+          items: []
+  - name: Azure Data Share
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Share
+      displayName: Azure Data Share
+    - name: datashare
+      items:
+      - name: Summary
+        uid: az_datashare
+        displayName: az datashare
+      - name: account
+        uid: az_datashare_account
+        displayName: az datashare account
+        items: []
+      - name: consumer
         items:
-        - name: Overview
-          uid: az_network_application_gateway_frontend_port
-          displayName: az network application-gateway frontend-port
-        - name: create
-          uid: az_network_application_gateway_frontend_port_create
-          displayName: az network application-gateway frontend-port create
-        - name: delete
-          uid: az_network_application_gateway_frontend_port_delete
-          displayName: az network application-gateway frontend-port delete
-        - name: list
-          uid: az_network_application_gateway_frontend_port_list
-          displayName: az network application-gateway frontend-port list
-        - name: show
-          uid: az_network_application_gateway_frontend_port_show
-          displayName: az network application-gateway frontend-port show
-        - name: update
-          uid: az_network_application_gateway_frontend_port_update
-          displayName: az network application-gateway frontend-port update
-      - name: HTTP listeners
-        displayName: az network application-gateway http-listener
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_http_listener
-          displayName: az network application-gateway http-listener
-        - name: create
-          uid: az_network_application_gateway_http_listener_create
-          displayName: az network application-gateway http-listener create
-        - name: delete
-          uid: az_network_application_gateway_http_listener_delete
-          displayName: az network application-gateway http-listener delete
-        - name: list
-          uid: az_network_application_gateway_http_listener_list
-          displayName: az network application-gateway http-listener list
-        - name: show
-          uid: az_network_application_gateway_http_listener_show
-          displayName: az network application-gateway http-listener show
-        - name: update
-          uid: az_network_application_gateway_http_listener_update
-          displayName: az network application-gateway http-listener update
-      - name: HTTP settings
-        displayName: az network application-gateway http-settings
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_http_settings
-          displayName: az network application-gateway http-settings
-        - name: create
-          uid: az_network_application_gateway_http_settings_create
-          displayName: az network application-gateway http-settings create
-        - name: delete
-          uid: az_network_application_gateway_http_settings_delete
-          displayName: az network application-gateway http-settings delete
-        - name: list
-          uid: az_network_application_gateway_http_settings_list
-          displayName: az network application-gateway http-settings list
-        - name: show
-          uid: az_network_application_gateway_http_settings_show
-          displayName: az network application-gateway http-settings show
-        - name: update
-          uid: az_network_application_gateway_http_settings_update
-          displayName: az network application-gateway http-settings update
-      - name: Probes
-        displayName: az network application-gateway probe
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_probe
-          displayName: az network application-gateway probe
-        - name: create
-          uid: az_network_application_gateway_probe_create
-          displayName: az network application-gateway probe create
-        - name: delete
-          uid: az_network_application_gateway_probe_delete
-          displayName: az network application-gateway probe delete
-        - name: list
-          uid: az_network_application_gateway_probe_list
-          displayName: az network application-gateway probe list
-        - name: show
-          uid: az_network_application_gateway_probe_show
-          displayName: az network application-gateway probe show
-        - name: update
-          uid: az_network_application_gateway_probe_update
-          displayName: az network application-gateway probe update
-      - name: Routing rules
-        displayName: az network application-gateway rule
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_rule
-          displayName: az network application-gateway rule
-        - name: create
-          uid: az_network_application_gateway_rule_create
-          displayName: az network application-gateway rule create
-        - name: delete
-          uid: az_network_application_gateway_rule_delete
-          displayName: az network application-gateway rule delete
-        - name: list
-          uid: az_network_application_gateway_rule_list
-          displayName: az network application-gateway rule list
-        - name: show
-          uid: az_network_application_gateway_rule_show
-          displayName: az network application-gateway rule show
-        - name: update
-          uid: az_network_application_gateway_rule_update
-          displayName: az network application-gateway rule update
-      - name: SSL certificates
-        displayName: az network application-gateway ssl-cert
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_ssl_cert
-          displayName: az network application-gateway ssl-cert
-        - name: create
-          uid: az_network_application_gateway_ssl_cert_create
-          displayName: az network application-gateway ssl-cert create
-        - name: delete
-          uid: az_network_application_gateway_ssl_cert_delete
-          displayName: az network application-gateway ssl-cert delete
-        - name: list
-          uid: az_network_application_gateway_ssl_cert_list
-          displayName: az network application-gateway ssl-cert list
-        - name: show
-          uid: az_network_application_gateway_ssl_cert_show
-          displayName: az network application-gateway ssl-cert show
-        - name: update
-          uid: az_network_application_gateway_ssl_cert_update
-          displayName: az network application-gateway ssl-cert update
-      - name: SSL policies
-        displayName: az network application-gateway ssl-policy
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_ssl_policy
-          displayName: az network application-gateway ssl-policy
-        - name: list-options
-          uid: az_network_application_gateway_ssl_policy_list_options
-          displayName: az network application-gateway ssl-policy list-options
-        - name: set
-          uid: az_network_application_gateway_ssl_policy_set
-          displayName: az network application-gateway ssl-policy set
-        - name: show
-          uid: az_network_application_gateway_ssl_policy_show
-          displayName: az network application-gateway ssl-policy show
-        - name: predefined
-          displayName: az network application-gateway ssl-policy predefined
-          items:
-          - name: Overview
-            uid: az_network_application_gateway_ssl_policy_predefined
-            displayName: az network application-gateway ssl-policy predefined
-          - name: list
-            uid: az_network_application_gateway_ssl_policy_predefined_list
-            displayName: az network application-gateway ssl-policy predefined list
-          - name: show
-            uid: az_network_application_gateway_ssl_policy_predefined_show
-            displayName: az network application-gateway ssl-policy predefined show
-      - name: URL path maps
-        displayName: az network application-gateway url-path-map
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_url_path_map
-          displayName: az network application-gateway url-path-map
-        - name: create
-          uid: az_network_application_gateway_url_path_map_create
-          displayName: az network application-gateway url-path-map create
-        - name: delete
-          uid: az_network_application_gateway_url_path_map_delete
-          displayName: az network application-gateway url-path-map delete
-        - name: list
-          uid: az_network_application_gateway_url_path_map_list
-          displayName: az network application-gateway url-path-map list
-        - name: show
-          uid: az_network_application_gateway_url_path_map_show
-          displayName: az network application-gateway url-path-map show
-        - name: update
-          uid: az_network_application_gateway_url_path_map_update
-          displayName: az network application-gateway url-path-map update
-        - name: Rules
-          displayName: az network application-gateway url-path-map rule
-          items:
-          - name: Overview
-            uid: az_network_application_gateway_url_path_map_rule
-            displayName: az network application-gateway url-path-map rule
-          - name: create
-            uid: az_network_application_gateway_url_path_map_rule_create
-            displayName: az network application-gateway url-path-map rule create
-          - name: delete
-            uid: az_network_application_gateway_url_path_map_rule_delete
-            displayName: az network application-gateway url-path-map rule delete
-      - name: Web application firewall settings
-        displayName: az network application-gateway waf-config
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_waf_config
-          displayName: az network application-gateway waf-config
-        - name: list-rule-sets
-          uid: az_network_application_gateway_waf_config_list_rule_sets
-          displayName: az network application-gateway waf-config list-rule-sets
-        - name: set
-          uid: az_network_application_gateway_waf_config_set
-          displayName: az network application-gateway waf-config set
-        - name: show
-          uid: az_network_application_gateway_waf_config_show
-          displayName: az network application-gateway waf-config show
-      - name: redirect-config
-        displayName: az network application-gateway redirect-config
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_redirect_config
-          displayName: az network application-gateway redirect-config
-        - name: create
-          uid: az_network_application_gateway_redirect_config_create
-          displayName: az network application-gateway redirect-config create
-        - name: delete
-          uid: az_network_application_gateway_redirect_config_delete
-          displayName: az network application-gateway redirect-config delete
-        - name: list
-          uid: az_network_application_gateway_redirect_config_list
-          displayName: az network application-gateway redirect-config list
-        - name: show
-          uid: az_network_application_gateway_redirect_config_show
-          displayName: az network application-gateway redirect-config show
-        - name: update
-          uid: az_network_application_gateway_redirect_config_update
-          displayName: az network application-gateway redirect-config update
-      - name: rewrite-rule
-        displayName: az network application-gateway rewrite-rule
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_rewrite_rule
-          displayName: az network application-gateway rewrite-rule
-        - name: set
-          displayName: az network application-gateway rewrite-rule set
+        - name: Summary
+          uid: az_datashare_consumer
+          displayName: az datashare consumer
+        - name: dataset-mapping
+          uid: az_datashare_consumer_dataset-mapping
+          displayName: az datashare consumer dataset-mapping
+          items: []
+        - name: invitation
+          uid: az_datashare_consumer_invitation
+          displayName: az datashare consumer invitation
+          items: []
+        - name: share-subscription
           items:
-          - name: Overview
-            uid: az_network_application_gateway_rewrite_rule_set
-            displayName: az network application-gateway rewrite-rule set
-          - name: create
-            uid: az_network_application_gateway_rewrite_rule_set_create
-            displayName: az network application-gateway rewrite-rule set create
-          - name: delete
-            uid: az_network_application_gateway_rewrite_rule_set_delete
-            displayName: az network application-gateway rewrite-rule set delete
-          - name: list
-            uid: az_network_application_gateway_rewrite_rule_set_list
-            displayName: az network application-gateway rewrite-rule set list
-          - name: show
-            uid: az_network_application_gateway_rewrite_rule_set_show
-            displayName: az network application-gateway rewrite-rule set show
-          - name: update
-            uid: az_network_application_gateway_rewrite_rule_set_update
-            displayName: az network application-gateway rewrite-rule set update
-    - name: DNS
-      displayName: az network dns
+          - name: Summary
+            uid: az_datashare_consumer_share-subscription
+            displayName: az datashare consumer share-subscription
+          - name: synchronization
+            uid: az_datashare_consumer_share-subscription_synchronization
+            displayName: az datashare consumer share-subscription synchronization
+            items: []
+        - name: trigger
+          uid: az_datashare_consumer_trigger
+          displayName: az datashare consumer trigger
+          items: []
+      - name: dataset
+        uid: az_datashare_dataset
+        displayName: az datashare dataset
+        items: []
+      - name: invitation
+        uid: az_datashare_invitation
+        displayName: az datashare invitation
+        items: []
+      - name: provider-share-subscription
+        uid: az_datashare_provider-share-subscription
+        displayName: az datashare provider-share-subscription
+        items: []
+      - name: synchronization
+        uid: az_datashare_synchronization
+        displayName: az datashare synchronization
+        items: []
+      - name: synchronization-setting
+        uid: az_datashare_synchronization-setting
+        displayName: az datashare synchronization-setting
+        items: []
+  - name: Azure Database for MariaDB
+    uid: sp-Azure_Database_for_MariaDB
+    displayName: Azure Database for MariaDB
+    items: []
+  - name: Azure Database for MySQL
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_for_MySQL
+      displayName: Azure Database for MySQL
+    - name: mysql
       items:
-      - name: Overview
-        uid: az_network_dns
-        displayName: az network dns
-      - name: Record sets
-        displayName: az network dns record-set
-        items:
-        - name: Overview
-          uid: az_network_dns_record_set
-          displayName: az network dns record-set
-        - name: list
-          uid: az_network_dns_record_set_list
-          displayName: az network dns record-set list
-        - name: A
-          displayName: az network dns record-set a
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_a
-            displayName: az network dns record-set a
-          - name: add-record
-            uid: az_network_dns_record_set_a_add_record
-            displayName: az network dns record-set a add-record
-          - name: create
-            uid: az_network_dns_record_set_a_create
-            displayName: az network dns record-set a create
-          - name: delete
-            uid: az_network_dns_record_set_a_delete
-            displayName: az network dns record-set a delete
-          - name: list
-            uid: az_network_dns_record_set_a_list
-            displayName: az network dns record-set a list
-          - name: remove-record
-            uid: az_network_dns_record_set_a_remove_record
-            displayName: az network dns record-set a remove-record
-          - name: show
-            uid: az_network_dns_record_set_a_show
-            displayName: az network dns record-set a show
-          - name: update
-            uid: az_network_dns_record_set_a_update
-            displayName: az network dns record-set a update
-        - name: AAAA
-          displayName: az network dns record-set aaaa
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_aaaa
-            displayName: az network dns record-set aaaa
-          - name: add-record
-            uid: az_network_dns_record_set_aaaa_add_record
-            displayName: az network dns record-set aaaa add-record
-          - name: create
-            uid: az_network_dns_record_set_aaaa_create
-            displayName: az network dns record-set aaaa create
-          - name: delete
-            uid: az_network_dns_record_set_aaaa_delete
-            displayName: az network dns record-set aaaa delete
-          - name: list
-            uid: az_network_dns_record_set_aaaa_list
-            displayName: az network dns record-set aaaa list
-          - name: remove-record
-            uid: az_network_dns_record_set_aaaa_remove_record
-            displayName: az network dns record-set aaaa remove-record
-          - name: show
-            uid: az_network_dns_record_set_aaaa_show
-            displayName: az network dns record-set aaaa show
-          - name: update
-            uid: az_network_dns_record_set_aaaa_update
-            displayName: az network dns record-set aaaa update
-        - name: CNAME
-          displayName: az network dns record-set cname
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_cname
-            displayName: az network dns record-set cname
-          - name: create
-            uid: az_network_dns_record_set_cname_create
-            displayName: az network dns record-set cname create
-          - name: delete
-            uid: az_network_dns_record_set_cname_delete
-            displayName: az network dns record-set cname delete
-          - name: list
-            uid: az_network_dns_record_set_cname_list
-            displayName: az network dns record-set cname list
-          - name: remove-record
-            uid: az_network_dns_record_set_cname_remove_record
-            displayName: az network dns record-set cname remove-record
-          - name: set-record
-            uid: az_network_dns_record_set_cname_set_record
-            displayName: az network dns record-set cname set-record
-          - name: show
-            uid: az_network_dns_record_set_cname_show
-            displayName: az network dns record-set cname show
-        - name: MX (mail)
-          displayName: az network dns record-set mx
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_mx
-            displayName: az network dns record-set mx
-          - name: add-record
-            uid: az_network_dns_record_set_mx_add_record
-            displayName: az network dns record-set mx add-record
-          - name: create
-            uid: az_network_dns_record_set_mx_create
-            displayName: az network dns record-set mx create
-          - name: delete
-            uid: az_network_dns_record_set_mx_delete
-            displayName: az network dns record-set mx delete
-          - name: list
-            uid: az_network_dns_record_set_mx_list
-            displayName: az network dns record-set mx list
-          - name: remove-record
-            uid: az_network_dns_record_set_mx_remove_record
-            displayName: az network dns record-set mx remove-record
-          - name: show
-            uid: az_network_dns_record_set_mx_show
-            displayName: az network dns record-set mx show
-          - name: update
-            uid: az_network_dns_record_set_mx_update
-            displayName: az network dns record-set mx update
-        - name: NS (nameserver)
-          displayName: az network dns record-set ns
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_ns
-            displayName: az network dns record-set ns
-          - name: add-record
-            uid: az_network_dns_record_set_ns_add_record
-            displayName: az network dns record-set ns add-record
-          - name: create
-            uid: az_network_dns_record_set_ns_create
-            displayName: az network dns record-set ns create
-          - name: delete
-            uid: az_network_dns_record_set_ns_delete
-            displayName: az network dns record-set ns delete
-          - name: list
-            uid: az_network_dns_record_set_ns_list
-            displayName: az network dns record-set ns list
-          - name: remove-record
-            uid: az_network_dns_record_set_ns_remove_record
-            displayName: az network dns record-set ns remove-record
-          - name: show
-            uid: az_network_dns_record_set_ns_show
-            displayName: az network dns record-set ns show
-          - name: update
-            uid: az_network_dns_record_set_ns_update
-            displayName: az network dns record-set ns update
-        - name: PTR (pointer)
-          displayName: az network dns record-set ptr
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_ptr
-            displayName: az network dns record-set ptr
-          - name: add-record
-            uid: az_network_dns_record_set_ptr_add_record
-            displayName: az network dns record-set ptr add-record
-          - name: create
-            uid: az_network_dns_record_set_ptr_create
-            displayName: az network dns record-set ptr create
-          - name: delete
-            uid: az_network_dns_record_set_ptr_delete
-            displayName: az network dns record-set ptr delete
-          - name: list
-            uid: az_network_dns_record_set_ptr_list
-            displayName: az network dns record-set ptr list
-          - name: remove-record
-            uid: az_network_dns_record_set_ptr_remove_record
-            displayName: az network dns record-set ptr remove-record
-          - name: show
-            uid: az_network_dns_record_set_ptr_show
-            displayName: az network dns record-set ptr show
-          - name: update
-            uid: az_network_dns_record_set_ptr_update
-            displayName: az network dns record-set ptr update
-        - name: SRV
-          displayName: az network dns record-set srv
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_srv
-            displayName: az network dns record-set srv
-          - name: add-record
-            uid: az_network_dns_record_set_srv_add_record
-            displayName: az network dns record-set srv add-record
-          - name: create
-            uid: az_network_dns_record_set_srv_create
-            displayName: az network dns record-set srv create
-          - name: delete
-            uid: az_network_dns_record_set_srv_delete
-            displayName: az network dns record-set srv delete
-          - name: list
-            uid: az_network_dns_record_set_srv_list
-            displayName: az network dns record-set srv list
-          - name: remove-record
-            uid: az_network_dns_record_set_srv_remove_record
-            displayName: az network dns record-set srv remove-record
-          - name: show
-            uid: az_network_dns_record_set_srv_show
-            displayName: az network dns record-set srv show
-          - name: update
-            uid: az_network_dns_record_set_srv_update
-            displayName: az network dns record-set srv update
-        - name: TXT
-          displayName: az network dns record-set txt
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_txt
-            displayName: az network dns record-set txt
-          - name: add-record
-            uid: az_network_dns_record_set_txt_add_record
-            displayName: az network dns record-set txt add-record
-          - name: create
-            uid: az_network_dns_record_set_txt_create
-            displayName: az network dns record-set txt create
-          - name: delete
-            uid: az_network_dns_record_set_txt_delete
-            displayName: az network dns record-set txt delete
-          - name: list
-            uid: az_network_dns_record_set_txt_list
-            displayName: az network dns record-set txt list
-          - name: remove-record
-            uid: az_network_dns_record_set_txt_remove_record
-            displayName: az network dns record-set txt remove-record
-          - name: show
-            uid: az_network_dns_record_set_txt_show
-            displayName: az network dns record-set txt show
-          - name: update
-            uid: az_network_dns_record_set_txt_update
-            displayName: az network dns record-set txt update
-        - name: soa
-          displayName: az network dns record-set soa
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_soa
-            displayName: az network dns record-set soa
-          - name: show
-            uid: az_network_dns_record_set_soa_show
-            displayName: az network dns record-set soa show
-          - name: update
-            uid: az_network_dns_record_set_soa_update
-            displayName: az network dns record-set soa update
-      - name: Zones
-        displayName: az network dns zone
-        items:
-        - name: Overview
-          uid: az_network_dns_zone
-          displayName: az network dns zone
-        - name: create
-          uid: az_network_dns_zone_create
-          displayName: az network dns zone create
-        - name: delete
-          uid: az_network_dns_zone_delete
-          displayName: az network dns zone delete
-        - name: export
-          uid: az_network_dns_zone_export
-          displayName: az network dns zone export
-        - name: import
-          uid: az_network_dns_zone_import
-          displayName: az network dns zone import
-        - name: list
-          uid: az_network_dns_zone_list
-          displayName: az network dns zone list
-        - name: show
-          uid: az_network_dns_zone_show
-          displayName: az network dns zone show
-        - name: update
-          uid: az_network_dns_zone_update
-          displayName: az network dns zone update
-    - name: Express Route
-      displayName: az network express-route
+      - name: Summary
+        uid: az_mysql
+        displayName: az mysql
+      - name: flexible-server
+        uid: az_mysql_flexible-server
+        displayName: az mysql flexible-server
+        items: []
+  - name: Azure Database for PostgreSQL
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_for_PostgreSQL
+      displayName: Azure Database for PostgreSQL
+    - name: postgres
       items:
-      - name: Overview
-        uid: az_network_express_route
-        displayName: az network express-route
-      - name: create
-        uid: az_network_express_route_create
-        displayName: az network express-route create
-      - name: delete
-        uid: az_network_express_route_delete
-        displayName: az network express-route delete
-      - name: get-stats
-        uid: az_network_express_route_get_stats
-        displayName: az network express-route get-stats
-      - name: list
-        uid: az_network_express_route_list
-        displayName: az network express-route list
-      - name: list-arp-tables
-        uid: az_network_express_route_list_arp_tables
-        displayName: az network express-route list-arp-tables
-      - name: list-route-tables
-        uid: az_network_express_route_list_route_tables
-        displayName: az network express-route list-route-tables
-      - name: list-service-providers
-        uid: az_network_express_route_list_service_providers
-        displayName: az network express-route list-service-providers
-      - name: show
-        uid: az_network_express_route_show
-        displayName: az network express-route show
-      - name: update
-        uid: az_network_express_route_update
-        displayName: az network express-route update
-      - name: wait
-        uid: az_network_express_route_wait
-        displayName: az network express-route wait
-      - name: Circuit authentication
-        displayName: az network express-route auth
-        items:
-        - name: Overview
-          uid: az_network_express_route_auth
-          displayName: az network express-route auth
-        - name: create
-          uid: az_network_express_route_auth_create
-          displayName: az network express-route auth create
-        - name: delete
-          uid: az_network_express_route_auth_delete
-          displayName: az network express-route auth delete
-        - name: list
-          uid: az_network_express_route_auth_list
-          displayName: az network express-route auth list
-        - name: show
-          uid: az_network_express_route_auth_show
-          displayName: az network express-route auth show
-      - name: Peering
-        displayName: az network express-route peering
-        items:
-        - name: Overview
-          uid: az_network_express_route_peering
-          displayName: az network express-route peering
-        - name: create
-          uid: az_network_express_route_peering_create
-          displayName: az network express-route peering create
-        - name: delete
-          uid: az_network_express_route_peering_delete
-          displayName: az network express-route peering delete
-        - name: list
-          uid: az_network_express_route_peering_list
-          displayName: az network express-route peering list
-        - name: show
-          uid: az_network_express_route_peering_show
-          displayName: az network express-route peering show
-        - name: update
-          uid: az_network_express_route_peering_update
-          displayName: az network express-route peering update
-        - name: connection
-          displayName: az network express-route peering connection
-          items:
-          - name: Overview
-            uid: az_network_express_route_peering_connection
-            displayName: az network express-route peering connection
-          - name: create
-            uid: az_network_express_route_peering_connection_create
-            displayName: az network express-route peering connection create
-      - name: gateway
-        displayName: az network express-route gateway
-        items:
-        - name: Overview
-          uid: az_network_express_route_gateway
-          displayName: az network express-route gateway
-        - name: create
-          uid: az_network_express_route_gateway_create
-          displayName: az network express-route gateway create
-        - name: list
-          uid: az_network_express_route_gateway_list
-          displayName: az network express-route gateway list
-        - name: connection
-          displayName: az network express-route gateway connection
-          items:
-          - name: Overview
-            uid: az_network_express_route_gateway_connection
-            displayName: az network express-route gateway connection
-          - name: create
-            uid: az_network_express_route_gateway_connection_create
-            displayName: az network express-route gateway connection create
-      - name: port
-        displayName: az network express-route port
+      - name: Summary
+        uid: az_postgres
+        displayName: az postgres
+      - name: flexible-server
+        uid: az_postgres_flexible-server
+        displayName: az postgres flexible-server
+        items: []
+  - name: Azure Database Migration Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_Migration_Service
+      displayName: Azure Database Migration Service
+    - name: dms
+      items:
+      - name: Summary
+        uid: az_dms
+        displayName: az dms
+      - name: project
         items:
-        - name: Overview
-          uid: az_network_express_route_port
-          displayName: az network express-route port
-        - name: create
-          uid: az_network_express_route_port_create
-          displayName: az network express-route port create
-        - name: list
-          uid: az_network_express_route_port_list
-          displayName: az network express-route port list
-    - name: Local gateways
-      displayName: az network local-gateway
+        - name: Summary
+          uid: az_dms_project
+          displayName: az dms project
+        - name: task
+          uid: az_dms_project_task
+          displayName: az dms project task
+          items: []
+  - name: Azure Databox
+    items:
+    - name: Summary
+      uid: sp-Azure_Databox
+      displayName: Azure Databox
+    - name: databox
       items:
-      - name: Overview
-        uid: az_network_local_gateway
-        displayName: az network local-gateway
-      - name: create
-        uid: az_network_local_gateway_create
-        displayName: az network local-gateway create
-      - name: delete
-        uid: az_network_local_gateway_delete
-        displayName: az network local-gateway delete
-      - name: list
-        uid: az_network_local_gateway_list
-        displayName: az network local-gateway list
-      - name: show
-        uid: az_network_local_gateway_show
-        displayName: az network local-gateway show
-      - name: update
-        uid: az_network_local_gateway_update
-        displayName: az network local-gateway update
-      - name: wait
-        uid: az_network_local_gateway_wait
-        displayName: az network local-gateway wait
-    - name: Network Load Balancer
-      displayName: az network lb
+      - name: Summary
+        uid: az_databox
+        displayName: az databox
+      - name: job
+        uid: az_databox_job
+        displayName: az databox job
+        items: []
+  - name: Azure Databricks
+    items:
+    - name: Summary
+      uid: sp-Azure_Databricks
+      displayName: Azure Databricks
+    - name: databricks
       items:
-      - name: Overview
-        uid: az_network_lb
-        displayName: az network lb
-      - name: create
-        uid: az_network_lb_create
-        displayName: az network lb create
-      - name: delete
-        uid: az_network_lb_delete
-        displayName: az network lb delete
-      - name: list
-        uid: az_network_lb_list
-        displayName: az network lb list
-      - name: show
-        uid: az_network_lb_show
-        displayName: az network lb show
-      - name: update
-        uid: az_network_lb_update
-        displayName: az network lb update
-      - name: Back-end address pools
-        displayName: az network lb address-pool
-        items:
-        - name: Overview
-          uid: az_network_lb_address_pool
-          displayName: az network lb address-pool
-        - name: create
-          uid: az_network_lb_address_pool_create
-          displayName: az network lb address-pool create
-        - name: delete
-          uid: az_network_lb_address_pool_delete
-          displayName: az network lb address-pool delete
-        - name: list
-          uid: az_network_lb_address_pool_list
-          displayName: az network lb address-pool list
-        - name: show
-          uid: az_network_lb_address_pool_show
-          displayName: az network lb address-pool show
-      - name: Front-end IP addresses
-        displayName: az network lb frontend-ip
-        items:
-        - name: Overview
-          uid: az_network_lb_frontend_ip
-          displayName: az network lb frontend-ip
-        - name: create
-          uid: az_network_lb_frontend_ip_create
-          displayName: az network lb frontend-ip create
-        - name: delete
-          uid: az_network_lb_frontend_ip_delete
-          displayName: az network lb frontend-ip delete
-        - name: list
-          uid: az_network_lb_frontend_ip_list
-          displayName: az network lb frontend-ip list
-        - name: show
-          uid: az_network_lb_frontend_ip_show
-          displayName: az network lb frontend-ip show
-        - name: update
-          uid: az_network_lb_frontend_ip_update
-          displayName: az network lb frontend-ip update
-      - name: Inbound NAT address pools
-        displayName: az network lb inbound-nat-pool
-        items:
-        - name: Overview
-          uid: az_network_lb_inbound_nat_pool
-          displayName: az network lb inbound-nat-pool
-        - name: create
-          uid: az_network_lb_inbound_nat_pool_create
-          displayName: az network lb inbound-nat-pool create
-        - name: delete
-          uid: az_network_lb_inbound_nat_pool_delete
-          displayName: az network lb inbound-nat-pool delete
-        - name: list
-          uid: az_network_lb_inbound_nat_pool_list
-          displayName: az network lb inbound-nat-pool list
-        - name: show
-          uid: az_network_lb_inbound_nat_pool_show
-          displayName: az network lb inbound-nat-pool show
-        - name: update
-          uid: az_network_lb_inbound_nat_pool_update
-          displayName: az network lb inbound-nat-pool update
-      - name: Inbound NAT address rules
-        displayName: az network lb inbound-nat-rule
-        items:
-        - name: Overview
-          uid: az_network_lb_inbound_nat_rule
-          displayName: az network lb inbound-nat-rule
-        - name: create
-          uid: az_network_lb_inbound_nat_rule_create
-          displayName: az network lb inbound-nat-rule create
-        - name: delete
-          uid: az_network_lb_inbound_nat_rule_delete
-          displayName: az network lb inbound-nat-rule delete
-        - name: list
-          uid: az_network_lb_inbound_nat_rule_list
-          displayName: az network lb inbound-nat-rule list
-        - name: show
-          uid: az_network_lb_inbound_nat_rule_show
-          displayName: az network lb inbound-nat-rule show
-        - name: update
-          uid: az_network_lb_inbound_nat_rule_update
-          displayName: az network lb inbound-nat-rule update
-      - name: Probes
-        displayName: az network lb probe
-        items:
-        - name: Overview
-          uid: az_network_lb_probe
-          displayName: az network lb probe
-        - name: create
-          uid: az_network_lb_probe_create
-          displayName: az network lb probe create
-        - name: delete
-          uid: az_network_lb_probe_delete
-          displayName: az network lb probe delete
-        - name: list
-          uid: az_network_lb_probe_list
-          displayName: az network lb probe list
-        - name: show
-          uid: az_network_lb_probe_show
-          displayName: az network lb probe show
-        - name: update
-          uid: az_network_lb_probe_update
-          displayName: az network lb probe update
-      - name: Rules
-        displayName: az network lb rule
+      - name: Summary
+        uid: az_databricks
+        displayName: az databricks
+      - name: workspace
         items:
-        - name: Overview
-          uid: az_network_lb_rule
-          displayName: az network lb rule
-        - name: create
-          uid: az_network_lb_rule_create
-          displayName: az network lb rule create
-        - name: delete
-          uid: az_network_lb_rule_delete
-          displayName: az network lb rule delete
-        - name: list
-          uid: az_network_lb_rule_list
-          displayName: az network lb rule list
-        - name: show
-          uid: az_network_lb_rule_show
-          displayName: az network lb rule show
-        - name: update
-          uid: az_network_lb_rule_update
-          displayName: az network lb rule update
-    - name: Network interfaces
-      displayName: az network nic
+        - name: Summary
+          uid: az_databricks_workspace
+          displayName: az databricks workspace
+        - name: vnet-peering
+          uid: az_databricks_workspace_vnet-peering
+          displayName: az databricks workspace vnet-peering
+          items: []
+  - name: Azure Dedicated HSM
+    items:
+    - name: Summary
+      uid: sp-Azure_Dedicated_HSM
+      displayName: Azure Dedicated HSM
+    - name: dedicated-hsm
+      uid: az_dedicated-hsm
+      displayName: az dedicated-hsm
+      items: []
+  - name: Azure DevOps
+    items:
+    - name: Summary
+      uid: sp-Azure_DevOps
+      displayName: Azure DevOps
+    - name: devops
       items:
-      - name: Overview
-        uid: az_network_nic
-        displayName: az network nic
-      - name: create
-        uid: az_network_nic_create
-        displayName: az network nic create
-      - name: delete
-        uid: az_network_nic_delete
-        displayName: az network nic delete
-      - name: list
-        uid: az_network_nic_list
-        displayName: az network nic list
-      - name: list-effective-nsg
-        uid: az_network_nic_list_effective_nsg
-        displayName: az network nic list-effective-nsg
-      - name: show
-        uid: az_network_nic_show
-        displayName: az network nic show
-      - name: show-effective-route-table
-        uid: az_network_nic_show_effective_route_table
-        displayName: az network nic show-effective-route-table
-      - name: update
-        uid: az_network_nic_update
-        displayName: az network nic update
-      - name: wait
-        uid: az_network_nic_wait
-        displayName: az network nic wait
-      - name: NIC IP configurations
-        displayName: az network nic ip-config
+      - name: Summary
+        uid: az_devops
+        displayName: az devops
+      - name: admin
         items:
-        - name: Overview
-          uid: az_network_nic_ip_config
-          displayName: az network nic ip-config
-        - name: create
-          uid: az_network_nic_ip_config_create
-          displayName: az network nic ip-config create
-        - name: delete
-          uid: az_network_nic_ip_config_delete
-          displayName: az network nic ip-config delete
-        - name: list
-          uid: az_network_nic_ip_config_list
-          displayName: az network nic ip-config list
-        - name: show
-          uid: az_network_nic_ip_config_show
-          displayName: az network nic ip-config show
-        - name: update
-          uid: az_network_nic_ip_config_update
-          displayName: az network nic ip-config update
-        - name: Address pools
-          displayName: az network nic ip-config address-pool
+        - name: Summary
+          uid: az_devops_admin
+          displayName: az devops admin
+        - name: banner
+          uid: az_devops_admin_banner
+          displayName: az devops admin banner
+          items: []
+      - name: extension
+        uid: az_devops_extension
+        displayName: az devops extension
+        items: []
+      - name: project
+        uid: az_devops_project
+        displayName: az devops project
+        items: []
+      - name: security
+        items:
+        - name: Summary
+          uid: az_devops_security
+          displayName: az devops security
+        - name: group
           items:
-          - name: Overview
-            uid: az_network_nic_ip_config_address_pool
-            displayName: az network nic ip-config address-pool
-          - name: add
-            uid: az_network_nic_ip_config_address_pool_add
-            displayName: az network nic ip-config address-pool add
-          - name: remove
-            uid: az_network_nic_ip_config_address_pool_remove
-            displayName: az network nic ip-config address-pool remove
-        - name: Inbound NAT rules
-          displayName: az network nic ip-config inbound-nat-rule
+          - name: Summary
+            uid: az_devops_security_group
+            displayName: az devops security group
+          - name: membership
+            uid: az_devops_security_group_membership
+            displayName: az devops security group membership
+            items: []
+        - name: permission
           items:
-          - name: Overview
-            uid: az_network_nic_ip_config_inbound_nat_rule
-            displayName: az network nic ip-config inbound-nat-rule
-          - name: add
-            uid: az_network_nic_ip_config_inbound_nat_rule_add
-            displayName: az network nic ip-config inbound-nat-rule add
-          - name: remove
-            uid: az_network_nic_ip_config_inbound_nat_rule_remove
-            displayName: az network nic ip-config inbound-nat-rule remove
-    - name: Network security groups
-      displayName: az network nsg
-      items:
-      - name: Overview
-        uid: az_network_nsg
-        displayName: az network nsg
-      - name: create
-        uid: az_network_nsg_create
-        displayName: az network nsg create
-      - name: delete
-        uid: az_network_nsg_delete
-        displayName: az network nsg delete
-      - name: list
-        uid: az_network_nsg_list
-        displayName: az network nsg list
-      - name: show
-        uid: az_network_nsg_show
-        displayName: az network nsg show
-      - name: update
-        uid: az_network_nsg_update
-        displayName: az network nsg update
-      - name: Rules
-        displayName: az network nsg rule
+          - name: Summary
+            uid: az_devops_security_permission
+            displayName: az devops security permission
+          - name: namespace
+            uid: az_devops_security_permission_namespace
+            displayName: az devops security permission namespace
+            items: []
+      - name: service-endpoint
         items:
-        - name: Overview
-          uid: az_network_nsg_rule
-          displayName: az network nsg rule
-        - name: create
-          uid: az_network_nsg_rule_create
-          displayName: az network nsg rule create
-        - name: delete
-          uid: az_network_nsg_rule_delete
-          displayName: az network nsg rule delete
-        - name: list
-          uid: az_network_nsg_rule_list
-          displayName: az network nsg rule list
-        - name: show
-          uid: az_network_nsg_rule_show
-          displayName: az network nsg rule show
-        - name: update
-          uid: az_network_nsg_rule_update
-          displayName: az network nsg rule update
-    - name: Public IP addresses
-      displayName: az network public-ip
-      items:
-      - name: Overview
-        uid: az_network_public_ip
-        displayName: az network public-ip
-      - name: create
-        uid: az_network_public_ip_create
-        displayName: az network public-ip create
-      - name: delete
-        uid: az_network_public_ip_delete
-        displayName: az network public-ip delete
-      - name: list
-        uid: az_network_public_ip_list
-        displayName: az network public-ip list
-      - name: show
-        uid: az_network_public_ip_show
-        displayName: az network public-ip show
-      - name: update
-        uid: az_network_public_ip_update
-        displayName: az network public-ip update
-      - name: prefix
-        displayName: az network public-ip prefix
+        - name: Summary
+          uid: az_devops_service-endpoint
+          displayName: az devops service-endpoint
+        - name: azurerm
+          uid: az_devops_service-endpoint_azurerm
+          displayName: az devops service-endpoint azurerm
+          items: []
+        - name: github
+          uid: az_devops_service-endpoint_github
+          displayName: az devops service-endpoint github
+          items: []
+      - name: team
+        uid: az_devops_team
+        displayName: az devops team
+        items: []
+      - name: user
+        uid: az_devops_user
+        displayName: az devops user
+        items: []
+      - name: wiki
         items:
-        - name: Overview
-          uid: az_network_public_ip_prefix
-          displayName: az network public-ip prefix
-        - name: create
-          uid: az_network_public_ip_prefix_create
-          displayName: az network public-ip prefix create
-        - name: list
-          uid: az_network_public_ip_prefix_list
-          displayName: az network public-ip prefix list
-    - name: Route tables
-      displayName: az network route-table
+        - name: Summary
+          uid: az_devops_wiki
+          displayName: az devops wiki
+        - name: page
+          uid: az_devops_wiki_page
+          displayName: az devops wiki page
+          items: []
+  - name: Azure DevTest Labs
+    uid: sp-Azure_DevTest_Labs
+    displayName: Azure DevTest Labs
+    items: []
+  - name: Azure Digital Twins
+    items:
+    - name: Summary
+      uid: sp-Azure_Digital_Twins
+      displayName: Azure Digital Twins
+    - name: dt
       items:
-      - name: Overview
-        uid: az_network_route_table
-        displayName: az network route-table
-      - name: create
-        uid: az_network_route_table_create
-        displayName: az network route-table create
-      - name: delete
-        uid: az_network_route_table_delete
-        displayName: az network route-table delete
-      - name: list
-        uid: az_network_route_table_list
-        displayName: az network route-table list
-      - name: show
-        uid: az_network_route_table_show
-        displayName: az network route-table show
-      - name: update
-        uid: az_network_route_table_update
-        displayName: az network route-table update
-      - name: Routes
-        displayName: az network route-table route
+      - name: Summary
+        uid: az_dt
+        displayName: az dt
+      - name: endpoint
         items:
-        - name: Overview
-          uid: az_network_route_table_route
-          displayName: az network route-table route
+        - name: Summary
+          uid: az_dt_endpoint
+          displayName: az dt endpoint
         - name: create
-          uid: az_network_route_table_route_create
-          displayName: az network route-table route create
-        - name: delete
-          uid: az_network_route_table_route_delete
-          displayName: az network route-table route delete
-        - name: list
-          uid: az_network_route_table_route_list
-          displayName: az network route-table route list
-        - name: show
-          uid: az_network_route_table_route_show
-          displayName: az network route-table route show
-        - name: update
-          uid: az_network_route_table_route_update
-          displayName: az network route-table route update
-    - name: Traffic Manager
-      displayName: az network traffic-manager
-      items:
-      - name: Overview
-        uid: az_network_traffic_manager
-        displayName: az network traffic-manager
-      - name: End points
-        displayName: az network traffic-manager endpoint
+          uid: az_dt_endpoint_create
+          displayName: az dt endpoint create
+          items: []
+      - name: model
+        uid: az_dt_model
+        displayName: az dt model
+        items: []
+      - name: network
         items:
-        - name: Overview
-          uid: az_network_traffic_manager_endpoint
-          displayName: az network traffic-manager endpoint
-        - name: create
-          uid: az_network_traffic_manager_endpoint_create
-          displayName: az network traffic-manager endpoint create
-        - name: delete
-          uid: az_network_traffic_manager_endpoint_delete
-          displayName: az network traffic-manager endpoint delete
-        - name: list
-          uid: az_network_traffic_manager_endpoint_list
-          displayName: az network traffic-manager endpoint list
-        - name: show
-          uid: az_network_traffic_manager_endpoint_show
-          displayName: az network traffic-manager endpoint show
-        - name: show-geographic-hierarchy
-          uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-          displayName: az network traffic-manager endpoint show-geographic-hierarchy
-        - name: update
-          uid: az_network_traffic_manager_endpoint_update
-          displayName: az network traffic-manager endpoint update
-      - name: Profiles
-        displayName: az network traffic-manager profile
+        - name: Summary
+          uid: az_dt_network
+          displayName: az dt network
+        - name: private-endpoint
+          items:
+          - name: Summary
+            uid: az_dt_network_private-endpoint
+            displayName: az dt network private-endpoint
+          - name: connection
+            uid: az_dt_network_private-endpoint_connection
+            displayName: az dt network private-endpoint connection
+            items: []
+        - name: private-link
+          uid: az_dt_network_private-link
+          displayName: az dt network private-link
+          items: []
+      - name: role-assignment
+        uid: az_dt_role-assignment
+        displayName: az dt role-assignment
+        items: []
+      - name: route
+        uid: az_dt_route
+        displayName: az dt route
+        items: []
+      - name: twin
         items:
-        - name: Overview
-          uid: az_network_traffic_manager_profile
-          displayName: az network traffic-manager profile
-        - name: check-dns
-          uid: az_network_traffic_manager_profile_check_dns
-          displayName: az network traffic-manager profile check-dns
-        - name: create
-          uid: az_network_traffic_manager_profile_create
-          displayName: az network traffic-manager profile create
-        - name: delete
-          uid: az_network_traffic_manager_profile_delete
-          displayName: az network traffic-manager profile delete
-        - name: list
-          uid: az_network_traffic_manager_profile_list
-          displayName: az network traffic-manager profile list
-        - name: show
-          uid: az_network_traffic_manager_profile_show
-          displayName: az network traffic-manager profile show
-        - name: update
-          uid: az_network_traffic_manager_profile_update
-          displayName: az network traffic-manager profile update
-    - name: VPN connections
-      displayName: az network vpn-connection
+        - name: Summary
+          uid: az_dt_twin
+          displayName: az dt twin
+        - name: component
+          uid: az_dt_twin_component
+          displayName: az dt twin component
+          items: []
+        - name: relationship
+          uid: az_dt_twin_relationship
+          displayName: az dt twin relationship
+          items: []
+        - name: telemetry
+          uid: az_dt_twin_telemetry
+          displayName: az dt twin telemetry
+          items: []
+  - name: Azure Disk Pool Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Disk_Pool_Service
+      displayName: Azure Disk Pool Service
+    - name: disk-pool
+      items:
+      - name: Summary
+        uid: az_disk-pool
+        displayName: az disk-pool
+      - name: iscsi-target
+        uid: az_disk-pool_iscsi-target
+        displayName: az disk-pool iscsi-target
+        items: []
+  - name: Azure Disk Storage
+    items:
+    - name: Summary
+      uid: sp-Azure_Disk_Storage
+      displayName: Azure Disk Storage
+    - name: disk - Managed Disks
+      uid: az_disk
+      displayName: az disk
+      items: []
+  - name: Azure Event Grid
+    items:
+    - name: Summary
+      uid: sp-Azure_Event_Grid
+      displayName: Azure Event Grid
+    - name: eventgrid
       items:
-      - name: Overview
-        uid: az_network_vpn_connection
-        displayName: az network vpn-connection
-      - name: create
-        uid: az_network_vpn_connection_create
-        displayName: az network vpn-connection create
-      - name: delete
-        uid: az_network_vpn_connection_delete
-        displayName: az network vpn-connection delete
-      - name: list
-        uid: az_network_vpn_connection_list
-        displayName: az network vpn-connection list
-      - name: show
-        uid: az_network_vpn_connection_show
-        displayName: az network vpn-connection show
-      - name: update
-        uid: az_network_vpn_connection_update
-        displayName: az network vpn-connection update
-      - name: Shared keys
-        displayName: az network vpn-connection shared-key
-        items:
-        - name: Overview
-          uid: az_network_vpn_connection_shared_key
-          displayName: az network vpn-connection shared-key
-        - name: reset
-          uid: az_network_vpn_connection_shared_key_reset
-          displayName: az network vpn-connection shared-key reset
-        - name: show
-          uid: az_network_vpn_connection_shared_key_show
-          displayName: az network vpn-connection shared-key show
-        - name: update
-          uid: az_network_vpn_connection_shared_key_update
-          displayName: az network vpn-connection shared-key update
-      - name: ipsec-policy
-        displayName: az network vpn-connection ipsec-policy
+      - name: Summary
+        uid: az_eventgrid
+        displayName: az eventgrid
+      - name: domain
         items:
-        - name: Overview
-          uid: az_network_vpn_connection_ipsec_policy
-          displayName: az network vpn-connection ipsec-policy
-        - name: add
-          uid: az_network_vpn_connection_ipsec_policy_add
-          displayName: az network vpn-connection ipsec-policy add
-        - name: clear
-          uid: az_network_vpn_connection_ipsec_policy_clear
-          displayName: az network vpn-connection ipsec-policy clear
-        - name: list
-          uid: az_network_vpn_connection_ipsec_policy_list
-          displayName: az network vpn-connection ipsec-policy list
-    - name: Virtual Network
-      displayName: az network vnet
-      items:
-      - name: Overview
-        uid: az_network_vnet
-        displayName: az network vnet
-      - name: check-ip-address
-        uid: az_network_vnet_check_ip_address
-        displayName: az network vnet check-ip-address
-      - name: create
-        uid: az_network_vnet_create
-        displayName: az network vnet create
-      - name: delete
-        uid: az_network_vnet_delete
-        displayName: az network vnet delete
-      - name: list
-        uid: az_network_vnet_list
-        displayName: az network vnet list
-      - name: list-available-ips
-        uid: az_network_vnet_list_available_ips
-        displayName: az network vnet list-available-ips
-      - name: list-endpoint-services
-        uid: az_network_vnet_list_endpoint_services
-        displayName: az network vnet list-endpoint-services
-      - name: show
-        uid: az_network_vnet_show
-        displayName: az network vnet show
-      - name: update
-        uid: az_network_vnet_update
-        displayName: az network vnet update
-      - name: Peering connections
-        displayName: az network vnet peering
-        items:
-        - name: Overview
-          uid: az_network_vnet_peering
-          displayName: az network vnet peering
-        - name: create
-          uid: az_network_vnet_peering_create
-          displayName: az network vnet peering create
-        - name: delete
-          uid: az_network_vnet_peering_delete
-          displayName: az network vnet peering delete
-        - name: list
-          uid: az_network_vnet_peering_list
-          displayName: az network vnet peering list
-        - name: show
-          uid: az_network_vnet_peering_show
-          displayName: az network vnet peering show
-        - name: update
-          uid: az_network_vnet_peering_update
-          displayName: az network vnet peering update
-      - name: Subnets
-        displayName: az network vnet subnet
-        items:
-        - name: Overview
-          uid: az_network_vnet_subnet
-          displayName: az network vnet subnet
-        - name: create
-          uid: az_network_vnet_subnet_create
-          displayName: az network vnet subnet create
-        - name: delete
-          uid: az_network_vnet_subnet_delete
-          displayName: az network vnet subnet delete
-        - name: list
-          uid: az_network_vnet_subnet_list
-          displayName: az network vnet subnet list
-        - name: show
-          uid: az_network_vnet_subnet_show
-          displayName: az network vnet subnet show
-        - name: update
-          uid: az_network_vnet_subnet_update
-          displayName: az network vnet subnet update
-    - name: Virtual Network gateways
-      displayName: az network vnet-gateway
-      items:
-      - name: Overview
-        uid: az_network_vnet_gateway
-        displayName: az network vnet-gateway
-      - name: create
-        uid: az_network_vnet_gateway_create
-        displayName: az network vnet-gateway create
-      - name: delete
-        uid: az_network_vnet_gateway_delete
-        displayName: az network vnet-gateway delete
-      - name: list
-        uid: az_network_vnet_gateway_list
-        displayName: az network vnet-gateway list
-      - name: list-advertised-routes
-        uid: az_network_vnet_gateway_list_advertised_routes
-        displayName: az network vnet-gateway list-advertised-routes
-      - name: list-bgp-peer-status
-        uid: az_network_vnet_gateway_list_bgp_peer_status
-        displayName: az network vnet-gateway list-bgp-peer-status
-      - name: list-learned-routes
-        uid: az_network_vnet_gateway_list_learned_routes
-        displayName: az network vnet-gateway list-learned-routes
-      - name: reset
-        uid: az_network_vnet_gateway_reset
-        displayName: az network vnet-gateway reset
-      - name: show
-        uid: az_network_vnet_gateway_show
-        displayName: az network vnet-gateway show
-      - name: update
-        uid: az_network_vnet_gateway_update
-        displayName: az network vnet-gateway update
-      - name: wait
-        uid: az_network_vnet_gateway_wait
-        displayName: az network vnet-gateway wait
-      - name: Revoked certificates
-        displayName: az network vnet-gateway revoked-cert
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_revoked_cert
-          displayName: az network vnet-gateway revoked-cert
-        - name: create
-          uid: az_network_vnet_gateway_revoked_cert_create
-          displayName: az network vnet-gateway revoked-cert create
-        - name: delete
-          uid: az_network_vnet_gateway_revoked_cert_delete
-          displayName: az network vnet-gateway revoked-cert delete
-      - name: Root certificates
-        displayName: az network vnet-gateway root-cert
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_root_cert
-          displayName: az network vnet-gateway root-cert
-        - name: create
-          uid: az_network_vnet_gateway_root_cert_create
-          displayName: az network vnet-gateway root-cert create
-        - name: delete
-          uid: az_network_vnet_gateway_root_cert_delete
-          displayName: az network vnet-gateway root-cert delete
-      - name: vpn-client
-        displayName: az network vnet-gateway vpn-client
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_vpn_client
-          displayName: az network vnet-gateway vpn-client
-        - name: generate
-          uid: az_network_vnet_gateway_vpn_client_generate
-          displayName: az network vnet-gateway vpn-client generate
-        - name: show-url
-          uid: az_network_vnet_gateway_vpn_client_show_url
-          displayName: az network vnet-gateway vpn-client show-url
-    - name: asg
-      displayName: az network asg
-      items:
-      - name: Overview
-        uid: az_network_asg
-        displayName: az network asg
-      - name: create
-        uid: az_network_asg_create
-        displayName: az network asg create
-      - name: delete
-        uid: az_network_asg_delete
-        displayName: az network asg delete
-      - name: list
-        uid: az_network_asg_list
-        displayName: az network asg list
-      - name: show
-        uid: az_network_asg_show
-        displayName: az network asg show
-      - name: update
-        uid: az_network_asg_update
-        displayName: az network asg update
-    - name: bastion
-      displayName: az network bastion
-      items:
-      - name: Overview
-        uid: az_network_bastion
-        displayName: az network bastion
-      - name: create
-        uid: az_network_bastion_create
-        displayName: az network bastion create
-      - name: list
-        uid: az_network_bastion_list
-        displayName: az network bastion list
-    - name: private-dns
-      displayName: az network private-dns
-      items:
-      - name: Overview
-        uid: az_network_private_dns
-        displayName: az network private-dns
-      - name: link
-        displayName: az network private-dns link
-        items:
-        - name: Overview
-          uid: az_network_private_dns_link
-          displayName: az network private-dns link
-        - name: vnet
-          displayName: az network private-dns link vnet
-          items:
-          - name: Overview
-            uid: az_network_private_dns_link_vnet
-            displayName: az network private-dns link vnet
-          - name: create
-            uid: az_network_private_dns_link_vnet_create
-            displayName: az network private-dns link vnet create
-          - name: delete
-            uid: az_network_private_dns_link_vnet_delete
-            displayName: az network private-dns link vnet delete
-          - name: list
-            uid: az_network_private_dns_link_vnet_list
-            displayName: az network private-dns link vnet list
-          - name: show
-            uid: az_network_private_dns_link_vnet_show
-            displayName: az network private-dns link vnet show
-          - name: update
-            uid: az_network_private_dns_link_vnet_update
-            displayName: az network private-dns link vnet update
-          - name: wait
-            uid: az_network_private_dns_link_vnet_wait
-            displayName: az network private-dns link vnet wait
-      - name: record-set
-        displayName: az network private-dns record-set
+        - name: Summary
+          uid: az_eventgrid_domain
+          displayName: az eventgrid domain
+        - name: key
+          uid: az_eventgrid_domain_key
+          displayName: az eventgrid domain key
+          items: []
+        - name: private-endpoint-connection
+          uid: az_eventgrid_domain_private-endpoint-connection
+          displayName: az eventgrid domain private-endpoint-connection
+          items: []
+        - name: private-link-resource
+          uid: az_eventgrid_domain_private-link-resource
+          displayName: az eventgrid domain private-link-resource
+          items: []
+        - name: topic
+          uid: az_eventgrid_domain_topic
+          displayName: az eventgrid domain topic
+          items: []
+      - name: event-subscription
+        uid: az_eventgrid_event-subscription
+        displayName: az eventgrid event-subscription
+        items: []
+      - name: extension-topic
+        uid: az_eventgrid_extension-topic
+        displayName: az eventgrid extension-topic
+        items: []
+      - name: partner
         items:
-        - name: Overview
-          uid: az_network_private_dns_record_set
-          displayName: az network private-dns record-set
-        - name: list
-          uid: az_network_private_dns_record_set_list
-          displayName: az network private-dns record-set list
-        - name: a
-          displayName: az network private-dns record-set a
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_a
-            displayName: az network private-dns record-set a
-          - name: add-record
-            uid: az_network_private_dns_record_set_a_add_record
-            displayName: az network private-dns record-set a add-record
-          - name: create
-            uid: az_network_private_dns_record_set_a_create
-            displayName: az network private-dns record-set a create
-          - name: delete
-            uid: az_network_private_dns_record_set_a_delete
-            displayName: az network private-dns record-set a delete
-          - name: list
-            uid: az_network_private_dns_record_set_a_list
-            displayName: az network private-dns record-set a list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_a_remove_record
-            displayName: az network private-dns record-set a remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_a_show
-            displayName: az network private-dns record-set a show
-          - name: update
-            uid: az_network_private_dns_record_set_a_update
-            displayName: az network private-dns record-set a update
-        - name: aaaa
-          displayName: az network private-dns record-set aaaa
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_aaaa
-            displayName: az network private-dns record-set aaaa
-          - name: add-record
-            uid: az_network_private_dns_record_set_aaaa_add_record
-            displayName: az network private-dns record-set aaaa add-record
-          - name: create
-            uid: az_network_private_dns_record_set_aaaa_create
-            displayName: az network private-dns record-set aaaa create
-          - name: delete
-            uid: az_network_private_dns_record_set_aaaa_delete
-            displayName: az network private-dns record-set aaaa delete
-          - name: list
-            uid: az_network_private_dns_record_set_aaaa_list
-            displayName: az network private-dns record-set aaaa list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_aaaa_remove_record
-            displayName: az network private-dns record-set aaaa remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_aaaa_show
-            displayName: az network private-dns record-set aaaa show
-          - name: update
-            uid: az_network_private_dns_record_set_aaaa_update
-            displayName: az network private-dns record-set aaaa update
-        - name: cname
-          displayName: az network private-dns record-set cname
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_cname
-            displayName: az network private-dns record-set cname
-          - name: create
-            uid: az_network_private_dns_record_set_cname_create
-            displayName: az network private-dns record-set cname create
-          - name: delete
-            uid: az_network_private_dns_record_set_cname_delete
-            displayName: az network private-dns record-set cname delete
-          - name: list
-            uid: az_network_private_dns_record_set_cname_list
-            displayName: az network private-dns record-set cname list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_cname_remove_record
-            displayName: az network private-dns record-set cname remove-record
-          - name: set-record
-            uid: az_network_private_dns_record_set_cname_set_record
-            displayName: az network private-dns record-set cname set-record
-          - name: show
-            uid: az_network_private_dns_record_set_cname_show
-            displayName: az network private-dns record-set cname show
-          - name: update
-            uid: az_network_private_dns_record_set_cname_update
-            displayName: az network private-dns record-set cname update
-        - name: mx
-          displayName: az network private-dns record-set mx
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_mx
-            displayName: az network private-dns record-set mx
-          - name: add-record
-            uid: az_network_private_dns_record_set_mx_add_record
-            displayName: az network private-dns record-set mx add-record
-          - name: create
-            uid: az_network_private_dns_record_set_mx_create
-            displayName: az network private-dns record-set mx create
-          - name: delete
-            uid: az_network_private_dns_record_set_mx_delete
-            displayName: az network private-dns record-set mx delete
-          - name: list
-            uid: az_network_private_dns_record_set_mx_list
-            displayName: az network private-dns record-set mx list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_mx_remove_record
-            displayName: az network private-dns record-set mx remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_mx_show
-            displayName: az network private-dns record-set mx show
-          - name: update
-            uid: az_network_private_dns_record_set_mx_update
-            displayName: az network private-dns record-set mx update
-        - name: ptr
-          displayName: az network private-dns record-set ptr
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_ptr
-            displayName: az network private-dns record-set ptr
-          - name: add-record
-            uid: az_network_private_dns_record_set_ptr_add_record
-            displayName: az network private-dns record-set ptr add-record
-          - name: create
-            uid: az_network_private_dns_record_set_ptr_create
-            displayName: az network private-dns record-set ptr create
-          - name: delete
-            uid: az_network_private_dns_record_set_ptr_delete
-            displayName: az network private-dns record-set ptr delete
-          - name: list
-            uid: az_network_private_dns_record_set_ptr_list
-            displayName: az network private-dns record-set ptr list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_ptr_remove_record
-            displayName: az network private-dns record-set ptr remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_ptr_show
-            displayName: az network private-dns record-set ptr show
-          - name: update
-            uid: az_network_private_dns_record_set_ptr_update
-            displayName: az network private-dns record-set ptr update
-        - name: soa
-          displayName: az network private-dns record-set soa
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_soa
-            displayName: az network private-dns record-set soa
-          - name: show
-            uid: az_network_private_dns_record_set_soa_show
-            displayName: az network private-dns record-set soa show
-          - name: update
-            uid: az_network_private_dns_record_set_soa_update
-            displayName: az network private-dns record-set soa update
-        - name: srv
-          displayName: az network private-dns record-set srv
+        - name: Summary
+          uid: az_eventgrid_partner
+          displayName: az eventgrid partner
+        - name: namespace
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_srv
-            displayName: az network private-dns record-set srv
-          - name: add-record
-            uid: az_network_private_dns_record_set_srv_add_record
-            displayName: az network private-dns record-set srv add-record
-          - name: create
-            uid: az_network_private_dns_record_set_srv_create
-            displayName: az network private-dns record-set srv create
-          - name: delete
-            uid: az_network_private_dns_record_set_srv_delete
-            displayName: az network private-dns record-set srv delete
-          - name: list
-            uid: az_network_private_dns_record_set_srv_list
-            displayName: az network private-dns record-set srv list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_srv_remove_record
-            displayName: az network private-dns record-set srv remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_srv_show
-            displayName: az network private-dns record-set srv show
-          - name: update
-            uid: az_network_private_dns_record_set_srv_update
-            displayName: az network private-dns record-set srv update
-        - name: txt
-          displayName: az network private-dns record-set txt
+          - name: Summary
+            uid: az_eventgrid_partner_namespace
+            displayName: az eventgrid partner namespace
+          - name: event-channel
+            uid: az_eventgrid_partner_namespace_event-channel
+            displayName: az eventgrid partner namespace event-channel
+            items: []
+          - name: key
+            uid: az_eventgrid_partner_namespace_key
+            displayName: az eventgrid partner namespace key
+            items: []
+        - name: registration
+          uid: az_eventgrid_partner_registration
+          displayName: az eventgrid partner registration
+          items: []
+        - name: topic
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_txt
-            displayName: az network private-dns record-set txt
-          - name: add-record
-            uid: az_network_private_dns_record_set_txt_add_record
-            displayName: az network private-dns record-set txt add-record
-          - name: create
-            uid: az_network_private_dns_record_set_txt_create
-            displayName: az network private-dns record-set txt create
-          - name: delete
-            uid: az_network_private_dns_record_set_txt_delete
-            displayName: az network private-dns record-set txt delete
-          - name: list
-            uid: az_network_private_dns_record_set_txt_list
-            displayName: az network private-dns record-set txt list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_txt_remove_record
-            displayName: az network private-dns record-set txt remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_txt_show
-            displayName: az network private-dns record-set txt show
-          - name: update
-            uid: az_network_private_dns_record_set_txt_update
-            displayName: az network private-dns record-set txt update
-      - name: zone
-        displayName: az network private-dns zone
+          - name: Summary
+            uid: az_eventgrid_partner_topic
+            displayName: az eventgrid partner topic
+          - name: event-subscription
+            uid: az_eventgrid_partner_topic_event-subscription
+            displayName: az eventgrid partner topic event-subscription
+            items: []
+      - name: system-topic
         items:
-        - name: Overview
-          uid: az_network_private_dns_zone
-          displayName: az network private-dns zone
-        - name: create
-          uid: az_network_private_dns_zone_create
-          displayName: az network private-dns zone create
-        - name: delete
-          uid: az_network_private_dns_zone_delete
-          displayName: az network private-dns zone delete
-        - name: export
-          uid: az_network_private_dns_zone_export
-          displayName: az network private-dns zone export
-        - name: import
-          uid: az_network_private_dns_zone_import
-          displayName: az network private-dns zone import
-        - name: list
-          uid: az_network_private_dns_zone_list
-          displayName: az network private-dns zone list
-        - name: show
-          uid: az_network_private_dns_zone_show
-          displayName: az network private-dns zone show
-        - name: update
-          uid: az_network_private_dns_zone_update
-          displayName: az network private-dns zone update
-        - name: wait
-          uid: az_network_private_dns_zone_wait
-          displayName: az network private-dns zone wait
-    - name: private-endpoint
-      displayName: az network private-endpoint
-      items:
-      - name: Overview
-        uid: az_network_private_endpoint
-        displayName: az network private-endpoint
-      - name: list
-        uid: az_network_private_endpoint_list
-        displayName: az network private-endpoint list
-    - name: private-endpoint-connection
-      displayName: az network private-endpoint-connection
-      items:
-      - name: Overview
-        uid: az_network_private_endpoint_connection
-        displayName: az network private-endpoint-connection
-      - name: approve
-        uid: az_network_private_endpoint_connection_approve
-        displayName: az network private-endpoint-connection approve
-      - name: delete
-        uid: az_network_private_endpoint_connection_delete
-        displayName: az network private-endpoint-connection delete
-      - name: list
-        uid: az_network_private_endpoint_connection_list
-        displayName: az network private-endpoint-connection list
-      - name: reject
-        uid: az_network_private_endpoint_connection_reject
-        displayName: az network private-endpoint-connection reject
-      - name: show
-        uid: az_network_private_endpoint_connection_show
-        displayName: az network private-endpoint-connection show
-    - name: private-link-resource
-      displayName: az network private-link-resource
-      items:
-      - name: Overview
-        uid: az_network_private_link_resource
-        displayName: az network private-link-resource
-      - name: list
-        uid: az_network_private_link_resource_list
-        displayName: az network private-link-resource list
-    - name: private-link-service
-      displayName: az network private-link-service
-      items:
-      - name: Overview
-        uid: az_network_private_link_service
-        displayName: az network private-link-service
-      - name: create
-        uid: az_network_private_link_service_create
-        displayName: az network private-link-service create
-      - name: list
-        uid: az_network_private_link_service_list
-        displayName: az network private-link-service list
-      - name: connection
-        displayName: az network private-link-service connection
+        - name: Summary
+          uid: az_eventgrid_system-topic
+          displayName: az eventgrid system-topic
+        - name: event-subscription
+          uid: az_eventgrid_system-topic_event-subscription
+          displayName: az eventgrid system-topic event-subscription
+          items: []
+      - name: topic
         items:
-        - name: Overview
-          uid: az_network_private_link_service_connection
-          displayName: az network private-link-service connection
-        - name: update
-          uid: az_network_private_link_service_connection_update
-          displayName: az network private-link-service connection update
-    - name: profile
-      displayName: az network profile
-      items:
-      - name: Overview
-        uid: az_network_profile
-        displayName: az network profile
-      - name: list
-        uid: az_network_profile_list
-        displayName: az network profile list
-    - name: route-filter
-      displayName: az network route-filter
+        - name: Summary
+          uid: az_eventgrid_topic
+          displayName: az eventgrid topic
+        - name: key
+          uid: az_eventgrid_topic_key
+          displayName: az eventgrid topic key
+          items: []
+        - name: private-endpoint-connection
+          uid: az_eventgrid_topic_private-endpoint-connection
+          displayName: az eventgrid topic private-endpoint-connection
+          items: []
+        - name: private-link-resource
+          uid: az_eventgrid_topic_private-link-resource
+          displayName: az eventgrid topic private-link-resource
+          items: []
+      - name: topic-type
+        uid: az_eventgrid_topic-type
+        displayName: az eventgrid topic-type
+        items: []
+  - name: Azure Event Hubs
+    uid: sp-Azure_Event_Hubs
+    displayName: Azure Event Hubs
+    items: []
+  - name: Azure File Sync
+    items:
+    - name: Summary
+      uid: sp-Azure_File_Sync
+      displayName: Azure File Sync
+    - name: storagesync
       items:
-      - name: Overview
-        uid: az_network_route_filter
-        displayName: az network route-filter
-      - name: create
-        uid: az_network_route_filter_create
-        displayName: az network route-filter create
-      - name: delete
-        uid: az_network_route_filter_delete
-        displayName: az network route-filter delete
-      - name: list
-        uid: az_network_route_filter_list
-        displayName: az network route-filter list
-      - name: show
-        uid: az_network_route_filter_show
-        displayName: az network route-filter show
-      - name: update
-        uid: az_network_route_filter_update
-        displayName: az network route-filter update
-      - name: rule
-        displayName: az network route-filter rule
+      - name: Summary
+        uid: az_storagesync
+        displayName: az storagesync
+      - name: registered-server
+        uid: az_storagesync_registered-server
+        displayName: az storagesync registered-server
+        items: []
+      - name: sync-group
         items:
-        - name: Overview
-          uid: az_network_route_filter_rule
-          displayName: az network route-filter rule
-        - name: create
-          uid: az_network_route_filter_rule_create
-          displayName: az network route-filter rule create
-        - name: delete
-          uid: az_network_route_filter_rule_delete
-          displayName: az network route-filter rule delete
-        - name: list
-          uid: az_network_route_filter_rule_list
-          displayName: az network route-filter rule list
-        - name: list-service-communities
-          uid: az_network_route_filter_rule_list_service_communities
-          displayName: az network route-filter rule list-service-communities
-        - name: show
-          uid: az_network_route_filter_rule_show
-          displayName: az network route-filter rule show
-        - name: update
-          uid: az_network_route_filter_rule_update
-          displayName: az network route-filter rule update
-    - name: security-partner-provider
-      displayName: az network security-partner-provider
+        - name: Summary
+          uid: az_storagesync_sync-group
+          displayName: az storagesync sync-group
+        - name: cloud-endpoint
+          uid: az_storagesync_sync-group_cloud-endpoint
+          displayName: az storagesync sync-group cloud-endpoint
+          items: []
+        - name: server-endpoint
+          uid: az_storagesync_sync-group_server-endpoint
+          displayName: az storagesync sync-group server-endpoint
+          items: []
+  - name: Azure Front Door
+    uid: sp-Azure_Front_Door
+    displayName: Azure Front Door
+    items: []
+  - name: Azure Functions
+    items:
+    - name: Summary
+      uid: sp-Azure_Functions
+      displayName: Azure Functions
+    - name: functionapp
       items:
-      - name: Overview
-        uid: az_network_security_partner_provider
-        displayName: az network security-partner-provider
-      - name: create
-        uid: az_network_security_partner_provider_create
-        displayName: az network security-partner-provider create
-      - name: list
-        uid: az_network_security_partner_provider_list
-        displayName: az network security-partner-provider list
-    - name: service-endpoint
-      displayName: az network service-endpoint
+      - name: Summary
+        uid: az_functionapp
+        displayName: az functionapp
+      - name: app
+        uid: az_functionapp_app
+        displayName: az functionapp app
+        items: []
+  - name: Azure HDInsight
+    items:
+    - name: Summary
+      uid: sp-Azure_HDInsight
+      displayName: Azure HDInsight
+    - name: hdinsight
+      items:
+      - name: Summary
+        uid: az_hdinsight
+        displayName: az hdinsight
+      - name: application
+        uid: az_hdinsight_application
+        displayName: az hdinsight application
+        items: []
+      - name: autoscale
+        items:
+        - name: Summary
+          uid: az_hdinsight_autoscale
+          displayName: az hdinsight autoscale
+        - name: condition
+          uid: az_hdinsight_autoscale_condition
+          displayName: az hdinsight autoscale condition
+          items: []
+      - name: host
+        uid: az_hdinsight_host
+        displayName: az hdinsight host
+        items: []
+      - name: monitor
+        uid: az_hdinsight_monitor
+        displayName: az hdinsight monitor
+        items: []
+      - name: script-action
+        uid: az_hdinsight_script-action
+        displayName: az hdinsight script-action
+        items: []
+  - name: Azure HPC Cache
+    items:
+    - name: Summary
+      uid: sp-Azure_HPC_Cache
+      displayName: Azure HPC Cache
+    - name: hpc-cache
       items:
-      - name: Overview
-        uid: az_network_service_endpoint
-        displayName: az network service-endpoint
-      - name: list
-        uid: az_network_service_endpoint_list
-        displayName: az network service-endpoint list
-      - name: policy
-        displayName: az network service-endpoint policy
-        items:
-        - name: Overview
-          uid: az_network_service_endpoint_policy
-          displayName: az network service-endpoint policy
-        - name: create
-          uid: az_network_service_endpoint_policy_create
-          displayName: az network service-endpoint policy create
-        - name: list
-          uid: az_network_service_endpoint_policy_list
-          displayName: az network service-endpoint policy list
-      - name: policy-definition
-        displayName: az network service-endpoint policy-definition
-        items:
-        - name: Overview
-          uid: az_network_service_endpoint_policy_definition
-          displayName: az network service-endpoint policy-definition
-        - name: create
-          uid: az_network_service_endpoint_policy_definition_create
-          displayName: az network service-endpoint policy-definition create
-    - name: vrouter
-      displayName: az network vrouter
+      - name: Summary
+        uid: az_hpc-cache
+        displayName: az hpc-cache
+      - name: blob-storage-target
+        uid: az_hpc-cache_blob-storage-target
+        displayName: az hpc-cache blob-storage-target
+        items: []
+      - name: nfs-storage-target
+        uid: az_hpc-cache_nfs-storage-target
+        displayName: az hpc-cache nfs-storage-target
+        items: []
+      - name: skus
+        uid: az_hpc-cache_skus
+        displayName: az hpc-cache skus
+        items: []
+      - name: storage-target
+        uid: az_hpc-cache_storage-target
+        displayName: az hpc-cache storage-target
+        items: []
+      - name: usage-model
+        uid: az_hpc-cache_usage-model
+        displayName: az hpc-cache usage-model
+        items: []
+  - name: Azure IoT
+    items:
+    - name: Summary
+      uid: sp-Azure_IoT
+      displayName: Azure IoT
+    - name: iot
       items:
-      - name: Overview
-        uid: az_network_vrouter
-        displayName: az network vrouter
-      - name: create
-        uid: az_network_vrouter_create
-        displayName: az network vrouter create
-      - name: list
-        uid: az_network_vrouter_list
-        displayName: az network vrouter list
-      - name: peering
-        displayName: az network vrouter peering
+      - name: Summary
+        uid: az_iot
+        displayName: az iot
+      - name: central
         items:
-        - name: Overview
-          uid: az_network_vrouter_peering
-          displayName: az network vrouter peering
-        - name: create
-          uid: az_network_vrouter_peering_create
-          displayName: az network vrouter peering create
-    - name: watcher
-      displayName: az network watcher
-      items:
-      - name: Overview
-        uid: az_network_watcher
-        displayName: az network watcher
-      - name: configure
-        uid: az_network_watcher_configure
-        displayName: az network watcher configure
-      - name: list
-        uid: az_network_watcher_list
-        displayName: az network watcher list
-      - name: show-next-hop
-        uid: az_network_watcher_show_next_hop
-        displayName: az network watcher show-next-hop
-      - name: show-security-group-view
-        uid: az_network_watcher_show_security_group_view
-        displayName: az network watcher show-security-group-view
-      - name: show-topology
-        uid: az_network_watcher_show_topology
-        displayName: az network watcher show-topology
-      - name: test-connectivity
-        uid: az_network_watcher_test_connectivity
-        displayName: az network watcher test-connectivity
-      - name: test-ip-flow
-        uid: az_network_watcher_test_ip_flow
-        displayName: az network watcher test-ip-flow
-      - name: flow-log
-        displayName: az network watcher flow-log
+        - name: Summary
+          uid: az_iot_central
+          displayName: az iot central
+        - name: api-token
+          uid: az_iot_central_api-token
+          displayName: az iot central api-token
+          items: []
+        - name: device
+          items:
+          - name: Summary
+            uid: az_iot_central_device
+            displayName: az iot central device
+          - name: command
+            uid: az_iot_central_device_command
+            displayName: az iot central device command
+            items: []
+          - name: twin
+            uid: az_iot_central_device_twin
+            displayName: az iot central device twin
+            items: []
+        - name: device-template
+          uid: az_iot_central_device-template
+          displayName: az iot central device-template
+          items: []
+        - name: diagnostics
+          uid: az_iot_central_diagnostics
+          displayName: az iot central diagnostics
+          items: []
+        - name: user
+          uid: az_iot_central_user
+          displayName: az iot central user
+          items: []
+      - name: device
+        items:
+        - name: Summary
+          uid: az_iot_device
+          displayName: az iot device
+        - name: c2d-message
+          uid: az_iot_device_c2d-message
+          displayName: az iot device c2d-message
+          items: []
+      - name: dps
         items:
-        - name: Overview
-          uid: az_network_watcher_flow_log
-          displayName: az network watcher flow-log
-        - name: configure
-          uid: az_network_watcher_flow_log_configure
-          displayName: az network watcher flow-log configure
-        - name: show
-          uid: az_network_watcher_flow_log_show
-          displayName: az network watcher flow-log show
-      - name: packet-capture
-        displayName: az network watcher packet-capture
+        - name: Summary
+          uid: az_iot_dps
+          displayName: az iot dps
+        - name: enrollment
+          uid: az_iot_dps_enrollment
+          displayName: az iot dps enrollment
+          items: []
+        - name: enrollment-group
+          uid: az_iot_dps_enrollment-group
+          displayName: az iot dps enrollment-group
+          items: []
+        - name: registration
+          uid: az_iot_dps_registration
+          displayName: az iot dps registration
+          items: []
+      - name: edge
         items:
-        - name: Overview
-          uid: az_network_watcher_packet_capture
-          displayName: az network watcher packet-capture
-        - name: create
-          uid: az_network_watcher_packet_capture_create
-          displayName: az network watcher packet-capture create
-        - name: delete
-          uid: az_network_watcher_packet_capture_delete
-          displayName: az network watcher packet-capture delete
-        - name: list
-          uid: az_network_watcher_packet_capture_list
-          displayName: az network watcher packet-capture list
-        - name: show
-          uid: az_network_watcher_packet_capture_show
-          displayName: az network watcher packet-capture show
-        - name: show-status
-          uid: az_network_watcher_packet_capture_show_status
-          displayName: az network watcher packet-capture show-status
-        - name: stop
-          uid: az_network_watcher_packet_capture_stop
-          displayName: az network watcher packet-capture stop
-      - name: troubleshooting
-        displayName: az network watcher troubleshooting
+        - name: Summary
+          uid: az_iot_edge
+          displayName: az iot edge
+        - name: deployment
+          uid: az_iot_edge_deployment
+          displayName: az iot edge deployment
+          items: []
+      - name: hub
         items:
-        - name: Overview
-          uid: az_network_watcher_troubleshooting
-          displayName: az network watcher troubleshooting
-        - name: show
-          uid: az_network_watcher_troubleshooting_show
-          displayName: az network watcher troubleshooting show
-        - name: start
-          uid: az_network_watcher_troubleshooting_start
-          displayName: az network watcher troubleshooting start
-  - name: Resource groups
-    displayName: az group
+        - name: Summary
+          uid: az_iot_hub
+          displayName: az iot hub
+        - name: configuration
+          uid: az_iot_hub_configuration
+          displayName: az iot hub configuration
+          items: []
+        - name: connection-string
+          uid: az_iot_hub_connection-string
+          displayName: az iot hub connection-string
+          items: []
+        - name: device-identity
+          items:
+          - name: Summary
+            uid: az_iot_hub_device-identity
+            displayName: az iot hub device-identity
+          - name: children
+            uid: az_iot_hub_device-identity_children
+            displayName: az iot hub device-identity children
+            items: []
+          - name: connection-string
+            uid: az_iot_hub_device-identity_connection-string
+            displayName: az iot hub device-identity connection-string
+            items: []
+          - name: parent
+            uid: az_iot_hub_device-identity_parent
+            displayName: az iot hub device-identity parent
+            items: []
+        - name: device-twin
+          uid: az_iot_hub_device-twin
+          displayName: az iot hub device-twin
+          items: []
+        - name: digital-twin
+          uid: az_iot_hub_digital-twin
+          displayName: az iot hub digital-twin
+          items: []
+        - name: distributed-tracing
+          uid: az_iot_hub_distributed-tracing
+          displayName: az iot hub distributed-tracing
+          items: []
+        - name: job
+          uid: az_iot_hub_job
+          displayName: az iot hub job
+          items: []
+        - name: module-identity
+          items:
+          - name: Summary
+            uid: az_iot_hub_module-identity
+            displayName: az iot hub module-identity
+          - name: connection-string
+            uid: az_iot_hub_module-identity_connection-string
+            displayName: az iot hub module-identity connection-string
+            items: []
+        - name: module-twin
+          uid: az_iot_hub_module-twin
+          displayName: az iot hub module-twin
+          items: []
+      - name: product
+        items:
+        - name: Summary
+          uid: az_iot_product
+          displayName: az iot product
+        - name: requirement
+          uid: az_iot_product_requirement
+          displayName: az iot product requirement
+          items: []
+        - name: test
+          items:
+          - name: Summary
+            uid: az_iot_product_test
+            displayName: az iot product test
+          - name: case
+            uid: az_iot_product_test_case
+            displayName: az iot product test case
+            items: []
+          - name: run
+            uid: az_iot_product_test_run
+            displayName: az iot product test run
+            items: []
+          - name: task
+            uid: az_iot_product_test_task
+            displayName: az iot product test task
+            items: []
+  - name: Azure Key Vault
     items:
-    - name: Overview
-      uid: az_group
-      displayName: az group
-    - name: create
-      uid: az_group_create
-      displayName: az group create
-    - name: delete
-      uid: az_group_delete
-      displayName: az group delete
-    - name: exists
-      uid: az_group_exists
-      displayName: az group exists
-    - name: export
-      uid: az_group_export
-      displayName: az group export
-    - name: list
-      uid: az_group_list
-      displayName: az group list
-    - name: show
-      uid: az_group_show
-      displayName: az group show
-    - name: update
-      uid: az_group_update
-      displayName: az group update
-    - name: wait
-      uid: az_group_wait
-      displayName: az group wait
-    - name: Deployments
-      displayName: az group deployment
+    - name: Summary
+      uid: sp-Azure_Key_Vault
+      displayName: Azure Key Vault
+    - name: keyvault
       items:
-      - name: Overview
-        uid: az_group_deployment
-        displayName: az group deployment
-      - name: cancel
-        uid: az_group_deployment_cancel
-        displayName: az group deployment cancel
-      - name: create
-        uid: az_group_deployment_create
-        displayName: az group deployment create
-      - name: delete
-        uid: az_group_deployment_delete
-        displayName: az group deployment delete
-      - name: export
-        uid: az_group_deployment_export
-        displayName: az group deployment export
-      - name: list
-        uid: az_group_deployment_list
-        displayName: az group deployment list
-      - name: show
-        uid: az_group_deployment_show
-        displayName: az group deployment show
-      - name: validate
-        uid: az_group_deployment_validate
-        displayName: az group deployment validate
-      - name: wait
-        uid: az_group_deployment_wait
-        displayName: az group deployment wait
-      - name: Operations
-        displayName: az group deployment operation
+      - name: Summary
+        uid: az_keyvault
+        displayName: az keyvault
+      - name: certificate
         items:
-        - name: Overview
-          uid: az_group_deployment_operation
-          displayName: az group deployment operation
-        - name: list
-          uid: az_group_deployment_operation_list
-          displayName: az group deployment operation list
-        - name: show
-          uid: az_group_deployment_operation_show
-          displayName: az group deployment operation show
-    - name: lock
-      displayName: az group lock
-      items:
-      - name: Overview
-        uid: az_group_lock
-        displayName: az group lock
-      - name: create
-        uid: az_group_lock_create
-        displayName: az group lock create
-      - name: delete
-        uid: az_group_lock_delete
-        displayName: az group lock delete
-      - name: list
-        uid: az_group_lock_list
-        displayName: az group lock list
-      - name: show
-        uid: az_group_lock_show
-        displayName: az group lock show
-      - name: update
-        uid: az_group_lock_update
-        displayName: az group lock update
-  - name: Resource policies
-    displayName: az policy
+        - name: Summary
+          uid: az_keyvault_certificate
+          displayName: az keyvault certificate
+        - name: contact
+          uid: az_keyvault_certificate_contact
+          displayName: az keyvault certificate contact
+          items: []
+        - name: issuer
+          items:
+          - name: Summary
+            uid: az_keyvault_certificate_issuer
+            displayName: az keyvault certificate issuer
+          - name: admin
+            uid: az_keyvault_certificate_issuer_admin
+            displayName: az keyvault certificate issuer admin
+            items: []
+        - name: pending
+          uid: az_keyvault_certificate_pending
+          displayName: az keyvault certificate pending
+          items: []
+      - name: key
+        uid: az_keyvault_key
+        displayName: az keyvault key
+        items: []
+      - name: secret
+        uid: az_keyvault_secret
+        displayName: az keyvault secret
+        items: []
+  - name: Azure Kubernetes Configuration Service
     items:
-    - name: Overview
-      uid: az_policy
-      displayName: az policy
-    - name: Assignments
-      displayName: az policy assignment
-      items:
-      - name: Overview
-        uid: az_policy_assignment
-        displayName: az policy assignment
-      - name: create
-        uid: az_policy_assignment_create
-        displayName: az policy assignment create
-      - name: delete
-        uid: az_policy_assignment_delete
-        displayName: az policy assignment delete
-      - name: list
-        uid: az_policy_assignment_list
-        displayName: az policy assignment list
-      - name: show
-        uid: az_policy_assignment_show
-        displayName: az policy assignment show
-    - name: Definitions
-      displayName: az policy definition
-      items:
-      - name: Overview
-        uid: az_policy_definition
-        displayName: az policy definition
-      - name: create
-        uid: az_policy_definition_create
-        displayName: az policy definition create
-      - name: delete
-        uid: az_policy_definition_delete
-        displayName: az policy definition delete
-      - name: list
-        uid: az_policy_definition_list
-        displayName: az policy definition list
-      - name: show
-        uid: az_policy_definition_show
-        displayName: az policy definition show
-      - name: update
-        uid: az_policy_definition_update
-        displayName: az policy definition update
-  - name: Resource providers
-    displayName: az provider
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Configuration_Service
+      displayName: Azure Kubernetes Configuration Service
+    - name: k8sconfiguration
+      uid: az_k8sconfiguration
+      displayName: az k8sconfiguration
+      items: []
+    - name: k8s-configuration
+      uid: az_k8s-configuration
+      displayName: az k8s-configuration
+      items: []
+  - name: Azure Kubernetes Extension Service
     items:
-    - name: Overview
-      uid: az_provider
-      displayName: az provider
-    - name: list
-      uid: az_provider_list
-      displayName: az provider list
-    - name: register
-      uid: az_provider_register
-      displayName: az provider register
-    - name: show
-      uid: az_provider_show
-      displayName: az provider show
-    - name: unregister
-      uid: az_provider_unregister
-      displayName: az provider unregister
-    - name: operation
-      displayName: az provider operation
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Extension_Service
+      displayName: Azure Kubernetes Extension Service
+    - name: k8s-extension
+      uid: az_k8s-extension
+      displayName: az k8s-extension
+      items: []
+  - name: Azure Kubernetes Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Service
+      displayName: Azure Kubernetes Service
+    - name: aks
       items:
-      - name: Overview
-        uid: az_provider_operation
-        displayName: az provider operation
-      - name: list
-        uid: az_provider_operation_list
-        displayName: az provider operation list
-      - name: show
-        uid: az_provider_operation_show
-        displayName: az provider operation show
-  - name: Resource tags
-    displayName: az tag
+      - name: Summary
+        uid: az_aks
+        displayName: az aks
+      - name: app
+        uid: az_aks_app
+        displayName: az aks app
+        items: []
+      - name: command
+        uid: az_aks_command
+        displayName: az aks command
+        items: []
+      - name: maintenanceconfiguration
+        uid: az_aks_maintenanceconfiguration
+        displayName: az aks maintenanceconfiguration
+        items: []
+      - name: nodepool
+        uid: az_aks_nodepool
+        displayName: az aks nodepool
+        items: []
+      - name: pod-identity
+        items:
+        - name: Summary
+          uid: az_aks_pod-identity
+          displayName: az aks pod-identity
+        - name: exception
+          uid: az_aks_pod-identity_exception
+          displayName: az aks pod-identity exception
+          items: []
+    - name: connectedk8s
+      uid: az_connectedk8s
+      displayName: az connectedk8s
+      items: []
+  - name: Azure Lab Services
     items:
-    - name: Overview
-      uid: az_tag
-      displayName: az tag
-    - name: add-value
-      uid: az_tag_add_value
-      displayName: az tag add-value
-    - name: create
-      uid: az_tag_create
-      displayName: az tag create
-    - name: delete
-      uid: az_tag_delete
-      displayName: az tag delete
-    - name: list
-      uid: az_tag_list
-      displayName: az tag list
-    - name: remove-value
-      uid: az_tag_remove_value
-      displayName: az tag remove-value
-  - name: Resources
-    displayName: az resource
+    - name: Summary
+      uid: sp-Azure_Lab_Services
+      displayName: Azure Lab Services
+    - name: hack
+      uid: az_hack
+      displayName: az hack
+      items: []
+  - name: Azure Logic Apps
     items:
-    - name: Overview
-      uid: az_resource
-      displayName: az resource
-    - name: create
-      uid: az_resource_create
-      displayName: az resource create
-    - name: delete
-      uid: az_resource_delete
-      displayName: az resource delete
-    - name: invoke-action
-      uid: az_resource_invoke_action
-      displayName: az resource invoke-action
-    - name: list
-      uid: az_resource_list
-      displayName: az resource list
-    - name: move
-      uid: az_resource_move
-      displayName: az resource move
-    - name: show
-      uid: az_resource_show
-      displayName: az resource show
-    - name: tag
-      uid: az_resource_tag
-      displayName: az resource tag
-    - name: update
-      uid: az_resource_update
-      displayName: az resource update
-    - name: wait
-      uid: az_resource_wait
-      displayName: az resource wait
-    - name: Links
-      displayName: az resource link
-      items:
-      - name: Overview
-        uid: az_resource_link
-        displayName: az resource link
-      - name: create
-        uid: az_resource_link_create
-        displayName: az resource link create
-      - name: delete
-        uid: az_resource_link_delete
-        displayName: az resource link delete
-      - name: list
-        uid: az_resource_link_list
-        displayName: az resource link list
-      - name: show
-        uid: az_resource_link_show
-        displayName: az resource link show
-      - name: update
-        uid: az_resource_link_update
-        displayName: az resource link update
-    - name: lock
-      displayName: az resource lock
+    - name: Summary
+      uid: sp-Azure_Logic_Apps
+      displayName: Azure Logic Apps
+    - name: logic
       items:
-      - name: Overview
-        uid: az_resource_lock
-        displayName: az resource lock
-      - name: create
-        uid: az_resource_lock_create
-        displayName: az resource lock create
-      - name: delete
-        uid: az_resource_lock_delete
-        displayName: az resource lock delete
-      - name: list
-        uid: az_resource_lock_list
-        displayName: az resource lock list
-      - name: show
-        uid: az_resource_lock_show
-        displayName: az resource lock show
-      - name: update
-        uid: az_resource_lock_update
-        displayName: az resource lock update
-  - name: Roles
-    displayName: az role
-    items:
-    - name: Overview
-      uid: az_role
-      displayName: az role
-    - name: Assignments
-      displayName: az role assignment
-      items:
-      - name: Overview
-        uid: az_role_assignment
-        displayName: az role assignment
-      - name: create
-        uid: az_role_assignment_create
-        displayName: az role assignment create
-      - name: delete
-        uid: az_role_assignment_delete
-        displayName: az role assignment delete
-      - name: list
-        uid: az_role_assignment_list
-        displayName: az role assignment list
-      - name: list-changelogs
-        uid: az_role_assignment_list_changelogs
-        displayName: az role assignment list-changelogs
-    - name: Definitions
-      displayName: az role definition
-      items:
-      - name: Overview
-        uid: az_role_definition
-        displayName: az role definition
-      - name: create
-        uid: az_role_definition_create
-        displayName: az role definition create
-      - name: delete
-        uid: az_role_definition_delete
-        displayName: az role definition delete
-      - name: list
-        uid: az_role_definition_list
-        displayName: az role definition list
-      - name: update
-        uid: az_role_definition_update
-        displayName: az role definition update
-  - name: Storage
-    displayName: az storage
+      - name: Summary
+        uid: az_logic
+        displayName: az logic
+      - name: integration-account
+        uid: az_logic_integration-account
+        displayName: az logic integration-account
+        items: []
+      - name: workflow
+        uid: az_logic_workflow
+        displayName: az logic workflow
+        items: []
+  - name: Azure Machine Learning
     items:
-    - name: Overview
-      uid: az_storage
-      displayName: az storage
-    - name: copy
-      uid: az_storage_copy
-      displayName: az storage copy
-    - name: remove
-      uid: az_storage_remove
-      displayName: az storage remove
-    - name: Accounts
-      displayName: az storage account
-      items:
-      - name: Overview
-        uid: az_storage_account
-        displayName: az storage account
-      - name: check-name
-        uid: az_storage_account_check_name
-        displayName: az storage account check-name
-      - name: create
-        uid: az_storage_account_create
-        displayName: az storage account create
-      - name: delete
-        uid: az_storage_account_delete
-        displayName: az storage account delete
-      - name: generate-sas
-        uid: az_storage_account_generate_sas
-        displayName: az storage account generate-sas
-      - name: list
-        uid: az_storage_account_list
-        displayName: az storage account list
-      - name: show
-        uid: az_storage_account_show
-        displayName: az storage account show
-      - name: show-connection-string
-        uid: az_storage_account_show_connection_string
-        displayName: az storage account show-connection-string
-      - name: show-usage
-        uid: az_storage_account_show_usage
-        displayName: az storage account show-usage
-      - name: Keys
-        displayName: az storage account keys
-        items:
-        - name: Overview
-          uid: az_storage_account_keys
-          displayName: az storage account keys
-        - name: list
-          uid: az_storage_account_keys_list
-          displayName: az storage account keys list
-        - name: renew
-          uid: az_storage_account_keys_renew
-          displayName: az storage account keys renew
-    - name: Blob
-      displayName: az storage blob
-      items:
-      - name: Overview
-        uid: az_storage_blob
-        displayName: az storage blob
-      - name: delete
-        uid: az_storage_blob_delete
-        displayName: az storage blob delete
-      - name: delete-batch
-        uid: az_storage_blob_delete_batch
-        displayName: az storage blob delete-batch
-      - name: download
-        uid: az_storage_blob_download
-        displayName: az storage blob download
-      - name: download-batch
-        uid: az_storage_blob_download_batch
-        displayName: az storage blob download-batch
-      - name: exists
-        uid: az_storage_blob_exists
-        displayName: az storage blob exists
-      - name: generate-sas
-        uid: az_storage_blob_generate_sas
-        displayName: az storage blob generate-sas
-      - name: list
-        uid: az_storage_blob_list
-        displayName: az storage blob list
-      - name: set-tier
-        uid: az_storage_blob_set_tier
-        displayName: az storage blob set-tier
-      - name: show
-        uid: az_storage_blob_show
-        displayName: az storage blob show
-      - name: snapshot
-        uid: az_storage_blob_snapshot
-        displayName: az storage blob snapshot
-      - name: sync
-        uid: az_storage_blob_sync
-        displayName: az storage blob sync
-      - name: update
-        uid: az_storage_blob_update
-        displayName: az storage blob update
-      - name: upload
-        uid: az_storage_blob_upload
-        displayName: az storage blob upload
-      - name: upload-batch
-        uid: az_storage_blob_upload_batch
-        displayName: az storage blob upload-batch
-      - name: url
-        uid: az_storage_blob_url
-        displayName: az storage blob url
-      - name: Copy operations
-        displayName: az storage blob copy
-        items:
-        - name: Overview
-          uid: az_storage_blob_copy
-          displayName: az storage blob copy
-        - name: cancel
-          uid: az_storage_blob_copy_cancel
-          displayName: az storage blob copy cancel
-        - name: start
-          uid: az_storage_blob_copy_start
-          displayName: az storage blob copy start
-        - name: start-batch
-          uid: az_storage_blob_copy_start_batch
-          displayName: az storage blob copy start-batch
-      - name: Leases
-        displayName: az storage blob lease
-        items:
-        - name: Overview
-          uid: az_storage_blob_lease
-          displayName: az storage blob lease
-        - name: acquire
-          uid: az_storage_blob_lease_acquire
-          displayName: az storage blob lease acquire
-        - name: break
-          uid: az_storage_blob_lease_break
-          displayName: az storage blob lease break
-        - name: change
-          uid: az_storage_blob_lease_change
-          displayName: az storage blob lease change
-        - name: release
-          uid: az_storage_blob_lease_release
-          displayName: az storage blob lease release
-        - name: renew
-          uid: az_storage_blob_lease_renew
-          displayName: az storage blob lease renew
-      - name: Metadata
-        displayName: az storage blob metadata
-        items:
-        - name: Overview
-          uid: az_storage_blob_metadata
-          displayName: az storage blob metadata
-        - name: show
-          uid: az_storage_blob_metadata_show
-          displayName: az storage blob metadata show
-        - name: update
-          uid: az_storage_blob_metadata_update
-          displayName: az storage blob metadata update
-      - name: Service properties
-        displayName: az storage blob service-properties
-        items:
-        - name: Overview
-          uid: az_storage_blob_service_properties
-          displayName: az storage blob service-properties
-        - name: show
-          uid: az_storage_blob_service_properties_show
-          displayName: az storage blob service-properties show
-        - name: update
-          uid: az_storage_blob_service_properties_update
-          displayName: az storage blob service-properties update
-      - name: incremental-copy
-        displayName: az storage blob incremental-copy
-        items:
-        - name: Overview
-          uid: az_storage_blob_incremental_copy
-          displayName: az storage blob incremental-copy
-        - name: cancel
-          uid: az_storage_blob_incremental_copy_cancel
-          displayName: az storage blob incremental-copy cancel
-        - name: start
-          uid: az_storage_blob_incremental_copy_start
-          displayName: az storage blob incremental-copy start
-    - name: Containers
-      displayName: az storage container
-      items:
-      - name: Overview
-        uid: az_storage_container
-        displayName: az storage container
-      - name: create
-        uid: az_storage_container_create
-        displayName: az storage container create
-      - name: delete
-        uid: az_storage_container_delete
-        displayName: az storage container delete
-      - name: exists
-        uid: az_storage_container_exists
-        displayName: az storage container exists
-      - name: generate-sas
-        uid: az_storage_container_generate_sas
-        displayName: az storage container generate-sas
-      - name: list
-        uid: az_storage_container_list
-        displayName: az storage container list
-      - name: set-permission
-        uid: az_storage_container_set_permission
-        displayName: az storage container set-permission
-      - name: show
-        uid: az_storage_container_show
-        displayName: az storage container show
-      - name: show-permission
-        uid: az_storage_container_show_permission
-        displayName: az storage container show-permission
-      - name: Leases
-        displayName: az storage container lease
-        items:
-        - name: Overview
-          uid: az_storage_container_lease
-          displayName: az storage container lease
-        - name: acquire
-          uid: az_storage_container_lease_acquire
-          displayName: az storage container lease acquire
-        - name: break
-          uid: az_storage_container_lease_break
-          displayName: az storage container lease break
-        - name: change
-          uid: az_storage_container_lease_change
-          displayName: az storage container lease change
-        - name: release
-          uid: az_storage_container_lease_release
-          displayName: az storage container lease release
-        - name: renew
-          uid: az_storage_container_lease_renew
-          displayName: az storage container lease renew
-      - name: Metadata
-        displayName: az storage container metadata
-        items:
-        - name: Overview
-          uid: az_storage_container_metadata
-          displayName: az storage container metadata
-        - name: show
-          uid: az_storage_container_metadata_show
-          displayName: az storage container metadata show
-        - name: update
-          uid: az_storage_container_metadata_update
-          displayName: az storage container metadata update
-      - name: Policies
-        displayName: az storage container policy
-        items:
-        - name: Overview
-          uid: az_storage_container_policy
-          displayName: az storage container policy
-        - name: create
-          uid: az_storage_container_policy_create
-          displayName: az storage container policy create
-        - name: delete
-          uid: az_storage_container_policy_delete
-          displayName: az storage container policy delete
-        - name: list
-          uid: az_storage_container_policy_list
-          displayName: az storage container policy list
-        - name: show
-          uid: az_storage_container_policy_show
-          displayName: az storage container policy show
-        - name: update
-          uid: az_storage_container_policy_update
-          displayName: az storage container policy update
-    - name: Cross-origin resource sharing
-      displayName: az storage cors
-      items:
-      - name: Overview
-        uid: az_storage_cors
-        displayName: az storage cors
-      - name: add
-        uid: az_storage_cors_add
-        displayName: az storage cors add
-      - name: clear
-        uid: az_storage_cors_clear
-        displayName: az storage cors clear
-      - name: list
-        uid: az_storage_cors_list
-        displayName: az storage cors list
-    - name: Directories
-      displayName: az storage directory
+    - name: Summary
+      uid: sp-Azure_Machine_Learning
+      displayName: Azure Machine Learning
+    - name: ml
       items:
-      - name: Overview
-        uid: az_storage_directory
-        displayName: az storage directory
-      - name: create
-        uid: az_storage_directory_create
-        displayName: az storage directory create
-      - name: delete
-        uid: az_storage_directory_delete
-        displayName: az storage directory delete
-      - name: exists
-        uid: az_storage_directory_exists
-        displayName: az storage directory exists
-      - name: list
-        uid: az_storage_directory_list
-        displayName: az storage directory list
-      - name: show
-        uid: az_storage_directory_show
-        displayName: az storage directory show
-      - name: Metadata
-        displayName: az storage directory metadata
-        items:
-        - name: Overview
-          uid: az_storage_directory_metadata
-          displayName: az storage directory metadata
-        - name: show
-          uid: az_storage_directory_metadata_show
-          displayName: az storage directory metadata show
-        - name: update
-          uid: az_storage_directory_metadata_update
-          displayName: az storage directory metadata update
-    - name: File shares
-      displayName: az storage share
+      - name: Summary
+        uid: az_ml
+        displayName: az ml
+      - name: code
+        uid: az_ml_code
+        displayName: az ml code
+        items: []
+      - name: compute
+        uid: az_ml_compute
+        displayName: az ml compute
+        items: []
+      - name: data
+        uid: az_ml_data
+        displayName: az ml data
+        items: []
+      - name: datastore
+        uid: az_ml_datastore
+        displayName: az ml datastore
+        items: []
+      - name: endpoint
+        uid: az_ml_endpoint
+        displayName: az ml endpoint
+        items: []
+      - name: environment
+        uid: az_ml_environment
+        displayName: az ml environment
+        items: []
+      - name: job
+        uid: az_ml_job
+        displayName: az ml job
+        items: []
+      - name: model
+        uid: az_ml_model
+        displayName: az ml model
+        items: []
+      - name: workspace
+        uid: az_ml_workspace
+        displayName: az ml workspace
+        items: []
+    - name: ml(v1)
       items:
-      - name: Overview
-        uid: az_storage_share
-        displayName: az storage share
-      - name: create
-        uid: az_storage_share_create
-        displayName: az storage share create
-      - name: delete
-        uid: az_storage_share_delete
-        displayName: az storage share delete
-      - name: exists
-        uid: az_storage_share_exists
-        displayName: az storage share exists
-      - name: generate-sas
-        uid: az_storage_share_generate_sas
-        displayName: az storage share generate-sas
-      - name: list
-        uid: az_storage_share_list
-        displayName: az storage share list
-      - name: show
-        uid: az_storage_share_show
-        displayName: az storage share show
-      - name: snapshot
-        uid: az_storage_share_snapshot
-        displayName: az storage share snapshot
-      - name: stats
-        uid: az_storage_share_stats
-        displayName: az storage share stats
-      - name: update
-        uid: az_storage_share_update
-        displayName: az storage share update
-      - name: url
-        uid: az_storage_share_url
-        displayName: az storage share url
-      - name: Metadata
-        displayName: az storage share metadata
-        items:
-        - name: Overview
-          uid: az_storage_share_metadata
-          displayName: az storage share metadata
-        - name: show
-          uid: az_storage_share_metadata_show
-          displayName: az storage share metadata show
-        - name: update
-          uid: az_storage_share_metadata_update
-          displayName: az storage share metadata update
-      - name: Policies
-        displayName: az storage share policy
+      - name: Summary
+        uid: az_ml(v1)
+        displayName: az ml
+      - name: computetarget
         items:
-        - name: Overview
-          uid: az_storage_share_policy
-          displayName: az storage share policy
+        - name: Summary
+          uid: az_ml(v1)_computetarget
+          displayName: az ml computetarget
+        - name: amlcompute
+          items:
+          - name: Summary
+            uid: az_ml(v1)_computetarget_amlcompute
+            displayName: az ml computetarget amlcompute
+          - name: identity
+            uid: az_ml(v1)_computetarget_amlcompute_identity
+            displayName: az ml computetarget amlcompute identity
+            items: []
+        - name: attach
+          uid: az_ml(v1)_computetarget_attach
+          displayName: az ml computetarget attach
+          items: []
+        - name: computeinstance
+          uid: az_ml(v1)_computetarget_computeinstance
+          displayName: az ml computetarget computeinstance
+          items: []
         - name: create
-          uid: az_storage_share_policy_create
-          displayName: az storage share policy create
-        - name: delete
-          uid: az_storage_share_policy_delete
-          displayName: az storage share policy delete
-        - name: list
-          uid: az_storage_share_policy_list
-          displayName: az storage share policy list
-        - name: show
-          uid: az_storage_share_policy_show
-          displayName: az storage share policy show
-        - name: update
-          uid: az_storage_share_policy_update
-          displayName: az storage share policy update
-    - name: Files
-      displayName: az storage file
-      items:
-      - name: Overview
-        uid: az_storage_file
-        displayName: az storage file
-      - name: delete
-        uid: az_storage_file_delete
-        displayName: az storage file delete
-      - name: delete-batch
-        uid: az_storage_file_delete_batch
-        displayName: az storage file delete-batch
-      - name: download
-        uid: az_storage_file_download
-        displayName: az storage file download
-      - name: download-batch
-        uid: az_storage_file_download_batch
-        displayName: az storage file download-batch
-      - name: exists
-        uid: az_storage_file_exists
-        displayName: az storage file exists
-      - name: generate-sas
-        uid: az_storage_file_generate_sas
-        displayName: az storage file generate-sas
-      - name: list
-        uid: az_storage_file_list
-        displayName: az storage file list
-      - name: resize
-        uid: az_storage_file_resize
-        displayName: az storage file resize
-      - name: show
-        uid: az_storage_file_show
-        displayName: az storage file show
-      - name: update
-        uid: az_storage_file_update
-        displayName: az storage file update
-      - name: upload
-        uid: az_storage_file_upload
-        displayName: az storage file upload
-      - name: upload-batch
-        uid: az_storage_file_upload_batch
-        displayName: az storage file upload-batch
-      - name: url
-        uid: az_storage_file_url
-        displayName: az storage file url
-      - name: Copy operations
-        displayName: az storage file copy
-        items:
-        - name: Overview
-          uid: az_storage_file_copy
-          displayName: az storage file copy
-        - name: cancel
-          uid: az_storage_file_copy_cancel
-          displayName: az storage file copy cancel
-        - name: start
-          uid: az_storage_file_copy_start
-          displayName: az storage file copy start
-        - name: start-batch
-          uid: az_storage_file_copy_start_batch
-          displayName: az storage file copy start-batch
-      - name: Metadata
-        displayName: az storage file metadata
-        items:
-        - name: Overview
-          uid: az_storage_file_metadata
-          displayName: az storage file metadata
-        - name: show
-          uid: az_storage_file_metadata_show
-          displayName: az storage file metadata show
-        - name: update
-          uid: az_storage_file_metadata_update
-          displayName: az storage file metadata update
-    - name: Logging
-      displayName: az storage logging
-      items:
-      - name: Overview
-        uid: az_storage_logging
-        displayName: az storage logging
-      - name: off
-        uid: az_storage_logging_off
-        displayName: az storage logging off
-      - name: show
-        uid: az_storage_logging_show
-        displayName: az storage logging show
-      - name: update
-        uid: az_storage_logging_update
-        displayName: az storage logging update
-    - name: Messages
-      displayName: az storage message
-      items:
-      - name: Overview
-        uid: az_storage_message
-        displayName: az storage message
-      - name: clear
-        uid: az_storage_message_clear
-        displayName: az storage message clear
-      - name: delete
-        uid: az_storage_message_delete
-        displayName: az storage message delete
-      - name: get
-        uid: az_storage_message_get
-        displayName: az storage message get
-      - name: peek
-        uid: az_storage_message_peek
-        displayName: az storage message peek
-      - name: put
-        uid: az_storage_message_put
-        displayName: az storage message put
-      - name: update
-        uid: az_storage_message_update
-        displayName: az storage message update
-    - name: Metrics
-      displayName: az storage metrics
-      items:
-      - name: Overview
-        uid: az_storage_metrics
-        displayName: az storage metrics
-      - name: show
-        uid: az_storage_metrics_show
-        displayName: az storage metrics show
-      - name: update
-        uid: az_storage_metrics_update
-        displayName: az storage metrics update
-    - name: Queues
-      displayName: az storage queue
-      items:
-      - name: Overview
-        uid: az_storage_queue
-        displayName: az storage queue
-      - name: create
-        uid: az_storage_queue_create
-        displayName: az storage queue create
-      - name: delete
-        uid: az_storage_queue_delete
-        displayName: az storage queue delete
-      - name: exists
-        uid: az_storage_queue_exists
-        displayName: az storage queue exists
-      - name: generate-sas
-        uid: az_storage_queue_generate_sas
-        displayName: az storage queue generate-sas
-      - name: list
-        uid: az_storage_queue_list
-        displayName: az storage queue list
-      - name: stats
-        uid: az_storage_queue_stats
-        displayName: az storage queue stats
-      - name: Metadata
-        displayName: az storage queue metadata
-        items:
-        - name: Overview
-          uid: az_storage_queue_metadata
-          displayName: az storage queue metadata
-        - name: show
-          uid: az_storage_queue_metadata_show
-          displayName: az storage queue metadata show
+          uid: az_ml(v1)_computetarget_create
+          displayName: az ml computetarget create
+          items: []
         - name: update
-          uid: az_storage_queue_metadata_update
-          displayName: az storage queue metadata update
-      - name: Policies
-        displayName: az storage queue policy
+          uid: az_ml(v1)_computetarget_update
+          displayName: az ml computetarget update
+          items: []
+      - name: dataset
+        uid: az_ml(v1)_dataset
+        displayName: az ml dataset
+        items: []
+      - name: datastore
+        uid: az_ml(v1)_datastore
+        displayName: az ml datastore
+        items: []
+      - name: endpoint
         items:
-        - name: Overview
-          uid: az_storage_queue_policy
-          displayName: az storage queue policy
-        - name: create
-          uid: az_storage_queue_policy_create
-          displayName: az storage queue policy create
-        - name: delete
-          uid: az_storage_queue_policy_delete
-          displayName: az storage queue policy delete
-        - name: list
-          uid: az_storage_queue_policy_list
-          displayName: az storage queue policy list
-        - name: show
-          uid: az_storage_queue_policy_show
-          displayName: az storage queue policy show
-        - name: update
-          uid: az_storage_queue_policy_update
-          displayName: az storage queue policy update
-    - name: Table storage entities
-      displayName: az storage entity
-      items:
-      - name: Overview
-        uid: az_storage_entity
-        displayName: az storage entity
-      - name: delete
-        uid: az_storage_entity_delete
-        displayName: az storage entity delete
-      - name: insert
-        uid: az_storage_entity_insert
-        displayName: az storage entity insert
-      - name: merge
-        uid: az_storage_entity_merge
-        displayName: az storage entity merge
-      - name: query
-        uid: az_storage_entity_query
-        displayName: az storage entity query
-      - name: replace
-        uid: az_storage_entity_replace
-        displayName: az storage entity replace
-      - name: show
-        uid: az_storage_entity_show
-        displayName: az storage entity show
-    - name: Tables
-      displayName: az storage table
-      items:
-      - name: Overview
-        uid: az_storage_table
-        displayName: az storage table
-      - name: create
-        uid: az_storage_table_create
-        displayName: az storage table create
-      - name: delete
-        uid: az_storage_table_delete
-        displayName: az storage table delete
-      - name: exists
-        uid: az_storage_table_exists
-        displayName: az storage table exists
-      - name: generate-sas
-        uid: az_storage_table_generate_sas
-        displayName: az storage table generate-sas
-      - name: list
-        uid: az_storage_table_list
-        displayName: az storage table list
-      - name: stats
-        uid: az_storage_table_stats
-        displayName: az storage table stats
-      - name: Policies
-        displayName: az storage table policy
+        - name: Summary
+          uid: az_ml(v1)_endpoint
+          displayName: az ml endpoint
+        - name: realtime
+          uid: az_ml(v1)_endpoint_realtime
+          displayName: az ml endpoint realtime
+          items: []
+      - name: environment
+        uid: az_ml(v1)_environment
+        displayName: az ml environment
+        items: []
+      - name: experiment
+        uid: az_ml(v1)_experiment
+        displayName: az ml experiment
+        items: []
+      - name: folder
+        uid: az_ml(v1)_folder
+        displayName: az ml folder
+        items: []
+      - name: model
+        uid: az_ml(v1)_model
+        displayName: az ml model
+        items: []
+      - name: pipeline
+        uid: az_ml(v1)_pipeline
+        displayName: az ml pipeline
+        items: []
+      - name: run
+        uid: az_ml(v1)_run
+        displayName: az ml run
+        items: []
+      - name: service
+        uid: az_ml(v1)_service
+        displayName: az ml service
+        items: []
+      - name: workspace
         items:
-        - name: Overview
-          uid: az_storage_table_policy
-          displayName: az storage table policy
-        - name: create
-          uid: az_storage_table_policy_create
-          displayName: az storage table policy create
-        - name: delete
-          uid: az_storage_table_policy_delete
-          displayName: az storage table policy delete
-        - name: list
-          uid: az_storage_table_policy_list
-          displayName: az storage table policy list
-        - name: show
-          uid: az_storage_table_policy_show
-          displayName: az storage table policy show
-        - name: update
-          uid: az_storage_table_policy_update
-          displayName: az storage table policy update
-  - name: Subscriptions
-    displayName: az account
+        - name: Summary
+          uid: az_ml(v1)_workspace
+          displayName: az ml workspace
+        - name: private-endpoint
+          uid: az_ml(v1)_workspace_private-endpoint
+          displayName: az ml workspace private-endpoint
+          items: []
+  - name: Azure Managed Applications
     items:
-    - name: Overview
-      uid: az_account
-      displayName: az account
-    - name: clear
-      uid: az_account_clear
-      displayName: az account clear
-    - name: get-access-token
-      uid: az_account_get_access_token
-      displayName: az account get-access-token
-    - name: list
-      uid: az_account_list
-      displayName: az account list
-    - name: list-locations
-      uid: az_account_list_locations
-      displayName: az account list-locations
-    - name: set
-      uid: az_account_set
-      displayName: az account set
-    - name: show
-      uid: az_account_show
-      displayName: az account show
-    - name: lock
-      displayName: az account lock
-      items:
-      - name: Overview
-        uid: az_account_lock
-        displayName: az account lock
-      - name: create
-        uid: az_account_lock_create
-        displayName: az account lock create
-      - name: delete
-        uid: az_account_lock_delete
-        displayName: az account lock delete
-      - name: list
-        uid: az_account_lock_list
-        displayName: az account lock list
-      - name: show
-        uid: az_account_lock_show
-        displayName: az account lock show
-      - name: update
-        uid: az_account_lock_update
-        displayName: az account lock update
-    - name: management-group
-      displayName: az account management-group
-      items:
-      - name: Overview
-        uid: az_account_management_group
-        displayName: az account management-group
-      - name: create
-        uid: az_account_management_group_create
-        displayName: az account management-group create
-      - name: delete
-        uid: az_account_management_group_delete
-        displayName: az account management-group delete
-      - name: list
-        uid: az_account_management_group_list
-        displayName: az account management-group list
-      - name: show
-        uid: az_account_management_group_show
-        displayName: az account management-group show
-      - name: update
-        uid: az_account_management_group_update
-        displayName: az account management-group update
-      - name: subscription
-        displayName: az account management-group subscription
-        items:
-        - name: Overview
-          uid: az_account_management_group_subscription
-          displayName: az account management-group subscription
-        - name: add
-          uid: az_account_management_group_subscription_add
-          displayName: az account management-group subscription add
-        - name: remove
-          uid: az_account_management_group_subscription_remove
-          displayName: az account management-group subscription remove
-  - name: VM Images
-    displayName: az image
+    - name: Summary
+      uid: sp-Azure_Managed_Applications
+      displayName: Azure Managed Applications
+    - name: managedapp
+      items:
+      - name: Summary
+        uid: az_managedapp
+        displayName: az managedapp
+      - name: definition
+        uid: az_managedapp_definition
+        displayName: az managedapp definition
+        items: []
+  - name: Azure Managed Services
+    uid: sp-Azure_Managed_Services
+    displayName: Azure Managed Services
+    items: []
+  - name: Azure Maps
+    uid: sp-Azure_Maps
+    displayName: Azure Maps
+    items: []
+  - name: Azure Marketplace Ordering
+    items:
+    - name: Summary
+      uid: sp-Azure_Marketplace_Ordering
+      displayName: Azure Marketplace Ordering
+    - name: term
+      uid: az_term
+      displayName: az term
+      items: []
+  - name: Azure Media Services
+    uid: sp-Azure_Media_Services
+    displayName: Azure Media Services
+    items: []
+  - name: Azure Migrate
     items:
-    - name: Overview
-      uid: az_image
-      displayName: az image
-    - name: create
-      uid: az_image_create
-      displayName: az image create
-    - name: delete
-      uid: az_image_delete
-      displayName: az image delete
-    - name: list
-      uid: az_image_list
-      displayName: az image list
-    - name: show
-      uid: az_image_show
-      displayName: az image show
-    - name: update
-      uid: az_image_update
-      displayName: az image update
-    - name: builder
-      displayName: az image builder
+    - name: Summary
+      uid: sp-Azure_Migrate
+      displayName: Azure Migrate
+    - name: offazure
+      items:
+      - name: Summary
+        uid: az_offazure
+        displayName: az offazure
+      - name: hyperv
+        items:
+        - name: Summary
+          uid: az_offazure_hyperv
+          displayName: az offazure hyperv
+        - name: cluster
+          uid: az_offazure_hyperv_cluster
+          displayName: az offazure hyperv cluster
+          items: []
+        - name: host
+          uid: az_offazure_hyperv_host
+          displayName: az offazure hyperv host
+          items: []
+        - name: machine
+          uid: az_offazure_hyperv_machine
+          displayName: az offazure hyperv machine
+          items: []
+        - name: run-as-account
+          uid: az_offazure_hyperv_run-as-account
+          displayName: az offazure hyperv run-as-account
+          items: []
+        - name: site
+          uid: az_offazure_hyperv_site
+          displayName: az offazure hyperv site
+          items: []
+      - name: vmware
+        items:
+        - name: Summary
+          uid: az_offazure_vmware
+          displayName: az offazure vmware
+        - name: machine
+          uid: az_offazure_vmware_machine
+          displayName: az offazure vmware machine
+          items: []
+        - name: run-as-account
+          uid: az_offazure_vmware_run-as-account
+          displayName: az offazure vmware run-as-account
+          items: []
+        - name: site
+          uid: az_offazure_vmware_site
+          displayName: az offazure vmware site
+          items: []
+        - name: vcenter
+          uid: az_offazure_vmware_vcenter
+          displayName: az offazure vmware vcenter
+          items: []
+  - name: Azure Monitor
+    items:
+    - name: Summary
+      uid: sp-Azure_Monitor
+      displayName: Azure Monitor
+    - name: footprint
+      items:
+      - name: Summary
+        uid: az_footprint
+        displayName: az footprint
+      - name: experiment
+        uid: az_footprint_experiment
+        displayName: az footprint experiment
+        items: []
+      - name: measurement-endpoint
+        uid: az_footprint_measurement-endpoint
+        displayName: az footprint measurement-endpoint
+        items: []
+      - name: measurement-endpoint-condition
+        uid: az_footprint_measurement-endpoint-condition
+        displayName: az footprint measurement-endpoint-condition
+        items: []
+      - name: profile
+        uid: az_footprint_profile
+        displayName: az footprint profile
+        items: []
+    - name: monitor
       items:
-      - name: Overview
-        uid: az_image_builder
-        displayName: az image builder
-      - name: create
-        uid: az_image_builder_create
-        displayName: az image builder create
-      - name: delete
-        uid: az_image_builder_delete
-        displayName: az image builder delete
-      - name: list
-        uid: az_image_builder_list
-        displayName: az image builder list
-      - name: run
-        uid: az_image_builder_run
-        displayName: az image builder run
-      - name: show
-        uid: az_image_builder_show
-        displayName: az image builder show
-      - name: show-runs
-        uid: az_image_builder_show_runs
-        displayName: az image builder show-runs
-      - name: update
-        uid: az_image_builder_update
-        displayName: az image builder update
-      - name: wait
-        uid: az_image_builder_wait
-        displayName: az image builder wait
-      - name: customizer
-        displayName: az image builder customizer
+      - name: Summary
+        uid: az_monitor
+        displayName: az monitor
+      - name: action-rule
+        uid: az_monitor_action-rule
+        displayName: az monitor action-rule
+        items: []
+      - name: app-insights
         items:
-        - name: Overview
-          uid: az_image_builder_customizer
-          displayName: az image builder customizer
-        - name: add
-          uid: az_image_builder_customizer_add
-          displayName: az image builder customizer add
-        - name: clear
-          uid: az_image_builder_customizer_clear
-          displayName: az image builder customizer clear
-        - name: remove
-          uid: az_image_builder_customizer_remove
-          displayName: az image builder customizer remove
-      - name: output
-        displayName: az image builder output
+        - name: Summary
+          uid: az_monitor_app-insights
+          displayName: az monitor app-insights
+        - name: api-key
+          uid: az_monitor_app-insights_api-key
+          displayName: az monitor app-insights api-key
+          items: []
+        - name: component
+          items:
+          - name: Summary
+            uid: az_monitor_app-insights_component
+            displayName: az monitor app-insights component
+          - name: billing
+            uid: az_monitor_app-insights_component_billing
+            displayName: az monitor app-insights component billing
+            items: []
+          - name: continues-export
+            uid: az_monitor_app-insights_component_continues-export
+            displayName: az monitor app-insights component continues-export
+            items: []
+          - name: linked-storage
+            uid: az_monitor_app-insights_component_linked-storage
+            displayName: az monitor app-insights component linked-storage
+            items: []
+        - name: events
+          uid: az_monitor_app-insights_events
+          displayName: az monitor app-insights events
+          items: []
+        - name: metrics
+          uid: az_monitor_app-insights_metrics
+          displayName: az monitor app-insights metrics
+          items: []
+      - name: data-collection
+        items:
+        - name: Summary
+          uid: az_monitor_data-collection
+          displayName: az monitor data-collection
+        - name: rule
+          items:
+          - name: Summary
+            uid: az_monitor_data-collection_rule
+            displayName: az monitor data-collection rule
+          - name: association
+            uid: az_monitor_data-collection_rule_association
+            displayName: az monitor data-collection rule association
+            items: []
+          - name: data-flow
+            uid: az_monitor_data-collection_rule_data-flow
+            displayName: az monitor data-collection rule data-flow
+            items: []
+          - name: log-analytics
+            uid: az_monitor_data-collection_rule_log-analytics
+            displayName: az monitor data-collection rule log-analytics
+            items: []
+          - name: performance-counter
+            uid: az_monitor_data-collection_rule_performance-counter
+            displayName: az monitor data-collection rule performance-counter
+            items: []
+          - name: syslog
+            uid: az_monitor_data-collection_rule_syslog
+            displayName: az monitor data-collection rule syslog
+            items: []
+          - name: windows-event-log
+            uid: az_monitor_data-collection_rule_windows-event-log
+            displayName: az monitor data-collection rule windows-event-log
+            items: []
+      - name: log-analytics
         items:
-        - name: Overview
-          uid: az_image_builder_output
-          displayName: az image builder output
-        - name: add
-          uid: az_image_builder_output_add
-          displayName: az image builder output add
-        - name: clear
-          uid: az_image_builder_output_clear
-          displayName: az image builder output clear
-        - name: remove
-          uid: az_image_builder_output_remove
-          displayName: az image builder output remove
-  - name: VM Scale Sets
-    displayName: az vmss
+        - name: Summary
+          uid: az_monitor_log-analytics
+          displayName: az monitor log-analytics
+        - name: solution
+          uid: az_monitor_log-analytics_solution
+          displayName: az monitor log-analytics solution
+          items: []
+      - name: scheduled-query
+        uid: az_monitor_scheduled-query
+        displayName: az monitor scheduled-query
+        items: []
+  - name: Azure NetApp Files
     items:
-    - name: Overview
-      uid: az_vmss
-      displayName: az vmss
-    - name: create
-      uid: az_vmss_create
-      displayName: az vmss create
-    - name: deallocate
-      uid: az_vmss_deallocate
-      displayName: az vmss deallocate
-    - name: delete
-      uid: az_vmss_delete
-      displayName: az vmss delete
-    - name: delete-instances
-      uid: az_vmss_delete_instances
-      displayName: az vmss delete-instances
-    - name: get-instance-view
-      uid: az_vmss_get_instance_view
-      displayName: az vmss get-instance-view
-    - name: list
-      uid: az_vmss_list
-      displayName: az vmss list
-    - name: list-instance-connection-info
-      uid: az_vmss_list_instance_connection_info
-      displayName: az vmss list-instance-connection-info
-    - name: list-instance-public-ips
-      uid: az_vmss_list_instance_public_ips
-      displayName: az vmss list-instance-public-ips
-    - name: list-instances
-      uid: az_vmss_list_instances
-      displayName: az vmss list-instances
-    - name: list-skus
-      uid: az_vmss_list_skus
-      displayName: az vmss list-skus
-    - name: reimage
-      uid: az_vmss_reimage
-      displayName: az vmss reimage
-    - name: restart
-      uid: az_vmss_restart
-      displayName: az vmss restart
-    - name: scale
-      uid: az_vmss_scale
-      displayName: az vmss scale
-    - name: set-orchestration-service-state
-      uid: az_vmss_set_orchestration_service_state
-      displayName: az vmss set-orchestration-service-state
-    - name: show
-      uid: az_vmss_show
-      displayName: az vmss show
-    - name: start
-      uid: az_vmss_start
-      displayName: az vmss start
-    - name: stop
-      uid: az_vmss_stop
-      displayName: az vmss stop
-    - name: update
-      uid: az_vmss_update
-      displayName: az vmss update
-    - name: update-instances
-      uid: az_vmss_update_instances
-      displayName: az vmss update-instances
-    - name: wait
-      uid: az_vmss_wait
-      displayName: az vmss wait
-    - name: Diagnostics
-      displayName: az vmss diagnostics
-      items:
-      - name: Overview
-        uid: az_vmss_diagnostics
-        displayName: az vmss diagnostics
-      - name: get-default-config
-        uid: az_vmss_diagnostics_get_default_config
-        displayName: az vmss diagnostics get-default-config
-      - name: set
-        uid: az_vmss_diagnostics_set
-        displayName: az vmss diagnostics set
-    - name: Disks
-      displayName: az vmss disk
-      items:
-      - name: Overview
-        uid: az_vmss_disk
-        displayName: az vmss disk
-      - name: attach
-        uid: az_vmss_disk_attach
-        displayName: az vmss disk attach
-      - name: detach
-        uid: az_vmss_disk_detach
-        displayName: az vmss disk detach
-    - name: Extensions
-      displayName: az vmss extension
-      items:
-      - name: Overview
-        uid: az_vmss_extension
-        displayName: az vmss extension
-      - name: delete
-        uid: az_vmss_extension_delete
-        displayName: az vmss extension delete
-      - name: list
-        uid: az_vmss_extension_list
-        displayName: az vmss extension list
-      - name: set
-        uid: az_vmss_extension_set
-        displayName: az vmss extension set
-      - name: show
-        uid: az_vmss_extension_show
-        displayName: az vmss extension show
-      - name: Images
-        displayName: az vmss extension image
-        items:
-        - name: Overview
-          uid: az_vmss_extension_image
-          displayName: az vmss extension image
-        - name: list
-          uid: az_vmss_extension_image_list
-          displayName: az vmss extension image list
-        - name: list-names
-          uid: az_vmss_extension_image_list_names
-          displayName: az vmss extension image list-names
-        - name: list-versions
-          uid: az_vmss_extension_image_list_versions
-          displayName: az vmss extension image list-versions
-        - name: show
-          uid: az_vmss_extension_image_show
-          displayName: az vmss extension image show
-    - name: Network interfaces
-      displayName: az vmss nic
-      items:
-      - name: Overview
-        uid: az_vmss_nic
-        displayName: az vmss nic
-      - name: list
-        uid: az_vmss_nic_list
-        displayName: az vmss nic list
-      - name: list-vm-nics
-        uid: az_vmss_nic_list_vm_nics
-        displayName: az vmss nic list-vm-nics
-      - name: show
-        uid: az_vmss_nic_show
-        displayName: az vmss nic show
-    - name: encryption
-      displayName: az vmss encryption
-      items:
-      - name: Overview
-        uid: az_vmss_encryption
-        displayName: az vmss encryption
-      - name: disable
-        uid: az_vmss_encryption_disable
-        displayName: az vmss encryption disable
-      - name: enable
-        uid: az_vmss_encryption_enable
-        displayName: az vmss encryption enable
-      - name: show
-        uid: az_vmss_encryption_show
-        displayName: az vmss encryption show
-    - name: identity
-      displayName: az vmss identity
-      items:
-      - name: Overview
-        uid: az_vmss_identity
-        displayName: az vmss identity
-      - name: assign
-        uid: az_vmss_identity_assign
-        displayName: az vmss identity assign
-      - name: show
-        uid: az_vmss_identity_show
-        displayName: az vmss identity show
-    - name: rolling-upgrade
-      displayName: az vmss rolling-upgrade
+    - name: Summary
+      uid: sp-Azure_NetApp_Files
+      displayName: Azure NetApp Files
+    - name: netappfiles
       items:
-      - name: Overview
-        uid: az_vmss_rolling_upgrade
-        displayName: az vmss rolling-upgrade
-      - name: cancel
-        uid: az_vmss_rolling_upgrade_cancel
-        displayName: az vmss rolling-upgrade cancel
-      - name: get-latest
-        uid: az_vmss_rolling_upgrade_get_latest
-        displayName: az vmss rolling-upgrade get-latest
-      - name: start
-        uid: az_vmss_rolling_upgrade_start
-        displayName: az vmss rolling-upgrade start
-  - name: VM Snapshots
-    displayName: az snapshot
-    items:
-    - name: Overview
-      uid: az_snapshot
-      displayName: az snapshot
-    - name: create
-      uid: az_snapshot_create
-      displayName: az snapshot create
-    - name: delete
-      uid: az_snapshot_delete
-      displayName: az snapshot delete
-    - name: grant-access
-      uid: az_snapshot_grant_access
-      displayName: az snapshot grant-access
-    - name: list
-      uid: az_snapshot_list
-      displayName: az snapshot list
-    - name: revoke-access
-      uid: az_snapshot_revoke_access
-      displayName: az snapshot revoke-access
-    - name: show
-      uid: az_snapshot_show
-      displayName: az snapshot show
-    - name: update
-      uid: az_snapshot_update
-      displayName: az snapshot update
-    - name: wait
-      uid: az_snapshot_wait
-      displayName: az snapshot wait
-  - name: Virtual Machines
-    displayName: az vm
+      - name: Summary
+        uid: az_netappfiles
+        displayName: az netappfiles
+      - name: account
+        uid: az_netappfiles_account
+        displayName: az netappfiles account
+        items: []
+      - name: mount-target
+        uid: az_netappfiles_mount-target
+        displayName: az netappfiles mount-target
+        items: []
+      - name: pool
+        uid: az_netappfiles_pool
+        displayName: az netappfiles pool
+        items: []
+      - name: snapshot
+        uid: az_netappfiles_snapshot
+        displayName: az netappfiles snapshot
+        items: []
+      - name: volume
+        uid: az_netappfiles_volume
+        displayName: az netappfiles volume
+        items: []
+  - name: Azure Network
     items:
-    - name: Overview
-      uid: az_vm
-      displayName: az vm
-    - name: auto-shutdown
-      uid: az_vm_auto_shutdown
-      displayName: az vm auto-shutdown
-    - name: capture
-      uid: az_vm_capture
-      displayName: az vm capture
-    - name: convert
-      uid: az_vm_convert
-      displayName: az vm convert
-    - name: create
-      uid: az_vm_create
-      displayName: az vm create
-    - name: deallocate
-      uid: az_vm_deallocate
-      displayName: az vm deallocate
-    - name: delete
-      uid: az_vm_delete
-      displayName: az vm delete
-    - name: generalize
-      uid: az_vm_generalize
-      displayName: az vm generalize
-    - name: get-instance-view
-      uid: az_vm_get_instance_view
-      displayName: az vm get-instance-view
-    - name: list
-      uid: az_vm_list
-      displayName: az vm list
-    - name: list-ip-addresses
-      uid: az_vm_list_ip_addresses
-      displayName: az vm list-ip-addresses
-    - name: list-sizes
-      uid: az_vm_list_sizes
-      displayName: az vm list-sizes
-    - name: list-skus
-      uid: az_vm_list_skus
-      displayName: az vm list-skus
-    - name: list-usage
-      uid: az_vm_list_usage
-      displayName: az vm list-usage
-    - name: list-vm-resize-options
-      uid: az_vm_list_vm_resize_options
-      displayName: az vm list-vm-resize-options
-    - name: open-port
-      uid: az_vm_open_port
-      displayName: az vm open-port
-    - name: perform-maintenance
-      uid: az_vm_perform_maintenance
-      displayName: az vm perform-maintenance
-    - name: redeploy
-      uid: az_vm_redeploy
-      displayName: az vm redeploy
-    - name: resize
-      uid: az_vm_resize
-      displayName: az vm resize
-    - name: restart
-      uid: az_vm_restart
-      displayName: az vm restart
-    - name: show
-      uid: az_vm_show
-      displayName: az vm show
-    - name: start
-      uid: az_vm_start
-      displayName: az vm start
-    - name: stop
-      uid: az_vm_stop
-      displayName: az vm stop
-    - name: update
-      uid: az_vm_update
-      displayName: az vm update
-    - name: wait
-      uid: az_vm_wait
-      displayName: az vm wait
-    - name: Availability sets
-      displayName: az vm availability-set
-      items:
-      - name: Overview
-        uid: az_vm_availability_set
-        displayName: az vm availability-set
-      - name: convert
-        uid: az_vm_availability_set_convert
-        displayName: az vm availability-set convert
-      - name: create
-        uid: az_vm_availability_set_create
-        displayName: az vm availability-set create
-      - name: delete
-        uid: az_vm_availability_set_delete
-        displayName: az vm availability-set delete
-      - name: list
-        uid: az_vm_availability_set_list
-        displayName: az vm availability-set list
-      - name: list-sizes
-        uid: az_vm_availability_set_list_sizes
-        displayName: az vm availability-set list-sizes
-      - name: show
-        uid: az_vm_availability_set_show
-        displayName: az vm availability-set show
-      - name: update
-        uid: az_vm_availability_set_update
-        displayName: az vm availability-set update
-    - name: Boot diagnostics
-      displayName: az vm boot-diagnostics
-      items:
-      - name: Overview
-        uid: az_vm_boot_diagnostics
-        displayName: az vm boot-diagnostics
-      - name: disable
-        uid: az_vm_boot_diagnostics_disable
-        displayName: az vm boot-diagnostics disable
-      - name: enable
-        uid: az_vm_boot_diagnostics_enable
-        displayName: az vm boot-diagnostics enable
-      - name: get-boot-log
-        uid: az_vm_boot_diagnostics_get_boot_log
-        displayName: az vm boot-diagnostics get-boot-log
-    - name: Diagnostics
-      displayName: az vm diagnostics
-      items:
-      - name: Overview
-        uid: az_vm_diagnostics
-        displayName: az vm diagnostics
-      - name: get-default-config
-        uid: az_vm_diagnostics_get_default_config
-        displayName: az vm diagnostics get-default-config
-      - name: set
-        uid: az_vm_diagnostics_set
-        displayName: az vm diagnostics set
-    - name: Encryption
-      displayName: az vm encryption
+    - name: Summary
+      uid: sp-Azure_Network
+      displayName: Azure Network
+    - name: internet-analyzer
       items:
-      - name: Overview
-        uid: az_vm_encryption
-        displayName: az vm encryption
-      - name: disable
-        uid: az_vm_encryption_disable
-        displayName: az vm encryption disable
-      - name: enable
-        uid: az_vm_encryption_enable
-        displayName: az vm encryption enable
-      - name: show
-        uid: az_vm_encryption_show
-        displayName: az vm encryption show
-    - name: Extensions
-      displayName: az vm extension
+      - name: Summary
+        uid: az_internet-analyzer
+        displayName: az internet-analyzer
+      - name: preconfigured-endpoint
+        uid: az_internet-analyzer_preconfigured-endpoint
+        displayName: az internet-analyzer preconfigured-endpoint
+        items: []
+      - name: profile
+        uid: az_internet-analyzer_profile
+        displayName: az internet-analyzer profile
+        items: []
+      - name: test
+        uid: az_internet-analyzer_test
+        displayName: az internet-analyzer test
+        items: []
+    - name: network
       items:
-      - name: Overview
-        uid: az_vm_extension
-        displayName: az vm extension
-      - name: delete
-        uid: az_vm_extension_delete
-        displayName: az vm extension delete
-      - name: list
-        uid: az_vm_extension_list
-        displayName: az vm extension list
-      - name: set
-        uid: az_vm_extension_set
-        displayName: az vm extension set
-      - name: show
-        uid: az_vm_extension_show
-        displayName: az vm extension show
-      - name: wait
-        uid: az_vm_extension_wait
-        displayName: az vm extension wait
-      - name: Extension images
-        displayName: az vm extension image
+      - name: Summary
+        uid: az_network
+        displayName: az network
+      - name: application-gateway
         items:
-        - name: Overview
-          uid: az_vm_extension_image
-          displayName: az vm extension image
-        - name: list
-          uid: az_vm_extension_image_list
-          displayName: az vm extension image list
-        - name: list-names
-          uid: az_vm_extension_image_list_names
-          displayName: az vm extension image list-names
-        - name: list-versions
-          uid: az_vm_extension_image_list_versions
-          displayName: az vm extension image list-versions
-        - name: show
-          uid: az_vm_extension_image_show
-          displayName: az vm extension image show
-    - name: Images
-      displayName: az vm image
-      items:
-      - name: Overview
-        uid: az_vm_image
-        displayName: az vm image
-      - name: accept-terms
-        uid: az_vm_image_accept_terms
-        displayName: az vm image accept-terms
-      - name: list
-        uid: az_vm_image_list
-        displayName: az vm image list
-      - name: list-offers
-        uid: az_vm_image_list_offers
-        displayName: az vm image list-offers
-      - name: list-publishers
-        uid: az_vm_image_list_publishers
-        displayName: az vm image list-publishers
-      - name: list-skus
-        uid: az_vm_image_list_skus
-        displayName: az vm image list-skus
-      - name: show
-        uid: az_vm_image_show
-        displayName: az vm image show
-      - name: terms
-        displayName: az vm image terms
-        items:
-        - name: Overview
-          uid: az_vm_image_terms
-          displayName: az vm image terms
-        - name: accept
-          uid: az_vm_image_terms_accept
-          displayName: az vm image terms accept
-        - name: cancel
-          uid: az_vm_image_terms_cancel
-          displayName: az vm image terms cancel
-        - name: show
-          uid: az_vm_image_terms_show
-          displayName: az vm image terms show
-    - name: Network interfaces
-      displayName: az vm nic
-      items:
-      - name: Overview
-        uid: az_vm_nic
-        displayName: az vm nic
-      - name: add
-        uid: az_vm_nic_add
-        displayName: az vm nic add
-      - name: list
-        uid: az_vm_nic_list
-        displayName: az vm nic list
-      - name: remove
-        uid: az_vm_nic_remove
-        displayName: az vm nic remove
-      - name: set
-        uid: az_vm_nic_set
-        displayName: az vm nic set
-      - name: show
-        uid: az_vm_nic_show
-        displayName: az vm nic show
-    - name: Storage disks
-      displayName: az vm disk
-      items:
-      - name: Overview
-        uid: az_vm_disk
-        displayName: az vm disk
-      - name: attach
-        uid: az_vm_disk_attach
-        displayName: az vm disk attach
-      - name: detach
-        uid: az_vm_disk_detach
-        displayName: az vm disk detach
-    - name: Unmanaged disks
-      displayName: az vm unmanaged-disk
-      items:
-      - name: Overview
-        uid: az_vm_unmanaged_disk
-        displayName: az vm unmanaged-disk
-      - name: attach
-        uid: az_vm_unmanaged_disk_attach
-        displayName: az vm unmanaged-disk attach
-      - name: detach
-        uid: az_vm_unmanaged_disk_detach
-        displayName: az vm unmanaged-disk detach
-      - name: list
-        uid: az_vm_unmanaged_disk_list
-        displayName: az vm unmanaged-disk list
-    - name: Users
-      displayName: az vm user
-      items:
-      - name: Overview
-        uid: az_vm_user
-        displayName: az vm user
-      - name: delete
-        uid: az_vm_user_delete
-        displayName: az vm user delete
-      - name: reset-ssh
-        uid: az_vm_user_reset_ssh
-        displayName: az vm user reset-ssh
-      - name: update
-        uid: az_vm_user_update
-        displayName: az vm user update
-    - name: identity
-      displayName: az vm identity
-      items:
-      - name: Overview
-        uid: az_vm_identity
-        displayName: az vm identity
-      - name: assign
-        uid: az_vm_identity_assign
-        displayName: az vm identity assign
-      - name: show
-        uid: az_vm_identity_show
-        displayName: az vm identity show
-    - name: monitor
-      displayName: az vm monitor
-      items:
-      - name: Overview
-        uid: az_vm_monitor
-        displayName: az vm monitor
-      - name: log
-        displayName: az vm monitor log
-        items:
-        - name: Overview
-          uid: az_vm_monitor_log
-          displayName: az vm monitor log
-        - name: show
-          uid: az_vm_monitor_log_show
-          displayName: az vm monitor log show
-    - name: run-command
-      displayName: az vm run-command
-      items:
-      - name: Overview
-        uid: az_vm_run_command
-        displayName: az vm run-command
-      - name: invoke
-        uid: az_vm_run_command_invoke
-        displayName: az vm run-command invoke
-      - name: list
-        uid: az_vm_run_command_list
-        displayName: az vm run-command list
-      - name: show
-        uid: az_vm_run_command_show
-        displayName: az vm run-command show
-    - name: secret
-      displayName: az vm secret
-      items:
-      - name: Overview
-        uid: az_vm_secret
-        displayName: az vm secret
-      - name: add
-        uid: az_vm_secret_add
-        displayName: az vm secret add
-      - name: format
-        uid: az_vm_secret_format
-        displayName: az vm secret format
-      - name: list
-        uid: az_vm_secret_list
-        displayName: az vm secret list
-      - name: remove
-        uid: az_vm_secret_remove
-        displayName: az vm secret remove
-  - name: appconfig
-    displayName: az appconfig
-    items:
-    - name: Overview
-      uid: az_appconfig
-      displayName: az appconfig
-    - name: create
-      uid: az_appconfig_create
-      displayName: az appconfig create
-    - name: delete
-      uid: az_appconfig_delete
-      displayName: az appconfig delete
-    - name: list
-      uid: az_appconfig_list
-      displayName: az appconfig list
-    - name: show
-      uid: az_appconfig_show
-      displayName: az appconfig show
-    - name: update
-      uid: az_appconfig_update
-      displayName: az appconfig update
-    - name: credential
-      displayName: az appconfig credential
-      items:
-      - name: Overview
-        uid: az_appconfig_credential
-        displayName: az appconfig credential
-      - name: list
-        uid: az_appconfig_credential_list
-        displayName: az appconfig credential list
-      - name: regenerate
-        uid: az_appconfig_credential_regenerate
-        displayName: az appconfig credential regenerate
-    - name: feature
-      displayName: az appconfig feature
-      items:
-      - name: Overview
-        uid: az_appconfig_feature
-        displayName: az appconfig feature
-      - name: delete
-        uid: az_appconfig_feature_delete
-        displayName: az appconfig feature delete
-      - name: disable
-        uid: az_appconfig_feature_disable
-        displayName: az appconfig feature disable
-      - name: enable
-        uid: az_appconfig_feature_enable
-        displayName: az appconfig feature enable
-      - name: list
-        uid: az_appconfig_feature_list
-        displayName: az appconfig feature list
-      - name: lock
-        uid: az_appconfig_feature_lock
-        displayName: az appconfig feature lock
-      - name: set
-        uid: az_appconfig_feature_set
-        displayName: az appconfig feature set
-      - name: show
-        uid: az_appconfig_feature_show
-        displayName: az appconfig feature show
-      - name: unlock
-        uid: az_appconfig_feature_unlock
-        displayName: az appconfig feature unlock
-      - name: filter
-        displayName: az appconfig feature filter
-        items:
-        - name: Overview
-          uid: az_appconfig_feature_filter
-          displayName: az appconfig feature filter
-        - name: add
-          uid: az_appconfig_feature_filter_add
-          displayName: az appconfig feature filter add
-        - name: delete
-          uid: az_appconfig_feature_filter_delete
-          displayName: az appconfig feature filter delete
-        - name: list
-          uid: az_appconfig_feature_filter_list
-          displayName: az appconfig feature filter list
-        - name: show
-          uid: az_appconfig_feature_filter_show
-          displayName: az appconfig feature filter show
-    - name: identity
-      displayName: az appconfig identity
-      items:
-      - name: Overview
-        uid: az_appconfig_identity
-        displayName: az appconfig identity
-      - name: assign
-        uid: az_appconfig_identity_assign
-        displayName: az appconfig identity assign
-      - name: remove
-        uid: az_appconfig_identity_remove
-        displayName: az appconfig identity remove
-      - name: show
-        uid: az_appconfig_identity_show
-        displayName: az appconfig identity show
-    - name: kv
-      displayName: az appconfig kv
-      items:
-      - name: Overview
-        uid: az_appconfig_kv
-        displayName: az appconfig kv
-      - name: delete
-        uid: az_appconfig_kv_delete
-        displayName: az appconfig kv delete
-      - name: export
-        uid: az_appconfig_kv_export
-        displayName: az appconfig kv export
-      - name: import
-        uid: az_appconfig_kv_import
-        displayName: az appconfig kv import
-      - name: list
-        uid: az_appconfig_kv_list
-        displayName: az appconfig kv list
-      - name: lock
-        uid: az_appconfig_kv_lock
-        displayName: az appconfig kv lock
-      - name: restore
-        uid: az_appconfig_kv_restore
-        displayName: az appconfig kv restore
-      - name: set
-        uid: az_appconfig_kv_set
-        displayName: az appconfig kv set
-      - name: set-keyvault
-        uid: az_appconfig_kv_set_keyvault
-        displayName: az appconfig kv set-keyvault
-      - name: show
-        uid: az_appconfig_kv_show
-        displayName: az appconfig kv show
-      - name: unlock
-        uid: az_appconfig_kv_unlock
-        displayName: az appconfig kv unlock
-    - name: revision
-      displayName: az appconfig revision
-      items:
-      - name: Overview
-        uid: az_appconfig_revision
-        displayName: az appconfig revision
-      - name: list
-        uid: az_appconfig_revision_list
-        displayName: az appconfig revision list
-  - name: artifacts
-    displayName: az artifacts
-    items:
-    - name: Overview
-      uid: az_artifacts
-      displayName: az artifacts
-    - name: universal
-      displayName: az artifacts universal
-      items:
-      - name: Overview
-        uid: az_artifacts_universal
-        displayName: az artifacts universal
-      - name: download
-        uid: az_artifacts_universal_download
-        displayName: az artifacts universal download
-      - name: publish
-        uid: az_artifacts_universal_publish
-        displayName: az artifacts universal publish
-  - name: boards
-    displayName: az boards
-    items:
-    - name: Overview
-      uid: az_boards
-      displayName: az boards
-    - name: query
-      uid: az_boards_query
-      displayName: az boards query
-    - name: area
-      displayName: az boards area
-      items:
-      - name: Overview
-        uid: az_boards_area
-        displayName: az boards area
-      - name: project
-        displayName: az boards area project
-        items:
-        - name: Overview
-          uid: az_boards_area_project
-          displayName: az boards area project
-        - name: create
-          uid: az_boards_area_project_create
-          displayName: az boards area project create
-        - name: delete
-          uid: az_boards_area_project_delete
-          displayName: az boards area project delete
-        - name: list
-          uid: az_boards_area_project_list
-          displayName: az boards area project list
-        - name: show
-          uid: az_boards_area_project_show
-          displayName: az boards area project show
-        - name: update
-          uid: az_boards_area_project_update
-          displayName: az boards area project update
-      - name: team
-        displayName: az boards area team
-        items:
-        - name: Overview
-          uid: az_boards_area_team
-          displayName: az boards area team
-        - name: add
-          uid: az_boards_area_team_add
-          displayName: az boards area team add
-        - name: list
-          uid: az_boards_area_team_list
-          displayName: az boards area team list
-        - name: remove
-          uid: az_boards_area_team_remove
-          displayName: az boards area team remove
-        - name: update
-          uid: az_boards_area_team_update
-          displayName: az boards area team update
-    - name: iteration
-      displayName: az boards iteration
-      items:
-      - name: Overview
-        uid: az_boards_iteration
-        displayName: az boards iteration
-      - name: project
-        displayName: az boards iteration project
-        items:
-        - name: Overview
-          uid: az_boards_iteration_project
-          displayName: az boards iteration project
-        - name: create
-          uid: az_boards_iteration_project_create
-          displayName: az boards iteration project create
-        - name: delete
-          uid: az_boards_iteration_project_delete
-          displayName: az boards iteration project delete
-        - name: list
-          uid: az_boards_iteration_project_list
-          displayName: az boards iteration project list
-        - name: show
-          uid: az_boards_iteration_project_show
-          displayName: az boards iteration project show
-        - name: update
-          uid: az_boards_iteration_project_update
-          displayName: az boards iteration project update
-      - name: team
-        displayName: az boards iteration team
-        items:
-        - name: Overview
-          uid: az_boards_iteration_team
-          displayName: az boards iteration team
-        - name: add
-          uid: az_boards_iteration_team_add
-          displayName: az boards iteration team add
-        - name: list
-          uid: az_boards_iteration_team_list
-          displayName: az boards iteration team list
-        - name: list-work-items
-          uid: az_boards_iteration_team_list_work_items
-          displayName: az boards iteration team list-work-items
-        - name: remove
-          uid: az_boards_iteration_team_remove
-          displayName: az boards iteration team remove
-        - name: set-backlog-iteration
-          uid: az_boards_iteration_team_set_backlog_iteration
-          displayName: az boards iteration team set-backlog-iteration
-        - name: set-default-iteration
-          uid: az_boards_iteration_team_set_default_iteration
-          displayName: az boards iteration team set-default-iteration
-        - name: show-backlog-iteration
-          uid: az_boards_iteration_team_show_backlog_iteration
-          displayName: az boards iteration team show-backlog-iteration
-        - name: show-default-iteration
-          uid: az_boards_iteration_team_show_default_iteration
-          displayName: az boards iteration team show-default-iteration
-    - name: work-item
-      displayName: az boards work-item
-      items:
-      - name: Overview
-        uid: az_boards_work_item
-        displayName: az boards work-item
-      - name: create
-        uid: az_boards_work_item_create
-        displayName: az boards work-item create
-      - name: delete
-        uid: az_boards_work_item_delete
-        displayName: az boards work-item delete
-      - name: show
-        uid: az_boards_work_item_show
-        displayName: az boards work-item show
-      - name: update
-        uid: az_boards_work_item_update
-        displayName: az boards work-item update
-      - name: relation
-        displayName: az boards work-item relation
-        items:
-        - name: Overview
-          uid: az_boards_work_item_relation
-          displayName: az boards work-item relation
-        - name: add
-          uid: az_boards_work_item_relation_add
-          displayName: az boards work-item relation add
-        - name: list-type
-          uid: az_boards_work_item_relation_list_type
-          displayName: az boards work-item relation list-type
-        - name: remove
-          uid: az_boards_work_item_relation_remove
-          displayName: az boards work-item relation remove
-        - name: show
-          uid: az_boards_work_item_relation_show
-          displayName: az boards work-item relation show
-  - name: cache
-    displayName: az cache
-    items:
-    - name: Overview
-      uid: az_cache
-      displayName: az cache
-    - name: delete
-      uid: az_cache_delete
-      displayName: az cache delete
-    - name: list
-      uid: az_cache_list
-      displayName: az cache list
-    - name: purge
-      uid: az_cache_purge
-      displayName: az cache purge
-    - name: show
-      uid: az_cache_show
-      displayName: az cache show
-  - name: deployment
-    displayName: az deployment
-    items:
-    - name: Overview
-      uid: az_deployment
-      displayName: az deployment
-    - name: group
-      displayName: az deployment group
-      items:
-      - name: Overview
-        uid: az_deployment_group
-        displayName: az deployment group
-      - name: cancel
-        uid: az_deployment_group_cancel
-        displayName: az deployment group cancel
-      - name: create
-        uid: az_deployment_group_create
-        displayName: az deployment group create
-      - name: delete
-        uid: az_deployment_group_delete
-        displayName: az deployment group delete
-      - name: export
-        uid: az_deployment_group_export
-        displayName: az deployment group export
-      - name: list
-        uid: az_deployment_group_list
-        displayName: az deployment group list
-      - name: show
-        uid: az_deployment_group_show
-        displayName: az deployment group show
-      - name: validate
-        uid: az_deployment_group_validate
-        displayName: az deployment group validate
-      - name: wait
-        uid: az_deployment_group_wait
-        displayName: az deployment group wait
-    - name: operation
-      displayName: az deployment operation
-      items:
-      - name: Overview
-        uid: az_deployment_operation
-        displayName: az deployment operation
-      - name: group
-        displayName: az deployment operation group
-        items:
-        - name: Overview
-          uid: az_deployment_operation_group
-          displayName: az deployment operation group
-        - name: list
-          uid: az_deployment_operation_group_list
-          displayName: az deployment operation group list
-        - name: show
-          uid: az_deployment_operation_group_show
-          displayName: az deployment operation group show
-  - name: deployment-scripts
-    displayName: az deployment-scripts
-    items:
-    - name: Overview
-      uid: az_deployment_scripts
-      displayName: az deployment-scripts
-    - name: delete
-      uid: az_deployment_scripts_delete
-      displayName: az deployment-scripts delete
-    - name: list
-      uid: az_deployment_scripts_list
-      displayName: az deployment-scripts list
-    - name: show
-      uid: az_deployment_scripts_show
-      displayName: az deployment-scripts show
-    - name: show-log
-      uid: az_deployment_scripts_show_log
-      displayName: az deployment-scripts show-log
-  - name: devops
-    displayName: az devops
-    items:
-    - name: Overview
-      uid: az_devops
-      displayName: az devops
-    - name: configure
-      uid: az_devops_configure
-      displayName: az devops configure
-    - name: feedback
-      uid: az_devops_feedback
-      displayName: az devops feedback
-    - name: invoke
-      uid: az_devops_invoke
-      displayName: az devops invoke
-    - name: login
-      uid: az_devops_login
-      displayName: az devops login
-    - name: logout
-      uid: az_devops_logout
-      displayName: az devops logout
-    - name: admin
-      displayName: az devops admin
-      items:
-      - name: Overview
-        uid: az_devops_admin
-        displayName: az devops admin
-      - name: banner
-        displayName: az devops admin banner
-        items:
-        - name: Overview
-          uid: az_devops_admin_banner
-          displayName: az devops admin banner
-        - name: add
-          uid: az_devops_admin_banner_add
-          displayName: az devops admin banner add
-        - name: list
-          uid: az_devops_admin_banner_list
-          displayName: az devops admin banner list
-        - name: remove
-          uid: az_devops_admin_banner_remove
-          displayName: az devops admin banner remove
-        - name: show
-          uid: az_devops_admin_banner_show
-          displayName: az devops admin banner show
-        - name: update
-          uid: az_devops_admin_banner_update
-          displayName: az devops admin banner update
-    - name: extension
-      displayName: az devops extension
-      items:
-      - name: Overview
-        uid: az_devops_extension
-        displayName: az devops extension
-      - name: disable
-        uid: az_devops_extension_disable
-        displayName: az devops extension disable
-      - name: enable
-        uid: az_devops_extension_enable
-        displayName: az devops extension enable
-      - name: install
-        uid: az_devops_extension_install
-        displayName: az devops extension install
-      - name: list
-        uid: az_devops_extension_list
-        displayName: az devops extension list
-      - name: search
-        uid: az_devops_extension_search
-        displayName: az devops extension search
-      - name: show
-        uid: az_devops_extension_show
-        displayName: az devops extension show
-      - name: uninstall
-        uid: az_devops_extension_uninstall
-        displayName: az devops extension uninstall
-    - name: project
-      displayName: az devops project
-      items:
-      - name: Overview
-        uid: az_devops_project
-        displayName: az devops project
-      - name: create
-        uid: az_devops_project_create
-        displayName: az devops project create
-      - name: delete
-        uid: az_devops_project_delete
-        displayName: az devops project delete
-      - name: list
-        uid: az_devops_project_list
-        displayName: az devops project list
-      - name: show
-        uid: az_devops_project_show
-        displayName: az devops project show
-    - name: security
-      displayName: az devops security
-      items:
-      - name: Overview
-        uid: az_devops_security
-        displayName: az devops security
-      - name: group
-        displayName: az devops security group
-        items:
-        - name: Overview
-          uid: az_devops_security_group
-          displayName: az devops security group
-        - name: create
-          uid: az_devops_security_group_create
-          displayName: az devops security group create
-        - name: delete
-          uid: az_devops_security_group_delete
-          displayName: az devops security group delete
-        - name: list
-          uid: az_devops_security_group_list
-          displayName: az devops security group list
-        - name: show
-          uid: az_devops_security_group_show
-          displayName: az devops security group show
-        - name: update
-          uid: az_devops_security_group_update
-          displayName: az devops security group update
-        - name: membership
-          displayName: az devops security group membership
-          items:
-          - name: Overview
-            uid: az_devops_security_group_membership
-            displayName: az devops security group membership
-          - name: add
-            uid: az_devops_security_group_membership_add
-            displayName: az devops security group membership add
-          - name: list
-            uid: az_devops_security_group_membership_list
-            displayName: az devops security group membership list
-          - name: remove
-            uid: az_devops_security_group_membership_remove
-            displayName: az devops security group membership remove
-      - name: permission
-        displayName: az devops security permission
-        items:
-        - name: Overview
-          uid: az_devops_security_permission
-          displayName: az devops security permission
-        - name: list
-          uid: az_devops_security_permission_list
-          displayName: az devops security permission list
-        - name: reset
-          uid: az_devops_security_permission_reset
-          displayName: az devops security permission reset
-        - name: reset-all
-          uid: az_devops_security_permission_reset_all
-          displayName: az devops security permission reset-all
-        - name: show
-          uid: az_devops_security_permission_show
-          displayName: az devops security permission show
-        - name: update
-          uid: az_devops_security_permission_update
-          displayName: az devops security permission update
-        - name: namespace
-          displayName: az devops security permission namespace
-          items:
-          - name: Overview
-            uid: az_devops_security_permission_namespace
-            displayName: az devops security permission namespace
-          - name: list
-            uid: az_devops_security_permission_namespace_list
-            displayName: az devops security permission namespace list
-          - name: show
-            uid: az_devops_security_permission_namespace_show
-            displayName: az devops security permission namespace show
-    - name: service-endpoint
-      displayName: az devops service-endpoint
-      items:
-      - name: Overview
-        uid: az_devops_service_endpoint
-        displayName: az devops service-endpoint
-      - name: create
-        uid: az_devops_service_endpoint_create
-        displayName: az devops service-endpoint create
-      - name: delete
-        uid: az_devops_service_endpoint_delete
-        displayName: az devops service-endpoint delete
-      - name: list
-        uid: az_devops_service_endpoint_list
-        displayName: az devops service-endpoint list
-      - name: show
-        uid: az_devops_service_endpoint_show
-        displayName: az devops service-endpoint show
-      - name: update
-        uid: az_devops_service_endpoint_update
-        displayName: az devops service-endpoint update
-      - name: azurerm
-        displayName: az devops service-endpoint azurerm
-        items:
-        - name: Overview
-          uid: az_devops_service_endpoint_azurerm
-          displayName: az devops service-endpoint azurerm
-        - name: create
-          uid: az_devops_service_endpoint_azurerm_create
-          displayName: az devops service-endpoint azurerm create
-      - name: github
-        displayName: az devops service-endpoint github
-        items:
-        - name: Overview
-          uid: az_devops_service_endpoint_github
-          displayName: az devops service-endpoint github
-        - name: create
-          uid: az_devops_service_endpoint_github_create
-          displayName: az devops service-endpoint github create
-    - name: team
-      displayName: az devops team
-      items:
-      - name: Overview
-        uid: az_devops_team
-        displayName: az devops team
-      - name: create
-        uid: az_devops_team_create
-        displayName: az devops team create
-      - name: delete
-        uid: az_devops_team_delete
-        displayName: az devops team delete
-      - name: list
-        uid: az_devops_team_list
-        displayName: az devops team list
-      - name: list-member
-        uid: az_devops_team_list_member
-        displayName: az devops team list-member
-      - name: show
-        uid: az_devops_team_show
-        displayName: az devops team show
-      - name: update
-        uid: az_devops_team_update
-        displayName: az devops team update
-    - name: user
-      displayName: az devops user
-      items:
-      - name: Overview
-        uid: az_devops_user
-        displayName: az devops user
-      - name: add
-        uid: az_devops_user_add
-        displayName: az devops user add
-      - name: list
-        uid: az_devops_user_list
-        displayName: az devops user list
-      - name: remove
-        uid: az_devops_user_remove
-        displayName: az devops user remove
-      - name: show
-        uid: az_devops_user_show
-        displayName: az devops user show
-      - name: update
-        uid: az_devops_user_update
-        displayName: az devops user update
-    - name: wiki
-      displayName: az devops wiki
-      items:
-      - name: Overview
-        uid: az_devops_wiki
-        displayName: az devops wiki
-      - name: create
-        uid: az_devops_wiki_create
-        displayName: az devops wiki create
-      - name: delete
-        uid: az_devops_wiki_delete
-        displayName: az devops wiki delete
-      - name: list
-        uid: az_devops_wiki_list
-        displayName: az devops wiki list
-      - name: show
-        uid: az_devops_wiki_show
-        displayName: az devops wiki show
-      - name: page
-        displayName: az devops wiki page
-        items:
-        - name: Overview
-          uid: az_devops_wiki_page
-          displayName: az devops wiki page
-        - name: create
-          uid: az_devops_wiki_page_create
-          displayName: az devops wiki page create
-        - name: delete
-          uid: az_devops_wiki_page_delete
-          displayName: az devops wiki page delete
-        - name: show
-          uid: az_devops_wiki_page_show
-          displayName: az devops wiki page show
-        - name: update
-          uid: az_devops_wiki_page_update
-          displayName: az devops wiki page update
-  - name: extension
-    displayName: az extension
-    items:
-    - name: Overview
-      uid: az_extension
-      displayName: az extension
-    - name: add
-      uid: az_extension_add
-      displayName: az extension add
-    - name: list
-      uid: az_extension_list
-      displayName: az extension list
-    - name: list-available
-      uid: az_extension_list_available
-      displayName: az extension list-available
-    - name: remove
-      uid: az_extension_remove
-      displayName: az extension remove
-    - name: show
-      uid: az_extension_show
-      displayName: az extension show
-    - name: update
-      uid: az_extension_update
-      displayName: az extension update
-  - name: local-context
-    displayName: az local-context
-    items:
-    - name: Overview
-      uid: az_local_context
-      displayName: az local-context
-    - name: delete
-      uid: az_local_context_delete
-      displayName: az local-context delete
-    - name: off
-      uid: az_local_context_off
-      displayName: az local-context off
-    - name: on
-      uid: az_local_context_on
-      displayName: az local-context on
-    - name: show
-      uid: az_local_context_show
-      displayName: az local-context show
-  - name: pipelines
-    displayName: az pipelines
-    items:
-    - name: Overview
-      uid: az_pipelines
-      displayName: az pipelines
-    - name: create
-      uid: az_pipelines_create
-      displayName: az pipelines create
-    - name: delete
-      uid: az_pipelines_delete
-      displayName: az pipelines delete
-    - name: list
-      uid: az_pipelines_list
-      displayName: az pipelines list
-    - name: run
-      uid: az_pipelines_run
-      displayName: az pipelines run
-    - name: show
-      uid: az_pipelines_show
-      displayName: az pipelines show
-    - name: update
-      uid: az_pipelines_update
-      displayName: az pipelines update
-    - name: agent
-      displayName: az pipelines agent
-      items:
-      - name: Overview
-        uid: az_pipelines_agent
-        displayName: az pipelines agent
-      - name: list
-        uid: az_pipelines_agent_list
-        displayName: az pipelines agent list
-      - name: show
-        uid: az_pipelines_agent_show
-        displayName: az pipelines agent show
-    - name: build
-      displayName: az pipelines build
-      items:
-      - name: Overview
-        uid: az_pipelines_build
-        displayName: az pipelines build
-      - name: list
-        uid: az_pipelines_build_list
-        displayName: az pipelines build list
-      - name: queue
-        uid: az_pipelines_build_queue
-        displayName: az pipelines build queue
-      - name: show
-        uid: az_pipelines_build_show
-        displayName: az pipelines build show
-      - name: definition
-        displayName: az pipelines build definition
-        items:
-        - name: Overview
-          uid: az_pipelines_build_definition
-          displayName: az pipelines build definition
-        - name: list
-          uid: az_pipelines_build_definition_list
-          displayName: az pipelines build definition list
-        - name: show
-          uid: az_pipelines_build_definition_show
-          displayName: az pipelines build definition show
-      - name: tag
-        displayName: az pipelines build tag
-        items:
-        - name: Overview
-          uid: az_pipelines_build_tag
-          displayName: az pipelines build tag
-        - name: add
-          uid: az_pipelines_build_tag_add
-          displayName: az pipelines build tag add
-        - name: delete
-          uid: az_pipelines_build_tag_delete
-          displayName: az pipelines build tag delete
-        - name: list
-          uid: az_pipelines_build_tag_list
-          displayName: az pipelines build tag list
-    - name: folder
-      displayName: az pipelines folder
-      items:
-      - name: Overview
-        uid: az_pipelines_folder
-        displayName: az pipelines folder
-      - name: create
-        uid: az_pipelines_folder_create
-        displayName: az pipelines folder create
-      - name: delete
-        uid: az_pipelines_folder_delete
-        displayName: az pipelines folder delete
-      - name: list
-        uid: az_pipelines_folder_list
-        displayName: az pipelines folder list
-      - name: update
-        uid: az_pipelines_folder_update
-        displayName: az pipelines folder update
-    - name: pool
-      displayName: az pipelines pool
-      items:
-      - name: Overview
-        uid: az_pipelines_pool
-        displayName: az pipelines pool
-      - name: list
-        uid: az_pipelines_pool_list
-        displayName: az pipelines pool list
-      - name: show
-        uid: az_pipelines_pool_show
-        displayName: az pipelines pool show
-    - name: queue
-      displayName: az pipelines queue
-      items:
-      - name: Overview
-        uid: az_pipelines_queue
-        displayName: az pipelines queue
-      - name: list
-        uid: az_pipelines_queue_list
-        displayName: az pipelines queue list
-      - name: show
-        uid: az_pipelines_queue_show
-        displayName: az pipelines queue show
-    - name: release
-      displayName: az pipelines release
-      items:
-      - name: Overview
-        uid: az_pipelines_release
-        displayName: az pipelines release
-      - name: create
-        uid: az_pipelines_release_create
-        displayName: az pipelines release create
-      - name: list
-        uid: az_pipelines_release_list
-        displayName: az pipelines release list
-      - name: show
-        uid: az_pipelines_release_show
-        displayName: az pipelines release show
-      - name: definition
-        displayName: az pipelines release definition
-        items:
-        - name: Overview
-          uid: az_pipelines_release_definition
-          displayName: az pipelines release definition
-        - name: list
-          uid: az_pipelines_release_definition_list
-          displayName: az pipelines release definition list
-        - name: show
-          uid: az_pipelines_release_definition_show
-          displayName: az pipelines release definition show
-    - name: runs
-      displayName: az pipelines runs
-      items:
-      - name: Overview
-        uid: az_pipelines_runs
-        displayName: az pipelines runs
-      - name: list
-        uid: az_pipelines_runs_list
-        displayName: az pipelines runs list
-      - name: show
-        uid: az_pipelines_runs_show
-        displayName: az pipelines runs show
-      - name: artifact
-        displayName: az pipelines runs artifact
-        items:
-        - name: Overview
-          uid: az_pipelines_runs_artifact
-          displayName: az pipelines runs artifact
-        - name: download
-          uid: az_pipelines_runs_artifact_download
-          displayName: az pipelines runs artifact download
-        - name: list
-          uid: az_pipelines_runs_artifact_list
-          displayName: az pipelines runs artifact list
-        - name: upload
-          uid: az_pipelines_runs_artifact_upload
-          displayName: az pipelines runs artifact upload
-      - name: tag
-        displayName: az pipelines runs tag
-        items:
-        - name: Overview
-          uid: az_pipelines_runs_tag
-          displayName: az pipelines runs tag
-        - name: add
-          uid: az_pipelines_runs_tag_add
-          displayName: az pipelines runs tag add
-        - name: delete
-          uid: az_pipelines_runs_tag_delete
-          displayName: az pipelines runs tag delete
-        - name: list
-          uid: az_pipelines_runs_tag_list
-          displayName: az pipelines runs tag list
-    - name: variable
-      displayName: az pipelines variable
-      items:
-      - name: Overview
-        uid: az_pipelines_variable
-        displayName: az pipelines variable
-      - name: create
-        uid: az_pipelines_variable_create
-        displayName: az pipelines variable create
-      - name: delete
-        uid: az_pipelines_variable_delete
-        displayName: az pipelines variable delete
-      - name: list
-        uid: az_pipelines_variable_list
-        displayName: az pipelines variable list
-      - name: update
-        uid: az_pipelines_variable_update
-        displayName: az pipelines variable update
-    - name: variable-group
-      displayName: az pipelines variable-group
-      items:
-      - name: Overview
-        uid: az_pipelines_variable_group
-        displayName: az pipelines variable-group
-      - name: create
-        uid: az_pipelines_variable_group_create
-        displayName: az pipelines variable-group create
-      - name: delete
-        uid: az_pipelines_variable_group_delete
-        displayName: az pipelines variable-group delete
-      - name: list
-        uid: az_pipelines_variable_group_list
-        displayName: az pipelines variable-group list
-      - name: show
-        uid: az_pipelines_variable_group_show
-        displayName: az pipelines variable-group show
-      - name: update
-        uid: az_pipelines_variable_group_update
-        displayName: az pipelines variable-group update
-      - name: variable
-        displayName: az pipelines variable-group variable
-        items:
-        - name: Overview
-          uid: az_pipelines_variable_group_variable
-          displayName: az pipelines variable-group variable
-        - name: create
-          uid: az_pipelines_variable_group_variable_create
-          displayName: az pipelines variable-group variable create
-        - name: delete
-          uid: az_pipelines_variable_group_variable_delete
-          displayName: az pipelines variable-group variable delete
-        - name: list
-          uid: az_pipelines_variable_group_variable_list
-          displayName: az pipelines variable-group variable list
-        - name: update
-          uid: az_pipelines_variable_group_variable_update
-          displayName: az pipelines variable-group variable update
-  - name: repos
-    displayName: az repos
-    items:
-    - name: Overview
-      uid: az_repos
-      displayName: az repos
-    - name: create
-      uid: az_repos_create
-      displayName: az repos create
-    - name: delete
-      uid: az_repos_delete
-      displayName: az repos delete
-    - name: list
-      uid: az_repos_list
-      displayName: az repos list
-    - name: show
-      uid: az_repos_show
-      displayName: az repos show
-    - name: update
-      uid: az_repos_update
-      displayName: az repos update
-    - name: import
-      displayName: az repos import
-      items:
-      - name: Overview
-        uid: az_repos_import
-        displayName: az repos import
-      - name: create
-        uid: az_repos_import_create
-        displayName: az repos import create
-    - name: policy
-      displayName: az repos policy
-      items:
-      - name: Overview
-        uid: az_repos_policy
-        displayName: az repos policy
-      - name: create
-        uid: az_repos_policy_create
-        displayName: az repos policy create
-      - name: delete
-        uid: az_repos_policy_delete
-        displayName: az repos policy delete
-      - name: list
-        uid: az_repos_policy_list
-        displayName: az repos policy list
-      - name: show
-        uid: az_repos_policy_show
-        displayName: az repos policy show
-      - name: update
-        uid: az_repos_policy_update
-        displayName: az repos policy update
-      - name: approver-count
-        displayName: az repos policy approver-count
-        items:
-        - name: Overview
-          uid: az_repos_policy_approver_count
-          displayName: az repos policy approver-count
-        - name: create
-          uid: az_repos_policy_approver_count_create
-          displayName: az repos policy approver-count create
-        - name: update
-          uid: az_repos_policy_approver_count_update
-          displayName: az repos policy approver-count update
-      - name: build
-        displayName: az repos policy build
-        items:
-        - name: Overview
-          uid: az_repos_policy_build
-          displayName: az repos policy build
-        - name: create
-          uid: az_repos_policy_build_create
-          displayName: az repos policy build create
-        - name: update
-          uid: az_repos_policy_build_update
-          displayName: az repos policy build update
-      - name: case-enforcement
-        displayName: az repos policy case-enforcement
-        items:
-        - name: Overview
-          uid: az_repos_policy_case_enforcement
-          displayName: az repos policy case-enforcement
-        - name: create
-          uid: az_repos_policy_case_enforcement_create
-          displayName: az repos policy case-enforcement create
-        - name: update
-          uid: az_repos_policy_case_enforcement_update
-          displayName: az repos policy case-enforcement update
-      - name: comment-required
-        displayName: az repos policy comment-required
-        items:
-        - name: Overview
-          uid: az_repos_policy_comment_required
-          displayName: az repos policy comment-required
-        - name: create
-          uid: az_repos_policy_comment_required_create
-          displayName: az repos policy comment-required create
-        - name: update
-          uid: az_repos_policy_comment_required_update
-          displayName: az repos policy comment-required update
-      - name: file-size
-        displayName: az repos policy file-size
-        items:
-        - name: Overview
-          uid: az_repos_policy_file_size
-          displayName: az repos policy file-size
-        - name: create
-          uid: az_repos_policy_file_size_create
-          displayName: az repos policy file-size create
-        - name: update
-          uid: az_repos_policy_file_size_update
-          displayName: az repos policy file-size update
-      - name: merge-strategy
-        displayName: az repos policy merge-strategy
-        items:
-        - name: Overview
-          uid: az_repos_policy_merge_strategy
-          displayName: az repos policy merge-strategy
-        - name: create
-          uid: az_repos_policy_merge_strategy_create
-          displayName: az repos policy merge-strategy create
-        - name: update
-          uid: az_repos_policy_merge_strategy_update
-          displayName: az repos policy merge-strategy update
-      - name: required-reviewer
-        displayName: az repos policy required-reviewer
-        items:
-        - name: Overview
-          uid: az_repos_policy_required_reviewer
-          displayName: az repos policy required-reviewer
-        - name: create
-          uid: az_repos_policy_required_reviewer_create
-          displayName: az repos policy required-reviewer create
-        - name: update
-          uid: az_repos_policy_required_reviewer_update
-          displayName: az repos policy required-reviewer update
-      - name: work-item-linking
-        displayName: az repos policy work-item-linking
-        items:
-        - name: Overview
-          uid: az_repos_policy_work_item_linking
-          displayName: az repos policy work-item-linking
-        - name: create
-          uid: az_repos_policy_work_item_linking_create
-          displayName: az repos policy work-item-linking create
-        - name: update
-          uid: az_repos_policy_work_item_linking_update
-          displayName: az repos policy work-item-linking update
-    - name: pr
-      displayName: az repos pr
-      items:
-      - name: Overview
-        uid: az_repos_pr
-        displayName: az repos pr
-      - name: checkout
-        uid: az_repos_pr_checkout
-        displayName: az repos pr checkout
-      - name: create
-        uid: az_repos_pr_create
-        displayName: az repos pr create
-      - name: list
-        uid: az_repos_pr_list
-        displayName: az repos pr list
-      - name: set-vote
-        uid: az_repos_pr_set_vote
-        displayName: az repos pr set-vote
-      - name: show
-        uid: az_repos_pr_show
-        displayName: az repos pr show
-      - name: update
-        uid: az_repos_pr_update
-        displayName: az repos pr update
-      - name: policy
-        displayName: az repos pr policy
-        items:
-        - name: Overview
-          uid: az_repos_pr_policy
-          displayName: az repos pr policy
-        - name: list
-          uid: az_repos_pr_policy_list
-          displayName: az repos pr policy list
-        - name: queue
-          uid: az_repos_pr_policy_queue
-          displayName: az repos pr policy queue
-      - name: reviewer
-        displayName: az repos pr reviewer
-        items:
-        - name: Overview
-          uid: az_repos_pr_reviewer
-          displayName: az repos pr reviewer
-        - name: add
-          uid: az_repos_pr_reviewer_add
-          displayName: az repos pr reviewer add
-        - name: list
-          uid: az_repos_pr_reviewer_list
-          displayName: az repos pr reviewer list
-        - name: remove
-          uid: az_repos_pr_reviewer_remove
-          displayName: az repos pr reviewer remove
-      - name: work-item
-        displayName: az repos pr work-item
-        items:
-        - name: Overview
-          uid: az_repos_pr_work_item
-          displayName: az repos pr work-item
-        - name: add
-          uid: az_repos_pr_work_item_add
-          displayName: az repos pr work-item add
-        - name: list
-          uid: az_repos_pr_work_item_list
-          displayName: az repos pr work-item list
-        - name: remove
-          uid: az_repos_pr_work_item_remove
-          displayName: az repos pr work-item remove
-    - name: ref
-      displayName: az repos ref
-      items:
-      - name: Overview
-        uid: az_repos_ref
-        displayName: az repos ref
-      - name: create
-        uid: az_repos_ref_create
-        displayName: az repos ref create
-      - name: delete
-        uid: az_repos_ref_delete
-        displayName: az repos ref delete
-      - name: list
-        uid: az_repos_ref_list
-        displayName: az repos ref list
-      - name: lock
-        uid: az_repos_ref_lock
-        displayName: az repos ref lock
-      - name: unlock
-        uid: az_repos_ref_unlock
-        displayName: az repos ref unlock
-  - name: security
-    displayName: az security
-    items:
-    - name: Overview
-      uid: az_security
-      displayName: az security
-    - name: alert
-      displayName: az security alert
-      items:
-      - name: Overview
-        uid: az_security_alert
-        displayName: az security alert
-      - name: list
-        uid: az_security_alert_list
-        displayName: az security alert list
-      - name: show
-        uid: az_security_alert_show
-        displayName: az security alert show
-      - name: update
-        uid: az_security_alert_update
-        displayName: az security alert update
-    - name: atp
-      displayName: az security atp
-      items:
-      - name: Overview
-        uid: az_security_atp
-        displayName: az security atp
-      - name: storage
-        displayName: az security atp storage
-        items:
-        - name: Overview
-          uid: az_security_atp_storage
-          displayName: az security atp storage
-        - name: show
-          uid: az_security_atp_storage_show
-          displayName: az security atp storage show
-        - name: update
-          uid: az_security_atp_storage_update
-          displayName: az security atp storage update
-    - name: auto-provisioning-setting
-      displayName: az security auto-provisioning-setting
-      items:
-      - name: Overview
-        uid: az_security_auto_provisioning_setting
-        displayName: az security auto-provisioning-setting
-      - name: list
-        uid: az_security_auto_provisioning_setting_list
-        displayName: az security auto-provisioning-setting list
-      - name: show
-        uid: az_security_auto_provisioning_setting_show
-        displayName: az security auto-provisioning-setting show
-      - name: update
-        uid: az_security_auto_provisioning_setting_update
-        displayName: az security auto-provisioning-setting update
-    - name: contact
-      displayName: az security contact
-      items:
-      - name: Overview
-        uid: az_security_contact
-        displayName: az security contact
-      - name: create
-        uid: az_security_contact_create
-        displayName: az security contact create
-      - name: delete
-        uid: az_security_contact_delete
-        displayName: az security contact delete
-      - name: list
-        uid: az_security_contact_list
-        displayName: az security contact list
-      - name: show
-        uid: az_security_contact_show
-        displayName: az security contact show
-    - name: discovered-security-solution
-      displayName: az security discovered-security-solution
-      items:
-      - name: Overview
-        uid: az_security_discovered_security_solution
-        displayName: az security discovered-security-solution
-      - name: list
-        uid: az_security_discovered_security_solution_list
-        displayName: az security discovered-security-solution list
-      - name: show
-        uid: az_security_discovered_security_solution_show
-        displayName: az security discovered-security-solution show
-    - name: external-security-solution
-      displayName: az security external-security-solution
-      items:
-      - name: Overview
-        uid: az_security_external_security_solution
-        displayName: az security external-security-solution
-      - name: list
-        uid: az_security_external_security_solution_list
-        displayName: az security external-security-solution list
-      - name: show
-        uid: az_security_external_security_solution_show
-        displayName: az security external-security-solution show
-    - name: jit-policy
-      displayName: az security jit-policy
-      items:
-      - name: Overview
-        uid: az_security_jit_policy
-        displayName: az security jit-policy
-      - name: list
-        uid: az_security_jit_policy_list
-        displayName: az security jit-policy list
-      - name: show
-        uid: az_security_jit_policy_show
-        displayName: az security jit-policy show
-    - name: location
-      displayName: az security location
-      items:
-      - name: Overview
-        uid: az_security_location
-        displayName: az security location
-      - name: list
-        uid: az_security_location_list
-        displayName: az security location list
-      - name: show
-        uid: az_security_location_show
-        displayName: az security location show
-    - name: pricing
-      displayName: az security pricing
-      items:
-      - name: Overview
-        uid: az_security_pricing
-        displayName: az security pricing
-      - name: create
-        uid: az_security_pricing_create
-        displayName: az security pricing create
-      - name: list
-        uid: az_security_pricing_list
-        displayName: az security pricing list
-      - name: show
-        uid: az_security_pricing_show
-        displayName: az security pricing show
-    - name: setting
-      displayName: az security setting
-      items:
-      - name: Overview
-        uid: az_security_setting
-        displayName: az security setting
-      - name: list
-        uid: az_security_setting_list
-        displayName: az security setting list
-      - name: show
-        uid: az_security_setting_show
-        displayName: az security setting show
-    - name: task
-      displayName: az security task
-      items:
-      - name: Overview
-        uid: az_security_task
-        displayName: az security task
-      - name: list
-        uid: az_security_task_list
-        displayName: az security task list
-      - name: show
-        uid: az_security_task_show
-        displayName: az security task show
-    - name: topology
-      displayName: az security topology
-      items:
-      - name: Overview
-        uid: az_security_topology
-        displayName: az security topology
-      - name: list
-        uid: az_security_topology_list
-        displayName: az security topology list
-      - name: show
-        uid: az_security_topology_show
-        displayName: az security topology show
-    - name: workspace-setting
-      displayName: az security workspace-setting
-      items:
-      - name: Overview
-        uid: az_security_workspace_setting
-        displayName: az security workspace-setting
-      - name: create
-        uid: az_security_workspace_setting_create
-        displayName: az security workspace-setting create
-      - name: delete
-        uid: az_security_workspace_setting_delete
-        displayName: az security workspace-setting delete
-      - name: list
-        uid: az_security_workspace_setting_list
-        displayName: az security workspace-setting list
-      - name: show
-        uid: az_security_workspace_setting_show
-        displayName: az security workspace-setting show
-- name: Extensions Reference
-  items:
-  - name: account
-    items:
-    - name: Overview
-      uid: ext_account_az
-    - name: Subscriptions
-      displayName: az account
-      items:
-      - name: Overview
-        uid: ext_account_az_account
-        displayName: az account
-      - name: subscription
-        displayName: az account subscription
-        items:
-        - name: Overview
-          uid: ext_account_az_account_subscription
-          displayName: az account subscription
-        - name: cancel
-          uid: ext_account_az_account_subscription_cancel
-          displayName: az account subscription cancel
-        - name: create
-          uid: ext_account_az_account_subscription_create
-          displayName: az account subscription create
-        - name: create-csp
-          uid: ext_account_az_account_subscription_create_csp
-          displayName: az account subscription create-csp
-        - name: create-in-enrollment-account
-          uid: ext_account_az_account_subscription_create_in_enrollment_account
-          displayName: az account subscription create-in-enrollment-account
-        - name: enable
-          uid: ext_account_az_account_subscription_enable
-          displayName: az account subscription enable
-        - name: rename
-          uid: ext_account_az_account_subscription_rename
-          displayName: az account subscription rename
-  - name: aem
-    items:
-    - name: Overview
-      uid: ext_aem_az
-    - name: Virtual Machines
-      displayName: az vm
-      items:
-      - name: Overview
-        uid: ext_aem_az_vm
-        displayName: az vm
-      - name: aem
-        displayName: az vm aem
-        items:
-        - name: Overview
-          uid: ext_aem_az_vm_aem
-          displayName: az vm aem
-        - name: delete
-          uid: ext_aem_az_vm_aem_delete
-          displayName: az vm aem delete
-        - name: set
-          uid: ext_aem_az_vm_aem_set
-          displayName: az vm aem set
-        - name: verify
-          uid: ext_aem_az_vm_aem_verify
-          displayName: az vm aem verify
-  - name: ai-did-you-mean-this
-    items:
-    - name: Overview
-      uid: ext_ai-did-you-mean-this_az
-    - name: ai-did-you-mean-this
-      displayName: az ai-did-you-mean-this
-      items:
-      - name: Overview
-        uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-        displayName: az ai-did-you-mean-this
-      - name: version
-        uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-        displayName: az ai-did-you-mean-this version
-  - name: ai-examples
-    items:
-    - name: Overview
-      uid: ext_ai-examples_az
-    - name: ai-examples
-      displayName: az ai-examples
-      items:
-      - name: Overview
-        uid: ext_ai-examples_az_ai_examples
-        displayName: az ai-examples
-      - name: check-connection
-        uid: ext_ai-examples_az_ai_examples_check_connection
-        displayName: az ai-examples check-connection
-  - name: aks-preview
-    items:
-    - name: Overview
-      uid: ext_aks-preview_az
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_aks-preview_az_aks
-        displayName: az aks
-      - name: browse
-        uid: ext_aks-preview_az_aks_browse
-        displayName: az aks browse
-      - name: create
-        uid: ext_aks-preview_az_aks_create
-        displayName: az aks create
-      - name: disable-addons
-        uid: ext_aks-preview_az_aks_disable_addons
-        displayName: az aks disable-addons
-      - name: enable-addons
-        uid: ext_aks-preview_az_aks_enable_addons
-        displayName: az aks enable-addons
-      - name: get-credentials
-        uid: ext_aks-preview_az_aks_get_credentials
-        displayName: az aks get-credentials
-      - name: get-upgrades
-        uid: ext_aks-preview_az_aks_get_upgrades
-        displayName: az aks get-upgrades
-      - name: get-versions
-        uid: ext_aks-preview_az_aks_get_versions
-        displayName: az aks get-versions
-      - name: kanalyze
-        uid: ext_aks-preview_az_aks_kanalyze
-        displayName: az aks kanalyze
-      - name: kollect
-        uid: ext_aks-preview_az_aks_kollect
-        displayName: az aks kollect
-      - name: rotate-certs
-        uid: ext_aks-preview_az_aks_rotate_certs
-        displayName: az aks rotate-certs
-      - name: scale
-        uid: ext_aks-preview_az_aks_scale
-        displayName: az aks scale
-      - name: show
-        uid: ext_aks-preview_az_aks_show
-        displayName: az aks show
-      - name: update
-        uid: ext_aks-preview_az_aks_update
-        displayName: az aks update
-      - name: upgrade
-        uid: ext_aks-preview_az_aks_upgrade
-        displayName: az aks upgrade
-      - name: wait
-        uid: ext_aks-preview_az_aks_wait
-        displayName: az aks wait
-      - name: nodepool
-        displayName: az aks nodepool
-        items:
-        - name: Overview
-          uid: ext_aks-preview_az_aks_nodepool
-          displayName: az aks nodepool
-        - name: add
-          uid: ext_aks-preview_az_aks_nodepool_add
-          displayName: az aks nodepool add
-        - name: delete
-          uid: ext_aks-preview_az_aks_nodepool_delete
-          displayName: az aks nodepool delete
-        - name: list
-          uid: ext_aks-preview_az_aks_nodepool_list
-          displayName: az aks nodepool list
-        - name: scale
-          uid: ext_aks-preview_az_aks_nodepool_scale
-          displayName: az aks nodepool scale
-        - name: show
-          uid: ext_aks-preview_az_aks_nodepool_show
-          displayName: az aks nodepool show
-        - name: update
-          uid: ext_aks-preview_az_aks_nodepool_update
-          displayName: az aks nodepool update
-        - name: upgrade
-          uid: ext_aks-preview_az_aks_nodepool_upgrade
-          displayName: az aks nodepool upgrade
-  - name: alertsmanagement
-    items:
-    - name: Overview
-      uid: ext_alertsmanagement_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_alertsmanagement_az_monitor
-        displayName: az monitor
-      - name: action-rule
-        displayName: az monitor action-rule
-        items:
-        - name: Overview
-          uid: ext_alertsmanagement_az_monitor_action_rule
-          displayName: az monitor action-rule
-        - name: create
-          uid: ext_alertsmanagement_az_monitor_action_rule_create
-          displayName: az monitor action-rule create
-        - name: delete
-          uid: ext_alertsmanagement_az_monitor_action_rule_delete
-          displayName: az monitor action-rule delete
-        - name: list
-          uid: ext_alertsmanagement_az_monitor_action_rule_list
-          displayName: az monitor action-rule list
-        - name: show
-          uid: ext_alertsmanagement_az_monitor_action_rule_show
-          displayName: az monitor action-rule show
-        - name: update
-          uid: ext_alertsmanagement_az_monitor_action_rule_update
-          displayName: az monitor action-rule update
-  - name: alias
-    items:
-    - name: Overview
-      uid: ext_alias_az
-    - name: alias
-      displayName: az alias
-      items:
-      - name: Overview
-        uid: ext_alias_az_alias
-        displayName: az alias
-      - name: create
-        uid: ext_alias_az_alias_create
-        displayName: az alias create
-      - name: export
-        uid: ext_alias_az_alias_export
-        displayName: az alias export
-      - name: import
-        uid: ext_alias_az_alias_import
-        displayName: az alias import
-      - name: list
-        uid: ext_alias_az_alias_list
-        displayName: az alias list
-      - name: remove
-        uid: ext_alias_az_alias_remove
-        displayName: az alias remove
-      - name: remove-all
-        uid: ext_alias_az_alias_remove_all
-        displayName: az alias remove-all
-  - name: application-insights
-    items:
-    - name: Overview
-      uid: ext_application-insights_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_application-insights_az_monitor
-        displayName: az monitor
-      - name: app-insights
-        displayName: az monitor app-insights
-        items:
-        - name: Overview
-          uid: ext_application-insights_az_monitor_app_insights
-          displayName: az monitor app-insights
-        - name: query
-          uid: ext_application-insights_az_monitor_app_insights_query
-          displayName: az monitor app-insights query
-        - name: api-key
-          displayName: az monitor app-insights api-key
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_api_key
-            displayName: az monitor app-insights api-key
-          - name: create
-            uid: ext_application-insights_az_monitor_app_insights_api_key_create
-            displayName: az monitor app-insights api-key create
-          - name: delete
-            uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-            displayName: az monitor app-insights api-key delete
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_api_key_show
-            displayName: az monitor app-insights api-key show
-        - name: component
-          displayName: az monitor app-insights component
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_component
-            displayName: az monitor app-insights component
-          - name: create
-            uid: ext_application-insights_az_monitor_app_insights_component_create
-            displayName: az monitor app-insights component create
-          - name: delete
-            uid: ext_application-insights_az_monitor_app_insights_component_delete
-            displayName: az monitor app-insights component delete
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_component_show
-            displayName: az monitor app-insights component show
-          - name: update
-            uid: ext_application-insights_az_monitor_app_insights_component_update
-            displayName: az monitor app-insights component update
-          - name: update-tags
-            uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-            displayName: az monitor app-insights component update-tags
-          - name: billing
-            displayName: az monitor app-insights component billing
-            items:
-            - name: Overview
-              uid: ext_application-insights_az_monitor_app_insights_component_billing
-              displayName: az monitor app-insights component billing
-            - name: show
-              uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-              displayName: az monitor app-insights component billing show
-            - name: update
-              uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-              displayName: az monitor app-insights component billing update
-          - name: linked-storage
-            displayName: az monitor app-insights component linked-storage
-            items:
-            - name: Overview
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-              displayName: az monitor app-insights component linked-storage
-            - name: link
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-              displayName: az monitor app-insights component linked-storage link
-            - name: show
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-              displayName: az monitor app-insights component linked-storage show
-            - name: unlink
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-              displayName: az monitor app-insights component linked-storage unlink
-            - name: update
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-              displayName: az monitor app-insights component linked-storage update
-        - name: events
-          displayName: az monitor app-insights events
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_events
-            displayName: az monitor app-insights events
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_events_show
-            displayName: az monitor app-insights events show
-        - name: metrics
-          displayName: az monitor app-insights metrics
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_metrics
-            displayName: az monitor app-insights metrics
-          - name: get-metadata
-            uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-            displayName: az monitor app-insights metrics get-metadata
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_metrics_show
-            displayName: az monitor app-insights metrics show
-  - name: azure-batch-cli-extensions
-    items:
-    - name: Overview
-      uid: ext_azure-batch-cli-extensions_az
-    - name: Batch
-      displayName: az batch
-      items:
-      - name: Overview
-        uid: ext_azure-batch-cli-extensions_az_batch
-        displayName: az batch
-      - name: Jobs
-        displayName: az batch job
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_job
-          displayName: az batch job
-        - name: create
-          uid: ext_azure-batch-cli-extensions_az_batch_job_create
-          displayName: az batch job create
-      - name: Pools
-        displayName: az batch pool
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_pool
-          displayName: az batch pool
-        - name: create
-          uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-          displayName: az batch pool create
-      - name: file
-        displayName: az batch file
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_file
-          displayName: az batch file
-        - name: download
-          uid: ext_azure-batch-cli-extensions_az_batch_file_download
-          displayName: az batch file download
-        - name: upload
-          uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-          displayName: az batch file upload
-  - name: azure-cli-iot-ext
-    items:
-    - name: Overview
-      uid: ext_azure-cli-iot-ext_az
-    - name: IoT
-      displayName: az iot
-      items:
-      - name: Overview
-        uid: ext_azure-cli-iot-ext_az_iot
-        displayName: az iot
-      - name: Devices
-        displayName: az iot device
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_device
-          displayName: az iot device
-        - name: send-d2c-message
-          uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-          displayName: az iot device send-d2c-message
-        - name: simulate
-          uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-          displayName: az iot device simulate
-        - name: upload-file
-          uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-          displayName: az iot device upload-file
-        - name: c2d-message
-          displayName: az iot device c2d-message
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-            displayName: az iot device c2d-message
-          - name: abandon
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-            displayName: az iot device c2d-message abandon
-          - name: complete
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-            displayName: az iot device c2d-message complete
-          - name: receive
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-            displayName: az iot device c2d-message receive
-          - name: reject
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-            displayName: az iot device c2d-message reject
-          - name: send
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-            displayName: az iot device c2d-message send
-      - name: Hubs
-        displayName: az iot hub
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_hub
-          displayName: az iot hub
-        - name: generate-sas-token
-          uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-          displayName: az iot hub generate-sas-token
-        - name: invoke-device-method
-          uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-          displayName: az iot hub invoke-device-method
-        - name: invoke-module-method
-          uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-          displayName: az iot hub invoke-module-method
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-          displayName: az iot hub monitor-events
-        - name: monitor-feedback
-          uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-          displayName: az iot hub monitor-feedback
-        - name: query
-          uid: ext_azure-cli-iot-ext_az_iot_hub_query
-          displayName: az iot hub query
-        - name: Jobs
-          displayName: az iot hub job
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job
-            displayName: az iot hub job
-          - name: cancel
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-            displayName: az iot hub job cancel
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-            displayName: az iot hub job create
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-            displayName: az iot hub job list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-            displayName: az iot hub job show
-        - name: configuration
-          displayName: az iot hub configuration
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-            displayName: az iot hub configuration
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-            displayName: az iot hub configuration create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-            displayName: az iot hub configuration delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-            displayName: az iot hub configuration list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-            displayName: az iot hub configuration show
-          - name: show-metric
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-            displayName: az iot hub configuration show-metric
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-            displayName: az iot hub configuration update
-        - name: device-identity
-          displayName: az iot hub device-identity
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-            displayName: az iot hub device-identity
-          - name: add-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-            displayName: az iot hub device-identity add-children
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-            displayName: az iot hub device-identity create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-            displayName: az iot hub device-identity delete
-          - name: export
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-            displayName: az iot hub device-identity export
-          - name: get-parent
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-            displayName: az iot hub device-identity get-parent
-          - name: import
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-            displayName: az iot hub device-identity import
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-            displayName: az iot hub device-identity list
-          - name: list-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-            displayName: az iot hub device-identity list-children
-          - name: remove-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-            displayName: az iot hub device-identity remove-children
-          - name: set-parent
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-            displayName: az iot hub device-identity set-parent
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-            displayName: az iot hub device-identity show
-          - name: show-connection-string
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-            displayName: az iot hub device-identity show-connection-string
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-            displayName: az iot hub device-identity update
-        - name: device-twin
-          displayName: az iot hub device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-            displayName: az iot hub device-twin
-          - name: replace
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-            displayName: az iot hub device-twin replace
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-            displayName: az iot hub device-twin show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-            displayName: az iot hub device-twin update
-        - name: distributed-tracing
-          displayName: az iot hub distributed-tracing
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-            displayName: az iot hub distributed-tracing
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-            displayName: az iot hub distributed-tracing show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-            displayName: az iot hub distributed-tracing update
-        - name: module-identity
-          displayName: az iot hub module-identity
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-            displayName: az iot hub module-identity
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-            displayName: az iot hub module-identity create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-            displayName: az iot hub module-identity delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-            displayName: az iot hub module-identity list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-            displayName: az iot hub module-identity show
-          - name: show-connection-string
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-            displayName: az iot hub module-identity show-connection-string
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-            displayName: az iot hub module-identity update
-        - name: module-twin
-          displayName: az iot hub module-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-            displayName: az iot hub module-twin
-          - name: replace
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-            displayName: az iot hub module-twin replace
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-            displayName: az iot hub module-twin show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-            displayName: az iot hub module-twin update
-      - name: central
-        displayName: az iot central
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_central
-          displayName: az iot central
-        - name: app
-          displayName: az iot central app
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_central_app
-            displayName: az iot central app
-          - name: monitor-events
-            uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-            displayName: az iot central app monitor-events
-        - name: device-twin
-          displayName: az iot central device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-            displayName: az iot central device-twin
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-            displayName: az iot central device-twin show
-      - name: dps
-        displayName: az iot dps
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_dps
-          displayName: az iot dps
-        - name: enrollment
-          displayName: az iot dps enrollment
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-            displayName: az iot dps enrollment
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-            displayName: az iot dps enrollment create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-            displayName: az iot dps enrollment delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-            displayName: az iot dps enrollment list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-            displayName: az iot dps enrollment show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-            displayName: az iot dps enrollment update
-        - name: enrollment-group
-          displayName: az iot dps enrollment-group
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-            displayName: az iot dps enrollment-group
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-            displayName: az iot dps enrollment-group create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-            displayName: az iot dps enrollment-group delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-            displayName: az iot dps enrollment-group list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-            displayName: az iot dps enrollment-group show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-            displayName: az iot dps enrollment-group update
-        - name: registration
-          displayName: az iot dps registration
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-            displayName: az iot dps registration
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-            displayName: az iot dps registration delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-            displayName: az iot dps registration list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-            displayName: az iot dps registration show
-      - name: dt
-        displayName: az iot dt
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_dt
-          displayName: az iot dt
-        - name: invoke-command
-          uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-          displayName: az iot dt invoke-command
-        - name: list-commands
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-          displayName: az iot dt list-commands
-        - name: list-interfaces
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-          displayName: az iot dt list-interfaces
-        - name: list-properties
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-          displayName: az iot dt list-properties
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-          displayName: az iot dt monitor-events
-        - name: update-property
-          uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-          displayName: az iot dt update-property
-      - name: edge
-        displayName: az iot edge
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_edge
-          displayName: az iot edge
-        - name: set-modules
-          uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-          displayName: az iot edge set-modules
-        - name: deployment
-          displayName: az iot edge deployment
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-            displayName: az iot edge deployment
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-            displayName: az iot edge deployment create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-            displayName: az iot edge deployment delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-            displayName: az iot edge deployment list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-            displayName: az iot edge deployment show
-          - name: show-metric
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-            displayName: az iot edge deployment show-metric
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-            displayName: az iot edge deployment update
-      - name: pnp
-        displayName: az iot pnp
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_pnp
-          displayName: az iot pnp
-        - name: capability-model
-          displayName: az iot pnp capability-model
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-            displayName: az iot pnp capability-model
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-            displayName: az iot pnp capability-model create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-            displayName: az iot pnp capability-model delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-            displayName: az iot pnp capability-model list
-          - name: publish
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-            displayName: az iot pnp capability-model publish
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-            displayName: az iot pnp capability-model show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-            displayName: az iot pnp capability-model update
-        - name: interface
-          displayName: az iot pnp interface
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-            displayName: az iot pnp interface
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-            displayName: az iot pnp interface create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-            displayName: az iot pnp interface delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-            displayName: az iot pnp interface list
-          - name: publish
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-            displayName: az iot pnp interface publish
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-            displayName: az iot pnp interface show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-            displayName: az iot pnp interface update
-    - name: iotcentral
-      displayName: az iotcentral
-      items:
-      - name: Overview
-        uid: ext_azure-cli-iot-ext_az_iotcentral
-        displayName: az iotcentral
-      - name: app
-        displayName: az iotcentral app
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iotcentral_app
-          displayName: az iotcentral app
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-          displayName: az iotcentral app monitor-events
-      - name: device-twin
-        displayName: az iotcentral device-twin
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-          displayName: az iotcentral device-twin
-        - name: show
-          uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-          displayName: az iotcentral device-twin show
-  - name: azure-cli-ml
-    items:
-    - name: Overview
-      uid: ext_azure-cli-ml_az
-    - name: ml
-      displayName: az ml
-      items:
-      - name: Overview
-        uid: ext_azure-cli-ml_az_ml
-        displayName: az ml
-      - name: computetarget
-        displayName: az ml computetarget
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_computetarget
-          displayName: az ml computetarget
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_computetarget_delete
-          displayName: az ml computetarget delete
-        - name: detach
-          uid: ext_azure-cli-ml_az_ml_computetarget_detach
-          displayName: az ml computetarget detach
-        - name: get-credentials
-          uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-          displayName: az ml computetarget get-credentials
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_computetarget_list
-          displayName: az ml computetarget list
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_computetarget_show
-          displayName: az ml computetarget show
-        - name: amlcompute
-          displayName: az ml computetarget amlcompute
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-            displayName: az ml computetarget amlcompute
-          - name: identity
-            displayName: az ml computetarget amlcompute identity
-            items:
-            - name: Overview
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-              displayName: az ml computetarget amlcompute identity
-            - name: assign
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-              displayName: az ml computetarget amlcompute identity assign
-            - name: remove
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-              displayName: az ml computetarget amlcompute identity remove
-            - name: show
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-              displayName: az ml computetarget amlcompute identity show
-        - name: attach
-          displayName: az ml computetarget attach
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach
-            displayName: az ml computetarget attach
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-            displayName: az ml computetarget attach aks
-          - name: remote
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-            displayName: az ml computetarget attach remote
-        - name: create
-          displayName: az ml computetarget create
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_create
-            displayName: az ml computetarget create
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-            displayName: az ml computetarget create aks
-          - name: amlcompute
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-            displayName: az ml computetarget create amlcompute
-          - name: datafactory
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-            displayName: az ml computetarget create datafactory
-        - name: update
-          displayName: az ml computetarget update
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_update
-            displayName: az ml computetarget update
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-            displayName: az ml computetarget update aks
-          - name: amlcompute
-            uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-            displayName: az ml computetarget update amlcompute
-      - name: dataset
-        displayName: az ml dataset
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_dataset
-          displayName: az ml dataset
-        - name: archive
-          uid: ext_azure-cli-ml_az_ml_dataset_archive
-          displayName: az ml dataset archive
-        - name: deprecate
-          uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-          displayName: az ml dataset deprecate
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_dataset_list
-          displayName: az ml dataset list
-        - name: reactivate
-          uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-          displayName: az ml dataset reactivate
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_dataset_register
-          displayName: az ml dataset register
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_dataset_show
-          displayName: az ml dataset show
-        - name: unregister
-          uid: ext_azure-cli-ml_az_ml_dataset_unregister
-          displayName: az ml dataset unregister
-      - name: datastore
-        displayName: az ml datastore
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_datastore
-          displayName: az ml datastore
-        - name: attach-adls
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-          displayName: az ml datastore attach-adls
-        - name: attach-adls-gen2
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-          displayName: az ml datastore attach-adls-gen2
-        - name: attach-blob
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-          displayName: az ml datastore attach-blob
-        - name: attach-dbfs
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-          displayName: az ml datastore attach-dbfs
-        - name: attach-file
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-          displayName: az ml datastore attach-file
-        - name: attach-mysqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-          displayName: az ml datastore attach-mysqldb
-        - name: attach-psqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-          displayName: az ml datastore attach-psqldb
-        - name: attach-sqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-          displayName: az ml datastore attach-sqldb
-        - name: detach
-          uid: ext_azure-cli-ml_az_ml_datastore_detach
-          displayName: az ml datastore detach
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_datastore_download
-          displayName: az ml datastore download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_datastore_list
-          displayName: az ml datastore list
-        - name: set-default
-          uid: ext_azure-cli-ml_az_ml_datastore_set_default
-          displayName: az ml datastore set-default
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_datastore_show
-          displayName: az ml datastore show
-        - name: show-default
-          uid: ext_azure-cli-ml_az_ml_datastore_show_default
-          displayName: az ml datastore show-default
-        - name: upload
-          uid: ext_azure-cli-ml_az_ml_datastore_upload
-          displayName: az ml datastore upload
-      - name: endpoint
-        displayName: az ml endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_endpoint
-          displayName: az ml endpoint
-        - name: realtime
-          displayName: az ml endpoint realtime
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-            displayName: az ml endpoint realtime
-          - name: create-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-            displayName: az ml endpoint realtime create-version
-          - name: delete
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-            displayName: az ml endpoint realtime delete
-          - name: delete-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-            displayName: az ml endpoint realtime delete-version
-          - name: get-access-token
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-            displayName: az ml endpoint realtime get-access-token
-          - name: get-keys
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-            displayName: az ml endpoint realtime get-keys
-          - name: get-logs
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-            displayName: az ml endpoint realtime get-logs
-          - name: list
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-            displayName: az ml endpoint realtime list
-          - name: regen-key
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-            displayName: az ml endpoint realtime regen-key
-          - name: run
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-            displayName: az ml endpoint realtime run
-          - name: show
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-            displayName: az ml endpoint realtime show
-          - name: update
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-            displayName: az ml endpoint realtime update
-          - name: update-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-            displayName: az ml endpoint realtime update-version
-      - name: environment
-        displayName: az ml environment
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_environment
-          displayName: az ml environment
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_environment_download
-          displayName: az ml environment download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_environment_list
-          displayName: az ml environment list
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_environment_register
-          displayName: az ml environment register
-        - name: scaffold
-          uid: ext_azure-cli-ml_az_ml_environment_scaffold
-          displayName: az ml environment scaffold
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_environment_show
-          displayName: az ml environment show
-      - name: experiment
-        displayName: az ml experiment
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_experiment
-          displayName: az ml experiment
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_experiment_list
-          displayName: az ml experiment list
-      - name: folder
-        displayName: az ml folder
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_folder
-          displayName: az ml folder
-        - name: attach
-          uid: ext_azure-cli-ml_az_ml_folder_attach
-          displayName: az ml folder attach
-      - name: model
-        displayName: az ml model
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_model
-          displayName: az ml model
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_model_delete
-          displayName: az ml model delete
-        - name: deploy
-          uid: ext_azure-cli-ml_az_ml_model_deploy
-          displayName: az ml model deploy
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_model_download
-          displayName: az ml model download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_model_list
-          displayName: az ml model list
-        - name: package
-          uid: ext_azure-cli-ml_az_ml_model_package
-          displayName: az ml model package
-        - name: profile
-          uid: ext_azure-cli-ml_az_ml_model_profile
-          displayName: az ml model profile
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_model_register
-          displayName: az ml model register
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_model_show
-          displayName: az ml model show
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_model_update
-          displayName: az ml model update
-      - name: pipeline
-        displayName: az ml pipeline
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_pipeline
-          displayName: az ml pipeline
-        - name: clone
-          uid: ext_azure-cli-ml_az_ml_pipeline_clone
-          displayName: az ml pipeline clone
-        - name: clone-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-          displayName: az ml pipeline clone-draft
-        - name: create
-          uid: ext_azure-cli-ml_az_ml_pipeline_create
-          displayName: az ml pipeline create
-        - name: create-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-          displayName: az ml pipeline create-draft
-        - name: create-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-          displayName: az ml pipeline create-schedule
-        - name: delete-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-          displayName: az ml pipeline delete-draft
-        - name: disable
-          uid: ext_azure-cli-ml_az_ml_pipeline_disable
-          displayName: az ml pipeline disable
-        - name: disable-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-          displayName: az ml pipeline disable-schedule
-        - name: enable
-          uid: ext_azure-cli-ml_az_ml_pipeline_enable
-          displayName: az ml pipeline enable
-        - name: enable-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-          displayName: az ml pipeline enable-schedule
-        - name: get
-          uid: ext_azure-cli-ml_az_ml_pipeline_get
-          displayName: az ml pipeline get
-        - name: last-pipeline-run
-          uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-          displayName: az ml pipeline last-pipeline-run
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_pipeline_list
-          displayName: az ml pipeline list
-        - name: list-drafts
-          uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-          displayName: az ml pipeline list-drafts
-        - name: list-steps
-          uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-          displayName: az ml pipeline list-steps
-        - name: pipeline-runs-list
-          uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-          displayName: az ml pipeline pipeline-runs-list
-        - name: publish-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-          displayName: az ml pipeline publish-draft
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_pipeline_show
-          displayName: az ml pipeline show
-        - name: show-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-          displayName: az ml pipeline show-draft
-        - name: show-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-          displayName: az ml pipeline show-schedule
-        - name: submit-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-          displayName: az ml pipeline submit-draft
-        - name: update-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-          displayName: az ml pipeline update-draft
-        - name: update-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-          displayName: az ml pipeline update-schedule
-      - name: run
-        displayName: az ml run
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_run
-          displayName: az ml run
-        - name: cancel
-          uid: ext_azure-cli-ml_az_ml_run_cancel
-          displayName: az ml run cancel
-        - name: download-logs
-          uid: ext_azure-cli-ml_az_ml_run_download_logs
-          displayName: az ml run download-logs
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_run_list
-          displayName: az ml run list
-        - name: monitor-logs
-          uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-          displayName: az ml run monitor-logs
-        - name: monitor-tensorboard
-          uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-          displayName: az ml run monitor-tensorboard
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_run_show
-          displayName: az ml run show
-        - name: submit-hyperdrive
-          uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-          displayName: az ml run submit-hyperdrive
-        - name: submit-pipeline
-          uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-          displayName: az ml run submit-pipeline
-        - name: submit-script
-          uid: ext_azure-cli-ml_az_ml_run_submit_script
-          displayName: az ml run submit-script
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_run_update
-          displayName: az ml run update
-      - name: service
-        displayName: az ml service
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_service
-          displayName: az ml service
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_service_delete
-          displayName: az ml service delete
-        - name: get-access-token
-          uid: ext_azure-cli-ml_az_ml_service_get_access_token
-          displayName: az ml service get-access-token
-        - name: get-keys
-          uid: ext_azure-cli-ml_az_ml_service_get_keys
-          displayName: az ml service get-keys
-        - name: get-logs
-          uid: ext_azure-cli-ml_az_ml_service_get_logs
-          displayName: az ml service get-logs
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_service_list
-          displayName: az ml service list
-        - name: regen-key
-          uid: ext_azure-cli-ml_az_ml_service_regen_key
-          displayName: az ml service regen-key
-        - name: run
-          uid: ext_azure-cli-ml_az_ml_service_run
-          displayName: az ml service run
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_service_show
-          displayName: az ml service show
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_service_update
-          displayName: az ml service update
-      - name: workspace
-        displayName: az ml workspace
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_workspace
-          displayName: az ml workspace
-        - name: create
-          uid: ext_azure-cli-ml_az_ml_workspace_create
-          displayName: az ml workspace create
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_workspace_delete
-          displayName: az ml workspace delete
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_workspace_list
-          displayName: az ml workspace list
-        - name: share
-          uid: ext_azure-cli-ml_az_ml_workspace_share
-          displayName: az ml workspace share
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_workspace_show
-          displayName: az ml workspace show
-        - name: sync-keys
-          uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-          displayName: az ml workspace sync-keys
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_workspace_update
-          displayName: az ml workspace update
-        - name: private-endpoint
-          displayName: az ml workspace private-endpoint
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-            displayName: az ml workspace private-endpoint
-          - name: add
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-            displayName: az ml workspace private-endpoint add
-          - name: delete
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-            displayName: az ml workspace private-endpoint delete
-          - name: list
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-            displayName: az ml workspace private-endpoint list
-  - name: azure-devops
-    items:
-    - name: Overview
-      uid: ext_azure-devops_az
-    - name: artifacts
-      displayName: az artifacts
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_artifacts
-        displayName: az artifacts
-      - name: universal
-        displayName: az artifacts universal
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_artifacts_universal
-          displayName: az artifacts universal
-        - name: download
-          uid: ext_azure-devops_az_artifacts_universal_download
-          displayName: az artifacts universal download
-        - name: publish
-          uid: ext_azure-devops_az_artifacts_universal_publish
-          displayName: az artifacts universal publish
-    - name: boards
-      displayName: az boards
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_boards
-        displayName: az boards
-      - name: query
-        uid: ext_azure-devops_az_boards_query
-        displayName: az boards query
-      - name: area
-        displayName: az boards area
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_area
-          displayName: az boards area
-        - name: project
-          displayName: az boards area project
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_area_project
-            displayName: az boards area project
-          - name: create
-            uid: ext_azure-devops_az_boards_area_project_create
-            displayName: az boards area project create
-          - name: delete
-            uid: ext_azure-devops_az_boards_area_project_delete
-            displayName: az boards area project delete
-          - name: list
-            uid: ext_azure-devops_az_boards_area_project_list
-            displayName: az boards area project list
-          - name: show
-            uid: ext_azure-devops_az_boards_area_project_show
-            displayName: az boards area project show
-          - name: update
-            uid: ext_azure-devops_az_boards_area_project_update
-            displayName: az boards area project update
-        - name: team
-          displayName: az boards area team
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_area_team
-            displayName: az boards area team
-          - name: add
-            uid: ext_azure-devops_az_boards_area_team_add
-            displayName: az boards area team add
-          - name: list
-            uid: ext_azure-devops_az_boards_area_team_list
-            displayName: az boards area team list
-          - name: remove
-            uid: ext_azure-devops_az_boards_area_team_remove
-            displayName: az boards area team remove
-          - name: update
-            uid: ext_azure-devops_az_boards_area_team_update
-            displayName: az boards area team update
-      - name: iteration
-        displayName: az boards iteration
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_iteration
-          displayName: az boards iteration
-        - name: project
-          displayName: az boards iteration project
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_iteration_project
-            displayName: az boards iteration project
-          - name: create
-            uid: ext_azure-devops_az_boards_iteration_project_create
-            displayName: az boards iteration project create
-          - name: delete
-            uid: ext_azure-devops_az_boards_iteration_project_delete
-            displayName: az boards iteration project delete
-          - name: list
-            uid: ext_azure-devops_az_boards_iteration_project_list
-            displayName: az boards iteration project list
-          - name: show
-            uid: ext_azure-devops_az_boards_iteration_project_show
-            displayName: az boards iteration project show
-          - name: update
-            uid: ext_azure-devops_az_boards_iteration_project_update
-            displayName: az boards iteration project update
-        - name: team
-          displayName: az boards iteration team
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_iteration_team
-            displayName: az boards iteration team
-          - name: add
-            uid: ext_azure-devops_az_boards_iteration_team_add
-            displayName: az boards iteration team add
-          - name: list
-            uid: ext_azure-devops_az_boards_iteration_team_list
-            displayName: az boards iteration team list
-          - name: list-work-items
-            uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-            displayName: az boards iteration team list-work-items
-          - name: remove
-            uid: ext_azure-devops_az_boards_iteration_team_remove
-            displayName: az boards iteration team remove
-          - name: set-backlog-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-            displayName: az boards iteration team set-backlog-iteration
-          - name: set-default-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-            displayName: az boards iteration team set-default-iteration
-          - name: show-backlog-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-            displayName: az boards iteration team show-backlog-iteration
-          - name: show-default-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-            displayName: az boards iteration team show-default-iteration
-      - name: work-item
-        displayName: az boards work-item
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_work_item
-          displayName: az boards work-item
-        - name: create
-          uid: ext_azure-devops_az_boards_work_item_create
-          displayName: az boards work-item create
-        - name: delete
-          uid: ext_azure-devops_az_boards_work_item_delete
-          displayName: az boards work-item delete
-        - name: show
-          uid: ext_azure-devops_az_boards_work_item_show
-          displayName: az boards work-item show
-        - name: update
-          uid: ext_azure-devops_az_boards_work_item_update
-          displayName: az boards work-item update
-        - name: relation
-          displayName: az boards work-item relation
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_work_item_relation
-            displayName: az boards work-item relation
-          - name: add
-            uid: ext_azure-devops_az_boards_work_item_relation_add
-            displayName: az boards work-item relation add
-          - name: list-type
-            uid: ext_azure-devops_az_boards_work_item_relation_list_type
-            displayName: az boards work-item relation list-type
-          - name: remove
-            uid: ext_azure-devops_az_boards_work_item_relation_remove
-            displayName: az boards work-item relation remove
-          - name: show
-            uid: ext_azure-devops_az_boards_work_item_relation_show
-            displayName: az boards work-item relation show
-    - name: devops
-      displayName: az devops
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_devops
-        displayName: az devops
-      - name: configure
-        uid: ext_azure-devops_az_devops_configure
-        displayName: az devops configure
-      - name: feedback
-        uid: ext_azure-devops_az_devops_feedback
-        displayName: az devops feedback
-      - name: invoke
-        uid: ext_azure-devops_az_devops_invoke
-        displayName: az devops invoke
-      - name: login
-        uid: ext_azure-devops_az_devops_login
-        displayName: az devops login
-      - name: logout
-        uid: ext_azure-devops_az_devops_logout
-        displayName: az devops logout
-      - name: admin
-        displayName: az devops admin
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_admin
-          displayName: az devops admin
-        - name: banner
-          displayName: az devops admin banner
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_admin_banner
-            displayName: az devops admin banner
-          - name: add
-            uid: ext_azure-devops_az_devops_admin_banner_add
-            displayName: az devops admin banner add
-          - name: list
-            uid: ext_azure-devops_az_devops_admin_banner_list
-            displayName: az devops admin banner list
-          - name: remove
-            uid: ext_azure-devops_az_devops_admin_banner_remove
-            displayName: az devops admin banner remove
-          - name: show
-            uid: ext_azure-devops_az_devops_admin_banner_show
-            displayName: az devops admin banner show
-          - name: update
-            uid: ext_azure-devops_az_devops_admin_banner_update
-            displayName: az devops admin banner update
-      - name: extension
-        displayName: az devops extension
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_extension
-          displayName: az devops extension
-        - name: disable
-          uid: ext_azure-devops_az_devops_extension_disable
-          displayName: az devops extension disable
-        - name: enable
-          uid: ext_azure-devops_az_devops_extension_enable
-          displayName: az devops extension enable
-        - name: install
-          uid: ext_azure-devops_az_devops_extension_install
-          displayName: az devops extension install
-        - name: list
-          uid: ext_azure-devops_az_devops_extension_list
-          displayName: az devops extension list
-        - name: search
-          uid: ext_azure-devops_az_devops_extension_search
-          displayName: az devops extension search
-        - name: show
-          uid: ext_azure-devops_az_devops_extension_show
-          displayName: az devops extension show
-        - name: uninstall
-          uid: ext_azure-devops_az_devops_extension_uninstall
-          displayName: az devops extension uninstall
-      - name: project
-        displayName: az devops project
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_project
-          displayName: az devops project
-        - name: create
-          uid: ext_azure-devops_az_devops_project_create
-          displayName: az devops project create
-        - name: delete
-          uid: ext_azure-devops_az_devops_project_delete
-          displayName: az devops project delete
-        - name: list
-          uid: ext_azure-devops_az_devops_project_list
-          displayName: az devops project list
-        - name: show
-          uid: ext_azure-devops_az_devops_project_show
-          displayName: az devops project show
-      - name: security
-        displayName: az devops security
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_security
-          displayName: az devops security
-        - name: group
-          displayName: az devops security group
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_security_group
-            displayName: az devops security group
-          - name: create
-            uid: ext_azure-devops_az_devops_security_group_create
-            displayName: az devops security group create
-          - name: delete
-            uid: ext_azure-devops_az_devops_security_group_delete
-            displayName: az devops security group delete
-          - name: list
-            uid: ext_azure-devops_az_devops_security_group_list
-            displayName: az devops security group list
-          - name: show
-            uid: ext_azure-devops_az_devops_security_group_show
-            displayName: az devops security group show
-          - name: update
-            uid: ext_azure-devops_az_devops_security_group_update
-            displayName: az devops security group update
-          - name: membership
-            displayName: az devops security group membership
-            items:
-            - name: Overview
-              uid: ext_azure-devops_az_devops_security_group_membership
-              displayName: az devops security group membership
-            - name: add
-              uid: ext_azure-devops_az_devops_security_group_membership_add
-              displayName: az devops security group membership add
-            - name: list
-              uid: ext_azure-devops_az_devops_security_group_membership_list
-              displayName: az devops security group membership list
-            - name: remove
-              uid: ext_azure-devops_az_devops_security_group_membership_remove
-              displayName: az devops security group membership remove
-        - name: permission
-          displayName: az devops security permission
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_security_permission
-            displayName: az devops security permission
-          - name: list
-            uid: ext_azure-devops_az_devops_security_permission_list
-            displayName: az devops security permission list
-          - name: reset
-            uid: ext_azure-devops_az_devops_security_permission_reset
-            displayName: az devops security permission reset
-          - name: reset-all
-            uid: ext_azure-devops_az_devops_security_permission_reset_all
-            displayName: az devops security permission reset-all
-          - name: show
-            uid: ext_azure-devops_az_devops_security_permission_show
-            displayName: az devops security permission show
-          - name: update
-            uid: ext_azure-devops_az_devops_security_permission_update
-            displayName: az devops security permission update
-          - name: namespace
-            displayName: az devops security permission namespace
-            items:
-            - name: Overview
-              uid: ext_azure-devops_az_devops_security_permission_namespace
-              displayName: az devops security permission namespace
-            - name: list
-              uid: ext_azure-devops_az_devops_security_permission_namespace_list
-              displayName: az devops security permission namespace list
-            - name: show
-              uid: ext_azure-devops_az_devops_security_permission_namespace_show
-              displayName: az devops security permission namespace show
-      - name: service-endpoint
-        displayName: az devops service-endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_service_endpoint
-          displayName: az devops service-endpoint
-        - name: create
-          uid: ext_azure-devops_az_devops_service_endpoint_create
-          displayName: az devops service-endpoint create
-        - name: delete
-          uid: ext_azure-devops_az_devops_service_endpoint_delete
-          displayName: az devops service-endpoint delete
-        - name: list
-          uid: ext_azure-devops_az_devops_service_endpoint_list
-          displayName: az devops service-endpoint list
-        - name: show
-          uid: ext_azure-devops_az_devops_service_endpoint_show
-          displayName: az devops service-endpoint show
-        - name: update
-          uid: ext_azure-devops_az_devops_service_endpoint_update
-          displayName: az devops service-endpoint update
-        - name: azurerm
-          displayName: az devops service-endpoint azurerm
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-            displayName: az devops service-endpoint azurerm
-          - name: create
-            uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-            displayName: az devops service-endpoint azurerm create
-        - name: github
-          displayName: az devops service-endpoint github
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_service_endpoint_github
-            displayName: az devops service-endpoint github
-          - name: create
-            uid: ext_azure-devops_az_devops_service_endpoint_github_create
-            displayName: az devops service-endpoint github create
-      - name: team
-        displayName: az devops team
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_team
-          displayName: az devops team
-        - name: create
-          uid: ext_azure-devops_az_devops_team_create
-          displayName: az devops team create
-        - name: delete
-          uid: ext_azure-devops_az_devops_team_delete
-          displayName: az devops team delete
-        - name: list
-          uid: ext_azure-devops_az_devops_team_list
-          displayName: az devops team list
-        - name: list-member
-          uid: ext_azure-devops_az_devops_team_list_member
-          displayName: az devops team list-member
-        - name: show
-          uid: ext_azure-devops_az_devops_team_show
-          displayName: az devops team show
-        - name: update
-          uid: ext_azure-devops_az_devops_team_update
-          displayName: az devops team update
-      - name: user
-        displayName: az devops user
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_user
-          displayName: az devops user
-        - name: add
-          uid: ext_azure-devops_az_devops_user_add
-          displayName: az devops user add
-        - name: list
-          uid: ext_azure-devops_az_devops_user_list
-          displayName: az devops user list
-        - name: remove
-          uid: ext_azure-devops_az_devops_user_remove
-          displayName: az devops user remove
-        - name: show
-          uid: ext_azure-devops_az_devops_user_show
-          displayName: az devops user show
-        - name: update
-          uid: ext_azure-devops_az_devops_user_update
-          displayName: az devops user update
-      - name: wiki
-        displayName: az devops wiki
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_wiki
-          displayName: az devops wiki
-        - name: create
-          uid: ext_azure-devops_az_devops_wiki_create
-          displayName: az devops wiki create
-        - name: delete
-          uid: ext_azure-devops_az_devops_wiki_delete
-          displayName: az devops wiki delete
-        - name: list
-          uid: ext_azure-devops_az_devops_wiki_list
-          displayName: az devops wiki list
-        - name: show
-          uid: ext_azure-devops_az_devops_wiki_show
-          displayName: az devops wiki show
-        - name: page
-          displayName: az devops wiki page
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_wiki_page
-            displayName: az devops wiki page
-          - name: create
-            uid: ext_azure-devops_az_devops_wiki_page_create
-            displayName: az devops wiki page create
-          - name: delete
-            uid: ext_azure-devops_az_devops_wiki_page_delete
-            displayName: az devops wiki page delete
-          - name: show
-            uid: ext_azure-devops_az_devops_wiki_page_show
-            displayName: az devops wiki page show
-          - name: update
-            uid: ext_azure-devops_az_devops_wiki_page_update
-            displayName: az devops wiki page update
-    - name: pipelines
-      displayName: az pipelines
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_pipelines
-        displayName: az pipelines
-      - name: create
-        uid: ext_azure-devops_az_pipelines_create
-        displayName: az pipelines create
-      - name: delete
-        uid: ext_azure-devops_az_pipelines_delete
-        displayName: az pipelines delete
-      - name: list
-        uid: ext_azure-devops_az_pipelines_list
-        displayName: az pipelines list
-      - name: run
-        uid: ext_azure-devops_az_pipelines_run
-        displayName: az pipelines run
-      - name: show
-        uid: ext_azure-devops_az_pipelines_show
-        displayName: az pipelines show
-      - name: update
-        uid: ext_azure-devops_az_pipelines_update
-        displayName: az pipelines update
-      - name: agent
-        displayName: az pipelines agent
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_agent
-          displayName: az pipelines agent
-        - name: list
-          uid: ext_azure-devops_az_pipelines_agent_list
-          displayName: az pipelines agent list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_agent_show
-          displayName: az pipelines agent show
-      - name: build
-        displayName: az pipelines build
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_build
-          displayName: az pipelines build
-        - name: list
-          uid: ext_azure-devops_az_pipelines_build_list
-          displayName: az pipelines build list
-        - name: queue
-          uid: ext_azure-devops_az_pipelines_build_queue
-          displayName: az pipelines build queue
-        - name: show
-          uid: ext_azure-devops_az_pipelines_build_show
-          displayName: az pipelines build show
-        - name: definition
-          displayName: az pipelines build definition
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_build_definition
-            displayName: az pipelines build definition
-          - name: list
-            uid: ext_azure-devops_az_pipelines_build_definition_list
-            displayName: az pipelines build definition list
-          - name: show
-            uid: ext_azure-devops_az_pipelines_build_definition_show
-            displayName: az pipelines build definition show
-        - name: tag
-          displayName: az pipelines build tag
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_build_tag
-            displayName: az pipelines build tag
-          - name: add
-            uid: ext_azure-devops_az_pipelines_build_tag_add
-            displayName: az pipelines build tag add
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_build_tag_delete
-            displayName: az pipelines build tag delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_build_tag_list
-            displayName: az pipelines build tag list
-      - name: folder
-        displayName: az pipelines folder
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_folder
-          displayName: az pipelines folder
-        - name: create
-          uid: ext_azure-devops_az_pipelines_folder_create
-          displayName: az pipelines folder create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_folder_delete
-          displayName: az pipelines folder delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_folder_list
-          displayName: az pipelines folder list
-        - name: update
-          uid: ext_azure-devops_az_pipelines_folder_update
-          displayName: az pipelines folder update
-      - name: pool
-        displayName: az pipelines pool
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_pool
-          displayName: az pipelines pool
-        - name: list
-          uid: ext_azure-devops_az_pipelines_pool_list
-          displayName: az pipelines pool list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_pool_show
-          displayName: az pipelines pool show
-      - name: queue
-        displayName: az pipelines queue
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_queue
-          displayName: az pipelines queue
-        - name: list
-          uid: ext_azure-devops_az_pipelines_queue_list
-          displayName: az pipelines queue list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_queue_show
-          displayName: az pipelines queue show
-      - name: release
-        displayName: az pipelines release
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_release
-          displayName: az pipelines release
-        - name: create
-          uid: ext_azure-devops_az_pipelines_release_create
-          displayName: az pipelines release create
-        - name: list
-          uid: ext_azure-devops_az_pipelines_release_list
-          displayName: az pipelines release list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_release_show
-          displayName: az pipelines release show
-        - name: definition
-          displayName: az pipelines release definition
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_release_definition
-            displayName: az pipelines release definition
-          - name: list
-            uid: ext_azure-devops_az_pipelines_release_definition_list
-            displayName: az pipelines release definition list
-          - name: show
-            uid: ext_azure-devops_az_pipelines_release_definition_show
-            displayName: az pipelines release definition show
-      - name: runs
-        displayName: az pipelines runs
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_runs
-          displayName: az pipelines runs
-        - name: list
-          uid: ext_azure-devops_az_pipelines_runs_list
-          displayName: az pipelines runs list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_runs_show
-          displayName: az pipelines runs show
-        - name: artifact
-          displayName: az pipelines runs artifact
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_runs_artifact
-            displayName: az pipelines runs artifact
-          - name: download
-            uid: ext_azure-devops_az_pipelines_runs_artifact_download
-            displayName: az pipelines runs artifact download
-          - name: list
-            uid: ext_azure-devops_az_pipelines_runs_artifact_list
-            displayName: az pipelines runs artifact list
-          - name: upload
-            uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-            displayName: az pipelines runs artifact upload
-        - name: tag
-          displayName: az pipelines runs tag
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_runs_tag
-            displayName: az pipelines runs tag
-          - name: add
-            uid: ext_azure-devops_az_pipelines_runs_tag_add
-            displayName: az pipelines runs tag add
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_runs_tag_delete
-            displayName: az pipelines runs tag delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_runs_tag_list
-            displayName: az pipelines runs tag list
-      - name: variable
-        displayName: az pipelines variable
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_variable
-          displayName: az pipelines variable
-        - name: create
-          uid: ext_azure-devops_az_pipelines_variable_create
-          displayName: az pipelines variable create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_variable_delete
-          displayName: az pipelines variable delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_variable_list
-          displayName: az pipelines variable list
-        - name: update
-          uid: ext_azure-devops_az_pipelines_variable_update
-          displayName: az pipelines variable update
-      - name: variable-group
-        displayName: az pipelines variable-group
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_variable_group
-          displayName: az pipelines variable-group
-        - name: create
-          uid: ext_azure-devops_az_pipelines_variable_group_create
-          displayName: az pipelines variable-group create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_variable_group_delete
-          displayName: az pipelines variable-group delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_variable_group_list
-          displayName: az pipelines variable-group list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_variable_group_show
-          displayName: az pipelines variable-group show
-        - name: update
-          uid: ext_azure-devops_az_pipelines_variable_group_update
-          displayName: az pipelines variable-group update
-        - name: variable
-          displayName: az pipelines variable-group variable
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_variable_group_variable
-            displayName: az pipelines variable-group variable
-          - name: create
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-            displayName: az pipelines variable-group variable create
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-            displayName: az pipelines variable-group variable delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-            displayName: az pipelines variable-group variable list
-          - name: update
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-            displayName: az pipelines variable-group variable update
-    - name: repos
-      displayName: az repos
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_repos
-        displayName: az repos
-      - name: create
-        uid: ext_azure-devops_az_repos_create
-        displayName: az repos create
-      - name: delete
-        uid: ext_azure-devops_az_repos_delete
-        displayName: az repos delete
-      - name: list
-        uid: ext_azure-devops_az_repos_list
-        displayName: az repos list
-      - name: show
-        uid: ext_azure-devops_az_repos_show
-        displayName: az repos show
-      - name: update
-        uid: ext_azure-devops_az_repos_update
-        displayName: az repos update
-      - name: import
-        displayName: az repos import
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_import
-          displayName: az repos import
-        - name: create
-          uid: ext_azure-devops_az_repos_import_create
-          displayName: az repos import create
-      - name: policy
-        displayName: az repos policy
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_policy
-          displayName: az repos policy
-        - name: create
-          uid: ext_azure-devops_az_repos_policy_create
-          displayName: az repos policy create
-        - name: delete
-          uid: ext_azure-devops_az_repos_policy_delete
-          displayName: az repos policy delete
-        - name: list
-          uid: ext_azure-devops_az_repos_policy_list
-          displayName: az repos policy list
-        - name: show
-          uid: ext_azure-devops_az_repos_policy_show
-          displayName: az repos policy show
-        - name: update
-          uid: ext_azure-devops_az_repos_policy_update
-          displayName: az repos policy update
-        - name: approver-count
-          displayName: az repos policy approver-count
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_approver_count
-            displayName: az repos policy approver-count
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_approver_count_create
-            displayName: az repos policy approver-count create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_approver_count_update
-            displayName: az repos policy approver-count update
-        - name: build
-          displayName: az repos policy build
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_build
-            displayName: az repos policy build
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_build_create
-            displayName: az repos policy build create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_build_update
-            displayName: az repos policy build update
-        - name: case-enforcement
-          displayName: az repos policy case-enforcement
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_case_enforcement
-            displayName: az repos policy case-enforcement
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-            displayName: az repos policy case-enforcement create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-            displayName: az repos policy case-enforcement update
-        - name: comment-required
-          displayName: az repos policy comment-required
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_comment_required
-            displayName: az repos policy comment-required
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_comment_required_create
-            displayName: az repos policy comment-required create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_comment_required_update
-            displayName: az repos policy comment-required update
-        - name: file-size
-          displayName: az repos policy file-size
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_file_size
-            displayName: az repos policy file-size
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_file_size_create
-            displayName: az repos policy file-size create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_file_size_update
-            displayName: az repos policy file-size update
-        - name: merge-strategy
-          displayName: az repos policy merge-strategy
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_merge_strategy
-            displayName: az repos policy merge-strategy
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-            displayName: az repos policy merge-strategy create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-            displayName: az repos policy merge-strategy update
-        - name: required-reviewer
-          displayName: az repos policy required-reviewer
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_required_reviewer
-            displayName: az repos policy required-reviewer
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-            displayName: az repos policy required-reviewer create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-            displayName: az repos policy required-reviewer update
-        - name: work-item-linking
-          displayName: az repos policy work-item-linking
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_work_item_linking
-            displayName: az repos policy work-item-linking
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-            displayName: az repos policy work-item-linking create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-            displayName: az repos policy work-item-linking update
-      - name: pr
-        displayName: az repos pr
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_pr
-          displayName: az repos pr
-        - name: checkout
-          uid: ext_azure-devops_az_repos_pr_checkout
-          displayName: az repos pr checkout
-        - name: create
-          uid: ext_azure-devops_az_repos_pr_create
-          displayName: az repos pr create
-        - name: list
-          uid: ext_azure-devops_az_repos_pr_list
-          displayName: az repos pr list
-        - name: set-vote
-          uid: ext_azure-devops_az_repos_pr_set_vote
-          displayName: az repos pr set-vote
-        - name: show
-          uid: ext_azure-devops_az_repos_pr_show
-          displayName: az repos pr show
-        - name: update
-          uid: ext_azure-devops_az_repos_pr_update
-          displayName: az repos pr update
-        - name: policy
-          displayName: az repos pr policy
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_policy
-            displayName: az repos pr policy
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_policy_list
-            displayName: az repos pr policy list
-          - name: queue
-            uid: ext_azure-devops_az_repos_pr_policy_queue
-            displayName: az repos pr policy queue
-        - name: reviewer
-          displayName: az repos pr reviewer
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_reviewer
-            displayName: az repos pr reviewer
-          - name: add
-            uid: ext_azure-devops_az_repos_pr_reviewer_add
-            displayName: az repos pr reviewer add
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_reviewer_list
-            displayName: az repos pr reviewer list
-          - name: remove
-            uid: ext_azure-devops_az_repos_pr_reviewer_remove
-            displayName: az repos pr reviewer remove
-        - name: work-item
-          displayName: az repos pr work-item
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_work_item
-            displayName: az repos pr work-item
-          - name: add
-            uid: ext_azure-devops_az_repos_pr_work_item_add
-            displayName: az repos pr work-item add
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_work_item_list
-            displayName: az repos pr work-item list
-          - name: remove
-            uid: ext_azure-devops_az_repos_pr_work_item_remove
-            displayName: az repos pr work-item remove
-      - name: ref
-        displayName: az repos ref
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_ref
-          displayName: az repos ref
-        - name: create
-          uid: ext_azure-devops_az_repos_ref_create
-          displayName: az repos ref create
-        - name: delete
-          uid: ext_azure-devops_az_repos_ref_delete
-          displayName: az repos ref delete
-        - name: list
-          uid: ext_azure-devops_az_repos_ref_list
-          displayName: az repos ref list
-        - name: lock
-          uid: ext_azure-devops_az_repos_ref_lock
-          displayName: az repos ref lock
-        - name: unlock
-          uid: ext_azure-devops_az_repos_ref_unlock
-          displayName: az repos ref unlock
-  - name: azure-firewall
-    items:
-    - name: Overview
-      uid: ext_azure-firewall_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_azure-firewall_az_network
-        displayName: az network
-      - name: firewall
-        displayName: az network firewall
-        items:
-        - name: Overview
-          uid: ext_azure-firewall_az_network_firewall
-          displayName: az network firewall
-        - name: create
-          uid: ext_azure-firewall_az_network_firewall_create
-          displayName: az network firewall create
-        - name: delete
-          uid: ext_azure-firewall_az_network_firewall_delete
-          displayName: az network firewall delete
-        - name: list
-          uid: ext_azure-firewall_az_network_firewall_list
-          displayName: az network firewall list
-        - name: list-fqdn-tags
-          uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-          displayName: az network firewall list-fqdn-tags
-        - name: show
-          uid: ext_azure-firewall_az_network_firewall_show
-          displayName: az network firewall show
-        - name: update
-          uid: ext_azure-firewall_az_network_firewall_update
-          displayName: az network firewall update
-        - name: application-rule
-          displayName: az network firewall application-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_application_rule
-            displayName: az network firewall application-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_application_rule_create
-            displayName: az network firewall application-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-            displayName: az network firewall application-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_application_rule_list
-            displayName: az network firewall application-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_application_rule_show
-            displayName: az network firewall application-rule show
-          - name: collection
-            displayName: az network firewall application-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-              displayName: az network firewall application-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-              displayName: az network firewall application-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-              displayName: az network firewall application-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-              displayName: az network firewall application-rule collection show
-        - name: ip-config
-          displayName: az network firewall ip-config
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_ip_config
-            displayName: az network firewall ip-config
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_ip_config_create
-            displayName: az network firewall ip-config create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-            displayName: az network firewall ip-config delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_ip_config_list
-            displayName: az network firewall ip-config list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_ip_config_show
-            displayName: az network firewall ip-config show
-        - name: management-ip-config
-          displayName: az network firewall management-ip-config
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config
-            displayName: az network firewall management-ip-config
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-            displayName: az network firewall management-ip-config show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-            displayName: az network firewall management-ip-config update
-        - name: nat-rule
-          displayName: az network firewall nat-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_nat_rule
-            displayName: az network firewall nat-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-            displayName: az network firewall nat-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-            displayName: az network firewall nat-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-            displayName: az network firewall nat-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-            displayName: az network firewall nat-rule show
-          - name: collection
-            displayName: az network firewall nat-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-              displayName: az network firewall nat-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-              displayName: az network firewall nat-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-              displayName: az network firewall nat-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-              displayName: az network firewall nat-rule collection show
-        - name: network-rule
-          displayName: az network firewall network-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_network_rule
-            displayName: az network firewall network-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_network_rule_create
-            displayName: az network firewall network-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-            displayName: az network firewall network-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_network_rule_list
-            displayName: az network firewall network-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_network_rule_show
-            displayName: az network firewall network-rule show
-          - name: collection
-            displayName: az network firewall network-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-              displayName: az network firewall network-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-              displayName: az network firewall network-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-              displayName: az network firewall network-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-              displayName: az network firewall network-rule collection show
-        - name: policy
-          displayName: az network firewall policy
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_policy
-            displayName: az network firewall policy
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_policy_create
-            displayName: az network firewall policy create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_policy_delete
-            displayName: az network firewall policy delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_policy_list
-            displayName: az network firewall policy list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_policy_show
-            displayName: az network firewall policy show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_policy_update
-            displayName: az network firewall policy update
-          - name: rule-collection-group
-            displayName: az network firewall policy rule-collection-group
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-              displayName: az network firewall policy rule-collection-group
-            - name: create
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-              displayName: az network firewall policy rule-collection-group create
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-              displayName: az network firewall policy rule-collection-group delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-              displayName: az network firewall policy rule-collection-group list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-              displayName: az network firewall policy rule-collection-group show
-            - name: update
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-              displayName: az network firewall policy rule-collection-group update
-            - name: collection
-              displayName: az network firewall policy rule-collection-group collection
-              items:
-              - name: Overview
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-                displayName: az network firewall policy rule-collection-group collection
-              - name: add-filter-collection
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-                displayName: az network firewall policy rule-collection-group collection add-filter-collection
-              - name: add-nat-collection
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-                displayName: az network firewall policy rule-collection-group collection add-nat-collection
-              - name: list
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-                displayName: az network firewall policy rule-collection-group collection list
-              - name: remove
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-                displayName: az network firewall policy rule-collection-group collection remove
-              - name: rule
-                displayName: az network firewall policy rule-collection-group collection rule
-                items:
-                - name: Overview
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-                  displayName: az network firewall policy rule-collection-group collection rule
-                - name: add
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-                  displayName: az network firewall policy rule-collection-group collection rule add
-                - name: remove
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-                  displayName: az network firewall policy rule-collection-group collection rule remove
-        - name: threat-intel-whitelist
-          displayName: az network firewall threat-intel-whitelist
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-            displayName: az network firewall threat-intel-whitelist
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-            displayName: az network firewall threat-intel-whitelist create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-            displayName: az network firewall threat-intel-whitelist delete
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-            displayName: az network firewall threat-intel-whitelist show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-            displayName: az network firewall threat-intel-whitelist update
-  - name: azure-iot
-    items:
-    - name: Overview
-      uid: ext_azure-iot_az
-    - name: IoT
-      displayName: az iot
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_iot
-        displayName: az iot
-      - name: Devices
-        displayName: az iot device
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_device
-          displayName: az iot device
-        - name: send-d2c-message
-          uid: ext_azure-iot_az_iot_device_send_d2c_message
-          displayName: az iot device send-d2c-message
-        - name: simulate
-          uid: ext_azure-iot_az_iot_device_simulate
-          displayName: az iot device simulate
-        - name: upload-file
-          uid: ext_azure-iot_az_iot_device_upload_file
-          displayName: az iot device upload-file
-        - name: c2d-message
-          displayName: az iot device c2d-message
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_device_c2d_message
-            displayName: az iot device c2d-message
-          - name: abandon
-            uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-            displayName: az iot device c2d-message abandon
-          - name: complete
-            uid: ext_azure-iot_az_iot_device_c2d_message_complete
-            displayName: az iot device c2d-message complete
-          - name: receive
-            uid: ext_azure-iot_az_iot_device_c2d_message_receive
-            displayName: az iot device c2d-message receive
-          - name: reject
-            uid: ext_azure-iot_az_iot_device_c2d_message_reject
-            displayName: az iot device c2d-message reject
-          - name: send
-            uid: ext_azure-iot_az_iot_device_c2d_message_send
-            displayName: az iot device c2d-message send
-      - name: Hubs
-        displayName: az iot hub
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_hub
-          displayName: az iot hub
-        - name: generate-sas-token
-          uid: ext_azure-iot_az_iot_hub_generate_sas_token
-          displayName: az iot hub generate-sas-token
-        - name: invoke-device-method
-          uid: ext_azure-iot_az_iot_hub_invoke_device_method
-          displayName: az iot hub invoke-device-method
-        - name: invoke-module-method
-          uid: ext_azure-iot_az_iot_hub_invoke_module_method
-          displayName: az iot hub invoke-module-method
-        - name: monitor-events
-          uid: ext_azure-iot_az_iot_hub_monitor_events
-          displayName: az iot hub monitor-events
-        - name: monitor-feedback
-          uid: ext_azure-iot_az_iot_hub_monitor_feedback
-          displayName: az iot hub monitor-feedback
-        - name: query
-          uid: ext_azure-iot_az_iot_hub_query
-          displayName: az iot hub query
-        - name: Jobs
-          displayName: az iot hub job
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_job
-            displayName: az iot hub job
-          - name: cancel
-            uid: ext_azure-iot_az_iot_hub_job_cancel
-            displayName: az iot hub job cancel
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_job_create
-            displayName: az iot hub job create
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_job_list
-            displayName: az iot hub job list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_job_show
-            displayName: az iot hub job show
-        - name: configuration
-          displayName: az iot hub configuration
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_configuration
-            displayName: az iot hub configuration
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_configuration_create
-            displayName: az iot hub configuration create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_configuration_delete
-            displayName: az iot hub configuration delete
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_configuration_list
-            displayName: az iot hub configuration list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_configuration_show
-            displayName: az iot hub configuration show
-          - name: show-metric
-            uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-            displayName: az iot hub configuration show-metric
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_configuration_update
-            displayName: az iot hub configuration update
-        - name: device-identity
-          displayName: az iot hub device-identity
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_device_identity
-            displayName: az iot hub device-identity
-          - name: add-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-            displayName: az iot hub device-identity add-children
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_device_identity_create
-            displayName: az iot hub device-identity create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_device_identity_delete
-            displayName: az iot hub device-identity delete
-          - name: export
-            uid: ext_azure-iot_az_iot_hub_device_identity_export
-            displayName: az iot hub device-identity export
-          - name: get-parent
-            uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-            displayName: az iot hub device-identity get-parent
-          - name: import
-            uid: ext_azure-iot_az_iot_hub_device_identity_import
-            displayName: az iot hub device-identity import
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_device_identity_list
-            displayName: az iot hub device-identity list
-          - name: list-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-            displayName: az iot hub device-identity list-children
-          - name: remove-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-            displayName: az iot hub device-identity remove-children
-          - name: set-parent
-            uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-            displayName: az iot hub device-identity set-parent
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_device_identity_show
-            displayName: az iot hub device-identity show
-          - name: show-connection-string
-            uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-            displayName: az iot hub device-identity show-connection-string
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_device_identity_update
-            displayName: az iot hub device-identity update
-        - name: device-twin
-          displayName: az iot hub device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_device_twin
-            displayName: az iot hub device-twin
-          - name: replace
-            uid: ext_azure-iot_az_iot_hub_device_twin_replace
-            displayName: az iot hub device-twin replace
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_device_twin_show
-            displayName: az iot hub device-twin show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_device_twin_update
-            displayName: az iot hub device-twin update
-        - name: distributed-tracing
-          displayName: az iot hub distributed-tracing
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing
-            displayName: az iot hub distributed-tracing
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-            displayName: az iot hub distributed-tracing show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-            displayName: az iot hub distributed-tracing update
-        - name: module-identity
-          displayName: az iot hub module-identity
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_module_identity
-            displayName: az iot hub module-identity
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_module_identity_create
-            displayName: az iot hub module-identity create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_module_identity_delete
-            displayName: az iot hub module-identity delete
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_module_identity_list
-            displayName: az iot hub module-identity list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_module_identity_show
-            displayName: az iot hub module-identity show
-          - name: show-connection-string
-            uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-            displayName: az iot hub module-identity show-connection-string
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_module_identity_update
-            displayName: az iot hub module-identity update
-        - name: module-twin
-          displayName: az iot hub module-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_module_twin
-            displayName: az iot hub module-twin
-          - name: replace
-            uid: ext_azure-iot_az_iot_hub_module_twin_replace
-            displayName: az iot hub module-twin replace
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_module_twin_show
-            displayName: az iot hub module-twin show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_module_twin_update
-            displayName: az iot hub module-twin update
-      - name: central
-        displayName: az iot central
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_central
-          displayName: az iot central
-        - name: app
-          displayName: az iot central app
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_central_app
-            displayName: az iot central app
-          - name: monitor-events
-            uid: ext_azure-iot_az_iot_central_app_monitor_events
-            displayName: az iot central app monitor-events
-          - name: validate-messages
-            uid: ext_azure-iot_az_iot_central_app_validate_messages
-            displayName: az iot central app validate-messages
-          - name: device
-            displayName: az iot central app device
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device
-              displayName: az iot central app device
-            - name: create
-              uid: ext_azure-iot_az_iot_central_app_device_create
-              displayName: az iot central app device create
-            - name: delete
-              uid: ext_azure-iot_az_iot_central_app_device_delete
-              displayName: az iot central app device delete
-            - name: list
-              uid: ext_azure-iot_az_iot_central_app_device_list
-              displayName: az iot central app device list
-            - name: registration-info
-              uid: ext_azure-iot_az_iot_central_app_device_registration_info
-              displayName: az iot central app device registration-info
-            - name: registration-summary
-              uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-              displayName: az iot central app device registration-summary
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_show
-              displayName: az iot central app device show
-          - name: device-template
-            displayName: az iot central app device-template
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device_template
-              displayName: az iot central app device-template
-            - name: create
-              uid: ext_azure-iot_az_iot_central_app_device_template_create
-              displayName: az iot central app device-template create
-            - name: delete
-              uid: ext_azure-iot_az_iot_central_app_device_template_delete
-              displayName: az iot central app device-template delete
-            - name: list
-              uid: ext_azure-iot_az_iot_central_app_device_template_list
-              displayName: az iot central app device-template list
-            - name: map
-              uid: ext_azure-iot_az_iot_central_app_device_template_map
-              displayName: az iot central app device-template map
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_template_show
-              displayName: az iot central app device-template show
-          - name: device-twin
-            displayName: az iot central app device-twin
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device_twin
-              displayName: az iot central app device-twin
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_twin_show
-              displayName: az iot central app device-twin show
-        - name: device-twin
-          displayName: az iot central device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_central_device_twin
-            displayName: az iot central device-twin
-          - name: show
-            uid: ext_azure-iot_az_iot_central_device_twin_show
-            displayName: az iot central device-twin show
-      - name: dps
-        displayName: az iot dps
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_dps
-          displayName: az iot dps
-        - name: enrollment
-          displayName: az iot dps enrollment
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_enrollment
-            displayName: az iot dps enrollment
-          - name: create
-            uid: ext_azure-iot_az_iot_dps_enrollment_create
-            displayName: az iot dps enrollment create
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_enrollment_delete
-            displayName: az iot dps enrollment delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_enrollment_list
-            displayName: az iot dps enrollment list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_enrollment_show
-            displayName: az iot dps enrollment show
-          - name: update
-            uid: ext_azure-iot_az_iot_dps_enrollment_update
-            displayName: az iot dps enrollment update
-        - name: enrollment-group
-          displayName: az iot dps enrollment-group
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_enrollment_group
-            displayName: az iot dps enrollment-group
-          - name: create
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-            displayName: az iot dps enrollment-group create
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-            displayName: az iot dps enrollment-group delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-            displayName: az iot dps enrollment-group list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-            displayName: az iot dps enrollment-group show
-          - name: update
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-            displayName: az iot dps enrollment-group update
-        - name: registration
-          displayName: az iot dps registration
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_registration
-            displayName: az iot dps registration
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_registration_delete
-            displayName: az iot dps registration delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_registration_list
-            displayName: az iot dps registration list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_registration_show
-            displayName: az iot dps registration show
-      - name: dt
-        displayName: az iot dt
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_dt
-          displayName: az iot dt
-        - name: invoke-command
-          uid: ext_azure-iot_az_iot_dt_invoke_command
-          displayName: az iot dt invoke-command
-        - name: list-commands
-          uid: ext_azure-iot_az_iot_dt_list_commands
-          displayName: az iot dt list-commands
-        - name: list-interfaces
-          uid: ext_azure-iot_az_iot_dt_list_interfaces
-          displayName: az iot dt list-interfaces
-        - name: list-properties
-          uid: ext_azure-iot_az_iot_dt_list_properties
-          displayName: az iot dt list-properties
-        - name: monitor-events
-          uid: ext_azure-iot_az_iot_dt_monitor_events
-          displayName: az iot dt monitor-events
-        - name: update-property
-          uid: ext_azure-iot_az_iot_dt_update_property
-          displayName: az iot dt update-property
-      - name: edge
-        displayName: az iot edge
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_edge
-          displayName: az iot edge
-        - name: set-modules
-          uid: ext_azure-iot_az_iot_edge_set_modules
-          displayName: az iot edge set-modules
-        - name: deployment
-          displayName: az iot edge deployment
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_edge_deployment
-            displayName: az iot edge deployment
-          - name: create
-            uid: ext_azure-iot_az_iot_edge_deployment_create
-            displayName: az iot edge deployment create
-          - name: delete
-            uid: ext_azure-iot_az_iot_edge_deployment_delete
-            displayName: az iot edge deployment delete
-          - name: list
-            uid: ext_azure-iot_az_iot_edge_deployment_list
-            displayName: az iot edge deployment list
-          - name: show
-            uid: ext_azure-iot_az_iot_edge_deployment_show
-            displayName: az iot edge deployment show
-          - name: show-metric
-            uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-            displayName: az iot edge deployment show-metric
-          - name: update
-            uid: ext_azure-iot_az_iot_edge_deployment_update
-            displayName: az iot edge deployment update
-      - name: pnp
-        displayName: az iot pnp
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_pnp
-          displayName: az iot pnp
-        - name: capability-model
-          displayName: az iot pnp capability-model
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_pnp_capability_model
-            displayName: az iot pnp capability-model
-          - name: create
-            uid: ext_azure-iot_az_iot_pnp_capability_model_create
-            displayName: az iot pnp capability-model create
-          - name: delete
-            uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-            displayName: az iot pnp capability-model delete
-          - name: list
-            uid: ext_azure-iot_az_iot_pnp_capability_model_list
-            displayName: az iot pnp capability-model list
-          - name: publish
-            uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-            displayName: az iot pnp capability-model publish
-          - name: show
-            uid: ext_azure-iot_az_iot_pnp_capability_model_show
-            displayName: az iot pnp capability-model show
-          - name: update
-            uid: ext_azure-iot_az_iot_pnp_capability_model_update
-            displayName: az iot pnp capability-model update
-        - name: interface
-          displayName: az iot pnp interface
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_pnp_interface
-            displayName: az iot pnp interface
-          - name: create
-            uid: ext_azure-iot_az_iot_pnp_interface_create
-            displayName: az iot pnp interface create
-          - name: delete
-            uid: ext_azure-iot_az_iot_pnp_interface_delete
-            displayName: az iot pnp interface delete
-          - name: list
-            uid: ext_azure-iot_az_iot_pnp_interface_list
-            displayName: az iot pnp interface list
-          - name: publish
-            uid: ext_azure-iot_az_iot_pnp_interface_publish
-            displayName: az iot pnp interface publish
-          - name: show
-            uid: ext_azure-iot_az_iot_pnp_interface_show
-            displayName: az iot pnp interface show
-          - name: update
-            uid: ext_azure-iot_az_iot_pnp_interface_update
-            displayName: az iot pnp interface update
-    - name: dt
-      displayName: az dt
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_dt
-        displayName: az dt
-      - name: create
-        uid: ext_azure-iot_az_dt_create
-        displayName: az dt create
-      - name: delete
-        uid: ext_azure-iot_az_dt_delete
-        displayName: az dt delete
-      - name: list
-        uid: ext_azure-iot_az_dt_list
-        displayName: az dt list
-      - name: show
-        uid: ext_azure-iot_az_dt_show
-        displayName: az dt show
-      - name: endpoint
-        displayName: az dt endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_endpoint
-          displayName: az dt endpoint
-        - name: delete
-          uid: ext_azure-iot_az_dt_endpoint_delete
-          displayName: az dt endpoint delete
-        - name: list
-          uid: ext_azure-iot_az_dt_endpoint_list
-          displayName: az dt endpoint list
-        - name: show
-          uid: ext_azure-iot_az_dt_endpoint_show
-          displayName: az dt endpoint show
-        - name: create
-          displayName: az dt endpoint create
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_endpoint_create
-            displayName: az dt endpoint create
-          - name: eventgrid
-            uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-            displayName: az dt endpoint create eventgrid
-          - name: eventhub
-            uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-            displayName: az dt endpoint create eventhub
-          - name: servicebus
-            uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-            displayName: az dt endpoint create servicebus
-      - name: model
-        displayName: az dt model
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_model
-          displayName: az dt model
-        - name: create
-          uid: ext_azure-iot_az_dt_model_create
-          displayName: az dt model create
-        - name: delete
-          uid: ext_azure-iot_az_dt_model_delete
-          displayName: az dt model delete
-        - name: list
-          uid: ext_azure-iot_az_dt_model_list
-          displayName: az dt model list
-        - name: show
-          uid: ext_azure-iot_az_dt_model_show
-          displayName: az dt model show
-        - name: update
-          uid: ext_azure-iot_az_dt_model_update
-          displayName: az dt model update
-      - name: role-assignment
-        displayName: az dt role-assignment
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_role_assignment
-          displayName: az dt role-assignment
-        - name: create
-          uid: ext_azure-iot_az_dt_role_assignment_create
-          displayName: az dt role-assignment create
-        - name: delete
-          uid: ext_azure-iot_az_dt_role_assignment_delete
-          displayName: az dt role-assignment delete
-        - name: list
-          uid: ext_azure-iot_az_dt_role_assignment_list
-          displayName: az dt role-assignment list
-      - name: route
-        displayName: az dt route
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_route
-          displayName: az dt route
-        - name: create
-          uid: ext_azure-iot_az_dt_route_create
-          displayName: az dt route create
-        - name: delete
-          uid: ext_azure-iot_az_dt_route_delete
-          displayName: az dt route delete
-        - name: list
-          uid: ext_azure-iot_az_dt_route_list
-          displayName: az dt route list
-        - name: show
-          uid: ext_azure-iot_az_dt_route_show
-          displayName: az dt route show
-      - name: twin
-        displayName: az dt twin
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_twin
-          displayName: az dt twin
-        - name: create
-          uid: ext_azure-iot_az_dt_twin_create
-          displayName: az dt twin create
-        - name: delete
-          uid: ext_azure-iot_az_dt_twin_delete
-          displayName: az dt twin delete
-        - name: query
-          uid: ext_azure-iot_az_dt_twin_query
-          displayName: az dt twin query
-        - name: show
-          uid: ext_azure-iot_az_dt_twin_show
-          displayName: az dt twin show
-        - name: update
-          uid: ext_azure-iot_az_dt_twin_update
-          displayName: az dt twin update
-        - name: component
-          displayName: az dt twin component
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_component
-            displayName: az dt twin component
-          - name: show
-            uid: ext_azure-iot_az_dt_twin_component_show
-            displayName: az dt twin component show
-          - name: update
-            uid: ext_azure-iot_az_dt_twin_component_update
-            displayName: az dt twin component update
-        - name: relationship
-          displayName: az dt twin relationship
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_relationship
-            displayName: az dt twin relationship
-          - name: create
-            uid: ext_azure-iot_az_dt_twin_relationship_create
-            displayName: az dt twin relationship create
-          - name: delete
-            uid: ext_azure-iot_az_dt_twin_relationship_delete
-            displayName: az dt twin relationship delete
-          - name: list
-            uid: ext_azure-iot_az_dt_twin_relationship_list
-            displayName: az dt twin relationship list
-          - name: show
-            uid: ext_azure-iot_az_dt_twin_relationship_show
-            displayName: az dt twin relationship show
-          - name: update
-            uid: ext_azure-iot_az_dt_twin_relationship_update
-            displayName: az dt twin relationship update
-        - name: telemetry
-          displayName: az dt twin telemetry
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_telemetry
-            displayName: az dt twin telemetry
-          - name: send
-            uid: ext_azure-iot_az_dt_twin_telemetry_send
-            displayName: az dt twin telemetry send
-    - name: iotcentral
-      displayName: az iotcentral
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_iotcentral
-        displayName: az iotcentral
-      - name: app
-        displayName: az iotcentral app
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iotcentral_app
-          displayName: az iotcentral app
-        - name: monitor-events
-          uid: ext_azure-iot_az_iotcentral_app_monitor_events
-          displayName: az iotcentral app monitor-events
-        - name: device-twin
-          displayName: az iotcentral app device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iotcentral_app_device_twin
-            displayName: az iotcentral app device-twin
-          - name: show
-            uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-            displayName: az iotcentral app device-twin show
-      - name: device-twin
-        displayName: az iotcentral device-twin
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iotcentral_device_twin
-          displayName: az iotcentral device-twin
-        - name: show
-          uid: ext_azure-iot_az_iotcentral_device_twin_show
-          displayName: az iotcentral device-twin show
-  - name: blockchain
-    items:
-    - name: Overview
-      uid: ext_blockchain_az
-    - name: blockchain
-      displayName: az blockchain
-      items:
-      - name: Overview
-        uid: ext_blockchain_az_blockchain
-        displayName: az blockchain
-      - name: consortium
-        displayName: az blockchain consortium
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_consortium
-          displayName: az blockchain consortium
-        - name: list
-          uid: ext_blockchain_az_blockchain_consortium_list
-          displayName: az blockchain consortium list
-      - name: member
-        displayName: az blockchain member
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_member
-          displayName: az blockchain member
-        - name: create
-          uid: ext_blockchain_az_blockchain_member_create
-          displayName: az blockchain member create
-        - name: delete
-          uid: ext_blockchain_az_blockchain_member_delete
-          displayName: az blockchain member delete
-        - name: list
-          uid: ext_blockchain_az_blockchain_member_list
-          displayName: az blockchain member list
-        - name: list-api-key
-          uid: ext_blockchain_az_blockchain_member_list_api_key
-          displayName: az blockchain member list-api-key
-        - name: list-consortium-member
-          uid: ext_blockchain_az_blockchain_member_list_consortium_member
-          displayName: az blockchain member list-consortium-member
-        - name: regenerate-api-key
-          uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-          displayName: az blockchain member regenerate-api-key
-        - name: show
-          uid: ext_blockchain_az_blockchain_member_show
-          displayName: az blockchain member show
-        - name: update
-          uid: ext_blockchain_az_blockchain_member_update
-          displayName: az blockchain member update
-        - name: wait
-          uid: ext_blockchain_az_blockchain_member_wait
-          displayName: az blockchain member wait
-      - name: transaction-node
-        displayName: az blockchain transaction-node
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_transaction_node
-          displayName: az blockchain transaction-node
-        - name: create
-          uid: ext_blockchain_az_blockchain_transaction_node_create
-          displayName: az blockchain transaction-node create
-        - name: delete
-          uid: ext_blockchain_az_blockchain_transaction_node_delete
-          displayName: az blockchain transaction-node delete
-        - name: list
-          uid: ext_blockchain_az_blockchain_transaction_node_list
-          displayName: az blockchain transaction-node list
-        - name: list-api-key
-          uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-          displayName: az blockchain transaction-node list-api-key
-        - name: regenerate-api-key
-          uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-          displayName: az blockchain transaction-node regenerate-api-key
-        - name: show
-          uid: ext_blockchain_az_blockchain_transaction_node_show
-          displayName: az blockchain transaction-node show
-        - name: update
-          uid: ext_blockchain_az_blockchain_transaction_node_update
-          displayName: az blockchain transaction-node update
-        - name: wait
-          uid: ext_blockchain_az_blockchain_transaction_node_wait
-          displayName: az blockchain transaction-node wait
-  - name: blueprint
-    items:
-    - name: Overview
-      uid: ext_blueprint_az
-    - name: blueprint
-      displayName: az blueprint
-      items:
-      - name: Overview
-        uid: ext_blueprint_az_blueprint
-        displayName: az blueprint
-      - name: create
-        uid: ext_blueprint_az_blueprint_create
-        displayName: az blueprint create
-      - name: delete
-        uid: ext_blueprint_az_blueprint_delete
-        displayName: az blueprint delete
-      - name: import
-        uid: ext_blueprint_az_blueprint_import
-        displayName: az blueprint import
-      - name: list
-        uid: ext_blueprint_az_blueprint_list
-        displayName: az blueprint list
-      - name: publish
-        uid: ext_blueprint_az_blueprint_publish
-        displayName: az blueprint publish
-      - name: show
-        uid: ext_blueprint_az_blueprint_show
-        displayName: az blueprint show
-      - name: update
-        uid: ext_blueprint_az_blueprint_update
-        displayName: az blueprint update
-      - name: artifact
-        displayName: az blueprint artifact
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_artifact
-          displayName: az blueprint artifact
-        - name: delete
-          uid: ext_blueprint_az_blueprint_artifact_delete
-          displayName: az blueprint artifact delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_artifact_list
-          displayName: az blueprint artifact list
-        - name: show
-          uid: ext_blueprint_az_blueprint_artifact_show
-          displayName: az blueprint artifact show
-        - name: policy
-          displayName: az blueprint artifact policy
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_policy
-            displayName: az blueprint artifact policy
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_policy_create
-            displayName: az blueprint artifact policy create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_policy_update
-            displayName: az blueprint artifact policy update
-        - name: role
-          displayName: az blueprint artifact role
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_role
-            displayName: az blueprint artifact role
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_role_create
-            displayName: az blueprint artifact role create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_role_update
-            displayName: az blueprint artifact role update
-        - name: template
-          displayName: az blueprint artifact template
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_template
-            displayName: az blueprint artifact template
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_template_create
-            displayName: az blueprint artifact template create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_template_update
-            displayName: az blueprint artifact template update
-      - name: assignment
-        displayName: az blueprint assignment
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_assignment
-          displayName: az blueprint assignment
-        - name: create
-          uid: ext_blueprint_az_blueprint_assignment_create
-          displayName: az blueprint assignment create
-        - name: delete
-          uid: ext_blueprint_az_blueprint_assignment_delete
-          displayName: az blueprint assignment delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_assignment_list
-          displayName: az blueprint assignment list
-        - name: show
-          uid: ext_blueprint_az_blueprint_assignment_show
-          displayName: az blueprint assignment show
-        - name: update
-          uid: ext_blueprint_az_blueprint_assignment_update
-          displayName: az blueprint assignment update
-        - name: wait
-          uid: ext_blueprint_az_blueprint_assignment_wait
-          displayName: az blueprint assignment wait
-        - name: who
-          uid: ext_blueprint_az_blueprint_assignment_who
-          displayName: az blueprint assignment who
-      - name: resource-group
-        displayName: az blueprint resource-group
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_resource_group
-          displayName: az blueprint resource-group
-        - name: add
-          uid: ext_blueprint_az_blueprint_resource_group_add
-          displayName: az blueprint resource-group add
-        - name: list
-          uid: ext_blueprint_az_blueprint_resource_group_list
-          displayName: az blueprint resource-group list
-        - name: remove
-          uid: ext_blueprint_az_blueprint_resource_group_remove
-          displayName: az blueprint resource-group remove
-        - name: show
-          uid: ext_blueprint_az_blueprint_resource_group_show
-          displayName: az blueprint resource-group show
-        - name: update
-          uid: ext_blueprint_az_blueprint_resource_group_update
-          displayName: az blueprint resource-group update
-      - name: version
-        displayName: az blueprint version
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_version
-          displayName: az blueprint version
-        - name: delete
-          uid: ext_blueprint_az_blueprint_version_delete
-          displayName: az blueprint version delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_version_list
-          displayName: az blueprint version list
-        - name: show
-          uid: ext_blueprint_az_blueprint_version_show
-          displayName: az blueprint version show
-        - name: artifact
-          displayName: az blueprint version artifact
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_version_artifact
-            displayName: az blueprint version artifact
-          - name: list
-            uid: ext_blueprint_az_blueprint_version_artifact_list
-            displayName: az blueprint version artifact list
-          - name: show
-            uid: ext_blueprint_az_blueprint_version_artifact_show
-            displayName: az blueprint version artifact show
-  - name: codespaces
-    items:
-    - name: Overview
-      uid: ext_codespaces_az
-    - name: codespace
-      displayName: az codespace
-      items:
-      - name: Overview
-        uid: ext_codespaces_az_codespace
-        displayName: az codespace
-      - name: create
-        uid: ext_codespaces_az_codespace_create
-        displayName: az codespace create
-      - name: delete
-        uid: ext_codespaces_az_codespace_delete
-        displayName: az codespace delete
-      - name: list
-        uid: ext_codespaces_az_codespace_list
-        displayName: az codespace list
-      - name: open
-        uid: ext_codespaces_az_codespace_open
-        displayName: az codespace open
-      - name: resume
-        uid: ext_codespaces_az_codespace_resume
-        displayName: az codespace resume
-      - name: show
-        uid: ext_codespaces_az_codespace_show
-        displayName: az codespace show
-      - name: suspend
-        uid: ext_codespaces_az_codespace_suspend
-        displayName: az codespace suspend
-      - name: location
-        displayName: az codespace location
-        items:
-        - name: Overview
-          uid: ext_codespaces_az_codespace_location
-          displayName: az codespace location
-        - name: list
-          uid: ext_codespaces_az_codespace_location_list
-          displayName: az codespace location list
-        - name: show
-          uid: ext_codespaces_az_codespace_location_show
-          displayName: az codespace location show
-      - name: plan
-        displayName: az codespace plan
-        items:
-        - name: Overview
-          uid: ext_codespaces_az_codespace_plan
-          displayName: az codespace plan
-        - name: create
-          uid: ext_codespaces_az_codespace_plan_create
-          displayName: az codespace plan create
-        - name: delete
-          uid: ext_codespaces_az_codespace_plan_delete
-          displayName: az codespace plan delete
-        - name: list
-          uid: ext_codespaces_az_codespace_plan_list
-          displayName: az codespace plan list
-        - name: show
-          uid: ext_codespaces_az_codespace_plan_show
-          displayName: az codespace plan show
-  - name: connectedk8s
-    items:
-    - name: Overview
-      uid: ext_connectedk8s_az
-    - name: connectedk8s
-      displayName: az connectedk8s
-      items:
-      - name: Overview
-        uid: ext_connectedk8s_az_connectedk8s
-        displayName: az connectedk8s
-      - name: connect
-        uid: ext_connectedk8s_az_connectedk8s_connect
-        displayName: az connectedk8s connect
-      - name: delete
-        uid: ext_connectedk8s_az_connectedk8s_delete
-        displayName: az connectedk8s delete
-      - name: list
-        uid: ext_connectedk8s_az_connectedk8s_list
-        displayName: az connectedk8s list
-      - name: show
-        uid: ext_connectedk8s_az_connectedk8s_show
-        displayName: az connectedk8s show
-  - name: connectedmachine
-    items:
-    - name: Overview
-      uid: ext_connectedmachine_az
-    - name: connectedmachine
-      displayName: az connectedmachine
-      items:
-      - name: Overview
-        uid: ext_connectedmachine_az_connectedmachine
-        displayName: az connectedmachine
-      - name: delete
-        uid: ext_connectedmachine_az_connectedmachine_delete
-        displayName: az connectedmachine delete
-      - name: list
-        uid: ext_connectedmachine_az_connectedmachine_list
-        displayName: az connectedmachine list
-      - name: show
-        uid: ext_connectedmachine_az_connectedmachine_show
-        displayName: az connectedmachine show
-  - name: costmanagement
-    items:
-    - name: Overview
-      uid: ext_costmanagement_az
-    - name: costmanagement
-      displayName: az costmanagement
-      items:
-      - name: Overview
-        uid: ext_costmanagement_az_costmanagement
-        displayName: az costmanagement
-      - name: query
-        uid: ext_costmanagement_az_costmanagement_query
-        displayName: az costmanagement query
-      - name: export
-        displayName: az costmanagement export
-        items:
-        - name: Overview
-          uid: ext_costmanagement_az_costmanagement_export
-          displayName: az costmanagement export
-        - name: create
-          uid: ext_costmanagement_az_costmanagement_export_create
-          displayName: az costmanagement export create
-        - name: delete
-          uid: ext_costmanagement_az_costmanagement_export_delete
-          displayName: az costmanagement export delete
-        - name: list
-          uid: ext_costmanagement_az_costmanagement_export_list
-          displayName: az costmanagement export list
-        - name: show
-          uid: ext_costmanagement_az_costmanagement_export_show
-          displayName: az costmanagement export show
-        - name: update
-          uid: ext_costmanagement_az_costmanagement_export_update
-          displayName: az costmanagement export update
-  - name: csvmware
-    items:
-    - name: Overview
-      uid: ext_csvmware_az
-    - name: csvmware
-      displayName: az csvmware
-      items:
-      - name: Overview
-        uid: ext_csvmware_az_csvmware
-        displayName: az csvmware
-      - name: private-cloud
-        displayName: az csvmware private-cloud
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_private_cloud
-          displayName: az csvmware private-cloud
-        - name: list
-          uid: ext_csvmware_az_csvmware_private_cloud_list
-          displayName: az csvmware private-cloud list
-        - name: show
-          uid: ext_csvmware_az_csvmware_private_cloud_show
-          displayName: az csvmware private-cloud show
-      - name: resource-pool
-        displayName: az csvmware resource-pool
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_resource_pool
-          displayName: az csvmware resource-pool
-        - name: list
-          uid: ext_csvmware_az_csvmware_resource_pool_list
-          displayName: az csvmware resource-pool list
-        - name: show
-          uid: ext_csvmware_az_csvmware_resource_pool_show
-          displayName: az csvmware resource-pool show
-      - name: virtual-network
-        displayName: az csvmware virtual-network
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_virtual_network
-          displayName: az csvmware virtual-network
-        - name: list
-          uid: ext_csvmware_az_csvmware_virtual_network_list
-          displayName: az csvmware virtual-network list
-        - name: show
-          uid: ext_csvmware_az_csvmware_virtual_network_show
-          displayName: az csvmware virtual-network show
-      - name: vm
-        displayName: az csvmware vm
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_vm
-          displayName: az csvmware vm
-        - name: create
-          uid: ext_csvmware_az_csvmware_vm_create
-          displayName: az csvmware vm create
-        - name: delete
-          uid: ext_csvmware_az_csvmware_vm_delete
-          displayName: az csvmware vm delete
-        - name: list
-          uid: ext_csvmware_az_csvmware_vm_list
-          displayName: az csvmware vm list
-        - name: show
-          uid: ext_csvmware_az_csvmware_vm_show
-          displayName: az csvmware vm show
-        - name: start
-          uid: ext_csvmware_az_csvmware_vm_start
-          displayName: az csvmware vm start
-        - name: stop
-          uid: ext_csvmware_az_csvmware_vm_stop
-          displayName: az csvmware vm stop
-        - name: update
-          uid: ext_csvmware_az_csvmware_vm_update
-          displayName: az csvmware vm update
-        - name: disk
-          displayName: az csvmware vm disk
-          items:
-          - name: Overview
-            uid: ext_csvmware_az_csvmware_vm_disk
-            displayName: az csvmware vm disk
-          - name: add
-            uid: ext_csvmware_az_csvmware_vm_disk_add
-            displayName: az csvmware vm disk add
-          - name: delete
-            uid: ext_csvmware_az_csvmware_vm_disk_delete
-            displayName: az csvmware vm disk delete
-          - name: list
-            uid: ext_csvmware_az_csvmware_vm_disk_list
-            displayName: az csvmware vm disk list
-          - name: show
-            uid: ext_csvmware_az_csvmware_vm_disk_show
-            displayName: az csvmware vm disk show
-        - name: nic
-          displayName: az csvmware vm nic
-          items:
-          - name: Overview
-            uid: ext_csvmware_az_csvmware_vm_nic
-            displayName: az csvmware vm nic
-          - name: add
-            uid: ext_csvmware_az_csvmware_vm_nic_add
-            displayName: az csvmware vm nic add
-          - name: delete
-            uid: ext_csvmware_az_csvmware_vm_nic_delete
-            displayName: az csvmware vm nic delete
-          - name: list
-            uid: ext_csvmware_az_csvmware_vm_nic_list
-            displayName: az csvmware vm nic list
-          - name: show
-            uid: ext_csvmware_az_csvmware_vm_nic_show
-            displayName: az csvmware vm nic show
-      - name: vm-template
-        displayName: az csvmware vm-template
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_vm_template
-          displayName: az csvmware vm-template
-        - name: list
-          uid: ext_csvmware_az_csvmware_vm_template_list
-          displayName: az csvmware vm-template list
-        - name: show
-          uid: ext_csvmware_az_csvmware_vm_template_show
-          displayName: az csvmware vm-template show
-  - name: custom-providers
-    items:
-    - name: Overview
-      uid: ext_custom-providers_az
-    - name: custom-providers
-      displayName: az custom-providers
-      items:
-      - name: Overview
-        uid: ext_custom-providers_az_custom_providers
-        displayName: az custom-providers
-      - name: resource-provider
-        displayName: az custom-providers resource-provider
-        items:
-        - name: Overview
-          uid: ext_custom-providers_az_custom_providers_resource_provider
-          displayName: az custom-providers resource-provider
-        - name: create
-          uid: ext_custom-providers_az_custom_providers_resource_provider_create
-          displayName: az custom-providers resource-provider create
-        - name: delete
-          uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-          displayName: az custom-providers resource-provider delete
-        - name: list
-          uid: ext_custom-providers_az_custom_providers_resource_provider_list
-          displayName: az custom-providers resource-provider list
-        - name: show
-          uid: ext_custom-providers_az_custom_providers_resource_provider_show
-          displayName: az custom-providers resource-provider show
-        - name: update
-          uid: ext_custom-providers_az_custom_providers_resource_provider_update
-          displayName: az custom-providers resource-provider update
-  - name: databox
-    items:
-    - name: Overview
-      uid: ext_databox_az
-    - name: databox
-      displayName: az databox
-      items:
-      - name: Overview
-        uid: ext_databox_az_databox
-        displayName: az databox
-      - name: job
-        displayName: az databox job
-        items:
-        - name: Overview
-          uid: ext_databox_az_databox_job
-          displayName: az databox job
-        - name: cancel
-          uid: ext_databox_az_databox_job_cancel
-          displayName: az databox job cancel
-        - name: create
-          uid: ext_databox_az_databox_job_create
-          displayName: az databox job create
-        - name: delete
-          uid: ext_databox_az_databox_job_delete
-          displayName: az databox job delete
-        - name: list
-          uid: ext_databox_az_databox_job_list
-          displayName: az databox job list
-        - name: list-credentials
-          uid: ext_databox_az_databox_job_list_credentials
-          displayName: az databox job list-credentials
-        - name: show
-          uid: ext_databox_az_databox_job_show
-          displayName: az databox job show
-        - name: update
-          uid: ext_databox_az_databox_job_update
-          displayName: az databox job update
-  - name: databricks
-    items:
-    - name: Overview
-      uid: ext_databricks_az
-    - name: databricks
-      displayName: az databricks
-      items:
-      - name: Overview
-        uid: ext_databricks_az_databricks
-        displayName: az databricks
-      - name: workspace
-        displayName: az databricks workspace
-        items:
-        - name: Overview
-          uid: ext_databricks_az_databricks_workspace
-          displayName: az databricks workspace
-        - name: create
-          uid: ext_databricks_az_databricks_workspace_create
-          displayName: az databricks workspace create
-        - name: delete
-          uid: ext_databricks_az_databricks_workspace_delete
-          displayName: az databricks workspace delete
-        - name: list
-          uid: ext_databricks_az_databricks_workspace_list
-          displayName: az databricks workspace list
-        - name: show
-          uid: ext_databricks_az_databricks_workspace_show
-          displayName: az databricks workspace show
-        - name: update
-          uid: ext_databricks_az_databricks_workspace_update
-          displayName: az databricks workspace update
-        - name: wait
-          uid: ext_databricks_az_databricks_workspace_wait
-          displayName: az databricks workspace wait
-  - name: datashare
-    items:
-    - name: Overview
-      uid: ext_datashare_az
-    - name: datashare
-      displayName: az datashare
-      items:
-      - name: Overview
-        uid: ext_datashare_az_datashare
-        displayName: az datashare
-      - name: create
-        uid: ext_datashare_az_datashare_create
-        displayName: az datashare create
-      - name: delete
-        uid: ext_datashare_az_datashare_delete
-        displayName: az datashare delete
-      - name: list
-        uid: ext_datashare_az_datashare_list
-        displayName: az datashare list
-      - name: show
-        uid: ext_datashare_az_datashare_show
-        displayName: az datashare show
-      - name: wait
-        uid: ext_datashare_az_datashare_wait
-        displayName: az datashare wait
-      - name: account
-        displayName: az datashare account
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_account
-          displayName: az datashare account
-        - name: create
-          uid: ext_datashare_az_datashare_account_create
-          displayName: az datashare account create
-        - name: delete
-          uid: ext_datashare_az_datashare_account_delete
-          displayName: az datashare account delete
-        - name: list
-          uid: ext_datashare_az_datashare_account_list
-          displayName: az datashare account list
-        - name: show
-          uid: ext_datashare_az_datashare_account_show
-          displayName: az datashare account show
-        - name: update
-          uid: ext_datashare_az_datashare_account_update
-          displayName: az datashare account update
-        - name: wait
-          uid: ext_datashare_az_datashare_account_wait
-          displayName: az datashare account wait
-      - name: consumer
-        displayName: az datashare consumer
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_consumer
-          displayName: az datashare consumer
-        - name: dataset-mapping
-          displayName: az datashare consumer dataset-mapping
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping
-            displayName: az datashare consumer dataset-mapping
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-            displayName: az datashare consumer dataset-mapping create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-            displayName: az datashare consumer dataset-mapping delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-            displayName: az datashare consumer dataset-mapping list
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-            displayName: az datashare consumer dataset-mapping show
-        - name: invitation
-          displayName: az datashare consumer invitation
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_invitation
-            displayName: az datashare consumer invitation
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_invitation_list
-            displayName: az datashare consumer invitation list
-          - name: reject
-            uid: ext_datashare_az_datashare_consumer_invitation_reject
-            displayName: az datashare consumer invitation reject
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_invitation_show
-            displayName: az datashare consumer invitation show
-        - name: share-subscription
-          displayName: az datashare consumer share-subscription
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_share_subscription
-            displayName: az datashare consumer share-subscription
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_share_subscription_create
-            displayName: az datashare consumer share-subscription create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-            displayName: az datashare consumer share-subscription delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list
-            displayName: az datashare consumer share-subscription list
-          - name: list-source-dataset
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-            displayName: az datashare consumer share-subscription list-source-dataset
-          - name: list-source-share-synchronization-setting
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-            displayName: az datashare consumer share-subscription list-source-share-synchronization-setting
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_share_subscription_show
-            displayName: az datashare consumer share-subscription show
-          - name: wait
-            uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-            displayName: az datashare consumer share-subscription wait
-          - name: synchronization
-            displayName: az datashare consumer share-subscription synchronization
-            items:
-            - name: Overview
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-              displayName: az datashare consumer share-subscription synchronization
-            - name: cancel
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-              displayName: az datashare consumer share-subscription synchronization cancel
-            - name: list
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-              displayName: az datashare consumer share-subscription synchronization list
-            - name: list-detail
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-              displayName: az datashare consumer share-subscription synchronization list-detail
-            - name: start
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-              displayName: az datashare consumer share-subscription synchronization start
-            - name: wait
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-              displayName: az datashare consumer share-subscription synchronization wait
-        - name: trigger
-          displayName: az datashare consumer trigger
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_trigger
-            displayName: az datashare consumer trigger
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_trigger_create
-            displayName: az datashare consumer trigger create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_trigger_delete
-            displayName: az datashare consumer trigger delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_trigger_list
-            displayName: az datashare consumer trigger list
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_trigger_show
-            displayName: az datashare consumer trigger show
-          - name: wait
-            uid: ext_datashare_az_datashare_consumer_trigger_wait
-            displayName: az datashare consumer trigger wait
-      - name: dataset
-        displayName: az datashare dataset
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_dataset
-          displayName: az datashare dataset
-        - name: create
-          uid: ext_datashare_az_datashare_dataset_create
-          displayName: az datashare dataset create
-        - name: delete
-          uid: ext_datashare_az_datashare_dataset_delete
-          displayName: az datashare dataset delete
-        - name: list
-          uid: ext_datashare_az_datashare_dataset_list
-          displayName: az datashare dataset list
-        - name: show
-          uid: ext_datashare_az_datashare_dataset_show
-          displayName: az datashare dataset show
-        - name: wait
-          uid: ext_datashare_az_datashare_dataset_wait
-          displayName: az datashare dataset wait
-      - name: invitation
-        displayName: az datashare invitation
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_invitation
-          displayName: az datashare invitation
-        - name: create
-          uid: ext_datashare_az_datashare_invitation_create
-          displayName: az datashare invitation create
-        - name: delete
-          uid: ext_datashare_az_datashare_invitation_delete
-          displayName: az datashare invitation delete
-        - name: list
-          uid: ext_datashare_az_datashare_invitation_list
-          displayName: az datashare invitation list
-        - name: show
-          uid: ext_datashare_az_datashare_invitation_show
-          displayName: az datashare invitation show
-      - name: provider-share-subscription
-        displayName: az datashare provider-share-subscription
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_provider_share_subscription
-          displayName: az datashare provider-share-subscription
-        - name: list
-          uid: ext_datashare_az_datashare_provider_share_subscription_list
-          displayName: az datashare provider-share-subscription list
-        - name: reinstate
-          uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-          displayName: az datashare provider-share-subscription reinstate
-        - name: revoke
-          uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-          displayName: az datashare provider-share-subscription revoke
-        - name: show
-          uid: ext_datashare_az_datashare_provider_share_subscription_show
-          displayName: az datashare provider-share-subscription show
-        - name: wait
-          uid: ext_datashare_az_datashare_provider_share_subscription_wait
-          displayName: az datashare provider-share-subscription wait
-      - name: synchronization
-        displayName: az datashare synchronization
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_synchronization
-          displayName: az datashare synchronization
-        - name: list
-          uid: ext_datashare_az_datashare_synchronization_list
-          displayName: az datashare synchronization list
-        - name: list-detail
-          uid: ext_datashare_az_datashare_synchronization_list_detail
-          displayName: az datashare synchronization list-detail
-      - name: synchronization-setting
-        displayName: az datashare synchronization-setting
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_synchronization_setting
-          displayName: az datashare synchronization-setting
-        - name: create
-          uid: ext_datashare_az_datashare_synchronization_setting_create
-          displayName: az datashare synchronization-setting create
-        - name: delete
-          uid: ext_datashare_az_datashare_synchronization_setting_delete
-          displayName: az datashare synchronization-setting delete
-        - name: list
-          uid: ext_datashare_az_datashare_synchronization_setting_list
-          displayName: az datashare synchronization-setting list
-        - name: show
-          uid: ext_datashare_az_datashare_synchronization_setting_show
-          displayName: az datashare synchronization-setting show
-        - name: wait
-          uid: ext_datashare_az_datashare_synchronization_setting_wait
-          displayName: az datashare synchronization-setting wait
-  - name: db-up
-    items:
-    - name: Overview
-      uid: ext_db-up_az
-    - name: MySQL
-      displayName: az mysql
-      items:
-      - name: Overview
-        uid: ext_db-up_az_mysql
-        displayName: az mysql
-      - name: down
-        uid: ext_db-up_az_mysql_down
-        displayName: az mysql down
-      - name: show-connection-string
-        uid: ext_db-up_az_mysql_show_connection_string
-        displayName: az mysql show-connection-string
-      - name: up
-        uid: ext_db-up_az_mysql_up
-        displayName: az mysql up
-    - name: PostgreSQL
-      displayName: az postgres
-      items:
-      - name: Overview
-        uid: ext_db-up_az_postgres
-        displayName: az postgres
-      - name: down
-        uid: ext_db-up_az_postgres_down
-        displayName: az postgres down
-      - name: show-connection-string
-        uid: ext_db-up_az_postgres_show_connection_string
-        displayName: az postgres show-connection-string
-      - name: up
-        uid: ext_db-up_az_postgres_up
-        displayName: az postgres up
-    - name: SQL
-      displayName: az sql
-      items:
-      - name: Overview
-        uid: ext_db-up_az_sql
-        displayName: az sql
-      - name: down
-        uid: ext_db-up_az_sql_down
-        displayName: az sql down
-      - name: up
-        uid: ext_db-up_az_sql_up
-        displayName: az sql up
-  - name: deploy-to-azure
-    items:
-    - name: Overview
-      uid: ext_deploy-to-azure_az
-    - name: Container
-      displayName: az container
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_container
-        displayName: az container
-      - name: app
-        displayName: az container app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_container_app
-          displayName: az container app
-        - name: up
-          uid: ext_deploy-to-azure_az_container_app_up
-          displayName: az container app up
-    - name: Functions
-      displayName: az functionapp
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_functionapp
-        displayName: az functionapp
-      - name: app
-        displayName: az functionapp app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_functionapp_app
-          displayName: az functionapp app
-        - name: up
-          uid: ext_deploy-to-azure_az_functionapp_app_up
-          displayName: az functionapp app up
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_aks
-        displayName: az aks
-      - name: app
-        displayName: az aks app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_aks_app
-          displayName: az aks app
-        - name: up
-          uid: ext_deploy-to-azure_az_aks_app_up
-          displayName: az aks app up
-  - name: dev-spaces
-    items:
-    - name: Overview
-      uid: ext_dev-spaces_az
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_dev-spaces_az_aks
-        displayName: az aks
-      - name: use-dev-spaces
-        uid: ext_dev-spaces_az_aks_use_dev_spaces
-        displayName: az aks use-dev-spaces
-  - name: dms-preview
-    items:
-    - name: Overview
-      uid: ext_dms-preview_az
-    - name: dms
-      displayName: az dms
-      items:
-      - name: Overview
-        uid: ext_dms-preview_az_dms
-        displayName: az dms
-      - name: project
-        displayName: az dms project
-        items:
-        - name: Overview
-          uid: ext_dms-preview_az_dms_project
-          displayName: az dms project
-        - name: create
-          uid: ext_dms-preview_az_dms_project_create
-          displayName: az dms project create
-        - name: task
-          displayName: az dms project task
-          items:
-          - name: Overview
-            uid: ext_dms-preview_az_dms_project_task
-            displayName: az dms project task
-          - name: cancel
-            uid: ext_dms-preview_az_dms_project_task_cancel
-            displayName: az dms project task cancel
-          - name: create
-            uid: ext_dms-preview_az_dms_project_task_create
-            displayName: az dms project task create
-          - name: cutover
-            uid: ext_dms-preview_az_dms_project_task_cutover
-            displayName: az dms project task cutover
-          - name: restart
-            uid: ext_dms-preview_az_dms_project_task_restart
-            displayName: az dms project task restart
-          - name: stop
-            uid: ext_dms-preview_az_dms_project_task_stop
-            displayName: az dms project task stop
-      - name: task
-        displayName: az dms task
-        items:
-        - name: Overview
-          uid: ext_dms-preview_az_dms_task
-          displayName: az dms task
-        - name: cancel
-          uid: ext_dms-preview_az_dms_task_cancel
-          displayName: az dms task cancel
-        - name: create
-          uid: ext_dms-preview_az_dms_task_create
-          displayName: az dms task create
-        - name: delete
-          uid: ext_dms-preview_az_dms_task_delete
-          displayName: az dms task delete
-        - name: list
-          uid: ext_dms-preview_az_dms_task_list
-          displayName: az dms task list
-        - name: show
-          uid: ext_dms-preview_az_dms_task_show
-          displayName: az dms task show
-  - name: eventgrid
-    items:
-    - name: Overview
-      uid: ext_eventgrid_az
-    - name: eventgrid
-      displayName: az eventgrid
-      items:
-      - name: Overview
-        uid: ext_eventgrid_az_eventgrid
-        displayName: az eventgrid
-      - name: domain
-        displayName: az eventgrid domain
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_domain
-          displayName: az eventgrid domain
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_domain_create
-          displayName: az eventgrid domain create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_domain_delete
-          displayName: az eventgrid domain delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_domain_list
-          displayName: az eventgrid domain list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_domain_show
-          displayName: az eventgrid domain show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_domain_update
-          displayName: az eventgrid domain update
-        - name: key
-          displayName: az eventgrid domain key
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_key
-            displayName: az eventgrid domain key
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_key_list
-            displayName: az eventgrid domain key list
-          - name: regenerate
-            uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-            displayName: az eventgrid domain key regenerate
-        - name: private-endpoint-connection
-          displayName: az eventgrid domain private-endpoint-connection
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-            displayName: az eventgrid domain private-endpoint-connection
-          - name: approve
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-            displayName: az eventgrid domain private-endpoint-connection approve
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-            displayName: az eventgrid domain private-endpoint-connection delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-            displayName: az eventgrid domain private-endpoint-connection list
-          - name: reject
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-            displayName: az eventgrid domain private-endpoint-connection reject
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-            displayName: az eventgrid domain private-endpoint-connection show
-        - name: private-link-resource
-          displayName: az eventgrid domain private-link-resource
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-            displayName: az eventgrid domain private-link-resource
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-            displayName: az eventgrid domain private-link-resource list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-            displayName: az eventgrid domain private-link-resource show
-        - name: topic
-          displayName: az eventgrid domain topic
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_topic
-            displayName: az eventgrid domain topic
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_domain_topic_create
-            displayName: az eventgrid domain topic create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-            displayName: az eventgrid domain topic delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_topic_list
-            displayName: az eventgrid domain topic list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_topic_show
-            displayName: az eventgrid domain topic show
-      - name: event-subscription
-        displayName: az eventgrid event-subscription
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_event_subscription
-          displayName: az eventgrid event-subscription
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_event_subscription_create
-          displayName: az eventgrid event-subscription create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-          displayName: az eventgrid event-subscription delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_event_subscription_list
-          displayName: az eventgrid event-subscription list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_event_subscription_show
-          displayName: az eventgrid event-subscription show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_event_subscription_update
-          displayName: az eventgrid event-subscription update
-      - name: extension-topic
-        displayName: az eventgrid extension-topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_extension_topic
-          displayName: az eventgrid extension-topic
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_extension_topic_show
-          displayName: az eventgrid extension-topic show
-      - name: partner
-        displayName: az eventgrid partner
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_partner
-          displayName: az eventgrid partner
-        - name: namespace
-          displayName: az eventgrid partner namespace
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_namespace
-            displayName: az eventgrid partner namespace
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-            displayName: az eventgrid partner namespace create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-            displayName: az eventgrid partner namespace delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-            displayName: az eventgrid partner namespace list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-            displayName: az eventgrid partner namespace show
-          - name: event-channel
-            displayName: az eventgrid partner namespace event-channel
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-              displayName: az eventgrid partner namespace event-channel
-            - name: create
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-              displayName: az eventgrid partner namespace event-channel create
-            - name: delete
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-              displayName: az eventgrid partner namespace event-channel delete
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-              displayName: az eventgrid partner namespace event-channel list
-            - name: show
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-              displayName: az eventgrid partner namespace event-channel show
-          - name: key
-            displayName: az eventgrid partner namespace key
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-              displayName: az eventgrid partner namespace key
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-              displayName: az eventgrid partner namespace key list
-            - name: regenerate
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-              displayName: az eventgrid partner namespace key regenerate
-        - name: registration
-          displayName: az eventgrid partner registration
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_registration
-            displayName: az eventgrid partner registration
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_partner_registration_create
-            displayName: az eventgrid partner registration create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-            displayName: az eventgrid partner registration delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_registration_list
-            displayName: az eventgrid partner registration list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_registration_show
-            displayName: az eventgrid partner registration show
-        - name: topic
-          displayName: az eventgrid partner topic
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_topic
-            displayName: az eventgrid partner topic
-          - name: activate
-            uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-            displayName: az eventgrid partner topic activate
-          - name: deactivate
-            uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-            displayName: az eventgrid partner topic deactivate
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-            displayName: az eventgrid partner topic delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_topic_list
-            displayName: az eventgrid partner topic list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_topic_show
-            displayName: az eventgrid partner topic show
-          - name: event-subscription
-            displayName: az eventgrid partner topic event-subscription
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-              displayName: az eventgrid partner topic event-subscription
-            - name: create
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-              displayName: az eventgrid partner topic event-subscription create
-            - name: delete
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-              displayName: az eventgrid partner topic event-subscription delete
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-              displayName: az eventgrid partner topic event-subscription list
-            - name: show
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-              displayName: az eventgrid partner topic event-subscription show
-            - name: update
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-              displayName: az eventgrid partner topic event-subscription update
-      - name: system-topic
-        displayName: az eventgrid system-topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_system_topic
-          displayName: az eventgrid system-topic
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_system_topic_create
-          displayName: az eventgrid system-topic create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_system_topic_delete
-          displayName: az eventgrid system-topic delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_system_topic_list
-          displayName: az eventgrid system-topic list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_system_topic_show
-          displayName: az eventgrid system-topic show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_system_topic_update
-          displayName: az eventgrid system-topic update
-        - name: event-subscription
-          displayName: az eventgrid system-topic event-subscription
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-            displayName: az eventgrid system-topic event-subscription
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-            displayName: az eventgrid system-topic event-subscription create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-            displayName: az eventgrid system-topic event-subscription delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-            displayName: az eventgrid system-topic event-subscription list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-            displayName: az eventgrid system-topic event-subscription show
-          - name: update
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-            displayName: az eventgrid system-topic event-subscription update
-      - name: topic
-        displayName: az eventgrid topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_topic
-          displayName: az eventgrid topic
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_topic_create
-          displayName: az eventgrid topic create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_topic_delete
-          displayName: az eventgrid topic delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_topic_list
-          displayName: az eventgrid topic list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_topic_show
-          displayName: az eventgrid topic show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_topic_update
-          displayName: az eventgrid topic update
-        - name: key
-          displayName: az eventgrid topic key
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_key
-            displayName: az eventgrid topic key
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_key_list
-            displayName: az eventgrid topic key list
-          - name: regenerate
-            uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-            displayName: az eventgrid topic key regenerate
-        - name: private-endpoint-connection
-          displayName: az eventgrid topic private-endpoint-connection
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-            displayName: az eventgrid topic private-endpoint-connection
-          - name: approve
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-            displayName: az eventgrid topic private-endpoint-connection approve
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-            displayName: az eventgrid topic private-endpoint-connection delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-            displayName: az eventgrid topic private-endpoint-connection list
-          - name: reject
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-            displayName: az eventgrid topic private-endpoint-connection reject
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-            displayName: az eventgrid topic private-endpoint-connection show
-        - name: private-link-resource
-          displayName: az eventgrid topic private-link-resource
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-            displayName: az eventgrid topic private-link-resource
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-            displayName: az eventgrid topic private-link-resource list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-            displayName: az eventgrid topic private-link-resource show
-      - name: topic-type
-        displayName: az eventgrid topic-type
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_topic_type
-          displayName: az eventgrid topic-type
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_topic_type_list
-          displayName: az eventgrid topic-type list
-        - name: list-event-types
-          uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-          displayName: az eventgrid topic-type list-event-types
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_topic_type_show
-          displayName: az eventgrid topic-type show
-  - name: express-route
-    items:
-    - name: Overview
-      uid: ext_express-route_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_express-route_az_network
-        displayName: az network
-      - name: Express Route
-        displayName: az network express-route
-        items:
-        - name: Overview
-          uid: ext_express-route_az_network_express_route
-          displayName: az network express-route
-        - name: create
-          uid: ext_express-route_az_network_express_route_create
-          displayName: az network express-route create
-        - name: list
-          uid: ext_express-route_az_network_express_route_list
-          displayName: az network express-route list
-        - name: show
-          uid: ext_express-route_az_network_express_route_show
-          displayName: az network express-route show
-        - name: update
-          uid: ext_express-route_az_network_express_route_update
-          displayName: az network express-route update
-        - name: gateway
-          displayName: az network express-route gateway
+        - name: Summary
+          uid: az_network_application-gateway
+          displayName: az network application-gateway
+        - name: address-pool
+          uid: az_network_application-gateway_address-pool
+          displayName: az network application-gateway address-pool
+          items: []
+        - name: auth-cert
+          uid: az_network_application-gateway_auth-cert
+          displayName: az network application-gateway auth-cert
+          items: []
+        - name: frontend-ip
+          uid: az_network_application-gateway_frontend-ip
+          displayName: az network application-gateway frontend-ip
+          items: []
+        - name: frontend-port
+          uid: az_network_application-gateway_frontend-port
+          displayName: az network application-gateway frontend-port
+          items: []
+        - name: http-listener
+          uid: az_network_application-gateway_http-listener
+          displayName: az network application-gateway http-listener
+          items: []
+        - name: http-settings
+          uid: az_network_application-gateway_http-settings
+          displayName: az network application-gateway http-settings
+          items: []
+        - name: probe
+          uid: az_network_application-gateway_probe
+          displayName: az network application-gateway probe
+          items: []
+        - name: redirect-config
+          uid: az_network_application-gateway_redirect-config
+          displayName: az network application-gateway redirect-config
+          items: []
+        - name: rewrite-rule
           items:
-          - name: Overview
-            uid: ext_express-route_az_network_express_route_gateway
-            displayName: az network express-route gateway
-          - name: create
-            uid: ext_express-route_az_network_express_route_gateway_create
-            displayName: az network express-route gateway create
-          - name: delete
-            uid: ext_express-route_az_network_express_route_gateway_delete
-            displayName: az network express-route gateway delete
-          - name: list
-            uid: ext_express-route_az_network_express_route_gateway_list
-            displayName: az network express-route gateway list
-          - name: show
-            uid: ext_express-route_az_network_express_route_gateway_show
-            displayName: az network express-route gateway show
-          - name: update
-            uid: ext_express-route_az_network_express_route_gateway_update
-            displayName: az network express-route gateway update
-          - name: connection
-            displayName: az network express-route gateway connection
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_gateway_connection
-              displayName: az network express-route gateway connection
-            - name: create
-              uid: ext_express-route_az_network_express_route_gateway_connection_create
-              displayName: az network express-route gateway connection create
-            - name: delete
-              uid: ext_express-route_az_network_express_route_gateway_connection_delete
-              displayName: az network express-route gateway connection delete
-            - name: list
-              uid: ext_express-route_az_network_express_route_gateway_connection_list
-              displayName: az network express-route gateway connection list
-            - name: show
-              uid: ext_express-route_az_network_express_route_gateway_connection_show
-              displayName: az network express-route gateway connection show
-            - name: update
-              uid: ext_express-route_az_network_express_route_gateway_connection_update
-              displayName: az network express-route gateway connection update
-        - name: port
-          displayName: az network express-route port
+          - name: Summary
+            uid: az_network_application-gateway_rewrite-rule
+            displayName: az network application-gateway rewrite-rule
+          - name: set
+            uid: az_network_application-gateway_rewrite-rule_set
+            displayName: az network application-gateway rewrite-rule set
+            items: []
+        - name: rule
+          uid: az_network_application-gateway_rule
+          displayName: az network application-gateway rule
+          items: []
+        - name: ssl-cert
+          uid: az_network_application-gateway_ssl-cert
+          displayName: az network application-gateway ssl-cert
+          items: []
+        - name: ssl-policy
+          items:
+          - name: Summary
+            uid: az_network_application-gateway_ssl-policy
+            displayName: az network application-gateway ssl-policy
+          - name: predefined
+            uid: az_network_application-gateway_ssl-policy_predefined
+            displayName: az network application-gateway ssl-policy predefined
+            items: []
+        - name: url-path-map
           items:
-          - name: Overview
-            uid: ext_express-route_az_network_express_route_port
-            displayName: az network express-route port
-          - name: create
-            uid: ext_express-route_az_network_express_route_port_create
-            displayName: az network express-route port create
-          - name: delete
-            uid: ext_express-route_az_network_express_route_port_delete
-            displayName: az network express-route port delete
-          - name: list
-            uid: ext_express-route_az_network_express_route_port_list
-            displayName: az network express-route port list
-          - name: show
-            uid: ext_express-route_az_network_express_route_port_show
-            displayName: az network express-route port show
-          - name: update
-            uid: ext_express-route_az_network_express_route_port_update
-            displayName: az network express-route port update
-          - name: link
-            displayName: az network express-route port link
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_port_link
-              displayName: az network express-route port link
-            - name: list
-              uid: ext_express-route_az_network_express_route_port_link_list
-              displayName: az network express-route port link list
-            - name: show
-              uid: ext_express-route_az_network_express_route_port_link_show
-              displayName: az network express-route port link show
-          - name: location
-            displayName: az network express-route port location
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_port_location
-              displayName: az network express-route port location
-            - name: list
-              uid: ext_express-route_az_network_express_route_port_location_list
-              displayName: az network express-route port location list
-            - name: show
-              uid: ext_express-route_az_network_express_route_port_location_show
-              displayName: az network express-route port location show
-  - name: express-route-cross-connection
-    items:
-    - name: Overview
-      uid: ext_express-route-cross-connection_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_express-route-cross-connection_az_network
-        displayName: az network
+          - name: Summary
+            uid: az_network_application-gateway_url-path-map
+            displayName: az network application-gateway url-path-map
+          - name: rule
+            uid: az_network_application-gateway_url-path-map_rule
+            displayName: az network application-gateway url-path-map rule
+            items: []
+        - name: waf-config
+          uid: az_network_application-gateway_waf-config
+          displayName: az network application-gateway waf-config
+          items: []
+      - name: asg
+        uid: az_network_asg
+        displayName: az network asg
+        items: []
+      - name: bastion
+        uid: az_network_bastion
+        displayName: az network bastion
+        items: []
       - name: cross-connection
-        displayName: az network cross-connection
         items:
-        - name: Overview
-          uid: ext_express-route-cross-connection_az_network_cross_connection
+        - name: Summary
+          uid: az_network_cross-connection
           displayName: az network cross-connection
-        - name: list
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list
-          displayName: az network cross-connection list
-        - name: list-arp-tables
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-          displayName: az network cross-connection list-arp-tables
-        - name: list-route-tables
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-          displayName: az network cross-connection list-route-tables
-        - name: show
-          uid: ext_express-route-cross-connection_az_network_cross_connection_show
-          displayName: az network cross-connection show
-        - name: summarize-route-table
-          uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-          displayName: az network cross-connection summarize-route-table
-        - name: update
-          uid: ext_express-route-cross-connection_az_network_cross_connection_update
-          displayName: az network cross-connection update
-        - name: wait
-          uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-          displayName: az network cross-connection wait
         - name: peering
+          uid: az_network_cross-connection_peering
           displayName: az network cross-connection peering
-          items:
-          - name: Overview
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-            displayName: az network cross-connection peering
-          - name: create
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-            displayName: az network cross-connection peering create
-          - name: delete
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-            displayName: az network cross-connection peering delete
-          - name: list
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-            displayName: az network cross-connection peering list
-          - name: show
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-            displayName: az network cross-connection peering show
-          - name: update
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-            displayName: az network cross-connection peering update
-  - name: front-door
-    items:
-    - name: Overview
-      uid: ext_front-door_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_front-door_az_network
-        displayName: az network
-      - name: front-door
-        displayName: az network front-door
-        items:
-        - name: Overview
-          uid: ext_front-door_az_network_front_door
-          displayName: az network front-door
-        - name: check-custom-domain
-          uid: ext_front-door_az_network_front_door_check_custom_domain
-          displayName: az network front-door check-custom-domain
-        - name: create
-          uid: ext_front-door_az_network_front_door_create
-          displayName: az network front-door create
-        - name: delete
-          uid: ext_front-door_az_network_front_door_delete
-          displayName: az network front-door delete
-        - name: list
-          uid: ext_front-door_az_network_front_door_list
-          displayName: az network front-door list
-        - name: purge-endpoint
-          uid: ext_front-door_az_network_front_door_purge_endpoint
-          displayName: az network front-door purge-endpoint
-        - name: show
-          uid: ext_front-door_az_network_front_door_show
-          displayName: az network front-door show
-        - name: update
-          uid: ext_front-door_az_network_front_door_update
-          displayName: az network front-door update
-        - name: backend-pool
-          displayName: az network front-door backend-pool
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_backend_pool
-            displayName: az network front-door backend-pool
-          - name: create
-            uid: ext_front-door_az_network_front_door_backend_pool_create
-            displayName: az network front-door backend-pool create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_backend_pool_delete
-            displayName: az network front-door backend-pool delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_backend_pool_list
-            displayName: az network front-door backend-pool list
-          - name: show
-            uid: ext_front-door_az_network_front_door_backend_pool_show
-            displayName: az network front-door backend-pool show
-          - name: backend
-            displayName: az network front-door backend-pool backend
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_backend_pool_backend
-              displayName: az network front-door backend-pool backend
-            - name: add
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-              displayName: az network front-door backend-pool backend add
-            - name: list
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-              displayName: az network front-door backend-pool backend list
-            - name: remove
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-              displayName: az network front-door backend-pool backend remove
-        - name: frontend-endpoint
-          displayName: az network front-door frontend-endpoint
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_frontend_endpoint
-            displayName: az network front-door frontend-endpoint
-          - name: create
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-            displayName: az network front-door frontend-endpoint create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-            displayName: az network front-door frontend-endpoint delete
-          - name: disable-https
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-            displayName: az network front-door frontend-endpoint disable-https
-          - name: enable-https
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-            displayName: az network front-door frontend-endpoint enable-https
-          - name: list
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-            displayName: az network front-door frontend-endpoint list
-          - name: show
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-            displayName: az network front-door frontend-endpoint show
-        - name: load-balancing
-          displayName: az network front-door load-balancing
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_load_balancing
-            displayName: az network front-door load-balancing
-          - name: create
-            uid: ext_front-door_az_network_front_door_load_balancing_create
-            displayName: az network front-door load-balancing create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_load_balancing_delete
-            displayName: az network front-door load-balancing delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_load_balancing_list
-            displayName: az network front-door load-balancing list
-          - name: show
-            uid: ext_front-door_az_network_front_door_load_balancing_show
-            displayName: az network front-door load-balancing show
+          items: []
+      - name: cross-region-lb
+        items:
+        - name: Summary
+          uid: az_network_cross-region-lb
+          displayName: az network cross-region-lb
+        - name: address-pool
+          items:
+          - name: Summary
+            uid: az_network_cross-region-lb_address-pool
+            displayName: az network cross-region-lb address-pool
+          - name: address
+            uid: az_network_cross-region-lb_address-pool_address
+            displayName: az network cross-region-lb address-pool address
+            items: []
+        - name: frontend-ip
+          uid: az_network_cross-region-lb_frontend-ip
+          displayName: az network cross-region-lb frontend-ip
+          items: []
         - name: probe
-          displayName: az network front-door probe
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_probe
-            displayName: az network front-door probe
-          - name: create
-            uid: ext_front-door_az_network_front_door_probe_create
-            displayName: az network front-door probe create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_probe_delete
-            displayName: az network front-door probe delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_probe_list
-            displayName: az network front-door probe list
-          - name: show
-            uid: ext_front-door_az_network_front_door_probe_show
-            displayName: az network front-door probe show
-          - name: update
-            uid: ext_front-door_az_network_front_door_probe_update
-            displayName: az network front-door probe update
-        - name: routing-rule
-          displayName: az network front-door routing-rule
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_routing_rule
-            displayName: az network front-door routing-rule
-          - name: create
-            uid: ext_front-door_az_network_front_door_routing_rule_create
-            displayName: az network front-door routing-rule create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_routing_rule_delete
-            displayName: az network front-door routing-rule delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_routing_rule_list
-            displayName: az network front-door routing-rule list
-          - name: show
-            uid: ext_front-door_az_network_front_door_routing_rule_show
-            displayName: az network front-door routing-rule show
-          - name: update
-            uid: ext_front-door_az_network_front_door_routing_rule_update
-            displayName: az network front-door routing-rule update
-        - name: rules-engine
-          displayName: az network front-door rules-engine
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_rules_engine
-            displayName: az network front-door rules-engine
-          - name: delete
-            uid: ext_front-door_az_network_front_door_rules_engine_delete
-            displayName: az network front-door rules-engine delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_rules_engine_list
-            displayName: az network front-door rules-engine list
-          - name: show
-            uid: ext_front-door_az_network_front_door_rules_engine_show
-            displayName: az network front-door rules-engine show
-          - name: rule
-            displayName: az network front-door rules-engine rule
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_rules_engine_rule
-              displayName: az network front-door rules-engine rule
-            - name: create
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-              displayName: az network front-door rules-engine rule create
-            - name: delete
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-              displayName: az network front-door rules-engine rule delete
-            - name: list
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-              displayName: az network front-door rules-engine rule list
-            - name: show
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-              displayName: az network front-door rules-engine rule show
-            - name: update
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-              displayName: az network front-door rules-engine rule update
-            - name: action
-              displayName: az network front-door rules-engine rule action
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-                displayName: az network front-door rules-engine rule action
-              - name: add
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-                displayName: az network front-door rules-engine rule action add
-              - name: list
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-                displayName: az network front-door rules-engine rule action list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-                displayName: az network front-door rules-engine rule action remove
-            - name: condition
-              displayName: az network front-door rules-engine rule condition
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-                displayName: az network front-door rules-engine rule condition
-              - name: add
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-                displayName: az network front-door rules-engine rule condition add
-              - name: list
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-                displayName: az network front-door rules-engine rule condition list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-                displayName: az network front-door rules-engine rule condition remove
-        - name: waf-policy
-          displayName: az network front-door waf-policy
+          uid: az_network_cross-region-lb_probe
+          displayName: az network cross-region-lb probe
+          items: []
+        - name: rule
+          uid: az_network_cross-region-lb_rule
+          displayName: az network cross-region-lb rule
+          items: []
+      - name: dns
+        items:
+        - name: Summary
+          uid: az_network_dns
+          displayName: az network dns
+        - name: record-set
           items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_waf_policy
-            displayName: az network front-door waf-policy
-          - name: create
-            uid: ext_front-door_az_network_front_door_waf_policy_create
-            displayName: az network front-door waf-policy create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_waf_policy_delete
-            displayName: az network front-door waf-policy delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_waf_policy_list
-            displayName: az network front-door waf-policy list
-          - name: show
-            uid: ext_front-door_az_network_front_door_waf_policy_show
-            displayName: az network front-door waf-policy show
-          - name: update
-            uid: ext_front-door_az_network_front_door_waf_policy_update
-            displayName: az network front-door waf-policy update
-          - name: managed-rule-definition
-            displayName: az network front-door waf-policy managed-rule-definition
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-              displayName: az network front-door waf-policy managed-rule-definition
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-              displayName: az network front-door waf-policy managed-rule-definition list
-          - name: managed-rules
-            displayName: az network front-door waf-policy managed-rules
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-              displayName: az network front-door waf-policy managed-rules
-            - name: add
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-              displayName: az network front-door waf-policy managed-rules add
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-              displayName: az network front-door waf-policy managed-rules list
-            - name: remove
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-              displayName: az network front-door waf-policy managed-rules remove
-            - name: exclusion
-              displayName: az network front-door waf-policy managed-rules exclusion
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-                displayName: az network front-door waf-policy managed-rules exclusion
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-                displayName: az network front-door waf-policy managed-rules exclusion add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-                displayName: az network front-door waf-policy managed-rules exclusion list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-                displayName: az network front-door waf-policy managed-rules exclusion remove
-            - name: override
-              displayName: az network front-door waf-policy managed-rules override
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-                displayName: az network front-door waf-policy managed-rules override
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-                displayName: az network front-door waf-policy managed-rules override add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-                displayName: az network front-door waf-policy managed-rules override list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-                displayName: az network front-door waf-policy managed-rules override remove
-          - name: rule
-            displayName: az network front-door waf-policy rule
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_rule
-              displayName: az network front-door waf-policy rule
-            - name: create
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-              displayName: az network front-door waf-policy rule create
-            - name: delete
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-              displayName: az network front-door waf-policy rule delete
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-              displayName: az network front-door waf-policy rule list
-            - name: show
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-              displayName: az network front-door waf-policy rule show
-            - name: update
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-              displayName: az network front-door waf-policy rule update
-            - name: match-condition
-              displayName: az network front-door waf-policy rule match-condition
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-                displayName: az network front-door waf-policy rule match-condition
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-                displayName: az network front-door waf-policy rule match-condition add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-                displayName: az network front-door waf-policy rule match-condition list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-                displayName: az network front-door waf-policy rule match-condition remove
-  - name: hack
-    items:
-    - name: Overview
-      uid: ext_hack_az
-    - name: hack
-      displayName: az hack
-      items:
-      - name: Overview
-        uid: ext_hack_az_hack
-        displayName: az hack
-      - name: create
-        uid: ext_hack_az_hack_create
-        displayName: az hack create
-      - name: show
-        uid: ext_hack_az_hack_show
-        displayName: az hack show
-  - name: hardware-security-modules
-    items:
-    - name: Overview
-      uid: ext_hardware-security-modules_az
-    - name: dedicated-hsm
-      displayName: az dedicated-hsm
-      items:
-      - name: Overview
-        uid: ext_hardware-security-modules_az_dedicated_hsm
-        displayName: az dedicated-hsm
-      - name: create
-        uid: ext_hardware-security-modules_az_dedicated_hsm_create
-        displayName: az dedicated-hsm create
-      - name: delete
-        uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-        displayName: az dedicated-hsm delete
-      - name: list
-        uid: ext_hardware-security-modules_az_dedicated_hsm_list
-        displayName: az dedicated-hsm list
-      - name: show
-        uid: ext_hardware-security-modules_az_dedicated_hsm_show
-        displayName: az dedicated-hsm show
-      - name: update
-        uid: ext_hardware-security-modules_az_dedicated_hsm_update
-        displayName: az dedicated-hsm update
-      - name: wait
-        uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-        displayName: az dedicated-hsm wait
-  - name: healthcareapis
-    items:
-    - name: Overview
-      uid: ext_healthcareapis_az
-    - name: healthcareapis
-      displayName: az healthcareapis
-      items:
-      - name: Overview
-        uid: ext_healthcareapis_az_healthcareapis
-        displayName: az healthcareapis
-      - name: operation-result
-        displayName: az healthcareapis operation-result
-        items:
-        - name: Overview
-          uid: ext_healthcareapis_az_healthcareapis_operation_result
-          displayName: az healthcareapis operation-result
-        - name: show
-          uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-          displayName: az healthcareapis operation-result show
-      - name: service
-        displayName: az healthcareapis service
-        items:
-        - name: Overview
-          uid: ext_healthcareapis_az_healthcareapis_service
-          displayName: az healthcareapis service
-        - name: create
-          uid: ext_healthcareapis_az_healthcareapis_service_create
-          displayName: az healthcareapis service create
-        - name: delete
-          uid: ext_healthcareapis_az_healthcareapis_service_delete
-          displayName: az healthcareapis service delete
-        - name: list
-          uid: ext_healthcareapis_az_healthcareapis_service_list
-          displayName: az healthcareapis service list
-        - name: show
-          uid: ext_healthcareapis_az_healthcareapis_service_show
-          displayName: az healthcareapis service show
-        - name: update
-          uid: ext_healthcareapis_az_healthcareapis_service_update
-          displayName: az healthcareapis service update
-  - name: hpc-cache
-    items:
-    - name: Overview
-      uid: ext_hpc-cache_az
-    - name: hpc-cache
-      displayName: az hpc-cache
-      items:
-      - name: Overview
-        uid: ext_hpc-cache_az_hpc_cache
-        displayName: az hpc-cache
-      - name: create
-        uid: ext_hpc-cache_az_hpc_cache_create
-        displayName: az hpc-cache create
-      - name: delete
-        uid: ext_hpc-cache_az_hpc_cache_delete
-        displayName: az hpc-cache delete
-      - name: flush
-        uid: ext_hpc-cache_az_hpc_cache_flush
-        displayName: az hpc-cache flush
-      - name: list
-        uid: ext_hpc-cache_az_hpc_cache_list
-        displayName: az hpc-cache list
-      - name: show
-        uid: ext_hpc-cache_az_hpc_cache_show
-        displayName: az hpc-cache show
-      - name: start
-        uid: ext_hpc-cache_az_hpc_cache_start
-        displayName: az hpc-cache start
-      - name: stop
-        uid: ext_hpc-cache_az_hpc_cache_stop
-        displayName: az hpc-cache stop
-      - name: update
-        uid: ext_hpc-cache_az_hpc_cache_update
-        displayName: az hpc-cache update
-      - name: upgrade-firmware
-        uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-        displayName: az hpc-cache upgrade-firmware
-      - name: wait
-        uid: ext_hpc-cache_az_hpc_cache_wait
-        displayName: az hpc-cache wait
-      - name: blob-storage-target
-        displayName: az hpc-cache blob-storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-          displayName: az hpc-cache blob-storage-target
-        - name: add
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-          displayName: az hpc-cache blob-storage-target add
-        - name: update
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-          displayName: az hpc-cache blob-storage-target update
-      - name: nfs-storage-target
-        displayName: az hpc-cache nfs-storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-          displayName: az hpc-cache nfs-storage-target
-        - name: add
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-          displayName: az hpc-cache nfs-storage-target add
-        - name: update
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-          displayName: az hpc-cache nfs-storage-target update
-      - name: skus
-        displayName: az hpc-cache skus
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_skus
-          displayName: az hpc-cache skus
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_skus_list
-          displayName: az hpc-cache skus list
-      - name: storage-target
-        displayName: az hpc-cache storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_storage_target
-          displayName: az hpc-cache storage-target
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-          displayName: az hpc-cache storage-target list
-        - name: remove
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-          displayName: az hpc-cache storage-target remove
-        - name: show
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-          displayName: az hpc-cache storage-target show
-      - name: usage-model
-        displayName: az hpc-cache usage-model
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_usage_model
-          displayName: az hpc-cache usage-model
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-          displayName: az hpc-cache usage-model list
-  - name: image-copy-extension
-    items:
-    - name: Overview
-      uid: ext_image-copy-extension_az
-    - name: VM Images
-      displayName: az image
-      items:
-      - name: Overview
-        uid: ext_image-copy-extension_az_image
-        displayName: az image
-      - name: copy
-        uid: ext_image-copy-extension_az_image_copy
-        displayName: az image copy
-  - name: import-export
-    items:
-    - name: Overview
-      uid: ext_import-export_az
-    - name: import-export
-      displayName: az import-export
-      items:
-      - name: Overview
-        uid: ext_import-export_az_import_export
-        displayName: az import-export
-      - name: create
-        uid: ext_import-export_az_import_export_create
-        displayName: az import-export create
-      - name: delete
-        uid: ext_import-export_az_import_export_delete
-        displayName: az import-export delete
-      - name: list
-        uid: ext_import-export_az_import_export_list
-        displayName: az import-export list
-      - name: show
-        uid: ext_import-export_az_import_export_show
-        displayName: az import-export show
-      - name: update
-        uid: ext_import-export_az_import_export_update
-        displayName: az import-export update
-      - name: bit-locker-key
-        displayName: az import-export bit-locker-key
-        items:
-        - name: Overview
-          uid: ext_import-export_az_import_export_bit_locker_key
-          displayName: az import-export bit-locker-key
-        - name: list
-          uid: ext_import-export_az_import_export_bit_locker_key_list
-          displayName: az import-export bit-locker-key list
-      - name: location
-        displayName: az import-export location
-        items:
-        - name: Overview
-          uid: ext_import-export_az_import_export_location
-          displayName: az import-export location
-        - name: list
-          uid: ext_import-export_az_import_export_location_list
-          displayName: az import-export location list
-        - name: show
-          uid: ext_import-export_az_import_export_location_show
-          displayName: az import-export location show
-  - name: interactive
-    uid: ext_interactive_az
-  - name: internet-analyzer
-    items:
-    - name: Overview
-      uid: ext_internet-analyzer_az
-    - name: internet-analyzer
-      displayName: az internet-analyzer
-      items:
-      - name: Overview
-        uid: ext_internet-analyzer_az_internet_analyzer
-        displayName: az internet-analyzer
-      - name: show-scorecard
-        uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-        displayName: az internet-analyzer show-scorecard
-      - name: show-timeseries
-        uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-        displayName: az internet-analyzer show-timeseries
-      - name: preconfigured-endpoint
-        displayName: az internet-analyzer preconfigured-endpoint
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-          displayName: az internet-analyzer preconfigured-endpoint
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-          displayName: az internet-analyzer preconfigured-endpoint list
-      - name: profile
-        displayName: az internet-analyzer profile
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_profile
-          displayName: az internet-analyzer profile
-        - name: create
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-          displayName: az internet-analyzer profile create
-        - name: delete
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-          displayName: az internet-analyzer profile delete
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-          displayName: az internet-analyzer profile list
-        - name: show
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-          displayName: az internet-analyzer profile show
-        - name: update
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-          displayName: az internet-analyzer profile update
-      - name: test
-        displayName: az internet-analyzer test
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_test
-          displayName: az internet-analyzer test
-        - name: create
-          uid: ext_internet-analyzer_az_internet_analyzer_test_create
-          displayName: az internet-analyzer test create
-        - name: delete
-          uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-          displayName: az internet-analyzer test delete
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_test_list
-          displayName: az internet-analyzer test list
-        - name: show
-          uid: ext_internet-analyzer_az_internet_analyzer_test_show
-          displayName: az internet-analyzer test show
-        - name: update
-          uid: ext_internet-analyzer_az_internet_analyzer_test_update
-          displayName: az internet-analyzer test update
-  - name: ip-group
-    items:
-    - name: Overview
-      uid: ext_ip-group_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_ip-group_az_network
-        displayName: az network
-      - name: ip-group
-        displayName: az network ip-group
-        items:
-        - name: Overview
-          uid: ext_ip-group_az_network_ip_group
-          displayName: az network ip-group
-        - name: create
-          uid: ext_ip-group_az_network_ip_group_create
-          displayName: az network ip-group create
-        - name: delete
-          uid: ext_ip-group_az_network_ip_group_delete
-          displayName: az network ip-group delete
-        - name: list
-          uid: ext_ip-group_az_network_ip_group_list
-          displayName: az network ip-group list
-        - name: show
-          uid: ext_ip-group_az_network_ip_group_show
-          displayName: az network ip-group show
-        - name: update
-          uid: ext_ip-group_az_network_ip_group_update
-          displayName: az network ip-group update
-  - name: k8sconfiguration
-    items:
-    - name: Overview
-      uid: ext_k8sconfiguration_az
-    - name: k8sconfiguration
-      displayName: az k8sconfiguration
-      items:
-      - name: Overview
-        uid: ext_k8sconfiguration_az_k8sconfiguration
-        displayName: az k8sconfiguration
-      - name: create
-        uid: ext_k8sconfiguration_az_k8sconfiguration_create
-        displayName: az k8sconfiguration create
-      - name: delete
-        uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-        displayName: az k8sconfiguration delete
-      - name: list
-        uid: ext_k8sconfiguration_az_k8sconfiguration_list
-        displayName: az k8sconfiguration list
-      - name: show
-        uid: ext_k8sconfiguration_az_k8sconfiguration_show
-        displayName: az k8sconfiguration show
-      - name: update
-        uid: ext_k8sconfiguration_az_k8sconfiguration_update
-        displayName: az k8sconfiguration update
-  - name: keyvault-preview
-    items:
-    - name: Overview
-      uid: ext_keyvault-preview_az
-    - name: Key Vault
-      displayName: az keyvault
-      items:
-      - name: Overview
-        uid: ext_keyvault-preview_az_keyvault
-        displayName: az keyvault
-      - name: create
-        uid: ext_keyvault-preview_az_keyvault_create
-        displayName: az keyvault create
-      - name: delete
-        uid: ext_keyvault-preview_az_keyvault_delete
-        displayName: az keyvault delete
-      - name: delete-policy
-        uid: ext_keyvault-preview_az_keyvault_delete_policy
-        displayName: az keyvault delete-policy
-      - name: list
-        uid: ext_keyvault-preview_az_keyvault_list
-        displayName: az keyvault list
-      - name: list-deleted
-        uid: ext_keyvault-preview_az_keyvault_list_deleted
-        displayName: az keyvault list-deleted
-      - name: purge
-        uid: ext_keyvault-preview_az_keyvault_purge
-        displayName: az keyvault purge
-      - name: recover
-        uid: ext_keyvault-preview_az_keyvault_recover
-        displayName: az keyvault recover
-      - name: set-policy
-        uid: ext_keyvault-preview_az_keyvault_set_policy
-        displayName: az keyvault set-policy
-      - name: show
-        uid: ext_keyvault-preview_az_keyvault_show
-        displayName: az keyvault show
-      - name: update
-        uid: ext_keyvault-preview_az_keyvault_update
-        displayName: az keyvault update
-      - name: Certificates
-        displayName: az keyvault certificate
+          - name: Summary
+            uid: az_network_dns_record-set
+            displayName: az network dns record-set
+          - name: a
+            uid: az_network_dns_record-set_a
+            displayName: az network dns record-set a
+            items: []
+          - name: aaaa
+            uid: az_network_dns_record-set_aaaa
+            displayName: az network dns record-set aaaa
+            items: []
+          - name: cname
+            uid: az_network_dns_record-set_cname
+            displayName: az network dns record-set cname
+            items: []
+          - name: mx
+            uid: az_network_dns_record-set_mx
+            displayName: az network dns record-set mx
+            items: []
+          - name: ns
+            uid: az_network_dns_record-set_ns
+            displayName: az network dns record-set ns
+            items: []
+          - name: network dns record-set ptr - pointer
+            uid: az_network_dns_record-set_ptr
+            displayName: az network dns record-set ptr
+            items: []
+          - name: soa
+            uid: az_network_dns_record-set_soa
+            displayName: az network dns record-set soa
+            items: []
+          - name: srv
+            uid: az_network_dns_record-set_srv
+            displayName: az network dns record-set srv
+            items: []
+          - name: txt
+            uid: az_network_dns_record-set_txt
+            displayName: az network dns record-set txt
+            items: []
+        - name: zone
+          uid: az_network_dns_zone
+          displayName: az network dns zone
+          items: []
+      - name: express-route
         items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_certificate
-          displayName: az keyvault certificate
-        - name: create
-          uid: ext_keyvault-preview_az_keyvault_certificate_create
-          displayName: az keyvault certificate create
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_certificate_delete
-          displayName: az keyvault certificate delete
-        - name: download
-          uid: ext_keyvault-preview_az_keyvault_certificate_download
-          displayName: az keyvault certificate download
-        - name: get-default-policy
-          uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-          displayName: az keyvault certificate get-default-policy
-        - name: import
-          uid: ext_keyvault-preview_az_keyvault_certificate_import
-          displayName: az keyvault certificate import
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_certificate_list
-          displayName: az keyvault certificate list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-          displayName: az keyvault certificate list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-          displayName: az keyvault certificate list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_certificate_purge
-          displayName: az keyvault certificate purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_certificate_recover
-          displayName: az keyvault certificate recover
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-          displayName: az keyvault certificate set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_certificate_show
-          displayName: az keyvault certificate show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-          displayName: az keyvault certificate show-deleted
-        - name: Contacts
-          displayName: az keyvault certificate contact
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact
-            displayName: az keyvault certificate contact
-          - name: add
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-            displayName: az keyvault certificate contact add
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-            displayName: az keyvault certificate contact delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-            displayName: az keyvault certificate contact list
-        - name: Issuers
-          displayName: az keyvault certificate issuer
+        - name: Summary
+          uid: az_network_express-route
+          displayName: az network express-route
+        - name: auth
+          uid: az_network_express-route_auth
+          displayName: az network express-route auth
+          items: []
+        - name: gateway
           items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-            displayName: az keyvault certificate issuer
-          - name: create
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-            displayName: az keyvault certificate issuer create
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-            displayName: az keyvault certificate issuer delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-            displayName: az keyvault certificate issuer list
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-            displayName: az keyvault certificate issuer show
-          - name: update
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-            displayName: az keyvault certificate issuer update
-          - name: Administration
-            displayName: az keyvault certificate issuer admin
-            items:
-            - name: Overview
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-              displayName: az keyvault certificate issuer admin
-            - name: add
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-              displayName: az keyvault certificate issuer admin add
-            - name: delete
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-              displayName: az keyvault certificate issuer admin delete
-            - name: list
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-              displayName: az keyvault certificate issuer admin list
-        - name: Pending
-          displayName: az keyvault certificate pending
+          - name: Summary
+            uid: az_network_express-route_gateway
+            displayName: az network express-route gateway
+          - name: connection
+            uid: az_network_express-route_gateway_connection
+            displayName: az network express-route gateway connection
+            items: []
+        - name: peering
           items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending
-            displayName: az keyvault certificate pending
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-            displayName: az keyvault certificate pending delete
-          - name: merge
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-            displayName: az keyvault certificate pending merge
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-            displayName: az keyvault certificate pending show
-      - name: Keys
-        displayName: az keyvault key
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_key
-          displayName: az keyvault key
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_key_backup
-          displayName: az keyvault key backup
-        - name: create
-          uid: ext_keyvault-preview_az_keyvault_key_create
-          displayName: az keyvault key create
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_key_delete
-          displayName: az keyvault key delete
-        - name: import
-          uid: ext_keyvault-preview_az_keyvault_key_import
-          displayName: az keyvault key import
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_key_list
-          displayName: az keyvault key list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-          displayName: az keyvault key list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_key_list_versions
-          displayName: az keyvault key list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_key_purge
-          displayName: az keyvault key purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_key_recover
-          displayName: az keyvault key recover
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_key_restore
-          displayName: az keyvault key restore
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-          displayName: az keyvault key set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_key_show
-          displayName: az keyvault key show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-          displayName: az keyvault key show-deleted
-      - name: Secrets
-        displayName: az keyvault secret
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_secret
-          displayName: az keyvault secret
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_secret_backup
-          displayName: az keyvault secret backup
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_secret_delete
-          displayName: az keyvault secret delete
-        - name: download
-          uid: ext_keyvault-preview_az_keyvault_secret_download
-          displayName: az keyvault secret download
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_secret_list
-          displayName: az keyvault secret list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-          displayName: az keyvault secret list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-          displayName: az keyvault secret list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_secret_purge
-          displayName: az keyvault secret purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_secret_recover
-          displayName: az keyvault secret recover
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_secret_restore
-          displayName: az keyvault secret restore
-        - name: set
-          uid: ext_keyvault-preview_az_keyvault_secret_set
-          displayName: az keyvault secret set
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-          displayName: az keyvault secret set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_secret_show
-          displayName: az keyvault secret show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-          displayName: az keyvault secret show-deleted
-      - name: network-rule
-        displayName: az keyvault network-rule
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_network_rule
-          displayName: az keyvault network-rule
-        - name: add
-          uid: ext_keyvault-preview_az_keyvault_network_rule_add
-          displayName: az keyvault network-rule add
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_network_rule_list
-          displayName: az keyvault network-rule list
-        - name: remove
-          uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-          displayName: az keyvault network-rule remove
-      - name: storage
-        displayName: az keyvault storage
+          - name: Summary
+            uid: az_network_express-route_peering
+            displayName: az network express-route peering
+          - name: connection
+            uid: az_network_express-route_peering_connection
+            displayName: az network express-route peering connection
+            items: []
+        - name: port
+          uid: az_network_express-route_port
+          displayName: az network express-route port
+          items: []
+      - name: firewall
         items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_storage
-          displayName: az keyvault storage
-        - name: add
-          uid: ext_keyvault-preview_az_keyvault_storage_add
-          displayName: az keyvault storage add
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_storage_backup
-          displayName: az keyvault storage backup
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_storage_list
-          displayName: az keyvault storage list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-          displayName: az keyvault storage list-deleted
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_storage_purge
-          displayName: az keyvault storage purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_storage_recover
-          displayName: az keyvault storage recover
-        - name: regenerate-key
-          uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-          displayName: az keyvault storage regenerate-key
-        - name: remove
-          uid: ext_keyvault-preview_az_keyvault_storage_remove
-          displayName: az keyvault storage remove
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_storage_restore
-          displayName: az keyvault storage restore
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_storage_show
-          displayName: az keyvault storage show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-          displayName: az keyvault storage show-deleted
-        - name: update
-          uid: ext_keyvault-preview_az_keyvault_storage_update
-          displayName: az keyvault storage update
-        - name: sas-definition
-          displayName: az keyvault storage sas-definition
+        - name: Summary
+          uid: az_network_firewall
+          displayName: az network firewall
+        - name: application-rule
           items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-            displayName: az keyvault storage sas-definition
-          - name: create
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-            displayName: az keyvault storage sas-definition create
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-            displayName: az keyvault storage sas-definition delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-            displayName: az keyvault storage sas-definition list
-          - name: list-deleted
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-            displayName: az keyvault storage sas-definition list-deleted
-          - name: recover
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-            displayName: az keyvault storage sas-definition recover
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-            displayName: az keyvault storage sas-definition show
-          - name: show-deleted
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-            displayName: az keyvault storage sas-definition show-deleted
-          - name: update
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-            displayName: az keyvault storage sas-definition update
-  - name: kusto
-    items:
-    - name: Overview
-      uid: ext_kusto_az
-    - name: kusto
-      displayName: az kusto
-      items:
-      - name: Overview
-        uid: ext_kusto_az_kusto
-        displayName: az kusto
-      - name: attached-database-configuration
-        displayName: az kusto attached-database-configuration
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_attached_database_configuration
-          displayName: az kusto attached-database-configuration
-        - name: create
-          uid: ext_kusto_az_kusto_attached_database_configuration_create
-          displayName: az kusto attached-database-configuration create
-        - name: delete
-          uid: ext_kusto_az_kusto_attached_database_configuration_delete
-          displayName: az kusto attached-database-configuration delete
-        - name: list
-          uid: ext_kusto_az_kusto_attached_database_configuration_list
-          displayName: az kusto attached-database-configuration list
-        - name: show
-          uid: ext_kusto_az_kusto_attached_database_configuration_show
-          displayName: az kusto attached-database-configuration show
-        - name: update
-          uid: ext_kusto_az_kusto_attached_database_configuration_update
-          displayName: az kusto attached-database-configuration update
-        - name: wait
-          uid: ext_kusto_az_kusto_attached_database_configuration_wait
-          displayName: az kusto attached-database-configuration wait
-      - name: cluster
-        displayName: az kusto cluster
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_cluster
-          displayName: az kusto cluster
-        - name: add-language-extension
-          uid: ext_kusto_az_kusto_cluster_add_language_extension
-          displayName: az kusto cluster add-language-extension
-        - name: create
-          uid: ext_kusto_az_kusto_cluster_create
-          displayName: az kusto cluster create
-        - name: delete
-          uid: ext_kusto_az_kusto_cluster_delete
-          displayName: az kusto cluster delete
-        - name: detach-follower-database
-          uid: ext_kusto_az_kusto_cluster_detach_follower_database
-          displayName: az kusto cluster detach-follower-database
-        - name: diagnose-virtual-network
-          uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-          displayName: az kusto cluster diagnose-virtual-network
-        - name: list
-          uid: ext_kusto_az_kusto_cluster_list
-          displayName: az kusto cluster list
-        - name: list-follower-database
-          uid: ext_kusto_az_kusto_cluster_list_follower_database
-          displayName: az kusto cluster list-follower-database
-        - name: list-language-extension
-          uid: ext_kusto_az_kusto_cluster_list_language_extension
-          displayName: az kusto cluster list-language-extension
-        - name: list-sku
-          uid: ext_kusto_az_kusto_cluster_list_sku
-          displayName: az kusto cluster list-sku
-        - name: remove-language-extension
-          uid: ext_kusto_az_kusto_cluster_remove_language_extension
-          displayName: az kusto cluster remove-language-extension
-        - name: show
-          uid: ext_kusto_az_kusto_cluster_show
-          displayName: az kusto cluster show
-        - name: start
-          uid: ext_kusto_az_kusto_cluster_start
-          displayName: az kusto cluster start
-        - name: stop
-          uid: ext_kusto_az_kusto_cluster_stop
-          displayName: az kusto cluster stop
-        - name: update
-          uid: ext_kusto_az_kusto_cluster_update
-          displayName: az kusto cluster update
-        - name: wait
-          uid: ext_kusto_az_kusto_cluster_wait
-          displayName: az kusto cluster wait
-      - name: cluster-principal-assignment
-        displayName: az kusto cluster-principal-assignment
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_cluster_principal_assignment
-          displayName: az kusto cluster-principal-assignment
-        - name: create
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-          displayName: az kusto cluster-principal-assignment create
-        - name: delete
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-          displayName: az kusto cluster-principal-assignment delete
-        - name: list
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-          displayName: az kusto cluster-principal-assignment list
-        - name: show
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-          displayName: az kusto cluster-principal-assignment show
-        - name: update
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-          displayName: az kusto cluster-principal-assignment update
-        - name: wait
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-          displayName: az kusto cluster-principal-assignment wait
-      - name: data-connection
-        displayName: az kusto data-connection
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_data_connection
-          displayName: az kusto data-connection
-        - name: delete
-          uid: ext_kusto_az_kusto_data_connection_delete
-          displayName: az kusto data-connection delete
-        - name: list
-          uid: ext_kusto_az_kusto_data_connection_list
-          displayName: az kusto data-connection list
-        - name: show
-          uid: ext_kusto_az_kusto_data_connection_show
-          displayName: az kusto data-connection show
-        - name: wait
-          uid: ext_kusto_az_kusto_data_connection_wait
-          displayName: az kusto data-connection wait
-        - name: event-grid
-          displayName: az kusto data-connection event-grid
+          - name: Summary
+            uid: az_network_firewall_application-rule
+            displayName: az network firewall application-rule
+          - name: collection
+            uid: az_network_firewall_application-rule_collection
+            displayName: az network firewall application-rule collection
+            items: []
+        - name: ip-config
+          uid: az_network_firewall_ip-config
+          displayName: az network firewall ip-config
+          items: []
+        - name: management-ip-config
+          uid: az_network_firewall_management-ip-config
+          displayName: az network firewall management-ip-config
+          items: []
+        - name: nat-rule
           items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_event_grid
-            displayName: az kusto data-connection event-grid
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_event_grid_create
-            displayName: az kusto data-connection event-grid create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-            displayName: az kusto data-connection event-grid data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_event_grid_update
-            displayName: az kusto data-connection event-grid update
-        - name: event-hub
-          displayName: az kusto data-connection event-hub
+          - name: Summary
+            uid: az_network_firewall_nat-rule
+            displayName: az network firewall nat-rule
+          - name: collection
+            uid: az_network_firewall_nat-rule_collection
+            displayName: az network firewall nat-rule collection
+            items: []
+        - name: network-rule
           items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_event_hub
-            displayName: az kusto data-connection event-hub
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_event_hub_create
-            displayName: az kusto data-connection event-hub create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-            displayName: az kusto data-connection event-hub data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_event_hub_update
-            displayName: az kusto data-connection event-hub update
-        - name: iot-hub
-          displayName: az kusto data-connection iot-hub
+          - name: Summary
+            uid: az_network_firewall_network-rule
+            displayName: az network firewall network-rule
+          - name: collection
+            uid: az_network_firewall_network-rule_collection
+            displayName: az network firewall network-rule collection
+            items: []
+        - name: policy
           items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_iot_hub
-            displayName: az kusto data-connection iot-hub
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-            displayName: az kusto data-connection iot-hub create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-            displayName: az kusto data-connection iot-hub data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-            displayName: az kusto data-connection iot-hub update
-      - name: database
-        displayName: az kusto database
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_database
-          displayName: az kusto database
-        - name: add-principal
-          uid: ext_kusto_az_kusto_database_add_principal
-          displayName: az kusto database add-principal
-        - name: create
-          uid: ext_kusto_az_kusto_database_create
-          displayName: az kusto database create
-        - name: delete
-          uid: ext_kusto_az_kusto_database_delete
-          displayName: az kusto database delete
-        - name: list
-          uid: ext_kusto_az_kusto_database_list
-          displayName: az kusto database list
-        - name: list-principal
-          uid: ext_kusto_az_kusto_database_list_principal
-          displayName: az kusto database list-principal
-        - name: remove-principal
-          uid: ext_kusto_az_kusto_database_remove_principal
-          displayName: az kusto database remove-principal
-        - name: show
-          uid: ext_kusto_az_kusto_database_show
-          displayName: az kusto database show
-        - name: update
-          uid: ext_kusto_az_kusto_database_update
-          displayName: az kusto database update
-        - name: wait
-          uid: ext_kusto_az_kusto_database_wait
-          displayName: az kusto database wait
-      - name: database-principal-assignment
-        displayName: az kusto database-principal-assignment
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_database_principal_assignment
-          displayName: az kusto database-principal-assignment
-        - name: create
-          uid: ext_kusto_az_kusto_database_principal_assignment_create
-          displayName: az kusto database-principal-assignment create
-        - name: delete
-          uid: ext_kusto_az_kusto_database_principal_assignment_delete
-          displayName: az kusto database-principal-assignment delete
-        - name: list
-          uid: ext_kusto_az_kusto_database_principal_assignment_list
-          displayName: az kusto database-principal-assignment list
-        - name: show
-          uid: ext_kusto_az_kusto_database_principal_assignment_show
-          displayName: az kusto database-principal-assignment show
-        - name: update
-          uid: ext_kusto_az_kusto_database_principal_assignment_update
-          displayName: az kusto database-principal-assignment update
-        - name: wait
-          uid: ext_kusto_az_kusto_database_principal_assignment_wait
-          displayName: az kusto database-principal-assignment wait
-  - name: log-analytics
-    items:
-    - name: Overview
-      uid: ext_log-analytics_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_log-analytics_az_monitor
-        displayName: az monitor
-      - name: log-analytics
-        displayName: az monitor log-analytics
-        items:
-        - name: Overview
-          uid: ext_log-analytics_az_monitor_log_analytics
-          displayName: az monitor log-analytics
-        - name: query
-          uid: ext_log-analytics_az_monitor_log_analytics_query
-          displayName: az monitor log-analytics query
-  - name: log-analytics-solution
-    items:
-    - name: Overview
-      uid: ext_log-analytics-solution_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_log-analytics-solution_az_monitor
-        displayName: az monitor
-      - name: log-analytics
-        displayName: az monitor log-analytics
+          - name: Summary
+            uid: az_network_firewall_policy
+            displayName: az network firewall policy
+          - name: intrusion-detection
+            uid: az_network_firewall_policy_intrusion-detection
+            displayName: az network firewall policy intrusion-detection
+            items: []
+          - name: rule-collection-group
+            items:
+            - name: Summary
+              uid: az_network_firewall_policy_rule-collection-group
+              displayName: az network firewall policy rule-collection-group
+            - name: collection
+              items:
+              - name: Summary
+                uid: az_network_firewall_policy_rule-collection-group_collection
+                displayName: az network firewall policy rule-collection-group collection
+              - name: rule
+                uid: az_network_firewall_policy_rule-collection-group_collection_rule
+                displayName: az network firewall policy rule-collection-group collection rule
+                items: []
+        - name: threat-intel-allowlist
+          uid: az_network_firewall_threat-intel-allowlist
+          displayName: az network firewall threat-intel-allowlist
+          items: []
+      - name: front-door
         items:
-        - name: Overview
-          uid: ext_log-analytics-solution_az_monitor_log_analytics
-          displayName: az monitor log-analytics
-        - name: solution
-          displayName: az monitor log-analytics solution
+        - name: Summary
+          uid: az_network_front-door
+          displayName: az network front-door
+        - name: backend-pool
           items:
-          - name: Overview
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-            displayName: az monitor log-analytics solution
-          - name: create
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-            displayName: az monitor log-analytics solution create
-          - name: delete
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-            displayName: az monitor log-analytics solution delete
-          - name: list
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-            displayName: az monitor log-analytics solution list
-          - name: show
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-            displayName: az monitor log-analytics solution show
-          - name: update
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-            displayName: az monitor log-analytics solution update
-  - name: logic
-    items:
-    - name: Overview
-      uid: ext_logic_az
-    - name: logic
-      displayName: az logic
-      items:
-      - name: Overview
-        uid: ext_logic_az_logic
-        displayName: az logic
-      - name: integration-account
-        displayName: az logic integration-account
-        items:
-        - name: Overview
-          uid: ext_logic_az_logic_integration_account
-          displayName: az logic integration-account
-        - name: create
-          uid: ext_logic_az_logic_integration_account_create
-          displayName: az logic integration-account create
-        - name: delete
-          uid: ext_logic_az_logic_integration_account_delete
-          displayName: az logic integration-account delete
-        - name: import
-          uid: ext_logic_az_logic_integration_account_import
-          displayName: az logic integration-account import
-        - name: list
-          uid: ext_logic_az_logic_integration_account_list
-          displayName: az logic integration-account list
-        - name: show
-          uid: ext_logic_az_logic_integration_account_show
-          displayName: az logic integration-account show
-        - name: update
-          uid: ext_logic_az_logic_integration_account_update
-          displayName: az logic integration-account update
-      - name: workflow
-        displayName: az logic workflow
-        items:
-        - name: Overview
-          uid: ext_logic_az_logic_workflow
-          displayName: az logic workflow
-        - name: create
-          uid: ext_logic_az_logic_workflow_create
-          displayName: az logic workflow create
-        - name: delete
-          uid: ext_logic_az_logic_workflow_delete
-          displayName: az logic workflow delete
-        - name: list
-          uid: ext_logic_az_logic_workflow_list
-          displayName: az logic workflow list
-        - name: show
-          uid: ext_logic_az_logic_workflow_show
-          displayName: az logic workflow show
-        - name: update
-          uid: ext_logic_az_logic_workflow_update
-          displayName: az logic workflow update
-  - name: maintenance
-    items:
-    - name: Overview
-      uid: ext_maintenance_az
-    - name: maintenance
-      displayName: az maintenance
-      items:
-      - name: Overview
-        uid: ext_maintenance_az_maintenance
-        displayName: az maintenance
-      - name: applyupdate
-        displayName: az maintenance applyupdate
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_applyupdate
-          displayName: az maintenance applyupdate
-        - name: create
-          uid: ext_maintenance_az_maintenance_applyupdate_create
-          displayName: az maintenance applyupdate create
-        - name: get
-          uid: ext_maintenance_az_maintenance_applyupdate_get
-          displayName: az maintenance applyupdate get
-        - name: show
-          uid: ext_maintenance_az_maintenance_applyupdate_show
-          displayName: az maintenance applyupdate show
-      - name: assignment
-        displayName: az maintenance assignment
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_assignment
-          displayName: az maintenance assignment
-        - name: create
-          uid: ext_maintenance_az_maintenance_assignment_create
-          displayName: az maintenance assignment create
-        - name: delete
-          uid: ext_maintenance_az_maintenance_assignment_delete
-          displayName: az maintenance assignment delete
-        - name: list
-          uid: ext_maintenance_az_maintenance_assignment_list
-          displayName: az maintenance assignment list
-      - name: configuration
-        displayName: az maintenance configuration
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_configuration
-          displayName: az maintenance configuration
-        - name: create
-          uid: ext_maintenance_az_maintenance_configuration_create
-          displayName: az maintenance configuration create
-        - name: delete
-          uid: ext_maintenance_az_maintenance_configuration_delete
-          displayName: az maintenance configuration delete
-        - name: list
-          uid: ext_maintenance_az_maintenance_configuration_list
-          displayName: az maintenance configuration list
-        - name: show
-          uid: ext_maintenance_az_maintenance_configuration_show
-          displayName: az maintenance configuration show
-        - name: update
-          uid: ext_maintenance_az_maintenance_configuration_update
-          displayName: az maintenance configuration update
-      - name: update
-        displayName: az maintenance update
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_update
-          displayName: az maintenance update
-        - name: list
-          uid: ext_maintenance_az_maintenance_update_list
-          displayName: az maintenance update list
-  - name: managementpartner
-    items:
-    - name: Overview
-      uid: ext_managementpartner_az
-    - name: managementpartner
-      displayName: az managementpartner
-      items:
-      - name: Overview
-        uid: ext_managementpartner_az_managementpartner
-        displayName: az managementpartner
-      - name: create
-        uid: ext_managementpartner_az_managementpartner_create
-        displayName: az managementpartner create
-      - name: delete
-        uid: ext_managementpartner_az_managementpartner_delete
-        displayName: az managementpartner delete
-      - name: show
-        uid: ext_managementpartner_az_managementpartner_show
-        displayName: az managementpartner show
-      - name: update
-        uid: ext_managementpartner_az_managementpartner_update
-        displayName: az managementpartner update
-  - name: mesh
-    items:
-    - name: Overview
-      uid: ext_mesh_az
-    - name: mesh
-      displayName: az mesh
-      items:
-      - name: Overview
-        uid: ext_mesh_az_mesh
-        displayName: az mesh
-      - name: app
-        displayName: az mesh app
-        items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_app
-          displayName: az mesh app
-        - name: delete
-          uid: ext_mesh_az_mesh_app_delete
-          displayName: az mesh app delete
-        - name: list
-          uid: ext_mesh_az_mesh_app_list
-          displayName: az mesh app list
-        - name: show
-          uid: ext_mesh_az_mesh_app_show
-          displayName: az mesh app show
-      - name: code-package-log
-        displayName: az mesh code-package-log
+          - name: Summary
+            uid: az_network_front-door_backend-pool
+            displayName: az network front-door backend-pool
+          - name: backend
+            uid: az_network_front-door_backend-pool_backend
+            displayName: az network front-door backend-pool backend
+            items: []
+        - name: frontend-endpoint
+          uid: az_network_front-door_frontend-endpoint
+          displayName: az network front-door frontend-endpoint
+          items: []
+        - name: load-balancing
+          uid: az_network_front-door_load-balancing
+          displayName: az network front-door load-balancing
+          items: []
+        - name: probe
+          uid: az_network_front-door_probe
+          displayName: az network front-door probe
+          items: []
+        - name: routing-rule
+          uid: az_network_front-door_routing-rule
+          displayName: az network front-door routing-rule
+          items: []
+        - name: rules-engine
+          items:
+          - name: Summary
+            uid: az_network_front-door_rules-engine
+            displayName: az network front-door rules-engine
+          - name: rule
+            items:
+            - name: Summary
+              uid: az_network_front-door_rules-engine_rule
+              displayName: az network front-door rules-engine rule
+            - name: action
+              uid: az_network_front-door_rules-engine_rule_action
+              displayName: az network front-door rules-engine rule action
+              items: []
+            - name: condition
+              uid: az_network_front-door_rules-engine_rule_condition
+              displayName: az network front-door rules-engine rule condition
+              items: []
+        - name: waf-policy
+          items:
+          - name: Summary
+            uid: az_network_front-door_waf-policy
+            displayName: az network front-door waf-policy
+          - name: managed-rule-definition
+            uid: az_network_front-door_waf-policy_managed-rule-definition
+            displayName: az network front-door waf-policy managed-rule-definition
+            items: []
+          - name: managed-rules
+            items:
+            - name: Summary
+              uid: az_network_front-door_waf-policy_managed-rules
+              displayName: az network front-door waf-policy managed-rules
+            - name: exclusion
+              uid: az_network_front-door_waf-policy_managed-rules_exclusion
+              displayName: az network front-door waf-policy managed-rules exclusion
+              items: []
+            - name: override
+              uid: az_network_front-door_waf-policy_managed-rules_override
+              displayName: az network front-door waf-policy managed-rules override
+              items: []
+          - name: rule
+            items:
+            - name: Summary
+              uid: az_network_front-door_waf-policy_rule
+              displayName: az network front-door waf-policy rule
+            - name: match-condition
+              uid: az_network_front-door_waf-policy_rule_match-condition
+              displayName: az network front-door waf-policy rule match-condition
+              items: []
+      - name: ip-group
+        uid: az_network_ip-group
+        displayName: az network ip-group
+        items: []
+      - name: lb
+        items:
+        - name: Summary
+          uid: az_network_lb
+          displayName: az network lb
+        - name: address-pool
+          items:
+          - name: Summary
+            uid: az_network_lb_address-pool
+            displayName: az network lb address-pool
+          - name: address
+            uid: az_network_lb_address-pool_address
+            displayName: az network lb address-pool address
+            items: []
+        - name: frontend-ip
+          uid: az_network_lb_frontend-ip
+          displayName: az network lb frontend-ip
+          items: []
+        - name: inbound-nat-pool
+          uid: az_network_lb_inbound-nat-pool
+          displayName: az network lb inbound-nat-pool
+          items: []
+        - name: inbound-nat-rule
+          uid: az_network_lb_inbound-nat-rule
+          displayName: az network lb inbound-nat-rule
+          items: []
+        - name: probe
+          uid: az_network_lb_probe
+          displayName: az network lb probe
+          items: []
+        - name: rule
+          uid: az_network_lb_rule
+          displayName: az network lb rule
+          items: []
+      - name: local-gateway
+        uid: az_network_local-gateway
+        displayName: az network local-gateway
+        items: []
+      - name: nic
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_code_package_log
-          displayName: az mesh code-package-log
-        - name: get
-          uid: ext_mesh_az_mesh_code_package_log_get
-          displayName: az mesh code-package-log get
-      - name: deployment
-        displayName: az mesh deployment
+        - name: Summary
+          uid: az_network_nic
+          displayName: az network nic
+        - name: ip-config
+          items:
+          - name: Summary
+            uid: az_network_nic_ip-config
+            displayName: az network nic ip-config
+          - name: address-pool
+            uid: az_network_nic_ip-config_address-pool
+            displayName: az network nic ip-config address-pool
+            items: []
+          - name: inbound-nat-rule
+            uid: az_network_nic_ip-config_inbound-nat-rule
+            displayName: az network nic ip-config inbound-nat-rule
+            items: []
+        - name: vtap-config
+          uid: az_network_nic_vtap-config
+          displayName: az network nic vtap-config
+          items: []
+      - name: nsg
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_deployment
-          displayName: az mesh deployment
-        - name: create
-          uid: ext_mesh_az_mesh_deployment_create
-          displayName: az mesh deployment create
-      - name: gateway
-        displayName: az mesh gateway
+        - name: Summary
+          uid: az_network_nsg
+          displayName: az network nsg
+        - name: rule
+          uid: az_network_nsg_rule
+          displayName: az network nsg rule
+          items: []
+      - name: p2s-vpn-gateway
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_gateway
-          displayName: az mesh gateway
-        - name: delete
-          uid: ext_mesh_az_mesh_gateway_delete
-          displayName: az mesh gateway delete
-        - name: list
-          uid: ext_mesh_az_mesh_gateway_list
-          displayName: az mesh gateway list
-        - name: show
-          uid: ext_mesh_az_mesh_gateway_show
-          displayName: az mesh gateway show
-      - name: generate
-        displayName: az mesh generate
+        - name: Summary
+          uid: az_network_p2s-vpn-gateway
+          displayName: az network p2s-vpn-gateway
+        - name: connection
+          uid: az_network_p2s-vpn-gateway_connection
+          displayName: az network p2s-vpn-gateway connection
+          items: []
+        - name: vpn-client
+          uid: az_network_p2s-vpn-gateway_vpn-client
+          displayName: az network p2s-vpn-gateway vpn-client
+          items: []
+      - name: private-dns
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_generate
-          displayName: az mesh generate
-        - name: armtemplate
-          uid: ext_mesh_az_mesh_generate_armtemplate
-          displayName: az mesh generate armtemplate
-      - name: network
-        displayName: az mesh network
+        - name: Summary
+          uid: az_network_private-dns
+          displayName: az network private-dns
+        - name: link
+          items:
+          - name: Summary
+            uid: az_network_private-dns_link
+            displayName: az network private-dns link
+          - name: vnet
+            uid: az_network_private-dns_link_vnet
+            displayName: az network private-dns link vnet
+            items: []
+        - name: record-set
+          items:
+          - name: Summary
+            uid: az_network_private-dns_record-set
+            displayName: az network private-dns record-set
+          - name: a
+            uid: az_network_private-dns_record-set_a
+            displayName: az network private-dns record-set a
+            items: []
+          - name: aaaa
+            uid: az_network_private-dns_record-set_aaaa
+            displayName: az network private-dns record-set aaaa
+            items: []
+          - name: cname
+            uid: az_network_private-dns_record-set_cname
+            displayName: az network private-dns record-set cname
+            items: []
+          - name: mx
+            uid: az_network_private-dns_record-set_mx
+            displayName: az network private-dns record-set mx
+            items: []
+          - name: ptr
+            uid: az_network_private-dns_record-set_ptr
+            displayName: az network private-dns record-set ptr
+            items: []
+          - name: soa
+            uid: az_network_private-dns_record-set_soa
+            displayName: az network private-dns record-set soa
+            items: []
+          - name: srv
+            uid: az_network_private-dns_record-set_srv
+            displayName: az network private-dns record-set srv
+            items: []
+          - name: txt
+            uid: az_network_private-dns_record-set_txt
+            displayName: az network private-dns record-set txt
+            items: []
+        - name: zone
+          uid: az_network_private-dns_zone
+          displayName: az network private-dns zone
+          items: []
+      - name: private-endpoint
+        uid: az_network_private-endpoint
+        displayName: az network private-endpoint
+        items: []
+      - name: private-endpoint-connection
+        uid: az_network_private-endpoint-connection
+        displayName: az network private-endpoint-connection
+        items: []
+      - name: private-link-resource
+        uid: az_network_private-link-resource
+        displayName: az network private-link-resource
+        items: []
+      - name: private-link-service
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_network
-          displayName: az mesh network
-        - name: delete
-          uid: ext_mesh_az_mesh_network_delete
-          displayName: az mesh network delete
-        - name: list
-          uid: ext_mesh_az_mesh_network_list
-          displayName: az mesh network list
-        - name: show
-          uid: ext_mesh_az_mesh_network_show
-          displayName: az mesh network show
-      - name: secret
-        displayName: az mesh secret
+        - name: Summary
+          uid: az_network_private-link-service
+          displayName: az network private-link-service
+        - name: connection
+          uid: az_network_private-link-service_connection
+          displayName: az network private-link-service connection
+          items: []
+      - name: profile
+        uid: az_network_profile
+        displayName: az network profile
+        items: []
+      - name: public-ip
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_secret
-          displayName: az mesh secret
-        - name: delete
-          uid: ext_mesh_az_mesh_secret_delete
-          displayName: az mesh secret delete
-        - name: list
-          uid: ext_mesh_az_mesh_secret_list
-          displayName: az mesh secret list
-        - name: show
-          uid: ext_mesh_az_mesh_secret_show
-          displayName: az mesh secret show
-      - name: secretvalue
-        displayName: az mesh secretvalue
+        - name: Summary
+          uid: az_network_public-ip
+          displayName: az network public-ip
+        - name: prefix
+          uid: az_network_public-ip_prefix
+          displayName: az network public-ip prefix
+          items: []
+      - name: route-filter
+        items:
+        - name: Summary
+          uid: az_network_route-filter
+          displayName: az network route-filter
+        - name: rule
+          uid: az_network_route-filter_rule
+          displayName: az network route-filter rule
+          items: []
+      - name: route-table
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_secretvalue
-          displayName: az mesh secretvalue
-        - name: delete
-          uid: ext_mesh_az_mesh_secretvalue_delete
-          displayName: az mesh secretvalue delete
-        - name: list
-          uid: ext_mesh_az_mesh_secretvalue_list
-          displayName: az mesh secretvalue list
-        - name: show
-          uid: ext_mesh_az_mesh_secretvalue_show
-          displayName: az mesh secretvalue show
-      - name: service
-        displayName: az mesh service
+        - name: Summary
+          uid: az_network_route-table
+          displayName: az network route-table
+        - name: route
+          uid: az_network_route-table_route
+          displayName: az network route-table route
+          items: []
+      - name: security-partner-provider
+        uid: az_network_security-partner-provider
+        displayName: az network security-partner-provider
+        items: []
+      - name: service-endpoint
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_service
-          displayName: az mesh service
-        - name: list
-          uid: ext_mesh_az_mesh_service_list
-          displayName: az mesh service list
-        - name: show
-          uid: ext_mesh_az_mesh_service_show
-          displayName: az mesh service show
-      - name: service-replica
-        displayName: az mesh service-replica
+        - name: Summary
+          uid: az_network_service-endpoint
+          displayName: az network service-endpoint
+        - name: policy
+          uid: az_network_service-endpoint_policy
+          displayName: az network service-endpoint policy
+          items: []
+        - name: policy-definition
+          uid: az_network_service-endpoint_policy-definition
+          displayName: az network service-endpoint policy-definition
+          items: []
+      - name: traffic-manager
+        items:
+        - name: Summary
+          uid: az_network_traffic-manager
+          displayName: az network traffic-manager
+        - name: endpoint
+          uid: az_network_traffic-manager_endpoint
+          displayName: az network traffic-manager endpoint
+          items: []
+        - name: profile
+          uid: az_network_traffic-manager_profile
+          displayName: az network traffic-manager profile
+          items: []
+      - name: vhub
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_service_replica
-          displayName: az mesh service-replica
-        - name: list
-          uid: ext_mesh_az_mesh_service_replica_list
-          displayName: az mesh service-replica list
-        - name: show
-          uid: ext_mesh_az_mesh_service_replica_show
-          displayName: az mesh service-replica show
-      - name: volume
-        displayName: az mesh volume
+        - name: Summary
+          uid: az_network_vhub
+          displayName: az network vhub
+        - name: connection
+          uid: az_network_vhub_connection
+          displayName: az network vhub connection
+          items: []
+        - name: route
+          uid: az_network_vhub_route
+          displayName: az network vhub route
+          items: []
+        - name: route-table
+          items:
+          - name: Summary
+            uid: az_network_vhub_route-table
+            displayName: az network vhub route-table
+          - name: route
+            uid: az_network_vhub_route-table_route
+            displayName: az network vhub route-table route
+            items: []
+      - name: virtual-appliance
+        items:
+        - name: Summary
+          uid: az_network_virtual-appliance
+          displayName: az network virtual-appliance
+        - name: site
+          uid: az_network_virtual-appliance_site
+          displayName: az network virtual-appliance site
+          items: []
+      - name: vnet
+        items:
+        - name: Summary
+          uid: az_network_vnet
+          displayName: az network vnet
+        - name: peering
+          uid: az_network_vnet_peering
+          displayName: az network vnet peering
+          items: []
+        - name: subnet
+          uid: az_network_vnet_subnet
+          displayName: az network vnet subnet
+          items: []
+        - name: tap
+          uid: az_network_vnet_tap
+          displayName: az network vnet tap
+          items: []
+      - name: vnet-gateway
+        items:
+        - name: Summary
+          uid: az_network_vnet-gateway
+          displayName: az network vnet-gateway
+        - name: revoked-cert
+          uid: az_network_vnet-gateway_revoked-cert
+          displayName: az network vnet-gateway revoked-cert
+          items: []
+        - name: root-cert
+          uid: az_network_vnet-gateway_root-cert
+          displayName: az network vnet-gateway root-cert
+          items: []
+        - name: vpn-client
+          uid: az_network_vnet-gateway_vpn-client
+          displayName: az network vnet-gateway vpn-client
+          items: []
+      - name: vpn-connection
+        items:
+        - name: Summary
+          uid: az_network_vpn-connection
+          displayName: az network vpn-connection
+        - name: ipsec-policy
+          uid: az_network_vpn-connection_ipsec-policy
+          displayName: az network vpn-connection ipsec-policy
+          items: []
+        - name: shared-key
+          uid: az_network_vpn-connection_shared-key
+          displayName: az network vpn-connection shared-key
+          items: []
+      - name: vpn-gateway
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_volume
-          displayName: az mesh volume
-        - name: create
-          uid: ext_mesh_az_mesh_volume_create
-          displayName: az mesh volume create
-        - name: delete
-          uid: ext_mesh_az_mesh_volume_delete
-          displayName: az mesh volume delete
-        - name: list
-          uid: ext_mesh_az_mesh_volume_list
-          displayName: az mesh volume list
-        - name: show
-          uid: ext_mesh_az_mesh_volume_show
-          displayName: az mesh volume show
-  - name: mixed-reality
-    items:
-    - name: Overview
-      uid: ext_mixed-reality_az
-    - name: spatial-anchors-account
-      displayName: az spatial-anchors-account
-      items:
-      - name: Overview
-        uid: ext_mixed-reality_az_spatial_anchors_account
-        displayName: az spatial-anchors-account
-      - name: create
-        uid: ext_mixed-reality_az_spatial_anchors_account_create
-        displayName: az spatial-anchors-account create
-      - name: delete
-        uid: ext_mixed-reality_az_spatial_anchors_account_delete
-        displayName: az spatial-anchors-account delete
-      - name: list
-        uid: ext_mixed-reality_az_spatial_anchors_account_list
-        displayName: az spatial-anchors-account list
-      - name: show
-        uid: ext_mixed-reality_az_spatial_anchors_account_show
-        displayName: az spatial-anchors-account show
-      - name: key
-        displayName: az spatial-anchors-account key
+        - name: Summary
+          uid: az_network_vpn-gateway
+          displayName: az network vpn-gateway
+        - name: connection
+          items:
+          - name: Summary
+            uid: az_network_vpn-gateway_connection
+            displayName: az network vpn-gateway connection
+          - name: ipsec-policy
+            uid: az_network_vpn-gateway_connection_ipsec-policy
+            displayName: az network vpn-gateway connection ipsec-policy
+            items: []
+      - name: vpn-server-config
+        items:
+        - name: Summary
+          uid: az_network_vpn-server-config
+          displayName: az network vpn-server-config
+        - name: ipsec-policy
+          uid: az_network_vpn-server-config_ipsec-policy
+          displayName: az network vpn-server-config ipsec-policy
+          items: []
+      - name: vpn-site
+        uid: az_network_vpn-site
+        displayName: az network vpn-site
+        items: []
+      - name: vrouter
         items:
-        - name: Overview
-          uid: ext_mixed-reality_az_spatial_anchors_account_key
-          displayName: az spatial-anchors-account key
-        - name: renew
-          uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-          displayName: az spatial-anchors-account key renew
-        - name: show
-          uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-          displayName: az spatial-anchors-account key show
-  - name: netappfiles-preview
-    items:
-    - name: Overview
-      uid: ext_netappfiles-preview_az
-    - name: netappfiles
-      displayName: az netappfiles
+        - name: Summary
+          uid: az_network_vrouter
+          displayName: az network vrouter
+        - name: peering
+          uid: az_network_vrouter_peering
+          displayName: az network vrouter peering
+          items: []
+      - name: vwan
+        uid: az_network_vwan
+        displayName: az network vwan
+        items: []
+      - name: watcher
+        items:
+        - name: Summary
+          uid: az_network_watcher
+          displayName: az network watcher
+        - name: flow-log
+          uid: az_network_watcher_flow-log
+          displayName: az network watcher flow-log
+          items: []
+        - name: packet-capture
+          uid: az_network_watcher_packet-capture
+          displayName: az network watcher packet-capture
+          items: []
+        - name: troubleshooting
+          uid: az_network_watcher_troubleshooting
+          displayName: az network watcher troubleshooting
+          items: []
+    - name: peering
       items:
-      - name: Overview
-        uid: ext_netappfiles-preview_az_netappfiles
-        displayName: az netappfiles
-      - name: account
-        displayName: az netappfiles account
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_account
-          displayName: az netappfiles account
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_account_create
-          displayName: az netappfiles account create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_account_delete
-          displayName: az netappfiles account delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_account_list
-          displayName: az netappfiles account list
-        - name: set
-          uid: ext_netappfiles-preview_az_netappfiles_account_set
-          displayName: az netappfiles account set
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_account_show
-          displayName: az netappfiles account show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_account_update
-          displayName: az netappfiles account update
-      - name: mount-target
-        displayName: az netappfiles mount-target
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_mount_target
-          displayName: az netappfiles mount-target
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-          displayName: az netappfiles mount-target list
-      - name: pool
-        displayName: az netappfiles pool
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_pool
-          displayName: az netappfiles pool
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_pool_create
-          displayName: az netappfiles pool create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-          displayName: az netappfiles pool delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_pool_list
-          displayName: az netappfiles pool list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_pool_show
-          displayName: az netappfiles pool show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_pool_update
-          displayName: az netappfiles pool update
-      - name: snapshot
-        displayName: az netappfiles snapshot
-        items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot
-          displayName: az netappfiles snapshot
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-          displayName: az netappfiles snapshot create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-          displayName: az netappfiles snapshot delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-          displayName: az netappfiles snapshot list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-          displayName: az netappfiles snapshot show
-      - name: volume
-        displayName: az netappfiles volume
+      - name: Summary
+        uid: az_peering
+        displayName: az peering
+      - name: asn
+        uid: az_peering_asn
+        displayName: az peering asn
+        items: []
+      - name: legacy
+        uid: az_peering_legacy
+        displayName: az peering legacy
+        items: []
+      - name: location
+        uid: az_peering_location
+        displayName: az peering location
+        items: []
+      - name: peering
+        uid: az_peering_peering
+        displayName: az peering peering
+        items: []
+      - name: received-route
+        uid: az_peering_received-route
+        displayName: az peering received-route
+        items: []
+      - name: registered-asn
+        uid: az_peering_registered-asn
+        displayName: az peering registered-asn
+        items: []
+      - name: registered-prefix
+        uid: az_peering_registered-prefix
+        displayName: az peering registered-prefix
+        items: []
+      - name: service
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_volume
-          displayName: az netappfiles volume
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_volume_create
-          displayName: az netappfiles volume create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-          displayName: az netappfiles volume delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_volume_list
-          displayName: az netappfiles volume list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_volume_show
-          displayName: az netappfiles volume show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_volume_update
-          displayName: az netappfiles volume update
-  - name: notification-hub
+        - name: Summary
+          uid: az_peering_service
+          displayName: az peering service
+        - name: country
+          uid: az_peering_service_country
+          displayName: az peering service country
+          items: []
+        - name: location
+          uid: az_peering_service_location
+          displayName: az peering service location
+          items: []
+        - name: prefix
+          uid: az_peering_service_prefix
+          displayName: az peering service prefix
+          items: []
+        - name: provider
+          uid: az_peering_service_provider
+          displayName: az peering service provider
+          items: []
+  - name: Azure Notification Hubs
     items:
-    - name: Overview
-      uid: ext_notification-hub_az
+    - name: Summary
+      uid: sp-Azure_Notification_Hubs
+      displayName: Azure Notification Hubs
     - name: notification-hub
-      displayName: az notification-hub
       items:
-      - name: Overview
-        uid: ext_notification-hub_az_notification_hub
+      - name: Summary
+        uid: az_notification-hub
         displayName: az notification-hub
-      - name: check-availability
-        uid: ext_notification-hub_az_notification_hub_check_availability
-        displayName: az notification-hub check-availability
-      - name: create
-        uid: ext_notification-hub_az_notification_hub_create
-        displayName: az notification-hub create
-      - name: delete
-        uid: ext_notification-hub_az_notification_hub_delete
-        displayName: az notification-hub delete
-      - name: list
-        uid: ext_notification-hub_az_notification_hub_list
-        displayName: az notification-hub list
-      - name: show
-        uid: ext_notification-hub_az_notification_hub_show
-        displayName: az notification-hub show
-      - name: test-send
-        uid: ext_notification-hub_az_notification_hub_test_send
-        displayName: az notification-hub test-send
-      - name: update
-        uid: ext_notification-hub_az_notification_hub_update
-        displayName: az notification-hub update
       - name: authorization-rule
+        uid: az_notification-hub_authorization-rule
         displayName: az notification-hub authorization-rule
-        items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_authorization_rule
-          displayName: az notification-hub authorization-rule
-        - name: create
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-          displayName: az notification-hub authorization-rule create
-        - name: delete
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-          displayName: az notification-hub authorization-rule delete
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-          displayName: az notification-hub authorization-rule list
-        - name: list-keys
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-          displayName: az notification-hub authorization-rule list-keys
-        - name: regenerate-keys
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-          displayName: az notification-hub authorization-rule regenerate-keys
-        - name: show
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-          displayName: az notification-hub authorization-rule show
+        items: []
       - name: credential
-        displayName: az notification-hub credential
         items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_credential
+        - name: Summary
+          uid: az_notification-hub_credential
           displayName: az notification-hub credential
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_credential_list
-          displayName: az notification-hub credential list
         - name: adm
+          uid: az_notification-hub_credential_adm
           displayName: az notification-hub credential adm
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_adm
-            displayName: az notification-hub credential adm
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_adm_update
-            displayName: az notification-hub credential adm update
+          items: []
         - name: apns
+          uid: az_notification-hub_credential_apns
           displayName: az notification-hub credential apns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_apns
-            displayName: az notification-hub credential apns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_apns_update
-            displayName: az notification-hub credential apns update
+          items: []
         - name: baidu
+          uid: az_notification-hub_credential_baidu
           displayName: az notification-hub credential baidu
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_baidu
-            displayName: az notification-hub credential baidu
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-            displayName: az notification-hub credential baidu update
+          items: []
         - name: gcm
+          uid: az_notification-hub_credential_gcm
           displayName: az notification-hub credential gcm
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_gcm
-            displayName: az notification-hub credential gcm
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-            displayName: az notification-hub credential gcm update
+          items: []
         - name: mpns
+          uid: az_notification-hub_credential_mpns
           displayName: az notification-hub credential mpns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_mpns
-            displayName: az notification-hub credential mpns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-            displayName: az notification-hub credential mpns update
+          items: []
         - name: wns
+          uid: az_notification-hub_credential_wns
           displayName: az notification-hub credential wns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_wns
-            displayName: az notification-hub credential wns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_wns_update
-            displayName: az notification-hub credential wns update
+          items: []
       - name: namespace
-        displayName: az notification-hub namespace
         items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_namespace
+        - name: Summary
+          uid: az_notification-hub_namespace
           displayName: az notification-hub namespace
-        - name: check-availability
-          uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-          displayName: az notification-hub namespace check-availability
-        - name: create
-          uid: ext_notification-hub_az_notification_hub_namespace_create
-          displayName: az notification-hub namespace create
-        - name: delete
-          uid: ext_notification-hub_az_notification_hub_namespace_delete
-          displayName: az notification-hub namespace delete
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_namespace_list
-          displayName: az notification-hub namespace list
-        - name: show
-          uid: ext_notification-hub_az_notification_hub_namespace_show
-          displayName: az notification-hub namespace show
-        - name: update
-          uid: ext_notification-hub_az_notification_hub_namespace_update
-          displayName: az notification-hub namespace update
-        - name: wait
-          uid: ext_notification-hub_az_notification_hub_namespace_wait
-          displayName: az notification-hub namespace wait
         - name: authorization-rule
+          uid: az_notification-hub_namespace_authorization-rule
           displayName: az notification-hub namespace authorization-rule
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-            displayName: az notification-hub namespace authorization-rule
-          - name: create
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-            displayName: az notification-hub namespace authorization-rule create
-          - name: delete
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-            displayName: az notification-hub namespace authorization-rule delete
-          - name: list
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-            displayName: az notification-hub namespace authorization-rule list
-          - name: list-keys
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-            displayName: az notification-hub namespace authorization-rule list-keys
-          - name: regenerate-keys
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-            displayName: az notification-hub namespace authorization-rule regenerate-keys
-          - name: show
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-            displayName: az notification-hub namespace authorization-rule show
-  - name: peering
+          items: []
+  - name: Azure Pipelines
     items:
-    - name: Overview
-      uid: ext_peering_az
-    - name: peering
-      displayName: az peering
+    - name: Summary
+      uid: sp-Azure_Pipelines
+      displayName: Azure Pipelines
+    - name: pipelines
       items:
-      - name: Overview
-        uid: ext_peering_az_peering
-        displayName: az peering
-      - name: create
-        uid: ext_peering_az_peering_create
-        displayName: az peering create
-      - name: delete
-        uid: ext_peering_az_peering_delete
-        displayName: az peering delete
-      - name: list
-        uid: ext_peering_az_peering_list
-        displayName: az peering list
-      - name: show
-        uid: ext_peering_az_peering_show
-        displayName: az peering show
-      - name: update
-        uid: ext_peering_az_peering_update
-        displayName: az peering update
-      - name: asn
-        displayName: az peering asn
+      - name: Summary
+        uid: az_pipelines
+        displayName: az pipelines
+      - name: agent
+        uid: az_pipelines_agent
+        displayName: az pipelines agent
+        items: []
+      - name: build
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_asn
-          displayName: az peering asn
-        - name: create
-          uid: ext_peering_az_peering_asn_create
-          displayName: az peering asn create
-        - name: delete
-          uid: ext_peering_az_peering_asn_delete
-          displayName: az peering asn delete
-        - name: list
-          uid: ext_peering_az_peering_asn_list
-          displayName: az peering asn list
-        - name: show
-          uid: ext_peering_az_peering_asn_show
-          displayName: az peering asn show
-        - name: update
-          uid: ext_peering_az_peering_asn_update
-          displayName: az peering asn update
-      - name: legacy
-        displayName: az peering legacy
+        - name: Summary
+          uid: az_pipelines_build
+          displayName: az pipelines build
+        - name: definition
+          uid: az_pipelines_build_definition
+          displayName: az pipelines build definition
+          items: []
+        - name: tag
+          uid: az_pipelines_build_tag
+          displayName: az pipelines build tag
+          items: []
+      - name: folder
+        uid: az_pipelines_folder
+        displayName: az pipelines folder
+        items: []
+      - name: pool
+        uid: az_pipelines_pool
+        displayName: az pipelines pool
+        items: []
+      - name: queue
+        uid: az_pipelines_queue
+        displayName: az pipelines queue
+        items: []
+      - name: release
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_legacy
-          displayName: az peering legacy
-        - name: list
-          uid: ext_peering_az_peering_legacy_list
-          displayName: az peering legacy list
-      - name: location
-        displayName: az peering location
+        - name: Summary
+          uid: az_pipelines_release
+          displayName: az pipelines release
+        - name: definition
+          uid: az_pipelines_release_definition
+          displayName: az pipelines release definition
+          items: []
+      - name: runs
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_location
-          displayName: az peering location
-        - name: list
-          uid: ext_peering_az_peering_location_list
-          displayName: az peering location list
-      - name: service
-        displayName: az peering service
+        - name: Summary
+          uid: az_pipelines_runs
+          displayName: az pipelines runs
+        - name: artifact
+          uid: az_pipelines_runs_artifact
+          displayName: az pipelines runs artifact
+          items: []
+        - name: tag
+          uid: az_pipelines_runs_tag
+          displayName: az pipelines runs tag
+          items: []
+      - name: variable
+        uid: az_pipelines_variable
+        displayName: az pipelines variable
+        items: []
+      - name: variable-group
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_service
-          displayName: az peering service
-        - name: create
-          uid: ext_peering_az_peering_service_create
-          displayName: az peering service create
-        - name: delete
-          uid: ext_peering_az_peering_service_delete
-          displayName: az peering service delete
-        - name: list
-          uid: ext_peering_az_peering_service_list
-          displayName: az peering service list
-        - name: show
-          uid: ext_peering_az_peering_service_show
-          displayName: az peering service show
-        - name: update
-          uid: ext_peering_az_peering_service_update
-          displayName: az peering service update
-        - name: location
-          displayName: az peering service location
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_location
-            displayName: az peering service location
-          - name: list
-            uid: ext_peering_az_peering_service_location_list
-            displayName: az peering service location list
-        - name: prefix
-          displayName: az peering service prefix
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_prefix
-            displayName: az peering service prefix
-          - name: create
-            uid: ext_peering_az_peering_service_prefix_create
-            displayName: az peering service prefix create
-          - name: delete
-            uid: ext_peering_az_peering_service_prefix_delete
-            displayName: az peering service prefix delete
-          - name: list
-            uid: ext_peering_az_peering_service_prefix_list
-            displayName: az peering service prefix list
-          - name: show
-            uid: ext_peering_az_peering_service_prefix_show
-            displayName: az peering service prefix show
-          - name: update
-            uid: ext_peering_az_peering_service_prefix_update
-            displayName: az peering service prefix update
-        - name: provider
-          displayName: az peering service provider
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_provider
-            displayName: az peering service provider
-          - name: list
-            uid: ext_peering_az_peering_service_provider_list
-            displayName: az peering service provider list
-  - name: portal
+        - name: Summary
+          uid: az_pipelines_variable-group
+          displayName: az pipelines variable-group
+        - name: variable
+          uid: az_pipelines_variable-group_variable
+          displayName: az pipelines variable-group variable
+          items: []
+  - name: Azure Policy
+    items:
+    - name: Summary
+      uid: sp-Azure_Policy
+      displayName: Azure Policy
+    - name: guestconfig
+      items:
+      - name: Summary
+        uid: az_guestconfig
+        displayName: az guestconfig
+      - name: guest-configuration-assignment
+        uid: az_guestconfig_guest-configuration-assignment
+        displayName: az guestconfig guest-configuration-assignment
+        items: []
+      - name: guest-configuration-assignment-report
+        uid: az_guestconfig_guest-configuration-assignment-report
+        displayName: az guestconfig guest-configuration-assignment-report
+        items: []
+      - name: guest-configuration-hcrp-assignment
+        uid: az_guestconfig_guest-configuration-hcrp-assignment
+        displayName: az guestconfig guest-configuration-hcrp-assignment
+        items: []
+      - name: guest-configuration-hcrp-assignment-report
+        uid: az_guestconfig_guest-configuration-hcrp-assignment-report
+        displayName: az guestconfig guest-configuration-hcrp-assignment-report
+        items: []
+    - name: policy
+      items:
+      - name: Summary
+        uid: az_policy
+        displayName: az policy
+      - name: assignment
+        uid: az_policy_assignment
+        displayName: az policy assignment
+        items: []
+      - name: definition
+        uid: az_policy_definition
+        displayName: az policy definition
+        items: []
+  - name: Azure Portal
     items:
-    - name: Overview
-      uid: ext_portal_az
+    - name: Summary
+      uid: sp-Azure_Portal
+      displayName: Azure Portal
     - name: portal
-      displayName: az portal
       items:
-      - name: Overview
-        uid: ext_portal_az_portal
+      - name: Summary
+        uid: az_portal
         displayName: az portal
       - name: dashboard
+        uid: az_portal_dashboard
         displayName: az portal dashboard
-        items:
-        - name: Overview
-          uid: ext_portal_az_portal_dashboard
-          displayName: az portal dashboard
-        - name: create
-          uid: ext_portal_az_portal_dashboard_create
-          displayName: az portal dashboard create
-        - name: delete
-          uid: ext_portal_az_portal_dashboard_delete
-          displayName: az portal dashboard delete
-        - name: import
-          uid: ext_portal_az_portal_dashboard_import
-          displayName: az portal dashboard import
-        - name: list
-          uid: ext_portal_az_portal_dashboard_list
-          displayName: az portal dashboard list
-        - name: show
-          uid: ext_portal_az_portal_dashboard_show
-          displayName: az portal dashboard show
-        - name: update
-          uid: ext_portal_az_portal_dashboard_update
-          displayName: az portal dashboard update
-  - name: powerbidedicated
+        items: []
+  - name: Azure Providers
     items:
-    - name: Overview
-      uid: ext_powerbidedicated_az
-    - name: powerbi
-      displayName: az powerbi
-      items:
-      - name: Overview
-        uid: ext_powerbidedicated_az_powerbi
-        displayName: az powerbi
-      - name: embedded-capacity
-        displayName: az powerbi embedded-capacity
-        items:
-        - name: Overview
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-          displayName: az powerbi embedded-capacity
-        - name: create
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-          displayName: az powerbi embedded-capacity create
-        - name: delete
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-          displayName: az powerbi embedded-capacity delete
-        - name: list
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-          displayName: az powerbi embedded-capacity list
-        - name: show
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-          displayName: az powerbi embedded-capacity show
-        - name: update
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-          displayName: az powerbi embedded-capacity update
-        - name: wait
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-          displayName: az powerbi embedded-capacity wait
-  - name: privatedns
+    - name: Summary
+      uid: sp-Azure_Providers
+      displayName: Azure Providers
+    - name: providerhub
+      items:
+      - name: Summary
+        uid: az_providerhub
+        displayName: az providerhub
+      - name: custom-rollout
+        uid: az_providerhub_custom-rollout
+        displayName: az providerhub custom-rollout
+        items: []
+      - name: default-rollout
+        uid: az_providerhub_default-rollout
+        displayName: az providerhub default-rollout
+        items: []
+      - name: manifest
+        uid: az_providerhub_manifest
+        displayName: az providerhub manifest
+        items: []
+      - name: provider-registration
+        uid: az_providerhub_provider-registration
+        displayName: az providerhub provider-registration
+        items: []
+      - name: resource-type-registration
+        uid: az_providerhub_resource-type-registration
+        displayName: az providerhub resource-type-registration
+        items: []
+  - name: Azure Quantum
     items:
-    - name: Overview
-      uid: ext_privatedns_az
-    - name: Networking
-      displayName: az network
+    - name: Summary
+      uid: sp-Azure_Quantum
+      displayName: Azure Quantum
+    - name: quantum
+      items:
+      - name: Summary
+        uid: az_quantum
+        displayName: az quantum
+      - name: job
+        uid: az_quantum_job
+        displayName: az quantum job
+        items: []
+      - name: offerings
+        uid: az_quantum_offerings
+        displayName: az quantum offerings
+        items: []
+      - name: target
+        uid: az_quantum_target
+        displayName: az quantum target
+        items: []
+      - name: workspace
+        uid: az_quantum_workspace
+        displayName: az quantum workspace
+        items: []
+  - name: Azure Red Hat OpenShift
+    uid: sp-Azure_Red_Hat_OpenShift
+    displayName: Azure Red Hat OpenShift
+    items: []
+  - name: Azure Relay
+    uid: sp-Azure_Relay
+    displayName: Azure Relay
+    items: []
+  - name: Azure Remote Rendering
+    items:
+    - name: Summary
+      uid: sp-Azure_Remote_Rendering
+      displayName: Azure Remote Rendering
+    - name: remote-rendering-account
+      items:
+      - name: Summary
+        uid: az_remote-rendering-account
+        displayName: az remote-rendering-account
+      - name: key
+        uid: az_remote-rendering-account_key
+        displayName: az remote-rendering-account key
+        items: []
+  - name: Azure Repos
+    items:
+    - name: Summary
+      uid: sp-Azure_Repos
+      displayName: Azure Repos
+    - name: repos
       items:
-      - name: Overview
-        uid: ext_privatedns_az_network
-        displayName: az network
-      - name: private-dns
-        displayName: az network private-dns
+      - name: Summary
+        uid: az_repos
+        displayName: az repos
+      - name: import
+        uid: az_repos_import
+        displayName: az repos import
+        items: []
+      - name: policy
+        items:
+        - name: Summary
+          uid: az_repos_policy
+          displayName: az repos policy
+        - name: approver-count
+          uid: az_repos_policy_approver-count
+          displayName: az repos policy approver-count
+          items: []
+        - name: build
+          uid: az_repos_policy_build
+          displayName: az repos policy build
+          items: []
+        - name: case-enforcement
+          uid: az_repos_policy_case-enforcement
+          displayName: az repos policy case-enforcement
+          items: []
+        - name: comment-required
+          uid: az_repos_policy_comment-required
+          displayName: az repos policy comment-required
+          items: []
+        - name: file-size
+          uid: az_repos_policy_file-size
+          displayName: az repos policy file-size
+          items: []
+        - name: merge-strategy
+          uid: az_repos_policy_merge-strategy
+          displayName: az repos policy merge-strategy
+          items: []
+        - name: required-reviewer
+          uid: az_repos_policy_required-reviewer
+          displayName: az repos policy required-reviewer
+          items: []
+        - name: work-item-linking
+          uid: az_repos_policy_work-item-linking
+          displayName: az repos policy work-item-linking
+          items: []
+      - name: pr
         items:
-        - name: Overview
-          uid: ext_privatedns_az_network_private_dns
-          displayName: az network private-dns
-        - name: link
-          displayName: az network private-dns link
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_link
-            displayName: az network private-dns link
-          - name: vnet
-            displayName: az network private-dns link vnet
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_link_vnet
-              displayName: az network private-dns link vnet
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_link_vnet_create
-              displayName: az network private-dns link vnet create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-              displayName: az network private-dns link vnet delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_link_vnet_list
-              displayName: az network private-dns link vnet list
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_link_vnet_show
-              displayName: az network private-dns link vnet show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_link_vnet_update
-              displayName: az network private-dns link vnet update
-            - name: wait
-              uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-              displayName: az network private-dns link vnet wait
-        - name: record-set
-          displayName: az network private-dns record-set
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_record_set
-            displayName: az network private-dns record-set
-          - name: list
-            uid: ext_privatedns_az_network_private_dns_record_set_list
-            displayName: az network private-dns record-set list
-          - name: a
-            displayName: az network private-dns record-set a
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_a
-              displayName: az network private-dns record-set a
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-              displayName: az network private-dns record-set a add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_a_create
-              displayName: az network private-dns record-set a create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-              displayName: az network private-dns record-set a delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_a_list
-              displayName: az network private-dns record-set a list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-              displayName: az network private-dns record-set a remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_a_show
-              displayName: az network private-dns record-set a show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_a_update
-              displayName: az network private-dns record-set a update
-          - name: aaaa
-            displayName: az network private-dns record-set aaaa
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-              displayName: az network private-dns record-set aaaa
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-              displayName: az network private-dns record-set aaaa add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-              displayName: az network private-dns record-set aaaa create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-              displayName: az network private-dns record-set aaaa delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-              displayName: az network private-dns record-set aaaa list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-              displayName: az network private-dns record-set aaaa remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-              displayName: az network private-dns record-set aaaa show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-              displayName: az network private-dns record-set aaaa update
-          - name: cname
-            displayName: az network private-dns record-set cname
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_cname
-              displayName: az network private-dns record-set cname
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-              displayName: az network private-dns record-set cname create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-              displayName: az network private-dns record-set cname delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-              displayName: az network private-dns record-set cname list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-              displayName: az network private-dns record-set cname remove-record
-            - name: set-record
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-              displayName: az network private-dns record-set cname set-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-              displayName: az network private-dns record-set cname show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-              displayName: az network private-dns record-set cname update
-          - name: mx
-            displayName: az network private-dns record-set mx
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_mx
-              displayName: az network private-dns record-set mx
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-              displayName: az network private-dns record-set mx add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-              displayName: az network private-dns record-set mx create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-              displayName: az network private-dns record-set mx delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-              displayName: az network private-dns record-set mx list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-              displayName: az network private-dns record-set mx remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-              displayName: az network private-dns record-set mx show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-              displayName: az network private-dns record-set mx update
-          - name: ptr
-            displayName: az network private-dns record-set ptr
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr
-              displayName: az network private-dns record-set ptr
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-              displayName: az network private-dns record-set ptr add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-              displayName: az network private-dns record-set ptr create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-              displayName: az network private-dns record-set ptr delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-              displayName: az network private-dns record-set ptr list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-              displayName: az network private-dns record-set ptr remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-              displayName: az network private-dns record-set ptr show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-              displayName: az network private-dns record-set ptr update
-          - name: soa
-            displayName: az network private-dns record-set soa
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_soa
-              displayName: az network private-dns record-set soa
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-              displayName: az network private-dns record-set soa show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-              displayName: az network private-dns record-set soa update
-          - name: srv
-            displayName: az network private-dns record-set srv
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_srv
-              displayName: az network private-dns record-set srv
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-              displayName: az network private-dns record-set srv add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-              displayName: az network private-dns record-set srv create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-              displayName: az network private-dns record-set srv delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-              displayName: az network private-dns record-set srv list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-              displayName: az network private-dns record-set srv remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-              displayName: az network private-dns record-set srv show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-              displayName: az network private-dns record-set srv update
-          - name: txt
-            displayName: az network private-dns record-set txt
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_txt
-              displayName: az network private-dns record-set txt
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-              displayName: az network private-dns record-set txt add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-              displayName: az network private-dns record-set txt create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-              displayName: az network private-dns record-set txt delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-              displayName: az network private-dns record-set txt list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-              displayName: az network private-dns record-set txt remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-              displayName: az network private-dns record-set txt show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-              displayName: az network private-dns record-set txt update
-        - name: zone
-          displayName: az network private-dns zone
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_zone
-            displayName: az network private-dns zone
-          - name: create
-            uid: ext_privatedns_az_network_private_dns_zone_create
-            displayName: az network private-dns zone create
-          - name: delete
-            uid: ext_privatedns_az_network_private_dns_zone_delete
-            displayName: az network private-dns zone delete
-          - name: list
-            uid: ext_privatedns_az_network_private_dns_zone_list
-            displayName: az network private-dns zone list
-          - name: show
-            uid: ext_privatedns_az_network_private_dns_zone_show
-            displayName: az network private-dns zone show
-          - name: update
-            uid: ext_privatedns_az_network_private_dns_zone_update
-            displayName: az network private-dns zone update
-          - name: wait
-            uid: ext_privatedns_az_network_private_dns_zone_wait
-            displayName: az network private-dns zone wait
-  - name: resource-graph
+        - name: Summary
+          uid: az_repos_pr
+          displayName: az repos pr
+        - name: policy
+          uid: az_repos_pr_policy
+          displayName: az repos pr policy
+          items: []
+        - name: reviewer
+          uid: az_repos_pr_reviewer
+          displayName: az repos pr reviewer
+          items: []
+        - name: work-item
+          uid: az_repos_pr_work-item
+          displayName: az repos pr work-item
+          items: []
+      - name: ref
+        uid: az_repos_ref
+        displayName: az repos ref
+        items: []
+  - name: Azure Reservations
+    uid: sp-Azure_Reservations
+    displayName: Azure Reservations
+    items: []
+  - name: Azure Resource Graph
     items:
-    - name: Overview
-      uid: ext_resource-graph_az
+    - name: Summary
+      uid: sp-Azure_Resource_Graph
+      displayName: Azure Resource Graph
     - name: graph
+      uid: az_graph
       displayName: az graph
+      items: []
+  - name: Azure Resource Manager
+    items:
+    - name: Summary
+      uid: sp-Azure_Resource_Manager
+      displayName: Azure Resource Manager
+    - name: deployment
+      items:
+      - name: Summary
+        uid: az_deployment
+        displayName: az deployment
+      - name: group
+        uid: az_deployment_group
+        displayName: az deployment group
+        items: []
+      - name: operation
+        items:
+        - name: Summary
+          uid: az_deployment_operation
+          displayName: az deployment operation
+        - name: group
+          uid: az_deployment_operation_group
+          displayName: az deployment operation group
+          items: []
+    - name: deployment-scripts
+      uid: az_deployment-scripts
+      displayName: az deployment-scripts
+      items: []
+    - name: group
       items:
-      - name: Overview
-        uid: ext_resource-graph_az_graph
-        displayName: az graph
-      - name: query
-        uid: ext_resource-graph_az_graph_query
-        displayName: az graph query
-      - name: shared-query
-        displayName: az graph shared-query
+      - name: Summary
+        uid: az_group
+        displayName: az group
+      - name: deployment
         items:
-        - name: Overview
-          uid: ext_resource-graph_az_graph_shared_query
-          displayName: az graph shared-query
-        - name: create
-          uid: ext_resource-graph_az_graph_shared_query_create
-          displayName: az graph shared-query create
-        - name: delete
-          uid: ext_resource-graph_az_graph_shared_query_delete
-          displayName: az graph shared-query delete
-        - name: list
-          uid: ext_resource-graph_az_graph_shared_query_list
-          displayName: az graph shared-query list
-        - name: show
-          uid: ext_resource-graph_az_graph_shared_query_show
-          displayName: az graph shared-query show
-  - name: sap-hana
+        - name: Summary
+          uid: az_group_deployment
+          displayName: az group deployment
+        - name: operation
+          uid: az_group_deployment_operation
+          displayName: az group deployment operation
+          items: []
+      - name: lock
+        uid: az_group_lock
+        displayName: az group lock
+        items: []
+    - name: lock
+      uid: az_lock
+      displayName: az lock
+      items: []
+    - name: provider
+      items:
+      - name: Summary
+        uid: az_provider
+        displayName: az provider
+      - name: operation
+        uid: az_provider_operation
+        displayName: az provider operation
+        items: []
+    - name: resource
+      items:
+      - name: Summary
+        uid: az_resource
+        displayName: az resource
+      - name: link
+        uid: az_resource_link
+        displayName: az resource link
+        items: []
+      - name: lock
+        uid: az_resource_lock
+        displayName: az resource lock
+        items: []
+    - name: tag
+      uid: az_tag
+      displayName: az tag
+      items: []
+  - name: Azure Resource Mover
     items:
-    - name: Overview
-      uid: ext_sap-hana_az
-    - name: hanainstance
-      displayName: az hanainstance
+    - name: Summary
+      uid: sp-Azure_Resource_Mover
+      displayName: Azure Resource Mover
+    - name: resource-mover
+      items:
+      - name: Summary
+        uid: az_resource-mover
+        displayName: az resource-mover
+      - name: move-collection
+        uid: az_resource-mover_move-collection
+        displayName: az resource-mover move-collection
+        items: []
+      - name: move-resource
+        uid: az_resource-mover_move-resource
+        displayName: az resource-mover move-resource
+        items: []
+  - name: Azure resource providers
+    uid: sp-Azure_resource_providers
+    displayName: Azure resource providers
+    items: []
+  - name: Azure role-based access Control
+    items:
+    - name: Summary
+      uid: sp-Azure_role-based_access_Control
+      displayName: Azure role-based access Control
+    - name: role
+      items:
+      - name: Summary
+        uid: az_role
+        displayName: az role
+      - name: assignment
+        uid: az_role_assignment
+        displayName: az role assignment
+        items: []
+      - name: definition
+        uid: az_role_definition
+        displayName: az role definition
+        items: []
+  - name: Azure Security Center
+    items:
+    - name: Summary
+      uid: sp-Azure_Security_Center
+      displayName: Azure Security Center
+    - name: security
       items:
-      - name: Overview
-        uid: ext_sap-hana_az_hanainstance
-        displayName: az hanainstance
-      - name: create
-        uid: ext_sap-hana_az_hanainstance_create
-        displayName: az hanainstance create
-      - name: delete
-        uid: ext_sap-hana_az_hanainstance_delete
-        displayName: az hanainstance delete
-      - name: list
-        uid: ext_sap-hana_az_hanainstance_list
-        displayName: az hanainstance list
-      - name: restart
-        uid: ext_sap-hana_az_hanainstance_restart
-        displayName: az hanainstance restart
-      - name: show
-        uid: ext_sap-hana_az_hanainstance_show
-        displayName: az hanainstance show
-      - name: shutdown
-        uid: ext_sap-hana_az_hanainstance_shutdown
-        displayName: az hanainstance shutdown
-      - name: start
-        uid: ext_sap-hana_az_hanainstance_start
-        displayName: az hanainstance start
-      - name: update
-        uid: ext_sap-hana_az_hanainstance_update
-        displayName: az hanainstance update
-    - name: sapmonitor
-      displayName: az sapmonitor
+      - name: Summary
+        uid: az_security
+        displayName: az security
+      - name: adaptive_network_hardenings
+        uid: az_security_adaptive_network_hardenings
+        displayName: az security adaptive_network_hardenings
+        items: []
+      - name: adaptive-application-controls
+        uid: az_security_adaptive-application-controls
+        displayName: az security adaptive-application-controls
+        items: []
+      - name: alert
+        uid: az_security_alert
+        displayName: az security alert
+        items: []
+      - name: allowed_connections
+        uid: az_security_allowed_connections
+        displayName: az security allowed_connections
+        items: []
+      - name: assessment
+        uid: az_security_assessment
+        displayName: az security assessment
+        items: []
+      - name: assessment-metadata
+        uid: az_security_assessment-metadata
+        displayName: az security assessment-metadata
+        items: []
+      - name: atp
+        items:
+        - name: Summary
+          uid: az_security_atp
+          displayName: az security atp
+        - name: storage
+          uid: az_security_atp_storage
+          displayName: az security atp storage
+          items: []
+      - name: auto-provisioning-setting
+        uid: az_security_auto-provisioning-setting
+        displayName: az security auto-provisioning-setting
+        items: []
+      - name: contact
+        uid: az_security_contact
+        displayName: az security contact
+        items: []
+      - name: discovered-security-solution
+        uid: az_security_discovered-security-solution
+        displayName: az security discovered-security-solution
+        items: []
+      - name: external-security-solution
+        uid: az_security_external-security-solution
+        displayName: az security external-security-solution
+        items: []
+      - name: iot-alerts
+        uid: az_security_iot-alerts
+        displayName: az security iot-alerts
+        items: []
+      - name: iot-analytics
+        uid: az_security_iot-analytics
+        displayName: az security iot-analytics
+        items: []
+      - name: iot-recommendations
+        uid: az_security_iot-recommendations
+        displayName: az security iot-recommendations
+        items: []
+      - name: iot-solution
+        uid: az_security_iot-solution
+        displayName: az security iot-solution
+        items: []
+      - name: jit-policy
+        uid: az_security_jit-policy
+        displayName: az security jit-policy
+        items: []
+      - name: location
+        uid: az_security_location
+        displayName: az security location
+        items: []
+      - name: pricing
+        uid: az_security_pricing
+        displayName: az security pricing
+        items: []
+      - name: regulatory-compliance-assessments
+        uid: az_security_regulatory-compliance-assessments
+        displayName: az security regulatory-compliance-assessments
+        items: []
+      - name: regulatory-compliance-controls
+        uid: az_security_regulatory-compliance-controls
+        displayName: az security regulatory-compliance-controls
+        items: []
+      - name: regulatory-compliance-standards
+        uid: az_security_regulatory-compliance-standards
+        displayName: az security regulatory-compliance-standards
+        items: []
+      - name: secure-score-control-definitions
+        uid: az_security_secure-score-control-definitions
+        displayName: az security secure-score-control-definitions
+        items: []
+      - name: secure-score-controls
+        uid: az_security_secure-score-controls
+        displayName: az security secure-score-controls
+        items: []
+      - name: secure-scores
+        uid: az_security_secure-scores
+        displayName: az security secure-scores
+        items: []
+      - name: setting
+        uid: az_security_setting
+        displayName: az security setting
+        items: []
+      - name: sub-assessment
+        uid: az_security_sub-assessment
+        displayName: az security sub-assessment
+        items: []
+      - name: task
+        uid: az_security_task
+        displayName: az security task
+        items: []
+      - name: topology
+        uid: az_security_topology
+        displayName: az security topology
+        items: []
+      - name: va
+        items:
+        - name: Summary
+          uid: az_security_va
+          displayName: az security va
+        - name: sql
+          items:
+          - name: Summary
+            uid: az_security_va_sql
+            displayName: az security va sql
+          - name: baseline
+            uid: az_security_va_sql_baseline
+            displayName: az security va sql baseline
+            items: []
+          - name: results
+            uid: az_security_va_sql_results
+            displayName: az security va sql results
+            items: []
+          - name: scans
+            uid: az_security_va_sql_scans
+            displayName: az security va sql scans
+            items: []
+      - name: workspace-setting
+        uid: az_security_workspace-setting
+        displayName: az security workspace-setting
+        items: []
+  - name: Azure Sentinel
+    items:
+    - name: Summary
+      uid: sp-Azure_Sentinel
+      displayName: Azure Sentinel
+    - name: sentinel
+      items:
+      - name: Summary
+        uid: az_sentinel
+        displayName: az sentinel
+      - name: action
+        uid: az_sentinel_action
+        displayName: az sentinel action
+        items: []
+      - name: alert-rule
+        uid: az_sentinel_alert-rule
+        displayName: az sentinel alert-rule
+        items: []
+      - name: alert-rule-template
+        uid: az_sentinel_alert-rule-template
+        displayName: az sentinel alert-rule-template
+        items: []
+      - name: bookmark
+        uid: az_sentinel_bookmark
+        displayName: az sentinel bookmark
+        items: []
+      - name: data-connector
+        uid: az_sentinel_data-connector
+        displayName: az sentinel data-connector
+        items: []
+      - name: incident
+        uid: az_sentinel_incident
+        displayName: az sentinel incident
+        items: []
+      - name: incident-comment
+        uid: az_sentinel_incident-comment
+        displayName: az sentinel incident-comment
+        items: []
+  - name: Azure Service Bus Messaging
+    uid: sp-Azure_Service_Bus_Messaging
+    displayName: Azure Service Bus Messaging
+    items: []
+  - name: Azure Service Fabric
+    uid: sp-Azure_Service_Fabric
+    displayName: Azure Service Fabric
+    items: []
+  - name: Azure Service Fabric Mesh
+    items:
+    - name: Summary
+      uid: sp-Azure_Service_Fabric_Mesh
+      displayName: Azure Service Fabric Mesh
+    - name: mesh
       items:
-      - name: Overview
-        uid: ext_sap-hana_az_sapmonitor
-        displayName: az sapmonitor
-      - name: create
-        uid: ext_sap-hana_az_sapmonitor_create
-        displayName: az sapmonitor create
-      - name: delete
-        uid: ext_sap-hana_az_sapmonitor_delete
-        displayName: az sapmonitor delete
-      - name: list
-        uid: ext_sap-hana_az_sapmonitor_list
-        displayName: az sapmonitor list
-      - name: show
-        uid: ext_sap-hana_az_sapmonitor_show
-        displayName: az sapmonitor show
-      - name: update
-        uid: ext_sap-hana_az_sapmonitor_update
-        displayName: az sapmonitor update
-      - name: provider-instance
-        displayName: az sapmonitor provider-instance
-        items:
-        - name: Overview
-          uid: ext_sap-hana_az_sapmonitor_provider_instance
-          displayName: az sapmonitor provider-instance
-        - name: create
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-          displayName: az sapmonitor provider-instance create
-        - name: delete
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-          displayName: az sapmonitor provider-instance delete
-        - name: list
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-          displayName: az sapmonitor provider-instance list
-        - name: show
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-          displayName: az sapmonitor provider-instance show
-  - name: spring-cloud
+      - name: Summary
+        uid: az_mesh
+        displayName: az mesh
+      - name: app
+        uid: az_mesh_app
+        displayName: az mesh app
+        items: []
+      - name: code-package-log
+        uid: az_mesh_code-package-log
+        displayName: az mesh code-package-log
+        items: []
+      - name: deployment
+        uid: az_mesh_deployment
+        displayName: az mesh deployment
+        items: []
+      - name: gateway
+        uid: az_mesh_gateway
+        displayName: az mesh gateway
+        items: []
+      - name: generate
+        uid: az_mesh_generate
+        displayName: az mesh generate
+        items: []
+      - name: network
+        uid: az_mesh_network
+        displayName: az mesh network
+        items: []
+      - name: secret
+        uid: az_mesh_secret
+        displayName: az mesh secret
+        items: []
+      - name: secretvalue
+        uid: az_mesh_secretvalue
+        displayName: az mesh secretvalue
+        items: []
+      - name: service
+        uid: az_mesh_service
+        displayName: az mesh service
+        items: []
+      - name: service-replica
+        uid: az_mesh_service-replica
+        displayName: az mesh service-replica
+        items: []
+      - name: volume
+        uid: az_mesh_volume
+        displayName: az mesh volume
+        items: []
+  - name: Azure SignalR
+    uid: sp-Azure_SignalR
+    displayName: Azure SignalR
+    items: []
+  - name: Azure Spatial Anchors
+    items:
+    - name: Summary
+      uid: sp-Azure_Spatial_Anchors
+      displayName: Azure Spatial Anchors
+    - name: spatial-anchors-account
+      items:
+      - name: Summary
+        uid: az_spatial-anchors-account
+        displayName: az spatial-anchors-account
+      - name: key
+        uid: az_spatial-anchors-account_key
+        displayName: az spatial-anchors-account key
+        items: []
+  - name: Azure Spring Cloud
     items:
-    - name: Overview
-      uid: ext_spring-cloud_az
+    - name: Summary
+      uid: sp-Azure_Spring_Cloud
+      displayName: Azure Spring Cloud
     - name: spring-cloud
-      displayName: az spring-cloud
       items:
-      - name: Overview
-        uid: ext_spring-cloud_az_spring_cloud
+      - name: Summary
+        uid: az_spring-cloud
         displayName: az spring-cloud
-      - name: create
-        uid: ext_spring-cloud_az_spring_cloud_create
-        displayName: az spring-cloud create
-      - name: delete
-        uid: ext_spring-cloud_az_spring_cloud_delete
-        displayName: az spring-cloud delete
-      - name: list
-        uid: ext_spring-cloud_az_spring_cloud_list
-        displayName: az spring-cloud list
-      - name: show
-        uid: ext_spring-cloud_az_spring_cloud_show
-        displayName: az spring-cloud show
-      - name: update
-        uid: ext_spring-cloud_az_spring_cloud_update
-        displayName: az spring-cloud update
       - name: app
-        displayName: az spring-cloud app
         items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_app
+        - name: Summary
+          uid: az_spring-cloud_app
           displayName: az spring-cloud app
-        - name: create
-          uid: ext_spring-cloud_az_spring_cloud_app_create
-          displayName: az spring-cloud app create
-        - name: delete
-          uid: ext_spring-cloud_az_spring_cloud_app_delete
-          displayName: az spring-cloud app delete
-        - name: deploy
-          uid: ext_spring-cloud_az_spring_cloud_app_deploy
-          displayName: az spring-cloud app deploy
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_app_list
-          displayName: az spring-cloud app list
-        - name: logs
-          uid: ext_spring-cloud_az_spring_cloud_app_logs
-          displayName: az spring-cloud app logs
-        - name: restart
-          uid: ext_spring-cloud_az_spring_cloud_app_restart
-          displayName: az spring-cloud app restart
-        - name: scale
-          uid: ext_spring-cloud_az_spring_cloud_app_scale
-          displayName: az spring-cloud app scale
-        - name: set-deployment
-          uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-          displayName: az spring-cloud app set-deployment
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_app_show
-          displayName: az spring-cloud app show
-        - name: show-deploy-log
-          uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-          displayName: az spring-cloud app show-deploy-log
-        - name: start
-          uid: ext_spring-cloud_az_spring_cloud_app_start
-          displayName: az spring-cloud app start
-        - name: stop
-          uid: ext_spring-cloud_az_spring_cloud_app_stop
-          displayName: az spring-cloud app stop
-        - name: update
-          uid: ext_spring-cloud_az_spring_cloud_app_update
-          displayName: az spring-cloud app update
         - name: binding
-          displayName: az spring-cloud app binding
           items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_binding
+          - name: Summary
+            uid: az_spring-cloud_app_binding
             displayName: az spring-cloud app binding
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-            displayName: az spring-cloud app binding list
-          - name: remove
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-            displayName: az spring-cloud app binding remove
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-            displayName: az spring-cloud app binding show
           - name: cosmos
+            uid: az_spring-cloud_app_binding_cosmos
             displayName: az spring-cloud app binding cosmos
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-              displayName: az spring-cloud app binding cosmos
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-              displayName: az spring-cloud app binding cosmos add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-              displayName: az spring-cloud app binding cosmos update
+            items: []
           - name: mysql
+            uid: az_spring-cloud_app_binding_mysql
             displayName: az spring-cloud app binding mysql
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-              displayName: az spring-cloud app binding mysql
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-              displayName: az spring-cloud app binding mysql add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-              displayName: az spring-cloud app binding mysql update
+            items: []
           - name: redis
+            uid: az_spring-cloud_app_binding_redis
             displayName: az spring-cloud app binding redis
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-              displayName: az spring-cloud app binding redis
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-              displayName: az spring-cloud app binding redis add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-              displayName: az spring-cloud app binding redis update
+            items: []
         - name: custom-domain
+          uid: az_spring-cloud_app_custom-domain
           displayName: az spring-cloud app custom-domain
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-            displayName: az spring-cloud app custom-domain
-          - name: bind
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-            displayName: az spring-cloud app custom-domain bind
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-            displayName: az spring-cloud app custom-domain list
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-            displayName: az spring-cloud app custom-domain show
-          - name: unbind
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-            displayName: az spring-cloud app custom-domain unbind
-          - name: update
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-            displayName: az spring-cloud app custom-domain update
+          items: []
         - name: deployment
+          uid: az_spring-cloud_app_deployment
           displayName: az spring-cloud app deployment
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment
-            displayName: az spring-cloud app deployment
-          - name: create
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-            displayName: az spring-cloud app deployment create
-          - name: delete
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-            displayName: az spring-cloud app deployment delete
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-            displayName: az spring-cloud app deployment list
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-            displayName: az spring-cloud app deployment show
+          items: []
         - name: identity
+          uid: az_spring-cloud_app_identity
           displayName: az spring-cloud app identity
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_identity
-            displayName: az spring-cloud app identity
-          - name: assign
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-            displayName: az spring-cloud app identity assign
-          - name: remove
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-            displayName: az spring-cloud app identity remove
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-            displayName: az spring-cloud app identity show
+          items: []
         - name: log
+          uid: az_spring-cloud_app_log
           displayName: az spring-cloud app log
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_log
-            displayName: az spring-cloud app log
-          - name: tail
-            uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-            displayName: az spring-cloud app log tail
+          items: []
+      - name: app-insights
+        uid: az_spring-cloud_app-insights
+        displayName: az spring-cloud app-insights
+        items: []
       - name: certificate
+        uid: az_spring-cloud_certificate
         displayName: az spring-cloud certificate
-        items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_certificate
-          displayName: az spring-cloud certificate
-        - name: add
-          uid: ext_spring-cloud_az_spring_cloud_certificate_add
-          displayName: az spring-cloud certificate add
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_certificate_list
-          displayName: az spring-cloud certificate list
-        - name: remove
-          uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-          displayName: az spring-cloud certificate remove
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_certificate_show
-          displayName: az spring-cloud certificate show
+        items: []
       - name: config-server
-        displayName: az spring-cloud config-server
         items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_config_server
+        - name: Summary
+          uid: az_spring-cloud_config-server
           displayName: az spring-cloud config-server
-        - name: clear
-          uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-          displayName: az spring-cloud config-server clear
-        - name: set
-          uid: ext_spring-cloud_az_spring_cloud_config_server_set
-          displayName: az spring-cloud config-server set
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_config_server_show
-          displayName: az spring-cloud config-server show
         - name: git
-          displayName: az spring-cloud config-server git
           items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_config_server_git
+          - name: Summary
+            uid: az_spring-cloud_config-server_git
             displayName: az spring-cloud config-server git
-          - name: set
-            uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-            displayName: az spring-cloud config-server git set
           - name: repo
+            uid: az_spring-cloud_config-server_git_repo
             displayName: az spring-cloud config-server git repo
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-              displayName: az spring-cloud config-server git repo
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-              displayName: az spring-cloud config-server git repo add
-            - name: list
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-              displayName: az spring-cloud config-server git repo list
-            - name: remove
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-              displayName: az spring-cloud config-server git repo remove
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-              displayName: az spring-cloud config-server git repo update
+            items: []
       - name: test-endpoint
+        uid: az_spring-cloud_test-endpoint
         displayName: az spring-cloud test-endpoint
-        items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-          displayName: az spring-cloud test-endpoint
-        - name: disable
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-          displayName: az spring-cloud test-endpoint disable
-        - name: enable
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-          displayName: az spring-cloud test-endpoint enable
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-          displayName: az spring-cloud test-endpoint list
-        - name: renew-key
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-          displayName: az spring-cloud test-endpoint renew-key
-  - name: storage-or-preview
+        items: []
+  - name: Azure SQL
     items:
-    - name: Overview
-      uid: ext_storage-or-preview_az
-    - name: Storage
-      displayName: az storage
-      items:
-      - name: Overview
-        uid: ext_storage-or-preview_az_storage
-        displayName: az storage
-      - name: Accounts
-        displayName: az storage account
-        items:
-        - name: Overview
-          uid: ext_storage-or-preview_az_storage_account
-          displayName: az storage account
-        - name: or-policy
-          displayName: az storage account or-policy
-          items:
-          - name: Overview
-            uid: ext_storage-or-preview_az_storage_account_or_policy
-            displayName: az storage account or-policy
-          - name: create
-            uid: ext_storage-or-preview_az_storage_account_or_policy_create
-            displayName: az storage account or-policy create
-          - name: delete
-            uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-            displayName: az storage account or-policy delete
-          - name: list
-            uid: ext_storage-or-preview_az_storage_account_or_policy_list
-            displayName: az storage account or-policy list
-          - name: show
-            uid: ext_storage-or-preview_az_storage_account_or_policy_show
-            displayName: az storage account or-policy show
-          - name: update
-            uid: ext_storage-or-preview_az_storage_account_or_policy_update
-            displayName: az storage account or-policy update
-          - name: rule
-            displayName: az storage account or-policy rule
-            items:
-            - name: Overview
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-              displayName: az storage account or-policy rule
-            - name: add
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-              displayName: az storage account or-policy rule add
-            - name: list
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-              displayName: az storage account or-policy rule list
-            - name: remove
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-              displayName: az storage account or-policy rule remove
-            - name: show
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-              displayName: az storage account or-policy rule show
-            - name: update
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-              displayName: az storage account or-policy rule update
-  - name: storage-preview
+    - name: Summary
+      uid: sp-Azure_SQL
+      displayName: Azure SQL
+    - name: sql
+      uid: az_sql
+      displayName: az sql
+      items: []
+  - name: Azure SQL Server
+    items:
+    - name: Summary
+      uid: sp-Azure_SQL_Server
+      displayName: Azure SQL Server
+    - name: sql
+      uid: az_sql
+      displayName: az sql
+      items: []
+  - name: Azure Stack Edge
+    uid: sp-Azure_Stack_Edge
+    displayName: Azure Stack Edge
+    items: []
+  - name: Azure Stack HCI
+    items:
+    - name: Summary
+      uid: sp-Azure_Stack_HCI
+      displayName: Azure Stack HCI
+    - name: stack-hci
+      items:
+      - name: Summary
+        uid: az_stack-hci
+        displayName: az stack-hci
+      - name: cluster
+        uid: az_stack-hci_cluster
+        displayName: az stack-hci cluster
+        items: []
+  - name: Azure Storage
     items:
-    - name: Overview
-      uid: ext_storage-preview_az
-    - name: Storage
-      displayName: az storage
+    - name: Summary
+      uid: sp-Azure_Storage
+      displayName: Azure Storage
+    - name: import-export
+      items:
+      - name: Summary
+        uid: az_import-export
+        displayName: az import-export
+      - name: bit-locker-key
+        uid: az_import-export_bit-locker-key
+        displayName: az import-export bit-locker-key
+        items: []
+      - name: location
+        uid: az_import-export_location
+        displayName: az import-export location
+        items: []
+    - name: snapshot
+      uid: az_snapshot
+      displayName: az snapshot
+      items: []
+    - name: storage
       items:
-      - name: Overview
-        uid: ext_storage-preview_az_storage
+      - name: Summary
+        uid: az_storage
         displayName: az storage
-      - name: Accounts
-        displayName: az storage account
+      - name: account
         items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_account
+        - name: Summary
+          uid: az_storage_account
           displayName: az storage account
-        - name: check-name
-          uid: ext_storage-preview_az_storage_account_check_name
-          displayName: az storage account check-name
-        - name: create
-          uid: ext_storage-preview_az_storage_account_create
-          displayName: az storage account create
-        - name: delete
-          uid: ext_storage-preview_az_storage_account_delete
-          displayName: az storage account delete
-        - name: failover
-          uid: ext_storage-preview_az_storage_account_failover
-          displayName: az storage account failover
-        - name: list
-          uid: ext_storage-preview_az_storage_account_list
-          displayName: az storage account list
-        - name: show
-          uid: ext_storage-preview_az_storage_account_show
-          displayName: az storage account show
-        - name: show-usage
-          uid: ext_storage-preview_az_storage_account_show_usage
-          displayName: az storage account show-usage
-        - name: update
-          uid: ext_storage-preview_az_storage_account_update
-          displayName: az storage account update
-        - name: Keys
+        - name: blob-inventory-policy
+          uid: az_storage_account_blob-inventory-policy
+          displayName: az storage account blob-inventory-policy
+          items: []
+        - name: blob-service-properties
+          uid: az_storage_account_blob-service-properties
+          displayName: az storage account blob-service-properties
+          items: []
+        - name: file-service-properties
+          uid: az_storage_account_file-service-properties
+          displayName: az storage account file-service-properties
+          items: []
+        - name: keys
+          uid: az_storage_account_keys
           displayName: az storage account keys
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_keys
-            displayName: az storage account keys
-          - name: list
-            uid: ext_storage-preview_az_storage_account_keys_list
-            displayName: az storage account keys list
-          - name: renew
-            uid: ext_storage-preview_az_storage_account_keys_renew
-            displayName: az storage account keys renew
-        - name: management-policy
-          displayName: az storage account management-policy
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_management_policy
-            displayName: az storage account management-policy
-          - name: create
-            uid: ext_storage-preview_az_storage_account_management_policy_create
-            displayName: az storage account management-policy create
-          - name: delete
-            uid: ext_storage-preview_az_storage_account_management_policy_delete
-            displayName: az storage account management-policy delete
-          - name: show
-            uid: ext_storage-preview_az_storage_account_management_policy_show
-            displayName: az storage account management-policy show
-          - name: update
-            uid: ext_storage-preview_az_storage_account_management_policy_update
-            displayName: az storage account management-policy update
+          items: []
         - name: network-rule
+          uid: az_storage_account_network-rule
           displayName: az storage account network-rule
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_network_rule
-            displayName: az storage account network-rule
-          - name: add
-            uid: ext_storage-preview_az_storage_account_network_rule_add
-            displayName: az storage account network-rule add
-          - name: list
-            uid: ext_storage-preview_az_storage_account_network_rule_list
-            displayName: az storage account network-rule list
-          - name: remove
-            uid: ext_storage-preview_az_storage_account_network_rule_remove
-            displayName: az storage account network-rule remove
-      - name: Blob
-        displayName: az storage blob
+          items: []
+      - name: azcopy
+        items:
+        - name: Summary
+          uid: az_storage_azcopy
+          displayName: az storage azcopy
+        - name: blob
+          uid: az_storage_azcopy_blob
+          displayName: az storage azcopy blob
+          items: []
+      - name: blob
         items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_blob
+        - name: Summary
+          uid: az_storage_blob
           displayName: az storage blob
-        - name: list
-          uid: ext_storage-preview_az_storage_blob_list
-          displayName: az storage blob list
-        - name: move
-          uid: ext_storage-preview_az_storage_blob_move
-          displayName: az storage blob move
-        - name: Service properties
-          displayName: az storage blob service-properties
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_service_properties
-            displayName: az storage blob service-properties
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_service_properties_show
-            displayName: az storage blob service-properties show
-          - name: update
-            uid: ext_storage-preview_az_storage_blob_service_properties_update
-            displayName: az storage blob service-properties update
         - name: access
+          uid: az_storage_blob_access
           displayName: az storage blob access
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_access
-            displayName: az storage blob access
-          - name: set
-            uid: ext_storage-preview_az_storage_blob_access_set
-            displayName: az storage blob access set
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_access_show
-            displayName: az storage blob access show
-          - name: update
-            uid: ext_storage-preview_az_storage_blob_access_update
-            displayName: az storage blob access update
+          items: []
+        - name: copy
+          uid: az_storage_blob_copy
+          displayName: az storage blob copy
+          items: []
         - name: directory
-          displayName: az storage blob directory
           items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_directory
+          - name: Summary
+            uid: az_storage_blob_directory
             displayName: az storage blob directory
-          - name: create
-            uid: ext_storage-preview_az_storage_blob_directory_create
-            displayName: az storage blob directory create
-          - name: delete
-            uid: ext_storage-preview_az_storage_blob_directory_delete
-            displayName: az storage blob directory delete
-          - name: download
-            uid: ext_storage-preview_az_storage_blob_directory_download
-            displayName: az storage blob directory download
-          - name: exists
-            uid: ext_storage-preview_az_storage_blob_directory_exists
-            displayName: az storage blob directory exists
-          - name: list
-            uid: ext_storage-preview_az_storage_blob_directory_list
-            displayName: az storage blob directory list
-          - name: move
-            uid: ext_storage-preview_az_storage_blob_directory_move
-            displayName: az storage blob directory move
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_directory_show
-            displayName: az storage blob directory show
-          - name: upload
-            uid: ext_storage-preview_az_storage_blob_directory_upload
-            displayName: az storage blob directory upload
           - name: access
+            uid: az_storage_blob_directory_access
             displayName: az storage blob directory access
-            items:
-            - name: Overview
-              uid: ext_storage-preview_az_storage_blob_directory_access
-              displayName: az storage blob directory access
-            - name: set
-              uid: ext_storage-preview_az_storage_blob_directory_access_set
-              displayName: az storage blob directory access set
-            - name: show
-              uid: ext_storage-preview_az_storage_blob_directory_access_show
-              displayName: az storage blob directory access show
-            - name: update
-              uid: ext_storage-preview_az_storage_blob_directory_access_update
-              displayName: az storage blob directory access update
+            items: []
           - name: metadata
+            uid: az_storage_blob_directory_metadata
             displayName: az storage blob directory metadata
-            items:
-            - name: Overview
-              uid: ext_storage-preview_az_storage_blob_directory_metadata
-              displayName: az storage blob directory metadata
-            - name: show
-              uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-              displayName: az storage blob directory metadata show
-            - name: update
-              uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-              displayName: az storage blob directory metadata update
-      - name: azcopy
-        displayName: az storage azcopy
-        items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_azcopy
-          displayName: az storage azcopy
-        - name: run-command
-          uid: ext_storage-preview_az_storage_azcopy_run_command
-          displayName: az storage azcopy run-command
-        - name: blob
-          displayName: az storage azcopy blob
+            items: []
+        - name: incremental-copy
+          uid: az_storage_blob_incremental-copy
+          displayName: az storage blob incremental-copy
+          items: []
+        - name: lease
+          uid: az_storage_blob_lease
+          displayName: az storage blob lease
+          items: []
+        - name: metadata
+          uid: az_storage_blob_metadata
+          displayName: az storage blob metadata
+          items: []
+        - name: service-properties
           items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_azcopy_blob
-            displayName: az storage azcopy blob
-          - name: delete
-            uid: ext_storage-preview_az_storage_azcopy_blob_delete
-            displayName: az storage azcopy blob delete
-          - name: download
-            uid: ext_storage-preview_az_storage_azcopy_blob_download
-            displayName: az storage azcopy blob download
-          - name: sync
-            uid: ext_storage-preview_az_storage_azcopy_blob_sync
-            displayName: az storage azcopy blob sync
-          - name: upload
-            uid: ext_storage-preview_az_storage_azcopy_blob_upload
-            displayName: az storage azcopy blob upload
-  - name: storagesync
-    items:
-    - name: Overview
-      uid: ext_storagesync_az
-    - name: storagesync
-      displayName: az storagesync
-      items:
-      - name: Overview
-        uid: ext_storagesync_az_storagesync
-        displayName: az storagesync
-      - name: create
-        uid: ext_storagesync_az_storagesync_create
-        displayName: az storagesync create
-      - name: delete
-        uid: ext_storagesync_az_storagesync_delete
-        displayName: az storagesync delete
-      - name: list
-        uid: ext_storagesync_az_storagesync_list
-        displayName: az storagesync list
-      - name: show
-        uid: ext_storagesync_az_storagesync_show
-        displayName: az storagesync show
-      - name: registered-server
-        displayName: az storagesync registered-server
+          - name: Summary
+            uid: az_storage_blob_service-properties
+            displayName: az storage blob service-properties
+          - name: delete-policy
+            uid: az_storage_blob_service-properties_delete-policy
+            displayName: az storage blob service-properties delete-policy
+            items: []
+        - name: tag
+          uid: az_storage_blob_tag
+          displayName: az storage blob tag
+          items: []
+      - name: container
+        items:
+        - name: Summary
+          uid: az_storage_container
+          displayName: az storage container
+        - name: lease
+          uid: az_storage_container_lease
+          displayName: az storage container lease
+          items: []
+        - name: metadata
+          uid: az_storage_container_metadata
+          displayName: az storage container metadata
+          items: []
+        - name: policy
+          uid: az_storage_container_policy
+          displayName: az storage container policy
+          items: []
+      - name: storage cors - Cross-origin resource sharing
+        uid: az_storage_cors
+        displayName: az storage cors
+        items: []
+      - name: directory
+        items:
+        - name: Summary
+          uid: az_storage_directory
+          displayName: az storage directory
+        - name: metadata
+          uid: az_storage_directory_metadata
+          displayName: az storage directory metadata
+          items: []
+      - name: entity
+        uid: az_storage_entity
+        displayName: az storage entity
+        items: []
+      - name: file
+        items:
+        - name: Summary
+          uid: az_storage_file
+          displayName: az storage file
+        - name: copy
+          uid: az_storage_file_copy
+          displayName: az storage file copy
+          items: []
+        - name: metadata
+          uid: az_storage_file_metadata
+          displayName: az storage file metadata
+          items: []
+      - name: fs
+        items:
+        - name: Summary
+          uid: az_storage_fs
+          displayName: az storage fs
+        - name: service-properties
+          uid: az_storage_fs_service-properties
+          displayName: az storage fs service-properties
+          items: []
+      - name: logging
+        uid: az_storage_logging
+        displayName: az storage logging
+        items: []
+      - name: message
+        uid: az_storage_message
+        displayName: az storage message
+        items: []
+      - name: metrics
+        uid: az_storage_metrics
+        displayName: az storage metrics
+        items: []
+      - name: queue
         items:
-        - name: Overview
-          uid: ext_storagesync_az_storagesync_registered_server
-          displayName: az storagesync registered-server
-        - name: delete
-          uid: ext_storagesync_az_storagesync_registered_server_delete
-          displayName: az storagesync registered-server delete
-        - name: list
-          uid: ext_storagesync_az_storagesync_registered_server_list
-          displayName: az storagesync registered-server list
-        - name: show
-          uid: ext_storagesync_az_storagesync_registered_server_show
-          displayName: az storagesync registered-server show
-        - name: wait
-          uid: ext_storagesync_az_storagesync_registered_server_wait
-          displayName: az storagesync registered-server wait
-      - name: sync-group
-        displayName: az storagesync sync-group
+        - name: Summary
+          uid: az_storage_queue
+          displayName: az storage queue
+        - name: metadata
+          uid: az_storage_queue_metadata
+          displayName: az storage queue metadata
+          items: []
+        - name: policy
+          uid: az_storage_queue_policy
+          displayName: az storage queue policy
+          items: []
+      - name: share
         items:
-        - name: Overview
-          uid: ext_storagesync_az_storagesync_sync_group
-          displayName: az storagesync sync-group
-        - name: create
-          uid: ext_storagesync_az_storagesync_sync_group_create
-          displayName: az storagesync sync-group create
-        - name: delete
-          uid: ext_storagesync_az_storagesync_sync_group_delete
-          displayName: az storagesync sync-group delete
-        - name: list
-          uid: ext_storagesync_az_storagesync_sync_group_list
-          displayName: az storagesync sync-group list
-        - name: show
-          uid: ext_storagesync_az_storagesync_sync_group_show
-          displayName: az storagesync sync-group show
-        - name: cloud-endpoint
-          displayName: az storagesync sync-group cloud-endpoint
-          items:
-          - name: Overview
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-            displayName: az storagesync sync-group cloud-endpoint
-          - name: create
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-            displayName: az storagesync sync-group cloud-endpoint create
-          - name: delete
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-            displayName: az storagesync sync-group cloud-endpoint delete
-          - name: list
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-            displayName: az storagesync sync-group cloud-endpoint list
-          - name: show
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-            displayName: az storagesync sync-group cloud-endpoint show
-          - name: wait
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-            displayName: az storagesync sync-group cloud-endpoint wait
-        - name: server-endpoint
-          displayName: az storagesync sync-group server-endpoint
-          items:
-          - name: Overview
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-            displayName: az storagesync sync-group server-endpoint
-          - name: create
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-            displayName: az storagesync sync-group server-endpoint create
-          - name: delete
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-            displayName: az storagesync sync-group server-endpoint delete
-          - name: list
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-            displayName: az storagesync sync-group server-endpoint list
-          - name: show
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-            displayName: az storagesync sync-group server-endpoint show
-          - name: update
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-            displayName: az storagesync sync-group server-endpoint update
-          - name: wait
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-            displayName: az storagesync sync-group server-endpoint wait
-  - name: stream-analytics
+        - name: Summary
+          uid: az_storage_share
+          displayName: az storage share
+        - name: metadata
+          uid: az_storage_share_metadata
+          displayName: az storage share metadata
+          items: []
+        - name: policy
+          uid: az_storage_share_policy
+          displayName: az storage share policy
+          items: []
+      - name: table
+        items:
+        - name: Summary
+          uid: az_storage_table
+          displayName: az storage table
+        - name: policy
+          uid: az_storage_table_policy
+          displayName: az storage table policy
+          items: []
+  - name: Azure Stream Analytics
     items:
-    - name: Overview
-      uid: ext_stream-analytics_az
+    - name: Summary
+      uid: sp-Azure_Stream_Analytics
+      displayName: Azure Stream Analytics
     - name: stream-analytics
-      displayName: az stream-analytics
       items:
-      - name: Overview
-        uid: ext_stream-analytics_az_stream_analytics
+      - name: Summary
+        uid: az_stream-analytics
         displayName: az stream-analytics
       - name: function
+        uid: az_stream-analytics_function
         displayName: az stream-analytics function
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_function
-          displayName: az stream-analytics function
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_function_create
-          displayName: az stream-analytics function create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_function_delete
-          displayName: az stream-analytics function delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_function_list
-          displayName: az stream-analytics function list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_function_show
-          displayName: az stream-analytics function show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_function_test
-          displayName: az stream-analytics function test
+        items: []
       - name: input
+        uid: az_stream-analytics_input
         displayName: az stream-analytics input
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_input
-          displayName: az stream-analytics input
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_input_create
-          displayName: az stream-analytics input create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_input_delete
-          displayName: az stream-analytics input delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_input_list
-          displayName: az stream-analytics input list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_input_show
-          displayName: az stream-analytics input show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_input_test
-          displayName: az stream-analytics input test
+        items: []
       - name: job
+        uid: az_stream-analytics_job
         displayName: az stream-analytics job
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_job
-          displayName: az stream-analytics job
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_job_create
-          displayName: az stream-analytics job create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_job_delete
-          displayName: az stream-analytics job delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_job_list
-          displayName: az stream-analytics job list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_job_show
-          displayName: az stream-analytics job show
-        - name: start
-          uid: ext_stream-analytics_az_stream_analytics_job_start
-          displayName: az stream-analytics job start
-        - name: stop
-          uid: ext_stream-analytics_az_stream_analytics_job_stop
-          displayName: az stream-analytics job stop
-        - name: update
-          uid: ext_stream-analytics_az_stream_analytics_job_update
-          displayName: az stream-analytics job update
-        - name: wait
-          uid: ext_stream-analytics_az_stream_analytics_job_wait
-          displayName: az stream-analytics job wait
+        items: []
       - name: output
+        uid: az_stream-analytics_output
         displayName: az stream-analytics output
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_output
-          displayName: az stream-analytics output
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_output_create
-          displayName: az stream-analytics output create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_output_delete
-          displayName: az stream-analytics output delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_output_list
-          displayName: az stream-analytics output list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_output_show
-          displayName: az stream-analytics output show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_output_test
-          displayName: az stream-analytics output test
+        items: []
       - name: quota
+        uid: az_stream-analytics_quota
         displayName: az stream-analytics quota
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_quota
-          displayName: az stream-analytics quota
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_quota_show
-          displayName: az stream-analytics quota show
+        items: []
       - name: transformation
+        uid: az_stream-analytics_transformation
         displayName: az stream-analytics transformation
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_transformation
-          displayName: az stream-analytics transformation
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_transformation_create
-          displayName: az stream-analytics transformation create
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_transformation_show
-          displayName: az stream-analytics transformation show
-        - name: update
-          uid: ext_stream-analytics_az_stream_analytics_transformation_update
-          displayName: az stream-analytics transformation update
-  - name: subscription
-    items:
-    - name: Overview
-      uid: ext_subscription_az
-    - name: Subscriptions
-      displayName: az account
-      items:
-      - name: Overview
-        uid: ext_subscription_az_account
-        displayName: az account
-      - name: create
-        uid: ext_subscription_az_account_create
-        displayName: az account create
-  - name: support
+        items: []
+  - name: Azure Support
     items:
-    - name: Overview
-      uid: ext_support_az
+    - name: Summary
+      uid: sp-Azure_Support
+      displayName: Azure Support
     - name: support
-      displayName: az support
       items:
-      - name: Overview
-        uid: ext_support_az_support
+      - name: Summary
+        uid: az_support
         displayName: az support
       - name: services
-        displayName: az support services
         items:
-        - name: Overview
-          uid: ext_support_az_support_services
+        - name: Summary
+          uid: az_support_services
           displayName: az support services
-        - name: list
-          uid: ext_support_az_support_services_list
-          displayName: az support services list
-        - name: show
-          uid: ext_support_az_support_services_show
-          displayName: az support services show
         - name: problem-classifications
+          uid: az_support_services_problem-classifications
           displayName: az support services problem-classifications
-          items:
-          - name: Overview
-            uid: ext_support_az_support_services_problem_classifications
-            displayName: az support services problem-classifications
-          - name: list
-            uid: ext_support_az_support_services_problem_classifications_list
-            displayName: az support services problem-classifications list
-          - name: show
-            uid: ext_support_az_support_services_problem_classifications_show
-            displayName: az support services problem-classifications show
+          items: []
       - name: tickets
-        displayName: az support tickets
         items:
-        - name: Overview
-          uid: ext_support_az_support_tickets
+        - name: Summary
+          uid: az_support_tickets
           displayName: az support tickets
-        - name: create
-          uid: ext_support_az_support_tickets_create
-          displayName: az support tickets create
-        - name: list
-          uid: ext_support_az_support_tickets_list
-          displayName: az support tickets list
-        - name: show
-          uid: ext_support_az_support_tickets_show
-          displayName: az support tickets show
-        - name: update
-          uid: ext_support_az_support_tickets_update
-          displayName: az support tickets update
         - name: communications
+          uid: az_support_tickets_communications
           displayName: az support tickets communications
-          items:
-          - name: Overview
-            uid: ext_support_az_support_tickets_communications
-            displayName: az support tickets communications
-          - name: create
-            uid: ext_support_az_support_tickets_communications_create
-            displayName: az support tickets communications create
-          - name: list
-            uid: ext_support_az_support_tickets_communications_list
-            displayName: az support tickets communications list
-          - name: show
-            uid: ext_support_az_support_tickets_communications_show
-            displayName: az support tickets communications show
-  - name: synapse
+          items: []
+  - name: Azure Synapse Analytics
     items:
-    - name: Overview
-      uid: ext_synapse_az
+    - name: Summary
+      uid: sp-Azure_Synapse_Analytics
+      displayName: Azure Synapse Analytics
     - name: synapse
-      displayName: az synapse
       items:
-      - name: Overview
-        uid: ext_synapse_az_synapse
+      - name: Summary
+        uid: az_synapse
         displayName: az synapse
+      - name: activity-run
+        uid: az_synapse_activity-run
+        displayName: az synapse activity-run
+        items: []
+      - name: data-flow
+        uid: az_synapse_data-flow
+        displayName: az synapse data-flow
+        items: []
+      - name: dataset
+        uid: az_synapse_dataset
+        displayName: az synapse dataset
+        items: []
+      - name: integration-runtime
+        uid: az_synapse_integration-runtime
+        displayName: az synapse integration-runtime
+        items: []
+      - name: integration-runtime-node
+        uid: az_synapse_integration-runtime-node
+        displayName: az synapse integration-runtime-node
+        items: []
+      - name: linked-service
+        uid: az_synapse_linked-service
+        displayName: az synapse linked-service
+        items: []
+      - name: notebook
+        uid: az_synapse_notebook
+        displayName: az synapse notebook
+        items: []
+      - name: pipeline
+        uid: az_synapse_pipeline
+        displayName: az synapse pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_synapse_pipeline-run
+        displayName: az synapse pipeline-run
+        items: []
+      - name: role
+        items:
+        - name: Summary
+          uid: az_synapse_role
+          displayName: az synapse role
+        - name: assignment
+          uid: az_synapse_role_assignment
+          displayName: az synapse role assignment
+          items: []
+        - name: definition
+          uid: az_synapse_role_definition
+          displayName: az synapse role definition
+          items: []
+        - name: scope
+          uid: az_synapse_role_scope
+          displayName: az synapse role scope
+          items: []
       - name: spark
-        displayName: az synapse spark
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_spark
+        - name: Summary
+          uid: az_synapse_spark
           displayName: az synapse spark
         - name: job
+          uid: az_synapse_spark_job
           displayName: az synapse spark job
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_job
-            displayName: az synapse spark job
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_job_cancel
-            displayName: az synapse spark job cancel
-          - name: list
-            uid: ext_synapse_az_synapse_spark_job_list
-            displayName: az synapse spark job list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_job_show
-            displayName: az synapse spark job show
-          - name: submit
-            uid: ext_synapse_az_synapse_spark_job_submit
-            displayName: az synapse spark job submit
+          items: []
         - name: pool
+          uid: az_synapse_spark_pool
           displayName: az synapse spark pool
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_pool
-            displayName: az synapse spark pool
-          - name: create
-            uid: ext_synapse_az_synapse_spark_pool_create
-            displayName: az synapse spark pool create
-          - name: delete
-            uid: ext_synapse_az_synapse_spark_pool_delete
-            displayName: az synapse spark pool delete
-          - name: list
-            uid: ext_synapse_az_synapse_spark_pool_list
-            displayName: az synapse spark pool list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_pool_show
-            displayName: az synapse spark pool show
-          - name: update
-            uid: ext_synapse_az_synapse_spark_pool_update
-            displayName: az synapse spark pool update
-          - name: wait
-            uid: ext_synapse_az_synapse_spark_pool_wait
-            displayName: az synapse spark pool wait
+          items: []
         - name: session
+          uid: az_synapse_spark_session
           displayName: az synapse spark session
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_session
-            displayName: az synapse spark session
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_session_cancel
-            displayName: az synapse spark session cancel
-          - name: create
-            uid: ext_synapse_az_synapse_spark_session_create
-            displayName: az synapse spark session create
-          - name: list
-            uid: ext_synapse_az_synapse_spark_session_list
-            displayName: az synapse spark session list
-          - name: reset-timeout
-            uid: ext_synapse_az_synapse_spark_session_reset_timeout
-            displayName: az synapse spark session reset-timeout
-          - name: show
-            uid: ext_synapse_az_synapse_spark_session_show
-            displayName: az synapse spark session show
+          items: []
         - name: statement
+          uid: az_synapse_spark_statement
           displayName: az synapse spark statement
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_statement
-            displayName: az synapse spark statement
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_statement_cancel
-            displayName: az synapse spark statement cancel
-          - name: invoke
-            uid: ext_synapse_az_synapse_spark_statement_invoke
-            displayName: az synapse spark statement invoke
-          - name: list
-            uid: ext_synapse_az_synapse_spark_statement_list
-            displayName: az synapse spark statement list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_statement_show
-            displayName: az synapse spark statement show
+          items: []
       - name: sql
-        displayName: az synapse sql
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_sql
+        - name: Summary
+          uid: az_synapse_sql
           displayName: az synapse sql
+        - name: ad-admin
+          uid: az_synapse_sql_ad-admin
+          displayName: az synapse sql ad-admin
+          items: []
+        - name: audit-policy
+          uid: az_synapse_sql_audit-policy
+          displayName: az synapse sql audit-policy
+          items: []
         - name: pool
-          displayName: az synapse sql pool
           items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_sql_pool
+          - name: Summary
+            uid: az_synapse_sql_pool
             displayName: az synapse sql pool
-          - name: create
-            uid: ext_synapse_az_synapse_sql_pool_create
-            displayName: az synapse sql pool create
-          - name: delete
-            uid: ext_synapse_az_synapse_sql_pool_delete
-            displayName: az synapse sql pool delete
-          - name: list
-            uid: ext_synapse_az_synapse_sql_pool_list
-            displayName: az synapse sql pool list
-          - name: pause
-            uid: ext_synapse_az_synapse_sql_pool_pause
-            displayName: az synapse sql pool pause
-          - name: resume
-            uid: ext_synapse_az_synapse_sql_pool_resume
-            displayName: az synapse sql pool resume
-          - name: show
-            uid: ext_synapse_az_synapse_sql_pool_show
-            displayName: az synapse sql pool show
-          - name: update
-            uid: ext_synapse_az_synapse_sql_pool_update
-            displayName: az synapse sql pool update
-          - name: wait
-            uid: ext_synapse_az_synapse_sql_pool_wait
-            displayName: az synapse sql pool wait
+          - name: audit-policy
+            uid: az_synapse_sql_pool_audit-policy
+            displayName: az synapse sql pool audit-policy
+            items: []
+          - name: classification
+            items:
+            - name: Summary
+              uid: az_synapse_sql_pool_classification
+              displayName: az synapse sql pool classification
+            - name: recommendation
+              uid: az_synapse_sql_pool_classification_recommendation
+              displayName: az synapse sql pool classification recommendation
+              items: []
+          - name: tde
+            uid: az_synapse_sql_pool_tde
+            displayName: az synapse sql pool tde
+            items: []
+          - name: threat-policy
+            uid: az_synapse_sql_pool_threat-policy
+            displayName: az synapse sql pool threat-policy
+            items: []
+      - name: trigger
+        uid: az_synapse_trigger
+        displayName: az synapse trigger
+        items: []
+      - name: trigger-run
+        uid: az_synapse_trigger-run
+        displayName: az synapse trigger-run
+        items: []
       - name: workspace
-        displayName: az synapse workspace
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_workspace
+        - name: Summary
+          uid: az_synapse_workspace
           displayName: az synapse workspace
-        - name: check-name
-          uid: ext_synapse_az_synapse_workspace_check_name
-          displayName: az synapse workspace check-name
-        - name: create
-          uid: ext_synapse_az_synapse_workspace_create
-          displayName: az synapse workspace create
-        - name: delete
-          uid: ext_synapse_az_synapse_workspace_delete
-          displayName: az synapse workspace delete
-        - name: list
-          uid: ext_synapse_az_synapse_workspace_list
-          displayName: az synapse workspace list
-        - name: show
-          uid: ext_synapse_az_synapse_workspace_show
-          displayName: az synapse workspace show
-        - name: update
-          uid: ext_synapse_az_synapse_workspace_update
-          displayName: az synapse workspace update
-        - name: wait
-          uid: ext_synapse_az_synapse_workspace_wait
-          displayName: az synapse workspace wait
         - name: firewall-rule
+          uid: az_synapse_workspace_firewall-rule
           displayName: az synapse workspace firewall-rule
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_workspace_firewall_rule
-            displayName: az synapse workspace firewall-rule
-          - name: create
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-            displayName: az synapse workspace firewall-rule create
-          - name: delete
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-            displayName: az synapse workspace firewall-rule delete
-          - name: list
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-            displayName: az synapse workspace firewall-rule list
-          - name: show
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-            displayName: az synapse workspace firewall-rule show
-          - name: wait
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-            displayName: az synapse workspace firewall-rule wait
-  - name: timeseriesinsights
+          items: []
+        - name: key
+          uid: az_synapse_workspace_key
+          displayName: az synapse workspace key
+          items: []
+        - name: managed-identity
+          uid: az_synapse_workspace_managed-identity
+          displayName: az synapse workspace managed-identity
+          items: []
+  - name: Azure Time Series Insights
     items:
-    - name: Overview
-      uid: ext_timeseriesinsights_az
-    - name: timeseriesinsights
-      displayName: az timeseriesinsights
-      items:
-      - name: Overview
-        uid: ext_timeseriesinsights_az_timeseriesinsights
-        displayName: az timeseriesinsights
+    - name: Summary
+      uid: sp-Azure_Time_Series_Insights
+      displayName: Azure Time Series Insights
+    - name: tsi
+      items:
+      - name: Summary
+        uid: az_tsi
+        displayName: az tsi
       - name: access-policy
-        displayName: az timeseriesinsights access-policy
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-          displayName: az timeseriesinsights access-policy
-        - name: create
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-          displayName: az timeseriesinsights access-policy create
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-          displayName: az timeseriesinsights access-policy delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-          displayName: az timeseriesinsights access-policy list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-          displayName: az timeseriesinsights access-policy show
-        - name: update
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-          displayName: az timeseriesinsights access-policy update
+        uid: az_tsi_access-policy
+        displayName: az tsi access-policy
+        items: []
       - name: environment
-        displayName: az timeseriesinsights environment
         items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-          displayName: az timeseriesinsights environment
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-          displayName: az timeseriesinsights environment delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-          displayName: az timeseriesinsights environment list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-          displayName: az timeseriesinsights environment show
-        - name: longterm
-          displayName: az timeseriesinsights environment longterm
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-            displayName: az timeseriesinsights environment longterm
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-            displayName: az timeseriesinsights environment longterm create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-            displayName: az timeseriesinsights environment longterm update
-        - name: standard
-          displayName: az timeseriesinsights environment standard
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-            displayName: az timeseriesinsights environment standard
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-            displayName: az timeseriesinsights environment standard create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-            displayName: az timeseriesinsights environment standard update
+        - name: Summary
+          uid: az_tsi_environment
+          displayName: az tsi environment
+        - name: gen1
+          uid: az_tsi_environment_gen1
+          displayName: az tsi environment gen1
+          items: []
+        - name: gen2
+          uid: az_tsi_environment_gen2
+          displayName: az tsi environment gen2
+          items: []
       - name: event-source
-        displayName: az timeseriesinsights event-source
         items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-          displayName: az timeseriesinsights event-source
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-          displayName: az timeseriesinsights event-source delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-          displayName: az timeseriesinsights event-source list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-          displayName: az timeseriesinsights event-source show
+        - name: Summary
+          uid: az_tsi_event-source
+          displayName: az tsi event-source
         - name: eventhub
-          displayName: az timeseriesinsights event-source eventhub
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-            displayName: az timeseriesinsights event-source eventhub
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-            displayName: az timeseriesinsights event-source eventhub create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-            displayName: az timeseriesinsights event-source eventhub update
+          uid: az_tsi_event-source_eventhub
+          displayName: az tsi event-source eventhub
+          items: []
         - name: iothub
-          displayName: az timeseriesinsights event-source iothub
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-            displayName: az timeseriesinsights event-source iothub
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-            displayName: az timeseriesinsights event-source iothub create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-            displayName: az timeseriesinsights event-source iothub update
+          uid: az_tsi_event-source_iothub
+          displayName: az tsi event-source iothub
+          items: []
       - name: reference-data-set
-        displayName: az timeseriesinsights reference-data-set
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-          displayName: az timeseriesinsights reference-data-set
-        - name: create
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-          displayName: az timeseriesinsights reference-data-set create
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-          displayName: az timeseriesinsights reference-data-set delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-          displayName: az timeseriesinsights reference-data-set list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-          displayName: az timeseriesinsights reference-data-set show
-        - name: update
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-          displayName: az timeseriesinsights reference-data-set update
-  - name: virtual-network-tap
+        uid: az_tsi_reference-data-set
+        displayName: az tsi reference-data-set
+        items: []
+  - name: Azure Virtual Machine scale sets
     items:
-    - name: Overview
-      uid: ext_virtual-network-tap_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_virtual-network-tap_az_network
-        displayName: az network
-      - name: Network interfaces
-        displayName: az network nic
-        items:
-        - name: Overview
-          uid: ext_virtual-network-tap_az_network_nic
-          displayName: az network nic
-        - name: vtap-config
-          displayName: az network nic vtap-config
-          items:
-          - name: Overview
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config
-            displayName: az network nic vtap-config
-          - name: create
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-            displayName: az network nic vtap-config create
-          - name: delete
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-            displayName: az network nic vtap-config delete
-          - name: list
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-            displayName: az network nic vtap-config list
-          - name: show
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-            displayName: az network nic vtap-config show
-      - name: Virtual Network
-        displayName: az network vnet
+    - name: Summary
+      uid: sp-Azure_Virtual_Machine_scale_sets
+      displayName: Azure Virtual Machine scale sets
+    - name: vmss - VM Scale Sets
+      items:
+      - name: Summary
+        uid: az_vmss
+        displayName: az vmss
+      - name: diagnostics
+        uid: az_vmss_diagnostics
+        displayName: az vmss diagnostics
+        items: []
+      - name: disk
+        uid: az_vmss_disk
+        displayName: az vmss disk
+        items: []
+      - name: encryption
+        uid: az_vmss_encryption
+        displayName: az vmss encryption
+        items: []
+      - name: extension
         items:
-        - name: Overview
-          uid: ext_virtual-network-tap_az_network_vnet
-          displayName: az network vnet
-        - name: tap
-          displayName: az network vnet tap
-          items:
-          - name: Overview
-            uid: ext_virtual-network-tap_az_network_vnet_tap
-            displayName: az network vnet tap
-          - name: create
-            uid: ext_virtual-network-tap_az_network_vnet_tap_create
-            displayName: az network vnet tap create
-          - name: delete
-            uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-            displayName: az network vnet tap delete
-          - name: list
-            uid: ext_virtual-network-tap_az_network_vnet_tap_list
-            displayName: az network vnet tap list
-          - name: show
-            uid: ext_virtual-network-tap_az_network_vnet_tap_show
-            displayName: az network vnet tap show
-          - name: update
-            uid: ext_virtual-network-tap_az_network_vnet_tap_update
-            displayName: az network vnet tap update
-  - name: virtual-wan
+        - name: Summary
+          uid: az_vmss_extension
+          displayName: az vmss extension
+        - name: image
+          uid: az_vmss_extension_image
+          displayName: az vmss extension image
+          items: []
+      - name: identity
+        uid: az_vmss_identity
+        displayName: az vmss identity
+        items: []
+      - name: nic
+        uid: az_vmss_nic
+        displayName: az vmss nic
+        items: []
+      - name: rolling-upgrade
+        uid: az_vmss_rolling-upgrade
+        displayName: az vmss rolling-upgrade
+        items: []
+  - name: Azure Virtual Machines
     items:
-    - name: Overview
-      uid: ext_virtual-wan_az
-    - name: Networking
-      displayName: az network
+    - name: Summary
+      uid: sp-Azure_Virtual_Machines
+      displayName: Azure Virtual Machines
+    - name: desktopvirtualization
+      items:
+      - name: Summary
+        uid: az_desktopvirtualization
+        displayName: az desktopvirtualization
+      - name: applicationgroup
+        uid: az_desktopvirtualization_applicationgroup
+        displayName: az desktopvirtualization applicationgroup
+        items: []
+      - name: hostpool
+        uid: az_desktopvirtualization_hostpool
+        displayName: az desktopvirtualization hostpool
+        items: []
+      - name: workspace
+        uid: az_desktopvirtualization_workspace
+        displayName: az desktopvirtualization workspace
+        items: []
+    - name: image - VM Images
       items:
-      - name: Overview
-        uid: ext_virtual-wan_az_network
-        displayName: az network
-      - name: vhub
-        displayName: az network vhub
+      - name: Summary
+        uid: az_image
+        displayName: az image
+      - name: builder
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vhub
-          displayName: az network vhub
-        - name: create
-          uid: ext_virtual-wan_az_network_vhub_create
-          displayName: az network vhub create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vhub_delete
-          displayName: az network vhub delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vhub_list
-          displayName: az network vhub list
-        - name: show
-          uid: ext_virtual-wan_az_network_vhub_show
-          displayName: az network vhub show
-        - name: update
-          uid: ext_virtual-wan_az_network_vhub_update
-          displayName: az network vhub update
-        - name: connection
-          displayName: az network vhub connection
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_connection
-            displayName: az network vhub connection
-          - name: create
-            uid: ext_virtual-wan_az_network_vhub_connection_create
-            displayName: az network vhub connection create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vhub_connection_delete
-            displayName: az network vhub connection delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_connection_list
-            displayName: az network vhub connection list
-          - name: show
-            uid: ext_virtual-wan_az_network_vhub_connection_show
-            displayName: az network vhub connection show
-        - name: route
-          displayName: az network vhub route
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_route
-            displayName: az network vhub route
-          - name: add
-            uid: ext_virtual-wan_az_network_vhub_route_add
-            displayName: az network vhub route add
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_route_list
-            displayName: az network vhub route list
-          - name: remove
-            uid: ext_virtual-wan_az_network_vhub_route_remove
-            displayName: az network vhub route remove
-        - name: route-table
-          displayName: az network vhub route-table
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_route_table
-            displayName: az network vhub route-table
-          - name: create
-            uid: ext_virtual-wan_az_network_vhub_route_table_create
-            displayName: az network vhub route-table create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vhub_route_table_delete
-            displayName: az network vhub route-table delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_route_table_list
-            displayName: az network vhub route-table list
-          - name: show
-            uid: ext_virtual-wan_az_network_vhub_route_table_show
-            displayName: az network vhub route-table show
-          - name: update
-            uid: ext_virtual-wan_az_network_vhub_route_table_update
-            displayName: az network vhub route-table update
-          - name: route
-            displayName: az network vhub route-table route
-            items:
-            - name: Overview
-              uid: ext_virtual-wan_az_network_vhub_route_table_route
-              displayName: az network vhub route-table route
-            - name: add
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-              displayName: az network vhub route-table route add
-            - name: list
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-              displayName: az network vhub route-table route list
-            - name: remove
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-              displayName: az network vhub route-table route remove
-      - name: vpn-gateway
-        displayName: az network vpn-gateway
+        - name: Summary
+          uid: az_image_builder
+          displayName: az image builder
+        - name: customizer
+          uid: az_image_builder_customizer
+          displayName: az image builder customizer
+          items: []
+        - name: output
+          uid: az_image_builder_output
+          displayName: az image builder output
+          items: []
+    - name: maintenance
+      items:
+      - name: Summary
+        uid: az_maintenance
+        displayName: az maintenance
+      - name: applyupdate
+        uid: az_maintenance_applyupdate
+        displayName: az maintenance applyupdate
+        items: []
+      - name: applyupdate-for-resource-group
+        uid: az_maintenance_applyupdate-for-resource-group
+        displayName: az maintenance applyupdate-for-resource-group
+        items: []
+      - name: assignment
+        uid: az_maintenance_assignment
+        displayName: az maintenance assignment
+        items: []
+      - name: configuration
+        uid: az_maintenance_configuration
+        displayName: az maintenance configuration
+        items: []
+      - name: configuration-for-resource-group
+        uid: az_maintenance_configuration-for-resource-group
+        displayName: az maintenance configuration-for-resource-group
+        items: []
+      - name: public-configuration
+        uid: az_maintenance_public-configuration
+        displayName: az maintenance public-configuration
+        items: []
+      - name: update
+        uid: az_maintenance_update
+        displayName: az maintenance update
+        items: []
+    - name: ssh
+      uid: az_ssh
+      displayName: az ssh
+      items: []
+    - name: sshkey
+      uid: az_sshkey
+      displayName: az sshkey
+      items: []
+    - name: vm
+      items:
+      - name: Summary
+        uid: az_vm
+        displayName: az vm
+      - name: aem
+        uid: az_vm_aem
+        displayName: az vm aem
+        items: []
+      - name: availability-set
+        uid: az_vm_availability-set
+        displayName: az vm availability-set
+        items: []
+      - name: boot-diagnostics
+        uid: az_vm_boot-diagnostics
+        displayName: az vm boot-diagnostics
+        items: []
+      - name: diagnostics
+        uid: az_vm_diagnostics
+        displayName: az vm diagnostics
+        items: []
+      - name: disk
+        uid: az_vm_disk
+        displayName: az vm disk
+        items: []
+      - name: encryption
+        uid: az_vm_encryption
+        displayName: az vm encryption
+        items: []
+      - name: extension
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vpn_gateway
-          displayName: az network vpn-gateway
-        - name: create
-          uid: ext_virtual-wan_az_network_vpn_gateway_create
-          displayName: az network vpn-gateway create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vpn_gateway_delete
-          displayName: az network vpn-gateway delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vpn_gateway_list
-          displayName: az network vpn-gateway list
-        - name: show
-          uid: ext_virtual-wan_az_network_vpn_gateway_show
-          displayName: az network vpn-gateway show
-        - name: update
-          uid: ext_virtual-wan_az_network_vpn_gateway_update
-          displayName: az network vpn-gateway update
-        - name: connection
-          displayName: az network vpn-gateway connection
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection
-            displayName: az network vpn-gateway connection
-          - name: create
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-            displayName: az network vpn-gateway connection create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-            displayName: az network vpn-gateway connection delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-            displayName: az network vpn-gateway connection list
-          - name: show
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-            displayName: az network vpn-gateway connection show
-          - name: ipsec-policy
-            displayName: az network vpn-gateway connection ipsec-policy
-            items:
-            - name: Overview
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-              displayName: az network vpn-gateway connection ipsec-policy
-            - name: add
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-              displayName: az network vpn-gateway connection ipsec-policy add
-            - name: list
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-              displayName: az network vpn-gateway connection ipsec-policy list
-            - name: remove
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-              displayName: az network vpn-gateway connection ipsec-policy remove
-      - name: vpn-site
-        displayName: az network vpn-site
+        - name: Summary
+          uid: az_vm_extension
+          displayName: az vm extension
+        - name: image
+          uid: az_vm_extension_image
+          displayName: az vm extension image
+          items: []
+      - name: identity
+        uid: az_vm_identity
+        displayName: az vm identity
+        items: []
+      - name: image
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vpn_site
-          displayName: az network vpn-site
-        - name: create
-          uid: ext_virtual-wan_az_network_vpn_site_create
-          displayName: az network vpn-site create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vpn_site_delete
-          displayName: az network vpn-site delete
-        - name: download
-          uid: ext_virtual-wan_az_network_vpn_site_download
-          displayName: az network vpn-site download
-        - name: list
-          uid: ext_virtual-wan_az_network_vpn_site_list
-          displayName: az network vpn-site list
-        - name: show
-          uid: ext_virtual-wan_az_network_vpn_site_show
-          displayName: az network vpn-site show
-        - name: update
-          uid: ext_virtual-wan_az_network_vpn_site_update
-          displayName: az network vpn-site update
-      - name: vwan
-        displayName: az network vwan
+        - name: Summary
+          uid: az_vm_image
+          displayName: az vm image
+        - name: terms
+          uid: az_vm_image_terms
+          displayName: az vm image terms
+          items: []
+      - name: monitor
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vwan
-          displayName: az network vwan
-        - name: create
-          uid: ext_virtual-wan_az_network_vwan_create
-          displayName: az network vwan create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vwan_delete
-          displayName: az network vwan delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vwan_list
-          displayName: az network vwan list
-        - name: show
-          uid: ext_virtual-wan_az_network_vwan_show
-          displayName: az network vwan show
-        - name: update
-          uid: ext_virtual-wan_az_network_vwan_update
-          displayName: az network vwan update
-  - name: vm-repair
-    items:
-    - name: Overview
-      uid: ext_vm-repair_az
-    - name: Virtual Machines
-      displayName: az vm
-      items:
-      - name: Overview
-        uid: ext_vm-repair_az_vm
-        displayName: az vm
+        - name: Summary
+          uid: az_vm_monitor
+          displayName: az vm monitor
+        - name: log
+          uid: az_vm_monitor_log
+          displayName: az vm monitor log
+          items: []
+      - name: nic
+        uid: az_vm_nic
+        displayName: az vm nic
+        items: []
       - name: repair
+        uid: az_vm_repair
         displayName: az vm repair
-        items:
-        - name: Overview
-          uid: ext_vm-repair_az_vm_repair
-          displayName: az vm repair
-        - name: create
-          uid: ext_vm-repair_az_vm_repair_create
-          displayName: az vm repair create
-        - name: list-scripts
-          uid: ext_vm-repair_az_vm_repair_list_scripts
-          displayName: az vm repair list-scripts
-        - name: restore
-          uid: ext_vm-repair_az_vm_repair_restore
-          displayName: az vm repair restore
-        - name: run
-          uid: ext_vm-repair_az_vm_repair_run
-          displayName: az vm repair run
-  - name: vmware
+        items: []
+      - name: run-command
+        uid: az_vm_run-command
+        displayName: az vm run-command
+        items: []
+      - name: secret
+        uid: az_vm_secret
+        displayName: az vm secret
+        items: []
+      - name: unmanaged-disk
+        uid: az_vm_unmanaged-disk
+        displayName: az vm unmanaged-disk
+        items: []
+      - name: user
+        uid: az_vm_user
+        displayName: az vm user
+        items: []
+  - name: Azure VMWare Solution
     items:
-    - name: Overview
-      uid: ext_vmware_az
+    - name: Summary
+      uid: sp-Azure_VMWare_Solution
+      displayName: Azure VMWare Solution
+    - name: csvmware
+      items:
+      - name: Summary
+        uid: az_csvmware
+        displayName: az csvmware
+      - name: private-cloud
+        uid: az_csvmware_private-cloud
+        displayName: az csvmware private-cloud
+        items: []
+      - name: resource-pool
+        uid: az_csvmware_resource-pool
+        displayName: az csvmware resource-pool
+        items: []
+      - name: virtual-network
+        uid: az_csvmware_virtual-network
+        displayName: az csvmware virtual-network
+        items: []
+      - name: vm
+        items:
+        - name: Summary
+          uid: az_csvmware_vm
+          displayName: az csvmware vm
+        - name: disk
+          uid: az_csvmware_vm_disk
+          displayName: az csvmware vm disk
+          items: []
+        - name: nic
+          uid: az_csvmware_vm_nic
+          displayName: az csvmware vm nic
+          items: []
+      - name: vm-template
+        uid: az_csvmware_vm-template
+        displayName: az csvmware vm-template
+        items: []
     - name: vmware
-      displayName: az vmware
       items:
-      - name: Overview
-        uid: ext_vmware_az_vmware
+      - name: Summary
+        uid: az_vmware
         displayName: az vmware
-      - name: checkquotaavailability
-        uid: ext_vmware_az_vmware_checkquotaavailability
-        displayName: az vmware checkquotaavailability
+      - name: authorization
+        uid: az_vmware_authorization
+        displayName: az vmware authorization
+        items: []
       - name: cluster
+        uid: az_vmware_cluster
         displayName: az vmware cluster
-        items:
-        - name: Overview
-          uid: ext_vmware_az_vmware_cluster
-          displayName: az vmware cluster
-        - name: create
-          uid: ext_vmware_az_vmware_cluster_create
-          displayName: az vmware cluster create
-        - name: delete
-          uid: ext_vmware_az_vmware_cluster_delete
-          displayName: az vmware cluster delete
-        - name: list
-          uid: ext_vmware_az_vmware_cluster_list
-          displayName: az vmware cluster list
-        - name: show
-          uid: ext_vmware_az_vmware_cluster_show
-          displayName: az vmware cluster show
-        - name: update
-          uid: ext_vmware_az_vmware_cluster_update
-          displayName: az vmware cluster update
+        items: []
+      - name: datastore
+        uid: az_vmware_datastore
+        displayName: az vmware datastore
+        items: []
+      - name: hcx-enterprise-site
+        uid: az_vmware_hcx-enterprise-site
+        displayName: az vmware hcx-enterprise-site
+        items: []
+      - name: location
+        uid: az_vmware_location
+        displayName: az vmware location
+        items: []
       - name: private-cloud
+        uid: az_vmware_private-cloud
         displayName: az vmware private-cloud
-        items:
-        - name: Overview
-          uid: ext_vmware_az_vmware_private_cloud
-          displayName: az vmware private-cloud
-        - name: addauthorization
-          uid: ext_vmware_az_vmware_private_cloud_addauthorization
-          displayName: az vmware private-cloud addauthorization
-        - name: addidentitysource
-          uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-          displayName: az vmware private-cloud addidentitysource
-        - name: create
-          uid: ext_vmware_az_vmware_private_cloud_create
-          displayName: az vmware private-cloud create
-        - name: delete
-          uid: ext_vmware_az_vmware_private_cloud_delete
-          displayName: az vmware private-cloud delete
-        - name: deleteauthorization
-          uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-          displayName: az vmware private-cloud deleteauthorization
-        - name: deleteidentitysource
-          uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-          displayName: az vmware private-cloud deleteidentitysource
-        - name: list
-          uid: ext_vmware_az_vmware_private_cloud_list
-          displayName: az vmware private-cloud list
-        - name: listadmincredentials
-          uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-          displayName: az vmware private-cloud listadmincredentials
-        - name: show
-          uid: ext_vmware_az_vmware_private_cloud_show
-          displayName: az vmware private-cloud show
-        - name: update
-          uid: ext_vmware_az_vmware_private_cloud_update
-          displayName: az vmware private-cloud update
-  - name: webapp
+        items: []
+  - name: Azure Web Apps
     items:
-    - name: Overview
-      uid: ext_webapp_az
-    - name: Web Apps
-      displayName: az webapp
+    - name: Summary
+      uid: sp-Azure_Web_Apps
+      displayName: Azure Web Apps
+    - name: webapp
       items:
-      - name: Overview
-        uid: ext_webapp_az_webapp
+      - name: Summary
+        uid: az_webapp
         displayName: az webapp
       - name: container
+        uid: az_webapp_container
         displayName: az webapp container
-        items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_container
-          displayName: az webapp container
-        - name: up
-          uid: ext_webapp_az_webapp_container_up
-          displayName: az webapp container up
+        items: []
       - name: remote-connection
+        uid: az_webapp_remote-connection
         displayName: az webapp remote-connection
-        items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_remote_connection
-          displayName: az webapp remote-connection
-        - name: create
-          uid: ext_webapp_az_webapp_remote_connection_create
-          displayName: az webapp remote-connection create
+        items: []
       - name: scan
+        uid: az_webapp_scan
         displayName: az webapp scan
+        items: []
+  - name: Azure Web PubSub
+    items:
+    - name: Summary
+      uid: sp-Azure_Web_PubSub
+      displayName: Azure Web PubSub
+    - name: webpubsub
+      items:
+      - name: Summary
+        uid: az_webpubsub
+        displayName: az webpubsub
+      - name: client
+        uid: az_webpubsub_client
+        displayName: az webpubsub client
+        items: []
+      - name: event-handler
+        items:
+        - name: Summary
+          uid: az_webpubsub_event-handler
+          displayName: az webpubsub event-handler
+        - name: hub
+          uid: az_webpubsub_event-handler_hub
+          displayName: az webpubsub event-handler hub
+          items: []
+      - name: key
+        uid: az_webpubsub_key
+        displayName: az webpubsub key
+        items: []
+      - name: network-rule
+        uid: az_webpubsub_network-rule
+        displayName: az webpubsub network-rule
+        items: []
+      - name: service
         items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_scan
-          displayName: az webapp scan
-        - name: list-result
-          uid: ext_webapp_az_webapp_scan_list_result
-          displayName: az webapp scan list-result
-        - name: show-result
-          uid: ext_webapp_az_webapp_scan_show_result
-          displayName: az webapp scan show-result
-        - name: start
-          uid: ext_webapp_az_webapp_scan_start
-          displayName: az webapp scan start
-        - name: stop
-          uid: ext_webapp_az_webapp_scan_stop
-          displayName: az webapp scan stop
-        - name: track
-          uid: ext_webapp_az_webapp_scan_track
-          displayName: az webapp scan track
+        - name: Summary
+          uid: az_webpubsub_service
+          displayName: az webpubsub service
+        - name: connection
+          uid: az_webpubsub_service_connection
+          displayName: az webpubsub service connection
+          items: []
+        - name: group
+          uid: az_webpubsub_service_group
+          displayName: az webpubsub service group
+          items: []
+        - name: permission
+          uid: az_webpubsub_service_permission
+          displayName: az webpubsub service permission
+          items: []
+        - name: user
+          uid: az_webpubsub_service_user
+          displayName: az webpubsub service user
+          items: []
+  - name: Bicep
+    items:
+    - name: Summary
+      uid: sp-Bicep
+      displayName: Bicep
+    - name: bicep
+      uid: az_bicep
+      displayName: az bicep
+      items: []
+  - name: Content Delivery Network
+    uid: sp-Content_Delivery_Network
+    displayName: Content Delivery Network
+    items: []
+  - name: Microsoft AI
+    items:
+    - name: Summary
+      uid: sp-Microsoft_AI
+      displayName: Microsoft AI
+    - name: ai-examples
+      uid: az_ai-examples
+      displayName: az ai-examples
+      items: []
+  - name: Microsoft Partner Network
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Partner_Network
+      displayName: Microsoft Partner Network
+    - name: managementpartner
+      uid: az_managementpartner
+      displayName: az managementpartner
+      items: []
+  - name: Microsoft Partner Services
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Partner_Services
+      displayName: Microsoft Partner Services
+    - name: confluent
+      items:
+      - name: Summary
+        uid: az_confluent
+        displayName: az confluent
+      - name: organization
+        uid: az_confluent_organization
+        displayName: az confluent organization
+        items: []
+      - name: terms
+        uid: az_confluent_terms
+        displayName: az confluent terms
+        items: []
+    - name: datadog
+      items:
+      - name: Summary
+        uid: az_datadog
+        displayName: az datadog
+      - name: monitor
+        uid: az_datadog_monitor
+        displayName: az datadog monitor
+        items: []
+      - name: sso-config
+        uid: az_datadog_sso-config
+        displayName: az datadog sso-config
+        items: []
+      - name: tag-rule
+        uid: az_datadog_tag-rule
+        displayName: az datadog tag-rule
+        items: []
+      - name: terms
+        uid: az_datadog_terms
+        displayName: az datadog terms
+        items: []
+  - name: Microsoft Windows
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Windows
+      displayName: Microsoft Windows
+    - name: baremetalinstance
+      uid: az_baremetalinstance
+      displayName: az baremetalinstance
+      items: []
+  - name: Power BI
+    items:
+    - name: Summary
+      uid: sp-Power_BI
+      displayName: Power BI
+    - name: powerbi
+      items:
+      - name: Summary
+        uid: az_powerbi
+        displayName: az powerbi
+      - name: embedded-capacity
+        uid: az_powerbi_embedded-capacity
+        displayName: az powerbi embedded-capacity
+        items: []
+  - name: SAP HANA on Azure
+    items:
+    - name: Summary
+      uid: sp-SAP_HANA_on_Azure
+      displayName: SAP HANA on Azure
+    - name: hanainstance
+      uid: az_hanainstance
+      displayName: az hanainstance
+      items: []
+    - name: sapmonitor
+      items:
+      - name: Summary
+        uid: az_sapmonitor
+        displayName: az sapmonitor
+      - name: provider-instance
+        uid: az_sapmonitor_provider-instance
+        displayName: az sapmonitor provider-instance
+        items: []
+  - name: Visual Studio
+    items:
+    - name: Summary
+      uid: sp-Visual_Studio
+      displayName: Visual Studio
+    - name: codespace
+      items:
+      - name: Summary
+        uid: az_codespace
+        displayName: az codespace
+      - name: location
+        uid: az_codespace_location
+        displayName: az codespace location
+        items: []
+      - name: plan
+        uid: az_codespace_plan
+        displayName: az codespace plan
+        items: []
+      - name: secret
+        uid: az_codespace_secret
+        displayName: az codespace secret
+        items: []
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account.yml b/2018-03-01-hybrid/docs-ref-autogen/account.yml
index 31b3df8f08..bbc0d30658 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/account.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/account.yml
@@ -1,51 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_clear
-  - az_account_get_access_token
-  - az_account_list
-  - az_account_list_locations
-  - az_account_set
-  - az_account_show
+### YamlMime:AzureCLIGroup
+uid: az_account
+name: az account
+summary: Manage Azure subscription information.
+description: ''
+directCommands:
 - uid: az_account_clear
   name: az account clear
   summary: Clear all subscriptions from the CLI's local cache.
   description: To clear the current subscription, use 'az logout'.
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_get_access_token
+  syntax: az account clear
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_create
+  name: az account create
+  summary: Create a subscription.
+  description: ''
+  syntax: >-
+    az account create --enrollment-account-name
+                      --offer-type {MS-AZR-0017P, MS-AZR-0148P}
+                      [--display-name]
+                      [--owner-object-id]
+                      [--owner-spn]
+                      [--owner-upn]
+  requiredParameters:
+  - isRequired: true
+    name: --enrollment-account-name --enrollment-account-object-id
+    summary: The name of the enrollment account which should be used to create a subscription.
+    description: ''
+  - isRequired: true
+    name: --offer-type
+    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
+    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.
+    description: ''
+  optionalParameters:
+  - name: --display-name
+    summary: The display name of the subscription.
+    description: ''
+  - name: --owner-object-id
+    summary: The object id(s) of the owner(s) which should be granted access to the new subscription.
+    description: ''
+  - name: --owner-spn
+    summary: The service principal name(s) of the owner(s) which should be granted access to the new subscription.
+    description: ''
+  - name: --owner-upn
+    summary: The user principal name(s) of owner(s) who should be granted access to the new subscription.
+    description: ''
+- uid: az_account_get-access-token
   name: az account get-access-token
   summary: Get a token for utilities to access Azure.
   description: The token will be valid for at least 5 minutes with the maximum at 60 minutes. If the subscription argument isn't specified, the current account is used.
-  langs:
-  - azurecli
+  syntax: >-
+    az account get-access-token [--resource]
+                                [--resource-type {aad-graph, arm, batch, data-lake, media, ms-graph, oss-rdbms}]
+                                [--subscription]
+                                [--tenant]
   examples:
   - summary: Get an access token for the current account
-    syntax:
-      content: az account get-access-token
+    syntax: az account get-access-token
   - summary: Get an access token for a specific subscription
-    syntax:
-      content: az account get-access-token --subscription 00000000-0000-0000-0000-000000000000
+    syntax: az account get-access-token --subscription 00000000-0000-0000-0000-000000000000
   - summary: Get an access token for a specific tenant
-    syntax:
-      content: az account get-access-token --tenant 00000000-0000-0000-0000-000000000000
+    syntax: az account get-access-token --tenant 00000000-0000-0000-0000-000000000000
   - summary: Get an access token to use with MS Graph API
-    syntax:
-      content: az account get-access-token --resource-type ms-graph
-  parameters:
+    syntax: az account get-access-token --resource-type ms-graph
+  optionalParameters:
   - name: --resource
     summary: Azure resource endpoints. Default to Azure Resource Manager.
     description: ''
@@ -59,144 +76,104 @@ items:
   - name: --tenant -t
     summary: Tenant ID for which the token is acquired. Only available for user and service principal account, not for MSI or Cloud Shell account.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_list
   name: az account list
   summary: Get a list of subscriptions for the logged in account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az account list [--all]
+                    [--query-examples]
+                    [--refresh]
+  optionalParameters:
   - name: --all
     summary: List all subscriptions, rather than just 'Enabled' ones.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --refresh
     summary: Retrieve up-to-date subscriptions from server.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_list_locations
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_list-locations
   name: az account list-locations
   summary: List supported regions for the current subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  syntax: az account list-locations
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_set
   name: az account set
   summary: Set a subscription to be the current active subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az account set --subscription
+  requiredParameters:
   - isRequired: true
     name: --subscription -s
     summary: Name or ID of subscription.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_show
   name: az account show
   summary: Get the details of a subscription.
-  description: If the subscription isn't specified, shows the details of the default subscription.
-  langs:
-  - azurecli
-  parameters:
+  description: >-
+    If the subscription isn't specified, shows the details of the default subscription.
+
+
+    When --sdk-auth is used, the output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az account show [--query-examples]
+                    [--sdk-auth]
+                    [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sdk-auth
     summary: Output result to a file compatible with Azure SDK auth. Only applicable when authenticating with a Service Principal.
     description: ''
   - name: --subscription -s
     summary: Name or ID of subscription.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_clear
-  name: az account clear
-  summary: Clear all subscriptions from the CLI's local cache.
-- uid: az_account_get_access_token
-  name: az account get-access-token
-  summary: Get a token for utilities to access Azure.
-- uid: az_account_list
-  name: az account list
-  summary: Get a list of subscriptions for the logged in account.
-- uid: az_account_list_locations
-  name: az account list-locations
-  summary: List supported regions for the current subscription.
-- uid: az_account_lock
-  name: az account lock
-  summary: Manage Azure subscription level locks.
-- uid: az_account_lock_create
-  name: az account lock create
-  summary: Create a subscription lock.
-- uid: az_account_lock_delete
-  name: az account lock delete
-  summary: Delete a subscription lock.
-- uid: az_account_lock_list
-  name: az account lock list
-  summary: List lock information in the subscription.
-- uid: az_account_lock_show
-  name: az account lock show
-  summary: Show the details of a subscription lock.
-- uid: az_account_lock_update
-  name: az account lock update
-  summary: Update a subscription lock.
-- uid: az_account_management_group
-  name: az account management-group
-  summary: Manage Azure Management Groups.
-- uid: az_account_management_group_create
-  name: az account management-group create
-  summary: Create a new management group.
-- uid: az_account_management_group_delete
-  name: az account management-group delete
-  summary: Delete an existing management group.
-- uid: az_account_management_group_list
-  name: az account management-group list
-  summary: List all management groups.
-- uid: az_account_management_group_show
-  name: az account management-group show
-  summary: Get a specific management group.
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
-- uid: az_account_management_group_update
-  name: az account management-group update
-  summary: Update an existing management group.
-- uid: az_account_set
-  name: az account set
-  summary: Set a subscription to be the current active subscription.
-- uid: az_account_show
-  name: az account show
-  summary: Get the details of a subscription.
+- az_account_alias
+- az_account_alias_create
+- az_account_alias_delete
+- az_account_alias_list
+- az_account_alias_show
+- az_account_alias_wait
+- az_account_clear
+- az_account_create
+- az_account_get-access-token
+- az_account_list
+- az_account_list-locations
+- az_account_lock
+- az_account_lock_create
+- az_account_lock_delete
+- az_account_lock_list
+- az_account_lock_show
+- az_account_lock_update
+- az_account_management-group
+- az_account_management-group_create
+- az_account_management-group_delete
+- az_account_management-group_list
+- az_account_management-group_show
+- az_account_management-group_subscription
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
+- az_account_management-group_update
+- az_account_set
+- az_account_show
+- az_account_subscription
+- az_account_subscription_cancel
+- az_account_subscription_enable
+- az_account_subscription_list
+- az_account_subscription_list-location
+- az_account_subscription_rename
+- az_account_subscription_show
+- az_account_tenant
+- az_account_tenant_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -212,10 +189,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure subscription information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure subscription information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account/alias.yml b/2018-03-01-hybrid/docs-ref-autogen/account/alias.yml
new file mode 100644
index 0000000000..3b1e1fe6d7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/account/alias.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_alias
+name: az account alias
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account alias** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage subscription alias.
+description: ''
+directCommands:
+- uid: az_account_alias_create
+  name: az account alias create
+  summary: Create Alias Subscription.
+  description: ''
+  syntax: >-
+    az account alias create --name
+                            [--billing-scope]
+                            [--display-name]
+                            [--no-wait]
+                            [--reseller-id]
+                            [--subscription-id]
+                            [--workload {DevTest, Production}]
+  examples:
+  - summary: CreateAlias
+    syntax: az account alias create --name "aliasForNewSub" --billing-scope "/providers/Microsoft.Billing/billingAccounts/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:024cabf4-7321-4cf9-be59-df0c77ca51de_2019-05-31/billingProfiles/PE2Q-NOIT-BG7-TGB/invoiceSections/MTT4-OBS7-PJA-TGB" --display-name "Contoso MCA subscription" --workload "Production"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+  optionalParameters:
+  - name: --billing-scope
+    summary: Billing scope. It determines whether the subscription is Field-Led, Partner-Led or LegacyEA.
+    description: ''
+  - name: --display-name
+    summary: The friendly name of the subscription.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --reseller-id
+    summary: Reseller ID, basically MPN Id.
+    description: ''
+  - name: --subscription-id
+    summary: This parameter can be used to create alias for existing subscription ID.
+    description: ''
+  - name: --workload
+    parameterValueGroup: DevTest, Production
+    summary: The workload type of the subscription. It can be either Production or DevTest.
+    description: ''
+- uid: az_account_alias_delete
+  name: az account alias delete
+  summary: Delete Alias.
+  description: ''
+  syntax: az account alias delete --name
+  examples:
+  - summary: DeleteAlias
+    syntax: az account alias delete --name "aliasForNewSub"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+- uid: az_account_alias_list
+  name: az account alias list
+  summary: List Alias Subscriptions.
+  description: ''
+  syntax: az account alias list
+  examples:
+  - summary: List Alias Subscriptions
+    syntax: az account alias list
+- uid: az_account_alias_show
+  name: az account alias show
+  summary: Get Alias Subscription.
+  description: ''
+  syntax: az account alias show --name
+  examples:
+  - summary: GetAlias
+    syntax: az account alias show --name "aliasForNewSub"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+- uid: az_account_alias_wait
+  name: az account alias wait
+  summary: Place the CLI in a waiting state until a condition of the account alias is met.
+  description: ''
+  syntax: >-
+    az account alias wait --name
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the account alias is successfully created.
+    syntax: az account alias wait --name "aliasForNewSub" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_account_alias_create
+- az_account_alias_delete
+- az_account_alias_list
+- az_account_alias_show
+- az_account_alias_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage subscription alias.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account/lock.yml b/2018-03-01-hybrid/docs-ref-autogen/account/lock.yml
index 7df0034c5d..eedcad460e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/account/lock.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/account/lock.yml
@@ -1,28 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_lock
-  name: az account lock
-  summary: Manage Azure subscription level locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_lock_create
-  - az_account_lock_delete
-  - az_account_lock_list
-  - az_account_lock_show
-  - az_account_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_account_lock
+name: az account lock
+summary: Manage Azure subscription level locks.
+description: ''
+directCommands:
 - uid: az_account_lock_create
   name: az account lock create
   summary: Create a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock create --lock-type {CanNotDelete, ReadOnly}
+                           --name
+                           [--notes]
   examples:
   - summary: Create a read-only subscription level lock.
-    syntax:
-      content: az account lock create --lock-type ReadOnly -n lockName
-  parameters:
+    syntax: az account lock create --lock-type ReadOnly -n lockName
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -32,92 +25,82 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes about this lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_delete
   name: az account lock delete
   summary: Delete a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock delete [--ids]
+                           [--name]
   examples:
   - summary: Delete a subscription lock
-    syntax:
-      content: az account lock delete --name lockName
-  parameters:
+    syntax: az account lock delete --name lockName
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_list
   name: az account lock list
   summary: List lock information in the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock list [--filter-string]
+                         [--query-examples]
   examples:
   - summary: List out all locks on the subscription level
-    syntax:
-      content: az account lock list
-  parameters:
+    syntax: az account lock list
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_show
   name: az account lock show
   summary: Show the details of a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock show [--ids]
+                         [--name]
+                         [--query-examples]
   examples:
   - summary: Show a subscription level lock
-    syntax:
-      content: az account lock show -n lockname
-  parameters:
+    syntax: az account lock show -n lockname
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_update
   name: az account lock update
   summary: Update a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock update [--ids]
+                           [--lock-type {CanNotDelete, ReadOnly}]
+                           [--name]
+                           [--notes]
   examples:
   - summary: Update a subscription lock with new notes and type
-    syntax:
-      content: az account lock update --name lockName --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az account lock update --name lockName --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -131,28 +114,13 @@ items:
   - name: --notes
     summary: Notes about this lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_lock_create
-  name: az account lock create
-  summary: Create a subscription lock.
-- uid: az_account_lock_delete
-  name: az account lock delete
-  summary: Delete a subscription lock.
-- uid: az_account_lock_list
-  name: az account lock list
-  summary: List lock information in the subscription.
-- uid: az_account_lock_show
-  name: az account lock show
-  summary: Show the details of a subscription lock.
-- uid: az_account_lock_update
-  name: az account lock update
-  summary: Update a subscription lock.
+- az_account_lock_create
+- az_account_lock_delete
+- az_account_lock_list
+- az_account_lock_show
+- az_account_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -168,10 +136,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure subscription level locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure subscription level locks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account/management-group.yml b/2018-03-01-hybrid/docs-ref-autogen/account/management-group.yml
index 6639f53f26..6c12c4fca8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/account/management-group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/account/management-group.yml
@@ -1,194 +1,151 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_management_group
-  name: az account management-group
-  summary: Manage Azure Management Groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_management_group_create
-  - az_account_management_group_delete
-  - az_account_management_group_list
-  - az_account_management_group_show
-  - az_account_management_group_update
-- uid: az_account_management_group_create
+### YamlMime:AzureCLIGroup
+uid: az_account_management-group
+name: az account management-group
+summary: Manage Azure Management Groups.
+description: ''
+directCommands:
+- uid: az_account_management-group_create
   name: az account management-group create
   summary: Create a new management group.
   description: Create a new management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group create --name
+                                       [--display-name]
+                                       [--parent]
   examples:
   - summary: Create a new management group.
-    syntax:
-      content: az account management-group create --name GroupName
+    syntax: az account management-group create --name GroupName
   - summary: Create a new management group with a specific display name.
-    syntax:
-      content: az account management-group create --name GroupName --display-name DisplayName
+    syntax: az account management-group create --name GroupName --display-name DisplayName
   - summary: Create a new management group with a specific parent.
-    syntax:
-      content: az account management-group create --name GroupName --parent ParentId/ParentName
+    syntax: az account management-group create --name GroupName --parent ParentId/ParentName
   - summary: Create a new management group with a specific display name and parent.
-    syntax:
-      content: az account management-group create --name GroupName --display-name DisplayName --parent ParentId/ParentName
-  parameters:
+    syntax: az account management-group create --name GroupName --display-name DisplayName --parent ParentId/ParentName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
+  optionalParameters:
   - name: --display-name -d
     summary: Sets the display name of the management group. If null, the group name is set as the display name.
     description: ''
   - name: --parent -p
     summary: Sets the parent of the management group. Can be the fully qualified id or the name of the management group. If null, the root tenant group is set as the parent.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_delete
   name: az account management-group delete
   summary: Delete an existing management group.
   description: Delete an existing management group.
-  langs:
-  - azurecli
+  syntax: az account management-group delete --name
   examples:
   - summary: Delete an existing management group
-    syntax:
-      content: az account management-group delete --name GroupName
-  parameters:
+    syntax: az account management-group delete --name GroupName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_list
   name: az account management-group list
   summary: List all management groups.
   description: List of all management groups in the current tenant.
-  langs:
-  - azurecli
+  syntax: az account management-group list [--query-examples]
   examples:
   - summary: List all management groups
-    syntax:
-      content: az account management-group list
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_show
+    syntax: az account management-group list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_show
   name: az account management-group show
   summary: Get a specific management group.
   description: Get the details of the management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group show --name
+                                     [--expand]
+                                     [--query-examples]
+                                     [--recurse]
   examples:
   - summary: Get a management group.
-    syntax:
-      content: az account management-group show --name GroupName
+    syntax: az account management-group show --name GroupName
   - summary: Get a management group with children in the first level of hierarchy.
-    syntax:
-      content: az account management-group show --name GroupName -e
+    syntax: az account management-group show --name GroupName -e
   - summary: Get a management group with children in all levels of hierarchy.
-    syntax:
-      content: az account management-group show --name GroupName -e -r
-  parameters:
+    syntax: az account management-group show --name GroupName -e -r
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the management group.
+    summary: Name of the management group (the last segment of the resource ID). Do not use display name.
     description: ''
+  optionalParameters:
   - name: --expand -e
     summary: If given, lists the children in the first level of hierarchy.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --recurse -r
     summary: If given, lists the children in all levels of hierarchy.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_update
   name: az account management-group update
   summary: Update an existing management group.
   description: Update an existing management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group update --name
+                                       [--add]
+                                       [--display-name]
+                                       [--force-string]
+                                       [--parent]
+                                       [--remove]
+                                       [--set]
   examples:
   - summary: Update an existing management group with a specific display name.
-    syntax:
-      content: az account management-group update --name GroupName --display-name DisplayName
+    syntax: az account management-group update --name GroupName --display-name DisplayName
   - summary: Update an existing management group with a specific parent.
-    syntax:
-      content: az account management-group update --name GroupName --parent ParentId/ParentName
+    syntax: az account management-group update --name GroupName --parent ParentId/ParentName
   - summary: Update an existing management group with a specific display name and parent.
-    syntax:
-      content: az account management-group update --name GroupName --display-name DisplayName --parent ParentId/ParentName
-  parameters:
+    syntax: az account management-group update --name GroupName --display-name DisplayName --parent ParentId/ParentName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
-  - name: --display-name -d
-    summary: Updates the display name of the management group. If null, no change is made.
-    description: ''
-  - name: --parent -p
-    summary: Update the parent of the management group. Can be the fully qualified id or the name of the management group. If null, no change is made.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --display-name -d
+    summary: Updates the display name of the management group. If null, no change is made.
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --parent -p
+    summary: Update the parent of the management group. Can be the fully qualified id or the name of the management group. If null, no change is made.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_management_group_create
-  name: az account management-group create
-  summary: Create a new management group.
-- uid: az_account_management_group_delete
-  name: az account management-group delete
-  summary: Delete an existing management group.
-- uid: az_account_management_group_list
-  name: az account management-group list
-  summary: List all management groups.
-- uid: az_account_management_group_show
-  name: az account management-group show
-  summary: Get a specific management group.
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
-- uid: az_account_management_group_update
-  name: az account management-group update
-  summary: Update an existing management group.
+- az_account_management-group_create
+- az_account_management-group_delete
+- az_account_management-group_list
+- az_account_management-group_show
+- az_account_management-group_subscription
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
+- az_account_management-group_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -204,10 +161,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure Management Groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure Management Groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml
index dba31b3417..9dd07e642c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml
@@ -1,25 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_management_group_subscription_add
-  - az_account_management_group_subscription_remove
-- uid: az_account_management_group_subscription_add
+### YamlMime:AzureCLIGroup
+uid: az_account_management-group_subscription
+name: az account management-group subscription
+summary: Subscription operations for Management Groups.
+description: ''
+directCommands:
+- uid: az_account_management-group_subscription_add
   name: az account management-group subscription add
   summary: Add a subscription to a management group.
   description: Add a subscription to a management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group subscription add --name
+                                                 --subscription
   examples:
   - summary: Add a subscription to a management group.
-    syntax:
-      content: az account management-group subscription add --name GroupName --subscription Subscription
-  parameters:
+    syntax: az account management-group subscription add --name GroupName --subscription Subscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
@@ -28,23 +23,18 @@ items:
     name: --subscription -s
     summary: Subscription Id or Name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_subscription_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_subscription_remove
   name: az account management-group subscription remove
   summary: Remove an existing subscription from a management group.
   description: Remove an existing subscription from a management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group subscription remove --name
+                                                    --subscription
   examples:
   - summary: Remove an existing subscription from a management group.
-    syntax:
-      content: az account management-group subscription remove --name GroupName --subscription Subscription
-  parameters:
+    syntax: az account management-group subscription remove --name GroupName --subscription Subscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
@@ -53,19 +43,10 @@ items:
     name: --subscription -s
     summary: Subscription Id or Name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -81,10 +62,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Subscription operations for Management Groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Subscription operations for Management Groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account/subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/account/subscription.yml
new file mode 100644
index 0000000000..e70ff8195a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/account/subscription.yml
@@ -0,0 +1,119 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_subscription
+name: az account subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage subscriptions.
+description: ''
+directCommands:
+- uid: az_account_subscription_cancel
+  name: az account subscription cancel
+  summary: Cancel subscription.
+  description: ''
+  syntax: >-
+    az account subscription cancel --id
+                                   [--yes]
+  examples:
+  - summary: Cancel subscription
+    syntax: az account subscription cancel --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_account_subscription_enable
+  name: az account subscription enable
+  summary: Enable subscription.
+  description: ''
+  syntax: az account subscription enable --id
+  examples:
+  - summary: Enable subscription
+    syntax: az account subscription enable --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+- uid: az_account_subscription_list
+  name: az account subscription list
+  summary: Get all subscriptions for a tenant.
+  description: ''
+  syntax: az account subscription list
+  examples:
+  - summary: listSubscriptions
+    syntax: az account subscription list
+- uid: az_account_subscription_list-location
+  name: az account subscription list-location
+  summary: This operation provides all the locations that are available for resource providers; however, each resource provider may support a subset of this list.
+  description: ''
+  syntax: az account subscription list-location --id
+  examples:
+  - summary: listLocations
+    syntax: az account subscription list-location --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: The ID of the target subscription.
+    description: ''
+- uid: az_account_subscription_rename
+  name: az account subscription rename
+  summary: Rename subscription.
+  description: ''
+  syntax: >-
+    az account subscription rename --id
+                                   [--name]
+  examples:
+  - summary: Rename subscription
+    syntax: az account subscription rename --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+  optionalParameters:
+  - name: --name --subscription-name -n
+    summary: New subscription name.
+    description: ''
+- uid: az_account_subscription_show
+  name: az account subscription show
+  summary: Get details about a specified subscription.
+  description: ''
+  syntax: az account subscription show --id
+  examples:
+  - summary: getSubscription
+    syntax: az account subscription show --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: The ID of the target subscription.
+    description: ''
+commands:
+- az_account_subscription_cancel
+- az_account_subscription_enable
+- az_account_subscription_list
+- az_account_subscription_list-location
+- az_account_subscription_rename
+- az_account_subscription_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/account/tenant.yml b/2018-03-01-hybrid/docs-ref-autogen/account/tenant.yml
new file mode 100644
index 0000000000..92816bcd8c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/account/tenant.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_tenant
+name: az account tenant
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account tenant** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tenant.
+description: ''
+directCommands:
+- uid: az_account_tenant_list
+  name: az account tenant list
+  summary: Get the tenants for your account.
+  description: ''
+  syntax: az account tenant list
+  examples:
+  - summary: listTenants
+    syntax: az account tenant list
+commands:
+- az_account_tenant_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tenant.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/acr.yml b/2018-03-01-hybrid/docs-ref-autogen/acr.yml
new file mode 100644
index 0000000000..5ecc4212a7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/acr.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr
+name: az acr
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private registries with Azure Container Registries.
+description: ''
+commands:
+- az_acr_export-pipeline
+- az_acr_export-pipeline_create
+- az_acr_export-pipeline_delete
+- az_acr_export-pipeline_list
+- az_acr_export-pipeline_show
+- az_acr_import-pipeline
+- az_acr_import-pipeline_create
+- az_acr_import-pipeline_delete
+- az_acr_import-pipeline_list
+- az_acr_import-pipeline_show
+- az_acr_pipeline-run
+- az_acr_pipeline-run_create
+- az_acr_pipeline-run_delete
+- az_acr_pipeline-run_list
+- az_acr_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private registries with Azure Container Registries.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/acr/export-pipeline.yml b/2018-03-01-hybrid/docs-ref-autogen/acr/export-pipeline.yml
new file mode 100644
index 0000000000..a1a4be6601
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/acr/export-pipeline.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_export-pipeline
+name: az acr export-pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr export-pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR export pipelines.
+description: ''
+directCommands:
+- uid: az_acr_export-pipeline_create
+  name: az acr export-pipeline create
+  summary: Create an export pipeline.
+  description: ''
+  syntax: >-
+    az acr export-pipeline create --name
+                                  --registry
+                                  --resource-group
+                                  --secret-uri
+                                  --storage-container-uri
+                                  [--assign-identity]
+                                  [--options]
+  examples:
+  - summary: Create an export pipeline.
+    syntax: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
+  - summary: Create an export pipeline with a user assigned identity and all available options.
+    syntax: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options OverwriteBlobs ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-uri -s
+    summary: Keyvault secret URI containing a valid SAS token to the associated storage account of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  - isRequired: true
+    name: --storage-container-uri -c
+    summary: Storage account container URI of the source or target storage account container of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity -i
+    summary: User assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.
+    description: ''
+  - name: --options -z
+    summary: 'Space-separated list of options. May only container the following options: OverwriteBlobs,ContinueOnErrors.'
+    description: ''
+- uid: az_acr_export-pipeline_delete
+  name: az acr export-pipeline delete
+  summary: Delete an export pipeline.
+  description: ''
+  syntax: >-
+    az acr export-pipeline delete --name
+                                  --registry
+                                  --resource-group
+  examples:
+  - summary: Delete an export pipeline.
+    syntax: az acr export-pipeline delete --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_export-pipeline_list
+  name: az acr export-pipeline list
+  summary: List export pipelines on a Container Registry.
+  description: ''
+  syntax: >-
+    az acr export-pipeline list --registry
+                                --resource-group
+  examples:
+  - summary: List export pipelines on a container registry
+    syntax: az acr export-pipeline list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_export-pipeline_show
+  name: az acr export-pipeline show
+  summary: Show an export pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr export-pipeline show --name
+                                --registry
+                                --resource-group
+  examples:
+  - summary: Show a specific export pipeline in detail.
+    syntax: az acr export-pipeline show --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_export-pipeline_create
+- az_acr_export-pipeline_delete
+- az_acr_export-pipeline_list
+- az_acr_export-pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR export pipelines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/acr/import-pipeline.yml b/2018-03-01-hybrid/docs-ref-autogen/acr/import-pipeline.yml
new file mode 100644
index 0000000000..d67f5b3523
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/acr/import-pipeline.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_import-pipeline
+name: az acr import-pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr import-pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR import pipelines.
+description: ''
+directCommands:
+- uid: az_acr_import-pipeline_create
+  name: az acr import-pipeline create
+  summary: Create an import pipeline.
+  description: ''
+  syntax: >-
+    az acr import-pipeline create --name
+                                  --registry
+                                  --resource-group
+                                  --secret-uri
+                                  --storage-container-uri
+                                  [--assign-identity]
+                                  [--options]
+                                  [--source-trigger-enabled {false, true}]
+  examples:
+  - summary: Create an import pipeline.
+    syntax: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
+  - summary: Create an import pipeline with a user assigned identity, all available options, and source trigger disabled.
+    syntax: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options DeleteSourceBlobOnSuccess OverwriteTags ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity --source-trigger-enabled False
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-uri -s
+    summary: Keyvault secret URI containing a valid SAS token to the associated storage account of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  - isRequired: true
+    name: --storage-container-uri -c
+    summary: Storage account container URI of the source or target storage account container of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity -i
+    summary: User assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.
+    description: ''
+  - name: --options -z
+    summary: 'Space-separated list of options. May only contain the following options: DeleteSourceBlobOnSuccess,OverwriteTags,ContinueOnErrors,DisableSourceTrigger.'
+    description: ''
+  - name: --source-trigger-enabled -e
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: Boolean parameter that determines whether source trigger is enabled on the pipeline. Must be either True or False. True by default.
+    description: ''
+- uid: az_acr_import-pipeline_delete
+  name: az acr import-pipeline delete
+  summary: Delete an import pipeline.
+  description: ''
+  syntax: >-
+    az acr import-pipeline delete --name
+                                  --registry
+                                  --resource-group
+  examples:
+  - summary: Delete an import pipeline.
+    syntax: az acr import-pipeline delete --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_import-pipeline_list
+  name: az acr import-pipeline list
+  summary: List import pipelines on a Container Registry.
+  description: ''
+  syntax: >-
+    az acr import-pipeline list --registry
+                                --resource-group
+  examples:
+  - summary: List import pipelines on a container registry
+    syntax: az acr import-pipeline list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_import-pipeline_show
+  name: az acr import-pipeline show
+  summary: Show an import pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr import-pipeline show --name
+                                --registry
+                                --resource-group
+  examples:
+  - summary: Show a specific import pipeline in detail.
+    syntax: az acr import-pipeline show --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_import-pipeline_create
+- az_acr_import-pipeline_delete
+- az_acr_import-pipeline_list
+- az_acr_import-pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR import pipelines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/acr/pipeline-run.yml b/2018-03-01-hybrid/docs-ref-autogen/acr/pipeline-run.yml
new file mode 100644
index 0000000000..3e3b2410c4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/acr/pipeline-run.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_pipeline-run
+name: az acr pipeline-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr pipeline-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR import and export pipeline runs.
+description: ''
+directCommands:
+- uid: az_acr_pipeline-run_create
+  name: az acr pipeline-run create
+  summary: Create a pipeline run.
+  description: ''
+  syntax: >-
+    az acr pipeline-run create --name
+                               --pipeline
+                               --pipeline-type
+                               --registry
+                               --resource-group
+                               --storage-blob
+                               [--artifacts]
+                               [--force-redeploy]
+  examples:
+  - summary: Create an import pipeline run.
+    syntax: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type import --storage-blob $MyBlob
+  - summary: Create an export pipeline run and force redeploy.
+    syntax: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type export --storage-blob $MyBlob --artifacts hello-world:latest hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042 --force-redeploy
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --pipeline -p
+    summary: Name of the pipeline to run.
+    description: ''
+  - isRequired: true
+    name: --pipeline-type -t
+    summary: Type of pipeline. Must be either import or export.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-blob -b
+    summary: Name of the storage blob to be imported or exported.
+    description: ''
+  optionalParameters:
+  - name: --artifacts -a
+    summary: Space-separated list of container artifacts. Artifacts must be either of the form `repository:tag` or `repository@digest` such as hello-world:latest or hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042.
+    description: ''
+  - name: --force-redeploy -f
+    summary: Flag that forces ARM to redeploy resource even if no parameters have changed.
+    description: ''
+- uid: az_acr_pipeline-run_delete
+  name: az acr pipeline-run delete
+  summary: Delete an export pipeline.
+  description: ''
+  syntax: >-
+    az acr pipeline-run delete --name
+                               --registry
+                               --resource-group
+  examples:
+  - summary: Delete an export pipeline.
+    syntax: az acr pipeline-run delete --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_pipeline-run_list
+  name: az acr pipeline-run list
+  summary: List pipelineruns of all pipelines on a container registry.
+  description: ''
+  syntax: >-
+    az acr pipeline-run list --registry
+                             --resource-group
+  examples:
+  - summary: List all export pipelines on a container registry
+    syntax: az acr pipeline-run list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_pipeline-run_show
+  name: az acr pipeline-run show
+  summary: Show an export pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr pipeline-run show --name
+                             --registry
+                             --resource-group
+  examples:
+  - summary: Show a specific export pipeline in detail.
+    syntax: az acr pipeline-run show --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_pipeline-run_create
+- az_acr_pipeline-run_delete
+- az_acr_pipeline-run_list
+- az_acr_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR import and export pipeline runs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad.yml b/2018-03-01-hybrid/docs-ref-autogen/ad.yml
index f843119468..4e8e0c6308 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad.yml
@@ -1,190 +1,75 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad
-  name: az ad
-  summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_ad
+name: az ad
+summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
+description: ''
 commands:
-- uid: az_ad_app
-  name: az ad app
-  summary: Manage applications with AAD Graph.
-- uid: az_ad_app_create
-  name: az ad app create
-  summary: Create a web application, web API or native application.
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
-- uid: az_ad_app_delete
-  name: az ad app delete
-  summary: Delete an application.
-- uid: az_ad_app_list
-  name: az ad app list
-  summary: List applications.
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
-- uid: az_ad_app_show
-  name: az ad app show
-  summary: Get the details of an application.
-- uid: az_ad_app_update
-  name: az ad app update
-  summary: Update an application.
-- uid: az_ad_group
-  name: az ad group
-  summary: Manage Azure Active Directory groups.
-- uid: az_ad_group_create
-  name: az ad group create
-  summary: Create a group in the directory.
-- uid: az_ad_group_delete
-  name: az ad group delete
-  summary: Delete a group from the directory.
-- uid: az_ad_group_get_member_groups
-  name: az ad group get-member-groups
-  summary: Gets a collection of object IDs of groups of which the specified group is a member.
-- uid: az_ad_group_list
-  name: az ad group list
-  summary: List groups in the directory.
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
-- uid: az_ad_group_show
-  name: az ad group show
-  summary: Gets group information from the directory.
-- uid: az_ad_signed_in_user
-  name: az ad signed-in-user
-  summary: Show graph information about current signed-in user in CLI.
-- uid: az_ad_signed_in_user_list_owned_objects
-  name: az ad signed-in-user list-owned-objects
-  summary: Get the list of directory objects that are owned by the user.
-- uid: az_ad_signed_in_user_show
-  name: az ad signed-in-user show
-  summary: Gets the details for the currently logged-in user.
-- uid: az_ad_sp
-  name: az ad sp
-  summary: Manage Azure Active Directory service principals for automation authentication.
-- uid: az_ad_sp_create
-  name: az ad sp create
-  summary: Create a service principal.
-- uid: az_ad_sp_create_for_rbac
-  name: az ad sp create-for-rbac
-  summary: Create a service principal and configure its access to Azure resources.
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
-- uid: az_ad_sp_delete
-  name: az ad sp delete
-  summary: Delete a service principal and its role assignments.
-- uid: az_ad_sp_list
-  name: az ad sp list
-  summary: List service principals.
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
-- uid: az_ad_sp_show
-  name: az ad sp show
-  summary: Get the details of a service principal.
-- uid: az_ad_sp_update
-  name: az ad sp update
-  summary: Update a service principal.
-- uid: az_ad_user
-  name: az ad user
-  summary: Manage Azure Active Directory users and user authentication.
-- uid: az_ad_user_create
-  name: az ad user create
-  summary: Create an Azure Active Directory user.
-- uid: az_ad_user_delete
-  name: az ad user delete
-  summary: Delete a user.
-- uid: az_ad_user_get_member_groups
-  name: az ad user get-member-groups
-  summary: Get groups of which the user is a member.
-- uid: az_ad_user_list
-  name: az ad user list
-  summary: List Azure Active Directory users.
-- uid: az_ad_user_show
-  name: az ad user show
-  summary: Gets user information from the directory.
-- uid: az_ad_user_update
-  name: az ad user update
-  summary: Update Azure Active Directory users.
+- az_ad_app
+- az_ad_app_create
+- az_ad_app_credential
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
+- az_ad_app_delete
+- az_ad_app_list
+- az_ad_app_owner
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
+- az_ad_app_permission
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
+- az_ad_app_show
+- az_ad_app_update
+- az_ad_ds
+- az_ad_ds_create
+- az_ad_ds_delete
+- az_ad_ds_list
+- az_ad_ds_show
+- az_ad_ds_update
+- az_ad_ds_wait
+- az_ad_group
+- az_ad_group_create
+- az_ad_group_delete
+- az_ad_group_get-member-groups
+- az_ad_group_list
+- az_ad_group_member
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
+- az_ad_group_owner
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
+- az_ad_group_show
+- az_ad_signed-in-user
+- az_ad_signed-in-user_list-owned-objects
+- az_ad_signed-in-user_show
+- az_ad_sp
+- az_ad_sp_create
+- az_ad_sp_create-for-rbac
+- az_ad_sp_credential
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
+- az_ad_sp_delete
+- az_ad_sp_list
+- az_ad_sp_owner
+- az_ad_sp_owner_list
+- az_ad_sp_show
+- az_ad_sp_update
+- az_ad_user
+- az_ad_user_create
+- az_ad_user_delete
+- az_ad_user_get-member-groups
+- az_ad_user_list
+- az_ad_user_show
+- az_ad_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +85,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/app.yml
index 5ed3dbe609..e704c73e5f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/app.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/app.yml
@@ -1,84 +1,90 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app
-  name: az ad app
-  summary: Manage applications with AAD Graph.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_create
-  - az_ad_app_delete
-  - az_ad_app_list
-  - az_ad_app_show
-  - az_ad_app_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_app
+name: az ad app
+summary: Manage applications with AAD Graph.
+description: ''
+directCommands:
 - uid: az_ad_app_create
   name: az ad app create
   summary: Create a web application, web API or native application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app create --display-name
+                     [--app-roles]
+                     [--available-to-other-tenants {false, true}]
+                     [--credential-description]
+                     [--end-date]
+                     [--homepage]
+                     [--identifier-uris]
+                     [--key-type {AsymmetricX509Cert, Password, Symmetric}]
+                     [--key-usage {Sign, Verify}]
+                     [--key-value]
+                     [--native-app {false, true}]
+                     [--oauth2-allow-implicit-flow {false, true}]
+                     [--optional-claims]
+                     [--password]
+                     [--reply-urls]
+                     [--required-resource-accesses]
+                     [--start-date]
   examples:
   - summary: Create a native application with delegated permission of "access the AAD directory as the signed-in user"
-    syntax:
-      content: >-
-        az ad app create --display-name my-native --native-app --required-resource-accesses @manifest.json
+    syntax: >-
+      az ad app create --display-name my-native --native-app --required-resource-accesses @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "resourceAppId": "00000002-0000-0000-c000-000000000000",
-            "resourceAccess": [
-                {
-                    "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
-                    "type": "Scope"
-                }
-           ]
-        }]
+      [{
+          "resourceAppId": "00000002-0000-0000-c000-000000000000",
+          "resourceAccess": [
+              {
+                  "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
+                  "type": "Scope"
+              }
+         ]
+      }]
   - summary: Create an application with a role
-    syntax:
-      content: >-
-        az ad app create --id e042ec79-34cd-498f-9d9f-123456781234 --display-name mytestapp --identifier-uris https://mytestapp.websites.net --app-roles @manifest.json
+    syntax: >-
+      az ad app create --display-name mytestapp --identifier-uris https://mytestapp.websites.net --app-roles @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "allowedMemberTypes": [
-              "User"
-            ],
-            "description": "Approvers can mark documents as approved",
-            "displayName": "Approver",
-            "isEnabled": "true",
-            "value": "approver"
-        }]
+      [{
+          "allowedMemberTypes": [
+            "User"
+          ],
+          "description": "Approvers can mark documents as approved",
+          "displayName": "Approver",
+          "isEnabled": "true",
+          "value": "approver"
+      }]
   - summary: Create an application with optional claims
-    syntax:
-      content: >-
-        az ad app create --display-name mytestapp --optional-claims @manifest.json
+    syntax: >-
+      az ad app create --display-name mytestapp --optional-claims @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        {
-            "idToken": [
-                {
-                    "name": "auth_time",
-                    "source": null,
-                    "essential": false
-                }
-            ],
-            "accessToken": [
-                {
-                    "name": "email",
-                    "source": null,
-                    "essential": false
-                }
-            ]
-        }
-  parameters:
+      {
+          "idToken": [
+              {
+                  "name": "auth_time",
+                  "source": null,
+                  "essential": false
+              }
+          ],
+          "accessToken": [
+              {
+                  "name": "email",
+                  "source": null,
+                  "essential": false
+              }
+          ]
+      }
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: The display name of the application.
     description: ''
+  optionalParameters:
   - name: --app-roles
     summary: Declare the roles you want to associate with your application. Should be in manifest json format. See examples below for details.
     description: ''
@@ -120,7 +126,7 @@ items:
     summary: Whether to allow implicit grant flow for OAuth2.
     description: ''
   - name: --optional-claims
-    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference <a href="https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type">https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type</a> for optional claim properties.
+    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type for optional claim properties.
     description: ''
   - name: --password
     summary: App password, aka 'client secret'.
@@ -134,40 +140,34 @@ items:
   - name: --start-date
     summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_delete
   name: az ad app delete
   summary: Delete an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad app delete --id
   examples:
   - summary: Delete an application. (autogenerated)
-    syntax:
-      content: az ad app delete --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app delete --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_list
   name: az ad app list
   summary: List applications.
   description: For low latency, by default, only the first 100 will be returned unless you provide filter arguments or use "--all".
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad app list [--all]
+                   [--app-id]
+                   [--display-name]
+                   [--filter]
+                   [--identifier-uri]
+                   [--query-examples]
+                   [--show-mine]
+  optionalParameters:
   - name: --all
     summary: List all entities, expect long delay if under a big organization.
     description: ''
@@ -183,106 +183,123 @@ items:
   - name: --identifier-uri
     summary: Graph application identifier, must be in uri format.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --show-mine
     summary: List entities owned by the current user.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_show
   name: az ad app show
   summary: Get the details of an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app show --id
+                   [--query-examples]
   examples:
   - summary: Get the details of an application. (autogenerated)
-    syntax:
-      content: az ad app show --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app show --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_update
   name: az ad app update
   summary: Update an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app update --id
+                     [--add]
+                     [--app-roles]
+                     [--available-to-other-tenants {false, true}]
+                     [--credential-description]
+                     [--display-name]
+                     [--end-date]
+                     [--force-string]
+                     [--homepage]
+                     [--identifier-uris]
+                     [--key-type {AsymmetricX509Cert, Password, Symmetric}]
+                     [--key-usage {Sign, Verify}]
+                     [--key-value]
+                     [--oauth2-allow-implicit-flow {false, true}]
+                     [--optional-claims]
+                     [--password]
+                     [--remove]
+                     [--reply-urls]
+                     [--required-resource-accesses]
+                     [--set]
+                     [--start-date]
   examples:
   - summary: update a native application with delegated permission of "access the AAD directory as the signed-in user"
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --required-resource-accesses @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --required-resource-accesses @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "resourceAppId": "00000002-0000-0000-c000-000000000000",
-            "resourceAccess": [
-                {
-                    "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
-                    "type": "Scope"
-                }
-           ]
-        }]
+      [{
+          "resourceAppId": "00000002-0000-0000-c000-000000000000",
+          "resourceAccess": [
+              {
+                  "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
+                  "type": "Scope"
+              }
+         ]
+      }]
   - summary: declare an application role
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --app-roles @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --app-roles @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "allowedMemberTypes": [
-              "User"
-            ],
-            "description": "Approvers can mark documents as approved",
-            "displayName": "Approver",
-            "isEnabled": "true",
-            "value": "approver"
-        }]
+      [{
+          "allowedMemberTypes": [
+            "User"
+          ],
+          "description": "Approvers can mark documents as approved",
+          "displayName": "Approver",
+          "isEnabled": "true",
+          "value": "approver"
+      }]
   - summary: update optional claims
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --optional-claims @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --optional-claims @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        {
-            "idToken": [
-                {
-                    "name": "auth_time",
-                    "source": null,
-                    "essential": false
-                }
-            ],
-            "accessToken": [
-                {
-                    "name": "email",
-                    "source": null,
-                    "essential": false
-                }
-            ]
-        }
+      {
+          "idToken": [
+              {
+                  "name": "auth_time",
+                  "source": null,
+                  "essential": false
+              }
+          ],
+          "accessToken": [
+              {
+                  "name": "email",
+                  "source": null,
+                  "essential": false
+              }
+          ]
+      }
   - summary: update an application's group membership claims to "All"
-    syntax:
-      content: az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --set groupMembershipClaims=All
-  parameters:
+    syntax: az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --set groupMembershipClaims=All
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --app-roles
     summary: Declare the roles you want to associate with your application. Should be in manifest json format. See examples below for details.
     description: ''
@@ -299,6 +316,9 @@ items:
   - name: --end-date
     summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --homepage
     summary: The url where users can sign in and use your app.
     description: ''
@@ -323,99 +343,48 @@ items:
     summary: Whether to allow implicit grant flow for OAuth2.
     description: ''
   - name: --optional-claims
-    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference <a href="https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type">https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type</a> for optional claim properties.
+    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type for optional claim properties.
     description: ''
   - name: --password
     summary: App password, aka 'client secret'.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --reply-urls
     summary: Space-separated URIs to which Azure AD will redirect in response to an OAuth 2.0 request. The value does not need to be a physical endpoint, but must be a valid URI.
     description: ''
   - name: --required-resource-accesses
     summary: Resource scopes and roles the application requires access to. Should be in manifest json format. See examples below for details.
     description: ''
-  - name: --start-date
-    summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --start-date
+    summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_create
-  name: az ad app create
-  summary: Create a web application, web API or native application.
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
-- uid: az_ad_app_delete
-  name: az ad app delete
-  summary: Delete an application.
-- uid: az_ad_app_list
-  name: az ad app list
-  summary: List applications.
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
-- uid: az_ad_app_show
-  name: az ad app show
-  summary: Get the details of an application.
-- uid: az_ad_app_update
-  name: az ad app update
-  summary: Update an application.
+- az_ad_app_create
+- az_ad_app_credential
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
+- az_ad_app_delete
+- az_ad_app_list
+- az_ad_app_owner
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
+- az_ad_app_permission
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
+- az_ad_app_show
+- az_ad_app_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -431,10 +400,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage applications with AAD Graph.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage applications with AAD Graph.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml
index b56156ff5a..b58c58b89a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml
@@ -1,26 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_credential_delete
-  - az_ad_app_credential_list
-  - az_ad_app_credential_reset
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_credential
+name: az ad app credential
+summary: Manage an application's password or certificate credentials.
+description: ''
+directCommands:
 - uid: az_ad_app_credential_delete
   name: az ad app credential delete
   summary: Delete an application's password or certificate credentials.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app credential delete --id
+                                --key-id
+                                [--cert]
   examples:
   - summary: delete an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad app credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -29,69 +24,86 @@ items:
     name: --key-id
     summary: Credential key id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_credential_list
   name: az ad app credential list
-  summary: List an application's password or certificate credentials.
+  summary: List an application's password or certificate credential metadata. (The content of the password or certificate credential is not retrievable.).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app credential list --id
+                              [--cert]
+                              [--query-examples]
   examples:
   - summary: list an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app credential list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_credential_reset
   name: az ad app credential reset
   summary: Append or overwrite an application's password or certificate credentials.
-  description: ''
-  langs:
-  - azurecli
+  description: The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az ad app credential reset --id
+                               [--append]
+                               [--cert]
+                               [--create-cert]
+                               [--credential-description]
+                               [--end-date]
+                               [--keyvault]
+                               [--password]
+                               [--years]
   examples:
+  - summary: Append a certificate to the application with the certificate string.
+    syntax: az ad app credential reset --id 00000000-0000-0000-0000-000000000000 --cert "MIICoT..." --append
+  - summary: Append a certificate to the application with the certificate file.
+    syntax: >-
+      az ad app credential reset --id 00000000-0000-0000-0000-000000000000 --cert "@~/cert.pem" --append
+
+      cert.pem contains the following content
+
+      -----BEGIN CERTIFICATE-----  <<< this line is optional
+
+      MIICoT...
+
+      -----END CERTIFICATE-----    <<< this line is optional
   - summary: append or overwrite an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential reset --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app credential reset --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --append
     summary: Append the new credential instead of overwriting.
     description: ''
-  - name: --credential-description
-    summary: The description of the password.
-    description: ''
-  - name: --end-date
-    summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
-    description: ''
   - name: --cert
     summary: Certificate to use for credentials.
     description: ''
   - name: --create-cert
     summary: Create a self-signed certificate to use for the credential.
     description: ''
+  - name: --credential-description
+    summary: The description of the password.
+    description: ''
+  - name: --end-date
+    summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
+    description: ''
   - name: --keyvault
     summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
     description: ''
@@ -101,22 +113,11 @@ items:
   - name: --years
     summary: Number of years for which the credentials will be valid.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -132,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage an application's password or certificate credentials.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage an application's password or certificate credentials.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml
index 0b8fbdc9e9..e023aa07a3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_owner_add
-  - az_ad_app_owner_list
-  - az_ad_app_owner_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_owner
+name: az ad app owner
+summary: Manage application owners.
+description: ''
+directCommands:
 - uid: az_ad_app_owner_add
   name: az ad app owner add
   summary: Add an application owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app owner add --id
+                        --owner-object-id
   examples:
   - summary: add an application owner. (autogenerated)
-    syntax:
-      content: az ad app owner add --id 00000000-0000-0000-0000-000000000000 --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad app owner add --id 00000000-0000-0000-0000-000000000000 --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -29,40 +23,35 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_owner_list
   name: az ad app owner list
   summary: List application owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app owner list --id
+                         [--query-examples]
   examples:
   - summary: List application owners. (autogenerated)
-    syntax:
-      content: az ad app owner list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app owner list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_owner_remove
   name: az ad app owner remove
   summary: Remove an application owner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad app owner remove --id
+                           --owner-object-id
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -71,22 +60,11 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +80,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage application owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage application owners.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml
index 0452d8f7b7..74f2d3e691 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml
@@ -1,112 +1,111 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_permission_add
-  - az_ad_app_permission_admin_consent
-  - az_ad_app_permission_delete
-  - az_ad_app_permission_grant
-  - az_ad_app_permission_list
-  - az_ad_app_permission_list_grants
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_permission
+name: az ad app permission
+summary: Manage an application's OAuth2 permissions.
+description: ''
+directCommands:
 - uid: az_ad_app_permission_add
   name: az ad app permission add
   summary: Add an API permission.
-  description: Invoking "az ad app permission grant" is needed to activate it.
-  langs:
-  - azurecli
+  description: >-
+    Invoking "az ad app permission grant" is needed to activate it.
+
+
+    To get available permissions of the resource app, run `az ad sp show --id <resource-appId>`. For example, to get available permissions for Graph API:
+      - Azure Active Directory Graph: `az ad sp show --id 00000002-0000-0000-c000-000000000000`
+      - Microsoft Graph: `az ad sp show --id 00000003-0000-0000-c000-000000000000`
+    Application permissions under the `appRoles` property correspond to `Role` in --api-permissions. Delegated permissions under the `oauth2Permissions` property correspond to `Scope` in --api-permissions.
+  syntax: >-
+    az ad app permission add --api
+                             --api-permissions
+                             --id
   examples:
-  - summary: add a Graph API permission of "Sign in and read user profile"
-    syntax:
-      content: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6=Scope
-  parameters:
+  - summary: Add Azure Active Directory Graph delegated permission User.Read (Sign in and read user profile).
+    syntax: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6=Scope
+  - summary: Add Azure Active Directory Graph application permission Application.ReadWrite.All (Read and write all applications).
+    syntax: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 1cda74f2-2616-4834-b122-5cb1b07f8a59=Role
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --api-permissions
-    summary: Space separated list of `&lt;resource-access-id&gt;=&lt;type&gt;`.
+    summary: Specify `ResourceAccess.id` - The unique identifier for one of the OAuth2Permission or AppRole instances that the resource application exposes. Space-separated list of `<resource-access-id>=<type>`.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_app_permission_admin_consent
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_app_permission_admin-consent
   name: az ad app permission admin-consent
   summary: Grant Application & Delegated permissions through admin-consent.
   description: You must login as a directory administrator.
-  langs:
-  - azurecli
+  syntax: az ad app permission admin-consent --id
   examples:
-  - summary: grant Application & Delegated permissions through admin-consent. (autogenerated)
-    syntax:
-      content: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
-  parameters:
+  - summary: Grant Application & Delegated permissions through admin-consent. (autogenerated)
+    syntax: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_delete
   name: az ad app permission delete
   summary: Remove an API permission.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission delete --api
+                                --id
+                                [--api-permissions]
   examples:
-  - summary: remove an AAD graph permission
-    syntax:
-      content: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000
-  parameters:
+  - summary: Remove Azure Active Directory Graph permissions.
+    syntax: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000
+  - summary: Remove Azure Active Directory Graph delegated permission User.Read (Sign in and read user profile).
+    syntax: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --api-permissions
+    summary: Specify `ResourceAccess.id` - The unique identifier for one of the OAuth2Permission or AppRole instances that the resource application exposes. Space-separated list of `<resource-access-id>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_grant
   name: az ad app permission grant
   summary: Grant the app an API Delegated permissions.
-  description: For Application permissions, please use "ad app permission admin-consent".
-  langs:
-  - azurecli
+  description: >-
+    A service principal must exist for the app when running this command. To create a corresponding service principal, use `az ad sp create --id {appId}`.
+
+    For Application permissions, please use "ad app permission admin-consent".
+  syntax: >-
+    az ad app permission grant --api
+                               --id
+                               [--consent-type {AllPrincipals, Principal}]
+                               [--expires]
+                               [--principal-id]
+                               [--scope]
   examples:
   - summary: Grant a native application with permissions to access an existing API with TTL of 2 years
-    syntax:
-      content: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --api a0322f79-57df-498f-9d9f-12678 --expires 2
-  parameters:
+    syntax: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --api a0322f79-57df-498f-9d9f-12678 --expires 2
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --consent-type
     defaultValue: AllPrincipals
     parameterValueGroup: AllPrincipals, Principal
@@ -123,44 +122,39 @@ items:
     defaultValue: user_impersonation
     summary: Specifies the value of the scope claim that the resource application should expect in the OAuth 2.0 access token, e.g. User.Read.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_list
   name: az ad app permission list
   summary: List API permissions the application has requested.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission list --id
+                              [--query-examples]
   examples:
   - summary: List the OAuth2 permissions for an existing AAD app
-    syntax:
-      content: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234
-  parameters:
+    syntax: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the associated application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_app_permission_list_grants
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_app_permission_list-grants
   name: az ad app permission list-grants
   summary: List Oauth2 permission grants.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission list-grants [--filter]
+                                     [--id]
+                                     [--show-resource-name {false, true}]
   examples:
   - summary: list oauth2 permissions granted to the service principal
-    syntax:
-      content: az ad app permission list-grants --id e042ec79-34cd-498f-9d9f-1234234123456
-  parameters:
+    syntax: az ad app permission list-grants --id e042ec79-34cd-498f-9d9f-1234234123456
+  optionalParameters:
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
@@ -171,31 +165,14 @@ items:
     parameterValueGroup: false, true
     summary: Show resource's display name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,10 +188,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage an application's OAuth2 permissions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage an application's OAuth2 permissions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/ds.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/ds.yml
new file mode 100644
index 0000000000..f02cede4fd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/ds.yml
@@ -0,0 +1,438 @@
+### YamlMime:AzureCLIGroup
+uid: az_ad_ds
+name: az ad ds
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ad** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ad ds** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage domain service with azure active directory.
+description: ''
+directCommands:
+- uid: az_ad_ds_create
+  name: az ad ds create
+  summary: Create a new domain service with the specified parameters.
+  description: ''
+  syntax: >-
+    az ad ds create --domain
+                    --name
+                    --replica-sets
+                    --resource-group
+                    [--domain-config-type {FullySynced, ResourceTrusting}]
+                    [--external-access {Disabled, Enabled}]
+                    [--filtered-sync {Disabled, Enabled}]
+                    [--ldaps {Disabled, Enabled}]
+                    [--no-wait]
+                    [--notify-dc-admins {Disabled, Enabled}]
+                    [--notify-global-admins {Disabled, Enabled}]
+                    [--notify-others]
+                    [--ntlm-v1 {Disabled, Enabled}]
+                    [--pfx-cert]
+                    [--pfx-cert-pwd]
+                    [--resource-forest {Disabled, Enabled}]
+                    [--settings]
+                    [--sku {Enterprise, Premium, Standard}]
+                    [--sync-kerberos-pwd {Disabled, Enabled}]
+                    [--sync-ntlm-pwd {Disabled, Enabled}]
+                    [--sync-on-prem-pwd {Disabled, Enabled}]
+                    [--tags]
+                    [--tls-v1 {Disabled, Enabled}]
+  examples:
+  - summary: Create Domain Service
+    syntax: az ad ds create --domain "TestDS.com" --replica-sets location="West US" subnet-id="<subnetId>" --name "TestDS.com" --resource-group "rg"
+  - summary: Create Domain Service with specified settings (Line breaks for legibility only)
+    syntax: >-
+      az ad ds create --domain "TestDS.com" --replica-sets location="West US" subnet-id="<subnetId>" --name "TestDS.com" --resource-group "rg"
+
+      --ntlm-v1 "Enabled" --sync-ntlm-pwd "Enabled" --tls-v1 "Disabled" --filtered-sync "Enabled" --external-access "Enabled"
+
+      --ldaps "Enabled" --pfx-cert "cert or path to cert" --pfx-cert-pwd "<pfxCertificatePassword>"
+
+      --notify-others "a@gmail.com" "b@gmail.com" --notify-dc-admins "Enabled" --notify-global-admins "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --domain
+    summary: The name of the Azure domain that the user would like to deploy Domain Services to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --replica-sets
+    summary: List of ReplicaSets.
+    description: >-
+      Usage: --replica-sets location=XX subnet-id=XX
+
+
+      location: Virtual network location
+
+      subnet-id: The id of the subnet that Domain Services will be deployed on.
+
+
+      Multiple actions can be specified by using more than one --replica-sets argument.
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --domain-config-type
+    parameterValueGroup: FullySynced, ResourceTrusting
+    summary: Domain Configuration Type.
+    description: ''
+  - name: --external-access
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP access over the internet is enabled or disabled.
+    description: ''
+  - name: --filtered-sync
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled or Disabled flag to turn on Group-based filtered sync.
+    description: ''
+  - name: --ldaps
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP is enabled or disabled.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notify-dc-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should domain controller admins be notified.
+    description: ''
+  - name: --notify-global-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should global admins be notified.
+    description: ''
+  - name: --notify-others
+    summary: The list of additional recipients.
+    description: ''
+  - name: --ntlm-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not NtlmV1 is enabled or disabled.
+    description: ''
+  - name: --pfx-cert
+    summary: The certificate required to configure Secure LDAP. The parameter passed here should be the file path to the certificate pfx file or a base64encoded representation of the certificate pfx file.
+    description: ''
+  - name: --pfx-cert-pwd
+    summary: The password to decrypt the provided Secure LDAP certificate pfx file.
+    description: ''
+  - name: --resource-forest
+    parameterValueGroup: Disabled, Enabled
+    summary: Resource Forest.
+    description: ''
+  - name: --settings
+    summary: List of settings for Resource Forest. This can be either a JSON-formatted string or the location to a file containing the JSON object.
+    description: >-
+      The format of the settings JSON object for Resource Forest:
+
+      [
+          {
+              "trusted_domain_fqdn": "XX",
+              "trust_direction": "XX",
+              "friendly_name": "XX",
+              "remote_dns_ips": "XX",
+              "trust_password": "XX"
+          },
+          ...n
+      ].
+  - name: --sku
+    parameterValueGroup: Enterprise, Premium, Standard
+    summary: Sku Type.
+    description: ''
+  - name: --sync-kerberos-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncKerberosPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-ntlm-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-on-prem-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncOnPremPasswords is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --tls-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not TlsV1 is enabled or disabled.
+    description: ''
+- uid: az_ad_ds_delete
+  name: az ad ds delete
+  summary: The Delete Domain Service operation deletes an existing Domain Service.
+  description: ''
+  syntax: >-
+    az ad ds delete --name
+                    --resource-group
+                    [--no-wait]
+                    [--yes]
+  examples:
+  - summary: Delete Domain Service
+    syntax: az ad ds delete --name "TestDomainService.com" --resource-group "TestResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ad_ds_list
+  name: az ad ds list
+  summary: List domain services in resource group or in subscription.
+  description: ''
+  syntax: az ad ds list [--resource-group]
+  examples:
+  - summary: List Domain Service By Group
+    syntax: az ad ds list --resource-group "TestResourceGroup"
+  - summary: List Domain Service By Sub
+    syntax: az ad ds list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ad_ds_show
+  name: az ad ds show
+  summary: Get the specified domain service.
+  description: ''
+  syntax: >-
+    az ad ds show --name
+                  --resource-group
+  examples:
+  - summary: Get Domain Service
+    syntax: az ad ds show --name "TestDomainService.com" --resource-group "TestResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ad_ds_update
+  name: az ad ds update
+  summary: Update the existing deployment properties for domain service.
+  description: ''
+  syntax: >-
+    az ad ds update --name
+                    --resource-group
+                    [--domain-config-type {FullySynced, ResourceTrusting}]
+                    [--external-access {Disabled, Enabled}]
+                    [--filtered-sync {Disabled, Enabled}]
+                    [--ldaps {Disabled, Enabled}]
+                    [--no-wait]
+                    [--notify-dc-admins {Disabled, Enabled}]
+                    [--notify-global-admins {Disabled, Enabled}]
+                    [--notify-others]
+                    [--ntlm-v1 {Disabled, Enabled}]
+                    [--pfx-cert]
+                    [--pfx-cert-pwd]
+                    [--replica-sets]
+                    [--resource-forest {Disabled, Enabled}]
+                    [--settings]
+                    [--sku {Enterprise, Premium, Standard}]
+                    [--sync-kerberos-pwd {Disabled, Enabled}]
+                    [--sync-ntlm-pwd {Disabled, Enabled}]
+                    [--sync-on-prem-pwd {Disabled, Enabled}]
+                    [--tags]
+                    [--tls-v1 {Disabled, Enabled}]
+  examples:
+  - summary: Update sku
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --sku "Enterprise"
+  - summary: Update domain security settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --ntlm-v1 "Enabled" --tls-v1 "Disabled"
+  - summary: Update ldaps settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --external-access "Enabled" --ldaps "Enabled" --pfx-cert "MIIDPDCCAiSg..." --pfx-cert-pwd "<pfxCertificatePassword>"
+  - summary: Update notification settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --notify-dc-admins "Enabled" --notify-global-admins "Disabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --domain-config-type
+    parameterValueGroup: FullySynced, ResourceTrusting
+    summary: Domain Configuration Type.
+    description: ''
+  - name: --external-access
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP access over the internet is enabled or disabled.
+    description: ''
+  - name: --filtered-sync
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled or Disabled flag to turn on Group-based filtered sync.
+    description: ''
+  - name: --ldaps
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP is enabled or disabled.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notify-dc-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should domain controller admins be notified.
+    description: ''
+  - name: --notify-global-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should global admins be notified.
+    description: ''
+  - name: --notify-others
+    summary: The list of additional recipients.
+    description: ''
+  - name: --ntlm-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not NtlmV1 is enabled or disabled.
+    description: ''
+  - name: --pfx-cert
+    summary: The certificate required to configure Secure LDAP. The parameter passed here should be the file path to the certificate pfx file or a base64encoded representation of the certificate pfx file.
+    description: ''
+  - name: --pfx-cert-pwd
+    summary: The password to decrypt the provided Secure LDAP certificate pfx file.
+    description: ''
+  - name: --replica-sets
+    summary: List of ReplicaSets.
+    description: >-
+      Usage: --replica-sets location=XX subnet-id=XX
+
+
+      location: Virtual network location
+
+      subnet-id: The id of the subnet that Domain Services will be deployed on.
+
+
+      Multiple actions can be specified by using more than one --replica-sets argument.
+  - name: --resource-forest
+    parameterValueGroup: Disabled, Enabled
+    summary: Resource Forest.
+    description: ''
+  - name: --settings
+    summary: List of settings for Resource Forest. This can be either a JSON-formatted string or the location to a file containing the JSON object.
+    description: >-
+      The format of the settings JSON object for Resource Forest:
+
+      [
+          {
+              "trusted_domain_fqdn": "XX",
+              "trust_direction": "XX",
+              "friendly_name": "XX",
+              "remote_dns_ips": "XX",
+              "trust_password": "XX"
+          },
+          ...n
+      ].
+  - name: --sku
+    parameterValueGroup: Enterprise, Premium, Standard
+    summary: Sku Type.
+    description: ''
+  - name: --sync-kerberos-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncKerberosPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-ntlm-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-on-prem-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncOnPremPasswords is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --tls-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not TlsV1 is enabled or disabled.
+    description: ''
+- uid: az_ad_ds_wait
+  name: az ad ds wait
+  summary: Place the CLI in a waiting state until a condition of the ad ds is met.
+  description: ''
+  syntax: >-
+    az ad ds wait --name
+                  --resource-group
+                  [--created]
+                  [--custom]
+                  [--deleted]
+                  [--exists]
+                  [--interval]
+                  [--timeout]
+                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the ad ds is successfully created.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the ad ds is successfully updated.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the ad ds is successfully deleted.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_ad_ds_create
+- az_ad_ds_delete
+- az_ad_ds_list
+- az_ad_ds_show
+- az_ad_ds_update
+- az_ad_ds_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage domain service with azure active directory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/group.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/group.yml
index 12abd57e91..083e51c7e2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/group.yml
@@ -1,28 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group
-  name: az ad group
-  summary: Manage Azure Active Directory groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_create
-  - az_ad_group_delete
-  - az_ad_group_get_member_groups
-  - az_ad_group_list
-  - az_ad_group_show
+### YamlMime:AzureCLIGroup
+uid: az_ad_group
+name: az ad group
+summary: Manage Azure Active Directory groups.
+description: ''
+directCommands:
 - uid: az_ad_group_create
   name: az ad group create
   summary: Create a group in the directory.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group create --display-name
+                       --mail-nickname
+                       [--description]
+                       [--force {false, true}]
   examples:
   - summary: Create a group in the directory. (autogenerated)
-    syntax:
-      content: az ad group create --display-name MyDisplay --mail-nickname MyDisplay
-  parameters:
+    syntax: az ad group create --display-name MyDisplay --mail-nickname MyDisplay
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: Object's display name or its prefix.
@@ -31,44 +25,40 @@ items:
     name: --mail-nickname
     summary: Mail nickname.
     description: ''
+  optionalParameters:
+  - name: --description
+    summary: Group description.
+    description: ''
   - name: --force
     parameterValueGroup: false, true
     summary: Always create a new group instead of updating the one with same display and mail nickname.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_delete
   name: az ad group delete
   summary: Delete a group from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad group delete --group
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_group_get_member_groups
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_group_get-member-groups
   name: az ad group get-member-groups
   summary: Gets a collection of object IDs of groups of which the specified group is a member.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group get-member-groups --group
+                                  [--additional-properties]
+                                  [--security-enabled-only {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
+  optionalParameters:
   - name: --additional-properties
     summary: Unmatched properties from the message are deserialized this collection.
     description: ''
@@ -76,91 +66,58 @@ items:
     parameterValueGroup: false, true
     summary: If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_list
   name: az ad group list
   summary: List groups in the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group list [--display-name]
+                     [--filter]
+                     [--query-examples]
+  optionalParameters:
   - name: --display-name
     summary: Object's display name or its prefix.
     description: ''
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_show
   name: az ad group show
   summary: Gets group information from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group show --group
+                     [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_create
-  name: az ad group create
-  summary: Create a group in the directory.
-- uid: az_ad_group_delete
-  name: az ad group delete
-  summary: Delete a group from the directory.
-- uid: az_ad_group_get_member_groups
-  name: az ad group get-member-groups
-  summary: Gets a collection of object IDs of groups of which the specified group is a member.
-- uid: az_ad_group_list
-  name: az ad group list
-  summary: List groups in the directory.
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
-- uid: az_ad_group_show
-  name: az ad group show
-  summary: Gets group information from the directory.
+- az_ad_group_create
+- az_ad_group_delete
+- az_ad_group_get-member-groups
+- az_ad_group_list
+- az_ad_group_member
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
+- az_ad_group_owner
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
+- az_ad_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/group/member.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/group/member.yml
index 89af3cbdaa..e5705aa209 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/group/member.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/group/member.yml
@@ -1,23 +1,18 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_member_add
-  - az_ad_group_member_check
-  - az_ad_group_member_list
-  - az_ad_group_member_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_group_member
+name: az ad group member
+summary: Manage Azure Active Directory group members.
+description: ''
+directCommands:
 - uid: az_ad_group_member_add
   name: az ad group member add
   summary: Add a member to a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member add --group
+                           --member-id
+                           [--additional-properties]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -26,26 +21,22 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
+  optionalParameters:
   - name: --additional-properties
     summary: Unmatched properties from the message are deserialized this collection.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_check
   name: az ad group member check
   summary: Check if a member is in a group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group member check --group
+                             --member-id
   examples:
   - summary: Check if a member is in a group. (autogenerated)
-    syntax:
-      content: az ad group member check --group MyGroupDisplayName --member-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group member check --group MyGroupDisplayName --member-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -54,36 +45,32 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_list
   name: az ad group member list
   summary: Gets the members of a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member list --group
+                            [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_remove
   name: az ad group member remove
   summary: Remove a member from a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member remove --group
+                              --member-id
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -92,25 +79,12 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -126,10 +100,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory group members.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory group members.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml
index e58e19029f..5a879fb16d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_owner_add
-  - az_ad_group_owner_list
-  - az_ad_group_owner_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_group_owner
+name: az ad group owner
+summary: Manage Azure Active Directory group owners.
+description: ''
+directCommands:
 - uid: az_ad_group_owner_add
   name: az ad group owner add
   summary: Add a group owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner add --group
+                          --owner-object-id
   examples:
   - summary: add a group owner. (autogenerated)
-    syntax:
-      content: az ad group owner add --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group owner add --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -29,44 +23,38 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_owner_list
   name: az ad group owner list
   summary: List group owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner list --group
+                           [--query-examples]
   examples:
   - summary: List group owners. (autogenerated)
-    syntax:
-      content: az ad group owner list --group MyGroupDisplayName
-  parameters:
+    syntax: az ad group owner list --group MyGroupDisplayName
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_owner_remove
   name: az ad group owner remove
   summary: Remove a group owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner remove --group
+                             --owner-object-id
   examples:
   - summary: remove a group owner. (autogenerated)
-    syntax:
-      content: az ad group owner remove --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group owner remove --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -75,22 +63,11 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,10 +83,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory group owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory group owners.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml
index 88125e52b8..e485ad5b81 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml
@@ -1,50 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_signed_in_user
-  name: az ad signed-in-user
-  summary: Show graph information about current signed-in user in CLI.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_signed_in_user_list_owned_objects
-  - az_ad_signed_in_user_show
-- uid: az_ad_signed_in_user_list_owned_objects
+### YamlMime:AzureCLIGroup
+uid: az_ad_signed-in-user
+name: az ad signed-in-user
+summary: Show graph information about current signed-in user in CLI.
+description: ''
+directCommands:
+- uid: az_ad_signed-in-user_list-owned-objects
   name: az ad signed-in-user list-owned-objects
   summary: Get the list of directory objects that are owned by the user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad signed-in-user list-owned-objects [--type]
+  optionalParameters:
   - name: --type -t
     summary: Object type filter, e.g. "application", "servicePrincipal"  "group", etc.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_signed_in_user_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_signed-in-user_show
   name: az ad signed-in-user show
   summary: Gets the details for the currently logged-in user.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  syntax: az ad signed-in-user show [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_signed_in_user_list_owned_objects
-  name: az ad signed-in-user list-owned-objects
-  summary: Get the list of directory objects that are owned by the user.
-- uid: az_ad_signed_in_user_show
-  name: az ad signed-in-user show
-  summary: Gets the details for the currently logged-in user.
+- az_ad_signed-in-user_list-owned-objects
+- az_ad_signed-in-user_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -60,10 +42,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Show graph information about current signed-in user in CLI.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Show graph information about current signed-in user in CLI.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/sp.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/sp.yml
index 45ef6d1a48..b25acb5f25 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/sp.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/sp.yml
@@ -1,80 +1,77 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp
-  name: az ad sp
-  summary: Manage Azure Active Directory service principals for automation authentication.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_create
-  - az_ad_sp_create_for_rbac
-  - az_ad_sp_delete
-  - az_ad_sp_list
-  - az_ad_sp_show
-  - az_ad_sp_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp
+name: az ad sp
+summary: Manage Azure Active Directory service principals for automation authentication.
+description: ''
+directCommands:
 - uid: az_ad_sp_create
   name: az ad sp create
   summary: Create a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad sp create --id
   examples:
   - summary: Create a service principal. (autogenerated)
-    syntax:
-      content: az ad sp create --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp create --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the associated application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_sp_create_for_rbac
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_sp_create-for-rbac
   name: az ad sp create-for-rbac
   summary: Create a service principal and configure its access to Azure resources.
-  description: ''
-  langs:
-  - azurecli
+  description: >-
+    The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+
+
+    By default, this command assigns the 'Contributor' role to the service principal at the subscription scope. To reduce your risk of a compromised service principal, use --skip-assignment to avoid creating a role assignment, then assign a more specific role and narrow the scope to a resource or resource group. See [steps to add a role assignment](https://aka.ms/azadsp-more) for more information.
+
+
+    WARNING: In a future release, this command will NOT create a 'Contributor' role assignment by default. If needed, use the --role argument to explicitly create a role assignment.
+  syntax: >-
+    az ad sp create-for-rbac [--cert]
+                             [--create-cert]
+                             [--keyvault]
+                             [--name]
+                             [--role]
+                             [--scopes]
+                             [--sdk-auth {false, true}]
+                             [--skip-assignment {false, true}]
+                             [--years]
   examples:
   - summary: Create with a default role assignment.
-    syntax:
-      content: az ad sp create-for-rbac
+    syntax: az ad sp create-for-rbac
   - summary: Create using a custom name, and with a default assignment.
-    syntax:
-      content: az ad sp create-for-rbac -n "MyApp"
+    syntax: az ad sp create-for-rbac -n "MyApp"
   - summary: Create without a default assignment.
-    syntax:
-      content: az ad sp create-for-rbac --skip-assignment
-  - summary: Create with customized contributor assignments.
-    syntax:
-      content: >-
-        az ad sp create-for-rbac -n "MyApp" --role contributor \
-            --scopes /subscriptions/{SubID}/resourceGroups/{ResourceGroup1} \
-            /subscriptions/{SubID}/resourceGroups/{ResourceGroup2}
+    syntax: az ad sp create-for-rbac --skip-assignment
+  - summary: Create with a Contributor role assignments on specified scope.
+    syntax: az ad sp create-for-rbac -n "MyApp" --role Contributor --scopes /subscriptions/{SubID}/resourceGroups/{ResourceGroup1} /subscriptions/{SubID}/resourceGroups/{ResourceGroup2}
   - summary: Create using a self-signed certificate.
-    syntax:
-      content: az ad sp create-for-rbac --create-cert
+    syntax: az ad sp create-for-rbac --create-cert
   - summary: Create using a self-signed certificate, and store it within KeyVault.
-    syntax:
-      content: az ad sp create-for-rbac --keyvault MyVault --cert CertName --create-cert
+    syntax: az ad sp create-for-rbac --keyvault MyVault --cert CertName --create-cert
   - summary: Create using existing certificate in KeyVault.
-    syntax:
-      content: az ad sp create-for-rbac --keyvault MyVault --cert CertName
-  parameters:
+    syntax: az ad sp create-for-rbac --keyvault MyVault --cert CertName
+  optionalParameters:
+  - name: --cert
+    summary: Certificate to use for credentials.
+    description: When used with `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
+  - name: --create-cert
+    summary: Create a self-signed certificate to use for the credential. Only the current OS user has read/write permission to this certificate.
+    description: Use with `--keyvault` to create the certificate in Key Vault. Otherwise, a certificate will be created locally.
+  - name: --keyvault
+    summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
+    description: ''
   - name: --name -n
     summary: A URI to use as the logic name. It doesn't need to exist. If not present, CLI will generate one.
     description: ''
   - name: --role
-    defaultValue: Contributor
     summary: Role of the service principal.
     description: ''
   - name: --scopes
-    summary: Space-separated list of scopes the service principal's role assignment applies to. Defaults to the root of the current subscription.
+    summary: Space-separated list of scopes the service principal's role assignment applies to. Defaults to the root of the current subscription. e.g., /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333, /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup, or /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM.
     description: ''
   - name: --sdk-auth
     parameterValueGroup: false, true
@@ -82,54 +79,38 @@ items:
     description: ''
   - name: --skip-assignment
     parameterValueGroup: false, true
-    summary: Skip creating the default assignment, which allows the service principal to access resources under the current subscription.
-    description: ''
-  - name: --cert
-    summary: Certificate to use for credentials.
-    description: When used with `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
-  - name: --create-cert
-    summary: Create a self-signed certificate to use for the credential.
-    description: Use with `--keyvault` to create the certificate in Key Vault. Otherwise, a certificate will be created locally.
-  - name: --keyvault
-    summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
+    summary: Skip creating the default assignment, which allows the service principal to access resources under the current subscription. When specified, --scopes will be ignored. You may use `az role assignment create` to create role assignments for this service principal later.
     description: ''
   - name: --years
     summary: 'Number of years for which the credentials will be valid. Default: 1 year.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_delete
   name: az ad sp delete
   summary: Delete a service principal and its role assignments.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad sp delete --id
   examples:
   - summary: Delete a service principal and its role assignments. (autogenerated)
-    syntax:
-      content: az ad sp delete --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp delete --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_list
   name: az ad sp list
   summary: List service principals.
   description: For low latency, by default, only the first 100 will be returned unless you provide filter arguments or use "--all".
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad sp list [--all]
+                  [--display-name]
+                  [--filter]
+                  [--query-examples]
+                  [--show-mine]
+                  [--spn]
+  optionalParameters:
   - name: --all
     summary: List all entities, expect long delay if under a big organization.
     description: ''
@@ -139,54 +120,55 @@ items:
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --show-mine
     summary: List entities owned by the current user.
     description: ''
   - name: --spn
     summary: Service principal name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_show
   name: az ad sp show
   summary: Get the details of a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp show --id
+                  [--query-examples]
   examples:
   - summary: Get the details of a service principal. (autogenerated)
-    syntax:
-      content: az ad sp show --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp show --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_update
   name: az ad sp update
   summary: Update a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp update --id
+                    [--add]
+                    [--force-string]
+                    [--remove]
+                    [--set]
   examples:
   - summary: update a service principal (autogenerated)
-    syntax:
-      content: az ad sp update --id 00000000-0000-0000-0000-000000000000 --set groupMembershipClaims=All
-  parameters:
+    syntax: az ad sp update --id 00000000-0000-0000-0000-000000000000 --set groupMembershipClaims=All
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
@@ -199,49 +181,20 @@ items:
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_create
-  name: az ad sp create
-  summary: Create a service principal.
-- uid: az_ad_sp_create_for_rbac
-  name: az ad sp create-for-rbac
-  summary: Create a service principal and configure its access to Azure resources.
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
-- uid: az_ad_sp_delete
-  name: az ad sp delete
-  summary: Delete a service principal and its role assignments.
-- uid: az_ad_sp_list
-  name: az ad sp list
-  summary: List service principals.
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
-- uid: az_ad_sp_show
-  name: az ad sp show
-  summary: Get the details of a service principal.
-- uid: az_ad_sp_update
-  name: az ad sp update
-  summary: Update a service principal.
+- az_ad_sp_create
+- az_ad_sp_create-for-rbac
+- az_ad_sp_credential
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
+- az_ad_sp_delete
+- az_ad_sp_list
+- az_ad_sp_owner
+- az_ad_sp_owner_list
+- az_ad_sp_show
+- az_ad_sp_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -257,10 +210,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory service principals for automation authentication.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory service principals for automation authentication.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml
index 80370c6e38..a383215bb5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml
@@ -1,26 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-  description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_credential_delete
-  - az_ad_sp_credential_list
-  - az_ad_sp_credential_reset
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp_credential
+name: az ad sp credential
+summary: Manage a service principal's credentials.
+description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
+directCommands:
 - uid: az_ad_sp_credential_delete
   name: az ad sp credential delete
   summary: Delete a service principal's credential.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp credential delete --id
+                               --key-id
+                               [--cert]
   examples:
-  - summary: delete a service principal's credential. (autogenerated)
-    syntax:
-      content: az ad sp credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+  - summary: Delete a service principal's credential. (autogenerated)
+    syntax: az ad sp credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
@@ -29,54 +24,75 @@ items:
     name: --key-id
     summary: Credential key id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_credential_list
   name: az ad sp credential list
   summary: List a service principal's credentials.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp credential list --id
+                             [--cert]
+                             [--query-examples]
   examples:
-  - summary: list a service principal's credentials. (autogenerated)
-    syntax:
-      content: az ad sp credential list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+  - summary: List a service principal's credentials. (autogenerated)
+    syntax: az ad sp credential list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_credential_reset
   name: az ad sp credential reset
   summary: Reset a service principal credential.
-  description: Use upon expiration of the service principal's credentials, or in the event that login credentials are lost.
-  langs:
-  - azurecli
+  description: >-
+    Use upon expiration of the service principal's credentials, or in the event that login credentials are lost.
+
+
+    The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az ad sp credential reset --name
+                              [--append]
+                              [--cert]
+                              [--create-cert]
+                              [--credential-description]
+                              [--end-date]
+                              [--keyvault]
+                              [--password]
+                              [--years]
   examples:
+  - summary: Append a certificate to the service principal with the certificate string.
+    syntax: az ad sp credential reset --name myapp --cert "MIICoT..." --append
+  - summary: Append a certificate to the service principal with the certificate file.
+    syntax: >-
+      az ad sp credential reset --name myapp --cert "@~/cert.pem" --append
+
+      cert.pem contains the following content
+
+      -----BEGIN CERTIFICATE-----  <<< this line is optional
+
+      MIICoT...
+
+      -----END CERTIFICATE-----    <<< this line is optional
   - summary: Reset a service principal credential. (autogenerated)
-    syntax:
-      content: az ad sp credential reset --name MyAppURIForCredential
-  parameters:
+    syntax: az ad sp credential reset --name MyAppURIForCredential
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name or app ID of the service principal.
     description: ''
+  optionalParameters:
   - name: --append
     summary: Append the new credential instead of overwriting.
     description: ''
@@ -101,22 +117,11 @@ items:
   - name: --years
     summary: 'Number of years for which the credentials will be valid. Default: 1 year.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -132,10 +137,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml
index 2480bcb6bc..ef2fe89a5c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml
@@ -1,38 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_owner_list
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp_owner
+name: az ad sp owner
+summary: Manage service principal owners.
+description: ''
+directCommands:
 - uid: az_ad_sp_owner_list
   name: az ad sp owner list
   summary: List service principal owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp owner list --id
+                        [--query-examples]
   examples:
   - summary: List service principal owners. (autogenerated)
-    syntax:
-      content: az ad sp owner list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp owner list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id or the service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
+- az_ad_sp_owner_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -48,10 +41,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage service principal owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage service principal owners.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ad/user.yml b/2018-03-01-hybrid/docs-ref-autogen/ad/user.yml
index 01908ef4d4..b743b865df 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/ad/user.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/ad/user.yml
@@ -1,25 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_user
-  name: az ad user
-  summary: Manage Azure Active Directory users and user authentication.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_user_create
-  - az_ad_user_delete
-  - az_ad_user_get_member_groups
-  - az_ad_user_list
-  - az_ad_user_show
-  - az_ad_user_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_user
+name: az ad user
+summary: Manage Azure Active Directory users and user authentication.
+description: ''
+directCommands:
 - uid: az_ad_user_create
   name: az ad user create
   summary: Create an Azure Active Directory user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user create --display-name
+                      --password
+                      --user-principal-name
+                      [--force-change-password-next-login {false, true}]
+                      [--immutable-id]
+                      [--mail-nickname]
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: Object's display name or its prefix.
@@ -32,9 +28,10 @@ items:
     name: --user-principal-name
     summary: Required. The user principal name (someuser@contoso.com). It must contain one of the verified domains for the tenant.
     description: ''
+  optionalParameters:
   - name: --force-change-password-next-login
     parameterValueGroup: false, true
-    summary: Marks this user as needing to update their password the next time they authenticate.
+    summary: Marks this user as needing to update their password the next time they authenticate. If omitted, false will be used.
     description: ''
   - name: --immutable-id
     summary: This must be specified if you are using a federated domain for the user's userPrincipalName (UPN) property when creating a new user account. It is used to associate an on-premises Active Directory user account with their Azure AD user object.
@@ -42,107 +39,98 @@ items:
   - name: --mail-nickname
     summary: Mail alias. Defaults to user principal name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_delete
   name: az ad user delete
   summary: Delete a user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad user delete --id
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_user_get_member_groups
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_user_get-member-groups
   name: az ad user get-member-groups
   summary: Get groups of which the user is a member.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad user get-member-groups --id
+                                 [--security-enabled-only]
   examples:
   - summary: Get groups of which the user is a member (autogenerated)
-    syntax:
-      content: az ad user get-member-groups --upn-or-object-id myuser@consoso.com
-  parameters:
+    syntax: az ad user get-member-groups --upn-or-object-id myuser@contoso.com
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
+  optionalParameters:
   - name: --security-enabled-only
     summary: If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_list
   name: az ad user list
   summary: List Azure Active Directory users.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user list [--display-name]
+                    [--filter]
+                    [--query-examples]
+                    [--upn]
+  optionalParameters:
   - name: --display-name
     summary: Object's display name or its prefix.
     description: ''
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --upn
     summary: User principal name, e.g. john.doe@contoso.com.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_show
   name: az ad user show
   summary: Gets user information from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user show --id
+                    [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_update
   name: az ad user update
   summary: Update Azure Active Directory users.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad user update --id
+                      [--account-enabled {false, true}]
+                      [--display-name]
+                      [--force-change-password-next-login {false, true}]
+                      [--mail-nickname]
+                      [--password]
   examples:
   - summary: Update Azure Active Directory users. (autogenerated)
-    syntax:
-      content: az ad user update --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad user update --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
+  optionalParameters:
   - name: --account-enabled
     parameterValueGroup: false, true
     summary: Enable the user account.
@@ -160,31 +148,14 @@ items:
   - name: --password
     summary: User password.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_user_create
-  name: az ad user create
-  summary: Create an Azure Active Directory user.
-- uid: az_ad_user_delete
-  name: az ad user delete
-  summary: Delete a user.
-- uid: az_ad_user_get_member_groups
-  name: az ad user get-member-groups
-  summary: Get groups of which the user is a member.
-- uid: az_ad_user_list
-  name: az ad user list
-  summary: List Azure Active Directory users.
-- uid: az_ad_user_show
-  name: az ad user show
-  summary: Gets user information from the directory.
-- uid: az_ad_user_update
-  name: az ad user update
-  summary: Update Azure Active Directory users.
+- az_ad_user_create
+- az_ad_user_delete
+- az_ad_user_get-member-groups
+- az_ad_user_list
+- az_ad_user_show
+- az_ad_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +171,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory users and user authentication.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory users and user authentication.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ai-examples.yml b/2018-03-01-hybrid/docs-ref-autogen/ai-examples.yml
new file mode 100644
index 0000000000..f36fbab675
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ai-examples.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_ai-examples
+name: az ai-examples
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ai-examples** extension for Azure CLI and requires version 2.2.0 or higher.  The extension will automatically install the first time you run an **az ai-examples** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Add AI powered examples to help content.
+description: ''
+directCommands:
+- uid: az_ai-examples_check-connection
+  name: az ai-examples check-connection
+  summary: Check if the client can connect to the AI example service.
+  description: ''
+  syntax: az ai-examples check-connection
+commands:
+- az_ai-examples_check-connection
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Add AI powered examples to help content.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks.yml b/2018-03-01-hybrid/docs-ref-autogen/aks.yml
new file mode 100644
index 0000000000..3263ce5a10
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks.yml
@@ -0,0 +1,1359 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks
+name: az aks
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Kubernetes Services.
+description: ''
+directCommands:
+- uid: az_aks_browse
+  name: az aks browse
+  summary: Show the dashboard for a Kubernetes cluster in a web browser.
+  description: ''
+  syntax: >-
+    az aks browse --name
+                  --resource-group
+                  [--disable-browser]
+                  [--listen-address]
+                  [--listen-port]
+  examples:
+  - summary: Show the dashboard for a Kubernetes cluster in a web browser. (autogenerated)
+    syntax: az aks browse --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disable-browser
+    summary: Don't launch a web browser after establishing port-forwarding.
+    description: Add this argument when launching a web browser manually, or for automated testing.
+  - name: --listen-address
+    defaultValue: 127.0.0.1
+    summary: The listening address for the dashboard.
+    description: Add this argument to listen on a specific IP address.
+  - name: --listen-port
+    defaultValue: "8001"
+    summary: The listening port for the dashboard.
+    description: Add this argument when the default listening port is used by another process or unavailable.
+- uid: az_aks_create
+  name: az aks create
+  summary: Create a new managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks create --name
+                  --resource-group
+                  [--aad-admin-group-object-ids]
+                  [--aad-client-app-id]
+                  [--aad-server-app-id]
+                  [--aad-server-app-secret]
+                  [--aad-tenant-id]
+                  [--aci-subnet-name]
+                  [--admin-username]
+                  [--aks-custom-headers]
+                  [--api-server-authorized-ip-ranges]
+                  [--appgw-id]
+                  [--appgw-name]
+                  [--appgw-subnet-cidr]
+                  [--appgw-subnet-id]
+                  [--appgw-subnet-prefix]
+                  [--appgw-watch-namespace]
+                  [--assign-identity]
+                  [--assign-kubelet-identity]
+                  [--attach-acr]
+                  [--auto-upgrade-channel {node-image, none, patch, rapid, stable}]
+                  [--client-secret]
+                  [--cluster-autoscaler-profile]
+                  [--disable-local-accounts]
+                  [--disable-rbac]
+                  [--dns-name-prefix]
+                  [--dns-service-ip]
+                  [--docker-bridge-address]
+                  [--enable-aad]
+                  [--enable-addons]
+                  [--enable-ahub]
+                  [--enable-azure-rbac]
+                  [--enable-cluster-autoscaler]
+                  [--enable-encryption-at-host {false, true}]
+                  [--enable-fips-image]
+                  [--enable-managed-identity]
+                  [--enable-node-public-ip]
+                  [--enable-pod-identity]
+                  [--enable-pod-identity-with-kubenet]
+                  [--enable-pod-security-policy]
+                  [--enable-private-cluster]
+                  [--enable-rbac]
+                  [--enable-secret-rotation]
+                  [--enable-sgxquotehelper]
+                  [--enable-vmss]
+                  [--fqdn-subdomain]
+                  [--generate-ssh-keys]
+                  [--kubelet-config]
+                  [--kubernetes-version]
+                  [--linux-os-config]
+                  [--load-balancer-idle-timeout]
+                  [--load-balancer-managed-outbound-ip-count]
+                  [--load-balancer-outbound-ip-prefixes]
+                  [--load-balancer-outbound-ips]
+                  [--load-balancer-outbound-ports]
+                  [--load-balancer-sku]
+                  [--location]
+                  [--max-count]
+                  [--max-pods]
+                  [--min-count]
+                  [--network-plugin {azure, kubenet}]
+                  [--network-policy]
+                  [--no-ssh-key]
+                  [--no-wait]
+                  [--node-count]
+                  [--node-osdisk-diskencryptionset-id]
+                  [--node-osdisk-size]
+                  [--node-osdisk-type]
+                  [--node-public-ip-prefix-id]
+                  [--node-resource-group]
+                  [--node-vm-size]
+                  [--node-zones {1, 2, 3}]
+                  [--nodepool-labels]
+                  [--nodepool-name]
+                  [--nodepool-tags]
+                  [--os-sku]
+                  [--outbound-type {loadBalancer, userDefinedRouting}]
+                  [--pod-cidr]
+                  [--pod-subnet-id]
+                  [--ppg]
+                  [--private-dns-zone]
+                  [--service-cidr]
+                  [--service-principal]
+                  [--skip-subnet-role-assignment]
+                  [--ssh-key-value]
+                  [--tags]
+                  [--uptime-sla]
+                  [--vm-set-type]
+                  [--vnet-subnet-id]
+                  [--windows-admin-password]
+                  [--windows-admin-username]
+                  [--workspace-resource-id]
+                  [--yes]
+  examples:
+  - summary: Create a Kubernetes cluster with an existing SSH public key.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
+  - summary: Create a Kubernetes cluster with a specific version.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9
+  - summary: Create a Kubernetes cluster with a larger node pool.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-count 7
+  - summary: Create a kubernetes cluster with cluster autosclaler enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --node-count 3 --enable-cluster-autoscaler --min-count 1 --max-count 5
+  - summary: Create a kubernetes cluster with k8s 1.13.9 but use vmas.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --vm-set-type AvailabilitySet
+  - summary: Create a kubernetes cluster with default kubernetes vesrion, default SKU load balancer(standard) and default vm set type(VirtualMachineScaleSets).
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster
+  - summary: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
+  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
+  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
+  - summary: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
+  - summary: Create a kubernetes cluster with basic SKU load balancer and AvailabilitySet vm set type.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku basic --vm-set-type AvailabilitySet
+  - summary: Create a kubernetes cluster with authorized apiserver IP ranges.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24,195.168.1.0
+  - summary: Create a kubernetes cluster with server side encryption using your owned key.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-diskencryptionset-id <disk-encryption-set-resource-id>
+  - summary: Create a kubernetes cluster with userDefinedRouting, standard load balancer SKU and a custom subnet preconfigured with a route table
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --outbound-type userDefinedRouting --load-balancer-sku standard --vnet-subnet-id customUserSubnetVnetID
+  - summary: Create a kubernetes cluster with supporting Windows agent pools with AHUB enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku Standard --network-plugin azure --windows-admin-username azure --windows-admin-password 'replacePassword1234$' --enable-ahub
+  - summary: Create a kubernetes cluster with managed AAD enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Create a kubernetes cluster with ephemeral os enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-type Ephemeral --node-osdisk-size 48
+  - summary: Create a kubernetes cluster with custom tags
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --tags "foo=bar" "baz=qux"
+  - summary: Create a kubernetes cluster with EncryptionAtHost enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-encryption-at-host
+  - summary: Create a kubernetes cluster with custom control plane identity and kubelet identity.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --assign-identity <control-plane-identity-resource-id> --assign-kubelet-identity <kubelet-identity-resource-id>
+  - summary: Create a kubernetes cluster with Azure RBAC enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --enable-azure-rbac
+  - summary: Create a kubernetes cluster with a specific os-sku
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --os-sku Ubuntu
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-admin-group-object-ids
+    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
+    description: ''
+  - name: --aad-client-app-id
+    summary: The ID of an Azure Active Directory client application of type "Native". This application is for user login via kubectl.
+    description: ''
+  - name: --aad-server-app-id
+    summary: The ID of an Azure Active Directory server application of type "Web app/API". This application represents the managed cluster's apiserver (Server application).
+    description: ''
+  - name: --aad-server-app-secret
+    summary: The secret of an Azure Active Directory server application.
+    description: ''
+  - name: --aad-tenant-id
+    summary: The ID of an Azure Active Directory tenant.
+    description: ''
+  - name: --aci-subnet-name
+    summary: The name of a subnet in an existing VNet into which to deploy the virtual nodes.
+    description: ''
+  - name: --admin-username -u
+    defaultValue: azureuser
+    summary: User account to create on node VMs for SSH access.
+    description: ''
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --api-server-authorized-ip-ranges
+    summary: Comma seperated list of authorized apiserver IP ranges. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
+    description: ''
+  - name: --appgw-id
+    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-name
+    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-cidr
+    summary: Subnet CIDR to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-id
+    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-prefix
+    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-watch-namespace
+    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
+    description: ''
+  - name: --assign-identity
+    summary: Specify an existing user assigned identity to manage cluster resource group.
+    description: ''
+  - name: --assign-kubelet-identity
+    summary: Specify an existing user assigned identity for kubelet's usage, which is typically used to pull image from ACR.
+    description: ''
+  - name: --attach-acr
+    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --auto-upgrade-channel
+    parameterValueGroup: node-image, none, patch, rapid, stable
+    summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade.
+    description: ''
+  - name: --client-secret
+    summary: Secret associated with the service principal. This argument is required if `--service-principal` is specified.
+    description: ''
+  - name: --cluster-autoscaler-profile
+    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
+    description: ''
+  - name: --disable-local-accounts
+    summary: (Preview) If set to true, getting static credential will be disabled for this cluster.
+    description: ''
+  - name: --disable-rbac
+    summary: Disable Kubernetes Role-Based Access Control.
+    description: ''
+  - name: --dns-name-prefix -p
+    summary: Prefix for hostnames that are created. If not specified, generate a hostname using the managed cluster and resource group names.
+    description: ''
+  - name: --dns-service-ip
+    summary: An IP address assigned to the Kubernetes DNS service.
+    description: This address must be within the Kubernetes service address range specified by "--service-cidr". For example, 10.0.0.10.
+  - name: --docker-bridge-address
+    summary: A specific IP address and netmask for the Docker bridge, using standard CIDR notation.
+    description: This address must not be in any Subnet IP ranges, or the Kubernetes service address range. For example, 172.17.0.1/16.
+  - name: --enable-aad
+    summary: Enable managed AAD feature for cluster.
+    description: ''
+  - name: --enable-addons -a
+    summary: Enable the Kubernetes addons in a comma-separated list.
+    description: >-
+      These addons are available:
+          http_application_routing        - configure ingress with automatic public DNS name creation.
+          monitoring                      - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
+                                            If monitoring addon is enabled --no-wait argument will have no effect
+          virtual-node                    - enable AKS Virtual Node. Requires --aci-subnet-name to provide the name of an existing subnet for the Virtual Node to use.
+                                            aci-subnet-name must be in the same vnet which is specified by --vnet-subnet-id (required as well).
+          azure-policy                    - enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
+                                            Learn more at aka.ms/aks/policy.
+          ingress-appgw                   - enable Application Gateway Ingress Controller addon (PREVIEW).
+          confcom                         - enable confcom addon, this will enable SGX device plugin by default(PREVIEW).
+          open-service-mesh               - enable Open Service Mesh addon (PREVIEW).
+          gitops                          - enable GitOps (PREVIEW).
+          azure-keyvault-secrets-provider - enable Azure Keyvault Secrets Provider addon (PREVIEW).
+          azure-defender                  - enable Azure Defender addon (PREVIEW).
+  - name: --enable-ahub
+    summary: Enable Azure Hybrid User Benefits (AHUB) for Windows VMs.
+    description: ''
+  - name: --enable-azure-rbac
+    summary: Enable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --enable-cluster-autoscaler
+    summary: Enable cluster autoscaler, default value is false.
+    description: If specified, please make sure the kubernetes version is larger than 1.10.6.
+  - name: --enable-encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable EncryptionAtHost on agent node pool.
+    description: ''
+  - name: --enable-fips-image
+    summary: Use FIPS-enabled OS on agent nodes.
+    description: ''
+  - name: --enable-managed-identity
+    defaultValue: "1"
+    summary: Using managed identity to manage cluster resource group. Default value is true, you can explicitly specify "--client-id" and "--secret" to disable managed identity.
+    description: ''
+  - name: --enable-node-public-ip
+    summary: Enable VMSS node public IP.
+    description: ''
+  - name: --enable-pod-identity
+    summary: (PREVIEW) Enable pod identity addon.
+    description: ''
+  - name: --enable-pod-identity-with-kubenet
+    summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin.
+    description: ''
+  - name: --enable-pod-security-policy
+    summary: (PREVIEW) Enable pod security policy.
+    description: ''
+  - name: --enable-private-cluster
+    summary: Enable private cluster.
+    description: ''
+  - name: --enable-rbac -r
+    summary: 'Enable Kubernetes Role-Based Access Control. Default: enabled.'
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-sgxquotehelper
+    summary: Enable SGX quote helper for confcom addon.
+    description: ''
+  - name: --enable-vmss
+    summary: To be deprecated. Use vm_set_type instead.
+    description: ''
+  - name: --fqdn-subdomain
+    summary: Prefix for FQDN that is created for private cluster with custom private dns zone scenario.
+    description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing.
+    description: ''
+  - name: --kubelet-config
+    summary: Kubelet configurations for agent nodes.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
+    description: ''
+    valueFrom: '`az aks get-versions`'
+  - name: --linux-os-config
+    summary: OS configurations for Linux agent nodes.
+    description: ''
+  - name: --load-balancer-idle-timeout
+    summary: Load balancer idle timeout in minutes.
+    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --load-balancer-managed-outbound-ip-count
+    summary: Load balancer managed outbound IP count.
+    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ip-prefixes
+    summary: Load balancer outbound IP prefix resource IDs.
+    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ips
+    summary: Load balancer outbound IP resource IDs.
+    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ports
+    summary: Load balancer outbound allocated ports.
+    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
+  - name: --load-balancer-sku
+    summary: Azure Load Balancer SKU selection for your cluster. basic or standard.
+    description: Select between Basic or Standard Azure Load Balancer SKU for your AKS cluster.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-pods -m
+    summary: The maximum number of pods deployable to a node.
+    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --network-plugin
+    parameterValueGroup: azure, kubenet
+    summary: The Kubernetes network plugin to use.
+    description: Specify "azure" for advanced networking configurations. Defaults to "kubenet".
+  - name: --network-policy
+    summary: (PREVIEW) The Kubernetes network policy to use.
+    description: >-
+      Using together with "azure" network plugin.
+
+      Specify "azure" for Azure network policy manager and "calico" for calico network policy controller.
+
+      Defaults to "" (network policy disabled).
+  - name: --no-ssh-key -x
+    summary: Do not use or create a local SSH key.
+    description: To access nodes after creating a cluster with this option, use the Azure Portal.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes node pool. It is required when --enable-cluster-autoscaler specified. After creating a cluster, you can change the size of its node pool with `az aks scale`.
+    description: ''
+  - name: --node-osdisk-diskencryptionset-id
+    summary: ResourceId of the disk encryption set to use for enabling encryption at rest.
+    description: ''
+  - name: --node-osdisk-size
+    summary: Size in GB of the OS disk for each node in the node pool. Minimum 30 GB.
+    description: ''
+  - name: --node-osdisk-type
+    summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Managed'. May not be changed for this pool after creation.
+    description: ''
+  - name: --node-public-ip-prefix-id
+    summary: Public IP prefix ID used to assign public IPs to VMSS nodes.
+    description: ''
+  - name: --node-resource-group
+    summary: The node resource group is the resource group where all customer's resources will be created in, such as virtual machines.
+    description: ''
+  - name: --node-vm-size -s
+    defaultValue: Standard_DS2_v2
+    summary: Size of Virtual Machines to create as Kubernetes nodes.
+    description: ''
+  - name: --node-zones --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: (--node-zones will be deprecated, use --zones) Space-separated list of availability zones where agent nodes will be placed.
+    description: ''
+  - name: --nodepool-labels
+    summary: 'Space-separated labels: key[=value] [key[=value] ...]. You can not change the node labels through CLI after creation. See https://aka.ms/node-labels for syntax of labels.'
+    description: ''
+  - name: --nodepool-name
+    defaultValue: nodepool1
+    summary: Node pool name, upto 12 alphanumeric characters.
+    description: ''
+  - name: --nodepool-tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --os-sku
+    summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+    description: ''
+  - name: --outbound-type
+    parameterValueGroup: loadBalancer, userDefinedRouting
+    summary: How outbound traffic will be configured for a cluster.
+    description: Select between loadBalancer and userDefinedRouting. If not set, defaults to type loadBalancer. Requires --vnet-subnet-id to be provided with a preconfigured route table and --load-balancer-sku to be Standard.
+  - name: --pod-cidr
+    summary: A CIDR notation IP range from which to assign pod IPs when kubenet is used.
+    description: This range must not overlap with any Subnet IP ranges. For example, 172.244.0.0/16.
+  - name: --pod-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    description: ''
+  - name: --ppg
+    summary: The ID of a PPG.
+    description: ''
+  - name: --private-dns-zone
+    summary: Private dns zone mode for private cluster. "none" mode is in preview.
+    description: Allowed values are "system", "none" (Preview) or your custom private dns zone resource id. If not set, defaults to type system. Requires --enable-private-cluster to be used.
+  - name: --service-cidr
+    summary: A CIDR notation IP range from which to assign service cluster IPs.
+    description: This range must not overlap with any Subnet IP ranges. For example, 10.0.0.0/16.
+  - name: --service-principal
+    summary: Service principal used for authentication to Azure APIs.
+    description: If not specified, a new service principal is created and cached at $HOME.azureaksServicePrincipal.json to be used by subsequent `az aks` commands.
+  - name: --skip-subnet-role-assignment
+    summary: Skip role assignment for subnet (advanced networking).
+    description: If specified, please make sure your service principal has the access to your subnet.
+  - name: --ssh-key-value
+    defaultValue: ~\.ssh\id_rsa.pub
+    summary: Public key path or key contents to install on node VMs for SSH access. For example, 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'.
+    description: ''
+  - name: --tags
+    summary: The tags of the managed cluster. The managed cluster instance and all resources managed by the cloud provider will be tagged.
+    description: ''
+  - name: --uptime-sla
+    summary: Enable a paid managed cluster service with a financially backed SLA.
+    description: ''
+  - name: --vm-set-type
+    summary: Agent pool vm set type. VirtualMachineScaleSets or AvailabilitySet.
+    description: ''
+  - name: --vnet-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+    description: ''
+  - name: --windows-admin-password
+    summary: User account password to use on windows node VMs.
+    description: >-
+      Rules for windows-admin-password:
+          - Minimum-length: 14 characters
+          - Max-length: 123 characters
+          - Complexity requirements: 3 out of 4 conditions below need to be fulfilled
+            * Has lower characters
+            * Has upper characters
+            * Has a digit
+            * Has a special character (Regex match [W_])
+          - Disallowed values:  "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminpassword?view=azure-dotnet.
+  - name: --windows-admin-username
+    summary: User account to create on windows node VMs.
+    description: >-
+      Rules for windows-admin-username:
+          - restriction: Cannot end in "."
+          - Disallowed values: "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5".
+          - Minimum-length: 1 character
+          - Max-length: 20 characters
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminusername?view=azure-dotnet.
+  - name: --workspace-resource-id
+    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data. If not specified, uses the default Log Analytics Workspace if it exists, otherwise creates one.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_disable-addons
+  name: az aks disable-addons
+  summary: Disable Kubernetes addons.
+  description: ''
+  syntax: >-
+    az aks disable-addons --addons
+                          --name
+                          --resource-group
+                          [--no-wait]
+  examples:
+  - summary: Disable Kubernetes addons. (autogenerated)
+    syntax: az aks disable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --addons -a
+    summary: Disable the Kubernetes addons in a comma-separated list.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_enable-addons
+  name: az aks enable-addons
+  summary: Enable Kubernetes addons.
+  description: >-
+    These addons are available:
+        http_application_routing        - configure ingress with automatic public DNS name creation.
+        monitoring                      - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
+                                          If monitoring addon is enabled --no-wait argument will have no effect
+        virtual-node                    - enable AKS Virtual Node. Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
+        azure-policy                    - enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
+                                          Learn more at aka.ms/aks/policy.
+        ingress-appgw                   - enable Application Gateway Ingress Controller addon (PREVIEW).
+        open-service-mesh               - enable Open Service Mesh addon (PREVIEW).
+        gitops                          - enable GitOps (PREVIEW).
+        azure-keyvault-secrets-provider - enable Azure Keyvault Secrets Provider addon (PREVIEW).
+        azure-defender                  - enable Azure Defender addon (PREVIEW).
+  syntax: >-
+    az aks enable-addons --addons
+                         --name
+                         --resource-group
+                         [--appgw-id]
+                         [--appgw-name]
+                         [--appgw-subnet-cidr]
+                         [--appgw-subnet-id]
+                         [--appgw-subnet-prefix]
+                         [--appgw-watch-namespace]
+                         [--enable-secret-rotation]
+                         [--enable-sgxquotehelper]
+                         [--no-wait]
+                         [--subnet-name]
+                         [--workspace-resource-id]
+  examples:
+  - summary: Enable Kubernetes addons. (autogenerated)
+    syntax: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet-name VirtualNodeSubnet
+  - summary: Enable ingress-appgw addon with subnet prefix.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-cidr 10.2.0.0/16 --appgw-name gateway
+  - summary: Enable open-service-mesh addon.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons open-service-mesh
+  - summary: Enable azure-defender addon with workspace resourceId.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons azure-defender --workspace-resource-id WorkspaceResourceId
+  requiredParameters:
+  - isRequired: true
+    name: --addons -a
+    summary: Enable the Kubernetes addons in a comma-separated list.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --appgw-id
+    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-name
+    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-cidr
+    summary: Subnet CIDR to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-id
+    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-prefix
+    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-watch-namespace
+    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces. Use with ingress-azure addon.
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-sgxquotehelper
+    summary: Enable SGX quote helper for confcom addon.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subnet-name -s
+    summary: The subnet name for the virtual node to use.
+    description: ''
+  - name: --workspace-resource-id
+    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data.
+    description: ''
+- uid: az_aks_get-credentials
+  name: az aks get-credentials
+  summary: Get access credentials for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks get-credentials --name
+                           --resource-group
+                           [--admin]
+                           [--context]
+                           [--file]
+                           [--overwrite-existing]
+                           [--user]
+  examples:
+  - summary: Get access credentials for a managed Kubernetes cluster. (autogenerated)
+    syntax: az aks get-credentials --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin -a
+    summary: 'Get cluster administrator credentials.  Default: cluster user credentials.'
+    description: ''
+  - name: --context
+    summary: If specified, overwrite the default context name.
+    description: ''
+  - name: --file -f
+    defaultValue: ~/.kube/config
+    summary: Kubernetes configuration file to update. Use "-" to print YAML to stdout instead.
+    description: ''
+  - name: --overwrite-existing
+    summary: Overwrite any existing cluster entry with the same name.
+    description: ''
+  - name: --user -u
+    defaultValue: clusterUser
+    summary: 'Get credentials for the user. Only valid when --admin is False.  Default: cluster user credentials.'
+    description: ''
+- uid: az_aks_get-os-options
+  name: az aks get-os-options
+  summary: Get the OS options available for creating a managed Kubernetes cluster.
+  description: ''
+  syntax: az aks get-os-options --location
+  examples:
+  - summary: Get the OS options available for creating a managed Kubernetes cluster
+    syntax: az aks get-os-options --location westus2
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_aks_get-upgrades
+  name: az aks get-upgrades
+  summary: Get the upgrade versions available for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks get-upgrades --name
+                        --resource-group
+  examples:
+  - summary: Get the upgrade versions available for a managed Kubernetes cluster
+    syntax: az aks get-upgrades --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_get-versions
+  name: az aks get-versions
+  summary: Get the versions available for creating a managed Kubernetes cluster.
+  description: ''
+  syntax: az aks get-versions --location
+  examples:
+  - summary: Get the versions available for creating a managed Kubernetes cluster
+    syntax: az aks get-versions --location westus2
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_aks_kanalyze
+  name: az aks kanalyze
+  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
+  description: ''
+  syntax: >-
+    az aks kanalyze --name
+                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_kollect
+  name: az aks kollect
+  summary: Collecting diagnostic information for the Kubernetes cluster.
+  description: >-
+    Collect diagnostic information for the Kubernetes cluster and store it in the specified storage account.
+
+    You can provide the storage account in three ways:
+      storage account name and a shared access signature with write permission.
+      resource Id to a storage account you own.
+      the storagea account in diagnostics settings for your managed cluster.
+  syntax: >-
+    az aks kollect --name
+                   --resource-group
+                   [--container-logs]
+                   [--kube-objects]
+                   [--node-logs]
+                   [--sas-token]
+                   [--storage-account]
+  examples:
+  - summary: using storage account name and a shared access signature token with write permission
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account MyStorageAccount --sas-token "MySasToken"
+  - summary: using the resource id of a storagea account resource you own.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account "MyStoreageAccountResourceId"
+  - summary: using the storagea account in diagnostics settings for your managed cluster.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster
+  - summary: customize the container logs to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --container-logs "mynamespace1/mypod1 myns2"
+  - summary: customize the kubernetes objects to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --kube-objects "mynamespace1/service myns2/deployment/deployment1"
+  - summary: customize the node log files to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --node-logs "/var/log/azure-vnet.log /var/log/azure-vnet-ipam.log"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container-logs
+    summary: The list of container logs to collect.
+    description: >-
+      The list of container logs to collect. Its value can be either all containers
+
+      in a namespace, for example, kube-system, or a specific container in a
+
+      namespace, for example, kube-system/tunnelfront.
+  - name: --kube-objects
+    summary: The list of kubernetes objects to describe.
+    description: >-
+      The list of kubernetes objects to describe. Its value can be either all objects of a type
+
+      in a namespace, for example, kube-system/pod, or a specific object of a type in a namespace,
+
+      for example, kube-system/deployment/tunnelfront.
+  - name: --node-logs
+    summary: The list of node logs to collect. For example, /var/log/cloud-init.log.
+    description: ''
+  - name: --sas-token
+    summary: The SAS token with writable permission for the storage account.
+    description: ''
+  - name: --storage-account
+    summary: Name or ID of the storage account to save the diagnostic information.
+    description: ''
+- uid: az_aks_rotate-certs
+  name: az aks rotate-certs
+  summary: Rotate certificates and keys on a managed Kubernetes cluster.
+  description: Kubernetes will be unavailable during cluster certificate rotation.
+  syntax: >-
+    az aks rotate-certs --name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_scale
+  name: az aks scale
+  summary: Scale the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks scale --name
+                 --node-count
+                 --resource-group
+                 [--no-wait]
+                 [--nodepool-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --node-count -c
+    summary: Number of nodes in the Kubernetes node pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --nodepool-name
+    summary: Node pool name, upto 12 alphanumeric characters.
+    description: ''
+- uid: az_aks_show
+  name: az aks show
+  summary: Show the details for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks show --name
+                --resource-group
+  examples:
+  - summary: Show the details for a managed Kubernetes cluster
+    syntax: az aks show --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_start
+  name: az aks start
+  summary: Start Managed Cluster.
+  description: Starts a Stopped Managed Cluster.
+  syntax: >-
+    az aks start --name
+                 --resource-group
+                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_stop
+  name: az aks stop
+  summary: Stop Managed Cluster.
+  description: Stops a Running Managed Cluster.
+  syntax: >-
+    az aks stop --name
+                --resource-group
+                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_update
+  name: az aks update
+  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
+  description: ''
+  syntax: >-
+    az aks update --name
+                  --resource-group
+                  [--aad-admin-group-object-ids]
+                  [--aad-tenant-id]
+                  [--aks-custom-headers]
+                  [--api-server-authorized-ip-ranges]
+                  [--assign-identity]
+                  [--attach-acr]
+                  [--auto-upgrade-channel {node-image, none, patch, rapid, stable}]
+                  [--cluster-autoscaler-profile]
+                  [--detach-acr]
+                  [--disable-ahub]
+                  [--disable-azure-rbac]
+                  [--disable-cluster-autoscaler]
+                  [--disable-local-accounts]
+                  [--disable-pod-identity]
+                  [--disable-pod-security-policy]
+                  [--disable-secret-rotation]
+                  [--enable-aad]
+                  [--enable-ahub]
+                  [--enable-azure-rbac]
+                  [--enable-cluster-autoscaler]
+                  [--enable-local-accounts]
+                  [--enable-managed-identity]
+                  [--enable-pod-identity]
+                  [--enable-pod-identity-with-kubenet]
+                  [--enable-pod-security-policy]
+                  [--enable-secret-rotation]
+                  [--load-balancer-idle-timeout]
+                  [--load-balancer-managed-outbound-ip-count]
+                  [--load-balancer-outbound-ip-prefixes]
+                  [--load-balancer-outbound-ips]
+                  [--load-balancer-outbound-ports]
+                  [--max-count]
+                  [--min-count]
+                  [--no-uptime-sla]
+                  [--no-wait]
+                  [--tags]
+                  [--update-cluster-autoscaler]
+                  [--uptime-sla]
+                  [--windows-admin-password]
+                  [--yes]
+  examples:
+  - summary: Enable cluster-autoscaler within node count range [1,5]
+    syntax: az aks update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n MyManagedCluster
+  - summary: Disable cluster-autoscaler for an existing cluster
+    syntax: az aks update --disable-cluster-autoscaler -g MyResourceGroup -n MyManagedCluster
+  - summary: Update min-count or max-count for cluster autoscaler.
+    syntax: az aks update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n MyManagedCluster
+  - summary: Enable pod security policy.
+    syntax: az aks update --enable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
+  - summary: Disable pod security policy.
+    syntax: az aks update --disable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use two AKS created IPs for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
+  - summary: Update a kubernetes cluster with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
+  - summary: Update a kubernetes cluster with authorized apiserver ip ranges.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24
+  - summary: Disable authorized apiserver ip ranges feature for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges ""
+  - summary: Restrict apiserver traffic in a kubernetes cluster to agentpool nodes.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 0.0.0.0/32
+  - summary: Update a AKS-managed AAD cluster with tenant ID or admin group object IDs.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Migrate a AKS AAD-Integrated cluster or a non-AAAAD cluster to a AKS-managed AAD cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Enable Azure Hybrid User Benefits featture for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-ahub
+  - summary: Disable Azure Hybrid User Benefits featture for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-ahub
+  - summary: Update the cluster to use system assigned managed identity in control plane.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-managed-identity
+  - summary: Update the cluster to use user assigned managed identity in control plane.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-managed-identity --assign-identity <user_assigned_identity_resource_id>
+  - summary: Enable pod identity addon.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-pod-identity
+  - summary: Disable pod identity addon.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-pod-identity
+  - summary: Update the tags of a kubernetes cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCLuster --tags "foo=bar" "baz=qux"
+  - summary: Update Windows password of a kubernetes cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCLuster --windows-admin-password "Repl@cePassw0rd12345678"
+  - summary: Update a managed AAD AKS cluster to use Azure RBAC
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-azure-rbac
+  - summary: Disable Azure RBAC in a managed AAD AKS cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-azure-rbac
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-admin-group-object-ids
+    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
+    description: ''
+  - name: --aad-tenant-id
+    summary: The ID of an Azure Active Directory tenant.
+    description: ''
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --api-server-authorized-ip-ranges
+    summary: Comma seperated list of authorized apiserver IP ranges. Set to "" to allow all traffic on a previously restricted cluster. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
+    description: ''
+  - name: --assign-identity
+    summary: (PREVIEW) Specify an existing user assigned identity to manage cluster resource group.
+    description: ''
+  - name: --attach-acr
+    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --auto-upgrade-channel
+    parameterValueGroup: node-image, none, patch, rapid, stable
+    summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade.
+    description: ''
+  - name: --cluster-autoscaler-profile
+    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
+    description: ''
+  - name: --detach-acr
+    summary: Disable the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --disable-ahub
+    summary: Disable Azure Hybrid User Benefits (AHUB) feature for cluster.
+    description: ''
+  - name: --disable-azure-rbac
+    summary: Disable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --disable-cluster-autoscaler -d
+    summary: Disable cluster autoscaler.
+    description: ''
+  - name: --disable-local-accounts
+    summary: (Preview) If set to true, getting static credential will be disabled for this cluster.
+    description: ''
+  - name: --disable-pod-identity
+    summary: (PREVIEW) Disable Pod Identity addon for cluster.
+    description: ''
+  - name: --disable-pod-security-policy
+    summary: (PREVIEW) Disable pod security policy.
+    description: ''
+  - name: --disable-secret-rotation
+    summary: Disable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-aad
+    summary: Enable managed AAD feature for cluster.
+    description: ''
+  - name: --enable-ahub
+    summary: Enable Azure Hybrid User Benefits (AHUB) feature for cluster.
+    description: ''
+  - name: --enable-azure-rbac
+    summary: Enable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --enable-local-accounts
+    summary: (Preview) If set to true, will enable getting static credential for this cluster.
+    description: ''
+  - name: --enable-managed-identity
+    summary: (PREVIEW) Update current cluster to managed identity to manage cluster resource group.
+    description: ''
+  - name: --enable-pod-identity
+    summary: (PREVIEW) Enable Pod Identity addon for cluster.
+    description: ''
+  - name: --enable-pod-identity-with-kubenet
+    summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin.
+    description: ''
+  - name: --enable-pod-security-policy
+    summary: (PREVIEW) Enable pod security policy.
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --load-balancer-idle-timeout
+    summary: Load balancer idle timeout in minutes.
+    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --load-balancer-managed-outbound-ip-count
+    summary: Load balancer managed outbound IP count.
+    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ip-prefixes
+    summary: Load balancer outbound IP prefix resource IDs.
+    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ips
+    summary: Load balancer outbound IP resource IDs.
+    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ports
+    summary: Load balancer outbound allocated ports.
+    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --no-uptime-sla
+    summary: Change a paid managed cluster to a free one.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: The tags of the managed cluster. The managed cluster instance and all resources managed by the cloud provider will be tagged.
+    description: ''
+  - name: --update-cluster-autoscaler -u
+    summary: Update min-count or max-count for cluster autoscaler.
+    description: ''
+  - name: --uptime-sla
+    summary: Enable a paid managed cluster service with a financially backed SLA.
+    description: ''
+  - name: --windows-admin-password
+    summary: User account password to use on windows node VMs.
+    description: >-
+      Rules for windows-admin-password:
+          - Minimum-length: 14 characters
+          - Max-length: 123 characters
+          - Complexity requirements: 3 out of 4 conditions below need to be fulfilled
+            * Has lower characters
+            * Has upper characters
+            * Has a digit
+            * Has a special character (Regex match [W_])
+          - Disallowed values:  "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminpassword?view=azure-dotnet.
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_upgrade
+  name: az aks upgrade
+  summary: Upgrade a managed Kubernetes cluster to a newer version.
+  description: Kubernetes will be unavailable during cluster upgrades.
+  syntax: >-
+    az aks upgrade --name
+                   --resource-group
+                   [--aks-custom-headers]
+                   [--control-plane-only]
+                   [--kubernetes-version]
+                   [--no-wait]
+                   [--node-image-only]
+                   [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --control-plane-only
+    summary: Upgrade the cluster control plane only. If not specified, control plane AND all node pools will be upgraded.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to upgrade the cluster to, such as "1.11.12".
+    description: ''
+    valueFrom: '`az aks get-upgrades`'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-image-only
+    summary: Only upgrade node image for agent pools.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_use-dev-spaces
+  name: az aks use-dev-spaces
+  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks use-dev-spaces --name
+                          --resource-group
+                          [--endpoint {None, Private, Public}]
+                          [--space]
+                          [--update]
+                          [--yes]
+  examples:
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, interactively selecting a dev space.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, updating to the latest Azure Dev Spaces             client components and selecting a new or existing dev space 'my-space'.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks --update --space my-space
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, selecting a new or existing dev space             'develop/my-space' without prompting for confirmation.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks -s develop/my-space -y
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster with a private endpoint.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks -e private
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --endpoint -e
+    defaultValue: Public
+    parameterValueGroup: None, Private, Public
+    summary: The endpoint type to be used for a Azure Dev Spaces controller. See https://aka.ms/azds-networking for more information.
+    description: ''
+  - name: --space -s
+    summary: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
+    description: ''
+  - name: --update
+    summary: Update to the latest Azure Dev Spaces client components.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Requires --space.
+    description: ''
+- uid: az_aks_wait
+  name: az aks wait
+  summary: Wait for a managed Kubernetes cluster to reach a desired state.
+  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
+  syntax: >-
+    az aks wait --name
+                --resource-group
+                [--created]
+                [--custom]
+                [--deleted]
+                [--exists]
+                [--interval]
+                [--timeout]
+                [--updated]
+  examples:
+  - summary: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes.
+    syntax: az aks wait -g MyResourceGroup -n MyManagedCluster --updated --interval 60 --timeout 1800
+  - summary: Wait for a managed Kubernetes cluster to reach a desired state (autogenerated)
+    syntax: az aks wait --created --interval 60 --name MyManagedCluster --resource-group MyResourceGroup --timeout 1800
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_aks_app
+- az_aks_app_up
+- az_aks_browse
+- az_aks_command
+- az_aks_command_invoke
+- az_aks_command_result
+- az_aks_create
+- az_aks_disable-addons
+- az_aks_enable-addons
+- az_aks_get-credentials
+- az_aks_get-os-options
+- az_aks_get-upgrades
+- az_aks_get-versions
+- az_aks_kanalyze
+- az_aks_kollect
+- az_aks_maintenanceconfiguration
+- az_aks_maintenanceconfiguration_add
+- az_aks_maintenanceconfiguration_delete
+- az_aks_maintenanceconfiguration_list
+- az_aks_maintenanceconfiguration_show
+- az_aks_maintenanceconfiguration_update
+- az_aks_nodepool
+- az_aks_nodepool_add
+- az_aks_nodepool_delete
+- az_aks_nodepool_get-upgrades
+- az_aks_nodepool_list
+- az_aks_nodepool_scale
+- az_aks_nodepool_show
+- az_aks_nodepool_update
+- az_aks_nodepool_upgrade
+- az_aks_pod-identity
+- az_aks_pod-identity_add
+- az_aks_pod-identity_delete
+- az_aks_pod-identity_exception
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+- az_aks_pod-identity_list
+- az_aks_rotate-certs
+- az_aks_scale
+- az_aks_show
+- az_aks_start
+- az_aks_stop
+- az_aks_update
+- az_aks_upgrade
+- az_aks_use-dev-spaces
+- az_aks_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Kubernetes Services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks/app.yml b/2018-03-01-hybrid/docs-ref-autogen/aks/app.yml
new file mode 100644
index 0000000000..0a759a89e8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks/app.yml
@@ -0,0 +1,59 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_app
+name: az aks app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az aks app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage AKS app.
+description: ''
+directCommands:
+- uid: az_aks_app_up
+  name: az aks app up
+  summary: Deploy to AKS via GitHub actions.
+  description: ''
+  syntax: >-
+    az aks app up [--acr]
+                  [--aks-cluster]
+                  [--branch-name]
+                  [--do-not-wait]
+                  [--port]
+                  [--repository]
+  optionalParameters:
+  - name: --acr
+    summary: Name of the Azure Container Registry to be used for pushing the image.
+    description: ''
+  - name: --aks-cluster
+    summary: Name of the cluster to select for deployment.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --port
+    summary: Port on which your application runs. Default is 8080.
+    description: ''
+  - name: --repository -r
+    summary: GitHub repository URL e.g. https://github.com/azure/azure-cli.
+    description: ''
+commands:
+- az_aks_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage AKS app.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks/command.yml b/2018-03-01-hybrid/docs-ref-autogen/aks/command.yml
new file mode 100644
index 0000000000..0f5c8907d8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks/command.yml
@@ -0,0 +1,80 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_command
+name: az aks command
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks command** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: See detail usage in 'az aks command invoke', 'az aks command result'.
+description: ''
+directCommands:
+- uid: az_aks_command_invoke
+  name: az aks command invoke
+  summary: Run a shell command (with kubectl, helm) on your aks cluster, support attaching files as well.
+  description: ''
+  syntax: >-
+    az aks command invoke --name
+                          --resource-group
+                          [--command]
+                          [--file]
+                          [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --command -c
+    summary: Command or shell script you want run.
+    description: ''
+  - name: --file -f
+    summary: Files will be used by the command, use '.' to attach the current folder.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_command_result
+  name: az aks command result
+  summary: Fetch result from previously triggered 'aks command invoke'.
+  description: ''
+  syntax: >-
+    az aks command result --name
+                          --resource-group
+                          [--command-id]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --command-id -i
+    summary: CommandId returned from 'aks command invoke'.
+    description: ''
+commands:
+- az_aks_command_invoke
+- az_aks_command_result
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: See detail usage in 'az aks command invoke', 'az aks command result'.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks/maintenanceconfiguration.yml b/2018-03-01-hybrid/docs-ref-autogen/aks/maintenanceconfiguration.yml
new file mode 100644
index 0000000000..fd69697c85
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks/maintenanceconfiguration.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_maintenanceconfiguration
+name: az aks maintenanceconfiguration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks maintenanceconfiguration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage maintenance configurations in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_maintenanceconfiguration_add
+  name: az aks maintenanceconfiguration add
+  summary: Add a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration add --cluster-name
+                                        --name
+                                        --resource-group
+                                        [--config-file]
+                                        [--start-hour]
+                                        [--weekday]
+  examples:
+  - summary: Add a maintenance configuration with --weekday and --start-hour.
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday  --start-hour 1
+        The maintenance is allowed on Monday 1:00am to 2:00am
+  - summary: Add a maintenance configuration with --weekday.The maintenance is allowd on any time of that day.
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday
+        The maintenance is allowed on Monday.
+  - summary: Add a maintenance configuration with maintenance configuration json file
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --config-file ./test.json
+          The content of json file looks below. It means the maintenance is allowed on UTC time Tuesday 1:00am - 3:00 am and Wednesday 1:00am - 2:00am, 6:00am-7:00am
+          No maintenance is allowed from 2020-11-26T03:00:00Z to 2020-11-30T12:00:00Z and from 2020-12-26T03:00:00Z to 2020-12-26T12:00:00Z even if they are allowed in the above weekly setting
+          {
+                "timeInWeek": [
+                  {
+                    "day": "Tuesday",
+                    "hour_slots": [
+                      1,
+                      2
+                    ]
+                  },
+                  {
+                    "day": "Wednesday",
+                    "hour_slots": [
+                      1,
+                      6
+                    ]
+                  }
+                ],
+                "notAllowedTime": [
+                  {
+                    "start": "2021-11-26T03:00:00Z",
+                    "end": "2021-11-30T12:00:00Z"
+                  },
+                  {
+                    "start": "2021-12-26T03:00:00Z",
+                    "end": "2021-12-26T12:00:00Z"
+                  }
+                ]
+        }
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --config-file
+    summary: The maintenance configuration json file.
+    description: ''
+  - name: --start-hour
+    summary: The start time of 1 hour window which maintenance is allowd. E.g. 1 means it's allowd between 1:00 am and 2:00 am.
+    description: ''
+  - name: --weekday
+    summary: A day in week on which maintenance is allowed. E.g. Monday.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_delete
+  name: az aks maintenanceconfiguration delete
+  summary: Delete a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration delete --cluster-name
+                                           --name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_list
+  name: az aks maintenanceconfiguration list
+  summary: List maintenance configurations in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration list --cluster-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_show
+  name: az aks maintenanceconfiguration show
+  summary: Show the details of a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration show --cluster-name
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_update
+  name: az aks maintenanceconfiguration update
+  summary: Update a maintenance configuration of a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration update --cluster-name
+                                           --name
+                                           --resource-group
+                                           [--config-file]
+                                           [--start-hour]
+                                           [--weekday]
+  examples:
+  - summary: Update a maintenance configuration with --weekday and --start-hour.
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday  --start-hour 1
+        The maintenance is allowed on Monday 1:00am to 2:00am
+  - summary: Update a maintenance configuration with --weekday.The maintenance is allowd on any time of that day.
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday
+        The maintenance is allowed on Monday.
+  - summary: Update a maintenance configuration with maintenance configuration json file
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --config-file ./test.json
+          The content of json file looks below. It means the maintenance is allowed on UTC time Tuesday 1:00am - 3:00 am and Wednesday 1:00am - 2:00am, 6:00am-7:00am
+          No maintenance is allowed from 2020-11-26T03:00:00Z to 2020-11-30T12:00:00Z and from 2020-12-26T03:00:00Z to 2020-12-26T12:00:00Z even if they are allowed in the above weekly setting
+          {
+                "timeInWeek": [
+                  {
+                    "day": "Tuesday",
+                    "hour_slots": [
+                      1,
+                      2
+                    ]
+                  },
+                  {
+                    "day": "Wednesday",
+                    "hour_slots": [
+                      1,
+                      6
+                    ]
+                  }
+                ],
+                "notAllowedTime": [
+                  {
+                    "start": "2021-11-26T03:00:00Z",
+                    "end": "2021-11-30T12:00:00Z"
+                  },
+                  {
+                    "start": "2021-12-26T03:00:00Z",
+                    "end": "2021-12-26T12:00:00Z"
+                  }
+                ]
+        }
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --config-file
+    summary: The maintenance configuration json file.
+    description: ''
+  - name: --start-hour
+    summary: The start time of 1 hour window which maintenance is allowd. E.g. 1 means it's allowd between 1:00 am and 2:00 am.
+    description: ''
+  - name: --weekday
+    summary: A day in week on which maintenance is allowed. E.g. Monday.
+    description: ''
+commands:
+- az_aks_maintenanceconfiguration_add
+- az_aks_maintenanceconfiguration_delete
+- az_aks_maintenanceconfiguration_list
+- az_aks_maintenanceconfiguration_show
+- az_aks_maintenanceconfiguration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage maintenance configurations in managed Kubernetes cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks/nodepool.yml b/2018-03-01-hybrid/docs-ref-autogen/aks/nodepool.yml
new file mode 100644
index 0000000000..a82717b4b4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks/nodepool.yml
@@ -0,0 +1,424 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_nodepool
+name: az aks nodepool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks nodepool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage node pools in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_nodepool_add
+  name: az aks nodepool add
+  summary: Add a node pool to the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool add --cluster-name
+                        --name
+                        --resource-group
+                        [--aks-custom-headers]
+                        [--enable-cluster-autoscaler]
+                        [--enable-encryption-at-host]
+                        [--enable-fips-image]
+                        [--enable-node-public-ip]
+                        [--eviction-policy {Deallocate, Delete}]
+                        [--kubelet-config]
+                        [--kubernetes-version]
+                        [--labels]
+                        [--linux-os-config]
+                        [--max-count]
+                        [--max-pods]
+                        [--max-surge]
+                        [--min-count]
+                        [--mode {System, User}]
+                        [--no-wait]
+                        [--node-count]
+                        [--node-osdisk-size]
+                        [--node-osdisk-type]
+                        [--node-public-ip-prefix-id]
+                        [--node-taints]
+                        [--node-vm-size]
+                        [--node-zones {1, 2, 3}]
+                        [--os-sku]
+                        [--os-type]
+                        [--pod-subnet-id]
+                        [--ppg]
+                        [--priority {Regular, Spot}]
+                        [--spot-max-price]
+                        [--tags]
+                        [--vnet-subnet-id]
+  examples:
+  - summary: Create a nodepool in an existing AKS cluster with ephemeral os enabled.
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster --node-osdisk-type Ephemeral --node-osdisk-size 48
+  - summary: Create a nodepool with EncryptionAtHost enabled.
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster --enable-encryption-at-host
+  - summary: Create a nodepool cluster with a specific os-sku
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster  --os-sku Ubuntu
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --enable-encryption-at-host
+    summary: Enable EncryptionAtHost on agent node pool.
+    description: ''
+  - name: --enable-fips-image
+    summary: Use FIPS-enabled OS on agent nodes.
+    description: ''
+  - name: --enable-node-public-ip
+    summary: Enable VMSS node public IP.
+    description: ''
+  - name: --eviction-policy
+    defaultValue: Delete
+    parameterValueGroup: Deallocate, Delete
+    summary: The eviction policy of the Spot node pool. It can only be set when --priority is Spot.
+    description: ''
+  - name: --kubelet-config
+    summary: Kubelet configurations for agent nodes.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
+    description: ''
+    valueFrom: '`az aks get-versions`'
+  - name: --labels
+    summary: The node labels for the node pool. You can't change the node labels through CLI after the node pool is created. See https://aka.ms/node-labels for syntax of labels.
+    description: ''
+  - name: --linux-os-config
+    summary: OS configurations for Linux agent nodes.
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-pods -m
+    summary: The maximum number of pods deployable to a node.
+    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --mode
+    defaultValue: User
+    parameterValueGroup: System, User
+    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes agent pool. After creating a cluster, you can change the size of its node pool with `az aks scale`.
+    description: ''
+  - name: --node-osdisk-size
+    summary: Size in GB of the OS disk for each node in the agent pool. Minimum 30 GB.
+    description: ''
+  - name: --node-osdisk-type
+    summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Managed'. May not be changed for this pool after creation.
+    description: ''
+  - name: --node-public-ip-prefix-id
+    summary: Public IP prefix ID used to assign public IPs to VMSS nodes.
+    description: ''
+  - name: --node-taints
+    summary: The node taints for the node pool. You can't change the node taints through CLI after the node pool is created.
+    description: ''
+  - name: --node-vm-size -s
+    summary: Size of Virtual Machines to create as Kubernetes nodes.
+    description: ''
+  - name: --node-zones --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: (will be deprecated, use --zones) Availability zones where agent nodes will be placed.
+    description: ''
+  - name: --os-sku
+    summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+    description: ''
+  - name: --os-type
+    defaultValue: Linux
+    summary: The OS Type. Linux or Windows.
+    description: ''
+  - name: --pod-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    description: ''
+  - name: --ppg
+    summary: The ID of a PPG.
+    description: ''
+  - name: --priority
+    defaultValue: Regular
+    parameterValueGroup: Regular, Spot
+    summary: The priority of the node pool.
+    description: ''
+  - name: --spot-max-price
+    defaultValue: nan
+    summary: It can only be set when --priority is Spot. Specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. It can only include up to 5 decimal places.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+    description: ''
+- uid: az_aks_nodepool_delete
+  name: az aks nodepool delete
+  summary: Delete the agent pool in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool delete --cluster-name
+                           --name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_nodepool_get-upgrades
+  name: az aks nodepool get-upgrades
+  summary: Get the available upgrade versions for an agent pool of the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool get-upgrades --cluster-name
+                                 --nodepool-name
+                                 --resource-group
+  examples:
+  - summary: Get the available upgrade versions for an agent pool of the managed Kubernetes cluster.
+    syntax: az aks nodepool get-upgrades --resource-group MyResourceGroup --cluster-name MyManagedCluster --nodepool-name MyNodePool
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --nodepool-name
+    summary: Name of the node pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_list
+  name: az aks nodepool list
+  summary: List node pools in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool list --cluster-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_scale
+  name: az aks nodepool scale
+  summary: Scale the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool scale --cluster-name
+                          --name
+                          --resource-group
+                          [--no-wait]
+                          [--node-count]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes node pool.
+    description: ''
+- uid: az_aks_nodepool_show
+  name: az aks nodepool show
+  summary: Show the details for a node pool in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool show --cluster-name
+                         --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_update
+  name: az aks nodepool update
+  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
+  description: ''
+  syntax: >-
+    az aks nodepool update --cluster-name
+                           --name
+                           --resource-group
+                           [--disable-cluster-autoscaler]
+                           [--enable-cluster-autoscaler]
+                           [--max-count]
+                           [--max-surge]
+                           [--min-count]
+                           [--mode {System, User}]
+                           [--no-wait]
+                           [--tags]
+                           [--update-cluster-autoscaler]
+  examples:
+  - summary: Enable cluster-autoscaler within node count range [1,5]
+    syntax: az aks nodepool update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Disable cluster-autoscaler for an existing cluster
+    syntax: az aks nodepool update --disable-cluster-autoscaler -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Update min-count or max-count for cluster autoscaler.
+    syntax: az aks nodepool update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Change a node pool to system mode
+    syntax: az aks nodepool update --mode System -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disable-cluster-autoscaler -d
+    summary: Disable cluster autoscaler.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --mode
+    parameterValueGroup: System, User
+    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --update-cluster-autoscaler -u
+    summary: Update min-count or max-count for cluster autoscaler.
+    description: ''
+- uid: az_aks_nodepool_upgrade
+  name: az aks nodepool upgrade
+  summary: Upgrade the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool upgrade --cluster-name
+                            --name
+                            --resource-group
+                            [--kubernetes-version]
+                            [--max-surge]
+                            [--no-wait]
+                            [--node-image-only]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to upgrade the node pool to, such as "1.11.12".
+    description: ''
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-image-only
+    summary: Only upgrade agent pool's node image.
+    description: ''
+commands:
+- az_aks_nodepool_add
+- az_aks_nodepool_delete
+- az_aks_nodepool_get-upgrades
+- az_aks_nodepool_list
+- az_aks_nodepool_scale
+- az_aks_nodepool_show
+- az_aks_nodepool_update
+- az_aks_nodepool_upgrade
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage node pools in managed Kubernetes cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks/pod-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/aks/pod-identity.yml
new file mode 100644
index 0000000000..f26eabfbd7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks/pod-identity.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_pod-identity
+name: az aks pod-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks pod-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage pod identities in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_pod-identity_add
+  name: az aks pod-identity add
+  summary: Add a pod identity to a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity add --cluster-name
+                            --identity-resource-id
+                            --namespace
+                            --resource-group
+                            [--binding-selector]
+                            [--name]
+  examples:
+  - summary: Add pod identity
+    syntax: az aks pod-identity add --cluster-name MyManagedCluster --resource-group MyResourceGroup --namespace my-namespace --name my-identity --identity-resource-id <my-identity-resource-id>
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --identity-resource-id
+    summary: Resource id of the identity to use.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --binding-selector
+    summary: Optional binding selector to use.
+    description: ''
+  - name: --name -n
+    summary: The pod identity name. Generate if not specified.
+    description: ''
+- uid: az_aks_pod-identity_delete
+  name: az aks pod-identity delete
+  summary: Remove a pod identity from a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity delete --cluster-name
+                               --name
+                               --namespace
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity name.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_list
+  name: az aks pod-identity list
+  summary: List pod identities in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity list --cluster-name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_aks_pod-identity_add
+- az_aks_pod-identity_delete
+- az_aks_pod-identity_exception
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+- az_aks_pod-identity_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage pod identities in managed Kubernetes cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/aks/pod-identity/exception.yml b/2018-03-01-hybrid/docs-ref-autogen/aks/pod-identity/exception.yml
new file mode 100644
index 0000000000..70b2724367
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/aks/pod-identity/exception.yml
@@ -0,0 +1,136 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_pod-identity_exception
+name: az aks pod-identity exception
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks pod-identity exception** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage pod identity exceptions in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_pod-identity_exception_add
+  name: az aks pod-identity exception add
+  summary: Add a pod identity exception to a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception add --cluster-name
+                                      --namespace
+                                      --pod-labels
+                                      --resource-group
+                                      [--name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace.
+    description: ''
+  - isRequired: true
+    name: --pod-labels
+    summary: 'Space-separated labels: key=value [key=value ...].'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The pod identity exception name. Generate if not specified.
+    description: ''
+- uid: az_aks_pod-identity_exception_delete
+  name: az aks pod-identity exception delete
+  summary: Remove a pod identity exception from a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception delete --cluster-name
+                                         --name
+                                         --namespace
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity exception name to remove.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace to remove.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_exception_list
+  name: az aks pod-identity exception list
+  summary: List pod identity exceptions in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception list --cluster-name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_exception_update
+  name: az aks pod-identity exception update
+  summary: Update a pod identity exception in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception update --cluster-name
+                                         --name
+                                         --namespace
+                                         --pod-labels
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity exception name to remove.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace to remove.
+    description: ''
+  - isRequired: true
+    name: --pod-labels
+    summary: Pod labels in key=value [key=value ...].
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage pod identity exceptions in managed Kubernetes cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/alias.yml b/2018-03-01-hybrid/docs-ref-autogen/alias.yml
new file mode 100644
index 0000000000..06dd5690c2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/alias.yml
@@ -0,0 +1,117 @@
+### YamlMime:AzureCLIGroup
+uid: az_alias
+name: az alias
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alias** extension for Azure CLI and requires version 2.0.31.dev0 or higher.  The extension will automatically install the first time you run an **az alias** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure CLI Aliases.
+description: ''
+directCommands:
+- uid: az_alias_create
+  name: az alias create
+  summary: Create an alias.
+  description: ''
+  syntax: >-
+    az alias create --command
+                    --name
+  examples:
+  - summary: Create simple alias commands.
+    syntax: >-
+      az alias create --name rg --command group
+
+
+      az alias create --name ls --command list
+  - summary: Create a complex alias.
+    syntax: az alias create --name list-vm --command 'vm list --resource-group myResourceGroup'
+  - summary: Create an alias command with arguments.
+    syntax: >-
+      az alias create --name 'list-vm {{ resource_group }}' \
+        --command 'vm list --resource-group {{ resource_group }}'
+  - summary: Process arguments using Jinja2 templates.
+    syntax: >-
+      az alias create --name 'storage-ls {{ url }}' \
+        --command 'storage blob list
+          --account-name {{ url.replace("https://", "").split(".")[0] }}
+          --container-name {{ url.replace("https://", "").split("/")[1] }}'
+  requiredParameters:
+  - isRequired: true
+    name: --command -c
+    summary: The command that the alias points to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the alias.
+    description: ''
+- uid: az_alias_export
+  name: az alias export
+  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
+  description: ''
+  syntax: >-
+    az alias export [--exclude]
+                    [--path]
+  optionalParameters:
+  - name: --exclude -e
+    summary: Space-separated aliases excluded from export.
+    description: ''
+  - name: --path -p
+    summary: The path of the alias configuration file to export to.
+    description: ''
+- uid: az_alias_import
+  name: az alias import
+  summary: Import aliases from an INI configuration file or an URL.
+  description: ''
+  syntax: az alias import --source
+  requiredParameters:
+  - isRequired: true
+    name: --source -s
+    summary: The source of the aliases to import from.
+    description: ''
+- uid: az_alias_list
+  name: az alias list
+  summary: List the registered aliases.
+  description: ''
+  syntax: az alias list
+- uid: az_alias_remove
+  name: az alias remove
+  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
+  description: ''
+  syntax: az alias remove --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Space-separated aliases.
+    description: ''
+- uid: az_alias_remove-all
+  name: az alias remove-all
+  summary: Remove all registered aliases.
+  description: ''
+  syntax: az alias remove-all [--yes]
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+commands:
+- az_alias_create
+- az_alias_export
+- az_alias_import
+- az_alias_list
+- az_alias_remove
+- az_alias_remove-all
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure CLI Aliases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig.yml
index 1364e0e032..a01c1ea135 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig.yml
@@ -1,176 +1,173 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig
-  name: az appconfig
-  summary: Manage App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_create
-  - az_appconfig_delete
-  - az_appconfig_list
-  - az_appconfig_show
-  - az_appconfig_update
+### YamlMime:AzureCLIGroup
+uid: az_appconfig
+name: az appconfig
+summary: Manage App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_create
   name: az appconfig create
   summary: Create an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig create --location
+                        --name
+                        --resource-group
+                        [--assign-identity]
+                        [--enable-public-network {false, true}]
+                        [--sku {Free, Standard}]
+                        [--subscription]
   examples:
   - summary: Create an App Configuration with name, location, sku and resource group.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
   - summary: Create an App Configuration with name, location, sku and resource group with system assigned identity.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
   - summary: Create an App Configuration with name, location, sku and resource group with user assigned identity.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
-  parameters:
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
+  - summary: Create an App Configuration with name, location and resource group and enable public network access.
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --enable-public-network
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: free, standard
-    summary: The sku of App Configuration.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified.
+    summary: Space-separated list of managed identities to be assigned. Use "[system]" to refer to system-assigned managed identity or a resource ID to refer to user-assigned managed identity. If this argument is provided without any value, system-assigned managed identity will be assigned by default. If this argument is not provided, no managed identities will be assigned to this App Configuration store.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: When true, requests coming from public networks have permission to access this store while private endpoint is enabled. When false, only requests made through Private Links can reach this store.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    parameterValueGroup: Free, Standard
+    summary: The sku of App Configuration.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_delete
   name: az appconfig delete
   summary: Delete an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig delete --name
+                        [--resource-group]
+                        [--subscription]
+                        [--yes]
   examples:
   - summary: Delete an App Configuration under resource group
-    syntax:
-      content: az appconfig delete -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig delete -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_list
   name: az appconfig list
   summary: Lists all App Configurations under the current subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig list [--query-examples]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: List all App Configurations under a resource group
-    syntax:
-      content: az appconfig list -g MyResourceGroup
-  parameters:
+    syntax: az appconfig list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_show
   name: az appconfig show
   summary: Show properties of an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig show --name
+                      [--query-examples]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: Show properties of an App Configuration
-    syntax:
-      content: az appconfig show -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig show -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_update
   name: az appconfig update
   summary: Update an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig update --name
+                        [--enable-public-network {false, true}]
+                        [--encryption-key-name]
+                        [--encryption-key-vault]
+                        [--encryption-key-version]
+                        [--identity-client-id]
+                        [--resource-group]
+                        [--sku {Free, Standard}]
+                        [--subscription]
+                        [--tags]
   examples:
   - summary: Update tags of an App Configuration
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
   - summary: Upgrade sku of an App Configuration to standard
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
   - summary: Enable customer encryption key with system assigned identity
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name myKey --encryption-key-version keyVersion --encryption-key-vault https://keyVaultName.vault.azure.net
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name myKey --encryption-key-version keyVersion --encryption-key-vault https://keyVaultName.vault.azure.net
   - summary: Remove customer encryption key
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name ""
-  parameters:
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name ""
+  - summary: Update an App Configuration to enable public network access.
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --enable-public-network true
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --sku
-    parameterValueGroup: free, standard
-    summary: The sku of App Configuration.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  optionalParameters:
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: When true, requests coming from public networks have permission to access this store while private endpoint is enabled. When false, only requests made through Private Links can reach this store.
     description: ''
   - name: --encryption-key-name
     summary: The name of the KeyVault key.
@@ -182,135 +179,62 @@ items:
     summary: The version of the KeyVault key. Use the latest version by default.
     description: ''
   - name: --identity-client-id
-    summary: Client ID of the managed identity with wrap and unwrap access to encryption key. Use system assigned identity by default.
+    summary: Client ID of the managed identity with wrap and unwrap access to encryption key. Use system-assigned managed identity by default.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Free, Standard
+    summary: The sku of App Configuration.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_create
-  name: az appconfig create
-  summary: Create an App Configuration.
-- uid: az_appconfig_credential
-  name: az appconfig credential
-  summary: Manage credentials for App Configurations.
-- uid: az_appconfig_credential_list
-  name: az appconfig credential list
-  summary: List access keys of an App Configuration.
-- uid: az_appconfig_credential_regenerate
-  name: az appconfig credential regenerate
-  summary: Regenerate an access key for an App Configuration.
-- uid: az_appconfig_delete
-  name: az appconfig delete
-  summary: Delete an App Configuration.
-- uid: az_appconfig_feature
-  name: az appconfig feature
-  summary: Manage feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_delete
-  name: az appconfig feature delete
-  summary: Delete feature flag.
-- uid: az_appconfig_feature_disable
-  name: az appconfig feature disable
-  summary: Disable a feature flag to turn it OFF for use.
-- uid: az_appconfig_feature_enable
-  name: az appconfig feature enable
-  summary: Enable a feature flag to turn it ON for use.
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
-- uid: az_appconfig_feature_list
-  name: az appconfig feature list
-  summary: List feature flags.
-- uid: az_appconfig_feature_lock
-  name: az appconfig feature lock
-  summary: Lock a feature flag to prohibit write operations.
-- uid: az_appconfig_feature_set
-  name: az appconfig feature set
-  summary: Set a feature flag.
-- uid: az_appconfig_feature_show
-  name: az appconfig feature show
-  summary: Show all attributes of a feature flag.
-- uid: az_appconfig_feature_unlock
-  name: az appconfig feature unlock
-  summary: Unlock a feature to gain write operations.
-- uid: az_appconfig_identity
-  name: az appconfig identity
-  summary: Managed identities for App Configurations.
-- uid: az_appconfig_identity_assign
-  name: az appconfig identity assign
-  summary: Update managed identities for an App Configuration.
-- uid: az_appconfig_identity_remove
-  name: az appconfig identity remove
-  summary: Remove managed identities for an App Configuration.
-- uid: az_appconfig_identity_show
-  name: az appconfig identity show
-  summary: Display managed identities for an App Configuration.
-- uid: az_appconfig_kv
-  name: az appconfig kv
-  summary: Manage key-values stored in an App Configuration.
-- uid: az_appconfig_kv_delete
-  name: az appconfig kv delete
-  summary: Delete key-values.
-- uid: az_appconfig_kv_export
-  name: az appconfig kv export
-  summary: Export configurations to another place from your App Configuration.
-- uid: az_appconfig_kv_import
-  name: az appconfig kv import
-  summary: Import configurations into your App Configuration from another place.
-- uid: az_appconfig_kv_list
-  name: az appconfig kv list
-  summary: List key-values.
-- uid: az_appconfig_kv_lock
-  name: az appconfig kv lock
-  summary: Lock a key-value to prohibit write operations.
-- uid: az_appconfig_kv_restore
-  name: az appconfig kv restore
-  summary: Restore key-values.
-- uid: az_appconfig_kv_set
-  name: az appconfig kv set
-  summary: Set a key-value.
-- uid: az_appconfig_kv_set_keyvault
-  name: az appconfig kv set-keyvault
-  summary: Set a keyvault reference.
-- uid: az_appconfig_kv_show
-  name: az appconfig kv show
-  summary: Show all attributes of a key-value.
-- uid: az_appconfig_kv_unlock
-  name: az appconfig kv unlock
-  summary: Unlock a key-value to gain write operations.
-- uid: az_appconfig_list
-  name: az appconfig list
-  summary: Lists all App Configurations under the current subscription.
-- uid: az_appconfig_revision
-  name: az appconfig revision
-  summary: Manage revisions for key-values stored in an App Configuration.
-- uid: az_appconfig_revision_list
-  name: az appconfig revision list
-  summary: Lists revision history of key-values.
-- uid: az_appconfig_show
-  name: az appconfig show
-  summary: Show properties of an App Configuration.
-- uid: az_appconfig_update
-  name: az appconfig update
-  summary: Update an App Configuration.
+- az_appconfig_create
+- az_appconfig_credential
+- az_appconfig_credential_list
+- az_appconfig_credential_regenerate
+- az_appconfig_delete
+- az_appconfig_feature
+- az_appconfig_feature_delete
+- az_appconfig_feature_disable
+- az_appconfig_feature_enable
+- az_appconfig_feature_filter
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
+- az_appconfig_feature_list
+- az_appconfig_feature_lock
+- az_appconfig_feature_set
+- az_appconfig_feature_show
+- az_appconfig_feature_unlock
+- az_appconfig_identity
+- az_appconfig_identity_assign
+- az_appconfig_identity_remove
+- az_appconfig_identity_show
+- az_appconfig_kv
+- az_appconfig_kv_delete
+- az_appconfig_kv_export
+- az_appconfig_kv_import
+- az_appconfig_kv_list
+- az_appconfig_kv_lock
+- az_appconfig_kv_restore
+- az_appconfig_kv_set
+- az_appconfig_kv_set-keyvault
+- az_appconfig_kv_show
+- az_appconfig_kv_unlock
+- az_appconfig_list
+- az_appconfig_revision
+- az_appconfig_revision_list
+- az_appconfig_show
+- az_appconfig_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -326,10 +250,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage App Configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml
index 7a90cd2a3b..164466cbcd 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml
@@ -1,79 +1,69 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_credential
-  name: az appconfig credential
-  summary: Manage credentials for App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_credential_list
-  - az_appconfig_credential_regenerate
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_credential
+name: az appconfig credential
+summary: Manage credentials for App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_credential_list
   name: az appconfig credential list
   summary: List access keys of an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig credential list --name
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List access keys of an App Configuration
-    syntax:
-      content: az appconfig credential list -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig credential list -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_credential_regenerate
   name: az appconfig credential regenerate
   summary: Regenerate an access key for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig credential regenerate --id
+                                       --name
+                                       [--resource-group]
+                                       [--subscription]
   examples:
   - summary: Regenerate a read only access key for an App Configuration
-    syntax:
-      content: az appconfig credential regenerate -g MyResourceGroup -n MyAppConfiguration --id 0-l0-s0:8ldbreMVH+d7EjaSUg3H
-  parameters:
+    syntax: az appconfig credential regenerate -g MyResourceGroup -n MyAppConfiguration --id 0-l0-s0:8ldbreMVH+d7EjaSUg3H
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Id of the key to be regenerated. Can be found using az appconfig credential list command.
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_credential_list
-  name: az appconfig credential list
-  summary: List access keys of an App Configuration.
-- uid: az_appconfig_credential_regenerate
-  name: az appconfig credential regenerate
-  summary: Regenerate an access key for an App Configuration.
+- az_appconfig_credential_list
+- az_appconfig_credential_regenerate
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -89,10 +79,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage credentials for App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage credentials for App Configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml
index 8f95bca75d..7171edc3d6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml
@@ -1,168 +1,198 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_feature
-  name: az appconfig feature
-  summary: Manage feature flags stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_feature_delete
-  - az_appconfig_feature_disable
-  - az_appconfig_feature_enable
-  - az_appconfig_feature_list
-  - az_appconfig_feature_lock
-  - az_appconfig_feature_set
-  - az_appconfig_feature_show
-  - az_appconfig_feature_unlock
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_feature
+name: az appconfig feature
+summary: Manage feature flags stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_feature_delete
   name: az appconfig feature delete
   summary: Delete feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature delete --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: Delete a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature delete -n MyAppConfiguration --feature color --label MyLabel --yes
+    syntax: az appconfig feature delete -n MyAppConfiguration --feature color --label MyLabel --yes
   - summary: Delete a feature using connection string.
-    syntax:
-      content: az appconfig feature delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label MyLabel
-  parameters:
+    syntax: az appconfig feature delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label MyLabel
+  - summary: Delete a feature using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature delete --endpoint https://myappconfiguration.azconfig.io --feature color --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be deleted. Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix. Comma separated keys are not supported. Please provide escaped string if your feature name contains comma.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, delete the feature flag with null label by default. Support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_disable
   name: az appconfig feature disable
   summary: Disable a feature flag to turn it OFF for use.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature disable --feature
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--endpoint]
+                                 [--label]
+                                 [--name]
+                                 [--subscription]
+                                 [--yes]
   examples:
   - summary: disable a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature disable -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature disable -n MyAppConfiguration --feature color --label test
   - summary: Force disabling a feature using connection string.
-    syntax:
-      content: az appconfig feature disable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature disable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be disabled.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, disable the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_enable
   name: az appconfig feature enable
   summary: Enable a feature flag to turn it ON for use.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature enable --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: enable a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature enable -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature enable -n MyAppConfiguration --feature color --label test
   - summary: Force enabling a feature using connection string.
-    syntax:
-      content: az appconfig feature enable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature enable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be enabled.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, enable the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_list
   name: az appconfig feature list
   summary: List feature flags.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature list [--all]
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--feature]
+                              [--fields {conditions, description, key, label, last_modified, locked, state}]
+                              [--label]
+                              [--name]
+                              [--query-examples]
+                              [--subscription]
+                              [--top]
   examples:
   - summary: List all feature flags.
-    syntax:
-      content: az appconfig feature list -n MyAppConfiguration
+    syntax: az appconfig feature list -n MyAppConfiguration
   - summary: List all feature flags with null labels.
-    syntax:
-      content: az appconfig feature list -n MyAppConfiguration --label \0
+    syntax: az appconfig feature list -n MyAppConfiguration --label \0
   - summary: List a specfic feature for any label start with v1. using connection string.
-    syntax:
-      content: az appconfig feature list --feature color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
+    syntax: az appconfig feature list --feature color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
   - summary: List all features with any labels and query only key, state and conditions.
-    syntax:
-      content: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key state conditions
+    syntax: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key state conditions
   - summary: List 150 feature flags with any labels.
-    syntax:
-      content: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --top 150
+    syntax: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --top 150
   - summary: List feature flags with multiple labels.
-    syntax:
-      content: az appconfig feature list --label test,prod,\0 -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig feature list --label test,prod,\0 -n MyAppConfiguration
+  optionalParameters:
   - name: --all
     summary: List all feature flags.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --feature
     summary: Key of the feature to be listed. Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix. Comma separated keys are not supported. Please provide escaped string if your feature name contains comma.
@@ -175,121 +205,157 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_lock
   name: az appconfig feature lock
   summary: Lock a feature flag to prohibit write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature lock --feature
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--label]
+                              [--name]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Lock a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature lock -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature lock -n MyAppConfiguration --feature color --label test
   - summary: Force locking a feature using connection string.
-    syntax:
-      content: az appconfig feature lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be locked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, lock the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_set
   name: az appconfig feature set
   summary: Set a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature set --feature
+                             [--auth-mode {key, login}]
+                             [--connection-string]
+                             [--description]
+                             [--endpoint]
+                             [--label]
+                             [--name]
+                             [--subscription]
+                             [--yes]
   examples:
   - summary: Set a feature flag with label MyLabel.
-    syntax:
-      content: az appconfig feature set -n MyAppConfiguration --feature color --label MyLabel
+    syntax: az appconfig feature set -n MyAppConfiguration --feature color --label MyLabel
   - summary: Set a feature flag with null label using connection string and set a description.
-    syntax:
-      content: az appconfig feature set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
-  parameters:
+    syntax: az appconfig feature set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
+  - summary: Set a feature flag using your 'az login' credentials.
+    syntax: az appconfig feature set --endpoint https://myappconfiguration.azconfig.io --feature color --label MyLabel --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature flag to be set. Only alphanumeric characters, '.', '-' and '_' are allowed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --description
     summary: Description of the feature flag to be set.
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, set the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_show
   name: az appconfig feature show
   summary: Show all attributes of a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature show --feature
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--fields {conditions, description, key, label, last_modified, locked, state}]
+                              [--label]
+                              [--name]
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Show a feature flag using App Configuration name with a specific label
-    syntax:
-      content: az appconfig feature show -n MyAppConfiguration --feature color --label MyLabel
+    syntax: az appconfig feature show -n MyAppConfiguration --feature color --label MyLabel
   - summary: Show a feature flag using connection string and field filters
-    syntax:
-      content: az appconfig feature show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --fields key locked conditions state
-  parameters:
+    syntax: az appconfig feature show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --fields key locked conditions state
+  - summary: Show a feature flag using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature show --endpoint https://myappconfiguration.azconfig.io --feature color --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature flag to be retrieved.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --fields
     parameterValueGroup: conditions, description, key, label, last_modified, locked, state
@@ -299,96 +365,77 @@ items:
     summary: If no label specified, show entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_unlock
   name: az appconfig feature unlock
   summary: Unlock a feature to gain write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature unlock --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: Unlock a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature unlock -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature unlock -n MyAppConfiguration --feature color --label test
   - summary: Force unlocking a feature using connection string.
-    syntax:
-      content: az appconfig feature unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be unlocked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, unlock the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_feature_delete
-  name: az appconfig feature delete
-  summary: Delete feature flag.
-- uid: az_appconfig_feature_disable
-  name: az appconfig feature disable
-  summary: Disable a feature flag to turn it OFF for use.
-- uid: az_appconfig_feature_enable
-  name: az appconfig feature enable
-  summary: Enable a feature flag to turn it ON for use.
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
-- uid: az_appconfig_feature_list
-  name: az appconfig feature list
-  summary: List feature flags.
-- uid: az_appconfig_feature_lock
-  name: az appconfig feature lock
-  summary: Lock a feature flag to prohibit write operations.
-- uid: az_appconfig_feature_set
-  name: az appconfig feature set
-  summary: Set a feature flag.
-- uid: az_appconfig_feature_show
-  name: az appconfig feature show
-  summary: Show all attributes of a feature flag.
-- uid: az_appconfig_feature_unlock
-  name: az appconfig feature unlock
-  summary: Unlock a feature to gain write operations.
+- az_appconfig_feature_delete
+- az_appconfig_feature_disable
+- az_appconfig_feature_enable
+- az_appconfig_feature_filter
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
+- az_appconfig_feature_list
+- az_appconfig_feature_lock
+- az_appconfig_feature_set
+- az_appconfig_feature_show
+- az_appconfig_feature_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -404,10 +451,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage feature flags stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage feature flags stored in an App Configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml
index 983c38c78a..2b093aded9 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml
@@ -1,33 +1,37 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_feature_filter_add
-  - az_appconfig_feature_filter_delete
-  - az_appconfig_feature_filter_list
-  - az_appconfig_feature_filter_show
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_feature_filter
+name: az appconfig feature filter
+summary: Manage filters associated with feature flags stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_feature_filter_add
   name: az appconfig feature filter add
   summary: Add a filter to a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter add --feature
+                                    --filter-name
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--endpoint]
+                                    [--filter-parameters]
+                                    [--index]
+                                    [--label]
+                                    [--name]
+                                    [--subscription]
+                                    [--yes]
   examples:
   - summary: Add a filter for feature 'color' with label MyLabel with name 'MyFilter' and 2 parameters.
-    syntax:
-      content: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters Name=Value Name2=Value2
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters Name=\"Value\" Name2=\"Value2\"
   - summary: Insert a filter at index 2 (zero-based index) for feature 'color' with label MyLabel and filter name 'MyFilter' with no parameters
-    syntax:
-      content: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --index 2
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --index 2
   - summary: Add a filter with name 'MyFilter' using connection string.
-    syntax:
-      content: az appconfig feature filter add --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
-  parameters:
+    syntax: az appconfig feature filter add --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
+  - summary: Add a filter with name 'MyFilter' using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature filter add --endpoint=https://contoso.azconfig.io --feature color --filter-name MyFilter --auth-mode login
+  - summary: Add a filter for feature 'color' with label MyLabel with name 'MyFilter' and array parameters.
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters ArrayParam=[1,2,3]
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature to which you want to add the filter.
@@ -36,11 +40,20 @@ items:
     name: --filter-name
     summary: Name of the filter to be added.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --filter-parameters
-    summary: Space-separated filter parameters in 'name[=value]' format.
+    summary: Space-separated filter parameters in 'name[=value]' format. The value must be an escaped JSON string.
     description: ''
   - name: --index
     summary: Zero-based index in the list of filters where you want to insert the new filter. If no index is specified or index is invalid, filter will be added to the end of the list.
@@ -49,46 +62,57 @@ items:
     summary: If no label specified, add to the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_delete
   name: az appconfig feature filter delete
   summary: Delete a filter from a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter delete --feature
+                                       [--all]
+                                       [--auth-mode {key, login}]
+                                       [--connection-string]
+                                       [--endpoint]
+                                       [--filter-name]
+                                       [--index]
+                                       [--label]
+                                       [--name]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete a filter from a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature filter delete -n MyAppConfiguration --feature color --filter-name MyFilter --yes
+    syntax: az appconfig feature filter delete -n MyAppConfiguration --feature color --filter-name MyFilter --yes
   - summary: Delete a filter from a feature when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter delete --feature color --filter-name MyFilter --index 2 --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx
+    syntax: az appconfig feature filter delete --feature color --filter-name MyFilter --index 2 --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx
   - summary: Delete all filters of a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature filter delete -n MyAppConfiguration --feature color --label MyLabel --all --yes
-  parameters:
+    syntax: az appconfig feature filter delete -n MyAppConfiguration --feature color --label MyLabel --all --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature from which you want to delete the filter.
     description: ''
+  optionalParameters:
   - name: --all
     summary: Delete all filters associated with a feature flag.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --filter-name
     summary: Name of the filter to be deleted.
@@ -100,76 +124,94 @@ items:
     summary: If no label specified, delete from the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_list
   name: az appconfig feature filter list
   summary: List all filters for a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter list --feature
+                                     [--all]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--endpoint]
+                                     [--label]
+                                     [--name]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--top]
   examples:
   - summary: List all filters for feature flag 'color'.
-    syntax:
-      content: az appconfig feature filter list -n MyAppConfiguration --feature color --all
+    syntax: az appconfig feature filter list -n MyAppConfiguration --feature color --all
   - summary: List 150 filters for feature flag 'color'
-    syntax:
-      content: az appconfig feature filter list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --feature color --top 150
-  parameters:
+    syntax: az appconfig feature filter list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --feature color --top 150
+  - summary: List all filters for feature flag 'color' using your 'az login' credentials.
+    syntax: az appconfig feature filter list --endpoint https://myappconfiguration.azconfig.io --feature color --all --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature whose filters you want to be displayed.
     description: ''
+  optionalParameters:
   - name: --all
     summary: List all filters associated with a feature flag.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, display filters from the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_show
   name: az appconfig feature filter show
   summary: Show filters of a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter show --feature
+                                     --filter-name
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--endpoint]
+                                     [--index]
+                                     [--label]
+                                     [--name]
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Show one unique feature filter when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter show -n MyAppConfiguration --feature color --filter-name MyFilter --index 2
+    syntax: az appconfig feature filter show -n MyAppConfiguration --feature color --filter-name MyFilter --index 2
   - summary: Show all instances of a feature filter when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
-  parameters:
+    syntax: az appconfig feature filter show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature which contains the filter.
@@ -178,8 +220,17 @@ items:
     name: --filter-name
     summary: Name of the filter to be displayed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --index
     summary: Zero-based index of the filter to be displayed in case there are multiple instances with same filter name.
@@ -188,30 +239,20 @@ items:
     summary: If no label specified, show the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,10 +268,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage filters associated with feature flags stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage filters associated with feature flags stored in an App Configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml
index 82e2696a02..97f9293862 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml
@@ -1,124 +1,105 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_identity
-  name: az appconfig identity
-  summary: Managed identities for App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_identity_assign
-  - az_appconfig_identity_remove
-  - az_appconfig_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_identity
+name: az appconfig identity
+summary: Managed identities for App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_identity_assign
   name: az appconfig identity assign
   summary: Update managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity assign --name
+                                 [--identities]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Enable the system-assigned identity for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
   - summary: Assign a user-assigned managed identity for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
   - summary: Assign both system-assigned and user assigned identities for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
-  parameters:
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --identities
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified.
+    summary: Accept system-assigned or user-assigned managed identities separated by spaces. Use '[system]' to refer to system-assigned managed identity or a resource ID to refer to user-assigned managed identity. If this argument is not provided or this argument is provided without any value, system-assigned managed identity will be used by default.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_identity_remove
   name: az appconfig identity remove
   summary: Remove managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity remove --name
+                                 [--identities]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Remove the system-assigned identity from a App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
   - summary: Remove a user assigned identity from a App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
   - summary: Remove all identities from an App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
-  parameters:
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --identities
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, '[all]' for all identities or a resource id to refer user assigned identity. Remove system assigned identity if not specified.
+    summary: Accept system-assigned or user-assigned managed identities separated by spaces. Use '[system]' to refer to system-assigned managed identity, '[all]' for all managed identities or a resource ID to refer user-assigned managed identity. If this argument is not provided or this argument is provided without any value, system-assigned managed identity will be removed by default.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_identity_show
   name: az appconfig identity show
   summary: Display managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity show --name
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Display managed identities for a task.
-    syntax:
-      content: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_identity_assign
-  name: az appconfig identity assign
-  summary: Update managed identities for an App Configuration.
-- uid: az_appconfig_identity_remove
-  name: az appconfig identity remove
-  summary: Remove managed identities for an App Configuration.
-- uid: az_appconfig_identity_show
-  name: az appconfig identity show
-  summary: Display managed identities for an App Configuration.
+- az_appconfig_identity_assign
+- az_appconfig_identity_remove
+- az_appconfig_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -134,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Managed identities for App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Managed identities for App Configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml
index 1c95aee6d7..6a6cfefa20 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml
@@ -1,135 +1,152 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_kv
-  name: az appconfig kv
-  summary: Manage key-values stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_kv_delete
-  - az_appconfig_kv_export
-  - az_appconfig_kv_import
-  - az_appconfig_kv_list
-  - az_appconfig_kv_lock
-  - az_appconfig_kv_restore
-  - az_appconfig_kv_set
-  - az_appconfig_kv_set_keyvault
-  - az_appconfig_kv_show
-  - az_appconfig_kv_unlock
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_kv
+name: az appconfig kv
+summary: Manage key-values stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_kv_delete
   name: az appconfig kv delete
   summary: Delete key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv delete --key
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--endpoint]
+                           [--label]
+                           [--name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Delete a key using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig kv delete -n MyAppConfiguration --key color --label MyLabel --yes
+    syntax: az appconfig kv delete -n MyAppConfiguration --key color --label MyLabel --yes
   - summary: Delete a key using connection string.
-    syntax:
-      content: az appconfig kv delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
-  parameters:
+    syntax: az appconfig kv delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
+  - summary: Delete a key using your 'az login' credentials and App Configuration endpoint.
+    syntax: az appconfig kv delete --endpoint https://myappconfiguration.azconfig.io --key color --auth-mode login --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, delete entry with null label. Support star sign as filters, for instance \* means all label and abc\* means labels with abc as prefix.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_export
   name: az appconfig kv export
   summary: Export configurations to another place from your App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv export --destination {appconfig, appservice, file}
+                           [--appservice-account]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--dest-auth-mode {key, login}]
+                           [--dest-connection-string]
+                           [--dest-endpoint]
+                           [--dest-label]
+                           [--dest-name]
+                           [--endpoint]
+                           [--format {json, properties, yaml}]
+                           [--key]
+                           [--label]
+                           [--name]
+                           [--naming-convention {camel, hyphen, pascal, underscore}]
+                           [--path]
+                           [--prefix]
+                           [--preserve-labels {false, true}]
+                           [--resolve-keyvault {false, true}]
+                           [--separator]
+                           [--skip-features {false, true}]
+                           [--skip-keyvault {false, true}]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Export all keys and feature flags with label test to a json file.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json
+    syntax: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json
   - summary: Export all keys with null label to an App Service application.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appservice  --appservice-account MyAppService
+    syntax: az appconfig kv export -n MyAppConfiguration -d appservice --appservice-account MyAppService
   - summary: Export all keys with label test excluding feature flags to a json file.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json --skip-features
+    syntax: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json --skip-features
   - summary: Export all keys and feature flags with all labels to another App Configuration.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --preserve-labels
+    syntax: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --preserve-labels
   - summary: Export all keys and feature flags with all labels to another App Configuration and overwrite destination labels.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --dest-label ExportedKeys
-  parameters:
+    syntax: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --dest-label ExportedKeys
+  - summary: Export all keys to another App Configuration using your 'az login' credentials.
+    syntax: az appconfig kv export -d appconfig --endpoint https://myappconfiguration.azconfig.io --auth-mode login --dest-endpoint https://anotherappconfiguration.azconfig.io --dest-auth-mode login --key * --label * --preserve-labels
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     parameterValueGroup: appconfig, appservice, file
     summary: The destination of exporting. Note that exporting feature flags to appservice is not supported.
     description: ''
-  - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
-    description: ''
-  - name: --key
-    summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be exported.
-    description: ''
-  - name: --label
-    summary: Only keys and feature flags with this label will be exported. If no label specified, export keys and feature flags with null label by default. Only when export destination is appconfig, we support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Label filters are not supported when exporting to file or appservice.
-    description: ''
-  - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --prefix
-    summary: Prefix to be trimmed from keys. Prefix will be ignored for feature flags.
+  optionalParameters:
+  - name: --appservice-account
+    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
     description: ''
-  - name: --skip-features
-    parameterValueGroup: false, true
-    summary: Export items excluding all feature flags. By default, all features with the specified label will be exported to file or appconfig. Not applicable for appservice.
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
     description: ''
-  - name: --skip-keyvault
-    parameterValueGroup: false, true
-    summary: Export items excluding all key vault references. By default, all key vault references with the specified label will be exported.
+  - name: --connection-string
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for preview.
+  - name: --dest-auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Auth mode for connecting to destination App Configuration. For details, refer to "--auth-mode" argument.
     description: ''
   - name: --dest-connection-string
     summary: Combination of access key and endpoint of the destination store.
     description: ''
+  - name: --dest-endpoint
+    summary: If --dest-auth-mode is "login", provide endpoint URL of the destination App Configuration.
+    description: ''
   - name: --dest-label
     summary: Exported KVs will be labeled with this destination label. If neither --dest-label nor --preserve-labels is specified, will assign null label.
     description: ''
   - name: --dest-name
     summary: The name of the destination App Configuration.
     description: ''
-  - name: --preserve-labels
-    parameterValueGroup: false, true
-    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --dest-label.
-    description: ''
-  - name: --appservice-account
-    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --format
     parameterValueGroup: json, properties, yaml
     summary: File format exporting to. Required for file arguments. Currently, feature flags are not supported in properties format.
     description: ''
+  - name: --key
+    summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be exported.
+    description: ''
+  - name: --label
+    summary: Only keys and feature flags with this label will be exported. If no label specified, export keys and feature flags with null label by default. Only when export destination is appconfig, we support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Label filters are not supported when exporting to file or appservice.
+    description: ''
+  - name: --name -n
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
   - name: --naming-convention
     defaultValue: pascal
     parameterValueGroup: camel, hyphen, pascal, underscore
@@ -138,79 +155,143 @@ items:
   - name: --path
     summary: Local configuration file path. Required for file arguments.
     description: ''
+  - name: --prefix
+    summary: Prefix to be trimmed from keys. Prefix will be ignored for feature flags.
+    description: ''
+  - name: --preserve-labels
+    parameterValueGroup: false, true
+    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --dest-label.
+    description: ''
   - name: --resolve-keyvault
     parameterValueGroup: false, true
     summary: Resolve the content of key vault reference.
     description: ''
   - name: --separator
-    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Required for exporting hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
+    summary: "Delimiter for flattening the key-value pairs to json or yaml file. Required for exporting hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
+    description: ''
+  - name: --skip-features
+    parameterValueGroup: false, true
+    summary: Export items excluding all feature flags. By default, all features with the specified label will be exported to file or appconfig. Not applicable for appservice.
+    description: ''
+  - name: --skip-keyvault
+    parameterValueGroup: false, true
+    summary: Export items excluding all key vault references. By default, all key vault references with the specified label will be exported.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for preview.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_import
   name: az appconfig kv import
   summary: Import configurations into your App Configuration from another place.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv import --source {appconfig, appservice, file}
+                           [--appservice-account]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--content-type]
+                           [--depth]
+                           [--endpoint]
+                           [--format {json, properties, yaml}]
+                           [--label]
+                           [--name]
+                           [--path]
+                           [--prefix]
+                           [--preserve-labels {false, true}]
+                           [--separator]
+                           [--skip-features {false, true}]
+                           [--src-auth-mode {key, login}]
+                           [--src-connection-string]
+                           [--src-endpoint]
+                           [--src-key]
+                           [--src-label]
+                           [--src-name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Import all keys and feature flags from a file and apply test label.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration --label test -s file --path D:/abc.json --format json
+    syntax: az appconfig kv import -n MyAppConfiguration --label test -s file --path D:/abc.json --format json
   - summary: Import all keys and feature flags with null label and apply new label from an App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --label ImportedKeys
-  - summary: Import all keys and apply null label from an App Service appliaction.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appservice --appservice-account MyAppService
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --label ImportedKeys
+  - summary: Import all keys and apply null label from an App Service application.
+    syntax: az appconfig kv import -n MyAppConfiguration -s appservice --appservice-account MyAppService
   - summary: Import all keys with label test and apply test2 label excluding feature flags from an App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-label test --label test2 --src-name AnotherAppConfiguration --skip-features
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-label test --label test2 --src-name AnotherAppConfiguration --skip-features
   - summary: Import all keys and feature flags with all labels to another App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --src-key * --src-label * --preserve-labels
-  parameters:
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --src-key * --src-label * --preserve-labels
+  - summary: Import all keys and feature flags from a JSON file and apply JSON content type.
+    syntax: az appconfig kv import -n MyAppConfiguration -s file --path D:/abc.json --format json --separator . --content-type application/json
+  - summary: Import all keys to another App Configuration using your 'az login' credentials.
+    syntax: az appconfig kv import -s appconfig --endpoint https://myappconfiguration.azconfig.io --auth-mode login --src-endpoint https://anotherappconfiguration.azconfig.io --src-auth-mode login --src-key * --src-label * --preserve-labels
+  requiredParameters:
   - isRequired: true
     name: --source -s
     parameterValueGroup: appconfig, appservice, file
     summary: The source of importing. Note that importing feature flags from appservice is not supported.
     description: ''
+  optionalParameters:
+  - name: --appservice-account
+    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
+    description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --content-type
     summary: Content type of all imported items.
     description: ''
+  - name: --depth
+    summary: Depth for flattening the json or yaml file to key-value pairs. Flatten to the deepest level by default if --separator is provided. Not applicable for property files or feature flags.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
+  - name: --format
+    parameterValueGroup: json, properties, yaml
+    summary: Imported file format. Required for file arguments. Currently, feature flags are not supported in properties format.
+    description: ''
   - name: --label
     summary: Imported KVs and feature flags will be assigned with this label. If no label specified, will assign null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --path
+    summary: Local configuration file path. Required for file arguments.
     description: ''
   - name: --prefix
     summary: This prefix will be appended to the front of imported keys. Prefix will be ignored for feature flags.
     description: ''
-  - name: --skip-features
+  - name: --preserve-labels
     parameterValueGroup: false, true
-    summary: Import only key values and exclude all feature flags. By default, all feature flags will be imported from file or appconfig. Not applicable for appservice.
+    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --label.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for preview.
+  - name: --separator
+    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
     description: ''
-  - name: --preserve-labels
+  - name: --skip-features
     parameterValueGroup: false, true
-    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --label.
+    summary: Import only key values and exclude all feature flags. By default, all feature flags will be imported from file or appconfig. Not applicable for appservice.
+    description: ''
+  - name: --src-auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Auth mode for connecting to source App Configuration. For details, refer to "--auth-mode" argument.
     description: ''
   - name: --src-connection-string
     summary: Combination of access key and endpoint of the source store.
     description: ''
+  - name: --src-endpoint
+    summary: If --src-auth-mode is "login", provide endpoint URL of the source App Configuration.
+    description: ''
   - name: --src-key
     summary: If no key specified, import all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be imported.
     description: ''
@@ -220,66 +301,65 @@ items:
   - name: --src-name
     summary: The name of the source App Configuration.
     description: ''
-  - name: --appservice-account
-    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
-    description: ''
-  - name: --depth
-    summary: Depth for flattening the json or yaml file to key-value pairs. Flatten to the deepest level by default. Not applicable for property files or feature flags.
-    description: ''
-  - name: --format
-    parameterValueGroup: json, properties, yaml
-    summary: Imported file format. Required for file arguments. Currently, feature flags are not supported in properties format.
-    description: ''
-  - name: --path
-    summary: Local configuration file path. Required for file arguments.
-    description: ''
-  - name: --separator
-    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Required for importing hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for preview.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_list
   name: az appconfig kv list
   summary: List key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv list [--all]
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--datetime]
+                         [--endpoint]
+                         [--fields {content_type, etag, key, label, last_modified, locked, tags, value}]
+                         [--key]
+                         [--label]
+                         [--name]
+                         [--query-examples]
+                         [--resolve-keyvault {false, true}]
+                         [--subscription]
+                         [--top]
   examples:
   - summary: List all key-values with null label.
-    syntax:
-      content: az appconfig kv list -n MyAppConfiguration --label \0
+    syntax: az appconfig kv list -n MyAppConfiguration --label \0
   - summary: List a specific key for any label start with v1. using connection string.
-    syntax:
-      content: az appconfig kv list --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
+    syntax: az appconfig kv list --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
   - summary: List all keys with any labels and query only key, value and tags.
-    syntax:
-      content: az appconfig kv list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value tags --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value tags --datetime "2019-05-01T11:24:12Z"
   - summary: List content of key vault reference with key prefix 'KVRef_' and only select key and value.
-    syntax:
-      content: az appconfig kv list -n MyAppConfiguration --key "KVRef_*" --resolve-keyvault --query "[*].{key:key, value:value}"
+    syntax: az appconfig kv list -n MyAppConfiguration --key "KVRef_*" --resolve-keyvault --query "[*].{key:key, value:value}"
   - summary: List key-values with multiple labels.
-    syntax:
-      content: az appconfig kv list --label test,prod,\0 -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig kv list --label test,prod,\0 -n MyAppConfiguration
+  - summary: List all key-values with all labels using your 'az login' credentials.
+    syntax: az appconfig kv list --endpoint https://myappconfiguration.azconfig.io --auth-mode login
+  optionalParameters:
   - name: --all
     summary: List all items.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --fields
     parameterValueGroup: content_type, etag, key, label, last_modified, locked, tags, value
-    summary: Customize output fields.
+    summary: Space-separated customized output fields.
     description: ''
   - name: --key
     summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
@@ -288,134 +368,179 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resolve-keyvault
     parameterValueGroup: false, true
     summary: Resolve the content of key vault reference. This argument should NOT be specified along with --fields. Instead use --query for customized query.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_lock
   name: az appconfig kv lock
   summary: Lock a key-value to prohibit write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv lock --key
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--endpoint]
+                         [--label]
+                         [--name]
+                         [--subscription]
+                         [--yes]
   examples:
   - summary: Lock a key-value using App Configuration name.
-    syntax:
-      content: az appconfig kv lock -n MyAppConfiguration --key color --label test
+    syntax: az appconfig kv lock -n MyAppConfiguration --key color --label test
   - summary: Force locking a key-value using connection string.
-    syntax:
-      content: az appconfig kv lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
-  parameters:
+    syntax: az appconfig kv lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be locked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, lock entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_restore
   name: az appconfig kv restore
   summary: Restore key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv restore --datetime
+                            [--auth-mode {key, login}]
+                            [--connection-string]
+                            [--endpoint]
+                            [--key]
+                            [--label]
+                            [--name]
+                            [--subscription]
+                            [--yes]
   examples:
   - summary: Restore all key-values to a specific point in time.
-    syntax:
-      content: az appconfig kv restore -n MyAppConfiguration --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv restore -n MyAppConfiguration --datetime "2019-05-01T11:24:12Z"
   - summary: Restore a specific key for any label start with v1. using connection string to a specific point in time.
-    syntax:
-      content: az appconfig kv restore --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.* --datetime "2019-05-01T11:24:12Z"
-  parameters:
+    syntax: az appconfig kv restore --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.* --datetime "2019-05-01T11:24:12Z"
+  requiredParameters:
   - isRequired: true
     name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --key
     summary: If no key specified, restore all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
     description: ''
   - name: --label
-    summary: If no label specified, restore all key-value pairs with all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix.
+    summary: If no label specified, restore all key-value pairs with all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_set
   name: az appconfig kv set
   summary: Set a key-value.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv set --key
+                        [--auth-mode {key, login}]
+                        [--connection-string]
+                        [--content-type]
+                        [--endpoint]
+                        [--label]
+                        [--name]
+                        [--subscription]
+                        [--tags]
+                        [--value]
+                        [--yes]
   examples:
   - summary: Set a key-value with label MyLabel.
-    syntax:
-      content: az appconfig kv set -n MyAppConfiguration --key color --label MyLabel --value red
+    syntax: az appconfig kv set -n MyAppConfiguration --key color --label MyLabel --value red
   - summary: Set a key with null label using connection string.
-    syntax:
-      content: az appconfig kv set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --value red --tags key1=value1 key2=value2
-  parameters:
+    syntax: az appconfig kv set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --value red --tags key1=value1 key2=value2
+  - summary: Set a key with string value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key color --value \"red\" --content-type application/json
+  - summary: Set a key with list value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key options --value [1,2,3] --content-type application/activity+json;charset=utf-8
+  - summary: Set a key with null value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key foo --value null --content-type application/json
+  - summary: Set a key-value using your 'az login' credentials.
+    syntax: az appconfig kv set --endpoint https://myappconfiguration.azconfig.io --key color --value red --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be set. Key cannot be a '.' or '..', or contain the '%' character.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --content-type
     summary: Content type of the keyvalue to be set.
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, set the key with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -426,29 +551,28 @@ items:
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_appconfig_kv_set_keyvault
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
+- uid: az_appconfig_kv_set-keyvault
   name: az appconfig kv set-keyvault
   summary: Set a keyvault reference.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv set-keyvault --key
+                                 --secret-identifier
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--endpoint]
+                                 [--label]
+                                 [--name]
+                                 [--subscription]
+                                 [--tags]
+                                 [--yes]
   examples:
   - summary: Set a keyvault reference with label MyLabel.
-    syntax:
-      content: az appconfig kv set-keyvault -n MyAppConfiguration --key HostSecret --label MyLabel --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret/Dummyversion
+    syntax: az appconfig kv set-keyvault -n MyAppConfiguration --key HostSecret --label MyLabel --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret/Dummyversion
   - summary: Set a keyvault reference with null label and multiple tags using connection string.
-    syntax:
-      content: az appconfig kv set-keyvault --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key HostSecret --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret --tags tag1=value1 tag2=value2
-  parameters:
+    syntax: az appconfig kv set-keyvault --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key HostSecret --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret --tags tag1=value1 tag2=value2
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be set. Key cannot be a '.' or '..', or contain the '%' character.
@@ -457,14 +581,26 @@ items:
     name: --secret-identifier
     summary: ID of the Key Vault object. Can be found using 'az keyvault {collection} show' command, where collection is key, secret or certificate. To set reference to the latest version of your secret, remove version information from secret identifier.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, set the key with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -472,124 +608,120 @@ items:
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_show
   name: az appconfig kv show
   summary: Show all attributes of a key-value.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv show --key
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--datetime]
+                         [--endpoint]
+                         [--label]
+                         [--name]
+                         [--query-examples]
+                         [--subscription]
   examples:
   - summary: Show a key-value using App Configuration name with a specific label and datetime
-    syntax:
-      content: az appconfig kv show -n MyAppConfiguration --key color --label MyLabel --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv show -n MyAppConfiguration --key color --label MyLabel --datetime "2019-05-01T11:24:12Z"
   - summary: Show a key-value using connection string with label
-    syntax:
-      content: az appconfig kv show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
-  parameters:
+    syntax: az appconfig kv show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
+  - summary: Show a key-value using your 'az login' credentials.
+    syntax: az appconfig kv show --key color --auth-mode login --endpoint https://myappconfiguration.azconfig.io
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be showed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, show entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_unlock
   name: az appconfig kv unlock
   summary: Unlock a key-value to gain write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv unlock --key
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--endpoint]
+                           [--label]
+                           [--name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Unlock a key-value using App Configuration name.
-    syntax:
-      content: az appconfig kv unlock -n MyAppConfiguration --key color --label test
+    syntax: az appconfig kv unlock -n MyAppConfiguration --key color --label test
   - summary: Force unlocking a key-value using connection string.
-    syntax:
-      content: az appconfig kv unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
-  parameters:
+    syntax: az appconfig kv unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be unlocked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, unlock entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_kv_delete
-  name: az appconfig kv delete
-  summary: Delete key-values.
-- uid: az_appconfig_kv_export
-  name: az appconfig kv export
-  summary: Export configurations to another place from your App Configuration.
-- uid: az_appconfig_kv_import
-  name: az appconfig kv import
-  summary: Import configurations into your App Configuration from another place.
-- uid: az_appconfig_kv_list
-  name: az appconfig kv list
-  summary: List key-values.
-- uid: az_appconfig_kv_lock
-  name: az appconfig kv lock
-  summary: Lock a key-value to prohibit write operations.
-- uid: az_appconfig_kv_restore
-  name: az appconfig kv restore
-  summary: Restore key-values.
-- uid: az_appconfig_kv_set
-  name: az appconfig kv set
-  summary: Set a key-value.
-- uid: az_appconfig_kv_set_keyvault
-  name: az appconfig kv set-keyvault
-  summary: Set a keyvault reference.
-- uid: az_appconfig_kv_show
-  name: az appconfig kv show
-  summary: Show all attributes of a key-value.
-- uid: az_appconfig_kv_unlock
-  name: az appconfig kv unlock
-  summary: Unlock a key-value to gain write operations.
+- az_appconfig_kv_delete
+- az_appconfig_kv_export
+- az_appconfig_kv_import
+- az_appconfig_kv_list
+- az_appconfig_kv_lock
+- az_appconfig_kv_restore
+- az_appconfig_kv_set
+- az_appconfig_kv_set-keyvault
+- az_appconfig_kv_show
+- az_appconfig_kv_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -605,10 +737,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage key-values stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage key-values stored in an App Configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml b/2018-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml
index 37c362f780..ce4398c928 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml
@@ -1,42 +1,56 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_revision
-  name: az appconfig revision
-  summary: Manage revisions for key-values stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_revision_list
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_revision
+name: az appconfig revision
+summary: Manage revisions for key-values stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_revision_list
   name: az appconfig revision list
   summary: Lists revision history of key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig revision list [--all]
+                               [--auth-mode {key, login}]
+                               [--connection-string]
+                               [--datetime]
+                               [--endpoint]
+                               [--fields {content_type, etag, key, label, last_modified, locked, tags, value}]
+                               [--key]
+                               [--label]
+                               [--name]
+                               [--query-examples]
+                               [--subscription]
+                               [--top]
   examples:
   - summary: List revision history of a key-value using App Configuration name.
-    syntax:
-      content: az appconfig revision list -n MyAppConfiguration --key color --label test
+    syntax: az appconfig revision list -n MyAppConfiguration --key color --label test
   - summary: List revision history of a key-value with multiple labels.
-    syntax:
-      content: az appconfig revision list -n MyAppConfiguration --key color --label test,prod,\0
+    syntax: az appconfig revision list -n MyAppConfiguration --key color --label test,prod,\0
   - summary: List revision history for key "color" with any labels using connection string
-    syntax:
-      content: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --datetime "2019-05-01T11:24:12Z"
-  parameters:
+    syntax: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --datetime "2019-05-01T11:24:12Z"
+  - summary: List revision history for all items and query only key, value and last_modified.
+    syntax: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value last_modified
+  optionalParameters:
   - name: --all
     summary: List all items.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --fields
     parameterValueGroup: content_type, etag, key, label, last_modified, locked, tags, value
-    summary: Customize output fields.
+    summary: Space-separated customized output fields.
     description: ''
   - name: --key
     summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
@@ -45,24 +59,20 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_revision_list
-  name: az appconfig revision list
-  summary: Lists revision history of key-values.
+- az_appconfig_revision_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -78,10 +88,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage revisions for key-values stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage revisions for key-values stored in an App Configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/arcappliance.yml b/2018-03-01-hybrid/docs-ref-autogen/arcappliance.yml
new file mode 100644
index 0000000000..0ad8a69c53
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/arcappliance.yml
@@ -0,0 +1,90 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance
+name: az arcappliance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage an Arc Appliance.
+description: ''
+directCommands:
+- uid: az_arcappliance_get-credentials
+  name: az arcappliance get-credentials
+  summary: Command to get credentials.
+  description: ''
+  syntax: >-
+    az arcappliance get-credentials --name
+                                    --resource-group
+  examples:
+  - summary: Command to get credentials for a specific Appliance resource.
+    syntax: az arcappliance get-credentials --resource-group [REQUIRED] --name [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_list
+  name: az arcappliance list
+  summary: Command to list Arc Appliances.
+  description: ''
+  syntax: az arcappliance list [--resource-group]
+  examples:
+  - summary: Command to list Appliance resources in a resource group in current subscription context.
+    syntax: az arcappliance list -g [OPTIONAL]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_show
+  name: az arcappliance show
+  summary: Command to get an Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance show --name
+                         --resource-group
+  examples:
+  - summary: Command to give details about a particular Appliance resource in a resource group
+    syntax: az arcappliance show --resource-group [REQUIRED] --name [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_create
+- az_arcappliance_create_hci
+- az_arcappliance_create_vmware
+- az_arcappliance_delete
+- az_arcappliance_delete_hci
+- az_arcappliance_delete_vmware
+- az_arcappliance_deploy
+- az_arcappliance_deploy_hci
+- az_arcappliance_deploy_vmware
+- az_arcappliance_get-credentials
+- az_arcappliance_list
+- az_arcappliance_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage an Arc Appliance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/arcappliance/create.yml b/2018-03-01-hybrid/docs-ref-autogen/arcappliance/create.yml
new file mode 100644
index 0000000000..8be82f7c92
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/arcappliance/create.yml
@@ -0,0 +1,94 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_create
+name: az arcappliance create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for creation of appliance.
+description: ''
+directCommands:
+- uid: az_arcappliance_create_hci
+  name: az arcappliance create hci
+  summary: Command to create HCI Arc Appliance - must be done after Appliance has been deployed.
+  description: ''
+  syntax: >-
+    az arcappliance create hci --config-file
+                               --kubeconfig
+                               [--location]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Create Arc Appliance HCI Resource
+    syntax: az arcappliance create hci --config-file [REQUIRED] --kubeconfig [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  - isRequired: true
+    name: --kubeconfig
+    summary: Path to kubeconfig output from deploy command.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_create_vmware
+  name: az arcappliance create vmware
+  summary: Command to create VMware Arc Appliance - must be done Appliance has been deployed.
+  description: ''
+  syntax: >-
+    az arcappliance create vmware --config-file
+                                  --kubeconfig
+                                  [--location]
+                                  [--name]
+                                  [--resource-group]
+  examples:
+  - summary: Create Arc Appliance VMware Resource
+    syntax: az arcappliance create vmware --config-file [REQUIRED] --kubeconfig [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  - isRequired: true
+    name: --kubeconfig
+    summary: Path to kubeconfig output from deploy command.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_create_hci
+- az_arcappliance_create_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for creation of appliance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/arcappliance/delete.yml b/2018-03-01-hybrid/docs-ref-autogen/arcappliance/delete.yml
new file mode 100644
index 0000000000..025b6b3708
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/arcappliance/delete.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_delete
+name: az arcappliance delete
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance delete** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for deletion of appliance cluster and resource.
+description: ''
+directCommands:
+- uid: az_arcappliance_delete_hci
+  name: az arcappliance delete hci
+  summary: Command to delete HCI Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance delete hci --config-file
+                               [--location]
+                               [--name]
+                               [--resource-group]
+                               [--yes]
+  examples:
+  - summary: Delete Arc Appliance HCI Resource
+    syntax: az arcappliance delete hci --config-file [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_arcappliance_delete_vmware
+  name: az arcappliance delete vmware
+  summary: Command to delete VMware Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance delete vmware --config-file
+                                  [--location]
+                                  [--name]
+                                  [--resource-group]
+                                  [--yes]
+  examples:
+  - summary: Delete Arc Appliance VMware Resource
+    syntax: az arcappliance delete vmware --config-file [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+commands:
+- az_arcappliance_delete_hci
+- az_arcappliance_delete_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for deletion of appliance cluster and resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/arcappliance/deploy.yml b/2018-03-01-hybrid/docs-ref-autogen/arcappliance/deploy.yml
new file mode 100644
index 0000000000..ac8a09ca92
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/arcappliance/deploy.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_deploy
+name: az arcappliance deploy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance deploy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for deployment of appliance cluster.
+description: ''
+directCommands:
+- uid: az_arcappliance_deploy_hci
+  name: az arcappliance deploy hci
+  summary: Command to deploy HCI Arc Appliance - must be done before Azure Resource creation.
+  description: ''
+  syntax: >-
+    az arcappliance deploy hci --config-file
+                               [--location]
+                               [--name]
+                               [--outfile]
+                               [--resource-group]
+  examples:
+  - summary: Deploy Arc Appliance using HCI
+    syntax: az arcappliance deploy hci --config-file [REQUIRED]
+  - summary: Deploy Arc Appliance using HCI with a specified outfile
+    syntax: az arcappliance deploy hci --config-file [REQUIRED] --outfile [OPTIONAL]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --outfile
+    defaultValue: kubeconfig
+    summary: Path to where Kubeconfig should be output, defaults to ./kubeconfig.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_deploy_vmware
+  name: az arcappliance deploy vmware
+  summary: Command to deploy VMware Arc Appliance - must be done before Azure Resource creation.
+  description: ''
+  syntax: >-
+    az arcappliance deploy vmware --config-file
+                                  [--location]
+                                  [--name]
+                                  [--outfile]
+                                  [--resource-group]
+  examples:
+  - summary: Deploy Arc Appliance using VMware
+    syntax: az arcappliance deploy vmware --config-file [REQUIRED]
+  - summary: Deploy Arc Appliance using VMware with a specified outfile
+    syntax: az arcappliance deploy vmware --config-file [REQUIRED] --outfile [OPTIONAL]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --outfile
+    defaultValue: kubeconfig
+    summary: Path to where Kubeconfig should be output, defaults to ./kubeconfig.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_deploy_hci
+- az_arcappliance_deploy_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for deployment of appliance cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/artifacts.yml b/2018-03-01-hybrid/docs-ref-autogen/artifacts.yml
index 1cd52e4092..a5d005d483 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/artifacts.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/artifacts.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_artifacts
+name: az artifacts
+summary: Manage Azure Artifacts.
+description: This command group is a part of the azure-devops extension.
 commands:
-- uid: az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-- uid: az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
+- az_artifacts_universal
+- az_artifacts_universal_download
+- az_artifacts_universal_publish
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,4 +22,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml b/2018-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml
index 0a89664228..cfa0e7eb3d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml
@@ -1,21 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_artifacts_universal_download
-  - az_artifacts_universal_publish
+### YamlMime:AzureCLIGroup
+uid: az_artifacts_universal
+name: az artifacts universal
+summary: Manage Universal Packages.
+description: ''
+directCommands:
 - uid: az_artifacts_universal_download
   name: az artifacts universal download
   summary: Download a package.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az artifacts universal download --feed
+                                    --name
+                                    --path
+                                    --version
+                                    [--detect {false, true}]
+                                    [--file-filter]
+                                    [--org]
+                                    [--project]
+                                    [--scope {organization, project}]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --feed
     summary: Name or ID of the feed.
@@ -32,6 +36,7 @@ items:
     name: --version -v
     summary: Version of the package, e.g. 1.0.0.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -40,7 +45,7 @@ items:
     summary: Wildcard filter for file download.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -57,9 +62,18 @@ items:
   name: az artifacts universal publish
   summary: Publish a package to a feed.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az artifacts universal publish --feed
+                                   --name
+                                   --path
+                                   --version
+                                   [--description]
+                                   [--detect {false, true}]
+                                   [--org]
+                                   [--project]
+                                   [--scope {organization, project}]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --feed
     summary: Name or ID of the feed.
@@ -76,6 +90,7 @@ items:
     name: --version -v
     summary: Version of the package, e.g. '1.0.0'.
     description: ''
+  optionalParameters:
   - name: --description -d
     summary: Description of the package.
     description: ''
@@ -84,7 +99,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -98,12 +113,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
+- az_artifacts_universal_download
+- az_artifacts_universal_publish
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -119,4 +130,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Universal Packages.
+metadata:
+  description: Manage Universal Packages.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/attestation.yml b/2018-03-01-hybrid/docs-ref-autogen/attestation.yml
new file mode 100644
index 0000000000..9251c8c0e3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/attestation.yml
@@ -0,0 +1,184 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation
+name: az attestation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Microsoft Azure Attestation (MAA).
+description: ''
+directCommands:
+- uid: az_attestation_create
+  name: az attestation create
+  summary: Creates a new Attestation Provider instance.
+  description: ''
+  syntax: >-
+    az attestation create --location
+                          --name
+                          --resource-group
+                          [--certs-input-path]
+                          [--tags]
+  examples:
+  - summary: AttestationProviders_Create
+    syntax: az attestation create --name "myattestationprovider" --resource-group "MyResourceGroup" -l westus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --certs-input-path
+    summary: Space-separated file paths to PEM/DER files containing certificates.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_attestation_delete
+  name: az attestation delete
+  summary: Delete Attestation Service.
+  description: ''
+  syntax: >-
+    az attestation delete [--id]
+                          [--name]
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: AttestationProviders_Delete
+    syntax: az attestation delete --name "myattestationprovider" --resource-group "sample-resource-group"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_attestation_get-default-by-location
+  name: az attestation get-default-by-location
+  summary: Get the default provider by location.
+  description: ''
+  syntax: az attestation get-default-by-location --location
+  examples:
+  - summary: AttestationProviders_GetDefaultWithLocation
+    syntax: az attestation get-default-by-location --location "Central US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. (eg: "West US").'
+    description: ''
+- uid: az_attestation_list
+  name: az attestation list
+  summary: Returns a list of attestation providers in a subscription.
+  description: ''
+  syntax: az attestation list [--resource-group]
+  examples:
+  - summary: AttestationProviders_ListByResourceGroup
+    syntax: az attestation list --resource-group "testrg1"
+  - summary: AttestationProviders_List
+    syntax: az attestation list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_list-default
+  name: az attestation list-default
+  summary: Get the default provider.
+  description: ''
+  syntax: az attestation list-default
+  examples:
+  - summary: AttestationProviders_GetDefault
+    syntax: az attestation list-default
+- uid: az_attestation_show
+  name: az attestation show
+  summary: Get the status of Attestation Provider.
+  description: ''
+  syntax: >-
+    az attestation show [--id]
+                        [--name]
+                        [--resource-group]
+  examples:
+  - summary: AttestationProviders_Get
+    syntax: az attestation show --name "myattestationprovider" --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_update
+  name: az attestation update
+  summary: Updates the Attestation Provider.
+  description: ''
+  syntax: >-
+    az attestation update --name
+                          --resource-group
+                          [--tags]
+  examples:
+  - summary: AttestationProviders_Update
+    syntax: >-
+      az attestation update --name "myattestationprovider" --resource-group "MyResourceGroup" \
+
+      --tags Property1="Value1" Property2="Value2" Property3="Value3"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_attestation_create
+- az_attestation_delete
+- az_attestation_get-default-by-location
+- az_attestation_list
+- az_attestation_list-default
+- az_attestation_policy
+- az_attestation_policy_reset
+- az_attestation_policy_set
+- az_attestation_policy_show
+- az_attestation_show
+- az_attestation_signer
+- az_attestation_signer_add
+- az_attestation_signer_list
+- az_attestation_signer_remove
+- az_attestation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Microsoft Azure Attestation (MAA).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/attestation/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/attestation/policy.yml
new file mode 100644
index 0000000000..1ece84d673
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/attestation/policy.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation_policy
+name: az attestation policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage policies.
+description: ''
+directCommands:
+- uid: az_attestation_policy_reset
+  name: az attestation policy reset
+  summary: Resets the attestation policy for the specified tenant and reverts to the default policy.
+  description: ''
+  syntax: >-
+    az attestation policy reset --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                                [--id]
+                                [--name]
+                                [--policy-jws]
+                                [--resource-group]
+  examples:
+  - summary: Resets the attestation policy for the specified tenant and reverts to the default policy.
+    syntax: >-
+      az attestation policy reset -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --policy-jws "eyJhbGciOiJub25lIn0.."
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --policy-jws
+    defaultValue: eyJhbGciOiJub25lIn0..
+    summary: JSON Web Signature with an empty policy document.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_policy_set
+  name: az attestation policy set
+  summary: Sets the policy for a given kind of attestation type.
+  description: ''
+  syntax: >-
+    az attestation policy set --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                              [--id]
+                              [--name]
+                              [--new-attestation-policy]
+                              [--new-attestation-policy-file]
+                              [--policy-format {JWT, Text}]
+                              [--resource-group]
+  examples:
+  - summary: Sets the policy for a given kind of attestation type using JWT content.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy "{JWT}" --policy-format JWT
+  - summary: Sets the policy for a given kind of attestation type using Text content.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy "{json_text}"
+  - summary: Sets the policy for a given kind of attestation type using file name.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy-file "{file_name}" --policy-format JWT
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --new-attestation-policy
+    summary: Content of the new attestation policy (Text or JWT).
+    description: ''
+  - name: --new-attestation-policy-file -f
+    summary: File name of the new attestation policy.
+    description: ''
+  - name: --policy-format
+    defaultValue: Text
+    parameterValueGroup: JWT, Text
+    summary: Specifies the format for the policy, either Text or JWT (JSON Web Token).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_policy_show
+  name: az attestation policy show
+  summary: Retrieves the current policy for a given kind of attestation type.
+  description: ''
+  syntax: >-
+    az attestation policy show --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                               [--id]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Retrieves the current policy for a given kind of attestation type.
+    syntax: >-
+      az attestation policy show -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_attestation_policy_reset
+- az_attestation_policy_set
+- az_attestation_policy_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/attestation/signer.yml b/2018-03-01-hybrid/docs-ref-autogen/attestation/signer.yml
new file mode 100644
index 0000000000..4f2e97e682
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/attestation/signer.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation_signer
+name: az attestation signer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation signer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage signers.
+description: ''
+directCommands:
+- uid: az_attestation_signer_add
+  name: az attestation signer add
+  summary: Adds a new attestation policy certificate to the set of policy management certificates.
+  description: ''
+  syntax: >-
+    az attestation signer add [--id]
+                              [--name]
+                              [--resource-group]
+                              [--signer]
+                              [--signer-file]
+  examples:
+  - summary: Adds a new attestation policy certificate to the set of policy management certificates.
+    syntax: >-
+      az attestation signer add -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --signer "eyAiYWxnIjoiUlMyNTYiLCAie..."
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --signer
+    summary: The policy certificate to add. An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate" whose value is an RFC7517 JSON Web Key which specifies a new key to update. The RFC7519 JWT must be signed with one of the existing signing certificates.
+    description: ''
+  - name: --signer-file -f
+    summary: File name of the signer. (--signer and --signer-file/-f are mutually exclusive.).
+    description: ''
+- uid: az_attestation_signer_list
+  name: az attestation signer list
+  summary: Retrieves the set of certificates used to express policy for the current tenant.
+  description: ''
+  syntax: >-
+    az attestation signer list [--id]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Retrieves the set of certificates used to express policy for the current tenant.
+    syntax: az attestation signer list -n "myattestationprovider" -g "MyResourceGroup"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_signer_remove
+  name: az attestation signer remove
+  summary: Removes the specified policy management certificate.
+  description: ''
+  syntax: >-
+    az attestation signer remove [--id]
+                                 [--name]
+                                 [--resource-group]
+                                 [--signer]
+                                 [--signer-file]
+  examples:
+  - summary: Removes the specified policy management certificate.
+    syntax: >-
+      az attestation signer remove -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --signer "eyAiYWxnIjoiUlMyNTYiLCAie..."
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --signer
+    summary: The policy certificate to remove. An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate" whose value is an RFC7517 JSON Web Key which specifies a new key to update. The RFC7519 JWT must be signed with one of the existing signing certificates.
+    description: ''
+  - name: --signer-file -f
+    summary: File name of the signer. (--signer and --signer-file/-f are mutually exclusive.).
+    description: ''
+commands:
+- az_attestation_signer_add
+- az_attestation_signer_list
+- az_attestation_signer_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage signers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/automation.yml b/2018-03-01-hybrid/docs-ref-autogen/automation.yml
new file mode 100644
index 0000000000..d242ff42e5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/automation.yml
@@ -0,0 +1,49 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation
+name: az automation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_automation_account
+- az_automation_account_create
+- az_automation_account_delete
+- az_automation_account_list
+- az_automation_account_show
+- az_automation_account_update
+- az_automation_job
+- az_automation_job_list
+- az_automation_job_resume
+- az_automation_job_show
+- az_automation_job_stop
+- az_automation_job_suspend
+- az_automation_runbook
+- az_automation_runbook_create
+- az_automation_runbook_delete
+- az_automation_runbook_list
+- az_automation_runbook_publish
+- az_automation_runbook_replace-content
+- az_automation_runbook_revert-to-published
+- az_automation_runbook_show
+- az_automation_runbook_start
+- az_automation_runbook_update
+- az_automation_runbook_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/automation/account.yml b/2018-03-01-hybrid/docs-ref-autogen/automation/account.yml
new file mode 100644
index 0000000000..473fbb9e54
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/automation/account.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_account
+name: az automation account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Account.
+description: ''
+directCommands:
+- uid: az_automation_account_create
+  name: az automation account create
+  summary: Create automation account.
+  description: ''
+  syntax: >-
+    az automation account create --automation-account-name
+                                 --resource-group
+                                 [--location]
+                                 [--sku {Basic, Free}]
+                                 [--tags]
+  examples:
+  - summary: Create an automation account
+    syntax: az automation account create --automation-account-name "myAutomationAccount" --location "East US 2"                --sku "Free" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: Basic, Free
+    summary: Account SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_account_delete
+  name: az automation account delete
+  summary: Delete an automation account.
+  description: ''
+  syntax: >-
+    az automation account delete --automation-account-name
+                                 --resource-group
+                                 [--yes]
+  examples:
+  - summary: Delete automation account
+    syntax: az automation account delete --name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_automation_account_list
+  name: az automation account list
+  summary: Retrieve a list of accounts within a given resource group. And Retrieve a list of accounts within a given subscription.
+  description: ''
+  syntax: az automation account list [--resource-group]
+  examples:
+  - summary: List automation accounts by resource group
+    syntax: az automation account list --resource-group "rg"
+  - summary: List automation accounts by resource group
+    syntax: az automation account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_account_show
+  name: az automation account show
+  summary: Get information about an Automation Account.
+  description: ''
+  syntax: >-
+    az automation account show --automation-account-name
+                               --resource-group
+  examples:
+  - summary: Get automation account
+    syntax: az automation account show --name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_account_update
+  name: az automation account update
+  summary: Update an automation account.
+  description: ''
+  syntax: >-
+    az automation account update --automation-account-name
+                                 --resource-group
+                                 [--sku {Basic, Free}]
+                                 [--tags]
+  examples:
+  - summary: Update an automation account
+    syntax: az automation account update --automation-account-name "myAutomationAccount" --tags KEY=VALUE                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: Basic, Free
+    summary: Account SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_automation_account_create
+- az_automation_account_delete
+- az_automation_account_list
+- az_automation_account_show
+- az_automation_account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/automation/job.yml b/2018-03-01-hybrid/docs-ref-autogen/automation/job.yml
new file mode 100644
index 0000000000..cac965160c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/automation/job.yml
@@ -0,0 +1,148 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_job
+name: az automation job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Job.
+description: ''
+directCommands:
+- uid: az_automation_job_list
+  name: az automation job list
+  summary: Retrieve a list of jobs.
+  description: ''
+  syntax: >-
+    az automation job list --automation-account-name
+                           --resource-group
+  examples:
+  - summary: List jobs by automation account
+    syntax: az automation job list --automation-account-name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_resume
+  name: az automation job resume
+  summary: Resume the job identified by jobName.
+  description: ''
+  syntax: >-
+    az automation job resume --automation-account-name
+                             --job-name
+                             --resource-group
+  examples:
+  - summary: Resume job
+    syntax: az automation job resume --automation-account-name "myAutomationAccount" --name "foo"                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_show
+  name: az automation job show
+  summary: Retrieve the job identified by job name.
+  description: ''
+  syntax: >-
+    az automation job show --automation-account-name
+                           --job-name
+                           --resource-group
+  examples:
+  - summary: Get job
+    syntax: az automation job show --automation-account-name "myAutomationAccount" --name "foo" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_stop
+  name: az automation job stop
+  summary: Stop the job identified by jobName.
+  description: ''
+  syntax: >-
+    az automation job stop --automation-account-name
+                           --job-name
+                           --resource-group
+  examples:
+  - summary: Stop job
+    syntax: az automation job stop --automation-account-name "myAutomationAccount" --name "foo" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_suspend
+  name: az automation job suspend
+  summary: Suspend the job identified by job name.
+  description: ''
+  syntax: >-
+    az automation job suspend --automation-account-name
+                              --job-name
+                              --resource-group
+  examples:
+  - summary: Suspend job
+    syntax: az automation job suspend --automation-account-name "myAutomationAccount" --name "foo"                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_automation_job_list
+- az_automation_job_resume
+- az_automation_job_show
+- az_automation_job_stop
+- az_automation_job_suspend
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Job.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/automation/runbook.yml b/2018-03-01-hybrid/docs-ref-autogen/automation/runbook.yml
new file mode 100644
index 0000000000..c8586384b9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/automation/runbook.yml
@@ -0,0 +1,388 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_runbook
+name: az automation runbook
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation runbook** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Runbook.
+description: ''
+directCommands:
+- uid: az_automation_runbook_create
+  name: az automation runbook create
+  summary: Create the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook create --automation-account-name
+                                 --name
+                                 --resource-group
+                                 --type {Graph, GraphPowerShell, GraphPowerShellWorkflow, PowerShell, PowerShellWorkflow, Script}
+                                 [--description]
+                                 [--location]
+                                 [--log-activity-trace]
+                                 [--log-progress {false, true}]
+                                 [--log-verbose {false, true}]
+                                 [--tags]
+  examples:
+  - summary: Create a runbook
+    syntax: az automation runbook create --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook" --type "PowerShell" --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Graph, GraphPowerShell, GraphPowerShellWorkflow, PowerShell, PowerShellWorkflow, Script
+    summary: Type of the runbook.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the runbook.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-activity-trace
+    summary: Activity level tracing options of the runbook.
+    description: ''
+  - name: --log-progress
+    parameterValueGroup: false, true
+    summary: Progress log option of the runbook.
+    description: ''
+  - name: --log-verbose
+    parameterValueGroup: false, true
+    summary: Verbose log option of the runbook.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_runbook_delete
+  name: az automation runbook delete
+  summary: Delete the runbook by name.
+  description: ''
+  syntax: >-
+    az automation runbook delete --automation-account-name
+                                 --name
+                                 --resource-group
+                                 [--yes]
+  examples:
+  - summary: Delete a runbook
+    syntax: az automation runbook delete --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_automation_runbook_list
+  name: az automation runbook list
+  summary: Retrieve a list of runbooks.
+  description: ''
+  syntax: >-
+    az automation runbook list --automation-account-name
+                               --resource-group
+  examples:
+  - summary: List runbooks by automation account
+    syntax: az automation runbook list --automation-account-name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_publish
+  name: az automation runbook publish
+  summary: Publish runbook draft.
+  description: ''
+  syntax: >-
+    az automation runbook publish --automation-account-name
+                                  --name
+                                  --resource-group
+                                  [--no-wait]
+  examples:
+  - summary: Publish runbook draft
+    syntax: az automation runbook publish --automation-account-name "myAutomationAccount" --resource-group                "rg" --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The parameters supplied to the publish runbook operation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_automation_runbook_replace-content
+  name: az automation runbook replace-content
+  summary: Replace content of the runbook.
+  description: ''
+  syntax: >-
+    az automation runbook replace-content --automation-account-name
+                                          --content
+                                          --name
+                                          --resource-group
+                                          [--no-wait]
+  examples:
+  - summary: Replace content of the runbook
+    syntax: az automation runbook replace-content --automation-account-name "myAutomationAccount" --resource-group                "rg" --name "myRunbook" --content @/path/to/script
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --content
+    summary: The runbook content.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_automation_runbook_revert-to-published
+  name: az automation runbook revert-to-published
+  summary: Revert the runbook content to last known published state.
+  description: ''
+  syntax: >-
+    az automation runbook revert-to-published --automation-account-name
+                                              --name
+                                              --resource-group
+  examples:
+  - summary: Replace content of the runbook
+    syntax: az automation runbook revert-to-published --automation-account-name "myAutomationAccount"                --resource-group "rg" --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_show
+  name: az automation runbook show
+  summary: Retrieve the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook show --automation-account-name
+                               --name
+                               --resource-group
+  examples:
+  - summary: Get runbook
+    syntax: az automation runbook show --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_start
+  name: az automation runbook start
+  summary: Start the runbook.
+  description: ''
+  syntax: >-
+    az automation runbook start --automation-account-name
+                                --resource-group
+                                [--name]
+                                [--parameters]
+                                [--run-on]
+  examples:
+  - summary: Start the runbook
+    syntax: az automation runbook start --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters of the job. Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --run-on
+    summary: RunOn which specifies the group name where the job is to be executed.
+    description: ''
+- uid: az_automation_runbook_update
+  name: az automation runbook update
+  summary: Update the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook update --automation-account-name
+                                 --name
+                                 --resource-group
+                                 [--description]
+                                 [--log-activity-trace]
+                                 [--log-progress {false, true}]
+                                 [--log-verbose {false, true}]
+                                 [--tags]
+  examples:
+  - summary: Update a runbook
+    syntax: az automation runbook update --automation-account-name "myAutomationAccount" --description                "Runbook Description" --log-activity-trace 1 --log-progress true --log-verbose false                --resource-group "rg" --runbook-name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the runbook.
+    description: ''
+  - name: --log-activity-trace
+    summary: Activity level tracing options of the runbook.
+    description: ''
+  - name: --log-progress
+    parameterValueGroup: false, true
+    summary: Progress log option of the runbook.
+    description: ''
+  - name: --log-verbose
+    parameterValueGroup: false, true
+    summary: Verbose log option of the runbook.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_runbook_wait
+  name: az automation runbook wait
+  summary: Place the CLI in a waiting state until a condition of the automation runbook is met.
+  description: ''
+  syntax: >-
+    az automation runbook wait --automation-account-name
+                               --name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the automation runbook is successfully created.
+    syntax: az automation runbook wait --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook" --created
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_automation_runbook_create
+- az_automation_runbook_delete
+- az_automation_runbook_list
+- az_automation_runbook_publish
+- az_automation_runbook_replace-content
+- az_automation_runbook_revert-to-published
+- az_automation_runbook_show
+- az_automation_runbook_start
+- az_automation_runbook_update
+- az_automation_runbook_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Runbook.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/baremetalinstance.yml b/2018-03-01-hybrid/docs-ref-autogen/baremetalinstance.yml
new file mode 100644
index 0000000000..4648feef1f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/baremetalinstance.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_baremetalinstance
+name: az baremetalinstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **baremetal-infrastructure** extension for Azure CLI and requires version 2.12.0 or higher.  The extension will automatically install the first time you run an **az baremetalinstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage BareMetal Instances.
+description: ''
+directCommands:
+- uid: az_baremetalinstance_delete
+  name: az baremetalinstance delete
+  summary: Delete a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance delete --instance-name
+                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_list
+  name: az baremetalinstance list
+  summary: List BareMetal Instances.
+  description: ''
+  syntax: az baremetalinstance list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_restart
+  name: az baremetalinstance restart
+  summary: Restart a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance restart --instance-name
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_show
+  name: az baremetalinstance show
+  summary: Get the details of a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance show --instance-name
+                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_shutdown
+  name: az baremetalinstance shutdown
+  summary: Shutdown a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance shutdown --instance-name
+                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_start
+  name: az baremetalinstance start
+  summary: Start a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance start --instance-name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_update
+  name: az baremetalinstance update
+  summary: Update the tags field of a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance update --instance-name
+                                --resource-group
+                                [--add]
+                                [--force-string]
+                                [--no-wait]
+                                [--remove]
+                                [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_baremetalinstance_delete
+- az_baremetalinstance_list
+- az_baremetalinstance_restart
+- az_baremetalinstance_show
+- az_baremetalinstance_shutdown
+- az_baremetalinstance_start
+- az_baremetalinstance_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage BareMetal Instances.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/batch.yml b/2018-03-01-hybrid/docs-ref-autogen/batch.yml
new file mode 100644
index 0000000000..fc7056b203
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/batch.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch
+name: az batch
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Batch.
+description: ''
+commands:
+- az_batch_file
+- az_batch_file_download
+- az_batch_file_upload
+- az_batch_job
+- az_batch_job_create
+- az_batch_pool
+- az_batch_pool_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Batch.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/batch/file.yml b/2018-03-01-hybrid/docs-ref-autogen/batch/file.yml
new file mode 100644
index 0000000000..07eebdf0eb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/batch/file.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_file
+name: az batch file
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch file** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch input files.
+description: ''
+directCommands:
+- uid: az_batch_file_download
+  name: az batch file download
+  summary: Download a specified file or directory of files to the specified storage path.
+  description: ''
+  syntax: >-
+    az batch file download --file-group
+                           --local-path
+                           [--account-endpoint]
+                           [--account-key]
+                           [--account-name]
+                           [--overwrite]
+                           [--remote-path]
+                           [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --file-group
+    summary: Name of a file group from which the files will be downloaded.
+    description: ''
+  - isRequired: true
+    name: --local-path
+    summary: Path to a local file or directory to be stored the download files.
+    description: ''
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --overwrite
+    summary: If set, an existing file in the local path will be overwritten.
+    description: ''
+  - name: --remote-path
+    summary: The subdirectory under which files exist remotely.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+- uid: az_batch_file_upload
+  name: az batch file upload
+  summary: Upload a specified file or directory of files to the specified storage path.
+  description: ''
+  syntax: >-
+    az batch file upload --file-group
+                         --local-path
+                         [--account-endpoint]
+                         [--account-key]
+                         [--account-name]
+                         [--flatten]
+                         [--remote-path]
+                         [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --file-group
+    summary: Name of a file group under which the files will be stored.
+    description: ''
+  - isRequired: true
+    name: --local-path
+    summary: Path to a local file or directory to be uploaded - can include wildcard patterns.
+    description: ''
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --flatten
+    summary: If set, will not retain local directory structure in storage.
+    description: ''
+  - name: --remote-path
+    summary: Group subdirectory under which files will be uploaded.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+commands:
+- az_batch_file_download
+- az_batch_file_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch input files.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/batch/job.yml b/2018-03-01-hybrid/docs-ref-autogen/batch/job.yml
new file mode 100644
index 0000000000..0bdc131e1a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/batch/job.yml
@@ -0,0 +1,107 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_job
+name: az batch job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch jobs.
+description: ''
+directCommands:
+- uid: az_batch_job_create
+  name: az batch job create
+  summary: Add a job and associated task(s) to a Batch account.
+  description: ''
+  syntax: >-
+    az batch job create [--account-endpoint]
+                        [--account-key]
+                        [--account-name]
+                        [--id]
+                        [--job-manager-task-command-line]
+                        [--job-manager-task-environment-settings]
+                        [--job-manager-task-id]
+                        [--job-manager-task-resource-files]
+                        [--job-max-task-retry-count]
+                        [--job-max-wall-clock-time]
+                        [--json-file]
+                        [--metadata]
+                        [--parameters]
+                        [--pool-id]
+                        [--priority]
+                        [--resource-group]
+                        [--template]
+                        [--uses-task-dependencies]
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --id
+    summary: Required. A string that uniquely identifies the Job within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).
+    description: ''
+  - name: --job-manager-task-command-line
+    summary: The command line of the Job Manager task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
+    description: ''
+  - name: --job-manager-task-environment-settings
+    summary: A list of environment variable settings for the Job Manager task. Space separated values in 'key=value' format.
+    description: ''
+  - name: --job-manager-task-id
+    summary: A string that uniquely identifies the Job Manager task within the job. The id can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than 64 characters.
+    description: ''
+  - name: --job-manager-task-resource-files
+    summary: A list of files that the Batch service will download to the compute node before running the command line. Files listed under this element are located in the task's working directory. Space separated resource references in filename=httpurl format.
+    description: ''
+  - name: --job-max-task-retry-count
+    summary: The maximum number of times each task may be retried. The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try each task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries a task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry tasks. If the maximum retry count is -1, the Batch service retries tasks without limit. The default value is 0 (no retries).
+    description: ''
+  - name: --job-max-wall-clock-time
+    summary: The maximum elapsed time that the job may run, measured from the time the job is created. If the job does not complete within the time limit, the Batch service terminates it and any tasks that are still running. In this case, the termination reason will be MaxWallClockTimeExpiry. If this property is not specified, there is no time limit on how long the job may run. Expected format is an ISO-8601 duration.
+    description: ''
+  - name: --json-file
+    summary: The file containing the job to create in JSON format, if this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --metadata
+    summary: A list of name-value pairs associated with the job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code. Space separated values in 'key=value' format.
+    description: ''
+  - name: --parameters
+    summary: Parameter values for a Batch job JSON template file. Can only be used with --template.
+    description: ''
+  - name: --pool-id
+    summary: The id of an existing pool. All the tasks of the job will run on the specified pool.
+    description: ''
+  - name: --priority
+    summary: The priority of the Job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. The default value is 0.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+  - name: --template
+    summary: A Batch job JSON template file. If this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --uses-task-dependencies
+    summary: The flag that determines if this job will use tasks with dependencies. True if flag present.
+    description: ''
+commands:
+- az_batch_job_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/batch/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/batch/pool.yml
new file mode 100644
index 0000000000..95958ad097
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/batch/pool.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_pool
+name: az batch pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch pools.
+description: ''
+directCommands:
+- uid: az_batch_pool_create
+  name: az batch pool create
+  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
+  description: ''
+  syntax: >-
+    az batch pool create [--account-endpoint]
+                         [--account-key]
+                         [--account-name]
+                         [--application-licenses]
+                         [--application-package-references]
+                         [--auto-scale-formula]
+                         [--certificate-references]
+                         [--disk-encryption-targets]
+                         [--enable-inter-node-communication]
+                         [--id]
+                         [--image]
+                         [--json-file]
+                         [--metadata]
+                         [--node-agent-sku-id]
+                         [--os-family]
+                         [--parameters]
+                         [--resize-timeout]
+                         [--resource-group]
+                         [--start-task-command-line]
+                         [--start-task-resource-files]
+                         [--start-task-wait-for-success]
+                         [--target-dedicated-nodes]
+                         [--target-low-priority-nodes]
+                         [--template]
+                         [--vm-size]
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --application-licenses
+    summary: The list of application licenses the Batch service will make available on each Compute Node in the Pool. The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, Pool creation will fail.
+    description: ''
+  - name: --application-package-references
+    summary: The list of Packages to be installed on each Compute Node in the Pool. Changes to Package references affect all new Nodes joining the Pool, but do not affect Compute Nodes that are already in the Pool until they are rebooted or reimaged. There is a maximum of 10 Package references on any given Pool.
+    description: ''
+  - name: --auto-scale-formula
+    summary: A formula for the desired number of Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to false. It is required if enableAutoScale is set to true. The formula is checked for validity before the Pool is created. If the formula is not valid, the Batch service rejects the request with detailed error information. For more information about specifying this formula, see 'Automatically scale Compute Nodes in an Azure Batch Pool' (https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/).
+    description: ''
+  - name: --certificate-references
+    summary: The list of Certificates to be installed on each Compute Node in the Pool. For Windows Nodes, the Batch service installs the Certificates to the specified Certificate store and location. For Linux Compute Nodes, the Certificates are stored in a directory inside the Task working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the Task to query for this location. For Certificates with visibility of 'remoteUser', a 'certs' directory is created in the user's home directory (e.g., /home/{user-name}/certs) and Certificates are placed in that directory.
+    description: ''
+  - name: --disk-encryption-targets
+    summary: A space seperated list of DiskEncryptionTargets. current possible values include OsDisk and TemporaryDisk.
+    description: ''
+  - name: --enable-inter-node-communication
+    summary: Whether the Pool permits direct communication between Compute Nodes. Enabling inter-node communication limits the maximum size of the Pool due to deployment restrictions on the Compute Nodes of the Pool. This may result in the Pool not reaching its desired size. The default value is false.
+    description: ''
+  - name: --id
+    summary: Required. A string that uniquely identifies the Pool within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two Pool IDs within an Account that differ only by case).
+    description: ''
+  - name: --image
+    summary: "OS image reference. This can be either 'publisher:offer:sku[:version]' format, or a fully qualified ARM image id of the form '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}'. If 'publisher:offer:sku[:version]' format, version is optional and if omitted latest will be used. Valid values can be retrieved via 'az batch pool node-agent-skus list'. For example: 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'."
+    description: ''
+  - name: --json-file
+    summary: The file containing the pool to create in JSON format, if this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --metadata
+    summary: A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.
+    description: ''
+  - name: --node-agent-sku-id
+    summary: The SKU of the Batch node agent to be provisioned on compute nodes in the pool. The Batch node agent is a program that runs on each node in the pool, and provides the command-and-control interface between the node and the Batch service. There are different implementations of the node agent, known as SKUs, for different operating systems. You must specify a node agent SKU which matches the selected image reference. To get the list of supported node agent SKUs along with their list of verified image references, see the 'List supported node agent SKUs' operation.
+    description: ''
+  - name: --os-family
+    summary: 'The Azure Guest OS family to be installed on the virtual machines in the pool. Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. For more information, see Azure Guest OS Releases (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). Allowed values: 2, 3, 4, 5.'
+    description: ''
+  - name: --parameters
+    summary: Parameter values for a Batch pool JSON template file. Can only be used with --template.
+    description: ''
+  - name: --resize-timeout
+    summary: The timeout for allocation of Compute Nodes to the Pool. This timeout applies only to manual scaling; it has no effect when enableAutoScale is set to true. The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+  - name: --start-task-command-line
+    summary: The command line of the start task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
+    description: ''
+  - name: --start-task-resource-files
+    summary: A list of files that the Batch service will download to the compute node before running the command line. Space separated resource references in filename=httpurl format.
+    description: ''
+  - name: --start-task-wait-for-success
+    summary: Whether the Batch service should wait for the start task to complete successfully (that is, to exit with exit code 0) before scheduling any tasks on the compute node. If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is false. True if flag present.
+    description: ''
+  - name: --target-dedicated-nodes
+    summary: The desired number of dedicated Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
+    description: ''
+  - name: --target-low-priority-nodes
+    summary: The desired number of low-priority Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
+    description: ''
+  - name: --template
+    summary: A Batch pool JSON template file. If this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --vm-size
+    summary: Required. The size of virtual machines in the Pool. All virtual machines in a Pool are the same size. For information about available sizes of virtual machines for Cloud Services Pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for Pools using Images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
+    description: ''
+commands:
+- az_batch_pool_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/bicep.yml b/2018-03-01-hybrid/docs-ref-autogen/bicep.yml
new file mode 100644
index 0000000000..556ba04f4e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/bicep.yml
@@ -0,0 +1,132 @@
+### YamlMime:AzureCLIGroup
+uid: az_bicep
+name: az bicep
+summary: Bicep CLI command group.
+description: ''
+directCommands:
+- uid: az_bicep_build
+  name: az bicep build
+  summary: Build a Bicep file.
+  description: ''
+  syntax: >-
+    az bicep build --file
+                   [--outdir]
+                   [--outfile]
+                   [--stdout]
+                   [--subscription]
+  examples:
+  - summary: Build a Bicep file.
+    syntax: az bicep build --file {bicep_file}
+  - summary: Build a Bicep file and print all output to stdout.
+    syntax: az bicep build --file {bicep_file} --stdout
+  - summary: Build a Bicep file and save the result to the specified directory.
+    syntax: az bicep build --file {bicep_file} --outdir {out_dir}
+  - summary: Build a Bicep file and save the result to the specified file.
+    syntax: az bicep build --file {bicep_file} --outfile {out_file}
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The path to the Bicep file to build in the file system.
+    description: ''
+  optionalParameters:
+  - name: --outdir
+    summary: When set, saves the output at the specified directory.
+    description: ''
+  - name: --outfile
+    summary: When set, saves the output as the specified file path.
+    description: ''
+  - name: --stdout
+    summary: When set, prints all output to stdout instead of corresponding files.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_decompile
+  name: az bicep decompile
+  summary: Attempt to decompile an ARM template file to a Bicep file.
+  description: ''
+  syntax: >-
+    az bicep decompile --file
+                       [--subscription]
+  examples:
+  - summary: Decompile an ARM template file.
+    syntax: az bicep decompile --file {json_template_file}
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The path to the ARM template to decompile in the file system.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_install
+  name: az bicep install
+  summary: Install Bicep CLI.
+  description: ''
+  syntax: >-
+    az bicep install [--subscription]
+                     [--version]
+  examples:
+  - summary: Install Bicep CLI.
+    syntax: az bicep install
+  - summary: Install a specific version of Bicep CLI.
+    syntax: az bicep install --version v0.2.212
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --version -v
+    summary: The version of Bicep CLI to be installed. Default to the latest if not specified.
+    description: ''
+- uid: az_bicep_list-versions
+  name: az bicep list-versions
+  summary: List out all available versions of Bicep CLI.
+  description: ''
+  syntax: az bicep list-versions [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_upgrade
+  name: az bicep upgrade
+  summary: Upgrade Bicep CLI to the latest version.
+  description: ''
+  syntax: az bicep upgrade [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_version
+  name: az bicep version
+  summary: Show the installed version of Bicep CLI.
+  description: ''
+  syntax: az bicep version [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+commands:
+- az_bicep_build
+- az_bicep_decompile
+- az_bicep_install
+- az_bicep_list-versions
+- az_bicep_upgrade
+- az_bicep_version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Bicep CLI command group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blockchain.yml b/2018-03-01-hybrid/docs-ref-autogen/blockchain.yml
new file mode 100644
index 0000000000..e8b0f0bc05
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blockchain.yml
@@ -0,0 +1,47 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain
+name: az blockchain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_blockchain_consortium
+- az_blockchain_consortium_list
+- az_blockchain_member
+- az_blockchain_member_create
+- az_blockchain_member_delete
+- az_blockchain_member_list
+- az_blockchain_member_list-api-key
+- az_blockchain_member_list-consortium-member
+- az_blockchain_member_regenerate-api-key
+- az_blockchain_member_show
+- az_blockchain_member_update
+- az_blockchain_member_wait
+- az_blockchain_transaction-node
+- az_blockchain_transaction-node_create
+- az_blockchain_transaction-node_delete
+- az_blockchain_transaction-node_list
+- az_blockchain_transaction-node_list-api-key
+- az_blockchain_transaction-node_regenerate-api-key
+- az_blockchain_transaction-node_show
+- az_blockchain_transaction-node_update
+- az_blockchain_transaction-node_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blockchain/consortium.yml b/2018-03-01-hybrid/docs-ref-autogen/blockchain/consortium.yml
new file mode 100644
index 0000000000..2f97e5909f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blockchain/consortium.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_consortium
+name: az blockchain consortium
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain consortium** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain consortium.
+description: ''
+directCommands:
+- uid: az_blockchain_consortium_list
+  name: az blockchain consortium list
+  summary: List the available consortiums for a subscription.
+  description: ''
+  syntax: az blockchain consortium list --location
+  examples:
+  - summary: List the available consortiums for a subscription.
+    syntax: az blockchain consortium list --location "southeastasia"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_blockchain_consortium_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain consortium.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blockchain/member.yml b/2018-03-01-hybrid/docs-ref-autogen/blockchain/member.yml
new file mode 100644
index 0000000000..2c081dce30
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blockchain/member.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_member
+name: az blockchain member
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain member** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain member.
+description: ''
+directCommands:
+- uid: az_blockchain_member_create
+  name: az blockchain member create
+  summary: Create a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member create --name
+                                --resource-group
+                                [--consortium]
+                                [--consortium-management-account-password]
+                                [--firewall-rules]
+                                [--location]
+                                [--no-wait]
+                                [--password]
+                                [--protocol {Corda, NotSpecified, Parity, Quorum}]
+                                [--sku {Basic, Standard}]
+                                [--tags]
+                                [--validator-nodes-sku]
+  examples:
+  - summary: Create a blockchain member.
+    syntax: az blockchain member create --location "southeastasia" --consortium "ContoseConsortium" --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --validator-nodes-sku capacity=2 --protocol "Quorum" --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consortium
+    summary: Gets or sets the consortium for the blockchain member.
+    description: ''
+  - name: --consortium-management-account-password
+    summary: Sets the managed consortium management account password.
+    description: ''
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian member.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --password
+    summary: Sets the basic auth password of the blockchain member.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Corda, NotSpecified, Parity, Quorum
+    summary: Gets or sets the blockchain protocol.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The Sku of the blockchain member.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validator-nodes-sku
+    summary: 'Gets or sets the blockchain validator nodes Sku. Expect value: capacity=xx.'
+    description: ''
+- uid: az_blockchain_member_delete
+  name: az blockchain member delete
+  summary: Delete a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member delete --name
+                                --resource-group
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete a blockchain member.
+    syntax: az blockchain member delete --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blockchain_member_list
+  name: az blockchain member list
+  summary: List the blockchain members.
+  description: ''
+  syntax: az blockchain member list [--resource-group]
+  examples:
+  - summary: List the blockchain members in a resource group.
+    syntax: az blockchain member list --resource-group "mygroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_list-api-key
+  name: az blockchain member list-api-key
+  summary: List the API keys for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member list-api-key --name
+                                      --resource-group
+  examples:
+  - summary: List the API keys for a blockchain member.
+    syntax: az blockchain member list-api-key --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_list-consortium-member
+  name: az blockchain member list-consortium-member
+  summary: List the consortium members for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member list-consortium-member --name
+                                                --resource-group
+  examples:
+  - summary: List the consortium members for a blockchain member.
+    syntax: az blockchain member list-consortium-member --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_regenerate-api-key
+  name: az blockchain member regenerate-api-key
+  summary: Regenerate the API keys for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member regenerate-api-key --name
+                                            --resource-group
+                                            [--key-name {key1, key2}]
+  examples:
+  - summary: Regenerate the API keys for a blockchain member.
+    syntax: az blockchain member regenerate-api-key --key-name "key1" --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: key1, key2
+    summary: Gets or sets the API key name.
+    description: ''
+- uid: az_blockchain_member_show
+  name: az blockchain member show
+  summary: Show the details about a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member show --name
+                              --resource-group
+  examples:
+  - summary: Show the details about a blockchain member.
+    syntax: az blockchain member show --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_update
+  name: az blockchain member update
+  summary: Update a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member update --name
+                                --resource-group
+                                [--consortium-management-account-password]
+                                [--firewall-rules]
+                                [--password]
+                                [--tags]
+  examples:
+  - summary: Update a blockchain member.
+    syntax: az blockchain member update --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --name "ContoseMember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consortium-management-account-password
+    summary: Sets the managed consortium management account password.
+    description: ''
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian member.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_blockchain_member_wait
+  name: az blockchain member wait
+  summary: Wait until a blockchain member is created or deleted.
+  description: ''
+  syntax: >-
+    az blockchain member wait --name
+                              --resource-group
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Wait until a blockchain member is created.
+    syntax: az blockchain member wait --name "contosemember1" --resource-group "mygroup" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_blockchain_member_create
+- az_blockchain_member_delete
+- az_blockchain_member_list
+- az_blockchain_member_list-api-key
+- az_blockchain_member_list-consortium-member
+- az_blockchain_member_regenerate-api-key
+- az_blockchain_member_show
+- az_blockchain_member_update
+- az_blockchain_member_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain member.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blockchain/transaction-node.yml b/2018-03-01-hybrid/docs-ref-autogen/blockchain/transaction-node.yml
new file mode 100644
index 0000000000..5af3848fca
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blockchain/transaction-node.yml
@@ -0,0 +1,307 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_transaction-node
+name: az blockchain transaction-node
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain transaction-node** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain transaction-node.
+description: ''
+directCommands:
+- uid: az_blockchain_transaction-node_create
+  name: az blockchain transaction-node create
+  summary: Create a transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node create --member-name
+                                          --name
+                                          --resource-group
+                                          [--firewall-rules]
+                                          [--location]
+                                          [--no-wait]
+                                          [--password]
+  examples:
+  - summary: Create a transaction node.
+    syntax: az blockchain transaction-node create --member-name "contosemember1" --resource-group "mygroup" --location "southeastasia" --password "1234abcdEFG1" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian transaction node.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+- uid: az_blockchain_transaction-node_delete
+  name: az blockchain transaction-node delete
+  summary: Delete the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node delete --member-name
+                                          --name
+                                          --resource-group
+                                          [--no-wait]
+                                          [--yes]
+  examples:
+  - summary: Delete the transaction node.
+    syntax: az blockchain transaction-node delete --member-name "contosemember1" --resource-group "mygroup" --name "txNode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blockchain_transaction-node_list
+  name: az blockchain transaction-node list
+  summary: List the transaction nodes for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node list --member-name
+                                        --resource-group
+  examples:
+  - summary: List the transaction nodes for a blockchain member.
+    syntax: az blockchain transaction-node list --member-name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_list-api-key
+  name: az blockchain transaction-node list-api-key
+  summary: List the API keys for the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node list-api-key --member-name
+                                                --name
+                                                --resource-group
+  examples:
+  - summary: List the API keys for the transaction node.
+    syntax: az blockchain transaction-node list-api-key --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_regenerate-api-key
+  name: az blockchain transaction-node regenerate-api-key
+  summary: Regenerate the API keys for the blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node regenerate-api-key --member-name
+                                                      --name
+                                                      --resource-group
+                                                      [--key-name {key1, key2}]
+                                                      [--value]
+  examples:
+  - summary: Regenerate the API keys for the blockchain member.
+    syntax: az blockchain transaction-node regenerate-api-key --key-name "key1" --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: key1, key2
+    summary: Gets or sets the API key name.
+    description: ''
+  - name: --value
+    summary: Gets or sets the API key value.
+    description: ''
+- uid: az_blockchain_transaction-node_show
+  name: az blockchain transaction-node show
+  summary: Show the details of the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node show --member-name
+                                        --name
+                                        --resource-group
+  examples:
+  - summary: Show the details of the transaction node.
+    syntax: az blockchain transaction-node show --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_update
+  name: az blockchain transaction-node update
+  summary: Update the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node update --member-name
+                                          --name
+                                          --resource-group
+                                          [--firewall-rules]
+                                          [--password]
+  examples:
+  - summary: Update the transaction node.
+    syntax: az blockchain transaction-node update --member-name "contosemember1" --resource-group "mygroup" --password "1234abcdEFG1" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian transaction node.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+- uid: az_blockchain_transaction-node_wait
+  name: az blockchain transaction-node wait
+  summary: Wait until the transaction node is created or deleted.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node wait --member-name
+                                        --name
+                                        --resource-group
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--interval]
+                                        [--timeout]
+                                        [--updated]
+  examples:
+  - summary: Wait until the transaction node is created.
+    syntax: az blockchain transaction-node wait --member-name "contosemember1" --resource-group "mygroup" --name "txNode2" --created
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_blockchain_transaction-node_create
+- az_blockchain_transaction-node_delete
+- az_blockchain_transaction-node_list
+- az_blockchain_transaction-node_list-api-key
+- az_blockchain_transaction-node_regenerate-api-key
+- az_blockchain_transaction-node_show
+- az_blockchain_transaction-node_update
+- az_blockchain_transaction-node_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain transaction-node.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint.yml
new file mode 100644
index 0000000000..2135211f65
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint.yml
@@ -0,0 +1,368 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint
+name: az blueprint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint.
+description: ''
+directCommands:
+- uid: az_blueprint_create
+  name: az blueprint create
+  summary: Create a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint create --name
+                        [--description]
+                        [--display-name]
+                        [--management-group]
+                        [--parameters]
+                        [--subscription]
+                        [--target-scope {managementGroup, subscription}]
+  examples:
+  - summary: Create a subscription blueprint
+    syntax: >-
+      az blueprint create --subscription MySubscription --name \
+
+      MyBlueprint --description \
+
+      "blueprint contains all artifacts" --target-scope \
+
+      subscription
+  - summary: Create a management group blueprint
+    syntax: >-
+      az blueprint create --management-group MyManagementGroup --name \
+
+      MyBlueprint --description \
+
+      "blueprint contains all artifact" --target-scope \
+
+      subscription
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --target-scope
+    defaultValue: subscription
+    parameterValueGroup: managementGroup, subscription
+    summary: The scope where this blueprint definition can be assigned.
+    description: ''
+- uid: az_blueprint_delete
+  name: az blueprint delete
+  summary: Delete a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint delete --name
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Delete a management group blueprint
+    syntax: >-
+      az blueprint delete --management-group MyManagementGroup --name \
+
+      MyBlueprint
+  - summary: Delete a subscription blueprint
+    syntax: >-
+      az blueprint delete --subscription MySubscription --name \
+
+      MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_export
+  name: az blueprint export
+  summary: Export a blueprint definition and artifacts to json file(s).
+  description: ''
+  syntax: >-
+    az blueprint export --name
+                        --output-path
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Export a blueprint definition and artifacts
+    syntax: >-
+      az blueprint export --name MyBlueprint \
+
+      --output-path "path/to/blueprint/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition to export.
+    description: ''
+  - isRequired: true
+    name: --output-path
+    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file will be named blueprint.json. Artifacts json files will be in a subdirectory named artifacts.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Skip user confirmation. When set, if directory does not exist, it will be created. If the directory exists and has contents, they will be overwritten. If not set, user will be prompted for permission to proceed.
+    description: ''
+- uid: az_blueprint_import
+  name: az blueprint import
+  summary: Import a blueprint definition and artifacts from a directoy of json files.
+  description: ''
+  syntax: >-
+    az blueprint import --input-path
+                        --name
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Import a blueprint definition and artifacts
+    syntax: >-
+      az blueprint import --name MyBlueprint \
+
+      --input-path "path/to/blueprint/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file should be named blueprint.json. Artifacts json files should be in a subdirectory named artifacts.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_list
+  name: az blueprint list
+  summary: List blueprint definitions.
+  description: ''
+  syntax: >-
+    az blueprint list [--management-group]
+                      [--subscription]
+  examples:
+  - summary: List blueprints in a management group
+    syntax: az blueprint list --management-group MyManagementGroup
+  - summary: List blueprints in a subscription
+    syntax: az blueprint list --subscription MySubscription
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_publish
+  name: az blueprint publish
+  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
+  description: ''
+  syntax: >-
+    az blueprint publish --blueprint-name
+                         --version
+                         [--change-notes]
+                         [--management-group]
+                         [--subscription]
+  examples:
+  - summary: Publish a management group blueprint
+    syntax: >-
+      az blueprint publish --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: Publish a subscription blueprint
+    syntax: >-
+      az blueprint publish --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --change-notes
+    summary: Version-specific change notes.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_show
+  name: az blueprint show
+  summary: Get a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint show --name
+                      [--management-group]
+                      [--subscription]
+  examples:
+  - summary: Show a management group blueprint
+    syntax: >-
+      az blueprint show --management-group MyManagementGroup --name \
+
+      MyBlueprint
+  - summary: Show a subscription blueprint
+    syntax: >-
+      az blueprint show --subscription MySubscription --name \
+
+      MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_update
+  name: az blueprint update
+  summary: Update a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint update --name
+                        [--add]
+                        [--description]
+                        [--force-string]
+                        [--management-group]
+                        [--parameters]
+                        [--remove]
+                        [--set]
+                        [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact
+- az_blueprint_artifact_delete
+- az_blueprint_artifact_list
+- az_blueprint_artifact_policy
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+- az_blueprint_artifact_role
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+- az_blueprint_artifact_show
+- az_blueprint_artifact_template
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+- az_blueprint_assignment
+- az_blueprint_assignment_create
+- az_blueprint_assignment_delete
+- az_blueprint_assignment_list
+- az_blueprint_assignment_show
+- az_blueprint_assignment_update
+- az_blueprint_assignment_wait
+- az_blueprint_assignment_who
+- az_blueprint_create
+- az_blueprint_delete
+- az_blueprint_export
+- az_blueprint_import
+- az_blueprint_list
+- az_blueprint_publish
+- az_blueprint_resource-group
+- az_blueprint_resource-group_add
+- az_blueprint_resource-group_list
+- az_blueprint_resource-group_remove
+- az_blueprint_resource-group_show
+- az_blueprint_resource-group_update
+- az_blueprint_show
+- az_blueprint_update
+- az_blueprint_version
+- az_blueprint_version_artifact
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+- az_blueprint_version_delete
+- az_blueprint_version_list
+- az_blueprint_version_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact.yml
new file mode 100644
index 0000000000..e51e30f6d4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact.yml
@@ -0,0 +1,147 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact
+name: az blueprint artifact
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_delete
+  name: az blueprint artifact delete
+  summary: Delete a blueprint artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact delete --blueprint-name
+                                 --name
+                                 [--management-group]
+                                 [--subscription]
+                                 [--yes]
+  examples:
+  - summary: Delete a role assignment artifact
+    syntax: >-
+      az blueprint artifact delete --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --name OwnerAssignment
+  - summary: Delete an ARM template artifact
+    syntax: >-
+      az blueprint artifact delete --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint artifact.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_artifact_list
+  name: az blueprint artifact list
+  summary: List artifacts for a given blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint artifact list --blueprint-name
+                               [--management-group]
+                               [--subscription]
+  examples:
+  - summary: List artifcats for a management group blueprint
+    syntax: >-
+      az blueprint artifact list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint
+  - summary: List artifcats for a subscription blueprint
+    syntax: >-
+      az blueprint artifact list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_show
+  name: az blueprint artifact show
+  summary: Get a blueprint artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact show --blueprint-name
+                               --name
+                               [--management-group]
+                               [--subscription]
+  examples:
+  - summary: Show an artifact of a subscription blueprint
+    syntax: >-
+      az blueprint artifact show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --name OwnerAssignment
+  - summary: Show an artifact of a management group blueprint
+    syntax: >-
+      az blueprint artifact show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint artifact.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_delete
+- az_blueprint_artifact_list
+- az_blueprint_artifact_policy
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+- az_blueprint_artifact_role
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+- az_blueprint_artifact_show
+- az_blueprint_artifact_template
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/policy.yml
new file mode 100644
index 0000000000..8fed0d0031
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/policy.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_policy
+name: az blueprint artifact policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint policy assignment artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_policy_create
+  name: az blueprint artifact policy create
+  summary: Create blueprint policy artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact policy create --artifact-name
+                                        --blueprint-name
+                                        --policy-definition-id
+                                        [--depends-on]
+                                        [--description]
+                                        [--display-name]
+                                        [--management-group]
+                                        [--parameters]
+                                        [--resource-group-art]
+                                        [--subscription]
+  examples:
+  - summary: Create a policy artifact
+    syntax: >-
+      az blueprint artifact policy create \
+
+      --blueprint-name MyBlueprint --artifact-name MyPolicy --policy-definition-id \
+
+      "/providers/Microsoft.Authorization/policyDefinitions/00000000-0000-0000-0000-000000000000" \
+
+      --parameters path/to/file --display-name "Policy to do sth"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --policy-definition-id
+    summary: The full policy definition id.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_policy_update
+  name: az blueprint artifact policy update
+  summary: Update blueprint policy artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact policy update --artifact-name
+                                        --blueprint-name
+                                        [--depends-on]
+                                        [--description]
+                                        [--display-name]
+                                        [--management-group]
+                                        [--parameters]
+                                        [--resource-group-art]
+                                        [--subscription]
+  examples:
+  - summary: Update a policy artifact
+    syntax: >-
+      az blueprint artifact policy update \
+
+      --blueprint-name MyBlueprint --artifact-name MyPolicy --display-name "My Policy"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint policy assignment artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/role.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/role.yml
new file mode 100644
index 0000000000..5450ee1af5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/role.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_role
+name: az blueprint artifact role
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact role** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint role assignment artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_role_create
+  name: az blueprint artifact role create
+  summary: Create blueprint role artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact role create --artifact-name
+                                      --blueprint-name
+                                      --principal-ids
+                                      --role-definition-id
+                                      [--depends-on]
+                                      [--description]
+                                      [--display-name]
+                                      [--management-group]
+                                      [--resource-group-art]
+                                      [--subscription]
+  examples:
+  - summary: Create a role artifact
+    syntax: >-
+      az blueprint artifact role create \
+
+      --blueprint-name MyBlueprint --artifact-name MyRole --role-definition-id \
+
+      "/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000" \
+
+      --principal-ids "[parameters('[Usergrouporapplicationname]:MyRoleAssignmentName')]"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --principal-ids
+    summary: Array of user or group identities in Azure Active Directory or a reference to the corresponding parameter in blueprint definiton. The roleDefinition will apply to each identity.
+    description: ''
+  - isRequired: true
+    name: --role-definition-id
+    summary: The full role definition id. Only built-in roles are supported.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_role_update
+  name: az blueprint artifact role update
+  summary: Update blueprint role artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact role update --artifact-name
+                                      --blueprint-name
+                                      [--depends-on]
+                                      [--description]
+                                      [--display-name]
+                                      [--management-group]
+                                      [--resource-group-art]
+                                      [--subscription]
+  examples:
+  - summary: Update a role artifact
+    syntax: >-
+      az blueprint artifact role update \
+
+      --blueprint-name MyBlueprint --artifact-name MyRole --display-name "My Big Role"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint role assignment artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/template.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/template.yml
new file mode 100644
index 0000000000..e28470c67e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/artifact/template.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_template
+name: az blueprint artifact template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint ARM template artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_template_create
+  name: az blueprint artifact template create
+  summary: Create blueprint arm artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact template create --artifact-name
+                                          --blueprint-name
+                                          --template
+                                          [--depends-on]
+                                          [--description]
+                                          [--display-name]
+                                          [--management-group]
+                                          [--parameters]
+                                          [--resource-group-art]
+                                          [--subscription]
+  examples:
+  - summary: Create an arm artifact
+    syntax: >-
+      az blueprint artifact template create \
+
+      --blueprint-name MyBlueprint --artifact-name MyTemplate \
+
+      --parameters path/to/parameter/file --template path/to/template
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --template -t
+    summary: ARM template in JSON string or path to JSON file.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_template_update
+  name: az blueprint artifact template update
+  summary: Update blueprint arm artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact template update --artifact-name
+                                          --blueprint-name
+                                          [--depends-on]
+                                          [--description]
+                                          [--display-name]
+                                          [--management-group]
+                                          [--parameters]
+                                          [--resource-group-art]
+                                          [--subscription]
+                                          [--template]
+  examples:
+  - summary: Update a arm artifact
+    syntax: >-
+      az blueprint artifact template update \
+
+      --blueprint-name MyBlueprint --artifact-name MyTemplate --display-name "My Template"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --template -t
+    summary: ARM template in JSON string or path to JSON file.
+    description: ''
+commands:
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint ARM template artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/assignment.yml
new file mode 100644
index 0000000000..00354fab87
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/assignment.yml
@@ -0,0 +1,349 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_assignment
+name: az blueprint assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint assignment.
+description: ''
+directCommands:
+- uid: az_blueprint_assignment_create
+  name: az blueprint assignment create
+  summary: Create a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment create --name
+                                   [--blueprint-version]
+                                   [--description]
+                                   [--display-name]
+                                   [--identity-type {None, SystemAssigned, UserAssigned}]
+                                   [--location]
+                                   [--locks-excluded-principals]
+                                   [--locks-mode {AllResourcesDoNotDelete, AllResourcesReadOnly, None}]
+                                   [--management-group]
+                                   [--parameters]
+                                   [--resource-group-value]
+                                   [--subscription]
+                                   [--user-assigned-identity]
+  examples:
+  - summary: Assignment with system-assigned managed identity
+    syntax: >-
+      az blueprint assignment create --subscription MySubscription --name \
+
+      MyBlueprintAssignment --location eastus --identity-type SystemAssigned \
+
+      --description "Enforce pre-defined MyBlueprint to this subscription." \
+
+      --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup/provid \
+
+      ers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
+
+      --resource-group-value artifact_name=rg-art-1 name=rg1 location=westus \
+
+      --resource-group-value artifact_name=rg-art-2 name=rg2 location=eastus \
+
+      --parameters "path/to/parameter/file" \
+  - summary: Assignment with user-assigned managed identity
+    syntax: >-
+      az blueprint assignment create --subscription MySubscription --name \
+
+      MyBlueprintAssignment --location eastus --identity-type UserAssigned \
+
+      --user-assigned-identity "/subscriptions/00000000-0000-0000-0000-000000000000 \
+
+      /resourcegroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myIdentity"\
+
+      --description "Enforce pre-defined MyBlueprint to this subscription." \
+
+      --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup \
+
+      /providers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
+
+      --resource-group-value artifact_name=rg-art-1 name=rg1 location=eastus \
+
+      --parameters "path/to/parameter/file" \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --blueprint-version
+    summary: Resource ID of the published version of a blueprint definition.
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --identity-type
+    defaultValue: SystemAssigned
+    parameterValueGroup: None, SystemAssigned, UserAssigned
+    summary: Type of the managed identity.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --locks-excluded-principals
+    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
+    description: ''
+  - name: --locks-mode
+    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
+    summary: Lock mode.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --parameters -p
+    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-value
+    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --user-assigned-identity
+    summary: The user-assigned managed identity associated with the resource.
+    description: ''
+- uid: az_blueprint_assignment_delete
+  name: az blueprint assignment delete
+  summary: Delete a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment delete --name
+                                   [--management-group]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Delete an assignment
+    syntax: >-
+      az blueprint assignment delete --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_assignment_list
+  name: az blueprint assignment list
+  summary: List blueprint assignments within a subscription.
+  description: ''
+  syntax: >-
+    az blueprint assignment list [--management-group]
+                                 [--subscription]
+  examples:
+  - summary: List assignments
+    syntax: az blueprint assignment list --subscription MySubscription
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+- uid: az_blueprint_assignment_show
+  name: az blueprint assignment show
+  summary: Get a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment show --name
+                                 [--management-group]
+                                 [--subscription]
+  examples:
+  - summary: Show an assignment
+    syntax: >-
+      az blueprint assignment show --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+- uid: az_blueprint_assignment_update
+  name: az blueprint assignment update
+  summary: Update a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment update --name
+                                   [--blueprint-version]
+                                   [--description]
+                                   [--display-name]
+                                   [--identity-type {None, SystemAssigned, UserAssigned}]
+                                   [--location]
+                                   [--locks-excluded-principals]
+                                   [--locks-mode {AllResourcesDoNotDelete, AllResourcesReadOnly, None}]
+                                   [--management-group]
+                                   [--parameters]
+                                   [--resource-group-value]
+                                   [--subscription]
+                                   [--user-assigned-identity]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --blueprint-version
+    summary: Resource ID of the published version of a blueprint definition.
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --identity-type
+    parameterValueGroup: None, SystemAssigned, UserAssigned
+    summary: Type of the managed identity.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --locks-excluded-principals
+    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
+    description: ''
+  - name: --locks-mode
+    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
+    summary: Lock mode.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --parameters -p
+    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-value
+    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --user-assigned-identity
+    summary: The user-assigned managed identity associated with the resource.
+    description: ''
+- uid: az_blueprint_assignment_wait
+  name: az blueprint assignment wait
+  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
+  description: ''
+  syntax: >-
+    az blueprint assignment wait --name
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--management-group]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Blueprint Assignment is successfully provisioned.
+    syntax: az blueprint assignment wait --subscription MySubscription \ --name MyBlueprintAssignment --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+- uid: az_blueprint_assignment_who
+  name: az blueprint assignment who
+  summary: Get Blueprint Servie Principal Name objectId.
+  description: ''
+  syntax: >-
+    az blueprint assignment who --name
+                                [--management-group]
+                                [--subscription]
+  examples:
+  - summary: Get SPN objectId
+    syntax: >-
+      az blueprint assignment who --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+commands:
+- az_blueprint_assignment_create
+- az_blueprint_assignment_delete
+- az_blueprint_assignment_list
+- az_blueprint_assignment_show
+- az_blueprint_assignment_update
+- az_blueprint_assignment_wait
+- az_blueprint_assignment_who
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint assignment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/resource-group.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/resource-group.yml
new file mode 100644
index 0000000000..758bae1ab7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/resource-group.yml
@@ -0,0 +1,234 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_resource-group
+name: az blueprint resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint resource group artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_resource-group_add
+  name: az blueprint resource-group add
+  summary: Add a resource group artifact to the blueprint.
+  description: ''
+  syntax: >-
+    az blueprint resource-group add --blueprint-name
+                                    [--artifact-name]
+                                    [--depends-on]
+                                    [--description]
+                                    [--display-name]
+                                    [--management-group]
+                                    [--rg-location]
+                                    [--rg-name]
+                                    [--subscription]
+                                    [--tags]
+  examples:
+  - summary: Add a resource group artifact
+    syntax: >-
+      az blueprint resource-group add \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: Display name of this resource group artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --rg-location
+    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
+    description: ''
+  - name: --rg-name
+    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --tags
+    summary: Tags to be assigned to this resource group.
+    description: ''
+- uid: az_blueprint_resource-group_list
+  name: az blueprint resource-group list
+  summary: List blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group list --blueprint-name
+                                     [--management-group]
+                                     [--subscription]
+  examples:
+  - summary: List resource group artifacts
+    syntax: >-
+      az blueprint resource-group list \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_resource-group_remove
+  name: az blueprint resource-group remove
+  summary: Remove a blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group remove --artifact-name
+                                       --blueprint-name
+                                       [--management-group]
+                                       [--subscription]
+                                       [--yes]
+  examples:
+  - summary: Remove a resource group artifact
+    syntax: >-
+      az blueprint resource-group remove \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_resource-group_show
+  name: az blueprint resource-group show
+  summary: Show blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group show --artifact-name
+                                     --blueprint-name
+                                     [--management-group]
+                                     [--subscription]
+  examples:
+  - summary: Show a resource group artifact
+    syntax: >-
+      az blueprint resource-group show \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_resource-group_update
+  name: az blueprint resource-group update
+  summary: Update blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group update --artifact-name
+                                       --blueprint-name
+                                       [--depends-on]
+                                       [--description]
+                                       [--display-name]
+                                       [--management-group]
+                                       [--rg-location]
+                                       [--rg-name]
+                                       [--subscription]
+                                       [--tags]
+  examples:
+  - summary: Update a resource group artifact
+    syntax: >-
+      az blueprint resource-group update \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt --display-name "My Resource Group"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: Display name of this resource group artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --rg-location
+    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
+    description: ''
+  - name: --rg-name
+    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --tags
+    summary: Tags to be assigned to this resource group.
+    description: ''
+commands:
+- az_blueprint_resource-group_add
+- az_blueprint_resource-group_list
+- az_blueprint_resource-group_remove
+- az_blueprint_resource-group_show
+- az_blueprint_resource-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint resource group artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/version.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/version.yml
new file mode 100644
index 0000000000..fd5f45f233
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/version.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_version
+name: az blueprint version
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint version** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage published blueprint versions.
+description: ''
+directCommands:
+- uid: az_blueprint_version_delete
+  name: az blueprint version delete
+  summary: Delete a published version of a blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version delete --blueprint-name
+                                --version
+                                [--management-group]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a published subscription blueprint
+    syntax: >-
+      az blueprint version delete --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  - summary: Delete a published management group blueprint
+    syntax: >-
+      az blueprint version delete --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_version_list
+  name: az blueprint version list
+  summary: List published versions of given blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint version list --blueprint-name
+                              [--management-group]
+                              [--subscription]
+  examples:
+  - summary: List published blueprints of a management group
+    syntax: >-
+      az blueprint version list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint
+  - summary: List published blueprints of a subscription
+    syntax: >-
+      az blueprint version list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_version_show
+  name: az blueprint version show
+  summary: Get a published version of a blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version show --blueprint-name
+                              --version
+                              [--management-group]
+                              [--subscription]
+  examples:
+  - summary: Get a published management group blueprint
+    syntax: >-
+      az blueprint version show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: Get a published subscription blueprint
+    syntax: >-
+      az blueprint version show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_version_artifact
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+- az_blueprint_version_delete
+- az_blueprint_version_list
+- az_blueprint_version_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage published blueprint versions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/blueprint/version/artifact.yml b/2018-03-01-hybrid/docs-ref-autogen/blueprint/version/artifact.yml
new file mode 100644
index 0000000000..276ac2e929
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/blueprint/version/artifact.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_version_artifact
+name: az blueprint version artifact
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint version artifact** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage published blueprint artifacts.
+description: ''
+directCommands:
+- uid: az_blueprint_version_artifact_list
+  name: az blueprint version artifact list
+  summary: List artifacts for a version of a published blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version artifact list --blueprint-name
+                                       --version
+                                       [--management-group]
+                                       [--subscription]
+  examples:
+  - summary: List artifacts of a published management group blueprint
+    syntax: >-
+      az blueprint version artifact list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: List artifacts of a published subscription blueprint
+    syntax: >-
+      az blueprint version artifact list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_version_artifact_show
+  name: az blueprint version artifact show
+  summary: Show an artifact for a published blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version artifact show --artifact-name
+                                       --blueprint-name
+                                       --version
+                                       [--management-group]
+                                       [--subscription]
+  examples:
+  - summary: Show a role assignment artifact
+    syntax: >-
+      az blueprint version artifact show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2 --artifact-name OwnerAssignment
+  - summary: Show a template artifact
+    syntax: >-
+      az blueprint version artifact show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2 --artifact-name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage published blueprint artifacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards.yml b/2018-03-01-hybrid/docs-ref-autogen/boards.yml
index 147a57aa03..5cf68a9755 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards.yml
@@ -1,20 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_boards_query
+### YamlMime:AzureCLIGroup
+uid: az_boards
+name: az boards
+summary: Manage Azure Boards.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_boards_query
   name: az boards query
   summary: Query for a list of work items.
   description: Only supports flat queries.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards query [--detect {false, true}]
+                    [--id]
+                    [--org]
+                    [--path]
+                    [--project]
+                    [--subscription]
+                    [--wiql]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -23,7 +25,7 @@ items:
     summary: The ID of an existing query.  Required unless --path or --wiql are specified.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: The path of an existing query.  Ignored if --id is specified.
@@ -31,130 +33,52 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --wiql
-    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --wiql
+    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
+    description: ''
 commands:
-- uid: az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-- uid: az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-- uid: az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-- uid: az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-- uid: az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
+- az_boards_area
+- az_boards_area_project
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
+- az_boards_area_team
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
+- az_boards_iteration
+- az_boards_iteration_project
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
+- az_boards_iteration_team
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
+- az_boards_query
+- az_boards_work-item
+- az_boards_work-item_create
+- az_boards_work-item_delete
+- az_boards_work-item_relation
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
+- az_boards_work-item_show
+- az_boards_work-item_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -170,4 +94,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/area.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/area.yml
index 7ca7d14214..1c10d2893a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/area.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/area.yml
@@ -1,46 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_boards_area
+name: az boards area
+summary: Manage area paths.
+description: ''
 commands:
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
+- az_boards_area_project
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
+- az_boards_area_team
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -56,4 +30,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage area paths.
+metadata:
+  description: Manage area paths.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/area/project.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/area/project.yml
index 3664b29e8f..e014d7f2e9 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/area/project.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/area/project.yml
@@ -1,34 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_area_project_create
-  - az_boards_area_project_delete
-  - az_boards_area_project_list
-  - az_boards_area_project_show
-  - az_boards_area_project_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_area_project
+name: az boards area project
+summary: Manage areas for a project.
+description: ''
+directCommands:
 - uid: az_boards_area_project_create
   name: az boards area project create
   summary: Create area.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project create --name
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--path]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the area.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an area. Creates an area at root level if --path is not specified. Example:ProjectNameAreaAreaName.
@@ -43,36 +41,48 @@ items:
   name: az boards area project delete
   summary: Delete area.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project delete --path
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+                                  [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_boards_area_project_list
   name: az boards area project list
   summary: List areas for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project list [--depth]
+                                [--detect {false, true}]
+                                [--org]
+                                [--path]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  optionalParameters:
   - name: --depth
     defaultValue: "1"
     summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
@@ -82,7 +92,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
@@ -90,6 +100,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -97,23 +110,32 @@ items:
   name: az boards area project show
   summary: Show area details for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project show --id
+                                [--detect {false, true}]
+                                [--org]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Area ID.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -121,13 +143,20 @@ items:
   name: az boards area project update
   summary: Update area.
   description: Move area or update area name.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project update --path
+                                  [--child-id]
+                                  [--detect {false, true}]
+                                  [--name]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
     description: ''
+  optionalParameters:
   - name: --child-id
     summary: Move an existing area and add as child node for this area.
     description: ''
@@ -139,7 +168,7 @@ items:
     summary: New name of the area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -148,21 +177,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -178,4 +197,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a project.
+metadata:
+  description: Manage areas for a project.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/area/team.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/area/team.yml
index 40c1b91d7f..1cbf664774 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/area/team.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/area/team.yml
@@ -1,27 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_area_team_add
-  - az_boards_area_team_list
-  - az_boards_area_team_remove
-  - az_boards_area_team_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_area_team
+name: az boards area team
+summary: Manage areas for a team.
+description: ''
+directCommands:
 - uid: az_boards_area_team_add
   name: az boards area team add
   summary: Add area to a team.
   description: Every team needs to have a default area configured which can't be empty. Hence, you need to pass --set-as-default while adding first area to your team. You can later configure any other area which already added to team as default by using `az boards area team update -h` command.
-  langs:
-  - azurecli
+  syntax: >-
+    az boards area team add --path
+                            --team
+                            [--detect {false, true}]
+                            [--include-sub-areas {false, true}]
+                            [--org]
+                            [--project]
+                            [--set-as-default]
+                            [--subscription]
   examples:
   - summary: Add area to a team.
-    syntax:
-      content: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
-  parameters:
+    syntax: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -30,6 +29,7 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -39,7 +39,7 @@ items:
     summary: Include child nodes of this area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -54,23 +54,32 @@ items:
   name: az boards area team list
   summary: List areas for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team list --team
+                             [--detect {false, true}]
+                             [--org]
+                             [--project]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -78,9 +87,14 @@ items:
   name: az boards area team remove
   summary: Remove area from a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team remove --path
+                               --team
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -89,12 +103,13 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -106,9 +121,16 @@ items:
   name: az boards area team update
   summary: Update team area.
   description: Update any area to include/exclude sub areas OR Set already added area as default.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team update --path
+                               --team
+                               [--detect {false, true}]
+                               [--include-sub-areas {false, true}]
+                               [--org]
+                               [--project]
+                               [--set-as-default]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -117,6 +139,7 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -126,7 +149,7 @@ items:
     summary: Include child nodes of this area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -138,18 +161,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -165,4 +180,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a team.
+metadata:
+  description: Manage areas for a team.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/iteration.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/iteration.yml
index dea0301992..56a0d13dbf 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/iteration.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/iteration.yml
@@ -1,58 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration
+name: az boards iteration
+summary: Manage iterations.
+description: ''
 commands:
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
+- az_boards_iteration_project
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
+- az_boards_iteration_team
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -68,4 +34,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations.
+metadata:
+  description: Manage iterations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml
index c8de369d09..daf94a9ff1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_iteration_project_create
-  - az_boards_iteration_project_delete
-  - az_boards_iteration_project_list
-  - az_boards_iteration_project_show
-  - az_boards_iteration_project_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration_project
+name: az boards iteration project
+summary: Manage iterations for a project.
+description: ''
+directCommands:
 - uid: az_boards_iteration_project_create
   name: az boards iteration project create
   summary: Create iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project create --name
+                                       [--detect {false, true}]
+                                       [--finish-date]
+                                       [--org]
+                                       [--path]
+                                       [--project]
+                                       [--start-date]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the iteration.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -31,7 +31,7 @@ items:
     summary: 'Finish date of the iteration. Example : "2019-06-21".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an iteration. Creates an iteration at root level if --path is not specified. Example:ProjectNameIterationIterationName.
@@ -49,36 +49,48 @@ items:
   name: az boards iteration project delete
   summary: Delete iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project delete --path
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+                                       [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_boards_iteration_project_list
   name: az boards iteration project list
   summary: List iterations for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project list [--depth]
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--path]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  optionalParameters:
   - name: --depth
     defaultValue: "1"
     summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
@@ -88,7 +100,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
@@ -96,6 +108,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -103,23 +118,32 @@ items:
   name: az boards iteration project show
   summary: Show iteration details for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project show --id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Iteration ID.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -127,13 +151,22 @@ items:
   name: az boards iteration project update
   summary: Update project iteration.
   description: Move iteration or update iteration details like name AND/OR start-date and finish-date.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project update --path
+                                       [--child-id]
+                                       [--detect {false, true}]
+                                       [--finish-date]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--start-date]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
     description: ''
+  optionalParameters:
   - name: --child-id
     summary: Move an existing iteration and add as child node for this iteration.
     description: ''
@@ -148,7 +181,7 @@ items:
     summary: New name of the iteration.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -160,21 +193,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -190,4 +213,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a project.
+metadata:
+  description: Manage iterations for a project.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml
index 77a911bc04..f9feb16624 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml
@@ -1,27 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_iteration_team_add
-  - az_boards_iteration_team_list
-  - az_boards_iteration_team_list_work_items
-  - az_boards_iteration_team_remove
-  - az_boards_iteration_team_set_backlog_iteration
-  - az_boards_iteration_team_set_default_iteration
-  - az_boards_iteration_team_show_backlog_iteration
-  - az_boards_iteration_team_show_default_iteration
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration_team
+name: az boards iteration team
+summary: Manage iterations for a team.
+description: ''
+directCommands:
 - uid: az_boards_iteration_team_add
   name: az boards iteration team add
   summary: Add iteration to a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team add --id
+                                 --team
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -30,12 +24,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,36 +42,51 @@ items:
   name: az boards iteration team list
   summary: List iterations for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team list --team
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--timeframe]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --timeframe
-    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_list_work_items
+  - name: --timeframe
+    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
+    description: ''
+- uid: az_boards_iteration_team_list-work-items
   name: az boards iteration team list-work-items
   summary: List work-items for an iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team list-work-items --id
+                                             --team
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -85,12 +95,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -102,9 +113,14 @@ items:
   name: az boards iteration team remove
   summary: Remove iteration from a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team remove --id
+                                    --team
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -113,12 +129,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -126,13 +143,18 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_set_backlog_iteration
+- uid: az_boards_iteration_team_set-backlog-iteration
   name: az boards iteration team set-backlog-iteration
   summary: Set backlog iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team set-backlog-iteration --id
+                                                   --team
+                                                   [--detect {false, true}]
+                                                   [--org]
+                                                   [--project]
+                                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration which needs to be set as backlog iteration.
@@ -141,12 +163,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -154,17 +177,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_set_default_iteration
+- uid: az_boards_iteration_team_set-default-iteration
   name: az boards iteration team set-default-iteration
   summary: Set default iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team set-default-iteration --team
+                                                   [--default-iteration-macro]
+                                                   [--detect {false, true}]
+                                                   [--id]
+                                                   [--org]
+                                                   [--project]
+                                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --default-iteration-macro
     summary: 'Default iteration macro. Example: @CurrentIteration.'
     description: ''
@@ -176,7 +206,7 @@ items:
     summary: Identifier of the iteration which needs to be set as default.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -184,23 +214,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_show_backlog_iteration
+- uid: az_boards_iteration_team_show-backlog-iteration
   name: az boards iteration team show-backlog-iteration
   summary: Show backlog iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team show-backlog-iteration --team
+                                                    [--detect {false, true}]
+                                                    [--org]
+                                                    [--project]
+                                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -208,23 +243,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_show_default_iteration
+- uid: az_boards_iteration_team_show-default-iteration
   name: az boards iteration team show-default-iteration
   summary: Show default iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team show-default-iteration --team
+                                                    [--detect {false, true}]
+                                                    [--org]
+                                                    [--project]
+                                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -233,30 +273,14 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -272,4 +296,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a team.
+metadata:
+  description: Manage iterations for a team.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/work-item.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/work-item.yml
index 948056d580..14c24db075 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/work-item.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/work-item.yml
@@ -1,23 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_work_item_create
-  - az_boards_work_item_delete
-  - az_boards_work_item_show
-  - az_boards_work_item_update
-- uid: az_boards_work_item_create
+### YamlMime:AzureCLIGroup
+uid: az_boards_work-item
+name: az boards work-item
+summary: Manage work items.
+description: ''
+directCommands:
+- uid: az_boards_work-item_create
   name: az boards work-item create
   summary: Create a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item create --title
+                               --type
+                               [--area]
+                               [--assigned-to]
+                               [--description]
+                               [--detect {false, true}]
+                               [--discussion]
+                               [--fields]
+                               [--iteration]
+                               [--open]
+                               [--org]
+                               [--project]
+                               [--reason]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --title
     summary: Title of the work item.
@@ -26,6 +32,7 @@ items:
     name: --type
     summary: Name of the work item type (e.g. Bug).
     description: ''
+  optionalParameters:
   - name: --area
     summary: Area the work item is assigned to (e.g. Demos).
     description: ''
@@ -43,7 +50,7 @@ items:
     summary: Comment to add to a discussion in a work item.
     description: ''
   - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
+    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
     description: ''
   - name: --iteration
     summary: Iteration path of the work item (e.g. DemosIteration 1).
@@ -52,7 +59,7 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -63,17 +70,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_delete
+- uid: az_boards_work-item_delete
   name: az boards work-item delete
   summary: Delete a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item delete --id
+                               [--destroy]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Unique id of the work item.
     description: ''
+  optionalParameters:
   - name: --destroy
     summary: Permanently delete this work item.
     description: ''
@@ -82,28 +96,37 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_show
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_boards_work-item_show
   name: az boards work-item show
   summary: Show details for a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item show --id
+                             [--as-of]
+                             [--detect {false, true}]
+                             [--expand {all, fields, links, none, relations}]
+                             [--fields]
+                             [--open]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
     description: ''
+  optionalParameters:
   - name: --as-of
     summary: "Work item details as of a particular date and time. Provide a date or date time string. Assumes local time zone. Example: '2019-01-20', '2019-01-20 00:20:00'. For UTC, append 'UTC' to the date time string, '2019-01-20 00:20:00 UTC'."
     description: ''
@@ -123,22 +146,39 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_update
+- uid: az_boards_work-item_update
   name: az boards work-item update
   summary: Update work items.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item update --id
+                               [--area]
+                               [--assigned-to]
+                               [--description]
+                               [--detect {false, true}]
+                               [--discussion]
+                               [--fields]
+                               [--iteration]
+                               [--open]
+                               [--org]
+                               [--reason]
+                               [--state]
+                               [--subscription]
+                               [--title]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the work item to update.
     description: ''
+  optionalParameters:
   - name: --area
     summary: Area the work item is assigned to (e.g. Demos).
     description: ''
@@ -156,7 +196,7 @@ items:
     summary: Comment to add to a discussion in a work item.
     description: ''
   - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
+    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
     description: ''
   - name: --iteration
     summary: Iteration path of the work item (e.g. DemosIteration 1).
@@ -165,7 +205,7 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --reason
     summary: Reason for the state of the work item.
@@ -173,40 +213,22 @@ items:
   - name: --state
     summary: State of the work item (e.g. active).
     description: ''
-  - name: --title
-    summary: Title of the work item.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --title
+    summary: Title of the work item.
+    description: ''
 commands:
-- uid: az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
+- az_boards_work-item_create
+- az_boards_work-item_delete
+- az_boards_work-item_relation
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
+- az_boards_work-item_show
+- az_boards_work-item_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -222,4 +244,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items.
+metadata:
+  description: Manage work items.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml b/2018-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml
index dfea92aa34..3e6e9879a8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml
@@ -1,23 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_work_item_relation_add
-  - az_boards_work_item_relation_list_type
-  - az_boards_work_item_relation_remove
-  - az_boards_work_item_relation_show
-- uid: az_boards_work_item_relation_add
+### YamlMime:AzureCLIGroup
+uid: az_boards_work-item_relation
+name: az boards work-item relation
+summary: Manage work item relations.
+description: ''
+directCommands:
+- uid: az_boards_work-item_relation_add
   name: az boards work-item relation add
   summary: Add relation(s) to work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation add --id
+                                     --relation-type
+                                     --target-id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
@@ -30,40 +28,49 @@ items:
     name: --target-id
     summary: 'ID(s) of work-items to create relation with.                          Multiple values can be passed comma separated. Example: 1,2.'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_list_type
+- uid: az_boards_work-item_relation_list-type
   name: az boards work-item relation list-type
   summary: List work item relations supported in the organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation list-type [--detect {false, true}]
+                                           [--org]
+                                           [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_remove
+- uid: az_boards_work-item_relation_remove
   name: az boards work-item relation remove
   summary: Remove relation(s) from work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation remove --id
+                                        --relation-type
+                                        --target-id
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--subscription]
+                                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
@@ -76,53 +83,54 @@ items:
     name: --target-id
     summary: 'ID(s) of work-items to remove relation from.                          Multiple values can be passed comma separated. Example: 1,2.'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_show
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_boards_work-item_relation_show
   name: az boards work-item relation show
   summary: Get work item, fill relations with friendly name.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation show --id
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--query-examples]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -138,4 +146,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item relations.
+metadata:
+  description: Manage work item relations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cache.yml b/2018-03-01-hybrid/docs-ref-autogen/cache.yml
index 948b187998..2599a6b9b2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/cache.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/cache.yml
@@ -1,35 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_cache
-  name: az cache
-  summary: Commands to manage CLI objects cached using the `--defer` argument.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_cache_delete
-  - az_cache_list
-  - az_cache_purge
-  - az_cache_show
+### YamlMime:AzureCLIGroup
+uid: az_cache
+name: az cache
+summary: Commands to manage CLI objects cached using the `--defer` argument.
+description: ''
+directCommands:
 - uid: az_cache_delete
   name: az cache delete
   summary: Delete an object from the cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache delete --name
+                    --resource-group
+                    --resource-type
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-type -t
     summary: The resource type.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -37,9 +34,13 @@ items:
   name: az cache list
   summary: List the contents of the object cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache list [--query-examples]
+                  [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -47,9 +48,8 @@ items:
   name: az cache purge
   summary: Clear the entire CLI object cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az cache purge [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -57,37 +57,37 @@ items:
   name: az cache show
   summary: Show the contents of a specific object in the cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache show --name
+                  --resource-group
+                  --resource-type
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-type -t
     summary: The resource type.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_cache_delete
-  name: az cache delete
-  summary: Delete an object from the cache.
-- uid: az_cache_list
-  name: az cache list
-  summary: List the contents of the object cache.
-- uid: az_cache_purge
-  name: az cache purge
-  summary: Clear the entire CLI object cache.
-- uid: az_cache_show
-  name: az cache show
-  summary: Show the contents of a specific object in the cache.
+- az_cache_delete
+- az_cache_list
+- az_cache_purge
+- az_cache_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -103,4 +103,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage CLI objects cached using the `--defer` argument.
+metadata:
+  description: Commands to manage CLI objects cached using the `--defer` argument.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cli-translator.yml b/2018-03-01-hybrid/docs-ref-autogen/cli-translator.yml
new file mode 100644
index 0000000000..a0ae214250
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cli-translator.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_cli-translator
+name: az cli-translator
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cli-translator** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az cli-translator** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Translate ARM template or REST API to CLI scripts.
+description: ''
+commands:
+- az_cli-translator_arm
+- az_cli-translator_arm_translate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Translate ARM template or REST API to CLI scripts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cli-translator/arm.yml b/2018-03-01-hybrid/docs-ref-autogen/cli-translator/arm.yml
new file mode 100644
index 0000000000..5a3c85efc8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cli-translator/arm.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_cli-translator_arm
+name: az cli-translator arm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cli-translator** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az cli-translator arm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
+description: ''
+directCommands:
+- uid: az_cli-translator_arm_translate
+  name: az cli-translator arm translate
+  summary: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
+  description: ''
+  syntax: >-
+    az cli-translator arm translate --parameters
+                                    --resource-group
+                                    --template
+                                    [--target-subscription]
+  examples:
+  - summary: Translate ARM template.json and parameters.json to CLI scripts
+    syntax: az cli-translator arm translate --target-subscription 00000000-0000-0000-0000-000000000000 --resource-group groupName --template /path/to/local/template --parameters /path/to/local/parameters
+  requiredParameters:
+  - isRequired: true
+    name: --parameters
+    summary: The local path or url of parameters.json file.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: The local path or url of template.json file.
+    description: ''
+  optionalParameters:
+  - name: --target-subscription
+    summary: The target subscription id. If omit, the current subscription id will be used.
+    description: ''
+commands:
+- az_cli-translator_arm_translate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cloud-service.yml b/2018-03-01-hybrid/docs-ref-autogen/cloud-service.yml
new file mode 100644
index 0000000000..5bc3ea321f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cloud-service.yml
@@ -0,0 +1,422 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service
+name: az cloud-service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service (extended support).
+description: ''
+directCommands:
+- uid: az_cloud-service_create
+  name: az cloud-service create
+  summary: Create a cloud service (extended support). Please note some properties can be set only during cloud service creation.
+  description: ''
+  syntax: >-
+    az cloud-service create --cloud-service-name
+                            --resource-group
+                            [--configuration]
+                            [--configuration-url]
+                            [--extensions]
+                            [--id]
+                            [--lb]
+                            [--location]
+                            [--no-wait]
+                            [--package-url]
+                            [--roles]
+                            [--secrets]
+                            [--start-cloud-service {false, true}]
+                            [--tags]
+                            [--upgrade-mode {Auto, Manual, Simultaneous}]
+  examples:
+  - summary: Create a cloud service with 2 roles, 2 load balancers (one has a public IP and another has a private IP), secrets and extensions.
+    syntax: 'az cloud-service create -g ResourceGroup -n CloudService --roles ContosoFrontend:Standard_D1_v2:1:Standard ContosoBackend:Standard_D1_v2:1:Standard --package-url PackageURL --configuration Config --load-balancer-configurations MyLoadBalancer:MyFe:PublicIP:: MyLoadBalancer2:MyFe2::SubnetIDd:PrivateIPID --secrets Vault0:Cert0:Cert1 Vault1:Cert2:Cert3:Cert4 --extensions "@extensions.json"'
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --configuration
+    summary: 'Specify the XML service configuration (.cscfg) for the cloud service. Expected value: xml-string/@xml-file.'
+    description: ''
+  - name: --configuration-url
+    summary: Specify a URL that refers to the location of the service configuration in the Blob service. The service package URL  can be Shared Access Signature (SAS) URI from any storage account. This is a write-only property and is not returned in GET calls.
+    description: ''
+  - name: --extensions
+    summary: 'List of extensions for the cloud service. Expected value: json-string/@json-file. Example: [{"properties": {"type": "RDP", "autoUpgradeMinorVersion": false, "protectedSettings": "settings","publisher": "Microsoft.Windows.Azure.Extensions", "settings": "settings", "typeHandlerVersion": "1.2.1"}, "name": "RDPExtension"}].'
+    description: ''
+  - name: --id
+    summary: Resource Id.
+    description: ''
+  - name: --lb --load-balancer-configurations
+    summary: 'The list of load balancer configurations separated by space for the cloud service. The public IP is a mandatory field. Format: LBName:FrontendIPConfiguration:PublicIPAddress:Subnet:PrivateIP.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --package-url
+    summary: Specify a URL that refers to the location of the service package in the Blob service. The service package URL can be Shared Access Signature (SAS) URI from any storage account. This is a write-only property and is not returned in GET calls.
+    description: ''
+  - name: --roles
+    summary: 'List of roles separated by space for the cloud service. Format: RoleName:SkuName:SkuCapacity:SkuTier.'
+    description: ''
+  - name: --secrets
+    summary: 'Specify certificates separated by space that should be installed onto the role instances. Format: KeyVaultName:CertificateUrl:CertificateUrl2:...:CertificateUrlN.'
+    description: ''
+  - name: --start-cloud-service
+    parameterValueGroup: false, true
+    summary: Indicate whether to start the cloud service immediately after it is created. The default value is `true`. If false, the service model is still deployed, but the code is not run immediately. Instead, the service is PoweredOff until you call Start, at which time the service will be started. A deployed service still incurs charges, even if it is poweredoff.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --upgrade-mode
+    parameterValueGroup: Auto, Manual, Simultaneous
+    summary: Update mode for the cloud service. Role instances are allocated to update domains when the service is deployed. Updates can be initiated manually in each update domain or initiated automatically in all update domains. Possible Values are Auto, Manual, Simultaneous. If not specified, the default value is Auto. If set to Manual, PUT UpdateDomain must be called to apply the update. If set to Auto, the update is automatically applied to each update domain in sequence.
+    description: ''
+- uid: az_cloud-service_delete
+  name: az cloud-service delete
+  summary: Delete a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service delete --cloud-service-name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_delete-instance
+  name: az cloud-service delete-instance
+  summary: Delete role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service delete-instance --cloud-service-name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--role-instances]
+                                     [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_list
+  name: az cloud-service list
+  summary: Get a list of all cloud services under a resource group.
+  description: ''
+  syntax: az cloud-service list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_list-all
+  name: az cloud-service list-all
+  summary: Get a list of all cloud services in the subscription, regardless of the associated resource group.
+  description: ''
+  syntax: az cloud-service list-all
+- uid: az_cloud-service_power-off
+  name: az cloud-service power-off
+  summary: Power off the cloud service. Note that resources are still attached and you are getting charged for the resources.
+  description: ''
+  syntax: >-
+    az cloud-service power-off --cloud-service-name
+                               --resource-group
+                               [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_rebuild
+  name: az cloud-service rebuild
+  summary: Rebuild Role Instances. Reinstall the operating system on instances of web roles or worker roles and initialize the storage resources that are used by them. If you do not want to initialize storage resources, you can use Reimage Role Instances.
+  description: ''
+  syntax: >-
+    az cloud-service rebuild --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_reimage
+  name: az cloud-service reimage
+  summary: Reimage asynchronous operation reinstalls the operating system on instances of web roles or worker roles.
+  description: ''
+  syntax: >-
+    az cloud-service reimage --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_restart
+  name: az cloud-service restart
+  summary: Restart one or more role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service restart --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_show
+  name: az cloud-service show
+  summary: Display information about a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service show --cloud-service-name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_show-instance-view
+  name: az cloud-service show-instance-view
+  summary: Get the status of a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service show-instance-view --cloud-service-name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_start
+  name: az cloud-service start
+  summary: Start the cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service start --cloud-service-name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_update
+  name: az cloud-service update
+  summary: Update a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update --cloud-service-name
+                            --resource-group
+                            [--no-wait]
+                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_cloud-service_wait
+  name: az cloud-service wait
+  summary: Place the CLI in a waiting state until a condition of the cloud-service is met.
+  description: ''
+  syntax: >-
+    az cloud-service wait --cloud-service-name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_cloud-service_create
+- az_cloud-service_delete
+- az_cloud-service_delete-instance
+- az_cloud-service_list
+- az_cloud-service_list-all
+- az_cloud-service_power-off
+- az_cloud-service_rebuild
+- az_cloud-service_reimage
+- az_cloud-service_restart
+- az_cloud-service_role
+- az_cloud-service_role_list
+- az_cloud-service_role_show
+- az_cloud-service_role-instance
+- az_cloud-service_role-instance_delete
+- az_cloud-service_role-instance_list
+- az_cloud-service_role-instance_rebuild
+- az_cloud-service_role-instance_reimage
+- az_cloud-service_role-instance_restart
+- az_cloud-service_role-instance_show
+- az_cloud-service_role-instance_show-instance-view
+- az_cloud-service_role-instance_show-remote-desktop-file
+- az_cloud-service_show
+- az_cloud-service_show-instance-view
+- az_cloud-service_start
+- az_cloud-service_update
+- az_cloud-service_update-domain
+- az_cloud-service_update-domain_list-update-domain
+- az_cloud-service_update-domain_show-update-domain
+- az_cloud-service_update-domain_walk-update-domain
+- az_cloud-service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service (extended support).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cloud-service/role-instance.yml b/2018-03-01-hybrid/docs-ref-autogen/cloud-service/role-instance.yml
new file mode 100644
index 0000000000..3fe7177b79
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cloud-service/role-instance.yml
@@ -0,0 +1,223 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_role-instance
+name: az cloud-service role-instance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service role-instance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service role instance with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_role-instance_delete
+  name: az cloud-service role-instance delete
+  summary: Delete a role instance from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance delete --cloud-service-name
+                                          --resource-group
+                                          --role-instance-name
+                                          [--no-wait]
+                                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_role-instance_list
+  name: az cloud-service role-instance list
+  summary: Get the list of all role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance list --cloud-service-name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_role-instance_rebuild
+  name: az cloud-service role-instance rebuild
+  summary: The Rebuild Role Instance asynchronous operation reinstalls the operating system on instances of web roles or worker roles and initializes the storage resources that are used by them. If you do not want to initialize storage resources, you can use Reimage Role Instance.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance rebuild --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_reimage
+  name: az cloud-service role-instance reimage
+  summary: The Reimage Role Instance asynchronous operation reinstalls the operating system on instances of web roles or worker roles.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance reimage --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_restart
+  name: az cloud-service role-instance restart
+  summary: The Reboot Role Instance asynchronous operation requests a reboot of a role instance in the cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance restart --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_show
+  name: az cloud-service role-instance show
+  summary: Get a role instance from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show --cloud-service-name
+                                        --resource-group
+                                        --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+- uid: az_cloud-service_role-instance_show-instance-view
+  name: az cloud-service role-instance show-instance-view
+  summary: Retrieve information about the run-time state of a role instance in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show-instance-view --cloud-service-name
+                                                      --resource-group
+                                                      --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+- uid: az_cloud-service_role-instance_show-remote-desktop-file
+  name: az cloud-service role-instance show-remote-desktop-file
+  summary: Get a remote desktop file for a role instance in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show-remote-desktop-file --cloud-service-name
+                                                            --resource-group
+                                                            --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+commands:
+- az_cloud-service_role-instance_delete
+- az_cloud-service_role-instance_list
+- az_cloud-service_role-instance_rebuild
+- az_cloud-service_role-instance_reimage
+- az_cloud-service_role-instance_restart
+- az_cloud-service_role-instance_show
+- az_cloud-service_role-instance_show-instance-view
+- az_cloud-service_role-instance_show-remote-desktop-file
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service role instance with cloud service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cloud-service/role.yml b/2018-03-01-hybrid/docs-ref-autogen/cloud-service/role.yml
new file mode 100644
index 0000000000..389cec1fa5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cloud-service/role.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_role
+name: az cloud-service role
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service role** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service role with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_role_list
+  name: az cloud-service role list
+  summary: Get a list of all roles in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role list --cloud-service-name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_role_show
+  name: az cloud-service role show
+  summary: Get a role from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role show --cloud-service-name
+                               --resource-group
+                               --role-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-name
+    summary: Name of the role.
+    description: ''
+commands:
+- az_cloud-service_role_list
+- az_cloud-service_role_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service role with cloud service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cloud-service/update-domain.yml b/2018-03-01-hybrid/docs-ref-autogen/cloud-service/update-domain.yml
new file mode 100644
index 0000000000..401a31b63a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cloud-service/update-domain.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_update-domain
+name: az cloud-service update-domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service update-domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service update domain with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_update-domain_list-update-domain
+  name: az cloud-service update-domain list-update-domain
+  summary: Get a list of all update domains in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain list-update-domain --cloud-service-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_update-domain_show-update-domain
+  name: az cloud-service update-domain show-update-domain
+  summary: Get the specified update domain of a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain show-update-domain --cloud-service-name
+                                                      --resource-group
+                                                      --update-domain
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --update-domain
+    summary: 'Specifies an integer value that identifies the update domain. Update domains are identified with a zero-based index: the first update domain has an ID of 0, the second has an ID of 1, and so on.'
+    description: ''
+- uid: az_cloud-service_update-domain_walk-update-domain
+  name: az cloud-service update-domain walk-update-domain
+  summary: Update the role instances in the specified update domain.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain walk-update-domain --cloud-service-name
+                                                      --resource-group
+                                                      --update-domain
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --update-domain
+    summary: 'Specifies an integer value that identifies the update domain. Update domains are identified with a zero-based index: the first update domain has an ID of 0, the second has an ID of 1, and so on.'
+    description: ''
+commands:
+- az_cloud-service_update-domain_list-update-domain
+- az_cloud-service_update-domain_show-update-domain
+- az_cloud-service_update-domain_walk-update-domain
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service update domain with cloud service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/cloud.yml
index 012b6e81dc..8cc5841bd3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/cloud.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/cloud.yml
@@ -1,39 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_cloud
-  name: az cloud
-  summary: Manage registered Azure clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_cloud_list
-  - az_cloud_list_profiles
-  - az_cloud_register
-  - az_cloud_set
-  - az_cloud_show
-  - az_cloud_unregister
-  - az_cloud_update
+### YamlMime:AzureCLIGroup
+uid: az_cloud
+name: az cloud
+summary: Manage registered Azure clouds.
+description: ''
+directCommands:
 - uid: az_cloud_list
   name: az cloud list
   summary: List registered clouds.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_cloud_list_profiles
+  syntax: az cloud list [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
+- uid: az_cloud_list-profiles
   name: az cloud list-profiles
   summary: List the supported profiles for a cloud.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud list-profiles [--name]
+                           [--show-all]
+  optionalParameters:
   - name: --name -n
     defaultValue: AzureCloud
     summary: Name of a registered cloud.
@@ -41,23 +29,58 @@ items:
   - name: --show-all
     summary: Show all available profiles supported in the CLI.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_register
   name: az cloud register
   summary: Register a cloud.
   description: When registering a cloud, specify only the resource manager endpoint for the autodetection of other endpoints.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud register --name
+                      [--cloud-config]
+                      [--endpoint-active-directory]
+                      [--endpoint-active-directory-data-lake-resource-id]
+                      [--endpoint-active-directory-graph-resource-id]
+                      [--endpoint-active-directory-resource-id]
+                      [--endpoint-gallery]
+                      [--endpoint-management]
+                      [--endpoint-resource-manager]
+                      [--endpoint-sql-management]
+                      [--endpoint-vm-image-alias-doc]
+                      [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
+                      [--suffix-acr-login-server-endpoint]
+                      [--suffix-azure-datalake-analytics-catalog-and-job-endpoint]
+                      [--suffix-azure-datalake-store-file-system-endpoint]
+                      [--suffix-keyvault-dns]
+                      [--suffix-sql-server-hostname]
+                      [--suffix-storage-endpoint]
+  examples:
+  - summary: Register a cloud with a config file
+    syntax: >-
+      az cloud register -n MyCloud --cloud-config @"cloud.json"
+
+      ("cloud.json" supports all the endpoint and suffix options in camel case or the JSON output format from az cloud show. See the example content below.)
+
+      {
+        "endpointActiveDirectory": "https://login.microsoftonline.us",
+        "suffixAcrLoginServerEndpoint": ".azurecr.us"
+      }
+
+      or
+
+      {
+        "endpoints":{
+          "activeDirectory": "https://login.microsoftonline.us"
+        },
+        "suffixes":{
+          "acrLoginServerEndpoint": ".azurecr.us"
+        }
+      }
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
+  optionalParameters:
   - name: --cloud-config
     summary: JSON encoded cloud configuration. Use @{file} to load from a file.
     description: ''
@@ -89,7 +112,7 @@ items:
     summary: The uri of the document which caches commonly used virtual machine images.
     description: ''
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
   - name: --suffix-acr-login-server-endpoint
@@ -110,86 +133,85 @@ items:
   - name: --suffix-storage-endpoint
     summary: The endpoint suffix for storage accounts.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_set
   name: az cloud set
   summary: Set the active cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az cloud set --name
+                 [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
   examples:
   - summary: Set the active cloud. (autogenerated)
-    syntax:
-      content: az cloud set --name MyRegisteredCloud
-  parameters:
+    syntax: az cloud set --name MyRegisteredCloud
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
+  optionalParameters:
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_show
   name: az cloud show
   summary: Get the details of a registered cloud.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud show [--name]
+                  [--query-examples]
+  optionalParameters:
   - name: --name -n
     defaultValue: AzureCloud
     summary: Name of a registered cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_unregister
   name: az cloud unregister
   summary: Unregister a cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: az cloud unregister --name
   examples:
   - summary: Unregister a cloud. (autogenerated)
-    syntax:
-      content: az cloud unregister --name MyRegisteredCloud
-  parameters:
+    syntax: az cloud unregister --name MyRegisteredCloud
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_update
   name: az cloud update
   summary: Update the configuration of a cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az cloud update [--cloud-config]
+                    [--endpoint-active-directory]
+                    [--endpoint-active-directory-data-lake-resource-id]
+                    [--endpoint-active-directory-graph-resource-id]
+                    [--endpoint-active-directory-resource-id]
+                    [--endpoint-gallery]
+                    [--endpoint-management]
+                    [--endpoint-resource-manager]
+                    [--endpoint-sql-management]
+                    [--endpoint-vm-image-alias-doc]
+                    [--name]
+                    [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
+                    [--suffix-acr-login-server-endpoint]
+                    [--suffix-azure-datalake-analytics-catalog-and-job-endpoint]
+                    [--suffix-azure-datalake-store-file-system-endpoint]
+                    [--suffix-keyvault-dns]
+                    [--suffix-sql-server-hostname]
+                    [--suffix-storage-endpoint]
   examples:
   - summary: Update the configuration of a cloud. (autogenerated)
-    syntax:
-      content: az cloud update --profile latest
-  parameters:
+    syntax: az cloud update --profile latest
+  optionalParameters:
   - name: --cloud-config
     summary: JSON encoded cloud configuration. Use @{file} to load from a file.
     description: ''
@@ -225,7 +247,7 @@ items:
     summary: Name of a registered cloud.
     description: ''
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
   - name: --suffix-acr-login-server-endpoint
@@ -246,34 +268,15 @@ items:
   - name: --suffix-storage-endpoint
     summary: The endpoint suffix for storage accounts.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 commands:
-- uid: az_cloud_list
-  name: az cloud list
-  summary: List registered clouds.
-- uid: az_cloud_list_profiles
-  name: az cloud list-profiles
-  summary: List the supported profiles for a cloud.
-- uid: az_cloud_register
-  name: az cloud register
-  summary: Register a cloud.
-- uid: az_cloud_set
-  name: az cloud set
-  summary: Set the active cloud.
-- uid: az_cloud_show
-  name: az cloud show
-  summary: Get the details of a registered cloud.
-- uid: az_cloud_unregister
-  name: az cloud unregister
-  summary: Unregister a cloud.
-- uid: az_cloud_update
-  name: az cloud update
-  summary: Update the configuration of a cloud.
+- az_cloud_list
+- az_cloud_list-profiles
+- az_cloud_register
+- az_cloud_set
+- az_cloud_show
+- az_cloud_unregister
+- az_cloud_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -289,10 +292,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/800e711239d60c81de6679d73779563b2cedcc62/src/azure-cli/azure/cli/command_modules/cloud/_help.py
-updated_at: 2/13/2020 4:56:47 AM
-ms.date: 02/13/2020
-description: Manage registered Azure clouds.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 10/30/2020
+  description: Manage registered Azure clouds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/codespace.yml b/2018-03-01-hybrid/docs-ref-autogen/codespace.yml
new file mode 100644
index 0000000000..65ea5c5a6b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/codespace.yml
@@ -0,0 +1,364 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace
+name: az codespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Visual Studio Codespaces.
+description: ''
+directCommands:
+- uid: az_codespace_create
+  name: az codespace create
+  summary: Create a Codespace.
+  description: ''
+  syntax: >-
+    az codespace create --name
+                        --plan
+                        [--dotfiles-command]
+                        [--dotfiles-path]
+                        [--dotfiles-repo]
+                        [--git-repo]
+                        [--git-user-email]
+                        [--git-user-name]
+                        [--instance-type]
+                        [--resource-group]
+                        [--suspend-after {120, 30, 5, 60}]
+  examples:
+  - summary: Create a Codespace with default plan settings
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace
+  - summary: Create a Codespace with a different instance type with custom suspend time
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux --suspend-after 5
+  - summary: Create a Codespace with a git repo
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --git-repo https://github.com/github/repo --git-user-name "User Name" --git-user-email user@example.com
+  - summary: Create a Codespace with a dotfiles repo
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --dotfiles-repo https://github.com/github/dotfiles --dotfiles-path ~/dotfiles --dotfiles-command bootstrap.sh
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --dotfiles-command
+    summary: The command we'll run after cloning your dotfiles repository.
+    description: ''
+  - name: --dotfiles-path
+    summary: Path where you expect your dotfiles repository to be cloned into the Codespace.
+    description: ''
+  - name: --dotfiles-repo
+    summary: 'Url of dotfiles git repository. More info: https://aka.ms/vso-docs/reference/personalizing.'
+    description: ''
+  - name: --git-repo
+    summary: Url of the git repository we'll clone into the Codespace.
+    description: ''
+  - name: --git-user-email
+    summary: Git user email. For example, the output of `git config user.email`.
+    description: ''
+  - name: --git-user-name
+    summary: Git username. For example, the output of `git config user.name`.
+    description: ''
+  - name: --instance-type
+    summary: Instance Type.
+    description: ''
+    valueFrom: az codespace location show
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Automatically suspend the inactive Codespace after this many minutes.
+    description: ''
+- uid: az_codespace_delete
+  name: az codespace delete
+  summary: Delete a Codespace.
+  description: ''
+  syntax: >-
+    az codespace delete --plan
+                        [--id]
+                        [--name]
+                        [--resource-group]
+                        [--yes]
+  examples:
+  - summary: Delete a Codespace given name
+    syntax: az codespace delete -g my-rg --plan my-plan --name my-codespace
+  - summary: Delete a Codespace given id
+    syntax: az codespace delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Delete a Codespace given plan id and Codespace name
+    syntax: az codespace delete --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_list
+  name: az codespace list
+  summary: List Codespaces.
+  description: ''
+  syntax: >-
+    az codespace list --plan
+                      [--all]
+                      [--resource-group]
+  examples:
+  - summary: List Codespaces
+    syntax: az codespace list -g my-rg --plan my-plan
+  - summary: List Codespaces given plan id
+    syntax: az codespace list --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --all
+    summary: Include the Codespaces of other users. You may not have access to connect or modify these other Codespaces.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_open
+  name: az codespace open
+  summary: Open a Codespace in the web browser.
+  description: Confirmation is required if the Codespace is not in the 'Available' state as opening a Codespace will automatically resume it.
+  syntax: >-
+    az codespace open --plan
+                      [--id]
+                      [--name]
+                      [--resource-group]
+                      [--yes]
+  examples:
+  - summary: Open a Codespace given name
+    syntax: az codespace open -g my-rg --plan my-plan --name my-codespace
+  - summary: Open a Codespace given id
+    syntax: az codespace open -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Open a Codespace given plan id and Codespace name
+    syntax: az codespace open --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_resume
+  name: az codespace resume
+  summary: Resume a Codespace.
+  description: ''
+  syntax: >-
+    az codespace resume --plan
+                        [--id]
+                        [--name]
+                        [--resource-group]
+  examples:
+  - summary: Resume a Codespace given name
+    syntax: az codespace resume -g my-rg --plan my-plan --name my-codespace
+  - summary: Resume a Codespace given id
+    syntax: az codespace resume -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Resume a Codespace given plan id and Codespace name
+    syntax: az codespace resume --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_set-config
+  name: az codespace set-config
+  summary: Set configuration for codespace commands.
+  description: ''
+  syntax: >-
+    az codespace set-config [--clear]
+                            [--domain]
+                            [--rp]
+  optionalParameters:
+  - name: --clear
+    summary: Clear current configuration to return to defaults.
+    description: ''
+  - name: --domain
+    summary: Service domain to use.
+    description: ''
+  - name: --rp
+    summary: Resource Provider API version to use.
+    description: ''
+- uid: az_codespace_show
+  name: az codespace show
+  summary: Show details of a Codespace.
+  description: ''
+  syntax: >-
+    az codespace show --plan
+                      [--id]
+                      [--name]
+                      [--resource-group]
+  examples:
+  - summary: Show details of a Codespace given name
+    syntax: az codespace show -g my-rg --plan my-plan --name my-codespace
+  - summary: Show details of a Codespace given id
+    syntax: az codespace show -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Show details of a Codespace given plan id and Codespace name
+    syntax: az codespace show --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_show-config
+  name: az codespace show-config
+  summary: Show current configuration for codespace commands.
+  description: ''
+  syntax: az codespace show-config
+- uid: az_codespace_suspend
+  name: az codespace suspend
+  summary: Suspend a Codespace.
+  description: ''
+  syntax: >-
+    az codespace suspend --plan
+                         [--id]
+                         [--name]
+                         [--resource-group]
+  examples:
+  - summary: Suspend a Codespace given name
+    syntax: az codespace suspend -g my-rg --plan my-plan --name my-codespace
+  - summary: Suspend a Codespace given id
+    syntax: az codespace suspend -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Suspend a Codespace given plan id and Codespace name
+    syntax: az codespace suspend --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_update
+  name: az codespace update
+  summary: Update a Codespace.
+  description: ''
+  syntax: >-
+    az codespace update --plan
+                        [--id]
+                        [--instance-type]
+                        [--name]
+                        [--resource-group]
+                        [--suspend-after {120, 30, 5, 60}]
+  examples:
+  - summary: Update a Codespace with a different instance type
+    syntax: az codespace update -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux
+  - summary: Update a Codespace with a different suspend after
+    syntax: az codespace update -g my-rg --plan my-plan --name my-codespace --suspend-after 30
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --instance-type
+    summary: Instance Type.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Automatically suspend the inactive Codespace after this many minutes.
+    description: ''
+commands:
+- az_codespace_create
+- az_codespace_delete
+- az_codespace_list
+- az_codespace_location
+- az_codespace_location_list
+- az_codespace_location_show
+- az_codespace_open
+- az_codespace_plan
+- az_codespace_plan_create
+- az_codespace_plan_delete
+- az_codespace_plan_list
+- az_codespace_plan_show
+- az_codespace_resume
+- az_codespace_secret
+- az_codespace_secret_create
+- az_codespace_secret_delete
+- az_codespace_secret_list
+- az_codespace_secret_update
+- az_codespace_set-config
+- az_codespace_show
+- az_codespace_show-config
+- az_codespace_suspend
+- az_codespace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Visual Studio Codespaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/codespace/location.yml b/2018-03-01-hybrid/docs-ref-autogen/codespace/location.yml
new file mode 100644
index 0000000000..86d607998a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/codespace/location.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_location
+name: az codespace location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Information on available regions.
+description: ''
+directCommands:
+- uid: az_codespace_location_list
+  name: az codespace location list
+  summary: List available regions.
+  description: ''
+  syntax: az codespace location list
+- uid: az_codespace_location_show
+  name: az codespace location show
+  summary: Show details of a region.
+  description: ''
+  syntax: az codespace location show --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the region.
+    description: ''
+commands:
+- az_codespace_location_list
+- az_codespace_location_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Information on available regions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/codespace/plan.yml b/2018-03-01-hybrid/docs-ref-autogen/codespace/plan.yml
new file mode 100644
index 0000000000..f43310d8cf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/codespace/plan.yml
@@ -0,0 +1,140 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_plan
+name: az codespace plan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace plan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Codespace plans.
+description: ''
+directCommands:
+- uid: az_codespace_plan_create
+  name: az codespace plan create
+  summary: Create a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan create --name
+                             --resource-group
+                             [--default-instance-type]
+                             [--default-suspend-after {120, 30, 5, 60}]
+                             [--location]
+                             [--subnet]
+                             [--tags]
+  examples:
+  - summary: Create a plan in same region as resource group
+    syntax: az codespace plan create -g my-rg -n my-plan
+  - summary: Create a plan in a specific region
+    syntax: az codespace plan create -g my-rg -n my-plan -l westus2
+  - summary: Create a plan with tags
+    syntax: az codespace plan create -g my-rg -n my-plan --tags tagname=tagvalue
+  - summary: Create a plan with a default instance type
+    syntax: az codespace plan create -g my-rg -n my-plan --default-instance-type premiumLinux
+  - summary: Create a plan with a default suspend after
+    syntax: az codespace plan create -g my-rg -n my-plan --default-suspend-after 120
+  - summary: Create a plan associated with a subnet
+    syntax: az codespace plan create -g my-rg -n my-plan --subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Network/virtualNetworks/my-vnet/subnets/default
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --default-instance-type
+    summary: Default Instance Type for Codespaces in this plan.
+    description: ''
+  - name: --default-suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Default minutes Codespaces in this plan should suspend after.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subnet
+    summary: Resource ID of an existing subnet. If specified, all Codespaces in this plan will be created in this subnet. The subnet must be in the same region as the plan.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_codespace_plan_delete
+  name: az codespace plan delete
+  summary: Delete a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan delete --name
+                             --resource-group
+                             [--yes]
+  examples:
+  - summary: Delete a plan
+    syntax: az codespace plan delete -g my-rg -n my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_plan_list
+  name: az codespace plan list
+  summary: List Codespace plans.
+  description: ''
+  syntax: az codespace plan list [--resource-group]
+  examples:
+  - summary: List plans
+    syntax: az codespace plan list
+  - summary: List plans in a given resource group
+    syntax: az codespace plan list -g my-rg
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_plan_show
+  name: az codespace plan show
+  summary: Show details of a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan show --name
+                           --resource-group
+  examples:
+  - summary: Show details of a plan
+    syntax: az codespace plan show -g my-rg -n my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_codespace_plan_create
+- az_codespace_plan_delete
+- az_codespace_plan_list
+- az_codespace_plan_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Codespace plans.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/codespace/secret.yml b/2018-03-01-hybrid/docs-ref-autogen/codespace/secret.yml
new file mode 100644
index 0000000000..38cc2c474a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/codespace/secret.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_secret
+name: az codespace secret
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace secret** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage plan secrets.
+description: ''
+directCommands:
+- uid: az_codespace_secret_create
+  name: az codespace secret create
+  summary: Create a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret create --name
+                               --plan
+                               --value
+                               [--filters]
+                               [--note]
+                               [--resource-group]
+  examples:
+  - summary: Create a plan secret.
+    syntax: az codespace secret create -g my-rg --plan my-plan --name API_KEY --value "secretkey" --note "service api key"
+  - summary: Create a plan secret with filters.
+    syntax: az codespace secret create -g my-rg --plan my-plan --name API_KEY --value "secretkey" --filters GitRepo=https://github.com/repo/name CodespaceName=mycodespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Value of the secret.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: 'Space-separated filters: type=value [type=value ...]. Use "" to clear existing filters. Allowed types: GitRepo, CodespaceName.'
+    description: ''
+  - name: --note
+    summary: Note for the secret.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_delete
+  name: az codespace secret delete
+  summary: Delete a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret delete --id
+                               --plan
+                               [--resource-group]
+  examples:
+  - summary: Delete a plan secret.
+    syntax: az codespace secret delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_list
+  name: az codespace secret list
+  summary: List plan secrets.
+  description: ''
+  syntax: >-
+    az codespace secret list --plan
+                             [--resource-group]
+  examples:
+  - summary: List plan secrets.
+    syntax: az codespace secret list -g my-rg --plan my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_update
+  name: az codespace secret update
+  summary: Update a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret update --id
+                               --plan
+                               [--filters]
+                               [--name]
+                               [--note]
+                               [--resource-group]
+                               [--value]
+  examples:
+  - summary: Update a plan secret with new values.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --name API_KEY --value "newsecretkey" --note "service api key"
+  - summary: Update a plan secret with new filters.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --filters GitRepo=https://github.com/repo/name CodespaceName=mycodespace
+  - summary: Update a plan secret and clear existing filters.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --filters ''
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: 'Space-separated filters: type=value [type=value ...]. Use "" to clear existing filters. Allowed types: GitRepo, CodespaceName.'
+    description: ''
+  - name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - name: --note
+    summary: Note for the secret.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --value
+    summary: Value of the secret.
+    description: ''
+commands:
+- az_codespace_secret_create
+- az_codespace_secret_delete
+- az_codespace_secret_list
+- az_codespace_secret_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage plan secrets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/communication.yml b/2018-03-01-hybrid/docs-ref-autogen/communication.yml
new file mode 100644
index 0000000000..3cd874ba3f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/communication.yml
@@ -0,0 +1,300 @@
+### YamlMime:AzureCLIGroup
+uid: az_communication
+name: az communication
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **communication** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az communication** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage communication service.
+description: ''
+directCommands:
+- uid: az_communication_create
+  name: az communication create
+  summary: Create a new Communication Service or update an existing Communication Service.
+  description: ''
+  syntax: >-
+    az communication create --name
+                            --resource-group
+                            [--data-location]
+                            [--location]
+                            [--no-wait]
+                            [--tags]
+  examples:
+  - summary: Create a Communication Service
+    syntax: az communication create --name "MyCommunicationResource" --location "Global" --data-location "United States" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-location
+    summary: The location where the communication service stores its data at rest.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_communication_delete
+  name: az communication delete
+  summary: Operation to delete a Communication Service.
+  description: ''
+  syntax: >-
+    az communication delete --name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: Delete a Communication Service
+    syntax: az communication delete --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_communication_link-notification-hub
+  name: az communication link-notification-hub
+  summary: Link an Azure Notification Hub to this communication.
+  description: ''
+  syntax: >-
+    az communication link-notification-hub --name
+                                           --resource-group
+                                           [--connection-string]
+                                           [--resource-id]
+  examples:
+  - summary: Link a Communication Service to a existing notification hub
+    syntax: az communication link-notification-hub --name "MyCommunicationResource" --connection-string "Endpoint=sb://MyNamespace.servicebus.windows.net/;SharedAccessKey=abcd1234" --resource-id "/subscriptions/12345/resourceGroups/MyOtherResourceGroup/providers/Microsoft.NotificationHubs/namespaces/MyNamespace/notificationHubs/MyHub" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --connection-string
+    summary: Connection string for the notification hub.
+    description: ''
+  - name: --resource-id
+    summary: The resource ID of the notification hub.
+    description: ''
+- uid: az_communication_list
+  name: az communication list
+  summary: List all resources in a subscription or a resource group.
+  description: ''
+  syntax: az communication list [--resource-group]
+  examples:
+  - summary: List by resource group
+    syntax: az communication list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_list-key
+  name: az communication list-key
+  summary: Get the access keys of the Communication Service resource.
+  description: ''
+  syntax: >-
+    az communication list-key --name
+                              --resource-group
+  examples:
+  - summary: List access keys of a Communication Service
+    syntax: az communication list-key --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_regenerate-key
+  name: az communication regenerate-key
+  summary: Regenerate Communication Service access key. PrimaryKey and SecondaryKey cannot be regenerated at the same time.
+  description: ''
+  syntax: >-
+    az communication regenerate-key --name
+                                    --resource-group
+                                    [--key-type {Primary, Secondary}]
+  examples:
+  - summary: Regenerate primary access keys of a Communication Service
+    syntax: az communication regenerate-key --name "MyCommunicationResource" --key-type "Primary" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-type
+    parameterValueGroup: Primary, Secondary
+    summary: The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive).
+    description: ''
+- uid: az_communication_show
+  name: az communication show
+  summary: Get the Communication Service and its properties.
+  description: ''
+  syntax: >-
+    az communication show --name
+                          --resource-group
+  examples:
+  - summary: Get the detail of a Communication Service
+    syntax: az communication show --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_show-status
+  name: az communication show-status
+  summary: Get the current status of an async operation.
+  description: ''
+  syntax: >-
+    az communication show-status --location
+                                 --operation-id
+  examples:
+  - summary: Get the current status of a specific operation
+    syntax: az communication show-status --operation-id "db5f291f-284d-46e9-9152-d5c83f7c14b8" --location "westus2"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The ID of an ongoing async operation.
+    description: ''
+- uid: az_communication_update
+  name: az communication update
+  summary: Operation to update an existing Communication Service.
+  description: ''
+  syntax: >-
+    az communication update --name
+                            --resource-group
+                            [--tags]
+  examples:
+  - summary: Update a Communication Service
+    syntax: az communication update --name "MyCommunicationResource" --tags newTag="newVal" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_communication_wait
+  name: az communication wait
+  summary: Place the CLI in a waiting state until a condition of the communication is met.
+  description: ''
+  syntax: >-
+    az communication wait --name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the communication is successfully created.
+    syntax: az communication wait --name "MyCommunicationResource" --resource-group "MyResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the communication is successfully deleted.
+    syntax: az communication wait --name "MyCommunicationResource" --resource-group "MyResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_communication_create
+- az_communication_delete
+- az_communication_link-notification-hub
+- az_communication_list
+- az_communication_list-key
+- az_communication_regenerate-key
+- az_communication_show
+- az_communication_show-status
+- az_communication_update
+- az_communication_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage communication service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/config.yml b/2018-03-01-hybrid/docs-ref-autogen/config.yml
new file mode 100644
index 0000000000..7da352b168
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/config.yml
@@ -0,0 +1,108 @@
+### YamlMime:AzureCLIGroup
+uid: az_config
+name: az config
+summary: Manage Azure CLI configuration.
+description: Available since Azure CLI 2.10.0.
+directCommands:
+- uid: az_config_get
+  name: az config get
+  summary: Get a configuration.
+  description: ''
+  syntax: >-
+    az config get [--local]
+                  [<KEY>]
+  examples:
+  - summary: Get all configurations.
+    syntax: az config get
+  - summary: Get configurations in `core` section.
+    syntax: az config get core
+  - summary: Get the configuration of key `core.no_color`.
+    syntax: az config get core.no_color
+  optionalParameters:
+  - name: --local
+    summary: Include local configuration. Scan from the working directory up to the root drive, then the global configuration and return the first occurrence.
+    description: ''
+  - name: <KEY>
+    summary: The configuration to get. If not provided, all sections and configurations will be listed. If `section` is provided, all configurations under the specified section will be listed. If `<section>.<key>` is provided, only the corresponding configuration is shown.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_set
+  name: az config set
+  summary: Set a configuration.
+  description: >-
+    For available configuration options, see https://docs.microsoft.com/cli/azure/azure-cli-configuration.
+
+    By default without specifying --local, the configuration will be saved to `~/.azure/config`.
+  syntax: >-
+    az config set [--local]
+                  [<KEY_VALUE>]
+  examples:
+  - summary: Disable color with `core.no_color`.
+    syntax: az config set core.no_color=true
+  - summary: Hide warnings and only show errors with `core.only_show_errors`.
+    syntax: az config set core.only_show_errors=true
+  - summary: Turn on client-side telemetry.
+    syntax: az config set core.collect_telemetry=true
+  - summary: Turn on file logging and set its location.
+    syntax: >-
+      az config set logging.enable_log_file=true
+
+      az config set logging.log_dir=~/az-logs
+  - summary: Set the default location to `westus2` and default resource group to `myRG`.
+    syntax: az config set defaults.location=westus2 defaults.group=MyResourceGroup
+  - summary: Set the default resource group to `myRG` on a local scope.
+    syntax: az config set defaults.group=myRG --local
+  optionalParameters:
+  - name: --local
+    summary: Set as a local configuration in the working directory.
+    description: ''
+  - name: <KEY_VALUE>
+    summary: Space-separated configurations in the form of <section>.<key>=<value>.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_unset
+  name: az config unset
+  summary: Unset a configuration.
+  description: ''
+  syntax: >-
+    az config unset [--local]
+                    [<KEY>]
+  examples:
+  - summary: Unset the configuration of key `core.no_color`.
+    syntax: az config unset core.no_color
+  optionalParameters:
+  - name: --local
+    summary: Include local configuration. Scan from the working directory up to the root drive, then the global configuration and unset the first occurrence.
+    description: ''
+  - name: <KEY>
+    summary: The configuration to unset, in the form of <section>.<key>.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+commands:
+- az_config_get
+- az_config_param-persist
+- az_config_param-persist_delete
+- az_config_param-persist_off
+- az_config_param-persist_on
+- az_config_param-persist_show
+- az_config_set
+- az_config_unset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 03/17/2021
+  description: Available since Azure CLI 2.10.0.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/config/param-persist.yml b/2018-03-01-hybrid/docs-ref-autogen/config/param-persist.yml
new file mode 100644
index 0000000000..55ecd5fcbc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/config/param-persist.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_config_param-persist
+name: az config param-persist
+summary: Manage parameter persistence.
+description: ''
+directCommands:
+- uid: az_config_param-persist_delete
+  name: az config param-persist delete
+  summary: Delete parameter persistence data.
+  description: ''
+  syntax: >-
+    az config param-persist delete [--all]
+                                   [--purge]
+                                   [--recursive]
+                                   [--yes]
+                                   [<NAME>]
+  examples:
+  - summary: Delete resource_group_name from parameter persistence
+    syntax: az config param-persist delete resource_group_name
+  - summary: Clear all parameter persistence data
+    syntax: az config param-persist delete --all
+  - summary: Delete parameter persistence file
+    syntax: az config param-persist delete --all --purge
+  - summary: Delete parameter persistence file recursively
+    syntax: az config param-persist delete --all --purge --recursive
+  optionalParameters:
+  - name: --all
+    summary: Clear all parameter persistence data. Either positional name argument  or --all can be specified.
+    description: ''
+  - name: --purge
+    summary: Delete parameter persistence file from working directory. Only available when --all is specified.
+    description: ''
+  - name: --recursive
+    summary: Indicate this is recursive delete of parameter persistence. Only available when --all is specified.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Only available when --all is specified.
+    description: ''
+  - name: <NAME>
+    summary: Space-separated list of parameter persistence names. Either positional name argument or --all can be specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_off
+  name: az config param-persist off
+  summary: Turn off parameter persistence.
+  description: ''
+  syntax: az config param-persist off
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_on
+  name: az config param-persist on
+  summary: Turn on parameter persistence.
+  description: ''
+  syntax: az config param-persist on
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_show
+  name: az config param-persist show
+  summary: Show parameter persistence data.
+  description: ''
+  syntax: >-
+    az config param-persist show [--query-examples]
+                                 [<NAME>]
+  examples:
+  - summary: Show all parameter persistence value
+    syntax: az config param-persist show
+  - summary: Show resource_group_name parameter persistence value
+    syntax: az config param-persist show resource_group_name
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: <NAME>
+    summary: Space-separated list of parameter persistence names.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+commands:
+- az_config_param-persist_delete
+- az_config_param-persist_off
+- az_config_param-persist_on
+- az_config_param-persist_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 03/17/2021
+  description: Manage parameter persistence.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/confluent.yml b/2018-03-01-hybrid/docs-ref-autogen/confluent.yml
new file mode 100644
index 0000000000..708b242a84
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/confluent.yml
@@ -0,0 +1,36 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent
+name: az confluent
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage confluent resources.
+description: ''
+commands:
+- az_confluent_organization
+- az_confluent_organization_create
+- az_confluent_organization_delete
+- az_confluent_organization_list
+- az_confluent_organization_show
+- az_confluent_organization_update
+- az_confluent_organization_wait
+- az_confluent_terms
+- az_confluent_terms_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage confluent resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/confluent/organization.yml b/2018-03-01-hybrid/docs-ref-autogen/confluent/organization.yml
new file mode 100644
index 0000000000..08e6689dd4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/confluent/organization.yml
@@ -0,0 +1,237 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent_organization
+name: az confluent organization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent organization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage organization with confluent.
+description: ''
+directCommands:
+- uid: az_confluent_organization_create
+  name: az confluent organization create
+  summary: Create Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization create --name
+                                     --resource-group
+                                     [--location]
+                                     [--no-wait]
+                                     [--offer-detail]
+                                     [--tags]
+                                     [--user-detail]
+  examples:
+  - summary: Organization_Create
+    syntax: az confluent organization create --location "West US" --offer-detail id="string" plan-id="string" plan-name="string" publisher-id="string" term-unit="string" --user-detail email-address="contoso@microsoft.com" first-name="string" last-name="string" --tags Environment="Dev" --name "myOrganization" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offer-detail
+    summary: Confluent offer detail.
+    description: >-
+      Usage: --offer-detail publisher-id=XX id=XX plan-id=XX plan-name=XX term-unit=XX status=XX
+
+
+      publisher-id: Publisher Id
+
+      id: Offer Id
+
+      plan-id: Offer Plan Id
+
+      plan-name: Offer Plan Name
+
+      term-unit: Offer Plan Term unit
+
+      status: SaaS Offer Status.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --user-detail
+    summary: Subscriber detail.
+    description: >-
+      Usage: --user-detail first-name=XX last-name=XX email-address=XX
+
+
+      first-name: First name
+
+      last-name: Last name
+
+      email-address: Email address.
+- uid: az_confluent_organization_delete
+  name: az confluent organization delete
+  summary: Delete Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization delete --name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete organization
+    syntax: az confluent organization delete --name "myOrganization" --resource-group "myResourceGroup"
+  - summary: Delete organization using IDs
+    syntax: az confluent organization delete --ids "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Confluent/organizations/{myOrganization}"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_confluent_organization_list
+  name: az confluent organization list
+  summary: List all Organizations under the specified resource group. And List all organizations under the specified subscription.
+  description: ''
+  syntax: az confluent organization list [--resource-group]
+  examples:
+  - summary: Organization_ListByResourceGroup
+    syntax: az confluent organization list --resource-group "myResourceGroup"
+  - summary: Organization_ListBySubscription
+    syntax: az confluent organization list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_confluent_organization_show
+  name: az confluent organization show
+  summary: Get the properties of a specific Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization show --name
+                                   --resource-group
+  examples:
+  - summary: Show organization
+    syntax: az confluent organization show --name "myOrganization" --resource-group "myResourceGroup"
+  - summary: Show organization using IDs
+    syntax: az confluent organization show --ids "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Confluent/organizations/{myOrganization}"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_confluent_organization_update
+  name: az confluent organization update
+  summary: Update Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization update --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: Confluent_Update
+    syntax: az confluent organization update --tags client="dev-client" env="dev" --name "myOrganization" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_confluent_organization_wait
+  name: az confluent organization wait
+  summary: Place the CLI in a waiting state until a condition of the confluent organization is met.
+  description: ''
+  syntax: >-
+    az confluent organization wait --name
+                                   --resource-group
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the confluent organization is successfully created.
+    syntax: az confluent organization wait --name "myOrganization" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the confluent organization is successfully deleted.
+    syntax: az confluent organization wait --name "myOrganization" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_confluent_organization_create
+- az_confluent_organization_delete
+- az_confluent_organization_list
+- az_confluent_organization_show
+- az_confluent_organization_update
+- az_confluent_organization_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage organization with confluent.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/confluent/terms.yml b/2018-03-01-hybrid/docs-ref-autogen/confluent/terms.yml
new file mode 100644
index 0000000000..377fb60bc6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/confluent/terms.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent_terms
+name: az confluent terms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent terms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage marketplace agreement with confluent.
+description: ''
+directCommands:
+- uid: az_confluent_terms_list
+  name: az confluent terms list
+  summary: List Confluent marketplace agreements in the subscription.
+  description: ''
+  syntax: az confluent terms list
+  examples:
+  - summary: MarketplaceAgreements_List
+    syntax: az confluent terms list
+commands:
+- az_confluent_terms_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage marketplace agreement with confluent.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/connectedk8s.yml b/2018-03-01-hybrid/docs-ref-autogen/connectedk8s.yml
new file mode 100644
index 0000000000..d473ecab4c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/connectedk8s.yml
@@ -0,0 +1,423 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedk8s
+name: az connectedk8s
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedk8s** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az connectedk8s** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage connected kubernetes clusters.
+description: ''
+directCommands:
+- uid: az_connectedk8s_connect
+  name: az connectedk8s connect
+  summary: Onboard a connected kubernetes cluster to azure.
+  description: ''
+  syntax: >-
+    az connectedk8s connect --name
+                            --resource-group
+                            [--custom-locations-oid]
+                            [--disable-auto-upgrade]
+                            [--distribution {aks, aks_engine, aks_management, aks_workload, auto, capz, eks, generic, gke, k3s, kind, minikube, openshift, rancher_rke, tkg}]
+                            [--infrastructure {auto, aws, azure, azure_stack_edge, azure_stack_hci, azure_stack_hub, gcp, generic, vsphere, windows_server}]
+                            [--kube-config]
+                            [--kube-context]
+                            [--location]
+                            [--no-wait]
+                            [--proxy-cert]
+                            [--proxy-http]
+                            [--proxy-https]
+                            [--proxy-skip-range]
+                            [--tags]
+  examples:
+  - summary: Onboard a connected kubernetes cluster with default kube config and kube context.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName
+  - summary: Onboard a connected kubernetes cluster with default kube config and kube context and disabling auto upgrade of arc agents.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --disable-auto-upgrade
+  - summary: Onboard a connected kubernetes cluster by specifying the kubeconfig and kubecontext.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
+  - summary: Onboard a connected kubernetes cluster by specifying the https proxy, http proxy, no proxy settings.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  - summary: Onboard a connected kubernetes cluster by specifying the https proxy, http proxy, no proxy  with cert settings.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --proxy-cert /path/to/crt --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-locations-oid
+    summary: OID of 'custom-locations' app.
+    description: ''
+  - name: --disable-auto-upgrade
+    summary: Flag to disable auto upgrade of arc agents.
+    description: ''
+  - name: --distribution
+    defaultValue: auto
+    parameterValueGroup: aks, aks_engine, aks_management, aks_workload, auto, capz, eks, generic, gke, k3s, kind, minikube, openshift, rancher_rke, tkg
+    summary: The Kubernetes distribution which will be running on this connected cluster.
+    description: ''
+  - name: --infrastructure
+    defaultValue: auto
+    parameterValueGroup: auto, aws, azure, azure_stack_edge, azure_stack_hci, azure_stack_hub, gcp, generic, vsphere, windows_server
+    summary: The infrastructure on which the Kubernetes cluster represented by this connected cluster will be running on.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --proxy-cert
+    summary: Path to the certificate file for proxy.
+    description: ''
+  - name: --proxy-http
+    summary: Http proxy URL to be used.
+    description: ''
+  - name: --proxy-https
+    summary: Https proxy URL to be used.
+    description: ''
+  - name: --proxy-skip-range
+    summary: List of URLs/CIDRs for which proxy should not to be used.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_connectedk8s_delete
+  name: az connectedk8s delete
+  summary: Delete a connected kubernetes cluster along with connected cluster agents.
+  description: ''
+  syntax: >-
+    az connectedk8s delete --name
+                           --resource-group
+                           [--kube-config]
+                           [--kube-context]
+                           [--no-wait]
+                           [--yes]
+  examples:
+  - summary: Delete a connected kubernetes cluster and connected cluster agents with default kubeconfig and kubecontext.
+    syntax: az connectedk8s delete -g resourceGroupName -n connectedClusterName
+  - summary: Delete a connected kubernetes cluster by specifying the kubeconfig and kubecontext for connected cluster agents deletion.
+    syntax: az connectedk8s delete -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedk8s_disable-features
+  name: az connectedk8s disable-features
+  summary: Disables the selective features on the connected cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s disable-features --features {azure-rbac, cluster-connect, custom-locations}
+                                     --name
+                                     --resource-group
+                                     [--kube-config]
+                                     [--kube-context]
+                                     [--yes]
+  examples:
+  - summary: Disables the azure-rbac feature.
+    syntax: az connectedk8s disable-features -n clusterName -g resourceGroupName --features azure-rbac
+  - summary: Disable multiple features.
+    syntax: az connectedk8s disable-features -n clusterName -g resourceGroupName --features custom-locations azure-rbac
+  requiredParameters:
+  - isRequired: true
+    name: --features
+    parameterValueGroup: azure-rbac, cluster-connect, custom-locations
+    summary: Space-separated list of features you want to disable.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedk8s_enable-features
+  name: az connectedk8s enable-features
+  summary: Enables the selective features on the connected cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s enable-features --features {azure-rbac, cluster-connect, custom-locations}
+                                    --name
+                                    --resource-group
+                                    [--app-id]
+                                    [--app-secret]
+                                    [--custom-locations-oid]
+                                    [--kube-config]
+                                    [--kube-context]
+                                    [--skip-azure-rbac-list]
+  examples:
+  - summary: Enables the Cluster-Connect feature.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features cluster-connect
+  - summary: Enable Azure RBAC feature.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features azure-rbac --app-id appID --app-secret="appSecret" --skip-azure-rbac-list "user1@domain.com,spn_oid"
+  - summary: Enable multiple features.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features cluster-connect custom-locations
+  requiredParameters:
+  - isRequired: true
+    name: --features
+    parameterValueGroup: azure-rbac, cluster-connect, custom-locations
+    summary: Space-separated list of features you want to enable.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-id
+    summary: Application ID for enabling Azure RBAC. Specify when enabling azure-rbac.
+    description: ''
+  - name: --app-secret
+    summary: Application secret for enabling Azure RBAC. Specify when enabling azure-rbac.
+    description: ''
+  - name: --custom-locations-oid
+    summary: OID of 'custom-locations' app.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --skip-azure-rbac-list
+    summary: Comma separated list of names of usernames/email/oid. Azure RBAC will be skipped for these users. Specify when enabling azure-rbac.
+    description: ''
+- uid: az_connectedk8s_list
+  name: az connectedk8s list
+  summary: List connected kubernetes clusters.
+  description: ''
+  syntax: az connectedk8s list [--resource-group]
+  examples:
+  - summary: List all connected kubernetes clusters in a resource group.
+    syntax: az connectedk8s list -g resourceGroupName --subscription subscriptionName
+  - summary: List all connected kubernetes clusters in a subscription.
+    syntax: az connectedk8s list --subscription subscriptionName
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedk8s_proxy
+  name: az connectedk8s proxy
+  summary: Get access to a connected kubernetes cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s proxy --name
+                          --resource-group
+                          [--file]
+                          [--kube-context]
+                          [--port]
+                          [--token]
+  examples:
+  - summary: Get access to a connected kubernetes cluster.
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName
+  - summary: Get access to a connected kubernetes cluster with custom port
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --port portValue
+  - summary: Get access to a connected kubernetes cluster with service account token
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --token tokenValue
+  - summary: Get access to a connected kubernetes cluster by specifying custom kubeconfig location
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName -f path/to/kubeconfig
+  - summary: Get access to a connected kubernetes cluster by specifying custom context
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --kube-context contextName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    defaultValue: ~/.kube/config
+    summary: Kubernetes configuration file to update. If not provided, updates the file '~/.kube/config'. Use '-' to print YAML to stdout instead.
+    description: ''
+  - name: --kube-context
+    summary: If specified, overwrite the default context name.
+    description: ''
+  - name: --port
+    defaultValue: "47011"
+    summary: Port used for accessing connected cluster.
+    description: ''
+  - name: --token
+    summary: Service account token to use to authenticate to the kubernetes cluster.
+    description: ''
+- uid: az_connectedk8s_show
+  name: az connectedk8s show
+  summary: Show details of a connected kubernetes cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s show --name
+                         --resource-group
+  examples:
+  - summary: Show the details for a connected kubernetes cluster
+    syntax: az connectedk8s show -g resourceGroupName -n connectedClusterName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedk8s_update
+  name: az connectedk8s update
+  summary: Update properties of the onboarded agents.
+  description: ''
+  syntax: >-
+    az connectedk8s update --name
+                           --resource-group
+                           [--auto-upgrade {false, true}]
+                           [--disable-proxy]
+                           [--kube-config]
+                           [--kube-context]
+                           [--proxy-cert]
+                           [--proxy-http]
+                           [--proxy-https]
+                           [--proxy-skip-range]
+  examples:
+  - summary: Update proxy values for the agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName  --proxy-cert /path/to/crt --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  - summary: Disable proxy settings for agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName --disable-proxy
+  - summary: Disable auto-upgrade of agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName --auto-upgrade false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade
+    parameterValueGroup: false, true
+    summary: Flag to enable/disable auto upgrade of arc agents. By default, auto upgrade of agents is enabled.
+    description: ''
+  - name: --disable-proxy
+    summary: Disables proxy settings for agents.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --proxy-cert
+    summary: Path to the certificate file for proxy.
+    description: ''
+  - name: --proxy-http
+    summary: Http proxy URL to be used.
+    description: ''
+  - name: --proxy-https
+    summary: Https proxy URL to be used.
+    description: ''
+  - name: --proxy-skip-range
+    summary: List of URLs/CIDRs for which proxy should not to be used.
+    description: ''
+- uid: az_connectedk8s_upgrade
+  name: az connectedk8s upgrade
+  summary: Atomically upgrade onboarded agents to the specific version or default to the latest version.
+  description: ''
+  syntax: >-
+    az connectedk8s upgrade --name
+                            --resource-group
+                            [--agent-version]
+                            [--kube-config]
+                            [--kube-context]
+  examples:
+  - summary: Upgrade the agents to the latest version
+    syntax: az connectedk8s upgrade -g resourceGroupName -n connectedClusterName
+  - summary: Upgrade the agents to a specific version
+    syntax: az connectedk8s upgrade -g resourceGroupName -n connectedClusterName --agent-version 0.2.62
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent-version
+    summary: Version of agent to update the helm charts to.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+commands:
+- az_connectedk8s_connect
+- az_connectedk8s_delete
+- az_connectedk8s_disable-features
+- az_connectedk8s_enable-features
+- az_connectedk8s_list
+- az_connectedk8s_proxy
+- az_connectedk8s_show
+- az_connectedk8s_update
+- az_connectedk8s_upgrade
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage connected kubernetes clusters.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/connectedmachine.yml b/2018-03-01-hybrid/docs-ref-autogen/connectedmachine.yml
new file mode 100644
index 0000000000..b6cb9c1f2b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/connectedmachine.yml
@@ -0,0 +1,93 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedmachine
+name: az connectedmachine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedmachine** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az connectedmachine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Connectedmachine.
+description: ''
+directCommands:
+- uid: az_connectedmachine_delete
+  name: az connectedmachine delete
+  summary: The operation to remove a hybrid machine identity in Azure.
+  description: ''
+  syntax: >-
+    az connectedmachine delete --machine-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Machine
+    syntax: az connectedmachine delete --name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: The name of the hybrid machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedmachine_list
+  name: az connectedmachine list
+  summary: Lists all the hybrid machines in the specified subscription.
+  description: ''
+  syntax: az connectedmachine list [--resource-group]
+  examples:
+  - summary: List Machines by resource group
+    syntax: az connectedmachine list --resource-group "myResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedmachine_show
+  name: az connectedmachine show
+  summary: Retrieves information about the model view or the instance view of a hybrid machine.
+  description: ''
+  syntax: >-
+    az connectedmachine show --machine-name
+                             --resource-group
+  examples:
+  - summary: Get Machine
+    syntax: az connectedmachine show --name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: The name of the hybrid machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_connectedmachine_delete
+- az_connectedmachine_extension
+- az_connectedmachine_extension_create
+- az_connectedmachine_extension_delete
+- az_connectedmachine_extension_list
+- az_connectedmachine_extension_show
+- az_connectedmachine_extension_update
+- az_connectedmachine_extension_wait
+- az_connectedmachine_list
+- az_connectedmachine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Connectedmachine.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/connectedmachine/extension.yml b/2018-03-01-hybrid/docs-ref-autogen/connectedmachine/extension.yml
new file mode 100644
index 0000000000..beaf30f43f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/connectedmachine/extension.yml
@@ -0,0 +1,303 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedmachine_extension
+name: az connectedmachine extension
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedmachine** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az connectedmachine extension** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Connectedmachine extension.
+description: ''
+directCommands:
+- uid: az_connectedmachine_extension_create
+  name: az connectedmachine extension create
+  summary: The operation to create or update the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension create --extension-name
+                                         --location
+                                         --machine-name
+                                         --resource-group
+                                         [--auto-upgrade-minor {false, true}]
+                                         [--force-update-tag]
+                                         [--no-wait]
+                                         [--protected-settings]
+                                         [--publisher]
+                                         [--settings]
+                                         [--tags]
+                                         [--type]
+                                         [--type-handler-version]
+  examples:
+  - summary: Create a Machine Extension (PUT)
+    syntax: az connectedmachine extension create --machine-name "myMachine" --name "CustomScriptExtension" --location "eastus2euap" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\"commandToExecute\":\"powershell.exe -c \\\"Get-Process | Where-Object { $_.CPU -gt 10000 }\\\"\"}" --type-handler-version "1.10" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be created or updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade-minor
+    parameterValueGroup: false, true
+    summary: Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
+    description: ''
+  - name: --force-update-tag
+    summary: How the extension handler should be forced to update even if the extension configuration has not changed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protected-settings
+    summary: 'The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --publisher
+    summary: The name of the extension handler publisher.
+    description: ''
+  - name: --settings
+    summary: 'Json formatted public settings for the extension. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: Specifies the type of the extension; an example is "CustomScriptExtension".
+    description: ''
+  - name: --type-handler-version
+    summary: Specifies the version of the script handler.
+    description: ''
+- uid: az_connectedmachine_extension_delete
+  name: az connectedmachine extension delete
+  summary: The operation to delete the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension delete --extension-name
+                                         --machine-name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete a Machine Extension
+    syntax: az connectedmachine extension delete --machine-name "myMachine" --name "MMA" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be deleted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedmachine_extension_list
+  name: az connectedmachine extension list
+  summary: The operation to get all extensions of a non-Azure machine.
+  description: ''
+  syntax: >-
+    az connectedmachine extension list --machine-name
+                                       --resource-group
+                                       [--expand]
+  examples:
+  - summary: Get all Machine Extensions
+    syntax: az connectedmachine extension list --machine-name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The expand expression to apply on the operation.
+    description: ''
+- uid: az_connectedmachine_extension_show
+  name: az connectedmachine extension show
+  summary: The operation to get the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension show --extension-name
+                                       --machine-name
+                                       --resource-group
+  examples:
+  - summary: Get Machine Extension
+    syntax: az connectedmachine extension show --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedmachine_extension_update
+  name: az connectedmachine extension update
+  summary: The operation to update the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension update --extension-name
+                                         --machine-name
+                                         --resource-group
+                                         [--auto-upgrade-minor {false, true}]
+                                         [--force-update-tag]
+                                         [--no-wait]
+                                         [--protected-settings]
+                                         [--publisher]
+                                         [--settings]
+                                         [--tags]
+                                         [--type]
+                                         [--type-handler-version]
+  examples:
+  - summary: Update a Machine Extension (PATCH)
+    syntax: az connectedmachine extension update --machine-name "myMachine" --name "CustomScriptExtension" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\"commandToExecute\":\"powershell.exe -c \\\"Get-Process | Where-Object { $_.CPU -lt 100 }\\\"\"}" --type-handler-version "1.10" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be created or updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade-minor
+    parameterValueGroup: false, true
+    summary: Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
+    description: ''
+  - name: --force-update-tag
+    summary: How the extension handler should be forced to update even if the extension configuration has not changed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protected-settings
+    summary: 'The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --publisher
+    summary: The name of the extension handler publisher.
+    description: ''
+  - name: --settings
+    summary: 'Json formatted public settings for the extension. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: Specifies the type of the extension; an example is "CustomScriptExtension".
+    description: ''
+  - name: --type-handler-version
+    summary: Specifies the version of the script handler.
+    description: ''
+- uid: az_connectedmachine_extension_wait
+  name: az connectedmachine extension wait
+  summary: Place the CLI in a waiting state until a condition of the connectedmachine extension is met.
+  description: ''
+  syntax: >-
+    az connectedmachine extension wait --extension-name
+                                       --machine-name
+                                       --resource-group
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully created.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully updated.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully deleted.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_connectedmachine_extension_create
+- az_connectedmachine_extension_delete
+- az_connectedmachine_extension_list
+- az_connectedmachine_extension_show
+- az_connectedmachine_extension_update
+- az_connectedmachine_extension_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Connectedmachine extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/container.yml b/2018-03-01-hybrid/docs-ref-autogen/container.yml
new file mode 100644
index 0000000000..f2c7fa37eb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/container.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_container
+name: az container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Container Instances.
+description: ''
+commands:
+- az_container_app
+- az_container_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Container Instances.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/container/app.yml b/2018-03-01-hybrid/docs-ref-autogen/container/app.yml
new file mode 100644
index 0000000000..44cfc75479
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/container/app.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_container_app
+name: az container app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az container app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to Manage Azure Container Instances App.
+description: ''
+directCommands:
+- uid: az_container_app_up
+  name: az container app up
+  summary: Deploy to Azure Container Instances using GitHub Actions.
+  description: ''
+  syntax: >-
+    az container app up [--acr]
+                        [--branch-name]
+                        [--do-not-wait]
+                        [--port]
+                        [--repository]
+  optionalParameters:
+  - name: --acr
+    summary: Name of the Azure Container Registry to be used for pushing the image.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --port
+    summary: Port on which your application runs. Default is 8080.
+    description: ''
+  - name: --repository
+    summary: GitHub Repository URL e.g. https://github.com/contoso/webapp.
+    description: ''
+commands:
+- az_container_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to Manage Azure Container Instances App.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb.yml
new file mode 100644
index 0000000000..5a16ea2bf0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb.yml
@@ -0,0 +1,378 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb
+name: az cosmosdb
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Cosmos DB database accounts.
+description: ''
+directCommands:
+- uid: az_cosmosdb_create
+  name: az cosmosdb create
+  summary: Create a new Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb create --name
+                       --resource-group
+                       [--backup-interval]
+                       [--backup-policy-type {Continuous, Periodic}]
+                       [--backup-retention]
+                       [--capabilities]
+                       [--databases-to-restore]
+                       [--default-consistency-level {BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong}]
+                       [--disable-key-based-metadata-write-access {false, true}]
+                       [--enable-analytical-storage {false, true}]
+                       [--enable-automatic-failover {false, true}]
+                       [--enable-free-tier {false, true}]
+                       [--enable-multiple-write-locations {false, true}]
+                       [--enable-public-network {false, true}]
+                       [--enable-virtual-network {false, true}]
+                       [--ip-range-filter]
+                       [--is-restore-request {false, true}]
+                       [--key-uri]
+                       [--kind {GlobalDocumentDB, MongoDB, Parse}]
+                       [--locations]
+                       [--max-interval]
+                       [--max-staleness-prefix]
+                       [--restore-source]
+                       [--restore-timestamp]
+                       [--server-version {3.2, 3.6, 4.0}]
+                       [--tags]
+                       [--virtual-network-rules]
+  examples:
+  - summary: Create a new Azure Cosmos DB database account.
+    syntax: az cosmosdb create --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup --subscription MySubscription
+  - summary: Create a new Azure Cosmos DB database account with two regions. UK South is zone redundant.
+    syntax: az cosmosdb create -n myaccount -g mygroup --locations regionName=eastus failoverPriority=0 isZoneRedundant=False --locations regionName=uksouth failoverPriority=1 isZoneRedundant=True --enable-multiple-write-locations
+  - summary: Create a new Azure Cosmos DB database account by restoring from an existing account in the given location
+    syntax: az cosmosdb create -n restoredaccount -g mygroup --is-restore-request true --restore-source /subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d056a4f8-044a-436f-80c8-cd3edbc94c68 --restore-timestamp 2020-07-13T16:03:41+0000 --locations regionName=westus failoverPriority=0 isZoneRedundant=False
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-interval
+    summary: The frequency(in minutes) with which backups are taken (only for accounts with periodic mode backups).
+    description: ''
+  - name: --backup-policy-type
+    parameterValueGroup: Continuous, Periodic
+    summary: The type of backup policy of the account to create.
+    description: ''
+  - name: --backup-retention
+    summary: The time(in hours) for which each backup is retained (only for accounts with periodic mode backups).
+    description: ''
+  - name: --capabilities
+    summary: Set custom capabilities on the Cosmos DB database account.
+    description: ''
+  - name: --databases-to-restore
+    summary: Add a database and its collection names to restore.
+    description: 'Usage:          --databases-to-restore name=DatabaseName collections=collection1 [collection2 ...].'
+  - name: --default-consistency-level
+    parameterValueGroup: BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong
+    summary: Default consistency level of the Cosmos DB database account.
+    description: ''
+  - name: --disable-key-based-metadata-write-access
+    parameterValueGroup: false, true
+    summary: Disable write operations on metadata resources (databases, containers, throughput) via account keys.
+    description: ''
+  - name: --enable-analytical-storage
+    parameterValueGroup: false, true
+    summary: Flag to enable log storage on the account.
+    description: ''
+  - name: --enable-automatic-failover
+    parameterValueGroup: false, true
+    summary: Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.
+    description: ''
+  - name: --enable-free-tier
+    parameterValueGroup: false, true
+    summary: If enabled the account is free-tier.
+    description: ''
+  - name: --enable-multiple-write-locations
+    parameterValueGroup: false, true
+    summary: Enable Multiple Write Locations.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: Enable or disable public network access to server.
+    description: ''
+  - name: --enable-virtual-network
+    parameterValueGroup: false, true
+    summary: Enables virtual network on the Cosmos DB database account.
+    description: ''
+  - name: --ip-range-filter
+    summary: Firewall support. Specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma-separated and must not contain any spaces.
+    description: ''
+  - name: --is-restore-request -r
+    parameterValueGroup: false, true
+    summary: Restore from an existing/deleted account.
+    description: ''
+  - name: --key-uri
+    summary: The URI of the key vault.
+    description: ''
+  - name: --kind
+    defaultValue: GlobalDocumentDB
+    parameterValueGroup: GlobalDocumentDB, MongoDB, Parse
+    summary: The type of Cosmos DB database account to create.
+    description: ''
+  - name: --locations
+    summary: Add a location to the Cosmos DB database account.
+    description: >-
+      Usage:          --locations KEY=VALUE [KEY=VALUE ...]
+
+      Required Keys:  regionName, failoverPriority
+
+      Optional Key:   isZoneRedundant
+
+      Default:        single region account in the location of the specified resource group.
+
+      Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
+
+      Multiple locations can be specified by using more than one `--locations` argument.
+  - name: --max-interval
+    defaultValue: "5"
+    summary: When used with Bounded Staleness consistency, this value represents the time amount of staleness (in seconds) tolerated. Accepted range for this value is 1 - 100.
+    description: ''
+  - name: --max-staleness-prefix
+    defaultValue: "100"
+    summary: When used with Bounded Staleness consistency, this value represents the number of stale requests tolerated. Accepted range for this value is 1 - 2,147,483,647.
+    description: ''
+  - name: --restore-source
+    summary: The restorable-database-account Id of the source account from which the account has to be restored. Required if --is-restore-request is set to true.
+    description: ''
+  - name: --restore-timestamp
+    summary: The timestamp to which the account has to be restored to. Required if --is-restore-request is set to true.
+    description: ''
+  - name: --server-version
+    parameterValueGroup: 3.2, 3.6, 4.0
+    summary: Valid only for MongoDB accounts.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-network-rules
+    summary: ACL's for virtual network.
+    description: ''
+- uid: az_cosmosdb_list
+  name: az cosmosdb list
+  summary: List Azure Cosmos DB database accounts.
+  description: ''
+  syntax: az cosmosdb list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cosmosdb_restore
+  name: az cosmosdb restore
+  summary: Create a new Azure Cosmos DB database account by restoring from an existing database account.
+  description: ''
+  syntax: >-
+    az cosmosdb restore --account-name
+                        --location
+                        --resource-group
+                        --restore-timestamp
+                        --target-database-account-name
+                        [--databases-to-restore]
+  examples:
+  - summary: Create a new Azure Cosmos DB database account by restoring from an existing database account.
+    syntax: az cosmosdb restore --target-database-account-name MyRestoredCosmosDBDatabaseAccount --account-name MySourceAccount --restore-timestamp 2020-07-13T16:03:41+0000 -g MyResourceGroup --location westus
+  - summary: Create a new Azure Cosmos DB database account by restoring only the selected databases and collections from an existing database account.
+    syntax: az cosmosdb restore -g MyResourceGroup --target-database-account-name MyRestoredCosmosDBDatabaseAccount --account-name MySourceAccount --restore-timestamp 2020-07-13T16:03:41+0000 --location westus --databases-to-restore name=MyDB1 collections=collection1 collection2 --databases-to-restore name=MyDB2 collections=collection3 collection4
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: Name of the source Cosmos DB database account for the restore.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: The location of the source account from which restore is triggered. This will also be the write region of the restored account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp to which the account has to be restored to.
+    description: ''
+  - isRequired: true
+    name: --target-database-account-name -n
+    summary: Name of the new target Cosmos DB database account after the restore.
+    description: ''
+  optionalParameters:
+  - name: --databases-to-restore
+    summary: Add a database and its collection names to restore.
+    description: >-
+      Usage:          --databases-to-restore name=DatabaseName collections=collection1 [collection2 ...]
+
+      Multiple databases can be specified by using more than one `--databases-to-restore` argument.
+- uid: az_cosmosdb_show
+  name: az cosmosdb show
+  summary: Get the details of an Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb show --name
+                     --resource-group
+  examples:
+  - summary: Get the details of an Azure Cosmos DB database account. (autogenerated)
+    syntax: az cosmosdb show --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cosmosdb_update
+  name: az cosmosdb update
+  summary: Update an Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb update --name
+                       --resource-group
+                       [--backup-interval]
+                       [--backup-retention]
+                       [--capabilities]
+                       [--default-consistency-level {BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong}]
+                       [--disable-key-based-metadata-write-access {false, true}]
+                       [--enable-analytical-storage {false, true}]
+                       [--enable-automatic-failover {false, true}]
+                       [--enable-multiple-write-locations {false, true}]
+                       [--enable-public-network {false, true}]
+                       [--enable-virtual-network {false, true}]
+                       [--ip-range-filter]
+                       [--locations]
+                       [--max-interval]
+                       [--max-staleness-prefix]
+                       [--tags]
+                       [--virtual-network-rules]
+  examples:
+  - summary: Update an Azure Cosmos DB database account.
+    syntax: az cosmosdb update --capabilities EnableGremlin --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  - summary: Update an new Azure Cosmos DB database account with two regions. UK South is zone redundant.
+    syntax: az cosmosdb update -n myaccount -g mygroup --locations regionName=eastus failoverPriority=0 isZoneRedundant=False --locations regionName=uksouth failoverPriority=1 isZoneRedundant=True --enable-multiple-write-locations
+  - summary: Update the backup policy parameters of a database account with Periodic backup type.
+    syntax: az cosmosdb update -n myaccount -g mygroup --backup-interval 240 --backup-retention 24
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-interval
+    summary: The frequency(in minutes) with which backups are taken (only for accounts with periodic mode backups).
+    description: ''
+  - name: --backup-retention
+    summary: The time(in hours) for which each backup is retained (only for accounts with periodic mode backups).
+    description: ''
+  - name: --capabilities
+    summary: Set custom capabilities on the Cosmos DB database account.
+    description: ''
+  - name: --default-consistency-level
+    parameterValueGroup: BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong
+    summary: Default consistency level of the Cosmos DB database account.
+    description: ''
+  - name: --disable-key-based-metadata-write-access
+    parameterValueGroup: false, true
+    summary: Disable write operations on metadata resources (databases, containers, throughput) via account keys.
+    description: ''
+  - name: --enable-analytical-storage
+    parameterValueGroup: false, true
+    summary: Flag to enable log storage on the account.
+    description: ''
+  - name: --enable-automatic-failover
+    parameterValueGroup: false, true
+    summary: Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.
+    description: ''
+  - name: --enable-multiple-write-locations
+    parameterValueGroup: false, true
+    summary: Enable Multiple Write Locations.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: Enable or disable public network access to server.
+    description: ''
+  - name: --enable-virtual-network
+    parameterValueGroup: false, true
+    summary: Enables virtual network on the Cosmos DB database account.
+    description: ''
+  - name: --ip-range-filter
+    summary: Firewall support. Specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma-separated and must not contain any spaces.
+    description: ''
+  - name: --locations
+    summary: Add a location to the Cosmos DB database account.
+    description: >-
+      Usage:          --locations KEY=VALUE [KEY=VALUE ...]
+
+      Required Keys:  regionName, failoverPriority
+
+      Optional Key:   isZoneRedundant
+
+      Default:        single region account in the location of the specified resource group.
+
+      Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
+
+      Multiple locations can be specified by using more than one `--locations` argument.
+  - name: --max-interval
+    summary: When used with Bounded Staleness consistency, this value represents the time amount of staleness (in seconds) tolerated. Accepted range for this value is 1 - 100.
+    description: ''
+  - name: --max-staleness-prefix
+    summary: When used with Bounded Staleness consistency, this value represents the number of stale requests tolerated. Accepted range for this value is 1 - 2,147,483,647.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-network-rules
+    summary: ACL's for virtual network.
+    description: ''
+commands:
+- az_cosmosdb_create
+- az_cosmosdb_list
+- az_cosmosdb_mongodb
+- az_cosmosdb_mongodb_restorable-collection
+- az_cosmosdb_mongodb_restorable-collection_list
+- az_cosmosdb_mongodb_restorable-database
+- az_cosmosdb_mongodb_restorable-database_list
+- az_cosmosdb_mongodb_restorable-resource
+- az_cosmosdb_mongodb_restorable-resource_list
+- az_cosmosdb_restorable-database-account
+- az_cosmosdb_restorable-database-account_list
+- az_cosmosdb_restorable-database-account_show
+- az_cosmosdb_restore
+- az_cosmosdb_show
+- az_cosmosdb_sql
+- az_cosmosdb_sql_restorable-container
+- az_cosmosdb_sql_restorable-container_list
+- az_cosmosdb_sql_restorable-database
+- az_cosmosdb_sql_restorable-database_list
+- az_cosmosdb_sql_restorable-resource
+- az_cosmosdb_sql_restorable-resource_list
+- az_cosmosdb_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Cosmos DB database accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb.yml
new file mode 100644
index 0000000000..610b76c9fd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb
+name: az cosmosdb mongodb
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage MongoDB resources of Azure Cosmos DB account.
+description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-collection
+- az_cosmosdb_mongodb_restorable-collection_list
+- az_cosmosdb_mongodb_restorable-database
+- az_cosmosdb_mongodb_restorable-database_list
+- az_cosmosdb_mongodb_restorable-resource
+- az_cosmosdb_mongodb_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage MongoDB resources of Azure Cosmos DB account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml
new file mode 100644
index 0000000000..2374ca024c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-collection
+name: az cosmosdb mongodb restorable-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of mongodb collections that are restorable in a database of a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-collection_list
+  name: az cosmosdb mongodb restorable-collection list
+  summary: List all the versions of all the mongodb collections that were created / modified / deleted in the given database and restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-collection list --database-rid
+                                                   --instance-id
+                                                   --location
+  requiredParameters:
+  - isRequired: true
+    name: --database-rid -d
+    summary: Rid of the database.
+    description: ''
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-collection_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of mongodb collections that are restorable in a database of a Azure Cosmos DB account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml
new file mode 100644
index 0000000000..181857de0d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-database
+name: az cosmosdb mongodb restorable-database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of mongodb databases that are restorable in a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-database_list
+  name: az cosmosdb mongodb restorable-database list
+  summary: List all the versions of all the mongodb databases that were created / modified / deleted in the given restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-database list --instance-id
+                                                 --location
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-database_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of mongodb databases that are restorable in a Azure Cosmos DB account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml
new file mode 100644
index 0000000000..2918518898
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-resource
+name: az cosmosdb mongodb restorable-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the databases and its collections that can be restored in the given account at the given timesamp and region.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-resource_list
+  name: az cosmosdb mongodb restorable-resource list
+  summary: List all the databases and its collections that can be restored in the given account at the given timesamp and region.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-resource list --instance-id
+                                                 --location
+                                                 --restore-location
+                                                 --restore-timestamp
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the account.
+    description: ''
+  - isRequired: true
+    name: --restore-location -r
+    summary: The region of the restore.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp of the restore.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the databases and its collections that can be restored in the given account at the given timesamp and region.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/restorable-database-account.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/restorable-database-account.yml
new file mode 100644
index 0000000000..ad67088e6d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/restorable-database-account.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_restorable-database-account
+name: az cosmosdb restorable-database-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb restorable-database-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage restorable Azure Cosmos DB accounts.
+description: ''
+directCommands:
+- uid: az_cosmosdb_restorable-database-account_list
+  name: az cosmosdb restorable-database-account list
+  summary: List all the database accounts that can be restored.
+  description: ''
+  syntax: >-
+    az cosmosdb restorable-database-account list [--account-name]
+                                                 [--location]
+  optionalParameters:
+  - name: --account-name -n
+    summary: Name of the Account.
+    description: ''
+  - name: --location -l
+    summary: Location.
+    description: ''
+- uid: az_cosmosdb_restorable-database-account_show
+  name: az cosmosdb restorable-database-account show
+  summary: Show the details of a database account that can be restored.
+  description: ''
+  syntax: >-
+    az cosmosdb restorable-database-account show [--instance-id]
+                                                 [--location]
+  optionalParameters:
+  - name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_restorable-database-account_list
+- az_cosmosdb_restorable-database-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage restorable Azure Cosmos DB accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql.yml
new file mode 100644
index 0000000000..05446094e9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql
+name: az cosmosdb sql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage SQL resources of Azure Cosmos DB account.
+description: ''
+commands:
+- az_cosmosdb_sql_restorable-container
+- az_cosmosdb_sql_restorable-container_list
+- az_cosmosdb_sql_restorable-database
+- az_cosmosdb_sql_restorable-database_list
+- az_cosmosdb_sql_restorable-resource
+- az_cosmosdb_sql_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage SQL resources of Azure Cosmos DB account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-container.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-container.yml
new file mode 100644
index 0000000000..02728ebe76
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-container.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-container
+name: az cosmosdb sql restorable-container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of sql containers that are restorable in a database of a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-container_list
+  name: az cosmosdb sql restorable-container list
+  summary: List all the versions of all the sql containers that were created / modified / deleted in the given database and restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-container list --database-rid
+                                              --instance-id
+                                              --location
+  requiredParameters:
+  - isRequired: true
+    name: --database-rid -d
+    summary: Rid of the database.
+    description: ''
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-container_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of sql containers that are restorable in a database of a Azure Cosmos DB account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-database.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-database.yml
new file mode 100644
index 0000000000..69996d747a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-database.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-database
+name: az cosmosdb sql restorable-database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of sql databases that are restorable in a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-database_list
+  name: az cosmosdb sql restorable-database list
+  summary: List all the versions of all the sql databases that were created / modified / deleted in the given restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-database list --instance-id
+                                             --location
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-database_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of sql databases that are restorable in a Azure Cosmos DB account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml
new file mode 100644
index 0000000000..63c1c845e3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-resource
+name: az cosmosdb sql restorable-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the databases and its containers that can be restored in the given account at the given timesamp and region.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-resource_list
+  name: az cosmosdb sql restorable-resource list
+  summary: List all the databases and its containers that can be restored in the given account at the given timesamp and region.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-resource list --instance-id
+                                             --location
+                                             --restore-location
+                                             --restore-timestamp
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the account.
+    description: ''
+  - isRequired: true
+    name: --restore-location -r
+    summary: The region of the restore.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp of the restore.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the databases and its containers that can be restored in the given account at the given timesamp and region.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/costmanagement.yml b/2018-03-01-hybrid/docs-ref-autogen/costmanagement.yml
new file mode 100644
index 0000000000..0384019aa3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/costmanagement.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_costmanagement
+name: az costmanagement
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **costmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az costmanagement** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cost and billing in Azure.
+description: ''
+directCommands:
+- uid: az_costmanagement_query
+  name: az costmanagement query
+  summary: Query the usage data for scope defined.
+  description: ''
+  syntax: >-
+    az costmanagement query --scope
+                            --timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}
+                            --type {ActualCost, AmortizedCost, Usage}
+                            [--dataset-aggregation]
+                            [--dataset-configuration]
+                            [--dataset-filter]
+                            [--dataset-grouping]
+                            [--time-period]
+  examples:
+  - summary: Query in ManagementGroup scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
+  - summary: Query in ManagementGroupQuery scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
+  - summary: Query in a ResourceGroup scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
+  - summary: Query in a ResourceGroupQuery scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceType" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
+  - summary: Query in a Subscription scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  - summary: Query in a Subscription scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes "/subscriptions/{subscriptionId}/" for subscription scope, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}" for resourceGroup scope, "/providers/Microsoft.Management/managementGroups/{managementGroupId}" for Management Group scope.
+    description: ''
+  - isRequired: true
+    name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query.If custom, then a specific time period must be provided.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: ActualCost, AmortizedCost, Usage
+    summary: The type of the query.
+    description: ''
+  optionalParameters:
+  - name: --dataset-aggregation
+    summary: 'Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the aliasfor the aggregated column. Query can have up to 2 aggregation clauses. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-filter
+    summary: 'Has filter expression to use in the query. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses.Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.'
+    description: ''
+commands:
+- az_costmanagement_export
+- az_costmanagement_export_create
+- az_costmanagement_export_delete
+- az_costmanagement_export_list
+- az_costmanagement_export_show
+- az_costmanagement_export_update
+- az_costmanagement_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cost and billing in Azure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/costmanagement/export.yml b/2018-03-01-hybrid/docs-ref-autogen/costmanagement/export.yml
new file mode 100644
index 0000000000..05d49aa1e2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/costmanagement/export.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_costmanagement_export
+name: az costmanagement export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **costmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az costmanagement export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Costmanagement export.
+description: ''
+directCommands:
+- uid: az_costmanagement_export_create
+  name: az costmanagement export create
+  summary: The operation to create an export.
+  description: ''
+  syntax: >-
+    az costmanagement export create --name
+                                    --scope
+                                    --storage-account-id
+                                    --storage-container
+                                    --timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}
+                                    [--dataset-configuration]
+                                    [--dataset-grouping]
+                                    [--recurrence {Annually, Daily, Monthly, Weekly}]
+                                    [--recurrence-period]
+                                    [--schedule-status {Active, Inactive}]
+                                    [--storage-directory]
+                                    [--time-period]
+                                    [--type {ActualCost, AmortizedCost, Usage}]
+  examples:
+  - summary: Create an export for ManagementGroup scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Create an export for ResourceGroup scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Create an export for Subscription scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  - isRequired: true
+    name: --storage-account-id
+    summary: The ID of the storage account to store exports.
+    description: ''
+  - isRequired: true
+    name: --storage-container
+    summary: The storage container to deliver exports.
+    description: ''
+  - isRequired: true
+    name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
+    description: ''
+  optionalParameters:
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --recurrence
+    parameterValueGroup: Annually, Daily, Monthly, Weekly
+    summary: The schedule recurrence.
+    description: ''
+  - name: --recurrence-period
+    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
+    description: ''
+  - name: --schedule-status
+    parameterValueGroup: Active, Inactive
+    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
+    description: ''
+  - name: --storage-directory
+    summary: The root directory in the storage container to store exports.
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
+    description: ''
+  - name: --type
+    parameterValueGroup: ActualCost, AmortizedCost, Usage
+    summary: The type of the query.
+    description: ''
+- uid: az_costmanagement_export_delete
+  name: az costmanagement export delete
+  summary: The operation to delete an export.
+  description: ''
+  syntax: >-
+    az costmanagement export delete --name
+                                    --scope
+                                    [--yes]
+  examples:
+  - summary: delete an export for a ManagementGroup scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: delete an export for ResourceGroup scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: delete an export for Subscription scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_costmanagement_export_list
+  name: az costmanagement export list
+  summary: The operation to list all exports at the given scope.
+  description: ''
+  syntax: az costmanagement export list --scope
+  examples:
+  - summary: list exports in a ManagementGroup scope
+    syntax: az costmanagement export list --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: list exports in a ResourceGroup scope
+    syntax: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: list exports in a Subscription scope
+    syntax: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+- uid: az_costmanagement_export_show
+  name: az costmanagement export show
+  summary: The operation to get the execution history of an export for the defined scope by export name.
+  description: ''
+  syntax: >-
+    az costmanagement export show --name
+                                  --scope
+  examples:
+  - summary: Show an export in a ManagementGroup scope
+    syntax: az costmanagement export show --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Show an export in a ResourceGroup scope
+    syntax: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Show an export in a Subscription scope
+    syntax: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+- uid: az_costmanagement_export_update
+  name: az costmanagement export update
+  summary: The operation to update an export.
+  description: ''
+  syntax: >-
+    az costmanagement export update --name
+                                    --scope
+                                    [--dataset-configuration]
+                                    [--dataset-grouping]
+                                    [--recurrence {Annually, Daily, Monthly, Weekly}]
+                                    [--recurrence-period]
+                                    [--schedule-status {Active, Inactive}]
+                                    [--storage-account-id]
+                                    [--storage-container]
+                                    [--storage-directory]
+                                    [--time-period]
+                                    [--timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}]
+  examples:
+  - summary: Update an export in a ManagementGroup scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Update an export in a ResourceGroup scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Update an export in a Subscription scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  optionalParameters:
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --recurrence
+    parameterValueGroup: Annually, Daily, Monthly, Weekly
+    summary: The schedule recurrence.
+    description: ''
+  - name: --recurrence-period
+    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
+    description: ''
+  - name: --schedule-status
+    parameterValueGroup: Active, Inactive
+    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
+    description: ''
+  - name: --storage-account-id
+    summary: The ID of the storage account to store exports.
+    description: ''
+  - name: --storage-container
+    summary: The storage container to deliver exports.
+    description: ''
+  - name: --storage-directory
+    summary: The root directory in the storage container to store exports.
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
+    description: ''
+  - name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
+    description: ''
+commands:
+- az_costmanagement_export_create
+- az_costmanagement_export_delete
+- az_costmanagement_export_list
+- az_costmanagement_export_show
+- az_costmanagement_export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Costmanagement export.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware.yml
new file mode 100644
index 0000000000..2404aeb9bf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware.yml
@@ -0,0 +1,57 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware
+name: az csvmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure VMware Solution by CloudSimple.
+description: ''
+commands:
+- az_csvmware_private-cloud
+- az_csvmware_private-cloud_list
+- az_csvmware_private-cloud_show
+- az_csvmware_resource-pool
+- az_csvmware_resource-pool_list
+- az_csvmware_resource-pool_show
+- az_csvmware_virtual-network
+- az_csvmware_virtual-network_list
+- az_csvmware_virtual-network_show
+- az_csvmware_vm
+- az_csvmware_vm_create
+- az_csvmware_vm_delete
+- az_csvmware_vm_disk
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+- az_csvmware_vm_list
+- az_csvmware_vm_nic
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+- az_csvmware_vm_show
+- az_csvmware_vm_start
+- az_csvmware_vm_stop
+- az_csvmware_vm_update
+- az_csvmware_vm-template
+- az_csvmware_vm-template_list
+- az_csvmware_vm-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure VMware Solution by CloudSimple.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/private-cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/private-cloud.yml
new file mode 100644
index 0000000000..fafa42ad1e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/private-cloud.yml
@@ -0,0 +1,62 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_private-cloud
+name: az csvmware private-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware private-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware private clouds.
+description: ''
+directCommands:
+- uid: az_csvmware_private-cloud_list
+  name: az csvmware private-cloud list
+  summary: List details of private clouds in a region.
+  description: ''
+  syntax: az csvmware private-cloud list --location
+  examples:
+  - summary: List details of private clouds in East US.
+    syntax: az csvmware private-cloud list --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+- uid: az_csvmware_private-cloud_show
+  name: az csvmware private-cloud show
+  summary: Get the details of a private cloud in a region.
+  description: ''
+  syntax: >-
+    az csvmware private-cloud show --location
+                                   --name
+  examples:
+  - summary: Get the details of a private cloud which is in East US.
+    syntax: az csvmware private-cloud show -n MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_private-cloud_list
+- az_csvmware_private-cloud_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware private clouds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/resource-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/resource-pool.yml
new file mode 100644
index 0000000000..64acdc496e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/resource-pool.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_resource-pool
+name: az csvmware resource-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware resource-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware resource pools.
+description: ''
+directCommands:
+- uid: az_csvmware_resource-pool_list
+  name: az csvmware resource-pool list
+  summary: List details of resource pools in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware resource-pool list --location
+                                   --private-cloud
+  examples:
+  - summary: List details of resource pools.
+    syntax: az csvmware resource-pool list -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+- uid: az_csvmware_resource-pool_show
+  name: az csvmware resource-pool show
+  summary: Get the details of a resource pool in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware resource-pool show --location
+                                   --name
+                                   --private-cloud
+  examples:
+  - summary: Get the details of a resource pool.
+    syntax: az csvmware resource-pool show -n MyResourcePool -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_resource-pool_list
+- az_csvmware_resource-pool_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware resource pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/virtual-network.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/virtual-network.yml
new file mode 100644
index 0000000000..f9864b1582
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/virtual-network.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_virtual-network
+name: az csvmware virtual-network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware virtual-network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual networks.
+description: ''
+directCommands:
+- uid: az_csvmware_virtual-network_list
+  name: az csvmware virtual-network list
+  summary: List details of available virtual networks in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware virtual-network list --location
+                                     --private-cloud
+                                     --resource-pool
+  examples:
+  - summary: List details of virtual networks.
+    syntax: az csvmware virtual-network list -p MyPrivateCloud -r MyResourcePool --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the resource pool used to derive vSphere cluster which contains virtual networks. You can also pass the basename of the ID.
+    description: ''
+- uid: az_csvmware_virtual-network_show
+  name: az csvmware virtual-network show
+  summary: Get the details of a virtual network in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware virtual-network show --location
+                                     --name
+                                     --private-cloud
+  examples:
+  - summary: Get the details of a virtual network.
+    syntax: az csvmware virtual-network show -n MyVirtualNetwork -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the virtual network (vsphereId). You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_virtual-network_list
+- az_csvmware_virtual-network_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual networks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm-template.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm-template.yml
new file mode 100644
index 0000000000..dc1b6e9950
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm-template.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm-template
+name: az csvmware vm-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine templates.
+description: ''
+directCommands:
+- uid: az_csvmware_vm-template_list
+  name: az csvmware vm-template list
+  summary: List details of VMware virtual machines templates in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware vm-template list --location
+                                 --private-cloud
+                                 --resource-pool
+  examples:
+  - summary: List details of VM templates.
+    syntax: az csvmware vm-template list -p MyPrivateCloud -r MyResourcePool --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+- uid: az_csvmware_vm-template_show
+  name: az csvmware vm-template show
+  summary: Get the details of a VMware virtual machines template in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware vm-template show --location
+                                 --name
+                                 --private-cloud
+  examples:
+  - summary: Get the details of a VM template.
+    syntax: az csvmware vm-template show  -n MyVmTemplate -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the vSphere virtual machine template. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_vm-template_list
+- az_csvmware_vm-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine templates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm.yml
new file mode 100644
index 0000000000..d3f8af1364
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm.yml
@@ -0,0 +1,277 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm
+name: az csvmware vm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machines.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_create
+  name: az csvmware vm create
+  summary: Create a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm create --name
+                          --private-cloud
+                          --resource-group
+                          --resource-pool
+                          --template
+                          [--cores]
+                          [--disk]
+                          [--expose-to-guest-vm {false, true}]
+                          [--location]
+                          [--nic]
+                          [--ram]
+  examples:
+  - summary: Creating a VM with default parameters from the vm template.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate
+  - summary: Creating a VM and adding an extra nic to the VM with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot. The name entered in the nic is for identification purposes only, to see if such a nic name exists in the vm template, else a nic is created and a new name is assigned. Lets say the vm template contains a nic with name "Network adapter 1".
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
+  - summary: Customizing specific properties of a VM. Changing the number of cores to 2 and adapter of "Network adapter 1" nic to E1000E, from that specified in the template. All other properties would be defaulted from the template.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --cores 2 --nic name="Network adapter 1" adapter=E1000E
+  - summary: Customizing specific properties of a VM. Changing the adapter of "Network adapter 1" nic to E1000E, from that specified in the template, and also adding another nic with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name="Network adapter 1" adapter=E1000E --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
+  - summary: Creating a VM and adding an extra disk to the VM with SCSI controller 0, persistent mode, and 41943040 KB size. The name entered in the disk is for identification purposes only, to see if such a disk name exists in the vm template, else a disk is created and a new name is assigned. Lets say the vm template contains a disk with name "Hard disk 1".
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
+  - summary: Customizing specific properties of a VM. Changing the size of "Hard disk 1" disk to 21943040 KB, from that specified in the template, and also adding another disk with SCSI controller 0, persistent mode, and 41943040 KB size.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name="Hard disk 1" size=21943040 --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the VMware resource pool for this virtual machine in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: ID of the vSphere template from which this virtual machine will be created. You can also pass the basename of the ID.
+    description: ''
+  optionalParameters:
+  - name: --cores
+    summary: The number of CPU cores required. The default is taken from the vSphere VM template specified.
+    description: ''
+  - name: --disk
+    summary: Add or modify disks.
+    description: >-
+      By default, the disks will be added according to the vSphere VM template.
+
+      You can add more disks, or modify some properties of a disk specified in the VM template.
+
+      Multiple disks can be specified by using more than one `--disk` argument.
+
+      If a disk name already exists in the VM template, that disk would be modified according to the user input.
+
+      If a disk name does not exist in the VM template, a new disk would be created and a new name will be assigned to it.
+
+      Usage:   --disk name=MyDiskName controller=SCSIControllerID mode=IndependenceMode size=DiskSizeInKB.
+  - name: --expose-to-guest-vm
+    parameterValueGroup: false, true
+    summary: Will expose full CPU virtualization to the guest operating system. The default is taken from the vSphere VM template specified.
+    description: ''
+  - name: --location -l
+    summary: Region in which the private cloud is present. If default location is not configured, will default to the resource group's location.
+    description: ''
+  - name: --nic
+    summary: Add or modify NICs.
+    description: >-
+      By default, the nics will be added according to the vSphere VM template.
+
+      You can add more nics, or modify some properties of a nic specified in the VM template.
+
+      Multiple nics can be specified by using more than one `--nic` argument.
+
+      If a nic name already exists in the VM template, that nic would be modified according to the user input.
+
+      If a nic name does not exist in the VM template, a new nic would be created and a new name will be assigned to it.
+
+      Usage:   --nic name=MyNicName virtual-network=MyNetwork adapter=MyAdapter power-on-boot=True/False.
+  - name: --ram
+    summary: The amount of memory in MB. The default is taken from the vSphere VM template specified.
+    description: ''
+- uid: az_csvmware_vm_delete
+  name: az csvmware vm delete
+  summary: Delete a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm delete --name
+                          --resource-group
+  examples:
+  - summary: Delete a VMware VM.
+    syntax: az csvmware vm delete -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_list
+  name: az csvmware vm list
+  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
+  description: ''
+  syntax: az csvmware vm list [--resource-group]
+  examples:
+  - summary: List details of VMware VMs in the current subscription.
+    syntax: az csvmware vm list
+  - summary: List details of VMware VMs in a particular resource group.
+    syntax: az csvmware vm list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_show
+  name: az csvmware vm show
+  summary: Get the details of a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm show --name
+                        --resource-group
+  examples:
+  - summary: Get the details of a VMware VM.
+    syntax: az csvmware vm show -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_start
+  name: az csvmware vm start
+  summary: Start a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm start --name
+                         --resource-group
+  examples:
+  - summary: Start a VMware VM.
+    syntax: az csvmware vm start -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_stop
+  name: az csvmware vm stop
+  summary: Stop/Reboot/Suspend a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm stop --mode {poweroff, reboot, shutdown, suspend}
+                        --name
+                        --resource-group
+  examples:
+  - summary: Power off a VMware VM.
+    syntax: az csvmware vm stop -n MyVm -g MyResourceGroup --mode poweroff
+  - summary: Restart a VMware VM.
+    syntax: az csvmware vm stop -n MyVm -g MyResourceGroup --mode reboot
+  requiredParameters:
+  - isRequired: true
+    name: --mode
+    parameterValueGroup: poweroff, reboot, shutdown, suspend
+    summary: Stop mode.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_update
+  name: az csvmware vm update
+  summary: Update the tags field of a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm update --name
+                          --resource-group
+                          [--add]
+                          [--force-string]
+                          [--no-wait]
+                          [--remove]
+                          [--set]
+  examples:
+  - summary: Add or update a tag.
+    syntax: az csvmware vm update -n MyVm -g MyResourceGroup --set tags.tagName=tagValue
+  - summary: Remove a tag.
+    syntax: az csvmware vm update -n MyVm -g MyResourceGroup --remove tags.tagName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_csvmware_vm_create
+- az_csvmware_vm_delete
+- az_csvmware_vm_disk
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+- az_csvmware_vm_list
+- az_csvmware_vm_nic
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+- az_csvmware_vm_show
+- az_csvmware_vm_start
+- az_csvmware_vm_stop
+- az_csvmware_vm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm/disk.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm/disk.yml
new file mode 100644
index 0000000000..c32b9254ef
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm/disk.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm_disk
+name: az csvmware vm disk
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm disk** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine's disks.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_disk_add
+  name: az csvmware vm disk add
+  summary: Add disk to a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm disk add --resource-group
+                            --vm-name
+                            [--controller]
+                            [--mode {independent_nonpersistent, independent_persistent, persistent}]
+                            [--size]
+  examples:
+  - summary: Add a disk with default parameters in a VM.
+    syntax: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup
+  - summary: Add a disk with SATA controller 0 and 64 GB memory in a VM.
+    syntax: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup --controller 15000 --size 67108864
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --controller
+    defaultValue: "1000"
+    summary: Id of the controller. Input 1000 for SCSI controller 0, and 15000 for SATA controller 0.
+    description: ''
+  - name: --mode
+    defaultValue: persistent
+    parameterValueGroup: independent_nonpersistent, independent_persistent, persistent
+    summary: The disk independence mode.
+    description: ''
+  - name: --size
+    defaultValue: "16777216"
+    summary: The amount of disk size in KB.
+    description: ''
+- uid: az_csvmware_vm_disk_delete
+  name: az csvmware vm disk delete
+  summary: Delete disks from a VM.
+  description: ''
+  syntax: >-
+    az csvmware vm disk delete --disks
+                               --resource-group
+                               --vm-name
+  examples:
+  - summary: Delete two disks from a VM.
+    syntax: az csvmware vm disk delete --vm-name MyVm -g MyResourceGroup --disks "My Disk Name 1" "My Disk Name 2"
+  requiredParameters:
+  - isRequired: true
+    name: --disks
+    summary: Names of disks.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_disk_list
+  name: az csvmware vm disk list
+  summary: List details of disks available on a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm disk list --resource-group
+                             --vm-name
+  examples:
+  - summary: List details of disks in a VM.
+    syntax: az csvmware vm disk list --vm-name MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_disk_show
+  name: az csvmware vm disk show
+  summary: Get the details of a VMware virtual machine's disk.
+  description: ''
+  syntax: >-
+    az csvmware vm disk show --name
+                             --resource-group
+                             --vm-name
+  examples:
+  - summary: Get the details of a disk in a VM.
+    syntax: az csvmware vm disk show --vm-name MyVm -g MyResourceGroup -n "My Disk Name"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the disk.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+commands:
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine's disks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm/nic.yml b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm/nic.yml
new file mode 100644
index 0000000000..06731d3613
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/csvmware/vm/nic.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm_nic
+name: az csvmware vm nic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm nic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine's Network Interface Cards.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_nic_add
+  name: az csvmware vm nic add
+  summary: Add NIC to a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm nic add --resource-group
+                           --virtual-network
+                           --vm-name
+                           [--adapter {E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3}]
+                           [--power-on-boot {false, true}]
+  examples:
+  - summary: Add a NIC with default parameters in a VM.
+    syntax: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork
+  - summary: Add a NIC with E1000E adapter that powers on boot in a VM.
+    syntax: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork --adapter E1000E --power-on-boot true
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --virtual-network
+    summary: ID of the virtual network. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --adapter
+    defaultValue: VMXNET3
+    parameterValueGroup: E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3
+    summary: The adapter for the NIC.
+    description: ''
+  - name: --power-on-boot
+    parameterValueGroup: false, true
+    summary: Will power on the NIC at boot time.
+    description: ''
+- uid: az_csvmware_vm_nic_delete
+  name: az csvmware vm nic delete
+  summary: Delete NICs from a VM.
+  description: ''
+  syntax: >-
+    az csvmware vm nic delete --nics
+                              --resource-group
+                              --vm-name
+  examples:
+  - summary: Delete two NICs from a VM.
+    syntax: az csvmware vm nic delete --vm-name MyVm -g MyResourceGroup --nics "My NIC Name 1" "My NIC Name 2"
+  requiredParameters:
+  - isRequired: true
+    name: --nics
+    summary: Names of NICs.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_nic_list
+  name: az csvmware vm nic list
+  summary: List details of NICs available on a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm nic list --resource-group
+                            --vm-name
+  examples:
+  - summary: List details of NICs in a VM.
+    syntax: az csvmware vm nic list --vm-name MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_nic_show
+  name: az csvmware vm nic show
+  summary: Get the details of a VMware virtual machine's NIC.
+  description: ''
+  syntax: >-
+    az csvmware vm nic show --name
+                            --resource-group
+                            --vm-name
+  examples:
+  - summary: Get the details of a NIC in a VM.
+    syntax: az csvmware vm nic show --vm-name MyVm -g MyResourceGroup -n "My NIC Name"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the NIC.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+commands:
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine's Network Interface Cards.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/custom-providers.yml b/2018-03-01-hybrid/docs-ref-autogen/custom-providers.yml
new file mode 100644
index 0000000000..fb93fe6845
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/custom-providers.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_custom-providers
+name: az custom-providers
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **custom-providers** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az custom-providers** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_custom-providers_resource-provider
+- az_custom-providers_resource-provider_create
+- az_custom-providers_resource-provider_delete
+- az_custom-providers_resource-provider_list
+- az_custom-providers_resource-provider_show
+- az_custom-providers_resource-provider_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/custom-providers/resource-provider.yml b/2018-03-01-hybrid/docs-ref-autogen/custom-providers/resource-provider.yml
new file mode 100644
index 0000000000..7e4da4ca30
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/custom-providers/resource-provider.yml
@@ -0,0 +1,200 @@
+### YamlMime:AzureCLIGroup
+uid: az_custom-providers_resource-provider
+name: az custom-providers resource-provider
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **custom-providers** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az custom-providers resource-provider** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage custom resource provider.
+description: ''
+directCommands:
+- uid: az_custom-providers_resource-provider_create
+  name: az custom-providers resource-provider create
+  summary: Create or update the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider create --name
+                                                 --resource-group
+                                                 [--action]
+                                                 [--location]
+                                                 [--no-wait]
+                                                 [--resource-type]
+                                                 [--tags]
+                                                 [--validation]
+  examples:
+  - summary: Create or update a custom resource provider.
+    syntax: >-
+      az custom-providers resource-provider create -n MyRP -g MyRG \
+
+      --action name=ping endpoint=https://test.azurewebsites.net/api routing_type=Proxy \
+
+      --resource-type name=users endpoint=https://test.azurewebsites.net/api routing_type="Proxy, Cache" \
+
+      --validation validation_type=swagger specification=https://raw.githubusercontent.com/test.json
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action to the custom resource provider.
+    description: >-
+      Usage: --action name=ping endpoint="https://test.azurewebsites.net/api/{requestPath}" routing_type=Proxy
+
+
+      name: Required. The name of the action.
+
+      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
+
+      routing_type: The routing types that are supported for action requests. Possible values include: 'Proxy'.
+
+
+      Multiple actions can be specified by using more than one `--action` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-type -r
+    summary: Add a custom resource type to the custom resource provider.
+    description: >-
+      Usage: --resource-type name=user endpoint="https://test.azurewebsites.net/api/{requestPath}" routing_type="Proxy, Cache"
+
+
+      name: Required. The name of the resource type.
+
+      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
+
+      routing_type: The routing types that are supported for resource requests. Possible values include: 'Proxy', 'Proxy,Cache'.
+
+
+      Multiple resource types can be specified by using more than one `--resource-type` argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation -v
+    summary: Add a validation to the custom resource provider.
+    description: >-
+      Usage: --validation specification="https://raw.githubusercontent.com/" validation_type="Swagger"
+
+
+      specification: A link to the validation specification.vThe specification must be hosted on raw.githubusercontent.com.
+
+      validation_type: The type of validation to run against a matching request. Possible values include: 'Swagger'.
+
+
+      Multiple validations can be specified by using more than one `--validation` argument.
+- uid: az_custom-providers_resource-provider_delete
+  name: az custom-providers resource-provider delete
+  summary: Delete the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider delete --name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--yes]
+  examples:
+  - summary: Delete a custom resource provider.
+    syntax: az custom-providers resource-provider delete -g MyRG -n MyRP
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_custom-providers_resource-provider_list
+  name: az custom-providers resource-provider list
+  summary: Get all the custom resource providers within a resource group or in the current subscription.
+  description: ''
+  syntax: az custom-providers resource-provider list [--resource-group]
+  examples:
+  - summary: List all custom resource providers in the resource group.
+    syntax: az custom-providers resource-provider list -g MyRG
+  - summary: List all custom resource providers in the current subscription.
+    syntax: az custom-providers resource-provider list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_custom-providers_resource-provider_show
+  name: az custom-providers resource-provider show
+  summary: Get the properties for the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider show --name
+                                               --resource-group
+  examples:
+  - summary: Get a custom resource provider.
+    syntax: az custom-providers resource-provider show -g MyRG -n MyRP
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_custom-providers_resource-provider_update
+  name: az custom-providers resource-provider update
+  summary: Update the custom resource provider. Only tags can be updated.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider update --name
+                                                 --resource-group
+                                                 [--tags]
+  examples:
+  - summary: Update the tags for a custom resource provider.
+    syntax: az custom-providers resource-provider update -g MyRG -n MyRP --tags a=b
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_custom-providers_resource-provider_create
+- az_custom-providers_resource-provider_delete
+- az_custom-providers_resource-provider_list
+- az_custom-providers_resource-provider_show
+- az_custom-providers_resource-provider_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage custom resource provider.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/customlocation.yml b/2018-03-01-hybrid/docs-ref-autogen/customlocation.yml
new file mode 100644
index 0000000000..f0f4b82228
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/customlocation.yml
@@ -0,0 +1,217 @@
+### YamlMime:AzureCLIGroup
+uid: az_customlocation
+name: az customlocation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **customlocation** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az customlocation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to Create, Get, List and Delete CustomLocations.
+description: ''
+directCommands:
+- uid: az_customlocation_create
+  name: az customlocation create
+  summary: Create a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation create --cluster-extension-ids
+                             --host-resource-id
+                             --name
+                             --namespace
+                             --resource-group
+                             [--kubeconfig]
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kubeconfig -k
+    summary: Admin Kubeconfig of Cluster. Needs to passed in as a file if the cluster is a non-AAD enabled Cluster.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_customlocation_delete
+  name: az customlocation delete
+  summary: Delete a Customlocation.
+  description: ''
+  syntax: >-
+    az customlocation delete --name
+                             --resource-group
+                             [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_customlocation_list
+  name: az customlocation list
+  summary: Command to list CustomLocations.
+  description: ''
+  syntax: az customlocation list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_list-enabled-resource-types
+  name: az customlocation list-enabled-resource-types
+  summary: Get details of Enabled Resource Types for a CustomLocation.
+  description: ''
+  syntax: >-
+    az customlocation list-enabled-resource-types --name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_patch
+  name: az customlocation patch
+  summary: Patch a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation patch --cluster-extension-ids
+                            --host-resource-id
+                            --name
+                            --namespace
+                            --resource-group
+                            [--display-name]
+                            [--location]
+                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --display-name -d
+    summary: Display Name of Custom Location.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags -t
+    summary: A json file for tags for Custom Location.
+    description: ''
+- uid: az_customlocation_show
+  name: az customlocation show
+  summary: Get details of a Customlocation.
+  description: ''
+  syntax: >-
+    az customlocation show --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_update
+  name: az customlocation update
+  summary: Update a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation update --cluster-extension-ids
+                             --host-resource-id
+                             --name
+                             --namespace
+                             --resource-group
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_customlocation_create
+- az_customlocation_delete
+- az_customlocation_list
+- az_customlocation_list-enabled-resource-types
+- az_customlocation_patch
+- az_customlocation_show
+- az_customlocation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to Create, Get, List and Delete CustomLocations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/databox.yml b/2018-03-01-hybrid/docs-ref-autogen/databox.yml
new file mode 100644
index 0000000000..4c7c3bf6ca
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/databox.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_databox
+name: az databox
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databox** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databox** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_databox_job
+- az_databox_job_cancel
+- az_databox_job_create
+- az_databox_job_delete
+- az_databox_job_list
+- az_databox_job_list-credentials
+- az_databox_job_show
+- az_databox_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/databox/job.yml b/2018-03-01-hybrid/docs-ref-autogen/databox/job.yml
new file mode 100644
index 0000000000..e7805b9b48
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/databox/job.yml
@@ -0,0 +1,352 @@
+### YamlMime:AzureCLIGroup
+uid: az_databox_job
+name: az databox job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databox** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databox job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databox job.
+description: ''
+directCommands:
+- uid: az_databox_job_cancel
+  name: az databox job cancel
+  summary: Cancel a job.
+  description: ''
+  syntax: >-
+    az databox job cancel --name
+                          --reason
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Cancel the job "SdkJob3971" under resource group "SdkRg4981".
+    syntax: az databox job cancel --resource-group "SdkRg4981" --name "SdkJob3971" --reason "CancelTest"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --reason
+    summary: Reason for cancellation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databox_job_create
+  name: az databox job create
+  summary: Create a new job with the specified parameters.
+  description: ''
+  syntax: >-
+    az databox job create --city
+                          --contact-name
+                          --country
+                          --email-list
+                          --location
+                          --name
+                          --phone
+                          --postal-code
+                          --resource-group
+                          --sku {DataBox, DataBoxDisk, DataBoxHeavy}
+                          --state-or-province
+                          --street-address1
+                          [--company-name]
+                          [--expected-data-size]
+                          [--mobile]
+                          [--resource-group-for-managed-disk]
+                          [--staging-storage-account]
+                          [--storage-accounts]
+                          [--street-address2]
+                          [--street-address3]
+                          [--tags]
+  examples:
+  - summary: Create a databox job to use both storage account and managed disk as data destination.
+    syntax: >-
+      az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
+
+      "westus" --sku "DataBox" --contact-name "Public SDK Test" \
+
+      --phone "1234567890" --email-list "testing@microsoft.com" \
+
+      --street-address1 "16 TOWNSEND ST" --street-address2 "Unit 1" --city "San Francisco"  \
+
+      --state-or-province "CA" --country "US" --postal-code "94107" --company-name "Microsoft" \
+
+      --storage-account sa1 sa2 --staging-storage-account sa \
+
+      --resource-group-for-managed-disk /subscriptions/sub/resourceGroups/rg
+  - summary: Create a databoxdisk job to use storage account as data destination.
+    syntax: >-
+      az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
+
+      "westus" --sku "DataBoxDisk" --expected-data-size 1 --contact-name "Public SDK Test" \
+
+      --phone "1234567890" --email-list "testing@microsoft.com" --street-address1 "16 TOWNSEND ST" \
+
+      --street-address2 "Unit 1" --city "San Francisco" --state-or-province "CA" --country "US" \
+
+      --postal-code "94107" --company-name "Microsoft" --storage-account sa1
+  requiredParameters:
+  - isRequired: true
+    name: --city
+    summary: Name of the City.
+    description: ''
+  - isRequired: true
+    name: --contact-name
+    summary: Contact name of the person.
+    description: ''
+  - isRequired: true
+    name: --country
+    summary: 'Name of the Country. Ex: US.'
+    description: ''
+  - isRequired: true
+    name: --email-list
+    summary: Space-separated list of Email addresses to be notified about job progress.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --phone
+    summary: Phone number of the contact person.
+    description: ''
+  - isRequired: true
+    name: --postal-code
+    summary: Postal code.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: DataBox, DataBoxDisk, DataBoxHeavy
+    summary: The sku type of DataBox.
+    description: ''
+  - isRequired: true
+    name: --state-or-province
+    summary: Name of the State or Province.
+    description: ''
+  - isRequired: true
+    name: --street-address1
+    summary: Street Address line 1.
+    description: ''
+  optionalParameters:
+  - name: --company-name
+    summary: Name of the company.
+    description: ''
+  - name: --expected-data-size
+    summary: The expected size of the data which needs to be transferred in this job, in terabytes.The maximum usable capacity is up to 35 TB. This is only needed when sku is DataBoxDisk.
+    description: ''
+  - name: --mobile
+    summary: Mobile number of the contact person.
+    description: ''
+  - name: --resource-group-for-managed-disk
+    summary: The name or ID of the destination resource group where the Compute disks should be created.
+    description: ''
+  - name: --staging-storage-account
+    summary: The name or ID of the destination storage account that can be used to copy the vhd for staging.
+    description: ''
+  - name: --storage-accounts
+    summary: Space-separated list of the destination storage account. It can be the name or resource ID of storage account.
+    description: ''
+  - name: --street-address2
+    summary: Street Address line 2.
+    description: ''
+  - name: --street-address3
+    summary: Street Address line 3.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_databox_job_delete
+  name: az databox job delete
+  summary: Delete a job.
+  description: ''
+  syntax: >-
+    az databox job delete --name
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Delete the job "SdkJob3971" in resource group "SdkRg4981".
+    syntax: az databox job delete --resource-group "SdkRg4981" --name "SdkJob3971"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databox_job_list
+  name: az databox job list
+  summary: List all the jobs available under the given resource group or the given subscription.
+  description: ''
+  syntax: az databox job list [--resource-group]
+  examples:
+  - summary: List all the jobs available under the current subscription.
+    syntax: az databox job list
+  - summary: List all the jobs available under the resource group "SdkRg4981".
+    syntax: az databox job list --resource-group "SdkRg4981"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_list-credentials
+  name: az databox job list-credentials
+  summary: List the unencrypted secrets related to the job.
+  description: ''
+  syntax: >-
+    az databox job list-credentials --name
+                                    --resource-group
+  examples:
+  - summary: List the unencrypted secrets related to the job "TJ-636646322037905056".
+    syntax: az databox job list-credentials --resource-group "bvttoolrg6" --name "TJ-636646322037905056"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_show
+  name: az databox job show
+  summary: Get information about the specified job.
+  description: ''
+  syntax: >-
+    az databox job show --name
+                        --resource-group
+  examples:
+  - summary: Get the information about the job "SdkJob3971".
+    syntax: az databox job show --resource-group "SdkRg4981" --name "SdkJob3971"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_update
+  name: az databox job update
+  summary: Update an existing job with the specified parameters.
+  description: ''
+  syntax: >-
+    az databox job update --name
+                          --resource-group
+                          [--city]
+                          [--company-name]
+                          [--contact-name]
+                          [--country]
+                          [--email-list]
+                          [--mobile]
+                          [--phone]
+                          [--postal-code]
+                          [--state-or-province]
+                          [--street-address1]
+                          [--street-address2]
+                          [--street-address3]
+  examples:
+  - summary: Update the job "SdkJob3971" with the specified parameters.
+    syntax: >-
+      az databox job update --resource-group "SdkRg4981" --name "SdkJob3971" \
+
+      --contact-name "Update Job" --phone "1234567890" \
+
+      --email-list "testing@microsoft.com" \
+
+      --street-address1 "16 TOWNSEND ST" \
+
+      --city "San Francisco" --state-or-province "CA" \
+
+      --country "US" --postal-code "94107" \
+
+      --company-name "Microsoft" \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --city
+    summary: Name of the City.
+    description: ''
+  - name: --company-name
+    summary: Name of the company.
+    description: ''
+  - name: --contact-name
+    summary: Contact name of the person.
+    description: ''
+  - name: --country
+    summary: 'Name of the Country. Ex: US.'
+    description: ''
+  - name: --email-list
+    summary: List of Email addresses to be notified about job progress.
+    description: ''
+  - name: --mobile
+    summary: Mobile number of the contact person.
+    description: ''
+  - name: --phone
+    summary: Phone number of the contact person.
+    description: ''
+  - name: --postal-code
+    summary: Postal code.
+    description: ''
+  - name: --state-or-province
+    summary: Name of the State or Province.
+    description: ''
+  - name: --street-address1
+    summary: Street Address line 1.
+    description: ''
+  - name: --street-address2
+    summary: Street Address line 2.
+    description: ''
+  - name: --street-address3
+    summary: Street Address line 3.
+    description: ''
+commands:
+- az_databox_job_cancel
+- az_databox_job_create
+- az_databox_job_delete
+- az_databox_job_list
+- az_databox_job_list-credentials
+- az_databox_job_show
+- az_databox_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databox job.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/databricks.yml b/2018-03-01-hybrid/docs-ref-autogen/databricks.yml
new file mode 100644
index 0000000000..0fefc73812
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/databricks.yml
@@ -0,0 +1,41 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks
+name: az databricks
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage databricks workspaces.
+description: ''
+commands:
+- az_databricks_workspace
+- az_databricks_workspace_create
+- az_databricks_workspace_delete
+- az_databricks_workspace_list
+- az_databricks_workspace_show
+- az_databricks_workspace_update
+- az_databricks_workspace_vnet-peering
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+- az_databricks_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage databricks workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/databricks/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/databricks/workspace.yml
new file mode 100644
index 0000000000..a0e6c5ced3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/databricks/workspace.yml
@@ -0,0 +1,278 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks_workspace
+name: az databricks workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databricks workspace.
+description: ''
+directCommands:
+- uid: az_databricks_workspace_create
+  name: az databricks workspace create
+  summary: Create a new workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace create --location
+                                   --name
+                                   --resource-group
+                                   --sku {premium, standard, trial}
+                                   [--enable-no-public-ip]
+                                   [--managed-resource-group]
+                                   [--no-wait]
+                                   [--prepare-encryption]
+                                   [--private-subnet]
+                                   [--public-subnet]
+                                   [--require-infrastructure-encryption]
+                                   [--tags]
+                                   [--vnet]
+  examples:
+  - summary: Create a workspace
+    syntax: az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location westus --sku standard
+  - summary: Create a workspace with managed identity for storage account
+    syntax: az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location eastus2euap --sku premium --prepare-encryption
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: premium, standard, trial
+    summary: The SKU tier name.
+    description: ''
+  optionalParameters:
+  - name: --enable-no-public-ip
+    summary: Flag to enable the no public ip feature.
+    description: ''
+  - name: --managed-resource-group
+    summary: The managed resource group to create. It can be either a name or a resource ID.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prepare-encryption
+    summary: Flag to enable the Managed Identity for managed storage account to prepare for CMK encryption.
+    description: ''
+  - name: --private-subnet
+    summary: The name of a Private Subnet within the Virtual Network.
+    description: ''
+  - name: --public-subnet
+    summary: The name of a Public Subnet within the Virtual Network.
+    description: ''
+  - name: --require-infrastructure-encryption
+    summary: Flag to enable the DBFS root file system with secondary layer of encryption with platform managed keys for data at rest.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet
+    summary: Virtual Network name or resource ID.
+    description: ''
+- uid: az_databricks_workspace_delete
+  name: az databricks workspace delete
+  summary: Delete the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace delete --name
+                                   --resource-group
+                                   [--no-wait]
+                                   [--yes]
+  examples:
+  - summary: Delete the workspace
+    syntax: az databricks workspace delete --resource-group MyResourceGroup --name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databricks_workspace_list
+  name: az databricks workspace list
+  summary: Get all the workspaces.
+  description: ''
+  syntax: az databricks workspace list [--resource-group]
+  examples:
+  - summary: List workspaces within a resource group
+    syntax: az databricks workspace list --resource-group MyResourceGroup
+  - summary: List workspaces within the default subscription
+    syntax: az databricks workspace list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databricks_workspace_show
+  name: az databricks workspace show
+  summary: Show the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace show --name
+                                 --resource-group
+  examples:
+  - summary: Show the workspace
+    syntax: az databricks workspace show --resource-group MyResourceGroup --name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databricks_workspace_update
+  name: az databricks workspace update
+  summary: Update the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace update --name
+                                   --resource-group
+                                   [--key-name]
+                                   [--key-source {Default, Microsoft.Keyvault}]
+                                   [--key-vault]
+                                   [--key-version]
+                                   [--no-wait]
+                                   [--prepare-encryption]
+                                   [--tags]
+  examples:
+  - summary: Update the workspace's tags.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags key1=value1 key2=value2
+  - summary: Clean the workspace's tags.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags ""
+  - summary: Prepare for CMK encryption by assigning identity for storage account.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --prepare-encryption
+  - summary: Configure CMK encryption
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --key-source Microsoft.KeyVault --key-name MyKey --key-vault https://myKeyVault.vault.azure.net/ --key-version 00000000000000000000000000000000
+  - summary: Revert encryption to Microsoft Managed Keys
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --key-source Default
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    summary: The name of KeyVault key.
+    description: ''
+  - name: --key-source
+    parameterValueGroup: Default, Microsoft.Keyvault
+    summary: The encryption key source (provider).
+    description: ''
+  - name: --key-vault
+    summary: The Uri of KeyVault.
+    description: ''
+  - name: --key-version
+    summary: The version of KeyVault key. It is optional when updating CMK.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prepare-encryption
+    summary: Flag to enable the Managed Identity for managed storage account to prepare for CMK encryption.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_databricks_workspace_wait
+  name: az databricks workspace wait
+  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
+  description: ''
+  syntax: >-
+    az databricks workspace wait --name
+                                 --resource-group
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Databricks workspace is successfully provisioned.
+    syntax: az databricks workspace wait --resource-group MyResourceGroup --name MyWorkspace \ --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_databricks_workspace_create
+- az_databricks_workspace_delete
+- az_databricks_workspace_list
+- az_databricks_workspace_show
+- az_databricks_workspace_update
+- az_databricks_workspace_vnet-peering
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+- az_databricks_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databricks workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/databricks/workspace/vnet-peering.yml b/2018-03-01-hybrid/docs-ref-autogen/databricks/workspace/vnet-peering.yml
new file mode 100644
index 0000000000..3eb423318a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/databricks/workspace/vnet-peering.yml
@@ -0,0 +1,270 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks_workspace_vnet-peering
+name: az databricks workspace vnet-peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks workspace vnet-peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databricks workspace vnet peering.
+description: ''
+directCommands:
+- uid: az_databricks_workspace_vnet-peering_create
+  name: az databricks workspace vnet-peering create
+  summary: Create a vnet peering for a workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering create --name
+                                                --remote-vnet
+                                                --resource-group
+                                                --workspace-name
+                                                [--allow-forwarded-traffic {false, true}]
+                                                [--allow-gateway-transit {false, true}]
+                                                [--allow-virtual-network-access {false, true}]
+                                                [--no-wait]
+                                                [--use-remote-gateways {false, true}]
+  examples:
+  - summary: Create a vnet peering for a workspace
+    syntax: >-
+      az databricks workspace vnet-peering create --resource-group MyResourceGroup --workspace-name MyWorkspace \
+
+      -n MyPeering --remote-vnet /subscriptions/000000-0000-0000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVNet
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --remote-vnet
+    summary: The remote virtual network name or Resource ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --allow-forwarded-traffic
+    parameterValueGroup: false, true
+    summary: Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+    description: ''
+  - name: --allow-gateway-transit
+    parameterValueGroup: false, true
+    summary: If gateway links can be used in remote virtual networking to link to this virtual network.
+    description: ''
+  - name: --allow-virtual-network-access
+    parameterValueGroup: false, true
+    summary: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --use-remote-gateways
+    parameterValueGroup: false, true
+    summary: If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_delete
+  name: az databricks workspace vnet-peering delete
+  summary: Delete the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering delete --name
+                                                --resource-group
+                                                --workspace-name
+                                                [--no-wait]
+  examples:
+  - summary: Delete the vnet peering.
+    syntax: az databricks workspace vnet-peering delete --resource-group MyResourceGroup --workspace-name MyWorkspace -n MyPeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_list
+  name: az databricks workspace vnet-peering list
+  summary: List vnet peerings under a workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering list --resource-group
+                                              --workspace-name
+  examples:
+  - summary: List vnet peerings under a workspace.
+    syntax: az databricks workspace vnet-peering list --resource-group MyResourceGroup --workspace-name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_show
+  name: az databricks workspace vnet-peering show
+  summary: Show the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering show --name
+                                              --resource-group
+                                              --workspace-name
+  examples:
+  - summary: Show the vnet peering
+    syntax: az databricks workspace vnet-peering show --resource-group MyResourceGroup --workspace-name MyWorkspace -n MyPeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_update
+  name: az databricks workspace vnet-peering update
+  summary: Update the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering update --name
+                                                --resource-group
+                                                --workspace-name
+                                                [--allow-forwarded-traffic {false, true}]
+                                                [--allow-gateway-transit {false, true}]
+                                                [--allow-virtual-network-access {false, true}]
+                                                [--no-wait]
+                                                [--use-remote-gateways {false, true}]
+  examples:
+  - summary: Update the vnet peering (enable gateway transit and disable virtual network access).
+    syntax: >-
+      az databricks workspace vnet-peering update --resource-group MyResourceGroup --workspace-name MyWorkspace \
+
+      -n MyPeering --allow-gateway-transit --allow-virtual-network-access false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --allow-forwarded-traffic
+    parameterValueGroup: false, true
+    summary: Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+    description: ''
+  - name: --allow-gateway-transit
+    parameterValueGroup: false, true
+    summary: If gateway links can be used in remote virtual networking to link to this virtual network.
+    description: ''
+  - name: --allow-virtual-network-access
+    parameterValueGroup: false, true
+    summary: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --use-remote-gateways
+    parameterValueGroup: false, true
+    summary: If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_wait
+  name: az databricks workspace vnet-peering wait
+  summary: Place the CLI in a waiting state until a condition of the Databricks workspace vnet peering is met.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering wait --name
+                                              --resource-group
+                                              --workspace-name
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Databricks workspace vnet peering is successfully provisioned.
+    syntax: az databricks workspace vnet-peering wait --resource-group MyResourceGroup --workspace-name MyWorkspace \ --name MyPeering --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databricks workspace vnet peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datadog.yml b/2018-03-01-hybrid/docs-ref-autogen/datadog.yml
new file mode 100644
index 0000000000..c022011242
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datadog.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog
+name: az datadog
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_datadog_monitor
+- az_datadog_monitor_create
+- az_datadog_monitor_delete
+- az_datadog_monitor_get-default-key
+- az_datadog_monitor_list
+- az_datadog_monitor_list-api-key
+- az_datadog_monitor_list-host
+- az_datadog_monitor_list-linked-resource
+- az_datadog_monitor_list-monitored-resource
+- az_datadog_monitor_refresh-set-password-link
+- az_datadog_monitor_set-default-key
+- az_datadog_monitor_show
+- az_datadog_monitor_update
+- az_datadog_monitor_wait
+- az_datadog_sso-config
+- az_datadog_sso-config_create
+- az_datadog_sso-config_list
+- az_datadog_sso-config_show
+- az_datadog_sso-config_update
+- az_datadog_sso-config_wait
+- az_datadog_tag-rule
+- az_datadog_tag-rule_create
+- az_datadog_tag-rule_list
+- az_datadog_tag-rule_show
+- az_datadog_tag-rule_update
+- az_datadog_terms
+- az_datadog_terms_create
+- az_datadog_terms_list
+- az_datadog_terms_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datadog/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/datadog/monitor.yml
new file mode 100644
index 0000000000..d434256cdc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datadog/monitor.yml
@@ -0,0 +1,401 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_monitor
+name: az datadog monitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog monitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage monitor with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_monitor_create
+  name: az datadog monitor create
+  summary: Create a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor create --monitor-name
+                              --resource-group
+                              [--datadog-organization-properties]
+                              [--location]
+                              [--no-wait]
+                              [--sku-name]
+                              [--tags]
+                              [--type {SystemAssigned, UserAssigned}]
+                              [--user-info]
+  examples:
+  - summary: Monitors_Create
+    syntax: az datadog monitor create --name "myMonitor" --resource-group "myResourceGroup" --location "West US 2" --tags Environment="Dev" --user-info name="Alice" email-address="alice@microsoft.com" phone-number="123-456-7890" --type "SystemAssigned" --sku-name "payg_v2_Monthly"
+  - summary: Monitors creation with linking to Datadogo organization.
+    syntax: az datadog monitor create --name "myMonitor" --resource-group "myResourceGroup" --location "West US 2" --datadog-organization-properties api-key=XX application-key=XX --tags Environment="Dev" --user-info name="Alice" email-address="alice@microsoft.com" phone-number="123-456-7890" --type "SystemAssigned" --sku-name "Linked"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --datadog-organization-properties
+    summary: Datadog organization properties.
+    description: >-
+      Usage: --datadog-organization-properties linking-auth-code=XX linking-client-id=XX redirect-uri=XX api-key=XX application-key=XX enterprise-app-id=XX
+
+
+      linking-auth-code: The auth code used to linking to an existing datadog organization.
+
+      linking-client-id: The client_id from an existing in exchange for an auth token to link organization.
+
+      redirect-uri: The redirect uri for linking.
+
+      api-key: Api key associated to the Datadog organization.
+
+      application-key: Application key associated to the Datadog organization.
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign on.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-name
+    summary: Name of the SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: SystemAssigned, UserAssigned
+    summary: Identity type.
+    description: ''
+  - name: --user-info
+    summary: User info.
+    description: >-
+      Usage: --user-info name=XX email-address=XX phone-number=XX
+
+
+      name: Name of the user
+
+      email-address: Email of the user used by Datadog for contacting them if needed
+
+      phone-number: Phone number of the user used by Datadog for contacting them if needed.
+- uid: az_datadog_monitor_delete
+  name: az datadog monitor delete
+  summary: Delete a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor delete --monitor-name
+                              --resource-group
+                              [--no-wait]
+                              [--yes]
+  examples:
+  - summary: Monitors_Delete
+    syntax: az datadog monitor delete --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datadog_monitor_get-default-key
+  name: az datadog monitor get-default-key
+  summary: Get the default api key.
+  description: ''
+  syntax: >-
+    az datadog monitor get-default-key --monitor-name
+                                       --resource-group
+  examples:
+  - summary: Monitors_GetDefaultKey
+    syntax: az datadog monitor get-default-key --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list
+  name: az datadog monitor list
+  summary: List all monitors under the specified resource group. And List all monitors under the specified subscription.
+  description: ''
+  syntax: az datadog monitor list [--resource-group]
+  examples:
+  - summary: Monitors_ListByResourceGroup
+    syntax: az datadog monitor list --resource-group "myResourceGroup"
+  - summary: Monitors_List
+    syntax: az datadog monitor list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-api-key
+  name: az datadog monitor list-api-key
+  summary: List the api keys for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-api-key --monitor-name
+                                    --resource-group
+  examples:
+  - summary: Monitors_ListApiKeys
+    syntax: az datadog monitor list-api-key --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-host
+  name: az datadog monitor list-host
+  summary: List the hosts for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-host --monitor-name
+                                 --resource-group
+  examples:
+  - summary: Monitors_ListHosts
+    syntax: az datadog monitor list-host --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-linked-resource
+  name: az datadog monitor list-linked-resource
+  summary: List all Azure resources associated to the same Datadog organization as the target resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-linked-resource --monitor-name
+                                            --resource-group
+  examples:
+  - summary: Monitors_ListLinkedResources
+    syntax: az datadog monitor list-linked-resource --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-monitored-resource
+  name: az datadog monitor list-monitored-resource
+  summary: List the resources currently being monitored by the Datadog monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-monitored-resource --monitor-name
+                                               --resource-group
+  examples:
+  - summary: Monitors_ListMonitoredResources
+    syntax: az datadog monitor list-monitored-resource --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_refresh-set-password-link
+  name: az datadog monitor refresh-set-password-link
+  summary: Refresh the set password link and return a latest one.
+  description: ''
+  syntax: >-
+    az datadog monitor refresh-set-password-link --monitor-name
+                                                 --resource-group
+  examples:
+  - summary: Monitors_RefreshSetPasswordLink
+    syntax: az datadog monitor refresh-set-password-link --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_set-default-key
+  name: az datadog monitor set-default-key
+  summary: Set the default api key.
+  description: ''
+  syntax: >-
+    az datadog monitor set-default-key --monitor-name
+                                       --resource-group
+                                       [--created]
+                                       [--created-by]
+                                       [--key]
+                                       [--name]
+  examples:
+  - summary: Monitors_SetDefaultKey
+    syntax: az datadog monitor set-default-key --monitor-name "myMonitor" --key "1111111111111111aaaaaaaaaaaaaaaa" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time of creation of the API key.
+    description: ''
+  - name: --created-by
+    summary: The user that created the API key.
+    description: ''
+  - name: --key
+    summary: The value of the API key.
+    description: ''
+  - name: --name
+    summary: The name of the API key.
+    description: ''
+- uid: az_datadog_monitor_show
+  name: az datadog monitor show
+  summary: Get the properties of a specific monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor show --monitor-name
+                            --resource-group
+  examples:
+  - summary: Monitors_Get
+    syntax: az datadog monitor show --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_update
+  name: az datadog monitor update
+  summary: Update a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor update --monitor-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Monitors_Update
+    syntax: az datadog monitor update --name "myMonitor" --tags Environment="Dev" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datadog_monitor_wait
+  name: az datadog monitor wait
+  summary: Place the CLI in a waiting state until a condition of the datadog monitor is met.
+  description: ''
+  syntax: >-
+    az datadog monitor wait --monitor-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datadog monitor is successfully created.
+    syntax: az datadog monitor wait --name "myMonitor" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the datadog monitor is successfully deleted.
+    syntax: az datadog monitor wait --name "myMonitor" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datadog_monitor_create
+- az_datadog_monitor_delete
+- az_datadog_monitor_get-default-key
+- az_datadog_monitor_list
+- az_datadog_monitor_list-api-key
+- az_datadog_monitor_list-host
+- az_datadog_monitor_list-linked-resource
+- az_datadog_monitor_list-monitored-resource
+- az_datadog_monitor_refresh-set-password-link
+- az_datadog_monitor_set-default-key
+- az_datadog_monitor_show
+- az_datadog_monitor_update
+- az_datadog_monitor_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage monitor with datadog.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datadog/sso-config.yml b/2018-03-01-hybrid/docs-ref-autogen/datadog/sso-config.yml
new file mode 100644
index 0000000000..f650395664
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datadog/sso-config.yml
@@ -0,0 +1,224 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_sso-config
+name: az datadog sso-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog sso-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage sso config with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_sso-config_create
+  name: az datadog sso-config create
+  summary: Configures single-sign-on for this resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config create --configuration-name
+                                 --monitor-name
+                                 --resource-group
+                                 [--no-wait]
+                                 [--properties]
+  examples:
+  - summary: SingleSignOnConfigurations_CreateOrUpdate
+    syntax: az datadog sso-config create --configuration-name "default" --monitor-name "myMonitor" --properties enterprise-app-id="00000000-0000-0000-0000-000000000000" single-sign-on-state="Enable" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --properties
+    summary: ''
+    description: >-
+      Usage: --properties provisioning-state=XX single-sign-on-state=XX enterprise-app-id=XX
+
+
+      single-sign-on-state: Various states of the SSO resource
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign-on.
+- uid: az_datadog_sso-config_list
+  name: az datadog sso-config list
+  summary: List the single sign-on configurations for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config list --monitor-name
+                               --resource-group
+  examples:
+  - summary: SingleSignOnConfigurations_List
+    syntax: az datadog sso-config list --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_sso-config_show
+  name: az datadog sso-config show
+  summary: Gets the datadog single sign-on resource for the given Monitor.
+  description: ''
+  syntax: >-
+    az datadog sso-config show --configuration-name
+                               --monitor-name
+                               --resource-group
+  examples:
+  - summary: SingleSignOnConfigurations_Get
+    syntax: az datadog sso-config show --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_sso-config_update
+  name: az datadog sso-config update
+  summary: Configures single-sign-on for this resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config update --configuration-name
+                                 --monitor-name
+                                 --resource-group
+                                 [--add]
+                                 [--force-string]
+                                 [--no-wait]
+                                 [--properties]
+                                 [--remove]
+                                 [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --properties
+    summary: ''
+    description: >-
+      Usage: --properties provisioning-state=XX single-sign-on-state=XX enterprise-app-id=XX
+
+
+      single-sign-on-state: Various states of the SSO resource
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign-on.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_datadog_sso-config_wait
+  name: az datadog sso-config wait
+  summary: Place the CLI in a waiting state until a condition of the datadog sso-config is met.
+  description: ''
+  syntax: >-
+    az datadog sso-config wait --configuration-name
+                               --monitor-name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datadog sso-config is successfully created.
+    syntax: az datadog sso-config wait --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the datadog sso-config is successfully updated.
+    syntax: az datadog sso-config wait --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup" --updated
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datadog_sso-config_create
+- az_datadog_sso-config_list
+- az_datadog_sso-config_show
+- az_datadog_sso-config_update
+- az_datadog_sso-config_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage sso config with datadog.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datadog/tag-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/datadog/tag-rule.yml
new file mode 100644
index 0000000000..f3ed087fa6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datadog/tag-rule.yml
@@ -0,0 +1,228 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_tag-rule
+name: az datadog tag-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog tag-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tag rule with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_tag-rule_create
+  name: az datadog tag-rule create
+  summary: Create a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule create --monitor-name
+                               --resource-group
+                               --rule-set-name
+                               [--filtering-tags]
+                               [--log-rules-filtering-tags]
+                               [--send-aad-logs {false, true}]
+                               [--send-resource-logs {false, true}]
+                               [--send-subscription-logs {false, true}]
+  examples:
+  - summary: TagRules_CreateOrUpdate
+    syntax: az datadog tag-rule create --monitor-name "myMonitor" --log-rules-filtering-tags name="Environment" action="Include" value="Prod" --log-rules-filtering-tags name="Environment" action="Exclude" value="Dev" --send-aad-logs false --send-resource-logs true --send-subscription-logs true --resource-group "myResourceGroup" --rule-set-name "default"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+  optionalParameters:
+  - name: --filtering-tags
+    summary: List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --filtering-tags argument.
+  - name: --log-rules-filtering-tags
+    summary: List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --log-rules-filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --log-rules-filtering-tags argument.
+  - name: --send-aad-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if AAD logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-resource-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure resource logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-subscription-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure subscription logs should be sent for the Monitor resource.
+    description: ''
+- uid: az_datadog_tag-rule_list
+  name: az datadog tag-rule list
+  summary: List the tag rules for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule list --monitor-name
+                             --resource-group
+  examples:
+  - summary: TagRules_List
+    syntax: az datadog tag-rule list --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_tag-rule_show
+  name: az datadog tag-rule show
+  summary: Get a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule show --monitor-name
+                             --resource-group
+                             --rule-set-name
+  examples:
+  - summary: TagRules_Get
+    syntax: az datadog tag-rule show --monitor-name "myMonitor" --resource-group "myResourceGroup" --rule-set-name "default"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+- uid: az_datadog_tag-rule_update
+  name: az datadog tag-rule update
+  summary: Update a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule update --monitor-name
+                               --resource-group
+                               --rule-set-name
+                               [--add]
+                               [--filtering-tags]
+                               [--force-string]
+                               [--log-rules-filtering-tags]
+                               [--remove]
+                               [--send-aad-logs {false, true}]
+                               [--send-resource-logs {false, true}]
+                               [--send-subscription-logs {false, true}]
+                               [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --filtering-tags
+    summary: List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --filtering-tags argument.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --log-rules-filtering-tags
+    summary: List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --log-rules-filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --log-rules-filtering-tags argument.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --send-aad-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if AAD logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-resource-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure resource logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-subscription-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure subscription logs should be sent for the Monitor resource.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_datadog_tag-rule_create
+- az_datadog_tag-rule_list
+- az_datadog_tag-rule_show
+- az_datadog_tag-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tag rule with datadog.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datadog/terms.yml b/2018-03-01-hybrid/docs-ref-autogen/datadog/terms.yml
new file mode 100644
index 0000000000..43aee9f595
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datadog/terms.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_terms
+name: az datadog terms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog terms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage marketplace agreements with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_terms_create
+  name: az datadog terms create
+  summary: Create Datadog marketplace agreement in the subscription.
+  description: ''
+  syntax: az datadog terms create [--properties]
+  examples:
+  - summary: MarketplaceAgreements_CreateOrUpdate
+    syntax: az datadog terms create --properties accepted=true
+  optionalParameters:
+  - name: --properties
+    summary: Represents the properties of the resource.
+    description: >-
+      Usage: --properties publisher=XX product=XX plan=XX license-text-link=XX privacy-policy-link=XX retrieve-datetime=XX signature=XX accepted=XX
+
+
+      publisher: Publisher identifier string.
+
+      product: Product identifier string.
+
+      plan: Plan identifier string.
+
+      license-text-link: Link to HTML with Microsoft and Publisher terms.
+
+      privacy-policy-link: Link to the privacy policy of the publisher.
+
+      retrieve-datetime: Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.
+
+      signature: Terms signature.
+
+      accepted: If any version of the terms have been accepted, otherwise false.
+- uid: az_datadog_terms_list
+  name: az datadog terms list
+  summary: List datadog marketplace agreements.
+  description: ''
+  syntax: az datadog terms list
+  examples:
+  - summary: List marketplace agreements
+    syntax: az datadog terms list
+- uid: az_datadog_terms_update
+  name: az datadog terms update
+  summary: Update Datadog marketplace agreement in the subscription.
+  description: ''
+  syntax: az datadog terms update [--properties]
+  optionalParameters:
+  - name: --properties
+    summary: Represents the properties of the resource.
+    description: >-
+      Usage: --properties publisher=XX product=XX plan=XX license-text-link=XX privacy-policy-link=XX retrieve-datetime=XX signature=XX accepted=XX
+
+
+      publisher: Publisher identifier string.
+
+      product: Product identifier string.
+
+      plan: Plan identifier string.
+
+      license-text-link: Link to HTML with Microsoft and Publisher terms.
+
+      privacy-policy-link: Link to the privacy policy of the publisher.
+
+      retrieve-datetime: Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.
+
+      signature: Terms signature.
+
+      accepted: If any version of the terms have been accepted, otherwise false.
+commands:
+- az_datadog_terms_create
+- az_datadog_terms_list
+- az_datadog_terms_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage marketplace agreements with datadog.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory.yml
new file mode 100644
index 0000000000..dddd6f3be0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory.yml
@@ -0,0 +1,404 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory
+name: az datafactory
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage factory with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_configure-factory-repo
+  name: az datafactory configure-factory-repo
+  summary: Updates a factory's repo information.
+  description: ''
+  syntax: >-
+    az datafactory configure-factory-repo --location
+                                          [--factory-git-hub-configuration]
+                                          [--factory-resource-id]
+                                          [--factory-vsts-configuration]
+  examples:
+  - summary: Factories_ConfigureFactoryRepo
+    syntax: az datafactory configure-factory-repo --factory-resource-id "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName" --factory-vsts-configuration account-name="ADF" collaboration-branch="master" last-commit-id="" project-name="project" repository-name="repo" root-folder="/" tenant-id="" --location "East US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --factory-git-hub-configuration --github-config
+    summary: Factory's GitHub repo information.
+    description: >-
+      Usage: --factory-git-hub-configuration host-name=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      host-name: GitHub Enterprise host name. For example: https://github.mydomain.com
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --factory-resource-id
+    summary: The factory resource id.
+    description: ''
+  - name: --factory-vsts-configuration --vsts-config
+    summary: Factory's VSTS repo information.
+    description: >-
+      Usage: --factory-vsts-configuration project-name=XX tenant-id=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      project-name: Required. VSTS project name.
+
+      tenant-id: VSTS tenant id.
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+- uid: az_datafactory_create
+  name: az datafactory create
+  summary: Create a factory.
+  description: ''
+  syntax: >-
+    az datafactory create --factory-name
+                          --resource-group
+                          [--factory-git-hub-configuration]
+                          [--factory-vsts-configuration]
+                          [--global-parameters]
+                          [--if-match]
+                          [--location]
+                          [--tags]
+  examples:
+  - summary: Factories_CreateOrUpdate
+    syntax: az datafactory create --location "East US" --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --factory-git-hub-configuration --github-config
+    summary: Factory's GitHub repo information.
+    description: >-
+      Usage: --factory-git-hub-configuration host-name=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      host-name: GitHub Enterprise host name. For example: https://github.mydomain.com
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --factory-vsts-configuration --vsts-config
+    summary: Factory's VSTS repo information.
+    description: >-
+      Usage: --factory-vsts-configuration project-name=XX tenant-id=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      project-name: Required. VSTS project name.
+
+      tenant-id: VSTS tenant id.
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --global-parameters
+    summary: 'List of parameters for factory. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --if-match
+    summary: ETag of the factory entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datafactory_delete
+  name: az datafactory delete
+  summary: Deletes a factory.
+  description: ''
+  syntax: >-
+    az datafactory delete --factory-name
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Factories_Delete
+    syntax: az datafactory delete --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_get-data-plane-access
+  name: az datafactory get-data-plane-access
+  summary: Get Data Plane access.
+  description: ''
+  syntax: >-
+    az datafactory get-data-plane-access --factory-name
+                                         --resource-group
+                                         [--access-resource-path]
+                                         [--expire-time]
+                                         [--permissions]
+                                         [--profile-name]
+                                         [--start-time]
+  examples:
+  - summary: Factories_GetDataPlaneAccess
+    syntax: az datafactory get-data-plane-access --name "exampleFactoryName" --access-resource-path "" --expire-time "2018-11-10T09:46:20.2659347Z" --permissions "r" --profile-name "DefaultProfile" --start-time "2018-11-10T02:46:20.2659347Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --access-resource-path
+    summary: The resource path to get access relative to factory. Currently only empty string is supported which corresponds to the factory resource.
+    description: ''
+  - name: --expire-time
+    summary: Expiration time for the token. Maximum duration for the token is eight hours and by default the token will expire in eight hours.
+    description: ''
+  - name: --permissions
+    summary: The string with permissions for Data Plane access. Currently only 'r' is supported which grants read only access.
+    description: ''
+  - name: --profile-name
+    summary: The name of the profile. Currently only the default is supported. The default value is DefaultProfile.
+    description: ''
+  - name: --start-time
+    summary: Start time for the token. If not specified the current time will be used.
+    description: ''
+- uid: az_datafactory_get-git-hub-access-token
+  name: az datafactory get-git-hub-access-token
+  summary: Get GitHub Access Token.
+  description: ''
+  syntax: >-
+    az datafactory get-git-hub-access-token --factory-name
+                                            --git-hub-access-code
+                                            --git-hub-access-token-base-url
+                                            --resource-group
+                                            [--git-hub-client-id]
+  examples:
+  - summary: Factories_GetGitHubAccessToken
+    syntax: az datafactory get-git-hub-access-token --name "exampleFactoryName" --git-hub-access-code "some" --git-hub-access-token-base-url "some" --git-hub-client-id "some" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --git-hub-access-code
+    summary: GitHub access code.
+    description: ''
+  - isRequired: true
+    name: --git-hub-access-token-base-url
+    summary: GitHub access token base URL.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --git-hub-client-id
+    summary: GitHub application client ID.
+    description: ''
+- uid: az_datafactory_list
+  name: az datafactory list
+  summary: Lists factories. And Lists factories under the specified subscription.
+  description: ''
+  syntax: az datafactory list [--resource-group]
+  examples:
+  - summary: Factories_ListByResourceGroup
+    syntax: az datafactory list --resource-group "exampleResourceGroup"
+  - summary: Factories_List
+    syntax: az datafactory list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_show
+  name: az datafactory show
+  summary: Gets a factory.
+  description: ''
+  syntax: >-
+    az datafactory show --factory-name
+                        --resource-group
+                        [--if-none-match]
+  examples:
+  - summary: Factories_Get
+    syntax: az datafactory show --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the factory entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_update
+  name: az datafactory update
+  summary: Updates a factory.
+  description: ''
+  syntax: >-
+    az datafactory update --factory-name
+                          --resource-group
+                          [--tags]
+  examples:
+  - summary: Factories_Update
+    syntax: az datafactory update --name "exampleFactoryName" --tags exampleTag="exampleValue" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_datafactory_activity-run
+- az_datafactory_activity-run_query-by-pipeline-run
+- az_datafactory_configure-factory-repo
+- az_datafactory_create
+- az_datafactory_dataset
+- az_datafactory_dataset_create
+- az_datafactory_dataset_delete
+- az_datafactory_dataset_list
+- az_datafactory_dataset_show
+- az_datafactory_dataset_update
+- az_datafactory_delete
+- az_datafactory_get-data-plane-access
+- az_datafactory_get-git-hub-access-token
+- az_datafactory_integration-runtime
+- az_datafactory_integration-runtime_delete
+- az_datafactory_integration-runtime_get-connection-info
+- az_datafactory_integration-runtime_get-monitoring-data
+- az_datafactory_integration-runtime_get-status
+- az_datafactory_integration-runtime_linked-integration-runtime
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+- az_datafactory_integration-runtime_list
+- az_datafactory_integration-runtime_list-auth-key
+- az_datafactory_integration-runtime_managed
+- az_datafactory_integration-runtime_managed_create
+- az_datafactory_integration-runtime_regenerate-auth-key
+- az_datafactory_integration-runtime_remove-link
+- az_datafactory_integration-runtime_self-hosted
+- az_datafactory_integration-runtime_self-hosted_create
+- az_datafactory_integration-runtime_show
+- az_datafactory_integration-runtime_start
+- az_datafactory_integration-runtime_stop
+- az_datafactory_integration-runtime_sync-credentials
+- az_datafactory_integration-runtime_update
+- az_datafactory_integration-runtime_upgrade
+- az_datafactory_integration-runtime_wait
+- az_datafactory_integration-runtime-node
+- az_datafactory_integration-runtime-node_delete
+- az_datafactory_integration-runtime-node_get-ip-address
+- az_datafactory_integration-runtime-node_show
+- az_datafactory_integration-runtime-node_update
+- az_datafactory_linked-service
+- az_datafactory_linked-service_create
+- az_datafactory_linked-service_delete
+- az_datafactory_linked-service_list
+- az_datafactory_linked-service_show
+- az_datafactory_linked-service_update
+- az_datafactory_list
+- az_datafactory_pipeline
+- az_datafactory_pipeline_create
+- az_datafactory_pipeline_create-run
+- az_datafactory_pipeline_delete
+- az_datafactory_pipeline_list
+- az_datafactory_pipeline_show
+- az_datafactory_pipeline_update
+- az_datafactory_pipeline-run
+- az_datafactory_pipeline-run_cancel
+- az_datafactory_pipeline-run_query-by-factory
+- az_datafactory_pipeline-run_show
+- az_datafactory_show
+- az_datafactory_trigger
+- az_datafactory_trigger_create
+- az_datafactory_trigger_delete
+- az_datafactory_trigger_get-event-subscription-status
+- az_datafactory_trigger_list
+- az_datafactory_trigger_query-by-factory
+- az_datafactory_trigger_show
+- az_datafactory_trigger_start
+- az_datafactory_trigger_stop
+- az_datafactory_trigger_subscribe-to-event
+- az_datafactory_trigger_unsubscribe-from-event
+- az_datafactory_trigger_update
+- az_datafactory_trigger_wait
+- az_datafactory_trigger-run
+- az_datafactory_trigger-run_cancel
+- az_datafactory_trigger-run_query-by-factory
+- az_datafactory_trigger-run_rerun
+- az_datafactory_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage factory with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/activity-run.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/activity-run.yml
new file mode 100644
index 0000000000..5a4487a65f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/activity-run.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_activity-run
+name: az datafactory activity-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory activity-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage activity run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_activity-run_query-by-pipeline-run
+  name: az datafactory activity-run query-by-pipeline-run
+  summary: Query activity runs based on input filter conditions.
+  description: ''
+  syntax: >-
+    az datafactory activity-run query-by-pipeline-run --factory-name
+                                                      --last-updated-after
+                                                      --last-updated-before
+                                                      --resource-group
+                                                      --run-id
+                                                      [--continuation-token]
+                                                      [--filters]
+                                                      [--order-by]
+  examples:
+  - summary: ActivityRuns_QueryByPipelineRun
+    syntax: az datafactory activity-run query-by-pipeline-run --factory-name "exampleFactoryName" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+commands:
+- az_datafactory_activity-run_query-by-pipeline-run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage activity run with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/dataset.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/dataset.yml
new file mode 100644
index 0000000000..6d566d2665
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/dataset.yml
@@ -0,0 +1,226 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_dataset
+name: az datafactory dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage dataset with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_dataset_create
+  name: az datafactory dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset create --dataset-name
+                                  --factory-name
+                                  --properties
+                                  --resource-group
+                                  [--if-match]
+  examples:
+  - summary: Datasets_Create
+    syntax: az datafactory dataset create --properties "{\"type\":\"AzureBlob\",\"linkedServiceName\":{\"type\":\"LinkedServiceReference\",\"referenceName\":\"exampleLinkedService\"},\"parameters\":{\"MyFileName\":{\"type\":\"String\"},\"MyFolderPath\":{\"type\":\"String\"}},\"typeProperties\":{\"format\":{\"type\":\"TextFormat\"},\"fileName\":{\"type\":\"Expression\",\"value\":\"@dataset().MyFileName\"},\"folderPath\":{\"type\":\"Expression\",\"value\":\"@dataset().MyFolderPath\"}}}" --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Dataset properties. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the dataset entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_dataset_delete
+  name: az datafactory dataset delete
+  summary: Deletes a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset delete --dataset-name
+                                  --factory-name
+                                  --resource-group
+                                  [--yes]
+  examples:
+  - summary: Datasets_Delete
+    syntax: az datafactory dataset delete --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_dataset_list
+  name: az datafactory dataset list
+  summary: Lists datasets.
+  description: ''
+  syntax: >-
+    az datafactory dataset list --factory-name
+                                --resource-group
+  examples:
+  - summary: Datasets_ListByFactory
+    syntax: az datafactory dataset list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_dataset_show
+  name: az datafactory dataset show
+  summary: Gets a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset show --dataset-name
+                                --factory-name
+                                --resource-group
+                                [--if-none-match]
+  examples:
+  - summary: Datasets_Get
+    syntax: az datafactory dataset show --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the dataset entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_dataset_update
+  name: az datafactory dataset update
+  summary: Update a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset update --dataset-name
+                                  --factory-name
+                                  --linked-service-name
+                                  --resource-group
+                                  [--add]
+                                  [--annotations]
+                                  [--description]
+                                  [--folder]
+                                  [--force-string]
+                                  [--if-match]
+                                  [--if-none-match]
+                                  [--parameters]
+                                  [--remove]
+                                  [--schema]
+                                  [--set]
+                                  [--structure]
+  examples:
+  - summary: Datasets_Update
+    syntax: az datafactory dataset update --description "Example description" --linked-service-name "{\"type\":\"LinkedServiceReference\",\"referenceName\":\"exampleLinkedService\"}" --parameters "{\"MyFileName\":{\"type\":\"String\"},\"MyFolderPath\":{\"type\":\"String\"}}" --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name
+    summary: 'Linked service reference. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the Dataset. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Dataset description.
+    description: ''
+  - name: --folder
+    summary: The folder that this Dataset is in. If not specified, Dataset will appear at the root level.
+    description: >-
+      Usage: --folder name=XX
+
+
+      name: The name of the folder that this Dataset is in.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the dataset entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the dataset entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters for dataset. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --schema
+    summary: 'Columns that define the physical type schema of the dataset. Type: array (or Expression with resultType array), itemType: DatasetSchemaDataElement. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --structure
+    summary: 'Columns that define the structure of the dataset. Type: array (or Expression with resultType array), itemType: DatasetDataElement. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_dataset_create
+- az_datafactory_dataset_delete
+- az_datafactory_dataset_list
+- az_datafactory_dataset_show
+- az_datafactory_dataset_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage dataset with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime-node.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime-node.yml
new file mode 100644
index 0000000000..17a025d274
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime-node.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime-node
+name: az datafactory integration-runtime-node
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime-node** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime node with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime-node_delete
+  name: az datafactory integration-runtime-node delete
+  summary: Deletes a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node delete --factory-name
+                                                   --integration-runtime-name
+                                                   --node-name
+                                                   --resource-group
+                                                   [--yes]
+  examples:
+  - summary: IntegrationRuntimesNodes_Delete
+    syntax: az datafactory integration-runtime-node delete --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_get-ip-address
+  name: az datafactory integration-runtime-node get-ip-address
+  summary: Get the IP address of self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node get-ip-address --factory-name
+                                                           --integration-runtime-name
+                                                           --node-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimeNodes_GetIpAddress
+    syntax: az datafactory integration-runtime-node get-ip-address --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_show
+  name: az datafactory integration-runtime-node show
+  summary: Gets a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node show --factory-name
+                                                 --integration-runtime-name
+                                                 --node-name
+                                                 --resource-group
+  examples:
+  - summary: IntegrationRuntimeNodes_Get
+    syntax: az datafactory integration-runtime-node show --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_update
+  name: az datafactory integration-runtime-node update
+  summary: Updates a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node update --factory-name
+                                                   --integration-runtime-name
+                                                   --node-name
+                                                   --resource-group
+                                                   [--concurrent-jobs-limit]
+  examples:
+  - summary: IntegrationRuntimeNodes_Update
+    syntax: az datafactory integration-runtime-node update --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup" --concurrent-jobs-limit 2
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --concurrent-jobs-limit
+    summary: The number of concurrent jobs permitted to run on the integration runtime node. Values between 1 and maxConcurrentJobs(inclusive) are allowed.
+    description: ''
+commands:
+- az_datafactory_integration-runtime-node_delete
+- az_datafactory_integration-runtime-node_get-ip-address
+- az_datafactory_integration-runtime-node_show
+- az_datafactory_integration-runtime-node_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime node with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime.yml
new file mode 100644
index 0000000000..88b13e9bad
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime.yml
@@ -0,0 +1,480 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime
+name: az datafactory integration-runtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_delete
+  name: az datafactory integration-runtime delete
+  summary: Deletes an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime delete --factory-name
+                                              --integration-runtime-name
+                                              --resource-group
+                                              [--yes]
+  examples:
+  - summary: IntegrationRuntimes_Delete
+    syntax: az datafactory integration-runtime delete --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-connection-info
+  name: az datafactory integration-runtime get-connection-info
+  summary: Gets the on-premises integration runtime connection information for encrypting the on-premises data source credentials.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-connection-info --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetConnectionInfo
+    syntax: az datafactory integration-runtime get-connection-info --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-monitoring-data
+  name: az datafactory integration-runtime get-monitoring-data
+  summary: Get the integration runtime monitoring data, which includes the monitor data for all the nodes under this integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-monitoring-data --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetMonitoringData
+    syntax: az datafactory integration-runtime get-monitoring-data --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-status
+  name: az datafactory integration-runtime get-status
+  summary: Gets detailed status information for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-status --factory-name
+                                                  --integration-runtime-name
+                                                  --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetStatus
+    syntax: az datafactory integration-runtime get-status --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_list
+  name: az datafactory integration-runtime list
+  summary: Lists integration runtimes.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime list --factory-name
+                                            --resource-group
+  examples:
+  - summary: IntegrationRuntimes_ListByFactory
+    syntax: az datafactory integration-runtime list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_list-auth-key
+  name: az datafactory integration-runtime list-auth-key
+  summary: Retrieves the authentication keys for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime list-auth-key --factory-name
+                                                     --integration-runtime-name
+                                                     --resource-group
+  examples:
+  - summary: IntegrationRuntimes_ListAuthKeys
+    syntax: az datafactory integration-runtime list-auth-key --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_regenerate-auth-key
+  name: az datafactory integration-runtime regenerate-auth-key
+  summary: Regenerates the authentication key for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime regenerate-auth-key --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+                                                           [--key-name {authKey1, authKey2}]
+  examples:
+  - summary: IntegrationRuntimes_RegenerateAuthKey
+    syntax: az datafactory integration-runtime regenerate-auth-key --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --key-name "authKey2" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: authKey1, authKey2
+    summary: The name of the authentication key to regenerate.
+    description: ''
+- uid: az_datafactory_integration-runtime_remove-link
+  name: az datafactory integration-runtime remove-link
+  summary: Remove all linked integration runtimes under specific data factory in a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime remove-link --factory-name
+                                                   --integration-runtime-name
+                                                   --linked-factory-name
+                                                   --resource-group
+  examples:
+  - summary: IntegrationRuntimes_Upgrade
+    syntax: az datafactory integration-runtime remove-link --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --linked-factory-name "exampleFactoryName-linked" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --linked-factory-name
+    summary: The data factory name for linked integration runtime.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_show
+  name: az datafactory integration-runtime show
+  summary: Gets an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime show --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--if-none-match]
+  examples:
+  - summary: IntegrationRuntimes_Get
+    syntax: az datafactory integration-runtime show --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_integration-runtime_start
+  name: az datafactory integration-runtime start
+  summary: Starts a ManagedReserved type integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime start --factory-name
+                                             --integration-runtime-name
+                                             --resource-group
+                                             [--no-wait]
+  examples:
+  - summary: IntegrationRuntimes_Start
+    syntax: az datafactory integration-runtime start --factory-name "exampleFactoryName" --name "exampleManagedIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_integration-runtime_stop
+  name: az datafactory integration-runtime stop
+  summary: Stops a ManagedReserved type integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime stop --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--no-wait]
+  examples:
+  - summary: IntegrationRuntimes_Stop
+    syntax: az datafactory integration-runtime stop --factory-name "exampleFactoryName" --name "exampleManagedIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_integration-runtime_sync-credentials
+  name: az datafactory integration-runtime sync-credentials
+  summary: Force the integration runtime to synchronize credentials across integration runtime nodes, and this will override the credentials across all worker nodes with those available on the dispatcher node. If you already have the latest credential backup file, you should manually import it (preferred) on any self-hosted integration runtime node than using this API directly.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime sync-credentials --factory-name
+                                                        --integration-runtime-name
+                                                        --resource-group
+  examples:
+  - summary: IntegrationRuntimes_SyncCredentials
+    syntax: az datafactory integration-runtime sync-credentials --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_update
+  name: az datafactory integration-runtime update
+  summary: Updates an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime update --factory-name
+                                              --integration-runtime-name
+                                              --resource-group
+                                              [--auto-update {Off, On}]
+                                              [--update-delay-offset]
+  examples:
+  - summary: IntegrationRuntimes_Update
+    syntax: az datafactory integration-runtime update --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup" --auto-update "Off" --update-delay-offset "\"PT3H\""
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enables or disables the auto-update feature of the self-hosted integration runtime. See https://go.microsoft.com/fwlink/?linkid=854189.
+    description: ''
+  - name: --update-delay-offset
+    summary: The time offset (in hours) in the day, e.g., PT03H is 3 hours. The integration runtime auto update will happen on that time.
+    description: ''
+- uid: az_datafactory_integration-runtime_upgrade
+  name: az datafactory integration-runtime upgrade
+  summary: Upgrade self-hosted integration runtime to latest version if availability.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime upgrade --factory-name
+                                               --integration-runtime-name
+                                               --resource-group
+  examples:
+  - summary: IntegrationRuntimes_Upgrade
+    syntax: az datafactory integration-runtime upgrade --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_wait
+  name: az datafactory integration-runtime wait
+  summary: Place the CLI in a waiting state until a condition of the datafactory integration-runtime is met.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime wait --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--created]
+                                            [--custom]
+                                            [--deleted]
+                                            [--exists]
+                                            [--if-none-match]
+                                            [--interval]
+                                            [--timeout]
+                                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datafactory integration-runtime is successfully created.
+    syntax: az datafactory integration-runtime wait --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup" --created
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datafactory_integration-runtime_delete
+- az_datafactory_integration-runtime_get-connection-info
+- az_datafactory_integration-runtime_get-monitoring-data
+- az_datafactory_integration-runtime_get-status
+- az_datafactory_integration-runtime_linked-integration-runtime
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+- az_datafactory_integration-runtime_list
+- az_datafactory_integration-runtime_list-auth-key
+- az_datafactory_integration-runtime_managed
+- az_datafactory_integration-runtime_managed_create
+- az_datafactory_integration-runtime_regenerate-auth-key
+- az_datafactory_integration-runtime_remove-link
+- az_datafactory_integration-runtime_self-hosted
+- az_datafactory_integration-runtime_self-hosted_create
+- az_datafactory_integration-runtime_show
+- az_datafactory_integration-runtime_start
+- az_datafactory_integration-runtime_stop
+- az_datafactory_integration-runtime_sync-credentials
+- az_datafactory_integration-runtime_update
+- az_datafactory_integration-runtime_upgrade
+- az_datafactory_integration-runtime_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml
new file mode 100644
index 0000000000..748df0e7d1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_linked-integration-runtime
+name: az datafactory integration-runtime linked-integration-runtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime linked-integration-runtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group linked-integration-runtime.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_linked-integration-runtime_create
+  name: az datafactory integration-runtime linked-integration-runtime create
+  summary: Create a linked integration runtime entry in a shared integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime linked-integration-runtime create --factory-name
+                                                                         --integration-runtime-name
+                                                                         --resource-group
+                                                                         [--data-factory-name]
+                                                                         [--location]
+                                                                         [--name]
+                                                                         [--subscription-id]
+  examples:
+  - summary: IntegrationRuntimes_CreateLinkedIntegrationRuntime
+    syntax: az datafactory integration-runtime linked-integration-runtime create --name "bfa92911-9fb6-4fbe-8f23-beae87bc1c83" --location "West US" --data-factory-name "e9955d6d-56ea-4be3-841c-52a12c1a9981" --subscription-id "061774c7-4b5a-4159-a55b-365581830283" --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-factory-name
+    summary: The name of the data factory that the linked integration runtime belongs to.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: The name of the linked integration runtime.
+    description: ''
+  - name: --subscription-id
+    summary: The ID of the subscription that the linked integration runtime belongs to.
+    description: ''
+commands:
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group linked-integration-runtime.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/managed.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/managed.yml
new file mode 100644
index 0000000000..75036b9269
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/managed.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_managed
+name: az datafactory integration-runtime managed
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime managed** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group managed.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_managed_create
+  name: az datafactory integration-runtime managed create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime managed create --factory-name
+                                                      --integration-runtime-name
+                                                      --resource-group
+                                                      [--compute-properties]
+                                                      [--description]
+                                                      [--if-match]
+                                                      [--ssis-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compute-properties
+    summary: 'The compute resource for managed integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --ssis-properties
+    summary: 'SSIS properties for managed integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_integration-runtime_managed_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group managed.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml
new file mode 100644
index 0000000000..1f867dcd53
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_self-hosted
+name: az datafactory integration-runtime self-hosted
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime self-hosted** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group self-hosted.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_self-hosted_create
+  name: az datafactory integration-runtime self-hosted create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime self-hosted create --factory-name
+                                                          --integration-runtime-name
+                                                          --resource-group
+                                                          [--description]
+                                                          [--if-match]
+                                                          [--linked-info]
+  examples:
+  - summary: IntegrationRuntimes_Create
+    syntax: az datafactory integration-runtime self-hosted create --factory-name "exampleFactoryName" --description "A selfhosted integration runtime" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --linked-info
+    summary: 'The base definition of a linked integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_integration-runtime_self-hosted_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group self-hosted.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/linked-service.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/linked-service.yml
new file mode 100644
index 0000000000..5db4a171b3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/linked-service.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_linked-service
+name: az datafactory linked-service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory linked-service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage linked service with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_linked-service_create
+  name: az datafactory linked-service create
+  summary: Create a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service create --factory-name
+                                         --linked-service-name
+                                         --properties
+                                         --resource-group
+                                         [--if-match]
+  examples:
+  - summary: LinkedServices_Create
+    syntax: az datafactory linked-service create --factory-name "exampleFactoryName" --properties "{\"type\":\"AzureStorage\",\"typeProperties\":{\"connectionString\":{\"type\":\"SecureString\",\"value\":\"DefaultEndpointsProtocol=https;AccountName=examplestorageaccount;AccountKey=<storage key>\"}}}" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Properties of linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the linkedService entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_linked-service_delete
+  name: az datafactory linked-service delete
+  summary: Deletes a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service delete --factory-name
+                                         --linked-service-name
+                                         --resource-group
+                                         [--yes]
+  examples:
+  - summary: LinkedServices_Delete
+    syntax: az datafactory linked-service delete --factory-name "exampleFactoryName" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_linked-service_list
+  name: az datafactory linked-service list
+  summary: Lists linked services.
+  description: ''
+  syntax: >-
+    az datafactory linked-service list --factory-name
+                                       --resource-group
+  examples:
+  - summary: LinkedServices_ListByFactory
+    syntax: az datafactory linked-service list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_linked-service_show
+  name: az datafactory linked-service show
+  summary: Gets a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service show --factory-name
+                                       --linked-service-name
+                                       --resource-group
+                                       [--if-none-match]
+  examples:
+  - summary: LinkedServices_Get
+    syntax: az datafactory linked-service show --factory-name "exampleFactoryName" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the linked service entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_linked-service_update
+  name: az datafactory linked-service update
+  summary: Update a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service update --factory-name
+                                         --linked-service-name
+                                         --resource-group
+                                         [--add]
+                                         [--annotations]
+                                         [--connect-via]
+                                         [--description]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--parameters]
+                                         [--remove]
+                                         [--set]
+  examples:
+  - summary: LinkedServices_Update
+    syntax: az datafactory linked-service update --factory-name "exampleFactoryName" --description "Example description" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --connect-via
+    summary: 'The integration runtime reference. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Linked service description.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the linkedService entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the linked service entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters for linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_datafactory_linked-service_create
+- az_datafactory_linked-service_delete
+- az_datafactory_linked-service_list
+- az_datafactory_linked-service_show
+- az_datafactory_linked-service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage linked service with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/pipeline-run.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/pipeline-run.yml
new file mode 100644
index 0000000000..812414abac
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/pipeline-run.yml
@@ -0,0 +1,147 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_pipeline-run
+name: az datafactory pipeline-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory pipeline-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage pipeline run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_pipeline-run_cancel
+  name: az datafactory pipeline-run cancel
+  summary: Cancel a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run cancel --factory-name
+                                       --resource-group
+                                       --run-id
+                                       [--is-recursive {false, true}]
+  examples:
+  - summary: PipelineRuns_Cancel
+    syntax: az datafactory pipeline-run cancel --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "16ac5348-ff82-4f95-a80d-638c1d47b721"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  optionalParameters:
+  - name: --is-recursive
+    parameterValueGroup: false, true
+    summary: If true, cancel all the Child pipelines that are triggered by the current pipeline.
+    description: ''
+- uid: az_datafactory_pipeline-run_query-by-factory
+  name: az datafactory pipeline-run query-by-factory
+  summary: Query pipeline runs in the factory based on input filter conditions.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run query-by-factory --factory-name
+                                                 --last-updated-after
+                                                 --last-updated-before
+                                                 --resource-group
+                                                 [--continuation-token]
+                                                 [--filters]
+                                                 [--order-by]
+  examples:
+  - summary: PipelineRuns_QueryByFactory
+    syntax: az datafactory pipeline-run query-by-factory --factory-name "exampleFactoryName" --filters operand="PipelineName" operator="Equals" values="examplePipeline" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+- uid: az_datafactory_pipeline-run_show
+  name: az datafactory pipeline-run show
+  summary: Get a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run show --factory-name
+                                     --resource-group
+                                     --run-id
+  examples:
+  - summary: PipelineRuns_Get
+    syntax: az datafactory pipeline-run show --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+commands:
+- az_datafactory_pipeline-run_cancel
+- az_datafactory_pipeline-run_query-by-factory
+- az_datafactory_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage pipeline run with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/pipeline.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/pipeline.yml
new file mode 100644
index 0000000000..aa76dd493e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/pipeline.yml
@@ -0,0 +1,277 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_pipeline
+name: az datafactory pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage pipeline with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_pipeline_create
+  name: az datafactory pipeline create
+  summary: Create a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline create --factory-name
+                                   --name
+                                   --pipeline
+                                   --resource-group
+                                   [--if-match]
+  examples:
+  - summary: Pipelines_Create
+    syntax: az datafactory pipeline create --factory-name "exampleFactoryName" --pipeline "{\"activities\":[{\"name\":\"ExampleForeachActivity\",\"type\":\"ForEach\",\"typeProperties\":{\"activities\":[{\"name\":\"ExampleCopyActivity\",\"type\":\"Copy\",\"inputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":\"examplecontainer.csv\",\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"outputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":{\"type\":\"Expression\",\"value\":\"@item()\"},\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"typeProperties\":{\"dataIntegrationUnits\":32,\"sink\":{\"type\":\"BlobSink\"},\"source\":{\"type\":\"BlobSource\"}}}],\"isSequential\":true,\"items\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.OutputBlobNameList\"}}}],\"parameters\":{\"JobId\":{\"type\":\"String\"},\"OutputBlobNameList\":{\"type\":\"Array\"}},\"variables\":{\"TestVariableArray\":{\"type\":\"Array\"}},\"runDimensions\":{\"JobId\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.JobId\"}},\"duration\":\"0.00:10:00\"}" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --pipeline
+    summary: 'Pipeline resource definition. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the pipeline entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_pipeline_create-run
+  name: az datafactory pipeline create-run
+  summary: Creates a run of a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline create-run --factory-name
+                                       --name
+                                       --resource-group
+                                       [--is-recovery {false, true}]
+                                       [--parameters]
+                                       [--reference-pipeline-run-id]
+                                       [--start-activity-name]
+                                       [--start-from-failure {false, true}]
+  examples:
+  - summary: Pipelines_CreateRun
+    syntax: az datafactory pipeline create-run --factory-name "exampleFactoryName" --parameters "{\"OutputBlobNameList\":[\"exampleoutput.csv\"]}" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --is-recovery
+    parameterValueGroup: false, true
+    summary: Recovery mode flag. If recovery mode is set to true, the specified referenced pipeline run and the new run will be grouped under the same groupId.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters of the pipeline run. These parameters will be used only if the runId is not specified. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --reference-pipeline-run-id
+    summary: The pipeline run identifier. If run ID is specified the parameters of the specified run will be used to create a new run.
+    description: ''
+  - name: --start-activity-name
+    summary: In recovery mode, the rerun will start from this activity. If not specified, all activities will run.
+    description: ''
+  - name: --start-from-failure
+    parameterValueGroup: false, true
+    summary: In recovery mode, if set to true, the rerun will start from failed activities. The property will be used only if startActivityName is not specified.
+    description: ''
+- uid: az_datafactory_pipeline_delete
+  name: az datafactory pipeline delete
+  summary: Deletes a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline delete --factory-name
+                                   --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Pipelines_Delete
+    syntax: az datafactory pipeline delete --factory-name "exampleFactoryName" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_pipeline_list
+  name: az datafactory pipeline list
+  summary: Lists pipelines.
+  description: ''
+  syntax: >-
+    az datafactory pipeline list --factory-name
+                                 --resource-group
+  examples:
+  - summary: Pipelines_ListByFactory
+    syntax: az datafactory pipeline list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_pipeline_show
+  name: az datafactory pipeline show
+  summary: Gets a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline show --factory-name
+                                 --name
+                                 --resource-group
+                                 [--if-none-match]
+  examples:
+  - summary: Pipelines_Get
+    syntax: az datafactory pipeline show --factory-name "exampleFactoryName" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the pipeline entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_pipeline_update
+  name: az datafactory pipeline update
+  summary: Update a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline update --factory-name
+                                   --name
+                                   --resource-group
+                                   [--activities]
+                                   [--add]
+                                   [--annotations]
+                                   [--concurrency]
+                                   [--description]
+                                   [--duration]
+                                   [--folder-name]
+                                   [--force-string]
+                                   [--if-match]
+                                   [--if-none-match]
+                                   [--parameters]
+                                   [--remove]
+                                   [--run-dimensions]
+                                   [--set]
+                                   [--variables]
+  examples:
+  - summary: Pipelines_Update
+    syntax: az datafactory pipeline update --factory-name "exampleFactoryName" --description "Example description" --activities "[{\"name\":\"ExampleForeachActivity\",\"type\":\"ForEach\",\"typeProperties\":{\"activities\":[{\"name\":\"ExampleCopyActivity\",\"type\":\"Copy\",\"inputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":\"examplecontainer.csv\",\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"outputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":{\"type\":\"Expression\",\"value\":\"@item()\"},\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"typeProperties\":{\"dataIntegrationUnits\":32,\"sink\":{\"type\":\"BlobSink\"},\"source\":{\"type\":\"BlobSource\"}}}],\"isSequential\":true,\"items\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.OutputBlobNameList\"}}}]" --parameters "{\"OutputBlobNameList\":{\"type\":\"Array\"}}" --duration "0.00:10:00" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --activities
+    summary: 'List of activities in pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the Pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --concurrency
+    summary: The max number of concurrent runs for the pipeline.
+    description: ''
+  - name: --description
+    summary: The description of the pipeline.
+    description: ''
+  - name: --duration
+    summary: 'TimeSpan value, after which an Azure Monitoring Metric is fired. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --folder-name
+    summary: The name of the folder that this Pipeline is in.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the pipeline entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the pipeline entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'List of parameters for pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --run-dimensions
+    summary: 'Dimensions emitted by Pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --variables
+    summary: 'List of variables for pipeline. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_pipeline_create
+- az_datafactory_pipeline_create-run
+- az_datafactory_pipeline_delete
+- az_datafactory_pipeline_list
+- az_datafactory_pipeline_show
+- az_datafactory_pipeline_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage pipeline with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/trigger-run.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/trigger-run.yml
new file mode 100644
index 0000000000..76ef739154
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/trigger-run.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_trigger-run
+name: az datafactory trigger-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory trigger-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage trigger run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_trigger-run_cancel
+  name: az datafactory trigger-run cancel
+  summary: Cancel a single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run cancel --factory-name
+                                      --resource-group
+                                      --run-id
+                                      --trigger-name
+  examples:
+  - summary: Triggers_Cancel
+    syntax: az datafactory trigger-run cancel --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --trigger-name
+    summary: The trigger name.
+    description: ''
+- uid: az_datafactory_trigger-run_query-by-factory
+  name: az datafactory trigger-run query-by-factory
+  summary: Query trigger runs.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run query-by-factory --factory-name
+                                                --last-updated-after
+                                                --last-updated-before
+                                                --resource-group
+                                                [--continuation-token]
+                                                [--filters]
+                                                [--order-by]
+  examples:
+  - summary: TriggerRuns_QueryByFactory
+    syntax: az datafactory trigger-run query-by-factory --factory-name "exampleFactoryName" --filters operand="TriggerName" operator="Equals" values="exampleTrigger" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+- uid: az_datafactory_trigger-run_rerun
+  name: az datafactory trigger-run rerun
+  summary: Rerun single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run rerun --factory-name
+                                     --resource-group
+                                     --run-id
+                                     --trigger-name
+  examples:
+  - summary: Triggers_Rerun
+    syntax: az datafactory trigger-run rerun --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --trigger-name
+    summary: The trigger name.
+    description: ''
+commands:
+- az_datafactory_trigger-run_cancel
+- az_datafactory_trigger-run_query-by-factory
+- az_datafactory_trigger-run_rerun
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage trigger run with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datafactory/trigger.yml b/2018-03-01-hybrid/docs-ref-autogen/datafactory/trigger.yml
new file mode 100644
index 0000000000..1da72fb8c6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datafactory/trigger.yml
@@ -0,0 +1,435 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_trigger
+name: az datafactory trigger
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory trigger** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage trigger with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_trigger_create
+  name: az datafactory trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger create --factory-name
+                                  --name
+                                  --properties
+                                  --resource-group
+                                  [--if-match]
+  examples:
+  - summary: Triggers_Create
+    syntax: az datafactory trigger create --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --properties "{\"type\":\"ScheduleTrigger\",\"pipelines\":[{\"parameters\":{\"OutputBlobNameList\":[\"exampleoutput.csv\"]},\"pipelineReference\":{\"type\":\"PipelineReference\",\"referenceName\":\"examplePipeline\"}}],\"typeProperties\":{\"recurrence\":{\"endTime\":\"2018-06-16T00:55:13.8441801Z\",\"frequency\":\"Minute\",\"interval\":4,\"startTime\":\"2018-06-16T00:39:13.8441801Z\",\"timeZone\":\"UTC\"}}}" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Properties of the trigger. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the trigger entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_trigger_delete
+  name: az datafactory trigger delete
+  summary: Deletes a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger delete --factory-name
+                                  --name
+                                  --resource-group
+                                  [--yes]
+  examples:
+  - summary: Triggers_Delete
+    syntax: az datafactory trigger delete --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_trigger_get-event-subscription-status
+  name: az datafactory trigger get-event-subscription-status
+  summary: Get a trigger's event subscription status.
+  description: ''
+  syntax: >-
+    az datafactory trigger get-event-subscription-status --factory-name
+                                                         --name
+                                                         --resource-group
+  examples:
+  - summary: Triggers_GetEventSubscriptionStatus
+    syntax: az datafactory trigger get-event-subscription-status --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_trigger_list
+  name: az datafactory trigger list
+  summary: Lists triggers.
+  description: ''
+  syntax: >-
+    az datafactory trigger list --factory-name
+                                --resource-group
+  examples:
+  - summary: Triggers_ListByFactory
+    syntax: az datafactory trigger list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_trigger_query-by-factory
+  name: az datafactory trigger query-by-factory
+  summary: Query triggers.
+  description: ''
+  syntax: >-
+    az datafactory trigger query-by-factory --factory-name
+                                            --resource-group
+                                            [--continuation-token]
+                                            [--parent-trigger-name]
+  examples:
+  - summary: Triggers_QueryByFactory
+    syntax: az datafactory trigger query-by-factory --factory-name "exampleFactoryName" --parent-trigger-name "exampleTrigger" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --parent-trigger-name
+    summary: The name of the parent TumblingWindowTrigger to get the child rerun triggers.
+    description: ''
+- uid: az_datafactory_trigger_show
+  name: az datafactory trigger show
+  summary: Gets a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger show --factory-name
+                                --name
+                                --resource-group
+                                [--if-none-match]
+  examples:
+  - summary: Triggers_Get
+    syntax: az datafactory trigger show --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_trigger_start
+  name: az datafactory trigger start
+  summary: Starts a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger start --factory-name
+                                 --name
+                                 --resource-group
+                                 [--no-wait]
+  examples:
+  - summary: Triggers_Start
+    syntax: az datafactory trigger start --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_stop
+  name: az datafactory trigger stop
+  summary: Stops a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger stop --factory-name
+                                --name
+                                --resource-group
+                                [--no-wait]
+  examples:
+  - summary: Triggers_Stop
+    syntax: az datafactory trigger stop --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_subscribe-to-event
+  name: az datafactory trigger subscribe-to-event
+  summary: Subscribe event trigger to events.
+  description: ''
+  syntax: >-
+    az datafactory trigger subscribe-to-event --factory-name
+                                              --name
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: Triggers_SubscribeToEvents
+    syntax: az datafactory trigger subscribe-to-event --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_unsubscribe-from-event
+  name: az datafactory trigger unsubscribe-from-event
+  summary: Unsubscribe event trigger from events.
+  description: ''
+  syntax: >-
+    az datafactory trigger unsubscribe-from-event --factory-name
+                                                  --name
+                                                  --resource-group
+                                                  [--no-wait]
+  examples:
+  - summary: Triggers_UnsubscribeFromEvents
+    syntax: az datafactory trigger unsubscribe-from-event --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_update
+  name: az datafactory trigger update
+  summary: Update a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger update --factory-name
+                                  --name
+                                  --resource-group
+                                  [--add]
+                                  [--annotations]
+                                  [--description]
+                                  [--force-string]
+                                  [--if-match]
+                                  [--if-none-match]
+                                  [--remove]
+                                  [--set]
+  examples:
+  - summary: Triggers_Update
+    syntax: az datafactory trigger update --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --description "Example description" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the trigger. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Trigger description.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the trigger entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_datafactory_trigger_wait
+  name: az datafactory trigger wait
+  summary: Place the CLI in a waiting state until a condition of the datafactory trigger is met.
+  description: ''
+  syntax: >-
+    az datafactory trigger wait --factory-name
+                                --name
+                                --resource-group
+                                [--created]
+                                [--custom]
+                                [--deleted]
+                                [--exists]
+                                [--if-none-match]
+                                [--interval]
+                                [--timeout]
+                                [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datafactory trigger is successfully created.
+    syntax: az datafactory trigger wait --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger" --created
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datafactory_trigger_create
+- az_datafactory_trigger_delete
+- az_datafactory_trigger_get-event-subscription-status
+- az_datafactory_trigger_list
+- az_datafactory_trigger_query-by-factory
+- az_datafactory_trigger_show
+- az_datafactory_trigger_start
+- az_datafactory_trigger_stop
+- az_datafactory_trigger_subscribe-to-event
+- az_datafactory_trigger_unsubscribe-from-event
+- az_datafactory_trigger_update
+- az_datafactory_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage trigger with datafactory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare.yml
new file mode 100644
index 0000000000..8402be1519
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare.yml
@@ -0,0 +1,265 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare
+name: az datashare
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare.
+description: For a summary of CLI commands for Data Share, see https://docs.microsoft.com/azure/data-share/azure-cli-references-for-data-share.
+directCommands:
+- uid: az_datashare_create
+  name: az datashare create
+  summary: Create a datashare.
+  description: ''
+  syntax: >-
+    az datashare create --account-name
+                        --name
+                        --resource-group
+                        [--description]
+                        [--share-kind {CopyBased, InPlace}]
+                        [--terms]
+  examples:
+  - summary: Create a datashare
+    syntax: az datashare create --account-name MyAccount --resource-group MyResourceGroup --description "share description" --share-kind "CopyBased" --terms "Confidential" --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Share description.
+    description: ''
+  - name: --share-kind
+    parameterValueGroup: CopyBased, InPlace
+    summary: Share kind.
+    description: ''
+  - name: --terms
+    summary: Share terms.
+    description: ''
+- uid: az_datashare_delete
+  name: az datashare delete
+  summary: Delete a datashare.
+  description: ''
+  syntax: >-
+    az datashare delete --account-name
+                        --name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: Delete a datashare
+    syntax: az datashare delete --account-name MyAccount --resource-group MyResourceGroup --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_list
+  name: az datashare list
+  summary: List datashares in an account.
+  description: ''
+  syntax: >-
+    az datashare list --account-name
+                      --resource-group
+  examples:
+  - summary: List datashares
+    syntax: az datashare list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_show
+  name: az datashare show
+  summary: Show a datashare.
+  description: ''
+  syntax: >-
+    az datashare show --account-name
+                      --name
+                      --resource-group
+  examples:
+  - summary: Show a datashare
+    syntax: az datashare show --account-name MyAccount --resource-group MyResourceGroup --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_wait
+  name: az datashare wait
+  summary: Place the CLI in a waiting state until a condition of the datashare is met.
+  description: ''
+  syntax: >-
+    az datashare wait --account-name
+                      --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare is successfully provisioned.
+    syntax: az datashare wait --account-name MyAccount --resource-group MyResourceGroup --name MyShare --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_account
+- az_datashare_account_create
+- az_datashare_account_delete
+- az_datashare_account_list
+- az_datashare_account_show
+- az_datashare_account_update
+- az_datashare_account_wait
+- az_datashare_consumer
+- az_datashare_consumer_dataset-mapping
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+- az_datashare_consumer_invitation
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+- az_datashare_consumer_share-subscription
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+- az_datashare_consumer_trigger
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+- az_datashare_create
+- az_datashare_dataset
+- az_datashare_dataset_create
+- az_datashare_dataset_delete
+- az_datashare_dataset_list
+- az_datashare_dataset_show
+- az_datashare_dataset_wait
+- az_datashare_delete
+- az_datashare_invitation
+- az_datashare_invitation_create
+- az_datashare_invitation_delete
+- az_datashare_invitation_list
+- az_datashare_invitation_show
+- az_datashare_list
+- az_datashare_provider-share-subscription
+- az_datashare_provider-share-subscription_list
+- az_datashare_provider-share-subscription_reinstate
+- az_datashare_provider-share-subscription_revoke
+- az_datashare_provider-share-subscription_show
+- az_datashare_provider-share-subscription_wait
+- az_datashare_show
+- az_datashare_synchronization
+- az_datashare_synchronization_list
+- az_datashare_synchronization_list-detail
+- az_datashare_synchronization-setting
+- az_datashare_synchronization-setting_create
+- az_datashare_synchronization-setting_delete
+- az_datashare_synchronization-setting_list
+- az_datashare_synchronization-setting_show
+- az_datashare_synchronization-setting_wait
+- az_datashare_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: For a summary of CLI commands for Data Share, see https://docs.microsoft.com/azure/data-share/azure-cli-references-for-data-share.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/account.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/account.yml
new file mode 100644
index 0000000000..a5e5d542d2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/account.yml
@@ -0,0 +1,199 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_account
+name: az datashare account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare accounts.
+description: ''
+directCommands:
+- uid: az_datashare_account_create
+  name: az datashare account create
+  summary: Create an account.
+  description: ''
+  syntax: >-
+    az datashare account create --name
+                                --resource-group
+                                [--location]
+                                [--no-wait]
+                                [--tags]
+  examples:
+  - summary: Create an account
+    syntax: az datashare account create --location "West US 2" --tags tag1=Red tag2=White --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datashare_account_delete
+  name: az datashare account delete
+  summary: Delete an account.
+  description: ''
+  syntax: >-
+    az datashare account delete --name
+                                --resource-group
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete the account
+    syntax: az datashare account delete --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_account_list
+  name: az datashare account list
+  summary: List datashare accounts.
+  description: ''
+  syntax: az datashare account list [--resource-group]
+  examples:
+  - summary: List accounts by resource group
+    syntax: az datashare account list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_account_show
+  name: az datashare account show
+  summary: Show an account.
+  description: ''
+  syntax: >-
+    az datashare account show --name
+                              --resource-group
+  examples:
+  - summary: Show account information
+    syntax: az datashare account show --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_account_update
+  name: az datashare account update
+  summary: Patch an account.
+  description: ''
+  syntax: >-
+    az datashare account update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update account tags
+    syntax: az datashare account update --name MyAccount --tags tag1=Red tag2=White --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datashare_account_wait
+  name: az datashare account wait
+  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
+  description: ''
+  syntax: >-
+    az datashare account wait --name
+                              --resource-group
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare account is successfully provisioned.
+    syntax: az datashare account wait --name MyAccount --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_account_create
+- az_datashare_account_delete
+- az_datashare_account_list
+- az_datashare_account_show
+- az_datashare_account_update
+- az_datashare_account_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage datashare accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer.yml
new file mode 100644
index 0000000000..cfc6a3446c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer.yml
@@ -0,0 +1,56 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer
+name: az datashare consumer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare.
+description: ''
+commands:
+- az_datashare_consumer_dataset-mapping
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+- az_datashare_consumer_invitation
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+- az_datashare_consumer_share-subscription
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+- az_datashare_consumer_trigger
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/dataset-mapping.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/dataset-mapping.yml
new file mode 100644
index 0000000000..e5e22266e1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/dataset-mapping.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_dataset-mapping
+name: az datashare consumer dataset-mapping
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer dataset-mapping** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare dataset mappings.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_dataset-mapping_create
+  name: az datashare consumer dataset-mapping create
+  summary: Create a dataSet mapping.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping create --account-name
+                                                 --mapping
+                                                 --name
+                                                 --resource-group
+                                                 --share-subscription-name
+  examples:
+  - summary: Create a Blob dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
+  - summary: Create a BlobFolder dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"BlobFolder\",\"properties\":{\"containerName\":\"C2\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"prefix\":\"folder21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage3\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
+  - summary: Create a SqlDBTable dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDBTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"databaseName\":\"Database1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
+  - summary: Create a AdlsGen2File dataset mapping
+    syntax: 'az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"AdlsGen2File\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"fileSystem\": \"fileSystem\",\"outputType\":\"Csv\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a SqlDWTable dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"dataWarehouseName\":\"DataWarehouse1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --mapping
+    summary: Dataset mapping in JSON string or path to JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_delete
+  name: az datashare consumer dataset-mapping delete
+  summary: Delete a dataset mapping in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping delete --account-name
+                                                 --name
+                                                 --resource-group
+                                                 --share-subscription-name
+                                                 [--yes]
+  examples:
+  - summary: Delete a dataset mapping
+    syntax: az datashare consumer dataset-mapping delete --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_list
+  name: az datashare consumer dataset-mapping list
+  summary: List dataset mappings in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping list --account-name
+                                               --resource-group
+                                               --share-subscription-name
+  examples:
+  - summary: List dataset mappings
+    syntax: az datashare consumer dataset-mapping list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_show
+  name: az datashare consumer dataset-mapping show
+  summary: Show a dataset mapping in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping show --account-name
+                                               --name
+                                               --resource-group
+                                               --share-subscription-name
+  examples:
+  - summary: Show a dataset mapping
+    syntax: az datashare consumer dataset-mapping show --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+commands:
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare dataset mappings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/invitation.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/invitation.yml
new file mode 100644
index 0000000000..cb12ce6c0e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/invitation.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_invitation
+name: az datashare consumer invitation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer invitation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare invitations.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_invitation_list
+  name: az datashare consumer invitation list
+  summary: List received invitations.
+  description: ''
+  syntax: az datashare consumer invitation list
+  examples:
+  - summary: List invitations
+    syntax: az datashare consumer invitation list
+- uid: az_datashare_consumer_invitation_reject
+  name: az datashare consumer invitation reject
+  summary: Reject an invitation.
+  description: ''
+  syntax: >-
+    az datashare consumer invitation reject --invitation-id
+                                            --location
+  examples:
+  - summary: Reject an invitation
+    syntax: az datashare consumer invitation reject --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --invitation-id
+    summary: An invitation id.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_datashare_consumer_invitation_show
+  name: az datashare consumer invitation show
+  summary: Show a received invitation.
+  description: ''
+  syntax: >-
+    az datashare consumer invitation show --invitation-id
+                                          --location
+  examples:
+  - summary: Show an invitation
+    syntax: az datashare consumer invitation show --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --invitation-id
+    summary: An invitation id.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare invitations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription.yml
new file mode 100644
index 0000000000..d0ceefd8c0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_share-subscription
+name: az datashare consumer share-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer share-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare share subscriptions.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_share-subscription_create
+  name: az datashare consumer share-subscription create
+  summary: Create a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription create --account-name
+                                                    --invitation-id
+                                                    --name
+                                                    --resource-group
+                                                    --source-share-location
+  examples:
+  - summary: Create a share subscription
+    syntax: az datashare consumer share-subscription create --account-name MyAccount --resource-group MyResourceGroup --invitation-id 00000000-0000-0000-0000-000000000000 --source-share-location "eastus2" --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --invitation-id
+    summary: The invitation id.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source-share-location
+    summary: Source share location.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_delete
+  name: az datashare consumer share-subscription delete
+  summary: Delete a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription delete --account-name
+                                                    --name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--yes]
+  examples:
+  - summary: Delete a share subscription
+    syntax: az datashare consumer share-subscription delete --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list
+  name: az datashare consumer share-subscription list
+  summary: List share subscriptions in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list --account-name
+                                                  --resource-group
+  examples:
+  - summary: List share subscriptions
+    syntax: az datashare consumer share-subscription list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list-source-dataset
+  name: az datashare consumer share-subscription list-source-dataset
+  summary: List source datasets of a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list-source-dataset --account-name
+                                                                 --resource-group
+                                                                 --share-subscription-name
+  examples:
+  - summary: List source datasets
+    syntax: az datashare consumer share-subscription list-source-dataset --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+  name: az datashare consumer share-subscription list-source-share-synchronization-setting
+  summary: List synchronization settings set on a share.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list-source-share-synchronization-setting --account-name
+                                                                                       --resource-group
+                                                                                       --share-subscription-name
+  examples:
+  - summary: List synchronization settings
+    syntax: az datashare consumer share-subscription list-source-share-synchronization-setting --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_show
+  name: az datashare consumer share-subscription show
+  summary: Show a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription show --account-name
+                                                  --name
+                                                  --resource-group
+  examples:
+  - summary: Show a share subscription
+    syntax: az datashare consumer share-subscription show --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_wait
+  name: az datashare consumer share-subscription wait
+  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription wait --account-name
+                                                  --name
+                                                  --resource-group
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare share subscription is successfully provisioned.
+    syntax: az datashare consumer share-subscription wait --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare share subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml
new file mode 100644
index 0000000000..6d8b9e26ff
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_share-subscription_synchronization
+name: az datashare consumer share-subscription synchronization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer share-subscription synchronization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare share subscription synchronizations.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_share-subscription_synchronization_cancel
+  name: az datashare consumer share-subscription synchronization cancel
+  summary: Request to cancel a synchronization.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization cancel --account-name
+                                                                    --resource-group
+                                                                    --share-subscription-name
+                                                                    --synchronization-id
+                                                                    [--no-wait]
+  examples:
+  - summary: Request to cancel a synchronization
+    syntax: az datashare consumer share-subscription synchronization cancel --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_list
+  name: az datashare consumer share-subscription synchronization list
+  summary: List synchronizations of a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization list --account-name
+                                                                  --resource-group
+                                                                  --share-subscription-name
+  examples:
+  - summary: List synchronizations
+    syntax: az datashare consumer share-subscription synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_list-detail
+  name: az datashare consumer share-subscription synchronization list-detail
+  summary: List synchronization details.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization list-detail --account-name
+                                                                         --resource-group
+                                                                         --share-subscription-name
+                                                                         --synchronization-id
+  examples:
+  - summary: List synchronization details
+    syntax: az datashare consumer share-subscription synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: Synchronization id.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_start
+  name: az datashare consumer share-subscription synchronization start
+  summary: Initiate a dataset synchronization.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization start --account-name
+                                                                   --resource-group
+                                                                   --share-subscription-name
+                                                                   [--no-wait]
+                                                                   [--synchronization-mode {FullSync, Incremental}]
+  examples:
+  - summary: Initiate a dataset synchronization
+    syntax: az datashare consumer share-subscription synchronization start --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-mode "Incremental"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --synchronization-mode
+    parameterValueGroup: FullSync, Incremental
+    summary: Synchronization mode.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_wait
+  name: az datashare consumer share-subscription synchronization wait
+  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization wait --account-name
+                                                                  --resource-group
+                                                                  --share-subscription-name
+                                                                  --synchronization-id
+                                                                  [--created]
+                                                                  [--custom]
+                                                                  [--deleted]
+                                                                  [--exists]
+                                                                  [--interval]
+                                                                  [--timeout]
+                                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization finishes successfully.
+    syntax: az datashare consumer share-subscription synchronization wait --custom "status=='Succeeded'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization is cancelled.
+    syntax: az datashare consumer share-subscription synchronization wait --custom "status=='Cancelled'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare share subscription synchronizations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/trigger.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/trigger.yml
new file mode 100644
index 0000000000..01e55fb80c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/consumer/trigger.yml
@@ -0,0 +1,235 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_trigger
+name: az datashare consumer trigger
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer trigger** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare consumer triggers.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_trigger_create
+  name: az datashare consumer trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger create --account-name
+                                         --name
+                                         --recurrence-interval {Day, Hour}
+                                         --resource-group
+                                         --share-subscription-name
+                                         --synchronization-time
+                                         [--kind {ScheduleBased}]
+                                         [--no-wait]
+  examples:
+  - summary: Create a trigger
+    syntax: az datashare consumer trigger create --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --recurrence-interval
+    parameterValueGroup: Day, Hour
+    summary: Synchronization Recurrence Interval.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-time
+    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  optionalParameters:
+  - name: --kind
+    defaultValue: ScheduleBased
+    parameterValueGroup: ScheduleBased
+    summary: Kind of synchronization.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_consumer_trigger_delete
+  name: az datashare consumer trigger delete
+  summary: Delete a trigger in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger delete --account-name
+                                         --name
+                                         --resource-group
+                                         --share-subscription-name
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete a trigger
+    syntax: az datashare consumer trigger delete --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_trigger_list
+  name: az datashare consumer trigger list
+  summary: List triggers in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger list --account-name
+                                       --resource-group
+                                       --share-subscription-name
+  examples:
+  - summary: List triggers
+    syntax: az datashare consumer trigger list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_trigger_show
+  name: az datashare consumer trigger show
+  summary: Show a trigger in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger show --account-name
+                                       --name
+                                       --resource-group
+                                       --share-subscription-name
+  examples:
+  - summary: Show a trigger
+    syntax: az datashare consumer trigger show --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_trigger_wait
+  name: az datashare consumer trigger wait
+  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger wait --account-name
+                                       --name
+                                       --resource-group
+                                       --share-subscription-name
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare trigger is successfully provisioned.
+    syntax: az datashare consumer trigger wait --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the shareSubscription.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare consumer triggers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/dataset.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/dataset.yml
new file mode 100644
index 0000000000..5ea4f7943f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/dataset.yml
@@ -0,0 +1,228 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_dataset
+name: az datashare dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare datasets.
+description: ''
+directCommands:
+- uid: az_datashare_dataset_create
+  name: az datashare dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az datashare dataset create --account-name
+                                --dataset
+                                --name
+                                --resource-group
+                                --share-name
+  examples:
+  - summary: Create a Blob dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"filePath\":\"file21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a BlobFolder dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"BlobFolder\",\"properties\":{\"containerName\":\"C1\",\"prefix\":\"folder21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a KustoCluster dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoCluster\",\"properties\":{\"kustoClusterResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1\"}}"'
+  - summary: Create a KustoDatabase dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoDatabase\",\"properties\":{\"kustoDatabaseResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1/databases/Database1\"}}"'
+  - summary: Create a SqlDBTable dataset
+    syntax: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDBTable\",\"properties\":{\"databaseName\":\"MySqlDB\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\", \"tableName\":\"Table1\"}}"
+  - summary: Create a SqlDWTable dataset
+    syntax: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataWarehouseName\":\"MyDataWarehouse\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Sql/servers/MyServer\",\"tableName\":\"MyTable\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --dataset
+    summary: Dataset parameters in JSON string or path to JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_delete
+  name: az datashare dataset delete
+  summary: Delete a dataset in a share.
+  description: ''
+  syntax: >-
+    az datashare dataset delete --account-name
+                                --name
+                                --resource-group
+                                --share-name
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete a dataset
+    syntax: az datashare dataset delete --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_dataset_list
+  name: az datashare dataset list
+  summary: List datasets in a share.
+  description: ''
+  syntax: >-
+    az datashare dataset list --account-name
+                              --resource-group
+                              --share-name
+  examples:
+  - summary: List datasets
+    syntax: az datashare dataset list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_show
+  name: az datashare dataset show
+  summary: Show a dataset.
+  description: ''
+  syntax: >-
+    az datashare dataset show --account-name
+                              --name
+                              --resource-group
+                              --share-name
+  examples:
+  - summary: Show a dataset
+    syntax: az datashare dataset show --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_wait
+  name: az datashare dataset wait
+  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
+  description: ''
+  syntax: >-
+    az datashare dataset wait --account-name
+                              --name
+                              --resource-group
+                              --share-name
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare dataset is successfully provisioned.
+    syntax: az datashare dataset wait --account-name MyAccount --share-name MyShare --name MyDataset --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_dataset_create
+- az_datashare_dataset_delete
+- az_datashare_dataset_list
+- az_datashare_dataset_show
+- az_datashare_dataset_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare datasets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/invitation.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/invitation.yml
new file mode 100644
index 0000000000..34f0ed0567
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/invitation.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_invitation
+name: az datashare invitation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare invitation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare invitations.
+description: ''
+directCommands:
+- uid: az_datashare_invitation_create
+  name: az datashare invitation create
+  summary: Create an invitation.
+  description: ''
+  syntax: >-
+    az datashare invitation create --account-name
+                                   --name
+                                   --resource-group
+                                   --share-name
+                                   [--target-active-directory-id]
+                                   [--target-email]
+                                   [--target-object-id]
+  examples:
+  - summary: Create an invitation
+    syntax: az datashare invitation create --account-name MyAccount --target-email "receiver@microsoft.com" --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --target-active-directory-id
+    summary: The target Azure AD Id. Can't be combined with email.
+    description: ''
+  - name: --target-email
+    summary: The email the invitation is directed to.
+    description: ''
+  - name: --target-object-id
+    summary: The target user or application Id that invitation is being sent to. Must be specified along TargetActiveDirectoryId. This enables sending invitations to specific users or applications in an AD tenant.
+    description: ''
+- uid: az_datashare_invitation_delete
+  name: az datashare invitation delete
+  summary: Delete an invitation in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation delete --account-name
+                                   --name
+                                   --resource-group
+                                   --share-name
+                                   [--yes]
+  examples:
+  - summary: Delete an invitation
+    syntax: az datashare invitation delete --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_invitation_list
+  name: az datashare invitation list
+  summary: List invitations in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation list --account-name
+                                 --resource-group
+                                 --share-name
+  examples:
+  - summary: List invitations
+    syntax: az datashare invitation list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_invitation_show
+  name: az datashare invitation show
+  summary: Show an invitation in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation show --account-name
+                                 --name
+                                 --resource-group
+                                 --share-name
+  examples:
+  - summary: Show an invitation
+    syntax: az datashare invitation show --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+commands:
+- az_datashare_invitation_create
+- az_datashare_invitation_delete
+- az_datashare_invitation_list
+- az_datashare_invitation_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare invitations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/provider-share-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/provider-share-subscription.yml
new file mode 100644
index 0000000000..a340735a88
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/provider-share-subscription.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_provider-share-subscription
+name: az datashare provider-share-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare provider-share-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare share subscriptions.
+description: ''
+directCommands:
+- uid: az_datashare_provider-share-subscription_list
+  name: az datashare provider-share-subscription list
+  summary: List share subscriptions in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription list --account-name
+                                                  --resource-group
+                                                  --share-name
+  examples:
+  - summary: List share subscriptions
+    syntax: az datashare provider-share-subscription list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_provider-share-subscription_reinstate
+  name: az datashare provider-share-subscription reinstate
+  summary: Reinstate a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription reinstate --account-name
+                                                       --resource-group
+                                                       --share-name
+                                                       --share-subscription
+  examples:
+  - summary: Reinstate a share subscription
+    syntax: az datashare provider-share-subscription reinstate --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+- uid: az_datashare_provider-share-subscription_revoke
+  name: az datashare provider-share-subscription revoke
+  summary: Revoke a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription revoke --account-name
+                                                    --resource-group
+                                                    --share-name
+                                                    --share-subscription
+                                                    [--no-wait]
+  examples:
+  - summary: Revoke a share subscription
+    syntax: az datashare provider-share-subscription revoke --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_provider-share-subscription_show
+  name: az datashare provider-share-subscription show
+  summary: Show a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription show --account-name
+                                                  --resource-group
+                                                  --share-name
+                                                  --share-subscription
+  examples:
+  - summary: Show a share subscription
+    syntax: az datashare provider-share-subscription show --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+- uid: az_datashare_provider-share-subscription_wait
+  name: az datashare provider-share-subscription wait
+  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription wait --account-name
+                                                  --resource-group
+                                                  --share-name
+                                                  --share-subscription
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare provider share subscription is successfully provisioned.
+    syntax: az datashare provider-share-subscription wait --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_provider-share-subscription_list
+- az_datashare_provider-share-subscription_reinstate
+- az_datashare_provider-share-subscription_revoke
+- az_datashare_provider-share-subscription_show
+- az_datashare_provider-share-subscription_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare share subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/synchronization-setting.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/synchronization-setting.yml
new file mode 100644
index 0000000000..c56e275392
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/synchronization-setting.yml
@@ -0,0 +1,231 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_synchronization-setting
+name: az datashare synchronization-setting
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare synchronization-setting** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare synchronization settings.
+description: ''
+directCommands:
+- uid: az_datashare_synchronization-setting_create
+  name: az datashare synchronization-setting create
+  summary: Create a synchronization setting.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting create --account-name
+                                                --name
+                                                --recurrence-interval {Day, Hour}
+                                                --resource-group
+                                                --share-name
+                                                --synchronization-time
+                                                [--kind {ScheduleBased}]
+  examples:
+  - summary: Create a synchronization setting
+    syntax: az datashare synchronization-setting create --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MyDataset --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --recurrence-interval
+    parameterValueGroup: Day, Hour
+    summary: Synchronization Recurrence Interval.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --synchronization-time
+    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  optionalParameters:
+  - name: --kind
+    defaultValue: ScheduleBased
+    parameterValueGroup: ScheduleBased
+    summary: Kind of synchronization.
+    description: ''
+- uid: az_datashare_synchronization-setting_delete
+  name: az datashare synchronization-setting delete
+  summary: Delete a synchronization setting in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting delete --account-name
+                                                --name
+                                                --resource-group
+                                                --share-name
+                                                [--no-wait]
+                                                [--yes]
+  examples:
+  - summary: Delete a synchronization setting
+    syntax: az datashare synchronization-setting delete --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_synchronization-setting_list
+  name: az datashare synchronization-setting list
+  summary: List synchronization settings in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting list --account-name
+                                              --resource-group
+                                              --share-name
+  examples:
+  - summary: List synchronization settings
+    syntax: az datashare synchronization-setting list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization-setting_show
+  name: az datashare synchronization-setting show
+  summary: Show a synchronization setting in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting show --account-name
+                                              --name
+                                              --resource-group
+                                              --share-name
+  examples:
+  - summary: Show a synchronization setting
+    syntax: az datashare synchronization-setting show --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization-setting_wait
+  name: az datashare synchronization-setting wait
+  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting wait --account-name
+                                              --name
+                                              --resource-group
+                                              --share-name
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare synchronization setting is successfully provisioned.
+    syntax: az datashare synchronization-setting wait --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_synchronization-setting_create
+- az_datashare_synchronization-setting_delete
+- az_datashare_synchronization-setting_list
+- az_datashare_synchronization-setting_show
+- az_datashare_synchronization-setting_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare synchronization settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/datashare/synchronization.yml b/2018-03-01-hybrid/docs-ref-autogen/datashare/synchronization.yml
new file mode 100644
index 0000000000..f5cb5f65dc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/datashare/synchronization.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_synchronization
+name: az datashare synchronization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare synchronization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare synchronization.
+description: ''
+directCommands:
+- uid: az_datashare_synchronization_list
+  name: az datashare synchronization list
+  summary: List synchronizations of a datashare.
+  description: ''
+  syntax: >-
+    az datashare synchronization list --account-name
+                                      --resource-group
+                                      --share-name
+  examples:
+  - summary: List synchronizations
+    syntax: az datashare synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization_list-detail
+  name: az datashare synchronization list-detail
+  summary: List synchronization details.
+  description: ''
+  syntax: >-
+    az datashare synchronization list-detail --account-name
+                                             --resource-group
+                                             --share-name
+                                             [--synchronization-id]
+  examples:
+  - summary: List synchronization details
+    syntax: az datashare synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+commands:
+- az_datashare_synchronization_list
+- az_datashare_synchronization_list-detail
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage datashare synchronization.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dedicated-hsm.yml b/2018-03-01-hybrid/docs-ref-autogen/dedicated-hsm.yml
new file mode 100644
index 0000000000..cded4c8275
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dedicated-hsm.yml
@@ -0,0 +1,229 @@
+### YamlMime:AzureCLIGroup
+uid: az_dedicated-hsm
+name: az dedicated-hsm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hardware-security-modules** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az dedicated-hsm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
+description: ''
+directCommands:
+- uid: az_dedicated-hsm_create
+  name: az dedicated-hsm create
+  summary: Create a dedicated HSM in the specified subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm create --location
+                            --name
+                            --resource-group
+                            [--network-profile-network-interfaces]
+                            [--no-wait]
+                            [--sku]
+                            [--stamp-id]
+                            [--subnet]
+                            [--tags]
+                            [--zones]
+  examples:
+  - summary: Create a new dedicated HSM
+    syntax: az dedicated-hsm create -n "hsm1" -l "japanwest" -i private-ip-address="1.0.0.1" -s id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.Network/virtualNetworks/hsm/subnets/hsm" --stamp-id "stamp1" --sku name="SafeNet Luna Network HSM A790" --tags Dept="hsm" Environment="dogfood" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the dedicated Hsm.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --network-profile-network-interfaces -i
+    summary: 'Specifies a list of ip address from the specfied subnet for the network interfaces associated with the dedicated HSM. Expected value: -i private-ip-address=xx.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: 'The HSM device SKU if a non-standard HSM is wanted (default is: SafeNet Luna Network HSM A790).'
+    description: ''
+  - name: --stamp-id
+    summary: This field will be used when RP does not support Availability zones.
+    description: ''
+  - name: --subnet -s
+    summary: 'Specifies the identifier of the subnet. Expected value: id=xx.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zones
+    summary: The Dedicated Hsm zones.
+    description: ''
+- uid: az_dedicated-hsm_delete
+  name: az dedicated-hsm delete
+  summary: Deletes the specified Azure Dedicated HSM.
+  description: ''
+  syntax: >-
+    az dedicated-hsm delete --name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: Delete a dedicated HSM
+    syntax: az dedicated-hsm delete -n "hsm1" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dedicated HSM to delete.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dedicated-hsm_list
+  name: az dedicated-hsm list
+  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm list [--resource-group]
+                          [--top]
+  examples:
+  - summary: List dedicated HSM devices in a subscription
+    syntax: az dedicated-hsm list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_dedicated-hsm_show
+  name: az dedicated-hsm show
+  summary: Gets the specified Azure dedicated HSM.
+  description: ''
+  syntax: >-
+    az dedicated-hsm show --name
+                          --resource-group
+  examples:
+  - summary: Get a dedicated HSM
+    syntax: az dedicated-hsm show -n "hsm1" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dedicated-hsm_update
+  name: az dedicated-hsm update
+  summary: Update a dedicated HSM in the specified subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm update --name
+                            --resource-group
+                            [--no-wait]
+                            [--tags]
+  examples:
+  - summary: Update an existing dedicated HSM
+    syntax: az dedicated-hsm update -n "hsm1" --tags Dept="hsm" Environment="dogfood" Slice="A" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_dedicated-hsm_wait
+  name: az dedicated-hsm wait
+  summary: Waits for operation to complete.
+  description: ''
+  syntax: >-
+    az dedicated-hsm wait --name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Delete a dedicated HSM
+    syntax: az dedicated-hsm wait --created -g "hsm-group" --name "hsm1"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_dedicated-hsm_create
+- az_dedicated-hsm_delete
+- az_dedicated-hsm_list
+- az_dedicated-hsm_show
+- az_dedicated-hsm_update
+- az_dedicated-hsm_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Dedicated-hsm to create, update, list, show, and delete HSMs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/demo.yml b/2018-03-01-hybrid/docs-ref-autogen/demo.yml
new file mode 100644
index 0000000000..ef37199548
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/demo.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_demo
+name: az demo
+summary: Demos for designing, developing and demonstrating Azure CLI.
+description: ''
+directCommands:
+- uid: az_demo_style
+  name: az demo style
+  summary: A demo showing supported text styles.
+  description: ''
+  syntax: >-
+    az demo style [--subscription]
+                  [--theme {cloud-shell, dark, light, none}]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --theme
+    parameterValueGroup: cloud-shell, dark, light, none
+    summary: The theme to format styled text. If unspecified, the default theme is used.
+    description: ''
+commands:
+- az_demo_style
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Demos for designing, developing and demonstrating Azure CLI.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml b/2018-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml
index 48c6938705..e855d392e4 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml
@@ -1,118 +1,117 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_scripts
-  name: az deployment-scripts
-  summary: Manage deployment scripts at subscription or resource group scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_scripts_delete
-  - az_deployment_scripts_list
-  - az_deployment_scripts_show
-  - az_deployment_scripts_show_log
-- uid: az_deployment_scripts_delete
+### YamlMime:AzureCLIGroup
+uid: az_deployment-scripts
+name: az deployment-scripts
+summary: Manage deployment scripts at subscription or resource group scope.
+description: ''
+directCommands:
+- uid: az_deployment-scripts_delete
   name: az deployment-scripts delete
   summary: Delete a deployment script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts delete --name
+                                 --resource-group
+                                 [--subscription]
+                                 [--yes]
   examples:
   - summary: Delete a deployment script found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts delete --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts delete --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_deployment-scripts_list
   name: az deployment-scripts list
   summary: List all deployment scripts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts list [--query-examples]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Retrieve all deployment scripts found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts list
+    syntax: az deployment-scripts list
   - summary: Retrieve all deployment scripts found in a resource group
-    syntax:
-      content: az deployment-scripts list --resource-group contoso-rg
-  parameters:
+    syntax: az deployment-scripts list --resource-group contoso-rg
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_show
+- uid: az_deployment-scripts_show
   name: az deployment-scripts show
   summary: Retrieve a deployment script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts show --name
+                               --resource-group
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Retrieve a deployment script found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts show --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts show --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_show_log
+- uid: az_deployment-scripts_show-log
   name: az deployment-scripts show-log
   summary: Show deployment script logs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts show-log --name
+                                   --resource-group
+                                   [--subscription]
   examples:
   - summary: Retrieve deployment script logs found in the user's logged-in default subscription, max limit is 4MB.
-    syntax:
-      content: az deployment-scripts show-log --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts show-log --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_deployment_scripts_delete
-  name: az deployment-scripts delete
-  summary: Delete a deployment script.
-- uid: az_deployment_scripts_list
-  name: az deployment-scripts list
-  summary: List all deployment scripts.
-- uid: az_deployment_scripts_show
-  name: az deployment-scripts show
-  summary: Retrieve a deployment script.
-- uid: az_deployment_scripts_show_log
-  name: az deployment-scripts show-log
-  summary: Show deployment script logs.
+- az_deployment-scripts_delete
+- az_deployment-scripts_list
+- az_deployment-scripts_show
+- az_deployment-scripts_show-log
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -128,4 +127,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage deployment scripts at subscription or resource group scope.
+metadata:
+  description: Manage deployment scripts at subscription or resource group scope.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/deployment.yml
index 9ea3d875c2..c833337fdd 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/deployment.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/deployment.yml
@@ -1,52 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment
-  name: az deployment
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_deployment
+name: az deployment
+summary: Manage Azure Resource Manager template deployment at subscription scope.
+description: ''
 commands:
-- uid: az_deployment_group
-  name: az deployment group
-  summary: Manage Azure Resource Manager template deployment at resource group.
-- uid: az_deployment_group_cancel
-  name: az deployment group cancel
-  summary: Cancel a deployment at resource group.
-- uid: az_deployment_group_create
-  name: az deployment group create
-  summary: Start a deployment at resource group.
-- uid: az_deployment_group_delete
-  name: az deployment group delete
-  summary: Delete a deployment at resource group.
-- uid: az_deployment_group_export
-  name: az deployment group export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group_list
-  name: az deployment group list
-  summary: List deployments at resource group.
-- uid: az_deployment_group_show
-  name: az deployment group show
-  summary: Show a deployment at resource group.
-- uid: az_deployment_group_validate
-  name: az deployment group validate
-  summary: Validate whether a template is valid at resource group.
-- uid: az_deployment_group_wait
-  name: az deployment group wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
-- uid: az_deployment_operation
-  name: az deployment operation
-  summary: Manage deployment operations at subscription scope.
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_group
+- az_deployment_group_cancel
+- az_deployment_group_create
+- az_deployment_group_delete
+- az_deployment_group_export
+- az_deployment_group_list
+- az_deployment_group_show
+- az_deployment_group_validate
+- az_deployment_group_wait
+- az_deployment_operation
+- az_deployment_operation_group
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -62,10 +32,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at subscription scope.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/deployment/group.yml b/2018-03-01-hybrid/docs-ref-autogen/deployment/group.yml
index b58d0f36eb..da92300d71 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/deployment/group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/deployment/group.yml
@@ -1,80 +1,78 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_group
-  name: az deployment group
-  summary: Manage Azure Resource Manager template deployment at resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_group_cancel
-  - az_deployment_group_create
-  - az_deployment_group_delete
-  - az_deployment_group_export
-  - az_deployment_group_list
-  - az_deployment_group_show
-  - az_deployment_group_validate
-  - az_deployment_group_wait
+### YamlMime:AzureCLIGroup
+uid: az_deployment_group
+name: az deployment group
+summary: Manage Azure Resource Manager template deployment at resource group.
+description: ''
+directCommands:
 - uid: az_deployment_group_cancel
   name: az deployment group cancel
   summary: Cancel a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group cancel --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Cancel a deployment at resource group.
-    syntax:
-      content: az deployment group cancel -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group cancel -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_create
   name: az deployment group create
   summary: Start a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group create --resource-group
+                               [--aux-subs]
+                               [--aux-tenants]
+                               [--handle-extended-json-format]
+                               [--mode {Complete, Incremental}]
+                               [--name]
+                               [--no-prompt {false, true}]
+                               [--no-wait]
+                               [--parameters]
+                               [--query-string]
+                               [--rollback-on-error]
+                               [--subscription]
+                               [--template-file]
+                               [--template-uri]
   examples:
   - summary: Create a deployment at resource group from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment at resource group from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-file azuredeploy.json  \
-            --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-file azuredeploy.json  \
+          --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
   - summary: Create a deployment at resource group from a local template file, using parameters from an array string.
-    syntax:
-      content: az deployment group create --resource-group testgroup --template-file demotemplate.json --parameters exampleString='inline string' exampleArray='("value1", "value2")'
+    syntax: az deployment group create --resource-group testgroup --template-file demotemplate.json --parameters exampleString='inline string' exampleArray='("value1", "value2")'
   - summary: Create a deployment at resource group from a local template, using a parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-file azuredeploy.json  --parameters @params.json \
-            --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-file azuredeploy.json  --parameters @params.json \
+          --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  - summary: Create a deployment at subscription scope from a template-spec
+    syntax: az deployment group create --resource-group testrg --template-spec "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Resources/templateSpecs/myTemplateSpec/versions/1.0"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group to create deployment at.
     description: ''
+  optionalParameters:
   - name: --aux-subs
     summary: Auxiliary subscriptions which will be used during deployment across tenants.
     description: ''
@@ -101,154 +99,161 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_delete
   name: az deployment group delete
   summary: Delete a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group delete --name
+                               --resource-group
+                               [--no-wait]
+                               [--subscription]
   examples:
   - summary: Delete a deployment at resource group.
-    syntax:
-      content: az deployment group delete -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group delete -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_export
   name: az deployment group export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group export --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Export the template used for a deployment at resource group.
-    syntax:
-      content: az deployment group export --resource-group testrg --name MyDeployment
-  parameters:
+    syntax: az deployment group export --resource-group testrg --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_list
   name: az deployment group list
   summary: List deployments at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group list --resource-group
+                             [--filter]
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List deployments at resource group.
-    syntax:
-      content: az deployment group list -g testrg
-  parameters:
+    syntax: az deployment group list -g testrg
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --filter
-    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit <a href="https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters">https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters</a>.
+    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_show
   name: az deployment group show
   summary: Show a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Show a deployment at resource group.
-    syntax:
-      content: az deployment group show -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group show -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_validate
   name: az deployment group validate
   summary: Validate whether a template is valid at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group validate --resource-group
+                                 [--handle-extended-json-format]
+                                 [--mode {Complete, Incremental}]
+                                 [--name]
+                                 [--no-prompt {false, true}]
+                                 [--parameters]
+                                 [--query-string]
+                                 [--rollback-on-error]
+                                 [--subscription]
+                                 [--template-file]
+                                 [--template-uri]
   examples:
   - summary: Validate whether a template is valid at resource group.
-    syntax:
-      content: az deployment group validate --resource-group testrg --template-file {template-file}
-  parameters:
+    syntax: az deployment group validate --resource-group testrg --template-file {template-file}
+  - summary: Validate whether a template is valid at resource group. (autogenerated)
+    syntax: az deployment group validate --parameters MyValue=This MyArray=@array.json --resource-group testrg --template-file azuredeploy.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group to create deployment at.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -266,40 +271,51 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_wait
   name: az deployment group wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment group wait --name
+                             --resource-group
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--interval]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
+    syntax: az deployment group wait --created --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -316,6 +332,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -323,40 +342,16 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_group_cancel
-  name: az deployment group cancel
-  summary: Cancel a deployment at resource group.
-- uid: az_deployment_group_create
-  name: az deployment group create
-  summary: Start a deployment at resource group.
-- uid: az_deployment_group_delete
-  name: az deployment group delete
-  summary: Delete a deployment at resource group.
-- uid: az_deployment_group_export
-  name: az deployment group export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group_list
-  name: az deployment group list
-  summary: List deployments at resource group.
-- uid: az_deployment_group_show
-  name: az deployment group show
-  summary: Show a deployment at resource group.
-- uid: az_deployment_group_validate
-  name: az deployment group validate
-  summary: Validate whether a template is valid at resource group.
-- uid: az_deployment_group_wait
-  name: az deployment group wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_deployment_group_cancel
+- az_deployment_group_create
+- az_deployment_group_delete
+- az_deployment_group_export
+- az_deployment_group_list
+- az_deployment_group_show
+- az_deployment_group_validate
+- az_deployment_group_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -372,10 +367,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at resource group.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at resource group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/deployment/operation.yml b/2018-03-01-hybrid/docs-ref-autogen/deployment/operation.yml
index 5bade12abc..676feb5e95 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/deployment/operation.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/deployment/operation.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation
-  name: az deployment operation
-  summary: Manage deployment operations at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation
+name: az deployment operation
+summary: Manage deployment operations at subscription scope.
+description: ''
 commands:
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_operation_group
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,10 +22,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at subscription scope.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml b/2018-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml
index 30158d5936..d12db1d67a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml
@@ -1,45 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_operation_group_list
-  - az_deployment_operation_group_show
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation_group
+name: az deployment operation group
+summary: Manage deployment operations at resource group.
+description: ''
+directCommands:
 - uid: az_deployment_operation_group_list
   name: az deployment operation group list
   summary: List deployment operations at resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation group list --name
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  examples:
+  - summary: List deployment operations at resource group (autogenerated)
+    syntax: az deployment operation group list --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_operation_group_show
   name: az deployment operation group show
   summary: Show a deployment operation at resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation group show --name
+                                       --operation-ids
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -50,24 +54,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -83,10 +82,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at resource group.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at resource group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization.yml b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization.yml
new file mode 100644
index 0000000000..a8d860aefe
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization.yml
@@ -0,0 +1,44 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization
+name: az desktopvirtualization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_desktopvirtualization_applicationgroup
+- az_desktopvirtualization_applicationgroup_create
+- az_desktopvirtualization_applicationgroup_delete
+- az_desktopvirtualization_applicationgroup_list
+- az_desktopvirtualization_applicationgroup_show
+- az_desktopvirtualization_applicationgroup_update
+- az_desktopvirtualization_hostpool
+- az_desktopvirtualization_hostpool_create
+- az_desktopvirtualization_hostpool_delete
+- az_desktopvirtualization_hostpool_list
+- az_desktopvirtualization_hostpool_show
+- az_desktopvirtualization_hostpool_update
+- az_desktopvirtualization_workspace
+- az_desktopvirtualization_workspace_create
+- az_desktopvirtualization_workspace_delete
+- az_desktopvirtualization_workspace_list
+- az_desktopvirtualization_workspace_show
+- az_desktopvirtualization_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/applicationgroup.yml b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/applicationgroup.yml
new file mode 100644
index 0000000000..7c2877b787
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/applicationgroup.yml
@@ -0,0 +1,168 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_applicationgroup
+name: az desktopvirtualization applicationgroup
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization applicationgroup** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization applicationgroup.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_applicationgroup_create
+  name: az desktopvirtualization applicationgroup create
+  summary: Create or update an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup create --application-group-type {Desktop, RemoteApp}
+                                                     --host-pool-arm-path
+                                                     --location
+                                                     --name
+                                                     --resource-group
+                                                     [--description]
+                                                     [--friendly-name]
+                                                     [--tags]
+  examples:
+  - summary: ApplicationGroup_Create
+    syntax: az desktopvirtualization applicationgroup create --location "centralus" --description "des1" --application-group-type "RemoteApp" --friendly-name "friendly" --host-pool-arm-path "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/MyResourceGroup/providers/Microsoft.DesktopVirtualization/hostPools/MyHostPool" --tags tag1="value1" tag2="value2" --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --application-group-type
+    parameterValueGroup: Desktop, RemoteApp
+    summary: Resource Type of ApplicationGroup.
+    description: ''
+  - isRequired: true
+    name: --host-pool-arm-path
+    summary: HostPool arm path of ApplicationGroup.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of ApplicationGroup.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of ApplicationGroup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_delete
+  name: az desktopvirtualization applicationgroup delete
+  summary: Remove an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup delete --name
+                                                     --resource-group
+  examples:
+  - summary: ApplicationGroup_Delete
+    syntax: az desktopvirtualization applicationgroup delete --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_list
+  name: az desktopvirtualization applicationgroup list
+  summary: List applicationGroups in subscription.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup list [--filter]
+                                                   [--resource-group]
+  examples:
+  - summary: ApplicationGroup_ListByResourceGroup
+    syntax: az desktopvirtualization applicationgroup list --filter "applicationGroupType eq 'RailApplication'" --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --filter
+    summary: OData filter expression. Valid properties for filtering are applicationGroupType.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_show
+  name: az desktopvirtualization applicationgroup show
+  summary: Get an application group.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup show --name
+                                                   --resource-group
+  examples:
+  - summary: ApplicationGroup_Get
+    syntax: az desktopvirtualization applicationgroup show --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_update
+  name: az desktopvirtualization applicationgroup update
+  summary: Update an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup update --name
+                                                     --resource-group
+                                                     [--description]
+                                                     [--friendly-name]
+                                                     [--tags]
+  examples:
+  - summary: ApplicationGroups_Update
+    syntax: az desktopvirtualization applicationgroup update --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of ApplicationGroup.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of ApplicationGroup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_desktopvirtualization_applicationgroup_create
+- az_desktopvirtualization_applicationgroup_delete
+- az_desktopvirtualization_applicationgroup_list
+- az_desktopvirtualization_applicationgroup_show
+- az_desktopvirtualization_applicationgroup_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization applicationgroup.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/hostpool.yml b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/hostpool.yml
new file mode 100644
index 0000000000..fd474b922a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/hostpool.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_hostpool
+name: az desktopvirtualization hostpool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization hostpool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization hostpool.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_hostpool_create
+  name: az desktopvirtualization hostpool create
+  summary: Create or update a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool create --host-pool-type {Personal, Pooled}
+                                             --load-balancer-type {BreadthFirst, DepthFirst, Persistent}
+                                             --location
+                                             --name
+                                             --personal-desktop-assignment-type {Automatic, Direct}
+                                             --resource-group
+                                             [--custom-rdp-property]
+                                             [--description]
+                                             [--friendly-name]
+                                             [--max-session-limit]
+                                             [--registration-info]
+                                             [--ring]
+                                             [--sso-context]
+                                             [--tags]
+                                             [--validation-environment {false, true}]
+                                             [--vm-template]
+  examples:
+  - summary: HostPool_Create
+    syntax: az desktopvirtualization hostpool create --location "centralus" --description "des1" --friendly-name "friendly" --host-pool-type "Pooled" --load-balancer-type "BreadthFirst" --max-session-limit 999999 --personal-desktop-assignment-type "Automatic" --registration-info expiration-time="2020-10-01T14:01:54.9571247Z" registration-token-operation="Update" --sso-context "KeyVaultPath" --tags tag1="value1" tag2="value2" --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --host-pool-type
+    parameterValueGroup: Personal, Pooled
+    summary: HostPool type for desktop.
+    description: ''
+  - isRequired: true
+    name: --load-balancer-type
+    parameterValueGroup: BreadthFirst, DepthFirst, Persistent
+    summary: The type of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --personal-desktop-assignment-type
+    parameterValueGroup: Automatic, Direct
+    summary: PersonalDesktopAssignment type for HostPool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-rdp-property
+    summary: Custom rdp property of HostPool.
+    description: ''
+  - name: --description
+    summary: Description of HostPool.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of HostPool.
+    description: ''
+  - name: --max-session-limit
+    summary: The max session limit of HostPool.
+    description: ''
+  - name: --registration-info
+    summary: The registration info of HostPool.
+    description: >-
+      Usage: --registration-info expiration-time=XX token=XX registration-token-operation=XX
+
+
+      expiration-time: Expiration time of registration token.
+
+      token: The registration token base64 encoded string.
+
+      registration-token-operation: The type of resetting the token.
+  - name: --ring
+    summary: The ring number of HostPool.
+    description: ''
+  - name: --sso-context
+    summary: Path to keyvault containing ssoContext secret.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation-environment
+    parameterValueGroup: false, true
+    summary: Is validation environment.
+    description: ''
+  - name: --vm-template
+    summary: VM template for sessionhosts configuration within hostpool.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_delete
+  name: az desktopvirtualization hostpool delete
+  summary: Remove a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool delete --name
+                                             --resource-group
+                                             [--force {false, true}]
+  examples:
+  - summary: HostPool_Delete
+    syntax: az desktopvirtualization hostpool delete --force true --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --force
+    parameterValueGroup: false, true
+    summary: Force flag to delete sessionHost.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_list
+  name: az desktopvirtualization hostpool list
+  summary: List hostPools in subscription.
+  description: ''
+  syntax: az desktopvirtualization hostpool list [--resource-group]
+  examples:
+  - summary: HostPool_ListByResourceGroup
+    syntax: az desktopvirtualization hostpool list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_show
+  name: az desktopvirtualization hostpool show
+  summary: Get a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool show --name
+                                           --resource-group
+  examples:
+  - summary: HostPool_Get
+    syntax: az desktopvirtualization hostpool show --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_update
+  name: az desktopvirtualization hostpool update
+  summary: Update a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool update --name
+                                             --resource-group
+                                             [--custom-rdp-property]
+                                             [--description]
+                                             [--friendly-name]
+                                             [--load-balancer-type {BreadthFirst, DepthFirst, Persistent}]
+                                             [--max-session-limit]
+                                             [--personal-desktop-assignment-type {Automatic, Direct}]
+                                             [--registration-info]
+                                             [--ring]
+                                             [--sso-context]
+                                             [--tags]
+                                             [--validation-environment {false, true}]
+  examples:
+  - summary: HostPool_Update
+    syntax: az desktopvirtualization hostpool update --description "des1" --friendly-name "friendly" --load-balancer-type "BreadthFirst" --max-session-limit 999999 --personal-desktop-assignment-type "Automatic" --registration-info expiration-time="2020-10-01T15:01:54.9571247Z" registration-token-operation="Update" --sso-context "KeyVaultPath" --tags tag1="value1" tag2="value2" --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-rdp-property
+    summary: Custom rdp property of HostPool.
+    description: ''
+  - name: --description
+    summary: Description of HostPool.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of HostPool.
+    description: ''
+  - name: --load-balancer-type
+    parameterValueGroup: BreadthFirst, DepthFirst, Persistent
+    summary: The type of the load balancer.
+    description: ''
+  - name: --max-session-limit
+    summary: The max session limit of HostPool.
+    description: ''
+  - name: --personal-desktop-assignment-type
+    parameterValueGroup: Automatic, Direct
+    summary: PersonalDesktopAssignment type for HostPool.
+    description: ''
+  - name: --registration-info
+    summary: The registration info of HostPool.
+    description: >-
+      Usage: --registration-info expiration-time=XX registration-token-operation=XX
+
+
+      expiration-time: Expiration time of registration token.
+
+      registration-token-operation: The type of resetting the token.
+  - name: --ring
+    summary: The ring number of HostPool.
+    description: ''
+  - name: --sso-context
+    summary: Path to keyvault containing ssoContext secret.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation-environment
+    parameterValueGroup: false, true
+    summary: Is validation environment.
+    description: ''
+commands:
+- az_desktopvirtualization_hostpool_create
+- az_desktopvirtualization_hostpool_delete
+- az_desktopvirtualization_hostpool_list
+- az_desktopvirtualization_hostpool_show
+- az_desktopvirtualization_hostpool_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization hostpool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/workspace.yml
new file mode 100644
index 0000000000..dc072fadea
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/desktopvirtualization/workspace.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_workspace
+name: az desktopvirtualization workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization workspace.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_workspace_create
+  name: az desktopvirtualization workspace create
+  summary: Create or update a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace create --location
+                                              --name
+                                              --resource-group
+                                              [--application-group-references]
+                                              [--description]
+                                              [--friendly-name]
+                                              [--tags]
+  examples:
+  - summary: Workspace_Create
+    syntax: az desktopvirtualization workspace create --resource-group "MyResourceGroup" --location "centralus" --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-group-references
+    summary: List of applicationGroup resource Ids.
+    description: ''
+  - name: --description
+    summary: Description of Workspace.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of Workspace.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_desktopvirtualization_workspace_delete
+  name: az desktopvirtualization workspace delete
+  summary: Remove a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace delete --name
+                                              --resource-group
+  examples:
+  - summary: Workspace_Delete
+    syntax: az desktopvirtualization workspace delete --resource-group "MyResourceGroup" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_list
+  name: az desktopvirtualization workspace list
+  summary: List workspaces in subscription.
+  description: ''
+  syntax: az desktopvirtualization workspace list [--resource-group]
+  examples:
+  - summary: Workspace_ListByResourceGroup
+    syntax: az desktopvirtualization workspace list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_show
+  name: az desktopvirtualization workspace show
+  summary: Get a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace show --name
+                                            --resource-group
+  examples:
+  - summary: Workspace_Get
+    syntax: az desktopvirtualization workspace show --resource-group "MyResourceGroup" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_update
+  name: az desktopvirtualization workspace update
+  summary: Update a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace update --name
+                                              --resource-group
+                                              [--application-group-references]
+                                              [--description]
+                                              [--friendly-name]
+                                              [--tags]
+  examples:
+  - summary: Workspace_Update
+    syntax: az desktopvirtualization workspace update --resource-group "MyResourceGroup" --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-group-references
+    summary: List of applicationGroup links.
+    description: ''
+  - name: --description
+    summary: Description of Workspace.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of Workspace.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_desktopvirtualization_workspace_create
+- az_desktopvirtualization_workspace_delete
+- az_desktopvirtualization_workspace_list
+- az_desktopvirtualization_workspace_show
+- az_desktopvirtualization_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops.yml b/2018-03-01-hybrid/docs-ref-autogen/devops.yml
index bee17d2a03..ed8bcfb183 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops.yml
@@ -1,87 +1,91 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-  description: >-
-    Related Groups
+### YamlMime:AzureCLIGroup
+uid: az_devops
+name: az devops
+summary: Manage Azure DevOps organization level operations.
+description: >-
+  Related Groups
 
-    az pipelines: Manage Azure Pipelines
+  az pipelines: Manage Azure Pipelines
 
-    az boards: Manage Azure Boards
+  az boards: Manage Azure Boards
 
-    az repos: Manage Azure Repos
+  az repos: Manage Azure Repos
 
-    az artifacts: Manage Azure Artifacts.
-  langs:
-  - azurecli
-  children:
-  - az_devops_configure
-  - az_devops_feedback
-  - az_devops_invoke
-  - az_devops_login
-  - az_devops_logout
+  az artifacts: Manage Azure Artifacts.
+directCommands:
 - uid: az_devops_configure
   name: az devops configure
   summary: Configure the Azure DevOps CLI or view your configuration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops configure [--defaults]
+                        [--list]
+                        [--subscription]
+                        [--use-git-aliases {false, true}]
+  optionalParameters:
   - name: --defaults -d
     summary: Space separated 'name=value' pairs for common arguments defaults, e.g. '--defaults project=my-project-name organization=https://dev.azure.com/organizationName arg=value'. Use '' to clear the defaults, e.g. --defaults project=''.
     description: ''
   - name: --list -l
     summary: Lists the contents of the config file.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-git-aliases
     parameterValueGroup: false, true
     summary: Set to 'true' to configure Git aliases global git config file (to enable commands like "git pr list"). Set to 'false' to remove any aliases set by the tool.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_feedback
   name: az devops feedback
   summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az devops feedback [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_devops_invoke
   name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
+  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - https://docs.microsoft.com/en-us/rest/api/azure/devops/.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops invoke [--accept-media-type]
+                     [--api-version]
+                     [--area]
+                     [--detect {false, true}]
+                     [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                     [--http-method {DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}]
+                     [--in-file]
+                     [--media-type]
+                     [--org]
+                     [--out-file]
+                     [--query-parameters]
+                     [--resource]
+                     [--route-parameters]
+                     [--subscription]
   examples:
   - summary: Discover areas related to 'Wiki'
-    syntax:
-      content: az devops invoke --query "[?contains(area,'wiki')]"
+    syntax: az devops invoke --query "[?contains(area,'wiki')]"
   - summary: Get all wikis in a project
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
+    syntax: >-
+      az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
 
-        az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
+      az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
   - summary: Add page to a wiki
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
+    syntax: >-
+      az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
 
-        wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
+      wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
 
-        --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
+      --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
 
-        az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
+      az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
 
-        wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
+      wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
 
-        --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
-  parameters:
+      --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
+  optionalParameters:
   - name: --accept-media-type
     defaultValue: application/json
     summary: Specifies the content type of the response.
@@ -115,7 +119,7 @@ items:
     summary: Specifies the content type of the request.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --out-file
     summary: Path and file name to the file  for which this function saves the response body.
@@ -135,12 +139,13 @@ items:
 - uid: az_devops_login
   name: az devops login
   summary: Set the credential (PAT) to use for a particular organization.
-  description: Refer <a href="https://aka.ms/azure-devops-cli-auth">https://aka.ms/azure-devops-cli-auth</a> for more information on providing PAT as input.
-  langs:
-  - azurecli
-  parameters:
+  description: Refer https://aka.ms/azure-devops-cli-auth for more information on providing PAT as input.
+  syntax: >-
+    az devops login [--org]
+                    [--subscription]
+  optionalParameters:
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName">https://dev.azure.com/MyOrganizationName</a>.'
+    summary: 'Azure DevOps organization URL. Example: https://dev.azure.com/MyOrganizationName.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -149,250 +154,95 @@ items:
   name: az devops logout
   summary: Clear the credential for all or a particular organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops logout [--org]
+                     [--subscription]
+  optionalParameters:
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>. If no organization is specified, all organizations will be logged out.'
+    summary: 'Azure DevOps organization URL. Example: https://dev.azure.com/MyOrganizationName/. If no organization is specified, all organizations will be logged out.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-- uid: az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-- uid: az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-- uid: az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-- uid: az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-- uid: az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-- uid: az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-- uid: az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-- uid: az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-- uid: az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-- uid: az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-- uid: az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-- uid: az_devops_team
-  name: az devops team
-  summary: Manage teams.
-- uid: az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-- uid: az_devops_user
-  name: az devops user
-  summary: Manage users.
-- uid: az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-- uid: az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-- uid: az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
+- az_devops_admin
+- az_devops_admin_banner
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
+- az_devops_configure
+- az_devops_extension
+- az_devops_extension_disable
+- az_devops_extension_enable
+- az_devops_extension_install
+- az_devops_extension_list
+- az_devops_extension_search
+- az_devops_extension_show
+- az_devops_extension_uninstall
+- az_devops_feedback
+- az_devops_invoke
+- az_devops_login
+- az_devops_logout
+- az_devops_project
+- az_devops_project_create
+- az_devops_project_delete
+- az_devops_project_list
+- az_devops_project_show
+- az_devops_security
+- az_devops_security_group
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
+- az_devops_security_permission
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
+- az_devops_service-endpoint
+- az_devops_service-endpoint_azurerm
+- az_devops_service-endpoint_azurerm_create
+- az_devops_service-endpoint_create
+- az_devops_service-endpoint_delete
+- az_devops_service-endpoint_github
+- az_devops_service-endpoint_github_create
+- az_devops_service-endpoint_list
+- az_devops_service-endpoint_show
+- az_devops_service-endpoint_update
+- az_devops_team
+- az_devops_team_create
+- az_devops_team_delete
+- az_devops_team_list
+- az_devops_team_list-member
+- az_devops_team_show
+- az_devops_team_update
+- az_devops_user
+- az_devops_user_add
+- az_devops_user_list
+- az_devops_user_remove
+- az_devops_user_show
+- az_devops_user_update
+- az_devops_wiki
+- az_devops_wiki_create
+- az_devops_wiki_delete
+- az_devops_wiki_list
+- az_devops_wiki_page
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
+- az_devops_wiki_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -408,13 +258,14 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Related Groups
+metadata:
+  description: >-
+    Related Groups
 
-  az pipelines: Manage Azure Pipelines
+    az pipelines: Manage Azure Pipelines
 
-  az boards: Manage Azure Boards
+    az boards: Manage Azure Boards
 
-  az repos: Manage Azure Repos
+    az repos: Manage Azure Repos
 
-  az artifacts: Manage Azure Artifacts.
+    az artifacts: Manage Azure Artifacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/admin.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/admin.yml
index 321a3a2bf8..3e73a57e9c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/admin.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/admin.yml
@@ -1,31 +1,15 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_devops_admin
+name: az devops admin
+summary: Manage administration operations.
+description: ''
 commands:
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
+- az_devops_admin_banner
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -41,4 +25,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage administration operations.
+metadata:
+  description: Manage administration operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml
index 4223ec7ca4..bf702cf069 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml
@@ -1,28 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_admin_banner_add
-  - az_devops_admin_banner_list
-  - az_devops_admin_banner_remove
-  - az_devops_admin_banner_show
-  - az_devops_admin_banner_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_admin_banner
+name: az devops admin banner
+summary: Manage organization banner.
+description: ''
+directCommands:
 - uid: az_devops_admin_banner_add
   name: az devops admin banner add
   summary: Add a new banner and immediately show it.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner add --message
+                               [--detect {false, true}]
+                               [--expiration]
+                               [--id]
+                               [--org]
+                               [--subscription]
+                               [--type {error, info, warning}]
+  requiredParameters:
   - isRequired: true
     name: --message -m
     summary: Message (string) to show in the banner.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -34,28 +33,34 @@ items:
     summary: Identifier for the new banner. This identifier is needed to change or remove the message later. A unique identifier is automatically created if one is not specified.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --type -t
     parameterValueGroup: error, info, warning
     summary: Type of banner to present. Defaults is "info".
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_admin_banner_list
   name: az devops admin banner list
   summary: List banners.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner list [--detect {false, true}]
+                                [--org]
+                                [--query-examples]
+                                [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -64,19 +69,23 @@ items:
   name: az devops admin banner remove
   summary: Remove a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner remove --id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the banner to remove.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -85,19 +94,27 @@ items:
   name: az devops admin banner show
   summary: Show details for a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner show --id
+                                [--detect {false, true}]
+                                [--org]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier for the banner.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -106,13 +123,20 @@ items:
   name: az devops admin banner update
   summary: Update the message, level, or expiration date for a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner update --id
+                                  [--detect {false, true}]
+                                  [--expiration]
+                                  [--message]
+                                  [--org]
+                                  [--subscription]
+                                  [--type {error, info, warning}]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the banner to update.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -124,31 +148,21 @@ items:
     summary: Message (string) to show in the banner.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --type -t
     parameterValueGroup: error, info, warning
     summary: Type of banner to present. Defaults is "info".
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -164,4 +178,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage organization banner.
+metadata:
+  description: Manage organization banner.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/extension.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/extension.yml
index 9d37fa3efe..2313c84136 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/extension.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/extension.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_extension_disable
-  - az_devops_extension_enable
-  - az_devops_extension_install
-  - az_devops_extension_list
-  - az_devops_extension_search
-  - az_devops_extension_show
-  - az_devops_extension_uninstall
+### YamlMime:AzureCLIGroup
+uid: az_devops_extension
+name: az devops extension
+summary: Manage extensions.
+description: ''
+directCommands:
 - uid: az_devops_extension_disable
   name: az devops extension disable
   summary: Disable an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension disable --extension-id
+                                --publisher-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -29,12 +23,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -43,9 +38,13 @@ items:
   name: az devops extension enable
   summary: Enable an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension enable --extension-id
+                               --publisher-id
+                               [--detect {false, true}]
+                               [--org]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -54,12 +53,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -68,9 +68,13 @@ items:
   name: az devops extension install
   summary: Install an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension install --extension-id
+                                --publisher-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -79,12 +83,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -93,9 +98,14 @@ items:
   name: az devops extension list
   summary: List extensions installed in an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension list [--detect {false, true}]
+                             [--include-built-in {false, true}]
+                             [--include-disabled {false, true}]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -109,7 +119,10 @@ items:
     summary: Include disabled extensions.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -118,13 +131,15 @@ items:
   name: az devops extension search
   summary: Search extensions from marketplace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension search --search-query
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --search-query -q
     summary: Search term.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -132,9 +147,14 @@ items:
   name: az devops extension show
   summary: Get detail of single extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension show --extension-id
+                             --publisher-id
+                             [--detect {false, true}]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -143,12 +163,16 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -157,9 +181,14 @@ items:
   name: az devops extension uninstall
   summary: Uninstall an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension uninstall --extension-id
+                                  --publisher-id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--subscription]
+                                  [--yes]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -168,41 +197,28 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 commands:
-- uid: az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
+- az_devops_extension_disable
+- az_devops_extension_enable
+- az_devops_extension_install
+- az_devops_extension_list
+- az_devops_extension_search
+- az_devops_extension_show
+- az_devops_extension_uninstall
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -218,4 +234,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage extensions.
+metadata:
+  description: Manage extensions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/project.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/project.yml
index 2a8368296c..48b5ecfe60 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/project.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/project.yml
@@ -1,27 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_project_create
-  - az_devops_project_delete
-  - az_devops_project_list
-  - az_devops_project_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_project
+name: az devops project
+summary: Manage team projects.
+description: ''
+directCommands:
 - uid: az_devops_project_create
   name: az devops project create
   summary: Create a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project create --name
+                             [--description]
+                             [--detect {false, true}]
+                             [--open]
+                             [--org]
+                             [--process]
+                             [--source-control {git, tfvc}]
+                             [--subscription]
+                             [--visibility {private, public}]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new project.
     description: ''
+  optionalParameters:
   - name: --description -d
     summary: Description for the new project.
     description: ''
@@ -33,7 +35,7 @@ items:
     summary: Open the team project in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --process -p
     summary: Process to use. Default if not specified.
@@ -43,45 +45,58 @@ items:
     parameterValueGroup: git, tfvc
     summary: Source control type of the initial code repository created.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --visibility
     defaultValue: private
     parameterValueGroup: private, public
     summary: Project visibility.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_project_delete
   name: az devops project delete
   summary: Delete team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project delete --id
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+                             [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the project to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_project_list
   name: az devops project list
   summary: List team projects.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project list [--continuation-token]
+                           [--detect {false, true}]
+                           [--get-default-team-image-url {false, true}]
+                           [--org]
+                           [--query-examples]
+                           [--skip]
+                           [--state-filter {all, createPending, deleted, deleting, new, unchanged, wellFormed}]
+                           [--subscription]
+                           [--top]
+  optionalParameters:
   - name: --continuation-token
     summary: Continuation token. This can be retrived from previous run of this command if more results are present.
     description: ''
@@ -94,7 +109,10 @@ items:
     summary: Whether to get default team image url or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: Number of results to skip.
@@ -104,23 +122,29 @@ items:
     parameterValueGroup: all, createPending, deleted, deleting, new, unchanged, wellFormed
     summary: State filter.
     description: ''
-  - name: --top
-    summary: Maximum number of results to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of results to list.
+    description: ''
 - uid: az_devops_project_show
   name: az devops project show
   summary: Show team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project show --project
+                           [--detect {false, true}]
+                           [--open]
+                           [--org]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -129,24 +153,19 @@ items:
     summary: Open the team project in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
+- az_devops_project_create
+- az_devops_project_delete
+- az_devops_project_list
+- az_devops_project_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -162,4 +181,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage team projects.
+metadata:
+  description: Manage team projects.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/security.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/security.yml
index ab6577b7b7..5ab75e06d0 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/security.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/security.yml
@@ -1,70 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_devops_security
+name: az devops security
+summary: Manage security related operations.
+description: ''
 commands:
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
+- az_devops_security_group
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
+- az_devops_security_permission
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -80,4 +38,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security related operations.
+metadata:
+  description: Manage security related operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/security/group.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/security/group.yml
index 0cda88cc2c..87050e10c0 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/security/group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/security/group.yml
@@ -1,51 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_group_create
-  - az_devops_security_group_delete
-  - az_devops_security_group_list
-  - az_devops_security_group_show
-  - az_devops_security_group_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_group
+name: az devops security group
+summary: Manage security groups.
+description: ''
+directCommands:
 - uid: az_devops_security_group_create
   name: az devops security group create
   summary: Create a new Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops security group create [--description]
+                                    [--detect {false, true}]
+                                    [--email-id]
+                                    [--groups]
+                                    [--name]
+                                    [--org]
+                                    [--origin-id]
+                                    [--project]
+                                    [--scope {organization, project}]
+                                    [--subscription]
   examples:
   - summary: Create an Azure DevOps Group with name and description
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
+    syntax: >-
+      az devops security group create --name 'Some group name'
 
-        --description 'Something to describe this group'
+      --description 'Something to describe this group'
   - summary: Add an existing AAD group to an Azure DevOps group
-    syntax:
-      content: >-
-        Get object ID of an existing AAD group
+    syntax: >-
+      Get object ID of an existing AAD group
 
-        az ad group show -g '{Group Name}'
+      az ad group show -g '{Group Name}'
 
-        az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
+      az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
   - summary: Add an existing AAD group to an Azure DevOps group with AAD group Email ID
-    syntax:
-      content: >-
-        az devops security group create --email-id '{Email ID of AAD group}'
+    syntax: >-
+      az devops security group create --email-id '{Email ID of AAD group}'
 
-        --groups 'vssgp.someDescriptorForGroup'
+      --groups 'vssgp.someDescriptorForGroup'
   - summary: Create a new Azure DevOps group and add it to existing Azure DevOps groups.
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
+    syntax: >-
+      az devops security group create --name 'Some group name'
 
-        --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
-  parameters:
+      --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
+  optionalParameters:
   - name: --description
     summary: Description of Azure DevOps group.
     description: ''
@@ -63,7 +60,7 @@ items:
     summary: Name of Azure DevOps group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --origin-id
     summary: Create new group using the OriginID as a reference to an existing group from an external AD or AAD backed provider. Required if name or email-id is missing.
@@ -83,33 +80,45 @@ items:
   name: az devops security group delete
   summary: Delete an Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group delete --id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--subscription]
+                                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_security_group_list
   name: az devops security group list
   summary: List all the groups in a project or organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group list [--continuation-token]
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--query-examples]
+                                  [--scope {organization, project}]
+                                  [--subject-types]
+                                  [--subscription]
+  optionalParameters:
   - name: --continuation-token
     summary: If there are more results that can't be returned in a single page, the result set will contain a continuation token for retrieval of the next set of results.
     description: ''
@@ -118,11 +127,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: List groups for a particular project.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     defaultValue: project
     parameterValueGroup: organization, project
@@ -138,19 +150,27 @@ items:
   name: az devops security group show
   summary: Show group details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group show --id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -159,13 +179,19 @@ items:
   name: az devops security group update
   summary: Update name AND/OR description for an Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group update --id
+                                    [--description]
+                                    [--detect {false, true}]
+                                    [--name]
+                                    [--org]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --description
     summary: New description for Azure DevOps group.
     description: ''
@@ -177,39 +203,21 @@ items:
     summary: New name for Azure DevOps group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -225,4 +233,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security groups.
+metadata:
+  description: Manage security groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml
index afae7695f6..32ba3cfd76 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_group_membership_add
-  - az_devops_security_group_membership_list
-  - az_devops_security_group_membership_remove
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_group_membership
+name: az devops security group membership
+summary: Manage memberships for security groups.
+description: ''
+directCommands:
 - uid: az_devops_security_group_membership_add
   name: az devops security group membership add
   summary: Add membership.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership add --group-id
+                                            --member-id
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id
     summary: Descriptor of the group to which member needs to be added.
@@ -25,12 +23,13 @@ items:
     name: --member-id
     summary: Descriptor of the group or Email Id of the user to be added. User should already be a part of the organization. Use `az devops user add` command to add an user to organization.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -39,19 +38,28 @@ items:
   name: az devops security group membership list
   summary: List memberships for a group or user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership list --id
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--query-examples]
+                                             [--relationship {memberof, members}]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Group descriptor or User Email whose membership details are required.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --relationship
     defaultValue: members
@@ -65,9 +73,14 @@ items:
   name: az devops security group membership remove
   summary: Remove membership.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership remove --group-id
+                                               --member-id
+                                               [--detect {false, true}]
+                                               [--org]
+                                               [--subscription]
+                                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id
     summary: Descriptor of the group from which member needs to be removed.
@@ -76,29 +89,24 @@ items:
     name: --member-id
     summary: Descriptor of the group or Email Id of the user to be removed.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 commands:
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -114,4 +122,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage memberships for security groups.
+metadata:
+  description: Manage memberships for security groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml
index fea65aaca1..eb0bab97d2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_permission_list
-  - az_devops_security_permission_reset
-  - az_devops_security_permission_reset_all
-  - az_devops_security_permission_show
-  - az_devops_security_permission_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_permission
+name: az devops security permission
+summary: Manage security permissions.
+description: ''
+directCommands:
 - uid: az_devops_security_permission_list
   name: az devops security permission list
   summary: List tokens for given user/group and namespace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission list --id
+                                       --subject
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--query-examples]
+                                       [--recurse]
+                                       [--subscription]
+                                       [--token]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -27,29 +26,39 @@ items:
     name: --subject
     summary: User Email ID or Group descriptor.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --recurse
     summary: If true and this is a hierarchical namespace, return child ACLs of the specified token.
     description: ''
-  - name: --token
-    summary: Security token.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --token
+    summary: Security token.
+    description: ''
 - uid: az_devops_security_permission_reset
   name: az devops security permission reset
   summary: Reset permission for given permission bit(s).
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission reset --id
+                                        --permission-bit
+                                        --subject
+                                        --token
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -66,23 +75,30 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_security_permission_reset_all
+- uid: az_devops_security_permission_reset-all
   name: az devops security permission reset-all
   summary: Clear all permissions of this token for a user/group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission reset-all --id
+                                            --subject
+                                            --token
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--subscription]
+                                            [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -95,26 +111,33 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_security_permission_show
   name: az devops security permission show
   summary: Show permissions for given token, namespace and user/group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission show --id
+                                       --subject
+                                       --token
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -127,12 +150,16 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -140,20 +167,27 @@ items:
 - uid: az_devops_security_permission_update
   name: az devops security permission update
   summary: Assign allow or deny permission to given user/group.
-  description: Learn more at <a href="https://aka.ms/azure-devops-cli-security-permission">https://aka.ms/azure-devops-cli-security-permission</a>.
-  langs:
-  - azurecli
+  description: Learn more at https://aka.ms/azure-devops-cli-security-permission.
+  syntax: >-
+    az devops security permission update --id
+                                         --subject
+                                         --token
+                                         [--allow-bit]
+                                         [--deny-bit]
+                                         [--detect {false, true}]
+                                         [--merge {false, true}]
+                                         [--org]
+                                         [--subscription]
   examples:
   - summary: Assign view, edit and delete permission for team projects.
-    syntax:
-      content: >-
-        az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
+    syntax: >-
+      az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
 
 
-        You would need to add the bit value of the various permission bits to
+      You would need to add the bit value of the various permission bits to
 
-        simultaneously allow/deny multiple permissions.
-  parameters:
+      simultaneously allow/deny multiple permissions.
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -166,6 +200,7 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --allow-bit
     summary: Allow bit or addition of bits. Required if --deny-bit is missing.
     description: ''
@@ -182,36 +217,20 @@ items:
     summary: If set, the existing ACE has its allow and deny merged with                          the incoming ACE's allow and deny. If unset, the existing ACE is displaced.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,4 +246,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security permissions.
+metadata:
+  description: Manage security permissions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml
index 9b76ef9021..703b38cf0c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml
@@ -1,21 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_permission_namespace_list
-  - az_devops_security_permission_namespace_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_permission_namespace
+name: az devops security permission namespace
+summary: Manage security namespaces.
+description: ''
+directCommands:
 - uid: az_devops_security_permission_namespace_list
   name: az devops security permission namespace list
   summary: List all available namespaces for an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission namespace list [--detect {false, true}]
+                                                 [--local-only]
+                                                 [--org]
+                                                 [--query-examples]
+                                                 [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -24,7 +23,10 @@ items:
     summary: If true, retrieve only local security namespaces.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -33,30 +35,34 @@ items:
   name: az devops security permission namespace show
   summary: Show details of permissions available in each namespace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission namespace show --id
+                                                 [--detect {false, true}]
+                                                 [--org]
+                                                 [--query-examples]
+                                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -72,4 +78,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security namespaces.
+metadata:
+  description: Manage security namespaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml
index e14b0060a3..5d0fba1f03 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml
@@ -1,28 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_create
-  - az_devops_service_endpoint_delete
-  - az_devops_service_endpoint_list
-  - az_devops_service_endpoint_show
-  - az_devops_service_endpoint_update
-- uid: az_devops_service_endpoint_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint
+name: az devops service-endpoint
+summary: Manage service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_create
   name: az devops service-endpoint create
   summary: Create a service endpoint using configuration file.
-  description: You can learn more about this at <a href="https://aka.ms/azure-devops-service-endpoint-config">https://aka.ms/azure-devops-service-endpoint-config</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: You can learn more about this at https://aka.ms/azure-devops-service-endpoint-config.
+  syntax: >-
+    az devops service-endpoint create --service-endpoint-configuration
+                                      [--detect {false, true}]
+                                      [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --service-endpoint-configuration
     summary: Configuration file with service endpoint request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -33,7 +31,7 @@ items:
     summary: Encoding of the input file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -41,17 +39,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_delete
+- uid: az_devops_service-endpoint_delete
   name: az devops service-endpoint delete
   summary: Deletes service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint delete --id
+                                      [--deep]
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+                                      [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Id of the service endpoint to delete.
     description: ''
+  optionalParameters:
   - name: --deep
     summary: Specific to AzureRM endpoint created in Automatic flow. When it is specified, this will also delete corresponding AAD application in Azure.
     description: ''
@@ -60,72 +65,94 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_devops_service-endpoint_list
   name: az devops service-endpoint list
   summary: List service endpoints in a project.
   description: rtypelist of VssJsonCollectionWrapper.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint list [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_show
+- uid: az_devops_service-endpoint_show
   name: az devops service-endpoint show
   summary: Get the details of a service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint show --id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the service endpoint.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_update
+- uid: az_devops_service-endpoint_update
   name: az devops service-endpoint update
   summary: Update a service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint update --id
+                                      [--detect {false, true}]
+                                      [--enable-for-all {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the service endpoint.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -135,7 +162,7 @@ items:
     summary: Allow all pipelines to access this service endpoint.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -144,33 +171,15 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
+- az_devops_service-endpoint_azurerm
+- az_devops_service-endpoint_azurerm_create
+- az_devops_service-endpoint_create
+- az_devops_service-endpoint_delete
+- az_devops_service-endpoint_github
+- az_devops_service-endpoint_github_create
+- az_devops_service-endpoint_list
+- az_devops_service-endpoint_show
+- az_devops_service-endpoint_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -186,4 +195,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage service endpoints/connections.
+metadata:
+  description: Manage service endpoints/connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml
index 753c21aaf3..fc8eaab85b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml
@@ -1,20 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_azurerm_create
-- uid: az_devops_service_endpoint_azurerm_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint_azurerm
+name: az devops service-endpoint azurerm
+summary: Manage Azure RM service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_azurerm_create
   name: az devops service-endpoint azurerm create
   summary: Create an Azure RM type service endpoint.
-  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at https://aka.ms/azure-devops-cli-azurerm-service-endpoint.
+  syntax: >-
+    az devops service-endpoint azurerm create --azure-rm-service-principal-id
+                                              --azure-rm-subscription-id
+                                              --azure-rm-subscription-name
+                                              --azure-rm-tenant-id
+                                              --name
+                                              [--azure-rm-service-principal-certificate-path]
+                                              [--detect {false, true}]
+                                              [--org]
+                                              [--project]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --azure-rm-service-principal-id
     summary: Service principal id for creating azure rm service endpoint.
@@ -35,15 +40,16 @@ items:
     name: --name
     summary: Name of service endpoint to create.
     description: ''
+  optionalParameters:
   - name: --azure-rm-service-principal-certificate-path
-    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:&lt;password_here&gt;". More details : <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.'
+    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:<password_here>". More details : https://aka.ms/azure-devops-cli-azurerm-service-endpoint.'
     description: ''
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,9 +58,7 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
+- az_devops_service-endpoint_azurerm_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -70,4 +74,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure RM service endpoints/connections.
+metadata:
+  description: Manage Azure RM service endpoints/connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml
index e42bf8ec38..2532d9b542 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml
@@ -1,20 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_github_create
-- uid: az_devops_service_endpoint_github_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint_github
+name: az devops service-endpoint github
+summary: Manage GitHub service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_github_create
   name: az devops service-endpoint github create
   summary: Create a GitHub service endpoint.
-  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-service-endpoint">https://aka.ms/azure-devops-cli-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at https://aka.ms/azure-devops-cli-service-endpoint.
+  syntax: >-
+    az devops service-endpoint github create --github-url
+                                             --name
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --github-url
     summary: Url for github for creating service endpoint.
@@ -23,12 +24,13 @@ items:
     name: --name
     summary: Name of service endpoint to create.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -37,9 +39,7 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
+- az_devops_service-endpoint_github_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -55,4 +55,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage GitHub service endpoints/connections.
+metadata:
+  description: Manage GitHub service endpoints/connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/team.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/team.yml
index e130a3e250..54efcf73e6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/team.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/team.yml
@@ -1,29 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_team
-  name: az devops team
-  summary: Manage teams.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_team_create
-  - az_devops_team_delete
-  - az_devops_team_list
-  - az_devops_team_list_member
-  - az_devops_team_show
-  - az_devops_team_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_team
+name: az devops team
+summary: Manage teams.
+description: ''
+directCommands:
 - uid: az_devops_team_create
   name: az devops team create
   summary: Create a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team create --name
+                          [--description]
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new team.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the new team.
     description: ''
@@ -32,7 +29,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -44,72 +41,94 @@ items:
   name: az devops team delete
   summary: Delete a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team delete --id
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the team to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_team_list
   name: az devops team list
   summary: List all teams in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team list [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--skip]
+                        [--subscription]
+                        [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --skip
     summary: Number of teams to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of teams to return.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_team_list_member
+  - name: --top
+    summary: Maximum number of teams to return.
+    description: ''
+- uid: az_devops_team_list-member
   name: az devops team list-member
   summary: List members of a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team list-member --team
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--skip]
+                               [--subscription]
+                               [--top]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to show members of.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -117,33 +136,42 @@ items:
   - name: --skip
     summary: Number of members to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of members to return.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of members to return.
+    description: ''
 - uid: az_devops_team_show
   name: az devops team show
   summary: Show team details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team show --team
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to show.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -151,13 +179,20 @@ items:
   name: az devops team update
   summary: Update a team's name and/or description.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team update --team
+                          [--description]
+                          [--detect {false, true}]
+                          [--name]
+                          [--org]
+                          [--project]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to be updated.
     description: ''
+  optionalParameters:
   - name: --description
     summary: New description of the team.
     description: ''
@@ -169,7 +204,7 @@ items:
     summary: New name of the team.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -178,24 +213,12 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
+- az_devops_team_create
+- az_devops_team_delete
+- az_devops_team_list
+- az_devops_team_list-member
+- az_devops_team_show
+- az_devops_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,4 +234,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage teams.
+metadata:
+  description: Manage teams.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/user.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/user.yml
index 10f8218c6f..8257e0b579 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/user.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/user.yml
@@ -1,24 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_user
-  name: az devops user
-  summary: Manage users.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_user_add
-  - az_devops_user_list
-  - az_devops_user_remove
-  - az_devops_user_show
-  - az_devops_user_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_user
+name: az devops user
+summary: Manage users.
+description: ''
+directCommands:
 - uid: az_devops_user_add
   name: az devops user add
   summary: Add user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user add --email-id
+                       --license-type {advanced, earlyAdopter, express, professional, stakeholder}
+                       [--detect {false, true}]
+                       [--org]
+                       [--send-email-invite {false, true}]
+                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email-id
     summary: Email ID of the user.
@@ -28,12 +25,13 @@ items:
     parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
     summary: License type for the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --send-email-invite
     parameterValueGroup: false, true
@@ -46,67 +44,88 @@ items:
   name: az devops user list
   summary: List users in an organization [except for users which are added via AAD groups].
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user list [--detect {false, true}]
+                        [--org]
+                        [--query-examples]
+                        [--skip]
+                        [--subscription]
+                        [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: 'Offset: Number of records to skip.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --top
     defaultValue: "100"
     summary: Maximum number of users to return. Max value is 10000.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_user_remove
   name: az devops user remove
   summary: Remove user from an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user remove --user
+                          [--detect {false, true}]
+                          [--org]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_user_show
   name: az devops user show
   summary: Show user details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user show --user
+                        [--detect {false, true}]
+                        [--org]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -115,9 +134,13 @@ items:
   name: az devops user update
   summary: Update license type for a user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user update --license-type {advanced, earlyAdopter, express, professional, stakeholder}
+                          --user
+                          [--detect {false, true}]
+                          [--org]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --license-type
     parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
@@ -127,32 +150,23 @@ items:
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
+- az_devops_user_add
+- az_devops_user_list
+- az_devops_user_remove
+- az_devops_user_show
+- az_devops_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -168,4 +182,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage users.
+metadata:
+  description: Manage users.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/wiki.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/wiki.yml
index 134f191558..98722ad2b5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/wiki.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/wiki.yml
@@ -1,33 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_wiki_create
-  - az_devops_wiki_delete
-  - az_devops_wiki_list
-  - az_devops_wiki_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_wiki
+name: az devops wiki
+summary: Manage wikis.
+description: ''
+directCommands:
 - uid: az_devops_wiki_create
   name: az devops wiki create
   summary: Create a wiki.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki create [--detect {false, true}]
+                          [--mapped-path]
+                          [--name]
+                          [--org]
+                          [--project]
+                          [--repository]
+                          [--subscription]
+                          [--type {codewiki, projectwiki}]
+                          [--version]
   examples:
   - summary: Create a project wiki
-    syntax:
-      content: az devops wiki create --name myprojectwiki
+    syntax: az devops wiki create --name myprojectwiki
   - summary: Create a code wiki from a folder in a code repository
-    syntax:
-      content: >-
-        az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
+    syntax: >-
+      az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
 
-        --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
-  parameters:
+      --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -39,7 +38,7 @@ items:
     summary: Name of the new wiki.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,6 +46,9 @@ items:
   - name: --repository -r
     summary: '[Required for codewiki type] Name or ID of the repository to publish the wiki from.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --type --wiki-type
     defaultValue: projectwiki
     parameterValueGroup: codewiki, projectwiki
@@ -55,60 +57,69 @@ items:
   - name: --version -v
     summary: '[Required for codewiki type] Repository branch name to publish the code wiki from.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_wiki_delete
   name: az devops wiki delete
   summary: Delete a wiki.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki delete --wiki
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --wiki
     summary: Name or Id of the wiki to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_wiki_list
   name: az devops wiki list
   summary: List all the wikis in a project or organization.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki list [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--scope {organization, project}]
+                        [--subscription]
   examples:
   - summary: List all wikis for a project
-    syntax:
-      content: az devops wiki list
+    syntax: az devops wiki list
   - summary: List all wikis in the organization
-    syntax:
-      content: az devops wiki list --scope organization
-  parameters:
+    syntax: az devops wiki list --scope organization
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     defaultValue: project
     parameterValueGroup: organization, project
@@ -121,13 +132,20 @@ items:
   name: az devops wiki show
   summary: Show details of a wiki.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki show --wiki
+                        [--detect {false, true}]
+                        [--open]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -136,42 +154,27 @@ items:
     summary: Open the wiki in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
+- az_devops_wiki_create
+- az_devops_wiki_delete
+- az_devops_wiki_list
+- az_devops_wiki_page
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
+- az_devops_wiki_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -187,4 +190,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wikis.
+metadata:
+  description: Manage wikis.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml b/2018-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml
index 2523227065..73bb957973 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml
@@ -1,30 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_wiki_page_create
-  - az_devops_wiki_page_delete
-  - az_devops_wiki_page_show
-  - az_devops_wiki_page_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_wiki_page
+name: az devops wiki page
+summary: Manage wiki pages.
+description: ''
+directCommands:
 - uid: az_devops_wiki_page_create
   name: az devops wiki page create
   summary: Add a new page.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki page create --path
+                               --wiki
+                               [--comment]
+                               [--content]
+                               [--detect {false, true}]
+                               [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                               [--file-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
   examples:
   - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
+    syntax: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
   - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with content from a file
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
-  parameters:
+    syntax: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -33,6 +33,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Added a new page using Azure DevOps CLI
     summary: Comment in the commit message of file add operation.
@@ -53,7 +54,7 @@ items:
     summary: Path of the file input if content is specified in the file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -65,9 +66,16 @@ items:
   name: az devops wiki page delete
   summary: Delete a page.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki page delete --path
+                               --wiki
+                               [--comment]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -76,6 +84,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Deleted the page using Azure DevOps CLI
     summary: Comment in the commit message of delete operation.
@@ -85,24 +94,33 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_wiki_page_show
   name: az devops wiki page show
   summary: Get the content of a page or open a page.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki page show --path
+                             --wiki
+                             [--detect {false, true}]
+                             [--include-content]
+                             [--open]
+                             [--org]
+                             [--project]
+                             [--query-examples]
+                             [--subscription]
+                             [--version]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -111,6 +129,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -122,31 +141,42 @@ items:
     summary: Open the wiki page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --version -v
-    summary: Version (ETag) of the wiki page.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version -v
+    summary: Version (ETag) of the wiki page.
+    description: ''
 - uid: az_devops_wiki_page_update
   name: az devops wiki page update
   summary: Edit a page.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki page update --path
+                               --version
+                               --wiki
+                               [--comment]
+                               [--content]
+                               [--detect {false, true}]
+                               [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                               [--file-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
   examples:
   - summary: Update content of page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
+    syntax: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
   - summary: Update content of page with path 'my page' in a wiki with content from a file
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  parameters:
+    syntax: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -159,6 +189,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Updated the page using Azure DevOps CLI
     summary: Comment in the commit message of file edit operation.
@@ -179,7 +210,7 @@ items:
     summary: Path of the file input if content is specified in the file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -188,18 +219,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -215,4 +238,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wiki pages.
+metadata:
+  description: Manage wiki pages.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/disk-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/disk-pool.yml
new file mode 100644
index 0000000000..49a0cde4c1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/disk-pool.yml
@@ -0,0 +1,325 @@
+### YamlMime:AzureCLIGroup
+uid: az_disk-pool
+name: az disk-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **diskpool** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az disk-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure disk pool.
+description: ''
+directCommands:
+- uid: az_disk-pool_create
+  name: az disk-pool create
+  summary: Create Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool create --disk-pool-name
+                        --resource-group
+                        --sku
+                        --subnet-id
+                        [--additional-capabilities]
+                        [--availability-zones]
+                        [--disks]
+                        [--location]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Create or Update Disk pool
+    syntax: az disk-pool create --location "westus" --availability-zones "1" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --subnet-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" --sku name="Basic_V0" tier="Basic" --tags key="value" --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: Determines the SKU of the Disk Pool.
+    description: >-
+      Usage: --sku name=XX tier=XX
+
+
+      name: Required. Sku name
+
+      tier: Sku tier.
+  - isRequired: true
+    name: --subnet-id
+    summary: Azure Resource ID of a Subnet for the Disk Pool.
+    description: ''
+  optionalParameters:
+  - name: --additional-capabilities -a
+    summary: List of additional capabilities for a Disk Pool.
+    description: ''
+  - name: --availability-zones
+    summary: 'Logical zone for Disk Pool resource; example: ["1"].'
+    description: ''
+  - name: --disks
+    summary: List of Azure Managed Disks to attach to a Disk Pool.
+    description: >-
+      The order of this parameter is specific customized. Usage:  --disks id-value
+
+
+      id: Required. Unique Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --disks argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_disk-pool_delete
+  name: az disk-pool delete
+  summary: Delete a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool delete --disk-pool-name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: Delete Disk pool
+    syntax: az disk-pool delete --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk-pool_list
+  name: az disk-pool list
+  summary: Gets a list of DiskPools in a resource group. And Gets a list of Disk Pools in a subscription.
+  description: ''
+  syntax: az disk-pool list [--resource-group]
+  examples:
+  - summary: List Disk Pools
+    syntax: az disk-pool list --resource-group "myResourceGroup"
+  - summary: List Disk Pools by subscription
+    syntax: az disk-pool list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_list-skus
+  name: az disk-pool list-skus
+  summary: Lists available Disk Pool Skus in an Azure location.
+  description: ''
+  syntax: az disk-pool list-skus [--location]
+  examples:
+  - summary: List Disk Pool Skus
+    syntax: az disk-pool list-skus --location "eastus"
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_disk-pool_show
+  name: az disk-pool show
+  summary: Get a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool show --disk-pool-name
+                      --resource-group
+  examples:
+  - summary: Get Disk pool
+    syntax: az disk-pool show --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_start
+  name: az disk-pool start
+  summary: The operation to start a Disk Pool.
+  description: ''
+  syntax: >-
+    az disk-pool start --disk-pool-name
+                       --resource-group
+                       [--no-wait]
+  examples:
+  - summary: Start Disk Pool
+    syntax: az disk-pool start --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_disk-pool_stop
+  name: az disk-pool stop
+  summary: Shuts down the Disk Pool and releases the compute resources. You are not billed for the compute resources that this Disk Pool uses.
+  description: ''
+  syntax: >-
+    az disk-pool stop --disk-pool-name
+                      --resource-group
+                      [--no-wait]
+  examples:
+  - summary: Deallocate Disk Pool
+    syntax: az disk-pool stop --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_disk-pool_update
+  name: az disk-pool update
+  summary: Update a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool update --disk-pool-name
+                        --resource-group
+                        [--disks]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Update Disk pool
+    syntax: az disk-pool update --name "myDiskPool" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --tags key="value" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disks
+    summary: List of Azure Managed Disks to attach to a Disk Pool.
+    description: >-
+      The order of this parameter is specific customized. Usage:  --disks id-value
+
+
+      id: Required. Unique Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --disks argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_disk-pool_wait
+  name: az disk-pool wait
+  summary: Place the CLI in a waiting state until a condition of the disk-pool is met.
+  description: ''
+  syntax: >-
+    az disk-pool wait --disk-pool-name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully created.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully updated.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully deleted.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_disk-pool_create
+- az_disk-pool_delete
+- az_disk-pool_iscsi-target
+- az_disk-pool_iscsi-target_create
+- az_disk-pool_iscsi-target_delete
+- az_disk-pool_iscsi-target_list
+- az_disk-pool_iscsi-target_show
+- az_disk-pool_iscsi-target_update
+- az_disk-pool_iscsi-target_wait
+- az_disk-pool_list
+- az_disk-pool_list-skus
+- az_disk-pool_show
+- az_disk-pool_start
+- az_disk-pool_stop
+- az_disk-pool_update
+- az_disk-pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure disk pool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/disk-pool/iscsi-target.yml b/2018-03-01-hybrid/docs-ref-autogen/disk-pool/iscsi-target.yml
new file mode 100644
index 0000000000..0eb020a1c3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/disk-pool/iscsi-target.yml
@@ -0,0 +1,289 @@
+### YamlMime:AzureCLIGroup
+uid: az_disk-pool_iscsi-target
+name: az disk-pool iscsi-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **diskpool** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az disk-pool iscsi-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage iSCSI target with a Disk Pool.
+description: ''
+directCommands:
+- uid: az_disk-pool_iscsi-target_create
+  name: az disk-pool iscsi-target create
+  summary: Create an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target create --acl-mode {Dynamic, Static}
+                                     --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--luns]
+                                     [--no-wait]
+                                     [--static-acls]
+                                     [--target-iqn]
+  examples:
+  - summary: Create or Update iSCSI Target
+    syntax: az disk-pool iscsi-target create --disk-pool-name "myDiskPool" --acl-mode "Dynamic" --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --target-iqn "iqn.2005-03.org.iscsi:server1" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --acl-mode
+    parameterValueGroup: Dynamic, Static
+    summary: Mode for Target connectivity.
+    description: ''
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --luns
+    summary: List of LUNs to be exposed through iSCSI Target.
+    description: >-
+      Usage: --luns name=XX managed-disk-azure-resource-id=XX
+
+
+      name: Required. User defined name for iSCSI LUN; example: "lun0"
+
+      managed-disk-azure-resource-id: Required. Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --luns argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --static-acls
+    summary: Access Control List (ACL) for an iSCSI Target; defines LUN masking policy.
+    description: >-
+      Usage: --static-acls initiator-iqn=XX mapped-luns=XX
+
+
+      initiator-iqn: Required. iSCSI initiator IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:client".
+
+      mapped-luns: Required. List of LUN names mapped to the ACL.
+
+
+      Multiple actions can be specified by using more than one --static-acls argument.
+  - name: --target-iqn
+    summary: 'ISCSI Target IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:server".'
+    description: ''
+- uid: az_disk-pool_iscsi-target_delete
+  name: az disk-pool iscsi-target delete
+  summary: Delete an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target delete --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete iSCSI Target
+    syntax: az disk-pool iscsi-target delete --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk-pool_iscsi-target_list
+  name: az disk-pool iscsi-target list
+  summary: Get iSCSI Targets in a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target list --disk-pool-name
+                                   --resource-group
+  examples:
+  - summary: List Disk Pools by Resource Group
+    syntax: az disk-pool iscsi-target list --disk-pool-name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_iscsi-target_show
+  name: az disk-pool iscsi-target show
+  summary: Get an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target show --disk-pool-name
+                                   --iscsi-target-name
+                                   --resource-group
+  examples:
+  - summary: Get iSCSI Target
+    syntax: az disk-pool iscsi-target show --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_iscsi-target_update
+  name: az disk-pool iscsi-target update
+  summary: Update an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target update --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--luns]
+                                     [--no-wait]
+                                     [--static-acls]
+  examples:
+  - summary: Update iSCSI Target
+    syntax: az disk-pool iscsi-target update --disk-pool-name "myDiskPool" --name "myIscsiTarget" --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --luns
+    summary: List of LUNs to be exposed through iSCSI Target.
+    description: >-
+      Usage: --luns name=XX managed-disk-azure-resource-id=XX
+
+
+      name: Required. User defined name for iSCSI LUN; example: "lun0"
+
+      managed-disk-azure-resource-id: Required. Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --luns argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --static-acls
+    summary: Access Control List (ACL) for an iSCSI Target; defines LUN masking policy.
+    description: >-
+      Usage: --static-acls initiator-iqn=XX mapped-luns=XX
+
+
+      initiator-iqn: Required. iSCSI initiator IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:client".
+
+      mapped-luns: Required. List of LUN names mapped to the ACL.
+
+
+      Multiple actions can be specified by using more than one --static-acls argument.
+- uid: az_disk-pool_iscsi-target_wait
+  name: az disk-pool iscsi-target wait
+  summary: Place the CLI in a waiting state until a condition of the disk-pool iscsi-target is met.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target wait --disk-pool-name
+                                   --iscsi-target-name
+                                   --resource-group
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully created.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully updated.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully deleted.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_disk-pool_iscsi-target_create
+- az_disk-pool_iscsi-target_delete
+- az_disk-pool_iscsi-target_list
+- az_disk-pool_iscsi-target_show
+- az_disk-pool_iscsi-target_update
+- az_disk-pool_iscsi-target_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage iSCSI target with a Disk Pool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/disk.yml b/2018-03-01-hybrid/docs-ref-autogen/disk.yml
index 6768c2fa9b..f03808d301 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/disk.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/disk.yml
@@ -1,77 +1,88 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_disk
-  name: az disk
-  summary: Manage Azure Managed Disks.
-  description: >-
-    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+### YamlMime:AzureCLIGroup
+uid: az_disk
+name: az disk
+summary: Manage Azure Managed Disks.
+description: >-
+  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
-    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
-    For more information, see:
+  For more information, see:
 
-    - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+  - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-    - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+  - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-    - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
-  langs:
-  - azurecli
-  children:
-  - az_disk_create
-  - az_disk_delete
-  - az_disk_grant_access
-  - az_disk_list
-  - az_disk_revoke_access
-  - az_disk_show
-  - az_disk_update
-  - az_disk_wait
+  - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
+directCommands:
 - uid: az_disk_create
   name: az disk create
   summary: Create a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk create --name
+                   --resource-group
+                   [--disk-iops-read-only]
+                   [--disk-mbps-read-only]
+                   [--enable-bursting {false, true}]
+                   [--gallery-image-reference]
+                   [--gallery-image-reference-lun]
+                   [--image-reference]
+                   [--image-reference-lun]
+                   [--location]
+                   [--logical-sector-size]
+                   [--max-shares]
+                   [--no-wait]
+                   [--os-type {Linux, Windows}]
+                   [--size-gb]
+                   [--sku {Premium_LRS, Standard_LRS}]
+                   [--source]
+                   [--source-storage-account-id]
+                   [--subscription]
+                   [--tags]
+                   [--tier]
+                   [--zone {1, 2, 3}]
   examples:
   - summary: Create a managed disk by importing from a blob uri.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --source https://vhd1234.blob.core.windows.net/vhds/osdisk1234.vhd
+    syntax: az disk create -g MyResourceGroup -n MyDisk --source https://vhd1234.blob.core.windows.net/vhds/osdisk1234.vhd
   - summary: Create an empty managed disk.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 10
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10
+  - summary: Create an empty managed disk with bursting enabled.
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 1024 --location centraluseuap --enable-bursting
   - summary: Create a managed disk by copying an existing disk or snapshot.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk2 --source MyDisk
+    syntax: az disk create -g MyResourceGroup -n MyDisk2 --source MyDisk
   - summary: Create a disk in an availability zone in the region of "East US 2"
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --location eastus2 --zone 1
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --location eastus2 --zone 1
   - summary: Create a disk from image.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --image-reference Canonical:UbuntuServer:18.04-LTS:18.04.202002180
+    syntax: az disk create -g MyResourceGroup -n MyDisk --image-reference Canonical:UbuntuServer:18.04-LTS:18.04.202002180
   - summary: Create a disk from gallery image.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --gallery-image-reference $id
+    syntax: az disk create -g MyResourceGroup -n MyDisk --gallery-image-reference $id
   - summary: Create a disk with total number of IOPS and total throughput (MBps) limitation.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --sku UltraSSD_LRS --disk-iops-read-only 200 --disk-mbps-read-only 30
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --sku UltraSSD_LRS --disk-iops-read-only 200 --disk-mbps-read-only 30
   - summary: Create a disk and specify maximum number of VMs that can attach to the disk at the same time.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 256 --max-shares 2 -l centraluseuap
-  parameters:
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 256 --max-shares 2 -l centraluseuap
+  - summary: Create a disk and associate it with a disk access resource.
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --network-access-policy AllowPrivate --disk-access MyDiskAccessID
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the managed disk.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --disk-iops-read-only
     summary: The total number of IOPS that will be allowed across all VMs mounting the shared disk as ReadOnly. One operation can transfer between 4k and 256k bytes.
     description: ''
   - name: --disk-mbps-read-only
     summary: The total throughput (MBps) that will be allowed across all VMs mounting the shared disk as ReadOnly. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10.
     description: ''
+  - name: --enable-bursting
+    parameterValueGroup: false, true
+    summary: Enable bursting beyond the provisioned performance target of the disk. Bursting is disabled by default, and it does not apply to Ultra disks.
+    description: ''
   - name: --gallery-image-reference
     summary: ID of the shared galley image version from which to create a disk.
     description: ''
@@ -85,7 +96,10 @@ items:
     summary: If the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`. If location is not specified and no default location specified, location will be automatically set as same as the resource group.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`. If location is not specified and no default location specified, location will be automatically set as same as the resource group.'
+    description: ''
+  - name: --logical-sector-size
+    summary: Logical sector size in bytes for Ultra disks. Supported values are 512 ad 4096. 4096 is the default.
     description: ''
   - name: --max-shares
     summary: The maximum number of VMs that can attach to the disk at the same time. Value greater than one indicates a disk that can be mounted on multiple VMs at the same time.
@@ -111,60 +125,71 @@ items:
   - name: --source-storage-account-id
     summary: Used when source blob is in a different subscription.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  - name: --tier
+    summary: 'Performance tier of the disk (e.g, P4, S10) as described here: https://azure.microsoft.com/en-us/pricing/details/managed-disks/. Does not apply to Ultra disks.'
+    description: ''
   - name: --zone
     parameterValueGroup: 1, 2, 3
     summary: Availability zone into which to provision the resource.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_disk_delete
   name: az disk delete
   summary: Delete a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk delete [--ids]
+                   [--name]
+                   [--no-wait]
+                   [--resource-group]
+                   [--subscription]
+                   [--yes]
   examples:
   - summary: Delete a managed disk. (autogenerated)
-    syntax:
-      content: az disk delete --name MyManagedDisk --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az disk delete --name MyManagedDisk --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the managed disk.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_disk_grant_access
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk_grant-access
   name: az disk grant-access
   summary: Grant a resource access to a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk grant-access --duration-in-seconds
+                         [--ids]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Grant a resource read access to a managed disk. (autogenerated)
-    syntax:
-      content: az disk grant-access --access-level Read --duration-in-seconds 3600 --name MyManagedDisk --resource-group MyResourceGroup
-  parameters:
+    syntax: az disk grant-access --access-level Read --duration-in-seconds 3600 --name MyManagedDisk --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --duration-in-seconds
     summary: Time duration in seconds until the SAS access expires.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -172,7 +197,7 @@ items:
     summary: The name of the managed disk.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -181,29 +206,35 @@ items:
   name: az disk list
   summary: List managed disks.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az disk list [--query-examples]
+                 [--resource-group]
+                 [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_disk_revoke_access
+- uid: az_disk_revoke-access
   name: az disk revoke-access
   summary: Revoke a resource's read access to a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk revoke-access [--ids]
+                          [--name]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Revoke a resource's read access to a managed disk. (autogenerated)
-    syntax:
-      content: az disk revoke-access --ids $id
+    syntax: az disk revoke-access --ids $id
   - summary: Revoke a resource's read access to a managed disk. (autogenerated)
-    syntax:
-      content: az disk revoke-access --name MyManagedDisk --resource-group MyResourceGroup
-  parameters:
+    syntax: az disk revoke-access --name MyManagedDisk --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -211,7 +242,7 @@ items:
     summary: The name of the managed disk.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -220,17 +251,24 @@ items:
   name: az disk show
   summary: Gets information about a disk.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az disk show [--ids]
+                 [--name]
+                 [--query-examples]
+                 [--resource-group]
+                 [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the managed disk.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -239,70 +277,97 @@ items:
   name: az disk update
   summary: Update a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk update [--add]
+                   [--disk-iops-read-only]
+                   [--disk-mbps-read-only]
+                   [--enable-bursting {false, true}]
+                   [--force-string]
+                   [--ids]
+                   [--max-shares]
+                   [--name]
+                   [--no-wait]
+                   [--remove]
+                   [--resource-group]
+                   [--set]
+                   [--size-gb]
+                   [--sku {Premium_LRS, Standard_LRS}]
+                   [--subscription]
   examples:
+  - summary: Update a managed disk and associate it with a disk access resource.
+    syntax: az disk update --name MyManagedDisk --resource-group MyResourceGroup --network-access-policy AllowPrivate --disk-access MyDiskAccessID
   - summary: Update a managed disk. (autogenerated)
-    syntax:
-      content: az disk update --name MyManagedDisk --resource-group MyResourceGroup --size-gb 20
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+    syntax: az disk update --name MyManagedDisk --resource-group MyResourceGroup --size-gb 20
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --size-gb -z
-    summary: 'Size in GB. Max size: 4095 GB (certain preview disks can be larger).'
+  - name: --disk-iops-read-only
+    summary: The total number of IOPS that will be allowed across all VMs mounting the shared disk as ReadOnly. One operation can transfer between 4k and 256k bytes.
     description: ''
-  - name: --sku
-    parameterValueGroup: Premium_LRS, Standard_LRS
-    summary: Underlying storage SKU.
+  - name: --disk-mbps-read-only
+    summary: The total throughput (MBps) that will be allowed across all VMs mounting the shared disk as ReadOnly. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10.
+    description: ''
+  - name: --enable-bursting
+    parameterValueGroup: false, true
+    summary: Enable bursting beyond the provisioned performance target of the disk. Bursting is disabled by default, and it does not apply to Ultra disks.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --max-shares
+    summary: The maximum number of VMs that can attach to the disk at the same time. Value greater than one indicates a disk that can be mounted on multiple VMs at the same time.
+    description: ''
   - name: --name -n
     summary: The name of the managed disk.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
+  - name: --size-gb -z
+    summary: 'Size in GB. Max size: 4095 GB (certain preview disks can be larger).'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Premium_LRS, Standard_LRS
+    summary: Underlying storage SKU.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
 - uid: az_disk_wait
   name: az disk wait
   summary: Place the CLI in a waiting state until a condition of a managed disk is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk wait [--created]
+                 [--custom]
+                 [--deleted]
+                 [--exists]
+                 [--ids]
+                 [--interval]
+                 [--name]
+                 [--resource-group]
+                 [--subscription]
+                 [--timeout]
+                 [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a condition of a managed disk is met. (autogenerated)
-    syntax:
-      content: az disk wait --created --name MyManagedDisk --resource-group MyResourceGroup
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the managed disk.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az disk wait --created --name MyManagedDisk --resource-group MyResourceGroup
+  - summary: Place the CLI in a waiting state until a condition of a managed disk is met. (autogenerated)
+    syntax: az disk wait --deleted --name MyManagedDisk --resource-group MyResourceGroup --subscription mysubscription
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -315,10 +380,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The name of the managed disk.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -327,30 +404,14 @@ items:
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
 commands:
-- uid: az_disk_create
-  name: az disk create
-  summary: Create a managed disk.
-- uid: az_disk_delete
-  name: az disk delete
-  summary: Delete a managed disk.
-- uid: az_disk_grant_access
-  name: az disk grant-access
-  summary: Grant a resource access to a managed disk.
-- uid: az_disk_list
-  name: az disk list
-  summary: List managed disks.
-- uid: az_disk_revoke_access
-  name: az disk revoke-access
-  summary: Revoke a resource's read access to a managed disk.
-- uid: az_disk_show
-  name: az disk show
-  summary: Gets information about a disk.
-- uid: az_disk_update
-  name: az disk update
-  summary: Update a managed disk.
-- uid: az_disk_wait
-  name: az disk wait
-  summary: Place the CLI in a waiting state until a condition of a managed disk is met.
+- az_disk_create
+- az_disk_delete
+- az_disk_grant-access
+- az_disk_list
+- az_disk_revoke-access
+- az_disk_show
+- az_disk_update
+- az_disk_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -366,15 +427,16 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+metadata:
+  description: >-
+    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
-  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
-  For more information, see:
+    For more information, see:
 
-  - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+    - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-  - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+    - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-  - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
+    - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dms.yml b/2018-03-01-hybrid/docs-ref-autogen/dms.yml
new file mode 100644
index 0000000000..172507032f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dms.yml
@@ -0,0 +1,35 @@
+### YamlMime:AzureCLIGroup
+uid: az_dms
+name: az dms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **dms-preview** extension for Azure CLI and requires version 2.0.43 or higher.  The extension will automatically install the first time you run an **az dms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Data Migration Service (DMS) instances.
+description: ''
+commands:
+- az_dms_project
+- az_dms_project_create
+- az_dms_project_task
+- az_dms_project_task_cancel
+- az_dms_project_task_create
+- az_dms_project_task_cutover
+- az_dms_project_task_restart
+- az_dms_project_task_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Data Migration Service (DMS) instances.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dms/project.yml b/2018-03-01-hybrid/docs-ref-autogen/dms/project.yml
new file mode 100644
index 0000000000..e3aaf67902
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dms/project.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_dms_project
+name: az dms project
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **dms-preview** extension for Azure CLI and requires version 2.0.43 or higher.  The extension will automatically install the first time you run an **az dms project** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage projects for an instance of the Data Migration Service.
+description: ''
+directCommands:
+- uid: az_dms_project_create
+  name: az dms project create
+  summary: Create a migration Project which can contain multiple Tasks.
+  description: >-
+    The following project configurations are supported:
+        -) source -> target
+        1) SQL -> SQLDB
+        2) MySQL -> AzureDbForMySql
+        3) PostgreSQL -> AzureDbForPostgreSQL
+        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API).
+  syntax: >-
+    az dms project create --location
+                          --name
+                          --resource-group
+                          --service-name
+                          --source-platform
+                          --target-platform
+                          [--tags]
+  examples:
+  - summary: Create a SQL Project for a DMS instance.
+    syntax: az dms project create -l westus -n myproject -g myresourcegroup --service-name mydms --source-platform SQL --target-platform SQLDB --tags tagName1=tagValue1 tagWithNoValue
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  - isRequired: true
+    name: --source-platform
+    summary: 'The type of server for the source database. The supported types are: SQL, MySQL, PostgreSQL, MongoDB.'
+    description: ''
+  - isRequired: true
+    name: --target-platform
+    summary: 'The type of service for the target database. The supported types are: SQLDB, AzureDbForMySql, AzureDbForPostgreSQL, MongoDB.'
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: A space-delimited list of tags in tag1[=value1]" format.
+    description: ''
+commands:
+- az_dms_project_create
+- az_dms_project_task
+- az_dms_project_task_cancel
+- az_dms_project_task_create
+- az_dms_project_task_cutover
+- az_dms_project_task_restart
+- az_dms_project_task_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage projects for an instance of the Data Migration Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dms/project/task.yml b/2018-03-01-hybrid/docs-ref-autogen/dms/project/task.yml
new file mode 100644
index 0000000000..f0bc264282
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dms/project/task.yml
@@ -0,0 +1,384 @@
+### YamlMime:AzureCLIGroup
+uid: az_dms_project_task
+name: az dms project task
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **dms-preview** extension for Azure CLI and requires version 2.0.43 or higher.  The extension will automatically install the first time you run an **az dms project task** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tasks for a Data Migration Service instance's project.
+description: ''
+directCommands:
+- uid: az_dms_project_task_cancel
+  name: az dms project task cancel
+  summary: This command is being deprecated. Use the stop command instead.
+  description: >-
+    To keep a more consistent experience with Azure's portal UI use:
+        az dms project task stop.
+  syntax: >-
+    az dms project task cancel --name
+                               --project-name
+                               --resource-group
+                               --service-name
+                               [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --object-name
+    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
+    description: ''
+- uid: az_dms_project_task_create
+  name: az dms project task create
+  summary: Create and start a migration Task.
+  description: >-
+    The following task configurations are supported:
+        -) source -> target :: task type
+        1) SQL -> SQLDB :: OfflineMigration
+        2) MySQL -> AzureDbForMySql :: OnlineMigration
+        3) PostgreSQL -> AzureDbForPostgreSQL :: OnlineMigration
+        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API) :: OfflineMigration.
+  syntax: >-
+    az dms project task create --database-options-json
+                               --name
+                               --project-name
+                               --resource-group
+                               --service-name
+                               --source-connection-json
+                               --target-connection-json
+                               --task-type
+                               [--enable-data-integrity-validation]
+                               [--enable-query-analysis-validation]
+                               [--enable-schema-validation]
+                               [--validate-only]
+                               [--validated-task-name]
+  examples:
+  - summary: Create and start a SQL Task which performs no validation checks.
+    syntax: "az dms project task create --database-options-json C:\\CliFiles\\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json '{'dataSource': 'myserver', 'authentication': 'SqlAuthentication', 'encryptConnection': 'true', 'trustServerCertificate': 'true'}' --target-connection-json C:\\CliFiles\\targetConnection.json --task-type offlinemigration"
+  - summary: Create and start a SQL Task which performs all validation checks.
+    syntax: az dms project task create --database-options-json C:\CliFiles\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json C:\CliFiles\sourceConnection.json --target-connection-json C:\CliFiles\targetConnection.json --enable-data-integrity-validation --enable-query-analysis-validation --enable-schema-validation --task-type offlinemigration
+  requiredParameters:
+  - isRequired: true
+    name: --database-options-json
+    summary: Database and table information. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
+    description: >-
+      For SQL we support per table migrations. To use this, specify the tables names in the 'table_map' as below. You can also set the source as read only.
+        [
+            {
+                "name": "source database",
+                "target_database_name": "target database",
+                "make_source_db_read_only": false|true,
+                "table_map": {
+                    "schema.SourceTableName1": "schema.TargetTableName1",
+                    "schema.SourceTableName2": "schema.TargetTableName2",
+                    ...n
+                }
+            },
+            ...n
+        ]
+
+      For MySQL and PostgreSQL, the format of the database options JSON object.
+        [
+            {
+                "name": "source database",
+                "target_database_name": "target database",
+                // Used for manipulating the underlying migration engine.
+                // Only provide if instructed to do so or if you really know what you are doing.
+                "migrationSetting": {
+                    "setting1": "value1",
+                    ...n
+                },
+                // Used for manipulating the underlying migration engine.
+                // Only provide if instructed to do so or if you really know what you are doing.
+                "sourceSetting": {
+                    "setting1": "value1",
+                    ...n
+                },
+                // Used for manipulating the underlying migration engine.
+                // Only provide if instructed to do so or if you really know what you are doing.
+                "targetSetting": {
+                    "setting1": "value1",
+                    ...n
+                },
+                // Applies only for PostgreSQL
+                // List tables that you want included in the migration.
+                "selectedTables": [
+                    "schemaName1.tableName1",
+                    ...n
+                ]
+            },
+            ...n
+        ]
+
+      For MongoDB we support per collection migrations. To use this, specify the collections inside the database object as below.
+        {
+            // set to zero to get the default boost during migration (recommended)
+            "boostRUs": 0,
+            // "OneTime" or "Continuous", only "OneTime" is currently supported
+            "replication": "OneTime",
+            // Set to null to use maximum resources available.
+            "throttling": {
+                // percentage of the CPU to try to avoid using
+                "minFreeCpu": 25,
+                // amount of RAM (in MBs) to try to avoid using
+                "minFreeMemoryMb": 1024,
+                // max number of collections to migrate at a time
+                "maxParallelism": 2
+            },
+            "databases": {
+                "database_name": {
+                    // see https://docs.microsoft.com/th-th/azure/cosmos-db/request-units,     ||
+                    // set to null to use default
+                    // or 0 if throughput should not be provisioned at the database level
+                    "targetRUs": 0,
+                    "collections": {
+                        "collection_name_1": {
+                            // Whether the target database/collection will be deleted if exists
+                            "canDelete": true,
+                            // set to null if target should not be sharded
+                            // or to copy the shard key from source (if exists)
+                            "shardKey": null,
+                            // set to null to use default (recommended)
+                            "targetRUs": null
+                        },
+                        "collection_name_2": {
+                            "canDelete": true,
+                            "shardKey": {
+                                "fields": [
+                                    {
+                                        "name": "field_name",
+                                        // accepts "Forward", "Reverse", or "Hashed" but CosmosDB only accepts a single-field, hashed shard key
+                                        "order": "Forward"
+                                    },
+                                    ...n
+                                ],
+                                // whether shard key is unique
+                                // see https://docs.microsoft.com/azure/cosmos-db/partition-data
+                                "isUnique": false
+                            },
+                            "targetRUs": 10000
+                        },
+                        ...n
+                    }
+                },
+                ...n
+            }
+        }.
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  - isRequired: true
+    name: --source-connection-json
+    summary: The connection information to the source server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
+    description: >-
+      The format of the connection JSON object for SQL connections.
+        {
+            "userName": "user name",    // if this is missing or null, you will be prompted
+            "password": null,           // if this is missing or null (highly recommended) you will be prompted
+            "dataSource": "server name[,port]",
+            "authentication": "SqlAuthentication|WindowsAuthentication",
+            "encryptConnection": true,      // highly recommended to leave as true
+            "trustServerCertificate": false  // highly recommended to leave as false
+        }
+
+      The format of the connection JSON object for MySql connections.
+        {
+            "userName": "user name",    // if this is missing or null, you will be prompted
+            "password": null,           // if this is missing or null (highly recommended) you will be prompted
+            "serverName": "server name",
+            "port": 3306                // if this is missing, it will default to 3306
+        }
+
+      The format of the connection JSON object for PostgreSQL connections.
+        {
+            "userName": "user name",    // if this is missing or null, you will be prompted
+            "password": null,           // if this is missing or null (highly recommended) you will be prompted
+            "serverName": "server name",
+            "databaseName": "database name", // if this is missing, it will default to the 'postgres' database
+            "port": 5432,                // if this is missing, it will default to 5432
+            "encryptConnection": true,      // highly recommended to leave as true (For PostgreSQL to Azure PostgreSQL migration only)
+            "trustServerCertificate": false  // highly recommended to leave as false (For PostgreSQL to Azure PostgreSQL migration only)
+        }
+
+      The format of the connection JSON object for MongoDB connections.
+        {
+            "userName": null,   // if this is missing or null, you will be prompted
+            "password": null,   // if this is missing or null (highly recommended) you will be prompted
+            "connectionString": "mongodb://hostOrIp:port"
+        }.
+  - isRequired: true
+    name: --target-connection-json
+    summary: The connection information to the target server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See 'source-connection-json' for examples of connection formats.
+    description: ''
+  - isRequired: true
+    name: --task-type
+    summary: 'The type of data movement the task will support. The supported types are: OnlineMigration, OfflineMigration.'
+    description: ''
+  optionalParameters:
+  - name: --enable-data-integrity-validation
+    summary: (For SQL only) Whether to perform a checksum based data integrity validation between source and target for the selected database and tables.
+    description: ''
+  - name: --enable-query-analysis-validation
+    summary: (For SQL only) Whether to perform a quick and intelligent query analysis by retrieving queries from the source database and executing them in the target. The result will have execution statistics for executions in source and target databases for the extracted queries.
+    description: ''
+  - name: --enable-schema-validation
+    summary: (For SQL only) Whether to compare the schema information between source and target.
+    description: ''
+  - name: --validate-only
+    summary: (For MongoDB to Cosmos DB only) Whether to run validation only and NOT run migration. It is mandatory to run a 'validate only' task before attempting an actual migration. Once the validation is complete, pass the name of this 'validate only' task to a new task's 'validated task name' argument.
+    description: ''
+  - name: --validated-task-name
+    summary: (For MongoDB to Cosmos DB only) When running a migration it is neceaary to pass in the name of a previously run 'validate only' task.
+    description: ''
+- uid: az_dms_project_task_cutover
+  name: az dms project task cutover
+  summary: For an online migration task, complete the migration by performing a cutover.
+  description: >-
+    To see the result of the request, please use the 'task show' command:
+        az dms project task show ... --expand command.
+  syntax: >-
+    az dms project task cutover --name
+                                --project-name
+                                --resource-group
+                                --service-name
+                                [--immediate]
+                                [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --immediate
+    summary: For MongoDB migrations, whether to cutover immediately or to let the currently loaded events get migrated. For all other migration types, this has no effect.
+    description: ''
+  - name: --object-name
+    summary: For MongoDB migrations, the qualified name of the database or collection you wish to cutover. Leave blank to cutover the entire migration. For all other migration types, the name of the database on the source you wish to cutover.
+    description: ''
+- uid: az_dms_project_task_restart
+  name: az dms project task restart
+  summary: ''
+  description: >-
+    To see the result of the request, please use the 'task show' command:
+        az dms project task show ... --expand command.
+  syntax: >-
+    az dms project task restart --name
+                                --project-name
+                                --resource-group
+                                --service-name
+                                [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --object-name
+    summary: The qualified name of the database or collection you wish to restart. Leave blank to restart the entire migration.
+    description: ''
+- uid: az_dms_project_task_stop
+  name: az dms project task stop
+  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
+  description: >-
+    To see the result of the request, please use the 'task show' command:
+        az dms project task show ... --expand command.
+  syntax: >-
+    az dms project task stop --name
+                             --project-name
+                             --resource-group
+                             --service-name
+                             [--object-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
+    description: ''
+  - isRequired: true
+    name: --project-name
+    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
+    description: ''
+  optionalParameters:
+  - name: --object-name
+    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
+    description: ''
+commands:
+- az_dms_project_task_cancel
+- az_dms_project_task_create
+- az_dms_project_task_cutover
+- az_dms_project_task_restart
+- az_dms_project_task_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tasks for a Data Migration Service instance's project.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt.yml b/2018-03-01-hybrid/docs-ref-autogen/dt.yml
new file mode 100644
index 0000000000..98071f0631
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt.yml
@@ -0,0 +1,215 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt
+name: az dt
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Digital Twins solutions & infrastructure.
+description: ''
+directCommands:
+- uid: az_dt_create
+  name: az dt create
+  summary: Create or update a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt create --dt-name
+                 --resource-group
+                 [--assign-identity {false, true}]
+                 [--location]
+                 [--pna {Disabled, Enabled}]
+                 [--role]
+                 [--scopes]
+                 [--tags]
+  examples:
+  - summary: Create instance in target resource group using the resource group location.
+    syntax: az dt create -n {instance_name} -g {resouce_group}
+  - summary: Create instance in target resource group with specified location and tags.
+    syntax: az dt create -n {instance_name} -g {resouce_group} -l westus --tags a=b c=d
+  - summary: Create instance in the target resource group with a system managed identity.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity
+  - summary: Create instance in the target resource group with a system managed identity then assign the identity to one or more scopes (space-separated) with the role of Contributor.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity --scopes "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.EventHub/namespaces/myEventHubNamespace/eventhubs/myEventHub" "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.ServiceBus/namespaces/myServiceBusNamespace/topics/myTopic"
+  - summary: Create instance in the target resource group with a system managed identity then assign the identity to one or more scopes with a custom specified role.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity --scopes "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.EventHub/namespaces/myEventHubNamespace/eventhubs/myEventHub" "/subscriptions/a12345ea-bb21-994d-2263-c716348e32a1/resourceGroups/ProResourceGroup/providers/Microsoft.ServiceBus/namespaces/myServiceBusNamespace/topics/myTopic" --role MyCustomRole
+  - summary: Update an instance in the target resource group to enable system managed identity.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity
+  - summary: Update an instance in the target resource group to disable system managed identity.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --assign-identity false
+  - summary: Update an instance in the target resource group with new tag values and disable public network access.
+    syntax: az dt create -n {instance_name} -g {resouce_group} --tags env=prod --public-network-access Disabled
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity
+    parameterValueGroup: false, true
+    summary: Assign a system generated identity to the Digital Twins instance.
+    description: ''
+  - name: --location -l
+    summary: Digital Twins instance location. If no location is provided the resource group location is used.You can configure the default location using `az configure --defaults location=<name>`.
+    description: ''
+  - name: --pna --public-network-access
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Determines if the Digital Twins instance can be accessed from a public network.
+    description: ''
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or Id the system assigned identity will have.
+    description: ''
+  - name: --scopes
+    summary: Space-seperated scopes the system assigned identity can access.
+    description: ''
+  - name: --tags
+    summary: 'Digital Twins instance tags. Property bag in key-value pairs with the following format: a=b c=d.'
+    description: ''
+- uid: az_dt_delete
+  name: az dt delete
+  summary: Delete an existing Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt delete --dt-name
+                 [--no-wait]
+                 [--resource-group]
+                 [--yes]
+  examples:
+  - summary: Delete an arbitrary instance in blocking fashion with a confirmation prompt.
+    syntax: az dt delete -n {instance_name}
+  - summary: Delete an arbitrary instance with no blocking or prompt.
+    syntax: az dt delete -n {instance_name} -y --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_list
+  name: az dt list
+  summary: List the collection of Digital Twins instances by subscription or resource group.
+  description: ''
+  syntax: az dt list [--resource-group]
+  examples:
+  - summary: List all instances in the current subscription.
+    syntax: az dt list
+  - summary: List all instances in target resource group and output in table format.
+    syntax: az dt list -g {resource_group} --output table
+  - summary: List all instances in subscription that meet a condition.
+    syntax: az dt list --query "[?contains(name, 'Production')]"
+  - summary: Count instances that meet condition.
+    syntax: az dt list --query "length([?contains(name, 'Production')])"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_show
+  name: az dt show
+  summary: Show an existing Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt show --dt-name
+               [--resource-group]
+  examples:
+  - summary: Show an instance.
+    syntax: az dt show -n {instance_name}
+  - summary: Show an instance and project certain properties.
+    syntax: az dt show -n {instance_name} --query "{Endpoint:hostName, Location:location}"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_create
+- az_dt_delete
+- az_dt_endpoint
+- az_dt_endpoint_create
+- az_dt_endpoint_create_eventgrid
+- az_dt_endpoint_create_eventhub
+- az_dt_endpoint_create_servicebus
+- az_dt_endpoint_delete
+- az_dt_endpoint_list
+- az_dt_endpoint_show
+- az_dt_list
+- az_dt_model
+- az_dt_model_create
+- az_dt_model_delete
+- az_dt_model_delete-all
+- az_dt_model_list
+- az_dt_model_show
+- az_dt_model_update
+- az_dt_network
+- az_dt_network_private-endpoint
+- az_dt_network_private-endpoint_connection
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+- az_dt_network_private-link
+- az_dt_network_private-link_list
+- az_dt_network_private-link_show
+- az_dt_role-assignment
+- az_dt_role-assignment_create
+- az_dt_role-assignment_delete
+- az_dt_role-assignment_list
+- az_dt_route
+- az_dt_route_create
+- az_dt_route_delete
+- az_dt_route_list
+- az_dt_route_show
+- az_dt_show
+- az_dt_twin
+- az_dt_twin_component
+- az_dt_twin_component_show
+- az_dt_twin_component_update
+- az_dt_twin_create
+- az_dt_twin_delete
+- az_dt_twin_delete-all
+- az_dt_twin_query
+- az_dt_twin_relationship
+- az_dt_twin_relationship_create
+- az_dt_twin_relationship_delete
+- az_dt_twin_relationship_delete-all
+- az_dt_twin_relationship_list
+- az_dt_twin_relationship_show
+- az_dt_twin_relationship_update
+- az_dt_twin_show
+- az_dt_twin_telemetry
+- az_dt_twin_telemetry_send
+- az_dt_twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Digital Twins solutions & infrastructure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/endpoint.yml
new file mode 100644
index 0000000000..e68bb77d02
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/endpoint.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_endpoint
+name: az dt endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Digital Twins instance endpoints.
+description: ''
+directCommands:
+- uid: az_dt_endpoint_delete
+  name: az dt endpoint delete
+  summary: Remove an endpoint from a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt endpoint delete --dt-name
+                          --en
+                          [--no-wait]
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: Remove an endpoint from an instance and block until the operation is complete.
+    syntax: az dt endpoint delete -n {instance_name} --endpoint-name {endpoint_name}
+  - summary: Remove an endpoint from an instance without confirmation or blocking.
+    syntax: az dt endpoint delete -n {instance_name} --endpoint-name {endpoint_name} -y --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_endpoint_list
+  name: az dt endpoint list
+  summary: List all egress endpoints configured on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt endpoint list --dt-name
+                        [--resource-group]
+  examples:
+  - summary: List all egress endpoints configured on an instance.
+    syntax: az dt endpoint list -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_endpoint_show
+  name: az dt endpoint show
+  summary: Show details of an endpoint configured on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt endpoint show --dt-name
+                        --en
+                        [--resource-group]
+  examples:
+  - summary: Show a desired endpoint by name on an instance.
+    syntax: az dt endpoint show -n {instance_name} --endpoint-name {endpoint_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_endpoint_create
+- az_dt_endpoint_create_eventgrid
+- az_dt_endpoint_create_eventhub
+- az_dt_endpoint_create_servicebus
+- az_dt_endpoint_delete
+- az_dt_endpoint_list
+- az_dt_endpoint_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Digital Twins instance endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/endpoint/create.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/endpoint/create.yml
new file mode 100644
index 0000000000..bbe9b39467
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/endpoint/create.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_endpoint_create
+name: az dt endpoint create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt endpoint create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Add egress endpoints to a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_endpoint_create_eventgrid
+  name: az dt endpoint create eventgrid
+  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
+  description: ''
+  syntax: >-
+    az dt endpoint create eventgrid --dt-name
+                                    --egg
+                                    --egt
+                                    --en
+                                    [--auth-type {IdentityBased, KeyBased}]
+                                    [--deadletter-sas-uri]
+                                    [--deadletter-uri]
+                                    [--egs]
+                                    [--resource-group]
+  examples:
+  - summary: Adds an EventGrid Topic endpoint to a target instance.
+    syntax: az dt endpoint create eventgrid --endpoint-name {endpoint_name} --eventgrid-resource-group {eventgrid_resource_group} --eventgrid-topic {eventgrid_topic_name} -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --egg --eventgrid-resource-group
+    summary: Name of EventGrid Topic resource group.
+    description: ''
+  - isRequired: true
+    name: --egt --eventgrid-topic
+    summary: Name of EventGrid Topic to integrate with.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: KeyBased
+    parameterValueGroup: IdentityBased, KeyBased
+    summary: Endpoint authentication type.
+    description: ''
+  - name: --deadletter-sas-uri --dsu
+    summary: Dead-letter storage container URL with SAS token for Key based authentication.
+    description: ''
+  - name: --deadletter-uri --du
+    summary: Dead-letter storage container URL for Identity based authentication.
+    description: ''
+  - name: --egs --eventgrid-subscription
+    summary: Name or ID of subscription where the endpoint resource exists. If no subscription is provided the default subscription is used.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_endpoint_create_eventhub
+  name: az dt endpoint create eventhub
+  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource. The instance must be created with a managed identity to support identity based endpoint integration.
+  description: ''
+  syntax: >-
+    az dt endpoint create eventhub --dt-name
+                                   --eh
+                                   --ehg
+                                   --ehn
+                                   --en
+                                   [--auth-type {IdentityBased, KeyBased}]
+                                   [--deadletter-sas-uri]
+                                   [--deadletter-uri]
+                                   [--ehp]
+                                   [--ehs]
+                                   [--resource-group]
+  examples:
+  - summary: Adds an EventHub endpoint to a target instance using Key based auth.
+    syntax: az dt endpoint create eventhub --endpoint-name {endpoint_name} --eventhub-resource-group {eventhub_resource_group} --eventhub-namespace {eventhub_namespace} --eventhub {eventhub_name} --eventhub-policy {eventhub_policy} -n {instance_name}
+  - summary: Adds an EventHub endpoint to a target instance using Identity based auth.
+    syntax: az dt endpoint create eventhub --endpoint-name {endpoint_name} --eventhub-resource-group {eventhub_resource_group} --eventhub-namespace {eventhub_namespace} --eventhub {eventhub_name} --auth-type IdentityBased -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --eh --eventhub
+    summary: Name of EventHub to integrate with.
+    description: ''
+  - isRequired: true
+    name: --ehg --eventhub-resource-group
+    summary: Name of EventHub resource group.
+    description: ''
+  - isRequired: true
+    name: --ehn --eventhub-namespace
+    summary: EventHub Namespace identifier.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: KeyBased
+    parameterValueGroup: IdentityBased, KeyBased
+    summary: Endpoint authentication type.
+    description: ''
+  - name: --deadletter-sas-uri --dsu
+    summary: Dead-letter storage container URL with SAS token for Key based authentication.
+    description: ''
+  - name: --deadletter-uri --du
+    summary: Dead-letter storage container URL for Identity based authentication.
+    description: ''
+  - name: --ehp --eventhub-policy
+    summary: EventHub policy to use for endpoint configuration. Required when --auth-type is KeyBased.
+    description: ''
+  - name: --ehs --eventhub-subscription
+    summary: Name or ID of subscription where the endpoint resource exists. If no subscription is provided the default subscription is used.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_endpoint_create_servicebus
+  name: az dt endpoint create servicebus
+  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource. The instance must be created with a managed identity to support identity based endpoint integration.
+  description: ''
+  syntax: >-
+    az dt endpoint create servicebus --dt-name
+                                     --en
+                                     --sbg
+                                     --sbn
+                                     --sbt
+                                     [--auth-type {IdentityBased, KeyBased}]
+                                     [--deadletter-sas-uri]
+                                     [--deadletter-uri]
+                                     [--resource-group]
+                                     [--sbp]
+                                     [--sbs]
+  examples:
+  - summary: Adds a ServiceBus Topic endpoint to a target instance using Key based auth.
+    syntax: az dt endpoint create servicebus --endpoint-name {endpoint_name} --servicebus-resource-group {servicebus_resource_group} --servicebus-namespace {servicebus_namespace} --servicebus-topic {servicebus_topic_name} --servicebus-policy {servicebus_policy} -n {instance_name}
+  - summary: Adds a ServiceBus Topic endpoint to a target instance using Identity based auth.
+    syntax: az dt endpoint create servicebus --endpoint-name {endpoint_name} --servicebus-resource-group {servicebus_resource_group} --servicebus-namespace {servicebus_namespace} --servicebus-topic {servicebus_topic_name} -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  - isRequired: true
+    name: --sbg --servicebus-resource-group
+    summary: Name of ServiceBus resource group.
+    description: ''
+  - isRequired: true
+    name: --sbn --servicebus-namespace
+    summary: ServiceBus Namespace identifier.
+    description: ''
+  - isRequired: true
+    name: --sbt --servicebus-topic
+    summary: Name of ServiceBus Topic to integrate with.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: KeyBased
+    parameterValueGroup: IdentityBased, KeyBased
+    summary: Endpoint authentication type.
+    description: ''
+  - name: --deadletter-sas-uri --dsu
+    summary: Dead-letter storage container URL with SAS token for Key based authentication.
+    description: ''
+  - name: --deadletter-uri --du
+    summary: Dead-letter storage container URL for Identity based authentication.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sbp --servicebus-policy
+    summary: ServiceBus Topic policy to use for endpoint configuration. Required when --auth-type is KeyBased.
+    description: ''
+  - name: --sbs --servicebus-subscription
+    summary: Name or ID of subscription where the endpoint resource exists. If no subscription is provided the default subscription is used.
+    description: ''
+commands:
+- az_dt_endpoint_create_eventgrid
+- az_dt_endpoint_create_eventhub
+- az_dt_endpoint_create_servicebus
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Add egress endpoints to a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/model.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/model.yml
new file mode 100644
index 0000000000..54ff392059
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/model.yml
@@ -0,0 +1,202 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_model
+name: az dt model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage DTDL models and definitions on a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_model_create
+  name: az dt model create
+  summary: Uploads one or more models. When any error occurs, no models are uploaded.
+  description: --models can be inline json or file path.
+  syntax: >-
+    az dt model create --dt-name
+                       [--fd]
+                       [--models]
+                       [--resource-group]
+  examples:
+  - summary: Bulk upload all .json or .dtdl model files from a target directory. Model processing is recursive.
+    syntax: az dt model create -n {instance_or_hostname} --from-directory {directory_path}
+  - summary: Upload model json inline or from file path.
+    syntax: az dt model create -n {instance_or_hostname} --models {file_path_or_inline_json}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --fd --from-directory
+    summary: The directory JSON model files will be parsed from.
+    description: ''
+  - name: --models
+    summary: Inline model JSON or file path to model JSON.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_delete
+  name: az dt model delete
+  summary: Delete a model. A model can only be deleted if no other models reference it.
+  description: ''
+  syntax: >-
+    az dt model delete --dt-name
+                       --dtmi
+                       [--resource-group]
+  examples:
+  - summary: Delete a target model.
+    syntax: az dt model delete -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_delete-all
+  name: az dt model delete-all
+  summary: Delete all models within a Digital Twins instance. Twins configurations are not affected but may be broken without model definitions.
+  description: ''
+  syntax: >-
+    az dt model delete-all --dt-name
+                           [--resource-group]
+                           [--yes]
+  examples:
+  - summary: Delete all models.
+    syntax: az dt model delete-all -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_model_list
+  name: az dt model list
+  summary: List model metadata, definitions and dependencies.
+  description: ''
+  syntax: >-
+    az dt model list --dt-name
+                     [--def {false, true}]
+                     [--dependencies-for]
+                     [--resource-group]
+  examples:
+  - summary: List model metadata
+    syntax: az dt model list -n {instance_or_hostname}
+  - summary: List model definitions
+    syntax: az dt model list -n {instance_or_hostname} --definition
+  - summary: List dependencies of particular pre-existing model(s). Space seperate dtmi values.
+    syntax: az dt model list -n {instance_or_hostname} --dependencies-for {model_id0} {model_id1}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --def --definition
+    parameterValueGroup: false, true
+    summary: The operation will retrieve the model definition.
+    description: ''
+  - name: --dependencies-for
+    summary: The set of models which will have their dependencies retrieved. If omitted, all models are retrieved. Format is a whitespace separated list.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_show
+  name: az dt model show
+  summary: Retrieve a target model or model definition.
+  description: ''
+  syntax: >-
+    az dt model show --dt-name
+                     --dtmi
+                     [--def {false, true}]
+                     [--resource-group]
+  examples:
+  - summary: Show model meta data
+    syntax: az dt model show -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1"
+  - summary: Show model meta data and definition
+    syntax: az dt model show -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1" --definition
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  optionalParameters:
+  - name: --def --definition
+    parameterValueGroup: false, true
+    summary: The operation will retrieve the model definition.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_model_update
+  name: az dt model update
+  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
+  description: ''
+  syntax: >-
+    az dt model update --dt-name
+                       --dtmi
+                       [--decommission {false, true}]
+                       [--resource-group]
+  examples:
+  - summary: Decommision a target model
+    syntax: az dt model update -n {instance_or_hostname} --dtmi "dtmi:com:example:Floor;1" --decommission
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  optionalParameters:
+  - name: --decommission
+    parameterValueGroup: false, true
+    summary: Indicates intent to decommission a target model.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_model_create
+- az_dt_model_delete
+- az_dt_model_delete-all
+- az_dt_model_list
+- az_dt_model_show
+- az_dt_model_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage DTDL models and definitions on a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/network.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/network.yml
new file mode 100644
index 0000000000..865441d5a1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/network.yml
@@ -0,0 +1,36 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network
+name: az dt network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins network configuration including private links and endpoint connections.
+description: ''
+commands:
+- az_dt_network_private-endpoint
+- az_dt_network_private-endpoint_connection
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+- az_dt_network_private-link
+- az_dt_network_private-link_list
+- az_dt_network_private-link_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Digital Twins network configuration including private links and endpoint connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-endpoint.yml
new file mode 100644
index 0000000000..0789b85b58
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-endpoint.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network_private-endpoint
+name: az dt network private-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network private-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins instance private-endpoints.
+description: Use 'az network private-endpoint create' to create a private-endpoint and link to a Digital Twins resource.
+commands:
+- az_dt_network_private-endpoint_connection
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Use 'az network private-endpoint create' to create a private-endpoint and link to a Digital Twins resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-endpoint/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-endpoint/connection.yml
new file mode 100644
index 0000000000..318910d827
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-endpoint/connection.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network_private-endpoint_connection
+name: az dt network private-endpoint connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network private-endpoint connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins instance private-endpoint connections.
+description: ''
+directCommands:
+- uid: az_dt_network_private-endpoint_connection_delete
+  name: az dt network private-endpoint connection delete
+  summary: Delete a private-endpoint connection associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection delete --cn
+                                                     --dt-name
+                                                     [--no-wait]
+                                                     [--resource-group]
+                                                     [--yes]
+  examples:
+  - summary: Delete the private-endpoint connection named ba8408b6-1372-41b2-aef8-af43afc4729f with confirmation. Block until finished.
+    syntax: az dt network private-endpoint connection delete -n {instance_name} --cn ba8408b6-1372-41b2-aef8-af43afc4729f
+  - summary: Delete the private-endpoint connection named ba8408b6-1372-41b2-aef8-af43afc4729f no confirmation. Return immediately.
+    syntax: az dt network private-endpoint connection delete -n {instance_name} --cn ba8408b6-1372-41b2-aef8-af43afc4729f -y --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --cn --conn-name
+    summary: Private endpoint connection name.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_network_private-endpoint_connection_list
+  name: az dt network private-endpoint connection list
+  summary: List private-endpoint connections associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection list --dt-name
+                                                   [--resource-group]
+  examples:
+  - summary: List all private-endpoint connections associated with the instance.
+    syntax: az dt network private-endpoint connection list -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_network_private-endpoint_connection_set
+  name: az dt network private-endpoint connection set
+  summary: Set the state of a private-endpoint connection associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection set --cn
+                                                  --dt-name
+                                                  --status {Approved, Disconnected, Pending, Rejected}
+                                                  [--actions-required]
+                                                  [--desc]
+                                                  [--group-ids]
+                                                  [--resource-group]
+  examples:
+  - summary: Approve a pending private-endpoint connection associated with the instance and add a description.
+    syntax: az dt network private-endpoint connection set -n {instance_name} --cn {connection_name} --status Approved --desc "A description."
+  - summary: Reject a private-endpoint connection associated with the instance and add a description.
+    syntax: az dt network private-endpoint connection set -n {instance_name} --cn {connection_name} --status Rejected --desc "Does not comply."
+  requiredParameters:
+  - isRequired: true
+    name: --cn --conn-name
+    summary: Private endpoint connection name.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --status
+    parameterValueGroup: Approved, Disconnected, Pending, Rejected
+    summary: The status of a private endpoint connection.
+    description: ''
+  optionalParameters:
+  - name: --actions-required --ar
+    summary: A message indicating if changes on the service provider require any updates on the consumer.
+    description: ''
+  - name: --desc --description
+    summary: Description for the private endpoint connection.
+    description: ''
+  - name: --group-ids
+    summary: Space seperated list of group ids that the private endpoint should connect to.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_network_private-endpoint_connection_show
+  name: az dt network private-endpoint connection show
+  summary: Show a private-endpoint connection associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-endpoint connection show --cn
+                                                   --dt-name
+                                                   [--resource-group]
+  examples:
+  - summary: Show details of the private-endpoint connection named ba8408b6-1372-41b2-aef8-af43afc4729f.
+    syntax: az dt network private-endpoint connection show -n {instance_name} --cn ba8408b6-1372-41b2-aef8-af43afc4729f
+  requiredParameters:
+  - isRequired: true
+    name: --cn --conn-name
+    summary: Private endpoint connection name.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_network_private-endpoint_connection_delete
+- az_dt_network_private-endpoint_connection_list
+- az_dt_network_private-endpoint_connection_set
+- az_dt_network_private-endpoint_connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Digital Twins instance private-endpoint connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-link.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-link.yml
new file mode 100644
index 0000000000..5caf067764
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/network/private-link.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_network_private-link
+name: az dt network private-link
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt network private-link** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Digital Twins instance private-link operations.
+description: ''
+directCommands:
+- uid: az_dt_network_private-link_list
+  name: az dt network private-link list
+  summary: List private-links associated with the Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt network private-link list --dt-name
+                                    [--resource-group]
+  examples:
+  - summary: List all private-links associated with the instance.
+    syntax: az dt network private-link list -n {instance_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_network_private-link_show
+  name: az dt network private-link show
+  summary: Show a private-link associated with the instance.
+  description: ''
+  syntax: >-
+    az dt network private-link show --dt-name
+                                    --link-name
+                                    [--resource-group]
+  examples:
+  - summary: Show the private-link named "API" associated with the instance.
+    syntax: az dt network private-link show -n {instance_name} --link-name API
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --link-name --ln
+    summary: Private link name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_network_private-link_list
+- az_dt_network_private-link_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Digital Twins instance private-link operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/role-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/role-assignment.yml
new file mode 100644
index 0000000000..e977f2573f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/role-assignment.yml
@@ -0,0 +1,139 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_role-assignment
+name: az dt role-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt role-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage RBAC role assignments for a Digital Twins instance.
+description: >-
+  Note that in order to perform role assignments, the logged in principal needs permissions
+
+  such as Owner or User Access Administrator at the assigned scope.
+
+
+  This command group is provided for convenience. For more complex role assignment scenarios
+
+  use the 'az role assignment' command group.
+directCommands:
+- uid: az_dt_role-assignment_create
+  name: az dt role-assignment create
+  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
+  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
+  syntax: >-
+    az dt role-assignment create --assignee
+                                 --dt-name
+                                 --role
+                                 [--resource-group]
+  examples:
+  - summary: Assign a user (by email) the built-in Digital Twins Owner role against a target instance.
+    syntax: az dt role-assignment create -n {instance_name} --assignee "owneruser@microsoft.com" --role "Azure Digital Twins Data Owner"
+  - summary: Assign a user (by object Id) the built-in Digital Twins Reader role against a target instance.
+    syntax: az dt role-assignment create -n {instance_name} --assignee "97a89267-0966-4054-a156-b7d86ef8e216" --role "Azure Digital Twins Data Reader"
+  - summary: Assign a service principal a custom role against a target instance.
+    syntax: az dt role-assignment create -n {instance_name} --assignee {service_principal_name_or_id} --role {role_name_or_id}
+  requiredParameters:
+  - isRequired: true
+    name: --assignee
+    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  - isRequired: true
+    name: --role
+    summary: Role name or Id.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_role-assignment_delete
+  name: az dt role-assignment delete
+  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
+  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
+  syntax: >-
+    az dt role-assignment delete --dt-name
+                                 [--assignee]
+                                 [--resource-group]
+                                 [--role]
+  examples:
+  - summary: Remove a user from a specific role assignment of a Digital Twins instance.
+    syntax: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com" --role "Azure Digital Twins Data Reader"
+  - summary: Remove a user from all assigned roles of a Digital Twins instance.
+    syntax: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    summary: Role name or Id.
+    description: ''
+- uid: az_dt_role-assignment_list
+  name: az dt role-assignment list
+  summary: List the existing role assignments of a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt role-assignment list --dt-name
+                               [--include-inherited {false, true}]
+                               [--resource-group]
+                               [--role]
+  examples:
+  - summary: List the role assignments on a target instance.
+    syntax: az dt role-assignment list -n {instance_name}
+  - summary: List the role assignments on a target instance and filter by role.
+    syntax: az dt role-assignment list -n {instance_name} --role {role_name_or_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name.
+    description: ''
+  optionalParameters:
+  - name: --include-inherited
+    parameterValueGroup: false, true
+    summary: Include assignments applied on parent scopes.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    summary: Role name or Id.
+    description: ''
+commands:
+- az_dt_role-assignment_create
+- az_dt_role-assignment_delete
+- az_dt_role-assignment_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Note that in order to perform role assignments, the logged in principal needs permissions
+
+    such as Owner or User Access Administrator at the assigned scope.
+
+
+    This command group is provided for convenience. For more complex role assignment scenarios
+
+    use the 'az role assignment' command group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/route.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/route.yml
new file mode 100644
index 0000000000..5b9c8efa63
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/route.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_route
+name: az dt route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure event routes.
+description: Note that an endpoint must first be configred before adding an event route.
+directCommands:
+- uid: az_dt_route_create
+  name: az dt route create
+  summary: Add an event route to a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route create --dt-name
+                       --en
+                       --rn
+                       [--filter]
+                       [--resource-group]
+  examples:
+  - summary: Adds an event route for an existing endpoint on target instance with default filter of "true".
+    syntax: az dt route create -n {instance_or_hostname} --endpoint-name {endpoint_name} --route-name {route_name}
+  - summary: Adds an event route for an existing endpoint on target instance with custom filter.
+    syntax: az dt route create -n {instance_or_hostname} --endpoint-name {endpoint_name} --route-name {route_name} --filter "type = 'Microsoft.DigitalTwins.Twin.Create'"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --en --endpoint-name
+    summary: Endpoint name.
+    description: ''
+  - isRequired: true
+    name: --rn --route-name
+    summary: Event route name.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    defaultValue: "true"
+    summary: Event route filter.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_route_delete
+  name: az dt route delete
+  summary: Remove an event route from a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route delete --dt-name
+                       --rn
+                       [--resource-group]
+  examples:
+  - summary: Remove an event route from a target instance.
+    syntax: az dt route delete -n {instance_or_hostname} --route-name {route_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --rn --route-name
+    summary: Event route name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_route_list
+  name: az dt route list
+  summary: List the configured event routes of a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route list --dt-name
+                     [--resource-group]
+  examples:
+  - summary: List configured event routes of a target instance.
+    syntax: az dt route list -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_route_show
+  name: az dt route show
+  summary: Show details of an event route configured on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt route show --dt-name
+                     --rn
+                     [--resource-group]
+  examples:
+  - summary: Show an event route on a target instance.
+    syntax: az dt route show -n {instance_or_hostname} --route-name {route_name}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --rn --route-name
+    summary: Event route name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_route_create
+- az_dt_route_delete
+- az_dt_route_list
+- az_dt_route_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Note that an endpoint must first be configred before adding an event route.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/twin.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/twin.yml
new file mode 100644
index 0000000000..bd6b52856b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/twin.yml
@@ -0,0 +1,257 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin
+name: az dt twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure the digital twins of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_create
+  name: az dt twin create
+  summary: Create a digital twin on an instance.
+  description: >-
+    --properties can be inline JSON or file path.
+
+    Note: --properties are required for twins that contain components.
+  syntax: >-
+    az dt twin create --dt-name
+                      --dtmi
+                      --twin-id
+                      [--if-none-match]
+                      [--properties]
+                      [--resource-group]
+  examples:
+  - summary: Create a digital twin from an existing (prior-created) model.
+    syntax: az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:Room;1" --twin-id {twin_id}
+  - summary: Create a digital twin from an existing (prior-created) model with if-none-match tag.
+    syntax: az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:Room;1" --twin-id {twin_id} --if-none-match
+  - summary: Create a digital twin from an existing (prior-created) model. Instantiate with property values.
+    syntax: "az dt twin create -n {instance_or_hostname} --dtmi \"dtmi:com:example:DeviceInformation;1\" --twin-id {twin_id} --properties '{\"manufacturer\": \"Microsoft\"}'"
+  - summary: Create a digital twin with component from existing (prior-created) models. Instantiate component with minimum properties.
+    syntax: >-
+      az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:TemperatureController;1" --twin-id {twin_id} --properties '{
+          "Thermostat": {
+              "$metadata": {},
+          }
+      }'
+  - summary: Create a digital twin with component from existing (prior-created) models. Instantiate with property values.
+    syntax: >-
+      az dt twin create -n {instance_or_hostname} --dtmi "dtmi:com:example:TemperatureController;1" --twin-id {twin_id} --properties '{
+          "Temperature": 10.2,
+          "Thermostat": {
+              "$metadata": {},
+              "setPointTemp": 23.12
+          }
+      }'
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --dtmi --model-id -m
+    summary: 'Digital Twins model Id. Example: dtmi:com:example:Room;2.'
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: Indicates the create operation should fail if an existing twin with the same id exists.
+    description: ''
+  - name: --properties -p
+    summary: Initial property values for instantiating a digital twin or related components. Provide file path or inline JSON. Properties are required for twins that contain components, at the minimum you must provide an empty $metadata object for each component.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_delete
+  name: az dt twin delete
+  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
+  description: ''
+  syntax: >-
+    az dt twin delete --dt-name
+                      --twin-id
+                      [--etag]
+                      [--resource-group]
+  examples:
+  - summary: Remove a digital twin by Id.
+    syntax: az dt twin delete -n {instance_or_hostname} --twin-id {twin_id}
+  - summary: Remove a digital twin by Id using the etag.
+    syntax: az dt twin delete -n {instance_or_hostname} --twin-id {twin_id} --etag {etag}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_delete-all
+  name: az dt twin delete-all
+  summary: Deletes all digital twins within a Digital Twins instance, including all relationships for those twins.
+  description: ''
+  syntax: >-
+    az dt twin delete-all --dt-name
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: Delete all digital twins. Any relationships referencing the twins will also be deleted.
+    syntax: az dt twin delete-all -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_twin_query
+  name: az dt twin query
+  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
+  description: ''
+  syntax: >-
+    az dt twin query --dt-name
+                     --query-command
+                     [--cost {false, true}]
+                     [--resource-group]
+  examples:
+  - summary: Query all digital twins in target instance and project all attributes. Also show cost in query units.
+    syntax: az dt twin query -n {instance_or_hostname} -q "select * from digitaltwins" --show-cost
+  - summary: Query by model and project all attributes.
+    syntax: az dt twin query -n {instance_or_hostname} -q "select * from digitaltwins T where IS_OF_MODEL(T, 'dtmi:com:example:Room;2')"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --query-command -q
+    summary: User query to be executed.
+    description: ''
+  optionalParameters:
+  - name: --cost --show-cost
+    parameterValueGroup: false, true
+    summary: Calculates and shows the query charge.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_show
+  name: az dt twin show
+  summary: Show the details of a digital twin.
+  description: ''
+  syntax: >-
+    az dt twin show --dt-name
+                    --twin-id
+                    [--resource-group]
+  examples:
+  - summary: Show the details of a digital twin.
+    syntax: az dt twin show -n {instance_or_hostname} --twin-id {twin_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_update
+  name: az dt twin update
+  summary: Update an instance digital twin via JSON patch specification.
+  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
+  syntax: >-
+    az dt twin update --dt-name
+                      --json-patch
+                      --twin-id
+                      [--etag]
+                      [--resource-group]
+  examples:
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: "az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin via JSON patch specification and using etag.
+    syntax: "az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --etag {etag} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: >-
+      az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --json-patch '[
+        {"op":"replace", "path":"/Temperature", "value": 20.5},
+        {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
+      ]'
+  - summary: Update a digital twin via JSON patch specification defined in a file.
+    syntax: az dt twin update -n {instance_or_hostname} --twin-id {twin_id} --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_twin_component
+- az_dt_twin_component_show
+- az_dt_twin_component_update
+- az_dt_twin_create
+- az_dt_twin_delete
+- az_dt_twin_delete-all
+- az_dt_twin_query
+- az_dt_twin_relationship
+- az_dt_twin_relationship_create
+- az_dt_twin_relationship_delete
+- az_dt_twin_relationship_delete-all
+- az_dt_twin_relationship_list
+- az_dt_twin_relationship_show
+- az_dt_twin_relationship_update
+- az_dt_twin_show
+- az_dt_twin_telemetry
+- az_dt_twin_telemetry_send
+- az_dt_twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure the digital twins of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/twin/component.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/twin/component.yml
new file mode 100644
index 0000000000..1d3fc25def
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/twin/component.yml
@@ -0,0 +1,105 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin_component
+name: az dt twin component
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin component** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Show and update the digital twin components of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_component_show
+  name: az dt twin component show
+  summary: Show details of a digital twin component.
+  description: ''
+  syntax: >-
+    az dt twin component show --component
+                              --dt-name
+                              --twin-id
+                              [--resource-group]
+  examples:
+  - summary: Show details of a digital twin component
+    syntax: az dt twin component show -n {instance_or_hostname} --twin-id {twin_id} --component Thermostat
+  requiredParameters:
+  - isRequired: true
+    name: --component
+    summary: The path to the DTDL component.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_component_update
+  name: az dt twin component update
+  summary: Update a digital twin component via JSON patch specification.
+  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
+  syntax: >-
+    az dt twin component update --component
+                                --dt-name
+                                --json-patch
+                                --twin-id
+                                [--etag]
+                                [--resource-group]
+  examples:
+  - summary: Update a digital twin component via JSON patch specification.
+    syntax: "az dt twin component update -n {instance_or_hostname} --twin-id {twin_id} --component {component_path} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin component via JSON patch specification.
+    syntax: >-
+      az dt twin component update -n {instance_or_hostname} --twin-id {twin_id} --component {component_path} --json-patch '[
+        {"op":"replace", "path":"/Temperature", "value": 20.5},
+        {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
+      ]'
+  - summary: Update a digital twin component via JSON patch specification defined in a file.
+    syntax: az dt twin component update -n {instance_or_hostname} --twin-id {twin_id} --component {component_path} --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --component
+    summary: The path to the DTDL component.
+    description: ''
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_twin_component_show
+- az_dt_twin_component_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Show and update the digital twin components of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/twin/relationship.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/twin/relationship.yml
new file mode 100644
index 0000000000..b927df600c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/twin/relationship.yml
@@ -0,0 +1,265 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin_relationship
+name: az dt twin relationship
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin relationship** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure the digital twin relationships of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_relationship_create
+  name: az dt twin relationship create
+  summary: Create a relationship between source and target digital twins.
+  description: --properties can be inline JSON or file path.
+  syntax: >-
+    az dt twin relationship create --dt-name
+                                   --kind
+                                   --relationship-id
+                                   --source
+                                   --target
+                                   [--if-none-match]
+                                   [--properties]
+                                   [--resource-group]
+  examples:
+  - summary: Create a relationship between two digital twins.
+    syntax: az dt twin relationship create -n {instance_or_hostname} --relationship-id {relationship_id} --relationship contains --twin-id {source_twin_id} --target {target_twin_id}
+  - summary: Create a relationship between two digital twins with if-none-match tag
+    syntax: az dt twin relationship create -n {instance_or_hostname} --relationship-id {relationship_id} --relationship contains --twin-id {source_twin_id} --target {target_twin_id} --if-none-match
+  - summary: Create a relationship with initialized properties between two digital twins.
+    syntax: "az dt twin relationship create -n {instance_or_hostname} --relationship-id {relationship_id} --relationship contains --twin-id {source_twin_id} --target {target_twin_id} --properties '{\"ownershipUser\": \"me\", \"ownershipDepartment\": \"Computer Science\"}'"
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --kind --relationship
+    summary: "Relationship name or kind. For example: 'contains'."
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  - isRequired: true
+    name: --target --target-twin-id
+    summary: The target twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: Indicates the create operation should fail if an existing twin with the same id exists.
+    description: ''
+  - name: --properties -p
+    summary: Initial property values for instantiating a digital twin relationship. Provide file path or inline JSON.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_delete
+  name: az dt twin relationship delete
+  summary: Delete a digital twin relationship on a Digital Twins instance.
+  description: ''
+  syntax: >-
+    az dt twin relationship delete --dt-name
+                                   --relationship-id
+                                   --source
+                                   [--etag]
+                                   [--resource-group]
+  examples:
+  - summary: Delete a digital twin relationship.
+    syntax: az dt twin relationship delete -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id}
+  - summary: Delete a digital twin relationship using the etag.
+    syntax: az dt twin relationship delete -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --etag {etag}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_delete-all
+  name: az dt twin relationship delete-all
+  summary: Deletes all digital twin relationships within a Digital Twins instance, including incoming relationships.
+  description: ''
+  syntax: >-
+    az dt twin relationship delete-all --dt-name
+                                       [--resource-group]
+                                       [--source]
+                                       [--yes]
+  examples:
+  - summary: Delete all digital twin relationships associated with the twin.
+    syntax: az dt twin relationship delete-all -n {instance_or_hostname} --twin-id {twin_id}
+  - summary: Delete all digital twin relationships within the Digital Twins instace.
+    syntax: az dt twin relationship delete-all -n {instance_or_hostname}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dt_twin_relationship_list
+  name: az dt twin relationship list
+  summary: List the relationships of a digital twin.
+  description: ''
+  syntax: >-
+    az dt twin relationship list --dt-name
+                                 --source
+                                 [--incoming {false, true}]
+                                 [--kind]
+                                 [--resource-group]
+  examples:
+  - summary: List outgoing relationships of a digital twin.
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id}
+  - summary: List outgoing relationships of a digital twin and filter on relationship 'contains'
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id} --relationship contains
+  - summary: List incoming relationships of a digital twin.
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id} --incoming
+  - summary: List incoming relationships of a digital twin and filter on relationship 'contains'.
+    syntax: az dt twin relationship list -n {instance_or_hostname} --twin-id {twin_id} --relationship contains --incoming
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --incoming
+    parameterValueGroup: false, true
+    summary: Retrieves all incoming relationships for a digital twin.
+    description: ''
+  - name: --kind --relationship
+    summary: Filter result by the kind of relationship.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_show
+  name: az dt twin relationship show
+  summary: Show details of a digital twin relationship.
+  description: ''
+  syntax: >-
+    az dt twin relationship show --dt-name
+                                 --relationship-id
+                                 --source
+                                 [--resource-group]
+  examples:
+  - summary: Show details of a digital twin relationship.
+    syntax: az dt twin relationship show -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dt_twin_relationship_update
+  name: az dt twin relationship update
+  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
+  description: Operations are limited to add, replace and remove.
+  syntax: >-
+    az dt twin relationship update --dt-name
+                                   --json-patch
+                                   --relationship-id
+                                   --source
+                                   [--etag]
+                                   [--resource-group]
+  examples:
+  - summary: Update a digital twin relationship via JSON patch specification.
+    syntax: "az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
+  - summary: Update a digital twin relationship via JSON patch specification and using etag.
+    syntax: "az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}' --etag {etag}"
+  - summary: Update a digital twin relationship via JSON patch specification.
+    syntax: >-
+      az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '[
+        {"op":"replace", "path":"/Temperature", "value": 20.5},
+        {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
+      ]'
+  - summary: Update a digital twin relationship via JSON patch specification defined in a file.
+    syntax: az dt twin relationship update -n {instance_or_hostname} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  - isRequired: true
+    name: --relationship-id -r
+    summary: Relationship Id.
+    description: ''
+  - isRequired: true
+    name: --source --twin-id -t
+    summary: The source twin Id for a relationship.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Entity tag value. The command will succeed if the etag matches the current etag for the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_dt_twin_relationship_create
+- az_dt_twin_relationship_delete
+- az_dt_twin_relationship_delete-all
+- az_dt_twin_relationship_list
+- az_dt_twin_relationship_show
+- az_dt_twin_relationship_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure the digital twin relationships of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/dt/twin/telemetry.yml b/2018-03-01-hybrid/docs-ref-autogen/dt/twin/telemetry.yml
new file mode 100644
index 0000000000..2e24af0f26
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/dt/twin/telemetry.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_dt_twin_telemetry
+name: az dt twin telemetry
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az dt twin telemetry** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Test and validate the event routes and endpoints of a Digital Twins instance.
+description: ''
+directCommands:
+- uid: az_dt_twin_telemetry_send
+  name: az dt twin telemetry send
+  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
+  description: ''
+  syntax: >-
+    az dt twin telemetry send --dt-name
+                              --twin-id
+                              [--component]
+                              [--dt-id]
+                              [--resource-group]
+                              [--telemetry]
+  examples:
+  - summary: Send twin telemetry
+    syntax: az dt twin telemetry send -n {instance_or_hostname} --twin-id {twin_id}
+  requiredParameters:
+  - isRequired: true
+    name: --dt-name --dtn -n
+    summary: Digital Twins instance name or hostname. If an instance name is provided, the user subscription is first queried for the target instance to retrieve the hostname. If a hostname is provided, the subscription query is skipped and the provided value is used for subsequent interaction.
+    description: ''
+  - isRequired: true
+    name: --twin-id -t
+    summary: The digital twin Id.
+    description: ''
+  optionalParameters:
+  - name: --component
+    summary: The path to the DTDL component. If set, telemetry will be emitted on behalf of the component.
+    description: ''
+  - name: --dt-id
+    summary: A unique message identifier (in the scope of the digital twin id) that is commonly used for de-duplicating messages. If no value is provided a GUID is automatically generated.
+    description: ''
+  - name: --resource-group -g
+    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --telemetry
+    summary: 'Inline telemetry JSON or file path to telemetry JSON. Default payload is an empty object: {}.'
+    description: ''
+commands:
+- az_dt_twin_telemetry_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Test and validate the event routes and endpoints of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid.yml
new file mode 100644
index 0000000000..e60e089558
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid.yml
@@ -0,0 +1,123 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid
+name: az eventgrid
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
+description: ''
+commands:
+- az_eventgrid_domain
+- az_eventgrid_domain_create
+- az_eventgrid_domain_delete
+- az_eventgrid_domain_key
+- az_eventgrid_domain_key_list
+- az_eventgrid_domain_key_regenerate
+- az_eventgrid_domain_list
+- az_eventgrid_domain_private-endpoint-connection
+- az_eventgrid_domain_private-endpoint-connection_approve
+- az_eventgrid_domain_private-endpoint-connection_delete
+- az_eventgrid_domain_private-endpoint-connection_list
+- az_eventgrid_domain_private-endpoint-connection_reject
+- az_eventgrid_domain_private-endpoint-connection_show
+- az_eventgrid_domain_private-link-resource
+- az_eventgrid_domain_private-link-resource_list
+- az_eventgrid_domain_private-link-resource_show
+- az_eventgrid_domain_show
+- az_eventgrid_domain_topic
+- az_eventgrid_domain_topic_create
+- az_eventgrid_domain_topic_delete
+- az_eventgrid_domain_topic_list
+- az_eventgrid_domain_topic_show
+- az_eventgrid_domain_update
+- az_eventgrid_event-subscription
+- az_eventgrid_event-subscription_create
+- az_eventgrid_event-subscription_delete
+- az_eventgrid_event-subscription_list
+- az_eventgrid_event-subscription_show
+- az_eventgrid_event-subscription_update
+- az_eventgrid_extension-topic
+- az_eventgrid_extension-topic_show
+- az_eventgrid_partner
+- az_eventgrid_partner_namespace
+- az_eventgrid_partner_namespace_create
+- az_eventgrid_partner_namespace_delete
+- az_eventgrid_partner_namespace_event-channel
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+- az_eventgrid_partner_namespace_key
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+- az_eventgrid_partner_namespace_list
+- az_eventgrid_partner_namespace_show
+- az_eventgrid_partner_registration
+- az_eventgrid_partner_registration_create
+- az_eventgrid_partner_registration_delete
+- az_eventgrid_partner_registration_list
+- az_eventgrid_partner_registration_show
+- az_eventgrid_partner_topic
+- az_eventgrid_partner_topic_activate
+- az_eventgrid_partner_topic_deactivate
+- az_eventgrid_partner_topic_delete
+- az_eventgrid_partner_topic_event-subscription
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+- az_eventgrid_partner_topic_list
+- az_eventgrid_partner_topic_show
+- az_eventgrid_system-topic
+- az_eventgrid_system-topic_create
+- az_eventgrid_system-topic_delete
+- az_eventgrid_system-topic_event-subscription
+- az_eventgrid_system-topic_event-subscription_create
+- az_eventgrid_system-topic_event-subscription_delete
+- az_eventgrid_system-topic_event-subscription_list
+- az_eventgrid_system-topic_event-subscription_show
+- az_eventgrid_system-topic_event-subscription_update
+- az_eventgrid_system-topic_list
+- az_eventgrid_system-topic_show
+- az_eventgrid_system-topic_update
+- az_eventgrid_topic
+- az_eventgrid_topic_create
+- az_eventgrid_topic_delete
+- az_eventgrid_topic_key
+- az_eventgrid_topic_key_list
+- az_eventgrid_topic_key_regenerate
+- az_eventgrid_topic_list
+- az_eventgrid_topic_private-endpoint-connection
+- az_eventgrid_topic_private-endpoint-connection_approve
+- az_eventgrid_topic_private-endpoint-connection_delete
+- az_eventgrid_topic_private-endpoint-connection_list
+- az_eventgrid_topic_private-endpoint-connection_reject
+- az_eventgrid_topic_private-endpoint-connection_show
+- az_eventgrid_topic_private-link-resource
+- az_eventgrid_topic_private-link-resource_list
+- az_eventgrid_topic_private-link-resource_show
+- az_eventgrid_topic_show
+- az_eventgrid_topic_update
+- az_eventgrid_topic-type
+- az_eventgrid_topic-type_list
+- az_eventgrid_topic-type_list-event-types
+- az_eventgrid_topic-type_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain.yml
new file mode 100644
index 0000000000..7d3fd225f7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain.yml
@@ -0,0 +1,225 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain
+name: az eventgrid domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event domains.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_create
+  name: az eventgrid domain create
+  summary: Create a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain create --location
+                               --name
+                               --resource-group
+                               [--identity {noidentity, systemassigned}]
+                               [--inbound-ip-rules]
+                               [--input-mapping-default-values]
+                               [--input-mapping-fields]
+                               [--input-schema {cloudeventschemav1_0, customeventschema, eventgridschema}]
+                               [--public-network-access {disabled, enabled}]
+                               [--sku {basic, premium}]
+                               [--tags]
+  examples:
+  - summary: Create a new domain.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2
+  - summary: Create a new domain with custom input mappings.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=mytopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
+  - summary: Create a new domain that accepts events published in CloudEvents V1.0 schema and maps a property mytopicfield to the topic name.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema cloudeventschemav1_0 --input-mapping-fields topic=mytopicfield
+  - summary: Create a new domain which allows specific inbound ip rules.
+    syntax: az eventgrid domain create -g rg1 --name domain1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku basic
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --input-mapping-default-values
+    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
+    description: ''
+  - name: --input-mapping-fields
+    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
+    description: ''
+  - name: --input-schema
+    defaultValue: eventgridschema
+    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
+    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
+    description: ''
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_domain_delete
+  name: az eventgrid domain delete
+  summary: Delete a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain delete --name
+                               --resource-group
+  examples:
+  - summary: Delete a domain.
+    syntax: az eventgrid domain delete -g rg1 --name domain1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_list
+  name: az eventgrid domain list
+  summary: List available domains.
+  description: ''
+  syntax: >-
+    az eventgrid domain list [--odata-query]
+                             [--resource-group]
+  examples:
+  - summary: List all domains in the current Azure subscription.
+    syntax: az eventgrid domain list
+  - summary: List all domains in a resource group.
+    syntax: az eventgrid domain list -g rg1
+  - summary: List all domains in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid domain list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all domains in a resource group except the domain with name "name1"
+    syntax: az eventgrid domain list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_show
+  name: az eventgrid domain show
+  summary: Get the details of a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain show --name
+                             --resource-group
+  examples:
+  - summary: Show the details of a domain.
+    syntax: az eventgrid domain show -g rg1 -n domain1
+  - summary: Show the details of a domain based on resource ID.
+    syntax: az eventgrid domain show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_update
+  name: az eventgrid domain update
+  summary: Update a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain update --name
+                               --resource-group
+                               [--identity {noidentity, systemassigned}]
+                               [--inbound-ip-rules]
+                               [--public-network-access {disabled, enabled}]
+                               [--sku {basic, premium}]
+                               [--tags]
+  examples:
+  - summary: Update the properties of an existing domain.
+    syntax: az eventgrid domain update -g rg1 --name domain1 --sku Basic --identity noidentity --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_eventgrid_domain_create
+- az_eventgrid_domain_delete
+- az_eventgrid_domain_key
+- az_eventgrid_domain_key_list
+- az_eventgrid_domain_key_regenerate
+- az_eventgrid_domain_list
+- az_eventgrid_domain_private-endpoint-connection
+- az_eventgrid_domain_private-endpoint-connection_approve
+- az_eventgrid_domain_private-endpoint-connection_delete
+- az_eventgrid_domain_private-endpoint-connection_list
+- az_eventgrid_domain_private-endpoint-connection_reject
+- az_eventgrid_domain_private-endpoint-connection_show
+- az_eventgrid_domain_private-link-resource
+- az_eventgrid_domain_private-link-resource_list
+- az_eventgrid_domain_private-link-resource_show
+- az_eventgrid_domain_show
+- az_eventgrid_domain_topic
+- az_eventgrid_domain_topic_create
+- az_eventgrid_domain_topic_delete
+- az_eventgrid_domain_topic_list
+- az_eventgrid_domain_topic_show
+- az_eventgrid_domain_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event domains.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/key.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/key.yml
new file mode 100644
index 0000000000..ccc8f47946
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/key.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_key
+name: az eventgrid domain key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage shared access keys of a domain.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_key_list
+  name: az eventgrid domain key list
+  summary: List shared access keys of a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain key list --name
+                                 --resource-group
+  examples:
+  - summary: List shared access keys of a domain. (autogenerated)
+    syntax: az eventgrid domain key list --name MyDomain --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_key_regenerate
+  name: az eventgrid domain key regenerate
+  summary: Regenerate a shared access key of a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain key regenerate --key-name
+                                       --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: Key name to regenerate key1 or key2.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_key_list
+- az_eventgrid_domain_key_regenerate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage shared access keys of a domain.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/private-endpoint-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/private-endpoint-connection.yml
new file mode 100644
index 0000000000..533840fbbe
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/private-endpoint-connection.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_private-endpoint-connection
+name: az eventgrid domain private-endpoint-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain private-endpoint-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private endpoint connection resources of a domain.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_private-endpoint-connection_approve
+  name: az eventgrid domain private-endpoint-connection approve
+  summary: Approve a private endpoint connection request for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection approve --domain-name
+                                                            --name
+                                                            --resource-group
+                                                            [--description]
+  examples:
+  - summary: Approve a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection approve -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the approval.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_delete
+  name: az eventgrid domain private-endpoint-connection delete
+  summary: Delete a private endpoint connection for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection delete --domain-name
+                                                           --name
+                                                           --resource-group
+  examples:
+  - summary: Delete private endpoint connection for a specific domain.
+    syntax: az eventgrid domain private-endpoint-connection delete -g rg1 --domain-name domain1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_list
+  name: az eventgrid domain private-endpoint-connection list
+  summary: List the properties of all the private endpoint connections for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection list --name
+                                                         --resource-group
+  examples:
+  - summary: List a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection list -g rg1 -n domain1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_reject
+  name: az eventgrid domain private-endpoint-connection reject
+  summary: Reject a private endpoint connection request for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection reject --domain-name
+                                                           --name
+                                                           --resource-group
+                                                           [--description]
+  examples:
+  - summary: Reject a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection reject -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the rejection.
+    description: ''
+- uid: az_eventgrid_domain_private-endpoint-connection_show
+  name: az eventgrid domain private-endpoint-connection show
+  summary: Display the properties of a private endpoint connection for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-endpoint-connection show --domain-name
+                                                         --name
+                                                         --resource-group
+  examples:
+  - summary: Show a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-endpoint-connection show -g rg1 --domain-name domain1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_private-endpoint-connection_approve
+- az_eventgrid_domain_private-endpoint-connection_delete
+- az_eventgrid_domain_private-endpoint-connection_list
+- az_eventgrid_domain_private-endpoint-connection_reject
+- az_eventgrid_domain_private-endpoint-connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private endpoint connection resources of a domain.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/private-link-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/private-link-resource.yml
new file mode 100644
index 0000000000..26f604db64
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/private-link-resource.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_private-link-resource
+name: az eventgrid domain private-link-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain private-link-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private link resource of a domain.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_private-link-resource_list
+  name: az eventgrid domain private-link-resource list
+  summary: List the properties of all the private link resources for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-link-resource list --domain-name
+                                                   --resource-group
+  examples:
+  - summary: Show a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-link-resource list -g rg1 --domain-name domain1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_private-link-resource_show
+  name: az eventgrid domain private-link-resource show
+  summary: Display the properties of a private link resource for a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain private-link-resource show --domain-name
+                                                   --name
+                                                   --resource-group
+  examples:
+  - summary: Show a private endpoint connection for a domain.
+    syntax: az eventgrid domain private-link-resource show -g rg1 --domain-name domain1 -n domain
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private link resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_private-link-resource_list
+- az_eventgrid_domain_private-link-resource_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private link resource of a domain.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/topic.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/topic.yml
new file mode 100644
index 0000000000..39cbb85254
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/domain/topic.yml
@@ -0,0 +1,132 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_domain_topic
+name: az eventgrid domain topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid domain topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event domain topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_domain_topic_create
+  name: az eventgrid domain topic create
+  summary: Create a domain topic under a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic create --domain-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: Create a new domain topic under domain.
+    syntax: az eventgrid domain topic create -g rg1 --domain-name domain1 --name domaintopic1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_topic_delete
+  name: az eventgrid domain topic delete
+  summary: Delete a domain topic under a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic delete --domain-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: Delete a domain topic.
+    syntax: az eventgrid domain topic delete -g rg1 --domain-name domain1 --name domaintopic1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_domain_topic_list
+  name: az eventgrid domain topic list
+  summary: List available topics in a domain.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic list --domain-name
+                                   --resource-group
+                                   [--odata-query]
+  examples:
+  - summary: List all topics in a domain.
+    syntax: az eventgrid domain topic list -g rg1 --domain-name domain1
+  - summary: List all domain topics in a domain whose name contains the pattern "XYZ"
+    syntax: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all domain topics in a domain except the domain topic with name "name1"
+    syntax: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "NOT (name eq 'name1')"
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_domain_topic_show
+  name: az eventgrid domain topic show
+  summary: Get the details of a domain topic.
+  description: ''
+  syntax: >-
+    az eventgrid domain topic show --domain-name
+                                   --name
+                                   --resource-group
+  examples:
+  - summary: Show the details of a domain topic.
+    syntax: az eventgrid domain topic show -g rg1 --domain-name domain1 --name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --domain-name
+    summary: Name of the domain.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the domain topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_domain_topic_create
+- az_eventgrid_domain_topic_delete
+- az_eventgrid_domain_topic_list
+- az_eventgrid_domain_topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event domain topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/event-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/event-subscription.yml
new file mode 100644
index 0000000000..6f22ed35c1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/event-subscription.yml
@@ -0,0 +1,638 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_event-subscription
+name: az eventgrid event-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid event-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event subscriptions.
+description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
+directCommands:
+- uid: az_eventgrid_event-subscription_create
+  name: az eventgrid event-subscription create
+  summary: Create a new event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription create --name
+                                           [--advanced-filter]
+                                           [--azure-active-directory-application-id-or-uri]
+                                           [--azure-active-directory-tenant-id]
+                                           [--deadletter-endpoint]
+                                           [--deadletter-identity {systemassigned}]
+                                           [--deadletter-identity-endpoint]
+                                           [--delivery-identity {systemassigned}]
+                                           [--delivery-identity-endpoint]
+                                           [--delivery-identity-endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--endpoint]
+                                           [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--event-delivery-schema {cloudeventschemav1_0, custominputschema, eventgridschema}]
+                                           [--event-ttl]
+                                           [--expiration-date]
+                                           [--included-event-types]
+                                           [--labels]
+                                           [--max-delivery-attempts]
+                                           [--max-events-per-batch]
+                                           [--preferred-batch-size-in-kilobytes]
+                                           [--source-resource-id]
+                                           [--subject-begins-with]
+                                           [--subject-case-sensitive {false, true}]
+                                           [--subject-ends-with]
+  examples:
+  - summary: Create a new event subscription for an Event Grid topic, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for an Azure subscription subscription, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for a resource group, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for a storage account, using default filters.
+    syntax: >-
+      az eventgrid event-subscription create --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1"  \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for a storage account, using advanced filters.
+    syntax: >-
+      az eventgrid event-subscription create  --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  - summary: Create a new event subscription for an Azure subscription, with a filter specifying a subject prefix.
+    syntax: >-
+      az eventgrid event-subscription create --name es4 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-begins-with mysubject_prefix
+  - summary: Create a new event subscription for a resource group, with a filter specifying a subject suffix.
+    syntax: >-
+      az eventgrid event-subscription create --name es5 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-ends-with mysubject_suffix
+  - summary: Create a new event subscription for an Azure subscription, using default filters, and an EventHub as a destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint-type eventhub \
+          --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.EventHub/namespaces/n1/eventhubs/EH1
+  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure Storage queue as a destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint-type storagequeue \
+          --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/queueservices/default/queues/q1
+  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure ServiceBusQueue as a destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --endpoint-type servicebusqueue \
+          --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.ServiceBus/namespaces/ns1/queues/queue1
+  - summary: Create a new event subscription for an Event Grid domain, using default filters, and CloudEvent V 1.0 as the delivery schema.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --event-delivery-schema cloudeventschemav1_0
+  - summary: Create a new event subscription for a storage account, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier).
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
+          --max-delivery-attempts 10 --event-ttl 120
+  - summary: Create a new event subscription for a domain topic.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/t1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription (for a storage account) with an expiration date.
+    syntax: >-
+      az eventgrid event-subscription create --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/sa1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --expiration-date "2018-10-31"
+  - summary: Create a new event subscription for an Event Grid topic, using Azure Active Directory enabled Webhook as a destination .
+    syntax: >-
+      az eventgrid event-subscription create --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --azure-active-directory-tenant-id azureactivedirectorytenantid
+          --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
+  - summary: Create a new event subscription for an Event Grid topic, using Azure Function as destination.
+    syntax: >-
+      az eventgrid event-subscription create --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
+  - summary: Create a new event subscription for an Event Grid topic, using Eventhub with systemassigned MSI identity as destination and with deadletter with MSI identity
+    syntax: >-
+      az eventgrid event-subscription create --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --delivery-identity-endpoint-type eventhub --delivery-identity systemassigned --delivery-identity-endpoint /subscriptions/{SubId2|}/resourceGroups/{RG2}/providers/Microsoft.eventhub/namespaces/{EventHubNamespace}/eventhubs/{EventhubName} \
+          --deadletter-identity-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 --deadletter-identity systemassigned -n {EventSubscriptionName}
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --azure-active-directory-application-id-or-uri
+    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --azure-active-directory-tenant-id
+    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
+  - name: --deadletter-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the deadletter destination resource.
+    description: ''
+  - name: --deadletter-identity-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --delivery-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
+    description: ''
+  - name: --delivery-identity-endpoint
+    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --delivery-identity-endpoint-type
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint with resource identity.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --event-delivery-schema
+    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
+    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
+    description: ''
+  - name: --event-ttl
+    defaultValue: "1440"
+    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
+    description: ''
+  - name: --expiration-date
+    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --max-delivery-attempts
+    defaultValue: "30"
+    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
+    description: ''
+  - name: --max-events-per-batch
+    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
+    description: ''
+  - name: --preferred-batch-size-in-kilobytes
+    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource to which the event subscription needs to be created.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-case-sensitive
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+- uid: az_eventgrid_event-subscription_delete
+  name: az eventgrid event-subscription delete
+  summary: Delete an event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription delete --name
+                                           [--source-resource-id]
+  examples:
+  - summary: Delete an event subscription for an Event Grid topic.
+    syntax: >-
+      az eventgrid event-subscription delete --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
+  - summary: Delete an event subscription for an Event Grid domain topic.
+    syntax: >-
+      az eventgrid event-subscription delete --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/topic1
+  - summary: Delete an event subscription for an Event Grid domain.
+    syntax: >-
+      az eventgrid event-subscription delete --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
+  - summary: Delete an event subscription for an Azure subscription.
+    syntax: >-
+      az eventgrid event-subscription delete --name es2 \
+          --source-resource-id /subscriptions/{SubID}
+  - summary: Delete an event subscription for a resource group.
+    syntax: >-
+      az eventgrid event-subscription delete --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
+  - summary: Delete an event subscription for a storage account.
+    syntax: >-
+      az eventgrid event-subscription delete --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be deleted.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+- uid: az_eventgrid_event-subscription_list
+  name: az eventgrid event-subscription list
+  summary: List event subscriptions.
+  description: >-
+    Event Grid supports both regional and global event subscriptions: Event subscriptions on regional resources (such as Storage accounts or Event Grid topics) are regional, while event subscriptions on global resources (such as an Azure subscription or resource group) are global.
+
+    Hence, you can list event subscriptions in a few different ways:
+
+    1. To list by the resource ID of the resource whose event subscriptions you want to list, specify the --source-resource-id parameter. No other parameters must be specified.
+
+    2. To list by a topic-type (e.g. storage accounts), specify the --topic-type parameter along with --location (e.g. "westus2") parameter. For global topic types (e.g. "Microsoft.Resources.Subscriptions"), specify the location value as "global".
+
+    3. To list all event subscriptions in a region (across all topic types), specify only the --location parameter.
+
+    4. For both #2 and #3 above, to filter only by a resource group, you can additionally specify the --resource-group parameter.
+  syntax: >-
+    az eventgrid event-subscription list [--location]
+                                         [--odata-query]
+                                         [--resource-group]
+                                         [--source-resource-id]
+                                         [--topic-type-name]
+  examples:
+  - summary: List all event subscriptions created for an Event Grid topic.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
+  - summary: List all event subscriptions created for a storage account.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob
+  - summary: List all event subscriptions created for an Azure subscription.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}
+  - summary: List all event subscriptions created for a resource group.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
+  - summary: List all event subscriptions for an Event Grid domain.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1
+  - summary: List all event subscriptions for an Event Grid domain topic.
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1/topics/topic1
+  - summary: List all Storage event subscriptions (under the currently selected Azure subscription) in westus2.
+    syntax: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2
+  - summary: List all Storage event subscriptions (under the given resource group) in westus2.
+    syntax: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2 --resource-group {RG}
+  - summary: List all regional or global event subscriptions (under the currently selected Azure subscription).
+    syntax: >-
+      az eventgrid event-subscription list --location westus2
+
+      az eventgrid event-subscription list --location global
+  - summary: List all regional or global event subscriptions under a specified resource group.
+    syntax: >-
+      az eventgrid event-subscription list --location westus2 --resource-group {RG}
+
+      az eventgrid event-subscription list --location global --resource-group {RG}
+  - summary: List all event subscriptions for an Event Grid domain whose name contains the pattern "XYZ"
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all event subscriptions for an Event Grid domain except the event subscription with name "name1"
+    syntax: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be listed.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+  - name: --topic-type-name
+    summary: Name of the topic-type whose event subscriptions need to be listed. When this is specified, you must also specify --location.
+    description: >-
+      Example 1: List all Storage event subscriptions in WestUS2
+          --resource-group TestRG --topic-type-name Microsoft.Storage.StorageAccounts --location westus2
+      Example 2: List all event subscriptions on Azure subscriptions
+          --topic-type-name Microsoft.Resources.Subscriptions --location global.
+- uid: az_eventgrid_event-subscription_show
+  name: az eventgrid event-subscription show
+  summary: Get the details of an event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription show --name
+                                         [--include-full-endpoint-url {false, true}]
+                                         [--source-resource-id]
+  examples:
+  - summary: Show the details of an event subscription for an Event Grid topic.
+    syntax: >-
+      az eventgrid event-subscription show --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/topic1
+  - summary: Show the details of an event subscription for an Azure subscription.
+    syntax: >-
+      az eventgrid event-subscription show --name es2 \
+          --source-resource-id /subscriptions/{SubID}
+  - summary: Show the details of an event subscription for a resource group.
+    syntax: >-
+      az eventgrid event-subscription show --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+  - summary: Show the details of an event subscription for a storage account.
+    syntax: >-
+      az eventgrid event-subscription show --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/microsoft.storage/storageaccounts/kalsegblob
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --include-full-endpoint-url
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be shown.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+- uid: az_eventgrid_event-subscription_update
+  name: az eventgrid event-subscription update
+  summary: Update an event subscription.
+  description: ''
+  syntax: >-
+    az eventgrid event-subscription update --name
+                                           [--add]
+                                           [--advanced-filter]
+                                           [--deadletter-endpoint]
+                                           [--deadletter-identity {systemassigned}]
+                                           [--deadletter-identity-endpoint]
+                                           [--delivery-identity {systemassigned}]
+                                           [--delivery-identity-endpoint]
+                                           [--delivery-identity-endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--endpoint]
+                                           [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                           [--force-string]
+                                           [--included-event-types]
+                                           [--labels]
+                                           [--remove]
+                                           [--set]
+                                           [--source-resource-id]
+                                           [--subject-begins-with]
+                                           [--subject-ends-with]
+  examples:
+  - summary: Update an event subscription for an Event Grid topic to specify a new endpoint.
+    syntax: >-
+      az eventgrid event-subscription update --name es1 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for an Azure subscription to specify a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid event-subscription update --name es2 \
+          --source-resource-id /subscriptions/{SubID} \
+          --subject-ends-with .jpg
+  - summary: Update an event subscription for a resource group to specify a new endpoint and a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid event-subscription update --name es3 \
+          --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
+          --subject-ends-with .png \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for a storage account to specify a new list of included event types.
+    syntax: >-
+      az eventgrid event-subscription update --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob" \
+          --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
+  - summary: Update an event subscription for a storage account, to include a deadletter destination.
+    syntax: >-
+      az eventgrid event-subscription update --name es2 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob" \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
+  - summary: Update an event subscription for a storage account, using advanced filters.
+    syntax: >-
+      az eventgrid event-subscription update --name es3 \
+          --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --deadletter-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the deadletter destination resource.
+    description: ''
+  - name: --deadletter-identity-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --delivery-identity
+    parameterValueGroup: systemassigned
+    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
+    description: ''
+  - name: --delivery-identity-endpoint
+    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --delivery-identity-endpoint-type
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint with resource identity.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --source-resource-id
+    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be updated.
+    description: >-
+      Usage:                      --source-resource-id Azure-Resource-ID
+
+      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
+
+      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
+
+      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
+
+      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
+
+      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
+
+      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+commands:
+- az_eventgrid_event-subscription_create
+- az_eventgrid_event-subscription_delete
+- az_eventgrid_event-subscription_list
+- az_eventgrid_event-subscription_show
+- az_eventgrid_event-subscription_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/extension-topic.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/extension-topic.yml
new file mode 100644
index 0000000000..5adcf7594e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/extension-topic.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_extension-topic
+name: az eventgrid extension-topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid extension-topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Event Grid extension topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_extension-topic_show
+  name: az eventgrid extension-topic show
+  summary: Get the details of an extension topic.
+  description: ''
+  syntax: az eventgrid extension-topic show --scope
+  examples:
+  - summary: Show the details of an extension topic.
+    syntax: az eventgrid extension-topic show --scope /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageAccounts/{StorageAccountName}
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The identifier of the resource to which extension topic is queried. The scope can be a subscription, or a resource group, or a top level resource belonging to a resource provider namespace. For example, use '/subscriptions/{subscriptionId}/' for a subscription, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' for Azure resource.
+    description: ''
+commands:
+- az_eventgrid_extension-topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Event Grid extension topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner.yml
new file mode 100644
index 0000000000..f354fa7674
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner.yml
@@ -0,0 +1,57 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner
+name: az eventgrid partner
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner resources.
+description: ''
+commands:
+- az_eventgrid_partner_namespace
+- az_eventgrid_partner_namespace_create
+- az_eventgrid_partner_namespace_delete
+- az_eventgrid_partner_namespace_event-channel
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+- az_eventgrid_partner_namespace_key
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+- az_eventgrid_partner_namespace_list
+- az_eventgrid_partner_namespace_show
+- az_eventgrid_partner_registration
+- az_eventgrid_partner_registration_create
+- az_eventgrid_partner_registration_delete
+- az_eventgrid_partner_registration_list
+- az_eventgrid_partner_registration_show
+- az_eventgrid_partner_topic
+- az_eventgrid_partner_topic_activate
+- az_eventgrid_partner_topic_deactivate
+- az_eventgrid_partner_topic_delete
+- az_eventgrid_partner_topic_event-subscription
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+- az_eventgrid_partner_topic_list
+- az_eventgrid_partner_topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace.yml
new file mode 100644
index 0000000000..d2350e759f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_namespace
+name: az eventgrid partner namespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner namespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner namespaces.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_namespace_create
+  name: az eventgrid partner namespace create
+  summary: Create a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace create --location
+                                          --name
+                                          --partner-registration-id
+                                          --resource-group
+                                          [--tags]
+  examples:
+  - summary: Create a new partner namespace.
+    syntax: az eventgrid partner namespace create -g rg1 --name namespaceName1 -l westus2 --partner-registration-id 795c9f2f-6d2d-42ff-a570-42fd3043192c
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --partner-registration-id
+    summary: 'The fully qualified ARM Id of the partner registration that should be associated with this partner namespace. This takes the following format: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/partnerRegistrations/{partnerRegistrationName}.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_partner_namespace_delete
+  name: az eventgrid partner namespace delete
+  summary: Delete a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace delete --name
+                                          --resource-group
+  examples:
+  - summary: Delete a specific partner namespace.
+    syntax: az eventgrid partner namespace delete -g rg1 --name partnernamespace1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_list
+  name: az eventgrid partner namespace list
+  summary: List available partner namespaces.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace list [--odata-query]
+                                        [--resource-group]
+  examples:
+  - summary: List all partner namespaces in the current Azure subscription.
+    syntax: az eventgrid partner namespace list
+  - summary: List all partner namespaces in a resource group.
+    syntax: az eventgrid partner namespace list -g rg1
+  - summary: List all partner namespaces in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner namespace list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all partner namespaces in a resource group except the partner namespace with name "name1"
+    syntax: az eventgrid partner namespace list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_show
+  name: az eventgrid partner namespace show
+  summary: Get the details of a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace show --name
+                                        --resource-group
+  examples:
+  - summary: Show the details of a partner namespace.
+    syntax: az eventgrid partner namespace show -g rg1 -n partnernamespace1
+  - summary: Show the details of a partner namespace based on resource ID.
+    syntax: az eventgrid partner namespace show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_namespace_create
+- az_eventgrid_partner_namespace_delete
+- az_eventgrid_partner_namespace_event-channel
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+- az_eventgrid_partner_namespace_key
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+- az_eventgrid_partner_namespace_list
+- az_eventgrid_partner_namespace_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner namespaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace/event-channel.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace/event-channel.yml
new file mode 100644
index 0000000000..c15a8d4099
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace/event-channel.yml
@@ -0,0 +1,196 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_namespace_event-channel
+name: az eventgrid partner namespace event-channel
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner namespace event-channel** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner event channels.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_namespace_event-channel_create
+  name: az eventgrid partner namespace event-channel create
+  summary: Create an event channel under a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel create --desination-topic-name
+                                                        --destination-resource-group
+                                                        --destination-subscription-id
+                                                        --name
+                                                        --partner-namespace-name
+                                                        --resource-group
+                                                        --source
+                                                        [--activation-expiration-date]
+                                                        [--partner-topic-description]
+                                                        [--publisher-filter]
+  examples:
+  - summary: Create a specific event channel.
+    syntax: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1
+  - summary: Create a specific event channel with an activation expiration time and partner topic friendly description.
+    syntax: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --activation-expiration-date '2020-05-20T10:00' --partner-topic-description 'This topic is created by Costoco corp on user behavior.'
+  - summary: Create a specific event channel with publisher filters.
+    syntax: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --publisher-filter data.key1 NumberIn 2 3 4 100 200 --publisher-filter data.key2 StringIn 2 3 4 100 200
+  requiredParameters:
+  - isRequired: true
+    name: --desination-topic-name
+    summary: Name of the partner topic associated with the event channel.
+    description: ''
+  - isRequired: true
+    name: --destination-resource-group
+    summary: Azure Resource Group of the customer creating the event channel. The partner topic associated with the event channel will be created under this resource group.
+    description: ''
+  - isRequired: true
+    name: --destination-subscription-id
+    summary: Azure subscription Id of the customer creating the event channel. The partner topic associated with the event channel will be created under this Azure subscription.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event channel.
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source
+    summary: The identifier of the resource that forms the partner source of the events. This represents a unique resource in the partner's resource model.
+    description: ''
+  optionalParameters:
+  - name: --activation-expiration-date
+    summary: Date or datetime in UTC ISO 8601 format (e.g., '2022-02-17T01:59:59+00:00' or '2022-02-17') after which the event channel and corresponding partner topic would expire and get auto deleted. If this time is not specified, the expiration date is set to seven days by default.
+    description: ''
+  - name: --partner-topic-description
+    summary: Friendly description of the corresponding partner topic. This will be helpful to remove any ambiguity of the origin of creation of the partner topic for the customer.
+    description: ''
+  - name: --publisher-filter
+    summary: A publisher filter that is used to enable filtering of events based on a specific event property. This set of filters that are specified by the publisher in order to determine which events to be received by the subscriber.
+    description: >-
+      Usage:                     --publisher-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --publisher-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --publisher-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --publisher-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --publisher-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --publisher-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --publisher-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --publisher-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --publisher-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --publisher-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --publisher-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --publisher-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --publisher-filter data.property3 BoolEquals true
+
+      Multiple publisher filters can be specified by using more than one `--publisher-filter` argument.
+- uid: az_eventgrid_partner_namespace_event-channel_delete
+  name: az eventgrid partner namespace event-channel delete
+  summary: Delete a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel delete --name
+                                                        --partner-namespace-name
+                                                        --resource-group
+  examples:
+  - summary: Delete a specific partner namespace.
+    syntax: az eventgrid partner namespace event-channel delete -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event channel.
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_event-channel_list
+  name: az eventgrid partner namespace event-channel list
+  summary: List available partner event-channels.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel list --partner-namespace-name
+                                                      --resource-group
+                                                      [--odata-query]
+  examples:
+  - summary: List all event-channels in a specific partner namespace.
+    syntax: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1
+  - summary: List all event channel under a partner namespace whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1  --odata-query "Contains(name, 'XYZ')"
+  requiredParameters:
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_partner_namespace_event-channel_show
+  name: az eventgrid partner namespace event-channel show
+  summary: Get the details of an event channel under a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace event-channel show --name
+                                                      --partner-namespace-name
+                                                      --resource-group
+  examples:
+  - summary: Show the details of an event channel.
+    syntax: az eventgrid partner namespace event-channel show -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
+  - summary: Show the details of an event-channel based on resource ID.
+    syntax: az eventgrid partner namespace event-channel show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1/eventChannels/eventChannelName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event channel.
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_namespace_event-channel_create
+- az_eventgrid_partner_namespace_event-channel_delete
+- az_eventgrid_partner_namespace_event-channel_list
+- az_eventgrid_partner_namespace_event-channel_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner event channels.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace/key.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace/key.yml
new file mode 100644
index 0000000000..43a9a45cc4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/namespace/key.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_namespace_key
+name: az eventgrid partner namespace key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner namespace key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage shared access keys of a partner namespace.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_namespace_key_list
+  name: az eventgrid partner namespace key list
+  summary: List shared access keys of a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace key list --partner-namespace-name
+                                            --resource-group
+  examples:
+  - summary: List shared access keys of a partner namespace (autogenerated)
+    syntax: az eventgrid partner namespace key list --partner-namespace-name MyNamespace --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_namespace_key_regenerate
+  name: az eventgrid partner namespace key regenerate
+  summary: Regenerate a shared access key of a partner namespace.
+  description: ''
+  syntax: >-
+    az eventgrid partner namespace key regenerate --key-name
+                                                  --partner-namespace-name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: Key name to regenerate (key1 or key2).
+    description: ''
+  - isRequired: true
+    name: --partner-namespace-name
+    summary: Name of the partner namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_namespace_key_list
+- az_eventgrid_partner_namespace_key_regenerate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage shared access keys of a partner namespace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/registration.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/registration.yml
new file mode 100644
index 0000000000..ba0aec35b3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/registration.yml
@@ -0,0 +1,159 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_registration
+name: az eventgrid partner registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner registrations.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_registration_create
+  name: az eventgrid partner registration create
+  summary: Create a new partner registration.
+  description: ''
+  syntax: >-
+    az eventgrid partner registration create --name
+                                             --partner-name
+                                             --resource-group
+                                             --resource-type-name
+                                             [--authorized-subscription-ids]
+                                             [--customer-service-extension]
+                                             [--customer-service-number]
+                                             [--customer-service-uri]
+                                             [--description]
+                                             [--display-name]
+                                             [--logo-uri]
+                                             [--long-description]
+                                             [--setup-uri]
+                                             [--tags]
+  examples:
+  - summary: Create a new partner registration with basic information.
+    syntax: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445
+  - summary: Create a new partner registration with partner information.
+    syntax: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445 --description ExampleDescription --display-name ExampleDisplayName1 --logo-uri 'https://www.example.com/logo.png' --setup-uri 'https://www.example.com' --long-description 'This is sample description}' --customer-service-number '+1 800 123 4567' --customer-service-extension '125' --customer-service-uri 'https://www.example.com/customerservice'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner registration.
+    description: ''
+  - isRequired: true
+    name: --partner-name
+    summary: Official name of the partner.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-type-name
+    summary: Name of the partner topic resource type. This name should be unique among all partner topic types names.
+    description: ''
+  optionalParameters:
+  - name: --authorized-subscription-ids
+    summary: A space-separated list of Azure subscription Ids that are authorized to create a partner namespace associated with this partner registration. This is an optional property. Creating partner namespaces is always permitted under the same Azure subscription as the one used for creating the partner registration.
+    description: ''
+  - name: --customer-service-extension
+    summary: The extension of the customer service number of the publisher. Only digits are allowed and number of digits should not exceed 10.
+    description: ''
+  - name: --customer-service-number
+    summary: "The customer service number of the publisher. The expected phone format should start with a '+' sign followed by the country code. The remaining digits are then followed. Only digits and spaces are allowed and its length cannot exceed 16 digits including country code. Examples of valid phone numbers are: +1 515 123 4567 and +966 7 5115 2471. Examples of invalid phone numbers are: +1 (515) 123-4567, 1 515 123 4567 and +966 121 5115 24 7 551 1234 43."
+    description: ''
+  - name: --customer-service-uri
+    summary: The customer service URI of the publisher.
+    description: ''
+  - name: --description
+    summary: Description of the partner topic type.
+    description: ''
+  - name: --display-name
+    summary: Display name for the partner topic type.
+    description: ''
+  - name: --logo-uri
+    summary: URI of the partner logo.
+    description: ''
+  - name: --long-description
+    summary: Description of the custom scenarios and integration. Length of this description should not exceed 2048 characters.
+    description: ''
+  - name: --setup-uri
+    summary: URI of the partner website that can be used by Azure customers to setup Event Grid integration on an event source.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_partner_registration_delete
+  name: az eventgrid partner registration delete
+  summary: Delete a partner registration.
+  description: Deletes a partner registration with the specified parameters.
+  syntax: >-
+    az eventgrid partner registration delete --name
+                                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_registration_list
+  name: az eventgrid partner registration list
+  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
+  description: ''
+  syntax: >-
+    az eventgrid partner registration list [--odata-query]
+                                           [--resource-group]
+  examples:
+  - summary: List all partner registrations in the current Azure subscription.
+    syntax: az eventgrid partner registration list
+  - summary: List all partner registrations in a resource group.
+    syntax: az eventgrid partner registration list -g rg1
+  - summary: List all partner registrations in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner registration list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all partner registrations in a resource group except the partner registration with name "name1"
+    syntax: az eventgrid partner registration list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_registration_show
+  name: az eventgrid partner registration show
+  summary: Get a partner registration.
+  description: Gets a partner registration with the specified parameters.
+  syntax: >-
+    az eventgrid partner registration show --name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_registration_create
+- az_eventgrid_partner_registration_delete
+- az_eventgrid_partner_registration_list
+- az_eventgrid_partner_registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner registrations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/topic.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/topic.yml
new file mode 100644
index 0000000000..39c550fc61
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/topic.yml
@@ -0,0 +1,140 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_topic
+name: az eventgrid partner topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage partner topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_topic_activate
+  name: az eventgrid partner topic activate
+  summary: Activate a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic activate --name
+                                        --resource-group
+  examples:
+  - summary: Activate a specific partner topic.
+    syntax: az eventgrid partner topic activate -g rg1 -n partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_deactivate
+  name: az eventgrid partner topic deactivate
+  summary: Deactivate a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic deactivate --name
+                                          --resource-group
+  examples:
+  - summary: Deactivate a specific partner topic.
+    syntax: az eventgrid partner topic deactivate -g rg1 -n partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_delete
+  name: az eventgrid partner topic delete
+  summary: Delete a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic delete --name
+                                      --resource-group
+  examples:
+  - summary: Delete a specific partner topic.
+    syntax: az eventgrid partner topic delete -g rg1 --name partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_list
+  name: az eventgrid partner topic list
+  summary: List available partner topics.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic list [--odata-query]
+                                    [--resource-group]
+  examples:
+  - summary: List all partner topics in the current Azure subscription.
+    syntax: az eventgrid partner topic list
+  - summary: List all partner topics in a resource group.
+    syntax: az eventgrid partner topic list -g rg1
+  - summary: List all partner topics in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid partner topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all partner topics in a resource group except the partner topic with name "name1"
+    syntax: az eventgrid partner topic list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_show
+  name: az eventgrid partner topic show
+  summary: Get the details of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic show --name
+                                    --resource-group
+  examples:
+  - summary: Show the details of a partner topic.
+    syntax: az eventgrid partner topic show -g rg1 -n partnertopic1
+  - summary: Show the details of a partner topic based on resource ID.
+    syntax: az eventgrid partner topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnetopics/topic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_partner_topic_activate
+- az_eventgrid_partner_topic_deactivate
+- az_eventgrid_partner_topic_delete
+- az_eventgrid_partner_topic_event-subscription
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+- az_eventgrid_partner_topic_list
+- az_eventgrid_partner_topic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage partner topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/topic/event-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/topic/event-subscription.yml
new file mode 100644
index 0000000000..e1457a1990
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/partner/topic/event-subscription.yml
@@ -0,0 +1,387 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_partner_topic_event-subscription
+name: az eventgrid partner topic event-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid partner topic event-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event subscriptions of partner topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_partner_topic_event-subscription_create
+  name: az eventgrid partner topic event-subscription create
+  summary: Create a new event subscription for a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription create --name
+                                                         --partner-topic-name
+                                                         --resource-group
+                                                         [--advanced-filter]
+                                                         [--azure-active-directory-application-id-or-uri]
+                                                         [--azure-active-directory-tenant-id]
+                                                         [--deadletter-endpoint]
+                                                         [--endpoint]
+                                                         [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                         [--event-delivery-schema {cloudeventschemav1_0, custominputschema, eventgridschema}]
+                                                         [--event-ttl]
+                                                         [--expiration-date]
+                                                         [--included-event-types]
+                                                         [--labels]
+                                                         [--max-delivery-attempts]
+                                                         [--max-events-per-batch]
+                                                         [--preferred-batch-size-in-kilobytes]
+                                                         [--subject-begins-with]
+                                                         [--subject-case-sensitive {false, true}]
+                                                         [--subject-ends-with]
+  examples:
+  - summary: Create a new event subscription for an Event Grid partner topic, using default filters.
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for an Event Grid partner topic, with a filter specifying a subject prefix.
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es4 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-begins-with mysubject_prefix
+  - summary: Create a new event subscription for an Event Grid partner topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
+    syntax: >-
+      az eventgrid partner topic event-subscription create -n es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --event-delivery-schema cloudeventschemav1_0
+  - summary: Create a new event subscription for an Event Grid partnertopic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
+          --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
+  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Active Directory enabled Webhook as a destination .
+    syntax: >-
+      az eventgrid partner topic event-subscription create --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --azure-active-directory-tenant-id azureactivedirectorytenantid
+          --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
+  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Function as destination.
+    syntax: >-
+      az eventgrid partner topic event-subscription create -n es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --azure-active-directory-application-id-or-uri
+    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --azure-active-directory-tenant-id
+    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --event-delivery-schema
+    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
+    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
+    description: ''
+  - name: --event-ttl
+    defaultValue: "1440"
+    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
+    description: ''
+  - name: --expiration-date
+    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --max-delivery-attempts
+    defaultValue: "30"
+    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
+    description: ''
+  - name: --max-events-per-batch
+    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
+    description: ''
+  - name: --preferred-batch-size-in-kilobytes
+    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-case-sensitive
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_delete
+  name: az eventgrid partner topic event-subscription delete
+  summary: Delete an event subscription of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription delete --name
+                                                         --partner-topic-name
+                                                         --resource-group
+  examples:
+  - summary: Delete an event subscription for an Event Grid partner topic.
+    syntax: >-
+      az eventgrid partner topic event-subscription delete --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_list
+  name: az eventgrid partner topic event-subscription list
+  summary: List event subscriptions of a specific partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription list --partner-topic-name
+                                                       --resource-group
+                                                       [--odata-query]
+  examples:
+  - summary: List all event subscriptions created for an Event Grid partner topic.
+    syntax: az eventgrid partner topic event-subscription list -g rg1 --partner-topic-name partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_show
+  name: az eventgrid partner topic event-subscription show
+  summary: Get the details of an event subscription of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription show --name
+                                                       --partner-topic-name
+                                                       --resource-group
+                                                       [--include-full-endpoint-url {false, true}]
+  examples:
+  - summary: Show the details of an event subscription for an Event Grid partner topic.
+    syntax: >-
+      az eventgrid partner topic event-subscription show --name es1 \
+           -g rg1 --partner-topic-name partnertopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-full-endpoint-url
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
+    description: ''
+- uid: az_eventgrid_partner_topic_event-subscription_update
+  name: az eventgrid partner topic event-subscription update
+  summary: Update an event subscription of a partner topic.
+  description: ''
+  syntax: >-
+    az eventgrid partner topic event-subscription update --name
+                                                         --partner-topic-name
+                                                         --resource-group
+                                                         [--advanced-filter]
+                                                         [--deadletter-endpoint]
+                                                         [--endpoint]
+                                                         [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                         [--included-event-types]
+                                                         [--labels]
+                                                         [--subject-begins-with]
+                                                         [--subject-ends-with]
+  examples:
+  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es1 \
+          -g rg1 --partner-topic-name partnertopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for an Event Grid partner topic to specify a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --subject-ends-with .jpg
+  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es3 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --subject-ends-with .png \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
+  - summary: Update an event subscription for an Azure Event Grid partner topic, to include a deadletter destination.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es2 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
+  - summary: Update an event subscription for an Azure Event Grid partner topic, using advanced filters.
+    syntax: >-
+      az eventgrid partner topic event-subscription update --name es3 \
+          -g rg1 --partner-topic-name partnertopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --partner-topic-name
+    summary: Name of the partner topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+commands:
+- az_eventgrid_partner_topic_event-subscription_create
+- az_eventgrid_partner_topic_event-subscription_delete
+- az_eventgrid_partner_topic_event-subscription_list
+- az_eventgrid_partner_topic_event-subscription_show
+- az_eventgrid_partner_topic_event-subscription_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event subscriptions of partner topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/system-topic.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/system-topic.yml
new file mode 100644
index 0000000000..1ab7771e3f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/system-topic.yml
@@ -0,0 +1,165 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_system-topic
+name: az eventgrid system-topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid system-topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage system topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_system-topic_create
+  name: az eventgrid system-topic create
+  summary: Create a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic create --location
+                                     --name
+                                     --resource-group
+                                     --source
+                                     --topic-type
+                                     [--tags]
+  examples:
+  - summary: Create a new system topic for storage account source.
+    syntax: az eventgrid system-topic create -g rg1 --name systemtopic1 --location westus2 --topic-type microsoft.storage.storageaccounts --source /subscriptions/1b3b4501-23b9-4790-c31b-ddbd88d72123/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/stgaccountname
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source
+    summary: The ARM Id for the topic, e.g., /subscriptions/{SubId}/resourceGroups/{RgName}/providers/Microsoft.Storage/storageAccounts/{AccountName}.
+    description: ''
+  - isRequired: true
+    name: --topic-type
+    summary: Name of the topic type.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_system-topic_delete
+  name: az eventgrid system-topic delete
+  summary: Delete a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic delete --name
+                                     --resource-group
+  examples:
+  - summary: Delete a specific system topic.
+    syntax: az eventgrid system-topic delete -g rg1 --name systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_system-topic_list
+  name: az eventgrid system-topic list
+  summary: List available system topics.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic list [--odata-query]
+                                   [--resource-group]
+  examples:
+  - summary: List all system topics in the current Azure subscription.
+    syntax: az eventgrid system-topic list
+  - summary: List all system topics in a resource group.
+    syntax: az eventgrid system-topic list -g rg1
+  - summary: List all system topics in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid system-topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all system topics in a resource group except the system topic with name "name1"
+    syntax: az eventgrid system-topic list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_system-topic_show
+  name: az eventgrid system-topic show
+  summary: Get the details of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic show --name
+                                   --resource-group
+  examples:
+  - summary: Show the details of a system topic.
+    syntax: az eventgrid system-topic show -g rg1 -n systemtopic1
+  - summary: Show the details of a system topic based on resource ID.
+    syntax: az eventgrid system-topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/systemtopics/systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_system-topic_update
+  name: az eventgrid system-topic update
+  summary: Update a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic update --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: Update the properties of an existing system topic.
+    syntax: az eventgrid system-topic update -g rg1 --name systemtopic1 --tags Dept=IT
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the system topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_eventgrid_system-topic_create
+- az_eventgrid_system-topic_delete
+- az_eventgrid_system-topic_event-subscription
+- az_eventgrid_system-topic_event-subscription_create
+- az_eventgrid_system-topic_event-subscription_delete
+- az_eventgrid_system-topic_event-subscription_list
+- az_eventgrid_system-topic_event-subscription_show
+- az_eventgrid_system-topic_event-subscription_update
+- az_eventgrid_system-topic_list
+- az_eventgrid_system-topic_show
+- az_eventgrid_system-topic_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage system topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/system-topic/event-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/system-topic/event-subscription.yml
new file mode 100644
index 0000000000..50ad5f22fd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/system-topic/event-subscription.yml
@@ -0,0 +1,387 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_system-topic_event-subscription
+name: az eventgrid system-topic event-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid system-topic event-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event subscriptions of system topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_system-topic_event-subscription_create
+  name: az eventgrid system-topic event-subscription create
+  summary: Create a new event subscription for a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription create --name
+                                                        --resource-group
+                                                        --system-topic-name
+                                                        [--advanced-filter]
+                                                        [--azure-active-directory-application-id-or-uri]
+                                                        [--azure-active-directory-tenant-id]
+                                                        [--deadletter-endpoint]
+                                                        [--endpoint]
+                                                        [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                        [--event-delivery-schema {cloudeventschemav1_0, custominputschema, eventgridschema}]
+                                                        [--event-ttl]
+                                                        [--expiration-date]
+                                                        [--included-event-types]
+                                                        [--labels]
+                                                        [--max-delivery-attempts]
+                                                        [--max-events-per-batch]
+                                                        [--preferred-batch-size-in-kilobytes]
+                                                        [--subject-begins-with]
+                                                        [--subject-case-sensitive {false, true}]
+                                                        [--subject-ends-with]
+  examples:
+  - summary: Create a new event subscription for an Event Grid system topic, using default filters.
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Create a new event subscription for an Event Grid system topic, with a filter specifying a subject prefix.
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es4 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --subject-begins-with mysubject_prefix
+  - summary: Create a new event subscription for an Event Grid system topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
+    syntax: >-
+      az eventgrid system-topic event-subscription create -n es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --event-delivery-schema cloudeventschemav1_0
+  - summary: Create a new event subscription for an Event Grid system topic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
+          --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
+  - summary: Create a new event subscription for an Event Grid system topic, using Azure Active Directory enabled Webhook as a destination .
+    syntax: >-
+      az eventgrid system-topic event-subscription create --name es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --azure-active-directory-tenant-id azureactivedirectorytenantid
+          --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
+  - summary: Create a new event subscription for an Event Grid system topic, using Azure Function as destination.
+    syntax: >-
+      az eventgrid system-topic event-subscription create -n es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --azure-active-directory-application-id-or-uri
+    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --azure-active-directory-tenant-id
+    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
+    description: ''
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --event-delivery-schema
+    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
+    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
+    description: ''
+  - name: --event-ttl
+    defaultValue: "1440"
+    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
+    description: ''
+  - name: --expiration-date
+    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --max-delivery-attempts
+    defaultValue: "30"
+    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
+    description: ''
+  - name: --max-events-per-batch
+    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
+    description: ''
+  - name: --preferred-batch-size-in-kilobytes
+    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-case-sensitive
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_delete
+  name: az eventgrid system-topic event-subscription delete
+  summary: Delete an event subscription of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription delete --name
+                                                        --resource-group
+                                                        --system-topic-name
+  examples:
+  - summary: Delete an event subscription for an Event Grid system topic.
+    syntax: >-
+      az eventgrid system-topic event-subscription delete --name es1 \
+          -g rg1 --system-topic-name systemtopic1 \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_list
+  name: az eventgrid system-topic event-subscription list
+  summary: List event subscriptions of a specific system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription list --resource-group
+                                                      --system-topic-name
+                                                      [--odata-query]
+  examples:
+  - summary: List all event subscriptions created for an Event Grid system topic.
+    syntax: az eventgrid system-topic event-subscription list -g rg1 --system-topic-name systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_show
+  name: az eventgrid system-topic event-subscription show
+  summary: Get the details of an event subscription of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription show --name
+                                                      --resource-group
+                                                      --system-topic-name
+                                                      [--include-full-endpoint-url {false, true}]
+  examples:
+  - summary: Show the details of an event subscription for an Event Grid system topic.
+    syntax: >-
+      az eventgrid system-topic event-subscription show --name es1 \
+           -g rg1 --system-topic-name systemtopic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --include-full-endpoint-url
+    parameterValueGroup: false, true
+    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
+    description: ''
+- uid: az_eventgrid_system-topic_event-subscription_update
+  name: az eventgrid system-topic event-subscription update
+  summary: Update an event subscription of a system topic.
+  description: ''
+  syntax: >-
+    az eventgrid system-topic event-subscription update --name
+                                                        --resource-group
+                                                        --system-topic-name
+                                                        [--advanced-filter]
+                                                        [--deadletter-endpoint]
+                                                        [--endpoint]
+                                                        [--endpoint-type {azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook}]
+                                                        [--included-event-types]
+                                                        [--labels]
+                                                        [--subject-begins-with]
+                                                        [--subject-ends-with]
+  examples:
+  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es1 \
+          -g rg1 --system-topic-name systemtopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+  - summary: Update an event subscription for an Event Grid system topic to specify a new subject-ends-with filter.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --subject-ends-with .jpg
+  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es3 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --subject-ends-with .png \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
+  - summary: Update an event subscription for an Azure Event Grid system topic, to include a deadletter destination.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es2 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
+  - summary: Update an event subscription for an Azure Event Grid system topic, using advanced filters.
+    syntax: >-
+      az eventgrid system-topic event-subscription update --name es3 \
+          -g rg1 --system-topic-name systemtopic1 \
+          --endpoint https://contoso.azurewebsites.net/api/f1?code=code
+          --advanced-filter data.blobType StringIn BlockBlob
+          --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the event subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --system-topic-name
+    summary: Name of the system topic.
+    description: ''
+  optionalParameters:
+  - name: --advanced-filter
+    summary: An advanced filter enables filtering of events based on a specific event property.
+    description: >-
+      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
+
+      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
+
+      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
+
+      StringContains:            --advanced-filter subject StringContains Blue Red
+
+      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
+
+      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
+
+      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
+
+      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
+
+      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
+
+      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
+
+      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
+
+      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
+
+      BoolEquals:                --advanced-filter data.property3 BoolEquals true
+
+      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
+  - name: --deadletter-endpoint
+    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
+    description: ''
+  - name: --endpoint
+    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
+    description: ''
+  - name: --endpoint-type
+    defaultValue: webhook
+    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
+    summary: The type of the destination endpoint.
+    description: ''
+  - name: --included-event-types
+    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
+    description: ''
+  - name: --labels
+    summary: A space-separated list of labels to associate with this event subscription.
+    description: ''
+  - name: --subject-begins-with
+    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
+    description: ''
+  - name: --subject-ends-with
+    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
+    description: ''
+commands:
+- az_eventgrid_system-topic_event-subscription_create
+- az_eventgrid_system-topic_event-subscription_delete
+- az_eventgrid_system-topic_event-subscription_list
+- az_eventgrid_system-topic_event-subscription_show
+- az_eventgrid_system-topic_event-subscription_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event subscriptions of system topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic-type.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic-type.yml
new file mode 100644
index 0000000000..22a2aac5d4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic-type.yml
@@ -0,0 +1,59 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic-type
+name: az eventgrid topic-type
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic-type** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Get details for topic types.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic-type_list
+  name: az eventgrid topic-type list
+  summary: List registered topic types.
+  description: ''
+  syntax: az eventgrid topic-type list
+- uid: az_eventgrid_topic-type_list-event-types
+  name: az eventgrid topic-type list-event-types
+  summary: List the event types supported by a topic type.
+  description: ''
+  syntax: az eventgrid topic-type list-event-types --name
+  examples:
+  - summary: List all event types supported by Azure Storage Accounts.
+    syntax: az eventgrid topic-type list-event-types -n Microsoft.Storage.StorageAccounts
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic type.
+    description: ''
+- uid: az_eventgrid_topic-type_show
+  name: az eventgrid topic-type show
+  summary: Get the details for a topic type.
+  description: ''
+  syntax: az eventgrid topic-type show --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic type.
+    description: ''
+commands:
+- az_eventgrid_topic-type_list
+- az_eventgrid_topic-type_list-event-types
+- az_eventgrid_topic-type_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Get details for topic types.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic.yml
new file mode 100644
index 0000000000..e1982444dd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic.yml
@@ -0,0 +1,220 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic
+name: az eventgrid topic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Event Grid topics.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_create
+  name: az eventgrid topic create
+  summary: Create a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic create --location
+                              --name
+                              --resource-group
+                              [--identity {noidentity, systemassigned}]
+                              [--inbound-ip-rules]
+                              [--input-mapping-default-values]
+                              [--input-mapping-fields]
+                              [--input-schema {cloudeventschemav1_0, customeventschema, eventgridschema}]
+                              [--public-network-access {disabled, enabled}]
+                              [--sku {basic, premium}]
+                              [--tags]
+  examples:
+  - summary: Create a new topic.
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2
+  - summary: Create a new topic with custom input mappings.
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=myTopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
+  - summary: Create a new topic that accepts events published in CloudEvents V1.0 schema.
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema cloudeventschemav1_0
+  - summary: Create a new topic which allows specific inbound ip rules with Basic Sku and system assigned identity
+    syntax: az eventgrid topic create -g rg1 --name topic1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku Basic --identity systemassigned
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --input-mapping-default-values
+    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
+    description: ''
+  - name: --input-mapping-fields
+    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
+    description: ''
+  - name: --input-schema
+    defaultValue: eventgridschema
+    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
+    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
+    description: ''
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_eventgrid_topic_delete
+  name: az eventgrid topic delete
+  summary: Delete a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic delete --name
+                              --resource-group
+  examples:
+  - summary: Delete a topic.
+    syntax: az eventgrid topic delete -g rg1 --name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_list
+  name: az eventgrid topic list
+  summary: List available topics.
+  description: ''
+  syntax: >-
+    az eventgrid topic list [--odata-query]
+                            [--resource-group]
+  examples:
+  - summary: List all topics in the current Azure subscription.
+    syntax: az eventgrid topic list
+  - summary: List all topics in a resource group.
+    syntax: az eventgrid topic list -g rg1
+  - summary: List all topics in a resource group whose name contains the pattern "XYZ"
+    syntax: az eventgrid topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
+  - summary: List all topics in a resource group except the domain with name "name1"
+    syntax: az eventgrid topic list -g rg1 --odata-query "NOT (name eq 'name1')"
+  optionalParameters:
+  - name: --odata-query
+    summary: The query used to filter the results using OData syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_show
+  name: az eventgrid topic show
+  summary: Get the details of a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic show --name
+                            --resource-group
+  examples:
+  - summary: Show the details of a topic.
+    syntax: az eventgrid topic show -g rg1 -n topic1
+  - summary: Show the details of a topic based on resource ID.
+    syntax: az eventgrid topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_update
+  name: az eventgrid topic update
+  summary: Update a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic update --name
+                              --resource-group
+                              [--identity {noidentity, systemassigned}]
+                              [--inbound-ip-rules]
+                              [--public-network-access {disabled, enabled}]
+                              [--sku {basic, premium}]
+                              [--tags]
+  examples:
+  - summary: Update the properties of an existing topic with new sku, identity and public network access information.
+    syntax: az eventgrid topic update -g rg1 --name topic1 --sku Premium --identity systemassigned --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    parameterValueGroup: noidentity, systemassigned
+    summary: The identity type of the resource (e.g., topic or domain).
+    description: ''
+  - name: --inbound-ip-rules
+    summary: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask.
+    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
+  - name: --public-network-access
+    parameterValueGroup: disabled, enabled
+    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
+    description: ''
+  - name: --sku
+    parameterValueGroup: basic, premium
+    summary: The Sku name of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_eventgrid_topic_create
+- az_eventgrid_topic_delete
+- az_eventgrid_topic_key
+- az_eventgrid_topic_key_list
+- az_eventgrid_topic_key_regenerate
+- az_eventgrid_topic_list
+- az_eventgrid_topic_private-endpoint-connection
+- az_eventgrid_topic_private-endpoint-connection_approve
+- az_eventgrid_topic_private-endpoint-connection_delete
+- az_eventgrid_topic_private-endpoint-connection_list
+- az_eventgrid_topic_private-endpoint-connection_reject
+- az_eventgrid_topic_private-endpoint-connection_show
+- az_eventgrid_topic_private-link-resource
+- az_eventgrid_topic_private-link-resource_list
+- az_eventgrid_topic_private-link-resource_show
+- az_eventgrid_topic_show
+- az_eventgrid_topic_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Event Grid topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/key.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/key.yml
new file mode 100644
index 0000000000..11b17cfa4d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/key.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic_key
+name: az eventgrid topic key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage shared access keys of a topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_key_list
+  name: az eventgrid topic key list
+  summary: List shared access keys of a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic key list --name
+                                --resource-group
+  examples:
+  - summary: List shared access keys of a topic (autogenerated)
+    syntax: az eventgrid topic key list --name MyTopic --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_eventgrid_topic_key_regenerate
+  name: az eventgrid topic key regenerate
+  summary: Regenerate a shared access key of a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic key regenerate --key-name
+                                      --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: Key name to regenerate key1 or key2.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the topic.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_eventgrid_topic_key_list
+- az_eventgrid_topic_key_regenerate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage shared access keys of a topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/private-endpoint-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/private-endpoint-connection.yml
new file mode 100644
index 0000000000..81eb7d6717
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/private-endpoint-connection.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic_private-endpoint-connection
+name: az eventgrid topic private-endpoint-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic private-endpoint-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private endpoint connections of a topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_private-endpoint-connection_approve
+  name: az eventgrid topic private-endpoint-connection approve
+  summary: Approve a private endpoint connection request for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection approve --name
+                                                           --resource-group
+                                                           --topic-name
+                                                           [--description]
+  examples:
+  - summary: Approve a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-endpoint-connection approve -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the approval.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_delete
+  name: az eventgrid topic private-endpoint-connection delete
+  summary: Delete a private endpoint connection for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection delete --name
+                                                          --resource-group
+                                                          --topic-name
+  examples:
+  - summary: Delete private endpoint connection for a specific topic.
+    syntax: az eventgrid topic private-endpoint-connection delete -g rg1 --topic-name topic1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_list
+  name: az eventgrid topic private-endpoint-connection list
+  summary: List the properties of all the private endpoint connections for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection list --resource-group
+                                                        --topic-name
+  examples:
+  - summary: List private endpoint connections for a topic.
+    syntax: az eventgrid topic private-endpoint-connection list -g rg1 --topic-name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_reject
+  name: az eventgrid topic private-endpoint-connection reject
+  summary: Reject a private endpoint connection request for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection reject --name
+                                                          --resource-group
+                                                          --topic-name
+                                                          [--description]
+  examples:
+  - summary: Reject a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-endpoint-connection reject -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Comments for the rejection.
+    description: ''
+- uid: az_eventgrid_topic_private-endpoint-connection_show
+  name: az eventgrid topic private-endpoint-connection show
+  summary: Display the properties of a private endpoint connection for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-endpoint-connection show --name
+                                                        --resource-group
+                                                        --topic-name
+  examples:
+  - summary: Show a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-endpoint-connection show -g rg1 --topic-name topic1 -n connectionName1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private endpoint connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+commands:
+- az_eventgrid_topic_private-endpoint-connection_approve
+- az_eventgrid_topic_private-endpoint-connection_delete
+- az_eventgrid_topic_private-endpoint-connection_list
+- az_eventgrid_topic_private-endpoint-connection_reject
+- az_eventgrid_topic_private-endpoint-connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private endpoint connections of a topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/private-link-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/private-link-resource.yml
new file mode 100644
index 0000000000..3e29c0d00b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/eventgrid/topic/private-link-resource.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_eventgrid_topic_private-link-resource
+name: az eventgrid topic private-link-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **eventgrid** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az eventgrid topic private-link-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private link resource of a topic.
+description: ''
+directCommands:
+- uid: az_eventgrid_topic_private-link-resource_list
+  name: az eventgrid topic private-link-resource list
+  summary: List the properties of all the private link resources for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-link-resource list --resource-group
+                                                  --topic-name
+  examples:
+  - summary: Show a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-link-resource list -g rg1 --topic-name topic1
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+- uid: az_eventgrid_topic_private-link-resource_show
+  name: az eventgrid topic private-link-resource show
+  summary: Display the properties of a private link resource for a topic.
+  description: ''
+  syntax: >-
+    az eventgrid topic private-link-resource show --name
+                                                  --resource-group
+                                                  --topic-name
+  examples:
+  - summary: Show a private endpoint connection for a topic.
+    syntax: az eventgrid topic private-link-resource show -g rg1 --topic-name topic1 -n topic
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private link resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --topic-name
+    summary: Name of the topic.
+    description: ''
+commands:
+- az_eventgrid_topic_private-link-resource_list
+- az_eventgrid_topic_private-link-resource_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private link resource of a topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/account/account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/account/account.yml
deleted file mode 100644
index 6ce3c12eba..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/account/account.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_account_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_account_az_account_subscription
-  name: az account subscription
-  summary: Manage subscriptions.
-- uid: ext_account_az_account_subscription_cancel
-  name: az account subscription cancel
-  summary: Cancel subscription.
-- uid: ext_account_az_account_subscription_create
-  name: az account subscription create
-  summary: Create a new WebDirect or EA Azure subscription.
-- uid: ext_account_az_account_subscription_create_csp
-  name: az account subscription create-csp
-  summary: Create a new CSP subscription.
-- uid: ext_account_az_account_subscription_create_in_enrollment_account
-  name: az account subscription create-in-enrollment-account
-  summary: Create subscription in enrolment account.
-- uid: ext_account_az_account_subscription_enable
-  name: az account subscription enable
-  summary: Enable subscription.
-- uid: ext_account_az_account_subscription_rename
-  name: az account subscription rename
-  summary: Rename subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure subscription information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/account/account/subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/account/account/subscription.yml
deleted file mode 100644
index 56ee324868..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/account/account/subscription.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_account_az_account_subscription
-  name: az account subscription
-  summary: Manage subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_account_az_account_subscription_cancel
-  - ext_account_az_account_subscription_create
-  - ext_account_az_account_subscription_create_csp
-  - ext_account_az_account_subscription_create_in_enrollment_account
-  - ext_account_az_account_subscription_enable
-  - ext_account_az_account_subscription_rename
-- uid: ext_account_az_account_subscription_cancel
-  name: az account subscription cancel
-  summary: Cancel subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel subscription
-    syntax:
-      content: az account subscription cancel --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --subscription-id
-    summary: Subscription Id.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_account_az_account_subscription_create
-  name: az account subscription create
-  summary: Create a new WebDirect or EA Azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create subscription
-    syntax:
-      content: >-
-        az account subscription create --billing-account-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx_XXXX-XX-XX" \
-
-        --billing-profile-name "27VR-HDWX-BG7-TGB" --cost-center "135366376" --display-name \
-
-        "Contoso MCA subscription" --owner xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx \
-
-        --sku-id "0001" --invoice-section-name "JGF7-NSBG-PJA-TGB"
-  parameters:
-  - isRequired: true
-    name: --billing-account-name
-    summary: The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --billing-profile-name
-    summary: The name of the billing profile in the billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --display-name
-    summary: The friendly name of the subscription.
-    description: ''
-  - isRequired: true
-    name: --invoice-section-name
-    summary: The name of the invoice section in the billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --sku-id
-    summary: The SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
-    description: ''
-  - name: --cost-center
-    summary: If set, the cost center will show up on the Azure usage and charges file.
-    description: ''
-  - name: --management-group-id
-    summary: The identifier of the management group to which this subscription will be associated.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --owner
-    summary: Active Directory Principal who’ll get owner access on the new subscription.
-    description: ''
-- uid: ext_account_az_account_subscription_create_csp
-  name: az account subscription create-csp
-  summary: Create a new CSP subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create CSP subscription
-    syntax:
-      content: >-
-        az account subscription create-csp --billing-account-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx_XXXX-XX-XX" \
-
-        --display-name "Contoso MCA subscription" --sku-id "0001" --customer-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --billing-account-name
-    summary: The name of the Microsoft Customer Agreement billing account for which you want to create the subscription.
-    description: ''
-  - isRequired: true
-    name: --customer-name
-    summary: The name of the customer.
-    description: ''
-  - isRequired: true
-    name: --display-name
-    summary: The friendly name of the subscription.
-    description: ''
-  - isRequired: true
-    name: --sku-id
-    summary: The SKU ID of the Azure plan. Azure plan determines the pricing and service-level agreement of the subscription.  Use 001 for Microsoft Azure Plan and 002 for Microsoft Azure Plan for DevTest.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --reseller-id
-    summary: Reseller ID, basically MPN Id.
-    description: ''
-- uid: ext_account_az_account_subscription_create_in_enrollment_account
-  name: az account subscription create-in-enrollment-account
-  summary: Create subscription in enrolment account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create subscription in enrollment account
-    syntax:
-      content: >-
-        az account subscription create-in-enrollment-account --display-name \
-
-        "Test Ea Azure Sub" --offer-type "MS-AZR-0017P" --owners \
-
-        xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx \
-
-        xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --enrollment-account-name \
-
-        "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --enrollment-account-name
-    summary: The name of the enrollment account to which the subscription will be billed.
-    description: ''
-  - name: --display-name
-    summary: The display name of the subscription.
-    description: ''
-  - name: --management-group-id
-    summary: The Management Group Id.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --offer-type
-    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
-    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available. Only valid when creating a subscription in a enrollment account scope.
-    description: ''
-  - name: --owners
-    summary: The list of principals that should be granted Owner access on the subscription. Principals should be of type User, Service Principal or Security Group.
-    description: ''
-- uid: ext_account_az_account_subscription_enable
-  name: az account subscription enable
-  summary: Enable subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable subscription
-    syntax:
-      content: az account subscription enable --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --subscription-id
-    summary: Subscription Id.
-    description: ''
-- uid: ext_account_az_account_subscription_rename
-  name: az account subscription rename
-  summary: Rename subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Rename subscription
-    syntax:
-      content: az account subscription rename --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --subscription-id
-    summary: Subscription Id.
-    description: ''
-  - name: --subscription-name
-    summary: New subscription name.
-    description: ''
-commands:
-- uid: ext_account_az_account_subscription_cancel
-  name: az account subscription cancel
-  summary: Cancel subscription.
-- uid: ext_account_az_account_subscription_create
-  name: az account subscription create
-  summary: Create a new WebDirect or EA Azure subscription.
-- uid: ext_account_az_account_subscription_create_csp
-  name: az account subscription create-csp
-  summary: Create a new CSP subscription.
-- uid: ext_account_az_account_subscription_create_in_enrollment_account
-  name: az account subscription create-in-enrollment-account
-  summary: Create subscription in enrolment account.
-- uid: ext_account_az_account_subscription_enable
-  name: az account subscription enable
-  summary: Enable subscription.
-- uid: ext_account_az_account_subscription_rename
-  name: az account subscription rename
-  summary: Rename subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/account/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/account/index.yml
deleted file mode 100644
index 84da9c46ce..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/account/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_account_az
-  name: account
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_account_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/aem/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/aem/index.yml
deleted file mode 100644
index c6dccf0041..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/aem/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aem_az
-  name: aem
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_aem_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm.yml
deleted file mode 100644
index 6c69576acb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aem_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_aem_az_vm_aem
-  name: az vm aem
-  summary: Manage Azure Enhanced Monitoring Extension for SAP.
-- uid: ext_aem_az_vm_aem_delete
-  name: az vm aem delete
-  summary: Remove Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_set
-  name: az vm aem set
-  summary: Configure Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_verify
-  name: az vm aem verify
-  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Linux or Windows virtual machines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm/aem.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm/aem.yml
deleted file mode 100644
index 6a382f7b2e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/aem/vm/aem.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aem_az_vm_aem
-  name: az vm aem
-  summary: Manage Azure Enhanced Monitoring Extension for SAP.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_aem_az_vm_aem_delete
-  - ext_aem_az_vm_aem_set
-  - ext_aem_az_vm_aem_verify
-- uid: ext_aem_az_vm_aem_delete
-  name: az vm aem delete
-  summary: Remove Azure Enhanced Monitoring Extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aem_az_vm_aem_set
-  name: az vm aem set
-  summary: Configure Azure Enhanced Monitoring Extension.
-  description: It can take up to 15 minutes for the monitoring data to appear in the SAP system.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --skip-storage-analytics
-    summary: Skip enabling analytics on storage accounts.
-    description: ''
-- uid: ext_aem_az_vm_aem_verify
-  name: az vm aem verify
-  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --skip-storage-check
-    summary: Disables the test for table content.
-    description: ''
-  - name: --wait-time-in-minutes
-    defaultValue: "15"
-    summary: Maximum minutes to wait for the storage metrics to be available.
-    description: ''
-commands:
-- uid: ext_aem_az_vm_aem_delete
-  name: az vm aem delete
-  summary: Remove Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_set
-  name: az vm aem set
-  summary: Configure Azure Enhanced Monitoring Extension.
-- uid: ext_aem_az_vm_aem_verify
-  name: az vm aem verify
-  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Enhanced Monitoring Extension for SAP.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-did-you-mean-this/ai-did-you-mean-this.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ai-did-you-mean-this/ai-did-you-mean-this.yml
deleted file mode 100644
index f68833b774..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-did-you-mean-this/ai-did-you-mean-this.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-  name: az ai-did-you-mean-this
-  summary: Add recommendations for recovering from failure.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-  name: az ai-did-you-mean-this version
-  summary: Prints the extension version.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-  name: az ai-did-you-mean-this version
-  summary: Prints the extension version.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Add recommendations for recovering from failure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-did-you-mean-this/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ai-did-you-mean-this/index.yml
deleted file mode 100644
index b58077c5d6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-did-you-mean-this/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-did-you-mean-this_az
-  name: ai-did-you-mean-this
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-  name: az ai-did-you-mean-this
-  summary: Add recommendations for recovering from failure.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/ai-examples.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/ai-examples.yml
deleted file mode 100644
index a8ff64bd94..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/ai-examples.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-examples_az_ai_examples
-  name: az ai-examples
-  summary: Add AI powered examples to help content.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_ai-examples_az_ai_examples_check_connection
-- uid: ext_ai-examples_az_ai_examples_check_connection
-  name: az ai-examples check-connection
-  summary: Check if the client can connect to the AI example service.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_ai-examples_az_ai_examples_check_connection
-  name: az ai-examples check-connection
-  summary: Check if the client can connect to the AI example service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Add AI powered examples to help content.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/index.yml
deleted file mode 100644
index 06ad6d31a2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ai-examples/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ai-examples_az
-  name: ai-examples
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ai-examples_az_ai_examples
-  name: az ai-examples
-  summary: Add AI powered examples to help content.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks.yml
deleted file mode 100644
index 34113881ca..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks.yml
+++ /dev/null
@@ -1,906 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aks-preview_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_aks-preview_az_aks_browse
-  - ext_aks-preview_az_aks_create
-  - ext_aks-preview_az_aks_disable_addons
-  - ext_aks-preview_az_aks_enable_addons
-  - ext_aks-preview_az_aks_get_credentials
-  - ext_aks-preview_az_aks_get_upgrades
-  - ext_aks-preview_az_aks_get_versions
-  - ext_aks-preview_az_aks_kanalyze
-  - ext_aks-preview_az_aks_kollect
-  - ext_aks-preview_az_aks_rotate_certs
-  - ext_aks-preview_az_aks_scale
-  - ext_aks-preview_az_aks_show
-  - ext_aks-preview_az_aks_update
-  - ext_aks-preview_az_aks_upgrade
-  - ext_aks-preview_az_aks_wait
-- uid: ext_aks-preview_az_aks_browse
-  name: az aks browse
-  summary: Show the dashboard for a Kubernetes cluster in a web browser.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the dashboard for a Kubernetes cluster in a web browser. (autogenerated)
-    syntax:
-      content: az aks browse --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disable-browser
-    summary: Don't launch a web browser after establishing port-forwarding.
-    description: Add this argument when launching a web browser manually, or for automated testing.
-  - name: --listen-address
-    defaultValue: 127.0.0.1
-    summary: The listening address for the dashboard.
-    description: Add this argument to listen on a specific IP address.
-  - name: --listen-port
-    defaultValue: "8001"
-    summary: The listening port for the dashboard.
-    description: Add this argument when the default listening port is used by another process or unavailable.
-- uid: ext_aks-preview_az_aks_create
-  name: az aks create
-  summary: Create a new managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Kubernetes cluster with an existing SSH public key.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
-  - summary: Create a Kubernetes cluster with a specific version.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9
-  - summary: Create a Kubernetes cluster with a larger node pool.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --node-count 7
-  - summary: Create a kubernetes cluster with cluster autosclaler enabled.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --node-count 3 --enable-cluster-autoscaler --min-count 1 --max-count 5
-  - summary: Create a kubernetes cluster with k8s 1.13.9 but use vmas.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --vm-set-type AvailabilitySet
-  - summary: Create a kubernetes cluster with default kubernetes vesrion, default SKU load balancer(standard) and default vm set type(VirtualMachineScaleSets).
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster
-  - summary: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
-  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
-  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
-  - summary: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
-  - summary: Create a kubernetes cluster with basic SKU load balancer and AvailabilitySet vm set type.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku basic --vm-set-type AvailabilitySet
-  - summary: Create a kubernetes cluster with authorized apiserver IP ranges.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24,195.168.1.0
-  - summary: Create a kubernetes cluster with server side encryption using your owned key.
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-diskencryptionset-id <disk-encryption-set-resource-id>
-  - summary: Create a kubernetes cluster with userDefinedRouting, standard load balancer SKU and a custom subnet preconfigured with a route table
-    syntax:
-      content: az aks create -g MyResourceGroup -n MyManagedCluster --outbound-type userDefinedRouting --load-balancer-sku standard --vnet-subnet-id customUserSubnetVnetID
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --aad-admin-group-object-ids
-    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
-    description: ''
-  - name: --aad-client-app-id
-    summary: The ID of an Azure Active Directory client application of type "Native". This application is for user login via kubectl.
-    description: ''
-  - name: --aad-server-app-id
-    summary: The ID of an Azure Active Directory server application of type "Web app/API". This application represents the managed cluster's apiserver (Server application).
-    description: ''
-  - name: --aad-server-app-secret
-    summary: The secret of an Azure Active Directory server application.
-    description: ''
-  - name: --aad-tenant-id
-    summary: The ID of an Azure Active Directory tenant.
-    description: ''
-  - name: --admin-username -u
-    defaultValue: azureuser
-    summary: User account to create on node VMs for SSH access.
-    description: ''
-  - name: --aks-custom-headers
-    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
-    description: ''
-  - name: --api-server-authorized-ip-ranges
-    summary: Comma seperated list of authorized apiserver IP ranges. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
-    description: ''
-  - name: --appgw-id
-    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-name
-    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-id
-    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-prefix
-    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-watch-namespace
-    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
-    description: ''
-  - name: --attach-acr
-    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
-    description: ''
-  - name: --client-secret
-    summary: Secret associated with the service principal. This argument is required if `--service-principal` is specified.
-    description: ''
-  - name: --cluster-autoscaler-profile
-    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
-    description: ''
-  - name: --disable-rbac
-    summary: Disable Kubernetes Role-Based Access Control.
-    description: ''
-  - name: --dns-name-prefix -p
-    summary: Prefix for hostnames that are created. If not specified, generate a hostname using the managed cluster and resource group names.
-    description: ''
-  - name: --dns-service-ip
-    summary: An IP address assigned to the Kubernetes DNS service.
-    description: This address must be within the Kubernetes service address range specified by "--service-cidr". For example, 10.0.0.10.
-  - name: --docker-bridge-address
-    summary: A specific IP address and netmask for the Docker bridge, using standard CIDR notation.
-    description: This address must not be in any Subnet IP ranges, or the Kubernetes service address range. For example, 172.17.0.1/16.
-  - name: --enable-aad
-    summary: Enable managed AAD feature for cluster.
-    description: ''
-  - name: --enable-addons -a
-    summary: Enable the Kubernetes addons in a comma-separated list.
-    description: >-
-      These addons are available:
-          http_application_routing  - configure ingress with automatic public DNS name creation.
-          monitoring                - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
-                                      If monitoring addon is enabled --no-wait argument will have no effect
-          virtual-node              - enable AKS Virtual Node (PREVIEW). Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
-          azure-policy              - enable Azure policy (PREVIEW).
-          ingress-appgw             - enable Applicaiton Gateway Ingress Controller addon (PREVIEW).
-  - name: --enable-cluster-autoscaler
-    summary: Enable cluster autoscaler, default value is false.
-    description: If specified, please make sure the kubernetes version is larger than 1.10.6.
-  - name: --enable-managed-identity
-    summary: (PREVIEW) Using a system assigned managed identity to manage cluster resource group.
-    description: ''
-  - name: --enable-node-public-ip
-    summary: Enable VMSS node public IP.
-    description: ''
-  - name: --enable-pod-security-policy
-    summary: (PREVIEW) Enable pod security policy.
-    description: ''
-  - name: --enable-private-cluster
-    summary: Enable private cluster.
-    description: ''
-  - name: --enable-rbac -r
-    summary: 'Enable Kubernetes Role-Based Access Control. Default: enabled.'
-    description: ''
-  - name: --enable-vmss
-    summary: To be deprecated. Use vm_set_type instead.
-    description: ''
-  - name: --generate-ssh-keys
-    summary: Generate SSH public and private key files if missing.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
-    description: ''
-    valueFrom: '`az aks get-versions`'
-  - name: --load-balancer-idle-timeout
-    summary: Load balancer idle timeout in minutes.
-    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120].
-  - name: --load-balancer-managed-outbound-ip-count
-    summary: Load balancer managed outbound IP count.
-    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
-  - name: --load-balancer-outbound-ip-prefixes
-    summary: Load balancer outbound IP prefix resource IDs.
-    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
-  - name: --load-balancer-outbound-ips
-    summary: Load balancer outbound IP resource IDs.
-    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
-  - name: --load-balancer-outbound-ports
-    summary: Load balancer outbound allocated ports.
-    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
-  - name: --load-balancer-sku
-    summary: Azure Load Balancer SKU selection for your cluster. basic or standard.
-    description: Select between Basic or Standard Azure Load Balancer SKU for your AKS cluster.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --max-pods -m
-    summary: The maximum number of pods deployable to a node.
-    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --network-plugin
-    parameterValueGroup: azure, kubenet
-    summary: The Kubernetes network plugin to use.
-    description: Specify "azure" for advanced networking configurations. Defaults to "kubenet".
-  - name: --network-policy
-    summary: (PREVIEW) The Kubernetes network policy to use.
-    description: >-
-      Using together with "azure" network plugin.
-
-      Specify "azure" for Azure network policy manager and "calico" for calico network policy controller.
-
-      Defaults to "" (network policy disabled).
-  - name: --no-ssh-key -x
-    summary: Do not use or create a local SSH key.
-    description: To access nodes after creating a cluster with this option, use the Azure Portal.
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-count -c
-    defaultValue: "3"
-    summary: Number of nodes in the Kubernetes node pool. It is required when --enable-cluster-autoscaler specified. After creating a cluster, you can change the size of its node pool with `az aks scale`.
-    description: ''
-  - name: --node-osdisk-diskencryptionset-id
-    summary: ResourceId of the disk encryption set to use for enabling encryption at rest.
-    description: ''
-  - name: --node-osdisk-size
-    summary: Size in GB of the OS disk for each node in the node pool. Minimum 30 GB.
-    description: ''
-  - name: --node-resource-group
-    summary: The node resource group is the resource group where all customer's resources will be created in, such as virtual machines.
-    description: ''
-  - name: --node-vm-size -s
-    defaultValue: Standard_DS2_v2
-    summary: Size of Virtual Machines to create as Kubernetes nodes.
-    description: ''
-  - name: --node-zones --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: (--node-zones will be deprecated, use --zones) Space-separated list of availability zones where agent nodes will be placed.
-    description: ''
-  - name: --nodepool-labels
-    summary: 'Space-separated labels: key[=value] [key[=value] ...]. You can not change the node labels through CLI after creation. See <a href="https://aka.ms/node-labels">https://aka.ms/node-labels</a> for syntax of labels.'
-    description: ''
-  - name: --nodepool-name
-    defaultValue: nodepool1
-    summary: Node pool name, upto 12 alphanumeric characters.
-    description: ''
-  - name: --nodepool-tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --outbound-type
-    parameterValueGroup: loadBalancer, userDefinedRouting
-    summary: How outbound traffic will be configured for a cluster.
-    description: Select between loadBalancer and userDefinedRouting. If not set, defaults to type loadBalancer. Requires --vnet-subnet-id to be provided with a preconfigured route table and --load-balancer-sku to be Standard.
-  - name: --pod-cidr
-    summary: A CIDR notation IP range from which to assign pod IPs when kubenet is used.
-    description: This range must not overlap with any Subnet IP ranges. For example, 172.244.0.0/16.
-  - name: --service-cidr
-    summary: A CIDR notation IP range from which to assign service cluster IPs.
-    description: This range must not overlap with any Subnet IP ranges. For example, 10.0.0.0/16.
-  - name: --service-principal
-    summary: Service principal used for authentication to Azure APIs.
-    description: If not specified, a new service principal is created and cached at $HOME.azureaksServicePrincipal.json to be used by subsequent `az aks` commands.
-  - name: --skip-subnet-role-assignment
-    summary: Skip role assignment for subnet (advanced networking).
-    description: If specified, please make sure your service principal has the access to your subnet.
-  - name: --ssh-key-value
-    defaultValue: ~\.ssh\id_rsa.pub
-    summary: Public key path or key contents to install on node VMs for SSH access. For example, 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --uptime-sla
-    summary: Enable a paid managed cluster service with a financially backed SLA.
-    description: ''
-  - name: --vm-set-type
-    summary: Agent pool vm set type. VirtualMachineScaleSets or AvailabilitySet.
-    description: ''
-  - name: --vnet-subnet-id
-    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
-    description: ''
-  - name: --windows-admin-password
-    summary: User account password to use on windows node VMs.
-    description: ''
-  - name: --windows-admin-username
-    summary: User account to create on windows node VMs.
-    description: ''
-  - name: --workspace-resource-id
-    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data. If not specified, uses the default Log Analytics Workspace if it exists, otherwise creates one.
-    description: ''
-- uid: ext_aks-preview_az_aks_disable_addons
-  name: az aks disable-addons
-  summary: Disable Kubernetes addons.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Disable Kubernetes addons. (autogenerated)
-    syntax:
-      content: az aks disable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --addons -a
-    summary: Disable the Kubernetes addons in a comma-separated list.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_aks-preview_az_aks_enable_addons
-  name: az aks enable-addons
-  summary: Enable Kubernetes addons.
-  description: >-
-    These addons are available:
-        http_application_routing  - configure ingress with automatic public DNS name creation.
-        monitoring                - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
-                                    If monitoring addon is enabled --no-wait argument will have no effect
-        virtual-node              - enable AKS Virtual Node (PREVIEW). Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
-        azure-policy              - enable Azure policy (PREVIEW).
-        ingress-appgw             - enable Application Gateway Ingress Controller addon (PREVIEW).
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable Kubernetes addons. (autogenerated)
-    syntax:
-      content: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet-name VirtualNodeSubnet
-  - summary: Enable ingress-appgw addon with subnet prefix.
-    syntax:
-      content: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-prefix 10.2.0.0/16 --appgw-name gateway
-  parameters:
-  - isRequired: true
-    name: --addons -a
-    summary: Enable the Kubernetes addons in a comma-separated list.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --appgw-id
-    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-name
-    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-id
-    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-subnet-prefix
-    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
-    description: ''
-  - name: --appgw-watch-namespace
-    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces. Use with ingress-azure addon.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --subnet-name -s
-    summary: The subnet name for the virtual node to use.
-    description: ''
-  - name: --workspace-resource-id
-    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data.
-    description: ''
-- uid: ext_aks-preview_az_aks_get_credentials
-  name: az aks get-credentials
-  summary: Get access credentials for a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get access credentials for a managed Kubernetes cluster. (autogenerated)
-    syntax:
-      content: az aks get-credentials --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --admin -a
-    summary: 'Get cluster administrator credentials.  Default: cluster user credentials.'
-    description: ''
-  - name: --context
-    summary: If specified, overwrite the default context name.
-    description: ''
-  - name: --file -f
-    defaultValue: ~/.kube/config
-    summary: Kubernetes configuration file to update. Use "-" to print YAML to stdout instead.
-    description: ''
-  - name: --overwrite-existing
-    summary: Overwrite any existing cluster entry with the same name.
-    description: ''
-  - name: --user -u
-    defaultValue: clusterUser
-    summary: 'Get credentials for the user. Only valid when --admin is False.  Default: cluster user credentials.'
-    description: ''
-- uid: ext_aks-preview_az_aks_get_upgrades
-  name: az aks get-upgrades
-  summary: Get the upgrade versions available for a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the upgrade versions available for a managed Kubernetes cluster
-    syntax:
-      content: az aks get-upgrades --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_get_versions
-  name: az aks get-versions
-  summary: Get the versions available for creating a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the versions available for creating a managed Kubernetes cluster
-    syntax:
-      content: az aks get-versions --location westus2
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-- uid: ext_aks-preview_az_aks_kanalyze
-  name: az aks kanalyze
-  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_kollect
-  name: az aks kollect
-  summary: Collecting diagnostic information for the Kubernetes cluster.
-  description: >-
-    Collect diagnostic information for the Kubernetes cluster and store it in the specified storage account.
-
-    You can provide the storage account in three ways:
-      storage account name and a shared access signature with write permission.
-      resource Id to a storage account you own.
-      the storagea account in diagnostics settings for your managed cluster.
-  langs:
-  - azurecli
-  examples:
-  - summary: using storage account name and a shared access signature token with write permission
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account MyStorageAccount --sas-token "MySasToken"
-  - summary: using the resource id of a storagea account resource you own.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account "MyStoreageAccountResourceId"
-  - summary: using the storagea account in diagnostics settings for your managed cluster.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster
-  - summary: customize the container logs to collect.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --container-logs "mynamespace1/mypod1 myns2"
-  - summary: customize the kubernetes objects to collect.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --kube-objects "mynamespace1/service myns2/deployment/deployment1"
-  - summary: customize the node log files to collect.
-    syntax:
-      content: az aks kollect -g MyResourceGroup -n MyManagedCluster --node-logs "/var/log/azure-vnet.log /var/log/azure-vnet-ipam.log"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --container-logs
-    summary: The list of container logs to collect.
-    description: >-
-      The list of container logs to collect. Its value can be either all containers
-
-      in a namespace, for example, kube-system, or a specific container in a
-
-      namespace, for example, kube-system/tunnelfront.
-  - name: --kube-objects
-    summary: The list of kubernetes objects to describe.
-    description: >-
-      The list of kubernetes objects to describe. Its value can be either all objects of a type
-
-      in a namespace, for example, kube-system/pod, or a specific object of a type in a namespace,
-
-      for example, kube-system/deployment/tunnelfront.
-  - name: --node-logs
-    summary: The list of node logs to collect. For example, /var/log/cloud-init.log.
-    description: ''
-  - name: --sas-token
-    summary: The SAS token with writable permission for the storage account.
-    description: ''
-  - name: --storage-account
-    summary: Name or ID of the storage account to save the diagnostic information.
-    description: ''
-- uid: ext_aks-preview_az_aks_rotate_certs
-  name: az aks rotate-certs
-  summary: Rotate certificates and keys on a managed Kubernetes cluster.
-  description: Kubernetes will be unavailable during cluster certificate rotation.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_aks-preview_az_aks_scale
-  name: az aks scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --node-count -c
-    summary: Number of nodes in the Kubernetes node pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --nodepool-name
-    summary: Node pool name, upto 12 alphanumeric characters.
-    description: ''
-- uid: ext_aks-preview_az_aks_show
-  name: az aks show
-  summary: Show the details for a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details for a managed Kubernetes cluster
-    syntax:
-      content: az aks show --name MyManagedCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_update
-  name: az aks update
-  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable cluster-autoscaler within node count range [1,5]
-    syntax:
-      content: az aks update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n MyManagedCluster
-  - summary: Disable cluster-autoscaler for an existing cluster
-    syntax:
-      content: az aks update --disable-cluster-autoscaler -g MyResourceGroup -n MyManagedCluster
-  - summary: Update min-count or max-count for cluster autoscaler.
-    syntax:
-      content: az aks update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n MyManagedCluster
-  - summary: Enable pod security policy.
-    syntax:
-      content: az aks update --enable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
-  - summary: Disable pod security policy.
-    syntax:
-      content: az aks update --disable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
-  - summary: Update a kubernetes cluster with standard SKU load balancer to use two AKS created IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
-  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
-  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
-  - summary: Update a kubernetes cluster with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
-  - summary: Update a kubernetes cluster with authorized apiserver ip ranges.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24
-  - summary: Disable authorized apiserver ip ranges feature for a kubernetes cluster.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges ""
-  - summary: Restrict apiserver traffic in a kubernetes cluster to agentpool nodes.
-    syntax:
-      content: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 0.0.0.0/32
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --aad-admin-group-object-ids
-    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
-    description: ''
-  - name: --aad-tenant-id
-    summary: The ID of an Azure Active Directory tenant.
-    description: ''
-  - name: --aks-custom-headers
-    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
-    description: ''
-  - name: --api-server-authorized-ip-ranges
-    summary: Comma seperated list of authorized apiserver IP ranges. Set to "" to allow all traffic on a previously restricted cluster. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
-    description: ''
-  - name: --attach-acr
-    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
-    description: ''
-  - name: --cluster-autoscaler-profile
-    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
-    description: ''
-  - name: --detach-acr
-    summary: Disable the 'acrpull' role assignment to the ACR specified by name or resource ID.
-    description: ''
-  - name: --disable-cluster-autoscaler -d
-    summary: Disable cluster autoscaler.
-    description: ''
-  - name: --disable-pod-security-policy
-    summary: (PREVIEW) Disable pod security policy.
-    description: ''
-  - name: --enable-cluster-autoscaler -e
-    summary: Enable cluster autoscaler.
-    description: ''
-  - name: --enable-pod-security-policy
-    summary: (PREVIEW) Enable pod security policy.
-    description: ''
-  - name: --load-balancer-idle-timeout
-    summary: Load balancer idle timeout in minutes.
-    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 120].
-  - name: --load-balancer-managed-outbound-ip-count
-    summary: Load balancer managed outbound IP count.
-    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
-  - name: --load-balancer-outbound-ip-prefixes
-    summary: Load balancer outbound IP prefix resource IDs.
-    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
-  - name: --load-balancer-outbound-ips
-    summary: Load balancer outbound IP resource IDs.
-    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
-  - name: --load-balancer-outbound-ports
-    summary: Load balancer outbound allocated ports.
-    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --update-cluster-autoscaler -u
-    summary: Update min-count or max-count for cluster autoscaler.
-    description: ''
-- uid: ext_aks-preview_az_aks_upgrade
-  name: az aks upgrade
-  summary: Upgrade a managed Kubernetes cluster to a newer version.
-  description: Kubernetes will be unavailable during cluster upgrades.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --control-plane-only
-    summary: Upgrade the cluster control plane only. If not specified, control plane AND all node pools will be upgraded.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to upgrade the cluster to, such as "1.11.12".
-    description: ''
-    valueFrom: '`az aks get-upgrades`'
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-image-only
-    summary: Only upgrade node image for agent pools.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_aks-preview_az_aks_wait
-  name: az aks wait
-  summary: Wait for a managed Kubernetes cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  examples:
-  - summary: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes.
-    syntax:
-      content: az aks wait -g MyResourceGroup -n MyManagedCluster --updated --interval 60 --timeout 1800
-  - summary: Wait for a managed Kubernetes cluster to reach a desired state (autogenerated)
-    syntax:
-      content: az aks wait --created --interval 60 --name MyManagedCluster --resource-group MyResourceGroup --timeout 1800
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_aks-preview_az_aks_browse
-  name: az aks browse
-  summary: Show the dashboard for a Kubernetes cluster in a web browser.
-- uid: ext_aks-preview_az_aks_create
-  name: az aks create
-  summary: Create a new managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_disable_addons
-  name: az aks disable-addons
-  summary: Disable Kubernetes addons.
-- uid: ext_aks-preview_az_aks_enable_addons
-  name: az aks enable-addons
-  summary: Enable Kubernetes addons.
-- uid: ext_aks-preview_az_aks_get_credentials
-  name: az aks get-credentials
-  summary: Get access credentials for a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_get_upgrades
-  name: az aks get-upgrades
-  summary: Get the upgrade versions available for a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_get_versions
-  name: az aks get-versions
-  summary: Get the versions available for creating a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_kanalyze
-  name: az aks kanalyze
-  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
-- uid: ext_aks-preview_az_aks_kollect
-  name: az aks kollect
-  summary: Collecting diagnostic information for the Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool
-  name: az aks nodepool
-  summary: Commands to manage node pools in Kubernetes kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_add
-  name: az aks nodepool add
-  summary: Add a node pool to the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_delete
-  name: az aks nodepool delete
-  summary: Delete the agent pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_list
-  name: az aks nodepool list
-  summary: List node pools in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_scale
-  name: az aks nodepool scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_show
-  name: az aks nodepool show
-  summary: Show the details for a node pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_update
-  name: az aks nodepool update
-  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
-- uid: ext_aks-preview_az_aks_nodepool_upgrade
-  name: az aks nodepool upgrade
-  summary: Upgrade the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_rotate_certs
-  name: az aks rotate-certs
-  summary: Rotate certificates and keys on a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_scale
-  name: az aks scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_show
-  name: az aks show
-  summary: Show the details for a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_update
-  name: az aks update
-  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
-- uid: ext_aks-preview_az_aks_upgrade
-  name: az aks upgrade
-  summary: Upgrade a managed Kubernetes cluster to a newer version.
-- uid: ext_aks-preview_az_aks_wait
-  name: az aks wait
-  summary: Wait for a managed Kubernetes cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kubernetes Services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml
deleted file mode 100644
index 657320820c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/aks/nodepool.yml
+++ /dev/null
@@ -1,323 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aks-preview_az_aks_nodepool
-  name: az aks nodepool
-  summary: Commands to manage node pools in Kubernetes kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_aks-preview_az_aks_nodepool_add
-  - ext_aks-preview_az_aks_nodepool_delete
-  - ext_aks-preview_az_aks_nodepool_list
-  - ext_aks-preview_az_aks_nodepool_scale
-  - ext_aks-preview_az_aks_nodepool_show
-  - ext_aks-preview_az_aks_nodepool_update
-  - ext_aks-preview_az_aks_nodepool_upgrade
-- uid: ext_aks-preview_az_aks_nodepool_add
-  name: az aks nodepool add
-  summary: Add a node pool to the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --aks-custom-headers
-    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
-    description: ''
-  - name: --enable-cluster-autoscaler -e
-    summary: Enable cluster autoscaler.
-    description: ''
-  - name: --enable-node-public-ip
-    summary: Enable VMSS node public IP.
-    description: ''
-  - name: --eviction-policy
-    defaultValue: Delete
-    parameterValueGroup: Deallocate, Delete
-    summary: The eviction policy of the Spot node pool. It can only be set when --priority is Spot.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
-    description: ''
-    valueFrom: '`az aks get-versions`'
-  - name: --labels
-    summary: The node labels for the node pool. You can't change the node labels through CLI after the node pool is created. See <a href="https://aka.ms/node-labels">https://aka.ms/node-labels</a> for syntax of labels.
-    description: ''
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --max-pods -m
-    summary: The maximum number of pods deployable to a node.
-    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
-  - name: --max-surge
-    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
-    description: ''
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --mode
-    defaultValue: User
-    parameterValueGroup: System, User
-    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at <a href="https://aka.ms/aks/nodepool/mode">https://aka.ms/aks/nodepool/mode</a>.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-count -c
-    defaultValue: "3"
-    summary: Number of nodes in the Kubernetes agent pool. After creating a cluster, you can change the size of its node pool with `az aks scale`.
-    description: ''
-  - name: --node-osdisk-size
-    summary: Size in GB of the OS disk for each node in the agent pool. Minimum 30 GB.
-    description: ''
-  - name: --node-taints
-    summary: The node taints for the node pool. You can't change the node taints through CLI after the node pool is created.
-    description: ''
-  - name: --node-vm-size -s
-    summary: Size of Virtual Machines to create as Kubernetes nodes.
-    description: ''
-  - name: --node-zones --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: (will be deprecated, use --zones) Availability zones where agent nodes will be placed.
-    description: ''
-  - name: --os-type
-    defaultValue: Linux
-    summary: The OS Type. Linux or Windows.
-    description: ''
-  - name: --priority
-    defaultValue: Regular
-    parameterValueGroup: Regular, Spot
-    summary: The priority of the node pool.
-    description: ''
-  - name: --spot-max-price
-    defaultValue: nan
-    summary: It can only be set when --priority is Spot. Specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. It can only include up to 5 decimal places.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vnet-subnet-id
-    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_delete
-  name: az aks nodepool delete
-  summary: Delete the agent pool in the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_list
-  name: az aks nodepool list
-  summary: List node pools in the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_scale
-  name: az aks nodepool scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-count -c
-    defaultValue: "3"
-    summary: Number of nodes in the Kubernetes node pool.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_show
-  name: az aks nodepool show
-  summary: Show the details for a node pool in the managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_update
-  name: az aks nodepool update
-  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable cluster-autoscaler within node count range [1,5]
-    syntax:
-      content: az aks nodepool update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  - summary: Disable cluster-autoscaler for an existing cluster
-    syntax:
-      content: az aks nodepool update --disable-cluster-autoscaler -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  - summary: Update min-count or max-count for cluster autoscaler.
-    syntax:
-      content: az aks nodepool update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  - summary: Change a node pool to system mode
-    syntax:
-      content: az aks nodepool update --mode System -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disable-cluster-autoscaler -d
-    summary: Disable cluster autoscaler.
-    description: ''
-  - name: --enable-cluster-autoscaler -e
-    summary: Enable cluster autoscaler.
-    description: ''
-  - name: --max-count
-    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --max-surge
-    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
-    description: ''
-  - name: --min-count
-    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
-    description: ''
-  - name: --mode
-    parameterValueGroup: System, User
-    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at <a href="https://aka.ms/aks/nodepool/mode">https://aka.ms/aks/nodepool/mode</a>.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --update-cluster-autoscaler -u
-    summary: Update min-count or max-count for cluster autoscaler.
-    description: ''
-- uid: ext_aks-preview_az_aks_nodepool_upgrade
-  name: az aks nodepool upgrade
-  summary: Upgrade the node pool in a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The cluster name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The node pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --kubernetes-version -k
-    summary: Version of Kubernetes to upgrade the node pool to, such as "1.11.12".
-    description: ''
-  - name: --max-surge
-    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --node-image-only
-    summary: Only upgrade agent pool's node image.
-    description: ''
-commands:
-- uid: ext_aks-preview_az_aks_nodepool_add
-  name: az aks nodepool add
-  summary: Add a node pool to the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_delete
-  name: az aks nodepool delete
-  summary: Delete the agent pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_list
-  name: az aks nodepool list
-  summary: List node pools in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_scale
-  name: az aks nodepool scale
-  summary: Scale the node pool in a managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_show
-  name: az aks nodepool show
-  summary: Show the details for a node pool in the managed Kubernetes cluster.
-- uid: ext_aks-preview_az_aks_nodepool_update
-  name: az aks nodepool update
-  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
-- uid: ext_aks-preview_az_aks_nodepool_upgrade
-  name: az aks nodepool upgrade
-  summary: Upgrade the node pool in a managed Kubernetes cluster.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage node pools in Kubernetes kubernetes cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/index.yml
deleted file mode 100644
index 31d67a32fc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/aks-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_aks-preview_az
-  name: aks-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_aks-preview_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/index.yml
deleted file mode 100644
index a75e7862e3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alertsmanagement_az
-  name: alertsmanagement
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_alertsmanagement_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor.yml
deleted file mode 100644
index 86efe72de3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alertsmanagement_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_alertsmanagement_az_monitor_action_rule
-  name: az monitor action-rule
-  summary: Commands to manage action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_create
-  name: az monitor action-rule create
-  summary: Create an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_delete
-  name: az monitor action-rule delete
-  summary: Delete an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_list
-  name: az monitor action-rule list
-  summary: List all action rules of the subscription, created in given resource group and given input filters.
-- uid: ext_alertsmanagement_az_monitor_action_rule_show
-  name: az monitor action-rule show
-  summary: Get an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_update
-  name: az monitor action-rule update
-  summary: Update an action rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml
deleted file mode 100644
index 0cc410df36..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/alertsmanagement/monitor/action-rule.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alertsmanagement_az_monitor_action_rule
-  name: az monitor action-rule
-  summary: Commands to manage action rule.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_alertsmanagement_az_monitor_action_rule_create
-  - ext_alertsmanagement_az_monitor_action_rule_delete
-  - ext_alertsmanagement_az_monitor_action_rule_list
-  - ext_alertsmanagement_az_monitor_action_rule_show
-  - ext_alertsmanagement_az_monitor_action_rule_update
-- uid: ext_alertsmanagement_az_monitor_action_rule_create
-  name: az monitor action-rule create
-  summary: Create an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an action rule to suppress notifications for all Sev4 alerts on all VMs within the subscription every weekend
-    syntax:
-      content: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --severity Equals Sev4 --target-resource-type Equals Microsoft.Compute/VirtualMachines --suppression-recurrence-type Weekly --suppression-recurrence 0 6 --suppression-start-date 12/09/2018 --suppression-end-date 12/18/2018 --suppression-start-time 06:00:00 --suppression-end-time 14:00:00
-  - summary: Create an action rule to suppress notifications for all log alerts generated for Computer-01 in subscription indefinitely as it's going through maintenance
-    syntax:
-      content: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
-  - summary: Create an action rule to suppress notifications in a resource group
-    syntax:
-      content: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --scope-type ResourceGroup --scope /subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/rg --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-type
-    parameterValueGroup: ActionGroup, Diagnostics, Suppression
-    summary: Indicate type of action rule.
-    description: ''
-  - name: --alert-context
-    summary: Filter alerts by alert context (payload).
-    description: ''
-  - name: --alert-description
-    summary: Filter alerts by alert rule description.
-    description: ''
-  - name: --alert-rule
-    summary: Filter alerts by alert rule name or ID.
-    description: ''
-  - name: --description
-    summary: Description of action rule.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --monitor-condition
-    summary: Filter alerts by monitor condition.
-    description: ''
-  - name: --monitor-service
-    summary: Filter alerts by monitor service.
-    description: ''
-  - name: --scope
-    summary: List of ARM IDs (space-delimited) of the given scope type which will be the target of the given action rule.
-    description: ''
-  - name: --scope-type
-    parameterValueGroup: Resource, ResourceGroup
-    summary: Type of target scope.
-    description: ''
-  - name: --severity
-    summary: Filter alerts by severity. All filters should follow format "operator value1 value2 ... valueN". Operator is one of Equals, NotEquals, Contains and DoesNotContain.
-    description: ''
-  - name: --status
-    parameterValueGroup: Disabled, Enabled
-    summary: Indicate if the given action rule is enabled or disabled. Default to enabled.
-    description: ''
-  - name: --suppression-end-date
-    summary: 'End date for suppression. Format: MM/DD/YYYY.'
-    description: ''
-  - name: --suppression-end-time
-    summary: 'End time for suppression. Format: hh:mm:ss.'
-    description: ''
-  - name: --suppression-recurrence
-    summary: List of recurrence pattern values, delimited by space. If --suppression-recurrence-type is Weekly, allowed values range from 0 to 6. 0 stands for Sunday, 1 stands for Monday, ..., 6 stands for Saturday. If --suppression-recurrence-type is Monthly, allowed values range from 1 to 31, stands for day of month.
-    description: ''
-  - name: --suppression-recurrence-type
-    parameterValueGroup: Always, Daily, Monthly, Once, Weekly
-    summary: Specifies when the suppression should be applied.
-    description: ''
-  - name: --suppression-start-date
-    summary: 'Start date for suppression. Format: MM/DD/YYYY.'
-    description: ''
-  - name: --suppression-start-time
-    summary: 'Start time for suppression. Format: hh:mm:ss.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --target-resource-type
-    summary: Filter alerts by target resource type.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_delete
-  name: az monitor action-rule delete
-  summary: Delete an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an action rule
-    syntax:
-      content: az monitor action-rule delete --resource-group rg --name rule
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_list
-  name: az monitor action-rule list
-  summary: List all action rules of the subscription, created in given resource group and given input filters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List action rules of the subscription
-    syntax:
-      content: az monitor action-rule list
-  - summary: List action rules of the resource group
-    syntax:
-      content: az monitor action-rule list --resource-group rg
-  parameters:
-  - name: --action-group
-    summary: Filter by action group configured as part of action rule.
-    description: ''
-  - name: --alert-rule-id
-    summary: Filter by alert rule ID.
-    description: ''
-  - name: --description
-    summary: Filter by alert rule description.
-    description: ''
-  - name: --impacted-scope
-    summary: Filter by impacted/target scope (provide comma separated list for multiple scopes). The value should be an well constructed ARM id of the scope.
-    description: ''
-  - name: --monitor-service
-    summary: Filter by monitor service which generates the alert instance. Default value is select all.
-    description: ''
-  - name: --name
-    summary: Filter by action rule name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --severity
-    summary: Filter by severity. Default value is select all.
-    description: ''
-  - name: --target-resource
-    summary: Filter by target resource (which is full ARM ID). Default value is select all.
-    description: ''
-  - name: --target-resource-group
-    summary: Filter by target resource group name. Default value is select all.
-    description: ''
-  - name: --target-resource-type
-    summary: Filter by target resource type. Default value is select all.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_show
-  name: az monitor action-rule show
-  summary: Get an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an action rule
-    syntax:
-      content: az monitor action-rule show --resource-group rg --name rule
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_alertsmanagement_az_monitor_action_rule_update
-  name: az monitor action-rule update
-  summary: Update an action rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an action rule
-    syntax:
-      content: az monitor action-rule update --resource-group rg --name rule --status Disabled
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of action rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --status
-    parameterValueGroup: Disabled, Enabled
-    summary: Indicates if the given action rule is enabled or disabled.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_alertsmanagement_az_monitor_action_rule_create
-  name: az monitor action-rule create
-  summary: Create an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_delete
-  name: az monitor action-rule delete
-  summary: Delete an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_list
-  name: az monitor action-rule list
-  summary: List all action rules of the subscription, created in given resource group and given input filters.
-- uid: ext_alertsmanagement_az_monitor_action_rule_show
-  name: az monitor action-rule show
-  summary: Get an action rule.
-- uid: ext_alertsmanagement_az_monitor_action_rule_update
-  name: az monitor action-rule update
-  summary: Update an action rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage action rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/alias/alias.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/alias/alias.yml
deleted file mode 100644
index 429a69cc42..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/alias/alias.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alias_az_alias
-  name: az alias
-  summary: Manage Azure CLI Aliases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_alias_az_alias_create
-  - ext_alias_az_alias_export
-  - ext_alias_az_alias_import
-  - ext_alias_az_alias_list
-  - ext_alias_az_alias_remove
-  - ext_alias_az_alias_remove_all
-- uid: ext_alias_az_alias_create
-  name: az alias create
-  summary: Create an alias.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create simple alias commands.
-    syntax:
-      content: >-
-        az alias create --name rg --command group
-
-
-        az alias create --name ls --command list
-  - summary: Create a complex alias.
-    syntax:
-      content: az alias create --name list-vm --command 'vm list --resource-group myResourceGroup'
-  - summary: Create an alias command with arguments.
-    syntax:
-      content: >-
-        az alias create --name 'list-vm {{ resource_group }}' \
-          --command 'vm list --resource-group {{ resource_group }}'
-  - summary: Process arguments using Jinja2 templates.
-    syntax:
-      content: >-
-        az alias create --name 'storage-ls {{ url }}' \
-          --command 'storage blob list
-            --account-name {{ url.replace("https://", "").split(".")[0] }}
-            --container-name {{ url.replace("https://", "").split("/")[1] }}'
-  parameters:
-  - isRequired: true
-    name: --command -c
-    summary: The command that the alias points to.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the alias.
-    description: ''
-- uid: ext_alias_az_alias_export
-  name: az alias export
-  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --exclude -e
-    summary: Space-separated aliases excluded from export.
-    description: ''
-  - name: --path -p
-    summary: The path of the alias configuration file to export to.
-    description: ''
-- uid: ext_alias_az_alias_import
-  name: az alias import
-  summary: Import aliases from an INI configuration file or an URL.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --source -s
-    summary: The source of the aliases to import from.
-    description: ''
-- uid: ext_alias_az_alias_list
-  name: az alias list
-  summary: List the registered aliases.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_alias_az_alias_remove
-  name: az alias remove
-  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Space-separated aliases.
-    description: ''
-- uid: ext_alias_az_alias_remove_all
-  name: az alias remove-all
-  summary: Remove all registered aliases.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-commands:
-- uid: ext_alias_az_alias_create
-  name: az alias create
-  summary: Create an alias.
-- uid: ext_alias_az_alias_export
-  name: az alias export
-  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
-- uid: ext_alias_az_alias_import
-  name: az alias import
-  summary: Import aliases from an INI configuration file or an URL.
-- uid: ext_alias_az_alias_list
-  name: az alias list
-  summary: List the registered aliases.
-- uid: ext_alias_az_alias_remove
-  name: az alias remove
-  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
-- uid: ext_alias_az_alias_remove_all
-  name: az alias remove-all
-  summary: Remove all registered aliases.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure CLI Aliases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/alias/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/alias/index.yml
deleted file mode 100644
index 4eb84bc5c5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/alias/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_alias_az
-  name: alias
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_alias_az_alias
-  name: az alias
-  summary: Manage Azure CLI Aliases.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/index.yml
deleted file mode 100644
index f7caf24d0b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az
-  name: application-insights
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_application-insights_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor.yml
deleted file mode 100644
index e5d5b38848..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_application-insights_az_monitor_app_insights
-  name: az monitor app-insights
-  summary: Commands for querying data in Application Insights applications.
-- uid: ext_application-insights_az_monitor_app_insights_api_key
-  name: az monitor app-insights api-key
-  summary: Operations on API keys associated with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component
-  name: az monitor app-insights component
-  summary: Manage an Application Insights component or its subcomponents.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_events
-  name: az monitor app-insights events
-  summary: Retrieve events from an application.
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-- uid: ext_application-insights_az_monitor_app_insights_metrics
-  name: az monitor app-insights metrics
-  summary: Retrieve metrics from an application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-- uid: ext_application-insights_az_monitor_app_insights_query
-  name: az monitor app-insights query
-  summary: Execute a query over data in your application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml
deleted file mode 100644
index 4f294213ce..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights
-  name: az monitor app-insights
-  summary: Commands for querying data in Application Insights applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_query
-- uid: ext_application-insights_az_monitor_app_insights_query
-  name: az monitor app-insights query
-  summary: Execute a query over data in your application.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a simple query over past 1 hour and 30 minutes.
-    syntax:
-      content: az monitor app-insights query --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --analytics-query 'requests | summarize count() by bin(timestamp, 1h)' --offset 1h30m
-  parameters:
-  - isRequired: true
-    name: --analytics-query
-    summary: Query to execute over Application Insights data.
-    description: ''
-  - isRequired: true
-    name: --apps -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - name: --end-time
-    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --offset
-    defaultValue: 1h
-    summary: 'Time offset of the query range, in ##d##h format.'
-    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start-time
-    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_api_key
-  name: az monitor app-insights api-key
-  summary: Operations on API keys associated with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component
-  name: az monitor app-insights component
-  summary: Manage an Application Insights component or its subcomponents.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_events
-  name: az monitor app-insights events
-  summary: Retrieve events from an application.
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-- uid: ext_application-insights_az_monitor_app_insights_metrics
-  name: az monitor app-insights metrics
-  summary: Retrieve metrics from an application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-- uid: ext_application-insights_az_monitor_app_insights_query
-  name: az monitor app-insights query
-  summary: Execute a query over data in your application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for querying data in Application Insights applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml
deleted file mode 100644
index e0def6ed7d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/api-key.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_api_key
-  name: az monitor app-insights api-key
-  summary: Operations on API keys associated with an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_api_key_create
-  - ext_application-insights_az_monitor_app_insights_api_key_delete
-  - ext_application-insights_az_monitor_app_insights_api_key_show
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a component with kind web and location.
-    syntax:
-      content: az monitor app-insights api-key create --api-key cli-demo --read-properties ReadTelemetry -g demoRg --app testApp
-  parameters:
-  - isRequired: true
-    name: --api-key
-    summary: Name of the API key to create.
-    description: ''
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --read-properties
-    summary: A space seperated list of names of read Roles for this API key to inherit.
-    description: ''
-  - name: --write-properties
-    summary: A space seperated list of names of write Roles for this API key to inherit.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete API Key.
-    syntax:
-      content: az monitor app-insights api-key delete --app demoApp -g demoRg --api-key demo-key
-  parameters:
-  - isRequired: true
-    name: --api-key
-    summary: Name of the API key to delete. Can be found using `api-keys show`.
-    description: ''
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Fetch API Key.
-    syntax:
-      content: az monitor app-insights api-key show --app demoApp -g demoRg --api-key demo-key
-  - summary: Fetch API Keys.
-    syntax:
-      content: az monitor app-insights api-key show --app demoApp -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --api-key
-    summary: Name of the API key to fetch. Can be found using `api-keys show`.
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_api_key_create
-  name: az monitor app-insights api-key create
-  summary: Create a new API key for use with an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-  name: az monitor app-insights api-key delete
-  summary: Delete an API key from an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_api_key_show
-  name: az monitor app-insights api-key show
-  summary: Get all keys or a specific API key associated with an Application Insights resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Operations on API keys associated with an Application Insights component.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml
deleted file mode 100644
index 21d7b819e5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_component
-  name: az monitor app-insights component
-  summary: Manage an Application Insights component or its subcomponents.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_component_create
-  - ext_application-insights_az_monitor_app_insights_component_delete
-  - ext_application-insights_az_monitor_app_insights_component_show
-  - ext_application-insights_az_monitor_app_insights_component_update
-  - ext_application-insights_az_monitor_app_insights_component_update_tags
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a component with kind web and location.
-    syntax:
-      content: az monitor app-insights component create --app demoApp --location westus2 --kind web -g demoRg --application-type web
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --application-type
-    defaultValue: web
-    summary: Type of application being monitored.
-    description: ''
-  - name: --ingestion-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights ingestion.
-    description: ''
-  - name: --kind -k
-    defaultValue: web
-    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
-    description: ''
-  - name: --query-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights query.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --workspace
-    summary: Name or resource ID of a log analytics workspace.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a component with kind web and location.
-    syntax:
-      content: az monitor app-insights component delete --app demoApp -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a component by name.
-    syntax:
-      content: az monitor app-insights component show --app demoApp -g demoRg
-  - summary: List components in a resource group.
-    syntax:
-      content: az monitor app-insights component show -g demoRg
-  - summary: List components in the currently selected subscription.
-    syntax:
-      content: az monitor app-insights component show
-  parameters:
-  - name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a component with kind web.
-    syntax:
-      content: az monitor app-insights component update --app demoApp -k web -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --ingestion-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights ingestion.
-    description: ''
-  - name: --kind -k
-    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
-    description: ''
-  - name: --query-access
-    parameterValueGroup: Disabled, Enabled
-    summary: The public network access type for accessing Application Insights query.
-    description: ''
-  - name: --workspace
-    summary: Name or resource ID of a log analytics workspace.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tag 'name' to equal 'value'.
-    syntax:
-      content: az monitor app-insights component update-tags --app demoApp --tags name=value -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_create
-  name: az monitor app-insights component create
-  summary: Create a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_delete
-  name: az monitor app-insights component delete
-  summary: Delete a new Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_show
-  name: az monitor app-insights component show
-  summary: Get an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_update
-  name: az monitor app-insights component update
-  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
-- uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-  name: az monitor app-insights component update-tags
-  summary: Update tags on an existing Application Insights resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage an Application Insights component or its subcomponents.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml
deleted file mode 100644
index bed5cb0d38..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/billing.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_component_billing
-  name: az monitor app-insights component billing
-  summary: Manage an Application Insights component billing features.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_component_billing_show
-  - ext_application-insights_az_monitor_app_insights_component_billing_update
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the billing features of an application insights component
-    syntax:
-      content: az monitor app-insights component billing show --app demoApp -g demoRg
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the daily cap of the billing features
-    syntax:
-      content: az monitor app-insights component billing update --app demoApp -g demoRg --cap 200 --stop
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cap
-    summary: Daily data volume cap in GB.
-    description: ''
-  - name: --stop -s
-    parameterValueGroup: false, true
-    summary: Do not send a notification email when the daily data volume cap is met.
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-  name: az monitor app-insights component billing show
-  summary: Show the billing features of an Application Insights resource.
-- uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-  name: az monitor app-insights component billing update
-  summary: Update the billing features of an Application Insights resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage an Application Insights component billing features.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml
deleted file mode 100644
index fba2777c8b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/component/linked-storage.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-  name: az monitor app-insights component linked-storage
-  summary: Manage linked storage account for an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  - ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-account -s
-    summary: Name or ID of a linked storage account.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-account -s
-    summary: Name or ID of a linked storage account.
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-  name: az monitor app-insights component linked-storage link
-  summary: Link a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-  name: az monitor app-insights component linked-storage show
-  summary: Show the details of linked storage account for an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-  name: az monitor app-insights component linked-storage unlink
-  summary: Unlink a storage account with an Application Insights component.
-- uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-  name: az monitor app-insights component linked-storage update
-  summary: Update the linked storage account for an Application Insights component.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage linked storage account for an Application Insights component.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml
deleted file mode 100644
index 0734a005a2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/events.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_events
-  name: az monitor app-insights events
-  summary: Retrieve events from an application.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_events_show
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an availability result by ID.
-    syntax:
-      content: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --event b2cf08df-bf42-4278-8d2c-5b55f85901fe
-  - summary: List availability results from the last 24 hours.
-    syntax:
-      content: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --offset 24h
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: The type of events to retrieve.
-    description: ''
-  - name: --end-time
-    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --event
-    summary: GUID of the event to retrieve. This could be obtained by first listing and filtering events, then selecting an event of interest.
-    description: ''
-  - name: --offset
-    defaultValue: 1h
-    summary: 'Time offset of the query range, in ##d##h format.'
-    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start-time
-    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_events_show
-  name: az monitor app-insights events show
-  summary: List events by type or view a single event from an application, specified by type and ID.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Retrieve events from an application.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml
deleted file mode 100644
index 2faf471261..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/application-insights/monitor/app-insights/metrics.yml
+++ /dev/null
@@ -1,102 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_application-insights_az_monitor_app_insights_metrics
-  name: az monitor app-insights metrics
-  summary: Retrieve metrics from an application.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  - ext_application-insights_az_monitor_app_insights_metrics_show
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Views the metadata for the provided app.
-    syntax:
-      content: az monitor app-insights metrics get-metadata --app e292531c-eb03-4079-9bb0-fe6b56b99f8b
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: View the count of availabilityResults events.
-    syntax:
-      content: az monitor app-insights metrics show --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --metric availabilityResults/count
-  parameters:
-  - isRequired: true
-    name: --app -a
-    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
-    description: ''
-  - isRequired: true
-    name: --metrics -m
-    summary: The metric to retrieve. May be either a standard AI metric or an application-specific custom metric.
-    description: ''
-  - name: --aggregation
-    summary: The aggregation to use when computing the metric values. To retrieve more than one aggregation at a time, separate them with a comma. If no aggregation is specified, then the default aggregation for the metric is used.
-    description: ''
-  - name: --end-time
-    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --filter
-    summary: An expression used to filter the results.  This value should be a valid OData filter expression where the keys of each clause should be applicable dimensions for the metric you are retrieving.
-    description: ''
-  - name: --offset
-    defaultValue: 1h
-    summary: 'Time offset of the query range, in ##d##h format.'
-    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
-  - name: --orderby
-    summary: The aggregation function and direction to sort the segments by.  This value is only valid when segment is specified.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --segment
-    summary: The name of the dimension to segment the metric values by. This dimension must be applicable to the metric you are retrieving. To segment by more than one dimension at a time, separate them with a comma (,). In this case, the metric data will be segmented in the order the dimensions are listed in the parameter.
-    description: ''
-  - name: --start-time
-    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --top
-    summary: The number of segments to return.  This value is only valid when segment is specified.
-    description: ''
-  - name: --interval
-    summary: 'The interval over which to aggregate metrics, in ##h##m format.'
-    description: ''
-commands:
-- uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-  name: az monitor app-insights metrics get-metadata
-  summary: Get the metadata for metrics on a particular application.
-- uid: ext_application-insights_az_monitor_app_insights_metrics_show
-  name: az monitor app-insights metrics show
-  summary: View the value of a single metric.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Retrieve metrics from an application.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml
deleted file mode 100644
index 4562566183..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch
-  name: az batch
-  summary: Manage Azure Batch.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_file
-  name: az batch file
-  summary: Manage Batch input files.
-- uid: ext_azure-batch-cli-extensions_az_batch_file_download
-  name: az batch file download
-  summary: Download a specified file or directory of files to the specified storage path.
-- uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-  name: az batch file upload
-  summary: Upload a specified file or directory of files to the specified storage path.
-- uid: ext_azure-batch-cli-extensions_az_batch_job
-  name: az batch job
-  summary: Manage Batch jobs.
-- uid: ext_azure-batch-cli-extensions_az_batch_job_create
-  name: az batch job create
-  summary: Add a job and associated task(s) to a Batch account.
-- uid: ext_azure-batch-cli-extensions_az_batch_pool
-  name: az batch pool
-  summary: Manage Batch pools.
-- uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-  name: az batch pool create
-  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Batch.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml
deleted file mode 100644
index a7739a11b3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/file.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch_file
-  name: az batch file
-  summary: Manage Batch input files.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-batch-cli-extensions_az_batch_file_download
-  - ext_azure-batch-cli-extensions_az_batch_file_upload
-- uid: ext_azure-batch-cli-extensions_az_batch_file_download
-  name: az batch file download
-  summary: Download a specified file or directory of files to the specified storage path.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-group
-    summary: Name of a file group from which the files will be downloaded.
-    description: ''
-  - isRequired: true
-    name: --local-path
-    summary: Path to a local file or directory to be stored the download files.
-    description: ''
-  - name: --overwrite
-    summary: If set, an existing file in the local path will be overwritten.
-    description: ''
-  - name: --remote-path
-    summary: The subdirectory under which files exist remotely.
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-- uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-  name: az batch file upload
-  summary: Upload a specified file or directory of files to the specified storage path.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-group
-    summary: Name of a file group under which the files will be stored.
-    description: ''
-  - isRequired: true
-    name: --local-path
-    summary: Path to a local file or directory to be uploaded - can include wildcard patterns.
-    description: ''
-  - name: --flatten
-    summary: If set, will not retain local directory structure in storage.
-    description: ''
-  - name: --remote-path
-    summary: Group subdirectory under which files will be uploaded.
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_file_download
-  name: az batch file download
-  summary: Download a specified file or directory of files to the specified storage path.
-- uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-  name: az batch file upload
-  summary: Upload a specified file or directory of files to the specified storage path.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Batch input files.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml
deleted file mode 100644
index 396dee3936..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/job.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch_job
-  name: az batch job
-  summary: Manage Batch jobs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-batch-cli-extensions_az_batch_job_create
-- uid: ext_azure-batch-cli-extensions_az_batch_job_create
-  name: az batch job create
-  summary: Add a job and associated task(s) to a Batch account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Required. A string that uniquely identifies the Job within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).
-    description: ''
-  - name: --json-file
-    summary: The file containing the job to create in JSON format, if this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --metadata
-    summary: A list of name-value pairs associated with the job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code. Space separated values in 'key=value' format.
-    description: ''
-  - name: --priority
-    summary: The priority of the Job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. The default value is 0.
-    description: ''
-  - name: --uses-task-dependencies
-    summary: The flag that determines if this job will use tasks with dependencies. True if flag present.
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-  - name: --parameters
-    summary: Parameter values for a Batch job JSON template file. Can only be used with --template.
-    description: ''
-  - name: --template
-    summary: A Batch job JSON template file. If this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --job-max-task-retry-count
-    summary: The maximum number of times each task may be retried. The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try each task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries a task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry tasks. If the maximum retry count is -1, the Batch service retries tasks without limit. The default value is 0 (no retries).
-    description: ''
-  - name: --job-max-wall-clock-time
-    summary: The maximum elapsed time that the job may run, measured from the time the job is created. If the job does not complete within the time limit, the Batch service terminates it and any tasks that are still running. In this case, the termination reason will be MaxWallClockTimeExpiry. If this property is not specified, there is no time limit on how long the job may run. Expected format is an ISO-8601 duration.
-    description: ''
-  - name: --job-manager-task-command-line
-    summary: The command line of the Job Manager task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
-    description: ''
-  - name: --job-manager-task-environment-settings
-    summary: A list of environment variable settings for the Job Manager task. Space separated values in 'key=value' format.
-    description: ''
-  - name: --job-manager-task-id
-    summary: A string that uniquely identifies the Job Manager task within the job. The id can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than 64 characters.
-    description: ''
-  - name: --job-manager-task-resource-files
-    summary: A list of files that the Batch service will download to the compute node before running the command line. Files listed under this element are located in the task's working directory. Space separated resource references in filename=httpurl format.
-    description: ''
-  - name: --pool-id
-    summary: The id of an existing pool. All the tasks of the job will run on the specified pool.
-    description: ''
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_job_create
-  name: az batch job create
-  summary: Add a job and associated task(s) to a Batch account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Batch jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml
deleted file mode 100644
index 2f3ddf48ad..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/batch/pool.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az_batch_pool
-  name: az batch pool
-  summary: Manage Batch pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-batch-cli-extensions_az_batch_pool_create
-- uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-  name: az batch pool create
-  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --application-licenses
-    summary: The list of application licenses the Batch service will make available on each Compute Node in the Pool. The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, Pool creation will fail.
-    description: ''
-  - name: --application-package-references
-    summary: The list of Packages to be installed on each Compute Node in the Pool. Changes to Package references affect all new Nodes joining the Pool, but do not affect Compute Nodes that are already in the Pool until they are rebooted or reimaged. There is a maximum of 10 Package references on any given Pool.
-    description: ''
-  - name: --auto-scale-formula
-    summary: A formula for the desired number of Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to false. It is required if enableAutoScale is set to true. The formula is checked for validity before the Pool is created. If the formula is not valid, the Batch service rejects the request with detailed error information. For more information about specifying this formula, see 'Automatically scale Compute Nodes in an Azure Batch Pool' (<a href="https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/">https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/</a>).
-    description: ''
-  - name: --certificate-references
-    summary: The list of Certificates to be installed on each Compute Node in the Pool. For Windows Nodes, the Batch service installs the Certificates to the specified Certificate store and location. For Linux Compute Nodes, the Certificates are stored in a directory inside the Task working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the Task to query for this location. For Certificates with visibility of 'remoteUser', a 'certs' directory is created in the user's home directory (e.g., /home/{user-name}/certs) and Certificates are placed in that directory.
-    description: ''
-  - name: --enable-inter-node-communication
-    summary: Whether the Pool permits direct communication between Compute Nodes. Enabling inter-node communication limits the maximum size of the Pool due to deployment restrictions on the Compute Nodes of the Pool. This may result in the Pool not reaching its desired size. The default value is false.
-    description: ''
-  - name: --id
-    summary: Required. A string that uniquely identifies the Pool within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two Pool IDs within an Account that differ only by case).
-    description: ''
-  - name: --json-file
-    summary: The file containing the pool to create in JSON format, if this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --metadata
-    summary: A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.
-    description: ''
-  - name: --resize-timeout
-    summary: The timeout for allocation of Compute Nodes to the Pool. This timeout applies only to manual scaling; it has no effect when enableAutoScale is set to true. The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).
-    description: ''
-  - name: --target-dedicated-nodes
-    summary: The desired number of dedicated Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
-    description: ''
-  - name: --target-low-priority-nodes
-    summary: The desired number of low-priority Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
-    description: ''
-  - name: --vm-size
-    summary: Required. The size of virtual machines in the Pool. All virtual machines in a Pool are the same size. For information about available sizes of virtual machines for Cloud Services Pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (<a href="https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/">https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/</a>). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for Pools using Images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (<a href="https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/">https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/</a>) or Sizes for Virtual Machines (Windows) (<a href="https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/">https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/</a>). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
-    description: ''
-  - name: --account-endpoint
-    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
-    description: ''
-  - name: --account-key
-    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
-    description: ''
-  - name: --resource-group
-    summary: The resource group of the Batch account.
-    description: ''
-  - name: --parameters
-    summary: Parameter values for a Batch pool JSON template file. Can only be used with --template.
-    description: ''
-  - name: --template
-    summary: A Batch pool JSON template file. If this parameter is specified, all other parameters are ignored.
-    description: ''
-  - name: --os-family
-    summary: 'The Azure Guest OS family to be installed on the virtual machines in the pool. Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. For more information, see Azure Guest OS Releases (<a href="https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases">https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases</a>). Allowed values: 2, 3, 4, 5.'
-    description: ''
-  - name: --start-task-command-line
-    summary: The command line of the start task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
-    description: ''
-  - name: --start-task-resource-files
-    summary: A list of files that the Batch service will download to the compute node before running the command line. Space separated resource references in filename=httpurl format.
-    description: ''
-  - name: --start-task-wait-for-success
-    summary: Whether the Batch service should wait for the start task to complete successfully (that is, to exit with exit code 0) before scheduling any tasks on the compute node. If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is false. True if flag present.
-    description: ''
-  - name: --image
-    summary: "OS image reference. This can be either 'publisher:offer:sku[:version]' format, or a fully qualified ARM image id of the form '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}'. If 'publisher:offer:sku[:version]' format, version is optional and if omitted latest will be used. Valid values can be retrieved via 'az batch pool node-agent-skus list'. For example: 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'."
-    description: ''
-  - name: --node-agent-sku-id
-    summary: The SKU of the Batch node agent to be provisioned on compute nodes in the pool. The Batch node agent is a program that runs on each node in the pool, and provides the command-and-control interface between the node and the Batch service. There are different implementations of the node agent, known as SKUs, for different operating systems. You must specify a node agent SKU which matches the selected image reference. To get the list of supported node agent SKUs along with their list of verified image references, see the 'List supported node agent SKUs' operation.
-    description: ''
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-  name: az batch pool create
-  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Batch pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/index.yml
deleted file mode 100644
index a8c6bac24e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-batch-cli-extensions/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-batch-cli-extensions_az
-  name: azure-batch-cli-extensions
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-batch-cli-extensions_az_batch
-  name: az batch
-  summary: Manage Azure Batch.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/index.yml
deleted file mode 100644
index 277a581c1b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/index.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az
-  name: azure-cli-iot-ext
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-- uid: ext_azure-cli-iot-ext_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot.yml
deleted file mode 100644
index 2cdb51c7d5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot.yml
+++ /dev/null
@@ -1,407 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-  description: >-
-    Review the extension wiki tips to maximize usage
-
-    <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central
-  name: az iot central
-  summary: Manage Azure IoT Central assets.
-- uid: ext_azure-cli-iot-ext_az_iot_central_app
-  name: az iot central app
-  summary: Manage Azure IoT Central applications.
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-- uid: ext_azure-cli-iot-ext_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-- uid: ext_azure-cli-iot-ext_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Review the extension wiki tips to maximize usage
-
-  <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central.yml
deleted file mode 100644
index 7d1435344a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_central
-  name: az iot central
-  summary: Manage Azure IoT Central assets.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central_app
-  name: az iot central app
-  summary: Manage Azure IoT Central applications.
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Central assets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/app.yml
deleted file mode 100644
index 33e3b1c313..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/app.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_central_app
-  name: az iot central app
-  summary: Manage Azure IoT Central applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Central applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/device-twin.yml
deleted file mode 100644
index f3c502e6d8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/central/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device.yml
deleted file mode 100644
index de968df5bb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  - ext_azure-cli-iot-ext_az_iot_device_simulate
-  - ext_azure-cli-iot-ext_az_iot_device_upload_file
-- uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id}
-  - summary: Basic usage with custom data
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --data {message_body}
-  - summary: Send application properties
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props 'key0=value0;key1=value1'
-  - summary: Send system properties (Message Id and Correlation Id)
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props '$.mid=<id>;$.cid=<id>'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "1"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.'
-    description: ''
-  - name: --qos
-    defaultValue: "1"
-    parameterValueGroup: 0, 1
-    summary: Quality of Service. 0 = At most once, 1 = At least once. 2 (Exactly once) is not supported.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage (mqtt)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id}
-  - summary: Basic usage (mqtt) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --properties "myprop=myvalue;$.ct=application/json"
-  - summary: Basic usage (http)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http
-  - summary: Basic usage (http) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http --properties "iothub-app-myprop=myvalue;content-type=application/json;iothub-correlationid=12345"
-  - summary: Choose total message count and interval between messages
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --msg-count 1000 --msg-interval 5
-  - summary: Reject c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs reject --protocol http
-  - summary: Abandon c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs abandon --protocol http
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "100"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --mi --msg-interval
-    defaultValue: "3"
-    summary: Delay in seconds between device-to-cloud messages.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.  For http messaging - application properties are sent using iothub-app-<name>=value, for instance iothub-app-myprop=myvalue. System properties are generally prefixed with iothub-<name> like iothub-correlationid but there are exceptions such as content-type and content-encoding.'
-    description: ''
-  - name: --proto --protocol
-    defaultValue: mqtt
-    parameterValueGroup: http, mqtt
-    summary: Indicates device-to-cloud message protocol.
-    description: ''
-  - name: --receive-settle --rs
-    defaultValue: complete
-    parameterValueGroup: abandon, complete, reject
-    summary: Indicates how to settle received cloud-to-device messages. Supported with HTTP only.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --content-type --ct
-    summary: MIME Type of file.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --file-path --fp
-    summary: Path to file for upload.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Leverage device-to-cloud and cloud-to-device messaging capabilities.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device/c2d-message.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device/c2d-message.yml
deleted file mode 100644
index 65c4afa331..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/device/c2d-message.yml
+++ /dev/null
@@ -1,219 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  - ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lock-timeout --lt
-    defaultValue: "60"
-    summary: Specifies the amount of time a message will be invisible to other receive calls.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage with default message body
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name}
-  - summary: Send cloud-to-device message with custom data and properties.
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --data 'Hello World' --props 'key0=value0;key1=value1'
-  - summary: Send a C2D message and wait for device acknowledgement
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --ack full --wait
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --ack
-    parameterValueGroup: full, negative, positive
-    summary: 'Request the delivery of per-message feedback regarding the final state of that message. The description of ack values is as follows. Positive: If the c2d message reaches the Completed state, IoT Hub generates a feedback message. Negative: If the c2d message reaches the Dead lettered state, IoT Hub generates a feedback message. Full: IoT Hub generates a feedback message in either case. By default, no ack is requested.'
-    description: ''
-  - name: --ce --content-encoding
-    defaultValue: utf-8
-    summary: The content encoding associated with the C2D message.
-    description: ''
-  - name: --cid --correlation-id
-    summary: The correlation Id associated with the C2D message.
-    description: ''
-  - name: --content-type --ct
-    summary: The content type associated with the C2D message.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --expiry --expiry-time-utc
-    summary: Units are milliseconds since unix epoch. If no time is indicated the default IoT Hub C2D message TTL is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --message-id --mid
-    summary: The C2D message Id. If no message Id is provided a UUID will be generated.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --uid --user-id
-    summary: The C2D message, user Id property.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: If set the c2d send operation will block until device feedback has been received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Cloud-to-device messaging commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps.yml
deleted file mode 100644
index 21dcd797f7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment-group.yml
deleted file mode 100644
index c78035f863..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment-group.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using a CA certificate {certificate_name} as secondary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name}
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service 'MyDps' in the resource group '{resource_group_name}' with provisioning status 'enabled', target IoT Hub '{iothub_host_name}' and initial twin tags '{"location":{"region":"US"}} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem --provisioning-status enabled --iot-hub-host-name {iothub_host_name} --initial-twin-tags "{'location':{'region':'US'}}"
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} with attestation type 'symmetrickey'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {primary_key} --secondary-key {secondary_key}
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new initial twin tags.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-tags "{'location':{'region':'US2'}}" --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary intermediate certificate and remove existing secondary intermediate certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --remove-secondary-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new secondary CA certificate '{certificate_name}' and remove existing primary CA certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name} --remove-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary key.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment.yml
deleted file mode 100644
index 895934142d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/enrollment.yml
+++ /dev/null
@@ -1,278 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  - ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}'
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with provisioning status 'disabled', target IoT Hub '{iothub_host_name}', device id '{device_id}' and initial twin properties '{"location":{"region":"US"}}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem --provisioning-status disabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --device-id {device_id}
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'tpm' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'symmetrickey' in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --primary-key {primary_key} --secondary-key {secondary_key}
-  - summary: Create an enrollment 'MyEnrollment' with reprovision in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --reprovision-policy {reprovision_type} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with static allocation policy in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy static --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs {iot_hub_host_name}
-  - summary: Create an enrollment 'MyEnrollment' with hashed allocation policy and multiple hubs in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy hashed --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2}"
-  parameters:
-  - isRequired: true
-    name: --at --attestation-type
-    parameterValueGroup: symmetricKey, tpm, x509
-    summary: Attestation Mechanism.
-    description: ''
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device. When choosing tpm as attestation type, endorsement key is required.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment '{enrollment_id}' with a new x509 certificate in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new endorsement key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new primary key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new reprovision type in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --reprovision-policy {reprovision_type} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new allocation policy in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy geolatency --etag AAAAAAAAAAA= --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2} {iot_hub_host_name3}"
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/registration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/registration.yml
deleted file mode 100644
index bf2f79dde5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dps/registration.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  - ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  - ext_azure-cli-iot-ext_az_iot_dps_registration_show
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service registrations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dt.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dt.yml
deleted file mode 100644
index cff6192b3e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/dt.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  - ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  - ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  - ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  - ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  - ext_azure-cli-iot-ext_az_iot_dt_update_property
-- uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a command on device .
-    syntax:
-      content: az iot dt invoke-command --login {iothub_cs} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  - summary: Execute a command on device within current session.
-    syntax:
-      content: az iot dt invoke-command --hub-name {iothub_name} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --cn --command-name
-    summary: IoT Plug and Play interface command name.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --command-payload --cp --cv
-    summary: IoT Plug and Play interface command payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "10"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all commands of all private interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id}
-  - summary: List all commands of a private interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id} --interface {plug_and_play_interface}
-  - summary: List all commands of all public interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source public --device-id {device_id}
-  - summary: List all commands of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all IoT Plug and Play interfaces on a device.
-    syntax:
-      content: az iot dt list-interfaces --login {iothub_cs} --device-id {device_id}
-  - summary: List all IoT Plug and Play interfaces on a device within current session.
-    syntax:
-      content: az iot dt list-interfaces --hub-name {iothub_name} --device-id {device_id}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all properties of all device's interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id}
-  - summary: List all properties of all public interfaces on an IoT Plug and Play device within current session.
-    syntax:
-      content: az iot dt list-properties --hub-name {iothub_name} --device-id {device_id} --source public
-  - summary: List all properties of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage monitoring events of all devices and all interfaces using the logged in session.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name}
-  - summary: Basic usage monitoring events of all devices and all interfaces using an IotHub connection string.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs}
-  - summary: Basic usage when filtering on specific interface events while targeting devices with a wildcard in the ID.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -d Device* -i {plug_and_play_interface}
-  - summary: Filter Digital Twin events of a subset of devices using IoT Hub query language.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter events on a device with a particular interface. Use a custom consumer group when binding and see all message properties.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs} --device-id {device_id} --interface {plug_and_play_interface} --consumer-group {consumer_group_name} --properties all
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an IoT Plug and Play device interfaces read-write property.
-    syntax:
-      content: az iot dt update-property --login {iothub_cs} --device-id {device_id} --interface-payload {payload}
-  - summary: Update an IoT Plug and Play device interfaces read-write property within current session.
-    syntax:
-      content: az iot dt update-property --hub-name {iothub_name} --device-id {device_id} --interface-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface-payload --ip --iv
-    summary: IoT Plug and Play interface payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage digital twin of an IoT Plug and Play device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge.yml
deleted file mode 100644
index f730b01e58..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_edge_set_modules
-- uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-  description: >-
-    Modules content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Note: Upon execution the command will output the collection of modules applied to the device.
-  langs:
-  - azurecli
-  examples:
-  - summary: Test edge modules while in development by setting modules on a target device.
-    syntax:
-      content: az iot edge set-modules --hub-name {iothub_name} --device-id {device_id} --content ../modules_content.json
-  parameters:
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT solutions on the Edge.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge/deployment.yml
deleted file mode 100644
index beb68a5afe..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/edge/deployment.yml
+++ /dev/null
@@ -1,256 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  - ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-  description: >-
-    Deployment content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Edge deployments can be created with user defined metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a deployment with labels (bash syntax example) that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{"key0":"value0", "key1":"value1"}' --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a deployment with labels (powershell syntax example) that applies for devices tagged with environment 'dev'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{\"key\":\"value\"}' --target-condition "tags.environment='dev'"
-  - summary: Create a layered deployment that applies for devices tagged with environment 'dev'. Both user metrics and modules content defined inline (cmd syntax example).
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content "{\"modulesContent\":{\"$edgeAgent\":{\"properties.desired.modules.mymodule0\":{ }},\"$edgeHub\":{\"properties.desired.routes.myroute0\":\"FROM /messages/* INTO $upstream\"}}}" --target-condition "tags.environment='dev'" --priority 10 --metrics "{\"queries\":{\"mymetrik\":\"SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200\"}}" --layered
-  - summary: Create a layered deployment that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content layered_modules_content.json --target-condition "tags.building=9 and tags.environment='test'" --metrics metrics_content.json --layered
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: "Map of labels to be applied to target deployment. Use the following format: '{\"key0\":\"value0\", \"key1\":\"value1\"}'."
-    description: ''
-  - name: --layered
-    parameterValueGroup: false, true
-    summary: Layered deployments allow you to define desired properties in $edgeAgent, $edgeHub and user modules that will layer on top of a base deployment. For example the routes specified in a layered deployment will merge with routes of the base deployment. Routes with the same name will be overwritten based on deployment priority.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: IoT Edge deployment metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of deployment in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which an Edge deployment applies to.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of deployments to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the 'appliedCount' system metric
-    syntax:
-      content: az iot edge deployment show-metric -m appliedCount -d {deployment_name} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the labels and target condition of an existing edge deployment
-    syntax:
-      content: az iot edge deployment update -d {deployment_name} -n {iothub_name} --set labels='{"purpose":"dev", "owners":"IoTEngineering"}' targetCondition='tags.building=9'
-  parameters:
-  - isRequired: true
-    name: --config-id --deployment-id -c -d
-    summary: Target deployment name. Option '--config-id' has been deprecated and will be removed in a future release. Use '--deployment-id' instead.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Edge deployments at scale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub.yml
deleted file mode 100644
index ab94c6b2f8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub.yml
+++ /dev/null
@@ -1,469 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  - ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  - ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  - ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  - ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  - ext_azure-cli-iot-ext_az_iot_hub_query
-- uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-  description: For device SAS tokens, the policy parameter is used to access the the device registry only. Therefore the policy should have read access to the registry. For IoT Hub tokens the policy is part of the SAS.
-  langs:
-  - azurecli
-  examples:
-  - summary: Generate an IoT Hub SAS token using the iothubowner policy and primary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name}
-  - summary: Generate an IoT Hub SAS token using the registryRead policy and secondary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name} --policy registryRead --key-type secondary
-  - summary: Generate a device SAS token using the iothubowner policy to access the {iothub_name} device registry.
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} -n {iothub_name}
-  - summary: Generate a device SAS token using an IoT Hub connection string (with registry access)
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --du --duration
-    defaultValue: "3600"
-    summary: Valid token duration in seconds.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --pn --policy-name
-    defaultValue: iothubowner
-    summary: Shared access policy with operation permissions for target IoT Hub entity.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d Device*
-  - summary: Filter devices using IoT Hub query language
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --content-type application/json
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id}
-  - summary: Exit feedback monitor upon receiving a message with specific id (uuid)
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id} -w {message_id}
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --wait-on-msg -w
-    summary: Feedback monitor will block until a message with specific id (uuid) is received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-  description: Query an IoT Hub using a powerful SQL-like language to retrieve information regarding device and module twins, jobs and message routing. See <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language</a> for more information.
-  langs:
-  - azurecli
-  examples:
-  - summary: Query all device twin data in an Azure IoT Hub.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices"
-  - summary: Query all module twin data on target device.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices.modules where devices.deviceId = '{device_id}'"
-  parameters:
-  - isRequired: true
-    name: --query-command -q
-    summary: User query to be executed.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. By default query has no cap.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/configuration.yml
deleted file mode 100644
index 536a6571fe..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/configuration.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  - ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-  description: >-
-    Configuration content is json and slighty varies based on device or module intent.
-
-
-    Device configurations are in the form of {"deviceContent":{...}} or {"content":{"deviceContent":{...}}}
-
-
-    Module configurations are in the form of {"moduleContent":{...}} or {"content":{"moduleContent":{...}}}
-
-
-    Configurations can be defined with user provided metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device configuration with a priority of 3 that applies on condition when a device is tagged in building 9 and the environment is 'test'.
-    syntax:
-      content: az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a device configuration with labels and provide user metrics inline (bash syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition \"tags.building=9\" --labels '{\"key0\":\"value0\", \"key1\":\"value1\"}' --priority 10 --metrics '{\"metrics\": {\"queries\": {\"mymetric\": \"select deviceId from devices where tags.location='US'\"}}}'"
-  - summary: Create a module configuration with labels and provide user metrics inline (cmd syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content module_content.json --target-condition \"tags.building=9\" --labels \"{\\\"key0\\\":\\\"value0\\\", \\\"key1\\\":\\\"value1\\\"}\" --metrics \"{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\": \\\"select deviceId from devices where tags.location='US'\\\"}}}\""
-  - summary: Create a module configuration with content and user metrics inline (powershell syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content '{\\\"moduleContent\\\": {\\\"properties.desired.chillerWaterSettings\\\": {\\\"temperature\\\": 38, \\\"pressure\\\": 78}}}' --target-condition \"tags.building=9\" --priority 1 --metrics '{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\":\\\"select deviceId from devices where tags.location=''US''\\\"}}}'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: Device configuration content. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: 'Map of labels to be applied to target configuration. Format example: {"key0":"value0", "key1":"value1"}.'
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: Device configuration metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of the device configuration in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which a device configuration applies to.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of configurations to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the user defined 'warningLimit' metric
-    syntax:
-      content: az iot hub configuration show-metric -m warningLimit -c {configuration_name} -n {iothub_name}
-  - summary: Evaluate the system 'appliedCount' metric
-    syntax:
-      content: az iot hub configuration show-metric --metric-id appliedCount -c {configuration_name} -n {iothub_name} --metric-type system
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the priority of a device configuration and update its target condition
-    syntax:
-      content: az iot hub configuration update -c {configuration_name} -n {iothub_name} --set priority=10 targetCondition="tags.building=43 and tags.environment='dev'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT automatic device management configuration at scale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-identity.yml
deleted file mode 100644
index 4e0b5165ca..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-identity.yml
+++ /dev/null
@@ -1,482 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  - ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add non-edge devices as a children to the edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Add non-edge devices as a children to the edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name} -f
-  parameters:
-  - isRequired: true
-    name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an edge enabled IoT device with default authorization (shared private key).
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee
-  - summary: Create an edge enabled IoT device with default authorization (shared private key) and add child devices as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee --cl {child_device_id}
-  - summary: Create an IoT device with default authorization (shared private key) and set parent device as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --pd {edge_device_id}
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert valid for 10 days then use its thumbprint.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --valid-days 10
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert of default expiration (365 days) and output to target directory.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --output-dir /path/to/output
-  - summary: Create an IoT device with self-signed certificate authorization and explicitly provide primary and secondary thumbprints.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --ptp {thumbprint_1} --stp {thumbprint_2}
-  - summary: Create an IoT device with root CA authorization with disabled status and reason
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_ca --status disabled --status-reason 'for reasons'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --add-children --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --pd --set-parent
-    summary: Id of edge device.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sta --status
-    defaultValue: enabled
-    parameterValueGroup: disabled, enabled
-    summary: Set device status upon creation.
-    description: ''
-  - name: --star --status-reason
-    summary: Description for device status.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --bcu --blob-container-uri
-    summary: Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --ik --include-keys
-    parameterValueGroup: false, true
-    summary: If set, keys are exported normally. Otherwise, keys are set to null in export output.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the parent device of the specified device.
-    syntax:
-      content: az iot hub device-identity get-parent -d {non_edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --ibcu --input-blob-container-uri
-    summary: Blob Shared Access Signature URI with read access to a blob container. This blob contains the operations to be performed on the identity registry.
-    description: ''
-  - isRequired: true
-    name: --obcu --output-blob-container-uri
-    summary: Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show all assigned non-edge devices as comma-separated list.
-    syntax:
-      content: az iot hub device-identity list-children -d {edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove all mentioned devices as children of specified device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Remove all non-edge devices as children specified edge device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --remove-all
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --remove-all -a
-    summary: To remove all children.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the parent device of the specified non-edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} -n {iothub_name}
-  - summary: Set the parent device of the specified non-edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} --force -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - isRequired: true
-    name: --parent-device-id --pd
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-  description: Use --set followed by property assignments for updating a device. Leverage parameters returned from 'iot hub device-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Turn on edge capabilities for device
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set capabilities.iotEdge=true
-  - summary: Disable device status
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled
-  - summary: In one command
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled capabilities.iotEdge=true
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT devices.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-twin.yml
deleted file mode 100644
index aacfa07014..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/device-twin.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  - ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  - ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace device twin with file contents.
-    syntax:
-      content: az iot hub device-twin replace -d {device_id} -n {iothub_name} -j ../mydevicetwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-  description: Use --set followed by property assignments for updating a device twin. Leverage properties returned from 'iot hub device-twin show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Add nested tags to device twin.
-    syntax:
-      content: az iot hub device-twin update --device-id {device_id} --hub-name {iothub_name} --set tags='{"location":{"region":"US"}}'
-  - summary: Remove the 'region' property from parent 'location' property
-    syntax:
-      content: az iot hub device-twin update --device-id {device_id} --hub-name {iothub_name} --set tags.location.region='null'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device twin configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/distributed-tracing.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/distributed-tracing.yml
deleted file mode 100644
index bfc75e76cf..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/distributed-tracing.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  - ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the distributed tracing settings for a device
-    syntax:
-      content: az iot hub distributed-tracing show -d {device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the distributed tracing options for a device
-    syntax:
-      content: az iot hub distributed-tracing update -d {device_id} --sm on --sr 50 -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --sampling-mode --sm
-    parameterValueGroup: off, on
-    summary: Turns sampling for distributed tracing on and off. 1 is On and, 2 is Off.
-    description: ''
-  - isRequired: true
-    name: --sampling-rate --sr
-    summary: Controls the amount of messages sampled for adding trace context. This value isa percentage. Only values from 0 to 100 (inclusive) are permitted.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage distributed settings per-device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/job.yml
deleted file mode 100644
index b6849667e7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/job.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  - ext_azure-cli-iot-ext_az_iot_hub_job_create
-  - ext_azure-cli-iot-ext_az_iot_hub_job_list
-  - ext_azure-cli-iot-ext_az_iot_hub_job_show
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel an IoT Hub job.
-    syntax:
-      content: az iot hub job cancel --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-  description: >-
-    When scheduling a twin update job, the twin patch is a required argument.
-
-    When scheduling a device method job, the method name and payload are required arguments.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create and schedule a job to update the twin tags of all devices.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}'"
-  - summary: Schedule job and block for result of "completed", "failed" or "cancelled". Specify poll interval in seconds.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}' --wait --poll-interval 30"
-  - summary: Create a job to update a desired twin property on a subset of devices, scheduled to run at an arbitrary future time.
-    syntax:
-      content: "az iot hub job create --job-id {job_name} --job-type scheduleUpdateTwin -n {iothub_name} --twin-patch '{\"properties\":{\"desired\": {\"temperatureF\": 65}}}' --start-time \"2020-01-08T12:19:56.868Z\" --query-condition \"deviceId IN ['MyDevice1', 'MyDevice2', 'MyDevice3']\""
-  - summary: Create and schedule a job to invoke a device method for a set of devices meeting a query condition.
-    syntax:
-      content: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -n {iothub_name} --method-name setSyncIntervalSec --method-payload 30 --query-condition "properties.reported.settings.syncIntervalSec != 30"
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - isRequired: true
-    name: --job-type --jt
-    parameterValueGroup: scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --duration --poll-duration
-    defaultValue: "600"
-    summary: Total duration in seconds where job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interval --poll-interval
-    defaultValue: "10"
-    summary: Interval in seconds that job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mct --method-connect-timeout
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait on device connection.
-    description: ''
-  - name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --method-payload --mp
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --method-response-timeout --mrt
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-  - name: --patch --twin-patch
-    summary: The desired twin patch. Provide file path or raw json.
-    description: ''
-  - name: --query-condition -q
-    summary: 'Condition for device query to get devices to execute the job on. Required if job type is scheduleDeviceMethod or scheduleUpdateTwin. Note: The service will prefix "SELECT \* FROM devices WHERE " to the input.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start --start-time
-    summary: The scheduled start of the job in ISO 8601 date time format. If no start time is provided, the job is queued for asap execution.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Max execution time in seconds, before job is terminated.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: Block until the created job is in a completed, failed or cancelled state. Will regularly poll on interval specified by --poll-interval.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all archived jobs within retention period (max of 30 days).
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name}
-  - summary: List all archived jobs projecting specific properties
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --query "[*].[jobId,type,status,startTime,endTime]"
-  - summary: List only update twin type jobs
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod
-  - summary: List device method jobs which have status "scheduled"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod --job-status scheduled
-  - summary: List device export jobs which have status "completed"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type export --job-status completed
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --job-status --js
-    parameterValueGroup: cancelled, completed, enqueued, failed, queued, running, scheduled, unknown
-    summary: The status of a scheduled job.
-    description: ''
-  - name: --job-type --jt
-    parameterValueGroup: export, import, scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a created job.
-    syntax:
-      content: az iot hub job show --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Hub jobs (v2).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-identity.yml
deleted file mode 100644
index 910bbf4e70..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-identity.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  - ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate module symmetric authentication keys
-    syntax:
-      content: az iot hub module-identity update -m {module_name} -d {device_id} -n {iothub_name} --set authentication.symmetricKey.primaryKey="" authentication.symmetricKey.secondaryKey=""
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device modules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-twin.yml
deleted file mode 100644
index 8689edec4a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/hub/module-twin.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  - ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  - ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace a module twin with file contents.
-    syntax:
-      content: az iot hub module-twin replace -d {device_id} -n {iothub_name} -m {module_name} -j ../mymodtwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-twin show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Add desired properties to module twin.
-    syntax:
-      content: az iot hub module-twin update -d {device_id} -n {iothub_name} -m {module_name} --set properties.desired='{"conditions":{"temperature":{"warning":70, "critical":100}}}'
-  - summary: Remove 'critical' property from parent 'temperature'
-    syntax:
-      content: az iot hub module-twin update -d mydevice -n myhub -m mymod --set properties.desired.condition.temperature.critical='null'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device module twin configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp.yml
deleted file mode 100644
index dcceb6fcd9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities of an IoT Plug and Play model repository.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/capability-model.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/capability-model.yml
deleted file mode 100644
index 60a1145bff..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/capability-model.yml
+++ /dev/null
@@ -1,212 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  - ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model create --def {plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model delete -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's capability-model.
-    syntax:
-      content: az iot pnp capability-model list -r {pnp_repository}
-  - summary: List all public capability-model.
-    syntax:
-      content: az iot pnp capability-model list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play models for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of capability-model to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish the capability-model to public repository.
-    syntax:
-      content: az iot pnp capability-model publish -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository capability-model.
-    syntax:
-      content: az iot pnp capability-model show -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  - summary: Get the details of public capability-model.
-    syntax:
-      content: az iot pnp capability-model show --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --expand
-    summary: Indicates whether to expand the device capability model's interface definitions or not.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model update --def {updated_plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage device capability models in an IoT Plug and Play model repository.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/interface.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/interface.yml
deleted file mode 100644
index 3aa115d427..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iot/pnp/interface.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  - ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an interface in the company repository.
-    syntax:
-      content: az iot pnp interface create --def {plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an interface in the company repository.
-    syntax:
-      content: az iot pnp interface delete -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's interfaces.
-    syntax:
-      content: az iot pnp interface list -r {pnp_repository}
-  - summary: List all public interfaces.
-    syntax:
-      content: az iot pnp interface list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play interfaces for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of interface to return.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish an interface to public repository.
-    syntax:
-      content: az iot pnp interface publish -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository interface.
-    syntax:
-      content: az iot pnp interface show -r {pnp_repository} --interface {plug_and_play_interface_id}
-  - summary: Get the details of public interface.
-    syntax:
-      content: az iot pnp interface show --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an interface in the company repository.
-    syntax:
-      content: az iot pnp interface update --def {updated_plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage interfaces in an IoT Plug and Play model repository.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral.yml
deleted file mode 100644
index 655654cfa5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central assets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/app.yml
deleted file mode 100644
index 503fe404d6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/app.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>
-
-
-    DEPRECATED. Use 'az iot central app monitor-events' instead.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/device-twin.yml
deleted file mode 100644
index a47ba7b2af..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-iot-ext/iotcentral/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-  description: DEPRECATED. Use 'az iot central device-twin' instead.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: DEPRECATED. Use 'az iot central device-twin show' instead.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri
-    defaultValue: api.azureiotcentral.com
-    summary: IoT Central API override.  For use with environments other than production.
-    description: ''
-commands:
-- uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: DEPRECATED. Use 'az iot central device-twin' instead.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/index.yml
deleted file mode 100644
index ce6e796ae6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az
-  name: azure-cli-ml
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml
-  name: az ml
-  summary: Azureml._cli commands.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml.yml
deleted file mode 100644
index ce98916bf6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml.yml
+++ /dev/null
@@ -1,434 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml
-  name: az ml
-  summary: Azureml._cli commands.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget
-  name: az ml computetarget
-  summary: Computetarget subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-  name: az ml computetarget amlcompute
-  summary: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach
-  name: az ml computetarget attach
-  summary: Attach subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create
-  name: az ml computetarget create
-  summary: Create a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_delete
-  name: az ml computetarget delete
-  summary: Delete a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_detach
-  name: az ml computetarget detach
-  summary: Detach a compute target (aks or remote) from a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  name: az ml computetarget get-credentials
-  summary: Get credentials for a compute target (aks or remote).
-- uid: ext_azure-cli-ml_az_ml_computetarget_list
-  name: az ml computetarget list
-  summary: List all the compute targets attached to a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_show
-  name: az ml computetarget show
-  summary: Show details of a specific compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update
-  name: az ml computetarget update
-  summary: Update a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_dataset
-  name: az ml dataset
-  summary: Commands for managing datasets in Azure Machine Learning Workspace.
-- uid: ext_azure-cli-ml_az_ml_dataset_archive
-  name: az ml dataset archive
-  summary: Archive an active or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-  name: az ml dataset deprecate
-  summary: Deprecate an active dataset in a workspace by another dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_list
-  name: az ml dataset list
-  summary: List all datasets in the workspace.
-- uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-  name: az ml dataset reactivate
-  summary: Reactivate an archived or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_register
-  name: az ml dataset register
-  summary: Register a new dataset from the specified file.
-- uid: ext_azure-cli-ml_az_ml_dataset_show
-  name: az ml dataset show
-  summary: Get details of a dataset by its id or registration name.
-- uid: ext_azure-cli-ml_az_ml_dataset_unregister
-  name: az ml dataset unregister
-  summary: Unregister all versions under the specified registration name.
-- uid: ext_azure-cli-ml_az_ml_datastore
-  name: az ml datastore
-  summary: Commands for managing and using datastores with the Azure ML Workspace.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-  name: az ml datastore attach-adls
-  summary: Attach an ADLS datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  name: az ml datastore attach-adls-gen2
-  summary: Attach a ADLS Gen2 datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-  name: az ml datastore attach-blob
-  summary: Attach a blob storage datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  name: az ml datastore attach-dbfs
-  summary: Attach a Databricks File System datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-  name: az ml datastore attach-file
-  summary: Attach a file share datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  name: az ml datastore attach-mysqldb
-  summary: Attach an Azure MySQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  name: az ml datastore attach-psqldb
-  summary: Attach an Azure PostgreSQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  name: az ml datastore attach-sqldb
-  summary: Attach an Azure SQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_detach
-  name: az ml datastore detach
-  summary: Detach a datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_download
-  name: az ml datastore download
-  summary: Download files from a Datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_list
-  name: az ml datastore list
-  summary: List datastores in the workspace.
-- uid: ext_azure-cli-ml_az_ml_datastore_set_default
-  name: az ml datastore set-default
-  summary: Set the workspace default datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show
-  name: az ml datastore show
-  summary: Show a single datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show_default
-  name: az ml datastore show-default
-  summary: Show the workspace default datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_upload
-  name: az ml datastore upload
-  summary: Upload files to a Datastore.
-- uid: ext_azure-cli-ml_az_ml_endpoint
-  name: az ml endpoint
-  summary: Manage machine learning endpoints.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-  name: az ml endpoint realtime
-  summary: Manage operationalized realtime endpoints.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_environment
-  name: az ml environment
-  summary: Commands to manage environments.
-- uid: ext_azure-cli-ml_az_ml_environment_download
-  name: az ml environment download
-  summary: Download an environment definition to a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_list
-  name: az ml environment list
-  summary: List environments in a workspace.
-- uid: ext_azure-cli-ml_az_ml_environment_register
-  name: az ml environment register
-  summary: Register an environment definition from a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_scaffold
-  name: az ml environment scaffold
-  summary: Scaffold the files for a default environment definition in the specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_show
-  name: az ml environment show
-  summary: Show an environment by name and optionally version.
-- uid: ext_azure-cli-ml_az_ml_experiment
-  name: az ml experiment
-  summary: Commands to manage experiments.
-- uid: ext_azure-cli-ml_az_ml_experiment_list
-  name: az ml experiment list
-  summary: List experiments in a workspace.
-- uid: ext_azure-cli-ml_az_ml_folder
-  name: az ml folder
-  summary: Folder subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_folder_attach
-  name: az ml folder attach
-  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
-- uid: ext_azure-cli-ml_az_ml_model
-  name: az ml model
-  summary: Manage machine learning models.
-- uid: ext_azure-cli-ml_az_ml_model_delete
-  name: az ml model delete
-  summary: Delete a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_deploy
-  name: az ml model deploy
-  summary: Deploy model(s) from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_download
-  name: az ml model download
-  summary: Download a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_list
-  name: az ml model list
-  summary: List models in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_package
-  name: az ml model package
-  summary: Package a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_profile
-  name: az ml model profile
-  summary: Profile model(s) in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_register
-  name: az ml model register
-  summary: Register a model to the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_show
-  name: az ml model show
-  summary: Show a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_update
-  name: az ml model update
-  summary: Update a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline
-  name: az ml pipeline
-  summary: Pipeline subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone
-  name: az ml pipeline clone
-  summary: Generate yml definition describing the pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  name: az ml pipeline clone-draft
-  summary: Create a pipeline draft from an existing pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create
-  name: az ml pipeline create
-  summary: Create a pipeline from a yaml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-  name: az ml pipeline create-draft
-  summary: Create a pipeline draft from a yml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  name: az ml pipeline create-schedule
-  summary: Create a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  name: az ml pipeline delete-draft
-  summary: Delete a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable
-  name: az ml pipeline disable
-  summary: Disable a pipeline from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  name: az ml pipeline disable-schedule
-  summary: Disable a schedule from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable
-  name: az ml pipeline enable
-  summary: Enable a pipeline and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  name: az ml pipeline enable-schedule
-  summary: Enable a schedule and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_get
-  name: az ml pipeline get
-  summary: Generate yml definition describing the pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  name: az ml pipeline last-pipeline-run
-  summary: Show last pipeline run for a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list
-  name: az ml pipeline list
-  summary: List all pipelines and respective schedules in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  name: az ml pipeline list-drafts
-  summary: List pipeline drafts in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-  name: az ml pipeline list-steps
-  summary: List the step runs generated from a pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  name: az ml pipeline pipeline-runs-list
-  summary: List pipeline runs generated from a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  name: az ml pipeline publish-draft
-  summary: Publish a pipeline draft as a published pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show
-  name: az ml pipeline show
-  summary: Show details of a pipeline and respective schedules.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-  name: az ml pipeline show-draft
-  summary: Show details of a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  name: az ml pipeline show-schedule
-  summary: Show details of a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  name: az ml pipeline submit-draft
-  summary: Submit a run from the pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-  name: az ml pipeline update-draft
-  summary: Update a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-  name: az ml pipeline update-schedule
-  summary: Update a schedule.
-- uid: ext_azure-cli-ml_az_ml_run
-  name: az ml run
-  summary: Commands for submitting, updating, and monitoring runs.
-- uid: ext_azure-cli-ml_az_ml_run_cancel
-  name: az ml run cancel
-  summary: Cancel run.
-- uid: ext_azure-cli-ml_az_ml_run_download_logs
-  name: az ml run download-logs
-  summary: Download log files.
-- uid: ext_azure-cli-ml_az_ml_run_list
-  name: az ml run list
-  summary: List runs.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-  name: az ml run monitor-logs
-  summary: Monitor the logs for an existing run.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  name: az ml run monitor-tensorboard
-  summary: Monitor an existing run using tensorboard.
-- uid: ext_azure-cli-ml_az_ml_run_show
-  name: az ml run show
-  summary: Show run.
-- uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  name: az ml run submit-hyperdrive
-  summary: Submit a hyper parameter sweep using run config.
-- uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-  name: az ml run submit-pipeline
-  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
-- uid: ext_azure-cli-ml_az_ml_run_submit_script
-  name: az ml run submit-script
-  summary: Submit a script for execution.
-- uid: ext_azure-cli-ml_az_ml_run_update
-  name: az ml run update
-  summary: Update the run by adding tags.
-- uid: ext_azure-cli-ml_az_ml_service
-  name: az ml service
-  summary: Manage operationalized services.
-- uid: ext_azure-cli-ml_az_ml_service_delete
-  name: az ml service delete
-  summary: Delete a service from the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_get_access_token
-  name: az ml service get-access-token
-  summary: Get a token to issue requests a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_keys
-  name: az ml service get-keys
-  summary: Get keys to issue requests against a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_logs
-  name: az ml service get-logs
-  summary: Get logs for a service.
-- uid: ext_azure-cli-ml_az_ml_service_list
-  name: az ml service list
-  summary: List services in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_regen_key
-  name: az ml service regen-key
-  summary: Regenerate keys for a service.
-- uid: ext_azure-cli-ml_az_ml_service_run
-  name: az ml service run
-  summary: Run a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_show
-  name: az ml service show
-  summary: Show details for a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_update
-  name: az ml service update
-  summary: Update a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace
-  name: az ml workspace
-  summary: Workspace subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_workspace_create
-  name: az ml workspace create
-  summary: Create a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_delete
-  name: az ml workspace delete
-  summary: Delete a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_list
-  name: az ml workspace list
-  summary: List workspaces.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-  name: az ml workspace private-endpoint
-  summary: Workspace private endpoint subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_share
-  name: az ml workspace share
-  summary: Share a workspace with another user with a given role.
-- uid: ext_azure-cli-ml_az_ml_workspace_show
-  name: az ml workspace show
-  summary: Show a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-  name: az ml workspace sync-keys
-  summary: Sync workspace keys  for dependent resources such as storage, acr, and app insights.
-- uid: ext_azure-cli-ml_az_ml_workspace_update
-  name: az ml workspace update
-  summary: Update a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Azureml._cli commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml
deleted file mode 100644
index 794bfb64db..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget.yml
+++ /dev/null
@@ -1,217 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget
-  name: az ml computetarget
-  summary: Computetarget subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_delete
-  - ext_azure-cli-ml_az_ml_computetarget_detach
-  - ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  - ext_azure-cli-ml_az_ml_computetarget_list
-  - ext_azure-cli-ml_az_ml_computetarget_show
-- uid: ext_azure-cli-ml_az_ml_computetarget_delete
-  name: az ml computetarget delete
-  summary: Delete a compute target (aks or amlcompute).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the enviroment to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_detach
-  name: az ml computetarget detach
-  summary: Detach a compute target (aks or remote) from a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to detach.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the enviroment to detach.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  name: az ml computetarget get-credentials
-  summary: Get credentials for a compute target (aks or remote).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to retrieve keys for.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the compute target to get credentials for.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_list
-  name: az ml computetarget list
-  summary: List all the compute targets attached to a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the compute target to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_show
-  name: az ml computetarget show
-  summary: Show details of a specific compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the compute target to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-  name: az ml computetarget amlcompute
-  summary: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach
-  name: az ml computetarget attach
-  summary: Attach subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create
-  name: az ml computetarget create
-  summary: Create a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_delete
-  name: az ml computetarget delete
-  summary: Delete a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_detach
-  name: az ml computetarget detach
-  summary: Detach a compute target (aks or remote) from a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-  name: az ml computetarget get-credentials
-  summary: Get credentials for a compute target (aks or remote).
-- uid: ext_azure-cli-ml_az_ml_computetarget_list
-  name: az ml computetarget list
-  summary: List all the compute targets attached to a workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_show
-  name: az ml computetarget show
-  summary: Show details of a specific compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update
-  name: az ml computetarget update
-  summary: Update a compute target (aks or amlcompute).
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Computetarget subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml
deleted file mode 100644
index e6057f8888..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-  name: az ml computetarget amlcompute
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml
deleted file mode 100644
index 9ab80e22bb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/amlcompute/identity.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-  name: az ml computetarget amlcompute identity
-  summary: AzureML compute target identity commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  - ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  - ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --identities
-    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie <ResourceID1>,<ResourceID2>) to set user assigned identities.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --identities
-    summary: Use '[system]' to remove a system assigned identity else input resource IDs separated by commas (ie <ResourceID1>,<ResourceID2>) to remove user assigned identities.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-  name: az ml computetarget amlcompute identity assign
-  summary: Assign identity to an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-  name: az ml computetarget amlcompute identity remove
-  summary: Remove identity from an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-  name: az ml computetarget amlcompute identity show
-  summary: Display identities of an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: AzureML compute target identity commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml
deleted file mode 100644
index 5c35393e3d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/attach.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach
-  name: az ml computetarget attach
-  summary: Attach subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  - ext_azure-cli-ml_az_ml_computetarget_attach_remote
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --compute-resource-id -i
-    summary: Resource ID of the compute object to attach to the workspace.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Specifies the compute target name. Must be unique to the workspace.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address -a
-    summary: DNS name or IP address of the target.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Specifies the compute target name. Must be unique to the workspace.
-    description: ''
-  - isRequired: true
-    name: --ssh-port
-    defaultValue: "22"
-    summary: Ssh port that can be use to connect to the compute.
-    description: ''
-  - isRequired: true
-    name: --username -u
-    summary: The username for the remote machine being attached. Must also provide either a password or public and private key files.
-    description: ''
-  - name: --password -p
-    summary: The password for the remote machine being attached. Must either provide a password or public and private key files.
-    description: ''
-  - name: --private-key-file
-    summary: Path to a file containing the private key information for the remote machine being attached.
-    description: ''
-  - name: --private-key-passphrase
-    summary: Passphrase for private key specified with the --private-key-file option.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-  name: az ml computetarget attach aks
-  summary: Attach an AKS cluster to the workspace.
-- uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-  name: az ml computetarget attach remote
-  summary: Attach a remote machine without Docker as a compute target to the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Attach subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml
deleted file mode 100644
index 3ae03420e3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/create.yml
+++ /dev/null
@@ -1,226 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_create
-  name: az ml computetarget create
-  summary: Create a compute target (aks or amlcompute).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_create_aks
-  - ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  - ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --agent-count -a
-    summary: 'Number of agents to provision with the AKS cluster. Default: 3.'
-    description: ''
-  - name: --cluster-purpose
-    summary: 'Targeted purpose of the cluster. This is used when provisioning AzureML components to ensure the desired level of fault-tolerance and QoS. Accepted values are "FastProd" and "DevTest". Further detail of the use cases can be found here: <a href="https://aka.ms/azureml-create-new-aks-cluster">https://aka.ms/azureml-create-new-aks-cluster</a>.'
-    description: ''
-  - name: --dns-service-ip
-    summary: Containers DNS server IP address.
-    description: ''
-  - name: --docker-bridge-cidr
-    summary: A CIDR notation IP for Docker bridge.
-    description: ''
-  - name: --load-balancer-subnet
-    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
-    description: ''
-  - name: --load-balancer-type
-    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
-    description: ''
-  - name: --location -l
-    summary: Location to provision cluster in. If not specified, will default to workspace location.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --service-cidr
-    summary: A CIDR notation IP range from which to assign service cluster IPs.
-    description: ''
-  - name: --ssl-cert-file
-    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
-    description: ''
-  - name: --ssl-cname
-    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
-    description: ''
-  - name: --ssl-key-file
-    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
-    description: ''
-  - name: --ssl-leaf-domain-label
-    summary: Leaf domain label to use for the auto generated certificate.
-    description: ''
-  - name: --ssl-overwrite-domain
-    summary: When set overwrites the existing leaf domain label.
-    description: ''
-  - name: --subnet-name
-    summary: Name of the subnet inside the vnet.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --vm-size -s
-    summary: 'VM size to use for the compute target. A full list of options can be found here: <a href="https://aka.ms/azureml-aks-details">https://aka.ms/azureml-aks-details</a> Default: Standard_D3_v2.'
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network.
-    description: ''
-  - name: --vnet-resourcegroup-name
-    summary: Name of the resource group where the virtual network is located.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --max-nodes
-    summary: 'Maximum number of nodes to use. Default: 4.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - isRequired: true
-    name: --vm-size -s
-    summary: 'VM size to use for the compute target. More details can be found here: <a href="https://aka.ms/azureml-vm-details">https://aka.ms/azureml-vm-details</a> Default: Standard_NC6.'
-    description: ''
-  - name: --admin-user-password
-    summary: Password of the administrator user account.
-    description: ''
-  - name: --admin-user-ssh-key
-    summary: SSH public key of the administrator user account.
-    description: ''
-  - name: --admin-username
-    summary: Name of the administrator user account which can be used to SSH into nodes.
-    description: ''
-  - name: --assign-identity
-    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie <ResourceID1>,<ResourceID2>) to set user assigned identities.
-    description: ''
-  - name: --description
-    summary: Description of the compute target.
-    description: ''
-  - name: --idle-seconds-before-scaledown
-    summary: 'Node idle time in seconds before scaling down the cluster. Default: 120.'
-    description: ''
-  - name: --min-nodes
-    summary: 'Minimum number of nodes to use. Default: 0.'
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --remote-login-port-public-access
-    summary: 'State of the public SSH port. Possible values are: Enabled or Disabled.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subnet-name
-    summary: Name of the subnet inside the vnet.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --vm-priority -p
-    summary: "VM priority to use for the compute target. (Options are 'dedicated', 'lowpriority') Default: dedicated."
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network.
-    description: ''
-  - name: --vnet-resourcegroup-name
-    summary: Name of the resource group where the virtual network is located.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --location -l
-    summary: Location to provision cluster in. If not specified, will default to workspace location.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-  name: az ml computetarget create aks
-  summary: Create an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-  name: az ml computetarget create amlcompute
-  summary: Create an AzureML compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-  name: az ml computetarget create datafactory
-  summary: Create a data factory compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create a compute target (aks or amlcompute).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml
deleted file mode 100644
index 624badc4d1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/computetarget/update.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_computetarget_update
-  name: az ml computetarget update
-  summary: Update a compute target (aks or amlcompute).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_computetarget_update_aks
-  - ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to update.
-    description: ''
-  - name: --load-balancer-subnet
-    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
-    description: ''
-  - name: --load-balancer-type
-    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --ssl-cert-file
-    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
-    description: ''
-  - name: --ssl-cname
-    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
-    description: ''
-  - name: --ssl-disable
-    summary: Disable SSL validation.
-    description: ''
-  - name: --ssl-key-file
-    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
-    description: ''
-  - name: --ssl-leaf-domain-label
-    summary: Leaf domain label to use for the auto generated certificate.
-    description: ''
-  - name: --ssl-overwrite-domain
-    summary: When set overwrites the existing leaf domain label.
-    description: ''
-  - name: --ssl-renew
-    summary: Refreshes the auto generated certificate. If provided, the existing SSL configuration must be auto.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of compute target to provision.
-    description: ''
-  - name: --idle-seconds-before-scaledown
-    summary: Node idle time in seconds before scaling down the cluster.
-    description: ''
-  - name: --max-nodes
-    summary: Maximum number of nodes to use.
-    description: ''
-  - name: --min-nodes
-    summary: Minimum number of nodes to use.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to create this compute target under.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-  name: az ml computetarget update aks
-  summary: Update an AKS compute target.
-- uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-  name: az ml computetarget update amlcompute
-  summary: Update an AzureML compute target.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Update a compute target (aks or amlcompute).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml
deleted file mode 100644
index 9cfb2a8de5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/dataset.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_dataset
-  name: az ml dataset
-  summary: Commands for managing datasets in Azure Machine Learning Workspace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_dataset_archive
-  - ext_azure-cli-ml_az_ml_dataset_deprecate
-  - ext_azure-cli-ml_az_ml_dataset_list
-  - ext_azure-cli-ml_az_ml_dataset_reactivate
-  - ext_azure-cli-ml_az_ml_dataset_register
-  - ext_azure-cli-ml_az_ml_dataset_show
-  - ext_azure-cli-ml_az_ml_dataset_unregister
-- uid: ext_azure-cli-ml_az_ml_dataset_archive
-  name: az ml dataset archive
-  summary: Archive an active or deprecated dataset.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id -i
-    summary: Dataset ID (guid).
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-  name: az ml dataset deprecate
-  summary: Deprecate an active dataset in a workspace by another dataset.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --deprecate-by-id -d
-    summary: Dataset ID (guid) which is the intended replacement for this Dataset.
-    description: ''
-  - name: --id -i
-    summary: Dataset ID (guid).
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_list
-  name: az ml dataset list
-  summary: List all datasets in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-  name: az ml dataset reactivate
-  summary: Reactivate an archived or deprecated dataset.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id -i
-    summary: Dataset ID (guid).
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_register
-  name: az ml dataset register
-  summary: Register a new dataset from the specified file.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --file -f
-    summary: Specification file for dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --show-template
-    summary: Show template of dataset specification file.
-    description: ''
-  - name: --skip-validation
-    summary: Skip validation that ensures data can be loaded from the dataset before registration.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_show
-  name: az ml dataset show
-  summary: Get details of a dataset by its id or registration name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id -i
-    summary: ID of the dataset saved to workspace.
-    description: ''
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version -v
-    defaultValue: latest
-    summary: Registration version of the dataset.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_dataset_unregister
-  name: az ml dataset unregister
-  summary: Unregister all versions under the specified registration name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --name -n
-    summary: Registration name of the dataset.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_dataset_archive
-  name: az ml dataset archive
-  summary: Archive an active or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-  name: az ml dataset deprecate
-  summary: Deprecate an active dataset in a workspace by another dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_list
-  name: az ml dataset list
-  summary: List all datasets in the workspace.
-- uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-  name: az ml dataset reactivate
-  summary: Reactivate an archived or deprecated dataset.
-- uid: ext_azure-cli-ml_az_ml_dataset_register
-  name: az ml dataset register
-  summary: Register a new dataset from the specified file.
-- uid: ext_azure-cli-ml_az_ml_dataset_show
-  name: az ml dataset show
-  summary: Get details of a dataset by its id or registration name.
-- uid: ext_azure-cli-ml_az_ml_dataset_unregister
-  name: az ml dataset unregister
-  summary: Unregister all versions under the specified registration name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for managing datasets in Azure Machine Learning Workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml
deleted file mode 100644
index c4d4788326..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/datastore.yml
+++ /dev/null
@@ -1,745 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_datastore
-  name: az ml datastore
-  summary: Commands for managing and using datastores with the Azure ML Workspace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_datastore_attach_adls
-  - ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  - ext_azure-cli-ml_az_ml_datastore_attach_blob
-  - ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  - ext_azure-cli-ml_az_ml_datastore_attach_file
-  - ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  - ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  - ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  - ext_azure-cli-ml_az_ml_datastore_detach
-  - ext_azure-cli-ml_az_ml_datastore_download
-  - ext_azure-cli-ml_az_ml_datastore_list
-  - ext_azure-cli-ml_az_ml_datastore_set_default
-  - ext_azure-cli-ml_az_ml_datastore_show
-  - ext_azure-cli-ml_az_ml_datastore_show_default
-  - ext_azure-cli-ml_az_ml_datastore_upload
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-  name: az ml datastore attach-adls
-  summary: Attach an ADLS datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --client-id
-    summary: The service principal's client/application ID.
-    description: ''
-  - isRequired: true
-    name: --client-secret
-    summary: The service principal's secret.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --store-name -c
-    summary: The ADLS store name.
-    description: ''
-  - isRequired: true
-    name: --tenant-id
-    summary: The service principal Tenant ID.
-    description: ''
-  - name: --adls-resource-group
-    summary: The resource group the ADLS store belongs to.
-    description: ''
-  - name: --adls-subscription-id
-    summary: The ID of the subscription the ADLS store belongs to.
-    description: ''
-  - name: --authority-url
-    defaultValue: <a href="https://login.microsoftonline.com">https://login.microsoftonline.com</a>
-    summary: Authority url used to authenticate the user.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --resource-url
-    defaultValue: <a href="https://datalake.azure.net/">https://datalake.azure.net/</a>
-    summary: Determines what operations will be performed on the data lake store. Defaults to <a href="https://datalake.azure.net/">https://datalake.azure.net/</a> allowing for filesystem operations.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  name: az ml datastore attach-adls-gen2
-  summary: Attach a ADLS Gen2 datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the storage account.
-    description: ''
-  - isRequired: true
-    name: --client-id
-    summary: The service principal's client/application ID.
-    description: ''
-  - isRequired: true
-    name: --client-secret
-    summary: The service principal's secret.
-    description: ''
-  - isRequired: true
-    name: --file-system -c
-    summary: The file system name of the ADLS Gen2.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --tenant-id
-    summary: The service principal Tenant ID.
-    description: ''
-  - name: --authority-url
-    defaultValue: <a href="https://login.microsoftonline.com">https://login.microsoftonline.com</a>
-    summary: Authority url used to authenticate the user.
-    description: ''
-  - name: --endpoint
-    defaultValue: core.windows.net
-    summary: The endpoint of the storage account. Defaults to core.windows.net.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --protocol
-    defaultValue: https
-    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --resource-url
-    defaultValue: <a href="https://storage.azure.com/">https://storage.azure.com/</a>
-    summary: Determines what operations will be performed on the data lake store. Defaults to <a href="https://storage.azure.com/">https://storage.azure.com/</a> allowing for filesystem operations.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-  name: az ml datastore attach-blob
-  summary: Attach a blob storage datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the storage account.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The blob container name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --account-key -k
-    summary: The storage account key.
-    description: ''
-  - name: --endpoint
-    defaultValue: core.windows.net
-    summary: The endpoint of the storage account. Defaults to core.windows.net.
-    description: ''
-  - name: --grant-workspace-msi-access
-    summary: Grants Workspace Managed Service Identity (MSI) access to the storage account. Defaults to False. This should be set if the storage account is in a VNet. If set to True, we will use the current user's identity to grant the Workspace MSI access to the storage account. It may take up to 5 minutes for the granted access to take effect so the first time you run this, it can fail. If such an event occurs, please rerun this command after 5 minutes. If this error persists, please contact Azure Support.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --protocol
-    defaultValue: https
-    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --sas-token
-    summary: A SAS token for the blob container.
-    description: ''
-  - name: --storage-account-resource-group
-    summary: The resource group of the storage account.
-    description: ''
-  - name: --storage-account-subscription-id
-    summary: The subscription ID of the storage account.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  name: az ml datastore attach-dbfs
-  summary: Attach a Databricks File System datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-  name: az ml datastore attach-file
-  summary: Attach a file share datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the storage account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --share-name -c
-    summary: The file share name.
-    description: ''
-  - name: --account-key -k
-    summary: The storage account key.
-    description: ''
-  - name: --endpoint
-    defaultValue: core.windows.net
-    summary: The endpoint of the storage account. Defaults to core.windows.net.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --protocol
-    defaultValue: https
-    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --sas-token
-    summary: A SAS token for the blob container.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  name: az ml datastore attach-mysqldb
-  summary: Attach an Azure MySQL datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --database-name -d
-    summary: The database name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --password -p
-    summary: The password.
-    description: ''
-  - isRequired: true
-    name: --server-name
-    summary: The SQL/PostgreSQL/MySQL server name.
-    description: ''
-  - isRequired: true
-    name: --user-id -u
-    summary: The user ID.
-    description: ''
-  - name: --endpoint
-    defaultValue: mysql.database.azure.com
-    summary: The endpoint of the server. Defaults to mysql.database.azure.com.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --port
-    defaultValue: "5432"
-    summary: The port number.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  name: az ml datastore attach-psqldb
-  summary: Attach an Azure PostgreSQL datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --database-name -d
-    summary: The database name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --password -p
-    summary: The password.
-    description: ''
-  - isRequired: true
-    name: --server-name
-    summary: The SQL/PostgreSQL/MySQL server name.
-    description: ''
-  - isRequired: true
-    name: --user-id -u
-    summary: The user ID.
-    description: ''
-  - name: --endpoint
-    defaultValue: postgres.database.azure.com
-    summary: The endpoint of the server. Defaults to postgres.database.azure.com.
-    description: ''
-  - name: --enforce-ssl
-    defaultValue: "1"
-    summary: This sets the ssl value of the server. Defaults to true if not set.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --port
-    defaultValue: "5432"
-    summary: The port number.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  name: az ml datastore attach-sqldb
-  summary: Attach an Azure SQL datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --database-name -d
-    summary: The database name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --server-name
-    summary: The SQL/PostgreSQL/MySQL server name.
-    description: ''
-  - name: --authority-url
-    defaultValue: <a href="https://login.microsoftonline.com">https://login.microsoftonline.com</a>
-    summary: Authority url used to authenticate the user.
-    description: ''
-  - name: --client-id
-    summary: The service principal/application ID.
-    description: ''
-  - name: --client-secret
-    summary: The service principal's secret.
-    description: ''
-  - name: --endpoint
-    defaultValue: database.windows.net
-    summary: The endpoint of the sql server. Defaults to database.windows.net.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --password
-    summary: The password of the database user to access the database.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --resource-url
-    defaultValue: <a href="https://database.windows.net/">https://database.windows.net/</a>
-    summary: Determines what operations will be performed on the database.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tenant-id
-    summary: The service principal Tenant ID.
-    description: ''
-  - name: --username
-    summary: The username of the database user to access the database.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_detach
-  name: az ml datastore detach
-  summary: Detach a datastore by name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_download
-  name: az ml datastore download
-  summary: Download files from a Datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --target-path -d
-    summary: Target path for the downloaded files.
-    description: ''
-  - name: --hide-progress
-    summary: Whether to hide progress of operation.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite target files if they exist.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --prefix -p
-    summary: Path filter for files to download. If none is provided, downloads everything.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_list
-  name: az ml datastore list
-  summary: List datastores in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_set_default
-  name: az ml datastore set-default
-  summary: Set the workspace default datastore by name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_show
-  name: az ml datastore show
-  summary: Show a single datastore by name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_show_default
-  name: az ml datastore show-default
-  summary: Show the workspace default datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-secret
-    summary: Show the registered secret for the datastores.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_datastore_upload
-  name: az ml datastore upload
-  summary: Upload files to a Datastore.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The datastore name.
-    description: ''
-  - isRequired: true
-    name: --src-path -p
-    summary: Path from which to upload data.
-    description: ''
-  - name: --hide-progress
-    summary: Whether to hide progress of operation.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite target files if they exist.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --target-path -u
-    summary: Path to upload data in the container. Uploads to the root by default.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-  name: az ml datastore attach-adls
-  summary: Attach an ADLS datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-  name: az ml datastore attach-adls-gen2
-  summary: Attach a ADLS Gen2 datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-  name: az ml datastore attach-blob
-  summary: Attach a blob storage datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-  name: az ml datastore attach-dbfs
-  summary: Attach a Databricks File System datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-  name: az ml datastore attach-file
-  summary: Attach a file share datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-  name: az ml datastore attach-mysqldb
-  summary: Attach an Azure MySQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-  name: az ml datastore attach-psqldb
-  summary: Attach an Azure PostgreSQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-  name: az ml datastore attach-sqldb
-  summary: Attach an Azure SQL datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_detach
-  name: az ml datastore detach
-  summary: Detach a datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_download
-  name: az ml datastore download
-  summary: Download files from a Datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_list
-  name: az ml datastore list
-  summary: List datastores in the workspace.
-- uid: ext_azure-cli-ml_az_ml_datastore_set_default
-  name: az ml datastore set-default
-  summary: Set the workspace default datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show
-  name: az ml datastore show
-  summary: Show a single datastore by name.
-- uid: ext_azure-cli-ml_az_ml_datastore_show_default
-  name: az ml datastore show-default
-  summary: Show the workspace default datastore.
-- uid: ext_azure-cli-ml_az_ml_datastore_upload
-  name: az ml datastore upload
-  summary: Upload files to a Datastore.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for managing and using datastores with the Azure ML Workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml
deleted file mode 100644
index 4993d1e9c9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_endpoint
-  name: az ml endpoint
-  summary: Manage machine learning endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-  name: az ml endpoint realtime
-  summary: Manage operationalized realtime endpoints.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage machine learning endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml
deleted file mode 100644
index 7eca24b277..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/endpoint/realtime.yml
+++ /dev/null
@@ -1,660 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-  name: az ml endpoint realtime
-  summary: Manage operationalized realtime endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  - ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name.
-    description: ''
-  - isRequired: true
-    name: --version-name --vn
-    summary: The version name to create in an Endpoint.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --cvt --is-control-version-type
-    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON file containing deployment metadata.
-    description: ''
-  - name: --description -d
-    summary: Description of the service.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --is-default
-    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --tp --traffic-percentile
-    summary: The traffic percentile this version takes in Endpoint.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name.
-    description: ''
-  - isRequired: true
-    name: --version-name --vn
-    summary: The version name to delete.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --num_lines -l
-    defaultValue: "5000"
-    summary: Number of log lines to return from tail (default is 5000).
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --compute-type -c
-    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS', 'AKSENDPOINT').
-    description: ''
-  - name: --model-id
-    summary: If provided, will only show services that have the specified model id.
-    description: ''
-  - name: --model-name
-    summary: If provided, will only show services that have the specified model name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoints to list.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key -k
-    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Endpoint Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --set-key -s
-    summary: Provide auth value for the specified key.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name to score against.
-    description: ''
-  - name: --input-data -d
-    summary: The data to use for calling the endpoint.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to run.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the endpoint to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the endpoint to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name to update.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ae --auth-enabled
-    summary: Whether or not to enable key auth for this Endpoint. Defaults to False.
-    description: ''
-  - name: --ai --enable-app-insights
-    summary: Whether or not to enable AppInsights for this Endpoint. Defaults to False.
-    description: ''
-  - name: --description -d
-    summary: Description of the endpoint.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --remove-tag
-    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --token-auth-enabled
-    summary: Whether or not to enable token auth for this Endpoint. Defaults to False.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the Endpoint to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The endpoint name.
-    description: ''
-  - isRequired: true
-    name: --version-name --vn
-    summary: The version name to create in an Endpoint.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --cvt --is-control-version-type
-    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON file containing deployment metadata.
-    description: ''
-  - name: --description -d
-    summary: Description of the service.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --is-default
-    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --tp --traffic-percentile
-    summary: The traffic percentile this version takes in Endpoint.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-  name: az ml endpoint realtime create-version
-  summary: Create a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-  name: az ml endpoint realtime delete
-  summary: Delete a realtime endpoint and its version from the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-  name: az ml endpoint realtime delete-version
-  summary: Delete a version for realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-  name: az ml endpoint realtime get-access-token
-  summary: Get a token to issue requests a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-  name: az ml endpoint realtime get-keys
-  summary: Get keys to issue requests against a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-  name: az ml endpoint realtime get-logs
-  summary: Get logs for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-  name: az ml endpoint realtime list
-  summary: List realtime endpoints in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-  name: az ml endpoint realtime regen-key
-  summary: Regenerate keys for a realtime endpoint.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-  name: az ml endpoint realtime run
-  summary: Run a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-  name: az ml endpoint realtime show
-  summary: Show details for a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-  name: az ml endpoint realtime update
-  summary: Update a realtime endpoint in the workspace.
-- uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-  name: az ml endpoint realtime update-version
-  summary: Update a version for realtime endpoint in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage operationalized realtime endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml
deleted file mode 100644
index 9cf7b12103..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/environment.yml
+++ /dev/null
@@ -1,194 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_environment
-  name: az ml environment
-  summary: Commands to manage environments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_environment_download
-  - ext_azure-cli-ml_az_ml_environment_list
-  - ext_azure-cli-ml_az_ml_environment_register
-  - ext_azure-cli-ml_az_ml_environment_scaffold
-  - ext_azure-cli-ml_az_ml_environment_show
-- uid: ext_azure-cli-ml_az_ml_environment_download
-  name: az ml environment download
-  summary: Download an environment definition to a specified directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --directory -d
-    summary: Directory for the environment.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite any existing destination folder.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version -v
-    summary: Version of the environment.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_list
-  name: az ml environment list
-  summary: List environments in a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_register
-  name: az ml environment register
-  summary: Register an environment definition from a specified directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --directory -d
-    summary: Directory for the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_scaffold
-  name: az ml environment scaffold
-  summary: Scaffold the files for a default environment definition in the specified directory.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --directory -d
-    summary: Directory for the environment.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_environment_show
-  name: az ml environment show
-  summary: Show an environment by name and optionally version.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the environment.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version -v
-    summary: Version of the environment.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_environment_download
-  name: az ml environment download
-  summary: Download an environment definition to a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_list
-  name: az ml environment list
-  summary: List environments in a workspace.
-- uid: ext_azure-cli-ml_az_ml_environment_register
-  name: az ml environment register
-  summary: Register an environment definition from a specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_scaffold
-  name: az ml environment scaffold
-  summary: Scaffold the files for a default environment definition in the specified directory.
-- uid: ext_azure-cli-ml_az_ml_environment_show
-  name: az ml environment show
-  summary: Show an environment by name and optionally version.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage environments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml
deleted file mode 100644
index 3509b62cbc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/experiment.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_experiment
-  name: az ml experiment
-  summary: Commands to manage experiments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_experiment_list
-- uid: ext_azure-cli-ml_az_ml_experiment_list
-  name: az ml experiment list
-  summary: List experiments in a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_experiment_list
-  name: az ml experiment list
-  summary: List experiments in a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage experiments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml
deleted file mode 100644
index 88033902ee..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/folder.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_folder
-  name: az ml folder
-  summary: Folder subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_folder_attach
-- uid: ext_azure-cli-ml_az_ml_folder_attach
-  name: az ml folder attach
-  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_folder_attach
-  name: az ml folder attach
-  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Folder subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml
deleted file mode 100644
index 7b9816b654..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/model.yml
+++ /dev/null
@@ -1,663 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_model
-  name: az ml model
-  summary: Manage machine learning models.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_model_delete
-  - ext_azure-cli-ml_az_ml_model_deploy
-  - ext_azure-cli-ml_az_ml_model_download
-  - ext_azure-cli-ml_az_ml_model_list
-  - ext_azure-cli-ml_az_ml_model_package
-  - ext_azure-cli-ml_az_ml_model_profile
-  - ext_azure-cli-ml_az_ml_model_register
-  - ext_azure-cli-ml_az_ml_model_show
-  - ext_azure-cli-ml_az_ml_model_update
-- uid: ext_azure-cli-ml_az_ml_model_delete
-  name: az ml model delete
-  summary: Delete a model from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --model-id -i
-    summary: ID of model to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_deploy
-  name: az ml model deploy
-  summary: Deploy model(s) from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the service deployed.
-    description: ''
-  - name: --ae --auth-enabled
-    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
-    description: ''
-  - name: --ai --enable-app-insights
-    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --base-image --bi
-    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
-    description: ''
-  - name: --base-image-registry --ir
-    summary: Image registry that contains the base image.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --compute-target --ct
-    summary: Name of compute target. Only applicable when deploying to AKS.
-    description: ''
-  - name: --compute-type --cp
-    summary: Compute type of service to deploy.
-    description: ''
-  - name: --cuda-version --cv
-    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON or YAML file containing deployment metadata.
-    description: ''
-  - name: --description
-    summary: Description of the service deployed.
-    description: ''
-  - name: --dn --dns-name-label
-    summary: The dns name for this Webservice.
-    description: ''
-  - name: --ds --extra-docker-file-steps
-    summary: Path to local file containing additional Docker steps to run when setting up image.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --eg --enable-gpu
-    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --key-name
-    summary: Key name for for encryption properties in customer-managed keys (CMK) for ACI.
-    description: ''
-  - name: --key-version
-    summary: Key version for for encryption properties in customer-managed keys (CMK) for ACI.
-    description: ''
-  - name: --kp --primary-key
-    summary: A primary auth key to use for this Webservice.
-    description: ''
-  - name: --ks --secondary-key
-    summary: A secondary auth key to use for this Webservice.
-    description: ''
-  - name: --lo --location
-    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: <a href="https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances">https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances</a>.'
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --namespace
-    summary: "Kubernetes namespace in which to deploy the service: up to 63 lowercase alphanumeric ('a'-'z', '0'-'9') and hyphen ('-') characters. The first and last characters cannot be hyphens. Only applicable when deploying to AKS."
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite the existing service if name conflicts.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --pi --profile-input
-    summary: Path to a JSON file containing profiling results.
-    description: ''
-  - name: --po --port
-    summary: The local port on which to expose the service's HTTP endpoint.
-    description: ''
-  - name: --property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --rt --runtime
-    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
-    description: ''
-  - name: --sc --ssl-cname
-    summary: The cname for if SSL is enabled.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --se --ssl-enabled
-    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
-    description: ''
-  - name: --sk --ssl-key-pem-file
-    summary: The key file needed if SSL is enabled.
-    description: ''
-  - name: --sp --ssl-cert-pem-file
-    summary: The cert file needed if SSL is enabled.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subnet-name
-    summary: Name of the subnet inside the vnet.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --token-auth-enabled
-    summary: Whether or not to enable token auth for this Webservice. Ignored if not deploying to AKS. Defaults to False.
-    description: ''
-  - name: --tp --traffic-percentile
-    summary: The amount of traffic the version takes in an endpoint. Can be a decimal. Defaults to 0.
-    description: ''
-  - name: --vault-base-url
-    summary: Vault base url for encryption properties in customer-managed keys (CMK) for ACI.
-    description: ''
-  - name: --version-name --vn
-    summary: The version name in an endpoint. Defaults to endpoint name for the first version.
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_download
-  name: az ml model download
-  summary: Download a model from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --model-id -i
-    summary: ID of model.
-    description: ''
-  - isRequired: true
-    name: --target-dir -t
-    summary: Target directory to download the model file to.
-    description: ''
-  - name: --overwrite
-    summary: Overwrite if the same name file exists in target directory.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing model to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_list
-  name: az ml model list
-  summary: List models in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --dataset-id
-    summary: If provided, will only show models with the specified dataset ID.
-    description: ''
-  - name: --model-name -n
-    summary: An optional model name to filter the list by.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --run-id
-    summary: If provided, will only show models with the specified Run ID.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing models to list.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_package
-  name: az ml model package
-  summary: Package a model in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the package.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for packaging. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for packaging.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for packaging.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be packaged. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --output-path
-    summary: Output path for docker context. If an output path is passed, instead of building an image in the workspace ACR, a dockerfile and the necessary build context will be writen to that path.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --rt --runtime
-    summary: Which runtime to use for package. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_profile
-  name: az ml model profile
-  summary: Profile model(s) in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the model profile.
-    description: ''
-  - name: --base-image --bi
-    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
-    description: ''
-  - name: --base-image-registry --ir
-    summary: Image registry that contains the base image.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: Double value for maximum CPU to use when profiling.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --description
-    summary: Description of the model profile.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --gb --memory-in-gb
-    summary: Double value for maximum Memory to use when profiling.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --idi --input-dataset-id
-    summary: ID of the Tabular Dataset to be used as input for the profile.
-    description: ''
-  - name: --input-data -d
-    summary: The data to use for calling the web service.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Path to a JSON file where profile results metadata will be written. Used as input for model deployment.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_register
-  name: az ml model register
-  summary: Register a model to the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of model to register.
-    description: ''
-  - name: --asset-path
-    summary: The cloud path where the experiement run stores the model file.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --description -d
-    summary: Description of the model.
-    description: ''
-  - name: --experiment-name
-    summary: The name of the experiment.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The default number of GPUs to allocate for this model.
-    description: ''
-  - name: --model-framework
-    summary: 'Framework of the model to register. Currently supported frameworks: TensorFlow, ScikitLearn, Onnx, Custom.'
-    description: ''
-  - name: --model-framework-version
-    summary: Framework version of the model to register (e.g. 1.0.0, 2.4.1).
-    description: ''
-  - name: --model-path -p
-    summary: Full path of the model file to register.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Path to a JSON file where model registration metadata will be written. Used as input for model deployment.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --run-id -r
-    summary: The ID for the experiment run where model is registered from.
-    description: ''
-  - name: --run-metadata-file -f
-    summary: Path to a JSON file containing experiement run metadata.
-    description: ''
-  - name: --sample-input-dataset-id
-    summary: The ID for the sample input dataset.
-    description: ''
-  - name: --sample-output-dataset-id
-    summary: The ID for the sample output dataset.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace to register this model with.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_show
-  name: az ml model show
-  summary: Show a model in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --model-id -i
-    summary: ID of model to show.
-    description: ''
-  - name: --model-name -n
-    summary: Name of model to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --run-id
-    summary: If provided, will only show models with the specified Run ID.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --version
-    summary: If provided, will only show models with the specified name and version.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing model to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_model_update
-  name: az ml model update
-  summary: Update a model in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --model-id -i
-    summary: ID of model.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --description
-    summary: Description to update the model with. Will replace the current description.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The default number of GPUs to allocate for this model.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --remove-tag
-    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --sample-input-dataset-id
-    summary: The ID for the sample input dataset.
-    description: ''
-  - name: --sample-output-dataset-id
-    summary: The ID for the sample output dataset.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_model_delete
-  name: az ml model delete
-  summary: Delete a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_deploy
-  name: az ml model deploy
-  summary: Deploy model(s) from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_download
-  name: az ml model download
-  summary: Download a model from the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_list
-  name: az ml model list
-  summary: List models in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_package
-  name: az ml model package
-  summary: Package a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_profile
-  name: az ml model profile
-  summary: Profile model(s) in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_register
-  name: az ml model register
-  summary: Register a model to the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_show
-  name: az ml model show
-  summary: Show a model in the workspace.
-- uid: ext_azure-cli-ml_az_ml_model_update
-  name: az ml model update
-  summary: Update a model in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage machine learning models.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml
deleted file mode 100644
index 4912ab8524..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/pipeline.yml
+++ /dev/null
@@ -1,619 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_pipeline
-  name: az ml pipeline
-  summary: Pipeline subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_pipeline_clone
-  - ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  - ext_azure-cli-ml_az_ml_pipeline_create
-  - ext_azure-cli-ml_az_ml_pipeline_create_draft
-  - ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  - ext_azure-cli-ml_az_ml_pipeline_disable
-  - ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_enable
-  - ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_get
-  - ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  - ext_azure-cli-ml_az_ml_pipeline_list
-  - ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  - ext_azure-cli-ml_az_ml_pipeline_list_steps
-  - ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  - ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  - ext_azure-cli-ml_az_ml_pipeline_show
-  - ext_azure-cli-ml_az_ml_pipeline_show_draft
-  - ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  - ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  - ext_azure-cli-ml_az_ml_pipeline_update_draft
-  - ext_azure-cli-ml_az_ml_pipeline_update_schedule
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone
-  name: az ml pipeline clone
-  summary: Generate yml definition describing the pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path -p
-    summary: File path to save pipeline yaml to.
-    description: ''
-  - isRequired: true
-    name: --pipeline-run-id -i
-    summary: ID of the PipelineRun to clone (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  name: az ml pipeline clone-draft
-  summary: Create a pipeline draft from an existing pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --experiment-name -e
-    summary: Experiment name of the specified PipelineRun.
-    description: ''
-  - name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to create PipelineDraft from.
-    description: ''
-  - name: --pipeline-id -p
-    summary: ID of the PublishedPipeline to create PipelineDraft from.
-    description: ''
-  - name: --pipeline-run-id -r
-    summary: ID of the PipelineRun to create PipelineDraft from.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_create
-  name: az ml pipeline create
-  summary: Create a pipeline from a yaml definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to assign to the pipeline.
-    description: ''
-  - isRequired: true
-    name: --pipeline-yaml -y
-    summary: YAML file which defines a pipeline.
-    description: ''
-  - name: --continue -c
-    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
-    description: ''
-  - name: --description -d
-    summary: Description text of the pipeline.
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --version -v
-    summary: Version string of the pipeline.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-  name: az ml pipeline create-draft
-  summary: Create a pipeline draft from a yml definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --experiment_name -e
-    summary: Experiment name for the pipeline draft.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to assign to the pipeline draft.
-    description: ''
-  - isRequired: true
-    name: --pipeline-yaml -y
-    summary: YAML file which defines the pipeline draft.
-    description: ''
-  - name: --continue -c
-    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
-    description: ''
-  - name: --description -d
-    summary: Description text of the pipeline draft.
-    description: ''
-  - name: --parameters
-    summary: PipelineParameters for the draft with 'key=value' syntax.
-    description: ''
-  - name: --properties -p
-    summary: Properties for the draft with 'key=value' syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --tags -t
-    summary: Tags for the draft with 'key=value' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  name: az ml pipeline create-schedule
-  summary: Create a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --experiment-name -e
-    summary: Name of experiment.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of schedule.
-    description: ''
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to create schedule (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --schedule-yaml -y
-    summary: Schedule  YAML input.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  name: az ml pipeline delete-draft
-  summary: Delete a pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to delete (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable
-  name: az ml pipeline disable
-  summary: Disable a pipeline from running.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to disable (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  name: az ml pipeline disable-schedule
-  summary: Disable a schedule from running.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable
-  name: az ml pipeline enable
-  summary: Enable a pipeline and allow it to run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to enable (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  name: az ml pipeline enable-schedule
-  summary: Enable a schedule and allow it to run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_get
-  name: az ml pipeline get
-  summary: Generate yml definition describing the pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path -p
-    summary: File path to save Pipeline yaml to.
-    description: ''
-  - name: --pipeline-draft-id -d
-    summary: ID of the PipelineDraft to get (guid).
-    description: ''
-  - name: --pipeline-id -i
-    summary: ID of the Pipeline to get (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  name: az ml pipeline last-pipeline-run
-  summary: Show last pipeline run for a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_list
-  name: az ml pipeline list
-  summary: List all pipelines and respective schedules in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  name: az ml pipeline list-drafts
-  summary: List pipeline drafts in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --tags -t
-    summary: Tags for a draft with 'key=value' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-  name: az ml pipeline list-steps
-  summary: List the step runs generated from a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  name: az ml pipeline pipeline-runs-list
-  summary: List pipeline runs generated from a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  name: az ml pipeline publish-draft
-  summary: Publish a pipeline draft as a published pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to publish.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_show
-  name: az ml pipeline show
-  summary: Show details of a pipeline and respective schedules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-id -i
-    summary: ID of the pipeline to show (guid).
-    description: ''
-  - name: --output-file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-  name: az ml pipeline show-draft
-  summary: Show details of a pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  name: az ml pipeline show-schedule
-  summary: Show details of a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  name: az ml pipeline submit-draft
-  summary: Submit a run from the pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to use to submit run.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-  name: az ml pipeline update-draft
-  summary: Update a pipeline draft.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --continue -c
-    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
-    description: ''
-  - name: --description -d
-    summary: Description text of the pipeline draft.
-    description: ''
-  - name: --experiment_name -e
-    summary: Experiment name for the pipeline draft.
-    description: ''
-  - name: --name -n
-    summary: Name to assign to the pipeline draft.
-    description: ''
-  - name: --parameters
-    summary: PipelineParameters for the draft with 'key=value' syntax.
-    description: ''
-  - name: --pipeline-draft-id -i
-    summary: ID of the PipelineDraft to update.
-    description: ''
-  - name: --pipeline-yaml -y
-    summary: YAML file which defines the pipeline draft.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --tags -t
-    summary: Tags for the draft with 'key=value' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-  name: az ml pipeline update-schedule
-  summary: Update a schedule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --schedule-id -s
-    summary: ID of the schedule to show (guid).
-    description: ''
-  - name: --name -n
-    summary: Name of the schedule to show (guid).
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --schedule-yaml -y
-    summary: Schedule  YAML input.
-    description: ''
-  - name: --status -t
-    summary: Status of the schedule to show (guid).
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone
-  name: az ml pipeline clone
-  summary: Generate yml definition describing the pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-  name: az ml pipeline clone-draft
-  summary: Create a pipeline draft from an existing pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create
-  name: az ml pipeline create
-  summary: Create a pipeline from a yaml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-  name: az ml pipeline create-draft
-  summary: Create a pipeline draft from a yml definition.
-- uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-  name: az ml pipeline create-schedule
-  summary: Create a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-  name: az ml pipeline delete-draft
-  summary: Delete a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable
-  name: az ml pipeline disable
-  summary: Disable a pipeline from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-  name: az ml pipeline disable-schedule
-  summary: Disable a schedule from running.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable
-  name: az ml pipeline enable
-  summary: Enable a pipeline and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-  name: az ml pipeline enable-schedule
-  summary: Enable a schedule and allow it to run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_get
-  name: az ml pipeline get
-  summary: Generate yml definition describing the pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-  name: az ml pipeline last-pipeline-run
-  summary: Show last pipeline run for a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list
-  name: az ml pipeline list
-  summary: List all pipelines and respective schedules in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-  name: az ml pipeline list-drafts
-  summary: List pipeline drafts in the workspace.
-- uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-  name: az ml pipeline list-steps
-  summary: List the step runs generated from a pipeline run.
-- uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-  name: az ml pipeline pipeline-runs-list
-  summary: List pipeline runs generated from a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-  name: az ml pipeline publish-draft
-  summary: Publish a pipeline draft as a published pipeline.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show
-  name: az ml pipeline show
-  summary: Show details of a pipeline and respective schedules.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-  name: az ml pipeline show-draft
-  summary: Show details of a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-  name: az ml pipeline show-schedule
-  summary: Show details of a schedule.
-- uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-  name: az ml pipeline submit-draft
-  summary: Submit a run from the pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-  name: az ml pipeline update-draft
-  summary: Update a pipeline draft.
-- uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-  name: az ml pipeline update-schedule
-  summary: Update a schedule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Pipeline subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml
deleted file mode 100644
index 5970b6942f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/run.yml
+++ /dev/null
@@ -1,438 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_run
-  name: az ml run
-  summary: Commands for submitting, updating, and monitoring runs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_run_cancel
-  - ext_azure-cli-ml_az_ml_run_download_logs
-  - ext_azure-cli-ml_az_ml_run_list
-  - ext_azure-cli-ml_az_ml_run_monitor_logs
-  - ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  - ext_azure-cli-ml_az_ml_run_show
-  - ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  - ext_azure-cli-ml_az_ml_run_submit_pipeline
-  - ext_azure-cli-ml_az_ml_run_submit_script
-  - ext_azure-cli-ml_az_ml_run_update
-- uid: ext_azure-cli-ml_az_ml_run_cancel
-  name: az ml run cancel
-  summary: Cancel run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_download_logs
-  name: az ml run download-logs
-  summary: Download log files.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --output-dir -d
-    summary: Output directory to download log files to.
-    description: ''
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_list
-  name: az ml run list
-  summary: List runs.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --compute-target-name
-    summary: The compute target name.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --last
-    defaultValue: "10"
-    summary: Fetch the latest N elements.
-    description: ''
-  - name: --minimal
-    summary: Flag to provide minimum properties for run output.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --parent-run-id
-    summary: Parent Run ID.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --pipeline-run-id
-    summary: Pipeline Run ID.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --status
-    parameterValueGroup: Completed, Failed, Finalizing, Preparing, Provisioning, Queued, Running, Starting
-    summary: Status of the run.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tags
-    summary: Tags for a run with 'key[=value]' syntax.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-  name: az ml run monitor-logs
-  summary: Monitor the logs for an existing run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  name: az ml run monitor-tensorboard
-  summary: Monitor an existing run using tensorboard.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --local-directory
-    summary: Local Directory to stage tensorboard files being monitored.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_show
-  name: az ml run show
-  summary: Show run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  name: az ml run submit-hyperdrive
-  summary: Submit a hyper parameter sweep using run config.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hyperdrive-configuration-name
-    summary: The full name of the hyperdrive configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
-    description: ''
-  - name: --async
-    summary: Disable output streaming.
-    description: ''
-  - name: --conda-dependencies -d
-    summary: Override the default Conda dependencies file.
-    description: ''
-  - name: --ct --target
-    summary: The name of the compute target to use for the run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --run-configuration-name -c
-    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
-    description: ''
-  - name: --source-directory
-    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-  - name: <USER_SCRIPT_AND_ARGUMENTS>
-    summary: The run submit arguments, like script name and script arguments.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-  name: az ml run submit-pipeline
-  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --datapaths -d
-    summary: Comma-separated list of name=datastore/path pairs for datapath parameter assignments.
-    description: ''
-  - name: --experiment-name -n
-    summary: Experiment name for run submission. If unspecified, use the pipeline name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --output_file -f
-    summary: File to write output in JSON format.
-    description: ''
-  - name: --parameters -p
-    summary: Comma-separated list of name=value pairs for pipeline parameter assignments.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --pipeline-id -i
-    summary: ID of a pipeline to submit (guid).
-    description: ''
-  - name: --pipeline-yaml -y
-    summary: YAML file which defines a pipeline.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_submit_script
-  name: az ml run submit-script
-  summary: Submit a script for execution.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --async
-    summary: Disable output streaming.
-    description: ''
-  - name: --conda-dependencies -d
-    summary: Override the default Conda dependencies file.
-    description: ''
-  - name: --ct --target
-    summary: The name of the compute target to use for the run.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --run-configuration-name -c
-    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
-    description: ''
-  - name: --source-directory
-    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-  - name: <USER_SCRIPT_AND_ARGUMENTS>
-    summary: The run submit arguments, like script name and script arguments.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_run_update
-  name: az ml run update
-  summary: Update the run by adding tags.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run -r
-    summary: The runId of an experiment run.
-    description: ''
-  - name: --add-tag
-    summary: Tag the entitiy with 'key[=value]' syntax.
-    description: ''
-  - name: --experiment-name -e
-    summary: Experiment name.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_run_cancel
-  name: az ml run cancel
-  summary: Cancel run.
-- uid: ext_azure-cli-ml_az_ml_run_download_logs
-  name: az ml run download-logs
-  summary: Download log files.
-- uid: ext_azure-cli-ml_az_ml_run_list
-  name: az ml run list
-  summary: List runs.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-  name: az ml run monitor-logs
-  summary: Monitor the logs for an existing run.
-- uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-  name: az ml run monitor-tensorboard
-  summary: Monitor an existing run using tensorboard.
-- uid: ext_azure-cli-ml_az_ml_run_show
-  name: az ml run show
-  summary: Show run.
-- uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-  name: az ml run submit-hyperdrive
-  summary: Submit a hyper parameter sweep using run config.
-- uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-  name: az ml run submit-pipeline
-  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
-- uid: ext_azure-cli-ml_az_ml_run_submit_script
-  name: az ml run submit-script
-  summary: Submit a script for execution.
-- uid: ext_azure-cli-ml_az_ml_run_update
-  name: az ml run update
-  summary: Update the run by adding tags.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for submitting, updating, and monitoring runs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml
deleted file mode 100644
index 9a854f8340..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/service.yml
+++ /dev/null
@@ -1,477 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_service
-  name: az ml service
-  summary: Manage operationalized services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_service_delete
-  - ext_azure-cli-ml_az_ml_service_get_access_token
-  - ext_azure-cli-ml_az_ml_service_get_keys
-  - ext_azure-cli-ml_az_ml_service_get_logs
-  - ext_azure-cli-ml_az_ml_service_list
-  - ext_azure-cli-ml_az_ml_service_regen_key
-  - ext_azure-cli-ml_az_ml_service_run
-  - ext_azure-cli-ml_az_ml_service_show
-  - ext_azure-cli-ml_az_ml_service_update
-- uid: ext_azure-cli-ml_az_ml_service_delete
-  name: az ml service delete
-  summary: Delete a service from the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The service name to delete.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to delete.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_get_access_token
-  name: az ml service get-access-token
-  summary: Get a token to issue requests a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_get_keys
-  name: az ml service get-keys
-  summary: Get keys to issue requests against a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_get_logs
-  name: az ml service get-logs
-  summary: Get logs for a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --num_lines -l
-    defaultValue: "5000"
-    summary: Number of log lines to return from tail (default is 5000).
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_list
-  name: az ml service list
-  summary: List services in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --compute-type -c
-    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS').
-    description: ''
-  - name: --image-digest
-    summary: If provided, will only show services that have the specified image digest.
-    description: ''
-  - name: --model-id
-    summary: If provided, will only show services that have the specified model id.
-    description: ''
-  - name: --model-name
-    summary: If provided, will only show services that have the specified model name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --property
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tag
-    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the services to list.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_regen_key
-  name: az ml service regen-key
-  summary: Regenerate keys for a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key -k
-    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Service Name.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --set-key -s
-    summary: Provide auth value for the specified key.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_run
-  name: az ml service run
-  summary: Run a service in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The service name to score against.
-    description: ''
-  - name: --input-data -d
-    summary: The data to use for calling the web service.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to run.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_show
-  name: az ml service show
-  summary: Show details for a service in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webservice to show.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to show.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_service_update
-  name: az ml service update
-  summary: Update a service in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The service name to update.
-    description: ''
-  - name: --add-property
-    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
-    description: ''
-  - name: --add-tag
-    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
-    description: ''
-  - name: --ae --auth-enabled
-    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
-    description: ''
-  - name: --ai --enable-app-insights
-    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
-    description: ''
-  - name: --ar --autoscale-refresh-seconds
-    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
-    description: ''
-  - name: --as --autoscale-enabled
-    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
-    description: ''
-  - name: --at --autoscale-target-utilization
-    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
-    description: ''
-  - name: --autoscale-max-replicas --ma
-    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
-    description: ''
-  - name: --autoscale-min-replicas --mi
-    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
-    description: ''
-  - name: --base-image --bi
-    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
-    description: ''
-  - name: --base-image-registry --ir
-    summary: Image registry that contains the base image.
-    description: ''
-  - name: --cc --cpu-cores
-    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
-    description: ''
-  - name: --cf --conda-file
-    summary: Path to local file containing a conda environment definition to use for the image.
-    description: ''
-  - name: --collect-model-data --md
-    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
-    description: ''
-  - name: --cuda-version --cv
-    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
-    description: ''
-  - name: --dc --deploy-config-file
-    summary: Path to a JSON file containing deployment metadata.
-    description: ''
-  - name: --description -d
-    summary: Description of the service.
-    description: ''
-  - name: --dn --dns-name-label
-    summary: The dns name for this Webservice.
-    description: ''
-  - name: --ds --extra-docker-file-steps
-    summary: Path to local file containing additional Docker steps to run when setting up image.
-    description: ''
-  - name: --ed --environment-directory
-    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
-    description: ''
-  - name: --eg --enable-gpu
-    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
-    description: ''
-  - name: --entry-script --es
-    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
-    description: ''
-  - name: --environment-name -e
-    summary: Name of Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --environment-version --ev
-    summary: Version of an existing Azure Machine Learning Environment for deployment.
-    description: ''
-  - name: --failure-threshold --ft
-    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
-    description: ''
-  - name: --gb --memory-gb
-    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
-    description: ''
-  - name: --gc --gpu-cores
-    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
-    description: ''
-  - name: --ic --inference-config-file
-    summary: Path to a JSON or YAML file containing inference configuration.
-    description: ''
-  - name: --id --initial-delay-seconds
-    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
-    description: ''
-  - name: --kp --primary-key
-    summary: A primary auth key to use for this Webservice.
-    description: ''
-  - name: --ks --secondary-key
-    summary: A secondary auth key to use for this Webservice.
-    description: ''
-  - name: --lo --location
-    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: <a href="https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances">https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&amp;products=container-instances</a>.'
-    description: ''
-  - name: --max-request-wait-time --mr
-    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
-    description: ''
-  - name: --model -m
-    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
-    description: ''
-  - name: --model-metadata-file -f
-    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
-    description: ''
-  - name: --no-wait
-    summary: Flag to not wait for asynchronous calls.
-    description: ''
-  - name: --nr --num-replicas
-    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
-    description: ''
-  - name: --path
-    summary: 'Path to a project folder. Default: current directory.'
-    description: ''
-  - name: --period-seconds --ps
-    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
-    description: ''
-  - name: --po --port
-    summary: The local port on which to expose the service's HTTP endpoint.
-    description: ''
-  - name: --remove-tag
-    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
-    description: ''
-  - name: --replica-max-concurrent-requests --rm
-    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group corresponding to the provided workspace.
-    description: ''
-  - name: --rt --runtime
-    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
-    description: ''
-  - name: --sc --ssl-cname
-    summary: The cname for if SSL is enabled. Only applicable when updating an ACI service.
-    description: ''
-  - name: --scoring-timeout-ms --tm
-    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
-    description: ''
-  - name: --sd --source-directory
-    summary: Path to folders that contain all files to create the image.
-    description: ''
-  - name: --se --ssl-enabled
-    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
-    description: ''
-  - name: --sk --ssl-key-pem-file
-    summary: The key file needed if SSL is enabled.
-    description: ''
-  - name: --sp --ssl-cert-pem-file
-    summary: The cert file needed if SSL is enabled.
-    description: ''
-  - name: --st --success-threshold
-    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --timeout-seconds --ts
-    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
-    description: ''
-  - name: --token-auth-enabled
-    summary: Whether or not to enable token auth for this Webservice. Only available for AKS web services. Defaults to False.
-    description: ''
-  - name: --workspace-name -w
-    summary: Name of the workspace containing the service to update.
-    description: ''
-  - name: -v
-    summary: Verbosity flag.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_service_delete
-  name: az ml service delete
-  summary: Delete a service from the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_get_access_token
-  name: az ml service get-access-token
-  summary: Get a token to issue requests a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_keys
-  name: az ml service get-keys
-  summary: Get keys to issue requests against a service.
-- uid: ext_azure-cli-ml_az_ml_service_get_logs
-  name: az ml service get-logs
-  summary: Get logs for a service.
-- uid: ext_azure-cli-ml_az_ml_service_list
-  name: az ml service list
-  summary: List services in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_regen_key
-  name: az ml service regen-key
-  summary: Regenerate keys for a service.
-- uid: ext_azure-cli-ml_az_ml_service_run
-  name: az ml service run
-  summary: Run a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_show
-  name: az ml service show
-  summary: Show details for a service in the workspace.
-- uid: ext_azure-cli-ml_az_ml_service_update
-  name: az ml service update
-  summary: Update a service in the workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage operationalized services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml
deleted file mode 100644
index c2cda04f16..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_workspace
-  name: az ml workspace
-  summary: Workspace subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_workspace_create
-  - ext_azure-cli-ml_az_ml_workspace_delete
-  - ext_azure-cli-ml_az_ml_workspace_list
-  - ext_azure-cli-ml_az_ml_workspace_share
-  - ext_azure-cli-ml_az_ml_workspace_show
-  - ext_azure-cli-ml_az_ml_workspace_sync_keys
-  - ext_azure-cli-ml_az_ml_workspace_update
-- uid: ext_azure-cli-ml_az_ml_workspace_create
-  name: az ml workspace create
-  summary: Create a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-  - name: --application-insights
-    summary: Application Insights to be associated with this workspace.
-    description: ''
-  - name: --cmk-keyvault
-    summary: The key vault containing the customer managed key in the Azure resource ID format.
-    description: ''
-  - name: --container-registry
-    summary: Container Registry to be associated with this workspace.
-    description: ''
-  - name: --exist-ok
-    summary: Do not fail if workspace exists.
-    description: ''
-  - name: --friendly-name -f
-    summary: Friendly name for this workspace.
-    description: ''
-  - name: --hbi-workspace
-    summary: Specifies whether the customer data is of High Business Impact(HBI), i.e., contains sensitive business information.
-    description: ''
-  - name: --keyvault
-    summary: Key Vault to be associated with this workspace.
-    description: ''
-  - name: --location -l
-    summary: Location for resource.
-    description: ''
-  - name: --pe-auto-approval
-    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
-    description: ''
-  - name: --pe-name
-    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
-    description: ''
-  - name: --pe-resource-group
-    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
-    description: ''
-  - name: --pe-subnet-name
-    defaultValue: default
-    summary: Name of the existing subnet to create the workspace private endpoint in.
-    description: ''
-  - name: --pe-subscription-id
-    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
-    description: ''
-  - name: --pe-vnet-name
-    summary: Name of the existing vnet to create the workspace private endpoint in.
-    description: ''
-  - name: --resource-cmk-uri
-    summary: The key URI of the customer managed key to encrypt the data at rest.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --sku
-    defaultValue: basic
-    summary: SKU/edition of a workspace -can be a 'basic' workspace or a feature rich 'enterprise' workspace.
-    description: ''
-  - name: --storage-account
-    summary: Storage account to be associated with this workspace.
-    description: ''
-  - name: --yes -y
-    summary: Create a resource group for this workspace.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_delete
-  name: az ml workspace delete
-  summary: Delete a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --all-resources
-    summary: Deletes resources which this workspace depends on like storage, acr, kv and app insights.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the workspace deletion to complete.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_list
-  name: az ml workspace list
-  summary: List workspaces.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_share
-  name: az ml workspace share
-  summary: Share a workspace with another user with a given role.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --role
-    summary: Role to assign to this user.
-    description: ''
-  - isRequired: true
-    name: --user
-    summary: User with whom to share this workspace.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_show
-  name: az ml workspace show
-  summary: Show a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-  name: az ml workspace sync-keys
-  summary: Sync workspace keys  for dependent resources such as storage, acr, and app insights.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_update
-  name: az ml workspace update
-  summary: Update a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --description -d
-    summary: Description of this workspace.
-    description: ''
-  - name: --friendly-name -f
-    summary: Friendly name.
-    description: ''
-  - name: --image-build-compute
-    summary: Compute target for image build.
-    description: ''
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --tags
-    summary: Tags associated with this workspace.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_workspace_create
-  name: az ml workspace create
-  summary: Create a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_delete
-  name: az ml workspace delete
-  summary: Delete a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_list
-  name: az ml workspace list
-  summary: List workspaces.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-  name: az ml workspace private-endpoint
-  summary: Workspace private endpoint subgroup commands.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_share
-  name: az ml workspace share
-  summary: Share a workspace with another user with a given role.
-- uid: ext_azure-cli-ml_az_ml_workspace_show
-  name: az ml workspace show
-  summary: Show a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-  name: az ml workspace sync-keys
-  summary: Sync workspace keys  for dependent resources such as storage, acr, and app insights.
-- uid: ext_azure-cli-ml_az_ml_workspace_update
-  name: az ml workspace update
-  summary: Update a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Workspace subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml
deleted file mode 100644
index 73fed00322..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-cli-ml/ml/workspace/private-endpoint.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-  name: az ml workspace private-endpoint
-  summary: Workspace private endpoint subgroup commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  - ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  - ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --pe-auto-approval
-    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
-    description: ''
-  - name: --pe-name
-    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
-    description: ''
-  - name: --pe-resource-group
-    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
-    description: ''
-  - name: --pe-subnet-name
-    defaultValue: default
-    summary: Name of the existing subnet to create the workspace private endpoint in.
-    description: ''
-  - name: --pe-subscription-id
-    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
-    description: ''
-  - name: --pe-vnet-name
-    summary: Name of the existing vnet to create the workspace private endpoint in.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --resource-id
-    summary: The resource id of the Private EndPoint Connection.
-    description: ''
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --output-metadata-file -t
-    summary: Provide an optional output file location for structured object output.
-    description: ''
-  - name: --path
-    defaultValue: .
-    summary: Path to a root directory for run configuration files.
-    description: ''
-  - name: --resource-group -g
-    summary: Resource group name.
-    description: ''
-  - name: --subscription-id
-    summary: Specifies the subscription Id.
-    description: ''
-  - name: --workspace-name -w
-    summary: Workspace name.
-    description: ''
-commands:
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-  name: az ml workspace private-endpoint add
-  summary: Add private endpoint to a workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-  name: az ml workspace private-endpoint delete
-  summary: Delete the specified private endpoint Connection in the workspace.
-- uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-  name: az ml workspace private-endpoint list
-  summary: List all private endpoints in a workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Workspace private endpoint subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts.yml
deleted file mode 100644
index f436ca3ad5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-- uid: ext_azure-devops_az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: ext_azure-devops_az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml
deleted file mode 100644
index 39e2b16c6e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/artifacts/universal.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_artifacts_universal_download
-  - ext_azure-devops_az_artifacts_universal_publish
-- uid: ext_azure-devops_az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --feed
-    summary: Name or ID of the feed.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the package, e.g. 'foo-package'.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Directory to place the package contents.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: Version of the package, e.g. 1.0.0.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --file-filter
-    summary: Wildcard filter for file download.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --scope
-    defaultValue: organization
-    parameterValueGroup: organization, project
-    summary: "Scope of the feed: 'project' if the feed was created in a project, and 'organization' otherwise."
-    description: ''
-- uid: ext_azure-devops_az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --feed
-    summary: Name or ID of the feed.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the package, e.g. 'foo-package'.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Directory containing the package contents.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: Version of the package, e.g. '1.0.0'.
-    description: ''
-  - name: --description -d
-    summary: Description of the package.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --scope
-    defaultValue: organization
-    parameterValueGroup: organization, project
-    summary: "Scope of the feed: 'project' if the feed was created in a project, and 'organization' otherwise."
-    description: ''
-commands:
-- uid: ext_azure-devops_az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: ext_azure-devops_az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Universal Packages.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards.yml
deleted file mode 100644
index dafe7d0924..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_query
-- uid: ext_azure-devops_az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-  description: Only supports flat queries.
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: The ID of an existing query.  Required unless --path or --wiql are specified.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: The path of an existing query.  Ignored if --id is specified.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --wiql
-    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-- uid: ext_azure-devops_az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: ext_azure-devops_az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-- uid: ext_azure-devops_az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-- uid: ext_azure-devops_az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: ext_azure-devops_az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-- uid: ext_azure-devops_az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-- uid: ext_azure-devops_az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-- uid: ext_azure-devops_az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: ext_azure-devops_az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: ext_azure-devops_az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: ext_azure-devops_az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: ext_azure-devops_az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area.yml
deleted file mode 100644
index a72ce13365..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: ext_azure-devops_az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage area paths.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/project.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/project.yml
deleted file mode 100644
index 58a23004d4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/project.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_area_project_create
-  - ext_azure-devops_az_boards_area_project_delete
-  - ext_azure-devops_az_boards_area_project_list
-  - ext_azure-devops_az_boards_area_project_show
-  - ext_azure-devops_az_boards_area_project_update
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the area.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an area. Creates an area at root level if --path is not specified. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --depth
-    defaultValue: "1"
-    summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Area ID.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-  description: Move area or update area name.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
-    description: ''
-  - name: --child-id
-    summary: Move an existing area and add as child node for this area.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name of the area.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: ext_azure-devops_az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: ext_azure-devops_az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: ext_azure-devops_az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: ext_azure-devops_az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a project.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/team.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/team.yml
deleted file mode 100644
index 0ee6bd04a6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/area/team.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_area_team_add
-  - ext_azure-devops_az_boards_area_team_list
-  - ext_azure-devops_az_boards_area_team_remove
-  - ext_azure-devops_az_boards_area_team_update
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-  description: Every team needs to have a default area configured which can't be empty. Hence, you need to pass --set-as-default while adding first area to your team. You can later configure any other area which already added to team as default by using `az boards area team update -h` command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Add area to a team.
-    syntax:
-      content: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Area path. Example:ProjectNameAreaName.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-sub-areas
-    parameterValueGroup: false, true
-    summary: Include child nodes of this area.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --set-as-default
-    summary: 'Set this area path as default area for this team. Default: False.'
-    description: ''
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Area path. Example:ProjectNameAreaName.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-  description: Update any area to include/exclude sub areas OR Set already added area as default.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Area path. Example:ProjectNameAreaName.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-sub-areas
-    parameterValueGroup: false, true
-    summary: Include child nodes of this area.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --set-as-default
-    summary: 'Set as default team area path. Default: False.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: ext_azure-devops_az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: ext_azure-devops_az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: ext_azure-devops_az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a team.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration.yml
deleted file mode 100644
index 23c1e7bfa5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: ext_azure-devops_az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml
deleted file mode 100644
index fbd0b576f2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/project.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_iteration_project_create
-  - ext_azure-devops_az_boards_iteration_project_delete
-  - ext_azure-devops_az_boards_iteration_project_list
-  - ext_azure-devops_az_boards_iteration_project_show
-  - ext_azure-devops_az_boards_iteration_project_update
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the iteration.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --finish-date
-    summary: 'Finish date of the iteration. Example : "2019-06-21".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an iteration. Creates an iteration at root level if --path is not specified. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --start-date
-    summary: 'Start date of the iteration. Example : "2019-06-03".'
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --depth
-    defaultValue: "1"
-    summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Iteration ID.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-  description: Move iteration or update iteration details like name AND/OR start-date and finish-date.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
-    description: ''
-  - name: --child-id
-    summary: Move an existing iteration and add as child node for this iteration.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --finish-date
-    summary: 'Finish date of the iteration. Example : "2019-06-21".'
-    description: ''
-  - name: --name
-    summary: New name of the iteration.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --start-date
-    summary: 'Start date of the iteration. Example : "2019-06-03".'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: ext_azure-devops_az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: ext_azure-devops_az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a project.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml
deleted file mode 100644
index b1756cf484..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/iteration/team.yml
+++ /dev/null
@@ -1,251 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_iteration_team_add
-  - ext_azure-devops_az_boards_iteration_team_list
-  - ext_azure-devops_az_boards_iteration_team_list_work_items
-  - ext_azure-devops_az_boards_iteration_team_remove
-  - ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  - ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  - ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  - ext_azure-devops_az_boards_iteration_team_show_default_iteration
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --timeframe
-    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier of the iteration which needs to be set as backlog iteration.
-    description: ''
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --default-iteration-macro
-    summary: 'Default iteration macro. Example: @CurrentIteration.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: Identifier of the iteration which needs to be set as default.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: Name or ID of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: ext_azure-devops_az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a team.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item.yml
deleted file mode 100644
index 674a811df0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_work_item_create
-  - ext_azure-devops_az_boards_work_item_delete
-  - ext_azure-devops_az_boards_work_item_show
-  - ext_azure-devops_az_boards_work_item_update
-- uid: ext_azure-devops_az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --title
-    summary: Title of the work item.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: Name of the work item type (e.g. Bug).
-    description: ''
-  - name: --area
-    summary: Area the work item is assigned to (e.g. Demos).
-    description: ''
-  - name: --assigned-to
-    summary: Name of the person the work item is assigned-to (e.g. fabrikam).
-    description: ''
-  - name: --description -d
-    summary: Description of the work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --discussion
-    summary: Comment to add to a discussion in a work item.
-    description: ''
-  - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
-    description: ''
-  - name: --iteration
-    summary: Iteration path of the work item (e.g. DemosIteration 1).
-    description: ''
-  - name: --open
-    summary: Open the work item in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --reason
-    summary: Reason for the state of the work item.
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Unique id of the work item.
-    description: ''
-  - name: --destroy
-    summary: Permanently delete this work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - name: --as-of
-    summary: "Work item details as of a particular date and time. Provide a date or date time string. Assumes local time zone. Example: '2019-01-20', '2019-01-20 00:20:00'. For UTC, append 'UTC' to the date time string, '2019-01-20 00:20:00 UTC'."
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --expand
-    defaultValue: all
-    parameterValueGroup: all, fields, links, none, relations
-    summary: The expand parameters for work item attributes.
-    description: ''
-  - name: --fields -f
-    summary: Comma-separated list of requested fields. Example:System.Id,System.AreaPath. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
-    description: ''
-  - name: --open
-    summary: Open the work item in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The id of the work item to update.
-    description: ''
-  - name: --area
-    summary: Area the work item is assigned to (e.g. Demos).
-    description: ''
-  - name: --assigned-to
-    summary: Name of the person the work item is assigned-to (e.g. fabrikam).
-    description: ''
-  - name: --description -d
-    summary: Description of the work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --discussion
-    summary: Comment to add to a discussion in a work item.
-    description: ''
-  - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
-    description: ''
-  - name: --iteration
-    summary: Iteration path of the work item (e.g. DemosIteration 1).
-    description: ''
-  - name: --open
-    summary: Open the work item in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --reason
-    summary: Reason for the state of the work item.
-    description: ''
-  - name: --state
-    summary: State of the work item (e.g. active).
-    description: ''
-  - name: --title
-    summary: Title of the work item.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: ext_azure-devops_az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: ext_azure-devops_az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: ext_azure-devops_az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: ext_azure-devops_az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml
deleted file mode 100644
index 904773fb3b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/boards/work-item/relation.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_boards_work_item_relation_add
-  - ext_azure-devops_az_boards_work_item_relation_list_type
-  - ext_azure-devops_az_boards_work_item_relation_remove
-  - ext_azure-devops_az_boards_work_item_relation_show
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - isRequired: true
-    name: --relation-type
-    summary: 'Relation type to create. Example: parent, child.'
-    description: ''
-  - isRequired: true
-    name: --target-id
-    summary: 'ID(s) of work-items to create relation with.                          Multiple values can be passed comma separated. Example: 1,2.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - isRequired: true
-    name: --relation-type
-    summary: 'Relation type to remove. Example: parent, child.'
-    description: ''
-  - isRequired: true
-    name: --target-id
-    summary: 'ID(s) of work-items to remove relation from.                          Multiple values can be passed comma separated. Example: 1,2.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The ID of the work item.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: ext_azure-devops_az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: ext_azure-devops_az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item relations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops.yml
deleted file mode 100644
index 76e64eccd4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops.yml
+++ /dev/null
@@ -1,405 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-  description: >-
-    Related Groups
-
-    az pipelines: Manage Azure Pipelines
-
-    az boards: Manage Azure Boards
-
-    az repos: Manage Azure Repos
-
-    az artifacts: Manage Azure Artifacts.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_configure
-  - ext_azure-devops_az_devops_feedback
-  - ext_azure-devops_az_devops_invoke
-  - ext_azure-devops_az_devops_login
-  - ext_azure-devops_az_devops_logout
-- uid: ext_azure-devops_az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --defaults -d
-    summary: Space separated 'name=value' pairs for common arguments defaults, e.g. '--defaults project=my-project-name organization=https://dev.azure.com/organizationName arg=value'. Use '' to clear the defaults, e.g. --defaults project=''.
-    description: ''
-  - name: --list -l
-    summary: Lists the contents of the config file.
-    description: ''
-  - name: --use-git-aliases
-    parameterValueGroup: false, true
-    summary: Set to 'true' to configure Git aliases global git config file (to enable commands like "git pr list"). Set to 'false' to remove any aliases set by the tool.
-    description: ''
-- uid: ext_azure-devops_az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_azure-devops_az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Discover areas related to 'Wiki'
-    syntax:
-      content: az devops invoke --query "[?contains(area,'wiki')]"
-  - summary: Get all wikis in a project
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
-
-        az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
-  - summary: Add page to a wiki
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
-
-        wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
-
-        --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
-
-        az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
-
-        wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
-
-        --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
-  parameters:
-  - name: --accept-media-type
-    defaultValue: application/json
-    summary: Specifies the content type of the response.
-    description: ''
-  - name: --api-version
-    defaultValue: "5.0"
-    summary: The version of the API to target.
-    description: ''
-  - name: --area
-    summary: The area to find the resource.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the input file. Used in conjunction with --in-file.
-    description: ''
-  - name: --http-method
-    defaultValue: GET
-    parameterValueGroup: DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT
-    summary: Specifies the method used for the request.
-    description: ''
-  - name: --in-file
-    summary: Path and file name to the file that contains the contents of the request.
-    description: ''
-  - name: --media-type
-    defaultValue: application/json
-    summary: Specifies the content type of the request.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --out-file
-    summary: Path and file name to the file  for which this function saves the response body.
-    description: ''
-  - name: --query-parameters
-    summary: Specifies the list of query parameters.
-    description: ''
-  - name: --resource
-    summary: The name of the resource to operate on.
-    description: ''
-  - name: --route-parameters
-    summary: Specifies the list of route parameters.
-    description: ''
-- uid: ext_azure-devops_az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-  description: Refer <a href="https://aka.ms/azure-devops-cli-auth">https://aka.ms/azure-devops-cli-auth</a> for more information on providing PAT as input.
-  langs:
-  - azurecli
-  parameters:
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName">https://dev.azure.com/MyOrganizationName</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>. If no organization is specified, all organizations will be logged out.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-- uid: ext_azure-devops_az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-- uid: ext_azure-devops_az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-- uid: ext_azure-devops_az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-- uid: ext_azure-devops_az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: ext_azure-devops_az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: ext_azure-devops_az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: ext_azure-devops_az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: ext_azure-devops_az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: ext_azure-devops_az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: ext_azure-devops_az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-- uid: ext_azure-devops_az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-- uid: ext_azure-devops_az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-- uid: ext_azure-devops_az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-- uid: ext_azure-devops_az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-- uid: ext_azure-devops_az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-- uid: ext_azure-devops_az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: ext_azure-devops_az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: ext_azure-devops_az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: ext_azure-devops_az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-- uid: ext_azure-devops_az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-- uid: ext_azure-devops_az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-- uid: ext_azure-devops_az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: ext_azure-devops_az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: ext_azure-devops_az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-- uid: ext_azure-devops_az_devops_team
-  name: az devops team
-  summary: Manage teams.
-- uid: ext_azure-devops_az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: ext_azure-devops_az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: ext_azure-devops_az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: ext_azure-devops_az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: ext_azure-devops_az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: ext_azure-devops_az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-- uid: ext_azure-devops_az_devops_user
-  name: az devops user
-  summary: Manage users.
-- uid: ext_azure-devops_az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: ext_azure-devops_az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: ext_azure-devops_az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: ext_azure-devops_az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: ext_azure-devops_az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-- uid: ext_azure-devops_az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-- uid: ext_azure-devops_az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: ext_azure-devops_az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: ext_azure-devops_az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: ext_azure-devops_az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: ext_azure-devops_az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Related Groups
-
-  az pipelines: Manage Azure Pipelines
-
-  az boards: Manage Azure Boards
-
-  az repos: Manage Azure Repos
-
-  az artifacts: Manage Azure Artifacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin.yml
deleted file mode 100644
index a3c6015232..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage administration operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml
deleted file mode 100644
index 773057d8e8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/admin/banner.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_admin_banner_add
-  - ext_azure-devops_az_devops_admin_banner_list
-  - ext_azure-devops_az_devops_admin_banner_remove
-  - ext_azure-devops_az_devops_admin_banner_show
-  - ext_azure-devops_az_devops_admin_banner_update
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --message -m
-    summary: Message (string) to show in the banner.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --expiration
-    summary: 'Date/time when the banner should no longer be presented to users. If not set, the banner does not automatically expire and must be removed with the remove command. Example : "2019-06-10 17:21:00 UTC", "2019-06-10".'
-    description: ''
-  - name: --id
-    summary: Identifier for the new banner. This identifier is needed to change or remove the message later. A unique identifier is automatically created if one is not specified.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --type -t
-    parameterValueGroup: error, info, warning
-    summary: Type of banner to present. Defaults is "info".
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the banner to remove.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Identifier for the banner.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the banner to update.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --expiration
-    summary: 'Date/time when the banner should no longer be presented to users. To unset the expiration for the banner, supply an empty value to this argument. Example : "2019-06-10 17:21:00 UTC", "2019-06-10".'
-    description: ''
-  - name: --message -m
-    summary: Message (string) to show in the banner.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --type -t
-    parameterValueGroup: error, info, warning
-    summary: Type of banner to present. Defaults is "info".
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: ext_azure-devops_az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: ext_azure-devops_az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: ext_azure-devops_az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage organization banner.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/extension.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/extension.yml
deleted file mode 100644
index a03ab09330..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/extension.yml
+++ /dev/null
@@ -1,200 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_extension_disable
-  - ext_azure-devops_az_devops_extension_enable
-  - ext_azure-devops_az_devops_extension_install
-  - ext_azure-devops_az_devops_extension_list
-  - ext_azure-devops_az_devops_extension_search
-  - ext_azure-devops_az_devops_extension_show
-  - ext_azure-devops_az_devops_extension_uninstall
-- uid: ext_azure-devops_az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-built-in
-    parameterValueGroup: false, true
-    summary: Include built in extensions.
-    description: ''
-  - name: --include-disabled
-    parameterValueGroup: false, true
-    summary: Include disabled extensions.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --search-query -q
-    summary: Search term.
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --extension-id
-    summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
-    description: ''
-  - isRequired: true
-    name: --publisher-id
-    summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: ext_azure-devops_az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: ext_azure-devops_az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: ext_azure-devops_az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: ext_azure-devops_az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: ext_azure-devops_az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: ext_azure-devops_az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage extensions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/project.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/project.yml
deleted file mode 100644
index 86ba9fc229..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/project.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_project_create
-  - ext_azure-devops_az_devops_project_delete
-  - ext_azure-devops_az_devops_project_list
-  - ext_azure-devops_az_devops_project_show
-- uid: ext_azure-devops_az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the new project.
-    description: ''
-  - name: --description -d
-    summary: Description for the new project.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the team project in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --process -p
-    summary: Process to use. Default if not specified.
-    description: ''
-  - name: --source-control -s
-    defaultValue: git
-    parameterValueGroup: git, tfvc
-    summary: Source control type of the initial code repository created.
-    description: ''
-  - name: --visibility
-    defaultValue: private
-    parameterValueGroup: private, public
-    summary: Project visibility.
-    description: ''
-- uid: ext_azure-devops_az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The id of the project to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --continuation-token
-    summary: Continuation token. This can be retrived from previous run of this command if more results are present.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --get-default-team-image-url
-    parameterValueGroup: false, true
-    summary: Whether to get default team image url or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --skip
-    summary: Number of results to skip.
-    description: ''
-  - name: --state-filter
-    defaultValue: all
-    parameterValueGroup: all, createPending, deleted, deleting, new, unchanged, wellFormed
-    summary: State filter.
-    description: ''
-  - name: --top
-    summary: Maximum number of results to list.
-    description: ''
-- uid: ext_azure-devops_az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the team project in the default web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: ext_azure-devops_az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: ext_azure-devops_az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: ext_azure-devops_az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage team projects.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security.yml
deleted file mode 100644
index 8be0ac9c2b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security related operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group.yml
deleted file mode 100644
index d7d8838832..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_group_create
-  - ext_azure-devops_az_devops_security_group_delete
-  - ext_azure-devops_az_devops_security_group_list
-  - ext_azure-devops_az_devops_security_group_show
-  - ext_azure-devops_az_devops_security_group_update
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an Azure DevOps Group with name and description
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
-
-        --description 'Something to describe this group'
-  - summary: Add an existing AAD group to an Azure DevOps group
-    syntax:
-      content: >-
-        Get object ID of an existing AAD group
-
-        az ad group show -g '{Group Name}'
-
-        az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
-  - summary: Add an existing AAD group to an Azure DevOps group with AAD group Email ID
-    syntax:
-      content: >-
-        az devops security group create --email-id '{Email ID of AAD group}'
-
-        --groups 'vssgp.someDescriptorForGroup'
-  - summary: Create a new Azure DevOps group and add it to existing Azure DevOps groups.
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
-
-        --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
-  parameters:
-  - name: --description
-    summary: Description of Azure DevOps group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --email-id
-    summary: Create new group using the mail address as a reference to an existing group from an external AD or AAD backed provider. Required if name or origin-id is missing.
-    description: ''
-  - name: --groups
-    summary: A comma separated list of descriptors referencing groups you want the newly created group to join.
-    description: ''
-  - name: --name
-    summary: Name of Azure DevOps group.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --origin-id
-    summary: Create new group using the OriginID as a reference to an existing group from an external AD or AAD backed provider. Required if name or email-id is missing.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project in which Azure DevOps group should be created.
-    description: ''
-  - name: --scope
-    defaultValue: project
-    parameterValueGroup: organization, project
-    summary: Create group at project or organization level.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Descriptor of the group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --continuation-token
-    summary: If there are more results that can't be returned in a single page, the result set will contain a continuation token for retrieval of the next set of results.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: List groups for a particular project.
-    description: ''
-  - name: --scope
-    defaultValue: project
-    parameterValueGroup: organization, project
-    summary: List groups at project or organization level.
-    description: ''
-  - name: --subject-types
-    summary: A comma separated list of user subject subtypes to reduce the retrieved results. You can give initial part of descriptor [before the dot] as a filter e.g. vssgp,aadgp.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Descriptor of the group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Descriptor of the group.
-    description: ''
-  - name: --description
-    summary: New description for Azure DevOps group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name for Azure DevOps group.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: ext_azure-devops_az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: ext_azure-devops_az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: ext_azure-devops_az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml
deleted file mode 100644
index 0eeb72191e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/group/membership.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_group_membership_add
-  - ext_azure-devops_az_devops_security_group_membership_list
-  - ext_azure-devops_az_devops_security_group_membership_remove
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id
-    summary: Descriptor of the group to which member needs to be added.
-    description: ''
-  - isRequired: true
-    name: --member-id
-    summary: Descriptor of the group or Email Id of the user to be added. User should already be a part of the organization. Use `az devops user add` command to add an user to organization.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Group descriptor or User Email whose membership details are required.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --relationship
-    defaultValue: members
-    parameterValueGroup: memberof, members
-    summary: Get member of/members for this group.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id
-    summary: Descriptor of the group from which member needs to be removed.
-    description: ''
-  - isRequired: true
-    name: --member-id
-    summary: Descriptor of the group or Email Id of the user to be removed.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: ext_azure-devops_az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: ext_azure-devops_az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage memberships for security groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml
deleted file mode 100644
index 24aef7bed8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_permission_list
-  - ext_azure-devops_az_devops_security_permission_reset
-  - ext_azure-devops_az_devops_security_permission_reset_all
-  - ext_azure-devops_az_devops_security_permission_show
-  - ext_azure-devops_az_devops_security_permission_update
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --recurse
-    summary: If true and this is a hierarchical namespace, return child ACLs of the specified token.
-    description: ''
-  - name: --token
-    summary: Security token.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --permission-bit
-    summary: Permission bit or addition of permission bits which needs to be reset                         for given user/group and token.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-  description: Learn more at <a href="https://aka.ms/azure-devops-cli-security-permission">https://aka.ms/azure-devops-cli-security-permission</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Assign view, edit and delete permission for team projects.
-    syntax:
-      content: >-
-        az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
-
-
-        You would need to add the bit value of the various permission bits to
-
-        simultaneously allow/deny multiple permissions.
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - isRequired: true
-    name: --subject
-    summary: User Email ID or Group descriptor.
-    description: ''
-  - isRequired: true
-    name: --token
-    summary: Security token.
-    description: ''
-  - name: --allow-bit
-    summary: Allow bit or addition of bits. Required if --deny-bit is missing.
-    description: ''
-  - name: --deny-bit
-    summary: Deny bit or addition of bits. Required if --allow-bit is missing.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --merge
-    defaultValue: "1"
-    parameterValueGroup: false, true
-    summary: If set, the existing ACE has its allow and deny merged with                          the incoming ACE's allow and deny. If unset, the existing ACE is displaced.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: ext_azure-devops_az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: ext_azure-devops_az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: ext_azure-devops_az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: ext_azure-devops_az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security permissions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml
deleted file mode 100644
index 2b43b3ba75..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/security/permission/namespace.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_security_permission_namespace_list
-  - ext_azure-devops_az_devops_security_permission_namespace_show
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --local-only
-    summary: If true, retrieve only local security namespaces.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --namespace-id
-    summary: ID of security namespace.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: ext_azure-devops_az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security namespaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml
deleted file mode 100644
index 26e43a4c41..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_service_endpoint_create
-  - ext_azure-devops_az_devops_service_endpoint_delete
-  - ext_azure-devops_az_devops_service_endpoint_list
-  - ext_azure-devops_az_devops_service_endpoint_show
-  - ext_azure-devops_az_devops_service_endpoint_update
-- uid: ext_azure-devops_az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-  description: You can learn more about this at <a href="https://aka.ms/azure-devops-service-endpoint-config">https://aka.ms/azure-devops-service-endpoint-config</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --service-endpoint-configuration
-    summary: Configuration file with service endpoint request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the input file.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: Id of the service endpoint to delete.
-    description: ''
-  - name: --deep
-    summary: Specific to AzureRM endpoint created in Automatic flow. When it is specified, this will also delete corresponding AAD application in Azure.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-  description: rtypelist of VssJsonCollectionWrapper.
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the service endpoint.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the service endpoint.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enable-for-all
-    parameterValueGroup: false, true
-    summary: Allow all pipelines to access this service endpoint.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: ext_azure-devops_az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: ext_azure-devops_az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: ext_azure-devops_az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage service endpoints/connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml
deleted file mode 100644
index 58c134033c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/azurerm.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_service_endpoint_azurerm_create
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --azure-rm-service-principal-id
-    summary: Service principal id for creating azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --azure-rm-subscription-id
-    summary: Subscription id for azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --azure-rm-subscription-name
-    summary: Name of azure subscription for azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --azure-rm-tenant-id
-    summary: Tenant id for creating azure rm service endpoint.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of service endpoint to create.
-    description: ''
-  - name: --azure-rm-service-principal-certificate-path
-    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:&lt;password_here&gt;". More details : <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure RM service endpoints/connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml
deleted file mode 100644
index a95ea73210..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/service-endpoint/github.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_service_endpoint_github_create
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-service-endpoint">https://aka.ms/azure-devops-cli-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --github-url
-    summary: Url for github for creating service endpoint.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of service endpoint to create.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage GitHub service endpoints/connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/team.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/team.yml
deleted file mode 100644
index eb33935f00..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/team.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_team
-  name: az devops team
-  summary: Manage teams.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_team_create
-  - ext_azure-devops_az_devops_team_delete
-  - ext_azure-devops_az_devops_team_list
-  - ext_azure-devops_az_devops_team_list_member
-  - ext_azure-devops_az_devops_team_show
-  - ext_azure-devops_az_devops_team_update
-- uid: ext_azure-devops_az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the new team.
-    description: ''
-  - name: --description
-    summary: Description of the new team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: The id of the team to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --skip
-    summary: Number of teams to skip.
-    description: ''
-  - name: --top
-    summary: Maximum number of teams to return.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team to show members of.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --skip
-    summary: Number of members to skip.
-    description: ''
-  - name: --top
-    summary: Maximum number of members to return.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team to show.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --team
-    summary: The name or id of the team to be updated.
-    description: ''
-  - name: --description
-    summary: New description of the team.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name of the team.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: ext_azure-devops_az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: ext_azure-devops_az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: ext_azure-devops_az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: ext_azure-devops_az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: ext_azure-devops_az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage teams.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/user.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/user.yml
deleted file mode 100644
index 6922f49706..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/user.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_user
-  name: az devops user
-  summary: Manage users.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_user_add
-  - ext_azure-devops_az_devops_user_list
-  - ext_azure-devops_az_devops_user_remove
-  - ext_azure-devops_az_devops_user_show
-  - ext_azure-devops_az_devops_user_update
-- uid: ext_azure-devops_az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email-id
-    summary: Email ID of the user.
-    description: ''
-  - isRequired: true
-    name: --license-type
-    parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
-    summary: License type for the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --send-email-invite
-    parameterValueGroup: false, true
-    summary: Whether to send email invite for new user or not.
-    description: ''
-- uid: ext_azure-devops_az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --skip
-    summary: 'Offset: Number of records to skip.'
-    description: ''
-  - name: --top
-    defaultValue: "100"
-    summary: Maximum number of users to return. Max value is 10000.
-    description: ''
-- uid: ext_azure-devops_az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --user
-    summary: Email ID or ID of the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --user
-    summary: Email ID or ID of the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --license-type
-    parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
-    summary: License type for the user.
-    description: ''
-  - isRequired: true
-    name: --user
-    summary: Email ID or ID of the user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: ext_azure-devops_az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: ext_azure-devops_az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: ext_azure-devops_az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: ext_azure-devops_az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage users.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki.yml
deleted file mode 100644
index 2677cf8f99..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_wiki_create
-  - ext_azure-devops_az_devops_wiki_delete
-  - ext_azure-devops_az_devops_wiki_list
-  - ext_azure-devops_az_devops_wiki_show
-- uid: ext_azure-devops_az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a project wiki
-    syntax:
-      content: az devops wiki create --name myprojectwiki
-  - summary: Create a code wiki from a folder in a code repository
-    syntax:
-      content: >-
-        az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
-
-        --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --mapped-path
-    summary: "[Required for codewiki type] Mapped path of the new wiki e.g. '/' to publish from root of repository."
-    description: ''
-  - name: --name
-    summary: Name of the new wiki.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: '[Required for codewiki type] Name or ID of the repository to publish the wiki from.'
-    description: ''
-  - name: --type --wiki-type
-    defaultValue: projectwiki
-    parameterValueGroup: codewiki, projectwiki
-    summary: Type of wiki to create.
-    description: ''
-  - name: --version -v
-    summary: '[Required for codewiki type] Repository branch name to publish the code wiki from.'
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all wikis for a project
-    syntax:
-      content: az devops wiki list
-  - summary: List all wikis in the organization
-    syntax:
-      content: az devops wiki list --scope organization
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --scope
-    defaultValue: project
-    parameterValueGroup: organization, project
-    summary: List the wikis at project or organization level.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the wiki in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: ext_azure-devops_az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: ext_azure-devops_az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: ext_azure-devops_az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: ext_azure-devops_az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wikis.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml
deleted file mode 100644
index cb894d4d75..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/devops/wiki/page.yml
+++ /dev/null
@@ -1,206 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_devops_wiki_page_create
-  - ext_azure-devops_az_devops_wiki_page_delete
-  - ext_azure-devops_az_devops_wiki_page_show
-  - ext_azure-devops_az_devops_wiki_page_update
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
-  - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with content from a file
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --comment
-    defaultValue: Added a new page using Azure DevOps CLI
-    summary: Comment in the commit message of file add operation.
-    description: ''
-  - name: --content
-    summary: Content of the wiki page. Ignored if --file-path is specified.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the file. Used in conjunction with --file-path parameter.
-    description: ''
-  - name: --file-path
-    summary: Path of the file input if content is specified in the file.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --comment
-    defaultValue: Deleted the page using Azure DevOps CLI
-    summary: Comment in the commit message of delete operation.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-content
-    summary: Include content of the page.
-    description: ''
-  - name: --open
-    summary: Open the wiki page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --version -v
-    summary: Version (ETag) of the wiki page.
-    description: ''
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update content of page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  - summary: Update content of page with path 'my page' in a wiki with content from a file
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Path of the wiki page.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: Version (ETag) of file to edit.
-    description: ''
-  - isRequired: true
-    name: --wiki
-    summary: Name or Id of the wiki.
-    description: ''
-  - name: --comment
-    defaultValue: Updated the page using Azure DevOps CLI
-    summary: Comment in the commit message of file edit operation.
-    description: ''
-  - name: --content
-    summary: Content of the wiki page. Ignored if --file-path is specified.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --encoding
-    defaultValue: utf-8
-    parameterValueGroup: ascii, utf-16be, utf-16le, utf-8
-    summary: Encoding of the file. Used in conjunction with --file-path parameter.
-    description: ''
-  - name: --file-path
-    summary: Path of the file input if content is specified in the file.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: ext_azure-devops_az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: ext_azure-devops_az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: ext_azure-devops_az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wiki pages.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/index.yml
deleted file mode 100644
index a6a06abd41..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/index.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az
-  name: azure-devops
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-devops_az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-- uid: ext_azure-devops_az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-- uid: ext_azure-devops_az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-- uid: ext_azure-devops_az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-- uid: ext_azure-devops_az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines.yml
deleted file mode 100644
index ed2f37c678..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines.yml
+++ /dev/null
@@ -1,479 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_create
-  - ext_azure-devops_az_pipelines_delete
-  - ext_azure-devops_az_pipelines_list
-  - ext_azure-devops_az_pipelines_run
-  - ext_azure-devops_az_pipelines_show
-  - ext_azure-devops_az_pipelines_update
-- uid: ext_azure-devops_az_pipelines_create
-  name: az pipelines create
-  summary: Create a new Azure Pipeline (YAML based).
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an Azure Pipeline from local checkout repository context
-    syntax:
-      content: >-
-        Repository name/url (--repository), type (--repository-type) and branch name (--branch) will be detected from the local git repository
-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-  - summary: Create an Azure Pipeline for a repository hosted on Github using clone url
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository https://github.com/SampleOrg/SampleRepo --branch master
-  - summary: Create an Azure Pipeline for a repository hosted on Github organization SampleOrg, repository name SampleRepo
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository SampleOrg/SampleRepoName --branch master --repository-type github
-  - summary: Create an Azure Pipeline for a repository hosted in a Azure Repo in the same project
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository SampleRepoName --branch master --repository-type tfsgit
-  - summary: Create an Azure Pipeline for a repository with the pipeline yaml already checked in into the repository
-    syntax:
-      content: >-
-        Service connection required for non Azure Repos can be optionally provided in the command to run it non interatively
-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
-
-        --repository https://github.com/SampleOrg/SampleRepo --branch master --yml-path azure-pipelines.yml [--service-connection SERVICE_CONNECTION]
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the new pipeline.
-    description: ''
-  - name: --branch
-    summary: Branch name for which the pipeline will be configured. If omitted, it will be auto-detected from local repository.
-    description: ''
-  - name: --description
-    summary: Description for the new pipeline.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: Path of the folder where the pipeline needs to be created. Default is root folder. e.g. "user1/test_pipelines".
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-id
-    summary: Id of the queue in the available agent pools. Will be auto detected if not specified.
-    description: ''
-  - name: --repository
-    summary: Repository for which the pipeline needs to be configured. Can be clone url of the git repository or name of the repository for a Azure Repos or Owner/RepoName in case of GitHub repository. If omitted it will be auto-detected from the remote url of local git repository. If name is mentioned instead of url, --repository-type argument is also required.
-    description: ''
-  - name: --repository-type
-    parameterValueGroup: github, tfsgit
-    summary: Type of repository. If omitted, it will be auto-detected from remote url of local repository. 'tfsgit' for Azure Repos, 'github' for GitHub repository.
-    description: ''
-  - name: --service-connection
-    summary: Id of the Service connection created for the repository for GitHub repository. Use command az devops service-endpoint -h for creating/listing service_connections. Not required for Azure Repos.
-    description: ''
-  - name: --skip-first-run --skip-run
-    parameterValueGroup: false, true
-    summary: Specify this flag to prevent the first run being triggered by the command. Command will return a pipeline if run is skipped else it will output a pipeline run.
-    description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo (if yaml is already present in the repo).
-    description: ''
-- uid: ext_azure-devops_az_pipelines_delete
-  name: az pipelines delete
-  summary: Delete a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pipeline.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_list
-  name: az pipelines list
-  summary: List pipelines.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: If specified, filters to definitions under this folder.
-    description: ''
-  - name: --name
-    summary: 'Limit results to pipelines with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    parameterValueGroup: ModifiedAsc, ModifiedDesc, NameAsc, NameDesc, None
-    summary: Order of the results.
-    description: ''
-  - name: --repository
-    summary: Limit results to pipelines associated with this repository.
-    description: ''
-  - name: --repository-type
-    parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
-    summary: Limit results to pipelines associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
-    description: ''
-  - name: --top
-    summary: Maximum number of pipelines to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_run
-  name: az pipelines run
-  summary: Queue (run) a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: 'Name of the branch on which the pipeline run is to be queued. Example: refs/heads/master or master or refs/pull/1/merge.'
-    description: ''
-  - name: --commit-id
-    summary: Commit-id on which the pipeline run is to be queued.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: Folder path of pipeline. Default is root level folder.
-    description: ''
-  - name: --id
-    summary: ID of the pipeline to queue. Required if --name is not supplied.
-    description: ''
-  - name: --name
-    summary: Name of the pipeline to queue. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the pipeline results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_show
-  name: az pipelines show
-  summary: Get the details of a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --folder-path
-    summary: Folder path of pipeline. Default is root level folder.
-    description: ''
-  - name: --id
-    summary: ID of the pipeline.
-    description: ''
-  - name: --name
-    summary: Name of the pipeline. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the pipeline summary page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_update
-  name: az pipelines update
-  summary: Update a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: Branch name for which the pipeline will be configured.
-    description: ''
-  - name: --description
-    summary: New description for the pipeline.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: Id of the pipeline to update.
-    description: ''
-  - name: --name
-    summary: Name of the pipeline to update.
-    description: ''
-  - name: --new-folder-path
-    summary: New full path of the folder to move the pipeline to. e.g. "user1/production_pipelines".
-    description: ''
-  - name: --new-name
-    summary: New updated name of the pipeline.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-id
-    summary: Queue id of the agent pool where the pipeline needs to run.
-    description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-- uid: ext_azure-devops_az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: ext_azure-devops_az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-- uid: ext_azure-devops_az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-- uid: ext_azure-devops_az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: ext_azure-devops_az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: ext_azure-devops_az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: ext_azure-devops_az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: ext_azure-devops_az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-- uid: ext_azure-devops_az_pipelines_create
-  name: az pipelines create
-  summary: Create a new Azure Pipeline (YAML based).
-- uid: ext_azure-devops_az_pipelines_delete
-  name: az pipelines delete
-  summary: Delete a pipeline.
-- uid: ext_azure-devops_az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-- uid: ext_azure-devops_az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: ext_azure-devops_az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: ext_azure-devops_az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: ext_azure-devops_az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-- uid: ext_azure-devops_az_pipelines_list
-  name: az pipelines list
-  summary: List pipelines.
-- uid: ext_azure-devops_az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-- uid: ext_azure-devops_az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: ext_azure-devops_az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-- uid: ext_azure-devops_az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-- uid: ext_azure-devops_az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: ext_azure-devops_az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-- uid: ext_azure-devops_az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-- uid: ext_azure-devops_az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: ext_azure-devops_az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: ext_azure-devops_az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: ext_azure-devops_az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-- uid: ext_azure-devops_az_pipelines_run
-  name: az pipelines run
-  summary: Queue (run) a pipeline.
-- uid: ext_azure-devops_az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-- uid: ext_azure-devops_az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: ext_azure-devops_az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_show
-  name: az pipelines show
-  summary: Get the details of a pipeline.
-- uid: ext_azure-devops_az_pipelines_update
-  name: az pipelines update
-  summary: Update a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-- uid: ext_azure-devops_az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-- uid: ext_azure-devops_az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: ext_azure-devops_az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: ext_azure-devops_az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml
deleted file mode 100644
index 815daa9bca..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/agent.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_agent_list
-  - ext_azure-devops_az_pipelines_agent_show
-- uid: ext_azure-devops_az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --pool-id
-    summary: The agent pool containing the agents.
-    description: ''
-  - name: --agent-name
-    summary: Filter on agent name.
-    description: ''
-  - name: --demands
-    summary: Filter by demands the agents can satisfy. Comma separated list.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-assigned-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' current work.
-    description: ''
-  - name: --include-capabilities
-    parameterValueGroup: false, true
-    summary: Whether to include the agents' capabilities in the response.
-    description: ''
-  - name: --include-last-completed-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' most recent completed work.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --agent-id --id
-    summary: The agent ID to get information about.
-    description: ''
-  - isRequired: true
-    name: --pool-id
-    summary: The agent pool containing the agent.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-assigned-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' current work.
-    description: ''
-  - name: --include-capabilities
-    parameterValueGroup: false, true
-    summary: Whether to include the agents' capabilities in the response.
-    description: ''
-  - name: --include-last-completed-request
-    parameterValueGroup: false, true
-    summary: Whether to include details about the agents' most recent completed work.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: ext_azure-devops_az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agents.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build.yml
deleted file mode 100644
index d4e0bc326d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_build_list
-  - ext_azure-devops_az_pipelines_build_queue
-  - ext_azure-devops_az_pipelines_build_show
-- uid: ext_azure-devops_az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: Filter by builds for this branch.
-    description: ''
-  - name: --definition-ids
-    summary: IDs (space separated) of definitions to list builds for.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --reason
-    parameterValueGroup: all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset
-    summary: Limit to builds with this reason.
-    description: ''
-  - name: --requested-for
-    summary: Limit to builds requested for this user or group.
-    description: ''
-  - name: --result
-    parameterValueGroup: canceled, failed, none, partiallySucceeded, succeeded
-    summary: Limit to builds with this result.
-    description: ''
-  - name: --status
-    parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
-    summary: Limit to builds with this status.
-    description: ''
-  - name: --tags
-    summary: Limit to builds with each of the specified tags. Space separated.
-    description: ''
-  - name: --top
-    summary: Maximum number of builds to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: 'Branch to build. Required if there is not a default branch set up on the definition. Example: refs/heads/master or master or refs/pull/1/merge.'
-    description: ''
-  - name: --commit-id
-    summary: Commit ID of the branch to build.
-    description: ''
-  - name: --definition-id
-    summary: ID of the definition to queue. Required if --name is not supplied.
-    description: ''
-  - name: --definition-name
-    summary: Name of the definition to queue. Ignored if --id is supplied.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the build results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-id
-    summary: Queue Id of the pool that will be used to queue the build.
-    description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the build.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the build results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: ext_azure-devops_az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: ext_azure-devops_az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: ext_azure-devops_az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: ext_azure-devops_az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage builds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml
deleted file mode 100644
index 5a6cd77b37..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/definition.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_build_definition_list
-  - ext_azure-devops_az_pipelines_build_definition_show
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: 'Limit results to definitions with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository
-    summary: Limit results to definitions associated with this repository.
-    description: ''
-  - name: --repository-type
-    parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
-    summary: Limit results to definitions associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
-    description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: ID of the definition.
-    description: ''
-  - name: --name
-    summary: Name of the definition. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the definition summary page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: ext_azure-devops_az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml
deleted file mode 100644
index fa93f6e312..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/build/tag.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_build_tag_add
-  - ext_azure-devops_az_pipelines_build_tag_delete
-  - ext_azure-devops_az_pipelines_build_tag_list
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --build-id
-    summary: ID of the build.
-    description: ''
-  - isRequired: true
-    name: --tags
-    summary: Tag(s) to be added to the build. [Comma seperated values].
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --build-id
-    summary: ID of the build.
-    description: ''
-  - isRequired: true
-    name: --tag
-    summary: Tag to be deleted from the build.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --build-id
-    summary: ID of the build.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: ext_azure-devops_az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: ext_azure-devops_az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build tags.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml
deleted file mode 100644
index 8218001494..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/folder.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_folder_create
-  - ext_azure-devops_az_pipelines_folder_delete
-  - ext_azure-devops_az_pipelines_folder_list
-  - ext_azure-devops_az_pipelines_folder_update
-- uid: ext_azure-devops_az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --description
-    summary: Description of the folder.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-  description: This will delete all pipelines in the folder.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    parameterValueGroup: Asc, Desc, None
-    summary: Order in which folders are returned.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --path
-    summary: Full path of the folder.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --new-description
-    summary: New description of the folder.
-    description: ''
-  - name: --new-path
-    summary: New full path of the folder.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: ext_azure-devops_az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: ext_azure-devops_az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: ext_azure-devops_az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage folders for organizing pipelines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml
deleted file mode 100644
index 62a3b7a9c3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/pool.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_pool_list
-  - ext_azure-devops_az_pipelines_pool_show
-- uid: ext_azure-devops_az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter the list with user action permitted.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pool-name
-    summary: Filter the list with matching pool name.
-    description: ''
-  - name: --pool-type
-    parameterValueGroup: automation, deployment
-    summary: Filter the list with type of pool.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --pool-id
-    summary: Id of the pool to list the details.
-    description: ''
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter the list with user action permitted.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: ext_azure-devops_az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml
deleted file mode 100644
index 17b2bfb965..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/queue.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_queue_list
-  - ext_azure-devops_az_pipelines_queue_show
-- uid: ext_azure-devops_az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter by whether the calling user has use or manage permissions.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-name
-    summary: Filter the list with matching queue name regex. e.g. \*ubuntu\* for queue with name 'Hosted Ubuntu 1604'.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --queue-id
-    summary: Id of the agent queue to get information about.
-    description: ''
-  - name: --action
-    parameterValueGroup: manage, none, use
-    summary: Filter by whether the calling user has use or manage permissions.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: ext_azure-devops_az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent queues.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release.yml
deleted file mode 100644
index 7f8715ff97..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_release_create
-  - ext_azure-devops_az_pipelines_release_list
-  - ext_azure-devops_az_pipelines_release_show
-- uid: ext_azure-devops_az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --artifact-metadata-list
-    summary: Space separated "alias=version_id" pairs.
-    description: ''
-  - name: --definition-id
-    summary: ID of the definition to create. Required if --definition-name is not supplied.
-    description: ''
-  - name: --definition-name
-    summary: Name of the definition to create. Ignored if --definition-id is supplied.
-    description: ''
-  - name: --description
-    summary: Description of the release.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the release results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --definition-id
-    summary: ID of definition to list releases for.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --source-branch
-    summary: Filter releases for this branch.
-    description: ''
-  - name: --status
-    summary: Limit to releases with this status.
-    description: ''
-  - name: --top
-    summary: Maximum number of releases to list. Default is 50.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the release.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the release results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: ext_azure-devops_az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: ext_azure-devops_az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: ext_azure-devops_az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage releases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml
deleted file mode 100644
index e26dfdd012..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/release/definition.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_release_definition_list
-  - ext_azure-devops_az_pipelines_release_definition_show
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --artifact-source-id
-    summary: Limit results to definitions associated with this artifact_source_id. e.g. For build it would be {projectGuid}:{BuildDefinitionId}, for Jenkins it would be {JenkinsConnectionId}:{JenkinsDefinitionId}, for TfsOnPrem it would be {TfsOnPremConnectionId}:{ProjectName}:{TfsOnPremDefinitionId}. For third-party artifacts e.g. TeamCity, BitBucket you may refer 'uniqueSourceIdentifier' inside vss-extension.json at <a href="https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions">https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions</a>.
-    description: ''
-  - name: --artifact-type
-    parameterValueGroup: build, externaltfsbuild, git, github, jenkins, tfvc
-    summary: Release definitions with given artifactType will be returned.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: 'Limit results to definitions with this name or contains this name. Example: "FabCI".'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --id
-    summary: ID of the definition.
-    description: ''
-  - name: --name
-    summary: Name of the definition. Ignored if --id is supplied.
-    description: ''
-  - name: --open
-    summary: Open the definition summary page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: ext_azure-devops_az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage release definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml
deleted file mode 100644
index ceda5ebbb0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_runs_list
-  - ext_azure-devops_az_pipelines_runs_show
-- uid: ext_azure-devops_az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: Filter by builds for this branch.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-ids
-    summary: IDs (space separated) of definitions to list builds for.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    parameterValueGroup: FinishTimeAsc, FinishTimeDesc, QueueTimeAsc, QueueTimeDesc, StartTimeAsc, StartTimeDesc
-    summary: Order of pipeline runs.
-    description: ''
-  - name: --reason
-    parameterValueGroup: all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset
-    summary: Limit to builds with this reason.
-    description: ''
-  - name: --requested-for
-    summary: Limit to builds requested for this user or group.
-    description: ''
-  - name: --result
-    parameterValueGroup: canceled, failed, none, partiallySucceeded, succeeded
-    summary: Limit to builds with this result.
-    description: ''
-  - name: --status
-    parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
-    summary: Limit to builds with this status.
-    description: ''
-  - name: --tags
-    summary: Limit to builds with each of the specified tags. Space separated.
-    description: ''
-  - name: --top
-    summary: Maximum number of builds to list.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pipeline run.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the build results page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: ext_azure-devops_az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline runs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml
deleted file mode 100644
index 8958cb8d06..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/artifact.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_runs_artifact_download
-  - ext_azure-devops_az_pipelines_runs_artifact_list
-  - ext_azure-devops_az_pipelines_runs_artifact_upload
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the artifact to download.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Path to download the artifact into.
-    description: ''
-  - isRequired: true
-    name: --run-id
-    summary: ID of the run that the artifact is associated to.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the run that the artifact is associated to.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the artifact to upload.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Path to upload the artifact from.
-    description: ''
-  - isRequired: true
-    name: --run-id
-    summary: ID of the run that the artifact is associated to.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run artifacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml
deleted file mode 100644
index 6a13c1c940..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/runs/tag.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_runs_tag_add
-  - ext_azure-devops_az_pipelines_runs_tag_delete
-  - ext_azure-devops_az_pipelines_runs_tag_list
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the pipeline run.
-    description: ''
-  - isRequired: true
-    name: --tags
-    summary: Tag(s) to be added to the pipeline run. [Comma seperated values].
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the pipeline run.
-    description: ''
-  - isRequired: true
-    name: --tag
-    summary: Tag to be deleted from the pipeline run.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --run-id
-    summary: ID of the  pipeline run.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: ext_azure-devops_az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: ext_azure-devops_az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run tags.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml
deleted file mode 100644
index e9a2e9f348..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_variable_group_create
-  - ext_azure-devops_az_pipelines_variable_group_delete
-  - ext_azure-devops_az_pipelines_variable_group_list
-  - ext_azure-devops_az_pipelines_variable_group_show
-  - ext_azure-devops_az_pipelines_variable_group_update
-- uid: ext_azure-devops_az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable group.
-    description: ''
-  - isRequired: true
-    name: --variables
-    summary: Variables in format key=value space separated pairs. Secret variables should be managed using `az pipelines variable-group variable` commands.
-    description: ''
-  - name: --authorize
-    parameterValueGroup: false, true
-    summary: Whether the variable group should be accessible by all pipelines.
-    description: ''
-  - name: --description
-    summary: Description of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --action --action-filter
-    parameterValueGroup: manage, none, use
-    summary: Action filter for the variable group. It specifies the action which can be performed on the variable groups.
-    description: ''
-  - name: --continuation-token
-    summary: Gets the variable groups after the continuation token provided.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --group-name
-    summary: Name of the variable group. Wildcards are accepted. e.g. var_group\*.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --query-order
-    defaultValue: Desc
-    parameterValueGroup: Asc, Desc
-    summary: Gets the results in the defined order.
-    description: ''
-  - name: --top
-    summary: Number of variable groups to get.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: ID of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - name: --authorize
-    parameterValueGroup: false, true
-    summary: Whether the variable group should be accessible by all pipelines.
-    description: ''
-  - name: --description
-    summary: New description of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name of the variable group.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: ext_azure-devops_az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: ext_azure-devops_az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variable groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml
deleted file mode 100644
index 923dcabc19..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable-group/variable.yml
+++ /dev/null
@@ -1,162 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_variable_group_variable_create
-  - ext_azure-devops_az_pipelines_variable_group_variable_delete
-  - ext_azure-devops_az_pipelines_variable_group_variable_list
-  - ext_azure-devops_az_pipelines_variable_group_variable_update
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: If the value of the variable is a secret.
-    description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --group-id --id
-    summary: Id of the variable group.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --new-name
-    summary: New name of the variable.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --prompt-value
-    parameterValueGroup: false, true
-    summary: Set it to True to update the value of a secret variable using environment variable or prompt via standard input.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: If the value of the variable is a secret.
-    description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variables in a variable group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml
deleted file mode 100644
index 80d0908b39..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/pipelines/variable.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_pipelines_variable_create
-  - ext_azure-devops_az_pipelines_variable_delete
-  - ext_azure-devops_az_pipelines_variable_list
-  - ext_azure-devops_az_pipelines_variable_update
-- uid: ext_azure-devops_az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --allow-override
-    parameterValueGroup: false, true
-    summary: Indicates whether the value can be set at queue time.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline. Ignored if --pipeline-id parameter is supplied.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: Indicates whether the variable's value is a secret.
-    description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with <problematic ids="id10" refid="id9">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> or user will be prompted to enter it via standard input. e.g. A variable named `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline. Ignored if --pipeline-id parameter is supplied.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of the variable.
-    description: ''
-  - name: --allow-override
-    parameterValueGroup: false, true
-    summary: Indicates whether the value can be set at queue time.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --new-name
-    summary: New name of the variable.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --pipeline-id
-    summary: Id of the pipeline.
-    description: ''
-  - name: --pipeline-name
-    summary: Name of the pipeline. Ignored if --pipeline-id parameter is supplied.
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --prompt-value
-    parameterValueGroup: false, true
-    summary: Set it to True to update the value of a secret variable using environment variable or prompt via standard input.
-    description: ''
-  - name: --secret
-    parameterValueGroup: false, true
-    summary: If the value of the variable is a secret.
-    description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, use --prompt-value parameter, to be prompted to enter it via standard input. For non-interactive consoles it can be picked from environment variable prefixed with <problematic ids="id12" refid="id11">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> e.g. A variable nameed `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: ext_azure-devops_az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline variables.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos.yml
deleted file mode 100644
index 2fb91bbb4a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos.yml
+++ /dev/null
@@ -1,330 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_create
-  - ext_azure-devops_az_repos_delete
-  - ext_azure-devops_az_repos_list
-  - ext_azure-devops_az_repos_show
-  - ext_azure-devops_az_repos_update
-- uid: ext_azure-devops_az_repos_create
-  name: az repos create
-  summary: Create a Git repository in a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name for the new repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the repository page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_delete
-  name: az repos delete
-  summary: Delete a Git repository in a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_repos_list
-  name: az repos list
-  summary: List Git repositories of a team project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_show
-  name: az repos show
-  summary: Get the details of a Git repository.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the repository page in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_update
-  name: az repos update
-  summary: Update the Git repository.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-  - name: --default-branch
-    summary: "Default branch to be set for the repository. Example: 'refs/heads/live' or 'live'."
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --name
-    summary: New name for the repository.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_create
-  name: az repos create
-  summary: Create a Git repository in a team project.
-- uid: ext_azure-devops_az_repos_delete
-  name: az repos delete
-  summary: Delete a Git repository in a team project.
-- uid: ext_azure-devops_az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-- uid: ext_azure-devops_az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-- uid: ext_azure-devops_az_repos_list
-  name: az repos list
-  summary: List Git repositories of a team project.
-- uid: ext_azure-devops_az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: ext_azure-devops_az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: ext_azure-devops_az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: ext_azure-devops_az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: ext_azure-devops_az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-- uid: ext_azure-devops_az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-- uid: ext_azure-devops_az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: ext_azure-devops_az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: ext_azure-devops_az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: ext_azure-devops_az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: ext_azure-devops_az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: ext_azure-devops_az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: ext_azure-devops_az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-- uid: ext_azure-devops_az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-- uid: ext_azure-devops_az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: ext_azure-devops_az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: ext_azure-devops_az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: ext_azure-devops_az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: ext_azure-devops_az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-- uid: ext_azure-devops_az_repos_show
-  name: az repos show
-  summary: Get the details of a Git repository.
-- uid: ext_azure-devops_az_repos_update
-  name: az repos update
-  summary: Update the Git repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/import.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/import.yml
deleted file mode 100644
index 6e7d95c22a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/import.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_import_create
-- uid: ext_azure-devops_az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --git-source-url --git-url
-    summary: Url of the source git repository.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --git-service-endpoint-id
-    summary: Service Endpoint for connection to external endpoint.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository to create the import request in.
-    description: ''
-  - name: --requires-authorization
-    summary: Flag to tell if source git repository is private.
-    description: ''
-  - name: --user-name
-    summary: User name in case source git repository is private.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git repositories import.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy.yml
deleted file mode 100644
index 5294ec00d2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_create
-  - ext_azure-devops_az_repos_policy_delete
-  - ext_azure-devops_az_repos_policy_list
-  - ext_azure-devops_az_repos_policy_show
-  - ext_azure-devops_az_repos_policy_update
-- uid: ext_azure-devops_az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config --policy-configuration
-    summary: Local file path for configuration file. Please use / backslash when typing in directory path.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --branch
-    summary: 'Branch name to filter results by exact match of branch name. The --repository-id parameter is required to use the branch filter. For example: --branch master.'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: ID of the repository to filter results by exact match of the repository ID. For example --repository-ID e556f204-53c9-4153-9cd9-ef41a11e3345.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config --policy-configuration
-    summary: Local file path for configuration file. Please use / backslash when typing in directory path.
-    description: ''
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: ext_azure-devops_az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: ext_azure-devops_az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: ext_azure-devops_az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: ext_azure-devops_az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage branch policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml
deleted file mode 100644
index a37e77001b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/approver-count.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_approver_count_create
-  - ext_azure-devops_az_repos_policy_approver_count_update
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --allow-downvotes
-    parameterValueGroup: false, true
-    summary: Whether to allow downvotes or not.
-    description: ''
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --creator-vote-counts
-    parameterValueGroup: false, true
-    summary: Whether the creator's vote counts or not.
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --minimum-approver-count
-    summary: 'Minimum number of approvers required. For example: 2.'
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --reset-on-source-push
-    parameterValueGroup: false, true
-    summary: Whether to reset source on push.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --allow-downvotes
-    parameterValueGroup: false, true
-    summary: Whether to allow downvotes or not.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --creator-vote-counts
-    parameterValueGroup: false, true
-    summary: Whether the creator's vote counts or not.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --minimum-approver-count
-    summary: 'Minimum number of approvers required. For example: 2.'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --reset-on-source-push
-    parameterValueGroup: false, true
-    summary: Whether to reset source on push.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: ext_azure-devops_az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage approver count policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml
deleted file mode 100644
index bb2a29dac8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/build.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_build_create
-  - ext_azure-devops_az_repos_policy_build_update
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --build-definition-id
-    summary: Build Definition Id.
-    description: ''
-  - isRequired: true
-    name: --display-name
-    summary: "Display name for this build policy to identify the policy. For example: 'Manual queue policy'."
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --manual-queue-only
-    parameterValueGroup: false, true
-    summary: Whether to allow only manual queue of builds.
-    description: ''
-  - isRequired: true
-    name: --queue-on-source-update-only
-    parameterValueGroup: false, true
-    summary: Queue Only on source update.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --valid-duration
-    summary: Policy validity duration (in minutes).
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --build-definition-id
-    summary: Build Definition Id.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --display-name
-    summary: "Display name for this build policy to identify the policy. For example: 'Manual queue policy'."
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --manual-queue-only
-    parameterValueGroup: false, true
-    summary: Whether to allow only manual queue of builds.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --queue-on-source-update-only
-    parameterValueGroup: false, true
-    summary: Queue Only on source update.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --valid-duration
-    summary: Policy validity duration (in minutes).
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: ext_azure-devops_az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml
deleted file mode 100644
index ab14116286..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/case-enforcement.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_case_enforcement_create
-  - ext_azure-devops_az_repos_policy_case_enforcement_update
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage case enforcement policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml
deleted file mode 100644
index 1b7dccc8bc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/comment-required.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_comment_required_create
-  - ext_azure-devops_az_repos_policy_comment_required_update
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: ext_azure-devops_az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage comment required policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml
deleted file mode 100644
index 5122fa99b7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/file-size.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_file_size_create
-  - ext_azure-devops_az_repos_policy_file_size_update
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --maximum-git-blob-size
-    summary: Maximum git blob size in bytes. For example, to specify a 10byte limit, --maximum-git-blob-size 10.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --use-uncompressed-size
-    parameterValueGroup: false, true
-    summary: Whether to use uncompressed size.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --maximum-git-blob-size
-    summary: Maximum git blob size in bytes. For example, to specify a 10byte limit, --maximum-git-blob-size 10.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --use-uncompressed-size
-    parameterValueGroup: false, true
-    summary: Whether to use uncompressed size.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: ext_azure-devops_az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage file size policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml
deleted file mode 100644
index e06b907c46..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/merge-strategy.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_merge_strategy_create
-  - ext_azure-devops_az_repos_policy_merge_strategy_update
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --allow-no-fast-forward
-    parameterValueGroup: false, true
-    summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
-    description: ''
-  - name: --allow-rebase
-    parameterValueGroup: false, true
-    summary: Rebase and fast-forward - Creates a linear history by replaying the source branch commits onto the target without a merge commit.
-    description: ''
-  - name: --allow-rebase-merge
-    parameterValueGroup: false, true
-    summary: Rebase with merge commit - Creates a semi-linear history by replaying the source branch commits onto the target and then creating a merge commit.
-    description: ''
-  - name: --allow-squash
-    parameterValueGroup: false, true
-    summary: Squash merge - Creates a linear history by condensing the source branch commits into a single new commit on the target branch.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --use-squash-merge
-    parameterValueGroup: false, true
-    summary: Whether to squash merge always. This option does not work for allowing other merge types.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --allow-no-fast-forward
-    parameterValueGroup: false, true
-    summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
-    description: ''
-  - name: --allow-rebase
-    parameterValueGroup: false, true
-    summary: Rebase and fast-forward - Creates a linear history by replaying the source branch commits onto the target without a merge commit.
-    description: ''
-  - name: --allow-rebase-merge
-    parameterValueGroup: false, true
-    summary: Rebase with merge commit - Creates a semi-linear history by replaying the source branch commits onto the target and then creating a merge commit.
-    description: ''
-  - name: --allow-squash
-    parameterValueGroup: false, true
-    summary: Squash merge - Creates a linear history by condensing the source branch commits into a single new commit on the target branch.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --use-squash-merge
-    parameterValueGroup: false, true
-    summary: Whether to squash merge always. This option does not work for allowing other merge types.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage merge strategy policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml
deleted file mode 100644
index e98e24fe5e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/required-reviewer.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_required_reviewer_create
-  - ext_azure-devops_az_repos_policy_required_reviewer_update
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --message
-    summary: Message.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - isRequired: true
-    name: --required-reviewer-ids
-    summary: "Required reviewers email addresses separated by ';'. For example: john@contoso.com;alice@contoso.com."
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --message
-    summary: Message.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --path-filter
-    summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --required-reviewer-ids
-    summary: "Required reviewers email addresses separated by ';'. For example: john@contoso.com;alice@contoso.com."
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage required reviewer policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml
deleted file mode 100644
index 73409c64e7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/policy/work-item-linking.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_policy_work_item_linking_create
-  - ext_azure-devops_az_repos_policy_work_item_linking_update
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - isRequired: true
-    name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - isRequired: true
-    name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - isRequired: true
-    name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-  - name: --branch-match-type
-    defaultValue: exact
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id --policy-id
-    summary: ID of the policy.
-    description: ''
-  - name: --blocking
-    parameterValueGroup: false, true
-    summary: Whether the policy should be blocking or not.
-    description: ''
-  - name: --branch
-    summary: 'Branch on which this policy should be applied. For example: master.'
-    description: ''
-  - name: --branch-match-type
-    parameterValueGroup: exact, prefix
-    summary: Determines how the branch argument is used to apply a policy. If value is 'exact', the policy will be applied on a branch which has an exact match on the --branch argument. If value is 'prefix' the policy is applied across all branch folders that match the prefix provided by the --branch argument.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Whether the policy is enabled or not.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository-id
-    summary: Id of the repository on which to apply the policy.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item linking policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr.yml
deleted file mode 100644
index 4a95fc7331..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr.yml
+++ /dev/null
@@ -1,316 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_checkout
-  - ext_azure-devops_az_repos_pr_create
-  - ext_azure-devops_az_repos_pr_list
-  - ext_azure-devops_az_repos_pr_set_vote
-  - ext_azure-devops_az_repos_pr_show
-  - ext_azure-devops_az_repos_pr_update
-- uid: ext_azure-devops_az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --remote-name
-    defaultValue: origin
-    summary: Name of git remote against which PR is raised.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --auto-complete
-    parameterValueGroup: false, true
-    summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
-    description: ''
-  - name: --bypass-policy
-    parameterValueGroup: false, true
-    summary: Bypass required policies (if any) and completes the pull request once it can be merged.
-    description: ''
-  - name: --bypass-policy-reason
-    summary: Reason for bypassing the required policies.
-    description: ''
-  - name: --delete-source-branch
-    parameterValueGroup: false, true
-    summary: Delete the source branch after the pull request has been completed and merged into the target branch.
-    description: ''
-  - name: --description -d
-    summary: 'Description for the new pull request. Can include markdown. Each value sent to this arg will be a new line. For example: --description "First Line" "Second Line".'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --draft
-    parameterValueGroup: false, true
-    summary: Use this flag to create the pull request in draft/work in progress mode.
-    description: ''
-  - name: --merge-commit-message
-    summary: Message displayed when commits are merged.
-    description: ''
-  - name: --open
-    summary: Open the pull request in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository to create the pull request in.
-    description: ''
-  - name: --reviewers
-    summary: Additional users or groups to include as reviewers on the new pull request. Space separated.
-    description: ''
-  - name: --source-branch -s
-    summary: 'Name of the source branch. Example: "dev".'
-    description: ''
-  - name: --squash
-    parameterValueGroup: false, true
-    summary: Squash the commits in the source branch when merging into the target branch.
-    description: ''
-  - name: --target-branch -t
-    summary: Name of the target branch. If not specified, defaults to the default branch of the target repository.
-    description: ''
-  - name: --title
-    summary: Title for the new pull request.
-    description: ''
-  - name: --transition-work-items
-    parameterValueGroup: false, true
-    summary: Transition any work items linked to the pull request into the next logical state. (e.g. Active -> Resolved).
-    description: ''
-  - name: --work-items
-    summary: IDs of the work items to link to the new pull request. Space separated.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --creator
-    summary: Limit results to pull requests created by this user.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --include-links
-    summary: Include _links for each pull request.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-  - name: --reviewer
-    summary: Limit results to pull requests where this user is a reviewer.
-    description: ''
-  - name: --skip
-    summary: Number of pull requests to skip.
-    description: ''
-  - name: --source-branch -s
-    summary: Limit results to pull requests that originate from this source branch.
-    description: ''
-  - name: --status
-    parameterValueGroup: abandoned, active, all, completed
-    summary: Limit results to pull requests with this status.
-    description: ''
-  - name: --target-branch -t
-    summary: Limit results to pull requests that target this branch.
-    description: ''
-  - name: --top
-    summary: Maximum number of pull requests to list.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --vote
-    parameterValueGroup: approve, approve-with-suggestions, reject, reset, wait-for-author
-    summary: New vote value for the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --open
-    summary: Open the pull request in your web browser.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --auto-complete
-    parameterValueGroup: false, true
-    summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
-    description: ''
-  - name: --bypass-policy
-    parameterValueGroup: false, true
-    summary: Bypass required policies (if any) and completes the pull request once it can be merged.
-    description: ''
-  - name: --bypass-policy-reason
-    summary: Reason for bypassing the required policies.
-    description: ''
-  - name: --delete-source-branch
-    parameterValueGroup: false, true
-    summary: Delete the source branch after the pull request has been completed and merged into the target branch.
-    description: ''
-  - name: --description -d
-    summary: 'New description for the pull request.  Can include markdown.  Each value sent to this arg will be a new line. For example: --description "First Line" "Second Line".'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --draft
-    parameterValueGroup: false, true
-    summary: Publish the PR or convert to draft mode.
-    description: ''
-  - name: --merge-commit-message
-    summary: Message displayed when commits are merged.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --squash
-    parameterValueGroup: false, true
-    summary: Squash the commits in the source branch when merging into the target branch.
-    description: ''
-  - name: --status
-    parameterValueGroup: abandoned, active, completed
-    summary: Set the new state of pull request.
-    description: ''
-  - name: --title
-    summary: New title for the pull request.
-    description: ''
-  - name: --transition-work-items
-    parameterValueGroup: false, true
-    summary: Transition any work items linked to the pull request into the next logical state. (e.g. Active -> Resolved).
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: ext_azure-devops_az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: ext_azure-devops_az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: ext_azure-devops_az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: ext_azure-devops_az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: ext_azure-devops_az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: ext_azure-devops_az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull requests.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml
deleted file mode 100644
index b966024e54..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/policy.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_policy_list
-  - ext_azure-devops_az_repos_pr_policy_queue
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --skip
-    summary: Number of policies to skip.
-    description: ''
-  - name: --top
-    summary: Maximum number of policies to list.
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --evaluation-id -e
-    summary: ID of the policy evaluation to queue.
-    description: ''
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: ext_azure-devops_az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml
deleted file mode 100644
index 7065accc28..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/reviewer.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_reviewer_add
-  - ext_azure-devops_az_repos_pr_reviewer_list
-  - ext_azure-devops_az_repos_pr_reviewer_remove
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --reviewers
-    summary: Users or groups to include as reviewers on a pull request. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --reviewers
-    summary: Users or groups to remove as reviewers on a pull request. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: ext_azure-devops_az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request reviewers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml
deleted file mode 100644
index 8895b8ba7d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/pr/work-item.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_pr_work_item_add
-  - ext_azure-devops_az_repos_pr_work_item_list
-  - ext_azure-devops_az_repos_pr_work_item_remove
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --work-items
-    summary: IDs of the work items to link. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --id
-    summary: ID of the pull request.
-    description: ''
-  - isRequired: true
-    name: --work-items
-    summary: IDs of the work items to unlink. Space separated.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: ext_azure-devops_az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items associated with pull requests.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/ref.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/ref.yml
deleted file mode 100644
index 43937dacf3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-devops/repos/ref.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-devops_az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-devops_az_repos_ref_create
-  - ext_azure-devops_az_repos_ref_delete
-  - ext_azure-devops_az_repos_ref_list
-  - ext_azure-devops_az_repos_ref_lock
-  - ext_azure-devops_az_repos_ref_unlock
-- uid: ext_azure-devops_az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to create (example: heads/my_branch or tags/my_tag).'
-    description: ''
-  - isRequired: true
-    name: --object-id
-    summary: Id of the object to create the reference from.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to delete (example: heads/my_branch).'
-    description: ''
-  - isRequired: true
-    name: --object-id
-    summary: Id of the reference to delete.
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --filter
-    summary: 'A filter to apply to the refs (starts with). Example: head or heads/ for the branches.'
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to update (example: heads/my_branch).'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-- uid: ext_azure-devops_az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: 'Name of the reference to update (example: heads/my_branch).'
-    description: ''
-  - name: --detect
-    parameterValueGroup: false, true
-    summary: Automatically detect organization.
-    description: ''
-  - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --project -p
-    summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
-    description: ''
-  - name: --repository -r
-    summary: Name or ID of the repository.
-    description: ''
-commands:
-- uid: ext_azure-devops_az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: ext_azure-devops_az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: ext_azure-devops_az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: ext_azure-devops_az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: ext_azure-devops_az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git references.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/index.yml
deleted file mode 100644
index a5e4c6da10..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az
-  name: azure-firewall
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-firewall_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network.yml
deleted file mode 100644
index 7ba3c352c6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-firewall_az_network_firewall
-  name: az network firewall
-  summary: Manage and configure Azure Firewalls.
-- uid: ext_azure-firewall_az_network_firewall_application_rule
-  name: az network firewall application-rule
-  summary: Manage and configure Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_create
-  name: az network firewall create
-  summary: Create an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_delete
-  name: az network firewall delete
-  summary: Delete an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_ip_config
-  name: az network firewall ip-config
-  summary: Manage and configure Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_list
-  name: az network firewall list
-  summary: List Azure Firewalls.
-- uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  name: az network firewall list-fqdn-tags
-  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config
-  name: az network firewall management-ip-config
-  summary: Manage and configure Azure Firewall Management IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule
-  name: az network firewall nat-rule
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule
-  name: az network firewall network-rule
-  summary: Manage and configure Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_policy
-  name: az network firewall policy
-  summary: Manage and configure Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_show
-  name: az network firewall show
-  summary: Get the details of an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-  name: az network firewall threat-intel-whitelist
-  summary: Manage and configure Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_update
-  name: az network firewall update
-  summary: Update an Azure Firewall.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall.yml
deleted file mode 100644
index fffc44a5db..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall.yml
+++ /dev/null
@@ -1,362 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall
-  name: az network firewall
-  summary: Manage and configure Azure Firewalls.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_create
-  - ext_azure-firewall_az_network_firewall_delete
-  - ext_azure-firewall_az_network_firewall_list
-  - ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  - ext_azure-firewall_az_network_firewall_show
-  - ext_azure-firewall_az_network_firewall_update
-- uid: ext_azure-firewall_az_network_firewall_create
-  name: az network firewall create
-  summary: Create an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Azure firewall with private ranges
-    syntax:
-      content: az network firewall create -g MyResourceGroup -n MyFirewall --private-ranges 10.0.0.0 10.0.0.0/16 IANAPrivateRanges
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-policy --policy
-    summary: Name or ID of the firewallPolicy associated with this azure firewall.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --private-ranges
-    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
-    description: ''
-  - name: --sku
-    parameterValueGroup: AZFW_Hub, AZFW_VNet
-    summary: SKU of Azure firewall. This field cannot be updated after the creation. The default sku in server end is AZFW_VNet. If you want to attach azure firewall to vhub, you should set sku to AZFW_Hub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vhub --virtual-hub
-    summary: Name or ID of the virtualHub to which the firewall belongs.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_delete
-  name: az network firewall delete
-  summary: Delete an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_list
-  name: az network firewall list
-  summary: List Azure Firewalls.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  name: az network firewall list-fqdn-tags
-  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_azure-firewall_az_network_firewall_show
-  name: az network firewall show
-  summary: Get the details of an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_update
-  name: az network firewall update
-  summary: Update an Azure Firewall.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-policy --policy
-    summary: Name or ID of the firewallPolicy associated with this azure firewall.
-    description: ''
-  - name: --private-ranges
-    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vhub --virtual-hub
-    summary: Name or ID of the virtualHub to which the firewall belongs.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_application_rule
-  name: az network firewall application-rule
-  summary: Manage and configure Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_create
-  name: az network firewall create
-  summary: Create an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_delete
-  name: az network firewall delete
-  summary: Delete an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_ip_config
-  name: az network firewall ip-config
-  summary: Manage and configure Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_list
-  name: az network firewall list
-  summary: List Azure Firewalls.
-- uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-  name: az network firewall list-fqdn-tags
-  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config
-  name: az network firewall management-ip-config
-  summary: Manage and configure Azure Firewall Management IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule
-  name: az network firewall nat-rule
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule
-  name: az network firewall network-rule
-  summary: Manage and configure Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_policy
-  name: az network firewall policy
-  summary: Manage and configure Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_show
-  name: az network firewall show
-  summary: Get the details of an Azure Firewall.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-  name: az network firewall threat-intel-whitelist
-  summary: Manage and configure Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_update
-  name: az network firewall update
-  summary: Update an Azure Firewall.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewalls.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml
deleted file mode 100644
index 9b4edb6937..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_application_rule
-  name: az network firewall application-rule
-  summary: Manage and configure Azure Firewall application rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_application_rule_create
-  - ext_azure-firewall_az_network_firewall_application_rule_delete
-  - ext_azure-firewall_az_network_firewall_application_rule_list
-  - ext_azure-firewall_az_network_firewall_application_rule_show
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application rule.
-    description: ''
-  - isRequired: true
-    name: --protocols
-    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Rule description.
-    description: ''
-  - name: --fqdn-tags
-    summary: Space-separated list of FQDN tags.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --source-ip-groups
-    summary: Space-separated list of name or resource id of source IpGroups.
-    description: ''
-  - name: --target-fqdns
-    summary: Space-separated list of fully qualified domain names (FDQN).
-    description: ''
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Deny
-    summary: The action to apply for the rule collection.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule collection from 100 (high) to 65000 (low).
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_create
-  name: az network firewall application-rule create
-  summary: Create an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-  name: az network firewall application-rule delete
-  summary: Delete an Azure Firewall application rule.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_list
-  name: az network firewall application-rule list
-  summary: List Azure Firewall application rules.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_show
-  name: az network firewall application-rule show
-  summary: Get the details of an Azure Firewall application rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall application rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml
deleted file mode 100644
index 224fae7dac..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/application-rule/collection.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-  name: az network firewall application-rule collection
-  summary: Manage and configure Azure Firewall application rule collections.
-  description: Collections are created as part of the `az network firewall application-rule create` command.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  - ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  - ext_azure-firewall_az_network_firewall_application_rule_collection_show
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-  name: az network firewall application-rule collection delete
-  summary: Delete an Azure Firewall application rule collection.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-  name: az network firewall application-rule collection list
-  summary: List Azure Firewall application rule collections.
-- uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-  name: az network firewall application-rule collection show
-  summary: Get the details of an Azure Firewall application rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Collections are created as part of the `az network firewall application-rule create` command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml
deleted file mode 100644
index 41c03e3d09..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/ip-config.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_ip_config
-  name: az network firewall ip-config
-  summary: Manage and configure Azure Firewall IP configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_ip_config_create
-  - ext_azure-firewall_az_network_firewall_ip_config_delete
-  - ext_azure-firewall_az_network_firewall_ip_config_list
-  - ext_azure-firewall_az_network_firewall_ip_config_show
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IP configuration.
-    description: ''
-  - isRequired: true
-    name: --public-ip-address
-    summary: Name or ID of the public IP to use.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallSubnet".
-    description: ''
-  - name: --m-name
-    summary: Name of the management IP configuration.
-    description: ''
-  - name: --m-public-ip-address
-    summary: Name or ID of the public IP to use for management ip configuation.
-    description: ''
-  - name: --m-vnet-name
-    summary: The virtual network (VNet) name for management ip configuation. It should contain one subnet called "AzureFirewallManagementSubnet".
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IP configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IP configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_ip_config_create
-  name: az network firewall ip-config create
-  summary: Create an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-  name: az network firewall ip-config delete
-  summary: Delete an Azure Firewall IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_list
-  name: az network firewall ip-config list
-  summary: List Azure Firewall IP configurations.
-- uid: ext_azure-firewall_az_network_firewall_ip_config_show
-  name: az network firewall ip-config show
-  summary: Get the details of an Azure Firewall IP configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall IP configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml
deleted file mode 100644
index 48f4b7ad27..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/management-ip-config.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config
-  name: az network firewall management-ip-config
-  summary: Manage and configure Azure Firewall Management IP configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_management_ip_config_show
-  - ext_azure-firewall_az_network_firewall_management_ip_config_update
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the public IP to use.
-    description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallManagementSubnet".
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-  name: az network firewall management-ip-config show
-  summary: Get the details of an Azure Firewall Management IP configuration.
-- uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-  name: az network firewall management-ip-config update
-  summary: Update an Azure Firewall Management IP configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall Management IP configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml
deleted file mode 100644
index fd099ec9cf..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule
-  name: az network firewall nat-rule
-  summary: Manage and configure Azure Firewall NAT rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_nat_rule_create
-  - ext_azure-firewall_az_network_firewall_nat_rule_delete
-  - ext_azure-firewall_az_network_firewall_nat_rule_list
-  - ext_azure-firewall_az_network_firewall_nat_rule_show
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --destination-addresses
-    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
-    description: ''
-  - isRequired: true
-    name: --destination-ports
-    summary: Space-separated list of destination ports. Use '\*' to match all.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the NAT rule.
-    description: ''
-  - isRequired: true
-    name: --protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of protocols.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --translated-port
-    summary: Translated port for this NAT rule.
-    description: ''
-  - name: --description
-    summary: Rule description.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --source-ip-groups
-    summary: Space-separated list of name or resource id of source IpGroups.
-    description: ''
-  - name: --translated-address
-    summary: Translated address for this NAT rule.
-    description: ''
-  - name: --translated-fqdn
-    summary: Translated FQDN for this NAT rule.
-    description: ''
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
-    description: ''
-  - name: --action
-    parameterValueGroup: Dnat, Snat
-    summary: The action to apply for the rule collection.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule collection from 100 (high) to 65000 (low).
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the NAT rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the NAT rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-  name: az network firewall nat-rule create
-  summary: Create an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-  name: az network firewall nat-rule delete
-  summary: Delete an Azure Firewall NAT rule.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-  name: az network firewall nat-rule list
-  summary: List Azure Firewall NAT rules.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-  name: az network firewall nat-rule show
-  summary: Get the details of an Azure Firewall NAT rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall NAT rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml
deleted file mode 100644
index cba4b9869e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/nat-rule/collection.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-  name: az network firewall nat-rule collection
-  summary: Manage and configure Azure Firewall NAT rules.
-  description: Collections are created as part of the `az network firewall nat-rule create` command.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  - ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  - ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-  name: az network firewall nat-rule collection delete
-  summary: Delete an Azure Firewall NAT rule collection.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-  name: az network firewall nat-rule collection list
-  summary: List Azure Firewall NAT rule collections.
-- uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-  name: az network firewall nat-rule collection show
-  summary: Get the details of an Azure Firewall NAT rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Collections are created as part of the `az network firewall nat-rule create` command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml
deleted file mode 100644
index dbfb04a4d1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule.yml
+++ /dev/null
@@ -1,176 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_network_rule
-  name: az network firewall network-rule
-  summary: Manage and configure Azure Firewall network rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_network_rule_create
-  - ext_azure-firewall_az_network_firewall_network_rule_delete
-  - ext_azure-firewall_az_network_firewall_network_rule_list
-  - ext_azure-firewall_az_network_firewall_network_rule_show
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --destination-ports
-    summary: Space-separated list of destination ports. Use '\*' to match all.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network rule.
-    description: ''
-  - isRequired: true
-    name: --protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of protocols.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Rule description.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --destination-fqdns
-    summary: Space-separated list of destination FQDNs.
-    description: ''
-  - name: --destination-ip-groups
-    summary: Space-separated list of name or resource id of destination IpGroups.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses. Use '\*' to match all.
-    description: ''
-  - name: --source-ip-groups
-    summary: Space-separated list of name or resource id of source IpGroups.
-    description: ''
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Deny
-    summary: The action to apply for the rule collection.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule collection from 100 (high) to 65000 (low).
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_create
-  name: az network firewall network-rule create
-  summary: Create an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-  name: az network firewall network-rule delete
-  summary: Delete an Azure Firewall network rule.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_list
-  name: az network firewall network-rule list
-  summary: List Azure Firewall network rules.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_show
-  name: az network firewall network-rule show
-  summary: Get the details of an Azure Firewall network rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall network rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml
deleted file mode 100644
index 5ee3f936fb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/network-rule/collection.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-  name: az network firewall network-rule collection
-  summary: Manage and configure Azure Firewall network rule collections.
-  description: Collections are created as part of the `az network firewall network-rule create` command.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  - ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  - ext_azure-firewall_az_network_firewall_network_rule_collection_show
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name -c
-    summary: Name of the rule collection.
-    description: ''
-  - isRequired: true
-    name: --firewall-name -f
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-  name: az network firewall network-rule collection delete
-  summary: Delete an Azure Firewall network rule collection.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-  name: az network firewall network-rule collection list
-  summary: List Azure Firewall network rule collections.
-- uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-  name: az network firewall network-rule collection show
-  summary: Get the details of an Azure Firewall network rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Collections are created as part of the `az network firewall network-rule create` command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml
deleted file mode 100644
index 7ca9562192..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy
-  name: az network firewall policy
-  summary: Manage and configure Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_create
-  - ext_azure-firewall_az_network_firewall_policy_delete
-  - ext_azure-firewall_az_network_firewall_policy_list
-  - ext_azure-firewall_az_network_firewall_policy_show
-  - ext_azure-firewall_az_network_firewall_policy_update
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --base-policy
-    summary: The name or ID of parent firewall policy from which rules are inherited.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --threat-intel-mode
-    parameterValueGroup: Alert, Deny, Off
-    summary: The operation mode for Threat Intelligence.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Expands referenced resources.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --threat-intel-mode
-    parameterValueGroup: Alert, Deny, Off
-    summary: The operation mode for Threat Intelligence.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_create
-  name: az network firewall policy create
-  summary: Create an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_delete
-  name: az network firewall policy delete
-  summary: Delete an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_list
-  name: az network firewall policy list
-  summary: List all Azure firewall policies.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_show
-  name: az network firewall policy show
-  summary: Show an Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_update
-  name: az network firewall policy update
-  summary: Update an Azure firewall policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure firewall policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml
deleted file mode 100644
index bc48ff87ed..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group.yml
+++ /dev/null
@@ -1,189 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-  name: az network firewall policy rule-collection-group
-  summary: Manage and configure Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --priority
-    summary: Priority of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --priority
-    summary: Priority of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-  name: az network firewall policy rule-collection-group create
-  summary: Create an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-  name: az network firewall policy rule-collection-group delete
-  summary: Delete an Azure Firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-  name: az network firewall policy rule-collection-group list
-  summary: List all Azure firewall policy rule collection groups.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-  name: az network firewall policy rule-collection-group show
-  summary: Show an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-  name: az network firewall policy rule-collection-group update
-  summary: Update an Azure firewall policy rule collection group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure firewall policy rule collection group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml
deleted file mode 100644
index 5fffe6aacb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-  name: az network firewall policy rule-collection-group collection
-  summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
-  description: >-
-    Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are also two kinds of rules which are application rule and network rule.
-
-    NAT collection only support having one network rule. Filter collection support including a list of rules in it. But all of rules should be the same type.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-  description: Common Rule Arguments are used for both Network rule and Application rule. If you want to add more rules into filter collection, please use "az network policy rule-collection-group collection rule add/remove".
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a filter collection with Network rule into the rule collection group
-    syntax:
-      content: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name network_rule --rule-type NetworkRule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --destination-ports 12003 12004 --ip-protocols TCP UDP --collection-priority 11002
-  - summary: Add a filter collection with Application rule into the rule collection group
-    syntax:
-      content: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name application_rule --rule-type ApplicationRule --description "test" --destination-addresses "202.120.36.15" "202.120.36.16" --source-addresses "202.120.36.13" "202.120.36.14" --protocols Http=12800 Https=12801 --fqdn-tags AzureBackup HDInsight --collection-priority 11100
-  parameters:
-  - isRequired: true
-    name: --collection-priority
-    summary: The priority of the rule in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Deny
-    summary: The action type of a rule collection.
-    description: ''
-  - name: --fqdn-tags
-    summary: Space-separated list of FQDN tags for this rule.
-    description: ''
-  - name: --protocols
-    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
-    description: ''
-  - name: --target-fqdns
-    summary: Space-separated list of FQDNs for this rule.
-    description: ''
-  - name: --description
-    summary: The description of rule.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses.
-    description: ''
-  - name: --rule-name
-    summary: The name of rule.
-    description: ''
-  - name: --rule-type
-    parameterValueGroup: ApplicationRule, NetworkRule
-    summary: The type of rule.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses.
-    description: ''
-  - name: --destination-ports
-    summary: Space-separated list of destination ports.
-    description: ''
-  - name: --ip-protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of IP protocols.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a NAT collection into the rule collection group
-    syntax:
-      content: az network firewall policy rule-collection-group collection add-nat-collection -n nat_collection --collection-priority 10003 --policy-name {policy} -g {rg} --rule-collection-group-name {collectiongroup} --action DNAT --rule-name network_rule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --translated-address 128.1.1.1 --translated-port 1234 --destination-ports 12000 12001 --ip-protocols TCP UDP
-  parameters:
-  - isRequired: true
-    name: --collection-priority
-    summary: The priority of the rule in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --action
-    parameterValueGroup: DNAT, SNAT
-    summary: The action type of a rule collection.
-    description: ''
-  - name: --description
-    summary: The description of rule.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses.
-    description: ''
-  - name: --rule-name
-    summary: The name of rule.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses.
-    description: ''
-  - name: --translated-address
-    summary: Translated address for this NAT rule collection.
-    description: ''
-  - name: --translated-port
-    summary: Translated port for this NAT rule collection.
-    description: ''
-  - name: --destination-ports
-    summary: Space-separated list of destination ports.
-    description: ''
-  - name: --ip-protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of IP protocols.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-  name: az network firewall policy rule-collection-group collection add-filter-collection
-  summary: Add a filter collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-  name: az network firewall policy rule-collection-group collection add-nat-collection
-  summary: Add a NAT collection into an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-  name: az network firewall policy rule-collection-group collection list
-  summary: List all rule collections of an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-  name: az network firewall policy rule-collection-group collection remove
-  summary: Remove a rule collection from an Azure firewall policy rule collection group.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are also two kinds of rules which are application rule and network rule.
-
-  NAT collection only support having one network rule. Filter collection support including a list of rules in it. But all of rules should be the same type.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml
deleted file mode 100644
index 936ac87c2c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/policy/rule-collection-group/collection/rule.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-  name: az network firewall policy rule-collection-group collection rule
-  summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
-  description: Only filter collection supports having a list of rules.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  - ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-  description: Only filter collection supports having a list of rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name
-    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - name: --fqdn-tags
-    summary: Space-separated list of FQDN tags for this rule.
-    description: ''
-  - name: --protocols
-    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
-    description: ''
-  - name: --target-fqdns
-    summary: Space-separated list of FQDNs for this rule.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of rule.
-    description: ''
-  - isRequired: true
-    name: --rule-type
-    parameterValueGroup: ApplicationRule, NetworkRule
-    summary: The type of rule.
-    description: ''
-  - name: --description
-    summary: The description of rule.
-    description: ''
-  - name: --destination-addresses
-    summary: Space-separated list of destination IP addresses.
-    description: ''
-  - name: --source-addresses
-    summary: Space-separated list of source IP addresses.
-    description: ''
-  - name: --destination-ports
-    summary: Space-separated list of destination ports.
-    description: ''
-  - name: --ip-protocols
-    parameterValueGroup: Any, ICMP, TCP, UDP
-    summary: Space-separated list of IP protocols.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-  description: Only filter collection supports having a list of rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --collection-name
-    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: The name of the Firewall Policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-collection-group-name
-    summary: The name of the Firewall Policy Rule Collection Group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of rule.
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-  name: az network firewall policy rule-collection-group collection rule add
-  summary: Add a rule into an Azure firewall policy rule collection.
-- uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-  name: az network firewall policy rule-collection-group collection rule remove
-  summary: Remove a rule from an Azure firewall policy rule collection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Only filter collection supports having a list of rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-whitelist.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-whitelist.yml
deleted file mode 100644
index 7d436902f1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-firewall/network/firewall/threat-intel-whitelist.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-  name: az network firewall threat-intel-whitelist
-  summary: Manage and configure Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  - ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a threat intelligence whitelist
-    syntax:
-      content: az network firewall threat-intel-whitelist create -g MyResourceGroup -n MyFirewall --ip-addresses 10.0.0.0 10.0.0.1 --fqdns *.microsoft.com www.bing.com *google.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --fqdns
-    summary: Space-separated list of FQDNs.
-    description: ''
-  - name: --ip-addresses
-    summary: Space-separated list of IPv4 addresses.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Azure Firewall name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --fqdns
-    summary: Space-separated list of FQDNs.
-    description: ''
-  - name: --ip-addresses
-    summary: Space-separated list of IPv4 addresses.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-  name: az network firewall threat-intel-whitelist create
-  summary: Create an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-  name: az network firewall threat-intel-whitelist delete
-  summary: Delete an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-  name: az network firewall threat-intel-whitelist show
-  summary: Get the details of an Azure Firewall Threat Intelligence Whitelist.
-- uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-  name: az network firewall threat-intel-whitelist update
-  summary: Update Azure Firewall Threat Intelligence Whitelist.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Azure Firewall Threat Intelligence Whitelist.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt.yml
deleted file mode 100644
index 39b09d57ec..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt.yml
+++ /dev/null
@@ -1,253 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt
-  name: az dt
-  summary: Manage Azure Digital Twins (ADT) solutions & infrastructure.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_create
-  - ext_azure-iot_az_dt_delete
-  - ext_azure-iot_az_dt_list
-  - ext_azure-iot_az_dt_show
-- uid: ext_azure-iot_az_dt_create
-  name: az dt create
-  summary: Create a new Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create instance in target resource group with default location.
-    syntax:
-      content: az dt create -n {instance_name} -g {resouce_group} -l eastus2euap
-  - summary: Create instance in target resource group with specified location and tags.
-    syntax:
-      content: az dt create -n {instance_name} -g {resouce_group} -l westcentralus --tags "a=b;c=d"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: Digital Twins instance location. You can configure the default location using `az configure --defaults location=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins instance tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-- uid: ext_azure-iot_az_dt_delete
-  name: az dt delete
-  summary: Delete an existing Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an arbitrary instance.
-    syntax:
-      content: az dt delete -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_list
-  name: az dt list
-  summary: List the collection of Digital Twins instances by subscription or resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all instances in the current subscription.
-    syntax:
-      content: az dt list
-  - summary: List all instances in target resource group and output in table format.
-    syntax:
-      content: az dt list -g {resource_group} --output table
-  - summary: List all instances in subscription that meet a condition.
-    syntax:
-      content: az dt list --query "[?contains(name, 'Production')]"
-  - summary: Count instances that meet condition.
-    syntax:
-      content: az dt list --query "length([?contains(name, 'Production')])"
-  parameters:
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_show
-  name: az dt show
-  summary: Show an existing Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an instance.
-    syntax:
-      content: az dt show -n {instance_name}
-  - summary: Show an instance and project certain properties.
-    syntax:
-      content: az dt show -n {instance_name} --query "{Endpoint:hostName, Location:location}"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_create
-  name: az dt create
-  summary: Create a new Digital Twins instance.
-- uid: ext_azure-iot_az_dt_delete
-  name: az dt delete
-  summary: Delete an existing Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint
-  name: az dt endpoint
-  summary: Manage and configure Digital Twins instance endpoints.
-- uid: ext_azure-iot_az_dt_endpoint_create
-  name: az dt endpoint create
-  summary: Add egress endpoints to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_delete
-  name: az dt endpoint delete
-  summary: Remove an endpoint from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_list
-  name: az dt endpoint list
-  summary: List all egress endpoints configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_show
-  name: az dt endpoint show
-  summary: Show details of an endpoint configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_list
-  name: az dt list
-  summary: List the collection of Digital Twins instances by subscription or resource group.
-- uid: ext_azure-iot_az_dt_model
-  name: az dt model
-  summary: Manage DTDL models and definitions on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_model_create
-  name: az dt model create
-  summary: Uploads one or more models. When any error occurs, no models are uploaded.
-- uid: ext_azure-iot_az_dt_model_delete
-  name: az dt model delete
-  summary: Delete a model. A model can only be deleted if no other models reference it.
-- uid: ext_azure-iot_az_dt_model_list
-  name: az dt model list
-  summary: List model metadata, definitions and dependencies.
-- uid: ext_azure-iot_az_dt_model_show
-  name: az dt model show
-  summary: Retrieve a target model or model definition.
-- uid: ext_azure-iot_az_dt_model_update
-  name: az dt model update
-  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
-- uid: ext_azure-iot_az_dt_role_assignment
-  name: az dt role-assignment
-  summary: Manage RBAC role assignments for a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_create
-  name: az dt role-assignment create
-  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_delete
-  name: az dt role-assignment delete
-  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_list
-  name: az dt role-assignment list
-  summary: List the existing role assignments of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route
-  name: az dt route
-  summary: Manage and configure event routes.
-- uid: ext_azure-iot_az_dt_route_create
-  name: az dt route create
-  summary: Add an event route to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_delete
-  name: az dt route delete
-  summary: Remove an event route from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_list
-  name: az dt route list
-  summary: List the configured event routes of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_show
-  name: az dt route show
-  summary: Show details of an event route configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_show
-  name: az dt show
-  summary: Show an existing Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin
-  name: az dt twin
-  summary: Manage and configure the digital twins of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_component
-  name: az dt twin component
-  summary: Show and update the digital twin components of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_create
-  name: az dt twin create
-  summary: Create a digital twin on an instance.
-- uid: ext_azure-iot_az_dt_twin_delete
-  name: az dt twin delete
-  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
-- uid: ext_azure-iot_az_dt_twin_query
-  name: az dt twin query
-  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
-- uid: ext_azure-iot_az_dt_twin_relationship
-  name: az dt twin relationship
-  summary: Manage and configure the digital twin relationships of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_show
-  name: az dt twin show
-  summary: Show the details of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_telemetry
-  name: az dt twin telemetry
-  summary: Test and validate the event routes and endpoints of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-- uid: ext_azure-iot_az_dt_twin_update
-  name: az dt twin update
-  summary: Update an instance digital twin via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Digital Twins (ADT) solutions & infrastructure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml
deleted file mode 100644
index 1bb6a2b6ec..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_endpoint
-  name: az dt endpoint
-  summary: Manage and configure Digital Twins instance endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_endpoint_delete
-  - ext_azure-iot_az_dt_endpoint_list
-  - ext_azure-iot_az_dt_endpoint_show
-- uid: ext_azure-iot_az_dt_endpoint_delete
-  name: az dt endpoint delete
-  summary: Remove an endpoint from a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an endpoint from an instance.
-    syntax:
-      content: az dt endpoint delete -n {instance_name} --endpoint-name {endpoint_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_list
-  name: az dt endpoint list
-  summary: List all egress endpoints configured on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all egress endpoints configured on an instance.
-    syntax:
-      content: az dt endpoint list -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_show
-  name: az dt endpoint show
-  summary: Show details of an endpoint configured on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a desired endpoint by name on an instance.
-    syntax:
-      content: az dt endpoint show -n {instance_name} --endpoint-name {endpoint_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_endpoint_create
-  name: az dt endpoint create
-  summary: Add egress endpoints to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_delete
-  name: az dt endpoint delete
-  summary: Remove an endpoint from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_list
-  name: az dt endpoint list
-  summary: List all egress endpoints configured on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_endpoint_show
-  name: az dt endpoint show
-  summary: Show details of an endpoint configured on a Digital Twins instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure Digital Twins instance endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml
deleted file mode 100644
index c9238d47a1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/endpoint/create.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_endpoint_create
-  name: az dt endpoint create
-  summary: Add egress endpoints to a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_endpoint_create_eventgrid
-  - ext_azure-iot_az_dt_endpoint_create_eventhub
-  - ext_azure-iot_az_dt_endpoint_create_servicebus
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds an EventGrid Topic endpoint to a target instance.
-    syntax:
-      content: az dt endpoint create eventgrid --endpoint-name {endpoint_name} --eventgrid-resource-group {eventgrid_resource_group} --eventgrid-topic {eventgrid_topic_name} -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins endpoint tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - isRequired: true
-    name: --egg --eventgrid-resource-group
-    summary: Name of EventGrid Topic resource group.
-    description: ''
-  - isRequired: true
-    name: --egt --eventgrid-topic
-    summary: Name of EventGrid Topic to integrate with.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds an EventHub endpoint to a target instance.
-    syntax:
-      content: az dt endpoint create eventhub --endpoint-name {endpoint_name} --eventhub-resource-group {eventhub_resource_group} --eventhub-namespace {eventhub_namespace} --eventhub {eventhub_name} --eventhub-policy {eventhub_policy} -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins endpoint tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - isRequired: true
-    name: --eh --eventhub
-    summary: Name of EventHub to integrate with.
-    description: ''
-  - isRequired: true
-    name: --ehg --eventhub-resource-group
-    summary: Name of EventHub resource group.
-    description: ''
-  - isRequired: true
-    name: --ehn --eventhub-namespace
-    summary: EventHub Namespace identifier.
-    description: ''
-  - isRequired: true
-    name: --ehp --eventhub-policy
-    summary: EventHub policy to use for endpoint configuration.
-    description: ''
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds a ServiceBus Topic endpoint to a target instance.
-    syntax:
-      content: az dt endpoint create servicebus --endpoint-name {endpoint_name} --servicebus-resource-group {servicebus_resource_group} --servicebus-namespace {servicebus_namespace} --servicebus-topic {servicebus_topic_name} --servicebus-policy {servicebus_policy} -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Digital Twins endpoint tags. Property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - isRequired: true
-    name: --sbg --servicebus-resource-group
-    summary: Name of ServiceBus resource group.
-    description: ''
-  - isRequired: true
-    name: --sbn --servicebus-namespace
-    summary: ServiceBus Namespace identifier.
-    description: ''
-  - isRequired: true
-    name: --sbp --servicebus-policy
-    summary: ServiceBus Topic policy to use for endpoint configuration.
-    description: ''
-  - isRequired: true
-    name: --sbt --servicebus-topic
-    summary: Name of ServiceBus Topic to integrate with.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-  name: az dt endpoint create eventgrid
-  summary: Adds an EventGrid Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-  name: az dt endpoint create eventhub
-  summary: Adds an EventHub endpoint to a Digital Twins instance. Requires pre-created resource.
-- uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-  name: az dt endpoint create servicebus
-  summary: Adds a ServiceBus Topic endpoint to a Digital Twins instance. Requires pre-created resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Add egress endpoints to a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/model.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/model.yml
deleted file mode 100644
index 0b551e9934..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/model.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_model
-  name: az dt model
-  summary: Manage DTDL models and definitions on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_model_create
-  - ext_azure-iot_az_dt_model_delete
-  - ext_azure-iot_az_dt_model_list
-  - ext_azure-iot_az_dt_model_show
-  - ext_azure-iot_az_dt_model_update
-- uid: ext_azure-iot_az_dt_model_create
-  name: az dt model create
-  summary: Uploads one or more models. When any error occurs, no models are uploaded.
-  description: --models can be inline json or file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Bulk upload all .json or .dtdl model files from a target directory. Model processing is recursive.
-    syntax:
-      content: az dt model create -n {instance_name} --from-directory {directory_path}
-  - summary: Upload model json inline or from file path.
-    syntax:
-      content: az dt model create -n {instance_name} --models {file_path_or_inline_json}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --fd --from-directory
-    summary: The directory JSON model files will be parsed from.
-    description: ''
-  - name: --models
-    summary: Inline model JSON or file path to model JSON.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_delete
-  name: az dt model delete
-  summary: Delete a model. A model can only be deleted if no other models reference it.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a target model.
-    syntax:
-      content: az dt model delete -n {instance_name} --dtmi "dtmi:example:Floor;1"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_list
-  name: az dt model list
-  summary: List model metadata, definitions and dependencies.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List model metadata
-    syntax:
-      content: az dt model list -n {instance_name}
-  - summary: List model definitions
-    syntax:
-      content: az dt model list -n {instance_name} --definition
-  - summary: List dependencies of particular pre-existing model(s). Space seperate dtmi values.
-    syntax:
-      content: az dt model list -n {instance_name} --dependencies-for {model_id0} {model_id1}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --def --definition
-    parameterValueGroup: false, true
-    summary: The operation will retrieve the model definition.
-    description: ''
-  - name: --dependencies-for
-    summary: The set of models which will have their dependencies retrieved. If omitted, all models are retrieved. Format is a whitespace separated list.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_show
-  name: az dt model show
-  summary: Retrieve a target model or model definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show model meta data
-    syntax:
-      content: az dt model show -n {instance_name} --dtmi "dtmi:example:Floor;1"
-  - summary: Show model meta data and definition
-    syntax:
-      content: az dt model show -n {instance_name} --dtmi "dtmi:example:Floor;1" --definition
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - name: --def --definition
-    parameterValueGroup: false, true
-    summary: The operation will retrieve the model definition.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_model_update
-  name: az dt model update
-  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Decommision a target model
-    syntax:
-      content: az dt model update -n {instance_name} --dtmi "dtmi:example:Floor;1" --decommission
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - name: --decommission
-    parameterValueGroup: false, true
-    summary: Indicates intent to decommission a target model.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_model_create
-  name: az dt model create
-  summary: Uploads one or more models. When any error occurs, no models are uploaded.
-- uid: ext_azure-iot_az_dt_model_delete
-  name: az dt model delete
-  summary: Delete a model. A model can only be deleted if no other models reference it.
-- uid: ext_azure-iot_az_dt_model_list
-  name: az dt model list
-  summary: List model metadata, definitions and dependencies.
-- uid: ext_azure-iot_az_dt_model_show
-  name: az dt model show
-  summary: Retrieve a target model or model definition.
-- uid: ext_azure-iot_az_dt_model_update
-  name: az dt model update
-  summary: Updates the metadata for a model. Currently a model can only be decommisioned.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage DTDL models and definitions on a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml
deleted file mode 100644
index 0d498011df..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/role-assignment.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_role_assignment
-  name: az dt role-assignment
-  summary: Manage RBAC role assignments for a Digital Twins instance.
-  description: >-
-    Note that in order to perform role assignments, the logged in principal needs permissions
-
-    such as Owner or User Access Administrator at the assigned scope.
-
-
-    This command group is provided for convenience. For more complex role assignment scenarios
-
-    use the 'az role assignment' command group.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_role_assignment_create
-  - ext_azure-iot_az_dt_role_assignment_delete
-  - ext_azure-iot_az_dt_role_assignment_list
-- uid: ext_azure-iot_az_dt_role_assignment_create
-  name: az dt role-assignment create
-  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
-  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
-  langs:
-  - azurecli
-  examples:
-  - summary: Assign a user (by email) the built-in Digital Twins Owner role against a target instance.
-    syntax:
-      content: az dt role-assignment create -n {instance_name} --assignee "owneruser@microsoft.com" --role "Azure Digital Twins Owner (Preview)"
-  - summary: Assign a user (by object Id) the built-in Digital Twins Reader role against a target instance.
-    syntax:
-      content: az dt role-assignment create -n {instance_name} --assignee "97a89267-0966-4054-a156-b7d86ef8e216" --role "Azure Digital Twins Reader (Preview)"
-  - summary: Assign a service principal a custom role against a target instance.
-    syntax:
-      content: az dt role-assignment create -n {instance_name} --assignee {service_principal_name_or_id} --role {role_name_or_id}
-  parameters:
-  - isRequired: true
-    name: --assignee
-    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
-    description: ''
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --role
-    summary: Role name or Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_role_assignment_delete
-  name: az dt role-assignment delete
-  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
-  description: Note that in order to perform role assignments, the logged in principal needs permissions such as Owner or User Access Administrator at the assigned scope.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a user from a specific role assignment of a Digital Twins instance.
-    syntax:
-      content: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com" --role "Azure Digital Twins Reader (Preview)"
-  - summary: Remove a user from all assigned roles of a Digital Twins instance.
-    syntax:
-      content: az dt role-assignment delete -n {instance_name} --assignee "removeuser@microsoft.com"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --assignee
-    summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --role
-    summary: Role name or Id.
-    description: ''
-- uid: ext_azure-iot_az_dt_role_assignment_list
-  name: az dt role-assignment list
-  summary: List the existing role assignments of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the role assignments on a target instance.
-    syntax:
-      content: az dt role-assignment list -n {instance_name}
-  - summary: List the role assignments on a target instance and filter by role.
-    syntax:
-      content: az dt role-assignment list -n {instance_name} --role {role_name_or_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --include-inherited
-    parameterValueGroup: false, true
-    summary: Include assignments applied on parent scopes.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --role
-    summary: Role name or Id.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_role_assignment_create
-  name: az dt role-assignment create
-  summary: Assign a user, group or service principal to a role against a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_delete
-  name: az dt role-assignment delete
-  summary: Remove a user, group or service principal role assignment from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_role_assignment_list
-  name: az dt role-assignment list
-  summary: List the existing role assignments of a Digital Twins instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Note that in order to perform role assignments, the logged in principal needs permissions
-
-  such as Owner or User Access Administrator at the assigned scope.
-
-
-  This command group is provided for convenience. For more complex role assignment scenarios
-
-  use the 'az role assignment' command group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/route.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/route.yml
deleted file mode 100644
index dca55e2d77..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/route.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_route
-  name: az dt route
-  summary: Manage and configure event routes.
-  description: Note that an endpoint must first be configred before adding an event route.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_route_create
-  - ext_azure-iot_az_dt_route_delete
-  - ext_azure-iot_az_dt_route_list
-  - ext_azure-iot_az_dt_route_show
-- uid: ext_azure-iot_az_dt_route_create
-  name: az dt route create
-  summary: Add an event route to a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Adds an event route for an existing endpoint on target instance with default filter of "true".
-    syntax:
-      content: az dt route create -n {instance_name} --endpoint-name {endpoint_name} --route-name {route_name}
-  - summary: Adds an event route for an existing endpoint on target instance with custom filter.
-    syntax:
-      content: az dt route create -n {instance_name} --endpoint-name {endpoint_name} --route-name {route_name} --filter "type = 'Microsoft.DigitalTwins.Twin.Create'"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --en --endpoint-name
-    summary: Endpoint name.
-    description: ''
-  - isRequired: true
-    name: --rn --route-name
-    summary: Event route name.
-    description: ''
-  - name: --filter
-    defaultValue: "true"
-    summary: Event route filter.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_route_delete
-  name: az dt route delete
-  summary: Remove an event route from a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an event route from a target instance.
-    syntax:
-      content: az dt route delete -n {instance_name} --route-name {route_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --rn --route-name
-    summary: Event route name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_route_list
-  name: az dt route list
-  summary: List the configured event routes of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List configured event routes of a target instance.
-    syntax:
-      content: az dt route list -n {instance_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_route_show
-  name: az dt route show
-  summary: Show details of an event route configured on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an event route on a target instance.
-    syntax:
-      content: az dt route show -n {instance_name} --route-name {route_name}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --rn --route-name
-    summary: Event route name.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_route_create
-  name: az dt route create
-  summary: Add an event route to a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_delete
-  name: az dt route delete
-  summary: Remove an event route from a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_list
-  name: az dt route list
-  summary: List the configured event routes of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_route_show
-  name: az dt route show
-  summary: Show details of an event route configured on a Digital Twins instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Note that an endpoint must first be configred before adding an event route.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin.yml
deleted file mode 100644
index 8d4aeb6595..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin
-  name: az dt twin
-  summary: Manage and configure the digital twins of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_create
-  - ext_azure-iot_az_dt_twin_delete
-  - ext_azure-iot_az_dt_twin_query
-  - ext_azure-iot_az_dt_twin_show
-  - ext_azure-iot_az_dt_twin_update
-- uid: ext_azure-iot_az_dt_twin_create
-  name: az dt twin create
-  summary: Create a digital twin on an instance.
-  description: --properties can be inline JSON or file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a digital twin from an existing (prior-created) model.
-    syntax:
-      content: az dt twin create -n {instance_name} --dtmi urn:azureiot:DeviceManagement:DeviceInformation:1 --twin-id {twin_id}
-  - summary: Create a digital twin from an existing (prior-created) model. Instantiate with property values.
-    syntax:
-      content: "az dt twin create -n {instance_name} --dtmi urn:azureiot:DeviceManagement:DeviceInformation:1 --twin-id {twin_id} --properties '{\"manufacturer\": \"Microsoft\"}'"
-  - summary: Create a digital twin with component from existing (prior-created) models. Instantiate with property values.
-    syntax:
-      content: >-
-        az dt twin create -n {instance_name} --dtmi dtmi:example:Room;1 --twin-id {twin_id} --properties '{
-            "Temperature": 10.2,
-            "Thermostat": {
-                "$metadata": {},
-                "setPointTemp": 23.12
-            }
-        }'
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --dtmi --model-id -m
-    summary: 'Digital Twins model Id. Example: dtmi:example:Room;2.'
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --properties -p
-    summary: Initial property values for instantiating a digital twin or related components. Provide file path or inline JSON.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_delete
-  name: az dt twin delete
-  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a digital twin by Id.
-    syntax:
-      content: az dt twin delete -n {instance_name} --twin-id {twin_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_query
-  name: az dt twin query
-  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Query all digital twins in target instance and project all attributes. Also show cost in query units.
-    syntax:
-      content: az dt twin query -n {instance_name} -q "select * from digitaltwins" --show-cost
-  - summary: Query by model and project all attributes.
-    syntax:
-      content: az dt twin query -n {instance_name} -q "select * from digitaltwins T where IS_OF_MODEL(T, 'dtmi:example:Room;2')"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --query-command -q
-    summary: User query to be executed.
-    description: ''
-  - name: --cost --show-cost
-    parameterValueGroup: false, true
-    summary: Calculates and shows the query charge.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_show
-  name: az dt twin show
-  summary: Show the details of a digital twin.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a digital twin.
-    syntax:
-      content: az dt twin show -n {instance_name} --twin-id {twin_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_update
-  name: az dt twin update
-  summary: Update an instance digital twin via JSON patch specification.
-  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a digital twin via JSON patch specification.
-    syntax:
-      content: "az dt twin update -n {instance_name} --twin-id {twin_id} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
-  - summary: Update a digital twin via JSON patch specification.
-    syntax:
-      content: >-
-        az dt twin update -n {instance_name} --twin-id {twin_id} --json-patch '[
-          {"op":"replace", "path":"/Temperature", "value": 20.5},
-          {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
-        ]'
-  - summary: Update a digital twin via JSON patch specification defined in a file.
-    syntax:
-      content: az dt twin update -n {instance_name} --twin-id {twin_id} --json-patch ./my/patch/document.json
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --json-patch --patch
-    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_component
-  name: az dt twin component
-  summary: Show and update the digital twin components of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_create
-  name: az dt twin create
-  summary: Create a digital twin on an instance.
-- uid: ext_azure-iot_az_dt_twin_delete
-  name: az dt twin delete
-  summary: Remove a digital twin. All relationships referencing this twin must already be deleted.
-- uid: ext_azure-iot_az_dt_twin_query
-  name: az dt twin query
-  summary: Query the digital twins of an instance. Allows traversing relationships and filtering by property values.
-- uid: ext_azure-iot_az_dt_twin_relationship
-  name: az dt twin relationship
-  summary: Manage and configure the digital twin relationships of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-- uid: ext_azure-iot_az_dt_twin_show
-  name: az dt twin show
-  summary: Show the details of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_telemetry
-  name: az dt twin telemetry
-  summary: Test and validate the event routes and endpoints of a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-- uid: ext_azure-iot_az_dt_twin_update
-  name: az dt twin update
-  summary: Update an instance digital twin via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure the digital twins of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml
deleted file mode 100644
index 7e94a1de32..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/component.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin_component
-  name: az dt twin component
-  summary: Show and update the digital twin components of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_component_show
-  - ext_azure-iot_az_dt_twin_component_update
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a digital twin component
-    syntax:
-      content: az dt twin component show -n {instance_name} --twin-id {twin_id} --component Thermostat
-  parameters:
-  - isRequired: true
-    name: --component
-    summary: The path to the DTDL component.
-    description: ''
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-  description: Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove.
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a digital twin component via JSON patch specification.
-    syntax:
-      content: "az dt twin component update -n {instance_name} --twin-id {twin_id} --component {component_path} --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
-  - summary: Update a digital twin component via JSON patch specification.
-    syntax:
-      content: >-
-        az dt twin component update -n {instance_name} --twin-id {twin_id} --component {component_path} --json-patch '[
-          {"op":"replace", "path":"/Temperature", "value": 20.5},
-          {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
-        ]'
-  - summary: Update a digital twin component via JSON patch specification defined in a file.
-    syntax:
-      content: az dt twin component update -n {instance_name} --twin-id {twin_id} --component {component_path} --json-patch ./my/patch/document.json
-  parameters:
-  - isRequired: true
-    name: --component
-    summary: The path to the DTDL component.
-    description: ''
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --json-patch --patch
-    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_component_show
-  name: az dt twin component show
-  summary: Show details of a digital twin component.
-- uid: ext_azure-iot_az_dt_twin_component_update
-  name: az dt twin component update
-  summary: Update a digital twin component via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Show and update the digital twin components of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml
deleted file mode 100644
index 6cfb8487b8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/relationship.yml
+++ /dev/null
@@ -1,216 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin_relationship
-  name: az dt twin relationship
-  summary: Manage and configure the digital twin relationships of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_relationship_create
-  - ext_azure-iot_az_dt_twin_relationship_delete
-  - ext_azure-iot_az_dt_twin_relationship_list
-  - ext_azure-iot_az_dt_twin_relationship_show
-  - ext_azure-iot_az_dt_twin_relationship_update
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-  description: --properties can be inline JSON or file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a relationship between two digital twins.
-    syntax:
-      content: az dt twin relationship create -n {instance_name} --relationship-id {relationship_id} --relationship contains --source {source_twin_id} --target {target_twin_id}
-  - summary: Create a relationship with initialized properties between two digital twins.
-    syntax:
-      content: "az dt twin relationship create -n {instance_name} --relationship-id {relationship_id} --relationship contains --source {source_twin_id} --target {target_twin_id} --properties '{\"ownershipUser\": \"me\", \"ownershipDepartment\": \"Computer Science\"}'"
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --kind --relationship
-    summary: "Relationship name or kind. For example: 'contains'."
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --source --source-twin-id -s
-    summary: The source twin Id for a relationship.
-    description: ''
-  - isRequired: true
-    name: --target --target-twin-id -t
-    summary: The target twin Id for a relationship.
-    description: ''
-  - name: --properties -p
-    summary: Initial property values for instantiating a digital twin relationship. Provide file path or inline JSON.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a digital twin relationship.
-    syntax:
-      content: az dt twin relationship delete -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List outgoing relationships of a digital twin.
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id}
-  - summary: List outgoing relationships of a digital twin and filter on relationship 'contains'
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id} --relationship contains
-  - summary: List incoming relationships of a digital twin.
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id} --incoming
-  - summary: List incoming relationships of a digital twin and filter on relationship 'contains'.
-    syntax:
-      content: az dt twin relationship list -n {instance_name} --twin-id {twin_id} --relationship contains --incoming
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --incoming
-    parameterValueGroup: false, true
-    summary: Retrieves all incoming relationships for a digital twin.
-    description: ''
-  - name: --kind --relationship
-    summary: Filter result by the kind of relationship.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a digital twin relationship.
-    syntax:
-      content: az dt twin relationship show -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-  description: Operations are limited to add, replace and remove.
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a digital twin relationship via JSON patch specification.
-    syntax:
-      content: "az dt twin relationship update -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '{\"op\":\"replace\", \"path\":\"/Temperature\", \"value\": 20.5}'"
-  - summary: Update a digital twin relationship via JSON patch specification.
-    syntax:
-      content: >-
-        az dt twin relationship update -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch '[
-          {"op":"replace", "path":"/Temperature", "value": 20.5},
-          {"op":"add", "path":"/Areas", "value": ["ControlSystem"]}
-        ]'
-  - summary: Update a digital twin relationship via JSON patch specification defined in a file.
-    syntax:
-      content: az dt twin relationship update -n {instance_name} --twin-id {twin_id} --relationship-id {relationship_id} --relationship contains --json-patch ./my/patch/document.json
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --json-patch --patch
-    summary: An update specification described by JSON-patch. Updates to property values and $model elements may happen in the same request. Operations are limited to add, replace and remove. Provide file path or inline JSON.
-    description: ''
-  - isRequired: true
-    name: --relationship-id -r
-    summary: Relationship Id.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_relationship_create
-  name: az dt twin relationship create
-  summary: Create a relationship between source and target digital twins.
-- uid: ext_azure-iot_az_dt_twin_relationship_delete
-  name: az dt twin relationship delete
-  summary: Delete a digital twin relationship on a Digital Twins instance.
-- uid: ext_azure-iot_az_dt_twin_relationship_list
-  name: az dt twin relationship list
-  summary: List the relationships of a digital twin.
-- uid: ext_azure-iot_az_dt_twin_relationship_show
-  name: az dt twin relationship show
-  summary: Show details of a digital twin relationship.
-- uid: ext_azure-iot_az_dt_twin_relationship_update
-  name: az dt twin relationship update
-  summary: Updates the properties of a relationship between two digital twins via JSON patch specification.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure the digital twin relationships of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml
deleted file mode 100644
index 804db2be68..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/dt/twin/telemetry.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_dt_twin_telemetry
-  name: az dt twin telemetry
-  summary: Test and validate the event routes and endpoints of a Digital Twins instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_dt_twin_telemetry_send
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Send twin telemetry
-    syntax:
-      content: az dt twin telemetry send -n {instance_name} --twin-id {twin_id}
-  parameters:
-  - isRequired: true
-    name: --dt-name --dtn -n
-    summary: Digital Twins instance name.
-    description: ''
-  - isRequired: true
-    name: --twin-id -t
-    summary: The digital twin Id.
-    description: ''
-  - name: --component
-    summary: The path to the DTDL component. If set, telemetry will be emitted on behalf of the component.
-    description: ''
-  - name: --dt-id
-    summary: A unique message identifier (in the scope of the digital twin id) that is commonly used for de-duplicating messages. If no value is provided a GUID is automatically generated.
-    description: ''
-  - name: --resource-group -g
-    summary: Digital Twins instance resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --telemetry
-    summary: 'Inline telemetry JSON or file path to telemetry JSON. Default payload is an empty object: {}.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_dt_twin_telemetry_send
-  name: az dt twin telemetry send
-  summary: Sends telemetry on behalf of a digital twin. If component path is provided the emitted telemetry is on behalf of the component.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Test and validate the event routes and endpoints of a Digital Twins instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/index.yml
deleted file mode 100644
index a097e32caf..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/index.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az
-  name: azure-iot
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_dt
-  name: az dt
-  summary: Manage Azure Digital Twins (ADT) solutions & infrastructure.
-- uid: ext_azure-iot_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-- uid: ext_azure-iot_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot.yml
deleted file mode 100644
index a6509dcbcb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot.yml
+++ /dev/null
@@ -1,463 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot
-  name: az iot
-  summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
-  description: >-
-    Review the extension wiki tips to maximize usage
-
-    <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_central
-  name: az iot central
-  summary: Manage Azure Central (IoT Central) solutions & infrastructure.
-- uid: ext_azure-iot_az_iot_central_app
-  name: az iot central app
-  summary: >-
-    Manage Azure IoT Central applications.
-
-
-    To use this command group, the user must be logged through the `az login` command,
-
-    have the correct tenant set (the users home tenant) and
-
-    have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-- uid: ext_azure-iot_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-iot_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-iot_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-- uid: ext_azure-iot_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-- uid: ext_azure-iot_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-iot_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-iot_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-iot_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-- uid: ext_azure-iot_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-- uid: ext_azure-iot_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-- uid: ext_azure-iot_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-iot_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-iot_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-iot_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-iot_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-iot_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-iot_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-- uid: ext_azure-iot_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Review the extension wiki tips to maximize usage
-
-  <a href="https://github.com/Azure/azure-iot-cli-extension/wiki/Tips">https://github.com/Azure/azure-iot-cli-extension/wiki/Tips</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central.yml
deleted file mode 100644
index 17c6190890..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central
-  name: az iot central
-  summary: Manage Azure Central (IoT Central) solutions & infrastructure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_central_app
-  name: az iot central app
-  summary: >-
-    Manage Azure IoT Central applications.
-
-
-    To use this command group, the user must be logged through the `az login` command,
-
-    have the correct tenant set (the users home tenant) and
-
-    have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Central (IoT Central) solutions & infrastructure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app.yml
deleted file mode 100644
index e6fb5009d5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app.yml
+++ /dev/null
@@ -1,246 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app
-  name: az iot central app
-  summary: >-
-    Manage Azure IoT Central applications.
-
-
-    To use this command group, the user must be logged through the `az login` command,
-
-    have the correct tenant set (the users home tenant) and
-
-    have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_monitor_events
-  - ext_azure-iot_az_iot_central_app_validate_messages
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot central app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id}
-  - summary: Output errors as they are detected
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} --style scroll
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot central app validate-messages --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --dr --duration
-    defaultValue: "300"
-    summary: Maximum duration to receive messages from target device before terminating connection.Use 0 for infinity.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --max-messages --mm
-    defaultValue: "10"
-    summary: Maximum number of messages to recieve from target device before terminating connection.Use 0 for infinity.
-    description: ''
-  - name: --minimum-severity
-    defaultValue: warning
-    parameterValueGroup: error, info, warning
-    summary: Minimum severity of issue required for reporting.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --style
-    defaultValue: scroll
-    parameterValueGroup: csv, json, scroll
-    summary: Indicate output stylescroll = deliver errors as they arrive, json = summarize results as json, csv = summarize results as json.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-- uid: ext_azure-iot_az_iot_central_app_monitor_events
-  name: az iot central app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iot_central_app_validate_messages
-  name: az iot central app validate-messages
-  summary: Validate messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Manage Azure IoT Central applications.
-
-
-  To use this command group, the user must be logged through the `az login` command,
-
-  have the correct tenant set (the users home tenant) and
-
-  have access to the application through <a href="http://apps.azureiotcentral.com">http://apps.azureiotcentral.com</a>".
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device-template.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device-template.yml
deleted file mode 100644
index b659532191..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device-template.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app_device_template
-  name: az iot central app device-template
-  summary: Manage and configure IoT Central device templates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_device_template_create
-  - ext_azure-iot_az_iot_central_app_device_template_delete
-  - ext_azure-iot_az_iot_central_app_device_template_list
-  - ext_azure-iot_az_iot_central_app_device_template_map
-  - ext_azure-iot_az_iot_central_app_device_template_show
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device template with payload read from a file
-    syntax:
-      content: az iot central app device-template create --app-id {appid} --content {pathtofile} --device-template-id {devicetemplateid}
-  - summary: Create a device template with payload read from raw json
-    syntax:
-      content: az iot central app device-template create --app-id {appid} --content {json} --device-template-id {devicetemplateid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: "Configuration for request. Provide path to JSON file or raw stringified JSON. [File Path Example: ./path/to/file.json] [Stringified JSON Example: {'a': 'b'}]."
-    description: ''
-  - isRequired: true
-    name: --device-template-id
-    summary: 'Device template id. Example: somedevicetemplate.'
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-  description: 'Note: this is expected to fail if any devices are still associated to this template.'
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a device template from IoT Central
-    syntax:
-      content: az iot central app device-template delete --app-id {appid} --device-template-id {devicetemplateid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-template-id
-    summary: 'Device template id. Example: somedevicetemplate.'
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all device templates
-    syntax:
-      content: az iot central app device-template list --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get device template name to id mapping
-    syntax:
-      content: az iot central app device-template map --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a device template
-    syntax:
-      content: az iot central app device-template show --app-id {appid} --device-template-id {devicetemplateid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-template-id
-    summary: 'Device template id. Example: somedevicetemplate.'
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device_template_create
-  name: az iot central app device-template create
-  summary: Create a device template in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_delete
-  name: az iot central app device-template delete
-  summary: Delete a device template from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_list
-  name: az iot central app device-template list
-  summary: List all device templates in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_template_map
-  name: az iot central app device-template map
-  summary: Returns a mapping of device template name to device template id.
-- uid: ext_azure-iot_az_iot_central_app_device_template_show
-  name: az iot central app device-template show
-  summary: Get a device template from IoT Central.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure IoT Central device templates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device-twin.yml
deleted file mode 100644
index 0f57659967..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app_device_twin
-  name: az iot central app device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_device_twin_show
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device_twin_show
-  name: az iot central app device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device.yml
deleted file mode 100644
index 9840498e70..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/app/device.yml
+++ /dev/null
@@ -1,217 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_app_device
-  name: az iot central app device
-  summary: Manage and configure IoT Central devices.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_app_device_create
-  - ext_azure-iot_az_iot_central_app_device_delete
-  - ext_azure-iot_az_iot_central_app_device_list
-  - ext_azure-iot_az_iot_central_app_device_registration_info
-  - ext_azure-iot_az_iot_central_app_device_registration_summary
-  - ext_azure-iot_az_iot_central_app_device_show
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device
-    syntax:
-      content: az iot central app device create --app-id {appid} --device-id {deviceid}
-  - summary: Create a simulated device
-    syntax:
-      content: az iot central app device create --app-id {appid} --device-id {deviceid} --instance-of {devicetemplateid} --simulated
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --device-name
-    summary: 'Human readable device name. Example: Fridge.'
-    description: ''
-  - name: --instance-of
-    summary: 'Central template id. Example: <a href="urn:ojpkindbz:modelDefinition:iild3tm_uo">urn:ojpkindbz:modelDefinition:iild3tm_uo</a>.'
-    description: ''
-  - name: --simulated
-    parameterValueGroup: false, true
-    summary: Add this flag if you would like IoT Central to set this up as a simulated device. --instance-of is required if this is true.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a device
-    syntax:
-      content: az iot central app device delete --app-id {appid} --device-id {deviceid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all devices in IoT Central
-    syntax:
-      content: az iot central app device list --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-  description: >-
-    Note: This command can take a significant amount of time to return
-
-    if no device id is specified and your app contains a lot of devices.
-  langs:
-  - azurecli
-  examples:
-  - summary: Get registration info on specified device
-    syntax:
-      content: az iot central app device registration-info --app-id {appid} --device-id {deviceid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-  description: >-
-    Note: This command can take a significant amount of time to return
-
-    if your app contains a lot of devices.
-  langs:
-  - azurecli
-  examples:
-  - summary: Registration summary
-    syntax:
-      content: az iot central app device registration-summary --app-id {appid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a device
-    syntax:
-      content: az iot central app device show --app-id {appid} --device-id {deviceid}
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --token
-    summary: "Authorization token for request. More info available here: <a href=\"https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/\">https://docs.microsoft.com/en-us/learn/modules/manage-iot-central-apps-with-rest-api/</a> MUST INCLUDE type (e.g. 'SharedAccessToken ...', 'Bearer ...'). Example: 'Bearer someBearerTokenHere'."
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_app_device_create
-  name: az iot central app device create
-  summary: Create a device in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_delete
-  name: az iot central app device delete
-  summary: Delete a device from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_list
-  name: az iot central app device list
-  summary: List all devices in IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_info
-  name: az iot central app device registration-info
-  summary: Get registration info on device(s) from IoT Central.
-- uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-  name: az iot central app device registration-summary
-  summary: Provides a registration summary of all the devices in an app.
-- uid: ext_azure-iot_az_iot_central_app_device_show
-  name: az iot central app device show
-  summary: Get a device from IoT Central.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and configure IoT Central devices.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device-twin.yml
deleted file mode 100644
index 2d9e7f9ca6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/central/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_central_device_twin
-  name: az iot central device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_central_device_twin_show
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_central_device_twin_show
-  name: az iot central device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device.yml
deleted file mode 100644
index 323285d06b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_device
-  name: az iot device
-  summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_device_send_d2c_message
-  - ext_azure-iot_az_iot_device_simulate
-  - ext_azure-iot_az_iot_device_upload_file
-- uid: ext_azure-iot_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id}
-  - summary: Basic usage with custom data
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --data {message_body}
-  - summary: Send application properties
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props 'key0=value0;key1=value1'
-  - summary: Send system properties (Message Id and Correlation Id)
-    syntax:
-      content: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props '$.mid=<id>;$.cid=<id>'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "1"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.'
-    description: ''
-  - name: --qos
-    defaultValue: "1"
-    parameterValueGroup: 0, 1
-    summary: Quality of Service. 0 = At most once, 1 = At least once. 2 (Exactly once) is not supported.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage (mqtt)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id}
-  - summary: Basic usage (mqtt) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --properties "myprop=myvalue;$.ct=application/json"
-  - summary: Basic usage (http)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http
-  - summary: Basic usage (http) with sending mixed properties
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --protocol http --properties "iothub-app-myprop=myvalue;content-type=application/json;iothub-correlationid=12345"
-  - summary: Choose total message count and interval between messages
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --msg-count 1000 --msg-interval 5
-  - summary: Reject c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs reject --protocol http
-  - summary: Abandon c2d messages (http only)
-    syntax:
-      content: az iot device simulate -n {iothub_name} -d {device_id} --rs abandon --protocol http
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mc --msg-count
-    defaultValue: "100"
-    summary: Number of device messages to send to IoT Hub.
-    description: ''
-  - name: --mi --msg-interval
-    defaultValue: "3"
-    summary: Delay in seconds between device-to-cloud messages.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.  For http messaging - application properties are sent using iothub-app-<name>=value, for instance iothub-app-myprop=myvalue. System properties are generally prefixed with iothub-<name> like iothub-correlationid but there are exceptions such as content-type and content-encoding.'
-    description: ''
-  - name: --proto --protocol
-    defaultValue: mqtt
-    parameterValueGroup: http, mqtt
-    summary: Indicates device-to-cloud message protocol.
-    description: ''
-  - name: --receive-settle --rs
-    defaultValue: complete
-    parameterValueGroup: abandon, complete, reject
-    summary: Indicates how to settle received cloud-to-device messages. Supported with HTTP only.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --content-type --ct
-    summary: MIME Type of file.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --file-path --fp
-    summary: Path to file for upload.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_send_d2c_message
-  name: az iot device send-d2c-message
-  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
-- uid: ext_azure-iot_az_iot_device_simulate
-  name: az iot device simulate
-  summary: >-
-    Simulate a device in an Azure IoT Hub.
-
-
-    While the device simulation is running, the device will automatically receive
-
-    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
-
-    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
-
-    selection which can be complete, reject or abandon.
-
-
-    Note: The command by default will set content-type to application/json and content-encoding
-
-    to utf-8. This can be overriden.
-- uid: ext_azure-iot_az_iot_device_upload_file
-  name: az iot device upload-file
-  summary: Upload a local file as a device to a pre-configured blob storage container.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Leverage device-to-cloud and cloud-to-device messaging capabilities.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml
deleted file mode 100644
index 1d3a0d9e97..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/device/c2d-message.yml
+++ /dev/null
@@ -1,219 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_device_c2d_message
-  name: az iot device c2d-message
-  summary: Cloud-to-device messaging commands.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_device_c2d_message_abandon
-  - ext_azure-iot_az_iot_device_c2d_message_complete
-  - ext_azure-iot_az_iot_device_c2d_message_receive
-  - ext_azure-iot_az_iot_device_c2d_message_reject
-  - ext_azure-iot_az_iot_device_c2d_message_send
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lock-timeout --lt
-    defaultValue: "60"
-    summary: Specifies the amount of time a message will be invisible to other receive calls.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage with default message body
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name}
-  - summary: Send cloud-to-device message with custom data and properties.
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --data 'Hello World' --props 'key0=value0;key1=value1'
-  - summary: Send a C2D message and wait for device acknowledgement
-    syntax:
-      content: az iot device c2d-message send -d {device_id} -n {iothub_name} --ack full --wait
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --ack
-    parameterValueGroup: full, negative, positive
-    summary: 'Request the delivery of per-message feedback regarding the final state of that message. The description of ack values is as follows. Positive: If the c2d message reaches the Completed state, IoT Hub generates a feedback message. Negative: If the c2d message reaches the Dead lettered state, IoT Hub generates a feedback message. Full: IoT Hub generates a feedback message in either case. By default, no ack is requested.'
-    description: ''
-  - name: --ce --content-encoding
-    defaultValue: utf-8
-    summary: The content encoding associated with the C2D message.
-    description: ''
-  - name: --cid --correlation-id
-    summary: The correlation Id associated with the C2D message.
-    description: ''
-  - name: --content-type --ct
-    summary: The content type associated with the C2D message.
-    description: ''
-  - name: --da --data
-    defaultValue: Ping from Az CLI IoT Extension
-    summary: Message body.
-    description: ''
-  - name: --expiry --expiry-time-utc
-    summary: Units are milliseconds since unix epoch. If no time is indicated the default IoT Hub C2D message TTL is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --message-id --mid
-    summary: The C2D message Id. If no message Id is provided a UUID will be generated.
-    description: ''
-  - name: --properties --props -p
-    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d.'
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --uid --user-id
-    summary: The C2D message, user Id property.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: If set the c2d send operation will block until device feedback has been received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-  name: az iot device c2d-message abandon
-  summary: Abandon a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_complete
-  name: az iot device c2d-message complete
-  summary: Complete a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_receive
-  name: az iot device c2d-message receive
-  summary: Receive a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_reject
-  name: az iot device c2d-message reject
-  summary: Reject or deadletter a cloud-to-device message.
-- uid: ext_azure-iot_az_iot_device_c2d_message_send
-  name: az iot device c2d-message send
-  summary: Send a cloud-to-device message.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Cloud-to-device messaging commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps.yml
deleted file mode 100644
index deafe7708a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps
-  name: az iot dps
-  summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml
deleted file mode 100644
index f397f6cc05..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment-group.yml
+++ /dev/null
@@ -1,269 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps_enrollment_group
-  name: az iot dps enrollment-group
-  summary: Manage Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dps_enrollment_group_create
-  - ext_azure-iot_az_iot_dps_enrollment_group_delete
-  - ext_azure-iot_az_iot_dps_enrollment_group_list
-  - ext_azure-iot_az_iot_dps_enrollment_group_show
-  - ext_azure-iot_az_iot_dps_enrollment_group_update
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using a CA certificate {certificate_name} as secondary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name}
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service 'MyDps' in the resource group '{resource_group_name}' with provisioning status 'enabled', target IoT Hub '{iothub_host_name}' and initial twin tags '{"location":{"region":"US"}} using an intermediate certificate as primary certificate'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem --provisioning-status enabled --iot-hub-host-name {iothub_host_name} --initial-twin-tags "{'location':{'region':'US'}}"
-  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} with attestation type 'symmetrickey'.
-    syntax:
-      content: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {primary_key} --secondary-key {secondary_key}
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new initial twin tags.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-tags "{'location':{'region':'US2'}}" --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary intermediate certificate and remove existing secondary intermediate certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --remove-secondary-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new secondary CA certificate '{certificate_name}' and remove existing primary CA certificate.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name} --remove-certificate --etag AAAAAAAAAAA=
-  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary key.
-    syntax:
-      content: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --ca-name --cn --root-ca-name
-    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scn --secondary-ca-name --secondary-root-ca-name
-    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-  name: az iot dps enrollment-group create
-  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-  name: az iot dps enrollment-group delete
-  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-  name: az iot dps enrollment-group list
-  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-  name: az iot dps enrollment-group show
-  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-  name: az iot dps enrollment-group update
-  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml
deleted file mode 100644
index 045c13bad4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/enrollment.yml
+++ /dev/null
@@ -1,286 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps_enrollment
-  name: az iot dps enrollment
-  summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dps_enrollment_create
-  - ext_azure-iot_az_iot_dps_enrollment_delete
-  - ext_azure-iot_az_iot_dps_enrollment_list
-  - ext_azure-iot_az_iot_dps_enrollment_show
-  - ext_azure-iot_az_iot_dps_enrollment_update
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}'
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem
-  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with provisioning status 'disabled', target IoT Hub '{iothub_host_name}', device id '{device_id}' and initial twin properties '{"location":{"region":"US"}}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem --provisioning-status disabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --device-id {device_id}
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'tpm' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with attestation type 'symmetrickey' in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --primary-key {primary_key} --secondary-key {secondary_key}
-  - summary: Create an enrollment 'MyEnrollment' with reprovision in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --reprovision-policy {reprovision_type} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
-  - summary: Create an enrollment 'MyEnrollment' with static allocation policy in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy static --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs {iot_hub_host_name}
-  - summary: Create an enrollment 'MyEnrollment' with hashed allocation policy and multiple hubs in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy hashed --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2}"
-  parameters:
-  - isRequired: true
-    name: --at --attestation-type
-    parameterValueGroup: symmetricKey, tpm, x509
-    summary: Attestation Mechanism.
-    description: ''
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device. When choosing tpm as attestation type, endorsement key is required.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate. When choosing x509 as attestation type, one of the certificate path is required.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update enrollment '{enrollment_id}' with a new x509 certificate in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new endorsement key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new primary key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new reprovision type in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --reprovision-policy {reprovision_type} --etag AAAAAAAAAAA=
-  - summary: Update enrollment '{enrollment_id}' with a new allocation policy in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
-    syntax:
-      content: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy geolatency --etag AAAAAAAAAAA= --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2} {iot_hub_host_name3}"
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of device enrollment record.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allocation-policy --ap
-    parameterValueGroup: geolatency, hashed, static
-    summary: Type of allocation for device assigned to the Hub.
-    description: ''
-  - name: --certificate-path --cp
-    summary: The path to the file containing the primary certificate.
-    description: ''
-  - name: --device-id -d
-    summary: IoT Hub Device ID.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --ek --endorsement-key
-    summary: TPM endorsement key for a TPM device.
-    description: ''
-  - name: --etag -e
-    summary: Entity tag value.
-    description: ''
-  - name: --hn --iot-hub-host-name
-    summary: Host name of target IoT Hub.
-    description: ''
-  - name: --ih --iot-hubs
-    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
-    description: ''
-  - name: --initial-twin-properties --props
-    summary: Initial twin properties.
-    description: ''
-  - name: --initial-twin-tags --tags
-    summary: Initial twin tags.
-    description: ''
-  - name: --pk --primary-key
-    summary: The primary symmetric shared access key stored in base64 format.
-    description: ''
-  - name: --provisioning-status --ps
-    parameterValueGroup: disabled, enabled
-    summary: Enable or disable enrollment entry.
-    description: ''
-  - name: --rc --remove-certificate
-    parameterValueGroup: false, true
-    summary: Remove current primary certificate.
-    description: ''
-  - name: --remove-secondary-certificate --rsc
-    parameterValueGroup: false, true
-    summary: Remove current secondary certificate.
-    description: ''
-  - name: --reprovision-policy --rp
-    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
-    summary: Device data to be handled on re-provision to different Iot Hub.
-    description: ''
-  - name: --scp --secondary-certificate-path
-    summary: The path to the file containing the secondary certificate.
-    description: ''
-  - name: --secondary-key --sk
-    summary: The secondary symmetric shared access key stored in base64 format.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dps_enrollment_create
-  name: az iot dps enrollment create
-  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_delete
-  name: az iot dps enrollment delete
-  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_list
-  name: az iot dps enrollment list
-  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_show
-  name: az iot dps enrollment show
-  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_enrollment_update
-  name: az iot dps enrollment update
-  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml
deleted file mode 100644
index 8d4b135177..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dps/registration.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dps_registration
-  name: az iot dps registration
-  summary: Manage Azure IoT Hub Device Provisioning Service registrations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dps_registration_delete
-  - ext_azure-iot_az_iot_dps_registration_list
-  - ext_azure-iot_az_iot_dps_registration_show
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --enrollment-id
-    summary: ID of enrollment group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --dps-name
-    summary: Name of the Azure IoT Hub device provisioning service.
-    description: ''
-  - isRequired: true
-    name: --registration-id
-    summary: ID of device registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dps_registration_delete
-  name: az iot dps registration delete
-  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
-- uid: ext_azure-iot_az_iot_dps_registration_list
-  name: az iot dps registration list
-  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
-- uid: ext_azure-iot_az_iot_dps_registration_show
-  name: az iot dps registration show
-  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure IoT Hub Device Provisioning Service registrations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dt.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dt.yml
deleted file mode 100644
index ab8fb1138f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/dt.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_dt
-  name: az iot dt
-  summary: Manage digital twin of an IoT Plug and Play device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_dt_invoke_command
-  - ext_azure-iot_az_iot_dt_list_commands
-  - ext_azure-iot_az_iot_dt_list_interfaces
-  - ext_azure-iot_az_iot_dt_list_properties
-  - ext_azure-iot_az_iot_dt_monitor_events
-  - ext_azure-iot_az_iot_dt_update_property
-- uid: ext_azure-iot_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a command on device .
-    syntax:
-      content: az iot dt invoke-command --login {iothub_cs} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  - summary: Execute a command on device within current session.
-    syntax:
-      content: az iot dt invoke-command --hub-name {iothub_name} --interface {plug_and_play_interface} --device-id {device_id} --command-name {command_name} --command-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --cn --command-name
-    summary: IoT Plug and Play interface command name.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --command-payload --cp --cv
-    summary: IoT Plug and Play interface command payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "10"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all commands of all private interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id}
-  - summary: List all commands of a private interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source private --device-id {device_id} --repo-id {plug_and_play_model_repository_id} --interface {plug_and_play_interface}
-  - summary: List all commands of all public interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source public --device-id {device_id}
-  - summary: List all commands of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-commands --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all IoT Plug and Play interfaces on a device.
-    syntax:
-      content: az iot dt list-interfaces --login {iothub_cs} --device-id {device_id}
-  - summary: List all IoT Plug and Play interfaces on a device within current session.
-    syntax:
-      content: az iot dt list-interfaces --hub-name {iothub_name} --device-id {device_id}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all properties of all device's interfaces on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id}
-  - summary: List all properties of all public interfaces on an IoT Plug and Play device within current session.
-    syntax:
-      content: az iot dt list-properties --hub-name {iothub_name} --device-id {device_id} --source public
-  - summary: List all properties of device's interface on an IoT Plug and Play device.
-    syntax:
-      content: az iot dt list-properties --login {iothub_cs} --source device --device-id {device_id} --interface {plug_and_play_interface}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    parameterValueGroup: device, private, public
-    summary: Choose your option to get model definition from specified source.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --repo-login --rl
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid PnP endpoint and repository name if repository is private. If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --schema
-    summary: Show interface with entity schema.
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-  description: You can leverage az login and provide --hub-name instead of --login for every command.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage monitoring events of all devices and all interfaces using the logged in session.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name}
-  - summary: Basic usage monitoring events of all devices and all interfaces using an IotHub connection string.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs}
-  - summary: Basic usage when filtering on specific interface events while targeting devices with a wildcard in the ID.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -d Device* -i {plug_and_play_interface}
-  - summary: Filter Digital Twin events of a subset of devices using IoT Hub query language.
-    syntax:
-      content: az iot dt monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter events on a device with a particular interface. Use a custom consumer group when binding and see all message properties.
-    syntax:
-      content: az iot dt monitor-events --login {iothub_cs} --device-id {device_id} --interface {plug_and_play_interface} --consumer-group {consumer_group_name} --properties all
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interface -i
-    summary: Target interface name. This should be the name of the interface not the urn-id.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an IoT Plug and Play device interfaces read-write property.
-    syntax:
-      content: az iot dt update-property --login {iothub_cs} --device-id {device_id} --interface-payload {payload}
-  - summary: Update an IoT Plug and Play device interfaces read-write property within current session.
-    syntax:
-      content: az iot dt update-property --hub-name {iothub_name} --device-id {device_id} --interface-payload {payload}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --interface-payload --ip --iv
-    summary: IoT Plug and Play interface payload. Content can be directly input or extracted from a file path.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_dt_invoke_command
-  name: az iot dt invoke-command
-  summary: Executes a command on an IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_commands
-  name: az iot dt list-commands
-  summary: List commands of an IoT Plug and Play devices interface(s).
-- uid: ext_azure-iot_az_iot_dt_list_interfaces
-  name: az iot dt list-interfaces
-  summary: List interfaces of a target IoT Plug and Play device.
-- uid: ext_azure-iot_az_iot_dt_list_properties
-  name: az iot dt list-properties
-  summary: List properties of a target IoT Plug and Play device interface(s).
-- uid: ext_azure-iot_az_iot_dt_monitor_events
-  name: az iot dt monitor-events
-  summary: Monitor Digital Twin events.
-- uid: ext_azure-iot_az_iot_dt_update_property
-  name: az iot dt update-property
-  summary: Update an IoT Plug and Play device interfaces writable property.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage digital twin of an IoT Plug and Play device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge.yml
deleted file mode 100644
index 7eb19af8af..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_edge
-  name: az iot edge
-  summary: Manage IoT solutions on the Edge.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_edge_set_modules
-- uid: ext_azure-iot_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-  description: >-
-    Modules content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Note: Upon execution the command will output the collection of modules applied to the device.
-  langs:
-  - azurecli
-  examples:
-  - summary: Test edge modules while in development by setting modules on a target device.
-    syntax:
-      content: az iot edge set-modules --hub-name {iothub_name} --device-id {device_id} --content ../modules_content.json
-  parameters:
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_edge_set_modules
-  name: az iot edge set-modules
-  summary: Set edge modules on a single device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT solutions on the Edge.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml
deleted file mode 100644
index 738bc77730..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/edge/deployment.yml
+++ /dev/null
@@ -1,256 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_edge_deployment
-  name: az iot edge deployment
-  summary: Manage IoT Edge deployments at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_edge_deployment_create
-  - ext_azure-iot_az_iot_edge_deployment_delete
-  - ext_azure-iot_az_iot_edge_deployment_list
-  - ext_azure-iot_az_iot_edge_deployment_show
-  - ext_azure-iot_az_iot_edge_deployment_show_metric
-  - ext_azure-iot_az_iot_edge_deployment_update
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-  description: >-
-    Deployment content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
-
-
-    Edge deployments can be created with user defined metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a deployment with labels (bash syntax example) that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{"key0":"value0", "key1":"value1"}' --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a deployment with labels (powershell syntax example) that applies for devices tagged with environment 'dev'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{\"key\":\"value\"}' --target-condition "tags.environment='dev'"
-  - summary: Create a layered deployment that applies for devices tagged with environment 'dev'. Both user metrics and modules content defined inline (cmd syntax example).
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content "{\"modulesContent\":{\"$edgeAgent\":{\"properties.desired.modules.mymodule0\":{ }},\"$edgeHub\":{\"properties.desired.routes.myroute0\":\"FROM /messages/* INTO $upstream\"}}}" --target-condition "tags.environment='dev'" --priority 10 --metrics "{\"queries\":{\"mymetrik\":\"SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200\"}}" --layered
-  - summary: Create a layered deployment that applies for devices in 'building 9' and the environment is 'test'.
-    syntax:
-      content: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content layered_modules_content.json --target-condition "tags.building=9 and tags.environment='test'" --metrics metrics_content.json --layered
-  parameters:
-  - isRequired: true
-    name: --content -k
-    summary: IoT Edge deployment content. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: "Map of labels to be applied to target deployment. Use the following format: '{\"key0\":\"value0\", \"key1\":\"value1\"}'."
-    description: ''
-  - name: --layered
-    parameterValueGroup: false, true
-    summary: Layered deployments allow you to define desired properties in $edgeAgent, $edgeHub and user modules that will layer on top of a base deployment. For example the routes specified in a layered deployment will merge with routes of the base deployment. Routes with the same name will be overwritten based on deployment priority.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: IoT Edge deployment metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of deployment in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which an Edge deployment applies to.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of deployments to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the 'appliedCount' system metric
-    syntax:
-      content: az iot edge deployment show-metric -m appliedCount -d {deployment_name} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the labels and target condition of an existing edge deployment
-    syntax:
-      content: az iot edge deployment update -d {deployment_name} -n {iothub_name} --set labels='{"purpose":"dev", "owners":"IoTEngineering"}' targetCondition='tags.building=9'
-  parameters:
-  - isRequired: true
-    name: --deployment-id -d
-    summary: Target deployment name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_edge_deployment_create
-  name: az iot edge deployment create
-  summary: Create an IoT Edge deployment in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_delete
-  name: az iot edge deployment delete
-  summary: Delete an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_list
-  name: az iot edge deployment list
-  summary: List IoT Edge deployments in an IoT Hub.
-- uid: ext_azure-iot_az_iot_edge_deployment_show
-  name: az iot edge deployment show
-  summary: Get the details of an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-  name: az iot edge deployment show-metric
-  summary: Evaluate a target system metric defined in an IoT Edge deployment.
-- uid: ext_azure-iot_az_iot_edge_deployment_update
-  name: az iot edge deployment update
-  summary: >-
-    Update specified properties of an IoT Edge deployment.
-
-
-    Use --set followed by property assignments for updating a deployment.
-
-
-    Note: IoT Edge deployment content is immutable. Deployment properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Edge deployments at scale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub.yml
deleted file mode 100644
index 77058b7fe5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub.yml
+++ /dev/null
@@ -1,469 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub
-  name: az iot hub
-  summary: Manage entities in an Azure IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_generate_sas_token
-  - ext_azure-iot_az_iot_hub_invoke_device_method
-  - ext_azure-iot_az_iot_hub_invoke_module_method
-  - ext_azure-iot_az_iot_hub_monitor_events
-  - ext_azure-iot_az_iot_hub_monitor_feedback
-  - ext_azure-iot_az_iot_hub_query
-- uid: ext_azure-iot_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-  description: For device SAS tokens, the policy parameter is used to access the the device registry only. Therefore the policy should have read access to the registry. For IoT Hub tokens the policy is part of the SAS.
-  langs:
-  - azurecli
-  examples:
-  - summary: Generate an IoT Hub SAS token using the iothubowner policy and primary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name}
-  - summary: Generate an IoT Hub SAS token using the registryRead policy and secondary key.
-    syntax:
-      content: az iot hub generate-sas-token -n {iothub_name} --policy registryRead --key-type secondary
-  - summary: Generate a device SAS token using the iothubowner policy to access the {iothub_name} device registry.
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} -n {iothub_name}
-  - summary: Generate a device SAS token using an IoT Hub connection string (with registry access)
-    syntax:
-      content: az iot hub generate-sas-token -d {device_id} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --du --duration
-    defaultValue: "3600"
-    summary: Valid token duration in seconds.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --pn --policy-name
-    defaultValue: iothubowner
-    summary: Shared access policy with operation permissions for target IoT Hub entity.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --method-payload --mp
-    defaultValue: '{}'
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d Device*
-  - summary: Filter devices using IoT Hub query language
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iot hub monitor-events -n {iothub_name} --content-type application/json
-  parameters:
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --content-type --ct
-    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --device-query -q
-    summary: Specify a custom query to filter devices.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-  description: >-
-    EXPERIMENTAL requires Python 3.4+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name}
-  - summary: Basic usage with an IoT Hub connection string
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id}
-  - summary: Exit feedback monitor upon receiving a message with specific id (uuid)
-    syntax:
-      content: az iot hub monitor-feedback -n {iothub_name} -d {device_id} -w {message_id}
-  parameters:
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --wait-on-msg -w
-    summary: Feedback monitor will block until a message with specific id (uuid) is received.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-  description: Query an IoT Hub using a powerful SQL-like language to retrieve information regarding device and module twins, jobs and message routing. See <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language</a> for more information.
-  langs:
-  - azurecli
-  examples:
-  - summary: Query all device twin data in an Azure IoT Hub.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices"
-  - summary: Query all module twin data on target device.
-    syntax:
-      content: az iot hub query -n {iothub_name} -q "select * from devices.modules where devices.deviceId = '{device_id}'"
-  parameters:
-  - isRequired: true
-    name: --query-command -q
-    summary: User query to be executed.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. By default query has no cap.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-- uid: ext_azure-iot_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-- uid: ext_azure-iot_az_iot_hub_generate_sas_token
-  name: az iot hub generate-sas-token
-  summary: Generate a SAS token for a target IoT Hub, device or module.
-- uid: ext_azure-iot_az_iot_hub_invoke_device_method
-  name: az iot hub invoke-device-method
-  summary: Invoke a device method.
-- uid: ext_azure-iot_az_iot_hub_invoke_module_method
-  name: az iot hub invoke-module-method
-  summary: Invoke an Edge module method.
-- uid: ext_azure-iot_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-- uid: ext_azure-iot_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-- uid: ext_azure-iot_az_iot_hub_monitor_events
-  name: az iot hub monitor-events
-  summary: Monitor device telemetry & messages sent to an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_monitor_feedback
-  name: az iot hub monitor-feedback
-  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
-- uid: ext_azure-iot_az_iot_hub_query
-  name: az iot hub query
-  summary: Query an IoT Hub using a powerful SQL-like language.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities in an Azure IoT Hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml
deleted file mode 100644
index 67c58b2cf6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/configuration.yml
+++ /dev/null
@@ -1,264 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_configuration
-  name: az iot hub configuration
-  summary: Manage IoT automatic device management configuration at scale.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_configuration_create
-  - ext_azure-iot_az_iot_hub_configuration_delete
-  - ext_azure-iot_az_iot_hub_configuration_list
-  - ext_azure-iot_az_iot_hub_configuration_show
-  - ext_azure-iot_az_iot_hub_configuration_show_metric
-  - ext_azure-iot_az_iot_hub_configuration_update
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-  description: >-
-    Configuration content is json and slighty varies based on device or module intent.
-
-
-    Device configurations are in the form of {"deviceContent":{...}} or {"content":{"deviceContent":{...}}}
-
-
-    Module configurations are in the form of {"moduleContent":{...}} or {"content":{"moduleContent":{...}}}
-
-
-    Configurations can be defined with user provided metrics for on demand evaluation.
-
-    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
-
-
-    Note: Target condition for modules must start with "from devices.modules where".
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a device configuration with a priority of 3 that applies on condition when a device is tagged in building 9 and the environment is 'test'.
-    syntax:
-      content: az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition "tags.building=9 and tags.environment='test'" --priority 3
-  - summary: Create a device configuration with labels and provide user metrics inline (bash syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition \"tags.building=9\" --labels '{\"key0\":\"value0\", \"key1\":\"value1\"}' --priority 10 --metrics '{\"metrics\": {\"queries\": {\"mymetric\": \"select deviceId from devices where tags.location='US'\"}}}'"
-  - summary: Create a module configuration with labels and provide user metrics inline (cmd syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content module_content.json --target-condition \"from devices.modules where tags.building=9\" --labels \"{\\\"key0\\\":\\\"value0\\\", \\\"key1\\\":\\\"value1\\\"}\" --metrics \"{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\": \\\"select moduleId from devices.modules where tags.location='US'\\\"}}}\""
-  - summary: Create a module configuration with content and user metrics inline (powershell syntax example)
-    syntax:
-      content: "az iot hub configuration create -c {config_name} -n {iothub_name} --content '{\\\"moduleContent\\\": {\\\"properties.desired.chillerWaterSettings\\\": {\\\"temperature\\\": 38, \\\"pressure\\\": 78}}}' --target-condition \"from devices.modules where tags.building=9\" --priority 1 --metrics '{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\":\\\"select moduleId from devices.modules where tags.location=''US''\\\"}}}'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --content -k
-    summary: Device configuration content. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --lab --labels
-    summary: 'Map of labels to be applied to target configuration. Format example: {"key0":"value0", "key1":"value1"}.'
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metrics -m
-    summary: Device configuration metric definitions. Provide file path or raw json.
-    description: ''
-  - name: --pri --priority
-    summary: Weight of the device configuration in case of competing rules (highest wins).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --target-condition --tc -t
-    summary: Target condition in which a device configuration applies to.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "10"
-    summary: Maximum number of configurations to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Evaluate the user defined 'warningLimit' metric
-    syntax:
-      content: az iot hub configuration show-metric -m warningLimit -c {configuration_name} -n {iothub_name}
-  - summary: Evaluate the system 'appliedCount' metric
-    syntax:
-      content: az iot hub configuration show-metric --metric-id appliedCount -c {configuration_name} -n {iothub_name} --metric-type system
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - isRequired: true
-    name: --metric-id -m
-    summary: Target metric for evaluation.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --metric-type --mt
-    defaultValue: user
-    parameterValueGroup: system, user
-    summary: Indicates which metric collection should be used to lookup a metric.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Alter the priority of a device configuration and update its target condition
-    syntax:
-      content: az iot hub configuration update -c {configuration_name} -n {iothub_name} --set priority=10 targetCondition="tags.building=43 and tags.environment='dev'"
-  parameters:
-  - isRequired: true
-    name: --config-id -c
-    summary: Target device configuration name.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_configuration_create
-  name: az iot hub configuration create
-  summary: Create an IoT automatic device management configuration in a target IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_delete
-  name: az iot hub configuration delete
-  summary: Delete an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_list
-  name: az iot hub configuration list
-  summary: List IoT automatic device management configurations in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_configuration_show
-  name: az iot hub configuration show
-  summary: Get the details of an IoT automatic device management configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-  name: az iot hub configuration show-metric
-  summary: Evaluate a target user or system metric defined in an IoT device configuration.
-- uid: ext_azure-iot_az_iot_hub_configuration_update
-  name: az iot hub configuration update
-  summary: >-
-    Update specified properties of an IoT automatic device management configuration.
-
-
-    Use --set followed by property assignments for updating a configuration.
-
-
-    Note: Configuration content is immutable. Configuration properties that can be
-
-    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT automatic device management configuration at scale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml
deleted file mode 100644
index 2be51e53e0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-identity.yml
+++ /dev/null
@@ -1,490 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_device_identity
-  name: az iot hub device-identity
-  summary: Manage IoT devices.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_device_identity_add_children
-  - ext_azure-iot_az_iot_hub_device_identity_create
-  - ext_azure-iot_az_iot_hub_device_identity_delete
-  - ext_azure-iot_az_iot_hub_device_identity_export
-  - ext_azure-iot_az_iot_hub_device_identity_get_parent
-  - ext_azure-iot_az_iot_hub_device_identity_import
-  - ext_azure-iot_az_iot_hub_device_identity_list
-  - ext_azure-iot_az_iot_hub_device_identity_list_children
-  - ext_azure-iot_az_iot_hub_device_identity_remove_children
-  - ext_azure-iot_az_iot_hub_device_identity_set_parent
-  - ext_azure-iot_az_iot_hub_device_identity_show
-  - ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  - ext_azure-iot_az_iot_hub_device_identity_update
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add non-edge devices as a children to the edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Add non-edge devices as a children to the edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity add-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name} -f
-  parameters:
-  - isRequired: true
-    name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an edge enabled IoT device with default authorization (shared private key).
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee
-  - summary: Create an edge enabled IoT device with default authorization (shared private key) and add child devices as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee --cl {child_device_id}
-  - summary: Create an IoT device with default authorization (shared private key) and set parent device as well.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --pd {edge_device_id}
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert valid for 10 days then use its thumbprint.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --valid-days 10
-  - summary: Create an IoT device with self-signed certificate authorization, generate a cert of default expiration (365 days) and output to target directory.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --output-dir /path/to/output
-  - summary: Create an IoT device with self-signed certificate authorization and explicitly provide primary and secondary thumbprints.
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --ptp {thumbprint_1} --stp {thumbprint_2}
-  - summary: Create an IoT device with root CA authorization with disabled status and reason
-    syntax:
-      content: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_ca --status disabled --status-reason 'for reasons'
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --add-children --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --pd --set-parent
-    summary: Id of edge device.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sta --status
-    defaultValue: enabled
-    parameterValueGroup: disabled, enabled
-    summary: Set device status upon creation.
-    description: ''
-  - name: --star --status-reason
-    summary: Description for device status.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --bcu --blob-container-uri
-    summary: 'Blob Shared Access Signature URI with write, read, and delete access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication, you must supply an https:// URI.'
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --auth-type --storage-authentication-type
-    parameterValueGroup: identity, key
-    summary: Authentication type for communicating with the storage container.
-    description: ''
-  - name: --ik --include-keys
-    parameterValueGroup: false, true
-    summary: If set, keys are exported normally. Otherwise, keys are set to null in export output.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the parent device of the specified device.
-    syntax:
-      content: az iot hub device-identity get-parent -d {non_edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities">https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --ibcu --input-blob-container-uri
-    summary: 'Blob Shared Access Signature URI with read access to a blob container. This blob contains the operations to be performed on the identity registry. Note: when using Identity-based authentication, you must supply an https:// URI.'
-    description: ''
-  - isRequired: true
-    name: --obcu --output-blob-container-uri
-    summary: 'Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication, you must supply an https:// URI.'
-    description: ''
-  - name: --auth-type --storage-authentication-type
-    parameterValueGroup: identity, key
-    summary: Authentication type for communicating with the storage container.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --edge-enabled --ee
-    parameterValueGroup: false, true
-    summary: Flag indicating edge enablement.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show all assigned non-edge devices as comma-separated list.
-    syntax:
-      content: az iot hub device-identity list-children -d {edge_device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove all mentioned devices as children of specified device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --child-list {comma_separated_non_edge_device_id} -n {iothub_name}
-  - summary: Remove all non-edge devices as children specified edge device.
-    syntax:
-      content: az iot hub device-identity remove-children -d {edge_device_id} --remove-all
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of edge device.
-    description: ''
-  - name: --child-list --cl
-    summary: Child device list (comma separated) includes only non-edge devices.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --remove-all -a
-    summary: To remove all children.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the parent device of the specified non-edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} -n {iothub_name}
-  - summary: Set the parent device of the specified non-edge device irrespectively the non-edge device is already a child of other edge device.
-    syntax:
-      content: az iot hub device-identity set-parent -d {non_edge_device_id} --pd {edge_device_id} --force -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Id of non-edge device.
-    description: ''
-  - isRequired: true
-    name: --parent-device-id --pd
-    summary: Id of edge device.
-    description: ''
-  - name: --force -f
-    summary: Overwrites the non-edge device's parent device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-  description: Use --set followed by property assignments for updating a device. Leverage parameters returned from 'iot hub device-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Turn on edge capabilities for device
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set capabilities.iotEdge=true
-  - summary: Disable device status
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled
-  - summary: In one command
-    syntax:
-      content: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled capabilities.iotEdge=true
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-  name: az iot hub device-identity add-children
-  summary: Add specified comma-separated list of non edge device ids as children of specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_create
-  name: az iot hub device-identity create
-  summary: Create a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_delete
-  name: az iot hub device-identity delete
-  summary: Delete an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_export
-  name: az iot hub device-identity export
-  summary: Export all device identities from an IoT Hub to an Azure Storage blob container.
-- uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-  name: az iot hub device-identity get-parent
-  summary: Get the parent device of the specified device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_import
-  name: az iot hub device-identity import
-  summary: Import device identities to an IoT Hub from a blob.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list
-  name: az iot hub device-identity list
-  summary: List devices in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-  name: az iot hub device-identity list-children
-  summary: Print comma-separated list of assigned child devices.
-- uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-  name: az iot hub device-identity remove-children
-  summary: Remove non edge devices as children from specified edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-  name: az iot hub device-identity set-parent
-  summary: Set the parent device of the specified non-edge device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show
-  name: az iot hub device-identity show
-  summary: Get the details of an IoT Hub device.
-- uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-  name: az iot hub device-identity show-connection-string
-  summary: Show a given IoT Hub device connection string.
-- uid: ext_azure-iot_az_iot_hub_device_identity_update
-  name: az iot hub device-identity update
-  summary: Update an IoT Hub device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT devices.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml
deleted file mode 100644
index 193115d27f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/device-twin.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_device_twin
-  name: az iot hub device-twin
-  summary: Manage IoT device twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_device_twin_replace
-  - ext_azure-iot_az_iot_hub_device_twin_show
-  - ext_azure-iot_az_iot_hub_device_twin_update
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace device twin with file contents.
-    syntax:
-      content: az iot hub device-twin replace -d {device_id} -n {iothub_name} -j ../mydevicetwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch device twin desired properties.
-    syntax:
-      content: az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
-  - summary: Patch device twin tags.
-    syntax:
-      content: "az iot hub device-twin update -n {iothub_name} -d {device_id} --tags '{\"country\": \"USA\"}'"
-  - summary: Patch removal of 'critical' desired property from parent 'temperature'
-    syntax:
-      content: "az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --desired
-    summary: Twin desired properties.
-    description: ''
-  - name: --tags
-    summary: Twin tags.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_device_twin_replace
-  name: az iot hub device-twin replace
-  summary: Replace device twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_device_twin_show
-  name: az iot hub device-twin show
-  summary: Get a device twin definition.
-- uid: ext_azure-iot_az_iot_hub_device_twin_update
-  name: az iot hub device-twin update
-  summary: Update device twin desired properties and tags.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device twin configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml
deleted file mode 100644
index ef31fb33a6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/distributed-tracing.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing
-  name: az iot hub distributed-tracing
-  summary: Manage distributed settings per-device.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_distributed_tracing_show
-  - ext_azure-iot_az_iot_hub_distributed_tracing_update
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the distributed tracing settings for a device
-    syntax:
-      content: az iot hub distributed-tracing show -d {device_id} -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the distributed tracing options for a device
-    syntax:
-      content: az iot hub distributed-tracing update -d {device_id} --sm on --sr 50 -n {iothub_name}
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - isRequired: true
-    name: --sampling-mode --sm
-    parameterValueGroup: off, on
-    summary: Turns sampling for distributed tracing on and off. 1 is On and, 2 is Off.
-    description: ''
-  - isRequired: true
-    name: --sampling-rate --sr
-    summary: Controls the amount of messages sampled for adding trace context. This value isa percentage. Only values from 0 to 100 (inclusive) are permitted.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-  name: az iot hub distributed-tracing show
-  summary: Get the distributed tracing settings for a device.
-- uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-  name: az iot hub distributed-tracing update
-  summary: Update the distributed tracing options for a device.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage distributed settings per-device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml
deleted file mode 100644
index 6905280da1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/job.yml
+++ /dev/null
@@ -1,213 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_job
-  name: az iot hub job
-  summary: Manage IoT Hub jobs (v2).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_job_cancel
-  - ext_azure-iot_az_iot_hub_job_create
-  - ext_azure-iot_az_iot_hub_job_list
-  - ext_azure-iot_az_iot_hub_job_show
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel an IoT Hub job.
-    syntax:
-      content: az iot hub job cancel --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-  description: >-
-    When scheduling a twin update job, the twin patch is a required argument.
-
-    When scheduling a device method job, the method name and payload are required arguments.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create and schedule a job to update the twin tags of all devices.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}'"
-  - summary: Schedule job and block for result of "completed", "failed" or "cancelled". Specify poll interval in seconds.
-    syntax:
-      content: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}' --wait --poll-interval 30"
-  - summary: Create a job to update a desired twin property on a subset of devices, scheduled to run at an arbitrary future time.
-    syntax:
-      content: "az iot hub job create --job-id {job_name} --job-type scheduleUpdateTwin -n {iothub_name} --twin-patch '{\"properties\":{\"desired\": {\"temperatureF\": 65}}}' --start-time \"2020-01-08T12:19:56.868Z\" --query-condition \"deviceId IN ['MyDevice1', 'MyDevice2', 'MyDevice3']\""
-  - summary: Create and schedule a job to invoke a device method for a set of devices meeting a query condition.
-    syntax:
-      content: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -n {iothub_name} --method-name setSyncIntervalSec --method-payload 30 --query-condition "properties.reported.settings.syncIntervalSec != 30"
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - isRequired: true
-    name: --job-type --jt
-    parameterValueGroup: scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --duration --poll-duration
-    defaultValue: "600"
-    summary: Total duration in seconds where job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --interval --poll-interval
-    defaultValue: "10"
-    summary: Interval in seconds that job status will be checked if --wait flag is passed in.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --mct --method-connect-timeout
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait on device connection.
-    description: ''
-  - name: --method-name --mn
-    summary: Target method for invocation.
-    description: ''
-  - name: --method-payload --mp
-    summary: Json payload to be passed to method. Must be file path or raw json.
-    description: ''
-  - name: --method-response-timeout --mrt
-    defaultValue: "30"
-    summary: Maximum number of seconds to wait for device method result.
-    description: ''
-  - name: --patch --twin-patch
-    summary: The desired twin patch. Provide file path or raw json.
-    description: ''
-  - name: --query-condition -q
-    summary: 'Condition for device query to get devices to execute the job on. Required if job type is scheduleDeviceMethod or scheduleUpdateTwin. Note: The service will prefix "SELECT \* FROM devices WHERE " to the input.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --start --start-time
-    summary: The scheduled start of the job in ISO 8601 date time format. If no start time is provided, the job is queued for asap execution.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Max execution time in seconds, before job is terminated.
-    description: ''
-  - name: --wait -w
-    parameterValueGroup: false, true
-    summary: Block until the created job is in a completed, failed or cancelled state. Will regularly poll on interval specified by --poll-interval.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all archived jobs within retention period (max of 30 days).
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name}
-  - summary: List all archived jobs projecting specific properties
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --query "[*].[jobId,type,status,startTime,endTime]"
-  - summary: List only update twin type jobs
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod
-  - summary: List device method jobs which have status "scheduled"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod --job-status scheduled
-  - summary: List device export jobs which have status "completed"
-    syntax:
-      content: az iot hub job list --hub-name {iothub_name} --job-type export --job-status completed
-  parameters:
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --job-status --js
-    parameterValueGroup: cancelled, completed, enqueued, failed, queued, running, scheduled, unknown
-    summary: The status of a scheduled job.
-    description: ''
-  - name: --job-type --jt
-    parameterValueGroup: export, import, scheduleDeviceMethod, scheduleUpdateTwin
-    summary: The type of scheduled job.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a created job.
-    syntax:
-      content: az iot hub job show --hub-name {iothub_name} --job-id {job_id}
-  parameters:
-  - isRequired: true
-    name: --job-id
-    summary: IoT Hub job Id.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_job_cancel
-  name: az iot hub job cancel
-  summary: Cancel an IoT Hub job.
-- uid: ext_azure-iot_az_iot_hub_job_create
-  name: az iot hub job create
-  summary: Create and schedule an IoT Hub job for execution.
-- uid: ext_azure-iot_az_iot_hub_job_list
-  name: az iot hub job list
-  summary: List the historical jobs of an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_job_show
-  name: az iot hub job show
-  summary: Show details of an existing IoT Hub job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Hub jobs (v2).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml
deleted file mode 100644
index 37425fd36c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-identity.yml
+++ /dev/null
@@ -1,232 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_module_identity
-  name: az iot hub module-identity
-  summary: Manage IoT device modules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_module_identity_create
-  - ext_azure-iot_az_iot_hub_module_identity_delete
-  - ext_azure-iot_az_iot_hub_module_identity_list
-  - ext_azure-iot_az_iot_hub_module_identity_show
-  - ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  - ext_azure-iot_az_iot_hub_module_identity_update
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --am --auth-method
-    defaultValue: shared_private_key
-    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
-    summary: The authorization type an entity is to be created with.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --od --output-dir
-    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
-    description: ''
-  - name: --primary-thumbprint --ptp
-    summary: Explicit self-signed certificate thumbprint to use for primary key.
-    description: ''
-  - name: --secondary-thumbprint --stp
-    summary: Explicit self-signed certificate thumbprint to use for secondary key.
-    description: ''
-  - name: --valid-days --vd
-    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of elements to return. Use -1 for unlimited.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --key-type --kt
-    defaultValue: primary
-    parameterValueGroup: primary, secondary
-    summary: Shared access policy key type for auth.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-identity show'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate module symmetric authentication keys
-    syntax:
-      content: az iot hub module-identity update -m {module_name} -d {device_id} -n {iothub_name} --set authentication.symmetricKey.primaryKey="" authentication.symmetricKey.secondaryKey=""
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_module_identity_create
-  name: az iot hub module-identity create
-  summary: Create a module on a target IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_delete
-  name: az iot hub module-identity delete
-  summary: Delete a device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_list
-  name: az iot hub module-identity list
-  summary: List modules located on an IoT device in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show
-  name: az iot hub module-identity show
-  summary: Get the details of an IoT device module in an IoT Hub.
-- uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-  name: az iot hub module-identity show-connection-string
-  summary: Show a target IoT device module connection string.
-- uid: ext_azure-iot_az_iot_hub_module_identity_update
-  name: az iot hub module-identity update
-  summary: Update an IoT Hub device module.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device modules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml
deleted file mode 100644
index e268625e75..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/hub/module-twin.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_hub_module_twin
-  name: az iot hub module-twin
-  summary: Manage IoT device module twin configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_hub_module_twin_replace
-  - ext_azure-iot_az_iot_hub_module_twin_show
-  - ext_azure-iot_az_iot_hub_module_twin_update
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-  description: Input json directly or use a file path.
-  langs:
-  - azurecli
-  examples:
-  - summary: Replace a module twin with file contents.
-    syntax:
-      content: az iot hub module-twin replace -d {device_id} -n {iothub_name} -m {module_name} -j ../mymodtwin.json
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --json -j
-    summary: Json to replace existing twin with. Provide file path or raw json.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch module twin desired properties.
-    syntax:
-      content: az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
-  - summary: Patch module twin tags.
-    syntax:
-      content: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --tags '{\"country\": \"USA\"}'"
-  - summary: Patch removal of 'critical' desired property from parent 'temperature'
-    syntax:
-      content: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
-  parameters:
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - isRequired: true
-    name: --module-id -m
-    summary: Target Module.
-    description: ''
-  - name: --hub-name -n
-    summary: IoT Hub name.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --desired
-    summary: Twin desired properties.
-    description: ''
-  - name: --tags
-    summary: Twin tags.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_hub_module_twin_replace
-  name: az iot hub module-twin replace
-  summary: Replace a module twin definition with target json.
-- uid: ext_azure-iot_az_iot_hub_module_twin_show
-  name: az iot hub module-twin show
-  summary: Show a module twin definition.
-- uid: ext_azure-iot_az_iot_hub_module_twin_update
-  name: az iot hub module-twin update
-  summary: Update module twin desired properties and tags.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT device module twin configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp.yml
deleted file mode 100644
index 6af569e9cb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_pnp
-  name: az iot pnp
-  summary: Manage entities of an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entities of an IoT Plug and Play model repository.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp/capability-model.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp/capability-model.yml
deleted file mode 100644
index 041f7a2309..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp/capability-model.yml
+++ /dev/null
@@ -1,212 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_pnp_capability_model
-  name: az iot pnp capability-model
-  summary: Manage device capability models in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_pnp_capability_model_create
-  - ext_azure-iot_az_iot_pnp_capability_model_delete
-  - ext_azure-iot_az_iot_pnp_capability_model_list
-  - ext_azure-iot_az_iot_pnp_capability_model_publish
-  - ext_azure-iot_az_iot_pnp_capability_model_show
-  - ext_azure-iot_az_iot_pnp_capability_model_update
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model create --def {plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model delete -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's capability-model.
-    syntax:
-      content: az iot pnp capability-model list -r {pnp_repository}
-  - summary: List all public capability-model.
-    syntax:
-      content: az iot pnp capability-model list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play models for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of capability-model to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish the capability-model to public repository.
-    syntax:
-      content: az iot pnp capability-model publish -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository capability-model.
-    syntax:
-      content: az iot pnp capability-model show -r {pnp_repository} --model {plug_and_play_capability_model_id}
-  - summary: Get the details of public capability-model.
-    syntax:
-      content: az iot pnp capability-model show --model {plug_and_play_capability_model_id}
-  parameters:
-  - isRequired: true
-    name: --model -m
-    summary: 'Target capability-model urn-id. Example: <a href="urn:example:capabilityModels:Mxchip:1">urn:example:capabilityModels:Mxchip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --expand
-    summary: Indicates whether to expand the device capability model's interface definitions or not.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the capability-model in the company repository.
-    syntax:
-      content: az iot pnp capability-model update --def {updated_plug_and_play_capability_model_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play capability-model definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_pnp_capability_model_create
-  name: az iot pnp capability-model create
-  summary: Create a capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-  name: az iot pnp capability-model delete
-  summary: Delete the capability-model in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_list
-  name: az iot pnp capability-model list
-  summary: List all capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-  name: az iot pnp capability-model publish
-  summary: Publish the capability-model to public repository.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_show
-  name: az iot pnp capability-model show
-  summary: Get the details of a capability-model.
-- uid: ext_azure-iot_az_iot_pnp_capability_model_update
-  name: az iot pnp capability-model update
-  summary: Update the capability-model in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage device capability models in an IoT Plug and Play model repository.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp/interface.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp/interface.yml
deleted file mode 100644
index a51f3fb1ba..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iot/pnp/interface.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iot_pnp_interface
-  name: az iot pnp interface
-  summary: Manage interfaces in an IoT Plug and Play model repository.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iot_pnp_interface_create
-  - ext_azure-iot_az_iot_pnp_interface_delete
-  - ext_azure-iot_az_iot_pnp_interface_list
-  - ext_azure-iot_az_iot_pnp_interface_publish
-  - ext_azure-iot_az_iot_pnp_interface_show
-  - ext_azure-iot_az_iot_pnp_interface_update
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an interface in the company repository.
-    syntax:
-      content: az iot pnp interface create --def {plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an interface in the company repository.
-    syntax:
-      content: az iot pnp interface delete -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all company repository's interfaces.
-    syntax:
-      content: az iot pnp interface list -r {pnp_repository}
-  - summary: List all public interfaces.
-    syntax:
-      content: az iot pnp interface list
-  parameters:
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-  - name: --search --ss
-    summary: Searches IoT Plug and Play interfaces for given string in the "Description, DisplayName, comment and Id".
-    description: ''
-  - name: --top
-    defaultValue: "1000"
-    summary: Maximum number of interface to return.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish an interface to public repository.
-    syntax:
-      content: az iot pnp interface publish -r {pnp_repository} --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a company repository interface.
-    syntax:
-      content: az iot pnp interface show -r {pnp_repository} --interface {plug_and_play_interface_id}
-  - summary: Get the details of public interface.
-    syntax:
-      content: az iot pnp interface show --interface {plug_and_play_interface_id}
-  parameters:
-  - isRequired: true
-    name: --interface -i
-    summary: 'Target interface urn-id. Example: <a href="urn:example:interfaces:MXChip:1">urn:example:interfaces:MXChip:1</a>.'
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an interface in the company repository.
-    syntax:
-      content: az iot pnp interface update --def {updated_plug_and_play_interface_file_path} -r {pnp_repository}
-  parameters:
-  - isRequired: true
-    name: --def --definition
-    summary: IoT Plug and Play interface definition written in PPDL (JSON-LD). Can be directly input or a file path where the content is extracted.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: <a href="https://provider.azureiotrepository.com">https://provider.azureiotrepository.com</a>
-    summary: IoT Plug and Play endpoint.
-    description: ''
-  - name: --login -l
-    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
-    description: ''
-  - name: --repo-id -r
-    summary: IoT Plug and Play repository Id.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iot_pnp_interface_create
-  name: az iot pnp interface create
-  summary: Create an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_delete
-  name: az iot pnp interface delete
-  summary: Delete an interface in the company repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_list
-  name: az iot pnp interface list
-  summary: List all interfaces.
-- uid: ext_azure-iot_az_iot_pnp_interface_publish
-  name: az iot pnp interface publish
-  summary: Publish an interface to public repository.
-- uid: ext_azure-iot_az_iot_pnp_interface_show
-  name: az iot pnp interface show
-  summary: Get the details of an interface.
-- uid: ext_azure-iot_az_iot_pnp_interface_update
-  name: az iot pnp interface update
-  summary: Update an interface in the company repository.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage interfaces in an IoT Plug and Play model repository.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral.yml
deleted file mode 100644
index d6fc1e8948..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral
-  name: az iotcentral
-  summary: Manage IoT Central assets.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_azure-iot_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-- uid: ext_azure-iot_az_iotcentral_app_device_twin
-  name: az iotcentral app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-- uid: ext_azure-iot_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central assets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/app.yml
deleted file mode 100644
index fa72bd7baa..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/app.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral_app
-  name: az iotcentral app
-  summary: Manage IoT Central applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iotcentral_app_monitor_events
-- uid: ext_azure-iot_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-  description: >-
-    EXPERIMENTAL requires Python 3.5+
-
-    This command relies on and may install dependent Cython package (uamqp) upon first execution.
-
-    <a href="https://github.com/Azure/azure-uamqp-python">https://github.com/Azure/azure-uamqp-python</a>
-
-
-    DEPRECATED. Use 'az iot central app monitor-events' instead.
-  langs:
-  - azurecli
-  examples:
-  - summary: Basic usage
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id}
-  - summary: Basic usage when filtering on target device
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id}
-  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d Device*
-  - summary: Filter device and specify an Event Hub consumer group to bind to.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
-  - summary: Receive message annotations (message headers)
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno
-  - summary: Receive message annotations + system properties. Never time out.
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
-  - summary: Receive all message attributes from all device messages
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --props all
-  - summary: Receive all messages and parse message payload as JSON
-    syntax:
-      content: az iotcentral app monitor-events --app-id {app_id} --output json
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-  - name: --cg --consumer-group -c
-    defaultValue: $Default
-    summary: Specify the consumer group to use when connecting to event hub endpoint.
-    description: ''
-  - name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --enqueued-time --et -e
-    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
-    description: ''
-  - name: --properties --props -p
-    parameterValueGroup: all, anno, app, sys
-    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
-    description: ''
-  - name: --repair -r
-    parameterValueGroup: false, true
-    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
-    description: ''
-  - name: --timeout --to -t
-    defaultValue: "300"
-    summary: Maximum seconds to maintain connection. Use 0 for infinity.
-    description: ''
-  - name: --yes -y
-    parameterValueGroup: false, true
-    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iotcentral_app_device_twin
-  name: az iotcentral app device-twin
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-- uid: ext_azure-iot_az_iotcentral_app_monitor_events
-  name: az iotcentral app monitor-events
-  summary: Monitor device telemetry & messages sent to the IoT Hub for an IoT Central app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/app/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/app/device-twin.yml
deleted file mode 100644
index 4fe5b33a30..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/app/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral_app_device_twin
-  name: az iotcentral app device-twin
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iotcentral_app_device_twin_show
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-  name: az iotcentral app device-twin show
-  summary: Manage IoT Central device twins.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage IoT Central device twins.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/device-twin.yml
deleted file mode 100644
index 3a282a3ba1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/azure-iot/iotcentral/device-twin.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_azure-iot_az_iotcentral_device_twin
-  name: az iotcentral device-twin
-  summary: Manage IoT Central device twins.
-  description: DEPRECATED. Use 'az iot central device-twin' instead.
-  langs:
-  - azurecli
-  children:
-  - ext_azure-iot_az_iotcentral_device_twin_show
-- uid: ext_azure-iot_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-  description: DEPRECATED. Use 'az iot central device-twin show' instead.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-id
-    summary: Target App.
-    description: ''
-  - isRequired: true
-    name: --device-id -d
-    summary: Target Device.
-    description: ''
-  - name: --central-api-uri --central-dns-suffix
-    defaultValue: azureiotcentral.com
-    summary: Central dns suffix. This enables running cli commands against non public/prod environments.
-    description: ''
-commands:
-- uid: ext_azure-iot_az_iotcentral_device_twin_show
-  name: az iotcentral device-twin show
-  summary: Get the device twin from IoT Hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: DEPRECATED. Use 'az iot central device-twin' instead.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain.yml
deleted file mode 100644
index 68c37de7c2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain
-  name: az blockchain
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_blockchain_az_blockchain_consortium
-  name: az blockchain consortium
-  summary: Blockchain consortium.
-- uid: ext_blockchain_az_blockchain_consortium_list
-  name: az blockchain consortium list
-  summary: List the available consortiums for a subscription.
-- uid: ext_blockchain_az_blockchain_member
-  name: az blockchain member
-  summary: Blockchain member.
-- uid: ext_blockchain_az_blockchain_member_create
-  name: az blockchain member create
-  summary: Create a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_delete
-  name: az blockchain member delete
-  summary: Delete a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list
-  name: az blockchain member list
-  summary: List the blockchain members.
-- uid: ext_blockchain_az_blockchain_member_list_api_key
-  name: az blockchain member list-api-key
-  summary: List the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list_consortium_member
-  name: az blockchain member list-consortium-member
-  summary: List the consortium members for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-  name: az blockchain member regenerate-api-key
-  summary: Regenerate the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_show
-  name: az blockchain member show
-  summary: Show the details about a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_update
-  name: az blockchain member update
-  summary: Update a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_wait
-  name: az blockchain member wait
-  summary: Wait until a blockchain member is created or deleted.
-- uid: ext_blockchain_az_blockchain_transaction_node
-  name: az blockchain transaction-node
-  summary: Blockchain transaction-node.
-- uid: ext_blockchain_az_blockchain_transaction_node_create
-  name: az blockchain transaction-node create
-  summary: Create a transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_delete
-  name: az blockchain transaction-node delete
-  summary: Delete the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_list
-  name: az blockchain transaction-node list
-  summary: List the transaction nodes for a blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-  name: az blockchain transaction-node list-api-key
-  summary: List the API keys for the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  name: az blockchain transaction-node regenerate-api-key
-  summary: Regenerate the API keys for the blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_show
-  name: az blockchain transaction-node show
-  summary: Show the details of the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_update
-  name: az blockchain transaction-node update
-  summary: Update the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_wait
-  name: az blockchain transaction-node wait
-  summary: Wait until the transaction node is created or deleted.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml
deleted file mode 100644
index 7983eab30a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/consortium.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain_consortium
-  name: az blockchain consortium
-  summary: Blockchain consortium.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blockchain_az_blockchain_consortium_list
-- uid: ext_blockchain_az_blockchain_consortium_list
-  name: az blockchain consortium list
-  summary: List the available consortiums for a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the available consortiums for a subscription.
-    syntax:
-      content: az blockchain consortium list --location "southeastasia"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_blockchain_az_blockchain_consortium_list
-  name: az blockchain consortium list
-  summary: List the available consortiums for a subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Blockchain consortium.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/member.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/member.yml
deleted file mode 100644
index 47e4f9a2f3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/member.yml
+++ /dev/null
@@ -1,313 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain_member
-  name: az blockchain member
-  summary: Blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blockchain_az_blockchain_member_create
-  - ext_blockchain_az_blockchain_member_delete
-  - ext_blockchain_az_blockchain_member_list
-  - ext_blockchain_az_blockchain_member_list_api_key
-  - ext_blockchain_az_blockchain_member_list_consortium_member
-  - ext_blockchain_az_blockchain_member_regenerate_api_key
-  - ext_blockchain_az_blockchain_member_show
-  - ext_blockchain_az_blockchain_member_update
-  - ext_blockchain_az_blockchain_member_wait
-- uid: ext_blockchain_az_blockchain_member_create
-  name: az blockchain member create
-  summary: Create a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a blockchain member.
-    syntax:
-      content: az blockchain member create --location "southeastasia" --consortium "ContoseConsortium" --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --validator-nodes-sku capacity=2 --protocol "Quorum" --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consortium
-    summary: Gets or sets the consortium for the blockchain member.
-    description: ''
-  - name: --consortium-management-account-password
-    summary: Sets the managed consortium management account password.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian member.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --password
-    summary: Sets the basic auth password of the blockchain member.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Corda, NotSpecified, Parity, Quorum
-    summary: Gets or sets the blockchain protocol.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Standard
-    summary: The Sku of the blockchain member.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validator-nodes-sku
-    summary: 'Gets or sets the blockchain validator nodes Sku. Expect value: capacity=xx.'
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_delete
-  name: az blockchain member delete
-  summary: Delete a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a blockchain member.
-    syntax:
-      content: az blockchain member delete --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_list
-  name: az blockchain member list
-  summary: List the blockchain members.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the blockchain members in a resource group.
-    syntax:
-      content: az blockchain member list --resource-group "mygroup"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_list_api_key
-  name: az blockchain member list-api-key
-  summary: List the API keys for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the API keys for a blockchain member.
-    syntax:
-      content: az blockchain member list-api-key --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_list_consortium_member
-  name: az blockchain member list-consortium-member
-  summary: List the consortium members for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the consortium members for a blockchain member.
-    syntax:
-      content: az blockchain member list-consortium-member --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-  name: az blockchain member regenerate-api-key
-  summary: Regenerate the API keys for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate the API keys for a blockchain member.
-    syntax:
-      content: az blockchain member regenerate-api-key --key-name "key1" --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --key-name
-    parameterValueGroup: key1, key2
-    summary: Gets or sets the API key name.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_show
-  name: az blockchain member show
-  summary: Show the details about a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details about a blockchain member.
-    syntax:
-      content: az blockchain member show --name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_update
-  name: az blockchain member update
-  summary: Update a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a blockchain member.
-    syntax:
-      content: az blockchain member update --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --name "ContoseMember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consortium-management-account-password
-    summary: Sets the managed consortium management account password.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian member.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --password
-    summary: Sets the transaction node dns endpoint basic auth password.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_blockchain_az_blockchain_member_wait
-  name: az blockchain member wait
-  summary: Wait until a blockchain member is created or deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Wait until a blockchain member is created.
-    syntax:
-      content: az blockchain member wait --name "contosemember1" --resource-group "mygroup" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_blockchain_az_blockchain_member_create
-  name: az blockchain member create
-  summary: Create a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_delete
-  name: az blockchain member delete
-  summary: Delete a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list
-  name: az blockchain member list
-  summary: List the blockchain members.
-- uid: ext_blockchain_az_blockchain_member_list_api_key
-  name: az blockchain member list-api-key
-  summary: List the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_list_consortium_member
-  name: az blockchain member list-consortium-member
-  summary: List the consortium members for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-  name: az blockchain member regenerate-api-key
-  summary: Regenerate the API keys for a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_show
-  name: az blockchain member show
-  summary: Show the details about a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_update
-  name: az blockchain member update
-  summary: Update a blockchain member.
-- uid: ext_blockchain_az_blockchain_member_wait
-  name: az blockchain member wait
-  summary: Wait until a blockchain member is created or deleted.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Blockchain member.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml
deleted file mode 100644
index 6a2d5c3d9f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/blockchain/transaction-node.yml
+++ /dev/null
@@ -1,300 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az_blockchain_transaction_node
-  name: az blockchain transaction-node
-  summary: Blockchain transaction-node.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blockchain_az_blockchain_transaction_node_create
-  - ext_blockchain_az_blockchain_transaction_node_delete
-  - ext_blockchain_az_blockchain_transaction_node_list
-  - ext_blockchain_az_blockchain_transaction_node_list_api_key
-  - ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  - ext_blockchain_az_blockchain_transaction_node_show
-  - ext_blockchain_az_blockchain_transaction_node_update
-  - ext_blockchain_az_blockchain_transaction_node_wait
-- uid: ext_blockchain_az_blockchain_transaction_node_create
-  name: az blockchain transaction-node create
-  summary: Create a transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a transaction node.
-    syntax:
-      content: az blockchain transaction-node create --member-name "contosemember1" --resource-group "mygroup" --location "southeastasia" --password "1234abcdEFG1" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian transaction node.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --password
-    summary: Sets the transaction node dns endpoint basic auth password.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_delete
-  name: az blockchain transaction-node delete
-  summary: Delete the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the transaction node.
-    syntax:
-      content: az blockchain transaction-node delete --member-name "contosemember1" --resource-group "mygroup" --name "txNode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_list
-  name: az blockchain transaction-node list
-  summary: List the transaction nodes for a blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the transaction nodes for a blockchain member.
-    syntax:
-      content: az blockchain transaction-node list --member-name "contosemember1" --resource-group "mygroup"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-  name: az blockchain transaction-node list-api-key
-  summary: List the API keys for the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the API keys for the transaction node.
-    syntax:
-      content: az blockchain transaction-node list-api-key --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  name: az blockchain transaction-node regenerate-api-key
-  summary: Regenerate the API keys for the blockchain member.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate the API keys for the blockchain member.
-    syntax:
-      content: az blockchain transaction-node regenerate-api-key --key-name "key1" --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --key-name
-    parameterValueGroup: key1, key2
-    summary: Gets or sets the API key name.
-    description: ''
-  - name: --value
-    summary: Gets or sets the API key value.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_show
-  name: az blockchain transaction-node show
-  summary: Show the details of the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of the transaction node.
-    syntax:
-      content: az blockchain transaction-node show --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_update
-  name: az blockchain transaction-node update
-  summary: Update the transaction node.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the transaction node.
-    syntax:
-      content: az blockchain transaction-node update --member-name "contosemember1" --resource-group "mygroup" --password "1234abcdEFG1" --name "txnode2"
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --firewall-rules
-    summary: Firewall rules of the blockchian transaction node.
-    description: >-
-      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
-
-
-      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
-  - name: --password
-    summary: Sets the transaction node dns endpoint basic auth password.
-    description: ''
-- uid: ext_blockchain_az_blockchain_transaction_node_wait
-  name: az blockchain transaction-node wait
-  summary: Wait until the transaction node is created or deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Wait until the transaction node is created.
-    syntax:
-      content: az blockchain transaction-node wait --member-name "contosemember1" --resource-group "mygroup" --name "txNode2" --created
-  parameters:
-  - isRequired: true
-    name: --member-name
-    summary: Blockchain member name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Transaction node name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_blockchain_az_blockchain_transaction_node_create
-  name: az blockchain transaction-node create
-  summary: Create a transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_delete
-  name: az blockchain transaction-node delete
-  summary: Delete the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_list
-  name: az blockchain transaction-node list
-  summary: List the transaction nodes for a blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-  name: az blockchain transaction-node list-api-key
-  summary: List the API keys for the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-  name: az blockchain transaction-node regenerate-api-key
-  summary: Regenerate the API keys for the blockchain member.
-- uid: ext_blockchain_az_blockchain_transaction_node_show
-  name: az blockchain transaction-node show
-  summary: Show the details of the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_update
-  name: az blockchain transaction-node update
-  summary: Update the transaction node.
-- uid: ext_blockchain_az_blockchain_transaction_node_wait
-  name: az blockchain transaction-node wait
-  summary: Wait until the transaction node is created or deleted.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Blockchain transaction-node.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/index.yml
deleted file mode 100644
index 8577fd9c74..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blockchain/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blockchain_az
-  name: blockchain
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_blockchain_az_blockchain
-  name: az blockchain
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint.yml
deleted file mode 100644
index a4902b02c9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint.yml
+++ /dev/null
@@ -1,396 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint
-  name: az blueprint
-  summary: Commands to manage blueprint.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_create
-  - ext_blueprint_az_blueprint_delete
-  - ext_blueprint_az_blueprint_import
-  - ext_blueprint_az_blueprint_list
-  - ext_blueprint_az_blueprint_publish
-  - ext_blueprint_az_blueprint_show
-  - ext_blueprint_az_blueprint_update
-- uid: ext_blueprint_az_blueprint_create
-  name: az blueprint create
-  summary: Create a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint create --subscription MySubscription --name \
-
-        MyBlueprint --description \
-
-        "blueprint contains all artifacts" --target-scope \
-
-        subscription
-  - summary: Create a management group blueprint
-    syntax:
-      content: >-
-        az blueprint create --management-group MyManagementGroup --name \
-
-        MyBlueprint --description \
-
-        "blueprint contains all artifact" --target-scope \
-
-        subscription
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --display-name
-    summary: One-liner string explain this resource.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --target-scope
-    defaultValue: subscription
-    parameterValueGroup: managementGroup, subscription
-    summary: The scope where this blueprint definition can be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_delete
-  name: az blueprint delete
-  summary: Delete a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a management group blueprint
-    syntax:
-      content: >-
-        az blueprint delete --management-group MyManagementGroup --name \
-
-        MyBlueprint
-  - summary: Delete a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint delete --subscription MySubscription --name \
-
-        MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_import
-  name: az blueprint import
-  summary: Import a blueprint definition and artifacts from a directoy of json files.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import a blueprint definition and artifacts
-    syntax:
-      content: >-
-        az blueprint import --name MyBlueprint \
-
-        --input-path "path/to/blueprint/directory"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file should be named blueprint.json. Artifacts json files should be in a subdirectory named artifacts.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_list
-  name: az blueprint list
-  summary: List blueprint definitions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List blueprints in a management group
-    syntax:
-      content: az blueprint list --management-group MyManagementGroup
-  - summary: List blueprints in a subscription
-    syntax:
-      content: az blueprint list --subscription MySubscription
-  parameters:
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_publish
-  name: az blueprint publish
-  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Publish a management group blueprint
-    syntax:
-      content: >-
-        az blueprint publish --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  - summary: Publish a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint publish --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --change-notes
-    summary: Version-specific change notes.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_show
-  name: az blueprint show
-  summary: Get a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a management group blueprint
-    syntax:
-      content: >-
-        az blueprint show --management-group MyManagementGroup --name \
-
-        MyBlueprint
-  - summary: Show a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint show --subscription MySubscription --name \
-
-        MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_update
-  name: az blueprint update
-  summary: Update a blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact
-  name: az blueprint artifact
-  summary: Commands to manage blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_delete
-  name: az blueprint artifact delete
-  summary: Delete a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_list
-  name: az blueprint artifact list
-  summary: List artifacts for a given blueprint definition.
-- uid: ext_blueprint_az_blueprint_artifact_policy
-  name: az blueprint artifact policy
-  summary: Commands to manage blueprint policy assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role
-  name: az blueprint artifact role
-  summary: Commands to manage blueprint role assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_show
-  name: az blueprint artifact show
-  summary: Get a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template
-  name: az blueprint artifact template
-  summary: Commands to manage blueprint ARM template artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_assignment
-  name: az blueprint assignment
-  summary: Commands to manage blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_create
-  name: az blueprint assignment create
-  summary: Create a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_delete
-  name: az blueprint assignment delete
-  summary: Delete a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_list
-  name: az blueprint assignment list
-  summary: List blueprint assignments within a subscription.
-- uid: ext_blueprint_az_blueprint_assignment_show
-  name: az blueprint assignment show
-  summary: Get a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_update
-  name: az blueprint assignment update
-  summary: Update a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_wait
-  name: az blueprint assignment wait
-  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
-- uid: ext_blueprint_az_blueprint_assignment_who
-  name: az blueprint assignment who
-  summary: Get Blueprint Servie Principal Name objectId.
-- uid: ext_blueprint_az_blueprint_create
-  name: az blueprint create
-  summary: Create a blueprint definition.
-- uid: ext_blueprint_az_blueprint_delete
-  name: az blueprint delete
-  summary: Delete a blueprint definition.
-- uid: ext_blueprint_az_blueprint_import
-  name: az blueprint import
-  summary: Import a blueprint definition and artifacts from a directoy of json files.
-- uid: ext_blueprint_az_blueprint_list
-  name: az blueprint list
-  summary: List blueprint definitions.
-- uid: ext_blueprint_az_blueprint_publish
-  name: az blueprint publish
-  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
-- uid: ext_blueprint_az_blueprint_resource_group
-  name: az blueprint resource-group
-  summary: Commands to manage blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_add
-  name: az blueprint resource-group add
-  summary: Add a resource group artifact to the blueprint.
-- uid: ext_blueprint_az_blueprint_resource_group_list
-  name: az blueprint resource-group list
-  summary: List blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_remove
-  name: az blueprint resource-group remove
-  summary: Remove a blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_show
-  name: az blueprint resource-group show
-  summary: Show blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_update
-  name: az blueprint resource-group update
-  summary: Update blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_show
-  name: az blueprint show
-  summary: Get a blueprint definition.
-- uid: ext_blueprint_az_blueprint_update
-  name: az blueprint update
-  summary: Update a blueprint definition.
-- uid: ext_blueprint_az_blueprint_version
-  name: az blueprint version
-  summary: Commands to manage published blueprint versions.
-- uid: ext_blueprint_az_blueprint_version_artifact
-  name: az blueprint version artifact
-  summary: Commands to manage published blueprint artifacts.
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_delete
-  name: az blueprint version delete
-  summary: Delete a published version of a blueprint.
-- uid: ext_blueprint_az_blueprint_version_list
-  name: az blueprint version list
-  summary: List published versions of given blueprint definition.
-- uid: ext_blueprint_az_blueprint_version_show
-  name: az blueprint version show
-  summary: Get a published version of a blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml
deleted file mode 100644
index ea50a39752..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact
-  name: az blueprint artifact
-  summary: Commands to manage blueprint artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_delete
-  - ext_blueprint_az_blueprint_artifact_list
-  - ext_blueprint_az_blueprint_artifact_show
-- uid: ext_blueprint_az_blueprint_artifact_delete
-  name: az blueprint artifact delete
-  summary: Delete a blueprint artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a role assignment artifact
-    syntax:
-      content: >-
-        az blueprint artifact delete --subscription MySubscription \
-
-        --blueprint-name MyBlueprint --name OwnerAssignment
-  - summary: Delete an ARM template artifact
-    syntax:
-      content: >-
-        az blueprint artifact delete --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --name StorageTemplate
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint artifact.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_list
-  name: az blueprint artifact list
-  summary: List artifacts for a given blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List artifcats for a management group blueprint
-    syntax:
-      content: >-
-        az blueprint artifact list --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint
-  - summary: List artifcats for a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint artifact list --subscription MySubscription \
-
-        --blueprint-name MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_show
-  name: az blueprint artifact show
-  summary: Get a blueprint artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an artifact of a subscription blueprint
-    syntax:
-      content: >-
-        az blueprint artifact show --subscription MySubscription \
-
-        --blueprint-name MyBlueprint --name OwnerAssignment
-  - summary: Show an artifact of a management group blueprint
-    syntax:
-      content: >-
-        az blueprint artifact show --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --name StorageTemplate
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint artifact.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_delete
-  name: az blueprint artifact delete
-  summary: Delete a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_list
-  name: az blueprint artifact list
-  summary: List artifacts for a given blueprint definition.
-- uid: ext_blueprint_az_blueprint_artifact_policy
-  name: az blueprint artifact policy
-  summary: Commands to manage blueprint policy assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role
-  name: az blueprint artifact role
-  summary: Commands to manage blueprint role assignment artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_show
-  name: az blueprint artifact show
-  summary: Get a blueprint artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template
-  name: az blueprint artifact template
-  summary: Commands to manage blueprint ARM template artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml
deleted file mode 100644
index 58fa5fd652..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/policy.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact_policy
-  name: az blueprint artifact policy
-  summary: Commands to manage blueprint policy assignment artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_policy_create
-  - ext_blueprint_az_blueprint_artifact_policy_update
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a policy artifact
-    syntax:
-      content: >-
-        az blueprint artifact policy create \
-
-        --blueprint-name MyBlueprint --artifact-name MyPolicy --policy-definition-id \
-
-        "/providers/Microsoft.Authorization/policyDefinitions/00000000-0000-0000-0000-000000000000" \
-
-        --parameters path/to/file --display-name "Policy to do sth"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --policy-definition-id
-    summary: The full policy definition id.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a policy artifact
-    syntax:
-      content: >-
-        az blueprint artifact policy update \
-
-        --blueprint-name MyBlueprint --artifact-name MyPolicy --display-name "My Policy"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_policy_create
-  name: az blueprint artifact policy create
-  summary: Create blueprint policy artifact.
-- uid: ext_blueprint_az_blueprint_artifact_policy_update
-  name: az blueprint artifact policy update
-  summary: Update blueprint policy artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint policy assignment artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml
deleted file mode 100644
index 83b7fd6be9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/role.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact_role
-  name: az blueprint artifact role
-  summary: Commands to manage blueprint role assignment artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_role_create
-  - ext_blueprint_az_blueprint_artifact_role_update
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a role artifact
-    syntax:
-      content: >-
-        az blueprint artifact role create \
-
-        --blueprint-name MyBlueprint --artifact-name MyRole --role-definition-id \
-
-        "/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000" \
-
-        --principal-ids "[parameters('[Usergrouporapplicationname]:MyRoleAssignmentName')]"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --principal-ids
-    summary: Array of user or group identities in Azure Active Directory or a reference to the corresponding parameter in blueprint definiton. The roleDefinition will apply to each identity.
-    description: ''
-  - isRequired: true
-    name: --role-definition-id
-    summary: The full role definition id. Only built-in roles are supported.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a role artifact
-    syntax:
-      content: >-
-        az blueprint artifact role update \
-
-        --blueprint-name MyBlueprint --artifact-name MyRole --display-name "My Big Role"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_role_create
-  name: az blueprint artifact role create
-  summary: Create blueprint role artifact.
-- uid: ext_blueprint_az_blueprint_artifact_role_update
-  name: az blueprint artifact role update
-  summary: Update blueprint role artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint role assignment artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml
deleted file mode 100644
index 34e84e1636..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/artifact/template.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_artifact_template
-  name: az blueprint artifact template
-  summary: Commands to manage blueprint ARM template artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_artifact_template_create
-  - ext_blueprint_az_blueprint_artifact_template_update
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an arm artifact
-    syntax:
-      content: >-
-        az blueprint artifact template create \
-
-        --blueprint-name MyBlueprint --artifact-name MyTemplate \
-
-        --parameters path/to/parameter/file --template path/to/template
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --template -t
-    summary: ARM template in JSON string or path to JSON file.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a arm artifact
-    syntax:
-      content: >-
-        az blueprint artifact template update \
-
-        --blueprint-name MyBlueprint --artifact-name MyTemplate --display-name "My Template"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: DisplayName of this artifact.
-    description: ''
-  - name: --parameters -p
-    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-art
-    summary: Name of the resource group artifact to which the policy will be assigned.
-    description: ''
-  - name: --template -t
-    summary: ARM template in JSON string or path to JSON file.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_artifact_template_create
-  name: az blueprint artifact template create
-  summary: Create blueprint arm artifact.
-- uid: ext_blueprint_az_blueprint_artifact_template_update
-  name: az blueprint artifact template update
-  summary: Update blueprint arm artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint ARM template artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml
deleted file mode 100644
index 31acf588f2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/assignment.yml
+++ /dev/null
@@ -1,339 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_assignment
-  name: az blueprint assignment
-  summary: Commands to manage blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_assignment_create
-  - ext_blueprint_az_blueprint_assignment_delete
-  - ext_blueprint_az_blueprint_assignment_list
-  - ext_blueprint_az_blueprint_assignment_show
-  - ext_blueprint_az_blueprint_assignment_update
-  - ext_blueprint_az_blueprint_assignment_wait
-  - ext_blueprint_az_blueprint_assignment_who
-- uid: ext_blueprint_az_blueprint_assignment_create
-  name: az blueprint assignment create
-  summary: Create a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Assignment with system-assigned managed identity
-    syntax:
-      content: >-
-        az blueprint assignment create --subscription MySubscription --name \
-
-        MyBlueprintAssignment --location eastus --identity-type SystemAssigned \
-
-        --description "Enforce pre-defined MyBlueprint to this subscription." \
-
-        --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup/provid \
-
-        ers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
-
-        --resource-group-value artifact_name=rg-art-1 name=rg1 location=westus \
-
-        --resource-group-value artifact_name=rg-art-2 name=rg2 location=eastus \
-
-        --parameters "path/to/parameter/file" \
-  - summary: Assignment with user-assigned managed identity
-    syntax:
-      content: >-
-        az blueprint assignment create --subscription MySubscription --name \
-
-        MyBlueprintAssignment --location eastus --identity-type UserAssigned \
-
-        --user-assigned-identities identity-id \
-
-        --description "Enforce pre-defined MyBlueprint to this subscription." \
-
-        --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup \
-
-        /providers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
-
-        --resource-group-value artifact_name=rg-art-1 name=rg1 location=eastus \
-
-        --parameters "path/to/parameter/file" \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --blueprint-version
-    summary: Resource ID of the published version of a blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --display-name
-    summary: One-liner string explain this resource.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --locks-excluded-principals
-    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
-    description: ''
-  - name: --locks-mode
-    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
-    summary: Lock mode.
-    description: ''
-  - name: --parameters -p
-    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-value
-    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
-    description: ''
-  - name: --identity-type
-    defaultValue: SystemAssigned
-    parameterValueGroup: None, SystemAssigned, UserAssigned
-    summary: Type of the managed identity.
-    description: ''
-  - name: --principal-id
-    summary: Azure Active Directory principal ID associated with this Identity.
-    description: ''
-  - name: --tenant-id
-    summary: ID of the Azure Active Directory.
-    description: ''
-  - name: --user-assigned-identities
-    summary: The list of user-assigned managed identities associated with the resource. Key is the Azure resource Id of the managed identity.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_delete
-  name: az blueprint assignment delete
-  summary: Delete a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an assignment
-    syntax:
-      content: >-
-        az blueprint assignment delete --subscription MySubscription \
-
-        --name MyBlueprintAssignment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_list
-  name: az blueprint assignment list
-  summary: List blueprint assignments within a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List assignments
-    syntax:
-      content: az blueprint assignment list --subscription MySubscription
-  parameters:
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_show
-  name: az blueprint assignment show
-  summary: Get a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an assignment
-    syntax:
-      content: >-
-        az blueprint assignment show --subscription MySubscription \
-
-        --name MyBlueprintAssignment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_update
-  name: az blueprint assignment update
-  summary: Update a blueprint assignment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --blueprint-version
-    summary: Resource ID of the published version of a blueprint definition.
-    description: ''
-  - name: --description
-    summary: Multi-line explain this resource.
-    description: ''
-  - name: --display-name
-    summary: One-liner string explain this resource.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --locks-excluded-principals
-    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
-    description: ''
-  - name: --locks-mode
-    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
-    summary: Lock mode.
-    description: ''
-  - name: --parameters -p
-    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
-    description: ''
-  - name: --resource-group-value
-    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
-    description: ''
-  - name: --identity-type
-    defaultValue: SystemAssigned
-    parameterValueGroup: None, SystemAssigned, UserAssigned
-    summary: Type of the managed identity.
-    description: ''
-  - name: --principal-id
-    summary: Azure Active Directory principal ID associated with this Identity.
-    description: ''
-  - name: --tenant-id
-    summary: ID of the Azure Active Directory.
-    description: ''
-  - name: --user-assigned-identities
-    summary: The list of user-assigned managed identities associated with the resource. Key is the Azure resource Id of the managed identity.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_wait
-  name: az blueprint assignment wait
-  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Blueprint Assignment is successfully provisioned.
-    syntax:
-      content: az blueprint assignment wait --subscription MySubscription \ --name MyBlueprintAssignment --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-- uid: ext_blueprint_az_blueprint_assignment_who
-  name: az blueprint assignment who
-  summary: Get Blueprint Servie Principal Name objectId.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get SPN objectId
-    syntax:
-      content: >-
-        az blueprint assignment who --subscription MySubscription \
-
-        --name MyBlueprintAssignment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the blueprint assignment.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_assignment_create
-  name: az blueprint assignment create
-  summary: Create a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_delete
-  name: az blueprint assignment delete
-  summary: Delete a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_list
-  name: az blueprint assignment list
-  summary: List blueprint assignments within a subscription.
-- uid: ext_blueprint_az_blueprint_assignment_show
-  name: az blueprint assignment show
-  summary: Get a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_update
-  name: az blueprint assignment update
-  summary: Update a blueprint assignment.
-- uid: ext_blueprint_az_blueprint_assignment_wait
-  name: az blueprint assignment wait
-  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
-- uid: ext_blueprint_az_blueprint_assignment_who
-  name: az blueprint assignment who
-  summary: Get Blueprint Servie Principal Name objectId.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint assignment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml
deleted file mode 100644
index f7c844416a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/resource-group.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_resource_group
-  name: az blueprint resource-group
-  summary: Commands to manage blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_resource_group_add
-  - ext_blueprint_az_blueprint_resource_group_list
-  - ext_blueprint_az_blueprint_resource_group_remove
-  - ext_blueprint_az_blueprint_resource_group_show
-  - ext_blueprint_az_blueprint_resource_group_update
-- uid: ext_blueprint_az_blueprint_resource_group_add
-  name: az blueprint resource-group add
-  summary: Add a resource group artifact to the blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group add \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: Display name of this resource group artifact.
-    description: ''
-  - name: --rg-location
-    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
-    description: ''
-  - name: --rg-name
-    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
-    description: ''
-  - name: --tags
-    summary: Tags to be assigned to this resource group.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_list
-  name: az blueprint resource-group list
-  summary: List blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List resource group artifacts
-    syntax:
-      content: >-
-        az blueprint resource-group list \
-
-        --blueprint-name MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_remove
-  name: az blueprint resource-group remove
-  summary: Remove a blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group remove \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_show
-  name: az blueprint resource-group show
-  summary: Show blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group show \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_resource_group_update
-  name: az blueprint resource-group update
-  summary: Update blueprint resource group artifact.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a resource group artifact
-    syntax:
-      content: >-
-        az blueprint resource-group update \
-
-        --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt --display-name "My Resource Group"
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: A unique name of this resource group artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --depends-on
-    summary: Artifacts which need to be deployed before the specified artifact.
-    description: ''
-  - name: --description
-    summary: Description of the blueprint artifact.
-    description: ''
-  - name: --display-name
-    summary: Display name of this resource group artifact.
-    description: ''
-  - name: --rg-location
-    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
-    description: ''
-  - name: --rg-name
-    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
-    description: ''
-  - name: --tags
-    summary: Tags to be assigned to this resource group.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_resource_group_add
-  name: az blueprint resource-group add
-  summary: Add a resource group artifact to the blueprint.
-- uid: ext_blueprint_az_blueprint_resource_group_list
-  name: az blueprint resource-group list
-  summary: List blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_remove
-  name: az blueprint resource-group remove
-  summary: Remove a blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_show
-  name: az blueprint resource-group show
-  summary: Show blueprint resource group artifact.
-- uid: ext_blueprint_az_blueprint_resource_group_update
-  name: az blueprint resource-group update
-  summary: Update blueprint resource group artifact.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage blueprint resource group artifact.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version.yml
deleted file mode 100644
index dee6f1e1d6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_version
-  name: az blueprint version
-  summary: Commands to manage published blueprint versions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_version_delete
-  - ext_blueprint_az_blueprint_version_list
-  - ext_blueprint_az_blueprint_version_show
-- uid: ext_blueprint_az_blueprint_version_delete
-  name: az blueprint version delete
-  summary: Delete a published version of a blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a published subscription blueprint
-    syntax:
-      content: >-
-        az blueprint version delete --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2
-  - summary: Delete a published management group blueprint
-    syntax:
-      content: >-
-        az blueprint version delete --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_version_list
-  name: az blueprint version list
-  summary: List published versions of given blueprint definition.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List published blueprints of a management group
-    syntax:
-      content: >-
-        az blueprint version list --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint
-  - summary: List published blueprints of a subscription
-    syntax:
-      content: >-
-        az blueprint version list --subscription MySubscription \
-
-        --blueprint-name MyBlueprint
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_version_show
-  name: az blueprint version show
-  summary: Get a published version of a blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a published management group blueprint
-    syntax:
-      content: >-
-        az blueprint version show --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  - summary: Get a published subscription blueprint
-    syntax:
-      content: >-
-        az blueprint version show --subscription MySubscription \
-
-        --blueprint-name MyBlueprint --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_version_artifact
-  name: az blueprint version artifact
-  summary: Commands to manage published blueprint artifacts.
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_delete
-  name: az blueprint version delete
-  summary: Delete a published version of a blueprint.
-- uid: ext_blueprint_az_blueprint_version_list
-  name: az blueprint version list
-  summary: List published versions of given blueprint definition.
-- uid: ext_blueprint_az_blueprint_version_show
-  name: az blueprint version show
-  summary: Get a published version of a blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage published blueprint versions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml
deleted file mode 100644
index 747336d0b4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/blueprint/version/artifact.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az_blueprint_version_artifact
-  name: az blueprint version artifact
-  summary: Commands to manage published blueprint artifacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_blueprint_az_blueprint_version_artifact_list
-  - ext_blueprint_az_blueprint_version_artifact_show
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List artifacts of a published management group blueprint
-    syntax:
-      content: >-
-        az blueprint version artifact list --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2
-  - summary: List artifacts of a published subscription blueprint
-    syntax:
-      content: >-
-        az blueprint version artifact list --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2
-  parameters:
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a role assignment artifact
-    syntax:
-      content: >-
-        az blueprint version artifact show --subscription MySubscription \
-
-        --blueprint-name MyBlueprint \
-
-        --version v2 --artifact-name OwnerAssignment
-  - summary: Show a template artifact
-    syntax:
-      content: >-
-        az blueprint version artifact show --management-group MyManagementGroup --blueprint-name \
-
-        MyBlueprint --version v2 --artifact-name StorageTemplate
-  parameters:
-  - isRequired: true
-    name: --artifact-name
-    summary: Name of the blueprint artifact.
-    description: ''
-  - isRequired: true
-    name: --blueprint-name
-    summary: Name of the blueprint definition.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Version of the published blueprint definition.
-    description: ''
-  - name: --management-group -m
-    summary: Use management group for the scope of the blueprint.
-    description: ''
-  - name: --subscription -s
-    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
-    description: ''
-commands:
-- uid: ext_blueprint_az_blueprint_version_artifact_list
-  name: az blueprint version artifact list
-  summary: List artifacts for a version of a published blueprint.
-- uid: ext_blueprint_az_blueprint_version_artifact_show
-  name: az blueprint version artifact show
-  summary: Show an artifact for a published blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage published blueprint artifacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/index.yml
deleted file mode 100644
index a6e2656849..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/blueprint/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_blueprint_az
-  name: blueprint
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_blueprint_az_blueprint
-  name: az blueprint
-  summary: Commands to manage blueprint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace.yml
deleted file mode 100644
index 1b710ce4a2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace.yml
+++ /dev/null
@@ -1,314 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az_codespace
-  name: az codespace
-  summary: Manage Visual Studio Codespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_codespaces_az_codespace_create
-  - ext_codespaces_az_codespace_delete
-  - ext_codespaces_az_codespace_list
-  - ext_codespaces_az_codespace_open
-  - ext_codespaces_az_codespace_resume
-  - ext_codespaces_az_codespace_show
-  - ext_codespaces_az_codespace_suspend
-- uid: ext_codespaces_az_codespace_create
-  name: az codespace create
-  summary: Create a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Codespace with default settings
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace
-  - summary: Create a Codespace with a different instance type with custom suspend time
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux --suspend-after 5
-  - summary: Create a Codespace with a git repo
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace --git-repo https://github.com/github/repo --git-user-name "User Name" --git-user-email user@example.com
-  - summary: Create a Codespace with a dotfiles repo
-    syntax:
-      content: az codespace create -g my-rg --plan my-plan --name my-codespace --dotfiles-repo https://github.com/github/dotfiles --dotfiles-path ~/dotfiles --dotfiles-command bootstrap.sh
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --instance-type
-    defaultValue: standardLinux
-    summary: Instance Type.
-    description: ''
-    valueFrom: az codespace location show
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --suspend-after
-    defaultValue: "30"
-    parameterValueGroup: 120, 30, 5
-    summary: Automatically suspend the inactive Codespace after this many minutes.
-    description: ''
-  - name: --dotfiles-command
-    summary: The command we'll run after cloning your dotfiles repository.
-    description: ''
-  - name: --dotfiles-path
-    summary: Path where you expect your dotfiles repository to be cloned into the Codespace.
-    description: ''
-  - name: --dotfiles-repo
-    summary: 'Url of dotfiles git repository. More info: <a href="https://aka.ms/vso-docs/reference/personalizing">https://aka.ms/vso-docs/reference/personalizing</a>.'
-    description: ''
-  - name: --git-repo
-    summary: Url of the git repository we'll clone into the Codespace.
-    description: ''
-  - name: --git-user-email
-    summary: Git user email. For example, the output of `git config user.email`.
-    description: ''
-  - name: --git-user-name
-    summary: Git username. For example, the output of `git config user.name`.
-    description: ''
-- uid: ext_codespaces_az_codespace_delete
-  name: az codespace delete
-  summary: Delete a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Codespace given name
-    syntax:
-      content: az codespace delete -g my-rg --plan my-plan --name my-codespace
-  - summary: Delete a Codespace given id
-    syntax:
-      content: az codespace delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Delete a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace delete --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_codespaces_az_codespace_list
-  name: az codespace list
-  summary: List Codespaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Codespaces
-    syntax:
-      content: az codespace list -g my-rg --plan my-plan
-  - summary: List Codespaces given plan id and Codespace name
-    syntax:
-      content: az codespace list --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_open
-  name: az codespace open
-  summary: Open a Codespace in the web browser.
-  description: Confirmation is required if the Codespace is not in the 'Available' state as opening a Codespace will automatically resume it.
-  langs:
-  - azurecli
-  examples:
-  - summary: Open a Codespace given name
-    syntax:
-      content: az codespace open -g my-rg --plan my-plan --name my-codespace
-  - summary: Open a Codespace given id
-    syntax:
-      content: az codespace open -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Open a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace open --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_codespaces_az_codespace_resume
-  name: az codespace resume
-  summary: Resume a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Resume a Codespace given name
-    syntax:
-      content: az codespace resume -g my-rg --plan my-plan --name my-codespace
-  - summary: Resume a Codespace given id
-    syntax:
-      content: az codespace resume -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Resume a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace resume --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_show
-  name: az codespace show
-  summary: Show details of a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a Codespace given name
-    syntax:
-      content: az codespace show -g my-rg --plan my-plan --name my-codespace
-  - summary: Show details of a Codespace given id
-    syntax:
-      content: az codespace show -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Show details of a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace show --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_suspend
-  name: az codespace suspend
-  summary: Suspend a Codespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Suspend a Codespace given name
-    syntax:
-      content: az codespace suspend -g my-rg --plan my-plan --name my-codespace
-  - summary: Suspend a Codespace given id
-    syntax:
-      content: az codespace suspend -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
-  - summary: Suspend a Codespace given plan id and Codespace name
-    syntax:
-      content: az codespace suspend --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.VSOnline/plans/my-plan --name my-codespace
-  parameters:
-  - isRequired: true
-    name: --plan -p
-    summary: Name or ID of the Codespace plan.
-    description: ''
-  - name: --id
-    summary: Id of the Codespace.
-    description: ''
-  - name: --name -n
-    summary: Name of the Codespace.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_codespaces_az_codespace_create
-  name: az codespace create
-  summary: Create a Codespace.
-- uid: ext_codespaces_az_codespace_delete
-  name: az codespace delete
-  summary: Delete a Codespace.
-- uid: ext_codespaces_az_codespace_list
-  name: az codespace list
-  summary: List Codespaces.
-- uid: ext_codespaces_az_codespace_location
-  name: az codespace location
-  summary: Information on available regions.
-- uid: ext_codespaces_az_codespace_location_list
-  name: az codespace location list
-  summary: List available regions.
-- uid: ext_codespaces_az_codespace_location_show
-  name: az codespace location show
-  summary: Show details on a region.
-- uid: ext_codespaces_az_codespace_open
-  name: az codespace open
-  summary: Open a Codespace in the web browser.
-- uid: ext_codespaces_az_codespace_plan
-  name: az codespace plan
-  summary: Manage Codespace plans.
-- uid: ext_codespaces_az_codespace_plan_create
-  name: az codespace plan create
-  summary: Create a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_delete
-  name: az codespace plan delete
-  summary: Delete a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_list
-  name: az codespace plan list
-  summary: List Codespace plans.
-- uid: ext_codespaces_az_codespace_plan_show
-  name: az codespace plan show
-  summary: Show details of a Codespace plan.
-- uid: ext_codespaces_az_codespace_resume
-  name: az codespace resume
-  summary: Resume a Codespace.
-- uid: ext_codespaces_az_codespace_show
-  name: az codespace show
-  summary: Show details of a Codespace.
-- uid: ext_codespaces_az_codespace_suspend
-  name: az codespace suspend
-  summary: Suspend a Codespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Visual Studio Codespaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/location.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/location.yml
deleted file mode 100644
index 7541a804a1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/location.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az_codespace_location
-  name: az codespace location
-  summary: Information on available regions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_codespaces_az_codespace_location_list
-  - ext_codespaces_az_codespace_location_show
-- uid: ext_codespaces_az_codespace_location_list
-  name: az codespace location list
-  summary: List available regions.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_codespaces_az_codespace_location_show
-  name: az codespace location show
-  summary: Show details on a region.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the region.
-    description: ''
-commands:
-- uid: ext_codespaces_az_codespace_location_list
-  name: az codespace location list
-  summary: List available regions.
-- uid: ext_codespaces_az_codespace_location_show
-  name: az codespace location show
-  summary: Show details on a region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Information on available regions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/plan.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/plan.yml
deleted file mode 100644
index a092ec277f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/codespace/plan.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az_codespace_plan
-  name: az codespace plan
-  summary: Manage Codespace plans.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_codespaces_az_codespace_plan_create
-  - ext_codespaces_az_codespace_plan_delete
-  - ext_codespaces_az_codespace_plan_list
-  - ext_codespaces_az_codespace_plan_show
-- uid: ext_codespaces_az_codespace_plan_create
-  name: az codespace plan create
-  summary: Create a Codespace plan.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a plan in same region as resource group
-    syntax:
-      content: az codespace plan create -g my-rg -n my-plan
-  - summary: Create a plan in a specific region
-    syntax:
-      content: az codespace plan create -g my-rg -n my-plan -l westus2
-  - summary: Create a plan with tags
-    syntax:
-      content: az codespace plan create -g my-rg -n my-plan -l westus2 --tags tagname=tagvalue
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace plan.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_codespaces_az_codespace_plan_delete
-  name: az codespace plan delete
-  summary: Delete a Codespace plan.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a plan
-    syntax:
-      content: az codespace plan delete -g my-rg -n my-plan
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace plan.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_plan_list
-  name: az codespace plan list
-  summary: List Codespace plans.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List plans
-    syntax:
-      content: az codespace plan list
-  - summary: List plans in a given resource group
-    syntax:
-      content: az codespace plan list -g my-rg
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_codespaces_az_codespace_plan_show
-  name: az codespace plan show
-  summary: Show details of a Codespace plan.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details of a plan
-    syntax:
-      content: az codespace plan show -g my-rg -n my-plan
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Codespace plan.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_codespaces_az_codespace_plan_create
-  name: az codespace plan create
-  summary: Create a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_delete
-  name: az codespace plan delete
-  summary: Delete a Codespace plan.
-- uid: ext_codespaces_az_codespace_plan_list
-  name: az codespace plan list
-  summary: List Codespace plans.
-- uid: ext_codespaces_az_codespace_plan_show
-  name: az codespace plan show
-  summary: Show details of a Codespace plan.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Codespace plans.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/index.yml
deleted file mode 100644
index 5da055cc05..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/codespaces/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_codespaces_az
-  name: codespaces
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_codespaces_az_codespace
-  name: az codespace
-  summary: Manage Visual Studio Codespaces.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml
deleted file mode 100644
index 8b61979fb2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/connectedk8s.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedk8s_az_connectedk8s
-  name: az connectedk8s
-  summary: Commands to manage connected kubernetes clusters.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_connectedk8s_az_connectedk8s_connect
-  - ext_connectedk8s_az_connectedk8s_delete
-  - ext_connectedk8s_az_connectedk8s_list
-  - ext_connectedk8s_az_connectedk8s_show
-- uid: ext_connectedk8s_az_connectedk8s_connect
-  name: az connectedk8s connect
-  summary: Onboard a connected kubernetes cluster to azure.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Onboard a connected kubernetes cluster with default kube config and kube context.
-    syntax:
-      content: az connectedk8s connect -g resourceGroupName -n connectedClusterName
-  - summary: Onboard a connected kubernetes cluster by specifying the kubeconfig and kubecontext.
-    syntax:
-      content: az connectedk8s connect -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the connected cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --kube-config
-    summary: Path to the kube config file.
-    description: ''
-  - name: --kube-context
-    summary: Kubconfig context from current machine.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_connectedk8s_az_connectedk8s_delete
-  name: az connectedk8s delete
-  summary: Delete a connected kubernetes cluster along with connected cluster agents.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a connected kubernetes cluster and connected cluster agents with default kubeconfig and kubecontext.
-    syntax:
-      content: az connectedk8s delete -g resourceGroupName -n connectedClusterName
-  - summary: Delete a connected kubernetes cluster by specifying the kubeconfig and kubecontext for connected cluster agents deletion.
-    syntax:
-      content: az connectedk8s delete -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the connected cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --kube-config
-    summary: Path to the kube config file.
-    description: ''
-  - name: --kube-context
-    summary: Kubconfig context from current machine.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_connectedk8s_az_connectedk8s_list
-  name: az connectedk8s list
-  summary: List connected kubernetes clusters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all connected kubernetes clusters in a resource group.
-    syntax:
-      content: az connectedk8s list -g resourceGroupName --subscription subscriptionName
-  - summary: List all connected kubernetes clusters in a subscription.
-    syntax:
-      content: az connectedk8s list --subscription subscriptionName
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_connectedk8s_az_connectedk8s_show
-  name: az connectedk8s show
-  summary: Show details of a connected kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details for a connected kubernetes cluster
-    syntax:
-      content: az connectedk8s show -g resourceGroupName -n connectedClusterName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the connected cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_connectedk8s_az_connectedk8s_connect
-  name: az connectedk8s connect
-  summary: Onboard a connected kubernetes cluster to azure.
-- uid: ext_connectedk8s_az_connectedk8s_delete
-  name: az connectedk8s delete
-  summary: Delete a connected kubernetes cluster along with connected cluster agents.
-- uid: ext_connectedk8s_az_connectedk8s_list
-  name: az connectedk8s list
-  summary: List connected kubernetes clusters.
-- uid: ext_connectedk8s_az_connectedk8s_show
-  name: az connectedk8s show
-  summary: Show details of a connected kubernetes cluster.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage connected kubernetes clusters.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/index.yml
deleted file mode 100644
index c9e8b64582..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedk8s/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedk8s_az
-  name: connectedk8s
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_connectedk8s_az_connectedk8s
-  name: az connectedk8s
-  summary: Commands to manage connected kubernetes clusters.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml
deleted file mode 100644
index 7f80cc9c85..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/connectedmachine.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedmachine_az_connectedmachine
-  name: az connectedmachine
-  summary: Commands to manage Connected machines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_connectedmachine_az_connectedmachine_delete
-  - ext_connectedmachine_az_connectedmachine_list
-  - ext_connectedmachine_az_connectedmachine_show
-- uid: ext_connectedmachine_az_connectedmachine_delete
-  name: az connectedmachine delete
-  summary: Delete a Connected machine.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Connected machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_connectedmachine_az_connectedmachine_list
-  name: az connectedmachine list
-  summary: List Connected machines.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_connectedmachine_az_connectedmachine_show
-  name: az connectedmachine show
-  summary: Show details of a Connected machine.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Connected machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_connectedmachine_az_connectedmachine_delete
-  name: az connectedmachine delete
-  summary: Delete a Connected machine.
-- uid: ext_connectedmachine_az_connectedmachine_list
-  name: az connectedmachine list
-  summary: List Connected machines.
-- uid: ext_connectedmachine_az_connectedmachine_show
-  name: az connectedmachine show
-  summary: Show details of a Connected machine.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Connected machines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/index.yml
deleted file mode 100644
index 843cf79c5b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/connectedmachine/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_connectedmachine_az
-  name: connectedmachine
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_connectedmachine_az_connectedmachine
-  name: az connectedmachine
-  summary: Commands to manage Connected machines.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement.yml
deleted file mode 100644
index 300c45264d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_costmanagement_az_costmanagement
-  name: az costmanagement
-  summary: Manage cost and billing in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_costmanagement_az_costmanagement_query
-- uid: ext_costmanagement_az_costmanagement_query
-  name: az costmanagement query
-  summary: Query the usage data for scope defined.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Query in ManagementGroup scope
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
-  - summary: Query in ManagementGroupQuery scope via grouping
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
-  - summary: Query in a ResourceGroup scope
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
-  - summary: Query in a ResourceGroupQuery scope via grouping
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceType" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
-  - summary: Query in a Subscription scope
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  - summary: Query in a Subscription scope via grouping
-    syntax:
-      content: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes "/subscriptions/{subscriptionId}/" for subscription scope, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}" for resourceGroup scope, "/providers/Microsoft.Management/managementGroups/{managementGroupId}" for Management Group scope.
-    description: ''
-  - isRequired: true
-    name: --timeframe
-    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
-    summary: The time frame for pulling data for the query.If custom, then a specific time period must be provided.
-    description: ''
-  - isRequired: true
-    name: --type
-    parameterValueGroup: ActualCost, AmortizedCost, Usage
-    summary: The type of the query.
-    description: ''
-  - name: --dataset-aggregation
-    summary: 'Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the aliasfor the aggregated column. Query can have up to 2 aggregation clauses. Expected value: json-string/@json-file.'
-    description: ''
-  - name: --dataset-configuration
-    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
-    description: ''
-  - name: --dataset-filter
-    summary: 'Has filter expression to use in the query. Expected value: json-string/@json-file.'
-    description: ''
-  - name: --dataset-grouping
-    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses.Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
-    description: ''
-  - name: --time-period
-    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.'
-    description: ''
-commands:
-- uid: ext_costmanagement_az_costmanagement_export
-  name: az costmanagement export
-  summary: Costmanagement export.
-- uid: ext_costmanagement_az_costmanagement_export_create
-  name: az costmanagement export create
-  summary: The operation to create an export.
-- uid: ext_costmanagement_az_costmanagement_export_delete
-  name: az costmanagement export delete
-  summary: The operation to delete an export.
-- uid: ext_costmanagement_az_costmanagement_export_list
-  name: az costmanagement export list
-  summary: The operation to list all exports at the given scope.
-- uid: ext_costmanagement_az_costmanagement_export_show
-  name: az costmanagement export show
-  summary: The operation to get the execution history of an export for the defined scope by export name.
-- uid: ext_costmanagement_az_costmanagement_export_update
-  name: az costmanagement export update
-  summary: The operation to update an export.
-- uid: ext_costmanagement_az_costmanagement_query
-  name: az costmanagement query
-  summary: Query the usage data for scope defined.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage cost and billing in Azure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml
deleted file mode 100644
index 302bd3cdc1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/costmanagement/export.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_costmanagement_az_costmanagement_export
-  name: az costmanagement export
-  summary: Costmanagement export.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_costmanagement_az_costmanagement_export_create
-  - ext_costmanagement_az_costmanagement_export_delete
-  - ext_costmanagement_az_costmanagement_export_list
-  - ext_costmanagement_az_costmanagement_export_show
-  - ext_costmanagement_az_costmanagement_export_update
-- uid: ext_costmanagement_az_costmanagement_export_create
-  name: az costmanagement export create
-  summary: The operation to create an export.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an export for ManagementGroup scope
-    syntax:
-      content: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: Create an export for ResourceGroup scope
-    syntax:
-      content: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: Create an export for Subscription scope
-    syntax:
-      content: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-  - isRequired: true
-    name: --storage-account-id
-    summary: The ID of the storage account to store exports.
-    description: ''
-  - isRequired: true
-    name: --storage-container
-    summary: The storage container to deliver exports.
-    description: ''
-  - name: --storage-directory
-    summary: The root directory in the storage container to store exports.
-    description: ''
-  - isRequired: true
-    name: --timeframe
-    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
-    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
-    description: ''
-  - name: --dataset-configuration
-    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
-    description: ''
-  - name: --dataset-grouping
-    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
-    description: ''
-  - name: --time-period
-    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
-    description: ''
-  - name: --type
-    parameterValueGroup: ActualCost, AmortizedCost, Usage
-    summary: The type of the query.
-    description: ''
-  - name: --recurrence
-    parameterValueGroup: Annually, Daily, Monthly, Weekly
-    summary: The schedule recurrence.
-    description: ''
-  - name: --recurrence-period
-    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
-    description: ''
-  - name: --schedule-status
-    parameterValueGroup: Active, Inactive
-    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_delete
-  name: az costmanagement export delete
-  summary: The operation to delete an export.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: delete an export for a ManagementGroup scope
-    syntax:
-      content: az costmanagement export delete --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: delete an export for ResourceGroup scope
-    syntax:
-      content: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: delete an export for Subscription scope
-    syntax:
-      content: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_list
-  name: az costmanagement export list
-  summary: The operation to list all exports at the given scope.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: list exports in a ManagementGroup scope
-    syntax:
-      content: az costmanagement export list --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: list exports in a ResourceGroup scope
-    syntax:
-      content: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: list exports in a Subscription scope
-    syntax:
-      content: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_show
-  name: az costmanagement export show
-  summary: The operation to get the execution history of an export for the defined scope by export name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an export in a ManagementGroup scope
-    syntax:
-      content: az costmanagement export show --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: Show an export in a ResourceGroup scope
-    syntax:
-      content: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: Show an export in a Subscription scope
-    syntax:
-      content: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-- uid: ext_costmanagement_az_costmanagement_export_update
-  name: az costmanagement export update
-  summary: The operation to update an export.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an export in a ManagementGroup scope
-    syntax:
-      content: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
-  - summary: Update an export in a ResourceGroup scope
-    syntax:
-      content: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
-  - summary: Update an export in a Subscription scope
-    syntax:
-      content: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Export Name.
-    description: ''
-  - isRequired: true
-    name: --scope
-    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
-    description: ''
-  - name: --storage-account-id
-    summary: The ID of the storage account to store exports.
-    description: ''
-  - name: --storage-container
-    summary: The storage container to deliver exports.
-    description: ''
-  - name: --storage-directory
-    summary: The root directory in the storage container to store exports.
-    description: ''
-  - name: --dataset-configuration
-    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
-    description: ''
-  - name: --dataset-grouping
-    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
-    description: ''
-  - name: --time-period
-    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
-    description: ''
-  - name: --timeframe
-    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
-    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
-    description: ''
-  - name: --recurrence
-    parameterValueGroup: Annually, Daily, Monthly, Weekly
-    summary: The schedule recurrence.
-    description: ''
-  - name: --recurrence-period
-    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
-    description: ''
-  - name: --schedule-status
-    parameterValueGroup: Active, Inactive
-    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
-    description: ''
-commands:
-- uid: ext_costmanagement_az_costmanagement_export_create
-  name: az costmanagement export create
-  summary: The operation to create an export.
-- uid: ext_costmanagement_az_costmanagement_export_delete
-  name: az costmanagement export delete
-  summary: The operation to delete an export.
-- uid: ext_costmanagement_az_costmanagement_export_list
-  name: az costmanagement export list
-  summary: The operation to list all exports at the given scope.
-- uid: ext_costmanagement_az_costmanagement_export_show
-  name: az costmanagement export show
-  summary: The operation to get the execution history of an export for the defined scope by export name.
-- uid: ext_costmanagement_az_costmanagement_export_update
-  name: az costmanagement export update
-  summary: The operation to update an export.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Costmanagement export.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/index.yml
deleted file mode 100644
index 55d21a7c64..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/costmanagement/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_costmanagement_az
-  name: costmanagement
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_costmanagement_az_costmanagement
-  name: az costmanagement
-  summary: Manage cost and billing in Azure.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware.yml
deleted file mode 100644
index 2310a9a176..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware
-  name: az csvmware
-  summary: Manage Azure VMware Solution by CloudSimple.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_csvmware_az_csvmware_private_cloud
-  name: az csvmware private-cloud
-  summary: Manage VMware private clouds.
-- uid: ext_csvmware_az_csvmware_private_cloud_list
-  name: az csvmware private-cloud list
-  summary: List details of private clouds in a region.
-- uid: ext_csvmware_az_csvmware_private_cloud_show
-  name: az csvmware private-cloud show
-  summary: Get the details of a private cloud in a region.
-- uid: ext_csvmware_az_csvmware_resource_pool
-  name: az csvmware resource-pool
-  summary: Manage VMware resource pools.
-- uid: ext_csvmware_az_csvmware_resource_pool_list
-  name: az csvmware resource-pool list
-  summary: List details of resource pools in a private cloud.
-- uid: ext_csvmware_az_csvmware_resource_pool_show
-  name: az csvmware resource-pool show
-  summary: Get the details of a resource pool in a private cloud.
-- uid: ext_csvmware_az_csvmware_virtual_network
-  name: az csvmware virtual-network
-  summary: Manage virtual networks.
-- uid: ext_csvmware_az_csvmware_virtual_network_list
-  name: az csvmware virtual-network list
-  summary: List details of available virtual networks in a private cloud.
-- uid: ext_csvmware_az_csvmware_virtual_network_show
-  name: az csvmware virtual-network show
-  summary: Get the details of a virtual network in a private cloud.
-- uid: ext_csvmware_az_csvmware_vm
-  name: az csvmware vm
-  summary: Manage VMware virtual machines.
-- uid: ext_csvmware_az_csvmware_vm_create
-  name: az csvmware vm create
-  summary: Create a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_delete
-  name: az csvmware vm delete
-  summary: Delete a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk
-  name: az csvmware vm disk
-  summary: Manage VMware virtual machine's disks.
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-- uid: ext_csvmware_az_csvmware_vm_list
-  name: az csvmware vm list
-  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
-- uid: ext_csvmware_az_csvmware_vm_nic
-  name: az csvmware vm nic
-  summary: Manage VMware virtual machine's Network Interface Cards.
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-- uid: ext_csvmware_az_csvmware_vm_show
-  name: az csvmware vm show
-  summary: Get the details of a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_start
-  name: az csvmware vm start
-  summary: Start a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_stop
-  name: az csvmware vm stop
-  summary: Stop/Reboot/Suspend a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_update
-  name: az csvmware vm update
-  summary: Update the tags field of a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_template
-  name: az csvmware vm-template
-  summary: Manage VMware virtual machine templates.
-- uid: ext_csvmware_az_csvmware_vm_template_list
-  name: az csvmware vm-template list
-  summary: List details of VMware virtual machines templates in a private cloud.
-- uid: ext_csvmware_az_csvmware_vm_template_show
-  name: az csvmware vm-template show
-  summary: Get the details of a VMware virtual machines template in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure VMware Solution by CloudSimple.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml
deleted file mode 100644
index 57407adb56..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/private-cloud.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_private_cloud
-  name: az csvmware private-cloud
-  summary: Manage VMware private clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_private_cloud_list
-  - ext_csvmware_az_csvmware_private_cloud_show
-- uid: ext_csvmware_az_csvmware_private_cloud_list
-  name: az csvmware private-cloud list
-  summary: List details of private clouds in a region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of private clouds in East US.
-    syntax:
-      content: az csvmware private-cloud list --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-- uid: ext_csvmware_az_csvmware_private_cloud_show
-  name: az csvmware private-cloud show
-  summary: Get the details of a private cloud in a region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a private cloud which is in East US.
-    syntax:
-      content: az csvmware private-cloud show -n MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_private_cloud_list
-  name: az csvmware private-cloud list
-  summary: List details of private clouds in a region.
-- uid: ext_csvmware_az_csvmware_private_cloud_show
-  name: az csvmware private-cloud show
-  summary: Get the details of a private cloud in a region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware private clouds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml
deleted file mode 100644
index 7c43e2b2da..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/resource-pool.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_resource_pool
-  name: az csvmware resource-pool
-  summary: Manage VMware resource pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_resource_pool_list
-  - ext_csvmware_az_csvmware_resource_pool_show
-- uid: ext_csvmware_az_csvmware_resource_pool_list
-  name: az csvmware resource-pool list
-  summary: List details of resource pools in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of resource pools.
-    syntax:
-      content: az csvmware resource-pool list -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-- uid: ext_csvmware_az_csvmware_resource_pool_show
-  name: az csvmware resource-pool show
-  summary: Get the details of a resource pool in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a resource pool.
-    syntax:
-      content: az csvmware resource-pool show -n MyResourcePool -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_resource_pool_list
-  name: az csvmware resource-pool list
-  summary: List details of resource pools in a private cloud.
-- uid: ext_csvmware_az_csvmware_resource_pool_show
-  name: az csvmware resource-pool show
-  summary: Get the details of a resource pool in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware resource pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml
deleted file mode 100644
index 842b1d24f9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/virtual-network.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_virtual_network
-  name: az csvmware virtual-network
-  summary: Manage virtual networks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_virtual_network_list
-  - ext_csvmware_az_csvmware_virtual_network_show
-- uid: ext_csvmware_az_csvmware_virtual_network_list
-  name: az csvmware virtual-network list
-  summary: List details of available virtual networks in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of virtual networks.
-    syntax:
-      content: az csvmware virtual-network list -p MyPrivateCloud -r MyResourcePool --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-pool -r
-    summary: ID of the resource pool used to derive vSphere cluster which contains virtual networks. You can also pass the basename of the ID.
-    description: ''
-- uid: ext_csvmware_az_csvmware_virtual_network_show
-  name: az csvmware virtual-network show
-  summary: Get the details of a virtual network in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a virtual network.
-    syntax:
-      content: az csvmware virtual-network show -n MyVirtualNetwork -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ID of the virtual network (vsphereId). You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_virtual_network_list
-  name: az csvmware virtual-network list
-  summary: List details of available virtual networks in a private cloud.
-- uid: ext_csvmware_az_csvmware_virtual_network_show
-  name: az csvmware virtual-network show
-  summary: Get the details of a virtual network in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual networks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml
deleted file mode 100644
index 88ca124707..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm-template.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm_template
-  name: az csvmware vm-template
-  summary: Manage VMware virtual machine templates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_template_list
-  - ext_csvmware_az_csvmware_vm_template_show
-- uid: ext_csvmware_az_csvmware_vm_template_list
-  name: az csvmware vm-template list
-  summary: List details of VMware virtual machines templates in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of VM templates.
-    syntax:
-      content: az csvmware vm-template list -p MyPrivateCloud -r MyResourcePool --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-pool -r
-    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_template_show
-  name: az csvmware vm-template show
-  summary: Get the details of a VMware virtual machines template in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a VM template.
-    syntax:
-      content: az csvmware vm-template show  -n MyVmTemplate -p MyPrivateCloud --location eastus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Region in which the private cloud is present.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ID of the vSphere virtual machine template. You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_template_list
-  name: az csvmware vm-template list
-  summary: List details of VMware virtual machines templates in a private cloud.
-- uid: ext_csvmware_az_csvmware_vm_template_show
-  name: az csvmware vm-template show
-  summary: Get the details of a VMware virtual machines template in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machine templates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm.yml
deleted file mode 100644
index 6f7f9b23a6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm.yml
+++ /dev/null
@@ -1,309 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm
-  name: az csvmware vm
-  summary: Manage VMware virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_create
-  - ext_csvmware_az_csvmware_vm_delete
-  - ext_csvmware_az_csvmware_vm_list
-  - ext_csvmware_az_csvmware_vm_show
-  - ext_csvmware_az_csvmware_vm_start
-  - ext_csvmware_az_csvmware_vm_stop
-  - ext_csvmware_az_csvmware_vm_update
-- uid: ext_csvmware_az_csvmware_vm_create
-  name: az csvmware vm create
-  summary: Create a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creating a VM with default parameters from the vm template.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate
-  - summary: Creating a VM and adding an extra nic to the VM with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot. The name entered in the nic is for identification purposes only, to see if such a nic name exists in the vm template, else a nic is created and a new name is assigned. Lets say the vm template contains a nic with name "Network adapter 1".
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
-  - summary: Customizing specific properties of a VM. Changing the number of cores to 2 and adapter of "Network adapter 1" nic to E1000E, from that specified in the template. All other properties would be defaulted from the template.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --cores 2 --nic name="Network adapter 1" adapter=E1000E
-  - summary: Customizing specific properties of a VM. Changing the adapter of "Network adapter 1" nic to E1000E, from that specified in the template, and also adding another nic with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name="Network adapter 1" adapter=E1000E --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
-  - summary: Creating a VM and adding an extra disk to the VM with SCSI controller 0, persistent mode, and 41943040 KB size. The name entered in the disk is for identification purposes only, to see if such a disk name exists in the vm template, else a disk is created and a new name is assigned. Lets say the vm template contains a disk with name "Hard disk 1".
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
-  - summary: Customizing specific properties of a VM. Changing the size of "Hard disk 1" disk to 21943040 KB, from that specified in the template, and also adding another disk with SCSI controller 0, persistent mode, and 41943040 KB size.
-    syntax:
-      content: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name="Hard disk 1" size=21943040 --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -p
-    summary: Name or ID of the CloudSimple private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-pool -r
-    summary: ID of the VMware resource pool for this virtual machine in your CloudSimple Private Cloud. You can also pass the basename of the ID.
-    description: ''
-  - isRequired: true
-    name: --template
-    summary: ID of the vSphere template from which this virtual machine will be created. You can also pass the basename of the ID.
-    description: ''
-  - name: --cores
-    summary: The number of CPU cores required. The default is taken from the vSphere VM template specified.
-    description: ''
-  - name: --expose-to-guest-vm
-    parameterValueGroup: false, true
-    summary: Will expose full CPU virtualization to the guest operating system. The default is taken from the vSphere VM template specified.
-    description: ''
-  - name: --location -l
-    summary: Region in which the private cloud is present. If default location is not configured, will default to the resource group's location.
-    description: ''
-  - name: --ram
-    summary: The amount of memory in MB. The default is taken from the vSphere VM template specified.
-    description: ''
-  - name: --nic
-    summary: Add or modify NICs.
-    description: >-
-      By default, the nics will be added according to the vSphere VM template.
-
-      You can add more nics, or modify some properties of a nic specified in the VM template.
-
-      Multiple nics can be specified by using more than one `--nic` argument.
-
-      If a nic name already exists in the VM template, that nic would be modified according to the user input.
-
-      If a nic name does not exist in the VM template, a new nic would be created and a new name will be assigned to it.
-
-      Usage:   --nic name=MyNicName virtual-network=MyNetwork adapter=MyAdapter power-on-boot=True/False.
-  - name: --disk
-    summary: Add or modify disks.
-    description: >-
-      By default, the disks will be added according to the vSphere VM template.
-
-      You can add more disks, or modify some properties of a disk specified in the VM template.
-
-      Multiple disks can be specified by using more than one `--disk` argument.
-
-      If a disk name already exists in the VM template, that disk would be modified according to the user input.
-
-      If a disk name does not exist in the VM template, a new disk would be created and a new name will be assigned to it.
-
-      Usage:   --disk name=MyDiskName controller=SCSIControllerID mode=IndependenceMode size=DiskSizeInKB.
-- uid: ext_csvmware_az_csvmware_vm_delete
-  name: az csvmware vm delete
-  summary: Delete a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a VMware VM.
-    syntax:
-      content: az csvmware vm delete -n MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_list
-  name: az csvmware vm list
-  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of VMware VMs in the current subscription.
-    syntax:
-      content: az csvmware vm list
-  - summary: List details of VMware VMs in a particular resource group.
-    syntax:
-      content: az csvmware vm list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_show
-  name: az csvmware vm show
-  summary: Get the details of a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a VMware VM.
-    syntax:
-      content: az csvmware vm show -n MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_start
-  name: az csvmware vm start
-  summary: Start a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Start a VMware VM.
-    syntax:
-      content: az csvmware vm start -n MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_stop
-  name: az csvmware vm stop
-  summary: Stop/Reboot/Suspend a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Power off a VMware VM.
-    syntax:
-      content: az csvmware vm stop -n MyVm -g MyResourceGroup --mode poweroff
-  - summary: Restart a VMware VM.
-    syntax:
-      content: az csvmware vm stop -n MyVm -g MyResourceGroup --mode reboot
-  parameters:
-  - isRequired: true
-    name: --mode
-    parameterValueGroup: poweroff, reboot, shutdown, suspend
-    summary: Stop mode.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_update
-  name: az csvmware vm update
-  summary: Update the tags field of a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add or update a tag.
-    syntax:
-      content: az csvmware vm update -n MyVm -g MyResourceGroup --set tags.tagName=tagValue
-  - summary: Remove a tag.
-    syntax:
-      content: az csvmware vm update -n MyVm -g MyResourceGroup --remove tags.tagName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_create
-  name: az csvmware vm create
-  summary: Create a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_delete
-  name: az csvmware vm delete
-  summary: Delete a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk
-  name: az csvmware vm disk
-  summary: Manage VMware virtual machine's disks.
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-- uid: ext_csvmware_az_csvmware_vm_list
-  name: az csvmware vm list
-  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
-- uid: ext_csvmware_az_csvmware_vm_nic
-  name: az csvmware vm nic
-  summary: Manage VMware virtual machine's Network Interface Cards.
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-- uid: ext_csvmware_az_csvmware_vm_show
-  name: az csvmware vm show
-  summary: Get the details of a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_start
-  name: az csvmware vm start
-  summary: Start a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_stop
-  name: az csvmware vm stop
-  summary: Stop/Reboot/Suspend a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_update
-  name: az csvmware vm update
-  summary: Update the tags field of a VMware virtual machine.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml
deleted file mode 100644
index c4158f3866..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/disk.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm_disk
-  name: az csvmware vm disk
-  summary: Manage VMware virtual machine's disks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_disk_add
-  - ext_csvmware_az_csvmware_vm_disk_delete
-  - ext_csvmware_az_csvmware_vm_disk_list
-  - ext_csvmware_az_csvmware_vm_disk_show
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a disk with default parameters in a VM.
-    syntax:
-      content: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup
-  - summary: Add a disk with SATA controller 0 and 64 GB memory in a VM.
-    syntax:
-      content: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup --controller 15000 --size 67108864
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - name: --controller
-    defaultValue: "1000"
-    summary: Id of the controller. Input 1000 for SCSI controller 0, and 15000 for SATA controller 0.
-    description: ''
-  - name: --mode
-    defaultValue: persistent
-    parameterValueGroup: independent_nonpersistent, independent_persistent, persistent
-    summary: The disk independence mode.
-    description: ''
-  - name: --size
-    defaultValue: "16777216"
-    summary: The amount of disk size in KB.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete two disks from a VM.
-    syntax:
-      content: az csvmware vm disk delete --vm-name MyVm -g MyResourceGroup --disks "My Disk Name 1" "My Disk Name 2"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --disks
-    summary: Names of disks.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of disks in a VM.
-    syntax:
-      content: az csvmware vm disk list --vm-name MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a disk in a VM.
-    syntax:
-      content: az csvmware vm disk show --vm-name MyVm -g MyResourceGroup -n "My Disk Name"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the disk.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_disk_add
-  name: az csvmware vm disk add
-  summary: Add disk to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_delete
-  name: az csvmware vm disk delete
-  summary: Delete disks from a VM.
-- uid: ext_csvmware_az_csvmware_vm_disk_list
-  name: az csvmware vm disk list
-  summary: List details of disks available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_disk_show
-  name: az csvmware vm disk show
-  summary: Get the details of a VMware virtual machine's disk.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machine's disks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml
deleted file mode 100644
index d09a6a1d36..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/csvmware/vm/nic.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az_csvmware_vm_nic
-  name: az csvmware vm nic
-  summary: Manage VMware virtual machine's Network Interface Cards.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_csvmware_az_csvmware_vm_nic_add
-  - ext_csvmware_az_csvmware_vm_nic_delete
-  - ext_csvmware_az_csvmware_vm_nic_list
-  - ext_csvmware_az_csvmware_vm_nic_show
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a NIC with default parameters in a VM.
-    syntax:
-      content: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork
-  - summary: Add a NIC with E1000E adapter that powers on boot in a VM.
-    syntax:
-      content: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork --adapter E1000E --power-on-boot true
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --virtual-network
-    summary: ID of the virtual network. You can also pass the basename of the ID.
-    description: ''
-  - name: --adapter
-    defaultValue: VMXNET3
-    parameterValueGroup: E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3
-    summary: The adapter for the NIC.
-    description: ''
-  - name: --power-on-boot
-    parameterValueGroup: false, true
-    summary: Will power on the NIC at boot time.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete two NICs from a VM.
-    syntax:
-      content: az csvmware vm nic delete --vm-name MyVm -g MyResourceGroup --nics "My NIC Name 1" "My NIC Name 2"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --nics
-    summary: Names of NICs.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List details of NICs in a VM.
-    syntax:
-      content: az csvmware vm nic list --vm-name MyVm -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a NIC in a VM.
-    syntax:
-      content: az csvmware vm nic show --vm-name MyVm -g MyResourceGroup -n "My NIC Name"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vm-name
-    summary: Name of the virtual machine.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the NIC.
-    description: ''
-commands:
-- uid: ext_csvmware_az_csvmware_vm_nic_add
-  name: az csvmware vm nic add
-  summary: Add NIC to a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_delete
-  name: az csvmware vm nic delete
-  summary: Delete NICs from a VM.
-- uid: ext_csvmware_az_csvmware_vm_nic_list
-  name: az csvmware vm nic list
-  summary: List details of NICs available on a VMware virtual machine.
-- uid: ext_csvmware_az_csvmware_vm_nic_show
-  name: az csvmware vm nic show
-  summary: Get the details of a VMware virtual machine's NIC.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VMware virtual machine's Network Interface Cards.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/index.yml
deleted file mode 100644
index 3140a5faa1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/csvmware/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_csvmware_az
-  name: csvmware
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_csvmware_az_csvmware
-  name: az csvmware
-  summary: Manage Azure VMware Solution by CloudSimple.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers.yml
deleted file mode 100644
index 3ea9b29909..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_custom-providers_az_custom_providers
-  name: az custom-providers
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_custom-providers_az_custom_providers_resource_provider
-  name: az custom-providers resource-provider
-  summary: Commands to manage custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_create
-  name: az custom-providers resource-provider create
-  summary: Create or update the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-  name: az custom-providers resource-provider delete
-  summary: Delete the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_list
-  name: az custom-providers resource-provider list
-  summary: Get all the custom resource providers within a resource group or in the current subscription.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_show
-  name: az custom-providers resource-provider show
-  summary: Get the properties for the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_update
-  name: az custom-providers resource-provider update
-  summary: Update the custom resource provider. Only tags can be updated.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml
deleted file mode 100644
index 762d5fc289..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/custom-providers/resource-provider.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_custom-providers_az_custom_providers_resource_provider
-  name: az custom-providers resource-provider
-  summary: Commands to manage custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_custom-providers_az_custom_providers_resource_provider_create
-  - ext_custom-providers_az_custom_providers_resource_provider_delete
-  - ext_custom-providers_az_custom_providers_resource_provider_list
-  - ext_custom-providers_az_custom_providers_resource_provider_show
-  - ext_custom-providers_az_custom_providers_resource_provider_update
-- uid: ext_custom-providers_az_custom_providers_resource_provider_create
-  name: az custom-providers resource-provider create
-  summary: Create or update the custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a custom resource provider.
-    syntax:
-      content: >-
-        az custom-providers resource-provider create -n MyRP -g MyRG \
-
-        --action name=ping endpoint=https://test.azurewebsites.net/api routing_type=Proxy \
-
-        --resource-type name=users endpoint=https://test.azurewebsites.net/api routing_type="Proxy, Cache" \
-
-        --validation validation_type=swagger specification=https://raw.githubusercontent.com/test.json
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --action -a
-    summary: Add an action to the custom resource provider.
-    description: >-
-      Usage: --action name=ping endpoint="<a href="https://test.azurewebsites.net/api">https://test.azurewebsites.net/api</a>/{requestPath}" routing_type=Proxy
-
-
-      name: Required. The name of the action.
-
-      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
-
-      routing_type: The routing types that are supported for action requests. Possible values include: 'Proxy'.
-
-
-      Multiple actions can be specified by using more than one `--action` argument.
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-type -r
-    summary: Add a custom resource type to the custom resource provider.
-    description: >-
-      Usage: --resource-type name=user endpoint="<a href="https://test.azurewebsites.net/api">https://test.azurewebsites.net/api</a>/{requestPath}" routing_type="Proxy, Cache"
-
-
-      name: Required. The name of the resource type.
-
-      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
-
-      routing_type: The routing types that are supported for resource requests. Possible values include: 'Proxy', 'Proxy,Cache'.
-
-
-      Multiple resource types can be specified by using more than one `--resource-type` argument.
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validation -v
-    summary: Add a validation to the custom resource provider.
-    description: >-
-      Usage: --validation specification="<a href="https://raw.githubusercontent.com/">https://raw.githubusercontent.com/</a>" validation_type="Swagger"
-
-
-      specification: A link to the validation specification.vThe specification must be hosted on raw.githubusercontent.com.
-
-      validation_type: The type of validation to run against a matching request. Possible values include: 'Swagger'.
-
-
-      Multiple validations can be specified by using more than one `--validation` argument.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-  name: az custom-providers resource-provider delete
-  summary: Delete the custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a custom resource provider.
-    syntax:
-      content: az custom-providers resource-provider delete -g MyRG -n MyRP
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_custom-providers_az_custom_providers_resource_provider_list
-  name: az custom-providers resource-provider list
-  summary: Get all the custom resource providers within a resource group or in the current subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all custom resource providers in the resource group.
-    syntax:
-      content: az custom-providers resource-provider list -g MyRG
-  - summary: List all custom resource providers in the current subscription.
-    syntax:
-      content: az custom-providers resource-provider list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_custom-providers_az_custom_providers_resource_provider_show
-  name: az custom-providers resource-provider show
-  summary: Get the properties for the custom resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a custom resource provider.
-    syntax:
-      content: az custom-providers resource-provider show -g MyRG -n MyRP
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_custom-providers_az_custom_providers_resource_provider_update
-  name: az custom-providers resource-provider update
-  summary: Update the custom resource provider. Only tags can be updated.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tags for a custom resource provider.
-    syntax:
-      content: az custom-providers resource-provider update -g MyRG -n MyRP --tags a=b
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the resource provider.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_custom-providers_az_custom_providers_resource_provider_create
-  name: az custom-providers resource-provider create
-  summary: Create or update the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-  name: az custom-providers resource-provider delete
-  summary: Delete the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_list
-  name: az custom-providers resource-provider list
-  summary: Get all the custom resource providers within a resource group or in the current subscription.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_show
-  name: az custom-providers resource-provider show
-  summary: Get the properties for the custom resource provider.
-- uid: ext_custom-providers_az_custom_providers_resource_provider_update
-  name: az custom-providers resource-provider update
-  summary: Update the custom resource provider. Only tags can be updated.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage custom resource provider.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/index.yml
deleted file mode 100644
index c5c981b49e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/custom-providers/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_custom-providers_az
-  name: custom-providers
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_custom-providers_az_custom_providers
-  name: az custom-providers
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox.yml
deleted file mode 100644
index 7c129ba17f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databox_az_databox
-  name: az databox
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databox_az_databox_job
-  name: az databox job
-  summary: Commands to manage databox job.
-- uid: ext_databox_az_databox_job_cancel
-  name: az databox job cancel
-  summary: Cancel a job.
-- uid: ext_databox_az_databox_job_create
-  name: az databox job create
-  summary: Create a new job with the specified parameters.
-- uid: ext_databox_az_databox_job_delete
-  name: az databox job delete
-  summary: Delete a job.
-- uid: ext_databox_az_databox_job_list
-  name: az databox job list
-  summary: List all the jobs available under the given resource group or the given subscription.
-- uid: ext_databox_az_databox_job_list_credentials
-  name: az databox job list-credentials
-  summary: List the unencrypted secrets related to the job.
-- uid: ext_databox_az_databox_job_show
-  name: az databox job show
-  summary: Get information about the specified job.
-- uid: ext_databox_az_databox_job_update
-  name: az databox job update
-  summary: Update an existing job with the specified parameters.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox/job.yml
deleted file mode 100644
index 3a84a5f597..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/databox/databox/job.yml
+++ /dev/null
@@ -1,337 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databox_az_databox_job
-  name: az databox job
-  summary: Commands to manage databox job.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_databox_az_databox_job_cancel
-  - ext_databox_az_databox_job_create
-  - ext_databox_az_databox_job_delete
-  - ext_databox_az_databox_job_list
-  - ext_databox_az_databox_job_list_credentials
-  - ext_databox_az_databox_job_show
-  - ext_databox_az_databox_job_update
-- uid: ext_databox_az_databox_job_cancel
-  name: az databox job cancel
-  summary: Cancel a job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel the job "SdkJob3971" under resource group "SdkRg4981".
-    syntax:
-      content: az databox job cancel --resource-group "SdkRg4981" --name "SdkJob3971" --reason "CancelTest"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --reason
-    summary: Reason for cancellation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_databox_az_databox_job_create
-  name: az databox job create
-  summary: Create a new job with the specified parameters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a databox job to use both storage account and managed disk as data destination.
-    syntax:
-      content: >-
-        az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
-
-        "westus" --sku "DataBox" --contact-name "Public SDK Test" \
-
-        --phone "1234567890" --email-list "testing@microsoft.com" \
-
-        --street-address1 "16 TOWNSEND ST" --street-address2 "Unit 1" --city "San Francisco"  \
-
-        --state-or-province "CA" --country "US" --postal-code "94107" --company-name "Microsoft" \
-
-        --storage-account sa1 sa2 --staging-storage-account sa \
-
-        --resource-group-for-managed-disk /subscriptions/sub/resourceGroups/rg
-  - summary: Create a databoxdisk job to use storage account as data destination.
-    syntax:
-      content: >-
-        az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
-
-        "westus" --sku "DataBoxDisk" --expected-data-size 1 --contact-name "Public SDK Test" \
-
-        --phone "1234567890" --email-list "testing@microsoft.com" --street-address1 "16 TOWNSEND ST" \
-
-        --street-address2 "Unit 1" --city "San Francisco" --state-or-province "CA" --country "US" \
-
-        --postal-code "94107" --company-name "Microsoft" --storage-account sa1
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: DataBox, DataBoxDisk, DataBoxHeavy
-    summary: The sku type of DataBox.
-    description: ''
-  - name: --expected-data-size
-    summary: The expected size of the data which needs to be transferred in this job, in terabytes.The maximum usable capacity is up to 35 TB. This is only needed when sku is DataBoxDisk.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --contact-name
-    summary: Contact name of the person.
-    description: ''
-  - isRequired: true
-    name: --email-list
-    summary: Space-separated list of Email addresses to be notified about job progress.
-    description: ''
-  - isRequired: true
-    name: --phone
-    summary: Phone number of the contact person.
-    description: ''
-  - name: --mobile
-    summary: Mobile number of the contact person.
-    description: ''
-  - name: --resource-group-for-managed-disk
-    summary: The name or ID of the destination resource group where the Compute disks should be created.
-    description: ''
-  - name: --staging-storage-account
-    summary: The name or ID of the destination storage account that can be used to copy the vhd for staging.
-    description: ''
-  - isRequired: true
-    name: --city
-    summary: Name of the City.
-    description: ''
-  - isRequired: true
-    name: --country
-    summary: 'Name of the Country. Ex: US.'
-    description: ''
-  - isRequired: true
-    name: --postal-code
-    summary: Postal code.
-    description: ''
-  - isRequired: true
-    name: --state-or-province
-    summary: Name of the State or Province.
-    description: ''
-  - isRequired: true
-    name: --street-address1
-    summary: Street Address line 1.
-    description: ''
-  - name: --company-name
-    summary: Name of the company.
-    description: ''
-  - name: --street-address2
-    summary: Street Address line 2.
-    description: ''
-  - name: --street-address3
-    summary: Street Address line 3.
-    description: ''
-  - name: --storage-accounts
-    summary: Space-separated list of the destination storage account. It can be the name or resource ID of storage account.
-    description: ''
-- uid: ext_databox_az_databox_job_delete
-  name: az databox job delete
-  summary: Delete a job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the job "SdkJob3971" in resource group "SdkRg4981".
-    syntax:
-      content: az databox job delete --resource-group "SdkRg4981" --name "SdkJob3971"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_databox_az_databox_job_list
-  name: az databox job list
-  summary: List all the jobs available under the given resource group or the given subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all the jobs available under the current subscription.
-    syntax:
-      content: az databox job list
-  - summary: List all the jobs available under the resource group "SdkRg4981".
-    syntax:
-      content: az databox job list --resource-group "SdkRg4981"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databox_az_databox_job_list_credentials
-  name: az databox job list-credentials
-  summary: List the unencrypted secrets related to the job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the unencrypted secrets related to the job "TJ-636646322037905056".
-    syntax:
-      content: az databox job list-credentials --resource-group "bvttoolrg6" --name "TJ-636646322037905056"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databox_az_databox_job_show
-  name: az databox job show
-  summary: Get information about the specified job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the information about the job "SdkJob3971".
-    syntax:
-      content: az databox job show --resource-group "SdkRg4981" --name "SdkJob3971"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databox_az_databox_job_update
-  name: az databox job update
-  summary: Update an existing job with the specified parameters.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the job "SdkJob3971" with the specified parameters.
-    syntax:
-      content: >-
-        az databox job update --resource-group "SdkRg4981" --name "SdkJob3971" \
-
-        --contact-name "Update Job" --phone "1234567890" \
-
-        --email-list "testing@microsoft.com" \
-
-        --street-address1 "16 TOWNSEND ST" \
-
-        --city "San Francisco" --state-or-province "CA" \
-
-        --country "US" --postal-code "94107" \
-
-        --company-name "Microsoft" \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --contact-name
-    summary: Contact name of the person.
-    description: ''
-  - name: --email-list
-    summary: List of Email addresses to be notified about job progress.
-    description: ''
-  - name: --mobile
-    summary: Mobile number of the contact person.
-    description: ''
-  - name: --phone
-    summary: Phone number of the contact person.
-    description: ''
-  - name: --city
-    summary: Name of the City.
-    description: ''
-  - name: --company-name
-    summary: Name of the company.
-    description: ''
-  - name: --country
-    summary: 'Name of the Country. Ex: US.'
-    description: ''
-  - name: --postal-code
-    summary: Postal code.
-    description: ''
-  - name: --state-or-province
-    summary: Name of the State or Province.
-    description: ''
-  - name: --street-address1
-    summary: Street Address line 1.
-    description: ''
-  - name: --street-address2
-    summary: Street Address line 2.
-    description: ''
-  - name: --street-address3
-    summary: Street Address line 3.
-    description: ''
-commands:
-- uid: ext_databox_az_databox_job_cancel
-  name: az databox job cancel
-  summary: Cancel a job.
-- uid: ext_databox_az_databox_job_create
-  name: az databox job create
-  summary: Create a new job with the specified parameters.
-- uid: ext_databox_az_databox_job_delete
-  name: az databox job delete
-  summary: Delete a job.
-- uid: ext_databox_az_databox_job_list
-  name: az databox job list
-  summary: List all the jobs available under the given resource group or the given subscription.
-- uid: ext_databox_az_databox_job_list_credentials
-  name: az databox job list-credentials
-  summary: List the unencrypted secrets related to the job.
-- uid: ext_databox_az_databox_job_show
-  name: az databox job show
-  summary: Get information about the specified job.
-- uid: ext_databox_az_databox_job_update
-  name: az databox job update
-  summary: Update an existing job with the specified parameters.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage databox job.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/databox/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/databox/index.yml
deleted file mode 100644
index ea7102a632..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/databox/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databox_az
-  name: databox
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databox_az_databox
-  name: az databox
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks.yml
deleted file mode 100644
index cdd93e45f4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databricks_az_databricks
-  name: az databricks
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databricks_az_databricks_workspace
-  name: az databricks workspace
-  summary: Commands to manage databricks workspace.
-- uid: ext_databricks_az_databricks_workspace_create
-  name: az databricks workspace create
-  summary: Create a new workspace.
-- uid: ext_databricks_az_databricks_workspace_delete
-  name: az databricks workspace delete
-  summary: Delete the workspace.
-- uid: ext_databricks_az_databricks_workspace_list
-  name: az databricks workspace list
-  summary: Get all the workspaces.
-- uid: ext_databricks_az_databricks_workspace_show
-  name: az databricks workspace show
-  summary: Show the workspace.
-- uid: ext_databricks_az_databricks_workspace_update
-  name: az databricks workspace update
-  summary: Update the workspace.
-- uid: ext_databricks_az_databricks_workspace_wait
-  name: az databricks workspace wait
-  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks/workspace.yml
deleted file mode 100644
index b7a5d07537..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/databricks/workspace.yml
+++ /dev/null
@@ -1,230 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databricks_az_databricks_workspace
-  name: az databricks workspace
-  summary: Commands to manage databricks workspace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_databricks_az_databricks_workspace_create
-  - ext_databricks_az_databricks_workspace_delete
-  - ext_databricks_az_databricks_workspace_list
-  - ext_databricks_az_databricks_workspace_show
-  - ext_databricks_az_databricks_workspace_update
-  - ext_databricks_az_databricks_workspace_wait
-- uid: ext_databricks_az_databricks_workspace_create
-  name: az databricks workspace create
-  summary: Create a new workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a workspace
-    syntax:
-      content: >-
-        az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location \
-
-        westus  --sku standard
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: premium, standard, trial
-    summary: The SKU tier name.
-    description: ''
-  - name: --managed-resource-group
-    summary: The managed resource group to create. It can be either a name or a resource ID.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --private-subnet
-    summary: The name of a new private subnet.
-    description: ''
-  - name: --public-subnet
-    summary: The name of a new public subnet.
-    description: ''
-  - name: --vnet
-    summary: Virtual network name or resource ID.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_delete
-  name: az databricks workspace delete
-  summary: Delete the workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the workspace
-    syntax:
-      content: az databricks workspace delete --resource-group MyResourceGroup --name MyWorkspace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_list
-  name: az databricks workspace list
-  summary: Get all the workspaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List workspaces within a resource group
-    syntax:
-      content: az databricks workspace list --resource-group MyResourceGroup
-  - summary: List workspaces within the default subscription
-    syntax:
-      content: az databricks workspace list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_show
-  name: az databricks workspace show
-  summary: Show the workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the workspace
-    syntax:
-      content: az databricks workspace show --resource-group MyResourceGroup --name MyWorkspace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_update
-  name: az databricks workspace update
-  summary: Update the workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the workspace's tags.
-    syntax:
-      content: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags key1=value1 key2=value2
-  - summary: Clean the workspace's tags.
-    syntax:
-      content: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags ""
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_databricks_az_databricks_workspace_wait
-  name: az databricks workspace wait
-  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Databricks workspace is successfully provisioned.
-    syntax:
-      content: az databricks workspace wait --resource-group MyResourceGroup --name MyWorkspace \ --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_databricks_az_databricks_workspace_create
-  name: az databricks workspace create
-  summary: Create a new workspace.
-- uid: ext_databricks_az_databricks_workspace_delete
-  name: az databricks workspace delete
-  summary: Delete the workspace.
-- uid: ext_databricks_az_databricks_workspace_list
-  name: az databricks workspace list
-  summary: Get all the workspaces.
-- uid: ext_databricks_az_databricks_workspace_show
-  name: az databricks workspace show
-  summary: Show the workspace.
-- uid: ext_databricks_az_databricks_workspace_update
-  name: az databricks workspace update
-  summary: Update the workspace.
-- uid: ext_databricks_az_databricks_workspace_wait
-  name: az databricks workspace wait
-  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage databricks workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/index.yml
deleted file mode 100644
index 15a5f1d1e6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/databricks/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_databricks_az
-  name: databricks
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_databricks_az_databricks
-  name: az databricks
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare.yml
deleted file mode 100644
index 5ccfaa5812..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare.yml
+++ /dev/null
@@ -1,385 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare
-  name: az datashare
-  summary: Commands to manage datashare.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_create
-  - ext_datashare_az_datashare_delete
-  - ext_datashare_az_datashare_list
-  - ext_datashare_az_datashare_show
-  - ext_datashare_az_datashare_wait
-- uid: ext_datashare_az_datashare_create
-  name: az datashare create
-  summary: Create a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a datashare
-    syntax:
-      content: az datashare create --account-name MyAccount --resource-group MyResourceGroup --description "share description" --share-kind "CopyBased" --terms "Confidential" --name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Share description.
-    description: ''
-  - name: --share-kind
-    parameterValueGroup: CopyBased, InPlace
-    summary: Share kind.
-    description: ''
-  - name: --terms
-    summary: Share terms.
-    description: ''
-- uid: ext_datashare_az_datashare_delete
-  name: az datashare delete
-  summary: Delete a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a datashare
-    syntax:
-      content: az datashare delete --account-name MyAccount --resource-group MyResourceGroup --name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_list
-  name: az datashare list
-  summary: List datashares in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List datashares
-    syntax:
-      content: az datashare list --account-name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_show
-  name: az datashare show
-  summary: Show a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a datashare
-    syntax:
-      content: az datashare show --account-name MyAccount --resource-group MyResourceGroup --name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_wait
-  name: az datashare wait
-  summary: Place the CLI in a waiting state until a condition of the datashare is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare is successfully provisioned.
-    syntax:
-      content: az datashare wait --account-name MyAccount --resource-group MyResourceGroup --name MyShare --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_account
-  name: az datashare account
-  summary: Commands to manage datashare accounts.
-- uid: ext_datashare_az_datashare_account_create
-  name: az datashare account create
-  summary: Create an account.
-- uid: ext_datashare_az_datashare_account_delete
-  name: az datashare account delete
-  summary: Delete an account.
-- uid: ext_datashare_az_datashare_account_list
-  name: az datashare account list
-  summary: List datashare accounts.
-- uid: ext_datashare_az_datashare_account_show
-  name: az datashare account show
-  summary: Show an account.
-- uid: ext_datashare_az_datashare_account_update
-  name: az datashare account update
-  summary: Patch an account.
-- uid: ext_datashare_az_datashare_account_wait
-  name: az datashare account wait
-  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
-- uid: ext_datashare_az_datashare_consumer
-  name: az datashare consumer
-  summary: Commands for consumers to manage datashare.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping
-  name: az datashare consumer dataset-mapping
-  summary: Commands for consumers to manage datashare dataset mappings.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_invitation
-  name: az datashare consumer invitation
-  summary: Commands for consumers to manage datashare invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-- uid: ext_datashare_az_datashare_consumer_share_subscription
-  name: az datashare consumer share-subscription
-  summary: Commands for consumers to manage datashare share subscriptions.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-- uid: ext_datashare_az_datashare_consumer_trigger
-  name: az datashare consumer trigger
-  summary: Commands for consumers to manage datashare consumer triggers.
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-- uid: ext_datashare_az_datashare_create
-  name: az datashare create
-  summary: Create a datashare.
-- uid: ext_datashare_az_datashare_dataset
-  name: az datashare dataset
-  summary: Commands for providers to manage datashare datasets.
-- uid: ext_datashare_az_datashare_dataset_create
-  name: az datashare dataset create
-  summary: Create a dataset.
-- uid: ext_datashare_az_datashare_dataset_delete
-  name: az datashare dataset delete
-  summary: Delete a dataset in a share.
-- uid: ext_datashare_az_datashare_dataset_list
-  name: az datashare dataset list
-  summary: List datasets in a share.
-- uid: ext_datashare_az_datashare_dataset_show
-  name: az datashare dataset show
-  summary: Show a dataset.
-- uid: ext_datashare_az_datashare_dataset_wait
-  name: az datashare dataset wait
-  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
-- uid: ext_datashare_az_datashare_delete
-  name: az datashare delete
-  summary: Delete a datashare.
-- uid: ext_datashare_az_datashare_invitation
-  name: az datashare invitation
-  summary: Commands for providers to manage datashare invitations.
-- uid: ext_datashare_az_datashare_invitation_create
-  name: az datashare invitation create
-  summary: Create an invitation.
-- uid: ext_datashare_az_datashare_invitation_delete
-  name: az datashare invitation delete
-  summary: Delete an invitation in a share.
-- uid: ext_datashare_az_datashare_invitation_list
-  name: az datashare invitation list
-  summary: List invitations in a share.
-- uid: ext_datashare_az_datashare_invitation_show
-  name: az datashare invitation show
-  summary: Show an invitation in a share.
-- uid: ext_datashare_az_datashare_list
-  name: az datashare list
-  summary: List datashares in an account.
-- uid: ext_datashare_az_datashare_provider_share_subscription
-  name: az datashare provider-share-subscription
-  summary: Commands for providers to manage datashare share subscriptions.
-- uid: ext_datashare_az_datashare_provider_share_subscription_list
-  name: az datashare provider-share-subscription list
-  summary: List share subscriptions in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-  name: az datashare provider-share-subscription reinstate
-  summary: Reinstate a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-  name: az datashare provider-share-subscription revoke
-  summary: Revoke a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_show
-  name: az datashare provider-share-subscription show
-  summary: Show a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_wait
-  name: az datashare provider-share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
-- uid: ext_datashare_az_datashare_show
-  name: az datashare show
-  summary: Show a datashare.
-- uid: ext_datashare_az_datashare_synchronization
-  name: az datashare synchronization
-  summary: Commands to manage datashare synchronization.
-- uid: ext_datashare_az_datashare_synchronization_list
-  name: az datashare synchronization list
-  summary: List synchronizations of a datashare.
-- uid: ext_datashare_az_datashare_synchronization_list_detail
-  name: az datashare synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_synchronization_setting
-  name: az datashare synchronization-setting
-  summary: Commands for providers to manage datashare synchronization settings.
-- uid: ext_datashare_az_datashare_synchronization_setting_create
-  name: az datashare synchronization-setting create
-  summary: Create a synchronization setting.
-- uid: ext_datashare_az_datashare_synchronization_setting_delete
-  name: az datashare synchronization-setting delete
-  summary: Delete a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_list
-  name: az datashare synchronization-setting list
-  summary: List synchronization settings in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_show
-  name: az datashare synchronization-setting show
-  summary: Show a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_wait
-  name: az datashare synchronization-setting wait
-  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
-- uid: ext_datashare_az_datashare_wait
-  name: az datashare wait
-  summary: Place the CLI in a waiting state until a condition of the datashare is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage datashare.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/account.yml
deleted file mode 100644
index 8fd2fef963..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/account.yml
+++ /dev/null
@@ -1,200 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_account
-  name: az datashare account
-  summary: Commands to manage datashare accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_account_create
-  - ext_datashare_az_datashare_account_delete
-  - ext_datashare_az_datashare_account_list
-  - ext_datashare_az_datashare_account_show
-  - ext_datashare_az_datashare_account_update
-  - ext_datashare_az_datashare_account_wait
-- uid: ext_datashare_az_datashare_account_create
-  name: az datashare account create
-  summary: Create an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an account
-    syntax:
-      content: az datashare account create --location "West US 2" --tags tag1=Red tag2=White --name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_datashare_az_datashare_account_delete
-  name: az datashare account delete
-  summary: Delete an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the account
-    syntax:
-      content: az datashare account delete --name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_account_list
-  name: az datashare account list
-  summary: List datashare accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List accounts by resource group
-    syntax:
-      content: az datashare account list --resource-group MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_account_show
-  name: az datashare account show
-  summary: Show an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show account information
-    syntax:
-      content: az datashare account show --name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_account_update
-  name: az datashare account update
-  summary: Patch an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update account tags
-    syntax:
-      content: az datashare account update --name MyAccount --tags tag1=Red tag2=White --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_datashare_az_datashare_account_wait
-  name: az datashare account wait
-  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare account is successfully provisioned.
-    syntax:
-      content: az datashare account wait --name MyAccount --resource-group MyResourceGroup --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_account_create
-  name: az datashare account create
-  summary: Create an account.
-- uid: ext_datashare_az_datashare_account_delete
-  name: az datashare account delete
-  summary: Delete an account.
-- uid: ext_datashare_az_datashare_account_list
-  name: az datashare account list
-  summary: List datashare accounts.
-- uid: ext_datashare_az_datashare_account_show
-  name: az datashare account show
-  summary: Show an account.
-- uid: ext_datashare_az_datashare_account_update
-  name: az datashare account update
-  summary: Patch an account.
-- uid: ext_datashare_az_datashare_account_wait
-  name: az datashare account wait
-  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage datashare accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer.yml
deleted file mode 100644
index 819a3c1959..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer
-  name: az datashare consumer
-  summary: Commands for consumers to manage datashare.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping
-  name: az datashare consumer dataset-mapping
-  summary: Commands for consumers to manage datashare dataset mappings.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_invitation
-  name: az datashare consumer invitation
-  summary: Commands for consumers to manage datashare invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-- uid: ext_datashare_az_datashare_consumer_share_subscription
-  name: az datashare consumer share-subscription
-  summary: Commands for consumers to manage datashare share subscriptions.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-- uid: ext_datashare_az_datashare_consumer_trigger
-  name: az datashare consumer trigger
-  summary: Commands for consumers to manage datashare consumer triggers.
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml
deleted file mode 100644
index a484e651ab..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/dataset-mapping.yml
+++ /dev/null
@@ -1,162 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping
-  name: az datashare consumer dataset-mapping
-  summary: Commands for consumers to manage datashare dataset mappings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_dataset_mapping_create
-  - ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  - ext_datashare_az_datashare_consumer_dataset_mapping_list
-  - ext_datashare_az_datashare_consumer_dataset_mapping_show
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Blob dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
-  - summary: Create a SqlDBTable dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDBTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"databaseName\":\"Database1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
-  - summary: Create a AdlsGen2File dataset mapping
-    syntax:
-      content: 'az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"AdlsGen2File\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"fileSystem\": \"fileSystem\",\"outputType\":\"Csv\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
-  - summary: Create a SqlDWTable dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"dataWarehouseName\":\"DataWarehouse1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --mapping
-    summary: Dataset mapping in JSON string or path to JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the datasetMapping.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping delete --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the datasetMapping.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List dataset mappings
-    syntax:
-      content: az datashare consumer dataset-mapping list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a dataset mapping
-    syntax:
-      content: az datashare consumer dataset-mapping show --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the datasetMapping.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-  name: az datashare consumer dataset-mapping create
-  summary: Create a dataSet mapping.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-  name: az datashare consumer dataset-mapping delete
-  summary: Delete a dataset mapping in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-  name: az datashare consumer dataset-mapping list
-  summary: List dataset mappings in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-  name: az datashare consumer dataset-mapping show
-  summary: Show a dataset mapping in a share subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare dataset mappings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml
deleted file mode 100644
index d0b0b4e536..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/invitation.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_invitation
-  name: az datashare consumer invitation
-  summary: Commands for consumers to manage datashare invitations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_invitation_list
-  - ext_datashare_az_datashare_consumer_invitation_reject
-  - ext_datashare_az_datashare_consumer_invitation_show
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List invitations
-    syntax:
-      content: az datashare consumer invitation list
-  parameters: []
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reject an invitation
-    syntax:
-      content: az datashare consumer invitation reject --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
-  parameters:
-  - isRequired: true
-    name: --invitation-id
-    summary: An invitation id.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an invitation
-    syntax:
-      content: az datashare consumer invitation show --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
-  parameters:
-  - isRequired: true
-    name: --invitation-id
-    summary: An invitation id.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_invitation_list
-  name: az datashare consumer invitation list
-  summary: List received invitations.
-- uid: ext_datashare_az_datashare_consumer_invitation_reject
-  name: az datashare consumer invitation reject
-  summary: Reject an invitation.
-- uid: ext_datashare_az_datashare_consumer_invitation_show
-  name: az datashare consumer invitation show
-  summary: Show a received invitation.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare invitations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml
deleted file mode 100644
index e42afab878..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription.yml
+++ /dev/null
@@ -1,266 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_share_subscription
-  name: az datashare consumer share-subscription
-  summary: Commands for consumers to manage datashare share subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_share_subscription_create
-  - ext_datashare_az_datashare_consumer_share_subscription_delete
-  - ext_datashare_az_datashare_consumer_share_subscription_list
-  - ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  - ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  - ext_datashare_az_datashare_consumer_share_subscription_show
-  - ext_datashare_az_datashare_consumer_share_subscription_wait
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a share subscription
-    syntax:
-      content: az datashare consumer share-subscription create --account-name MyAccount --resource-group MyResourceGroup --invitation-id 00000000-0000-0000-0000-000000000000 --source-share-location "eastus2" --name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --invitation-id
-    summary: The invitation id.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source-share-location
-    summary: Source share location.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a share subscription
-    syntax:
-      content: az datashare consumer share-subscription delete --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List share subscriptions
-    syntax:
-      content: az datashare consumer share-subscription list --account-name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List source datasets
-    syntax:
-      content: az datashare consumer share-subscription list-source-dataset --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization settings
-    syntax:
-      content: az datashare consumer share-subscription list-source-share-synchronization-setting --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a share subscription
-    syntax:
-      content: az datashare consumer share-subscription show --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare share subscription is successfully provisioned.
-    syntax:
-      content: az datashare consumer share-subscription wait --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_share_subscription_create
-  name: az datashare consumer share-subscription create
-  summary: Create a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-  name: az datashare consumer share-subscription delete
-  summary: Delete a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list
-  name: az datashare consumer share-subscription list
-  summary: List share subscriptions in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-  name: az datashare consumer share-subscription list-source-dataset
-  summary: List source datasets of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-  name: az datashare consumer share-subscription list-source-share-synchronization-setting
-  summary: List synchronization settings set on a share.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_show
-  name: az datashare consumer share-subscription show
-  summary: Show a share subscription in an account.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-  name: az datashare consumer share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare share subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml
deleted file mode 100644
index 28a704445b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/share-subscription/synchronization.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-  name: az datashare consumer share-subscription synchronization
-  summary: Commands for consumers to manage datashare share subscription synchronizations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  - ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Request to cancel a synchronization
-    syntax:
-      content: az datashare consumer share-subscription synchronization cancel --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --synchronization-id
-    summary: The synchronization GUID.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronizations
-    syntax:
-      content: az datashare consumer share-subscription synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization details
-    syntax:
-      content: az datashare consumer share-subscription synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --synchronization-id
-    summary: Synchronization id.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Initiate a dataset synchronization
-    syntax:
-      content: az datashare consumer share-subscription synchronization start --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-mode "Incremental"
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --synchronization-mode
-    parameterValueGroup: FullSync, Incremental
-    summary: Synchronization mode.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization finishes successfully.
-    syntax:
-      content: az datashare consumer share-subscription synchronization wait --custom "status=='Succeeded'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
-  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization is cancelled.
-    syntax:
-      content: az datashare consumer share-subscription synchronization wait --custom "status=='Cancelled'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - isRequired: true
-    name: --synchronization-id
-    summary: The synchronization GUID.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-  name: az datashare consumer share-subscription synchronization cancel
-  summary: Request to cancel a synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-  name: az datashare consumer share-subscription synchronization list
-  summary: List synchronizations of a share subscription.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-  name: az datashare consumer share-subscription synchronization list-detail
-  summary: List synchronization details.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-  name: az datashare consumer share-subscription synchronization start
-  summary: Initiate a dataset synchronization.
-- uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-  name: az datashare consumer share-subscription synchronization wait
-  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare share subscription synchronizations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml
deleted file mode 100644
index 307853d6f0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/consumer/trigger.yml
+++ /dev/null
@@ -1,223 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_consumer_trigger
-  name: az datashare consumer trigger
-  summary: Commands for consumers to manage datashare consumer triggers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_consumer_trigger_create
-  - ext_datashare_az_datashare_consumer_trigger_delete
-  - ext_datashare_az_datashare_consumer_trigger_list
-  - ext_datashare_az_datashare_consumer_trigger_show
-  - ext_datashare_az_datashare_consumer_trigger_wait
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a trigger
-    syntax:
-      content: az datashare consumer trigger create --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - isRequired: true
-    name: --recurrence-interval
-    parameterValueGroup: Day, Hour
-    summary: Synchronization Recurrence Interval.
-    description: ''
-  - isRequired: true
-    name: --synchronization-time
-    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --kind
-    defaultValue: ScheduleBased
-    parameterValueGroup: ScheduleBased
-    summary: Kind of synchronization.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a trigger
-    syntax:
-      content: az datashare consumer trigger delete --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List triggers
-    syntax:
-      content: az datashare consumer trigger list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a trigger
-    syntax:
-      content: az datashare consumer trigger show --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare trigger is successfully provisioned.
-    syntax:
-      content: az datashare consumer trigger wait --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the trigger.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-subscription-name
-    summary: The name of the shareSubscription.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_consumer_trigger_create
-  name: az datashare consumer trigger create
-  summary: Create a trigger.
-- uid: ext_datashare_az_datashare_consumer_trigger_delete
-  name: az datashare consumer trigger delete
-  summary: Delete a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_list
-  name: az datashare consumer trigger list
-  summary: List triggers in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_show
-  name: az datashare consumer trigger show
-  summary: Show a trigger in a share subscription.
-- uid: ext_datashare_az_datashare_consumer_trigger_wait
-  name: az datashare consumer trigger wait
-  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for consumers to manage datashare consumer triggers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/dataset.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/dataset.yml
deleted file mode 100644
index 4db7049041..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/dataset.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_dataset
-  name: az datashare dataset
-  summary: Commands for providers to manage datashare datasets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_dataset_create
-  - ext_datashare_az_datashare_dataset_delete
-  - ext_datashare_az_datashare_dataset_list
-  - ext_datashare_az_datashare_dataset_show
-  - ext_datashare_az_datashare_dataset_wait
-- uid: ext_datashare_az_datashare_dataset_create
-  name: az datashare dataset create
-  summary: Create a dataset.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Blob dataset
-    syntax:
-      content: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"filePath\":\"file21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
-  - summary: Create a KustoCluster dataset
-    syntax:
-      content: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoCluster\",\"properties\":{\"kustoClusterResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1\"}}"'
-  - summary: Create a KustoDatabase dataset
-    syntax:
-      content: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoDatabase\",\"properties\":{\"kustoDatabaseResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1/databases/Database1\"}}"'
-  - summary: Create a SqlDBTable dataset
-    syntax:
-      content: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDBTable\",\"properties\":{\"databaseName\":\"MySqlDB\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\", \"tableName\":\"Table1\"}}"
-  - summary: Create a SqlDWTable dataset
-    syntax:
-      content: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataWarehouseName\":\"MyDataWarehouse\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Sql/servers/MyServer\",\"tableName\":\"MyTable\"}}"
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --dataset
-    summary: Dataset parameters in JSON string or path to JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_delete
-  name: az datashare dataset delete
-  summary: Delete a dataset in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dataset
-    syntax:
-      content: az datashare dataset delete --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_list
-  name: az datashare dataset list
-  summary: List datasets in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List datasets
-    syntax:
-      content: az datashare dataset list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_show
-  name: az datashare dataset show
-  summary: Show a dataset.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a dataset
-    syntax:
-      content: az datashare dataset show --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_dataset_wait
-  name: az datashare dataset wait
-  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare dataset is successfully provisioned.
-    syntax:
-      content: az datashare dataset wait --account-name MyAccount --share-name MyShare --name MyDataset --resource-group MyResourceGroup --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dataset.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_dataset_create
-  name: az datashare dataset create
-  summary: Create a dataset.
-- uid: ext_datashare_az_datashare_dataset_delete
-  name: az datashare dataset delete
-  summary: Delete a dataset in a share.
-- uid: ext_datashare_az_datashare_dataset_list
-  name: az datashare dataset list
-  summary: List datasets in a share.
-- uid: ext_datashare_az_datashare_dataset_show
-  name: az datashare dataset show
-  summary: Show a dataset.
-- uid: ext_datashare_az_datashare_dataset_wait
-  name: az datashare dataset wait
-  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare datasets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/invitation.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/invitation.yml
deleted file mode 100644
index ae23ab69a2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/invitation.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_invitation
-  name: az datashare invitation
-  summary: Commands for providers to manage datashare invitations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_invitation_create
-  - ext_datashare_az_datashare_invitation_delete
-  - ext_datashare_az_datashare_invitation_list
-  - ext_datashare_az_datashare_invitation_show
-- uid: ext_datashare_az_datashare_invitation_create
-  name: az datashare invitation create
-  summary: Create an invitation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an invitation
-    syntax:
-      content: az datashare invitation create --account-name MyAccount --target-email "receiver@microsoft.com" --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the invitation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --target-active-directory-id
-    summary: The target Azure AD Id. Can't be combined with email.
-    description: ''
-  - name: --target-email
-    summary: The email the invitation is directed to.
-    description: ''
-  - name: --target-object-id
-    summary: The target user or application Id that invitation is being sent to. Must be specified along TargetActiveDirectoryId. This enables sending invitations to specific users or applications in an AD tenant.
-    description: ''
-- uid: ext_datashare_az_datashare_invitation_delete
-  name: az datashare invitation delete
-  summary: Delete an invitation in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an invitation
-    syntax:
-      content: az datashare invitation delete --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the invitation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_invitation_list
-  name: az datashare invitation list
-  summary: List invitations in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List invitations
-    syntax:
-      content: az datashare invitation list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_invitation_show
-  name: az datashare invitation show
-  summary: Show an invitation in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an invitation
-    syntax:
-      content: az datashare invitation show --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the invitation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_invitation_create
-  name: az datashare invitation create
-  summary: Create an invitation.
-- uid: ext_datashare_az_datashare_invitation_delete
-  name: az datashare invitation delete
-  summary: Delete an invitation in a share.
-- uid: ext_datashare_az_datashare_invitation_list
-  name: az datashare invitation list
-  summary: List invitations in a share.
-- uid: ext_datashare_az_datashare_invitation_show
-  name: az datashare invitation show
-  summary: Show an invitation in a share.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare invitations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml
deleted file mode 100644
index ebc37ccefb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/provider-share-subscription.yml
+++ /dev/null
@@ -1,203 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_provider_share_subscription
-  name: az datashare provider-share-subscription
-  summary: Commands for providers to manage datashare share subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_provider_share_subscription_list
-  - ext_datashare_az_datashare_provider_share_subscription_reinstate
-  - ext_datashare_az_datashare_provider_share_subscription_revoke
-  - ext_datashare_az_datashare_provider_share_subscription_show
-  - ext_datashare_az_datashare_provider_share_subscription_wait
-- uid: ext_datashare_az_datashare_provider_share_subscription_list
-  name: az datashare provider-share-subscription list
-  summary: List share subscriptions in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List share subscriptions
-    syntax:
-      content: az datashare provider-share-subscription list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-  name: az datashare provider-share-subscription reinstate
-  summary: Reinstate a share subscription in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reinstate a share subscription
-    syntax:
-      content: az datashare provider-share-subscription reinstate --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-  name: az datashare provider-share-subscription revoke
-  summary: Revoke a share subscription in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Revoke a share subscription
-    syntax:
-      content: az datashare provider-share-subscription revoke --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_show
-  name: az datashare provider-share-subscription show
-  summary: Show a share subscription in a provider share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a share subscription
-    syntax:
-      content: az datashare provider-share-subscription show --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-- uid: ext_datashare_az_datashare_provider_share_subscription_wait
-  name: az datashare provider-share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare provider share subscription is successfully provisioned.
-    syntax:
-      content: az datashare provider-share-subscription wait --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --share-subscription
-    summary: To locate share subscription.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_provider_share_subscription_list
-  name: az datashare provider-share-subscription list
-  summary: List share subscriptions in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-  name: az datashare provider-share-subscription reinstate
-  summary: Reinstate a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-  name: az datashare provider-share-subscription revoke
-  summary: Revoke a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_show
-  name: az datashare provider-share-subscription show
-  summary: Show a share subscription in a provider share.
-- uid: ext_datashare_az_datashare_provider_share_subscription_wait
-  name: az datashare provider-share-subscription wait
-  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare share subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml
deleted file mode 100644
index 2430428eac..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization-setting.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_synchronization_setting
-  name: az datashare synchronization-setting
-  summary: Commands for providers to manage datashare synchronization settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_synchronization_setting_create
-  - ext_datashare_az_datashare_synchronization_setting_delete
-  - ext_datashare_az_datashare_synchronization_setting_list
-  - ext_datashare_az_datashare_synchronization_setting_show
-  - ext_datashare_az_datashare_synchronization_setting_wait
-- uid: ext_datashare_az_datashare_synchronization_setting_create
-  name: az datashare synchronization-setting create
-  summary: Create a synchronization setting.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a synchronization setting
-    syntax:
-      content: az datashare synchronization-setting create --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MyDataset --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - isRequired: true
-    name: --recurrence-interval
-    parameterValueGroup: Day, Hour
-    summary: Synchronization Recurrence Interval.
-    description: ''
-  - isRequired: true
-    name: --synchronization-time
-    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
-    description: ''
-  - name: --kind
-    defaultValue: ScheduleBased
-    parameterValueGroup: ScheduleBased
-    summary: Kind of synchronization.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_delete
-  name: az datashare synchronization-setting delete
-  summary: Delete a synchronization setting in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a synchronization setting
-    syntax:
-      content: az datashare synchronization-setting delete --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_list
-  name: az datashare synchronization-setting list
-  summary: List synchronization settings in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization settings
-    syntax:
-      content: az datashare synchronization-setting list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_show
-  name: az datashare synchronization-setting show
-  summary: Show a synchronization setting in a share.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a synchronization setting
-    syntax:
-      content: az datashare synchronization-setting show --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_setting_wait
-  name: az datashare synchronization-setting wait
-  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the datashare synchronization setting is successfully provisioned.
-    syntax:
-      content: az datashare synchronization-setting wait --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting --created
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the synchronizationSetting.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_synchronization_setting_create
-  name: az datashare synchronization-setting create
-  summary: Create a synchronization setting.
-- uid: ext_datashare_az_datashare_synchronization_setting_delete
-  name: az datashare synchronization-setting delete
-  summary: Delete a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_list
-  name: az datashare synchronization-setting list
-  summary: List synchronization settings in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_show
-  name: az datashare synchronization-setting show
-  summary: Show a synchronization setting in a share.
-- uid: ext_datashare_az_datashare_synchronization_setting_wait
-  name: az datashare synchronization-setting wait
-  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for providers to manage datashare synchronization settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization.yml
deleted file mode 100644
index b04558d3c6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/datashare/synchronization.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az_datashare_synchronization
-  name: az datashare synchronization
-  summary: Commands to manage datashare synchronization.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_datashare_az_datashare_synchronization_list
-  - ext_datashare_az_datashare_synchronization_list_detail
-- uid: ext_datashare_az_datashare_synchronization_list
-  name: az datashare synchronization list
-  summary: List synchronizations of a datashare.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronizations
-    syntax:
-      content: az datashare synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-- uid: ext_datashare_az_datashare_synchronization_list_detail
-  name: az datashare synchronization list-detail
-  summary: List synchronization details.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List synchronization details
-    syntax:
-      content: az datashare synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --synchronization-id 00000000-0000-0000-0000-000000000000
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the share account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --share-name
-    summary: The name of the share.
-    description: ''
-  - name: --synchronization-id
-    summary: The synchronization GUID.
-    description: ''
-commands:
-- uid: ext_datashare_az_datashare_synchronization_list
-  name: az datashare synchronization list
-  summary: List synchronizations of a datashare.
-- uid: ext_datashare_az_datashare_synchronization_list_detail
-  name: az datashare synchronization list-detail
-  summary: List synchronization details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage datashare synchronization.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/index.yml
deleted file mode 100644
index b674eec1dd..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/datashare/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_datashare_az
-  name: datashare
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_datashare_az_datashare
-  name: az datashare
-  summary: Commands to manage datashare.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/index.yml
deleted file mode 100644
index 12dde3be67..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/index.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az
-  name: db-up
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_db-up_az_mysql
-  name: az mysql
-  summary: Manage Azure Database for MySQL servers.
-- uid: ext_db-up_az_postgres
-  name: az postgres
-  summary: Manage Azure Database for PostgreSQL servers.
-- uid: ext_db-up_az_sql
-  name: az sql
-  summary: Manage Azure SQL Databases and Data Warehouses.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/mysql.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/mysql.yml
deleted file mode 100644
index 7afb4d561f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/mysql.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az_mysql
-  name: az mysql
-  summary: Manage Azure Database for MySQL servers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_db-up_az_mysql_down
-  - ext_db-up_az_mysql_show_connection_string
-  - ext_db-up_az_mysql_up
-- uid: ext_db-up_az_mysql_down
-  name: az mysql down
-  summary: Delete the MySQL server and its cached information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the server and the cached data, aside from the resource group.
-    syntax:
-      content: az mysql down
-  - summary: Delete the resource group and the full cache.
-    syntax:
-      content: az mysql down --delete-group
-  parameters:
-  - name: --delete-group
-    summary: Delete the resource group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_db-up_az_mysql_show_connection_string
-  name: az mysql show-connection-string
-  summary: Show the connection strings for a MySQL server database.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --admin-password -p
-    defaultValue: '{password}'
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    defaultValue: '{login}'
-    summary: The login username of the administrator.
-    description: ''
-  - name: --database-name -d
-    defaultValue: '{database}'
-    summary: The name of a database.
-    description: ''
-  - name: --server-name -s
-    defaultValue: '{server}'
-    summary: Name of the server.
-    description: ''
-- uid: ext_db-up_az_mysql_up
-  name: az mysql up
-  summary: Set up an Azure Database for MySQL server and configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Ensure that a Azure Database for MySQL server is up and running and configured for immediate use.
-    syntax:
-      content: az mysql up
-  - summary: To override default names, provide parameters indicating desired values/existing resources.
-    syntax:
-      content: az mysql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
-  parameters:
-  - name: --backup-retention
-    summary: The number of days a backup is retained.
-    description: ''
-  - name: --database-name -d
-    summary: The name of a database to initialize.
-    description: ''
-  - name: --geo-redundant-backup
-    defaultValue: Disabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable Geo-redundant or not for server backup.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --server-name -s
-    summary: Name of the server.
-    description: ''
-  - name: --sku-name
-    defaultValue: GP_Gen5_2
-    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
-    description: ''
-  - name: --ssl-enforcement
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable ssl enforcement or not when connect to server.
-    description: ''
-  - name: --storage-size
-    summary: The max storage size of the server. Unit is megabytes.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --version
-    defaultValue: "5.7"
-    summary: Server version.
-    description: ''
-  - name: --admin-password -p
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    summary: The login username of the administrator.
-    description: ''
-  - name: --generate-password
-    summary: Generate a password.
-    description: ''
-commands:
-- uid: ext_db-up_az_mysql_down
-  name: az mysql down
-  summary: Delete the MySQL server and its cached information.
-- uid: ext_db-up_az_mysql_show_connection_string
-  name: az mysql show-connection-string
-  summary: Show the connection strings for a MySQL server database.
-- uid: ext_db-up_az_mysql_up
-  name: az mysql up
-  summary: Set up an Azure Database for MySQL server and configurations.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Database for MySQL servers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/postgres.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/postgres.yml
deleted file mode 100644
index 209c48580e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/postgres.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az_postgres
-  name: az postgres
-  summary: Manage Azure Database for PostgreSQL servers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_db-up_az_postgres_down
-  - ext_db-up_az_postgres_show_connection_string
-  - ext_db-up_az_postgres_up
-- uid: ext_db-up_az_postgres_down
-  name: az postgres down
-  summary: Delete the PostgreSQL server and its cached information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the server and the cached data, aside from the resource group.
-    syntax:
-      content: az postgres down
-  - summary: Delete the resource group and the full cache.
-    syntax:
-      content: az postgres down --delete-group
-  parameters:
-  - name: --delete-group
-    summary: Delete the resource group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_db-up_az_postgres_show_connection_string
-  name: az postgres show-connection-string
-  summary: Show the connection strings for a PostgreSQL server database.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --admin-password -p
-    defaultValue: '{password}'
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    defaultValue: '{login}'
-    summary: The login username of the administrator.
-    description: ''
-  - name: --database-name -d
-    defaultValue: '{database}'
-    summary: The name of a database.
-    description: ''
-  - name: --server-name -s
-    defaultValue: '{server}'
-    summary: Name of the server.
-    description: ''
-- uid: ext_db-up_az_postgres_up
-  name: az postgres up
-  summary: Set up an Azure Database for PostgreSQL server and configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Ensure that a Azure Database for PostgreSQL server is up and running and configured for immediate use.
-    syntax:
-      content: az postgres up
-  - summary: To override default names, provide parameters indicating desired values/existing resources.
-    syntax:
-      content: az postgres up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
-  parameters:
-  - name: --backup-retention
-    summary: The number of days a backup is retained.
-    description: ''
-  - name: --database-name -d
-    summary: The name of a database to initialize.
-    description: ''
-  - name: --geo-redundant-backup
-    defaultValue: Disabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable Geo-redundant or not for server backup.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --server-name -s
-    summary: Name of the server.
-    description: ''
-  - name: --sku-name
-    defaultValue: GP_Gen5_2
-    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
-    description: ''
-  - name: --ssl-enforcement
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enable ssl enforcement or not when connect to server.
-    description: ''
-  - name: --storage-size
-    summary: The max storage size of the server. Unit is megabytes.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --version
-    defaultValue: "10"
-    summary: Server version.
-    description: ''
-  - name: --admin-password -p
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    summary: The login username of the administrator.
-    description: ''
-  - name: --generate-password
-    summary: Generate a password.
-    description: ''
-commands:
-- uid: ext_db-up_az_postgres_down
-  name: az postgres down
-  summary: Delete the PostgreSQL server and its cached information.
-- uid: ext_db-up_az_postgres_show_connection_string
-  name: az postgres show-connection-string
-  summary: Show the connection strings for a PostgreSQL server database.
-- uid: ext_db-up_az_postgres_up
-  name: az postgres up
-  summary: Set up an Azure Database for PostgreSQL server and configurations.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Database for PostgreSQL servers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/sql.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/sql.yml
deleted file mode 100644
index 501277c064..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/db-up/sql.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_db-up_az_sql
-  name: az sql
-  summary: Manage Azure SQL Databases and Data Warehouses.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_db-up_az_sql_down
-  - ext_db-up_az_sql_up
-- uid: ext_db-up_az_sql_down
-  name: az sql down
-  summary: Delete the SQL server and its cached information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the server and the cached data, aside from the resource group.
-    syntax:
-      content: az sql down
-  - summary: Delete the resource group and the full cache.
-    syntax:
-      content: az sql down --delete-group
-  parameters:
-  - name: --delete-group
-    summary: Delete the resource group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_db-up_az_sql_up
-  name: az sql up
-  summary: Set up an Azure Database for SQL server and configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Ensure that a Azure Database for SQL server is up and running and configured for immediate use.
-    syntax:
-      content: az sql up
-  - summary: To override default names, provide parameters indicating desired values/existing resources.
-    syntax:
-      content: az sql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
-  parameters:
-  - name: --database-name -d
-    summary: The name of a database to initialize.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --server-name -s
-    summary: Name of the server.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --version
-    defaultValue: "12.0"
-    summary: Server version.
-    description: ''
-  - name: --admin-password -p
-    summary: The login password of the administrator.
-    description: ''
-  - name: --admin-user -u
-    summary: The login username of the administrator.
-    description: ''
-  - name: --generate-password
-    summary: Generate a password.
-    description: ''
-commands:
-- uid: ext_db-up_az_sql_down
-  name: az sql down
-  summary: Delete the SQL server and its cached information.
-- uid: ext_db-up_az_sql_up
-  name: az sql up
-  summary: Set up an Azure Database for SQL server and configurations.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure SQL Databases and Data Warehouses.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks.yml
deleted file mode 100644
index 1ad196056b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_aks_app
-  name: az aks app
-  summary: Commands to manage AKS app.
-- uid: ext_deploy-to-azure_az_aks_app_up
-  name: az aks app up
-  summary: Deploy to AKS via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kubernetes Services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml
deleted file mode 100644
index 23e23b9e07..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/aks/app.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_aks_app
-  name: az aks app
-  summary: Commands to manage AKS app.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_deploy-to-azure_az_aks_app_up
-- uid: ext_deploy-to-azure_az_aks_app_up
-  name: az aks app up
-  summary: Deploy to AKS via GitHub actions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --acr
-    summary: Name of the Azure Container Registry to be used for pushing the image.
-    description: ''
-  - name: --aks-cluster
-    summary: Name of the cluster to select for deployment.
-    description: ''
-  - name: --branch-name
-    summary: New branch name to be created to check in files and raise a PR.
-    description: ''
-  - name: --do-not-wait
-    summary: Do not wait for workflow completion.
-    description: ''
-  - name: --port
-    summary: Port on which your application runs. Default is 8080.
-    description: ''
-  - name: --repository -r
-    summary: GitHub repository URL e.g. <a href="https://github.com/azure/azure-cli">https://github.com/azure/azure-cli</a>.
-    description: ''
-commands:
-- uid: ext_deploy-to-azure_az_aks_app_up
-  name: az aks app up
-  summary: Deploy to AKS via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage AKS app.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container.yml
deleted file mode 100644
index 2483cb2ef2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_container
-  name: az container
-  summary: Manage Azure Container Instances.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_container_app
-  name: az container app
-  summary: Commands to Manage Azure Container Instances App.
-- uid: ext_deploy-to-azure_az_container_app_up
-  name: az container app up
-  summary: Deploy to Azure Container Instances using GitHub Actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Container Instances.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container/app.yml
deleted file mode 100644
index 90e512c908..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/container/app.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_container_app
-  name: az container app
-  summary: Commands to Manage Azure Container Instances App.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_deploy-to-azure_az_container_app_up
-- uid: ext_deploy-to-azure_az_container_app_up
-  name: az container app up
-  summary: Deploy to Azure Container Instances using GitHub Actions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --acr
-    summary: Name of the Azure Container Registry to be used for pushing the image.
-    description: ''
-  - name: --branch-name
-    summary: New branch name to be created to check in files and raise a PR.
-    description: ''
-  - name: --do-not-wait
-    summary: Do not wait for workflow completion.
-    description: ''
-  - name: --port
-    summary: Port on which your application runs. Default is 8080.
-    description: ''
-  - name: --repository
-    summary: GitHub Repository URL e.g. <a href="https://github.com/contoso/webapp">https://github.com/contoso/webapp</a>.
-    description: ''
-commands:
-- uid: ext_deploy-to-azure_az_container_app_up
-  name: az container app up
-  summary: Deploy to Azure Container Instances using GitHub Actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to Manage Azure Container Instances App.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml
deleted file mode 100644
index 3413da13df..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_functionapp
-  name: az functionapp
-  summary: Manage function apps. To install the Azure Functions Core tools see <a href="https://github.com/Azure/azure-functions-core-tools">https://github.com/Azure/azure-functions-core-tools</a>.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_functionapp_app
-  name: az functionapp app
-  summary: Commands to manage Azure Functions app.
-- uid: ext_deploy-to-azure_az_functionapp_app_up
-  name: az functionapp app up
-  summary: Deploy to Azure Functions via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage function apps. To install the Azure Functions Core tools see <a href="https://github.com/Azure/azure-functions-core-tools">https://github.com/Azure/azure-functions-core-tools</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml
deleted file mode 100644
index 9088eac4a1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/functionapp/app.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az_functionapp_app
-  name: az functionapp app
-  summary: Commands to manage Azure Functions app.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_deploy-to-azure_az_functionapp_app_up
-- uid: ext_deploy-to-azure_az_functionapp_app_up
-  name: az functionapp app up
-  summary: Deploy to Azure Functions via GitHub actions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function - Run interactive mode
-    syntax:
-      content: az functionapp app up
-  - summary: Deploy/Setup GitHub Action for locally checked out GitHub Repository to Azure Function
-    syntax:
-      content: >-
-        Repository name/url (--repository) will be detected from the local git repository
-
-        az functionapp app up --app-name AzFunctionPythonPreProd
-  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function
-    syntax:
-      content: az functionapp app up --app-name AzFunctionPythonPreProd --repository https://github.com/azure/deploy-functions
-  parameters:
-  - name: --app-name
-    summary: FunctionApp name in the subscription.
-    description: ''
-  - name: --branch-name
-    summary: New branch name to be created to check in files and raise a PR.
-    description: ''
-  - name: --do-not-wait
-    summary: Do not wait for workflow completion.
-    description: ''
-  - name: --repository -r
-    summary: GitHub repository URL e.g. <a href="https://github.com/azure/azure-cli">https://github.com/azure/azure-cli</a>.
-    description: ''
-commands:
-- uid: ext_deploy-to-azure_az_functionapp_app_up
-  name: az functionapp app up
-  summary: Deploy to Azure Functions via GitHub actions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Functions app.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/index.yml
deleted file mode 100644
index fedc8067f0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/deploy-to-azure/index.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_deploy-to-azure_az
-  name: deploy-to-azure
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_deploy-to-azure_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-- uid: ext_deploy-to-azure_az_container
-  name: az container
-  summary: Manage Azure Container Instances.
-- uid: ext_deploy-to-azure_az_functionapp
-  name: az functionapp
-  summary: Manage function apps. To install the Azure Functions Core tools see <a href="https://github.com/Azure/azure-functions-core-tools">https://github.com/Azure/azure-functions-core-tools</a>.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/aks.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/aks.yml
deleted file mode 100644
index 7ab309d8cf..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/aks.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dev-spaces_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_dev-spaces_az_aks_use_dev_spaces
-- uid: ext_dev-spaces_az_aks_use_dev_spaces
-  name: az aks use-dev-spaces
-  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, interactively selecting a dev space.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, updating to the latest Azure Dev Spaces             client components and selecting a new or existing dev space 'my-space'.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks --update --space my-space
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, selecting a new or existing dev space             'develop/my-space' without prompting for confirmation.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks -s develop/my-space -y
-  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster with a private endpoint.
-    syntax:
-      content: az aks use-dev-spaces -g my-aks-group -n my-aks -e private
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the managed cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --endpoint -e
-    defaultValue: Public
-    parameterValueGroup: None, Private, Public
-    summary: The endpoint type to be used for a Azure Dev Spaces controller. See <a href="https://aka.ms/azds-networking">https://aka.ms/azds-networking</a> for more information.
-    description: ''
-  - name: --space -s
-    summary: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
-    description: ''
-  - name: --update
-    summary: Update to the latest Azure Dev Spaces client components.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation. Requires --space.
-    description: ''
-commands:
-- uid: ext_dev-spaces_az_aks_use_dev_spaces
-  name: az aks use-dev-spaces
-  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kubernetes Services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/index.yml
deleted file mode 100644
index 94a9999409..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dev-spaces/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dev-spaces_az
-  name: dev-spaces
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_dev-spaces_az_aks
-  name: az aks
-  summary: Manage Azure Kubernetes Services.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms.yml
deleted file mode 100644
index 1057275e5a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms
-  name: az dms
-  summary: Manage Azure Data Migration Service (DMS) instances.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_dms-preview_az_dms_project
-  name: az dms project
-  summary: Manage Projects for an instance of the Data Migration Service.
-- uid: ext_dms-preview_az_dms_project_create
-  name: az dms project create
-  summary: Create a migration Project which can contain multiple Tasks.
-- uid: ext_dms-preview_az_dms_project_task
-  name: az dms project task
-  summary: Manage Tasks for a Data Migration Service instance's Project.
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-- uid: ext_dms-preview_az_dms_task
-  name: az dms task
-  summary: Manage service-level tasks for a Database Migration Service instance.
-- uid: ext_dms-preview_az_dms_task_cancel
-  name: az dms task cancel
-  summary: Cancel a service-level Task if it's currently queued or running.
-- uid: ext_dms-preview_az_dms_task_create
-  name: az dms task create
-  summary: Create and start a service-level task.
-- uid: ext_dms-preview_az_dms_task_delete
-  name: az dms task delete
-  summary: Delete a service-level Task.
-- uid: ext_dms-preview_az_dms_task_list
-  name: az dms task list
-  summary: List the service-level Tasks within a DMS instance. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
-- uid: ext_dms-preview_az_dms_task_show
-  name: az dms task show
-  summary: Show the details of a service-level Task. Use the "--expand" to get more details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Data Migration Service (DMS) instances.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project.yml
deleted file mode 100644
index 9726d7a4b5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms_project
-  name: az dms project
-  summary: Manage Projects for an instance of the Data Migration Service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_dms-preview_az_dms_project_create
-- uid: ext_dms-preview_az_dms_project_create
-  name: az dms project create
-  summary: Create a migration Project which can contain multiple Tasks.
-  description: >-
-    The following project configurations are supported:
-        -) source -> target
-        1) SQL -> SQLDB
-        2) MySQL -> AzureDbForMySql
-        3) PostgreSQL -> AzureDbForPostgreSQL
-        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API).
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a SQL Project for a DMS instance.
-    syntax:
-      content: az dms project create -l westus -n myproject -g myresourcegroup --service-name mydms --source-platform SQL --target-platform SQLDB --tags tagName1=tagValue1 tagWithNoValue
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - isRequired: true
-    name: --source-platform
-    summary: 'The type of server for the source database. The supported types are: SQL, MySQL, PostgreSQL, MongoDB.'
-    description: ''
-  - isRequired: true
-    name: --target-platform
-    summary: 'The type of service for the target database. The supported types are: SQLDB, AzureDbForMySql, AzureDbForPostgreSQL, MongoDB.'
-    description: ''
-  - name: --tags
-    summary: A space-delimited list of tags in tag1[=value1]" format.
-    description: ''
-commands:
-- uid: ext_dms-preview_az_dms_project_create
-  name: az dms project create
-  summary: Create a migration Project which can contain multiple Tasks.
-- uid: ext_dms-preview_az_dms_project_task
-  name: az dms project task
-  summary: Manage Tasks for a Data Migration Service instance's Project.
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Projects for an instance of the Data Migration Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project/task.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project/task.yml
deleted file mode 100644
index 2819b90027..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/project/task.yml
+++ /dev/null
@@ -1,407 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms_project_task
-  name: az dms project task
-  summary: Manage Tasks for a Data Migration Service instance's Project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_dms-preview_az_dms_project_task_cancel
-  - ext_dms-preview_az_dms_project_task_create
-  - ext_dms-preview_az_dms_project_task_cutover
-  - ext_dms-preview_az_dms_project_task_restart
-  - ext_dms-preview_az_dms_project_task_stop
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-  description: >-
-    To keep a more consistent experience with Azure's portal UI use:
-        az dms project task stop.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --object-name
-    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-  description: >-
-    The following task configurations are supported:
-        -) source -> target :: task type
-        1) SQL -> SQLDB :: OfflineMigration
-        2) MySQL -> AzureDbForMySql :: OnlineMigration
-        3) PostgreSQL -> AzureDbForPostgreSQL :: OnlineMigration
-        4) MongoDB -> MongoDB (for migrating to Cosmos DB via their MongoDB API) :: OfflineMigration.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create and start a SQL Task which performs no validation checks.
-    syntax:
-      content: "az dms project task create --database-options-json C:\\CliFiles\\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json '{'dataSource': 'myserver', 'authentication': 'SqlAuthentication', 'encryptConnection': 'true', 'trustServerCertificate': 'true'}' --target-connection-json C:\\CliFiles\\targetConnection.json --task-type offlinemigration"
-  - summary: Create and start a SQL Task which performs all validation checks.
-    syntax:
-      content: az dms project task create --database-options-json C:\CliFiles\databaseOptions.json -n mytask --project-name myproject -g myresourcegroup --service-name mydms --source-connection-json C:\CliFiles\sourceConnection.json --target-connection-json C:\CliFiles\targetConnection.json --enable-data-integrity-validation --enable-query-analysis-validation --enable-schema-validation --task-type offlinemigration
-  parameters:
-  - isRequired: true
-    name: --database-options-json
-    summary: Database and table information. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
-    description: >-
-      For SQL we support per table migrations. To use this, specify the tables names in the 'table_map' as below. You can also set the source as read only.
-        [
-            {
-                "name": "source database",
-                "target_database_name": "target database",
-                "make_source_db_read_only": false|true,
-                "table_map": {
-                    "schema.SourceTableName1": "schema.TargetTableName1",
-                    "schema.SourceTableName2": "schema.TargetTableName2",
-                    ...n
-                }
-            },
-            ...n
-        ]
-
-      For MySQL and PostgreSQL, the format of the database options JSON object.
-        [
-            {
-                "name": "source database",
-                "target_database_name": "target database",
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "migrationSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "sourceSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "targetSetting": {
-                    "setting1": "value1",
-                    ...n
-                }
-            },
-            ...n
-        ]
-
-      For MongoDB we support per collection migrations. To use this, specify the collections inside the database object as below.
-        {
-            // set to zero to get the default boost during migration (recommended)
-            "boostRUs": 0,
-            // "OneTime" or "Continuous", only "OneTime" is currently supported
-            "replication": "OneTime",
-            // Set to null to use maximum resources available.
-            "throttling": {
-                // percentage of the CPU to try to avoid using
-                "minFreeCpu": 25,
-                // amount of RAM (in MBs) to try to avoid using
-                "minFreeMemoryMb": 1024,
-                // max number of collections to migrate at a time
-                "maxParallelism": 2
-            },
-            "databases": {
-                "database_name": {
-                    // see <a href="https://docs.microsoft.com/th-th/azure/cosmos-db/request-units">https://docs.microsoft.com/th-th/azure/cosmos-db/request-units</a>,     ||
-                    // set to null to use default
-                    // or 0 if throughput should not be provisioned at the database level
-                    "targetRUs": 0,
-                    "collections": {
-                        "collection_name_1": {
-                            // Whether the target database/collection will be deleted if exists
-                            "canDelete": true,
-                            // set to null if target should not be sharded
-                            // or to copy the shard key from source (if exists)
-                            "shardKey": null,
-                            // set to null to use default (recommended)
-                            "targetRUs": null
-                        },
-                        "collection_name_2": {
-                            "canDelete": true,
-                            "shardKey": {
-                                "fields": [
-                                    {
-                                        "name": "field_name",
-                                        // accepts "Forward", "Reverse", or "Hashed" but CosmosDB only accepts a single-field, hashed shard key
-                                        "order": "Forward"
-                                    },
-                                    ...n
-                                ],
-                                // whether shard key is unique
-                                // see <a href="https://docs.microsoft.com/azure/cosmos-db/partition-data">https://docs.microsoft.com/azure/cosmos-db/partition-data</a>
-                                "isUnique": false
-                            },
-                            "targetRUs": 10000
-                        },
-                        ...n
-                    }
-                },
-                ...n
-            }
-        }
-
-      For Oracle to PostgreSQL, the format of the database options JSON object.
-        [
-            {
-                // "Preserve" or "ToLower". Not valid when providing "tableMap".
-                "caseManipulation": "",
-                // When provided, copies all tables within this schema, preserving the casing of the source object names,
-                // or using the value of "caseManipulation" if provided.
-                // Not valid if providing "tableMap".
-                "schemaName": "",
-                // Defines custom mapping of schemas and tables. As seen, offers freedom for mapping tables to different schemas, changing schema and table names, and modifying object name casing.
-                // Not valid if providing "schemaName".
-                "tableMap": {
-                    "SCHEMA1.TABLE1": "SCHEMA1.TABLE1",
-                    "SCHEMA2.TABLE2": "SCHEMA1.TABLE2",
-                    "SCHEMA2.TABLE3": "schema2.OtherTableName
-                    ...n
-                },
-                "targetDatabaseName": "database_name",
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "migrationSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "sourceSetting": {
-                    "setting1": "value1",
-                    ...n
-                },
-                // Used for manipulating the underlying migration engine.
-                // Only provide if instructed to do so or if you really know what you are doing.
-                "targetSetting": {
-                    "setting1": "value1",
-                    ...n
-                }
-            }
-        ].
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - isRequired: true
-    name: --source-connection-json
-    summary: The connection information to the source server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
-    description: >-
-      The format of the connection JSON object for SQL connections.
-        {
-            "userName": "user name",    // if this is missing or null, you will be prompted
-            "password": null,           // if this is missing or null (highly recommended) you will be prompted
-            "dataSource": "server name[,port]",
-            "authentication": "SqlAuthentication|WindowsAuthentication",
-            "encryptConnection": true,      // highly recommended to leave as true
-            "trustServerCertificate": false  // highly recommended to leave as false
-        }
-
-      The format of the connection JSON object for MySql connections.
-        {
-            "userName": "user name",    // if this is missing or null, you will be prompted
-            "password": null,           // if this is missing or null (highly recommended) you will be prompted
-            "serverName": "server name",
-            "port": 3306                // if this is missing, it will default to 3306
-        }
-
-      The format of the connection JSON object for PostgreSQL connections.
-        {
-            "userName": "user name",    // if this is missing or null, you will be prompted
-            "password": null,           // if this is missing or null (highly recommended) you will be prompted
-            "serverName": "server name",
-            "databaseName": "database name", // if this is missing, it will default to the 'postgres' database
-            "port": 5432,                // if this is missing, it will default to 5432
-            "encryptConnection": true,      // highly recommended to leave as true (For PostgreSQL to Azure PostgreSQL migration only)
-            "trustServerCertificate": false  // highly recommended to leave as false (For PostgreSQL to Azure PostgreSQL migration only)
-        }
-
-      The format of the connection JSON object for MongoDB connections.
-        {
-            "userName": null,   // if this is missing or null, you will be prompted
-            "password": null,   // if this is missing or null (highly recommended) you will be prompted
-            "connectionString": "mongodb://hostOrIp:port"
-        }
-
-      The format of the connection JSON object for Oracle connections.
-        {
-            "userName": null,   // if this is missing or null, you will be prompted
-            "password": null,   // if this is missing or null (highly recommended) you will be prompted
-            "dataSource": "//hostOrIp:port/serviceName"   // accepts EZConnect or Tnsnames formats
-        }.
-  - isRequired: true
-    name: --target-connection-json
-    summary: The connection information to the target server. This can be either a JSON-formatted string or the location to a file containing the JSON object. See 'source-connection-json' for examples of connection formats.
-    description: ''
-  - isRequired: true
-    name: --task-type
-    summary: 'The type of data movement the task will support. The supported types are: OnlineMigration, OfflineMigration.'
-    description: ''
-  - name: --enable-data-integrity-validation
-    summary: (For SQL only) Whether to perform a checksum based data integrity validation between source and target for the selected database and tables.
-    description: ''
-  - name: --enable-query-analysis-validation
-    summary: (For SQL only) Whether to perform a quick and intelligent query analysis by retrieving queries from the source database and executing them in the target. The result will have execution statistics for executions in source and target databases for the extracted queries.
-    description: ''
-  - name: --enable-schema-validation
-    summary: (For SQL only) Whether to compare the schema information between source and target.
-    description: ''
-  - name: --validate-only
-    summary: (For MongoDB to Cosmos DB only) Whether to run validation only and NOT run migration. It is mandatory to run a 'validate only' task before attempting an actual migration. Once the validation is complete, pass the name of this 'validate only' task to a new task's 'validated task name' argument.
-    description: ''
-  - name: --validated-task-name
-    summary: (For MongoDB to Cosmos DB only) When running a migration it is neceaary to pass in the name of a previously run 'validate only' task.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-  description: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --immediate
-    summary: For MongoDB migrations, whether to cutover immediately or to let the currently loaded events get migrated. For all other migration types, this has no effect.
-    description: ''
-  - name: --object-name
-    summary: For MongoDB migrations, the qualified name of the database or collection you wish to cutover. Leave blank to cutover the entire migration. For all other migration types, the name of the database on the source you wish to cutover.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: ''
-  description: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --object-name
-    summary: The qualified name of the database or collection you wish to restart. Leave blank to restart the entire migration.
-    description: ''
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-  description: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Project Task is the activity that performs migration related work. There could be multiple Tasks associated with a Project.
-    description: ''
-  - isRequired: true
-    name: --project-name
-    summary: The name of the Project. DMS Project is a logical grouping that encompasses source database connection, target database connection and a list of databases to migrate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service. DMS Service is an Azure instance that performs database migrations.
-    description: ''
-  - name: --object-name
-    summary: Supported by MongoDB migrations only. The qualified name of the database or collection you wish to stop. Leave blank to stop the entire migration.
-    description: ''
-commands:
-- uid: ext_dms-preview_az_dms_project_task_cancel
-  name: az dms project task cancel
-  summary: This command is being deprecated. Use the stop command instead.
-- uid: ext_dms-preview_az_dms_project_task_create
-  name: az dms project task create
-  summary: Create and start a migration Task.
-- uid: ext_dms-preview_az_dms_project_task_cutover
-  name: az dms project task cutover
-  summary: For an online migration task, complete the migration by performing a cutover.
-- uid: ext_dms-preview_az_dms_project_task_restart
-  name: az dms project task restart
-  summary: >-
-    To see the result of the request, please use the 'task show' command:
-        az dms project task show ... --expand command.
-- uid: ext_dms-preview_az_dms_project_task_stop
-  name: az dms project task stop
-  summary: Stops the task, or stops migration on the specified object (MongoDB migrations only).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Tasks for a Data Migration Service instance's Project.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/task.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/task.yml
deleted file mode 100644
index 5e3db9b7ae..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/dms/task.yml
+++ /dev/null
@@ -1,195 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az_dms_task
-  name: az dms task
-  summary: Manage service-level tasks for a Database Migration Service instance.
-  description: Service-level tasks are non-migration tasks that are performed at the service level. This is usually for administrative and maintenance work which applies to the service's agent and VM.
-  langs:
-  - azurecli
-  children:
-  - ext_dms-preview_az_dms_task_cancel
-  - ext_dms-preview_az_dms_task_create
-  - ext_dms-preview_az_dms_task_delete
-  - ext_dms-preview_az_dms_task_list
-  - ext_dms-preview_az_dms_task_show
-- uid: ext_dms-preview_az_dms_task_cancel
-  name: az dms task cancel
-  summary: Cancel a service-level Task if it's currently queued or running.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a service-level task
-    syntax:
-      content: az dms task cancel -g myresourcegroup --service-name mydms -n mytask
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-- uid: ext_dms-preview_az_dms_task_create
-  name: az dms task create
-  summary: Create and start a service-level task.
-  description: >-
-    The following tasks are currently supported:
-        1) Check OCI driver against Oracle source to check for compatibility
-        2) Upload OCI driver install package
-        3) Install an already uploaded OCI driver package.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a service-level task which checks if the currently installed OCI driver supports
-    syntax:
-      content: 'az dms task create -g myresourcegroup --service-name mydms -n checkocitask1 --task-options-json "{"serverVersion": "12.2.0.1"}" --task-type CheckOciDriver'
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-  - isRequired: true
-    name: --task-options-json
-    summary: Information and settings relevant to the particular task's type. This can be either a JSON-formatted string or the location to a file containing the JSON object. See examples below for the format.
-    description: >-
-      For CheckOciDriver:
-          {
-              // The version of your Oracle source server against which to check the driver's compatibility.
-              // Can also be null to get a list of supported versions.
-              "serverVersion": "Oracle source version"
-          }
-
-      For UploadOciDriver:
-          {
-              "ociDriverPath": File share path of the driver install package,
-              "userName": "user name",    // if this is missing or null, you will be prompted
-              "password": "password"      // if this is missing or null (highly recommended) you will be prompted
-          }
-
-      For InstallOciDriver:
-          {
-              // The output of the UploadOciDriver task can be used here
-              "ociDriverPackageName": "Oci driver installer package name"
-          }.
-  - isRequired: true
-    name: --task-type
-    summary: The type of task to create. The supported types are CheckOciDriver, UploadOciDriver, and InstallOciDriver.
-    description: ''
-- uid: ext_dms-preview_az_dms_task_delete
-  name: az dms task delete
-  summary: Delete a service-level Task.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-  - name: --delete-running-tasks
-    summary: Delete the service-level Task even if the Task is currently running.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_dms-preview_az_dms_task_list
-  name: az dms task list
-  summary: List the service-level Tasks within a DMS instance. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Tasks within a DMS instance.
-    syntax:
-      content: az dms task list -g myresourcegroup -n mydms
-  - summary: List only the tasks that check the OCI driver compatibility within a DMS instance.
-    syntax:
-      content: az dms task list -g myresourcegroup -n mydms --task-type Service.Check.OCI
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --task-type
-    summary: The type of task to be listed. For the list of possible types see "az dms check-status".
-    description: ''
-- uid: ext_dms-preview_az_dms_task_show
-  name: az dms task show
-  summary: Show the details of a service-level Task. Use the "--expand" to get more details.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Task. A DMS Task is the activity that performs service-level related work. There could be multiple Tasks associated with a service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the Service.
-    description: ''
-  - name: --expand
-    summary: Expand the response to provide more details. Use with "command" to see more details of the Task. Use with "output" to see the results of the Task's migration.
-    description: ''
-commands:
-- uid: ext_dms-preview_az_dms_task_cancel
-  name: az dms task cancel
-  summary: Cancel a service-level Task if it's currently queued or running.
-- uid: ext_dms-preview_az_dms_task_create
-  name: az dms task create
-  summary: Create and start a service-level task.
-- uid: ext_dms-preview_az_dms_task_delete
-  name: az dms task delete
-  summary: Delete a service-level Task.
-- uid: ext_dms-preview_az_dms_task_list
-  name: az dms task list
-  summary: List the service-level Tasks within a DMS instance. Some tasks may have a status of Unknown, which indicates that an error occurred while querying the status of that task.
-- uid: ext_dms-preview_az_dms_task_show
-  name: az dms task show
-  summary: Show the details of a service-level Task. Use the "--expand" to get more details.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Service-level tasks are non-migration tasks that are performed at the service level. This is usually for administrative and maintenance work which applies to the service's agent and VM.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/index.yml
deleted file mode 100644
index 940baefdbc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/dms-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_dms-preview_az
-  name: dms-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_dms-preview_az_dms
-  name: az dms
-  summary: Manage Azure Data Migration Service (DMS) instances.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid.yml
deleted file mode 100644
index 151dfb9f4d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid.yml
+++ /dev/null
@@ -1,314 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid
-  name: az eventgrid
-  summary: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain
-  name: az eventgrid domain
-  summary: Manage event domains.
-- uid: ext_eventgrid_az_eventgrid_domain_create
-  name: az eventgrid domain create
-  summary: Create a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_delete
-  name: az eventgrid domain delete
-  summary: Delete a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key
-  name: az eventgrid domain key
-  summary: Manage shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_list
-  name: az eventgrid domain list
-  summary: List available domains.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-  name: az eventgrid domain private-endpoint-connection
-  summary: Manage private endpoint connection resources of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-  name: az eventgrid domain private-link-resource
-  summary: Manage private link resource of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_show
-  name: az eventgrid domain show
-  summary: Get the details of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic
-  name: az eventgrid domain topic
-  summary: Manage event domain topics.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-- uid: ext_eventgrid_az_eventgrid_domain_update
-  name: az eventgrid domain update
-  summary: Update a domain.
-- uid: ext_eventgrid_az_eventgrid_event_subscription
-  name: az eventgrid event-subscription
-  summary: Manage event subscriptions.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_create
-  name: az eventgrid event-subscription create
-  summary: Create a new event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-  name: az eventgrid event-subscription delete
-  summary: Delete an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_list
-  name: az eventgrid event-subscription list
-  summary: List event subscriptions.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_show
-  name: az eventgrid event-subscription show
-  summary: Get the details of an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_update
-  name: az eventgrid event-subscription update
-  summary: Update an event subscription.
-- uid: ext_eventgrid_az_eventgrid_extension_topic
-  name: az eventgrid extension-topic
-  summary: Manage Azure Event Grid extension topics.
-- uid: ext_eventgrid_az_eventgrid_extension_topic_show
-  name: az eventgrid extension-topic show
-  summary: Get the details of an extension topic.
-- uid: ext_eventgrid_az_eventgrid_partner
-  name: az eventgrid partner
-  summary: Manage partner resources.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace
-  name: az eventgrid partner namespace
-  summary: Manage partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_registration
-  name: az eventgrid partner registration
-  summary: Manage partner registrations.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_topic
-  name: az eventgrid partner topic
-  summary: Manage partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic
-  name: az eventgrid system-topic
-  summary: Manage system topics.
-- uid: ext_eventgrid_az_eventgrid_system_topic_create
-  name: az eventgrid system-topic create
-  summary: Create a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_delete
-  name: az eventgrid system-topic delete
-  summary: Delete a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-  name: az eventgrid system-topic event-subscription
-  summary: Manage event subscriptions of system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_list
-  name: az eventgrid system-topic list
-  summary: List available system topics.
-- uid: ext_eventgrid_az_eventgrid_system_topic_show
-  name: az eventgrid system-topic show
-  summary: Get the details of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_update
-  name: az eventgrid system-topic update
-  summary: Update a system topic.
-- uid: ext_eventgrid_az_eventgrid_topic
-  name: az eventgrid topic
-  summary: Manage Azure Event Grid topics.
-- uid: ext_eventgrid_az_eventgrid_topic_create
-  name: az eventgrid topic create
-  summary: Create a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_delete
-  name: az eventgrid topic delete
-  summary: Delete a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key
-  name: az eventgrid topic key
-  summary: Manage shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_list
-  name: az eventgrid topic list
-  summary: List available topics.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-  name: az eventgrid topic private-endpoint-connection
-  summary: Manage private endpoint connections of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-  name: az eventgrid topic private-link-resource
-  summary: Manage private link resource of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_show
-  name: az eventgrid topic show
-  summary: Get the details of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_update
-  name: az eventgrid topic update
-  summary: Update a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_type
-  name: az eventgrid topic-type
-  summary: Get details for topic types.
-- uid: ext_eventgrid_az_eventgrid_topic_type_list
-  name: az eventgrid topic-type list
-  summary: List registered topic types.
-- uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  name: az eventgrid topic-type list-event-types
-  summary: List the event types supported by a topic type.
-- uid: ext_eventgrid_az_eventgrid_topic_type_show
-  name: az eventgrid topic-type show
-  summary: Get the details for a topic type.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml
deleted file mode 100644
index 961d1631fa..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain.yml
+++ /dev/null
@@ -1,263 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain
-  name: az eventgrid domain
-  summary: Manage event domains.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_create
-  - ext_eventgrid_az_eventgrid_domain_delete
-  - ext_eventgrid_az_eventgrid_domain_list
-  - ext_eventgrid_az_eventgrid_domain_show
-  - ext_eventgrid_az_eventgrid_domain_update
-- uid: ext_eventgrid_az_eventgrid_domain_create
-  name: az eventgrid domain create
-  summary: Create a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new domain.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2
-  - summary: Create a new domain with custom input mappings.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=mytopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
-  - summary: Create a new domain that accepts events published in CloudEvents V1.0 schema and maps a property mytopicfield to the topic name.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2 --input-schema cloudeventschemav1_0 --input-mapping-fields topic=mytopicfield
-  - summary: Create a new domain which allows specific inbound ip rules.
-    syntax:
-      content: az eventgrid domain create -g rg1 --name domain1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku basic
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --input-mapping-default-values
-    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
-    description: ''
-  - name: --input-mapping-fields
-    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
-    description: ''
-  - name: --input-schema
-    defaultValue: eventgridschema
-    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
-    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
-    description: ''
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    defaultValue: Basic
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_delete
-  name: az eventgrid domain delete
-  summary: Delete a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a domain.
-    syntax:
-      content: az eventgrid domain delete -g rg1 --name domain1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_list
-  name: az eventgrid domain list
-  summary: List available domains.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all domains in the current Azure subscription.
-    syntax:
-      content: az eventgrid domain list
-  - summary: List all domains in a resource group.
-    syntax:
-      content: az eventgrid domain list -g rg1
-  - summary: List all domains in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid domain list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all domains in a resource group except the domain with name "name1"
-    syntax:
-      content: az eventgrid domain list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_show
-  name: az eventgrid domain show
-  summary: Get the details of a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a domain.
-    syntax:
-      content: az eventgrid domain show -g rg1 -n domain1
-  - summary: Show the details of a domain based on resource ID.
-    syntax:
-      content: az eventgrid domain show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_update
-  name: az eventgrid domain update
-  summary: Update a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties of an existing domain.
-    syntax:
-      content: az eventgrid domain update -g rg1 --name domain1 --sku Basic --identity noidentity --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_create
-  name: az eventgrid domain create
-  summary: Create a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_delete
-  name: az eventgrid domain delete
-  summary: Delete a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key
-  name: az eventgrid domain key
-  summary: Manage shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_list
-  name: az eventgrid domain list
-  summary: List available domains.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-  name: az eventgrid domain private-endpoint-connection
-  summary: Manage private endpoint connection resources of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-  name: az eventgrid domain private-link-resource
-  summary: Manage private link resource of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_show
-  name: az eventgrid domain show
-  summary: Get the details of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic
-  name: az eventgrid domain topic
-  summary: Manage event domain topics.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-- uid: ext_eventgrid_az_eventgrid_domain_update
-  name: az eventgrid domain update
-  summary: Update a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event domains.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml
deleted file mode 100644
index 2ae9c45571..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/key.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_key
-  name: az eventgrid domain key
-  summary: Manage shared access keys of a domain.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_key_list
-  - ext_eventgrid_az_eventgrid_domain_key_regenerate
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List shared access keys of a domain. (autogenerated)
-    syntax:
-      content: az eventgrid domain key list --name MyDomain --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: Key name to regenerate key1 or key2.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_key_list
-  name: az eventgrid domain key list
-  summary: List shared access keys of a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-  name: az eventgrid domain key regenerate
-  summary: Regenerate a shared access key of a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared access keys of a domain.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml
deleted file mode 100644
index 1b896397b0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-endpoint-connection.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-  name: az eventgrid domain private-endpoint-connection
-  summary: Manage private endpoint connection resources of a domain.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  - ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Approve a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection approve -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Comments for the approval.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete private endpoint connection for a specific domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection delete -g rg1 --domain-name domain1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection list -g rg1 -n domain1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reject a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection reject -g rg1 --domain-name domain1 -n domain1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: Comments for the rejection.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-endpoint-connection show -g rg1 --domain-name domain1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-  name: az eventgrid domain private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-  name: az eventgrid domain private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-  name: az eventgrid domain private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-  name: az eventgrid domain private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-  name: az eventgrid domain private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private endpoint connection resources of a domain.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml
deleted file mode 100644
index 6febea5d63..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/private-link-resource.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-  name: az eventgrid domain private-link-resource
-  summary: Manage private link resource of a domain.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  - ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-link-resource list -g rg1 --domain-name domain1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a domain.
-    syntax:
-      content: az eventgrid domain private-link-resource show -g rg1 --domain-name domain1 -n domain
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private link resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-  name: az eventgrid domain private-link-resource list
-  summary: List the properties of all the private link resources for a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-  name: az eventgrid domain private-link-resource show
-  summary: Display the properties of a private link resource for a domain.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private link resource of a domain.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml
deleted file mode 100644
index 9b371e5b93..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/domain/topic.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_domain_topic
-  name: az eventgrid domain topic
-  summary: Manage event domain topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_domain_topic_create
-  - ext_eventgrid_az_eventgrid_domain_topic_delete
-  - ext_eventgrid_az_eventgrid_domain_topic_list
-  - ext_eventgrid_az_eventgrid_domain_topic_show
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new domain topic under domain.
-    syntax:
-      content: az eventgrid domain topic create -g rg1 --domain-name domain1 --name domaintopic1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a domain topic.
-    syntax:
-      content: az eventgrid domain topic delete -g rg1 --domain-name domain1 --name domaintopic1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all topics in a domain.
-    syntax:
-      content: az eventgrid domain topic list -g rg1 --domain-name domain1
-  - summary: List all domain topics in a domain whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all domain topics in a domain except the domain topic with name "name1"
-    syntax:
-      content: az eventgrid domain topic list -g rg1 --domain-name domain1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a domain topic.
-    syntax:
-      content: az eventgrid domain topic show -g rg1 --domain-name domain1 --name topic1
-  parameters:
-  - isRequired: true
-    name: --domain-name
-    summary: Name of the domain.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the domain topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_domain_topic_create
-  name: az eventgrid domain topic create
-  summary: Create a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-  name: az eventgrid domain topic delete
-  summary: Delete a domain topic under a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_list
-  name: az eventgrid domain topic list
-  summary: List available topics in a domain.
-- uid: ext_eventgrid_az_eventgrid_domain_topic_show
-  name: az eventgrid domain topic show
-  summary: Get the details of a domain topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event domain topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml
deleted file mode 100644
index fab570bbbc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/event-subscription.yml
+++ /dev/null
@@ -1,644 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_event_subscription
-  name: az eventgrid event-subscription
-  summary: Manage event subscriptions.
-  description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_event_subscription_create
-  - ext_eventgrid_az_eventgrid_event_subscription_delete
-  - ext_eventgrid_az_eventgrid_event_subscription_list
-  - ext_eventgrid_az_eventgrid_event_subscription_show
-  - ext_eventgrid_az_eventgrid_event_subscription_update
-- uid: ext_eventgrid_az_eventgrid_event_subscription_create
-  name: az eventgrid event-subscription create
-  summary: Create a new event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new event subscription for an Event Grid topic, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for an Azure subscription subscription, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for a resource group, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for a storage account, using default filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1"  \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for a storage account, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create  --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  - summary: Create a new event subscription for an Azure subscription, with a filter specifying a subject prefix.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es4 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-begins-with mysubject_prefix
-  - summary: Create a new event subscription for a resource group, with a filter specifying a subject suffix.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es5 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-ends-with mysubject_suffix
-  - summary: Create a new event subscription for an Azure subscription, using default filters, and an EventHub as a destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint-type eventhub \
-            --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.EventHub/namespaces/n1/eventhubs/EH1
-  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure Storage queue as a destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint-type storagequeue \
-            --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/queueservices/default/queues/q1
-  - summary: Create a new event subscription for an Azure subscription, using default filters, and an Azure ServiceBusQueue as a destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --endpoint-type servicebusqueue \
-            --endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.ServiceBus/namespaces/ns1/queues/queue1
-  - summary: Create a new event subscription for an Event Grid domain, using default filters, and CloudEvent V 1.0 as the delivery schema.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --event-delivery-schema cloudeventschemav1_0
-  - summary: Create a new event subscription for a storage account, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier).
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
-            --max-delivery-attempts 10 --event-ttl 120
-  - summary: Create a new event subscription for a domain topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/t1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription (for a storage account) with an expiration date.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/sa1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --expiration-date "2018-10-31"
-  - summary: Create a new event subscription for an Event Grid topic, using Azure Active Directory enabled Webhook as a destination .
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --azure-active-directory-tenant-id azureactivedirectorytenantid
-            --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
-  - summary: Create a new event subscription for an Event Grid topic, using Azure Function as destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
-  - summary: Create a new event subscription for an Event Grid topic, using Eventhub with systemassigned MSI identity as destination and with deadletter with MSI identity
-    syntax:
-      content: >-
-        az eventgrid event-subscription create --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --delivery-identity-endpoint-type eventhub --delivery-identity systemassigned --delivery-identity-endpoint /subscriptions/{SubId2|}/resourceGroups/{RG2}/providers/Microsoft.eventhub/namespaces/{EventHubNamespace}/eventhubs/{EventhubName} \
-            --deadletter-identity-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 --deadletter-identity systemassigned -n {EventSubscriptionName}
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --azure-active-directory-application-id-or-uri
-    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --azure-active-directory-tenant-id
-    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
-  - name: --deadletter-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the deadletter destination resource.
-    description: ''
-  - name: --deadletter-identity-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --delivery-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
-    description: ''
-  - name: --delivery-identity-endpoint
-    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --delivery-identity-endpoint-type
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint with resource identity.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --event-delivery-schema
-    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
-    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
-    description: ''
-  - name: --event-ttl
-    defaultValue: "1440"
-    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
-    description: ''
-  - name: --expiration-date
-    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --max-delivery-attempts
-    defaultValue: "30"
-    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
-    description: ''
-  - name: --max-events-per-batch
-    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
-    description: ''
-  - name: --preferred-batch-size-in-kilobytes
-    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource to which the event subscription needs to be created.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-case-sensitive
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-  name: az eventgrid event-subscription delete
-  summary: Delete an event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an event subscription for an Event Grid topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
-  - summary: Delete an event subscription for an Event Grid domain topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1/topics/topic1
-  - summary: Delete an event subscription for an Event Grid domain.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/domain1
-  - summary: Delete an event subscription for an Azure subscription.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es2 \
-            --source-resource-id /subscriptions/{SubID}
-  - summary: Delete an event subscription for a resource group.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
-  - summary: Delete an event subscription for a storage account.
-    syntax:
-      content: >-
-        az eventgrid event-subscription delete --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be deleted.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_list
-  name: az eventgrid event-subscription list
-  summary: List event subscriptions.
-  description: >-
-    Event Grid supports both regional and global event subscriptions: Event subscriptions on regional resources (such as Storage accounts or Event Grid topics) are regional, while event subscriptions on global resources (such as an Azure subscription or resource group) are global.
-
-    Hence, you can list event subscriptions in a few different ways:
-
-    1. To list by the resource ID of the resource whose event subscriptions you want to list, specify the --source-resource-id parameter. No other parameters must be specified.
-
-    2. To list by a topic-type (e.g. storage accounts), specify the --topic-type parameter along with --location (e.g. "westus2") parameter. For global topic types (e.g. "Microsoft.Resources.Subscriptions"), specify the location value as "global".
-
-    3. To list all event subscriptions in a region (across all topic types), specify only the --location parameter.
-
-    4. For both #2 and #3 above, to filter only by a resource group, you can additionally specify the --resource-group parameter.
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event subscriptions created for an Event Grid topic.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
-  - summary: List all event subscriptions created for a storage account.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob
-  - summary: List all event subscriptions created for an Azure subscription.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}
-  - summary: List all event subscriptions created for a resource group.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}
-  - summary: List all event subscriptions for an Event Grid domain.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1
-  - summary: List all event subscriptions for an Event Grid domain topic.
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1/topics/topic1
-  - summary: List all Storage event subscriptions (under the currently selected Azure subscription) in westus2.
-    syntax:
-      content: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2
-  - summary: List all Storage event subscriptions (under the given resource group) in westus2.
-    syntax:
-      content: az eventgrid event-subscription list --topic-type Microsoft.Storage.StorageAccounts --location westus2 --resource-group {RG}
-  - summary: List all regional or global event subscriptions (under the currently selected Azure subscription).
-    syntax:
-      content: >-
-        az eventgrid event-subscription list --location westus2
-
-        az eventgrid event-subscription list --location global
-  - summary: List all regional or global event subscriptions under a specified resource group.
-    syntax:
-      content: >-
-        az eventgrid event-subscription list --location westus2 --resource-group {RG}
-
-        az eventgrid event-subscription list --location global --resource-group {RG}
-  - summary: List all event subscriptions for an Event Grid domain whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all event subscriptions for an Event Grid domain except the event subscription with name "name1"
-    syntax:
-      content: az eventgrid event-subscription list --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/domains/d1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be listed.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-  - name: --topic-type-name
-    summary: Name of the topic-type whose event subscriptions need to be listed. When this is specified, you must also specify --location.
-    description: >-
-      Example 1: List all Storage event subscriptions in WestUS2
-          --resource-group TestRG --topic-type-name Microsoft.Storage.StorageAccounts --location westus2
-      Example 2: List all event subscriptions on Azure subscriptions
-          --topic-type-name Microsoft.Resources.Subscriptions --location global.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_show
-  name: az eventgrid event-subscription show
-  summary: Get the details of an event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event subscription for an Event Grid topic.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/topic1
-  - summary: Show the details of an event subscription for an Azure subscription.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es2 \
-            --source-resource-id /subscriptions/{SubID}
-  - summary: Show the details of an event subscription for a resource group.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-  - summary: Show the details of an event subscription for a storage account.
-    syntax:
-      content: >-
-        az eventgrid event-subscription show --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/microsoft.storage/storageaccounts/kalsegblob
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --include-full-endpoint-url
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be shown.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_update
-  name: az eventgrid event-subscription update
-  summary: Update an event subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an event subscription for an Event Grid topic to specify a new endpoint.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es1 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for an Azure subscription to specify a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es2 \
-            --source-resource-id /subscriptions/{SubID} \
-            --subject-ends-with .jpg
-  - summary: Update an event subscription for a resource group to specify a new endpoint and a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es3 \
-            --source-resource-id /subscriptions/{SubID}/resourceGroups/{RG} \
-            --subject-ends-with .png \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for a storage account to specify a new list of included event types.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/microsoft.storage/storageaccounts/kalsegblob" \
-            --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
-  - summary: Update an event subscription for a storage account, to include a deadletter destination.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es2 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/kalsegblob" \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
-  - summary: Update an event subscription for a storage account, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid event-subscription update --name es3 \
-            --source-resource-id "/subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageaccounts/s1" \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --deadletter-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the deadletter destination resource.
-    description: ''
-  - name: --deadletter-identity-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination with identity where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --delivery-identity
-    parameterValueGroup: systemassigned
-    summary: The identity type of the delivery destination resource (e.g., storage queue, or eventhub).
-    description: ''
-  - name: --delivery-identity-endpoint
-    summary: Endpoint with identity where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --delivery-identity-endpoint-type
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint with resource identity.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --source-resource-id
-    summary: Fully qualified identifier of the Azure resource whose event subscription needs to be updated.
-    description: >-
-      Usage:                      --source-resource-id Azure-Resource-ID
-
-      For Azure subscription:     --source-resource-id /subscriptions/{SubID}
-
-      For resource group:         --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1
-
-      For EventGrid topic:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/topics/t1
-
-      For storage account:        --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageaccounts/sa1
-
-      For EventGrid domain:       --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1
-
-      For EventGrid domain topic: --source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.EventGrid/domains/d1/topics/t1.
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_event_subscription_create
-  name: az eventgrid event-subscription create
-  summary: Create a new event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-  name: az eventgrid event-subscription delete
-  summary: Delete an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_list
-  name: az eventgrid event-subscription list
-  summary: List event subscriptions.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_show
-  name: az eventgrid event-subscription show
-  summary: Get the details of an event subscription.
-- uid: ext_eventgrid_az_eventgrid_event_subscription_update
-  name: az eventgrid event-subscription update
-  summary: Update an event subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event subscriptions for an Event Grid topic, domain, domain topic, Azure subscription, resource group or for any other Azure resource that supports event notifications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml
deleted file mode 100644
index 7aa704cdc3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/extension-topic.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_extension_topic
-  name: az eventgrid extension-topic
-  summary: Manage Azure Event Grid extension topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_extension_topic_show
-- uid: ext_eventgrid_az_eventgrid_extension_topic_show
-  name: az eventgrid extension-topic show
-  summary: Get the details of an extension topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an extension topic.
-    syntax:
-      content: az eventgrid extension-topic show --scope /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Storage/storageAccounts/{StorageAccountName}
-  parameters:
-  - isRequired: true
-    name: --scope
-    summary: The identifier of the resource to which extension topic is queried. The scope can be a subscription, or a resource group, or a top level resource belonging to a resource provider namespace. For example, use '/subscriptions/{subscriptionId}/' for a subscription, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for a resource group, and '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}' for Azure resource.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_extension_topic_show
-  name: az eventgrid extension-topic show
-  summary: Get the details of an extension topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Event Grid extension topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml
deleted file mode 100644
index 6a6288e98d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner
-  name: az eventgrid partner
-  summary: Manage partner resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace
-  name: az eventgrid partner namespace
-  summary: Manage partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_registration
-  name: az eventgrid partner registration
-  summary: Manage partner registrations.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_topic
-  name: az eventgrid partner topic
-  summary: Manage partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml
deleted file mode 100644
index 027cf47ff6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace
-  name: az eventgrid partner namespace
-  summary: Manage partner namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_namespace_create
-  - ext_eventgrid_az_eventgrid_partner_namespace_delete
-  - ext_eventgrid_az_eventgrid_partner_namespace_list
-  - ext_eventgrid_az_eventgrid_partner_namespace_show
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new partner namespace.
-    syntax:
-      content: az eventgrid partner namespace create -g rg1 --name namespaceName1 -l westus2 --partner-registration-id 795c9f2f-6d2d-42ff-a570-42fd3043192c
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --partner-registration-id
-    summary: 'The fully qualified ARM Id of the partner registration that should be associated with this partner namespace. This takes the following format: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/partnerRegistrations/{partnerRegistrationName}.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific partner namespace.
-    syntax:
-      content: az eventgrid partner namespace delete -g rg1 --name partnernamespace1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all partner namespaces in the current Azure subscription.
-    syntax:
-      content: az eventgrid partner namespace list
-  - summary: List all partner namespaces in a resource group.
-    syntax:
-      content: az eventgrid partner namespace list -g rg1
-  - summary: List all partner namespaces in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner namespace list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all partner namespaces in a resource group except the partner namespace with name "name1"
-    syntax:
-      content: az eventgrid partner namespace list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a partner namespace.
-    syntax:
-      content: az eventgrid partner namespace show -g rg1 -n partnernamespace1
-  - summary: Show the details of a partner namespace based on resource ID.
-    syntax:
-      content: az eventgrid partner namespace show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-  name: az eventgrid partner namespace create
-  summary: Create a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-  name: az eventgrid partner namespace delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-  name: az eventgrid partner namespace list
-  summary: List available partner namespaces.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-  name: az eventgrid partner namespace show
-  summary: Get the details of a partner namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner namespaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml
deleted file mode 100644
index 8bc8efbfba..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/event-channel.yml
+++ /dev/null
@@ -1,197 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-  name: az eventgrid partner namespace event-channel
-  summary: Manage partner event channels.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  - ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a specific event channel.
-    syntax:
-      content: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1
-  - summary: Create a specific event channel with an activation expiration time and partner topic friendly description.
-    syntax:
-      content: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --activation-expiration-date '2020-05-20T10:00' --partner-topic-description 'This topic is created by Costoco corp on user behavior.'
-  - summary: Create a specific event channel with publisher filters.
-    syntax:
-      content: az eventgrid partner namespace event-channel create -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1 --source SourceExample1 --destination-subscription-id 61f7c265-374d-499e-866d-5f4cc302b888 --destination-resource-group rg2 --desination-topic-name topicName1 --publisher-filter data.key1 NumberIn 2 3 4 100 200 --publisher-filter data.key2 StringIn 2 3 4 100 200
-  parameters:
-  - isRequired: true
-    name: --desination-topic-name
-    summary: Name of the partner topic associated with the event channel.
-    description: ''
-  - isRequired: true
-    name: --destination-resource-group
-    summary: Azure Resource Group of the customer creating the event channel. The partner topic associated with the event channel will be created under this resource group.
-    description: ''
-  - isRequired: true
-    name: --destination-subscription-id
-    summary: Azure subscription Id of the customer creating the event channel. The partner topic associated with the event channel will be created under this Azure subscription.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event channel.
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source
-    summary: The identifier of the resource that forms the partner source of the events. This represents a unique resource in the partner's resource model.
-    description: ''
-  - name: --activation-expiration-date
-    summary: Date or datetime in UTC ISO 8601 format (e.g., '2022-02-17T01:59:59+00:00' or '2022-02-17') after which the event channel and corresponding partner topic would expire and get auto deleted. If this time is not specified, the expiration date is set to seven days by default.
-    description: ''
-  - name: --partner-topic-description
-    summary: Friendly description of the corresponding partner topic. This will be helpful to remove any ambiguity of the origin of creation of the partner topic for the customer.
-    description: ''
-  - name: --publisher-filter
-    summary: A publisher filter that is used to enable filtering of events based on a specific event property. This set of filters that are specified by the publisher in order to determine which events to be received by the subscriber.
-    description: >-
-      Usage:                     --publisher-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --publisher-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --publisher-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --publisher-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --publisher-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --publisher-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --publisher-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --publisher-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --publisher-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --publisher-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --publisher-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --publisher-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --publisher-filter data.property3 BoolEquals true
-
-      Multiple publisher filters can be specified by using more than one `--publisher-filter` argument.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific partner namespace.
-    syntax:
-      content: az eventgrid partner namespace event-channel delete -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event channel.
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event-channels in a specific partner namespace.
-    syntax:
-      content: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1
-  - summary: List all event channel under a partner namespace whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner namespace event-channel list -g rg1 --partner-namespace-name partnernamespace1  --odata-query "Contains(name, 'XYZ')"
-  parameters:
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event channel.
-    syntax:
-      content: az eventgrid partner namespace event-channel show -g rg1 --partner-namespace-name partnernamespace1 -n eventChannelName1
-  - summary: Show the details of an event-channel based on resource ID.
-    syntax:
-      content: az eventgrid partner namespace event-channel show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnenamespaces/partnernamespace1/eventChannels/eventChannelName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event channel.
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-  name: az eventgrid partner namespace event-channel create
-  summary: Create an event channel under a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-  name: az eventgrid partner namespace event-channel delete
-  summary: Delete a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-  name: az eventgrid partner namespace event-channel list
-  summary: List available partner event-channels.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-  name: az eventgrid partner namespace event-channel show
-  summary: Get the details of an event channel under a partner namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner event channels.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml
deleted file mode 100644
index 949b6eb377..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/namespace/key.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-  name: az eventgrid partner namespace key
-  summary: Manage shared access keys of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  - ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List shared access keys of a partner namespace (autogenerated)
-    syntax:
-      content: az eventgrid partner namespace key list --partner-namespace-name MyNamespace --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: Key name to regenerate (key1 or key2).
-    description: ''
-  - isRequired: true
-    name: --partner-namespace-name
-    summary: Name of the partner namespace.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-  name: az eventgrid partner namespace key list
-  summary: List shared access keys of a partner namespace.
-- uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-  name: az eventgrid partner namespace key regenerate
-  summary: Regenerate a shared access key of a partner namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared access keys of a partner namespace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml
deleted file mode 100644
index 07c75f6d36..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/registration.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_registration
-  name: az eventgrid partner registration
-  summary: Manage partner registrations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_registration_create
-  - ext_eventgrid_az_eventgrid_partner_registration_delete
-  - ext_eventgrid_az_eventgrid_partner_registration_list
-  - ext_eventgrid_az_eventgrid_partner_registration_show
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new partner registration with basic information.
-    syntax:
-      content: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445
-  - summary: Create a new partner registration with partner information.
-    syntax:
-      content: az eventgrid partner registration create -g rg1 --name partnerRegistrationName1 --partner-name Contoso --resource-type-name Accounts --authorized-subscription-ids 533ad9de-25db-46e2-b94a-d00c37cf022b 05aa2228-7d34-4635-922d-2b582c422445 --description ExampleDescription --display-name ExampleDisplayName1 --logo-uri 'https://www.example.com/logo.png' --setup-uri 'https://www.example.com' --long-description 'This is sample description}' --customer-service-number '+1 800 123 4567' --customer-service-extension '125' --customer-service-uri 'https://www.example.com/customerservice'
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner registration.
-    description: ''
-  - isRequired: true
-    name: --partner-name
-    summary: Official name of the partner.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-type-name
-    summary: Name of the partner topic resource type. This name should be unique among all partner topic types names.
-    description: ''
-  - name: --authorized-subscription-ids
-    summary: A space-separated list of Azure subscription Ids that are authorized to create a partner namespace associated with this partner registration. This is an optional property. Creating partner namespaces is always permitted under the same Azure subscription as the one used for creating the partner registration.
-    description: ''
-  - name: --customer-service-extension
-    summary: The extension of the customer service number of the publisher. Only digits are allowed and number of digits should not exceed 10.
-    description: ''
-  - name: --customer-service-number
-    summary: "The customer service number of the publisher. The expected phone format should start with a '+' sign followed by the country code. The remaining digits are then followed. Only digits and spaces are allowed and its length cannot exceed 16 digits including country code. Examples of valid phone numbers are: +1 515 123 4567 and +966 7 5115 2471. Examples of invalid phone numbers are: +1 (515) 123-4567, 1 515 123 4567 and +966 121 5115 24 7 551 1234 43."
-    description: ''
-  - name: --customer-service-uri
-    summary: The customer service URI of the publisher.
-    description: ''
-  - name: --description
-    summary: Description of the partner topic type.
-    description: ''
-  - name: --display-name
-    summary: Display name for the partner topic type.
-    description: ''
-  - name: --logo-uri
-    summary: URI of the partner logo.
-    description: ''
-  - name: --long-description
-    summary: Description of the custom scenarios and integration. Length of this description should not exceed 2048 characters.
-    description: ''
-  - name: --setup-uri
-    summary: URI of the partner website that can be used by Azure customers to setup Event Grid integration on an event source.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-  description: Deletes a partner registration with the specified parameters.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all partner registrations in the current Azure subscription.
-    syntax:
-      content: az eventgrid partner registration list
-  - summary: List all partner registrations in a resource group.
-    syntax:
-      content: az eventgrid partner registration list -g rg1
-  - summary: List all partner registrations in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner registration list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all partner registrations in a resource group except the partner registration with name "name1"
-    syntax:
-      content: az eventgrid partner registration list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-  description: Gets a partner registration with the specified parameters.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner registration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_registration_create
-  name: az eventgrid partner registration create
-  summary: Create a new partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-  name: az eventgrid partner registration delete
-  summary: Delete a partner registration.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_list
-  name: az eventgrid partner registration list
-  summary: List all partner registrations in specific resource group or all under the specified azure subscription.
-- uid: ext_eventgrid_az_eventgrid_partner_registration_show
-  name: az eventgrid partner registration show
-  summary: Get a partner registration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner registrations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml
deleted file mode 100644
index 00a964ef35..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic.yml
+++ /dev/null
@@ -1,169 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_topic
-  name: az eventgrid partner topic
-  summary: Manage partner topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_topic_activate
-  - ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  - ext_eventgrid_az_eventgrid_partner_topic_delete
-  - ext_eventgrid_az_eventgrid_partner_topic_list
-  - ext_eventgrid_az_eventgrid_partner_topic_show
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Activate a specific partner topic.
-    syntax:
-      content: az eventgrid partner topic activate -g rg1 -n partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deactivate a specific partner topic.
-    syntax:
-      content: az eventgrid partner topic deactivate -g rg1 -n partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific partner topic.
-    syntax:
-      content: az eventgrid partner topic delete -g rg1 --name partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all partner topics in the current Azure subscription.
-    syntax:
-      content: az eventgrid partner topic list
-  - summary: List all partner topics in a resource group.
-    syntax:
-      content: az eventgrid partner topic list -g rg1
-  - summary: List all partner topics in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid partner topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all partner topics in a resource group except the partner topic with name "name1"
-    syntax:
-      content: az eventgrid partner topic list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a partner topic.
-    syntax:
-      content: az eventgrid partner topic show -g rg1 -n partnertopic1
-  - summary: Show the details of a partner topic based on resource ID.
-    syntax:
-      content: az eventgrid partner topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/partnetopics/topic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-  name: az eventgrid partner topic activate
-  summary: Activate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-  name: az eventgrid partner topic deactivate
-  summary: Deactivate a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-  name: az eventgrid partner topic delete
-  summary: Delete a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_list
-  name: az eventgrid partner topic list
-  summary: List available partner topics.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_show
-  name: az eventgrid partner topic show
-  summary: Get the details of a partner topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage partner topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml
deleted file mode 100644
index d01a2b11c5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/partner/topic/event-subscription.yml
+++ /dev/null
@@ -1,374 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-  name: az eventgrid partner topic event-subscription
-  summary: Manage event subscriptions of partner topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  - ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new event subscription for an Event Grid partner topic, using default filters.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for an Event Grid partner topic, with a filter specifying a subject prefix.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es4 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-begins-with mysubject_prefix
-  - summary: Create a new event subscription for an Event Grid partner topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create -n es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --event-delivery-schema cloudeventschemav1_0
-  - summary: Create a new event subscription for an Event Grid partnertopic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
-            --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
-  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Active Directory enabled Webhook as a destination .
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --azure-active-directory-tenant-id azureactivedirectorytenantid
-            --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
-  - summary: Create a new event subscription for an Event Grid partner topic, using Azure Function as destination.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription create -n es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --azure-active-directory-application-id-or-uri
-    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --azure-active-directory-tenant-id
-    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --event-delivery-schema
-    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
-    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
-    description: ''
-  - name: --event-ttl
-    defaultValue: "1440"
-    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
-    description: ''
-  - name: --expiration-date
-    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --max-delivery-attempts
-    defaultValue: "30"
-    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
-    description: ''
-  - name: --max-events-per-batch
-    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
-    description: ''
-  - name: --preferred-batch-size-in-kilobytes
-    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-case-sensitive
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an event subscription for an Event Grid partner topic.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription delete --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event subscriptions created for an Event Grid partner topic.
-    syntax:
-      content: az eventgrid partner topic event-subscription list -g rg1 --partner-topic-name partnertopic1
-  parameters:
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event subscription for an Event Grid partner topic.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription show --name es1 \
-             -g rg1 --partner-topic-name partnertopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --include-full-endpoint-url
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es1 \
-            -g rg1 --partner-topic-name partnertopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for an Event Grid partner topic to specify a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --subject-ends-with .jpg
-  - summary: Update an event subscription for an Event Grid partner topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es3 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --subject-ends-with .png \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
-  - summary: Update an event subscription for an Azure Event Grid partner topic, to include a deadletter destination.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es2 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
-  - summary: Update an event subscription for an Azure Event Grid partner topic, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid partner topic event-subscription update --name es3 \
-            -g rg1 --partner-topic-name partnertopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --partner-topic-name
-    summary: Name of the partner topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-  name: az eventgrid partner topic event-subscription create
-  summary: Create a new event subscription for a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-  name: az eventgrid partner topic event-subscription delete
-  summary: Delete an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-  name: az eventgrid partner topic event-subscription list
-  summary: List event subscriptions of a specific partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-  name: az eventgrid partner topic event-subscription show
-  summary: Get the details of an event subscription of a partner topic.
-- uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-  name: az eventgrid partner topic event-subscription update
-  summary: Update an event subscription of a partner topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event subscriptions of partner topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml
deleted file mode 100644
index 8140c7012d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_system_topic
-  name: az eventgrid system-topic
-  summary: Manage system topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_system_topic_create
-  - ext_eventgrid_az_eventgrid_system_topic_delete
-  - ext_eventgrid_az_eventgrid_system_topic_list
-  - ext_eventgrid_az_eventgrid_system_topic_show
-  - ext_eventgrid_az_eventgrid_system_topic_update
-- uid: ext_eventgrid_az_eventgrid_system_topic_create
-  name: az eventgrid system-topic create
-  summary: Create a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new system topic for storage account source.
-    syntax:
-      content: az eventgrid system-topic create -g rg1 --name systemtopic1 --location westus2 --topic-type microsoft.storage.storageaccounts --source /subscriptions/1b3b4501-23b9-4790-c31b-ddbd88d72123/resourceGroups/rg2/providers/Microsoft.Storage/storageAccounts/stgaccountname
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source
-    summary: The ARM Id for the topic, e.g., /subscriptions/{SubId}/resourceGroups/{RgName}/providers/Microsoft.Storage/storageAccounts/{AccountName}.
-    description: ''
-  - isRequired: true
-    name: --topic-type
-    summary: Name of the topic type.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_delete
-  name: az eventgrid system-topic delete
-  summary: Delete a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a specific system topic.
-    syntax:
-      content: az eventgrid system-topic delete -g rg1 --name systemtopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_list
-  name: az eventgrid system-topic list
-  summary: List available system topics.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all system topics in the current Azure subscription.
-    syntax:
-      content: az eventgrid system-topic list
-  - summary: List all system topics in a resource group.
-    syntax:
-      content: az eventgrid system-topic list -g rg1
-  - summary: List all system topics in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid system-topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all system topics in a resource group except the system topic with name "name1"
-    syntax:
-      content: az eventgrid system-topic list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_show
-  name: az eventgrid system-topic show
-  summary: Get the details of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a system topic.
-    syntax:
-      content: az eventgrid system-topic show -g rg1 -n systemtopic1
-  - summary: Show the details of a system topic based on resource ID.
-    syntax:
-      content: az eventgrid system-topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/systemtopics/systemtopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_update
-  name: az eventgrid system-topic update
-  summary: Update a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties of an existing system topic.
-    syntax:
-      content: az eventgrid system-topic update -g rg1 --name systemtopic1 --tags Dept=IT
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the system topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_system_topic_create
-  name: az eventgrid system-topic create
-  summary: Create a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_delete
-  name: az eventgrid system-topic delete
-  summary: Delete a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-  name: az eventgrid system-topic event-subscription
-  summary: Manage event subscriptions of system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_list
-  name: az eventgrid system-topic list
-  summary: List available system topics.
-- uid: ext_eventgrid_az_eventgrid_system_topic_show
-  name: az eventgrid system-topic show
-  summary: Get the details of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_update
-  name: az eventgrid system-topic update
-  summary: Update a system topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage system topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml
deleted file mode 100644
index 0be11cce95..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/system-topic/event-subscription.yml
+++ /dev/null
@@ -1,374 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-  name: az eventgrid system-topic event-subscription
-  summary: Manage event subscriptions of system topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  - ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new event subscription for an Event Grid system topic, using default filters.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Create a new event subscription for an Event Grid system topic, with a filter specifying a subject prefix.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es4 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --subject-begins-with mysubject_prefix
-  - summary: Create a new event subscription for an Event Grid system topic, using default filters, and CloudEvent V 1.0 as the delivery schema.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create -n es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --event-delivery-schema cloudeventschemav1_0
-  - summary: Create a new event subscription for an Event Grid system topic, with a deadletter destination and custom retry policy of maximum 10 delivery attempts and an Event TTL of 2 hours (whichever happens earlier) and expiration date.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/s2/blobServices/default/containers/blobcontainer1 \
-            --max-delivery-attempts 10 --event-ttl 120 --expiration-date "2022-10-31"
-  - summary: Create a new event subscription for an Event Grid system topic, using Azure Active Directory enabled Webhook as a destination .
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create --name es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --azure-active-directory-tenant-id azureactivedirectorytenantid
-            --azure-active-directory-application-id-or-uri azureactivedirectoryapplicationidoruri
-  - summary: Create a new event subscription for an Event Grid system topic, using Azure Function as destination.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription create -n es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.Web/sites/{functionappname}/functions/{functionname} --endpoint-type azurefunction
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --azure-active-directory-application-id-or-uri
-    summary: The Azure Active Directory Application Id or Uri to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --azure-active-directory-tenant-id
-    summary: The Azure Active Directory Tenant Id to get the access token that will be included as the bearer token in delivery requests. Applicable only for webhook as a destination.
-    description: ''
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: 'Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName.'
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --event-delivery-schema
-    parameterValueGroup: cloudeventschemav1_0, custominputschema, eventgridschema
-    summary: The schema in which events should be delivered for this event subscription. By default, events will be delivered in the same schema in which they are published (based on the corresponding topic's input schema).
-    description: ''
-  - name: --event-ttl
-    defaultValue: "1440"
-    summary: Event time to live (in minutes). Must be a number between 1 and 1440.
-    description: ''
-  - name: --expiration-date
-    summary: Date or datetime (in UTC, e.g. '2018-11-30T11:59:59+00:00' or '2018-11-30') after which the event subscription would expire. By default, there is no expiration for the event subscription.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --max-delivery-attempts
-    defaultValue: "30"
-    summary: Maximum number of delivery attempts. Must be a number between 1 and 30.
-    description: ''
-  - name: --max-events-per-batch
-    summary: Maximum number of events in a batch. Must be a number between 1 and 5000.
-    description: ''
-  - name: --preferred-batch-size-in-kilobytes
-    summary: Preferred batch size in kilobytes. Must be a number between 1 and 1024.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-case-sensitive
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the subject fields should be compared in a case sensitive manner. True if flag present.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an event subscription for an Event Grid system topic.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription delete --name es1 \
-            -g rg1 --system-topic-name systemtopic1 \
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event subscriptions created for an Event Grid system topic.
-    syntax:
-      content: az eventgrid system-topic event-subscription list -g rg1 --system-topic-name systemtopic1
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of an event subscription for an Event Grid system topic.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription show --name es1 \
-             -g rg1 --system-topic-name systemtopic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --include-full-endpoint-url
-    parameterValueGroup: false, true
-    summary: Specify to indicate whether the full endpoint URL should be returned. True if flag present.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es1 \
-            -g rg1 --system-topic-name systemtopic1 --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-  - summary: Update an event subscription for an Event Grid system topic to specify a new subject-ends-with filter.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --subject-ends-with .jpg
-  - summary: Update an event subscription for an Event Grid system topic to specify a new endpoint and a new subject-ends-with filter a new list of included event types.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es3 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --subject-ends-with .png \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --included-event-types Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted
-  - summary: Update an event subscription for an Azure Event Grid system topic, to include a deadletter destination.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es2 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/TestRG/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/blobcontainer1
-  - summary: Update an event subscription for an Azure Event Grid system topic, using advanced filters.
-    syntax:
-      content: >-
-        az eventgrid system-topic event-subscription update --name es3 \
-            -g rg1 --system-topic-name systemtopic1 \
-            --endpoint https://contoso.azurewebsites.net/api/f1?code=code
-            --advanced-filter data.blobType StringIn BlockBlob
-            --advanced-filter data.url StringBeginsWith https://myaccount.blob.core.windows.net
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the event subscription.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --system-topic-name
-    summary: Name of the system topic.
-    description: ''
-  - name: --advanced-filter
-    summary: An advanced filter enables filtering of events based on a specific event property.
-    description: >-
-      Usage:                     --advanced-filter KEY[.INNERKEY] FILTEROPERATOR VALUE [VALUE ...]
-
-      StringIn:                  --advanced-filter data.Color StringIn Blue Red Orange Yellow
-
-      StringNotIn:               --advanced-filter data.Color StringNotIn Blue Red Orange Yellow
-
-      StringContains:            --advanced-filter subject StringContains Blue Red
-
-      StringBeginsWith:          --advanced-filter subject StringBeginsWith Blue Red
-
-      StringEndsWith:            --advanced-filter subject StringEndsWith img png jpg
-
-      NumberIn:                  --advanced-filter data.property1 NumberIn 5 10 20
-
-      NumberNotIn:               --advanced-filter data.property2 NumberNotIn 100 200 300
-
-      NumberLessThan:            --advanced-filter data.property3 NumberLessThan 100
-
-      NumberLessThanOrEquals:    --advanced-filter data.property2 NumberLessThanOrEquals 100
-
-      NumberGreaterThan:         --advanced-filter data.property3 NumberGreaterThan 100
-
-      NumberGreaterThanOrEquals: --advanced-filter data.property2 NumberGreaterThanOrEquals 100
-
-      BoolEquals:                --advanced-filter data.property3 BoolEquals true
-
-      Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
-  - name: --deadletter-endpoint
-    summary: The Azure resource ID of an Azure Storage blob container destination where EventGrid should deadletter undeliverable events for this event subscription.
-    description: ''
-  - name: --endpoint
-    summary: Endpoint where EventGrid should deliver events matching this event subscription. For webhook endpoint type, this should be the corresponding webhook URL. For other endpoint types, this should be the Azure resource identifier of the endpoint.
-    description: ''
-  - name: --endpoint-type
-    defaultValue: webhook
-    parameterValueGroup: azurefunction, eventhub, hybridconnection, servicebusqueue, servicebustopic, storagequeue, webhook
-    summary: The type of the destination endpoint.
-    description: ''
-  - name: --included-event-types
-    summary: 'A space-separated list of event types. Example: Microsoft.Storage.BlobCreated Microsoft.Storage.BlobDeleted. To subscribe to all default event types, do not specify any value for this argument.'
-    description: ''
-  - name: --labels
-    summary: A space-separated list of labels to associate with this event subscription.
-    description: ''
-  - name: --subject-begins-with
-    summary: An optional string to filter events for an event subscription based on a prefix. Wildcard characters are not supported.
-    description: ''
-  - name: --subject-ends-with
-    summary: An optional string to filter events for an event subscription based on a suffix. Wildcard characters are not supported.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-  name: az eventgrid system-topic event-subscription create
-  summary: Create a new event subscription for a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-  name: az eventgrid system-topic event-subscription delete
-  summary: Delete an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-  name: az eventgrid system-topic event-subscription list
-  summary: List event subscriptions of a specific system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-  name: az eventgrid system-topic event-subscription show
-  summary: Get the details of an event subscription of a system topic.
-- uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-  name: az eventgrid system-topic event-subscription update
-  summary: Update an event subscription of a system topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage event subscriptions of system topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml
deleted file mode 100644
index 6c0a444432..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic-type.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_type
-  name: az eventgrid topic-type
-  summary: Get details for topic types.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_type_list
-  - ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  - ext_eventgrid_az_eventgrid_topic_type_show
-- uid: ext_eventgrid_az_eventgrid_topic_type_list
-  name: az eventgrid topic-type list
-  summary: List registered topic types.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  name: az eventgrid topic-type list-event-types
-  summary: List the event types supported by a topic type.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all event types supported by Azure Storage Accounts.
-    syntax:
-      content: az eventgrid topic-type list-event-types -n Microsoft.Storage.StorageAccounts
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic type.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_type_show
-  name: az eventgrid topic-type show
-  summary: Get the details for a topic type.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic type.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_type_list
-  name: az eventgrid topic-type list
-  summary: List registered topic types.
-- uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-  name: az eventgrid topic-type list-event-types
-  summary: List the event types supported by a topic type.
-- uid: ext_eventgrid_az_eventgrid_topic_type_show
-  name: az eventgrid topic-type show
-  summary: Get the details for a topic type.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Get details for topic types.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml
deleted file mode 100644
index d8f8fdcf01..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic.yml
+++ /dev/null
@@ -1,248 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic
-  name: az eventgrid topic
-  summary: Manage Azure Event Grid topics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_create
-  - ext_eventgrid_az_eventgrid_topic_delete
-  - ext_eventgrid_az_eventgrid_topic_list
-  - ext_eventgrid_az_eventgrid_topic_show
-  - ext_eventgrid_az_eventgrid_topic_update
-- uid: ext_eventgrid_az_eventgrid_topic_create
-  name: az eventgrid topic create
-  summary: Create a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new topic.
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2
-  - summary: Create a new topic with custom input mappings.
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema customeventschema --input-mapping-fields topic=myTopicField eventType=myEventTypeField --input-mapping-default-values subject=DefaultSubject dataVersion=1.0
-  - summary: Create a new topic that accepts events published in CloudEvents V1.0 schema.
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema cloudeventschemav1_0
-  - summary: Create a new topic which allows specific inbound ip rules with Basic Sku and system assigned identity
-    syntax:
-      content: az eventgrid topic create -g rg1 --name topic1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku Basic --identity systemassigned
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --input-mapping-default-values
-    summary: When input-schema is specified as customeventschema, this parameter can be used to specify input mappings based on default values. You can use this parameter when your custom schema does not include a field that corresponds to one of the three fields supported by this parameter. Specify space separated mappings in 'key=value' format. Allowed key names are 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the default values to be used for the mapping and they will be used only when the published event doesn't have a valid mapping for a particular field.
-    description: ''
-  - name: --input-mapping-fields
-    summary: When input-schema is specified as customeventschema, this parameter is used to specify input mappings based on field names. Specify space separated mappings in 'key=value' format. Allowed key names are 'id', 'topic', 'eventtime', 'subject', 'eventtype', 'dataversion'. The corresponding value names should specify the names of the fields in the custom input schema. If a mapping for either 'id' or 'eventtime' is not provided, Event Grid will auto-generate a default value for these two fields.
-    description: ''
-  - name: --input-schema
-    defaultValue: eventgridschema
-    parameterValueGroup: cloudeventschemav1_0, customeventschema, eventgridschema
-    summary: Schema in which incoming events will be published to this topic/domain. If you specify customeventschema as the value for this parameter, you must also provide values for at least one of --input_mapping_default_values / --input_mapping_fields.
-    description: ''
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    defaultValue: Basic
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_delete
-  name: az eventgrid topic delete
-  summary: Delete a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a topic.
-    syntax:
-      content: az eventgrid topic delete -g rg1 --name topic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_list
-  name: az eventgrid topic list
-  summary: List available topics.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all topics in the current Azure subscription.
-    syntax:
-      content: az eventgrid topic list
-  - summary: List all topics in a resource group.
-    syntax:
-      content: az eventgrid topic list -g rg1
-  - summary: List all topics in a resource group whose name contains the pattern "XYZ"
-    syntax:
-      content: az eventgrid topic list -g rg1 --odata-query "Contains(name, 'XYZ')"
-  - summary: List all topics in a resource group except the domain with name "name1"
-    syntax:
-      content: az eventgrid topic list -g rg1 --odata-query "NOT (name eq 'name1')"
-  parameters:
-  - name: --odata-query
-    summary: The query used to filter the results using OData syntax.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_show
-  name: az eventgrid topic show
-  summary: Get the details of a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the details of a topic.
-    syntax:
-      content: az eventgrid topic show -g rg1 -n topic1
-  - summary: Show the details of a topic based on resource ID.
-    syntax:
-      content: az eventgrid topic show --ids /subscriptions/{SubID}/resourceGroups/{RG}/providers/Microsoft.EventGrid/topics/topic1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_update
-  name: az eventgrid topic update
-  summary: Update a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties of an existing topic with new sku, identity and public network access information.
-    syntax:
-      content: az eventgrid topic update -g rg1 --name topic1 --sku Premium --identity systemassigned --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --tags Dept=IT --sku basic
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --identity
-    parameterValueGroup: noidentity, systemassigned
-    summary: The identity type of the resource (e.g., topic or domain).
-    description: ''
-  - name: --inbound-ip-rules
-    summary: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask.
-    description: List of inbound IP rules specifying IP Address in CIDR notation e.g., 10.0.0.0/8 along with corresponding Action to perform based on the match or no match of the IpMask. Possible values include - Allow.
-  - name: --public-network-access
-    parameterValueGroup: disabled, enabled
-    summary: This determines if traffic is allowed over public network. By default it is enabled. You can further restrict to specific IPs by configuring.
-    description: ''
-  - name: --sku
-    parameterValueGroup: basic, premium
-    summary: The Sku name of the resource.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_create
-  name: az eventgrid topic create
-  summary: Create a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_delete
-  name: az eventgrid topic delete
-  summary: Delete a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key
-  name: az eventgrid topic key
-  summary: Manage shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_list
-  name: az eventgrid topic list
-  summary: List available topics.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-  name: az eventgrid topic private-endpoint-connection
-  summary: Manage private endpoint connections of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-  name: az eventgrid topic private-link-resource
-  summary: Manage private link resource of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_show
-  name: az eventgrid topic show
-  summary: Get the details of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_update
-  name: az eventgrid topic update
-  summary: Update a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Event Grid topics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml
deleted file mode 100644
index bfd7252f9e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/key.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_key
-  name: az eventgrid topic key
-  summary: Manage shared access keys of a topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_key_list
-  - ext_eventgrid_az_eventgrid_topic_key_regenerate
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List shared access keys of a topic (autogenerated)
-    syntax:
-      content: az eventgrid topic key list --name MyTopic --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: Key name to regenerate key1 or key2.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the topic.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_key_list
-  name: az eventgrid topic key list
-  summary: List shared access keys of a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-  name: az eventgrid topic key regenerate
-  summary: Regenerate a shared access key of a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared access keys of a topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml
deleted file mode 100644
index 944d142b05..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-endpoint-connection.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-  name: az eventgrid topic private-endpoint-connection
-  summary: Manage private endpoint connections of a topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  - ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Approve a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection approve -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample approval description"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-  - name: --description
-    summary: Comments for the approval.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete private endpoint connection for a specific topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection delete -g rg1 --topic-name topic1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List private endpoint connections for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection list -g rg1 --topic-name topic1
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reject a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection reject -g rg1 --topic-name topic1 -n topic1-PrivateEndpoint.6d90cf76-a022-452c-9994-6dac62a50c99 --description "Sample rejection description"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-  - name: --description
-    summary: Comments for the rejection.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-endpoint-connection show -g rg1 --topic-name topic1 -n connectionName1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private endpoint connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-  name: az eventgrid topic private-endpoint-connection approve
-  summary: Approve a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-  name: az eventgrid topic private-endpoint-connection delete
-  summary: Delete a private endpoint connection for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-  name: az eventgrid topic private-endpoint-connection list
-  summary: List the properties of all the private endpoint connections for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-  name: az eventgrid topic private-endpoint-connection reject
-  summary: Reject a private endpoint connection request for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-  name: az eventgrid topic private-endpoint-connection show
-  summary: Display the properties of a private endpoint connection for a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private endpoint connections of a topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml
deleted file mode 100644
index d6c99354a3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/eventgrid/topic/private-link-resource.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-  name: az eventgrid topic private-link-resource
-  summary: Manage private link resource of a topic.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  - ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-link-resource list -g rg1 --topic-name topic1
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a private endpoint connection for a topic.
-    syntax:
-      content: az eventgrid topic private-link-resource show -g rg1 --topic-name topic1 -n topic
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private link resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --topic-name
-    summary: Name of the topic.
-    description: ''
-commands:
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-  name: az eventgrid topic private-link-resource list
-  summary: List the properties of all the private link resources for a topic.
-- uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-  name: az eventgrid topic private-link-resource show
-  summary: Display the properties of a private link resource for a topic.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage private link resource of a topic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/index.yml
deleted file mode 100644
index 1c1f49fd7a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/eventgrid/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_eventgrid_az
-  name: eventgrid
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_eventgrid_az_eventgrid
-  name: az eventgrid
-  summary: Manage Azure Event Grid topics, domains, domain topics, system topics partner topics, event subscriptions, system topic event subscriptions and partner topic event subscriptions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/index.yml
deleted file mode 100644
index d05dbb5aa2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az
-  name: express-route-cross-connection
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route-cross-connection_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network.yml
deleted file mode 100644
index 91d2552a16..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route-cross-connection_az_network_cross_connection
-  name: az network cross-connection
-  summary: Manage customers' ExpressRoute circuits.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list
-  name: az network cross-connection list
-  summary: List all ExpressRoute cross-connections for the current subscription.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  name: az network cross-connection list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  name: az network cross-connection list-route-tables
-  summary: Show the current routing table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-  name: az network cross-connection peering
-  summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_show
-  name: az network cross-connection show
-  summary: Get the details of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  name: az network cross-connection summarize-route-table
-  summary: Gets the route table summary associated with the express route cross connection in a resource group.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_update
-  name: az network cross-connection update
-  summary: Update settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-  name: az network cross-connection wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml
deleted file mode 100644
index 47b48313af..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection.yml
+++ /dev/null
@@ -1,268 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az_network_cross_connection
-  name: az network cross-connection
-  summary: Manage customers' ExpressRoute circuits.
-  description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - ext_express-route-cross-connection_az_network_cross_connection_list
-  - ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  - ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  - ext_express-route-cross-connection_az_network_cross_connection_show
-  - ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  - ext_express-route-cross-connection_az_network_cross_connection_update
-  - ext_express-route-cross-connection_az_network_cross_connection_wait
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list
-  name: az network cross-connection list
-  summary: List all ExpressRoute cross-connections for the current subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all ExpressRoute cross-connections for the current subscription.
-    syntax:
-      content: az network cross-connection list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  name: az network cross-connection list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection.
-    syntax:
-      content: >-
-        az network cross-connection list-arp-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  name: az network cross-connection list-route-tables
-  summary: Show the current routing table of an ExpressRoute cross-connection peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current routing table of an ExpressRoute cross-connection peering.
-    syntax:
-      content: >-
-        az network cross-connection list-route-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_show
-  name: az network cross-connection show
-  summary: Get the details of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an ExpressRoute cross-connection.
-    syntax:
-      content: az network cross-connection show -n MyCircuit -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  name: az network cross-connection summarize-route-table
-  summary: Gets the route table summary associated with the express route cross connection in a resource group.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --path
-    parameterValueGroup: primary, secondary
-    summary: The path of the device.
-    description: ''
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_update
-  name: az network cross-connection update
-  summary: Update settings of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --notes
-    summary: Service provider notes.
-    description: ''
-  - name: --provisioning-state
-    parameterValueGroup: NotProvisioned, Provisioned, Provisioning
-    summary: Provisioning state of the customer ExpressRoute circuit.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-  name: az network cross-connection wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the ExpressRoute cross-connection is successfully provisioned.
-    syntax:
-      content: az network cross-connection wait -n MyCircuit -g MyResourceGroup --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list
-  name: az network cross-connection list
-  summary: List all ExpressRoute cross-connections for the current subscription.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-  name: az network cross-connection list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-  name: az network cross-connection list-route-tables
-  summary: Show the current routing table of an ExpressRoute cross-connection peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-  name: az network cross-connection peering
-  summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_show
-  name: az network cross-connection show
-  summary: Get the details of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-  name: az network cross-connection summarize-route-table
-  summary: Gets the route table summary associated with the express route cross connection in a resource group.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_update
-  name: az network cross-connection update
-  summary: Update settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-  name: az network cross-connection wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml
deleted file mode 100644
index 37f34b73d8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route-cross-connection/network/cross-connection/peering.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-  name: az network cross-connection peering
-  summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  - ext_express-route-cross-connection_az_network_cross_connection_peering_update
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create Microsoft Peering settings with IPv4 configuration.
-    syntax:
-      content: >-
-        az network cross-connection peering create -g MyResourceGroup --cross-connection-name MyCircuit \
-            --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
-            --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
-            --advertised-public-prefixes 101.0.0.0/30
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --peer-asn
-    summary: Autonomous system number of the customer/connectivity provider.
-    description: ''
-  - isRequired: true
-    name: --peering-type
-    parameterValueGroup: AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering
-    summary: BGP peering type for the circuit.
-    description: ''
-  - isRequired: true
-    name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
-    description: ''
-  - isRequired: true
-    name: --vlan-id
-    summary: Identifier used to identify the customer.
-    description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
-    description: ''
-  - name: --advertised-public-prefixes
-    summary: Space-separated list of prefixes to be advertised through the BGP peering.
-    description: ''
-  - name: --customer-asn
-    summary: Autonomous system number of the customer.
-    description: ''
-  - name: --routing-registry-name
-    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
-    summary: Internet Routing Registry / Regional Internet Registry.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete private peering.
-    syntax:
-      content: az network cross-connection peering delete -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List peering settings of an ExpressRoute cross-connection.
-    syntax:
-      content: az network cross-connection peering list -g MyResourceGroup --cross-connection-name MyCircuit
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get private peering details of an ExpressRoute cross-connection.
-    syntax:
-      content: az network cross-connection peering show -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cross-connection-name
-    summary: ExpressRoute cross-connection name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --peer-asn
-    summary: Autonomous system number of the customer/connectivity provider.
-    description: ''
-  - name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
-    description: ''
-  - name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
-    description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
-    description: ''
-  - name: --vlan-id
-    summary: Identifier used to identify the customer.
-    description: ''
-  - name: --advertised-public-prefixes
-    summary: Space-separated list of prefixes to be advertised through the BGP peering.
-    description: ''
-  - name: --customer-asn
-    summary: Autonomous system number of the customer.
-    description: ''
-  - name: --ip-version
-    defaultValue: IPv4
-    parameterValueGroup: IPv4, IPv6
-    summary: The IP version to update Microsoft Peering settings for.
-    description: ''
-  - name: --routing-registry-name
-    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
-    summary: Internet Routing Registry / Regional Internet Registry.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-  name: az network cross-connection peering create
-  summary: Create peering settings for an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-  name: az network cross-connection peering delete
-  summary: Delete peering settings.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-  name: az network cross-connection peering list
-  summary: List peering settings of an ExpressRoute cross-connection.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-  name: az network cross-connection peering show
-  summary: Get the details of an express route peering.
-- uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-  name: az network cross-connection peering update
-  summary: Update peering settings for an ExpressRoute cross-connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute peering of an ExpressRoute cross-connection.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/index.yml
deleted file mode 100644
index 622e4b5801..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az
-  name: express-route
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network.yml
deleted file mode 100644
index 8ec8c14839..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_express-route_az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-- uid: ext_express-route_az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: ext_express-route_az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route.yml
deleted file mode 100644
index 6f07c31e42..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route.yml
+++ /dev/null
@@ -1,266 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-  description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_create
-  - ext_express-route_az_network_express_route_list
-  - ext_express-route_az_network_express_route_show
-  - ext_express-route_az_network_express_route_update
-- uid: ext_express-route_az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ExpressRoute circuit.
-    syntax:
-      content: az network express-route create --bandwidth 200 -n MyCircuit --peering-location "Silicon Valley" -g MyResourceGroup --provider "Equinix" -l "West US" --sku-family MeteredData --sku-tier Standard
-  parameters:
-  - isRequired: true
-    name: --bandwidth
-    summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
-    description: ''
-    valueFrom: az network express-route list-service-providers
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allow-global-reach
-    parameterValueGroup: false, true
-    summary: Enable global reach on the circuit.
-    description: ''
-  - name: --express-route-port
-    summary: Name or ID of an ExpressRoute port.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --peering-location
-    summary: Name of the peering location.
-    description: ''
-    valueFrom: az network express-route list-service-providers
-  - name: --provider
-    summary: Name of the ExpressRoute Service Provider.
-    description: ''
-    valueFrom: az network express-route list-service-providers
-  - name: --sku-family
-    defaultValue: MeteredData
-    parameterValueGroup: MeteredData, UnlimitedData
-    summary: Chosen SKU family of ExpressRoute circuit.
-    description: ''
-  - name: --sku-tier
-    defaultValue: Standard
-    parameterValueGroup: Premium, Standard
-    summary: SKU Tier of ExpressRoute circuit.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_express-route_az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all ExpressRoute circuits for the current subscription.
-    syntax:
-      content: az network express-route list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route show -n MyCircuit -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Change the SKU of an ExpressRoute circuit from Standard to Premium.
-    syntax:
-      content: az network express-route update -n MyCircuit -g MyResourceGroup --sku-tier Premium
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --allow-global-reach
-    parameterValueGroup: false, true
-    summary: Enable global reach on the circuit.
-    description: ''
-  - name: --bandwidth
-    summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
-    description: ''
-  - name: --express-route-port
-    summary: Name or ID of an ExpressRoute port.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --peering-location
-    summary: Name of the peering location.
-    description: ''
-  - name: --provider
-    summary: Name of the ExpressRoute Service Provider.
-    description: ''
-  - name: --sku-family
-    parameterValueGroup: MeteredData, UnlimitedData
-    summary: Chosen SKU family of ExpressRoute circuit.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: Premium, Standard
-    summary: SKU Tier of ExpressRoute circuit.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: ext_express-route_az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-- uid: ext_express-route_az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/gateway.yml
deleted file mode 100644
index 4e30a3d6f7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/gateway.yml
+++ /dev/null
@@ -1,171 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_gateway_create
-  - ext_express-route_az_network_express_route_gateway_delete
-  - ext_express-route_az_network_express_route_gateway_list
-  - ext_express-route_az_network_express_route_gateway_show
-  - ext_express-route_az_network_express_route_gateway_update
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --virtual-hub
-    summary: Name or ID of the virtual hub to associate with the gateway.
-    description: ''
-  - name: --max-val
-    summary: Maximum number of scale units deployed for gateway.
-    description: ''
-  - name: --min-val
-    defaultValue: "2"
-    summary: Minimum number of scale units deployed for gateway.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --max-val
-    summary: Maximum number of scale units deployed for gateway.
-    description: ''
-  - name: --min-val
-    summary: Minimum number of scale units deployed for gateway.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_delete
-  name: az network express-route gateway delete
-  summary: Delete an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: ext_express-route_az_network_express_route_gateway_show
-  name: az network express-route gateway show
-  summary: Get the details of an ExpressRoute gateway.
-- uid: ext_express-route_az_network_express_route_gateway_update
-  name: az network express-route gateway update
-  summary: Update settings of an ExpressRoute gateway.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute gateways.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/gateway/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/gateway/connection.yml
deleted file mode 100644
index 37939f182e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/gateway/connection.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_gateway_connection_create
-  - ext_express-route_az_network_express_route_gateway_connection_delete
-  - ext_express-route_az_network_express_route_gateway_connection_list
-  - ext_express-route_az_network_express_route_gateway_connection_show
-  - ext_express-route_az_network_express_route_gateway_connection_update
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --authorization-key
-    summary: Authorization key to establish the connection.
-    description: ''
-  - name: --routing-weight
-    summary: Routing weight associated with the connection.
-    description: ''
-  - isRequired: true
-    name: --peering
-    summary: Name or ID of an ExpressRoute peering.
-    description: ''
-  - name: --circuit-name
-    summary: ExpressRoute circuit name.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: ExpressRoute gateway name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute connection name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --authorization-key
-    summary: Authorization key to establish the connection.
-    description: ''
-  - name: --routing-weight
-    summary: Routing weight associated with the connection.
-    description: ''
-  - name: --circuit-name
-    summary: ExpressRoute circuit name.
-    description: ''
-  - name: --peering
-    summary: Name or ID of an ExpressRoute peering.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_delete
-  name: az network express-route gateway connection delete
-  summary: Delete an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_list
-  name: az network express-route gateway connection list
-  summary: List ExpressRoute gateway connections.
-- uid: ext_express-route_az_network_express_route_gateway_connection_show
-  name: az network express-route gateway connection show
-  summary: Get the details of an ExpressRoute gateway connection.
-- uid: ext_express-route_az_network_express_route_gateway_connection_update
-  name: az network express-route gateway connection update
-  summary: Update an ExpressRoute gateway connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute gateway connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port.yml
deleted file mode 100644
index 60a6aadeb2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_port_create
-  - ext_express-route_az_network_express_route_port_delete
-  - ext_express-route_az_network_express_route_port_list
-  - ext_express-route_az_network_express_route_port_show
-  - ext_express-route_az_network_express_route_port_update
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --bandwidth
-    summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Gbps.'
-    description: ''
-  - name: --encapsulation
-    parameterValueGroup: Dot1Q, QinQ
-    summary: Encapsulation method on physical ports.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --peering-location
-    summary: The name of the peering location that the port is mapped to physically.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_delete
-  name: az network express-route port delete
-  summary: Delete an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-- uid: ext_express-route_az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-- uid: ext_express-route_az_network_express_route_port_show
-  name: az network express-route port show
-  summary: Get the details of an ExpressRoute port.
-- uid: ext_express-route_az_network_express_route_port_update
-  name: az network express-route port update
-  summary: Update settings of an ExpressRoute port.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage ExpressRoute ports.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port/link.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port/link.yml
deleted file mode 100644
index 15309ae53d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port/link.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_port_link
-  name: az network express-route port link
-  summary: View ExpressRoute links.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_port_link_list
-  - ext_express-route_az_network_express_route_port_link_show
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --port-name
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the ExpressRouteLink resource.
-    description: ''
-  - isRequired: true
-    name: --port-name
-    summary: ExpressRoute port name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_port_link_list
-  name: az network express-route port link list
-  summary: List ExpressRoute links.
-- uid: ext_express-route_az_network_express_route_port_link_show
-  name: az network express-route port link show
-  summary: Get the details of an ExpressRoute link.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: View ExpressRoute links.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port/location.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port/location.yml
deleted file mode 100644
index 2a585d2727..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/express-route/network/express-route/port/location.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_express-route_az_network_express_route_port_location
-  name: az network express-route port location
-  summary: View ExpressRoute port location information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_express-route_az_network_express_route_port_location_list
-  - ext_express-route_az_network_express_route_port_location_show
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: Name of the requested ExpressRoutePort peering location.
-    description: ''
-commands:
-- uid: ext_express-route_az_network_express_route_port_location_list
-  name: az network express-route port location list
-  summary: List ExpressRoute port locations.
-- uid: ext_express-route_az_network_express_route_port_location_show
-  name: az network express-route port location show
-  summary: Get the details of an ExpressRoute port location.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: View ExpressRoute port location information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/index.yml
deleted file mode 100644
index c1c6569db0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az
-  name: front-door
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_front-door_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network.yml
deleted file mode 100644
index 7d6e59e096..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network.yml
+++ /dev/null
@@ -1,293 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_front-door_az_network_front_door
-  name: az network front-door
-  summary: Manage Front Doors.
-- uid: ext_front-door_az_network_front_door_backend_pool
-  name: az network front-door backend-pool
-  summary: Manage Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_check_custom_domain
-  name: az network front-door check-custom-domain
-  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
-- uid: ext_front-door_az_network_front_door_create
-  name: az network front-door create
-  summary: Create a Front Door.
-- uid: ext_front-door_az_network_front_door_delete
-  name: az network front-door delete
-  summary: Delete a Front Door.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint
-  name: az network front-door frontend-endpoint
-  summary: Manage Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_list
-  name: az network front-door list
-  summary: List Front Doors.
-- uid: ext_front-door_az_network_front_door_load_balancing
-  name: az network front-door load-balancing
-  summary: Manage Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-- uid: ext_front-door_az_network_front_door_probe
-  name: az network front-door probe
-  summary: Manage Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_purge_endpoint
-  name: az network front-door purge-endpoint
-  summary: Removes a content from Front Door.
-- uid: ext_front-door_az_network_front_door_routing_rule
-  name: az network front-door routing-rule
-  summary: Manage Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_rules_engine
-  name: az network front-door rules-engine
-  summary: Manage Front Door rules engines.
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-- uid: ext_front-door_az_network_front_door_show
-  name: az network front-door show
-  summary: Get the details of a Front Door.
-- uid: ext_front-door_az_network_front_door_update
-  name: az network front-door update
-  summary: Update settings of a Front Door.
-- uid: ext_front-door_az_network_front_door_waf_policy
-  name: az network front-door waf-policy
-  summary: Manage WebApplication Firewall (WAF) policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door.yml
deleted file mode 100644
index e861629aef..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door.yml
+++ /dev/null
@@ -1,490 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door
-  name: az network front-door
-  summary: Manage Front Doors.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_check_custom_domain
-  - ext_front-door_az_network_front_door_create
-  - ext_front-door_az_network_front_door_delete
-  - ext_front-door_az_network_front_door_list
-  - ext_front-door_az_network_front_door_purge_endpoint
-  - ext_front-door_az_network_front_door_show
-  - ext_front-door_az_network_front_door_update
-- uid: ext_front-door_az_network_front_door_check_custom_domain
-  name: az network front-door check-custom-domain
-  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --host-name
-    summary: The host name of the custom domain. Must be a domain name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_create
-  name: az network front-door create
-  summary: Create a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --friendly-name
-    summary: Friendly name of the Front Door.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --backend-address
-    summary: FQDN of the backend endpoint.
-    description: ''
-  - name: --backend-host-header
-    summary: Host header sent to the backend.
-    description: ''
-  - name: --enforce-certificate-name-check
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
-    description: ''
-  - name: --send-recv-timeout
-    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
-    description: ''
-  - name: --frontend-host-name
-    summary: Domain name of the frontend endpoint.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Interval in seconds between probes.
-    description: ''
-  - name: --path
-    defaultValue: /
-    summary: Path to probe.
-    description: ''
-  - name: --probeMethod
-    defaultValue: HEAD
-    parameterValueGroup: GET, HEAD
-    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
-    description: ''
-  - name: --protocol
-    defaultValue: Https
-    parameterValueGroup: Http, Https
-    summary: Protocol to use for sending probes.
-    description: ''
-  - name: --accepted-protocols
-    summary: 'Space-separated list of protocols to accept. Default: Http.'
-    description: ''
-  - name: --forwarding-protocol
-    defaultValue: MatchRequest
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --patterns
-    summary: "Space-separated list of patterns to match. Default: '/\\*'."
-    description: ''
-- uid: ext_front-door_az_network_front_door_delete
-  name: az network front-door delete
-  summary: Delete a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_front-door_az_network_front_door_list
-  name: az network front-door list
-  summary: List Front Doors.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_purge_endpoint
-  name: az network front-door purge-endpoint
-  summary: Removes a content from Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --content-paths
-    summary: The path to the content to be purged. Can describe a file path or a wild card directory.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_show
-  name: az network front-door show
-  summary: Get the details of a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_update
-  name: az network front-door update
-  summary: Update settings of a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --enforce-certificate-name-check
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
-    description: ''
-  - name: --send-recv-timeout
-    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_backend_pool
-  name: az network front-door backend-pool
-  summary: Manage Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_check_custom_domain
-  name: az network front-door check-custom-domain
-  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
-- uid: ext_front-door_az_network_front_door_create
-  name: az network front-door create
-  summary: Create a Front Door.
-- uid: ext_front-door_az_network_front_door_delete
-  name: az network front-door delete
-  summary: Delete a Front Door.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint
-  name: az network front-door frontend-endpoint
-  summary: Manage Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_list
-  name: az network front-door list
-  summary: List Front Doors.
-- uid: ext_front-door_az_network_front_door_load_balancing
-  name: az network front-door load-balancing
-  summary: Manage Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-- uid: ext_front-door_az_network_front_door_probe
-  name: az network front-door probe
-  summary: Manage Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_purge_endpoint
-  name: az network front-door purge-endpoint
-  summary: Removes a content from Front Door.
-- uid: ext_front-door_az_network_front_door_routing_rule
-  name: az network front-door routing-rule
-  summary: Manage Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_rules_engine
-  name: az network front-door rules-engine
-  summary: Manage Front Door rules engines.
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-- uid: ext_front-door_az_network_front_door_show
-  name: az network front-door show
-  summary: Get the details of a Front Door.
-- uid: ext_front-door_az_network_front_door_update
-  name: az network front-door update
-  summary: Update settings of a Front Door.
-- uid: ext_front-door_az_network_front_door_waf_policy
-  name: az network front-door waf-policy
-  summary: Manage WebApplication Firewall (WAF) policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Doors.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml
deleted file mode 100644
index 6e8b3323af..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_backend_pool
-  name: az network front-door backend-pool
-  summary: Manage Front Door backend pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_backend_pool_create
-  - ext_front-door_az_network_front_door_backend_pool_delete
-  - ext_front-door_az_network_front_door_backend_pool_list
-  - ext_front-door_az_network_front_door_backend_pool_show
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-  description: Since a backend pool must contain a backend, this command also creates the first backend. To add additional backends, use the `az network front-door backend-pool backend add` command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --load-balancing
-    summary: Name or ID of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --probe
-    summary: Name or ID of the probe settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - isRequired: true
-    name: --address
-    summary: FQDN of the backend endpoint.
-    description: ''
-  - name: --backend-host-header
-    summary: Host header sent to the backend.
-    description: ''
-  - name: --http-port
-    defaultValue: "80"
-    summary: HTTP TCP port number.
-    description: ''
-  - name: --https-port
-    defaultValue: "443"
-    summary: HTTPS TCP port number.
-    description: ''
-  - name: --priority
-    defaultValue: "1"
-    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
-    description: ''
-  - name: --weight
-    defaultValue: "50"
-    summary: Weight of this endpoint for load balancing purposes.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_create
-  name: az network front-door backend-pool create
-  summary: Create a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_delete
-  name: az network front-door backend-pool delete
-  summary: Delete a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_list
-  name: az network front-door backend-pool list
-  summary: List Front Door backend pools.
-- uid: ext_front-door_az_network_front_door_backend_pool_show
-  name: az network front-door backend-pool show
-  summary: Get the details of a Front Door backend pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door backend pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml
deleted file mode 100644
index d22e07b2df..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/backend-pool/backend.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_backend_pool_backend
-  name: az network front-door backend-pool backend
-  summary: Manage backends of Front Door backend pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_backend_pool_backend_add
-  - ext_front-door_az_network_front_door_backend_pool_backend_list
-  - ext_front-door_az_network_front_door_backend_pool_backend_remove
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address
-    summary: FQDN of the backend endpoint.
-    description: ''
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --pool-name
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --backend-host-header
-    summary: Host header sent to the backend.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --http-port
-    defaultValue: "80"
-    summary: HTTP TCP port number.
-    description: ''
-  - name: --https-port
-    defaultValue: "443"
-    summary: HTTPS TCP port number.
-    description: ''
-  - name: --priority
-    defaultValue: "1"
-    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
-    description: ''
-  - name: --weight
-    defaultValue: "50"
-    summary: Weight of this endpoint for load balancing purposes.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --pool-name
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --index
-    summary: Index of the backend to remove (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --pool-name
-    summary: Name of the backend pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-  name: az network front-door backend-pool backend add
-  summary: Add a backend to a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-  name: az network front-door backend-pool backend list
-  summary: List backends of a Front Door backend pool.
-- uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-  name: az network front-door backend-pool backend remove
-  summary: Remove a backend from a Front Door backend pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage backends of Front Door backend pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml
deleted file mode 100644
index 5956e3aab1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/frontend-endpoint.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_frontend_endpoint
-  name: az network front-door frontend-endpoint
-  summary: Manage Front Door frontend endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_frontend_endpoint_create
-  - ext_front-door_az_network_front_door_frontend_endpoint_delete
-  - ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  - ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  - ext_front-door_az_network_front_door_frontend_endpoint_list
-  - ext_front-door_az_network_front_door_frontend_endpoint_show
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --host-name
-    summary: Domain name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --session-affinity-enabled
-    parameterValueGroup: false, true
-    summary: Whether to allow session affinity on this host.
-    description: ''
-  - name: --session-affinity-ttl
-    summary: The TTL to use in seconds for session affinity.
-    description: ''
-  - name: --waf-policy
-    summary: Name or ID of a web application firewall policy.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-  description: HTTPS protocol for a custom domain can be enabled using Front Door managed certificate or using your own certificate in Azure Key Vault. For Azure Key Vault, right permissions need to be set for Front Door to access the Key vault. Learn more at <a href="https://aka.ms/FrontDoorCustomDomain">https://aka.ms/FrontDoorCustomDomain</a>.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --certificate-source
-    defaultValue: FrontDoor
-    parameterValueGroup: AzureKeyVault, FrontDoor
-    summary: Certificate source to enable HTTPS.
-    description: ''
-  - name: --minimum-tls-version
-    defaultValue: "1.2"
-    parameterValueGroup: 1.0, 1.2
-    summary: The minimum TLS version required from the clients to establish an SSL handshake with Front Door.
-    description: ''
-  - name: --secret-name
-    summary: The name of the Key Vault secret representing the full certificate PFX.
-    description: ''
-  - name: --secret-version
-    summary: The version of the Key Vault secret representing the full certificate PFX.
-    description: ''
-  - name: --vault-id
-    summary: The resource id of the Key Vault containing the SSL certificate.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the frontend endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-  name: az network front-door frontend-endpoint create
-  summary: Create a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-  name: az network front-door frontend-endpoint delete
-  summary: Delete a Front Door frontend endpoint.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-  name: az network front-door frontend-endpoint disable-https
-  summary: Disable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-  name: az network front-door frontend-endpoint enable-https
-  summary: Enable HTTPS protocol for a custom domain.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-  name: az network front-door frontend-endpoint list
-  summary: List Front Door frontend endpoints.
-- uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-  name: az network front-door frontend-endpoint show
-  summary: Get the details of a Front Door frontend endpoint.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door frontend endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml
deleted file mode 100644
index 3a00016675..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/load-balancing.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_load_balancing
-  name: az network front-door load-balancing
-  summary: Manage Front Door load-balancing settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_load_balancing_create
-  - ext_front-door_az_network_front_door_load_balancing_delete
-  - ext_front-door_az_network_front_door_load_balancing_list
-  - ext_front-door_az_network_front_door_load_balancing_show
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sample-size
-    summary: The number of samples to consider for load balancing decisions.
-    description: ''
-  - isRequired: true
-    name: --successful-samples-required
-    summary: The number of samples within the sample period that must succeed.
-    description: ''
-  - name: --additional-latency
-    summary: The additional latency in milliseconds for probes to fall in the lowest latency bucket.
-    description: ''
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the load balancing settings.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_load_balancing_create
-  name: az network front-door load-balancing create
-  summary: Create Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_delete
-  name: az network front-door load-balancing delete
-  summary: Delete Front Door load-balancing settings.
-- uid: ext_front-door_az_network_front_door_load_balancing_list
-  name: az network front-door load-balancing list
-  summary: List Front Door load-balancing settingss.
-- uid: ext_front-door_az_network_front_door_load_balancing_show
-  name: az network front-door load-balancing show
-  summary: Get the details of a Front Door load-balancing settings bundle.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door load-balancing settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/probe.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/probe.yml
deleted file mode 100644
index ff4acf609e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/probe.yml
+++ /dev/null
@@ -1,177 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_probe
-  name: az network front-door probe
-  summary: Manage Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_probe_create
-  - ext_front-door_az_network_front_door_probe_delete
-  - ext_front-door_az_network_front_door_probe_list
-  - ext_front-door_az_network_front_door_probe_show
-  - ext_front-door_az_network_front_door_probe_update
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Https
-    summary: Protocol to use for sending probes.
-    description: ''
-  - isRequired: true
-    name: --interval
-    summary: Interval in seconds between probes.
-    description: ''
-  - isRequired: true
-    name: --path
-    summary: Path to probe.
-    description: ''
-  - name: --enabled
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enabled status.
-    description: ''
-  - name: --probeMethod
-    defaultValue: HEAD
-    parameterValueGroup: GET, HEAD
-    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the health probe.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enabled status.
-    description: ''
-  - name: --interval
-    summary: Interval in seconds between probes.
-    description: ''
-  - name: --path
-    summary: Path to probe.
-    description: ''
-  - name: --probeMethod
-    parameterValueGroup: GET, HEAD
-    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Https
-    summary: Protocol to use for sending probes.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_probe_create
-  name: az network front-door probe create
-  summary: Create Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_delete
-  name: az network front-door probe delete
-  summary: Delete Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_list
-  name: az network front-door probe list
-  summary: List Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_show
-  name: az network front-door probe show
-  summary: Get the details of a Front Door health probe settings.
-- uid: ext_front-door_az_network_front_door_probe_update
-  name: az network front-door probe update
-  summary: Update Front Door health probe settings.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door health probe settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml
deleted file mode 100644
index f89b33e4f0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/routing-rule.yml
+++ /dev/null
@@ -1,292 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_routing_rule
-  name: az network front-door routing-rule
-  summary: Manage Front Door routing rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_routing_rule_create
-  - ext_front-door_az_network_front_door_routing_rule_delete
-  - ext_front-door_az_network_front_door_routing_rule_list
-  - ext_front-door_az_network_front_door_routing_rule_show
-  - ext_front-door_az_network_front_door_routing_rule_update
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-  description: >-
-    Create a Front Door routing rule to either forward the requests to a backend or redirect the users to a different URL.
-
-
-    Example 1: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Forward --backend-pool DefaultBackendPool -n forwardRoutingrule1 --patterns /forward1
-
-
-    Example 2: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Redirect --custom-host redirecthost.com -n redirectRouteRule1 --patterns /redirect1 --custom-query-string querystring.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --frontend-endpoints
-    summary: Space-separated list of frontend endpoint names or IDs.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --accepted-protocols
-    summary: 'Space-separated list of protocols to accept. Default: Http.'
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --patterns
-    summary: "Space-separated list of patterns to match. Default: '/\\*'."
-    description: ''
-  - name: --rules-engine
-    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
-    description: ''
-  - name: --backend-pool
-    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
-    description: ''
-  - name: --cache-duration
-    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
-    description: ''
-  - name: --caching
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to enable caching for this route.
-    description: ''
-  - name: --custom-forwarding-path
-    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
-    description: ''
-  - name: --dynamic-compression
-    parameterValueGroup: Disabled, Enabled
-    summary: Use dynamic compression for cached content.
-    description: ''
-  - name: --forwarding-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --query-parameter-strip-directive
-    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
-    summary: Treatment of URL query terms when forming the cache key.
-    description: ''
-  - name: --query-parameters
-    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
-    description: ''
-  - name: --custom-fragment
-    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
-    description: ''
-  - name: --custom-host
-    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
-    description: ''
-  - name: --custom-path
-    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
-    description: ''
-  - name: --custom-query-string
-    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
-    description: ''
-  - name: --redirect-protocol
-    defaultValue: MatchRequest
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: The protocol of the destination to where the traffic is redirected.
-    description: ''
-  - name: --redirect-type
-    defaultValue: Moved
-    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
-    summary: The redirect type the rule will use when redirecting traffic.
-    description: ''
-  - isRequired: true
-    name: --route-type
-    parameterValueGroup: Forward, Redirect
-    summary: Route type to define how Front Door should handle requests for this route i.e. forward them to a backend or redirect the users to a different URL.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the routing rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --accepted-protocols
-    summary: 'Space-separated list of protocols to accept. Default: Http.'
-    description: ''
-  - name: --frontend-endpoints
-    summary: Space-separated list of frontend endpoint names or IDs.
-    description: ''
-  - name: --patterns
-    summary: "Space-separated list of patterns to match. Default: '/\\*'."
-    description: ''
-  - name: --rules-engine
-    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
-    description: ''
-  - name: --backend-pool
-    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
-    description: ''
-  - name: --cache-duration
-    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
-    description: ''
-  - name: --caching
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to enable caching for this route.
-    description: ''
-  - name: --custom-forwarding-path
-    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
-    description: ''
-  - name: --dynamic-compression
-    parameterValueGroup: Disabled, Enabled
-    summary: Use dynamic compression for cached content.
-    description: ''
-  - name: --forwarding-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --query-parameter-strip-directive
-    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
-    summary: Treatment of URL query terms when forming the cache key.
-    description: ''
-  - name: --query-parameters
-    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Enabled status.
-    description: ''
-  - name: --custom-fragment
-    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
-    description: ''
-  - name: --custom-host
-    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
-    description: ''
-  - name: --custom-path
-    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
-    description: ''
-  - name: --custom-query-string
-    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
-    description: ''
-  - name: --redirect-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: The protocol of the destination to where the traffic is redirected.
-    description: ''
-  - name: --redirect-type
-    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
-    summary: The redirect type the rule will use when redirecting traffic.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_routing_rule_create
-  name: az network front-door routing-rule create
-  summary: Create a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_delete
-  name: az network front-door routing-rule delete
-  summary: Delete a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_list
-  name: az network front-door routing-rule list
-  summary: List Front Door routing rules.
-- uid: ext_front-door_az_network_front_door_routing_rule_show
-  name: az network front-door routing-rule show
-  summary: Get the details of a Front Door routing rule.
-- uid: ext_front-door_az_network_front_door_routing_rule_update
-  name: az network front-door routing-rule update
-  summary: Update a Front Door routing rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door routing rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml
deleted file mode 100644
index a7af2dab23..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine
-  name: az network front-door rules-engine
-  summary: Manage Front Door rules engines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_delete
-  - ext_front-door_az_network_front_door_rules_engine_list
-  - ext_front-door_az_network_front_door_rules_engine_show
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_delete
-  name: az network front-door rules-engine delete
-  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
-- uid: ext_front-door_az_network_front_door_rules_engine_list
-  name: az network front-door rules-engine list
-  summary: Lists all of the Rules Engine Configurations within a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_show
-  name: az network front-door rules-engine show
-  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Front Door rules engines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml
deleted file mode 100644
index 130872b77b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule
-  name: az network front-door rules-engine rule
-  summary: Manage Rules Engine rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_rule_create
-  - ext_front-door_az_network_front_door_rules_engine_rule_delete
-  - ext_front-door_az_network_front_door_rules_engine_rule_list
-  - ext_front-door_az_network_front_door_rules_engine_rule_show
-  - ext_front-door_az_network_front_door_rules_engine_rule_update
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-  description: This command allows creating Rules Engine configuration with Header action type. To add additional actions like Route overrides, use the `az network front-door rules-engine rule action add` command.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --priority
-    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --match-processing-behavior
-    parameterValueGroup: Continue, Stop
-    summary: Whether to stop processing rules after conditions in a rule is satisfied.
-    description: ''
-  - isRequired: true
-    name: --action-type
-    parameterValueGroup: RequestHeader, ResponseHeader
-    summary: Action type to apply for a rule.
-    description: ''
-  - name: --header-action
-    parameterValueGroup: Append, Delete, Overwrite
-    summary: Header action type for the requests.
-    description: ''
-  - name: --header-name
-    summary: Name of the header to modify.
-    description: ''
-  - name: --header-value
-    summary: Value of the header.
-    description: ''
-  - name: --match-values
-    summary: Space-separated list of values to match against.
-    description: ''
-  - name: --match-variable
-    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
-    summary: Name of the match condition.
-    description: ''
-  - name: --negate-condition
-    parameterValueGroup: false, true
-    summary: Applies "Not" to the operator.
-    description: ''
-  - name: --operator
-    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
-    summary: Operator of the match condition.
-    description: ''
-  - name: --selector
-    summary: Optional selector for the match condition variable.
-    description: ''
-  - name: --transforms
-    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
-    summary: Space-separated list of transforms to apply.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --match-processing-behavior
-    parameterValueGroup: Continue, Stop
-    summary: Whether to stop processing rules after conditions in a rule is satisfied.
-    description: ''
-  - name: --priority
-    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-  name: az network front-door rules-engine rule create
-  summary: Create a Rules Engine rule for a Front Door.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-  name: az network front-door rules-engine rule delete
-  summary: Delete a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-  name: az network front-door rules-engine rule list
-  summary: List rules of a Rules Engine configuration.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-  name: az network front-door rules-engine rule show
-  summary: Get the details of a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-  name: az network front-door rules-engine rule update
-  summary: Update Rules Engine configuration of a rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Rules Engine rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml
deleted file mode 100644
index 74ef803a09..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/action.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-  name: az network front-door rules-engine rule action
-  summary: Manage Rules Engine actions for Front Door.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  - ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  - ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - isRequired: true
-    name: --action-type
-    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
-    summary: Action type to apply for a rule.
-    description: ''
-  - name: --header-action
-    parameterValueGroup: Append, Delete, Overwrite
-    summary: Header action type for the requests.
-    description: ''
-  - name: --header-name
-    summary: Name of the header to modify.
-    description: ''
-  - name: --header-value
-    summary: Value of the header.
-    description: ''
-  - name: --backend-pool
-    summary: Name or ID of a backend pool.
-    description: ''
-  - name: --cache-duration
-    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
-    description: ''
-  - name: --caching
-    parameterValueGroup: Disabled, Enabled
-    summary: Whether to enable caching for this route.
-    description: ''
-  - name: --custom-forwarding-path
-    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
-    description: ''
-  - name: --dynamic-compression
-    parameterValueGroup: Disabled, Enabled
-    summary: Use dynamic compression for cached content.
-    description: ''
-  - name: --forwarding-protocol
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: Protocol to use for forwarding traffic.
-    description: ''
-  - name: --query-parameter-strip-directive
-    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
-    summary: Treatment of URL query terms when forming the cache key.
-    description: ''
-  - name: --query-parameters
-    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
-    description: ''
-  - name: --custom-fragment
-    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
-    description: ''
-  - name: --custom-host
-    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
-    description: ''
-  - name: --custom-path
-    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
-    description: ''
-  - name: --custom-query-string
-    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
-    description: ''
-  - name: --redirect-protocol
-    defaultValue: MatchRequest
-    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
-    summary: The protocol of the destination to where the traffic is redirected.
-    description: ''
-  - name: --redirect-type
-    defaultValue: Moved
-    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
-    summary: The redirect type the rule will use when redirecting traffic.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --index
-    summary: 0-based index of the request or response header action to remove. Index parameter is not required for "ForwardRouteOverride" or "RedirectRouteOverride" action remove.
-    description: ''
-  - isRequired: true
-    name: --action-type
-    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
-    summary: Action type to apply for a rule.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-  name: az network front-door rules-engine rule action add
-  summary: Add an action to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-  name: az network front-door rules-engine rule action list
-  summary: Show all actions that apply for a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-  name: az network front-door rules-engine rule action remove
-  summary: Remove an action from a Rules Engine rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Rules Engine actions for Front Door.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml
deleted file mode 100644
index e68470b9f6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/rules-engine/rule/condition.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-  name: az network front-door rules-engine rule condition
-  summary: Manage Rules Engine match conditions for Front Door.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  - ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  - ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-  - name: --match-values
-    summary: Space-separated list of values to match against.
-    description: ''
-  - name: --match-variable
-    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
-    summary: Name of the match condition.
-    description: ''
-  - name: --negate-condition
-    parameterValueGroup: false, true
-    summary: Applies "Not" to the operator.
-    description: ''
-  - name: --operator
-    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
-    summary: Operator of the match condition.
-    description: ''
-  - name: --selector
-    summary: Optional selector for the match condition variable.
-    description: ''
-  - name: --transforms
-    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
-    summary: Space-separated list of transforms to apply.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --front-door-name -f
-    summary: Name of the Front Door.
-    description: ''
-  - isRequired: true
-    name: --index
-    summary: 0-based index of the match condition to remove.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rules-engine-name -r
-    summary: Name of the Rules Engine.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-  name: az network front-door rules-engine rule condition add
-  summary: Add a match condition to a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-  name: az network front-door rules-engine rule condition list
-  summary: Show all match conditions associated with a Rules Engine rule.
-- uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-  name: az network front-door rules-engine rule condition remove
-  summary: Remove a match condition from a Rules Engine rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Rules Engine match conditions for Front Door.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml
deleted file mode 100644
index 4e1fff3079..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy.yml
+++ /dev/null
@@ -1,241 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy
-  name: az network front-door waf-policy
-  summary: Manage WebApplication Firewall (WAF) policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_create
-  - ext_front-door_az_network_front_door_waf_policy_delete
-  - ext_front-door_az_network_front_door_waf_policy_list
-  - ext_front-door_az_network_front_door_waf_policy_show
-  - ext_front-door_az_network_front_door_waf_policy_update
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --custom-block-response-body
-    summary: Body to return for blocked requests.
-    description: ''
-  - name: --custom-block-response-status-code
-    summary: HTTP status to return for blocked requests.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --mode
-    parameterValueGroup: Detection, Prevention
-    summary: Firewall policy mode.
-    description: ''
-  - name: --redirect-url
-    summary: URL used for redirect rule action.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --custom-block-response-body
-    summary: Body to return for blocked requests.
-    description: ''
-  - name: --custom-block-response-status-code
-    summary: HTTP status to return for blocked requests.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create in a disabled state.
-    description: ''
-  - name: --mode
-    parameterValueGroup: Detection, Prevention
-    summary: Firewall policy mode.
-    description: ''
-  - name: --redirect-url
-    summary: URL used for redirect rule action.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_create
-  name: az network front-door waf-policy create
-  summary: Create a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_delete
-  name: az network front-door waf-policy delete
-  summary: Delete a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_list
-  name: az network front-door waf-policy list
-  summary: List WAF policies.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_show
-  name: az network front-door waf-policy show
-  summary: Get the details of a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_update
-  name: az network front-door waf-policy update
-  summary: Update settings of a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage WebApplication Firewall (WAF) policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml
deleted file mode 100644
index a7ea0c61fb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rule-definition.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-  name: az network front-door waf-policy managed-rule-definition
-  summary: Learn about available managed rule sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-  name: az network front-door waf-policy managed-rule-definition list
-  summary: Show a detailed list of available managed rule sets.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Learn about available managed rule sets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml
deleted file mode 100644
index 1f28b3f638..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-  name: az network front-door waf-policy managed-rules
-  summary: Change and view managed rule sets associated with your WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available managed rulesets.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to apply.
-    description: ''
-  - isRequired: true
-    name: --version
-    summary: Rule set version.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to remove.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-  name: az network front-door waf-policy managed-rules add
-  summary: Add a managed rule set to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-  name: az network front-door waf-policy managed-rules list
-  summary: Show which managed rule sets are applied to a WAF policy.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-  name: az network front-door waf-policy managed-rules remove
-  summary: Remove a managed rule set from a WAF policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Change and view managed rule sets associated with your WAF policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml
deleted file mode 100644
index 140da70047..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/exclusion.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-  name: az network front-door waf-policy managed-rules exclusion
-  summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
-  description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-  description: Prevents the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --match-variable
-    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
-    description: ''
-  - isRequired: true
-    name: --operator
-    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to exclusion.
-    description: ''
-  - isRequired: true
-    name: --value
-    summary: Values to match the variable name against.
-    description: ''
-  - name: --rule-group-id
-    summary: ID of the rule group containing the rule to exclusion.
-    description: ''
-  - name: --rule-id
-    summary: ID of the rule to apply exclusion.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the exclusions to list.
-    description: ''
-  - name: --rule-group-id
-    summary: ID of the rule group containing the exclusions to list.
-    description: ''
-  - name: --rule-id
-    summary: ID of the rule to list exclusion for.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --match-variable
-    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
-    description: ''
-  - isRequired: true
-    name: --operator
-    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the exclusion to remove.
-    description: ''
-  - isRequired: true
-    name: --value
-    summary: Values to match the variable name against.
-    description: ''
-  - name: --rule-group-id
-    summary: ID of the rule group containing the exclusion to remove.
-    description: ''
-  - name: --rule-id
-    summary: ID of the rule to remove from exclusion.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-  name: az network front-door waf-policy managed-rules exclusion add
-  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-  name: az network front-door waf-policy managed-rules exclusion list
-  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-  name: az network front-door waf-policy managed-rules exclusion remove
-  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml
deleted file mode 100644
index 69797d0a49..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/managed-rules/override.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-  name: az network front-door waf-policy managed-rules override
-  summary: View and alter overrides on managed rules within a managed rule set.
-  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  - ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-group-id
-    summary: ID of the rule group containing the rule to override.
-    description: ''
-  - isRequired: true
-    name: --rule-id
-    summary: ID of the rule to override.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset to override.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Block, Log, Redirect
-    summary: Action for applied rulesets.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Whether to disable the rule.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the overrides to list.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-group-id
-    summary: ID of the rule group containing the override to remove.
-    description: ''
-  - isRequired: true
-    name: --rule-id
-    summary: ID of the rule override to remove.
-    description: ''
-  - isRequired: true
-    name: --type
-    summary: ID of the ruleset with the override to remove.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-  name: az network front-door waf-policy managed-rules override add
-  summary: Add an override on a managed rule within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-  name: az network front-door waf-policy managed-rules override list
-  summary: List the overrides on managed rules within a managed rule set.
-- uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-  name: az network front-door waf-policy managed-rules override remove
-  summary: Remove an override on a managed rule within a managed rule set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml
deleted file mode 100644
index db229d0d24..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule
-  name: az network front-door waf-policy rule
-  summary: Manage WAF policy custom rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_rule_create
-  - ext_front-door_az_network_front_door_waf_policy_rule_delete
-  - ext_front-door_az_network_front_door_waf_policy_rule_list
-  - ext_front-door_az_network_front_door_waf_policy_rule_show
-  - ext_front-door_az_network_front_door_waf_policy_rule_update
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --action
-    parameterValueGroup: Allow, Block, Log, Redirect
-    summary: Rule action.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --priority
-    summary: Priority of the rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-type
-    parameterValueGroup: MatchRule, RateLimitRule
-    summary: Type of rule.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Whether to disable the rule.
-    description: ''
-  - name: --rate-limit-duration
-    summary: Rate limit duration in minutes.
-    description: ''
-  - name: --rate-limit-threshold
-    summary: Rate limit threshold.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --action
-    parameterValueGroup: Allow, Block, Log, Redirect
-    summary: Rule action.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Whether to disable the rule.
-    description: ''
-  - name: --priority
-    summary: Priority of the rule.
-    description: ''
-  - name: --rate-limit-duration
-    summary: Rate limit duration in minutes.
-    description: ''
-  - name: --rate-limit-threshold
-    summary: Rate limit threshold.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-  name: az network front-door waf-policy rule create
-  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-  name: az network front-door waf-policy rule delete
-  summary: Delete a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-  name: az network front-door waf-policy rule list
-  summary: List WAF policy custom rules.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-  name: az network front-door waf-policy rule show
-  summary: Get the details of a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-  name: az network front-door waf-policy rule update
-  summary: Alter the details of a WAF policy custom rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage WAF policy custom rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml
deleted file mode 100644
index 41e19b0a47..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/front-door/network/front-door/waf-policy/rule/match-condition.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-  name: az network front-door waf-policy rule match-condition
-  summary: Alter match-conditions associated with a WAF policy custom rule.
-  description: Note that at least one match-condition must be associated with a custom rule.
-  langs:
-  - azurecli
-  children:
-  - ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  - ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  - ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-  description: >-
-    Usage:   [--negate] --match-variable VARIABLE[.selector] --operator OPERATOR --value [VALUE [VALUE ...]]
-
-      Variable allowed values: RemoteAddr, RequestMethod, QueryString, PostArgs, RequestUri, RequestHeader, RequestBody, Cookies, SocketAddr
-
-      Operator allowed values: Any, IPMatch, GeoMatch, Equal, Contains, LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, BeginsWith, EndsWith, RegEx.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --match-variable
-    summary: Variable[.Selector] Request variable to test with optional selector.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --operator
-    summary: Operator used to compare the variable to the values.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --values
-    summary: Space-separated list of values to match against.
-    description: ''
-  - name: --negate
-    parameterValueGroup: false, true
-    summary: Applies "Not" to the operator.
-    description: ''
-  - name: --transforms
-    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
-    summary: Space-separated list of transforms to apply.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --index
-    summary: 0-based index of the match condition to remove.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the custom rule.
-    description: ''
-  - isRequired: true
-    name: --policy-name
-    summary: Name of the WAF policy.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-  name: az network front-door waf-policy rule match-condition add
-  summary: Add a match-condition to a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-  name: az network front-door waf-policy rule match-condition list
-  summary: Show all match-conditions associated with a WAF policy custom rule.
-- uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-  name: az network front-door waf-policy rule match-condition remove
-  summary: Remove a match-condition from a WAF policy custom rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Note that at least one match-condition must be associated with a custom rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hack/hack.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hack/hack.yml
deleted file mode 100644
index a5182840dc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hack/hack.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hack_az_hack
-  name: az hack
-  summary: Commands to manage resources commonly used for student hacks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hack_az_hack_create
-  - ext_hack_az_hack_show
-- uid: ext_hack_az_hack_create
-  name: az hack create
-  summary: Create resources commonly used for a student hack, including a website, database, and artificial intelligence.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create website using Python and MySQL
-    syntax:
-      content: az hack create --name samplename --runtime python --location westus2 --database mysql
-  - summary: Create website using Node.js, SQL and Cognitive Services key
-    syntax:
-      content: az hack create --name samplename --runtime node --location westus2 --database sql --ai
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Base name of resources; random charagers will be appended.
-    description: ''
-  - isRequired: true
-    name: --runtime -r
-    parameterValueGroup: aspnet, jetty, node, php, python, tomcat
-    summary: Runtime.
-    description: ''
-  - name: --ai
-    summary: Enable Azure Cognitive Services.
-    description: ''
-  - name: --database -d
-    parameterValueGroup: cosmosdb, mysql, sql
-    summary: Database type - { sql | mysql | cosmosdb }.
-    description: ''
-- uid: ext_hack_az_hack_show
-  name: az hack show
-  summary: Display settings for created resources, including database name and password, Git url, and website url.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Display settings
-    syntax:
-      content: az hack show --name samplename
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the application.
-    description: ''
-commands:
-- uid: ext_hack_az_hack_create
-  name: az hack create
-  summary: Create resources commonly used for a student hack, including a website, database, and artificial intelligence.
-- uid: ext_hack_az_hack_show
-  name: az hack show
-  summary: Display settings for created resources, including database name and password, Git url, and website url.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage resources commonly used for student hacks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hack/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hack/index.yml
deleted file mode 100644
index 12d176f176..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hack/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hack_az
-  name: hack
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_hack_az_hack
-  name: az hack
-  summary: Commands to manage resources commonly used for student hacks.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml
deleted file mode 100644
index 20c7442f1d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/dedicated-hsm.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hardware-security-modules_az_dedicated_hsm
-  name: az dedicated-hsm
-  summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hardware-security-modules_az_dedicated_hsm_create
-  - ext_hardware-security-modules_az_dedicated_hsm_delete
-  - ext_hardware-security-modules_az_dedicated_hsm_list
-  - ext_hardware-security-modules_az_dedicated_hsm_show
-  - ext_hardware-security-modules_az_dedicated_hsm_update
-  - ext_hardware-security-modules_az_dedicated_hsm_wait
-- uid: ext_hardware-security-modules_az_dedicated_hsm_create
-  name: az dedicated-hsm create
-  summary: Create a dedicated HSM in the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new dedicated HSM
-    syntax:
-      content: az dedicated-hsm create -n "hsm1" -l "japanwest" -i private-ip-address="1.0.0.1" -s id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.Network/virtualNetworks/hsm/subnets/hsm" --stamp-id "stamp1" --sku name="SafeNet Luna Network HSM A790" --tags Dept="hsm" Environment="dogfood" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the dedicated Hsm.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --network-profile-network-interfaces -i
-    summary: 'Specifies a list of ip address from the specfied subnet for the network interfaces associated with the dedicated HSM. Expected value: -i private-ip-address=xx.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    summary: 'The HSM device SKU if a non-standard HSM is wanted (default is: SafeNet Luna Network HSM A790).'
-    description: ''
-  - name: --stamp-id
-    summary: This field will be used when RP does not support Availability zones.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --zones
-    summary: The Dedicated Hsm zones.
-    description: ''
-  - name: --subnet -s
-    summary: 'Specifies the identifier of the subnet. Expected value: id=xx.'
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-  name: az dedicated-hsm delete
-  summary: Deletes the specified Azure Dedicated HSM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dedicated HSM
-    syntax:
-      content: az dedicated-hsm delete -n "hsm1" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dedicated HSM to delete.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_list
-  name: az dedicated-hsm list
-  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List dedicated HSM devices in a subscription
-    syntax:
-      content: az dedicated-hsm list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --top
-    summary: Maximum number of results to return.
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_show
-  name: az dedicated-hsm show
-  summary: Gets the specified Azure dedicated HSM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a dedicated HSM
-    syntax:
-      content: az dedicated-hsm show -n "hsm1" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dedicated HSM.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_update
-  name: az dedicated-hsm update
-  summary: Update a dedicated HSM in the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an existing dedicated HSM
-    syntax:
-      content: az dedicated-hsm update -n "hsm1" --tags Dept="hsm" Environment="dogfood" Slice="A" -g "hsm-group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the dedicated HSM.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-  name: az dedicated-hsm wait
-  summary: Waits for operation to complete.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a dedicated HSM
-    syntax:
-      content: az dedicated-hsm wait --created -g "hsm-group" --name "hsm1"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the dedicated HSM.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_hardware-security-modules_az_dedicated_hsm_create
-  name: az dedicated-hsm create
-  summary: Create a dedicated HSM in the specified subscription.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-  name: az dedicated-hsm delete
-  summary: Deletes the specified Azure Dedicated HSM.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_list
-  name: az dedicated-hsm list
-  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_show
-  name: az dedicated-hsm show
-  summary: Gets the specified Azure dedicated HSM.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_update
-  name: az dedicated-hsm update
-  summary: Update a dedicated HSM in the specified subscription.
-- uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-  name: az dedicated-hsm wait
-  summary: Waits for operation to complete.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Dedicated-hsm to create, update, list, show, and delete HSMs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/index.yml
deleted file mode 100644
index 96506bfe3b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hardware-security-modules/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hardware-security-modules_az
-  name: hardware-security-modules
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_hardware-security-modules_az_dedicated_hsm
-  name: az dedicated-hsm
-  summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml
deleted file mode 100644
index 3fc8588ab6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az_healthcareapis
-  name: az healthcareapis
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_healthcareapis_az_healthcareapis_operation_result
-  name: az healthcareapis operation-result
-  summary: Healthcareapis operation-result.
-- uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-  name: az healthcareapis operation-result show
-  summary: Get the operation result for a long running operation.
-- uid: ext_healthcareapis_az_healthcareapis_service
-  name: az healthcareapis service
-  summary: Healthcareapis service.
-- uid: ext_healthcareapis_az_healthcareapis_service_create
-  name: az healthcareapis service create
-  summary: Create or update the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_delete
-  name: az healthcareapis service delete
-  summary: Delete a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_list
-  name: az healthcareapis service list
-  summary: Get all the service instances in a subscription.
-- uid: ext_healthcareapis_az_healthcareapis_service_show
-  name: az healthcareapis service show
-  summary: Get the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_update
-  name: az healthcareapis service update
-  summary: Update the metadata of a service instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml
deleted file mode 100644
index 3a02ede001..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/operation-result.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az_healthcareapis_operation_result
-  name: az healthcareapis operation-result
-  summary: Healthcareapis operation-result.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_healthcareapis_az_healthcareapis_operation_result_show
-- uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-  name: az healthcareapis operation-result show
-  summary: Get the operation result for a long running operation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get operation result
-    syntax:
-      content: az healthcareapis operation-result show --location-name "westus" --operation-result-id "exampleid"
-  parameters:
-  - isRequired: true
-    name: --location-name
-    summary: The location of the operation.
-    description: ''
-  - isRequired: true
-    name: --operation-result-id
-    summary: The ID of the operation result to get.
-    description: ''
-commands:
-- uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-  name: az healthcareapis operation-result show
-  summary: Get the operation result for a long running operation.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Healthcareapis operation-result.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml
deleted file mode 100644
index 57ca72ec2c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/healthcareapis/service.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az_healthcareapis_service
-  name: az healthcareapis service
-  summary: Healthcareapis service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_healthcareapis_az_healthcareapis_service_create
-  - ext_healthcareapis_az_healthcareapis_service_delete
-  - ext_healthcareapis_az_healthcareapis_service_list
-  - ext_healthcareapis_az_healthcareapis_service_show
-  - ext_healthcareapis_az_healthcareapis_service_update
-- uid: ext_healthcareapis_az_healthcareapis_service_create
-  name: az healthcareapis service create
-  summary: Create or update the metadata of a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or Update a service with all parameters
-    syntax:
-      content: az healthcareapis service create --resource-group "rg1" --resource-name "service1" --identity type="SystemAssigned" --kind "fhir-R4" --location "westus2" --properties "{\"accessPolicies\":[{\"objectId\":\"c487e7d1-3210-41a3-8ccc-e9372b78da47\"},{\"objectId\":\"5b307da8-43d4-492b-8b66-b0294ade872f\"}],\"authenticationConfiguration\":{\"audience\":\"https://azurehealthcareapis.com\",\"authority\":\"https://login.microsoftonline.com/abfde7b2-df0f-47e6-aabf-2462b07508dc\",\"smartProxyEnabled\":true},\"corsConfiguration\":{\"allowCredentials\":false,\"headers\":[\"*\"],\"maxAge\":1440,\"methods\":[\"DELETE\",\"GET\",\"OPTIONS\",\"PATCH\",\"POST\",\"PUT\"],\"origins\":[\"*\"]},\"cosmosDbConfiguration\":{\"offerThroughput\":1000},\"exportConfiguration\":{\"storageAccountName\":\"existingStorageAccount\"}}"
-  - summary: Create or Update a service with minimum parameters
-    syntax:
-      content: az healthcareapis service create --resource-group "rg1" --resource-name "service2" --kind "fhir-R4" --location "westus2" --properties "{\"accessPolicies\":[{\"objectId\":\"c487e7d1-3210-41a3-8ccc-e9372b78da47\"}]}"
-  parameters:
-  - isRequired: true
-    name: --kind
-    parameterValueGroup: fhir, fhir-R4, fhir-Stu3
-    summary: The kind of the service.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-  - name: --etag
-    summary: An etag associated with the resource, used for optimistic concurrency when editing it.
-    description: ''
-  - name: --identity
-    summary: 'Setting indicating whether the service has a managed identity associated with it. Expect value: type=xx.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --properties
-    summary: 'The common properties of a service. Expected value: json-string/@json-file.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_delete
-  name: az healthcareapis service delete
-  summary: Delete a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete service
-    syntax:
-      content: az healthcareapis service delete --resource-group "rg1" --resource-name "service1"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_list
-  name: az healthcareapis service list
-  summary: Get all the service instances in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all services in resource group
-    syntax:
-      content: az healthcareapis service list --resource-group "rgname"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_show
-  name: az healthcareapis service show
-  summary: Get the metadata of a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get metadata
-    syntax:
-      content: az healthcareapis service show --resource-group "rg1" --resource-name "service1"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-- uid: ext_healthcareapis_az_healthcareapis_service_update
-  name: az healthcareapis service update
-  summary: Update the metadata of a service instance.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch service
-    syntax:
-      content: az healthcareapis service update --resource-group "rg1" --resource-name "service1" --tags tag1="value1" tag2="value2"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: The name of the service instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_healthcareapis_az_healthcareapis_service_create
-  name: az healthcareapis service create
-  summary: Create or update the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_delete
-  name: az healthcareapis service delete
-  summary: Delete a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_list
-  name: az healthcareapis service list
-  summary: Get all the service instances in a subscription.
-- uid: ext_healthcareapis_az_healthcareapis_service_show
-  name: az healthcareapis service show
-  summary: Get the metadata of a service instance.
-- uid: ext_healthcareapis_az_healthcareapis_service_update
-  name: az healthcareapis service update
-  summary: Update the metadata of a service instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Healthcareapis service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/index.yml
deleted file mode 100644
index 108231e116..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/healthcareapis/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_healthcareapis_az
-  name: healthcareapis
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_healthcareapis_az_healthcareapis
-  name: az healthcareapis
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml
deleted file mode 100644
index 1a459a3011..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache.yml
+++ /dev/null
@@ -1,379 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache
-  name: az hpc-cache
-  summary: Commands to manage hpc cache.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_create
-  - ext_hpc-cache_az_hpc_cache_delete
-  - ext_hpc-cache_az_hpc_cache_flush
-  - ext_hpc-cache_az_hpc_cache_list
-  - ext_hpc-cache_az_hpc_cache_show
-  - ext_hpc-cache_az_hpc_cache_start
-  - ext_hpc-cache_az_hpc_cache_stop
-  - ext_hpc-cache_az_hpc_cache_update
-  - ext_hpc-cache_az_hpc_cache_upgrade_firmware
-  - ext_hpc-cache_az_hpc_cache_wait
-- uid: ext_hpc-cache_az_hpc_cache_create
-  name: az hpc-cache create
-  summary: Create or update a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_CreateOrUpdate
-    syntax:
-      content: >-
-        az hpc-cache create --resource-group "scgroup" --name "sc1" --location "eastus" \
-
-        --cache-size-gb "3072" --subnet "/subscriptions/{{ subscription_id }}/resourceGroups/{{ re
-
-        source_group }}/providers/Microsoft.Network/virtualNetworks/{{ virtual_network_name }}/sub
-
-        nets/{{ subnet_name }}" --sku-name "Standard_2G"
-  parameters:
-  - isRequired: true
-    name: --cache-size-gb
-    summary: The size of this Cache, in GB.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    summary: SKU name for this Cache.
-    description: ''
-  - isRequired: true
-    name: --subnet
-    summary: Subnet used for the Cache.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_delete
-  name: az hpc-cache delete
-  summary: Schedules a Cache for deletion.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Delete
-    syntax:
-      content: az hpc-cache delete --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_flush
-  name: az hpc-cache flush
-  summary: Tells a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors returned until the flush is complete.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Flush
-    syntax:
-      content: az hpc-cache flush --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_list
-  name: az hpc-cache list
-  summary: Returns all Caches the user has access to under a resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_List
-    syntax:
-      content: az hpc-cache list
-  - summary: Caches_ListByResourceGroup
-    syntax:
-      content: az hpc-cache list --resource-group "scgroup"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_show
-  name: az hpc-cache show
-  summary: Returns a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Get
-    syntax:
-      content: az hpc-cache show --resource-group "scgroup" --name "sc1"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_start
-  name: az hpc-cache start
-  summary: Tells a Stopped state Cache to transition to Active state.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Start
-    syntax:
-      content: az hpc-cache start --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_stop
-  name: az hpc-cache stop
-  summary: Tells an Active Cache to transition to Stopped state.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Stop
-    syntax:
-      content: az hpc-cache stop --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_update
-  name: az hpc-cache update
-  summary: Create or update a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Update
-    syntax:
-      content: >-
-        az hpc-cache update --resource-group "scgroup" --name "sc1" --location "eastus" \
-
-        --cache-size-gb "3072" --subnet "/subscriptions/{{ subscription_id }}/resourceGroups/{{ re
-
-        source_group }}/providers/Microsoft.Network/virtualNetworks/{{ virtual_network_name }}/sub
-
-        nets/{{ subnet_name }}" --sku-name "Standard_2G"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cache-size-gb
-    summary: The size of this Cache, in GB.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku-name
-    summary: SKU name for this Cache.
-    description: ''
-  - name: --subnet
-    summary: Subnet used for the Cache.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-  name: az hpc-cache upgrade-firmware
-  summary: Upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_UpgradeFirmware
-    syntax:
-      content: az hpc-cache upgrade-firmware --resource-group "scgroup" --name "sc"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_wait
-  name: az hpc-cache wait
-  summary: Waits a hpc Cache to specified state.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Caches_Wait
-    syntax:
-      content: az hpc-cache wait --resource-group "scgroup" --name "sc" --created
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-  name: az hpc-cache blob-storage-target
-  summary: Commands to create hpc cache blob storage target.
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  name: az hpc-cache blob-storage-target add
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-  name: az hpc-cache blob-storage-target update
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_create
-  name: az hpc-cache create
-  summary: Create or update a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_delete
-  name: az hpc-cache delete
-  summary: Schedules a Cache for deletion.
-- uid: ext_hpc-cache_az_hpc_cache_flush
-  name: az hpc-cache flush
-  summary: Tells a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors returned until the flush is complete.
-- uid: ext_hpc-cache_az_hpc_cache_list
-  name: az hpc-cache list
-  summary: Returns all Caches the user has access to under a resource group.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-  name: az hpc-cache nfs-storage-target
-  summary: Commands to create hpc cache nfs storage target.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  name: az hpc-cache nfs-storage-target add
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-  name: az hpc-cache nfs-storage-target update
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_show
-  name: az hpc-cache show
-  summary: Returns a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_skus
-  name: az hpc-cache skus
-  summary: Commands to manage hpc cache skus.
-- uid: ext_hpc-cache_az_hpc_cache_skus_list
-  name: az hpc-cache skus list
-  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
-- uid: ext_hpc-cache_az_hpc_cache_start
-  name: az hpc-cache start
-  summary: Tells a Stopped state Cache to transition to Active state.
-- uid: ext_hpc-cache_az_hpc_cache_stop
-  name: az hpc-cache stop
-  summary: Tells an Active Cache to transition to Stopped state.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target
-  name: az hpc-cache storage-target
-  summary: Commands to manage hpc cache storage target.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-  name: az hpc-cache storage-target list
-  summary: Returns a list of Storage Targets for the specified Cache.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-  name: az hpc-cache storage-target remove
-  summary: Removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-  name: az hpc-cache storage-target show
-  summary: Returns a Storage Target from a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_update
-  name: az hpc-cache update
-  summary: Create or update a Cache.
-- uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-  name: az hpc-cache upgrade-firmware
-  summary: Upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect.
-- uid: ext_hpc-cache_az_hpc_cache_usage_model
-  name: az hpc-cache usage-model
-  summary: Commands to manage hpc cache usage model.
-- uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-  name: az hpc-cache usage-model list
-  summary: Get the list of Cache Usage Models available to this subscription.
-- uid: ext_hpc-cache_az_hpc_cache_wait
-  name: az hpc-cache wait
-  summary: Waits a hpc Cache to specified state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml
deleted file mode 100644
index 0756913821..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/blob-storage-target.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-  name: az hpc-cache blob-storage-target
-  summary: Commands to create hpc cache blob storage target.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  - ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  name: az hpc-cache blob-storage-target add
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_CreateOrUpdate
-    syntax:
-      content: >-
-        az hpc-cache blob-storage-target add --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1" --storage-account "/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.Storage/storageAccounts/{acount_name}" \
-         --container-name "cn" --virtual-namespace-path "/test"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --container-name
-    summary: Name of target storage container.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-account
-    summary: Resource ID of target storage account.
-    description: ''
-  - isRequired: true
-    name: --virtual-namespace-path -v
-    summary: Path to create for this storage target in the client-facing virtual filesystem.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-  name: az hpc-cache blob-storage-target update
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --container-name
-    summary: Name of target storage container.
-    description: ''
-  - name: --storage-account
-    summary: Resource ID of target storage account.
-    description: ''
-  - name: --virtual-namespace-path -v
-    summary: Path to create for this storage target in the client-facing virtual filesystem.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-  name: az hpc-cache blob-storage-target add
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-  name: az hpc-cache blob-storage-target update
-  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to create hpc cache blob storage target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml
deleted file mode 100644
index d8c9276750..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/nfs-storage-target.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-  name: az hpc-cache nfs-storage-target
-  summary: Commands to create hpc cache nfs storage target.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  - ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  name: az hpc-cache nfs-storage-target add
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_CreateOrUpdate
-    syntax:
-      content: >-
-        az hpc-cache nfs-storage-target add --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1" --nfs3-target 10.7.0.24 --nfs3-usage-model WRITE_AROUND \
-
-        --junction namespace-path="/nt2" nfs-export="/export/a" target-path="/1" \
-
-        --junction namespace-path="/nt3" nfs-export="/export/b"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --junction
-    summary: List of Cache namespace junctions to target for namespace associations.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --nfs3-target
-    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
-    description: ''
-  - isRequired: true
-    name: --nfs3-usage-model
-    summary: Identifies the primary usage model to be used for this Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-  name: az hpc-cache nfs-storage-target update
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --junction
-    summary: List of Cache namespace junctions to target for namespace associations.
-    description: ''
-  - name: --nfs3-target
-    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
-    description: ''
-  - name: --nfs3-usage-model
-    summary: Identifies the primary usage model to be used for this Storage Target.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-  name: az hpc-cache nfs-storage-target add
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-- uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-  name: az hpc-cache nfs-storage-target update
-  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to create hpc cache nfs storage target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml
deleted file mode 100644
index 06936e4486..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/skus.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_skus
-  name: az hpc-cache skus
-  summary: Commands to manage hpc cache skus.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_skus_list
-- uid: ext_hpc-cache_az_hpc_cache_skus_list
-  name: az hpc-cache skus list
-  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Skus_List
-    syntax:
-      content: az hpc-cache skus list
-  parameters: []
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_skus_list
-  name: az hpc-cache skus list
-  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache skus.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml
deleted file mode 100644
index 25898bcaff..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/storage-target.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_storage_target
-  name: az hpc-cache storage-target
-  summary: Commands to manage hpc cache storage target.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_storage_target_list
-  - ext_hpc-cache_az_hpc_cache_storage_target_remove
-  - ext_hpc-cache_az_hpc_cache_storage_target_show
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-  name: az hpc-cache storage-target list
-  summary: Returns a list of Storage Targets for the specified Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_List
-    syntax:
-      content: az hpc-cache storage-target list --resource-group "scgroup" --cache-name "sc1"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-  name: az hpc-cache storage-target remove
-  summary: Removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_Delete
-    syntax:
-      content: >-
-        az hpc-cache storage-target remove --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-  name: az hpc-cache storage-target show
-  summary: Returns a Storage Target from a Cache.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: StorageTargets_Get
-    syntax:
-      content: >-
-        az hpc-cache storage-target show --resource-group "scgroup" --cache-name "sc1" --name \
-
-        "st1"
-  parameters:
-  - isRequired: true
-    name: --cache-name
-    summary: Name of Cache.
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: Name of the Storage Target.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-  name: az hpc-cache storage-target list
-  summary: Returns a list of Storage Targets for the specified Cache.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-  name: az hpc-cache storage-target remove
-  summary: Removes a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
-- uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-  name: az hpc-cache storage-target show
-  summary: Returns a Storage Target from a Cache.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache storage target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml
deleted file mode 100644
index d0820310ae..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/hpc-cache/usage-model.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az_hpc_cache_usage_model
-  name: az hpc-cache usage-model
-  summary: Commands to manage hpc cache usage model.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_hpc-cache_az_hpc_cache_usage_model_list
-- uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-  name: az hpc-cache usage-model list
-  summary: Get the list of Cache Usage Models available to this subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: UsageModels_List
-    syntax:
-      content: az hpc-cache usage-model list
-  parameters: []
-commands:
-- uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-  name: az hpc-cache usage-model list
-  summary: Get the list of Cache Usage Models available to this subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage hpc cache usage model.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/index.yml
deleted file mode 100644
index 714b97be2c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/hpc-cache/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_hpc-cache_az
-  name: hpc-cache
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_hpc-cache_az_hpc_cache
-  name: az hpc-cache
-  summary: Commands to manage hpc cache.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/image.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/image.yml
deleted file mode 100644
index ed26ed7151..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/image.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_image-copy-extension_az_image
-  name: az image
-  summary: Manage custom virtual machine images.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_image-copy-extension_az_image_copy
-- uid: ext_image-copy-extension_az_image_copy
-  name: az image copy
-  summary: Copy a managed image (or vm) to other regions. It requires the source disk to be available.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Copy an image to several regions and cleanup at the end.
-    syntax:
-      content: >-
-        az image copy --source-resource-group mySources-rg --source-object-name myImage \
-            --target-location uksouth northeurope --target-resource-group "images-repo-rg" --cleanup
-  - summary: Use an already generalized vm to create images in other regions.
-    syntax:
-      content: >-
-        az image copy --source-resource-group mySources-rg --source-object-name myVm \
-            --source-type vm --target-location uksouth northeurope --target-resource-group "images-repo-rg"
-  parameters:
-  - isRequired: true
-    name: --source-object-name
-    summary: The name of the image or vm resource.
-    description: ''
-  - isRequired: true
-    name: --source-resource-group
-    summary: Name of the resource group of the source resource.
-    description: ''
-  - isRequired: true
-    name: --target-location
-    summary: Space separated location list to create the image in (e.g. westeurope etc.).
-    description: ''
-  - isRequired: true
-    name: --target-resource-group
-    summary: Name of the resource group to create images in.
-    description: ''
-  - name: --cleanup
-    summary: Include this switch to delete temporary resources upon completion.
-    description: ''
-  - name: --export-as-snapshot
-    summary: Include this switch to export the copies as snapshots instead of images.
-    description: ''
-  - name: --parallel-degree
-    defaultValue: "-1"
-    summary: Number of parallel copy operations.
-    description: ''
-  - name: --source-type
-    defaultValue: image
-    parameterValueGroup: image, vm
-    summary: Image or vm.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --target-name
-    summary: Name of the final image that will be created.
-    description: ''
-  - name: --target-subscription
-    summary: Name or ID of the subscription where the final image should be created.
-    description: ''
-  - name: --temporary_resource_group_name
-    defaultValue: image-copy-rg
-    summary: Resource Group name where temporary storage account will be created.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Time in seconds for the copy operation to finish. Increase this time if you are going to copy large images (disks) like 512GB or more.
-    description: ''
-commands:
-- uid: ext_image-copy-extension_az_image_copy
-  name: az image copy
-  summary: Copy a managed image (or vm) to other regions. It requires the source disk to be available.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage custom virtual machine images.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/index.yml
deleted file mode 100644
index cfca961e5f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/image-copy-extension/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_image-copy-extension_az
-  name: image-copy-extension
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_image-copy-extension_az_image
-  name: az image
-  summary: Manage custom virtual machine images.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export.yml
deleted file mode 100644
index 7733043b9c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az_import_export
-  name: az import-export
-  summary: Manage Import Export.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_import-export_az_import_export_create
-  - ext_import-export_az_import_export_delete
-  - ext_import-export_az_import_export_list
-  - ext_import-export_az_import_export_show
-  - ext_import-export_az_import_export_update
-- uid: ext_import-export_az_import_export_create
-  name: az import-export create
-  summary: Creates a new job or updates an existing job in the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an import job
-    syntax:
-      content: >-
-        az import-export create --resource-group "myResourceGroup" --name "myJob"
-
-        --location "West US" --backup-drive-manifest true --diagnostics-path "waimportexport"
-
-        --drive-list bit-locker-key=238810-662376-448998-450120-652806-203390-606320-483076
-
-        drive-header-hash= drive-id=9CA995BB manifest-file=\\DriveManifest.xml
-
-        manifest-hash=109B21108597EF36D5785F08303F3638 --type "Import" --log-level "Verbose"
-
-        --return-address city=Redmond country-or-region=USA email=Test@contoso.com phone=4250000000
-
-        postal-code=98007 recipient-name=Tests state-or-province=wa street-address1=Street1
-
-        street-address2=street2 --storage-account "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-\
-
-        xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --backup-drive-manifest
-    parameterValueGroup: false, true
-    summary: Default value is false. Indicates whether the manifest files on the drives should be copied to block blobs.
-    description: ''
-  - name: --cancel-requested
-    parameterValueGroup: false, true
-    summary: Indicates whether a request has been submitted to cancel the job.
-    description: ''
-  - name: --client-tenant-id
-    summary: The tenant ID of the client making the request.
-    description: ''
-  - name: --delivery-package
-    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
-    description: ''
-  - name: --diagnostics-path
-    summary: The virtual blob directory to which the copy logs and backups of drive manifest files (if enabled) will be stored.
-    description: ''
-  - name: --drive-list
-    summary: List of up to ten drives that comprise the job. The drive list is a required element for an import job; it is not specified for export jobs.
-    description: ''
-  - name: --export
-    summary: A property containing information about the blobs to be exported for an export job. This property is required for export jobs, but must not be specified for import jobs.
-    description: ''
-  - name: --incomplete-blob-list-uri
-    summary: A blob path that points to a block blob containing a list of blob names that were not exported due to insufficient drive space. If all blobs were exported successfully, then this element is not included in the response.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --log-level
-    summary: Default value is Error. Indicates whether error logging or verbose logging will be enabled.
-    description: ''
-  - name: --percent-complete
-    summary: Overall percentage completed for the job.
-    description: ''
-  - name: --return-address
-    summary: Specifies the return address information for the job.
-    description: ''
-  - name: --return-package
-    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
-    description: ''
-  - name: --return-shipping
-    summary: Specifies the return carrier and customer's account with the carrier.
-    description: ''
-  - name: --shipping-information
-    summary: Contains information about the Microsoft datacenter to which the drives should be shipped.
-    description: ''
-  - name: --state
-    summary: Current state of the job.
-    description: ''
-  - name: --storage-account
-    summary: Name or ID of the storage account where data will be imported to or exported from.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --type
-    summary: The type of job.
-    description: ''
-- uid: ext_import-export_az_import_export_delete
-  name: az import-export delete
-  summary: Deletes an existing job. Only jobs in the Creating or Completed states can be deleted.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete job
-    syntax:
-      content: az import-export delete --resource-group "myResourceGroup" --name "myJob"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_import-export_az_import_export_list
-  name: az import-export list
-  summary: Returns all active and completed jobs in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List jobs in a resource group
-    syntax:
-      content: az import-export list --resource-group "myResourceGroup"
-  - summary: List jobs in current subscription
-    syntax:
-      content: az import-export list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_import-export_az_import_export_show
-  name: az import-export show
-  summary: Gets information about an existing job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get job
-    syntax:
-      content: az import-export show --resource-group "myResourceGroup" --name "myJob"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_import-export_az_import_export_update
-  name: az import-export update
-  summary: Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update job
-    syntax:
-      content: >-
-        az import-export update --resource-group "myResourceGroup" --name "myJob"
-
-        --backup-drive-manifest true --log-level "Verbose" --state ""
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --backup-drive-manifest
-    parameterValueGroup: false, true
-    summary: Indicates whether the manifest files on the drives should be copied to block blobs.
-    description: ''
-  - name: --cancel-requested
-    parameterValueGroup: false, true
-    summary: If specified, the value must be true. The service will attempt to cancel the job.
-    description: ''
-  - name: --delivery-package
-    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
-    description: ''
-  - name: --drive-list
-    summary: List of drives that comprise the job.
-    description: ''
-  - name: --log-level
-    summary: Indicates whether error logging or verbose logging is enabled.
-    description: ''
-  - name: --return-address
-    summary: Specifies the return address information for the job.
-    description: ''
-  - name: --return-shipping
-    summary: Specifies the return carrier and customer's account with the carrier.
-    description: ''
-  - name: --state
-    summary: If specified, the value must be Shipping, which tells the Import/Export service that the package for the job has been shipped. The ReturnAddress and DeliveryPackage properties must have been set either in this request or in a previous request, otherwise the request will fail.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_import-export_az_import_export_bit_locker_key
-  name: az import-export bit-locker-key
-  summary: Import-export bit-locker-key.
-- uid: ext_import-export_az_import_export_bit_locker_key_list
-  name: az import-export bit-locker-key list
-  summary: Returns the BitLocker Keys for all drives in the specified job.
-- uid: ext_import-export_az_import_export_create
-  name: az import-export create
-  summary: Creates a new job or updates an existing job in the specified subscription.
-- uid: ext_import-export_az_import_export_delete
-  name: az import-export delete
-  summary: Deletes an existing job. Only jobs in the Creating or Completed states can be deleted.
-- uid: ext_import-export_az_import_export_list
-  name: az import-export list
-  summary: Returns all active and completed jobs in a subscription.
-- uid: ext_import-export_az_import_export_location
-  name: az import-export location
-  summary: Import-export location.
-- uid: ext_import-export_az_import_export_location_list
-  name: az import-export location list
-  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
-- uid: ext_import-export_az_import_export_location_show
-  name: az import-export location show
-  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
-- uid: ext_import-export_az_import_export_show
-  name: az import-export show
-  summary: Gets information about an existing job.
-- uid: ext_import-export_az_import_export_update
-  name: az import-export update
-  summary: Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Import Export.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml
deleted file mode 100644
index f6673813b9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/bit-locker-key.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az_import_export_bit_locker_key
-  name: az import-export bit-locker-key
-  summary: Import-export bit-locker-key.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_import-export_az_import_export_bit_locker_key_list
-- uid: ext_import-export_az_import_export_bit_locker_key_list
-  name: az import-export bit-locker-key list
-  summary: Returns the BitLocker Keys for all drives in the specified job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List BitLocker Keys for drives in a job
-    syntax:
-      content: az import-export bit-locker-key list --resource-group "myResourceGroup" --job-name "myJob"
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the import/export job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_import-export_az_import_export_bit_locker_key_list
-  name: az import-export bit-locker-key list
-  summary: Returns the BitLocker Keys for all drives in the specified job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Import-export bit-locker-key.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/location.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/location.yml
deleted file mode 100644
index e33ded201b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/import-export/location.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az_import_export_location
-  name: az import-export location
-  summary: Import-export location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_import-export_az_import_export_location_list
-  - ext_import-export_az_import_export_location_show
-- uid: ext_import-export_az_import_export_location_list
-  name: az import-export location list
-  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List locations to which you can ship the disks
-    syntax:
-      content: az import-export location list
-  parameters: []
-- uid: ext_import-export_az_import_export_location_show
-  name: az import-export location show
-  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show details about a location
-    syntax:
-      content: az import-export location show --location "West US 2"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az import-export location list`.'
-    description: ''
-commands:
-- uid: ext_import-export_az_import_export_location_list
-  name: az import-export location list
-  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
-- uid: ext_import-export_az_import_export_location_show
-  name: az import-export location show
-  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Import-export location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/index.yml
deleted file mode 100644
index c949acb650..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/import-export/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_import-export_az
-  name: import-export
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_import-export_az_import_export
-  name: az import-export
-  summary: Manage Import Export.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/interactive/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/interactive/index.yml
deleted file mode 100644
index 982a33cd2f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/interactive/index.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_interactive_az
-  name: interactive
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands: []
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/index.yml
deleted file mode 100644
index 55a3b01a09..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az
-  name: internet-analyzer
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer
-  name: az internet-analyzer
-  summary: Commands to manage internet analyzer.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml
deleted file mode 100644
index 65e4782f65..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer
-  name: az internet-analyzer
-  summary: Commands to manage internet analyzer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_show_scorecard
-  - ext_internet-analyzer_az_internet_analyzer_show_timeseries
-- uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-  name: az internet-analyzer show-scorecard
-  summary: Show latency scorecard for a test.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --aggregation-interval
-    summary: The aggregation interval of the Latency Scorecard.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --test-name
-    summary: The name of the Internet Analyzer test.
-    description: ''
-  - name: --country
-    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - <a href="https://www.iso.org/iso-3166-country-codes.html">https://www.iso.org/iso-3166-country-codes.html</a>.
-    description: ''
-  - name: --end-date-time-utc
-    summary: The end DateTime of the Latency Scorecard in UTC.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-  name: az internet-analyzer show-timeseries
-  summary: Show timeseries for a test.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --aggregation-interval
-    summary: The aggregation interval of the Timeseries.
-    description: ''
-  - isRequired: true
-    name: --end-date-time-utc
-    summary: The end DateTime of the Timeseries in UTC.
-    description: ''
-  - isRequired: true
-    name: --endpoint
-    summary: The specific endpoint.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --start-date-time-utc
-    summary: The start DateTime of the Timeseries in UTC.
-    description: ''
-  - isRequired: true
-    name: --test-name
-    summary: The name of the Internet Analyzer test.
-    description: ''
-  - isRequired: true
-    name: --timeseries-type
-    summary: The type of Timeseries.
-    description: ''
-  - name: --country
-    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - <a href="https://www.iso.org/iso-3166-country-codes.html">https://www.iso.org/iso-3166-country-codes.html</a>.
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-  name: az internet-analyzer preconfigured-endpoint
-  summary: Commands to manage preconfigured endpoints.
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-  name: az internet-analyzer preconfigured-endpoint list
-  summary: List preconfigured endpoints.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile
-  name: az internet-analyzer profile
-  summary: Commands to manage internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-  name: az internet-analyzer profile create
-  summary: Create internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-  name: az internet-analyzer profile delete
-  summary: Delete internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-  name: az internet-analyzer profile list
-  summary: List internet analyzer profiles.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-  name: az internet-analyzer profile show
-  summary: Show internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-  name: az internet-analyzer profile update
-  summary: Update internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-  name: az internet-analyzer show-scorecard
-  summary: Show latency scorecard for a test.
-- uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-  name: az internet-analyzer show-timeseries
-  summary: Show timeseries for a test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test
-  name: az internet-analyzer test
-  summary: Commands to manage tests.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_create
-  name: az internet-analyzer test create
-  summary: Create test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-  name: az internet-analyzer test delete
-  summary: Delete test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_list
-  name: az internet-analyzer test list
-  summary: List tests.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_show
-  name: az internet-analyzer test show
-  summary: Show test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_update
-  name: az internet-analyzer test update
-  summary: Update test.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage internet analyzer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml
deleted file mode 100644
index f3cc4aa5e8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/preconfigured-endpoint.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-  name: az internet-analyzer preconfigured-endpoint
-  summary: Commands to manage preconfigured endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-  name: az internet-analyzer preconfigured-endpoint list
-  summary: List preconfigured endpoints.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets a list of Preconfigured Endpoints
-    syntax:
-      content: >-
-        az internet-analyzer preconfigured-endpoint list --resource-group "MyResourceGroup" \
-
-        --profile-name "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile for which to list preconfigured endpoints.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-  name: az internet-analyzer preconfigured-endpoint list
-  summary: List preconfigured endpoints.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage preconfigured endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml
deleted file mode 100644
index 38cbd54d10..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/profile.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer_profile
-  name: az internet-analyzer profile
-  summary: Commands to manage internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_profile_create
-  - ext_internet-analyzer_az_internet_analyzer_profile_delete
-  - ext_internet-analyzer_az_internet_analyzer_profile_list
-  - ext_internet-analyzer_az_internet_analyzer_profile_show
-  - ext_internet-analyzer_az_internet_analyzer_profile_update
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-  name: az internet-analyzer profile create
-  summary: Create internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creates an Internet Analyzer Profile in a Resource Group
-    syntax:
-      content: >-
-        az internet-analyzer profile create --resource-group "MyResourceGroup" --name "MyProfile" \
-
-        --location "WestUs" --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to be created.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The state of the Experiment.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-  name: az internet-analyzer profile delete
-  summary: Delete internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deletes an Internet Analyzer Profile in a Resource Group
-    syntax:
-      content: az internet-analyzer profile delete --resource-group "MyResourceGroup" --name "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to be deleted.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-  name: az internet-analyzer profile list
-  summary: List internet analyzer profiles.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Internet Analyzer Profiles in a Resource Group
-    syntax:
-      content: az internet-analyzer profile list --resource-group "MyResourceGroup"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-  name: az internet-analyzer profile show
-  summary: Show internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets an Internet Analyzer Profile by Profile Id
-    syntax:
-      content: az internet-analyzer profile show --resource-group "MyResourceGroup" --name "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to show.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-  name: az internet-analyzer profile update
-  summary: Update internet analyzer profile.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Updates an Internet Analyzer Profile in a Resource Group
-    syntax:
-      content: >-
-        az internet-analyzer profile update --resource-group "MyResourceGroup" --name "MyProfile" \
-
-        --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer profile to be updated.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The state of the Experiment.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-  name: az internet-analyzer profile create
-  summary: Create internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-  name: az internet-analyzer profile delete
-  summary: Delete internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-  name: az internet-analyzer profile list
-  summary: List internet analyzer profiles.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-  name: az internet-analyzer profile show
-  summary: Show internet analyzer profile.
-- uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-  name: az internet-analyzer profile update
-  summary: Update internet analyzer profile.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage internet analyzer profile.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml
deleted file mode 100644
index e0543c16e8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/internet-analyzer/internet-analyzer/test.yml
+++ /dev/null
@@ -1,226 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_internet-analyzer_az_internet_analyzer_test
-  name: az internet-analyzer test
-  summary: Commands to manage tests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_internet-analyzer_az_internet_analyzer_test_create
-  - ext_internet-analyzer_az_internet_analyzer_test_delete
-  - ext_internet-analyzer_az_internet_analyzer_test_list
-  - ext_internet-analyzer_az_internet_analyzer_test_show
-  - ext_internet-analyzer_az_internet_analyzer_test_update
-- uid: ext_internet-analyzer_az_internet_analyzer_test_create
-  name: az internet-analyzer test create
-  summary: Create test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creates a test
-    syntax:
-      content: >-
-        az internet-analyzer test create --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment" --description "this is my first experiment!" \
-
-        --endpoint-a-name "endpoint A" --endpoint-a-endpoint "endpointA.net" --endpoint-b-name \
-
-        "endpoint B" --endpoint-b-endpoint "endpointB.net" --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to be created.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the new test should be created.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: The description of the details or intents of the test.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The initial of the test.
-    description: ''
-  - name: --endpoint-a-endpoint
-    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-a-name
-    summary: The name of the control endpoint.
-    description: ''
-  - name: --endpoint-b-endpoint
-    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-b-name
-    summary: The name of the other endpoint.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-  name: az internet-analyzer test delete
-  summary: Delete test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deletes a test
-    syntax:
-      content: >-
-        az internet-analyzer test delete --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to delete.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_list
-  name: az internet-analyzer test list
-  summary: List tests.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets a list of tests
-    syntax:
-      content: >-
-        az internet-analyzer test list --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile"
-  parameters:
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile for which to list tests.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_show
-  name: az internet-analyzer test show
-  summary: Show test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets a test by name
-    syntax:
-      content: >-
-        az internet-analyzer test show --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to show.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_internet-analyzer_az_internet_analyzer_test_update
-  name: az internet-analyzer test update
-  summary: Update test.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Updates a test
-    syntax:
-      content: >-
-        az internet-analyzer test update --resource-group "MyResourceGroup" --profile-name \
-
-        "MyProfile" --name "MyExperiment" --description "string" --enabled-state "Enabled"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the Internet Analyzer test to be updated.
-    description: ''
-  - isRequired: true
-    name: --profile-name
-    summary: The name of the Internet Analyzer profile under which the test exists.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: The description of the details or intents of the test.
-    description: ''
-  - name: --enabled-state
-    parameterValueGroup: Disabled, Enabled
-    summary: The state of the Experiment.
-    description: ''
-  - name: --endpoint-a-endpoint
-    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-a-name
-    summary: The name of the control endpoint.
-    description: ''
-  - name: --endpoint-b-endpoint
-    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
-    description: ''
-  - name: --endpoint-b-name
-    summary: The name of the other endpoint.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_internet-analyzer_az_internet_analyzer_test_create
-  name: az internet-analyzer test create
-  summary: Create test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-  name: az internet-analyzer test delete
-  summary: Delete test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_list
-  name: az internet-analyzer test list
-  summary: List tests.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_show
-  name: az internet-analyzer test show
-  summary: Show test.
-- uid: ext_internet-analyzer_az_internet_analyzer_test_update
-  name: az internet-analyzer test update
-  summary: Update test.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage tests.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/index.yml
deleted file mode 100644
index fc92c3de31..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ip-group_az
-  name: ip-group
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ip-group_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network.yml
deleted file mode 100644
index f81a111692..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ip-group_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_ip-group_az_network_ip_group
-  name: az network ip-group
-  summary: Commands to manage IpGroup.
-- uid: ext_ip-group_az_network_ip_group_create
-  name: az network ip-group create
-  summary: Create an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_delete
-  name: az network ip-group delete
-  summary: Delete an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_list
-  name: az network ip-group list
-  summary: List all of IpGroup.
-- uid: ext_ip-group_az_network_ip_group_show
-  name: az network ip-group show
-  summary: Show details of an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_update
-  name: az network ip-group update
-  summary: Update an IpGroup.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network/ip-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network/ip-group.yml
deleted file mode 100644
index 2d00fe5406..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/ip-group/network/ip-group.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_ip-group_az_network_ip_group
-  name: az network ip-group
-  summary: Commands to manage IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_ip-group_az_network_ip_group_create
-  - ext_ip-group_az_network_ip_group_delete
-  - ext_ip-group_az_network_ip_group_list
-  - ext_ip-group_az_network_ip_group_show
-  - ext_ip-group_az_network_ip_group_update
-- uid: ext_ip-group_az_network_ip_group_create
-  name: az network ip-group create
-  summary: Create an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --ip-addresses
-    summary: Space-separated list of IpAddress or IpAddressPrefix.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_delete
-  name: az network ip-group delete
-  summary: Delete an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_list
-  name: az network ip-group list
-  summary: List all of IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_show
-  name: az network ip-group show
-  summary: Show details of an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
-    description: ''
-- uid: ext_ip-group_az_network_ip_group_update
-  name: az network ip-group update
-  summary: Update an IpGroup.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the IpGroup.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --ip-addresses
-    summary: Space-separated list of IpAddress or IpAddressPrefix.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_ip-group_az_network_ip_group_create
-  name: az network ip-group create
-  summary: Create an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_delete
-  name: az network ip-group delete
-  summary: Delete an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_list
-  name: az network ip-group list
-  summary: List all of IpGroup.
-- uid: ext_ip-group_az_network_ip_group_show
-  name: az network ip-group show
-  summary: Show details of an IpGroup.
-- uid: ext_ip-group_az_network_ip_group_update
-  name: az network ip-group update
-  summary: Update an IpGroup.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage IpGroup.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/index.yml
deleted file mode 100644
index 6f2be1677c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_k8sconfiguration_az
-  name: k8sconfiguration
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_k8sconfiguration_az_k8sconfiguration
-  name: az k8sconfiguration
-  summary: Commands to manage Kubernetes configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml
deleted file mode 100644
index 758dbbff41..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/k8sconfiguration/k8sconfiguration.yml
+++ /dev/null
@@ -1,260 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_k8sconfiguration_az_k8sconfiguration
-  name: az k8sconfiguration
-  summary: Commands to manage Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_k8sconfiguration_az_k8sconfiguration_create
-  - ext_k8sconfiguration_az_k8sconfiguration_delete
-  - ext_k8sconfiguration_az_k8sconfiguration_list
-  - ext_k8sconfiguration_az_k8sconfiguration_show
-  - ext_k8sconfiguration_az_k8sconfiguration_update
-- uid: ext_k8sconfiguration_az_k8sconfiguration_create
-  name: az k8sconfiguration create
-  summary: Create a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration create --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName --operator-instance-name OperatorInst01 \
-
-        --operator-namespace OperatorNamespace01 --repository-url git://github.com/fluxHowTo/flux-get-started \
-
-        --operator-params "'--git-readonly'" --enable-helm-operator --helm-operator-version 0.6.0 \
-
-        --scope namespace --helm-operator-params '--set helm.versions=v3'
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --repository-url -u
-    summary: Url of the source control repository.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --scope
-    parameterValueGroup: cluster, namespace
-    summary: Specify scope of the operator to be 'namespace' or 'cluster'.
-    description: ''
-  - name: --enable-helm-operator
-    parameterValueGroup: false, true
-    summary: Enable support for Helm chart deployments.
-    description: ''
-  - name: --helm-operator-params
-    summary: Chart values for the Helm Operator (if enabled).
-    description: ''
-  - name: --helm-operator-version
-    defaultValue: 0.3.0
-    summary: Chart version of the Helm Operator (if enabled).
-    description: ''
-  - name: --operator-instance-name
-    summary: Instance name of the Operator.
-    description: ''
-  - name: --operator-namespace
-    defaultValue: default
-    summary: Namespace in which to install the Operator.
-    description: ''
-  - name: --operator-params
-    summary: Parameters for the Operator.
-    description: ''
-  - name: --operator-type
-    defaultValue: flux
-    summary: Type of the operator. Valid value is 'flux'.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-  name: az k8sconfiguration delete
-  summary: Delete a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration delete --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_list
-  name: az k8sconfiguration list
-  summary: List Kubernetes configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Kubernetes configurations of a cluster
-    syntax:
-      content: >-
-        az k8sconfiguration list --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_show
-  name: az k8sconfiguration show
-  summary: Show details of a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration show --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_k8sconfiguration_az_k8sconfiguration_update
-  name: az k8sconfiguration update
-  summary: Update a Kubernetes configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an existing Kubernetes configuration
-    syntax:
-      content: >-
-        az k8sconfiguration update --resource-group MyResourceGroup --cluster-name MyClusterName \
-
-        --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \
-
-        --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \
-
-        --helm-operator-version 0.6.0 --helm-operator-params '--set helm.versions=v3'
-  parameters:
-  - isRequired: true
-    name: --cluster-name -c
-    summary: Name of the Kubernetes cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-type
-    parameterValueGroup: connectedClusters, managedClusters
-    summary: Specify Arc clusters or AKS managed clusters.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Kubernetes Configuration.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enable-helm-operator
-    parameterValueGroup: false, true
-    summary: Enable support for Helm chart deployments.
-    description: ''
-  - name: --helm-operator-params
-    summary: Chart values for the Helm Operator (if enabled).
-    description: ''
-  - name: --helm-operator-version
-    summary: Chart version of the Helm Operator (if enabled).
-    description: ''
-  - name: --operator-params
-    summary: Parameters for the Operator.
-    description: ''
-  - name: --repository-url -u
-    summary: Url of the source control repository.
-    description: ''
-commands:
-- uid: ext_k8sconfiguration_az_k8sconfiguration_create
-  name: az k8sconfiguration create
-  summary: Create a Kubernetes configuration.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-  name: az k8sconfiguration delete
-  summary: Delete a Kubernetes configuration.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_list
-  name: az k8sconfiguration list
-  summary: List Kubernetes configurations.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_show
-  name: az k8sconfiguration show
-  summary: Show details of a Kubernetes configuration.
-- uid: ext_k8sconfiguration_az_k8sconfiguration_update
-  name: az k8sconfiguration update
-  summary: Update a Kubernetes configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Kubernetes configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/index.yml
deleted file mode 100644
index 40fb3971e3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az
-  name: keyvault-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_keyvault-preview_az_keyvault
-  name: az keyvault
-  summary: Safeguard and maintain control of keys, secrets, and certificates.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault.yml
deleted file mode 100644
index e35b817030..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault.yml
+++ /dev/null
@@ -1,576 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault
-  name: az keyvault
-  summary: Safeguard and maintain control of keys, secrets, and certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_create
-  - ext_keyvault-preview_az_keyvault_delete
-  - ext_keyvault-preview_az_keyvault_delete_policy
-  - ext_keyvault-preview_az_keyvault_list
-  - ext_keyvault-preview_az_keyvault_list_deleted
-  - ext_keyvault-preview_az_keyvault_purge
-  - ext_keyvault-preview_az_keyvault_recover
-  - ext_keyvault-preview_az_keyvault_set_policy
-  - ext_keyvault-preview_az_keyvault_show
-  - ext_keyvault-preview_az_keyvault_update
-- uid: ext_keyvault-preview_az_keyvault_create
-  name: az keyvault create
-  summary: Create a key vault.
-  description: Default permissions are created for the current user or service principal unless the `--no-self-perms` flag is specified.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enable-purge-protection
-    parameterValueGroup: false, true
-    summary: Prevents manual purging of deleted vault, and all contained entities.
-    description: ''
-  - name: --enable-soft-delete
-    parameterValueGroup: false, true
-    summary: Enable vault deletion recovery for the vault, and all contained entities.
-    description: ''
-  - name: --enabled-for-deployment
-    parameterValueGroup: false, true
-    summary: Allow Virtual Machines to retrieve certificates stored as secrets from the vault.
-    description: ''
-  - name: --enabled-for-disk-encryption
-    parameterValueGroup: false, true
-    summary: Allow Disk Encryption to retrieve secrets from the vault and unwrap keys.
-    description: ''
-  - name: --enabled-for-template-deployment
-    parameterValueGroup: false, true
-    summary: Allow Resource Manager to retrieve secrets from the vault.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-self-perms
-    parameterValueGroup: false, true
-    summary: Don't add permissions for the current user/service principal in the new vault.
-    description: ''
-  - name: --sku
-    defaultValue: standard
-    parameterValueGroup: premium, standard
-    summary: Required. SKU details.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_delete
-  name: az keyvault delete
-  summary: Delete a key vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_delete_policy
-  name: az keyvault delete-policy
-  summary: Delete security policy settings for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --object-id
-    summary: A GUID that identifies the principal that will receive permissions.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --spn
-    summary: Name of a service principal that will receive permissions.
-    description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_list
-  name: az keyvault list
-  summary: List key vaults.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_list_deleted
-  name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_keyvault-preview_az_keyvault_purge
-  name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-  description: Aka Purges the deleted Azure key vault.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_recover
-  name: az keyvault recover
-  summary: Recover a key vault.
-  description: Recovers a previously deleted key vault for which soft delete was enabled.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_set_policy
-  name: az keyvault set-policy
-  summary: Update security policy settings for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --object-id
-    summary: A GUID that identifies the principal that will receive permissions.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --spn
-    summary: Name of a service principal that will receive permissions.
-    description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
-    description: ''
-  - name: --certificate-permissions
-    parameterValueGroup: backup, create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, restore, setissuers, update
-    summary: Space-separated list of certificate permissions to assign.
-    description: ''
-  - name: --key-permissions
-    parameterValueGroup: backup, create, decrypt, delete, encrypt, get, import, list, purge, recover, restore, sign, unwrapKey, update, verify, wrapKey
-    summary: Space-separated list of key permissions to assign.
-    description: ''
-  - name: --secret-permissions
-    parameterValueGroup: backup, delete, get, list, purge, recover, restore, set
-    summary: Space-separated list of secret permissions to assign.
-    description: ''
-  - name: --storage-permissions
-    parameterValueGroup: backup, delete, deletesas, get, getsas, list, listsas, purge, recover, regeneratekey, restore, set, setsas, update
-    summary: Space-separated list of storage permissions to assign.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_show
-  name: az keyvault show
-  summary: Show details of a key vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_update
-  name: az keyvault update
-  summary: Update the properties of a key vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --enable-purge-protection
-    parameterValueGroup: false, true
-    summary: Prevents manual purging of deleted vault, and all contained entities.
-    description: ''
-  - name: --enable-soft-delete
-    parameterValueGroup: false, true
-    summary: Enable vault deletion recovery for the vault, and all contained entities.
-    description: ''
-  - name: --enabled-for-deployment
-    parameterValueGroup: false, true
-    summary: Allow Virtual Machines to retrieve certificates stored as secrets from the vault.
-    description: ''
-  - name: --enabled-for-disk-encryption
-    parameterValueGroup: false, true
-    summary: Allow Disk Encryption to retrieve secrets from the vault and unwrap keys.
-    description: ''
-  - name: --enabled-for-template-deployment
-    parameterValueGroup: false, true
-    summary: Allow Resource Manager to retrieve secrets from the vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-- uid: ext_keyvault-preview_az_keyvault_create
-  name: az keyvault create
-  summary: Create a key vault.
-- uid: ext_keyvault-preview_az_keyvault_delete
-  name: az keyvault delete
-  summary: Delete a key vault.
-- uid: ext_keyvault-preview_az_keyvault_delete_policy
-  name: az keyvault delete-policy
-  summary: Delete security policy settings for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-- uid: ext_keyvault-preview_az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: ext_keyvault-preview_az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: ext_keyvault-preview_az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: ext_keyvault-preview_az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: ext_keyvault-preview_az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-- uid: ext_keyvault-preview_az_keyvault_list
-  name: az keyvault list
-  summary: List key vaults.
-- uid: ext_keyvault-preview_az_keyvault_list_deleted
-  name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
-- uid: ext_keyvault-preview_az_keyvault_network_rule
-  name: az keyvault network-rule
-  summary: Manage vault network ACLs.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_add
-  name: az keyvault network-rule add
-  summary: Add a network rule to the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_list
-  name: az keyvault network-rule list
-  summary: Lists the network rules from the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-  name: az keyvault network-rule remove
-  summary: Removes a network rule from the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_purge
-  name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_recover
-  name: az keyvault recover
-  summary: Recover a key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-- uid: ext_keyvault-preview_az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: ext_keyvault-preview_az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-- uid: ext_keyvault-preview_az_keyvault_set_policy
-  name: az keyvault set-policy
-  summary: Update security policy settings for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_show
-  name: az keyvault show
-  summary: Show details of a key vault.
-- uid: ext_keyvault-preview_az_keyvault_storage
-  name: az keyvault storage
-  summary: Manage storage accounts.
-- uid: ext_keyvault-preview_az_keyvault_storage_add
-  name: az keyvault storage add
-  summary: Creates or updates a new storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_backup
-  name: az keyvault storage backup
-  summary: Backs up the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_list
-  name: az keyvault storage list
-  summary: List storage accounts managed by the specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-  name: az keyvault storage list-deleted
-  summary: Lists deleted storage accounts for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_purge
-  name: az keyvault storage purge
-  summary: Permanently deletes the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_recover
-  name: az keyvault storage recover
-  summary: Recovers the deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  name: az keyvault storage regenerate-key
-  summary: Regenerates the specified key value for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_remove
-  name: az keyvault storage remove
-  summary: Remove a Key Vault managed Azure Storage Account and all associated SAS definitions. This operation requires the storage/delete permission.
-- uid: ext_keyvault-preview_az_keyvault_storage_restore
-  name: az keyvault storage restore
-  summary: Restores a backed up storage account to a vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-  name: az keyvault storage sas-definition
-  summary: Manage storage account SAS definitions.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_show
-  name: az keyvault storage show
-  summary: Gets information about a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-  name: az keyvault storage show-deleted
-  summary: Gets the specified deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_update
-  name: az keyvault storage update
-  summary: Updates the specified attributes associated with the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_update
-  name: az keyvault update
-  summary: Update the properties of a key vault.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Safeguard and maintain control of keys, secrets, and certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate.yml
deleted file mode 100644
index 47fb64e958..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate.yml
+++ /dev/null
@@ -1,420 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_create
-  - ext_keyvault-preview_az_keyvault_certificate_delete
-  - ext_keyvault-preview_az_keyvault_certificate_download
-  - ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  - ext_keyvault-preview_az_keyvault_certificate_import
-  - ext_keyvault-preview_az_keyvault_certificate_list
-  - ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  - ext_keyvault-preview_az_keyvault_certificate_list_versions
-  - ext_keyvault-preview_az_keyvault_certificate_purge
-  - ext_keyvault-preview_az_keyvault_certificate_recover
-  - ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  - ext_keyvault-preview_az_keyvault_certificate_show
-  - ext_keyvault-preview_az_keyvault_certificate_show_deleted
-- uid: ext_keyvault-preview_az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-  description: Certificates can be used as a secrets for provisioned virtual machines.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a self-signed certificate with the default policy and add it to a virtual machine.
-    syntax:
-      content: "az keyvault certificate create --vault-name vaultname -n cert1 \\\n  -p \"$(az keyvault certificate get-default-policy)\"\n\nsecrets=$(az keyvault secret list-versions --vault-name vaultname \\\n  -n cert1 --query \"[?attributes.enabled].id\" -o tsv)\n\nvm_secrets=$(az vm secret format -s \"$secrets\") \n\naz vm create -g group-name -n vm-name --admin-username deploy  \\\n  --image debian --secrets \"$vm_secrets\""
-  parameters:
-  - isRequired: true
-    name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create certificate in disabled state.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validity
-    summary: Number of months the certificate is valid for. Overrides the value specified with --policy/-p.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-  description: Deletes all versions of a certificate object along with its associated policy. Delete certificate cannot be used to remove individual versions of a certificate object. This operation requires the certificates/delete permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-  description: The certificate formatted as either PEM or DER. PEM is the default.
-  langs:
-  - azurecli
-  examples:
-  - summary: Download a certificate as PEM and check its fingerprint in openssl.
-    syntax:
-      content: az keyvault certificate download --vault-name vault -n cert-name -f cert.pem && \ openssl x509 -in cert.pem -inform PEM  -noout -sha1 -fingerprint
-  - summary: Download a certificate as DER and check its fingerprint in openssl.
-    syntax:
-      content: az keyvault certificate download --vault-name vault -n cert-name -f cert.crt -e DER && \ openssl x509 -in cert.crt -inform DER  -noout -sha1 -fingerprint
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: File to receive the binary certificate contents.
-    description: ''
-  - name: --encoding -e
-    defaultValue: PEM
-    parameterValueGroup: DER, PEM
-    summary: Encoding of the certificate. DER will create a binary DER formatted x509 certificate, and PEM will create a base64 PEM x509 certificate.
-    description: ''
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The certificate version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-  description: >-
-    This default policy can be used in conjunction with `az keyvault create` to create a self-signed certificate. The default policy can also be used as a starting point to create derivative policies.
-
-
-    For more details, see: <a href="https://docs.microsoft.com/en-us/rest/api/keyvault/certificates-and-policies">https://docs.microsoft.com/en-us/rest/api/keyvault/certificates-and-policies</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a self-signed certificate with the default policy
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
-  parameters:
-  - name: --scaffold
-    summary: Create a fully formed policy structure with default values.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-  description: Certificates can also be used as a secrets in provisioned virtual machines.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a service principal with a certificate, add the certificate to Key Vault and provision a VM with that certificate.
-    syntax:
-      content: "service_principal=$(az ad sp create-for-rbac --create-cert) \n\ncert_file=$(echo $service_principal | jq .fileWithCertAndPrivateKey -r) \n\naz keyvault create -g my-group -n vaultname \n\naz keyvault certificate import --vault-name vaultname -n cert_file \n\nsecrets=$(az keyvault secret list-versions --vault-name vaultname \\\n  -n cert1 --query \"[?attributes.enabled].id\" -o tsv)\n\nvm_secrets=$(az vm secret format -s \"$secrets\") \n\naz vm create -g group-name -n vm-name --admin-username deploy  \\\n  --image debian --secrets \"$vm_secrets\""
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: PKCS12 file or PEM file containing the certificate and private key.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Import the certificate in disabled state.
-    description: ''
-  - name: --password
-    summary: If the private key in certificate is encrypted, the password used for encryption.
-    description: ''
-  - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-  description: The GetCertificates operation returns the set of certificates resources in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-pending
-    summary: Specifies whether to include certificates which are not completely provisioned.
-    description: ''
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-  description: The GetDeletedCertificates operation retrieves the certificates in the current vault which are in a deleted state and ready for recovery or purging. This operation includes deletion-specific information. This operation requires the certificates/get/list permission. This operation can only be enabled on soft-delete enabled vaults.
-  langs:
-  - azurecli
-  parameters:
-  - name: --include-pending
-    summary: Specifies whether to include certificates which are not completely provisioned.
-    description: ''
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-  description: The GetCertificateVersions operation returns the versions of a certificate in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-  description: The PurgeDeletedCertificate operation performs an irreversible deletion of the specified certificate, without possibility for recovery. The operation is not available if the recovery level does not specify 'Purgeable'. This operation requires the certificate/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-  description: The RecoverDeletedCertificate operation performs the reversal of the Delete operation. The operation is applicable in vaults enabled for soft-delete, and must be issued during the retention interval (available in the deleted certificate's attributes). This operation requires the certificates/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-  description: The UpdateCertificate operation applies the specified update on the given certificate; the only elements updated are the certificate's attributes. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Enable the certificate.
-    description: ''
-  - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The certificate version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-  description: Gets information about a specific certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The certificate version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-  description: The GetDeletedCertificate operation retrieves the deleted certificate information plus its attributes, such as retention interval, scheduled permanent deletion and the current deletion recovery level. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the certificate. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/contact.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/contact.yml
deleted file mode 100644
index a9a0ccf5e9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/contact.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_contact_add
-  - ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  - ext_keyvault-preview_az_keyvault_certificate_contact_list
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Contact e-mail address. Must be unique.
-    description: ''
-  - name: --name
-    summary: Full contact name.
-    description: ''
-  - name: --phone
-    summary: Contact phone number.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Contact e-mail address. Must be unique.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-  description: The GetCertificateContacts operation returns the set of certificate contact resources in the specified key vault. This operation requires the certificates/managecontacts permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage contacts for certificate management.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer.yml
deleted file mode 100644
index 4916c55e3c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_update
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Set issuer to disabled state.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --account-id
-    summary: The issuer account id/username/etc.
-    description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
-    description: ''
-  - name: --organization-id
-    summary: The organization id.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-  description: The DeleteCertificateIssuer operation permanently removes the specified certificate issuer from the vault. This operation requires the certificates/manageissuers/deleteissuers permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-  description: The GetCertificateIssuers operation returns the set of certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-  description: The GetCertificateIssuer operation returns the specified certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Set issuer enabled state.
-    description: ''
-  - name: --provider-name
-    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --account-id
-    summary: The issuer account id/username/etc.
-    description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
-    description: ''
-  - name: --organization-id
-    summary: The organization id.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage certificate issuer information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer/admin.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer/admin.yml
deleted file mode 100644
index 0512ff1910..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/issuer/admin.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  - ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Admin e-mail address. Must be unique within the vault.
-    description: ''
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - name: --first-name
-    summary: ''
-    description: ''
-  - name: --last-name
-    summary: ''
-    description: ''
-  - name: --phone
-    summary: Amin phone number.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --email
-    summary: Admin e-mail address. Must be unique within the vault.
-    description: ''
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --issuer-name
-    summary: Certificate issuer name.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage admin information for certificate issuers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/pending.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/pending.yml
deleted file mode 100644
index cbc83e1383..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/certificate/pending.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  - ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  - ext_keyvault-preview_az_keyvault_certificate_pending_show
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-  description: Deletes the creation operation for a specified certificate that is in the process of being created. The certificate is no longer created. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-  description: The MergeCertificate operation performs the merging of a certificate or certificate chain with a key pair currently available in the service. This operation requires the certificates/create permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: File containing the certificate or certificate chain to merge.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create certificate in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-  description: Gets the creation operation associated with a specified certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pending certificate creation operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/key.yml
deleted file mode 100644
index 2fffee8072..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/key.yml
+++ /dev/null
@@ -1,370 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_key_backup
-  - ext_keyvault-preview_az_keyvault_key_create
-  - ext_keyvault-preview_az_keyvault_key_delete
-  - ext_keyvault-preview_az_keyvault_key_import
-  - ext_keyvault-preview_az_keyvault_key_list
-  - ext_keyvault-preview_az_keyvault_key_list_deleted
-  - ext_keyvault-preview_az_keyvault_key_list_versions
-  - ext_keyvault-preview_az_keyvault_key_purge
-  - ext_keyvault-preview_az_keyvault_key_recover
-  - ext_keyvault-preview_az_keyvault_key_restore
-  - ext_keyvault-preview_az_keyvault_key_set_attributes
-  - ext_keyvault-preview_az_keyvault_key_show
-  - ext_keyvault-preview_az_keyvault_key_show_deleted
-- uid: ext_keyvault-preview_az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-  description: The Key Backup operation exports a key from Azure Key Vault in a protected form. Note that this operation does NOT return key material in a form that can be used outside the Azure Key Vault system, the returned key material is either protected to a Azure Key Vault HSM or to Azure Key Vault itself. The intent of this operation is to allow a client to GENERATE a key in one Azure Key Vault instance, BACKUP the key, and then RESTORE it into another Azure Key Vault instance. The BACKUP operation may be used to export, in protected form, any key type from Azure Key Vault. Individual versions of a key cannot be backed up. BACKUP / RESTORE can be performed within geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical area. This operation requires the key/backup permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: Local file path in which to store key backup.
-    description: ''
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-  description: The create key operation can be used to create any key type in Azure Key Vault. If the named key already exists, Azure Key Vault creates a new version of the key. It requires the keys/create permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --curve
-    parameterValueGroup: P-256, P-384, P-521, SECP256K1
-    summary: Elliptic curve name. For valid values, see JsonWebKeyCurveName.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create key in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --kty
-    parameterValueGroup: EC, EC-HSM, RSA, RSA-HSM, oct
-    summary: The type of key to create. For valid values, see JsonWebKeyType.
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
-    description: ''
-  - name: --protection -p
-    parameterValueGroup: hsm, software
-    summary: Specifies the type of key protection.
-    description: ''
-  - name: --size
-    summary: The key size in bytes. For example, 1024 or 2048.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-  description: The delete key operation cannot be used to remove individual versions of a key. This operation removes the cryptographic material associated with the key, which means the key is not usable for Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt operations. This operation requires the keys/delete permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-  description: Supports importing base64 encoded private keys from PEM files. Supports importing BYOK keys into HSM for premium key vaults.
-  langs:
-  - azurecli
-  parameters:
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create key in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
-    description: ''
-  - name: --protection -p
-    parameterValueGroup: hsm, software
-    summary: Specifies the type of key protection.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --byok-file
-    summary: BYOK file containing the key to be imported. Must not be password protected.
-    description: ''
-  - name: --pem-file
-    summary: PEM file containing the key to be imported.
-    description: ''
-  - name: --pem-password
-    summary: Password of PEM file.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and tags are provided in the response. Individual versions of a key are not listed in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is applicable for vaults enabled for soft-delete. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-  description: The full key identifier, attributes, and tags are provided in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-  description: The Purge Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-  description: The Recover Deleted Key operation is applicable for deleted keys in soft-delete enabled vaults. It recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will return an error. Consider this the inverse of the delete operation on soft-delete enabled vaults. This operation requires the keys/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-  description: 'Imports a previously backed up key into Azure Key Vault, restoring the key, its key identifier, attributes and access control policies. The RESTORE operation may be used to import a previously backed up key. Individual versions of a key cannot be restored. The key is restored in its entirety with the same key name as it had when it was backed up. If the key name is not available in the target Key Vault, the RESTORE operation will be rejected. While the key name is retained during restore, the final key identifier will change if the key is restored to a different vault. Restore will restore all versions and preserve version identifiers. The RESTORE operation is subject to security constraints: The target Key Vault must be owned by the same Microsoft Azure Subscription as the source Key Vault The user must have RESTORE permission in the target Key Vault. This operation requires the keys/restore permission.'
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: Local key backup from which to restore key.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-  description: 'In order to perform this operation, the key must already exist in the Key Vault. Note: The cryptographic material of a key itself cannot be changed. This operation requires the keys/update permission.'
-  langs:
-  - azurecli
-  parameters:
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Enable the key.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The key version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-  description: The get key operation is applicable to all key types. If the requested key is symmetric, then no key material is released in the response. This operation requires the keys/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The key version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-  description: The Get Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/get permission. .
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: ext_keyvault-preview_az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: ext_keyvault-preview_az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: ext_keyvault-preview_az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: ext_keyvault-preview_az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: ext_keyvault-preview_az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/network-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/network-rule.yml
deleted file mode 100644
index 6f8499d8e1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/network-rule.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_network_rule
-  name: az keyvault network-rule
-  summary: Manage vault network ACLs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_network_rule_add
-  - ext_keyvault-preview_az_keyvault_network_rule_list
-  - ext_keyvault-preview_az_keyvault_network_rule_remove
-- uid: ext_keyvault-preview_az_keyvault_network_rule_add
-  name: az keyvault network-rule add
-  summary: Add a network rule to the network ACLs for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_network_rule_list
-  name: az keyvault network-rule list
-  summary: Lists the network rules from the network ACLs for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-  name: az keyvault network-rule remove
-  summary: Removes a network rule from the network ACLs for a Key Vault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_network_rule_add
-  name: az keyvault network-rule add
-  summary: Add a network rule to the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_list
-  name: az keyvault network-rule list
-  summary: Lists the network rules from the network ACLs for a Key Vault.
-- uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-  name: az keyvault network-rule remove
-  summary: Removes a network rule from the network ACLs for a Key Vault.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage vault network ACLs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/secret.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/secret.yml
deleted file mode 100644
index ac63431af3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/secret.yml
+++ /dev/null
@@ -1,346 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_secret_backup
-  - ext_keyvault-preview_az_keyvault_secret_delete
-  - ext_keyvault-preview_az_keyvault_secret_download
-  - ext_keyvault-preview_az_keyvault_secret_list
-  - ext_keyvault-preview_az_keyvault_secret_list_deleted
-  - ext_keyvault-preview_az_keyvault_secret_list_versions
-  - ext_keyvault-preview_az_keyvault_secret_purge
-  - ext_keyvault-preview_az_keyvault_secret_recover
-  - ext_keyvault-preview_az_keyvault_secret_restore
-  - ext_keyvault-preview_az_keyvault_secret_set
-  - ext_keyvault-preview_az_keyvault_secret_set_attributes
-  - ext_keyvault-preview_az_keyvault_secret_show
-  - ext_keyvault-preview_az_keyvault_secret_show_deleted
-- uid: ext_keyvault-preview_az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-  description: Requests that a backup of the specified secret be downloaded to the client. All versions of the secret will be downloaded. This operation requires the secrets/backup permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-path
-    summary: ''
-    description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-  description: The DELETE operation applies to any secret stored in Azure Key Vault. DELETE cannot be applied to an individual version of a secret. This operation requires the secrets/delete permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: File to receive the secret contents.
-    description: ''
-  - name: --encoding -e
-    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
-    summary: Encoding of the destination file. By default, will look for the 'file-encoding' tag on the secret. Otherwise will assume 'utf-8'.
-    description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The secret version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-  description: The Get Secrets operation is applicable to the entire vault. However, only the base secret identifier and its attributes are provided in the response. Individual secret versions are not listed in the response. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-  description: The Get Deleted Secrets operation returns the secrets that have been deleted for a vault enabled for soft-delete. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-  description: The full secret identifier and attributes are provided in the response. No values are returned for the secrets. This operations requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the secret.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-  description: The purge deleted secret operation removes the secret permanently, without the possibility of recovery. This operation can only be enabled on a soft-delete enabled vault. This operation requires the secrets/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-  description: Recovers the deleted secret in the specified vault. This operation can only be performed on a soft-delete enabled vault. This operation requires the secrets/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-  description: Restores a backed up secret, and all its versions, to a vault. This operation requires the secrets/restore permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-path
-    summary: ''
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --description
-    summary: Description of the secret contents (e.g. password, connection string, etc).
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Create secret in disabled state.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --encoding -e
-    defaultValue: utf-8
-    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
-    summary: Source file encoding. The value is saved as a tag (`file-encoding=&lt;val&gt;`) and used during download to automatically encode the resulting file.
-    description: ''
-  - name: --file -f
-    summary: Source file for secret. Use in conjunction with '--encoding'.
-    description: ''
-  - name: --value
-    summary: Plain text secret value. Cannot be used with '--file' or '--encoding'.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the secret.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-  description: The UPDATE operation changes specified attributes of an existing stored secret. Attributes that are not specified in the request are left unchanged. The value of a secret itself cannot be changed. This operation requires the secrets/set permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --content-type
-    summary: Type of the secret value such as a password.
-    description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Enable the secret.
-    description: ''
-  - name: --expires
-    summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The secret version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-  description: The GET operation is applicable to any secret stored in Azure Key Vault. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-  - name: --version -v
-    summary: The secret version. If omitted, uses the latest version.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-  description: The Get Deleted Secret operation returns the specified deleted secret along with its attributes. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: ext_keyvault-preview_az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: ext_keyvault-preview_az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage secrets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/storage.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/storage.yml
deleted file mode 100644
index 32cb407f64..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/storage.yml
+++ /dev/null
@@ -1,342 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_storage
-  name: az keyvault storage
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_storage_add
-  - ext_keyvault-preview_az_keyvault_storage_backup
-  - ext_keyvault-preview_az_keyvault_storage_list
-  - ext_keyvault-preview_az_keyvault_storage_list_deleted
-  - ext_keyvault-preview_az_keyvault_storage_purge
-  - ext_keyvault-preview_az_keyvault_storage_recover
-  - ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  - ext_keyvault-preview_az_keyvault_storage_remove
-  - ext_keyvault-preview_az_keyvault_storage_restore
-  - ext_keyvault-preview_az_keyvault_storage_show
-  - ext_keyvault-preview_az_keyvault_storage_show_deleted
-  - ext_keyvault-preview_az_keyvault_storage_update
-- uid: ext_keyvault-preview_az_keyvault_storage_add
-  name: az keyvault storage add
-  summary: Creates or updates a new storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a storage account and setup a vault to manage its keys
-    syntax:
-      content: >-
-        $id = az storage account create -g resourcegroup -n storageacct --query id
-
-
-        # assign the Azure Key Vault service the "Storage Account Key Operator Service Role" role. az role assignment create --role "Storage Account Key Operator Service Role" --scope $id \ --assignee cfa8b339-82a2-471a-a3c9-0fc0be7a4093
-
-
-        az keyvault storage add --vault-name vault -n storageacct --active-key-name key1    \ --auto-regenerate-key --regeneration-period P90D  --resource-id $id
-  parameters:
-  - isRequired: true
-    name: --active-key-name
-    summary: Current active storage account key name.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Storage account resource id.
-    description: ''
-  - name: --auto-regenerate-key
-    parameterValueGroup: false, true
-    summary: Whether keyvault should manage the storage account for the user.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --regeneration-period
-    summary: The key regeneration time duration specified in ISO-8601 format, such as "P30D" for rotation every 30 days.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_backup
-  name: az keyvault storage backup
-  summary: Backs up the specified storage account.
-  description: Requests that a backup of the specified storage account be downloaded to the client. This operation requires the storage/backup permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
-    summary: Local file path in which to store storage account backup.
-    description: ''
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_list
-  name: az keyvault storage list
-  summary: List storage accounts managed by the specified key vault.
-  description: This operation requires the storage/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-  name: az keyvault storage list-deleted
-  summary: Lists deleted storage accounts for the specified vault.
-  description: The Get Deleted Storage Accounts operation returns the storage accounts that have been deleted for a vault enabled for soft-delete. This operation requires the storage/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_purge
-  name: az keyvault storage purge
-  summary: Permanently deletes the specified storage account.
-  description: The purge deleted storage account operation removes the secret permanently, without the possibility of recovery. This operation can only be performed on a soft-delete enabled vault. This operation requires the storage/purge permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_recover
-  name: az keyvault storage recover
-  summary: Recovers the deleted storage account.
-  description: Recovers the deleted storage account in the specified vault. This operation can only be performed on a soft-delete enabled vault. This operation requires the storage/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  name: az keyvault storage regenerate-key
-  summary: Regenerates the specified key value for the given storage account.
-  description: This operation requires the storage/regeneratekey permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --key-name
-    summary: The storage account key name.
-    description: ''
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_remove
-  name: az keyvault storage remove
-  summary: Remove a Key Vault managed Azure Storage Account and all associated SAS definitions. This operation requires the storage/delete permission.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_restore
-  name: az keyvault storage restore
-  summary: Restores a backed up storage account to a vault.
-  description: Restores a backed up storage account to a vault. This operation requires the storage/restore permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file-path
-    summary: ''
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_show
-  name: az keyvault storage show
-  summary: Gets information about a specified storage account.
-  description: This operation requires the storage/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-  name: az keyvault storage show-deleted
-  summary: Gets the specified deleted storage account.
-  description: The Get Deleted Storage Account operation returns the specified deleted storage account along with its attributes. This operation requires the storage/get permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_update
-  name: az keyvault storage update
-  summary: Updates the specified attributes associated with the given storage account.
-  description: This operation requires the storage/set/update permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --active-key-name
-    summary: The current active storage account key name.
-    description: ''
-  - name: --auto-regenerate-key
-    parameterValueGroup: false, true
-    summary: Whether keyvault should manage the storage account for the user.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --regeneration-period
-    summary: The key regeneration time duration specified in ISO-8601 format, such as "P30D" for rotation every 30 days.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --id
-    summary: Id of the storage account.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_storage_add
-  name: az keyvault storage add
-  summary: Creates or updates a new storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_backup
-  name: az keyvault storage backup
-  summary: Backs up the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_list
-  name: az keyvault storage list
-  summary: List storage accounts managed by the specified key vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-  name: az keyvault storage list-deleted
-  summary: Lists deleted storage accounts for the specified vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_purge
-  name: az keyvault storage purge
-  summary: Permanently deletes the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_recover
-  name: az keyvault storage recover
-  summary: Recovers the deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-  name: az keyvault storage regenerate-key
-  summary: Regenerates the specified key value for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_remove
-  name: az keyvault storage remove
-  summary: Remove a Key Vault managed Azure Storage Account and all associated SAS definitions. This operation requires the storage/delete permission.
-- uid: ext_keyvault-preview_az_keyvault_storage_restore
-  name: az keyvault storage restore
-  summary: Restores a backed up storage account to a vault.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-  name: az keyvault storage sas-definition
-  summary: Manage storage account SAS definitions.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_show
-  name: az keyvault storage show
-  summary: Gets information about a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-  name: az keyvault storage show-deleted
-  summary: Gets the specified deleted storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_update
-  name: az keyvault storage update
-  summary: Updates the specified attributes associated with the given storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/storage/sas-definition.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/storage/sas-definition.yml
deleted file mode 100644
index 7b8a35da09..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/keyvault-preview/keyvault/storage/sas-definition.yml
+++ /dev/null
@@ -1,263 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-  name: az keyvault storage sas-definition
-  summary: Manage storage account SAS definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  - ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a sas-definition for an account sas-token
-    syntax:
-      content: >-
-        $sastoken = az storage account generate-sas --expiry 2020-01-01 --permissions rw \ --resource-types sco --services bfqt --https-only --account-name storageacct     \ --account-key 00000000
-
-
-        az keyvault storage sas-definition create --vault-name vault --account-name storageacct   \ -n rwallserviceaccess --validity-period P2D --sas-type account --template-uri $sastoken
-  - summary: Add a sas-definition for a blob sas-token
-    syntax:
-      content: >-
-        $sastoken = az storage blob generate-sas --account-name storageacct --account-key 00000000 \ -c container1 -n blob1 --https-only --permissions rw
-
-
-        $url = az storage blob url --account-name storageacct -c container1 -n blob1
-
-
-        az keyvault storage sas-definition create --vault-name vault --account-name storageacct   \ -n rwblobaccess --validity-period P2D --sas-type service --template-uri $url?$sastoken
-  parameters:
-  - isRequired: true
-    name: --sas-type
-    parameterValueGroup: account, service
-    summary: The type of SAS token the SAS definition will create.
-    description: ''
-  - isRequired: true
-    name: --template-uri
-    summary: The SAS definition token template signed with the key 00000000.  In the case of an account token this is only the sas token itself, for service tokens, the full service endpoint url along with the sas token.  Tokens created according to the SAS definition will have the same properties as the template.
-    description: ''
-  - isRequired: true
-    name: --validity-period
-    summary: The validity period of SAS tokens created according to the SAS definition in ISO-8601, such as "PT12H" for 12 hour tokens.
-    description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the SAS definition in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-  description: This operation requires the storage/deletesas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --account-name
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --id
-    summary: Id of the SAS definition.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the SAS definition in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-  description: This operation requires the storage/listsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-  description: The Get Deleted Sas Definitions operation returns the SAS definitions that have been deleted for a vault enabled for soft-delete. This operation requires the storage/listsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-  description: Recovers the deleted SAS definition for the specified storage account. This operation can only be performed on a soft-delete enabled vault. This operation requires the storage/recover permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the SAS definition in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-  description: This operation requires the storage/getsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --account-name
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --id
-    summary: Id of the SAS definition.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the SAS definition in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-  description: The Get Deleted SAS Definition operation returns the specified deleted SAS definition along with its attributes. This operation requires the storage/getsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: Name to identify the storage account in the vault.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name to identify the SAS definition in the vault.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-  description: This operation requires the storage/setsas permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Add the storage account in a disabled state.
-    description: ''
-  - name: --sas-type
-    parameterValueGroup: account, service
-    summary: The type of SAS token the SAS definition will create.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --template-uri
-    summary: The SAS definition token template signed with the key 00000000.  In the case of an account token this is only the sas token itself, for service tokens, the full service endpoint url along with the sas token.  Tokens created according to the SAS definition will have the same properties as the template.
-    description: ''
-  - name: --validity-period
-    summary: The validity period of SAS tokens created according to the SAS definition in ISO-8601, such as "PT12H" for 12 hour tokens.
-    description: ''
-  - name: --account-name
-    summary: Name to identify the storage account in the vault. Required if --id is not specified.
-    description: ''
-  - name: --id
-    summary: Id of the SAS definition.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name to identify the SAS definition in the vault. Required if --id is not specified.
-    description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
-commands:
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-  name: az keyvault storage sas-definition create
-  summary: Creates or updates a new SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-  name: az keyvault storage sas-definition delete
-  summary: Deletes a SAS definition from a specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-  name: az keyvault storage sas-definition list
-  summary: List storage SAS definitions for the given storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-  name: az keyvault storage sas-definition list-deleted
-  summary: Lists deleted SAS definitions for the specified vault and storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-  name: az keyvault storage sas-definition recover
-  summary: Recovers the deleted SAS definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-  name: az keyvault storage sas-definition show
-  summary: Gets information about a SAS definition for the specified storage account.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-  name: az keyvault storage sas-definition show-deleted
-  summary: Gets the specified deleted sas definition.
-- uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-  name: az keyvault storage sas-definition update
-  summary: Updates the specified attributes associated with the given SAS definition.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account SAS definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/index.yml
deleted file mode 100644
index 23821f9e6b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az
-  name: kusto
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_kusto_az_kusto
-  name: az kusto
-  summary: Manage Azure Kusto resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto.yml
deleted file mode 100644
index 1eec223967..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto
-  name: az kusto
-  summary: Manage Azure Kusto resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_kusto_az_kusto_attached_database_configuration
-  name: az kusto attached-database-configuration
-  summary: Kusto attached-database-configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_create
-  name: az kusto attached-database-configuration create
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_delete
-  name: az kusto attached-database-configuration delete
-  summary: Deletes the attached database configuration with the given name.
-- uid: ext_kusto_az_kusto_attached_database_configuration_list
-  name: az kusto attached-database-configuration list
-  summary: Returns the list of attached database configurations of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_attached_database_configuration_show
-  name: az kusto attached-database-configuration show
-  summary: Returns an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_update
-  name: az kusto attached-database-configuration update
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_wait
-  name: az kusto attached-database-configuration wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_cluster
-  name: az kusto cluster
-  summary: Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_add_language_extension
-  name: az kusto cluster add-language-extension
-  summary: Add a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_create
-  name: az kusto cluster create
-  summary: Create or update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_delete
-  name: az kusto cluster delete
-  summary: Deletes a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_detach_follower_database
-  name: az kusto cluster detach-follower-database
-  summary: Detaches all followers of a database owned by this cluster.
-- uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  name: az kusto cluster diagnose-virtual-network
-  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
-- uid: ext_kusto_az_kusto_cluster_list
-  name: az kusto cluster list
-  summary: Lists all Kusto clusters within a subscription.
-- uid: ext_kusto_az_kusto_cluster_list_follower_database
-  name: az kusto cluster list-follower-database
-  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
-- uid: ext_kusto_az_kusto_cluster_list_language_extension
-  name: az kusto cluster list-language-extension
-  summary: Returns a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_list_sku
-  name: az kusto cluster list-sku
-  summary: Lists eligible SKUs for Kusto resource provider.
-- uid: ext_kusto_az_kusto_cluster_remove_language_extension
-  name: az kusto cluster remove-language-extension
-  summary: Remove a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_show
-  name: az kusto cluster show
-  summary: Gets a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_start
-  name: az kusto cluster start
-  summary: Starts a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_stop
-  name: az kusto cluster stop
-  summary: Stops a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_update
-  name: az kusto cluster update
-  summary: Update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_wait
-  name: az kusto cluster wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment
-  name: az kusto cluster-principal-assignment
-  summary: Kusto cluster-principal-assignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-  name: az kusto cluster-principal-assignment create
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-  name: az kusto cluster-principal-assignment delete
-  summary: Deletes a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-  name: az kusto cluster-principal-assignment list
-  summary: Lists all Kusto cluster principalAssignments.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-  name: az kusto cluster-principal-assignment show
-  summary: Gets a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-  name: az kusto cluster-principal-assignment update
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-  name: az kusto cluster-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_data_connection
-  name: az kusto data-connection
-  summary: Kusto data-connection.
-- uid: ext_kusto_az_kusto_data_connection_delete
-  name: az kusto data-connection delete
-  summary: Deletes the data connection with the given name.
-- uid: ext_kusto_az_kusto_data_connection_event_grid
-  name: az kusto data-connection event-grid
-  summary: Kusto data-connection sub group event-grid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub
-  name: az kusto data-connection event-hub
-  summary: Kusto data-connection sub group event-hub.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub
-  name: az kusto data-connection iot-hub
-  summary: Kusto data-connection sub group iot-hub.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_list
-  name: az kusto data-connection list
-  summary: Returns the list of data connections of the given Kusto database.
-- uid: ext_kusto_az_kusto_data_connection_show
-  name: az kusto data-connection show
-  summary: Returns a data connection.
-- uid: ext_kusto_az_kusto_data_connection_wait
-  name: az kusto data-connection wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-- uid: ext_kusto_az_kusto_database
-  name: az kusto database
-  summary: Kusto database.
-- uid: ext_kusto_az_kusto_database_add_principal
-  name: az kusto database add-principal
-  summary: Add Database principals permissions.
-- uid: ext_kusto_az_kusto_database_create
-  name: az kusto database create
-  summary: Creates or updates a database.
-- uid: ext_kusto_az_kusto_database_delete
-  name: az kusto database delete
-  summary: Deletes the database with the given name.
-- uid: ext_kusto_az_kusto_database_list
-  name: az kusto database list
-  summary: Returns the list of databases of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_database_list_principal
-  name: az kusto database list-principal
-  summary: Returns a list of database principals of the given Kusto cluster and database.
-- uid: ext_kusto_az_kusto_database_remove_principal
-  name: az kusto database remove-principal
-  summary: Remove Database principals permissions.
-- uid: ext_kusto_az_kusto_database_show
-  name: az kusto database show
-  summary: Returns a database.
-- uid: ext_kusto_az_kusto_database_update
-  name: az kusto database update
-  summary: Updates a database.
-- uid: ext_kusto_az_kusto_database_wait
-  name: az kusto database wait
-  summary: Wait for a managed Kusto database to reach a desired state.
-- uid: ext_kusto_az_kusto_database_principal_assignment
-  name: az kusto database-principal-assignment
-  summary: Kusto database-principal-assignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_create
-  name: az kusto database-principal-assignment create
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_delete
-  name: az kusto database-principal-assignment delete
-  summary: Deletes a Kusto principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_list
-  name: az kusto database-principal-assignment list
-  summary: Lists all Kusto cluster database principalAssignments.
-- uid: ext_kusto_az_kusto_database_principal_assignment_show
-  name: az kusto database-principal-assignment show
-  summary: Gets a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_update
-  name: az kusto database-principal-assignment update
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_wait
-  name: az kusto database-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Kusto resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml
deleted file mode 100644
index a695702159..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/attached-database-configuration.yml
+++ /dev/null
@@ -1,238 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_attached_database_configuration
-  name: az kusto attached-database-configuration
-  summary: Kusto attached-database-configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_attached_database_configuration_create
-  - ext_kusto_az_kusto_attached_database_configuration_delete
-  - ext_kusto_az_kusto_attached_database_configuration_list
-  - ext_kusto_az_kusto_attached_database_configuration_show
-  - ext_kusto_az_kusto_attached_database_configuration_update
-  - ext_kusto_az_kusto_attached_database_configuration_wait
-- uid: ext_kusto_az_kusto_attached_database_configuration_create
-  name: az kusto attached-database-configuration create
-  summary: Creates or updates an attached database configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsCreateOrUpdate
-    syntax:
-      content: az kusto attached-database-configuration create --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --location "westus" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader" --database-name "Kustodatabase8" --default-principals-modification-kind "Union" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cluster-resource-id
-    summary: The resource id of the cluster where the databases you would like to attach reside.
-    description: ''
-  - name: --database-name
-    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
-    description: ''
-  - name: --default-principals-modification-kind
-    parameterValueGroup: None, Replace, Union
-    summary: The default principals modification kind.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_delete
-  name: az kusto attached-database-configuration delete
-  summary: Deletes the attached database configuration with the given name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsDelete
-    syntax:
-      content: az kusto attached-database-configuration delete --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_list
-  name: az kusto attached-database-configuration list
-  summary: Returns the list of attached database configurations of the given Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoAttachedDatabaseConfigurationsListByCluster
-    syntax:
-      content: az kusto attached-database-configuration list --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_show
-  name: az kusto attached-database-configuration show
-  summary: Returns an attached database configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsGet
-    syntax:
-      content: az kusto attached-database-configuration show --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_update
-  name: az kusto attached-database-configuration update
-  summary: Creates or updates an attached database configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: AttachedDatabaseConfigurationsCreateOrUpdate
-    syntax:
-      content: az kusto attached-database-configuration update --attached-database-configuration-name "attachedDatabaseConfigurations1" --cluster-name "KustoClusterRPTest4" --location "westus" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader" --database-name "Kustodatabase8" --default-principals-modification-kind "Union" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cluster-resource-id
-    summary: The resource id of the cluster where the databases you would like to attach reside.
-    description: ''
-  - name: --database-name
-    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
-    description: ''
-  - name: --default-principals-modification-kind
-    parameterValueGroup: None, Replace, Union
-    summary: The default principals modification kind.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_attached_database_configuration_wait
-  name: az kusto attached-database-configuration wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: The name of the attached database configuration.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_attached_database_configuration_create
-  name: az kusto attached-database-configuration create
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_delete
-  name: az kusto attached-database-configuration delete
-  summary: Deletes the attached database configuration with the given name.
-- uid: ext_kusto_az_kusto_attached_database_configuration_list
-  name: az kusto attached-database-configuration list
-  summary: Returns the list of attached database configurations of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_attached_database_configuration_show
-  name: az kusto attached-database-configuration show
-  summary: Returns an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_update
-  name: az kusto attached-database-configuration update
-  summary: Creates or updates an attached database configuration.
-- uid: ext_kusto_az_kusto_attached_database_configuration_wait
-  name: az kusto attached-database-configuration wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto attached-database-configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml
deleted file mode 100644
index ad68c404cf..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster-principal-assignment.yml
+++ /dev/null
@@ -1,240 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_cluster_principal_assignment
-  name: az kusto cluster-principal-assignment
-  summary: Kusto cluster-principal-assignment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_cluster_principal_assignment_create
-  - ext_kusto_az_kusto_cluster_principal_assignment_delete
-  - ext_kusto_az_kusto_cluster_principal_assignment_list
-  - ext_kusto_az_kusto_cluster_principal_assignment_show
-  - ext_kusto_az_kusto_cluster_principal_assignment_update
-  - ext_kusto_az_kusto_cluster_principal_assignment_wait
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-  name: az kusto cluster-principal-assignment create
-  summary: Create a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto cluster-principal-assignment create --cluster-name "kustoclusterrptest4" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "AllDatabasesAdmin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
-    summary: Cluster principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-  name: az kusto cluster-principal-assignment delete
-  summary: Deletes a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsDelete
-    syntax:
-      content: az kusto cluster-principal-assignment delete --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-  name: az kusto cluster-principal-assignment list
-  summary: Lists all Kusto cluster principalAssignments.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoPrincipalAssignmentsList
-    syntax:
-      content: az kusto cluster-principal-assignment list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-  name: az kusto cluster-principal-assignment show
-  summary: Gets a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsGet
-    syntax:
-      content: az kusto cluster-principal-assignment show --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-  name: az kusto cluster-principal-assignment update
-  summary: Create a Kusto cluster principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterPrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto cluster-principal-assignment update --cluster-name "kustoclusterrptest4" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "AllDatabasesAdmin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
-    summary: Cluster principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-  name: az kusto cluster-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-  name: az kusto cluster-principal-assignment create
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-  name: az kusto cluster-principal-assignment delete
-  summary: Deletes a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-  name: az kusto cluster-principal-assignment list
-  summary: Lists all Kusto cluster principalAssignments.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-  name: az kusto cluster-principal-assignment show
-  summary: Gets a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-  name: az kusto cluster-principal-assignment update
-  summary: Create a Kusto cluster principalAssignment.
-- uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-  name: az kusto cluster-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto cluster-principal-assignment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster.yml
deleted file mode 100644
index 466f1b9136..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/cluster.yml
+++ /dev/null
@@ -1,515 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_cluster
-  name: az kusto cluster
-  summary: Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_cluster_add_language_extension
-  - ext_kusto_az_kusto_cluster_create
-  - ext_kusto_az_kusto_cluster_delete
-  - ext_kusto_az_kusto_cluster_detach_follower_database
-  - ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  - ext_kusto_az_kusto_cluster_list
-  - ext_kusto_az_kusto_cluster_list_follower_database
-  - ext_kusto_az_kusto_cluster_list_language_extension
-  - ext_kusto_az_kusto_cluster_list_sku
-  - ext_kusto_az_kusto_cluster_remove_language_extension
-  - ext_kusto_az_kusto_cluster_show
-  - ext_kusto_az_kusto_cluster_start
-  - ext_kusto_az_kusto_cluster_stop
-  - ext_kusto_az_kusto_cluster_update
-  - ext_kusto_az_kusto_cluster_wait
-- uid: ext_kusto_az_kusto_cluster_add_language_extension
-  name: az kusto cluster add-language-extension
-  summary: Add a list of language extensions that can run within KQL queries.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterAddLanguageExtensions
-    syntax:
-      content: az kusto cluster add-language-extension --cluster-name "KustoClusterRPTest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_create
-  name: az kusto cluster create
-  summary: Create or update a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersCreateOrUpdate
-    syntax:
-      content: az kusto cluster create --cluster-name "KustoClusterRPTest4" --identity-type "SystemAssigned" --location "westus" --enable-purge true --enable-streaming-ingest true --key-vault-properties key-name="" key-vault-uri="" key-version="" --sku name="Standard_L8s" capacity=2 tier="Standard" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    summary: 'The SKU of the cluster. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: name, capacity, tier.'
-    description: ''
-  - name: --enable-disk-encryption
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the cluster's disks are encrypted.
-    description: ''
-  - name: --enable-purge
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the purge operations are enabled.
-    description: ''
-  - name: --enable-streaming-ingest
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the streaming ingest is enabled.
-    description: ''
-  - name: --identity-type
-    parameterValueGroup: None, SystemAssigned
-    summary: The identity type.
-    description: ''
-  - name: --identity-user-assigned-identities
-    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
-    description: ''
-  - name: --key-vault-properties
-    summary: 'KeyVault properties for the cluster encryption. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: key-name, key-version, key-vault-uri.'
-    description: ''
-  - name: --language-extensions-value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --optimized-autoscale
-    summary: 'Optimized auto scale definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: version, is-enabled, minimum, maximum.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --trusted-external-tenants
-    summary: "The cluster's external tenants. Expect value: value=xx."
-    description: ''
-  - name: --virtual-network-configuration
-    summary: 'Virtual network definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: subnet-id, engine-public-ip-id, data-management-public-ip-id.'
-    description: ''
-  - name: --zones
-    summary: 'The availability zones of the cluster. Expected value: json-string/@json-file.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_delete
-  name: az kusto cluster delete
-  summary: Deletes a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersDelete
-    syntax:
-      content: az kusto cluster delete --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_detach_follower_database
-  name: az kusto cluster detach-follower-database
-  summary: Detaches all followers of a database owned by this cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterDetachFollowerDatabases
-    syntax:
-      content: az kusto cluster detach-follower-database --cluster-name "KustoClusterRPTest4" --attached-database-configuration-name "myAttachedDatabaseConfiguration" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/clusters/leader4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --attached-database-configuration-name
-    summary: Resource name of the attached database configuration in the follower cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --cluster-resource-id
-    summary: Resource id of the cluster that follows a database owned by this cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  name: az kusto cluster diagnose-virtual-network
-  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterDiagnoseVirtualNetwork
-    syntax:
-      content: az kusto cluster diagnose-virtual-network --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list
-  name: az kusto cluster list
-  summary: Lists all Kusto clusters within a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersListByResourceGroup
-    syntax:
-      content: az kusto cluster list --resource-group "kustorptest"
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list_follower_database
-  name: az kusto cluster list-follower-database
-  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterListFollowerDatabases
-    syntax:
-      content: az kusto cluster list-follower-database --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list_language_extension
-  name: az kusto cluster list-language-extension
-  summary: Returns a list of language extensions that can run within KQL queries.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterListLanguageExtensions
-    syntax:
-      content: az kusto cluster list-language-extension --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_list_sku
-  name: az kusto cluster list-sku
-  summary: Lists eligible SKUs for Kusto resource provider.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersListResourceSkus
-    syntax:
-      content: az kusto cluster list-sku --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_remove_language_extension
-  name: az kusto cluster remove-language-extension
-  summary: Remove a list of language extensions that can run within KQL queries.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClusterRemoveLanguageExtensions
-    syntax:
-      content: az kusto cluster remove-language-extension --cluster-name "KustoClusterRPTest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_show
-  name: az kusto cluster show
-  summary: Gets a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersGet
-    syntax:
-      content: az kusto cluster show --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_start
-  name: az kusto cluster start
-  summary: Starts a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersStart
-    syntax:
-      content: az kusto cluster start --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_stop
-  name: az kusto cluster stop
-  summary: Stops a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersStop
-    syntax:
-      content: az kusto cluster stop --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_update
-  name: az kusto cluster update
-  summary: Update a Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoClustersUpdate
-    syntax:
-      content: az kusto cluster update --cluster-name "KustoClusterRPTest4" --identity-type "SystemAssigned" --location "westus" --enable-purge true --enable-streaming-ingest true --key-vault-properties key-name="keyName" key-vault-uri="https://dummy.keyvault.com" key-version="keyVersion" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --enable-disk-encryption
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the cluster's disks are encrypted.
-    description: ''
-  - name: --enable-purge
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the purge operations are enabled.
-    description: ''
-  - name: --enable-streaming-ingest
-    parameterValueGroup: false, true
-    summary: A boolean value that indicates if the streaming ingest is enabled.
-    description: ''
-  - name: --identity-type
-    parameterValueGroup: None, SystemAssigned
-    summary: The identity type.
-    description: ''
-  - name: --identity-user-assigned-identities
-    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
-    description: ''
-  - name: --key-vault-properties
-    summary: 'KeyVault properties for the cluster encryption. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: key-name, key-version, key-vault-uri.'
-    description: ''
-  - name: --language-extensions-value
-    summary: 'The list of language extensions. Expect value: language-extension-name=xx.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --optimized-autoscale
-    summary: 'Optimized auto scale definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: version, is-enabled, minimum, maximum.'
-    description: ''
-  - name: --sku
-    summary: 'The SKU of the cluster. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: name, capacity, tier.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --trusted-external-tenants
-    summary: "The cluster's external tenants. Expect value: value=xx."
-    description: ''
-  - name: --virtual-network-configuration
-    summary: 'Virtual network definition. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: subnet-id, engine-public-ip-id, data-management-public-ip-id.'
-    description: ''
-- uid: ext_kusto_az_kusto_cluster_wait
-  name: az kusto cluster wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_cluster_add_language_extension
-  name: az kusto cluster add-language-extension
-  summary: Add a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_create
-  name: az kusto cluster create
-  summary: Create or update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_delete
-  name: az kusto cluster delete
-  summary: Deletes a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_detach_follower_database
-  name: az kusto cluster detach-follower-database
-  summary: Detaches all followers of a database owned by this cluster.
-- uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-  name: az kusto cluster diagnose-virtual-network
-  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
-- uid: ext_kusto_az_kusto_cluster_list
-  name: az kusto cluster list
-  summary: Lists all Kusto clusters within a subscription.
-- uid: ext_kusto_az_kusto_cluster_list_follower_database
-  name: az kusto cluster list-follower-database
-  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
-- uid: ext_kusto_az_kusto_cluster_list_language_extension
-  name: az kusto cluster list-language-extension
-  summary: Returns a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_list_sku
-  name: az kusto cluster list-sku
-  summary: Lists eligible SKUs for Kusto resource provider.
-- uid: ext_kusto_az_kusto_cluster_remove_language_extension
-  name: az kusto cluster remove-language-extension
-  summary: Remove a list of language extensions that can run within KQL queries.
-- uid: ext_kusto_az_kusto_cluster_show
-  name: az kusto cluster show
-  summary: Gets a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_start
-  name: az kusto cluster start
-  summary: Starts a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_stop
-  name: az kusto cluster stop
-  summary: Stops a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_update
-  name: az kusto cluster update
-  summary: Update a Kusto cluster.
-- uid: ext_kusto_az_kusto_cluster_wait
-  name: az kusto cluster wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection.yml
deleted file mode 100644
index 6eac67a309..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection
-  name: az kusto data-connection
-  summary: Kusto data-connection.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_delete
-  - ext_kusto_az_kusto_data_connection_list
-  - ext_kusto_az_kusto_data_connection_show
-  - ext_kusto_az_kusto_data_connection_wait
-- uid: ext_kusto_az_kusto_data_connection_delete
-  name: az kusto data-connection delete
-  summary: Deletes the data connection with the given name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsDelete
-    syntax:
-      content: az kusto data-connection delete --cluster-name "KustoClusterRPTest4" --data-connection-name "kustoeventhubconnection1" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_list
-  name: az kusto data-connection list
-  summary: Returns the list of data connections of the given Kusto database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesListByCluster
-    syntax:
-      content: az kusto data-connection list --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_show
-  name: az kusto data-connection show
-  summary: Returns a data connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsGet
-    syntax:
-      content: az kusto data-connection show --cluster-name "KustoClusterRPTest4" --data-connection-name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_wait
-  name: az kusto data-connection wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_delete
-  name: az kusto data-connection delete
-  summary: Deletes the data connection with the given name.
-- uid: ext_kusto_az_kusto_data_connection_event_grid
-  name: az kusto data-connection event-grid
-  summary: Kusto data-connection sub group event-grid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub
-  name: az kusto data-connection event-hub
-  summary: Kusto data-connection sub group event-hub.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub
-  name: az kusto data-connection iot-hub
-  summary: Kusto data-connection sub group iot-hub.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_list
-  name: az kusto data-connection list
-  summary: Returns the list of data connections of the given Kusto database.
-- uid: ext_kusto_az_kusto_data_connection_show
-  name: az kusto data-connection show
-  summary: Returns a data connection.
-- uid: ext_kusto_az_kusto_data_connection_wait
-  name: az kusto data-connection wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml
deleted file mode 100644
index f6ecf0cc67..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-grid.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection_event_grid
-  name: az kusto data-connection event-grid
-  summary: Kusto data-connection sub group event-grid.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_event_grid_create
-  - ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  - ext_kusto_az_kusto_data_connection_event_grid_update
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID where the event grid is configured to send events.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --storage-account-resource-id
-    summary: The resource ID of the storage account where the data resides.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID where the event grid is configured to send events.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --storage-account-resource-id
-    summary: The resource ID of the storage account where the data resides.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID where the event grid is configured to send events.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --storage-account-resource-id
-    summary: The resource ID of the storage account where the data resides.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_event_grid_create
-  name: az kusto data-connection event-grid create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-  name: az kusto data-connection event-grid data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_grid_update
-  name: az kusto data-connection event-grid update
-  summary: Updates a data connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection sub group event-grid.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml
deleted file mode 100644
index ec1cc8dc9d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/event-hub.yml
+++ /dev/null
@@ -1,202 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection_event_hub
-  name: az kusto data-connection event-hub
-  summary: Kusto data-connection sub group event-hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_event_hub_create
-  - ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  - ext_kusto_az_kusto_data_connection_event_hub_update
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsCreateOrUpdate
-    syntax:
-      content: az kusto data-connection event-hub create --cluster-name "KustoClusterRPTest4" --data-connection-name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compression
-    parameterValueGroup: GZip, None
-    summary: The event hub messages compression type.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID of the event hub to be used to create a data connection.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the event hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionValidation
-    syntax:
-      content: az kusto data-connection event-hub data-connection-validation --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --data-connection-name "DataConnections8" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compression
-    parameterValueGroup: GZip, None
-    summary: The event hub messages compression type.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID of the event hub to be used to create a data connection.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the event hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDataConnectionsUpdate
-    syntax:
-      content: az kusto data-connection event-hub update --cluster-name "KustoClusterRPTest4" --data-connection-name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compression
-    parameterValueGroup: GZip, None
-    summary: The event hub messages compression type.
-    description: ''
-  - name: --consumer-group
-    summary: The event hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-hub-resource-id
-    summary: The resource ID of the event hub to be used to create a data connection.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the event hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_event_hub_create
-  name: az kusto data-connection event-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-  name: az kusto data-connection event-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_event_hub_update
-  name: az kusto data-connection event-hub update
-  summary: Updates a data connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection sub group event-hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml
deleted file mode 100644
index 9e1fa23ae6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/data-connection/iot-hub.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_data_connection_iot_hub
-  name: az kusto data-connection iot-hub
-  summary: Kusto data-connection sub group iot-hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_data_connection_iot_hub_create
-  - ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  - ext_kusto_az_kusto_data_connection_iot_hub_update
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The iot hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the iot hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --iot-hub-resource-id
-    summary: The resource ID of the Iot hub to be used to create a data connection.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --shared-access-policy-name
-    summary: The name of the share access policy.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The iot hub consumer group.
-    description: ''
-  - name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the iot hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --iot-hub-resource-id
-    summary: The resource ID of the Iot hub to be used to create a data connection.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --shared-access-policy-name
-    summary: The name of the share access policy.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --data-connection-name
-    summary: The name of the data connection.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --consumer-group
-    summary: The iot hub consumer group.
-    description: ''
-  - name: --data-format
-    parameterValueGroup: AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT
-    summary: The data format of the message. Optionally the data format can be added to each message.
-    description: ''
-  - name: --event-system-properties
-    summary: 'System properties of the iot hub Expected value: json-string/@json-file.'
-    description: ''
-  - name: --iot-hub-resource-id
-    summary: The resource ID of the Iot hub to be used to create a data connection.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --mapping-rule-name
-    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --shared-access-policy-name
-    summary: The name of the share access policy.
-    description: ''
-  - name: --table-name
-    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-  name: az kusto data-connection iot-hub create
-  summary: Creates or updates a data connection.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-  name: az kusto data-connection iot-hub data-connection-validation
-  summary: Checks that the data connection parameters are valid.
-- uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-  name: az kusto data-connection iot-hub update
-  summary: Updates a data connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto data-connection sub group iot-hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml
deleted file mode 100644
index d4f58779cd..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database-principal-assignment.yml
+++ /dev/null
@@ -1,264 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_database_principal_assignment
-  name: az kusto database-principal-assignment
-  summary: Kusto database-principal-assignment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_database_principal_assignment_create
-  - ext_kusto_az_kusto_database_principal_assignment_delete
-  - ext_kusto_az_kusto_database_principal_assignment_list
-  - ext_kusto_az_kusto_database_principal_assignment_show
-  - ext_kusto_az_kusto_database_principal_assignment_update
-  - ext_kusto_az_kusto_database_principal_assignment_wait
-- uid: ext_kusto_az_kusto_database_principal_assignment_create
-  name: az kusto database-principal-assignment create
-  summary: Creates a Kusto cluster database principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto database-principal-assignment create --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "Admin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewers, User, Viewer
-    summary: Database principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_delete
-  name: az kusto database-principal-assignment delete
-  summary: Deletes a Kusto principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsDelete
-    syntax:
-      content: az kusto database-principal-assignment delete --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_list
-  name: az kusto database-principal-assignment list
-  summary: Lists all Kusto cluster database principalAssignments.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoPrincipalAssignmentsList
-    syntax:
-      content: az kusto database-principal-assignment list --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_show
-  name: az kusto database-principal-assignment show
-  summary: Gets a Kusto cluster database principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsGet
-    syntax:
-      content: az kusto database-principal-assignment show --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_update
-  name: az kusto database-principal-assignment update
-  summary: Creates a Kusto cluster database principalAssignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasePrincipalAssignmentsCreateOrUpdate
-    syntax:
-      content: az kusto database-principal-assignment update --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "Admin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --principal-id
-    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
-    description: ''
-  - name: --principal-type
-    parameterValueGroup: App, Group, User
-    summary: Principal type.
-    description: ''
-  - name: --role
-    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewers, User, Viewer
-    summary: Database principal role.
-    description: ''
-  - name: --tenant-id
-    summary: The tenant id of the principal.
-    description: ''
-- uid: ext_kusto_az_kusto_database_principal_assignment_wait
-  name: az kusto database-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --principal-assignment-name
-    summary: The name of the Kusto principalAssignment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_database_principal_assignment_create
-  name: az kusto database-principal-assignment create
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_delete
-  name: az kusto database-principal-assignment delete
-  summary: Deletes a Kusto principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_list
-  name: az kusto database-principal-assignment list
-  summary: Lists all Kusto cluster database principalAssignments.
-- uid: ext_kusto_az_kusto_database_principal_assignment_show
-  name: az kusto database-principal-assignment show
-  summary: Gets a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_update
-  name: az kusto database-principal-assignment update
-  summary: Creates a Kusto cluster database principalAssignment.
-- uid: ext_kusto_az_kusto_database_principal_assignment_wait
-  name: az kusto database-principal-assignment wait
-  summary: Wait for a managed Kusto cluster to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto database-principal-assignment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database.yml
deleted file mode 100644
index 5b06a73295..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/kusto/kusto/database.yml
+++ /dev/null
@@ -1,311 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_kusto_az_kusto_database
-  name: az kusto database
-  summary: Kusto database.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_kusto_az_kusto_database_add_principal
-  - ext_kusto_az_kusto_database_create
-  - ext_kusto_az_kusto_database_delete
-  - ext_kusto_az_kusto_database_list
-  - ext_kusto_az_kusto_database_list_principal
-  - ext_kusto_az_kusto_database_remove_principal
-  - ext_kusto_az_kusto_database_show
-  - ext_kusto_az_kusto_database_update
-  - ext_kusto_az_kusto_database_wait
-- uid: ext_kusto_az_kusto_database_add_principal
-  name: az kusto database add-principal
-  summary: Add Database principals permissions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabaseAddPrincipals
-    syntax:
-      content: az kusto database add-principal --cluster-name "KustoClusterRPTest4" --database-name "databaseName1" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --value
-    summary: 'The list of Kusto database principals. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: role, name, type, fqn, email, app-id.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_create
-  name: az kusto database create
-  summary: Creates or updates a database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesCreateOrUpdate
-    syntax:
-      content: az kusto database create --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --read-write-database location="westus" soft-delete-period="P1D" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --read-only-following-database
-    summary: 'Class representing a read only following database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: hot-cache-period, location.'
-    description: ''
-  - name: --read-write-database
-    summary: 'Class representing a read write database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: soft-delete-period, hot-cache-period, location.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_delete
-  name: az kusto database delete
-  summary: Deletes the database with the given name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesDelete
-    syntax:
-      content: az kusto database delete --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_kusto_az_kusto_database_list
-  name: az kusto database list
-  summary: Returns the list of databases of the given Kusto cluster.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesListByCluster
-    syntax:
-      content: az kusto database list --cluster-name "KustoClusterRPTest4" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_list_principal
-  name: az kusto database list-principal
-  summary: Returns a list of database principals of the given Kusto cluster and database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabaseListPrincipals
-    syntax:
-      content: az kusto database list-principal --cluster-name "KustoClusterRPTest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_remove_principal
-  name: az kusto database remove-principal
-  summary: Remove Database principals permissions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabaseRemovePrincipals
-    syntax:
-      content: az kusto database remove-principal --cluster-name "KustoClusterRPTest4" --database-name "databaseName1" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --value
-    summary: 'The list of Kusto database principals. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: role, name, type, fqn, email, app-id.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_show
-  name: az kusto database show
-  summary: Returns a database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesGet
-    syntax:
-      content: az kusto database show --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_kusto_az_kusto_database_update
-  name: az kusto database update
-  summary: Updates a database.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: KustoDatabasesUpdate
-    syntax:
-      content: az kusto database update --cluster-name "KustoClusterRPTest4" --database-name "KustoDatabase8" --read-write-database soft-delete-period="P1D" --resource-group "kustorptest"
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --read-only-following-database
-    summary: 'Class representing a read only following database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: hot-cache-period, location.'
-    description: ''
-  - name: --read-write-database
-    summary: 'Class representing a read write database. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: soft-delete-period, hot-cache-period, location.'
-    description: ''
-- uid: ext_kusto_az_kusto_database_wait
-  name: az kusto database wait
-  summary: Wait for a managed Kusto database to reach a desired state.
-  description: If an operation on a database was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-name
-    summary: The name of the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: The name of the database in the Kusto cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_kusto_az_kusto_database_add_principal
-  name: az kusto database add-principal
-  summary: Add Database principals permissions.
-- uid: ext_kusto_az_kusto_database_create
-  name: az kusto database create
-  summary: Creates or updates a database.
-- uid: ext_kusto_az_kusto_database_delete
-  name: az kusto database delete
-  summary: Deletes the database with the given name.
-- uid: ext_kusto_az_kusto_database_list
-  name: az kusto database list
-  summary: Returns the list of databases of the given Kusto cluster.
-- uid: ext_kusto_az_kusto_database_list_principal
-  name: az kusto database list-principal
-  summary: Returns a list of database principals of the given Kusto cluster and database.
-- uid: ext_kusto_az_kusto_database_remove_principal
-  name: az kusto database remove-principal
-  summary: Remove Database principals permissions.
-- uid: ext_kusto_az_kusto_database_show
-  name: az kusto database show
-  summary: Returns a database.
-- uid: ext_kusto_az_kusto_database_update
-  name: az kusto database update
-  summary: Updates a database.
-- uid: ext_kusto_az_kusto_database_wait
-  name: az kusto database wait
-  summary: Wait for a managed Kusto database to reach a desired state.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Kusto database.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/index.yml
deleted file mode 100644
index f427a7860e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az
-  name: log-analytics-solution
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics-solution_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor.yml
deleted file mode 100644
index 93bcdbbec2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Manage Azure log analytics.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-  name: az monitor log-analytics solution
-  summary: Commands to manage monitor log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml
deleted file mode 100644
index 525211f569..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Manage Azure log analytics.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-  name: az monitor log-analytics solution
-  summary: Commands to manage monitor log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure log analytics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml
deleted file mode 100644
index d4f1862a24..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics-solution/monitor/log-analytics/solution.yml
+++ /dev/null
@@ -1,184 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-  name: az monitor log-analytics solution
-  summary: Commands to manage monitor log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  - ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a log-analytics solution for the plan product of OMSGallery/Containers
-    syntax:
-      content: >-
-        az monitor log-analytics solution create --resource-group MyResourceGroup \
-
-        --name Containers({SolutionName}) --tags key=value \
-
-        --plan-publisher Microsoft --plan-product "OMSGallery/Containers" \
-
-        --workspace "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
-
-        Microsoft.OperationalInsights/workspaces/{WorkspaceName}"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --plan-product
-    summary: Product name of the plan for solution. For Microsoft published gallery solution it should be in the format of OMSGallery/<solutionType>. This is case sensitive.
-    description: ''
-  - isRequired: true
-    name: --plan-publisher
-    summary: Publisher name of the plan for solution. For gallery solution, it is Microsoft.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace -w
-    summary: The name or resource ID of the log analytics workspace with which the solution will be linked.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a log-analytics solution
-    syntax:
-      content: az monitor log-analytics solution delete --resource-group MyResourceGroup --name SolutionName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all log-analytics solutions in the current subscription
-    syntax:
-      content: az monitor log-analytics solution list
-  - summary: List all log-analytics solutions in a subscription
-    syntax:
-      content: az monitor log-analytics solution list --subscription MySubscription
-  - summary: List all log-analytics solutions in a resource group
-    syntax:
-      content: az monitor log-analytics solution list --resource-group MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a log-analytics solution
-    syntax:
-      content: az monitor log-analytics solution show --resource-group MyResourceGroup --name SolutionName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a log-analytics solution
-    syntax:
-      content: >-
-        az monitor log-analytics solution update --resource-group MyResourceGroup \
-
-        --name SolutionName --tags key=value
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the log-analytics solution. For Microsoft published solution it should be in the format of solutionType(workspaceName). SolutionType part is case sensitive. For third party solution, it can be anything.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-  name: az monitor log-analytics solution create
-  summary: Create a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-  name: az monitor log-analytics solution delete
-  summary: Delete a log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-  name: az monitor log-analytics solution list
-  summary: List all of the log-analytics solutions in the specified subscription or resource group.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-  name: az monitor log-analytics solution show
-  summary: Get details about the specified log-analytics solution.
-- uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-  name: az monitor log-analytics solution update
-  summary: Update an existing log-analytics solution.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage monitor log-analytics solution.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/index.yml
deleted file mode 100644
index 360022778e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics_az
-  name: log-analytics
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor.yml
deleted file mode 100644
index 6a9c278e09..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics_az_monitor
-  name: az monitor
-  summary: Manage the Azure Monitor Service.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_log-analytics_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Commands for querying data in Log Analytics workspaces.
-- uid: ext_log-analytics_az_monitor_log_analytics_query
-  name: az monitor log-analytics query
-  summary: Query a Log Analytics workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the Azure Monitor Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml
deleted file mode 100644
index 37b5a2e5fe..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/log-analytics/monitor/log-analytics.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_log-analytics_az_monitor_log_analytics
-  name: az monitor log-analytics
-  summary: Commands for querying data in Log Analytics workspaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_log-analytics_az_monitor_log_analytics_query
-- uid: ext_log-analytics_az_monitor_log_analytics_query
-  name: az monitor log-analytics query
-  summary: Query a Log Analytics workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Execute a simple query over past 3.5 days.
-    syntax:
-      content: az monitor log-analytics query -w b8317023-66e4-4edc-8a5b-7c002b22f92f --analytics-query "AzureActivity | summarize count() by bin(timestamp, 1h)" -t P3DT12H
-  parameters:
-  - isRequired: true
-    name: --analytics-query
-    summary: Query to execute over Log Analytics data.
-    description: ''
-  - isRequired: true
-    name: --workspace -w
-    summary: GUID of the Log Analytics Workspace.
-    description: ''
-  - name: --timespan -t
-    summary: Timespan over which to query. Defaults to querying all available data.
-    description: ''
-  - name: --workspaces
-    summary: Additional workspaces to union data for querying. Specify additional workspace IDs separated by space.
-    description: ''
-commands:
-- uid: ext_log-analytics_az_monitor_log_analytics_query
-  name: az monitor log-analytics query
-  summary: Query a Log Analytics workspace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands for querying data in Log Analytics workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/logic/index.yml
deleted file mode 100644
index bf9370d00c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az
-  name: logic
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_logic_az_logic
-  name: az logic
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic.yml
deleted file mode 100644
index d34521e756..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az_logic
-  name: az logic
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_logic_az_logic_integration_account
-  name: az logic integration-account
-  summary: Logic integration-account.
-- uid: ext_logic_az_logic_integration_account_create
-  name: az logic integration-account create
-  summary: Creates or updates an integration account.
-- uid: ext_logic_az_logic_integration_account_delete
-  name: az logic integration-account delete
-  summary: Deletes an integration account.
-- uid: ext_logic_az_logic_integration_account_import
-  name: az logic integration-account import
-  summary: Import an integration account from a JSON file.
-- uid: ext_logic_az_logic_integration_account_list
-  name: az logic integration-account list
-  summary: Gets a list of integration accounts by subscription.
-- uid: ext_logic_az_logic_integration_account_show
-  name: az logic integration-account show
-  summary: Gets an integration account.
-- uid: ext_logic_az_logic_integration_account_update
-  name: az logic integration-account update
-  summary: Updates an integration account.
-- uid: ext_logic_az_logic_workflow
-  name: az logic workflow
-  summary: Logic workflow.
-- uid: ext_logic_az_logic_workflow_create
-  name: az logic workflow create
-  summary: Creates or updates a workflow using a JSON file for the defintion.
-- uid: ext_logic_az_logic_workflow_delete
-  name: az logic workflow delete
-  summary: Deletes a workflow.
-- uid: ext_logic_az_logic_workflow_list
-  name: az logic workflow list
-  summary: Gets a list of workflows by subscription.
-- uid: ext_logic_az_logic_workflow_show
-  name: az logic workflow show
-  summary: Gets a workflow.
-- uid: ext_logic_az_logic_workflow_update
-  name: az logic workflow update
-  summary: Updates a workflow.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/integration-account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/integration-account.yml
deleted file mode 100644
index f03998cb74..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/integration-account.yml
+++ /dev/null
@@ -1,207 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az_logic_integration_account
-  name: az logic integration-account
-  summary: Logic integration-account.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_logic_az_logic_integration_account_create
-  - ext_logic_az_logic_integration_account_delete
-  - ext_logic_az_logic_integration_account_import
-  - ext_logic_az_logic_integration_account_list
-  - ext_logic_az_logic_integration_account_show
-  - ext_logic_az_logic_integration_account_update
-- uid: ext_logic_az_logic_integration_account_create
-  name: az logic integration-account create
-  summary: Creates or updates an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update an integration account
-    syntax:
-      content: az logic integration-account create --location "centralus" --sku name=Standard --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --integration-service-environment
-    summary: The integration service environment. See README.md For more information.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku
-    summary: The integration account sku.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The workflow state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_delete
-  name: az logic integration-account delete
-  summary: Deletes an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an integration account
-    syntax:
-      content: az logic integration-account delete --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_import
-  name: az logic integration-account import
-  summary: Import an integration account from a JSON file.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import an integration account.
-    syntax:
-      content: az logic integration-account import --name "test_integration_account" --resource-group "test_resource_group" --input-path "integration.json"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: Path to a intergration-account JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku
-    summary: The integration account sku.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_list
-  name: az logic integration-account list
-  summary: Gets a list of integration accounts by subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List integration accounts by resource group name
-    syntax:
-      content: az logic integration-account list --resource-group "test_resource_group"
-  parameters:
-  - name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --top
-    summary: The number of items to be included in the result.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_show
-  name: az logic integration-account show
-  summary: Gets an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get integration account by name
-    syntax:
-      content: az logic integration-account show --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-- uid: ext_logic_az_logic_integration_account_update
-  name: az logic integration-account update
-  summary: Updates an integration account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch an integration account
-    syntax:
-      content: az logic integration-account update --sku name=Basic --tag atag=123 --name "test_integration_account" --resource-group "test_resource_group"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The integration account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --integration-service-environment
-    summary: The integration service environment. See README.md For more information.
-    description: ''
-  - name: --sku
-    summary: The integration account sku.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The workflow state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-commands:
-- uid: ext_logic_az_logic_integration_account_create
-  name: az logic integration-account create
-  summary: Creates or updates an integration account.
-- uid: ext_logic_az_logic_integration_account_delete
-  name: az logic integration-account delete
-  summary: Deletes an integration account.
-- uid: ext_logic_az_logic_integration_account_import
-  name: az logic integration-account import
-  summary: Import an integration account from a JSON file.
-- uid: ext_logic_az_logic_integration_account_list
-  name: az logic integration-account list
-  summary: Gets a list of integration accounts by subscription.
-- uid: ext_logic_az_logic_integration_account_show
-  name: az logic integration-account show
-  summary: Gets an integration account.
-- uid: ext_logic_az_logic_integration_account_update
-  name: az logic integration-account update
-  summary: Updates an integration account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Logic integration-account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/workflow.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/workflow.yml
deleted file mode 100644
index 90020ddbd6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/logic/logic/workflow.yml
+++ /dev/null
@@ -1,186 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_logic_az_logic_workflow
-  name: az logic workflow
-  summary: Logic workflow.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_logic_az_logic_workflow_create
-  - ext_logic_az_logic_workflow_delete
-  - ext_logic_az_logic_workflow_list
-  - ext_logic_az_logic_workflow_show
-  - ext_logic_az_logic_workflow_update
-- uid: ext_logic_az_logic_workflow_create
-  name: az logic workflow create
-  summary: Creates or updates a workflow using a JSON file for the defintion.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a workflow
-    syntax:
-      content: az logic workflow create --resource-group "test_resource_group" --location "centralus" --name "test_workflow" --definition "workflow.json"
-  parameters:
-  - isRequired: true
-    name: --definition
-    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --access-control
-    summary: The access control configuration controls access to this workflow. See README.md for more information.
-    description: ''
-  - name: --endpoints-configuration
-    summary: The endpoints configuration.
-    description: ''
-  - name: --integration-account
-    summary: The integration account.
-    description: ''
-  - name: --integration-service-environment
-    summary: The integration service environment. See README.md For more information.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-- uid: ext_logic_az_logic_workflow_delete
-  name: az logic workflow delete
-  summary: Deletes a workflow.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a workflow
-    syntax:
-      content: az logic workflow delete --resource-group "test_resource_group" --name "test_workflow"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_logic_az_logic_workflow_list
-  name: az logic workflow list
-  summary: Gets a list of workflows by subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all workflows in a resource group
-    syntax:
-      content: az logic workflow list --resource-group "test_resource_group"
-  - summary: List all workflows in a subscription
-    syntax:
-      content: az logic workflow list
-  parameters:
-  - name: --filter
-    summary: 'The filter to apply on the operation. Options for filters include: State, Trigger, and ReferencedResourceId.'
-    description: ''
-  - name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --top
-    summary: The number of items to be included in the result.
-    description: ''
-- uid: ext_logic_az_logic_workflow_show
-  name: az logic workflow show
-  summary: Gets a workflow.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a workflow
-    syntax:
-      content: az logic workflow show --resource-group "test_resource_group" --name "test_workflow"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-- uid: ext_logic_az_logic_workflow_update
-  name: az logic workflow update
-  summary: Updates a workflow.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Patch a workflow
-    syntax:
-      content: az logic workflow update --resource-group "test_resource_group" --definition workflow.json --name "test_workflow"
-  parameters:
-  - isRequired: true
-    name: --definition
-    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The workflow name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The resource group name.
-    description: ''
-  - name: --state
-    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
-    summary: The state.
-    description: ''
-  - name: --tags
-    summary: The resource tags.
-    description: ''
-commands:
-- uid: ext_logic_az_logic_workflow_create
-  name: az logic workflow create
-  summary: Creates or updates a workflow using a JSON file for the defintion.
-- uid: ext_logic_az_logic_workflow_delete
-  name: az logic workflow delete
-  summary: Deletes a workflow.
-- uid: ext_logic_az_logic_workflow_list
-  name: az logic workflow list
-  summary: Gets a list of workflows by subscription.
-- uid: ext_logic_az_logic_workflow_show
-  name: az logic workflow show
-  summary: Gets a workflow.
-- uid: ext_logic_az_logic_workflow_update
-  name: az logic workflow update
-  summary: Updates a workflow.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Logic workflow.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/index.yml
deleted file mode 100644
index 155d554d76..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az
-  name: maintenance
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_maintenance_az_maintenance
-  name: az maintenance
-  summary: Manage Azure Maintenance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance.yml
deleted file mode 100644
index 68c3bbe7b0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance
-  name: az maintenance
-  summary: Manage Azure Maintenance.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_maintenance_az_maintenance_applyupdate
-  name: az maintenance applyupdate
-  summary: Manage Azure Maintenance update applications.
-- uid: ext_maintenance_az_maintenance_applyupdate_create
-  name: az maintenance applyupdate create
-  summary: Creates a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_get
-  name: az maintenance applyupdate get
-  summary: Gets the state of a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_show
-  name: az maintenance applyupdate show
-  summary: Shows the state of a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_assignment
-  name: az maintenance assignment
-  summary: Manage Azure Maintenance configuration assignment to resource.
-- uid: ext_maintenance_az_maintenance_assignment_create
-  name: az maintenance assignment create
-  summary: Creates a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_delete
-  name: az maintenance assignment delete
-  summary: Delete a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_list
-  name: az maintenance assignment list
-  summary: Lists Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_configuration
-  name: az maintenance configuration
-  summary: Manage Azure Maintenance configurations.
-- uid: ext_maintenance_az_maintenance_configuration_create
-  name: az maintenance configuration create
-  summary: Creates a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_delete
-  name: az maintenance configuration delete
-  summary: Deletes a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_list
-  name: az maintenance configuration list
-  summary: Get Configuration records within a subscription.
-- uid: ext_maintenance_az_maintenance_configuration_show
-  name: az maintenance configuration show
-  summary: Get the details of a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_update
-  name: az maintenance configuration update
-  summary: Creates a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_update
-  name: az maintenance update
-  summary: Azure Maintenance updates.
-- uid: ext_maintenance_az_maintenance_update_list
-  name: az maintenance update list
-  summary: List pending a Maintenance Updates.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml
deleted file mode 100644
index abb0e4df6f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/applyupdate.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_applyupdate
-  name: az maintenance applyupdate
-  summary: Manage Azure Maintenance update applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_applyupdate_create
-  - ext_maintenance_az_maintenance_applyupdate_get
-  - ext_maintenance_az_maintenance_applyupdate_show
-- uid: ext_maintenance_az_maintenance_applyupdate_create
-  name: az maintenance applyupdate create
-  summary: Creates a ApplyUpdate request.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Creates a ApplyUpdate request.
-    syntax:
-      content: az maintenance applyupdate create -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute
-  parameters:
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_applyupdate_get
-  name: az maintenance applyupdate get
-  summary: Gets the state of a ApplyUpdate request.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets the state of a ApplyUpdate request.
-    syntax:
-      content: az maintenance applyupdate get -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --apply-update-name 7b1b66dc-e93a-4183-81ff-591f1b2d4f07
-  parameters:
-  - isRequired: true
-    name: --apply-update-name
-    summary: Name of apply update resource e.g. default.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_applyupdate_show
-  name: az maintenance applyupdate show
-  summary: Shows the state of a ApplyUpdate request.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Shows the state of a ApplyUpdate request.
-    syntax:
-      content: az maintenance applyupdate show -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --apply-update-name 7b1b66dc-e93a-4183-81ff-591f1b2d4f07
-  parameters:
-  - isRequired: true
-    name: --apply-update-name
-    summary: Name of apply update resource e.g. default.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_applyupdate_create
-  name: az maintenance applyupdate create
-  summary: Creates a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_get
-  name: az maintenance applyupdate get
-  summary: Gets the state of a ApplyUpdate request.
-- uid: ext_maintenance_az_maintenance_applyupdate_show
-  name: az maintenance applyupdate show
-  summary: Shows the state of a ApplyUpdate request.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance update applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml
deleted file mode 100644
index e16112e4e0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/assignment.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_assignment
-  name: az maintenance assignment
-  summary: Manage Azure Maintenance configuration assignment to resource.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_assignment_create
-  - ext_maintenance_az_maintenance_assignment_delete
-  - ext_maintenance_az_maintenance_assignment_list
-- uid: ext_maintenance_az_maintenance_assignment_create
-  name: az maintenance assignment create
-  summary: Creates a Maintenance Assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Maintenance Assignment.
-    syntax:
-      content: az maintenance assignment create -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --configuration-assignment-name workervms --maintenance-configuration-id "/subscriptions/2b4ce620-bb0f-4964-8428-dea4aefec295/resourcegroups/smdtest/providers/Microsoft.Maintenance/maintenanceConfigurations/workervms" -l eastus2
-  parameters:
-  - isRequired: true
-    name: --configuration-assignment-name
-    summary: Configuration assignment name. Same as the configuration name.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --maintenance-configuration-id
-    summary: Fully qualified id of the maintenance configuration e.g. /subscriptions/2b4ce620-bb0f-4964-8428-dea4aefec295/resourceGroups/smdtest/providers/Microsoft.Maintenance/maintenanceConfigurations/config1.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-id
-    summary: Fully qualified identifier of the Azure resource.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_assignment_delete
-  name: az maintenance assignment delete
-  summary: Delete a Maintenance Assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Maintenance Assignment.
-    syntax:
-      content: az maintenance assignment delete -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute --configuration-assignment-name workervms
-  parameters:
-  - isRequired: true
-    name: --configuration-assignment-name
-    summary: Configuration assignment name. Same as the configuration name.
-    description: ''
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-- uid: ext_maintenance_az_maintenance_assignment_list
-  name: az maintenance assignment list
-  summary: Lists Maintenance Assignment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Maintenance Assignment.
-    syntax:
-      content: az maintenance assignment list -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute
-  parameters:
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_assignment_create
-  name: az maintenance assignment create
-  summary: Creates a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_delete
-  name: az maintenance assignment delete
-  summary: Delete a Maintenance Assignment.
-- uid: ext_maintenance_az_maintenance_assignment_list
-  name: az maintenance assignment list
-  summary: Lists Maintenance Assignment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance configuration assignment to resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml
deleted file mode 100644
index c6a7c5fa89..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/configuration.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_configuration
-  name: az maintenance configuration
-  summary: Manage Azure Maintenance configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_configuration_create
-  - ext_maintenance_az_maintenance_configuration_delete
-  - ext_maintenance_az_maintenance_configuration_list
-  - ext_maintenance_az_maintenance_configuration_show
-  - ext_maintenance_az_maintenance_configuration_update
-- uid: ext_maintenance_az_maintenance_configuration_create
-  name: az maintenance configuration create
-  summary: Creates a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Maintenance Configuration with the All scope.
-    syntax:
-      content: az maintenance configuration create --name workervms -g MyResourceGroup -l westus
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --maintenanceScope
-    defaultValue: All
-    summary: Maintenance Scope e.g. Host, Guest or All.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_maintenance_az_maintenance_configuration_delete
-  name: az maintenance configuration delete
-  summary: Deletes a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Maintenance Configuration.
-    syntax:
-      content: az maintenance configuration delete --name workervms -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_maintenance_az_maintenance_configuration_list
-  name: az maintenance configuration list
-  summary: Get Configuration records within a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get Configuration records within a subscription.
-    syntax:
-      content: az maintenance configuration list --subscription 2b4ce620-bb0f-4964-8428-dea4aefe00000
-  parameters: []
-- uid: ext_maintenance_az_maintenance_configuration_show
-  name: az maintenance configuration show
-  summary: Get the details of a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the Maintenance Configuration.
-    syntax:
-      content: az maintenance configuration show --name workervms -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_maintenance_az_maintenance_configuration_update
-  name: az maintenance configuration update
-  summary: Creates a Maintenance Configuration.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Maintenance Configuration with the All scope.
-    syntax:
-      content: az maintenance configuration update --name workervms -g MyResourceGroup -l westus --maintenanceScope All
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --maintenanceScope
-    defaultValue: All
-    summary: Maintenance Scope e.g. Host, Guest or All.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_configuration_create
-  name: az maintenance configuration create
-  summary: Creates a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_delete
-  name: az maintenance configuration delete
-  summary: Deletes a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_list
-  name: az maintenance configuration list
-  summary: Get Configuration records within a subscription.
-- uid: ext_maintenance_az_maintenance_configuration_show
-  name: az maintenance configuration show
-  summary: Get the details of a Maintenance Configuration.
-- uid: ext_maintenance_az_maintenance_configuration_update
-  name: az maintenance configuration update
-  summary: Creates a Maintenance Configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Maintenance configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/update.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/update.yml
deleted file mode 100644
index 00e8f1bb38..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/maintenance/maintenance/update.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_maintenance_az_maintenance_update
-  name: az maintenance update
-  summary: Azure Maintenance updates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_maintenance_az_maintenance_update_list
-- uid: ext_maintenance_az_maintenance_update_list
-  name: az maintenance update list
-  summary: List pending a Maintenance Updates.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List pending a Maintenance Updates.
-    syntax:
-      content: az maintenance update list -g smdtest --resource-name smdVM --resource-type virtualMachines --provider-name Microsoft.Compute
-  parameters:
-  - isRequired: true
-    name: --provider-name
-    summary: Maintenance resource provider - Microsoft.Maintenance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-name
-    summary: Name of resource.
-    description: ''
-  - isRequired: true
-    name: --resource-type
-    summary: Type of the azure resource e.g. virtualmachines, hosts etc.
-    description: ''
-  - name: --resource-parent-name
-    summary: Name of the parent resource e.g. for dedicated hosts this would be the name of the dedicated host group, for VMSS VMs this would be the VMSS name.
-    description: ''
-  - name: --resource-parent-type
-    summary: Type of the parent resource e.g. for dedicated hosts this would be hostGroups, for VMSS VMs this would be virtualmachinescalesets.
-    description: ''
-commands:
-- uid: ext_maintenance_az_maintenance_update_list
-  name: az maintenance update list
-  summary: List pending a Maintenance Updates.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Azure Maintenance updates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/index.yml
deleted file mode 100644
index 4bf5a41498..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_managementpartner_az
-  name: managementpartner
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_managementpartner_az_managementpartner
-  name: az managementpartner
-  summary: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/managementpartner.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/managementpartner.yml
deleted file mode 100644
index bfc41f9635..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/managementpartner/managementpartner.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_managementpartner_az_managementpartner
-  name: az managementpartner
-  summary: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_managementpartner_az_managementpartner_create
-  - ext_managementpartner_az_managementpartner_delete
-  - ext_managementpartner_az_managementpartner_show
-  - ext_managementpartner_az_managementpartner_update
-- uid: ext_managementpartner_az_managementpartner_create
-  name: az managementpartner create
-  summary: Associates a Microsoft Partner Network(MPN) ID to the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-- uid: ext_managementpartner_az_managementpartner_delete
-  name: az managementpartner delete
-  summary: Delete the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-- uid: ext_managementpartner_az_managementpartner_show
-  name: az managementpartner show
-  summary: Gets the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-- uid: ext_managementpartner_az_managementpartner_update
-  name: az managementpartner update
-  summary: Updates the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --partner-id
-    summary: Microsoft partner network ID.
-    description: ''
-commands:
-- uid: ext_managementpartner_az_managementpartner_create
-  name: az managementpartner create
-  summary: Associates a Microsoft Partner Network(MPN) ID to the current authenticated user or service principal.
-- uid: ext_managementpartner_az_managementpartner_delete
-  name: az managementpartner delete
-  summary: Delete the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-- uid: ext_managementpartner_az_managementpartner_show
-  name: az managementpartner show
-  summary: Gets the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-- uid: ext_managementpartner_az_managementpartner_update
-  name: az managementpartner update
-  summary: Updates the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/index.yml
deleted file mode 100644
index 0355b0fe57..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az
-  name: mesh
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_mesh_az_mesh
-  name: az mesh
-  summary: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh.yml
deleted file mode 100644
index c04ff70256..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh
-  name: az mesh
-  summary: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_mesh_az_mesh_app
-  name: az mesh app
-  summary: Manage Service Fabric Mesh applications.
-- uid: ext_mesh_az_mesh_app_delete
-  name: az mesh app delete
-  summary: Delete a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_app_list
-  name: az mesh app list
-  summary: List Service Fabric Mesh applications.
-- uid: ext_mesh_az_mesh_app_show
-  name: az mesh app show
-  summary: Get the details of a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_code_package_log
-  name: az mesh code-package-log
-  summary: Examine the logs for a codepackage.
-- uid: ext_mesh_az_mesh_code_package_log_get
-  name: az mesh code-package-log get
-  summary: Examine the logs for a codepackage.
-- uid: ext_mesh_az_mesh_deployment
-  name: az mesh deployment
-  summary: Manage Service Fabric Mesh deployments.
-- uid: ext_mesh_az_mesh_deployment_create
-  name: az mesh deployment create
-  summary: Create a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_gateway
-  name: az mesh gateway
-  summary: Manage gateway resources.
-- uid: ext_mesh_az_mesh_gateway_delete
-  name: az mesh gateway delete
-  summary: Delete a gateway resource.
-- uid: ext_mesh_az_mesh_gateway_list
-  name: az mesh gateway list
-  summary: List gateway resources.
-- uid: ext_mesh_az_mesh_gateway_show
-  name: az mesh gateway show
-  summary: Get the details of a gateway.
-- uid: ext_mesh_az_mesh_generate
-  name: az mesh generate
-  summary: Generate Service Fabric Mesh deployment template.
-- uid: ext_mesh_az_mesh_generate_armtemplate
-  name: az mesh generate armtemplate
-  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
-- uid: ext_mesh_az_mesh_network
-  name: az mesh network
-  summary: Manage networks.
-- uid: ext_mesh_az_mesh_network_delete
-  name: az mesh network delete
-  summary: Delete a network.
-- uid: ext_mesh_az_mesh_network_list
-  name: az mesh network list
-  summary: List networks.
-- uid: ext_mesh_az_mesh_network_show
-  name: az mesh network show
-  summary: Get the details of a network.
-- uid: ext_mesh_az_mesh_secret
-  name: az mesh secret
-  summary: Manage secret resources.
-- uid: ext_mesh_az_mesh_secret_delete
-  name: az mesh secret delete
-  summary: Delete a secret.
-- uid: ext_mesh_az_mesh_secret_list
-  name: az mesh secret list
-  summary: List Secrets.
-- uid: ext_mesh_az_mesh_secret_show
-  name: az mesh secret show
-  summary: Get the details of a secret.
-- uid: ext_mesh_az_mesh_secretvalue
-  name: az mesh secretvalue
-  summary: Manage secret values.
-- uid: ext_mesh_az_mesh_secretvalue_delete
-  name: az mesh secretvalue delete
-  summary: Delete a secret version.
-- uid: ext_mesh_az_mesh_secretvalue_list
-  name: az mesh secretvalue list
-  summary: List Secrets versions.
-- uid: ext_mesh_az_mesh_secretvalue_show
-  name: az mesh secretvalue show
-  summary: Get the details of a secret value.
-- uid: ext_mesh_az_mesh_service
-  name: az mesh service
-  summary: Manage Service Fabric Mesh services.
-- uid: ext_mesh_az_mesh_service_list
-  name: az mesh service list
-  summary: Lists all the service resources.
-- uid: ext_mesh_az_mesh_service_show
-  name: az mesh service show
-  summary: Get the details of a service.
-- uid: ext_mesh_az_mesh_service_replica
-  name: az mesh service-replica
-  summary: Manage Service Fabric Mesh service replicas.
-- uid: ext_mesh_az_mesh_service_replica_list
-  name: az mesh service-replica list
-  summary: List the details of service replicas.
-- uid: ext_mesh_az_mesh_service_replica_show
-  name: az mesh service-replica show
-  summary: Gets the given replica of the service of an application.
-- uid: ext_mesh_az_mesh_volume
-  name: az mesh volume
-  summary: Manage volumes.
-- uid: ext_mesh_az_mesh_volume_create
-  name: az mesh volume create
-  summary: Create a volume.
-- uid: ext_mesh_az_mesh_volume_delete
-  name: az mesh volume delete
-  summary: Delete a volume.
-- uid: ext_mesh_az_mesh_volume_list
-  name: az mesh volume list
-  summary: List volumes.
-- uid: ext_mesh_az_mesh_volume_show
-  name: az mesh volume show
-  summary: Get the details of a volume.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/app.yml
deleted file mode 100644
index c51cd065de..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/app.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_app
-  name: az mesh app
-  summary: Manage Service Fabric Mesh applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_app_delete
-  - ext_mesh_az_mesh_app_list
-  - ext_mesh_az_mesh_app_show
-- uid: ext_mesh_az_mesh_app_delete
-  name: az mesh app delete
-  summary: Delete a Service Fabric Mesh application.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_app_list
-  name: az mesh app list
-  summary: List Service Fabric Mesh applications.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_app_show
-  name: az mesh app show
-  summary: Get the details of a Service Fabric Mesh application.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_app_delete
-  name: az mesh app delete
-  summary: Delete a Service Fabric Mesh application.
-- uid: ext_mesh_az_mesh_app_list
-  name: az mesh app list
-  summary: List Service Fabric Mesh applications.
-- uid: ext_mesh_az_mesh_app_show
-  name: az mesh app show
-  summary: Get the details of a Service Fabric Mesh application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml
deleted file mode 100644
index 9336675013..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/code-package-log.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_code_package_log
-  name: az mesh code-package-log
-  summary: Examine the logs for a codepackage.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_code_package_log_get
-- uid: ext_mesh_az_mesh_code_package_log_get
-  name: az mesh code-package-log get
-  summary: Examine the logs for a codepackage.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --code-package-name
-    summary: The name of code package of the service.
-    description: ''
-  - isRequired: true
-    name: --replica-name
-    summary: Service Fabric replica name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the service.
-    description: ''
-  - name: --tail
-    summary: Number of lines to show from the end of the logs. Default is 100.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_code_package_log_get
-  name: az mesh code-package-log get
-  summary: Examine the logs for a codepackage.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Examine the logs for a codepackage.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/deployment.yml
deleted file mode 100644
index 2cf7da4256..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/deployment.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_deployment
-  name: az mesh deployment
-  summary: Manage Service Fabric Mesh deployments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_deployment_create
-- uid: ext_mesh_az_mesh_deployment_create
-  name: az mesh deployment create
-  summary: Create a Service Fabric Mesh application.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a deployment with a template file on the remote.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --template-uri https://seabreezequickstart.blob.core.windows.net/templates/quickstart/sbz_rp.linux.json
-  - summary: Create a deployment with a template file on local disk.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --template-file ./appTemplate.json
-  - summary: List of comma separated yaml files or a directory which contains all the yaml files.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml
-  - summary: Create a deployment with yaml files, along with a yaml parameters file, which consists of key/value pairs.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
-  - summary: Create a deployment with parameters in arm json format.
-    syntax:
-      content: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
-  - summary: Create a deployment with parameters passed directly as a json object.
-    syntax:
-      content: "az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --input-yaml-files
-    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
-    description: ''
-  - name: --mode
-    summary: The mode for deployment, can be incremental(resources are only added) or complete(previous resources will be deleted).
-    description: ''
-  - name: --name -n
-    summary: The deployment name. Default to template file base name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --parameters
-    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
-    description: ''
-  - name: --template-file
-    summary: The full file path of creation template.
-    description: ''
-  - name: --template-uri
-    summary: The full file path of creation template on a http or https link.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_deployment_create
-  name: az mesh deployment create
-  summary: Create a Service Fabric Mesh application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh deployments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/gateway.yml
deleted file mode 100644
index 6fe28dc06b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/gateway.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_gateway
-  name: az mesh gateway
-  summary: Manage gateway resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_gateway_delete
-  - ext_mesh_az_mesh_gateway_list
-  - ext_mesh_az_mesh_gateway_show
-- uid: ext_mesh_az_mesh_gateway_delete
-  name: az mesh gateway delete
-  summary: Delete a gateway resource.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the gateway resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_gateway_list
-  name: az mesh gateway list
-  summary: List gateway resources.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_gateway_show
-  name: az mesh gateway show
-  summary: Get the details of a gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the gateway resource.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_gateway_delete
-  name: az mesh gateway delete
-  summary: Delete a gateway resource.
-- uid: ext_mesh_az_mesh_gateway_list
-  name: az mesh gateway list
-  summary: List gateway resources.
-- uid: ext_mesh_az_mesh_gateway_show
-  name: az mesh gateway show
-  summary: Get the details of a gateway.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage gateway resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/generate.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/generate.yml
deleted file mode 100644
index 5629bc6970..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/generate.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_generate
-  name: az mesh generate
-  summary: Generate Service Fabric Mesh deployment template.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_generate_armtemplate
-- uid: ext_mesh_az_mesh_generate_armtemplate
-  name: az mesh generate armtemplate
-  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Generate a template file for deployment.
-    syntax:
-      content: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml
-  - summary: Generate a template file for deployment with a yaml parameters file, which consists of key/value pairs.
-    syntax:
-      content: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
-  - summary: Generate a template file for deployment with parameters in arm json format.
-    syntax:
-      content: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
-  - summary: Generate a template file for deployment with parameters passed directly as a json object.
-    syntax:
-      content: "az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
-  parameters:
-  - isRequired: true
-    name: --input-yaml-files
-    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
-    description: ''
-  - name: --parameters
-    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_generate_armtemplate
-  name: az mesh generate armtemplate
-  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Generate Service Fabric Mesh deployment template.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/network.yml
deleted file mode 100644
index 22989256a4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/network.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_network
-  name: az mesh network
-  summary: Manage networks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_network_delete
-  - ext_mesh_az_mesh_network_list
-  - ext_mesh_az_mesh_network_show
-- uid: ext_mesh_az_mesh_network_delete
-  name: az mesh network delete
-  summary: Delete a network.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_network_list
-  name: az mesh network list
-  summary: List networks.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_network_show
-  name: az mesh network show
-  summary: Get the details of a network.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the network.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_network_delete
-  name: az mesh network delete
-  summary: Delete a network.
-- uid: ext_mesh_az_mesh_network_list
-  name: az mesh network list
-  summary: List networks.
-- uid: ext_mesh_az_mesh_network_show
-  name: az mesh network show
-  summary: Get the details of a network.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage networks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secret.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secret.yml
deleted file mode 100644
index 3945eb557a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secret.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_secret
-  name: az mesh secret
-  summary: Manage secret resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_secret_delete
-  - ext_mesh_az_mesh_secret_list
-  - ext_mesh_az_mesh_secret_show
-- uid: ext_mesh_az_mesh_secret_delete
-  name: az mesh secret delete
-  summary: Delete a secret.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the secret.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_secret_list
-  name: az mesh secret list
-  summary: List Secrets.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_secret_show
-  name: az mesh secret show
-  summary: Get the details of a secret.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the secret.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_secret_delete
-  name: az mesh secret delete
-  summary: Delete a secret.
-- uid: ext_mesh_az_mesh_secret_list
-  name: az mesh secret list
-  summary: List Secrets.
-- uid: ext_mesh_az_mesh_secret_show
-  name: az mesh secret show
-  summary: Get the details of a secret.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage secret resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml
deleted file mode 100644
index 1df331581b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/secretvalue.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_secretvalue
-  name: az mesh secretvalue
-  summary: Manage secret values.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_secretvalue_delete
-  - ext_mesh_az_mesh_secretvalue_list
-  - ext_mesh_az_mesh_secretvalue_show
-- uid: ext_mesh_az_mesh_secretvalue_delete
-  name: az mesh secretvalue delete
-  summary: Delete a secret version.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-resource-name
-    summary: The name of the secret resource.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: The name of the secret version.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_secretvalue_list
-  name: az mesh secretvalue list
-  summary: List Secrets versions.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-name -n
-    summary: The name of the secret resource.
-    description: ''
-- uid: ext_mesh_az_mesh_secretvalue_show
-  name: az mesh secretvalue show
-  summary: Get the details of a secret value.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-name -n
-    summary: The name of the secret resource.
-    description: ''
-  - isRequired: true
-    name: --version -v
-    summary: The name of the secret version.
-    description: ''
-  - name: --show-value
-    summary: Pass this flag to receive the value of the secret.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_secretvalue_delete
-  name: az mesh secretvalue delete
-  summary: Delete a secret version.
-- uid: ext_mesh_az_mesh_secretvalue_list
-  name: az mesh secretvalue list
-  summary: List Secrets versions.
-- uid: ext_mesh_az_mesh_secretvalue_show
-  name: az mesh secretvalue show
-  summary: Get the details of a secret value.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage secret values.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service-replica.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service-replica.yml
deleted file mode 100644
index 9d7d6f29b1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service-replica.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_service_replica
-  name: az mesh service-replica
-  summary: Manage Service Fabric Mesh service replicas.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_service_replica_list
-  - ext_mesh_az_mesh_service_replica_show
-- uid: ext_mesh_az_mesh_service_replica_list
-  name: az mesh service-replica list
-  summary: List the details of service replicas.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the service.
-    description: ''
-- uid: ext_mesh_az_mesh_service_replica_show
-  name: az mesh service-replica show
-  summary: Gets the given replica of the service of an application.
-  description: Gets the information about the service replica with the given name. The information include the description and other properties of the service replica.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the service replica.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: The name of the service.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_service_replica_list
-  name: az mesh service-replica list
-  summary: List the details of service replicas.
-- uid: ext_mesh_az_mesh_service_replica_show
-  name: az mesh service-replica show
-  summary: Gets the given replica of the service of an application.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh service replicas.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service.yml
deleted file mode 100644
index 9efab7fd10..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/service.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_service
-  name: az mesh service
-  summary: Manage Service Fabric Mesh services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_service_list
-  - ext_mesh_az_mesh_service_show
-- uid: ext_mesh_az_mesh_service_list
-  name: az mesh service list
-  summary: Lists all the service resources.
-  description: Gets the information about all services of an application resource. The information include the description and other properties of the Service.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_service_show
-  name: az mesh service show
-  summary: Get the details of a service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app-name --application-name
-    summary: The name of the application.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_service_list
-  name: az mesh service list
-  summary: Lists all the service resources.
-- uid: ext_mesh_az_mesh_service_show
-  name: az mesh service show
-  summary: Get the details of a service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Service Fabric Mesh services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/volume.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/volume.yml
deleted file mode 100644
index b3c7bd1fd6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mesh/mesh/volume.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mesh_az_mesh_volume
-  name: az mesh volume
-  summary: Manage volumes.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mesh_az_mesh_volume_create
-  - ext_mesh_az_mesh_volume_delete
-  - ext_mesh_az_mesh_volume_list
-  - ext_mesh_az_mesh_volume_show
-- uid: ext_mesh_az_mesh_volume_create
-  name: az mesh volume create
-  summary: Create a volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a volume with a template file on a remote URL.
-    syntax:
-      content: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-uri https://mystorage.blob.core.windows.net/templates/volumeDescription.json
-  - summary: Create a volume with a template file on local disk.
-    syntax:
-      content: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-file ./volumeDescription.json
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the volume.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --template-file
-    summary: The full file path of creation template.
-    description: ''
-  - name: --template-uri
-    summary: The full file path of creation template on a http or https link.
-    description: ''
-- uid: ext_mesh_az_mesh_volume_delete
-  name: az mesh volume delete
-  summary: Delete a volume.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the volume.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_mesh_az_mesh_volume_list
-  name: az mesh volume list
-  summary: List volumes.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mesh_az_mesh_volume_show
-  name: az mesh volume show
-  summary: Get the details of a volume.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the volume.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mesh_az_mesh_volume_create
-  name: az mesh volume create
-  summary: Create a volume.
-- uid: ext_mesh_az_mesh_volume_delete
-  name: az mesh volume delete
-  summary: Delete a volume.
-- uid: ext_mesh_az_mesh_volume_list
-  name: az mesh volume list
-  summary: List volumes.
-- uid: ext_mesh_az_mesh_volume_show
-  name: az mesh volume show
-  summary: Get the details of a volume.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage volumes.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/index.yml
deleted file mode 100644
index 2a2507125e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mixed-reality_az
-  name: mixed-reality
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_mixed-reality_az_spatial_anchors_account
-  name: az spatial-anchors-account
-  summary: Manage Spatial Anchors Accounts.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml
deleted file mode 100644
index 8d0778be1b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mixed-reality_az_spatial_anchors_account
-  name: az spatial-anchors-account
-  summary: Manage Spatial Anchors Accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mixed-reality_az_spatial_anchors_account_create
-  - ext_mixed-reality_az_spatial_anchors_account_delete
-  - ext_mixed-reality_az_spatial_anchors_account_list
-  - ext_mixed-reality_az_spatial_anchors_account_show
-- uid: ext_mixed-reality_az_spatial_anchors_account_create
-  name: az spatial-anchors-account create
-  summary: Create a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account create -g example -n example -l eastus2
-  - summary: Create a Spatial Anchors Account without Location specified.
-    syntax:
-      content: az spatial-anchors-account create -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_delete
-  name: az spatial-anchors-account delete
-  summary: Delete a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account delete -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_list
-  name: az spatial-anchors-account list
-  summary: List Spatial Anchors Accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spatial Anchors Accounts in Resource Group 'example'.
-    syntax:
-      content: az spatial-anchors-account list -g example
-  - summary: List all Spatial Anchors Accounts in current Subscription.
-    syntax:
-      content: az spatial-anchors-account list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_show
-  name: az spatial-anchors-account show
-  summary: Show a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show properties of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account show -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mixed-reality_az_spatial_anchors_account_create
-  name: az spatial-anchors-account create
-  summary: Create a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_delete
-  name: az spatial-anchors-account delete
-  summary: Delete a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key
-  name: az spatial-anchors-account key
-  summary: Manage developer keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-  name: az spatial-anchors-account key renew
-  summary: Renew one of the keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-  name: az spatial-anchors-account key show
-  summary: Show keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_list
-  name: az spatial-anchors-account list
-  summary: List Spatial Anchors Accounts.
-- uid: ext_mixed-reality_az_spatial_anchors_account_show
-  name: az spatial-anchors-account show
-  summary: Show a Spatial Anchors Account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Spatial Anchors Accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml
deleted file mode 100644
index f4d27008a0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/mixed-reality/spatial-anchors-account/key.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_mixed-reality_az_spatial_anchors_account_key
-  name: az spatial-anchors-account key
-  summary: Manage developer keys of a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_mixed-reality_az_spatial_anchors_account_key_renew
-  - ext_mixed-reality_az_spatial_anchors_account_key_show
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-  name: az spatial-anchors-account key renew
-  summary: Renew one of the keys of a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Renew primary key of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account key renew -g example -n example -k primary
-  - summary: Renew secondary key of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account key renew -g example -n example -k secondary
-  parameters:
-  - isRequired: true
-    name: --key -k
-    parameterValueGroup: primary, secondary
-    summary: Key to be regenerated.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-  name: az spatial-anchors-account key show
-  summary: Show keys of a Spatial Anchors Account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show primary key and secondary key of a Spatial Anchors Account.
-    syntax:
-      content: az spatial-anchors-account key show -g example -n example
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the Spatial Anchors Account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-  name: az spatial-anchors-account key renew
-  summary: Renew one of the keys of a Spatial Anchors Account.
-- uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-  name: az spatial-anchors-account key show
-  summary: Show keys of a Spatial Anchors Account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage developer keys of a Spatial Anchors Account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/index.yml
deleted file mode 100644
index 3ede6ae5de..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az
-  name: netappfiles-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles
-  name: az netappfiles
-  summary: Manage Azure NetApp Files (ANF) Resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml
deleted file mode 100644
index 462c03f228..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles
-  name: az netappfiles
-  summary: Manage Azure NetApp Files (ANF) Resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_account
-  name: az netappfiles account
-  summary: Manage Azure NetApp Files (ANF) Account Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_account_create
-  name: az netappfiles account create
-  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
-- uid: ext_netappfiles-preview_az_netappfiles_account_delete
-  name: az netappfiles account delete
-  summary: Delete the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_list
-  name: az netappfiles account list
-  summary: List ANF accounts.
-- uid: ext_netappfiles-preview_az_netappfiles_account_set
-  name: az netappfiles account set
-  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
-- uid: ext_netappfiles-preview_az_netappfiles_account_show
-  name: az netappfiles account show
-  summary: Get the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_update
-  name: az netappfiles account update
-  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target
-  name: az netappfiles mount-target
-  summary: Manage Azure NetApp Files (ANF) Mount Target Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-  name: az netappfiles mount-target list
-  summary: List the mount targets of an ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_pool
-  name: az netappfiles pool
-  summary: Manage Azure NetApp Files (ANF) Pool Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_create
-  name: az netappfiles pool create
-  summary: Create a new Azure NetApp Files (ANF) pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-  name: az netappfiles pool delete
-  summary: Delete the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_list
-  name: az netappfiles pool list
-  summary: L:ist the ANF pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_show
-  name: az netappfiles pool show
-  summary: Get the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_update
-  name: az netappfiles pool update
-  summary: Update the tags of the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot
-  name: az netappfiles snapshot
-  summary: Manage Azure NetApp Files (ANF) Snapshot Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-  name: az netappfiles snapshot create
-  summary: Create a new Azure NetApp Files (ANF) snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  name: az netappfiles snapshot delete
-  summary: Delete the specified ANF snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-  name: az netappfiles snapshot list
-  summary: List the snapshots of an ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-  name: az netappfiles snapshot show
-  summary: Get the specified ANF snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_volume
-  name: az netappfiles volume
-  summary: Manage Azure NetApp Files (ANF) Volume Resources.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_create
-  name: az netappfiles volume create
-  summary: Create a new Azure NetApp Files (ANF) volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-  name: az netappfiles volume delete
-  summary: Delete the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_list
-  name: az netappfiles volume list
-  summary: List the ANF Pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_show
-  name: az netappfiles volume show
-  summary: Get the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_update
-  name: az netappfiles volume update
-  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml
deleted file mode 100644
index 95d263869e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/account.yml
+++ /dev/null
@@ -1,205 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_account
-  name: az netappfiles account
-  summary: Manage Azure NetApp Files (ANF) Account Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_account_create
-  - ext_netappfiles-preview_az_netappfiles_account_delete
-  - ext_netappfiles-preview_az_netappfiles_account_list
-  - ext_netappfiles-preview_az_netappfiles_account_set
-  - ext_netappfiles-preview_az_netappfiles_account_show
-  - ext_netappfiles-preview_az_netappfiles_account_update
-- uid: ext_netappfiles-preview_az_netappfiles_account_create
-  name: az netappfiles account create
-  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF account
-    syntax:
-      content: az netappfiles account create -g group --account-name name -l location
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --active-directories
-    summary: Active Directories.
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the account.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_delete
-  name: az netappfiles account delete
-  summary: Delete the specified ANF account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF account
-    syntax:
-      content: az netappfiles account delete -g group --account-name name
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_list
-  name: az netappfiles account list
-  summary: List ANF accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List ANF accounts within a resource group
-    syntax:
-      content: az netappfiles account list -g group
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_set
-  name: az netappfiles account set
-  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tags and active directory of an ANF account
-    syntax:
-      content: "az netappfiles account set -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
-  - summary: Remove the active directory from the ANF account
-    syntax:
-      content: az netappfiles account set -g group --account-name name --active-directories '[]' -l westus2
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --active-directories
-    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the account.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_show
-  name: az netappfiles account show
-  summary: Get the specified ANF account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an ANF account
-    syntax:
-      content: az netappfiles account show -g group --account-name name
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_account_update
-  name: az netappfiles account update
-  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the tags and active directory of an ANF account
-    syntax:
-      content: "az netappfiles account update -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --active-directories
-    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the account.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_account_create
-  name: az netappfiles account create
-  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
-- uid: ext_netappfiles-preview_az_netappfiles_account_delete
-  name: az netappfiles account delete
-  summary: Delete the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_list
-  name: az netappfiles account list
-  summary: List ANF accounts.
-- uid: ext_netappfiles-preview_az_netappfiles_account_set
-  name: az netappfiles account set
-  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
-- uid: ext_netappfiles-preview_az_netappfiles_account_show
-  name: az netappfiles account show
-  summary: Get the specified ANF account.
-- uid: ext_netappfiles-preview_az_netappfiles_account_update
-  name: az netappfiles account update
-  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Account Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml
deleted file mode 100644
index 250b84dff7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/mount-target.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target
-  name: az netappfiles mount-target
-  summary: Manage Azure NetApp Files (ANF) Mount Target Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_mount_target_list
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-  name: az netappfiles mount-target list
-  summary: List the mount targets of an ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: list the mount targets of an ANF volume
-    syntax:
-      content: az netappfiles mount-target list -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF pool.
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-  name: az netappfiles mount-target list
-  summary: List the mount targets of an ANF volume.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Mount Target Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml
deleted file mode 100644
index 0f34d4cf51..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/pool.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_pool
-  name: az netappfiles pool
-  summary: Manage Azure NetApp Files (ANF) Pool Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_pool_create
-  - ext_netappfiles-preview_az_netappfiles_pool_delete
-  - ext_netappfiles-preview_az_netappfiles_pool_list
-  - ext_netappfiles-preview_az_netappfiles_pool_show
-  - ext_netappfiles-preview_az_netappfiles_pool_update
-- uid: ext_netappfiles-preview_az_netappfiles_pool_create
-  name: az netappfiles pool create
-  summary: Create a new Azure NetApp Files (ANF) pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF pool
-    syntax:
-      content: az netappfiles pool create -g group --account-name aname --pool-name pname -l location --size 4398046511104 --service-level "Premium"
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-level
-    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - isRequired: true
-    name: --size
-    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the pool.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-  name: az netappfiles pool delete
-  summary: Delete the specified ANF pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF pool
-    syntax:
-      content: az netappfiles pool delete -g group --account-name aname --pool-name pname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_list
-  name: az netappfiles pool list
-  summary: L:ist the ANF pools for the specified account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the pools for the ANF account
-    syntax:
-      content: az netappfiles pool list -g group --account-name name
-  parameters:
-  - isRequired: true
-    name: --account-name -a -n
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_show
-  name: az netappfiles pool show
-  summary: Get the specified ANF pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get an ANF pool
-    syntax:
-      content: az netappfiles pool show -g group --account-name aname --pool-name pname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_pool_update
-  name: az netappfiles pool update
-  summary: Update the tags of the specified ANF pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update specific values for an ANF pool
-    syntax:
-      content: az netappfiles pool update -g group --account-name aname --pool-name pname --service-level "Extreme" --tags 'key[=value] key[=value]'
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --service-level
-    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - name: --size
-    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the pool.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_pool_create
-  name: az netappfiles pool create
-  summary: Create a new Azure NetApp Files (ANF) pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-  name: az netappfiles pool delete
-  summary: Delete the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_list
-  name: az netappfiles pool list
-  summary: L:ist the ANF pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_show
-  name: az netappfiles pool show
-  summary: Get the specified ANF pool.
-- uid: ext_netappfiles-preview_az_netappfiles_pool_update
-  name: az netappfiles pool update
-  summary: Update the tags of the specified ANF pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Pool Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml
deleted file mode 100644
index 2c106681d9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/snapshot.yml
+++ /dev/null
@@ -1,169 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot
-  name: az netappfiles snapshot
-  summary: Manage Azure NetApp Files (ANF) Snapshot Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_snapshot_create
-  - ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  - ext_netappfiles-preview_az_netappfiles_snapshot_list
-  - ext_netappfiles-preview_az_netappfiles_snapshot_show
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-  name: az netappfiles snapshot create
-  summary: Create a new Azure NetApp Files (ANF) snapshot.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF snapshot
-    syntax:
-      content: az netappfiles snapshot create -g group --account-name account-name --pool-name pname --volume-name vname --snapshot-name sname -l location --file-system-id volume-uuid
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --snapshot-name -n -s
-    summary: The name of the ANF snapshot.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF volume.
-    description: ''
-  - name: --file-system-id
-    summary: The uuid of the volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  name: az netappfiles snapshot delete
-  summary: Delete the specified ANF snapshot.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF snapshot
-    syntax:
-      content: az netappfiles snapshot delete -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --snapshot-name -n -s
-    summary: The name of the ANF snapshot.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-  name: az netappfiles snapshot list
-  summary: List the snapshots of an ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: list the snapshots of an ANF volume
-    syntax:
-      content: az netappfiles snapshot list -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-  name: az netappfiles snapshot show
-  summary: Get the specified ANF snapshot.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Return the specified ANF snapshot
-    syntax:
-      content: az netappfiles snapshot show -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --snapshot-name -n -s
-    summary: The name of the ANF snapshot.
-    description: ''
-  - isRequired: true
-    name: --volume-name -v
-    summary: The name of the ANF volume.
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-  name: az netappfiles snapshot create
-  summary: Create a new Azure NetApp Files (ANF) snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-  name: az netappfiles snapshot delete
-  summary: Delete the specified ANF snapshot.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-  name: az netappfiles snapshot list
-  summary: List the snapshots of an ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-  name: az netappfiles snapshot show
-  summary: Get the specified ANF snapshot.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Snapshot Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml
deleted file mode 100644
index 62004ce211..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/netappfiles-preview/netappfiles/volume.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_netappfiles-preview_az_netappfiles_volume
-  name: az netappfiles volume
-  summary: Manage Azure NetApp Files (ANF) Volume Resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_netappfiles-preview_az_netappfiles_volume_create
-  - ext_netappfiles-preview_az_netappfiles_volume_delete
-  - ext_netappfiles-preview_az_netappfiles_volume_list
-  - ext_netappfiles-preview_az_netappfiles_volume_show
-  - ext_netappfiles-preview_az_netappfiles_volume_update
-- uid: ext_netappfiles-preview_az_netappfiles_volume_create
-  name: az netappfiles volume create
-  summary: Create a new Azure NetApp Files (ANF) volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF volume
-    syntax:
-      content: "az netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level \"Premium\" --usage-threshold 107374182400 --creation-token \"unique-token\" --subnet-id \"/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default\" --export-policy '[{\"allowed_clients\":\"0.0.0.0/0\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --creation-token
-    summary: A unique file path identifier, from 1 to 80 characters.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service-level
-    summary: The service level ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - isRequired: true
-    name: --subnet-id
-    summary: The subnet identifier.
-    description: ''
-  - isRequired: true
-    name: --usage-threshold
-    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-  - name: --export-policy
-    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-  name: az netappfiles volume delete
-  summary: Delete the specified ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an ANF volume
-    syntax:
-      content: az netappfiles volume delete -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_list
-  name: az netappfiles volume list
-  summary: List the ANF Pools for the specified account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the ANF volumes of the pool
-    syntax:
-      content: az netappfiles volume list -g group --account-name aname --pool-name pname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -n -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_show
-  name: az netappfiles volume show
-  summary: Get the specified ANF volume.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Returns the properties of the given ANF volume
-    syntax:
-      content: az netappfiles volume show -g group --account-name aname --pool-name pname --volume-name vname
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF pool.
-    description: ''
-- uid: ext_netappfiles-preview_az_netappfiles_volume_update
-  name: az netappfiles volume update
-  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an ANF volume
-    syntax:
-      content: "az netappfiles volume update -g group --account-name aname --pool-name pname --volume-name vname --service-level level --usage-threshold 107374182400 --tags 'key[=value] key[=value]' --export-policy '[{\"allowed_clients\":\"1.2.3.0/24\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}, {\"allowed_clients\":\"1.2.4.0/24\", \"rule_index\": \"2\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
-  parameters:
-  - isRequired: true
-    name: --account-name -a
-    summary: The name of the ANF account.
-    description: ''
-  - isRequired: true
-    name: --pool-name -p
-    summary: The name of the ANF pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --volume-name -n -v
-    summary: The name of the ANF volume.
-    description: ''
-  - name: --export-policy
-    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
-    description: ''
-  - name: --service-level
-    summary: The service level ["Standard"|"Premium"|"Extreme"].
-    description: ''
-  - name: --tags
-    summary: A list of space separated tags to apply to the volume.
-    description: ''
-  - name: --usage-threshold
-    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_netappfiles-preview_az_netappfiles_volume_create
-  name: az netappfiles volume create
-  summary: Create a new Azure NetApp Files (ANF) volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-  name: az netappfiles volume delete
-  summary: Delete the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_list
-  name: az netappfiles volume list
-  summary: List the ANF Pools for the specified account.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_show
-  name: az netappfiles volume show
-  summary: Get the specified ANF volume.
-- uid: ext_netappfiles-preview_az_netappfiles_volume_update
-  name: az netappfiles volume update
-  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure NetApp Files (ANF) Volume Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/index.yml
deleted file mode 100644
index e43f0a1a1d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az
-  name: notification-hub
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_notification-hub_az_notification_hub
-  name: az notification-hub
-  summary: Manage Notification Hubs.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub.yml
deleted file mode 100644
index 5e8356ca99..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub.yml
+++ /dev/null
@@ -1,388 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub
-  name: az notification-hub
-  summary: Manage Notification Hubs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_check_availability
-  - ext_notification-hub_az_notification_hub_create
-  - ext_notification-hub_az_notification_hub_delete
-  - ext_notification-hub_az_notification_hub_list
-  - ext_notification-hub_az_notification_hub_show
-  - ext_notification-hub_az_notification_hub_test_send
-  - ext_notification-hub_az_notification_hub_update
-- uid: ext_notification-hub_az_notification_hub_check_availability
-  name: az notification-hub check-availability
-  summary: Check the availability of the given notificationHub in a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check the availability of the given notificationHub name
-    syntax:
-      content: >-
-        az notification-hub check-availability --resource-group MyResourceGroup \
-
-        --namespace-name "locp-newns" --name my-hub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name to check.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_create
-  name: az notification-hub create
-  summary: Create a NotificationHub in a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Notification Hub
-    syntax:
-      content: >-
-        az notification-hub create --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --name my-hub --location "South Central US"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --registration-ttl
-    summary: The RegistrationTtl of the created NotificationHub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_delete
-  name: az notification-hub delete
-  summary: Delete a notification hub associated with a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a notification hub
-    syntax:
-      content: >-
-        az notification-hub delete --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --name my-hub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_list
-  name: az notification-hub list
-  summary: List the notification hubs associated with a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the notification hubs
-    syntax:
-      content: az notification-hub list --resource-group MyResourceGroup --namespace-name my-namespace
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_show
-  name: az notification-hub show
-  summary: Show the notification hub information.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the Notification Hub info
-    syntax:
-      content: >-
-        az notification-hub show --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --name my-hub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_test_send
-  name: az notification-hub test-send
-  summary: Test send a push notification.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: test send notification with message body
-    syntax:
-      content: >-
-        az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --notification-format gcm \
-
-        --message "test notification"
-  - summary: test send notification from file
-    syntax:
-      content: >-
-        az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --notification-format gcm \
-
-        --payload @path/to/file
-  - summary: test send notification with json string
-    syntax:
-      content: >-
-        az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --notification-format gcm \
-
-        --payload "{\"data\":{\"message\":\"test notification\"}}"
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-format
-    parameterValueGroup: apple, baidu, gcm, template, windows, windowsphone
-    summary: The format of notification message.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --message
-    summary: The message body to send. If not None, payload will be ignored.
-    description: ''
-  - name: --payload
-    summary: The payload for the message in JSON format.
-    description: ''
-  - name: --tag
-    summary: You can send test notifications to a specific set of registrations using this option. Leave this field empty if you like to send push notifications to 10 random registrations on the selected platform.
-    description: ''
-  - name: --title
-    summary: The title of the notification.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_update
-  name: az notification-hub update
-  summary: Update a Notification Hub in a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the Notification Hub
-    syntax:
-      content: >-
-        az notification-hub update --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --name "sdk-notificationHubs-8708"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_authorization_rule
-  name: az notification-hub authorization-rule
-  summary: Commands to manage notification hubs authorization rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-  name: az notification-hub authorization-rule create
-  summary: Create an authorization rule for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-  name: az notification-hub authorization-rule delete
-  summary: Delete a notificationHub authorization rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-  name: az notification-hub authorization-rule list
-  summary: List the authorization rules for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  name: az notification-hub authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  name: az notification-hub authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-  name: az notification-hub authorization-rule show
-  summary: Show an authorization rule for a NotificationHub by name.
-- uid: ext_notification-hub_az_notification_hub_check_availability
-  name: az notification-hub check-availability
-  summary: Check the availability of the given notificationHub in a namespace.
-- uid: ext_notification-hub_az_notification_hub_create
-  name: az notification-hub create
-  summary: Create a NotificationHub in a namespace.
-- uid: ext_notification-hub_az_notification_hub_credential
-  name: az notification-hub credential
-  summary: Commands to manage notification hub credential.
-- uid: ext_notification-hub_az_notification_hub_credential_adm
-  name: az notification-hub credential adm
-  summary: Commands to manage notification hub credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_apns
-  name: az notification-hub credential apns
-  summary: Commands to manage notification hub credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu
-  name: az notification-hub credential baidu
-  summary: Commands to manage notification hub credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm
-  name: az notification-hub credential gcm
-  summary: Commands to manage notification hub credential for Google(GCM/FCM).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-- uid: ext_notification-hub_az_notification_hub_credential_list
-  name: az notification-hub credential list
-  summary: List the PNS Credentials associated with a notification hub .
-- uid: ext_notification-hub_az_notification_hub_credential_mpns
-  name: az notification-hub credential mpns
-  summary: Commands to manage notification hub credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns
-  name: az notification-hub credential wns
-  summary: Commands to manage notification hub credential for Windows(WNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-- uid: ext_notification-hub_az_notification_hub_delete
-  name: az notification-hub delete
-  summary: Delete a notification hub associated with a namespace.
-- uid: ext_notification-hub_az_notification_hub_list
-  name: az notification-hub list
-  summary: List the notification hubs associated with a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace
-  name: az notification-hub namespace
-  summary: Commands to manage notification hub namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-  name: az notification-hub namespace authorization-rule
-  summary: Commands to manage notification hubs namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-- uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-  name: az notification-hub namespace check-availability
-  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
-- uid: ext_notification-hub_az_notification_hub_namespace_create
-  name: az notification-hub namespace create
-  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
-- uid: ext_notification-hub_az_notification_hub_namespace_delete
-  name: az notification-hub namespace delete
-  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_list
-  name: az notification-hub namespace list
-  summary: List available namespaces.
-- uid: ext_notification-hub_az_notification_hub_namespace_show
-  name: az notification-hub namespace show
-  summary: Return the description for the specified namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_update
-  name: az notification-hub namespace update
-  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
-- uid: ext_notification-hub_az_notification_hub_namespace_wait
-  name: az notification-hub namespace wait
-  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
-- uid: ext_notification-hub_az_notification_hub_show
-  name: az notification-hub show
-  summary: Show the notification hub information.
-- uid: ext_notification-hub_az_notification_hub_test_send
-  name: az notification-hub test-send
-  summary: Test send a push notification.
-- uid: ext_notification-hub_az_notification_hub_update
-  name: az notification-hub update
-  summary: Update a Notification Hub in a namespace.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Notification Hubs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml
deleted file mode 100644
index bec7d974d5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/authorization-rule.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_authorization_rule
-  name: az notification-hub authorization-rule
-  summary: Commands to manage notification hubs authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_authorization_rule_create
-  - ext_notification-hub_az_notification_hub_authorization_rule_delete
-  - ext_notification-hub_az_notification_hub_authorization_rule_list
-  - ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  - ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  - ext_notification-hub_az_notification_hub_authorization_rule_show
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-  name: az notification-hub authorization-rule create
-  summary: Create an authorization rule for a NotificationHub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule create --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature --rights Listen Send
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rights
-    summary: The rights associated with the rule.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-  name: az notification-hub authorization-rule delete
-  summary: Delete a notificationHub authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule delete --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-  name: az notification-hub authorization-rule list
-  summary: List the authorization rules for a NotificationHub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List authorization rules
-    syntax:
-      content: >-
-        az notification-hub authorization-rule list --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  name: az notification-hub authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List connectionStrings of the authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule list-keys --resource-group MyResourceGroup --namespace-name my-namespace \
-
-        --notification-hub-name my-hub --name "sdk-AuthRules-5800"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  name: az notification-hub authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate the Notification Hub authorization rule
-    syntax:
-      content: >-
-        az notification-hub authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature --policy-key "Secondary Key"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --policy-key
-    parameterValueGroup: Primary Key, Secondary Key
-    summary: Name of the key that has to be regenerated for the Notification Hub Authorization Rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-  name: az notification-hub authorization-rule show
-  summary: Show an authorization rule for a NotificationHub by name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the authorization rule information
-    syntax:
-      content: >-
-        az notification-hub authorization-rule show --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --name \
-
-        DefaultListenSharedAccessSignature
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-  name: az notification-hub authorization-rule create
-  summary: Create an authorization rule for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-  name: az notification-hub authorization-rule delete
-  summary: Delete a notificationHub authorization rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-  name: az notification-hub authorization-rule list
-  summary: List the authorization rules for a NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-  name: az notification-hub authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-  name: az notification-hub authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-  name: az notification-hub authorization-rule show
-  summary: Show an authorization rule for a NotificationHub by name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hubs authorization rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml
deleted file mode 100644
index 66159979ee..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential
-  name: az notification-hub credential
-  summary: Commands to manage notification hub credential.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_list
-- uid: ext_notification-hub_az_notification_hub_credential_list
-  name: az notification-hub credential list
-  summary: List the PNS Credentials associated with a notification hub .
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the PNS Credentials
-    syntax:
-      content: >-
-        az notification-hub credential list --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --notification-hub-name my-hub
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_adm
-  name: az notification-hub credential adm
-  summary: Commands to manage notification hub credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-- uid: ext_notification-hub_az_notification_hub_credential_apns
-  name: az notification-hub credential apns
-  summary: Commands to manage notification hub credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu
-  name: az notification-hub credential baidu
-  summary: Commands to manage notification hub credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm
-  name: az notification-hub credential gcm
-  summary: Commands to manage notification hub credential for Google(GCM/FCM).
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-- uid: ext_notification-hub_az_notification_hub_credential_list
-  name: az notification-hub credential list
-  summary: List the PNS Credentials associated with a notification hub .
-- uid: ext_notification-hub_az_notification_hub_credential_mpns
-  name: az notification-hub credential mpns
-  summary: Commands to manage notification hub credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns
-  name: az notification-hub credential wns
-  summary: Commands to manage notification hub credential for Windows(WNS).
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml
deleted file mode 100644
index a7154af95b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/adm.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_adm
-  name: az notification-hub credential adm
-  summary: Commands to manage notification hub credential for Amazon(ADM).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_adm_update
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --client-id
-    summary: The client identifier.
-    description: ''
-  - isRequired: true
-    name: --client-secret
-    summary: The credential secret access key.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_adm_update
-  name: az notification-hub credential adm update
-  summary: Update credential for Amazon(ADM).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Amazon(ADM).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml
deleted file mode 100644
index e4eb83ea70..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/apns.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_apns
-  name: az notification-hub credential apns
-  summary: Commands to manage notification hub credential for Apple(APNS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_apns_update
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update APNS certificate
-    syntax:
-      content: >-
-        az notification-hub credential apns update --namespace-name my-namespace \
-
-        --notification-hub-name my-hub --apns-certificate "/path/to/certificate" \
-
-        --certificate-key "xxxxxx" --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --apns-certificate
-    summary: The APNS certificate.
-    description: ''
-  - name: --app-id
-    summary: The issuer (iss) registered claim key, whose value is your 10-character Team ID, obtained from your developer account.
-    description: ''
-  - name: --app-name
-    summary: The name of the application/bundle id.
-    description: ''
-  - name: --certificate-key
-    summary: The certificate key.
-    description: ''
-  - name: --endpoint
-    defaultValue: gateway.push.apple.com
-    summary: The endpoint of this credential. Example values:"gateway.sandbox.push.apple.com","gateway.push.apple.com".
-    description: ''
-  - name: --key-id
-    summary: A 10-character key identifier (kid) key, obtained from your developer account.
-    description: ''
-  - name: --token
-    summary: Provider Authentication Token, obtained through your developer account.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_apns_update
-  name: az notification-hub credential apns update
-  summary: Update credential for Apple(APNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Apple(APNS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml
deleted file mode 100644
index 8473e49579..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/baidu.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_baidu
-  name: az notification-hub credential baidu
-  summary: Commands to manage notification hub credential for Baidu(Andrioid China).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_baidu_update
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --api-key
-    summary: Baidu API key.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-key
-    summary: Baidu secret key.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-  name: az notification-hub credential baidu update
-  summary: Update credential for Baidu(Andrioid China).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Baidu(Andrioid China).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml
deleted file mode 100644
index 1f3ca22a55..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/gcm.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_gcm
-  name: az notification-hub credential gcm
-  summary: Commands to manage notification hub credential for Google(GCM/FCM).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_gcm_update
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update gcm key
-    syntax:
-      content: >-
-        az notification-hub credential gcm update --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --notification-hub-name my-hub --google-api-key \
-
-        "xxxxxxxxx"
-  parameters:
-  - isRequired: true
-    name: --google-api-key
-    summary: Google GCM/FCM API key.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-  name: az notification-hub credential gcm update
-  summary: Update the Google GCM/FCM API key.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Google(GCM/FCM).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml
deleted file mode 100644
index 71cdf0da5c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/mpns.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_mpns
-  name: az notification-hub credential mpns
-  summary: Commands to manage notification hub credential for Windows Phone(MPNS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_mpns_update
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --certificate-key
-    summary: The certificate key for this credential.
-    description: ''
-  - isRequired: true
-    name: --mpns-certificate
-    summary: The MPNS certificate.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-  name: az notification-hub credential mpns update
-  summary: Update credential for Windows Phone(MPNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Windows Phone(MPNS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml
deleted file mode 100644
index ac658ffe64..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/credential/wns.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_credential_wns
-  name: az notification-hub credential wns
-  summary: Commands to manage notification hub credential for Windows(WNS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_credential_wns_update
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --notification-hub-name
-    summary: The notification hub name.
-    description: ''
-  - isRequired: true
-    name: --package-sid
-    summary: The package ID for this credential.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --secret-key
-    summary: The secret key.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_credential_wns_update
-  name: az notification-hub credential wns update
-  summary: Update credential for Windows(WNS).
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub credential for Windows(WNS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml
deleted file mode 100644
index 8128647636..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_namespace
-  name: az notification-hub namespace
-  summary: Commands to manage notification hub namespace.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_namespace_check_availability
-  - ext_notification-hub_az_notification_hub_namespace_create
-  - ext_notification-hub_az_notification_hub_namespace_delete
-  - ext_notification-hub_az_notification_hub_namespace_list
-  - ext_notification-hub_az_notification_hub_namespace_show
-  - ext_notification-hub_az_notification_hub_namespace_update
-  - ext_notification-hub_az_notification_hub_namespace_wait
-- uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-  name: az notification-hub namespace check-availability
-  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check name availability of namespace
-    syntax:
-      content: az notification-hub namespace check-availability --name "my-test-space"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name to check.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_create
-  name: az notification-hub namespace create
-  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a namespace
-    syntax:
-      content: >-
-        az notification-hub namespace create --resource-group MyResourceGroup --name \
-
-        my-namespace --location "South Central US" --sku Standard
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: Basic, Free, Standard
-    summary: Name of the notification hub sku.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_delete
-  name: az notification-hub namespace delete
-  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete the namespace
-    syntax:
-      content: >-
-        az notification-hub namespace delete --resource-group MyResourceGroup --name \
-
-        my-namespace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_list
-  name: az notification-hub namespace list
-  summary: List available namespaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List available namespaces within a resource group
-    syntax:
-      content: az notification-hub namespace list --resource-group MyResourceGroup
-  - summary: List all the available namespaces within the subscription irrespective of the resourceGroups
-    syntax:
-      content: az notification-hub namespace list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_show
-  name: az notification-hub namespace show
-  summary: Return the description for the specified namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show namespace info
-    syntax:
-      content: >-
-        az notification-hub namespace show --resource-group MyResourceGroup --name \
-
-        my-namespace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_update
-  name: az notification-hub namespace update
-  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the namespace
-    syntax:
-      content: >-
-        az notification-hub namespace update --resource-group MyResourceGroup --name \
-
-        my-namespace --sku Standard
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Free, Standard
-    summary: Name of the notification hub sku.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_wait
-  name: az notification-hub namespace wait
-  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Notification Hub Namesapce is successfully provisioned.
-    syntax:
-      content: az notification-hub namespace wait --resource-group MyResourceGroup --name \ my-namespace --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-  name: az notification-hub namespace authorization-rule
-  summary: Commands to manage notification hubs namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-- uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-  name: az notification-hub namespace check-availability
-  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
-- uid: ext_notification-hub_az_notification_hub_namespace_create
-  name: az notification-hub namespace create
-  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
-- uid: ext_notification-hub_az_notification_hub_namespace_delete
-  name: az notification-hub namespace delete
-  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_list
-  name: az notification-hub namespace list
-  summary: List available namespaces.
-- uid: ext_notification-hub_az_notification_hub_namespace_show
-  name: az notification-hub namespace show
-  summary: Return the description for the specified namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_update
-  name: az notification-hub namespace update
-  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
-- uid: ext_notification-hub_az_notification_hub_namespace_wait
-  name: az notification-hub namespace wait
-  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hub namespace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml
deleted file mode 100644
index 02274d4889..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/notification-hub/notification-hub/namespace/authorization-rule.yml
+++ /dev/null
@@ -1,214 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-  name: az notification-hub namespace authorization-rule
-  summary: Commands to manage notification hubs namespace authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  - ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a namespace authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule create --resource-group \
-
-        MyResourceGroup --namespace-name my-namespace --name "sdk-AuthRules-1788" --rights Listen Send
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rights
-    summary: The rights associated with the rule.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a namespace authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule delete --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --name "RootManageSharedAccessKey"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List authorization rules of the namespace
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule list --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace
-  parameters:
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List keys of the namesapce authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule list-keys --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --name "RootManageSharedAccessKey"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate keys of the namesapce authorization rule
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
-
-        my-namespace --name "RootManageSharedAccessKey" --policy-key "Secondary Key"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --policy-key
-    parameterValueGroup: Primary Key, Secondary Key
-    summary: Name of the key that has to be regenerated for the Namespace Authorization Rule.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show namespace authorization rule info
-    syntax:
-      content: >-
-        az notification-hub namespace authorization-rule show --resource-group MyResourceGroup \
-
-        --namespace-name my-namespace --name "RootManageSharedAccessKey"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The authorization rule name.
-    description: ''
-  - isRequired: true
-    name: --namespace-name
-    summary: The namespace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-  name: az notification-hub namespace authorization-rule create
-  summary: Create an authorization rule for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-  name: az notification-hub namespace authorization-rule delete
-  summary: Delete a namespace authorization rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-  name: az notification-hub namespace authorization-rule list
-  summary: List the authorization rules for a namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-  name: az notification-hub namespace authorization-rule list-keys
-  summary: List the Primary and Secondary ConnectionStrings to the namespace.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-  name: az notification-hub namespace authorization-rule regenerate-keys
-  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
-- uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-  name: az notification-hub namespace authorization-rule show
-  summary: Show an authorization rule for a namespace by name.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage notification hubs namespace authorization rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/index.yml
deleted file mode 100644
index e230d84d4c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az
-  name: peering
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_peering_az_peering
-  name: az peering
-  summary: Commands to manage peering.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering.yml
deleted file mode 100644
index d05d84271a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering
-  name: az peering
-  summary: Commands to manage peering.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_create
-  - ext_peering_az_peering_delete
-  - ext_peering_az_peering_list
-  - ext_peering_az_peering_show
-  - ext_peering_az_peering_update
-- uid: ext_peering_az_peering_create
-  name: az peering create
-  summary: Create peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a direct peering
-    syntax:
-      content: >-
-        az peering create --resource-group "MyResourceGroup" --name "MyPeering" --sku-name \
-
-        "Basic_Direct_Free" --kind "Direct" --direct-direct-peering-type "Edge" \
-
-        --peering-location "peeringLocation0" --location "eastus" \
-
-        --direct-connections bandwidthInMbps=10000 sessionAddressProvider=Peer \
-
-        useForPeeringService=false peeringDBFacilityId=99999 sessionPrefixV4=192.168.0.0/31 \
-
-        sessionPrefixV6=fd00::0/127 maxPrefixesAdvertisedV4=1000 maxPrefixesAdvertisedV6=100 \
-
-        md5AuthenticationKey=test-md5-auth-key \
-
-        connectionIdentifier=5F4CB5C7-6B43-4444-9338-9ABC72606C16 \
-
-        --direct-connections bandwidthInMbps=10000 \
-
-        sessionAddressProvider=Microsoft useForPeeringService=true peeringDBFacilityId=99999 \
-
-        connectionIdentifier=8AB00818-D533-4504-A25A-03A17F61201C \
-
-        --direct-peer-asn /subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Peering/peerAsns/peerAsnName
-  parameters:
-  - isRequired: true
-    name: --kind
-    parameterValueGroup: Direct, Exchange
-    summary: The kind of the peering.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --direct-connections
-    summary: The set of connections that constitute a direct peering.
-    description: ''
-  - name: --direct-direct-peering-type
-    parameterValueGroup: Cdn, Edge, Internal, Transit
-    summary: The type of direct peering.
-    description: ''
-  - name: --direct-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --exchange-connections
-    summary: The set of connections that constitute an exchange peering.
-    description: ''
-  - name: --exchange-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --peering-location
-    summary: The location of the peering.
-    description: ''
-  - name: --sku-family
-    parameterValueGroup: Direct, Exchange
-    summary: The family of the peering SKU.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: Basic_Direct_Free, Basic_Exchange_Free, Premium_Direct_Free, Premium_Direct_Metered, Premium_Direct_Unlimited, Premium_Exchange_Metered
-    summary: The name of the peering SKU.
-    description: ''
-  - name: --sku-size
-    parameterValueGroup: Free, Metered, Unlimited
-    summary: The size of the peering SKU.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: Basic, Premium
-    summary: The tier of the peering SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_peering_az_peering_delete
-  name: az peering delete
-  summary: Delete peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a peering
-    syntax:
-      content: az peering delete --resource-group "MyResourceGroup" --name "MyPeering"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_list
-  name: az peering list
-  summary: List peering.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_show
-  name: az peering show
-  summary: Show peering.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_update
-  name: az peering update
-  summary: Update peering.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update peering tags
-    syntax:
-      content: az peering update --resource-group "MyResourceGroup" --name "MyPeering"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --direct-connections
-    summary: The set of connections that constitute a direct peering.
-    description: ''
-  - name: --direct-direct-peering-type
-    parameterValueGroup: Cdn, Edge, Internal, Transit
-    summary: The type of direct peering.
-    description: ''
-  - name: --direct-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --exchange-connections
-    summary: The set of connections that constitute an exchange peering.
-    description: ''
-  - name: --exchange-peer-asn
-    summary: The reference of the peer ASN.
-    description: ''
-  - name: --kind
-    parameterValueGroup: Direct, Exchange
-    summary: The kind of the peering.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --peering-location
-    summary: The location of the peering.
-    description: ''
-  - name: --sku-family
-    parameterValueGroup: Direct, Exchange
-    summary: The family of the peering SKU.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: Basic_Direct_Free, Basic_Exchange_Free, Premium_Direct_Free, Premium_Direct_Metered, Premium_Direct_Unlimited, Premium_Exchange_Metered
-    summary: The name of the peering SKU.
-    description: ''
-  - name: --sku-size
-    parameterValueGroup: Free, Metered, Unlimited
-    summary: The size of the peering SKU.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: Basic, Premium
-    summary: The tier of the peering SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_peering_az_peering_asn
-  name: az peering asn
-  summary: Commands to manage peer asn.
-- uid: ext_peering_az_peering_asn_create
-  name: az peering asn create
-  summary: Create peer ASN.
-- uid: ext_peering_az_peering_asn_delete
-  name: az peering asn delete
-  summary: Delete peer ASN.
-- uid: ext_peering_az_peering_asn_list
-  name: az peering asn list
-  summary: List peer asn.
-- uid: ext_peering_az_peering_asn_show
-  name: az peering asn show
-  summary: Show peer asn.
-- uid: ext_peering_az_peering_asn_update
-  name: az peering asn update
-  summary: Update peer asn.
-- uid: ext_peering_az_peering_create
-  name: az peering create
-  summary: Create peering.
-- uid: ext_peering_az_peering_delete
-  name: az peering delete
-  summary: Delete peering.
-- uid: ext_peering_az_peering_legacy
-  name: az peering legacy
-  summary: Commands to manage legacy peering.
-- uid: ext_peering_az_peering_legacy_list
-  name: az peering legacy list
-  summary: List legacy peering.
-- uid: ext_peering_az_peering_list
-  name: az peering list
-  summary: List peering.
-- uid: ext_peering_az_peering_location
-  name: az peering location
-  summary: Commands to manage peering location.
-- uid: ext_peering_az_peering_location_list
-  name: az peering location list
-  summary: List peering location.
-- uid: ext_peering_az_peering_service
-  name: az peering service
-  summary: Commands to manage peering service.
-- uid: ext_peering_az_peering_service_create
-  name: az peering service create
-  summary: Create peering service.
-- uid: ext_peering_az_peering_service_delete
-  name: az peering service delete
-  summary: Delete peering service.
-- uid: ext_peering_az_peering_service_list
-  name: az peering service list
-  summary: List peering service.
-- uid: ext_peering_az_peering_service_location
-  name: az peering service location
-  summary: Commands to manage peering service location.
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-- uid: ext_peering_az_peering_service_prefix
-  name: az peering service prefix
-  summary: Commands to manage prefix.
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-- uid: ext_peering_az_peering_service_provider
-  name: az peering service provider
-  summary: Commands to manage peering service provider.
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-- uid: ext_peering_az_peering_service_show
-  name: az peering service show
-  summary: Show peering service.
-- uid: ext_peering_az_peering_service_update
-  name: az peering service update
-  summary: Update peering service.
-- uid: ext_peering_az_peering_show
-  name: az peering show
-  summary: Show peering.
-- uid: ext_peering_az_peering_update
-  name: az peering update
-  summary: Update peering.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/asn.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/asn.yml
deleted file mode 100644
index 13ea420813..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/asn.yml
+++ /dev/null
@@ -1,142 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_asn
-  name: az peering asn
-  summary: Commands to manage peer asn.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_asn_create
-  - ext_peering_az_peering_asn_delete
-  - ext_peering_az_peering_asn_list
-  - ext_peering_az_peering_asn_show
-  - ext_peering_az_peering_asn_update
-- uid: ext_peering_az_peering_asn_create
-  name: az peering asn create
-  summary: Create peer ASN.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a peer ASN
-    syntax:
-      content: >-
-        az peering asn create --name "MyPeerAsn" --peer-asn "65000" --emails \
-
-        "abc@contoso.com,xyz@contoso.com" --phone "+1 (234) 567-8900" --peer-name "Contoso" \
-
-        --validation-state Approved
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The peer ASN name.
-    description: ''
-  - name: --emails
-    summary: The list of email addresses.
-    description: ''
-  - name: --peer-asn
-    summary: The Autonomous System Number (ASN) of the peer.
-    description: ''
-  - name: --peer-name
-    summary: The name of the peer.
-    description: ''
-  - name: --phone
-    summary: The list of contact numbers.
-    description: ''
-  - name: --validation-state
-    parameterValueGroup: Approved, Failed, None, Pending
-    summary: The validation state of the ASN associated with the peer.
-    description: ''
-- uid: ext_peering_az_peering_asn_delete
-  name: az peering asn delete
-  summary: Delete peer ASN.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a peer ASN
-    syntax:
-      content: az peering asn delete --name "MyPeerAsn"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The peer ASN name.
-    description: ''
-- uid: ext_peering_az_peering_asn_list
-  name: az peering asn list
-  summary: List peer asn.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_peering_az_peering_asn_show
-  name: az peering asn show
-  summary: Show peer asn.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peer-asn-name
-    summary: The peer ASN name.
-    description: ''
-- uid: ext_peering_az_peering_asn_update
-  name: az peering asn update
-  summary: Update peer asn.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The peer ASN name.
-    description: ''
-  - name: --emails
-    summary: The list of email addresses.
-    description: ''
-  - name: --peer-asn
-    summary: The Autonomous System Number (ASN) of the peer.
-    description: ''
-  - name: --peer-name
-    summary: The name of the peer.
-    description: ''
-  - name: --phone
-    summary: The list of contact numbers.
-    description: ''
-  - name: --validation-state
-    parameterValueGroup: Approved, Failed, None, Pending
-    summary: The validation state of the ASN associated with the peer.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_asn_create
-  name: az peering asn create
-  summary: Create peer ASN.
-- uid: ext_peering_az_peering_asn_delete
-  name: az peering asn delete
-  summary: Delete peer ASN.
-- uid: ext_peering_az_peering_asn_list
-  name: az peering asn list
-  summary: List peer asn.
-- uid: ext_peering_az_peering_asn_show
-  name: az peering asn show
-  summary: Show peer asn.
-- uid: ext_peering_az_peering_asn_update
-  name: az peering asn update
-  summary: Update peer asn.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peer asn.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/legacy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/legacy.yml
deleted file mode 100644
index 5ab1fd4c29..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/legacy.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_legacy
-  name: az peering legacy
-  summary: Commands to manage legacy peering.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_legacy_list
-- uid: ext_peering_az_peering_legacy_list
-  name: az peering legacy list
-  summary: List legacy peering.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --kind
-    summary: The kind of the peering.
-    description: ''
-  - name: --peering-location
-    summary: The location of the peering.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_legacy_list
-  name: az peering legacy list
-  summary: List legacy peering.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage legacy peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/location.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/location.yml
deleted file mode 100644
index 0e2ec04bb2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/location.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_location
-  name: az peering location
-  summary: Commands to manage peering location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_location_list
-- uid: ext_peering_az_peering_location_list
-  name: az peering location list
-  summary: List peering location.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --direct-peering-type
-    summary: The type of direct peering.
-    description: ''
-  - name: --kind
-    summary: The kind of the peering.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_location_list
-  name: az peering location list
-  summary: List peering location.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service.yml
deleted file mode 100644
index 73b898086b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service.yml
+++ /dev/null
@@ -1,191 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service
-  name: az peering service
-  summary: Commands to manage peering service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_create
-  - ext_peering_az_peering_service_delete
-  - ext_peering_az_peering_service_list
-  - ext_peering_az_peering_service_show
-  - ext_peering_az_peering_service_update
-- uid: ext_peering_az_peering_service_create
-  name: az peering service create
-  summary: Create peering service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a  peering service
-    syntax:
-      content: >-
-        az peering service create --resource-group "MyResourceGroup" --name "MyPeeringService" \
-
-        --peering-service-location "state1" --peering-service-provider "serviceProvider1" \
-
-        --location "eastus"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --peering-service-location
-    summary: The PeeringServiceLocation of the Customer.
-    description: ''
-  - isRequired: true
-    name: --peering-service-provider
-    summary: The MAPS Provider Name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_peering_az_peering_service_delete
-  name: az peering service delete
-  summary: Delete peering service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a peering service
-    syntax:
-      content: az peering service delete --resource-group "MyResourceGroup" --name "MyPeeringService"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_list
-  name: az peering service list
-  summary: List peering service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_show
-  name: az peering service show
-  summary: Show peering service.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_update
-  name: az peering service update
-  summary: Update peering service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update peering service tags
-    syntax:
-      content: az peering service update --resource-group "MyResourceGroup" --name "MyPeeringService"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --peering-service-location
-    summary: The PeeringServiceLocation of the Customer.
-    description: ''
-  - name: --peering-service-provider
-    summary: The MAPS Provider Name.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_peering_az_peering_service_create
-  name: az peering service create
-  summary: Create peering service.
-- uid: ext_peering_az_peering_service_delete
-  name: az peering service delete
-  summary: Delete peering service.
-- uid: ext_peering_az_peering_service_list
-  name: az peering service list
-  summary: List peering service.
-- uid: ext_peering_az_peering_service_location
-  name: az peering service location
-  summary: Commands to manage peering service location.
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-- uid: ext_peering_az_peering_service_prefix
-  name: az peering service prefix
-  summary: Commands to manage prefix.
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-- uid: ext_peering_az_peering_service_provider
-  name: az peering service provider
-  summary: Commands to manage peering service provider.
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-- uid: ext_peering_az_peering_service_show
-  name: az peering service show
-  summary: Show peering service.
-- uid: ext_peering_az_peering_service_update
-  name: az peering service update
-  summary: Update peering service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/location.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/location.yml
deleted file mode 100644
index c015df73f9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/location.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service_location
-  name: az peering service location
-  summary: Commands to manage peering service location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_location_list
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_peering_az_peering_service_location_list
-  name: az peering service location list
-  summary: List peering service location.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering service location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/prefix.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/prefix.yml
deleted file mode 100644
index 80948eef8c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/prefix.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service_prefix
-  name: az peering service prefix
-  summary: Commands to manage prefix.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_prefix_create
-  - ext_peering_az_peering_service_prefix_delete
-  - ext_peering_az_peering_service_prefix_list
-  - ext_peering_az_peering_service_prefix_show
-  - ext_peering_az_peering_service_prefix_update
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a prefix for the peering service
-    syntax:
-      content: >-
-        az peering service prefix create --resource-group "MyResourceGroup" \
-
-        --peering-service-name "MyPeeringService" --name "MyPeeringServicePrefix" --prefix \
-
-        "192.168.1.0/24"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --prefix
-    summary: The prefix from which your traffic originates.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a prefix associated with the peering service
-    syntax:
-      content: >-
-        az peering service prefix delete --resource-group "MyResourceGroup" \
-
-        --peering-service-name "MyPeeringService" --name "MyPeeringServicePrefix"
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --prefix-name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: The properties to be expanded.
-    description: ''
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name
-    summary: The name of the prefix.
-    description: ''
-  - isRequired: true
-    name: --peering-service-name
-    summary: The name of the peering service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --prefix
-    summary: The prefix from which your traffic originates.
-    description: ''
-commands:
-- uid: ext_peering_az_peering_service_prefix_create
-  name: az peering service prefix create
-  summary: Create prefix.
-- uid: ext_peering_az_peering_service_prefix_delete
-  name: az peering service prefix delete
-  summary: Delete prefix.
-- uid: ext_peering_az_peering_service_prefix_list
-  name: az peering service prefix list
-  summary: List prefix.
-- uid: ext_peering_az_peering_service_prefix_show
-  name: az peering service prefix show
-  summary: Show prefix.
-- uid: ext_peering_az_peering_service_prefix_update
-  name: az peering service prefix update
-  summary: Update prefix.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage prefix.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/provider.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/provider.yml
deleted file mode 100644
index d742800675..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/peering/peering/service/provider.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_peering_az_peering_service_provider
-  name: az peering service provider
-  summary: Commands to manage peering service provider.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_peering_az_peering_service_provider_list
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-commands:
-- uid: ext_peering_az_peering_service_provider_list
-  name: az peering service provider list
-  summary: List peering service provider.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage peering service provider.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/portal/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/portal/index.yml
deleted file mode 100644
index 711d1fe975..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/portal/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_portal_az
-  name: portal
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_portal_az_portal
-  name: az portal
-  summary: ''
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal.yml
deleted file mode 100644
index 58bd3cca91..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_portal_az_portal
-  name: az portal
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_portal_az_portal_dashboard
-  name: az portal dashboard
-  summary: Manage portal dashboards.
-- uid: ext_portal_az_portal_dashboard_create
-  name: az portal dashboard create
-  summary: Creates or updates a dashboard.
-- uid: ext_portal_az_portal_dashboard_delete
-  name: az portal dashboard delete
-  summary: Deletes a dashboard.
-- uid: ext_portal_az_portal_dashboard_import
-  name: az portal dashboard import
-  summary: Imports a dashboard from a JSON file.
-- uid: ext_portal_az_portal_dashboard_list
-  name: az portal dashboard list
-  summary: Lists the dashboards within a subscription or resource group.
-- uid: ext_portal_az_portal_dashboard_show
-  name: az portal dashboard show
-  summary: Gets details for a single dashboard.
-- uid: ext_portal_az_portal_dashboard_update
-  name: az portal dashboard update
-  summary: Updates an existing dashboard.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal/dashboard.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal/dashboard.yml
deleted file mode 100644
index 09f2605403..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/portal/portal/dashboard.yml
+++ /dev/null
@@ -1,193 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_portal_az_portal_dashboard
-  name: az portal dashboard
-  summary: Manage portal dashboards.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_portal_az_portal_dashboard_create
-  - ext_portal_az_portal_dashboard_delete
-  - ext_portal_az_portal_dashboard_import
-  - ext_portal_az_portal_dashboard_list
-  - ext_portal_az_portal_dashboard_show
-  - ext_portal_az_portal_dashboard_update
-- uid: ext_portal_az_portal_dashboard_create
-  name: az portal dashboard create
-  summary: Creates or updates a dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create or update a Dashboard
-    syntax:
-      content: >-
-        az portal dashboard create --location "eastus" --name "testDashboard" \
-
-        --resource-group "testRG" --input-path "/src/json/properties.json" \
-
-        --tags aKey=aValue anotherKey=anotherValue
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The path to the dashboard properties JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_portal_az_portal_dashboard_delete
-  name: az portal dashboard delete
-  summary: Deletes a dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Dashboard
-    syntax:
-      content: az portal dashboard delete --name "testDashboard" --resource-group "testRG"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_import
-  name: az portal dashboard import
-  summary: Imports a dashboard from a JSON file.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import a Dashboard
-    syntax:
-      content: >-
-        az portal dashboard import --name "testDashboard" --resource-group "testRG" \
-
-        --input-path "/src/json/dashboard.json"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The path to the dashboard json file.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-  - name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_list
-  name: az portal dashboard list
-  summary: Lists the dashboards within a subscription or resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all dashboards in a resourceGroup
-    syntax:
-      content: az portal dashboard list --resource-group "testRG"
-  - summary: List all dashboards in a subscription
-    syntax:
-      content: az portal dashboard list
-  parameters:
-  - name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_show
-  name: az portal dashboard show
-  summary: Gets details for a single dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Dashboard
-    syntax:
-      content: az portal dashboard show --name "testDashboard" --resource-group "testRG"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_portal_az_portal_dashboard_update
-  name: az portal dashboard update
-  summary: Updates an existing dashboard.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a Dashboard
-    syntax:
-      content: >-
-        az portal dashboard update --name "testDashboard" --resource-group "testRG" \
-
-        --input-path "/src/json/properties.json"
-  parameters:
-  - isRequired: true
-    name: --input-path
-    summary: The path to the dashboard properties JSON file.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the dashboard.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: The name of the resource group.
-    description: ''
-commands:
-- uid: ext_portal_az_portal_dashboard_create
-  name: az portal dashboard create
-  summary: Creates or updates a dashboard.
-- uid: ext_portal_az_portal_dashboard_delete
-  name: az portal dashboard delete
-  summary: Deletes a dashboard.
-- uid: ext_portal_az_portal_dashboard_import
-  name: az portal dashboard import
-  summary: Imports a dashboard from a JSON file.
-- uid: ext_portal_az_portal_dashboard_list
-  name: az portal dashboard list
-  summary: Lists the dashboards within a subscription or resource group.
-- uid: ext_portal_az_portal_dashboard_show
-  name: az portal dashboard show
-  summary: Gets details for a single dashboard.
-- uid: ext_portal_az_portal_dashboard_update
-  name: az portal dashboard update
-  summary: Updates an existing dashboard.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage portal dashboards.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/index.yml
deleted file mode 100644
index 10da212586..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_powerbidedicated_az
-  name: powerbidedicated
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_powerbidedicated_az_powerbi
-  name: az powerbi
-  summary: Manage PowerBI resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi.yml
deleted file mode 100644
index 7564c3526f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_powerbidedicated_az_powerbi
-  name: az powerbi
-  summary: Manage PowerBI resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-  name: az powerbi embedded-capacity
-  summary: Manage PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  name: az powerbi embedded-capacity create
-  summary: Create a new PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  name: az powerbi embedded-capacity delete
-  summary: Delete the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  name: az powerbi embedded-capacity list
-  summary: List all the embedded capacities for the given resource group.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  name: az powerbi embedded-capacity show
-  summary: Get details about the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  name: az powerbi embedded-capacity update
-  summary: Update the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-  name: az powerbi embedded-capacity wait
-  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage PowerBI resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml
deleted file mode 100644
index 9fbadbb006..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/powerbidedicated/powerbi/embedded-capacity.yml
+++ /dev/null
@@ -1,255 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-  name: az powerbi embedded-capacity
-  summary: Manage PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  - ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  name: az powerbi embedded-capacity create
-  summary: Create a new PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new PowerBI embedded capacity.
-    syntax:
-      content: >-
-        az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
-
-        --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
-
-        "azsdktest@microsoft.com" "azsdktest2@microsoft.com"
-  - summary: Create a new PowerBI embedded capacity without waiting.
-    syntax:
-      content: >-
-        az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
-
-        --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
-
-        "azsdktest@microsoft.com" "azsdktest2@microsoft.com" --no-wait
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    parameterValueGroup: A1, A2, A3, A4, A5, A6
-    summary: Name of the SKU level. For more information, please refer to <a href="https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/">https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/</a>.
-    description: ''
-  - name: --administration-members
-    summary: An array of administrator user identities.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: PBIE_Azure
-    summary: The name of the Azure pricing tier to which the SKU applies.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  name: az powerbi embedded-capacity delete
-  summary: Delete the specified PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a capacity in specified resource group.
-    syntax:
-      content: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest"
-  - summary: Delete a capacity in specified resource group without prompt.
-    syntax:
-      content: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" -y
-  - summary: Delete a capacity in specified resource group without waiting.
-    syntax:
-      content: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" --no-wait
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  name: az powerbi embedded-capacity list
-  summary: List all the embedded capacities for the given resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List capacities in resource group
-    syntax:
-      content: az powerbi embedded-capacity list --resource-group "TestRG"
-  - summary: List all capacities in default subscription.
-    syntax:
-      content: az powerbi embedded-capacity list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  name: az powerbi embedded-capacity show
-  summary: Get details about the specified PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details of a capacity
-    syntax:
-      content: az powerbi embedded-capacity show --resource-group "TestRG" --name "azsdktest"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  name: az powerbi embedded-capacity update
-  summary: Update the specified PowerBI embedded capacity.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update sku name for the specified PowerBI embedded capacity.
-    syntax:
-      content: az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" --sku-name "A1"
-  - summary: Update administrator members the specified PowerBI embedded capacity without waiting.
-    syntax:
-      content: >-
-        az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" \
-
-        --sku-name "A1" --administration-members "azsdktest3@microsoft.com" --no-wait
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --administration-members
-    summary: An array of administrator user identities.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: A1, A2, A3, A4, A5, A6
-    summary: Name of the SKU level. For more information, please refer to <a href="https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/">https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/</a>.
-    description: ''
-  - name: --sku-tier
-    parameterValueGroup: PBIE_Azure
-    summary: The name of the Azure pricing tier to which the SKU applies.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-  name: az powerbi embedded-capacity wait
-  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until the powerbi embedded capacity is created.
-    syntax:
-      content: az powerbi embedded-capacity wait --resource-group "TestRG" --name "azsdktest" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-  name: az powerbi embedded-capacity create
-  summary: Create a new PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-  name: az powerbi embedded-capacity delete
-  summary: Delete the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-  name: az powerbi embedded-capacity list
-  summary: List all the embedded capacities for the given resource group.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-  name: az powerbi embedded-capacity show
-  summary: Get details about the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-  name: az powerbi embedded-capacity update
-  summary: Update the specified PowerBI embedded capacity.
-- uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-  name: az powerbi embedded-capacity wait
-  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage PowerBI embedded capacity.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/index.yml
deleted file mode 100644
index b598bf0edd..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az
-  name: privatedns
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network.yml
deleted file mode 100644
index c0db043a32..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network.yml
+++ /dev/null
@@ -1,257 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-- uid: ext_privatedns_az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: ext_privatedns_az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns.yml
deleted file mode 100644
index c50dc6c724..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns.yml
+++ /dev/null
@@ -1,254 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: ext_privatedns_az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS domains in Azure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/link.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/link.yml
deleted file mode 100644
index 027e46a330..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/link.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS links.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/link/vnet.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/link/vnet.yml
deleted file mode 100644
index b937a1a9d2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/link/vnet.yml
+++ /dev/null
@@ -1,261 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_link_vnet_create
-  - ext_privatedns_az_network_private_dns_link_vnet_delete
-  - ext_privatedns_az_network_private_dns_link_vnet_list
-  - ext_privatedns_az_network_private_dns_link_vnet_show
-  - ext_privatedns_az_network_private_dns_link_vnet_update
-  - ext_privatedns_az_network_private_dns_link_vnet_wait
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: >-
-        az network private-dns link vnet create -g MyResourceGroup -n MyLinkName -z www.mysite.com \
-            -v MyVirtualNetworkId -e False
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --registration-enabled -e
-    parameterValueGroup: false, true
-    summary: Specify if the link is registration enabled.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --virtual-network -v
-    summary: Name or ID of the virtual network.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-  description: In case of a registration virtual network, all auto-registered DNS records in the zone for the virtual network will also be deleted. This operation cannot be undone.
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: az network private-dns link vnet delete -g MyResourceGroup -z www.mysite.com -n MyLinkName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the virtual network link to the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List virtual network links to the specified Private DNS zone in a resource group.
-    syntax:
-      content: az network private-dns link vnet list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --top
-    summary: The maximum number of virtual network links to return. If not specified, returns up to 100 virtual network links.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a virtual network link to the specified Private DNS zone..
-    syntax:
-      content: az network private-dns link vnet show -g MyResourceGroup -n MyLinkName -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a virtual network link properties to enable registration.
-    syntax:
-      content: az network private-dns link vnet update -g MyResourceGroup -n MyLinkName -z www.mysite.com -e True
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the virtual network link to the Private DNS zone.
-    description: Omit this value to always overwrite the current virtual network link. Specify the last-seen ETag value to prevent accidentally overwritting any concurrent changes.
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --registration-enabled -e
-    parameterValueGroup: false, true
-    summary: Specify if the link is registration enabled.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the virtual network link to the specified Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns link vnet wait -g MyResourceGroup -n MyLinkName -z www.mysite.com --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the virtual network link to the specified Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual network links to the specified Private DNS zone.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set.yml
deleted file mode 100644
index cd95830d57..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set.yml
+++ /dev/null
@@ -1,228 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_list
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all "@" record sets within this zone.
-    syntax:
-      content: >-
-        az network private-dns record-set list -g MyResourceGroup -z www.mysite.com \
-            --query "[?name=='@']"
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS records and record sets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/a.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/a.yml
deleted file mode 100644
index f3f9beedc4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/a.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_a_add_record
-  - ext_privatedns_az_network_private_dns_record_set_a_create
-  - ext_privatedns_az_network_private_dns_record_set_a_delete
-  - ext_privatedns_az_network_private_dns_record_set_a_list
-  - ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_a_show
-  - ext_privatedns_az_network_private_dns_record_set_a_update
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an A record.
-    syntax:
-      content: >-
-        az network private-dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
-  - isRequired: true
-    name: --ipv4-address -a
-    summary: IPV4 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty A record set.
-    syntax:
-      content: az network private-dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an A record set and all associated records.
-    syntax:
-      content: az network private-dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all A record sets in a zone.
-    syntax:
-      content: az network private-dns record-set a list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an A record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
-  - isRequired: true
-    name: --ipv4-address -a
-    summary: IPV4 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an A record set.
-    syntax:
-      content: az network private-dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an A record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a update -g MyResourceGroup -n MyRecordSet \
-            -z www.mysite.com --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS A records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/aaaa.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/aaaa.yml
deleted file mode 100644
index 9fc503d211..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/aaaa.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  - ext_privatedns_az_network_private_dns_record_set_aaaa_update
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an AAAA record.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
-  - isRequired: true
-    name: --ipv6-address -a
-    summary: IPV6 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an AAAA record set and all associated records.
-    syntax:
-      content: az network private-dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all AAAA record sets in a zone.
-    syntax:
-      content: az network private-dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an AAAA record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
-  - isRequired: true
-    name: --ipv6-address -a
-    summary: IPV6 address in string notation.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an AAAA record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS AAAA records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/cname.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/cname.yml
deleted file mode 100644
index 5e727c8afe..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/cname.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_cname_create
-  - ext_privatedns_az_network_private_dns_record_set_cname_delete
-  - ext_privatedns_az_network_private_dns_record_set_cname_list
-  - ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  - ext_privatedns_az_network_private_dns_record_set_cname_show
-  - ext_privatedns_az_network_private_dns_record_set_cname_update
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a CNAME record set and its associated record.
-    syntax:
-      content: az network private-dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the CNAME record set in a zone.
-    syntax:
-      content: az network private-dns record-set cname list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a CNAME record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
-  - isRequired: true
-    name: --cname -c
-    summary: Canonical name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the value of a CNAME record.
-    syntax:
-      content: >-
-        az network private-dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
-  - isRequired: true
-    name: --cname -c
-    summary: Canonical name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a CNAME record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS CNAME records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/mx.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/mx.yml
deleted file mode 100644
index 998c2c9d4e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/mx.yml
+++ /dev/null
@@ -1,267 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  - ext_privatedns_az_network_private_dns_record_set_mx_create
-  - ext_privatedns_az_network_private_dns_record_set_mx_delete
-  - ext_privatedns_az_network_private_dns_record_set_mx_list
-  - ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_mx_show
-  - ext_privatedns_az_network_private_dns_record_set_mx_update
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an MX record.
-    syntax:
-      content: >-
-        az network private-dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
-  - isRequired: true
-    name: --exchange -e
-    summary: Exchange metric.
-    description: ''
-  - isRequired: true
-    name: --preference -p
-    summary: Preference metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty MX record set.
-    syntax:
-      content: az network private-dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an MX record set and all associated records.
-    syntax:
-      content: az network private-dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all MX record sets in a zone.
-    syntax:
-      content: az network private-dns record-set mx list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an MX record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
-  - isRequired: true
-    name: --exchange -e
-    summary: Exchange metric.
-    description: ''
-  - isRequired: true
-    name: --preference -p
-    summary: Preference metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an MX record set.
-    syntax:
-      content: az network private-dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an MX record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS MX records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/ptr.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/ptr.yml
deleted file mode 100644
index 8f3d4318c0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/ptr.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  - ext_privatedns_az_network_private_dns_record_set_ptr_create
-  - ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  - ext_privatedns_az_network_private_dns_record_set_ptr_list
-  - ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_ptr_show
-  - ext_privatedns_az_network_private_dns_record_set_ptr_update
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a PTR record.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
-  - isRequired: true
-    name: --ptrdname -d
-    summary: PTR target domain name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a PTR record set and all associated records.
-    syntax:
-      content: az network private-dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all PTR record sets in a zone.
-    syntax:
-      content: az network private-dns record-set ptr list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a PTR record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
-  - isRequired: true
-    name: --ptrdname -d
-    summary: PTR target domain name.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a PTR record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS PTR records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/soa.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/soa.yml
deleted file mode 100644
index 4b187748d8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/soa.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_soa_show
-  - ext_privatedns_az_network_private_dns_record_set_soa_update
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an SOA record.
-    syntax:
-      content: az network private-dns record-set soa show -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update properties of an SOA record.
-    syntax:
-      content: >-
-        az network private-dns record-set soa update -g MyResourceGroup -z www.mysite.com \
-            -e myhostmaster.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --email -e
-    summary: Email address.
-    description: ''
-  - name: --expire-time -x
-    summary: Expire time (seconds).
-    description: ''
-  - name: --minimum-ttl -m
-    summary: Minimum TTL (time-to-live, seconds).
-    description: ''
-  - name: --refresh-time -f
-    summary: Refresh value (seconds).
-    description: ''
-  - name: --retry-time -r
-    summary: Retry time (seconds).
-    description: ''
-  - name: --serial-number -s
-    summary: Serial number.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS SOA record.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/srv.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/srv.yml
deleted file mode 100644
index d97ca440b9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/srv.yml
+++ /dev/null
@@ -1,285 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  - ext_privatedns_az_network_private_dns_record_set_srv_create
-  - ext_privatedns_az_network_private_dns_record_set_srv_delete
-  - ext_privatedns_az_network_private_dns_record_set_srv_list
-  - ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_srv_show
-  - ext_privatedns_az_network_private_dns_record_set_srv_update
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an SRV record.
-    syntax:
-      content: >-
-        az network private-dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
-  - isRequired: true
-    name: --port -r
-    summary: Service port.
-    description: ''
-  - isRequired: true
-    name: --priority -p
-    summary: Priority metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --target -t
-    summary: Target domain name.
-    description: ''
-  - isRequired: true
-    name: --weight -w
-    summary: Weight metric.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv create -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an SRV record set and all associated records.
-    syntax:
-      content: az network private-dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all SRV record sets in a zone.
-    syntax:
-      content: az network private-dns record-set srv list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove an SRV record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
-  - isRequired: true
-    name: --port -r
-    summary: Service port.
-    description: ''
-  - isRequired: true
-    name: --priority -p
-    summary: Priority metric.
-    description: ''
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --target -t
-    summary: Target domain name.
-    description: ''
-  - isRequired: true
-    name: --weight -w
-    summary: Weight metric.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of an SRV record set.
-    syntax:
-      content: az network private-dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update an SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS SRV records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/txt.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/txt.yml
deleted file mode 100644
index bd68aece07..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/record-set/txt.yml
+++ /dev/null
@@ -1,259 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  - ext_privatedns_az_network_private_dns_record_set_txt_create
-  - ext_privatedns_az_network_private_dns_record_set_txt_delete
-  - ext_privatedns_az_network_private_dns_record_set_txt_list
-  - ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  - ext_privatedns_az_network_private_dns_record_set_txt_show
-  - ext_privatedns_az_network_private_dns_record_set_txt_update
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a TXT record.
-    syntax:
-      content: >-
-        az network private-dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --value -v
-    summary: Space-separated list of text values which will be concatenated together.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an empty TXT record set.
-    syntax:
-      content: az network private-dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --ttl
-    defaultValue: "3600"
-    summary: Record set TTL (time-to-live).
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a TXT record set and all associated records.
-    syntax:
-      content: az network private-dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all TXT record sets in a zone.
-    syntax:
-      content: az network private-dns record-set txt list -g MyResourceGroup -z www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-  description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a TXT record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --record-set-name -n
-    summary: The name of the record set relative to the zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --value -v
-    summary: Space-separated list of text values which will be concatenated together.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --keep-empty-record-set
-    summary: Keep the empty record set if the last record is removed.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get the details of a TXT record set.
-    syntax:
-      content: az network private-dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a TXT record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the record set, relative to the name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --zone-name -z
-    summary: The name of the Private DNS zone.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwritting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS TXT records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/zone.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/zone.yml
deleted file mode 100644
index dca2a22f90..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/privatedns/network/private-dns/zone.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_privatedns_az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_privatedns_az_network_private_dns_zone_create
-  - ext_privatedns_az_network_private_dns_zone_delete
-  - ext_privatedns_az_network_private_dns_zone_list
-  - ext_privatedns_az_network_private_dns_zone_show
-  - ext_privatedns_az_network_private_dns_zone_update
-  - ext_privatedns_az_network_private_dns_zone_wait
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone create -g MyResourceGroup -n www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-  description: All DNS records in the zone will also be deleted. This operation cannot be undone. Private DNS zone cannot be deleted unless all virtual network links to it are removed.
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone delete -g MyResourceGroup -n www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Private DNS zones in a resource group.
-    syntax:
-      content: az network private-dns zone list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone show -g MyResourceGroup -n www.mysite.com
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a Private DNS zone properties to change the user-defined value of a previously set tag.
-    syntax:
-      content: az network private-dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the Private DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen ETag value to prevent accidentally overwritting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns zone wait -g MyResourceGroup -n www.mysite.com --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Private DNS zone.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_privatedns_az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: ext_privatedns_az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: ext_privatedns_az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: ext_privatedns_az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Private DNS zones.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph.yml
deleted file mode 100644
index ccd741af6c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_resource-graph_az_graph
-  name: az graph
-  summary: Query the resources managed by Azure Resource Manager.
-  description: Run 'az graph query --help' for detailed help.
-  langs:
-  - azurecli
-  children:
-  - ext_resource-graph_az_graph_query
-- uid: ext_resource-graph_az_graph_query
-  name: az graph query
-  summary: Query the resources managed by Azure Resource Manager.
-  description: See <a href="https://aka.ms/AzureResourceGraph-QueryLanguage">https://aka.ms/AzureResourceGraph-QueryLanguage</a> to learn more about query language and browse examples.
-  langs:
-  - azurecli
-  examples:
-  - summary: Query resources requesting a subset of resource fields.
-    syntax:
-      content: az graph query -q "project id, name, type, location, tags"
-  - summary: Query resources with field selection, filtering and summarizing.
-    syntax:
-      content: az graph query -q "project id, type, location | where type =~ 'Microsoft.Compute/virtualMachines' | summarize count() by location | top 3 by count_"
-  - summary: Request a subset of results, skipping 20 items and getting the next 10.
-    syntax:
-      content: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --first 10 --skip 20
-  - summary: Choose subscriptions to query.
-    syntax:
-      content: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --subscriptions 11111111-1111-1111-1111-111111111111, 22222222-2222-2222-2222-222222222222
-  parameters:
-  - isRequired: true
-    name: --graph-query --q -q
-    summary: Resource Graph query to execute.
-    description: ''
-  - name: --first
-    defaultValue: "100"
-    summary: 'The maximum number of objects to return. Accepted range: 1-5000.'
-    description: ''
-  - name: --include
-    summary: 'Indicates if result should be extended with subscription and tenants names. Possible values: none, displayNames.'
-    description: ''
-  - name: --skip
-    summary: Ignores the first N objects and then gets the remaining objects.
-    description: ''
-  - name: --subscriptions -s
-    summary: List of subscriptions to run query against. By default all accessible subscriptions are queried.
-    description: ''
-commands:
-- uid: ext_resource-graph_az_graph_query
-  name: az graph query
-  summary: Query the resources managed by Azure Resource Manager.
-- uid: ext_resource-graph_az_graph_shared_query
-  name: az graph shared-query
-  summary: Manage shared query of Azure resource graph.
-- uid: ext_resource-graph_az_graph_shared_query_create
-  name: az graph shared-query create
-  summary: Create a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_delete
-  name: az graph shared-query delete
-  summary: Delete a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_list
-  name: az graph shared-query list
-  summary: List all shared query in a resource group.
-- uid: ext_resource-graph_az_graph_shared_query_show
-  name: az graph shared-query show
-  summary: Show the properties of a shared query.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Run 'az graph query --help' for detailed help.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml
deleted file mode 100644
index 98ed8a3652..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/graph/shared-query.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_resource-graph_az_graph_shared_query
-  name: az graph shared-query
-  summary: Manage shared query of Azure resource graph.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_resource-graph_az_graph_shared_query_create
-  - ext_resource-graph_az_graph_shared_query_delete
-  - ext_resource-graph_az_graph_shared_query_list
-  - ext_resource-graph_az_graph_shared_query_show
-- uid: ext_resource-graph_az_graph_shared_query_create
-  name: az graph shared-query create
-  summary: Create a shared query.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a shared query requesting a subset of resource fields.
-    syntax:
-      content: az graph shared-query create -g MyResourceGroup -n MySharedQuery -q "project id, name, type, location, tags" -d "requesting a subset of resource fields." --tags key=value
-  parameters:
-  - isRequired: true
-    name: --description -d
-    summary: Description of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --graph-query --q -q
-    summary: Resource Graph query to execute.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_resource-graph_az_graph_shared_query_delete
-  name: az graph shared-query delete
-  summary: Delete a shared query.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_resource-graph_az_graph_shared_query_list
-  name: az graph shared-query list
-  summary: List all shared query in a resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all shared query in a resource group.
-    syntax:
-      content: az graph shared-query list -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_resource-graph_az_graph_shared_query_show
-  name: az graph shared-query show
-  summary: Show the properties of a shared query.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the graph shared query.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_resource-graph_az_graph_shared_query_create
-  name: az graph shared-query create
-  summary: Create a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_delete
-  name: az graph shared-query delete
-  summary: Delete a shared query.
-- uid: ext_resource-graph_az_graph_shared_query_list
-  name: az graph shared-query list
-  summary: List all shared query in a resource group.
-- uid: ext_resource-graph_az_graph_shared_query_show
-  name: az graph shared-query show
-  summary: Show the properties of a shared query.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage shared query of Azure resource graph.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/index.yml
deleted file mode 100644
index 7b091fe685..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/resource-graph/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_resource-graph_az
-  name: resource-graph
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_resource-graph_az_graph
-  name: az graph
-  summary: Query the resources managed by Azure Resource Manager.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/hanainstance.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/hanainstance.yml
deleted file mode 100644
index c53acf83f1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/hanainstance.yml
+++ /dev/null
@@ -1,208 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az_hanainstance
-  name: az hanainstance
-  summary: (PREVIEW) Manage Azure SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_sap-hana_az_hanainstance_create
-  - ext_sap-hana_az_hanainstance_delete
-  - ext_sap-hana_az_hanainstance_list
-  - ext_sap-hana_az_hanainstance_restart
-  - ext_sap-hana_az_hanainstance_show
-  - ext_sap-hana_az_hanainstance_shutdown
-  - ext_sap-hana_az_hanainstance_start
-  - ext_sap-hana_az_hanainstance_update
-- uid: ext_sap-hana_az_hanainstance_create
-  name: az hanainstance create
-  summary: Create a new SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --ip-address
-    summary: IP address to connect to the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: Location of the SAP HANA instance. Default is the location of target resource group.
-    description: ''
-  - isRequired: true
-    name: --os-computer-name
-    summary: OS computer name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --partner-node-id
-    summary: ARM ID of a HANA Instance on the network to connect the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --ssh-public-key
-    summary: SSH public key to connect to the SAP HANA instance.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_delete
-  name: az hanainstance delete
-  summary: Delete a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_list
-  name: az hanainstance list
-  summary: List SAP HANA Instances.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_restart
-  name: az hanainstance restart
-  summary: Restart a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_show
-  name: az hanainstance show
-  summary: Get the details of a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_shutdown
-  name: az hanainstance shutdown
-  summary: Shutdown a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_start
-  name: az hanainstance start
-  summary: Start a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_hanainstance_update
-  name: az hanainstance update
-  summary: Update the Tags field of a SAP HANA Instance.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --instance-name -n
-    summary: The name of the SAP HANA instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_sap-hana_az_hanainstance_create
-  name: az hanainstance create
-  summary: Create a new SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_delete
-  name: az hanainstance delete
-  summary: Delete a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_list
-  name: az hanainstance list
-  summary: List SAP HANA Instances.
-- uid: ext_sap-hana_az_hanainstance_restart
-  name: az hanainstance restart
-  summary: Restart a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_show
-  name: az hanainstance show
-  summary: Get the details of a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_shutdown
-  name: az hanainstance shutdown
-  summary: Shutdown a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_start
-  name: az hanainstance start
-  summary: Start a SAP HANA Instance.
-- uid: ext_sap-hana_az_hanainstance_update
-  name: az hanainstance update
-  summary: Update the Tags field of a SAP HANA Instance.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: (PREVIEW) Manage Azure SAP HANA Instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/index.yml
deleted file mode 100644
index b1ce804545..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/index.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az
-  name: sap-hana
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_sap-hana_az_hanainstance
-  name: az hanainstance
-  summary: (PREVIEW) Manage Azure SAP HANA Instance.
-- uid: ext_sap-hana_az_sapmonitor
-  name: az sapmonitor
-  summary: (PREVIEW) Manage Azure SAP Monitor.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor.yml
deleted file mode 100644
index 8f4e984a33..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az_sapmonitor
-  name: az sapmonitor
-  summary: (PREVIEW) Manage Azure SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_sap-hana_az_sapmonitor_create
-  - ext_sap-hana_az_sapmonitor_delete
-  - ext_sap-hana_az_sapmonitor_list
-  - ext_sap-hana_az_sapmonitor_show
-  - ext_sap-hana_az_sapmonitor_update
-- uid: ext_sap-hana_az_sapmonitor_create
-  name: az sapmonitor create
-  summary: Create a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hana-subnet --hdbsn
-    summary: ARM ID of an Azure Subnet with access to the HANA instance.
-    description: ''
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --region
-    summary: The region to create this SAP monitor on.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --dca --disable_customer_analytics
-    summary: Disable sending analytics to Microsoft.
-    description: ''
-  - name: --hana-db-name --hdb
-    summary: Name of the database itself.
-    description: ''
-  - name: --hana-db-password --hdbpw
-    summary: Password for the HANA database to login for monitoring.
-    description: ''
-  - name: --hana-db-password-key-vault-url --hdpkvu
-    summary: URL to the KeyVault secret that contains the HANA credentials.
-    description: ''
-  - name: --hana-db-sql-port --hdbp
-    summary: The port number of the tenant DB. Used to connect to the DB.
-    description: ''
-  - name: --hana-db-username --hdbun
-    summary: Username for the HANA database to login to for monitoring.
-    description: ''
-  - name: --hana-hostname --hdbhn
-    summary: Hostname of the HANA Instance blade.
-    description: ''
-  - name: --key-vault-id --kvi
-    summary: Key Vault ID containing the HANA credentials.
-    description: ''
-  - name: --lawsid --log-analytics-workspace-arm-id
-    summary: Existing log analytics workspace id to use for log monitoring.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_delete
-  name: az sapmonitor delete
-  summary: Delete a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_list
-  name: az sapmonitor list
-  summary: List SAP Monitors.
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-- uid: ext_sap-hana_az_sapmonitor_show
-  name: az sapmonitor show
-  summary: Get the details of a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_update
-  name: az sapmonitor update
-  summary: Updates the tags field of a SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_sap-hana_az_sapmonitor_create
-  name: az sapmonitor create
-  summary: Create a SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_delete
-  name: az sapmonitor delete
-  summary: Delete a SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_list
-  name: az sapmonitor list
-  summary: List SAP Monitors.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance
-  name: az sapmonitor provider-instance
-  summary: Manage the provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-  name: az sapmonitor provider-instance create
-  summary: Create a new provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-  name: az sapmonitor provider-instance delete
-  summary: Delete a provider instance from the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-  name: az sapmonitor provider-instance list
-  summary: List provider instances for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-  name: az sapmonitor provider-instance show
-  summary: Get the details of a provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_show
-  name: az sapmonitor show
-  summary: Get the details of a SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_update
-  name: az sapmonitor update
-  summary: Updates the tags field of a SAP Monitor.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: (PREVIEW) Manage Azure SAP Monitor.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml
deleted file mode 100644
index e35b1d56dc..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/sap-hana/sapmonitor/provider-instance.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_sap-hana_az_sapmonitor_provider_instance
-  name: az sapmonitor provider-instance
-  summary: Manage the provider instance for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_sap-hana_az_sapmonitor_provider_instance_create
-  - ext_sap-hana_az_sapmonitor_provider_instance_delete
-  - ext_sap-hana_az_sapmonitor_provider_instance_list
-  - ext_sap-hana_az_sapmonitor_provider_instance_show
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-  name: az sapmonitor provider-instance create
-  summary: Create a new provider instance for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-name
-    summary: The name of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-properties
-    summary: The properties of the provider instance (Should be of JSON format).
-    description: ''
-  - isRequired: true
-    name: --provider-instance-type
-    summary: The type of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --provider-instance-metadata
-    summary: The metadata of the provider instance (Should be of JSON format).
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-  name: az sapmonitor provider-instance delete
-  summary: Delete a provider instance from the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-name
-    summary: The name of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-  name: az sapmonitor provider-instance list
-  summary: List provider instances for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-  name: az sapmonitor provider-instance show
-  summary: Get the details of a provider instance for the SAP Monitor.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --monitor-name -n
-    summary: The name of the SAP monitor.
-    description: ''
-  - isRequired: true
-    name: --provider-instance-name
-    summary: The name of the provider instance.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-  name: az sapmonitor provider-instance create
-  summary: Create a new provider instance for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-  name: az sapmonitor provider-instance delete
-  summary: Delete a provider instance from the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-  name: az sapmonitor provider-instance list
-  summary: List provider instances for the SAP Monitor.
-- uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-  name: az sapmonitor provider-instance show
-  summary: Get the details of a provider instance for the SAP Monitor.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the provider instance for the SAP Monitor.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/index.yml
deleted file mode 100644
index 6a3ee5e2bb..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az
-  name: spring-cloud
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_spring-cloud_az_spring_cloud
-  name: az spring-cloud
-  summary: Commands to manage Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml
deleted file mode 100644
index 5f183abd81..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud.yml
+++ /dev/null
@@ -1,337 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud
-  name: az spring-cloud
-  summary: Commands to manage Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_create
-  - ext_spring-cloud_az_spring_cloud_delete
-  - ext_spring-cloud_az_spring_cloud_list
-  - ext_spring-cloud_az_spring_cloud_show
-  - ext_spring-cloud_az_spring_cloud_update
-- uid: ext_spring-cloud_az_spring_cloud_create
-  name: az spring-cloud create
-  summary: Create an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new Azure Spring Cloud in westus.
-    syntax:
-      content: az spring-cloud create -n MyService -g MyResourceGroup -l westus
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    summary: Name of SKU, the value is "Basic" or "Standard".
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_delete
-  name: az spring-cloud delete
-  summary: Delete an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_list
-  name: az spring-cloud list
-  summary: List all Azure Spring Cloud in the given resource group, otherwise list the subscription's.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_show
-  name: az spring-cloud show
-  summary: Show the details for an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_update
-  name: az spring-cloud update
-  summary: Update pricing tier of an Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update pricing tier.
-    syntax:
-      content: az spring-cloud update -n MyService --sku Standard -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    summary: Name of SKU, the value is "Basic" or "Standard".
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app
-  name: az spring-cloud app
-  summary: Commands to manage apps in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding
-  name: az spring-cloud app binding
-  summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-- uid: ext_spring-cloud_az_spring_cloud_app_create
-  name: az spring-cloud app create
-  summary: Create a new app with a default deployment in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-  name: az spring-cloud app custom-domain
-  summary: Commands to manage custom domains.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_delete
-  name: az spring-cloud app delete
-  summary: Delete an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_deploy
-  name: az spring-cloud app deploy
-  summary: Deploy source code or pre-built binary to an app and update related configurations.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment
-  name: az spring-cloud app deployment
-  summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity
-  name: az spring-cloud app identity
-  summary: Manage an app's managed service identity.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-- uid: ext_spring-cloud_az_spring_cloud_app_list
-  name: az spring-cloud app list
-  summary: List all apps in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_log
-  name: az spring-cloud app log
-  summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_logs
-  name: az spring-cloud app logs
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_restart
-  name: az spring-cloud app restart
-  summary: Restart instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_scale
-  name: az spring-cloud app scale
-  summary: Manually scale an app or its deployments.
-- uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-  name: az spring-cloud app set-deployment
-  summary: Set production deployment of an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_show
-  name: az spring-cloud app show
-  summary: Show the details of an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  name: az spring-cloud app show-deploy-log
-  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_start
-  name: az spring-cloud app start
-  summary: Start instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_stop
-  name: az spring-cloud app stop
-  summary: Stop instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_update
-  name: az spring-cloud app update
-  summary: Update configurations of an app.
-- uid: ext_spring-cloud_az_spring_cloud_certificate
-  name: az spring-cloud certificate
-  summary: Commands to manage certificates.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_add
-  name: az spring-cloud certificate add
-  summary: Add a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_list
-  name: az spring-cloud certificate list
-  summary: List all certificates in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-  name: az spring-cloud certificate remove
-  summary: Remove a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_show
-  name: az spring-cloud certificate show
-  summary: Show a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server
-  name: az spring-cloud config-server
-  summary: Commands to manage Config Server in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-  name: az spring-cloud config-server clear
-  summary: Erase all settings in Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git
-  name: az spring-cloud config-server git
-  summary: Commands to manage Config Server git property in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_set
-  name: az spring-cloud config-server set
-  summary: Set Config Server from a yaml file.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_show
-  name: az spring-cloud config-server show
-  summary: Show Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_create
-  name: az spring-cloud create
-  summary: Create an Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_delete
-  name: az spring-cloud delete
-  summary: Delete an Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_list
-  name: az spring-cloud list
-  summary: List all Azure Spring Cloud in the given resource group, otherwise list the subscription's.
-- uid: ext_spring-cloud_az_spring_cloud_show
-  name: az spring-cloud show
-  summary: Show the details for an Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-  name: az spring-cloud test-endpoint
-  summary: Commands to manage test endpoint in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  name: az spring-cloud test-endpoint disable
-  summary: Disable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  name: az spring-cloud test-endpoint enable
-  summary: Enable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  name: az spring-cloud test-endpoint list
-  summary: List test endpoint keys of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-  name: az spring-cloud test-endpoint renew-key
-  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_update
-  name: az spring-cloud update
-  summary: Update pricing tier of an Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml
deleted file mode 100644
index 6dcf8b495d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app.yml
+++ /dev/null
@@ -1,600 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app
-  name: az spring-cloud app
-  summary: Commands to manage apps in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_create
-  - ext_spring-cloud_az_spring_cloud_app_delete
-  - ext_spring-cloud_az_spring_cloud_app_deploy
-  - ext_spring-cloud_az_spring_cloud_app_list
-  - ext_spring-cloud_az_spring_cloud_app_logs
-  - ext_spring-cloud_az_spring_cloud_app_restart
-  - ext_spring-cloud_az_spring_cloud_app_scale
-  - ext_spring-cloud_az_spring_cloud_app_set_deployment
-  - ext_spring-cloud_az_spring_cloud_app_show
-  - ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  - ext_spring-cloud_az_spring_cloud_app_start
-  - ext_spring-cloud_az_spring_cloud_app_stop
-  - ext_spring-cloud_az_spring_cloud_app_update
-- uid: ext_spring-cloud_az_spring_cloud_app_create
-  name: az spring-cloud app create
-  summary: Create a new app with a default deployment in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an app with the default configuration.
-    syntax:
-      content: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup
-  - summary: Create an public accessible app with 3 instances and 2 cpu cores and 3 GB of memory per instance.
-    syntax:
-      content: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup --is-public true --cpu 2 --memory 3 --instance-count 3
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --assign-identity
-    parameterValueGroup: false, true
-    summary: If true, assign managed service identity.
-    description: ''
-  - name: --cpu
-    defaultValue: "1"
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --enable-persistent-storage
-    parameterValueGroup: false, true
-    summary: If true, mount a 50G disk with default path.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --instance-count
-    defaultValue: "1"
-    summary: Number of instance.
-    description: ''
-  - name: --is-public
-    parameterValueGroup: false, true
-    summary: If true, assign public domain.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --memory
-    defaultValue: "1"
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_delete
-  name: az spring-cloud app delete
-  summary: Delete an app in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deploy
-  name: az spring-cloud app deploy
-  summary: Deploy source code or pre-built binary to an app and update related configurations.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy source code to an app. This will pack current directory, build binary with Pivotal Build Service and then deploy to the app.
-    syntax:
-      content: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup
-  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
-    syntax:
-      content: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
-  - summary: Deploy source code to a specific deployment of an app.
-    syntax:
-      content: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --cpu
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --instance-count
-    summary: Number of instance.
-    description: ''
-  - name: --jar-path
-    summary: If provided, deploy jar, otherwise deploy current folder as tar.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --memory
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-  - name: --target-module
-    summary: Child module to be deployed, required for multiple jar packages built from source code.
-    description: ''
-  - name: --version
-    summary: Deployment version, keep unchanged if not set.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_list
-  name: az spring-cloud app list
-  summary: List all apps in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Query status of persistent storage of all apps
-    syntax:
-      content: az spring-cloud app list -s MyCluster -g MyResourceGroup -o json --query '[].{Name:name, PersistentStorage:properties.persistentDisk}'
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_logs
-  name: az spring-cloud app logs
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --follow  -f
-    summary: Specify if the logs should be streamed.
-    description: ''
-  - name: --instance -i
-    summary: Name of an existing instance of the deployment.
-    description: ''
-  - name: --limit
-    defaultValue: "2048"
-    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
-    description: ''
-  - name: --lines
-    defaultValue: "50"
-    summary: Number of lines to show. Maximum is 10000.
-    description: ''
-  - name: --since
-    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_restart
-  name: az spring-cloud app restart
-  summary: Restart instances of the app, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_scale
-  name: az spring-cloud app scale
-  summary: Manually scale an app or its deployments.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Scale up an app to 4 cpu cores and 8 Gb of memory per instance.
-    syntax:
-      content: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup --cpu 3 --memory 8
-  - summary: Scale out a deployment of the app to 5 instances.
-    syntax:
-      content: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment --instance-count 5
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --cpu
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --instance-count
-    summary: Number of instance.
-    description: ''
-  - name: --memory
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-  name: az spring-cloud app set-deployment
-  summary: Set production deployment of an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Swap a staging deployment of an app to production.
-    syntax:
-      content: az spring-cloud app set-deployment -d green-deployment -n MyApp -s MyCluster -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --deployment -d
-    summary: Name of an existing deployment of the app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_show
-  name: az spring-cloud app show
-  summary: Show the details of an app in the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  name: az spring-cloud app show-deploy-log
-  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_start
-  name: az spring-cloud app start
-  summary: Start instances of the app, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_stop
-  name: az spring-cloud app stop
-  summary: Stop instances of the app, default to production deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_update
-  name: az spring-cloud app update
-  summary: Update configurations of an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add an environment variable for the app.
-    syntax:
-      content: az spring-cloud app update -n MyApp -s MyCluster -g MyResourceGroup --env foo=bar
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-  - name: --enable-persistent-storage
-    parameterValueGroup: false, true
-    summary: If true, mount a 50G disk with default path.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --https-only
-    parameterValueGroup: false, true
-    summary: If true, access app via https.
-    description: ''
-  - name: --is-public
-    parameterValueGroup: false, true
-    summary: If true, assign endpoint.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding
-  name: az spring-cloud app binding
-  summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-- uid: ext_spring-cloud_az_spring_cloud_app_create
-  name: az spring-cloud app create
-  summary: Create a new app with a default deployment in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-  name: az spring-cloud app custom-domain
-  summary: Commands to manage custom domains.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_delete
-  name: az spring-cloud app delete
-  summary: Delete an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_deploy
-  name: az spring-cloud app deploy
-  summary: Deploy source code or pre-built binary to an app and update related configurations.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment
-  name: az spring-cloud app deployment
-  summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity
-  name: az spring-cloud app identity
-  summary: Manage an app's managed service identity.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-- uid: ext_spring-cloud_az_spring_cloud_app_list
-  name: az spring-cloud app list
-  summary: List all apps in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_log
-  name: az spring-cloud app log
-  summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_logs
-  name: az spring-cloud app logs
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-- uid: ext_spring-cloud_az_spring_cloud_app_restart
-  name: az spring-cloud app restart
-  summary: Restart instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_scale
-  name: az spring-cloud app scale
-  summary: Manually scale an app or its deployments.
-- uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-  name: az spring-cloud app set-deployment
-  summary: Set production deployment of an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_show
-  name: az spring-cloud app show
-  summary: Show the details of an app in the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-  name: az spring-cloud app show-deploy-log
-  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_start
-  name: az spring-cloud app start
-  summary: Start instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_stop
-  name: az spring-cloud app stop
-  summary: Stop instances of the app, default to production deployment.
-- uid: ext_spring-cloud_az_spring_cloud_app_update
-  name: az spring-cloud app update
-  summary: Update configurations of an app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage apps in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml
deleted file mode 100644
index 9096e3f355..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding
-  name: az spring-cloud app binding
-  summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_list
-  - ext_spring-cloud_az_spring_cloud_app_binding_remove
-  - ext_spring-cloud_az_spring_cloud_app_binding_show
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-  name: az spring-cloud app binding list
-  summary: List all service bindings in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-  name: az spring-cloud app binding remove
-  summary: Remove a service binding of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-  name: az spring-cloud app binding show
-  summary: Show the details of a service binding.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml
deleted file mode 100644
index d6e142f11a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/cosmos.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-  name: az spring-cloud app binding cosmos
-  summary: Commands to manage Azure Cosmos DB bindings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  - ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Bind an Azure Cosmos DB.
-    syntax:
-      content: az spring-cloud app binding cosmos add -n cosmosProduction --app MyApp --resource-id ${COSMOSDB_ID} --api-type mongo --database mymongo -g MyResourceGroup -s MyService
-  parameters:
-  - isRequired: true
-    name: --api-type
-    parameterValueGroup: cassandra, gremlin, mongo, sql, table
-    summary: Type of API.
-    description: ''
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Azure resource ID of the service to bind with.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --collection-name
-    summary: Name of collection. Required for gremlin.
-    description: ''
-  - name: --database-name
-    summary: Name of database. Required for mongo, sql, gremlin.
-    description: ''
-  - name: --key-space
-    summary: Cassandra key space. Required for cassandra.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --collection-name
-    summary: Name of collection. Required for gremlin.
-    description: ''
-  - name: --database-name
-    summary: Name of database. Required for mongo, sql, gremlin.
-    description: ''
-  - name: --key-space
-    summary: Cassandra key space. Required for cassandra.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-  name: az spring-cloud app binding cosmos add
-  summary: Bind an Azure Cosmos DB with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-  name: az spring-cloud app binding cosmos update
-  summary: Update an Azure Cosmos DB service binding of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Cosmos DB bindings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml
deleted file mode 100644
index 364dca8274..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/mysql.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-  name: az spring-cloud app binding mysql
-  summary: Commands to manage Azure Database for MySQL bindings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  - ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --database-name
-    summary: Database name.
-    description: ''
-  - isRequired: true
-    name: --key
-    summary: API key of the service.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Azure resource ID of the service to bind with.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - isRequired: true
-    name: --username
-    summary: Username of the database.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --database-name
-    summary: Database name.
-    description: ''
-  - name: --key
-    summary: API key of the service.
-    description: ''
-  - name: --username
-    summary: Username of the database.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-  name: az spring-cloud app binding mysql add
-  summary: Bind an Azure Database for MySQL with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-  name: az spring-cloud app binding mysql update
-  summary: Update an Azure Database for MySQL service binding of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Database for MySQL bindings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml
deleted file mode 100644
index e81e83505d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/binding/redis.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-  name: az spring-cloud app binding redis
-  summary: Commands to manage Azure Cache for Redis bindings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  - ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-id
-    summary: Azure resource ID of the service to bind with.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --disable-ssl
-    summary: Disable SSL.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of service binding.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --disable-ssl
-    summary: Disable SSL.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-  name: az spring-cloud app binding redis add
-  summary: Bind an Azure Cache for Redis with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-  name: az spring-cloud app binding redis update
-  summary: Update an Azure Cache for Redis service binding of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure Cache for Redis bindings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml
deleted file mode 100644
index ce19efe1ad..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/custom-domain.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-  name: az spring-cloud app custom-domain
-  summary: Commands to manage custom domains.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  - ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Bind a custom domain to app.
-    syntax:
-      content: az spring-cloud app custom-domain bind --domain-name MyDomainName --certificate MyCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --certificate
-    summary: Certificate name in Azure Spring Cloud.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all custom domains of the app.
-    syntax:
-      content: az spring-cloud app custom-domain list --app MyAppName --service MyCluster --resource-group MyResourceGroup -o table
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Bind custom domain with a specified certificate.
-    syntax:
-      content: az spring-cloud app custom-domain update --domain-name MyDomainName --certificate MCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --domain-name
-    summary: Name of custom domain.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --certificate
-    summary: Certificate name in Azure Spring Cloud.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-  name: az spring-cloud app custom-domain bind
-  summary: Bind a custom domain with the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-  name: az spring-cloud app custom-domain list
-  summary: List all custom domains of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-  name: az spring-cloud app custom-domain show
-  summary: Show details of a custom domain.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-  name: az spring-cloud app custom-domain unbind
-  summary: Unbind a custom-domain of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-  name: az spring-cloud app custom-domain update
-  summary: Update a custom domain of the app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage custom domains.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml
deleted file mode 100644
index 60bb7e6713..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/deployment.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment
-  name: az spring-cloud app deployment
-  summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_deployment_create
-  - ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  - ext_spring-cloud_az_spring_cloud_app_deployment_list
-  - ext_spring-cloud_az_spring_cloud_app_deployment_show
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy source code to a new deployment of an app. This will pack current directory, build binary with Pivotal Build Service and then deploy.
-    syntax:
-      content: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup
-  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
-    syntax:
-      content: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of deployment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --cpu
-    defaultValue: "1"
-    summary: Number of virtual cpu cores per instance.
-    description: ''
-  - name: --env
-    summary: Space-separated environment variables in 'key[=value]' format.
-    description: ''
-  - name: --instance-count
-    defaultValue: "1"
-    summary: Number of instance.
-    description: ''
-  - name: --jar-path
-    summary: If provided, deploy jar, otherwise deploy current folder as tar.
-    description: ''
-  - name: --jvm-options
-    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
-    description: ''
-  - name: --memory
-    defaultValue: "1"
-    summary: Number of GB of memory per instance.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --runtime-version
-    parameterValueGroup: Java_11, Java_8
-    summary: Runtime version of used language.
-    description: ''
-  - name: --skip-clone-settings
-    summary: Create staging deployment will automatically copy settings from production deployment.
-    description: ''
-  - name: --target-module
-    summary: Child module to be deployed, required for multiple jar packages built from source code.
-    description: ''
-  - name: --version
-    summary: Deployment version, keep unchanged if not set.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of deployment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --app
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of deployment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-  name: az spring-cloud app deployment create
-  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use az spring-cloud app deploy/update --deployment <staging deployment>.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-  name: az spring-cloud app deployment delete
-  summary: Delete a deployment of the app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-  name: az spring-cloud app deployment list
-  summary: List all deployments in an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-  name: az spring-cloud app deployment show
-  summary: Show details of a deployment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml
deleted file mode 100644
index 2be3edadc0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/identity.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_identity
-  name: az spring-cloud app identity
-  summary: Manage an app's managed service identity.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_identity_assign
-  - ext_spring-cloud_az_spring_cloud_app_identity_remove
-  - ext_spring-cloud_az_spring_cloud_app_identity_show
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Enable the system assigned identity.
-    syntax:
-      content: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup
-  - summary: Enable the system assigned identity on an app with the 'Reader' role.
-    syntax:
-      content: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup --role Reader --scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/xxxxx/providers/Microsoft.KeyVault/vaults/xxxxx
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --role
-    summary: Role name or id the managed identity will be assigned.
-    description: ''
-  - name: --scope
-    summary: The scope the managed identity has access to.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove the system assigned identity from an app.
-    syntax:
-      content: az spring-cloud app identity remove -n MyApp -s MyCluster -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Display an app's managed identity info.
-    syntax:
-      content: az spring-cloud app identity show -n MyApp -s MyCluster -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-  name: az spring-cloud app identity assign
-  summary: Enable managed service identity on an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-  name: az spring-cloud app identity remove
-  summary: Remove managed service identity from an app.
-- uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-  name: az spring-cloud app identity show
-  summary: Display app's managed identity info.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage an app's managed service identity.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml
deleted file mode 100644
index 8f17511c53..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/app/log.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_app_log
-  name: az spring-cloud app log
-  summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_app_log_tail
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of app.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - name: --follow  -f
-    summary: Specify if the logs should be streamed.
-    description: ''
-  - name: --instance -i
-    summary: Name of an existing instance of the deployment.
-    description: ''
-  - name: --limit
-    defaultValue: "2048"
-    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
-    description: ''
-  - name: --lines
-    defaultValue: "50"
-    summary: Number of lines to show. Maximum is 10000.
-    description: ''
-  - name: --since
-    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-  name: az spring-cloud app log tail
-  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml
deleted file mode 100644
index bf1be964c6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/certificate.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_certificate
-  name: az spring-cloud certificate
-  summary: Commands to manage certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_certificate_add
-  - ext_spring-cloud_az_spring_cloud_certificate_list
-  - ext_spring-cloud_az_spring_cloud_certificate_remove
-  - ext_spring-cloud_az_spring_cloud_certificate_show
-- uid: ext_spring-cloud_az_spring_cloud_certificate_add
-  name: az spring-cloud certificate add
-  summary: Add a certificate in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Import certificate from key vault.
-    syntax:
-      content: az spring-cloud certificate add --name MyCertName --vault-uri MyKeyVaultUri --vault-certificate-name MyKeyVaultCertName --service MyCluster --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of certificate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-  - isRequired: true
-    name: --vault-certificate-name
-    summary: The certificate name in key vault.
-    description: ''
-  - isRequired: true
-    name: --vault-uri
-    summary: The key vault uri where store the certificate.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_certificate_list
-  name: az spring-cloud certificate list
-  summary: List all certificates in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all certificates in spring cloud service.
-    syntax:
-      content: az spring-cloud certificate list --service MyCluster --resource-group MyResourceGroup -o table
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-  name: az spring-cloud certificate remove
-  summary: Remove a certificate in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of certificate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_certificate_show
-  name: az spring-cloud certificate show
-  summary: Show a certificate in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of certificate.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --service -s
-    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_certificate_add
-  name: az spring-cloud certificate add
-  summary: Add a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_list
-  name: az spring-cloud certificate list
-  summary: List all certificates in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-  name: az spring-cloud certificate remove
-  summary: Remove a certificate in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_certificate_show
-  name: az spring-cloud certificate show
-  summary: Show a certificate in Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml
deleted file mode 100644
index 7fdad1263e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_config_server
-  name: az spring-cloud config-server
-  summary: Commands to manage Config Server in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_config_server_clear
-  - ext_spring-cloud_az_spring_cloud_config_server_set
-  - ext_spring-cloud_az_spring_cloud_config_server_show
-- uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-  name: az spring-cloud config-server clear
-  summary: Erase all settings in Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_set
-  name: az spring-cloud config-server set
-  summary: Set Config Server from a yaml file.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --config-file
-    summary: A yaml file path for the configuration of Spring Cloud config server.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_show
-  name: az spring-cloud config-server show
-  summary: Show Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-  name: az spring-cloud config-server clear
-  summary: Erase all settings in Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git
-  name: az spring-cloud config-server git
-  summary: Commands to manage Config Server git property in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_set
-  name: az spring-cloud config-server set
-  summary: Set Config Server from a yaml file.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_show
-  name: az spring-cloud config-server show
-  summary: Show Config Server.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Config Server in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml
deleted file mode 100644
index 797f3abdd7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git
-  name: az spring-cloud config-server git
-  summary: Commands to manage Config Server git property in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_config_server_git_set
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --uri
-    summary: Uri of the added config.
-    description: ''
-  - name: --host-key
-    summary: Host key of the added config.
-    description: ''
-  - name: --host-key-algorithm
-    summary: Host key algorithm of the added config.
-    description: ''
-  - name: --label
-    summary: Label of the added config.
-    description: ''
-  - name: --password
-    summary: Password of the added config.
-    description: ''
-  - name: --private-key
-    summary: Private_key of the added config.
-    description: ''
-  - name: --search-paths
-    summary: Search_paths of the added config, use , as delimiter for multiple paths.
-    description: ''
-  - name: --strict-host-key-checking
-    summary: Strict_host_key_checking of the added config.
-    description: ''
-  - name: --username
-    summary: Username of the added config.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-  name: az spring-cloud config-server git set
-  summary: Set git property of Config Server, will totally override the old one.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Config Server git property in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml
deleted file mode 100644
index b4786699b3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/config-server/git/repo.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-  name: az spring-cloud config-server git repo
-  summary: Commands to manage Config Server git repository in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  - ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --repo-name
-    summary: Uri of the repo.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --uri
-    summary: Uri of the added config.
-    description: ''
-  - name: --host-key
-    summary: Host key of the added config.
-    description: ''
-  - name: --host-key-algorithm
-    summary: Host key algorithm of the added config.
-    description: ''
-  - name: --label
-    summary: Label of the added config.
-    description: ''
-  - name: --password
-    summary: Password of the added config.
-    description: ''
-  - name: --pattern
-    summary: Pattern of the repo, use , as delimiter for multiple patterns.
-    description: ''
-  - name: --private-key
-    summary: Private_key of the added config.
-    description: ''
-  - name: --search-paths
-    summary: Search_paths of the added config, use , as delimiter for multiple paths.
-    description: ''
-  - name: --strict-host-key-checking
-    summary: Strict_host_key_checking of the added config.
-    description: ''
-  - name: --username
-    summary: Username of the added config.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --repo-name
-    summary: Uri of the repo.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --repo-name
-    summary: Uri of the repo.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --host-key
-    summary: Host key of the added config.
-    description: ''
-  - name: --host-key-algorithm
-    summary: Host key algorithm of the added config.
-    description: ''
-  - name: --label
-    summary: Label of the added config.
-    description: ''
-  - name: --password
-    summary: Password of the added config.
-    description: ''
-  - name: --pattern
-    summary: Pattern of the repo, use , as delimiter for multiple patterns.
-    description: ''
-  - name: --private-key
-    summary: Private_key of the added config.
-    description: ''
-  - name: --search-paths
-    summary: Search_paths of the added config, use , as delimiter for multiple paths.
-    description: ''
-  - name: --strict-host-key-checking
-    summary: Strict_host_key_checking of the added config.
-    description: ''
-  - name: --uri
-    summary: Uri of the added config.
-    description: ''
-  - name: --username
-    summary: Username of the added config.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-  name: az spring-cloud config-server git repo add
-  summary: Set add a new repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-  name: az spring-cloud config-server git repo list
-  summary: List all repositries of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-  name: az spring-cloud config-server git repo remove
-  summary: Remove an existing repositry of git property of Config Server.
-- uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-  name: az spring-cloud config-server git repo update
-  summary: Override an existing repositry of git property of Config Server, will totally override the old one.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Config Server git repository in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml
deleted file mode 100644
index 3ca88fcf36..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/spring-cloud/spring-cloud/test-endpoint.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-  name: az spring-cloud test-endpoint
-  summary: Commands to manage test endpoint in Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  - ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  name: az spring-cloud test-endpoint disable
-  summary: Disable test endpoint of the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  name: az spring-cloud test-endpoint enable
-  summary: Enable test endpoint of the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  name: az spring-cloud test-endpoint list
-  summary: List test endpoint keys of the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --app
-    summary: Name of app.
-    description: ''
-  - name: --deployment -d
-    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
-    description: ''
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-  name: az spring-cloud test-endpoint renew-key
-  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of Azure Spring Cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --type
-    parameterValueGroup: Primary, Secondary
-    summary: Type of test-endpoint key.
-    description: ''
-commands:
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-  name: az spring-cloud test-endpoint disable
-  summary: Disable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-  name: az spring-cloud test-endpoint enable
-  summary: Enable test endpoint of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-  name: az spring-cloud test-endpoint list
-  summary: List test endpoint keys of the Azure Spring Cloud.
-- uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-  name: az spring-cloud test-endpoint renew-key
-  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage test endpoint in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/index.yml
deleted file mode 100644
index b26a31b676..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az
-  name: storage-or-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-or-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage.yml
deleted file mode 100644
index 688bf830f5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-or-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-- uid: ext_storage-or-preview_az_storage_account_or_policy
-  name: az storage account or-policy
-  summary: Manage storage account Object Replication Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Cloud Storage resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account.yml
deleted file mode 100644
index 55ef4eaf54..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-or-preview_az_storage_account_or_policy
-  name: az storage account or-policy
-  summary: Manage storage account Object Replication Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy.yml
deleted file mode 100644
index 4c67dbc086..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy.yml
+++ /dev/null
@@ -1,228 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage_account_or_policy
-  name: az storage account or-policy
-  summary: Manage storage account Object Replication Policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-or-preview_az_storage_account_or_policy_create
-  - ext_storage-or-preview_az_storage_account_or_policy_delete
-  - ext_storage-or-preview_az_storage_account_or_policy_list
-  - ext_storage-or-preview_az_storage_account_or_policy_show
-  - ext_storage-or-preview_az_storage_account_or_policy_update
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create Object Replication Service Policy for storage account.
-    syntax:
-      content: az storage account or-policy create -g ResourceGroupName -n storageAccountName -d destAccountName -s srcAccountName --destination-container dcont --source-container scont
-  - summary: Create Object Replication Service Policy trough json file for storage account.
-    syntax:
-      content: az storage account or-policy create -g ResourceGroupName -n storageAccountName --policy @policy.json
-  - summary: Create Object Replication Service Policy to source storage account through policy associated with destination storage account.
-    syntax:
-      content: az storage account or-policy show -g ResourceGroupName -n destAccountName --policy-id "3496e652-4cea-4581-b2f7-c86b3971ba92" | az storage account or-policy create -g ResourceGroupName -n srcAccountName -p "@-"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --destination-account -d
-    summary: The destination storage account name. Required when no --policy provided.
-    description: ''
-  - name: --policy -p
-    summary: The object replication policy definition between two storage accounts, in JSON format. Multiple rules can be defined in one policy.
-    description: ''
-  - name: --policy-id
-    defaultValue: default
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - name: --source-account -s
-    summary: The source storage account name. Required when no --policy provided.
-    description: ''
-  - name: --min-creation-time -t
-    summary: "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z."
-    description: ''
-  - name: --prefix-match
-    summary: Optional. Filter the results to replicate only blobs whose names begin with the specified prefix.
-    description: ''
-  - name: --destination-container
-    summary: The destination storage container name. Required when no --policy provided.
-    description: ''
-  - name: --rule-id
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-  - name: --source-container
-    summary: The source storage container name. Required when no --policy provided.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete Object Replication Service Policy associated with the specified storage account.
-    syntax:
-      content: az storage account or-policy delete -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List Object Replication Service Policies associated with the specified storage account.
-    syntax:
-      content: az storage account or-policy list -g ResourceGroupName -n StorageAccountName
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties of specified Object Replication Service Policy for storage account.
-    syntax:
-      content: az storage account or-policy show -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update source storage account in Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy update -g ResourceGroupName -n StorageAccountName --source-account newSourceAccount --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  - summary: Update Object Replication Service Policy through json file.
-    syntax:
-      content: az storage account or-policy update -g ResourceGroupName -n StorageAccountName -p @policy.json
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --destination-account -d
-    summary: The destination storage account name. Required when no --policy provided.
-    description: ''
-  - name: --policy -p
-    summary: The object replication policy definition between two storage accounts, in JSON format. Multiple rules can be defined in one policy.
-    description: ''
-  - name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - name: --source-account -s
-    summary: The source storage account name. Required when no --policy provided.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-or-preview_az_storage_account_or_policy_create
-  name: az storage account or-policy create
-  summary: Create Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-  name: az storage account or-policy delete
-  summary: Delete specified Object Replication Service Policy associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_list
-  name: az storage account or-policy list
-  summary: List Object Replication Service Policies associated with the specified storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_show
-  name: az storage account or-policy show
-  summary: Show the properties of specified Object Replication Service Policy for storage account.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_update
-  name: az storage account or-policy update
-  summary: Update Object Replication Service Policy properties for storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account Object Replication Policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy/rule.yml
deleted file mode 100644
index 5625f201b5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-or-preview/storage/account/or-policy/rule.yml
+++ /dev/null
@@ -1,199 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-  name: az storage account or-policy rule
-  summary: Manage Object Replication Service Policy Rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  - ext_storage-or-preview_az_storage_account_or_policy_rule_update
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add rule to the specified Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule add -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" -d destContainer -s srcContainer
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --destination-container -d
-    summary: The destination storage container name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --source-container -s
-    summary: The source storage container name.
-    description: ''
-  - name: --min-creation-time -t
-    summary: "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z."
-    description: ''
-  - name: --prefix-match
-    summary: Optional. Filter the results to replicate only blobs whose names begin with the specified prefix.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all the rules in the specified Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule list -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove the specified rule from the specified Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule remove -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" --rule-id "78746d86-d3b7-4397-a99c-0837e6741332"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-id -r
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties of specified rule in Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule show -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" --rule-id "78746d86-d3b7-4397-a99c-0837e6741332"
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-id -r
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update rule properties to Object Replication Service Policy.
-    syntax:
-      content: az storage account or-policy rule update -g ResourceGroupName -n StorageAccountName --policy-id "04344ea7-aa3c-4846-bfb9-e908e32d3bf8" --rule-id "78746d86-d3b7-4397-a99c-0837e6741332" --prefix-match blobA blobB
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --policy-id
-    summary: The ID of object replication policy or "default" if the policy ID is unknown.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-id -r
-    summary: Rule Id is auto-generated for each new rule on destination account. It is required for put policy on source account.
-    description: ''
-  - name: --destination-container -d
-    summary: The destination storage container name.
-    description: ''
-  - name: --source-container -s
-    summary: The source storage container name.
-    description: ''
-  - name: --min-creation-time -t
-    summary: "Blobs created after the time will be replicated to the destination. It must be in datetime format 'yyyy-MM-ddTHH:mm:ssZ'. Example: 2020-02-19T16:05:00Z."
-    description: ''
-  - name: --prefix-match
-    summary: Optional. Filter the results to replicate only blobs whose names begin with the specified prefix.
-    description: ''
-commands:
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-  name: az storage account or-policy rule add
-  summary: Add rule to the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-  name: az storage account or-policy rule list
-  summary: List all the rules in the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-  name: az storage account or-policy rule remove
-  summary: Remove the specified rule from the specified Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-  name: az storage account or-policy rule show
-  summary: Show the properties of specified rule in Object Replication Service Policy.
-- uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-  name: az storage account or-policy rule update
-  summary: Update rule properties to Object Replication Service Policy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Object Replication Service Policy Rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/index.yml
deleted file mode 100644
index e6bc277fa3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az
-  name: storage-preview
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage.yml
deleted file mode 100644
index e3b5299507..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storage-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-- uid: ext_storage-preview_az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: ext_storage-preview_az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: ext_storage-preview_az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: ext_storage-preview_az_storage_account_failover
-  name: az storage account failover
-  summary: Failover request can be triggered for a storage account in case of availability issues.
-- uid: ext_storage-preview_az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: ext_storage-preview_az_storage_account_management_policy
-  name: az storage account management-policy
-  summary: Manage storage account management policies.
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_network_rule
-  name: az storage account network-rule
-  summary: Manage network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-- uid: ext_storage-preview_az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: ext_storage-preview_az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-- uid: ext_storage-preview_az_storage_account_update
-  name: az storage account update
-  summary: Update the properties of a storage account.
-- uid: ext_storage-preview_az_storage_azcopy
-  name: az storage azcopy
-  summary: '[EXPERIMENTAL] Manage storage operations utilizing AzCopy.'
-- uid: ext_storage-preview_az_storage_azcopy_blob
-  name: az storage azcopy blob
-  summary: Manage object storage for unstructured data (blobs) using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_run_command
-  name: az storage azcopy run-command
-  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
-- uid: ext_storage-preview_az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-- uid: ext_storage-preview_az_storage_blob_access
-  name: az storage blob access
-  summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_directory
-  name: az storage blob directory
-  summary: Manage blob directories in storage account container.
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-- uid: ext_storage-preview_az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: ext_storage-preview_az_storage_blob_move
-  name: az storage blob move
-  summary: Move a blob in a storage container.
-- uid: ext_storage-preview_az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Cloud Storage resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account.yml
deleted file mode 100644
index 502033ce8d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account.yml
+++ /dev/null
@@ -1,363 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_check_name
-  - ext_storage-preview_az_storage_account_create
-  - ext_storage-preview_az_storage_account_delete
-  - ext_storage-preview_az_storage_account_failover
-  - ext_storage-preview_az_storage_account_list
-  - ext_storage-preview_az_storage_account_show
-  - ext_storage-preview_az_storage_account_show_usage
-  - ext_storage-preview_az_storage_account_update
-- uid: ext_storage-preview_az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-  description: The SKU of the storage account defaults to 'Standard_RAGRS'.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a storage account 'MyStorageAccount' in resource group 'MyResourceGroup' in the West US region with locally redundant storage.
-    syntax:
-      content: az storage account create -n MyStorageAccount -g MyResourceGroup -l westus --sku Standard_LRS
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --access-tier
-    parameterValueGroup: Cool, Hot
-    summary: The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. It is required for StandardBlob accounts during creation.
-    description: ''
-  - name: --assign-identity
-    summary: Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.
-    description: ''
-  - name: --custom-domain
-    summary: User domain assigned to the storage account. Name is the CNAME source.
-    description: ''
-  - name: --encryption-services
-    parameterValueGroup: blob, file, queue, table
-    summary: Specifies which service(s) to encrypt.
-    description: ''
-  - name: --hierarchical-namespace
-    parameterValueGroup: false, true
-    summary: Allows the blob service to exhibit filesystem semantics.
-    description: ''
-  - name: --https-only
-    parameterValueGroup: false, true
-    summary: Allows https traffic only to storage service.
-    description: ''
-  - name: --kind
-    defaultValue: Storage
-    parameterValueGroup: BlobStorage, BlockBlobStorage, FileStorage, Storage, StorageV2
-    summary: Indicates the type of storage account.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --sku
-    defaultValue: Standard_RAGRS
-    parameterValueGroup: Premium_LRS, Premium_ZRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS
-    summary: The storage account SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, Logging, Metrics, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a storage account using a resource ID.
-    syntax:
-      content: az storage account delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
-  - summary: Delete a storage account using an account name and resource group.
-    syntax:
-      content: az storage account delete -n MyStorageAccount -g MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_failover
-  name: az storage account failover
-  summary: Failover request can be triggered for a storage account in case of availability issues.
-  description: >-
-    The failover occurs from the storage account's primary cluster to secondary cluster for (RA-)GRS/GZRS accounts. The secondary
-
-    cluster will become primary after failover. For more information, please refer to
-
-    <a href="https://docs.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance">https://docs.microsoft.com/en-us/azure/storage/common/storage-disaster-recovery-guidance</a>.
-  langs:
-  - azurecli
-  examples:
-  - summary: Failover a storage account.
-    syntax:
-      content: az storage account failover -n mystorageaccount -g MyResourceGroup
-  - summary: Failover a storage account without waiting for complete.
-    syntax:
-      content: >-
-        az storage account failover -n mystorageaccount -g MyResourceGroup --no-wait
-
-        az storage account show -n mystorageaccount --expand geoReplicationStats
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all storage accounts in a subscription.
-    syntax:
-      content: az storage account list
-  - summary: List all storage accounts in a resource group.
-    syntax:
-      content: az storage account list -g MyResourceGroup
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show properties for a storage account by resource ID.
-    syntax:
-      content: az storage account show --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
-  - summary: Show properties for a storage account using an account name and resource group.
-    syntax:
-      content: az storage account show -g MyResourceGroup -n MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --expand
-    parameterValueGroup: geoReplicationStats
-    summary: May be used to expand the properties within account's properties. By default, data is not included when fetching properties. Currently we only support geoReplicationStats.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the current count and limit of the storage accounts under the subscription. (autogenerated)
-    syntax:
-      content: az storage account show-usage --location westus2
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-- uid: ext_storage-preview_az_storage_account_update
-  name: az storage account update
-  summary: Update the properties of a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --access-tier
-    parameterValueGroup: Cool, Hot
-    summary: The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. It is required for StandardBlob accounts during creation.
-    description: ''
-  - name: --assign-identity
-    summary: Generate and assign a new Storage Account Identity for this storage account for use with key management services like Azure KeyVault.
-    description: ''
-  - name: --custom-domain
-    summary: User domain assigned to the storage account. Name is the CNAME source. Use "" to clear existing value.
-    description: ''
-  - name: --encryption-services
-    parameterValueGroup: blob, file, queue, table
-    summary: Specifies which service(s) to encrypt.
-    description: ''
-  - name: --https-only
-    parameterValueGroup: false, true
-    summary: Allows https traffic only to storage service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Premium_LRS, Premium_ZRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS
-    summary: The storage account SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --use-subdomain
-    parameterValueGroup: false, true
-    summary: Specify whether to use indirect CNAME validation.
-    description: ''
-  - name: --encryption-key-name
-    summary: The name of the KeyVault key.
-    description: ''
-  - name: --encryption-key-source
-    defaultValue: Microsoft.Storage
-    parameterValueGroup: Microsoft.Keyvault, Microsoft.Storage
-    summary: The default encryption service.
-    description: ''
-  - name: --encryption-key-vault
-    summary: The Uri of the KeyVault.
-    description: ''
-  - name: --encryption-key-version
-    summary: The version of the KeyVault key.
-    description: ''
-  - name: --bypass
-    parameterValueGroup: AzureServices, Logging, Metrics, None
-    summary: Bypass traffic for space-separated uses.
-    description: ''
-  - name: --default-action
-    parameterValueGroup: Allow, Deny
-    summary: Default action to apply when no rule matches.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: ext_storage-preview_az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: ext_storage-preview_az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: ext_storage-preview_az_storage_account_failover
-  name: az storage account failover
-  summary: Failover request can be triggered for a storage account in case of availability issues.
-- uid: ext_storage-preview_az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: ext_storage-preview_az_storage_account_management_policy
-  name: az storage account management-policy
-  summary: Manage storage account management policies.
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_network_rule
-  name: az storage account network-rule
-  summary: Manage network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-- uid: ext_storage-preview_az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: ext_storage-preview_az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-- uid: ext_storage-preview_az_storage_account_update
-  name: az storage account update
-  summary: Update the properties of a storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/keys.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/keys.yml
deleted file mode 100644
index d117763e4e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/keys.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_keys_list
-  - ext_storage-preview_az_storage_account_keys_renew
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List the access keys for a storage account.
-    syntax:
-      content: az storage account keys list -g MyResourceGroup -n MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-  description: Kerberos key is generated per storage account for Azure Files identity based authentication either with Azure Active Directory Domain Service (Azure AD DS) or Active Directory Domain Service (AD DS). It is used as the password of the identity registered in the domain service that represents the storage account. Kerberos key does not provide access permission to perform any control or data plane read or write operations against the storage account.
-  langs:
-  - azurecli
-  examples:
-  - summary: Regenerate one of the access keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key primary
-  - summary: Regenerate one of the Kerberos keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key secondary --key-type kerb
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - isRequired: true
-    name: --key
-    parameterValueGroup: primary, secondary
-    summary: The key to regenerate.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: ext_storage-preview_az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/management-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/management-policy.yml
deleted file mode 100644
index 304d109fe6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/management-policy.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account_management_policy
-  name: az storage account management-policy
-  summary: Manage storage account management policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_management_policy_create
-  - ext_storage-preview_az_storage_account_management_policy_delete
-  - ext_storage-preview_az_storage_account_management_policy_show
-  - ext_storage-preview_az_storage_account_management_policy_update
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --policy
-    summary: 'The Storage Account ManagementPolicies Rules, in JSON format. See more details in: <a href="https://docs.microsoft.com/azure/storage/common/storage-lifecycle-managment-concepts">https://docs.microsoft.com/azure/storage/common/storage-lifecycle-managment-concepts</a>.'
-    description: ''
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --account-name
-    summary: The name of the storage account within the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_management_policy_create
-  name: az storage account management-policy create
-  summary: Creates the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_delete
-  name: az storage account management-policy delete
-  summary: Deletes the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_show
-  name: az storage account management-policy show
-  summary: Gets the data policy rules associated with the specified storage account.
-- uid: ext_storage-preview_az_storage_account_management_policy_update
-  name: az storage account management-policy update
-  summary: Updates the data policy rules associated with the specified storage account.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage account management policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml
deleted file mode 100644
index 402a3e4520..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/account/network-rule.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_account_network_rule
-  name: az storage account network-rule
-  summary: Manage network rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_account_network_rule_add
-  - ext_storage-preview_az_storage_account_network_rule_list
-  - ext_storage-preview_az_storage_account_network_rule_remove
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-  description: Rules can be created for an IPv4 address, address range (CIDR format), or a virtual network subnet.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a rule to allow a specific address-range.
-    syntax:
-      content: az storage account network-rule add -g myRg --account-name mystorageaccount --ip-address 23.45.1.0/24
-  - summary: Create a rule to allow access for a subnet.
-    syntax:
-      content: az storage account network-rule add -g myRg --account-name mystorageaccount --vnet-name myvnet --subnet mysubnet
-  - summary: Create a rule to allow access for a subnet in another resource group.
-    syntax:
-      content: az storage account network-rule add -g myRg --account-name mystorageaccount  --subnet $subnetId
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --action
-    defaultValue: Allow
-    summary: The action of virtual network rule.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List network rules. (autogenerated)
-    syntax:
-      content: az storage account network-rule list --account-name MyAccount --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Remove a network rule. (autogenerated)
-    syntax:
-      content: az storage account network-rule remove --account-name MyAccount --resource-group MyResourceGroup --subnet MySubnetID
-  - summary: Remove a network rule. (autogenerated)
-    syntax:
-      content: az storage account network-rule remove --account-name MyAccount --ip-address 23.45.1.0/24 --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --account-name -n
-    summary: The storage account name.
-    description: ''
-  - name: --ip-address
-    summary: IPv4 address or CIDR range.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: Name of a virtual network.
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_account_network_rule_add
-  name: az storage account network-rule add
-  summary: Add a network rule.
-- uid: ext_storage-preview_az_storage_account_network_rule_list
-  name: az storage account network-rule list
-  summary: List network rules.
-- uid: ext_storage-preview_az_storage_account_network_rule_remove
-  name: az storage account network-rule remove
-  summary: Remove a network rule.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage network rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml
deleted file mode 100644
index 7a12530c96..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_azcopy
-  name: az storage azcopy
-  summary: '[EXPERIMENTAL] Manage storage operations utilizing AzCopy.'
-  description: 'Open issues here: <a href="https://github.com/Azure/azure-storage-azcopy">https://github.com/Azure/azure-storage-azcopy</a>.'
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_azcopy_run_command
-- uid: ext_storage-preview_az_storage_azcopy_run_command
-  name: az storage azcopy run-command
-  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: <COMMAND_ARGS>
-    summary: Command to run using azcopy. Please start commands with "azcopy ".
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_azcopy_blob
-  name: az storage azcopy blob
-  summary: Manage object storage for unstructured data (blobs) using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_run_command
-  name: az storage azcopy run-command
-  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: 'Open issues here: <a href="https://github.com/Azure/azure-storage-azcopy">https://github.com/Azure/azure-storage-azcopy</a>.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml
deleted file mode 100644
index 8c5b311804..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/azcopy/blob.yml
+++ /dev/null
@@ -1,220 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_azcopy_blob
-  name: az storage azcopy blob
-  summary: Manage object storage for unstructured data (blobs) using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_azcopy_blob_delete
-  - ext_storage-preview_az_storage_azcopy_blob_download
-  - ext_storage-preview_az_storage_azcopy_blob_sync
-  - ext_storage-preview_az_storage_azcopy_blob_upload
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a single blob from a container.
-    syntax:
-      content: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t TargetBlob
-  - summary: Delete all blobs from a container.
-    syntax:
-      content: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount --recursive
-  - summary: Delete all blobs in a virtual directory.
-    syntax:
-      content: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t "path/to/virtual_directory" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The delete target container.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively delete blobs.
-    description: ''
-  - name: --target -t
-    summary: The delete target path.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Download a single blob from a container.
-    syntax:
-      content: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "path/to/file"
-  - summary: Download a virtual directory from a container.
-    syntax:
-      content: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/virtual_directory" -d "download/path" --recursive
-  - summary: Download the contents of a container onto a local file system.
-    syntax:
-      content: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s * -d "download/path" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The download source container.
-    description: ''
-  - isRequired: true
-    name: --destination -d
-    summary: The destination file path to download to.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively download blobs.
-    description: ''
-  - name: --source -s
-    summary: The download source path.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Sync a single blob to a container.
-    syntax:
-      content: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
-  - summary: Sync a directory to a container.
-    syntax:
-      content: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/directory"
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The sync destination container.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    summary: The source file path to sync from.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --destination -d
-    summary: The sync destination path.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Upload a single blob to a container.
-    syntax:
-      content: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
-  - summary: Upload a directory to a container.
-    syntax:
-      content: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" --recursive
-  - summary: Upload the contents of a directory to a container.
-    syntax:
-      content: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory/*" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The upload destination container.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    summary: The source file path to upload from.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --destination -d
-    summary: The upload destination path.
-    description: ''
-  - name: --recursive -r
-    summary: Recursively upload blobs.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_azcopy_blob_delete
-  name: az storage azcopy blob delete
-  summary: Delete blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_download
-  name: az storage azcopy blob download
-  summary: Download blobs from a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_sync
-  name: az storage azcopy blob sync
-  summary: Sync blobs recursively to a storage blob container using AzCopy.
-- uid: ext_storage-preview_az_storage_azcopy_blob_upload
-  name: az storage azcopy blob upload
-  summary: Upload blobs to a storage blob container using AzCopy.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage object storage for unstructured data (blobs) using AzCopy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob.yml
deleted file mode 100644
index 536a62ebc3..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob.yml
+++ /dev/null
@@ -1,214 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_list
-  - ext_storage-preview_az_storage_blob_move
-- uid: ext_storage-preview_az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all storage blobs in a container whose names start with 'foo'; will match names such as 'foo', 'foobar', and 'foo/bar'
-    syntax:
-      content: az storage blob list -c MyContainer --prefix foo
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --delimiter
-    summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
-    description: ''
-  - name: --include
-    defaultValue: mc
-    summary: 'Specifies additional datasets to include: (c)opy-info, (m)etadata, (s)napshots, (d)eleted-soft. Can be combined.'
-    description: ''
-  - name: --marker
-    summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-    description: ''
-  - name: --num-results
-    defaultValue: "5000"
-    summary: Specifies the maximum number of results to return. Provide "\*" to return all.
-    description: ''
-  - name: --prefix
-    summary: Filters the results to return only blobs whose names begin with the specified prefix.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_move
-  name: az storage blob move
-  summary: Move a blob in a storage container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Move a blob in a storage container.
-    syntax:
-      content: az storage blob move -c MyContainer -d DestinationBlobPath -s SourceBlobPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --destination-blob -d
-    summary: The destination blob name. It should be an absolute path under the container. e.g.'topdir1/dirbar'.
-    description: ''
-  - isRequired: true
-    name: --source-blob -s
-    summary: The source blob name. It should be an absolute path under the container. e.g.'topdir1/dirsubfoo'.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Optional. A lease ID for the new_path. The new_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --source-if-match
-    summary: Optional. An ETag value. Specify this header to perform the rename operation only if the source's ETag matches the value specified.
-    description: ''
-  - name: --source-if-modified-since
-    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has been modified since the specified date and time.
-    description: ''
-  - name: --source-if-none-match
-    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the rename operation only if the source's ETag does not match the value specified.
-    description: ''
-  - name: --source-if-unmodified-since
-    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has not been modified since the specified date and time.
-    description: ''
-  - name: --source-lease-id
-    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_access
-  name: az storage blob access
-  summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_directory
-  name: az storage blob directory
-  summary: Manage blob directories in storage account container.
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-- uid: ext_storage-preview_az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: ext_storage-preview_az_storage_blob_move
-  name: az storage blob move
-  summary: Move a blob in a storage container.
-- uid: ext_storage-preview_az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml
deleted file mode 100644
index 85ebde0b29..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/access.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_access
-  name: az storage blob access
-  summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_access_set
-  - ext_storage-preview_az_storage_blob_access_show
-  - ext_storage-preview_az_storage_blob_access_update
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the access control properties of a blob.
-    syntax:
-      content: az storage blob access set -a "user::rwx,group::r--,other::---" -b MyBlob -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - isRequired: true
-    name: --blob-name -b
-    summary: The blob name.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the access control properties of a blob.
-    syntax:
-      content: az storage blob access show -b MyBlob -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --blob-name -b
-    summary: The blob name.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --user-principle-names
-    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the access permissions of a blob.
-    syntax:
-      content: az storage blob access update --permissions "rwxrwxrwx" -b MyBlob -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning user of a blob.
-    syntax:
-      content: az storage blob access update --owner [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning group of a blob.
-    syntax:
-      content: az storage blob access update --group [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --blob-name -b
-    summary: The blob name.
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --group
-    summary: The owning group for the directory.
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --owner
-    summary: The owning user for the directory.
-    description: ''
-  - name: --permissions
-    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_access_set
-  name: az storage blob access set
-  summary: Set the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_show
-  name: az storage blob access show
-  summary: Show the access control properties of a blob.
-- uid: ext_storage-preview_az_storage_blob_access_update
-  name: az storage blob access update
-  summary: Update the access control properties of a blob.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml
deleted file mode 100644
index 5e117873ad..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory.yml
+++ /dev/null
@@ -1,507 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_directory
-  name: az storage blob directory
-  summary: Manage blob directories in storage account container.
-  description: To use the directory commands, please make sure your storage account type is StorageV2.
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_directory_create
-  - ext_storage-preview_az_storage_blob_directory_delete
-  - ext_storage-preview_az_storage_blob_directory_download
-  - ext_storage-preview_az_storage_blob_directory_exists
-  - ext_storage-preview_az_storage_blob_directory_list
-  - ext_storage-preview_az_storage_blob_directory_move
-  - ext_storage-preview_az_storage_blob_directory_show
-  - ext_storage-preview_az_storage_blob_directory_upload
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-  description: Create a storage blob directory which can contain other directories or blobs in a storage container.
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  - summary: Create a storage blob directory with permissions and umask.
-    syntax:
-      content: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount --permissions rwxrwxrwx --umask 0000
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the directory to be overwritten has an active lease.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --permissions
-    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission. The sticky bit is also supported. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --umask
-    defaultValue: 0027
-    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. The umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. In this way, the resulting permission is given by p & ^u, where p is the permission and u is the umask. Only 4-digit octal notation (e.g. 0022) is supported here.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-  description: This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, then the delete operation can be atomic and instantaneous; if not, the operation is performed in batches and a continuation token could be returned.
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory delete -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --fail-not-exist
-    summary: Specify whether to throw an exception when the directory doesn't exist.
-    description: ''
-  - name: --lease-id
-    summary: Required if the directory has an active lease.
-    description: ''
-  - name: --marker
-    summary: Optional. When deleting a directory without the Hierarchical Namespace, the number of paths that are deleted with each invocation is limited. If the number of paths to be deleted exceeds this limit, a continuation token is returned. When a continuation token is returned, it must be specified in a subsequent invocation of the delete operation to continue deleting the directory.
-    description: ''
-  - name: --recursive
-    summary: If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Download a single blob in a storage blob directory.
-    syntax:
-      content: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "<local-path>"
-  - summary: Download the entire directory in a storage container.
-    syntax:
-      content: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s SourceDirectoryPath -d "<local-path>" --recursive
-  - summary: Download an entire subdirectory of a storage blob directory.
-    syntax:
-      content: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/subdirectory" -d "<local-path>" --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The download source container.
-    description: ''
-  - isRequired: true
-    name: --destination-path -d
-    summary: The destination local directory path to download.
-    description: ''
-  - isRequired: true
-    name: --source-path -s
-    summary: The download source directory path. It should be an absolute path to container.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively download blobs. If enabled, all the blobs including the blobs in subdirectories will be downloaded.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check for the existence of a blob directory in a storage container.
-    syntax:
-      content: az storage blob directory exists -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the snapshot.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List blobs and blob subdirectories in a storage directory.
-    syntax:
-      content: az storage blob directory list -c MyContainer -d DestinationDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --delimiter
-    summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
-    description: ''
-  - name: --include
-    defaultValue: mc
-    summary: Specifies one or more additional datasets to include in the response.
-    description: ''
-  - name: --marker
-    summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-    description: ''
-  - name: --num-results
-    summary: Specifies the maximum number of blobs to return, including all BlobPrefix elements. If the request does not specify num_results or specifies a value greater than 5,000, the server will return up to 5,000 items. Setting num_results to a value less than or equal to zero results in error response code 400 (Bad Request).
-    description: ''
-  - name: --prefix
-    summary: Filters the results to return only blobs whose names begin with the specified prefix.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-  description: Move a storage directory and all its content (which can contain other directories or blobs) to another storage blob directory in a storage container. This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, the move operation is atomic and no marker is returned; if not, the operation is performed in batches and a continuation token could be returned.
-  langs:
-  - azurecli
-  examples:
-  - summary: Move a storage directory to another storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory move -c MyContainer -d my-new-directory -s dir --account-name MyStorageAccount
-  - summary: Move a storage subdirectory to another storage blob directory in a storage container.
-    syntax:
-      content: az storage blob directory move -c MyContainer -d my-new-directory -s dir/subdirectory --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --destination-path -d
-    summary: The destination blob directory path. It can be a directory or subdirectory name, e.g. dir, dir/subdir. If the destination path exists and is empty, the source will be moved into the destination path. If the destination path does not exist, the destination path will be created and overwritten by the source. To control the move operation for nonempty path, you can use --move-mode to determine its behavior.
-    description: ''
-  - isRequired: true
-    name: --source-path -s
-    summary: The source blob directory path.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: A lease ID for destination directory_path. The destination directory_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --move-mode
-    defaultValue: posix
-    parameterValueGroup: legacy, posix
-    summary: Valid only when namespace is enabled. This parameter determines the behavior of the move operation. If the destination directory is empty, for both two mode, the destination directory will be overwritten. But if the destination directory is not empty, in legacy mode the move operation will fail and in posix mode, the source directory will be moved into the destination directory.
-    description: ''
-  - name: --source-if-match
-    summary: Optional. An ETag value. Specify this header to perform the move operation only if the source's ETag matches the value specified.
-    description: ''
-  - name: --source-if-modified-since
-    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has been modified since the specified date and time.
-    description: ''
-  - name: --source-if-none-match
-    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the move operation only if the source's ETag does not match the value specified.
-    description: ''
-  - name: --source-if-unmodified-since
-    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has not been modified since the specified date and time.
-    description: ''
-  - name: --source-lease-id
-    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show a storage blob directory properties in a storage container.
-    syntax:
-      content: az storage blob directory show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform theoperation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to performthe operation only if the resource's ETag does not match the value specified. Specify the wildcardcharacter (\*) to perform the operation only if the resource does not exist, and fail the operationif it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Upload a single blob to a storage blob directory.
-    syntax:
-      content: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d directory
-  - summary: Upload a local directory to a storage blob directory.
-    syntax:
-      content: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" -d directory --recursive
-  - summary: Upload a set of files in a local directory to a storage blob directory.
-    syntax:
-      content: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file*" -d directory --recursive
-  parameters:
-  - isRequired: true
-    name: --container -c
-    summary: The upload destination container.
-    description: ''
-  - isRequired: true
-    name: --destination-path -d
-    summary: The upload destination directory path. It should be an absolute path to container. If the specified destination path does not exist, a new directory path will be created.
-    description: ''
-  - isRequired: true
-    name: --source -s
-    summary: The source file path to upload from.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --recursive -r
-    summary: Recursively upload blobs. If enabled, all the blobs including the blobs in subdirectories will be uploaded.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_create
-  name: az storage blob directory create
-  summary: Create a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_delete
-  name: az storage blob directory delete
-  summary: Delete a storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_download
-  name: az storage blob directory download
-  summary: Download blobs to a local file path.
-- uid: ext_storage-preview_az_storage_blob_directory_exists
-  name: az storage blob directory exists
-  summary: Check for the existence of a blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_list
-  name: az storage blob directory list
-  summary: List blobs and blob subdirectories in a storage directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-- uid: ext_storage-preview_az_storage_blob_directory_move
-  name: az storage blob directory move
-  summary: Move a storage directory to another storage blob directory in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_show
-  name: az storage blob directory show
-  summary: Show a storage blob directory properties in a storage container.
-- uid: ext_storage-preview_az_storage_blob_directory_upload
-  name: az storage blob directory upload
-  summary: Upload blobs or subdirectories to a storage blob directory.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To use the directory commands, please make sure your storage account type is StorageV2.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml
deleted file mode 100644
index cd3da18da1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/access.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_directory_access
-  name: az storage blob directory access
-  summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_directory_access_set
-  - ext_storage-preview_az_storage_blob_directory_access_show
-  - ext_storage-preview_az_storage_blob_directory_access_update
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set the access control properties of a directory.
-    syntax:
-      content: az storage blob directory access set -a "user::rwx,group::r--,other::---" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the access control properties of a directory.
-    syntax:
-      content: az storage blob directory access show -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --user-principle-names
-    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the access permissions of a directory.
-    syntax:
-      content: az storage blob directory access update --permissions "rwxrwxrwx" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning user of a directory.
-    syntax:
-      content: az storage blob directory access update --owner [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  - summary: Update the owning group of a directory.
-    syntax:
-      content: az storage blob directory access update --group [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --acl-spec -a
-    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --group
-    summary: The owning group for the directory.
-    description: ''
-  - name: --lease-id
-    summary: Required if the path has an active lease.
-    description: ''
-  - name: --owner
-    summary: The owning user for the directory.
-    description: ''
-  - name: --permissions
-    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_directory_access_set
-  name: az storage blob directory access set
-  summary: Set the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_show
-  name: az storage blob directory access show
-  summary: Show the access control properties of a directory.
-- uid: ext_storage-preview_az_storage_blob_directory_access_update
-  name: az storage blob directory access update
-  summary: Update the access control properties of a directory.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml
deleted file mode 100644
index 84c57e41af..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/directory/metadata.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_directory_metadata
-  name: az storage blob directory metadata
-  summary: Manage directory metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_directory_metadata_show
-  - ext_storage-preview_az_storage_blob_directory_metadata_update
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show all user-defined metadata for the specified blob directory.
-    syntax:
-      content: az storage blob directory metadata show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --cpk
-    summary: Decrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
-    description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-    syntax:
-      content: az storage blob directory metadata update --metadata tag1=value1 -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
-  parameters:
-  - isRequired: true
-    name: --container-name -c
-    summary: The container name.
-    description: ''
-  - isRequired: true
-    name: --directory-path -d
-    summary: The directory path name.
-    description: ''
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --cpk
-    summary: Encrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
-    description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-  name: az storage blob directory metadata show
-  summary: Show all user-defined metadata for the specified blob directory.
-- uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-  name: az storage blob directory metadata update
-  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage directory metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml
deleted file mode 100644
index 40c963999b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storage-preview/storage/blob/service-properties.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storage-preview_az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storage-preview_az_storage_blob_service_properties_show
-  - ext_storage-preview_az_storage_blob_service_properties_update
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --auth-mode
-    parameterValueGroup: key, login
-    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --days-retained
-    summary: Number of days that soft-deleted blob will be retained. Must be in range [1,365].
-    description: ''
-  - name: --delete-retention
-    parameterValueGroup: false, true
-    summary: Enables soft-delete.
-    description: ''
-  - name: --404-document
-    summary: Represents the path to the error document that should be shown when an error 404 is issued, in other words, when a browser requests a page that does not exist.
-    description: ''
-  - name: --index-document
-    summary: Represents the name of the index document. This is commonly "index.html".
-    description: ''
-  - name: --static-website
-    parameterValueGroup: false, true
-    summary: Enables static-website.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_storage-preview_az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: ext_storage-preview_az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage storage blob service properties.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/index.yml
deleted file mode 100644
index 73985f32d9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az
-  name: storagesync
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_storagesync_az_storagesync
-  name: az storagesync
-  summary: Manage Azure File Sync.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync.yml
deleted file mode 100644
index 7a294d7d00..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync
-  name: az storagesync
-  summary: Manage Azure File Sync.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_create
-  - ext_storagesync_az_storagesync_delete
-  - ext_storagesync_az_storagesync_list
-  - ext_storagesync_az_storagesync_show
-- uid: ext_storagesync_az_storagesync_create
-  name: az storagesync create
-  summary: Create a new storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
-    syntax:
-      content: >-
-        az storagesync create --resource-group "SampleResourceGroup" \
-
-        --name "SampleStorageSyncService" --location "WestUS" --tags key1=value1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_storagesync_az_storagesync_delete
-  name: az storagesync delete
-  summary: Delete a given storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
-    syntax:
-      content: >-
-        az storagesync delete --resource-group "SampleResourceGroup" \
-
-        --name "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_list
-  name: az storagesync list
-  summary: List all storage sync services in a resource group or a subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all storage sync services in a resource group "SampleResourceGroup".
-    syntax:
-      content: az storagesync list --resource-group "SampleResourceGroup"
-  - summary: List all storage sync services in current subscription
-    syntax:
-      content: az storagesync list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_show
-  name: az storagesync show
-  summary: Show the properties for a given storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
-    syntax:
-      content: >-
-        az storagesync show --resource-group "SampleResourceGroup" --name \
-
-        "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_create
-  name: az storagesync create
-  summary: Create a new storage sync service.
-- uid: ext_storagesync_az_storagesync_delete
-  name: az storagesync delete
-  summary: Delete a given storage sync service.
-- uid: ext_storagesync_az_storagesync_list
-  name: az storagesync list
-  summary: List all storage sync services in a resource group or a subscription.
-- uid: ext_storagesync_az_storagesync_registered_server
-  name: az storagesync registered-server
-  summary: Manage registered server.
-- uid: ext_storagesync_az_storagesync_registered_server_delete
-  name: az storagesync registered-server delete
-  summary: Unregister an on-premises server from it's storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_list
-  name: az storagesync registered-server list
-  summary: List all registered servers for a given storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_show
-  name: az storagesync registered-server show
-  summary: Show the properties for a given registered server.
-- uid: ext_storagesync_az_storagesync_registered_server_wait
-  name: az storagesync registered-server wait
-  summary: Place the CLI in a waiting state until a condition of a registered server is met.
-- uid: ext_storagesync_az_storagesync_show
-  name: az storagesync show
-  summary: Show the properties for a given storage sync service.
-- uid: ext_storagesync_az_storagesync_sync_group
-  name: az storagesync sync-group
-  summary: Manage sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-  name: az storagesync sync-group cloud-endpoint
-  summary: Manage cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_create
-  name: az storagesync sync-group create
-  summary: Create a new sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_delete
-  name: az storagesync sync-group delete
-  summary: Delete a given sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_list
-  name: az storagesync sync-group list
-  summary: List all sync groups in a storage sync service.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-  name: az storagesync sync-group server-endpoint
-  summary: Manage server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_show
-  name: az storagesync sync-group show
-  summary: Show the properties for a given sync group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure File Sync.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml
deleted file mode 100644
index 1a0176d119..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/registered-server.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_registered_server
-  name: az storagesync registered-server
-  summary: Manage registered server.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_registered_server_delete
-  - ext_storagesync_az_storagesync_registered_server_list
-  - ext_storagesync_az_storagesync_registered_server_show
-  - ext_storagesync_az_storagesync_registered_server_wait
-- uid: ext_storagesync_az_storagesync_registered_server_delete
-  name: az storagesync registered-server delete
-  summary: Unregister an on-premises server from it's storage sync service.
-  description: Unregister an on-premises server from it's storage sync service which will result in cascading deletes of all server endpoints on this server.
-  langs:
-  - azurecli
-  examples:
-  - summary: Unregister an on-premises server "41166691-ab03-43e9-ab3e-0330eda162ac" from it's storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync registered-server delete --resource-group "SampleResourceGroup" --storage-sync-service \
-
-        "SampleStorageSyncService" --server-id "41166691-ab03-43e9-ab3e-0330eda162ac"
-  parameters:
-  - isRequired: true
-    name: --server-id
-    summary: GUID identifying the on-premises server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_registered_server_list
-  name: az storagesync registered-server list
-  summary: List all registered servers for a given storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all registered servers for storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync registered-server list --resource-group "SampleResourceGroup" --storage-sync-service \
-
-        "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_registered_server_show
-  name: az storagesync registered-server show
-  summary: Show the properties for a given registered server.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for registered server "080d4133-bdb5-40a0-96a0-71a6057bfe9a".
-    syntax:
-      content: >-
-        az storagesync registered-server show --resource-group "SampleResourceGroup" --storage-sync-service \
-
-        "SampleStorageSyncService" --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a"
-  parameters:
-  - isRequired: true
-    name: --server-id
-    summary: GUID identifying the on-premises server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_registered_server_wait
-  name: az storagesync registered-server wait
-  summary: Place the CLI in a waiting state until a condition of a registered server is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until a condition of a registered server is deleted.
-    syntax:
-      content: >-
-        az storagesync registered-server wait --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" \
-
-        --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a" --deleted
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --server-id
-    summary: GUID identifying the on-premises server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service-name
-    summary: Name of Storage Sync Service resource.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_registered_server_delete
-  name: az storagesync registered-server delete
-  summary: Unregister an on-premises server from it's storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_list
-  name: az storagesync registered-server list
-  summary: List all registered servers for a given storage sync service.
-- uid: ext_storagesync_az_storagesync_registered_server_show
-  name: az storagesync registered-server show
-  summary: Show the properties for a given registered server.
-- uid: ext_storagesync_az_storagesync_registered_server_wait
-  name: az storagesync registered-server wait
-  summary: Place the CLI in a waiting state until a condition of a registered server is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage registered server.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml
deleted file mode 100644
index 3e7b8bed67..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_sync_group
-  name: az storagesync sync-group
-  summary: Manage sync group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_sync_group_create
-  - ext_storagesync_az_storagesync_sync_group_delete
-  - ext_storagesync_az_storagesync_sync_group_list
-  - ext_storagesync_az_storagesync_sync_group_show
-- uid: ext_storagesync_az_storagesync_sync_group_create
-  name: az storagesync sync-group create
-  summary: Create a new sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group create --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of sync group.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_delete
-  name: az storagesync sync-group delete
-  summary: Delete a given sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group delete --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of sync group.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_list
-  name: az storagesync sync-group list
-  summary: List all sync groups in a storage sync service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all sync groups in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group list --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_show
-  name: az storagesync sync-group show
-  summary: Show the properties for a given sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
-    syntax:
-      content: >-
-        az storagesync sync-group show --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of sync group.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-  name: az storagesync sync-group cloud-endpoint
-  summary: Manage cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_create
-  name: az storagesync sync-group create
-  summary: Create a new sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_delete
-  name: az storagesync sync-group delete
-  summary: Delete a given sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_list
-  name: az storagesync sync-group list
-  summary: List all sync groups in a storage sync service.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-  name: az storagesync sync-group server-endpoint
-  summary: Manage server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-- uid: ext_storagesync_az_storagesync_sync_group_show
-  name: az storagesync sync-group show
-  summary: Show the properties for a given sync group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage sync group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml
deleted file mode 100644
index 2192894e86..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/cloud-endpoint.yml
+++ /dev/null
@@ -1,241 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-  name: az storagesync sync-group cloud-endpoint
-  summary: Manage cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  - ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new cloud endpoint "SampleCloudEndpoint" in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint create --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint" --storage-account storageaccountnameorid --azure-file-share-name \
-
-        "cvcloud-afscv-0719-058-a94a1354-a1fd-4e9a-9a50-919fad8c4ba4"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --azure-file-share-name
-    summary: The name of Azure file share.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --storage-account
-    summary: The name or ID of the storage account.
-    description: ''
-  - name: --storage-account-tenant-id
-    summary: The id of the tenant that the storage account is in.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete cloud endpoint "SampleCloudEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint delete --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all cloud endpoints in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint list --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for cloud endpoint "SampleCloudEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint show --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until a condition of a cloud endpoint is created.
-    syntax:
-      content: >-
-        az storagesync sync-group cloud-endpoint wait --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleCloudEndpoint" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of cloud endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service-name
-    summary: Name of Storage Sync Service resource.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: Name of Sync Group resource.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-  name: az storagesync sync-group cloud-endpoint create
-  summary: Create a new cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-  name: az storagesync sync-group cloud-endpoint delete
-  summary: Delete a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-  name: az storagesync sync-group cloud-endpoint list
-  summary: List all cloud endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-  name: az storagesync sync-group cloud-endpoint show
-  summary: Show the properties for a given cloud endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-  name: az storagesync sync-group cloud-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage cloud endpoint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml
deleted file mode 100644
index 94f911d0e6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/storagesync/storagesync/sync-group/server-endpoint.yml
+++ /dev/null
@@ -1,318 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-  name: az storagesync sync-group server-endpoint
-  summary: Manage server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  - ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a new server endpoint "SampleServerEndpoint" in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint create --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint" --server-id 91beed22-7e9e-4bda-9313-fec96cf286e0 \
-
-        --server-local-path "d:\abc" --cloud-tiering "off" --volume-free-space-percent 80 --tier-files-older-than-days 20 \
-
-        --offline-data-transfer "on" --offline-data-transfer-share-name "myfileshare"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --registered-server-id --server-id
-    summary: The resource id or GUID of the registered server.
-    description: ''
-  - isRequired: true
-    name: --server-local-path
-    summary: The local path of the registered server.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --cloud-tiering
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --offline-data-transfer
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
-    description: ''
-  - name: --offline-data-transfer-share-name
-    summary: The name of Azure file share that is used to transfer data offline.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tier-files-older-than-days
-    summary: The days that the files are older than will be tiered.
-    description: ''
-  - name: --volume-free-space-percent
-    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a server endpoint "SampleServerEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint delete --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all server endpoints in sync group "SampleSyncGroup".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint list --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup"
-  parameters:
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show the properties for server endpoint "SampleServerEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint show --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the properties for server endpoint "SampleServerEndpoint".
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint update --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint" --cloud-tiering "off" \
-
-        --volume-free-space-percent "100" --tier-files-older-than-days "0" \
-
-        --offline-data-transfer "off"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service
-    summary: The name or ID of storage sync service.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: The name of sync group.
-    description: ''
-  - name: --cloud-tiering
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --offline-data-transfer
-    parameterValueGroup: off, on
-    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
-    description: ''
-  - name: --offline-data-transfer-share-name
-    summary: The name of Azure file share that is used to transfer data offline.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tier-files-older-than-days
-    summary: The days that the files are older than will be tiered.
-    description: ''
-  - name: --volume-free-space-percent
-    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
-    description: ''
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Place the CLI in a waiting state until a condition of a server endpoint is created.
-    syntax:
-      content: >-
-        az storagesync sync-group server-endpoint wait --resource-group "SampleResourceGroup" \
-
-        --storage-sync-service "SampleStorageSyncService" --sync-group-name \
-
-        "SampleSyncGroup" --name "SampleServerEndpoint" --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of server endpoint.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --storage-sync-service-name
-    summary: Name of Storage Sync Service resource.
-    description: ''
-  - isRequired: true
-    name: --sync-group-name
-    summary: Name of Sync Group resource.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-  name: az storagesync sync-group server-endpoint create
-  summary: Create a new server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-  name: az storagesync sync-group server-endpoint delete
-  summary: Delete a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-  name: az storagesync sync-group server-endpoint list
-  summary: List all server endpoints in a sync group.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-  name: az storagesync sync-group server-endpoint show
-  summary: Show the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-  name: az storagesync sync-group server-endpoint update
-  summary: Update the properties for a given server endpoint.
-- uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-  name: az storagesync sync-group server-endpoint wait
-  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage server endpoint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/index.yml
deleted file mode 100644
index 4eaaa88f55..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az
-  name: stream-analytics
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_stream-analytics_az_stream_analytics
-  name: az stream-analytics
-  summary: Manage Stream Analytics.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml
deleted file mode 100644
index 7c0b676229..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics
-  name: az stream-analytics
-  summary: Manage Stream Analytics.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_function
-  name: az stream-analytics function
-  summary: Commands to manage stream-analytics function.
-- uid: ext_stream-analytics_az_stream_analytics_function_create
-  name: az stream-analytics function create
-  summary: Create a function or replaces an already existing function under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_delete
-  name: az stream-analytics function delete
-  summary: Delete a function from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_list
-  name: az stream-analytics function list
-  summary: List all of the functions under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_show
-  name: az stream-analytics function show
-  summary: Get details about the specified function.
-- uid: ext_stream-analytics_az_stream_analytics_function_test
-  name: az stream-analytics function test
-  summary: Test if the information provided for a function is valid.
-- uid: ext_stream-analytics_az_stream_analytics_input
-  name: az stream-analytics input
-  summary: Commands to manage stream-analytics input.
-- uid: ext_stream-analytics_az_stream_analytics_input_create
-  name: az stream-analytics input create
-  summary: Create an input or replaces an already existing input under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_delete
-  name: az stream-analytics input delete
-  summary: Delete an input from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_list
-  name: az stream-analytics input list
-  summary: List all of the inputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_show
-  name: az stream-analytics input show
-  summary: Get details about the specified input.
-- uid: ext_stream-analytics_az_stream_analytics_input_test
-  name: az stream-analytics input test
-  summary: Test an input.
-- uid: ext_stream-analytics_az_stream_analytics_job
-  name: az stream-analytics job
-  summary: Commands to manage stream-analytics streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_create
-  name: az stream-analytics job create
-  summary: Create a streaming job or replaces an already existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_delete
-  name: az stream-analytics job delete
-  summary: Delete a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_list
-  name: az stream-analytics job list
-  summary: List all of the streaming jobs in the specified resource group.
-- uid: ext_stream-analytics_az_stream_analytics_job_show
-  name: az stream-analytics job show
-  summary: Get details about the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_start
-  name: az stream-analytics job start
-  summary: Start a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_stop
-  name: az stream-analytics job stop
-  summary: Stop a running streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_update
-  name: az stream-analytics job update
-  summary: Update existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_wait
-  name: az stream-analytics job wait
-  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
-- uid: ext_stream-analytics_az_stream_analytics_output
-  name: az stream-analytics output
-  summary: Commands to manage stream-analytics output.
-- uid: ext_stream-analytics_az_stream_analytics_output_create
-  name: az stream-analytics output create
-  summary: Create an output or replaces an already existing output under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_delete
-  name: az stream-analytics output delete
-  summary: Delete an output from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_list
-  name: az stream-analytics output list
-  summary: List all of the outputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_show
-  name: az stream-analytics output show
-  summary: Get details about the specified output.
-- uid: ext_stream-analytics_az_stream_analytics_output_test
-  name: az stream-analytics output test
-  summary: Test an output.
-- uid: ext_stream-analytics_az_stream_analytics_quota
-  name: az stream-analytics quota
-  summary: Commands to show quota information.
-- uid: ext_stream-analytics_az_stream_analytics_quota_show
-  name: az stream-analytics quota show
-  summary: Retrieve quota information in a particular region.
-- uid: ext_stream-analytics_az_stream_analytics_transformation
-  name: az stream-analytics transformation
-  summary: Commands to manage stream-analytics transformation.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_create
-  name: az stream-analytics transformation create
-  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_show
-  name: az stream-analytics transformation show
-  summary: Get details about the specified transformation.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_update
-  name: az stream-analytics transformation update
-  summary: Update transformation under an existing streaming job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Stream Analytics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml
deleted file mode 100644
index 66e158edaa..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/function.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_function
-  name: az stream-analytics function
-  summary: Commands to manage stream-analytics function.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_function_create
-  - ext_stream-analytics_az_stream_analytics_function_delete
-  - ext_stream-analytics_az_stream_analytics_function_list
-  - ext_stream-analytics_az_stream_analytics_function_show
-  - ext_stream-analytics_az_stream_analytics_function_test
-- uid: ext_stream-analytics_az_stream_analytics_function_create
-  name: az stream-analytics function create
-  summary: Create a function or replaces an already existing function under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a function
-    syntax:
-      content: >-
-        az stream-analytics function create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyFunctionName --inputs @inputs.json --function-output @output.json --binding \
-
-        @binding.json
-         (below is an example for "inputs.json")
-         [
-             {
-                 "dataType": "Any"
-             }
-         ]
-         (below is an example for "output.json")
-         {
-             "dataType": "Any"
-         }
-         (below is an example of JavascripUDF for "binding.json")
-         {
-             "type": "Microsoft.StreamAnalytics/JavascriptUdf",
-             "properties": {
-                 "script": "function (x, y) { return x + y; }"
-             }
-         }
-         (below is an example of Azure Machine Learning for "binding.json")
-         {
-             "type": "Microsoft.MachineLearning/WebService",
-             "properties": {
-                 "endpoint": "someAzureMLEndpointURL",
-                 "apiKey": "someApiKey==",
-                 "inputs": {
-                     "name": "input1",
-                     "columnNames": [
-                         {
-                             "name": "tweet",
-                             "dataType": "string",
-                             "mapTo": 0
-                         }
-                     ]
-                 },
-                 "outputs": [
-                     {
-                         "name": "Sentiment",
-                         "dataType": "string"
-                     }
-                 ],
-                 "batchSize": 1000
-             }
-         }
-  parameters:
-  - isRequired: true
-    name: --binding
-    summary: The binding of the function.
-    description: ''
-  - isRequired: true
-    name: --function-output
-    summary: The output of the function.
-    description: ''
-  - isRequired: true
-    name: --inputs
-    summary: The inputs of the function.
-    description: ''
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --type
-    defaultValue: Scalar
-    parameterValueGroup: Scalar
-    summary: The udf type of the function.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_delete
-  name: az stream-analytics function delete
-  summary: Delete a function from the streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a function
-    syntax:
-      content: >-
-        az stream-analytics function delete --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyFunctionName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_list
-  name: az stream-analytics function list
-  summary: List all of the functions under the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all functions in a streaming job
-    syntax:
-      content: az stream-analytics function list --resource-group MyResourceGroup --job-name MyJobName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_show
-  name: az stream-analytics function show
-  summary: Get details about the specified function.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details about a function
-    syntax:
-      content: >-
-        az stream-analytics function show --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyFunctionName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_function_test
-  name: az stream-analytics function test
-  summary: Test if the information provided for a function is valid.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Test the connection for a function
-    syntax:
-      content: >-
-        az stream-analytics function test --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyFunctionName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the function.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_function_create
-  name: az stream-analytics function create
-  summary: Create a function or replaces an already existing function under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_delete
-  name: az stream-analytics function delete
-  summary: Delete a function from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_list
-  name: az stream-analytics function list
-  summary: List all of the functions under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_function_show
-  name: az stream-analytics function show
-  summary: Get details about the specified function.
-- uid: ext_stream-analytics_az_stream_analytics_function_test
-  name: az stream-analytics function test
-  summary: Test if the information provided for a function is valid.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics function.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml
deleted file mode 100644
index 103d70b0c8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/input.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_input
-  name: az stream-analytics input
-  summary: Commands to manage stream-analytics input.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_input_create
-  - ext_stream-analytics_az_stream_analytics_input_delete
-  - ext_stream-analytics_az_stream_analytics_input_list
-  - ext_stream-analytics_az_stream_analytics_input_show
-  - ext_stream-analytics_az_stream_analytics_input_test
-- uid: ext_stream-analytics_az_stream_analytics_input_create
-  name: az stream-analytics input create
-  summary: Create an input or replaces an already existing input under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an input
-    syntax:
-      content: >-
-        az stream-analytics input create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyInputName --type Stream --datasource @datasource.json --serialization \
-
-        @serialization.json
-         (below is an example of Blob Storage for "datasource.json")
-         {
-             "type": "Microsoft.Storage/Blob",
-             "properties": {
-                 "storageAccounts": [
-                     {
-                         "accountName": "someAccountName",
-                         "accountKey": "someAccountKey=="
-                     }
-                 ],
-                 "container": "state",
-                 "pathPattern": "{date}/{time}",
-                 "dateFormat": "yyyy/MM/dd",
-                 "timeFormat": "HH",
-                 "sourcePartitionCount": 16
-             }
-         }
-         (below is an example of Event Hub for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/EventHub",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "someSharedAccessPolicyKey==",
-                 "eventHubName": "sdkeventhub",
-                 "consumerGroupName": "sdkconsumergroup"
-             }
-         }
-         (below is an example of Iot Hub for "datasource.json")
-         {
-             "type": "Microsoft.Devices/IotHubs",
-             "properties": {
-                 "iotHubNamespace": "iothub",
-                 "sharedAccessPolicyName": "owner",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "consumerGroupName": "sdkconsumergroup",
-                 "endpoint": "messages/events"
-             }
-         }
-         (below is an example of Csv for "serialization.json")
-         {
-             "type": "Csv",
-             "properties": {
-                 "fieldDelimiter": ",",
-                 "encoding": "UTF8"
-             }
-         }
-         (below is an example of Json for "serialization.json")
-         {
-             "type": "Json",
-             "properties": {
-                 "encoding": "UTF8"
-             }
-         }
-         (below is an example of Avro for "serialization.json")
-         {
-             "type": "Avro"
-         }
-  parameters:
-  - isRequired: true
-    name: --datasource
-    summary: The datasource of the input.
-    description: ''
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --serialization
-    summary: The serialization of the input.
-    description: ''
-  - isRequired: true
-    name: --type
-    parameterValueGroup: Reference, Stream
-    summary: The type of the input.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_delete
-  name: az stream-analytics input delete
-  summary: Delete an input from the streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an input
-    syntax:
-      content: az stream-analytics input delete --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_list
-  name: az stream-analytics input list
-  summary: List all of the inputs under the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all inputs in a streaming job
-    syntax:
-      content: az stream-analytics input list --resource-group MyResourceGroup --job-name MyJobName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_show
-  name: az stream-analytics input show
-  summary: Get details about the specified input.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details about specified input
-    syntax:
-      content: az stream-analytics input show --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_input_test
-  name: az stream-analytics input test
-  summary: Test an input.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Test the connection for an input
-    syntax:
-      content: az stream-analytics input test --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the input.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_input_create
-  name: az stream-analytics input create
-  summary: Create an input or replaces an already existing input under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_delete
-  name: az stream-analytics input delete
-  summary: Delete an input from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_list
-  name: az stream-analytics input list
-  summary: List all of the inputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_input_show
-  name: az stream-analytics input show
-  summary: Get details about the specified input.
-- uid: ext_stream-analytics_az_stream_analytics_input_test
-  name: az stream-analytics input test
-  summary: Test an input.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics input.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml
deleted file mode 100644
index 6eb6342ac0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/job.yml
+++ /dev/null
@@ -1,333 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_job
-  name: az stream-analytics job
-  summary: Commands to manage stream-analytics streaming job.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_job_create
-  - ext_stream-analytics_az_stream_analytics_job_delete
-  - ext_stream-analytics_az_stream_analytics_job_list
-  - ext_stream-analytics_az_stream_analytics_job_show
-  - ext_stream-analytics_az_stream_analytics_job_start
-  - ext_stream-analytics_az_stream_analytics_job_stop
-  - ext_stream-analytics_az_stream_analytics_job_update
-  - ext_stream-analytics_az_stream_analytics_job_wait
-- uid: ext_stream-analytics_az_stream_analytics_job_create
-  name: az stream-analytics job create
-  summary: Create a streaming job or replaces an already existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a streaming job
-    syntax:
-      content: >-
-        az stream-analytics job create --resource-group MyResourceGroup --name MyJobName \
-
-        --location "West US" --output-error-policy "Drop" --events-outoforder-policy "Drop" \
-
-        --events-outoforder-max-delay 5 --events-late-arrival-max-delay 16 --data-locale "en-US"
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --compatibility-level
-    defaultValue: "1.0"
-    parameterValueGroup: "1.0"
-    summary: Controls certain runtime behaviors of the streaming job.
-    description: ''
-  - name: --data-locale
-    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set <a href="https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx">https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx</a>. Defaults to "en-US" if none specified.
-    description: ''
-  - name: --events-late-arrival-max-delay
-    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
-    description: ''
-  - name: --events-outoforder-max-delay
-    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
-    description: ''
-  - name: --events-outoforder-policy
-    parameterValueGroup: Adjust, Drop
-    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --output-error-policy
-    parameterValueGroup: Drop, Stop
-    summary: Indicates the policy to apply to events that arrive at the output.
-    description: ''
-  - name: --sku
-    defaultValue: Standard
-    parameterValueGroup: Standard
-    summary: The name of the SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_delete
-  name: az stream-analytics job delete
-  summary: Delete a streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a streaming job
-    syntax:
-      content: az stream-analytics job delete --resource-group MyResourceGroup --name MyJobName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_list
-  name: az stream-analytics job list
-  summary: List all of the streaming jobs in the specified resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all streaming jobs in current subscription
-    syntax:
-      content: az stream-analytics job list
-  - summary: List all streaming jobs in a resource group
-    syntax:
-      content: az stream-analytics job list --resource-group MyResourceGroup
-  - summary: List all streaming jobs and expand their inputs, outputs, transformation, and functions
-    syntax:
-      content: az stream-analytics job list --resource-group MyResourceGroup --expand
-  parameters:
-  - name: --expand
-    summary: Expand inputs, transformation, outputs and functions of the streaming job.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_show
-  name: az stream-analytics job show
-  summary: Get details about the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a streaming job
-    syntax:
-      content: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName
-  - summary: Get a streaming job and expand its inputs, outputs, transformation, and functions
-    syntax:
-      content: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName --expand
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Expand inputs, transformation, outputs and functions of the streaming job.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_start
-  name: az stream-analytics job start
-  summary: Start a streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Start a streaming job with LastOutputEventTime output start mode
-    syntax:
-      content: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode LastOutputEventTime
-  - summary: Start a streaming job with JobStartTime output start mode
-    syntax:
-      content: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode JobStartTime
-  - summary: Start a streaming job with CustomTime output start mode
-    syntax:
-      content: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode CustomTime --output-start-time 2020-01-01T00:00:00Z
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --output-start-mode
-    defaultValue: JobStartTime
-    parameterValueGroup: CustomTime, JobStartTime, LastOutputEventTime
-    summary: Output start mode.
-    description: ''
-  - name: --output-start-time
-    summary: Output start time, must have a value if --output-start-mode is set to CustomTime.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_stop
-  name: az stream-analytics job stop
-  summary: Stop a running streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Stop a streaming job
-    syntax:
-      content: az stream-analytics job stop --resource-group MyResourceGroup --name MyJobName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_update
-  name: az stream-analytics job update
-  summary: Update existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a streaming job
-    syntax:
-      content: >-
-        az stream-analytics job update --resource-group MyResourceGroup --name MyJobName \
-
-        --events-outoforder-max-delay 21 --events-late-arrival-max-delay 13
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --data-locale
-    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set <a href="https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx">https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx</a>.
-    description: ''
-  - name: --events-late-arrival-max-delay
-    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
-    description: ''
-  - name: --events-outoforder-max-delay
-    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
-    description: ''
-  - name: --events-outoforder-policy
-    parameterValueGroup: Adjust, Drop
-    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
-    description: ''
-  - name: --output-error-policy
-    parameterValueGroup: Drop, Stop
-    summary: Indicates the policy to apply to events that arrive at the output.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_job_wait
-  name: az stream-analytics job wait
-  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause executing next line of CLI script until the streaming job is successfully provisioned.
-    syntax:
-      content: az stream-analytics job wait --resource-group MyResourceGroup --name MyJobName --created
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: The $expand OData query parameter. This is a comma-separated list of additional streaming job properties to include in the response, beyond the default set returned when this parameter is absent. The default set is all streaming job properties other than 'inputs', 'transformation', 'outputs', and 'functions'.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_job_create
-  name: az stream-analytics job create
-  summary: Create a streaming job or replaces an already existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_delete
-  name: az stream-analytics job delete
-  summary: Delete a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_list
-  name: az stream-analytics job list
-  summary: List all of the streaming jobs in the specified resource group.
-- uid: ext_stream-analytics_az_stream_analytics_job_show
-  name: az stream-analytics job show
-  summary: Get details about the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_start
-  name: az stream-analytics job start
-  summary: Start a streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_stop
-  name: az stream-analytics job stop
-  summary: Stop a running streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_update
-  name: az stream-analytics job update
-  summary: Update existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_job_wait
-  name: az stream-analytics job wait
-  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics streaming job.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml
deleted file mode 100644
index 0a56f5db13..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/output.yml
+++ /dev/null
@@ -1,320 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_output
-  name: az stream-analytics output
-  summary: Commands to manage stream-analytics output.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_output_create
-  - ext_stream-analytics_az_stream_analytics_output_delete
-  - ext_stream-analytics_az_stream_analytics_output_list
-  - ext_stream-analytics_az_stream_analytics_output_show
-  - ext_stream-analytics_az_stream_analytics_output_test
-- uid: ext_stream-analytics_az_stream_analytics_output_create
-  name: az stream-analytics output create
-  summary: Create an output or replaces an already existing output under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an output
-    syntax:
-      content: >-
-        az stream-analytics output create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name MyOutputName --datasource @datasource.json --serialization @serialization.json
-         (below is an example of DataLake for "datasource.json")
-         {
-             "type": "Microsoft.DataLake/Accounts",
-             "properties": {
-                 "accountName": "someaccount",
-                 "tenantId": "cea4e98b-c798-49e7-8c40-4a2b3beb47dd",
-                 "refreshToken": "someRefreshToken==",
-                 "tokenUserPrincipalName": "bobsmith@contoso.com",
-                 "tokenUserDisplayName": "Bob Smith",
-                 "filePathPrefix": "{date}/{time}",
-                 "dateFormat": "yyyy/MM/dd",
-                 "timeFormat": "HH"
-             }
-         }
-         (below is an example of SQL Database for "datasource.json")
-         {
-             "type": "Microsoft.Sql/Server/Database",
-             "properties": {
-                 "server": "someServer",
-                 "database": "someDatabase",
-                 "user": "someUser",
-                 "password": "somePassword",
-                 "table": "someTable"
-             }
-         }
-         (below is an example of Table Storage for "datasource.json")
-         {
-             "type": "Microsoft.Storage/Table",
-             "properties": {
-                 "accountName": "someAccountName",
-                 "accountKey": "accountKey==",
-                 "table": "samples",
-                 "partitionKey": "partitionKey",
-                 "rowKey": "rowKey",
-                 "columnsToRemove": [
-                     "column1",
-                     "column2"
-                 ],
-                 "batchSize": 25
-             }
-         }
-         (below is an example of Blob Storage for "datasource.json")
-         {
-             "type": "Microsoft.Storage/Blob",
-             "properties": {
-                 "storageAccounts": [
-                     {
-                         "accountName": "someAccountName",
-                         "accountKey": "accountKey=="
-                     }
-                 ],
-                 "container": "state",
-                 "pathPattern": "{date}/{time}",
-                 "dateFormat": "yyyy/MM/dd",
-                 "timeFormat": "HH"
-             }
-         }
-         (below is an example of DocumentDB for "datasource.json")
-         {
-             "type": "Microsoft.Storage/DocumentDB",
-             "properties": {
-                 "accountId": "someAccountId",
-                 "accountKey": "accountKey==",
-                 "database": "db01",
-                 "collectionNamePattern": "collection",
-                 "partitionKey": "key",
-                 "documentId": "documentId"
-             }
-         }
-         (below is an example of Event Hub for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/EventHub",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "eventHubName": "sdkeventhub",
-                 "partitionKey": "partitionKey"
-             }
-         }
-         (below is an example of PowerBI for "datasource.json")
-         {
-             "type": "PowerBI",
-             "properties": {
-                 "dataset": "someDataset",
-                 "table": "someTable",
-                 "refreshToken": "someRefreshToken==",
-                 "tokenUserPrincipalName": "bobsmith@contoso.com",
-                 "tokenUserDisplayName": "Bob Smith",
-                 "groupId": "ac40305e-3e8d-43ac-8161-c33799f43e95",
-                 "groupName": "MyPowerBIGroup"
-             }
-         }
-         (below is an example of Service Bus Queue for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/Queue",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "queueName": "sdkqueue",
-                 "propertyColumns": [
-                     "column1",
-                     "column2"
-                 ]
-             }
-         }
-         (below is an example of Service Bus Topic for "datasource.json")
-         {
-             "type": "Microsoft.ServiceBus/Topic",
-             "properties": {
-                 "serviceBusNamespace": "sdktest",
-                 "sharedAccessPolicyName": "RootManageSharedAccessKey",
-                 "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
-                 "topicName": "sdktopic",
-                 "propertyColumns": [
-                     "column1",
-                     "column2"
-                 ]
-             }
-         }
-         (below is an example of Csv for "serialization.json")
-         {
-             "type": "Csv",
-             "properties": {
-                 "fieldDelimiter": ",",
-                 "encoding": "UTF8"
-             }
-         }
-         (below is an example of Json for "serialization.json")
-         {
-             "type": "Json",
-             "properties": {
-                 "encoding": "UTF8",
-                 "format": "Array"
-             }
-         }
-         (below is an example of Avro for "serialization.json")
-         {
-             "type": "Avro"
-         }
-  parameters:
-  - isRequired: true
-    name: --datasource
-    summary: The datasource of the output.
-    description: ''
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --serialization
-    summary: The serialization of the output.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_delete
-  name: az stream-analytics output delete
-  summary: Delete an output from the streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an output
-    syntax:
-      content: >-
-        az stream-analytics output delete --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyOutputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_list
-  name: az stream-analytics output list
-  summary: List all of the outputs under the specified streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all outputs in a streaming job
-    syntax:
-      content: az stream-analytics output list --resource-group MyResourceGroup --job-name MyJobName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_show
-  name: az stream-analytics output show
-  summary: Get details about the specified output.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details about an output
-    syntax:
-      content: >-
-        az stream-analytics output show --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyOutputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_output_test
-  name: az stream-analytics output test
-  summary: Test an output.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Test the connection for an output
-    syntax:
-      content: >-
-        az stream-analytics output test --resource-group MyResourceGroup --job-name MyJobName --name \
-
-        MyOutputName
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the output.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_output_create
-  name: az stream-analytics output create
-  summary: Create an output or replaces an already existing output under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_delete
-  name: az stream-analytics output delete
-  summary: Delete an output from the streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_list
-  name: az stream-analytics output list
-  summary: List all of the outputs under the specified streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_output_show
-  name: az stream-analytics output show
-  summary: Get details about the specified output.
-- uid: ext_stream-analytics_az_stream_analytics_output_test
-  name: az stream-analytics output test
-  summary: Test an output.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics output.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml
deleted file mode 100644
index b9fed98dac..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/quota.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_quota
-  name: az stream-analytics quota
-  summary: Commands to show quota information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_quota_show
-- uid: ext_stream-analytics_az_stream_analytics_quota_show
-  name: az stream-analytics quota show
-  summary: Retrieve quota information in a particular region.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List quota information in West US
-    syntax:
-      content: az stream-analytics quota show --location "West US"
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_quota_show
-  name: az stream-analytics quota show
-  summary: Retrieve quota information in a particular region.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to show quota information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml
deleted file mode 100644
index ed30253576..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/stream-analytics/stream-analytics/transformation.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_stream-analytics_az_stream_analytics_transformation
-  name: az stream-analytics transformation
-  summary: Commands to manage stream-analytics transformation.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_stream-analytics_az_stream_analytics_transformation_create
-  - ext_stream-analytics_az_stream_analytics_transformation_show
-  - ext_stream-analytics_az_stream_analytics_transformation_update
-- uid: ext_stream-analytics_az_stream_analytics_transformation_create
-  name: az stream-analytics transformation create
-  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a transformation
-    syntax:
-      content: >-
-        az stream-analytics transformation create --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name Transformation --streaming-units "6" --transformation-query "Select Id, Name from inputtest"
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the transformation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --streaming-units
-    summary: The number of streaming units that the streaming job uses.
-    description: ''
-  - name: --transformation-query
-    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: <a href="https://msdn.microsoft.com/library/azure/dn834998">https://msdn.microsoft.com/library/azure/dn834998</a> .'
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_transformation_show
-  name: az stream-analytics transformation show
-  summary: Get details about the specified transformation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a transformation
-    syntax:
-      content: >-
-        az stream-analytics transformation show --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name Transformation
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the transformation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_stream-analytics_az_stream_analytics_transformation_update
-  name: az stream-analytics transformation update
-  summary: Update transformation under an existing streaming job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a transformation
-    syntax:
-      content: >-
-        az stream-analytics transformation update --resource-group MyResourceGroup --job-name MyJobName \
-
-        --name Transformation --transformation-query "New query"
-  parameters:
-  - isRequired: true
-    name: --job-name
-    summary: The name of the streaming job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the transformation.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --streaming-units
-    summary: The number of streaming units that the streaming job uses.
-    description: ''
-  - name: --transformation-query
-    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: <a href="https://msdn.microsoft.com/library/azure/dn834998">https://msdn.microsoft.com/library/azure/dn834998</a> .'
-    description: ''
-commands:
-- uid: ext_stream-analytics_az_stream_analytics_transformation_create
-  name: az stream-analytics transformation create
-  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_show
-  name: az stream-analytics transformation show
-  summary: Get details about the specified transformation.
-- uid: ext_stream-analytics_az_stream_analytics_transformation_update
-  name: az stream-analytics transformation update
-  summary: Update transformation under an existing streaming job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage stream-analytics transformation.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/subscription/account.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/subscription/account.yml
deleted file mode 100644
index a7c068d701..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/subscription/account.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_subscription_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_subscription_az_account_create
-- uid: ext_subscription_az_account_create
-  name: az account create
-  summary: Create a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --enrollment-account-name --enrollment-account-object-id
-    summary: The name of the enrollment account which should be used to create a subscription.
-    description: ''
-  - isRequired: true
-    name: --offer-type
-    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
-    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.
-    description: ''
-  - name: --display-name
-    summary: The display name of the subscription.
-    description: ''
-  - name: --owner-object-id
-    summary: The object id(s) of the owner(s) which should be granted access to the new subscription.
-    description: ''
-  - name: --owner-spn
-    summary: The service principal name(s) of the owner(s) which should be granted access to the new subscription.
-    description: ''
-  - name: --owner-upn
-    summary: The user principal name(s) of owner(s) who should be granted access to the new subscription.
-    description: ''
-commands:
-- uid: ext_subscription_az_account_create
-  name: az account create
-  summary: Create a subscription.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure subscription information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/subscription/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/subscription/index.yml
deleted file mode 100644
index 1a67d7b877..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/subscription/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_subscription_az
-  name: subscription
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_subscription_az_account
-  name: az account
-  summary: Manage Azure subscription information.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/support/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/support/index.yml
deleted file mode 100644
index cf1c23341e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/support/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az
-  name: support
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_support_az_support
-  name: az support
-  summary: Manage Azure support resource.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/support/support.yml
deleted file mode 100644
index fa952d9bb9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support
-  name: az support
-  summary: Manage Azure support resource.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_support_az_support_services
-  name: az support services
-  summary: Azure services and related problem categories.
-- uid: ext_support_az_support_services_list
-  name: az support services list
-  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications
-  name: az support services problem-classifications
-  summary: Problem classifications for an Azure service.
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-- uid: ext_support_az_support_services_show
-  name: az support services show
-  summary: Gets a specific Azure service for support ticket creation.
-- uid: ext_support_az_support_tickets
-  name: az support tickets
-  summary: Create and manage Azure support ticket.
-- uid: ext_support_az_support_tickets_communications
-  name: az support tickets communications
-  summary: Manage support ticket communications.
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-- uid: ext_support_az_support_tickets_create
-  name: az support tickets create
-  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
-- uid: ext_support_az_support_tickets_list
-  name: az support tickets list
-  summary: Lists all the support tickets for an Azure subscription.
-- uid: ext_support_az_support_tickets_show
-  name: az support tickets show
-  summary: Gets support ticket details for an Azure subscription.
-- uid: ext_support_az_support_tickets_update
-  name: az support tickets update
-  summary: Updates severity level, status and customer contact information for a support ticket.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure support resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services.yml
deleted file mode 100644
index ddcfba5475..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_services
-  name: az support services
-  summary: Azure services and related problem categories.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_services_list
-  - ext_support_az_support_services_show
-- uid: ext_support_az_support_services_list
-  name: az support services list
-  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets list of services for which a support ticket can be created.
-    syntax:
-      content: az support services list
-  parameters: []
-- uid: ext_support_az_support_services_show
-  name: az support services show
-  summary: Gets a specific Azure service for support ticket creation.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets details of Azure service.
-    syntax:
-      content: az support services show --service-name "ServiceNameGuid"
-  parameters:
-  - isRequired: true
-    name: --service-name
-    summary: Name of Azure service.
-    description: ''
-commands:
-- uid: ext_support_az_support_services_list
-  name: az support services list
-  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications
-  name: az support services problem-classifications
-  summary: Problem classifications for an Azure service.
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-- uid: ext_support_az_support_services_show
-  name: az support services show
-  summary: Gets a specific Azure service for support ticket creation.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Azure services and related problem categories.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services/problem-classifications.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services/problem-classifications.yml
deleted file mode 100644
index a873940e6e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/services/problem-classifications.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_services_problem_classifications
-  name: az support services problem-classifications
-  summary: Problem classifications for an Azure service.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_services_problem_classifications_list
-  - ext_support_az_support_services_problem_classifications_show
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets list of problemClassifications for a service for which a support ticket can be created.
-    syntax:
-      content: az support services problem-classifications list --service-name "ServiceNameGuid"
-  parameters:
-  - isRequired: true
-    name: --service-name
-    summary: Name of Azure service.
-    description: ''
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Gets details of problemClassification for Azure service.
-    syntax:
-      content: >-
-        az support services problem-classifications show \
-          --service-name "ServiceNameGuid" \
-          --problem-classification-name "ProblemClassificationNameGuid"
-  parameters:
-  - isRequired: true
-    name: --problem-classification-name
-    summary: Name of problem classification.
-    description: ''
-  - isRequired: true
-    name: --service-name
-    summary: Name of Azure service.
-    description: ''
-commands:
-- uid: ext_support_az_support_services_problem_classifications_list
-  name: az support services problem-classifications list
-  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
-- uid: ext_support_az_support_services_problem_classifications_show
-  name: az support services problem-classifications show
-  summary: Gets the problem classification details for an Azure service.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Problem classifications for an Azure service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets.yml
deleted file mode 100644
index b834822b42..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets.yml
+++ /dev/null
@@ -1,582 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_tickets
-  name: az support tickets
-  summary: Create and manage Azure support ticket.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_tickets_create
-  - ext_support_az_support_tickets_list
-  - ext_support_az_support_tickets_show
-  - ext_support_az_support_tickets_update
-- uid: ext_support_az_support_tickets_create
-  name: az support tickets create
-  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a ticket for Billing related issues.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "BillingTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "BillingTestTicketName" \
-          --title "BillingTicketTitle"
-  - summary: Create a ticket for Subscription Management related issues.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "SubMgmtTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/SubMgmtServiceNameGuid/problemClassifications/SubMgmtProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "SubMgmtTestTicketName" \
-          --title "SubMgmtTicketTitle"
-  - summary: Create a ticket for Technical issue related to a specific resource.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "TechnicalTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/TechnicalServiceNameGuid/problemClassifications/TechnicalProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "TechnicalTestTicketName" \
-          --title "TechnicalTicketTitle" \
-          --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
-          --technical-resource "/subscriptions/SubscriptionGuid/resourceGroups/RgName/providers/Microsoft.Compute/virtualMachines/RName"
-  - summary: Create a ticket for Billing related issues in admin on behalf of (AOBO) mode.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "BillingTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "BillingTestTicketName" \
-          --title "BillingTicketTitle" \
-          --partner-tenant-id "CSPPartnerTenantIdGuid"
-  - summary: Create a ticket for Generic Quota increase for any Azure Service.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/GenericProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle"
-  - summary: Create a ticket to request Quota increase for Compute VM Cores.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/CoresQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"SKU\":\"DSv3 Series\", \"NewLimit\":104}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0"
-  - summary: Create a ticket to request Quota increase for Low-priority cores for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"LowPriority\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for specific VM family cores for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for Pools for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Pools\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for Active Jobs and Job Schedules for a Batch account.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Jobs\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Account"
-  - summary: Create a ticket to request Quota increase for number of Batch accounts for a subscription.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":200, \"Type\":\"Account\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Subscription"
-  - summary: Create a ticket to request Quota increase for DTUs for SQL Database.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "DTUs"
-  - summary: Create a ticket to request Quota increase for Servers for SQL Database.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":54000}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Servers"
-  - summary: Create a ticket to request Quota increase for DTUs for SQL Data Warehouse.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "DTUs"
-  - summary: Create a ticket to request Quota increase for Servers for SQL Data Warehouse.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":200}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "Servers"
-  - summary: Create a ticket to request Quota increase for specific VM family cores for Machine Learning service.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "BatchAml"
-  - summary: Create a ticket to request Quota increase for Low-priority cores for Machine Learning service.
-    syntax:
-      content: >-
-        az support tickets create \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "email" \
-          --contact-timezone "Pacific Standard Time" \
-          --description "QuotaTicketDescription" \
-          --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
-          --severity "minimal" \
-          --ticket-name "QuotaTestTicketName" \
-          --title "QuotaTicketTitle" \
-          --quota-change-payload "{\"NewLimit\":200, \"Type\":\"LowPriority\"}" \
-          --quota-change-regions "EastUS" \
-          --quota-change-version "1.0" \
-          --quota-change-subtype "BatchAml"
-  parameters:
-  - isRequired: true
-    name: --description
-    summary: Detailed description of the question or issue.
-    description: ''
-  - isRequired: true
-    name: --problem-classification
-    summary: Each Azure service has its own set of issue category called problem classification that corresponds to the type of problem you are experiencing. This parameter is the resource id of ProblemClassification resource.
-    description: ''
-  - isRequired: true
-    name: --severity
-    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
-    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
-    description: ''
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - isRequired: true
-    name: --title
-    summary: Title of the support ticket.
-    description: ''
-  - name: --partner-tenant-id
-    summary: Partner tenant id for Admin On Behalf of (AOBO) scenario. In addition to logging in to the customer tenant, logging in to the partner tenant (PT) using "az login -t PT --allow-no-subscriptions" is required.
-    description: ''
-  - name: --require-24-by-7-response
-    parameterValueGroup: false, true
-    summary: Indicates if this requires a 24x7 response from Azure. Default is false.
-    description: ''
-  - name: --start-time
-    summary: Time in UTC datetime (Y-m-d'T'H:M:S'Z') when the problem started. Default is today.
-    description: ''
-  - isRequired: true
-    name: --contact-country
-    summary: Country of the user. This is the ISO Alpha-3 code.
-    description: ''
-  - isRequired: true
-    name: --contact-email
-    summary: Primary email address.
-    description: ''
-  - isRequired: true
-    name: --contact-first-name
-    summary: First Name.
-    description: ''
-  - isRequired: true
-    name: --contact-language
-    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
-    description: ''
-  - isRequired: true
-    name: --contact-last-name
-    summary: Last Name.
-    description: ''
-  - isRequired: true
-    name: --contact-method
-    parameterValueGroup: email, phone
-    summary: Preferred contact method.
-    description: ''
-  - isRequired: true
-    name: --contact-timezone
-    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
-    description: ''
-  - name: --contact-additional-emails
-    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
-    description: ''
-  - name: --contact-phone-number
-    summary: Phone number. This is required if preferred contact method is phone.
-    description: ''
-  - name: --quota-change-payload
-    summary: Space seperated list of serialized payload of the quota increase request corresponding to regions. Visit <a href="https://aka.ms/supportrpquotarequestpayload">https://aka.ms/supportrpquotarequestpayload</a> for details.
-    description: ''
-  - name: --quota-change-regions
-    summary: Space seperated list of region for which the quota increase request is being made.
-    description: ''
-  - name: --quota-change-subtype
-    summary: 'Required for certain quota types when there is a sub type that you are requesting quota increase for. Example: Batch.'
-    description: ''
-  - name: --quota-change-version
-    summary: Quota change request version.
-    description: ''
-  - name: --technical-resource
-    summary: This is the resource id of the Azure service resource for which the support ticket is created.
-    description: ''
-- uid: ext_support_az_support_tickets_list
-  name: az support tickets list
-  summary: Lists all the support tickets for an Azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List support tickets for a subscription.
-    syntax:
-      content: az support tickets list
-  - summary: List support tickets in open state for a subscription.
-    syntax:
-      content: az support tickets list --filters "Status eq 'Open'"
-  - summary: List support tickets created on or after a certain date and in open state for a subscription.
-    syntax:
-      content: az support tickets list --filters "CreatedDate ge 2020-01-01 and Status eq 'Open'"
-  parameters:
-  - name: --filters
-    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "Status" property using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator. Default is CreatedDate >= one week.
-    description: ''
-- uid: ext_support_az_support_tickets_show
-  name: az support tickets show
-  summary: Gets support ticket details for an Azure subscription.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get details of a subscription ticket.
-    syntax:
-      content: az support tickets show --ticket-name "TestTicketName"
-  parameters:
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-- uid: ext_support_az_support_tickets_update
-  name: az support tickets update
-  summary: Updates severity level, status and customer contact information for a support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update support ticket severity.
-    syntax:
-      content: az support tickets update --ticket-name "TestTicketName" --severity "moderate"
-  - summary: Update support ticket status.
-    syntax:
-      content: az support tickets update --ticket-name "TestTicketName" --status "closed"
-  - summary: Update support ticket customer contact details properties.
-    syntax:
-      content: >-
-        az support tickets update --ticket-name "TestTicketName" \
-          --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "phone" \
-          --contact-phone-number "123-456-7890" \
-          --contact-timezone "Pacific Standard Time"
-  - summary: Update support ticket severity, status and customer contact details properties.
-    syntax:
-      content: >-
-        az support tickets update --ticket-name "TestTicketName" \
-          --status "open" \
-          --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
-          --contact-country "USA" \
-          --contact-email "abc@contoso.com" \
-          --contact-first-name "Foo" \
-          --contact-language "en-US" \
-          --contact-last-name "Bar" \
-          --contact-method "phone" \
-          --contact-phone-number "123-456-7890" \
-          --contact-timezone "Pacific Standard Time" \
-          --severity "moderate"
-  parameters:
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - name: --severity
-    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
-    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
-    description: ''
-  - name: --status
-    parameterValueGroup: closed, open
-    summary: Status to be updated on the ticket.
-    description: ''
-  - name: --contact-additional-emails
-    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
-    description: ''
-  - name: --contact-country
-    summary: Country of the user. This is the ISO Alpha-3 code.
-    description: ''
-  - name: --contact-email
-    summary: Primary email address.
-    description: ''
-  - name: --contact-first-name
-    summary: First Name.
-    description: ''
-  - name: --contact-language
-    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
-    description: ''
-  - name: --contact-last-name
-    summary: Last Name.
-    description: ''
-  - name: --contact-method
-    parameterValueGroup: email, phone
-    summary: Preferred contact method.
-    description: ''
-  - name: --contact-phone-number
-    summary: Phone number. This is required if preferred contact method is phone.
-    description: ''
-  - name: --contact-timezone
-    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
-    description: ''
-commands:
-- uid: ext_support_az_support_tickets_communications
-  name: az support tickets communications
-  summary: Manage support ticket communications.
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-- uid: ext_support_az_support_tickets_create
-  name: az support tickets create
-  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
-- uid: ext_support_az_support_tickets_list
-  name: az support tickets list
-  summary: Lists all the support tickets for an Azure subscription.
-- uid: ext_support_az_support_tickets_show
-  name: az support tickets show
-  summary: Gets support ticket details for an Azure subscription.
-- uid: ext_support_az_support_tickets_update
-  name: az support tickets update
-  summary: Updates severity level, status and customer contact information for a support ticket.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create and manage Azure support ticket.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets/communications.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets/communications.yml
deleted file mode 100644
index bbbd88c6ee..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/support/support/tickets/communications.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_support_az_support_tickets_communications
-  name: az support tickets communications
-  summary: Manage support ticket communications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_support_az_support_tickets_communications_create
-  - ext_support_az_support_tickets_communications_list
-  - ext_support_az_support_tickets_communications_show
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add communication to subscription ticket.
-    syntax:
-      content: >-
-        az support tickets communications create \
-          --ticket-name "TestTicketName" \
-          --communication-name "TestTicketCommunicationName" \
-          --communication-body "TicketCommunicationBody" \
-          --communication-subject "TicketCommunicationSubject"
-  parameters:
-  - isRequired: true
-    name: --communication-name
-    summary: Communication name.
-    description: ''
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - isRequired: true
-    name: --communication-body
-    summary: Text of the communication.
-    description: ''
-  - isRequired: true
-    name: --communication-subject
-    summary: Subject of the communication.
-    description: ''
-  - name: --communication-sender
-    summary: Email address of the sender.
-    description: ''
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List communications for a subscription support ticket.
-    syntax:
-      content: az support tickets communications list --ticket-name "TestTicketName"
-  - summary: List web communications for a subscription support ticket.
-    syntax:
-      content: >-
-        az support tickets communications list \
-          --ticket-name "TestTicketName" \
-          --filters "communicationType eq 'Web'"
-  - summary: List web communication created on or after a specific date for a subscription support ticket.
-    syntax:
-      content: >-
-        az support tickets communications list \
-          --ticket-name "TestTicketName" \
-          --filters "CreatedDate ge 2020-01-01 and communicationType eq 'Web'"
-  parameters:
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-  - name: --filters
-    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "CommunicationType" using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator.
-    description: ''
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get communication details for a subscription support ticket.
-    syntax:
-      content: >-
-        az support tickets communications show \
-          --ticket-name "TestTicketName" \
-          --communication-name "TestTicketCommunicationName"
-  parameters:
-  - isRequired: true
-    name: --communication-name
-    summary: Communication name.
-    description: ''
-  - isRequired: true
-    name: --ticket-name
-    summary: Support ticket name.
-    description: ''
-commands:
-- uid: ext_support_az_support_tickets_communications_create
-  name: az support tickets communications create
-  summary: Adds a new customer communication to an Azure support ticket.
-- uid: ext_support_az_support_tickets_communications_list
-  name: az support tickets communications list
-  summary: Lists all communications (attachments not included) for a support ticket.
-- uid: ext_support_az_support_tickets_communications_show
-  name: az support tickets communications show
-  summary: Gets communication details for a support ticket.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage support ticket communications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/index.yml
deleted file mode 100644
index 70ff40121d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az
-  name: synapse
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse
-  name: az synapse
-  summary: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse.yml
deleted file mode 100644
index 1b1cb87fa7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse
-  name: az synapse
-  summary: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse_spark
-  name: az synapse spark
-  summary: Manage Spark pools and Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job
-  name: az synapse spark job
-  summary: Manage Synapse Spark batch jobs.
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-- uid: ext_synapse_az_synapse_spark_pool
-  name: az synapse spark pool
-  summary: Manage Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-- uid: ext_synapse_az_synapse_spark_session
-  name: az synapse spark session
-  summary: Manage Synapse Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-- uid: ext_synapse_az_synapse_spark_statement
-  name: az synapse spark statement
-  summary: Manage Synapse Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-- uid: ext_synapse_az_synapse_sql
-  name: az synapse sql
-  summary: Manage SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool
-  name: az synapse sql pool
-  summary: Manage SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-- uid: ext_synapse_az_synapse_workspace
-  name: az synapse workspace
-  summary: Manage Synapse workspaces.
-- uid: ext_synapse_az_synapse_workspace_check_name
-  name: az synapse workspace check-name
-  summary: Check if a Synapse workspace name is available or not.
-- uid: ext_synapse_az_synapse_workspace_create
-  name: az synapse workspace create
-  summary: Create a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_delete
-  name: az synapse workspace delete
-  summary: Delete a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule
-  name: az synapse workspace firewall-rule
-  summary: Manage a workspace's firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-- uid: ext_synapse_az_synapse_workspace_list
-  name: az synapse workspace list
-  summary: List all Synapse workspaces.
-- uid: ext_synapse_az_synapse_workspace_show
-  name: az synapse workspace show
-  summary: Get a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_update
-  name: az synapse workspace update
-  summary: Update a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_wait
-  name: az synapse workspace wait
-  summary: Place the CLI in a waiting state until a condition of the workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark.yml
deleted file mode 100644
index 0e982b4ab9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark
-  name: az synapse spark
-  summary: Manage Spark pools and Spark jobs.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse_spark_job
-  name: az synapse spark job
-  summary: Manage Synapse Spark batch jobs.
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-- uid: ext_synapse_az_synapse_spark_pool
-  name: az synapse spark pool
-  summary: Manage Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-- uid: ext_synapse_az_synapse_spark_session
-  name: az synapse spark session
-  summary: Manage Synapse Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-- uid: ext_synapse_az_synapse_spark_statement
-  name: az synapse spark statement
-  summary: Manage Synapse Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Spark pools and Spark jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/job.yml
deleted file mode 100644
index 63d6c466ea..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/job.yml
+++ /dev/null
@@ -1,189 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_job
-  name: az synapse spark job
-  summary: Manage Synapse Spark batch jobs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_job_cancel
-  - ext_synapse_az_synapse_spark_job_list
-  - ext_synapse_az_synapse_spark_job_show
-  - ext_synapse_az_synapse_spark_job_submit
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a Spark job.
-    syntax:
-      content: az synapse spark job cancel --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark jobs.
-    syntax:
-      content: az synapse spark job list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --from-index
-    summary: Optional parameter specifying which index the list should begin from.
-    description: ''
-  - name: --size
-    summary: The size of the returned list.By default it is 20 and that is the maximum.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark job.
-    syntax:
-      content: az synapse spark job show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Submit a Java Spark job.
-    syntax:
-      content: >-
-        az synapse spark job submit --name WordCount_Java --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool \
-
-        --main-definition-file abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/wordcount.jar \
-
-        --main-class-name WordCount \
-
-        --command-line-arguments abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/shakespeare.txt \
-
-        abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/result/ \
-
-        --executors 2 --executor-size Small
-  parameters:
-  - isRequired: true
-    name: --executor-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The executor size.
-    description: ''
-  - isRequired: true
-    name: --executors
-    summary: The number of executors.
-    description: ''
-  - isRequired: true
-    name: --main-class-name
-    summary: The fully-qualified identifier or the main class that is in the main definition file.
-    description: ''
-  - isRequired: true
-    name: --main-definition-file
-    summary: The main file used for the job.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The Spark job name.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --archives
-    summary: The array of archives.
-    description: ''
-  - name: --command-line-arguments
-    summary: 'Optional arguments to the job (Note: please use storage URIs for file arguments).'
-    description: ''
-  - name: --configuration
-    summary: The configuration of Spark job.
-    description: ''
-  - name: --language
-    defaultValue: Scala
-    parameterValueGroup: CSharp, PySpark, Python, Scala, Spark, SparkDotNet
-    summary: The Spark job language.
-    description: ''
-  - name: --reference-files
-    summary: Additional files used for reference in the main definition file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_job_cancel
-  name: az synapse spark job cancel
-  summary: Cancel a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_list
-  name: az synapse spark job list
-  summary: List all Spark jobs.
-- uid: ext_synapse_az_synapse_spark_job_show
-  name: az synapse spark job show
-  summary: Get a Spark job.
-- uid: ext_synapse_az_synapse_spark_job_submit
-  name: az synapse spark job submit
-  summary: Submit a Spark job.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse Spark batch jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml
deleted file mode 100644
index d2fc8e4def..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/pool.yml
+++ /dev/null
@@ -1,309 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_pool
-  name: az synapse spark pool
-  summary: Manage Spark pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_pool_create
-  - ext_synapse_az_synapse_spark_pool_delete
-  - ext_synapse_az_synapse_spark_pool_list
-  - ext_synapse_az_synapse_spark_pool_show
-  - ext_synapse_az_synapse_spark_pool_update
-  - ext_synapse_az_synapse_spark_pool_wait
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Spark pool.
-    syntax:
-      content: >-
-        az synapse spark pool create --name testpool --workspace-name testsynapseworkspace --resource-group rg \
-
-        --spark-version 2.4 --node-count 3 --node-size Medium
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --delay
-    summary: The delay time whose unit is minute.
-    description: ''
-  - name: --enable-auto-pause
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto pause.
-    description: ''
-  - name: --enable-auto-scale
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto scale.
-    description: ''
-  - name: --max-node-count
-    summary: The max node count.
-    description: ''
-  - name: --min-node-count
-    summary: The min node count.
-    description: ''
-  - isRequired: true
-    name: --spark-version
-    summary: The supported Spark version is 2.4 now.
-    description: ''
-  - name: --default-spark-log-folder
-    defaultValue: /logs
-    summary: The default Spark log folder.
-    description: ''
-  - name: --spark-events-folder
-    defaultValue: /events
-    summary: The Spark events folder.
-    description: ''
-  - name: --library-requirements-file
-    summary: The library requirements file.
-    description: ''
-  - isRequired: true
-    name: --node-count
-    summary: The number of node.
-    description: ''
-  - isRequired: true
-    name: --node-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The node size.
-    description: ''
-  - name: --node-size-family
-    defaultValue: MemoryOptimized
-    summary: The node size family.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Spark pool.
-    syntax:
-      content: az synapse spark pool delete --name testpool --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark pools.
-    syntax:
-      content: az synapse spark pool list --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark pool.
-    syntax:
-      content: az synapse spark pool show --name testpool --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update the Spark pool's tags.
-    syntax:
-      content: >-
-        az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
-
-        --tags key1=value1
-  - summary: Update the Spark pool's auto scale configuration.
-    syntax:
-      content: >-
-        az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
-
-        --enable-auto-scale --min-node-count 3 --max-node-count 100
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --force
-    parameterValueGroup: false, true
-    summary: The flag of force operation.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --delay
-    summary: The delay time whose unit is minute.
-    description: ''
-  - name: --enable-auto-pause
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto pause.
-    description: ''
-  - name: --enable-auto-scale
-    parameterValueGroup: false, true
-    summary: The flag of enabling auto scale.
-    description: ''
-  - name: --max-node-count
-    summary: The max node count.
-    description: ''
-  - name: --min-node-count
-    summary: The min node count.
-    description: ''
-  - name: --library-requirements-file
-    summary: The library requirements file.
-    description: ''
-  - name: --node-count
-    summary: The number of node.
-    description: ''
-  - name: --node-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The node size.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --big-data-pool-name
-    summary: Big Data pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_pool_create
-  name: az synapse spark pool create
-  summary: Create a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_delete
-  name: az synapse spark pool delete
-  summary: Delete a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_list
-  name: az synapse spark pool list
-  summary: List all Spark pools.
-- uid: ext_synapse_az_synapse_spark_pool_show
-  name: az synapse spark pool show
-  summary: Get a Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_update
-  name: az synapse spark pool update
-  summary: Update the Spark pool.
-- uid: ext_synapse_az_synapse_spark_pool_wait
-  name: az synapse spark pool wait
-  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Spark pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/session.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/session.yml
deleted file mode 100644
index 5a9e73e577..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/session.yml
+++ /dev/null
@@ -1,187 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_session
-  name: az synapse spark session
-  summary: Manage Synapse Spark sessions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_session_cancel
-  - ext_synapse_az_synapse_spark_session_create
-  - ext_synapse_az_synapse_spark_session_list
-  - ext_synapse_az_synapse_spark_session_reset_timeout
-  - ext_synapse_az_synapse_spark_session_show
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a Spark session.
-    syntax:
-      content: az synapse spark session cancel  --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark session job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Spark session.
-    syntax:
-      content: >-
-        az synapse spark session create --name testsession  --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool --executor-size Small --executors 4
-  parameters:
-  - isRequired: true
-    name: --executor-size
-    parameterValueGroup: Large, Medium, Small
-    summary: The executor size.
-    description: ''
-  - isRequired: true
-    name: --executors
-    summary: The number of executors.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The Spark session name.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --configuration
-    summary: The configuration of Spark session.
-    description: ''
-  - name: --reference-files
-    summary: Additional files used for reference in the main definition file.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark sessions.
-    syntax:
-      content: az synapse spark session list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --from-index
-    summary: Optional parameter specifying which index the list should begin from.
-    description: ''
-  - name: --size
-    summary: The size of the returned list.By default it is 20 and that is the maximum.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Reset a Spark session's timeout time.
-    syntax:
-      content: az synapse spark session reset-timeout --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark session job.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark session.
-    syntax:
-      content: az synapse spark session show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the Spark session job.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_session_cancel
-  name: az synapse spark session cancel
-  summary: Cancel a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_create
-  name: az synapse spark session create
-  summary: Create a Spark session.
-- uid: ext_synapse_az_synapse_spark_session_list
-  name: az synapse spark session list
-  summary: List all Spark sessions.
-- uid: ext_synapse_az_synapse_spark_session_reset_timeout
-  name: az synapse spark session reset-timeout
-  summary: Reset a Spark session timeout time.
-- uid: ext_synapse_az_synapse_spark_session_show
-  name: az synapse spark session show
-  summary: Get a Spark session.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse Spark sessions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml
deleted file mode 100644
index ea1f4b4fb8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/spark/statement.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_spark_statement
-  name: az synapse spark statement
-  summary: Manage Synapse Spark statements.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_spark_statement_cancel
-  - ext_synapse_az_synapse_spark_statement_invoke
-  - ext_synapse_az_synapse_spark_statement_list
-  - ext_synapse_az_synapse_spark_statement_show
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Cancel a Spark statement.
-    syntax:
-      content: >-
-        az synapse spark statement cancel --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the statement.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Invoke a Spark statement.
-    syntax:
-      content: >-
-        az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool --code "print('hello, Azure CLI')" --language pyspark
-  - summary: Submit a Spark statement by reading code content from file.
-    syntax:
-      content: >-
-        az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool --code @file-path --language pyspark
-  parameters:
-  - isRequired: true
-    name: --code
-    summary: The code of Spark statement. This is either the code contents or use `@&lt;file path&gt;` to load the content from a file.
-    description: ''
-  - isRequired: true
-    name: --language
-    parameterValueGroup: CSharp, PySpark, Python, SQL, Scala, Spark, SparkDotNet
-    summary: The language of Spark statement.
-    description: ''
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Spark statements.
-    syntax:
-      content: >-
-        az synapse spark statement list --session-id 11 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Spark statement.
-    syntax:
-      content: >-
-        az synapse spark statement show --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
-
-        --spark-pool-name testsparkpool
-  parameters:
-  - isRequired: true
-    name: --session-id
-    summary: The id of Spark session.
-    description: ''
-  - isRequired: true
-    name: --spark-pool-name
-    summary: The name of the Spark pool.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - isRequired: true
-    name: --livy-id
-    summary: The id of the statement.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_spark_statement_cancel
-  name: az synapse spark statement cancel
-  summary: Cancel a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_invoke
-  name: az synapse spark statement invoke
-  summary: Invoke a Spark statement.
-- uid: ext_synapse_az_synapse_spark_statement_list
-  name: az synapse spark statement list
-  summary: List all Spark statements.
-- uid: ext_synapse_az_synapse_spark_statement_show
-  name: az synapse spark statement show
-  summary: Get a Spark statement.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse Spark statements.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql.yml
deleted file mode 100644
index 18fae2113c..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_sql
-  name: az synapse sql
-  summary: Manage SQL pools.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_synapse_az_synapse_sql_pool
-  name: az synapse sql pool
-  summary: Manage SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage SQL pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml
deleted file mode 100644
index c70bb93c12..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/sql/pool.yml
+++ /dev/null
@@ -1,285 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_sql_pool
-  name: az synapse sql pool
-  summary: Manage SQL pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_sql_pool_create
-  - ext_synapse_az_synapse_sql_pool_delete
-  - ext_synapse_az_synapse_sql_pool_list
-  - ext_synapse_az_synapse_sql_pool_pause
-  - ext_synapse_az_synapse_sql_pool_resume
-  - ext_synapse_az_synapse_sql_pool_show
-  - ext_synapse_az_synapse_sql_pool_update
-  - ext_synapse_az_synapse_sql_pool_wait
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a SQL pool.
-    syntax:
-      content: >-
-        az synapse sql pool create --name sqlpoolcli1 --performance-level "DW1000c" \
-
-        --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --performance-level
-    summary: The performance level.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a SQL pool.
-    syntax:
-      content: az synapse sql pool delete --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List SQL pools.
-    syntax:
-      content: az synapse sql pool list --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Pause a SQL pool.
-    syntax:
-      content: az synapse sql pool pause --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Resume a SQL pool.
-    syntax:
-      content: az synapse sql pool resume --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a SQL pool.
-    syntax:
-      content: az synapse sql pool show --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a SQL pool.
-    syntax:
-      content: >-
-        az synapse sql pool update --name sqlpoolcli1 --workspace-name testsynapseworkspace --resource-group rg \
-
-        --tags key1=value1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --performance-level
-    summary: The performance level.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sql-pool-name
-    summary: SQL pool name.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_sql_pool_create
-  name: az synapse sql pool create
-  summary: Create a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_delete
-  name: az synapse sql pool delete
-  summary: Delete a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_list
-  name: az synapse sql pool list
-  summary: List all SQL pools.
-- uid: ext_synapse_az_synapse_sql_pool_pause
-  name: az synapse sql pool pause
-  summary: Pause a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_resume
-  name: az synapse sql pool resume
-  summary: Resume a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_show
-  name: az synapse sql pool show
-  summary: Get a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_update
-  name: az synapse sql pool update
-  summary: Update a SQL pool.
-- uid: ext_synapse_az_synapse_sql_pool_wait
-  name: az synapse sql pool wait
-  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage SQL pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace.yml
deleted file mode 100644
index deceb50b12..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_workspace
-  name: az synapse workspace
-  summary: Manage Synapse workspaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_workspace_check_name
-  - ext_synapse_az_synapse_workspace_create
-  - ext_synapse_az_synapse_workspace_delete
-  - ext_synapse_az_synapse_workspace_list
-  - ext_synapse_az_synapse_workspace_show
-  - ext_synapse_az_synapse_workspace_update
-  - ext_synapse_az_synapse_workspace_wait
-- uid: ext_synapse_az_synapse_workspace_check_name
-  name: az synapse workspace check-name
-  summary: Check if a Synapse workspace name is available or not.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Check if a Synapse workspace name is available or not.
-    syntax:
-      content: az synapse workspace check-name --name testsynapseworkspace
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name you wanted to check.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_create
-  name: az synapse workspace create
-  summary: Create a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a Synapse workspace
-    syntax:
-      content: >-
-        az synapse workspace create --name fromcli4 --resource-group rg \
-          --storage-account testadlsgen2 --file-system testfilesystem \
-          --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
-  - summary: Create a Synapse workspace with storage resource id
-    syntax:
-      content: >-
-        az synapse workspace create --name fromcli4 --resource-group rg \
-          --storage-account /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/testadlsgen2 --file-system testfilesystem \
-          --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
-  parameters:
-  - isRequired: true
-    name: --file-system
-    summary: The file system of the data lake storage account.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sql-admin-login-password -p
-    summary: The sql administrator login password.
-    description: ''
-  - isRequired: true
-    name: --sql-admin-login-user -u
-    summary: The sql administrator login user name.
-    description: ''
-  - isRequired: true
-    name: --storage-account
-    summary: The data lake storage account name or resource id.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_delete
-  name: az synapse workspace delete
-  summary: Delete a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a Synapse workspace.
-    syntax:
-      content: az synapse workspace delete --name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_list
-  name: az synapse workspace list
-  summary: List all Synapse workspaces.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all Synapse workspaces under a subscription
-    syntax:
-      content: az synapse workspace list
-  - summary: List all Synapse workspaces under a specific resource group
-    syntax:
-      content: az synapse workspace list --resource-group rg
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_show
-  name: az synapse workspace show
-  summary: Get a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a Synapse workspace.
-    syntax:
-      content: az synapse workspace show --name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_update
-  name: az synapse workspace update
-  summary: Update a Synapse workspace.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update a Synapse workspace
-    syntax:
-      content: >-
-        az synapse workspace update --name fromcli4 --resource-group rg \
-          --tags key1=value1
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The workspace name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sql-admin-login-password -p
-    summary: The sql administrator login password.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_wait
-  name: az synapse workspace wait
-  summary: Place the CLI in a waiting state until a condition of the workspace is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The name of the workspace.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_workspace_check_name
-  name: az synapse workspace check-name
-  summary: Check if a Synapse workspace name is available or not.
-- uid: ext_synapse_az_synapse_workspace_create
-  name: az synapse workspace create
-  summary: Create a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_delete
-  name: az synapse workspace delete
-  summary: Delete a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule
-  name: az synapse workspace firewall-rule
-  summary: Manage a workspace's firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-- uid: ext_synapse_az_synapse_workspace_list
-  name: az synapse workspace list
-  summary: List all Synapse workspaces.
-- uid: ext_synapse_az_synapse_workspace_show
-  name: az synapse workspace show
-  summary: Get a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_update
-  name: az synapse workspace update
-  summary: Update a Synapse workspace.
-- uid: ext_synapse_az_synapse_workspace_wait
-  name: az synapse workspace wait
-  summary: Place the CLI in a waiting state until a condition of the workspace is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Synapse workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml
deleted file mode 100644
index 18e26638ca..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/synapse/synapse/workspace/firewall-rule.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_synapse_az_synapse_workspace_firewall_rule
-  name: az synapse workspace firewall-rule
-  summary: Manage a workspace's firewall rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_synapse_az_synapse_workspace_firewall_rule_create
-  - ext_synapse_az_synapse_workspace_firewall_rule_delete
-  - ext_synapse_az_synapse_workspace_firewall_rule_list
-  - ext_synapse_az_synapse_workspace_firewall_rule_show
-  - ext_synapse_az_synapse_workspace_firewall_rule_wait
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a firewall rule.
-    syntax:
-      content: >-
-        az synapse workspace firewall-rule create --name allowAll --workspace-name testsynapseworkspace \
-
-        --resource-group rg --start-ip-address 0.0.0.0 --end-ip-address 255.255.255.255
-  parameters:
-  - isRequired: true
-    name: --end-ip-address
-    summary: The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --start-ip-address
-    summary: The start IP address of the firewall rule. Must be IPv4 format.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a firewall rule.
-    syntax:
-      content: az synapse workspace firewall-rule delete --name rule1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List all firewall rules.
-    syntax:
-      content: az synapse workspace firewall-rule list --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get a firewall rule.
-    syntax:
-      content: az synapse workspace firewall-rule show --name rule1 --workspace-name testsynapseworkspace --resource-group rg
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --rule-name
-    summary: The IP firewall rule name.
-    description: ''
-  - isRequired: true
-    name: --workspace-name
-    summary: The workspace name.
-    description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
-    description: ''
-  - name: --timeout
-    defaultValue: "3600"
-    summary: Maximum wait in seconds.
-    description: ''
-  - name: --updated
-    summary: Wait until updated with provisioningState at 'Succeeded'.
-    description: ''
-commands:
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-  name: az synapse workspace firewall-rule create
-  summary: Create a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-  name: az synapse workspace firewall-rule delete
-  summary: Delete a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-  name: az synapse workspace firewall-rule list
-  summary: List all firewall rules.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-  name: az synapse workspace firewall-rule show
-  summary: Get a firewall rule.
-- uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-  name: az synapse workspace firewall-rule wait
-  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage a workspace's firewall rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/index.yml
deleted file mode 100644
index d9412427f9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az
-  name: timeseriesinsights
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights
-  name: az timeseriesinsights
-  summary: Manage Azure Time Series Insights.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights.yml
deleted file mode 100644
index a0f38e9243..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights
-  name: az timeseriesinsights
-  summary: Manage Azure Time Series Insights.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-  name: az timeseriesinsights access-policy
-  summary: Commands to manage timeseriesinsights access policy.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  name: az timeseriesinsights access-policy create
-  summary: Create or update an access policy in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  name: az timeseriesinsights access-policy delete
-  summary: Delete the access policy with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  name: az timeseriesinsights access-policy list
-  summary: List all the available access policies associated with the environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  name: az timeseriesinsights access-policy show
-  summary: Show the access policy with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-  name: az timeseriesinsights access-policy update
-  summary: Create or update an access policy in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-  name: az timeseriesinsights environment
-  summary: Commands to manage timeseriesinsights environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  name: az timeseriesinsights environment delete
-  summary: Delete the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  name: az timeseriesinsights environment list
-  summary: List all the available environments associated with the subscription and within the specified resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-  name: az timeseriesinsights environment longterm
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-  name: az timeseriesinsights environment show
-  summary: Show the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-  name: az timeseriesinsights environment standard
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-  name: az timeseriesinsights event-source
-  summary: Commands to manage timeseriesinsights event source.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  name: az timeseriesinsights event-source delete
-  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-  name: az timeseriesinsights event-source eventhub
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-  name: az timeseriesinsights event-source iothub
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  name: az timeseriesinsights event-source list
-  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-  name: az timeseriesinsights event-source show
-  summary: Show the event source with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-  name: az timeseriesinsights reference-data-set
-  summary: Commands to manage timeseriesinsights reference data set.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  name: az timeseriesinsights reference-data-set create
-  summary: Create or update a reference data set in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  name: az timeseriesinsights reference-data-set delete
-  summary: Delete the reference data set with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  name: az timeseriesinsights reference-data-set list
-  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  name: az timeseriesinsights reference-data-set show
-  summary: Show the reference data set with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-  name: az timeseriesinsights reference-data-set update
-  summary: Create or update a reference data set in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Time Series Insights.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/access-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/access-policy.yml
deleted file mode 100644
index 232f77748b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/access-policy.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-  name: az timeseriesinsights access-policy
-  summary: Commands to manage timeseriesinsights access policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  - ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  name: az timeseriesinsights access-policy create
-  summary: Create or update an access policy in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create access-policy
-    syntax:
-      content: az timeseriesinsights access-policy create -g {rg} --environment-name {env} -n ap1 --principal-object-id 001 --description "some description" --roles Contributor Reader
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: A description of the access policy.
-    description: ''
-  - name: --principal-object-id
-    summary: The objectId of the principal in Azure Active Directory.
-    description: ''
-  - name: --roles
-    parameterValueGroup: Contributor, Reader
-    summary: The list of roles the principal is assigned on the environment.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  name: az timeseriesinsights access-policy delete
-  summary: Delete the access policy with the specified name in the specified subscription, resource group, and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete access-policy
-    syntax:
-      content: az timeseriesinsights access-policy delete -g {rg} --environment-name {env} -n {ap}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  name: az timeseriesinsights access-policy list
-  summary: List all the available access policies associated with the environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List access-policy by environment
-    syntax:
-      content: az timeseriesinsights access-policy list -g {rg} --environment-name {env}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  name: az timeseriesinsights access-policy show
-  summary: Show the access policy with the specified name in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Get access-policy
-    syntax:
-      content: az timeseriesinsights access-policy show -g {rg} --environment-name {env} -n {ap}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-  name: az timeseriesinsights access-policy update
-  summary: Create or update an access policy in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update access-policy
-    syntax:
-      content: >-
-        az timeseriesinsights access-policy update -g {rg} --environment-name \
-
-        {env} -n {ap} --roles "Reader,Contributor"
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights access policy associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --description
-    summary: A description of the access policy.
-    description: ''
-  - name: --roles
-    parameterValueGroup: Contributor, Reader
-    summary: The list of roles the principal is assigned on the environment.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-  name: az timeseriesinsights access-policy create
-  summary: Create or update an access policy in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-  name: az timeseriesinsights access-policy delete
-  summary: Delete the access policy with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-  name: az timeseriesinsights access-policy list
-  summary: List all the available access policies associated with the environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-  name: az timeseriesinsights access-policy show
-  summary: Show the access policy with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-  name: az timeseriesinsights access-policy update
-  summary: Create or update an access policy in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights access policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment.yml
deleted file mode 100644
index 46a5daa974..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-  name: az timeseriesinsights environment
-  summary: Commands to manage timeseriesinsights environment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_show
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  name: az timeseriesinsights environment delete
-  summary: Delete the environment with the specified name in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete an environments
-    syntax:
-      content: az timeseriesinsights environment delete -g {rg} -n {env}
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  name: az timeseriesinsights environment list
-  summary: List all the available environments associated with the subscription and within the specified resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List environments by resource group
-    syntax:
-      content: az timeseriesinsights environment list -g {rg}
-  - summary: List environments by subscription
-    syntax:
-      content: az timeseriesinsights environment list
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-  name: az timeseriesinsights environment show
-  summary: Show the environment with the specified name in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show an environments
-    syntax:
-      content: az timeseriesinsights environment show -g {rg} -n {env}
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --expand
-    summary: Setting $expand=status will include the status of the internal services of the environment in the Time Series Insights service.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-  name: az timeseriesinsights environment delete
-  summary: Delete the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-  name: az timeseriesinsights environment list
-  summary: List all the available environments associated with the subscription and within the specified resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-  name: az timeseriesinsights environment longterm
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-  name: az timeseriesinsights environment show
-  summary: Show the environment with the specified name in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-  name: az timeseriesinsights environment standard
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights environment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/longterm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/longterm.yml
deleted file mode 100644
index 1730f2008a..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/longterm.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-  name: az timeseriesinsights environment longterm
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create storage account and use it to create a longterm environment
-    syntax:
-      content: >-
-        storage=mystorageaccount
-
-        rg={rg}
-
-        az storage account create -g $rg -n $storage --https-only
-
-        key=$(az storage account keys list -g $rg -n $storage --query [0].value --output tsv)
-
-        az timeseriesinsights environment longterm create -g $rg -n {env} --location westus --sku-name L1 --sku-capacity 1 --data-retention 7 --time-series-id-properties DeviceId1 --storage-account-name $storage --storage-management-key $key
-  parameters:
-  - isRequired: true
-    name: --data-retention
-    summary: The number of days the environment's events will be available for query from the warm store.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --time-series-id-properties
-    summary: Required. The list of event properties which will be used to define the environment's time series id.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --sku-capacity
-    summary: The capacity of the sku. For standard environments, this value can be changed to support scale out of environments after they have been created.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    parameterValueGroup: L1, P1, S1, S2
-    summary: The sku determines the type of environment, either standard (S1 or S2) or long-term (L1). For standard environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
-    description: ''
-  - isRequired: true
-    name: --storage-account-name
-    summary: The name of the storage account that will hold the environment's long term data.
-    description: ''
-  - isRequired: true
-    name: --storage-management-key
-    summary: The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update dataRetention
-    syntax:
-      content: az timeseriesinsights environment longterm update -g {rg} -n {env} --data-retention 8
-  - summary: Update storageManagementKey
-    syntax:
-      content: az timeseriesinsights environment longterm update -g {rg} -n {env} --storage-management-key xxx
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --data-retention
-    summary: The number of days the environment's events will be available for query from the warm store.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --storage-management-key
-    summary: The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-  name: az timeseriesinsights environment longterm create
-  summary: Create or update a longterm environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-  name: az timeseriesinsights environment longterm update
-  summary: Update a longterm environment in the specified subscription and resource group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update a longterm environment in the specified subscription and resource group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/standard.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/standard.yml
deleted file mode 100644
index 9792903241..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/environment/standard.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-  name: az timeseriesinsights environment standard
-  summary: Create or update a standard environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  - ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a standard environment
-    syntax:
-      content: az timeseriesinsights environment standard create -g {rg} -n {env} --location westus --sku-name S1 --sku-capacity 1 --data-retention-time 31 --partition-key DeviceId1 --storage-limit-exceeded-behavior PauseIngress
-  parameters:
-  - isRequired: true
-    name: --data-retention-time
-    summary: The minimum number of days the environment's events will be available for query.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --partition-key-properties
-    summary: The list of event properties which will be used to partition data in the environment.
-    description: ''
-  - name: --storage-limit-exceeded-behavior
-    parameterValueGroup: PauseIngress, PurgeOldData
-    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --sku-capacity
-    summary: The capacity of the sku. For standard environments, this value can be changed to support scale out of environments after they have been created.
-    description: ''
-  - isRequired: true
-    name: --sku-name
-    parameterValueGroup: L1, P1, S1, S2
-    summary: The sku determines the type of environment, either standard (S1 or S2) or long-term (L1). For standard environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update sku capacity
-    syntax:
-      content: az timeseriesinsights environment standard update -g {rg} -n {env} --sku-name S1 --sku-capacity 2
-  - summary: Update data retention days
-    syntax:
-      content: az timeseriesinsights environment standard update -g {rg} -n {env} --data-retention-time 8
-  - summary: Update storage limit exceeded behavior
-    syntax:
-      content: az timeseriesinsights environment standard update -g {rg} -n {env} --storage-limit-exceeded-behavior PurgeOldData
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --data-retention-time
-    summary: The minimum number of days the environment's events will be available for query.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --partition-key-properties
-    summary: The list of event properties which will be used to partition data in the environment.
-    description: ''
-  - name: --storage-limit-exceeded-behavior
-    parameterValueGroup: PauseIngress, PurgeOldData
-    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --sku-capacity
-    summary: The capacity of the sku. For standard environments, this value can be changed to support scale out of environments after they have been created.
-    description: ''
-  - name: --sku-name
-    parameterValueGroup: L1, P1, S1, S2
-    summary: The sku determines the type of environment, either standard (S1 or S2) or long-term (L1). For standard environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-  name: az timeseriesinsights environment standard create
-  summary: Create or update a standard environment in the specified subscription and resource group.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-  name: az timeseriesinsights environment standard update
-  summary: Update a standard environment in the specified subscription and resource group.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update a standard environment in the specified subscription and resource group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source.yml
deleted file mode 100644
index ce8abf53f0..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-  name: az timeseriesinsights event-source
-  summary: Commands to manage timeseriesinsights event source.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  name: az timeseriesinsights event-source delete
-  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete event-source
-    syntax:
-      content: az timeseriesinsights event-source delete -g {rg} --environment-name {env} -n es1
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  name: az timeseriesinsights event-source list
-  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List event-source by environment
-    syntax:
-      content: az timeseriesinsights event-source list -g {rg} --environment-name {env}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-  name: az timeseriesinsights event-source show
-  summary: Show the event source with the specified name in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show event-source
-    syntax:
-      content: az timeseriesinsights event-source show -g {rg} --environment-name {env} -n es1
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-  name: az timeseriesinsights event-source delete
-  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-  name: az timeseriesinsights event-source eventhub
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-  name: az timeseriesinsights event-source iothub
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-  name: az timeseriesinsights event-source list
-  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-  name: az timeseriesinsights event-source show
-  summary: Show the event source with the specified name in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights event source.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/eventhub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/eventhub.yml
deleted file mode 100644
index 2522f0caa5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/eventhub.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-  name: az timeseriesinsights event-source eventhub
-  summary: Create or update an event hub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an eventhub and use it for event source
-    syntax:
-      content: >-
-        rg={rg}
-
-        ehns={eventhub_namespace}
-
-        eh={eventhub_name}
-
-        az eventhubs namespace create -g $rg -n $ehns
-
-        es_resource_id=$(az eventhubs eventhub create -g $rg -n $eh --namespace-name $ehns --query id --output tsv)
-
-        shared_access_key=$(az eventhubs namespace authorization-rule keys list -g $rg --namespace-name $ehns -n RootManageSharedAccessKey --query primaryKey --output tsv)
-
-        az timeseriesinsights event-source eventhub create -g $rg --environment-name {env} -n es1 --key-name RootManageSharedAccessKey --shared-access-key $shared_access_key --event-source-resource-id $es_resource_id --consumer-group-name '$Default' --timestamp-property-name DeviceId
-  parameters:
-  - isRequired: true
-    name: --consumer-group-name
-    summary: Required. The name of the event hub's consumer group that holds the partitions from which events will be read.
-    description: ''
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --event-source-resource-id
-    summary: Required. The resource id of the event source in Azure Resource Manager.
-    description: ''
-  - isRequired: true
-    name: --key-name
-    summary: Required. The name of the SAS key that grants the Time Series Insights service access to the event hub. The shared access policies for this key must grant 'Listen' permissions to the event hub.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --shared-access-key
-    summary: Required. The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update timestampPropertyName
-    syntax:
-      content: az timeseriesinsights event-source eventhub update -g {rg} --environment-name {env} -n {es} --timestamp-property-name DeviceId1
-  - summary: Update localTimestamp (Currently only Embedded is supported)
-    syntax:
-      content: az timeseriesinsights event-source eventhub update -g {rg} --environment-name {env} -n {es} --local-timestamp-format Embedded
-  - summary: Update sharedAccessKey
-    syntax:
-      content: az timeseriesinsights event-source eventhub update -g {rg} --environment-name {env} -n {es} --shared-access-key {shared_access_key}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --shared-access-key
-    summary: The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-  - name: --local-timestamp-format
-    parameterValueGroup: Embedded, Iana, TimeSpan
-    summary: An enum that represents the format of the local timestamp property that needs to be set. Currently only Embedded is supported.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-  name: az timeseriesinsights event-source eventhub create
-  summary: Create or update an event hub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-  name: az timeseriesinsights event-source eventhub update
-  summary: Create or update an event source under the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update an event hub event source under the specified environment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/iothub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/iothub.yml
deleted file mode 100644
index 3eefc05dd5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/event-source/iothub.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-  name: az timeseriesinsights event-source iothub
-  summary: Create or update an iothub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  - ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create an iothub and use it for event source
-    syntax:
-      content: >-
-        rg={rg}
-
-        iothub={iothub_name}
-
-        es_resource_id=$(az iot hub create -g $rg -n $iothub --query id --output tsv)
-
-        shared_access_key=$(az iot hub policy list -g $rg --hub-name $iothub --query "[?keyName=='iothubowner'].primaryKey" --output tsv)
-
-        az timeseriesinsights event-source iothub create -g $rg --environment-name {env} -n es2 --consumer-group-name '$Default' --key-name iothubowner --shared-access-key $shared_access_key --event-source-resource-id $es_resource_id --timestamp-property-name DeviceId
-  parameters:
-  - isRequired: true
-    name: --consumer-group-name
-    summary: Required. The name of the iot hub's consumer group that holds the partitions from which events will be read.
-    description: ''
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --event-source-resource-id
-    summary: Required. The resource id of the event source in Azure Resource Manager.
-    description: ''
-  - isRequired: true
-    name: --key-name
-    summary: Required. The name of the Shared Access Policy key that grants the Time Series Insights service access to the iot hub. This shared access policy key must grant 'service connect' permissions to the iot hub.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --shared-access-key
-    summary: Required. The value of the Shared Access Policy key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update timestampPropertyName
-    syntax:
-      content: az timeseriesinsights event-source iothub update -g {rg} --environment-name {env} -n {es} --timestamp-property-name DeviceId1
-  - summary: Update localTimestamp (Currently only Embedded is supported)
-    syntax:
-      content: az timeseriesinsights event-source iothub update -g {rg} --environment-name {env} -n {es} --local-timestamp-format Embedded
-  - summary: Update sharedAccessKey
-    syntax:
-      content: az timeseriesinsights event-source iothub update -g {rg} --environment-name {env} -n {es} --shared-access-key {shared_access_key}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Time Series Insights event source associated with the specified environment.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --shared-access-key
-    summary: The value of the shared access key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --timestamp-property-name
-    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
-    description: ''
-  - name: --local-timestamp-format
-    parameterValueGroup: Embedded, Iana, TimeSpan
-    summary: An enum that represents the format of the local timestamp property that needs to be set. Currently only Embedded is supported.
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-  name: az timeseriesinsights event-source iothub create
-  summary: Create or update an iothub event source under the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-  name: az timeseriesinsights event-source iothub update
-  summary: Create or update an event source under the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create or update an iothub event source under the specified environment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/reference-data-set.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/reference-data-set.yml
deleted file mode 100644
index 9bf6df19e6..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/timeseriesinsights/timeseriesinsights/reference-data-set.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-  name: az timeseriesinsights reference-data-set
-  summary: Commands to manage timeseriesinsights reference data set.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  - ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  name: az timeseriesinsights reference-data-set create
-  summary: Create or update a reference data set in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set create -g {rg} --environment-name {env} -n {rds} --key-properties DeviceId1 String DeviceFloor Double --data-string-comparison-behavior Ordinal
-  parameters:
-  - isRequired: true
-    name: --data-string-comparison-behavior
-    parameterValueGroup: Ordinal, OrdinalIgnoreCase
-    summary: The reference data set key comparison behavior can be set using this property. By default, the value is 'Ordinal' - which means case sensitive key comparison will be performed while joining reference data with events or while adding new reference data. When 'OrdinalIgnoreCase' is set, case insensitive comparison will be used.
-    description: ''
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --key-properties
-    summary: 'The list of key properties for the reference data set. Format: NAME TYPE ...'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  name: az timeseriesinsights reference-data-set delete
-  summary: Delete the reference data set with the specified name in the specified subscription, resource group, and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set delete -g {rg} --environment-name {env} -n {rds}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  name: az timeseriesinsights reference-data-set list
-  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List reference-data-set by environment
-    syntax:
-      content: az timeseriesinsights reference-data-set list -g {rg} --environment-name {env}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  name: az timeseriesinsights reference-data-set show
-  summary: Show the reference data set with the specified name in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Show reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set show -g {rg} --environment-name {env} -n {rds}
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-  name: az timeseriesinsights reference-data-set update
-  summary: Create or update a reference data set in the specified environment.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Update reference-data-set
-    syntax:
-      content: az timeseriesinsights reference-data-set update -g {rg} --environment-name {env} -n {rds} --tags mykey=myvalue
-  parameters:
-  - isRequired: true
-    name: --environment-name
-    summary: The name of the Time Series Insights environment associated with the specified resource group.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the reference data set.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-  name: az timeseriesinsights reference-data-set create
-  summary: Create or update a reference data set in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-  name: az timeseriesinsights reference-data-set delete
-  summary: Delete the reference data set with the specified name in the specified subscription, resource group, and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-  name: az timeseriesinsights reference-data-set list
-  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-  name: az timeseriesinsights reference-data-set show
-  summary: Show the reference data set with the specified name in the specified environment.
-- uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-  name: az timeseriesinsights reference-data-set update
-  summary: Create or update a reference data set in the specified environment.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage timeseriesinsights reference data set.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/index.yml
deleted file mode 100644
index b2a277c2f4..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az
-  name: virtual-network-tap
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network.yml
deleted file mode 100644
index 2ecc3603a9..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config
-  name: az network nic vtap-config
-  summary: Manage virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-- uid: ext_virtual-network-tap_az_network_vnet_tap
-  name: az network vnet tap
-  summary: Manage virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml
deleted file mode 100644
index a88c5b83dd..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-  description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config
-  name: az network nic vtap-config
-  summary: Manage virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml
deleted file mode 100644
index f829d8ef7d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/nic/vtap-config.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config
-  name: az network nic vtap-config
-  summary: Manage virtual network tap configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-network-tap_az_network_nic_vtap_config_create
-  - ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  - ext_virtual-network-tap_az_network_nic_vtap_config_list
-  - ext_virtual-network-tap_az_network_nic_vtap_config_show
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual network tap configuration.
-    description: ''
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vnet-tap
-    summary: Name or ID of the virtual network tap.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual network tap configuration.
-    description: ''
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual network tap configuration.
-    description: ''
-  - isRequired: true
-    name: --nic-name
-    summary: Name of the network interface (NIC).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-  name: az network nic vtap-config create
-  summary: Create a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-  name: az network nic vtap-config delete
-  summary: Delete a virtual network tap configuration.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-  name: az network nic vtap-config list
-  summary: List virtual network tap configurations.
-- uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-  name: az network nic vtap-config show
-  summary: Get details of a virtual network tap configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual network tap configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml
deleted file mode 100644
index 072a9e7abe..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-  description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-network-tap_az_network_vnet_tap
-  name: az network vnet tap
-  summary: Manage virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml
deleted file mode 100644
index 0aa1ca29ba..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-network-tap/network/vnet/tap.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-network-tap_az_network_vnet_tap
-  name: az network vnet tap
-  summary: Manage virtual network taps.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-network-tap_az_network_vnet_tap_create
-  - ext_virtual-network-tap_az_network_vnet_tap_delete
-  - ext_virtual-network-tap_az_network_vnet_tap_list
-  - ext_virtual-network-tap_az_network_vnet_tap_show
-  - ext_virtual-network-tap_az_network_vnet_tap_update
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --destination
-    summary: ID of the ILB or NIC IP configuration to receive the tap.
-    description: ''
-  - name: --port
-    summary: The VXLAN port that will receive the tapped traffic.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VNet TAP.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-network-tap_az_network_vnet_tap_create
-  name: az network vnet tap create
-  summary: Create a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-  name: az network vnet tap delete
-  summary: Delete a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_list
-  name: az network vnet tap list
-  summary: List virtual network taps.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_show
-  name: az network vnet tap show
-  summary: Get the details of a virtual network tap.
-- uid: ext_virtual-network-tap_az_network_vnet_tap_update
-  name: az network vnet tap update
-  summary: Update settings of a virtual network tap.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual network taps.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/index.yml
deleted file mode 100644
index ffab51515b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az
-  name: virtual-wan
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-wan_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network.yml
deleted file mode 100644
index 2992808bd2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network.yml
+++ /dev/null
@@ -1,185 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_virtual-wan_az_network_vhub
-  name: az network vhub
-  summary: Manage virtual hubs.
-- uid: ext_virtual-wan_az_network_vhub_connection
-  name: az network vhub connection
-  summary: Manage virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_create
-  name: az network vhub create
-  summary: Create a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_delete
-  name: az network vhub delete
-  summary: Delete a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_list
-  name: az network vhub list
-  summary: List virtual hubs.
-- uid: ext_virtual-wan_az_network_vhub_route
-  name: az network vhub route
-  summary: Manage entries in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table
-  name: az network vhub route-table
-  summary: Manage route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_show
-  name: az network vhub show
-  summary: Get the details of a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_update
-  name: az network vhub update
-  summary: Update settings of a virtual hub.
-- uid: ext_virtual-wan_az_network_vpn_gateway
-  name: az network vpn-gateway
-  summary: Manage VPN gateways.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection
-  name: az network vpn-gateway connection
-  summary: Manage VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_create
-  name: az network vpn-gateway create
-  summary: Create a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_delete
-  name: az network vpn-gateway delete
-  summary: Delete a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_list
-  name: az network vpn-gateway list
-  summary: List VPN gateways.
-- uid: ext_virtual-wan_az_network_vpn_gateway_show
-  name: az network vpn-gateway show
-  summary: Get the details of a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_update
-  name: az network vpn-gateway update
-  summary: Update settings of a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_site
-  name: az network vpn-site
-  summary: Manage VPN site configurations.
-- uid: ext_virtual-wan_az_network_vpn_site_create
-  name: az network vpn-site create
-  summary: Create a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_delete
-  name: az network vpn-site delete
-  summary: Delete a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_download
-  name: az network vpn-site download
-  summary: Provide a SAS-URL to download the configuration for a VPN site.
-- uid: ext_virtual-wan_az_network_vpn_site_list
-  name: az network vpn-site list
-  summary: List VPN site configurations.
-- uid: ext_virtual-wan_az_network_vpn_site_show
-  name: az network vpn-site show
-  summary: Get the details of a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_update
-  name: az network vpn-site update
-  summary: Update settings of a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vwan
-  name: az network vwan
-  summary: Manage virtual WANs.
-- uid: ext_virtual-wan_az_network_vwan_create
-  name: az network vwan create
-  summary: Create a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_delete
-  name: az network vwan delete
-  summary: Delete a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_list
-  name: az network vwan list
-  summary: List virtual WANs.
-- uid: ext_virtual-wan_az_network_vwan_show
-  name: az network vwan show
-  summary: Get the details of a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_update
-  name: az network vwan update
-  summary: Update settings of a virtual WAN.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub.yml
deleted file mode 100644
index 12e57fee05..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub.yml
+++ /dev/null
@@ -1,222 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub
-  name: az network vhub
-  summary: Manage virtual hubs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_create
-  - ext_virtual-wan_az_network_vhub_delete
-  - ext_virtual-wan_az_network_vhub_list
-  - ext_virtual-wan_az_network_vhub_show
-  - ext_virtual-wan_az_network_vhub_update
-- uid: ext_virtual-wan_az_network_vhub_create
-  name: az network vhub create
-  summary: Create a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address-prefix
-    summary: CIDR address prefix for the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vwan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Standard
-    summary: The sku of the VirtualHub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_delete
-  name: az network vhub delete
-  summary: Delete a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_list
-  name: az network vhub list
-  summary: List virtual hubs.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_show
-  name: az network vhub show
-  summary: Get the details of a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_update
-  name: az network vhub update
-  summary: Update settings of a virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --address-prefix
-    summary: CIDR address prefix for the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, Standard
-    summary: The sku of the VirtualHub.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vwan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_connection
-  name: az network vhub connection
-  summary: Manage virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_create
-  name: az network vhub create
-  summary: Create a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_delete
-  name: az network vhub delete
-  summary: Delete a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_list
-  name: az network vhub list
-  summary: List virtual hubs.
-- uid: ext_virtual-wan_az_network_vhub_route
-  name: az network vhub route
-  summary: Manage entries in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table
-  name: az network vhub route-table
-  summary: Manage route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_show
-  name: az network vhub show
-  summary: Get the details of a virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_update
-  name: az network vhub update
-  summary: Update settings of a virtual hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual hubs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml
deleted file mode 100644
index 62ae59c455..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/connection.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_connection
-  name: az network vhub connection
-  summary: Manage virtual hub VNet connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_connection_create
-  - ext_virtual-wan_az_network_vhub_connection_delete
-  - ext_virtual-wan_az_network_vhub_connection_list
-  - ext_virtual-wan_az_network_vhub_connection_show
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the connection.
-    description: ''
-  - isRequired: true
-    name: --remote-vnet
-    summary: Name of ID of the remote VNet to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --internet-security
-    parameterValueGroup: false, true
-    summary: Enable internet security.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --remote-vnet-transit
-    parameterValueGroup: false, true
-    summary: Enable hub to remote VNet transit.
-    description: ''
-  - name: --use-hub-vnet-gateways
-    parameterValueGroup: false, true
-    summary: Allow remote VNet to use hub's VNet gateways.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_connection_create
-  name: az network vhub connection create
-  summary: Create a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_delete
-  name: az network vhub connection delete
-  summary: Delete a virtual hub VNet connection.
-- uid: ext_virtual-wan_az_network_vhub_connection_list
-  name: az network vhub connection list
-  summary: List virtual hub VNet connections.
-- uid: ext_virtual-wan_az_network_vhub_connection_show
-  name: az network vhub connection show
-  summary: Get the details of a virtual hub VNet connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual hub VNet connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml
deleted file mode 100644
index eebb69a61d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_route_table
-  name: az network vhub route-table
-  summary: Manage route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_route_table_create
-  - ext_virtual-wan_az_network_vhub_route_table_delete
-  - ext_virtual-wan_az_network_vhub_route_table_list
-  - ext_virtual-wan_az_network_vhub_route_table_show
-  - ext_virtual-wan_az_network_vhub_route_table_update
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a route table in the virtual hub.
-    syntax:
-      content: az network vhub route-table create -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --connections All_Vnets --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type IPAddress --next-hops "10.0.0.68"
-  parameters:
-  - isRequired: true
-    name: --connections
-    parameterValueGroup: All_Branches, All_Vnets
-    summary: List of all connections attached to this route table.
-    description: ''
-  - isRequired: true
-    name: --destination-type
-    parameterValueGroup: CIDR, Service
-    summary: The type of destinations.
-    description: ''
-  - isRequired: true
-    name: --destinations
-    summary: Space-separated list of all destinations.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --next-hop-type
-    parameterValueGroup: IPAddress
-    summary: The type of next hops. Currently it only supports IP Address.
-    description: ''
-  - isRequired: true
-    name: --next-hops
-    summary: Space-separated list of IP address of the next hop.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Delete a route table in the virtual hub.
-    syntax:
-      content: az network vhub route-table delete -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a route table in the virtual hub.
-    syntax:
-      content: az network vhub route-table update -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --connections All_Vnets All_Branches
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --connections
-    parameterValueGroup: All_Branches, All_Vnets
-    summary: List of all connections attached to this route table.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_route_table_create
-  name: az network vhub route-table create
-  summary: Create a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_delete
-  name: az network vhub route-table delete
-  summary: Delete a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_list
-  name: az network vhub route-table list
-  summary: List all route tables in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_show
-  name: az network vhub route-table show
-  summary: Show a route table in the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_update
-  name: az network vhub route-table update
-  summary: Update a route table in the virtual hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage route table in the virtual hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml
deleted file mode 100644
index 9bb7ae58aa..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route-table/route.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_route_table_route
-  name: az network vhub route-table route
-  summary: Manage routes of route table in the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_route_table_route_add
-  - ext_virtual-wan_az_network_vhub_route_table_route_list
-  - ext_virtual-wan_az_network_vhub_route_table_route_remove
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Add a route with CIDR destination into route table of the virtual hub.
-    syntax:
-      content: az network vhub route-table route add -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type IPAddress --next-hops "10.0.0.68"
-  - summary: Add a route with Service destination into route table of the virtual hub.
-    syntax:
-      content: az network vhub route-table route add -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --destination-type Service --destinations Skype Sharepoint --next-hop-type IPAddress --next-hops "10.0.0.68"
-  parameters:
-  - isRequired: true
-    name: --destination-type
-    parameterValueGroup: CIDR, Service
-    summary: The type of destinations.
-    description: ''
-  - isRequired: true
-    name: --destinations
-    summary: Space-separated list of all destinations.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --next-hop-type
-    parameterValueGroup: IPAddress
-    summary: The type of next hops. Currently it only supports IP Address.
-    description: ''
-  - isRequired: true
-    name: --next-hops
-    summary: Space-separated list of IP address of the next hop.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --index
-    summary: List index of the item (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual hub route table.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-  name: az network vhub route-table route add
-  summary: Add a route into route table of the virtual hub.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-  name: az network vhub route-table route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-  name: az network vhub route-table route remove
-  summary: Remove a route from route table of the virtual hub.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage routes of route table in the virtual hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml
deleted file mode 100644
index 04eb48ced8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vhub/route.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vhub_route
-  name: az network vhub route
-  summary: Manage entries in the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vhub_route_add
-  - ext_virtual-wan_az_network_vhub_route_list
-  - ext_virtual-wan_az_network_vhub_route_remove
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --address-prefixes
-    summary: Space-separated list of CIDR prefixes.
-    description: ''
-  - isRequired: true
-    name: --next-hop
-    summary: IP address of the next hop.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --index
-    summary: List index of the item (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub-name
-    summary: Name of the virtual hub.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vhub_route_add
-  name: az network vhub route add
-  summary: Add a route to the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_list
-  name: az network vhub route list
-  summary: List routes in the virtual hub route table.
-- uid: ext_virtual-wan_az_network_vhub_route_remove
-  name: az network vhub route remove
-  summary: Remove a route from the virtual hub route table.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage entries in the virtual hub route table.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml
deleted file mode 100644
index 2e10255266..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_gateway
-  name: az network vpn-gateway
-  summary: Manage VPN gateways.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_gateway_create
-  - ext_virtual-wan_az_network_vpn_gateway_delete
-  - ext_virtual-wan_az_network_vpn_gateway_list
-  - ext_virtual-wan_az_network_vpn_gateway_show
-  - ext_virtual-wan_az_network_vpn_gateway_update
-- uid: ext_virtual-wan_az_network_vpn_gateway_create
-  name: az network vpn-gateway create
-  summary: Create a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vhub
-    summary: Name or ID of a virtual hub.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --scale-unit
-    summary: The scale unit for this VPN gateway.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_delete
-  name: az network vpn-gateway delete
-  summary: Delete a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_list
-  name: az network vpn-gateway list
-  summary: List VPN gateways.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_show
-  name: az network vpn-gateway show
-  summary: Get the details of a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_update
-  name: az network vpn-gateway update
-  summary: Update settings of a VPN gateway.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --scale-unit
-    summary: The scale unit for this VPN gateway.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vhub
-    summary: Name or ID of a virtual hub.
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection
-  name: az network vpn-gateway connection
-  summary: Manage VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_create
-  name: az network vpn-gateway create
-  summary: Create a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_delete
-  name: az network vpn-gateway delete
-  summary: Delete a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_list
-  name: az network vpn-gateway list
-  summary: List VPN gateways.
-- uid: ext_virtual-wan_az_network_vpn_gateway_show
-  name: az network vpn-gateway show
-  summary: Get the details of a VPN gateway.
-- uid: ext_virtual-wan_az_network_vpn_gateway_update
-  name: az network vpn-gateway update
-  summary: Update settings of a VPN gateway.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN gateways.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml
deleted file mode 100644
index b34b1d11cf..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection
-  name: az network vpn-gateway connection
-  summary: Manage VPN gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_gateway_connection_create
-  - ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  - ext_virtual-wan_az_network_vpn_gateway_connection_list
-  - ext_virtual-wan_az_network_vpn_gateway_connection_show
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --remote-vpn-site
-    summary: Name of ID of the remote VPN site.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --connection-bandwidth
-    summary: Expected bandwidth in Mbps.
-    description: ''
-  - name: --enable-bgp
-    parameterValueGroup: false, true
-    summary: Enable BGP.
-    description: ''
-  - name: --internet-security
-    parameterValueGroup: false, true
-    summary: Enable internet security.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --protocol-type
-    parameterValueGroup: IKEv1, IKEv2
-    summary: Connection protocol.
-    description: ''
-  - name: --rate-limiting
-    parameterValueGroup: false, true
-    summary: Enable rate limiting.
-    description: ''
-  - name: --routing-weight
-    summary: Routing weight.
-    description: ''
-  - name: --shared-key
-    summary: Shared key.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-  name: az network vpn-gateway connection create
-  summary: Create a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-  name: az network vpn-gateway connection delete
-  summary: Delete a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-  name: az network vpn-gateway connection list
-  summary: List VPN gateway connections.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-  name: az network vpn-gateway connection show
-  summary: Get the details of a VPN gateway connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN gateway connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml
deleted file mode 100644
index 9426fcb3b7..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-gateway/connection/ipsec-policy.yml
+++ /dev/null
@@ -1,143 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-  name: az network vpn-gateway connection ipsec-policy
-  summary: Manage VPN gateway connection IPSec policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  - ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  - ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --connection-name
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - isRequired: true
-    name: --dh-group
-    parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
-    summary: DH Groups used in IKE Phase 1 for initial SA.
-    description: ''
-  - isRequired: true
-    name: --ike-encryption
-    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256
-    summary: IKE encryption algorithm (IKE phase 2).
-    description: ''
-  - isRequired: true
-    name: --ike-integrity
-    parameterValueGroup: GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384
-    summary: IKE integrity algorithm (IKE phase 2).
-    description: ''
-  - isRequired: true
-    name: --ipsec-encryption
-    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
-    summary: IPSec encryption algorithm (IKE phase 1).
-    description: ''
-  - isRequired: true
-    name: --ipsec-integrity
-    parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
-    summary: IPSec integrity algorithm (IKE phase 1).
-    description: ''
-  - isRequired: true
-    name: --pfs-group
-    parameterValueGroup: ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM
-    summary: The Pfs Groups used in IKE Phase 2 for new child SA.
-    description: ''
-  - isRequired: true
-    name: --sa-data-size
-    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site-to-site VPN tunnel.
-    description: ''
-  - isRequired: true
-    name: --sa-lifetime
-    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site-to-site VPN tunnel.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --connection-name
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --connection-name
-    summary: Name of the VPN gateway connection.
-    description: ''
-  - isRequired: true
-    name: --gateway-name
-    summary: Name of the VPN gateway.
-    description: ''
-  - isRequired: true
-    name: --index
-    summary: List index of the item (starting with 1).
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-  name: az network vpn-gateway connection ipsec-policy add
-  summary: Add an IPSec policy to a VPN gateway connection.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-  name: az network vpn-gateway connection ipsec-policy list
-  summary: List VPN gateway connection IPSec policies.
-- uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-  name: az network vpn-gateway connection ipsec-policy remove
-  summary: Remove an IPSec policy from a VPN gateway connection.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN gateway connection IPSec policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml
deleted file mode 100644
index f562658fc8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vpn-site.yml
+++ /dev/null
@@ -1,237 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vpn_site
-  name: az network vpn-site
-  summary: Manage VPN site configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vpn_site_create
-  - ext_virtual-wan_az_network_vpn_site_delete
-  - ext_virtual-wan_az_network_vpn_site_download
-  - ext_virtual-wan_az_network_vpn_site_list
-  - ext_virtual-wan_az_network_vpn_site_show
-  - ext_virtual-wan_az_network_vpn_site_update
-- uid: ext_virtual-wan_az_network_vpn_site_create
-  name: az network vpn-site create
-  summary: Create a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --ip-address
-    summary: IP address of the VPN site.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --address-prefixes
-    summary: Space-separated list of CIDR address prefixes.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --security-site
-    parameterValueGroup: false, true
-    summary: Whether the VPN site is security-related.
-    description: ''
-  - name: --site-key
-    summary: Key for the VPN site that can be used for connections.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --virtual-wan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-  - name: --device-model
-    summary: Model of the device.
-    description: ''
-  - name: --device-vendor
-    summary: Name of the device vendor.
-    description: ''
-  - name: --link-speed
-    summary: Link speed in Mbps.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_delete
-  name: az network vpn-site delete
-  summary: Delete a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_download
-  name: az network vpn-site download
-  summary: Provide a SAS-URL to download the configuration for a VPN site.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --vwan-name
-    summary: Name of the virtual WAN.
-    description: ''
-  - name: --output-blob-sas-url
-    summary: The sas-url to download the configurations for vpn-sites.
-    description: ''
-  - name: --vpn-sites
-    summary: Space-separated list of VPN site names or IDs.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_list
-  name: az network vpn-site list
-  summary: List VPN site configurations.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_show
-  name: az network vpn-site show
-  summary: Get the details of a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vpn_site_update
-  name: az network vpn-site update
-  summary: Update settings of a VPN site configuration.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the VPN site config.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --address-prefixes
-    summary: Space-separated list of CIDR address prefixes.
-    description: ''
-  - name: --ip-address
-    summary: IP address of the VPN site.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --security-site
-    parameterValueGroup: false, true
-    summary: Whether the VPN site is security-related.
-    description: ''
-  - name: --site-key
-    summary: Key for the VPN site that can be used for connections.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --virtual-wan
-    summary: Name or ID of the virtual WAN.
-    description: ''
-  - name: --asn
-    summary: BGP speaker's ASN.
-    description: ''
-  - name: --bgp-peering-address
-    summary: Peering address and BGP identifier of this BGP speaker.
-    description: ''
-  - name: --peer-weight
-    summary: Weight added to routes learned from this BGP speaker.
-    description: ''
-  - name: --device-model
-    summary: Model of the device.
-    description: ''
-  - name: --device-vendor
-    summary: Name of the device vendor.
-    description: ''
-  - name: --link-speed
-    summary: Link speed in Mbps.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vpn_site_create
-  name: az network vpn-site create
-  summary: Create a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_delete
-  name: az network vpn-site delete
-  summary: Delete a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_download
-  name: az network vpn-site download
-  summary: Provide a SAS-URL to download the configuration for a VPN site.
-- uid: ext_virtual-wan_az_network_vpn_site_list
-  name: az network vpn-site list
-  summary: List VPN site configurations.
-- uid: ext_virtual-wan_az_network_vpn_site_show
-  name: az network vpn-site show
-  summary: Get the details of a VPN site configuration.
-- uid: ext_virtual-wan_az_network_vpn_site_update
-  name: az network vpn-site update
-  summary: Update settings of a VPN site configuration.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage VPN site configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vwan.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vwan.yml
deleted file mode 100644
index 01efa98b4e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/virtual-wan/network/vwan.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_virtual-wan_az_network_vwan
-  name: az network vwan
-  summary: Manage virtual WANs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_virtual-wan_az_network_vwan_create
-  - ext_virtual-wan_az_network_vwan_delete
-  - ext_virtual-wan_az_network_vwan_list
-  - ext_virtual-wan_az_network_vwan_show
-  - ext_virtual-wan_az_network_vwan_update
-- uid: ext_virtual-wan_az_network_vwan_create
-  name: az network vwan create
-  summary: Create a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --branch-to-branch-traffic
-    parameterValueGroup: false, true
-    summary: Allow branch-to-branch traffic flow.
-    description: ''
-  - name: --disable-vpn-encryption
-    parameterValueGroup: false, true
-    summary: State of VPN encryption.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --office365-category
-    summary: The office local breakout category.
-    description: ''
-  - name: --security-provider-name
-    summary: The security provider name.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --type
-    parameterValueGroup: Basic, Standard
-    summary: The type of the VirtualWAN.
-    description: ''
-  - name: --vnet-to-vnet-traffic
-    parameterValueGroup: false, true
-    summary: Allow VNet-to-VNet traffic flow.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_delete
-  name: az network vwan delete
-  summary: Delete a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_list
-  name: az network vwan list
-  summary: List virtual WANs.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_show
-  name: az network vwan show
-  summary: Get the details of a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_virtual-wan_az_network_vwan_update
-  name: az network vwan update
-  summary: Update settings of a virtual WAN.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the virtual WAN.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --branch-to-branch-traffic
-    parameterValueGroup: false, true
-    summary: Allow branch-to-branch traffic flow.
-    description: ''
-  - name: --disable-vpn-encryption
-    parameterValueGroup: false, true
-    summary: State of VPN encryption.
-    description: ''
-  - name: --office365-category
-    summary: The office local breakout category.
-    description: ''
-  - name: --security-provider-name
-    summary: The security provider name.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --type
-    parameterValueGroup: Basic, Standard
-    summary: The type of the VirtualWAN.
-    description: ''
-  - name: --vnet-to-vnet-traffic
-    parameterValueGroup: false, true
-    summary: Allow VNet-to-VNet traffic flow.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-commands:
-- uid: ext_virtual-wan_az_network_vwan_create
-  name: az network vwan create
-  summary: Create a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_delete
-  name: az network vwan delete
-  summary: Delete a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_list
-  name: az network vwan list
-  summary: List virtual WANs.
-- uid: ext_virtual-wan_az_network_vwan_show
-  name: az network vwan show
-  summary: Get the details of a virtual WAN.
-- uid: ext_virtual-wan_az_network_vwan_update
-  name: az network vwan update
-  summary: Update settings of a virtual WAN.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage virtual WANs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/index.yml
deleted file mode 100644
index 331eb2bcb2..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vm-repair_az
-  name: vm-repair
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_vm-repair_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm.yml
deleted file mode 100644
index f3df7d1d07..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vm-repair_az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_vm-repair_az_vm_repair
-  name: az vm repair
-  summary: Auto repair commands to fix VMs.
-- uid: ext_vm-repair_az_vm_repair_create
-  name: az vm repair create
-  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
-- uid: ext_vm-repair_az_vm_repair_list_scripts
-  name: az vm repair list-scripts
-  summary: List available scripts. Located <a href="https://github.com/Azure/repair-script-library">https://github.com/Azure/repair-script-library</a>.
-- uid: ext_vm-repair_az_vm_repair_restore
-  name: az vm repair restore
-  summary: Replace source VM's OS disk with data disk from repair VM.
-- uid: ext_vm-repair_az_vm_repair_run
-  name: az vm repair run
-  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Linux or Windows virtual machines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm/repair.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm/repair.yml
deleted file mode 100644
index 4eb1652508..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vm-repair/vm/repair.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vm-repair_az_vm_repair
-  name: az vm repair
-  summary: Auto repair commands to fix VMs.
-  description: VM repair scripts will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
-  langs:
-  - azurecli
-  children:
-  - ext_vm-repair_az_vm_repair_create
-  - ext_vm-repair_az_vm_repair_list_scripts
-  - ext_vm-repair_az_vm_repair_restore
-  - ext_vm-repair_az_vm_repair_run
-- uid: ext_vm-repair_az_vm_repair_create
-  name: az vm repair create
-  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Create a repair VM
-    syntax:
-      content: az vm repair create -g MyResourceGroup -n myVM --verbose
-  - summary: Create a repair VM and set the VM authentication
-    syntax:
-      content: az vm repair create -g MyResourceGroup -n myVM --repair-username username --repair-password password!234 --verbose
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --copy-disk-name
-    summary: Name of OS disk copy.
-    description: ''
-  - name: --repair-group-name
-    summary: Repair resource group name.
-    description: ''
-  - name: --repair-password
-    summary: Admin password for the repair VM.
-    description: ''
-  - name: --repair-username
-    summary: Admin username for repair VM.
-    description: ''
-  - name: --repair-vm-name
-    summary: Name of repair VM.
-    description: ''
-  - name: --unlock-encrypted-vm
-    summary: Option to auto-unlock encrypted VMs using current subscription auth.
-    description: ''
-- uid: ext_vm-repair_az_vm_repair_list_scripts
-  name: az vm repair list-scripts
-  summary: List available scripts. Located <a href="https://github.com/Azure/repair-script-library">https://github.com/Azure/repair-script-library</a>.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: List scripts
-    syntax:
-      content: az vm repair list-scripts --verbose
-  - summary: List windows scripts only.
-    syntax:
-      content: az vm repair list-scripts --query "[?starts_with(id, 'win')]"
-  - summary: List scripts with test in its description.
-    syntax:
-      content: az vm repair list-scripts --query "[?contains(description, 'test')]"
-  parameters: []
-- uid: ext_vm-repair_az_vm_repair_restore
-  name: az vm repair restore
-  summary: Replace source VM's OS disk with data disk from repair VM.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Restore from the repair VM, command will auto-search for repair-vm
-    syntax:
-      content: az vm repair restore -g MyResourceGroup -n MyVM --verbose
-  - summary: Restore from the repair VM, specify the disk to restore
-    syntax:
-      content: az vm repair restore -g MyResourceGroup -n MyVM --disk-name MyDiskCopy --verbose
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --disk-name
-    summary: Name of fixed data disk. Defaults to the first data disk in the repair VM.
-    description: ''
-  - name: --repair-vm-id
-    summary: Repair VM resource id.
-    description: ''
-  - name: --yes
-    summary: Deletes the repair resources without confirmation.
-    description: ''
-- uid: ext_vm-repair_az_vm_repair_run
-  name: az vm repair run
-  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Run the script with <run-id> directly on the VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --verbose
-  - summary: Run the script with <run-id> on the linked repair VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --run-on-repair --verbose
-  - summary: Run a script with parameters on the VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --parameters hello=hi world=earth --verbose
-  - summary: Run a local custom script on the VM.
-    syntax:
-      content: az vm repair run -g MyResourceGroup -n MySourceWinVM --custom-script-file ./file.ps1 --verbose
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --custom-script-file
-    summary: Custom script file to run on VM. Script should be PowerShell for windows, Bash for Linux.
-    description: ''
-  - name: --parameters
-    summary: Space-separated parameters in the format of '[name=]value'. Positional for bash scripts.
-    description: ''
-  - name: --repair-vm-id
-    summary: Repair VM resource id.
-    description: ''
-  - name: --run-id
-    summary: Unique run id for run scripts.
-    description: ''
-  - name: --run-on-repair
-    summary: Script will be run on the linked repair VM.
-    description: ''
-commands:
-- uid: ext_vm-repair_az_vm_repair_create
-  name: az vm repair create
-  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
-- uid: ext_vm-repair_az_vm_repair_list_scripts
-  name: az vm repair list-scripts
-  summary: List available scripts. Located <a href="https://github.com/Azure/repair-script-library">https://github.com/Azure/repair-script-library</a>.
-- uid: ext_vm-repair_az_vm_repair_restore
-  name: az vm repair restore
-  summary: Replace source VM's OS disk with data disk from repair VM.
-- uid: ext_vm-repair_az_vm_repair_run
-  name: az vm repair run
-  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: VM repair scripts will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/index.yml
deleted file mode 100644
index 82366021a1..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az
-  name: vmware
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_vmware_az_vmware
-  name: az vmware
-  summary: Commands to manage Azure VMware Solutions.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware.yml
deleted file mode 100644
index 7ccb77020f..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az_vmware
-  name: az vmware
-  summary: Commands to manage Azure VMware Solutions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_vmware_az_vmware_checkquotaavailability
-- uid: ext_vmware_az_vmware_checkquotaavailability
-  name: az vmware checkquotaavailability
-  summary: Return quota for subscription by region.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-commands:
-- uid: ext_vmware_az_vmware_checkquotaavailability
-  name: az vmware checkquotaavailability
-  summary: Return quota for subscription by region.
-- uid: ext_vmware_az_vmware_cluster
-  name: az vmware cluster
-  summary: Commands to manage clusters in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_create
-  name: az vmware cluster create
-  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
-- uid: ext_vmware_az_vmware_cluster_delete
-  name: az vmware cluster delete
-  summary: Delete a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_list
-  name: az vmware cluster list
-  summary: List clusters in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_show
-  name: az vmware cluster show
-  summary: Show details of a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_update
-  name: az vmware cluster update
-  summary: Update a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud
-  name: az vmware private-cloud
-  summary: Commands to manage private clouds.
-- uid: ext_vmware_az_vmware_private_cloud_addauthorization
-  name: az vmware private-cloud addauthorization
-  summary: Add an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-  name: az vmware private-cloud addidentitysource
-  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_create
-  name: az vmware private-cloud create
-  summary: Create a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_delete
-  name: az vmware private-cloud delete
-  summary: Delete a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-  name: az vmware private-cloud deleteauthorization
-  summary: Delete an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  name: az vmware private-cloud deleteidentitysource
-  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_list
-  name: az vmware private-cloud list
-  summary: List the private clouds.
-- uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-  name: az vmware private-cloud listadmincredentials
-  summary: List the admin credentials for the private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_show
-  name: az vmware private-cloud show
-  summary: Show details of a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_update
-  name: az vmware private-cloud update
-  summary: Update a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage Azure VMware Solutions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/cluster.yml
deleted file mode 100644
index 1273ac6a19..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/cluster.yml
+++ /dev/null
@@ -1,151 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az_vmware_cluster
-  name: az vmware cluster
-  summary: Commands to manage clusters in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_vmware_az_vmware_cluster_create
-  - ext_vmware_az_vmware_cluster_delete
-  - ext_vmware_az_vmware_cluster_list
-  - ext_vmware_az_vmware_cluster_show
-  - ext_vmware_az_vmware_cluster_update
-- uid: ext_vmware_az_vmware_cluster_create
-  name: az vmware cluster create
-  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --size
-    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_delete
-  name: az vmware cluster delete
-  summary: Delete a cluster in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_list
-  name: az vmware cluster list
-  summary: List clusters in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_show
-  name: az vmware cluster show
-  summary: Show details of a cluster in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_cluster_update
-  name: az vmware cluster update
-  summary: Update a cluster in a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --size
-    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-commands:
-- uid: ext_vmware_az_vmware_cluster_create
-  name: az vmware cluster create
-  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
-- uid: ext_vmware_az_vmware_cluster_delete
-  name: az vmware cluster delete
-  summary: Delete a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_list
-  name: az vmware cluster list
-  summary: List clusters in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_show
-  name: az vmware cluster show
-  summary: Show details of a cluster in a private cloud.
-- uid: ext_vmware_az_vmware_cluster_update
-  name: az vmware cluster update
-  summary: Update a cluster in a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage clusters in a private cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml
deleted file mode 100644
index 59e714a6a5..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/vmware/vmware/private-cloud.yml
+++ /dev/null
@@ -1,310 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_vmware_az_vmware_private_cloud
-  name: az vmware private-cloud
-  summary: Commands to manage private clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_vmware_az_vmware_private_cloud_addauthorization
-  - ext_vmware_az_vmware_private_cloud_addidentitysource
-  - ext_vmware_az_vmware_private_cloud_create
-  - ext_vmware_az_vmware_private_cloud_delete
-  - ext_vmware_az_vmware_private_cloud_deleteauthorization
-  - ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  - ext_vmware_az_vmware_private_cloud_list
-  - ext_vmware_az_vmware_private_cloud_listadmincredentials
-  - ext_vmware_az_vmware_private_cloud_show
-  - ext_vmware_az_vmware_private_cloud_update
-- uid: ext_vmware_az_vmware_private_cloud_addauthorization
-  name: az vmware private-cloud addauthorization
-  summary: Add an authorization to the ExpressRoute for a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the authorization.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-  name: az vmware private-cloud addidentitysource
-  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --alias
-    summary: The domain's NetBIOS name.
-    description: ''
-  - isRequired: true
-    name: --base-group-dn
-    summary: The base distinguished name for groups.
-    description: ''
-  - isRequired: true
-    name: --base-user-dn
-    summary: The base distinguished name for users.
-    description: ''
-  - isRequired: true
-    name: --domain
-    summary: The domain's dns name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the identity source.
-    description: ''
-  - isRequired: true
-    name: --password
-    summary: The password of the Active Directory user with a minimum of read-only access to Base DN for users and groups.
-    description: ''
-  - isRequired: true
-    name: --primary-server
-    summary: Primary server URL.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --username
-    summary: The ID of an Active Directory user with a minimum of read-only access to Base DN for users and group.
-    description: ''
-  - name: --secondary-server
-    summary: Secondary server URL.
-    description: ''
-  - name: --ssl
-    defaultValue: Disabled
-    summary: Protect LDAP communication using SSL certificate (LDAPS). Specify "Enabled" or "Disabled".
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_create
-  name: az vmware private-cloud create
-  summary: Create a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --cluster-size
-    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
-    description: ''
-  - isRequired: true
-    name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --network-block
-    summary: A subnet at least of size /22. Make sure the CIDR format is conformed to (A.B.C.D/X) where A,B,C,D are between 0 and 255, and X is between 0 and 22.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    summary: The product SKU.
-    description: ''
-  - name: --circuit-primary-subnet
-    summary: A /30 subnet for the primary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
-    description: ''
-  - name: --circuit-secondary-subnet
-    summary: A /30 subnet for the secondary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
-    description: ''
-  - name: --internet
-    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
-    description: ''
-  - name: --nsxt-password
-    summary: NSX-T Manager password.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vcenter-password
-    summary: VCenter admin password.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_delete
-  name: az vmware private-cloud delete
-  summary: Delete a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-  name: az vmware private-cloud deleteauthorization
-  summary: Delete an authorization to the ExpressRoute for a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the authorization.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  name: az vmware private-cloud deleteidentitysource
-  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --alias
-    summary: The domain's NetBIOS name.
-    description: ''
-  - isRequired: true
-    name: --domain
-    summary: The domain's dns name.
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: The name of the identity source.
-    description: ''
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_list
-  name: az vmware private-cloud list
-  summary: List the private clouds.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-  name: az vmware private-cloud listadmincredentials
-  summary: List the admin credentials for the private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --private-cloud -c
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_show
-  name: az vmware private-cloud show
-  summary: Show details of a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-- uid: ext_vmware_az_vmware_private_cloud_update
-  name: az vmware private-cloud update
-  summary: Update a private cloud.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the private cloud.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --cluster-size
-    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
-    description: ''
-  - name: --internet
-    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
-    description: ''
-commands:
-- uid: ext_vmware_az_vmware_private_cloud_addauthorization
-  name: az vmware private-cloud addauthorization
-  summary: Add an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-  name: az vmware private-cloud addidentitysource
-  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_create
-  name: az vmware private-cloud create
-  summary: Create a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_delete
-  name: az vmware private-cloud delete
-  summary: Delete a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-  name: az vmware private-cloud deleteauthorization
-  summary: Delete an authorization to the ExpressRoute for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-  name: az vmware private-cloud deleteidentitysource
-  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_list
-  name: az vmware private-cloud list
-  summary: List the private clouds.
-- uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-  name: az vmware private-cloud listadmincredentials
-  summary: List the admin credentials for the private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_show
-  name: az vmware private-cloud show
-  summary: Show details of a private cloud.
-- uid: ext_vmware_az_vmware_private_cloud_update
-  name: az vmware private-cloud update
-  summary: Update a private cloud.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage private clouds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/index.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/index.yml
deleted file mode 100644
index 505618e53b..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/index.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az
-  name: webapp
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_webapp_az_webapp
-  name: az webapp
-  summary: Manage web apps.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp.yml
deleted file mode 100644
index 6eede24874..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp
-  name: az webapp
-  summary: Manage web apps.
-  description: ''
-  langs:
-  - azurecli
-  children: []
-commands:
-- uid: ext_webapp_az_webapp_container
-  name: az webapp container
-  summary: Group of commands related to webapp container operations.
-- uid: ext_webapp_az_webapp_container_up
-  name: az webapp container up
-  summary: Experimental command to create and deploy a container webapp.
-- uid: ext_webapp_az_webapp_remote_connection
-  name: az webapp remote-connection
-  summary: Create a remote connection using a tcp tunnel to your web app.
-- uid: ext_webapp_az_webapp_remote_connection_create
-  name: az webapp remote-connection create
-  summary: Creates a remote connection using a tcp tunnel to your web app.
-- uid: ext_webapp_az_webapp_scan
-  name: az webapp scan
-  summary: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
-- uid: ext_webapp_az_webapp_scan_list_result
-  name: az webapp scan list-result
-  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
-- uid: ext_webapp_az_webapp_scan_show_result
-  name: az webapp scan show-result
-  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
-- uid: ext_webapp_az_webapp_scan_start
-  name: az webapp scan start
-  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
-- uid: ext_webapp_az_webapp_scan_stop
-  name: az webapp scan stop
-  summary: Stops the current executing scan. Does nothing if no scan is executing.
-- uid: ext_webapp_az_webapp_scan_track
-  name: az webapp scan track
-  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage web apps.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/container.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/container.yml
deleted file mode 100644
index e2046cf8a8..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/container.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp_container
-  name: az webapp container
-  summary: Group of commands related to webapp container operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_webapp_az_webapp_container_up
-- uid: ext_webapp_az_webapp_container_up
-  name: az webapp container up
-  summary: Experimental command to create and deploy a container webapp.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Deploy a container using an image from DockerHub. This example uses nginx.
-    syntax:
-      content: az webapp container up -n AppName -i nginx
-  - summary: Upload files from the current directory to an Azure Container Registry, then build a container image and deploy it to a web app. The Azure Container Registry must already exist.
-    syntax:
-      content: az webapp container up -n AppName --registry-rg ContainerRegistryResourceGroup --registry-name ContainerRegistryName
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp. You can configure the default using 'az configure --defaults web=<name>'.
-    description: ''
-  - name: --docker-custom-image-name -i
-    summary: The container image name and optionally the tag name (currently public DockerHub images only).
-    description: ''
-  - name: --dryrun
-    summary: Show summary of the create and deploy operation instead of executing it.
-    description: ''
-  - name: --registry-name
-    summary: The name of the Azure Container Registry.
-    description: ''
-  - name: --registry-rg
-    summary: The resource group of the Azure Container Registry.
-    description: ''
-  - name: --source-location -s
-    summary: The path to the web app source directory.
-    description: ''
-commands:
-- uid: ext_webapp_az_webapp_container_up
-  name: az webapp container up
-  summary: Experimental command to create and deploy a container webapp.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Group of commands related to webapp container operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml
deleted file mode 100644
index 4599a9c08e..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/remote-connection.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp_remote_connection
-  name: az webapp remote-connection
-  summary: Create a remote connection using a tcp tunnel to your web app.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_webapp_az_webapp_remote_connection_create
-- uid: ext_webapp_az_webapp_remote_connection_create
-  name: az webapp remote-connection create
-  summary: Creates a remote connection using a tcp tunnel to your web app.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --port -p
-    summary: 'Port for the remote connection. Default: Random available port.'
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-commands:
-- uid: ext_webapp_az_webapp_remote_connection_create
-  name: az webapp remote-connection create
-  summary: Creates a remote connection using a tcp tunnel to your web app.
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Create a remote connection using a tcp tunnel to your web app.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/scan.yml b/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/scan.yml
deleted file mode 100644
index 2a96d9621d..0000000000
--- a/2018-03-01-hybrid/docs-ref-autogen/ext/webapp/webapp/scan.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-### YamlMime:UniversalReference
-items:
-- uid: ext_webapp_az_webapp_scan
-  name: az webapp scan
-  summary: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - ext_webapp_az_webapp_scan_list_result
-  - ext_webapp_az_webapp_scan_show_result
-  - ext_webapp_az_webapp_scan_start
-  - ext_webapp_az_webapp_scan_stop
-  - ext_webapp_az_webapp_scan_track
-- uid: ext_webapp_az_webapp_scan_list_result
-  name: az webapp scan list-result
-  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-- uid: ext_webapp_az_webapp_scan_show_result
-  name: az webapp scan show-result
-  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --scan-id
-    summary: Unique scan id.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-- uid: ext_webapp_az_webapp_scan_start
-  name: az webapp scan start
-  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-  - name: --timeout
-    summary: Timeout for operation in milliseconds.
-    description: ''
-- uid: ext_webapp_az_webapp_scan_stop
-  name: az webapp scan stop
-  summary: Stops the current executing scan. Does nothing if no scan is executing.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-- uid: ext_webapp_az_webapp_scan_track
-  name: az webapp scan track
-  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
-  description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the webapp to connect to.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --scan-id
-    summary: Unique scan id.
-    description: ''
-  - name: --slot
-    summary: ''
-    description: ''
-commands:
-- uid: ext_webapp_az_webapp_scan_list_result
-  name: az webapp scan list-result
-  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
-- uid: ext_webapp_az_webapp_scan_show_result
-  name: az webapp scan show-result
-  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
-- uid: ext_webapp_az_webapp_scan_start
-  name: az webapp scan start
-  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
-- uid: ext_webapp_az_webapp_scan_stop
-  name: az webapp scan stop
-  summary: Stops the current executing scan. Does nothing if no scan is executing.
-- uid: ext_webapp_az_webapp_scan_track
-  name: az webapp scan track
-  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
-globalParameters:
-- name: --debug
-  summary: Increase logging verbosity to show all debug logs.
-- name: --help -h
-  summary: Show this help message and exit.
-- name: --only-show-errors
-  summary: Only show errors, suppressing warnings.
-- name: --output -o
-  defaultValue: json
-  parameterValueGroup: json, jsonc, table, tsv
-  summary: Output format.
-- name: --query
-  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
-- name: --verbose
-  summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/extension.yml b/2018-03-01-hybrid/docs-ref-autogen/extension.yml
index 40c0f85575..1506486c4e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/extension.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/extension.yml
@@ -1,192 +1,171 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_extension
-  name: az extension
-  summary: Manage and update CLI extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_extension_add
-  - az_extension_list
-  - az_extension_list_available
-  - az_extension_remove
-  - az_extension_show
-  - az_extension_update
+### YamlMime:AzureCLIGroup
+uid: az_extension
+name: az extension
+summary: Manage and update CLI extensions.
+description: ''
+directCommands:
 - uid: az_extension_add
   name: az extension add
   summary: Add an extension.
-  description: ''
-  langs:
-  - azurecli
+  description: To learn about installing extensions automatically, visit https://aka.ms/AzExtDynamicInstall.
+  syntax: >-
+    az extension add [--name]
+                     [--pip-extra-index-urls]
+                     [--pip-proxy]
+                     [--source]
+                     [--system]
+                     [--upgrade]
+                     [--version]
+                     [--yes]
   examples:
   - summary: Add extension by name
-    syntax:
-      content: az extension add --name anextension
+    syntax: az extension add --name anextension
   - summary: Add extension from URL
-    syntax:
-      content: az extension add --source https://contoso.com/anextension-0.0.1-py2.py3-none-any.whl
+    syntax: az extension add --source https://contoso.com/anextension-0.0.1-py2.py3-none-any.whl
   - summary: Add extension from local disk
-    syntax:
-      content: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl
+    syntax: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl
   - summary: Add extension from local disk and use pip proxy for dependencies
-    syntax:
-      content: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl --pip-proxy https://user:pass@proxy.server:8080
+    syntax: az extension add --source ~/anextension-0.0.1-py2.py3-none-any.whl --pip-proxy https://user:pass@proxy.server:8080
   - summary: Add extension to system directory
-    syntax:
-      content: az extension add --name anextension --system
-  parameters:
+    syntax: az extension add --name anextension --system
+  - summary: Add a specific version of extension
+    syntax: az extension add --name anextension --version 1.0.0
+  - summary: Upgrade the extension if already installed
+    syntax: az extension add --upgrade --name anextension
+  optionalParameters:
   - name: --name -n
     summary: Name of extension.
     description: ''
+  - name: --pip-extra-index-urls
+    summary: Space-separated list of extra URLs of package indexes to use. This should point to a repository compliant with PEP 503 (the simple repository API) or a local directory laid out in the same format.
+    description: ''
+  - name: --pip-proxy
+    summary: Proxy for pip to use for extension dependencies in the form of [user:passwd@]proxy.server:port.
+    description: ''
   - name: --source -s
     summary: Filepath or URL to an extension.
     description: ''
   - name: --system
     summary: Use a system directory for the extension.
     description: Default path is azure-cli-extensions folder under the CLI running python environment lib path, configurable by environment variable AZURE_EXTENSION_SYS_DIR. On Windows, you may need to open your shell as Administrator to run with the right permission.
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+  - name: --upgrade
+    summary: Update the extension if already installed, otherwise just install the extension.
     description: ''
-  - name: --pip-extra-index-urls
-    summary: Space-separated list of extra URLs of package indexes to use. This should point to a repository compliant with PEP 503 (the simple repository API) or a local directory laid out in the same format.
+  - name: --version
+    defaultValue: latest
+    summary: The specific version of an extension.
     description: ''
-  - name: --pip-proxy
-    summary: Proxy for pip to use for extension dependencies in the form of [user:passwd@]proxy.server:port.
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_list
   name: az extension list
   summary: List the installed extensions.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_extension_list_available
+  syntax: az extension list [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
+- uid: az_extension_list-available
   name: az extension list-available
   summary: List publicly available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: az extension list-available [--show-details]
   examples:
   - summary: List all publicly available extensions
-    syntax:
-      content: az extension list-available
+    syntax: az extension list-available
   - summary: List details on a particular extension
-    syntax:
-      content: az extension list-available --show-details --query anextension
-  parameters:
+    syntax: az extension list-available --show-details --query anextension
+  optionalParameters:
   - name: --show-details -d
     summary: Show the raw data from the extension index.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
+- uid: az_extension_list-versions
+  name: az extension list-versions
+  summary: List available versions for an extension.
+  description: ''
+  syntax: az extension list-versions --name
+  examples:
+  - summary: List available versions for an extension
+    syntax: az extension list-versions --name anextension
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of extension.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_remove
   name: az extension remove
   summary: Remove an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: az extension remove --name
   examples:
   - summary: Remove an extension. (autogenerated)
-    syntax:
-      content: az extension remove --name MyExtension
-  parameters:
+    syntax: az extension remove --name MyExtension
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of extension.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_show
   name: az extension show
   summary: Show an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az extension show --name
+                      [--query-examples]
   examples:
   - summary: Show an extension. (autogenerated)
-    syntax:
-      content: az extension show --name MyExtension
-  parameters:
+    syntax: az extension show --name MyExtension
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of extension.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 - uid: az_extension_update
   name: az extension update
   summary: Update an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az extension update --name
+                        [--pip-extra-index-urls]
+                        [--pip-proxy]
   examples:
   - summary: Update an extension by name
-    syntax:
-      content: az extension update --name anextension
+    syntax: az extension update --name anextension
   - summary: Update an extension by name and use pip proxy for dependencies
-    syntax:
-      content: az extension update --name anextension --pip-proxy https://user:pass@proxy.server:8080
-  parameters:
+    syntax: az extension update --name anextension --pip-proxy https://user:pass@proxy.server:8080
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of extension.
     description: ''
+  optionalParameters:
   - name: --pip-extra-index-urls
     summary: Space-separated list of extra URLs of package indexes to use. This should point to a repository compliant with PEP 503 (the simple repository API) or a local directory laid out in the same format.
     description: ''
   - name: --pip-proxy
     summary: Proxy for pip to use for extension dependencies in the form of [user:passwd@]proxy.server:port.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
 commands:
-- uid: az_extension_add
-  name: az extension add
-  summary: Add an extension.
-- uid: az_extension_list
-  name: az extension list
-  summary: List the installed extensions.
-- uid: az_extension_list_available
-  name: az extension list-available
-  summary: List publicly available extensions.
-- uid: az_extension_remove
-  name: az extension remove
-  summary: Remove an extension.
-- uid: az_extension_show
-  name: az extension show
-  summary: Show an extension.
-- uid: az_extension_update
-  name: az extension update
-  summary: Update an extension.
+- az_extension_add
+- az_extension_list
+- az_extension_list-available
+- az_extension_list-versions
+- az_extension_remove
+- az_extension_show
+- az_extension_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -202,10 +181,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/extension/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/extension/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/76742362fc9c44ca968859f748ec3bb594d75271/src/azure-cli/azure/cli/command_modules/extension/_help.py
-updated_at: 5/6/2020 11:46:02 AM
-ms.date: 05/06/2020
-description: Manage and update CLI extensions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 09/16/2020
+  description: Manage and update CLI extensions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/footprint.yml b/2018-03-01-hybrid/docs-ref-autogen/footprint.yml
new file mode 100644
index 0000000000..415cf94f61
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/footprint.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint
+name: az footprint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_footprint_experiment
+- az_footprint_experiment_create
+- az_footprint_experiment_delete
+- az_footprint_experiment_list
+- az_footprint_experiment_show
+- az_footprint_experiment_update
+- az_footprint_measurement-endpoint
+- az_footprint_measurement-endpoint_create
+- az_footprint_measurement-endpoint_delete
+- az_footprint_measurement-endpoint_list
+- az_footprint_measurement-endpoint_show
+- az_footprint_measurement-endpoint_update
+- az_footprint_measurement-endpoint-condition
+- az_footprint_measurement-endpoint-condition_create
+- az_footprint_measurement-endpoint-condition_delete
+- az_footprint_measurement-endpoint-condition_list
+- az_footprint_measurement-endpoint-condition_show
+- az_footprint_measurement-endpoint-condition_update
+- az_footprint_profile
+- az_footprint_profile_create
+- az_footprint_profile_delete
+- az_footprint_profile_list
+- az_footprint_profile_show
+- az_footprint_profile_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/footprint/experiment.yml b/2018-03-01-hybrid/docs-ref-autogen/footprint/experiment.yml
new file mode 100644
index 0000000000..013cf6ec77
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/footprint/experiment.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_experiment
+name: az footprint experiment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint experiment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage experiments under a profile.
+description: ''
+directCommands:
+- uid: az_footprint_experiment_create
+  name: az footprint experiment create
+  summary: Creates or updates a Footprint experiment with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint experiment create --experiment-name
+                                   --profile-name
+                                   --resource-group
+                                   [--description]
+  examples:
+  - summary: Create or update an experiment.
+    syntax: az footprint experiment create --name "fpExp1" --description "An experiment description." --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a Footprint experiment.
+    description: ''
+- uid: az_footprint_experiment_delete
+  name: az footprint experiment delete
+  summary: Deletes an existing Footprint experiment.
+  description: ''
+  syntax: >-
+    az footprint experiment delete --experiment-name
+                                   --profile-name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Delete an experiment.
+    syntax: az footprint experiment delete --name "fpExp1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_experiment_list
+  name: az footprint experiment list
+  summary: Retrieves the information about all experiments under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint experiment list --profile-name
+                                 --resource-group
+  examples:
+  - summary: List all experiments under a Footprint profile.
+    syntax: az footprint experiment list --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_experiment_show
+  name: az footprint experiment show
+  summary: Retrieves the information about a single Footprint experiment.
+  description: ''
+  syntax: >-
+    az footprint experiment show --experiment-name
+                                 --profile-name
+                                 --resource-group
+  examples:
+  - summary: Get the details of an experiment.
+    syntax: az footprint experiment show --name "fpExp1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_experiment_update
+  name: az footprint experiment update
+  summary: Creates or updates a Footprint experiment with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint experiment update --experiment-name
+                                   --profile-name
+                                   --resource-group
+                                   [--description]
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name --name -n
+    summary: Name of the Footprint experiment resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a Footprint experiment.
+    description: ''
+commands:
+- az_footprint_experiment_create
+- az_footprint_experiment_delete
+- az_footprint_experiment_list
+- az_footprint_experiment_show
+- az_footprint_experiment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage experiments under a profile.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/footprint/measurement-endpoint-condition.yml b/2018-03-01-hybrid/docs-ref-autogen/footprint/measurement-endpoint-condition.yml
new file mode 100644
index 0000000000..5ce71b9f4e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/footprint/measurement-endpoint-condition.yml
@@ -0,0 +1,207 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_measurement-endpoint-condition
+name: az footprint measurement-endpoint-condition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint measurement-endpoint-condition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage measurement endpoint conditions under a measurement endpoint.
+description: ''
+directCommands:
+- uid: az_footprint_measurement-endpoint-condition_create
+  name: az footprint measurement-endpoint-condition create
+  summary: Creates or updates a measurement endpoint condition under a Footprint measurement with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition create --constant
+                                                       --endpoint-name
+                                                       --name
+                                                       --operator {ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing}
+                                                       --profile-name
+                                                       --resource-group
+                                                       --variable
+  examples:
+  - summary: Create or update a measurement endpoint condition.
+    syntax: az footprint measurement-endpoint-condition create --name "condition0" --endpoint-name "endpoint1" --constant "Edge-Prod-WST" --operator "MatchValueIgnoreCasing" --variable "X-FD-EdgeEnvironment" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --constant
+    summary: The constant of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --operator
+    parameterValueGroup: ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing
+    summary: The operator of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --variable
+    summary: The variable of a Footprint measurement endpoint condition.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_delete
+  name: az footprint measurement-endpoint-condition delete
+  summary: Deletes an existing measurement endpoint condition under a Footprint measurement.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition delete --endpoint-name
+                                                       --name
+                                                       --profile-name
+                                                       --resource-group
+                                                       [--yes]
+  examples:
+  - summary: Delete a measurement endpoint condition.
+    syntax: az footprint measurement-endpoint-condition delete --name "condition0" --endpoint-name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_list
+  name: az footprint measurement-endpoint-condition list
+  summary: Retrieves the information about all measurement endpoint conditions under a Footprint measurement endpoint.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition list --endpoint-name
+                                                     --profile-name
+                                                     --resource-group
+  examples:
+  - summary: List all conditions under a measurement endpoint.
+    syntax: az footprint measurement-endpoint-condition list --endpoint-name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_show
+  name: az footprint measurement-endpoint-condition show
+  summary: Retrieves the information about a single measurement endpoint condition under a Footprint measurement endpoint.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition show --endpoint-name
+                                                     --name
+                                                     --profile-name
+                                                     --resource-group
+  examples:
+  - summary: Get the details of a measurement endpoint condition.
+    syntax: az footprint measurement-endpoint-condition show --name "condition0" --endpoint-name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint-condition_update
+  name: az footprint measurement-endpoint-condition update
+  summary: Creates or updates a measurement endpoint condition under a Footprint measurement with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint-condition update --constant
+                                                       --endpoint-name
+                                                       --name
+                                                       --operator {ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing}
+                                                       --profile-name
+                                                       --resource-group
+                                                       --variable
+  requiredParameters:
+  - isRequired: true
+    name: --constant
+    summary: The constant of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --endpoint-name
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Footprint measurement endpoint condition resource.
+    description: ''
+  - isRequired: true
+    name: --operator
+    parameterValueGroup: ContainsValue, ContainsValueIgnoreCasing, DoesNotContainValue, DoesNotContainValueIgnoreCasing, IsExactValue, MatchValueIgnoreCasing
+    summary: The operator of a Footprint measurement endpoint condition.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --variable
+    summary: The variable of a Footprint measurement endpoint condition.
+    description: ''
+commands:
+- az_footprint_measurement-endpoint-condition_create
+- az_footprint_measurement-endpoint-condition_delete
+- az_footprint_measurement-endpoint-condition_list
+- az_footprint_measurement-endpoint-condition_show
+- az_footprint_measurement-endpoint-condition_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage measurement endpoint conditions under a measurement endpoint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/footprint/measurement-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/footprint/measurement-endpoint.yml
new file mode 100644
index 0000000000..35f5bc1870
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/footprint/measurement-endpoint.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_measurement-endpoint
+name: az footprint measurement-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint measurement-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage measurement endpoints under a profile.
+description: ''
+directCommands:
+- uid: az_footprint_measurement-endpoint_create
+  name: az footprint measurement-endpoint create
+  summary: Creates or updates a single measurement endpoint under a Footprint profile with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint create --endpoint
+                                             --measurement-endpoint-name
+                                             --measurement-type
+                                             --profile-name
+                                             --resource-group
+                                             --weight
+                                             [--description]
+                                             [--end-time-utc]
+                                             [--experiment-id]
+                                             [--metadata]
+                                             [--object-path]
+                                             [--sample-rate-cold]
+                                             [--sample-rate-hot]
+                                             [--sample-rate-warm]
+                                             [--start-time-utc]
+  examples:
+  - summary: Create or update a measurement endpoint.
+    syntax: az footprint measurement-endpoint create --name "endpoint1" --endpoint "www.contoso.com" --experiment-id "664cdec4f07d4e1083c9b3969ee2c49b" --measurement-type 2 --object-path "/trans.gif" --weight 10 --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint
+    summary: The value of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --measurement-type
+    summary: The type of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --weight
+    summary: The weight of a measurement endpoint, higher weight means higher priority.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a measurement endpoint.
+    description: ''
+  - name: --end-time-utc
+    summary: The end time that a measurement endpoint should be served.
+    description: ''
+  - name: --experiment-id
+    summary: The id of an experiment that a measurement endpoint is part of.
+    description: ''
+  - name: --metadata
+    summary: The metadata of a measurement endpoint.
+    description: ''
+  - name: --object-path
+    summary: The path of the object that a measurement endpoint points to.
+    description: ''
+  - name: --sample-rate-cold
+    summary: The percentual sampling rate for the cold path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-hot
+    summary: The percentual sampling rate for the hot path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-warm
+    summary: The percentual sampling rate for the warm path logging of a measurement endpoint.
+    description: ''
+  - name: --start-time-utc
+    summary: The start time that a measurement endpoint should be served.
+    description: ''
+- uid: az_footprint_measurement-endpoint_delete
+  name: az footprint measurement-endpoint delete
+  summary: Deletes an existing measurement endpoint under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint delete --measurement-endpoint-name
+                                             --profile-name
+                                             --resource-group
+                                             [--yes]
+  examples:
+  - summary: Delete a measurement endpoint.
+    syntax: az footprint measurement-endpoint delete --name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_measurement-endpoint_list
+  name: az footprint measurement-endpoint list
+  summary: Retrieves the information about all measurement endpoints under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint list --profile-name
+                                           --resource-group
+  examples:
+  - summary: List all the measurement endpoints under a Footprint profile.
+    syntax: az footprint measurement-endpoint list --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint_show
+  name: az footprint measurement-endpoint show
+  summary: Retrieves the information about a single measurement endpoint under a Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint show --measurement-endpoint-name
+                                           --profile-name
+                                           --resource-group
+  examples:
+  - summary: Get the details of a measurement endpoint.
+    syntax: az footprint measurement-endpoint show --name "endpoint1" --profile-name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_measurement-endpoint_update
+  name: az footprint measurement-endpoint update
+  summary: Creates or updates a single measurement endpoint under a Footprint profile with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint measurement-endpoint update --endpoint
+                                             --measurement-endpoint-name
+                                             --measurement-type
+                                             --profile-name
+                                             --resource-group
+                                             --weight
+                                             [--description]
+                                             [--end-time-utc]
+                                             [--experiment-id]
+                                             [--metadata]
+                                             [--object-path]
+                                             [--sample-rate-cold]
+                                             [--sample-rate-hot]
+                                             [--sample-rate-warm]
+                                             [--start-time-utc]
+  requiredParameters:
+  - isRequired: true
+    name: --endpoint
+    summary: The value of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --measurement-endpoint-name --name -n
+    summary: Name of the Footprint measurement endpoint resource.
+    description: ''
+  - isRequired: true
+    name: --measurement-type
+    summary: The type of a measurement endpoint.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --weight
+    summary: The weight of a measurement endpoint, higher weight means higher priority.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of a measurement endpoint.
+    description: ''
+  - name: --end-time-utc
+    summary: The end time that a measurement endpoint should be served.
+    description: ''
+  - name: --experiment-id
+    summary: The id of an experiment that a measurement endpoint is part of.
+    description: ''
+  - name: --metadata
+    summary: The metadata of a measurement endpoint.
+    description: ''
+  - name: --object-path
+    summary: The path of the object that a measurement endpoint points to.
+    description: ''
+  - name: --sample-rate-cold
+    summary: The percentual sampling rate for the cold path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-hot
+    summary: The percentual sampling rate for the hot path logging of a measurement endpoint.
+    description: ''
+  - name: --sample-rate-warm
+    summary: The percentual sampling rate for the warm path logging of a measurement endpoint.
+    description: ''
+  - name: --start-time-utc
+    summary: The start time that a measurement endpoint should be served.
+    description: ''
+commands:
+- az_footprint_measurement-endpoint_create
+- az_footprint_measurement-endpoint_delete
+- az_footprint_measurement-endpoint_list
+- az_footprint_measurement-endpoint_show
+- az_footprint_measurement-endpoint_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage measurement endpoints under a profile.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/footprint/profile.yml b/2018-03-01-hybrid/docs-ref-autogen/footprint/profile.yml
new file mode 100644
index 0000000000..2dced4e026
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/footprint/profile.yml
@@ -0,0 +1,162 @@
+### YamlMime:AzureCLIGroup
+uid: az_footprint_profile
+name: az footprint profile
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **footprint** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az footprint profile** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Footprint profiles.
+description: ''
+directCommands:
+- uid: az_footprint_profile_create
+  name: az footprint profile create
+  summary: Creates or updates a Footprint profile with the specified properties.
+  description: ''
+  syntax: >-
+    az footprint profile create --measurement-count
+                                --name
+                                --resource-group
+                                --start-delay-ms
+                                [--description]
+                                [--location]
+                                [--reporting-endpoints]
+                                [--sample-rate-cold]
+                                [--tags]
+  examples:
+  - summary: Create or update a Footprint profile.
+    syntax: az footprint profile create --location "westus2" --measurement-count 3 --start-delay-ms 5000 --tags key1="value1" key2="value2" --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --measurement-count
+    summary: The number of measurements to perform.
+    description: ''
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start-delay-ms
+    summary: The delay in milliseconds that the clients should wait for until they start performing measurements.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of the Footprint profile.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --reporting-endpoints
+    summary: The endpoints which to upload measurements to.
+    description: ''
+  - name: --sample-rate-cold
+    summary: The default sampling percentage for cold path measurement storage.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_footprint_profile_delete
+  name: az footprint profile delete
+  summary: Deletes an existing Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint profile delete --name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: Delete a Footprint profile.
+    syntax: az footprint profile delete --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_footprint_profile_list
+  name: az footprint profile list
+  summary: Retrieves the information about all Footprint profiles under a subscription.
+  description: ''
+  syntax: az footprint profile list [--resource-group]
+  examples:
+  - summary: List all Footprint profiles under a Resource Group.
+    syntax: az footprint profile list --resource-group "rgName"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_profile_show
+  name: az footprint profile show
+  summary: Retrieves the information about a single Footprint profile.
+  description: ''
+  syntax: >-
+    az footprint profile show --name
+                              --resource-group
+  examples:
+  - summary: Get the details of a Footprint profile.
+    syntax: az footprint profile show --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_footprint_profile_update
+  name: az footprint profile update
+  summary: Updates an existing Footprint profile resource.
+  description: ''
+  syntax: >-
+    az footprint profile update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update a Footprint profile.
+    syntax: az footprint profile update --tags key1="value1" key2="value2" --name "fpProfile1" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --profile-name -n
+    summary: Name of the Footprint profile resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_footprint_profile_create
+- az_footprint_profile_delete
+- az_footprint_profile_list
+- az_footprint_profile_show
+- az_footprint_profile_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Footprint profiles.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/functionapp.yml b/2018-03-01-hybrid/docs-ref-autogen/functionapp.yml
new file mode 100644
index 0000000000..5372263b46
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/functionapp.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_functionapp
+name: az functionapp
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az functionapp** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage function apps. To install the Azure Functions Core tools see https://github.com/Azure/azure-functions-core-tools.
+description: ''
+commands:
+- az_functionapp_app
+- az_functionapp_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage function apps. To install the Azure Functions Core tools see https://github.com/Azure/azure-functions-core-tools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/functionapp/app.yml b/2018-03-01-hybrid/docs-ref-autogen/functionapp/app.yml
new file mode 100644
index 0000000000..9001e7ecb0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/functionapp/app.yml
@@ -0,0 +1,61 @@
+### YamlMime:AzureCLIGroup
+uid: az_functionapp_app
+name: az functionapp app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az functionapp app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Functions app.
+description: ''
+directCommands:
+- uid: az_functionapp_app_up
+  name: az functionapp app up
+  summary: Deploy to Azure Functions via GitHub actions.
+  description: ''
+  syntax: >-
+    az functionapp app up [--app-name]
+                          [--branch-name]
+                          [--do-not-wait]
+                          [--repository]
+  examples:
+  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function - Run interactive mode
+    syntax: az functionapp app up
+  - summary: Deploy/Setup GitHub Action for locally checked out GitHub Repository to Azure Function
+    syntax: >-
+      Repository name/url (--repository) will be detected from the local git repository
+
+      az functionapp app up --app-name AzFunctionPythonPreProd
+  - summary: Deploy/Setup GitHub action for a GitHub Repository to Azure Function
+    syntax: az functionapp app up --app-name AzFunctionPythonPreProd --repository https://github.com/azure/deploy-functions
+  optionalParameters:
+  - name: --app-name
+    summary: FunctionApp name in the subscription.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --repository -r
+    summary: GitHub repository URL e.g. https://github.com/azure/azure-cli.
+    description: ''
+commands:
+- az_functionapp_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Functions app.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/fzf.yml b/2018-03-01-hybrid/docs-ref-autogen/fzf.yml
new file mode 100644
index 0000000000..5e29bce68f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/fzf.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_fzf
+name: az fzf
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **fzf** extension for Azure CLI and requires version 2.9.0 or higher.  The extension will automatically install the first time you run an **az fzf** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to select active or default objects via fzf.
+description: >-
+  Select your active subscription or set defaults with an easy selection interface (fzf).
+
+
+  Search syntax:
+
+
+  Token    Match type                  Description
+
+  -------  --------------------------  ----------------------------------
+
+  sbtrkt   fuzzy-match                 Items that match sbtrkt
+
+  'wild    exact-match (quoted)        Items that include wild
+
+  ^music   prefix-exact-match          Items that start with music
+
+  .mp3$    suffix-exact-match          Items that end with .mp3
+
+  !fire    inverse-exact-match         Items that do not include fire
+
+  !^music  inverse-prefix-exact-match  Items that do not start with music
+
+  !.mp3$   inverse-suffix-exact-match  Items that do not end with .mp3
+
+
+  More information about search syntax or fzf in general can be found on the fzf project page: https://github.com/junegunn/fzf#search-syntax.
+directCommands:
+- uid: az_fzf_group
+  name: az fzf group
+  summary: Select default resource group.
+  description: ''
+  syntax: >-
+    az fzf group [--filter]
+                 [--no-default]
+  optionalParameters:
+  - name: --filter -f
+    summary: A filter string to pass to fzf.
+    description: ''
+  - name: --no-default -d
+    summary: Don't change the active or default, just return selected item.
+    description: ''
+- uid: az_fzf_install
+  name: az fzf install
+  summary: Download and install the fzf command.
+  description: ''
+  syntax: >-
+    az fzf install [--install-dir]
+                   [--version]
+  optionalParameters:
+  - name: --install-dir -i
+    summary: Path to the directory where fzf should be installed.
+    description: ''
+  - name: --version -v
+    defaultValue: latest
+    summary: Version of fzf to install.
+    description: ''
+- uid: az_fzf_location
+  name: az fzf location
+  summary: Select default location.
+  description: ''
+  syntax: >-
+    az fzf location [--filter]
+                    [--no-default]
+  optionalParameters:
+  - name: --filter -f
+    summary: A filter string to pass to fzf.
+    description: ''
+  - name: --no-default -d
+    summary: Don't change the active or default, just return selected item.
+    description: ''
+- uid: az_fzf_subscription
+  name: az fzf subscription
+  summary: Select default subscription.
+  description: ''
+  syntax: >-
+    az fzf subscription [--filter]
+                        [--no-default]
+  optionalParameters:
+  - name: --filter -f
+    summary: A filter string to pass to fzf.
+    description: ''
+  - name: --no-default -d
+    summary: Don't change the active or default, just return selected item.
+    description: ''
+commands:
+- az_fzf_group
+- az_fzf_install
+- az_fzf_location
+- az_fzf_subscription
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Select your active subscription or set defaults with an easy selection interface (fzf).
+
+
+    Search syntax:
+
+
+    Token    Match type                  Description
+
+    -------  --------------------------  ----------------------------------
+
+    sbtrkt   fuzzy-match                 Items that match sbtrkt
+
+    'wild    exact-match (quoted)        Items that include wild
+
+    ^music   prefix-exact-match          Items that start with music
+
+    .mp3$    suffix-exact-match          Items that end with .mp3
+
+    !fire    inverse-exact-match         Items that do not include fire
+
+    !^music  inverse-prefix-exact-match  Items that do not start with music
+
+    !.mp3$   inverse-suffix-exact-match  Items that do not end with .mp3
+
+
+    More information about search syntax or fzf in general can be found on the fzf project page: https://github.com/junegunn/fzf#search-syntax.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/graph.yml b/2018-03-01-hybrid/docs-ref-autogen/graph.yml
new file mode 100644
index 0000000000..ec339b4cac
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/graph.yml
@@ -0,0 +1,79 @@
+### YamlMime:AzureCLIGroup
+uid: az_graph
+name: az graph
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-graph** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az graph** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Query the resources managed by Azure Resource Manager.
+description: Run 'az graph query --help' for detailed help.
+directCommands:
+- uid: az_graph_query
+  name: az graph query
+  summary: Query the resources managed by Azure Resource Manager.
+  description: See https://aka.ms/AzureResourceGraph-QueryLanguage to learn more about query language and browse examples.
+  syntax: >-
+    az graph query --graph-query
+                   [--allow-partial-scopes {false, true}]
+                   [--first]
+                   [--management-groups]
+                   [--skip]
+                   [--skip-token]
+                   [--subscriptions]
+  examples:
+  - summary: Query resources requesting a subset of resource fields.
+    syntax: az graph query -q "project id, name, type, location, tags"
+  - summary: Query resources with field selection, filtering and summarizing.
+    syntax: az graph query -q "project id, type, location | where type =~ 'Microsoft.Compute/virtualMachines' | summarize count() by location | top 3 by count_"
+  - summary: Request a subset of results, skipping 20 items and getting the next 10.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --first 10 --skip 20
+  - summary: Choose subscriptions to query.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --subscriptions 11111111-1111-1111-1111-111111111111 22222222-2222-2222-2222-222222222222
+  - summary: Choose management groups to query.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --management-groups aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb --allow-partial-scopes
+  - summary: Query with the skip token.
+    syntax: az graph query -q "where type =~ "Microsoft.Compute" | project name, tags" --skip-token skip_token_value_from_previous_query_response
+  requiredParameters:
+  - isRequired: true
+    name: --graph-query --q -q
+    summary: Resource Graph query to execute.
+    description: ''
+  optionalParameters:
+  - name: --allow-partial-scopes -a
+    parameterValueGroup: false, true
+    summary: Indicates if query should succeed when only partial number of subscription underneath can be processed by server.
+    description: ''
+  - name: --first
+    summary: 'The maximum number of objects to return. Accepted range: 1-1000.'
+    description: ''
+  - name: --management-groups -m
+    summary: List of management groups to run query against.
+    description: ''
+  - name: --skip
+    summary: Ignores the first N objects and then gets the remaining objects.
+    description: ''
+  - name: --skip-token
+    summary: Skip token to get the next page of the query if applicable.
+    description: ''
+  - name: --subscriptions -s
+    summary: List of subscriptions to run query against. By default all accessible subscriptions are queried.
+    description: ''
+commands:
+- az_graph_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Run 'az graph query --help' for detailed help.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/group.yml b/2018-03-01-hybrid/docs-ref-autogen/group.yml
index 8c25f6420c..69b76f9d89 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/group.yml
@@ -1,195 +1,191 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group
-  name: az group
-  summary: Manage resource groups and template deployments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_create
-  - az_group_delete
-  - az_group_exists
-  - az_group_export
-  - az_group_list
-  - az_group_show
-  - az_group_update
-  - az_group_wait
+### YamlMime:AzureCLIGroup
+uid: az_group
+name: az group
+summary: Manage resource groups and template deployments.
+description: ''
+directCommands:
 - uid: az_group_create
   name: az group create
   summary: Create a new resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group create --location
+                    --name
+                    [--managed-by]
+                    [--subscription]
+                    [--tags]
   examples:
   - summary: Create a new resource group in the West US region.
-    syntax:
-      content: az group create -l westus -n MyResourceGroup
-  parameters:
+    syntax: az group create -l westus -n MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name --resource-group -g -n
     summary: Name of the new resource group.
     description: ''
+  optionalParameters:
   - name: --managed-by
     summary: The ID of the resource that manages this resource group.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_delete
   name: az group delete
   summary: Delete a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group delete --name
+                    [--no-wait]
+                    [--subscription]
+                    [--yes]
   examples:
   - summary: Delete a resource group.
-    syntax:
-      content: az group delete -n MyResourceGroup
-  parameters:
+    syntax: az group delete -n MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_exists
   name: az group exists
   summary: Check if a resource group exists.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group exists --name
+                    [--subscription]
   examples:
   - summary: Check if 'MyResourceGroup' exists.
-    syntax:
-      content: az group exists -n MyResourceGroup
-  parameters:
+    syntax: az group exists -n MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_export
   name: az group export
   summary: Captures a resource group as a template.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group export --name
+                    [--include-comments]
+                    [--include-parameter-default-value]
+                    [--resource-ids]
+                    [--skip-all-params]
+                    [--skip-resource-name-params]
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --include-comments
     summary: Export template with comments.
     description: ''
   - name: --include-parameter-default-value
     summary: Export template parameter with default value.
     description: ''
+  - name: --resource-ids
+    summary: Space-separated resource ids to filter the export by. To export all resources, do not specify this argument or supply "\*".
+    description: ''
+  - name: --skip-all-params
+    summary: Export template parameter and skip all parameterization.
+    description: ''
+  - name: --skip-resource-name-params
+    summary: Export template and skip resource name parameterization.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_list
   name: az group list
   summary: List resource groups.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group list [--query-examples]
+                  [--subscription]
+                  [--tag]
   examples:
   - summary: List all resource groups located in the West US region.
-    syntax:
-      content: az group list --query "[?location=='westus']"
-  parameters:
-  - name: --tag
-    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
+    syntax: az group list --query "[?location=='westus']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tag
+    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_show
   name: az group show
   summary: Gets a resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group show --name
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_update
   name: az group update
   summary: Update a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group update --name
+                    [--add]
+                    [--force-string]
+                    [--remove]
+                    [--set]
+                    [--subscription]
+                    [--tags]
   examples:
   - summary: Update a resource group. (autogenerated)
-    syntax:
-      content: az group update --resource-group MyResourceGroup --set tags.CostCenter='{"Dept":"IT","Environment":"Test"}'
-  parameters:
+    syntax: az group update --resource-group MyResourceGroup --set tags.CostCenter='{"Dept":"IT","Environment":"Test"}'
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
@@ -205,30 +201,35 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_wait
   name: az group wait
   summary: Place the CLI in a waiting state until a condition of the resource group is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group wait --name
+                  [--created]
+                  [--custom]
+                  [--deleted]
+                  [--exists]
+                  [--interval]
+                  [--subscription]
+                  [--timeout]
+                  [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a condition of the resource group is met. (autogenerated)
-    syntax:
-      content: az group wait --created  --resource-group MyResourceGroup
+    syntax: az group wait --created  --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until a condition of the resource group is met. (autogenerated)
-    syntax:
-      content: az group wait --deleted --resource-group MyResourceGroup
-  parameters:
+    syntax: az group wait --deleted --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name --resource-group -g -n
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -245,6 +246,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -252,94 +256,34 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_create
-  name: az group create
-  summary: Create a new resource group.
-- uid: az_group_delete
-  name: az group delete
-  summary: Delete a resource group.
-- uid: az_group_deployment
-  name: az group deployment
-  summary: Manage Azure Resource Manager deployments.
-- uid: az_group_deployment_cancel
-  name: az group deployment cancel
-  summary: Cancels a currently running template deployment.
-- uid: az_group_deployment_create
-  name: az group deployment create
-  summary: Start a deployment.
-- uid: az_group_deployment_delete
-  name: az group deployment delete
-  summary: Deletes a deployment from the deployment history.
-- uid: az_group_deployment_export
-  name: az group deployment export
-  summary: Export the template used for a deployment.
-- uid: az_group_deployment_list
-  name: az group deployment list
-  summary: Get all the deployments for a resource group.
-- uid: az_group_deployment_operation
-  name: az group deployment operation
-  summary: Manage deployment operations.
-- uid: az_group_deployment_operation_list
-  name: az group deployment operation list
-  summary: Gets all deployments operations for a deployment.
-- uid: az_group_deployment_operation_show
-  name: az group deployment operation show
-  summary: Get a deployment's operation.
-- uid: az_group_deployment_show
-  name: az group deployment show
-  summary: Gets a deployment.
-- uid: az_group_deployment_validate
-  name: az group deployment validate
-  summary: Validate whether a template is syntactically correct.
-- uid: az_group_deployment_wait
-  name: az group deployment wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
-- uid: az_group_exists
-  name: az group exists
-  summary: Check if a resource group exists.
-- uid: az_group_export
-  name: az group export
-  summary: Captures a resource group as a template.
-- uid: az_group_list
-  name: az group list
-  summary: List resource groups.
-- uid: az_group_lock
-  name: az group lock
-  summary: Manage Azure resource group locks.
-- uid: az_group_lock_create
-  name: az group lock create
-  summary: Create a resource group lock.
-- uid: az_group_lock_delete
-  name: az group lock delete
-  summary: Delete a resource group lock.
-- uid: az_group_lock_list
-  name: az group lock list
-  summary: List lock information in the resource-group.
-- uid: az_group_lock_show
-  name: az group lock show
-  summary: Show the details of a resource group lock.
-- uid: az_group_lock_update
-  name: az group lock update
-  summary: Update a resource group lock.
-- uid: az_group_show
-  name: az group show
-  summary: Gets a resource group.
-- uid: az_group_update
-  name: az group update
-  summary: Update a resource group.
-- uid: az_group_wait
-  name: az group wait
-  summary: Place the CLI in a waiting state until a condition of the resource group is met.
+- az_group_create
+- az_group_delete
+- az_group_deployment
+- az_group_deployment_cancel
+- az_group_deployment_create
+- az_group_deployment_delete
+- az_group_deployment_export
+- az_group_deployment_list
+- az_group_deployment_operation
+- az_group_deployment_operation_list
+- az_group_deployment_operation_show
+- az_group_deployment_show
+- az_group_deployment_validate
+- az_group_deployment_wait
+- az_group_exists
+- az_group_export
+- az_group_list
+- az_group_lock
+- az_group_lock_create
+- az_group_lock_delete
+- az_group_lock_list
+- az_group_lock_show
+- az_group_lock_update
+- az_group_show
+- az_group_update
+- az_group_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -355,10 +299,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource groups and template deployments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource groups and template deployments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/group/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/group/deployment.yml
index 32bdd1587e..fb3e1a4aa7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/group/deployment.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/group/deployment.yml
@@ -1,69 +1,66 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group_deployment
-  name: az group deployment
-  summary: Manage Azure Resource Manager deployments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_deployment_cancel
-  - az_group_deployment_create
-  - az_group_deployment_delete
-  - az_group_deployment_export
-  - az_group_deployment_list
-  - az_group_deployment_show
-  - az_group_deployment_validate
-  - az_group_deployment_wait
+### YamlMime:AzureCLIGroup
+uid: az_group_deployment
+name: az group deployment
+summary: Manage Azure Resource Manager deployments.
+description: ''
+directCommands:
 - uid: az_group_deployment_cancel
   name: az group deployment cancel
   summary: Cancels a currently running template deployment.
   description: You can cancel a deployment only if the provisioningState is Accepted or Running. After the deployment is canceled, the provisioningState is set to Canceled. Canceling a template deployment stops the currently running template deployment and leaves the resource group partially deployed.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment cancel --name
+                               --resource-group
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_create
   name: az group deployment create
   summary: Start a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment create --resource-group
+                               [--aux-subs]
+                               [--aux-tenants]
+                               [--handle-extended-json-format]
+                               [--mode {Complete, Incremental}]
+                               [--name]
+                               [--no-prompt {false, true}]
+                               [--no-wait]
+                               [--parameters]
+                               [--rollback-on-error]
+                               [--subscription]
+                               [--template-file]
+                               [--template-uri]
   examples:
   - summary: Create a deployment from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: az group deployment create -g MyResourceGroup --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: az group deployment create -g MyResourceGroup --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
-            --parameters "{ \"location\": { \"value\": \"westus\" } }"
+    syntax: >-
+      az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
+          --parameters "{ \"location\": { \"value\": \"westus\" } }"
   - summary: Create a deployment from a local template, using a local parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
-            --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az group deployment create -g MyResourceGroup --template-file azuredeploy.json \
+          --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --aux-subs
     summary: Auxiliary subscriptions which will be used during deployment across tenants.
     description: ''
@@ -90,147 +87,151 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: A template file path in the file system.
+    summary: A path to a template file or Bicep file in the file system.
     description: ''
   - name: --template-uri -u
     summary: A uri to a remote template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_delete
   name: az group deployment delete
   summary: Deletes a deployment from the deployment history.
   description: A template deployment that is currently running cannot be deleted. Deleting a template deployment removes the associated deployment operations. Deleting a template deployment does not affect the state of the resource group. This is an asynchronous operation that returns a status of 202 until the template deployment is successfully deleted. The Location response header contains the URI that is used to obtain the status of the process. While the process is running, a call to the URI in the Location header returns a status of 202. When the process finishes, the URI in the Location header returns a status of 204 on success. If the asynchronous request failed, the URI in the Location header returns an error-level status code.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment delete --name
+                               --resource-group
+                               [--no-wait]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_export
   name: az group deployment export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment export --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Export the template used for a deployment. (autogenerated)
-    syntax:
-      content: az group deployment export --name MyDeployment --resource-group MyResourceGroup
-  parameters:
+    syntax: az group deployment export --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_list
   name: az group deployment list
   summary: Get all the deployments for a resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment list --resource-group
+                             [--filter]
+                             [--query-examples]
+                             [--subscription]
+                             [--top]
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --filter
     summary: The filter to apply on the operation. For example, you can use $filter=provisioningState eq '{state}'.
     description: ''
-  - name: --top
-    summary: The number of results to get. If null is passed, returns all deployments.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: The number of results to get. If null is passed, returns all deployments.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_show
   name: az group deployment show
   summary: Gets a deployment.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_validate
   name: az group deployment validate
   summary: Validate whether a template is syntactically correct.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment validate --resource-group
+                                 [--handle-extended-json-format]
+                                 [--mode {Complete, Incremental}]
+                                 [--no-prompt {false, true}]
+                                 [--parameters]
+                                 [--rollback-on-error]
+                                 [--subscription]
+                                 [--template-file]
+                                 [--template-uri]
   examples:
   - summary: Validate whether a template is syntactically correct. (autogenerated)
-    syntax:
-      content: >-
-        az group deployment validate --parameters "{ \"location\": { \"value\": \"westus\" } }" \
-            --resource-group MyResourceGroup --template-file storage.json
-  parameters:
+    syntax: >-
+      az group deployment validate --parameters "{ \"location\": { \"value\": \"westus\" } }" \
+          --resource-group MyResourceGroup --template-file storage.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -245,47 +246,50 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: A template file path in the file system.
+    summary: A path to a template file or Bicep file in the file system.
     description: ''
   - name: --template-uri -u
     summary: A uri to a remote template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_wait
   name: az group deployment wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group deployment wait --name
+                             --resource-group
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--interval]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
-    syntax:
-      content: az group deployment wait --name MyDeployment --resource-group MyResourceGroup --updated
+    syntax: az group deployment wait --name MyDeployment --resource-group MyResourceGroup --updated
   - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
-    syntax:
-      content: az group deployment wait --created --name MyDeployment --resource-group MyResourceGroup
-  parameters:
+    syntax: az group deployment wait --created --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -302,6 +306,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -309,49 +316,19 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_deployment_cancel
-  name: az group deployment cancel
-  summary: Cancels a currently running template deployment.
-- uid: az_group_deployment_create
-  name: az group deployment create
-  summary: Start a deployment.
-- uid: az_group_deployment_delete
-  name: az group deployment delete
-  summary: Deletes a deployment from the deployment history.
-- uid: az_group_deployment_export
-  name: az group deployment export
-  summary: Export the template used for a deployment.
-- uid: az_group_deployment_list
-  name: az group deployment list
-  summary: Get all the deployments for a resource group.
-- uid: az_group_deployment_operation
-  name: az group deployment operation
-  summary: Manage deployment operations.
-- uid: az_group_deployment_operation_list
-  name: az group deployment operation list
-  summary: Gets all deployments operations for a deployment.
-- uid: az_group_deployment_operation_show
-  name: az group deployment operation show
-  summary: Get a deployment's operation.
-- uid: az_group_deployment_show
-  name: az group deployment show
-  summary: Gets a deployment.
-- uid: az_group_deployment_validate
-  name: az group deployment validate
-  summary: Validate whether a template is syntactically correct.
-- uid: az_group_deployment_wait
-  name: az group deployment wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_group_deployment_cancel
+- az_group_deployment_create
+- az_group_deployment_delete
+- az_group_deployment_export
+- az_group_deployment_list
+- az_group_deployment_operation
+- az_group_deployment_operation_list
+- az_group_deployment_operation_show
+- az_group_deployment_show
+- az_group_deployment_validate
+- az_group_deployment_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -367,10 +344,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager deployments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager deployments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/group/deployment/operation.yml b/2018-03-01-hybrid/docs-ref-autogen/group/deployment/operation.yml
index bd2aa4de7c..f68a311f27 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/group/deployment/operation.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/group/deployment/operation.yml
@@ -1,48 +1,50 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group_deployment_operation
-  name: az group deployment operation
-  summary: Manage deployment operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_deployment_operation_list
-  - az_group_deployment_operation_show
+### YamlMime:AzureCLIGroup
+uid: az_group_deployment_operation
+name: az group deployment operation
+summary: Manage deployment operations.
+description: ''
+directCommands:
 - uid: az_group_deployment_operation_list
   name: az group deployment operation list
   summary: Gets all deployments operations for a deployment.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment operation list --name
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+                                       [--top]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --top
-    summary: The number of results to return.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: The number of results to return.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_deployment_operation_show
   name: az group deployment operation show
   summary: Get a deployment's operation.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az group deployment operation show --name
+                                       --operation-ids
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -53,24 +55,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_deployment_operation_list
-  name: az group deployment operation list
-  summary: Gets all deployments operations for a deployment.
-- uid: az_group_deployment_operation_show
-  name: az group deployment operation show
-  summary: Get a deployment's operation.
+- az_group_deployment_operation_list
+- az_group_deployment_operation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -86,10 +83,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/group/lock.yml b/2018-03-01-hybrid/docs-ref-autogen/group/lock.yml
index fd9a178b35..24542c9e5e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/group/lock.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/group/lock.yml
@@ -1,28 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_group_lock
-  name: az group lock
-  summary: Manage Azure resource group locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_group_lock_create
-  - az_group_lock_delete
-  - az_group_lock_list
-  - az_group_lock_show
-  - az_group_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_group_lock
+name: az group lock
+summary: Manage Azure resource group locks.
+description: ''
+directCommands:
 - uid: az_group_lock_create
   name: az group lock create
   summary: Create a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock create --lock-type {CanNotDelete, ReadOnly}
+                         --name
+                         --resource-group
+                         [--notes]
+                         [--subscription]
   examples:
   - summary: Create a read-only resource group level lock.
-    syntax:
-      content: az group lock create --lock-type ReadOnly -n lockName -g MyResourceGroup
-  parameters:
+    syntax: az group lock create --lock-type ReadOnly -n lockName -g MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -34,31 +29,29 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes about this lock.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_delete
   name: az group lock delete
   summary: Delete a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock delete [--ids]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Delete a resource group lock
-    syntax:
-      content: az group lock delete --name lockName -g MyResourceGroup
-  parameters:
+    syntax: az group lock delete --name lockName -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -66,83 +59,83 @@ items:
     summary: Name of the lock.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_list
   name: az group lock list
   summary: List lock information in the resource-group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock list [--filter-string]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: List out all locks on the resource group level
-    syntax:
-      content: az group lock list -g MyResourceGroup
-  parameters:
+    syntax: az group lock list -g MyResourceGroup
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_show
   name: az group lock show
   summary: Show the details of a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock show [--ids]
+                       [--name]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: Show a resource group level lock
-    syntax:
-      content: az group lock show -n lockname -g MyResourceGroup
-  parameters:
+    syntax: az group lock show -n lockname -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_group_lock_update
   name: az group lock update
   summary: Update a resource group lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az group lock update [--ids]
+                         [--lock-type {CanNotDelete, ReadOnly}]
+                         [--name]
+                         [--notes]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Update a resource group lock with new notes and type
-    syntax:
-      content: az group lock update --name lockName -g MyResourceGroup --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az group lock update --name lockName -g MyResourceGroup --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -157,33 +150,18 @@ items:
     summary: Notes about this lock.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_group_lock_create
-  name: az group lock create
-  summary: Create a resource group lock.
-- uid: az_group_lock_delete
-  name: az group lock delete
-  summary: Delete a resource group lock.
-- uid: az_group_lock_list
-  name: az group lock list
-  summary: List lock information in the resource-group.
-- uid: az_group_lock_show
-  name: az group lock show
-  summary: Show the details of a resource group lock.
-- uid: az_group_lock_update
-  name: az group lock update
-  summary: Update a resource group lock.
+- az_group_lock_create
+- az_group_lock_delete
+- az_group_lock_list
+- az_group_lock_show
+- az_group_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -199,10 +177,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure resource group locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure resource group locks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/guestconfig.yml b/2018-03-01-hybrid/docs-ref-autogen/guestconfig.yml
new file mode 100644
index 0000000000..0828c1a963
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/guestconfig.yml
@@ -0,0 +1,46 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig
+name: az guestconfig
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_guestconfig_guest-configuration-assignment
+- az_guestconfig_guest-configuration-assignment_create
+- az_guestconfig_guest-configuration-assignment_delete
+- az_guestconfig_guest-configuration-assignment_list
+- az_guestconfig_guest-configuration-assignment_show
+- az_guestconfig_guest-configuration-assignment_update
+- az_guestconfig_guest-configuration-assignment_wait
+- az_guestconfig_guest-configuration-assignment-report
+- az_guestconfig_guest-configuration-assignment-report_list
+- az_guestconfig_guest-configuration-assignment-report_show
+- az_guestconfig_guest-configuration-hcrp-assignment
+- az_guestconfig_guest-configuration-hcrp-assignment_create
+- az_guestconfig_guest-configuration-hcrp-assignment_delete
+- az_guestconfig_guest-configuration-hcrp-assignment_list
+- az_guestconfig_guest-configuration-hcrp-assignment_show
+- az_guestconfig_guest-configuration-hcrp-assignment_update
+- az_guestconfig_guest-configuration-hcrp-assignment_wait
+- az_guestconfig_guest-configuration-hcrp-assignment-report
+- az_guestconfig_guest-configuration-hcrp-assignment-report_list
+- az_guestconfig_guest-configuration-hcrp-assignment-report_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-assignment-report.yml b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-assignment-report.yml
new file mode 100644
index 0000000000..5b47c3f612
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-assignment-report.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-assignment-report
+name: az guestconfig guest-configuration-assignment-report
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-assignment-report** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-assignment-report.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-assignment-report_list
+  name: az guestconfig guest-configuration-assignment-report list
+  summary: List all reports for the guest configuration assignment, latest report first.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment-report list --guest-configuration-assignment-name
+                                                              --resource-group
+                                                              --vm-name
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-assignment-report list --guest-configuration-assignment-name "AuditSecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment-report_show
+  name: az guestconfig guest-configuration-assignment-report show
+  summary: Get a report for the guest configuration assignment, by reportId.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment-report show --guest-configuration-assignment-name
+                                                              --report-id
+                                                              --resource-group
+                                                              --vm-name
+  examples:
+  - summary: Get a guest configuration assignment report by Id for a virtual machine
+    syntax: az guestconfig guest-configuration-assignment-report show --guest-configuration-assignment-name "AuditSecureProtocol" --report-id "7367cbb8-ae99-47d0-a33b-a283564d2cb1" --resource-group "myResourceGroupName" --vm-name "myvm"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --report-id
+    summary: The GUID for the guest configuration assignment report.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-assignment-report_list
+- az_guestconfig_guest-configuration-assignment-report_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-assignment-report.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-assignment.yml
new file mode 100644
index 0000000000..ae7def5131
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-assignment.yml
@@ -0,0 +1,331 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-assignment
+name: az guestconfig guest-configuration-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-assignment.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-assignment_create
+  name: az guestconfig guest-configuration-assignment create
+  summary: Creates an association between a VM and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment create --guest-configuration-assignment-name
+                                                         --resource-group
+                                                         --vm-name
+                                                         [--context]
+                                                         [--guest-configuration-configuration-parameter]
+                                                         [--guest-configuration-configuration-setting]
+                                                         [--guest-configuration-name]
+                                                         [--guest-configuration-version]
+                                                         [--latest-assignment-report-assignment]
+                                                         [--location]
+                                                         [--name]
+                                                         [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment create --guest-configuration-assignment-name "WhitelistedApplication" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_delete
+  name: az guestconfig guest-configuration-assignment delete
+  summary: Delete a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment delete --name
+                                                         --resource-group
+                                                         --vm-name
+                                                         [--no-wait]
+  examples:
+  - summary: Delete an guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment delete --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_list
+  name: az guestconfig guest-configuration-assignment list
+  summary: List all guest configuration assignments for a virtual machine.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment list --resource-group
+                                                       --vm-name
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-assignment list --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_show
+  name: az guestconfig guest-configuration-assignment show
+  summary: Get information about a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment show --name
+                                                       --resource-group
+                                                       --vm-name
+  examples:
+  - summary: Get a guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment show --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_update
+  name: az guestconfig guest-configuration-assignment update
+  summary: Creates an association between a VM and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment update --guest-configuration-assignment-name
+                                                         --resource-group
+                                                         --vm-name
+                                                         [--context]
+                                                         [--guest-configuration-configuration-parameter]
+                                                         [--guest-configuration-configuration-setting]
+                                                         [--guest-configuration-name]
+                                                         [--guest-configuration-version]
+                                                         [--latest-assignment-report-assignment]
+                                                         [--location]
+                                                         [--name]
+                                                         [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-assignment update --guest-configuration-assignment-name "WhitelistedApplication" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName" --vm-name "myVMName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-assignment_wait
+  name: az guestconfig guest-configuration-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the guestconfig guest-configuration-assignment is met.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-assignment wait --name
+                                                       --resource-group
+                                                       --vm-name
+                                                       [--created]
+                                                       [--custom]
+                                                       [--deleted]
+                                                       [--exists]
+                                                       [--interval]
+                                                       [--timeout]
+                                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-assignment is successfully created.
+    syntax: az guestconfig guest-configuration-assignment wait --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName" --created
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-assignment is successfully deleted.
+    syntax: az guestconfig guest-configuration-assignment wait --name "SecureProtocol" --resource-group "myResourceGroupName" --vm-name "myVMName" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: The name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-assignment_create
+- az_guestconfig_guest-configuration-assignment_delete
+- az_guestconfig_guest-configuration-assignment_list
+- az_guestconfig_guest-configuration-assignment_show
+- az_guestconfig_guest-configuration-assignment_update
+- az_guestconfig_guest-configuration-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-assignment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment-report.yml b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment-report.yml
new file mode 100644
index 0000000000..80f3968ae5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment-report.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-hcrp-assignment-report
+name: az guestconfig guest-configuration-hcrp-assignment-report
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-hcrp-assignment-report** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-hcrp-assignment-report.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-hcrp-assignment-report_list
+  name: az guestconfig guest-configuration-hcrp-assignment-report list
+  summary: List all reports for the guest configuration assignment, latest report first.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment-report list --guest-configuration-assignment-name
+                                                                   --machine-name
+                                                                   --resource-group
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-hcrp-assignment-report list --guest-configuration-assignment-name "AuditSecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment-report_show
+  name: az guestconfig guest-configuration-hcrp-assignment-report show
+  summary: Get a report for the guest configuration assignment, by reportId.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment-report show --guest-configuration-assignment-name
+                                                                   --machine-name
+                                                                   --report-id
+                                                                   --resource-group
+  examples:
+  - summary: Get a guest configuration assignment report by Id for a virtual machine
+    syntax: az guestconfig guest-configuration-hcrp-assignment-report show --guest-configuration-assignment-name "AuditSecureProtocol" --machine-name "myMachineName" --report-id "7367cbb8-ae99-47d0-a33b-a283564d2cb1" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --report-id
+    summary: The GUID for the guest configuration assignment report.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-hcrp-assignment-report_list
+- az_guestconfig_guest-configuration-hcrp-assignment-report_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-hcrp-assignment-report.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment.yml
new file mode 100644
index 0000000000..1d538f6455
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/guestconfig/guest-configuration-hcrp-assignment.yml
@@ -0,0 +1,331 @@
+### YamlMime:AzureCLIGroup
+uid: az_guestconfig_guest-configuration-hcrp-assignment
+name: az guestconfig guest-configuration-hcrp-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **guestconfig** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az guestconfig guest-configuration-hcrp-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Guestconfig guest-configuration-hcrp-assignment.
+description: ''
+directCommands:
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_create
+  name: az guestconfig guest-configuration-hcrp-assignment create
+  summary: Creates an association between a ARC machine and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment create --guest-configuration-assignment-name
+                                                              --machine-name
+                                                              --resource-group
+                                                              [--context]
+                                                              [--guest-configuration-configuration-parameter]
+                                                              [--guest-configuration-configuration-setting]
+                                                              [--guest-configuration-name]
+                                                              [--guest-configuration-version]
+                                                              [--latest-assignment-report-assignment]
+                                                              [--location]
+                                                              [--name]
+                                                              [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment create --guest-configuration-assignment-name "WhitelistedApplication" --machine-name "myMachineName" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_delete
+  name: az guestconfig guest-configuration-hcrp-assignment delete
+  summary: Delete a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment delete --guest-configuration-assignment-name
+                                                              --machine-name
+                                                              --resource-group
+                                                              [--no-wait]
+  examples:
+  - summary: Delete an guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment delete --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_list
+  name: az guestconfig guest-configuration-hcrp-assignment list
+  summary: List all guest configuration assignments for an ARC machine.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment list --machine-name
+                                                            --resource-group
+  examples:
+  - summary: List all guest configuration assignments for a virtual machine
+    syntax: az guestconfig guest-configuration-hcrp-assignment list --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_show
+  name: az guestconfig guest-configuration-hcrp-assignment show
+  summary: Get information about a guest configuration assignment.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment show --guest-configuration-assignment-name
+                                                            --machine-name
+                                                            --resource-group
+  examples:
+  - summary: Get a guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment show --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_update
+  name: az guestconfig guest-configuration-hcrp-assignment update
+  summary: Creates an association between a ARC machine and guest configuration.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment update --guest-configuration-assignment-name
+                                                              --machine-name
+                                                              --resource-group
+                                                              [--context]
+                                                              [--guest-configuration-configuration-parameter]
+                                                              [--guest-configuration-configuration-setting]
+                                                              [--guest-configuration-name]
+                                                              [--guest-configuration-version]
+                                                              [--latest-assignment-report-assignment]
+                                                              [--location]
+                                                              [--name]
+                                                              [--no-wait]
+  examples:
+  - summary: Create or update guest configuration assignment
+    syntax: az guestconfig guest-configuration-hcrp-assignment update --guest-configuration-assignment-name "WhitelistedApplication" --machine-name "myMachineName" --guest-configuration-name "WhitelistedApplication" --location "westcentralus" --context "Azure policy" --guest-configuration-name "WhitelistedApplication" --guest-configuration-configuration-parameter name="[InstalledApplication]bwhitelistedapp;Name" value="NotePad,sql" --guest-configuration-configuration-setting action-after-reboot="ContinueConfiguration" configuration-mode="MonitorOnly" configuration-mode-frequency-mins=15 reboot-if-needed="False" --guest-configuration-version "1.*" --resource-group "myResourceGroupName"
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --context
+    summary: 'The source which initiated the guest configuration assignment. Ex: Azure Policy.'
+    description: ''
+  - name: --guest-configuration-configuration-parameter
+    summary: The configuration parameters for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-parameter name=XX value=XX
+
+
+      name: Name of the configuration parameter.
+
+      value: Value of the configuration parameter.
+
+
+      Multiple actions can be specified by using more than one --guest-configuration-configuration-parameter argument.
+  - name: --guest-configuration-configuration-setting
+    summary: The configuration setting for the guest configuration.
+    description: >-
+      Usage: --guest-configuration-configuration-setting configuration-mode=XX allow-module-overwrite=XX action-after-reboot=XX refresh-frequency-mins=XX reboot-if-needed=XX configuration-mode-frequency-mins=XX
+
+
+      configuration-mode: Specifies how the LCM(Local Configuration Manager) actually applies the configuration to the target nodes. Possible values are ApplyOnly, ApplyAndMonitor, and ApplyAndAutoCorrect.
+
+      allow-module-overwrite: If true - new configurations downloaded from the pull service are allowed to overwrite the old ones on the target node. Otherwise, false
+
+      action-after-reboot: Specifies what happens after a reboot during the application of a configuration. The possible values are ContinueConfiguration and StopConfiguration
+
+      refresh-frequency-mins: The time interval, in minutes, at which the LCM checks a pull service to get updated configurations. This value is ignored if the LCM is not configured in pull mode. The default value is 30.
+
+      reboot-if-needed: Set this to true to automatically reboot the node after a configuration that requires reboot is applied. Otherwise, you will have to manually reboot the node for any configuration that requires it. The default value is false. To use this setting when a reboot condition is enacted by something other than DSC (such as Windows Installer), combine this setting with the xPendingReboot module.
+
+      configuration-mode-frequency-mins: How often, in minutes, the current configuration is checked and applied. This property is ignored if the ConfigurationMode property is set to ApplyOnly. The default value is 15.
+  - name: --guest-configuration-name
+    summary: Name of the guest configuration.
+    description: ''
+  - name: --guest-configuration-version
+    summary: Version of the guest configuration.
+    description: ''
+  - name: --latest-assignment-report-assignment
+    summary: 'Configuration details of the guest configuration assignment. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: Name of the guest configuration assignment.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_guestconfig_guest-configuration-hcrp-assignment_wait
+  name: az guestconfig guest-configuration-hcrp-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the guestconfig guest-configuration-hcrp-assignment is met.
+  description: ''
+  syntax: >-
+    az guestconfig guest-configuration-hcrp-assignment wait --guest-configuration-assignment-name
+                                                            --machine-name
+                                                            --resource-group
+                                                            [--created]
+                                                            [--custom]
+                                                            [--deleted]
+                                                            [--exists]
+                                                            [--interval]
+                                                            [--timeout]
+                                                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-hcrp-assignment is successfully created.
+    syntax: az guestconfig guest-configuration-hcrp-assignment wait --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName" --created
+  - summary: Pause executing next line of CLI script until the guestconfig guest-configuration-hcrp-assignment is successfully deleted.
+    syntax: az guestconfig guest-configuration-hcrp-assignment wait --guest-configuration-assignment-name "SecureProtocol" --machine-name "myMachineName" --resource-group "myResourceGroupName" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --guest-configuration-assignment-name
+    summary: The guest configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the ARC machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_guestconfig_guest-configuration-hcrp-assignment_create
+- az_guestconfig_guest-configuration-hcrp-assignment_delete
+- az_guestconfig_guest-configuration-hcrp-assignment_list
+- az_guestconfig_guest-configuration-hcrp-assignment_show
+- az_guestconfig_guest-configuration-hcrp-assignment_update
+- az_guestconfig_guest-configuration-hcrp-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Guestconfig guest-configuration-hcrp-assignment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hack.yml b/2018-03-01-hybrid/docs-ref-autogen/hack.yml
new file mode 100644
index 0000000000..6062365234
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hack.yml
@@ -0,0 +1,80 @@
+### YamlMime:AzureCLIGroup
+uid: az_hack
+name: az hack
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hack** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az hack** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage resources commonly used for student hacks.
+description: ''
+directCommands:
+- uid: az_hack_create
+  name: az hack create
+  summary: Create resources commonly used for a student hack, including a website, database, and artificial intelligence.
+  description: ''
+  syntax: >-
+    az hack create --location
+                   --name
+                   --runtime {aspnet, jetty, node, php, python, tomcat}
+                   [--ai]
+                   [--database {cosmosdb, mysql, sql}]
+  examples:
+  - summary: Create website using Python and MySQL
+    syntax: az hack create --name samplename --runtime python --location westus2 --database mysql
+  - summary: Create website using Node.js, SQL and Cognitive Services key
+    syntax: az hack create --name samplename --runtime node --location westus2 --database sql --ai
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Base name of resources; random charagers will be appended.
+    description: ''
+  - isRequired: true
+    name: --runtime -r
+    parameterValueGroup: aspnet, jetty, node, php, python, tomcat
+    summary: Runtime.
+    description: ''
+  optionalParameters:
+  - name: --ai
+    summary: Enable Azure Cognitive Services.
+    description: ''
+  - name: --database -d
+    parameterValueGroup: cosmosdb, mysql, sql
+    summary: Database type - { sql | mysql | cosmosdb }.
+    description: ''
+- uid: az_hack_show
+  name: az hack show
+  summary: Display settings for created resources, including database name and password, Git url, and website url.
+  description: ''
+  syntax: az hack show --name
+  examples:
+  - summary: Display settings
+    syntax: az hack show --name samplename
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the application.
+    description: ''
+commands:
+- az_hack_create
+- az_hack_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage resources commonly used for student hacks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hanainstance.yml b/2018-03-01-hybrid/docs-ref-autogen/hanainstance.yml
new file mode 100644
index 0000000000..b4d5828597
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hanainstance.yml
@@ -0,0 +1,203 @@
+### YamlMime:AzureCLIGroup
+uid: az_hanainstance
+name: az hanainstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sap-hana** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az hanainstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage Azure SAP HANA Instance.
+description: ''
+directCommands:
+- uid: az_hanainstance_create
+  name: az hanainstance create
+  summary: Create a new SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance create --instance-name
+                           --ip-address
+                           --location
+                           --os-computer-name
+                           --partner-node-id
+                           --resource-group
+                           --ssh-public-key
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --ip-address
+    summary: IP address to connect to the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location of the SAP HANA instance. Default is the location of target resource group.
+    description: ''
+  - isRequired: true
+    name: --os-computer-name
+    summary: OS computer name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --partner-node-id
+    summary: ARM ID of a HANA Instance on the network to connect the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --ssh-public-key
+    summary: SSH public key to connect to the SAP HANA instance.
+    description: ''
+- uid: az_hanainstance_delete
+  name: az hanainstance delete
+  summary: Delete a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance delete --instance-name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_list
+  name: az hanainstance list
+  summary: List SAP HANA Instances.
+  description: ''
+  syntax: az hanainstance list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_restart
+  name: az hanainstance restart
+  summary: Restart a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance restart --instance-name
+                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_show
+  name: az hanainstance show
+  summary: Get the details of a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance show --instance-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_shutdown
+  name: az hanainstance shutdown
+  summary: Shutdown a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance shutdown --instance-name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_start
+  name: az hanainstance start
+  summary: Start a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance start --instance-name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hanainstance_update
+  name: az hanainstance update
+  summary: Update the Tags field of a SAP HANA Instance.
+  description: ''
+  syntax: >-
+    az hanainstance update --instance-name
+                           --resource-group
+                           [--add]
+                           [--force-string]
+                           [--no-wait]
+                           [--remove]
+                           [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the SAP HANA instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_hanainstance_create
+- az_hanainstance_delete
+- az_hanainstance_list
+- az_hanainstance_restart
+- az_hanainstance_show
+- az_hanainstance_shutdown
+- az_hanainstance_start
+- az_hanainstance_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage Azure SAP HANA Instance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight.yml
index 8082123ac2..0b0b7c4407 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/hdinsight.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight.yml
@@ -1,175 +1,308 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight
-  name: az hdinsight
-  summary: Manage HDInsight resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_create
-  - az_hdinsight_delete
-  - az_hdinsight_list
-  - az_hdinsight_list_usage
-  - az_hdinsight_resize
-  - az_hdinsight_rotate_disk_encryption_key
-  - az_hdinsight_show
-  - az_hdinsight_update
-  - az_hdinsight_wait
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight
+name: az hdinsight
+summary: Manage HDInsight resources.
+description: ''
+directCommands:
 - uid: az_hdinsight_create
   name: az hdinsight create
   summary: Create a new cluster.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az hdinsight create --name
+                        --resource-group
+                        --type
+                        [--assign-identity]
+                        [--autoscale-count]
+                        [--autoscale-max-count]
+                        [--autoscale-min-count]
+                        [--autoscale-type {Load, Schedule}]
+                        [--cluster-admin-account]
+                        [--cluster-admin-password]
+                        [--cluster-configurations]
+                        [--cluster-tier {Premium, Standard}]
+                        [--cluster-users-group-dns]
+                        [--component-version]
+                        [--compute-isolation {false, true}]
+                        [--days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}]
+                        [--domain]
+                        [--edgenode-size]
+                        [--enable-private-link {false, true}]
+                        [--encryption-algorithm {RSA-OAEP, RSA-OAEP-256, RSA1_5}]
+                        [--encryption-at-host {false, true}]
+                        [--encryption-in-transit {false, true}]
+                        [--encryption-key-name]
+                        [--encryption-key-version]
+                        [--encryption-vault-uri]
+                        [--esp]
+                        [--headnode-size]
+                        [--host-sku]
+                        [--http-password]
+                        [--http-user]
+                        [--idbroker]
+                        [--kafka-client-group-id]
+                        [--kafka-client-group-name]
+                        [--kafka-management-node-count]
+                        [--kafka-management-node-size]
+                        [--ldaps-urls]
+                        [--location]
+                        [--minimal-tls-version {1.0, 1.1, 1.2}]
+                        [--no-validation-timeout]
+                        [--no-wait]
+                        [--resource-provider-connection {Inbound, Outbound}]
+                        [--ssh-password]
+                        [--ssh-public-key]
+                        [--ssh-user]
+                        [--storage-account]
+                        [--storage-account-key]
+                        [--storage-account-managed-identity]
+                        [--storage-container]
+                        [--storage-filesystem]
+                        [--subnet]
+                        [--subscription]
+                        [--tags]
+                        [--time]
+                        [--timezone]
+                        [--version]
+                        [--vnet-name]
+                        [--workernode-count]
+                        [--workernode-data-disk-size]
+                        [--workernode-data-disk-storage-account-type {premium_lrs, standard_lrs}]
+                        [--workernode-data-disks-per-node]
+                        [--workernode-size]
+                        [--zookeepernode-size]
   examples:
   - summary: Create a cluster with an existing storage account.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" \
+      -p "HttpPassword1234!" \
 
-        --storage-account MyStorageAccount
+      --storage-account MyStorageAccount
   - summary: Create a cluster with minimal tls version.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
+
+      --storage-account MyStorageAccount --minimal-tls-version 1.2
+  - summary: Create a cluster which enables encryption in transit.
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
 
-        -p "HttpPassword1234!" \
+      --storage-account MyStorageAccount --encryption-in-transit true
+  - summary: Create a cluster with encryption at host.
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        --storage-account MyStorageAccount --minimal-tls-version 1.2
+      -p "HttpPassword1234!" \
+
+      --storage-account MyStorageAccount --encryption-at-host true
   - summary: Create a cluster with the Enterprise Security Package (ESP).
-    syntax:
-      content: >-
-        az hdinsight create --esp -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create --esp -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
+
+      --storage-account MyStorageAccount \
 
-        -p "HttpPassword1234!" \
+      --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/subnet1" \
 
-        --storage-account MyStorageAccount \
+      --domain "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.AAD/domainServices/MyDomain.onmicrosoft.com" \
 
-        --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/subnet1" \
+      --assign-identity "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MyMsiRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyMSI" \
 
-        --domain "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.AAD/domainServices/MyDomain.onmicrosoft.com" \
+      --cluster-admin-account MyAdminAccount@MyDomain.onmicrosoft.com \
 
-        --assign-identity "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MyMsiRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyMSI" \
+      --cluster-users-group-dns MyGroup
+  - summary: Create a cluster with the Enterprise Security Package (ESP) and enable HDInsight ID Broker.
+    syntax: >-
+      az hdinsight create --esp --idbroker -t spark -g MyResourceGroup -n MyCluster \
 
-        --cluster-admin-account MyAdminAccount@MyDomain.onmicrosoft.com \
+      -p "HttpPassword1234!" \
 
-        --cluster-users-group-dns MyGroup
+      --storage-account MyStorageAccount \
+
+      --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/subnet1" \
+
+      --domain "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRG/providers/Microsoft.AAD/domainServices/MyDomain.onmicrosoft.com" \
+
+      --assign-identity "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/MyMsiRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/MyMSI" \
+
+      --cluster-admin-account MyAdminAccount@MyDomain.onmicrosoft.com \
+
+      --cluster-users-group-dns MyGroup
   - summary: Create a Kafka cluster with disk encryption. See https://docs.microsoft.com/azure/hdinsight/kafka/apache-kafka-byok.
-    syntax:
-      content: >-
-        az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
+      -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --encryption-key-name kafkaClusterKey \
+      --encryption-key-name kafkaClusterKey \
 
-        --encryption-key-version 00000000000000000000000000000000 \
+      --encryption-key-version 00000000000000000000000000000000 \
 
-        --encryption-vault-uri https://MyKeyVault.vault.azure.net \
+      --encryption-vault-uri https://MyKeyVault.vault.azure.net \
 
-        --assign-identity MyMSI
+      --assign-identity MyMSI
   - summary: Create a kafka cluster with kafka rest proxy.
-    syntax:
-      content: >-
-        az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t kafka -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
+      -p "HttpPassword1234!" --workernode-data-disks-per-node 2 \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --kafka-management-node-size "Standard_D4_v2" \
+      --kafka-management-node-size "Standard_D4_v2" \
 
-        --kafka-client-group-id MySecurityGroupId \
+      --kafka-client-group-id MySecurityGroupId \
 
-        --kafka-client-group-name MySecurityGroupName
+      --kafka-client-group-name MySecurityGroupName
 
-        --component-version kafka=2.1
+      --component-version kafka=2.1
   - summary: Create a cluster with Azure Data Lake Storage Gen2
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" \
+      -p "HttpPassword1234!" \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --storage-account-managed-identity MyMSI
+      --storage-account-managed-identity MyMSI
   - summary: Create a cluster with configuration from JSON string.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
 
-        -p "HttpPassword1234!" \
+      -p "HttpPassword1234!" \
 
-        --storage-account MyStorageAccount \
+      --storage-account MyStorageAccount \
 
-        --cluster-configuration {'gateway':{'restAuthCredential.username':'admin'}}
+      --cluster-configuration {'gateway':{'restAuthCredential.username':'admin'}}
   - summary: Create a cluster with configuration from a local file.
-    syntax:
-      content: >-
-        az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+    syntax: >-
+      az hdinsight create -t spark -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" \
 
-        -p "HttpPassword1234!" \
+      --storage-account MyStorageAccount \
 
-        --storage-account MyStorageAccount \
+      --cluster-configuration @config.json
+  - summary: Create a cluster which Load-based Autoscale.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
 
-        --cluster-configuration @config.json
-  parameters:
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --autoscale-type Load --autoscale-min-workernode-count 3 --autoscale-max-workernode-count 5
+  - summary: Create a cluster which Schedule-based Autoscale.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --autoscale-type Schedule --timezone "Pacific Standard Time" --days Monday \
+
+      --time 09:00 --autoscale-workernode-count 5
+  - summary: Create a cluster with Relay Outbound and Private Link feature.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --subnet "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/fakevnet/subnets/default" \
+
+      --resource-provider-connection Outbound --enable-private-link
+  - summary: Create a cluster with Compute Isolation feature.
+    syntax: >-
+      az hdinsight create -t spark --version 3.6 -g MyResourceGroup -n MyCluster \
+
+      -p "HttpPassword1234!" --storage-account MyStorageAccount \
+
+      --enable-compute-isolation --workernode-size "Standard_E8S_V3" --headnode-size "Standard_E8S_V3"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+  - isRequired: true
+    name: --type -t
+    summary: 'Type of HDInsight cluster, like: hadoop, interactivehive, hbase, kafka, storm, spark, rserver, mlservices. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#cluster-types.'
     description: ''
-  - name: --no-validation-timeout
-    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
+  optionalParameters:
+  - name: --assign-identity
+    summary: The name or ID of user assigned identity.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --autoscale-count --autoscale-workernode-count
+    summary: The scheduled workernode count.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --autoscale-max-count --autoscale-max-workernode-count
+    summary: The max workernode count for Load-based atuoscale.
     description: ''
-  - isRequired: true
-    name: --type -t
-    summary: 'Type of HDInsight cluster, like: hadoop, interactivehive, hbase, kafka, storm, spark, rserver, mlservices. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#cluster-types">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#cluster-types</a>.'
+  - name: --autoscale-min-count --autoscale-min-workernode-count
+    summary: The minimal workernode count for Load-based atuoscale.
+    description: ''
+  - name: --autoscale-type
+    parameterValueGroup: Load, Schedule
+    summary: The autoscale type.
+    description: ''
+  - name: --cluster-admin-account
+    summary: The domain user account that will have admin privileges on the cluster. Required only when create cluster with Enterprise Security Package.
+    description: ''
+  - name: --cluster-admin-password
+    summary: The domain admin password. Required only when create cluster with Enterprise Security Package.
     description: ''
   - name: --cluster-configurations
-    summary: 'Extra configurations of various components. Configurations may be supplied from a file using the `@{path}` syntax or a JSON string. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap</a>.'
+    summary: 'Extra configurations of various components. Configurations may be supplied from a file using the `@{path}` syntax or a JSON string. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-customize-cluster-bootstrap.'
     description: ''
   - name: --cluster-tier
     parameterValueGroup: Premium, Standard
     summary: The tier of the cluster.
     description: ''
+  - name: --cluster-users-group-dns
+    summary: A space-delimited list of Distinguished Names for cluster user groups. Required only when create cluster with Enterprise Security Package.
+    description: ''
   - name: --component-version
-    summary: "The versions of various Hadoop components, in space-separated versions in 'component=version' format. Example: Spark=2.0 Hadoop=2.7.3 See also: <a href=\"https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#hadoop-components-available-with-different-hdinsight-versions\">https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#hadoop-components-available-with-different-hdinsight-versions</a>."
+    summary: "The versions of various Hadoop components, in space-separated versions in 'component=version' format. Example: Spark=2.0 Hadoop=2.7.3 See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#hadoop-components-available-with-different-hdinsight-versions."
     description: ''
-  - name: --esp
-    summary: Specify to create cluster with Enterprise Security Package. If omitted, creating cluster with Enterprise Security Package will not not allowed.
+  - name: --compute-isolation --enable-compute-isolation
+    parameterValueGroup: false, true
+    summary: Indicate whether enable compute isolation or not.
     description: ''
-  - name: --minimal-tls-version
-    parameterValueGroup: 1.0, 1.1, 1.2
-    summary: The minimal supported TLS version.
+  - name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
     description: ''
-  - name: --version -v
-    defaultValue: default
-    summary: 'The HDInsight cluster version. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#supported-hdinsight-versions">https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#supported-hdinsight-versions</a>.'
+  - name: --domain
+    summary: The name or resource ID of the user's Azure Active Directory Domain Service. Required only when create cluster with Enterprise Security Package.
+    description: ''
+  - name: --edgenode-size
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
+    description: ''
+  - name: --enable-private-link
+    parameterValueGroup: false, true
+    summary: Indicate whether enable the private link or not.
     description: ''
   - name: --encryption-algorithm
     defaultValue: RSA-OAEP
     parameterValueGroup: RSA-OAEP, RSA-OAEP-256, RSA1_5
     summary: Algorithm identifier for encryption.
     description: ''
+  - name: --encryption-at-host
+    parameterValueGroup: false, true
+    summary: Indicates whether enable encryption at host or not.
+    description: ''
+  - name: --encryption-in-transit
+    parameterValueGroup: false, true
+    summary: Indicates whether enable encryption in transit.
+    description: ''
   - name: --encryption-key-name
     summary: Key name that is used for enabling disk encryption.
     description: ''
@@ -177,22 +310,16 @@ items:
     summary: Key version that is used for enabling disk encryption.
     description: ''
   - name: --encryption-vault-uri
-    summary: Base key vault URI where the customers key is located eg. <a href="https://myvault.vault.azure.net">https://myvault.vault.azure.net</a>.
-    description: ''
-  - name: --cluster-admin-account
-    summary: The domain user account that will have admin privileges on the cluster. Required only when create cluster with Enterprise Security Package.
-    description: ''
-  - name: --cluster-admin-password
-    summary: The domain admin password. Required only when create cluster with Enterprise Security Package.
+    summary: Base key vault URI where the customers key is located eg. https://myvault.vault.azure.net.
     description: ''
-  - name: --cluster-users-group-dns
-    summary: A space-delimited list of Distinguished Names for cluster user groups. Required only when create cluster with Enterprise Security Package.
+  - name: --esp
+    summary: Specify to create cluster with Enterprise Security Package. If omitted, creating cluster with Enterprise Security Package will not not allowed.
     description: ''
-  - name: --domain
-    summary: The name or resource ID of the user's Azure Active Directory Domain Service. Required only when create cluster with Enterprise Security Package.
+  - name: --headnode-size
+    summary: 'Incoming BREAKING CHANGE: The default value "large" will be removed in next CLI version.The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
     description: ''
-  - name: --ldaps-urls
-    summary: A space-delimited list of LDAPS protocol URLs to communicate with the Active Directory. Required only when create cluster with Enterprise Security Package.
+  - name: --host-sku
+    summary: The dedicated host sku of compute isolation.
     description: ''
   - name: --http-password -p
     summary: HTTP password for the cluster. Will prompt if not given.
@@ -200,55 +327,41 @@ items:
   - name: --http-user -u
     summary: 'HTTP username for the cluster.  Default: admin.'
     description: ''
+  - name: --idbroker
+    summary: Specify to create ESP cluster with HDInsight ID Broker. If omitted, creating ESP cluster with HDInsight ID Broker will not not allowed.
+    description: ''
   - name: --kafka-client-group-id
     summary: The client AAD security group id for Kafka Rest Proxy.
     description: ''
   - name: --kafka-client-group-name
     summary: The client AAD security group name for Kafka Rest Proxy.
     description: ''
-  - name: --assign-identity
-    summary: The name or ID of user assigned identity.
-    description: ''
-  - name: --subnet
-    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
-    description: ''
-  - name: --vnet-name
-    summary: The name of a virtual network.
-    description: ''
-  - name: --edgenode-size
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
-    description: ''
-  - name: --headnode-size
-    defaultValue: large
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
-    description: ''
   - name: --kafka-management-node-count
     defaultValue: "2"
     summary: The number of kafka management node in the cluster.
     description: ''
   - name: --kafka-management-node-size
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
     description: ''
-  - name: --workernode-count -c
-    defaultValue: "3"
-    summary: The number of worker nodes in the cluster.
+  - name: --ldaps-urls
+    summary: A space-delimited list of LDAPS protocol URLs to communicate with the Active Directory. Required only when create cluster with Enterprise Security Package.
     description: ''
-  - name: --workernode-data-disk-size
-    summary: The size of the data disk in GB, e.g. 1023.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --workernode-data-disk-storage-account-type
-    parameterValueGroup: premium_lrs, standard_lrs
-    summary: 'The type of storage account that will be used for the data disks: standard_lrs or premium_lrs.'
+  - name: --minimal-tls-version
+    parameterValueGroup: 1.0, 1.1, 1.2
+    summary: The minimal supported TLS version.
     description: ''
-  - name: --workernode-data-disks-per-node
-    summary: The number of data disks to use per worker node.
+  - name: --no-validation-timeout
+    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
     description: ''
-  - name: --workernode-size
-    defaultValue: large
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --zookeepernode-size
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+  - name: --resource-provider-connection --rp-connection
+    parameterValueGroup: Inbound, Outbound
+    summary: The resource provider connection type.
     description: ''
   - name: --ssh-password -P
     summary: SSH password for the cluster nodes. If none specified, uses the HTTP password.
@@ -275,133 +388,162 @@ items:
   - name: --storage-filesystem
     summary: The storage filesystem the cluster will use. Uses the cluster name if none was specified. (DFS only).
     description: ''
+  - name: --subnet
+    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --time
+    summary: The 24-hour time in the form of xx:xx in days.
+    description: ''
+  - name: --timezone
+    summary: The timezone for schedule autoscale type. Values from `az hdinsight autoscale list-timezones`.
+    description: ''
+  - name: --version -v
+    defaultValue: default
+    summary: 'The HDInsight cluster version. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-component-versioning#supported-hdinsight-versions.'
+    description: ''
+  - name: --vnet-name
+    summary: The name of a virtual network.
+    description: ''
+  - name: --workernode-count -c
+    defaultValue: "3"
+    summary: The number of worker nodes in the cluster.
+    description: ''
+  - name: --workernode-data-disk-size
+    summary: The size of the data disk in GB, e.g. 1023.
+    description: ''
+  - name: --workernode-data-disk-storage-account-type
+    parameterValueGroup: premium_lrs, standard_lrs
+    summary: 'The type of storage account that will be used for the data disks: standard_lrs or premium_lrs.'
+    description: ''
+  - name: --workernode-data-disks-per-node
+    summary: The number of data disks to use per worker node.
+    description: ''
+  - name: --workernode-size
+    summary: 'Incoming BREAKING CHANGE: The default value "large" will be removed in next CLI version.The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
+    description: ''
+  - name: --zookeepernode-size
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_delete
   name: az hdinsight delete
   summary: Deletes the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight delete --name
+                        --resource-group
+                        [--no-wait]
+                        [--subscription]
+                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_list
   name: az hdinsight list
   summary: List HDInsight clusters in a resource group or subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight list [--query-examples]
+                      [--resource-group]
+                      [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_list_usage
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_list-usage
   name: az hdinsight list-usage
   summary: Lists the usages for the specified location.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight list-usage --location
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_resize
   name: az hdinsight resize
-  summary: Resizes the specified HDInsight cluster to the specified size.
+  summary: Resize the specified HDInsight cluster to the specified size.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight resize --name
+                        --resource-group
+                        --workernode-count
+                        [--no-wait]
+                        [--subscription]
+  examples:
+  - summary: Resize the cluster's workernode.
+    syntax: az hdinsight resize --name MyCluster --resource-group rg --workernode-count 5
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --workernode-count -c
     summary: The target worker node instance count for the operation.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_rotate_disk_encryption_key
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_rotate-disk-encryption-key
   name: az hdinsight rotate-disk-encryption-key
   summary: Rotate the disk encryption key of the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the cluster.
-    description: ''
-  - isRequired: true
-    name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  syntax: >-
+    az hdinsight rotate-disk-encryption-key --encryption-key-name
+                                            --encryption-key-version
+                                            --encryption-vault-uri
+                                            --name
+                                            --resource-group
+                                            [--no-wait]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --encryption-key-name
     summary: Key name that is used for enabling disk encryption.
@@ -412,86 +554,108 @@ items:
     description: ''
   - isRequired: true
     name: --encryption-vault-uri
-    summary: Base key vault URI where the customers key is located eg. <a href="https://myvault.vault.azure.net">https://myvault.vault.azure.net</a>.
+    summary: Base key vault URI where the customers key is located eg. https://myvault.vault.azure.net.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_show
   name: az hdinsight show
   summary: Gets the specified cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight show --name
+                      --resource-group
+                      [--query-examples]
+                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_update
   name: az hdinsight update
-  summary: Patch HDInsight cluster with the specified parameters.
+  summary: Update the tags of the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight update --name
+                        --resource-group
+                        [--no-wait]
+                        [--subscription]
+                        [--tags]
+  examples:
+  - summary: Update the tags.
+    syntax: az hdinsight update --name MyCluster --resource-group rg --tags key=value
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_wait
   name: az hdinsight wait
   summary: Place the CLI in a waiting state until an operation is complete.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight wait --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--subscription]
+                      [--timeout]
+                      [--updated]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -508,6 +672,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -515,94 +682,50 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_application
-  name: az hdinsight application
-  summary: Manage HDInsight applications.
-- uid: az_hdinsight_application_create
-  name: az hdinsight application create
-  summary: Create an application for a HDInsight cluster.
-- uid: az_hdinsight_application_delete
-  name: az hdinsight application delete
-  summary: Deletes the specified application on the HDInsight cluster.
-- uid: az_hdinsight_application_list
-  name: az hdinsight application list
-  summary: Lists all of the applications for the HDInsight cluster.
-- uid: az_hdinsight_application_show
-  name: az hdinsight application show
-  summary: Gets properties of the specified application.
-- uid: az_hdinsight_application_wait
-  name: az hdinsight application wait
-  summary: Place the CLI in a waiting state until an operation is complete.
-- uid: az_hdinsight_create
-  name: az hdinsight create
-  summary: Create a new cluster.
-- uid: az_hdinsight_delete
-  name: az hdinsight delete
-  summary: Deletes the specified HDInsight cluster.
-- uid: az_hdinsight_list
-  name: az hdinsight list
-  summary: List HDInsight clusters in a resource group or subscription.
-- uid: az_hdinsight_list_usage
-  name: az hdinsight list-usage
-  summary: Lists the usages for the specified location.
-- uid: az_hdinsight_monitor
-  name: az hdinsight monitor
-  summary: Manage Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_disable
-  name: az hdinsight monitor disable
-  summary: Disable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_enable
-  name: az hdinsight monitor enable
-  summary: Enable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_show
-  name: az hdinsight monitor show
-  summary: Get the status of Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_resize
-  name: az hdinsight resize
-  summary: Resizes the specified HDInsight cluster to the specified size.
-- uid: az_hdinsight_rotate_disk_encryption_key
-  name: az hdinsight rotate-disk-encryption-key
-  summary: Rotate the disk encryption key of the specified HDInsight cluster.
-- uid: az_hdinsight_script_action
-  name: az hdinsight script-action
-  summary: Manage HDInsight script actions.
-- uid: az_hdinsight_script_action_delete
-  name: az hdinsight script-action delete
-  summary: Deletes a specified persisted script action of the cluster.
-- uid: az_hdinsight_script_action_execute
-  name: az hdinsight script-action execute
-  summary: Execute script actions on the specified HDInsight cluster.
-- uid: az_hdinsight_script_action_list
-  name: az hdinsight script-action list
-  summary: Lists all the persisted script actions for the specified cluster.
-- uid: az_hdinsight_script_action_list_execution_history
-  name: az hdinsight script-action list-execution-history
-  summary: Lists all scripts' execution history for the specified cluster.
-- uid: az_hdinsight_script_action_promote
-  name: az hdinsight script-action promote
-  summary: Promotes the specified ad-hoc script execution to a persisted script.
-- uid: az_hdinsight_script_action_show_execution_details
-  name: az hdinsight script-action show-execution-details
-  summary: Gets the script execution detail for the given script execution ID.
-- uid: az_hdinsight_show
-  name: az hdinsight show
-  summary: Gets the specified cluster.
-- uid: az_hdinsight_update
-  name: az hdinsight update
-  summary: Patch HDInsight cluster with the specified parameters.
-- uid: az_hdinsight_wait
-  name: az hdinsight wait
-  summary: Place the CLI in a waiting state until an operation is complete.
+- az_hdinsight_application
+- az_hdinsight_application_create
+- az_hdinsight_application_delete
+- az_hdinsight_application_list
+- az_hdinsight_application_show
+- az_hdinsight_application_wait
+- az_hdinsight_autoscale
+- az_hdinsight_autoscale_condition
+- az_hdinsight_autoscale_condition_create
+- az_hdinsight_autoscale_condition_delete
+- az_hdinsight_autoscale_condition_list
+- az_hdinsight_autoscale_condition_update
+- az_hdinsight_autoscale_condition_wait
+- az_hdinsight_autoscale_create
+- az_hdinsight_autoscale_delete
+- az_hdinsight_autoscale_list-timezones
+- az_hdinsight_autoscale_show
+- az_hdinsight_autoscale_update
+- az_hdinsight_autoscale_wait
+- az_hdinsight_create
+- az_hdinsight_delete
+- az_hdinsight_host
+- az_hdinsight_host_list
+- az_hdinsight_host_restart
+- az_hdinsight_list
+- az_hdinsight_list-usage
+- az_hdinsight_monitor
+- az_hdinsight_monitor_disable
+- az_hdinsight_monitor_enable
+- az_hdinsight_monitor_show
+- az_hdinsight_resize
+- az_hdinsight_rotate-disk-encryption-key
+- az_hdinsight_script-action
+- az_hdinsight_script-action_delete
+- az_hdinsight_script-action_execute
+- az_hdinsight_script-action_list
+- az_hdinsight_script-action_list-execution-history
+- az_hdinsight_script-action_promote
+- az_hdinsight_script-action_show-execution-details
+- az_hdinsight_show
+- az_hdinsight_update
+- az_hdinsight_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -618,10 +741,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage HDInsight resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/application.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/application.yml
index b5e485d88c..d4b144eb43 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/application.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/application.yml
@@ -1,67 +1,76 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight_application
-  name: az hdinsight application
-  summary: Manage HDInsight applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_application_create
-  - az_hdinsight_application_delete
-  - az_hdinsight_application_list
-  - az_hdinsight_application_show
-  - az_hdinsight_application_wait
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_application
+name: az hdinsight application
+summary: Manage HDInsight applications.
+description: ''
+directCommands:
 - uid: az_hdinsight_application_create
   name: az hdinsight application create
   summary: Create an application for a HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az hdinsight application create --cluster-name
+                                    --name
+                                    --resource-group
+                                    --script-action-name
+                                    --script-uri
+                                    [--access-mode]
+                                    [--destination-port]
+                                    [--disable-gateway-auth {false, true}]
+                                    [--edgenode-size]
+                                    [--marketplace-id]
+                                    [--no-validation-timeout]
+                                    [--script-parameters]
+                                    [--ssh-password]
+                                    [--ssh-public-key]
+                                    [--ssh-user]
+                                    [--sub-domain-suffix]
+                                    [--subnet]
+                                    [--subscription]
+                                    [--tags]
+                                    [--type {CustomApplication, RServer}]
+                                    [--vnet-name]
   examples:
   - summary: Create an application with a script URI.
-    syntax:
-      content: >-
-        az hdinsight application create -g MyResourceGroup -n MyApplication \
+    syntax: >-
+      az hdinsight application create -g MyResourceGroup -n MyApplication \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
 
-        --script-action-name MyScriptAction \
+      --script-action-name MyScriptAction \
 
-        --script-parameters '"-version latest -port 20000"'
+      --script-parameters '"-version latest -port 20000"'
   - summary: Create an application with a script URI and specified edge node size.
-    syntax:
-      content: >-
-        az hdinsight application create -g MyResourceGroup -n MyApplication \
+    syntax: >-
+      az hdinsight application create -g MyResourceGroup -n MyApplication \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
 
-        --script-action-name MyScriptAction \
+      --script-action-name MyScriptAction \
 
-        --script-parameters "-version latest -port 20000" \
+      --script-parameters "-version latest -port 20000" \
 
-        --edgenode-size Standard_D4_v2
+      --edgenode-size Standard_D4_v2
   - summary: Create an application with HTTPS Endpoint.
-    syntax:
-      content: >-
-        az hdinsight application create -g MyResourceGroup -n MyApplication \
+    syntax: >-
+      az hdinsight application create -g MyResourceGroup -n MyApplication \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxhueconfigactionv02/install-hue-uber-v02.sh \
 
-        --script-action-name MyScriptAction \
+      --script-action-name MyScriptAction \
 
-        --script-parameters "-version latest -port 20000" \
+      --script-parameters "-version latest -port 20000" \
 
-        --destination-port 8888 \
+      --destination-port 8888 \
 
-        --sub-domain-suffix was
-  parameters:
+      --sub-domain-suffix was
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -72,22 +81,17 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --marketplace-id
-    summary: The marketplace identifier.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --no-validation-timeout
-    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - isRequired: true
+    name: --script-action-name
+    summary: The name of the script action.
     description: ''
-  - name: --type -t
-    defaultValue: CustomApplication
-    parameterValueGroup: CustomApplication, RServer
-    summary: The application type.
+  - isRequired: true
+    name: --script-uri
+    summary: The URI to the script.
     description: ''
+  optionalParameters:
   - name: --access-mode
     defaultValue: WebPage
     summary: The access mode for the application.
@@ -100,18 +104,18 @@ items:
     parameterValueGroup: false, true
     summary: 'Indicates whether to disable gateway authentication. Default is to enable gateway authentication. Default: false.'
     description: ''
-  - name: --sub-domain-suffix
-    summary: The subdomain suffix of the application.
+  - name: --edgenode-size
+    defaultValue: Standard_D3_V2
+    summary: 'The size of the node. See also: https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size.'
     description: ''
-  - name: --subnet
-    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+  - name: --marketplace-id
+    summary: The marketplace identifier.
     description: ''
-  - name: --vnet-name
-    summary: The name of a virtual network.
+  - name: --no-validation-timeout
+    summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
     description: ''
-  - name: --edgenode-size
-    defaultValue: Standard_D3_V2
-    summary: 'The size of the node. See also: <a href="https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size">https://docs.microsoft.com/azure/hdinsight/hdinsight-hadoop-provision-linux-clusters#configure-cluster-size</a>.'
+  - name: --script-parameters
+    summary: The parameters for the script.
     description: ''
   - name: --ssh-password -P
     summary: SSH password for the cluster nodes.
@@ -123,33 +127,39 @@ items:
     defaultValue: sshuser
     summary: SSH username for the cluster nodes.
     description: ''
-  - isRequired: true
-    name: --script-action-name
-    summary: The name of the script action.
-    description: ''
-  - isRequired: true
-    name: --script-uri
-    summary: The URI to the script.
+  - name: --sub-domain-suffix
+    summary: The subdomain suffix of the application.
     description: ''
-  - name: --script-parameters
-    summary: The parameters for the script.
+  - name: --subnet
+    summary: The name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type -t
+    defaultValue: CustomApplication
+    parameterValueGroup: CustomApplication, RServer
+    summary: The application type.
+    description: ''
+  - name: --vnet-name
+    summary: The name of a virtual network.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_delete
   name: az hdinsight application delete
   summary: Deletes the specified application on the HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application delete --cluster-name
+                                    --name
+                                    --resource-group
+                                    [--no-wait]
+                                    [--subscription]
+                                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -160,54 +170,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_list
   name: az hdinsight application list
   summary: Lists all of the applications for the HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application list --cluster-name
+                                  --resource-group
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_show
   name: az hdinsight application show
   summary: Gets properties of the specified application.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application show --cluster-name
+                                  --name
+                                  --resource-group
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -218,24 +230,33 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_application_wait
   name: az hdinsight application wait
   summary: Place the CLI in a waiting state until an operation is complete.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight application wait --cluster-name
+                                  --name
+                                  --resource-group
+                                  [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--interval]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -246,8 +267,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -264,6 +286,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -271,31 +296,13 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_application_create
-  name: az hdinsight application create
-  summary: Create an application for a HDInsight cluster.
-- uid: az_hdinsight_application_delete
-  name: az hdinsight application delete
-  summary: Deletes the specified application on the HDInsight cluster.
-- uid: az_hdinsight_application_list
-  name: az hdinsight application list
-  summary: Lists all of the applications for the HDInsight cluster.
-- uid: az_hdinsight_application_show
-  name: az hdinsight application show
-  summary: Gets properties of the specified application.
-- uid: az_hdinsight_application_wait
-  name: az hdinsight application wait
-  summary: Place the CLI in a waiting state until an operation is complete.
+- az_hdinsight_application_create
+- az_hdinsight_application_delete
+- az_hdinsight_application_list
+- az_hdinsight_application_show
+- az_hdinsight_application_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -311,10 +318,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage HDInsight applications.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/autoscale.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/autoscale.yml
new file mode 100644
index 0000000000..c92cc8a051
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/autoscale.yml
@@ -0,0 +1,280 @@
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_autoscale
+name: az hdinsight autoscale
+summary: Manage HDInsight cluster's Autoscale configuration.
+description: ''
+directCommands:
+- uid: az_hdinsight_autoscale_create
+  name: az hdinsight autoscale create
+  summary: Enable Autoscale for a running cluster.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale create --cluster-name
+                                  --resource-group
+                                  --type {Load, Schedule}
+                                  [--days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}]
+                                  [--max-workernode-count]
+                                  [--min-workernode-count]
+                                  [--no-wait]
+                                  [--subscription]
+                                  [--time]
+                                  [--timezone]
+                                  [--workernode-count]
+                                  [--yes]
+  examples:
+  - summary: Enable Load-based Autoscale for a running cluster.
+    syntax: >-
+      az hdinsight autoscale create --resource-group MyResourceGroup --cluster-name MyCluster --type Load \
+
+      --min-workernode-count 3 --max-workernode-count 5
+  - summary: Enable Schedule-based Autoscale for a running cluster.
+    syntax: >-
+      az hdinsight autoscale create --resource-group MyResourceGroup --cluster-name MyCluster --type Schedule \
+
+      --timezone "Pacific Standard Time" --days Monday Tuesday --time 09:00 --workernode-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Load, Schedule
+    summary: The autoscale type.
+    description: ''
+  optionalParameters:
+  - name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
+    description: ''
+  - name: --max-workernode-count
+    summary: The max workernode count for Load-based atuoscale.
+    description: ''
+  - name: --min-workernode-count
+    summary: The minimal workernode count for Load-based atuoscale.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time
+    summary: The 24-hour time in the form xx:xx in days.
+    description: ''
+  - name: --timezone
+    summary: The timezone for schedule autoscale type. Values from `az hdinsight autoscale list-timezones`.
+    description: ''
+  - name: --workernode-count
+    summary: The schedule workernode count.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_delete
+  name: az hdinsight autoscale delete
+  summary: Disable Autoscale for a running cluster.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale delete --cluster-name
+                                  --resource-group
+                                  [--no-wait]
+                                  [--subscription]
+                                  [--yes]
+  examples:
+  - summary: Disable Autoscale for a running cluster.
+    syntax: az hdinsight autoscale delete --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_list-timezones
+  name: az hdinsight autoscale list-timezones
+  summary: List the available timezone name when enabling Schedule-based Autoscale.
+  description: ''
+  syntax: az hdinsight autoscale list-timezones [--subscription]
+  examples:
+  - summary: List the available timezone name.
+    syntax: az hdinsight autoscale list-timezones
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_show
+  name: az hdinsight autoscale show
+  summary: Get the Autoscale configuration of a specified cluster.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale show --cluster-name
+                                --resource-group
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get the Autoscale configuration.
+    syntax: az hdinsight autoscale show --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_update
+  name: az hdinsight autoscale update
+  summary: Update the Autoscale configuration.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale update --cluster-name
+                                  --resource-group
+                                  [--max-workernode-count]
+                                  [--min-workernode-count]
+                                  [--no-wait]
+                                  [--subscription]
+                                  [--timezone]
+  examples:
+  - summary: Update Load-based Autoscale related configuration.
+    syntax: az hdinsight autoscale update --resource-group MyResourceGroup --cluster-name MyCluster --max-workernode-count 5
+  - summary: Update Schedule-based Autoscale related configuration.
+    syntax: az hdinsight autoscale update --resource-group MyResourceGroup --cluster-name MyCluster --timezone "China Standard Time"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-workernode-count
+    summary: The max workernode count for Load-based atuoscale.
+    description: ''
+  - name: --min-workernode-count
+    summary: The minimal workernode count for Load-based atuoscale.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timezone
+    summary: The timezone for schedule autoscale type. Values from `az hdinsight autoscale list-timezones`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_wait
+  name: az hdinsight autoscale wait
+  summary: Place the CLI in a waiting state until an operation is complete.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale wait --name
+                                --resource-group
+                                [--created]
+                                [--custom]
+                                [--deleted]
+                                [--exists]
+                                [--interval]
+                                [--subscription]
+                                [--timeout]
+                                [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+commands:
+- az_hdinsight_autoscale_condition
+- az_hdinsight_autoscale_condition_create
+- az_hdinsight_autoscale_condition_delete
+- az_hdinsight_autoscale_condition_list
+- az_hdinsight_autoscale_condition_update
+- az_hdinsight_autoscale_condition_wait
+- az_hdinsight_autoscale_create
+- az_hdinsight_autoscale_delete
+- az_hdinsight_autoscale_list-timezones
+- az_hdinsight_autoscale_show
+- az_hdinsight_autoscale_update
+- az_hdinsight_autoscale_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight cluster's Autoscale configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/autoscale/condition.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/autoscale/condition.yml
new file mode 100644
index 0000000000..f66c9bb391
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/autoscale/condition.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_autoscale_condition
+name: az hdinsight autoscale condition
+summary: Manage schedule condition of the HDInsight cluster which enabled Schedule-based Autoscale.
+description: ''
+directCommands:
+- uid: az_hdinsight_autoscale_condition_create
+  name: az hdinsight autoscale condition create
+  summary: Add a new schedule condition.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition create --cluster-name
+                                            --days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}
+                                            --resource-group
+                                            --time
+                                            --workernode-count
+                                            [--no-wait]
+                                            [--subscription]
+  examples:
+  - summary: Add a new schedule condition.
+    syntax: >-
+      az hdinsight autoscale condition create --resource-group MyResourceGroup --cluster-name MyCluster \
+
+      --days Monday Tuesday --time 09:00 --workernode-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --time
+    summary: The 24-hour time in the form xx:xx in days.
+    description: ''
+  - isRequired: true
+    name: --workernode-count
+    summary: The schedule workernode count.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_delete
+  name: az hdinsight autoscale condition delete
+  summary: Delete schedule condition.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition delete --cluster-name
+                                            --index
+                                            --resource-group
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--yes]
+  examples:
+  - summary: Delete a schedule condition.
+    syntax: az hdinsight autoscale condition delete --resource-group MyResourceGroup --cluster-name MyCluster --index 0
+  - summary: Delete multiple schedule conditions.
+    syntax: az hdinsight autoscale condition delete --resource-group MyResourceGroup --cluster-name MyCluster --index 0 1
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: The Space-separated list of condition indices which starts with 0 to delete.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_list
+  name: az hdinsight autoscale condition list
+  summary: List all schedule conditions.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition list --cluster-name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
+  examples:
+  - summary: List all schedule conditions.
+    syntax: az hdinsight autoscale condition list --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_update
+  name: az hdinsight autoscale condition update
+  summary: Update a schedule condition.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition update --cluster-name
+                                            --index
+                                            --resource-group
+                                            [--days {Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday}]
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--time]
+                                            [--workernode-count]
+  examples:
+  - summary: Update a schedule condition.
+    syntax: >-
+      az hdinsight autoscale condition update --resource-group MyResourceGroup --cluster-name MyCluster --index 0 \
+
+      --time 10:00 --workernode-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: The schedule condition index which starts with 0.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --days
+    parameterValueGroup: Friday, Monday, Saturday, Sunday, Thursday, Tuesday, Wednesday
+    summary: A space-delimited list of schedule day.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time
+    summary: The 24-hour time in the form xx:xx in days.
+    description: ''
+  - name: --workernode-count
+    summary: The schedule workernode count.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_autoscale_condition_wait
+  name: az hdinsight autoscale condition wait
+  summary: Place the CLI in a waiting state until an operation is complete.
+  description: ''
+  syntax: >-
+    az hdinsight autoscale condition wait --name
+                                          --resource-group
+                                          [--created]
+                                          [--custom]
+                                          [--deleted]
+                                          [--exists]
+                                          [--interval]
+                                          [--subscription]
+                                          [--timeout]
+                                          [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+commands:
+- az_hdinsight_autoscale_condition_create
+- az_hdinsight_autoscale_condition_delete
+- az_hdinsight_autoscale_condition_list
+- az_hdinsight_autoscale_condition_update
+- az_hdinsight_autoscale_condition_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage schedule condition of the HDInsight cluster which enabled Schedule-based Autoscale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/host.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/host.yml
new file mode 100644
index 0000000000..73871ea0d3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/host.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_host
+name: az hdinsight host
+summary: Manage HDInsight cluster's virtual hosts.
+description: ''
+directCommands:
+- uid: az_hdinsight_host_list
+  name: az hdinsight host list
+  summary: List the hosts of the specified HDInsight cluster.
+  description: ''
+  syntax: >-
+    az hdinsight host list --cluster-name
+                           --resource-group
+                           [--query-examples]
+                           [--subscription]
+  examples:
+  - summary: List the hosts of the specified HDInsight cluster.
+    syntax: az hdinsight host list --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_host_restart
+  name: az hdinsight host restart
+  summary: Restart the specific hosts of the specified HDInsight cluster.
+  description: ''
+  syntax: >-
+    az hdinsight host restart --cluster-name
+                              --host-names
+                              --resource-group
+                              [--subscription]
+                              [--yes]
+  examples:
+  - summary: Restart the specific hosts of the specified HDInsight cluster.
+    syntax: az hdinsight host restart --resource-group MyResourceGroup --cluster-name MyCluster --host-names hostname1 hostname2
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --host-names
+    summary: A space-delimited list of host names that need to be restarted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+commands:
+- az_hdinsight_host_list
+- az_hdinsight_host_restart
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight cluster's virtual hosts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/monitor.yml
index f1aea24ae4..05f0746b34 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/monitor.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/monitor.yml
@@ -1,58 +1,56 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight_monitor
-  name: az hdinsight monitor
-  summary: Manage Azure Monitor logs integration on an HDInsight cluster.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_monitor_disable
-  - az_hdinsight_monitor_enable
-  - az_hdinsight_monitor_show
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_monitor
+name: az hdinsight monitor
+summary: Manage Azure Monitor logs integration on an HDInsight cluster.
+description: ''
+directCommands:
 - uid: az_hdinsight_monitor_disable
   name: az hdinsight monitor disable
   summary: Disable the Azure Monitor logs integration on an HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight monitor disable --name
+                                 --resource-group
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_monitor_enable
   name: az hdinsight monitor enable
   summary: Enable the Azure Monitor logs integration on an HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight monitor enable --name
+                                --resource-group
+                                --workspace
+                                [--no-validation-timeout]
+                                [--primary-key]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --workspace
     summary: The name, resource ID or workspace ID of Log Analytics workspace.
     description: ''
+  optionalParameters:
   - name: --no-validation-timeout
     summary: Permit timeout error during argument validation phase. If omitted, validation timeout error will be permitted.
     description: ''
@@ -62,46 +60,37 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 - uid: az_hdinsight_monitor_show
   name: az hdinsight monitor show
   summary: Get the status of Azure Monitor logs integration on an HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight monitor show --name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_monitor_disable
-  name: az hdinsight monitor disable
-  summary: Disable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_enable
-  name: az hdinsight monitor enable
-  summary: Enable the Azure Monitor logs integration on an HDInsight cluster.
-- uid: az_hdinsight_monitor_show
-  name: az hdinsight monitor show
-  summary: Get the status of Azure Monitor logs integration on an HDInsight cluster.
+- az_hdinsight_monitor_disable
+- az_hdinsight_monitor_enable
+- az_hdinsight_monitor_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -117,10 +106,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage Azure Monitor logs integration on an HDInsight cluster.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage Azure Monitor logs integration on an HDInsight cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/script-action.yml b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/script-action.yml
index 41a9fd70fb..61be864f19 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/hdinsight/script-action.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/hdinsight/script-action.yml
@@ -1,25 +1,19 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_hdinsight_script_action
-  name: az hdinsight script-action
-  summary: Manage HDInsight script actions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_hdinsight_script_action_delete
-  - az_hdinsight_script_action_execute
-  - az_hdinsight_script_action_list
-  - az_hdinsight_script_action_list_execution_history
-  - az_hdinsight_script_action_promote
-  - az_hdinsight_script_action_show_execution_details
-- uid: az_hdinsight_script_action_delete
+### YamlMime:AzureCLIGroup
+uid: az_hdinsight_script-action
+name: az hdinsight script-action
+summary: Manage HDInsight script actions.
+description: ''
+directCommands:
+- uid: az_hdinsight_script-action_delete
   name: az hdinsight script-action delete
   summary: Deletes a specified persisted script action of the cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action delete --cluster-name
+                                      --name
+                                      --resource-group
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -30,37 +24,39 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_execute
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_execute
   name: az hdinsight script-action execute
   summary: Execute script actions on the specified HDInsight cluster.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az hdinsight script-action execute --cluster-name
+                                       --name
+                                       --resource-group
+                                       --roles
+                                       --script-uri
+                                       [--persist-on-success]
+                                       [--script-parameters]
+                                       [--subscription]
   examples:
   - summary: Execute a script action and persist on success.
-    syntax:
-      content: >-
-        az hdinsight script-action execute -g MyResourceGroup -n MyScriptActionName \
+    syntax: >-
+      az hdinsight script-action execute -g MyResourceGroup -n MyScriptActionName \
 
-        --cluster-name MyCluster \
+      --cluster-name MyCluster \
 
-        --script-uri https://hdiconfigactions.blob.core.windows.net/linuxgiraphconfigactionv01/giraph-installer-v01.sh \
+      --script-uri https://hdiconfigactions.blob.core.windows.net/linuxgiraphconfigactionv01/giraph-installer-v01.sh \
 
-        --roles headnode workernode \
+      --roles headnode workernode \
 
-        --persist-on-success
-  parameters:
+      --persist-on-success
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -71,7 +67,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --roles
@@ -81,6 +77,7 @@ items:
     name: --script-uri
     summary: The URI to the script.
     description: ''
+  optionalParameters:
   - name: --persist-on-success
     summary: If the scripts needs to be persisted.
     description: ''
@@ -90,67 +87,65 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_list
   name: az hdinsight script-action list
   summary: Lists all the persisted script actions for the specified cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action list --cluster-name
+                                    --resource-group
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_list_execution_history
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_list-execution-history
   name: az hdinsight script-action list-execution-history
   summary: Lists all scripts' execution history for the specified cluster.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action list-execution-history --cluster-name
+                                                      --resource-group
+                                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_promote
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_promote
   name: az hdinsight script-action promote
   summary: Promotes the specified ad-hoc script execution to a persisted script.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action promote --cluster-name
+                                       --execution-id
+                                       --resource-group
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -161,24 +156,23 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_hdinsight_script_action_show_execution_details
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
+- uid: az_hdinsight_script-action_show-execution-details
   name: az hdinsight script-action show-execution-details
   summary: Gets the script execution detail for the given script execution ID.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az hdinsight script-action show-execution-details --cluster-name
+                                                      --execution-id
+                                                      --resource-group
+                                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --cluster-name
     summary: The name of the cluster.
@@ -189,36 +183,20 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
 commands:
-- uid: az_hdinsight_script_action_delete
-  name: az hdinsight script-action delete
-  summary: Deletes a specified persisted script action of the cluster.
-- uid: az_hdinsight_script_action_execute
-  name: az hdinsight script-action execute
-  summary: Execute script actions on the specified HDInsight cluster.
-- uid: az_hdinsight_script_action_list
-  name: az hdinsight script-action list
-  summary: Lists all the persisted script actions for the specified cluster.
-- uid: az_hdinsight_script_action_list_execution_history
-  name: az hdinsight script-action list-execution-history
-  summary: Lists all scripts' execution history for the specified cluster.
-- uid: az_hdinsight_script_action_promote
-  name: az hdinsight script-action promote
-  summary: Promotes the specified ad-hoc script execution to a persisted script.
-- uid: az_hdinsight_script_action_show_execution_details
-  name: az hdinsight script-action show-execution-details
-  summary: Gets the script execution detail for the given script execution ID.
+- az_hdinsight_script-action_delete
+- az_hdinsight_script-action_execute
+- az_hdinsight_script-action_list
+- az_hdinsight_script-action_list-execution-history
+- az_hdinsight_script-action_promote
+- az_hdinsight_script-action_show-execution-details
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -234,10 +212,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/f55047618be302f17adc2cfe6c0953637d70ef2c/src/azure-cli/azure/cli/command_modules/hdinsight/_help.py
-updated_at: 3/23/2020 8:14:59 AM
-ms.date: 03/23/2020
-description: Manage HDInsight script actions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage HDInsight script actions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthbot.yml b/2018-03-01-hybrid/docs-ref-autogen/healthbot.yml
new file mode 100644
index 0000000000..b59bbb074a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthbot.yml
@@ -0,0 +1,214 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthbot
+name: az healthbot
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthbot** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az healthbot** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage bot with healthbot.
+description: ''
+directCommands:
+- uid: az_healthbot_create
+  name: az healthbot create
+  summary: Create a new HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot create --bot-name
+                        --resource-group
+                        --sku {C0, F0, S1}
+                        [--location]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: BotCreate
+    syntax: az healthbot create --name "samplebotname" --location "East US" --sku "F0" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: C0, F0, S1
+    summary: The name of the HealthBot SKU.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthbot_delete
+  name: az healthbot delete
+  summary: Delete a HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot delete --bot-name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: BotDelete
+    syntax: az healthbot delete --name "samplebotname" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_healthbot_list
+  name: az healthbot list
+  summary: Returns all the resources of a particular type belonging to a resource group And Returns all the resources of a particular type belonging to a subscription.
+  description: ''
+  syntax: az healthbot list [--resource-group]
+  examples:
+  - summary: List Bots by Resource Group
+    syntax: az healthbot list --resource-group "OneResourceGroupName"
+  - summary: List Bots by Subscription
+    syntax: az healthbot list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_healthbot_show
+  name: az healthbot show
+  summary: Get a HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot show --bot-name
+                      --resource-group
+  examples:
+  - summary: ResourceInfoGet
+    syntax: az healthbot show --name "samplebotname" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_healthbot_update
+  name: az healthbot update
+  summary: Patch a HealthBot.
+  description: ''
+  syntax: >-
+    az healthbot update --bot-name
+                        --resource-group
+                        [--sku {C0, F0, S1}]
+                        [--tags]
+  examples:
+  - summary: BotUpdate
+    syntax: az healthbot update --bot-name "samplebotname" --name "F0" --resource-group "healthbotClient"
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: C0, F0, S1
+    summary: The name of the HealthBot SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthbot_wait
+  name: az healthbot wait
+  summary: Place the CLI in a waiting state until a condition of the healthbot is met.
+  description: ''
+  syntax: >-
+    az healthbot wait --bot-name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the healthbot is successfully created.
+    syntax: az healthbot wait --name "samplebotname" --resource-group "healthbotClient" --created
+  - summary: Pause executing next line of CLI script until the healthbot is successfully deleted.
+    syntax: az healthbot wait --name "samplebotname" --resource-group "healthbotClient" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --bot-name --name -n
+    summary: The name of the Bot resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_healthbot_create
+- az_healthbot_delete
+- az_healthbot_list
+- az_healthbot_show
+- az_healthbot_update
+- az_healthbot_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage bot with healthbot.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthcareapis.yml b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis.yml
new file mode 100644
index 0000000000..493b29545c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis
+name: az healthcareapis
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_healthcareapis_acr
+- az_healthcareapis_acr_add
+- az_healthcareapis_acr_list
+- az_healthcareapis_acr_remove
+- az_healthcareapis_acr_reset
+- az_healthcareapis_operation-result
+- az_healthcareapis_operation-result_show
+- az_healthcareapis_private-endpoint-connection
+- az_healthcareapis_private-endpoint-connection_create
+- az_healthcareapis_private-endpoint-connection_delete
+- az_healthcareapis_private-endpoint-connection_list
+- az_healthcareapis_private-endpoint-connection_show
+- az_healthcareapis_private-endpoint-connection_update
+- az_healthcareapis_private-endpoint-connection_wait
+- az_healthcareapis_private-link-resource
+- az_healthcareapis_private-link-resource_list
+- az_healthcareapis_private-link-resource_show
+- az_healthcareapis_service
+- az_healthcareapis_service_create
+- az_healthcareapis_service_delete
+- az_healthcareapis_service_list
+- az_healthcareapis_service_show
+- az_healthcareapis_service_update
+- az_healthcareapis_service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/acr.yml b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/acr.yml
new file mode 100644
index 0000000000..326afade8a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/acr.yml
@@ -0,0 +1,125 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_acr
+name: az healthcareapis acr
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis acr** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis acr.
+description: ''
+directCommands:
+- uid: az_healthcareapis_acr_add
+  name: az healthcareapis acr add
+  summary: Add a list of registries to the service, repeated ones will be ignored.
+  description: ''
+  syntax: >-
+    az healthcareapis acr add --resource-group
+                              --resource-name
+                              [--login-servers]
+  examples:
+  - summary: Acr_Add
+    syntax: az healthcareapis acr add --login-servers "test1.azurecr.io test2.azurecr.io test3.azurecr.io" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --login-servers
+    summary: The list of login servers that shallbe added to the service instance.
+    description: ''
+- uid: az_healthcareapis_acr_list
+  name: az healthcareapis acr list
+  summary: Lists all container registries associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis acr list --resource-group
+                               --resource-name
+  examples:
+  - summary: Acr_List
+    syntax: az healthcareapis acr list --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_acr_remove
+  name: az healthcareapis acr remove
+  summary: Remove a list of registries from the service, non-existing ones will be ignored.
+  description: ''
+  syntax: >-
+    az healthcareapis acr remove --resource-group
+                                 --resource-name
+                                 [--login-servers]
+  examples:
+  - summary: Acr_Remove
+    syntax: az healthcareapis acr remove --login-servers "test1.azurecr.io test2.azurecr.io"  --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --login-servers
+    summary: The list of login servers that shallbe removed from the service instance.
+    description: ''
+- uid: az_healthcareapis_acr_reset
+  name: az healthcareapis acr reset
+  summary: Reset the container registries associated with the service to a new list.
+  description: ''
+  syntax: >-
+    az healthcareapis acr reset --resource-group
+                                --resource-name
+                                [--login-servers]
+  examples:
+  - summary: Acr_Reset
+    syntax: az healthcareapis acr reset --login-servers "test1.azurecr.io" --resource-group "rgname" --resource-name "service1"
+  - summary: Acr_Reset_To_Empty
+    syntax: az healthcareapis acr reset --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --login-servers
+    summary: The list of login servers to substitute for the existing one.
+    description: ''
+commands:
+- az_healthcareapis_acr_add
+- az_healthcareapis_acr_list
+- az_healthcareapis_acr_remove
+- az_healthcareapis_acr_reset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis acr.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/operation-result.yml b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/operation-result.yml
new file mode 100644
index 0000000000..198ff65f42
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/operation-result.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_operation-result
+name: az healthcareapis operation-result
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis operation-result** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis operation-result.
+description: ''
+directCommands:
+- uid: az_healthcareapis_operation-result_show
+  name: az healthcareapis operation-result show
+  summary: Get the operation result for a long running operation.
+  description: ''
+  syntax: >-
+    az healthcareapis operation-result show --location-name
+                                            --operation-result-id
+  examples:
+  - summary: Get operation result
+    syntax: az healthcareapis operation-result show --location-name "westus" --operation-result-id "exampleid"
+  requiredParameters:
+  - isRequired: true
+    name: --location-name
+    summary: The location of the operation.
+    description: ''
+  - isRequired: true
+    name: --operation-result-id
+    summary: The ID of the operation result to get.
+    description: ''
+commands:
+- az_healthcareapis_operation-result_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis operation-result.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/private-endpoint-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/private-endpoint-connection.yml
new file mode 100644
index 0000000000..3b077f3166
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/private-endpoint-connection.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_private-endpoint-connection
+name: az healthcareapis private-endpoint-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis private-endpoint-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis private-endpoint-connection.
+description: ''
+directCommands:
+- uid: az_healthcareapis_private-endpoint-connection_create
+  name: az healthcareapis private-endpoint-connection create
+  summary: Update the state of the specified private endpoint connection associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection create --name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--no-wait]
+                                                         [--private-link-service-connection-state-actions-required]
+                                                         [--private-link-service-connection-state-description]
+                                                         [--private-link-service-connection-state-status {Approved, Pending, Rejected}]
+  examples:
+  - summary: PrivateEndpointConnection_CreateOrUpdate
+    syntax: az healthcareapis private-endpoint-connection create --name "myConnection" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-link-service-connection-state-actions-required
+    summary: A message indicating if changes on the service provider require any updates on the consumer.
+    description: ''
+  - name: --private-link-service-connection-state-description
+    summary: The reason for approval/rejection of the connection.
+    description: ''
+  - name: --private-link-service-connection-state-status
+    parameterValueGroup: Approved, Pending, Rejected
+    summary: Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_delete
+  name: az healthcareapis private-endpoint-connection delete
+  summary: Deletes a private endpoint connection.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection delete --name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--no-wait]
+                                                         [--yes]
+  examples:
+  - summary: PrivateEndpointConnections_Delete
+    syntax: az healthcareapis private-endpoint-connection delete --name "myConnection" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_list
+  name: az healthcareapis private-endpoint-connection list
+  summary: Lists all private endpoint connections for a service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection list --resource-group
+                                                       --resource-name
+  examples:
+  - summary: PrivateEndpointConnection_List
+    syntax: az healthcareapis private-endpoint-connection list --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_show
+  name: az healthcareapis private-endpoint-connection show
+  summary: Gets the specified private endpoint connection associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection show --name
+                                                       --resource-group
+                                                       --resource-name
+  examples:
+  - summary: PrivateEndpointConnection_GetConnection
+    syntax: az healthcareapis private-endpoint-connection show --name "myConnection" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_update
+  name: az healthcareapis private-endpoint-connection update
+  summary: Update the state of the specified private endpoint connection associated with the service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection update --name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--no-wait]
+                                                         [--private-link-service-connection-state-actions-required]
+                                                         [--private-link-service-connection-state-description]
+                                                         [--private-link-service-connection-state-status {Approved, Pending, Rejected}]
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-link-service-connection-state-actions-required
+    summary: A message indicating if changes on the service provider require any updates on the consumer.
+    description: ''
+  - name: --private-link-service-connection-state-description
+    summary: The reason for approval/rejection of the connection.
+    description: ''
+  - name: --private-link-service-connection-state-status
+    parameterValueGroup: Approved, Pending, Rejected
+    summary: Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+    description: ''
+- uid: az_healthcareapis_private-endpoint-connection_wait
+  name: az healthcareapis private-endpoint-connection wait
+  summary: Place the CLI in a waiting state until a condition of the healthcareapis private-endpoint-connection is met.
+  description: ''
+  syntax: >-
+    az healthcareapis private-endpoint-connection wait --name
+                                                       --resource-group
+                                                       --resource-name
+                                                       [--created]
+                                                       [--custom]
+                                                       [--deleted]
+                                                       [--exists]
+                                                       [--interval]
+                                                       [--timeout]
+                                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the healthcareapis private-endpoint-connection is successfully created.
+    syntax: az healthcareapis private-endpoint-connection wait --name "myConnection" --resource-group "rgname" --resource-name "service1" --created
+  - summary: Pause executing next line of CLI script until the healthcareapis private-endpoint-connection is successfully updated.
+    syntax: az healthcareapis private-endpoint-connection wait --name "myConnection" --resource-group "rgname" --resource-name "service1" --updated
+  - summary: Pause executing next line of CLI script until the healthcareapis private-endpoint-connection is successfully deleted.
+    syntax: az healthcareapis private-endpoint-connection wait --name "myConnection" --resource-group "rgname" --resource-name "service1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name --private-endpoint-connection-name -n
+    summary: The name of the private endpoint connection associated with the Azure resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_healthcareapis_private-endpoint-connection_create
+- az_healthcareapis_private-endpoint-connection_delete
+- az_healthcareapis_private-endpoint-connection_list
+- az_healthcareapis_private-endpoint-connection_show
+- az_healthcareapis_private-endpoint-connection_update
+- az_healthcareapis_private-endpoint-connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis private-endpoint-connection.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/private-link-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/private-link-resource.yml
new file mode 100644
index 0000000000..30c11b268d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/private-link-resource.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_private-link-resource
+name: az healthcareapis private-link-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis private-link-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis private-link-resource.
+description: ''
+directCommands:
+- uid: az_healthcareapis_private-link-resource_list
+  name: az healthcareapis private-link-resource list
+  summary: Gets the private link resources that need to be created for a service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-link-resource list --resource-group
+                                                 --resource-name
+  examples:
+  - summary: PrivateLinkResources_ListGroupIds
+    syntax: az healthcareapis private-link-resource list --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_private-link-resource_show
+  name: az healthcareapis private-link-resource show
+  summary: Gets a private link resource that need to be created for a service.
+  description: ''
+  syntax: >-
+    az healthcareapis private-link-resource show --group-name
+                                                 --resource-group
+                                                 --resource-name
+  examples:
+  - summary: PrivateLinkResources_Get
+    syntax: az healthcareapis private-link-resource show --group-name "fhir" --resource-group "rgname" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: The name of the private link resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+commands:
+- az_healthcareapis_private-link-resource_list
+- az_healthcareapis_private-link-resource_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis private-link-resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/service.yml b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/service.yml
new file mode 100644
index 0000000000..a10c69f24e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/healthcareapis/service.yml
@@ -0,0 +1,305 @@
+### YamlMime:AzureCLIGroup
+uid: az_healthcareapis_service
+name: az healthcareapis service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **healthcareapis** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az healthcareapis service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Healthcareapis service.
+description: ''
+directCommands:
+- uid: az_healthcareapis_service_create
+  name: az healthcareapis service create
+  summary: Create the metadata of a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service create --kind {fhir, fhir-R4, fhir-Stu3}
+                                     --location
+                                     --resource-group
+                                     --resource-name
+                                     [--access-policies]
+                                     [--authentication-configuration]
+                                     [--cors-configuration]
+                                     [--cosmos-db-configuration]
+                                     [--etag]
+                                     [--export-configuration-storage-account-name]
+                                     [--identity-type {None, SystemAssigned}]
+                                     [--no-wait]
+                                     [--private-endpoint-connections]
+                                     [--public-network-access {Disabled, Enabled}]
+                                     [--tags]
+  examples:
+  - summary: Create or Update a service with all parameters
+    syntax: az healthcareapis service create --resource-group "rg1" --resource-name "service1" --identity-type "SystemAssigned" --kind "fhir-R4" --location "westus2" --access-policies object-id="c487e7d1-3210-41a3-8ccc-e9372b78da47" --access-policies object-id="5b307da8-43d4-492b-8b66-b0294ade872f" --authentication-configuration audience="https://azurehealthcareapis.com" authority="https://login.microsoftonline.com/abfde7b2-df0f-47e6-aabf-2462b07508dc" smart-proxy-enabled=true --cors-configuration allow-credentials=false headers="*" max-age=1440 methods="DELETE" methods="GET" methods="OPTIONS" methods="PATCH" methods="POST" methods="PUT" origins="*" --cosmos-db-configuration key-vault-key-uri="https://my-vault.vault.azure.net/keys/my-key" offer-throughput=1000 --export-configuration-storage-account-name "existingStorageAccount" --public-network-access "Disabled"
+  - summary: Create or Update a service with minimum parameters
+    syntax: az healthcareapis service create --resource-group "rg1" --resource-name "service2" --kind "fhir-R4" --location "westus2" --access-policies object-id="c487e7d1-3210-41a3-8ccc-e9372b78da47"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: fhir, fhir-R4, fhir-Stu3
+    summary: The kind of the service.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --access-policies
+    summary: The access policies of the service instance.
+    description: >-
+      Usage: --access-policies object-id=XX
+
+
+      object-id: Required. An Azure AD object ID (User or Apps) that is allowed access to the FHIR service.
+
+
+      Multiple actions can be specified by using more than one --access-policies argument.
+  - name: --authentication-configuration
+    summary: The authentication configuration for the service instance.
+    description: >-
+      Usage: --authentication-configuration authority=XX audience=XX smart-proxy-enabled=XX
+
+
+      authority: The authority url for the service
+
+      audience: The audience url for the service
+
+      smart-proxy-enabled: If the SMART on FHIR proxy is enabled.
+  - name: --cors-configuration
+    summary: The settings for the CORS configuration of the service instance.
+    description: >-
+      Usage: --cors-configuration origins=XX headers=XX methods=XX max-age=XX allow-credentials=XX
+
+
+      origins: The origins to be allowed via CORS.
+
+      headers: The headers to be allowed via CORS.
+
+      methods: The methods to be allowed via CORS.
+
+      max-age: The max age to be allowed via CORS.
+
+      allow-credentials: If credentials are allowed via CORS.
+  - name: --cosmos-db-configuration
+    summary: The settings for the Cosmos DB database backing the service.
+    description: >-
+      Usage: --cosmos-db-configuration offer-throughput=XX key-vault-key-uri=XX
+
+
+      offer-throughput: The provisioned throughput for the backing database.
+
+      key-vault-key-uri: The URI of the customer-managed key for the backing database.
+  - name: --etag
+    summary: An etag associated with the resource, used for optimistic concurrency when editing it.
+    description: ''
+  - name: --export-configuration-storage-account-name
+    summary: The name of the default export storage account.
+    description: ''
+  - name: --identity-type
+    parameterValueGroup: None, SystemAssigned
+    summary: Type of identity being specified, currently SystemAssigned and None are allowed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-endpoint-connections
+    summary: The list of private endpoint connections that are set up for this resource.
+    description: >-
+      Usage: --private-endpoint-connections status=XX description=XX actions-required=XX
+
+
+      status: Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service.
+
+      description: The reason for approval/rejection of the connection.
+
+      actions-required: A message indicating if changes on the service provider require any updates on the consumer.
+
+
+      Multiple actions can be specified by using more than one --private-endpoint-connections argument.
+  - name: --public-network-access
+    parameterValueGroup: Disabled, Enabled
+    summary: Control permission for data plane traffic coming from public networks while private endpoint is enabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthcareapis_service_delete
+  name: az healthcareapis service delete
+  summary: Delete a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service delete --resource-group
+                                     --resource-name
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete service
+    syntax: az healthcareapis service delete --resource-group "rg1" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_healthcareapis_service_list
+  name: az healthcareapis service list
+  summary: Get all the service instances in a resource group. And Get all the service instances in a subscription.
+  description: ''
+  syntax: az healthcareapis service list [--resource-group]
+  examples:
+  - summary: List all services in resource group
+    syntax: az healthcareapis service list --resource-group "rgname"
+  - summary: List all services in subscription
+    syntax: az healthcareapis service list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_healthcareapis_service_show
+  name: az healthcareapis service show
+  summary: Get the metadata of a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service show --resource-group
+                                   --resource-name
+  examples:
+  - summary: Get metadata
+    syntax: az healthcareapis service show --resource-group "rg1" --resource-name "service1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+- uid: az_healthcareapis_service_update
+  name: az healthcareapis service update
+  summary: Update the metadata of a service instance.
+  description: ''
+  syntax: >-
+    az healthcareapis service update --resource-group
+                                     --resource-name
+                                     [--no-wait]
+                                     [--public-network-access {Disabled, Enabled}]
+                                     [--tags]
+  examples:
+  - summary: Patch service
+    syntax: az healthcareapis service update --resource-group "rg1" --resource-name "service1" --tags tag1="value1" tag2="value2"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --public-network-access
+    parameterValueGroup: Disabled, Enabled
+    summary: Control permission for data plane traffic coming from public networks while private endpoint is enabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_healthcareapis_service_wait
+  name: az healthcareapis service wait
+  summary: Place the CLI in a waiting state until a condition of the healthcareapis service is met.
+  description: ''
+  syntax: >-
+    az healthcareapis service wait --resource-group
+                                   --resource-name
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the healthcareapis service is successfully created.
+    syntax: az healthcareapis service wait --resource-group "rg1" --resource-name "service1" --created
+  - summary: Pause executing next line of CLI script until the healthcareapis service is successfully updated.
+    syntax: az healthcareapis service wait --resource-group "rg1" --resource-name "service1" --updated
+  - summary: Pause executing next line of CLI script until the healthcareapis service is successfully deleted.
+    syntax: az healthcareapis service wait --resource-group "rg1" --resource-name "service1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: The name of the service instance.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_healthcareapis_service_create
+- az_healthcareapis_service_delete
+- az_healthcareapis_service_list
+- az_healthcareapis_service_show
+- az_healthcareapis_service_update
+- az_healthcareapis_service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Healthcareapis service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hpc-cache.yml b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache.yml
new file mode 100644
index 0000000000..11b90cfe3a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache.yml
@@ -0,0 +1,333 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache
+name: az hpc-cache
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache.
+description: ''
+directCommands:
+- uid: az_hpc-cache_create
+  name: az hpc-cache create
+  summary: Create or update a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache create --cache-size-gb
+                        --location
+                        --name
+                        --resource-group
+                        --sku-name
+                        --subnet
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Caches_CreateOrUpdate
+    syntax: az hpc-cache create --resource-group "scgroup" --name "sc1" --location "eastus" --cache-size-gb "3072" --subnet "/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.Network/virtualNetworks/{virtual_network_name}/subnets/{subnet_name}" --sku-name "Standard_2G"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-size-gb
+    summary: The size of this Cache, in GB.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku-name
+    summary: SKU name for this Cache.
+    description: ''
+  - isRequired: true
+    name: --subnet
+    summary: Subnet used for the Cache.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_hpc-cache_delete
+  name: az hpc-cache delete
+  summary: Schedule a Cache for deletion.
+  description: ''
+  syntax: >-
+    az hpc-cache delete --name
+                        --resource-group
+                        [--no-wait]
+  examples:
+  - summary: Caches_Delete
+    syntax: az hpc-cache delete --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_hpc-cache_flush
+  name: az hpc-cache flush
+  summary: Tell a Cache to write all dirty data to the Storage Target(s). During the flush, clients will see errors returned until the flush is complete.
+  description: ''
+  syntax: >-
+    az hpc-cache flush --name
+                       --resource-group
+  examples:
+  - summary: Caches_Flush
+    syntax: az hpc-cache flush --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_list
+  name: az hpc-cache list
+  summary: Return all Caches the user has access to under a resource group.
+  description: ''
+  syntax: az hpc-cache list [--resource-group]
+  examples:
+  - summary: Caches_List
+    syntax: az hpc-cache list
+  - summary: Caches_ListByResourceGroup
+    syntax: az hpc-cache list --resource-group "scgroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_show
+  name: az hpc-cache show
+  summary: Return a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache show --name
+                      --resource-group
+  examples:
+  - summary: Caches_Get
+    syntax: az hpc-cache show --resource-group "scgroup" --name "sc1"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_start
+  name: az hpc-cache start
+  summary: Tell a Stopped state Cache to transition to Active state.
+  description: ''
+  syntax: >-
+    az hpc-cache start --name
+                       --resource-group
+                       [--no-wait]
+  examples:
+  - summary: Caches_Start
+    syntax: az hpc-cache start --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_hpc-cache_stop
+  name: az hpc-cache stop
+  summary: Tell an Active Cache to transition to Stopped state.
+  description: ''
+  syntax: >-
+    az hpc-cache stop --name
+                      --resource-group
+                      [--no-wait]
+  examples:
+  - summary: Caches_Stop
+    syntax: az hpc-cache stop --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_hpc-cache_update
+  name: az hpc-cache update
+  summary: Update a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache update --name
+                        --resource-group
+                        [--cache-size-gb]
+                        [--location]
+                        [--sku-name]
+                        [--subnet]
+                        [--tags]
+  examples:
+  - summary: Caches_Update
+    syntax: az hpc-cache update --resource-group "scgroup" --name "sc1" --tags "key=val"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cache-size-gb
+    summary: The size of this Cache, in GB.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku-name
+    summary: SKU name for this Cache.
+    description: ''
+  - name: --subnet
+    summary: Subnet used for the Cache.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_hpc-cache_upgrade-firmware
+  name: az hpc-cache upgrade-firmware
+  summary: Upgrade a Cache's firmware if a new version is available. Otherwise, this operation has no effect.
+  description: ''
+  syntax: >-
+    az hpc-cache upgrade-firmware --name
+                                  --resource-group
+  examples:
+  - summary: Caches_UpgradeFirmware
+    syntax: az hpc-cache upgrade-firmware --resource-group "scgroup" --name "sc"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_wait
+  name: az hpc-cache wait
+  summary: Wait a hpc Cache to specified state.
+  description: ''
+  syntax: >-
+    az hpc-cache wait --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Caches_Wait
+    syntax: az hpc-cache wait --resource-group "scgroup" --name "sc" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_hpc-cache_blob-storage-target
+- az_hpc-cache_blob-storage-target_add
+- az_hpc-cache_blob-storage-target_update
+- az_hpc-cache_create
+- az_hpc-cache_delete
+- az_hpc-cache_flush
+- az_hpc-cache_list
+- az_hpc-cache_nfs-storage-target
+- az_hpc-cache_nfs-storage-target_add
+- az_hpc-cache_nfs-storage-target_update
+- az_hpc-cache_show
+- az_hpc-cache_skus
+- az_hpc-cache_skus_list
+- az_hpc-cache_start
+- az_hpc-cache_stop
+- az_hpc-cache_storage-target
+- az_hpc-cache_storage-target_list
+- az_hpc-cache_storage-target_remove
+- az_hpc-cache_storage-target_show
+- az_hpc-cache_update
+- az_hpc-cache_upgrade-firmware
+- az_hpc-cache_usage-model
+- az_hpc-cache_usage-model_list
+- az_hpc-cache_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/blob-storage-target.yml b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/blob-storage-target.yml
new file mode 100644
index 0000000000..39aefd4b7a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/blob-storage-target.yml
@@ -0,0 +1,103 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_blob-storage-target
+name: az hpc-cache blob-storage-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache blob-storage-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to create hpc cache blob storage target.
+description: ''
+directCommands:
+- uid: az_hpc-cache_blob-storage-target_add
+  name: az hpc-cache blob-storage-target add
+  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache blob-storage-target add --cache-name
+                                         --container-name
+                                         --name
+                                         --resource-group
+                                         --storage-account
+                                         --virtual-namespace-path
+  examples:
+  - summary: StorageTargets_CreateOrUpdate
+    syntax: az hpc-cache blob-storage-target add --resource-group "scgroup" --cache-name "sc1" --name "st1" --storage-account "/subscriptions/{subscription_id}/resourceGroups/{resource_group}/providers/Microsoft.Storage/storageAccounts/{acount_name}" --container-name "cn" --virtual-namespace-path "/test"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --container-name
+    summary: Name of target storage container.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-account
+    summary: Resource ID or Name of target storage account.
+    description: ''
+  - isRequired: true
+    name: --virtual-namespace-path -v
+    summary: Path to create for this storage target in the client-facing virtual filesystem.
+    description: ''
+- uid: az_hpc-cache_blob-storage-target_update
+  name: az hpc-cache blob-storage-target update
+  summary: Create or update a blob Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache blob-storage-target update --cache-name
+                                            --name
+                                            --resource-group
+                                            [--container-name]
+                                            [--storage-account]
+                                            [--virtual-namespace-path]
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container-name
+    summary: Name of target storage container.
+    description: ''
+  - name: --storage-account
+    summary: Resource ID or Name of target storage account.
+    description: ''
+  - name: --virtual-namespace-path -v
+    summary: Path to create for this storage target in the client-facing virtual filesystem.
+    description: ''
+commands:
+- az_hpc-cache_blob-storage-target_add
+- az_hpc-cache_blob-storage-target_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to create hpc cache blob storage target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/nfs-storage-target.yml b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/nfs-storage-target.yml
new file mode 100644
index 0000000000..51713b7209
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/nfs-storage-target.yml
@@ -0,0 +1,103 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_nfs-storage-target
+name: az hpc-cache nfs-storage-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache nfs-storage-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to create hpc cache nfs storage target.
+description: ''
+directCommands:
+- uid: az_hpc-cache_nfs-storage-target_add
+  name: az hpc-cache nfs-storage-target add
+  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache nfs-storage-target add --cache-name
+                                        --junction
+                                        --name
+                                        --nfs3-target
+                                        --nfs3-usage-model
+                                        --resource-group
+  examples:
+  - summary: StorageTargets_CreateOrUpdate
+    syntax: az hpc-cache nfs-storage-target add --resource-group "scgroup" --cache-name "sc1" --name "st1" --nfs3-target 10.7.0.24 --nfs3-usage-model WRITE_AROUND --junction namespace-path="/nt2" nfs-export="/export/a" target-path="/1" --junction namespace-path="/nt3" nfs-export="/export/b"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --junction
+    summary: 'List of Cache namespace junctions to target for namespace associations.The sub parameters contains: (1) --namespace-path: Namespace path on a Cache for a Storage Target (2) --nfs-export: NFS export where targetPath exists (3) --target-path(Optional): Path in Storage Target to which namespacePath points.'
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --nfs3-target
+    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
+    description: ''
+  - isRequired: true
+    name: --nfs3-usage-model
+    summary: Identify the primary usage model to be used for this Storage Target. You can use command `az hpc-cache usage-model list` to see the names of usage models. For more details about usage models, please refer to https://docs.microsoft.com/azure/hpc-cache/hpc-cache-add-storage?tabs=azure-cli#choose-a-usage-model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_nfs-storage-target_update
+  name: az hpc-cache nfs-storage-target update
+  summary: Create or update a nfs Storage Target. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual creation/modification of the Storage Target may be delayed until the Cache is healthy again.
+  description: ''
+  syntax: >-
+    az hpc-cache nfs-storage-target update --cache-name
+                                           --name
+                                           --resource-group
+                                           [--junction]
+                                           [--nfs3-target]
+                                           [--nfs3-usage-model]
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --junction
+    summary: 'List of Cache namespace junctions to target for namespace associations.The sub parameters contains: (1) --namespace-path: Namespace path on a Cache for a Storage Target (2) --nfs-export: NFS export where targetPath exists (3) --target-path(Optional): Path in Storage Target to which namespacePath points.'
+    description: ''
+  - name: --nfs3-target
+    summary: IP address or host name of an NFSv3 host (e.g., 10.0.44.44).
+    description: ''
+  - name: --nfs3-usage-model
+    summary: Identify the primary usage model to be used for this Storage Target. You can use command `az hpc-cache usage-model list` to see the names of usage models. For more details about usage models, please refer to https://docs.microsoft.com/azure/hpc-cache/hpc-cache-add-storage?tabs=azure-cli#choose-a-usage-model.
+    description: ''
+commands:
+- az_hpc-cache_nfs-storage-target_add
+- az_hpc-cache_nfs-storage-target_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to create hpc cache nfs storage target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/skus.yml b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/skus.yml
new file mode 100644
index 0000000000..cf6c82c9a2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/skus.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_skus
+name: az hpc-cache skus
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache skus** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache skus.
+description: ''
+directCommands:
+- uid: az_hpc-cache_skus_list
+  name: az hpc-cache skus list
+  summary: Get the list of StorageCache.Cache SKUs available to this subscription.
+  description: ''
+  syntax: az hpc-cache skus list
+  examples:
+  - summary: Skus_List
+    syntax: az hpc-cache skus list
+commands:
+- az_hpc-cache_skus_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache skus.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/storage-target.yml b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/storage-target.yml
new file mode 100644
index 0000000000..001b05afc7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/storage-target.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_storage-target
+name: az hpc-cache storage-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache storage-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache storage target.
+description: ''
+directCommands:
+- uid: az_hpc-cache_storage-target_list
+  name: az hpc-cache storage-target list
+  summary: Return a list of Storage Targets for the specified Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache storage-target list --cache-name
+                                     --resource-group
+  examples:
+  - summary: StorageTargets_List
+    syntax: az hpc-cache storage-target list --resource-group "scgroup" --cache-name "sc1"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_storage-target_remove
+  name: az hpc-cache storage-target remove
+  summary: Remove a Storage Target from a Cache. This operation is allowed at any time, but if the Cache is down or unhealthy, the actual removal of the Storage Target may be delayed until the Cache is healthy again. Note that if the Cache has data to flush to the Storage Target, the data will be flushed before the Storage Target will be deleted.
+  description: ''
+  syntax: >-
+    az hpc-cache storage-target remove --cache-name
+                                       --name
+                                       --resource-group
+  examples:
+  - summary: StorageTargets_Delete
+    syntax: az hpc-cache storage-target remove --resource-group "scgroup" --cache-name "sc1" --name "st1"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_hpc-cache_storage-target_show
+  name: az hpc-cache storage-target show
+  summary: Return a Storage Target from a Cache.
+  description: ''
+  syntax: >-
+    az hpc-cache storage-target show --cache-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: StorageTargets_Get
+    syntax: az hpc-cache storage-target show --resource-group "scgroup" --cache-name "sc1" --name "st1"
+  requiredParameters:
+  - isRequired: true
+    name: --cache-name
+    summary: Name of Cache.
+    description: ''
+  - isRequired: true
+    name: --name
+    summary: Name of the Storage Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_hpc-cache_storage-target_list
+- az_hpc-cache_storage-target_remove
+- az_hpc-cache_storage-target_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache storage target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/usage-model.yml b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/usage-model.yml
new file mode 100644
index 0000000000..79de9018b0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/hpc-cache/usage-model.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_hpc-cache_usage-model
+name: az hpc-cache usage-model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hpc-cache** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az hpc-cache usage-model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage hpc cache usage model.
+description: ''
+directCommands:
+- uid: az_hpc-cache_usage-model_list
+  name: az hpc-cache usage-model list
+  summary: Get the list of Cache Usage Models available to this subscription.
+  description: ''
+  syntax: az hpc-cache usage-model list
+  examples:
+  - summary: UsageModels_List
+    syntax: az hpc-cache usage-model list
+commands:
+- az_hpc-cache_usage-model_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage hpc cache usage model.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/image.yml b/2018-03-01-hybrid/docs-ref-autogen/image.yml
index cbb27d65c1..0e763a6967 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/image.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/image.yml
@@ -1,45 +1,123 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image
-  name: az image
-  summary: Manage custom virtual machine images.
+### YamlMime:AzureCLIGroup
+uid: az_image
+name: az image
+summary: Manage custom virtual machine images.
+description: ''
+directCommands:
+- uid: az_image_copy
+  name: az image copy
+  summary: Copy a managed image (or vm) to other regions. It requires the source disk to be available.
   description: ''
-  langs:
-  - azurecli
-  children:
-  - az_image_create
-  - az_image_delete
-  - az_image_list
-  - az_image_show
-  - az_image_update
+  syntax: >-
+    az image copy --source-object-name
+                  --source-resource-group
+                  --target-location
+                  --target-resource-group
+                  [--cleanup]
+                  [--export-as-snapshot]
+                  [--parallel-degree]
+                  [--source-type {image, vm}]
+                  [--tags]
+                  [--target-name]
+                  [--target-subscription]
+                  [--temporary-resource-group-name]
+                  [--timeout]
+  examples:
+  - summary: Copy an image to several regions and cleanup at the end.
+    syntax: >-
+      az image copy --source-resource-group mySources-rg --source-object-name myImage \
+          --target-location uksouth northeurope --target-resource-group "images-repo-rg" --cleanup
+  - summary: Use an already generalized vm to create images in other regions.
+    syntax: >-
+      az image copy --source-resource-group mySources-rg --source-object-name myVm \
+          --source-type vm --target-location uksouth northeurope --target-resource-group "images-repo-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --source-object-name
+    summary: The name of the image or vm resource.
+    description: ''
+  - isRequired: true
+    name: --source-resource-group
+    summary: Name of the resource group of the source resource.
+    description: ''
+  - isRequired: true
+    name: --target-location
+    summary: Space separated location list to create the image in (e.g. westeurope etc.).
+    description: ''
+  - isRequired: true
+    name: --target-resource-group
+    summary: Name of the resource group to create images in.
+    description: ''
+  optionalParameters:
+  - name: --cleanup
+    summary: Include this switch to delete temporary resources upon completion.
+    description: ''
+  - name: --export-as-snapshot
+    summary: Include this switch to export the copies as snapshots instead of images.
+    description: ''
+  - name: --parallel-degree
+    defaultValue: "-1"
+    summary: Number of parallel copy operations.
+    description: ''
+  - name: --source-type
+    defaultValue: image
+    parameterValueGroup: image, vm
+    summary: Image or vm.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-name
+    summary: Name of the final image that will be created.
+    description: ''
+  - name: --target-subscription
+    summary: Name or ID of the subscription where the final image should be created.
+    description: ''
+  - name: --temporary-resource-group-name --temporary_resource_group_name
+    defaultValue: image-copy-rg
+    summary: Resource Group name where temporary storage account will be created. --temporary_resource_group_name will be deprecated in 0.2.7.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Time in seconds for the copy operation to finish. Increase this time if you are going to copy large images (disks) like 512GB or more.
+    description: ''
 - uid: az_image_create
   name: az image create
   summary: Create a custom Virtual Machine Image from managed disks or snapshots.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image create --name
+                    --resource-group
+                    --source
+                    [--data-disk-caching {None, ReadOnly, ReadWrite}]
+                    [--data-disk-sources]
+                    [--location]
+                    [--os-disk-caching {None, ReadOnly, ReadWrite}]
+                    [--os-type {Linux, Windows}]
+                    [--storage-sku {Premium_LRS, Standard_LRS}]
+                    [--subscription]
+                    [--tags]
   examples:
   - summary: Create an image from an existing disk.
-    syntax:
-      content: >-
-        az image create -g MyResourceGroup -n image1 --os-type Linux \
-            --source /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/rg1/providers/Microsoft.Compute/snapshots/s1
+    syntax: >-
+      az image create -g MyResourceGroup -n image1 --os-type Linux \
+          --source /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/rg1/providers/Microsoft.Compute/snapshots/s1
   - summary: Create an image by capturing an existing generalized virtual machine in the same resource group.
-    syntax:
-      content: az image create -g MyResourceGroup -n image1 --source MyVm1
-  parameters:
+    syntax: az image create -g MyResourceGroup -n image1 --source MyVm1
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: New image name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --source
     summary: OS disk source from the same region, including a virtual machine ID or name, OS disk blob URI, managed OS disk ID or name, or OS snapshot ID or name.
     description: ''
+  optionalParameters:
   - name: --data-disk-caching
     parameterValueGroup: None, ReadOnly, ReadWrite
     summary: Storage caching type for the image's data disk.
@@ -48,7 +126,7 @@ items:
     summary: Space-separated list of data disk sources, including unmanaged blob URI, managed disk ID or name, or snapshot ID or name.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --os-disk-caching
     parameterValueGroup: None, ReadOnly, ReadWrite
@@ -62,19 +140,22 @@ items:
     parameterValueGroup: Premium_LRS, Standard_LRS
     summary: The SKU of the storage account with which to create the VM image. Unused if source VM is specified.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
 - uid: az_image_delete
   name: az image delete
   summary: Deletes an Image.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image delete [--ids]
+                    [--name]
+                    [--resource-group]
+                    [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -82,7 +163,7 @@ items:
     summary: The name of the image.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -91,11 +172,16 @@ items:
   name: az image list
   summary: List custom VM images.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image list [--query-examples]
+                  [--resource-group]
+                  [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -104,9 +190,14 @@ items:
   name: az image show
   summary: Gets an image.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image show [--expand]
+                  [--ids]
+                  [--name]
+                  [--query-examples]
+                  [--resource-group]
+                  [--subscription]
+  optionalParameters:
   - name: --expand
     summary: The expand expression to apply on the operation.
     description: ''
@@ -116,8 +207,11 @@ items:
   - name: --name -n
     summary: The name of the image.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -126,18 +220,27 @@ items:
   name: az image update
   summary: Update custom VM images.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image update [--add]
+                    [--force-string]
+                    [--ids]
+                    [--name]
+                    [--remove]
+                    [--resource-group]
+                    [--set]
+                    [--subscription]
+                    [--tags]
   examples:
   - summary: Add or update tags.
-    syntax:
-      content: az image update -n ImageName -g ResourceGroup --tags tag1=val1 tag2=val2
+    syntax: az image update -n ImageName -g ResourceGroup --tags tag1=val1 tag2=val2
   - summary: Remove all tags.
-    syntax:
-      content: az image update -n ImageName -g resourceGroup --tags
-  parameters:
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    syntax: az image update -n ImageName -g resourceGroup --tags
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -145,91 +248,46 @@ items:
   - name: --name -n
     summary: The name of the image.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
 commands:
-- uid: az_image_builder
-  name: az image builder
-  summary: Manage and build image builder templates.
-- uid: az_image_builder_create
-  name: az image builder create
-  summary: Create an image builder template.
-- uid: az_image_builder_customizer
-  name: az image builder customizer
-  summary: Manage image builder template customizers.
-- uid: az_image_builder_customizer_add
-  name: az image builder customizer add
-  summary: Add an image builder customizer to an image builder template.
-- uid: az_image_builder_customizer_clear
-  name: az image builder customizer clear
-  summary: Remove all image builder customizers from an image builder template.
-- uid: az_image_builder_customizer_remove
-  name: az image builder customizer remove
-  summary: Remove an image builder customizer from an image builder template.
-- uid: az_image_builder_delete
-  name: az image builder delete
-  summary: Delete image builder template.
-- uid: az_image_builder_list
-  name: az image builder list
-  summary: List image builder templates.
-- uid: az_image_builder_output
-  name: az image builder output
-  summary: Manage image builder template output distributors.
-- uid: az_image_builder_output_add
-  name: az image builder output add
-  summary: Add an image builder output distributor to an image builder template.
-- uid: az_image_builder_output_clear
-  name: az image builder output clear
-  summary: Remove all image builder output distributors from an image builder template.
-- uid: az_image_builder_output_remove
-  name: az image builder output remove
-  summary: Remove an image builder output distributor from an image builder template.
-- uid: az_image_builder_run
-  name: az image builder run
-  summary: Build an image builder template.
-- uid: az_image_builder_show
-  name: az image builder show
-  summary: Show an image builder template.
-- uid: az_image_builder_show_runs
-  name: az image builder show-runs
-  summary: Show an image builder template's run outputs.
-- uid: az_image_builder_update
-  name: az image builder update
-  summary: Update an image builder template.
-- uid: az_image_builder_wait
-  name: az image builder wait
-  summary: Place the CLI in a waiting state until a condition of the template is met.
-- uid: az_image_create
-  name: az image create
-  summary: Create a custom Virtual Machine Image from managed disks or snapshots.
-- uid: az_image_delete
-  name: az image delete
-  summary: Deletes an Image.
-- uid: az_image_list
-  name: az image list
-  summary: List custom VM images.
-- uid: az_image_show
-  name: az image show
-  summary: Gets an image.
-- uid: az_image_update
-  name: az image update
-  summary: Update custom VM images.
+- az_image_builder
+- az_image_builder_cancel
+- az_image_builder_create
+- az_image_builder_customizer
+- az_image_builder_customizer_add
+- az_image_builder_customizer_clear
+- az_image_builder_customizer_remove
+- az_image_builder_delete
+- az_image_builder_list
+- az_image_builder_output
+- az_image_builder_output_add
+- az_image_builder_output_clear
+- az_image_builder_output_remove
+- az_image_builder_run
+- az_image_builder_show
+- az_image_builder_show-runs
+- az_image_builder_update
+- az_image_builder_wait
+- az_image_copy
+- az_image_create
+- az_image_delete
+- az_image_list
+- az_image_show
+- az_image_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -245,4 +303,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage custom virtual machine images.
+metadata:
+  description: Manage custom virtual machine images.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/image/builder.yml b/2018-03-01-hybrid/docs-ref-autogen/image/builder.yml
index 2bde5db12e..a1bd23eb33 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/image/builder.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/image/builder.yml
@@ -1,136 +1,188 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image_builder
-  name: az image builder
-  summary: Manage and build image builder templates.
+### YamlMime:AzureCLIGroup
+uid: az_image_builder
+name: az image builder
+summary: Manage and build image builder templates.
+description: ''
+directCommands:
+- uid: az_image_builder_cancel
+  name: az image builder cancel
+  summary: Cancel the long running image build based on the image template.
   description: ''
-  langs:
-  - azurecli
-  children:
-  - az_image_builder_create
-  - az_image_builder_delete
-  - az_image_builder_list
-  - az_image_builder_run
-  - az_image_builder_show
-  - az_image_builder_show_runs
-  - az_image_builder_update
-  - az_image_builder_wait
+  syntax: >-
+    az image builder cancel [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+  examples:
+  - summary: Cancel an image build.
+    syntax: az image builder cancel -n mytemplate -g my-group
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the image template.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
 - uid: az_image_builder_create
   name: az image builder create
   summary: Create an image builder template.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder create --name
+                            --resource-group
+                            [--build-timeout]
+                            [--checksum]
+                            [--defer]
+                            [--identity]
+                            [--image-source]
+                            [--image-template]
+                            [--location]
+                            [--managed-image-destinations]
+                            [--no-wait]
+                            [--os-disk-size]
+                            [--scripts]
+                            [--shared-image-destinations]
+                            [--subnet]
+                            [--subscription]
+                            [--tags]
+                            [--vm-size]
+                            [--vnet]
   examples:
   - summary: Create an image builder template from an UbuntuLTS 18.04 image. Distribute it as a managed image and a shared image gallery image version
-    syntax:
-      content: >-
-        scripts="https://my-script-url.net/customize_script.sh"
+    syntax: >-
+      scripts="https://my-script-url.net/customize_script.sh"
 
-        imagesource="Canonical:UbuntuServer:18.04-LTS:18.04.201903060"
+      imagesource="Canonical:UbuntuServer:18.04-LTS:18.04.201903060"
 
 
-        az image builder create --image-source $imagesource -n mytemplate -g my-group \
-            --scripts $scripts --managed-image-destinations image_1=westus \
-            --shared-image-destinations my_shared_gallery/linux_image_def=westus,brazilsouth
+      az image builder create --image-source $imagesource -n mytemplate -g my-group \
+          --scripts $scripts --managed-image-destinations image_1=westus \
+          --shared-image-destinations my_shared_gallery/linux_image_def=westus,brazilsouth \
+          --identity myidentity
   - summary: Create an image builder template using an image template file.
-    syntax:
-      content: az image builder create -g my-group -n mytemplate --image-template filename
+    syntax: az image builder create -g my-group -n mytemplate --image-template filename
   - summary: "[Advanced] Create an image template with multiple customizers and distributors using the CLI's object cache via --defer. Supports features such as: customizer and output names, powershell exit codes, inline scripts, windows restart, file customizers, artifact tags and vhd output distributors."
-    syntax:
-      content: >-
-        script="https://my-script-url.com/customize_script.ps1"
+    syntax: >-
+      script="https://my-script-url.com/customize_script.ps1"
 
-        imagesource="MicrosoftWindowsServer:WindowsServer:2019-Datacenter:2019.0.20190214"
+      imagesource="MicrosoftWindowsServer:WindowsServer:2019-Datacenter:2019.0.20190214"
 
 
-        # create and update template object in local cli cache. Defers put request to ARM
+      # create and update template object in local cli cache. Defers put request to ARM
 
-        # Cache object ttl set via az configure.
+      # Cache object ttl set via az configure.
 
-        az image builder create --image-source $imagesource -n mytemplate \
-            -g my-group --scripts $script --defer
+      az image builder create --image-source $imagesource -n mytemplate \
+          -g my-group --scripts $script --identity myidentity --defer
 
-        # add customizers
+      # add customizers
 
-        az image builder customizer add -n mytemplate -g my-group  \
-            --customizer-name my-pwsh-script --exit-codes 0 1 --inline-script \
-            "mkdir c:\buildActions" "echo Azure-Image-Builder-Was-Here \
-             > c:\buildActions\Output.txt" --type powershell --defer
+      az image builder customizer add -n mytemplate -g my-group  \
+          --customizer-name my-pwsh-script --exit-codes 0 1 --inline-script \
+          "mkdir c:\buildActions" "echo Azure-Image-Builder-Was-Here \
+           > c:\buildActions\Output.txt" --type powershell --defer
 
-        az image builder customizer add -n mytemplate -g my-group \
-            --customizer-name my-file-customizer --type file \
-            --file-source "https://my-file-source.net/file.txt"  \
-            --dest-path "c:\buildArtifacts\file.txt" --defer
+      az image builder customizer add -n mytemplate -g my-group \
+          --customizer-name my-file-customizer --type file \
+          --file-source "https://my-file-source.net/file.txt"  \
+          --dest-path "c:\buildArtifacts\file.txt" --defer
 
-        # add distributors
+      # add distributors
 
-        az image builder output add -n mytemplate -g my-group --is-vhd \
-            --output-name my-win-image-vhd --artifact-tags "is_vhd=True" --defer
+      az image builder output add -n mytemplate -g my-group --is-vhd \
+          --output-name my-win-image-vhd --artifact-tags "is_vhd=True" --defer
 
-        az image builder output add -n mytemplate -g my-group \
-            --output-name my-win-image-managed --managed-image winImage \
-            --managed-image-location eastus \
-            --artifact-tags "is_vhd=False" --defer
+      az image builder output add -n mytemplate -g my-group \
+          --output-name my-win-image-managed --managed-image winImage \
+          --managed-image-location eastus \
+          --artifact-tags "is_vhd=False" --defer
 
-        # Stop deferring put request to ARM. Create the template from the object cache.
+      # Stop deferring put request to ARM. Create the template from the object cache.
 
-        # Cache object will be deleted.
+      # Cache object will be deleted.
 
-        az image builder update -n mytemplate -g my-group
-  parameters:
+      az image builder update -n mytemplate -g my-group
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the image template.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --build-timeout
     summary: The Maximum duration to wait while building the image template, in minutes. Default is 60.
     description: ''
+  - name: --checksum
+    summary: The SHA256 checksum of the Red Hat ISO image.
+    description: ''
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
+  - name: --identity
+    summary: List of user assigned identities (name or ID, space delimited) of the image template.
+    description: ''
+  - name: --image-source -i
+    summary: The base image to customize. Must be a valid platform image URN, platform image alias, Red Hat ISO image URI, managed image name/ID, or shared image version ID.
+    description: ''
+    valueFrom: az vm image list, az vm image show
   - name: --image-template
-    summary: 'Local path or URL to an image template file. When using --image-template, all other parameters are ignored except -g and -n. Reference: <a href="https://docs.microsoft.com/en-us/azure/virtual-machines/linux/image-builder-json">https://docs.microsoft.com/en-us/azure/virtual-machines/linux/image-builder-json</a>.'
+    summary: 'Local path or URL to an image template file. When using --image-template, all other parameters are ignored except -g and -n. Reference: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/image-builder-json.'
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-image-destinations
+    summary: Managed image output distributor information. Space-separated list of key-value pairs. E.g "image_1=westus2 image_2=westus". Each key is the name or resource ID of the managed image to be created. Each value is the location of the image.
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --os-disk-size
+    summary: Size of the OS disk in GB. Omit or specify 0 to use Azure's default OS disk size.
     description: ''
   - name: --scripts
     summary: "Space-separated list of shell or powershell scripts to customize the image with. Each script must be a publicly accessible URL. Infers type of script from file extension ('.sh' or'.ps1') or from source type. More more customizer options and flexibility, see: 'az image template customizer add'."
     description: ''
-  - name: --checksum
-    summary: The SHA256 checksum of the Red Hat ISO image.
-    description: ''
-  - name: --image-source -i
-    summary: The base image to customize. Must be a valid platform image URN, platform image alias, Red Hat ISO image URI, managed image name/ID, or shared image version ID.
-    description: ''
-    valueFrom: az vm image list, az vm image show
-  - name: --managed-image-destinations
-    summary: Managed image output distributor information. Space-separated list of key-value pairs. E.g "image_1=westus2 image_2=westus". Each key is the name or resource ID of the managed image to be created. Each value is the location of the image.
-    description: ''
   - name: --shared-image-destinations
     summary: Shared image gallery (sig) output distributor information. Space-separated list of key-value pairs. E.g "my_gallery_1/image_def_1=eastus,westus  my_gallery_2/image_def_2=uksouth,canadaeast,francesouth." Each key is the sig image definition ID or sig gallery name and sig image definition delimited by a "/". Each value is a comma-delimited list of replica locations.
     description: ''
+  - name: --subnet
+    summary: Name or ID of subnet to deploy the build virtual machine.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vm-size
+    summary: Size of the virtual machine used to build, customize and capture images. Omit or specify empty string to use the default (Standard_D1_v2).
+    description: ''
+  - name: --vnet
+    summary: Name of VNET to deploy the build virtual machine. You should only specify it when subnet is a name.
+    description: ''
 - uid: az_image_builder_delete
   name: az image builder delete
   summary: Delete image builder template.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder delete [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+  examples:
+  - summary: Delete image builder template. (autogenerated)
+    syntax: az image builder delete --name MyImageTemplate --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -138,7 +190,7 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -147,11 +199,16 @@ items:
   name: az image builder list
   summary: List image builder templates.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder list [--query-examples]
+                          [--resource-group]
+                          [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -160,31 +217,34 @@ items:
   name: az image builder run
   summary: Build an image builder template.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder run [--ids]
+                         [--name]
+                         [--no-wait]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Start a template build run and then wait for it to finish.
-    syntax:
-      content: >-
-        az image builder run -n mytemplate -g my-group --no-wait
+    syntax: >-
+      az image builder run -n mytemplate -g my-group --no-wait
 
 
-        az image builder wait -n mytemplate -g aibmdi \
-            --custom "lastRunStatus.runState!='running'"
+      az image builder wait -n mytemplate -g aibmdi \
+          --custom "lastRunStatus.runState!='running'"
 
-        az image builder show -n mytemplate -g my-group
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+      az image builder show -n mytemplate -g my-group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -193,54 +253,63 @@ items:
   name: az image builder show
   summary: Show an image builder template.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder show [--ids]
+                          [--name]
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Show an image builder template (autogenerated)
-    syntax:
-      content: az image builder show --name mytemplate  --resource-group my-group
-  parameters:
+    syntax: az image builder show --name mytemplate  --resource-group my-group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_image_builder_show_runs
+- uid: az_image_builder_show-runs
   name: az image builder show-runs
   summary: Show an image builder template's run outputs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder show-runs [--ids]
+                               [--name]
+                               [--output-name]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Run a template build run and then view its run outputs.
-    syntax:
-      content: >-
-        az image builder run -n mytemplate -g my-group --no-wait
+    syntax: >-
+      az image builder run -n mytemplate -g my-group --no-wait
 
 
-        az image builder wait -n mytemplate -g aibmdi \
-            --custom "lastRunStatus.runState!='running'"
+      az image builder wait -n mytemplate -g aibmdi \
+          --custom "lastRunStatus.runState!='running'"
 
-        az image builder show-runs -n mytemplate -g my-group
-  parameters:
-  - name: --output-name
-    summary: Name of the image builder run output.
-    description: ''
+      az image builder show-runs -n mytemplate -g my-group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
+  - name: --output-name
+    summary: Name of the image builder run output.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -249,85 +318,89 @@ items:
   name: az image builder update
   summary: Update an image builder template.
   description: Updating an image builder templates is currently unsupported. This command can be used in conjunction with --defer to update an image template object within the CLI cache. Without --defer it retrieves the specified image template from the cache and sends a request to Azure to create the image template.
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder update [--add]
+                            [--defer]
+                            [--force-string]
+                            [--ids]
+                            [--name]
+                            [--remove]
+                            [--resource-group]
+                            [--set]
+                            [--subscription]
   examples:
   - summary: Create a template resource from a template object in the cli cache.
-    syntax:
-      content: >-
-        # create and write template object to local cli cache
+    syntax: >-
+      # create and write template object to local cli cache
 
-        az image builder create --image-source {image_source} -n mytemplate -g my-group \
-            --scripts {script} --managed-image-destinations image_1=westus --defer
+      az image builder create --image-source {image_source} -n mytemplate -g my-group \
+          --scripts {script} --managed-image-destinations image_1=westus --identity myidentity --defer
 
-        # add customizers and outputs to local cache template object via az image template output / customizer add
+      # add customizers and outputs to local cache template object via az image template output / customizer add
 
-        # one can also update cache object properties through generic update options, such as: --set
+      # one can also update cache object properties through generic update options, such as: --set
 
-        az image builder output add -n mytemplate -g my-group --output-name my-win-image-managed \
-            --artifact-tags "is_vhd=False"  --managed-image winImage --managed-image-location eastus --defer
+      az image builder output add -n mytemplate -g my-group --output-name my-win-image-managed \
+          --artifact-tags "is_vhd=False"  --managed-image winImage --managed-image-location eastus --defer
 
-        # send template create request to azure to create template resource
+      # send template create request to azure to create template resource
 
-        az image builder update -n mytemplate -g my-group
-  parameters:
+      az image builder update -n mytemplate -g my-group
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the image template.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
 - uid: az_image_builder_wait
   name: az image builder wait
   summary: Place the CLI in a waiting state until a condition of the template is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder wait [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--ids]
+                          [--interval]
+                          [--name]
+                          [--resource-group]
+                          [--subscription]
+                          [--timeout]
+                          [--updated]
   examples:
   - summary: Start a template build run and then wait for it to finish.
-    syntax:
-      content: >-
-        az image builder run -n mytemplate -g my-group --no-wait
+    syntax: >-
+      az image builder run -n mytemplate -g my-group --no-wait
 
 
-        az image builder wait -n mytemplate -g aibmdi \
-            --custom "lastRunStatus.runState!='running'"
+      az image builder wait -n mytemplate -g aibmdi \
+          --custom "lastRunStatus.runState!='running'"
 
-        az image builder show -n mytemplate -g my-group
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the image template.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+      az image builder show -n mytemplate -g my-group
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -340,10 +413,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The name of the image template.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -352,54 +437,23 @@ items:
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
 commands:
-- uid: az_image_builder_create
-  name: az image builder create
-  summary: Create an image builder template.
-- uid: az_image_builder_customizer
-  name: az image builder customizer
-  summary: Manage image builder template customizers.
-- uid: az_image_builder_customizer_add
-  name: az image builder customizer add
-  summary: Add an image builder customizer to an image builder template.
-- uid: az_image_builder_customizer_clear
-  name: az image builder customizer clear
-  summary: Remove all image builder customizers from an image builder template.
-- uid: az_image_builder_customizer_remove
-  name: az image builder customizer remove
-  summary: Remove an image builder customizer from an image builder template.
-- uid: az_image_builder_delete
-  name: az image builder delete
-  summary: Delete image builder template.
-- uid: az_image_builder_list
-  name: az image builder list
-  summary: List image builder templates.
-- uid: az_image_builder_output
-  name: az image builder output
-  summary: Manage image builder template output distributors.
-- uid: az_image_builder_output_add
-  name: az image builder output add
-  summary: Add an image builder output distributor to an image builder template.
-- uid: az_image_builder_output_clear
-  name: az image builder output clear
-  summary: Remove all image builder output distributors from an image builder template.
-- uid: az_image_builder_output_remove
-  name: az image builder output remove
-  summary: Remove an image builder output distributor from an image builder template.
-- uid: az_image_builder_run
-  name: az image builder run
-  summary: Build an image builder template.
-- uid: az_image_builder_show
-  name: az image builder show
-  summary: Show an image builder template.
-- uid: az_image_builder_show_runs
-  name: az image builder show-runs
-  summary: Show an image builder template's run outputs.
-- uid: az_image_builder_update
-  name: az image builder update
-  summary: Update an image builder template.
-- uid: az_image_builder_wait
-  name: az image builder wait
-  summary: Place the CLI in a waiting state until a condition of the template is met.
+- az_image_builder_cancel
+- az_image_builder_create
+- az_image_builder_customizer
+- az_image_builder_customizer_add
+- az_image_builder_customizer_clear
+- az_image_builder_customizer_remove
+- az_image_builder_delete
+- az_image_builder_list
+- az_image_builder_output
+- az_image_builder_output_add
+- az_image_builder_output_clear
+- az_image_builder_output_remove
+- az_image_builder_run
+- az_image_builder_show
+- az_image_builder_show-runs
+- az_image_builder_update
+- az_image_builder_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -415,4 +469,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage and build image builder templates.
+metadata:
+  description: Manage and build image builder templates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/image/builder/customizer.yml b/2018-03-01-hybrid/docs-ref-autogen/image/builder/customizer.yml
index be9f39532b..cf3024394e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/image/builder/customizer.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/image/builder/customizer.yml
@@ -1,84 +1,92 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image_builder_customizer
-  name: az image builder customizer
-  summary: Manage image builder template customizers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_image_builder_customizer_add
-  - az_image_builder_customizer_clear
-  - az_image_builder_customizer_remove
+### YamlMime:AzureCLIGroup
+uid: az_image_builder_customizer
+name: az image builder customizer
+summary: Manage image builder template customizers.
+description: ''
+directCommands:
 - uid: az_image_builder_customizer_add
   name: az image builder customizer add
   summary: Add an image builder customizer to an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder customizer add --customizer-name
+                                    --type {file, powershell, shell, windows-restart, windows-update}
+                                    [--defer]
+                                    [--dest-path]
+                                    [--exit-codes]
+                                    [--file-source]
+                                    [--filters]
+                                    [--ids]
+                                    [--inline-script]
+                                    [--name]
+                                    [--resource-group]
+                                    [--restart-check-command]
+                                    [--restart-command]
+                                    [--restart-timeout]
+                                    [--script-url]
+                                    [--search-criteria]
+                                    [--subscription]
+                                    [--update-limit]
   examples:
   - summary: Add an inline shell customizer to an image template in the cli object cache
-    syntax:
-      content: >-
-        az image builder customizer add -n mytemplate -g my-group \
-            --inline-script "sudo mkdir /buildArtifacts" \
-                            "sudo cp /tmp/index.html /buildArtifacts/index.html" \
-            --customizer-name shell-script-inline --type shell --defer
+    syntax: >-
+      az image builder customizer add -n mytemplate -g my-group \
+          --inline-script "sudo mkdir /buildArtifacts" \
+                          "sudo cp /tmp/index.html /buildArtifacts/index.html" \
+          --customizer-name shell-script-inline --type shell --defer
   - summary: Add a file customizer to an image template in the cli object cache
-    syntax:
-      content: >-
-        az image builder customizer add -n mytemplate -g my-group \
-            --customizer-name my-file --type file \
-            --file-source "https://my-remote-file.html" --dest-path "/tmp/index.html" --defer
+    syntax: >-
+      az image builder customizer add -n mytemplate -g my-group \
+          --customizer-name my-file --type file \
+          --file-source "https://my-remote-file.html" --dest-path "/tmp/index.html" --defer
   - summary: Add a windows restart customizer to an image template in the cli object cache
-    syntax:
-      content: >-
-        az image builder customizer add -n mytemplate -g my-group \
+    syntax: >-
+      az image builder customizer add -n mytemplate -g my-group \
 
-        --customizer-name shell-script-url \
+      --customizer-name shell-script-url \
 
-        --restart-check-command "echo Azure-Image-Builder-Restarted-the-VM  > \
-                                c:\buildArtifacts\restart.txt" \
-            --type windows-restart --restart-timeout 10m --defer
-  parameters:
+      --restart-check-command "echo Azure-Image-Builder-Restarted-the-VM  > \
+                              c:\buildArtifacts\restart.txt" \
+          --type windows-restart --restart-timeout 10m --defer
+  - summary: Add a windows update customizer to an image template in the cli object cache.
+    syntax: az image builder customizer add -n mytemplate -g my-group --customizer-name win_update --type windows-update --search-criteria IsInstalled=0 --filters "exclude:\$_.Title -like \'*Preview*\'" "include:\$true" --update-limit 20 --defer
+  requiredParameters:
   - isRequired: true
     name: --customizer-name
     summary: Name of the customizer.
     description: ''
   - isRequired: true
     name: --type -t
-    parameterValueGroup: file, powershell, shell, windows-restart
+    parameterValueGroup: file, powershell, shell, windows-restart, windows-update
     summary: Type of customizer to be added to the image template.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the image template.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
   - name: --dest-path
     summary: The absolute destination path where the file specified in --file-source will be downloaded to in the image.
     description: ''
+  - name: --exit-codes -e
+    summary: Space-separated list of valid exit codes, as integers.
+    description: ''
   - name: --file-source
     summary: The URI of the file to be downloaded into the image. It can be a github link, SAS URI for Azure Storage, etc.
     description: ''
-  - name: --exit-codes -e
-    summary: Space-separated list of valid exit codes, as integers.
+  - name: --filters
+    summary: Space delimited filters to select updates to apply. Omit or specify empty array to use the default (no filter).
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --inline-script
     summary: Space-separated list of inline script lines to customize the image with.
     description: ''
-  - name: --script-url
-    summary: URL of script to customize the image with. The URL must be publicly accessible.
+  - name: --name -n
+    summary: The name of the image template.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --restart-check-command
     summary: Command to verify that restart succeeded.
@@ -90,13 +98,29 @@ items:
     defaultValue: 5m
     summary: Restart timeout specified as a string consisting of a magnitude and unit, e.g. '5m' (5 minutes) or '2h' (2 hours).
     description: ''
+  - name: --script-url
+    summary: URL of script to customize the image with. The URL must be publicly accessible.
+    description: ''
+  - name: --search-criteria
+    summary: Criteria to search updates. Omit or specify empty string to use the default (search all). Refer to above link for examples and detailed description of this field.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --update-limit
+    summary: Maximum number of updates to apply at a time. Omit or specify 0 to use the default (1000).
+    description: ''
 - uid: az_image_builder_customizer_clear
   name: az image builder customizer clear
   summary: Remove all image builder customizers from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder customizer clear [--defer]
+                                      [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -107,7 +131,7 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -116,13 +140,19 @@ items:
   name: az image builder customizer remove
   summary: Remove an image builder customizer from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder customizer remove --customizer-name
+                                       [--defer]
+                                       [--ids]
+                                       [--name]
+                                       [--resource-group]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --customizer-name
     summary: Name of the customizer.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -133,21 +163,15 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_image_builder_customizer_add
-  name: az image builder customizer add
-  summary: Add an image builder customizer to an image builder template.
-- uid: az_image_builder_customizer_clear
-  name: az image builder customizer clear
-  summary: Remove all image builder customizers from an image builder template.
-- uid: az_image_builder_customizer_remove
-  name: az image builder customizer remove
-  summary: Remove an image builder customizer from an image builder template.
+- az_image_builder_customizer_add
+- az_image_builder_customizer_clear
+- az_image_builder_customizer_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -163,4 +187,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage image builder template customizers.
+metadata:
+  description: Manage image builder template customizers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/image/builder/output.yml b/2018-03-01-hybrid/docs-ref-autogen/image/builder/output.yml
index a118ef0666..57b90f5e81 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/image/builder/output.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/image/builder/output.yml
@@ -1,59 +1,62 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_image_builder_output
-  name: az image builder output
-  summary: Manage image builder template output distributors.
-  description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
-  langs:
-  - azurecli
-  children:
-  - az_image_builder_output_add
-  - az_image_builder_output_clear
-  - az_image_builder_output_remove
+### YamlMime:AzureCLIGroup
+uid: az_image_builder_output
+name: az image builder output
+summary: Manage image builder template output distributors.
+description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
+directCommands:
 - uid: az_image_builder_output_add
   name: az image builder output add
   summary: Add an image builder output distributor to an image builder template.
   description: Must be used with --defer. The output distributor can be a managed image, a gallery image, or as a VHD blob.
-  langs:
-  - azurecli
+  syntax: >-
+    az image builder output add [--artifact-tags]
+                                [--defer]
+                                [--gallery-image-definition]
+                                [--gallery-name]
+                                [--gallery-replication-regions]
+                                [--ids]
+                                [--is-vhd]
+                                [--managed-image]
+                                [--managed-image-location]
+                                [--name]
+                                [--output-name]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Add a managed image distributor to an image template in the cli object cache. Specify a run output name.
-    syntax:
-      content: >-
-        az image builder output add -n mytemplate -g my-group \
-            --managed-image my_desired_image_name --output-name managed_image_run_01 --defer
+    syntax: >-
+      az image builder output add -n mytemplate -g my-group \
+          --managed-image my_desired_image_name --output-name managed_image_run_01 --defer
   - summary: Add a shared image gallery distributor to an image template in the cli object cache. Specify its replication regions.
-    syntax:
-      content: >-
-        az image builder output add -n mytemplate -g my-group --gallery-name my_shared_gallery \
-            --gallery-replication-regions westus brazilsouth \
-            --gallery-image-definition linux_image_def --defer
+    syntax: >-
+      az image builder output add -n mytemplate -g my-group --gallery-name my_shared_gallery \
+          --gallery-replication-regions westus brazilsouth \
+          --gallery-image-definition linux_image_def --defer
   - summary: Add a VHD distributor to an image template in the cli object cache.
-    syntax:
-      content: >-
-        az image builder output add -n mytemplate -g my-group \
-            --output-name my_vhd_image --is-vhd  --defer
-  parameters:
+    syntax: >-
+      az image builder output add -n mytemplate -g my-group \
+          --output-name my_vhd_image --is-vhd  --defer
+  optionalParameters:
   - name: --artifact-tags
     summary: 'Tags that will be applied to the output artifact once it has been created by the distributor. space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
-  - name: --output-name
-    summary: Name of the image builder run output. Defaults to the name of the managed image or sig image definition.
+  - name: --gallery-image-definition
+    summary: Name or ID of the existing SIG image definition to create the customized image version with.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+  - name: --gallery-name
+    summary: Shared image gallery name, if image definition name and not ID was provided.
     description: ''
-  - name: --name -n
-    summary: The name of the image template.
+  - name: --gallery-replication-regions
+    summary: Space-separated list of regions to replicate the image version into. Defaults to resource group's location.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --is-vhd
+    summary: The output is a VHD distributor.
     description: ''
   - name: --managed-image
     summary: Name or ID of the customized managed image to be created.
@@ -61,25 +64,29 @@ items:
   - name: --managed-image-location
     summary: Location where the customized image will be created. Defaults to resource group's location.
     description: ''
-  - name: --gallery-image-definition
-    summary: Name or ID of the existing SIG image definition to create the customized image version with.
+  - name: --name -n
+    summary: The name of the image template.
     description: ''
-  - name: --gallery-name
-    summary: Shared image gallery name, if image definition name and not ID was provided.
+  - name: --output-name
+    summary: Name of the image builder run output. Defaults to the name of the managed image or sig image definition.
     description: ''
-  - name: --gallery-replication-regions
-    summary: Space-separated list of regions to replicate the image version into. Defaults to resource group's location.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --is-vhd
-    summary: The output is a VHD distributor.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_image_builder_output_clear
   name: az image builder output clear
   summary: Remove all image builder output distributors from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder output clear [--defer]
+                                  [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -90,7 +97,7 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -99,13 +106,19 @@ items:
   name: az image builder output remove
   summary: Remove an image builder output distributor from an image builder template.
   description: Must be used with --defer.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az image builder output remove --output-name
+                                   [--defer]
+                                   [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --output-name
     summary: Name of the image builder run output.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
@@ -116,21 +129,15 @@ items:
     summary: The name of the image template.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_image_builder_output_add
-  name: az image builder output add
-  summary: Add an image builder output distributor to an image builder template.
-- uid: az_image_builder_output_clear
-  name: az image builder output clear
-  summary: Remove all image builder output distributors from an image builder template.
-- uid: az_image_builder_output_remove
-  name: az image builder output remove
-  summary: Remove an image builder output distributor from an image builder template.
+- az_image_builder_output_add
+- az_image_builder_output_clear
+- az_image_builder_output_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -146,4 +153,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
+metadata:
+  description: A customized image can be distributed as a managed image, a shared image in a shared image gallery (SIG), or as a VHD blob.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/import-export.yml b/2018-03-01-hybrid/docs-ref-autogen/import-export.yml
new file mode 100644
index 0000000000..ea5f3ce3b9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/import-export.yml
@@ -0,0 +1,266 @@
+### YamlMime:AzureCLIGroup
+uid: az_import-export
+name: az import-export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **import-export** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az import-export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Import Export.
+description: ''
+directCommands:
+- uid: az_import-export_create
+  name: az import-export create
+  summary: Creates a new job or updates an existing job in the specified subscription.
+  description: ''
+  syntax: >-
+    az import-export create --name
+                            --resource-group
+                            [--backup-drive-manifest {false, true}]
+                            [--cancel-requested {false, true}]
+                            [--client-tenant-id]
+                            [--delivery-package]
+                            [--diagnostics-path]
+                            [--drive-list]
+                            [--export]
+                            [--incomplete-blob-list-uri]
+                            [--location]
+                            [--log-level]
+                            [--percent-complete]
+                            [--return-address]
+                            [--return-package]
+                            [--return-shipping]
+                            [--shipping-information]
+                            [--state]
+                            [--storage-account]
+                            [--tags]
+                            [--type]
+  examples:
+  - summary: Create an import job
+    syntax: >-
+      az import-export create --resource-group "myResourceGroup" --name "myJob"
+
+      --location "West US" --backup-drive-manifest true --diagnostics-path "waimportexport"
+
+      --drive-list bit-locker-key=238810-662376-448998-450120-652806-203390-606320-483076
+
+      drive-header-hash= drive-id=9CA995BB manifest-file=\\DriveManifest.xml
+
+      manifest-hash=109B21108597EF36D5785F08303F3638 --type "Import" --log-level "Verbose"
+
+      --return-address city=Redmond country-or-region=USA email=Test@contoso.com phone=4250000000
+
+      postal-code=98007 recipient-name=Tests state-or-province=wa street-address1=Street1
+
+      street-address2=street2 --storage-account "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-\
+
+      xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-drive-manifest
+    parameterValueGroup: false, true
+    summary: Default value is false. Indicates whether the manifest files on the drives should be copied to block blobs.
+    description: ''
+  - name: --cancel-requested
+    parameterValueGroup: false, true
+    summary: Indicates whether a request has been submitted to cancel the job.
+    description: ''
+  - name: --client-tenant-id
+    summary: The tenant ID of the client making the request.
+    description: ''
+  - name: --delivery-package
+    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
+    description: ''
+  - name: --diagnostics-path
+    summary: The virtual blob directory to which the copy logs and backups of drive manifest files (if enabled) will be stored.
+    description: ''
+  - name: --drive-list
+    summary: List of up to ten drives that comprise the job. The drive list is a required element for an import job; it is not specified for export jobs.
+    description: ''
+  - name: --export
+    summary: A property containing information about the blobs to be exported for an export job. This property is required for export jobs, but must not be specified for import jobs.
+    description: ''
+  - name: --incomplete-blob-list-uri
+    summary: A blob path that points to a block blob containing a list of blob names that were not exported due to insufficient drive space. If all blobs were exported successfully, then this element is not included in the response.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-level
+    summary: Default value is Error. Indicates whether error logging or verbose logging will be enabled.
+    description: ''
+  - name: --percent-complete
+    summary: Overall percentage completed for the job.
+    description: ''
+  - name: --return-address
+    summary: Specifies the return address information for the job.
+    description: ''
+  - name: --return-package
+    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
+    description: ''
+  - name: --return-shipping
+    summary: Specifies the return carrier and customer's account with the carrier.
+    description: ''
+  - name: --shipping-information
+    summary: Contains information about the Microsoft datacenter to which the drives should be shipped.
+    description: ''
+  - name: --state
+    summary: Current state of the job.
+    description: ''
+  - name: --storage-account
+    summary: Name or ID of the storage account where data will be imported to or exported from.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: The type of job.
+    description: ''
+- uid: az_import-export_delete
+  name: az import-export delete
+  summary: Deletes an existing job. Only jobs in the Creating or Completed states can be deleted.
+  description: ''
+  syntax: >-
+    az import-export delete --name
+                            --resource-group
+  examples:
+  - summary: Delete job
+    syntax: az import-export delete --resource-group "myResourceGroup" --name "myJob"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_import-export_list
+  name: az import-export list
+  summary: Returns all active and completed jobs in a subscription.
+  description: ''
+  syntax: az import-export list [--resource-group]
+  examples:
+  - summary: List jobs in a resource group
+    syntax: az import-export list --resource-group "myResourceGroup"
+  - summary: List jobs in current subscription
+    syntax: az import-export list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_import-export_show
+  name: az import-export show
+  summary: Gets information about an existing job.
+  description: ''
+  syntax: >-
+    az import-export show --name
+                          --resource-group
+  examples:
+  - summary: Get job
+    syntax: az import-export show --resource-group "myResourceGroup" --name "myJob"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_import-export_update
+  name: az import-export update
+  summary: Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.
+  description: ''
+  syntax: >-
+    az import-export update --name
+                            --resource-group
+                            [--backup-drive-manifest {false, true}]
+                            [--cancel-requested {false, true}]
+                            [--delivery-package]
+                            [--drive-list]
+                            [--log-level]
+                            [--return-address]
+                            [--return-shipping]
+                            [--state]
+                            [--tags]
+  examples:
+  - summary: Update job
+    syntax: >-
+      az import-export update --resource-group "myResourceGroup" --name "myJob"
+
+      --backup-drive-manifest true --log-level "Verbose" --state ""
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-drive-manifest
+    parameterValueGroup: false, true
+    summary: Indicates whether the manifest files on the drives should be copied to block blobs.
+    description: ''
+  - name: --cancel-requested
+    parameterValueGroup: false, true
+    summary: If specified, the value must be true. The service will attempt to cancel the job.
+    description: ''
+  - name: --delivery-package
+    summary: Contains information about the package being shipped by the customer to the Microsoft data center.
+    description: ''
+  - name: --drive-list
+    summary: List of drives that comprise the job.
+    description: ''
+  - name: --log-level
+    summary: Indicates whether error logging or verbose logging is enabled.
+    description: ''
+  - name: --return-address
+    summary: Specifies the return address information for the job.
+    description: ''
+  - name: --return-shipping
+    summary: Specifies the return carrier and customer's account with the carrier.
+    description: ''
+  - name: --state
+    summary: If specified, the value must be Shipping, which tells the Import/Export service that the package for the job has been shipped. The ReturnAddress and DeliveryPackage properties must have been set either in this request or in a previous request, otherwise the request will fail.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_import-export_bit-locker-key
+- az_import-export_bit-locker-key_list
+- az_import-export_create
+- az_import-export_delete
+- az_import-export_list
+- az_import-export_location
+- az_import-export_location_list
+- az_import-export_location_show
+- az_import-export_show
+- az_import-export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Import Export.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/import-export/bit-locker-key.yml b/2018-03-01-hybrid/docs-ref-autogen/import-export/bit-locker-key.yml
new file mode 100644
index 0000000000..a349965c29
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/import-export/bit-locker-key.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_import-export_bit-locker-key
+name: az import-export bit-locker-key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **import-export** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az import-export bit-locker-key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Import-export bit-locker-key.
+description: ''
+directCommands:
+- uid: az_import-export_bit-locker-key_list
+  name: az import-export bit-locker-key list
+  summary: Returns the BitLocker Keys for all drives in the specified job.
+  description: ''
+  syntax: >-
+    az import-export bit-locker-key list --job-name
+                                         --resource-group
+  examples:
+  - summary: List BitLocker Keys for drives in a job
+    syntax: az import-export bit-locker-key list --resource-group "myResourceGroup" --job-name "myJob"
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the import/export job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_import-export_bit-locker-key_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Import-export bit-locker-key.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/import-export/location.yml b/2018-03-01-hybrid/docs-ref-autogen/import-export/location.yml
new file mode 100644
index 0000000000..90937f002c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/import-export/location.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_import-export_location
+name: az import-export location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **import-export** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az import-export location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Import-export location.
+description: ''
+directCommands:
+- uid: az_import-export_location_list
+  name: az import-export location list
+  summary: Returns a list of locations to which you can ship the disks associated with an import or export job. A location is a Microsoft data center region.
+  description: ''
+  syntax: az import-export location list
+  examples:
+  - summary: List locations to which you can ship the disks
+    syntax: az import-export location list
+- uid: az_import-export_location_show
+  name: az import-export location show
+  summary: Returns the details about a location to which you can ship the disks associated with an import or export job. A location is an Azure region.
+  description: ''
+  syntax: az import-export location show --location
+  examples:
+  - summary: Show details about a location
+    syntax: az import-export location show --location "West US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az import-export location list`.'
+    description: ''
+commands:
+- az_import-export_location_list
+- az_import-export_location_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Import-export location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer.yml b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer.yml
new file mode 100644
index 0000000000..f9df7dfce2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer
+name: az internet-analyzer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage internet analyzer.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_show-scorecard
+  name: az internet-analyzer show-scorecard
+  summary: Show latency scorecard for a test.
+  description: ''
+  syntax: >-
+    az internet-analyzer show-scorecard --aggregation-interval
+                                        --profile-name
+                                        --resource-group
+                                        --test-name
+                                        [--country]
+                                        [--end-date-time-utc]
+  requiredParameters:
+  - isRequired: true
+    name: --aggregation-interval
+    summary: The aggregation interval of the Latency Scorecard.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --test-name
+    summary: The name of the Internet Analyzer test.
+    description: ''
+  optionalParameters:
+  - name: --country
+    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - https://www.iso.org/iso-3166-country-codes.html.
+    description: ''
+  - name: --end-date-time-utc
+    summary: The end DateTime of the Latency Scorecard in UTC.
+    description: ''
+- uid: az_internet-analyzer_show-timeseries
+  name: az internet-analyzer show-timeseries
+  summary: Show timeseries for a test.
+  description: ''
+  syntax: >-
+    az internet-analyzer show-timeseries --aggregation-interval
+                                         --end-date-time-utc
+                                         --endpoint
+                                         --profile-name
+                                         --resource-group
+                                         --start-date-time-utc
+                                         --test-name
+                                         --timeseries-type
+                                         [--country]
+  requiredParameters:
+  - isRequired: true
+    name: --aggregation-interval
+    summary: The aggregation interval of the Timeseries.
+    description: ''
+  - isRequired: true
+    name: --end-date-time-utc
+    summary: The end DateTime of the Timeseries in UTC.
+    description: ''
+  - isRequired: true
+    name: --endpoint
+    summary: The specific endpoint.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start-date-time-utc
+    summary: The start DateTime of the Timeseries in UTC.
+    description: ''
+  - isRequired: true
+    name: --test-name
+    summary: The name of the Internet Analyzer test.
+    description: ''
+  - isRequired: true
+    name: --timeseries-type
+    summary: The type of Timeseries.
+    description: ''
+  optionalParameters:
+  - name: --country
+    summary: The country associated with the Latency Scorecard. Values are country ISO codes as specified here - https://www.iso.org/iso-3166-country-codes.html.
+    description: ''
+commands:
+- az_internet-analyzer_preconfigured-endpoint
+- az_internet-analyzer_preconfigured-endpoint_list
+- az_internet-analyzer_profile
+- az_internet-analyzer_profile_create
+- az_internet-analyzer_profile_delete
+- az_internet-analyzer_profile_list
+- az_internet-analyzer_profile_show
+- az_internet-analyzer_profile_update
+- az_internet-analyzer_show-scorecard
+- az_internet-analyzer_show-timeseries
+- az_internet-analyzer_test
+- az_internet-analyzer_test_create
+- az_internet-analyzer_test_delete
+- az_internet-analyzer_test_list
+- az_internet-analyzer_test_show
+- az_internet-analyzer_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage internet analyzer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/preconfigured-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/preconfigured-endpoint.yml
new file mode 100644
index 0000000000..9870e5a072
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/preconfigured-endpoint.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer_preconfigured-endpoint
+name: az internet-analyzer preconfigured-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer preconfigured-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage preconfigured endpoints.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_preconfigured-endpoint_list
+  name: az internet-analyzer preconfigured-endpoint list
+  summary: List preconfigured endpoints.
+  description: ''
+  syntax: >-
+    az internet-analyzer preconfigured-endpoint list --profile-name
+                                                     --resource-group
+  examples:
+  - summary: Gets a list of Preconfigured Endpoints
+    syntax: >-
+      az internet-analyzer preconfigured-endpoint list --resource-group "MyResourceGroup" \
+
+      --profile-name "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile for which to list preconfigured endpoints.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_internet-analyzer_preconfigured-endpoint_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage preconfigured endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/profile.yml b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/profile.yml
new file mode 100644
index 0000000000..9c1abbcffe
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/profile.yml
@@ -0,0 +1,156 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer_profile
+name: az internet-analyzer profile
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer profile** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage internet analyzer profile.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_profile_create
+  name: az internet-analyzer profile create
+  summary: Create internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile create --name
+                                        --resource-group
+                                        [--enabled-state {Disabled, Enabled}]
+                                        [--location]
+                                        [--tags]
+  examples:
+  - summary: Creates an Internet Analyzer Profile in a Resource Group
+    syntax: >-
+      az internet-analyzer profile create --resource-group "MyResourceGroup" --name "MyProfile" \
+
+      --location "WestUs" --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to be created.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The state of the Experiment.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_internet-analyzer_profile_delete
+  name: az internet-analyzer profile delete
+  summary: Delete internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile delete --name
+                                        --resource-group
+  examples:
+  - summary: Deletes an Internet Analyzer Profile in a Resource Group
+    syntax: az internet-analyzer profile delete --resource-group "MyResourceGroup" --name "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to be deleted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_profile_list
+  name: az internet-analyzer profile list
+  summary: List internet analyzer profiles.
+  description: ''
+  syntax: az internet-analyzer profile list --resource-group
+  examples:
+  - summary: List Internet Analyzer Profiles in a Resource Group
+    syntax: az internet-analyzer profile list --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_profile_show
+  name: az internet-analyzer profile show
+  summary: Show internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile show --name
+                                      --resource-group
+  examples:
+  - summary: Gets an Internet Analyzer Profile by Profile Id
+    syntax: az internet-analyzer profile show --resource-group "MyResourceGroup" --name "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to show.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_profile_update
+  name: az internet-analyzer profile update
+  summary: Update internet analyzer profile.
+  description: ''
+  syntax: >-
+    az internet-analyzer profile update --name
+                                        --resource-group
+                                        [--enabled-state {Disabled, Enabled}]
+                                        [--location]
+                                        [--tags]
+  examples:
+  - summary: Updates an Internet Analyzer Profile in a Resource Group
+    syntax: >-
+      az internet-analyzer profile update --resource-group "MyResourceGroup" --name "MyProfile" \
+
+      --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer profile to be updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The state of the Experiment.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_internet-analyzer_profile_create
+- az_internet-analyzer_profile_delete
+- az_internet-analyzer_profile_list
+- az_internet-analyzer_profile_show
+- az_internet-analyzer_profile_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage internet analyzer profile.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/test.yml b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/test.yml
new file mode 100644
index 0000000000..147f04d76b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/internet-analyzer/test.yml
@@ -0,0 +1,235 @@
+### YamlMime:AzureCLIGroup
+uid: az_internet-analyzer_test
+name: az internet-analyzer test
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **internet-analyzer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az internet-analyzer test** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage tests.
+description: ''
+directCommands:
+- uid: az_internet-analyzer_test_create
+  name: az internet-analyzer test create
+  summary: Create test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test create --name
+                                     --profile-name
+                                     --resource-group
+                                     [--description]
+                                     [--enabled-state {Disabled, Enabled}]
+                                     [--endpoint-a-endpoint]
+                                     [--endpoint-a-name]
+                                     [--endpoint-b-endpoint]
+                                     [--endpoint-b-name]
+                                     [--location]
+                                     [--tags]
+  examples:
+  - summary: Creates a test
+    syntax: >-
+      az internet-analyzer test create --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment" --description "this is my first experiment!" \
+
+      --endpoint-a-name "endpoint A" --endpoint-a-endpoint "endpointA.net" --endpoint-b-name \
+
+      "endpoint B" --endpoint-b-endpoint "endpointB.net" --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to be created.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the new test should be created.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of the details or intents of the test.
+    description: ''
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The initial of the test.
+    description: ''
+  - name: --endpoint-a-endpoint
+    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-a-name
+    summary: The name of the control endpoint.
+    description: ''
+  - name: --endpoint-b-endpoint
+    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-b-name
+    summary: The name of the other endpoint.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_internet-analyzer_test_delete
+  name: az internet-analyzer test delete
+  summary: Delete test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test delete --name
+                                     --profile-name
+                                     --resource-group
+  examples:
+  - summary: Deletes a test
+    syntax: >-
+      az internet-analyzer test delete --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to delete.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_test_list
+  name: az internet-analyzer test list
+  summary: List tests.
+  description: ''
+  syntax: >-
+    az internet-analyzer test list --profile-name
+                                   --resource-group
+  examples:
+  - summary: Gets a list of tests
+    syntax: >-
+      az internet-analyzer test list --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile"
+  requiredParameters:
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile for which to list tests.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_test_show
+  name: az internet-analyzer test show
+  summary: Show test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test show --name
+                                   --profile-name
+                                   --resource-group
+  examples:
+  - summary: Gets a test by name
+    syntax: >-
+      az internet-analyzer test show --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to show.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_internet-analyzer_test_update
+  name: az internet-analyzer test update
+  summary: Update test.
+  description: ''
+  syntax: >-
+    az internet-analyzer test update --name
+                                     --profile-name
+                                     --resource-group
+                                     [--description]
+                                     [--enabled-state {Disabled, Enabled}]
+                                     [--endpoint-a-endpoint]
+                                     [--endpoint-a-name]
+                                     [--endpoint-b-endpoint]
+                                     [--endpoint-b-name]
+                                     [--location]
+                                     [--tags]
+  examples:
+  - summary: Updates a test
+    syntax: >-
+      az internet-analyzer test update --resource-group "MyResourceGroup" --profile-name \
+
+      "MyProfile" --name "MyExperiment" --description "string" --enabled-state "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the Internet Analyzer test to be updated.
+    description: ''
+  - isRequired: true
+    name: --profile-name
+    summary: The name of the Internet Analyzer profile under which the test exists.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of the details or intents of the test.
+    description: ''
+  - name: --enabled-state
+    parameterValueGroup: Disabled, Enabled
+    summary: The state of the Experiment.
+    description: ''
+  - name: --endpoint-a-endpoint
+    summary: The URL of the control endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-a-name
+    summary: The name of the control endpoint.
+    description: ''
+  - name: --endpoint-b-endpoint
+    summary: The URL of the other endpoint in <hostname>[/<custom-path>] format (e.g., www.contoso.com or www.contoso.com/some/path/to/trans.gif). Must support HTTPS. If an object path isn't specified explicitly, Internet Analyzer will use "/apc/trans.gif" as the object path by default, which is where the preconfigured endpoints are hosting the one-pixel image.
+    description: ''
+  - name: --endpoint-b-name
+    summary: The name of the other endpoint.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_internet-analyzer_test_create
+- az_internet-analyzer_test_delete
+- az_internet-analyzer_test_list
+- az_internet-analyzer_test_show
+- az_internet-analyzer_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage tests.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot.yml b/2018-03-01-hybrid/docs-ref-autogen/iot.yml
new file mode 100644
index 0000000000..c68468a468
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot.yml
@@ -0,0 +1,186 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot
+name: az iot
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Internet of Things (IoT) assets. Augmented with the IoT extension.
+description: >-
+  Review the extension wiki tips to maximize usage
+
+  https://github.com/Azure/azure-iot-cli-extension/wiki/Tips.
+commands:
+- az_iot_central
+- az_iot_central_api-token
+- az_iot_central_api-token_create
+- az_iot_central_api-token_delete
+- az_iot_central_api-token_list
+- az_iot_central_api-token_show
+- az_iot_central_device
+- az_iot_central_device_command
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+- az_iot_central_device_compute-device-key
+- az_iot_central_device_create
+- az_iot_central_device_delete
+- az_iot_central_device_manual-failback
+- az_iot_central_device_manual-failover
+- az_iot_central_device_registration-info
+- az_iot_central_device_show
+- az_iot_central_device_show-credentials
+- az_iot_central_device_twin
+- az_iot_central_device_twin_show
+- az_iot_central_device-template
+- az_iot_central_device-template_create
+- az_iot_central_device-template_delete
+- az_iot_central_device-template_show
+- az_iot_central_diagnostics
+- az_iot_central_diagnostics_monitor-events
+- az_iot_central_diagnostics_monitor-properties
+- az_iot_central_diagnostics_registration-summary
+- az_iot_central_diagnostics_validate-messages
+- az_iot_central_diagnostics_validate-properties
+- az_iot_central_user
+- az_iot_central_user_create
+- az_iot_central_user_delete
+- az_iot_central_user_list
+- az_iot_central_user_show
+- az_iot_device
+- az_iot_device_c2d-message
+- az_iot_device_c2d-message_abandon
+- az_iot_device_c2d-message_complete
+- az_iot_device_c2d-message_purge
+- az_iot_device_c2d-message_receive
+- az_iot_device_c2d-message_reject
+- az_iot_device_c2d-message_send
+- az_iot_device_send-d2c-message
+- az_iot_device_simulate
+- az_iot_device_upload-file
+- az_iot_dps
+- az_iot_dps_compute-device-key
+- az_iot_dps_enrollment
+- az_iot_dps_enrollment_create
+- az_iot_dps_enrollment_delete
+- az_iot_dps_enrollment_list
+- az_iot_dps_enrollment_show
+- az_iot_dps_enrollment_update
+- az_iot_dps_enrollment-group
+- az_iot_dps_enrollment-group_create
+- az_iot_dps_enrollment-group_delete
+- az_iot_dps_enrollment-group_list
+- az_iot_dps_enrollment-group_show
+- az_iot_dps_enrollment-group_update
+- az_iot_dps_registration
+- az_iot_dps_registration_delete
+- az_iot_dps_registration_list
+- az_iot_dps_registration_show
+- az_iot_edge
+- az_iot_edge_deployment
+- az_iot_edge_deployment_create
+- az_iot_edge_deployment_delete
+- az_iot_edge_deployment_list
+- az_iot_edge_deployment_show
+- az_iot_edge_deployment_show-metric
+- az_iot_edge_deployment_update
+- az_iot_edge_set-modules
+- az_iot_hub
+- az_iot_hub_configuration
+- az_iot_hub_configuration_create
+- az_iot_hub_configuration_delete
+- az_iot_hub_configuration_list
+- az_iot_hub_configuration_show
+- az_iot_hub_configuration_show-metric
+- az_iot_hub_configuration_update
+- az_iot_hub_connection-string
+- az_iot_hub_connection-string_show
+- az_iot_hub_device-identity
+- az_iot_hub_device-identity_children
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+- az_iot_hub_device-identity_connection-string
+- az_iot_hub_device-identity_connection-string_show
+- az_iot_hub_device-identity_create
+- az_iot_hub_device-identity_delete
+- az_iot_hub_device-identity_export
+- az_iot_hub_device-identity_import
+- az_iot_hub_device-identity_list
+- az_iot_hub_device-identity_parent
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+- az_iot_hub_device-identity_renew-key
+- az_iot_hub_device-identity_show
+- az_iot_hub_device-identity_update
+- az_iot_hub_device-twin
+- az_iot_hub_device-twin_replace
+- az_iot_hub_device-twin_show
+- az_iot_hub_device-twin_update
+- az_iot_hub_digital-twin
+- az_iot_hub_digital-twin_invoke-command
+- az_iot_hub_digital-twin_show
+- az_iot_hub_digital-twin_update
+- az_iot_hub_distributed-tracing
+- az_iot_hub_distributed-tracing_show
+- az_iot_hub_distributed-tracing_update
+- az_iot_hub_generate-sas-token
+- az_iot_hub_invoke-device-method
+- az_iot_hub_invoke-module-method
+- az_iot_hub_job
+- az_iot_hub_job_cancel
+- az_iot_hub_job_create
+- az_iot_hub_job_list
+- az_iot_hub_job_show
+- az_iot_hub_module-identity
+- az_iot_hub_module-identity_connection-string
+- az_iot_hub_module-identity_connection-string_show
+- az_iot_hub_module-identity_create
+- az_iot_hub_module-identity_delete
+- az_iot_hub_module-identity_list
+- az_iot_hub_module-identity_show
+- az_iot_hub_module-identity_update
+- az_iot_hub_module-twin
+- az_iot_hub_module-twin_replace
+- az_iot_hub_module-twin_show
+- az_iot_hub_module-twin_update
+- az_iot_hub_monitor-events
+- az_iot_hub_monitor-feedback
+- az_iot_hub_query
+- az_iot_product
+- az_iot_product_requirement
+- az_iot_product_requirement_list
+- az_iot_product_test
+- az_iot_product_test_case
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+- az_iot_product_test_create
+- az_iot_product_test_run
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+- az_iot_product_test_search
+- az_iot_product_test_show
+- az_iot_product_test_task
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+- az_iot_product_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Review the extension wiki tips to maximize usage
+
+    https://github.com/Azure/azure-iot-cli-extension/wiki/Tips.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central.yml
new file mode 100644
index 0000000000..b65713da79
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central
+name: az iot central
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Central resources.
+description: >-
+  IoT Central is an IoT application platform that reduces the burden and cost of developing,
+
+  managing, and maintaining enterprise-grade IoT solutions. Choosing to build with IoT Central
+
+  gives you the opportunity to focus time, money, and energy on transforming your business
+
+  with IoT data, rather than just maintaining and updating a complex and continually evolving
+
+  IoT infrastructure.
+
+
+  IoT Central documentation is available at https://aka.ms/iotcentral-documentation
+
+  Additional information on CLI commands is available at https://aka.ms/azure-cli-iot-ext.
+commands:
+- az_iot_central_api-token
+- az_iot_central_api-token_create
+- az_iot_central_api-token_delete
+- az_iot_central_api-token_list
+- az_iot_central_api-token_show
+- az_iot_central_device
+- az_iot_central_device_command
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+- az_iot_central_device_compute-device-key
+- az_iot_central_device_create
+- az_iot_central_device_delete
+- az_iot_central_device_manual-failback
+- az_iot_central_device_manual-failover
+- az_iot_central_device_registration-info
+- az_iot_central_device_show
+- az_iot_central_device_show-credentials
+- az_iot_central_device_twin
+- az_iot_central_device_twin_show
+- az_iot_central_device-template
+- az_iot_central_device-template_create
+- az_iot_central_device-template_delete
+- az_iot_central_device-template_show
+- az_iot_central_diagnostics
+- az_iot_central_diagnostics_monitor-events
+- az_iot_central_diagnostics_monitor-properties
+- az_iot_central_diagnostics_registration-summary
+- az_iot_central_diagnostics_validate-messages
+- az_iot_central_diagnostics_validate-properties
+- az_iot_central_user
+- az_iot_central_user_create
+- az_iot_central_user_delete
+- az_iot_central_user_list
+- az_iot_central_user_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    IoT Central is an IoT application platform that reduces the burden and cost of developing,
+
+    managing, and maintaining enterprise-grade IoT solutions. Choosing to build with IoT Central
+
+    gives you the opportunity to focus time, money, and energy on transforming your business
+
+    with IoT data, rather than just maintaining and updating a complex and continually evolving
+
+    IoT infrastructure.
+
+
+    IoT Central documentation is available at https://aka.ms/iotcentral-documentation
+
+    Additional information on CLI commands is available at https://aka.ms/azure-cli-iot-ext.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/api-token.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/api-token.yml
new file mode 100644
index 0000000000..30e64c6399
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/api-token.yml
@@ -0,0 +1,173 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_api-token
+name: az iot central api-token
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central api-token** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage API tokens for your IoT Central application.
+description: IoT Central allows you to generate and manage API tokens to be used to access the IoT Central API. More information about APIs can be found at https://aka.ms/iotcentraldocsapi.
+directCommands:
+- uid: az_iot_central_api-token_create
+  name: az iot central api-token create
+  summary: Generate an API token associated with your IoT Central application.
+  description: "Note: Write down your token once it's been generated as you won't be able to retrieve it again."
+  syntax: >-
+    az iot central api-token create --app-id
+                                    --role {admin, builder, operator}
+                                    --tkid
+                                    [--api-version {1.0, preview}]
+                                    [--central-api-uri]
+                                    [--token]
+  examples:
+  - summary: Add new API token
+    syntax: az iot central api-token create --token-id {tokenId} --app-id {appId} --role admin
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --role -r
+    parameterValueGroup: admin, builder, operator
+    summary: The role that will be associated with this token. You can specify one of the built-in roles, or specify the role ID of a custom role. See more at https://aka.ms/iotcentral-customrolesdocs.
+    description: ''
+  - isRequired: true
+    name: --tkid --token-id
+    summary: The IoT Central ID associated with this token, [0-9a-zA-Z-] allowed, max length limit to 40. Specify an ID that you'll then use when modifying or deleting this token later via the CLI or API.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_api-token_delete
+  name: az iot central api-token delete
+  summary: Delete an API token associated with your IoT Central application.
+  description: ''
+  syntax: >-
+    az iot central api-token delete --app-id
+                                    --tkid
+                                    [--api-version {1.0, preview}]
+                                    [--central-api-uri]
+                                    [--token]
+  examples:
+  - summary: Delete an API token
+    syntax: az iot central api-token delete --app-id {appid} --token-id {tokenId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --tkid --token-id
+    summary: The IoT Central ID associated with this token, [0-9a-zA-Z-] allowed, max length limit to 40. Specify an ID that you'll then use when modifying or deleting this token later via the CLI or API.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_api-token_list
+  name: az iot central api-token list
+  summary: List all API tokens associated with your IoT Central application.
+  description: Information in the list contains basic information about the tokens in the application and does not include token values.
+  syntax: >-
+    az iot central api-token list --app-id
+                                  [--api-version {1.0, preview}]
+                                  [--central-api-uri]
+                                  [--token]
+  examples:
+  - summary: List of API tokens
+    syntax: az iot central api-token list --app-id {appid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_api-token_show
+  name: az iot central api-token show
+  summary: Get details for an API token associated with your IoT Central application.
+  description: List details, like its associated role, for an API token in your IoT Central app.
+  syntax: >-
+    az iot central api-token show --app-id
+                                  --tkid
+                                  [--api-version {1.0, preview}]
+                                  [--central-api-uri]
+                                  [--token]
+  examples:
+  - summary: Get API token
+    syntax: az iot central api-token show --app-id {appid} --token-id {tokenId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --tkid --token-id
+    summary: The IoT Central ID associated with this token, [0-9a-zA-Z-] allowed, max length limit to 40. Specify an ID that you'll then use when modifying or deleting this token later via the CLI or API.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_api-token_create
+- az_iot_central_api-token_delete
+- az_iot_central_api-token_list
+- az_iot_central_api-token_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: IoT Central allows you to generate and manage API tokens to be used to access the IoT Central API. More information about APIs can be found at https://aka.ms/iotcentraldocsapi.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/device-template.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device-template.yml
new file mode 100644
index 0000000000..5c87fc0948
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device-template.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device-template
+name: az iot central device-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure IoT Central device templates.
+description: ''
+directCommands:
+- uid: az_iot_central_device-template_create
+  name: az iot central device-template create
+  summary: Create a device template in IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device-template create --app-id
+                                          --content
+                                          --device-template-id
+                                          [--api-version {1.0, preview}]
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Create a device template with payload read from a file
+    syntax: az iot central device-template create --app-id {appid} --content {pathtofile} --device-template-id {devicetemplateid}
+  - summary: Create a device template with payload read from raw json
+    syntax: az iot central device-template create --app-id {appid} --content {json} --device-template-id {devicetemplateid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --content -k
+    summary: 'The device template definition. Provide path to JSON file or raw stringified JSON. [File Path Example: ./path/to/file.json] [Example of stringified JSON: {<Device Template JSON>}]. The request body must contain CapabilityModel.'
+    description: ''
+  - isRequired: true
+    name: --device-template-id --dtid
+    summary: Unique ID for the Device template.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device-template_delete
+  name: az iot central device-template delete
+  summary: Delete a device template from IoT Central.
+  description: 'Note: this is expected to fail if any devices are still associated to this template.'
+  syntax: >-
+    az iot central device-template delete --app-id
+                                          --device-template-id
+                                          [--api-version {1.0, preview}]
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Delete a device template from IoT Central
+    syntax: az iot central device-template delete --app-id {appid} --device-template-id {devicetemplateid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-template-id --dtid
+    summary: 'The ID of the target device template. Example: somedevicetemplate.'
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device-template_show
+  name: az iot central device-template show
+  summary: Get a device template from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device-template show --app-id
+                                        --device-template-id
+                                        [--api-version {1.0, preview}]
+                                        [--central-api-uri]
+                                        [--token]
+  examples:
+  - summary: Get a device template
+    syntax: az iot central device-template show --app-id {appid} --device-template-id {devicetemplateid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-template-id --dtid
+    summary: 'The ID of the target device template. Example: somedevicetemplate.'
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device-template_create
+- az_iot_central_device-template_delete
+- az_iot_central_device-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure IoT Central device templates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/device.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device.yml
new file mode 100644
index 0000000000..c1e9433f53
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device.yml
@@ -0,0 +1,300 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device
+name: az iot central device
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure IoT Central devices.
+description: ''
+directCommands:
+- uid: az_iot_central_device_compute-device-key
+  name: az iot central device compute-device-key
+  summary: Generate a derived device SAS key.
+  description: Generate a derived device key from a group-level SAS key.
+  syntax: >-
+    az iot central device compute-device-key --device-id
+                                             --pk
+  examples:
+  - summary: Basic usage
+    syntax: az iot central device compute-device-key --pk {primaryKey} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - isRequired: true
+    name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+- uid: az_iot_central_device_create
+  name: az iot central device create
+  summary: Create a device in IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device create --app-id
+                                 --device-id
+                                 [--api-version {1.0, preview}]
+                                 [--central-api-uri]
+                                 [--device-name]
+                                 [--simulated {false, true}]
+                                 [--template]
+                                 [--token]
+  examples:
+  - summary: Create a device
+    syntax: az iot central device create --app-id {appid} --device-id {deviceid}
+  - summary: Create a simulated device
+    syntax: az iot central device create --app-id {appid} --device-id {deviceid} --template {devicetemplateid} --simulated
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: "Provide a unique identifier for the device. A case-sensitive string (up to 128 characters long) of ASCII 7-bit alphanumeric characters plus certain special characters: - . + % _ # \\* ? ! ( ) , : = @ $ '."
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --device-name
+    summary: 'Human readable device name. Example: Fridge.'
+    description: ''
+  - name: --simulated
+    parameterValueGroup: false, true
+    summary: Add this flag if you would like IoT Central to set this up as a simulated device. --template is required if this is true.
+    description: ''
+  - name: --template
+    summary: 'Central template id. Example: dtmi:ojpkindbz:modelDefinition:iild3tm_uo.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_delete
+  name: az iot central device delete
+  summary: Delete a device from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device delete --app-id
+                                 --device-id
+                                 [--api-version {1.0, preview}]
+                                 [--central-api-uri]
+                                 [--token]
+  examples:
+  - summary: Delete a device
+    syntax: az iot central device delete --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_manual-failback
+  name: az iot central device manual-failback
+  summary: Reverts the previously executed failover command by moving the device back to it's original IoT Hub.
+  description: For more information about high availability visit https://github.com/iot-for-all/iot-central-high-availability-clients#readme.
+  syntax: >-
+    az iot central device manual-failback --app-id
+                                          --device-id
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Reverts the previously executed failover command by moving the device back to it's original IoT Hub
+    syntax: az iot central device manual-failback --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_manual-failover
+  name: az iot central device manual-failover
+  summary: Execute a manual failover of device across multiple IoT Hubs to validate device firmware's ability to reconnect using DPS to a different IoT Hub.
+  description: For more information about high availability and default value for ttl-minutes visit https://github.com/iot-for-all/iot-central-high-availability-clients#readme.
+  syntax: >-
+    az iot central device manual-failover --app-id
+                                          --device-id
+                                          [--central-api-uri]
+                                          [--token]
+                                          [--ttl]
+  examples:
+  - summary: Execute a manual failover of device across multiple IoT Hubs to validate device firmware's ability to reconnect using DPS to a different IoT Hub.
+    syntax: az iot central device manual-failover --app-id {appid} --device-id {deviceid} --ttl-minutes {ttl_minutes}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+  - name: --ttl --ttl-minutes
+    summary: A positive integer. TTL in minutes to move device back to the original hub.Has default value in backend. See documentation on what the latest backend default time to live valueby visiting https://github.com/iot-for-all/iot-central-high-availability-clients#readme.
+    description: ''
+- uid: az_iot_central_device_registration-info
+  name: az iot central device registration-info
+  summary: Get registration info on device(s) from IoT Central.
+  description: 'Note: This command can take a significant amount of time to return if no device id is specified and your app contains a lot of devices.'
+  syntax: >-
+    az iot central device registration-info --app-id
+                                            --device-id
+                                            [--central-api-uri]
+                                            [--token]
+  examples:
+  - summary: Get registration info on specified device
+    syntax: az iot central device registration-info --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_show
+  name: az iot central device show
+  summary: Get a device from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device show --app-id
+                               --device-id
+                               [--api-version {1.0, preview}]
+                               [--central-api-uri]
+                               [--token]
+  examples:
+  - summary: Get a device
+    syntax: az iot central device show --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_show-credentials
+  name: az iot central device show-credentials
+  summary: Get device credentials from IoT Central.
+  description: ''
+  syntax: >-
+    az iot central device show-credentials --app-id
+                                           --device-id
+                                           [--central-api-uri]
+                                           [--token]
+  examples:
+  - summary: Get device credentials for a device
+    syntax: az iot central device show-credentials --app-id {appid} --device-id {deviceid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device_command
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+- az_iot_central_device_compute-device-key
+- az_iot_central_device_create
+- az_iot_central_device_delete
+- az_iot_central_device_manual-failback
+- az_iot_central_device_manual-failover
+- az_iot_central_device_registration-info
+- az_iot_central_device_show
+- az_iot_central_device_show-credentials
+- az_iot_central_device_twin
+- az_iot_central_device_twin_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure IoT Central devices.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/device/command.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device/command.yml
new file mode 100644
index 0000000000..b34d2c3afd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device/command.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device_command
+name: az iot central device command
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device command** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Run device commands.
+description: ''
+directCommands:
+- uid: az_iot_central_device_command_history
+  name: az iot central device command history
+  summary: Get the details for the latest command request and response sent to the device.
+  description: >-
+    Lists the most recent command request and response that was sent to the device from IoT Central.
+
+    Any update that the device performs to the device properties as a result of the command execution are not included in the response.
+  syntax: >-
+    az iot central device command history --app-id
+                                          --cn
+                                          --device-id
+                                          --interface-id
+                                          [--api-version {1.0, preview}]
+                                          [--central-api-uri]
+                                          [--token]
+  examples:
+  - summary: Show command response
+    syntax: az iot central device command history --app-id {appid} --device-id {deviceid} --interface-id {interfaceid} --command-name {commandname}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --cn --command-name
+    summary: The command name as specified in the device template. Command name could be different from the Display Name of the command.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - isRequired: true
+    name: --interface-id -i
+    summary: The name of the interface as specified in the device template. You can find it by navigating to Device Template and view the interface identity under the corresponding device capability.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_device_command_run
+  name: az iot central device command run
+  summary: Run a command on a device and view associated response. Does NOT monitor property updates that the command may perform.
+  description: >-
+    Note: payload should be nested under "request".
+
+    i.e. if your device expects the payload in a shape {"key": "value"}
+
+    payload should be {"request": {"key": "value"}}.
+
+    --content can also be pointed at a filepath like this (.../path/to/payload.json).
+  syntax: >-
+    az iot central device command run --app-id
+                                      --cn
+                                      --content
+                                      --device-id
+                                      --interface-id
+                                      [--api-version {1.0, preview}]
+                                      [--central-api-uri]
+                                      [--token]
+  examples:
+  - summary: Run command response
+    syntax: az iot central device command run --app-id {appid} --device-id {deviceid} --interface-id {interfaceid} --command-name {commandname} --content {payload}
+  - summary: Short Run command response
+    syntax: az iot central device command run -n {appid} -d {deviceid} -i {interfaceid} --cn {commandname} -k {payload}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --cn --command-name
+    summary: The command name as specified in the device template. Command name could be different from the Display Name of the command.
+    description: ''
+  - isRequired: true
+    name: --content -k
+    summary: "Configuration for request. Provide path to JSON file or raw stringified JSON. [File Path Example: ./path/to/file.json] [Stringified JSON Example: {'a': 'b'}]."
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - isRequired: true
+    name: --interface-id -i
+    summary: The name of the interface as specified in the device template. You can find it by navigating to Device Template and view the interface identity under the corresponding device capability.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device_command_history
+- az_iot_central_device_command_run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Run device commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/device/twin.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device/twin.yml
new file mode 100644
index 0000000000..05b43362cc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/device/twin.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_device_twin
+name: az iot central device twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central device twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Central device twins.
+description: ''
+directCommands:
+- uid: az_iot_central_device_twin_show
+  name: az iot central device twin show
+  summary: Get the device twin from IoT Hub.
+  description: ''
+  syntax: >-
+    az iot central device twin show --app-id
+                                    --device-id
+                                    [--central-api-uri]
+                                    [--token]
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_device_twin_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Central device twins.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/diagnostics.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/diagnostics.yml
new file mode 100644
index 0000000000..d05bff06b6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/diagnostics.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_diagnostics
+name: az iot central diagnostics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central diagnostics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Perform application and device level diagnostics.
+description: ''
+directCommands:
+- uid: az_iot_central_diagnostics_monitor-events
+  name: az iot central diagnostics monitor-events
+  summary: View device telemetry messages sent to the IoT Central app.
+  description: >-
+    Shows the telemetry data sent to IoT Central application. By default,
+
+    it shows all the data sent by all devices. Use the --device-id parameter
+
+    to filter to a specific device.
+  syntax: >-
+    az iot central diagnostics monitor-events --app-id
+                                              [--central-api-uri]
+                                              [--cg]
+                                              [--device-id]
+                                              [--enqueued-time]
+                                              [--module-id]
+                                              [--properties {all, anno, app, sys}]
+                                              [--repair {false, true}]
+                                              [--timeout]
+                                              [--token]
+                                              [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics monitor-events --app-id {app_id}
+  - summary: Basic usage when filtering on target device
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id}
+  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d Device*d
+  - summary: Basic usage when filtering on module.
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -m {module_id}
+  - summary: Basic usage when filtering targeted modules with a wildcard in the ID
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -m Module*
+  - summary: Filter device and specify an Event Hub consumer group to bind to.
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id} --cg {consumer_group_name}
+  - summary: Receive message annotations (message headers)
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id} --properties anno
+  - summary: Receive message annotations + system properties. Never time out.
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} -d {device_id} --properties anno sys --timeout 0
+  - summary: Receive all message attributes from all device messages
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} --props all
+  - summary: Receive all messages and parse message payload as JSON
+    syntax: az iot central diagnostics monitor-events --app-id {app_id} --output json
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --cg --consumer-group -c
+    defaultValue: $Default
+    summary: Specify the consumer group to use when connecting to event hub endpoint.
+    description: ''
+  - name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - name: --enqueued-time --et -e
+    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
+    description: ''
+  - name: --module-id -m
+    summary: Provide IoT Edge Module ID if the device type is IoT Edge.
+    description: ''
+  - name: --properties --props -p
+    parameterValueGroup: all, anno, app, sys
+    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --timeout --to -t
+    defaultValue: "300"
+    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_central_diagnostics_monitor-properties
+  name: az iot central diagnostics monitor-properties
+  summary: View desired and reported properties sent to/from the IoT Central app.
+  description: >-
+    Polls device-twin from central and compares it to the last device-twin
+
+    Parses out properties from device-twin, and detects if changes were made
+
+    Prints subset of properties that were changed within the polling interval.
+  syntax: >-
+    az iot central diagnostics monitor-properties --app-id
+                                                  --device-id
+                                                  [--central-api-uri]
+                                                  [--token]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics monitor-properties --app-id {app_id} -d {device_id}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_diagnostics_registration-summary
+  name: az iot central diagnostics registration-summary
+  summary: View the registration summary of all the devices in an app.
+  description: >-
+    Note: This command can take a significant amount of time to return
+
+    if your app contains a lot of devices.
+  syntax: >-
+    az iot central diagnostics registration-summary --app-id
+                                                    [--central-api-uri]
+                                                    [--token]
+  examples:
+  - summary: Registration summary
+    syntax: az iot central diagnostics registration-summary --app-id {appid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_diagnostics_validate-messages
+  name: az iot central diagnostics validate-messages
+  summary: Validate messages sent to the IoT Hub for an IoT Central app.
+  description: Performs validations on the telemetry messages and reports back data that is not modeled in the device template or data where the data type doesn’t match what is defined in the device template.
+  syntax: >-
+    az iot central diagnostics validate-messages --app-id
+                                                 [--central-api-uri]
+                                                 [--cg]
+                                                 [--device-id]
+                                                 [--dr]
+                                                 [--enqueued-time]
+                                                 [--max-messages]
+                                                 [--minimum-severity {error, info, warning}]
+                                                 [--module-id]
+                                                 [--properties {all, anno, app, sys}]
+                                                 [--repair {false, true}]
+                                                 [--style {csv, json, scroll}]
+                                                 [--timeout]
+                                                 [--token]
+                                                 [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics validate-messages --app-id {app_id}
+  - summary: Output errors as they are detected
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} --style scroll
+  - summary: Basic usage when filtering on target device
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -d {device_id}
+  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -d Device*
+  - summary: Basic usage when filtering on module.
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -m {module_id}
+  - summary: Basic usage when filtering targeted modules with a wildcard in the ID
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -m Module*
+  - summary: Filter device and specify an Event Hub consumer group to bind to.
+    syntax: az iot central diagnostics validate-messages --app-id {app_id} -d {device_id} --cg {consumer_group_name}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --cg --consumer-group -c
+    defaultValue: $Default
+    summary: Specify the consumer group to use when connecting to event hub endpoint.
+    description: ''
+  - name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  - name: --dr --duration
+    defaultValue: "300"
+    summary: Maximum duration to receive messages from target device before terminating connection.Use 0 for infinity.
+    description: ''
+  - name: --enqueued-time --et -e
+    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
+    description: ''
+  - name: --max-messages --mm
+    defaultValue: "10"
+    summary: Maximum number of messages to recieve from target device before terminating connection.Use 0 for infinity.
+    description: ''
+  - name: --minimum-severity
+    defaultValue: warning
+    parameterValueGroup: error, info, warning
+    summary: Minimum severity of issue required for reporting.
+    description: ''
+  - name: --module-id -m
+    summary: Provide IoT Edge Module ID if the device type is IoT Edge.
+    description: ''
+  - name: --properties --props -p
+    parameterValueGroup: all, anno, app, sys
+    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --style
+    defaultValue: scroll
+    parameterValueGroup: csv, json, scroll
+    summary: Indicate output stylescroll = deliver errors as they arrive, json = summarize results as json, csv = summarize results as csv.
+    description: ''
+  - name: --timeout --to -t
+    defaultValue: "300"
+    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_central_diagnostics_validate-properties
+  name: az iot central diagnostics validate-properties
+  summary: Validate reported properties sent to the IoT Central application.
+  description: >-
+    Performs validations on reported property updates:
+
+    1) Warning - Properties sent by device that are not modeled in central.
+
+    2) Warning - Properties with same name declared in multiple interfaces
+
+    should have interface name included as part of the property update.
+  syntax: >-
+    az iot central diagnostics validate-properties --app-id
+                                                   --device-id
+                                                   [--central-api-uri]
+                                                   [--minimum-severity {error, info, warning}]
+                                                   [--token]
+  examples:
+  - summary: Basic usage
+    syntax: az iot central diagnostics validate-properties --app-id {app_id} -d {device_id}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: The ID of the target device, You can find the Device Id by clicking on the Connect button on the Device Details page.
+    description: ''
+  optionalParameters:
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --minimum-severity
+    defaultValue: warning
+    parameterValueGroup: error, info, warning
+    summary: Minimum severity of issue required for reporting.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_diagnostics_monitor-events
+- az_iot_central_diagnostics_monitor-properties
+- az_iot_central_diagnostics_registration-summary
+- az_iot_central_diagnostics_validate-messages
+- az_iot_central_diagnostics_validate-properties
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Perform application and device level diagnostics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/central/user.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/central/user.yml
new file mode 100644
index 0000000000..b41f98dd1d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/central/user.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_central_user
+name: az iot central user
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot central user** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure IoT Central users.
+description: ''
+directCommands:
+- uid: az_iot_central_user_create
+  name: az iot central user create
+  summary: Add a user to the application.
+  description: ''
+  syntax: >-
+    az iot central user create --app-id
+                               --assignee
+                               --role {admin, builder, operator}
+                               [--api-version {1.0, preview}]
+                               [--central-api-uri]
+                               [--email]
+                               [--object-id]
+                               [--tenant-id]
+                               [--token]
+  examples:
+  - summary: Add a user by email to the application
+    syntax: az iot central user create --user-id {userId} --app-id {appId} --email {emailAddress} --role admin
+  - summary: Add a service-principal to the application
+    syntax: az iot central user create --user-id {userId} --app-id {appId} --tenant-id {tenantId} --object-id {objectId} --role operator
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --assignee --user-id
+    summary: ID associated with the user.
+    description: ''
+  - isRequired: true
+    name: --role -r
+    parameterValueGroup: admin, builder, operator
+    summary: The role that will be associated with this token. You can specify one of the built-in roles, or specify the role ID of a custom role. See more at https://aka.ms/iotcentral-customrolesdocs.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --email
+    summary: Email address of user to be added to the app.
+    description: ''
+  - name: --object-id --oid
+    summary: Object ID for service principal to be added to the app. Tenant ID must also be specified.
+    description: ''
+  - name: --tenant-id --tnid
+    summary: Tenant ID for service principal to be added to the app. Object ID must also be specified.
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_user_delete
+  name: az iot central user delete
+  summary: Delete a user from the application.
+  description: ''
+  syntax: >-
+    az iot central user delete --app-id
+                               --assignee
+                               [--api-version {1.0, preview}]
+                               [--central-api-uri]
+                               [--token]
+  examples:
+  - summary: Delete a user
+    syntax: az iot central user delete --app-id {appid} --user-id {userId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --assignee --user-id
+    summary: ID associated with the user.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_user_list
+  name: az iot central user list
+  summary: Get list of users in an application.
+  description: ''
+  syntax: >-
+    az iot central user list --app-id
+                             [--api-version {1.0, preview}]
+                             [--central-api-uri]
+                             [--token]
+  examples:
+  - summary: List of users
+    syntax: az iot central user list --app-id {appid}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+- uid: az_iot_central_user_show
+  name: az iot central user show
+  summary: Get the details of a user by ID.
+  description: ''
+  syntax: >-
+    az iot central user show --app-id
+                             --assignee
+                             [--api-version {1.0, preview}]
+                             [--central-api-uri]
+                             [--token]
+  examples:
+  - summary: Get details of user
+    syntax: az iot central user show --app-id {appid} --user-id {userId}
+  requiredParameters:
+  - isRequired: true
+    name: --app-id -n
+    summary: The App ID of the IoT Central app you want to manage. You can find the App ID in the "About" page for your application under the help menu.
+    description: ''
+  - isRequired: true
+    name: --assignee --user-id
+    summary: ID associated with the user.
+    description: ''
+  optionalParameters:
+  - name: --api-version --av
+    defaultValue: "1.0"
+    parameterValueGroup: 1.0, preview
+    summary: The API version for the requested operation.
+    description: ''
+  - name: --central-api-uri --central-dns-suffix
+    defaultValue: azureiotcentral.com
+    summary: 'The IoT Central DNS suffix associated with your application. Default value is: azureiotcentral.com.'
+    description: ''
+  - name: --token
+    summary: If you'd prefer to submit your request without authenticating against the Azure CLI, you can specify a valid user token to authenticate your request. You must specify the type of key as part of the request. Learn more at https://aka.ms/iotcentraldocsapi.
+    description: ''
+commands:
+- az_iot_central_user_create
+- az_iot_central_user_delete
+- az_iot_central_user_list
+- az_iot_central_user_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure IoT Central users.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/device.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/device.yml
new file mode 100644
index 0000000000..89bdca28c4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/device.yml
@@ -0,0 +1,210 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_device
+name: az iot device
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot device** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Leverage device-to-cloud and cloud-to-device messaging capabilities.
+description: ''
+directCommands:
+- uid: az_iot_device_send-d2c-message
+  name: az iot device send-d2c-message
+  summary: Send an mqtt device-to-cloud message. The command supports sending messages with application and system properties.
+  description: ''
+  syntax: >-
+    az iot device send-d2c-message --device-id
+                                   [--da]
+                                   [--hub-name]
+                                   [--login]
+                                   [--mc]
+                                   [--properties]
+                                   [--qos {0, 1}]
+                                   [--resource-group]
+  examples:
+  - summary: Basic usage
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id}
+  - summary: Basic usage with custom data
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id} --data {message_body}
+  - summary: Send application properties
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props 'key0=value0;key1=value1'
+  - summary: Send system properties (Message Id and Correlation Id)
+    syntax: az iot device send-d2c-message -n {iothub_name} -d {device_id} --props '$.mid=<id>;$.cid=<id>'
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --da --data
+    defaultValue: Ping from Az CLI IoT Extension
+    summary: Message body.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --mc --msg-count
+    defaultValue: "1"
+    summary: Number of device messages to send to IoT Hub.
+    description: ''
+  - name: --properties --props -p
+    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.'
+    description: ''
+  - name: --qos
+    defaultValue: "1"
+    parameterValueGroup: 0, 1
+    summary: Quality of Service. 0 = At most once, 1 = At least once. 2 (Exactly once) is not supported.This command parameter has been deprecated and will be removed in the next release.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_simulate
+  name: az iot device simulate
+  summary: >-
+    Simulate a device in an Azure IoT Hub.
+
+
+    While the device simulation is running, the device will automatically receive
+
+    and acknowledge cloud-to-device (c2d) messages. For mqtt simulation, all c2d messages will
+
+    be acknowledged with completion. For http simulation c2d acknowledgement is based on user
+
+    selection which can be complete, reject or abandon.
+
+
+    Note: The command by default will set content-type to application/json and content-encoding
+
+    to utf-8. This can be overriden.
+  description: ''
+  syntax: >-
+    az iot device simulate --device-id
+                           [--da]
+                           [--hub-name]
+                           [--login]
+                           [--mc]
+                           [--mi]
+                           [--properties]
+                           [--proto {http, mqtt}]
+                           [--receive-settle {abandon, complete, reject}]
+                           [--resource-group]
+  examples:
+  - summary: Basic usage (mqtt)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id}
+  - summary: Basic usage (mqtt) with sending mixed properties
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --properties "myprop=myvalue;$.ct=application/json"
+  - summary: Basic usage (http)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --protocol http
+  - summary: Basic usage (http) with sending mixed properties
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --protocol http --properties "iothub-app-myprop=myvalue;content-type=application/json;iothub-correlationid=12345"
+  - summary: Choose total message count and interval between messages
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --msg-count 1000 --msg-interval 5
+  - summary: Reject c2d messages (http only)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --rs reject --protocol http
+  - summary: Abandon c2d messages (http only)
+    syntax: az iot device simulate -n {iothub_name} -d {device_id} --rs abandon --protocol http
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --da --data
+    defaultValue: Ping from Az CLI IoT Extension
+    summary: Message body.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --mc --msg-count
+    defaultValue: "100"
+    summary: Number of device messages to send to IoT Hub.
+    description: ''
+  - name: --mi --msg-interval
+    defaultValue: "3"
+    summary: Delay in seconds between device-to-cloud messages.
+    description: ''
+  - name: --properties --props -p
+    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d. For mqtt messaging - you are able to send system properties using $.<name>=value. For instance $.cid=12345 sets the system correlation Id property. Other system property identifier examples include $.ct for content type, $.mid for message Id and $.ce for content encoding.  For http messaging - application properties are sent using iothub-app-<name>=value, for instance iothub-app-myprop=myvalue. System properties are generally prefixed with iothub-<name> like iothub-correlationid but there are exceptions such as content-type and content-encoding.'
+    description: ''
+  - name: --proto --protocol
+    defaultValue: mqtt
+    parameterValueGroup: http, mqtt
+    summary: Indicates device-to-cloud message protocol.
+    description: ''
+  - name: --receive-settle --rs
+    defaultValue: complete
+    parameterValueGroup: abandon, complete, reject
+    summary: Indicates how to settle received cloud-to-device messages. Supported with HTTP only.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_upload-file
+  name: az iot device upload-file
+  summary: Upload a local file as a device to a pre-configured blob storage container.
+  description: ''
+  syntax: >-
+    az iot device upload-file --content-type
+                              --device-id
+                              --file-path
+                              [--hub-name]
+                              [--login]
+                              [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --content-type --ct
+    summary: MIME Type of file.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --file-path --fp
+    summary: Path to file for upload.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_device_c2d-message
+- az_iot_device_c2d-message_abandon
+- az_iot_device_c2d-message_complete
+- az_iot_device_c2d-message_purge
+- az_iot_device_c2d-message_receive
+- az_iot_device_c2d-message_reject
+- az_iot_device_c2d-message_send
+- az_iot_device_send-d2c-message
+- az_iot_device_simulate
+- az_iot_device_upload-file
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Leverage device-to-cloud and cloud-to-device messaging capabilities.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/device/c2d-message.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/device/c2d-message.yml
new file mode 100644
index 0000000000..954bfe1adf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/device/c2d-message.yml
@@ -0,0 +1,294 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_device_c2d-message
+name: az iot device c2d-message
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot device c2d-message** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Cloud-to-device messaging commands.
+description: ''
+directCommands:
+- uid: az_iot_device_c2d-message_abandon
+  name: az iot device c2d-message abandon
+  summary: Abandon a cloud-to-device message.
+  description: ''
+  syntax: >-
+    az iot device c2d-message abandon --device-id
+                                      --etag
+                                      [--hub-name]
+                                      [--login]
+                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_complete
+  name: az iot device c2d-message complete
+  summary: Complete a cloud-to-device message.
+  description: ''
+  syntax: >-
+    az iot device c2d-message complete --device-id
+                                       --etag
+                                       [--hub-name]
+                                       [--login]
+                                       [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_purge
+  name: az iot device c2d-message purge
+  summary: Purge cloud-to-device message queue for a target device.
+  description: ''
+  syntax: >-
+    az iot device c2d-message purge --device-id
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_receive
+  name: az iot device c2d-message receive
+  summary: Receive a cloud-to-device message.
+  description: 'Note: Only one message ack argument [--complete, --reject, --abandon] will be accepted.'
+  syntax: >-
+    az iot device c2d-message receive --device-id
+                                      [--abandon {false, true}]
+                                      [--complete {false, true}]
+                                      [--hub-name]
+                                      [--lock-timeout]
+                                      [--login]
+                                      [--reject {false, true}]
+                                      [--resource-group]
+  examples:
+  - summary: Basic usage
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group}
+  - summary: Receive a message and set a lock timeout of 30 seconds for that message
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group} --lt {30}
+  - summary: Receive a message and ack it as 'complete' after it is received
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group} --complete
+  - summary: Receive a message and reject it after it is received
+    syntax: az iot device c2d-message receive -d {device_id} -n {hub_name} -g {resource_group} --reject
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --abandon
+    parameterValueGroup: false, true
+    summary: Abandon the cloud-to-device message after receipt.
+    description: ''
+  - name: --complete
+    parameterValueGroup: false, true
+    summary: Complete the cloud-to-device message after receipt.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --lock-timeout --lt
+    defaultValue: "60"
+    summary: Specifies the amount of time a message will be invisible to other receive calls.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --reject
+    parameterValueGroup: false, true
+    summary: Reject the cloud-to-device message after receipt.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_reject
+  name: az iot device c2d-message reject
+  summary: Reject or deadletter a cloud-to-device message.
+  description: ''
+  syntax: >-
+    az iot device c2d-message reject --device-id
+                                     --etag
+                                     [--hub-name]
+                                     [--login]
+                                     [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_device_c2d-message_send
+  name: az iot device c2d-message send
+  summary: Send a cloud-to-device message.
+  description: >-
+    EXPERIMENTAL requires Python 3.4+
+
+    This command relies on and may install dependent Cython package (uamqp) upon first execution.
+
+    https://github.com/Azure/azure-uamqp-python.
+  syntax: >-
+    az iot device c2d-message send --device-id
+                                   [--ack {full, negative, positive}]
+                                   [--auth-type {key, login}]
+                                   [--ce]
+                                   [--cid]
+                                   [--content-type]
+                                   [--da]
+                                   [--expiry]
+                                   [--hub-name]
+                                   [--login]
+                                   [--message-id]
+                                   [--properties]
+                                   [--repair {false, true}]
+                                   [--resource-group]
+                                   [--uid]
+                                   [--wait {false, true}]
+                                   [--yes {false, true}]
+  examples:
+  - summary: Basic usage with default message body
+    syntax: az iot device c2d-message send -d {device_id} -n {iothub_name}
+  - summary: Send cloud-to-device message with custom data and properties.
+    syntax: az iot device c2d-message send -d {device_id} -n {iothub_name} --data 'Hello World' --props 'key0=value0;key1=value1'
+  - summary: Send a C2D message and wait for device acknowledgement
+    syntax: az iot device c2d-message send -d {device_id} -n {iothub_name} --ack full --wait
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --ack
+    parameterValueGroup: full, negative, positive
+    summary: 'Request the delivery of per-message feedback regarding the final state of that message. The description of ack values is as follows. Positive: If the c2d message reaches the Completed state, IoT Hub generates a feedback message. Negative: If the c2d message reaches the Dead lettered state, IoT Hub generates a feedback message. Full: IoT Hub generates a feedback message in either case. By default, no ack is requested.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --ce --content-encoding
+    defaultValue: utf-8
+    summary: The content encoding associated with the C2D message.
+    description: ''
+  - name: --cid --correlation-id
+    summary: The correlation Id associated with the C2D message.
+    description: ''
+  - name: --content-type --ct
+    summary: The content type associated with the C2D message.
+    description: ''
+  - name: --da --data
+    defaultValue: Ping from Az CLI IoT Extension
+    summary: Message body.
+    description: ''
+  - name: --expiry --expiry-time-utc
+    summary: Units are milliseconds since unix epoch. If no time is indicated the default IoT Hub C2D message TTL is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --message-id --mid
+    summary: The C2D message Id. If no message Id is provided a UUID will be generated.
+    description: ''
+  - name: --properties --props -p
+    summary: 'Message property bag in key-value pairs with the following format: a=b;c=d.'
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --uid --user-id
+    summary: The C2D message, user Id property.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: If set the c2d send operation will block until device feedback has been received.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+commands:
+- az_iot_device_c2d-message_abandon
+- az_iot_device_c2d-message_complete
+- az_iot_device_c2d-message_purge
+- az_iot_device_c2d-message_receive
+- az_iot_device_c2d-message_reject
+- az_iot_device_c2d-message_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Cloud-to-device messaging commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/dps.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/dps.yml
new file mode 100644
index 0000000000..619c5ff4e6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/dps.yml
@@ -0,0 +1,64 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps
+name: az iot dps
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
+description: ''
+directCommands:
+- uid: az_iot_dps_compute-device-key
+  name: az iot dps compute-device-key
+  summary: Generate a derived device SAS key.
+  description: Generate a derived device key from a DPS enrollment group symmetric key.
+  syntax: >-
+    az iot dps compute-device-key --key
+                                  --registration-id
+  examples:
+  - summary: Basic usage
+    syntax: az iot dps compute-device-key --key {enrollement_group_symmetric_key} --registration-id {registration_id}
+  requiredParameters:
+  - isRequired: true
+    name: --key --symmetric-key
+    summary: The symmetric shared access key for the enrollment group.
+    description: ''
+  - isRequired: true
+    name: --registration-id
+    summary: ID of device registration.
+    description: ''
+commands:
+- az_iot_dps_compute-device-key
+- az_iot_dps_enrollment
+- az_iot_dps_enrollment_create
+- az_iot_dps_enrollment_delete
+- az_iot_dps_enrollment_list
+- az_iot_dps_enrollment_show
+- az_iot_dps_enrollment_update
+- az_iot_dps_enrollment-group
+- az_iot_dps_enrollment-group_create
+- az_iot_dps_enrollment-group_delete
+- az_iot_dps_enrollment-group_list
+- az_iot_dps_enrollment-group_show
+- az_iot_dps_enrollment-group_update
+- az_iot_dps_registration
+- az_iot_dps_registration_delete
+- az_iot_dps_registration_list
+- az_iot_dps_registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage entities in an Azure IoT Hub Device Provisioning Service. Augmented with the IoT extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/dps/enrollment-group.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/dps/enrollment-group.yml
new file mode 100644
index 0000000000..f3413f50fc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/dps/enrollment-group.yml
@@ -0,0 +1,326 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps_enrollment-group
+name: az iot dps enrollment-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps enrollment-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure IoT Hub Device Provisioning Service.
+description: ''
+directCommands:
+- uid: az_iot_dps_enrollment-group_create
+  name: az iot dps enrollment-group create
+  summary: Create an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group create --dps-name
+                                       --enrollment-id
+                                       --resource-group
+                                       [--allocation-policy {custom, geolatency, hashed, static}]
+                                       [--api-version]
+                                       [--ca-name]
+                                       [--certificate-path]
+                                       [--edge-enabled {false, true}]
+                                       [--hn]
+                                       [--ih]
+                                       [--initial-twin-properties]
+                                       [--initial-twin-tags]
+                                       [--pk]
+                                       [--provisioning-status {disabled, enabled}]
+                                       [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                       [--scn]
+                                       [--scp]
+                                       [--secondary-key]
+                                       [--webhook-url]
+  examples:
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using an intermediate certificate as primary certificate'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} using a CA certificate {certificate_name} as secondary certificate'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name}
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service 'MyDps' in the resource group '{resource_group_name}' with provisioning status 'enabled', target IoT Hub '{iothub_host_name}', initial twin properties '{"location":{"region":"US"}}' and initial twin tags '{"version_dps":"1"}' using an intermediate certificate as primary certificate'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/Certificate.pem --provisioning-status enabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --initial-twin-tags "{'version_dps':'1'}"
+  - summary: Create an enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name} with attestation type 'symmetrickey'.
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {primary_key} --secondary-key {secondary_key}
+  - summary: Create an enrollment group '{enrollment_id}' with custom allocation policy,
+    syntax: az iot dps enrollment-group create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy custom --webhook-url {webhook_url} --api-version {api_version}
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --ca-name --cn --root-ca-name
+    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scn --secondary-ca-name --secondary-root-ca-name
+    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+- uid: az_iot_dps_enrollment-group_delete
+  name: az iot dps enrollment-group delete
+  summary: Delete an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group delete --dps-name
+                                       --enrollment-id
+                                       --resource-group
+                                       [--etag]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+- uid: az_iot_dps_enrollment-group_list
+  name: az iot dps enrollment-group list
+  summary: List enrollments groups in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group list --dps-name
+                                     --resource-group
+                                     [--top]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --top
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_dps_enrollment-group_show
+  name: az iot dps enrollment-group show
+  summary: Get the details of an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group show --dps-name
+                                     --enrollment-id
+                                     --resource-group
+                                     [--keys {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot dps enrollment-group show --dps-name {dps_name} -g {resource_group} --enrollment-id {enrollment_id}
+  - summary: Include full attestation information in results for a symmetric key enrollment-group
+    syntax: az iot dps enrollment-group show --dps-name {dps_name} -g {resource_group} --enrollment-id {symmetric_key_enrollment_id} --show-keys
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --keys --show-keys
+    parameterValueGroup: false, true
+    summary: Include attestation keys and information in enrollment group results.
+    description: ''
+- uid: az_iot_dps_enrollment-group_update
+  name: az iot dps enrollment-group update
+  summary: Update an enrollment group in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment-group update --dps-name
+                                       --enrollment-id
+                                       --resource-group
+                                       [--allocation-policy {custom, geolatency, hashed, static}]
+                                       [--api-version]
+                                       [--ca-name]
+                                       [--certificate-path]
+                                       [--edge-enabled {false, true}]
+                                       [--etag]
+                                       [--hn]
+                                       [--ih]
+                                       [--initial-twin-properties]
+                                       [--initial-twin-tags]
+                                       [--pk]
+                                       [--provisioning-status {disabled, enabled}]
+                                       [--rc {false, true}]
+                                       [--remove-secondary-certificate {false, true}]
+                                       [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                       [--scn]
+                                       [--scp]
+                                       [--secondary-key]
+                                       [--webhook-url]
+  examples:
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with initial twin properties and initial twin tags.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-properties "{'location':{'region':'USA'}}" --initial-twin-tags "{'version_dps':'2'}" --etag AAAAAAAAAAA=
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary intermediate certificate and remove existing secondary intermediate certificate.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --remove-secondary-certificate --etag AAAAAAAAAAA=
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new secondary CA certificate '{certificate_name}' and remove existing primary CA certificate.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --secondary-ca-name {certificate_name} --remove-certificate --etag AAAAAAAAAAA=
+  - summary: Update enrollment group '{enrollment_id}' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}' with new primary key.
+    syntax: az iot dps enrollment-group update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --ca-name --cn --root-ca-name
+    summary: The name of the primary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --rc --remove-certificate
+    parameterValueGroup: false, true
+    summary: Remove current primary certificate.
+    description: ''
+  - name: --remove-secondary-certificate --rsc
+    parameterValueGroup: false, true
+    summary: Remove current secondary certificate.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scn --secondary-ca-name --secondary-root-ca-name
+    summary: The name of the secondary root CA certificate. If attestation with a root CA certificate is desired then a root ca name must be provided.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate. If attestation with an intermediate certificate is desired then a certificate path must be provided.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+commands:
+- az_iot_dps_enrollment-group_create
+- az_iot_dps_enrollment-group_delete
+- az_iot_dps_enrollment-group_list
+- az_iot_dps_enrollment-group_show
+- az_iot_dps_enrollment-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure IoT Hub Device Provisioning Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/dps/enrollment.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/dps/enrollment.yml
new file mode 100644
index 0000000000..8fcf0fae5d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/dps/enrollment.yml
@@ -0,0 +1,342 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps_enrollment
+name: az iot dps enrollment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps enrollment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
+description: ''
+directCommands:
+- uid: az_iot_dps_enrollment_create
+  name: az iot dps enrollment create
+  summary: Create a device enrollment in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment create --at {symmetricKey, tpm, x509}
+                                 --dps-name
+                                 --enrollment-id
+                                 --resource-group
+                                 [--allocation-policy {custom, geolatency, hashed, static}]
+                                 [--api-version]
+                                 [--certificate-path]
+                                 [--device-id]
+                                 [--edge-enabled {false, true}]
+                                 [--ek]
+                                 [--hn]
+                                 [--ih]
+                                 [--initial-twin-properties]
+                                 [--initial-twin-tags]
+                                 [--pk]
+                                 [--provisioning-status {disabled, enabled}]
+                                 [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                 [--scp]
+                                 [--secondary-key]
+                                 [--webhook-url]
+  examples:
+  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT provisioning service '{dps_name}' in the resource group '{resource_group_name}'
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem
+  - summary: Create an enrollment '{enrollment_id}' with attestation type 'x509' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with provisioning status 'disabled', target IoT Hub '{iothub_host_name}', device id '{device_id}', initial twin properties '{"location":{"region":"US"}}' and initial twin tags '{"version":"1"}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type x509 --certificate-path /certificates/Certificate.pem --provisioning-status disabled --iot-hub-host-name {iothub_host_name} --initial-twin-properties "{'location':{'region':'US'}}" --initial-twin-tags "{'version':'1'}" --device-id {device_id}
+  - summary: Create an enrollment 'MyEnrollment' with attestation type 'tpm' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
+  - summary: Create an enrollment 'MyEnrollment' with attestation type 'symmetrickey' in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --primary-key {primary_key} --secondary-key {secondary_key}
+  - summary: Create an enrollment 'MyEnrollment' with reprovision in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --reprovision-policy {reprovision_type} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89
+  - summary: Create an enrollment 'MyEnrollment' with static allocation policy in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy static --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs {iot_hub_host_name}
+  - summary: Create an enrollment 'MyEnrollment' with hashed allocation policy and multiple hubs in the Azure IoT Device Provisioning service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type tpm --allocation-policy hashed --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2}"
+  - summary: Create an enrollment 'MyEnrollment' with custom allocation policy,
+    syntax: az iot dps enrollment create -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --attestation-type symmetrickey --allocation-policy custom --webhook-url {webhook_url} --api-version {api_version}
+  requiredParameters:
+  - isRequired: true
+    name: --at --attestation-type
+    parameterValueGroup: symmetricKey, tpm, x509
+    summary: Attestation Mechanism.
+    description: ''
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --device-id -d
+    summary: IoT Hub Device ID.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device. When choosing tpm as attestation type, endorsement key is required.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+- uid: az_iot_dps_enrollment_delete
+  name: az iot dps enrollment delete
+  summary: Delete a device enrollment in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment delete --dps-name
+                                 --enrollment-id
+                                 --resource-group
+                                 [--etag]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+- uid: az_iot_dps_enrollment_list
+  name: az iot dps enrollment list
+  summary: List device enrollments in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment list --dps-name
+                               --resource-group
+                               [--top]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --top
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_dps_enrollment_show
+  name: az iot dps enrollment show
+  summary: Get device enrollment details in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment show --dps-name
+                               --enrollment-id
+                               --resource-group
+                               [--keys {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot dps enrollment show --dps-name {dps_name} -g {resource_group} --enrollment-id {enrollment_id}
+  - summary: Include full attestation information in results for a symmetric key enrollment
+    syntax: az iot dps enrollment show --dps-name {dps_name} -g {resource_group} --enrollment-id {symmetric_key_enrollment_id} --show-keys
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --keys --show-keys
+    parameterValueGroup: false, true
+    summary: Include attestation keys and information in enrollment results.
+    description: ''
+- uid: az_iot_dps_enrollment_update
+  name: az iot dps enrollment update
+  summary: Update a device enrollment in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps enrollment update --dps-name
+                                 --enrollment-id
+                                 --resource-group
+                                 [--allocation-policy {custom, geolatency, hashed, static}]
+                                 [--api-version]
+                                 [--certificate-path]
+                                 [--device-id]
+                                 [--edge-enabled {false, true}]
+                                 [--ek]
+                                 [--etag]
+                                 [--hn]
+                                 [--ih]
+                                 [--initial-twin-properties]
+                                 [--initial-twin-tags]
+                                 [--pk]
+                                 [--provisioning-status {disabled, enabled}]
+                                 [--rc {false, true}]
+                                 [--remove-secondary-certificate {false, true}]
+                                 [--reprovision-policy {never, reprovisionandmigratedata, reprovisionandresetdata}]
+                                 [--scp]
+                                 [--secondary-key]
+                                 [--webhook-url]
+  examples:
+  - summary: Update enrollment '{enrollment_id}' with a new x509 certificate in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --certificate-path /certificates/NewCertificate.pem --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new endorsement key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --endorsement-key 14963E8F3BA5B3984110B3C1CA8E8B89 --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new primary key in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --primary-key {new_primary_key} --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new reprovision type in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --reprovision-policy {reprovision_type} --etag AAAAAAAAAAA=
+  - summary: Update enrollment '{enrollment_id}' with a new allocation policy in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --allocation-policy geolatency --etag AAAAAAAAAAA= --iot-hubs "{iot_hub_host_name1} {iot_hub_host_name2} {iot_hub_host_name3}"
+  - summary: Update enrollment '{enrollment_id}' in the Azure IoT Device Provisioning Service '{dps_name}' in the resource group '{resource_group_name}' with initial twin properties '{"location":{"region":"USA"}}' and initial twin tags '{"version":"2"}'.
+    syntax: az iot dps enrollment update -g {resource_group_name} --dps-name {dps_name} --enrollment-id {enrollment_id} --initial-twin-properties "{'location':{'region':'USA'}}" --initial-twin-tags "{'version1':'2'}"
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of device enrollment record.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allocation-policy --ap
+    parameterValueGroup: custom, geolatency, hashed, static
+    summary: Type of allocation for device assigned to the Hub.
+    description: ''
+  - name: --api-version --av
+    summary: 'The API version of the provisioning service types sent in the custom allocation request. Minimum supported version: 2018-09-01-preview.'
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate.
+    description: ''
+  - name: --device-id -d
+    summary: IoT Hub Device ID.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hn --iot-hub-host-name
+    summary: Host name of target IoT Hub.
+    description: ''
+  - name: --ih --iot-hubs
+    summary: Host name of target IoT Hub. Use space-separated list for multiple IoT Hubs.
+    description: ''
+  - name: --initial-twin-properties --props
+    summary: Initial twin properties.
+    description: ''
+  - name: --initial-twin-tags --tags
+    summary: Initial twin tags.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --provisioning-status --ps
+    parameterValueGroup: disabled, enabled
+    summary: Enable or disable enrollment entry.
+    description: ''
+  - name: --rc --remove-certificate
+    parameterValueGroup: false, true
+    summary: Remove current primary certificate.
+    description: ''
+  - name: --remove-secondary-certificate --rsc
+    parameterValueGroup: false, true
+    summary: Remove current secondary certificate.
+    description: ''
+  - name: --reprovision-policy --rp
+    parameterValueGroup: never, reprovisionandmigratedata, reprovisionandresetdata
+    summary: Device data to be handled on re-provision to different Iot Hub.
+    description: ''
+  - name: --scp --secondary-certificate-path
+    summary: The path to the file containing the secondary certificate.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --webhook-url --wh
+    summary: The webhook URL used for custom allocation requests.
+    description: ''
+commands:
+- az_iot_dps_enrollment_create
+- az_iot_dps_enrollment_delete
+- az_iot_dps_enrollment_list
+- az_iot_dps_enrollment_show
+- az_iot_dps_enrollment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage enrollments in an Azure IoT Hub Device Provisioning Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/dps/registration.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/dps/registration.yml
new file mode 100644
index 0000000000..75d6e0b705
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/dps/registration.yml
@@ -0,0 +1,99 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_dps_registration
+name: az iot dps registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot dps registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure IoT Hub Device Provisioning Service registrations.
+description: ''
+directCommands:
+- uid: az_iot_dps_registration_delete
+  name: az iot dps registration delete
+  summary: Delete a device registration in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps registration delete --dps-name
+                                   --registration-id
+                                   --resource-group
+                                   [--etag]
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --registration-id
+    summary: ID of device registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+- uid: az_iot_dps_registration_list
+  name: az iot dps registration list
+  summary: List device registration state in an Azure IoT Hub Device Provisioning Service enrollment group.
+  description: ''
+  syntax: >-
+    az iot dps registration list --dps-name
+                                 --enrollment-id
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --enrollment-id
+    summary: ID of enrollment group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_dps_registration_show
+  name: az iot dps registration show
+  summary: Get the device registration state in an Azure IoT Hub Device Provisioning Service.
+  description: ''
+  syntax: >-
+    az iot dps registration show --dps-name
+                                 --registration-id
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --dps-name
+    summary: Name of the Azure IoT Hub device provisioning service.
+    description: ''
+  - isRequired: true
+    name: --registration-id
+    summary: ID of device registration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_dps_registration_delete
+- az_iot_dps_registration_list
+- az_iot_dps_registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure IoT Hub Device Provisioning Service registrations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/edge.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/edge.yml
new file mode 100644
index 0000000000..551cf2387f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/edge.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_edge
+name: az iot edge
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot edge** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT solutions on the Edge.
+description: ''
+directCommands:
+- uid: az_iot_edge_set-modules
+  name: az iot edge set-modules
+  summary: Set edge modules on a single device.
+  description: >-
+    Modules content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
+
+
+    Note: Upon execution the command will output the collection of modules applied to the device.
+  syntax: >-
+    az iot edge set-modules --content
+                            --device-id
+                            [--auth-type {key, login}]
+                            [--hub-name]
+                            [--login]
+                            [--resource-group]
+  examples:
+  - summary: Test edge modules while in development by setting modules on a target device.
+    syntax: az iot edge set-modules --hub-name {iothub_name} --device-id {device_id} --content ../modules_content.json
+  requiredParameters:
+  - isRequired: true
+    name: --content -k
+    summary: IoT Edge deployment content. Provide file path or raw json.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_edge_deployment
+- az_iot_edge_deployment_create
+- az_iot_edge_deployment_delete
+- az_iot_edge_deployment_list
+- az_iot_edge_deployment_show
+- az_iot_edge_deployment_show-metric
+- az_iot_edge_deployment_update
+- az_iot_edge_set-modules
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT solutions on the Edge.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/edge/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/edge/deployment.yml
new file mode 100644
index 0000000000..aa3945e56f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/edge/deployment.yml
@@ -0,0 +1,312 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_edge_deployment
+name: az iot edge deployment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot edge deployment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Edge deployments at scale.
+description: ''
+directCommands:
+- uid: az_iot_edge_deployment_create
+  name: az iot edge deployment create
+  summary: Create an IoT Edge deployment in a target IoT Hub.
+  description: >-
+    Deployment content is json and in the form of {"modulesContent":{...}} or {"content":{"modulesContent":{...}}}.
+
+
+    Edge deployments can be created with user defined metrics for on demand evaluation.
+
+    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
+  syntax: >-
+    az iot edge deployment create --content
+                                  --deployment-id
+                                  [--auth-type {key, login}]
+                                  [--hub-name]
+                                  [--lab]
+                                  [--layered {false, true}]
+                                  [--login]
+                                  [--metrics]
+                                  [--no-validation {false, true}]
+                                  [--pri]
+                                  [--resource-group]
+                                  [--target-condition]
+  examples:
+  - summary: Create a deployment with labels (bash syntax example) that applies for devices in 'building 9' and the environment is 'test'.
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels '{"key0":"value0", "key1":"value1"}' --target-condition "tags.building=9 and tags.environment='test'" --priority 3
+  - summary: Create a deployment with labels (powershell syntax example) that applies for devices tagged with environment 'dev'.
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content modules_content.json --labels "{'key':'value'}" --target-condition "tags.environment='dev'"
+  - summary: Create a layered deployment that applies for devices tagged with environment 'dev'. Both user metrics and modules content defined inline (powershell syntax example).
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content "{'modulesContent':{'`$edgeAgent':{'properties.desired.modules.mymodule0':{ }},'`$edgeHub':{'properties.desired.routes.myroute0':'FROM /messages/* INTO `$upstream'}}}" --target-condition "tags.environment='dev'" --priority 10 --metrics "{'queries':{'mymetrik':'SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200'}}" --layered
+  - summary: Create a layered deployment that applies for devices in 'building 9' and environment 'test'. Both user metrics and modules content defined inline (bash syntax example).
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content '{"modulesContent":{"$edgeAgent":{"properties.desired.modules.mymodule0":{ }},"$edgeHub":{"properties.desired.routes.myroute0":"FROM /messages/* INTO $upstream"}}}' --target-condition "tags.building=9 and tags.environment='test'" --metrics '{"queries":{"mymetrik":"SELECT deviceId from devices where properties.reported.lastDesiredStatus.code = 200"}}' --layered
+  - summary: Create a layered deployment that applies for devices in 'building 9' and environment 'test'. Both user metrics and modules content defined from file.
+    syntax: az iot edge deployment create -d {deployment_name} -n {iothub_name} --content layered_modules_content.json --target-condition "tags.building=9 and tags.environment='test'" --metrics metrics_content.json --layered
+  requiredParameters:
+  - isRequired: true
+    name: --content -k
+    summary: IoT Edge deployment content. Provide file path or raw json.
+    description: ''
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --lab --labels
+    summary: "Map of labels to be applied to target deployment. Use the following format: '{\"key0\":\"value0\", \"key1\":\"value1\"}'."
+    description: ''
+  - name: --layered
+    parameterValueGroup: false, true
+    summary: Layered deployments allow you to define desired properties in $edgeAgent, $edgeHub and user modules that will layer on top of a base deployment. For example the routes specified in a layered deployment will merge with routes of the base deployment. Routes with the same name will be overwritten based on deployment priority.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metrics -m
+    summary: IoT Edge deployment metric definitions. Provide file path or raw json.
+    description: ''
+  - name: --no-validation
+    parameterValueGroup: false, true
+    summary: Disables client side schema validation for edge deployment creation.
+    description: ''
+  - name: --pri --priority
+    summary: Weight of deployment in case of competing rules (highest wins).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --target-condition --tc -t
+    summary: Target condition in which an Edge deployment applies to.
+    description: ''
+- uid: az_iot_edge_deployment_delete
+  name: az iot edge deployment delete
+  summary: Delete an IoT Edge deployment.
+  description: ''
+  syntax: >-
+    az iot edge deployment delete --deployment-id
+                                  [--auth-type {key, login}]
+                                  [--etag]
+                                  [--hub-name]
+                                  [--login]
+                                  [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_edge_deployment_list
+  name: az iot edge deployment list
+  summary: List IoT Edge deployments in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot edge deployment list [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+                                [--top]
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of deployments to return. By default all deployments are returned.
+    description: ''
+- uid: az_iot_edge_deployment_show
+  name: az iot edge deployment show
+  summary: Get the details of an IoT Edge deployment.
+  description: ''
+  syntax: >-
+    az iot edge deployment show --deployment-id
+                                [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_edge_deployment_show-metric
+  name: az iot edge deployment show-metric
+  summary: Evaluate a target system metric defined in an IoT Edge deployment.
+  description: ''
+  syntax: >-
+    az iot edge deployment show-metric --deployment-id
+                                       --metric-id
+                                       [--auth-type {key, login}]
+                                       [--hub-name]
+                                       [--login]
+                                       [--metric-type {system, user}]
+                                       [--resource-group]
+  examples:
+  - summary: Evaluate the 'appliedCount' system metric
+    syntax: az iot edge deployment show-metric -m appliedCount -d {deployment_name} -n {iothub_name} --mt system
+  - summary: Evaluate the 'myCustomMetric' user metric
+    syntax: az iot edge deployment show-metric -m myCustomMetric -d {deployment_name} -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  - isRequired: true
+    name: --metric-id -m
+    summary: Target metric for evaluation.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metric-type --mt
+    defaultValue: user
+    parameterValueGroup: system, user
+    summary: Indicates which metric collection should be used to lookup a metric.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_edge_deployment_update
+  name: az iot edge deployment update
+  summary: >-
+    Update specified properties of an IoT Edge deployment.
+
+
+    Use --set followed by property assignments for updating a deployment.
+
+
+    Note: IoT Edge deployment content is immutable. Deployment properties that can be
+
+    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
+  description: ''
+  syntax: >-
+    az iot edge deployment update --deployment-id
+                                  [--add]
+                                  [--auth-type {key, login}]
+                                  [--etag]
+                                  [--force-string]
+                                  [--hub-name]
+                                  [--login]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+  examples:
+  - summary: Alter the labels and target condition of an existing edge deployment
+    syntax: az iot edge deployment update -d {deployment_name} -n {iothub_name} --set labels='{"purpose":"dev", "owners":"IoTEngineering"}' targetCondition='tags.building=9'
+  requiredParameters:
+  - isRequired: true
+    name: --deployment-id -d
+    summary: Target deployment name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_iot_edge_deployment_create
+- az_iot_edge_deployment_delete
+- az_iot_edge_deployment_list
+- az_iot_edge_deployment_show
+- az_iot_edge_deployment_show-metric
+- az_iot_edge_deployment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Edge deployments at scale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub.yml
new file mode 100644
index 0000000000..d0929df3b8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub.yml
@@ -0,0 +1,435 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub
+name: az iot hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage entities in an Azure IoT Hub.
+description: ''
+directCommands:
+- uid: az_iot_hub_generate-sas-token
+  name: az iot hub generate-sas-token
+  summary: Generate a SAS token for a target IoT Hub, device or module.
+  description: For device SAS tokens, the policy parameter is used to access the the device registry only. Therefore the policy should have read access to the registry. For IoT Hub tokens the policy is part of the SAS.
+  syntax: >-
+    az iot hub generate-sas-token [--auth-type {key, login}]
+                                  [--device-id]
+                                  [--du]
+                                  [--hub-name]
+                                  [--key-type {primary, secondary}]
+                                  [--login]
+                                  [--module-id]
+                                  [--pn]
+                                  [--resource-group]
+  examples:
+  - summary: Generate an IoT Hub SAS token using the iothubowner policy and primary key.
+    syntax: az iot hub generate-sas-token -n {iothub_name}
+  - summary: Generate an IoT Hub SAS token using the registryRead policy and secondary key.
+    syntax: az iot hub generate-sas-token -n {iothub_name} --policy registryRead --key-type secondary
+  - summary: Generate a device SAS token using the iothubowner policy to access the {iothub_name} device registry.
+    syntax: az iot hub generate-sas-token -d {device_id} -n {iothub_name}
+  - summary: Generate a device SAS token using an IoT Hub connection string (with registry access)
+    syntax: az iot hub generate-sas-token -d {device_id} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - name: --du --duration
+    defaultValue: "3600"
+    summary: Valid token duration in seconds.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --module-id -m
+    summary: Target Module.
+    description: ''
+  - name: --pn --policy-name
+    defaultValue: iothubowner
+    summary: Shared access policy with operation permissions for target IoT Hub entity.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_invoke-device-method
+  name: az iot hub invoke-device-method
+  summary: Invoke a device method.
+  description: ''
+  syntax: >-
+    az iot hub invoke-device-method --device-id
+                                    --method-name
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--method-payload]
+                                    [--resource-group]
+                                    [--timeout]
+  examples:
+  - summary: Invoke a direct method on device from the cloud.
+    syntax: az iot hub invoke-device-method --hub-name {iothub_name} --device-id {device_id} --method-name Reboot --method-payload '{"version":"1.0"}'
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --method-name --mn
+    summary: Target method for invocation.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --method-payload --mp
+    defaultValue: '{}'
+    summary: Json payload to be passed to method. Must be file path or raw json.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --timeout --to
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait for device method result.
+    description: ''
+- uid: az_iot_hub_invoke-module-method
+  name: az iot hub invoke-module-method
+  summary: Invoke an Edge module method.
+  description: ''
+  syntax: >-
+    az iot hub invoke-module-method --device-id
+                                    --method-name
+                                    --module-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--method-payload]
+                                    [--resource-group]
+                                    [--timeout]
+  examples:
+  - summary: Invoke a direct method on edge device using a module from the cloud.
+    syntax: "az iot hub invoke-module-method -n {iothub_name} -d {device_id} -m '$edgeAgent' --method-name 'RestartModule' --method-payload '{\"schemaVersion\": \"1.0\"}'"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --method-name --mn
+    summary: Target method for invocation.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --method-payload --mp
+    defaultValue: '{}'
+    summary: Json payload to be passed to method. Must be file path or raw json.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --timeout --to
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait for device method result.
+    description: ''
+- uid: az_iot_hub_monitor-events
+  name: az iot hub monitor-events
+  summary: Monitor device telemetry & messages sent to an IoT Hub.
+  description: >-
+    EXPERIMENTAL requires Python 3.5+
+
+    This command relies on and may install dependent Cython package (uamqp) upon first execution.
+
+    https://github.com/Azure/azure-uamqp-python.
+  syntax: >-
+    az iot hub monitor-events [--cg]
+                              [--content-type]
+                              [--device-id]
+                              [--device-query]
+                              [--enqueued-time]
+                              [--hub-name]
+                              [--interface]
+                              [--login]
+                              [--module-id]
+                              [--properties {all, anno, app, sys}]
+                              [--repair {false, true}]
+                              [--resource-group]
+                              [--timeout]
+                              [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot hub monitor-events -n {iothub_name}
+  - summary: Basic usage with an IoT Hub connection string
+    syntax: az iot hub monitor-events -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
+  - summary: Basic usage when filtering on target device
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id}
+  - summary: Basic usage when filtering targeted devices with a wildcard in the ID
+    syntax: az iot hub monitor-events -n {iothub_name} -d Device*
+  - summary: Filter devices using IoT Hub query language
+    syntax: az iot hub monitor-events -n {iothub_name} -q "select * from devices where tags.location.region = 'US'"
+  - summary: Filter device and specify an Event Hub consumer group to bind to.
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id} --cg {consumer_group_name}
+  - summary: Receive message annotations (message headers)
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno
+  - summary: Receive message annotations + system properties. Never time out.
+    syntax: az iot hub monitor-events -n {iothub_name} -d {device_id} --properties anno sys --timeout 0
+  - summary: Receive all message attributes from all device messages
+    syntax: az iot hub monitor-events -n {iothub_name} --props all
+  - summary: Receive all messages and parse message payload as JSON
+    syntax: az iot hub monitor-events -n {iothub_name} --content-type application/json
+  optionalParameters:
+  - name: --cg --consumer-group -c
+    defaultValue: $Default
+    summary: Specify the consumer group to use when connecting to event hub endpoint.
+    description: ''
+  - name: --content-type --ct
+    summary: Specify the Content-Type of the message payload to automatically format the output to that type.
+    description: ''
+  - name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - name: --device-query -q
+    summary: Specify a custom query to filter devices.
+    description: ''
+  - name: --enqueued-time --et -e
+    summary: Indicates the time that should be used as a starting point to read messages from the partitions. Units are milliseconds since unix epoch. If no time is indicated "now" is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --interface -i
+    summary: 'Target interface identifier to filter on. For example: dtmi:com:example:TemperatureController;1.'
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --module-id -m
+    summary: Target Module.
+    description: ''
+  - name: --properties --props -p
+    parameterValueGroup: all, anno, app, sys
+    summary: Indicate key message properties to output. sys = system properties, app = application properties, anno = annotations.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --timeout --to -t
+    defaultValue: "300"
+    summary: Maximum seconds to maintain connection without receiving message. Use 0 for infinity.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_hub_monitor-feedback
+  name: az iot hub monitor-feedback
+  summary: Monitor feedback sent by devices to acknowledge cloud-to-device (C2D) messages.
+  description: >-
+    EXPERIMENTAL requires Python 3.4+
+
+    This command relies on and may install dependent Cython package (uamqp) upon first execution.
+
+    https://github.com/Azure/azure-uamqp-python.
+  syntax: >-
+    az iot hub monitor-feedback [--auth-type {key, login}]
+                                [--device-id]
+                                [--hub-name]
+                                [--login]
+                                [--repair {false, true}]
+                                [--resource-group]
+                                [--wait-on-msg]
+                                [--yes {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot hub monitor-feedback -n {iothub_name}
+  - summary: Basic usage with an IoT Hub connection string
+    syntax: az iot hub monitor-feedback -n {iothub_name} --login 'HostName=myhub.azure-devices.net;SharedAccessKeyName=iothubowner;SharedAccessKey=12345'
+  - summary: Basic usage when filtering on target device
+    syntax: az iot hub monitor-feedback -n {iothub_name} -d {device_id}
+  - summary: Exit feedback monitor upon receiving a message with specific id (uuid)
+    syntax: az iot hub monitor-feedback -n {iothub_name} -d {device_id} -w {message_id}
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --repair -r
+    parameterValueGroup: false, true
+    summary: 'Reinstall uamqp dependency compatible with extension version. Default: false.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --wait-on-msg -w
+    summary: Feedback monitor will block until a message with specific id (uuid) is received.
+    description: ''
+  - name: --yes -y
+    parameterValueGroup: false, true
+    summary: 'Skip user prompts. Indicates acceptance of dependency installation (if required). Used primarily for automation scenarios. Default: false.'
+    description: ''
+- uid: az_iot_hub_query
+  name: az iot hub query
+  summary: Query an IoT Hub using a powerful SQL-like language.
+  description: Query an IoT Hub using a powerful SQL-like language to retrieve information regarding device and module twins, jobs and message routing. See https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-query-language for more information.
+  syntax: >-
+    az iot hub query --query-command
+                     [--auth-type {key, login}]
+                     [--hub-name]
+                     [--login]
+                     [--resource-group]
+                     [--top]
+  examples:
+  - summary: Query all device twin data in an Azure IoT Hub.
+    syntax: az iot hub query -n {iothub_name} -q "select * from devices"
+  - summary: Query all module twin data on target device.
+    syntax: az iot hub query -n {iothub_name} -q "select * from devices.modules where devices.deviceId = '{device_id}'"
+  requiredParameters:
+  - isRequired: true
+    name: --query-command -q
+    summary: User query to be executed.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of elements to return. By default query has no cap.
+    description: ''
+commands:
+- az_iot_hub_configuration
+- az_iot_hub_configuration_create
+- az_iot_hub_configuration_delete
+- az_iot_hub_configuration_list
+- az_iot_hub_configuration_show
+- az_iot_hub_configuration_show-metric
+- az_iot_hub_configuration_update
+- az_iot_hub_connection-string
+- az_iot_hub_connection-string_show
+- az_iot_hub_device-identity
+- az_iot_hub_device-identity_children
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+- az_iot_hub_device-identity_connection-string
+- az_iot_hub_device-identity_connection-string_show
+- az_iot_hub_device-identity_create
+- az_iot_hub_device-identity_delete
+- az_iot_hub_device-identity_export
+- az_iot_hub_device-identity_import
+- az_iot_hub_device-identity_list
+- az_iot_hub_device-identity_parent
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+- az_iot_hub_device-identity_renew-key
+- az_iot_hub_device-identity_show
+- az_iot_hub_device-identity_update
+- az_iot_hub_device-twin
+- az_iot_hub_device-twin_replace
+- az_iot_hub_device-twin_show
+- az_iot_hub_device-twin_update
+- az_iot_hub_digital-twin
+- az_iot_hub_digital-twin_invoke-command
+- az_iot_hub_digital-twin_show
+- az_iot_hub_digital-twin_update
+- az_iot_hub_distributed-tracing
+- az_iot_hub_distributed-tracing_show
+- az_iot_hub_distributed-tracing_update
+- az_iot_hub_generate-sas-token
+- az_iot_hub_invoke-device-method
+- az_iot_hub_invoke-module-method
+- az_iot_hub_job
+- az_iot_hub_job_cancel
+- az_iot_hub_job_create
+- az_iot_hub_job_list
+- az_iot_hub_job_show
+- az_iot_hub_module-identity
+- az_iot_hub_module-identity_connection-string
+- az_iot_hub_module-identity_connection-string_show
+- az_iot_hub_module-identity_create
+- az_iot_hub_module-identity_delete
+- az_iot_hub_module-identity_list
+- az_iot_hub_module-identity_show
+- az_iot_hub_module-identity_update
+- az_iot_hub_module-twin
+- az_iot_hub_module-twin_replace
+- az_iot_hub_module-twin_show
+- az_iot_hub_module-twin_update
+- az_iot_hub_monitor-events
+- az_iot_hub_monitor-feedback
+- az_iot_hub_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage entities in an Azure IoT Hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/configuration.yml
new file mode 100644
index 0000000000..e2161c47a8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/configuration.yml
@@ -0,0 +1,309 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_configuration
+name: az iot hub configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT automatic device management configuration at scale.
+description: ''
+directCommands:
+- uid: az_iot_hub_configuration_create
+  name: az iot hub configuration create
+  summary: Create an IoT automatic device management configuration in a target IoT Hub.
+  description: >-
+    Configuration content is json and slighty varies based on device or module intent.
+
+
+    Device configurations are in the form of {"deviceContent":{...}} or {"content":{"deviceContent":{...}}}
+
+
+    Module configurations are in the form of {"moduleContent":{...}} or {"content":{"moduleContent":{...}}}
+
+
+    Configurations can be defined with user provided metrics for on demand evaluation.
+
+    User metrics are json and in the form of {"queries":{...}} or {"metrics":{"queries":{...}}}.
+
+
+    Note: Target condition for modules must start with "from devices.modules where".
+  syntax: >-
+    az iot hub configuration create --config-id
+                                    --content
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--lab]
+                                    [--login]
+                                    [--metrics]
+                                    [--pri]
+                                    [--resource-group]
+                                    [--target-condition]
+  examples:
+  - summary: Create a device configuration with a priority of 3 that applies on condition when a device is tagged in building 9 and the environment is 'test'.
+    syntax: az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition "tags.building=9 and tags.environment='test'" --priority 3
+  - summary: Create a device configuration with labels and provide user metrics inline (bash syntax example)
+    syntax: "az iot hub configuration create -c {config_name} -n {iothub_name} --content device_content.json --target-condition \"tags.building=9\" --labels '{\"key0\":\"value0\", \"key1\":\"value1\"}' --priority 10 --metrics '{\"metrics\": {\"queries\": {\"mymetric\": \"select deviceId from devices where tags.location='US'\"}}}'"
+  - summary: Create a module configuration with labels and provide user metrics inline (cmd syntax example)
+    syntax: "az iot hub configuration create -c {config_name} -n {iothub_name} --content module_content.json --target-condition \"from devices.modules where tags.building=9\" --labels \"{\\\"key0\\\":\\\"value0\\\", \\\"key1\\\":\\\"value1\\\"}\" --metrics \"{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\": \\\"select moduleId from devices.modules where tags.location='US'\\\"}}}\""
+  - summary: Create a module configuration with content and user metrics inline (powershell syntax example)
+    syntax: "az iot hub configuration create -c {config_name} -n {iothub_name} --content '{\\\"moduleContent\\\": {\\\"properties.desired.chillerWaterSettings\\\": {\\\"temperature\\\": 38, \\\"pressure\\\": 78}}}' --target-condition \"from devices.modules where tags.building=9\" --priority 1 --metrics '{\\\"metrics\\\": {\\\"queries\\\": {\\\"mymetric\\\":\\\"select moduleId from devices.modules where tags.location=''US''\\\"}}}'"
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  - isRequired: true
+    name: --content -k
+    summary: Device configuration content. Provide file path or raw json.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --lab --labels
+    summary: 'Map of labels to be applied to target configuration. Format example: {"key0":"value0", "key1":"value1"}.'
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metrics -m
+    summary: Device configuration metric definitions. Provide file path or raw json.
+    description: ''
+  - name: --pri --priority
+    summary: Weight of the device configuration in case of competing rules (highest wins).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --target-condition --tc -t
+    summary: Target condition in which a device configuration applies to.
+    description: ''
+- uid: az_iot_hub_configuration_delete
+  name: az iot hub configuration delete
+  summary: Delete an IoT device configuration.
+  description: ''
+  syntax: >-
+    az iot hub configuration delete --config-id
+                                    [--auth-type {key, login}]
+                                    [--etag]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_configuration_list
+  name: az iot hub configuration list
+  summary: List IoT automatic device management configurations in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub configuration list [--auth-type {key, login}]
+                                  [--hub-name]
+                                  [--login]
+                                  [--resource-group]
+                                  [--top]
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of configurations to return. By default all configurations are returned.
+    description: ''
+- uid: az_iot_hub_configuration_show
+  name: az iot hub configuration show
+  summary: Get the details of an IoT automatic device management configuration.
+  description: ''
+  syntax: >-
+    az iot hub configuration show --config-id
+                                  [--auth-type {key, login}]
+                                  [--hub-name]
+                                  [--login]
+                                  [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_configuration_show-metric
+  name: az iot hub configuration show-metric
+  summary: Evaluate a target user or system metric defined in an IoT device configuration.
+  description: ''
+  syntax: >-
+    az iot hub configuration show-metric --config-id
+                                         --metric-id
+                                         [--auth-type {key, login}]
+                                         [--hub-name]
+                                         [--login]
+                                         [--metric-type {system, user}]
+                                         [--resource-group]
+  examples:
+  - summary: Evaluate the user defined 'warningLimit' metric
+    syntax: az iot hub configuration show-metric -m warningLimit -c {configuration_name} -n {iothub_name}
+  - summary: Evaluate the system 'appliedCount' metric
+    syntax: az iot hub configuration show-metric --metric-id appliedCount -c {configuration_name} -n {iothub_name} --metric-type system
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  - isRequired: true
+    name: --metric-id -m
+    summary: Target metric for evaluation.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --metric-type --mt
+    defaultValue: user
+    parameterValueGroup: system, user
+    summary: Indicates which metric collection should be used to lookup a metric.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_configuration_update
+  name: az iot hub configuration update
+  summary: >-
+    Update specified properties of an IoT automatic device management configuration.
+
+
+    Use --set followed by property assignments for updating a configuration.
+
+
+    Note: Configuration content is immutable. Configuration properties that can be
+
+    updated are 'labels', 'metrics', 'priority' and 'targetCondition'.
+  description: ''
+  syntax: >-
+    az iot hub configuration update --config-id
+                                    [--add]
+                                    [--auth-type {key, login}]
+                                    [--etag]
+                                    [--force-string]
+                                    [--hub-name]
+                                    [--login]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+  examples:
+  - summary: Alter the priority of a device configuration and update its target condition
+    syntax: az iot hub configuration update -c {configuration_name} -n {iothub_name} --set priority=10 targetCondition="tags.building=43 and tags.environment='dev'"
+  requiredParameters:
+  - isRequired: true
+    name: --config-id -c
+    summary: Target device configuration name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_iot_hub_configuration_create
+- az_iot_hub_configuration_delete
+- az_iot_hub_configuration_list
+- az_iot_hub_configuration_show
+- az_iot_hub_configuration_show-metric
+- az_iot_hub_configuration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT automatic device management configuration at scale.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/connection-string.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/connection-string.yml
new file mode 100644
index 0000000000..ba6801b208
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/connection-string.yml
@@ -0,0 +1,76 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_connection-string
+name: az iot hub connection-string
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub connection-string** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Hub connection strings.
+description: ''
+directCommands:
+- uid: az_iot_hub_connection-string_show
+  name: az iot hub connection-string show
+  summary: Show the connection strings for the specified IoT Hubs using the given policy name and key.
+  description: ''
+  syntax: >-
+    az iot hub connection-string show [--all]
+                                      [--default-eventhub {false, true}]
+                                      [--hub-name]
+                                      [--key-type {primary, secondary}]
+                                      [--pn]
+                                      [--resource-group]
+  examples:
+  - summary: Show the connection strings for all active state IoT Hubs in a subscription using the default policy and primary key.
+    syntax: az iot hub connection-string show
+  - summary: Show the connection strings for all active state IoT Hubs in a resource group using the default policy and primary key.
+    syntax: az iot hub connection-string show --resource-group MyResourceGroup
+  - summary: Show all connection strings of the given IoT Hub using primary key.
+    syntax: az iot hub connection-string show -n MyIotHub --all
+  - summary: Show the connection string of the given IoT Hub using the default policy and primary key.
+    syntax: az iot hub connection-string show -n MyIotHub
+  - summary: Show the connection string of the given IoT Hub using policy 'service' and secondary key.
+    syntax: az iot hub connection-string show -n MyIotHub --policy-name service --key-type secondary
+  - summary: Show the eventhub compatible connection string of the given IoT Hub's default eventhub.
+    syntax: az iot hub connection-string show -n MyIotHub --default-eventhub
+  optionalParameters:
+  - name: --all --show-all
+    summary: Show all shared access policies for the respective IoT Hub.
+    description: ''
+  - name: --default-eventhub --eh
+    parameterValueGroup: false, true
+    summary: 'Flag indicating the connection string returned is for the default EventHub endpoint. Default: false.'
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --pn --policy-name
+    defaultValue: iothubowner
+    summary: Shared access policy with operation permissions for target IoT Hub entity.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_connection-string_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Hub connection strings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity.yml
new file mode 100644
index 0000000000..44dbd8480f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity.yml
@@ -0,0 +1,451 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity
+name: az iot hub device-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT devices.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_create
+  name: az iot hub device-identity create
+  summary: Create a device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub device-identity create --device-id
+                                      [--am {shared_private_key, x509_ca, x509_thumbprint}]
+                                      [--auth-type {key, login}]
+                                      [--edge-enabled {false, true}]
+                                      [--hub-name]
+                                      [--login]
+                                      [--od]
+                                      [--primary-thumbprint]
+                                      [--resource-group]
+                                      [--secondary-thumbprint]
+                                      [--sta {disabled, enabled}]
+                                      [--star]
+                                      [--valid-days]
+  examples:
+  - summary: Create an edge enabled IoT device with default authorization (shared private key).
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --ee
+  - summary: Create an IoT device with self-signed certificate authorization, generate a cert valid for 10 days then use its thumbprint.
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --valid-days 10
+  - summary: Create an IoT device with self-signed certificate authorization, generate a cert of default expiration (365 days) and output to target directory.
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --output-dir /path/to/output
+  - summary: Create an IoT device with self-signed certificate authorization and explicitly provide primary and secondary thumbprints.
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_thumbprint --ptp {thumbprint_1} --stp {thumbprint_2}
+  - summary: Create an IoT device with root CA authorization with disabled status and reason
+    syntax: az iot hub device-identity create -n {iothub_name} -d {device_id} --am x509_ca --status disabled --status-reason 'for reasons'
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --am --auth-method
+    defaultValue: shared_private_key
+    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
+    summary: The authorization type an entity is to be created with.
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --od --output-dir
+    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
+    description: ''
+  - name: --primary-thumbprint --ptp
+    summary: Explicit self-signed certificate thumbprint to use for primary key.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --secondary-thumbprint --stp
+    summary: Explicit self-signed certificate thumbprint to use for secondary key.
+    description: ''
+  - name: --sta --status
+    defaultValue: enabled
+    parameterValueGroup: disabled, enabled
+    summary: Set device status upon creation.
+    description: ''
+  - name: --star --status-reason
+    summary: Description for device status.
+    description: ''
+  - name: --valid-days --vd
+    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
+    description: ''
+- uid: az_iot_hub_device-identity_delete
+  name: az iot hub device-identity delete
+  summary: Delete an IoT Hub device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity delete --device-id
+                                      [--auth-type {key, login}]
+                                      [--etag]
+                                      [--hub-name]
+                                      [--login]
+                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_export
+  name: az iot hub device-identity export
+  summary: Export all device identities from an IoT Hub to an Azure Storage blob container. For inline blob container SAS uri input, please review the input rules of your environment.
+  description: For more information, see https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities.
+  syntax: >-
+    az iot hub device-identity export --bcu
+                                      --hub-name
+                                      [--auth-type {identity, key}]
+                                      [--identity]
+                                      [--ik {false, true}]
+                                      [--resource-group]
+  examples:
+  - summary: Export all device identities to a configured blob container and include device keys. Uses an inline SAS uri example.
+    syntax: az iot hub device-identity export -n {iothub_name} --ik --bcu 'https://mystorageaccount.blob.core.windows.net/devices?sv=2019-02-02&st=2020-08-23T22%3A35%3A00Z&se=2020-08-24T22%3A35%3A00Z&sr=c&sp=rwd&sig=VrmJ5sQtW3kLzYg10VqmALGCp4vtYKSLNjZDDJBSh9s%3D'
+  - summary: Export all device identities to a configured blob container using a file path which contains the SAS uri.
+    syntax: az iot hub device-identity export -n {iothub_name} --bcu {sas_uri_filepath}
+  - summary: Export all device identities to a configured blob container and include device keys. Uses system assigned identity that has Storage Blob Data Contributor roles for the storage account. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity export -n {iothub_name} --ik --bcu 'https://mystorageaccount.blob.core.windows.net/devices' --auth-type identity --identity [system]
+  - summary: Export all device identities to a configured blob container and include device keys. Uses user assigned managed identity that has Storage Blob Data Contributor roles for the storage account and contributor for the IoT hub. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity export -n {iothub_name} --ik --bcu 'https://mystorageaccount.blob.core.windows.net/devices' --auth-type identity --identity {managed_identity_resource_id}
+  requiredParameters:
+  - isRequired: true
+    name: --bcu --blob-container-uri
+    summary: 'Blob Shared Access Signature URI with write, read, and delete access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication an https:// URI is still required - but no SAS token is necessary. Input for this argument can be inline or from a file path.'
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type --storage-authentication-type
+    parameterValueGroup: identity, key
+    summary: Authentication type for communicating with the storage container.
+    description: ''
+  - name: --identity
+    summary: Managed identity type to determine if system assigned managed identity or user assigned managed identity is used. For system assigned managed identity, use [system]. For user assigned managed identity, provide the user assigned managed identity resource id. This identity requires a Storage Blob Data Contributor roles for the Storage Account.
+    description: ''
+  - name: --ik --include-keys
+    parameterValueGroup: false, true
+    summary: If set, keys are exported normally. Otherwise, keys are set to null in export output.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_import
+  name: az iot hub device-identity import
+  summary: Import device identities to an IoT Hub from a blob. For inline blob container SAS uri input, please review the input rules of your environment.
+  description: For more information, see https://docs.microsoft.com/azure/iot-hub/iot-hub-devguide-identity-registry#import-and-export-device-identities.
+  syntax: >-
+    az iot hub device-identity import --hub-name
+                                      --ibcu
+                                      --obcu
+                                      [--auth-type {identity, key}]
+                                      [--identity]
+                                      [--resource-group]
+  examples:
+  - summary: Import all device identities from a blob using an inline SAS uri.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri} --obcu {output_sas_uri}
+  - summary: Import all device identities from a blob using a file path which contains SAS uri.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri_filepath} --obcu {output_sas_uri_filepath}
+  - summary: Import all device identities from a blob using system assigned identity that has Storage Blob Data Contributor roles for both storage accounts. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri} --obcu {output_sas_uri} --auth-type identity --identity [system]
+  - summary: Import all device identities from a blob using user assigned managed identity that has Storage Blob Data Contributor roles for both storage accounts and contributor for the IoT hub. The blob container uri does not need the blob SAS token.
+    syntax: az iot hub device-identity import -n {iothub_name} --ibcu {input_sas_uri} --obcu {output_sas_uri} --auth-type identity --identity {managed_identity_resource_id}
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - isRequired: true
+    name: --ibcu --input-blob-container-uri
+    summary: 'Blob Shared Access Signature URI with read access to a blob container. This blob contains the operations to be performed on the identity registry. Note: when using Identity-based authentication an https:// URI is still required - but no SAS token is necessary. Input for this argument can be inline or from a file path.'
+    description: ''
+  - isRequired: true
+    name: --obcu --output-blob-container-uri
+    summary: 'Blob Shared Access Signature URI with write access to a blob container. This is used to output the status of the job and the results. Note: when using Identity-based authentication an https:// URI without the SAS token is still required. Input for this argument can be inline or from a file path.'
+    description: ''
+  optionalParameters:
+  - name: --auth-type --storage-authentication-type
+    parameterValueGroup: identity, key
+    summary: Authentication type for communicating with the storage container.
+    description: ''
+  - name: --identity
+    summary: Managed identity type to determine if system assigned managed identity or user assigned managed identity is used. For system assigned managed identity, use [system]. For user assigned managed identity, provide the user assigned managed identity resource id. This identity requires a Storage Blob Data Contributor role for the target Storage Account and Contributor role for the IoT Hub.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_list
+  name: az iot hub device-identity list
+  summary: List devices in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub device-identity list [--auth-type {key, login}]
+                                    [--edge-enabled {false, true}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+                                    [--top]
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    defaultValue: "1000"
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_hub_device-identity_renew-key
+  name: az iot hub device-identity renew-key
+  summary: Renew target keys of an IoT Hub device with sas authentication.
+  description: ''
+  syntax: >-
+    az iot hub device-identity renew-key --device-id
+                                         --hub-name
+                                         --key-type {primary, secondary, swap}
+                                         [--auth-type {key, login}]
+                                         [--etag]
+                                         [--login]
+                                         [--resource-group]
+  examples:
+  - summary: Renew the primary key.
+    syntax: az iot hub device-identity renew-key -d {device_id} -n {iothub_name} --kt primary
+  - summary: Swap the primary and secondary keys.
+    syntax: az iot hub device-identity renew-key -d {device_id} -n {iothub_name} --kt swap
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - isRequired: true
+    name: --key-type --kt
+    parameterValueGroup: primary, secondary, swap
+    summary: Target key type to regenerate.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_show
+  name: az iot hub device-identity show
+  summary: Get the details of an IoT Hub device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity show --device-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_update
+  name: az iot hub device-identity update
+  summary: Update an IoT Hub device.
+  description: Use --set followed by property assignments for updating a device. Leverage parameters returned from 'iot hub device-identity show'.
+  syntax: >-
+    az iot hub device-identity update --device-id
+                                      [--add]
+                                      [--am {shared_private_key, x509_ca, x509_thumbprint}]
+                                      [--auth-type {key, login}]
+                                      [--edge-enabled {false, true}]
+                                      [--etag]
+                                      [--force-string]
+                                      [--hub-name]
+                                      [--login]
+                                      [--pk]
+                                      [--primary-thumbprint]
+                                      [--remove]
+                                      [--resource-group]
+                                      [--secondary-key]
+                                      [--secondary-thumbprint]
+                                      [--set]
+                                      [--sta {disabled, enabled}]
+                                      [--star]
+  examples:
+  - summary: Turn on edge capabilities for device
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --set capabilities.iotEdge=true
+  - summary: Turn on edge capabilities for device using convenience argument.
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --ee
+  - summary: Disable device status
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled
+  - summary: Disable device status using convenience argument.
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --status disabled
+  - summary: In one command
+    syntax: az iot hub device-identity update -d {device_id} -n {iothub_name} --set status=disabled capabilities.iotEdge=true
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --am --auth-method
+    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
+    summary: The authorization type an entity is to be created with.
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --edge-enabled --ee
+    parameterValueGroup: false, true
+    summary: Flag indicating edge enablement.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --pk --primary-key
+    summary: The primary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --primary-thumbprint --ptp
+    summary: Explicit self-signed certificate thumbprint to use for primary key.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --secondary-key --sk
+    summary: The secondary symmetric shared access key stored in base64 format.
+    description: ''
+  - name: --secondary-thumbprint --stp
+    summary: Explicit self-signed certificate thumbprint to use for secondary key.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sta --status
+    parameterValueGroup: disabled, enabled
+    summary: Set device status upon creation.
+    description: ''
+  - name: --star --status-reason
+    summary: Description for device status.
+    description: ''
+commands:
+- az_iot_hub_device-identity_children
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+- az_iot_hub_device-identity_connection-string
+- az_iot_hub_device-identity_connection-string_show
+- az_iot_hub_device-identity_create
+- az_iot_hub_device-identity_delete
+- az_iot_hub_device-identity_export
+- az_iot_hub_device-identity_import
+- az_iot_hub_device-identity_list
+- az_iot_hub_device-identity_parent
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+- az_iot_hub_device-identity_renew-key
+- az_iot_hub_device-identity_show
+- az_iot_hub_device-identity_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT devices.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/children.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/children.yml
new file mode 100644
index 0000000000..668ffe8004
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/children.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity_children
+name: az iot hub device-identity children
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity children** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device's children device.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_children_add
+  name: az iot hub device-identity children add
+  summary: Add specified space-separated list of device ids as children of specified edge device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity children add --child-list
+                                            --device-id
+                                            [--auth-type {key, login}]
+                                            [--force]
+                                            [--hub-name]
+                                            [--login]
+                                            [--resource-group]
+  examples:
+  - summary: Add devices as a children to the edge device.
+    syntax: az iot hub device-identity children add -d {edge_device_id} --child-list {space_separated_device_id} -n {iothub_name}
+  - summary: Add devices as children to the edge device and overwrites children devices' original parent.
+    syntax: az iot hub device-identity children add -d {edge_device_id} --child-list {space_separated_device_id} -n {iothub_name} -f
+  requiredParameters:
+  - isRequired: true
+    name: --child-list --cl
+    summary: Child device list (space separated).
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --force -f
+    summary: Overwrites the child device's parent device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_children_list
+  name: az iot hub device-identity children list
+  summary: Outputs list of assigned child devices.
+  description: ''
+  syntax: >-
+    az iot hub device-identity children list --device-id
+                                             [--auth-type {key, login}]
+                                             [--hub-name]
+                                             [--login]
+                                             [--resource-group]
+  examples:
+  - summary: Show all assigned children devices as list.
+    syntax: az iot hub device-identity children list -d {edge_device_id} -n {iothub_name}
+  - summary: Show all assigned children devices as list whose device ID contains substring of 'test'.
+    syntax: az iot hub device-identity children list -d {edge_device_id} -n {iothub_name} --query "[?contains(@,'test')]"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_children_remove
+  name: az iot hub device-identity children remove
+  summary: Remove devices as children from specified edge device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity children remove --device-id
+                                               [--auth-type {key, login}]
+                                               [--child-list]
+                                               [--hub-name]
+                                               [--login]
+                                               [--remove-all]
+                                               [--resource-group]
+  examples:
+  - summary: Remove all mentioned devices as children of specified device.
+    syntax: az iot hub device-identity children remove -d {edge_device_id} --child-list {space_separated_device_id} -n {iothub_name}
+  - summary: Remove all devices as children specified edge device.
+    syntax: az iot hub device-identity children remove -d {edge_device_id} --remove-all
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --child-list --cl
+    summary: Child device list (space separated).
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove-all -a
+    summary: To remove all children.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_device-identity_children_add
+- az_iot_hub_device-identity_children_list
+- az_iot_hub_device-identity_children_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device's children device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/connection-string.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/connection-string.yml
new file mode 100644
index 0000000000..43c654f6b8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/connection-string.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity_connection-string
+name: az iot hub device-identity connection-string
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity connection-string** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device's connection string.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_connection-string_show
+  name: az iot hub device-identity connection-string show
+  summary: Show a given IoT Hub device connection string.
+  description: ''
+  syntax: >-
+    az iot hub device-identity connection-string show --device-id
+                                                      [--auth-type {key, login}]
+                                                      [--hub-name]
+                                                      [--key-type {primary, secondary}]
+                                                      [--login]
+                                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_device-identity_connection-string_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device's connection string.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/parent.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/parent.yml
new file mode 100644
index 0000000000..dd792f4ee0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-identity/parent.yml
@@ -0,0 +1,107 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-identity_parent
+name: az iot hub device-identity parent
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-identity parent** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device's parent device.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-identity_parent_set
+  name: az iot hub device-identity parent set
+  summary: Set the parent device of the specified device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity parent set --device-id
+                                          --parent-device-id
+                                          [--auth-type {key, login}]
+                                          [--force]
+                                          [--hub-name]
+                                          [--login]
+                                          [--resource-group]
+  examples:
+  - summary: Set the parent device of the specified device.
+    syntax: az iot hub device-identity parent set -d {device_id} --pd {edge_device_id} -n {iothub_name}
+  - summary: Set the parent device of the specified device and overwrites its original parent.
+    syntax: az iot hub device-identity parent set -d {device_id} --pd {edge_device_id} --force -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --parent-device-id --pd
+    summary: Id of edge device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --force -f
+    summary: Overwrites the device's parent device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-identity_parent_show
+  name: az iot hub device-identity parent show
+  summary: Get the parent device of the specified device.
+  description: ''
+  syntax: >-
+    az iot hub device-identity parent show --device-id
+                                           [--auth-type {key, login}]
+                                           [--hub-name]
+                                           [--login]
+                                           [--resource-group]
+  examples:
+  - summary: Get the parent device of the specified device.
+    syntax: az iot hub device-identity parent show -d {device_id} -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_device-identity_parent_set
+- az_iot_hub_device-identity_parent_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device's parent device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-twin.yml
new file mode 100644
index 0000000000..0890ba92aa
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/device-twin.yml
@@ -0,0 +1,168 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_device-twin
+name: az iot hub device-twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub device-twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device twin configuration.
+description: ''
+directCommands:
+- uid: az_iot_hub_device-twin_replace
+  name: az iot hub device-twin replace
+  summary: Replace device twin definition with target json.
+  description: Input json directly or use a file path.
+  syntax: >-
+    az iot hub device-twin replace --device-id
+                                   --json
+                                   [--auth-type {key, login}]
+                                   [--etag]
+                                   [--hub-name]
+                                   [--login]
+                                   [--resource-group]
+  examples:
+  - summary: Replace device twin with file contents.
+    syntax: az iot hub device-twin replace -d {device_id} -n {iothub_name} -j ../mydevicetwin.json
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --json -j
+    summary: Json to replace existing twin with. Provide file path or raw json.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-twin_show
+  name: az iot hub device-twin show
+  summary: Get a device twin definition.
+  description: ''
+  syntax: >-
+    az iot hub device-twin show --device-id
+                                [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_device-twin_update
+  name: az iot hub device-twin update
+  summary: Update device twin desired properties and tags.
+  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
+  syntax: >-
+    az iot hub device-twin update --device-id
+                                  [--add]
+                                  [--auth-type {key, login}]
+                                  [--desired]
+                                  [--etag]
+                                  [--force-string]
+                                  [--hub-name]
+                                  [--login]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--tags]
+  examples:
+  - summary: Patch device twin desired properties.
+    syntax: az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
+  - summary: Patch device twin tags.
+    syntax: "az iot hub device-twin update -n {iothub_name} -d {device_id} --tags '{\"country\": \"USA\"}'"
+  - summary: Patch removal of 'critical' desired property from parent 'temperature'
+    syntax: "az iot hub device-twin update -n {iothub_name} -d {device_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --desired
+    summary: Twin desired properties.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: Twin tags.
+    description: ''
+commands:
+- az_iot_hub_device-twin_replace
+- az_iot_hub_device-twin_show
+- az_iot_hub_device-twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device twin configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/digital-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/digital-twin.yml
new file mode 100644
index 0000000000..e3123e8194
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/digital-twin.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_digital-twin
+name: az iot hub digital-twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub digital-twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manipulate and interact with the digital twin of an IoT Hub device.
+description: ''
+directCommands:
+- uid: az_iot_hub_digital-twin_invoke-command
+  name: az iot hub digital-twin invoke-command
+  summary: Invoke a root or component level command of a digital twin device.
+  description: ''
+  syntax: >-
+    az iot hub digital-twin invoke-command --cn
+                                           --device-id
+                                           [--component-path]
+                                           [--connect-timeout]
+                                           [--hub-name]
+                                           [--login]
+                                           [--payload]
+                                           [--resource-group]
+                                           [--response-timeout]
+  examples:
+  - summary: Invoke root level command "reboot" which takes a payload that includes the "delay" property.
+    syntax: az iot hub digital-twin invoke-command --command-name reboot -n {iothub_name} -d {device_id} --payload '{"delay":5}'
+  - summary: Invoke command "getMaxMinReport" on component "thermostat1" that takes no input.
+    syntax: az iot hub digital-twin invoke-command --cn getMaxMinReport -n {iothub_name} -d {device_id} --component-path thermostat1
+  requiredParameters:
+  - isRequired: true
+    name: --cn --command-name
+    summary: Digital twin command name.
+    description: ''
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --component-path
+    summary: 'Digital twin component path. For example: thermostat1.'
+    description: ''
+  - name: --connect-timeout --cto
+    summary: Maximum interval of time, in seconds, that IoT Hub will attempt to connect to the device.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --payload
+    defaultValue: '{}'
+    summary: JSON payload input for command. Provide file path or inline JSON.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --response-timeout --rto
+    summary: Maximum interval of time, in seconds, that the digital twin command will wait for the result.
+    description: ''
+- uid: az_iot_hub_digital-twin_show
+  name: az iot hub digital-twin show
+  summary: Show the digital twin of an IoT Hub device.
+  description: ''
+  syntax: >-
+    az iot hub digital-twin show --device-id
+                                 [--hub-name]
+                                 [--login]
+                                 [--resource-group]
+  examples:
+  - summary: Show the target device digital twin.
+    syntax: az iot hub digital-twin show -n {iothub_name} -d {device_id}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_digital-twin_update
+  name: az iot hub digital-twin update
+  summary: Update the read-write properties of a digital twin device via JSON patch specification.
+  description: Currently operations are limited to add, replace and remove.
+  syntax: >-
+    az iot hub digital-twin update --device-id
+                                   --json-patch
+                                   [--etag]
+                                   [--hub-name]
+                                   [--login]
+                                   [--resource-group]
+  examples:
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: "az iot hub digital-twin update --hub-name {iothub_name} --device-id {device_id} --json-patch '{\"op\":\"add\", \"path\":\"/thermostat1/targetTemperature\", \"value\": 54}'"
+  - summary: Update a digital twin via JSON patch specification.
+    syntax: >-
+      az iot hub digital-twin update -n {iothub_name} -d {device_id} --json-patch '[
+        {"op":"remove", "path":"/thermostat1/targetTemperature"},
+        {"op":"add", "path":"/thermostat2/targetTemperature", "value": 22}
+      ]'
+  - summary: Update a digital twin property via JSON patch specification defined in a file.
+    syntax: az iot hub digital-twin update -n {iothub_name} -d {device_id} --json-patch ./my/patch/document.json
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --json-patch --patch
+    summary: An update specification described by JSON-patch. Operations are limited to add, replace and remove. Provide file path or inline JSON.
+    description: ''
+  optionalParameters:
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_digital-twin_invoke-command
+- az_iot_hub_digital-twin_show
+- az_iot_hub_digital-twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manipulate and interact with the digital twin of an IoT Hub device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/distributed-tracing.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/distributed-tracing.yml
new file mode 100644
index 0000000000..6100040a1d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/distributed-tracing.yml
@@ -0,0 +1,101 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_distributed-tracing
+name: az iot hub distributed-tracing
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub distributed-tracing** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage distributed settings per-device.
+description: ''
+directCommands:
+- uid: az_iot_hub_distributed-tracing_show
+  name: az iot hub distributed-tracing show
+  summary: Get the distributed tracing settings for a device.
+  description: ''
+  syntax: >-
+    az iot hub distributed-tracing show --device-id
+                                        --hub-name
+                                        [--auth-type {key, login}]
+                                        [--resource-group]
+  examples:
+  - summary: Get the distributed tracing settings for a device
+    syntax: az iot hub distributed-tracing show -d {device_id} -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_distributed-tracing_update
+  name: az iot hub distributed-tracing update
+  summary: Update the distributed tracing options for a device.
+  description: ''
+  syntax: >-
+    az iot hub distributed-tracing update --device-id
+                                          --hub-name
+                                          --sampling-mode {off, on}
+                                          --sampling-rate
+                                          [--auth-type {key, login}]
+                                          [--resource-group]
+  examples:
+  - summary: Update the distributed tracing options for a device
+    syntax: az iot hub distributed-tracing update -d {device_id} --sm on --sr 50 -n {iothub_name}
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - isRequired: true
+    name: --sampling-mode --sm
+    parameterValueGroup: off, on
+    summary: Turns sampling for distributed tracing on and off. 1 is On and, 2 is Off.
+    description: ''
+  - isRequired: true
+    name: --sampling-rate --sr
+    summary: Controls the amount of messages sampled for adding trace context. This value isa percentage. Only values from 0 to 100 (inclusive) are permitted.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_distributed-tracing_show
+- az_iot_hub_distributed-tracing_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage distributed settings per-device.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/job.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/job.yml
new file mode 100644
index 0000000000..d22cdb9738
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/job.yml
@@ -0,0 +1,247 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_job
+name: az iot hub job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT Hub jobs (v2).
+description: ''
+directCommands:
+- uid: az_iot_hub_job_cancel
+  name: az iot hub job cancel
+  summary: Cancel an IoT Hub job.
+  description: ''
+  syntax: >-
+    az iot hub job cancel --job-id
+                          [--auth-type {key, login}]
+                          [--hub-name]
+                          [--login]
+                          [--resource-group]
+  examples:
+  - summary: Cancel an IoT Hub job.
+    syntax: az iot hub job cancel --hub-name {iothub_name} --job-id {job_id}
+  requiredParameters:
+  - isRequired: true
+    name: --job-id
+    summary: IoT Hub job Id.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_job_create
+  name: az iot hub job create
+  summary: Create and schedule an IoT Hub job for execution.
+  description: >-
+    When scheduling a twin update job, the twin patch is a required argument.
+
+    When scheduling a device method job, the method name and payload are required arguments.
+  syntax: >-
+    az iot hub job create --job-id
+                          --job-type {scheduleDeviceMethod, scheduleUpdateTwin}
+                          [--auth-type {key, login}]
+                          [--duration]
+                          [--hub-name]
+                          [--interval]
+                          [--login]
+                          [--mct]
+                          [--method-name]
+                          [--method-payload]
+                          [--method-response-timeout]
+                          [--patch]
+                          [--query-condition]
+                          [--resource-group]
+                          [--start]
+                          [--ttl]
+                          [--wait {false, true}]
+  examples:
+  - summary: Create and schedule a job to update the twin tags of all devices.
+    syntax: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}'"
+  - summary: Schedule job and block for result of "completed", "failed" or "cancelled". Specify poll interval in seconds.
+    syntax: "az iot hub job create --job-id {job_id} --job-type scheduleUpdateTwin -n {iothub_name} -q \"*\" --twin-patch '{\"tags\": {\"deviceType\": \"Type1, Type2, Type3\"}}' --wait --poll-interval 30"
+  - summary: Create a job to update a desired twin property on a subset of devices, scheduled to run at an arbitrary future time.
+    syntax: "az iot hub job create --job-id {job_name} --job-type scheduleUpdateTwin -n {iothub_name} --twin-patch '{\"properties\":{\"desired\": {\"temperatureF\": 65}}}' --start-time \"2020-01-08T12:19:56.868Z\" --query-condition \"deviceId IN ['MyDevice1', 'MyDevice2', 'MyDevice3']\""
+  - summary: Create and schedule a job to invoke a device method for a set of devices meeting a query condition.
+    syntax: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -n {iothub_name} --method-name setSyncIntervalSec --method-payload 30 --query-condition "properties.reported.settings.syncIntervalSec != 30"
+  - summary: Create and schedule a job to invoke a device method for all devices.
+    syntax: az iot hub job create --job-id {job_name} --job-type scheduleDeviceMethod -q "*" -n {iothub_name} --method-name setSyncIntervalSec --method-payload '{"version":"1.0"}'
+  requiredParameters:
+  - isRequired: true
+    name: --job-id
+    summary: IoT Hub job Id.
+    description: ''
+  - isRequired: true
+    name: --job-type --jt
+    parameterValueGroup: scheduleDeviceMethod, scheduleUpdateTwin
+    summary: The type of scheduled job.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --duration --poll-duration
+    defaultValue: "600"
+    summary: Total duration in seconds where job status will be checked if --wait flag is passed in.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --interval --poll-interval
+    defaultValue: "10"
+    summary: Interval in seconds that job status will be checked if --wait flag is passed in.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --mct --method-connect-timeout
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait on device connection.
+    description: ''
+  - name: --method-name --mn
+    summary: Target method for invocation.
+    description: ''
+  - name: --method-payload --mp
+    summary: Json payload to be passed to method. Must be file path or raw json.
+    description: ''
+  - name: --method-response-timeout --mrt
+    defaultValue: "30"
+    summary: Maximum number of seconds to wait for device method result.
+    description: ''
+  - name: --patch --twin-patch
+    summary: The desired twin patch. Provide file path or raw json.
+    description: ''
+  - name: --query-condition -q
+    summary: 'Condition for device query to get devices to execute the job on. Required if job type is scheduleDeviceMethod or scheduleUpdateTwin. Note: The service will prefix "SELECT \* FROM devices WHERE " to the input.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start --start-time
+    summary: The scheduled start of the job in ISO 8601 date time format. If no start time is provided, the job is queued for asap execution.
+    description: ''
+  - name: --ttl
+    defaultValue: "3600"
+    summary: Max execution time in seconds, before job is terminated.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: Block until the created job is in a completed, failed or cancelled state. Will regularly poll on interval specified by --poll-interval.
+    description: ''
+- uid: az_iot_hub_job_list
+  name: az iot hub job list
+  summary: List the historical jobs of an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub job list [--auth-type {key, login}]
+                        [--hub-name]
+                        [--job-status {cancelled, completed, enqueued, failed, queued, running, scheduled, unknown}]
+                        [--job-type {export, import, scheduleDeviceMethod, scheduleUpdateTwin}]
+                        [--login]
+                        [--resource-group]
+                        [--top]
+  examples:
+  - summary: List all archived jobs within retention period (max of 30 days).
+    syntax: az iot hub job list --hub-name {iothub_name}
+  - summary: List all archived jobs projecting specific properties
+    syntax: az iot hub job list --hub-name {iothub_name} --query "[*].[jobId,type,status,startTime,endTime]"
+  - summary: List only update twin type jobs
+    syntax: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod
+  - summary: List device method jobs which have status "scheduled"
+    syntax: az iot hub job list --hub-name {iothub_name} --job-type scheduleDeviceMethod --job-status scheduled
+  - summary: List device export jobs which have status "completed"
+    syntax: az iot hub job list --hub-name {iothub_name} --job-type export --job-status completed
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --job-status --js
+    parameterValueGroup: cancelled, completed, enqueued, failed, queued, running, scheduled, unknown
+    summary: The status of a scheduled job.
+    description: ''
+  - name: --job-type --jt
+    parameterValueGroup: export, import, scheduleDeviceMethod, scheduleUpdateTwin
+    summary: The type of scheduled job.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_hub_job_show
+  name: az iot hub job show
+  summary: Show details of an existing IoT Hub job.
+  description: ''
+  syntax: >-
+    az iot hub job show --job-id
+                        [--auth-type {key, login}]
+                        [--hub-name]
+                        [--login]
+                        [--resource-group]
+  examples:
+  - summary: Show the details of a created job.
+    syntax: az iot hub job show --hub-name {iothub_name} --job-id {job_id}
+  requiredParameters:
+  - isRequired: true
+    name: --job-id
+    summary: IoT Hub job Id.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_job_cancel
+- az_iot_hub_job_create
+- az_iot_hub_job_list
+- az_iot_hub_job_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT Hub jobs (v2).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-identity.yml
new file mode 100644
index 0000000000..e2d65796d3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-identity.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_module-identity
+name: az iot hub module-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub module-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device modules.
+description: ''
+directCommands:
+- uid: az_iot_hub_module-identity_create
+  name: az iot hub module-identity create
+  summary: Create a module on a target IoT device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity create --device-id
+                                      --module-id
+                                      [--am {shared_private_key, x509_ca, x509_thumbprint}]
+                                      [--auth-type {key, login}]
+                                      [--hub-name]
+                                      [--login]
+                                      [--od]
+                                      [--primary-thumbprint]
+                                      [--resource-group]
+                                      [--secondary-thumbprint]
+                                      [--valid-days]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --am --auth-method
+    defaultValue: shared_private_key
+    parameterValueGroup: shared_private_key, x509_ca, x509_thumbprint
+    summary: The authorization type an entity is to be created with.
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --od --output-dir
+    summary: Generate self-signed cert and use its thumbprint. Output to specified target directory.
+    description: ''
+  - name: --primary-thumbprint --ptp
+    summary: Explicit self-signed certificate thumbprint to use for primary key.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --secondary-thumbprint --stp
+    summary: Explicit self-signed certificate thumbprint to use for secondary key.
+    description: ''
+  - name: --valid-days --vd
+    summary: 'Generate self-signed cert and use its thumbprint. Valid for specified number of days. Default: 365.'
+    description: ''
+- uid: az_iot_hub_module-identity_delete
+  name: az iot hub module-identity delete
+  summary: Delete a device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity delete --device-id
+                                      --module-id
+                                      [--auth-type {key, login}]
+                                      [--etag]
+                                      [--hub-name]
+                                      [--login]
+                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-identity_list
+  name: az iot hub module-identity list
+  summary: List modules located on an IoT device in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity list --device-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+                                    [--top]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    defaultValue: "1000"
+    summary: Maximum number of elements to return. Use -1 for unlimited.
+    description: ''
+- uid: az_iot_hub_module-identity_show
+  name: az iot hub module-identity show
+  summary: Get the details of an IoT device module in an IoT Hub.
+  description: ''
+  syntax: >-
+    az iot hub module-identity show --device-id
+                                    --module-id
+                                    [--auth-type {key, login}]
+                                    [--hub-name]
+                                    [--login]
+                                    [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-identity_update
+  name: az iot hub module-identity update
+  summary: Update an IoT Hub device module.
+  description: Use --set followed by property assignments for updating a module. Leverage properties returned from 'iot hub module-identity show'.
+  syntax: >-
+    az iot hub module-identity update --device-id
+                                      --module-id
+                                      [--add]
+                                      [--auth-type {key, login}]
+                                      [--etag]
+                                      [--force-string]
+                                      [--hub-name]
+                                      [--login]
+                                      [--remove]
+                                      [--resource-group]
+                                      [--set]
+  examples:
+  - summary: Regenerate module symmetric authentication keys
+    syntax: az iot hub module-identity update -m {module_name} -d {device_id} -n {iothub_name} --set authentication.symmetricKey.primaryKey="" authentication.symmetricKey.secondaryKey=""
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_iot_hub_module-identity_connection-string
+- az_iot_hub_module-identity_connection-string_show
+- az_iot_hub_module-identity_create
+- az_iot_hub_module-identity_delete
+- az_iot_hub_module-identity_list
+- az_iot_hub_module-identity_show
+- az_iot_hub_module-identity_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device modules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-identity/connection-string.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-identity/connection-string.yml
new file mode 100644
index 0000000000..2dc0b63e8c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-identity/connection-string.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_module-identity_connection-string
+name: az iot hub module-identity connection-string
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub module-identity connection-string** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device module's connection string.
+description: ''
+directCommands:
+- uid: az_iot_hub_module-identity_connection-string_show
+  name: az iot hub module-identity connection-string show
+  summary: Show a target IoT device module connection string.
+  description: ''
+  syntax: >-
+    az iot hub module-identity connection-string show --device-id
+                                                      --module-id
+                                                      [--auth-type {key, login}]
+                                                      [--hub-name]
+                                                      [--key-type {primary, secondary}]
+                                                      [--login]
+                                                      [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --key-type --kt
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Shared access policy key type for authentication.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_iot_hub_module-identity_connection-string_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device module's connection string.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-twin.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-twin.yml
new file mode 100644
index 0000000000..411f1e3619
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/hub/module-twin.yml
@@ -0,0 +1,183 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_hub_module-twin
+name: az iot hub module-twin
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot hub module-twin** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage IoT device module twin configuration.
+description: ''
+directCommands:
+- uid: az_iot_hub_module-twin_replace
+  name: az iot hub module-twin replace
+  summary: Replace a module twin definition with target json.
+  description: Input json directly or use a file path.
+  syntax: >-
+    az iot hub module-twin replace --device-id
+                                   --json
+                                   --module-id
+                                   [--auth-type {key, login}]
+                                   [--etag]
+                                   [--hub-name]
+                                   [--login]
+                                   [--resource-group]
+  examples:
+  - summary: Replace a module twin with file contents.
+    syntax: az iot hub module-twin replace -d {device_id} -n {iothub_name} -m {module_name} -j ../mymodtwin.json
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --json -j
+    summary: Json to replace existing twin with. Provide file path or raw json.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-twin_show
+  name: az iot hub module-twin show
+  summary: Show a module twin definition.
+  description: ''
+  syntax: >-
+    az iot hub module-twin show --device-id
+                                --module-id
+                                [--auth-type {key, login}]
+                                [--hub-name]
+                                [--login]
+                                [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_iot_hub_module-twin_update
+  name: az iot hub module-twin update
+  summary: Update module twin desired properties and tags.
+  description: Provide --desired or --tags arguments for PATCH behavior. Usage of generic update args (i.e. --set) will reflect PUT behavior and are deprecated.
+  syntax: >-
+    az iot hub module-twin update --device-id
+                                  --module-id
+                                  [--add]
+                                  [--auth-type {key, login}]
+                                  [--desired]
+                                  [--etag]
+                                  [--force-string]
+                                  [--hub-name]
+                                  [--login]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--tags]
+  examples:
+  - summary: Patch module twin desired properties.
+    syntax: az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{"conditions":{"temperature":{"warning":70, "critical":100}}}'
+  - summary: Patch module twin tags.
+    syntax: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --tags '{\"country\": \"USA\"}'"
+  - summary: Patch removal of 'critical' desired property from parent 'temperature'
+    syntax: "az iot hub module-twin update -n {iothub_name} -d {device_id} -m {module_id} --desired '{\"condition\":{\"temperature\":{\"critical\": null}}}'"
+  requiredParameters:
+  - isRequired: true
+    name: --device-id -d
+    summary: Target Device.
+    description: ''
+  - isRequired: true
+    name: --module-id -m
+    summary: Target Module.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-type
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Indicates whether the operation should auto-derive a policy key or use the current Azure AD session. You can configure the default using `az configure --defaults iothub-data-auth-type=<auth-type-value>`.
+    description: ''
+  - name: --desired
+    summary: Twin desired properties.
+    description: ''
+  - name: --etag -e
+    summary: Etag or entity tag corresponding to the last state of the resource. If no etag is provided the value '\*' is used.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --hub-name -n
+    summary: IoT Hub name.
+    description: ''
+  - name: --login -l
+    summary: This command supports an entity connection string with rights to perform action. Use to avoid session login via "az login". If both an entity connection string and name are provided the connection string takes priority.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: Twin tags.
+    description: ''
+commands:
+- az_iot_hub_module-twin_replace
+- az_iot_hub_module-twin_show
+- az_iot_hub_module-twin_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage IoT device module twin configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/product.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/product.yml
new file mode 100644
index 0000000000..97f32422a5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/product.yml
@@ -0,0 +1,44 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product
+name: az iot product
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage device testing for product certification.
+description: ''
+commands:
+- az_iot_product_requirement
+- az_iot_product_requirement_list
+- az_iot_product_test
+- az_iot_product_test_case
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+- az_iot_product_test_create
+- az_iot_product_test_run
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+- az_iot_product_test_search
+- az_iot_product_test_show
+- az_iot_product_test_task
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+- az_iot_product_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage device testing for product certification.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/product/requirement.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/product/requirement.yml
new file mode 100644
index 0000000000..4a8174feda
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/product/requirement.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_requirement
+name: az iot product requirement
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product requirement** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product certification requirements.
+description: ''
+directCommands:
+- uid: az_iot_product_requirement_list
+  name: az iot product requirement list
+  summary: Discover information about provisioning attestation methods that are supported for each badge type.
+  description: ''
+  syntax: >-
+    az iot product requirement list [--badge-type {IotDevice, IotEdgeCompatible, Pnp}]
+                                    [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product requirement list
+  optionalParameters:
+  - name: --badge-type --bt
+    defaultValue: IotDevice
+    parameterValueGroup: IotDevice, IotEdgeCompatible, Pnp
+    summary: The type of certification badge.
+    description: ''
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+commands:
+- az_iot_product_requirement_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product certification requirements.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/product/test.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test.yml
new file mode 100644
index 0000000000..68934052d8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test
+name: az iot product test
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage device tests for product certification.
+description: ''
+directCommands:
+- uid: az_iot_product_test_create
+  name: az iot product test create
+  summary: Create a new product test for product certification.
+  description: ''
+  syntax: >-
+    az iot product test create [--at {ConnectionString, SymmetricKey, TPM, X509}]
+                               [--badge-type {IotDevice, IotEdgeCompatible, Pnp}]
+                               [--base-url]
+                               [--certificate-path]
+                               [--cf]
+                               [--connection-string]
+                               [--device-type {DevKit, FinishedProduct}]
+                               [--ek]
+                               [--models]
+                               [--product-id]
+                               [--skip-provisioning]
+                               [--validation-type {Certification, Test}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test create --configuration-file {configuration_file}
+  - summary: Do not have service create provisioning configuration
+    syntax: az iot product test create --configuration-file {configuration_file} --skip-provisioning
+  - summary: Creating test with symmetric key attestation
+    syntax: az iot product test create --attestation-type SymmetricKey --device-type {device_type}
+  - summary: Creating test with TPM attestation
+    syntax: az iot product test create --attestation-type TPM --device-type {device_type} --endorsement-key {endorsement_key}
+  - summary: Creating test with x509 attestation
+    syntax: az iot product test create --attestation-type x509 --device-type {device_type} --certificate-path {certificate_path}
+  - summary: Creating test for Edge module
+    syntax: az iot product test create --attestation-type ConnectionString --device-type {device_type} --badge-type IotEdgeCompatible --connection-string {connection_string}
+  - summary: Creating test with symmetric key attestation and specified validation type
+    syntax: az iot product test create --attestation-type SymmetricKey --device-type {device_type} --validation-type Certification --product-id {product_id}
+  optionalParameters:
+  - name: --at --attestation-type
+    parameterValueGroup: ConnectionString, SymmetricKey, TPM, X509
+    summary: How the device will authenticate to testing service Device Provisioning Service.
+    description: ''
+  - name: --badge-type --bt
+    defaultValue: IotDevice
+    parameterValueGroup: IotDevice, IotEdgeCompatible, Pnp
+    summary: The type of certification badge.
+    description: ''
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --cf --configuration-file
+    summary: Path to device test JSON file. If not specified, attestation and device definition parameters must be specified.
+    description: ''
+  - name: --connection-string --cs
+    summary: Edge module connection stringWhen choosing IotEdgeCompatible badge type, connection string and attestaion-type of connection string are required.
+    description: ''
+  - name: --device-type --dt
+    parameterValueGroup: DevKit, FinishedProduct
+    summary: Defines the type of device to be tested.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device. When choosing TPM as attestation type, endorsement key is required.
+    description: ''
+  - name: --models -m
+    summary: Path containing Azure IoT Plug and Play interfaces implemented by the device being tested. When badge type is Pnp, models is required.
+    description: ''
+  - name: --product-id -p
+    summary: The submitted product id. Required when validation-type is 'Certification'.
+    description: ''
+  - name: --skip-provisioning --sp
+    summary: Determines whether the service skips generating provisioning configuration. Only applies to SymmetricKey and ConnectionString provisioning types.
+    description: ''
+  - name: --validation-type --vt
+    defaultValue: Test
+    parameterValueGroup: Certification, Test
+    summary: The type of validations testing to be performed.
+    description: ''
+- uid: az_iot_product_test_search
+  name: az iot product test search
+  summary: Search product repository for testing data.
+  description: ''
+  syntax: >-
+    az iot product test search [--base-url]
+                               [--certificate-name]
+                               [--product-id]
+                               [--registration-id]
+  examples:
+  - summary: Search by product id
+    syntax: az iot product test search --product-id {product_id}
+  - summary: Search by DPS registration
+    syntax: az iot product test search --registration-id {registration_id}
+  - summary: Search by x509 certifcate common name (CN)
+    syntax: az iot product test search --certificate-name {certificate_name}
+  - summary: Search by multiple values
+    syntax: az iot product test search --product-id {product_id} --certificate-name {certificate_name}
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --certificate-name --cn
+    summary: The x509 Certificate Common Name (cn) used for Device Provisioning Service attestation.
+    description: ''
+  - name: --product-id -p
+    summary: The submitted product id.
+    description: ''
+  - name: --registration-id -r
+    summary: The regstration Id for Device Provisioning Service.
+    description: ''
+- uid: az_iot_product_test_show
+  name: az iot product test show
+  summary: View product test data.
+  description: ''
+  syntax: >-
+    az iot product test show --test-id
+                             [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test show --test-id {test_id}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+- uid: az_iot_product_test_update
+  name: az iot product test update
+  summary: Update the product certification test data.
+  description: ''
+  syntax: >-
+    az iot product test update --test-id
+                               [--at {ConnectionString, SymmetricKey, TPM, X509}]
+                               [--badge-type {IotDevice, IotEdgeCompatible, Pnp}]
+                               [--base-url]
+                               [--certificate-path]
+                               [--cf]
+                               [--connection-string]
+                               [--ek]
+                               [--models]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test update --test-id {test_id} --configuration-file {configuration_file}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --at --attestation-type
+    parameterValueGroup: ConnectionString, SymmetricKey, TPM, X509
+    summary: How the device will authenticate to testing service Device Provisioning Service.
+    description: ''
+  - name: --badge-type --bt
+    parameterValueGroup: IotDevice, IotEdgeCompatible, Pnp
+    summary: The type of certification badge.
+    description: ''
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --certificate-path --cp
+    summary: The path to the file containing the primary certificate. When choosing x509 as attestation type, one of the certificate path is required.
+    description: ''
+  - name: --cf --configuration-file
+    summary: Path to device test JSON file. If not specified, attestation and device definition parameters must be specified.
+    description: ''
+  - name: --connection-string --cs
+    summary: Edge module connection stringWhen choosing IotEdgeCompatible badge type, connection string and attestaion-type of connection string are required.
+    description: ''
+  - name: --ek --endorsement-key
+    summary: TPM endorsement key for a TPM device. When choosing TPM as attestation type, endorsement key is required.
+    description: ''
+  - name: --models -m
+    summary: Path containing Azure IoT Plug and Play interfaces implemented by the device being tested. When badge type is Pnp, models is required.
+    description: ''
+commands:
+- az_iot_product_test_case
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+- az_iot_product_test_create
+- az_iot_product_test_run
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+- az_iot_product_test_search
+- az_iot_product_test_show
+- az_iot_product_test_task
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+- az_iot_product_test_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage device tests for product certification.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/case.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/case.yml
new file mode 100644
index 0000000000..39ea40cfcb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/case.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test_case
+name: az iot product test case
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test case** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product testing certification test cases.
+description: ''
+directCommands:
+- uid: az_iot_product_test_case_list
+  name: az iot product test case list
+  summary: List the test cases of a product certification test.
+  description: ''
+  syntax: >-
+    az iot product test case list --test-id
+                                  [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test case list --test-id {test_id}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+- uid: az_iot_product_test_case_update
+  name: az iot product test case update
+  summary: Update the product certification test case data.
+  description: ''
+  syntax: >-
+    az iot product test case update --cf
+                                    --test-id
+                                    [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test case update --test-id {test_id} --configuration-file {configuration_file}
+  requiredParameters:
+  - isRequired: true
+    name: --cf --configuration-file
+    summary: The file path for test case configuration JSON.
+    description: ''
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+commands:
+- az_iot_product_test_case_list
+- az_iot_product_test_case_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product testing certification test cases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/run.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/run.yml
new file mode 100644
index 0000000000..434108c1f1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/run.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test_run
+name: az iot product test run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product testing certification test runs.
+description: ''
+directCommands:
+- uid: az_iot_product_test_run_show
+  name: az iot product test run show
+  summary: Show the status of a testing run.
+  description: ''
+  syntax: >-
+    az iot product test run show --test-id
+                                 [--base-url]
+                                 [--interval]
+                                 [--run-id]
+                                 [--wait {false, true}]
+  examples:
+  - summary: Latest product test run
+    syntax: az iot product test run show --test-id {test_id}
+  - summary: Testing status by --run-id
+    syntax: az iot product test run show --test-id {test_id} --run-id {run_id}
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --interval --poll-interval
+    defaultValue: "3"
+    summary: Used in conjunction with --wait. Specifies how frequently (in seconds) polling occurs.
+    description: ''
+  - name: --run-id -r
+    summary: The generated Id of a test run.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: Wait until test run status is "started" or "running".
+    description: ''
+- uid: az_iot_product_test_run_submit
+  name: az iot product test run submit
+  summary: Submit a completed test run to the partner/product service.
+  description: ''
+  syntax: >-
+    az iot product test run submit --run-id
+                                   --test-id
+                                   [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test run submit --test-id {test_id} --run-id {run_id}
+  requiredParameters:
+  - isRequired: true
+    name: --run-id -r
+    summary: The generated Id of a test run.
+    description: ''
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+commands:
+- az_iot_product_test_run_show
+- az_iot_product_test_run_submit
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product testing certification test runs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/task.yml b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/task.yml
new file mode 100644
index 0000000000..cdba5281e7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/iot/product/test/task.yml
@@ -0,0 +1,124 @@
+### YamlMime:AzureCLIGroup
+uid: az_iot_product_test_task
+name: az iot product test task
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-iot** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az iot product test task** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage product testing certification tasks.
+description: ''
+directCommands:
+- uid: az_iot_product_test_task_create
+  name: az iot product test task create
+  summary: Queue a new testing task. Only one testing task can be running at a time.
+  description: ''
+  syntax: >-
+    az iot product test task create --test-id
+                                    [--base-url]
+                                    [--interval]
+                                    [--type {GenerateTestCases, QueueTestRun}]
+                                    [--wait {false, true}]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test task create --test-id {test_id}
+  - summary: Wait for completion and return test case
+    syntax: az iot product test task create --test-id {test_id} --wait
+  - summary: Wait for completion with custom polling interval to completion and return test case
+    syntax: az iot product test task create --test-id {test_id} --wait --poll-interval 5
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --interval --poll-interval
+    defaultValue: "3"
+    summary: Used in conjunction with --wait. Sepcifies how frequently (in seconds) polling occurs.
+    description: ''
+  - name: --type
+    defaultValue: QueueTestRun
+    parameterValueGroup: GenerateTestCases, QueueTestRun
+    summary: The type of task for the device test.
+    description: ''
+  - name: --wait -w
+    parameterValueGroup: false, true
+    summary: Wait for task completion and return test case data when available.
+    description: ''
+- uid: az_iot_product_test_task_delete
+  name: az iot product test task delete
+  summary: Cancel a running task matching the specified --task-id.
+  description: ''
+  syntax: >-
+    az iot product test task delete --task-id
+                                    --test-id
+                                    [--base-url]
+  examples:
+  - summary: Basic usage
+    syntax: az iot product test task delete --test-id {test_id} --task-id {task_id}
+  requiredParameters:
+  - isRequired: true
+    name: --task-id
+    summary: The generated Id of the testing task.
+    description: ''
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+- uid: az_iot_product_test_task_show
+  name: az iot product test task show
+  summary: Show the status of a testing task. Use --running for current running task or --task-id.
+  description: ''
+  syntax: >-
+    az iot product test task show --test-id
+                                  [--base-url]
+                                  [--running {false, true}]
+                                  [--task-id]
+  examples:
+  - summary: Task status by --task-id
+    syntax: az iot product test task show --test-id {test_id} --task-id {task_id}
+  - summary: Currently running task of product test
+    syntax: az iot product test task show --test-id {test_id} --running
+  requiredParameters:
+  - isRequired: true
+    name: --test-id -t
+    summary: The generated Id for the device certification test.
+    description: ''
+  optionalParameters:
+  - name: --base-url
+    summary: Override certification service URL to allow testing in non-production environements.
+    description: ''
+  - name: --running
+    parameterValueGroup: false, true
+    summary: Get the running tasks of a device test.
+    description: ''
+  - name: --task-id
+    summary: The generated Id of the testing task.
+    description: ''
+commands:
+- az_iot_product_test_task_create
+- az_iot_product_test_task_delete
+- az_iot_product_test_task_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage product testing certification tasks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/k8s-configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/k8s-configuration.yml
new file mode 100644
index 0000000000..ec3b8615a7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/k8s-configuration.yml
@@ -0,0 +1,310 @@
+### YamlMime:AzureCLIGroup
+uid: az_k8s-configuration
+name: az k8s-configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **k8s-configuration** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az k8s-configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Kubernetes configuration.
+description: ''
+directCommands:
+- uid: az_k8s-configuration_create
+  name: az k8s-configuration create
+  summary: Create a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration create --cluster-name
+                                --cluster-type {connectedClusters, managedClusters}
+                                --name
+                                --repository-url
+                                --resource-group
+                                --scope {cluster, namespace}
+                                [--enable-helm-operator {false, true}]
+                                [--helm-operator-chart-version]
+                                [--helm-operator-params]
+                                [--https-key]
+                                [--https-user]
+                                [--operator-instance-name]
+                                [--operator-namespace]
+                                [--operator-params]
+                                [--operator-type]
+                                [--ssh-known-hosts]
+                                [--ssh-known-hosts-file]
+                                [--ssh-private-key]
+                                [--ssh-private-key-file]
+  examples:
+  - summary: Create a Kubernetes configuration
+    syntax: >-
+      az k8s-configuration create --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyGitConfig --operator-instance-name OperatorInst01 \
+
+      --operator-namespace OperatorNamespace01 --operator-type flux --operator-params "'--git-readonly'" \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --enable-helm-operator  \
+
+      --helm-operator-chart-version 1.2.0 --scope namespace --helm-operator-params '--set helm.versions=v3' \
+
+      --ssh-private-key '' --ssh-private-key-file '' --https-user '' --https-key '' \
+
+      --ssh-known-hosts '' --ssh-known-hosts-file ''
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scope
+    parameterValueGroup: cluster, namespace
+    summary: Specify scope of the operator to be 'namespace' or 'cluster'.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator --enable-hop
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-chart-version --hop-chart-version
+    defaultValue: 1.2.0
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-params --hop-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --https-key
+    summary: Specify HTTPS token/password for private repository sync.
+    description: ''
+  - name: --https-user
+    summary: Specify HTTPS username for private repository sync.
+    description: ''
+  - name: --operator-instance-name
+    summary: Instance name of the Operator.
+    description: ''
+  - name: --operator-namespace
+    defaultValue: default
+    summary: Namespace in which to install the Operator.
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --operator-type
+    defaultValue: flux
+    summary: Type of the operator. Valid value is 'flux'.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-private-key
+    summary: Specify Base64-encoded private ssh key for private repository sync.
+    description: ''
+  - name: --ssh-private-key-file
+    summary: Specify filepath to private ssh key for private repository sync.
+    description: ''
+- uid: az_k8s-configuration_delete
+  name: az k8s-configuration delete
+  summary: Delete a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration delete --cluster-name
+                                --cluster-type {connectedClusters, managedClusters}
+                                --name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: Delete a Kubernetes configuration
+    syntax: >-
+      az k8s-configuration delete --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_k8s-configuration_list
+  name: az k8s-configuration list
+  summary: List Kubernetes configurations.
+  description: ''
+  syntax: >-
+    az k8s-configuration list --cluster-name
+                              --cluster-type {connectedClusters, managedClusters}
+                              --resource-group
+  examples:
+  - summary: List all Kubernetes configurations of a cluster
+    syntax: >-
+      az k8s-configuration list --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8s-configuration_show
+  name: az k8s-configuration show
+  summary: Show details of a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration show --cluster-name
+                              --cluster-type {connectedClusters, managedClusters}
+                              --name
+                              --resource-group
+  examples:
+  - summary: Show a Kubernetes configuration
+    syntax: >-
+      az k8s-configuration show --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8s-configuration_update
+  name: az k8s-configuration update
+  summary: Update a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8s-configuration update --cluster-name
+                                --cluster-type {connectedClusters, managedClusters}
+                                --name
+                                --resource-group
+                                [--enable-helm-operator {false, true}]
+                                [--helm-operator-chart-version]
+                                [--helm-operator-params]
+                                [--operator-params]
+                                [--repository-url]
+                                [--ssh-known-hosts]
+                                [--ssh-known-hosts-file]
+  examples:
+  - summary: Update an existing Kubernetes configuration
+    syntax: >-
+      az k8s-configuration update --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \
+
+      --helm-operator-chart-version 1.2.0 --helm-operator-params '--set helm.versions=v3'
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator --enable-hop
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-chart-version --hop-chart-version
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-params --hop-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+commands:
+- az_k8s-configuration_create
+- az_k8s-configuration_delete
+- az_k8s-configuration_list
+- az_k8s-configuration_show
+- az_k8s-configuration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Kubernetes configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/k8s-extension.yml b/2018-03-01-hybrid/docs-ref-autogen/k8s-extension.yml
new file mode 100644
index 0000000000..8076d6d4d0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/k8s-extension.yml
@@ -0,0 +1,192 @@
+### YamlMime:AzureCLIGroup
+uid: az_k8s-extension
+name: az k8s-extension
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **k8s-extension** extension for Azure CLI and requires version 2.24.0 or higher.  The extension will automatically install the first time you run an **az k8s-extension** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage K8s-extensions.
+description: ''
+directCommands:
+- uid: az_k8s-extension_create
+  name: az k8s-extension create
+  summary: Create a K8s-extension.
+  description: ''
+  syntax: >-
+    az k8s-extension create --cluster-name
+                            --cluster-type {appliances, connectedClusters, managedClusters}
+                            --extension-type
+                            --name
+                            --resource-group
+                            [--auto-upgrade {false, true}]
+                            [--config]
+                            [--config-file]
+                            [--config-protected]
+                            [--config-protected-file]
+                            [--release-namespace]
+                            [--release-train]
+                            [--scope {cluster, namespace}]
+                            [--tags]
+                            [--target-namespace]
+                            [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --extension-type
+    summary: Name of the extension type.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the extension instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade --auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: Automatically upgrade minor version of the extension instance.
+    description: ''
+  - name: --config --configuration-settings
+    summary: Configuration Settings as key=value pair.  Repeat parameter for each setting.
+    description: ''
+  - name: --config-file --configuration-settings-file
+    summary: JSON file path for configuration-settings.
+    description: ''
+  - name: --config-protected --configuration-protected-settings
+    summary: Configuration Protected Settings as key=value pair.  Repeat parameter for each setting.
+    description: ''
+  - name: --config-protected-file --configuration-protected-settings-file
+    summary: JSON file path for configuration-protected-settings.
+    description: ''
+  - name: --release-namespace
+    summary: Specify the namespace to install the extension release.
+    description: ''
+  - name: --release-train
+    summary: Specify the release train for the extension type.
+    description: ''
+  - name: --scope
+    parameterValueGroup: cluster, namespace
+    summary: Specify the extension scope.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-namespace
+    summary: Specify the target namespace to install to for the extension instance. This parameter is required if extension scope is set to 'namespace'.
+    description: ''
+  - name: --version
+    summary: Specify the version to install for the extension instance if --auto-upgrade-minor-version is not enabled.
+    description: ''
+- uid: az_k8s-extension_delete
+  name: az k8s-extension delete
+  summary: Delete a K8s-extension.
+  description: ''
+  syntax: >-
+    az k8s-extension delete --cluster-name
+                            --cluster-type {appliances, connectedClusters, managedClusters}
+                            --name
+                            --resource-group
+                            [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the extension instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_k8s-extension_list
+  name: az k8s-extension list
+  summary: List K8s-extensions.
+  description: ''
+  syntax: >-
+    az k8s-extension list --cluster-name
+                          --cluster-type {appliances, connectedClusters, managedClusters}
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8s-extension_show
+  name: az k8s-extension show
+  summary: Show details of a K8s-extension.
+  description: ''
+  syntax: >-
+    az k8s-extension show --cluster-name
+                          --cluster-type {appliances, connectedClusters, managedClusters}
+                          --name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: appliances, connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters or Arc appliances.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the extension instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_k8s-extension_create
+- az_k8s-extension_delete
+- az_k8s-extension_list
+- az_k8s-extension_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage K8s-extensions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/k8sconfiguration.yml b/2018-03-01-hybrid/docs-ref-autogen/k8sconfiguration.yml
new file mode 100644
index 0000000000..f1c4855338
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/k8sconfiguration.yml
@@ -0,0 +1,310 @@
+### YamlMime:AzureCLIGroup
+uid: az_k8sconfiguration
+name: az k8sconfiguration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **k8sconfiguration** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az k8sconfiguration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Kubernetes configuration.
+description: ''
+directCommands:
+- uid: az_k8sconfiguration_create
+  name: az k8sconfiguration create
+  summary: Create a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration create --cluster-name
+                               --cluster-type {connectedClusters, managedClusters}
+                               --name
+                               --repository-url
+                               --resource-group
+                               --scope {cluster, namespace}
+                               [--enable-helm-operator {false, true}]
+                               [--helm-operator-params]
+                               [--helm-operator-version]
+                               [--https-key]
+                               [--https-user]
+                               [--operator-instance-name]
+                               [--operator-namespace]
+                               [--operator-params]
+                               [--operator-type]
+                               [--ssh-known-hosts]
+                               [--ssh-known-hosts-file]
+                               [--ssh-private-key]
+                               [--ssh-private-key-file]
+  examples:
+  - summary: Create a Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration create --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyGitConfig --operator-instance-name OperatorInst01 \
+
+      --operator-namespace OperatorNamespace01 --operator-type flux --operator-params "'--git-readonly'" \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --enable-helm-operator  \
+
+      --helm-operator-version 1.2.0 --scope namespace --helm-operator-params '--set helm.versions=v3' \
+
+      --ssh-private-key '' --ssh-private-key-file '' --https-user '' --https-key '' \
+
+      --ssh-known-hosts '' --ssh-known-hosts-file ''
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scope
+    parameterValueGroup: cluster, namespace
+    summary: Specify scope of the operator to be 'namespace' or 'cluster'.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-version
+    defaultValue: 1.2.0
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --https-key
+    summary: Specify HTTPS token/password for private repository sync.
+    description: ''
+  - name: --https-user
+    summary: Specify HTTPS username for private repository sync.
+    description: ''
+  - name: --operator-instance-name
+    summary: Instance name of the Operator.
+    description: ''
+  - name: --operator-namespace
+    defaultValue: default
+    summary: Namespace in which to install the Operator.
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --operator-type
+    defaultValue: flux
+    summary: Type of the operator. Valid value is 'flux'.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-private-key
+    summary: Specify Base64-encoded private ssh key for private repository sync.
+    description: ''
+  - name: --ssh-private-key-file
+    summary: Specify filepath to private ssh key for private repository sync.
+    description: ''
+- uid: az_k8sconfiguration_delete
+  name: az k8sconfiguration delete
+  summary: Delete a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration delete --cluster-name
+                               --cluster-type {connectedClusters, managedClusters}
+                               --name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration delete --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_k8sconfiguration_list
+  name: az k8sconfiguration list
+  summary: List Kubernetes configurations.
+  description: ''
+  syntax: >-
+    az k8sconfiguration list --cluster-name
+                             --cluster-type {connectedClusters, managedClusters}
+                             --resource-group
+  examples:
+  - summary: List all Kubernetes configurations of a cluster
+    syntax: >-
+      az k8sconfiguration list --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8sconfiguration_show
+  name: az k8sconfiguration show
+  summary: Show details of a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration show --cluster-name
+                             --cluster-type {connectedClusters, managedClusters}
+                             --name
+                             --resource-group
+  examples:
+  - summary: Show a Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration show --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_k8sconfiguration_update
+  name: az k8sconfiguration update
+  summary: Update a Kubernetes configuration.
+  description: ''
+  syntax: >-
+    az k8sconfiguration update --cluster-name
+                               --cluster-type {connectedClusters, managedClusters}
+                               --name
+                               --resource-group
+                               [--enable-helm-operator {false, true}]
+                               [--helm-operator-params]
+                               [--helm-operator-version]
+                               [--operator-params]
+                               [--repository-url]
+                               [--ssh-known-hosts]
+                               [--ssh-known-hosts-file]
+  examples:
+  - summary: Update an existing Kubernetes configuration
+    syntax: >-
+      az k8sconfiguration update --resource-group MyResourceGroup --cluster-name MyClusterName \
+
+      --cluster-type connectedClusters --name MyConfigurationName --enable-helm-operator \
+
+      --repository-url git://github.com/fluxHowTo/flux-get-started --operator-params "'--git-readonly'" \
+
+      --helm-operator-version 1.2.0 --helm-operator-params '--set helm.versions=v3'
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Name of the Kubernetes cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-type
+    parameterValueGroup: connectedClusters, managedClusters
+    summary: Specify Arc clusters or AKS managed clusters.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Kubernetes Configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-helm-operator
+    parameterValueGroup: false, true
+    summary: Enable support for Helm chart deployments.
+    description: ''
+  - name: --helm-operator-params
+    summary: Chart values for the Helm Operator (if enabled).
+    description: ''
+  - name: --helm-operator-version
+    summary: Chart version of the Helm Operator (if enabled).
+    description: ''
+  - name: --operator-params
+    summary: Parameters for the Operator.
+    description: ''
+  - name: --repository-url -u
+    summary: Url of the source control repository.
+    description: ''
+  - name: --ssh-known-hosts
+    summary: Specify Base64-encoded known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+  - name: --ssh-known-hosts-file
+    summary: Specify filepath to known_hosts contents containing public SSH keys required to access private Git instances.
+    description: ''
+commands:
+- az_k8sconfiguration_create
+- az_k8sconfiguration_delete
+- az_k8sconfiguration_list
+- az_k8sconfiguration_show
+- az_k8sconfiguration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Kubernetes configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault.yml
index 11db381376..1a9570a962 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault.yml
@@ -1,55 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault
-  name: az keyvault
-  summary: Manage KeyVault keys, secrets, and certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_create
-  - az_keyvault_delete
-  - az_keyvault_delete_policy
-  - az_keyvault_list
-  - az_keyvault_list_deleted
-  - az_keyvault_purge
-  - az_keyvault_recover
-  - az_keyvault_set_policy
-  - az_keyvault_show
-  - az_keyvault_update
+### YamlMime:AzureCLIGroup
+uid: az_keyvault
+name: az keyvault
+summary: Manage KeyVault keys, secrets, and certificates.
+description: ''
+directCommands:
 - uid: az_keyvault_create
   name: az keyvault create
-  summary: Create a key vault.
+  summary: Create a Vault or HSM.
   description: If `--enable-rbac-authorization` is not specified, then default permissions are created for the current user or service principal unless the `--no-self-perms` flag is specified.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault create --resource-group
+                       [--administrators]
+                       [--enable-purge-protection {false, true}]
+                       [--enable-rbac-authorization {false, true}]
+                       [--enable-soft-delete {false, true}]
+                       [--enabled-for-deployment {false, true}]
+                       [--enabled-for-disk-encryption {false, true}]
+                       [--enabled-for-template-deployment {false, true}]
+                       [--hsm-name]
+                       [--location]
+                       [--name]
+                       [--network-acls]
+                       [--network-acls-ips]
+                       [--network-acls-vnets]
+                       [--no-self-perms {false, true}]
+                       [--no-wait]
+                       [--retention-days]
+                       [--sku]
+                       [--subscription]
+                       [--tags]
   examples:
-  - summary: Create a key vault. (autogenerated)
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup
   - summary: Create a key vault with network ACLs specified (use --network-acls to specify IP and VNet rules by using a JSON string).
-    syntax:
-      content: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\", \"/subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVNet/subnets/MySubnet\"]}"'
+    syntax: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\", \"/subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVNet/subnets/MySubnet\"]}"'
   - summary: Create a key vault with network ACLs specified (use --network-acls to specify IP and VNet rules by using a JSON file).
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls network-acls-example.json
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls network-acls-example.json
   - summary: Create a key vault with network ACLs specified (use --network-acls-ips to specify IP rules).
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-ips 3.4.5.0/24 4.5.6.0/24
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-ips 3.4.5.0/24 4.5.6.0/24
   - summary: Create a key vault with network ACLs specified (use --network-acls-vnets to specify VNet rules).
-    syntax:
-      content: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4
   - summary: Create a key vault with network ACLs specified (use --network-acls, --network-acls-ips and --network-acls-vnets together, redundant rules will be removed, finally there will be 4 IP rules and 3 VNet rules).
-    syntax:
-      content: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\"]}" --network-acls-ips 3.4.5.0/24 4.5.6.0/24 --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4'
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
-    description: ''
+    syntax: 'az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup --network-acls "{\"ip\": [\"1.2.3.4\", \"2.3.4.0/24\"], \"vnet\": [\"vnet_name_1/subnet_name1\", \"vnet_name_2/subnet_name2\"]}" --network-acls-ips 3.4.5.0/24 4.5.6.0/24 --network-acls-vnets vnet_name_2/subnet_name_2 vnet_name_3/subnet_name_3 /subscriptions/000000-0000-0000/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet_name_4/subnets/subnet_name_4'
+  - summary: Create a key vault. (autogenerated)
+    syntax: az keyvault create --location westus2 --name MyKeyVault --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --administrators
+    summary: '[HSM Only] Administrator role for data plane operations for Managed HSM. It accepts a space separated list of OIDs that will be assigned.'
     description: ''
   - name: --enable-purge-protection
     parameterValueGroup: false, true
@@ -61,41 +61,31 @@ items:
     description: ''
   - name: --enable-soft-delete
     parameterValueGroup: false, true
-    summary: Property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value.
+    summary: "[Vault Only] Property to specify whether the 'soft delete' functionality is enabled for this key vault. If it's not set to any value (true or false) when creating new key vault, it will be set to true by default. Once set to true, it cannot be reverted to false."
     description: ''
   - name: --enabled-for-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.
+    summary: '[Vault Only] Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.'
     description: ''
   - name: --enabled-for-disk-encryption
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.
+    summary: '[Vault Only] Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.'
     description: ''
   - name: --enabled-for-template-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-self-perms
-    parameterValueGroup: false, true
-    summary: Don't add permissions for the current user/service principal in the new vault.
+    summary: '[Vault Only] Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.'
     description: ''
-  - name: --retention-days
-    defaultValue: "90"
-    summary: Soft delete data retention days. It accepts >=7 and <=90.
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
     description: ''
-  - name: --sku
-    defaultValue: standard
-    parameterValueGroup: premium, standard
-    summary: Required. SKU details.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --name -n
+    summary: Name of the Vault.
     description: ''
   - name: --network-acls
-    summary: 'Network ACLs. It accepts a JSON filename or a JSON string. JSON format: `{"ip":[&lt;ip1&gt;, &lt;ip2&gt;...],"vnet":[&lt;vnet_name_1&gt;/&lt;subnet_name_1&gt;,&lt;subnet_id2&gt;...]}`.'
+    summary: 'Network ACLs. It accepts a JSON filename or a JSON string. JSON format: `{"ip":[<ip1>, <ip2>...],"vnet":[<vnet_name_1>/<subnet_name_1>,<subnet_id2>...]}`.'
     description: ''
   - name: --network-acls-ips
     summary: Network ACLs IP rules. Space-separated list of IP addresses.
@@ -103,29 +93,49 @@ items:
   - name: --network-acls-vnets
     summary: Network ACLS VNet rules. Space-separated list of Vnet/subnet pairs or subnet resource ids.
     description: ''
+  - name: --no-self-perms
+    parameterValueGroup: false, true
+    summary: "[Vault Only] Don't add permissions for the current user/service principal in the new vault."
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --retention-days
+    defaultValue: "90"
+    summary: Soft delete data retention days. It accepts >=7 and <=90.
+    description: ''
+  - name: --sku
+    summary: 'Required. SKU details. Allowed values for Vault: premium, standard. Default: standard. Allowed values for HSM: Standard_B1, Custom_B32. Default: Standard_B1.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_delete
   name: az keyvault delete
-  summary: Delete a key vault.
+  summary: Delete a Vault or HSM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault delete [--hsm-name]
+                       [--name]
+                       [--no-wait]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: Delete a key vault. (autogenerated)
-    syntax:
-      content: az keyvault delete --name MyKeyVault --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
+    syntax: az keyvault delete --name MyKeyVault --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --name -n
+    summary: Name of the Vault.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
     summary: Proceed only if Key Vault belongs to the specified resource group.
@@ -133,22 +143,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_delete_policy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_delete-policy
   name: az keyvault delete-policy
   summary: Delete security policy settings for a Key Vault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault delete-policy --name
+                              [--application-id]
+                              [--no-wait]
+                              [--object-id]
+                              [--resource-group]
+                              [--spn]
+                              [--subscription]
+                              [--upn]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --application-id
+    summary: Application ID of the client making request on behalf of a principal. Exposed for compound identity using on-behalf-of authentication flow.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --object-id
     summary: A GUID that identifies the principal that will receive permissions.
@@ -159,125 +178,144 @@ items:
   - name: --spn
     summary: Name of a service principal that will receive permissions.
     description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --upn
+    summary: Name of a user principal that will receive permissions.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_list
   name: az keyvault list
-  summary: List key vaults.
+  summary: List Vaults and/or HSMs.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault list [--query-examples]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --resource-type
+    summary: When --resource-type is not present the command will list all Vaults and HSMs. Possible values for --resource-type are vault and hsm.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_list_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_list-deleted
   name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
+  summary: Get information about the deleted Vaults or HSMs in a subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault list-deleted [--resource-type]
+                             [--subscription]
+  optionalParameters:
+  - name: --resource-type
+    summary: When --resource-type is not present the command will list all deleted Vaults and HSMs. Possible values for --resource-type are vault and hsm.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_purge
   name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-  description: Aka Purges the deleted Azure key vault.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the deleted vault.
+  summary: Permanently delete the specified Vault or HSM. Aka Purges the deleted Vault or HSM.
+  description: ''
+  syntax: >-
+    az keyvault purge [--hsm-name]
+                      [--location]
+                      [--name]
+                      [--no-wait]
+                      [--subscription]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the deleted HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
     description: ''
   - name: --location -l
-    summary: Location of the deleted vault.
+    summary: Location of the deleted Vault or HSM.
+    description: ''
+  - name: --name -n
+    summary: Name of the deleted Vault.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_recover
   name: az keyvault recover
-  summary: Recover a key vault.
-  description: Recovers a previously deleted key vault for which soft delete was enabled.
-  langs:
-  - azurecli
+  summary: Recover a Vault or HSM.
+  description: Recover a previously deleted Vault or HSM for which soft delete was enabled.
+  syntax: >-
+    az keyvault recover [--hsm-name]
+                        [--location]
+                        [--name]
+                        [--no-wait]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Recover a key vault. (autogenerated)
-    syntax:
-      content: az keyvault recover --location westus2 --name MyKeyVault --resource-group MyResourceGroup
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the deleted vault.
+    syntax: az keyvault recover --location westus2 --name MyKeyVault --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the deleted HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
     description: ''
   - name: --location -l
-    summary: Location of the deleted vault.
+    summary: Location of the deleted Vault or HSM.
+    description: ''
+  - name: --name -n
+    summary: Name of the deleted Vault.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Resource group of the deleted vault.
+    summary: Resource group of the deleted Vault or HSM.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_set_policy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_set-policy
   name: az keyvault set-policy
   summary: Update security policy settings for a Key Vault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault set-policy --name
+                           [--application-id]
+                           [--certificate-permissions {create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, setissuers, update}]
+                           [--key-permissions {backup, create, decrypt, delete, encrypt, get, import, list, purge, recover, restore, sign, unwrapKey, update, verify, wrapKey}]
+                           [--no-wait]
+                           [--object-id]
+                           [--resource-group]
+                           [--secret-permissions {backup, delete, get, list, purge, recover, restore, set}]
+                           [--spn]
+                           [--storage-permissions {backup, delete, deletesas, get, getsas, list, listsas, purge, recover, regeneratekey, restore, set, setsas, update}]
+                           [--subscription]
+                           [--upn]
+  examples:
+  - summary: Assign key permissions `get`, `list`, `import` and secret permissions `backup`, `restore` to an object id.
+    syntax: az keyvault set-policy -n MyVault --key-permissions get list import --secret-permissions backup restore --object-id {GUID}
+  - summary: Assign key permissions `get`, `list` to a UPN (User Principal Name).
+    syntax: az keyvault set-policy -n MyVault --key-permissions get list --upn {UPN}
+  - summary: Assign key permissions `get`, `list` to a SPN (Service Principal Name).
+    syntax: az keyvault set-policy -n MyVault --key-permissions get list --spn {SPN}
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
-  - name: --resource-group -g
-    summary: Proceed only if Key Vault belongs to the specified resource group.
-    description: ''
-  - name: --spn
-    summary: Name of a service principal that will receive permissions.
-    description: ''
-  - name: --upn
-    summary: Name of a user principal that will receive permissions.
+  optionalParameters:
+  - name: --application-id
+    summary: Application ID of the client making request on behalf of a principal. Exposed for compound identity using on-behalf-of authentication flow.
     description: ''
   - name: --certificate-permissions
     parameterValueGroup: create, delete, deleteissuers, get, getissuers, import, list, listissuers, managecontacts, manageissuers, purge, recover, setissuers, update
@@ -287,13 +325,22 @@ items:
     parameterValueGroup: backup, create, decrypt, delete, encrypt, get, import, list, purge, recover, restore, sign, unwrapKey, update, verify, wrapKey
     summary: Space-separated list of key permissions to assign.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --object-id
     summary: A GUID that identifies the principal that will receive permissions.
     description: ''
+  - name: --resource-group -g
+    summary: Proceed only if Key Vault belongs to the specified resource group.
+    description: ''
   - name: --secret-permissions
     parameterValueGroup: backup, delete, get, list, purge, recover, restore, set
     summary: Space-separated list of secret permissions to assign.
     description: ''
+  - name: --spn
+    summary: Name of a service principal that will receive permissions.
+    description: ''
   - name: --storage-permissions
     parameterValueGroup: backup, delete, deletesas, get, getsas, list, listsas, purge, recover, regeneratekey, restore, set, setsas, update
     summary: Space-separated list of storage permissions to assign.
@@ -301,26 +348,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --upn
+    summary: Name of a user principal that will receive permissions.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_show
   name: az keyvault show
-  summary: Show details of a key vault.
+  summary: Show details of a Vault or HSM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault show [--hsm-name]
+                     [--name]
+                     [--query-examples]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Show details of a key vault. (autogenerated)
-    syntax:
-      content: az keyvault show --name MyKeyVault
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: Name of the key vault.
+    syntax: az keyvault show --name MyKeyVault
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --name -n
+    summary: Name of the Vault.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
     summary: Proceed only if Key Vault belongs to the specified resource group.
@@ -328,26 +381,64 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_show-deleted
+  name: az keyvault show-deleted
+  summary: Show details of a deleted Vault or HSM.
+  description: ''
+  syntax: >-
+    az keyvault show-deleted [--hsm-name]
+                             [--location]
+                             [--name]
+                             [--subscription]
+  examples:
+  - summary: Show details of a deleted key vault.
+    syntax: az keyvault show-deleted --name MyKeyVault
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the deleted HSM. (--hsm-name and --name/-n are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --location -l
+    summary: Location of the deleted Vault or HSM.
+    description: ''
+  - name: --name -n
+    summary: Name of the deleted Vault.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_update
   name: az keyvault update
-  summary: Update the properties of a key vault.
+  summary: Update the properties of a Vault.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault update --name
+                       [--add]
+                       [--enable-purge-protection {false, true}]
+                       [--enable-rbac-authorization {false, true}]
+                       [--enable-soft-delete {false, true}]
+                       [--enabled-for-deployment {false, true}]
+                       [--enabled-for-disk-encryption {false, true}]
+                       [--enabled-for-template-deployment {false, true}]
+                       [--force-string]
+                       [--no-wait]
+                       [--remove]
+                       [--resource-group]
+                       [--retention-days]
+                       [--set]
+                       [--subscription]
   examples:
-  - summary: Update the properties of a key vault. (autogenerated)
-    syntax:
-      content: az keyvault update --enabled-for-disk-encryption true --name MyKeyVault --resource-group MyResourceGroup
-  parameters:
+  - summary: Update the properties of a Vault. (autogenerated)
+    syntax: az keyvault update --enabled-for-disk-encryption true --name MyKeyVault --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --enable-purge-protection
     parameterValueGroup: false, true
@@ -359,19 +450,28 @@ items:
     description: ''
   - name: --enable-soft-delete
     parameterValueGroup: false, true
-    summary: Property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value.
+    summary: "[Vault Only] Property to specify whether the 'soft delete' functionality is enabled for this key vault. If it's not set to any value (true or false) when creating new key vault, it will be set to true by default. Once set to true, it cannot be reverted to false."
     description: ''
   - name: --enabled-for-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.
+    summary: '[Vault Only] Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault.'
     description: ''
   - name: --enabled-for-disk-encryption
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.
+    summary: '[Vault Only] Property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys.'
     description: ''
   - name: --enabled-for-template-deployment
     parameterValueGroup: false, true
-    summary: Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.
+    summary: '[Vault Only] Property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
     summary: Proceed only if Key Vault belongs to the specified resource group.
@@ -379,241 +479,144 @@ items:
   - name: --retention-days
     summary: Soft delete data retention days. It accepts >=7 and <=90.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_wait
+  name: az keyvault wait
+  summary: Place the CLI in a waiting state until a condition of the Vault is met.
+  description: ''
+  syntax: >-
+    az keyvault wait --name
+                     [--created]
+                     [--custom]
+                     [--deleted]
+                     [--exists]
+                     [--interval]
+                     [--resource-group]
+                     [--subscription]
+                     [--timeout]
+                     [--updated]
+  examples:
+  - summary: Pause CLI until the vault is created.
+    syntax: az keyvault wait --name MyVault --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vault.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Proceed only if Key Vault belongs to the specified resource group.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-- uid: az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
-- uid: az_keyvault_create
-  name: az keyvault create
-  summary: Create a key vault.
-- uid: az_keyvault_delete
-  name: az keyvault delete
-  summary: Delete a key vault.
-- uid: az_keyvault_delete_policy
-  name: az keyvault delete-policy
-  summary: Delete security policy settings for a Key Vault.
-- uid: az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-- uid: az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: az_keyvault_key_download
-  name: az keyvault key download
-  summary: Downloads the public part of a stored key.
-- uid: az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-- uid: az_keyvault_list
-  name: az keyvault list
-  summary: List key vaults.
-- uid: az_keyvault_list_deleted
-  name: az keyvault list-deleted
-  summary: Gets information about the deleted vaults in a subscription.
-- uid: az_keyvault_purge
-  name: az keyvault purge
-  summary: Permanently deletes the specified vault.
-- uid: az_keyvault_recover
-  name: az keyvault recover
-  summary: Recover a key vault.
-- uid: az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-- uid: az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
-- uid: az_keyvault_set_policy
-  name: az keyvault set-policy
-  summary: Update security policy settings for a Key Vault.
-- uid: az_keyvault_show
-  name: az keyvault show
-  summary: Show details of a key vault.
-- uid: az_keyvault_update
-  name: az keyvault update
-  summary: Update the properties of a key vault.
+- az_keyvault_certificate
+- az_keyvault_certificate_contact
+- az_keyvault_certificate_contact_add
+- az_keyvault_certificate_contact_delete
+- az_keyvault_certificate_contact_list
+- az_keyvault_certificate_create
+- az_keyvault_certificate_delete
+- az_keyvault_certificate_download
+- az_keyvault_certificate_get-default-policy
+- az_keyvault_certificate_import
+- az_keyvault_certificate_issuer
+- az_keyvault_certificate_issuer_admin
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
+- az_keyvault_certificate_issuer_create
+- az_keyvault_certificate_issuer_delete
+- az_keyvault_certificate_issuer_list
+- az_keyvault_certificate_issuer_show
+- az_keyvault_certificate_issuer_update
+- az_keyvault_certificate_list
+- az_keyvault_certificate_list-deleted
+- az_keyvault_certificate_list-versions
+- az_keyvault_certificate_pending
+- az_keyvault_certificate_pending_delete
+- az_keyvault_certificate_pending_merge
+- az_keyvault_certificate_pending_show
+- az_keyvault_certificate_purge
+- az_keyvault_certificate_recover
+- az_keyvault_certificate_set-attributes
+- az_keyvault_certificate_show
+- az_keyvault_certificate_show-deleted
+- az_keyvault_create
+- az_keyvault_delete
+- az_keyvault_delete-policy
+- az_keyvault_key
+- az_keyvault_key_backup
+- az_keyvault_key_create
+- az_keyvault_key_decrypt
+- az_keyvault_key_delete
+- az_keyvault_key_download
+- az_keyvault_key_encrypt
+- az_keyvault_key_get-policy-template
+- az_keyvault_key_import
+- az_keyvault_key_list
+- az_keyvault_key_list-deleted
+- az_keyvault_key_list-versions
+- az_keyvault_key_purge
+- az_keyvault_key_recover
+- az_keyvault_key_restore
+- az_keyvault_key_set-attributes
+- az_keyvault_key_show
+- az_keyvault_key_show-deleted
+- az_keyvault_list
+- az_keyvault_list-deleted
+- az_keyvault_purge
+- az_keyvault_recover
+- az_keyvault_secret
+- az_keyvault_secret_backup
+- az_keyvault_secret_delete
+- az_keyvault_secret_download
+- az_keyvault_secret_list
+- az_keyvault_secret_list-deleted
+- az_keyvault_secret_list-versions
+- az_keyvault_secret_purge
+- az_keyvault_secret_recover
+- az_keyvault_secret_restore
+- az_keyvault_secret_set
+- az_keyvault_secret_set-attributes
+- az_keyvault_secret_show
+- az_keyvault_secret_show-deleted
+- az_keyvault_set-policy
+- az_keyvault_show
+- az_keyvault_show-deleted
+- az_keyvault_update
+- az_keyvault_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -629,10 +632,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage KeyVault keys, secrets, and certificates.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage KeyVault keys, secrets, and certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate.yml
index a69834e63d..cd89a05f0b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate.yml
@@ -1,154 +1,137 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate
-  name: az keyvault certificate
-  summary: Manage certificates.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_create
-  - az_keyvault_certificate_delete
-  - az_keyvault_certificate_download
-  - az_keyvault_certificate_get_default_policy
-  - az_keyvault_certificate_import
-  - az_keyvault_certificate_list
-  - az_keyvault_certificate_list_deleted
-  - az_keyvault_certificate_list_versions
-  - az_keyvault_certificate_purge
-  - az_keyvault_certificate_recover
-  - az_keyvault_certificate_set_attributes
-  - az_keyvault_certificate_show
-  - az_keyvault_certificate_show_deleted
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate
+name: az keyvault certificate
+summary: Manage certificates.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_create
   name: az keyvault certificate create
   summary: Create a Key Vault certificate.
   description: Certificates can be used as a secrets for provisioned virtual machines.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault certificate create --name
+                                   --policy
+                                   --vault-name
+                                   [--disabled {false, true}]
+                                   [--subscription]
+                                   [--tags]
+                                   [--validity]
   examples:
   - summary: Create a self-signed certificate with the default policy and add it to a virtual machine.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
-  parameters:
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the certificate.
+    description: ''
   - isRequired: true
     name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file(e.g. @my_policy.json).
+    summary: JSON encoded policy definition. Use @{file} to load from a file(e.g. @my_policy.json).
     description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --disabled
     parameterValueGroup: false, true
     summary: Create certificate in disabled state.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --validity
     summary: Number of months the certificate is valid for. Overrides the value specified with --policy/-p.
     description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_delete
   name: az keyvault certificate delete
   summary: Deletes a certificate from a specified key vault.
   description: Deletes all versions of a certificate object along with its associated policy. Delete certificate cannot be used to remove individual versions of a certificate object. This operation requires the certificates/delete permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate delete [--id]
+                                   [--name]
+                                   [--subscription]
+                                   [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_download
   name: az keyvault certificate download
   summary: Download the public portion of a Key Vault certificate.
   description: The certificate formatted as either PEM or DER. PEM is the default.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault certificate download --file
+                                     [--encoding {DER, PEM}]
+                                     [--id]
+                                     [--name]
+                                     [--subscription]
+                                     [--vault-name]
+                                     [--version]
   examples:
   - summary: Download a certificate as PEM and check its fingerprint in openssl.
-    syntax:
-      content: >-
-        az keyvault certificate download --vault-name vault -n cert-name -f cert.pem && \
+    syntax: >-
+      az keyvault certificate download --vault-name vault -n cert-name -f cert.pem && \
 
-        openssl x509 -in cert.pem -inform PEM  -noout -sha1 -fingerprint
+      openssl x509 -in cert.pem -inform PEM  -noout -sha1 -fingerprint
   - summary: Download a certificate as DER and check its fingerprint in openssl.
-    syntax:
-      content: >-
-        az keyvault certificate download --vault-name vault -n cert-name -f cert.crt -e DER && \
+    syntax: >-
+      az keyvault certificate download --vault-name vault -n cert-name -f cert.crt -e DER && \
 
-        openssl x509 -in cert.crt -inform DER  -noout -sha1 -fingerprint
-  parameters:
+      openssl x509 -in cert.crt -inform DER  -noout -sha1 -fingerprint
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the binary certificate contents.
     description: ''
+  optionalParameters:
   - name: --encoding -e
     defaultValue: PEM
     parameterValueGroup: DER, PEM
     summary: Encoding of the certificate. DER will create a binary DER formatted x509 certificate, and PEM will create a base64 PEM x509 certificate.
     description: ''
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The certificate version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_get_default_policy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_get-default-policy
   name: az keyvault certificate get-default-policy
   summary: Get the default policy for self-signed certificates.
   description: >-
@@ -157,63 +140,73 @@ items:
     The default policy can also be used as a starting point to create derivative policies.
 
 
-    For more details, see: <a href="https://docs.microsoft.com/rest/api/keyvault/certificates-and-policies">https://docs.microsoft.com/rest/api/keyvault/certificates-and-policies</a>.
-  langs:
-  - azurecli
+    For more details, see: https://docs.microsoft.com/azure/key-vault/certificates/about-certificates#certificate-policy.
+  syntax: >-
+    az keyvault certificate get-default-policy [--scaffold]
+                                               [--subscription]
   examples:
   - summary: Create a self-signed certificate with the default policy
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
-  parameters:
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
+  optionalParameters:
   - name: --scaffold
     summary: Create a fully formed policy structure with default values.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_import
   name: az keyvault certificate import
   summary: Import a certificate into KeyVault.
   description: Certificates can also be used as a secrets in provisioned virtual machines.
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault certificate import --file
+                                   --name
+                                   --vault-name
+                                   [--disabled {false, true}]
+                                   [--password]
+                                   [--policy]
+                                   [--subscription]
+                                   [--tags]
   examples:
   - summary: Create a service principal with a certificate, add the certificate to Key Vault and provision a VM with that certificate.
-    syntax:
-      content: >-
-        service_principal=$(az ad sp create-for-rbac --create-cert)
+    syntax: >-
+      service_principal=$(az ad sp create-for-rbac --create-cert)
 
 
-        cert_file=$(echo $service_principal | jq .fileWithCertAndPrivateKey -r)
+      cert_file=$(echo $service_principal | jq .fileWithCertAndPrivateKey -r)
 
 
-        az keyvault create -g my-group -n vaultname
+      az keyvault create -g my-group -n vaultname
 
 
-        az keyvault certificate import --vault-name vaultname -n cert_name -f cert_file
+      az keyvault certificate import --vault-name vaultname -n cert_name -f cert_file
 
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
-  parameters:
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: PKCS12 file or PEM file containing the certificate and private key.
     description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the certificate.
+    description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --disabled
     parameterValueGroup: false, true
     summary: Import the certificate in disabled state.
@@ -222,337 +215,266 @@ items:
     summary: If the private key in certificate is encrypted, the password used for encryption.
     description: ''
   - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file(e.g. @my_policy.json).
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+    summary: JSON encoded policy definition. Use @{file} to load from a file(e.g. @my_policy.json).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_list
   name: az keyvault certificate list
   summary: List certificates in a specified key vault.
   description: The GetCertificates operation returns the set of certificates resources in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate list [--id]
+                                 [--maxresults]
+                                 [--query-examples]
+                                 [--subscription]
+                                 [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_list_deleted
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_list-deleted
   name: az keyvault certificate list-deleted
   summary: Lists the deleted certificates in the specified vault currently available for recovery.
   description: The GetDeletedCertificates operation retrieves the certificates in the current vault which are in a deleted state and ready for recovery or purging. This operation includes deletion-specific information. This operation requires the certificates/get/list permission. This operation can only be enabled on soft-delete enabled vaults.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
+  syntax: >-
+    az keyvault certificate list-deleted --vault-name
+                                         [--id]
+                                         [--maxresults]
+                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --maxresults
+    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_list-versions
   name: az keyvault certificate list-versions
   summary: List the versions of a certificate.
   description: The GetCertificateVersions operation returns the versions of a certificate in the specified key vault. This operation requires the certificates/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate list-versions [--id]
+                                          [--maxresults]
+                                          [--name]
+                                          [--subscription]
+                                          [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
-    description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_purge
   name: az keyvault certificate purge
   summary: Permanently deletes the specified deleted certificate.
   description: The PurgeDeletedCertificate operation performs an irreversible deletion of the specified certificate, without possibility for recovery. The operation is not available if the recovery level does not specify 'Purgeable'. This operation requires the certificate/purge permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate purge [--id]
+                                  [--name]
+                                  [--subscription]
+                                  [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_recover
   name: az keyvault certificate recover
   summary: Recovers the deleted certificate back to its current version under /certificates.
   description: The RecoverDeletedCertificate operation performs the reversal of the Delete operation. The operation is applicable in vaults enabled for soft-delete, and must be issued during the retention interval (available in the deleted certificate's attributes). This operation requires the certificates/recover permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate recover [--id]
+                                    [--name]
+                                    [--subscription]
+                                    [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_set_attributes
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_set-attributes
   name: az keyvault certificate set-attributes
   summary: Updates the specified attributes associated with the given certificate.
   description: The UpdateCertificate operation applies the specified update on the given certificate; the only elements updated are the certificate's attributes. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate set-attributes [--enabled {false, true}]
+                                           [--id]
+                                           [--name]
+                                           [--policy]
+                                           [--subscription]
+                                           [--tags]
+                                           [--vault-name]
+                                           [--version]
+  optionalParameters:
   - name: --enabled
     parameterValueGroup: false, true
     summary: Enable the certificate.
     description: ''
-  - name: --policy -p
-    summary: JSON encoded policy defintion. Use @{file} to load from a file(e.g. @my_policy.json).
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
+  - name: --policy -p
+    summary: JSON encoded policy definition. Use @{file} to load from a file(e.g. @my_policy.json).
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The certificate version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_show
   name: az keyvault certificate show
   summary: Gets information about a certificate.
   description: Gets information about a specific certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate show [--id]
+                                 [--name]
+                                 [--query-examples]
+                                 [--subscription]
+                                 [--vault-name]
+                                 [--version]
+  optionalParameters:
   - name: --id
-    summary: Id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The certificate version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_certificate_show_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_certificate_show-deleted
   name: az keyvault certificate show-deleted
   summary: Retrieves information about the specified deleted certificate.
   description: The GetDeletedCertificate operation retrieves the deleted certificate information plus its attributes, such as retention interval, scheduled permanent deletion and the current deletion recovery level. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate show-deleted [--id]
+                                         [--name]
+                                         [--subscription]
+                                         [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the certificate.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the certificate. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the certificate. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-- uid: az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
-- uid: az_keyvault_certificate_create
-  name: az keyvault certificate create
-  summary: Create a Key Vault certificate.
-- uid: az_keyvault_certificate_delete
-  name: az keyvault certificate delete
-  summary: Deletes a certificate from a specified key vault.
-- uid: az_keyvault_certificate_download
-  name: az keyvault certificate download
-  summary: Download the public portion of a Key Vault certificate.
-- uid: az_keyvault_certificate_get_default_policy
-  name: az keyvault certificate get-default-policy
-  summary: Get the default policy for self-signed certificates.
-- uid: az_keyvault_certificate_import
-  name: az keyvault certificate import
-  summary: Import a certificate into KeyVault.
-- uid: az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
-- uid: az_keyvault_certificate_list
-  name: az keyvault certificate list
-  summary: List certificates in a specified key vault.
-- uid: az_keyvault_certificate_list_deleted
-  name: az keyvault certificate list-deleted
-  summary: Lists the deleted certificates in the specified vault currently available for recovery.
-- uid: az_keyvault_certificate_list_versions
-  name: az keyvault certificate list-versions
-  summary: List the versions of a certificate.
-- uid: az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-- uid: az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
-- uid: az_keyvault_certificate_purge
-  name: az keyvault certificate purge
-  summary: Permanently deletes the specified deleted certificate.
-- uid: az_keyvault_certificate_recover
-  name: az keyvault certificate recover
-  summary: Recovers the deleted certificate back to its current version under /certificates.
-- uid: az_keyvault_certificate_set_attributes
-  name: az keyvault certificate set-attributes
-  summary: Updates the specified attributes associated with the given certificate.
-- uid: az_keyvault_certificate_show
-  name: az keyvault certificate show
-  summary: Gets information about a certificate.
-- uid: az_keyvault_certificate_show_deleted
-  name: az keyvault certificate show-deleted
-  summary: Retrieves information about the specified deleted certificate.
+- az_keyvault_certificate_contact
+- az_keyvault_certificate_contact_add
+- az_keyvault_certificate_contact_delete
+- az_keyvault_certificate_contact_list
+- az_keyvault_certificate_create
+- az_keyvault_certificate_delete
+- az_keyvault_certificate_download
+- az_keyvault_certificate_get-default-policy
+- az_keyvault_certificate_import
+- az_keyvault_certificate_issuer
+- az_keyvault_certificate_issuer_admin
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
+- az_keyvault_certificate_issuer_create
+- az_keyvault_certificate_issuer_delete
+- az_keyvault_certificate_issuer_list
+- az_keyvault_certificate_issuer_show
+- az_keyvault_certificate_issuer_update
+- az_keyvault_certificate_list
+- az_keyvault_certificate_list-deleted
+- az_keyvault_certificate_list-versions
+- az_keyvault_certificate_pending
+- az_keyvault_certificate_pending_delete
+- az_keyvault_certificate_pending_merge
+- az_keyvault_certificate_pending_show
+- az_keyvault_certificate_purge
+- az_keyvault_certificate_recover
+- az_keyvault_certificate_set-attributes
+- az_keyvault_certificate_show
+- az_keyvault_certificate_show-deleted
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -568,10 +490,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage certificates.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/contact.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/contact.yml
index 67f4cbee92..a46714780b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/contact.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/contact.yml
@@ -1,99 +1,86 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_contact
-  name: az keyvault certificate contact
-  summary: Manage contacts for certificate management.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_contact_add
-  - az_keyvault_certificate_contact_delete
-  - az_keyvault_certificate_contact_list
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_contact
+name: az keyvault certificate contact
+summary: Manage contacts for certificate management.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_contact_add
   name: az keyvault certificate contact add
   summary: Add a contact to the specified vault to receive notifications of certificate operations.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate contact add --email
+                                        --vault-name
+                                        [--name]
+                                        [--phone]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Contact e-mail address. Must be unique.
     description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --name
     summary: Full contact name.
     description: ''
   - name: --phone
     summary: Contact phone number.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_contact_delete
   name: az keyvault certificate contact delete
   summary: Remove a certificate contact from the specified vault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate contact delete --email
+                                           --vault-name
+                                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Contact e-mail address. Must be unique.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_contact_list
   name: az keyvault certificate contact list
   summary: Lists the certificate contacts for a specified key vault.
   description: The GetCertificateContacts operation returns the set of certificate contact resources in the specified key vault. This operation requires the certificates/managecontacts permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate contact list --vault-name
+                                         [--query-examples]
+                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_contact_add
-  name: az keyvault certificate contact add
-  summary: Add a contact to the specified vault to receive notifications of certificate operations.
-- uid: az_keyvault_certificate_contact_delete
-  name: az keyvault certificate contact delete
-  summary: Remove a certificate contact from the specified vault.
-- uid: az_keyvault_certificate_contact_list
-  name: az keyvault certificate contact list
-  summary: Lists the certificate contacts for a specified key vault.
+- az_keyvault_certificate_contact_add
+- az_keyvault_certificate_contact_delete
+- az_keyvault_certificate_contact_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -109,10 +96,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage contacts for certificate management.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage contacts for certificate management.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer.yml
index 237a4ffb94..b65c0c1d08 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_issuer
-  name: az keyvault certificate issuer
-  summary: Manage certificate issuer information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_issuer_create
-  - az_keyvault_certificate_issuer_delete
-  - az_keyvault_certificate_issuer_list
-  - az_keyvault_certificate_issuer_show
-  - az_keyvault_certificate_issuer_update
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_issuer
+name: az keyvault certificate issuer
+summary: Manage certificate issuer information.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_issuer_create
   name: az keyvault certificate issuer create
   summary: Create a certificate issuer record.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer create --issuer-name
+                                          --provider-name
+                                          --vault-name
+                                          [--account-id]
+                                          [--disabled {false, true}]
+                                          [--organization-id]
+                                          [--password]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
@@ -27,171 +26,154 @@ items:
     name: --provider-name
     summary: The certificate provider name. Must be registered with your tenant ID and in your region.
     description: ''
-  - name: --disabled
-    parameterValueGroup: false, true
-    summary: Set issuer to disabled state.
-    description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --account-id
     summary: The issuer account id/username/etc.
     description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Set issuer to disabled state.
     description: ''
   - name: --organization-id
     summary: The organization id.
     description: ''
+  - name: --password
+    summary: The issuer account password/secret/etc.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_delete
   name: az keyvault certificate issuer delete
   summary: Deletes the specified certificate issuer.
   description: The DeleteCertificateIssuer operation permanently removes the specified certificate issuer from the vault. This operation requires the certificates/manageissuers/deleteissuers permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer delete --issuer-name
+                                          --vault-name
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_list
   name: az keyvault certificate issuer list
   summary: List certificate issuers for a specified key vault.
   description: The GetCertificateIssuers operation returns the set of certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer list --vault-name
+                                        [--maxresults]
+                                        [--query-examples]
+                                        [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_show
   name: az keyvault certificate issuer show
   summary: Lists the specified certificate issuer.
   description: The GetCertificateIssuer operation returns the specified certificate issuer resources in the specified key vault. This operation requires the certificates/manageissuers/getissuers permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer show --issuer-name
+                                        --vault-name
+                                        [--query-examples]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_update
   name: az keyvault certificate issuer update
   summary: Update a certificate issuer record.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer update --issuer-name
+                                          --vault-name
+                                          [--account-id]
+                                          [--enabled {false, true}]
+                                          [--organization-id]
+                                          [--password]
+                                          [--provider-name]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
-  - name: --enabled
-    parameterValueGroup: false, true
-    summary: Set issuer enabled state.
-    description: ''
-  - name: --provider-name
-    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
-    description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --account-id
     summary: The issuer account id/username/etc.
     description: ''
-  - name: --password
-    summary: The issuer account password/secret/etc.
+  - name: --enabled
+    parameterValueGroup: false, true
+    summary: Set issuer enabled state.
     description: ''
   - name: --organization-id
     summary: The organization id.
     description: ''
+  - name: --password
+    summary: The issuer account password/secret/etc.
+    description: ''
+  - name: --provider-name
+    summary: The certificate provider name. Must be registered with your tenant ID and in your region.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_create
-  name: az keyvault certificate issuer create
-  summary: Create a certificate issuer record.
-- uid: az_keyvault_certificate_issuer_delete
-  name: az keyvault certificate issuer delete
-  summary: Deletes the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_list
-  name: az keyvault certificate issuer list
-  summary: List certificate issuers for a specified key vault.
-- uid: az_keyvault_certificate_issuer_show
-  name: az keyvault certificate issuer show
-  summary: Lists the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_update
-  name: az keyvault certificate issuer update
-  summary: Update a certificate issuer record.
+- az_keyvault_certificate_issuer_admin
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
+- az_keyvault_certificate_issuer_create
+- az_keyvault_certificate_issuer_delete
+- az_keyvault_certificate_issuer_list
+- az_keyvault_certificate_issuer_show
+- az_keyvault_certificate_issuer_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -207,10 +189,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage certificate issuer information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage certificate issuer information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer/admin.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer/admin.yml
index 46a0cbdc18..d3a1e159b6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer/admin.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/issuer/admin.yml
@@ -1,22 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_issuer_admin
-  name: az keyvault certificate issuer admin
-  summary: Manage admin information for certificate issuers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_issuer_admin_add
-  - az_keyvault_certificate_issuer_admin_delete
-  - az_keyvault_certificate_issuer_admin_list
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_issuer_admin
+name: az keyvault certificate issuer admin
+summary: Manage admin information for certificate issuers.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_issuer_admin_add
   name: az keyvault certificate issuer admin add
   summary: Add admin details for a specified certificate issuer.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer admin add --email
+                                             --issuer-name
+                                             --vault-name
+                                             [--first-name]
+                                             [--last-name]
+                                             [--phone]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Admin e-mail address. Must be unique within the vault.
@@ -25,6 +25,11 @@ items:
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --first-name
     summary: Admin first name.
     description: ''
@@ -34,26 +39,20 @@ items:
   - name: --phone
     summary: Admin phone number.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_admin_delete
   name: az keyvault certificate issuer admin delete
   summary: Remove admin details for the specified certificate issuer.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer admin delete --email
+                                                --issuer-name
+                                                --vault-name
+                                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: Admin e-mail address. Must be unique within the vault.
@@ -64,51 +63,43 @@ items:
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_issuer_admin_list
   name: az keyvault certificate issuer admin list
   summary: List admins for a specified certificate issuer.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate issuer admin list --issuer-name
+                                              --vault-name
+                                              [--query-examples]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --issuer-name
     summary: Certificate issuer name.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_issuer_admin_add
-  name: az keyvault certificate issuer admin add
-  summary: Add admin details for a specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_delete
-  name: az keyvault certificate issuer admin delete
-  summary: Remove admin details for the specified certificate issuer.
-- uid: az_keyvault_certificate_issuer_admin_list
-  name: az keyvault certificate issuer admin list
-  summary: List admins for a specified certificate issuer.
+- az_keyvault_certificate_issuer_admin_add
+- az_keyvault_certificate_issuer_admin_delete
+- az_keyvault_certificate_issuer_admin_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -124,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage admin information for certificate issuers.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage admin information for certificate issuers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/pending.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/pending.yml
index 78a649da2b..7cad3b8fce 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/pending.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/certificate/pending.yml
@@ -1,50 +1,58 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_certificate_pending
-  name: az keyvault certificate pending
-  summary: Manage pending certificate creation operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_certificate_pending_delete
-  - az_keyvault_certificate_pending_merge
-  - az_keyvault_certificate_pending_show
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_certificate_pending
+name: az keyvault certificate pending
+summary: Manage pending certificate creation operations.
+description: ''
+directCommands:
 - uid: az_keyvault_certificate_pending_delete
   name: az keyvault certificate pending delete
   summary: Deletes the creation operation for a specific certificate.
   description: Deletes the creation operation for a specified certificate that is in the process of being created. The certificate is no longer created. This operation requires the certificates/update permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate pending delete --name
+                                           --vault-name
+                                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the pending certificate.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_pending_merge
   name: az keyvault certificate pending merge
   summary: Merges a certificate or a certificate chain with a key pair existing on the server.
   description: The MergeCertificate operation performs the merging of a certificate or certificate chain with a key pair currently available in the service. This operation requires the certificates/create permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate pending merge --file
+                                          --name
+                                          --vault-name
+                                          [--disabled {false, true}]
+                                          [--expires]
+                                          [--not-before]
+                                          [--subscription]
+                                          [--tags]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File containing the certificate or certificate chain to merge.
     description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pending certificate.
+    description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --disabled
     parameterValueGroup: false, true
     summary: Create certificate in disabled state.
@@ -55,60 +63,43 @@ items:
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the pending certificate.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_certificate_pending_show
   name: az keyvault certificate pending show
   summary: Gets the creation operation of a certificate.
   description: Gets the creation operation associated with a specified certificate. This operation requires the certificates/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault certificate pending show --name
+                                         --vault-name
+                                         [--query-examples]
+                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the pending certificate.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_certificate_pending_delete
-  name: az keyvault certificate pending delete
-  summary: Deletes the creation operation for a specific certificate.
-- uid: az_keyvault_certificate_pending_merge
-  name: az keyvault certificate pending merge
-  summary: Merges a certificate or a certificate chain with a key pair existing on the server.
-- uid: az_keyvault_certificate_pending_show
-  name: az keyvault certificate pending show
-  summary: Gets the creation operation of a certificate.
+- az_keyvault_certificate_pending_delete
+- az_keyvault_certificate_pending_merge
+- az_keyvault_certificate_pending_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -124,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage pending certificate creation operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage pending certificate creation operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/key.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/key.yml
index 8a01790b06..d8cfaeed16 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/key.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/key.yml
@@ -1,65 +1,65 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_key
-  name: az keyvault key
-  summary: Manage keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_key_backup
-  - az_keyvault_key_create
-  - az_keyvault_key_delete
-  - az_keyvault_key_download
-  - az_keyvault_key_import
-  - az_keyvault_key_list
-  - az_keyvault_key_list_deleted
-  - az_keyvault_key_list_versions
-  - az_keyvault_key_purge
-  - az_keyvault_key_recover
-  - az_keyvault_key_restore
-  - az_keyvault_key_set_attributes
-  - az_keyvault_key_show
-  - az_keyvault_key_show_deleted
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_key
+name: az keyvault key
+summary: Manage keys.
+description: ''
+directCommands:
 - uid: az_keyvault_key_backup
   name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-  description: The Key Backup operation exports a key from Azure Key Vault in a protected form. Note that this operation does NOT return key material in a form that can be used outside the Azure Key Vault system, the returned key material is either protected to a Azure Key Vault HSM or to Azure Key Vault itself. The intent of this operation is to allow a client to GENERATE a key in one Azure Key Vault instance, BACKUP the key, and then RESTORE it into another Azure Key Vault instance. The BACKUP operation may be used to export, in protected form, any key type from Azure Key Vault. Individual versions of a key cannot be backed up. BACKUP / RESTORE can be performed within geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical area. This operation requires the key/backup permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Request that a backup of the specified key be downloaded to the client.
+  description: The Key Backup operation exports a key from Vault or HSM in a protected form. Note that this operation does NOT return key material in a form that can be used outside the Vault or HSM system, the returned key material is either protected to a HSM or to Vault itself. The intent of this operation is to allow a client to GENERATE a key in one Vault or HSM instance, BACKUP the key, and then RESTORE it into another Vault or HSM instance. The BACKUP operation may be used to export, in protected form, any key type from Vault or HSM. Individual versions of a key cannot be backed up. BACKUP / RESTORE can be performed within geographical boundaries only; meaning that a BACKUP from one geographical area cannot be restored to another geographical area. For example, a backup from the US geographical area cannot be restored in an EU geographical area. This operation requires the key/backup permission.
+  syntax: >-
+    az keyvault key backup --file
+                           [--hsm-name]
+                           [--id]
+                           [--name]
+                           [--subscription]
+                           [--vault-name]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: Local file path in which to store key backup.
     description: ''
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_create
   name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-  description: The create key operation can be used to create any key type in Azure Key Vault. If the named key already exists, Azure Key Vault creates a new version of the key. It requires the keys/create permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Create a new key, stores it, then returns key parameters and attributes to the client.
+  description: The create key operation can be used to create any key type in Vault or HSM. If the named key already exists, Vault or HSM creates a new version of the key. It requires the keys/create permission.
+  syntax: >-
+    az keyvault key create [--curve {P-256, P-384, P-521, SECP256K1}]
+                           [--disabled {false, true}]
+                           [--expires]
+                           [--hsm-name]
+                           [--id]
+                           [--kty {EC, EC-HSM, RSA, RSA-HSM, oct, oct-HSM}]
+                           [--name]
+                           [--not-before]
+                           [--ops {decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey}]
+                           [--protection {hsm, software}]
+                           [--size]
+                           [--subscription]
+                           [--tags]
+                           [--vault-name]
+  optionalParameters:
   - name: --curve
     parameterValueGroup: P-256, P-384, P-521, SECP256K1
-    summary: 'Elliptic curve name. For valid values, see: <a href="https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeycurvename">https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeycurvename</a>.'
+    summary: 'Elliptic curve name. For valid values, see: https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeycurvename.'
     description: ''
   - name: --disabled
     parameterValueGroup: false, true
@@ -68,15 +68,24 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --kty
-    parameterValueGroup: EC, EC-HSM, RSA, RSA-HSM, oct
-    summary: 'The type of key to create. For valid values, see: <a href="https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeytype">https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeytype</a>.'
+    parameterValueGroup: EC, EC-HSM, RSA, RSA-HSM, oct, oct-HSM
+    summary: 'The type of key to create. For valid values, see: https://docs.microsoft.com/en-us/rest/api/keyvault/createkey/createkey#jsonwebkeytype.'
+    description: ''
+  - name: --name -n
+    summary: Name of the key.
     description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
   - name: --ops
-    parameterValueGroup: decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey
+    parameterValueGroup: decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey
     summary: Space-separated list of permitted JSON web key operations.
     description: ''
   - name: --protection -p
@@ -84,104 +93,235 @@ items:
     summary: Specifies the type of key protection.
     description: ''
   - name: --size
-    summary: 'The key size in bits. For example: 2048, 3072, or 4096 for RSA.'
+    summary: 'The key size in bits. For example: 2048, 3072, or 4096 for RSA. 128, 192, or 256 for oct.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_decrypt
+  name: az keyvault key decrypt
+  summary: Decrypt a single block of encrypted data.
+  description: The DECRYPT operation decrypts a well-formed block of ciphertext using the target encryption key and specified algorithm. This operation is the reverse of the ENCRYPT operation; only a single block of data may be decrypted, the size of this block is dependent on the target key and the algorithm to be used. The DECRYPT operation applies to asymmetric and symmetric keys stored in Vault or HSM since it uses the private portion of the key. This operation requires the keys/decrypt permission.
+  syntax: >-
+    az keyvault key decrypt --algorithm {RSA-OAEP, RSA-OAEP-256, RSA1_5}
+                            --value
+                            [--data-type {base64, plaintext}]
+                            [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--subscription]
+                            [--vault-name]
+                            [--version]
+  requiredParameters:
   - isRequired: true
-    name: --name -n
-    summary: Name of the key.
+    name: --algorithm -a
+    parameterValueGroup: RSA-OAEP, RSA-OAEP-256, RSA1_5
+    summary: Algorithm identifier.
     description: ''
   - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+    name: --value
+    summary: The value to be decrypted, which should be the result of "az keyvault encrypt".
+    description: ''
+  optionalParameters:
+  - name: --data-type
+    defaultValue: base64
+    parameterValueGroup: base64, plaintext
+    summary: The type of the original data.
+    description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. Required if --id is not specified.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  - name: --version -v
+    summary: The key version. If omitted, uses the latest version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_delete
   name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
+  summary: Delete a key of any type from storage in Vault or HSM.
   description: The delete key operation cannot be used to remove individual versions of a key. This operation removes the cryptographic material associated with the key, which means the key is not usable for Sign/Verify, Wrap/Unwrap or Encrypt/Decrypt operations. This operation requires the keys/delete permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault key delete [--hsm-name]
+                           [--id]
+                           [--name]
+                           [--subscription]
+                           [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_download
   name: az keyvault key download
-  summary: Downloads the public part of a stored key.
+  summary: Download the public part of a stored key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az keyvault key download --file
+                             [--encoding {DER, PEM}]
+                             [--hsm-name]
+                             [--id]
+                             [--name]
+                             [--subscription]
+                             [--vault-name]
+                             [--version]
   examples:
-  - summary: Save the key with PEM encoding
-    syntax:
-      content: az keyvault key download --vault-name MyKeyVault -n MyKey -e PEM -f mykey.pem
-  - summary: Save the key with DER encoding
-    syntax:
-      content: az keyvault key download --vault-name MyKeyVault -n MyKey -e DER -f mykey.der
-  parameters:
+  - summary: Save the key with PEM encoding.
+    syntax: az keyvault key download --vault-name MyKeyVault -n MyKey -e PEM -f mykey.pem
+  - summary: Save the key with DER encoding.
+    syntax: az keyvault key download --vault-name MyKeyVault -n MyKey -e DER -f mykey.der
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the key contents.
     description: ''
+  optionalParameters:
   - name: --encoding -e
     defaultValue: PEM
     parameterValueGroup: DER, PEM
     summary: 'Encoding of the key, default: PEM.'
     description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. Required if --id is not specified.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  - name: --version -v
+    summary: The key version. If omitted, uses the latest version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_encrypt
+  name: az keyvault key encrypt
+  summary: Encrypt an arbitrary sequence of bytes using an encryption key that is stored in a Vault or HSM.
+  description: The ENCRYPT operation encrypts an arbitrary sequence of bytes using an encryption key that is stored in Vault or HSM. Note that the ENCRYPT operation only supports a single block of data, the size of which is dependent on the target key and the encryption algorithm to be used. The ENCRYPT operation is only strictly necessary for symmetric keys stored in Vault pr HSM since protection with an asymmetric key can be performed using public portion of the key. This operation is supported for asymmetric keys as a convenience for callers that have a key-reference but do not have access to the public key material. This operation requires the keys/encrypt permission.
+  syntax: >-
+    az keyvault key encrypt --algorithm {RSA-OAEP, RSA-OAEP-256, RSA1_5}
+                            --value
+                            [--data-type {base64, plaintext}]
+                            [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--subscription]
+                            [--vault-name]
+                            [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --algorithm -a
+    parameterValueGroup: RSA-OAEP, RSA-OAEP-256, RSA1_5
+    summary: Algorithm identifier.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: The value to be encrypted. Default data type is Base64 encoded string.
+    description: ''
+  optionalParameters:
+  - name: --data-type
+    defaultValue: base64
+    parameterValueGroup: base64, plaintext
+    summary: The type of the original data.
+    description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The key version. If omitted, uses the latest version.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_get-policy-template
+  name: az keyvault key get-policy-template
+  summary: Return policy template as JSON encoded policy definition.
+  description: ''
+  syntax: az keyvault key get-policy-template [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_import
   name: az keyvault key import
   summary: Import a private key.
-  description: Supports importing base64 encoded private keys from PEM files. Supports importing BYOK keys into HSM for premium key vaults.
-  langs:
-  - azurecli
-  parameters:
+  description: Supports importing base64 encoded private keys from PEM files or strings. Supports importing BYOK keys into HSM for premium key vaults.
+  syntax: >-
+    az keyvault key import [--byok-file]
+                           [--byok-string]
+                           [--curve {P-256, P-256K, P-384, P-521}]
+                           [--disabled {false, true}]
+                           [--expires]
+                           [--hsm-name]
+                           [--id]
+                           [--kty {EC, RSA}]
+                           [--name]
+                           [--not-before]
+                           [--ops {decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey}]
+                           [--pem-file]
+                           [--pem-password]
+                           [--pem-string]
+                           [--protection {hsm, software}]
+                           [--subscription]
+                           [--tags]
+                           [--vault-name]
+  optionalParameters:
+  - name: --byok-file
+    summary: BYOK file containing the key to be imported. Must not be password protected.
+    description: ''
+  - name: --byok-string
+    summary: BYOK string containing the key to be imported. Must not be password protected.
+    description: ''
+  - name: --curve
+    parameterValueGroup: P-256, P-256K, P-384, P-521
+    summary: The curve name of the key to import (only for BYOK).
+    description: ''
   - name: --disabled
     parameterValueGroup: false, true
     summary: Create key in disabled state.
@@ -189,30 +329,26 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
-  - name: --not-before
-    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --ops
-    parameterValueGroup: decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey
-    summary: Space-separated list of permitted JSON web key operations.
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
     description: ''
-  - name: --protection -p
-    parameterValueGroup: hsm, software
-    summary: Specifies the type of key protection.
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --kty
+    defaultValue: RSA
+    parameterValueGroup: EC, RSA
+    summary: The type of key to import (only for BYOK).
     description: ''
-  - isRequired: true
-    name: --name -n
+  - name: --name -n
     summary: Name of the key.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --not-before
+    summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
-  - name: --byok-file
-    summary: BYOK file containing the key to be imported. Must not be password protected.
+  - name: --ops
+    parameterValueGroup: decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey
+    summary: Space-separated list of permitted JSON web key operations.
     description: ''
   - name: --pem-file
     summary: PEM file containing the key to be imported.
@@ -220,170 +356,243 @@ items:
   - name: --pem-password
     summary: Password of PEM file.
     description: ''
+  - name: --pem-string
+    summary: PEM string containing the key to be imported.
+    description: ''
+  - name: --protection -p
+    parameterValueGroup: hsm, software
+    summary: Specifies the type of key protection.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_list
   name: az keyvault key list
-  summary: List keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and tags are provided in the response. Individual versions of a key are not listed in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: List keys in the specified Vault or HSM.
+  description: Retrieve a list of the keys in the Vault or HSM as JSON Web Key structures that contain the public part of a stored key. The LIST operation is applicable to all key types, however only the base key identifier, attributes, and tags are provided in the response. Individual versions of a key are not listed in the response. This operation requires the keys/list permission.
+  syntax: >-
+    az keyvault key list [--hsm-name]
+                         [--id]
+                         [--include-managed {false, true}]
+                         [--maxresults]
+                         [--query-examples]
+                         [--subscription]
+                         [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --include-managed
+    parameterValueGroup: false, true
+    summary: 'Include managed keys. Default: false.'
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_list_deleted
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_list-deleted
   name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-  description: Retrieves a list of the keys in the Key Vault as JSON Web Key structures that contain the public part of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is applicable for vaults enabled for soft-delete. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: List the deleted keys in the specified Vault or HSM.
+  description: Retrieve a list of the keys in the Vault or HSM as JSON Web Key structures that contain the public part of a deleted key. This operation includes deletion-specific information. The Get Deleted Keys operation is applicable for vaults enabled for soft-delete. While the operation can be invoked on any Vault or HSM, it will return an error if invoked on a non soft-delete enabled Vault or HSM. This operation requires the keys/list permission.
+  syntax: >-
+    az keyvault key list-deleted [--hsm-name]
+                                 [--id]
+                                 [--maxresults]
+                                 [--subscription]
+                                 [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_list_versions
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_list-versions
   name: az keyvault key list-versions
   summary: Retrieves a list of individual key versions with the same key name.
   description: The full key identifier, attributes, and tags are provided in the response. This operation requires the keys/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
+  syntax: >-
+    az keyvault key list-versions [--hsm-name]
+                                  [--id]
+                                  [--maxresults]
+                                  [--name]
+                                  [--subscription]
+                                  [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
     description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --maxresults
+    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_purge
   name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-  description: The Purge Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/purge permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Permanently delete the specified key.
+  description: The Purge Deleted Key operation is applicable for soft-delete enabled Vaults or HSMs. While the operation can be invoked on any Vault or HSM, it will return an error if invoked on a non soft-delete enabled Vault or HSM. This operation requires the keys/purge permission.
+  syntax: >-
+    az keyvault key purge [--hsm-name]
+                          [--id]
+                          [--name]
+                          [--subscription]
+                          [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_recover
   name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-  description: The Recover Deleted Key operation is applicable for deleted keys in soft-delete enabled vaults. It recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will return an error. Consider this the inverse of the delete operation on soft-delete enabled vaults. This operation requires the keys/recover permission.
-  langs:
-  - azurecli
-  parameters:
+  summary: Recover the deleted key to its latest version.
+  description: The Recover Deleted Key operation is applicable for deleted keys in soft-delete enabled Vaults or HSMs. It recovers the deleted key back to its latest version under /keys. An attempt to recover an non-deleted key will return an error. Consider this the inverse of the delete operation on soft-delete enabled Vaults or HSMs. This operation requires the keys/recover permission.
+  syntax: >-
+    az keyvault key recover [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--subscription]
+                            [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_restore
   name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-  description: 'Imports a previously backed up key into Azure Key Vault, restoring the key, its key identifier, attributes and access control policies. The RESTORE operation may be used to import a previously backed up key. Individual versions of a key cannot be restored. The key is restored in its entirety with the same key name as it had when it was backed up. If the key name is not available in the target Key Vault, the RESTORE operation will be rejected. While the key name is retained during restore, the final key identifier will change if the key is restored to a different vault. Restore will restore all versions and preserve version identifiers. The RESTORE operation is subject to security constraints: The target Key Vault must be owned by the same Microsoft Azure Subscription as the source Key Vault The user must have RESTORE permission in the target Key Vault. This operation requires the keys/restore permission.'
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --file -f
+  summary: Restore a backed up key to a Vault or HSM.
+  description: Import a previously backed up key into Vault or HSM, restoring the key, its key identifier, attributes and access control policies. The RESTORE operation may be used to import a previously backed up key. Individual versions of a key cannot be restored. The key is restored in its entirety with the same key name as it had when it was backed up. If the key name is not available in the target Key Vault, the RESTORE operation will be rejected. While the key name is retained during restore, the final key identifier will change if the key is restored to a different Vault or HSM. Restore will restore all versions and preserve version identifiers. The RESTORE operation is subject to security constraints. The target Vault or HSM must be owned by the same Microsoft Azure Subscription as the source Vault or HSM. The user must have RESTORE permission in the target Vault or HSM. This operation requires the keys/restore permission.
+  syntax: >-
+    az keyvault key restore [--backup-folder]
+                            [--blob-container-name]
+                            [--file]
+                            [--hsm-name]
+                            [--id]
+                            [--name]
+                            [--no-wait]
+                            [--storage-account-name]
+                            [--storage-container-SAS-token]
+                            [--storage-resource-uri]
+                            [--subscription]
+                            [--vault-name]
+  optionalParameters:
+  - name: --backup-folder
+    summary: Name of the blob container which contains the backup.
+    description: ''
+  - name: --blob-container-name
+    summary: Name of Blob Container.
+    description: ''
+  - name: --file -f
     summary: Local key backup from which to restore key.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. (Only for restoring from storage account).
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-name
+    summary: Name of Azure Storage Account.
+    description: ''
+  - name: --storage-container-SAS-token -t
+    summary: The SAS token pointing to an Azure Blob storage container.
+    description: ''
+  - name: --storage-resource-uri -u
+    summary: Azure Blob storage container Uri. If specified, all other 'Storage Id' arguments should be omitted.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_set_attributes
+  - name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_set-attributes
   name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-  description: 'In order to perform this operation, the key must already exist in the Key Vault. Note: The cryptographic material of a key itself cannot be changed. This operation requires the keys/update permission.'
-  langs:
-  - azurecli
-  parameters:
+  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Vault or HSM.
+  description: In order to perform this operation, the key must already exist in the Vault or HSM. The cryptographic material of a key itself cannot be changed. This operation requires the keys/update permission.
+  syntax: >-
+    az keyvault key set-attributes [--enabled {false, true}]
+                                   [--expires]
+                                   [--hsm-name]
+                                   [--id]
+                                   [--name]
+                                   [--not-before]
+                                   [--ops {decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey}]
+                                   [--subscription]
+                                   [--tags]
+                                   [--vault-name]
+                                   [--version]
+  optionalParameters:
   - name: --enabled
     parameterValueGroup: false, true
     summary: Enable the key.
@@ -391,133 +600,115 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
+  - name: --id
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the key. Required if --id is not specified.
+    description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
   - name: --ops
-    parameterValueGroup: decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey
+    parameterValueGroup: decrypt, encrypt, export, import, sign, unwrapKey, verify, wrapKey
     summary: Space-separated list of permitted JSON web key operations.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the key. Required if --id is not specified.
-    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The key version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_key_show
   name: az keyvault key show
   summary: Gets the public part of a stored key.
   description: The get key operation is applicable to all key types. If the requested key is symmetric, then no key material is released in the response. This operation requires the keys/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault key show [--hsm-name]
+                         [--id]
+                         [--name]
+                         [--query-examples]
+                         [--subscription]
+                         [--vault-name]
+                         [--version]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: Id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The key version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_key_show_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_key_show-deleted
   name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
-  description: The Get Deleted Key operation is applicable for soft-delete enabled vaults. While the operation can be invoked on any vault, it will return an error if invoked on a non soft-delete enabled vault. This operation requires the keys/get permission. .
-  langs:
-  - azurecli
-  parameters:
+  summary: Get the public part of a deleted key.
+  description: The Get Deleted Key operation is applicable for soft-delete enabled Vaults or HSMs. While the operation can be invoked on any Vault or HSM, it will return an error if invoked on a non soft-delete enabled Vault or HSM. This operation requires the keys/get permission.
+  syntax: >-
+    az keyvault key show-deleted [--hsm-name]
+                                 [--id]
+                                 [--name]
+                                 [--subscription]
+                                 [--vault-name]
+  optionalParameters:
+  - name: --hsm-name
+    summary: Name of the HSM. (--hsm-name and --vault-name are mutually exclusive, please specify just one of them).
+    description: ''
   - name: --id
-    summary: The recovery id of the key.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the key. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the key. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_key_backup
-  name: az keyvault key backup
-  summary: Requests that a backup of the specified key be downloaded to the client.
-- uid: az_keyvault_key_create
-  name: az keyvault key create
-  summary: Creates a new key, stores it, then returns key parameters and attributes to the client.
-- uid: az_keyvault_key_delete
-  name: az keyvault key delete
-  summary: Deletes a key of any type from storage in Azure Key Vault.
-- uid: az_keyvault_key_download
-  name: az keyvault key download
-  summary: Downloads the public part of a stored key.
-- uid: az_keyvault_key_import
-  name: az keyvault key import
-  summary: Import a private key.
-- uid: az_keyvault_key_list
-  name: az keyvault key list
-  summary: List keys in the specified vault.
-- uid: az_keyvault_key_list_deleted
-  name: az keyvault key list-deleted
-  summary: Lists the deleted keys in the specified vault.
-- uid: az_keyvault_key_list_versions
-  name: az keyvault key list-versions
-  summary: Retrieves a list of individual key versions with the same key name.
-- uid: az_keyvault_key_purge
-  name: az keyvault key purge
-  summary: Permanently deletes the specified key.
-- uid: az_keyvault_key_recover
-  name: az keyvault key recover
-  summary: Recovers the deleted key to its latest version.
-- uid: az_keyvault_key_restore
-  name: az keyvault key restore
-  summary: Restores a backed up key to a vault.
-- uid: az_keyvault_key_set_attributes
-  name: az keyvault key set-attributes
-  summary: The update key operation changes specified attributes of a stored key and can be applied to any key type and key version stored in Azure Key Vault.
-- uid: az_keyvault_key_show
-  name: az keyvault key show
-  summary: Gets the public part of a stored key.
-- uid: az_keyvault_key_show_deleted
-  name: az keyvault key show-deleted
-  summary: Gets the public part of a deleted key.
+- az_keyvault_key_backup
+- az_keyvault_key_create
+- az_keyvault_key_decrypt
+- az_keyvault_key_delete
+- az_keyvault_key_download
+- az_keyvault_key_encrypt
+- az_keyvault_key_get-policy-template
+- az_keyvault_key_import
+- az_keyvault_key_list
+- az_keyvault_key_list-deleted
+- az_keyvault_key_list-versions
+- az_keyvault_key_purge
+- az_keyvault_key_recover
+- az_keyvault_key_restore
+- az_keyvault_key_set-attributes
+- az_keyvault_key_show
+- az_keyvault_key_show-deleted
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -533,10 +724,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage keys.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/keyvault/secret.yml b/2018-03-01-hybrid/docs-ref-autogen/keyvault/secret.yml
index b710fc8da4..4ab771fe2f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/keyvault/secret.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/keyvault/secret.yml
@@ -1,270 +1,282 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_keyvault_secret
-  name: az keyvault secret
-  summary: Manage secrets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_keyvault_secret_backup
-  - az_keyvault_secret_delete
-  - az_keyvault_secret_download
-  - az_keyvault_secret_list
-  - az_keyvault_secret_list_deleted
-  - az_keyvault_secret_list_versions
-  - az_keyvault_secret_purge
-  - az_keyvault_secret_recover
-  - az_keyvault_secret_restore
-  - az_keyvault_secret_set
-  - az_keyvault_secret_set_attributes
-  - az_keyvault_secret_show
-  - az_keyvault_secret_show_deleted
+### YamlMime:AzureCLIGroup
+uid: az_keyvault_secret
+name: az keyvault secret
+summary: Manage secrets.
+description: ''
+directCommands:
 - uid: az_keyvault_secret_backup
   name: az keyvault secret backup
   summary: Backs up the specified secret.
   description: Requests that a backup of the specified secret be downloaded to the client. All versions of the secret will be downloaded. This operation requires the secrets/backup permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret backup --file
+                              [--id]
+                              [--name]
+                              [--subscription]
+                              [--vault-name]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the secret contents.
     description: ''
+  optionalParameters:
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_delete
   name: az keyvault secret delete
   summary: Deletes a secret from a specified key vault.
   description: The DELETE operation applies to any secret stored in Azure Key Vault. DELETE cannot be applied to an individual version of a secret. This operation requires the secrets/delete permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret delete [--id]
+                              [--name]
+                              [--subscription]
+                              [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_download
   name: az keyvault secret download
   summary: Download a secret from a KeyVault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret download --file
+                                [--encoding {ascii, base64, hex, utf-16be, utf-16le, utf-8}]
+                                [--id]
+                                [--name]
+                                [--subscription]
+                                [--vault-name]
+                                [--version]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the secret contents.
     description: ''
+  optionalParameters:
   - name: --encoding -e
     parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
     summary: Encoding of the secret. By default, will look for the 'file-encoding' tag on the secret. Otherwise will assume 'utf-8'.
     description: ''
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The secret version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_list
   name: az keyvault secret list
   summary: List secrets in a specified key vault.
   description: The Get Secrets operation is applicable to the entire vault. However, only the base secret identifier and its attributes are provided in the response. Individual secret versions are not listed in the response. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret list [--id]
+                            [--include-managed {false, true}]
+                            [--maxresults]
+                            [--query-examples]
+                            [--subscription]
+                            [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault or HSM. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --include-managed
+    parameterValueGroup: false, true
+    summary: 'Include managed secrets. Default: false.'
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
     description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_list_deleted
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_list-deleted
   name: az keyvault secret list-deleted
   summary: Lists deleted secrets for the specified vault.
   description: The Get Deleted Secrets operation returns the secrets that have been deleted for a vault enabled for soft-delete. This operation requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
-  - name: --maxresults
-    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
-    description: ''
+  syntax: >-
+    az keyvault secret list-deleted --vault-name
+                                    [--id]
+                                    [--maxresults]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Vault. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --maxresults
+    summary: Maximum number of results to return in a page. If not specified the service will return up to 25 results.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_list-versions
   name: az keyvault secret list-versions
   summary: List all versions of the specified secret.
   description: The full secret identifier and attributes are provided in the response. No values are returned for the secrets. This operations requires the secrets/list permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret list-versions [--id]
+                                     [--maxresults]
+                                     [--name]
+                                     [--subscription]
+                                     [--vault-name]
+  optionalParameters:
+  - name: --id
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
+    description: ''
   - name: --maxresults
     summary: Maximum number of results to return in a page. If not specified, the service will return up to 25 results.
     description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Key Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_purge
   name: az keyvault secret purge
   summary: Permanently deletes the specified secret.
   description: The purge deleted secret operation removes the secret permanently, without the possibility of recovery. This operation can only be enabled on a soft-delete enabled vault. This operation requires the secrets/purge permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret purge [--id]
+                             [--name]
+                             [--subscription]
+                             [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_recover
   name: az keyvault secret recover
   summary: Recovers the deleted secret to the latest version.
   description: Recovers the deleted secret in the specified vault. This operation can only be performed on a soft-delete enabled vault. This operation requires the secrets/recover permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret recover [--id]
+                               [--name]
+                               [--subscription]
+                               [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_restore
   name: az keyvault secret restore
   summary: Restores a backed up secret to a vault.
   description: Restores a backed up secret, and all its versions, to a vault. This operation requires the secrets/restore permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret restore --file
+                               --vault-name
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --file -f
     summary: File to receive the secret contents.
     description: ''
   - isRequired: true
     name: --vault-name
-    summary: Name of the key vault.
+    summary: Name of the Vault.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_set
   name: az keyvault secret set
   summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret set --name
+                           --vault-name
+                           [--description]
+                           [--disabled {false, true}]
+                           [--encoding {ascii, base64, hex, utf-16be, utf-16le, utf-8}]
+                           [--expires]
+                           [--file]
+                           [--not-before]
+                           [--subscription]
+                           [--tags]
+                           [--value]
+  examples:
+  - summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
+    syntax: az keyvault secret set --name MySecretName --vault-name MyKeyVault --value MyVault
+  - summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault through a file.
+    syntax: az keyvault secret set --name MySecretName --vault-name MyKeyVault --file /path/to/file --encoding MyEncoding
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - isRequired: true
+    name: --vault-name
+    summary: Name of the Vault.
+    description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the secret contents (e.g. password, connection string, etc).
     description: ''
@@ -272,50 +284,46 @@ items:
     parameterValueGroup: false, true
     summary: Create secret in disabled state.
     description: ''
+  - name: --encoding -e
+    defaultValue: utf-8
+    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
+    summary: Source file encoding. The value is saved as a tag (`file-encoding=<val>`) and used during download to automatically encode the resulting file.
+    description: ''
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --file -f
+    summary: Source file for secret. Use in conjunction with '--encoding'.
+    description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --encoding -e
-    defaultValue: utf-8
-    parameterValueGroup: ascii, base64, hex, utf-16be, utf-16le, utf-8
-    summary: Source file encoding. The value is saved as a tag (`file-encoding=&lt;val&gt;`) and used during download to automatically encode the resulting file.
-    description: ''
-  - name: --file -f
-    summary: Source file for secret. Use in conjunction with '--encoding'.
-    description: ''
   - name: --value
     summary: Plain text secret value. Cannot be used with '--file' or '--encoding'.
     description: ''
-  - isRequired: true
-    name: --name -n
-    summary: Name of the secret.
-    description: ''
-  - isRequired: true
-    name: --vault-name
-    summary: Name of the key vault.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_set_attributes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_set-attributes
   name: az keyvault secret set-attributes
   summary: Updates the attributes associated with a specified secret in a given key vault.
   description: The UPDATE operation changes specified attributes of an existing stored secret. Attributes that are not specified in the request are left unchanged. The value of a secret itself cannot be changed. This operation requires the secrets/set permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret set-attributes [--content-type]
+                                      [--enabled {false, true}]
+                                      [--expires]
+                                      [--id]
+                                      [--name]
+                                      [--not-before]
+                                      [--subscription]
+                                      [--tags]
+                                      [--vault-name]
+                                      [--version]
+  optionalParameters:
   - name: --content-type
     summary: Type of the secret value such as a password.
     description: ''
@@ -326,126 +334,96 @@ items:
   - name: --expires
     summary: Expiration UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --id
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
+    description: ''
+  - name: --name -n
+    summary: Name of the secret. Required if --id is not specified.
+    description: ''
   - name: --not-before
     summary: Key not usable before the provided UTC datetime  (Y-m-d'T'H:M:S'Z').
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
-    description: ''
-  - name: --name -n
-    summary: Name of the secret. Required if --id is not specified.
-    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The secret version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 - uid: az_keyvault_secret_show
   name: az keyvault secret show
   summary: Get a specified secret from a given key vault.
   description: The GET operation is applicable to any secret stored in Azure Key Vault. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret show [--id]
+                            [--name]
+                            [--query-examples]
+                            [--subscription]
+                            [--vault-name]
+                            [--version]
+  optionalParameters:
   - name: --id
-    summary: Id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: Id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
+    summary: Name of the Key Vault. Required if --id is not specified.
     description: ''
   - name: --version -v
     summary: The secret version. If omitted, uses the latest version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_keyvault_secret_show_deleted
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
+- uid: az_keyvault_secret_show-deleted
   name: az keyvault secret show-deleted
   summary: Gets the specified deleted secret.
   description: The Get Deleted Secret operation returns the specified deleted secret along with its attributes. This operation requires the secrets/get permission.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az keyvault secret show-deleted [--id]
+                                    [--name]
+                                    [--subscription]
+                                    [--vault-name]
+  optionalParameters:
   - name: --id
-    summary: The recovery id of the secret.  If specified all other 'Id' arguments should be omitted.
+    summary: The recovery id of the secret. If specified all other 'Id' arguments should be omitted.
     description: ''
   - name: --name -n
     summary: Name of the secret. Required if --id is not specified.
     description: ''
-  - name: --vault-name
-    summary: Name of the key vault. Required if --id is not specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vault-name
+    summary: Name of the Vault. Required if --id is not specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
 commands:
-- uid: az_keyvault_secret_backup
-  name: az keyvault secret backup
-  summary: Backs up the specified secret.
-- uid: az_keyvault_secret_delete
-  name: az keyvault secret delete
-  summary: Deletes a secret from a specified key vault.
-- uid: az_keyvault_secret_download
-  name: az keyvault secret download
-  summary: Download a secret from a KeyVault.
-- uid: az_keyvault_secret_list
-  name: az keyvault secret list
-  summary: List secrets in a specified key vault.
-- uid: az_keyvault_secret_list_deleted
-  name: az keyvault secret list-deleted
-  summary: Lists deleted secrets for the specified vault.
-- uid: az_keyvault_secret_list_versions
-  name: az keyvault secret list-versions
-  summary: List all versions of the specified secret.
-- uid: az_keyvault_secret_purge
-  name: az keyvault secret purge
-  summary: Permanently deletes the specified secret.
-- uid: az_keyvault_secret_recover
-  name: az keyvault secret recover
-  summary: Recovers the deleted secret to the latest version.
-- uid: az_keyvault_secret_restore
-  name: az keyvault secret restore
-  summary: Restores a backed up secret to a vault.
-- uid: az_keyvault_secret_set
-  name: az keyvault secret set
-  summary: Create a secret (if one doesn't exist) or update a secret in a KeyVault.
-- uid: az_keyvault_secret_set_attributes
-  name: az keyvault secret set-attributes
-  summary: Updates the attributes associated with a specified secret in a given key vault.
-- uid: az_keyvault_secret_show
-  name: az keyvault secret show
-  summary: Get a specified secret from a given key vault.
-- uid: az_keyvault_secret_show_deleted
-  name: az keyvault secret show-deleted
-  summary: Gets the specified deleted secret.
+- az_keyvault_secret_backup
+- az_keyvault_secret_delete
+- az_keyvault_secret_download
+- az_keyvault_secret_list
+- az_keyvault_secret_list-deleted
+- az_keyvault_secret_list-versions
+- az_keyvault_secret_purge
+- az_keyvault_secret_recover
+- az_keyvault_secret_restore
+- az_keyvault_secret_set
+- az_keyvault_secret_set-attributes
+- az_keyvault_secret_show
+- az_keyvault_secret_show-deleted
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -461,10 +439,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1823d460a40a82c01883f137f8736c431b9cc554/src/azure-cli/azure/cli/command_modules/keyvault/_help.py
-updated_at: 5/28/2020 9:30:48 AM
-ms.date: 05/28/2020
-description: Manage secrets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/01/2021
+  description: Manage secrets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto.yml
new file mode 100644
index 0000000000..bc47bb13e6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto.yml
@@ -0,0 +1,100 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto
+name: az kusto
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Kusto resources.
+description: This module will not be supported starting January 1, 2021. Please execute "az extension add -n kusto" to install the supported Kusto extension.
+commands:
+- az_kusto_attached-database-configuration
+- az_kusto_attached-database-configuration_create
+- az_kusto_attached-database-configuration_delete
+- az_kusto_attached-database-configuration_list
+- az_kusto_attached-database-configuration_show
+- az_kusto_attached-database-configuration_update
+- az_kusto_attached-database-configuration_wait
+- az_kusto_cluster
+- az_kusto_cluster_add-language-extension
+- az_kusto_cluster_create
+- az_kusto_cluster_delete
+- az_kusto_cluster_detach-follower-database
+- az_kusto_cluster_diagnose-virtual-network
+- az_kusto_cluster_list
+- az_kusto_cluster_list-follower-database
+- az_kusto_cluster_list-language-extension
+- az_kusto_cluster_list-sku
+- az_kusto_cluster_remove-language-extension
+- az_kusto_cluster_show
+- az_kusto_cluster_start
+- az_kusto_cluster_stop
+- az_kusto_cluster_update
+- az_kusto_cluster_wait
+- az_kusto_cluster-principal-assignment
+- az_kusto_cluster-principal-assignment_create
+- az_kusto_cluster-principal-assignment_delete
+- az_kusto_cluster-principal-assignment_list
+- az_kusto_cluster-principal-assignment_show
+- az_kusto_cluster-principal-assignment_update
+- az_kusto_cluster-principal-assignment_wait
+- az_kusto_database
+- az_kusto_database_add-principal
+- az_kusto_database_create
+- az_kusto_database_delete
+- az_kusto_database_list
+- az_kusto_database_list-principal
+- az_kusto_database_remove-principal
+- az_kusto_database_show
+- az_kusto_database_update
+- az_kusto_database_wait
+- az_kusto_database-principal-assignment
+- az_kusto_database-principal-assignment_create
+- az_kusto_database-principal-assignment_delete
+- az_kusto_database-principal-assignment_list
+- az_kusto_database-principal-assignment_show
+- az_kusto_database-principal-assignment_update
+- az_kusto_database-principal-assignment_wait
+- az_kusto_data-connection
+- az_kusto_data-connection_delete
+- az_kusto_data-connection_event-grid
+- az_kusto_data-connection_event-grid_create
+- az_kusto_data-connection_event-grid_data-connection-validation
+- az_kusto_data-connection_event-grid_update
+- az_kusto_data-connection_event-hub
+- az_kusto_data-connection_event-hub_create
+- az_kusto_data-connection_event-hub_data-connection-validation
+- az_kusto_data-connection_event-hub_update
+- az_kusto_data-connection_iot-hub
+- az_kusto_data-connection_iot-hub_create
+- az_kusto_data-connection_iot-hub_data-connection-validation
+- az_kusto_data-connection_iot-hub_update
+- az_kusto_data-connection_list
+- az_kusto_data-connection_show
+- az_kusto_data-connection_wait
+- az_kusto_operation-result
+- az_kusto_operation-result_show
+- az_kusto_script
+- az_kusto_script_create
+- az_kusto_script_delete
+- az_kusto_script_list
+- az_kusto_script_show
+- az_kusto_script_update
+- az_kusto_script_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: This module will not be supported starting January 1, 2021. Please execute "az extension add -n kusto" to install the supported Kusto extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/attached-database-configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/attached-database-configuration.yml
new file mode 100644
index 0000000000..d7a1306b14
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/attached-database-configuration.yml
@@ -0,0 +1,279 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_attached-database-configuration
+name: az kusto attached-database-configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto attached-database-configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage attached database configuration with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_attached-database-configuration_create
+  name: az kusto attached-database-configuration create
+  summary: Create an attached database configuration.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration create --attached-database-configuration-name
+                                                    --cluster-name
+                                                    --resource-group
+                                                    [--cluster-resource-id]
+                                                    [--database-name]
+                                                    [--default-principals-modification-kind {None, Replace, Union}]
+                                                    [--location]
+                                                    [--no-wait]
+                                                    [--table-level-sharing-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cluster-resource-id
+    summary: The resource id of the cluster where the databases you would like to attach reside.
+    description: ''
+  - name: --database-name
+    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
+    description: ''
+  - name: --default-principals-modification-kind
+    parameterValueGroup: None, Replace, Union
+    summary: The default principals modification kind.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-level-sharing-properties --tls
+    summary: Table level sharing specifications.
+    description: ''
+- uid: az_kusto_attached-database-configuration_delete
+  name: az kusto attached-database-configuration delete
+  summary: Deletes the attached database configuration with the given name.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration delete --attached-database-configuration-name
+                                                    --cluster-name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--yes]
+  examples:
+  - summary: AttachedDatabaseConfigurationsDelete
+    syntax: az kusto attached-database-configuration delete --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_attached-database-configuration_list
+  name: az kusto attached-database-configuration list
+  summary: Returns the list of attached database configurations of the given Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration list --cluster-name
+                                                  --resource-group
+  examples:
+  - summary: KustoAttachedDatabaseConfigurationsListByCluster
+    syntax: az kusto attached-database-configuration list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_attached-database-configuration_show
+  name: az kusto attached-database-configuration show
+  summary: Returns an attached database configuration.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration show --attached-database-configuration-name
+                                                  --cluster-name
+                                                  --resource-group
+  examples:
+  - summary: AttachedDatabaseConfigurationsGet
+    syntax: az kusto attached-database-configuration show --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_attached-database-configuration_update
+  name: az kusto attached-database-configuration update
+  summary: Update an attached database configuration.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration update --attached-database-configuration-name
+                                                    --cluster-name
+                                                    --resource-group
+                                                    [--add]
+                                                    [--cluster-resource-id]
+                                                    [--database-name]
+                                                    [--default-principals-modification-kind {None, Replace, Union}]
+                                                    [--force-string]
+                                                    [--location]
+                                                    [--no-wait]
+                                                    [--remove]
+                                                    [--set]
+                                                    [--table-level-sharing-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --cluster-resource-id
+    summary: The resource id of the cluster where the databases you would like to attach reside.
+    description: ''
+  - name: --database-name
+    summary: The name of the database which you would like to attach, use \* if you want to follow all current and future databases.
+    description: ''
+  - name: --default-principals-modification-kind
+    parameterValueGroup: None, Replace, Union
+    summary: The default principals modification kind.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --table-level-sharing-properties --tls
+    summary: Table level sharing specifications.
+    description: ''
+- uid: az_kusto_attached-database-configuration_wait
+  name: az kusto attached-database-configuration wait
+  summary: Place the CLI in a waiting state until a condition of the kusto attached-database-configuration is met.
+  description: ''
+  syntax: >-
+    az kusto attached-database-configuration wait --attached-database-configuration-name
+                                                  --cluster-name
+                                                  --resource-group
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto attached-database-configuration is successfully created.
+    syntax: az kusto attached-database-configuration wait --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto attached-database-configuration is successfully updated.
+    syntax: az kusto attached-database-configuration wait --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto attached-database-configuration is successfully deleted.
+    syntax: az kusto attached-database-configuration wait --name "attachedDatabaseConfigurations1" --cluster-name "kustoclusterrptest4" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name --name -n
+    summary: The name of the attached database configuration.
+    description: ''
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_attached-database-configuration_create
+- az_kusto_attached-database-configuration_delete
+- az_kusto_attached-database-configuration_list
+- az_kusto_attached-database-configuration_show
+- az_kusto_attached-database-configuration_update
+- az_kusto_attached-database-configuration_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage attached database configuration with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/cluster-principal-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/cluster-principal-assignment.yml
new file mode 100644
index 0000000000..2d42a11283
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/cluster-principal-assignment.yml
@@ -0,0 +1,276 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_cluster-principal-assignment
+name: az kusto cluster-principal-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto cluster-principal-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cluster principal assignment with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_cluster-principal-assignment_create
+  name: az kusto cluster-principal-assignment create
+  summary: Create a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment create --cluster-name
+                                                 --principal-assignment-name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--principal-id]
+                                                 [--principal-type {App, Group, User}]
+                                                 [--role {AllDatabasesAdmin, AllDatabasesViewer}]
+                                                 [--tenant-id]
+  examples:
+  - summary: KustoClusterPrincipalAssignmentsCreateOrUpdate
+    syntax: az kusto cluster-principal-assignment create --cluster-name "kustoclusterrptest4" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "AllDatabasesAdmin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --role
+    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
+    summary: Cluster principal role.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_delete
+  name: az kusto cluster-principal-assignment delete
+  summary: Deletes a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment delete --cluster-name
+                                                 --principal-assignment-name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--yes]
+  examples:
+  - summary: KustoClusterPrincipalAssignmentsDelete
+    syntax: az kusto cluster-principal-assignment delete --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_list
+  name: az kusto cluster-principal-assignment list
+  summary: Lists all Kusto cluster principalAssignments.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment list --cluster-name
+                                               --resource-group
+  examples:
+  - summary: KustoPrincipalAssignmentsList
+    syntax: az kusto cluster-principal-assignment list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_show
+  name: az kusto cluster-principal-assignment show
+  summary: Gets a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment show --cluster-name
+                                               --principal-assignment-name
+                                               --resource-group
+  examples:
+  - summary: KustoClusterPrincipalAssignmentsGet
+    syntax: az kusto cluster-principal-assignment show --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_update
+  name: az kusto cluster-principal-assignment update
+  summary: Update a Kusto cluster principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment update --cluster-name
+                                                 --principal-assignment-name
+                                                 --resource-group
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--no-wait]
+                                                 [--principal-id]
+                                                 [--principal-type {App, Group, User}]
+                                                 [--remove]
+                                                 [--role {AllDatabasesAdmin, AllDatabasesViewer}]
+                                                 [--set]
+                                                 [--tenant-id]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the cluster principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --role
+    parameterValueGroup: AllDatabasesAdmin, AllDatabasesViewer
+    summary: Cluster principal role.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_cluster-principal-assignment_wait
+  name: az kusto cluster-principal-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the kusto cluster-principal-assignment is met.
+  description: ''
+  syntax: >-
+    az kusto cluster-principal-assignment wait --cluster-name
+                                               --principal-assignment-name
+                                               --resource-group
+                                               [--created]
+                                               [--custom]
+                                               [--deleted]
+                                               [--exists]
+                                               [--interval]
+                                               [--timeout]
+                                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto cluster-principal-assignment is successfully created.
+    syntax: az kusto cluster-principal-assignment wait --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto cluster-principal-assignment is successfully updated.
+    syntax: az kusto cluster-principal-assignment wait --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto cluster-principal-assignment is successfully deleted.
+    syntax: az kusto cluster-principal-assignment wait --cluster-name "kustoclusterrptest4" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_cluster-principal-assignment_create
+- az_kusto_cluster-principal-assignment_delete
+- az_kusto_cluster-principal-assignment_list
+- az_kusto_cluster-principal-assignment_show
+- az_kusto_cluster-principal-assignment_update
+- az_kusto_cluster-principal-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cluster principal assignment with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/cluster.yml
new file mode 100644
index 0000000000..5ec905fb74
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/cluster.yml
@@ -0,0 +1,666 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_cluster
+name: az kusto cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cluster with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_cluster_add-language-extension
+  name: az kusto cluster add-language-extension
+  summary: Add a list of language extensions that can run within KQL queries.
+  description: ''
+  syntax: >-
+    az kusto cluster add-language-extension --cluster-name
+                                            --resource-group
+                                            [--no-wait]
+                                            [--value]
+  examples:
+  - summary: KustoClusterAddLanguageExtensions
+    syntax: az kusto cluster add-language-extension --name "kustoclusterrptest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --value
+    summary: The list of language extensions.
+    description: >-
+      Usage: --value language-extension-name=XX
+
+
+      language-extension-name: The language extension name.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_cluster_create
+  name: az kusto cluster create
+  summary: Create a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster create --cluster-name
+                            --resource-group
+                            --sku
+                            [--enable-disk-encryption {false, true}]
+                            [--enable-double-encryption {false, true}]
+                            [--enable-purge {false, true}]
+                            [--enable-streaming-ingest {false, true}]
+                            [--engine-type {V2, V3}]
+                            [--if-match]
+                            [--if-none-match]
+                            [--key-vault-properties]
+                            [--location]
+                            [--no-wait]
+                            [--optimized-autoscale]
+                            [--tags]
+                            [--trusted-external-tenants]
+                            [--type {None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned}]
+                            [--uai]
+                            [--virtual-network-configuration]
+                            [--zones]
+  examples:
+  - summary: KustoClustersCreateOrUpdate
+    syntax: az kusto cluster create --name "kustoclusterrptest4" --type "SystemAssigned" --location "westus" --enable-double-encryption false --enable-purge true --enable-streaming-ingest true --sku name="Standard_L8s" capacity=2 tier="Standard" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The SKU of the cluster.
+    description: >-
+      Usage: --sku name=XX capacity=XX tier=XX
+
+
+      name: Required. SKU name.
+
+      capacity: The number of instances of the cluster.
+
+      tier: Required. SKU tier.
+  optionalParameters:
+  - name: --enable-disk-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the cluster's disks are encrypted.
+    description: ''
+  - name: --enable-double-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if double encryption is enabled.
+    description: ''
+  - name: --enable-purge
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the purge operations are enabled.
+    description: ''
+  - name: --enable-streaming-ingest
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the streaming ingest is enabled.
+    description: ''
+  - name: --engine-type
+    parameterValueGroup: V2, V3
+    summary: The engine type.
+    description: ''
+  - name: --if-match
+    summary: The ETag of the cluster. Omit this value to always overwrite the current cluster. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --if-none-match
+    summary: Set to '\*' to allow a new cluster to be created, but to prevent updating an existing cluster. Other values will result in a 412 Pre-condition Failed response.
+    description: ''
+  - name: --key-vault-properties
+    summary: KeyVault properties for the cluster encryption.
+    description: >-
+      Usage: --key-vault-properties key-name=XX key-version=XX key-vault-uri=XX user-identity=XX
+
+
+      key-name: Required. The name of the key vault key.
+
+      key-version: The version of the key vault key.
+
+      key-vault-uri: Required. The Uri of the key vault.
+
+      user-identity: The user assigned identity (ARM resource id) that has access to the key.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --optimized-autoscale
+    summary: Optimized auto scale definition.
+    description: >-
+      Usage: --optimized-autoscale version=XX is-enabled=XX minimum=XX maximum=XX
+
+
+      version: Required. The version of the template defined, for instance 1.
+
+      is-enabled: Required. A boolean value that indicate if the optimized autoscale feature is enabled or not.
+
+      minimum: Required. Minimum allowed instances count.
+
+      maximum: Required. Maximum allowed instances count.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --trusted-external-tenants
+    summary: The cluster's external tenants.
+    description: >-
+      Usage: --trusted-external-tenants value=XX
+
+
+      value: GUID representing an external tenant.
+
+
+      Multiple actions can be specified by using more than one --trusted-external-tenants argument.
+  - name: --type
+    parameterValueGroup: None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned
+    summary: The type of managed identity used. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user-assigned identities. The type 'None' will remove all identities.
+    description: ''
+  - name: --uai --user-assigned-identities
+    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
+    description: ''
+  - name: --virtual-network-configuration
+    summary: Virtual network definition.
+    description: >-
+      Usage: --virtual-network-configuration subnet-id=XX engine-public-ip-id=XX data-management-public-ip-id=XX
+
+
+      subnet-id: Required. The subnet resource id.
+
+      engine-public-ip-id: Required. Engine service's public IP address resource id.
+
+      data-management-public-ip-id: Required. Data management's service public IP address resource id.
+  - name: --zones
+    summary: The availability zones of the cluster.
+    description: ''
+- uid: az_kusto_cluster_delete
+  name: az kusto cluster delete
+  summary: Deletes a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster delete --cluster-name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: KustoClustersDelete
+    syntax: az kusto cluster delete --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_cluster_detach-follower-database
+  name: az kusto cluster detach-follower-database
+  summary: Detaches all followers of a database owned by this cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster detach-follower-database --attached-database-configuration-name
+                                              --cluster-name
+                                              --cluster-resource-id
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: KustoClusterDetachFollowerDatabases
+    syntax: az kusto cluster detach-follower-database --name "kustoclusterrptest4" --attached-database-configuration-name "myAttachedDatabaseConfiguration" --cluster-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/clusters/leader4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --attached-database-configuration-name
+    summary: Resource name of the attached database configuration in the follower cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --cluster-resource-id
+    summary: Resource id of the cluster that follows a database owned by this cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_diagnose-virtual-network
+  name: az kusto cluster diagnose-virtual-network
+  summary: Diagnoses network connectivity status for external resources on which the service is dependent on.
+  description: ''
+  syntax: >-
+    az kusto cluster diagnose-virtual-network --cluster-name
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: KustoClusterDiagnoseVirtualNetwork
+    syntax: az kusto cluster diagnose-virtual-network --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_list
+  name: az kusto cluster list
+  summary: Lists all Kusto clusters within a resource group. And Lists all Kusto clusters within a subscription.
+  description: ''
+  syntax: az kusto cluster list [--resource-group]
+  examples:
+  - summary: KustoClustersListByResourceGroup
+    syntax: az kusto cluster list --resource-group "kustorptest"
+  - summary: KustoClustersList
+    syntax: az kusto cluster list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_list-follower-database
+  name: az kusto cluster list-follower-database
+  summary: Returns a list of databases that are owned by this cluster and were followed by another cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster list-follower-database --cluster-name
+                                            --resource-group
+  examples:
+  - summary: KustoClusterListFollowerDatabases
+    syntax: az kusto cluster list-follower-database --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_list-language-extension
+  name: az kusto cluster list-language-extension
+  summary: Returns a list of language extensions that can run within KQL queries.
+  description: ''
+  syntax: >-
+    az kusto cluster list-language-extension --cluster-name
+                                             --resource-group
+  examples:
+  - summary: KustoClusterListLanguageExtensions
+    syntax: az kusto cluster list-language-extension --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_list-sku
+  name: az kusto cluster list-sku
+  summary: Returns the SKUs available for the provided resource. And Lists eligible SKUs for Kusto resource provider.
+  description: ''
+  syntax: >-
+    az kusto cluster list-sku [--cluster-name]
+                              [--resource-group]
+  examples:
+  - summary: KustoClustersListResourceSkus
+    syntax: az kusto cluster list-sku --name "kustoclusterrptest4" --resource-group "kustorptest"
+  - summary: KustoClustersListSkus
+    syntax: az kusto cluster list-sku
+  optionalParameters:
+  - name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_remove-language-extension
+  name: az kusto cluster remove-language-extension
+  summary: Remove a list of language extensions that can run within KQL queries.
+  description: ''
+  syntax: >-
+    az kusto cluster remove-language-extension --cluster-name
+                                               --resource-group
+                                               [--no-wait]
+                                               [--value]
+  examples:
+  - summary: KustoClusterRemoveLanguageExtensions
+    syntax: az kusto cluster remove-language-extension --name "kustoclusterrptest4" --value language-extension-name="PYTHON" --value language-extension-name="R" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --value
+    summary: The list of language extensions.
+    description: >-
+      Usage: --value language-extension-name=XX
+
+
+      language-extension-name: The language extension name.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_cluster_show
+  name: az kusto cluster show
+  summary: Gets a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster show --cluster-name
+                          --resource-group
+  examples:
+  - summary: KustoClustersGet
+    syntax: az kusto cluster show --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_cluster_start
+  name: az kusto cluster start
+  summary: Starts a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster start --cluster-name
+                           --resource-group
+                           [--no-wait]
+  examples:
+  - summary: KustoClustersStart
+    syntax: az kusto cluster start --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_stop
+  name: az kusto cluster stop
+  summary: Stops a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster stop --cluster-name
+                          --resource-group
+                          [--no-wait]
+  examples:
+  - summary: KustoClustersStop
+    syntax: az kusto cluster stop --name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_kusto_cluster_update
+  name: az kusto cluster update
+  summary: Update a Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto cluster update --cluster-name
+                            --resource-group
+                            [--enable-disk-encryption {false, true}]
+                            [--enable-double-encryption {false, true}]
+                            [--enable-purge {false, true}]
+                            [--enable-streaming-ingest {false, true}]
+                            [--engine-type {V2, V3}]
+                            [--if-match]
+                            [--key-vault-properties]
+                            [--location]
+                            [--no-wait]
+                            [--optimized-autoscale]
+                            [--sku]
+                            [--tags]
+                            [--trusted-external-tenants]
+                            [--type {None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned}]
+                            [--uai]
+                            [--virtual-network-configuration]
+  examples:
+  - summary: KustoClustersUpdate
+    syntax: az kusto cluster update --name "kustoclusterrptest4" --type "SystemAssigned" --location "westus" --enable-purge true --enable-streaming-ingest true --engine-type "V2" --key-vault-properties key-name="keyName" key-vault-uri="https://dummy.keyvault.com" key-version="keyVersion" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-disk-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the cluster's disks are encrypted.
+    description: ''
+  - name: --enable-double-encryption
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if double encryption is enabled.
+    description: ''
+  - name: --enable-purge
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the purge operations are enabled.
+    description: ''
+  - name: --enable-streaming-ingest
+    parameterValueGroup: false, true
+    summary: A boolean value that indicates if the streaming ingest is enabled.
+    description: ''
+  - name: --engine-type
+    parameterValueGroup: V2, V3
+    summary: The engine type.
+    description: ''
+  - name: --if-match
+    summary: The ETag of the cluster. Omit this value to always overwrite the current cluster. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --key-vault-properties
+    summary: KeyVault properties for the cluster encryption.
+    description: >-
+      Usage: --key-vault-properties key-name=XX key-version=XX key-vault-uri=XX user-identity=XX
+
+
+      key-name: Required. The name of the key vault key.
+
+      key-version: The version of the key vault key.
+
+      key-vault-uri: Required. The Uri of the key vault.
+
+      user-identity: The user assigned identity (ARM resource id) that has access to the key.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --optimized-autoscale
+    summary: Optimized auto scale definition.
+    description: >-
+      Usage: --optimized-autoscale version=XX is-enabled=XX minimum=XX maximum=XX
+
+
+      version: Required. The version of the template defined, for instance 1.
+
+      is-enabled: Required. A boolean value that indicate if the optimized autoscale feature is enabled or not.
+
+      minimum: Required. Minimum allowed instances count.
+
+      maximum: Required. Maximum allowed instances count.
+  - name: --sku
+    summary: The SKU of the cluster.
+    description: >-
+      Usage: --sku name=XX capacity=XX tier=XX
+
+
+      name: Required. SKU name.
+
+      capacity: The number of instances of the cluster.
+
+      tier: Required. SKU tier.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --trusted-external-tenants
+    summary: The cluster's external tenants.
+    description: >-
+      Usage: --trusted-external-tenants value=XX
+
+
+      value: GUID representing an external tenant.
+
+
+      Multiple actions can be specified by using more than one --trusted-external-tenants argument.
+  - name: --type
+    parameterValueGroup: None, SystemAssigned, SystemAssigned, UserAssigned, UserAssigned
+    summary: The type of managed identity used. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user-assigned identities. The type 'None' will remove all identities.
+    description: ''
+  - name: --uai --user-assigned-identities
+    summary: "The list of user identities associated with the Kusto cluster. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. Expected value: json-string/@json-file."
+    description: ''
+  - name: --virtual-network-configuration
+    summary: Virtual network definition.
+    description: >-
+      Usage: --virtual-network-configuration subnet-id=XX engine-public-ip-id=XX data-management-public-ip-id=XX
+
+
+      subnet-id: Required. The subnet resource id.
+
+      engine-public-ip-id: Required. Engine service's public IP address resource id.
+
+      data-management-public-ip-id: Required. Data management's service public IP address resource id.
+- uid: az_kusto_cluster_wait
+  name: az kusto cluster wait
+  summary: Place the CLI in a waiting state until a condition of the kusto cluster is met.
+  description: ''
+  syntax: >-
+    az kusto cluster wait --cluster-name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto cluster is successfully created.
+    syntax: az kusto cluster wait --name "kustoclusterrptest4" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto cluster is successfully updated.
+    syntax: az kusto cluster wait --name "kustoclusterrptest4" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto cluster is successfully deleted.
+    syntax: az kusto cluster wait --name "kustoclusterrptest4" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_cluster_add-language-extension
+- az_kusto_cluster_create
+- az_kusto_cluster_delete
+- az_kusto_cluster_detach-follower-database
+- az_kusto_cluster_diagnose-virtual-network
+- az_kusto_cluster_list
+- az_kusto_cluster_list-follower-database
+- az_kusto_cluster_list-language-extension
+- az_kusto_cluster_list-sku
+- az_kusto_cluster_remove-language-extension
+- az_kusto_cluster_show
+- az_kusto_cluster_start
+- az_kusto_cluster_stop
+- az_kusto_cluster_update
+- az_kusto_cluster_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cluster with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection.yml
new file mode 100644
index 0000000000..b7ec94af98
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection.yml
@@ -0,0 +1,197 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection
+name: az kusto data-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_delete
+  name: az kusto data-connection delete
+  summary: Deletes the data connection with the given name.
+  description: ''
+  syntax: >-
+    az kusto data-connection delete --cluster-name
+                                    --data-connection-name
+                                    --database-name
+                                    --resource-group
+                                    [--no-wait]
+                                    [--yes]
+  examples:
+  - summary: KustoDataConnectionsDelete
+    syntax: az kusto data-connection delete --cluster-name "kustoclusterrptest4" --name "kustoeventhubconnection1" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_data-connection_list
+  name: az kusto data-connection list
+  summary: Returns the list of data connections of the given Kusto database.
+  description: ''
+  syntax: >-
+    az kusto data-connection list --cluster-name
+                                  --database-name
+                                  --resource-group
+  examples:
+  - summary: KustoDatabasesListByCluster
+    syntax: az kusto data-connection list --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_data-connection_show
+  name: az kusto data-connection show
+  summary: Returns a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection show --cluster-name
+                                  --data-connection-name
+                                  --database-name
+                                  --resource-group
+  examples:
+  - summary: KustoDataConnectionsGet
+    syntax: az kusto data-connection show --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_data-connection_wait
+  name: az kusto data-connection wait
+  summary: Place the CLI in a waiting state until a condition of the kusto data-connection is met.
+  description: ''
+  syntax: >-
+    az kusto data-connection wait --cluster-name
+                                  --data-connection-name
+                                  --database-name
+                                  --resource-group
+                                  [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--interval]
+                                  [--timeout]
+                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto data-connection is successfully created.
+    syntax: az kusto data-connection wait --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto data-connection is successfully deleted.
+    syntax: az kusto data-connection wait --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_data-connection_delete
+- az_kusto_data-connection_event-grid
+- az_kusto_data-connection_event-grid_create
+- az_kusto_data-connection_event-grid_data-connection-validation
+- az_kusto_data-connection_event-grid_update
+- az_kusto_data-connection_event-hub
+- az_kusto_data-connection_event-hub_create
+- az_kusto_data-connection_event-hub_data-connection-validation
+- az_kusto_data-connection_event-hub_update
+- az_kusto_data-connection_iot-hub
+- az_kusto_data-connection_iot-hub_create
+- az_kusto_data-connection_iot-hub_data-connection-validation
+- az_kusto_data-connection_iot-hub_update
+- az_kusto_data-connection_list
+- az_kusto_data-connection_show
+- az_kusto_data-connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/event-grid.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/event-grid.yml
new file mode 100644
index 0000000000..950ecf1374
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/event-grid.yml
@@ -0,0 +1,240 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection_event-grid
+name: az kusto data-connection event-grid
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection event-grid** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto sub group event-grid.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_event-grid_create
+  name: az kusto data-connection event-grid create
+  summary: Create a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-grid create --cluster-name
+                                               --data-connection-name
+                                               --database-name
+                                               --resource-group
+                                               [--blob-storage-event-type {Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed}]
+                                               [--consumer-group]
+                                               [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                               [--event-hub-resource-id]
+                                               [--ignore-first-record {false, true}]
+                                               [--location]
+                                               [--mapping-rule-name]
+                                               [--no-wait]
+                                               [--storage-account-resource-id]
+                                               [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --blob-storage-event-type
+    parameterValueGroup: Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed
+    summary: The name of blob storage event type to process.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID where the event grid is configured to send events.
+    description: ''
+  - name: --ignore-first-record
+    parameterValueGroup: false, true
+    summary: A Boolean value that, if set to true, indicates that ingestion should ignore the first record of every file.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-resource-id
+    summary: The resource ID of the storage account where the data resides.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-grid_data-connection-validation
+  name: az kusto data-connection event-grid data-connection-validation
+  summary: Checks that the data connection parameters are valid.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-grid data-connection-validation --cluster-name
+                                                                   --database-name
+                                                                   --resource-group
+                                                                   [--blob-storage-event-type {Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed}]
+                                                                   [--consumer-group]
+                                                                   [--data-connection-name]
+                                                                   [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                                                   [--event-hub-resource-id]
+                                                                   [--ignore-first-record {false, true}]
+                                                                   [--location]
+                                                                   [--mapping-rule-name]
+                                                                   [--no-wait]
+                                                                   [--storage-account-resource-id]
+                                                                   [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --blob-storage-event-type
+    parameterValueGroup: Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed
+    summary: The name of blob storage event type to process.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID where the event grid is configured to send events.
+    description: ''
+  - name: --ignore-first-record
+    parameterValueGroup: false, true
+    summary: A Boolean value that, if set to true, indicates that ingestion should ignore the first record of every file.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-resource-id
+    summary: The resource ID of the storage account where the data resides.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-grid_update
+  name: az kusto data-connection event-grid update
+  summary: Updates a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-grid update --cluster-name
+                                               --data-connection-name
+                                               --database-name
+                                               --resource-group
+                                               [--blob-storage-event-type {Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed}]
+                                               [--consumer-group]
+                                               [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                               [--event-hub-resource-id]
+                                               [--ignore-first-record {false, true}]
+                                               [--location]
+                                               [--mapping-rule-name]
+                                               [--no-wait]
+                                               [--storage-account-resource-id]
+                                               [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --blob-storage-event-type
+    parameterValueGroup: Microsoft.Storage.BlobCreated, Microsoft.Storage.BlobRenamed
+    summary: The name of blob storage event type to process.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID where the event grid is configured to send events.
+    description: ''
+  - name: --ignore-first-record
+    parameterValueGroup: false, true
+    summary: A Boolean value that, if set to true, indicates that ingestion should ignore the first record of every file.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-account-resource-id
+    summary: The resource ID of the storage account where the data resides.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+commands:
+- az_kusto_data-connection_event-grid_create
+- az_kusto_data-connection_event-grid_data-connection-validation
+- az_kusto_data-connection_event-grid_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto sub group event-grid.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/event-hub.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/event-hub.yml
new file mode 100644
index 0000000000..6d37b40cf0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/event-hub.yml
@@ -0,0 +1,246 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection_event-hub
+name: az kusto data-connection event-hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection event-hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto sub group event-hub.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_event-hub_create
+  name: az kusto data-connection event-hub create
+  summary: Create a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-hub create --cluster-name
+                                              --data-connection-name
+                                              --database-name
+                                              --resource-group
+                                              [--compression {GZip, None}]
+                                              [--consumer-group]
+                                              [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                              [--event-hub-resource-id]
+                                              [--event-system-properties]
+                                              [--location]
+                                              [--managed-identity-resource-id]
+                                              [--mapping-rule-name]
+                                              [--no-wait]
+                                              [--table-name]
+  examples:
+  - summary: KustoDataConnectionsCreateOrUpdate
+    syntax: az kusto data-connection event-hub create --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --managed-identity-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentityTest1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compression
+    parameterValueGroup: GZip, None
+    summary: The event hub messages compression type.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID of the event hub to be used to create a data connection.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the event hub.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-identity-resource-id --mi-rid
+    summary: The resource ID of a managed identity (system or user assigned) to be used to authenticate with event hub.
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-hub_data-connection-validation
+  name: az kusto data-connection event-hub data-connection-validation
+  summary: Checks that the data connection parameters are valid.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-hub data-connection-validation --cluster-name
+                                                                  --database-name
+                                                                  --resource-group
+                                                                  [--compression {GZip, None}]
+                                                                  [--consumer-group]
+                                                                  [--data-connection-name]
+                                                                  [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                                                  [--event-hub-resource-id]
+                                                                  [--event-system-properties]
+                                                                  [--location]
+                                                                  [--managed-identity-resource-id]
+                                                                  [--mapping-rule-name]
+                                                                  [--no-wait]
+                                                                  [--table-name]
+  examples:
+  - summary: KustoDataConnectionValidation
+    syntax: az kusto data-connection event-hub data-connection-validation --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --name "DataConnections8" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --managed-identity-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentityTest1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compression
+    parameterValueGroup: GZip, None
+    summary: The event hub messages compression type.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID of the event hub to be used to create a data connection.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the event hub.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-identity-resource-id --mi-rid
+    summary: The resource ID of a managed identity (system or user assigned) to be used to authenticate with event hub.
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_event-hub_update
+  name: az kusto data-connection event-hub update
+  summary: Updates a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection event-hub update --cluster-name
+                                              --data-connection-name
+                                              --database-name
+                                              --resource-group
+                                              [--compression {GZip, None}]
+                                              [--consumer-group]
+                                              [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                              [--event-hub-resource-id]
+                                              [--event-system-properties]
+                                              [--location]
+                                              [--managed-identity-resource-id]
+                                              [--mapping-rule-name]
+                                              [--no-wait]
+                                              [--table-name]
+  examples:
+  - summary: KustoDataConnectionsUpdate
+    syntax: az kusto data-connection event-hub update --cluster-name "kustoclusterrptest4" --name "DataConnections8" --database-name "KustoDatabase8" --location "westus" --consumer-group "testConsumerGroup1" --event-hub-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1" --managed-identity-resource-id "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentityTest1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compression
+    parameterValueGroup: GZip, None
+    summary: The event hub messages compression type.
+    description: ''
+  - name: --consumer-group
+    summary: The event hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-hub-resource-id
+    summary: The resource ID of the event hub to be used to create a data connection.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the event hub.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --managed-identity-resource-id --mi-rid
+    summary: The resource ID of a managed identity (system or user assigned) to be used to authenticate with event hub.
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+commands:
+- az_kusto_data-connection_event-hub_create
+- az_kusto_data-connection_event-hub_data-connection-validation
+- az_kusto_data-connection_event-hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto sub group event-hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/iot-hub.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/iot-hub.yml
new file mode 100644
index 0000000000..8da72b7d4f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/data-connection/iot-hub.yml
@@ -0,0 +1,222 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_data-connection_iot-hub
+name: az kusto data-connection iot-hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto data-connection iot-hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data connection with kusto sub group iot-hub.
+description: ''
+directCommands:
+- uid: az_kusto_data-connection_iot-hub_create
+  name: az kusto data-connection iot-hub create
+  summary: Create a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection iot-hub create --cluster-name
+                                            --data-connection-name
+                                            --database-name
+                                            --resource-group
+                                            [--consumer-group]
+                                            [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                            [--event-system-properties]
+                                            [--iot-hub-resource-id]
+                                            [--location]
+                                            [--mapping-rule-name]
+                                            [--no-wait]
+                                            [--shared-access-policy-name]
+                                            [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consumer-group
+    summary: The iot hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the iot hub.
+    description: ''
+  - name: --iot-hub-resource-id
+    summary: The resource ID of the Iot hub to be used to create a data connection.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --shared-access-policy-name
+    summary: The name of the share access policy.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_iot-hub_data-connection-validation
+  name: az kusto data-connection iot-hub data-connection-validation
+  summary: Checks that the data connection parameters are valid.
+  description: ''
+  syntax: >-
+    az kusto data-connection iot-hub data-connection-validation --cluster-name
+                                                                --database-name
+                                                                --resource-group
+                                                                [--consumer-group]
+                                                                [--data-connection-name]
+                                                                [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                                                [--event-system-properties]
+                                                                [--iot-hub-resource-id]
+                                                                [--location]
+                                                                [--mapping-rule-name]
+                                                                [--no-wait]
+                                                                [--shared-access-policy-name]
+                                                                [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consumer-group
+    summary: The iot hub consumer group.
+    description: ''
+  - name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the iot hub.
+    description: ''
+  - name: --iot-hub-resource-id
+    summary: The resource ID of the Iot hub to be used to create a data connection.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --shared-access-policy-name
+    summary: The name of the share access policy.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+- uid: az_kusto_data-connection_iot-hub_update
+  name: az kusto data-connection iot-hub update
+  summary: Updates a data connection.
+  description: ''
+  syntax: >-
+    az kusto data-connection iot-hub update --cluster-name
+                                            --data-connection-name
+                                            --database-name
+                                            --resource-group
+                                            [--consumer-group]
+                                            [--data-format {APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE}]
+                                            [--event-system-properties]
+                                            [--iot-hub-resource-id]
+                                            [--location]
+                                            [--mapping-rule-name]
+                                            [--no-wait]
+                                            [--shared-access-policy-name]
+                                            [--table-name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --data-connection-name --name -n
+    summary: The name of the data connection.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consumer-group
+    summary: The iot hub consumer group.
+    description: ''
+  - name: --data-format
+    parameterValueGroup: APACHEAVRO, AVRO, CSV, JSON, MULTIJSON, ORC, PARQUET, PSV, RAW, SCSV, SINGLEJSON, SOHSV, TSV, TSVE, TXT, W3CLOGFILE
+    summary: The data format of the message. Optionally the data format can be added to each message.
+    description: ''
+  - name: --event-system-properties
+    summary: System properties of the iot hub.
+    description: ''
+  - name: --iot-hub-resource-id
+    summary: The resource ID of the Iot hub to be used to create a data connection.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mapping-rule-name
+    summary: The mapping rule to be used to ingest the data. Optionally the mapping information can be added to each message.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --shared-access-policy-name
+    summary: The name of the share access policy.
+    description: ''
+  - name: --table-name
+    summary: The table where the data should be ingested. Optionally the table information can be added to each message.
+    description: ''
+commands:
+- az_kusto_data-connection_iot-hub_create
+- az_kusto_data-connection_iot-hub_data-connection-validation
+- az_kusto_data-connection_iot-hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data connection with kusto sub group iot-hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/database-principal-assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/database-principal-assignment.yml
new file mode 100644
index 0000000000..036160c5a2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/database-principal-assignment.yml
@@ -0,0 +1,306 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_database-principal-assignment
+name: az kusto database-principal-assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto database-principal-assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage database principal assignment with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_database-principal-assignment_create
+  name: az kusto database-principal-assignment create
+  summary: Creates a Kusto cluster database principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment create --cluster-name
+                                                  --database-name
+                                                  --principal-assignment-name
+                                                  --resource-group
+                                                  [--no-wait]
+                                                  [--principal-id]
+                                                  [--principal-type {App, Group, User}]
+                                                  [--role {Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer}]
+                                                  [--tenant-id]
+  examples:
+  - summary: KustoDatabasePrincipalAssignmentsCreateOrUpdate
+    syntax: az kusto database-principal-assignment create --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-id "87654321-1234-1234-1234-123456789123" --principal-type "App" --role "Admin" --tenant-id "12345678-1234-1234-1234-123456789123" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --role
+    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer
+    summary: Database principal role.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_database-principal-assignment_delete
+  name: az kusto database-principal-assignment delete
+  summary: Deletes a Kusto principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment delete --cluster-name
+                                                  --database-name
+                                                  --principal-assignment-name
+                                                  --resource-group
+                                                  [--no-wait]
+                                                  [--yes]
+  examples:
+  - summary: KustoDatabasePrincipalAssignmentsDelete
+    syntax: az kusto database-principal-assignment delete --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_database-principal-assignment_list
+  name: az kusto database-principal-assignment list
+  summary: Lists all Kusto cluster database principalAssignments.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment list --cluster-name
+                                                --database-name
+                                                --resource-group
+  examples:
+  - summary: KustoPrincipalAssignmentsList
+    syntax: az kusto database-principal-assignment list --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database-principal-assignment_show
+  name: az kusto database-principal-assignment show
+  summary: Gets a Kusto cluster database principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment show --cluster-name
+                                                --database-name
+                                                --principal-assignment-name
+                                                --resource-group
+  examples:
+  - summary: KustoDatabasePrincipalAssignmentsGet
+    syntax: az kusto database-principal-assignment show --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database-principal-assignment_update
+  name: az kusto database-principal-assignment update
+  summary: Update a Kusto cluster database principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment update --cluster-name
+                                                  --database-name
+                                                  --principal-assignment-name
+                                                  --resource-group
+                                                  [--add]
+                                                  [--force-string]
+                                                  [--no-wait]
+                                                  [--principal-id]
+                                                  [--principal-type {App, Group, User}]
+                                                  [--remove]
+                                                  [--role {Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer}]
+                                                  [--set]
+                                                  [--tenant-id]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --principal-id
+    summary: The principal ID assigned to the database principal. It can be a user email, application ID, or security group name.
+    description: ''
+  - name: --principal-type
+    parameterValueGroup: App, Group, User
+    summary: Principal type.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --role
+    parameterValueGroup: Admin, Ingestor, Monitor, UnrestrictedViewer, User, Viewer
+    summary: Database principal role.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id of the principal.
+    description: ''
+- uid: az_kusto_database-principal-assignment_wait
+  name: az kusto database-principal-assignment wait
+  summary: Place the CLI in a waiting state until a condition of the kusto database-principal-assignment is met.
+  description: ''
+  syntax: >-
+    az kusto database-principal-assignment wait --cluster-name
+                                                --database-name
+                                                --principal-assignment-name
+                                                --resource-group
+                                                [--created]
+                                                [--custom]
+                                                [--deleted]
+                                                [--exists]
+                                                [--interval]
+                                                [--timeout]
+                                                [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto database-principal-assignment is successfully created.
+    syntax: az kusto database-principal-assignment wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto database-principal-assignment is successfully updated.
+    syntax: az kusto database-principal-assignment wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto database-principal-assignment is successfully deleted.
+    syntax: az kusto database-principal-assignment wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --principal-assignment-name "kustoprincipal1" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --principal-assignment-name
+    summary: The name of the Kusto principalAssignment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_database-principal-assignment_create
+- az_kusto_database-principal-assignment_delete
+- az_kusto_database-principal-assignment_list
+- az_kusto_database-principal-assignment_show
+- az_kusto_database-principal-assignment_update
+- az_kusto_database-principal-assignment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage database principal assignment with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/database.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/database.yml
new file mode 100644
index 0000000000..529c767b83
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/database.yml
@@ -0,0 +1,398 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_database
+name: az kusto database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage database with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_database_add-principal
+  name: az kusto database add-principal
+  summary: Add Database principals permissions.
+  description: ''
+  syntax: >-
+    az kusto database add-principal --cluster-name
+                                    --database-name
+                                    --resource-group
+                                    [--value]
+  examples:
+  - summary: KustoDatabaseAddPrincipals
+    syntax: az kusto database add-principal --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --value
+    summary: The list of Kusto database principals.
+    description: >-
+      Usage: --value role=XX name=XX type=XX fqn=XX email=XX app-id=XX
+
+
+      role: Required. Database principal role.
+
+      name: Required. Database principal name.
+
+      type: Required. Database principal type.
+
+      fqn: Database principal fully qualified name.
+
+      email: Database principal email if exists.
+
+      app-id: Application id - relevant only for application principal type.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_database_create
+  name: az kusto database create
+  summary: Create a database.
+  description: ''
+  syntax: >-
+    az kusto database create --cluster-name
+                             --database-name
+                             --resource-group
+                             [--no-wait]
+                             [--read-only-following-database]
+                             [--read-write-database]
+  examples:
+  - summary: Kusto ReadWrite database create or update
+    syntax: az kusto database create --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --read-write-database location="westus" soft-delete-period="P1D" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --read-only-following-database
+    summary: Class representing a read only following database.
+    description: >-
+      Usage: --read-only-following-database hot-cache-period=XX location=XX kind=XX
+
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+  - name: --read-write-database
+    summary: Class representing a read write database.
+    description: >-
+      Usage: --read-write-database soft-delete-period=XX hot-cache-period=XX location=XX kind=XX
+
+
+      soft-delete-period: The time the data should be kept before it stops being accessible to queries in TimeSpan.
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+- uid: az_kusto_database_delete
+  name: az kusto database delete
+  summary: Deletes the database with the given name.
+  description: ''
+  syntax: >-
+    az kusto database delete --cluster-name
+                             --database-name
+                             --resource-group
+                             [--no-wait]
+                             [--yes]
+  examples:
+  - summary: KustoDatabasesDelete
+    syntax: az kusto database delete --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_database_list
+  name: az kusto database list
+  summary: Returns the list of databases of the given Kusto cluster.
+  description: ''
+  syntax: >-
+    az kusto database list --cluster-name
+                           --resource-group
+  examples:
+  - summary: KustoDatabasesListByCluster
+    syntax: az kusto database list --cluster-name "kustoclusterrptest4" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database_list-principal
+  name: az kusto database list-principal
+  summary: Returns a list of database principals of the given Kusto cluster and database.
+  description: ''
+  syntax: >-
+    az kusto database list-principal --cluster-name
+                                     --database-name
+                                     --resource-group
+  examples:
+  - summary: KustoDatabaseListPrincipals
+    syntax: az kusto database list-principal --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database_remove-principal
+  name: az kusto database remove-principal
+  summary: Remove Database principals permissions.
+  description: ''
+  syntax: >-
+    az kusto database remove-principal --cluster-name
+                                       --database-name
+                                       --resource-group
+                                       [--value]
+  examples:
+  - summary: KustoDatabaseRemovePrincipals
+    syntax: az kusto database remove-principal --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --value name="Some User" type="User" app-id="" email="user@microsoft.com" fqn="aaduser=some_guid" role="Admin" --value name="Kusto" type="Group" app-id="" email="kusto@microsoft.com" fqn="aadgroup=some_guid" role="Viewer" --value name="SomeApp" type="App" app-id="some_guid_app_id" email="" fqn="aadapp=some_guid_app_id" role="Admin" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --value
+    summary: The list of Kusto database principals.
+    description: >-
+      Usage: --value role=XX name=XX type=XX fqn=XX email=XX app-id=XX
+
+
+      role: Required. Database principal role.
+
+      name: Required. Database principal name.
+
+      type: Required. Database principal type.
+
+      fqn: Database principal fully qualified name.
+
+      email: Database principal email if exists.
+
+      app-id: Application id - relevant only for application principal type.
+
+
+      Multiple actions can be specified by using more than one --value argument.
+- uid: az_kusto_database_show
+  name: az kusto database show
+  summary: Returns a database.
+  description: ''
+  syntax: >-
+    az kusto database show --cluster-name
+                           --database-name
+                           --resource-group
+  examples:
+  - summary: KustoDatabasesGet
+    syntax: az kusto database show --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_database_update
+  name: az kusto database update
+  summary: Updates a database.
+  description: ''
+  syntax: >-
+    az kusto database update --cluster-name
+                             --database-name
+                             --resource-group
+                             [--no-wait]
+                             [--read-only-following-database]
+                             [--read-write-database]
+  examples:
+  - summary: Kusto ReadWrite database create or update
+    syntax: az kusto database update --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --read-write-database location="westus" soft-delete-period="P1D" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --read-only-following-database
+    summary: Class representing a read only following database.
+    description: >-
+      Usage: --read-only-following-database hot-cache-period=XX location=XX kind=XX
+
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+  - name: --read-write-database
+    summary: Class representing a read write database.
+    description: >-
+      Usage: --read-write-database soft-delete-period=XX hot-cache-period=XX location=XX kind=XX
+
+
+      soft-delete-period: The time the data should be kept before it stops being accessible to queries in TimeSpan.
+
+      hot-cache-period: The time the data should be kept in cache for fast queries in TimeSpan.
+
+      location: Resource location.
+
+      kind: Required. Kind of the database.
+- uid: az_kusto_database_wait
+  name: az kusto database wait
+  summary: Place the CLI in a waiting state until a condition of the kusto database is met.
+  description: ''
+  syntax: >-
+    az kusto database wait --cluster-name
+                           --database-name
+                           --resource-group
+                           [--created]
+                           [--custom]
+                           [--deleted]
+                           [--exists]
+                           [--interval]
+                           [--timeout]
+                           [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto database is successfully created.
+    syntax: az kusto database wait --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --created
+  - summary: Pause executing next line of CLI script until the kusto database is successfully updated.
+    syntax: az kusto database wait --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --updated
+  - summary: Pause executing next line of CLI script until the kusto database is successfully deleted.
+    syntax: az kusto database wait --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_database_add-principal
+- az_kusto_database_create
+- az_kusto_database_delete
+- az_kusto_database_list
+- az_kusto_database_list-principal
+- az_kusto_database_remove-principal
+- az_kusto_database_show
+- az_kusto_database_update
+- az_kusto_database_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage database with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/operation-result.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/operation-result.yml
new file mode 100644
index 0000000000..6bf20d9d14
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/operation-result.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_operation-result
+name: az kusto operation-result
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto operation-result** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage operation result with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_operation-result_show
+  name: az kusto operation-result show
+  summary: Returns operation results.
+  description: ''
+  syntax: >-
+    az kusto operation-result show --location
+                                   --operation-id
+  examples:
+  - summary: KustoOperationResultsGet
+    syntax: az kusto operation-result show --operation-id "30972f1b-b61d-4fd8-bd34-3dcfa24670f3" --location "westus"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The Guid of the operation ID.
+    description: ''
+commands:
+- az_kusto_operation-result_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage operation result with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/kusto/script.yml b/2018-03-01-hybrid/docs-ref-autogen/kusto/script.yml
new file mode 100644
index 0000000000..e60724c511
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/kusto/script.yml
@@ -0,0 +1,291 @@
+### YamlMime:AzureCLIGroup
+uid: az_kusto_script
+name: az kusto script
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **kusto** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az kusto script** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage script with kusto.
+description: ''
+directCommands:
+- uid: az_kusto_script_create
+  name: az kusto script create
+  summary: Creates a Kusto database script.
+  description: ''
+  syntax: >-
+    az kusto script create --cluster-name
+                           --database-name
+                           --name
+                           --resource-group
+                           [--continue-on-errors {false, true}]
+                           [--force-update-tag]
+                           [--no-wait]
+                           [--script-url]
+                           [--script-url-sas-token]
+  examples:
+  - summary: KustoScriptsCreateOrUpdate
+    syntax: az kusto script create --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --continue-on-errors true --force-update-tag "2bcf3c21-ffd1-4444-b9dd-e52e00ee53fe" --script-url "https://mysa.blob.core.windows.net/container/script.txt" --script-url-sas-token "?sv=2019-02-02&st=2019-04-29T22%3A18%3A26Z&se=2019-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=********************************" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continue-on-errors
+    parameterValueGroup: false, true
+    summary: Flag that indicates whether to continue if one of the command fails.
+    description: ''
+  - name: --force-update-tag
+    summary: A unique string. If changed the script will be applied again.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --script-url
+    summary: The url to the KQL script blob file.
+    description: ''
+  - name: --script-url-sas-token
+    summary: The SaS token.
+    description: ''
+- uid: az_kusto_script_delete
+  name: az kusto script delete
+  summary: Deletes a Kusto principalAssignment.
+  description: ''
+  syntax: >-
+    az kusto script delete --cluster-name
+                           --database-name
+                           --name
+                           --resource-group
+                           [--no-wait]
+                           [--yes]
+  examples:
+  - summary: KustoScriptsDelete
+    syntax: az kusto script delete --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_kusto_script_list
+  name: az kusto script list
+  summary: Returns the list of database scripts for given database.
+  description: ''
+  syntax: >-
+    az kusto script list --cluster-name
+                         --database-name
+                         --resource-group
+  examples:
+  - summary: KustoScriptsList
+    syntax: az kusto script list --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_script_show
+  name: az kusto script show
+  summary: Gets a Kusto cluster database script.
+  description: ''
+  syntax: >-
+    az kusto script show --cluster-name
+                         --database-name
+                         --name
+                         --resource-group
+  examples:
+  - summary: KustoScriptsGet
+    syntax: az kusto script show --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_kusto_script_update
+  name: az kusto script update
+  summary: Updates a database script.
+  description: ''
+  syntax: >-
+    az kusto script update --cluster-name
+                           --database-name
+                           --name
+                           --resource-group
+                           [--continue-on-errors {false, true}]
+                           [--force-update-tag]
+                           [--no-wait]
+                           [--script-url]
+                           [--script-url-sas-token]
+  examples:
+  - summary: KustoScriptsUpdate
+    syntax: az kusto script update --cluster-name "kustoclusterrptest4" --database-name "KustoDatabase8" --continue-on-errors true --force-update-tag "2bcf3c21-ffd1-4444-b9dd-e52e00ee53fe" --script-url "https://mysa.blob.core.windows.net/container/script.txt" --script-url-sas-token "?sv=2019-02-02&st=2019-04-29T22%3A18%3A26Z&se=2019-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=********************************" --resource-group "kustorptest" --name "kustoScript1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continue-on-errors
+    parameterValueGroup: false, true
+    summary: Flag that indicates whether to continue if one of the command fails.
+    description: ''
+  - name: --force-update-tag
+    summary: A unique string. If changed the script will be applied again.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --script-url
+    summary: The url to the KQL script blob file.
+    description: ''
+  - name: --script-url-sas-token
+    summary: The SaS token.
+    description: ''
+- uid: az_kusto_script_wait
+  name: az kusto script wait
+  summary: Place the CLI in a waiting state until a condition of the kusto script is met.
+  description: ''
+  syntax: >-
+    az kusto script wait --cluster-name
+                         --database-name
+                         --name
+                         --resource-group
+                         [--created]
+                         [--custom]
+                         [--deleted]
+                         [--exists]
+                         [--interval]
+                         [--timeout]
+                         [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the kusto script is successfully created.
+    syntax: az kusto script wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1" --created
+  - summary: Pause executing next line of CLI script until the kusto script is successfully updated.
+    syntax: az kusto script wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1" --updated
+  - summary: Pause executing next line of CLI script until the kusto script is successfully deleted.
+    syntax: az kusto script wait --cluster-name "kustoclusterrptest4" --database-name "Kustodatabase8" --resource-group "kustorptest" --name "kustoScript1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The name of the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: The name of the database in the Kusto cluster.
+    description: ''
+  - isRequired: true
+    name: --name --script-name -n
+    summary: The name of the Kusto database script.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_kusto_script_create
+- az_kusto_script_delete
+- az_kusto_script_list
+- az_kusto_script_show
+- az_kusto_script_update
+- az_kusto_script_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage script with kusto.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/local-context.yml b/2018-03-01-hybrid/docs-ref-autogen/local-context.yml
index 4adaa15b9e..5be2c8f0f1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/local-context.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/local-context.yml
@@ -1,36 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_local_context
-  name: az local-context
-  summary: Manage Local Context.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_local_context_delete
-  - az_local_context_off
-  - az_local_context_on
-  - az_local_context_show
-- uid: az_local_context_delete
+### YamlMime:AzureCLIGroup
+uid: az_local-context
+name: az local-context
+summary: Manage Local Context.
+description: ''
+directCommands:
+- uid: az_local-context_delete
   name: az local-context delete
   summary: Delete local context data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az local-context delete [--all]
+                            [--name]
+                            [--purge]
+                            [--recursive]
+                            [--subscription]
+                            [--yes]
   examples:
   - summary: Delete resource_group_name from local context
-    syntax:
-      content: az local-context delete --name resource_group_name
+    syntax: az local-context delete --name resource_group_name
   - summary: Clear all local context data
-    syntax:
-      content: az local-context delete --all
+    syntax: az local-context delete --all
   - summary: Delete local context persistence file
-    syntax:
-      content: az local-context delete --all --purge
+    syntax: az local-context delete --all --purge
   - summary: Delete local context persistence file recursively
-    syntax:
-      content: az local-context delete --all --purge --recursive
-  parameters:
+    syntax: az local-context delete --all --purge --recursive
+  optionalParameters:
   - name: --all
     summary: Clear all local context data. Either --name or --all can be specified.
     description: ''
@@ -41,67 +35,60 @@ items:
     summary: Delete local context file from working directory. Only available when --all is specified.
     description: ''
   - name: --recursive
-    summary: Indicates this is recursive delete of local context. Only available when --all is specified.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation. Only available when --all is specified.
+    summary: Indicate this is recursive delete of local context. Only available when --all is specified.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_local_context_off
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Only available when --all is specified.
+    description: ''
+- uid: az_local-context_off
   name: az local-context off
   summary: Turn off local context.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az local-context off [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_local_context_on
+- uid: az_local-context_on
   name: az local-context on
   summary: Turn on local context.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az local-context on [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_local_context_show
+- uid: az_local-context_show
   name: az local-context show
   summary: Show local context data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az local-context show [--name]
+                          [--query-examples]
+                          [--subscription]
   examples:
   - summary: Show all local context value
-    syntax:
-      content: az local-context show
+    syntax: az local-context show
   - summary: Show resource_group_name local context value
-    syntax:
-      content: az local-context show --name resource_group_name
-  parameters:
+    syntax: az local-context show --name resource_group_name
+  optionalParameters:
   - name: --name -n
     summary: Space-separated list of local context parameter names.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_local_context_delete
-  name: az local-context delete
-  summary: Delete local context data.
-- uid: az_local_context_off
-  name: az local-context off
-  summary: Turn off local context.
-- uid: az_local_context_on
-  name: az local-context on
-  summary: Turn on local context.
-- uid: az_local_context_show
-  name: az local-context show
-  summary: Show local context data.
+- az_local-context_delete
+- az_local-context_off
+- az_local-context_on
+- az_local-context_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -117,4 +104,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Local Context.
+metadata:
+  description: Manage Local Context.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/lock.yml b/2018-03-01-hybrid/docs-ref-autogen/lock.yml
index ed4dd9b438..baa966e5da 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/lock.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/lock.yml
@@ -1,38 +1,35 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_lock
-  name: az lock
-  summary: Manage Azure locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_lock_create
-  - az_lock_delete
-  - az_lock_list
-  - az_lock_show
-  - az_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_lock
+name: az lock
+summary: Manage Azure locks.
+description: ''
+directCommands:
 - uid: az_lock_create
   name: az lock create
   summary: Create a lock.
   description: 'Locks can exist at three different scopes: subscription, resource group and resource.'
-  langs:
-  - azurecli
+  syntax: >-
+    az lock create --lock-type {CanNotDelete, ReadOnly}
+                   --name
+                   [--namespace]
+                   [--notes]
+                   [--parent]
+                   [--resource]
+                   [--resource-group]
+                   [--resource-type]
+                   [--subscription]
   examples:
   - summary: Create a read-only subscription level lock.
-    syntax:
-      content: az lock create --name lockName --resource-group group --lock-type ReadOnly
+    syntax: az lock create --name lockName --resource-group group --lock-type ReadOnly
   - summary: Create a read-only resource level lock on a vnet resource.
-    syntax:
-      content: >-
-        az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
-            Microsoft.Network/virtualNetworks --resource myVnet
+    syntax: >-
+      az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
+          Microsoft.Network/virtualNetworks --resource myVnet
   - summary: Create a read-only resource level lock on a subnet resource with a specific parent.
-    syntax:
-      content: >-
-        az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
-            Microsoft.Network/subnets --parent virtualNetworks/myVnet --resource mySubnet
-  parameters:
+    syntax: >-
+      az lock create --name lockName --resource-group group --lock-type ReadOnly --resource-type \
+          Microsoft.Network/subnets --parent virtualNetworks/myVnet --resource mySubnet
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -42,6 +39,7 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
+  optionalParameters:
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
@@ -55,7 +53,7 @@ items:
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -63,23 +61,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_delete
   name: az lock delete
   summary: Delete a lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock delete [--ids]
+                   [--name]
+                   [--namespace]
+                   [--parent]
+                   [--resource]
+                   [--resource-group]
+                   [--resource-type]
+                   [--subscription]
   examples:
   - summary: Delete a resource group-level lock
-    syntax:
-      content: az lock delete --name lockName --resource-group group
-  parameters:
+    syntax: az lock delete --name lockName --resource-group group
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -96,7 +95,7 @@ items:
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -104,26 +103,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_list
   name: az lock list
   summary: List lock information.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock list [--filter-string]
+                 [--namespace]
+                 [--parent]
+                 [--query-examples]
+                 [--resource]
+                 [--resource-group]
+                 [--resource-type]
+                 [--subscription]
   examples:
   - summary: List out the locks on a vnet resource. Includes locks in the associated group and subscription.
-    syntax:
-      content: az lock list --resource myvnet --resource-type Microsoft.Network/virtualNetworks -g group
+    syntax: az lock list --resource myvnet --resource-type Microsoft.Network/virtualNetworks -g group
   - summary: List out all locks on the subscription level
-    syntax:
-      content: az lock list
-  parameters:
+    syntax: az lock list
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
@@ -133,11 +132,14 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -145,26 +147,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_show
   name: az lock show
   summary: Show the properties of a lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock show [--ids]
+                 [--name]
+                 [--namespace]
+                 [--parent]
+                 [--query-examples]
+                 [--resource]
+                 [--resource-group]
+                 [--resource-type]
+                 [--subscription]
   examples:
   - summary: Show a subscription level lock
-    syntax:
-      content: az lock show -n lockname
+    syntax: az lock show -n lockname
   - summary: Show the properties of a lock (autogenerated)
-    syntax:
-      content: az lock show --name lockname --resource-group MyResourceGroup --resource-name MyResource --resource-type Microsoft.Network/virtualNetworks
-  parameters:
+    syntax: az lock show --name lockname --resource-group MyResourceGroup --resource-name MyResource --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -177,11 +180,14 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -189,23 +195,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_lock_update
   name: az lock update
   summary: Update a lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az lock update [--ids]
+                   [--lock-type {CanNotDelete, ReadOnly}]
+                   [--name]
+                   [--namespace]
+                   [--notes]
+                   [--parent]
+                   [--resource]
+                   [--resource-group]
+                   [--resource-type]
+                   [--subscription]
   examples:
   - summary: Update a resource group level lock with new notes and type
-    syntax:
-      content: az lock update --name lockName --resource-group group --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az lock update --name lockName --resource-group group --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -229,7 +238,7 @@ items:
     summary: Name or ID of the resource being locked. If an ID is given, other resource arguments should not be given.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -237,28 +246,13 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_lock_create
-  name: az lock create
-  summary: Create a lock.
-- uid: az_lock_delete
-  name: az lock delete
-  summary: Delete a lock.
-- uid: az_lock_list
-  name: az lock list
-  summary: List lock information.
-- uid: az_lock_show
-  name: az lock show
-  summary: Show the properties of a lock.
-- uid: az_lock_update
-  name: az lock update
-  summary: Update a lock.
+- az_lock_create
+- az_lock_delete
+- az_lock_list
+- az_lock_show
+- az_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -274,10 +268,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure locks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/logic.yml b/2018-03-01-hybrid/docs-ref-autogen/logic.yml
new file mode 100644
index 0000000000..d713e0f20f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/logic.yml
@@ -0,0 +1,39 @@
+### YamlMime:AzureCLIGroup
+uid: az_logic
+name: az logic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **logic** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az logic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_logic_integration-account
+- az_logic_integration-account_create
+- az_logic_integration-account_delete
+- az_logic_integration-account_import
+- az_logic_integration-account_list
+- az_logic_integration-account_show
+- az_logic_integration-account_update
+- az_logic_workflow
+- az_logic_workflow_create
+- az_logic_workflow_delete
+- az_logic_workflow_list
+- az_logic_workflow_show
+- az_logic_workflow_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/logic/integration-account.yml b/2018-03-01-hybrid/docs-ref-autogen/logic/integration-account.yml
new file mode 100644
index 0000000000..10527d10e8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/logic/integration-account.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_logic_integration-account
+name: az logic integration-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **logic** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az logic integration-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Logic integration-account.
+description: ''
+directCommands:
+- uid: az_logic_integration-account_create
+  name: az logic integration-account create
+  summary: Creates or updates an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account create --name
+                                        --resource-group
+                                        [--integration-service-environment]
+                                        [--location]
+                                        [--sku]
+                                        [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                                        [--tags]
+  examples:
+  - summary: Create or update an integration account
+    syntax: az logic integration-account create --location "centralus" --sku name=Standard --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --integration-service-environment
+    summary: The integration service environment. See README.md For more information.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The integration account sku.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The workflow state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+- uid: az_logic_integration-account_delete
+  name: az logic integration-account delete
+  summary: Deletes an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account delete --name
+                                        --resource-group
+                                        [--yes]
+  examples:
+  - summary: Delete an integration account
+    syntax: az logic integration-account delete --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_logic_integration-account_import
+  name: az logic integration-account import
+  summary: Import an integration account from a JSON file.
+  description: ''
+  syntax: >-
+    az logic integration-account import --input-path
+                                        --name
+                                        --resource-group
+                                        [--location]
+                                        [--sku]
+                                        [--tags]
+  examples:
+  - summary: Import an integration account.
+    syntax: az logic integration-account import --name "test_integration_account" --resource-group "test_resource_group" --input-path "integration.json"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: Path to a intergration-account JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The integration account sku.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+- uid: az_logic_integration-account_list
+  name: az logic integration-account list
+  summary: Gets a list of integration accounts by subscription.
+  description: ''
+  syntax: >-
+    az logic integration-account list [--resource-group]
+                                      [--top]
+  examples:
+  - summary: List integration accounts by resource group name
+    syntax: az logic integration-account list --resource-group "test_resource_group"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  - name: --top
+    summary: The number of items to be included in the result.
+    description: ''
+- uid: az_logic_integration-account_show
+  name: az logic integration-account show
+  summary: Gets an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account show --name
+                                      --resource-group
+  examples:
+  - summary: Get integration account by name
+    syntax: az logic integration-account show --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+- uid: az_logic_integration-account_update
+  name: az logic integration-account update
+  summary: Updates an integration account.
+  description: ''
+  syntax: >-
+    az logic integration-account update --name
+                                        --resource-group
+                                        [--integration-service-environment]
+                                        [--sku]
+                                        [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                                        [--tags]
+  examples:
+  - summary: Patch an integration account
+    syntax: az logic integration-account update --sku name=Basic --tag atag=123 --name "test_integration_account" --resource-group "test_resource_group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --integration-service-environment
+    summary: The integration service environment. See README.md For more information.
+    description: ''
+  - name: --sku
+    summary: The integration account sku.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The workflow state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+commands:
+- az_logic_integration-account_create
+- az_logic_integration-account_delete
+- az_logic_integration-account_import
+- az_logic_integration-account_list
+- az_logic_integration-account_show
+- az_logic_integration-account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Logic integration-account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/logic/workflow.yml b/2018-03-01-hybrid/docs-ref-autogen/logic/workflow.yml
new file mode 100644
index 0000000000..c777b7d6d5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/logic/workflow.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_logic_workflow
+name: az logic workflow
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **logic** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az logic workflow** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Logic workflow.
+description: ''
+directCommands:
+- uid: az_logic_workflow_create
+  name: az logic workflow create
+  summary: Creates or updates a workflow using a JSON file for the defintion.
+  description: ''
+  syntax: >-
+    az logic workflow create --definition
+                             --location
+                             --name
+                             --resource-group
+                             [--access-control]
+                             [--endpoints-configuration]
+                             [--integration-account]
+                             [--integration-service-environment]
+                             [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                             [--tags]
+  examples:
+  - summary: Create or update a workflow
+    syntax: az logic workflow create --resource-group "test_resource_group" --location "centralus" --name "test_workflow" --definition "workflow.json"
+  requiredParameters:
+  - isRequired: true
+    name: --definition
+    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --access-control
+    summary: The access control configuration controls access to this workflow. See README.md for more information.
+    description: ''
+  - name: --endpoints-configuration
+    summary: The endpoints configuration.
+    description: ''
+  - name: --integration-account
+    summary: The integration account.
+    description: ''
+  - name: --integration-service-environment
+    summary: The integration service environment.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+- uid: az_logic_workflow_delete
+  name: az logic workflow delete
+  summary: Deletes a workflow.
+  description: ''
+  syntax: >-
+    az logic workflow delete --name
+                             --resource-group
+                             [--yes]
+  examples:
+  - summary: Delete a workflow
+    syntax: az logic workflow delete --resource-group "test_resource_group" --name "test_workflow"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_logic_workflow_list
+  name: az logic workflow list
+  summary: Gets a list of workflows by subscription.
+  description: ''
+  syntax: >-
+    az logic workflow list [--filter]
+                           [--resource-group]
+                           [--top]
+  examples:
+  - summary: List all workflows in a resource group
+    syntax: az logic workflow list --resource-group "test_resource_group"
+  - summary: List all workflows in a subscription
+    syntax: az logic workflow list
+  optionalParameters:
+  - name: --filter
+    summary: 'The filter to apply on the operation. Options for filters include: State, Trigger, and ReferencedResourceId.'
+    description: ''
+  - name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  - name: --top
+    summary: The number of items to be included in the result.
+    description: ''
+- uid: az_logic_workflow_show
+  name: az logic workflow show
+  summary: Gets a workflow.
+  description: ''
+  syntax: >-
+    az logic workflow show --name
+                           --resource-group
+  examples:
+  - summary: Get a workflow
+    syntax: az logic workflow show --resource-group "test_resource_group" --name "test_workflow"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+- uid: az_logic_workflow_update
+  name: az logic workflow update
+  summary: Updates a workflow.
+  description: ''
+  syntax: >-
+    az logic workflow update --name
+                             --resource-group
+                             [--definition]
+                             [--state {Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended}]
+                             [--tags]
+  examples:
+  - summary: Patch a workflow
+    syntax: az logic workflow update --resource-group "test_resource_group" --definition workflow.json --name "test_workflow"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The workflow name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The resource group name.
+    description: ''
+  optionalParameters:
+  - name: --definition
+    summary: Path to a workflow defintion JSON file (see README.md for more info on this). This JSON format should match what the logic app design tool exports.
+    description: ''
+  - name: --state
+    parameterValueGroup: Completed, Deleted, Disabled, Enabled, NotSpecified, Suspended
+    summary: The state.
+    description: ''
+  - name: --tags
+    summary: The resource tags.
+    description: ''
+commands:
+- az_logic_workflow_create
+- az_logic_workflow_delete
+- az_logic_workflow_list
+- az_logic_workflow_show
+- az_logic_workflow_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Logic workflow.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance.yml
new file mode 100644
index 0000000000..a94b64c35f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance
+name: az maintenance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_maintenance_applyupdate
+- az_maintenance_applyupdate_create
+- az_maintenance_applyupdate_get-parent
+- az_maintenance_applyupdate_list
+- az_maintenance_applyupdate_show
+- az_maintenance_applyupdate_show-parent
+- az_maintenance_applyupdate_update
+- az_maintenance_applyupdate-for-resource-group
+- az_maintenance_applyupdate-for-resource-group_list
+- az_maintenance_assignment
+- az_maintenance_assignment_create
+- az_maintenance_assignment_delete
+- az_maintenance_assignment_list
+- az_maintenance_assignment_list-parent
+- az_maintenance_assignment_update
+- az_maintenance_configuration
+- az_maintenance_configuration_create
+- az_maintenance_configuration_delete
+- az_maintenance_configuration_list
+- az_maintenance_configuration_show
+- az_maintenance_configuration_update
+- az_maintenance_configuration-for-resource-group
+- az_maintenance_configuration-for-resource-group_list
+- az_maintenance_public-configuration
+- az_maintenance_public-configuration_list
+- az_maintenance_public-configuration_show
+- az_maintenance_update
+- az_maintenance_update_list
+- az_maintenance_update_list-parent
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/applyupdate-for-resource-group.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/applyupdate-for-resource-group.yml
new file mode 100644
index 0000000000..0052f19a27
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/applyupdate-for-resource-group.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_applyupdate-for-resource-group
+name: az maintenance applyupdate-for-resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance applyupdate-for-resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage apply update for resource group with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_applyupdate-for-resource-group_list
+  name: az maintenance applyupdate-for-resource-group list
+  summary: Get Configuration records within a subscription and resource group.
+  description: ''
+  syntax: az maintenance applyupdate-for-resource-group list --resource-group
+  examples:
+  - summary: ApplyUpdatesResourceGroup_List
+    syntax: az maintenance applyupdate-for-resource-group list --resource-group "examplerg"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_maintenance_applyupdate-for-resource-group_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage apply update for resource group with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/applyupdate.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/applyupdate.yml
new file mode 100644
index 0000000000..f212e7e747
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/applyupdate.yml
@@ -0,0 +1,230 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_applyupdate
+name: az maintenance applyupdate
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance applyupdate** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage apply update with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_applyupdate_create
+  name: az maintenance applyupdate create
+  summary: Apply maintenance updates to resource with parent And Apply maintenance updates to resource.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate create --provider-name
+                                      --resource-group
+                                      --resource-name
+                                      --resource-type
+                                      [--resource-parent-name]
+                                      [--resource-parent-type]
+  examples:
+  - summary: ApplyUpdates_CreateOrUpdateParent
+    syntax: az maintenance applyupdate create --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  - summary: ApplyUpdates_CreateOrUpdate
+    syntax: az maintenance applyupdate create --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+- uid: az_maintenance_applyupdate_get-parent
+  name: az maintenance applyupdate get-parent
+  summary: Track maintenance updates to resource with parent.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate get-parent --apply-update-name
+                                          --provider-name
+                                          --resource-group
+                                          --resource-name
+                                          --resource-parent-name
+                                          --resource-parent-type
+                                          --resource-type
+  examples:
+  - summary: ApplyUpdates_GetParent
+    syntax: az maintenance applyupdate get-parent --name "e9b9685d-78e4-44c4-a81c-64a14f9b87b6" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --apply-update-name --name -n
+    summary: ApplyUpdate Id.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_applyupdate_list
+  name: az maintenance applyupdate list
+  summary: Get Configuration records within a subscription.
+  description: ''
+  syntax: az maintenance applyupdate list
+  examples:
+  - summary: ApplyUpdates_List
+    syntax: az maintenance applyupdate list
+- uid: az_maintenance_applyupdate_show
+  name: az maintenance applyupdate show
+  summary: Track maintenance updates to resource.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate show --apply-update-name
+                                    --provider-name
+                                    --resource-group
+                                    --resource-name
+                                    --resource-type
+  examples:
+  - summary: ApplyUpdates_Get
+    syntax: az maintenance applyupdate show --name "e9b9685d-78e4-44c4-a81c-64a14f9b87b6" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --apply-update-name --name -n
+    summary: ApplyUpdate Id.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_applyupdate_show-parent
+  name: az maintenance applyupdate show-parent
+  summary: Track maintenance updates to resource with parent.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate show-parent --apply-update-name
+                                           --provider-name
+                                           --resource-group
+                                           --resource-name
+                                           --resource-parent-name
+                                           --resource-parent-type
+                                           --resource-type
+  examples:
+  - summary: ApplyUpdates_GetParent
+    syntax: az maintenance applyupdate show-parent --name "e9b9685d-78e4-44c4-a81c-64a14f9b87b6" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --apply-update-name --name -n
+    summary: ApplyUpdate Id.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_applyupdate_update
+  name: az maintenance applyupdate update
+  summary: Apply maintenance updates to resource.
+  description: ''
+  syntax: >-
+    az maintenance applyupdate update --provider-name
+                                      --resource-group
+                                      --resource-name
+                                      --resource-type
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+commands:
+- az_maintenance_applyupdate_create
+- az_maintenance_applyupdate_get-parent
+- az_maintenance_applyupdate_list
+- az_maintenance_applyupdate_show
+- az_maintenance_applyupdate_show-parent
+- az_maintenance_applyupdate_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage apply update with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/assignment.yml
new file mode 100644
index 0000000000..50e8204bc3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/assignment.yml
@@ -0,0 +1,251 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_assignment
+name: az maintenance assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage configuration assignment with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_assignment_create
+  name: az maintenance assignment create
+  summary: Register configuration for resource. And Register configuration for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment create --configuration-assignment-name
+                                     --provider-name
+                                     --resource-group
+                                     --resource-name
+                                     --resource-type
+                                     [--config-id]
+                                     [--location]
+                                     [--resource-id]
+                                     [--resource-parent-name]
+                                     [--resource-parent-type]
+  examples:
+  - summary: ConfigurationAssignments_CreateOrUpdateParent
+    syntax: az maintenance assignment create --maintenance-configuration-id "/subscriptions/5b4b650e-28b9-4790-b3ab-ddbd88d727c4/resourcegroups/examplerg/providers/Microsoft.Maintenance/maintenanceConfigurations/policy1" --name "workervmPolicy" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  - summary: ConfigurationAssignments_CreateOrUpdate
+    syntax: az maintenance assignment create --maintenance-configuration-id "/subscriptions/5b4b650e-28b9-4790-b3ab-ddbd88d727c4/resourcegroups/examplerg/providers/Microsoft.Maintenance/maintenanceConfigurations/configuration1" --name "workervmConfiguration" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-assignment-name --name -n
+    summary: Configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --config-id --maintenance-configuration-id
+    summary: The maintenance configuration Id.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-id
+    summary: The unique resourceId.
+    description: ''
+  - name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+- uid: az_maintenance_assignment_delete
+  name: az maintenance assignment delete
+  summary: Unregister configuration for resource. And Unregister configuration for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment delete --configuration-assignment-name
+                                     --provider-name
+                                     --resource-group
+                                     --resource-name
+                                     --resource-type
+                                     [--resource-parent-name]
+                                     [--resource-parent-type]
+                                     [--yes]
+  examples:
+  - summary: ConfigurationAssignments_DeleteParent
+    syntax: az maintenance assignment delete --name "workervmConfiguration" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  - summary: ConfigurationAssignments_Delete
+    syntax: az maintenance assignment delete --name "workervmConfiguration" --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-assignment-name --name -n
+    summary: Unique configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_maintenance_assignment_list
+  name: az maintenance assignment list
+  summary: List configurationAssignments for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment list --provider-name
+                                   --resource-group
+                                   --resource-name
+                                   --resource-type
+  examples:
+  - summary: ConfigurationAssignments_List
+    syntax: az maintenance assignment list --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_assignment_list-parent
+  name: az maintenance assignment list-parent
+  summary: List configurationAssignments for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment list-parent --provider-name
+                                          --resource-group
+                                          --resource-name
+                                          --resource-parent-name
+                                          --resource-parent-type
+                                          --resource-type
+  examples:
+  - summary: ConfigurationAssignments_ListParent
+    syntax: az maintenance assignment list-parent --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtestvm1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_assignment_update
+  name: az maintenance assignment update
+  summary: Register configuration for resource.
+  description: ''
+  syntax: >-
+    az maintenance assignment update --configuration-assignment-name
+                                     --provider-name
+                                     --resource-group
+                                     --resource-name
+                                     --resource-type
+                                     [--config-id]
+                                     [--location]
+                                     [--resource-id]
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-assignment-name --name -n
+    summary: Configuration assignment name.
+    description: ''
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+  optionalParameters:
+  - name: --config-id --maintenance-configuration-id
+    summary: The maintenance configuration Id.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-id
+    summary: The unique resourceId.
+    description: ''
+commands:
+- az_maintenance_assignment_create
+- az_maintenance_assignment_delete
+- az_maintenance_assignment_list
+- az_maintenance_assignment_list-parent
+- az_maintenance_assignment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage configuration assignment with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/configuration-for-resource-group.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/configuration-for-resource-group.yml
new file mode 100644
index 0000000000..3d647a8e25
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/configuration-for-resource-group.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_configuration-for-resource-group
+name: az maintenance configuration-for-resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance configuration-for-resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage maintenance configuration for resource group with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_configuration-for-resource-group_list
+  name: az maintenance configuration-for-resource-group list
+  summary: Get Configuration records within a subscription and resource group.
+  description: ''
+  syntax: az maintenance configuration-for-resource-group list --resource-group
+  examples:
+  - summary: MaintenanceConfigurationsResourceGroup_List
+    syntax: az maintenance configuration-for-resource-group list --resource-group "examplerg"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_maintenance_configuration-for-resource-group_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage maintenance configuration for resource group with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/configuration.yml
new file mode 100644
index 0000000000..98d64f8ada
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/configuration.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_configuration
+name: az maintenance configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage maintenance configuration with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_configuration_create
+  name: az maintenance configuration create
+  summary: Create configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration create --resource-group
+                                        --resource-name
+                                        [--duration]
+                                        [--expiration-date-time]
+                                        [--extension-properties]
+                                        [--location]
+                                        [--maintenance-scope {All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance}]
+                                        [--maintenance-window-recur-every]
+                                        [--maintenance-window-start-date-time]
+                                        [--maintenance-window-time-zone]
+                                        [--namespace]
+                                        [--tags]
+                                        [--visibility {Custom, Public}]
+  examples:
+  - summary: MaintenanceConfigurations_CreateOrUpdateForResource
+    syntax: az maintenance configuration create --location "westus2" --maintenance-scope "Host" --maintenance-window-duration "05:00" --maintenance-window-expiration-date-time "9999-12-31 00:00" --maintenance-window-recur-every "Day" --maintenance-window-start-date-time "2025-04-30 08:00" --maintenance-window-time-zone "Pacific Standard Time" --namespace "Microsoft.Maintenance" --visibility "Custom" --resource-group "examplerg" --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+  optionalParameters:
+  - name: --duration --maintenance-window-duration
+    summary: 'Duration of the maintenance window in HH:mm format. If not provided, default value will be used based on maintenance scope provided. Example: 05:00.'
+    description: ''
+  - name: --expiration-date-time --maintenance-window-expiration-date-time
+    summary: Effective expiration date of the maintenance window in YYYY-MM-DD hh:mm format. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone. Expiration date must be set to a future date. If not provided, it will be set to the maximum datetime 9999-12-31 23:59:59.
+    description: ''
+  - name: --extension-properties
+    summary: 'Gets or sets extensionProperties of the maintenanceConfiguration Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --maintenance-scope
+    parameterValueGroup: All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance
+    summary: Gets or sets maintenanceScope of the configuration.
+    description: ''
+  - name: --maintenance-window-recur-every --recur-every
+    summary: "Rate at which a Maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules. Daily schedule are formatted as recurEvery: [Frequency as integer]['Day(s)']. If no frequency is provided, the default frequency is 1. Daily schedule examples are recurEvery: Day, recurEvery: 3Days.  Weekly schedule are formatted as recurEvery: [Frequency as integer]['Week(s)'] [Optional comma separated list of weekdays Monday-Sunday]. Weekly schedule examples are recurEvery: 3Weeks, recurEvery: Week Saturday,Sunday. Monthly schedules are formatted as [Frequency as integer]['Month(s)'] [Comma separated list of month days] or [Frequency as integer]['Month(s)'] [Week of Month (First, Second, Third, Fourth, Last)] [Weekday Monday-Sunday]. Monthly schedule examples are recurEvery: Month, recurEvery: 2Months, recurEvery: Month day23,day24, recurEvery: Month Last Sunday, recurEvery: Month Fourth Monday."
+    description: ''
+  - name: --maintenance-window-start-date-time --start-date-time
+    summary: Effective start date of the maintenance window in YYYY-MM-DD hh:mm format. The start date can be set to either the current date or future date. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone.
+    description: ''
+  - name: --maintenance-window-time-zone --time-zone
+    summary: 'Name of the timezone. List of timezones can be obtained by executing [System.TimeZoneInfo]::GetSystemTimeZones() in PowerShell. Example: Pacific Standard Time, UTC, W. Europe Standard Time, Korea Standard Time, Cen. Australia Standard Time.'
+    description: ''
+  - name: --namespace
+    summary: Gets or sets namespace of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --visibility
+    parameterValueGroup: Custom, Public
+    summary: Gets or sets the visibility of the configuration.
+    description: ''
+- uid: az_maintenance_configuration_delete
+  name: az maintenance configuration delete
+  summary: Delete Configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration delete --resource-group
+                                        --resource-name
+                                        [--yes]
+  examples:
+  - summary: MaintenanceConfigurations_DeleteForResource
+    syntax: az maintenance configuration delete --resource-group "examplerg" --resource-name "example1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_maintenance_configuration_list
+  name: az maintenance configuration list
+  summary: Get Configuration records within a subscription.
+  description: ''
+  syntax: az maintenance configuration list
+  examples:
+  - summary: MaintenanceConfigurations_List
+    syntax: az maintenance configuration list
+- uid: az_maintenance_configuration_show
+  name: az maintenance configuration show
+  summary: Get Configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration show --resource-group
+                                      --resource-name
+  examples:
+  - summary: MaintenanceConfigurations_GetForResource
+    syntax: az maintenance configuration show --resource-group "examplerg" --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+- uid: az_maintenance_configuration_update
+  name: az maintenance configuration update
+  summary: Patch configuration record.
+  description: ''
+  syntax: >-
+    az maintenance configuration update --resource-group
+                                        --resource-name
+                                        [--duration]
+                                        [--expiration-date-time]
+                                        [--extension-properties]
+                                        [--location]
+                                        [--maintenance-scope {All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance}]
+                                        [--maintenance-window-recur-every]
+                                        [--maintenance-window-start-date-time]
+                                        [--maintenance-window-time-zone]
+                                        [--namespace]
+                                        [--tags]
+                                        [--visibility {Custom, Public}]
+  examples:
+  - summary: MaintenanceConfigurations_UpdateForResource
+    syntax: az maintenance configuration update --location "westus2" --maintenance-scope "Host" --maintenance-window-duration "05:00" --maintenance-window-expiration-date-time "9999-12-31 00:00" --maintenance-window-recur-every "Month Third Sunday" --maintenance-window-start-date-time "2025-04-30 08:00" --maintenance-window-time-zone "Pacific Standard Time" --namespace "Microsoft.Maintenance" --visibility "Custom" --resource-group "examplerg" --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+  optionalParameters:
+  - name: --duration --maintenance-window-duration
+    summary: 'Duration of the maintenance window in HH:mm format. If not provided, default value will be used based on maintenance scope provided. Example: 05:00.'
+    description: ''
+  - name: --expiration-date-time --maintenance-window-expiration-date-time
+    summary: Effective expiration date of the maintenance window in YYYY-MM-DD hh:mm format. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone. Expiration date must be set to a future date. If not provided, it will be set to the maximum datetime 9999-12-31 23:59:59.
+    description: ''
+  - name: --extension-properties
+    summary: 'Gets or sets extensionProperties of the maintenanceConfiguration Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --maintenance-scope
+    parameterValueGroup: All, Extension, Host, InGuestPatch, InResource, OSImage, Resource, SQLDB, SQLManagedInstance
+    summary: Gets or sets maintenanceScope of the configuration.
+    description: ''
+  - name: --maintenance-window-recur-every --recur-every
+    summary: "Rate at which a Maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules. Daily schedule are formatted as recurEvery: [Frequency as integer]['Day(s)']. If no frequency is provided, the default frequency is 1. Daily schedule examples are recurEvery: Day, recurEvery: 3Days.  Weekly schedule are formatted as recurEvery: [Frequency as integer]['Week(s)'] [Optional comma separated list of weekdays Monday-Sunday]. Weekly schedule examples are recurEvery: 3Weeks, recurEvery: Week Saturday,Sunday. Monthly schedules are formatted as [Frequency as integer]['Month(s)'] [Comma separated list of month days] or [Frequency as integer]['Month(s)'] [Week of Month (First, Second, Third, Fourth, Last)] [Weekday Monday-Sunday]. Monthly schedule examples are recurEvery: Month, recurEvery: 2Months, recurEvery: Month day23,day24, recurEvery: Month Last Sunday, recurEvery: Month Fourth Monday."
+    description: ''
+  - name: --maintenance-window-start-date-time --start-date-time
+    summary: Effective start date of the maintenance window in YYYY-MM-DD hh:mm format. The start date can be set to either the current date or future date. The window will be created in the time zone provided and adjusted to daylight savings according to that time zone.
+    description: ''
+  - name: --maintenance-window-time-zone --time-zone
+    summary: 'Name of the timezone. List of timezones can be obtained by executing [System.TimeZoneInfo]::GetSystemTimeZones() in PowerShell. Example: Pacific Standard Time, UTC, W. Europe Standard Time, Korea Standard Time, Cen. Australia Standard Time.'
+    description: ''
+  - name: --namespace
+    summary: Gets or sets namespace of the resource.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --visibility
+    parameterValueGroup: Custom, Public
+    summary: Gets or sets the visibility of the configuration.
+    description: ''
+commands:
+- az_maintenance_configuration_create
+- az_maintenance_configuration_delete
+- az_maintenance_configuration_list
+- az_maintenance_configuration_show
+- az_maintenance_configuration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage maintenance configuration with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/public-configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/public-configuration.yml
new file mode 100644
index 0000000000..83128fb541
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/public-configuration.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_public-configuration
+name: az maintenance public-configuration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance public-configuration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage public maintenance configuration with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_public-configuration_list
+  name: az maintenance public-configuration list
+  summary: Get Public Maintenance Configuration records.
+  description: ''
+  syntax: az maintenance public-configuration list
+  examples:
+  - summary: PublicMaintenanceConfigurations_List
+    syntax: az maintenance public-configuration list
+- uid: az_maintenance_public-configuration_show
+  name: az maintenance public-configuration show
+  summary: Get Public Maintenance Configuration record.
+  description: ''
+  syntax: az maintenance public-configuration show --resource-name
+  examples:
+  - summary: PublicMaintenanceConfigurations_GetForResource
+    syntax: az maintenance public-configuration show --resource-name "configuration1"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-name
+    summary: Resource Identifier.
+    description: ''
+commands:
+- az_maintenance_public-configuration_list
+- az_maintenance_public-configuration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage public maintenance configuration with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/maintenance/update.yml b/2018-03-01-hybrid/docs-ref-autogen/maintenance/update.yml
new file mode 100644
index 0000000000..0e4aec021a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/maintenance/update.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_maintenance_update
+name: az maintenance update
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **maintenance** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az maintenance update** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage update with maintenance.
+description: ''
+directCommands:
+- uid: az_maintenance_update_list
+  name: az maintenance update list
+  summary: Get updates to resources.
+  description: ''
+  syntax: >-
+    az maintenance update list --provider-name
+                               --resource-group
+                               --resource-name
+                               --resource-type
+  examples:
+  - summary: Updates_List
+    syntax: az maintenance update list --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "smdtest1" --resource-type "virtualMachineScaleSets"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+- uid: az_maintenance_update_list-parent
+  name: az maintenance update list-parent
+  summary: Get updates to resources.
+  description: ''
+  syntax: >-
+    az maintenance update list-parent --provider-name
+                                      --resource-group
+                                      --resource-name
+                                      --resource-parent-name
+                                      --resource-parent-type
+                                      --resource-type
+  examples:
+  - summary: Updates_ListParent
+    syntax: az maintenance update list-parent --provider-name "Microsoft.Compute" --resource-group "examplerg" --resource-name "1" --resource-parent-name "smdtest1" --resource-parent-type "virtualMachineScaleSets" --resource-type "virtualMachines"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-name
+    summary: Resource provider name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Resource identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-name
+    summary: Resource parent identifier.
+    description: ''
+  - isRequired: true
+    name: --resource-parent-type
+    summary: Resource parent type.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: Resource type.
+    description: ''
+commands:
+- az_maintenance_update_list
+- az_maintenance_update_list-parent
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage update with maintenance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra.yml b/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra.yml
new file mode 100644
index 0000000000..da5eca0188
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra.yml
@@ -0,0 +1,39 @@
+### YamlMime:AzureCLIGroup
+uid: az_managed-cassandra
+name: az managed-cassandra
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az managed-cassandra** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_managed-cassandra_cluster
+- az_managed-cassandra_cluster_create
+- az_managed-cassandra_cluster_delete
+- az_managed-cassandra_cluster_list
+- az_managed-cassandra_cluster_node-status
+- az_managed-cassandra_cluster_show
+- az_managed-cassandra_cluster_update
+- az_managed-cassandra_datacenter
+- az_managed-cassandra_datacenter_create
+- az_managed-cassandra_datacenter_delete
+- az_managed-cassandra_datacenter_list
+- az_managed-cassandra_datacenter_show
+- az_managed-cassandra_datacenter_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra/cluster.yml
new file mode 100644
index 0000000000..5e032d69aa
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra/cluster.yml
@@ -0,0 +1,276 @@
+### YamlMime:AzureCLIGroup
+uid: az_managed-cassandra_cluster
+name: az managed-cassandra cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az managed-cassandra cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Azure Managed Cassandra Cluster.
+description: ''
+directCommands:
+- uid: az_managed-cassandra_cluster_create
+  name: az managed-cassandra cluster create
+  summary: Create a Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster create --cluster-name
+                                        --delegated-management-subnet-id
+                                        --location
+                                        --resource-group
+                                        [--authentication-method]
+                                        [--cassandra-version]
+                                        [--client-certificates]
+                                        [--cluster-name-override]
+                                        [--external-gossip-certificates]
+                                        [--external-seed-nodes]
+                                        [--hours-between-backups]
+                                        [--identity]
+                                        [--initial-cassandra-admin-password]
+                                        [--no-wait]
+                                        [--repair-enabled]
+                                        [--restore-from-backup-id]
+                                        [--tags]
+  examples:
+  - summary: Create a Managed Cassandra Cluster in a given Subscription and ResourceGroup. Either a cassandra admin password or external seed needs are required.
+    syntax: >-
+      az managed-cassandra cluster create \
+
+      --resource-group MyResourceGroup \
+
+      --cluster-name MyCluster \
+
+      --location MyLocation \
+
+      --initial-cassandra-admin-password password \
+
+      --delegated-management-subnet-id /subscriptions/94d9b402-77b4-4049-b4c1-947bc6b7729b/resourceGroups/My-vnet/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-subnet
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --delegated-management-subnet-id -s
+    summary: The resource id of a subnet where the ip address of the cassandra management server will be allocated. This subnet must have connectivity to the delegated_subnet_id subnet of each data center.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the Cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --authentication-method
+    summary: Authentication mode can be None or Cassandra. If None, no authentication will be required to connect to the Cassandra API. If Cassandra, then passwords will be used.
+    description: ''
+  - name: --cassandra-version
+    summary: The version of Cassandra chosen.
+    description: ''
+  - name: --client-certificates
+    summary: If specified, enables client certificate authentication to the Cassandra API.
+    description: ''
+  - name: --cluster-name-override
+    summary: If a cluster must have a name that is not a valid azure resource name, this field can be specified to choose the Cassandra cluster name. Otherwise, the resource name will be used as the cluster name.
+    description: ''
+  - name: --external-gossip-certificates -e
+    summary: A list of certificates that the managed cassandra data center's should accept.
+    description: ''
+  - name: --external-seed-nodes
+    summary: A list of ip addresses of the seed nodes of on-premise data centers.
+    description: ''
+  - name: --hours-between-backups
+    summary: The number of hours between backup attempts.
+    description: ''
+  - name: --identity
+    summary: Identity used to authenticate.
+    description: ''
+  - name: --initial-cassandra-admin-password -i
+    summary: The intial password to be configured when a cluster is created for authentication_method Cassandra.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --repair-enabled
+    summary: Enables automatic repair.
+    description: ''
+  - name: --restore-from-backup-id
+    summary: The resource id of a backup. If provided on create, the backup will be used to prepopulate the cluster. The cluster data center count and node counts must match the backup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_managed-cassandra_cluster_delete
+  name: az managed-cassandra cluster delete
+  summary: Deletes a Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster delete --cluster-name
+                                        --resource-group
+                                        [--no-wait]
+                                        [--yes]
+  examples:
+  - summary: Deletes a Managed Cassandra Cluster in the given Subscription and ResourceGroup.
+    syntax: az managed-cassandra cluster delete --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_managed-cassandra_cluster_list
+  name: az managed-cassandra cluster list
+  summary: List the Managed Cassandra Clusters in a ResourceGroup and Subscription. If the ResourceGroup is not specified all the clusters in this Subscription are returned.
+  description: ''
+  syntax: az managed-cassandra cluster list [--resource-group]
+  examples:
+  - summary: List all Managed Cassandra Clusters in a given Subscription and ResourceGroup.
+    syntax: az managed-cassandra cluster list --resource-group MyResourceGroup
+  - summary: List all Managed Cassandra Clusters in a given Subscription.
+    syntax: az managed-cassandra cluster list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_cluster_node-status
+  name: az managed-cassandra cluster node-status
+  summary: Gets Status of all the nodes in all the datacenters in a given Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster node-status --cluster-name
+                                             --resource-group
+                                             [--no-wait]
+  examples:
+  - summary: This command gets the status of all the nodes in this cluster. By default a json is returned.
+    syntax: az managed-cassandra cluster node-status --resource-group MyResourceGroup --cluster-name MyCluster
+  - summary: This command gets the status of all the nodes in this cluster. When a table output is specified only one token is displayed. Use json output to get all the tokens.
+    syntax: az managed-cassandra cluster node-status --resource-group MyResourceGroup --cluster-name MyCluster --output table
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_managed-cassandra_cluster_show
+  name: az managed-cassandra cluster show
+  summary: Get a Managed Cassandra Cluster Resource.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster show --cluster-name
+                                      --resource-group
+  examples:
+  - summary: Gets a Managed Cassandra Cluster Resource. ProvisioningState tells the state of this cluster. If the cluster doesnot exist a NotFound response is returned.
+    syntax: az managed-cassandra cluster show --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_cluster_update
+  name: az managed-cassandra cluster update
+  summary: Update a Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra cluster update --cluster-name
+                                        --resource-group
+                                        [--authentication-method]
+                                        [--cassandra-version]
+                                        [--client-certificates]
+                                        [--external-gossip-certificates]
+                                        [--external-seed-nodes]
+                                        [--hours-between-backups]
+                                        [--identity]
+                                        [--no-wait]
+                                        [--repair-enabled]
+                                        [--tags]
+  examples:
+  - summary: Update External Seed Nodes of a given cluster.
+    syntax: az managed-cassandra cluster update --resource-group MyResourceGroup --cluster-name MyCluster --external-seed-nodes 127.0.0.1 127.0.0.2
+  - summary: Update External Gossip Certificates of a given cluster. Certs can be passed in as strings or the file locations.
+    syntax: az managed-cassandra cluster update --resource-group MyResourceGroup --cluster-name MyCluster --external-gossip-certificates C:/MyFolder/test.pem BeginCert-MLXCF-EndCert
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --authentication-method
+    summary: Authentication mode can be None or Cassandra. If None, no authentication will be required to connect to the Cassandra API. If Cassandra, then passwords will be used.
+    description: ''
+  - name: --cassandra-version
+    summary: The version of Cassandra chosen.
+    description: ''
+  - name: --client-certificates
+    summary: If specified, enables client certificate authentication to the Cassandra API.
+    description: ''
+  - name: --external-gossip-certificates -e
+    summary: A list of certificates that the managed cassandra data center's should accept.
+    description: ''
+  - name: --external-seed-nodes
+    summary: A list of ip addresses of the seed nodes of on-premise data centers.
+    description: ''
+  - name: --hours-between-backups
+    summary: The number of hours between backup attempts.
+    description: ''
+  - name: --identity
+    summary: Identity used to authenticate.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --repair-enabled
+    summary: Enables automatic repair.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_managed-cassandra_cluster_create
+- az_managed-cassandra_cluster_delete
+- az_managed-cassandra_cluster_list
+- az_managed-cassandra_cluster_node-status
+- az_managed-cassandra_cluster_show
+- az_managed-cassandra_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure Managed Cassandra Cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra/datacenter.yml b/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra/datacenter.yml
new file mode 100644
index 0000000000..235e4476dc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/managed-cassandra/datacenter.yml
@@ -0,0 +1,211 @@
+### YamlMime:AzureCLIGroup
+uid: az_managed-cassandra_datacenter
+name: az managed-cassandra datacenter
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az managed-cassandra datacenter** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Azure Managed Cassandra DataCenter.
+description: ''
+directCommands:
+- uid: az_managed-cassandra_datacenter_create
+  name: az managed-cassandra datacenter create
+  summary: Create a Datacenter in an Azure Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter create --cluster-name
+                                           --data-center-location
+                                           --data-center-name
+                                           --delegated-subnet-id
+                                           --node-count
+                                           --resource-group
+                                           [--base64-encoded-cassandra-yaml-fragment]
+                                           [--no-wait]
+  examples:
+  - summary: Create a Managed Cassandra Datacenter in a Cassandra Cluster. Each datacenter should atleast have 3 nodes.
+    syntax: >-
+      az managed-cassandra datacenter create \
+
+      --resource-group MyResourceGroup \
+
+      --cluster-name MyCluster \
+
+      --data-center-name MyDataCenter \
+
+      --data-center-location westus2 \
+
+      --node-count 3 \
+
+      --delegated-subnet-id /subscriptions/94d9b402-77b4-4049-b4c1-947bc6b7729b/resourceGroups/My-vnet/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-subnet
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-location -l
+    summary: Azure Location of the Datacenter.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --delegated-subnet-id -s
+    summary: The resource id of a subnet where ip addresses of the Cassandra virtual machines will be allocated. This must be in the same region as data_center_location.
+    description: ''
+  - isRequired: true
+    name: --node-count -n
+    summary: The number of Cassandra virtual machines in this data center. The minimum value is 3.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --base64-encoded-cassandra-yaml-fragment -b
+    summary: This is a Base64 encoded yaml file that is a subset of cassandra.yaml.  Supported fields will be honored and others will be ignored.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_managed-cassandra_datacenter_delete
+  name: az managed-cassandra datacenter delete
+  summary: Deletes a Managed Cassandra Datacenter.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter delete --cluster-name
+                                           --data-center-name
+                                           --resource-group
+                                           [--no-wait]
+                                           [--yes]
+  examples:
+  - summary: Deletes a Managed Cassandra Datacenter in the given Cluster.
+    syntax: az managed-cassandra datacenter delete --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter
+  - summary: Deletes a Managed Cassandra Datacenter in the given Cluster without waiting for the long-running operation to finish.
+    syntax: az managed-cassandra datacenter delete --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_managed-cassandra_datacenter_list
+  name: az managed-cassandra datacenter list
+  summary: List the Managed Cassandra Datacenters in a given Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter list --cluster-name
+                                         --resource-group
+  examples:
+  - summary: List all Managed Cassandra DataCenters in a given Cluster.
+    syntax: az managed-cassandra datacenter list --resource-group MyResourceGroup --cluster-name MyCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_datacenter_show
+  name: az managed-cassandra datacenter show
+  summary: Get a Managed Cassandra DataCenter Resource.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter show --cluster-name
+                                         --data-center-name
+                                         --resource-group
+  examples:
+  - summary: Gets a Managed Cassandra Datacenter Resource. ProvisioningState tells the state of this datacenter. If the datacenter does not exist a NotFound response is returned.
+    syntax: az managed-cassandra datacenter show --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_managed-cassandra_datacenter_update
+  name: az managed-cassandra datacenter update
+  summary: Update a Datacenter in an Azure Managed Cassandra Cluster.
+  description: ''
+  syntax: >-
+    az managed-cassandra datacenter update --cluster-name
+                                           --data-center-name
+                                           --resource-group
+                                           [--base64-encoded-cassandra-yaml-fragment]
+                                           [--no-wait]
+                                           [--node-count]
+  examples:
+  - summary: Scale the number of nodes in a datacenter. This is a scale up operation assuming that the create datacenter was done with 3 nodes. Each datacenter should atleast have 3 nodes.
+    syntax: az managed-cassandra datacenter update --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter --node-count 6
+  - summary: Scale the number of nodes in a datacenter. This is a scale down operation assuming that the create datacenter was done with 3 nodes, followed by a scale up to 6 nodes. Each datacenter should atleast have 3 nodes.
+    syntax: az managed-cassandra datacenter update --resource-group MyResourceGroup --cluster-name MyCluster --data-center-name MyDataCenter --node-count 4
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name -c
+    summary: Cluster Name.
+    description: ''
+  - isRequired: true
+    name: --data-center-name -d
+    summary: Datacenter Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --base64-encoded-cassandra-yaml-fragment -b
+    summary: This is a Base64 encoded yaml file that is a subset of cassandra.yaml.  Supported fields will be honored and others will be ignored.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -n
+    summary: The number of Cassandra virtual machines in this data center. The minimum value is 3.
+    description: ''
+commands:
+- az_managed-cassandra_datacenter_create
+- az_managed-cassandra_datacenter_delete
+- az_managed-cassandra_datacenter_list
+- az_managed-cassandra_datacenter_show
+- az_managed-cassandra_datacenter_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure Managed Cassandra DataCenter.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/managedapp.yml b/2018-03-01-hybrid/docs-ref-autogen/managedapp.yml
index cf0245272b..7cf0a7bc50 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/managedapp.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/managedapp.yml
@@ -1,36 +1,39 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_managedapp
-  name: az managedapp
-  summary: Manage template solutions provided and maintained by Independent Software Vendors (ISVs).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_managedapp_create
-  - az_managedapp_delete
-  - az_managedapp_list
-  - az_managedapp_show
+### YamlMime:AzureCLIGroup
+uid: az_managedapp
+name: az managedapp
+summary: Manage template solutions provided and maintained by Independent Software Vendors (ISVs).
+description: ''
+directCommands:
 - uid: az_managedapp_create
   name: az managedapp create
   summary: Create a managed application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az managedapp create --kind
+                         --managed-rg-id
+                         --name
+                         --resource-group
+                         [--location]
+                         [--managedapp-definition-id]
+                         [--parameters]
+                         [--plan-name]
+                         [--plan-product]
+                         [--plan-publisher]
+                         [--plan-version]
+                         [--subscription]
+                         [--tags]
   examples:
   - summary: Create a managed application of kind 'ServiceCatalog'. This requires a valid managed application definition ID.
-    syntax:
-      content: >-
-        az managedapp create -g MyResourceGroup -n MyManagedApp -l westcentralus --kind ServiceCatalog \
-            -m "/subscriptions/{SubID}/resourceGroups/{ManagedResourceGroup}" \
-            -d "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Solutions/applianceDefinitions/{ApplianceDefinition}"
+    syntax: >-
+      az managedapp create -g MyResourceGroup -n MyManagedApp -l westcentralus --kind ServiceCatalog \
+          -m "/subscriptions/{SubID}/resourceGroups/{ManagedResourceGroup}" \
+          -d "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Solutions/applianceDefinitions/{ApplianceDefinition}"
   - summary: Create a managed application of kind 'MarketPlace'. This requires a valid plan, containing details about existing marketplace package like plan name, version, publisher and product.
-    syntax:
-      content: >-
-        az managedapp create -g MyResourceGroup -n MyManagedApp -l westcentralus --kind MarketPlace \
-            -m "/subscriptions/{SubID}/resourceGroups/{ManagedResourceGroup}" \
-            --plan-name ContosoAppliance --plan-version "1.0" --plan-product "contoso-appliance" --plan-publisher Contoso
-  parameters:
+    syntax: >-
+      az managedapp create -g MyResourceGroup -n MyManagedApp -l westcentralus --kind MarketPlace \
+          -m "/subscriptions/{SubID}/resourceGroups/{ManagedResourceGroup}" \
+          --plan-name ContosoAppliance --plan-version "1.0" --plan-product "contoso-appliance" --plan-publisher Contoso
+  requiredParameters:
   - isRequired: true
     name: --kind
     summary: The managed application kind. can be marketplace or servicecatalog.
@@ -47,6 +50,7 @@ items:
     name: --resource-group -g
     summary: The resource group of the managed application.
     description: ''
+  optionalParameters:
   - name: --location -l
     summary: The managed application location.
     description: ''
@@ -68,29 +72,26 @@ items:
   - name: --plan-version
     summary: The managed application package plan version.
     description: ''
-  - name: --tags
-    summary: Tags in 'a=b c' format.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_managedapp_delete
   name: az managedapp delete
   summary: Delete a managed application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az managedapp delete [--ids]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Delete a managed application. (autogenerated)
-    syntax:
-      content: az managedapp delete --name MyManagedApplication --resource-group MyResourceGroup
-  parameters:
+    syntax: az managedapp delete --name MyManagedApplication --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -103,88 +104,67 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_managedapp_list
   name: az managedapp list
   summary: List managed applications.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az managedapp list [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: List managed applications. (autogenerated)
-    syntax:
-      content: az managedapp list --resource-group MyResourceGroup
-  parameters:
+    syntax: az managedapp list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: The resource group of the managed application.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_managedapp_show
   name: az managedapp show
   summary: Gets a managed application.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az managedapp show [--ids]
+                       [--name]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The managed application name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: The resource group of the managed application.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_managedapp_create
-  name: az managedapp create
-  summary: Create a managed application.
-- uid: az_managedapp_definition
-  name: az managedapp definition
-  summary: Manage Azure Managed Applications.
-- uid: az_managedapp_definition_create
-  name: az managedapp definition create
-  summary: Create a managed application definition.
-- uid: az_managedapp_definition_delete
-  name: az managedapp definition delete
-  summary: Delete a managed application definition.
-- uid: az_managedapp_definition_list
-  name: az managedapp definition list
-  summary: List managed application definitions.
-- uid: az_managedapp_definition_show
-  name: az managedapp definition show
-  summary: Gets a managed application definition.
-- uid: az_managedapp_delete
-  name: az managedapp delete
-  summary: Delete a managed application.
-- uid: az_managedapp_list
-  name: az managedapp list
-  summary: List managed applications.
-- uid: az_managedapp_show
-  name: az managedapp show
-  summary: Gets a managed application.
+- az_managedapp_create
+- az_managedapp_definition
+- az_managedapp_definition_create
+- az_managedapp_definition_delete
+- az_managedapp_definition_list
+- az_managedapp_definition_show
+- az_managedapp_definition_update
+- az_managedapp_delete
+- az_managedapp_list
+- az_managedapp_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +180,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage template solutions provided and maintained by Independent Software Vendors (ISVs).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage template solutions provided and maintained by Independent Software Vendors (ISVs).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/managedapp/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/managedapp/definition.yml
index fb29a6a69e..c9783a275c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/managedapp/definition.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/managedapp/definition.yml
@@ -1,39 +1,41 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_managedapp_definition
-  name: az managedapp definition
-  summary: Manage Azure Managed Applications.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_managedapp_definition_create
-  - az_managedapp_definition_delete
-  - az_managedapp_definition_list
-  - az_managedapp_definition_show
+### YamlMime:AzureCLIGroup
+uid: az_managedapp_definition
+name: az managedapp definition
+summary: Manage Azure Managed Applications.
+description: ''
+directCommands:
 - uid: az_managedapp_definition_create
   name: az managedapp definition create
   summary: Create a managed application definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az managedapp definition create --authorizations
+                                    --description
+                                    --display-name
+                                    --lock-level {CanNotDelete, None, ReadOnly}
+                                    --name
+                                    --resource-group
+                                    [--create-ui-definition]
+                                    [--location]
+                                    [--main-template]
+                                    [--package-file-uri]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Create a managed application defintion.
-    syntax:
-      content: >-
-        az managedapp definition create -g MyResourceGroup -n MyManagedAppDef -l eastus --display-name "MyManagedAppDef" \
-            --description "My Managed App Def description" -a "myPrincipalId:myRoleId" --lock-level None \
-            --package-file-uri "https://path/to/myPackage.zip"
+    syntax: >-
+      az managedapp definition create -g MyResourceGroup -n MyManagedAppDef -l eastus --display-name "MyManagedAppDef" \
+          --description "My Managed App Def description" -a "myPrincipalId:myRoleId" --lock-level None \
+          --package-file-uri "https://path/to/myPackage.zip"
   - summary: Create a managed application defintion with inline values for createUiDefinition and mainTemplate.
-    syntax:
-      content: >-
-        az managedapp definition create -g MyResourceGroup -n MyManagedAppDef -l eastus --display-name "MyManagedAppDef" \
-            --description "My Managed App Def description" -a "myPrincipalId:myRoleId" --lock-level None \
-            --create-ui-definition @myCreateUiDef.json --main-template @myMainTemplate.json
-  parameters:
+    syntax: >-
+      az managedapp definition create -g MyResourceGroup -n MyManagedAppDef -l eastus --display-name "MyManagedAppDef" \
+          --description "My Managed App Def description" -a "myPrincipalId:myRoleId" --lock-level None \
+          --create-ui-definition @myCreateUiDef.json --main-template @myMainTemplate.json
+  requiredParameters:
   - isRequired: true
     name: --authorizations -a
-    summary: Space-separated authorization pairs in a format of `&lt;principalId&gt;:&lt;roleDefinitionId&gt;`.
+    summary: Space-separated authorization pairs in a format of `<principalId>:<roleDefinitionId>`.
     description: ''
   - isRequired: true
     name: --description
@@ -56,41 +58,39 @@ items:
     name: --resource-group -g
     summary: The resource group of the managed application definition.
     description: ''
-  - name: --create-ui-definition
-    summary: The managed application definition create ui definition.
+  optionalParameters:
+  - name: --create-ui-definition -c
+    summary: JSON formatted string or a path to a file with such content.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --main-template
-    summary: The managed application definition main template.
+  - name: --main-template -t
+    summary: JSON formatted string or a path to a file with such content.
     description: ''
   - name: --package-file-uri
     summary: The managed application definition package file uri.
     description: ''
-  - name: --tags
-    summary: Tags in 'a=b c' format.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_managedapp_definition_delete
   name: az managedapp definition delete
   summary: Delete a managed application definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az managedapp definition delete [--ids]
+                                    [--name]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Delete a managed application definition. (autogenerated)
-    syntax:
-      content: az managedapp definition delete --name MyManagedApplicationDefinition --resource-group MyResourceGroup
-  parameters:
+    syntax: az managedapp definition delete --name MyManagedApplicationDefinition --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -103,74 +103,140 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_managedapp_definition_list
   name: az managedapp definition list
   summary: List managed application definitions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az managedapp definition list --resource-group
+                                  [--query-examples]
+                                  [--subscription]
   examples:
   - summary: List managed application definitions. (autogenerated)
-    syntax:
-      content: az managedapp definition list --resource-group MyResourceGroup
-  parameters:
+    syntax: az managedapp definition list --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group of the managed application definition.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_managedapp_definition_show
   name: az managedapp definition show
   summary: Gets a managed application definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az managedapp definition show [--ids]
+                                  [--name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The managed application definition name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: The resource group of the managed application definition.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
+- uid: az_managedapp_definition_update
+  name: az managedapp definition update
+  summary: Update a managed application definition.
+  description: ''
+  syntax: >-
+    az managedapp definition update --authorizations
+                                    --description
+                                    --display-name
+                                    --lock-level {CanNotDelete, None, ReadOnly}
+                                    [--create-ui-definition]
+                                    [--ids]
+                                    [--location]
+                                    [--main-template]
+                                    [--name]
+                                    [--package-file-uri]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--tags]
+  examples:
+  - summary: Update a managed application defintion.
+    syntax: >-
+      az managedapp definition update -g MyResourceGroup -n MyManagedAppDef -l eastus --display-name "MyManagedAppDef" \
+          --description "My Managed App Def description" -a "myPrincipalId:myRoleId" --lock-level None \
+          --package-file-uri "https://path/to/myPackage.zip"
+  - summary: Update a managed application defintion with inline values for createUiDefinition and mainTemplate.
+    syntax: >-
+      az managedapp definition update -g MyResourceGroup -n MyManagedAppDef -l eastus --display-name "MyManagedAppDef" \
+          --description "My Managed App Def description" -a "myPrincipalId:myRoleId" --lock-level None \
+          --create-ui-definition @myCreateUiDef.json --main-template @myMainTemplate.json
+  requiredParameters:
+  - isRequired: true
+    name: --authorizations -a
+    summary: Space-separated authorization pairs in a format of `<principalId>:<roleDefinitionId>`.
+    description: ''
+  - isRequired: true
+    name: --description
+    summary: The managed application definition description.
+    description: ''
+  - isRequired: true
+    name: --display-name
+    summary: The managed application definition display name.
+    description: ''
+  - isRequired: true
+    name: --lock-level
+    parameterValueGroup: CanNotDelete, None, ReadOnly
+    summary: The type of lock restriction.
+    description: ''
+  optionalParameters:
+  - name: --create-ui-definition -c
+    summary: JSON formatted string or a path to a file with such content.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --main-template -t
+    summary: JSON formatted string or a path to a file with such content.
+    description: ''
   - name: --name -n
     summary: The managed application definition name.
     description: ''
+  - name: --package-file-uri
+    summary: The managed application definition package file uri.
+    description: ''
   - name: --resource-group -g
     summary: The resource group of the managed application definition.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_managedapp_definition_create
-  name: az managedapp definition create
-  summary: Create a managed application definition.
-- uid: az_managedapp_definition_delete
-  name: az managedapp definition delete
-  summary: Delete a managed application definition.
-- uid: az_managedapp_definition_list
-  name: az managedapp definition list
-  summary: List managed application definitions.
-- uid: az_managedapp_definition_show
-  name: az managedapp definition show
-  summary: Gets a managed application definition.
+- az_managedapp_definition_create
+- az_managedapp_definition_delete
+- az_managedapp_definition_list
+- az_managedapp_definition_show
+- az_managedapp_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -186,10 +252,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Managed Applications.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Managed Applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/managementpartner.yml b/2018-03-01-hybrid/docs-ref-autogen/managementpartner.yml
new file mode 100644
index 0000000000..4153a32ffe
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/managementpartner.yml
@@ -0,0 +1,71 @@
+### YamlMime:AzureCLIGroup
+uid: az_managementpartner
+name: az managementpartner
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **managementpartner** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az managementpartner** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
+description: ''
+directCommands:
+- uid: az_managementpartner_create
+  name: az managementpartner create
+  summary: Associates a Microsoft Partner Network(MPN) ID to the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner create --partner-id
+  requiredParameters:
+  - isRequired: true
+    name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+- uid: az_managementpartner_delete
+  name: az managementpartner delete
+  summary: Delete the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner delete --partner-id
+  requiredParameters:
+  - isRequired: true
+    name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+- uid: az_managementpartner_show
+  name: az managementpartner show
+  summary: Gets the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner show [--partner-id]
+  optionalParameters:
+  - name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+- uid: az_managementpartner_update
+  name: az managementpartner update
+  summary: Updates the Microsoft Partner Network(MPN) ID of the current authenticated user or service principal.
+  description: ''
+  syntax: az managementpartner update --partner-id
+  requiredParameters:
+  - isRequired: true
+    name: --partner-id
+    summary: Microsoft partner network ID.
+    description: ''
+commands:
+- az_managementpartner_create
+- az_managementpartner_delete
+- az_managementpartner_show
+- az_managementpartner_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Allows the partners to associate a Microsoft Partner Network(MPN) ID to a user or service principal in the customer's Azure directory.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh.yml
new file mode 100644
index 0000000000..76800b24e8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh.yml
@@ -0,0 +1,64 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh
+name: az mesh
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
+description: ''
+commands:
+- az_mesh_app
+- az_mesh_app_delete
+- az_mesh_app_list
+- az_mesh_app_show
+- az_mesh_code-package-log
+- az_mesh_code-package-log_get
+- az_mesh_deployment
+- az_mesh_deployment_create
+- az_mesh_gateway
+- az_mesh_gateway_delete
+- az_mesh_gateway_list
+- az_mesh_gateway_show
+- az_mesh_generate
+- az_mesh_generate_armtemplate
+- az_mesh_network
+- az_mesh_network_delete
+- az_mesh_network_list
+- az_mesh_network_show
+- az_mesh_secret
+- az_mesh_secret_delete
+- az_mesh_secret_list
+- az_mesh_secret_show
+- az_mesh_secretvalue
+- az_mesh_secretvalue_delete
+- az_mesh_secretvalue_list
+- az_mesh_secretvalue_show
+- az_mesh_service
+- az_mesh_service_list
+- az_mesh_service_show
+- az_mesh_service-replica
+- az_mesh_service-replica_list
+- az_mesh_service-replica_show
+- az_mesh_volume
+- az_mesh_volume_create
+- az_mesh_volume_delete
+- az_mesh_volume_list
+- az_mesh_volume_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage Azure Service Fabric Mesh Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/app.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/app.yml
new file mode 100644
index 0000000000..91e8db0fab
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/app.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_app
+name: az mesh app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh applications.
+description: ''
+directCommands:
+- uid: az_mesh_app_delete
+  name: az mesh app delete
+  summary: Delete a Service Fabric Mesh application.
+  description: ''
+  syntax: >-
+    az mesh app delete --name
+                       --resource-group
+                       [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_app_list
+  name: az mesh app list
+  summary: List Service Fabric Mesh applications.
+  description: ''
+  syntax: az mesh app list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_app_show
+  name: az mesh app show
+  summary: Get the details of a Service Fabric Mesh application.
+  description: ''
+  syntax: >-
+    az mesh app show --name
+                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_app_delete
+- az_mesh_app_list
+- az_mesh_app_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/code-package-log.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/code-package-log.yml
new file mode 100644
index 0000000000..e08944ec37
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/code-package-log.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_code-package-log
+name: az mesh code-package-log
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh code-package-log** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Examine the logs for a codepackage.
+description: ''
+directCommands:
+- uid: az_mesh_code-package-log_get
+  name: az mesh code-package-log get
+  summary: Examine the logs for a codepackage.
+  description: ''
+  syntax: >-
+    az mesh code-package-log get --app-name
+                                 --code-package-name
+                                 --replica-name
+                                 --resource-group
+                                 --service-name
+                                 [--tail]
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --code-package-name
+    summary: The name of code package of the service.
+    description: ''
+  - isRequired: true
+    name: --replica-name
+    summary: Service Fabric replica name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the service.
+    description: ''
+  optionalParameters:
+  - name: --tail
+    summary: Number of lines to show from the end of the logs. Default is 100.
+    description: ''
+commands:
+- az_mesh_code-package-log_get
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Examine the logs for a codepackage.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/deployment.yml
new file mode 100644
index 0000000000..7e408afcd4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/deployment.yml
@@ -0,0 +1,82 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_deployment
+name: az mesh deployment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh deployment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh deployments.
+description: ''
+directCommands:
+- uid: az_mesh_deployment_create
+  name: az mesh deployment create
+  summary: Create a Service Fabric Mesh application.
+  description: ''
+  syntax: >-
+    az mesh deployment create --resource-group
+                              [--input-yaml-files]
+                              [--mode]
+                              [--name]
+                              [--no-wait]
+                              [--parameters]
+                              [--template-file]
+                              [--template-uri]
+  examples:
+  - summary: Create a deployment with a template file on the remote.
+    syntax: az mesh deployment create --resource-group mygroup --template-uri https://seabreezequickstart.blob.core.windows.net/templates/quickstart/sbz_rp.linux.json
+  - summary: Create a deployment with a template file on local disk.
+    syntax: az mesh deployment create --resource-group mygroup --template-file ./appTemplate.json
+  - summary: List of comma separated yaml files or a directory which contains all the yaml files.
+    syntax: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml
+  - summary: Create a deployment with yaml files, along with a yaml parameters file, which consists of key/value pairs.
+    syntax: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
+  - summary: Create a deployment with parameters in arm json format.
+    syntax: az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
+  - summary: Create a deployment with parameters passed directly as a json object.
+    syntax: "az mesh deployment create --resource-group mygroup --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-yaml-files
+    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
+    description: ''
+  - name: --mode
+    summary: The mode for deployment, can be incremental(resources are only added) or complete(previous resources will be deleted).
+    description: ''
+  - name: --name -n
+    summary: The deployment name. Default to template file base name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --parameters
+    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
+    description: ''
+  - name: --template-file
+    summary: The full file path of creation template.
+    description: ''
+  - name: --template-uri
+    summary: The full file path of creation template on a http or https link.
+    description: ''
+commands:
+- az_mesh_deployment_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh deployments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/gateway.yml
new file mode 100644
index 0000000000..7229c95cbc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/gateway.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_gateway
+name: az mesh gateway
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh gateway** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage gateway resources.
+description: ''
+directCommands:
+- uid: az_mesh_gateway_delete
+  name: az mesh gateway delete
+  summary: Delete a gateway resource.
+  description: ''
+  syntax: >-
+    az mesh gateway delete --name
+                           --resource-group
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the gateway resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_gateway_list
+  name: az mesh gateway list
+  summary: List gateway resources.
+  description: ''
+  syntax: az mesh gateway list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_gateway_show
+  name: az mesh gateway show
+  summary: Get the details of a gateway.
+  description: ''
+  syntax: >-
+    az mesh gateway show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the gateway resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_gateway_delete
+- az_mesh_gateway_list
+- az_mesh_gateway_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage gateway resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/generate.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/generate.yml
new file mode 100644
index 0000000000..5209801ad6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/generate.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_generate
+name: az mesh generate
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh generate** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Generate Service Fabric Mesh deployment template.
+description: ''
+directCommands:
+- uid: az_mesh_generate_armtemplate
+  name: az mesh generate armtemplate
+  summary: Generate a Service Fabric Mesh ARM deployment template from input yaml.
+  description: ''
+  syntax: >-
+    az mesh generate armtemplate --input-yaml-files
+                                 [--parameters]
+  examples:
+  - summary: Generate a template file for deployment.
+    syntax: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml
+  - summary: Generate a template file for deployment with a yaml parameters file, which consists of key/value pairs.
+    syntax: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters ../params.yaml
+  - summary: Generate a template file for deployment with parameters in arm json format.
+    syntax: az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters "params.json"
+  - summary: Generate a template file for deployment with parameters passed directly as a json object.
+    syntax: "az mesh generate armtemplate --input-yaml-files ./app.yaml,./network.yaml --parameters \"{ 'location' : {'value' : 'eastus'}, 'myparam' : {'value' : 'myvalue'} }\""
+  requiredParameters:
+  - isRequired: true
+    name: --input-yaml-files
+    summary: List of comma seperated yaml files or a directory which contains all the yaml files.
+    description: ''
+  optionalParameters:
+  - name: --parameters
+    summary: Parameters in yaml file as key-value pairs or as json object or as json arm parameter file to supplement parameters of the deployment template.
+    description: ''
+commands:
+- az_mesh_generate_armtemplate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Generate Service Fabric Mesh deployment template.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/network.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/network.yml
new file mode 100644
index 0000000000..0737d62035
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/network.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_network
+name: az mesh network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage networks.
+description: ''
+directCommands:
+- uid: az_mesh_network_delete
+  name: az mesh network delete
+  summary: Delete a network.
+  description: ''
+  syntax: >-
+    az mesh network delete --name
+                           --resource-group
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_network_list
+  name: az mesh network list
+  summary: List networks.
+  description: ''
+  syntax: az mesh network list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_network_show
+  name: az mesh network show
+  summary: Get the details of a network.
+  description: ''
+  syntax: >-
+    az mesh network show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_network_delete
+- az_mesh_network_list
+- az_mesh_network_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage networks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/secret.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/secret.yml
new file mode 100644
index 0000000000..d2a254fb2a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/secret.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_secret
+name: az mesh secret
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh secret** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage secret resources.
+description: ''
+directCommands:
+- uid: az_mesh_secret_delete
+  name: az mesh secret delete
+  summary: Delete a secret.
+  description: ''
+  syntax: >-
+    az mesh secret delete --name
+                          --resource-group
+                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the secret.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_secret_list
+  name: az mesh secret list
+  summary: List Secrets.
+  description: ''
+  syntax: az mesh secret list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_secret_show
+  name: az mesh secret show
+  summary: Get the details of a secret.
+  description: ''
+  syntax: >-
+    az mesh secret show --name
+                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the secret.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_secret_delete
+- az_mesh_secret_list
+- az_mesh_secret_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage secret resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/secretvalue.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/secretvalue.yml
new file mode 100644
index 0000000000..f3e42b2a52
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/secretvalue.yml
@@ -0,0 +1,99 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_secretvalue
+name: az mesh secretvalue
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh secretvalue** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage secret values.
+description: ''
+directCommands:
+- uid: az_mesh_secretvalue_delete
+  name: az mesh secretvalue delete
+  summary: Delete a secret version.
+  description: ''
+  syntax: >-
+    az mesh secretvalue delete --resource-group
+                               --secret-resource-name
+                               --version
+                               [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-resource-name
+    summary: The name of the secret resource.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: The name of the secret version.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_secretvalue_list
+  name: az mesh secretvalue list
+  summary: List Secrets versions.
+  description: ''
+  syntax: >-
+    az mesh secretvalue list --resource-group
+                             --secret-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-name -n
+    summary: The name of the secret resource.
+    description: ''
+- uid: az_mesh_secretvalue_show
+  name: az mesh secretvalue show
+  summary: Get the details of a secret value.
+  description: ''
+  syntax: >-
+    az mesh secretvalue show --resource-group
+                             --secret-name
+                             --version
+                             [--show-value]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-name -n
+    summary: The name of the secret resource.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: The name of the secret version.
+    description: ''
+  optionalParameters:
+  - name: --show-value
+    summary: Pass this flag to receive the value of the secret.
+    description: ''
+commands:
+- az_mesh_secretvalue_delete
+- az_mesh_secretvalue_list
+- az_mesh_secretvalue_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage secret values.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/service-replica.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/service-replica.yml
new file mode 100644
index 0000000000..55faee9562
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/service-replica.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_service-replica
+name: az mesh service-replica
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh service-replica** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh service replicas.
+description: ''
+directCommands:
+- uid: az_mesh_service-replica_list
+  name: az mesh service-replica list
+  summary: List the details of service replicas.
+  description: ''
+  syntax: >-
+    az mesh service-replica list --app-name
+                                 --resource-group
+                                 --service-name
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the service.
+    description: ''
+- uid: az_mesh_service-replica_show
+  name: az mesh service-replica show
+  summary: Gets the given replica of the service of an application.
+  description: Gets the information about the service replica with the given name. The information include the description and other properties of the service replica.
+  syntax: >-
+    az mesh service-replica show --app-name
+                                 --name
+                                 --resource-group
+                                 --service-name
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the service replica.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: The name of the service.
+    description: ''
+commands:
+- az_mesh_service-replica_list
+- az_mesh_service-replica_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh service replicas.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/service.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/service.yml
new file mode 100644
index 0000000000..36118589ca
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/service.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_service
+name: az mesh service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Service Fabric Mesh services.
+description: ''
+directCommands:
+- uid: az_mesh_service_list
+  name: az mesh service list
+  summary: Lists all the service resources.
+  description: Gets the information about all services of an application resource. The information include the description and other properties of the Service.
+  syntax: >-
+    az mesh service list --app-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_service_show
+  name: az mesh service show
+  summary: Get the details of a service.
+  description: ''
+  syntax: >-
+    az mesh service show --app-name
+                         --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app-name --application-name
+    summary: The name of the application.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_service_list
+- az_mesh_service_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Service Fabric Mesh services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mesh/volume.yml b/2018-03-01-hybrid/docs-ref-autogen/mesh/volume.yml
new file mode 100644
index 0000000000..ab938838cc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mesh/volume.yml
@@ -0,0 +1,113 @@
+### YamlMime:AzureCLIGroup
+uid: az_mesh_volume
+name: az mesh volume
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mesh** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az mesh volume** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage volumes.
+description: ''
+directCommands:
+- uid: az_mesh_volume_create
+  name: az mesh volume create
+  summary: Create a volume.
+  description: ''
+  syntax: >-
+    az mesh volume create --location
+                          --name
+                          --resource-group
+                          [--template-file]
+                          [--template-uri]
+  examples:
+  - summary: Create a volume with a template file on a remote URL.
+    syntax: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-uri https://mystorage.blob.core.windows.net/templates/volumeDescription.json
+  - summary: Create a volume with a template file on local disk.
+    syntax: az mesh volume create --location westus --name myvolume --resource-group mygroup --template-file ./volumeDescription.json
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the volume.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --template-file
+    summary: The full file path of creation template.
+    description: ''
+  - name: --template-uri
+    summary: The full file path of creation template on a http or https link.
+    description: ''
+- uid: az_mesh_volume_delete
+  name: az mesh volume delete
+  summary: Delete a volume.
+  description: ''
+  syntax: >-
+    az mesh volume delete --name
+                          --resource-group
+                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the volume.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mesh_volume_list
+  name: az mesh volume list
+  summary: List volumes.
+  description: ''
+  syntax: az mesh volume list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_mesh_volume_show
+  name: az mesh volume show
+  summary: Get the details of a volume.
+  description: ''
+  syntax: >-
+    az mesh volume show --name
+                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the volume.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_mesh_volume_create
+- az_mesh_volume_delete
+- az_mesh_volume_list
+- az_mesh_volume_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage volumes.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1).yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1).yml
new file mode 100644
index 0000000000..e4c302d88c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1).yml
@@ -0,0 +1,171 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)
+name: az ml
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Machine Learning resources.
+description: ''
+commands:
+- az_ml(v1)_computetarget
+- az_ml(v1)_computetarget_amlcompute
+- az_ml(v1)_computetarget_amlcompute_identity
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+- az_ml(v1)_computetarget_attach
+- az_ml(v1)_computetarget_attach_aks
+- az_ml(v1)_computetarget_attach_kubernetes
+- az_ml(v1)_computetarget_attach_remote
+- az_ml(v1)_computetarget_computeinstance
+- az_ml(v1)_computetarget_computeinstance_restart
+- az_ml(v1)_computetarget_computeinstance_start
+- az_ml(v1)_computetarget_computeinstance_stop
+- az_ml(v1)_computetarget_create
+- az_ml(v1)_computetarget_create_aks
+- az_ml(v1)_computetarget_create_amlcompute
+- az_ml(v1)_computetarget_create_computeinstance
+- az_ml(v1)_computetarget_create_datafactory
+- az_ml(v1)_computetarget_delete
+- az_ml(v1)_computetarget_detach
+- az_ml(v1)_computetarget_get-credentials
+- az_ml(v1)_computetarget_list
+- az_ml(v1)_computetarget_show
+- az_ml(v1)_computetarget_update
+- az_ml(v1)_computetarget_update_aks
+- az_ml(v1)_computetarget_update_amlcompute
+- az_ml(v1)_dataset
+- az_ml(v1)_dataset_archive
+- az_ml(v1)_dataset_deprecate
+- az_ml(v1)_dataset_list
+- az_ml(v1)_dataset_reactivate
+- az_ml(v1)_dataset_register
+- az_ml(v1)_dataset_show
+- az_ml(v1)_dataset_unregister
+- az_ml(v1)_datastore
+- az_ml(v1)_datastore_attach-adls
+- az_ml(v1)_datastore_attach-adls-gen2
+- az_ml(v1)_datastore_attach-blob
+- az_ml(v1)_datastore_attach-dbfs
+- az_ml(v1)_datastore_attach-file
+- az_ml(v1)_datastore_attach-mysqldb
+- az_ml(v1)_datastore_attach-psqldb
+- az_ml(v1)_datastore_attach-sqldb
+- az_ml(v1)_datastore_detach
+- az_ml(v1)_datastore_download
+- az_ml(v1)_datastore_list
+- az_ml(v1)_datastore_set-default
+- az_ml(v1)_datastore_show
+- az_ml(v1)_datastore_show-default
+- az_ml(v1)_datastore_upload
+- az_ml(v1)_endpoint
+- az_ml(v1)_endpoint_realtime
+- az_ml(v1)_endpoint_realtime_create-version
+- az_ml(v1)_endpoint_realtime_delete
+- az_ml(v1)_endpoint_realtime_delete-version
+- az_ml(v1)_endpoint_realtime_get-access-token
+- az_ml(v1)_endpoint_realtime_get-keys
+- az_ml(v1)_endpoint_realtime_get-logs
+- az_ml(v1)_endpoint_realtime_list
+- az_ml(v1)_endpoint_realtime_regen-key
+- az_ml(v1)_endpoint_realtime_run
+- az_ml(v1)_endpoint_realtime_show
+- az_ml(v1)_endpoint_realtime_update
+- az_ml(v1)_endpoint_realtime_update-version
+- az_ml(v1)_environment
+- az_ml(v1)_environment_download
+- az_ml(v1)_environment_list
+- az_ml(v1)_environment_register
+- az_ml(v1)_environment_scaffold
+- az_ml(v1)_environment_show
+- az_ml(v1)_experiment
+- az_ml(v1)_experiment_list
+- az_ml(v1)_folder
+- az_ml(v1)_folder_attach
+- az_ml(v1)_model
+- az_ml(v1)_model_delete
+- az_ml(v1)_model_deploy
+- az_ml(v1)_model_download
+- az_ml(v1)_model_list
+- az_ml(v1)_model_package
+- az_ml(v1)_model_profile
+- az_ml(v1)_model_register
+- az_ml(v1)_model_show
+- az_ml(v1)_model_update
+- az_ml(v1)_pipeline
+- az_ml(v1)_pipeline_clone
+- az_ml(v1)_pipeline_clone-draft
+- az_ml(v1)_pipeline_create
+- az_ml(v1)_pipeline_create-draft
+- az_ml(v1)_pipeline_create-schedule
+- az_ml(v1)_pipeline_delete-draft
+- az_ml(v1)_pipeline_disable
+- az_ml(v1)_pipeline_disable-schedule
+- az_ml(v1)_pipeline_enable
+- az_ml(v1)_pipeline_enable-schedule
+- az_ml(v1)_pipeline_get
+- az_ml(v1)_pipeline_last-pipeline-run
+- az_ml(v1)_pipeline_list
+- az_ml(v1)_pipeline_list-drafts
+- az_ml(v1)_pipeline_list-steps
+- az_ml(v1)_pipeline_pipeline-runs-list
+- az_ml(v1)_pipeline_publish-draft
+- az_ml(v1)_pipeline_show
+- az_ml(v1)_pipeline_show-draft
+- az_ml(v1)_pipeline_show-schedule
+- az_ml(v1)_pipeline_submit-draft
+- az_ml(v1)_pipeline_update-draft
+- az_ml(v1)_pipeline_update-schedule
+- az_ml(v1)_run
+- az_ml(v1)_run_cancel
+- az_ml(v1)_run_download-logs
+- az_ml(v1)_run_list
+- az_ml(v1)_run_monitor-logs
+- az_ml(v1)_run_monitor-tensorboard
+- az_ml(v1)_run_show
+- az_ml(v1)_run_submit-hyperdrive
+- az_ml(v1)_run_submit-pipeline
+- az_ml(v1)_run_submit-script
+- az_ml(v1)_run_update
+- az_ml(v1)_service
+- az_ml(v1)_service_delete
+- az_ml(v1)_service_get-access-token
+- az_ml(v1)_service_get-keys
+- az_ml(v1)_service_get-logs
+- az_ml(v1)_service_list
+- az_ml(v1)_service_regen-key
+- az_ml(v1)_service_run
+- az_ml(v1)_service_show
+- az_ml(v1)_service_update
+- az_ml(v1)_workspace
+- az_ml(v1)_workspace_create
+- az_ml(v1)_workspace_delete
+- az_ml(v1)_workspace_list
+- az_ml(v1)_workspace_list-keys
+- az_ml(v1)_workspace_private-endpoint
+- az_ml(v1)_workspace_private-endpoint_add
+- az_ml(v1)_workspace_private-endpoint_delete
+- az_ml(v1)_workspace_private-endpoint_list
+- az_ml(v1)_workspace_share
+- az_ml(v1)_workspace_show
+- az_ml(v1)_workspace_sync-keys
+- az_ml(v1)_workspace_update
+- az_ml(v1)_workspace_update-dependencies
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Machine Learning resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget.yml
new file mode 100644
index 0000000000..9048a378c1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget
+name: az ml computetarget
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Computetarget subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_delete
+  name: az ml computetarget delete
+  summary: Delete a compute target (aks or amlcompute or computeinstance).
+  description: ''
+  syntax: >-
+    az ml computetarget delete --name
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+                               [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the enviroment to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_detach
+  name: az ml computetarget detach
+  summary: Detach a compute target (aks or remote) from a workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget detach --name
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+                               [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to detach.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the enviroment to detach.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_get-credentials
+  name: az ml computetarget get-credentials
+  summary: Get credentials for a compute target (aks or remote).
+  description: ''
+  syntax: >-
+    az ml computetarget get-credentials --name
+                                        [--path]
+                                        [--resource-group]
+                                        [--subscription-id]
+                                        [--workspace-name]
+                                        [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to retrieve keys for.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to get credentials for.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_list
+  name: az ml computetarget list
+  summary: List all the compute targets attached to a workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget list [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+                             [-v]
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_show
+  name: az ml computetarget show
+  summary: Show details of a specific compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget show --name
+                             [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+                             [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to show.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_amlcompute
+- az_ml(v1)_computetarget_amlcompute_identity
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+- az_ml(v1)_computetarget_attach
+- az_ml(v1)_computetarget_attach_aks
+- az_ml(v1)_computetarget_attach_kubernetes
+- az_ml(v1)_computetarget_attach_remote
+- az_ml(v1)_computetarget_computeinstance
+- az_ml(v1)_computetarget_computeinstance_restart
+- az_ml(v1)_computetarget_computeinstance_start
+- az_ml(v1)_computetarget_computeinstance_stop
+- az_ml(v1)_computetarget_create
+- az_ml(v1)_computetarget_create_aks
+- az_ml(v1)_computetarget_create_amlcompute
+- az_ml(v1)_computetarget_create_computeinstance
+- az_ml(v1)_computetarget_create_datafactory
+- az_ml(v1)_computetarget_delete
+- az_ml(v1)_computetarget_detach
+- az_ml(v1)_computetarget_get-credentials
+- az_ml(v1)_computetarget_list
+- az_ml(v1)_computetarget_show
+- az_ml(v1)_computetarget_update
+- az_ml(v1)_computetarget_update_aks
+- az_ml(v1)_computetarget_update_amlcompute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Computetarget subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/amlcompute.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/amlcompute.yml
new file mode 100644
index 0000000000..89adbbb43b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/amlcompute.yml
@@ -0,0 +1,30 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_amlcompute
+name: az ml computetarget amlcompute
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget amlcompute** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_ml(v1)_computetarget_amlcompute_identity
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/amlcompute/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/amlcompute/identity.yml
new file mode 100644
index 0000000000..4ccc3152d3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/amlcompute/identity.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_amlcompute_identity
+name: az ml computetarget amlcompute identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget amlcompute identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: AzureML compute target identity commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_amlcompute_identity_assign
+  name: az ml computetarget amlcompute identity assign
+  summary: Assign identity to an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget amlcompute identity assign --identities
+                                                   --name
+                                                   [--path]
+                                                   [--resource-group]
+                                                   [--subscription-id]
+                                                   [--workspace-name]
+                                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --identities
+    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie 'ResourceID1,ResourceID2') to set user assigned identities.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_amlcompute_identity_remove
+  name: az ml computetarget amlcompute identity remove
+  summary: Remove identity from an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget amlcompute identity remove --identities
+                                                   --name
+                                                   [--path]
+                                                   [--resource-group]
+                                                   [--subscription-id]
+                                                   [--workspace-name]
+                                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --identities
+    summary: Use '[system]' to remove a system assigned identity else input resource IDs separated by commas (ie 'ResourceID1,ResourceID2') to remove user assigned identities.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_amlcompute_identity_show
+  name: az ml computetarget amlcompute identity show
+  summary: Display identities of an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget amlcompute identity show --name
+                                                 [--path]
+                                                 [--resource-group]
+                                                 [--subscription-id]
+                                                 [--workspace-name]
+                                                 [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_amlcompute_identity_assign
+- az_ml(v1)_computetarget_amlcompute_identity_remove
+- az_ml(v1)_computetarget_amlcompute_identity_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: AzureML compute target identity commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/attach.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/attach.yml
new file mode 100644
index 0000000000..b347be5be6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/attach.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_attach
+name: az ml computetarget attach
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget attach** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Attach subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_attach_aks
+  name: az ml computetarget attach aks
+  summary: Attach an AKS cluster to the workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget attach aks --compute-resource-id
+                                   --name
+                                   [--resource-group]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --compute-resource-id -i
+    summary: Resource ID of the compute object to attach to the workspace.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specifies the compute target name. Must be unique to the workspace.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
+    description: ''
+- uid: az_ml(v1)_computetarget_attach_kubernetes
+  name: az ml computetarget attach kubernetes
+  summary: Attach a KubernetesCompute as a compute target to the workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget attach kubernetes --compute-resource-id
+                                          --name
+                                          [--amlk8s-config]
+                                          [--resource-group]
+                                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --compute-resource-id -i
+    summary: Resource ID of the compute object to attach to the workspace.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specifies the compute target name. Must be unique to the workspace.
+    description: ''
+  optionalParameters:
+  - name: --amlk8s-config
+    summary: The json file for amlk8s configuration.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
+    description: ''
+- uid: az_ml(v1)_computetarget_attach_remote
+  name: az ml computetarget attach remote
+  summary: Attach a remote machine without Docker as a compute target to the workspace.
+  description: ''
+  syntax: >-
+    az ml computetarget attach remote --address
+                                      --name
+                                      --ssh-port
+                                      --username
+                                      [--password]
+                                      [--private-key-file]
+                                      [--private-key-passphrase]
+                                      [--resource-group]
+                                      [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --address -a
+    summary: DNS name or IP address of the target.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specifies the compute target name. Must be unique to the workspace.
+    description: ''
+  - isRequired: true
+    name: --ssh-port
+    defaultValue: "22"
+    summary: Ssh port that can be use to connect to the compute.
+    description: ''
+  - isRequired: true
+    name: --username -u
+    summary: The username for the remote machine being attached. Must also provide either a password or public and private key files.
+    description: ''
+  optionalParameters:
+  - name: --password -p
+    summary: The password for the remote machine being attached. Must either provide a password or public and private key files.
+    description: ''
+  - name: --private-key-file
+    summary: Path to a file containing the private key information for the remote machine being attached.
+    description: ''
+  - name: --private-key-passphrase
+    summary: Passphrase for private key specified with the --private-key-file option.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace. A default value for all commands can be set by running "az configure --defaults group=<resource group name>". This parameter will override any set default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under. A default value for all commands can be set by running "az configure --defaults workspace_name=<workspace name>". This parameter will override any set default.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_attach_aks
+- az_ml(v1)_computetarget_attach_kubernetes
+- az_ml(v1)_computetarget_attach_remote
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Attach subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/computeinstance.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/computeinstance.yml
new file mode 100644
index 0000000000..23d5d4d823
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/computeinstance.yml
@@ -0,0 +1,139 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_computeinstance
+name: az ml computetarget computeinstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget computeinstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: AzureML compute instance commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_computeinstance_restart
+  name: az ml computetarget computeinstance restart
+  summary: Restart a compute instance.
+  description: ''
+  syntax: >-
+    az ml computetarget computeinstance restart --name
+                                                [--no-wait]
+                                                [--path]
+                                                [--resource-group]
+                                                [--subscription-id]
+                                                [--workspace-name]
+                                                [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to restart.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to restart.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_computeinstance_start
+  name: az ml computetarget computeinstance start
+  summary: Start a compute instance.
+  description: ''
+  syntax: >-
+    az ml computetarget computeinstance start --name
+                                              [--no-wait]
+                                              [--path]
+                                              [--resource-group]
+                                              [--subscription-id]
+                                              [--workspace-name]
+                                              [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to start.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to start.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_computeinstance_stop
+  name: az ml computetarget computeinstance stop
+  summary: Stop a compute instance.
+  description: ''
+  syntax: >-
+    az ml computetarget computeinstance stop --name
+                                             [--no-wait]
+                                             [--path]
+                                             [--resource-group]
+                                             [--subscription-id]
+                                             [--workspace-name]
+                                             [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to stop.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the compute target to stop.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_computeinstance_restart
+- az_ml(v1)_computetarget_computeinstance_start
+- az_ml(v1)_computetarget_computeinstance_stop
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: AzureML compute instance commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/create.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/create.yml
new file mode 100644
index 0000000000..bc83c548f1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/create.yml
@@ -0,0 +1,351 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_create
+name: az ml computetarget create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Create a compute target (aks or amlcompute or computeinstance).
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_create_aks
+  name: az ml computetarget create aks
+  summary: Create an AKS compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget create aks --name
+                                   [--agent-count]
+                                   [--cluster-purpose]
+                                   [--dns-service-ip]
+                                   [--docker-bridge-cidr]
+                                   [--load-balancer-subnet]
+                                   [--load-balancer-type]
+                                   [--location]
+                                   [--no-wait]
+                                   [--path]
+                                   [--resource-group]
+                                   [--service-cidr]
+                                   [--ssl-cert-file]
+                                   [--ssl-cname]
+                                   [--ssl-key-file]
+                                   [--ssl-leaf-domain-label]
+                                   [--ssl-overwrite-domain]
+                                   [--subnet-name]
+                                   [--subscription-id]
+                                   [--vm-size]
+                                   [--vnet-name]
+                                   [--vnet-resourcegroup-name]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --agent-count -a
+    summary: 'Number of agents to provision with the AKS cluster. Default: 3.'
+    description: ''
+  - name: --cluster-purpose
+    summary: 'Targeted purpose of the cluster. This is used when provisioning AzureML components to ensure the desired level of fault-tolerance and QoS. Accepted values are "FastProd" and "DevTest". Further detail of the use cases can be found here: https://aka.ms/azureml-create-new-aks-cluster.'
+    description: ''
+  - name: --dns-service-ip
+    summary: Containers DNS server IP address.
+    description: ''
+  - name: --docker-bridge-cidr
+    summary: A CIDR notation IP for Docker bridge.
+    description: ''
+  - name: --load-balancer-subnet
+    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
+    description: ''
+  - name: --load-balancer-type
+    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
+    description: ''
+  - name: --location -l
+    summary: Location to provision cluster in. If not specified, will default to workspace location.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --service-cidr
+    summary: A CIDR notation IP range from which to assign service cluster IPs.
+    description: ''
+  - name: --ssl-cert-file
+    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
+    description: ''
+  - name: --ssl-cname
+    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
+    description: ''
+  - name: --ssl-key-file
+    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
+    description: ''
+  - name: --ssl-leaf-domain-label
+    summary: Leaf domain label to use for the auto generated certificate.
+    description: ''
+  - name: --ssl-overwrite-domain
+    summary: When set overwrites the existing leaf domain label.
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --vm-size -s
+    summary: 'VM size to use for the compute target. A full list of options can be found here: https://aka.ms/azureml-aks-details Default: Standard_D3_v2.'
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --vnet-resourcegroup-name
+    summary: Name of the resource group where the virtual network is located.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_create_amlcompute
+  name: az ml computetarget create amlcompute
+  summary: Create an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget create amlcompute --max-nodes
+                                          --name
+                                          --vm-size
+                                          [--admin-user-password]
+                                          [--admin-user-ssh-key]
+                                          [--admin-username]
+                                          [--assign-identity]
+                                          [--description]
+                                          [--idle-seconds-before-scaledown]
+                                          [--min-nodes]
+                                          [--no-wait]
+                                          [--path]
+                                          [--remote-login-port-public-access]
+                                          [--resource-group]
+                                          [--subnet-name]
+                                          [--subscription-id]
+                                          [--tag]
+                                          [--vm-priority]
+                                          [--vnet-name]
+                                          [--vnet-resourcegroup-name]
+                                          [--workspace-name]
+                                          [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --max-nodes
+    summary: 'Maximum number of nodes to use. Default: 4.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  - isRequired: true
+    name: --vm-size -s
+    summary: 'VM size to use for the compute target. More details can be found here: https://aka.ms/azureml-vm-details Default: Standard_NC6.'
+    description: ''
+  optionalParameters:
+  - name: --admin-user-password
+    summary: Password of the administrator user account.
+    description: ''
+  - name: --admin-user-ssh-key
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --admin-username
+    summary: Name of the administrator user account which can be used to SSH into nodes.
+    description: ''
+  - name: --assign-identity
+    summary: Use '[system]' to set a system assigned identity else input resource IDs separated by commas (ie 'ResourceID1,ResourceID2') to set user assigned identities.
+    description: ''
+  - name: --description
+    summary: Description of the compute target.
+    description: ''
+  - name: --idle-seconds-before-scaledown
+    summary: 'Node idle time in seconds before scaling down the cluster. Default: 120.'
+    description: ''
+  - name: --min-nodes
+    summary: 'Minimum number of nodes to use. Default: 0.'
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --remote-login-port-public-access
+    summary: 'State of the public SSH port. Possible values are: Enabled or Disabled.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --vm-priority -p
+    summary: "VM priority to use for the compute target. (Options are 'dedicated', 'lowpriority') Default: dedicated."
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --vnet-resourcegroup-name
+    summary: Name of the resource group where the virtual network is located.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_create_computeinstance
+  name: az ml computetarget create computeinstance
+  summary: Create an AzureML compute instance target.
+  description: ''
+  syntax: >-
+    az ml computetarget create computeinstance --name
+                                               --vm-size
+                                               [--admin-user-ssh-public-key]
+                                               [--description]
+                                               [--no-wait]
+                                               [--path]
+                                               [--resource-group]
+                                               [--ssh-public-access]
+                                               [--subnet-name]
+                                               [--subscription-id]
+                                               [--tag]
+                                               [--user-object-id]
+                                               [--user-tenant-id]
+                                               [--vnet-name]
+                                               [--vnet-resourcegroup-name]
+                                               [--workspace-name]
+                                               [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute instance to create.
+    description: ''
+  - isRequired: true
+    name: --vm-size -s
+    summary: 'VM size to use for the compute target. More details can be found here: https://aka.ms/azureml-vm-details Default: Standard_NC6.'
+    description: ''
+  optionalParameters:
+  - name: --admin-user-ssh-public-key
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --description
+    summary: Description of the compute target.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --ssh-public-access
+    summary: 'State of the public SSH port. Possible values are: True or False.'
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --user-object-id
+    summary: The AAD Object ID of the assigned user of this compute instance (preview).
+    description: ''
+  - name: --user-tenant-id
+    summary: The AAD Tenant ID of the assigned user of this compute instance (preview).
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --vnet-resourcegroup-name
+    summary: Name of the resource group where the virtual network is located.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_create_datafactory
+  name: az ml computetarget create datafactory
+  summary: Create a data factory compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget create datafactory --name
+                                           [--location]
+                                           [--no-wait]
+                                           [--path]
+                                           [--resource-group]
+                                           [--subscription-id]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: Location to provision cluster in. If not specified, will default to workspace location.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_create_aks
+- az_ml(v1)_computetarget_create_amlcompute
+- az_ml(v1)_computetarget_create_computeinstance
+- az_ml(v1)_computetarget_create_datafactory
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Create a compute target (aks or amlcompute or computeinstance).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/update.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/update.yml
new file mode 100644
index 0000000000..d9aae44a2f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/computetarget/update.yml
@@ -0,0 +1,146 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_computetarget_update
+name: az ml computetarget update
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml computetarget update** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Update a compute target (aks or amlcompute).
+description: ''
+directCommands:
+- uid: az_ml(v1)_computetarget_update_aks
+  name: az ml computetarget update aks
+  summary: Update an AKS compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget update aks --name
+                                   [--load-balancer-subnet]
+                                   [--load-balancer-type]
+                                   [--no-wait]
+                                   [--path]
+                                   [--resource-group]
+                                   [--ssl-cert-file]
+                                   [--ssl-cname]
+                                   [--ssl-disable]
+                                   [--ssl-key-file]
+                                   [--ssl-leaf-domain-label]
+                                   [--ssl-overwrite-domain]
+                                   [--ssl-renew]
+                                   [--subscription-id]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to update.
+    description: ''
+  optionalParameters:
+  - name: --load-balancer-subnet
+    summary: You can specify subnet for the AKS cluster when Internal Load Balancer is used as load balancer type. Default is "aks-subnet".
+    description: ''
+  - name: --load-balancer-type
+    summary: You can create an AKS cluster with either Public IP or Internal Load Balancer. Accepted values are "PublicIp" and "InternalLoadBalancer". Default is "PublicIp".
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --ssl-cert-file
+    summary: Cert pem file to use for SSL validation. If provided, must also provide cname and key pem file.
+    description: ''
+  - name: --ssl-cname
+    summary: Cname to use for SSL validation. If provided, must also provide cert and key pem files.
+    description: ''
+  - name: --ssl-disable
+    summary: Disable SSL validation.
+    description: ''
+  - name: --ssl-key-file
+    summary: Key pem file to use for SSL validation. If provided, must also provide cname and cert pem file.
+    description: ''
+  - name: --ssl-leaf-domain-label
+    summary: Leaf domain label to use for the auto generated certificate.
+    description: ''
+  - name: --ssl-overwrite-domain
+    summary: When set overwrites the existing leaf domain label.
+    description: ''
+  - name: --ssl-renew
+    summary: Refreshes the auto generated certificate. If provided, the existing SSL configuration must be auto.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_computetarget_update_amlcompute
+  name: az ml computetarget update amlcompute
+  summary: Update an AzureML compute target.
+  description: ''
+  syntax: >-
+    az ml computetarget update amlcompute --name
+                                          [--idle-seconds-before-scaledown]
+                                          [--max-nodes]
+                                          [--min-nodes]
+                                          [--path]
+                                          [--resource-group]
+                                          [--subscription-id]
+                                          [--workspace-name]
+                                          [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of compute target to provision.
+    description: ''
+  optionalParameters:
+  - name: --idle-seconds-before-scaledown
+    summary: Node idle time in seconds before scaling down the cluster.
+    description: ''
+  - name: --max-nodes
+    summary: Maximum number of nodes to use.
+    description: ''
+  - name: --min-nodes
+    summary: Minimum number of nodes to use.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to create this compute target under.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_computetarget_update_aks
+- az_ml(v1)_computetarget_update_amlcompute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Update a compute target (aks or amlcompute).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/dataset.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/dataset.yml
new file mode 100644
index 0000000000..8a189a7d8a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/dataset.yml
@@ -0,0 +1,283 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_dataset
+name: az ml dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for managing datasets in Azure Machine Learning Workspace.
+description: ''
+directCommands:
+- uid: az_ml(v1)_dataset_archive
+  name: az ml dataset archive
+  summary: Archive an active or deprecated dataset.
+  description: ''
+  syntax: >-
+    az ml dataset archive [--id]
+                          [--name]
+                          [--output-metadata-file]
+                          [--path]
+                          [--resource-group]
+                          [--subscription-id]
+                          [--workspace-name]
+  optionalParameters:
+  - name: --id -i
+    summary: Dataset ID (guid).
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_deprecate
+  name: az ml dataset deprecate
+  summary: Deprecate an active dataset in a workspace by another dataset.
+  description: ''
+  syntax: >-
+    az ml dataset deprecate --deprecate-by-id
+                            [--id]
+                            [--name]
+                            [--output-metadata-file]
+                            [--path]
+                            [--resource-group]
+                            [--subscription-id]
+                            [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --deprecate-by-id -d
+    summary: Dataset ID (guid) which is the intended replacement for this Dataset.
+    description: ''
+  optionalParameters:
+  - name: --id -i
+    summary: Dataset ID (guid).
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_list
+  name: az ml dataset list
+  summary: List all datasets in the workspace.
+  description: ''
+  syntax: >-
+    az ml dataset list [--output-metadata-file]
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_reactivate
+  name: az ml dataset reactivate
+  summary: Reactivate an archived or deprecated dataset.
+  description: ''
+  syntax: >-
+    az ml dataset reactivate [--id]
+                             [--name]
+                             [--output-metadata-file]
+                             [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+  optionalParameters:
+  - name: --id -i
+    summary: Dataset ID (guid).
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_register
+  name: az ml dataset register
+  summary: Register a new dataset from the specified file.
+  description: ''
+  syntax: >-
+    az ml dataset register [--file]
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--show-template]
+                           [--skip-validation]
+                           [--subscription-id]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --file -f
+    summary: Specification file for dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --show-template
+    summary: Show template of dataset specification file.
+    description: ''
+  - name: --skip-validation
+    summary: Skip validation that ensures data can be loaded from the dataset before registration.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_show
+  name: az ml dataset show
+  summary: Get details of a dataset by its id or registration name.
+  description: ''
+  syntax: >-
+    az ml dataset show [--id]
+                       [--name]
+                       [--output-metadata-file]
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--version]
+                       [--workspace-name]
+  optionalParameters:
+  - name: --id -i
+    summary: ID of the dataset saved to workspace.
+    description: ''
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version -v
+    defaultValue: latest
+    summary: Registration version of the dataset.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_dataset_unregister
+  name: az ml dataset unregister
+  summary: Unregister all versions under the specified registration name.
+  description: ''
+  syntax: >-
+    az ml dataset unregister [--name]
+                             [--output-metadata-file]
+                             [--path]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+  optionalParameters:
+  - name: --name -n
+    summary: Registration name of the dataset.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_dataset_archive
+- az_ml(v1)_dataset_deprecate
+- az_ml(v1)_dataset_list
+- az_ml(v1)_dataset_reactivate
+- az_ml(v1)_dataset_register
+- az_ml(v1)_dataset_show
+- az_ml(v1)_dataset_unregister
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for managing datasets in Azure Machine Learning Workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/datastore.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/datastore.yml
new file mode 100644
index 0000000000..c3f8d487ef
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/datastore.yml
@@ -0,0 +1,889 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_datastore
+name: az ml datastore
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml datastore** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for managing and using datastores with the Azure ML Workspace.
+description: ''
+directCommands:
+- uid: az_ml(v1)_datastore_attach-adls
+  name: az ml datastore attach-adls
+  summary: Attach an ADLS datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-adls --client-id
+                                --client-secret
+                                --name
+                                --store-name
+                                --tenant-id
+                                [--adls-resource-group]
+                                [--adls-subscription-id]
+                                [--authority-url]
+                                [--grant-workspace-msi-access]
+                                [--include-secret]
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--resource-url]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --client-id
+    summary: The service principal's client/application ID.
+    description: ''
+  - isRequired: true
+    name: --client-secret
+    summary: The service principal's secret.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --store-name -c
+    summary: The ADLS store name.
+    description: ''
+  - isRequired: true
+    name: --tenant-id
+    summary: The service principal Tenant ID.
+    description: ''
+  optionalParameters:
+  - name: --adls-resource-group
+    summary: The resource group the ADLS store belongs to.
+    description: ''
+  - name: --adls-subscription-id
+    summary: The ID of the subscription the ADLS store belongs to.
+    description: ''
+  - name: --authority-url
+    defaultValue: https://login.microsoftonline.com
+    summary: Authority url used to authenticate the user.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --resource-url
+    defaultValue: https://datalake.azure.net/
+    summary: Determines what operations will be performed on the data lake store.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-adls-gen2
+  name: az ml datastore attach-adls-gen2
+  summary: Attach a ADLS Gen2 datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-adls-gen2 --account-name
+                                     --client-id
+                                     --client-secret
+                                     --file-system
+                                     --name
+                                     --tenant-id
+                                     [--adlsgen2-account-resource-group]
+                                     [--adlsgen2-account-subscription-id]
+                                     [--authority-url]
+                                     [--endpoint]
+                                     [--grant-workspace-msi-access]
+                                     [--include-secret]
+                                     [--output-metadata-file]
+                                     [--path]
+                                     [--protocol]
+                                     [--resource-group]
+                                     [--resource-url]
+                                     [--subscription-id]
+                                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the storage account.
+    description: ''
+  - isRequired: true
+    name: --client-id
+    summary: The service principal's client/application ID.
+    description: ''
+  - isRequired: true
+    name: --client-secret
+    summary: The service principal's secret.
+    description: ''
+  - isRequired: true
+    name: --file-system -c
+    summary: The file system name of the ADLS Gen2.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --tenant-id
+    summary: The service principal Tenant ID.
+    description: ''
+  optionalParameters:
+  - name: --adlsgen2-account-resource-group
+    summary: The resource group of the ADLS Gen2 storage account.
+    description: ''
+  - name: --adlsgen2-account-subscription-id
+    summary: The subscription ID of the ADLS Gen2 storage account.
+    description: ''
+  - name: --authority-url
+    defaultValue: https://login.microsoftonline.com
+    summary: Authority url used to authenticate the user.
+    description: ''
+  - name: --endpoint
+    defaultValue: core.windows.net
+    summary: The endpoint of the storage account. Defaults to core.windows.net.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --protocol
+    defaultValue: https
+    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --resource-url
+    defaultValue: https://storage.azure.com/
+    summary: Determines what operations will be performed on the data lake store.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-blob
+  name: az ml datastore attach-blob
+  summary: Attach a blob storage datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-blob --account-name
+                                --container-name
+                                --name
+                                [--account-key]
+                                [--endpoint]
+                                [--grant-workspace-msi-access]
+                                [--include-secret]
+                                [--output-metadata-file]
+                                [--path]
+                                [--protocol]
+                                [--resource-group]
+                                [--sas-token]
+                                [--storage-account-resource-group]
+                                [--storage-account-subscription-id]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the storage account.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The blob container name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --account-key -k
+    summary: The storage account key.
+    description: ''
+  - name: --endpoint
+    defaultValue: core.windows.net
+    summary: The endpoint of the storage account. Defaults to core.windows.net.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --protocol
+    defaultValue: https
+    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --sas-token
+    summary: A SAS token for the blob container.
+    description: ''
+  - name: --storage-account-resource-group
+    summary: The resource group of the storage account.
+    description: ''
+  - name: --storage-account-subscription-id
+    summary: The subscription ID of the storage account.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-dbfs
+  name: az ml datastore attach-dbfs
+  summary: Attach a Databricks File System datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-dbfs --name
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-file
+  name: az ml datastore attach-file
+  summary: Attach a file share datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-file --account-name
+                                --name
+                                --share-name
+                                [--account-key]
+                                [--endpoint]
+                                [--include-secret]
+                                [--output-metadata-file]
+                                [--path]
+                                [--protocol]
+                                [--resource-group]
+                                [--sas-token]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the storage account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --share-name -c
+    summary: The file share name.
+    description: ''
+  optionalParameters:
+  - name: --account-key -k
+    summary: The storage account key.
+    description: ''
+  - name: --endpoint
+    defaultValue: core.windows.net
+    summary: The endpoint of the storage account. Defaults to core.windows.net.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --protocol
+    defaultValue: https
+    summary: Protocol to use to connect to the blob container. If not specified, defaults to https.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --sas-token
+    summary: A SAS token for the blob container.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-mysqldb
+  name: az ml datastore attach-mysqldb
+  summary: Attach an Azure MySQL datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-mysqldb --database-name
+                                   --name
+                                   --password
+                                   --server-name
+                                   --user-id
+                                   [--endpoint]
+                                   [--include-secret]
+                                   [--output-metadata-file]
+                                   [--path]
+                                   [--port]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --database-name -d
+    summary: The database name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --password -p
+    summary: The password.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The SQL/PostgreSQL/MySQL server name.
+    description: ''
+  - isRequired: true
+    name: --user-id -u
+    summary: The user ID.
+    description: ''
+  optionalParameters:
+  - name: --endpoint
+    defaultValue: mysql.database.azure.com
+    summary: The endpoint of the server. Defaults to mysql.database.azure.com.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --port
+    defaultValue: "5432"
+    summary: The port number.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-psqldb
+  name: az ml datastore attach-psqldb
+  summary: Attach an Azure PostgreSQL datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-psqldb --database-name
+                                  --name
+                                  --password
+                                  --server-name
+                                  --user-id
+                                  [--endpoint]
+                                  [--enforce-ssl]
+                                  [--include-secret]
+                                  [--output-metadata-file]
+                                  [--path]
+                                  [--port]
+                                  [--resource-group]
+                                  [--subscription-id]
+                                  [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --database-name -d
+    summary: The database name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --password -p
+    summary: The password.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The SQL/PostgreSQL/MySQL server name.
+    description: ''
+  - isRequired: true
+    name: --user-id -u
+    summary: The user ID.
+    description: ''
+  optionalParameters:
+  - name: --endpoint
+    defaultValue: postgres.database.azure.com
+    summary: The endpoint of the server. Defaults to postgres.database.azure.com.
+    description: ''
+  - name: --enforce-ssl
+    defaultValue: "1"
+    summary: This sets the ssl value of the server. Defaults to true if not set.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --port
+    defaultValue: "5432"
+    summary: The port number.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_attach-sqldb
+  name: az ml datastore attach-sqldb
+  summary: Attach an Azure SQL datastore.
+  description: ''
+  syntax: >-
+    az ml datastore attach-sqldb --database-name
+                                 --name
+                                 --server-name
+                                 [--authority-url]
+                                 [--client-id]
+                                 [--client-secret]
+                                 [--endpoint]
+                                 [--grant-workspace-msi-access]
+                                 [--include-secret]
+                                 [--output-metadata-file]
+                                 [--password]
+                                 [--path]
+                                 [--resource-group]
+                                 [--resource-url]
+                                 [--sql-resource-group]
+                                 [--sql-subscription-id]
+                                 [--subscription-id]
+                                 [--tenant-id]
+                                 [--username]
+                                 [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --database-name -d
+    summary: The database name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The SQL/PostgreSQL/MySQL server name.
+    description: ''
+  optionalParameters:
+  - name: --authority-url
+    defaultValue: https://login.microsoftonline.com
+    summary: Authority url used to authenticate the user.
+    description: ''
+  - name: --client-id
+    summary: The service principal/application ID.
+    description: ''
+  - name: --client-secret
+    summary: The service principal's secret.
+    description: ''
+  - name: --endpoint
+    defaultValue: database.windows.net
+    summary: The endpoint of the sql server. Defaults to database.windows.net.
+    description: ''
+  - name: --grant-workspace-msi-access
+    summary: Defaults to False. Set it to True to access data behind virtual network from Machine Learning Studio. This makes data access from Machine Learning Studio use workspace managed identity for authentication, You have to be Owner or User Access Administrator of the storage to opt-in. Ask your administrator to configure it for you if you do not have the required permission. Learn more 'https://docs.microsoft.com/azure/machine-learning/how-to-enable-studio-virtual-network.
+    description: ''
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --password
+    summary: The password of the database user to access the database.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --resource-url
+    defaultValue: https://database.windows.net/
+    summary: Determines what operations will be performed on the database.
+    description: ''
+  - name: --sql-resource-group
+    summary: The resource group of the Azure Sql Server.
+    description: ''
+  - name: --sql-subscription-id
+    summary: The subscription ID of the Azure Sql Server.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tenant-id
+    summary: The service principal Tenant ID.
+    description: ''
+  - name: --username
+    summary: The username of the database user to access the database.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_detach
+  name: az ml datastore detach
+  summary: Detach a datastore by name.
+  description: ''
+  syntax: >-
+    az ml datastore detach --name
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_download
+  name: az ml datastore download
+  summary: Download files from a Datastore.
+  description: ''
+  syntax: >-
+    az ml datastore download --name
+                             --target-path
+                             [--hide-progress]
+                             [--output-metadata-file]
+                             [--overwrite]
+                             [--path]
+                             [--prefix]
+                             [--resource-group]
+                             [--subscription-id]
+                             [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --target-path -d
+    summary: Target path for the downloaded files.
+    description: ''
+  optionalParameters:
+  - name: --hide-progress
+    summary: Whether to hide progress of operation.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite target files if they exist.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --prefix -p
+    summary: Path filter for files to download. If none is provided, downloads everything.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_list
+  name: az ml datastore list
+  summary: List datastores in the workspace.
+  description: ''
+  syntax: >-
+    az ml datastore list [--include-secret]
+                         [--output-metadata-file]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+  optionalParameters:
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_set-default
+  name: az ml datastore set-default
+  summary: Set the workspace default datastore by name.
+  description: ''
+  syntax: >-
+    az ml datastore set-default --name
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--subscription-id]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_show
+  name: az ml datastore show
+  summary: Show a single datastore by name.
+  description: ''
+  syntax: >-
+    az ml datastore show --name
+                         [--include-secret]
+                         [--output-metadata-file]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  optionalParameters:
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_show-default
+  name: az ml datastore show-default
+  summary: Show the workspace default datastore.
+  description: ''
+  syntax: >-
+    az ml datastore show-default [--include-secret]
+                                 [--output-metadata-file]
+                                 [--path]
+                                 [--resource-group]
+                                 [--subscription-id]
+                                 [--workspace-name]
+  optionalParameters:
+  - name: --include-secret
+    summary: Show the registered secret for the datastores.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_datastore_upload
+  name: az ml datastore upload
+  summary: Upload files to a Datastore.
+  description: ''
+  syntax: >-
+    az ml datastore upload --name
+                           --src-path
+                           [--hide-progress]
+                           [--output-metadata-file]
+                           [--overwrite]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--target-path]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The datastore name.
+    description: ''
+  - isRequired: true
+    name: --src-path -p
+    summary: Path from which to upload data.
+    description: ''
+  optionalParameters:
+  - name: --hide-progress
+    summary: Whether to hide progress of operation.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite target files if they exist.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --target-path -u
+    summary: Path to upload data in the container. Uploads to the root by default.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_datastore_attach-adls
+- az_ml(v1)_datastore_attach-adls-gen2
+- az_ml(v1)_datastore_attach-blob
+- az_ml(v1)_datastore_attach-dbfs
+- az_ml(v1)_datastore_attach-file
+- az_ml(v1)_datastore_attach-mysqldb
+- az_ml(v1)_datastore_attach-psqldb
+- az_ml(v1)_datastore_attach-sqldb
+- az_ml(v1)_datastore_detach
+- az_ml(v1)_datastore_download
+- az_ml(v1)_datastore_list
+- az_ml(v1)_datastore_set-default
+- az_ml(v1)_datastore_show
+- az_ml(v1)_datastore_show-default
+- az_ml(v1)_datastore_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for managing and using datastores with the Azure ML Workspace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/endpoint.yml
new file mode 100644
index 0000000000..0e3a7987d3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/endpoint.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_endpoint
+name: az ml endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage machine learning endpoints.
+description: ''
+commands:
+- az_ml(v1)_endpoint_realtime
+- az_ml(v1)_endpoint_realtime_create-version
+- az_ml(v1)_endpoint_realtime_delete
+- az_ml(v1)_endpoint_realtime_delete-version
+- az_ml(v1)_endpoint_realtime_get-access-token
+- az_ml(v1)_endpoint_realtime_get-keys
+- az_ml(v1)_endpoint_realtime_get-logs
+- az_ml(v1)_endpoint_realtime_list
+- az_ml(v1)_endpoint_realtime_regen-key
+- az_ml(v1)_endpoint_realtime_run
+- az_ml(v1)_endpoint_realtime_show
+- az_ml(v1)_endpoint_realtime_update
+- az_ml(v1)_endpoint_realtime_update-version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage machine learning endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/endpoint/realtime.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/endpoint/realtime.yml
new file mode 100644
index 0000000000..7d0235c4a3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/endpoint/realtime.yml
@@ -0,0 +1,807 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_endpoint_realtime
+name: az ml endpoint realtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml endpoint realtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage operationalized realtime endpoints.
+description: ''
+directCommands:
+- uid: az_ml(v1)_endpoint_realtime_create-version
+  name: az ml endpoint realtime create-version
+  summary: Create a version for realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime create-version --name
+                                           --version-name
+                                           [--add-property]
+                                           [--add-tag]
+                                           [--ar]
+                                           [--as]
+                                           [--at]
+                                           [--autoscale-max-replicas]
+                                           [--autoscale-min-replicas]
+                                           [--cc]
+                                           [--ccl]
+                                           [--cf]
+                                           [--collect-model-data]
+                                           [--cvt]
+                                           [--dc]
+                                           [--description]
+                                           [--ed]
+                                           [--entry-script]
+                                           [--environment-name]
+                                           [--environment-version]
+                                           [--failure-threshold]
+                                           [--gb]
+                                           [--gbl]
+                                           [--gc]
+                                           [--ic]
+                                           [--id]
+                                           [--is-default]
+                                           [--max-request-wait-time]
+                                           [--model]
+                                           [--model-metadata-file]
+                                           [--no-wait]
+                                           [--nr]
+                                           [--path]
+                                           [--period-seconds]
+                                           [--replica-max-concurrent-requests]
+                                           [--resource-group]
+                                           [--scoring-timeout-ms]
+                                           [--sd]
+                                           [--st]
+                                           [--subscription-id]
+                                           [--timeout-seconds]
+                                           [--tp]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name.
+    description: ''
+  - isRequired: true
+    name: --version-name --vn
+    summary: The version name to create in an Endpoint.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --cvt --is-control-version-type
+    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON file containing deployment metadata.
+    description: ''
+  - name: --description -d
+    summary: Description of the service.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --is-default
+    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --tp --traffic-percentile
+    summary: The traffic percentile this version takes in Endpoint.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_delete
+  name: az ml endpoint realtime delete
+  summary: Delete a realtime endpoint and its version from the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime delete --name
+                                   [--path]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_delete-version
+  name: az ml endpoint realtime delete-version
+  summary: Delete a version for realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime delete-version --name
+                                           --version-name
+                                           [--no-wait]
+                                           [--path]
+                                           [--resource-group]
+                                           [--subscription-id]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name.
+    description: ''
+  - isRequired: true
+    name: --version-name --vn
+    summary: The version name to delete.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_get-access-token
+  name: az ml endpoint realtime get-access-token
+  summary: Get a token to issue requests a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime get-access-token --name
+                                             [--path]
+                                             [--resource-group]
+                                             [--subscription-id]
+                                             [--workspace-name]
+                                             [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_get-keys
+  name: az ml endpoint realtime get-keys
+  summary: Get keys to issue requests against a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime get-keys --name
+                                     [--path]
+                                     [--resource-group]
+                                     [--subscription-id]
+                                     [--workspace-name]
+                                     [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_get-logs
+  name: az ml endpoint realtime get-logs
+  summary: Get logs for a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime get-logs --name
+                                     [--init]
+                                     [--num_lines]
+                                     [--path]
+                                     [--resource-group]
+                                     [--subscription-id]
+                                     [--workspace-name]
+                                     [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --init -i
+    summary: Get logs of init container instead of the scoring container.
+    description: ''
+  - name: --num_lines -l
+    defaultValue: "5000"
+    summary: Number of log lines to return from tail (default is 5000).
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_list
+  name: az ml endpoint realtime list
+  summary: List realtime endpoints in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime list [--compute-type]
+                                 [--model-id]
+                                 [--model-name]
+                                 [--path]
+                                 [--property]
+                                 [--resource-group]
+                                 [--subscription-id]
+                                 [--tag]
+                                 [--workspace-name]
+                                 [-v]
+  optionalParameters:
+  - name: --compute-type -c
+    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS', 'AKSENDPOINT').
+    description: ''
+  - name: --model-id
+    summary: If provided, will only show services that have the specified model id.
+    description: ''
+  - name: --model-name
+    summary: If provided, will only show services that have the specified model name.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoints to list.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_regen-key
+  name: az ml endpoint realtime regen-key
+  summary: Regenerate keys for a realtime endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime regen-key --key
+                                      --name
+                                      [--path]
+                                      [--resource-group]
+                                      [--set-key]
+                                      [--subscription-id]
+                                      [--workspace-name]
+                                      [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --key -k
+    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Endpoint Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --set-key -s
+    summary: Provide auth value for the specified key.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_run
+  name: az ml endpoint realtime run
+  summary: Run a realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime run --name
+                                [--input-data]
+                                [--path]
+                                [--resource-group]
+                                [--subscription-id]
+                                [--workspace-name]
+                                [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name to score against.
+    description: ''
+  optionalParameters:
+  - name: --input-data -d
+    summary: The data to use for calling the endpoint.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to run.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_show
+  name: az ml endpoint realtime show
+  summary: Show details for a realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime show --name
+                                 [--path]
+                                 [--resource-group]
+                                 [--subscription-id]
+                                 [--workspace-name]
+                                 [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint to show.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the endpoint to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_update
+  name: az ml endpoint realtime update
+  summary: Update a realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime update --name
+                                   [--add-property]
+                                   [--add-tag]
+                                   [--ae]
+                                   [--ai]
+                                   [--description]
+                                   [--no-wait]
+                                   [--path]
+                                   [--remove-tag]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--token-auth-enabled]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name to update.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ae --auth-enabled
+    summary: Whether or not to enable key auth for this Endpoint. Defaults to False.
+    description: ''
+  - name: --ai --enable-app-insights
+    summary: Whether or not to enable AppInsights for this Endpoint. Defaults to False.
+    description: ''
+  - name: --description -d
+    summary: Description of the endpoint.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --remove-tag
+    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --token-auth-enabled
+    summary: Whether or not to enable token auth for this Endpoint. Defaults to False.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the Endpoint to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_endpoint_realtime_update-version
+  name: az ml endpoint realtime update-version
+  summary: Update a version for realtime endpoint in the workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint realtime update-version --name
+                                           --version-name
+                                           [--add-property]
+                                           [--add-tag]
+                                           [--ar]
+                                           [--as]
+                                           [--at]
+                                           [--autoscale-max-replicas]
+                                           [--autoscale-min-replicas]
+                                           [--cc]
+                                           [--ccl]
+                                           [--cf]
+                                           [--collect-model-data]
+                                           [--cvt]
+                                           [--dc]
+                                           [--description]
+                                           [--ed]
+                                           [--entry-script]
+                                           [--environment-name]
+                                           [--environment-version]
+                                           [--failure-threshold]
+                                           [--gb]
+                                           [--gbl]
+                                           [--gc]
+                                           [--ic]
+                                           [--id]
+                                           [--is-default]
+                                           [--max-request-wait-time]
+                                           [--model]
+                                           [--model-metadata-file]
+                                           [--no-wait]
+                                           [--nr]
+                                           [--path]
+                                           [--period-seconds]
+                                           [--replica-max-concurrent-requests]
+                                           [--resource-group]
+                                           [--scoring-timeout-ms]
+                                           [--sd]
+                                           [--st]
+                                           [--subscription-id]
+                                           [--timeout-seconds]
+                                           [--tp]
+                                           [--workspace-name]
+                                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The endpoint name.
+    description: ''
+  - isRequired: true
+    name: --version-name --vn
+    summary: The version name to create in an Endpoint.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --cvt --is-control-version-type
+    summary: Whether or not this is the control version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON file containing deployment metadata.
+    description: ''
+  - name: --description -d
+    summary: Description of the service.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --is-default
+    summary: Whether or not this is the default version in an Endpoint. Defaults to False.
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --tp --traffic-percentile
+    summary: The traffic percentile this version takes in Endpoint.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_endpoint_realtime_create-version
+- az_ml(v1)_endpoint_realtime_delete
+- az_ml(v1)_endpoint_realtime_delete-version
+- az_ml(v1)_endpoint_realtime_get-access-token
+- az_ml(v1)_endpoint_realtime_get-keys
+- az_ml(v1)_endpoint_realtime_get-logs
+- az_ml(v1)_endpoint_realtime_list
+- az_ml(v1)_endpoint_realtime_regen-key
+- az_ml(v1)_endpoint_realtime_run
+- az_ml(v1)_endpoint_realtime_show
+- az_ml(v1)_endpoint_realtime_update
+- az_ml(v1)_endpoint_realtime_update-version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage operationalized realtime endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/environment.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/environment.yml
new file mode 100644
index 0000000000..86781057d2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/environment.yml
@@ -0,0 +1,214 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_environment
+name: az ml environment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml environment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage environments.
+description: ''
+directCommands:
+- uid: az_ml(v1)_environment_download
+  name: az ml environment download
+  summary: Download an environment definition to a specified directory.
+  description: ''
+  syntax: >-
+    az ml environment download --directory
+                               --name
+                               [--output-metadata-file]
+                               [--overwrite]
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--version]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --directory -d
+    summary: Directory for the environment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite any existing destination folder.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_list
+  name: az ml environment list
+  summary: List environments in a workspace.
+  description: ''
+  syntax: >-
+    az ml environment list [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_register
+  name: az ml environment register
+  summary: Register an environment definition from a specified directory.
+  description: ''
+  syntax: >-
+    az ml environment register --directory
+                               [--output-metadata-file]
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --directory -d
+    summary: Directory for the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_scaffold
+  name: az ml environment scaffold
+  summary: Scaffold the files for a default environment definition in the specified directory.
+  description: ''
+  syntax: >-
+    az ml environment scaffold --directory
+                               --name
+                               [--output-metadata-file]
+                               [--path]
+                               [--resource-group]
+                               [--subscription-id]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --directory -d
+    summary: Directory for the environment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_environment_show
+  name: az ml environment show
+  summary: Show an environment by name and optionally version.
+  description: ''
+  syntax: >-
+    az ml environment show --name
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--version]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_environment_download
+- az_ml(v1)_environment_list
+- az_ml(v1)_environment_register
+- az_ml(v1)_environment_scaffold
+- az_ml(v1)_environment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage environments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/experiment.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/experiment.yml
new file mode 100644
index 0000000000..9b63212389
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/experiment.yml
@@ -0,0 +1,56 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_experiment
+name: az ml experiment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml experiment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage experiments.
+description: ''
+directCommands:
+- uid: az_ml(v1)_experiment_list
+  name: az ml experiment list
+  summary: List experiments in a workspace.
+  description: ''
+  syntax: >-
+    az ml experiment list [--output-metadata-file]
+                          [--path]
+                          [--resource-group]
+                          [--subscription-id]
+                          [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_experiment_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage experiments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/folder.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/folder.yml
new file mode 100644
index 0000000000..175e64ab66
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/folder.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_folder
+name: az ml folder
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml folder** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Folder subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_folder_attach
+  name: az ml folder attach
+  summary: Attach a folder to an AzureML workspace and optionally a specific experiment to use by default. If experiment name is not specified, it defaults to the folder name.
+  description: ''
+  syntax: >-
+    az ml folder attach [--experiment-name]
+                        [--output-metadata-file]
+                        [--path]
+                        [--resource-group]
+                        [--subscription-id]
+                        [--workspace-name]
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_folder_attach
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Folder subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/model.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/model.yml
new file mode 100644
index 0000000000..ef5129652e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/model.yml
@@ -0,0 +1,828 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_model
+name: az ml model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage machine learning models.
+description: ''
+directCommands:
+- uid: az_ml(v1)_model_delete
+  name: az ml model delete
+  summary: Delete a model from the workspace.
+  description: ''
+  syntax: >-
+    az ml model delete --model-id
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --model-id -i
+    summary: ID of model to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_deploy
+  name: az ml model deploy
+  summary: Deploy model(s) from the workspace.
+  description: ''
+  syntax: >-
+    az ml model deploy --name
+                       [--ae]
+                       [--ai]
+                       [--ar]
+                       [--as]
+                       [--at]
+                       [--autoscale-max-replicas]
+                       [--autoscale-min-replicas]
+                       [--base-image]
+                       [--base-image-registry]
+                       [--cc]
+                       [--ccl]
+                       [--cf]
+                       [--collect-model-data]
+                       [--compute-target]
+                       [--compute-type]
+                       [--cuda-version]
+                       [--dc]
+                       [--description]
+                       [--dn]
+                       [--ds]
+                       [--ed]
+                       [--eg]
+                       [--entry-script]
+                       [--environment-name]
+                       [--environment-version]
+                       [--failure-threshold]
+                       [--gb]
+                       [--gbl]
+                       [--gc]
+                       [--ic]
+                       [--id]
+                       [--key-name]
+                       [--key-version]
+                       [--kp]
+                       [--ks]
+                       [--lo]
+                       [--max-request-wait-time]
+                       [--model]
+                       [--model-metadata-file]
+                       [--namespace]
+                       [--no-wait]
+                       [--nr]
+                       [--overwrite]
+                       [--path]
+                       [--period-seconds]
+                       [--pi]
+                       [--po]
+                       [--property]
+                       [--replica-max-concurrent-requests]
+                       [--resource-group]
+                       [--rt]
+                       [--sc]
+                       [--scoring-timeout-ms]
+                       [--sd]
+                       [--se]
+                       [--sk]
+                       [--sp]
+                       [--st]
+                       [--subnet-name]
+                       [--subscription-id]
+                       [--tag]
+                       [--timeout-seconds]
+                       [--token-auth-enabled]
+                       [--tp]
+                       [--vault-base-url]
+                       [--version-name]
+                       [--vnet-name]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the service deployed.
+    description: ''
+  optionalParameters:
+  - name: --ae --auth-enabled
+    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
+    description: ''
+  - name: --ai --enable-app-insights
+    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --base-image --bi
+    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
+    description: ''
+  - name: --base-image-registry --ir
+    summary: Image registry that contains the base image.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --compute-target --ct
+    summary: Name of compute target. Only applicable when deploying to AKS.
+    description: ''
+  - name: --compute-type --cp
+    summary: Compute type of service to deploy.
+    description: ''
+  - name: --cuda-version --cv
+    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON or YAML file containing deployment metadata.
+    description: ''
+  - name: --description
+    summary: Description of the service deployed.
+    description: ''
+  - name: --dn --dns-name-label
+    summary: The dns name for this Webservice.
+    description: ''
+  - name: --ds --extra-docker-file-steps
+    summary: Path to local file containing additional Docker steps to run when setting up image.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --eg --enable-gpu
+    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --key-name
+    summary: Key name for for encryption properties in customer-managed keys (CMK) for ACI.
+    description: ''
+  - name: --key-version
+    summary: Key version for for encryption properties in customer-managed keys (CMK) for ACI.
+    description: ''
+  - name: --kp --primary-key
+    summary: A primary auth key to use for this Webservice.
+    description: ''
+  - name: --ks --secondary-key
+    summary: A secondary auth key to use for this Webservice.
+    description: ''
+  - name: --lo --location
+    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&products=container-instances.'
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --namespace
+    summary: "Kubernetes namespace in which to deploy the service: up to 63 lowercase alphanumeric ('a'-'z', '0'-'9') and hyphen ('-') characters. The first and last characters cannot be hyphens. Only applicable when deploying to AKS."
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --overwrite
+    summary: Overwrite the existing service if name conflicts.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --pi --profile-input
+    summary: Path to a JSON file containing profiling results.
+    description: ''
+  - name: --po --port
+    summary: The local port on which to expose the service's HTTP endpoint.
+    description: ''
+  - name: --property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --rt --runtime
+    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
+    description: ''
+  - name: --sc --ssl-cname
+    summary: The cname for if SSL is enabled.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --se --ssl-enabled
+    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
+    description: ''
+  - name: --sk --ssl-key-pem-file
+    summary: The key file needed if SSL is enabled.
+    description: ''
+  - name: --sp --ssl-cert-pem-file
+    summary: The cert file needed if SSL is enabled.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subnet-name
+    summary: Name of the subnet inside the vnet.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --token-auth-enabled
+    summary: Whether or not to enable token auth for this Webservice. Ignored if not deploying to AKS. Defaults to False.
+    description: ''
+  - name: --tp --traffic-percentile
+    summary: The amount of traffic the version takes in an endpoint. Can be a decimal. Defaults to 0.
+    description: ''
+  - name: --vault-base-url
+    summary: Vault base url for encryption properties in customer-managed keys (CMK) for ACI.
+    description: ''
+  - name: --version-name --vn
+    summary: The version name in an endpoint. Defaults to endpoint name for the first version.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_download
+  name: az ml model download
+  summary: Download a model from the workspace.
+  description: ''
+  syntax: >-
+    az ml model download --model-id
+                         --target-dir
+                         [--overwrite]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --model-id -i
+    summary: ID of model.
+    description: ''
+  - isRequired: true
+    name: --target-dir -t
+    summary: Target directory to download the model file to.
+    description: ''
+  optionalParameters:
+  - name: --overwrite
+    summary: Overwrite if the same name file exists in target directory.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing model to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_list
+  name: az ml model list
+  summary: List models in the workspace.
+  description: ''
+  syntax: >-
+    az ml model list [--dataset-id]
+                     [--latest]
+                     [--model-name]
+                     [--path]
+                     [--property]
+                     [--resource-group]
+                     [--run-id]
+                     [--subscription-id]
+                     [--tag]
+                     [--workspace-name]
+                     [-v]
+  optionalParameters:
+  - name: --dataset-id
+    summary: If provided, will only show models with the specified dataset ID.
+    description: ''
+  - name: --latest -l
+    summary: If provided, will only return models with the latest version.
+    description: ''
+  - name: --model-name -n
+    summary: An optional model name to filter the list by.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --run-id
+    summary: If provided, will only show models with the specified Run ID.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing models to list.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_package
+  name: az ml model package
+  summary: Package a model in the workspace.
+  description: ''
+  syntax: >-
+    az ml model package [--cf]
+                        [--ed]
+                        [--entry-script]
+                        [--environment-name]
+                        [--environment-version]
+                        [--ic]
+                        [--il]
+                        [--image-name]
+                        [--model]
+                        [--model-metadata-file]
+                        [--no-wait]
+                        [--output-path]
+                        [--path]
+                        [--resource-group]
+                        [--rt]
+                        [--sd]
+                        [--subscription-id]
+                        [--workspace-name]
+                        [-v]
+  optionalParameters:
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the package.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for packaging. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for packaging.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for packaging.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --il --image-label
+    summary: Label to give the built package image.
+    description: ''
+  - name: --image-name --in
+    summary: Name to give the built package image.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be packaged. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --output-path
+    summary: Output path for docker context. If an output path is passed, instead of building an image in the workspace ACR, a dockerfile and the necessary build context will be writen to that path.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --rt --runtime
+    summary: Which runtime to use for package. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_profile
+  name: az ml model profile
+  summary: Profile model(s) in the workspace.
+  description: ''
+  syntax: >-
+    az ml model profile --name
+                        [--base-image]
+                        [--base-image-registry]
+                        [--cc]
+                        [--cf]
+                        [--description]
+                        [--ed]
+                        [--entry-script]
+                        [--environment-name]
+                        [--environment-version]
+                        [--gb]
+                        [--ic]
+                        [--idi]
+                        [--model]
+                        [--model-metadata-file]
+                        [--output-metadata-file]
+                        [--resource-group]
+                        [--sd]
+                        [--subscription-id]
+                        [--workspace-name]
+                        [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the model profile.
+    description: ''
+  optionalParameters:
+  - name: --base-image --bi
+    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
+    description: ''
+  - name: --base-image-registry --ir
+    summary: Image registry that contains the base image.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: Double value for maximum CPU to use when profiling.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --description
+    summary: Description of the model profile.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --gb --memory-in-gb
+    summary: Double value for maximum Memory to use when profiling.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --idi --input-dataset-id
+    summary: ID of the Tabular Dataset to be used as input for the profile.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Path to a JSON file where profile results metadata will be written. Used as input for model deployment.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_register
+  name: az ml model register
+  summary: Register a model to the workspace.
+  description: ''
+  syntax: >-
+    az ml model register --name
+                         [--asset-path]
+                         [--cc]
+                         [--description]
+                         [--experiment-name]
+                         [--gb]
+                         [--gc]
+                         [--model-framework]
+                         [--model-framework-version]
+                         [--model-path]
+                         [--output-metadata-file]
+                         [--path]
+                         [--property]
+                         [--resource-group]
+                         [--run-id]
+                         [--run-metadata-file]
+                         [--sample-input-dataset-id]
+                         [--sample-output-dataset-id]
+                         [--subscription-id]
+                         [--tag]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of model to register.
+    description: ''
+  optionalParameters:
+  - name: --asset-path
+    summary: The cloud path where the experiement run stores the model file.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --description -d
+    summary: Description of the model.
+    description: ''
+  - name: --experiment-name
+    summary: The name of the experiment.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The default number of GPUs to allocate for this model.
+    description: ''
+  - name: --model-framework
+    summary: 'Framework of the model to register. Currently supported frameworks: TensorFlow, ScikitLearn, Onnx, Custom, Multi.'
+    description: ''
+  - name: --model-framework-version
+    summary: Framework version of the model to register (e.g. 1.0.0, 2.4.1).
+    description: ''
+  - name: --model-path -p
+    summary: Full path of the model file to register.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Path to a JSON file where model registration metadata will be written. Used as input for model deployment.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --run-id -r
+    summary: The ID for the experiment run where model is registered from.
+    description: ''
+  - name: --run-metadata-file -f
+    summary: Path to a JSON file containing experiement run metadata.
+    description: ''
+  - name: --sample-input-dataset-id
+    summary: The ID for the sample input dataset.
+    description: ''
+  - name: --sample-output-dataset-id
+    summary: The ID for the sample output dataset.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace to register this model with.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_show
+  name: az ml model show
+  summary: Show a model in the workspace.
+  description: ''
+  syntax: >-
+    az ml model show [--model-id]
+                     [--model-name]
+                     [--path]
+                     [--resource-group]
+                     [--run-id]
+                     [--subscription-id]
+                     [--version]
+                     [--workspace-name]
+                     [-v]
+  optionalParameters:
+  - name: --model-id -i
+    summary: ID of model to show.
+    description: ''
+  - name: --model-name -n
+    summary: Name of model to show.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --run-id
+    summary: If provided, will only show models with the specified Run ID.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --version
+    summary: If provided, will only show models with the specified name and version.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing model to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_model_update
+  name: az ml model update
+  summary: Update a model in the workspace.
+  description: ''
+  syntax: >-
+    az ml model update --model-id
+                       [--add-property]
+                       [--add-tag]
+                       [--cc]
+                       [--description]
+                       [--gb]
+                       [--gc]
+                       [--path]
+                       [--remove-tag]
+                       [--resource-group]
+                       [--sample-input-dataset-id]
+                       [--sample-output-dataset-id]
+                       [--subscription-id]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --model-id -i
+    summary: ID of model.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The default number of CPU cores to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --description
+    summary: Description to update the model with. Will replace the current description.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The default amount of memory (in GB) to allocate for this model. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The default number of GPUs to allocate for this model.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --remove-tag
+    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --sample-input-dataset-id
+    summary: The ID for the sample input dataset.
+    description: ''
+  - name: --sample-output-dataset-id
+    summary: The ID for the sample output dataset.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_model_delete
+- az_ml(v1)_model_deploy
+- az_ml(v1)_model_download
+- az_ml(v1)_model_list
+- az_ml(v1)_model_package
+- az_ml(v1)_model_profile
+- az_ml(v1)_model_register
+- az_ml(v1)_model_show
+- az_ml(v1)_model_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage machine learning models.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/pipeline.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/pipeline.yml
new file mode 100644
index 0000000000..1620169d90
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/pipeline.yml
@@ -0,0 +1,653 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_pipeline
+name: az ml pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Pipeline subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_pipeline_clone
+  name: az ml pipeline clone
+  summary: Generate yml definition describing the pipeline run, supported only for ModuleStep for now.
+  description: ''
+  syntax: >-
+    az ml pipeline clone --path
+                         --pipeline-run-id
+                         [--output-file]
+                         [--resource-group]
+                         [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --path -p
+    summary: File path to save pipeline yaml to.
+    description: ''
+  - isRequired: true
+    name: --pipeline-run-id -i
+    summary: ID of the PipelineRun to clone (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_clone-draft
+  name: az ml pipeline clone-draft
+  summary: Create a pipeline draft from an existing pipeline.
+  description: ''
+  syntax: >-
+    az ml pipeline clone-draft [--experiment-name]
+                               [--pipeline-draft-id]
+                               [--pipeline-id]
+                               [--pipeline-run-id]
+                               [--resource-group]
+                               [--workspace-name]
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name of the specified PipelineRun.
+    description: ''
+  - name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to create PipelineDraft from.
+    description: ''
+  - name: --pipeline-id -p
+    summary: ID of the PublishedPipeline to create PipelineDraft from.
+    description: ''
+  - name: --pipeline-run-id -r
+    summary: ID of the PipelineRun to create PipelineDraft from.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_create
+  name: az ml pipeline create
+  summary: Create a pipeline from a yaml definition.
+  description: ''
+  syntax: >-
+    az ml pipeline create --name
+                          --pipeline-yaml
+                          [--continue]
+                          [--description]
+                          [--output-file]
+                          [--resource-group]
+                          [--version]
+                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name to assign to the pipeline.
+    description: ''
+  - isRequired: true
+    name: --pipeline-yaml -y
+    summary: YAML file which defines a pipeline.
+    description: ''
+  optionalParameters:
+  - name: --continue -c
+    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
+    description: ''
+  - name: --description -d
+    summary: Description text of the pipeline.
+    description: ''
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --version -v
+    summary: Version string of the pipeline.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_create-draft
+  name: az ml pipeline create-draft
+  summary: Create a pipeline draft from a yml definition.
+  description: ''
+  syntax: >-
+    az ml pipeline create-draft --experiment_name
+                                --name
+                                --pipeline-yaml
+                                [--continue]
+                                [--description]
+                                [--parameters]
+                                [--properties]
+                                [--resource-group]
+                                [--tags]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --experiment_name -e
+    summary: Experiment name for the pipeline draft.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name to assign to the pipeline draft.
+    description: ''
+  - isRequired: true
+    name: --pipeline-yaml -y
+    summary: YAML file which defines the pipeline draft.
+    description: ''
+  optionalParameters:
+  - name: --continue -c
+    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
+    description: ''
+  - name: --description -d
+    summary: Description text of the pipeline draft.
+    description: ''
+  - name: --parameters
+    summary: PipelineParameters for the draft with 'key=value' syntax.
+    description: ''
+  - name: --properties -p
+    summary: Properties for the draft with 'key=value' syntax.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --tags -t
+    summary: Tags for the draft with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_create-schedule
+  name: az ml pipeline create-schedule
+  summary: Create a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline create-schedule --experiment-name
+                                   --name
+                                   --pipeline-id
+                                   [--resource-group]
+                                   [--schedule-yaml]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --experiment-name -e
+    summary: Name of experiment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of schedule.
+    description: ''
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to create schedule (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --schedule-yaml -y
+    summary: Schedule  YAML input.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_delete-draft
+  name: az ml pipeline delete-draft
+  summary: Delete a pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline delete-draft --pipeline-draft-id
+                                [--resource-group]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to delete (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_disable
+  name: az ml pipeline disable
+  summary: Disable a pipeline from running.
+  description: ''
+  syntax: >-
+    az ml pipeline disable --pipeline-id
+                           [--output-file]
+                           [--resource-group]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to disable (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_disable-schedule
+  name: az ml pipeline disable-schedule
+  summary: Disable a schedule from running.
+  description: ''
+  syntax: >-
+    az ml pipeline disable-schedule --schedule-id
+                                    [--resource-group]
+                                    [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_enable
+  name: az ml pipeline enable
+  summary: Enable a pipeline and allow it to run.
+  description: ''
+  syntax: >-
+    az ml pipeline enable --pipeline-id
+                          [--output-file]
+                          [--resource-group]
+                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to enable (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_enable-schedule
+  name: az ml pipeline enable-schedule
+  summary: Enable a schedule and allow it to run.
+  description: ''
+  syntax: >-
+    az ml pipeline enable-schedule --schedule-id
+                                   [--resource-group]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_get
+  name: az ml pipeline get
+  summary: Generate yml definition describing the pipeline.
+  description: ''
+  syntax: >-
+    az ml pipeline get --path
+                       [--pipeline-draft-id]
+                       [--pipeline-id]
+                       [--resource-group]
+                       [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --path -p
+    summary: File path to save Pipeline yaml to.
+    description: ''
+  optionalParameters:
+  - name: --pipeline-draft-id -d
+    summary: ID of the PipelineDraft to get (guid).
+    description: ''
+  - name: --pipeline-id -i
+    summary: ID of the Pipeline to get (guid).
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_last-pipeline-run
+  name: az ml pipeline last-pipeline-run
+  summary: Show last pipeline run for a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline last-pipeline-run --schedule-id
+                                     [--resource-group]
+                                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_list
+  name: az ml pipeline list
+  summary: List all pipelines and respective schedules in the workspace.
+  description: ''
+  syntax: >-
+    az ml pipeline list [--output-file]
+                        [--resource-group]
+                        [--workspace-name]
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_list-drafts
+  name: az ml pipeline list-drafts
+  summary: List pipeline drafts in the workspace.
+  description: ''
+  syntax: >-
+    az ml pipeline list-drafts [--resource-group]
+                               [--tags]
+                               [--workspace-name]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --tags -t
+    summary: Tags for a draft with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_list-steps
+  name: az ml pipeline list-steps
+  summary: List the step runs generated from a pipeline run.
+  description: ''
+  syntax: >-
+    az ml pipeline list-steps --run
+                              [--output-file]
+                              [--resource-group]
+                              [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_pipeline-runs-list
+  name: az ml pipeline pipeline-runs-list
+  summary: List pipeline runs generated from a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline pipeline-runs-list --schedule-id
+                                      [--resource-group]
+                                      [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_publish-draft
+  name: az ml pipeline publish-draft
+  summary: Publish a pipeline draft as a published pipeline.
+  description: ''
+  syntax: >-
+    az ml pipeline publish-draft --pipeline-draft-id
+                                 [--resource-group]
+                                 [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to publish.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_show
+  name: az ml pipeline show
+  summary: Show details of a pipeline and respective schedules.
+  description: ''
+  syntax: >-
+    az ml pipeline show --pipeline-id
+                        [--output-file]
+                        [--resource-group]
+                        [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-id -i
+    summary: ID of the pipeline to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --output-file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_show-draft
+  name: az ml pipeline show-draft
+  summary: Show details of a pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline show-draft --pipeline-draft-id
+                              [--resource-group]
+                              [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_show-schedule
+  name: az ml pipeline show-schedule
+  summary: Show details of a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline show-schedule --schedule-id
+                                 [--resource-group]
+                                 [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_submit-draft
+  name: az ml pipeline submit-draft
+  summary: Submit a run from the pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline submit-draft --pipeline-draft-id
+                                [--resource-group]
+                                [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to use to submit run.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_update-draft
+  name: az ml pipeline update-draft
+  summary: Update a pipeline draft.
+  description: ''
+  syntax: >-
+    az ml pipeline update-draft [--continue]
+                                [--description]
+                                [--experiment_name]
+                                [--name]
+                                [--parameters]
+                                [--pipeline-draft-id]
+                                [--pipeline-yaml]
+                                [--resource-group]
+                                [--tags]
+                                [--workspace-name]
+  optionalParameters:
+  - name: --continue -c
+    summary: Boolean flag to allow a pipeline to continue executing after a step fails.
+    description: ''
+  - name: --description -d
+    summary: Description text of the pipeline draft.
+    description: ''
+  - name: --experiment_name -e
+    summary: Experiment name for the pipeline draft.
+    description: ''
+  - name: --name -n
+    summary: Name to assign to the pipeline draft.
+    description: ''
+  - name: --parameters
+    summary: PipelineParameters for the draft with 'key=value' syntax.
+    description: ''
+  - name: --pipeline-draft-id -i
+    summary: ID of the PipelineDraft to update.
+    description: ''
+  - name: --pipeline-yaml -y
+    summary: YAML file which defines the pipeline draft.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --tags -t
+    summary: Tags for the draft with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_pipeline_update-schedule
+  name: az ml pipeline update-schedule
+  summary: Update a schedule.
+  description: ''
+  syntax: >-
+    az ml pipeline update-schedule --schedule-id
+                                   [--name]
+                                   [--resource-group]
+                                   [--schedule-yaml]
+                                   [--status]
+                                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --schedule-id -s
+    summary: ID of the schedule to show (guid).
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the schedule to show (guid).
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --schedule-yaml -y
+    summary: Schedule  YAML input.
+    description: ''
+  - name: --status -t
+    summary: Status of the schedule to show (guid).
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_pipeline_clone
+- az_ml(v1)_pipeline_clone-draft
+- az_ml(v1)_pipeline_create
+- az_ml(v1)_pipeline_create-draft
+- az_ml(v1)_pipeline_create-schedule
+- az_ml(v1)_pipeline_delete-draft
+- az_ml(v1)_pipeline_disable
+- az_ml(v1)_pipeline_disable-schedule
+- az_ml(v1)_pipeline_enable
+- az_ml(v1)_pipeline_enable-schedule
+- az_ml(v1)_pipeline_get
+- az_ml(v1)_pipeline_last-pipeline-run
+- az_ml(v1)_pipeline_list
+- az_ml(v1)_pipeline_list-drafts
+- az_ml(v1)_pipeline_list-steps
+- az_ml(v1)_pipeline_pipeline-runs-list
+- az_ml(v1)_pipeline_publish-draft
+- az_ml(v1)_pipeline_show
+- az_ml(v1)_pipeline_show-draft
+- az_ml(v1)_pipeline_show-schedule
+- az_ml(v1)_pipeline_submit-draft
+- az_ml(v1)_pipeline_update-draft
+- az_ml(v1)_pipeline_update-schedule
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Pipeline subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/run.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/run.yml
new file mode 100644
index 0000000000..464f131854
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/run.yml
@@ -0,0 +1,501 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_run
+name: az ml run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for submitting, updating, and monitoring runs.
+description: ''
+directCommands:
+- uid: az_ml(v1)_run_cancel
+  name: az ml run cancel
+  summary: Cancel run.
+  description: ''
+  syntax: >-
+    az ml run cancel --run
+                     [--experiment-name]
+                     [--output-metadata-file]
+                     [--path]
+                     [--resource-group]
+                     [--subscription-id]
+                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_download-logs
+  name: az ml run download-logs
+  summary: Download log files.
+  description: ''
+  syntax: >-
+    az ml run download-logs --output-dir
+                            --run
+                            [--experiment-name]
+                            [--output-metadata-file]
+                            [--path]
+                            [--resource-group]
+                            [--subscription-id]
+                            [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --output-dir -d
+    summary: Output directory to download log files to.
+    description: ''
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_list
+  name: az ml run list
+  summary: List runs.
+  description: ''
+  syntax: >-
+    az ml run list [--compute-target-name]
+                   [--experiment-name]
+                   [--last]
+                   [--minimal]
+                   [--output-metadata-file]
+                   [--parent-run-id]
+                   [--path]
+                   [--pipeline-run-id]
+                   [--resource-group]
+                   [--status {Completed, Failed, Finalizing, Preparing, Provisioning, Queued, Running, Starting}]
+                   [--subscription-id]
+                   [--tags]
+                   [--workspace-name]
+  optionalParameters:
+  - name: --compute-target-name
+    summary: The compute target name.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --last
+    defaultValue: "10"
+    summary: Fetch the latest N elements.
+    description: ''
+  - name: --minimal
+    summary: Flag to provide minimum properties for run output.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --parent-run-id
+    summary: Parent Run ID.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --pipeline-run-id
+    summary: Pipeline Run ID.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --status
+    parameterValueGroup: Completed, Failed, Finalizing, Preparing, Provisioning, Queued, Running, Starting
+    summary: Status of the run.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tags
+    summary: Tags for a run with 'key[=value]' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_monitor-logs
+  name: az ml run monitor-logs
+  summary: Monitor the logs for an existing run.
+  description: ''
+  syntax: >-
+    az ml run monitor-logs --run
+                           [--experiment-name]
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_monitor-tensorboard
+  name: az ml run monitor-tensorboard
+  summary: Monitor an existing run using tensorboard.
+  description: ''
+  syntax: >-
+    az ml run monitor-tensorboard --run
+                                  [--experiment-name]
+                                  [--local-directory]
+                                  [--output-metadata-file]
+                                  [--path]
+                                  [--resource-group]
+                                  [--subscription-id]
+                                  [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --local-directory
+    summary: Local Directory to stage tensorboard files being monitored.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_show
+  name: az ml run show
+  summary: Show run.
+  description: ''
+  syntax: >-
+    az ml run show --run
+                   [--experiment-name]
+                   [--output-metadata-file]
+                   [--path]
+                   [--resource-group]
+                   [--subscription-id]
+                   [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_submit-hyperdrive
+  name: az ml run submit-hyperdrive
+  summary: Submit a hyper parameter sweep using run config.
+  description: ''
+  syntax: >-
+    az ml run submit-hyperdrive --hyperdrive-configuration-name
+                                [--async]
+                                [--conda-dependencies]
+                                [--ct]
+                                [--experiment-name]
+                                [--output-metadata-file]
+                                [--path]
+                                [--resource-group]
+                                [--run-configuration-name]
+                                [--source-directory]
+                                [--subscription-id]
+                                [--workspace-name]
+                                [<USER_SCRIPT_AND_ARGUMENTS>]
+  requiredParameters:
+  - isRequired: true
+    name: --hyperdrive-configuration-name
+    summary: The full name of the hyperdrive configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
+    description: ''
+  optionalParameters:
+  - name: --async
+    summary: Disable output streaming.
+    description: ''
+  - name: --conda-dependencies -d
+    summary: Override the default Conda dependencies file.
+    description: ''
+  - name: --ct --target
+    summary: The name of the compute target to use for the run.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --run-configuration-name -c
+    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
+    description: ''
+  - name: --source-directory
+    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+  - name: <USER_SCRIPT_AND_ARGUMENTS>
+    summary: The run submit arguments, like script name and script arguments.
+    description: ''
+- uid: az_ml(v1)_run_submit-pipeline
+  name: az ml run submit-pipeline
+  summary: Submit a pipeline for execution, from a published pipeline ID or pipeline YAML file.
+  description: ''
+  syntax: >-
+    az ml run submit-pipeline [--datapaths]
+                              [--experiment-name]
+                              [--output-metadata-file]
+                              [--output_file]
+                              [--parameters]
+                              [--path]
+                              [--pipeline-id]
+                              [--pipeline-yaml]
+                              [--resource-group]
+                              [--subscription-id]
+                              [--workspace-name]
+  optionalParameters:
+  - name: --datapaths -d
+    summary: Comma-separated list of name=datastore/path pairs for datapath parameter assignments.
+    description: ''
+  - name: --experiment-name -n
+    summary: Experiment name for run submission. If unspecified, use the pipeline name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --output_file -f
+    summary: File to write output in JSON format.
+    description: ''
+  - name: --parameters -p
+    summary: Comma-separated list of name=value pairs for pipeline parameter assignments.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --pipeline-id -i
+    summary: ID of a pipeline to submit (guid).
+    description: ''
+  - name: --pipeline-yaml -y
+    summary: YAML file which defines a pipeline.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_run_submit-script
+  name: az ml run submit-script
+  summary: Submit a script for execution.
+  description: ''
+  syntax: >-
+    az ml run submit-script [--async]
+                            [--conda-dependencies]
+                            [--ct]
+                            [--experiment-name]
+                            [--output-metadata-file]
+                            [--path]
+                            [--resource-group]
+                            [--run-configuration-name]
+                            [--source-directory]
+                            [--subscription-id]
+                            [--workspace-name]
+                            [<USER_SCRIPT_AND_ARGUMENTS>]
+  optionalParameters:
+  - name: --async
+    summary: Disable output streaming.
+    description: ''
+  - name: --conda-dependencies -d
+    summary: Override the default Conda dependencies file.
+    description: ''
+  - name: --ct --target
+    summary: The name of the compute target to use for the run.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --run-configuration-name -c
+    summary: Name (without extension) of a run configuration file. The file should be in a sub-folder of the directory specified by the path parameter.
+    description: ''
+  - name: --source-directory
+    summary: A local directory containing source code files. Defaults to path if source directory is not provided.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+  - name: <USER_SCRIPT_AND_ARGUMENTS>
+    summary: The run submit arguments, like script name and script arguments.
+    description: ''
+- uid: az_ml(v1)_run_update
+  name: az ml run update
+  summary: Update the run by adding tags.
+  description: ''
+  syntax: >-
+    az ml run update --run
+                     [--add-tag]
+                     [--experiment-name]
+                     [--output-metadata-file]
+                     [--path]
+                     [--resource-group]
+                     [--subscription-id]
+                     [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --run -r
+    summary: The runId of an experiment run.
+    description: ''
+  optionalParameters:
+  - name: --add-tag
+    summary: Tag the entitiy with 'key[=value]' syntax.
+    description: ''
+  - name: --experiment-name -e
+    summary: Experiment name.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_run_cancel
+- az_ml(v1)_run_download-logs
+- az_ml(v1)_run_list
+- az_ml(v1)_run_monitor-logs
+- az_ml(v1)_run_monitor-tensorboard
+- az_ml(v1)_run_show
+- az_ml(v1)_run_submit-hyperdrive
+- az_ml(v1)_run_submit-pipeline
+- az_ml(v1)_run_submit-script
+- az_ml(v1)_run_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for submitting, updating, and monitoring runs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/service.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/service.yml
new file mode 100644
index 0000000000..6611a0c030
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/service.yml
@@ -0,0 +1,577 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_service
+name: az ml service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage operationalized services.
+description: ''
+directCommands:
+- uid: az_ml(v1)_service_delete
+  name: az ml service delete
+  summary: Delete a service from the workspace.
+  description: ''
+  syntax: >-
+    az ml service delete --name
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The service name to delete.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to delete.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_get-access-token
+  name: az ml service get-access-token
+  summary: Get a token to issue requests a service.
+  description: ''
+  syntax: >-
+    az ml service get-access-token --name
+                                   [--path]
+                                   [--resource-group]
+                                   [--subscription-id]
+                                   [--workspace-name]
+                                   [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_get-keys
+  name: az ml service get-keys
+  summary: Get keys to issue requests against a service.
+  description: ''
+  syntax: >-
+    az ml service get-keys --name
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_get-logs
+  name: az ml service get-logs
+  summary: Get logs for a service.
+  description: ''
+  syntax: >-
+    az ml service get-logs --name
+                           [--init]
+                           [--num_lines]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+                           [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --init -i
+    summary: Get logs of init container instead of the scoring container.
+    description: ''
+  - name: --num_lines -l
+    defaultValue: "5000"
+    summary: Number of log lines to return from tail (default is 5000).
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_list
+  name: az ml service list
+  summary: List services in the workspace.
+  description: ''
+  syntax: >-
+    az ml service list [--compute-type]
+                       [--image-digest]
+                       [--model-id]
+                       [--model-name]
+                       [--path]
+                       [--property]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--tag]
+                       [--workspace-name]
+                       [-v]
+  optionalParameters:
+  - name: --compute-type -c
+    summary: If provided, will only show services that have the specified compute type. (Options are 'ACI', 'AKS').
+    description: ''
+  - name: --image-digest
+    summary: If provided, will only show services that have the specified image digest.
+    description: ''
+  - name: --model-id
+    summary: If provided, will only show services that have the specified model id.
+    description: ''
+  - name: --model-name
+    summary: If provided, will only show services that have the specified model name.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --property
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple properties can be specified with multiple --property options.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tag
+    summary: If provided, will filter based on the provided key/value (e.g. key, or key=value). Multiple tags can be specified with multiple --tag options.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the services to list.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_regen-key
+  name: az ml service regen-key
+  summary: Regenerate keys for a service.
+  description: ''
+  syntax: >-
+    az ml service regen-key --key
+                            --name
+                            [--path]
+                            [--resource-group]
+                            [--set-key]
+                            [--subscription-id]
+                            [--workspace-name]
+                            [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --key -k
+    summary: 'Which key to regenerate, if regen is specified. Options: Primary, Secondary.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Service Name.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --set-key -s
+    summary: Provide auth value for the specified key.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_run
+  name: az ml service run
+  summary: Run a service in the workspace.
+  description: ''
+  syntax: >-
+    az ml service run --name
+                      [--input-data]
+                      [--path]
+                      [--resource-group]
+                      [--subscription-id]
+                      [--workspace-name]
+                      [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The service name to score against.
+    description: ''
+  optionalParameters:
+  - name: --input-data -d
+    summary: The data to use for calling the web service.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to run.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_show
+  name: az ml service show
+  summary: Show details for a service in the workspace.
+  description: ''
+  syntax: >-
+    az ml service show --name
+                       [--path]
+                       [--resource-group]
+                       [--subscription-id]
+                       [--workspace-name]
+                       [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webservice to show.
+    description: ''
+  optionalParameters:
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to show.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+- uid: az_ml(v1)_service_update
+  name: az ml service update
+  summary: Update a service in the workspace.
+  description: ''
+  syntax: >-
+    az ml service update --name
+                         [--add-property]
+                         [--add-tag]
+                         [--ae]
+                         [--ai]
+                         [--ar]
+                         [--as]
+                         [--at]
+                         [--autoscale-max-replicas]
+                         [--autoscale-min-replicas]
+                         [--base-image]
+                         [--base-image-registry]
+                         [--cc]
+                         [--ccl]
+                         [--cf]
+                         [--collect-model-data]
+                         [--cuda-version]
+                         [--dc]
+                         [--description]
+                         [--dn]
+                         [--ds]
+                         [--ed]
+                         [--eg]
+                         [--entry-script]
+                         [--environment-name]
+                         [--environment-version]
+                         [--failure-threshold]
+                         [--gb]
+                         [--gbl]
+                         [--gc]
+                         [--ic]
+                         [--id]
+                         [--kp]
+                         [--ks]
+                         [--lo]
+                         [--max-request-wait-time]
+                         [--model]
+                         [--model-metadata-file]
+                         [--no-wait]
+                         [--nr]
+                         [--path]
+                         [--period-seconds]
+                         [--po]
+                         [--remove-tag]
+                         [--replica-max-concurrent-requests]
+                         [--resource-group]
+                         [--rt]
+                         [--sc]
+                         [--scoring-timeout-ms]
+                         [--sd]
+                         [--se]
+                         [--sk]
+                         [--sp]
+                         [--st]
+                         [--subscription-id]
+                         [--timeout-seconds]
+                         [--token-auth-enabled]
+                         [--workspace-name]
+                         [-v]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The service name to update.
+    description: ''
+  optionalParameters:
+  - name: --add-property
+    summary: Key/value property to add (e.g. key=value ). Multiple properties can be specified with multiple --add-property options.
+    description: ''
+  - name: --add-tag
+    summary: Key/value tag to add (e.g. key=value ). Multiple tags can be specified with multiple --add-tag options.
+    description: ''
+  - name: --ae --auth-enabled
+    summary: Whether or not to enable key auth for this Webservice. Defaults to False.
+    description: ''
+  - name: --ai --enable-app-insights
+    summary: Whether or not to enable AppInsights for this Webservice. Defaults to False.
+    description: ''
+  - name: --ar --autoscale-refresh-seconds
+    summary: How often the autoscaler should attempt to scale this Webservice. Defaults to 1.
+    description: ''
+  - name: --as --autoscale-enabled
+    summary: Whether or not to enable autoscaling for this Webservice. Defaults to True if num_replicas is None.
+    description: ''
+  - name: --at --autoscale-target-utilization
+    summary: The target utilization (in percent out of 100) the autoscaler should attempt to maintain for this Webservice. Defaults to 70.
+    description: ''
+  - name: --autoscale-max-replicas --ma
+    summary: The maximum number of containers to use when autoscaling this Webservice. Defaults to 10.
+    description: ''
+  - name: --autoscale-min-replicas --mi
+    summary: The minimum number of containers to use when autoscaling this Webservice. Defaults to 1.
+    description: ''
+  - name: --base-image --bi
+    summary: A custom image to be used as base image. If no base image is given then the base image will be used based off of given runtime parameter.
+    description: ''
+  - name: --base-image-registry --ir
+    summary: Image registry that contains the base image.
+    description: ''
+  - name: --cc --cpu-cores
+    summary: The number of cpu cores to allocate for this Webservice. Can be a decimal. Defaults to 0.1.
+    description: ''
+  - name: --ccl --cpu-cores-limit
+    summary: The max number of CPU cores this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --cf --conda-file
+    summary: Path to local file containing a conda environment definition to use for the image.
+    description: ''
+  - name: --collect-model-data --md
+    summary: Whether or not to enable model data collection for this Webservice. Defaults to False.
+    description: ''
+  - name: --cuda-version --cv
+    summary: Version of CUDA to install for images that need GPU support. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Supported versions are 9.0, 9.1, and 10.0. If 'enable_gpu' is set, this defaults to '9.1'.
+    description: ''
+  - name: --dc --deploy-config-file
+    summary: Path to a JSON file containing deployment metadata.
+    description: ''
+  - name: --description -d
+    summary: Description of the service.
+    description: ''
+  - name: --dn --dns-name-label
+    summary: The dns name for this Webservice.
+    description: ''
+  - name: --ds --extra-docker-file-steps
+    summary: Path to local file containing additional Docker steps to run when setting up image.
+    description: ''
+  - name: --ed --environment-directory
+    summary: Directory for Azure Machine Learning Environment for deployment. It is the same directory path as provided in 'az ml environment scaffold' command.
+    description: ''
+  - name: --eg --enable-gpu
+    summary: Whether or not to enable GPU support in the image. The GPU image must be used on Microsoft Azure Services such as Azure Container Instances, Azure Machine Learning Compute, Azure Virtual Machines, and Azure Kubernetes Service. Defaults to False.
+    description: ''
+  - name: --entry-script --es
+    summary: Path to local file that contains the code to run for service (relative path from source_directory if one is provided).
+    description: ''
+  - name: --environment-name -e
+    summary: Name of Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --environment-version --ev
+    summary: Version of an existing Azure Machine Learning Environment for deployment.
+    description: ''
+  - name: --failure-threshold --ft
+    summary: When a Pod starts and the liveness probe fails, Kubernetes will try --failure-threshold times before giving up. Defaults to 3. Minimum value is 1.
+    description: ''
+  - name: --gb --memory-gb
+    summary: The amount of memory (in GB) to allocate for this Webservice. Can be a decimal.
+    description: ''
+  - name: --gbl --memory-gb-limit
+    summary: The max amount of memory (in GB) this Webservice is allowed to use. Can be a decimal.
+    description: ''
+  - name: --gc --gpu-cores
+    summary: The number of gpu cores to allocate for this Webservice. Default is 1.
+    description: ''
+  - name: --ic --inference-config-file
+    summary: Path to a JSON or YAML file containing inference configuration.
+    description: ''
+  - name: --id --initial-delay-seconds
+    summary: Number of seconds after the container has started before liveness probes are initiated. Defaults to 310.
+    description: ''
+  - name: --kp --primary-key
+    summary: A primary auth key to use for this Webservice.
+    description: ''
+  - name: --ks --secondary-key
+    summary: A secondary auth key to use for this Webservice.
+    description: ''
+  - name: --lo --location
+    summary: 'The Azure region to deploy this Webservice to. If not specified the Workspace location will be used. More details on available regions can be found here: https://azure.microsoft.com/en-us/global-infrastructure/services/?regions=all&products=container-instances.'
+    description: ''
+  - name: --max-request-wait-time --mr
+    summary: The maximum amount of time a request will stay in the queue (in milliseconds) before returning a 503 error. Defaults to 500.
+    description: ''
+  - name: --model -m
+    summary: The ID of the model to be deployed. Multiple models can be specified with additional -m arguments. Models need to be registered first.
+    description: ''
+  - name: --model-metadata-file -f
+    summary: Path to a JSON file containing model registration metadata. Multiple models can be provided using multiple -f parameters.
+    description: ''
+  - name: --no-wait
+    summary: Flag to not wait for asynchronous calls.
+    description: ''
+  - name: --nr --num-replicas
+    summary: The number of containers to allocate for this Webservice. No default, if this parameter is not set then the autoscaler is enabled by default.
+    description: ''
+  - name: --path
+    summary: 'Path to a project folder. Default: current directory.'
+    description: ''
+  - name: --period-seconds --ps
+    summary: How often (in seconds) to perform the liveness probe. Default to 10 seconds. Minimum value is 1.
+    description: ''
+  - name: --po --port
+    summary: The local port on which to expose the service's HTTP endpoint.
+    description: ''
+  - name: --remove-tag
+    summary: Key of tag to remove. Multiple tags can be specified with multiple --remove-tag options.
+    description: ''
+  - name: --replica-max-concurrent-requests --rm
+    summary: The number of maximum concurrent requests per node to allow for this Webservice. Defaults to 1.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group corresponding to the provided workspace.
+    description: ''
+  - name: --rt --runtime
+    summary: Which runtime to use for image. Current supported runtimes are 'spark-py' and 'python'spark-py|python|python-slim.
+    description: ''
+  - name: --sc --ssl-cname
+    summary: The cname for if SSL is enabled. Only applicable when updating an ACI service.
+    description: ''
+  - name: --scoring-timeout-ms --tm
+    summary: A timeout to enforce for scoring calls to this Webservice. Defaults to 60000.
+    description: ''
+  - name: --sd --source-directory
+    summary: Path to folders that contain all files to create the image.
+    description: ''
+  - name: --se --ssl-enabled
+    summary: Whether or not to enable SSL for this Webservice. Defaults to False.
+    description: ''
+  - name: --sk --ssl-key-pem-file
+    summary: The key file needed if SSL is enabled.
+    description: ''
+  - name: --sp --ssl-cert-pem-file
+    summary: The cert file needed if SSL is enabled.
+    description: ''
+  - name: --st --success-threshold
+    summary: Minimum consecutive successes for the liveness probe to be considered successful after having failed. Defaults to 1. Minimum value is 1.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --timeout-seconds --ts
+    summary: Number of seconds after which the liveness probe times out. Defaults to 2 second. Minimum value is 1.
+    description: ''
+  - name: --token-auth-enabled
+    summary: Whether or not to enable token auth for this Webservice. Only available for AKS web services. Defaults to False.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the workspace containing the service to update.
+    description: ''
+  - name: -v
+    summary: Verbosity flag.
+    description: ''
+commands:
+- az_ml(v1)_service_delete
+- az_ml(v1)_service_get-access-token
+- az_ml(v1)_service_get-keys
+- az_ml(v1)_service_get-logs
+- az_ml(v1)_service_list
+- az_ml(v1)_service_regen-key
+- az_ml(v1)_service_run
+- az_ml(v1)_service_show
+- az_ml(v1)_service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage operationalized services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/workspace.yml
new file mode 100644
index 0000000000..41b5900f47
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/workspace.yml
@@ -0,0 +1,401 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_workspace
+name: az ml workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Workspace subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_workspace_create
+  name: az ml workspace create
+  summary: Create a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace create --workspace-name
+                           [--adb-workspace]
+                           [--application-insights]
+                           [--cmk-keyvault]
+                           [--container-registry]
+                           [--exist-ok]
+                           [--friendly-name]
+                           [--hbi-workspace]
+                           [--keyvault]
+                           [--location]
+                           [--pe-auto-approval]
+                           [--pe-name]
+                           [--pe-resource-group]
+                           [--pe-subnet-name]
+                           [--pe-subscription-id]
+                           [--pe-vnet-name]
+                           [--primary-user-assigned-identity]
+                           [--resource-cmk-uri]
+                           [--resource-group]
+                           [--sku]
+                           [--storage-account]
+                           [--system_datastores_auth_mode]
+                           [--tags]
+                           [--user-assigned-identity-for-cmk-encryption]
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+  optionalParameters:
+  - name: --adb-workspace
+    summary: Adb Workspace to be linked with this workspace.
+    description: ''
+  - name: --application-insights
+    summary: Application Insights to be associated with this workspace.
+    description: ''
+  - name: --cmk-keyvault
+    summary: The key vault containing the customer managed key in the Azure resource ID format.
+    description: ''
+  - name: --container-registry
+    summary: Container Registry to be associated with this workspace.
+    description: ''
+  - name: --exist-ok
+    summary: Do not fail if workspace exists.
+    description: ''
+  - name: --friendly-name -f
+    summary: Friendly name for this workspace.
+    description: ''
+  - name: --hbi-workspace
+    summary: Specifies whether the customer data is of High Business Impact(HBI), i.e., contains sensitive business information.
+    description: ''
+  - name: --keyvault
+    summary: Key Vault to be associated with this workspace.
+    description: ''
+  - name: --location -l
+    summary: Location for resource.
+    description: ''
+  - name: --pe-auto-approval
+    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
+    description: ''
+  - name: --pe-name
+    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
+    description: ''
+  - name: --pe-resource-group
+    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
+    description: ''
+  - name: --pe-subnet-name
+    defaultValue: default
+    summary: Name of the existing subnet to create the workspace private endpoint in.
+    description: ''
+  - name: --pe-subscription-id
+    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
+    description: ''
+  - name: --pe-vnet-name
+    summary: Name of the existing vnet to create the workspace private endpoint in.
+    description: ''
+  - name: --primary-user-assigned-identity
+    summary: The resourceId of the user assigned identity that used to represent workspace identity.
+    description: ''
+  - name: --resource-cmk-uri
+    summary: The key URI of the customer managed key to encrypt the data at rest.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --sku
+    defaultValue: basic
+    summary: SKU/edition of a workspace -can be a 'basic' workspace or a feature rich 'enterprise' workspace.
+    description: ''
+  - name: --storage-account
+    summary: Storage account to be associated with this workspace.
+    description: ''
+  - name: --system_datastores_auth_mode
+    defaultValue: accessKey
+    summary: Determines whether or not to use credentials for the system datastores of the workspace                'workspaceblobstore' and 'workspacefilestore'. The default value is 'accessKey', in which case,                the workspace will create the system datastores with credentials.  If set to 'identity',                the workspace will create the system datastores with no credentials.
+    description: ''
+  - name: --tags -t
+    summary: Tags associated with this workspace with 'key=value' syntax.
+    description: ''
+  - name: --user-assigned-identity-for-cmk-encryption
+    summary: The resourceId of the user assigned identity that needs to be used to access the encryption key.
+    description: ''
+  - name: --yes -y
+    summary: Create a resource group for this workspace.
+    description: ''
+- uid: az_ml(v1)_workspace_delete
+  name: az ml workspace delete
+  summary: Delete a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace delete [--all-resources]
+                           [--no-wait]
+                           [--output-metadata-file]
+                           [--path]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --all-resources
+    summary: Deletes resources which this workspace depends on like storage, acr, kv and app insights.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the workspace deletion to complete.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_list
+  name: az ml workspace list
+  summary: List workspaces.
+  description: ''
+  syntax: az ml workspace list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+- uid: az_ml(v1)_workspace_list-keys
+  name: az ml workspace list-keys
+  summary: List workspace keys for dependent resources such as storage, acr, and app insights.
+  description: ''
+  syntax: >-
+    az ml workspace list-keys [--output-metadata-file]
+                              [--path]
+                              [--resource-group]
+                              [--subscription-id]
+                              [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_share
+  name: az ml workspace share
+  summary: Share a workspace with another user with a given role.
+  description: ''
+  syntax: >-
+    az ml workspace share --role
+                          --user
+                          [--output-metadata-file]
+                          [--path]
+                          [--resource-group]
+                          [--subscription-id]
+                          [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --role
+    summary: Role to assign to this user.
+    description: ''
+  - isRequired: true
+    name: --user
+    summary: User with whom to share this workspace.
+    description: ''
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_show
+  name: az ml workspace show
+  summary: Show a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace show [--output-metadata-file]
+                         [--path]
+                         [--resource-group]
+                         [--subscription-id]
+                         [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_sync-keys
+  name: az ml workspace sync-keys
+  summary: Sync workspace keys for dependent resources such as storage, acr, and app insights.
+  description: ''
+  syntax: >-
+    az ml workspace sync-keys [--output-metadata-file]
+                              [--path]
+                              [--resource-group]
+                              [--subscription-id]
+                              [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_update
+  name: az ml workspace update
+  summary: Update a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace update [--allow-public-access]
+                           [--description]
+                           [--friendly-name]
+                           [--image-build-compute]
+                           [--output-metadata-file]
+                           [--path]
+                           [--primary-user-assigned-identity]
+                           [--resource-group]
+                           [--subscription-id]
+                           [--tags]
+                           [--workspace-name]
+  optionalParameters:
+  - name: --allow-public-access
+    summary: Allow public access to private link workspace.
+    description: ''
+  - name: --description -d
+    summary: Description of this workspace.
+    description: ''
+  - name: --friendly-name -f
+    summary: Friendly name.
+    description: ''
+  - name: --image-build-compute
+    summary: Compute target for image build.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --primary-user-assigned-identity
+    summary: The resourceId of the user assigned identity that used to represent workspace identity.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tags
+    summary: Tags associated with this workspace with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_update-dependencies
+  name: az ml workspace update-dependencies
+  summary: Update workspace dependent resources.
+  description: ''
+  syntax: >-
+    az ml workspace update-dependencies [--acr]
+                                        [--force]
+                                        [--output-metadata-file]
+                                        [--path]
+                                        [--resource-group]
+                                        [--subscription-id]
+                                        [--workspace-name]
+  optionalParameters:
+  - name: --acr
+    summary: The arm id of the container registry that you want to update this workspace with.
+    description: ''
+  - name: --force
+    summary: Force update dependent resources without user's confirmation.
+    description: ''
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_workspace_create
+- az_ml(v1)_workspace_delete
+- az_ml(v1)_workspace_list
+- az_ml(v1)_workspace_list-keys
+- az_ml(v1)_workspace_private-endpoint
+- az_ml(v1)_workspace_private-endpoint_add
+- az_ml(v1)_workspace_private-endpoint_delete
+- az_ml(v1)_workspace_private-endpoint_list
+- az_ml(v1)_workspace_share
+- az_ml(v1)_workspace_show
+- az_ml(v1)_workspace_sync-keys
+- az_ml(v1)_workspace_update
+- az_ml(v1)_workspace_update-dependencies
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Workspace subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/workspace/private-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/workspace/private-endpoint.yml
new file mode 100644
index 0000000000..e729238b49
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml(v1)/workspace/private-endpoint.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml(v1)_workspace_private-endpoint
+name: az ml workspace private-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-cli-ml** extension for Azure CLI and requires version 2.0.28 or higher.  The extension will automatically install the first time you run an **az ml workspace private-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Workspace private endpoint subgroup commands.
+description: ''
+directCommands:
+- uid: az_ml(v1)_workspace_private-endpoint_add
+  name: az ml workspace private-endpoint add
+  summary: Add private endpoint to a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace private-endpoint add [--output-metadata-file]
+                                         [--path]
+                                         [--pe-auto-approval]
+                                         [--pe-location]
+                                         [--pe-name]
+                                         [--pe-resource-group]
+                                         [--pe-subnet-name]
+                                         [--pe-subscription-id]
+                                         [--pe-vnet-name]
+                                         [--resource-group]
+                                         [--subscription-id]
+                                         [--tags]
+                                         [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --pe-auto-approval
+    summary: Whether private endpoint connections to the workspace resource via a private link should be auto approved.
+    description: ''
+  - name: --pe-location
+    summary: Location of the workspace private endpoint. If not specified it will be the same location of the workspace.
+    description: ''
+  - name: --pe-name
+    summary: Name of the workspace private endpoint. Use this parameter to restrict workspace access to private networks, via a private endpoint.
+    description: ''
+  - name: --pe-resource-group
+    summary: Name of the existing resource group to create the workspace private endpoint in. The vnet should be in the same resource group. If not specified, the resource group of the workspace will be used.
+    description: ''
+  - name: --pe-subnet-name
+    defaultValue: default
+    summary: Name of the existing subnet to create the workspace private endpoint in.
+    description: ''
+  - name: --pe-subscription-id
+    summary: Id of the existing subscription to create the workspace private endpoint in. The vnet should be in the same subscription. If not specified, the subscription Id of the workspace will be used.
+    description: ''
+  - name: --pe-vnet-name
+    summary: Name of the existing vnet to create the workspace private endpoint in.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --tags
+    summary: Tags associated with this private endpoint with 'key=value' syntax.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_private-endpoint_delete
+  name: az ml workspace private-endpoint delete
+  summary: Delete the specified private endpoint Connection in the workspace.
+  description: ''
+  syntax: >-
+    az ml workspace private-endpoint delete [--output-metadata-file]
+                                            [--pe-connection-name]
+                                            [--resource-group]
+                                            [--subscription-id]
+                                            [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --pe-connection-name
+    summary: The name of the Private EndPoint Connection.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+- uid: az_ml(v1)_workspace_private-endpoint_list
+  name: az ml workspace private-endpoint list
+  summary: List all private endpoints in a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace private-endpoint list [--output-metadata-file]
+                                          [--path]
+                                          [--resource-group]
+                                          [--subscription-id]
+                                          [--workspace-name]
+  optionalParameters:
+  - name: --output-metadata-file -t
+    summary: Provide an optional output file location for structured object output.
+    description: ''
+  - name: --path
+    defaultValue: .
+    summary: Path to a root directory for run configuration files.
+    description: ''
+  - name: --resource-group -g
+    summary: Resource group name.
+    description: ''
+  - name: --subscription-id
+    summary: Specifies the subscription Id.
+    description: ''
+  - name: --workspace-name -w
+    summary: Workspace name.
+    description: ''
+commands:
+- az_ml(v1)_workspace_private-endpoint_add
+- az_ml(v1)_workspace_private-endpoint_delete
+- az_ml(v1)_workspace_private-endpoint_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Workspace private endpoint subgroup commands.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml.yml b/2018-03-01-hybrid/docs-ref-autogen/ml.yml
new file mode 100644
index 0000000000..2d92021a09
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml
+name: az ml
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_ml_code
+- az_ml_code_show
+- az_ml_compute
+- az_ml_compute_attach
+- az_ml_compute_create
+- az_ml_compute_delete
+- az_ml_compute_detach
+- az_ml_compute_list
+- az_ml_compute_list-sizes
+- az_ml_compute_list-usage
+- az_ml_compute_restart
+- az_ml_compute_show
+- az_ml_compute_start
+- az_ml_compute_stop
+- az_ml_compute_update
+- az_ml_data
+- az_ml_data_create
+- az_ml_data_delete
+- az_ml_data_list
+- az_ml_data_show
+- az_ml_data_update
+- az_ml_datastore
+- az_ml_datastore_create
+- az_ml_datastore_delete
+- az_ml_datastore_list
+- az_ml_datastore_show
+- az_ml_datastore_update
+- az_ml_endpoint
+- az_ml_endpoint_create
+- az_ml_endpoint_delete
+- az_ml_endpoint_get-credentials
+- az_ml_endpoint_get-logs
+- az_ml_endpoint_invoke
+- az_ml_endpoint_list
+- az_ml_endpoint_list-jobs
+- az_ml_endpoint_regenerate-keys
+- az_ml_endpoint_show
+- az_ml_endpoint_update
+- az_ml_environment
+- az_ml_environment_create
+- az_ml_environment_delete
+- az_ml_environment_list
+- az_ml_environment_show
+- az_ml_environment_update
+- az_ml_job
+- az_ml_job_cancel
+- az_ml_job_create
+- az_ml_job_download
+- az_ml_job_list
+- az_ml_job_show
+- az_ml_job_stream
+- az_ml_job_update
+- az_ml_model
+- az_ml_model_create
+- az_ml_model_delete
+- az_ml_model_list
+- az_ml_model_show
+- az_ml_model_update
+- az_ml_workspace
+- az_ml_workspace_create
+- az_ml_workspace_delete
+- az_ml_workspace_list
+- az_ml_workspace_list-keys
+- az_ml_workspace_show
+- az_ml_workspace_sync-keys
+- az_ml_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/code.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/code.yml
new file mode 100644
index 0000000000..aefc9ad532
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/code.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_code
+name: az ml code
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml code** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML code assets.
+description: ''
+directCommands:
+- uid: az_ml_code_show
+  name: az ml code show
+  summary: Show details for a code asset.
+  description: ''
+  syntax: >-
+    az ml code show --name
+                    --resource-group
+                    --version
+                    --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the code asset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the code asset.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+commands:
+- az_ml_code_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure ML code assets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/compute.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/compute.yml
new file mode 100644
index 0000000000..8ef8793758
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/compute.yml
@@ -0,0 +1,481 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_compute
+name: az ml compute
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml compute** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML compute resources.
+description: Azure ML compute targets are designated compute resources where you can run your jobs for training or deploy your models for inference.
+directCommands:
+- uid: az_ml_compute_attach
+  name: az ml compute attach
+  summary: Attach an existing compute resource to a workspace.
+  description: AKS clusters and remote VMs can be attached as compute targets.
+  syntax: >-
+    az ml compute attach --resource-group
+                         --workspace-name
+                         [--admin-username]
+                         [--file]
+                         [--name]
+                         [--no-wait]
+                         [--resource-id]
+                         [--ssh-key-value]
+                         [--type]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin-username
+    summary: Name of the administrator user account that can be used to SSH into the node(s).
+    description: ''
+  - name: --file
+    summary: Local path to the YAML file containing the Azure ML compute specification.
+    description: ''
+  - name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-id
+    summary: The fully qualified ID of the resource, including the resource name and resource type.
+    description: ''
+  - name: --ssh-key-value
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --type -t
+    summary: 'The type of compute target. Allowed values: AKS, RemoteVM.'
+    description: ''
+- uid: az_ml_compute_create
+  name: az ml compute create
+  summary: Create a compute target.
+  description: You can create an AmlCompute cluster, which is Azure ML's managed compute infrastructure, or a compute instance, which is a managed cloud-based workstation.
+  syntax: >-
+    az ml compute create --resource-group
+                         --workspace-name
+                         [--admin-password]
+                         [--admin-username]
+                         [--description]
+                         [--file]
+                         [--identity-type]
+                         [--idle-time-before-scale-down]
+                         [--max-instances]
+                         [--min-instances]
+                         [--name]
+                         [--no-wait]
+                         [--priority]
+                         [--public-ip]
+                         [--set]
+                         [--size]
+                         [--ssh-key-value]
+                         [--subnet]
+                         [--type]
+                         [--user-assigned-identities]
+                         [--user-object-id]
+                         [--user-tenant-id]
+                         [--vnet-name]
+  examples:
+  - summary: Create a compute target from a YAML specification file
+    syntax: az ml compute create --file compute.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Create an AmlCompute target using command options
+    syntax: az ml compute create --name nc6-cluster --size Standard_NC6 --min-instances 0 --max-instances 5 --type AmlCompute --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin-password
+    summary: Password for the administrator user account if authentication type is 'Password'.
+    description: ''
+  - name: --admin-username
+    summary: Name of the administrator user account that can be used to SSH into the node(s).
+    description: ''
+  - name: --description
+    summary: Description of the compute target.
+    description: ''
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML compute specification.
+    description: ''
+  - name: --identity-type
+    summary: 'The type of managed identity. Allowed values: SystemAssigned, UserAssigned.'
+    description: ''
+  - name: --idle-time-before-scale-down -s
+    summary: Idle time in seconds before scaling down the cluster.
+    description: ''
+  - name: --max-instances
+    summary: The maximum number of nodes to use on the cluster.
+    description: ''
+  - name: --min-instances
+    summary: 'The minimum number of nodes to use on the cluster. Default: 0.'
+    description: ''
+  - name: --name -n
+    summary: Name of the compute target. Required if --file/-f is not provided.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --priority
+    summary: 'VM priority. Allowed values: Dedicated, LowPriority.'
+    description: ''
+  - name: --public-ip
+    summary: Public IP Address of this ComputeInstance (only applies to ComputeInstance).
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --size
+    summary: 'VM size to use for the compute target. More details can be found here: https://aka.ms/azureml-vm-details.'
+    description: ''
+  - name: --ssh-key-value
+    summary: SSH public key of the administrator user account.
+    description: ''
+  - name: --subnet
+    summary: Name of the subnet.
+    description: ''
+  - name: --type -t
+    summary: 'The type of compute target. Required if --file/-f is not provided. Allowed values: AmlCompute, ComputeInstance.'
+    description: ''
+  - name: --user-assigned-identities -i
+    summary: Comma-separated resource IDs (e.g. 'ResourceID1,ResourceID2') to set user-assigned managed identities. Only supported if --identity-type is 'UserAssigned'.
+    description: ''
+  - name: --user-object-id
+    summary: AAD object ID of the assigned user.
+    description: ''
+  - name: --user-tenant-id
+    summary: AAD tenant ID of the assigned user.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network.
+    description: ''
+- uid: az_ml_compute_delete
+  name: az ml compute delete
+  summary: Delete a compute target.
+  description: ''
+  syntax: >-
+    az ml compute delete --name
+                         --resource-group
+                         --workspace-name
+                         [--no-wait]
+                         [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_compute_detach
+  name: az ml compute detach
+  summary: Detach a previously attached compute resource from a workspace.
+  description: ''
+  syntax: >-
+    az ml compute detach --name
+                         --resource-group
+                         --workspace-name
+                         [--no-wait]
+                         [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_compute_list
+  name: az ml compute list
+  summary: List the compute targets in a workspace.
+  description: ''
+  syntax: >-
+    az ml compute list --resource-group
+                       --workspace-name
+                       [--max-results]
+                       [--type]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --type
+    summary: 'The type of compute target. Allowed values: AmlCompute, ComputeInstance.'
+    description: ''
+- uid: az_ml_compute_list-sizes
+  name: az ml compute list-sizes
+  summary: List the VM sizes available by location.
+  description: ''
+  syntax: >-
+    az ml compute list-sizes --resource-group
+                             --workspace-name
+                             [--location]
+                             [--type]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --type -t
+    summary: 'The type of compute target. Allowed values: AmlCompute, ComputeInstance.'
+    description: ''
+- uid: az_ml_compute_list-usage
+  name: az ml compute list-usage
+  summary: List the available usage resources for VMs.
+  description: ''
+  syntax: >-
+    az ml compute list-usage --resource-group
+                             --workspace-name
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: Defaults to workspace location.
+    description: ''
+- uid: az_ml_compute_restart
+  name: az ml compute restart
+  summary: Restart a ComputeInstance target.
+  description: ''
+  syntax: >-
+    az ml compute restart --name
+                          --resource-group
+                          --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_compute_show
+  name: az ml compute show
+  summary: Show details for a compute target.
+  description: ''
+  syntax: >-
+    az ml compute show --name
+                       --resource-group
+                       --workspace-name
+  examples:
+  - summary: Show details for a compute target
+    syntax: az ml compute show --name nc6-cluster --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_compute_start
+  name: az ml compute start
+  summary: Start a ComputeInstance target.
+  description: --no-wait option is recommended.
+  syntax: >-
+    az ml compute start --name
+                        --resource-group
+                        --workspace-name
+                        [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_ml_compute_stop
+  name: az ml compute stop
+  summary: Stop a ComputeInstance target.
+  description: --no-wait option is recommended.
+  syntax: >-
+    az ml compute stop --name
+                       --resource-group
+                       --workspace-name
+                       [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_ml_compute_update
+  name: az ml compute update
+  summary: Update a compute target.
+  description: The 'tags', 'description', 'max_instances', 'min_instances', 'idle_time_before_scale_down', 'identity_type', and 'user_assigned_identities' properties can be updated.
+  syntax: >-
+    az ml compute update --name
+                         --resource-group
+                         --workspace-name
+                         [--add]
+                         [--force-string]
+                         [--identity-type]
+                         [--idle-time-before-scale-down]
+                         [--max-instances]
+                         [--min-instances]
+                         [--remove]
+                         [--set]
+                         [--user-assigned-identities]
+  examples:
+  - summary: Update the minimum number of nodes for an AmlCompute cluster
+    syntax: az ml compute update --name nc6-cluster --min-instances 1 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the compute target (Required if not specified in the yaml file).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --identity-type
+    summary: 'The type of managed identity. Allowed values: SystemAssigned, UserAssigned.'
+    description: ''
+  - name: --idle-time-before-scale-down -s
+    summary: Idle time in seconds before scaling down the cluster.
+    description: ''
+  - name: --max-instances
+    summary: Maximum number of nodes to use.
+    description: ''
+  - name: --min-instances
+    summary: Minimum number of nodes to use.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --user-assigned-identities -i
+    summary: Comma-separated resource IDs (e.g. 'ResourceID1,ResourceID2') to set user-assigned managed identities. Only supported if --identity-type is 'UserAssigned'.
+    description: ''
+commands:
+- az_ml_compute_attach
+- az_ml_compute_create
+- az_ml_compute_delete
+- az_ml_compute_detach
+- az_ml_compute_list
+- az_ml_compute_list-sizes
+- az_ml_compute_list-usage
+- az_ml_compute_restart
+- az_ml_compute_show
+- az_ml_compute_start
+- az_ml_compute_stop
+- az_ml_compute_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML compute targets are designated compute resources where you can run your jobs for training or deploy your models for inference.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/data.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/data.yml
new file mode 100644
index 0000000000..3f23d56ea8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/data.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_data
+name: az ml data
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml data** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML data assets.
+description: Azure ML data assets are references to file(s) in your storage services or public URLs along with any corresponding metadata. They are not copies of your data.  You can use these data assets to access relevant data during model training and mount or download the referenced data to your compute target.
+directCommands:
+- uid: az_ml_data_create
+  name: az ml data create
+  summary: Create a data asset.
+  description: >-
+    Data assets can be defined from files on your local machine or as references to files in cloud storage. The created data asset will be tracked in the workspace under the specified name and version.
+
+
+    To create a data asset from file(s) on your local machine, specify the 'local_path' field in your YAML config. Azure ML will upload these file(s) to the blob container that backs the workspace's default datastore (named 'workspaceblobstore'). The created data asset will then point to that uploaded data.
+
+
+    To create a data asset that references file(s) in cloud storage, specify the 'datastore' that corresponds to the storage service and the 'path' to the file(s) in storage in your YAML config.
+
+
+    You can also create a data asset directly from a storage URL or public URL. To do so, specify the URL to the 'path' field in your YAML config.
+  syntax: >-
+    az ml data create --resource-group
+                      --workspace-name
+                      [--file]
+                      [--name]
+                      [--set]
+                      [--version]
+  examples:
+  - summary: Create a data asset from a YAML specification file
+    syntax: az ml data create --file data.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML data specification.
+    description: ''
+  - name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the data asset.
+    description: ''
+- uid: az_ml_data_delete
+  name: az ml data delete
+  summary: Delete a data asset.
+  description: ''
+  syntax: >-
+    az ml data delete --name
+                      --resource-group
+                      --version
+                      --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the data asset.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_data_list
+  name: az ml data list
+  summary: List data assets in a workspace.
+  description: ''
+  syntax: >-
+    az ml data list --resource-group
+                    --workspace-name
+                    [--max-results]
+                    [--name]
+  examples:
+  - summary: List all the data assets in a workspace
+    syntax: az ml data list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the data asset versions for the specified name in a workspace
+    syntax: az ml data list --name my-data --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --name -n
+    summary: Name of the data asset. If provided, all the data versions under this name will be returned.
+    description: ''
+- uid: az_ml_data_show
+  name: az ml data show
+  summary: Shows details for a data asset.
+  description: ''
+  syntax: >-
+    az ml data show --name
+                    --resource-group
+                    --workspace-name
+                    [--version]
+  examples:
+  - summary: Show details for a data asset with the specified name and version
+    syntax: az ml data show --name my-data --version 1 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Show details for the latest version of a data asset with the specified name
+    syntax: az ml data show --name my-data --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --version -v
+    summary: Version of the data asset. If omitted, the latest version is shown.
+    description: ''
+- uid: az_ml_data_update
+  name: az ml data update
+  summary: Update a data asset.
+  description: Only the 'description' and 'tags' properties can be updated.
+  syntax: >-
+    az ml data update --resource-group
+                      --workspace-name
+                      [--add]
+                      [--force-string]
+                      [--name]
+                      [--remove]
+                      [--set]
+                      [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --name -n
+    summary: Name of the data asset.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the data asset.
+    description: ''
+commands:
+- az_ml_data_create
+- az_ml_data_delete
+- az_ml_data_list
+- az_ml_data_show
+- az_ml_data_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML data assets are references to file(s) in your storage services or public URLs along with any corresponding metadata. They are not copies of your data.  You can use these data assets to access relevant data during model training and mount or download the referenced data to your compute target.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/datastore.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/datastore.yml
new file mode 100644
index 0000000000..ddbef77fe1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/datastore.yml
@@ -0,0 +1,188 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_datastore
+name: az ml datastore
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml datastore** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML datastores.
+description: >-
+  Azure ML datastores securely link your Azure storage services to your workspace so that you can access your storage without having to hardcode the connection information into your scripts. The connection secrets, like the storage service's authentication credentials, are stored in your workspace's Key Vault.
+
+
+  When you create a workspace, an Azure Storage account is automatically created as an associated resource. A blob container is created in this account, and its connection information is stored as a datastore named 'workspaceblobstore'. This serves as the workspace's default datastore, and the blob container is used to store your workspace artifacts and machine learning job logs and outputs.
+directCommands:
+- uid: az_ml_datastore_create
+  name: az ml datastore create
+  summary: Create a datastore.
+  description: This connects the underlying Azure storage service to the workspace. The storage service types that can currently be connected to by creating a datastore include Azure Blob storage, Azure File Share, Azure Data Lake Storage Gen1 and Azure Data Lake Storage Gen2.
+  syntax: >-
+    az ml datastore create --file
+                           --resource-group
+                           --workspace-name
+                           [--name]
+                           [--set]
+  examples:
+  - summary: Create a datastore from a YAML specification file
+    syntax: az ml datastore create --file blobstore.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML datastore specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the datastore. This overwrites the 'name' field in the YAML file provided to --file/-f.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_ml_datastore_delete
+  name: az ml datastore delete
+  summary: Delete a datastore.
+  description: This deletes the connection information to the storage service from the workspace but does not delete the underlying data in storage.
+  syntax: >-
+    az ml datastore delete --name
+                           --resource-group
+                           --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_datastore_list
+  name: az ml datastore list
+  summary: List datastores in a workspace.
+  description: ''
+  syntax: >-
+    az ml datastore list --resource-group
+                         --workspace-name
+                         [--include-secrets]
+                         [--max-results]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-secrets -i
+    summary: Whether to include the connection secrets for the datastore.
+    description: ''
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_ml_datastore_show
+  name: az ml datastore show
+  summary: Show details for a datastore.
+  description: ''
+  syntax: >-
+    az ml datastore show --name
+                         --resource-group
+                         --workspace-name
+                         [--include-secrets]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-secrets -i
+    summary: Whether to include the connection secrets for the datastore.
+    description: ''
+- uid: az_ml_datastore_update
+  name: az ml datastore update
+  summary: Update a datastore.
+  description: The 'description', 'tags', and 'credential' properties can be updated.
+  syntax: >-
+    az ml datastore update --resource-group
+                           --workspace-name
+                           [--add]
+                           [--file]
+                           [--force-string]
+                           [--name]
+                           [--remove]
+                           [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML datastore specification.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --name -n
+    summary: Name of the datastore. This overwrites the 'name' field in the YAML file provided to --file/-f.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_ml_datastore_create
+- az_ml_datastore_delete
+- az_ml_datastore_list
+- az_ml_datastore_show
+- az_ml_datastore_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Azure ML datastores securely link your Azure storage services to your workspace so that you can access your storage without having to hardcode the connection information into your scripts. The connection secrets, like the storage service's authentication credentials, are stored in your workspace's Key Vault.
+
+
+    When you create a workspace, an Azure Storage account is automatically created as an associated resource. A blob container is created in this account, and its connection information is stored as a datastore named 'workspaceblobstore'. This serves as the workspace's default datastore, and the blob container is used to store your workspace artifacts and machine learning job logs and outputs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/endpoint.yml
new file mode 100644
index 0000000000..9fdecc5c92
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/endpoint.yml
@@ -0,0 +1,524 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_endpoint
+name: az ml endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML endpoints.
+description: >-
+  Azure ML endpoints provide a simple interface for creating and managing model deployments. Each endpoint can have one or more deployments, enabling the traffic from a single scoring endpoint to be served to multiple deployments if needed. This is useful for scenarios such as controlled rollout.
+
+
+  Azure ML supports two types of endpoints: online and batch. Online endpoints support real-time inference, while batch endpoints are used for offline batch scoring.
+directCommands:
+- uid: az_ml_endpoint_create
+  name: az ml endpoint create
+  summary: Create an endpoint.
+  description: To create an endpoint, provide a YAML file with either an online or batch endpoint configuration. The endpoint can have one or more deployments defined. A deployment configuration will typically include the model to deploy, the scoring code, the environment encapsulating the scoring dependencies, the compute configuration, and any additional settings.
+  syntax: >-
+    az ml endpoint create --file
+                          --resource-group
+                          --workspace-name
+                          [--local {false, true}]
+                          [--name]
+                          [--no-wait]
+                          [--set]
+                          [--type]
+  examples:
+  - summary: Create an endpoint from a YAML specification file
+    syntax: az ml endpoint create --file endpoint.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML endpoint specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to create the endpoint locally. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --type -t
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_delete
+  name: az ml endpoint delete
+  summary: Delete an endpoint or a specific deployment.
+  description: ''
+  syntax: >-
+    az ml endpoint delete --name
+                          --resource-group
+                          --workspace-name
+                          [--deployment]
+                          [--local {false, true}]
+                          [--no-wait]
+                          [--type]
+                          [--yes]
+  examples:
+  - summary: Delete an online endpoint, including all its deployments
+    syntax: az ml endpoint delete --name my-online-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Delete a specific deployment for a batch endpoint. This does not delete the endpoint itself.
+    syntax: az ml endpoint delete --name my-batch-endpoint --deployment my-deployment --type batch --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of the deployment to delete.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to delete the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_endpoint_get-credentials
+  name: az ml endpoint get-credentials
+  summary: List the token/keys for an online endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint get-credentials --name
+                                   --resource-group
+                                   --workspace-name
+                                   [--type]
+  examples:
+  - summary: List the keys for an online endpoint
+    syntax: az ml endpoint get-credentials --name my-online-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --type -t
+    defaultValue: online
+    summary: The type of endpoint. Only online endpoints are currently supported.
+    description: ''
+- uid: az_ml_endpoint_get-logs
+  name: az ml endpoint get-logs
+  summary: Get the container logs for an online deployment.
+  description: ''
+  syntax: >-
+    az ml endpoint get-logs --deployment
+                            --name
+                            --resource-group
+                            --workspace-name
+                            [--container]
+                            [--lines]
+                            [--local {false, true}]
+                            [--type]
+  examples:
+  - summary: Get the container logs for an online deployment
+    syntax: az ml endpoint get-logs --name my-online-endpoint --deployment my-deployment --lines 100 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --deployment -d
+    summary: Name of the deployment.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container -c
+    summary: 'The type of container from which to retrieve logs. Allowed values: inference-server, storage-initializer.'
+    description: ''
+  - name: --lines -l
+    defaultValue: "5000"
+    summary: The maximum number of lines to tail.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to get logs from the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_invoke
+  name: az ml endpoint invoke
+  summary: Invoke an endpoint.
+  description: You can test an endpoint by invoking it with some request data. For online endpoints, this will be real-time inference and the scoring results will be returned immediately. For batch endpoints, invocation will trigger an asynchronous batch scoring job.
+  syntax: >-
+    az ml endpoint invoke --name
+                          --resource-group
+                          --workspace-name
+                          [--deployment]
+                          [--input-data]
+                          [--input-datastore]
+                          [--input-local-path]
+                          [--input-path]
+                          [--instance-count]
+                          [--local {false, true}]
+                          [--mini-batch-size]
+                          [--output-datastore]
+                          [--output-path]
+                          [--request-file]
+                          [--set]
+                          [--type]
+  examples:
+  - summary: Invoke an online endpoint with some request data
+    syntax: az ml endpoint invoke --name my-online-endpoint --request-file sample_request.json --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke an online endpoint, targeting a specific deployment
+    syntax: az ml endpoint invoke --name my-online-endpoint --deployment my-deployment --request-file sample_request.json --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from a registered Azure ML data asset (and override default deployment setting for mini_batch_size)
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-data azureml:mnist-data:1 --mini-batch-size 64 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from a storage URL
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-path https://pipelinedata.blob.core.windows.net/sampledata/mnist --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from a path on a datastore
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-datastore my-datastore --input-path mnist --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Invoke a batch endpoint with input data from local files
+    syntax: az ml endpoint invoke --name my-batch-endpoint --type batch --input-local-path ./mnist --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of the deployment to target.
+    description: ''
+  - name: --input-data -i
+    summary: Input data asset. Format should be azureml:<data-name>:<data-version>.
+    description: ''
+  - name: --input-datastore -u
+    summary: Datastore to which --input-path/-p is relative or files in --input-local-path/-l will be uploaded. Defaults to the workspace's default datastore.
+    description: ''
+  - name: --input-local-path -l
+    summary: Local path to the input data. The file(s) will be uploaded and registered as an Azure ML data asset.
+    description: ''
+  - name: --input-path -p
+    summary: URL or path on the datastore where the input data is located.
+    description: ''
+  - name: --instance-count -c
+    summary: Number of instances the prediction will run on.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Invoke the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --mini-batch-size -m
+    summary: Size of each mini batch that the input data will be split into for prediction.
+    description: ''
+  - name: --output-datastore -s
+    summary: Datastore to which --output-path/-x is relative. Defaults to the workspace's default datastore.
+    description: ''
+  - name: --output-path -x
+    summary: Path on the datastore where output files will be uploaded to.
+    description: ''
+  - name: --request-file -r
+    summary: Local path to the JSON file containing the request data.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_list
+  name: az ml endpoint list
+  summary: List endpoints in a workspace.
+  description: ''
+  syntax: >-
+    az ml endpoint list --resource-group
+                        --workspace-name
+                        [--local {false, true}]
+                        [--type]
+  examples:
+  - summary: List all the online endpoints in a workspace
+    syntax: az ml endpoint list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the batch endpoints in a workspace
+    syntax: az ml endpoint list --type batch --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to show all local endpoints. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_list-jobs
+  name: az ml endpoint list-jobs
+  summary: List the batch scoring jobs for a batch endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint list-jobs --name
+                             --resource-group
+                             --workspace-name
+                             [--deployment]
+                             [--type]
+  examples:
+  - summary: List all the batch scoring jobs for an endpoint
+    syntax: az ml endpoint list-jobs --name my-batch-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List the batch scoring jobs for a specific deployment
+    syntax: az ml endpoint list-jobs --name my-batch-endpoint --deployment my-deployment --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of the deployment to target.
+    description: ''
+  - name: --type -t
+    defaultValue: batch
+    summary: The type of endpoint. Only batch endpoints are supported.
+    description: ''
+- uid: az_ml_endpoint_regenerate-keys
+  name: az ml endpoint regenerate-keys
+  summary: Regenerate the keys for an online endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint regenerate-keys --name
+                                   --resource-group
+                                   --workspace-name
+                                   [--key-type]
+                                   [--type]
+  examples:
+  - summary: Regenerate the keys for an online endpoint
+    syntax: az ml endpoint regenerate-keys --name my-online-endpoint --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-type
+    defaultValue: primary
+    summary: 'The type of key to regenerate. Allowed values: primary, secondary.'
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: The type of the endpoint. Only online endpoints are supported.
+    description: ''
+- uid: az_ml_endpoint_show
+  name: az ml endpoint show
+  summary: Show details for an endpoint.
+  description: ''
+  syntax: >-
+    az ml endpoint show --name
+                        --resource-group
+                        --workspace-name
+                        [--local {false, true}]
+                        [--type]
+  examples:
+  - summary: Show the details for a batch endpoint
+    syntax: az ml endpoint show --name my-batch-endpoint --type batch --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to show only the local endpoints. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --type -t
+    defaultValue: online
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+- uid: az_ml_endpoint_update
+  name: az ml endpoint update
+  summary: Update an endpoint.
+  description: The 'description', 'tags', and 'traffic' properties of an endpoint can be updated. In addition, new deployments can be added to an endpoint, and existing deployments can be updated.
+  syntax: >-
+    az ml endpoint update --resource-group
+                          --workspace-name
+                          [--add]
+                          [--deployment]
+                          [--deployment-file]
+                          [--file]
+                          [--force-string]
+                          [--instance-count]
+                          [--local {false, true}]
+                          [--name]
+                          [--no-wait]
+                          [--remove]
+                          [--set]
+                          [--traffic]
+                          [--type]
+  examples:
+  - summary: Update an endpoint from a YAML specification file
+    syntax: az ml endpoint update --file updated_endpoint.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Add a new deployment to an existing endpoint
+    syntax: az ml endpoint update --name my-batch-endpoint --type batch --deployment my-new-deployment --deployment-file new_deployment.yml  --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Update the traffic settings for an endpoint
+    syntax: az ml endpoint update --name my-batch-endpoint --type batch --traffic my-new-deployment:100 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --deployment -d
+    summary: Name of the deployment to update.
+    description: ''
+  - name: --deployment-file -e
+    summary: Local path to the YAML file containing the Azure ML deployment specification to update. If specified, --deployment/-d must also be provided.
+    description: ''
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML endpoint specification.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --instance-count -i
+    summary: Instance count for the deployment. If specified, --deployment/-d must also be provided.
+    description: ''
+  - name: --local
+    parameterValueGroup: false, true
+    summary: Indicates whether to update the local endpoint. If specified, --type/-t must be 'online'.
+    description: ''
+  - name: --name -n
+    summary: Name of the endpoint.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --traffic -r
+    summary: Traffic settings for the endpoint.
+    description: ''
+  - name: --type -t
+    summary: 'The type of endpoint. Allowed values: online, batch.'
+    description: ''
+commands:
+- az_ml_endpoint_create
+- az_ml_endpoint_delete
+- az_ml_endpoint_get-credentials
+- az_ml_endpoint_get-logs
+- az_ml_endpoint_invoke
+- az_ml_endpoint_list
+- az_ml_endpoint_list-jobs
+- az_ml_endpoint_regenerate-keys
+- az_ml_endpoint_show
+- az_ml_endpoint_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Azure ML endpoints provide a simple interface for creating and managing model deployments. Each endpoint can have one or more deployments, enabling the traffic from a single scoring endpoint to be served to multiple deployments if needed. This is useful for scenarios such as controlled rollout.
+
+
+    Azure ML supports two types of endpoints: online and batch. Online endpoints support real-time inference, while batch endpoints are used for offline batch scoring.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/environment.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/environment.yml
new file mode 100644
index 0000000000..34d898815f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/environment.yml
@@ -0,0 +1,204 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_environment
+name: az ml environment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml environment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML environments.
+description: Azure ML environments define the execution environment for jobs and endpoint deployments, encapsulating the dependencies for training and inference. These environment definitions are built into Docker images.
+directCommands:
+- uid: az_ml_environment_create
+  name: az ml environment create
+  summary: Create an environment.
+  description: >-
+    Environments can be defined from a Docker image, Dockerfile, or Conda file. Azure ML maintains a set of CPU and GPU Docker images that you can use as base images. For information on these images, see https://github.com/Azure/AzureML-Containers.
+
+
+    The created environment will be tracked in the workspace under the specified name and version.
+  syntax: >-
+    az ml environment create --file
+                             --resource-group
+                             --workspace-name
+                             [--name]
+                             [--set]
+                             [--version]
+  examples:
+  - summary: Create an environment from a YAML specification file
+    syntax: az ml environment create --file my_env.yml --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML environment specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+- uid: az_ml_environment_delete
+  name: az ml environment delete
+  summary: Delete an environment.
+  description: ''
+  syntax: >-
+    az ml environment delete --name
+                             --resource-group
+                             --version
+                             --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the environment.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_environment_list
+  name: az ml environment list
+  summary: List environments in a workspace.
+  description: ''
+  syntax: >-
+    az ml environment list --resource-group
+                           --workspace-name
+                           [--max-results]
+                           [--name]
+  examples:
+  - summary: List all the environments in a workspace
+    syntax: az ml environment list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the environment versions for the specified name in a workspace
+    syntax: az ml environment list --name my-env --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --name -n
+    summary: Name of the environment. If provided, all the environment versions under this name will be returned.
+    description: ''
+- uid: az_ml_environment_show
+  name: az ml environment show
+  summary: Show details for an environment.
+  description: ''
+  syntax: >-
+    az ml environment show --name
+                           --resource-group
+                           --workspace-name
+                           [--version]
+  examples:
+  - summary: Show details for an environment with the specified name and version
+    syntax: az ml environment show --name my-env --version 1 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Show details for the latest version of an environment with the specified name
+    syntax: az ml environment show --name my-env --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --version -v
+    summary: Version of the environment. If omitted, the latest version is shown.
+    description: ''
+- uid: az_ml_environment_update
+  name: az ml environment update
+  summary: Update an environment.
+  description: Only the 'description' and 'tags' properties can be updated.
+  syntax: >-
+    az ml environment update --name
+                             --resource-group
+                             --workspace-name
+                             [--add]
+                             [--force-string]
+                             [--remove]
+                             [--set]
+                             [--version]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the environment.
+    description: ''
+commands:
+- az_ml_environment_create
+- az_ml_environment_delete
+- az_ml_environment_list
+- az_ml_environment_show
+- az_ml_environment_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML environments define the execution environment for jobs and endpoint deployments, encapsulating the dependencies for training and inference. These environment definitions are built into Docker images.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/job.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/job.yml
new file mode 100644
index 0000000000..d7609e3718
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/job.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_job
+name: az ml job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML jobs.
+description: >-
+  An Azure ML job executes a task against a specified compute target. You can configure jobs to scale out model training on Azure. Azure ML supports different job types with different capabilities. For example, the most basic job, a command job, executes a command in a Docker container and can be leveraged for single-node and distributed training. A sweep job executes a hyperparameter sweep over a specified search space for tuning a model's hyperparameters.
+
+
+  Jobs also enable systematic tracking for your ML experimentation and workflows. Once a job is created, Azure ML maintains a run record for the job that includes the metadata, any metrics, logs, and artifacts generated during the job, code that was executed, and the Azure ML environment used. All of your jobs' run records can be viewed in Azure ML studio.
+directCommands:
+- uid: az_ml_job_cancel
+  name: az ml job cancel
+  summary: Cancel a job.
+  description: ''
+  syntax: >-
+    az ml job cancel --name
+                     --resource-group
+                     --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_job_create
+  name: az ml job create
+  summary: Create a job.
+  description: To create a job, you will typically need to configure any code to be run, an environment encapsulating the dependencies, a compute target to execute the job on, and any additional job-specific settings. When a job is created, it is submitted for execution against the specified compute resource.
+  syntax: >-
+    az ml job create --file
+                     --resource-group
+                     --workspace-name
+                     [--name]
+                     [--save-as]
+                     [--set]
+                     [--stream]
+                     [--web]
+  examples:
+  - summary: Create a job from a YAML specification file
+    syntax: az ml job create --file job.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Create a job from a YAML specification file and open the job's run details in the Azure ML studio portal
+    syntax: az ml job create --file job.yml --web --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: Local path to the YAML file containing the Azure ML job specification.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the job.
+    description: ''
+  - name: --save-as -a
+    summary: File to which the created job's state in YAML format will be written.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --stream -s
+    summary: Indicates whether to stream the job's logs to the console.
+    description: ''
+  - name: --web -e
+    summary: Show the job's run details in Azure ML studio in a web browser.
+    description: ''
+- uid: az_ml_job_download
+  name: az ml job download
+  summary: Download all job-related files.
+  description: The files will be downloaded in a folder named after the job's name.
+  syntax: >-
+    az ml job download --name
+                       --resource-group
+                       --workspace-name
+                       [--download-path]
+                       [--outputs]
+  examples:
+  - summary: Download a job's files, including outputs, to the current working directory
+    syntax: az ml job download --name my-job --outputs --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --download-path -p
+    summary: Path to download the job files to. If omitted, job files will be downloaded to the current directory.
+    description: ''
+  - name: --outputs -u
+    summary: Indicates whether to download the outputs of the job. By default outputs will not be downloaded.
+    description: ''
+- uid: az_ml_job_list
+  name: az ml job list
+  summary: List jobs in a workspace.
+  description: ''
+  syntax: >-
+    az ml job list --resource-group
+                   --workspace-name
+                   [--max-results]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_ml_job_show
+  name: az ml job show
+  summary: Show details for a job.
+  description: ''
+  syntax: >-
+    az ml job show --name
+                   --resource-group
+                   --workspace-name
+                   [--include-logs]
+                   [--web]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --include-logs -l
+    summary: Indicates whether to list all the paths of the job's logs.
+    description: ''
+  - name: --web -e
+    summary: Show the job's run details in Azure ML studio in a web browser.
+    description: ''
+- uid: az_ml_job_stream
+  name: az ml job stream
+  summary: Stream job logs to the console.
+  description: ''
+  syntax: >-
+    az ml job stream --name
+                     --resource-group
+                     --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_job_update
+  name: az ml job update
+  summary: Update a job.
+  description: Only the 'tags' and 'properties' properties can be updated.
+  syntax: >-
+    az ml job update --name
+                     --resource-group
+                     --workspace-name
+                     [--add]
+                     [--force-string]
+                     [--remove]
+                     [--set]
+                     [--web]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --web -e
+    summary: Show the job's run details in Azure ML studio in a web browser.
+    description: ''
+commands:
+- az_ml_job_cancel
+- az_ml_job_create
+- az_ml_job_download
+- az_ml_job_list
+- az_ml_job_show
+- az_ml_job_stream
+- az_ml_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    An Azure ML job executes a task against a specified compute target. You can configure jobs to scale out model training on Azure. Azure ML supports different job types with different capabilities. For example, the most basic job, a command job, executes a command in a Docker container and can be leveraged for single-node and distributed training. A sweep job executes a hyperparameter sweep over a specified search space for tuning a model's hyperparameters.
+
+
+    Jobs also enable systematic tracking for your ML experimentation and workflows. Once a job is created, Azure ML maintains a run record for the job that includes the metadata, any metrics, logs, and artifacts generated during the job, code that was executed, and the Azure ML environment used. All of your jobs' run records can be viewed in Azure ML studio.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/model.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/model.yml
new file mode 100644
index 0000000000..1df8465d85
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/model.yml
@@ -0,0 +1,208 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_model
+name: az ml model
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml model** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML models.
+description: Azure ML models consist of the binary file(s) that represent a machine learning model and any corresponding metadata.  These models can be used in endpoint deployments for real-time and batch inference.
+directCommands:
+- uid: az_ml_model_create
+  name: az ml model create
+  summary: Create a model.
+  description: Models can be created from a local file or directory. The created model will be tracked in the workspace under the specified name and version.
+  syntax: >-
+    az ml model create --resource-group
+                       --workspace-name
+                       [--file]
+                       [--local-path]
+                       [--name]
+                       [--set]
+                       [--version]
+  examples:
+  - summary: Create a model from a YAML specification file
+    syntax: az ml model create --file model.yml --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Create a model from a local folder using command options
+    syntax: az ml model create --name my-model --version 1 --local-path ./my-model --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    summary: Local path to the YAML file containing the Azure ML model specification. --name/-n and --version/-v must be provided if YAML file is not having name and version.
+    description: ''
+  - name: --local-path -l
+    summary: Path to the model file(s). This can be either a file or a directory. If specified, --name/-n and --version/-v must also be provided.
+    description: ''
+  - name: --name -n
+    summary: Name of the model.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the model.
+    description: ''
+- uid: az_ml_model_delete
+  name: az ml model delete
+  summary: Delete a model.
+  description: ''
+  syntax: >-
+    az ml model delete --name
+                       --resource-group
+                       --version
+                       --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Version of the model.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_model_list
+  name: az ml model list
+  summary: List models in a workspace.
+  description: ''
+  syntax: >-
+    az ml model list --resource-group
+                     --workspace-name
+                     [--max-results]
+                     [--name]
+  examples:
+  - summary: List all the models in a workspace
+    syntax: az ml model list --resource-group my-resource-group --workspace-name my-workspace
+  - summary: List all the model versions for the specified name in a workspace
+    syntax: az ml model list --name my-model --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --max-results -r
+    defaultValue: "100"
+    summary: Maximum number of results to return.
+    description: ''
+  - name: --name -n
+    summary: Name of the model. If provided, all the model versions under this name will be returned.
+    description: ''
+- uid: az_ml_model_show
+  name: az ml model show
+  summary: Show details for a model.
+  description: ''
+  syntax: >-
+    az ml model show --name
+                     --resource-group
+                     --workspace-name
+                     [--version]
+  examples:
+  - summary: Show details for a model with the specified name and version
+    syntax: az ml model show --name my-model --version 1 --resource-group my-resource-group --workspace-name my-workspace
+  - summary: Show details for the latest version of a model with the specified name
+    syntax: az ml model show --name my-model --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --version -v
+    summary: Version of the model. If omitted, the latest version is shown.
+    description: ''
+- uid: az_ml_model_update
+  name: az ml model update
+  summary: Update a model.
+  description: The 'description', 'tags', 'properties', and 'flavors' properties can be updated.
+  syntax: >-
+    az ml model update --name
+                       --resource-group
+                       --workspace-name
+                       [--add]
+                       [--force-string]
+                       [--remove]
+                       [--set]
+                       [--version]
+  examples:
+  - summary: Update a model's flavors
+    syntax: az ml model update --name my-model --version 1 --set flavors.python_function.python_version=3.8 --resource-group my-resource-group --workspace-name my-workspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the model.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --version -v
+    summary: Version of the model.
+    description: ''
+commands:
+- az_ml_model_create
+- az_ml_model_delete
+- az_ml_model_list
+- az_ml_model_show
+- az_ml_model_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure ML models consist of the binary file(s) that represent a machine learning model and any corresponding metadata.  These models can be used in endpoint deployments for real-time and batch inference.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ml/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/ml/workspace.yml
new file mode 100644
index 0000000000..e0ee30b9b7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ml/workspace.yml
@@ -0,0 +1,185 @@
+### YamlMime:AzureCLIGroup
+uid: az_ml_workspace
+name: az ml workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ml** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ml workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure ML workspaces.
+description: An Azure ML workspace is the top-level resource for Azure Machine Learning. It provides a centralized place to track the assets and resources used in your ML workflows, along with the logs and artifacts produced from your training jobs.
+directCommands:
+- uid: az_ml_workspace_create
+  name: az ml workspace create
+  summary: Create a workspace.
+  description: 'When a workspace is created, several Azure resources that will be used by Azure ML also get created by default: Azure Storage, Azure Container Registry, Azure Key Vault, and Azure Application Insights. You can instead use existing Azure resource instances for those when creating the workspace by specifying the resource IDs in the workspace configuration YAML file.'
+  syntax: >-
+    az ml workspace create --resource-group
+                           [--file,]
+                           [--no-wait]
+                           [--set]
+                           [--workspace-name]
+  examples:
+  - summary: Create a workspace from a YAML specification file.
+    syntax: az ml workspace create --file workspace.yml --resource-group my-resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file, -f
+    summary: Local path to the YAML file containing the Azure ML workspace specification.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for workspace creation to finish.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set. Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_delete
+  name: az ml workspace delete
+  summary: Delete a workspace.
+  description: By default the dependent resources associated with the workspace (Azure Storage, Azure Container Registry, Azure Key Vault, Azure Application Insights) are not deleted. To delete those as well, include --all-resources.
+  syntax: >-
+    az ml workspace delete --resource-group
+                           --workspace-name
+                           [--all-resources]
+                           [--no-wait]
+                           [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --all-resources
+    summary: Delete all the dependent resources associated with the workspace (Azure Storage account, Azure Container Registry, Azure Application Insights, Azure Key Vault).
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ml_workspace_list
+  name: az ml workspace list
+  summary: List all the workspaces in a subscription.
+  description: The list of workspaces can be filtered by resource group.
+  syntax: az ml workspace list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ml_workspace_list-keys
+  name: az ml workspace list-keys
+  summary: List workspace keys for dependent resources such as Azure Storage, Azure Container Registry, and Azure Application Insights.
+  description: ''
+  syntax: >-
+    az ml workspace list-keys --resource-group
+                              --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_show
+  name: az ml workspace show
+  summary: Show details for a workspace.
+  description: ''
+  syntax: >-
+    az ml workspace show --resource-group
+                         --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_sync-keys
+  name: az ml workspace sync-keys
+  summary: Sync workspace keys for dependent resources such as Azure Storage, Azure Container Registry, and Azure Application Insights.
+  description: If the keys for any resource in the workspace are changed, it can take around an hour for them to automatically be updated. This command triggers the workspace to immediately synchronize keys. A possible scenario is needing immediate access to storage after regenerating the storage keys.
+  syntax: >-
+    az ml workspace sync-keys --resource-group
+                              --workspace-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+- uid: az_ml_workspace_update
+  name: az ml workspace update
+  summary: Update a workspace.
+  description: The 'description', 'tags', 'friendly_name', and 'container_registry' properties can be updated.
+  syntax: >-
+    az ml workspace update --resource-group
+                           [--add]
+                           [--force-string]
+                           [--remove]
+                           [--set]
+                           [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Azure ML workspace. You can configure the default group using `az configure --defaults workspace=<name>`.
+    description: ''
+commands:
+- az_ml_workspace_create
+- az_ml_workspace_delete
+- az_ml_workspace_list
+- az_ml_workspace_list-keys
+- az_ml_workspace_show
+- az_ml_workspace_sync-keys
+- az_ml_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: An Azure ML workspace is the top-level resource for Azure Machine Learning. It provides a centralized place to track the assets and resources used in your ML workflows, along with the logs and artifacts produced from your training jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor.yml
new file mode 100644
index 0000000000..282676307e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor.yml
@@ -0,0 +1,119 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor
+name: az monitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alertsmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az monitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the Azure Monitor Service.
+description: ''
+commands:
+- az_monitor_action-rule
+- az_monitor_action-rule_create
+- az_monitor_action-rule_delete
+- az_monitor_action-rule_list
+- az_monitor_action-rule_show
+- az_monitor_action-rule_update
+- az_monitor_app-insights
+- az_monitor_app-insights_api-key
+- az_monitor_app-insights_api-key_create
+- az_monitor_app-insights_api-key_delete
+- az_monitor_app-insights_api-key_show
+- az_monitor_app-insights_component
+- az_monitor_app-insights_component_billing
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+- az_monitor_app-insights_component_connect-webapp
+- az_monitor_app-insights_component_continues-export
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+- az_monitor_app-insights_component_create
+- az_monitor_app-insights_component_delete
+- az_monitor_app-insights_component_linked-storage
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+- az_monitor_app-insights_component_show
+- az_monitor_app-insights_component_update
+- az_monitor_app-insights_component_update-tags
+- az_monitor_app-insights_events
+- az_monitor_app-insights_events_show
+- az_monitor_app-insights_metrics
+- az_monitor_app-insights_metrics_get-metadata
+- az_monitor_app-insights_metrics_show
+- az_monitor_app-insights_query
+- az_monitor_data-collection
+- az_monitor_data-collection_rule
+- az_monitor_data-collection_rule_association
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+- az_monitor_data-collection_rule_create
+- az_monitor_data-collection_rule_data-flow
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+- az_monitor_data-collection_rule_delete
+- az_monitor_data-collection_rule_list
+- az_monitor_data-collection_rule_log-analytics
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+- az_monitor_data-collection_rule_performance-counter
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+- az_monitor_data-collection_rule_show
+- az_monitor_data-collection_rule_syslog
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+- az_monitor_data-collection_rule_update
+- az_monitor_data-collection_rule_windows-event-log
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+- az_monitor_log-analytics
+- az_monitor_log-analytics_query
+- az_monitor_log-analytics_solution
+- az_monitor_log-analytics_solution_create
+- az_monitor_log-analytics_solution_delete
+- az_monitor_log-analytics_solution_list
+- az_monitor_log-analytics_solution_show
+- az_monitor_log-analytics_solution_update
+- az_monitor_scheduled-query
+- az_monitor_scheduled-query_create
+- az_monitor_scheduled-query_delete
+- az_monitor_scheduled-query_list
+- az_monitor_scheduled-query_show
+- az_monitor_scheduled-query_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the Azure Monitor Service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/action-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/action-rule.yml
new file mode 100644
index 0000000000..573c4e1c2a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/action-rule.yml
@@ -0,0 +1,284 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_action-rule
+name: az monitor action-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alertsmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az monitor action-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage action rule.
+description: ''
+directCommands:
+- uid: az_monitor_action-rule_create
+  name: az monitor action-rule create
+  summary: Create an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule create --name
+                                  --resource-group
+                                  --rule-type {ActionGroup, Diagnostics, Suppression}
+                                  [--alert-context]
+                                  [--alert-description]
+                                  [--alert-rule]
+                                  [--description]
+                                  [--location]
+                                  [--monitor-condition]
+                                  [--monitor-service]
+                                  [--scope]
+                                  [--scope-type {Resource, ResourceGroup}]
+                                  [--severity]
+                                  [--status {Disabled, Enabled}]
+                                  [--suppression-end-date]
+                                  [--suppression-end-time]
+                                  [--suppression-recurrence]
+                                  [--suppression-recurrence-type {Always, Daily, Monthly, Once, Weekly}]
+                                  [--suppression-start-date]
+                                  [--suppression-start-time]
+                                  [--tags]
+                                  [--target-resource-type]
+  examples:
+  - summary: Create an action rule to suppress notifications for all Sev4 alerts on all VMs within the subscription every weekend
+    syntax: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --severity Equals Sev4 --target-resource-type Equals Microsoft.Compute/VirtualMachines --suppression-recurrence-type Weekly --suppression-recurrence 0 6 --suppression-start-date 12/09/2018 --suppression-end-date 12/18/2018 --suppression-start-time 06:00:00 --suppression-end-time 14:00:00
+  - summary: Create an action rule to suppress notifications for all log alerts generated for Computer-01 in subscription indefinitely as it's going through maintenance
+    syntax: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
+  - summary: Create an action rule to suppress notifications in a resource group
+    syntax: az monitor action-rule create --resource-group rg --name rule --location Global --status Enabled --rule-type Suppression --scope-type ResourceGroup --scope /subscriptions/0b1f6471-1bf0-4dda-aec3-cb9272f09590/resourceGroups/rg --suppression-recurrence-type Always --alert-context Contains Computer-01 --monitor-service Equals "Log Analytics"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-type
+    parameterValueGroup: ActionGroup, Diagnostics, Suppression
+    summary: Indicate type of action rule.
+    description: ''
+  optionalParameters:
+  - name: --alert-context
+    summary: Filter alerts by alert context (payload).
+    description: ''
+  - name: --alert-description
+    summary: Filter alerts by alert rule description.
+    description: ''
+  - name: --alert-rule
+    summary: Filter alerts by alert rule name or ID.
+    description: ''
+  - name: --description
+    summary: Description of action rule.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --monitor-condition
+    summary: Filter alerts by monitor condition.
+    description: ''
+  - name: --monitor-service
+    summary: Filter alerts by monitor service.
+    description: ''
+  - name: --scope
+    summary: List of ARM IDs (space-delimited) of the given scope type which will be the target of the given action rule.
+    description: ''
+  - name: --scope-type
+    parameterValueGroup: Resource, ResourceGroup
+    summary: Type of target scope.
+    description: ''
+  - name: --severity
+    summary: Filter alerts by severity. All filters should follow format "operator value1 value2 ... valueN". Operator is one of Equals, NotEquals, Contains and DoesNotContain.
+    description: ''
+  - name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Indicate if the given action rule is enabled or disabled. Default to enabled.
+    description: ''
+  - name: --suppression-end-date
+    summary: 'End date for suppression. Format: MM/DD/YYYY.'
+    description: ''
+  - name: --suppression-end-time
+    summary: 'End time for suppression. Format: hh:mm:ss.'
+    description: ''
+  - name: --suppression-recurrence
+    summary: List of recurrence pattern values, delimited by space. If --suppression-recurrence-type is Weekly, allowed values range from 0 to 6. 0 stands for Sunday, 1 stands for Monday, ..., 6 stands for Saturday. If --suppression-recurrence-type is Monthly, allowed values range from 1 to 31, stands for day of month.
+    description: ''
+  - name: --suppression-recurrence-type
+    parameterValueGroup: Always, Daily, Monthly, Once, Weekly
+    summary: Specifies when the suppression should be applied.
+    description: ''
+  - name: --suppression-start-date
+    summary: 'Start date for suppression. Format: MM/DD/YYYY.'
+    description: ''
+  - name: --suppression-start-time
+    summary: 'Start time for suppression. Format: hh:mm:ss.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-resource-type
+    summary: Filter alerts by target resource type.
+    description: ''
+- uid: az_monitor_action-rule_delete
+  name: az monitor action-rule delete
+  summary: Delete an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule delete --name
+                                  --resource-group
+  examples:
+  - summary: Delete an action rule
+    syntax: az monitor action-rule delete --resource-group rg --name rule
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_action-rule_list
+  name: az monitor action-rule list
+  summary: List all action rules of the subscription, created in given resource group and given input filters.
+  description: ''
+  syntax: >-
+    az monitor action-rule list [--action-group]
+                                [--alert-rule-id]
+                                [--description]
+                                [--impacted-scope]
+                                [--monitor-service]
+                                [--name]
+                                [--resource-group]
+                                [--severity]
+                                [--target-resource]
+                                [--target-resource-group]
+                                [--target-resource-type]
+  examples:
+  - summary: List action rules of the subscription
+    syntax: az monitor action-rule list
+  - summary: List action rules of the resource group
+    syntax: az monitor action-rule list --resource-group rg
+  optionalParameters:
+  - name: --action-group
+    summary: Filter by action group configured as part of action rule.
+    description: ''
+  - name: --alert-rule-id
+    summary: Filter by alert rule ID.
+    description: ''
+  - name: --description
+    summary: Filter by alert rule description.
+    description: ''
+  - name: --impacted-scope
+    summary: Filter by impacted/target scope (provide comma separated list for multiple scopes). The value should be an well constructed ARM id of the scope.
+    description: ''
+  - name: --monitor-service
+    summary: Filter by monitor service which generates the alert instance. Default value is select all.
+    description: ''
+  - name: --name
+    summary: Filter by action rule name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --severity
+    summary: Filter by severity. Default value is select all.
+    description: ''
+  - name: --target-resource
+    summary: Filter by target resource (which is full ARM ID). Default value is select all.
+    description: ''
+  - name: --target-resource-group
+    summary: Filter by target resource group name. Default value is select all.
+    description: ''
+  - name: --target-resource-type
+    summary: Filter by target resource type. Default value is select all.
+    description: ''
+- uid: az_monitor_action-rule_show
+  name: az monitor action-rule show
+  summary: Get an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule show --name
+                                --resource-group
+  examples:
+  - summary: Get an action rule
+    syntax: az monitor action-rule show --resource-group rg --name rule
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_action-rule_update
+  name: az monitor action-rule update
+  summary: Update an action rule.
+  description: ''
+  syntax: >-
+    az monitor action-rule update --name
+                                  --resource-group
+                                  [--add]
+                                  [--force-string]
+                                  [--location]
+                                  [--remove]
+                                  [--set]
+                                  [--status {Disabled, Enabled}]
+                                  [--tags]
+  examples:
+  - summary: Update an action rule
+    syntax: az monitor action-rule update --resource-group rg --name rule --status Disabled
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of action rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Indicates if the given action rule is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_monitor_action-rule_create
+- az_monitor_action-rule_delete
+- az_monitor_action-rule_list
+- az_monitor_action-rule_show
+- az_monitor_action-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage action rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights.yml
new file mode 100644
index 0000000000..5e3821b907
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights
+name: az monitor app-insights
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for querying data in Application Insights applications.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_query
+  name: az monitor app-insights query
+  summary: Execute a query over data in your application.
+  description: ''
+  syntax: >-
+    az monitor app-insights query --analytics-query
+                                  --apps
+                                  [--end-time]
+                                  [--offset]
+                                  [--resource-group]
+                                  [--start-time]
+  examples:
+  - summary: Execute a simple query over past 1 hour and 30 minutes.
+    syntax: az monitor app-insights query --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --analytics-query 'requests | summarize count() by bin(timestamp, 1h)' --offset 1h30m
+  requiredParameters:
+  - isRequired: true
+    name: --analytics-query
+    summary: Query to execute over Application Insights data.
+    description: ''
+  - isRequired: true
+    name: --apps -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  optionalParameters:
+  - name: --end-time
+    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --offset
+    defaultValue: 1h
+    summary: 'Time offset of the query range, in ##d##h format.'
+    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start-time
+    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+commands:
+- az_monitor_app-insights_api-key
+- az_monitor_app-insights_api-key_create
+- az_monitor_app-insights_api-key_delete
+- az_monitor_app-insights_api-key_show
+- az_monitor_app-insights_component
+- az_monitor_app-insights_component_billing
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+- az_monitor_app-insights_component_connect-webapp
+- az_monitor_app-insights_component_continues-export
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+- az_monitor_app-insights_component_create
+- az_monitor_app-insights_component_delete
+- az_monitor_app-insights_component_linked-storage
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+- az_monitor_app-insights_component_show
+- az_monitor_app-insights_component_update
+- az_monitor_app-insights_component_update-tags
+- az_monitor_app-insights_events
+- az_monitor_app-insights_events_show
+- az_monitor_app-insights_metrics
+- az_monitor_app-insights_metrics_get-metadata
+- az_monitor_app-insights_metrics_show
+- az_monitor_app-insights_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for querying data in Application Insights applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/api-key.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/api-key.yml
new file mode 100644
index 0000000000..ba8aa7e636
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/api-key.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_api-key
+name: az monitor app-insights api-key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights api-key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Operations on API keys associated with an Application Insights component.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_api-key_create
+  name: az monitor app-insights api-key create
+  summary: Create a new API key for use with an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights api-key create --api-key
+                                           --app
+                                           --resource-group
+                                           [--read-properties]
+                                           [--write-properties]
+  examples:
+  - summary: Create a component with kind web and location.
+    syntax: az monitor app-insights api-key create --api-key cli-demo --read-properties ReadTelemetry --write-properties WriteAnnotations -g demoRg --app testApp
+  - summary: Create a component with kind web and location without any permission
+    syntax: az monitor app-insights api-key create --api-key cli-demo --read-properties '""' --write-properties '""' -g demoRg --app testApp
+  requiredParameters:
+  - isRequired: true
+    name: --api-key
+    summary: Name of the API key to create.
+    description: ''
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --read-properties
+    summary: A space seperated list of names of read Roles for this API key to inherit.
+    description: ''
+  - name: --write-properties
+    summary: A space seperated list of names of write Roles for this API key to inherit.
+    description: ''
+- uid: az_monitor_app-insights_api-key_delete
+  name: az monitor app-insights api-key delete
+  summary: Delete an API key from an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights api-key delete --api-key
+                                           --app
+                                           --resource-group
+  examples:
+  - summary: Delete API Key.
+    syntax: az monitor app-insights api-key delete --app demoApp -g demoRg --api-key demo-key
+  requiredParameters:
+  - isRequired: true
+    name: --api-key
+    summary: Name of the API key to delete. Can be found using `api-key show`.
+    description: ''
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_api-key_show
+  name: az monitor app-insights api-key show
+  summary: Get all keys or a specific API key associated with an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights api-key show --app
+                                         --resource-group
+                                         [--api-key]
+  examples:
+  - summary: Fetch API Key.
+    syntax: az monitor app-insights api-key show --app demoApp -g demoRg --api-key demo-key
+  - summary: Fetch API Keys.
+    syntax: az monitor app-insights api-key show --app demoApp -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --api-key
+    summary: Name of the API key to fetch. Can be found using `api-key show`.
+    description: ''
+commands:
+- az_monitor_app-insights_api-key_create
+- az_monitor_app-insights_api-key_delete
+- az_monitor_app-insights_api-key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Operations on API keys associated with an Application Insights component.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component.yml
new file mode 100644
index 0000000000..1413785b33
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component
+name: az monitor app-insights component
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage an Application Insights component or its subcomponents.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_connect-webapp
+  name: az monitor app-insights component connect-webapp
+  summary: Connect AI to a web app.
+  description: ''
+  syntax: >-
+    az monitor app-insights component connect-webapp --name
+                                                     --resource-group
+                                                     [--enable-debugger {false, true}]
+                                                     [--enable-profiler {false, true}]
+  examples:
+  - summary: Connect AI to a web app and enable both profiler and snapshot debugger for the web app.
+    syntax: az monitor app-insights component connect-webapp -g myRG -n myApp --enable-profiler --enable-snapshot-debugger
+  - summary: Connect AI to a web app using resource id and enable profiler and disable snapshot debugger for the web app.
+    syntax: az monitor app-insights component connect-webapp --ids /subscriptions/mySub/resourceGroups/myRG/providers/Microsoft.Web/sites/myApp --enable-profiler --enable-snapshot-debugger false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the web app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-debugger --enable-snapshot-debugger
+    parameterValueGroup: false, true
+    summary: Enable snapshot debugger when an exception is thrown. Currently it is only supported for .NET/.NET Core Web Apps.
+    description: ''
+  - name: --enable-profiler
+    parameterValueGroup: false, true
+    summary: Enable collecting profiling traces that help you see where time is spent in code. Currently it is only supported for .NET/.NET Core Web Apps.
+    description: ''
+- uid: az_monitor_app-insights_component_create
+  name: az monitor app-insights component create
+  summary: Create a new Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component create --app
+                                             --location
+                                             --resource-group
+                                             [--application-type]
+                                             [--ingestion-access {Disabled, Enabled}]
+                                             [--kind]
+                                             [--query-access {Disabled, Enabled}]
+                                             [--retention-time]
+                                             [--tags]
+                                             [--workspace]
+  examples:
+  - summary: Create a component with kind web and location.
+    syntax: az monitor app-insights component create --app demoApp --location westus2 --kind web -g demoRg --application-type web --retention-time 120
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-type
+    defaultValue: web
+    summary: Type of application being monitored.
+    description: ''
+  - name: --ingestion-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights ingestion.
+    description: ''
+  - name: --kind -k
+    defaultValue: web
+    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
+    description: ''
+  - name: --query-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights query.
+    description: ''
+  - name: --retention-time
+    summary: 'Retention in days for Application Insights. The value can be one of the following values: 30,60,90,120,180,270,365,550,730. It can be set only when Application Insights is not connected to a Log Analytics workspace.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --workspace
+    summary: Name or resource ID of a log analytics workspace.
+    description: ''
+- uid: az_monitor_app-insights_component_delete
+  name: az monitor app-insights component delete
+  summary: Delete a new Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component delete --app
+                                             --resource-group
+  examples:
+  - summary: Delete a component with kind web and location.
+    syntax: az monitor app-insights component delete --app demoApp -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_show
+  name: az monitor app-insights component show
+  summary: Get an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component show [--app]
+                                           [--resource-group]
+  examples:
+  - summary: Get a component by name.
+    syntax: az monitor app-insights component show --app demoApp -g demoRg
+  - summary: List components in a resource group.
+    syntax: az monitor app-insights component show -g demoRg
+  - summary: List components in the currently selected subscription.
+    syntax: az monitor app-insights component show
+  optionalParameters:
+  - name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_update
+  name: az monitor app-insights component update
+  summary: Update properties on an existing Application Insights resource. The primary value which can be updated is kind, which customizes the UI experience.
+  description: ''
+  syntax: >-
+    az monitor app-insights component update --app
+                                             --resource-group
+                                             [--ingestion-access {Disabled, Enabled}]
+                                             [--kind]
+                                             [--query-access {Disabled, Enabled}]
+                                             [--retention-time]
+                                             [--workspace]
+  examples:
+  - summary: Update a component with kind web.
+    syntax: az monitor app-insights component update --app demoApp -k web -g demoRg --retention-time 120
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --ingestion-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights ingestion.
+    description: ''
+  - name: --kind -k
+    summary: The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of web, ios, other, store, java, phone.
+    description: ''
+  - name: --query-access
+    parameterValueGroup: Disabled, Enabled
+    summary: The public network access type for accessing Application Insights query.
+    description: ''
+  - name: --retention-time
+    summary: 'Retention in days for Application Insights. The value can be one of the following values: 30,60,90,120,180,270,365,550,730. It can be set only when Application Insights is not connected to a Log Analytics workspace.'
+    description: ''
+  - name: --workspace
+    summary: Name or resource ID of a log analytics workspace.
+    description: ''
+- uid: az_monitor_app-insights_component_update-tags
+  name: az monitor app-insights component update-tags
+  summary: Update tags on an existing Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component update-tags --app
+                                                  --resource-group
+                                                  --tags
+  examples:
+  - summary: Update the tag 'name' to equal 'value'.
+    syntax: az monitor app-insights component update-tags --app demoApp --tags name=value -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_monitor_app-insights_component_billing
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+- az_monitor_app-insights_component_connect-webapp
+- az_monitor_app-insights_component_continues-export
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+- az_monitor_app-insights_component_create
+- az_monitor_app-insights_component_delete
+- az_monitor_app-insights_component_linked-storage
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+- az_monitor_app-insights_component_show
+- az_monitor_app-insights_component_update
+- az_monitor_app-insights_component_update-tags
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage an Application Insights component or its subcomponents.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/billing.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/billing.yml
new file mode 100644
index 0000000000..63111d2975
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/billing.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component_billing
+name: az monitor app-insights component billing
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component billing** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage an Application Insights component billing features.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_billing_show
+  name: az monitor app-insights component billing show
+  summary: Show the billing features of an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component billing show --app
+                                                   --resource-group
+  examples:
+  - summary: Show the billing features of an application insights component
+    syntax: az monitor app-insights component billing show --app demoApp -g demoRg
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_billing_update
+  name: az monitor app-insights component billing update
+  summary: Update the billing features of an Application Insights resource.
+  description: ''
+  syntax: >-
+    az monitor app-insights component billing update --app
+                                                     --resource-group
+                                                     [--cap]
+                                                     [--stop {false, true}]
+  examples:
+  - summary: Update the daily cap of the billing features
+    syntax: az monitor app-insights component billing update --app demoApp -g demoRg --cap 200 --stop
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cap
+    summary: Daily data volume cap in GB.
+    description: ''
+  - name: --stop -s
+    parameterValueGroup: false, true
+    summary: Do not send a notification email when the daily data volume cap is met.
+    description: ''
+commands:
+- az_monitor_app-insights_component_billing_show
+- az_monitor_app-insights_component_billing_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage an Application Insights component billing features.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/continues-export.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/continues-export.yml
new file mode 100644
index 0000000000..216f8c9750
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/continues-export.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component_continues-export
+name: az monitor app-insights component continues-export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component continues-export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Continuous Export configurations for an Application Insights component.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_continues-export_create
+  name: az monitor app-insights component continues-export create
+  summary: Create a Continuous Export configuration for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export create --app
+                                                              --dest-account
+                                                              --dest-container
+                                                              --dest-sas
+                                                              --dest-sub-id
+                                                              --record-types {Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests}
+                                                              --resource-group
+                                                              [--dest-type {Blob}]
+                                                              [--is-enabled {false, true}]
+  examples:
+  - summary: Create a Continuous Export configuration.
+    syntax: >-
+      az monitor app-insights component continues-export create -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --record-types Requests Event Exceptions Metrics PageViews \
+
+      --dest-account account --dest-container container --dest-sub-id sub-id \
+
+      --dest-sas se=2020-10-27&sp=w&sv=2018-11-09&sr=c
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --dest-account
+    summary: The name of destination storage account.
+    description: ''
+  - isRequired: true
+    name: --dest-container
+    summary: The name of the destination storage container.
+    description: ''
+  - isRequired: true
+    name: --dest-sas
+    summary: The SAS token for the destination storage container. It must grant write permission.
+    description: ''
+  - isRequired: true
+    name: --dest-sub-id
+    summary: The subscription ID of the destination storage account.
+    description: ''
+  - isRequired: true
+    name: --record-types
+    parameterValueGroup: Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests
+    summary: The document types to be exported, as comma separated values. Allowed values include 'Requests', 'Event', 'Exceptions', 'Metrics', 'PageViews', 'PageViewPerformance', 'Rdd', 'PerformanceCounters', 'Availability', 'Messages'.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dest-type
+    defaultValue: Blob
+    parameterValueGroup: Blob
+    summary: The Continuous Export destination type. This has to be 'Blob'.
+    description: ''
+  - name: --is-enabled
+    defaultValue: "true"
+    parameterValueGroup: false, true
+    summary: Set to 'true' to create a Continuous Export configuration as enabled, otherwise set it to 'false'.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_delete
+  name: az monitor app-insights component continues-export delete
+  summary: Delete a specific Continuous Export configuration of an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export delete --app
+                                                              --id
+                                                              --resource-group
+                                                              [--yes]
+  examples:
+  - summary: Delete a Continuous Export configuration by ID.
+    syntax: >-
+      az monitor app-insights component continues-export delete -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --id
+    summary: The Continuous Export configuration ID. This is unique within a Application Insights component.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_list
+  name: az monitor app-insights component continues-export list
+  summary: List Continuous Export configurations for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export list --app
+                                                            --resource-group
+  examples:
+  - summary: ExportConfigurationsList
+    syntax: >-
+      az monitor app-insights component continues-export list -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_show
+  name: az monitor app-insights component continues-export show
+  summary: Get a specific Continuous Export configuration of an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export show --app
+                                                            --id
+                                                            --resource-group
+  examples:
+  - summary: Get a Continuous Export configuration by ID.
+    syntax: >-
+      az monitor app-insights component continues-export show -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --id
+    summary: The Continuous Export configuration ID. This is unique within a Application Insights component.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_continues-export_update
+  name: az monitor app-insights component continues-export update
+  summary: Update a Continuous Export configuration for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component continues-export update --app
+                                                              --id
+                                                              --resource-group
+                                                              [--dest-account]
+                                                              [--dest-container]
+                                                              [--dest-sas]
+                                                              [--dest-sub-id]
+                                                              [--dest-type {Blob}]
+                                                              [--is-enabled {false, true}]
+                                                              [--record-types {Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests}]
+  examples:
+  - summary: Update a Continuous Export configuration record-types.
+    syntax: >-
+      az monitor app-insights component continues-export update -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid \
+
+      --record-types Requests Event Exceptions Metrics PageViews
+  - summary: Update a Continuous Export configuration storage destination.
+    syntax: >-
+      az monitor app-insights component continues-export update -g rg \
+
+      --app 578f0e27-12e9-4631-bc02-50b965da2633 \
+
+      --id exportid \
+
+      --dest-account account --dest-container container --dest-sub-id sub-id \
+
+      --dest-sas se=2020-10-27&sp=w&sv=2018-11-09&sr=c
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --id
+    summary: The Continuous Export configuration ID. This is unique within a Application Insights component.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dest-account
+    summary: The name of destination storage account.
+    description: ''
+  - name: --dest-container
+    summary: The name of the destination storage container.
+    description: ''
+  - name: --dest-sas
+    summary: The SAS token for the destination storage container. It must grant write permission.
+    description: ''
+  - name: --dest-sub-id
+    summary: The subscription ID of the destination storage account.
+    description: ''
+  - name: --dest-type
+    parameterValueGroup: Blob
+    summary: The Continuous Export destination type. This has to be 'Blob'.
+    description: ''
+  - name: --is-enabled
+    parameterValueGroup: false, true
+    summary: Set to 'true' to create a Continuous Export configuration as enabled, otherwise set it to 'false'.
+    description: ''
+  - name: --record-types
+    parameterValueGroup: Availability, Event, Exceptions, Messages, Metrics, PageViewPerformance, PageViews, PerformanceCounters, Rdd, Requests
+    summary: The document types to be exported, as comma separated values. Allowed values include 'Requests', 'Event', 'Exceptions', 'Metrics', 'PageViews', 'PageViewPerformance', 'Rdd', 'PerformanceCounters', 'Availability', 'Messages'.
+    description: ''
+commands:
+- az_monitor_app-insights_component_continues-export_create
+- az_monitor_app-insights_component_continues-export_delete
+- az_monitor_app-insights_component_continues-export_list
+- az_monitor_app-insights_component_continues-export_show
+- az_monitor_app-insights_component_continues-export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Continuous Export configurations for an Application Insights component.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/linked-storage.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/linked-storage.yml
new file mode 100644
index 0000000000..af92c32aa7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/component/linked-storage.yml
@@ -0,0 +1,106 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_component_linked-storage
+name: az monitor app-insights component linked-storage
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights component linked-storage** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage linked storage account for an Application Insights component.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_component_linked-storage_link
+  name: az monitor app-insights component linked-storage link
+  summary: Link a storage account with an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage link --app
+                                                          --resource-group
+                                                          --storage-account
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-account -s
+    summary: Name or ID of a linked storage account.
+    description: ''
+- uid: az_monitor_app-insights_component_linked-storage_show
+  name: az monitor app-insights component linked-storage show
+  summary: Show the details of linked storage account for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage show --app
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_linked-storage_unlink
+  name: az monitor app-insights component linked-storage unlink
+  summary: Unlink a storage account with an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage unlink --app
+                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_component_linked-storage_update
+  name: az monitor app-insights component linked-storage update
+  summary: Update the linked storage account for an Application Insights component.
+  description: ''
+  syntax: >-
+    az monitor app-insights component linked-storage update --app
+                                                            --resource-group
+                                                            --storage-account
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-account -s
+    summary: Name or ID of a linked storage account.
+    description: ''
+commands:
+- az_monitor_app-insights_component_linked-storage_link
+- az_monitor_app-insights_component_linked-storage_show
+- az_monitor_app-insights_component_linked-storage_unlink
+- az_monitor_app-insights_component_linked-storage_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage linked storage account for an Application Insights component.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/events.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/events.yml
new file mode 100644
index 0000000000..cc9cae880a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/events.yml
@@ -0,0 +1,72 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_events
+name: az monitor app-insights events
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights events** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Retrieve events from an application.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_events_show
+  name: az monitor app-insights events show
+  summary: List events by type or view a single event from an application, specified by type and ID.
+  description: ''
+  syntax: >-
+    az monitor app-insights events show --app
+                                        --type
+                                        [--end-time]
+                                        [--event]
+                                        [--offset]
+                                        [--resource-group]
+                                        [--start-time]
+  examples:
+  - summary: Get an availability result by ID.
+    syntax: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --event b2cf08df-bf42-4278-8d2c-5b55f85901fe
+  - summary: List availability results from the last 24 hours.
+    syntax: az monitor app-insights events show --app 578f0e27-12e9-4631-bc02-50b965da2633 --type availabilityResults --offset 24h
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: The type of events to retrieve.
+    description: ''
+  optionalParameters:
+  - name: --end-time
+    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --event
+    summary: GUID of the event to retrieve. This could be obtained by first listing and filtering events, then selecting an event of interest.
+    description: ''
+  - name: --offset
+    defaultValue: 1h
+    summary: 'Time offset of the query range, in ##d##h format.'
+    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start-time
+    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+commands:
+- az_monitor_app-insights_events_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Retrieve events from an application.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/metrics.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/metrics.yml
new file mode 100644
index 0000000000..bfdc02d42d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/app-insights/metrics.yml
@@ -0,0 +1,110 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_app-insights_metrics
+name: az monitor app-insights metrics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **application-insights** extension for Azure CLI and requires version 2.0.79 or higher.  The extension will automatically install the first time you run an **az monitor app-insights metrics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Retrieve metrics from an application.
+description: ''
+directCommands:
+- uid: az_monitor_app-insights_metrics_get-metadata
+  name: az monitor app-insights metrics get-metadata
+  summary: Get the metadata for metrics on a particular application.
+  description: ''
+  syntax: >-
+    az monitor app-insights metrics get-metadata --app
+                                                 [--resource-group]
+  examples:
+  - summary: Views the metadata for the provided app.
+    syntax: az monitor app-insights metrics get-metadata --app e292531c-eb03-4079-9bb0-fe6b56b99f8b
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_app-insights_metrics_show
+  name: az monitor app-insights metrics show
+  summary: View the value of a single metric.
+  description: ''
+  syntax: >-
+    az monitor app-insights metrics show --app
+                                         --metrics
+                                         [--aggregation]
+                                         [--end-time]
+                                         [--filter]
+                                         [--interval]
+                                         [--offset]
+                                         [--orderby]
+                                         [--resource-group]
+                                         [--segment]
+                                         [--start-time]
+                                         [--top]
+  examples:
+  - summary: View the count of availabilityResults events.
+    syntax: az monitor app-insights metrics show --app e292531c-eb03-4079-9bb0-fe6b56b99f8b --metric availabilityResults/count
+  requiredParameters:
+  - isRequired: true
+    name: --app -a
+    summary: GUID, app name, or fully-qualified Azure resource name of Application Insights component. The application GUID may be acquired from the API Access menu item on any Application Insights resource in the Azure portal. If using an application name, please specify resource group.
+    description: ''
+  - isRequired: true
+    name: --metrics -m
+    summary: The metric to retrieve. May be either a standard AI metric or an application-specific custom metric.
+    description: ''
+  optionalParameters:
+  - name: --aggregation
+    summary: The aggregation to use when computing the metric values. To retrieve more than one aggregation at a time, separate them with a comma. If no aggregation is specified, then the default aggregation for the metric is used.
+    description: ''
+  - name: --end-time
+    summary: 'End of time range for current operation. Defaults to the current time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --filter
+    summary: An expression used to filter the results.  This value should be a valid OData filter expression where the keys of each clause should be applicable dimensions for the metric you are retrieving.
+    description: ''
+  - name: --interval
+    summary: 'The interval over which to aggregate metrics, in ##h##m format.'
+    description: ''
+  - name: --offset
+    defaultValue: 1h
+    summary: 'Time offset of the query range, in ##d##h format.'
+    description: Can be used with either --start-time or --end-time. If used with --start-time, then the end time will be calculated by adding the offset. If used with --end-time (default), then the start time will be calculated by subtracting the offset. If --start-time and --end-time are provided, then --offset will be ignored.
+  - name: --orderby
+    summary: The aggregation function and direction to sort the segments by.  This value is only valid when segment is specified.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --segment
+    summary: The name of the dimension to segment the metric values by. This dimension must be applicable to the metric you are retrieving. To segment by more than one dimension at a time, separate them with a comma (,). In this case, the metric data will be segmented in the order the dimensions are listed in the parameter.
+    description: ''
+  - name: --start-time
+    summary: 'Start-time of time range for which to retrieve data. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  - name: --top
+    summary: The number of segments to return.  This value is only valid when segment is specified.
+    description: ''
+commands:
+- az_monitor_app-insights_metrics_get-metadata
+- az_monitor_app-insights_metrics_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Retrieve metrics from an application.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection.yml
new file mode 100644
index 0000000000..d68f425b2e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection
+name: az monitor data-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data collection for monitor control service.
+description: ''
+commands:
+- az_monitor_data-collection_rule
+- az_monitor_data-collection_rule_association
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+- az_monitor_data-collection_rule_create
+- az_monitor_data-collection_rule_data-flow
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+- az_monitor_data-collection_rule_delete
+- az_monitor_data-collection_rule_list
+- az_monitor_data-collection_rule_log-analytics
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+- az_monitor_data-collection_rule_performance-counter
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+- az_monitor_data-collection_rule_show
+- az_monitor_data-collection_rule_syslog
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+- az_monitor_data-collection_rule_update
+- az_monitor_data-collection_rule_windows-event-log
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data collection for monitor control service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule.yml
new file mode 100644
index 0000000000..c8bb4376ee
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule.yml
@@ -0,0 +1,365 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule
+name: az monitor data-collection rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data collection rule for monitor control service.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_create
+  name: az monitor data-collection rule create
+  summary: Create a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule create --name
+                                           --resource-group
+                                           [--data-flows]
+                                           [--description]
+                                           [--extensions]
+                                           [--location]
+                                           [--log-analytics]
+                                           [--monitor-metrics]
+                                           [--performance-counters]
+                                           [--syslog]
+                                           [--tags]
+                                           [--windows-event-logs]
+  examples:
+  - summary: Create data collection rule
+    syntax: az monitor data-collection rule create --resource-group "myResourceGroup" --location "eastus" --name "myCollectionRule" --data-flows destinations="centralWorkspace" streams="Microsoft-Perf" streams="Microsoft-Syslog" streams="Microsoft-WindowsEvent" --log-analytics name="centralWorkspace" resource-id="/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace" --performance-counters name="cloudTeamCoreCounters" counter-specifiers="\\Processor(_Total)\\% Processor Time" counter-specifiers="\\Memory\\Committed Bytes" counter-specifiers="\\LogicalDisk(_Total)\\Free Megabytes" counter-specifiers="\\PhysicalDisk(_Total)\\Avg. Disk Queue Length" sampling-frequency=15 transfer-period="PT1M" streams="Microsoft-Perf" --performance-counters name="appTeamExtraCounters" counter-specifiers="\\Process(_Total)\\Thread Count" sampling-frequency=30 transfer-period="PT5M" streams="Microsoft-Perf" --syslog name="cronSyslog" facility-names="cron" log-levels="Debug" log-levels="Critical" log-levels="Emergency" streams="Microsoft-Syslog" --syslog name="syslogBase" facility-names="syslog" log-levels="Alert" log-levels="Critical" log-levels="Emergency" streams="Microsoft-Syslog" --windows-event-logs name="cloudSecurityTeamEvents" transfer-period="PT1M" streams="Microsoft-WindowsEvent" x-path-queries="Security!" --windows-event-logs name="appTeam1AppEvents" transfer-period="PT5M" streams="Microsoft-WindowsEvent" x-path-queries="System![System[(Level = 1 or Level = 2 or Level = 3)]]" x-path-queries="Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-flows
+    summary: The specification of data flows.
+    description: >-
+      Usage: --data-flows streams=XX1 streams=XX2 destinations=XX1 destinations=XX2
+
+
+      streams: Required. List of streams for this data flow.
+
+      destinations: Required. List of destinations for this data flow.
+
+
+      Multiple actions can be specified by using more than one --data-flows argument.
+  - name: --description
+    summary: Description of the data collection rule.
+    description: ''
+  - name: --extensions
+    summary: 'The list of Azure VM extension data source configurations. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-analytics
+    summary: List of Log Analytics destinations.
+    description: >-
+      Usage: --log-analytics resource-id=XX name=XX
+
+
+      resource-id: Required. The resource ID of the Log Analytics workspace.
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --log-analytics argument.
+  - name: --monitor-metrics
+    summary: Azure Monitor Metrics destination.
+    description: >-
+      Usage: --monitor-metrics name=XX
+
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+  - name: --performance-counters
+    summary: The list of performance counter data source configurations.
+    description: >-
+      Usage: --performance-counters streams=XX1 streams=XX2 transfer-period=XX sampling-frequency=XX counter-specifiers=XX1 counter-specifiers=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      sampling-frequency: Required. The number of seconds between consecutive counter measurements (samples).
+
+      counter-specifiers: Required. A list of specifier names of the performance counters you want to collect. Use a wildcard (*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --performance-counters argument.
+  - name: --syslog
+    summary: The list of Syslog data source configurations.
+    description: >-
+      Usage: --syslog streams=XX1 streams=XX2 facility-names=XX1 facility-names=XX2 log-levels=XX1 log-levels=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      facility-names: Required. The list of facility names.
+
+      log-levels: The log levels to collect.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --syslog argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --windows-event-logs
+    summary: The list of Windows Event Log data source configurations.
+    description: >-
+      Usage: --windows-event-logs streams=XX1 streams=XX2 transfer-period=XX x-path-queries=XX1 x-path-queries=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      x-path-queries: Required. A list of Windows Event Log queries in XPATH format.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --windows-event-logs argument.
+- uid: az_monitor_data-collection_rule_delete
+  name: az monitor data-collection rule delete
+  summary: Deletes a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule delete --name
+                                           --resource-group
+                                           [--yes]
+  examples:
+  - summary: Delete data collection rule
+    syntax: az monitor data-collection rule delete --name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_data-collection_rule_list
+  name: az monitor data-collection rule list
+  summary: List all data collection rules in the specified resource group. And Lists all data collection rules in the specified subscription.
+  description: ''
+  syntax: az monitor data-collection rule list [--resource-group]
+  examples:
+  - summary: List data collection rules by resource group
+    syntax: az monitor data-collection rule list --resource-group "myResourceGroup"
+  - summary: List data collection rules by subscription
+    syntax: az monitor data-collection rule list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_data-collection_rule_show
+  name: az monitor data-collection rule show
+  summary: Return the specified data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule show --name
+                                         --resource-group
+  examples:
+  - summary: Get data collection rule
+    syntax: az monitor data-collection rule show --name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_data-collection_rule_update
+  name: az monitor data-collection rule update
+  summary: Update a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule update --name
+                                           --resource-group
+                                           [--data-flows]
+                                           [--description]
+                                           [--extensions]
+                                           [--log-analytics]
+                                           [--monitor-metrics]
+                                           [--performance-counters]
+                                           [--syslog]
+                                           [--tags]
+                                           [--windows-event-logs]
+  examples:
+  - summary: Update data collection rule
+    syntax: az monitor data-collection rule update --resource-group "myResourceGroup" --name "myCollectionRule" --data-flows destinations="centralWorkspace" streams="Microsoft-Perf" streams="Microsoft-Syslog" streams="Microsoft-WindowsEvent" --log-analytics name="centralWorkspace" resource-id="/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/centralTeamWorkspace" --performance-counters name="appTeamExtraCounters" counter-specifiers="\\Process(_Total)\\Thread Count" sampling-frequency=30 transfer-period="PT5M" streams="Microsoft-Perf" --syslog name="cronSyslog" facility-names="cron" log-levels="Debug" log-levels="Critical" log-levels="Emergency" streams="Microsoft-Syslog" --windows-event-logs name="cloudSecurityTeamEvents" transfer-period="PT1M" streams="Microsoft-WindowsEvent" x-path-queries="Security!"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-flows
+    summary: The specification of data flows.
+    description: >-
+      Usage: --data-flows streams=XX1 streams=XX2 destinations=XX1 destinations=XX2
+
+
+      streams: Required. List of streams for this data flow.
+
+      destinations: Required. List of destinations for this data flow.
+
+
+      Multiple actions can be specified by using more than one --data-flows argument.
+  - name: --description
+    summary: Description of the data collection rule.
+    description: ''
+  - name: --extensions
+    summary: 'The list of Azure VM extension data source configurations. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --log-analytics
+    summary: List of Log Analytics destinations.
+    description: >-
+      Usage: --log-analytics resource-id=XX name=XX
+
+
+      resource-id: Required. The resource ID of the Log Analytics workspace.
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --log-analytics argument.
+  - name: --monitor-metrics
+    summary: Azure Monitor Metrics destination.
+    description: >-
+      Usage: --monitor-metrics name=XX
+
+
+      name: Required. A friendly name for the destination.  This name should be unique across all destinations (regardless of type) within the data collection rule.
+  - name: --performance-counters
+    summary: The list of performance counter data source configurations.
+    description: >-
+      Usage: --performance-counters streams=XX1 streams=XX2 transfer-period=XX sampling-frequency=XX counter-specifiers=XX1 counter-specifiers=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      sampling-frequency: Required. The number of seconds between consecutive counter measurements (samples).
+
+      counter-specifiers: Required. A list of specifier names of the performance counters you want to collect. Use a wildcard (*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --performance-counters argument.
+  - name: --syslog
+    summary: The list of Syslog data source configurations.
+    description: >-
+      Usage: --syslog streams=XX1 streams=XX2 facility-names=XX1 facility-names=XX2 log-levels=XX1 log-levels=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      facility-names: Required. The list of facility names.
+
+      log-levels: The log levels to collect.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --syslog argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --windows-event-logs
+    summary: The list of Windows Event Log data source configurations.
+    description: >-
+      Usage: --windows-event-logs streams=XX1 streams=XX2 transfer-period=XX x-path-queries=XX1 x-path-queries=XX2 name=XX
+
+
+      streams: Required. List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+
+      transfer-period: Required. The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+
+      x-path-queries: Required. A list of Windows Event Log queries in XPATH format.
+
+      name: Required. A friendly name for the data source.  This name should be unique across all data sources (regardless of type) within the data collection rule.
+
+
+      Multiple actions can be specified by using more than one --windows-event-logs argument.
+commands:
+- az_monitor_data-collection_rule_association
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+- az_monitor_data-collection_rule_create
+- az_monitor_data-collection_rule_data-flow
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+- az_monitor_data-collection_rule_delete
+- az_monitor_data-collection_rule_list
+- az_monitor_data-collection_rule_log-analytics
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+- az_monitor_data-collection_rule_performance-counter
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+- az_monitor_data-collection_rule_show
+- az_monitor_data-collection_rule_syslog
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+- az_monitor_data-collection_rule_update
+- az_monitor_data-collection_rule_windows-event-log
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data collection rule for monitor control service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/association.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/association.yml
new file mode 100644
index 0000000000..d145962db5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/association.yml
@@ -0,0 +1,155 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_association
+name: az monitor data-collection rule association
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule association** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data collection rule association for monitor control service.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_association_create
+  name: az monitor data-collection rule association create
+  summary: Create an association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association create --name
+                                                       --resource
+                                                       [--description]
+                                                       [--rule-id]
+  examples:
+  - summary: Create association
+    syntax: az monitor data-collection rule association create --name "myAssociation" --rule-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Insights/dataCollectionRules/myCollectionRule" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the association.
+    description: ''
+  - name: --rule-id
+    summary: The resource ID of the data collection rule that is to be associated.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_delete
+  name: az monitor data-collection rule association delete
+  summary: Delete an association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association delete --name
+                                                       --resource
+                                                       [--yes]
+  examples:
+  - summary: Delete association
+    syntax: az monitor data-collection rule association delete --name "myAssociation" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_list
+  name: az monitor data-collection rule association list
+  summary: List associations for the specified data collection rule. And Lists associations for the specified resource.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association list [--resource]
+                                                     [--resource-group]
+                                                     [--rule-name]
+  examples:
+  - summary: List associations for specified data collection rule
+    syntax: az monitor data-collection rule association list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  - summary: List associations for specified resource
+    syntax: az monitor data-collection rule association list --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  optionalParameters:
+  - name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_show
+  name: az monitor data-collection rule association show
+  summary: Return the specified association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association show --name
+                                                     --resource
+  examples:
+  - summary: Get association
+    syntax: az monitor data-collection rule association show --name "myAssociation" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+- uid: az_monitor_data-collection_rule_association_update
+  name: az monitor data-collection rule association update
+  summary: Update an association.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule association update --name
+                                                       --resource
+                                                       [--description]
+                                                       [--rule-id]
+  examples:
+  - summary: Update association
+    syntax: az monitor data-collection rule association update --name "myAssociation" --rule-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Insights/dataCollectionRules/myCollectionRule" --resource "subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVm"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the association.
+    description: ''
+  - isRequired: true
+    name: --resource
+    summary: The identifier of the resource.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the association.
+    description: ''
+  - name: --rule-id
+    summary: The resource ID of the data collection rule that is to be associated.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_association_create
+- az_monitor_data-collection_rule_association_delete
+- az_monitor_data-collection_rule_association_list
+- az_monitor_data-collection_rule_association_show
+- az_monitor_data-collection_rule_association_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data collection rule association for monitor control service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/data-flow.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/data-flow.yml
new file mode 100644
index 0000000000..3131f92e1d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/data-flow.yml
@@ -0,0 +1,79 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_data-flow
+name: az monitor data-collection rule data-flow
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule data-flow** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage data flows.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_data-flow_add
+  name: az monitor data-collection rule data-flow add
+  summary: Add a data flow.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule data-flow add --destinations
+                                                  --resource-group
+                                                  --rule-name
+                                                  --streams {Microsoft-AntiMalwareStatus, Microsoft-Auditd, Microsoft-CISCOASA, Microsoft-CommonSecurityLog, Microsoft-ComputerGroup, Microsoft-Event, Microsoft-FirewallLog, Microsoft-HealthStateChange, Microsoft-Heartbeat, Microsoft-InsightsMetrics, Microsoft-OperationLog, Microsoft-Perf, Microsoft-ProcessInvestigator, Microsoft-ProtectionStatus, Microsoft-RomeDetectionEvent, Microsoft-SecurityBaseline, Microsoft-SecurityBaselineSummary, Microsoft-SecurityEvent, Microsoft-Syslog, Microsoft-WindowsEvent}
+  examples:
+  - summary: Add a data flow
+    syntax: az monitor data-collection rule data-flow add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --destinations XX3 XX4 --streams "Microsoft-Perf" "Microsoft-WindowsEvent"
+  requiredParameters:
+  - isRequired: true
+    name: --destinations
+    summary: List of destinations for this data flow.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-AntiMalwareStatus, Microsoft-Auditd, Microsoft-CISCOASA, Microsoft-CommonSecurityLog, Microsoft-ComputerGroup, Microsoft-Event, Microsoft-FirewallLog, Microsoft-HealthStateChange, Microsoft-Heartbeat, Microsoft-InsightsMetrics, Microsoft-OperationLog, Microsoft-Perf, Microsoft-ProcessInvestigator, Microsoft-ProtectionStatus, Microsoft-RomeDetectionEvent, Microsoft-SecurityBaseline, Microsoft-SecurityBaselineSummary, Microsoft-SecurityEvent, Microsoft-Syslog, Microsoft-WindowsEvent
+    summary: List of streams for this data flow.
+    description: ''
+- uid: az_monitor_data-collection_rule_data-flow_list
+  name: az monitor data-collection rule data-flow list
+  summary: List data flows.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule data-flow list --resource-group
+                                                   --rule-name
+  examples:
+  - summary: List data flows
+    syntax: az monitor data-collection rule data-flow list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_data-flow_add
+- az_monitor_data-collection_rule_data-flow_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage data flows.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/log-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/log-analytics.yml
new file mode 100644
index 0000000000..9ffbd9e480
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/log-analytics.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_log-analytics
+name: az monitor data-collection rule log-analytics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule log-analytics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Log Analytics destinations.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_log-analytics_add
+  name: az monitor data-collection rule log-analytics add
+  summary: Add Log Analytics destinations of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics add --name
+                                                      --resource-group
+                                                      --resource-id
+                                                      --rule-name
+  examples:
+  - summary: Add Log Analytics destinations of a data collection rule
+    syntax: az monitor data-collection rule log-analytics add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "workspace2" --resource-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/workspace2"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: The resource ID of the Log Analytics workspace.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_delete
+  name: az monitor data-collection rule log-analytics delete
+  summary: Delete a Log Analytics destinations of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics delete --name
+                                                         --resource-group
+                                                         --rule-name
+  examples:
+  - summary: Delete a Log Analytics destinations of a data collection rule
+    syntax: az monitor data-collection rule log-analytics delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "workspace2"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_list
+  name: az monitor data-collection rule log-analytics list
+  summary: List Log Analytics destinations of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics list --resource-group
+                                                       --rule-name
+  examples:
+  - summary: List Log Analytics destinations of a data collection rule
+    syntax: az monitor data-collection rule log-analytics list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_show
+  name: az monitor data-collection rule log-analytics show
+  summary: Show a Log Analytics destination of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics show --name
+                                                       --resource-group
+                                                       --rule-name
+  examples:
+  - summary: Show a Log Analytics destination of a data collection rule
+    syntax: az monitor data-collection rule log-analytics show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "centralWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_log-analytics_update
+  name: az monitor data-collection rule log-analytics update
+  summary: Update a Log Analytics destination of a data collection rule.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule log-analytics update --name
+                                                         --resource-group
+                                                         --rule-name
+                                                         [--resource-id]
+  examples:
+  - summary: Update a Log Analytics destination of a data collection rule
+    syntax: az monitor data-collection rule log-analytics update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "workspace2" --resource-id "/subscriptions/703362b3-f278-4e4b-9179-c76eaf41ffc2/resourceGroups/myResourceGroup/providers/Microsoft.OperationalInsights/workspaces/anotherWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the destination. This name should be unique across all destinations (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --resource-id
+    summary: The resource ID of the Log Analytics workspace.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_log-analytics_add
+- az_monitor_data-collection_rule_log-analytics_delete
+- az_monitor_data-collection_rule_log-analytics_list
+- az_monitor_data-collection_rule_log-analytics_show
+- az_monitor_data-collection_rule_log-analytics_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Log Analytics destinations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/performance-counter.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/performance-counter.yml
new file mode 100644
index 0000000000..a36b805297
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/performance-counter.yml
@@ -0,0 +1,189 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_performance-counter
+name: az monitor data-collection rule performance-counter
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule performance-counter** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Log performance counter data source.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_performance-counter_add
+  name: az monitor data-collection rule performance-counter add
+  summary: Add a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter add --counter-specifiers
+                                                            --name
+                                                            --resource-group
+                                                            --rule-name
+                                                            --sampling-frequency
+                                                            --streams {Microsoft-InsightsMetrics, Microsoft-Perf}
+                                                            --transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}
+  examples:
+  - summary: Add a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "team2ExtraCounters" --streams "Microsoft-Perf" --counter-specifiers "\\Process(_Total)\\Thread Count" "\\LogicalDisk(_Total)\\Free Megabytes" --sampling-frequency 30 --transfer-period PT15M
+  requiredParameters:
+  - isRequired: true
+    name: --counter-specifiers
+    summary: A list of specifier names of the performance counters you want to collect.Use a wildcard (\*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --sampling-frequency
+    summary: The number of seconds between consecutive counter measurements (samples).
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-InsightsMetrics, Microsoft-Perf
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - isRequired: true
+    name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_delete
+  name: az monitor data-collection rule performance-counter delete
+  summary: Delete a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter delete --name
+                                                               --resource-group
+                                                               --rule-name
+  examples:
+  - summary: Delete a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "team2ExtraCounters"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_list
+  name: az monitor data-collection rule performance-counter list
+  summary: List Log performance counter data sources.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter list --resource-group
+                                                             --rule-name
+  examples:
+  - summary: List Log performance counter data sources
+    syntax: az monitor data-collection rule performance-counter list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_show
+  name: az monitor data-collection rule performance-counter show
+  summary: Show a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter show --name
+                                                             --resource-group
+                                                             --rule-name
+  examples:
+  - summary: Show a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeamExtraCounters"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_performance-counter_update
+  name: az monitor data-collection rule performance-counter update
+  summary: Update a Log performance counter data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule performance-counter update --name
+                                                               --resource-group
+                                                               --rule-name
+                                                               [--counter-specifiers]
+                                                               [--sampling-frequency]
+                                                               [--streams {Microsoft-InsightsMetrics, Microsoft-Perf}]
+                                                               [--transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}]
+  examples:
+  - summary: Update a Log performance counter data source
+    syntax: az monitor data-collection rule performance-counter update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "team2ExtraCounters" --transfer-period PT1M
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --counter-specifiers
+    summary: A list of specifier names of the performance counters you want to collect.Use a wildcard (\*) to collect a counter for all instances. To get a list of performance counters on Windows, run the command 'typeperf'.
+    description: ''
+  - name: --sampling-frequency
+    summary: The number of seconds between consecutive counter measurements (samples).
+    description: ''
+  - name: --streams
+    parameterValueGroup: Microsoft-InsightsMetrics, Microsoft-Perf
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_performance-counter_add
+- az_monitor_data-collection_rule_performance-counter_delete
+- az_monitor_data-collection_rule_performance-counter_list
+- az_monitor_data-collection_rule_performance-counter_show
+- az_monitor_data-collection_rule_performance-counter_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Log performance counter data source.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/syslog.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/syslog.yml
new file mode 100644
index 0000000000..492b79b165
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/syslog.yml
@@ -0,0 +1,182 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_syslog
+name: az monitor data-collection rule syslog
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule syslog** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Syslog data source.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_syslog_add
+  name: az monitor data-collection rule syslog add
+  summary: Add a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog add --facility-names {UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user}
+                                               --name
+                                               --resource-group
+                                               --rule-name
+                                               --streams {Microsoft-Syslog}
+                                               [--log-levels {Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning}]
+  examples:
+  - summary: Add a Syslog data source
+    syntax: az monitor data-collection rule syslog add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase" --facility-names "syslog" --log-levels "Alert" "Critical" --streams "Microsoft-Syslog"
+  requiredParameters:
+  - isRequired: true
+    name: --facility-names
+    parameterValueGroup: UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user
+    summary: The list of facility names.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-Syslog
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  optionalParameters:
+  - name: --log-levels
+    parameterValueGroup: Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning
+    summary: The log levels to collect.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_delete
+  name: az monitor data-collection rule syslog delete
+  summary: Delete a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog delete --name
+                                                  --resource-group
+                                                  --rule-name
+  examples:
+  - summary: Delete a Syslog data source
+    syntax: az monitor data-collection rule syslog delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_list
+  name: az monitor data-collection rule syslog list
+  summary: List Syslog data sources.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog list --resource-group
+                                                --rule-name
+  examples:
+  - summary: List Syslog data sources
+    syntax: az monitor data-collection rule syslog list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_show
+  name: az monitor data-collection rule syslog show
+  summary: Show a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog show --name
+                                                --resource-group
+                                                --rule-name
+  examples:
+  - summary: Show a Syslog data source
+    syntax: az monitor data-collection rule syslog show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_syslog_update
+  name: az monitor data-collection rule syslog update
+  summary: Update a Syslog data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule syslog update --name
+                                                  --resource-group
+                                                  --rule-name
+                                                  [--facility-names {UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user}]
+                                                  [--log-levels {Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning}]
+                                                  [--streams {Microsoft-Syslog}]
+  examples:
+  - summary: Update a Syslog data source
+    syntax: az monitor data-collection rule syslog update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "syslogBase" --facility-names "syslog" --log-levels "Emergency" "Critical"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --facility-names
+    parameterValueGroup: UUCP, auth, authpriv, cron, daemon, kern, local0, local1, local2, local3, local4, local5, local6, local7, lpr, mail, mark, news, syslog, user
+    summary: The list of facility names.
+    description: ''
+  - name: --log-levels
+    parameterValueGroup: Alert, Critical, Debug, Emergency, Error, Info, Notice, Warning
+    summary: The log levels to collect.
+    description: ''
+  - name: --streams
+    parameterValueGroup: Microsoft-Syslog
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_syslog_add
+- az_monitor_data-collection_rule_syslog_delete
+- az_monitor_data-collection_rule_syslog_list
+- az_monitor_data-collection_rule_syslog_show
+- az_monitor_data-collection_rule_syslog_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Syslog data source.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/windows-event-log.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/windows-event-log.yml
new file mode 100644
index 0000000000..883ba9fbf2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/data-collection/rule/windows-event-log.yml
@@ -0,0 +1,180 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_data-collection_rule_windows-event-log
+name: az monitor data-collection rule windows-event-log
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **monitor-control-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az monitor data-collection rule windows-event-log** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Windows Event Log data source.
+description: ''
+directCommands:
+- uid: az_monitor_data-collection_rule_windows-event-log_add
+  name: az monitor data-collection rule windows-event-log add
+  summary: Add a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log add --name
+                                                          --resource-group
+                                                          --rule-name
+                                                          --streams {Microsoft-Event, Microsoft-WindowsEvent}
+                                                          --transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}
+                                                          --x-path-queries
+  examples:
+  - summary: Add a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log add --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents" --transfer-period "PT1M" --streams "Microsoft-WindowsEvent" --x-path-queries "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]" "System![System[(Level = 1 or Level = 2 or Level = 3)]]"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  - isRequired: true
+    name: --streams
+    parameterValueGroup: Microsoft-Event, Microsoft-WindowsEvent
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - isRequired: true
+    name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+  - isRequired: true
+    name: --x-path-queries
+    summary: A list of Windows Event Log queries in XPATH format.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_delete
+  name: az monitor data-collection rule windows-event-log delete
+  summary: Delete a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log delete --name
+                                                             --resource-group
+                                                             --rule-name
+  examples:
+  - summary: Delete a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log delete --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_list
+  name: az monitor data-collection rule windows-event-log list
+  summary: List Windows Event Log data sources.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log list --resource-group
+                                                           --rule-name
+  examples:
+  - summary: List Windows Event Log data sources
+    syntax: az monitor data-collection rule windows-event-log list --rule-name "myCollectionRule" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_show
+  name: az monitor data-collection rule windows-event-log show
+  summary: Show a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log show --name
+                                                           --resource-group
+                                                           --rule-name
+  examples:
+  - summary: Show a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log show --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+- uid: az_monitor_data-collection_rule_windows-event-log_update
+  name: az monitor data-collection rule windows-event-log update
+  summary: Update a Windows Event Log data source.
+  description: ''
+  syntax: >-
+    az monitor data-collection rule windows-event-log update --name
+                                                             --resource-group
+                                                             --rule-name
+                                                             [--streams {Microsoft-Event, Microsoft-WindowsEvent}]
+                                                             [--transfer-period {PT15M, PT1M, PT30M, PT5M, PT60M}]
+                                                             [--x-path-queries]
+  examples:
+  - summary: Update a Windows Event Log data source
+    syntax: az monitor data-collection rule windows-event-log update --rule-name "myCollectionRule" --resource-group "myResourceGroup" --name "appTeam1AppEvents" --x-path-queries "Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: A friendly name for the data source. This name should be unique across all data sources (regardless of type) within the data collection rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-name
+    summary: The name of the data collection rule. The name is case insensitive.
+    description: ''
+  optionalParameters:
+  - name: --streams
+    parameterValueGroup: Microsoft-Event, Microsoft-WindowsEvent
+    summary: List of streams that this data source will be sent to. A stream indicates what schema will be used for this data and usually what table in Log Analytics the data will be sent to.
+    description: ''
+  - name: --transfer-period
+    parameterValueGroup: PT15M, PT1M, PT30M, PT5M, PT60M
+    summary: The interval between data uploads (scheduled transfers), rounded up to the nearest minute.
+    description: ''
+  - name: --x-path-queries
+    summary: A list of Windows Event Log queries in XPATH format.
+    description: ''
+commands:
+- az_monitor_data-collection_rule_windows-event-log_add
+- az_monitor_data-collection_rule_windows-event-log_delete
+- az_monitor_data-collection_rule_windows-event-log_list
+- az_monitor_data-collection_rule_windows-event-log_show
+- az_monitor_data-collection_rule_windows-event-log_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Windows Event Log data source.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/log-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/log-analytics.yml
new file mode 100644
index 0000000000..c5aa4289dc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/log-analytics.yml
@@ -0,0 +1,68 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_log-analytics
+name: az monitor log-analytics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **log-analytics** extension for Azure CLI and requires version 2.0.0 or higher.  The extension will automatically install the first time you run an **az monitor log-analytics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for querying data in Log Analytics workspaces.
+description: ''
+directCommands:
+- uid: az_monitor_log-analytics_query
+  name: az monitor log-analytics query
+  summary: Query a Log Analytics workspace.
+  description: ''
+  syntax: >-
+    az monitor log-analytics query --analytics-query
+                                   --workspace
+                                   [--timespan]
+                                   [--workspaces]
+  examples:
+  - summary: Execute a simple query over past 3.5 days.
+    syntax: az monitor log-analytics query -w workspace-customId --analytics-query "AzureActivity | summarize count() by bin(timestamp, 1h)" -t P3DT12H
+  - summary: Execute a saved query in workspace
+    syntax: >-
+      QUERY=$(az monitor log-analytics workspace saved-search show -g resource-group --workspace-name workspace-name -n query-name --query query --output tsv)
+
+      az monitor log-analytics query -w workspace-customId --analytics-query "$QUERY"
+  requiredParameters:
+  - isRequired: true
+    name: --analytics-query
+    summary: Query to execute over Log Analytics data.
+    description: ''
+  - isRequired: true
+    name: --workspace -w
+    summary: GUID of the Log Analytics Workspace.
+    description: ''
+  optionalParameters:
+  - name: --timespan -t
+    summary: Timespan over which to query. Defaults to querying all available data.
+    description: ''
+  - name: --workspaces
+    summary: Additional workspaces to union data for querying. Specify additional workspace IDs separated by space.
+    description: ''
+commands:
+- az_monitor_log-analytics_query
+- az_monitor_log-analytics_solution
+- az_monitor_log-analytics_solution_create
+- az_monitor_log-analytics_solution_delete
+- az_monitor_log-analytics_solution_list
+- az_monitor_log-analytics_solution_show
+- az_monitor_log-analytics_solution_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for querying data in Log Analytics workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/log-analytics/solution.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/log-analytics/solution.yml
new file mode 100644
index 0000000000..2144b9de4a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/log-analytics/solution.yml
@@ -0,0 +1,179 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_log-analytics_solution
+name: az monitor log-analytics solution
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **log-analytics-solution** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az monitor log-analytics solution** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage monitor log-analytics solution.
+description: ''
+directCommands:
+- uid: az_monitor_log-analytics_solution_create
+  name: az monitor log-analytics solution create
+  summary: Create a log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution create --resource-group
+                                             --solution-type
+                                             --workspace
+                                             [--name]
+                                             [--no-wait]
+                                             [--plan-product]
+                                             [--plan-publisher]
+                                             [--tags]
+  examples:
+  - summary: Create a log-analytics solution of type Containers
+    syntax: >-
+      az monitor log-analytics solution create --resource-group MyResourceGroup \
+
+      --solution-type Containers --tags key=value \
+
+      --workspace "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
+
+      Microsoft.OperationalInsights/workspaces/{WorkspaceName}"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-type -t
+    summary: 'Type of the log-analytics solution. The most used are: SecurityCenterFree, Security, Updates, ContainerInsights, ServiceMap, AzureActivity, ChangeTracking, VMInsights, SecurityInsights, NetworkMonitoring, SQLVulnerabilityAssessment, SQLAdvancedThreatProtection, AntiMalware, AzureAutomation, LogicAppsManagement, SQLDataClassification.'
+    description: ''
+  - isRequired: true
+    name: --workspace -w
+    summary: The name or resource ID of the log analytics workspace with which the solution will be linked.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --plan-product
+    summary: Product name of the plan for solution. It should be in the format of OMSGallery/<solutionType>. This is case sensitive.
+    description: ''
+  - name: --plan-publisher
+    summary: Publisher name of the plan for solution. For gallery solution, it is Microsoft.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_monitor_log-analytics_solution_delete
+  name: az monitor log-analytics solution delete
+  summary: Delete a log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution delete --name
+                                             --resource-group
+                                             [--no-wait]
+                                             [--yes]
+  examples:
+  - summary: Delete a log-analytics solution
+    syntax: az monitor log-analytics solution delete --resource-group MyResourceGroup --name SolutionName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_log-analytics_solution_list
+  name: az monitor log-analytics solution list
+  summary: List all of the log-analytics solutions in the specified subscription or resource group.
+  description: ''
+  syntax: az monitor log-analytics solution list [--resource-group]
+  examples:
+  - summary: List all log-analytics solutions in the current subscription
+    syntax: az monitor log-analytics solution list
+  - summary: List all log-analytics solutions in a subscription
+    syntax: az monitor log-analytics solution list --subscription MySubscription
+  - summary: List all log-analytics solutions in a resource group
+    syntax: az monitor log-analytics solution list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_log-analytics_solution_show
+  name: az monitor log-analytics solution show
+  summary: Get details about the specified log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution show --name
+                                           --resource-group
+  examples:
+  - summary: Get a log-analytics solution
+    syntax: az monitor log-analytics solution show --resource-group MyResourceGroup --name SolutionName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_log-analytics_solution_update
+  name: az monitor log-analytics solution update
+  summary: Update an existing log-analytics solution.
+  description: ''
+  syntax: >-
+    az monitor log-analytics solution update --name
+                                             --resource-group
+                                             [--no-wait]
+                                             [--tags]
+  examples:
+  - summary: Update a log-analytics solution
+    syntax: >-
+      az monitor log-analytics solution update --resource-group MyResourceGroup \
+
+      --name SolutionName --tags key=value
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the log-analytics solution. It should be in the format of solutionType(workspaceName). SolutionType part is case sensitive.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_monitor_log-analytics_solution_create
+- az_monitor_log-analytics_solution_delete
+- az_monitor_log-analytics_solution_list
+- az_monitor_log-analytics_solution_show
+- az_monitor_log-analytics_solution_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage monitor log-analytics solution.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/monitor/scheduled-query.yml b/2018-03-01-hybrid/docs-ref-autogen/monitor/scheduled-query.yml
new file mode 100644
index 0000000000..b24a4f01da
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/monitor/scheduled-query.yml
@@ -0,0 +1,299 @@
+### YamlMime:AzureCLIGroup
+uid: az_monitor_scheduled-query
+name: az monitor scheduled-query
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **scheduled-query** extension for Azure CLI and requires version 2.20.0 or higher.  The extension will automatically install the first time you run an **az monitor scheduled-query** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage scheduled queries.
+description: ''
+directCommands:
+- uid: az_monitor_scheduled-query_create
+  name: az monitor scheduled-query create
+  summary: Create a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query create --condition
+                                      --name
+                                      --resource-group
+                                      --scopes
+                                      [--action]
+                                      [--auto-mitigate {false, true}]
+                                      [--check-ws-alerts-storage {false, true}]
+                                      [--condition-query]
+                                      [--description]
+                                      [--disabled {false, true}]
+                                      [--display-name]
+                                      [--evaluation-frequency]
+                                      [--location]
+                                      [--mad]
+                                      [--severity]
+                                      [--skip-query-validation {false, true}]
+                                      [--tags]
+                                      [--target-resource-type]
+                                      [--window-size]
+  examples:
+  - summary: Create a scheduled query for a VM.
+    syntax: az monitor scheduled-query create -g {rg} -n {name1} --scopes {vm_id} --condition "count 'Placeholder_1' > 360 resource id _ResourceID at least 1 violations out of 5 aggregated points" --condition-query Placeholder_1="union Event, Syslog | where TimeGenerated > ago(1h) | where EventLevelName=='Error' or SeverityLevel=='err'" --description "Test rule"
+  - summary: Create a scheduled query for VMs in a resource group.
+    syntax: az monitor scheduled-query create -g {rg} -n {name1} --scopes {rg_id} --condition "count 'Placeholder_1' > 360 resource id _ResourceID at least 1 violations out of 5 aggregated points" --condition-query Placeholder_1="union Event, Syslog | where TimeGenerated > ago(1h) | where EventLevelName=='Error' or SeverityLevel=='err'" --description "Test rule"
+  requiredParameters:
+  - isRequired: true
+    name: --condition
+    summary: The condition which triggers the rule.
+    description: >-
+      Usage:  --condition {avg,min,max,total,count} ["METRIC COLUMN" from]
+                          "QUERY_PLACEHOLDER" {=,!=,>,>=,<,<=} THRESHOLD
+                          [resource id RESOURCEID]
+                          [where DIMENSION {includes,excludes} VALUE [or VALUE ...]
+                          [and   DIMENSION {includes,excludes} VALUE [or VALUE ...] ...]]
+                          [at least MinTimeToFail violations out of EvaluationPeriod aggregated points]'
+      Query placeholders can be defined in --condition-query argument
+
+      Dimensions can be queried by adding the 'where' keyword and multiple dimensions can be queried by combining them with the 'and' keyword.
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scopes
+    summary: Space-separated list of scopes the rule applies to. The resources specified in this parameter must be of the same type and exist in the same location.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action group and optional webhook properties to fire when the alert is triggered.
+    description: >-
+      Usage:   --action ACTION_GROUP_NAME_OR_ID [KEY=VAL [KEY=VAL ...]]
+
+
+      Multiple action groups can be specified by using more than one `--action` argument.
+  - name: --auto-mitigate
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: The flag that indicates whether the alert should be automatically resolved or not. The default is true.
+    description: ''
+  - name: --check-ws-alerts-storage --cwas
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether this scheduled query rule should be stored in the customer's storage.
+    description: ''
+  - name: --condition-query
+    summary: Query deteils to replace the placeholders in `--condition` argument.
+    description: ''
+  - name: --description
+    summary: Free-text description of the rule.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Disable the scheduled query.
+    description: ''
+  - name: --display-name
+    summary: The display name of the alert rule.
+    description: ''
+  - name: --evaluation-frequency
+    defaultValue: 5m
+    summary: Frequency with which to evaluate the rule in "##h##m##s" format.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --mad --mute-actions-duration
+    summary: Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired.
+    description: ''
+  - name: --severity
+    defaultValue: "2"
+    summary: Severity of the alert from 0 (critical) to 4 (verbose).
+    description: ''
+  - name: --skip-query-validation
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether the provided query should be validated or not.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-resource-type --type
+    summary: The resource type of the target resource(s) in scopes. This must be provided when scopes is resource group or subscription.
+    description: ''
+  - name: --window-size
+    defaultValue: 5m
+    summary: Time over which to aggregate metrics in "##h##m##s" format.
+    description: ''
+- uid: az_monitor_scheduled-query_delete
+  name: az monitor scheduled-query delete
+  summary: Delete a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query delete --name
+                                      --resource-group
+                                      [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_monitor_scheduled-query_list
+  name: az monitor scheduled-query list
+  summary: List all scheduled queries.
+  description: ''
+  syntax: az monitor scheduled-query list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_scheduled-query_show
+  name: az monitor scheduled-query show
+  summary: Show detail of a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query show --name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_monitor_scheduled-query_update
+  name: az monitor scheduled-query update
+  summary: Update a scheduled query.
+  description: ''
+  syntax: >-
+    az monitor scheduled-query update --name
+                                      --resource-group
+                                      [--action]
+                                      [--add]
+                                      [--auto-mitigate {false, true}]
+                                      [--check-ws-alerts-storage {false, true}]
+                                      [--condition]
+                                      [--condition-query]
+                                      [--description]
+                                      [--disabled {false, true}]
+                                      [--display-name]
+                                      [--evaluation-frequency]
+                                      [--force-string]
+                                      [--mad]
+                                      [--remove]
+                                      [--set]
+                                      [--severity]
+                                      [--skip-query-validation {false, true}]
+                                      [--tags]
+                                      [--window-size]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the scheduled query rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action group and optional webhook properties to fire when the alert is triggered.
+    description: >-
+      Usage:   --action ACTION_GROUP_NAME_OR_ID [KEY=VAL [KEY=VAL ...]]
+
+
+      Multiple action groups can be specified by using more than one `--action` argument.
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auto-mitigate
+    parameterValueGroup: false, true
+    summary: The flag that indicates whether the alert should be automatically resolved or not. The default is true.
+    description: ''
+  - name: --check-ws-alerts-storage --cwas
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether this scheduled query rule should be stored in the customer's storage.
+    description: ''
+  - name: --condition
+    summary: The condition which triggers the rule.
+    description: >-
+      Usage:  --condition {avg,min,max,total,count} ["METRIC COLUMN" from]
+                          "QUERY_PLACEHOLDER" {=,!=,>,>=,<,<=} THRESHOLD
+                          [resource id RESOURCEID]
+                          [where DIMENSION {includes,excludes} VALUE [or VALUE ...]
+                          [and   DIMENSION {includes,excludes} VALUE [or VALUE ...] ...]]
+                          [at least MinTimeToFail violations out of EvaluationPeriod aggregated points]'
+
+      Query placeholders can be defined in --condition-query argument
+
+      Dimensions can be queried by adding the 'where' keyword and multiple dimensions can be queried by combining them with the 'and' keyword.
+  - name: --condition-query
+    summary: Query deteils to replace the placeholders in `--condition` argument.
+    description: ''
+  - name: --description
+    summary: Free-text description of the rule.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Disable the scheduled query.
+    description: ''
+  - name: --display-name
+    summary: The display name of the alert rule.
+    description: ''
+  - name: --evaluation-frequency
+    summary: Frequency with which to evaluate the rule in "##h##m##s" format.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --mad --mute-actions-duration
+    summary: Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --severity
+    summary: Severity of the alert from 0 (critical) to 4 (verbose).
+    description: ''
+  - name: --skip-query-validation
+    parameterValueGroup: false, true
+    summary: The flag which indicates whether the provided query should be validated or not.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --window-size
+    summary: Time over which to aggregate metrics in "##h##m##s" format.
+    description: ''
+commands:
+- az_monitor_scheduled-query_create
+- az_monitor_scheduled-query_delete
+- az_monitor_scheduled-query_list
+- az_monitor_scheduled-query_show
+- az_monitor_scheduled-query_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage scheduled queries.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mysql.yml b/2018-03-01-hybrid/docs-ref-autogen/mysql.yml
new file mode 100644
index 0000000000..c3297be9ae
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mysql.yml
@@ -0,0 +1,164 @@
+### YamlMime:AzureCLIGroup
+uid: az_mysql
+name: az mysql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **db-up** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az mysql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for MySQL servers.
+description: ''
+directCommands:
+- uid: az_mysql_down
+  name: az mysql down
+  summary: Delete the MySQL server and its cached information.
+  description: ''
+  syntax: >-
+    az mysql down [--delete-group]
+                  [--no-wait]
+                  [--resource-group]
+                  [--server-name]
+                  [--yes]
+  examples:
+  - summary: Delete the server and the cached data, aside from the resource group.
+    syntax: az mysql down
+  - summary: Delete the resource group and the full cache.
+    syntax: az mysql down --delete-group
+  optionalParameters:
+  - name: --delete-group
+    summary: Delete the resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_mysql_show-connection-string
+  name: az mysql show-connection-string
+  summary: Show the connection strings for a MySQL server database.
+  description: ''
+  syntax: >-
+    az mysql show-connection-string [--admin-password]
+                                    [--admin-user]
+                                    [--database-name]
+                                    [--server-name]
+  optionalParameters:
+  - name: --admin-password -p
+    defaultValue: '{password}'
+    summary: The login password of the administrator.
+    description: ''
+  - name: --admin-user -u
+    defaultValue: '{login}'
+    summary: The login username of the administrator.
+    description: ''
+  - name: --database-name -d
+    defaultValue: '{database}'
+    summary: The name of a database.
+    description: ''
+  - name: --server-name -s
+    defaultValue: '{server}'
+    summary: Name of the server.
+    description: ''
+- uid: az_mysql_up
+  name: az mysql up
+  summary: Set up an Azure Database for MySQL server and configurations.
+  description: ''
+  syntax: >-
+    az mysql up [--admin-password]
+                [--admin-user]
+                [--backup-retention]
+                [--database-name]
+                [--generate-password]
+                [--geo-redundant-backup {Disabled, Enabled}]
+                [--location]
+                [--resource-group]
+                [--server-name]
+                [--sku-name]
+                [--ssl-enforcement {Disabled, Enabled}]
+                [--storage-size]
+                [--tags]
+                [--version]
+  examples:
+  - summary: Ensure that a Azure Database for MySQL server is up and running and configured for immediate use.
+    syntax: az mysql up
+  - summary: To override default names, provide parameters indicating desired values/existing resources.
+    syntax: az mysql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
+  optionalParameters:
+  - name: --admin-password -p
+    summary: 'The login password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.Your password cannot contain all or part of the login name. Part of a login name is defined as three or more consecutive alphanumeric characters.'
+    description: ''
+  - name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - name: --backup-retention
+    summary: The number of days a backup is retained.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database to initialize.
+    description: ''
+  - name: --generate-password
+    summary: Generate a password.
+    description: ''
+  - name: --geo-redundant-backup
+    defaultValue: Disabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable Geo-redundant or not for server backup.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --sku-name
+    defaultValue: GP_Gen5_2
+    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
+    description: ''
+  - name: --ssl-enforcement
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable ssl enforcement or not when connect to server.
+    description: ''
+  - name: --storage-size
+    summary: The max storage size of the server. Unit is megabytes.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --version
+    defaultValue: "5.7"
+    summary: Server version.
+    description: ''
+commands:
+- az_mysql_down
+- az_mysql_flexible-server
+- az_mysql_flexible-server_connect
+- az_mysql_flexible-server_execute
+- az_mysql_show-connection-string
+- az_mysql_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for MySQL servers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/mysql/flexible-server.yml b/2018-03-01-hybrid/docs-ref-autogen/mysql/flexible-server.yml
new file mode 100644
index 0000000000..a923af012d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/mysql/flexible-server.yml
@@ -0,0 +1,97 @@
+### YamlMime:AzureCLIGroup
+uid: az_mysql_flexible-server
+name: az mysql flexible-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **rdbms-connect** extension for Azure CLI and requires version 2.19.0 or higher.  The extension will automatically install the first time you run an **az mysql flexible-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for MySQL Flexible Servers.
+description: ''
+directCommands:
+- uid: az_mysql_flexible-server_connect
+  name: az mysql flexible-server connect
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az mysql flexible-server connect --admin-user
+                                     --name
+                                     [--admin-password]
+                                     [--database-name]
+                                     [--interactive]
+                                     [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --interactive
+    summary: Pass this parameter to connect to database in interactive mode.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+- uid: az_mysql_flexible-server_execute
+  name: az mysql flexible-server execute
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az mysql flexible-server execute --admin-password
+                                     --admin-user
+                                     --name
+                                     [--database-name]
+                                     [--file-path]
+                                     [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --file-path -f
+    summary: The path of the sql file to execute.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+commands:
+- az_mysql_flexible-server_connect
+- az_mysql_flexible-server_execute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for MySQL Flexible Servers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/netappfiles.yml b/2018-03-01-hybrid/docs-ref-autogen/netappfiles.yml
new file mode 100644
index 0000000000..72b4e658b4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/netappfiles.yml
@@ -0,0 +1,53 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles
+name: az netappfiles
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Resources.
+description: ''
+commands:
+- az_netappfiles_account
+- az_netappfiles_account_create
+- az_netappfiles_account_delete
+- az_netappfiles_account_list
+- az_netappfiles_account_set
+- az_netappfiles_account_show
+- az_netappfiles_account_update
+- az_netappfiles_mount-target
+- az_netappfiles_mount-target_list
+- az_netappfiles_pool
+- az_netappfiles_pool_create
+- az_netappfiles_pool_delete
+- az_netappfiles_pool_list
+- az_netappfiles_pool_show
+- az_netappfiles_pool_update
+- az_netappfiles_snapshot
+- az_netappfiles_snapshot_create
+- az_netappfiles_snapshot_delete
+- az_netappfiles_snapshot_list
+- az_netappfiles_snapshot_show
+- az_netappfiles_volume
+- az_netappfiles_volume_create
+- az_netappfiles_volume_delete
+- az_netappfiles_volume_list
+- az_netappfiles_volume_show
+- az_netappfiles_volume_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/netappfiles/account.yml b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/account.yml
new file mode 100644
index 0000000000..a4eaa53bd8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/account.yml
@@ -0,0 +1,202 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_account
+name: az netappfiles account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Account Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_account_create
+  name: az netappfiles account create
+  summary: Create a new Azure NetApp Files (ANF) account. Note that active directory can only be applied to an existing account (using set/update).
+  description: ''
+  syntax: >-
+    az netappfiles account create --account-name
+                                  --location
+                                  --resource-group
+                                  [--active-directories]
+                                  [--tags]
+  examples:
+  - summary: Create an ANF account
+    syntax: az netappfiles account create -g group --account-name name -l location
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --active-directories
+    summary: Active Directories.
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the account.
+    description: ''
+- uid: az_netappfiles_account_delete
+  name: az netappfiles account delete
+  summary: Delete the specified ANF account.
+  description: ''
+  syntax: >-
+    az netappfiles account delete --account-name
+                                  --resource-group
+  examples:
+  - summary: Delete an ANF account
+    syntax: az netappfiles account delete -g group --account-name name
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_account_list
+  name: az netappfiles account list
+  summary: List ANF accounts.
+  description: ''
+  syntax: az netappfiles account list --resource-group
+  examples:
+  - summary: List ANF accounts within a resource group
+    syntax: az netappfiles account list -g group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_account_set
+  name: az netappfiles account set
+  summary: Sets the tags or the active directory details for a specified ANF account. Sets the active directory property to exactly what is provided. If none is provided then the active directory is removed, i.e. provide empty [].
+  description: ''
+  syntax: >-
+    az netappfiles account set --account-name
+                               --location
+                               --resource-group
+                               [--active-directories]
+                               [--tags]
+  examples:
+  - summary: Update the tags and active directory of an ANF account
+    syntax: "az netappfiles account set -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
+  - summary: Remove the active directory from the ANF account
+    syntax: az netappfiles account set -g group --account-name name --active-directories '[]' -l westus2
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --active-directories
+    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the account.
+    description: ''
+- uid: az_netappfiles_account_show
+  name: az netappfiles account show
+  summary: Get the specified ANF account.
+  description: ''
+  syntax: >-
+    az netappfiles account show --account-name
+                                --resource-group
+  examples:
+  - summary: Get an ANF account
+    syntax: az netappfiles account show -g group --account-name name
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_account_update
+  name: az netappfiles account update
+  summary: Set/modify the tags or the active directory details for a specified ANF account. Active directory settings are appended only - if none are present no change is made otherwise the active directory is replaced with that provided.
+  description: ''
+  syntax: >-
+    az netappfiles account update --account-name
+                                  --location
+                                  --resource-group
+                                  [--active-directories]
+                                  [--add]
+                                  [--force-string]
+                                  [--remove]
+                                  [--set]
+                                  [--tags]
+  examples:
+  - summary: Update the tags and active directory of an ANF account
+    syntax: "az netappfiles account update -g group --account-name name --tags 'key[=value] key[=value]' --active-directories '[{\"username\": \"aduser\", \"password\": \"aduser\", \"smbservername\": \"SMBSERVER\", \"dns\": \"1.2.3.4\", \"domain\": \"westcentralus\"}]' -l westus2"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --active-directories
+    summary: An array of active directory (AD) settings in json format. Limitation one AD/subscription. Consists of the fields username (Username of Active Directory domain administrator), password (Plain text password of Active Directory domain administrator), domain (Name of the Active Directory domain), dns (Comma separated list of DNS server IP addresses for the Active Directory domain), smb_server_name (NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes. Must be 10 characters or less), organizational_unit (The Organizational Unit (OU) within the Windows Active Directory).
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the account.
+    description: ''
+commands:
+- az_netappfiles_account_create
+- az_netappfiles_account_delete
+- az_netappfiles_account_list
+- az_netappfiles_account_set
+- az_netappfiles_account_show
+- az_netappfiles_account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Account Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/netappfiles/mount-target.yml b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/mount-target.yml
new file mode 100644
index 0000000000..5e963a759e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/mount-target.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_mount-target
+name: az netappfiles mount-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles mount-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Mount Target Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_mount-target_list
+  name: az netappfiles mount-target list
+  summary: List the mount targets of an ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles mount-target list --account-name
+                                     --pool-name
+                                     --resource-group
+                                     --volume-name
+  examples:
+  - summary: list the mount targets of an ANF volume
+    syntax: az netappfiles mount-target list -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF pool.
+    description: ''
+commands:
+- az_netappfiles_mount-target_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Mount Target Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/netappfiles/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/pool.yml
new file mode 100644
index 0000000000..e88c688f7f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/pool.yml
@@ -0,0 +1,201 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_pool
+name: az netappfiles pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Pool Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_pool_create
+  name: az netappfiles pool create
+  summary: Create a new Azure NetApp Files (ANF) pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool create --account-name
+                               --location
+                               --pool-name
+                               --resource-group
+                               --service-level
+                               --size
+                               [--tags]
+  examples:
+  - summary: Create an ANF pool
+    syntax: az netappfiles pool create -g group --account-name aname --pool-name pname -l location --size 4398046511104 --service-level "Premium"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-level
+    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - isRequired: true
+    name: --size
+    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: A list of space separated tags to apply to the pool.
+    description: ''
+- uid: az_netappfiles_pool_delete
+  name: az netappfiles pool delete
+  summary: Delete the specified ANF pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool delete --account-name
+                               --pool-name
+                               --resource-group
+  examples:
+  - summary: Delete an ANF pool
+    syntax: az netappfiles pool delete -g group --account-name aname --pool-name pname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_pool_list
+  name: az netappfiles pool list
+  summary: L:ist the ANF pools for the specified account.
+  description: ''
+  syntax: >-
+    az netappfiles pool list --account-name
+                             --resource-group
+  examples:
+  - summary: List the pools for the ANF account
+    syntax: az netappfiles pool list -g group --account-name name
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a -n
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_pool_show
+  name: az netappfiles pool show
+  summary: Get the specified ANF pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool show --account-name
+                             --pool-name
+                             --resource-group
+  examples:
+  - summary: Get an ANF pool
+    syntax: az netappfiles pool show -g group --account-name aname --pool-name pname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_pool_update
+  name: az netappfiles pool update
+  summary: Update the tags of the specified ANF pool.
+  description: ''
+  syntax: >-
+    az netappfiles pool update --account-name
+                               --pool-name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--location]
+                               [--remove]
+                               [--service-level]
+                               [--set]
+                               [--size]
+                               [--tags]
+  examples:
+  - summary: Update specific values for an ANF pool
+    syntax: az netappfiles pool update -g group --account-name aname --pool-name pname --service-level "Extreme" --tags 'key[=value] key[=value]'
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --service-level
+    summary: The service level for the ANF pool ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --size
+    summary: The size for the ANF pool. Must be in 4 tebibytes increments, expressed in bytes.
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the pool.
+    description: ''
+commands:
+- az_netappfiles_pool_create
+- az_netappfiles_pool_delete
+- az_netappfiles_pool_list
+- az_netappfiles_pool_show
+- az_netappfiles_pool_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Pool Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/netappfiles/snapshot.yml b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/snapshot.yml
new file mode 100644
index 0000000000..60624ae7ab
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/snapshot.yml
@@ -0,0 +1,173 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_snapshot
+name: az netappfiles snapshot
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles snapshot** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Snapshot Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_snapshot_create
+  name: az netappfiles snapshot create
+  summary: Create a new Azure NetApp Files (ANF) snapshot.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot create --account-name
+                                   --location
+                                   --pool-name
+                                   --resource-group
+                                   --snapshot-name
+                                   --volume-name
+                                   [--file-system-id]
+  examples:
+  - summary: Create an ANF snapshot
+    syntax: az netappfiles snapshot create -g group --account-name account-name --pool-name pname --volume-name vname --snapshot-name sname -l location --file-system-id volume-uuid
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --snapshot-name -n -s
+    summary: The name of the ANF snapshot.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF volume.
+    description: ''
+  optionalParameters:
+  - name: --file-system-id
+    summary: The uuid of the volume.
+    description: ''
+- uid: az_netappfiles_snapshot_delete
+  name: az netappfiles snapshot delete
+  summary: Delete the specified ANF snapshot.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot delete --account-name
+                                   --pool-name
+                                   --resource-group
+                                   --snapshot-name
+                                   --volume-name
+  examples:
+  - summary: Delete an ANF snapshot
+    syntax: az netappfiles snapshot delete -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --snapshot-name -n -s
+    summary: The name of the ANF snapshot.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF volume.
+    description: ''
+- uid: az_netappfiles_snapshot_list
+  name: az netappfiles snapshot list
+  summary: List the snapshots of an ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot list --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --volume-name
+  examples:
+  - summary: list the snapshots of an ANF volume
+    syntax: az netappfiles snapshot list -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+- uid: az_netappfiles_snapshot_show
+  name: az netappfiles snapshot show
+  summary: Get the specified ANF snapshot.
+  description: ''
+  syntax: >-
+    az netappfiles snapshot show --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --snapshot-name
+                                 --volume-name
+  examples:
+  - summary: Return the specified ANF snapshot
+    syntax: az netappfiles snapshot show -g group --account-name aname --pool-name pname --volume-name vname --snapshot-name sname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --snapshot-name -n -s
+    summary: The name of the ANF snapshot.
+    description: ''
+  - isRequired: true
+    name: --volume-name -v
+    summary: The name of the ANF volume.
+    description: ''
+commands:
+- az_netappfiles_snapshot_create
+- az_netappfiles_snapshot_delete
+- az_netappfiles_snapshot_list
+- az_netappfiles_snapshot_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Snapshot Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/netappfiles/volume.yml b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/volume.yml
new file mode 100644
index 0000000000..31a24ba5bf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/netappfiles/volume.yml
@@ -0,0 +1,240 @@
+### YamlMime:AzureCLIGroup
+uid: az_netappfiles_volume
+name: az netappfiles volume
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **netappfiles-preview** extension for Azure CLI and requires version 2.0.56 or higher.  The extension will automatically install the first time you run an **az netappfiles volume** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure NetApp Files (ANF) Volume Resources.
+description: ''
+directCommands:
+- uid: az_netappfiles_volume_create
+  name: az netappfiles volume create
+  summary: Create a new Azure NetApp Files (ANF) volume.
+  description: ''
+  syntax: >-
+    az netappfiles volume create --account-name
+                                 --creation-token
+                                 --location
+                                 --pool-name
+                                 --resource-group
+                                 --service-level
+                                 --subnet-id
+                                 --usage-threshold
+                                 --volume-name
+                                 [--export-policy]
+                                 [--tags]
+  examples:
+  - summary: Create an ANF volume
+    syntax: "az netappfiles volume create -g group --account-name aname --pool-name pname --volume-name vname -l location --service-level \"Premium\" --usage-threshold 107374182400 --creation-token \"unique-token\" --subnet-id \"/subscriptions/mysubsid/resourceGroups/myrg/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/default\" --export-policy '[{\"allowed_clients\":\"0.0.0.0/0\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --creation-token
+    summary: A unique file path identifier, from 1 to 80 characters.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service-level
+    summary: The service level ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - isRequired: true
+    name: --subnet-id
+    summary: The subnet identifier.
+    description: ''
+  - isRequired: true
+    name: --usage-threshold
+    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+  optionalParameters:
+  - name: --export-policy
+    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the volume.
+    description: ''
+- uid: az_netappfiles_volume_delete
+  name: az netappfiles volume delete
+  summary: Delete the specified ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles volume delete --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --volume-name
+  examples:
+  - summary: Delete an ANF volume
+    syntax: az netappfiles volume delete -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+- uid: az_netappfiles_volume_list
+  name: az netappfiles volume list
+  summary: List the ANF Pools for the specified account.
+  description: ''
+  syntax: >-
+    az netappfiles volume list --account-name
+                               --pool-name
+                               --resource-group
+  examples:
+  - summary: List the ANF volumes of the pool
+    syntax: az netappfiles volume list -g group --account-name aname --pool-name pname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -n -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_netappfiles_volume_show
+  name: az netappfiles volume show
+  summary: Get the specified ANF volume.
+  description: ''
+  syntax: >-
+    az netappfiles volume show --account-name
+                               --pool-name
+                               --resource-group
+                               --volume-name
+  examples:
+  - summary: Returns the properties of the given ANF volume
+    syntax: az netappfiles volume show -g group --account-name aname --pool-name pname --volume-name vname
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF pool.
+    description: ''
+- uid: az_netappfiles_volume_update
+  name: az netappfiles volume update
+  summary: Update the specified ANF volume with the values provided. Unspecified values will remain unchanged.
+  description: ''
+  syntax: >-
+    az netappfiles volume update --account-name
+                                 --pool-name
+                                 --resource-group
+                                 --volume-name
+                                 [--add]
+                                 [--export-policy]
+                                 [--force-string]
+                                 [--remove]
+                                 [--service-level]
+                                 [--set]
+                                 [--tags]
+                                 [--usage-threshold]
+  examples:
+  - summary: Create an ANF volume
+    syntax: "az netappfiles volume update -g group --account-name aname --pool-name pname --volume-name vname --service-level level --usage-threshold 107374182400 --tags 'key[=value] key[=value]' --export-policy '[{\"allowed_clients\":\"1.2.3.0/24\", \"rule_index\": \"1\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}, {\"allowed_clients\":\"1.2.4.0/24\", \"rule_index\": \"2\", \"unix_read_only\": \"true\", \"unix_read_write\": \"false\", \"cifs\": \"false\", \"nfsv3\": \"true\", \"nfsv3\": \"true\", \"nfsv4\": \"false\"}]'"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: The name of the ANF account.
+    description: ''
+  - isRequired: true
+    name: --pool-name -p
+    summary: The name of the ANF pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --volume-name -n -v
+    summary: The name of the ANF volume.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --export-policy
+    summary: A json list of the parameters for export policy containing rule_index (Order index), unix_read_only (Read only access), unix_read_write (Read and write access), cifs (Allows CIFS protocol), nfsv3 (Allows NFSv3 protocol), nfsv4 (Allows NFSv4 protocol) and allowedClients (Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names).
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --service-level
+    summary: The service level ["Standard"|"Premium"|"Extreme"].
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: A list of space separated tags to apply to the volume.
+    description: ''
+  - name: --usage-threshold
+    summary: The maximum storage quota allowed for a file system in bytes. Min 100 GiB, max 100TiB".
+    description: ''
+commands:
+- az_netappfiles_volume_create
+- az_netappfiles_volume_delete
+- az_netappfiles_volume_list
+- az_netappfiles_volume_show
+- az_netappfiles_volume_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure NetApp Files (ANF) Volume Resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network.yml b/2018-03-01-hybrid/docs-ref-autogen/network.yml
index 57733097b3..b5e789fd42 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network.yml
@@ -1,1664 +1,921 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network
-  name: az network
-  summary: Manage Azure Network resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_list_service_aliases
-  - az_network_list_usages
-- uid: az_network_list_service_aliases
+### YamlMime:AzureCLIGroup
+uid: az_network
+name: az network
+summary: Manage Azure Network resources.
+description: ''
+directCommands:
+- uid: az_network_list-service-aliases
   name: az network list-service-aliases
   summary: List available service aliases in the region which can be used for Service Endpoint Policies.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network list-service-aliases --location
+                                    [--resource-group]
+                                    [--subscription]
+  examples:
+  - summary: List available service aliases in the region which can be used for Service Endpoint Policies. (autogenerated)
+    syntax: az network list-service-aliases --location westus2
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_list_usages
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_list-usages
   name: az network list-usages
   summary: List the number of network resources in a region that are used against a subscription quota.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network list-usages --location
+                           [--subscription]
   examples:
   - summary: List the provisioned network resources in East US region within a subscription.
-    syntax:
-      content: az network list-usages --location eastus -o table
-  parameters:
+    syntax: az network list-usages --location eastus -o table
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway
-  name: az network application-gateway
-  summary: Manage application-level routing and load balancing services.
-- uid: az_network_application_gateway_address_pool
-  name: az network application-gateway address-pool
-  summary: Manage address pools of an application gateway.
-- uid: az_network_application_gateway_address_pool_create
-  name: az network application-gateway address-pool create
-  summary: Create an address pool.
-- uid: az_network_application_gateway_address_pool_delete
-  name: az network application-gateway address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_application_gateway_address_pool_list
-  name: az network application-gateway address-pool list
-  summary: List address pools.
-- uid: az_network_application_gateway_address_pool_show
-  name: az network application-gateway address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_application_gateway_address_pool_update
-  name: az network application-gateway address-pool update
-  summary: Update an address pool.
-- uid: az_network_application_gateway_auth_cert
-  name: az network application-gateway auth-cert
-  summary: Manage authorization certificates of an application gateway.
-- uid: az_network_application_gateway_auth_cert_create
-  name: az network application-gateway auth-cert create
-  summary: Create an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_delete
-  name: az network application-gateway auth-cert delete
-  summary: Delete an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_list
-  name: az network application-gateway auth-cert list
-  summary: List authorization certificates.
-- uid: az_network_application_gateway_auth_cert_show
-  name: az network application-gateway auth-cert show
-  summary: Show an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_update
-  name: az network application-gateway auth-cert update
-  summary: Update an authorization certificate.
-- uid: az_network_application_gateway_create
-  name: az network application-gateway create
-  summary: Create an application gateway.
-- uid: az_network_application_gateway_delete
-  name: az network application-gateway delete
-  summary: Delete an application gateway.
-- uid: az_network_application_gateway_frontend_ip
-  name: az network application-gateway frontend-ip
-  summary: Manage frontend IP addresses of an application gateway.
-- uid: az_network_application_gateway_frontend_ip_create
-  name: az network application-gateway frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_delete
-  name: az network application-gateway frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_list
-  name: az network application-gateway frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_application_gateway_frontend_ip_show
-  name: az network application-gateway frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_update
-  name: az network application-gateway frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_application_gateway_frontend_port
-  name: az network application-gateway frontend-port
-  summary: Manage frontend ports of an application gateway.
-- uid: az_network_application_gateway_frontend_port_create
-  name: az network application-gateway frontend-port create
-  summary: Create a frontend port.
-- uid: az_network_application_gateway_frontend_port_delete
-  name: az network application-gateway frontend-port delete
-  summary: Delete a frontend port.
-- uid: az_network_application_gateway_frontend_port_list
-  name: az network application-gateway frontend-port list
-  summary: List frontend ports.
-- uid: az_network_application_gateway_frontend_port_show
-  name: az network application-gateway frontend-port show
-  summary: Get the details of a frontend port.
-- uid: az_network_application_gateway_frontend_port_update
-  name: az network application-gateway frontend-port update
-  summary: Update a frontend port.
-- uid: az_network_application_gateway_http_listener
-  name: az network application-gateway http-listener
-  summary: Manage HTTP listeners of an application gateway.
-- uid: az_network_application_gateway_http_listener_create
-  name: az network application-gateway http-listener create
-  summary: Create an HTTP listener.
-- uid: az_network_application_gateway_http_listener_delete
-  name: az network application-gateway http-listener delete
-  summary: Delete an HTTP listener.
-- uid: az_network_application_gateway_http_listener_list
-  name: az network application-gateway http-listener list
-  summary: List HTTP listeners.
-- uid: az_network_application_gateway_http_listener_show
-  name: az network application-gateway http-listener show
-  summary: Get the details of an HTTP listener.
-- uid: az_network_application_gateway_http_listener_update
-  name: az network application-gateway http-listener update
-  summary: Update an HTTP listener.
-- uid: az_network_application_gateway_http_settings
-  name: az network application-gateway http-settings
-  summary: Manage HTTP settings of an application gateway.
-- uid: az_network_application_gateway_http_settings_create
-  name: az network application-gateway http-settings create
-  summary: Create HTTP settings.
-- uid: az_network_application_gateway_http_settings_delete
-  name: az network application-gateway http-settings delete
-  summary: Delete HTTP settings.
-- uid: az_network_application_gateway_http_settings_list
-  name: az network application-gateway http-settings list
-  summary: List HTTP settings.
-- uid: az_network_application_gateway_http_settings_show
-  name: az network application-gateway http-settings show
-  summary: Get the details of a gateway's HTTP settings.
-- uid: az_network_application_gateway_http_settings_update
-  name: az network application-gateway http-settings update
-  summary: Update HTTP settings.
-- uid: az_network_application_gateway_list
-  name: az network application-gateway list
-  summary: List application gateways.
-- uid: az_network_application_gateway_probe
-  name: az network application-gateway probe
-  summary: Manage probes to gather and evaluate information on a gateway.
-- uid: az_network_application_gateway_probe_create
-  name: az network application-gateway probe create
-  summary: Create a probe.
-- uid: az_network_application_gateway_probe_delete
-  name: az network application-gateway probe delete
-  summary: Delete a probe.
-- uid: az_network_application_gateway_probe_list
-  name: az network application-gateway probe list
-  summary: List probes.
-- uid: az_network_application_gateway_probe_show
-  name: az network application-gateway probe show
-  summary: Get the details of a probe.
-- uid: az_network_application_gateway_probe_update
-  name: az network application-gateway probe update
-  summary: Update a probe.
-- uid: az_network_application_gateway_redirect_config
-  name: az network application-gateway redirect-config
-  summary: Manage redirect configurations.
-- uid: az_network_application_gateway_redirect_config_create
-  name: az network application-gateway redirect-config create
-  summary: Create a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_delete
-  name: az network application-gateway redirect-config delete
-  summary: Delete a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_list
-  name: az network application-gateway redirect-config list
-  summary: List redirect configurations.
-- uid: az_network_application_gateway_redirect_config_show
-  name: az network application-gateway redirect-config show
-  summary: Get the details of a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_update
-  name: az network application-gateway redirect-config update
-  summary: Update a redirect configuration.
-- uid: az_network_application_gateway_rewrite_rule
-  name: az network application-gateway rewrite-rule
-  summary: Manage rewrite rules of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
-- uid: az_network_application_gateway_rule
-  name: az network application-gateway rule
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_application_gateway_rule_create
-  name: az network application-gateway rule create
-  summary: Create a rule.
-- uid: az_network_application_gateway_rule_delete
-  name: az network application-gateway rule delete
-  summary: Delete a rule.
-- uid: az_network_application_gateway_rule_list
-  name: az network application-gateway rule list
-  summary: List rules.
-- uid: az_network_application_gateway_rule_show
-  name: az network application-gateway rule show
-  summary: Get the details of a rule.
-- uid: az_network_application_gateway_rule_update
-  name: az network application-gateway rule update
-  summary: Update a rule.
-- uid: az_network_application_gateway_show
-  name: az network application-gateway show
-  summary: Get the details of an application gateway.
-- uid: az_network_application_gateway_show_backend_health
-  name: az network application-gateway show-backend-health
-  summary: Get information on the backend health of an application gateway.
-- uid: az_network_application_gateway_ssl_cert
-  name: az network application-gateway ssl-cert
-  summary: Manage SSL certificates of an application gateway.
-- uid: az_network_application_gateway_ssl_cert_create
-  name: az network application-gateway ssl-cert create
-  summary: Upload an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_delete
-  name: az network application-gateway ssl-cert delete
-  summary: Delete an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_list
-  name: az network application-gateway ssl-cert list
-  summary: List SSL certificates.
-- uid: az_network_application_gateway_ssl_cert_show
-  name: az network application-gateway ssl-cert show
-  summary: Get the details of an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_update
-  name: az network application-gateway ssl-cert update
-  summary: Update an SSL certificate.
-- uid: az_network_application_gateway_ssl_policy
-  name: az network application-gateway ssl-policy
-  summary: Manage the SSL policy of an application gateway.
-- uid: az_network_application_gateway_ssl_policy_list_options
-  name: az network application-gateway ssl-policy list-options
-  summary: Lists available SSL options for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined
-  name: az network application-gateway ssl-policy predefined
-  summary: Get information on predefined SSL policies.
-- uid: az_network_application_gateway_ssl_policy_predefined_list
-  name: az network application-gateway ssl-policy predefined list
-  summary: Lists all SSL predefined policies for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined_show
-  name: az network application-gateway ssl-policy predefined show
-  summary: Gets SSL predefined policy with the specified policy name.
-- uid: az_network_application_gateway_ssl_policy_set
-  name: az network application-gateway ssl-policy set
-  summary: Update or clear SSL policy settings.
-- uid: az_network_application_gateway_ssl_policy_show
-  name: az network application-gateway ssl-policy show
-  summary: Get the details of gateway's SSL policy settings.
-- uid: az_network_application_gateway_start
-  name: az network application-gateway start
-  summary: Start an application gateway.
-- uid: az_network_application_gateway_stop
-  name: az network application-gateway stop
-  summary: Stop an application gateway.
-- uid: az_network_application_gateway_update
-  name: az network application-gateway update
-  summary: Update an application gateway.
-- uid: az_network_application_gateway_url_path_map
-  name: az network application-gateway url-path-map
-  summary: Manage URL path maps of an application gateway.
-- uid: az_network_application_gateway_url_path_map_create
-  name: az network application-gateway url-path-map create
-  summary: Create a URL path map.
-- uid: az_network_application_gateway_url_path_map_delete
-  name: az network application-gateway url-path-map delete
-  summary: Delete a URL path map.
-- uid: az_network_application_gateway_url_path_map_list
-  name: az network application-gateway url-path-map list
-  summary: List URL path maps.
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
-- uid: az_network_application_gateway_url_path_map_show
-  name: az network application-gateway url-path-map show
-  summary: Get the details of a URL path map.
-- uid: az_network_application_gateway_url_path_map_update
-  name: az network application-gateway url-path-map update
-  summary: Update a URL path map.
-- uid: az_network_application_gateway_waf_config
-  name: az network application-gateway waf-config
-  summary: Configure the settings of a web application firewall.
-- uid: az_network_application_gateway_waf_config_list_rule_sets
-  name: az network application-gateway waf-config list-rule-sets
-  summary: Get information on available WAF rule sets, rule groups, and rule IDs.
-- uid: az_network_application_gateway_waf_config_set
-  name: az network application-gateway waf-config set
-  summary: Update the firewall configuration of a web application.
-- uid: az_network_application_gateway_waf_config_show
-  name: az network application-gateway waf-config show
-  summary: Get the firewall configuration of a web application.
-- uid: az_network_application_gateway_wait
-  name: az network application-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the application gateway is met.
-- uid: az_network_asg
-  name: az network asg
-  summary: Manage application security groups (ASGs).
-- uid: az_network_asg_create
-  name: az network asg create
-  summary: Create an application security group.
-- uid: az_network_asg_delete
-  name: az network asg delete
-  summary: Delete an application security group.
-- uid: az_network_asg_list
-  name: az network asg list
-  summary: List all application security groups in a subscription.
-- uid: az_network_asg_show
-  name: az network asg show
-  summary: Get details of an application security group.
-- uid: az_network_asg_update
-  name: az network asg update
-  summary: Update an application security group.
-- uid: az_network_bastion
-  name: az network bastion
-  summary: Manage Azure bastion host.
-- uid: az_network_bastion_create
-  name: az network bastion create
-  summary: Create a Azure bastion host machine.
-- uid: az_network_bastion_list
-  name: az network bastion list
-  summary: List all Azure bastion host machines.
-- uid: az_network_dns
-  name: az network dns
-  summary: Manage DNS domains in Azure.
-- uid: az_network_dns_record_set
-  name: az network dns record-set
-  summary: Manage DNS records and record sets.
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_dns_record_set_list
-  name: az network dns record-set list
-  summary: List all record sets within a DNS zone.
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_dns_zone
-  name: az network dns zone
-  summary: Manage DNS zones.
-- uid: az_network_dns_zone_create
-  name: az network dns zone create
-  summary: Create a DNS zone.
-- uid: az_network_dns_zone_delete
-  name: az network dns zone delete
-  summary: Delete a DNS zone and all associated records.
-- uid: az_network_dns_zone_export
-  name: az network dns zone export
-  summary: Export a DNS zone as a DNS zone file.
-- uid: az_network_dns_zone_import
-  name: az network dns zone import
-  summary: Create a DNS zone using a DNS zone file.
-- uid: az_network_dns_zone_list
-  name: az network dns zone list
-  summary: List DNS zones.
-- uid: az_network_dns_zone_show
-  name: az network dns zone show
-  summary: Get a DNS zone parameters. Does not show DNS records within the zone.
-- uid: az_network_dns_zone_update
-  name: az network dns zone update
-  summary: Update a DNS zone properties. Does not modify DNS records within the zone.
-- uid: az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-- uid: az_network_express_route_auth
-  name: az network express-route auth
-  summary: Manage authentication of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_create
-  name: az network express-route auth create
-  summary: Create a new link authorization for an ExpressRoute circuit.
-- uid: az_network_express_route_auth_delete
-  name: az network express-route auth delete
-  summary: Delete a link authorization of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_list
-  name: az network express-route auth list
-  summary: List link authorizations of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_show
-  name: az network express-route auth show
-  summary: Get the details of a link authorization of an ExpressRoute circuit.
-- uid: az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: az_network_express_route_delete
-  name: az network express-route delete
-  summary: Delete an ExpressRoute circuit.
-- uid: az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: az_network_express_route_get_stats
-  name: az network express-route get-stats
-  summary: Get the statistics of an ExpressRoute circuit.
-- uid: az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: az_network_express_route_list_arp_tables
-  name: az network express-route list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute circuit.
-- uid: az_network_express_route_list_route_tables
-  name: az network express-route list-route-tables
-  summary: Show the current routing table of an ExpressRoute circuit peering.
-- uid: az_network_express_route_list_service_providers
-  name: az network express-route list-service-providers
-  summary: List available ExpressRoute service providers.
-- uid: az_network_express_route_peering
-  name: az network express-route peering
-  summary: Manage ExpressRoute peering of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
-- uid: az_network_express_route_peering_create
-  name: az network express-route peering create
-  summary: Create peering settings for an ExpressRoute circuit.
-- uid: az_network_express_route_peering_delete
-  name: az network express-route peering delete
-  summary: Delete peering settings.
-- uid: az_network_express_route_peering_list
-  name: az network express-route peering list
-  summary: List peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_show
-  name: az network express-route peering show
-  summary: Get the details of an express route peering.
-- uid: az_network_express_route_peering_update
-  name: az network express-route peering update
-  summary: Update peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-- uid: az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-- uid: az_network_express_route_wait
-  name: az network express-route wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
-- uid: az_network_lb
-  name: az network lb
-  summary: Manage and configure load balancers.
-- uid: az_network_lb_address_pool
-  name: az network lb address-pool
-  summary: Manage address pools of a load balancer.
-- uid: az_network_lb_address_pool_create
-  name: az network lb address-pool create
-  summary: Create an address pool.
-- uid: az_network_lb_address_pool_delete
-  name: az network lb address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_lb_address_pool_list
-  name: az network lb address-pool list
-  summary: List address pools.
-- uid: az_network_lb_address_pool_show
-  name: az network lb address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_lb_create
-  name: az network lb create
-  summary: Create a load balancer.
-- uid: az_network_lb_delete
-  name: az network lb delete
-  summary: Delete a load balancer.
-- uid: az_network_lb_frontend_ip
-  name: az network lb frontend-ip
-  summary: Manage frontend IP addresses of a load balancer.
-- uid: az_network_lb_frontend_ip_create
-  name: az network lb frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_lb_frontend_ip_delete
-  name: az network lb frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_lb_frontend_ip_list
-  name: az network lb frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_lb_frontend_ip_show
-  name: az network lb frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_lb_frontend_ip_update
-  name: az network lb frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_lb_inbound_nat_pool
-  name: az network lb inbound-nat-pool
-  summary: Manage inbound NAT address pools of a load balancer.
-- uid: az_network_lb_inbound_nat_pool_create
-  name: az network lb inbound-nat-pool create
-  summary: Create an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_delete
-  name: az network lb inbound-nat-pool delete
-  summary: Delete an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_list
-  name: az network lb inbound-nat-pool list
-  summary: List inbound NAT address pools.
-- uid: az_network_lb_inbound_nat_pool_show
-  name: az network lb inbound-nat-pool show
-  summary: Get the details of an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_update
-  name: az network lb inbound-nat-pool update
-  summary: Update an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_rule
-  name: az network lb inbound-nat-rule
-  summary: Manage inbound NAT rules of a load balancer.
-- uid: az_network_lb_inbound_nat_rule_create
-  name: az network lb inbound-nat-rule create
-  summary: Create an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_delete
-  name: az network lb inbound-nat-rule delete
-  summary: Delete an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_list
-  name: az network lb inbound-nat-rule list
-  summary: List inbound NAT rules.
-- uid: az_network_lb_inbound_nat_rule_show
-  name: az network lb inbound-nat-rule show
-  summary: Get the details of an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_update
-  name: az network lb inbound-nat-rule update
-  summary: Update an inbound NAT rule.
-- uid: az_network_lb_list
-  name: az network lb list
-  summary: List load balancers.
-- uid: az_network_lb_probe
-  name: az network lb probe
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_lb_probe_create
-  name: az network lb probe create
-  summary: Create a probe.
-- uid: az_network_lb_probe_delete
-  name: az network lb probe delete
-  summary: Delete a probe.
-- uid: az_network_lb_probe_list
-  name: az network lb probe list
-  summary: List probes.
-- uid: az_network_lb_probe_show
-  name: az network lb probe show
-  summary: Get the details of a probe.
-- uid: az_network_lb_probe_update
-  name: az network lb probe update
-  summary: Update a probe.
-- uid: az_network_lb_rule
-  name: az network lb rule
-  summary: Manage load balancing rules.
-- uid: az_network_lb_rule_create
-  name: az network lb rule create
-  summary: Create a load balancing rule.
-- uid: az_network_lb_rule_delete
-  name: az network lb rule delete
-  summary: Delete a load balancing rule.
-- uid: az_network_lb_rule_list
-  name: az network lb rule list
-  summary: List load balancing rules.
-- uid: az_network_lb_rule_show
-  name: az network lb rule show
-  summary: Get the details of a load balancing rule.
-- uid: az_network_lb_rule_update
-  name: az network lb rule update
-  summary: Update a load balancing rule.
-- uid: az_network_lb_show
-  name: az network lb show
-  summary: Get the details of a load balancer.
-- uid: az_network_lb_update
-  name: az network lb update
-  summary: Update a load balancer.
-- uid: az_network_list_service_aliases
-  name: az network list-service-aliases
-  summary: List available service aliases in the region which can be used for Service Endpoint Policies.
-- uid: az_network_list_usages
-  name: az network list-usages
-  summary: List the number of network resources in a region that are used against a subscription quota.
-- uid: az_network_local_gateway
-  name: az network local-gateway
-  summary: Manage local gateways.
-- uid: az_network_local_gateway_create
-  name: az network local-gateway create
-  summary: Create a local VPN gateway.
-- uid: az_network_local_gateway_delete
-  name: az network local-gateway delete
-  summary: Delete a local VPN gateway.
-- uid: az_network_local_gateway_list
-  name: az network local-gateway list
-  summary: List all local VPN gateways in a resource group.
-- uid: az_network_local_gateway_show
-  name: az network local-gateway show
-  summary: Get the details of a local VPN gateway.
-- uid: az_network_local_gateway_update
-  name: az network local-gateway update
-  summary: Update a local VPN gateway.
-- uid: az_network_local_gateway_wait
-  name: az network local-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the local gateway is met.
-- uid: az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-- uid: az_network_nic_create
-  name: az network nic create
-  summary: Create a network interface.
-- uid: az_network_nic_delete
-  name: az network nic delete
-  summary: Delete a network interface.
-- uid: az_network_nic_ip_config
-  name: az network nic ip-config
-  summary: Manage IP configurations of a network interface.
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
-- uid: az_network_nic_ip_config_create
-  name: az network nic ip-config create
-  summary: Create an IP configuration.
-- uid: az_network_nic_ip_config_delete
-  name: az network nic ip-config delete
-  summary: Delete an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
-- uid: az_network_nic_ip_config_list
-  name: az network nic ip-config list
-  summary: List the IP configurations of a NIC.
-- uid: az_network_nic_ip_config_show
-  name: az network nic ip-config show
-  summary: Show the details of an IP configuration.
-- uid: az_network_nic_ip_config_update
-  name: az network nic ip-config update
-  summary: Update an IP configuration.
-- uid: az_network_nic_list
-  name: az network nic list
-  summary: List network interfaces.
-- uid: az_network_nic_list_effective_nsg
-  name: az network nic list-effective-nsg
-  summary: List all effective network security groups applied to a network interface.
-- uid: az_network_nic_show
-  name: az network nic show
-  summary: Get the details of a network interface.
-- uid: az_network_nic_show_effective_route_table
-  name: az network nic show-effective-route-table
-  summary: Show the effective route table applied to a network interface.
-- uid: az_network_nic_update
-  name: az network nic update
-  summary: Update a network interface.
-- uid: az_network_nic_wait
-  name: az network nic wait
-  summary: Place the CLI in a waiting state until a condition of the network interface is met.
-- uid: az_network_nsg
-  name: az network nsg
-  summary: Manage Azure Network Security Groups (NSGs).
-- uid: az_network_nsg_create
-  name: az network nsg create
-  summary: Create a network security group.
-- uid: az_network_nsg_delete
-  name: az network nsg delete
-  summary: Delete a network security group.
-- uid: az_network_nsg_list
-  name: az network nsg list
-  summary: List network security groups.
-- uid: az_network_nsg_rule
-  name: az network nsg rule
-  summary: Manage network security group rules.
-- uid: az_network_nsg_rule_create
-  name: az network nsg rule create
-  summary: Create a network security group rule.
-- uid: az_network_nsg_rule_delete
-  name: az network nsg rule delete
-  summary: Delete a network security group rule.
-- uid: az_network_nsg_rule_list
-  name: az network nsg rule list
-  summary: List all rules in a network security group.
-- uid: az_network_nsg_rule_show
-  name: az network nsg rule show
-  summary: Get the details of a network security group rule.
-- uid: az_network_nsg_rule_update
-  name: az network nsg rule update
-  summary: Update a network security group rule.
-- uid: az_network_nsg_show
-  name: az network nsg show
-  summary: Get information about a network security group.
-- uid: az_network_nsg_update
-  name: az network nsg update
-  summary: Update a network security group.
-- uid: az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-- uid: az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: az_network_private_dns_zone_export
-  name: az network private-dns zone export
-  summary: Export a Private DNS zone as a DNS zone file.
-- uid: az_network_private_dns_zone_import
-  name: az network private-dns zone import
-  summary: Create a Private DNS zone using a DNS zone file.
-- uid: az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
-- uid: az_network_private_endpoint
-  name: az network private-endpoint
-  summary: Manage private endpoints.
-- uid: az_network_private_endpoint_list
-  name: az network private-endpoint list
-  summary: List private endpoints.
-- uid: az_network_private_endpoint_connection
-  name: az network private-endpoint-connection
-  summary: Manage private endpoint connections.
-- uid: az_network_private_endpoint_connection_approve
-  name: az network private-endpoint-connection approve
-  summary: Approve a private endpoint connection.
-- uid: az_network_private_endpoint_connection_delete
-  name: az network private-endpoint-connection delete
-  summary: Delete a private endpoint connection.
-- uid: az_network_private_endpoint_connection_list
-  name: az network private-endpoint-connection list
-  summary: List all private endpoint connections.
-- uid: az_network_private_endpoint_connection_reject
-  name: az network private-endpoint-connection reject
-  summary: Reject a private endpoint connection.
-- uid: az_network_private_endpoint_connection_show
-  name: az network private-endpoint-connection show
-  summary: Show a private endpoint connection.
-- uid: az_network_private_link_resource
-  name: az network private-link-resource
-  summary: Manage private link resources.
-- uid: az_network_private_link_resource_list
-  name: az network private-link-resource list
-  summary: List all private link resources.
-- uid: az_network_private_link_service
-  name: az network private-link-service
-  summary: Manage private link services.
-- uid: az_network_private_link_service_connection
-  name: az network private-link-service connection
-  summary: Manage private link service endpoint connections.
-- uid: az_network_private_link_service_connection_update
-  name: az network private-link-service connection update
-  summary: Update a private link service endpoint connection.
-- uid: az_network_private_link_service_create
-  name: az network private-link-service create
-  summary: Create a private link service.
-- uid: az_network_private_link_service_list
-  name: az network private-link-service list
-  summary: List private link services.
-- uid: az_network_profile
-  name: az network profile
-  summary: Manage network profiles.
-- uid: az_network_profile_list
-  name: az network profile list
-  summary: List network profiles.
-- uid: az_network_public_ip
-  name: az network public-ip
-  summary: Manage public IP addresses.
-- uid: az_network_public_ip_create
-  name: az network public-ip create
-  summary: Create a public IP address.
-- uid: az_network_public_ip_delete
-  name: az network public-ip delete
-  summary: Delete a public IP address.
-- uid: az_network_public_ip_list
-  name: az network public-ip list
-  summary: List public IP addresses.
-- uid: az_network_public_ip_prefix
-  name: az network public-ip prefix
-  summary: Manage public IP prefix resources.
-- uid: az_network_public_ip_prefix_create
-  name: az network public-ip prefix create
-  summary: Create a public IP prefix resource.
-- uid: az_network_public_ip_prefix_list
-  name: az network public-ip prefix list
-  summary: List public IP prefix resources.
-- uid: az_network_public_ip_show
-  name: az network public-ip show
-  summary: Get the details of a public IP address.
-- uid: az_network_public_ip_update
-  name: az network public-ip update
-  summary: Update a public IP address.
-- uid: az_network_route_filter
-  name: az network route-filter
-  summary: Manage route filters.
-- uid: az_network_route_filter_create
-  name: az network route-filter create
-  summary: Create a route filter.
-- uid: az_network_route_filter_delete
-  name: az network route-filter delete
-  summary: Delete a route filter.
-- uid: az_network_route_filter_list
-  name: az network route-filter list
-  summary: List route filters.
-- uid: az_network_route_filter_rule
-  name: az network route-filter rule
-  summary: Manage rules in a route filter.
-- uid: az_network_route_filter_rule_create
-  name: az network route-filter rule create
-  summary: Create a rule in a route filter.
-- uid: az_network_route_filter_rule_delete
-  name: az network route-filter rule delete
-  summary: Delete a rule from a route filter.
-- uid: az_network_route_filter_rule_list
-  name: az network route-filter rule list
-  summary: List rules in a route filter.
-- uid: az_network_route_filter_rule_list_service_communities
-  name: az network route-filter rule list-service-communities
-  summary: Gets all the available BGP service communities.
-- uid: az_network_route_filter_rule_show
-  name: az network route-filter rule show
-  summary: Get the details of a rule in a route filter.
-- uid: az_network_route_filter_rule_update
-  name: az network route-filter rule update
-  summary: Update a rule in a route filter.
-- uid: az_network_route_filter_show
-  name: az network route-filter show
-  summary: Get the details of a route filter.
-- uid: az_network_route_filter_update
-  name: az network route-filter update
-  summary: Update a route filter.
-- uid: az_network_route_table
-  name: az network route-table
-  summary: Manage route tables.
-- uid: az_network_route_table_create
-  name: az network route-table create
-  summary: Create a route table.
-- uid: az_network_route_table_delete
-  name: az network route-table delete
-  summary: Delete a route table.
-- uid: az_network_route_table_list
-  name: az network route-table list
-  summary: List route tables.
-- uid: az_network_route_table_route
-  name: az network route-table route
-  summary: Manage routes in a route table.
-- uid: az_network_route_table_route_create
-  name: az network route-table route create
-  summary: Create a route in a route table.
-- uid: az_network_route_table_route_delete
-  name: az network route-table route delete
-  summary: Delete a route from a route table.
-- uid: az_network_route_table_route_list
-  name: az network route-table route list
-  summary: List routes in a route table.
-- uid: az_network_route_table_route_show
-  name: az network route-table route show
-  summary: Get the details of a route in a route table.
-- uid: az_network_route_table_route_update
-  name: az network route-table route update
-  summary: Update a route in a route table.
-- uid: az_network_route_table_show
-  name: az network route-table show
-  summary: Get the details of a route table.
-- uid: az_network_route_table_update
-  name: az network route-table update
-  summary: Update a route table.
-- uid: az_network_security_partner_provider
-  name: az network security-partner-provider
-  summary: Manage Azure security partner provider.
-- uid: az_network_security_partner_provider_create
-  name: az network security-partner-provider create
-  summary: Create a Azure security partner provider.
-- uid: az_network_security_partner_provider_list
-  name: az network security-partner-provider list
-  summary: List all Azure security partner provider.
-- uid: az_network_service_endpoint
-  name: az network service-endpoint
-  summary: Manage policies related to service endpoints.
-- uid: az_network_service_endpoint_list
-  name: az network service-endpoint list
-  summary: List what values of endpoint services are available for use.
-- uid: az_network_service_endpoint_policy
-  name: az network service-endpoint policy
-  summary: Manage service endpoint policies.
-- uid: az_network_service_endpoint_policy_create
-  name: az network service-endpoint policy create
-  summary: Create a service endpoint policy.
-- uid: az_network_service_endpoint_policy_list
-  name: az network service-endpoint policy list
-  summary: List service endpoint policies.
-- uid: az_network_service_endpoint_policy_definition
-  name: az network service-endpoint policy-definition
-  summary: Manage service endpoint policy definitions.
-- uid: az_network_service_endpoint_policy_definition_create
-  name: az network service-endpoint policy-definition create
-  summary: Create a service endpoint policy definition.
-- uid: az_network_traffic_manager
-  name: az network traffic-manager
-  summary: Manage the routing of incoming traffic.
-- uid: az_network_traffic_manager_endpoint
-  name: az network traffic-manager endpoint
-  summary: Manage Azure Traffic Manager end points.
-- uid: az_network_traffic_manager_endpoint_create
-  name: az network traffic-manager endpoint create
-  summary: Create a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_delete
-  name: az network traffic-manager endpoint delete
-  summary: Delete a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_list
-  name: az network traffic-manager endpoint list
-  summary: List traffic manager endpoints.
-- uid: az_network_traffic_manager_endpoint_show
-  name: az network traffic-manager endpoint show
-  summary: Get the details of a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  name: az network traffic-manager endpoint show-geographic-hierarchy
-  summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-- uid: az_network_traffic_manager_endpoint_update
-  name: az network traffic-manager endpoint update
-  summary: Update a traffic manager endpoint.
-- uid: az_network_traffic_manager_profile
-  name: az network traffic-manager profile
-  summary: Manage Azure Traffic Manager profiles.
-- uid: az_network_traffic_manager_profile_check_dns
-  name: az network traffic-manager profile check-dns
-  summary: Check the availability of a relative DNS name.
-- uid: az_network_traffic_manager_profile_create
-  name: az network traffic-manager profile create
-  summary: Create a traffic manager profile.
-- uid: az_network_traffic_manager_profile_delete
-  name: az network traffic-manager profile delete
-  summary: Delete a traffic manager profile.
-- uid: az_network_traffic_manager_profile_list
-  name: az network traffic-manager profile list
-  summary: List traffic manager profiles.
-- uid: az_network_traffic_manager_profile_show
-  name: az network traffic-manager profile show
-  summary: Get the details of a traffic manager profile.
-- uid: az_network_traffic_manager_profile_update
-  name: az network traffic-manager profile update
-  summary: Update a traffic manager profile.
-- uid: az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-- uid: az_network_vnet_check_ip_address
-  name: az network vnet check-ip-address
-  summary: Check if a private IP address is available for use within a virtual network.
-- uid: az_network_vnet_create
-  name: az network vnet create
-  summary: Create a virtual network.
-- uid: az_network_vnet_delete
-  name: az network vnet delete
-  summary: Delete a virtual network.
-- uid: az_network_vnet_list
-  name: az network vnet list
-  summary: List virtual networks.
-- uid: az_network_vnet_list_available_ips
-  name: az network vnet list-available-ips
-  summary: List some available ips in the vnet.
-- uid: az_network_vnet_list_endpoint_services
-  name: az network vnet list-endpoint-services
-  summary: List which services support VNET service tunneling in a given region.
-- uid: az_network_vnet_peering
-  name: az network vnet peering
-  summary: Manage peering connections between Azure Virtual Networks.
-- uid: az_network_vnet_peering_create
-  name: az network vnet peering create
-  summary: Create a virtual network peering connection.
-- uid: az_network_vnet_peering_delete
-  name: az network vnet peering delete
-  summary: Delete a peering.
-- uid: az_network_vnet_peering_list
-  name: az network vnet peering list
-  summary: List peerings.
-- uid: az_network_vnet_peering_show
-  name: az network vnet peering show
-  summary: Show details of a peering.
-- uid: az_network_vnet_peering_update
-  name: az network vnet peering update
-  summary: Update a peering.
-- uid: az_network_vnet_show
-  name: az network vnet show
-  summary: Get the details of a virtual network.
-- uid: az_network_vnet_subnet
-  name: az network vnet subnet
-  summary: Manage subnets in an Azure Virtual Network.
-- uid: az_network_vnet_subnet_create
-  name: az network vnet subnet create
-  summary: Create a subnet and associate an existing NSG and route table.
-- uid: az_network_vnet_subnet_delete
-  name: az network vnet subnet delete
-  summary: Delete a subnet.
-- uid: az_network_vnet_subnet_list
-  name: az network vnet subnet list
-  summary: List the subnets in a virtual network.
-- uid: az_network_vnet_subnet_show
-  name: az network vnet subnet show
-  summary: Show details of a subnet.
-- uid: az_network_vnet_subnet_update
-  name: az network vnet subnet update
-  summary: Update a subnet.
-- uid: az_network_vnet_update
-  name: az network vnet update
-  summary: Update a virtual network.
-- uid: az_network_vnet_gateway
-  name: az network vnet-gateway
-  summary: Use an Azure Virtual Network Gateway to establish secure, cross-premises connectivity.
-- uid: az_network_vnet_gateway_create
-  name: az network vnet-gateway create
-  summary: Create a virtual network gateway.
-- uid: az_network_vnet_gateway_delete
-  name: az network vnet-gateway delete
-  summary: Delete a virtual network gateway.
-- uid: az_network_vnet_gateway_list
-  name: az network vnet-gateway list
-  summary: List virtual network gateways.
-- uid: az_network_vnet_gateway_list_advertised_routes
-  name: az network vnet-gateway list-advertised-routes
-  summary: List the routes of a virtual network gateway advertised to the specified peer.
-- uid: az_network_vnet_gateway_list_bgp_peer_status
-  name: az network vnet-gateway list-bgp-peer-status
-  summary: Retrieve the status of BGP peers.
-- uid: az_network_vnet_gateway_list_learned_routes
-  name: az network vnet-gateway list-learned-routes
-  summary: This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
-- uid: az_network_vnet_gateway_reset
-  name: az network vnet-gateway reset
-  summary: Reset a virtual network gateway.
-- uid: az_network_vnet_gateway_revoked_cert
-  name: az network vnet-gateway revoked-cert
-  summary: Manage revoked certificates in a virtual network gateway.
-- uid: az_network_vnet_gateway_revoked_cert_create
-  name: az network vnet-gateway revoked-cert create
-  summary: Revoke a certificate.
-- uid: az_network_vnet_gateway_revoked_cert_delete
-  name: az network vnet-gateway revoked-cert delete
-  summary: Delete a revoked certificate.
-- uid: az_network_vnet_gateway_root_cert
-  name: az network vnet-gateway root-cert
-  summary: Manage root certificates of a virtual network gateway.
-- uid: az_network_vnet_gateway_root_cert_create
-  name: az network vnet-gateway root-cert create
-  summary: Upload a root certificate.
-- uid: az_network_vnet_gateway_root_cert_delete
-  name: az network vnet-gateway root-cert delete
-  summary: Delete a root certificate.
-- uid: az_network_vnet_gateway_show
-  name: az network vnet-gateway show
-  summary: Get the details of a virtual network gateway.
-- uid: az_network_vnet_gateway_update
-  name: az network vnet-gateway update
-  summary: Update a virtual network gateway.
-- uid: az_network_vnet_gateway_vpn_client
-  name: az network vnet-gateway vpn-client
-  summary: Download a VPN client configuration required to connect to Azure via point-to-site.
-- uid: az_network_vnet_gateway_vpn_client_generate
-  name: az network vnet-gateway vpn-client generate
-  summary: Generate VPN client configuration.
-- uid: az_network_vnet_gateway_vpn_client_show_url
-  name: az network vnet-gateway vpn-client show-url
-  summary: Retrieve a pre-generated VPN client configuration.
-- uid: az_network_vnet_gateway_wait
-  name: az network vnet-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network gateway is met.
-- uid: az_network_vpn_connection
-  name: az network vpn-connection
-  summary: Manage VPN connections.
-- uid: az_network_vpn_connection_create
-  name: az network vpn-connection create
-  summary: Create a VPN connection.
-- uid: az_network_vpn_connection_delete
-  name: az network vpn-connection delete
-  summary: Delete a VPN connection.
-- uid: az_network_vpn_connection_ipsec_policy
-  name: az network vpn-connection ipsec-policy
-  summary: Manage VPN connection IPSec policies.
-- uid: az_network_vpn_connection_ipsec_policy_add
-  name: az network vpn-connection ipsec-policy add
-  summary: Add a VPN connection IPSec policy.
-- uid: az_network_vpn_connection_ipsec_policy_clear
-  name: az network vpn-connection ipsec-policy clear
-  summary: Delete all IPsec policies on a VPN connection.
-- uid: az_network_vpn_connection_ipsec_policy_list
-  name: az network vpn-connection ipsec-policy list
-  summary: List IPSec policies associated with a VPN connection.
-- uid: az_network_vpn_connection_list
-  name: az network vpn-connection list
-  summary: List all VPN connections in a resource group.
-- uid: az_network_vpn_connection_shared_key
-  name: az network vpn-connection shared-key
-  summary: Manage VPN shared keys.
-- uid: az_network_vpn_connection_shared_key_reset
-  name: az network vpn-connection shared-key reset
-  summary: Reset a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_show
-  name: az network vpn-connection shared-key show
-  summary: Retrieve a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_update
-  name: az network vpn-connection shared-key update
-  summary: Update a VPN connection shared key.
-- uid: az_network_vpn_connection_show
-  name: az network vpn-connection show
-  summary: Get the details of a VPN connection.
-- uid: az_network_vpn_connection_update
-  name: az network vpn-connection update
-  summary: Update a VPN connection.
-- uid: az_network_vrouter
-  name: az network vrouter
-  summary: Manage the virtual router.
-- uid: az_network_vrouter_create
-  name: az network vrouter create
-  summary: Create a virtual router.
-- uid: az_network_vrouter_list
-  name: az network vrouter list
-  summary: List all virtual routers under a subscription or a resource group.
-- uid: az_network_vrouter_peering
-  name: az network vrouter peering
-  summary: Manage the virtual router peering.
-- uid: az_network_vrouter_peering_create
-  name: az network vrouter peering create
-  summary: Create a virtual router peering.
-- uid: az_network_watcher
-  name: az network watcher
-  summary: Manage the Azure Network Watcher.
-- uid: az_network_watcher_configure
-  name: az network watcher configure
-  summary: Configure the Network Watcher service for different regions.
-- uid: az_network_watcher_flow_log
-  name: az network watcher flow-log
-  summary: Manage network security group flow logging.
-- uid: az_network_watcher_flow_log_configure
-  name: az network watcher flow-log configure
-  summary: Configure flow logging on a network security group.
-- uid: az_network_watcher_flow_log_show
-  name: az network watcher flow-log show
-  summary: Get the flow log configuration of a network security group.
-- uid: az_network_watcher_list
-  name: az network watcher list
-  summary: List Network Watchers.
-- uid: az_network_watcher_packet_capture
-  name: az network watcher packet-capture
-  summary: Manage packet capture sessions on VMs.
-- uid: az_network_watcher_packet_capture_create
-  name: az network watcher packet-capture create
-  summary: Create and start a packet capture session.
-- uid: az_network_watcher_packet_capture_delete
-  name: az network watcher packet-capture delete
-  summary: Delete a packet capture session.
-- uid: az_network_watcher_packet_capture_list
-  name: az network watcher packet-capture list
-  summary: List all packet capture sessions within a resource group.
-- uid: az_network_watcher_packet_capture_show
-  name: az network watcher packet-capture show
-  summary: Show details of a packet capture session.
-- uid: az_network_watcher_packet_capture_show_status
-  name: az network watcher packet-capture show-status
-  summary: Show the status of a packet capture session.
-- uid: az_network_watcher_packet_capture_stop
-  name: az network watcher packet-capture stop
-  summary: Stop a running packet capture session.
-- uid: az_network_watcher_show_next_hop
-  name: az network watcher show-next-hop
-  summary: Get information on the 'next hop' of a VM.
-- uid: az_network_watcher_show_security_group_view
-  name: az network watcher show-security-group-view
-  summary: Get detailed security information on a VM for the currently configured network security group.
-- uid: az_network_watcher_show_topology
-  name: az network watcher show-topology
-  summary: Get the network topology of a resource group, virtual network or subnet.
-- uid: az_network_watcher_test_connectivity
-  name: az network watcher test-connectivity
-  summary: Test if a connection can be established between a Virtual Machine and a given endpoint.
-- uid: az_network_watcher_test_ip_flow
-  name: az network watcher test-ip-flow
-  summary: Test IP flow to/from a VM given the currently configured network security group rules.
-- uid: az_network_watcher_troubleshooting
-  name: az network watcher troubleshooting
-  summary: Manage Network Watcher troubleshooting sessions.
-- uid: az_network_watcher_troubleshooting_show
-  name: az network watcher troubleshooting show
-  summary: Get the results of the last troubleshooting operation.
-- uid: az_network_watcher_troubleshooting_start
-  name: az network watcher troubleshooting start
-  summary: Troubleshoot issues with VPN connections or gateway connectivity.
+- az_network_application-gateway
+- az_network_application-gateway_address-pool
+- az_network_application-gateway_address-pool_create
+- az_network_application-gateway_address-pool_delete
+- az_network_application-gateway_address-pool_list
+- az_network_application-gateway_address-pool_show
+- az_network_application-gateway_address-pool_update
+- az_network_application-gateway_auth-cert
+- az_network_application-gateway_auth-cert_create
+- az_network_application-gateway_auth-cert_delete
+- az_network_application-gateway_auth-cert_list
+- az_network_application-gateway_auth-cert_show
+- az_network_application-gateway_auth-cert_update
+- az_network_application-gateway_create
+- az_network_application-gateway_delete
+- az_network_application-gateway_frontend-ip
+- az_network_application-gateway_frontend-ip_create
+- az_network_application-gateway_frontend-ip_delete
+- az_network_application-gateway_frontend-ip_list
+- az_network_application-gateway_frontend-ip_show
+- az_network_application-gateway_frontend-ip_update
+- az_network_application-gateway_frontend-port
+- az_network_application-gateway_frontend-port_create
+- az_network_application-gateway_frontend-port_delete
+- az_network_application-gateway_frontend-port_list
+- az_network_application-gateway_frontend-port_show
+- az_network_application-gateway_frontend-port_update
+- az_network_application-gateway_http-listener
+- az_network_application-gateway_http-listener_create
+- az_network_application-gateway_http-listener_delete
+- az_network_application-gateway_http-listener_list
+- az_network_application-gateway_http-listener_show
+- az_network_application-gateway_http-listener_update
+- az_network_application-gateway_http-settings
+- az_network_application-gateway_http-settings_create
+- az_network_application-gateway_http-settings_delete
+- az_network_application-gateway_http-settings_list
+- az_network_application-gateway_http-settings_show
+- az_network_application-gateway_http-settings_update
+- az_network_application-gateway_list
+- az_network_application-gateway_probe
+- az_network_application-gateway_probe_create
+- az_network_application-gateway_probe_delete
+- az_network_application-gateway_probe_list
+- az_network_application-gateway_probe_show
+- az_network_application-gateway_probe_update
+- az_network_application-gateway_redirect-config
+- az_network_application-gateway_redirect-config_create
+- az_network_application-gateway_redirect-config_delete
+- az_network_application-gateway_redirect-config_list
+- az_network_application-gateway_redirect-config_show
+- az_network_application-gateway_redirect-config_update
+- az_network_application-gateway_rewrite-rule
+- az_network_application-gateway_rewrite-rule_set
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
+- az_network_application-gateway_rule
+- az_network_application-gateway_rule_create
+- az_network_application-gateway_rule_delete
+- az_network_application-gateway_rule_list
+- az_network_application-gateway_rule_show
+- az_network_application-gateway_rule_update
+- az_network_application-gateway_show
+- az_network_application-gateway_show-backend-health
+- az_network_application-gateway_ssl-cert
+- az_network_application-gateway_ssl-cert_create
+- az_network_application-gateway_ssl-cert_delete
+- az_network_application-gateway_ssl-cert_list
+- az_network_application-gateway_ssl-cert_show
+- az_network_application-gateway_ssl-cert_update
+- az_network_application-gateway_ssl-policy
+- az_network_application-gateway_ssl-policy_list-options
+- az_network_application-gateway_ssl-policy_predefined
+- az_network_application-gateway_ssl-policy_predefined_list
+- az_network_application-gateway_ssl-policy_predefined_show
+- az_network_application-gateway_ssl-policy_set
+- az_network_application-gateway_ssl-policy_show
+- az_network_application-gateway_start
+- az_network_application-gateway_stop
+- az_network_application-gateway_update
+- az_network_application-gateway_url-path-map
+- az_network_application-gateway_url-path-map_create
+- az_network_application-gateway_url-path-map_delete
+- az_network_application-gateway_url-path-map_list
+- az_network_application-gateway_url-path-map_rule
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
+- az_network_application-gateway_url-path-map_show
+- az_network_application-gateway_url-path-map_update
+- az_network_application-gateway_waf-config
+- az_network_application-gateway_waf-config_list-rule-sets
+- az_network_application-gateway_waf-config_set
+- az_network_application-gateway_waf-config_show
+- az_network_application-gateway_wait
+- az_network_asg
+- az_network_asg_create
+- az_network_asg_delete
+- az_network_asg_list
+- az_network_asg_show
+- az_network_asg_update
+- az_network_bastion
+- az_network_bastion_create
+- az_network_bastion_list
+- az_network_cross-connection
+- az_network_cross-connection_list
+- az_network_cross-connection_list-arp-tables
+- az_network_cross-connection_list-route-tables
+- az_network_cross-connection_peering
+- az_network_cross-connection_peering_create
+- az_network_cross-connection_peering_delete
+- az_network_cross-connection_peering_list
+- az_network_cross-connection_peering_show
+- az_network_cross-connection_peering_update
+- az_network_cross-connection_show
+- az_network_cross-connection_summarize-route-table
+- az_network_cross-connection_update
+- az_network_cross-connection_wait
+- az_network_cross-region-lb
+- az_network_cross-region-lb_address-pool
+- az_network_cross-region-lb_address-pool_address
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+- az_network_cross-region-lb_address-pool_create
+- az_network_cross-region-lb_address-pool_delete
+- az_network_cross-region-lb_create
+- az_network_cross-region-lb_delete
+- az_network_cross-region-lb_frontend-ip
+- az_network_cross-region-lb_frontend-ip_create
+- az_network_cross-region-lb_frontend-ip_delete
+- az_network_cross-region-lb_frontend-ip_list
+- az_network_cross-region-lb_frontend-ip_show
+- az_network_cross-region-lb_frontend-ip_update
+- az_network_cross-region-lb_list
+- az_network_cross-region-lb_probe
+- az_network_cross-region-lb_probe_create
+- az_network_cross-region-lb_probe_delete
+- az_network_cross-region-lb_probe_list
+- az_network_cross-region-lb_probe_show
+- az_network_cross-region-lb_probe_update
+- az_network_cross-region-lb_rule
+- az_network_cross-region-lb_rule_create
+- az_network_cross-region-lb_rule_delete
+- az_network_cross-region-lb_rule_list
+- az_network_cross-region-lb_rule_show
+- az_network_cross-region-lb_rule_update
+- az_network_cross-region-lb_show
+- az_network_cross-region-lb_update
+- az_network_cross-region-lb_wait
+- az_network_dns
+- az_network_dns_record-set
+- az_network_dns_record-set_a
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
+- az_network_dns_record-set_aaaa
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
+- az_network_dns_record-set_cname
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
+- az_network_dns_record-set_list
+- az_network_dns_record-set_mx
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
+- az_network_dns_record-set_ns
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
+- az_network_dns_record-set_ptr
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
+- az_network_dns_record-set_soa
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
+- az_network_dns_record-set_srv
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
+- az_network_dns_record-set_txt
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
+- az_network_dns_zone
+- az_network_dns_zone_create
+- az_network_dns_zone_delete
+- az_network_dns_zone_export
+- az_network_dns_zone_import
+- az_network_dns_zone_list
+- az_network_dns_zone_show
+- az_network_dns_zone_update
+- az_network_express-route
+- az_network_express-route_auth
+- az_network_express-route_auth_create
+- az_network_express-route_auth_delete
+- az_network_express-route_auth_list
+- az_network_express-route_auth_show
+- az_network_express-route_create
+- az_network_express-route_delete
+- az_network_express-route_gateway
+- az_network_express-route_gateway_connection
+- az_network_express-route_gateway_connection_create
+- az_network_express-route_gateway_create
+- az_network_express-route_gateway_list
+- az_network_express-route_get-stats
+- az_network_express-route_list
+- az_network_express-route_list-arp-tables
+- az_network_express-route_list-route-tables
+- az_network_express-route_list-route-tables-summary
+- az_network_express-route_list-service-providers
+- az_network_express-route_peering
+- az_network_express-route_peering_connection
+- az_network_express-route_peering_connection_create
+- az_network_express-route_peering_create
+- az_network_express-route_peering_delete
+- az_network_express-route_peering_get-stats
+- az_network_express-route_peering_list
+- az_network_express-route_peering_show
+- az_network_express-route_peering_update
+- az_network_express-route_port
+- az_network_express-route_port_create
+- az_network_express-route_port_generate-loa
+- az_network_express-route_port_list
+- az_network_express-route_show
+- az_network_express-route_update
+- az_network_express-route_wait
+- az_network_firewall
+- az_network_firewall_application-rule
+- az_network_firewall_application-rule_collection
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+- az_network_firewall_application-rule_create
+- az_network_firewall_application-rule_delete
+- az_network_firewall_application-rule_list
+- az_network_firewall_application-rule_show
+- az_network_firewall_create
+- az_network_firewall_delete
+- az_network_firewall_ip-config
+- az_network_firewall_ip-config_create
+- az_network_firewall_ip-config_delete
+- az_network_firewall_ip-config_list
+- az_network_firewall_ip-config_show
+- az_network_firewall_list
+- az_network_firewall_list-fqdn-tags
+- az_network_firewall_management-ip-config
+- az_network_firewall_management-ip-config_show
+- az_network_firewall_management-ip-config_update
+- az_network_firewall_nat-rule
+- az_network_firewall_nat-rule_collection
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+- az_network_firewall_nat-rule_create
+- az_network_firewall_nat-rule_delete
+- az_network_firewall_nat-rule_list
+- az_network_firewall_nat-rule_show
+- az_network_firewall_network-rule
+- az_network_firewall_network-rule_collection
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+- az_network_firewall_network-rule_create
+- az_network_firewall_network-rule_delete
+- az_network_firewall_network-rule_list
+- az_network_firewall_network-rule_show
+- az_network_firewall_policy
+- az_network_firewall_policy_create
+- az_network_firewall_policy_delete
+- az_network_firewall_policy_intrusion-detection
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+- az_network_firewall_policy_list
+- az_network_firewall_policy_rule-collection-group
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+- az_network_firewall_policy_show
+- az_network_firewall_policy_update
+- az_network_firewall_show
+- az_network_firewall_threat-intel-allowlist
+- az_network_firewall_threat-intel-allowlist_create
+- az_network_firewall_threat-intel-allowlist_delete
+- az_network_firewall_threat-intel-allowlist_show
+- az_network_firewall_threat-intel-allowlist_update
+- az_network_firewall_update
+- az_network_front-door
+- az_network_front-door_backend-pool
+- az_network_front-door_backend-pool_backend
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+- az_network_front-door_backend-pool_create
+- az_network_front-door_backend-pool_delete
+- az_network_front-door_backend-pool_list
+- az_network_front-door_backend-pool_show
+- az_network_front-door_check-custom-domain
+- az_network_front-door_check-name-availability
+- az_network_front-door_create
+- az_network_front-door_delete
+- az_network_front-door_frontend-endpoint
+- az_network_front-door_frontend-endpoint_create
+- az_network_front-door_frontend-endpoint_delete
+- az_network_front-door_frontend-endpoint_disable-https
+- az_network_front-door_frontend-endpoint_enable-https
+- az_network_front-door_frontend-endpoint_list
+- az_network_front-door_frontend-endpoint_show
+- az_network_front-door_frontend-endpoint_wait
+- az_network_front-door_list
+- az_network_front-door_load-balancing
+- az_network_front-door_load-balancing_create
+- az_network_front-door_load-balancing_delete
+- az_network_front-door_load-balancing_list
+- az_network_front-door_load-balancing_show
+- az_network_front-door_load-balancing_update
+- az_network_front-door_probe
+- az_network_front-door_probe_create
+- az_network_front-door_probe_delete
+- az_network_front-door_probe_list
+- az_network_front-door_probe_show
+- az_network_front-door_probe_update
+- az_network_front-door_purge-endpoint
+- az_network_front-door_routing-rule
+- az_network_front-door_routing-rule_create
+- az_network_front-door_routing-rule_delete
+- az_network_front-door_routing-rule_list
+- az_network_front-door_routing-rule_show
+- az_network_front-door_routing-rule_update
+- az_network_front-door_rules-engine
+- az_network_front-door_rules-engine_delete
+- az_network_front-door_rules-engine_list
+- az_network_front-door_rules-engine_rule
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+- az_network_front-door_rules-engine_show
+- az_network_front-door_show
+- az_network_front-door_update
+- az_network_front-door_waf-policy
+- az_network_front-door_waf-policy_create
+- az_network_front-door_waf-policy_delete
+- az_network_front-door_waf-policy_list
+- az_network_front-door_waf-policy_managed-rule-definition
+- az_network_front-door_waf-policy_managed-rule-definition_list
+- az_network_front-door_waf-policy_managed-rules
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+- az_network_front-door_waf-policy_rule
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+- az_network_front-door_waf-policy_show
+- az_network_front-door_waf-policy_update
+- az_network_front-door_wait
+- az_network_ip-group
+- az_network_ip-group_create
+- az_network_ip-group_delete
+- az_network_ip-group_list
+- az_network_ip-group_show
+- az_network_ip-group_update
+- az_network_lb
+- az_network_lb_address-pool
+- az_network_lb_address-pool_address
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+- az_network_lb_address-pool_create
+- az_network_lb_address-pool_delete
+- az_network_lb_address-pool_list
+- az_network_lb_address-pool_show
+- az_network_lb_create
+- az_network_lb_delete
+- az_network_lb_frontend-ip
+- az_network_lb_frontend-ip_create
+- az_network_lb_frontend-ip_delete
+- az_network_lb_frontend-ip_list
+- az_network_lb_frontend-ip_show
+- az_network_lb_frontend-ip_update
+- az_network_lb_inbound-nat-pool
+- az_network_lb_inbound-nat-pool_create
+- az_network_lb_inbound-nat-pool_delete
+- az_network_lb_inbound-nat-pool_list
+- az_network_lb_inbound-nat-pool_show
+- az_network_lb_inbound-nat-pool_update
+- az_network_lb_inbound-nat-rule
+- az_network_lb_inbound-nat-rule_create
+- az_network_lb_inbound-nat-rule_delete
+- az_network_lb_inbound-nat-rule_list
+- az_network_lb_inbound-nat-rule_show
+- az_network_lb_inbound-nat-rule_update
+- az_network_lb_list
+- az_network_lb_list-nic
+- az_network_lb_probe
+- az_network_lb_probe_create
+- az_network_lb_probe_delete
+- az_network_lb_probe_list
+- az_network_lb_probe_show
+- az_network_lb_probe_update
+- az_network_lb_rule
+- az_network_lb_rule_create
+- az_network_lb_rule_delete
+- az_network_lb_rule_list
+- az_network_lb_rule_show
+- az_network_lb_rule_update
+- az_network_lb_show
+- az_network_lb_update
+- az_network_lb_wait
+- az_network_list-service-aliases
+- az_network_list-usages
+- az_network_local-gateway
+- az_network_local-gateway_create
+- az_network_local-gateway_delete
+- az_network_local-gateway_list
+- az_network_local-gateway_show
+- az_network_local-gateway_update
+- az_network_local-gateway_wait
+- az_network_nic
+- az_network_nic_create
+- az_network_nic_delete
+- az_network_nic_ip-config
+- az_network_nic_ip-config_address-pool
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
+- az_network_nic_ip-config_create
+- az_network_nic_ip-config_delete
+- az_network_nic_ip-config_inbound-nat-rule
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
+- az_network_nic_ip-config_list
+- az_network_nic_ip-config_show
+- az_network_nic_ip-config_update
+- az_network_nic_list
+- az_network_nic_list-effective-nsg
+- az_network_nic_show
+- az_network_nic_show-effective-route-table
+- az_network_nic_update
+- az_network_nic_vtap-config
+- az_network_nic_vtap-config_create
+- az_network_nic_vtap-config_delete
+- az_network_nic_vtap-config_list
+- az_network_nic_vtap-config_show
+- az_network_nic_wait
+- az_network_nsg
+- az_network_nsg_create
+- az_network_nsg_delete
+- az_network_nsg_list
+- az_network_nsg_rule
+- az_network_nsg_rule_create
+- az_network_nsg_rule_delete
+- az_network_nsg_rule_list
+- az_network_nsg_rule_show
+- az_network_nsg_rule_update
+- az_network_nsg_show
+- az_network_nsg_update
+- az_network_p2s-vpn-gateway
+- az_network_p2s-vpn-gateway_connection
+- az_network_p2s-vpn-gateway_connection_list
+- az_network_p2s-vpn-gateway_connection_show
+- az_network_p2s-vpn-gateway_create
+- az_network_p2s-vpn-gateway_delete
+- az_network_p2s-vpn-gateway_list
+- az_network_p2s-vpn-gateway_show
+- az_network_p2s-vpn-gateway_update
+- az_network_p2s-vpn-gateway_vpn-client
+- az_network_p2s-vpn-gateway_vpn-client_generate
+- az_network_p2s-vpn-gateway_wait
+- az_network_private-dns
+- az_network_private-dns_link
+- az_network_private-dns_link_vnet
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
+- az_network_private-dns_record-set
+- az_network_private-dns_record-set_a
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
+- az_network_private-dns_record-set_aaaa
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
+- az_network_private-dns_record-set_cname
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
+- az_network_private-dns_record-set_list
+- az_network_private-dns_record-set_mx
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
+- az_network_private-dns_record-set_ptr
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
+- az_network_private-dns_record-set_soa
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
+- az_network_private-dns_record-set_srv
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
+- az_network_private-dns_record-set_txt
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
+- az_network_private-dns_zone
+- az_network_private-dns_zone_create
+- az_network_private-dns_zone_delete
+- az_network_private-dns_zone_export
+- az_network_private-dns_zone_import
+- az_network_private-dns_zone_list
+- az_network_private-dns_zone_show
+- az_network_private-dns_zone_update
+- az_network_private-dns_zone_wait
+- az_network_private-endpoint
+- az_network_private-endpoint_list
+- az_network_private-endpoint-connection
+- az_network_private-endpoint-connection_approve
+- az_network_private-endpoint-connection_delete
+- az_network_private-endpoint-connection_list
+- az_network_private-endpoint-connection_reject
+- az_network_private-endpoint-connection_show
+- az_network_private-link-resource
+- az_network_private-link-resource_list
+- az_network_private-link-service
+- az_network_private-link-service_connection
+- az_network_private-link-service_connection_update
+- az_network_private-link-service_create
+- az_network_private-link-service_list
+- az_network_profile
+- az_network_profile_list
+- az_network_public-ip
+- az_network_public-ip_create
+- az_network_public-ip_delete
+- az_network_public-ip_list
+- az_network_public-ip_prefix
+- az_network_public-ip_prefix_create
+- az_network_public-ip_prefix_list
+- az_network_public-ip_show
+- az_network_public-ip_update
+- az_network_route-filter
+- az_network_route-filter_create
+- az_network_route-filter_delete
+- az_network_route-filter_list
+- az_network_route-filter_rule
+- az_network_route-filter_rule_create
+- az_network_route-filter_rule_delete
+- az_network_route-filter_rule_list
+- az_network_route-filter_rule_list-service-communities
+- az_network_route-filter_rule_show
+- az_network_route-filter_rule_update
+- az_network_route-filter_show
+- az_network_route-filter_update
+- az_network_route-table
+- az_network_route-table_create
+- az_network_route-table_delete
+- az_network_route-table_list
+- az_network_route-table_route
+- az_network_route-table_route_create
+- az_network_route-table_route_delete
+- az_network_route-table_route_list
+- az_network_route-table_route_show
+- az_network_route-table_route_update
+- az_network_route-table_show
+- az_network_route-table_update
+- az_network_security-partner-provider
+- az_network_security-partner-provider_create
+- az_network_security-partner-provider_list
+- az_network_service-endpoint
+- az_network_service-endpoint_list
+- az_network_service-endpoint_policy
+- az_network_service-endpoint_policy_create
+- az_network_service-endpoint_policy_list
+- az_network_service-endpoint_policy-definition
+- az_network_service-endpoint_policy-definition_create
+- az_network_traffic-manager
+- az_network_traffic-manager_endpoint
+- az_network_traffic-manager_endpoint_create
+- az_network_traffic-manager_endpoint_delete
+- az_network_traffic-manager_endpoint_list
+- az_network_traffic-manager_endpoint_show
+- az_network_traffic-manager_endpoint_show-geographic-hierarchy
+- az_network_traffic-manager_endpoint_update
+- az_network_traffic-manager_profile
+- az_network_traffic-manager_profile_check-dns
+- az_network_traffic-manager_profile_create
+- az_network_traffic-manager_profile_delete
+- az_network_traffic-manager_profile_list
+- az_network_traffic-manager_profile_show
+- az_network_traffic-manager_profile_update
+- az_network_vhub
+- az_network_vhub_connection
+- az_network_vhub_connection_create
+- az_network_vhub_connection_delete
+- az_network_vhub_connection_list
+- az_network_vhub_connection_show
+- az_network_vhub_connection_update
+- az_network_vhub_connection_wait
+- az_network_vhub_create
+- az_network_vhub_delete
+- az_network_vhub_get-effective-routes
+- az_network_vhub_list
+- az_network_vhub_route
+- az_network_vhub_route_add
+- az_network_vhub_route_list
+- az_network_vhub_route_remove
+- az_network_vhub_route_reset
+- az_network_vhub_route-table
+- az_network_vhub_route-table_create
+- az_network_vhub_route-table_delete
+- az_network_vhub_route-table_list
+- az_network_vhub_route-table_route
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+- az_network_vhub_route-table_show
+- az_network_vhub_route-table_update
+- az_network_vhub_route-table_wait
+- az_network_vhub_show
+- az_network_vhub_update
+- az_network_virtual-appliance
+- az_network_virtual-appliance_create
+- az_network_virtual-appliance_list
+- az_network_virtual-appliance_site
+- az_network_virtual-appliance_site_create
+- az_network_vnet
+- az_network_vnet_check-ip-address
+- az_network_vnet_create
+- az_network_vnet_delete
+- az_network_vnet_list
+- az_network_vnet_list-available-ips
+- az_network_vnet_list-endpoint-services
+- az_network_vnet_peering
+- az_network_vnet_peering_create
+- az_network_vnet_peering_delete
+- az_network_vnet_peering_list
+- az_network_vnet_peering_show
+- az_network_vnet_peering_update
+- az_network_vnet_show
+- az_network_vnet_subnet
+- az_network_vnet_subnet_create
+- az_network_vnet_subnet_delete
+- az_network_vnet_subnet_list
+- az_network_vnet_subnet_show
+- az_network_vnet_subnet_update
+- az_network_vnet_tap
+- az_network_vnet_tap_create
+- az_network_vnet_tap_delete
+- az_network_vnet_tap_list
+- az_network_vnet_tap_show
+- az_network_vnet_tap_update
+- az_network_vnet_update
+- az_network_vnet-gateway
+- az_network_vnet-gateway_create
+- az_network_vnet-gateway_delete
+- az_network_vnet-gateway_list
+- az_network_vnet-gateway_list-advertised-routes
+- az_network_vnet-gateway_list-bgp-peer-status
+- az_network_vnet-gateway_list-learned-routes
+- az_network_vnet-gateway_reset
+- az_network_vnet-gateway_revoked-cert
+- az_network_vnet-gateway_revoked-cert_create
+- az_network_vnet-gateway_revoked-cert_delete
+- az_network_vnet-gateway_root-cert
+- az_network_vnet-gateway_root-cert_create
+- az_network_vnet-gateway_root-cert_delete
+- az_network_vnet-gateway_show
+- az_network_vnet-gateway_show-supported-devices
+- az_network_vnet-gateway_update
+- az_network_vnet-gateway_vpn-client
+- az_network_vnet-gateway_vpn-client_generate
+- az_network_vnet-gateway_vpn-client_show-url
+- az_network_vnet-gateway_wait
+- az_network_vpn-connection
+- az_network_vpn-connection_create
+- az_network_vpn-connection_delete
+- az_network_vpn-connection_ipsec-policy
+- az_network_vpn-connection_ipsec-policy_add
+- az_network_vpn-connection_ipsec-policy_clear
+- az_network_vpn-connection_ipsec-policy_list
+- az_network_vpn-connection_list
+- az_network_vpn-connection_shared-key
+- az_network_vpn-connection_shared-key_reset
+- az_network_vpn-connection_shared-key_show
+- az_network_vpn-connection_shared-key_update
+- az_network_vpn-connection_show
+- az_network_vpn-connection_show-device-config-script
+- az_network_vpn-connection_update
+- az_network_vpn-gateway
+- az_network_vpn-gateway_connection
+- az_network_vpn-gateway_connection_create
+- az_network_vpn-gateway_connection_delete
+- az_network_vpn-gateway_connection_ipsec-policy
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+- az_network_vpn-gateway_connection_list
+- az_network_vpn-gateway_connection_show
+- az_network_vpn-gateway_connection_update
+- az_network_vpn-gateway_connection_wait
+- az_network_vpn-gateway_create
+- az_network_vpn-gateway_delete
+- az_network_vpn-gateway_list
+- az_network_vpn-gateway_show
+- az_network_vpn-gateway_update
+- az_network_vpn-server-config
+- az_network_vpn-server-config_create
+- az_network_vpn-server-config_delete
+- az_network_vpn-server-config_ipsec-policy
+- az_network_vpn-server-config_ipsec-policy_add
+- az_network_vpn-server-config_ipsec-policy_list
+- az_network_vpn-server-config_ipsec-policy_remove
+- az_network_vpn-server-config_ipsec-policy_wait
+- az_network_vpn-server-config_list
+- az_network_vpn-server-config_set
+- az_network_vpn-server-config_show
+- az_network_vpn-server-config_wait
+- az_network_vpn-site
+- az_network_vpn-site_create
+- az_network_vpn-site_delete
+- az_network_vpn-site_download
+- az_network_vpn-site_list
+- az_network_vpn-site_show
+- az_network_vpn-site_update
+- az_network_vrouter
+- az_network_vrouter_create
+- az_network_vrouter_delete
+- az_network_vrouter_list
+- az_network_vrouter_peering
+- az_network_vrouter_peering_create
+- az_network_vrouter_peering_delete
+- az_network_vrouter_peering_list
+- az_network_vrouter_peering_show
+- az_network_vrouter_show
+- az_network_vwan
+- az_network_vwan_create
+- az_network_vwan_delete
+- az_network_vwan_list
+- az_network_vwan_show
+- az_network_vwan_update
+- az_network_watcher
+- az_network_watcher_configure
+- az_network_watcher_flow-log
+- az_network_watcher_flow-log_configure
+- az_network_watcher_flow-log_show
+- az_network_watcher_list
+- az_network_watcher_packet-capture
+- az_network_watcher_packet-capture_create
+- az_network_watcher_packet-capture_delete
+- az_network_watcher_packet-capture_list
+- az_network_watcher_packet-capture_show
+- az_network_watcher_packet-capture_show-status
+- az_network_watcher_packet-capture_stop
+- az_network_watcher_show-next-hop
+- az_network_watcher_show-security-group-view
+- az_network_watcher_show-topology
+- az_network_watcher_test-connectivity
+- az_network_watcher_test-ip-flow
+- az_network_watcher_troubleshooting
+- az_network_watcher_troubleshooting_show
+- az_network_watcher_troubleshooting_start
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1674,10 +931,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure Network resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Network resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway.yml
index e277c07347..edd368457e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway.yml
@@ -1,62 +1,66 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway
-  name: az network application-gateway
-  summary: Manage application-level routing and load balancing services.
-  description: To learn more about Application Gateway, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_create
-  - az_network_application_gateway_delete
-  - az_network_application_gateway_list
-  - az_network_application_gateway_show
-  - az_network_application_gateway_show_backend_health
-  - az_network_application_gateway_start
-  - az_network_application_gateway_stop
-  - az_network_application_gateway_update
-  - az_network_application_gateway_wait
-- uid: az_network_application_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway
+name: az network application-gateway
+summary: Manage application-level routing and load balancing services.
+description: To learn more about Application Gateway, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli.
+directCommands:
+- uid: az_network_application-gateway_create
   name: az network application-gateway create
   summary: Create an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway create --name
+                                          --resource-group
+                                          [--capacity]
+                                          [--cert-file]
+                                          [--cert-password]
+                                          [--connection-draining-timeout]
+                                          [--enable-private-link]
+                                          [--frontend-port]
+                                          [--http-settings-cookie-based-affinity {Disabled, Enabled}]
+                                          [--http-settings-port]
+                                          [--http-settings-protocol {Http, Https}]
+                                          [--http2 {Disabled, Enabled}]
+                                          [--identity]
+                                          [--key-vault-secret-id]
+                                          [--location]
+                                          [--no-wait]
+                                          [--private-ip-address]
+                                          [--private-link-ip-address]
+                                          [--private-link-primary {false, true}]
+                                          [--private-link-subnet]
+                                          [--private-link-subnet-prefix]
+                                          [--public-ip-address]
+                                          [--public-ip-address-allocation]
+                                          [--routing-rule-type {Basic, PathBasedRouting}]
+                                          [--servers]
+                                          [--sku {Standard_Large, Standard_Medium, Standard_Small, WAF_Large, WAF_Medium}]
+                                          [--subnet]
+                                          [--subnet-address-prefix]
+                                          [--subscription]
+                                          [--tags]
+                                          [--validate]
+                                          [--vnet-address-prefix]
+                                          [--vnet-name]
+                                          [--zones {1, 2, 3}]
   examples:
   - summary: Create an application gateway with VMs as backend servers.
-    syntax:
-      content: >-
-        az network application-gateway create -g MyResourceGroup -n MyAppGateway --capacity 2 --sku Standard_Medium \
-            --vnet-name MyVNet --subnet MySubnet --http-settings-cookie-based-affinity Enabled \
-            --public-ip-address MyAppGatewayPublicIp --servers 10.0.0.4 10.0.0.5
+    syntax: >-
+      az network application-gateway create -g MyResourceGroup -n MyAppGateway --capacity 2 --sku Standard_Medium \
+          --vnet-name MyVNet --subnet MySubnet --http-settings-cookie-based-affinity Enabled \
+          --public-ip-address MyAppGatewayPublicIp --servers 10.0.0.4 10.0.0.5
   - summary: Create an application gateway. (autogenerated)
-    syntax:
-      content: az network application-gateway create --capacity 2 --frontend-port MyFrontendPort --http-settings-cookie-based-affinity Enabled --http-settings-port 80 --http-settings-protocol Http --location westus2 --name MyAppGateway --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup --sku Standard_Small --subnet MySubnet --vnet-name MyVNet
-  parameters:
+    syntax: az network application-gateway create --capacity 2 --frontend-port MyFrontendPort --http-settings-cookie-based-affinity Enabled --http-settings-port 80 --http-settings-protocol Http --location westus2 --name MyAppGateway --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup --sku Standard_Small --subnet MySubnet --vnet-name MyVNet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --capacity
     defaultValue: "2"
     summary: The number of instances to use with the application gateway.
@@ -70,6 +74,9 @@ items:
   - name: --connection-draining-timeout
     summary: 'The time in seconds after a backend server is removed during which on open connection remains active. Range: 0 (disabled) to 3600.'
     description: ''
+  - name: --enable-private-link
+    summary: Enable Private Link feature for this application gateway. If both public IP and private IP are enbaled, taking effect only in public frontend IP.
+    description: ''
   - name: --frontend-port
     summary: The front end port number.
     description: ''
@@ -91,9 +98,43 @@ items:
     parameterValueGroup: Disabled, Enabled
     summary: Use HTTP2 for the application gateway.
     description: ''
+  - name: --identity
+    summary: Name or ID of the ManagedIdentity Resource.
+    description: ''
   - name: --key-vault-secret-id
     summary: Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in Azure KeyVault. You need enable soft delete for keyvault to use this feature.
     description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --private-ip-address
+    summary: Static private IP address to use.
+    description: ''
+  - name: --private-link-ip-address
+    summary: The static private IP address of a subnet for Private Link. If omitting, a dynamic one will be created.
+    description: ''
+  - name: --private-link-primary
+    parameterValueGroup: false, true
+    summary: Whether the IP configuration is primary or not.
+    description: ''
+  - name: --private-link-subnet
+    defaultValue: PrivateLinkDefaultSubnet
+    summary: The name of the subnet within the same vnet of an application gateway.
+    description: ''
+  - name: --private-link-subnet-prefix
+    defaultValue: 10.0.1.0/24
+    summary: The CIDR prefix to use when creating a new subnet.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of a public IP address. Uses existing resource or creates new if specified, or none if omitted.
+    description: ''
+  - name: --public-ip-address-allocation
+    defaultValue: Dynamic
+    summary: The kind of IP allocation to use when creating a new public IP.
+    description: ''
   - name: --routing-rule-type
     defaultValue: Basic
     parameterValueGroup: Basic, PathBasedRouting
@@ -107,19 +148,6 @@ items:
     parameterValueGroup: Standard_Large, Standard_Medium, Standard_Small, WAF_Large, WAF_Medium
     summary: The name of the SKU.
     description: ''
-  - name: --identity
-    summary: Name or ID of the ManagedIdentity Resource.
-    description: ''
-  - name: --private-ip-address
-    summary: Static private IP address to use.
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of a public IP address. Uses existing resource or creates new if specified, or none if omitted.
-    description: ''
-  - name: --public-ip-address-allocation
-    defaultValue: Dynamic
-    summary: The kind of IP allocation to use when creating a new public IP.
-    description: ''
   - name: --subnet
     defaultValue: default
     summary: Name or ID of the subnet. Will create resource if it does not exist. If name specified, also specify --vnet-name. If you want to use an existing subnet in other resource group or subscription, please provide the ID instead of the name of the subnet.
@@ -128,6 +156,15 @@ items:
     defaultValue: 10.0.0.0/24
     summary: The CIDR prefix to use when creating a new subnet.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
   - name: --vnet-address-prefix
     defaultValue: 10.0.0.0/16
     summary: The CIDR prefix to use when creating a new VNet.
@@ -135,110 +172,109 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_delete
   name: az network application-gateway delete
   summary: Delete an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway delete [--ids]
+                                          [--name]
+                                          [--no-wait]
+                                          [--resource-group]
+                                          [--subscription]
   examples:
   - summary: Delete an application gateway.
-    syntax:
-      content: az network application-gateway delete -g MyResourceGroup -n MyAppGateway
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway delete -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the application gateway.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_list
   name: az network application-gateway list
   summary: List application gateways.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway list [--query-examples]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: List application gateways.
-    syntax:
-      content: az network application-gateway list -g MyResourceGroup
-  parameters:
+    syntax: az network application-gateway list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_show
   name: az network application-gateway show
   summary: Get the details of an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway show [--ids]
+                                        [--name]
+                                        [--query-examples]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Get the details of an application gateway.
-    syntax:
-      content: az network application-gateway show -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway show -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the application gateway.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_show_backend_health
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_show-backend-health
   name: az network application-gateway show-backend-health
   summary: Get information on the backend health of an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway show-backend-health [--expand]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
   examples:
   - summary: Show backend health of an application gateway.
-    syntax:
-      content: az network application-gateway show-backend-health -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway show-backend-health -g MyResourceGroup -n MyAppGateway
+  - summary: Show backend health of an application gateway for given combination of backend pool and http setting.
+    syntax: az network application-gateway show-backend-health -g MyResourceGroup -n MyAppGateway --host-name-from-http-settings --path /test --timeout 100 --http-settings appGatewayBackendHttpSettings --address-pool appGatewayBackendPool
+  optionalParameters:
   - name: --expand
     summary: Expands BackendAddressPool and BackendHttpSettings referenced in backend health.
     description: ''
@@ -249,28 +285,25 @@ items:
     summary: Name of the application gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_start
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_start
   name: az network application-gateway start
   summary: Start an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway start [--ids]
+                                         [--name]
+                                         [--resource-group]
+                                         [--subscription]
   examples:
   - summary: Start an application gateway.
-    syntax:
-      content: az network application-gateway start -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway start -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -278,28 +311,25 @@ items:
     summary: Name of the application gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_stop
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_stop
   name: az network application-gateway stop
   summary: Stop an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway stop [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Stop an application gateway.
-    syntax:
-      content: az network application-gateway stop -g MyResourceGroup -n MyAppGateway
-  parameters:
+    syntax: az network application-gateway stop -g MyResourceGroup -n MyAppGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -307,98 +337,96 @@ items:
     summary: Name of the application gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_update
   name: az network application-gateway update
   summary: Update an application gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway update [--add]
+                                          [--capacity]
+                                          [--force-string]
+                                          [--http2 {Disabled, Enabled}]
+                                          [--ids]
+                                          [--name]
+                                          [--no-wait]
+                                          [--remove]
+                                          [--resource-group]
+                                          [--set]
+                                          [--sku {Standard_Large, Standard_Medium, Standard_Small, WAF_Large, WAF_Medium}]
+                                          [--subscription]
+                                          [--tags]
   examples:
   - summary: Update an application gateway. (autogenerated)
-    syntax:
-      content: az network application-gateway update --name MyApplicationGateway --resource-group MyResourceGroup --set useRemoteGateways=true
-  parameters:
+    syntax: az network application-gateway update --name MyApplicationGateway --resource-group MyResourceGroup --set useRemoteGateways=true
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --capacity
     summary: The number of instances to use with the application gateway.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --http2
     parameterValueGroup: Disabled, Enabled
     summary: Use HTTP2 for the application gateway.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Standard_Large, Standard_Medium, Standard_Small, WAF_Large, WAF_Medium
-    summary: The name of the SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the application gateway.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_wait
+  - name: --sku
+    parameterValueGroup: Standard_Large, Standard_Medium, Standard_Small, WAF_Large, WAF_Medium
+    summary: The name of the SKU.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_wait
   name: az network application-gateway wait
   summary: Place the CLI in a waiting state until a condition of the application gateway is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway wait [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--ids]
+                                        [--interval]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
+                                        [--timeout]
+                                        [--updated]
   examples:
   - summary: Place the CLI in a waiting state until the application gateway is created.
-    syntax:
-      content: az network application-gateway wait -g MyResourceGroup -n MyAppGateway --created
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the application gateway.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network application-gateway wait -g MyResourceGroup -n MyAppGateway --created
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -411,10 +439,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the application gateway.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -422,301 +462,104 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_address_pool
-  name: az network application-gateway address-pool
-  summary: Manage address pools of an application gateway.
-- uid: az_network_application_gateway_address_pool_create
-  name: az network application-gateway address-pool create
-  summary: Create an address pool.
-- uid: az_network_application_gateway_address_pool_delete
-  name: az network application-gateway address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_application_gateway_address_pool_list
-  name: az network application-gateway address-pool list
-  summary: List address pools.
-- uid: az_network_application_gateway_address_pool_show
-  name: az network application-gateway address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_application_gateway_address_pool_update
-  name: az network application-gateway address-pool update
-  summary: Update an address pool.
-- uid: az_network_application_gateway_auth_cert
-  name: az network application-gateway auth-cert
-  summary: Manage authorization certificates of an application gateway.
-- uid: az_network_application_gateway_auth_cert_create
-  name: az network application-gateway auth-cert create
-  summary: Create an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_delete
-  name: az network application-gateway auth-cert delete
-  summary: Delete an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_list
-  name: az network application-gateway auth-cert list
-  summary: List authorization certificates.
-- uid: az_network_application_gateway_auth_cert_show
-  name: az network application-gateway auth-cert show
-  summary: Show an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_update
-  name: az network application-gateway auth-cert update
-  summary: Update an authorization certificate.
-- uid: az_network_application_gateway_create
-  name: az network application-gateway create
-  summary: Create an application gateway.
-- uid: az_network_application_gateway_delete
-  name: az network application-gateway delete
-  summary: Delete an application gateway.
-- uid: az_network_application_gateway_frontend_ip
-  name: az network application-gateway frontend-ip
-  summary: Manage frontend IP addresses of an application gateway.
-- uid: az_network_application_gateway_frontend_ip_create
-  name: az network application-gateway frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_delete
-  name: az network application-gateway frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_list
-  name: az network application-gateway frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_application_gateway_frontend_ip_show
-  name: az network application-gateway frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_update
-  name: az network application-gateway frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_application_gateway_frontend_port
-  name: az network application-gateway frontend-port
-  summary: Manage frontend ports of an application gateway.
-- uid: az_network_application_gateway_frontend_port_create
-  name: az network application-gateway frontend-port create
-  summary: Create a frontend port.
-- uid: az_network_application_gateway_frontend_port_delete
-  name: az network application-gateway frontend-port delete
-  summary: Delete a frontend port.
-- uid: az_network_application_gateway_frontend_port_list
-  name: az network application-gateway frontend-port list
-  summary: List frontend ports.
-- uid: az_network_application_gateway_frontend_port_show
-  name: az network application-gateway frontend-port show
-  summary: Get the details of a frontend port.
-- uid: az_network_application_gateway_frontend_port_update
-  name: az network application-gateway frontend-port update
-  summary: Update a frontend port.
-- uid: az_network_application_gateway_http_listener
-  name: az network application-gateway http-listener
-  summary: Manage HTTP listeners of an application gateway.
-- uid: az_network_application_gateway_http_listener_create
-  name: az network application-gateway http-listener create
-  summary: Create an HTTP listener.
-- uid: az_network_application_gateway_http_listener_delete
-  name: az network application-gateway http-listener delete
-  summary: Delete an HTTP listener.
-- uid: az_network_application_gateway_http_listener_list
-  name: az network application-gateway http-listener list
-  summary: List HTTP listeners.
-- uid: az_network_application_gateway_http_listener_show
-  name: az network application-gateway http-listener show
-  summary: Get the details of an HTTP listener.
-- uid: az_network_application_gateway_http_listener_update
-  name: az network application-gateway http-listener update
-  summary: Update an HTTP listener.
-- uid: az_network_application_gateway_http_settings
-  name: az network application-gateway http-settings
-  summary: Manage HTTP settings of an application gateway.
-- uid: az_network_application_gateway_http_settings_create
-  name: az network application-gateway http-settings create
-  summary: Create HTTP settings.
-- uid: az_network_application_gateway_http_settings_delete
-  name: az network application-gateway http-settings delete
-  summary: Delete HTTP settings.
-- uid: az_network_application_gateway_http_settings_list
-  name: az network application-gateway http-settings list
-  summary: List HTTP settings.
-- uid: az_network_application_gateway_http_settings_show
-  name: az network application-gateway http-settings show
-  summary: Get the details of a gateway's HTTP settings.
-- uid: az_network_application_gateway_http_settings_update
-  name: az network application-gateway http-settings update
-  summary: Update HTTP settings.
-- uid: az_network_application_gateway_list
-  name: az network application-gateway list
-  summary: List application gateways.
-- uid: az_network_application_gateway_probe
-  name: az network application-gateway probe
-  summary: Manage probes to gather and evaluate information on a gateway.
-- uid: az_network_application_gateway_probe_create
-  name: az network application-gateway probe create
-  summary: Create a probe.
-- uid: az_network_application_gateway_probe_delete
-  name: az network application-gateway probe delete
-  summary: Delete a probe.
-- uid: az_network_application_gateway_probe_list
-  name: az network application-gateway probe list
-  summary: List probes.
-- uid: az_network_application_gateway_probe_show
-  name: az network application-gateway probe show
-  summary: Get the details of a probe.
-- uid: az_network_application_gateway_probe_update
-  name: az network application-gateway probe update
-  summary: Update a probe.
-- uid: az_network_application_gateway_redirect_config
-  name: az network application-gateway redirect-config
-  summary: Manage redirect configurations.
-- uid: az_network_application_gateway_redirect_config_create
-  name: az network application-gateway redirect-config create
-  summary: Create a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_delete
-  name: az network application-gateway redirect-config delete
-  summary: Delete a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_list
-  name: az network application-gateway redirect-config list
-  summary: List redirect configurations.
-- uid: az_network_application_gateway_redirect_config_show
-  name: az network application-gateway redirect-config show
-  summary: Get the details of a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_update
-  name: az network application-gateway redirect-config update
-  summary: Update a redirect configuration.
-- uid: az_network_application_gateway_rewrite_rule
-  name: az network application-gateway rewrite-rule
-  summary: Manage rewrite rules of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
-- uid: az_network_application_gateway_rule
-  name: az network application-gateway rule
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_application_gateway_rule_create
-  name: az network application-gateway rule create
-  summary: Create a rule.
-- uid: az_network_application_gateway_rule_delete
-  name: az network application-gateway rule delete
-  summary: Delete a rule.
-- uid: az_network_application_gateway_rule_list
-  name: az network application-gateway rule list
-  summary: List rules.
-- uid: az_network_application_gateway_rule_show
-  name: az network application-gateway rule show
-  summary: Get the details of a rule.
-- uid: az_network_application_gateway_rule_update
-  name: az network application-gateway rule update
-  summary: Update a rule.
-- uid: az_network_application_gateway_show
-  name: az network application-gateway show
-  summary: Get the details of an application gateway.
-- uid: az_network_application_gateway_show_backend_health
-  name: az network application-gateway show-backend-health
-  summary: Get information on the backend health of an application gateway.
-- uid: az_network_application_gateway_ssl_cert
-  name: az network application-gateway ssl-cert
-  summary: Manage SSL certificates of an application gateway.
-- uid: az_network_application_gateway_ssl_cert_create
-  name: az network application-gateway ssl-cert create
-  summary: Upload an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_delete
-  name: az network application-gateway ssl-cert delete
-  summary: Delete an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_list
-  name: az network application-gateway ssl-cert list
-  summary: List SSL certificates.
-- uid: az_network_application_gateway_ssl_cert_show
-  name: az network application-gateway ssl-cert show
-  summary: Get the details of an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_update
-  name: az network application-gateway ssl-cert update
-  summary: Update an SSL certificate.
-- uid: az_network_application_gateway_ssl_policy
-  name: az network application-gateway ssl-policy
-  summary: Manage the SSL policy of an application gateway.
-- uid: az_network_application_gateway_ssl_policy_list_options
-  name: az network application-gateway ssl-policy list-options
-  summary: Lists available SSL options for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined
-  name: az network application-gateway ssl-policy predefined
-  summary: Get information on predefined SSL policies.
-- uid: az_network_application_gateway_ssl_policy_predefined_list
-  name: az network application-gateway ssl-policy predefined list
-  summary: Lists all SSL predefined policies for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined_show
-  name: az network application-gateway ssl-policy predefined show
-  summary: Gets SSL predefined policy with the specified policy name.
-- uid: az_network_application_gateway_ssl_policy_set
-  name: az network application-gateway ssl-policy set
-  summary: Update or clear SSL policy settings.
-- uid: az_network_application_gateway_ssl_policy_show
-  name: az network application-gateway ssl-policy show
-  summary: Get the details of gateway's SSL policy settings.
-- uid: az_network_application_gateway_start
-  name: az network application-gateway start
-  summary: Start an application gateway.
-- uid: az_network_application_gateway_stop
-  name: az network application-gateway stop
-  summary: Stop an application gateway.
-- uid: az_network_application_gateway_update
-  name: az network application-gateway update
-  summary: Update an application gateway.
-- uid: az_network_application_gateway_url_path_map
-  name: az network application-gateway url-path-map
-  summary: Manage URL path maps of an application gateway.
-- uid: az_network_application_gateway_url_path_map_create
-  name: az network application-gateway url-path-map create
-  summary: Create a URL path map.
-- uid: az_network_application_gateway_url_path_map_delete
-  name: az network application-gateway url-path-map delete
-  summary: Delete a URL path map.
-- uid: az_network_application_gateway_url_path_map_list
-  name: az network application-gateway url-path-map list
-  summary: List URL path maps.
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
-- uid: az_network_application_gateway_url_path_map_show
-  name: az network application-gateway url-path-map show
-  summary: Get the details of a URL path map.
-- uid: az_network_application_gateway_url_path_map_update
-  name: az network application-gateway url-path-map update
-  summary: Update a URL path map.
-- uid: az_network_application_gateway_waf_config
-  name: az network application-gateway waf-config
-  summary: Configure the settings of a web application firewall.
-- uid: az_network_application_gateway_waf_config_list_rule_sets
-  name: az network application-gateway waf-config list-rule-sets
-  summary: Get information on available WAF rule sets, rule groups, and rule IDs.
-- uid: az_network_application_gateway_waf_config_set
-  name: az network application-gateway waf-config set
-  summary: Update the firewall configuration of a web application.
-- uid: az_network_application_gateway_waf_config_show
-  name: az network application-gateway waf-config show
-  summary: Get the firewall configuration of a web application.
-- uid: az_network_application_gateway_wait
-  name: az network application-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the application gateway is met.
+- az_network_application-gateway_address-pool
+- az_network_application-gateway_address-pool_create
+- az_network_application-gateway_address-pool_delete
+- az_network_application-gateway_address-pool_list
+- az_network_application-gateway_address-pool_show
+- az_network_application-gateway_address-pool_update
+- az_network_application-gateway_auth-cert
+- az_network_application-gateway_auth-cert_create
+- az_network_application-gateway_auth-cert_delete
+- az_network_application-gateway_auth-cert_list
+- az_network_application-gateway_auth-cert_show
+- az_network_application-gateway_auth-cert_update
+- az_network_application-gateway_create
+- az_network_application-gateway_delete
+- az_network_application-gateway_frontend-ip
+- az_network_application-gateway_frontend-ip_create
+- az_network_application-gateway_frontend-ip_delete
+- az_network_application-gateway_frontend-ip_list
+- az_network_application-gateway_frontend-ip_show
+- az_network_application-gateway_frontend-ip_update
+- az_network_application-gateway_frontend-port
+- az_network_application-gateway_frontend-port_create
+- az_network_application-gateway_frontend-port_delete
+- az_network_application-gateway_frontend-port_list
+- az_network_application-gateway_frontend-port_show
+- az_network_application-gateway_frontend-port_update
+- az_network_application-gateway_http-listener
+- az_network_application-gateway_http-listener_create
+- az_network_application-gateway_http-listener_delete
+- az_network_application-gateway_http-listener_list
+- az_network_application-gateway_http-listener_show
+- az_network_application-gateway_http-listener_update
+- az_network_application-gateway_http-settings
+- az_network_application-gateway_http-settings_create
+- az_network_application-gateway_http-settings_delete
+- az_network_application-gateway_http-settings_list
+- az_network_application-gateway_http-settings_show
+- az_network_application-gateway_http-settings_update
+- az_network_application-gateway_list
+- az_network_application-gateway_probe
+- az_network_application-gateway_probe_create
+- az_network_application-gateway_probe_delete
+- az_network_application-gateway_probe_list
+- az_network_application-gateway_probe_show
+- az_network_application-gateway_probe_update
+- az_network_application-gateway_redirect-config
+- az_network_application-gateway_redirect-config_create
+- az_network_application-gateway_redirect-config_delete
+- az_network_application-gateway_redirect-config_list
+- az_network_application-gateway_redirect-config_show
+- az_network_application-gateway_redirect-config_update
+- az_network_application-gateway_rewrite-rule
+- az_network_application-gateway_rewrite-rule_set
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
+- az_network_application-gateway_rule
+- az_network_application-gateway_rule_create
+- az_network_application-gateway_rule_delete
+- az_network_application-gateway_rule_list
+- az_network_application-gateway_rule_show
+- az_network_application-gateway_rule_update
+- az_network_application-gateway_show
+- az_network_application-gateway_show-backend-health
+- az_network_application-gateway_ssl-cert
+- az_network_application-gateway_ssl-cert_create
+- az_network_application-gateway_ssl-cert_delete
+- az_network_application-gateway_ssl-cert_list
+- az_network_application-gateway_ssl-cert_show
+- az_network_application-gateway_ssl-cert_update
+- az_network_application-gateway_ssl-policy
+- az_network_application-gateway_ssl-policy_list-options
+- az_network_application-gateway_ssl-policy_predefined
+- az_network_application-gateway_ssl-policy_predefined_list
+- az_network_application-gateway_ssl-policy_predefined_show
+- az_network_application-gateway_ssl-policy_set
+- az_network_application-gateway_ssl-policy_show
+- az_network_application-gateway_start
+- az_network_application-gateway_stop
+- az_network_application-gateway_update
+- az_network_application-gateway_url-path-map
+- az_network_application-gateway_url-path-map_create
+- az_network_application-gateway_url-path-map_delete
+- az_network_application-gateway_url-path-map_list
+- az_network_application-gateway_url-path-map_rule
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
+- az_network_application-gateway_url-path-map_show
+- az_network_application-gateway_url-path-map_update
+- az_network_application-gateway_waf-config
+- az_network_application-gateway_waf-config_list-rule-sets
+- az_network_application-gateway_waf-config_set
+- az_network_application-gateway_waf-config_show
+- az_network_application-gateway_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -732,10 +575,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Application Gateway, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Application Gateway, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-create-gateway-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/address-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/address-pool.yml
index 41ad5e69f8..ad89175e67 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/address-pool.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/address-pool.yml
@@ -1,30 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_address_pool
-  name: az network application-gateway address-pool
-  summary: Manage address pools of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_address_pool_create
-  - az_network_application_gateway_address_pool_delete
-  - az_network_application_gateway_address_pool_list
-  - az_network_application_gateway_address_pool_show
-  - az_network_application_gateway_address_pool_update
-- uid: az_network_application_gateway_address_pool_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_address-pool
+name: az network application-gateway address-pool
+summary: Manage address pools of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_address-pool_create
   name: az network application-gateway address-pool create
   summary: Create an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool create --gateway-name
+                                                       --name
+                                                       --resource-group
+                                                       [--no-wait]
+                                                       [--servers]
+                                                       [--subscription]
   examples:
   - summary: Create an address pool with two endpoints.
-    syntax:
-      content: >-
-        az network application-gateway address-pool create -g MyResourceGroup \
-            --gateway-name MyAppGateway -n MyAddressPool --servers 10.0.0.4 10.0.0.5
-  parameters:
+    syntax: >-
+      az network application-gateway address-pool create -g MyResourceGroup \
+          --gateway-name MyAppGateway -n MyAddressPool --servers 10.0.0.4 10.0.0.5
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -35,8 +31,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -46,26 +43,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_delete
   name: az network application-gateway address-pool delete
   summary: Delete an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool delete [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--resource-group]
+                                                       [--subscription]
   examples:
   - summary: Delete an address pool.
-    syntax:
-      content: az network application-gateway address-pool delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway address-pool delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -75,57 +68,60 @@ items:
   - name: --name -n
     summary: The name of the backend address pool.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_list
   name: az network application-gateway address-pool list
   summary: List address pools.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool list --gateway-name
+                                                     --resource-group
+                                                     [--query-examples]
+                                                     [--subscription]
   examples:
   - summary: List address pools.
-    syntax:
-      content: az network application-gateway address-pool list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway address-pool list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_show
   name: az network application-gateway address-pool show
   summary: Get the details of an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool show [--gateway-name]
+                                                     [--ids]
+                                                     [--name]
+                                                     [--query-examples]
+                                                     [--resource-group]
+                                                     [--subscription]
   examples:
   - summary: Get the details of an address pool.
-    syntax:
-      content: az network application-gateway address-pool show -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
-  parameters:
+    syntax: az network application-gateway address-pool show -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -135,34 +131,49 @@ items:
   - name: --name -n
     summary: The name of the backend address pool.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_address_pool_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_address-pool_update
   name: az network application-gateway address-pool update
   summary: Update an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway address-pool update [--add]
+                                                       [--force-string]
+                                                       [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--remove]
+                                                       [--resource-group]
+                                                       [--servers]
+                                                       [--set]
+                                                       [--subscription]
   examples:
-  - summary: Update an address pool, add server.
-    syntax:
-      content: az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAddressPool --servers 10.0.0.4 10.0.0.5 10.0.0.6
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - summary: Update backend address pool.
+    syntax: az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAddressPool --servers 10.0.0.4 10.0.0.5 10.0.0.6
+  - summary: Add to the backend address pool by using backend server IP address.
+    syntax: >-
+      az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool \
+          --add backendAddresses ipAddress=10.0.0.4
+  - summary: Remove an existing ip of the backend address pool("0" is the index).
+    syntax: >-
+      az network application-gateway address-pool update -g MyResourceGroup --gateway-name MyAppGateway -n MyAddressPool \
+          --remove backendAddresses 0
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --servers
-    summary: Space-separated list of IP addresses or DNS names corresponding to backend servers.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -173,46 +184,31 @@ items:
   - name: --name -n
     summary: The name of the backend address pool.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --servers
+    summary: Space-separated list of IP addresses or DNS names corresponding to backend servers.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_address_pool_create
-  name: az network application-gateway address-pool create
-  summary: Create an address pool.
-- uid: az_network_application_gateway_address_pool_delete
-  name: az network application-gateway address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_application_gateway_address_pool_list
-  name: az network application-gateway address-pool list
-  summary: List address pools.
-- uid: az_network_application_gateway_address_pool_show
-  name: az network application-gateway address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_application_gateway_address_pool_update
-  name: az network application-gateway address-pool update
-  summary: Update an address pool.
+- az_network_application-gateway_address-pool_create
+- az_network_application-gateway_address-pool_delete
+- az_network_application-gateway_address-pool_list
+- az_network_application-gateway_address-pool_show
+- az_network_application-gateway_address-pool_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -228,10 +224,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage address pools of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/auth-cert.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/auth-cert.yml
index 8e8c044971..f6812274f6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/auth-cert.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/auth-cert.yml
@@ -1,30 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_auth_cert
-  name: az network application-gateway auth-cert
-  summary: Manage authorization certificates of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_auth_cert_create
-  - az_network_application_gateway_auth_cert_delete
-  - az_network_application_gateway_auth_cert_list
-  - az_network_application_gateway_auth_cert_show
-  - az_network_application_gateway_auth_cert_update
-- uid: az_network_application_gateway_auth_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_auth-cert
+name: az network application-gateway auth-cert
+summary: Manage authorization certificates of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_auth-cert_create
   name: az network application-gateway auth-cert create
   summary: Create an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert create --cert-file
+                                                    --gateway-name
+                                                    --name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--subscription]
   examples:
   - summary: Create an authorization certificate.
-    syntax:
-      content: >-
-        az network application-gateway auth-cert create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyAuthCert --cert-file /path/to/cert/file
-  parameters:
+    syntax: >-
+      az network application-gateway auth-cert create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyAuthCert --cert-file /path/to/cert/file
+  requiredParameters:
   - isRequired: true
     name: --cert-file
     summary: Certificate file path.
@@ -39,34 +35,31 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_delete
   name: az network application-gateway auth-cert delete
   summary: Delete an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert delete [--gateway-name]
+                                                    [--ids]
+                                                    [--name]
+                                                    [--no-wait]
+                                                    [--resource-group]
+                                                    [--subscription]
   examples:
   - summary: Delete an authorization certificate.
-    syntax:
-      content: az network application-gateway auth-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway auth-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -76,57 +69,64 @@ items:
   - name: --name -n
     summary: The name of the authentication certificate.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_list
   name: az network application-gateway auth-cert list
   summary: List authorization certificates.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert list --gateway-name
+                                                  --resource-group
+                                                  [--query-examples]
+                                                  [--subscription]
   examples:
   - summary: List authorization certificates.
-    syntax:
-      content: az network application-gateway auth-cert list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway auth-cert list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_show
   name: az network application-gateway auth-cert show
   summary: Show an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert show [--gateway-name]
+                                                  [--ids]
+                                                  [--name]
+                                                  [--query-examples]
+                                                  [--resource-group]
+                                                  [--subscription]
   examples:
   - summary: Show an authorization certificate.
-    syntax:
-      content: az network application-gateway auth-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
-  parameters:
+    syntax: az network application-gateway auth-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MyAuthCert
+  - summary: View expiry date of an authorization certificate. It is in Base-64 encoded X.509(.CER) format.
+    syntax: >-
+      az network application-gateway auth-cert show -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyAuthCert --query data -o tsv | base64 -d | openssl x509 -enddate -noout
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -136,35 +136,46 @@ items:
   - name: --name -n
     summary: The name of the authentication certificate.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_auth_cert_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_auth-cert_update
   name: az network application-gateway auth-cert update
   summary: Update an authorization certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway auth-cert update --cert-file
+                                                    [--add]
+                                                    [--force-string]
+                                                    [--gateway-name]
+                                                    [--ids]
+                                                    [--name]
+                                                    [--no-wait]
+                                                    [--remove]
+                                                    [--resource-group]
+                                                    [--set]
+                                                    [--subscription]
   examples:
   - summary: Update authorization certificates to use a new cert file.
-    syntax:
-      content: az network application-gateway auth-cert update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAuthCert --cert-file /path/to/new/cert/file
-  parameters:
+    syntax: az network application-gateway auth-cert update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyAuthCert --cert-file /path/to/new/cert/file
+  requiredParameters:
   - isRequired: true
     name: --cert-file
     summary: Certificate file path.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -175,46 +186,28 @@ items:
   - name: --name -n
     summary: The name of the authentication certificate.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_auth_cert_create
-  name: az network application-gateway auth-cert create
-  summary: Create an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_delete
-  name: az network application-gateway auth-cert delete
-  summary: Delete an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_list
-  name: az network application-gateway auth-cert list
-  summary: List authorization certificates.
-- uid: az_network_application_gateway_auth_cert_show
-  name: az network application-gateway auth-cert show
-  summary: Show an authorization certificate.
-- uid: az_network_application_gateway_auth_cert_update
-  name: az network application-gateway auth-cert update
-  summary: Update an authorization certificate.
+- az_network_application-gateway_auth-cert_create
+- az_network_application-gateway_auth-cert_delete
+- az_network_application-gateway_auth-cert_list
+- az_network_application-gateway_auth-cert_show
+- az_network_application-gateway_auth-cert_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -230,10 +223,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage authorization certificates of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage authorization certificates of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-ip.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-ip.yml
index bb53433bea..b3b125b41d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-ip.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-ip.yml
@@ -1,33 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_frontend_ip
-  name: az network application-gateway frontend-ip
-  summary: Manage frontend IP addresses of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_frontend_ip_create
-  - az_network_application_gateway_frontend_ip_delete
-  - az_network_application_gateway_frontend_ip_list
-  - az_network_application_gateway_frontend_ip_show
-  - az_network_application_gateway_frontend_ip_update
-- uid: az_network_application_gateway_frontend_ip_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_frontend-ip
+name: az network application-gateway frontend-ip
+summary: Manage frontend IP addresses of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_frontend-ip_create
   name: az network application-gateway frontend-ip create
   summary: Create a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip create --gateway-name
+                                                      --name
+                                                      --resource-group
+                                                      [--no-wait]
+                                                      [--private-ip-address]
+                                                      [--public-ip-address]
+                                                      [--subnet]
+                                                      [--subscription]
+                                                      [--vnet-name]
   examples:
   - summary: Create a frontend IP address.
-    syntax:
-      content: >-
-        az network application-gateway frontend-ip create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyFrontendIp --public-ip-address MyPublicIpAddress
+    syntax: >-
+      az network application-gateway frontend-ip create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyFrontendIp --public-ip-address MyPublicIpAddress
   - summary: Create a frontend IP address. (autogenerated)
-    syntax:
-      content: az network application-gateway frontend-ip create --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup --subnet MySubnet --vnet-name MyVnet
-  parameters:
+    syntax: az network application-gateway frontend-ip create --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup --subnet MySubnet --vnet-name MyVnet
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -38,8 +36,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -52,32 +51,28 @@ items:
   - name: --subnet
     summary: The name or ID of the subnet.
     description: ''
-  - name: --vnet-name
-    summary: The name of the virtual network corresponding to the subnet.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_delete
+  - name: --vnet-name
+    summary: The name of the virtual network corresponding to the subnet.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_delete
   name: az network application-gateway frontend-ip delete
   summary: Delete a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip delete [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--no-wait]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Delete a frontend IP address.
-    syntax:
-      content: az network application-gateway frontend-ip delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway frontend-ip delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -87,57 +82,60 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_list
   name: az network application-gateway frontend-ip list
   summary: List frontend IP addresses.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip list --gateway-name
+                                                    --resource-group
+                                                    [--query-examples]
+                                                    [--subscription]
   examples:
   - summary: List frontend IP addresses.
-    syntax:
-      content: az network application-gateway frontend-ip list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway frontend-ip list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_show
   name: az network application-gateway frontend-ip show
   summary: Get the details of a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip show [--gateway-name]
+                                                    [--ids]
+                                                    [--name]
+                                                    [--query-examples]
+                                                    [--resource-group]
+                                                    [--subscription]
   examples:
   - summary: Get the details of a frontend IP address.
-    syntax:
-      content: az network application-gateway frontend-ip show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
-  parameters:
+    syntax: az network application-gateway frontend-ip show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendIp
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -147,46 +145,44 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_ip_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-ip_update
   name: az network application-gateway frontend-ip update
   summary: Update a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-ip update [--add]
+                                                      [--force-string]
+                                                      [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--no-wait]
+                                                      [--private-ip-address]
+                                                      [--public-ip-address]
+                                                      [--remove]
+                                                      [--resource-group]
+                                                      [--set]
+                                                      [--subnet]
+                                                      [--subscription]
+                                                      [--vnet-name]
   examples:
-  - summary: Update a frontend IP address to use a new IP address.
-    syntax:
-      content: az network application-gateway frontend-ip update -g MyResourceGroup --gateway-name MyAppGateway \ -n MyFrontendIp --public-ip-address MyNewPublicIpAddress
   - summary: Update a frontend IP address. (autogenerated)
-    syntax:
-      content: az network application-gateway frontend-ip update --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --private-ip-address
-    summary: Static private IP address to use.
-    description: ''
-  - name: --public-ip-address
-    summary: The name or ID of the public IP address.
-    description: ''
-  - name: --subnet
-    summary: The name or ID of the subnet.
+    syntax: az network application-gateway frontend-ip update --gateway-name MyAppGateway --name MyFrontendIp --private-ip-address 10.10.10.50 --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --vnet-name
-    summary: The name of the virtual network corresponding to the subnet.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -197,46 +193,40 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --private-ip-address
+    summary: Static private IP address to use.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --public-ip-address
+    summary: The name or ID of the public IP address.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subnet
+    summary: The name or ID of the subnet.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The name of the virtual network corresponding to the subnet.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_frontend_ip_create
-  name: az network application-gateway frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_delete
-  name: az network application-gateway frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_list
-  name: az network application-gateway frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_application_gateway_frontend_ip_show
-  name: az network application-gateway frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_application_gateway_frontend_ip_update
-  name: az network application-gateway frontend-ip update
-  summary: Update a frontend IP address.
+- az_network_application-gateway_frontend-ip_create
+- az_network_application-gateway_frontend-ip_delete
+- az_network_application-gateway_frontend-ip_list
+- az_network_application-gateway_frontend-ip_show
+- az_network_application-gateway_frontend-ip_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -252,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage frontend IP addresses of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend IP addresses of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-port.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-port.yml
index 3f7a9318d3..1131e8cce3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-port.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/frontend-port.yml
@@ -1,30 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_frontend_port
-  name: az network application-gateway frontend-port
-  summary: Manage frontend ports of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_frontend_port_create
-  - az_network_application_gateway_frontend_port_delete
-  - az_network_application_gateway_frontend_port_list
-  - az_network_application_gateway_frontend_port_show
-  - az_network_application_gateway_frontend_port_update
-- uid: az_network_application_gateway_frontend_port_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_frontend-port
+name: az network application-gateway frontend-port
+summary: Manage frontend ports of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_frontend-port_create
   name: az network application-gateway frontend-port create
   summary: Create a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port create --gateway-name
+                                                        --name
+                                                        --port
+                                                        --resource-group
+                                                        [--no-wait]
+                                                        [--subscription]
   examples:
   - summary: Create a frontend port.
-    syntax:
-      content: >-
-        az network application-gateway frontend-port create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyFrontendPort --port 8080
-  parameters:
+    syntax: >-
+      az network application-gateway frontend-port create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyFrontendPort --port 8080
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -39,34 +35,31 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_delete
   name: az network application-gateway frontend-port delete
   summary: Delete a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port delete [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Delete a frontend port.
-    syntax:
-      content: az network application-gateway frontend-port delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway frontend-port delete -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -76,57 +69,60 @@ items:
   - name: --name -n
     summary: The name of the frontend port.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_list
   name: az network application-gateway frontend-port list
   summary: List frontend ports.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port list --gateway-name
+                                                      --resource-group
+                                                      [--query-examples]
+                                                      [--subscription]
   examples:
   - summary: List frontend ports.
-    syntax:
-      content: az network application-gateway frontend-port list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway frontend-port list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_show
   name: az network application-gateway frontend-port show
   summary: Get the details of a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port show [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--query-examples]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Get the details of a frontend port.
-    syntax:
-      content: az network application-gateway frontend-port show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
-  parameters:
+    syntax: az network application-gateway frontend-port show -g MyResourceGroup --gateway-name MyAppGateway -n MyFrontendPort
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -136,36 +132,43 @@ items:
   - name: --name -n
     summary: The name of the frontend port.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_frontend_port_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_frontend-port_update
   name: az network application-gateway frontend-port update
   summary: Update a frontend port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway frontend-port update [--add]
+                                                        [--force-string]
+                                                        [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--port]
+                                                        [--remove]
+                                                        [--resource-group]
+                                                        [--set]
+                                                        [--subscription]
   examples:
   - summary: Update a frontend port to use a different port.
-    syntax:
-      content: >-
-        az network application-gateway frontend-port update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyFrontendPort --port 8081
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+    syntax: >-
+      az network application-gateway frontend-port update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyFrontendPort --port 8081
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --port
-    summary: The port number.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -176,46 +179,31 @@ items:
   - name: --name -n
     summary: The name of the frontend port.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --port
+    summary: The port number.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_frontend_port_create
-  name: az network application-gateway frontend-port create
-  summary: Create a frontend port.
-- uid: az_network_application_gateway_frontend_port_delete
-  name: az network application-gateway frontend-port delete
-  summary: Delete a frontend port.
-- uid: az_network_application_gateway_frontend_port_list
-  name: az network application-gateway frontend-port list
-  summary: List frontend ports.
-- uid: az_network_application_gateway_frontend_port_show
-  name: az network application-gateway frontend-port show
-  summary: Get the details of a frontend port.
-- uid: az_network_application_gateway_frontend_port_update
-  name: az network application-gateway frontend-port update
-  summary: Update a frontend port.
+- az_network_application-gateway_frontend-port_create
+- az_network_application-gateway_frontend-port_delete
+- az_network_application-gateway_frontend-port_list
+- az_network_application-gateway_frontend-port_show
+- az_network_application-gateway_frontend-port_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -231,10 +219,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage frontend ports of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend ports of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-listener.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-listener.yml
index 3b208600f5..48653af99d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-listener.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-listener.yml
@@ -1,30 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_http_listener
-  name: az network application-gateway http-listener
-  summary: Manage HTTP listeners of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_http_listener_create
-  - az_network_application_gateway_http_listener_delete
-  - az_network_application_gateway_http_listener_list
-  - az_network_application_gateway_http_listener_show
-  - az_network_application_gateway_http_listener_update
-- uid: az_network_application_gateway_http_listener_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_http-listener
+name: az network application-gateway http-listener
+summary: Manage HTTP listeners of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_http-listener_create
   name: az network application-gateway http-listener create
   summary: Create an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener create --frontend-port
+                                                        --gateway-name
+                                                        --name
+                                                        --resource-group
+                                                        [--frontend-ip]
+                                                        [--host-name]
+                                                        [--no-wait]
+                                                        [--ssl-cert]
+                                                        [--subscription]
   examples:
   - summary: Create an HTTP listener.
-    syntax:
-      content: >-
-        az network application-gateway http-listener create -g MyResourceGroup --gateway-name MyAppGateway \
-            --frontend-port MyFrontendPort -n MyHttpListener --frontend-ip MyAppGatewayPublicIp
-  parameters:
+    syntax: >-
+      az network application-gateway http-listener create -g MyResourceGroup --gateway-name MyAppGateway \
+          --frontend-port MyFrontendPort -n MyHttpListener --frontend-ip MyAppGatewayPublicIp
+  requiredParameters:
   - isRequired: true
     name: --frontend-port
     summary: The name or ID of the frontend port.
@@ -39,8 +38,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --frontend-ip
     summary: The name or ID of the frontend IP configuration. If only one exists, omit to use as default.
     description: ''
@@ -56,26 +56,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_delete
   name: az network application-gateway http-listener delete
   summary: Delete an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener delete [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Delete an HTTP listener.
-    syntax:
-      content: az network application-gateway http-listener delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway http-listener delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -85,57 +81,60 @@ items:
   - name: --name -n
     summary: The name of the HTTP listener.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_list
   name: az network application-gateway http-listener list
   summary: List HTTP listeners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener list --gateway-name
+                                                      --resource-group
+                                                      [--query-examples]
+                                                      [--subscription]
   examples:
   - summary: List HTTP listeners.
-    syntax:
-      content: az network application-gateway http-listener list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway http-listener list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_show
   name: az network application-gateway http-listener show
   summary: Get the details of an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener show [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--query-examples]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Get the details of an HTTP listener.
-    syntax:
-      content: az network application-gateway http-listener show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
-  parameters:
+    syntax: az network application-gateway http-listener show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpListener
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -145,95 +144,90 @@ items:
   - name: --name -n
     summary: The name of the HTTP listener.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_listener_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-listener_update
   name: az network application-gateway http-listener update
   summary: Update an HTTP listener.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-listener update [--add]
+                                                        [--force-string]
+                                                        [--frontend-ip]
+                                                        [--frontend-port]
+                                                        [--gateway-name]
+                                                        [--host-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--remove]
+                                                        [--resource-group]
+                                                        [--set]
+                                                        [--ssl-cert]
+                                                        [--subscription]
   examples:
   - summary: Update an HTTP listener to use a different hostname.
-    syntax:
-      content: >-
-        az network application-gateway http-listener update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyHttpListener --host-name www.mynewhost.com
-  parameters:
+    syntax: >-
+      az network application-gateway http-listener update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyHttpListener --host-name www.mynewhost.com
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip
     summary: The name or ID of the frontend IP configuration.
     description: ''
   - name: --frontend-port
     summary: The name or ID of the frontend port.
     description: ''
-  - name: --host-name
-    summary: Host name to use for multisite gateways.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --ssl-cert
-    summary: The name or ID of the SSL certificate to use.
-    description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
+  - name: --host-name
+    summary: Host name to use for multisite gateways.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the HTTP listener.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --ssl-cert
+    summary: The name or ID of the SSL certificate to use.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_http_listener_create
-  name: az network application-gateway http-listener create
-  summary: Create an HTTP listener.
-- uid: az_network_application_gateway_http_listener_delete
-  name: az network application-gateway http-listener delete
-  summary: Delete an HTTP listener.
-- uid: az_network_application_gateway_http_listener_list
-  name: az network application-gateway http-listener list
-  summary: List HTTP listeners.
-- uid: az_network_application_gateway_http_listener_show
-  name: az network application-gateway http-listener show
-  summary: Get the details of an HTTP listener.
-- uid: az_network_application_gateway_http_listener_update
-  name: az network application-gateway http-listener update
-  summary: Update an HTTP listener.
+- az_network_application-gateway_http-listener_create
+- az_network_application-gateway_http-listener_delete
+- az_network_application-gateway_http-listener_list
+- az_network_application-gateway_http-listener_show
+- az_network_application-gateway_http-listener_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -249,10 +243,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage HTTP listeners of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage HTTP listeners of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-settings.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-settings.yml
index 416e6941c1..671df9e040 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-settings.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/http-settings.yml
@@ -1,33 +1,39 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_http_settings
-  name: az network application-gateway http-settings
-  summary: Manage HTTP settings of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_http_settings_create
-  - az_network_application_gateway_http_settings_delete
-  - az_network_application_gateway_http_settings_list
-  - az_network_application_gateway_http_settings_show
-  - az_network_application_gateway_http_settings_update
-- uid: az_network_application_gateway_http_settings_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_http-settings
+name: az network application-gateway http-settings
+summary: Manage HTTP settings of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_http-settings_create
   name: az network application-gateway http-settings create
   summary: Create HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings create --gateway-name
+                                                        --name
+                                                        --port
+                                                        --resource-group
+                                                        [--affinity-cookie-name]
+                                                        [--auth-certs]
+                                                        [--connection-draining-timeout]
+                                                        [--cookie-based-affinity {Disabled, Enabled}]
+                                                        [--enable-probe {false, true}]
+                                                        [--host-name]
+                                                        [--host-name-from-backend-pool {false, true}]
+                                                        [--no-wait]
+                                                        [--path]
+                                                        [--probe]
+                                                        [--protocol {Http, Https}]
+                                                        [--subscription]
+                                                        [--timeout]
   examples:
   - summary: Create HTTP settings.
-    syntax:
-      content: >-
-        az network application-gateway http-settings create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyHttpSettings --port 80 --protocol Http --cookie-based-affinity Disabled --timeout 30
+    syntax: >-
+      az network application-gateway http-settings create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyHttpSettings --port 80 --protocol Http --cookie-based-affinity Disabled --timeout 30
   - summary: Create HTTP settings. (autogenerated)
-    syntax:
-      content: az network application-gateway http-settings create --gateway-name MyAppGateway --host-name MyHost --name MyHttpSettings --port 80 --probe MyNewProbe --protocol Http --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway http-settings create --gateway-name MyAppGateway --host-name MyHost --name MyHttpSettings --port 80 --probe MyNewProbe --protocol Http --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -42,8 +48,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --affinity-cookie-name
     summary: Name used for the affinity cookie.
     description: ''
@@ -82,32 +89,28 @@ items:
     parameterValueGroup: Http, Https
     summary: The HTTP settings protocol.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_delete
+  - name: --timeout
+    summary: Request timeout in seconds.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_delete
   name: az network application-gateway http-settings delete
   summary: Delete HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings delete [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Delete HTTP settings.
-    syntax:
-      content: az network application-gateway http-settings delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway http-settings delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -117,57 +120,60 @@ items:
   - name: --name -n
     summary: The name of the backed HTTP settings.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_list
   name: az network application-gateway http-settings list
   summary: List HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings list --gateway-name
+                                                      --resource-group
+                                                      [--query-examples]
+                                                      [--subscription]
   examples:
   - summary: List HTTP settings.
-    syntax:
-      content: az network application-gateway http-settings list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway http-settings list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_show
   name: az network application-gateway http-settings show
   summary: Get the details of a gateway's HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings show [--gateway-name]
+                                                      [--ids]
+                                                      [--name]
+                                                      [--query-examples]
+                                                      [--resource-group]
+                                                      [--subscription]
   examples:
   - summary: Get the details of a gateway's HTTP settings.
-    syntax:
-      content: az network application-gateway http-settings show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
-  parameters:
+    syntax: az network application-gateway http-settings show -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -177,34 +183,56 @@ items:
   - name: --name -n
     summary: The name of the backed HTTP settings.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_http_settings_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_http-settings_update
   name: az network application-gateway http-settings update
   summary: Update HTTP settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway http-settings update [--add]
+                                                        [--affinity-cookie-name]
+                                                        [--auth-certs]
+                                                        [--connection-draining-timeout]
+                                                        [--cookie-based-affinity {Disabled, Enabled}]
+                                                        [--enable-probe {false, true}]
+                                                        [--force-string]
+                                                        [--gateway-name]
+                                                        [--host-name]
+                                                        [--host-name-from-backend-pool {false, true}]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--no-wait]
+                                                        [--path]
+                                                        [--port]
+                                                        [--probe]
+                                                        [--protocol {Http, Https}]
+                                                        [--remove]
+                                                        [--resource-group]
+                                                        [--set]
+                                                        [--subscription]
+                                                        [--timeout]
   examples:
   - summary: Update HTTP settings to use a new probe.
-    syntax:
-      content: >-
-        az network application-gateway http-settings update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyHttpSettings --probe MyNewProbe
+    syntax: >-
+      az network application-gateway http-settings update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyHttpSettings --probe MyNewProbe
+  - summary: Update HTTP settings. (autogenerated)
+    syntax: az network application-gateway http-settings update --enable-probe true --gateway-name MyAppGateway --name MyHttpSettings --probe MyNewProbe --resource-group MyResourceGroup
   - summary: Update HTTP settings. (autogenerated)
-    syntax:
-      content: az network application-gateway http-settings update --enable-probe true --gateway-name MyAppGateway --name MyHttpSettings --probe MyNewProbe --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway http-settings update --gateway-name MyAppGateway --host-name-from-backend-pool true --name MyHttpSettings --port 80 --probe MyNewProbe --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --affinity-cookie-name
     summary: Name used for the affinity cookie.
     description: ''
@@ -222,6 +250,12 @@ items:
     parameterValueGroup: false, true
     summary: Whether the probe is enabled.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
   - name: --host-name
     summary: Host header sent to the backend servers.
     description: ''
@@ -229,6 +263,12 @@ items:
     parameterValueGroup: false, true
     summary: Use host name of the backend server as the host header.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the backed HTTP settings.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -245,58 +285,28 @@ items:
     parameterValueGroup: Http, Https
     summary: The HTTP settings protocol.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds.
-    description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the backed HTTP settings.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --timeout
+    summary: Request timeout in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_http_settings_create
-  name: az network application-gateway http-settings create
-  summary: Create HTTP settings.
-- uid: az_network_application_gateway_http_settings_delete
-  name: az network application-gateway http-settings delete
-  summary: Delete HTTP settings.
-- uid: az_network_application_gateway_http_settings_list
-  name: az network application-gateway http-settings list
-  summary: List HTTP settings.
-- uid: az_network_application_gateway_http_settings_show
-  name: az network application-gateway http-settings show
-  summary: Get the details of a gateway's HTTP settings.
-- uid: az_network_application_gateway_http_settings_update
-  name: az network application-gateway http-settings update
-  summary: Update HTTP settings.
+- az_network_application-gateway_http-settings_create
+- az_network_application-gateway_http-settings_delete
+- az_network_application-gateway_http-settings_list
+- az_network_application-gateway_http-settings_show
+- az_network_application-gateway_http-settings_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -312,10 +322,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage HTTP settings of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage HTTP settings of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/probe.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/probe.yml
index 168d05110c..d64e8053d5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/probe.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/probe.yml
@@ -1,30 +1,35 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_probe
-  name: az network application-gateway probe
-  summary: Manage probes to gather and evaluate information on a gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_probe_create
-  - az_network_application_gateway_probe_delete
-  - az_network_application_gateway_probe_list
-  - az_network_application_gateway_probe_show
-  - az_network_application_gateway_probe_update
-- uid: az_network_application_gateway_probe_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_probe
+name: az network application-gateway probe
+summary: Manage probes to gather and evaluate information on a gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_probe_create
   name: az network application-gateway probe create
   summary: Create a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe create --gateway-name
+                                                --name
+                                                --path
+                                                --protocol {Http, Https}
+                                                --resource-group
+                                                [--host]
+                                                [--host-name-from-http-settings {false, true}]
+                                                [--interval]
+                                                [--match-body]
+                                                [--match-status-codes]
+                                                [--min-servers]
+                                                [--no-wait]
+                                                [--subscription]
+                                                [--threshold]
+                                                [--timeout]
   examples:
   - summary: Create an application gateway probe.
-    syntax:
-      content: >-
-        az network application-gateway probe create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyProbe --protocol https --host 127.0.0.1 --path /path/to/probe
-  parameters:
+    syntax: >-
+      az network application-gateway probe create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyProbe --protocol https --host 127.0.0.1 --path /path/to/probe
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -44,8 +49,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --host
     summary: The name of the host to send the probe.
     description: ''
@@ -69,6 +75,9 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --threshold
     defaultValue: "8"
     summary: The number of failed probes after which the back end server is marked down.
@@ -77,32 +86,24 @@ items:
     defaultValue: "120"
     summary: The probe timeout in seconds.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_delete
   name: az network application-gateway probe delete
   summary: Delete a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe delete [--gateway-name]
+                                                [--ids]
+                                                [--name]
+                                                [--no-wait]
+                                                [--resource-group]
+                                                [--subscription]
   examples:
   - summary: Delete a probe.
-    syntax:
-      content: az network application-gateway probe delete -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
+    syntax: az network application-gateway probe delete -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
   - summary: Delete a probe. (autogenerated)
-    syntax:
-      content: az network application-gateway probe delete --gateway-name MyAppGateway --name MyProbe --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway probe delete --gateway-name MyAppGateway --name MyProbe --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -112,57 +113,60 @@ items:
   - name: --name -n
     summary: The name of the probe.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_list
   name: az network application-gateway probe list
   summary: List probes.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe list --gateway-name
+                                              --resource-group
+                                              [--query-examples]
+                                              [--subscription]
   examples:
   - summary: List probes.
-    syntax:
-      content: az network application-gateway probe list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway probe list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_show
   name: az network application-gateway probe show
   summary: Get the details of a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe show [--gateway-name]
+                                              [--ids]
+                                              [--name]
+                                              [--query-examples]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: Get the details of a probe.
-    syntax:
-      content: az network application-gateway probe show -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
-  parameters:
+    syntax: az network application-gateway probe show -g MyResourceGroup --gateway-name MyAppGateway -n MyProbe
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -172,31 +176,58 @@ items:
   - name: --name -n
     summary: The name of the probe.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_probe_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_probe_update
   name: az network application-gateway probe update
   summary: Update a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway probe update [--add]
+                                                [--force-string]
+                                                [--gateway-name]
+                                                [--host]
+                                                [--host-name-from-http-settings {false, true}]
+                                                [--ids]
+                                                [--interval]
+                                                [--match-body]
+                                                [--match-status-codes]
+                                                [--min-servers]
+                                                [--name]
+                                                [--no-wait]
+                                                [--path]
+                                                [--protocol {Http, Https}]
+                                                [--remove]
+                                                [--resource-group]
+                                                [--set]
+                                                [--subscription]
+                                                [--threshold]
+                                                [--timeout]
   examples:
   - summary: Update an application gateway probe with a timeout of 60 seconds.
-    syntax:
-      content: >-
-        az network application-gateway probe update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyProbe --timeout 60
-  parameters:
+    syntax: >-
+      az network application-gateway probe update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyProbe --timeout 60
+  - summary: Update a probe. (autogenerated)
+    syntax: az network application-gateway probe update --gateway-name MyAppGateway --host 127.0.0.1 --name MyProbe --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
   - name: --host
     summary: The name of the host to send the probe.
     description: ''
@@ -204,6 +235,9 @@ items:
     parameterValueGroup: false, true
     summary: Use host header from HTTP settings.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     summary: The time interval in seconds between consecutive probes.
     description: ''
@@ -216,6 +250,9 @@ items:
   - name: --min-servers
     summary: Minimum number of servers that are always marked healthy.
     description: ''
+  - name: --name -n
+    summary: The name of the probe.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -226,61 +263,31 @@ items:
     parameterValueGroup: Http, Https
     summary: The HTTP settings protocol.
     description: ''
-  - name: --threshold
-    summary: The number of failed probes after which the back end server is marked down.
-    description: ''
-  - name: --timeout
-    summary: The probe timeout in seconds.
-    description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the probe.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --threshold
+    summary: The number of failed probes after which the back end server is marked down.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --timeout
+    summary: The probe timeout in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_probe_create
-  name: az network application-gateway probe create
-  summary: Create a probe.
-- uid: az_network_application_gateway_probe_delete
-  name: az network application-gateway probe delete
-  summary: Delete a probe.
-- uid: az_network_application_gateway_probe_list
-  name: az network application-gateway probe list
-  summary: List probes.
-- uid: az_network_application_gateway_probe_show
-  name: az network application-gateway probe show
-  summary: Get the details of a probe.
-- uid: az_network_application_gateway_probe_update
-  name: az network application-gateway probe update
-  summary: Update a probe.
+- az_network_application-gateway_probe_create
+- az_network_application-gateway_probe_delete
+- az_network_application-gateway_probe_list
+- az_network_application-gateway_probe_show
+- az_network_application-gateway_probe_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -296,10 +303,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage probes to gather and evaluate information on a gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage probes to gather and evaluate information on a gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/redirect-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/redirect-config.yml
index ac4d717cfe..885e314420 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/redirect-config.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/redirect-config.yml
@@ -1,31 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_redirect_config
-  name: az network application-gateway redirect-config
-  summary: Manage redirect configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_redirect_config_create
-  - az_network_application_gateway_redirect_config_delete
-  - az_network_application_gateway_redirect_config_list
-  - az_network_application_gateway_redirect_config_show
-  - az_network_application_gateway_redirect_config_update
-- uid: az_network_application_gateway_redirect_config_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_redirect-config
+name: az network application-gateway redirect-config
+summary: Manage redirect configurations.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_redirect-config_create
   name: az network application-gateway redirect-config create
   summary: Create a redirect configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway redirect-config create --gateway-name
+                                                          --name
+                                                          --resource-group
+                                                          --type {Found, Permanent, SeeOther, Temporary}
+                                                          [--include-path {false, true}]
+                                                          [--include-query-string {false, true}]
+                                                          [--no-wait]
+                                                          [--subscription]
+                                                          [--target-listener]
+                                                          [--target-url]
   examples:
   - summary: Create a redirect configuration to a http-listener called MyBackendListener.
-    syntax:
-      content: >-
-        az network application-gateway redirect-config create -g MyResourceGroup \
-            --gateway-name MyAppGateway -n MyRedirectConfig --type Permanent \
-            --include-path true --include-query-string true --target-listener MyBackendListener
-  parameters:
+    syntax: >-
+      az network application-gateway redirect-config create -g MyResourceGroup \
+          --gateway-name MyAppGateway -n MyRedirectConfig --type Permanent \
+          --include-path true --include-query-string true --target-listener MyBackendListener
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -36,13 +36,14 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --type -t
     parameterValueGroup: Found, Permanent, SeeOther, Temporary
     summary: HTTP redirection type.
     description: ''
+  optionalParameters:
   - name: --include-path
     parameterValueGroup: false, true
     summary: Include path in the redirected url.
@@ -54,35 +55,31 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target-listener
     summary: Name or ID of the HTTP listener to redirect the request to.
     description: ''
   - name: --target-url
     summary: URL to redirect the request to.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_redirect_config_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_redirect-config_delete
   name: az network application-gateway redirect-config delete
   summary: Delete a redirect configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway redirect-config delete [--gateway-name]
+                                                          [--ids]
+                                                          [--name]
+                                                          [--no-wait]
+                                                          [--resource-group]
+                                                          [--subscription]
   examples:
   - summary: Delete a redirect configuration.
-    syntax:
-      content: az network application-gateway redirect-config delete -g MyResourceGroup \ --gateway-name MyAppGateway -n MyRedirectConfig
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway redirect-config delete -g MyResourceGroup \ --gateway-name MyAppGateway -n MyRedirectConfig
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -92,57 +89,60 @@ items:
   - name: --name -n
     summary: The name of the redirect configuration.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_redirect_config_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_redirect-config_list
   name: az network application-gateway redirect-config list
   summary: List redirect configurations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway redirect-config list --gateway-name
+                                                        --resource-group
+                                                        [--query-examples]
+                                                        [--subscription]
   examples:
   - summary: List redirect configurations.
-    syntax:
-      content: az network application-gateway redirect-config list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway redirect-config list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_redirect_config_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_redirect-config_show
   name: az network application-gateway redirect-config show
   summary: Get the details of a redirect configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway redirect-config show [--gateway-name]
+                                                        [--ids]
+                                                        [--name]
+                                                        [--query-examples]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
   - summary: Get the details of a redirect configuration.
-    syntax:
-      content: az network application-gateway redirect-config show -g MyResourceGroup --gateway-name MyAppGateway -n MyRedirectConfig
-  parameters:
+    syntax: az network application-gateway redirect-config show -g MyResourceGroup --gateway-name MyAppGateway -n MyRedirectConfig
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -152,34 +152,56 @@ items:
   - name: --name -n
     summary: The name of the redirect configuration.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_redirect_config_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_redirect-config_update
   name: az network application-gateway redirect-config update
   summary: Update a redirect configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway redirect-config update [--add]
+                                                          [--force-string]
+                                                          [--gateway-name]
+                                                          [--ids]
+                                                          [--include-path {false, true}]
+                                                          [--include-query-string {false, true}]
+                                                          [--name]
+                                                          [--no-wait]
+                                                          [--remove]
+                                                          [--resource-group]
+                                                          [--set]
+                                                          [--subscription]
+                                                          [--target-listener]
+                                                          [--target-url]
+                                                          [--type {Found, Permanent, SeeOther, Temporary}]
   examples:
   - summary: Update a redirect configuration to a different http-listener.
-    syntax:
-      content: >-
-        az network application-gateway redirect-config update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyRedirectConfig --type Permanent --target-listener MyNewBackendListener
+    syntax: >-
+      az network application-gateway redirect-config update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyRedirectConfig --type Permanent --target-listener MyNewBackendListener
   - summary: Update a redirect configuration. (autogenerated)
-    syntax:
-      content: az network application-gateway redirect-config update --gateway-name MyAppGateway --include-path true --include-query-string true --name MyRedirectConfig --resource-group MyResourceGroup --target-listener MyNewBackendListener --type Permanent
-  parameters:
+    syntax: az network application-gateway redirect-config update --gateway-name MyAppGateway --include-path true --include-query-string true --name MyRedirectConfig --resource-group MyResourceGroup --target-listener MyNewBackendListener --type Permanent
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --include-path
     parameterValueGroup: false, true
     summary: Include path in the redirected url.
@@ -188,9 +210,24 @@ items:
     parameterValueGroup: false, true
     summary: Include query string in the redirected url.
     description: ''
+  - name: --name -n
+    summary: The name of the redirect configuration.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target-listener
     summary: Name or ID of the HTTP listener to redirect the request to.
     description: ''
@@ -201,55 +238,13 @@ items:
     parameterValueGroup: Found, Permanent, SeeOther, Temporary
     summary: HTTP redirection type.
     description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the redirect configuration.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_redirect_config_create
-  name: az network application-gateway redirect-config create
-  summary: Create a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_delete
-  name: az network application-gateway redirect-config delete
-  summary: Delete a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_list
-  name: az network application-gateway redirect-config list
-  summary: List redirect configurations.
-- uid: az_network_application_gateway_redirect_config_show
-  name: az network application-gateway redirect-config show
-  summary: Get the details of a redirect configuration.
-- uid: az_network_application_gateway_redirect_config_update
-  name: az network application-gateway redirect-config update
-  summary: Update a redirect configuration.
+- az_network_application-gateway_redirect-config_create
+- az_network_application-gateway_redirect-config_delete
+- az_network_application-gateway_redirect-config_list
+- az_network_application-gateway_redirect-config_show
+- az_network_application-gateway_redirect-config_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -265,10 +260,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage redirect configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage redirect configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule.yml
index 5db57537d6..a473507134 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule.yml
@@ -1,31 +1,15 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_rewrite_rule
-  name: az network application-gateway rewrite-rule
-  summary: Manage rewrite rules of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_rewrite-rule
+name: az network application-gateway rewrite-rule
+summary: Manage rewrite rules of an application gateway.
+description: ''
 commands:
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
+- az_network_application-gateway_rewrite-rule_set
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -41,10 +25,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage rewrite rules of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage rewrite rules of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml
index e54b636713..19ec4392f3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rewrite-rule/set.yml
@@ -1,28 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_rewrite_rule_set
-  name: az network application-gateway rewrite-rule set
-  summary: Manage rewrite rule sets of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_rewrite_rule_set_create
-  - az_network_application_gateway_rewrite_rule_set_delete
-  - az_network_application_gateway_rewrite_rule_set_list
-  - az_network_application_gateway_rewrite_rule_set_show
-  - az_network_application_gateway_rewrite_rule_set_update
-- uid: az_network_application_gateway_rewrite_rule_set_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_rewrite-rule_set
+name: az network application-gateway rewrite-rule set
+summary: Manage rewrite rule sets of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_rewrite-rule_set_create
   name: az network application-gateway rewrite-rule set create
   summary: Create a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rewrite-rule set create --gateway-name
+                                                           --item-name
+                                                           --resource-group
+                                                           [--no-wait]
+                                                           [--subscription]
   examples:
   - summary: Create a rewrite rule set. (autogenerated)
-    syntax:
-      content: az network application-gateway rewrite-rule set create --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rewrite-rule set create --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -33,124 +28,139 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_delete
   name: az network application-gateway rewrite-rule set delete
   summary: Delete a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network application-gateway rewrite-rule set delete --item-name
+                                                           --resource-group
+                                                           --resource-name
+                                                           [--no-wait]
+                                                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --item-name
     summary: ''
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-name
     summary: ''
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_list
   name: az network application-gateway rewrite-rule set list
   summary: List rewrite rule sets.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rewrite-rule set list --resource-group
+                                                         --resource-name
+                                                         [--query-examples]
+                                                         [--subscription]
   examples:
   - summary: List rewrite rule sets. (autogenerated)
-    syntax:
-      content: az network application-gateway rewrite-rule set list --gateway-name MyGateway --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rewrite-rule set list --gateway-name MyGateway --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-name
     summary: ''
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_show
   name: az network application-gateway rewrite-rule set show
   summary: Get the details of a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rewrite-rule set show --item-name
+                                                         --resource-group
+                                                         --resource-name
+                                                         [--query-examples]
+                                                         [--subscription]
   examples:
   - summary: Get the details of a rewrite rule set. (autogenerated)
-    syntax:
-      content: az network application-gateway rewrite-rule set show --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rewrite-rule set show --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --item-name
     summary: ''
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-name
     summary: ''
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rewrite_rule_set_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rewrite-rule_set_update
   name: az network application-gateway rewrite-rule set update
   summary: Update a rewrite rule set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network application-gateway rewrite-rule set update --item-name
+                                                           [--add]
+                                                           [--force-string]
+                                                           [--gateway-name]
+                                                           [--ids]
+                                                           [--no-wait]
+                                                           [--remove]
+                                                           [--resource-group]
+                                                           [--set]
+                                                           [--subscription]
+  examples:
+  - summary: Update a rewrite rule set. (autogenerated)
+    syntax: az network application-gateway rewrite-rule set update --gateway-name MyGateway --name MyRewriteRuleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --item-name
     summary: ''
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -158,46 +168,28 @@ items:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_rewrite_rule_set_create
-  name: az network application-gateway rewrite-rule set create
-  summary: Create a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_delete
-  name: az network application-gateway rewrite-rule set delete
-  summary: Delete a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_list
-  name: az network application-gateway rewrite-rule set list
-  summary: List rewrite rule sets.
-- uid: az_network_application_gateway_rewrite_rule_set_show
-  name: az network application-gateway rewrite-rule set show
-  summary: Get the details of a rewrite rule set.
-- uid: az_network_application_gateway_rewrite_rule_set_update
-  name: az network application-gateway rewrite-rule set update
-  summary: Update a rewrite rule set.
+- az_network_application-gateway_rewrite-rule_set_create
+- az_network_application-gateway_rewrite-rule_set_delete
+- az_network_application-gateway_rewrite-rule_set_list
+- az_network_application-gateway_rewrite-rule_set_show
+- az_network_application-gateway_rewrite-rule_set_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -213,10 +205,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage rewrite rule sets of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage rewrite rule sets of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rule.yml
index 17bd7fcbea..c910b6fca2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/rule.yml
@@ -1,30 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_rule
-  name: az network application-gateway rule
-  summary: Evaluate probe information and define routing rules.
-  description: For more information, visit, <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_rule_create
-  - az_network_application_gateway_rule_delete
-  - az_network_application_gateway_rule_list
-  - az_network_application_gateway_rule_show
-  - az_network_application_gateway_rule_update
-- uid: az_network_application_gateway_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_rule
+name: az network application-gateway rule
+summary: Evaluate probe information and define routing rules.
+description: For more information, visit, https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli.
+directCommands:
+- uid: az_network_application-gateway_rule_create
   name: az network application-gateway rule create
   summary: Create a rule.
   description: Rules are executed in the order in which they are created.
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule create --gateway-name
+                                               --name
+                                               --resource-group
+                                               [--address-pool]
+                                               [--http-listener]
+                                               [--http-settings]
+                                               [--no-wait]
+                                               [--priority]
+                                               [--redirect-config]
+                                               [--rule-type]
+                                               [--subscription]
+                                               [--url-path-map]
   examples:
   - summary: Create a basic rule.
-    syntax:
-      content: >-
-        az network application-gateway rule create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyRule --http-listener MyBackendListener --rule-type Basic --address-pool MyAddressPool --http-settings MyHttpSettings
-  parameters:
+    syntax: >-
+      az network application-gateway rule create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyRule --http-listener MyBackendListener --rule-type Basic --address-pool MyAddressPool --http-settings MyHttpSettings
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -35,8 +37,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --address-pool
     summary: The name or ID of the backend address pool. If only one exists, omit to use as default.
     description: ''
@@ -49,6 +52,9 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --priority
+    summary: Priority of the request routing rule. Range from 1 to 2000.
+    description: ''
   - name: --redirect-config
     summary: The name or ID of the redirect configuration to use with the created rule.
     description: ''
@@ -56,32 +62,28 @@ items:
     defaultValue: Basic
     summary: The rule type (Basic, PathBasedRouting).
     description: ''
-  - name: --url-path-map
-    summary: The name or ID of the URL path map.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_delete
+  - name: --url-path-map
+    summary: The name or ID of the URL path map.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_delete
   name: az network application-gateway rule delete
   summary: Delete a rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule delete [--gateway-name]
+                                               [--ids]
+                                               [--name]
+                                               [--no-wait]
+                                               [--resource-group]
+                                               [--subscription]
   examples:
   - summary: Delete a rule.
-    syntax:
-      content: az network application-gateway rule delete -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway rule delete -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -91,57 +93,60 @@ items:
   - name: --name -n
     summary: The name of the request routing rule.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_list
   name: az network application-gateway rule list
   summary: List rules.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule list --gateway-name
+                                             --resource-group
+                                             [--query-examples]
+                                             [--subscription]
   examples:
   - summary: List rules.
-    syntax:
-      content: az network application-gateway rule list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway rule list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_show
   name: az network application-gateway rule show
   summary: Get the details of a rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule show [--gateway-name]
+                                             [--ids]
+                                             [--name]
+                                             [--query-examples]
+                                             [--resource-group]
+                                             [--subscription]
   examples:
   - summary: Get the details of a rule.
-    syntax:
-      content: az network application-gateway rule show -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
-  parameters:
+    syntax: az network application-gateway rule show -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -151,104 +156,104 @@ items:
   - name: --name -n
     summary: The name of the request routing rule.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_rule_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_rule_update
   name: az network application-gateway rule update
   summary: Update a rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway rule update [--add]
+                                               [--address-pool]
+                                               [--force-string]
+                                               [--gateway-name]
+                                               [--http-listener]
+                                               [--http-settings]
+                                               [--ids]
+                                               [--name]
+                                               [--no-wait]
+                                               [--priority]
+                                               [--redirect-config]
+                                               [--remove]
+                                               [--resource-group]
+                                               [--rule-type]
+                                               [--set]
+                                               [--subscription]
+                                               [--url-path-map]
   examples:
   - summary: Update a rule use a new HTTP listener.
-    syntax:
-      content: >-
-        az network application-gateway rule update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyRule --http-listener MyNewBackendListener
+    syntax: >-
+      az network application-gateway rule update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyRule --http-listener MyNewBackendListener
   - summary: Update a rule. (autogenerated)
-    syntax:
-      content: az network application-gateway rule update --address-pool MyAddressPool --gateway-name MyAppGateway --name MyRule --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway rule update --address-pool MyAddressPool --gateway-name MyAppGateway --name MyRule --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-pool
     summary: The name or ID of the backend address pool.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
   - name: --http-listener
     summary: The name or ID of the HTTP listener.
     description: ''
   - name: --http-settings
     summary: The name or ID of the backend HTTP settings.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --redirect-config
-    summary: The name or ID of the redirect configuration to use with the created rule.
-    description: ''
-  - name: --rule-type
-    summary: The rule type (Basic, PathBasedRouting).
-    description: ''
-  - name: --url-path-map
-    summary: The name or ID of the URL path map.
-    description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the request routing rule.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --priority
+    summary: Priority of the request routing rule. Range from 1 to 2000.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --redirect-config
+    summary: The name or ID of the redirect configuration to use with the created rule.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --rule-type
+    summary: The rule type (Basic, PathBasedRouting).
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --url-path-map
+    summary: The name or ID of the URL path map.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_rule_create
-  name: az network application-gateway rule create
-  summary: Create a rule.
-- uid: az_network_application_gateway_rule_delete
-  name: az network application-gateway rule delete
-  summary: Delete a rule.
-- uid: az_network_application_gateway_rule_list
-  name: az network application-gateway rule list
-  summary: List rules.
-- uid: az_network_application_gateway_rule_show
-  name: az network application-gateway rule show
-  summary: Get the details of a rule.
-- uid: az_network_application_gateway_rule_update
-  name: az network application-gateway rule update
-  summary: Update a rule.
+- az_network_application-gateway_rule_create
+- az_network_application-gateway_rule_delete
+- az_network_application-gateway_rule_list
+- az_network_application-gateway_rule_show
+- az_network_application-gateway_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -264,10 +269,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information, visit, <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information, visit, https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-cert.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-cert.yml
index 361fb98a39..ff399ec930 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-cert.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-cert.yml
@@ -1,67 +1,63 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_ssl_cert
-  name: az network application-gateway ssl-cert
-  summary: Manage SSL certificates of an application gateway.
-  description: For more information visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_ssl_cert_create
-  - az_network_application_gateway_ssl_cert_delete
-  - az_network_application_gateway_ssl_cert_list
-  - az_network_application_gateway_ssl_cert_show
-  - az_network_application_gateway_ssl_cert_update
-- uid: az_network_application_gateway_ssl_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_ssl-cert
+name: az network application-gateway ssl-cert
+summary: Manage SSL certificates of an application gateway.
+description: For more information visit https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli.
+directCommands:
+- uid: az_network_application-gateway_ssl-cert_create
   name: az network application-gateway ssl-cert create
   summary: Upload an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert create --gateway-name
+                                                   --name
+                                                   --resource-group
+                                                   [--cert-file]
+                                                   [--cert-password]
+                                                   [--key-vault-secret-id]
+                                                   [--no-wait]
+                                                   [--subscription]
   examples:
   - summary: Upload an SSL certificate via --cert-file and --cert-password.
-    syntax:
-      content: >-
-        az network application-gateway ssl-cert create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MySSLCert --cert-file \path\to\cert\file --cert-password Abc123
+    syntax: >-
+      az network application-gateway ssl-cert create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MySSLCert --cert-file \path\to\cert\file --cert-password Abc123
   - summary: Upload an SSL certificate via --key-vault-secret-id of a KeyVault Secret
-    syntax:
-      content: >-
-        openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-          -out azure-cli-app-tls.crt \
-          -keyout azure-cli-app-tls.key \
-          -subj "/CN=azure-cli-app"
+    syntax: >-
+      openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+        -out azure-cli-app-tls.crt \
+        -keyout azure-cli-app-tls.key \
+        -subj "/CN=azure-cli-app"
 
-        openssl pkcs12 -export \
-          -in azure-cli-tls.crt \
-          -inkey sample-app-tls.key \
-          -passout pass: -out azure-cli-cert.pfx
+      openssl pkcs12 -export \
+        -in azure-cli-tls.crt \
+        -inkey sample-app-tls.key \
+        -passout pass: -out azure-cli-cert.pfx
 
-        SecretValue=$(cat azure-cli-cert.pfx | base64)
+      SecretValue=$(cat azure-cli-cert.pfx | base64)
 
 
-        az keyvault secret set --vault-name MyKeyVault --name MySecret --value ${SecretValue}
+      az keyvault secret set --vault-name MyKeyVault --name MySecret --value ${SecretValue}
 
 
-        az network application-gateway ssl-cert create \
-          --resource-group MyResourceGroup \
-          --gateway-name MyAppGateway \
-          -n MySSLCert \
-          --key-vault-secret-id MySecretSecretID
+      az network application-gateway ssl-cert create \
+        --resource-group MyResourceGroup \
+        --gateway-name MyAppGateway \
+        -n MySSLCert \
+        --key-vault-secret-id MySecretSecretID
   - summary: Upload an SSL certificate via --key-vault-secret-id of a KeyVault Certificate
-    syntax:
-      content: >-
-        az keyvault certificate create \
-          --vault-name MyKeyVault \
-          --name MyCertificate \
-          --policy "$(az keyvault certificate get-default-policy)" \
+    syntax: >-
+      az keyvault certificate create \
+        --vault-name MyKeyVault \
+        --name MyCertificate \
+        --policy "$(az keyvault certificate get-default-policy)" \
 
-        az network application-gateway ssl-cert create \
-          --resource-group MyResourceGroup \
-          --gateway-name MyAppGateway \
-          -n MySSLCert \
-          --key-vault-secret-id MyCertificateSecretID
-  parameters:
+      az network application-gateway ssl-cert create \
+        --resource-group MyResourceGroup \
+        --gateway-name MyAppGateway \
+        -n MySSLCert \
+        --key-vault-secret-id MyCertificateSecretID
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -72,8 +68,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --cert-file
     summary: The path to the PFX certificate file.
     description: ''
@@ -89,26 +86,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_delete
   name: az network application-gateway ssl-cert delete
   summary: Delete an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert delete [--gateway-name]
+                                                   [--ids]
+                                                   [--name]
+                                                   [--no-wait]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: Delete an SSL certificate.
-    syntax:
-      content: az network application-gateway ssl-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway ssl-cert delete -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -118,57 +111,67 @@ items:
   - name: --name -n
     summary: The name of the SSL certificate.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_list
   name: az network application-gateway ssl-cert list
   summary: List SSL certificates.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert list --gateway-name
+                                                 --resource-group
+                                                 [--query-examples]
+                                                 [--subscription]
   examples:
   - summary: List SSL certificates.
-    syntax:
-      content: az network application-gateway ssl-cert list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway ssl-cert list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_show
   name: az network application-gateway ssl-cert show
   summary: Get the details of an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert show [--gateway-name]
+                                                 [--ids]
+                                                 [--name]
+                                                 [--query-examples]
+                                                 [--resource-group]
+                                                 [--subscription]
   examples:
   - summary: Get the details of an SSL certificate.
-    syntax:
-      content: az network application-gateway ssl-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
-  parameters:
+    syntax: az network application-gateway ssl-cert show -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert
+  - summary: Display the expiry date of SSL certificate. The certificate is returned in PKCS7 format from which the expiration date needs to be retrieved.
+    syntax: >-
+      publiccert=`az network application-gateway ssl-cert show -g MyResourceGroup --gateway-name MyAppGateway --name mywebsite.com --query publicCertData -o tsv`
+
+      echo "-----BEGIN CERTIFICATE-----" >> public.cert; echo "${publiccert}" >> public.cert; echo "-----END CERTIFICATE-----" >> public.cert
+
+      cat public.cert | fold -w 64 | openssl pkcs7 -print_certs | openssl x509 -noout -enddate
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -178,42 +181,51 @@ items:
   - name: --name -n
     summary: The name of the SSL certificate.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_cert_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-cert_update
   name: az network application-gateway ssl-cert update
   summary: Update an SSL certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-cert update [--add]
+                                                   [--cert-file]
+                                                   [--cert-password]
+                                                   [--force-string]
+                                                   [--gateway-name]
+                                                   [--ids]
+                                                   [--key-vault-secret-id]
+                                                   [--name]
+                                                   [--no-wait]
+                                                   [--remove]
+                                                   [--resource-group]
+                                                   [--set]
+                                                   [--subscription]
   examples:
   - summary: Change a gateway SSL certificate and password.
-    syntax:
-      content: >-
-        az network application-gateway ssl-cert update -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert \
-            --cert-file \path\to\new\cert\file --cert-password Abc123Abc123
-  parameters:
+    syntax: >-
+      az network application-gateway ssl-cert update -g MyResourceGroup --gateway-name MyAppGateway -n MySslCert \
+          --cert-file \path\to\new\cert\file --cert-password Abc123Abc123
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --cert-file
     summary: The path to the PFX certificate file.
     description: ''
   - name: --cert-password
     summary: Certificate password.
     description: ''
-  - name: --key-vault-secret-id
-    summary: Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in Azure KeyVault.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -221,49 +233,34 @@ items:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --key-vault-secret-id
+    summary: Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in Azure KeyVault.
+    description: ''
   - name: --name -n
     summary: The name of the SSL certificate.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_ssl_cert_create
-  name: az network application-gateway ssl-cert create
-  summary: Upload an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_delete
-  name: az network application-gateway ssl-cert delete
-  summary: Delete an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_list
-  name: az network application-gateway ssl-cert list
-  summary: List SSL certificates.
-- uid: az_network_application_gateway_ssl_cert_show
-  name: az network application-gateway ssl-cert show
-  summary: Get the details of an SSL certificate.
-- uid: az_network_application_gateway_ssl_cert_update
-  name: az network application-gateway ssl-cert update
-  summary: Update an SSL certificate.
+- az_network_application-gateway_ssl-cert_create
+- az_network_application-gateway_ssl-cert_delete
+- az_network_application-gateway_ssl-cert_list
+- az_network_application-gateway_ssl-cert_show
+- az_network_application-gateway_ssl-cert_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -279,10 +276,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information visit https://docs.microsoft.com/azure/application-gateway/application-gateway-ssl-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy.yml
index 48f3828349..56388cbda3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy.yml
@@ -1,54 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_ssl_policy
-  name: az network application-gateway ssl-policy
-  summary: Manage the SSL policy of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_ssl_policy_list_options
-  - az_network_application_gateway_ssl_policy_set
-  - az_network_application_gateway_ssl_policy_show
-- uid: az_network_application_gateway_ssl_policy_list_options
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_ssl-policy
+name: az network application-gateway ssl-policy
+summary: Manage the SSL policy of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_ssl-policy_list-options
   name: az network application-gateway ssl-policy list-options
   summary: Lists available SSL options for configuring SSL policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: az network application-gateway ssl-policy list-options [--subscription]
   examples:
   - summary: List available SSL options for configuring SSL policy.
-    syntax:
-      content: az network application-gateway ssl-policy list-options
-  parameters:
+    syntax: az network application-gateway ssl-policy list-options
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_policy_set
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-policy_set
   name: az network application-gateway ssl-policy set
   summary: Update or clear SSL policy settings.
   description: To view the predefined policies, use `az network application-gateway ssl-policy predefined list`.
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-policy set [--cipher-suites]
+                                                  [--disabled-ssl-protocols]
+                                                  [--gateway-name]
+                                                  [--ids]
+                                                  [--min-protocol-version]
+                                                  [--name]
+                                                  [--no-wait]
+                                                  [--policy-type]
+                                                  [--resource-group]
+                                                  [--subscription]
   examples:
   - summary: Set a predefined SSL policy.
-    syntax:
-      content: >-
-        az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
-            -n AppGwSslPolicy20170401S --policy-type Predefined
+    syntax: >-
+      az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
+          -n AppGwSslPolicy20170401S --policy-type Predefined
   - summary: Set a custom SSL policy with TLSv1_2 and the cipher suites below.
-    syntax:
-      content: >-
-        az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
-            --policy-type Custom --min-protocol-version TLSv1_2 \
-            --cipher-suites TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 TLS_RSA_WITH_AES_128_GCM_SHA256
-  parameters:
+    syntax: >-
+      az network application-gateway ssl-policy set -g MyResourceGroup --gateway-name MyAppGateway \
+          --policy-type Custom --min-protocol-version TLSv1_2 \
+          --cipher-suites TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 TLS_RSA_WITH_AES_128_GCM_SHA256
+  optionalParameters:
   - name: --cipher-suites
     summary: Ssl cipher suites to be enabled in the specified order to application gateway.
     description: ''
@@ -57,6 +51,12 @@ items:
     summary: Space-separated list of protocols to disable.
     description: ''
     valueFrom: az network application-gateway ssl-policy list-options
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --min-protocol-version
     summary: Minimum version of Ssl protocol to be supported on application gateway.
     description: ''
@@ -70,72 +70,50 @@ items:
   - name: --policy-type
     summary: Type of Ssl Policy.
     description: ''
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_policy_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-policy_show
   name: az network application-gateway ssl-policy show
   summary: Get the details of gateway's SSL policy settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-policy show [--gateway-name]
+                                                   [--ids]
+                                                   [--query-examples]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: Get the details of a gateway's SSL policy settings.
-    syntax:
-      content: az network application-gateway ssl-policy show -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway ssl-policy show -g MyResourceGroup --gateway-name MyAppGateway
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_ssl_policy_list_options
-  name: az network application-gateway ssl-policy list-options
-  summary: Lists available SSL options for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined
-  name: az network application-gateway ssl-policy predefined
-  summary: Get information on predefined SSL policies.
-- uid: az_network_application_gateway_ssl_policy_predefined_list
-  name: az network application-gateway ssl-policy predefined list
-  summary: Lists all SSL predefined policies for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined_show
-  name: az network application-gateway ssl-policy predefined show
-  summary: Gets SSL predefined policy with the specified policy name.
-- uid: az_network_application_gateway_ssl_policy_set
-  name: az network application-gateway ssl-policy set
-  summary: Update or clear SSL policy settings.
-- uid: az_network_application_gateway_ssl_policy_show
-  name: az network application-gateway ssl-policy show
-  summary: Get the details of gateway's SSL policy settings.
+- az_network_application-gateway_ssl-policy_list-options
+- az_network_application-gateway_ssl-policy_predefined
+- az_network_application-gateway_ssl-policy_predefined_list
+- az_network_application-gateway_ssl-policy_predefined_show
+- az_network_application-gateway_ssl-policy_set
+- az_network_application-gateway_ssl-policy_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -151,10 +129,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the SSL policy of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the SSL policy of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy/predefined.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy/predefined.yml
index fd44dfd16e..eb5f70b69c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy/predefined.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/ssl-policy/predefined.yml
@@ -1,65 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_ssl_policy_predefined
-  name: az network application-gateway ssl-policy predefined
-  summary: Get information on predefined SSL policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_ssl_policy_predefined_list
-  - az_network_application_gateway_ssl_policy_predefined_show
-- uid: az_network_application_gateway_ssl_policy_predefined_list
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_ssl-policy_predefined
+name: az network application-gateway ssl-policy predefined
+summary: Get information on predefined SSL policies.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_ssl-policy_predefined_list
   name: az network application-gateway ssl-policy predefined list
   summary: Lists all SSL predefined policies for configuring SSL policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-policy predefined list [--query-examples]
+                                                              [--subscription]
   examples:
   - summary: Lists all SSL predefined policies for configuring SSL policy.
-    syntax:
-      content: az network application-gateway ssl-policy predefined list
-  parameters:
+    syntax: az network application-gateway ssl-policy predefined list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_ssl_policy_predefined_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_ssl-policy_predefined_show
   name: az network application-gateway ssl-policy predefined show
   summary: Gets SSL predefined policy with the specified policy name.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway ssl-policy predefined show --name
+                                                              [--query-examples]
+                                                              [--subscription]
   examples:
   - summary: Gets SSL predefined policy with the specified policy name.
-    syntax:
-      content: az network application-gateway ssl-policy predefined show -n AppGwSslPolicy20170401
-  parameters:
+    syntax: az network application-gateway ssl-policy predefined show -n AppGwSslPolicy20170401
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of Ssl predefined policy.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_ssl_policy_predefined_list
-  name: az network application-gateway ssl-policy predefined list
-  summary: Lists all SSL predefined policies for configuring SSL policy.
-- uid: az_network_application_gateway_ssl_policy_predefined_show
-  name: az network application-gateway ssl-policy predefined show
-  summary: Gets SSL predefined policy with the specified policy name.
+- az_network_application-gateway_ssl-policy_predefined_list
+- az_network_application-gateway_ssl-policy_predefined_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +64,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Get information on predefined SSL policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Get information on predefined SSL policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map.yml
index 6c76f0d8dc..975987c397 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map.yml
@@ -1,31 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_url_path_map
-  name: az network application-gateway url-path-map
-  summary: Manage URL path maps of an application gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_url_path_map_create
-  - az_network_application_gateway_url_path_map_delete
-  - az_network_application_gateway_url_path_map_list
-  - az_network_application_gateway_url_path_map_show
-  - az_network_application_gateway_url_path_map_update
-- uid: az_network_application_gateway_url_path_map_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_url-path-map
+name: az network application-gateway url-path-map
+summary: Manage URL path maps of an application gateway.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_url-path-map_create
   name: az network application-gateway url-path-map create
   summary: Create a URL path map.
-  description: The map must be created with at least one rule. This command requires the creation of the first rule at the time the map is created. To learn more visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-create-url-route-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-create-url-route-cli</a>.
-  langs:
-  - azurecli
+  description: The map must be created with at least one rule. This command requires the creation of the first rule at the time the map is created. To learn more visit https://docs.microsoft.com/azure/application-gateway/application-gateway-create-url-route-cli.
+  syntax: >-
+    az network application-gateway url-path-map create --gateway-name
+                                                       --name
+                                                       --paths
+                                                       --resource-group
+                                                       [--address-pool]
+                                                       [--default-address-pool]
+                                                       [--default-http-settings]
+                                                       [--default-redirect-config]
+                                                       [--http-settings]
+                                                       [--no-wait]
+                                                       [--redirect-config]
+                                                       [--rule-name]
+                                                       [--subscription]
   examples:
   - summary: Create a URL path map with a rule.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map create -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyUrlPathMap --rule-name MyUrlPathMapRule1 --paths /mypath1/* --address-pool MyAddressPool \
-            --default-address-pool MyAddressPool --http-settings MyHttpSettings --default-http-settings MyHttpSettings
-  parameters:
+    syntax: >-
+      az network application-gateway url-path-map create -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyUrlPathMap --rule-name MyUrlPathMapRule1 --paths /mypath1/* --address-pool MyAddressPool \
+          --default-address-pool MyAddressPool --http-settings MyHttpSettings --default-http-settings MyHttpSettings
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -34,9 +37,17 @@ items:
     name: --name -n
     summary: The name of the URL path map.
     description: ''
+  - isRequired: true
+    name: --paths
+    summary: 'Space-separated list of paths to associate with the rule. Valid paths start and end with "/" (ex: "/bar/").'
+    description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --address-pool
+    summary: The name or ID of the backend address pool to use with the created rule.
     description: ''
   - name: --default-address-pool
     summary: The name or ID of the default backend address pool, if different from --address-pool.
@@ -47,19 +58,12 @@ items:
   - name: --default-redirect-config
     summary: The name or ID of the default redirect configuration.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - isRequired: true
-    name: --paths
-    summary: 'Space-separated list of paths to associate with the rule. Valid paths start and end with "/" (ex: "/bar/").'
-    description: ''
-  - name: --address-pool
-    summary: The name or ID of the backend address pool to use with the created rule.
-    description: ''
   - name: --http-settings
     summary: The name or ID of the HTTP settings to use with the created rule.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --redirect-config
     summary: The name or ID of the redirect configuration to use with the created rule.
     description: ''
@@ -70,26 +74,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_delete
   name: az network application-gateway url-path-map delete
   summary: Delete a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map delete [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--resource-group]
+                                                       [--subscription]
   examples:
   - summary: Delete a URL path map.
-    syntax:
-      content: az network application-gateway url-path-map delete -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network application-gateway url-path-map delete -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -99,57 +99,60 @@ items:
   - name: --name -n
     summary: The name of the URL path map.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_list
   name: az network application-gateway url-path-map list
   summary: List URL path maps.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map list --gateway-name
+                                                     --resource-group
+                                                     [--query-examples]
+                                                     [--subscription]
   examples:
   - summary: List URL path maps.
-    syntax:
-      content: az network application-gateway url-path-map list -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway url-path-map list -g MyResourceGroup --gateway-name MyAppGateway
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: The name of the application gateway.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_show
   name: az network application-gateway url-path-map show
   summary: Get the details of a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map show [--gateway-name]
+                                                     [--ids]
+                                                     [--name]
+                                                     [--query-examples]
+                                                     [--resource-group]
+                                                     [--subscription]
   examples:
   - summary: Get the details of a URL path map.
-    syntax:
-      content: az network application-gateway url-path-map show -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
-  parameters:
+    syntax: az network application-gateway url-path-map show -g MyResourceGroup --gateway-name MyAppGateway -n MyUrlPathMap
+  optionalParameters:
   - name: --gateway-name
     summary: The name of the application gateway.
     description: ''
@@ -159,34 +162,45 @@ items:
   - name: --name -n
     summary: The name of the URL path map.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_update
   name: az network application-gateway url-path-map update
   summary: Update a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map update [--add]
+                                                       [--default-address-pool]
+                                                       [--default-http-settings]
+                                                       [--default-redirect-config]
+                                                       [--force-string]
+                                                       [--gateway-name]
+                                                       [--ids]
+                                                       [--name]
+                                                       [--no-wait]
+                                                       [--remove]
+                                                       [--resource-group]
+                                                       [--set]
+                                                       [--subscription]
   examples:
   - summary: Update a URL path map to use new default HTTP settings.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map update -g MyResourceGroup --gateway-name MyAppGateway \
-            -n MyUrlPathMap --default-http-settings MyNewHttpSettings
+    syntax: >-
+      az network application-gateway url-path-map update -g MyResourceGroup --gateway-name MyAppGateway \
+          -n MyUrlPathMap --default-http-settings MyNewHttpSettings
   - summary: Update a URL path map. (autogenerated)
-    syntax:
-      content: az network application-gateway url-path-map update --default-address-pool MyAddressPool --default-http-settings MyNewHttpSettings --gateway-name MyAppGateway --name MyUrlPathMap --resource-group MyResourceGroup
-  parameters:
+    syntax: az network application-gateway url-path-map update --default-address-pool MyAddressPool --default-http-settings MyNewHttpSettings --gateway-name MyAppGateway --name MyUrlPathMap --remove tags.no_80 --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --default-address-pool
     summary: The name or ID of the default backend address pool.
     description: ''
@@ -196,8 +210,8 @@ items:
   - name: --default-redirect-config
     summary: The name or ID of the default redirect configuration.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: Name of the application gateway.
@@ -208,55 +222,31 @@ items:
   - name: --name -n
     summary: The name of the URL path map.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_url_path_map_create
-  name: az network application-gateway url-path-map create
-  summary: Create a URL path map.
-- uid: az_network_application_gateway_url_path_map_delete
-  name: az network application-gateway url-path-map delete
-  summary: Delete a URL path map.
-- uid: az_network_application_gateway_url_path_map_list
-  name: az network application-gateway url-path-map list
-  summary: List URL path maps.
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
-- uid: az_network_application_gateway_url_path_map_show
-  name: az network application-gateway url-path-map show
-  summary: Get the details of a URL path map.
-- uid: az_network_application_gateway_url_path_map_update
-  name: az network application-gateway url-path-map update
-  summary: Update a URL path map.
+- az_network_application-gateway_url-path-map_create
+- az_network_application-gateway_url-path-map_delete
+- az_network_application-gateway_url-path-map_list
+- az_network_application-gateway_url-path-map_rule
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
+- az_network_application-gateway_url-path-map_show
+- az_network_application-gateway_url-path-map_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -272,10 +262,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage URL path maps of an application gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage URL path maps of an application gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml
index bb5a09567a..e1d6e82f47 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/url-path-map/rule.yml
@@ -1,28 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_url_path_map_rule
-  name: az network application-gateway url-path-map rule
-  summary: Manage the rules of a URL path map.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_url_path_map_rule_create
-  - az_network_application_gateway_url_path_map_rule_delete
-- uid: az_network_application_gateway_url_path_map_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_url-path-map_rule
+name: az network application-gateway url-path-map rule
+summary: Manage the rules of a URL path map.
+description: ''
+directCommands:
+- uid: az_network_application-gateway_url-path-map_rule_create
   name: az network application-gateway url-path-map rule create
   summary: Create a rule for a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map rule create --gateway-name
+                                                            --name
+                                                            --path-map-name
+                                                            --paths
+                                                            --resource-group
+                                                            [--address-pool]
+                                                            [--http-settings]
+                                                            [--no-wait]
+                                                            [--redirect-config]
+                                                            [--subscription]
   examples:
   - summary: Create a rule for a URL path map.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map rule create -g MyResourceGroup \
-            --gateway-name MyAppGateway -n MyUrlPathMapRule2 --path-map-name MyUrlPathMap \
-            --paths /mypath2/* --address-pool MyAddressPool --http-settings MyHttpSettings
-  parameters:
+    syntax: >-
+      az network application-gateway url-path-map rule create -g MyResourceGroup \
+          --gateway-name MyAppGateway -n MyUrlPathMapRule2 --path-map-name MyUrlPathMap \
+          --paths /mypath2/* --address-pool MyAddressPool --http-settings MyHttpSettings
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Name of the application gateway.
@@ -41,8 +44,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --address-pool
     summary: The name or ID of the backend address pool to use with the created rule.
     description: ''
@@ -58,28 +62,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_url_path_map_rule_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_url-path-map_rule_delete
   name: az network application-gateway url-path-map rule delete
   summary: Delete a rule of a URL path map.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway url-path-map rule delete [--gateway-name]
+                                                            [--ids]
+                                                            [--name]
+                                                            [--no-wait]
+                                                            [--path-map-name]
+                                                            [--resource-group]
+                                                            [--subscription]
   examples:
   - summary: Delete a rule of a URL path map.
-    syntax:
-      content: >-
-        az network application-gateway url-path-map rule delete -g MyResourceGroup --gateway-name MyAppGateway \
-            --path-map-name MyUrlPathMap -n MyUrlPathMapRule2
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: >-
+      az network application-gateway url-path-map rule delete -g MyResourceGroup --gateway-name MyAppGateway \
+          --path-map-name MyUrlPathMap -n MyUrlPathMapRule2
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
@@ -89,28 +90,22 @@ items:
   - name: --name -n
     summary: The name of the url-path-map rule.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --path-map-name
     summary: The name of the URL path map.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_url_path_map_rule_create
-  name: az network application-gateway url-path-map rule create
-  summary: Create a rule for a URL path map.
-- uid: az_network_application_gateway_url_path_map_rule_delete
-  name: az network application-gateway url-path-map rule delete
-  summary: Delete a rule of a URL path map.
+- az_network_application-gateway_url-path-map_rule_create
+- az_network_application-gateway_url-path-map_rule_delete
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -126,10 +121,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the rules of a URL path map.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the rules of a URL path map.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/waf-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/waf-config.yml
index 9da8d04434..ef1ee9d901 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/waf-config.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/application-gateway/waf-config.yml
@@ -1,85 +1,81 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_application_gateway_waf_config
-  name: az network application-gateway waf-config
-  summary: Configure the settings of a web application firewall.
-  description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_application_gateway_waf_config_list_rule_sets
-  - az_network_application_gateway_waf_config_set
-  - az_network_application_gateway_waf_config_show
-- uid: az_network_application_gateway_waf_config_list_rule_sets
+### YamlMime:AzureCLIGroup
+uid: az_network_application-gateway_waf-config
+name: az network application-gateway waf-config
+summary: Configure the settings of a web application firewall.
+description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli.
+directCommands:
+- uid: az_network_application-gateway_waf-config_list-rule-sets
   name: az network application-gateway waf-config list-rule-sets
   summary: Get information on available WAF rule sets, rule groups, and rule IDs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway waf-config list-rule-sets [--group]
+                                                             [--subscription]
+                                                             [--type]
+                                                             [--version]
   examples:
   - summary: List available rule groups in OWASP type rule sets.
-    syntax:
-      content: az network application-gateway waf-config list-rule-sets --type OWASP
+    syntax: az network application-gateway waf-config list-rule-sets --type OWASP
   - summary: List available rules in the OWASP 3.0 rule set.
-    syntax:
-      content: az network application-gateway waf-config list-rule-sets --group '*' --type OWASP --version 3.0
+    syntax: az network application-gateway waf-config list-rule-sets --group '*' --type OWASP --version 3.0
   - summary: List available rules in the `crs_35_bad_robots` rule group.
-    syntax:
-      content: az network application-gateway waf-config list-rule-sets --group crs_35_bad_robots
+    syntax: az network application-gateway waf-config list-rule-sets --group crs_35_bad_robots
   - summary: List available rules in table format.
-    syntax:
-      content: az network application-gateway waf-config list-rule-sets -o table
-  parameters:
+    syntax: az network application-gateway waf-config list-rule-sets -o table
+  optionalParameters:
   - name: --group
     summary: List rules for the specified rule group. Use `\*` to list rules for all groups. Omit to suppress listing individual rules.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --type
     summary: Rule set type to list. Omit to list all types.
     description: ''
   - name: --version
     summary: Rule set version to list. Omit to list all versions.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_waf_config_set
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_waf-config_set
   name: az network application-gateway waf-config set
   summary: Update the firewall configuration of a web application.
-  description: This command is only applicable to application gateways with an SKU type of WAF. To learn more, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli</a>.
-  langs:
-  - azurecli
+  description: This command is only applicable to application gateways with an SKU type of WAF. To learn more, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli.
+  syntax: >-
+    az network application-gateway waf-config set --enabled {false, true}
+                                                  [--disabled-rule-groups]
+                                                  [--disabled-rules]
+                                                  [--firewall-mode {Detection, Prevention}]
+                                                  [--gateway-name]
+                                                  [--ids]
+                                                  [--no-wait]
+                                                  [--resource-group]
+                                                  [--rule-set-type]
+                                                  [--rule-set-version]
+                                                  [--subscription]
   examples:
   - summary: Configure WAF on an application gateway in detection mode with default values
-    syntax:
-      content: >-
-        az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
-            --enabled true --firewall-mode Detection --rule-set-version 3.0
+    syntax: >-
+      az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
+          --enabled true --firewall-mode Detection --rule-set-version 3.0
   - summary: Disable rules for validation of request body parsing and SQL injection.
-    syntax:
-      content: >-
-        az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
-            --enabled true --rule-set-type OWASP --rule-set-version 3.0 \
-            --disabled-rule-groups REQUEST-942-APPLICATION-ATTACK-SQLI \
-            --disabled-rules 920130 920140
+    syntax: >-
+      az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
+          --enabled true --rule-set-type OWASP --rule-set-version 3.0 \
+          --disabled-rule-groups REQUEST-942-APPLICATION-ATTACK-SQLI \
+          --disabled-rules 920130 920140
   - summary: Configure WAF on an application gateway with exclusions.
-    syntax:
-      content: >-
-        az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
-            --enabled true --firewall-mode Detection --rule-set-version 3.0 \
-            --exclusion "RequestHeaderNames StartsWith x-header" \
-            --exclusion "RequestArgNames Equals IgnoreThis"
-  parameters:
+    syntax: >-
+      az network application-gateway waf-config set -g MyResourceGroup --gateway-name MyAppGateway \
+          --enabled true --firewall-mode Detection --rule-set-version 3.0 \
+          --exclusion "RequestHeaderNames StartsWith x-header" \
+          --exclusion "RequestArgNames Equals IgnoreThis"
+  requiredParameters:
   - isRequired: true
     name: --enabled
     parameterValueGroup: false, true
     summary: Specify whether the application firewall is enabled.
     description: ''
+  optionalParameters:
   - name: --disabled-rule-groups
     summary: Space-separated list of rule groups to disable. To disable individual rules, use `--disabled-rules`.
     description: ''
@@ -93,9 +89,18 @@ items:
     parameterValueGroup: Detection, Prevention
     summary: Web application firewall mode.
     description: ''
+  - name: --gateway-name
+    summary: Name of the application gateway.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --rule-set-type
     defaultValue: OWASP
     summary: Rule set type.
@@ -105,63 +110,44 @@ items:
     summary: Rule set version.
     description: ''
     valueFrom: az network application-gateway waf-config list-rule-sets
-  - name: --gateway-name
-    summary: Name of the application gateway.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_application_gateway_waf_config_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_application-gateway_waf-config_show
   name: az network application-gateway waf-config show
   summary: Get the firewall configuration of a web application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network application-gateway waf-config show [--gateway-name]
+                                                   [--ids]
+                                                   [--query-examples]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: Get the firewall configuration of a web application.
-    syntax:
-      content: az network application-gateway waf-config show -g MyResourceGroup --gateway-name MyAppGateway
-  parameters:
+    syntax: az network application-gateway waf-config show -g MyResourceGroup --gateway-name MyAppGateway
+  optionalParameters:
   - name: --gateway-name
     summary: Name of the application gateway.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_application_gateway_waf_config_list_rule_sets
-  name: az network application-gateway waf-config list-rule-sets
-  summary: Get information on available WAF rule sets, rule groups, and rule IDs.
-- uid: az_network_application_gateway_waf_config_set
-  name: az network application-gateway waf-config set
-  summary: Update the firewall configuration of a web application.
-- uid: az_network_application_gateway_waf_config_show
-  name: az network application-gateway waf-config show
-  summary: Get the firewall configuration of a web application.
+- az_network_application-gateway_waf-config_list-rule-sets
+- az_network_application-gateway_waf-config_set
+- az_network_application-gateway_waf-config_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -177,10 +163,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit <a href="https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli">https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: These commands are only applicable to application gateways with an SKU type of WAF. To learn more, visit https://docs.microsoft.com/azure/application-gateway/application-gateway-web-application-firewall-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/asg.yml b/2018-03-01-hybrid/docs-ref-autogen/network/asg.yml
index c9f933483c..437b32bf31 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/asg.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/asg.yml
@@ -1,62 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_asg
-  name: az network asg
-  summary: Manage application security groups (ASGs).
-  description: You can configure network security as a natural extension of an application's structure, ASG allows you to group virtual machines and define network security policies based on those groups. You can specify an application security group as the source and destination in a NSG security rule. For more information visit <a href="https://docs.microsoft.com/azure/virtual-network/create-network-security-group-preview">https://docs.microsoft.com/azure/virtual-network/create-network-security-group-preview</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_asg_create
-  - az_network_asg_delete
-  - az_network_asg_list
-  - az_network_asg_show
-  - az_network_asg_update
+### YamlMime:AzureCLIGroup
+uid: az_network_asg
+name: az network asg
+summary: Manage application security groups (ASGs).
+description: You can configure network security as a natural extension of an application's structure, ASG allows you to group virtual machines and define network security policies based on those groups. You can specify an application security group as the source and destination in a NSG security rule. For more information visit https://docs.microsoft.com/azure/virtual-network/create-network-security-group-preview.
+directCommands:
 - uid: az_network_asg_create
   name: az network asg create
   summary: Create an application security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network asg create --name
+                          --resource-group
+                          [--location]
+                          [--subscription]
+                          [--tags]
   examples:
   - summary: Create an application security group.
-    syntax:
-      content: az network asg create -g MyResourceGroup -n MyAsg --tags MyWebApp, CostCenter=Marketing
-  parameters:
+    syntax: az network asg create -g MyResourceGroup -n MyAsg --tags MyWebApp, CostCenter=Marketing
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the new application security group resource.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_asg_delete
   name: az network asg delete
   summary: Delete an application security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network asg delete [--ids]
+                          [--name]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Delete an application security group.
-    syntax:
-      content: az network asg delete -g MyResourceGroup -n MyAsg
-  parameters:
+    syntax: az network asg delete -g MyResourceGroup -n MyAsg
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -64,79 +57,83 @@ items:
     summary: The name of the application security group.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_asg_list
   name: az network asg list
   summary: List all application security groups in a subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network asg list [--query-examples]
+                        [--subscription]
   examples:
   - summary: List all application security groups in a subscription.
-    syntax:
-      content: az network asg list
-  parameters:
+    syntax: az network asg list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_asg_show
   name: az network asg show
   summary: Get details of an application security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network asg show [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Get details of an application security group.
-    syntax:
-      content: az network asg show -g MyResourceGroup -n MyAsg
-  parameters:
+    syntax: az network asg show -g MyResourceGroup -n MyAsg
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the application security group.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_asg_update
   name: az network asg update
   summary: Update an application security group.
   description: This command can only be used to update the tags for an application security group. Name and resource group are immutable and cannot be updated.
-  langs:
-  - azurecli
+  syntax: >-
+    az network asg update [--add]
+                          [--force-string]
+                          [--ids]
+                          [--name]
+                          [--remove]
+                          [--resource-group]
+                          [--set]
+                          [--subscription]
+                          [--tags]
   examples:
   - summary: Update an application security group with a modified tag value.
-    syntax:
-      content: az network asg update -g MyResourceGroup -n MyAsg --set tags.CostCenter=MyBusinessGroup
-  parameters:
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    syntax: az network asg update -g MyResourceGroup -n MyAsg --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -144,46 +141,28 @@ items:
   - name: --name -n
     summary: The name of the application security group.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_asg_create
-  name: az network asg create
-  summary: Create an application security group.
-- uid: az_network_asg_delete
-  name: az network asg delete
-  summary: Delete an application security group.
-- uid: az_network_asg_list
-  name: az network asg list
-  summary: List all application security groups in a subscription.
-- uid: az_network_asg_show
-  name: az network asg show
-  summary: Get details of an application security group.
-- uid: az_network_asg_update
-  name: az network asg update
-  summary: Update an application security group.
+- az_network_asg_create
+- az_network_asg_delete
+- az_network_asg_list
+- az_network_asg_show
+- az_network_asg_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -199,10 +178,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: You can configure network security as a natural extension of an application's structure, ASG allows you to group virtual machines and define network security policies based on those groups. You can specify an application security group as the source and destination in a NSG security rule. For more information visit <a href="https://docs.microsoft.com/azure/virtual-network/create-network-security-group-preview">https://docs.microsoft.com/azure/virtual-network/create-network-security-group-preview</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: You can configure network security as a natural extension of an application's structure, ASG allows you to group virtual machines and define network security policies based on those groups. You can specify an application security group as the source and destination in a NSG security rule. For more information visit https://docs.microsoft.com/azure/virtual-network/create-network-security-group-preview.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/bastion.yml b/2018-03-01-hybrid/docs-ref-autogen/network/bastion.yml
index 4e6322640f..209bfe150f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/bastion.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/bastion.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_bastion
-  name: az network bastion
-  summary: Manage Azure bastion host.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_bastion_create
-  - az_network_bastion_list
+### YamlMime:AzureCLIGroup
+uid: az_network_bastion
+name: az network bastion
+summary: Manage Azure bastion host.
+description: ''
+directCommands:
 - uid: az_network_bastion_create
   name: az network bastion create
   summary: Create a Azure bastion host machine.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network bastion create --name
+                              --public-ip-address
+                              --resource-group
+                              --vnet-name
+                              [--location]
+                              [--subscription]
+  examples:
+  - summary: Create a Azure bastion host machine. (autogenerated)
+    syntax: az network bastion create --location westus2 --name MyBastionHost --public-ip-address MyPublicIpAddress --resource-group MyResourceGroup --vnet-name MyVnet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the Bastion Host.
@@ -26,50 +29,42 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: Name of the virtual network. It must have a subnet called AzureBastionSubnet.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_bastion_list
   name: az network bastion list
   summary: List all Azure bastion host machines.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network bastion list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_bastion_create
-  name: az network bastion create
-  summary: Create a Azure bastion host machine.
-- uid: az_network_bastion_list
-  name: az network bastion list
-  summary: List all Azure bastion host machines.
+- az_network_bastion_create
+- az_network_bastion_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -85,10 +80,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure bastion host.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure bastion host.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-connection.yml
new file mode 100644
index 0000000000..9ee6d24883
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-connection.yml
@@ -0,0 +1,259 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-connection
+name: az network cross-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **express-route-cross-connection** extension for Azure CLI and requires version 2.0.41 or higher.  The extension will automatically install the first time you run an **az network cross-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage customers' ExpressRoute circuits.
+description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli.
+directCommands:
+- uid: az_network_cross-connection_list
+  name: az network cross-connection list
+  summary: List all ExpressRoute cross-connections for the current subscription.
+  description: ''
+  syntax: az network cross-connection list [--resource-group]
+  examples:
+  - summary: List all ExpressRoute cross-connections for the current subscription.
+    syntax: az network cross-connection list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_list-arp-tables
+  name: az network cross-connection list-arp-tables
+  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection peering.
+  description: ''
+  syntax: >-
+    az network cross-connection list-arp-tables --name
+                                                --path {primary, secondary}
+                                                --peering-name
+                                                --resource-group
+  examples:
+  - summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute cross-connection.
+    syntax: >-
+      az network cross-connection list-arp-tables -g MyResourceGroup -n MyCircuit \
+          --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_list-route-tables
+  name: az network cross-connection list-route-tables
+  summary: Show the current routing table of an ExpressRoute cross-connection peering.
+  description: ''
+  syntax: >-
+    az network cross-connection list-route-tables --name
+                                                  --path {primary, secondary}
+                                                  --peering-name
+                                                  --resource-group
+  examples:
+  - summary: Show the current routing table of an ExpressRoute cross-connection peering.
+    syntax: >-
+      az network cross-connection list-route-tables -g MyResourceGroup -n MyCircuit \
+          --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_show
+  name: az network cross-connection show
+  summary: Get the details of an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection show --name
+                                     --resource-group
+  examples:
+  - summary: Get the details of an ExpressRoute cross-connection.
+    syntax: az network cross-connection show -n MyCircuit -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_summarize-route-table
+  name: az network cross-connection summarize-route-table
+  summary: Gets the route table summary associated with the express route cross connection in a resource group.
+  description: ''
+  syntax: >-
+    az network cross-connection summarize-route-table --name
+                                                      --path {primary, secondary}
+                                                      --peering-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_update
+  name: az network cross-connection update
+  summary: Update settings of an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection update --name
+                                       --resource-group
+                                       [--add]
+                                       [--force-string]
+                                       [--no-wait]
+                                       [--notes]
+                                       [--provisioning-state {NotProvisioned, Provisioned, Provisioning}]
+                                       [--remove]
+                                       [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notes
+    summary: Service provider notes.
+    description: ''
+  - name: --provisioning-state
+    parameterValueGroup: NotProvisioned, Provisioned, Provisioning
+    summary: Provisioning state of the customer ExpressRoute circuit.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_network_cross-connection_wait
+  name: az network cross-connection wait
+  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
+  description: ''
+  syntax: >-
+    az network cross-connection wait --name
+                                     --resource-group
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--timeout]
+                                     [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the ExpressRoute cross-connection is successfully provisioned.
+    syntax: az network cross-connection wait -n MyCircuit -g MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_cross-connection_list
+- az_network_cross-connection_list-arp-tables
+- az_network_cross-connection_list-route-tables
+- az_network_cross-connection_peering
+- az_network_cross-connection_peering_create
+- az_network_cross-connection_peering_delete
+- az_network_cross-connection_peering_list
+- az_network_cross-connection_peering_show
+- az_network_cross-connection_peering_update
+- az_network_cross-connection_show
+- az_network_cross-connection_summarize-route-table
+- az_network_cross-connection_update
+- az_network_cross-connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/en-us/azure/expressroute/howto-circuit-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-connection/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-connection/peering.yml
new file mode 100644
index 0000000000..317fe1298b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-connection/peering.yml
@@ -0,0 +1,244 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-connection_peering
+name: az network cross-connection peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **express-route-cross-connection** extension for Azure CLI and requires version 2.0.41 or higher.  The extension will automatically install the first time you run an **az network cross-connection peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ExpressRoute peering of an ExpressRoute cross-connection.
+description: ''
+directCommands:
+- uid: az_network_cross-connection_peering_create
+  name: az network cross-connection peering create
+  summary: Create peering settings for an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection peering create --cross-connection-name
+                                               --peer-asn
+                                               --peering-type {AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+                                               --primary-peer-subnet
+                                               --resource-group
+                                               --secondary-peer-subnet
+                                               --vlan-id
+                                               [--advertised-public-prefixes]
+                                               [--customer-asn]
+                                               [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                               [--shared-key]
+  examples:
+  - summary: Create Microsoft Peering settings with IPv4 configuration.
+    syntax: >-
+      az network cross-connection peering create -g MyResourceGroup --cross-connection-name MyCircuit \
+          --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
+          --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
+          --advertised-public-prefixes 101.0.0.0/30
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --peer-asn
+    summary: Autonomous system number of the customer/connectivity provider.
+    description: ''
+  - isRequired: true
+    name: --peering-type
+    parameterValueGroup: AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering
+    summary: BGP peering type for the circuit.
+    description: ''
+  - isRequired: true
+    name: --primary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for primary interface.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secondary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for secondary interface.
+    description: ''
+  - isRequired: true
+    name: --vlan-id
+    summary: Identifier used to identify the customer.
+    description: ''
+  optionalParameters:
+  - name: --advertised-public-prefixes
+    summary: Space-separated list of prefixes to be advertised through the BGP peering.
+    description: ''
+  - name: --customer-asn
+    summary: Autonomous system number of the customer.
+    description: ''
+  - name: --routing-registry-name
+    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
+    summary: Internet Routing Registry / Regional Internet Registry.
+    description: ''
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
+- uid: az_network_cross-connection_peering_delete
+  name: az network cross-connection peering delete
+  summary: Delete peering settings.
+  description: ''
+  syntax: >-
+    az network cross-connection peering delete --cross-connection-name
+                                               --name
+                                               --resource-group
+  examples:
+  - summary: Delete private peering.
+    syntax: az network cross-connection peering delete -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_peering_list
+  name: az network cross-connection peering list
+  summary: List peering settings of an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection peering list --cross-connection-name
+                                             --resource-group
+  examples:
+  - summary: List peering settings of an ExpressRoute cross-connection.
+    syntax: az network cross-connection peering list -g MyResourceGroup --cross-connection-name MyCircuit
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_peering_show
+  name: az network cross-connection peering show
+  summary: Get the details of an express route peering.
+  description: ''
+  syntax: >-
+    az network cross-connection peering show --cross-connection-name
+                                             --name
+                                             --resource-group
+  examples:
+  - summary: Get private peering details of an ExpressRoute cross-connection.
+    syntax: az network cross-connection peering show -g MyResourceGroup --cross-connection-name MyCircuit -n AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_cross-connection_peering_update
+  name: az network cross-connection peering update
+  summary: Update peering settings for an ExpressRoute cross-connection.
+  description: ''
+  syntax: >-
+    az network cross-connection peering update --cross-connection-name
+                                               --name
+                                               --resource-group
+                                               [--add]
+                                               [--advertised-public-prefixes]
+                                               [--customer-asn]
+                                               [--force-string]
+                                               [--ip-version {IPv4, IPv6}]
+                                               [--peer-asn]
+                                               [--primary-peer-subnet]
+                                               [--remove]
+                                               [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                               [--secondary-peer-subnet]
+                                               [--set]
+                                               [--shared-key]
+                                               [--vlan-id]
+  requiredParameters:
+  - isRequired: true
+    name: --cross-connection-name
+    summary: ExpressRoute cross-connection name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --advertised-public-prefixes
+    summary: Space-separated list of prefixes to be advertised through the BGP peering.
+    description: ''
+  - name: --customer-asn
+    summary: Autonomous system number of the customer.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ip-version
+    defaultValue: IPv4
+    parameterValueGroup: IPv4, IPv6
+    summary: The IP version to update Microsoft Peering settings for.
+    description: ''
+  - name: --peer-asn
+    summary: Autonomous system number of the customer/connectivity provider.
+    description: ''
+  - name: --primary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for primary interface.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --routing-registry-name
+    parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
+    summary: Internet Routing Registry / Regional Internet Registry.
+    description: ''
+  - name: --secondary-peer-subnet
+    summary: /30 subnet used to configure IP addresses for secondary interface.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
+  - name: --vlan-id
+    summary: Identifier used to identify the customer.
+    description: ''
+commands:
+- az_network_cross-connection_peering_create
+- az_network_cross-connection_peering_delete
+- az_network_cross-connection_peering_list
+- az_network_cross-connection_peering_show
+- az_network_cross-connection_peering_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ExpressRoute peering of an ExpressRoute cross-connection.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb.yml
new file mode 100644
index 0000000000..f2271b9601
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb.yml
@@ -0,0 +1,308 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb
+name: az network cross-region-lb
+summary: Manage and configure cross-region load balancers.
+description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
+directCommands:
+- uid: az_network_cross-region-lb_create
+  name: az network cross-region-lb create
+  summary: Create a cross-region load balancer.
+  description: ''
+  syntax: >-
+    az network cross-region-lb create --name
+                                      --resource-group
+                                      [--address-allocation {Dynamic, Static}]
+                                      [--backend-pool-name]
+                                      [--frontend-ip-name]
+                                      [--frontend-ip-zone {1, 2, 3}]
+                                      [--location]
+                                      [--no-wait]
+                                      [--public-ip-address]
+                                      [--public-ip-dns-name]
+                                      [--public-ip-zone {1, 2, 3}]
+                                      [--subscription]
+                                      [--tags]
+                                      [--validate]
+  examples:
+  - summary: Create a basic load balancer.
+    syntax: az network cross-region-lb create -g MyResourceGroup -n MyLb
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --address-allocation --public-ip-address-allocation
+    parameterValueGroup: Dynamic, Static
+    summary: IP allocation method.
+    description: ''
+  - name: --backend-pool-name
+    summary: The name of the backend address pool.
+    description: ''
+  - name: --frontend-ip-name
+    defaultValue: LoadBalancerFrontEnd
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - name: --frontend-ip-zone
+    parameterValueGroup: 1, 2, 3
+    summary: Used to create internal facing Load balancer.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP address, or "" for none. Uses existing resource if available or will create a new resource with defaults if omitted.
+    description: ''
+  - name: --public-ip-dns-name
+    summary: Globally unique DNS name for a new public IP.
+    description: ''
+  - name: --public-ip-zone
+    parameterValueGroup: 1, 2, 3
+    summary: Used to created a new public ip for the load balancer, a.k.a public facing Load balancer.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_delete
+  name: az network cross-region-lb delete
+  summary: Deletes the specified load balancer.
+  description: ''
+  syntax: >-
+    az network cross-region-lb delete [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_list
+  name: az network cross-region-lb list
+  summary: List load balancers.
+  description: ''
+  syntax: >-
+    az network cross-region-lb list [--query-examples]
+                                    [--resource-group]
+                                    [--subscription]
+  examples:
+  - summary: List load balancers.
+    syntax: az network cross-region-lb list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_show
+  name: az network cross-region-lb show
+  summary: Gets the specified load balancer.
+  description: ''
+  syntax: >-
+    az network cross-region-lb show [--expand]
+                                    [--ids]
+                                    [--name]
+                                    [--query-examples]
+                                    [--resource-group]
+                                    [--subscription]
+  optionalParameters:
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_update
+  name: az network cross-region-lb update
+  summary: Update a cross-region load balancer.
+  description: This command can only be used to update the tags for a load balancer. Name and resource group are immutable and cannot be updated.
+  syntax: >-
+    az network cross-region-lb update [--add]
+                                      [--force-string]
+                                      [--ids]
+                                      [--name]
+                                      [--remove]
+                                      [--resource-group]
+                                      [--set]
+                                      [--subscription]
+  examples:
+  - summary: Update the tags of a load balancer.
+    syntax: az network cross-region-lb update -g MyResourceGroup -n MyLb --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_wait
+  name: az network cross-region-lb wait
+  summary: Place the CLI in a waiting state until a condition of the cross-region load balancer is met.
+  description: ''
+  syntax: >-
+    az network cross-region-lb wait [--created]
+                                    [--custom]
+                                    [--deleted]
+                                    [--exists]
+                                    [--expand]
+                                    [--ids]
+                                    [--interval]
+                                    [--name]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--timeout]
+                                    [--updated]
+  examples:
+  - summary: Wait for load balancer to return as created.
+    syntax: az network cross-region-lb wait -g MyResourceGroup -n MyLB --created
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_address-pool
+- az_network_cross-region-lb_address-pool_address
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+- az_network_cross-region-lb_address-pool_create
+- az_network_cross-region-lb_address-pool_delete
+- az_network_cross-region-lb_create
+- az_network_cross-region-lb_delete
+- az_network_cross-region-lb_frontend-ip
+- az_network_cross-region-lb_frontend-ip_create
+- az_network_cross-region-lb_frontend-ip_delete
+- az_network_cross-region-lb_frontend-ip_list
+- az_network_cross-region-lb_frontend-ip_show
+- az_network_cross-region-lb_frontend-ip_update
+- az_network_cross-region-lb_list
+- az_network_cross-region-lb_probe
+- az_network_cross-region-lb_probe_create
+- az_network_cross-region-lb_probe_delete
+- az_network_cross-region-lb_probe_list
+- az_network_cross-region-lb_probe_show
+- az_network_cross-region-lb_probe_update
+- az_network_cross-region-lb_rule
+- az_network_cross-region-lb_rule_create
+- az_network_cross-region-lb_rule_delete
+- az_network_cross-region-lb_rule_list
+- az_network_cross-region-lb_rule_show
+- az_network_cross-region-lb_rule_update
+- az_network_cross-region-lb_show
+- az_network_cross-region-lb_update
+- az_network_cross-region-lb_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/address-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/address-pool.yml
new file mode 100644
index 0000000000..ed376bef56
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/address-pool.yml
@@ -0,0 +1,128 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_address-pool
+name: az network cross-region-lb address-pool
+summary: Manage address pools of a cross-region load balancer.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_address-pool_create
+  name: az network cross-region-lb address-pool create
+  summary: Create an address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool create --lb-name
+                                                   --name
+                                                   --resource-group
+                                                   [--backend-address]
+                                                   [--backend-addresses-config-file]
+                                                   [--subscription]
+  examples:
+  - summary: Create an address pool.
+    syntax: az network cross-region-lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  - summary: Create an address pool with several backend addresses using key-value arguments.
+    syntax: az network cross-region-lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --backend-address name=addr1 frontend-ip-address=/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb1 --backend-address name=addr2 frontend-ip-address=/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb2
+  - summary: Create an address pool with several backend addresses using config file
+    syntax: az network cross-region-lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --backend-addresses-config-file @config_file.json
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-address
+    summary: Backend addresses information for backend address pool.
+    description: >-
+      Usage: --backend-address name=addr1 frontend-ip-address=regional_lb_resource_id
+
+
+      name: Required. The name of the backend address.
+
+      frontend-ip-address: Required. Resource id of a regional load balancer.
+
+
+      Multiple backend addresses can be specified by using more than one `--backend-address` argument.
+  - name: --backend-addresses-config-file --config-file
+    summary: A config file used to set backend addresses. This argument is for experienced users. You may encounter parse errors if the json file is invalid.
+    description: >-
+      Usage: --backend-addresses-config-file @"{config_file.json}"
+
+
+      A example config file is
+
+      [
+        {
+          "name": "address1",
+          "frontendIpAddress": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb1"
+        },
+        {
+          "name": "address2",
+          "frontendIpAddress": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb2"
+        }
+      ].
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_address-pool_delete
+  name: az network cross-region-lb address-pool delete
+  summary: Delete an address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool delete --lb-name
+                                                   --name
+                                                   --resource-group
+                                                   [--subscription]
+  examples:
+  - summary: Delete an address pool.
+    syntax: az network cross-region-lb address-pool delete -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_address-pool_address
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+- az_network_cross-region-lb_address-pool_create
+- az_network_cross-region-lb_address-pool_delete
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools of a cross-region load balancer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/address-pool/address.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/address-pool/address.yml
new file mode 100644
index 0000000000..7912b5e25c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/address-pool/address.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_address-pool_address
+name: az network cross-region-lb address-pool address
+summary: Manage backend addresses of the cross-region load balance backend address pool.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_address-pool_address_add
+  name: az network cross-region-lb address-pool address add
+  summary: Add one backend address into the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool address add --frontend-ip-address
+                                                        --lb-name
+                                                        --name
+                                                        --pool-name
+                                                        --resource-group
+                                                        [--subscription]
+  examples:
+  - summary: Add one backend address into the load balance backend address pool.
+    syntax: az network cross-region-lb address-pool address add -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress --frontend-ip-address /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/loadBalancers/regional-lb/frontendIPConfigurations/fe-rlb2
+  requiredParameters:
+  - isRequired: true
+    name: --frontend-ip-address
+    summary: Resource id of the frontend ip configuration defined in regional loadbalancer.
+    description: ''
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_address-pool_address_list
+  name: az network cross-region-lb address-pool address list
+  summary: List all backend addresses of the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool address list --lb-name
+                                                         --pool-name
+                                                         --resource-group
+                                                         [--query-examples]
+                                                         [--subscription]
+  examples:
+  - summary: List all backend addresses of the load balance backend address pool.
+    syntax: az network cross-region-lb address-pool address list -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_address-pool_address_remove
+  name: az network cross-region-lb address-pool address remove
+  summary: Remove one backend address from the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network cross-region-lb address-pool address remove --lb-name
+                                                           --name
+                                                           --pool-name
+                                                           --resource-group
+                                                           [--subscription]
+  examples:
+  - summary: Remove one backend address from the load balance backend address pool.
+    syntax: az network cross-region-lb address-pool address remove -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_address-pool_address_add
+- az_network_cross-region-lb_address-pool_address_list
+- az_network_cross-region-lb_address-pool_address_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage backend addresses of the cross-region load balance backend address pool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/frontend-ip.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/frontend-ip.yml
new file mode 100644
index 0000000000..ee9af409d6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/frontend-ip.yml
@@ -0,0 +1,213 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_frontend-ip
+name: az network cross-region-lb frontend-ip
+summary: Manage frontend IP addresses of a cross-region load balancer.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_frontend-ip_create
+  name: az network cross-region-lb frontend-ip create
+  summary: Create a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip create --lb-name
+                                                  --name
+                                                  --resource-group
+                                                  [--public-ip-address]
+                                                  [--subscription]
+                                                  [--zone {1, 2, 3}]
+  examples:
+  - summary: Create a frontend ip address for a public load balancer.
+    syntax: az network cross-region-lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb --public-ip-address MyFrontendIp
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --public-ip-address
+    summary: Name or ID of the existing public IP to associate with the configuration.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --zone -z
+    parameterValueGroup: 1, 2, 3
+    summary: Availability zone into which to provision the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_delete
+  name: az network cross-region-lb frontend-ip delete
+  summary: Delete a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip delete --lb-name
+                                                  --name
+                                                  --resource-group
+                                                  [--subscription]
+  examples:
+  - summary: Delete a frontend IP address.
+    syntax: az network cross-region-lb frontend-ip delete -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_list
+  name: az network cross-region-lb frontend-ip list
+  summary: List frontend IP addresses.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip list --lb-name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
+  examples:
+  - summary: List frontend IP addresses.
+    syntax: az network cross-region-lb frontend-ip list -g MyResourceGroup --lb-name MyLb
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_show
+  name: az network cross-region-lb frontend-ip show
+  summary: Get the details of a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip show --lb-name
+                                                --name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
+  examples:
+  - summary: Get the details of a frontend IP address.
+    syntax: az network cross-region-lb frontend-ip show -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_frontend-ip_update
+  name: az network cross-region-lb frontend-ip update
+  summary: Update a frontend IP address.
+  description: ''
+  syntax: >-
+    az network cross-region-lb frontend-ip update [--add]
+                                                  [--force-string]
+                                                  [--ids]
+                                                  [--lb-name]
+                                                  [--name]
+                                                  [--public-ip-address]
+                                                  [--remove]
+                                                  [--resource-group]
+                                                  [--set]
+                                                  [--subscription]
+  examples:
+  - summary: Update the frontend IP address of a public load balancer.
+    syntax: az network cross-region-lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --public-ip-address MyNewPublicIp
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - name: --name -n
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the existing public IP to associate with the configuration.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_frontend-ip_create
+- az_network_cross-region-lb_frontend-ip_delete
+- az_network_cross-region-lb_frontend-ip_list
+- az_network_cross-region-lb_frontend-ip_show
+- az_network_cross-region-lb_frontend-ip_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend IP addresses of a cross-region load balancer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/probe.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/probe.yml
new file mode 100644
index 0000000000..c43613a3db
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/probe.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_probe
+name: az network cross-region-lb probe
+summary: Evaluate probe information and define routing rules.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_probe_create
+  name: az network cross-region-lb probe create
+  summary: Create a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe create --lb-name
+                                            --name
+                                            --port
+                                            --protocol {Http, Tcp}
+                                            --resource-group
+                                            [--interval]
+                                            [--path]
+                                            [--subscription]
+                                            [--threshold]
+  examples:
+  - summary: Create a probe on a load balancer over HTTP and port 80.
+    syntax: >-
+      az network cross-region-lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol http --port 80 --path /
+  - summary: Create a probe on a load balancer over TCP on port 443.
+    syntax: >-
+      az network cross-region-lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol tcp --port 443
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - isRequired: true
+    name: --port
+    summary: The port to interrogate.
+    description: ''
+  - isRequired: true
+    name: --protocol
+    parameterValueGroup: Http, Tcp
+    summary: The protocol to probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --interval
+    summary: Probing time interval in seconds.
+    description: ''
+  - name: --path
+    summary: The endpoint to interrogate (http only).
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_delete
+  name: az network cross-region-lb probe delete
+  summary: Delete a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe delete --lb-name
+                                            --name
+                                            --resource-group
+                                            [--subscription]
+  examples:
+  - summary: Delete a probe.
+    syntax: az network cross-region-lb probe delete -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_list
+  name: az network cross-region-lb probe list
+  summary: List probes.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe list --lb-name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
+  examples:
+  - summary: List probes.
+    syntax: az network cross-region-lb probe list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_show
+  name: az network cross-region-lb probe show
+  summary: Get the details of a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe show --lb-name
+                                          --name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
+  examples:
+  - summary: Get the details of a probe.
+    syntax: az network cross-region-lb probe show -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_probe_update
+  name: az network cross-region-lb probe update
+  summary: Update a probe.
+  description: ''
+  syntax: >-
+    az network cross-region-lb probe update [--add]
+                                            [--force-string]
+                                            [--ids]
+                                            [--interval]
+                                            [--lb-name]
+                                            [--name]
+                                            [--path]
+                                            [--port]
+                                            [--protocol {Http, Tcp}]
+                                            [--remove]
+                                            [--resource-group]
+                                            [--set]
+                                            [--subscription]
+                                            [--threshold]
+  examples:
+  - summary: Update a probe with a different port and interval.
+    syntax: az network cross-region-lb probe update -g MyResourceGroup --lb-name MyLb -n MyProbe --port 81 --interval 10
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    summary: Probing time interval in seconds.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - name: --name -n
+    summary: The name of the probe.
+    description: ''
+  - name: --path
+    summary: The endpoint to interrogate (http only).
+    description: ''
+  - name: --port
+    summary: The port to interrogate.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Http, Tcp
+    summary: The protocol to probe.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_probe_create
+- az_network_cross-region-lb_probe_delete
+- az_network_cross-region-lb_probe_list
+- az_network_cross-region-lb_probe_show
+- az_network_cross-region-lb_probe_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Evaluate probe information and define routing rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/rule.yml
new file mode 100644
index 0000000000..574d2f9720
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/cross-region-lb/rule.yml
@@ -0,0 +1,297 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_cross-region-lb_rule
+name: az network cross-region-lb rule
+summary: Manage cross-region load balancing rules.
+description: ''
+directCommands:
+- uid: az_network_cross-region-lb_rule_create
+  name: az network cross-region-lb rule create
+  summary: Create a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule create --backend-port
+                                           --frontend-port
+                                           --lb-name
+                                           --name
+                                           --protocol {All, Tcp, Udp}
+                                           --resource-group
+                                           [--backend-pool-name]
+                                           [--floating-ip {false, true}]
+                                           [--frontend-ip-name]
+                                           [--idle-timeout]
+                                           [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                                           [--probe-name]
+                                           [--subscription]
+  examples:
+  - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port.
+    syntax: >-
+      az network cross-region-lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --frontend-port 80 \
+          --backend-pool-name MyAddressPool --backend-port 80
+  - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port with the floating ip feature.
+    syntax: >-
+      az network cross-region-lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --backend-pool-name MyAddressPool  \
+          --floating-ip true --frontend-port 80 --backend-port 80
+  - summary: Create an HA ports load balancing rule that assigns a frontend IP and port to use all available backend IPs in a pool on the same port.
+    syntax: >-
+      az network cross-region-lb rule create -g MyResourceGroup --lb-name MyLb -n MyHAPortsRule \
+          --protocol All --frontend-port 0 --backend-port 0 --frontend-ip-name MyFrontendIp \
+          --backend-pool-name MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --backend-port
+    summary: Port number.
+    description: ''
+  - isRequired: true
+    name: --frontend-port
+    summary: Port number.
+    description: ''
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - isRequired: true
+    name: --protocol
+    parameterValueGroup: All, Tcp, Udp
+    summary: Network transport protocol.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - name: --floating-ip
+    parameterValueGroup: false, true
+    summary: Enable floating IP.
+    description: ''
+  - name: --frontend-ip-name
+    summary: The name of the frontend IP configuration. If only one exists, omit to use as default.
+    description: ''
+  - name: --idle-timeout
+    summary: Idle timeout in minutes.
+    description: ''
+  - name: --load-distribution
+    defaultValue: default
+    parameterValueGroup: Default, SourceIP, SourceIPProtocol
+    summary: Affinity rule settings.
+    description: ''
+  - name: --probe-name
+    summary: Name of an existing probe to associate with this rule.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_delete
+  name: az network cross-region-lb rule delete
+  summary: Delete a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule delete --lb-name
+                                           --name
+                                           --resource-group
+                                           [--subscription]
+  examples:
+  - summary: Delete a load balancing rule.
+    syntax: az network cross-region-lb rule delete -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_list
+  name: az network cross-region-lb rule list
+  summary: List load balancing rules.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule list --lb-name
+                                         --resource-group
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: List load balancing rules.
+    syntax: az network cross-region-lb rule list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_show
+  name: az network cross-region-lb rule show
+  summary: Get the details of a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule show --lb-name
+                                         --name
+                                         --resource-group
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get the details of a load balancing rule.
+    syntax: az network cross-region-lb rule show -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The name of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_cross-region-lb_rule_update
+  name: az network cross-region-lb rule update
+  summary: Update a load balancing rule.
+  description: ''
+  syntax: >-
+    az network cross-region-lb rule update [--add]
+                                           [--backend-pool-name]
+                                           [--backend-port]
+                                           [--floating-ip {false, true}]
+                                           [--force-string]
+                                           [--frontend-ip-name]
+                                           [--frontend-port]
+                                           [--idle-timeout]
+                                           [--ids]
+                                           [--lb-name]
+                                           [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                                           [--name]
+                                           [--probe-name]
+                                           [--protocol {All, Tcp, Udp}]
+                                           [--remove]
+                                           [--resource-group]
+                                           [--set]
+                                           [--subscription]
+  examples:
+  - summary: Update a load balancing rule to change the protocol to UDP.
+    syntax: az network cross-region-lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Udp
+  - summary: Update a load balancing rule to support HA ports.
+    syntax: az network cross-region-lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule \ --protocol All --frontend-port 0 --backend-port 0
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --backend-pool-name
+    summary: The name of the backend address pool.
+    description: ''
+  - name: --backend-port
+    summary: Port number.
+    description: ''
+  - name: --floating-ip
+    parameterValueGroup: false, true
+    summary: Enable floating IP.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --frontend-ip-name
+    summary: The name of the frontend IP configuration.
+    description: ''
+  - name: --frontend-port
+    summary: Port number.
+    description: ''
+  - name: --idle-timeout
+    summary: Idle timeout in minutes.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - name: --load-distribution
+    parameterValueGroup: Default, SourceIP, SourceIPProtocol
+    summary: Affinity rule settings.
+    description: ''
+  - name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
+  - name: --probe-name
+    summary: Name of an existing probe to associate with this rule.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: All, Tcp, Udp
+    summary: Network transport protocol.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_cross-region-lb_rule_create
+- az_network_cross-region-lb_rule_delete
+- az_network_cross-region-lb_rule_list
+- az_network_cross-region-lb_rule_show
+- az_network_cross-region-lb_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage cross-region load balancing rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns.yml
index 385acd4861..3ca99ce37c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns.yml
@@ -1,241 +1,85 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns
-  name: az network dns
-  summary: Manage DNS domains in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_dns
+name: az network dns
+summary: Manage DNS domains in Azure.
+description: ''
 commands:
-- uid: az_network_dns_record_set
-  name: az network dns record-set
-  summary: Manage DNS records and record sets.
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_dns_record_set_list
-  name: az network dns record-set list
-  summary: List all record sets within a DNS zone.
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_dns_zone
-  name: az network dns zone
-  summary: Manage DNS zones.
-- uid: az_network_dns_zone_create
-  name: az network dns zone create
-  summary: Create a DNS zone.
-- uid: az_network_dns_zone_delete
-  name: az network dns zone delete
-  summary: Delete a DNS zone and all associated records.
-- uid: az_network_dns_zone_export
-  name: az network dns zone export
-  summary: Export a DNS zone as a DNS zone file.
-- uid: az_network_dns_zone_import
-  name: az network dns zone import
-  summary: Create a DNS zone using a DNS zone file.
-- uid: az_network_dns_zone_list
-  name: az network dns zone list
-  summary: List DNS zones.
-- uid: az_network_dns_zone_show
-  name: az network dns zone show
-  summary: Get a DNS zone parameters. Does not show DNS records within the zone.
-- uid: az_network_dns_zone_update
-  name: az network dns zone update
-  summary: Update a DNS zone properties. Does not modify DNS records within the zone.
+- az_network_dns_record-set
+- az_network_dns_record-set_a
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
+- az_network_dns_record-set_aaaa
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
+- az_network_dns_record-set_cname
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
+- az_network_dns_record-set_list
+- az_network_dns_record-set_mx
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
+- az_network_dns_record-set_ns
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
+- az_network_dns_record-set_ptr
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
+- az_network_dns_record-set_soa
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
+- az_network_dns_record-set_srv
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
+- az_network_dns_record-set_txt
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
+- az_network_dns_zone
+- az_network_dns_zone_create
+- az_network_dns_zone_delete
+- az_network_dns_zone_export
+- az_network_dns_zone_import
+- az_network_dns_zone_list
+- az_network_dns_zone_show
+- az_network_dns_zone_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -251,10 +95,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS domains in Azure.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS domains in Azure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set.yml
index 3c21904b09..93b7593948 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set.yml
@@ -1,243 +1,106 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set
-  name: az network dns record-set
-  summary: Manage DNS records and record sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_list
-- uid: az_network_dns_record_set_list
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set
+name: az network dns record-set
+summary: Manage DNS records and record sets.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_list
   name: az network dns record-set list
   summary: List all record sets within a DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set list --resource-group
+                                   --zone-name
+                                   [--query-examples]
+                                   [--subscription]
   examples:
   - summary: List all "@" record sets within this zone.
-    syntax:
-      content: az network dns record-set list -g MyResourceGroup -z www.mysite.com --query "[?name=='@']"
-  parameters:
+    syntax: az network dns record-set list -g MyResourceGroup -z www.mysite.com --query "[?name=='@']"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_dns_record_set_list
-  name: az network dns record-set list
-  summary: List all record sets within a DNS zone.
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_dns_record-set_a
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
+- az_network_dns_record-set_aaaa
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
+- az_network_dns_record-set_cname
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
+- az_network_dns_record-set_list
+- az_network_dns_record-set_mx
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
+- az_network_dns_record-set_ns
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
+- az_network_dns_record-set_ptr
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
+- az_network_dns_record-set_soa
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
+- az_network_dns_record-set_srv
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
+- az_network_dns_record-set_txt
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -253,10 +116,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS records and record sets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS records and record sets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/a.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/a.yml
index c2f9136c04..58ddf16245 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/a.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/a.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_a
-  name: az network dns record-set a
-  summary: Manage DNS A records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_a_add_record
-  - az_network_dns_record_set_a_create
-  - az_network_dns_record_set_a_delete
-  - az_network_dns_record_set_a_list
-  - az_network_dns_record_set_a_remove_record
-  - az_network_dns_record_set_a_show
-  - az_network_dns_record_set_a_update
-- uid: az_network_dns_record_set_a_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_a
+name: az network dns record-set a
+summary: Manage DNS A records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_a_add-record
   name: az network dns record-set a add-record
   summary: Add an A record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a add-record --ipv4-address
+                                           --record-set-name
+                                           --resource-group
+                                           --zone-name
+                                           [--if-none-match]
+                                           [--subscription]
+                                           [--ttl]
   examples:
   - summary: Add an A record.
-    syntax:
-      content: >-
-        az network dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPv4 address in string notation.
@@ -37,56 +32,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_create
   name: az network dns record-set a create
   summary: Create an empty A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a create --name
+                                       --resource-group
+                                       --zone-name
+                                       [--if-match]
+                                       [--if-none-match]
+                                       [--metadata]
+                                       [--subscription]
+                                       [--ttl]
   examples:
   - summary: Create an empty A record set.
-    syntax:
-      content: az network dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty A record set. (autogenerated)
-    syntax:
-      content: az network dns record-set a create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set a create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -94,98 +91,98 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_delete
   name: az network dns record-set a delete
   summary: Delete an A record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a delete --name
+                                       --resource-group
+                                       --zone-name
+                                       [--if-match]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete an A record set and all associated records.
-    syntax:
-      content: az network dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_list
   name: az network dns record-set a list
   summary: List all A record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a list --resource-group
+                                     --zone-name
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: List all A record sets in a zone.
-    syntax:
-      content: az network dns record-set a list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set a list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_remove-record
   name: az network dns record-set a remove-record
   summary: Remove an A record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a remove-record --ipv4-address
+                                              --record-set-name
+                                              --resource-group
+                                              --zone-name
+                                              [--keep-empty-record-set]
+                                              [--subscription]
   examples:
   - summary: Remove an A record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPv4 address in string notation.
@@ -196,86 +193,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_show
   name: az network dns record-set a show
   summary: Get the details of an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a show --name
+                                     --resource-group
+                                     --zone-name
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Get the details of an A record set.
-    syntax:
-      content: az network dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_a_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_a_update
   name: az network dns record-set a update
   summary: Update an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set a update --name
+                                       --resource-group
+                                       --zone-name
+                                       [--add]
+                                       [--force-string]
+                                       [--if-match]
+                                       [--if-none-match]
+                                       [--metadata]
+                                       [--remove]
+                                       [--set]
+                                       [--subscription]
   examples:
   - summary: Update an A record set.
-    syntax:
-      content: >-
-        az network dns record-set a update -g MyResourceGroup -n MyRecordSet \
-            -z www.mysite.com --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set a update -g MyResourceGroup -n MyRecordSet \
+          -z www.mysite.com --metadata owner=WebTeam
   - summary: Update an A record set. (autogenerated)
-    syntax:
-      content: az network dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -283,12 +293,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -298,34 +302,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_a_add_record
-  name: az network dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_dns_record_set_a_create
-  name: az network dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_dns_record_set_a_delete
-  name: az network dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_dns_record_set_a_list
-  name: az network dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_dns_record_set_a_remove_record
-  name: az network dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_dns_record_set_a_show
-  name: az network dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_dns_record_set_a_update
-  name: az network dns record-set a update
-  summary: Update an A record set.
+- az_network_dns_record-set_a_add-record
+- az_network_dns_record-set_a_create
+- az_network_dns_record-set_a_delete
+- az_network_dns_record-set_a_list
+- az_network_dns_record-set_a_remove-record
+- az_network_dns_record-set_a_show
+- az_network_dns_record-set_a_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -341,10 +326,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS A records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS A records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/aaaa.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/aaaa.yml
index 9c2fa01e33..975da88814 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/aaaa.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/aaaa.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_aaaa
-  name: az network dns record-set aaaa
-  summary: Manage DNS AAAA records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_aaaa_add_record
-  - az_network_dns_record_set_aaaa_create
-  - az_network_dns_record_set_aaaa_delete
-  - az_network_dns_record_set_aaaa_list
-  - az_network_dns_record_set_aaaa_remove_record
-  - az_network_dns_record_set_aaaa_show
-  - az_network_dns_record_set_aaaa_update
-- uid: az_network_dns_record_set_aaaa_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_aaaa
+name: az network dns record-set aaaa
+summary: Manage DNS AAAA records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_aaaa_add-record
   name: az network dns record-set aaaa add-record
   summary: Add an AAAA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa add-record --ipv6-address
+                                              --record-set-name
+                                              --resource-group
+                                              --zone-name
+                                              [--if-none-match]
+                                              [--subscription]
+                                              [--ttl]
   examples:
   - summary: Add an AAAA record.
-    syntax:
-      content: >-
-        az network dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPv6 address in string notation.
@@ -37,53 +32,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_create
   name: az network dns record-set aaaa create
   summary: Create an empty AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa create --name
+                                          --resource-group
+                                          --zone-name
+                                          [--if-match]
+                                          [--if-none-match]
+                                          [--metadata]
+                                          [--subscription]
+                                          [--ttl]
   examples:
   - summary: Create an empty AAAA record set.
-    syntax:
-      content: az network dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -91,101 +89,100 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_delete
   name: az network dns record-set aaaa delete
   summary: Delete an AAAA record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa delete --name
+                                          --resource-group
+                                          --zone-name
+                                          [--if-match]
+                                          [--subscription]
+                                          [--yes]
   examples:
   - summary: Delete an AAAA record set and all associated records.
-    syntax:
-      content: az network dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_list
   name: az network dns record-set aaaa list
   summary: List all AAAA record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa list --resource-group
+                                        --zone-name
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: List all AAAA record sets in a zone.
-    syntax:
-      content: az network dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
+    syntax: az network dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
   - summary: List all AAAA record sets in a zone. (autogenerated)
-    syntax:
-      content: az network dns record-set aaaa list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set aaaa list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_remove-record
   name: az network dns record-set aaaa remove-record
   summary: Remove AAAA record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa remove-record --ipv6-address
+                                                 --record-set-name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--keep-empty-record-set]
+                                                 [--subscription]
   examples:
   - summary: Remove an AAAA record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPv6 address in string notation.
@@ -196,83 +193,97 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_show
   name: az network dns record-set aaaa show
   summary: Get the details of an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa show --name
+                                        --resource-group
+                                        --zone-name
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: Get the details of an AAAA record set.
-    syntax:
-      content: az network dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_aaaa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_aaaa_update
   name: az network dns record-set aaaa update
   summary: Update an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set aaaa update --name
+                                          --resource-group
+                                          --zone-name
+                                          [--add]
+                                          [--force-string]
+                                          [--if-match]
+                                          [--if-none-match]
+                                          [--metadata]
+                                          [--remove]
+                                          [--set]
+                                          [--subscription]
   examples:
   - summary: Update an AAAA record set.
-    syntax:
-      content: >-
-        az network dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -280,12 +291,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -295,34 +300,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_aaaa_add_record
-  name: az network dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_dns_record_set_aaaa_create
-  name: az network dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_dns_record_set_aaaa_delete
-  name: az network dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_dns_record_set_aaaa_list
-  name: az network dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_dns_record_set_aaaa_remove_record
-  name: az network dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_dns_record_set_aaaa_show
-  name: az network dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_dns_record_set_aaaa_update
-  name: az network dns record-set aaaa update
-  summary: Update an AAAA record set.
+- az_network_dns_record-set_aaaa_add-record
+- az_network_dns_record-set_aaaa_create
+- az_network_dns_record-set_aaaa_delete
+- az_network_dns_record-set_aaaa_list
+- az_network_dns_record-set_aaaa_remove-record
+- az_network_dns_record-set_aaaa_show
+- az_network_dns_record-set_aaaa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -338,10 +324,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS AAAA records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS AAAA records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/cname.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/cname.yml
index 3947a98bc9..35324b314b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/cname.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/cname.yml
@@ -1,46 +1,43 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_cname
-  name: az network dns record-set cname
-  summary: Manage DNS CNAME records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_cname_create
-  - az_network_dns_record_set_cname_delete
-  - az_network_dns_record_set_cname_list
-  - az_network_dns_record_set_cname_remove_record
-  - az_network_dns_record_set_cname_set_record
-  - az_network_dns_record_set_cname_show
-- uid: az_network_dns_record_set_cname_create
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_cname
+name: az network dns record-set cname
+summary: Manage DNS CNAME records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_cname_create
   name: az network dns record-set cname create
   summary: Create an empty CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname create --name
+                                           --resource-group
+                                           --zone-name
+                                           [--if-match]
+                                           [--if-none-match]
+                                           [--metadata]
+                                           [--subscription]
+                                           [--ttl]
   examples:
   - summary: Create an empty CNAME record set.
-    syntax:
-      content: az network dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty CNAME record set. (autogenerated)
-    syntax:
-      content: az network dns record-set cname create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set cname create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -48,101 +45,101 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_delete
   name: az network dns record-set cname delete
   summary: Delete a CNAME record set and its associated record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname delete --name
+                                           --resource-group
+                                           --zone-name
+                                           [--if-match]
+                                           [--subscription]
+                                           [--yes]
   examples:
   - summary: Delete a CNAME record set and its associated record.
-    syntax:
-      content: az network dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_list
   name: az network dns record-set cname list
   summary: List the CNAME record set in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname list --resource-group
+                                         --zone-name
+                                         [--query-examples]
+                                         [--subscription]
   examples:
   - summary: List the CNAME record set in a zone.
-    syntax:
-      content: az network dns record-set cname list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set cname list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_remove-record
   name: az network dns record-set cname remove-record
   summary: Remove a CNAME record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname remove-record --cname
+                                                  --record-set-name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--keep-empty-record-set]
+                                                  [--subscription]
   examples:
   - summary: Remove a CNAME record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
-    summary: Canonical name.
+    summary: Value of the cname record-set. It should be Canonical name.
     description: ''
   - isRequired: true
     name: --record-set-name -n
@@ -150,40 +147,41 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_set_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_set-record
   name: az network dns record-set cname set-record
   summary: Set the value of a CNAME record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname set-record --cname
+                                               --record-set-name
+                                               --resource-group
+                                               --zone-name
+                                               [--if-none-match]
+                                               [--subscription]
+                                               [--ttl]
   examples:
   - summary: Set the value of a CNAME record.
-    syntax:
-      content: >-
-        az network dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
-    summary: Canonical name.
+    summary: Value of the cname record-set. It should be Canonical name.
     description: ''
   - isRequired: true
     name: --record-set-name -n
@@ -191,79 +189,65 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_cname_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_cname_show
   name: az network dns record-set cname show
   summary: Get the details of a CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set cname show --name
+                                         --resource-group
+                                         --zone-name
+                                         [--query-examples]
+                                         [--subscription]
   examples:
   - summary: Get the details of a CNAME record set.
-    syntax:
-      content: az network dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_cname_create
-  name: az network dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_dns_record_set_cname_delete
-  name: az network dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_dns_record_set_cname_list
-  name: az network dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_dns_record_set_cname_remove_record
-  name: az network dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_dns_record_set_cname_set_record
-  name: az network dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_dns_record_set_cname_show
-  name: az network dns record-set cname show
-  summary: Get the details of a CNAME record set.
+- az_network_dns_record-set_cname_create
+- az_network_dns_record-set_cname_delete
+- az_network_dns_record-set_cname_list
+- az_network_dns_record-set_cname_remove-record
+- az_network_dns_record-set_cname_set-record
+- az_network_dns_record-set_cname_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -279,10 +263,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS CNAME records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS CNAME records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/mx.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/mx.yml
index 7f4ea8ccec..d286923240 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/mx.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/mx.yml
@@ -1,32 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_mx
-  name: az network dns record-set mx
-  summary: Manage DNS MX records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_mx_add_record
-  - az_network_dns_record_set_mx_create
-  - az_network_dns_record_set_mx_delete
-  - az_network_dns_record_set_mx_list
-  - az_network_dns_record_set_mx_remove_record
-  - az_network_dns_record_set_mx_show
-  - az_network_dns_record_set_mx_update
-- uid: az_network_dns_record_set_mx_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_mx
+name: az network dns record-set mx
+summary: Manage DNS MX records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_mx_add-record
   name: az network dns record-set mx add-record
   summary: Add an MX record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx add-record --exchange
+                                            --preference
+                                            --record-set-name
+                                            --resource-group
+                                            --zone-name
+                                            [--if-none-match]
+                                            [--subscription]
+                                            [--ttl]
   examples:
   - summary: Add an MX record.
-    syntax:
-      content: >-
-        az network dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -41,56 +37,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_create
   name: az network dns record-set mx create
   summary: Create an empty MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx create --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--subscription]
+                                        [--ttl]
   examples:
   - summary: Create an empty MX record set.
-    syntax:
-      content: az network dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty MX record set. (autogenerated)
-    syntax:
-      content: az network dns record-set mx create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set mx create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -98,98 +96,101 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_delete
   name: az network dns record-set mx delete
   summary: Delete an MX record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx delete --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--subscription]
+                                        [--yes]
   examples:
   - summary: Delete an MX record set and all associated records.
-    syntax:
-      content: az network dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_list
   name: az network dns record-set mx list
   summary: List all MX record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx list --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List all MX record sets in a zone.
-    syntax:
-      content: az network dns record-set mx list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set mx list -g MyResourceGroup -z www.mysite.com
+  - summary: List all MX record sets in a zone (autogenerated)
+    syntax: az network dns record-set mx list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_remove-record
   name: az network dns record-set mx remove-record
   summary: Remove an MX record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx remove-record --exchange
+                                               --preference
+                                               --record-set-name
+                                               --resource-group
+                                               --zone-name
+                                               [--keep-empty-record-set]
+                                               [--subscription]
   examples:
   - summary: Remove an MX record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -204,86 +205,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_show
   name: az network dns record-set mx show
   summary: Get the details of an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx show --name
+                                      --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: Get the details of an MX record set.
-    syntax:
-      content: az network dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_mx_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_mx_update
   name: az network dns record-set mx update
   summary: Update an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set mx update --name
+                                        --resource-group
+                                        --zone-name
+                                        [--add]
+                                        [--force-string]
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--remove]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update an MX record set.
-    syntax:
-      content: >-
-        az network dns record-set mx update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set mx update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
   - summary: Update an MX record set. (autogenerated)
-    syntax:
-      content: az network dns record-set mx update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set mx update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -291,12 +305,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -306,34 +314,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_mx_add_record
-  name: az network dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_dns_record_set_mx_create
-  name: az network dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_dns_record_set_mx_delete
-  name: az network dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_dns_record_set_mx_list
-  name: az network dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_dns_record_set_mx_remove_record
-  name: az network dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_dns_record_set_mx_show
-  name: az network dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_dns_record_set_mx_update
-  name: az network dns record-set mx update
-  summary: Update an MX record set.
+- az_network_dns_record-set_mx_add-record
+- az_network_dns_record-set_mx_create
+- az_network_dns_record-set_mx_delete
+- az_network_dns_record-set_mx_list
+- az_network_dns_record-set_mx_remove-record
+- az_network_dns_record-set_mx_show
+- az_network_dns_record-set_mx_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -349,10 +338,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS MX records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS MX records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ns.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ns.yml
index 78abdad69a..b25f790474 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ns.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ns.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_ns
-  name: az network dns record-set ns
-  summary: Manage DNS NS records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_ns_add_record
-  - az_network_dns_record_set_ns_create
-  - az_network_dns_record_set_ns_delete
-  - az_network_dns_record_set_ns_list
-  - az_network_dns_record_set_ns_remove_record
-  - az_network_dns_record_set_ns_show
-  - az_network_dns_record_set_ns_update
-- uid: az_network_dns_record_set_ns_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_ns
+name: az network dns record-set ns
+summary: Manage DNS NS records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_ns_add-record
   name: az network dns record-set ns add-record
   summary: Add an NS record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns add-record --nsdname
+                                            --record-set-name
+                                            --resource-group
+                                            --zone-name
+                                            [--if-none-match]
+                                            [--subscriptionid]
+                                            [--ttl]
   examples:
   - summary: Add an NS record.
-    syntax:
-      content: >-
-        az network dns record-set ns add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d ns.mysite.com
-  parameters:
+    syntax: >-
+      az network dns record-set ns add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d ns.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --nsdname -d
     summary: Name server domain name.
@@ -37,12 +32,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
@@ -53,40 +49,41 @@ items:
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_create
   name: az network dns record-set ns create
   summary: Create an empty NS record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns create --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--subscription]
+                                        [--ttl]
   examples:
   - summary: Create an empty NS record set.
-    syntax:
-      content: az network dns record-set ns create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set ns create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty NS record set. (autogenerated)
-    syntax:
-      content: az network dns record-set ns create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set ns create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -94,98 +91,102 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_delete
   name: az network dns record-set ns delete
   summary: Delete an NS record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns delete --name
+                                        --resource-group
+                                        --zone-name
+                                        [--if-match]
+                                        [--subscription]
+                                        [--yes]
   examples:
   - summary: Delete an NS record set and all associated records.
-    syntax:
-      content: az network dns record-set ns delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ns delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Delete an NS record set and all associated records. (autogenerated)
+    syntax: az network dns record-set ns delete --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --yes --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_list
   name: az network dns record-set ns list
   summary: List all NS record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns list --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List all NS record sets in a zone.
-    syntax:
-      content: az network dns record-set ns list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set ns list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_remove-record
   name: az network dns record-set ns remove-record
   summary: Remove an NS record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns remove-record --nsdname
+                                               --record-set-name
+                                               --resource-group
+                                               --zone-name
+                                               [--keep-empty-record-set]
+                                               [--subscription]
   examples:
   - summary: Remove an NS record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set ns remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d ns.mysite.com
-  parameters:
+    syntax: >-
+      az network dns record-set ns remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d ns.mysite.com
+  - summary: Remove an NS record from its record set. (autogenerated)
+    syntax: az network dns record-set ns remove-record --keep-empty-record-set --nsdname ns.mysite.com --record-set-name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --nsdname -d
     summary: Name server domain name.
@@ -196,86 +197,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_show
   name: az network dns record-set ns show
   summary: Get the details of an NS record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns show --name
+                                      --resource-group
+                                      --zone-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: Get the details of an NS record set.
-    syntax:
-      content: az network dns record-set ns show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ns show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ns_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ns_update
   name: az network dns record-set ns update
   summary: Update an NS record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ns update --name
+                                        --resource-group
+                                        --zone-name
+                                        [--add]
+                                        [--force-string]
+                                        [--if-match]
+                                        [--if-none-match]
+                                        [--metadata]
+                                        [--remove]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update an NS record set.
-    syntax:
-      content: >-
-        az network dns record-set ns update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set ns update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
   - summary: Update an NS record set. (autogenerated)
-    syntax:
-      content: az network dns record-set ns update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set ns update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -283,12 +297,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -298,34 +306,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_ns_add_record
-  name: az network dns record-set ns add-record
-  summary: Add an NS record.
-- uid: az_network_dns_record_set_ns_create
-  name: az network dns record-set ns create
-  summary: Create an empty NS record set.
-- uid: az_network_dns_record_set_ns_delete
-  name: az network dns record-set ns delete
-  summary: Delete an NS record set and all associated records.
-- uid: az_network_dns_record_set_ns_list
-  name: az network dns record-set ns list
-  summary: List all NS record sets in a zone.
-- uid: az_network_dns_record_set_ns_remove_record
-  name: az network dns record-set ns remove-record
-  summary: Remove an NS record from its record set.
-- uid: az_network_dns_record_set_ns_show
-  name: az network dns record-set ns show
-  summary: Get the details of an NS record set.
-- uid: az_network_dns_record_set_ns_update
-  name: az network dns record-set ns update
-  summary: Update an NS record set.
+- az_network_dns_record-set_ns_add-record
+- az_network_dns_record-set_ns_create
+- az_network_dns_record-set_ns_delete
+- az_network_dns_record-set_ns_list
+- az_network_dns_record-set_ns_remove-record
+- az_network_dns_record-set_ns_show
+- az_network_dns_record-set_ns_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -341,10 +330,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS NS records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS NS records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ptr.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ptr.yml
index 5bbd8a3bf6..a5f07fcb9c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ptr.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/ptr.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_ptr
-  name: az network dns record-set ptr
-  summary: Manage DNS PTR records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_ptr_add_record
-  - az_network_dns_record_set_ptr_create
-  - az_network_dns_record_set_ptr_delete
-  - az_network_dns_record_set_ptr_list
-  - az_network_dns_record_set_ptr_remove_record
-  - az_network_dns_record_set_ptr_show
-  - az_network_dns_record_set_ptr_update
-- uid: az_network_dns_record_set_ptr_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_ptr
+name: az network dns record-set ptr
+summary: Manage DNS PTR records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_ptr_add-record
   name: az network dns record-set ptr add-record
   summary: Add a PTR record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr add-record --ptrdname
+                                             --record-set-name
+                                             --resource-group
+                                             --zone-name
+                                             [--if-none-match]
+                                             [--subscription]
+                                             [--ttl]
   examples:
   - summary: Add a PTR record.
-    syntax:
-      content: >-
-        az network dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -37,53 +32,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_create
   name: az network dns record-set ptr create
   summary: Create an empty PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr create --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--subscription]
+                                         [--ttl]
   examples:
   - summary: Create an empty PTR record set.
-    syntax:
-      content: az network dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Create an empty PTR record set. (autogenerated)
+    syntax: az network dns record-set ptr create --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -91,101 +91,102 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_delete
   name: az network dns record-set ptr delete
   summary: Delete a PTR record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr delete --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--subscription]
+                                         [--yes]
   examples:
   - summary: Delete a PTR record set and all associated records.
-    syntax:
-      content: az network dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Delete a PTR record set and all associated records. (autogenerated)
+    syntax: az network dns record-set ptr delete --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --yes --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_list
   name: az network dns record-set ptr list
   summary: List all PTR record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr list --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List all PTR record sets in a zone.
-    syntax:
-      content: az network dns record-set ptr list -g MyResourceGroup -z www.mysite.com
+    syntax: az network dns record-set ptr list -g MyResourceGroup -z www.mysite.com
   - summary: List all PTR record sets in a zone. (autogenerated)
-    syntax:
-      content: az network dns record-set ptr list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set ptr list --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_remove-record
   name: az network dns record-set ptr remove-record
   summary: Remove a PTR record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr remove-record --ptrdname
+                                                --record-set-name
+                                                --resource-group
+                                                --zone-name
+                                                [--keep-empty-record-set]
+                                                [--subscription]
   examples:
   - summary: Remove a PTR record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -196,83 +197,97 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_show
   name: az network dns record-set ptr show
   summary: Get the details of a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr show --name
+                                       --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of a PTR record set.
-    syntax:
-      content: az network dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_ptr_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_ptr_update
   name: az network dns record-set ptr update
   summary: Update a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set ptr update --name
+                                         --resource-group
+                                         --zone-name
+                                         [--add]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--remove]
+                                         [--set]
+                                         [--subscription]
   examples:
   - summary: Update a PTR record set.
-    syntax:
-      content: >-
-        az network dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -280,12 +295,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -295,34 +304,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_ptr_add_record
-  name: az network dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_dns_record_set_ptr_create
-  name: az network dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_dns_record_set_ptr_delete
-  name: az network dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_dns_record_set_ptr_list
-  name: az network dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_dns_record_set_ptr_remove_record
-  name: az network dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_dns_record_set_ptr_show
-  name: az network dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_dns_record_set_ptr_update
-  name: az network dns record-set ptr update
-  summary: Update a PTR record set.
+- az_network_dns_record-set_ptr_add-record
+- az_network_dns_record-set_ptr_create
+- az_network_dns_record-set_ptr_delete
+- az_network_dns_record-set_ptr_list
+- az_network_dns_record-set_ptr_remove-record
+- az_network_dns_record-set_ptr_show
+- az_network_dns_record-set_ptr_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -338,10 +328,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS PTR records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS PTR records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/soa.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/soa.yml
index dd5f1a94f6..f9ce77793b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/soa.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/soa.yml
@@ -1,63 +1,73 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_soa
-  name: az network dns record-set soa
-  summary: Manage a DNS SOA record.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_soa_show
-  - az_network_dns_record_set_soa_update
-- uid: az_network_dns_record_set_soa_show
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_soa
+name: az network dns record-set soa
+summary: Manage a DNS SOA record.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_soa_show
   name: az network dns record-set soa show
   summary: Get the details of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set soa show --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of an SOA record.
-    syntax:
-      content: az network dns record-set soa show -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set soa show -g MyResourceGroup -z www.mysite.com
+  - summary: Get the details of an SOA record (autogenerated)
+    syntax: az network dns record-set soa show --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_soa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_soa_update
   name: az network dns record-set soa update
   summary: Update properties of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set soa update --resource-group
+                                         --zone-name
+                                         [--email]
+                                         [--expire-time]
+                                         [--host]
+                                         [--if-none-match]
+                                         [--minimum-ttl]
+                                         [--refresh-time]
+                                         [--retry-time]
+                                         [--serial-number]
+                                         [--subscription]
   examples:
   - summary: Update properties of an SOA record.
-    syntax:
-      content: >-
-        az network dns record-set soa update -g MyResourceGroup -z www.mysite.com \
-            -e myhostmaster.mysite.com
-  parameters:
+    syntax: >-
+      az network dns record-set soa update -g MyResourceGroup -z www.mysite.com \
+          -e myhostmaster.mysite.com
+  - summary: Update properties of an SOA record. (autogenerated)
+    syntax: az network dns record-set soa update --email myhostmaster.mysite.com --only-show-errors --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --email -e
     summary: Email address.
     description: ''
@@ -86,19 +96,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_soa_show
-  name: az network dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_dns_record_set_soa_update
-  name: az network dns record-set soa update
-  summary: Update properties of an SOA record.
+- az_network_dns_record-set_soa_show
+- az_network_dns_record-set_soa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -114,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage a DNS SOA record.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage a DNS SOA record.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/srv.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/srv.yml
index 8fb6ec7ec4..465b7641bf 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/srv.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/srv.yml
@@ -1,32 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_srv
-  name: az network dns record-set srv
-  summary: Manage DNS SRV records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_srv_add_record
-  - az_network_dns_record_set_srv_create
-  - az_network_dns_record_set_srv_delete
-  - az_network_dns_record_set_srv_list
-  - az_network_dns_record_set_srv_remove_record
-  - az_network_dns_record_set_srv_show
-  - az_network_dns_record_set_srv_update
-- uid: az_network_dns_record_set_srv_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_srv
+name: az network dns record-set srv
+summary: Manage DNS SRV records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_srv_add-record
   name: az network dns record-set srv add-record
   summary: Add an SRV record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv add-record --port
+                                             --priority
+                                             --record-set-name
+                                             --resource-group
+                                             --target
+                                             --weight
+                                             --zone-name
+                                             [--if-none-match]
+                                             [--subscription]
   examples:
   - summary: Add an SRV record.
-    syntax:
-      content: >-
-        az network dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -41,7 +38,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -55,45 +52,50 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_create
   name: az network dns record-set srv create
   summary: Create an empty SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv create --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--subscription]
+                                         [--ttl]
   examples:
   - summary: Create an empty SRV record set.
-    syntax:
-      content: >-
-        az network dns record-set srv create -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet
-  parameters:
+    syntax: >-
+      az network dns record-set srv create -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet
+  - summary: Create an empty SRV record set. (autogenerated)
+    syntax: az network dns record-set srv create --metadata owner=WebTeam --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -101,98 +103,101 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_delete
   name: az network dns record-set srv delete
   summary: Delete an SRV record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv delete --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--subscription]
+                                         [--yes]
   examples:
   - summary: Delete an SRV record set and all associated records.
-    syntax:
-      content: az network dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_list
   name: az network dns record-set srv list
   summary: List all SRV record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv list --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List all SRV record sets in a zone.
-    syntax:
-      content: az network dns record-set srv list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set srv list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_remove-record
   name: az network dns record-set srv remove-record
   summary: Remove an SRV record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv remove-record --port
+                                                --priority
+                                                --record-set-name
+                                                --resource-group
+                                                --target
+                                                --weight
+                                                --zone-name
+                                                [--keep-empty-record-set]
+                                                [--subscription]
   examples:
   - summary: Remove an SRV record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -207,7 +212,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -221,77 +226,91 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_show
   name: az network dns record-set srv show
   summary: Get the details of an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv show --name
+                                       --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of an SRV record set.
-    syntax:
-      content: az network dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_srv_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_srv_update
   name: az network dns record-set srv update
   summary: Update an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set srv update --name
+                                         --resource-group
+                                         --zone-name
+                                         [--add]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--remove]
+                                         [--set]
+                                         [--subscription]
   examples:
   - summary: Update an SRV record set.
-    syntax:
-      content: >-
-        az network dns record-set srv update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set srv update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -299,12 +318,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -314,34 +327,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_srv_add_record
-  name: az network dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_dns_record_set_srv_create
-  name: az network dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_dns_record_set_srv_delete
-  name: az network dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_dns_record_set_srv_list
-  name: az network dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_dns_record_set_srv_remove_record
-  name: az network dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_dns_record_set_srv_show
-  name: az network dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_dns_record_set_srv_update
-  name: az network dns record-set srv update
-  summary: Update an SRV record set.
+- az_network_dns_record-set_srv_add-record
+- az_network_dns_record-set_srv_create
+- az_network_dns_record-set_srv_delete
+- az_network_dns_record-set_srv_list
+- az_network_dns_record-set_srv_remove-record
+- az_network_dns_record-set_srv_show
+- az_network_dns_record-set_srv_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -357,10 +351,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS SRV records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS SRV records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/txt.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/txt.yml
index 90d03537e1..da9585d8e5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/txt.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/record-set/txt.yml
@@ -1,39 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_record_set_txt
-  name: az network dns record-set txt
-  summary: Manage DNS TXT records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_record_set_txt_add_record
-  - az_network_dns_record_set_txt_create
-  - az_network_dns_record_set_txt_delete
-  - az_network_dns_record_set_txt_list
-  - az_network_dns_record_set_txt_remove_record
-  - az_network_dns_record_set_txt_show
-  - az_network_dns_record_set_txt_update
-- uid: az_network_dns_record_set_txt_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_record-set_txt
+name: az network dns record-set txt
+summary: Manage DNS TXT records.
+description: ''
+directCommands:
+- uid: az_network_dns_record-set_txt_add-record
   name: az network dns record-set txt add-record
   summary: Add a TXT record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt add-record --record-set-name
+                                             --resource-group
+                                             --value
+                                             --zone-name
+                                             [--if-none-match]
+                                             [--subscription]
   examples:
   - summary: Add a TXT record.
-    syntax:
-      content: >-
-        az network dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -43,46 +37,48 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_create
   name: az network dns record-set txt create
   summary: Create an empty TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt create --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--subscription]
+                                         [--ttl]
   examples:
   - summary: Create an empty TXT record set.
-    syntax:
-      content: az network dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Create an empty TXT record set. (autogenerated)
-    syntax:
-      content: az network dns record-set txt create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt create --name MyRecordSet --resource-group MyResourceGroup --ttl 30 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Create the record set only if it does not already exist.
@@ -90,105 +86,105 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_delete
   name: az network dns record-set txt delete
   summary: Delete a TXT record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt delete --name
+                                         --resource-group
+                                         --zone-name
+                                         [--if-match]
+                                         [--subscription]
+                                         [--yes]
   examples:
   - summary: Delete a TXT record set and all associated records.
-    syntax:
-      content: az network dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the record set. Omit this value to always delete the current record set. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_list
   name: az network dns record-set txt list
   summary: List all TXT record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt list --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List all TXT record sets in a zone.
-    syntax:
-      content: az network dns record-set txt list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_remove-record
   name: az network dns record-set txt remove-record
   summary: Remove a TXT record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt remove-record --record-set-name
+                                                --resource-group
+                                                --value
+                                                --zone-name
+                                                [--keep-empty-record-set]
+                                                [--subscription]
   examples:
   - summary: Remove a TXT record from its record set.
-    syntax:
-      content: >-
-        az network dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -198,83 +194,95 @@ items:
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_show
   name: az network dns record-set txt show
   summary: Get the details of a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt show --name
+                                       --resource-group
+                                       --zone-name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Get the details of a TXT record set.
-    syntax:
-      content: az network dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+    syntax: az network dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
   - summary: Get the details of a TXT record set. (autogenerated)
-    syntax:
-      content: az network dns record-set txt show --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt show --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_dns_record_set_txt_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_dns_record-set_txt_update
   name: az network dns record-set txt update
   summary: Update a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns record-set txt update --name
+                                         --resource-group
+                                         --zone-name
+                                         [--add]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--metadata]
+                                         [--remove]
+                                         [--set]
+                                         [--subscription]
   examples:
   - summary: Update a TXT record set.
-    syntax:
-      content: >-
-        az network dns record-set txt update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
+    syntax: >-
+      az network dns record-set txt update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
   - summary: Update a TXT record set. (autogenerated)
-    syntax:
-      content: az network dns record-set txt update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
-  parameters:
+    syntax: az network dns record-set txt update --name MyRecordSet --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
-    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwritting any concurrent changes.
+    summary: The etag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen etag value to prevent accidentally overwriting any concurrent changes.
     description: ''
   - name: --if-none-match
     summary: Set to '\*' to allow a new record set to be created, but to prevent updating an existing record set. Other values will be ignored.
@@ -282,12 +290,6 @@ items:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -297,34 +299,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_record_set_txt_add_record
-  name: az network dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_dns_record_set_txt_create
-  name: az network dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_dns_record_set_txt_delete
-  name: az network dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_dns_record_set_txt_list
-  name: az network dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_dns_record_set_txt_remove_record
-  name: az network dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_dns_record_set_txt_show
-  name: az network dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_dns_record_set_txt_update
-  name: az network dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_dns_record-set_txt_add-record
+- az_network_dns_record-set_txt_create
+- az_network_dns_record-set_txt_delete
+- az_network_dns_record-set_txt_list
+- az_network_dns_record-set_txt_remove-record
+- az_network_dns_record-set_txt_show
+- az_network_dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -340,10 +323,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS TXT records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS TXT records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/dns/zone.yml b/2018-03-01-hybrid/docs-ref-autogen/network/dns/zone.yml
index 6e4c5192be..6048e6c1a7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/dns/zone.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/dns/zone.yml
@@ -1,59 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_dns_zone
-  name: az network dns zone
-  summary: Manage DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_dns_zone_create
-  - az_network_dns_zone_delete
-  - az_network_dns_zone_export
-  - az_network_dns_zone_import
-  - az_network_dns_zone_list
-  - az_network_dns_zone_show
-  - az_network_dns_zone_update
+### YamlMime:AzureCLIGroup
+uid: az_network_dns_zone
+name: az network dns zone
+summary: Manage DNS zones.
+description: ''
+directCommands:
 - uid: az_network_dns_zone_create
   name: az network dns zone create
   summary: Create a DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone create --name
+                               --resource-group
+                               [--if-none-match]
+                               [--parent-name]
+                               [--registration-vnets]
+                               [--resolution-vnets]
+                               [--subscription]
+                               [--tags]
+                               [--zone-type {Private, Public}]
   examples:
   - summary: Create a DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network dns zone create -g MyResourceGroup -n www.mysite.com
+    syntax: az network dns zone create -g MyResourceGroup -n www.mysite.com
   - summary: Create a DNS zone with delegation in the parent within the same subscription and resource group
-    syntax:
-      content: az network dns zone create -g MyResourceGroup -n books.mysite.com -p mysite.com
+    syntax: az network dns zone create -g MyResourceGroup -n books.mysite.com -p mysite.com
   - summary: Create a DNS zone with delegation in the parent in different subscription
-    syntax:
-      content: az network dns zone create -g MyResourceGroup -n books.mysite.com -p "/subscriptions/**67e2/resourceGroups/OtherRg/providers/Microsoft.Network/dnszones/mysite.com"
-  parameters:
+    syntax: az network dns zone create -g MyResourceGroup -n books.mysite.com -p "/subscriptions/**67e2/resourceGroups/OtherRg/providers/Microsoft.Network/dnszones/mysite.com"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --if-none-match
     summary: Only create a DNS zone if one doesn't exist that matches the given name.
     description: ''
   - name: --parent-name -p
     summary: Specify if parent zone exists for this zone and delegation for the child zone in the parent is to be added.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --zone-type
-    defaultValue: Public
-    summary: Type of DNS zone to create.
-    description: ''
   - name: --registration-vnets
-    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: <a href="https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits">https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits</a>.'
+    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits.'
     description: ''
   - name: --resolution-vnets
     summary: Space-separated names or IDs of virtual networks that resolve records in this DNS zone.
@@ -61,88 +50,90 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zone-type
+    defaultValue: Public
+    parameterValueGroup: Private, Public
+    summary: Type of DNS zone to create.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_delete
   name: az network dns zone delete
   summary: Delete a DNS zone and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone delete --name
+                               --resource-group
+                               [--if-match]
+                               [--subscription]
+                               [--yes]
   examples:
   - summary: Delete a DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network dns zone delete -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network dns zone delete -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The etag of the DNS zone. Omit this value to always delete the current zone. Specify the last-seen etag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_export
   name: az network dns zone export
   summary: Export a DNS zone as a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone export --name
+                               --resource-group
+                               [--file-name]
+                               [--subscription]
   examples:
   - summary: Export a DNS zone as a DNS zone file.
-    syntax:
-      content: az network dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
-  parameters:
+    syntax: az network dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --file-name -f
     summary: Path to the DNS zone file to save.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_import
   name: az network dns zone import
   summary: Create a DNS zone using a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone import --file-name
+                               --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Import a local zone file into a DNS zone resource.
-    syntax:
-      content: az network dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
-  parameters:
+    syntax: az network dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
+  requiredParameters:
   - isRequired: true
     name: --file-name -f
     summary: Path to the DNS zone file to import.
@@ -153,145 +144,136 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_list
   name: az network dns zone list
   summary: List DNS zones.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone list [--query-examples]
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: List DNS zones in a resource group.
-    syntax:
-      content: az network dns zone list -g MyResourceGroup
-  parameters:
+    syntax: az network dns zone list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_show
   name: az network dns zone show
   summary: Get a DNS zone parameters. Does not show DNS records within the zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List DNS zones in a resource group.
-    syntax:
-      content: az network dns zone show -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network dns zone show -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_dns_zone_update
   name: az network dns zone update
   summary: Update a DNS zone properties. Does not modify DNS records within the zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network dns zone update --name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--if-match]
+                               [--registration-vnets]
+                               [--remove]
+                               [--resolution-vnets]
+                               [--set]
+                               [--subscription]
+                               [--tags]
+                               [--zone-type {Private, Public}]
   examples:
   - summary: Update a DNS zone properties to change the user-defined value of a previously set tag.
-    syntax:
-      content: az network dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
-  parameters:
+    syntax: az network dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
+  - summary: Update a DNS zone properties (autogenerated)
+    syntax: az network dns zone update --name www.mysite.com --remove tags.no_80 --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: Update only if the resource with the same ETAG exists.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --zone-type
-    summary: Type of DNS zone to create.
-    description: ''
-  - name: --registration-vnets
-    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: <a href="https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits">https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits</a>.'
-    description: ''
-  - name: --resolution-vnets
-    summary: Space-separated names or IDs of virtual networks that resolve records in this DNS zone.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: Update only if the resource with the same ETAG exists.
+    description: ''
+  - name: --registration-vnets
+    summary: 'Space-separated names or IDs of virtual networks that register hostnames in this DNS zone. Number of private DNS zones with virtual network auto-registration enabled is 1. If you need to increase this limit, please contact Azure Support: https://docs.microsoft.com/en-us/azure/azure-subscription-service-limits.'
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resolution-vnets
+    summary: Space-separated names or IDs of virtual networks that resolve records in this DNS zone.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zone-type
+    parameterValueGroup: Private, Public
+    summary: Type of DNS zone to create.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_dns_zone_create
-  name: az network dns zone create
-  summary: Create a DNS zone.
-- uid: az_network_dns_zone_delete
-  name: az network dns zone delete
-  summary: Delete a DNS zone and all associated records.
-- uid: az_network_dns_zone_export
-  name: az network dns zone export
-  summary: Export a DNS zone as a DNS zone file.
-- uid: az_network_dns_zone_import
-  name: az network dns zone import
-  summary: Create a DNS zone using a DNS zone file.
-- uid: az_network_dns_zone_list
-  name: az network dns zone list
-  summary: List DNS zones.
-- uid: az_network_dns_zone_show
-  name: az network dns zone show
-  summary: Get a DNS zone parameters. Does not show DNS records within the zone.
-- uid: az_network_dns_zone_update
-  name: az network dns zone update
-  summary: Update a DNS zone properties. Does not modify DNS records within the zone.
+- az_network_dns_zone_create
+- az_network_dns_zone_delete
+- az_network_dns_zone_export
+- az_network_dns_zone_import
+- az_network_dns_zone_list
+- az_network_dns_zone_show
+- az_network_dns_zone_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -307,10 +289,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage DNS zones.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage DNS zones.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route.yml
index 1020a1d3e6..7385adb882 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route.yml
@@ -1,33 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route
-  name: az network express-route
-  summary: Manage dedicated private network fiber connections to Azure.
-  description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_create
-  - az_network_express_route_delete
-  - az_network_express_route_get_stats
-  - az_network_express_route_list
-  - az_network_express_route_list_arp_tables
-  - az_network_express_route_list_route_tables
-  - az_network_express_route_list_service_providers
-  - az_network_express_route_show
-  - az_network_express_route_update
-  - az_network_express_route_wait
-- uid: az_network_express_route_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route
+name: az network express-route
+summary: Manage dedicated private network fiber connections to Azure.
+description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/azure/expressroute/howto-circuit-cli.
+directCommands:
+- uid: az_network_express-route_create
   name: az network express-route create
   summary: Create an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route create --bandwidth
+                                    --name
+                                    --peering-location
+                                    --provider
+                                    --resource-group
+                                    [--allow-classic-operations {false, true}]
+                                    [--location]
+                                    [--no-wait]
+                                    [--sku-family {MeteredData, UnlimitedData}]
+                                    [--sku-tier {Premium, Standard}]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Create an ExpressRoute circuit.
-    syntax:
-      content: az network express-route create --bandwidth 200 -n MyCircuit --peering-location "Silicon Valley" -g MyResourceGroup --provider "Equinix" -l "West US" --sku-family MeteredData --sku-tier Standard
-  parameters:
+    syntax: az network express-route create --bandwidth 200 -n MyCircuit --peering-location "Silicon Valley" -g MyResourceGroup --provider "Equinix" -l "West US" --sku-family MeteredData --sku-tier Standard
+  requiredParameters:
   - isRequired: true
     name: --bandwidth
     summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
@@ -49,14 +46,15 @@ items:
     valueFrom: az network express-route list-service-providers
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --allow-classic-operations
     parameterValueGroup: false, true
     summary: Allow classic operations.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -71,61 +69,58 @@ items:
     parameterValueGroup: Premium, Standard
     summary: SKU Tier of ExpressRoute circuit.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_delete
   name: az network express-route delete
   summary: Delete an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route delete [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Delete an ExpressRoute circuit.
-    syntax:
-      content: az network express-route delete -n MyCircuit -g MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network express-route delete -n MyCircuit -g MyResourceGroup
+  - summary: Delete an ExpressRoute circuit. (autogenerated)
+    syntax: az network express-route delete --name MyCircuit --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: ExpressRoute circuit name.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_get_stats
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_get-stats
   name: az network express-route get-stats
   summary: Get the statistics of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route get-stats [--ids]
+                                       [--name]
+                                       [--resource-group]
+                                       [--subscription]
   examples:
   - summary: Get the statistics of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route get-stats -g MyResourceGroup -n MyCircuit
-  parameters:
+    syntax: az network express-route get-stats -g MyResourceGroup -n MyCircuit
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -133,53 +128,51 @@ items:
     summary: ExpressRoute circuit name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_list
   name: az network express-route list
   summary: List all ExpressRoute circuits for the current subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route list [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: List all ExpressRoute circuits for the current subscription.
-    syntax:
-      content: az network express-route list -g MyResourceGroup
-  parameters:
+    syntax: az network express-route list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_list_arp_tables
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_list-arp-tables
   name: az network express-route list-arp-tables
   summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route list-arp-tables --path {primary, secondary}
+                                             --peering-name
+                                             [--ids]
+                                             [--name]
+                                             [--resource-group]
+                                             [--subscription]
   examples:
   - summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute circuit.
-    syntax:
-      content: >-
-        az network express-route list-arp-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
+    syntax: >-
+      az network express-route list-arp-tables -g MyResourceGroup -n MyCircuit \
+          --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
   - isRequired: true
     name: --path
     parameterValueGroup: primary, secondary
@@ -189,6 +182,7 @@ items:
     name: --peering-name
     summary: The name of the peering.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -196,30 +190,29 @@ items:
     summary: ExpressRoute circuit name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_list_route_tables
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_list-route-tables
   name: az network express-route list-route-tables
   summary: Show the current routing table of an ExpressRoute circuit peering.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route list-route-tables --path {primary, secondary}
+                                               --peering-name
+                                               [--ids]
+                                               [--name]
+                                               [--resource-group]
+                                               [--subscription]
   examples:
   - summary: Show the current routing table of an ExpressRoute circuit peering.
-    syntax:
-      content: >-
-        az network express-route list-route-tables -g MyResourceGroup -n MyCircuit \
-            --path primary --peering-name AzurePrivatePeering
-  parameters:
+    syntax: >-
+      az network express-route list-route-tables -g MyResourceGroup -n MyCircuit \
+          --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
   - isRequired: true
     name: --path
     parameterValueGroup: primary, secondary
@@ -229,6 +222,7 @@ items:
     name: --peering-name
     summary: The name of the peering.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -236,77 +230,121 @@ items:
     summary: ExpressRoute circuit name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_list_service_providers
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_list-route-tables-summary
+  name: az network express-route list-route-tables-summary
+  summary: Show the current routing table summary of an ExpressRoute circuit peering.
+  description: ''
+  syntax: >-
+    az network express-route list-route-tables-summary --path {primary, secondary}
+                                                       --peering-name
+                                                       [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+  examples:
+  - summary: List Route Table Summary
+    syntax: az network express-route list-route-tables-summary -g MyResourceGroup -n MyCircuit --path primary --peering-name AzurePrivatePeering
+  requiredParameters:
+  - isRequired: true
+    name: --path
+    parameterValueGroup: primary, secondary
+    summary: The path of the device.
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: ExpressRoute circuit name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_list-service-providers
   name: az network express-route list-service-providers
   summary: List available ExpressRoute service providers.
   description: ''
-  langs:
-  - azurecli
+  syntax: az network express-route list-service-providers [--subscription]
   examples:
   - summary: List available ExpressRoute service providers.
-    syntax:
-      content: az network express-route list-service-providers
-  parameters:
+    syntax: az network express-route list-service-providers
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_show
   name: az network express-route show
   summary: Get the details of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route show [--ids]
+                                  [--name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Get the details of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route show -n MyCircuit -g MyResourceGroup
-  parameters:
+    syntax: az network express-route show -n MyCircuit -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: ExpressRoute circuit name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_update
   name: az network express-route update
   summary: Update settings of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route update [--add]
+                                    [--allow-classic-operations {false, true}]
+                                    [--bandwidth]
+                                    [--force-string]
+                                    [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--peering-location]
+                                    [--provider]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+                                    [--sku-family {MeteredData, UnlimitedData}]
+                                    [--sku-tier {Premium, Standard}]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Change the SKU of an ExpressRoute circuit from Standard to Premium.
-    syntax:
-      content: az network express-route update -n MyCircuit -g MyResourceGroup --sku-tier Premium
-  parameters:
+    syntax: az network express-route update -n MyCircuit -g MyResourceGroup --sku-tier Premium
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --allow-classic-operations
     parameterValueGroup: false, true
     summary: Allow classic operations.
@@ -314,6 +352,15 @@ items:
   - name: --bandwidth
     summary: 'Bandwidth of the circuit. Usage: INT {Mbps,Gbps}. Defaults to Mbps.'
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: ExpressRoute circuit name.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -323,6 +370,15 @@ items:
   - name: --provider
     summary: Name of the ExpressRoute Service Provider.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
   - name: --sku-family
     parameterValueGroup: MeteredData, UnlimitedData
     summary: Chosen SKU family of ExpressRoute circuit.
@@ -331,62 +387,33 @@ items:
     parameterValueGroup: Premium, Standard
     summary: SKU Tier of ExpressRoute circuit.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_wait
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_wait
   name: az network express-route wait
   summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route wait [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--ids]
+                                  [--interval]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
   examples:
   - summary: Pause executing next line of CLI script until the ExpressRoute circuit is successfully provisioned.
-    syntax:
-      content: az network express-route wait -n MyCircuit -g MyResourceGroup --created
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: ExpressRoute circuit name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network express-route wait -n MyCircuit -g MyResourceGroup --created
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -399,10 +426,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: ExpressRoute circuit name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -410,106 +449,42 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_auth
-  name: az network express-route auth
-  summary: Manage authentication of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_create
-  name: az network express-route auth create
-  summary: Create a new link authorization for an ExpressRoute circuit.
-- uid: az_network_express_route_auth_delete
-  name: az network express-route auth delete
-  summary: Delete a link authorization of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_list
-  name: az network express-route auth list
-  summary: List link authorizations of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_show
-  name: az network express-route auth show
-  summary: Get the details of a link authorization of an ExpressRoute circuit.
-- uid: az_network_express_route_create
-  name: az network express-route create
-  summary: Create an ExpressRoute circuit.
-- uid: az_network_express_route_delete
-  name: az network express-route delete
-  summary: Delete an ExpressRoute circuit.
-- uid: az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
-- uid: az_network_express_route_get_stats
-  name: az network express-route get-stats
-  summary: Get the statistics of an ExpressRoute circuit.
-- uid: az_network_express_route_list
-  name: az network express-route list
-  summary: List all ExpressRoute circuits for the current subscription.
-- uid: az_network_express_route_list_arp_tables
-  name: az network express-route list-arp-tables
-  summary: Show the current Address Resolution Protocol (ARP) table of an ExpressRoute circuit.
-- uid: az_network_express_route_list_route_tables
-  name: az network express-route list-route-tables
-  summary: Show the current routing table of an ExpressRoute circuit peering.
-- uid: az_network_express_route_list_service_providers
-  name: az network express-route list-service-providers
-  summary: List available ExpressRoute service providers.
-- uid: az_network_express_route_peering
-  name: az network express-route peering
-  summary: Manage ExpressRoute peering of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
-- uid: az_network_express_route_peering_create
-  name: az network express-route peering create
-  summary: Create peering settings for an ExpressRoute circuit.
-- uid: az_network_express_route_peering_delete
-  name: az network express-route peering delete
-  summary: Delete peering settings.
-- uid: az_network_express_route_peering_list
-  name: az network express-route peering list
-  summary: List peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_show
-  name: az network express-route peering show
-  summary: Get the details of an express route peering.
-- uid: az_network_express_route_peering_update
-  name: az network express-route peering update
-  summary: Update peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-- uid: az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
-- uid: az_network_express_route_show
-  name: az network express-route show
-  summary: Get the details of an ExpressRoute circuit.
-- uid: az_network_express_route_update
-  name: az network express-route update
-  summary: Update settings of an ExpressRoute circuit.
-- uid: az_network_express_route_wait
-  name: az network express-route wait
-  summary: Place the CLI in a waiting state until a condition of the ExpressRoute is met.
+- az_network_express-route_auth
+- az_network_express-route_auth_create
+- az_network_express-route_auth_delete
+- az_network_express-route_auth_list
+- az_network_express-route_auth_show
+- az_network_express-route_create
+- az_network_express-route_delete
+- az_network_express-route_gateway
+- az_network_express-route_gateway_connection
+- az_network_express-route_gateway_connection_create
+- az_network_express-route_gateway_create
+- az_network_express-route_gateway_list
+- az_network_express-route_get-stats
+- az_network_express-route_list
+- az_network_express-route_list-arp-tables
+- az_network_express-route_list-route-tables
+- az_network_express-route_list-route-tables-summary
+- az_network_express-route_list-service-providers
+- az_network_express-route_peering
+- az_network_express-route_peering_connection
+- az_network_express-route_peering_connection_create
+- az_network_express-route_peering_create
+- az_network_express-route_peering_delete
+- az_network_express-route_peering_get-stats
+- az_network_express-route_peering_list
+- az_network_express-route_peering_show
+- az_network_express-route_peering_update
+- az_network_express-route_port
+- az_network_express-route_port_create
+- az_network_express-route_port_generate-loa
+- az_network_express-route_port_list
+- az_network_express-route_show
+- az_network_express-route_update
+- az_network_express-route_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -525,10 +500,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about ExpressRoute circuits visit <a href="https://docs.microsoft.com/azure/expressroute/howto-circuit-cli">https://docs.microsoft.com/azure/expressroute/howto-circuit-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about ExpressRoute circuits visit https://docs.microsoft.com/azure/expressroute/howto-circuit-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/auth.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/auth.yml
index c1058b4d6e..767de1fad1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/auth.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/auth.yml
@@ -1,27 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_auth
-  name: az network express-route auth
-  summary: Manage authentication of an ExpressRoute circuit.
-  description: To learn more about ExpressRoute circuit authentication visit <a href="https://docs.microsoft.com/azure/expressroute/howto-linkvnet-cli#connect-a-virtual-network-in-a-different-subscription-to-a-circuit">https://docs.microsoft.com/azure/expressroute/howto-linkvnet-cli#connect-a-virtual-network-in-a-different-subscription-to-a-circuit</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_auth_create
-  - az_network_express_route_auth_delete
-  - az_network_express_route_auth_list
-  - az_network_express_route_auth_show
-- uid: az_network_express_route_auth_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_auth
+name: az network express-route auth
+summary: Manage authentication of an ExpressRoute circuit.
+description: To learn more about ExpressRoute circuit authentication visit https://docs.microsoft.com/azure/expressroute/howto-linkvnet-cli#connect-a-virtual-network-in-a-different-subscription-to-a-circuit.
+directCommands:
+- uid: az_network_express-route_auth_create
   name: az network express-route auth create
   summary: Create a new link authorization for an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route auth create --circuit-name
+                                         --name
+                                         --resource-group
+                                         [--subscription]
   examples:
   - summary: Create a new link authorization for an ExpressRoute circuit.
-    syntax:
-      content: az network express-route auth create --circuit-name MyCircuit -g MyResourceGroup -n MyAuthorization
-  parameters:
+    syntax: az network express-route auth create --circuit-name MyCircuit -g MyResourceGroup -n MyAuthorization
+  requiredParameters:
   - isRequired: true
     name: --circuit-name
     summary: ExpressRoute circuit name.
@@ -32,28 +27,27 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_auth_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_auth_delete
   name: az network express-route auth delete
   summary: Delete a link authorization of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route auth delete [--circuit-name]
+                                         [--ids]
+                                         [--name]
+                                         [--resource-group]
+                                         [--subscription]
   examples:
   - summary: Delete a link authorization of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route auth delete --circuit-name MyCircuit -g MyResourceGroup -n MyAuthorization
-  parameters:
+    syntax: az network express-route auth delete --circuit-name MyCircuit -g MyResourceGroup -n MyAuthorization
+  optionalParameters:
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
@@ -64,59 +58,58 @@ items:
     summary: Authorization name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_auth_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_auth_list
   name: az network express-route auth list
   summary: List link authorizations of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route auth list --circuit-name
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: List link authorizations of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route auth list -g MyResourceGroup --circuit-name MyCircuit
+    syntax: az network express-route auth list -g MyResourceGroup --circuit-name MyCircuit
   - summary: List link authorizations of an ExpressRoute circuit. (autogenerated)
-    syntax:
-      content: az network express-route auth list --circuit-name MyCircuit --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network express-route auth list --circuit-name MyCircuit --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_auth_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_auth_show
   name: az network express-route auth show
   summary: Get the details of a link authorization of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route auth show [--circuit-name]
+                                       [--ids]
+                                       [--name]
+                                       [--query-examples]
+                                       [--resource-group]
+                                       [--subscription]
   examples:
   - summary: Get the details of a link authorization of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route auth show -g MyResourceGroup --circuit-name MyCircuit -n MyAuthorization
-  parameters:
+    syntax: az network express-route auth show -g MyResourceGroup --circuit-name MyCircuit -n MyAuthorization
+  optionalParameters:
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
@@ -126,31 +119,21 @@ items:
   - name: --name -n
     summary: Authorization name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_auth_create
-  name: az network express-route auth create
-  summary: Create a new link authorization for an ExpressRoute circuit.
-- uid: az_network_express_route_auth_delete
-  name: az network express-route auth delete
-  summary: Delete a link authorization of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_list
-  name: az network express-route auth list
-  summary: List link authorizations of an ExpressRoute circuit.
-- uid: az_network_express_route_auth_show
-  name: az network express-route auth show
-  summary: Get the details of a link authorization of an ExpressRoute circuit.
+- az_network_express-route_auth_create
+- az_network_express-route_auth_delete
+- az_network_express-route_auth_list
+- az_network_express-route_auth_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -166,10 +149,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about ExpressRoute circuit authentication visit <a href="https://docs.microsoft.com/azure/expressroute/howto-linkvnet-cli#connect-a-virtual-network-in-a-different-subscription-to-a-circuit">https://docs.microsoft.com/azure/expressroute/howto-linkvnet-cli#connect-a-virtual-network-in-a-different-subscription-to-a-circuit</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about ExpressRoute circuit authentication visit https://docs.microsoft.com/azure/expressroute/howto-linkvnet-cli#connect-a-virtual-network-in-a-different-subscription-to-a-circuit.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway.yml
index a43f6c14ee..4f2b17904d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway.yml
@@ -1,72 +1,61 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_gateway
-  name: az network express-route gateway
-  summary: Manage ExpressRoute gateways.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_gateway_create
-  - az_network_express_route_gateway_list
-- uid: az_network_express_route_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_gateway
+name: az network express-route gateway
+summary: Manage ExpressRoute gateways.
+description: ''
+directCommands:
+- uid: az_network_express-route_gateway_create
   name: az network express-route gateway create
   summary: Create an ExpressRoute gateway.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route gateway create --resource-group
+                                            [--location]
+                                            [--subscription]
+                                            [--tags]
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_gateway_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_gateway_list
   name: az network express-route gateway list
   summary: List ExpressRoute gateways.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route gateway list [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
+  examples:
+  - summary: List ExpressRoute gateways. (autogenerated)
+    syntax: az network express-route gateway list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
-- uid: az_network_express_route_gateway_create
-  name: az network express-route gateway create
-  summary: Create an ExpressRoute gateway.
-- uid: az_network_express_route_gateway_list
-  name: az network express-route gateway list
-  summary: List ExpressRoute gateways.
+- az_network_express-route_gateway_connection
+- az_network_express-route_gateway_connection_create
+- az_network_express-route_gateway_create
+- az_network_express-route_gateway_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -82,10 +71,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute gateways.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute gateways.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway/connection.yml
index e9f4edec5b..8d3ccd1539 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway/connection.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/gateway/connection.yml
@@ -1,37 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_gateway_connection
-  name: az network express-route gateway connection
-  summary: Manage ExpressRoute gateway connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_gateway_connection_create
-- uid: az_network_express_route_gateway_connection_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_gateway_connection
+name: az network express-route gateway connection
+summary: Manage ExpressRoute gateway connections.
+description: ''
+directCommands:
+- uid: az_network_express-route_gateway_connection_create
   name: az network express-route gateway connection create
   summary: Create an ExpressRoute gateway connection.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route gateway connection create --resource-group
+                                                       [--subscription]
+  examples:
+  - summary: Create an ExpressRoute gateway connection.
+    syntax: az network express-route gateway connection create --gateway-name MyGateway -n MyExpressRouteConnection -g MyResourceGroup --peering /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/expressRouteCircuits/MyCircuit/peerings/AzurePrivatePeering --associated-route-table /MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 --propagated-route-tables /MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 /MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable2 --labels label1 label2
+  - summary: Create an ExpressRoute gateway connection. (autogenerated)
+    syntax: az network express-route gateway connection create --gateway-name MyGateway --name MyExpressRouteConnection --peering /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/expressRouteCircuits/MyCircuit/peerings/AzurePrivatePeering --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_gateway_connection_create
-  name: az network express-route gateway connection create
-  summary: Create an ExpressRoute gateway connection.
+- az_network_express-route_gateway_connection_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -47,10 +43,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute gateway connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute gateway connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering.yml
index 4d964d2c72..aaf392831d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering.yml
@@ -1,32 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_peering
-  name: az network express-route peering
-  summary: Manage ExpressRoute peering of an ExpressRoute circuit.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_peering_create
-  - az_network_express_route_peering_delete
-  - az_network_express_route_peering_list
-  - az_network_express_route_peering_show
-  - az_network_express_route_peering_update
-- uid: az_network_express_route_peering_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_peering
+name: az network express-route peering
+summary: Manage ExpressRoute peering of an ExpressRoute circuit.
+description: ''
+directCommands:
+- uid: az_network_express-route_peering_create
   name: az network express-route peering create
   summary: Create peering settings for an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering create --circuit-name
+                                            --peer-asn
+                                            --peering-type {AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+                                            --primary-peer-subnet
+                                            --resource-group
+                                            --secondary-peer-subnet
+                                            --vlan-id
+                                            [--advertised-public-prefixes]
+                                            [--customer-asn]
+                                            [--ip-version {IPv4, IPv6}]
+                                            [--legacy-mode]
+                                            [--route-filter]
+                                            [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                            [--shared-key]
+                                            [--subscription]
   examples:
   - summary: Create Microsoft Peering settings with IPv4 configuration.
-    syntax:
-      content: >-
-        az network express-route peering create -g MyResourceGroup --circuit-name MyCircuit \
-            --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
-            --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
-            --advertised-public-prefixes 101.0.0.0/30
-  parameters:
+    syntax: >-
+      az network express-route peering create -g MyResourceGroup --circuit-name MyCircuit \
+          --peering-type MicrosoftPeering --peer-asn 10002 --vlan-id 103 \
+          --primary-peer-subnet 101.0.0.0/30 --secondary-peer-subnet 102.0.0.0/30 \
+          --advertised-public-prefixes 101.0.0.0/30
+  - summary: Create Microsoft Peering settings with IPv6 configuration.
+    syntax: >-
+      az network express-route peering create -g MyResourceGroup --circuit-name MyCircuit \
+          --peering-type AzurePrivatePeering --peer-asn 10002 --vlan-id 103 --ip-version ipv6\
+          --primary-peer-subnet 2002:db00::/126 --secondary-peer-subnet 2003:db00::/126
+  - summary: Create peering settings for an ExpressRoute circuit. (autogenerated)
+    syntax: az network express-route peering create --circuit-name MyCircuit --peer-asn 10002 --peering-type AzurePublicPeering --primary-peer-subnet 101.0.0.0/30 --resource-group MyResourceGroup --secondary-peer-subnet 102.0.0.0/30 --shared-key Abc123 --vlan-id 103
+  requiredParameters:
   - isRequired: true
     name: --circuit-name
     summary: ExpressRoute circuit name.
@@ -42,29 +54,32 @@ items:
     description: ''
   - isRequired: true
     name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for primary interface.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for secondary interface.
     description: ''
   - isRequired: true
     name: --vlan-id
     summary: Identifier used to identify the customer.
     description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
-    description: ''
+  optionalParameters:
   - name: --advertised-public-prefixes
     summary: Space-separated list of prefixes to be advertised through the BGP peering.
     description: ''
   - name: --customer-asn
     summary: Autonomous system number of the customer.
     description: ''
+  - name: --ip-version
+    defaultValue: IPv4
+    parameterValueGroup: IPv4, IPv6
+    summary: The IP version to update Microsoft Peering settings for.
+    description: ''
   - name: --legacy-mode
     summary: Integer representing the legacy mode of the peering.
     description: ''
@@ -75,26 +90,57 @@ items:
     parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
     summary: Internet Routing Registry / Regional Internet Registry.
     description: ''
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_delete
   name: az network express-route peering delete
   summary: Delete peering settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering delete [--circuit-name]
+                                            [--ids]
+                                            [--name]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: Delete private peering.
-    syntax:
-      content: az network express-route peering delete -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
-  parameters:
+    syntax: az network express-route peering delete -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
+  optionalParameters:
+  - name: --circuit-name
+    summary: ExpressRoute circuit name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_get-stats
+  name: az network express-route peering get-stats
+  summary: Get all traffic stats of an ExpressRoute peering.
+  description: ''
+  syntax: >-
+    az network express-route peering get-stats [--circuit-name]
+                                               [--ids]
+                                               [--name]
+                                               [--resource-group]
+                                               [--subscription]
+  examples:
+  - summary: Get ExpressRoute Circuit Peering Traffic Stats
+    syntax: az network express-route peering get-stats --circuit-name MyCircuit --name MyPeering --resource-group MyResourceGroup
+  optionalParameters:
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
@@ -105,56 +151,56 @@ items:
     summary: The name of the peering.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_list
   name: az network express-route peering list
   summary: List peering settings of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering list --circuit-name
+                                          --resource-group
+                                          [--query-examples]
+                                          [--subscription]
   examples:
   - summary: List peering settings of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route peering list -g MyResourceGroup --circuit-name MyCircuit
-  parameters:
+    syntax: az network express-route peering list -g MyResourceGroup --circuit-name MyCircuit
+  requiredParameters:
   - isRequired: true
     name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_show
   name: az network express-route peering show
   summary: Get the details of an express route peering.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering show [--circuit-name]
+                                          [--ids]
+                                          [--name]
+                                          [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
   examples:
   - summary: Get private peering details of an ExpressRoute circuit.
-    syntax:
-      content: az network express-route peering show -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
-  parameters:
+    syntax: az network express-route peering show -g MyResourceGroup --circuit-name MyCircuit -n AzurePrivatePeering
+  optionalParameters:
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
@@ -164,61 +210,63 @@ items:
   - name: --name -n
     summary: The name of the peering.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_peering_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_peering_update
   name: az network express-route peering update
   summary: Update peering settings of an ExpressRoute circuit.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --peer-asn
-    summary: Autonomous system number of the customer/connectivity provider.
-    description: ''
-  - name: --primary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for primary interface.
-    description: ''
-  - name: --secondary-peer-subnet
-    summary: /30 subnet used to configure IP addresses for secondary interface.
-    description: ''
-  - name: --shared-key
-    summary: Key for generating an MD5 for the BGP session.
+  syntax: >-
+    az network express-route peering update [--add]
+                                            [--advertised-public-prefixes]
+                                            [--circuit-name]
+                                            [--customer-asn]
+                                            [--force-string]
+                                            [--ids]
+                                            [--ip-version {IPv4, IPv6}]
+                                            [--legacy-mode]
+                                            [--name]
+                                            [--peer-asn]
+                                            [--primary-peer-subnet]
+                                            [--remove]
+                                            [--resource-group]
+                                            [--route-filter]
+                                            [--routing-registry-name {AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC}]
+                                            [--secondary-peer-subnet]
+                                            [--set]
+                                            [--shared-key]
+                                            [--subscription]
+                                            [--vlan-id]
+  examples:
+  - summary: Update peering settings of an ExpressRoute circuit. (autogenerated)
+    syntax: az network express-route peering update --circuit-name MyCircuit --name MyPeering --peer-asn 10002 --primary-peer-subnet 2002:db00::/126 --resource-group MyResourceGroup --secondary-peer-subnet 2003:db00::/126 --shared-key Abc123 --vlan-id 103
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --vlan-id
-    summary: Identifier used to identify the customer.
+  - name: --advertised-public-prefixes
+    summary: Space-separated list of prefixes to be advertised through the BGP peering.
     description: ''
   - name: --circuit-name
     summary: ExpressRoute circuit name.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the peering.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --advertised-public-prefixes
-    summary: Space-separated list of prefixes to be advertised through the BGP peering.
-    description: ''
   - name: --customer-asn
     summary: Autonomous system number of the customer.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --ip-version
     defaultValue: IPv4
     parameterValueGroup: IPv4, IPv6
@@ -227,6 +275,21 @@ items:
   - name: --legacy-mode
     summary: Integer representing the legacy mode of the peering.
     description: ''
+  - name: --name -n
+    summary: The name of the peering.
+    description: ''
+  - name: --peer-asn
+    summary: Autonomous system number of the customer/connectivity provider.
+    description: ''
+  - name: --primary-peer-subnet
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for primary interface.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --route-filter
     summary: Name or ID of a route filter to apply to the peering settings.
     description: ''
@@ -234,46 +297,31 @@ items:
     parameterValueGroup: AFRINIC, ALTDB, APNIC, ARIN, LACNIC, LEVEL3, RADB, RIPENCC
     summary: Internet Routing Registry / Regional Internet Registry.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --secondary-peer-subnet
+    summary: /30(ipv4) or /126(ipv6) subnet used to configure IP addresses for secondary interface.
     description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --shared-key
+    summary: Key for generating an MD5 for the BGP session.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vlan-id
+    summary: Identifier used to identify the customer.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
-- uid: az_network_express_route_peering_create
-  name: az network express-route peering create
-  summary: Create peering settings for an ExpressRoute circuit.
-- uid: az_network_express_route_peering_delete
-  name: az network express-route peering delete
-  summary: Delete peering settings.
-- uid: az_network_express_route_peering_list
-  name: az network express-route peering list
-  summary: List peering settings of an ExpressRoute circuit.
-- uid: az_network_express_route_peering_show
-  name: az network express-route peering show
-  summary: Get the details of an express route peering.
-- uid: az_network_express_route_peering_update
-  name: az network express-route peering update
-  summary: Update peering settings of an ExpressRoute circuit.
+- az_network_express-route_peering_connection
+- az_network_express-route_peering_connection_create
+- az_network_express-route_peering_create
+- az_network_express-route_peering_delete
+- az_network_express-route_peering_get-stats
+- az_network_express-route_peering_list
+- az_network_express-route_peering_show
+- az_network_express-route_peering_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -289,10 +337,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute peering of an ExpressRoute circuit.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute peering of an ExpressRoute circuit.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering/connection.yml
index f66f98912c..d08520d45a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering/connection.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/peering/connection.yml
@@ -1,27 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_peering_connection
-  name: az network express-route peering connection
-  summary: Manage ExpressRoute circuit connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_peering_connection_create
-- uid: az_network_express_route_peering_connection_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_peering_connection
+name: az network express-route peering connection
+summary: Manage ExpressRoute circuit connections.
+description: ''
+directCommands:
+- uid: az_network_express-route_peering_connection_create
   name: az network express-route peering connection create
   summary: Create connections between two ExpressRoute circuits.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route peering connection create --address-prefix
+                                                       --circuit-name
+                                                       --name
+                                                       --peer-circuit
+                                                       --peering-name
+                                                       --resource-group
+                                                       [--authorization-key]
+                                                       [--subscription]
   examples:
   - summary: Create connection between two ExpressRoute circuits with AzurePrivatePeering settings.
-    syntax:
-      content: >-
-        az network express-route peering connection create -g MyResourceGroup --circuit-name \
-            MyCircuit --peering-name AzurePrivatePeering -n myConnection --peer-circuit \
-            MyOtherCircuit --address-prefix 104.0.0.0/29
-  parameters:
+    syntax: >-
+      az network express-route peering connection create -g MyResourceGroup --circuit-name \
+          MyCircuit --peering-name AzurePrivatePeering -n myConnection --peer-circuit \
+          MyOtherCircuit --address-prefix 104.0.0.0/29
+  requiredParameters:
   - isRequired: true
     name: --address-prefix
     summary: /29 IP address space to carve out customer addresses for tunnels.
@@ -44,24 +46,18 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --authorization-key
     summary: The authorization key used when the peer circuit is in another subscription.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_peering_connection_create
-  name: az network express-route peering connection create
-  summary: Create connections between two ExpressRoute circuits.
+- az_network_express-route_peering_connection_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -77,10 +73,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute circuit connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute circuit connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/port.yml b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/port.yml
index fe3d2dd084..33fe53c77a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/express-route/port.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/express-route/port.yml
@@ -1,70 +1,80 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_express_route_port
-  name: az network express-route port
-  summary: Manage ExpressRoute ports.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_express_route_port_create
-  - az_network_express_route_port_list
-- uid: az_network_express_route_port_create
+### YamlMime:AzureCLIGroup
+uid: az_network_express-route_port
+name: az network express-route port
+summary: Manage ExpressRoute ports.
+description: ''
+directCommands:
+- uid: az_network_express-route_port_create
   name: az network express-route port create
   summary: Create an ExpressRoute port.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network express-route port create --resource-group
+                                         [--location]
+                                         [--subscription]
+                                         [--tags]
   examples:
   - summary: Create an ExpressRoute port. (autogenerated)
-    syntax:
-      content: az network express-route port create --bandwidth 200 --encapsulation Dot1Q --location westus2 --name MyExpressRoutePort --peering-location westus --resource-group MyResourceGroup
-  parameters:
+    syntax: az network express-route port create --bandwidth 200 --encapsulation Dot1Q --location westus2 --name MyExpressRoutePort --peering-location westus --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_port_generate-loa
+  name: az network express-route port generate-loa
+  summary: Generate and download a letter of authorization for the requested ExpressRoutePort.
+  description: ''
+  syntax: >-
+    az network express-route port generate-loa --resource-group
+                                               [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_express_route_port_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_express-route_port_list
   name: az network express-route port list
   summary: List ExpressRoute ports.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network express-route port list [--query-examples]
+                                       [--resource-group]
+                                       [--subscription]
+  examples:
+  - summary: List ExpressRoute ports. (autogenerated)
+    syntax: az network express-route port list --resource-group myresourcegroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_express_route_port_create
-  name: az network express-route port create
-  summary: Create an ExpressRoute port.
-- uid: az_network_express_route_port_list
-  name: az network express-route port list
-  summary: List ExpressRoute ports.
+- az_network_express-route_port_create
+- az_network_express-route_port_generate-loa
+- az_network_express-route_port_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -80,10 +90,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage ExpressRoute ports.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage ExpressRoute ports.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall.yml
new file mode 100644
index 0000000000..05f126b664
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall.yml
@@ -0,0 +1,305 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall
+name: az network firewall
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewalls.
+description: ''
+directCommands:
+- uid: az_network_firewall_create
+  name: az network firewall create
+  summary: Create an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall create --name
+                               --resource-group
+                               [--allow-active-ftp {false, true}]
+                               [--count]
+                               [--dns-servers]
+                               [--enable-dns-proxy {false, true}]
+                               [--firewall-policy]
+                               [--location]
+                               [--private-ranges]
+                               [--sku {AZFW_Hub, AZFW_VNet}]
+                               [--tags]
+                               [--threat-intel-mode {Alert, Deny, Off}]
+                               [--tier {Premium, Standard}]
+                               [--vhub]
+                               [--zones {1, 2, 3}]
+  examples:
+  - summary: Create a Azure firewall with private ranges
+    syntax: az network firewall create -g MyResourceGroup -n MyFirewall --private-ranges 10.0.0.0 10.0.0.0/16 IANAPrivateRanges
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allow-active-ftp
+    parameterValueGroup: false, true
+    summary: Allow Active FTP. By default it is false. It's only allowed for azure firewall on virtual network.
+    description: ''
+  - name: --count --public-ip-count
+    summary: Number of Public IP Address associated with azure firewall. It's used to add public ip addresses into this firewall.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --firewall-policy --policy
+    summary: Name or ID of the firewallPolicy associated with this azure firewall.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --private-ranges
+    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
+    description: ''
+  - name: --sku
+    parameterValueGroup: AZFW_Hub, AZFW_VNet
+    summary: SKU of Azure firewall. This field cannot be updated after the creation. The default sku in server end is AZFW_VNet. If you want to attach azure firewall to vhub, you should set sku to AZFW_Hub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+  - name: --tier
+    defaultValue: Standard
+    parameterValueGroup: Premium, Standard
+    summary: Tier of an azure firewall. --tier will take effect only when --sku is set.
+    description: ''
+  - name: --vhub --virtual-hub
+    summary: Name or ID of the virtualHub to which the firewall belongs.
+    description: ''
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
+    description: ''
+- uid: az_network_firewall_delete
+  name: az network firewall delete
+  summary: Delete an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_list
+  name: az network firewall list
+  summary: List Azure Firewalls.
+  description: ''
+  syntax: az network firewall list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_list-fqdn-tags
+  name: az network firewall list-fqdn-tags
+  summary: Gets all the Azure Firewall FQDN Tags in a subscription.
+  description: 'keyword callable clsA custom type or function that will be passed the direct response :return: An iterator like instance of either AzureFirewallFqdnTagListResult or the result of cls(response) :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.network.v2020_07_01.models.AzureFirewallFqdnTagListResult] :raises: ~azure.core.exceptions.HttpResponseError.'
+  syntax: az network firewall list-fqdn-tags
+- uid: az_network_firewall_show
+  name: az network firewall show
+  summary: Get the details of an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall show --name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_update
+  name: az network firewall update
+  summary: Update an Azure Firewall.
+  description: ''
+  syntax: >-
+    az network firewall update --name
+                               --resource-group
+                               [--add]
+                               [--allow-active-ftp {false, true}]
+                               [--count]
+                               [--dns-servers]
+                               [--enable-dns-proxy {false, true}]
+                               [--firewall-policy]
+                               [--force-string]
+                               [--private-ranges]
+                               [--public-ips]
+                               [--remove]
+                               [--set]
+                               [--tags]
+                               [--threat-intel-mode {Alert, Deny, Off}]
+                               [--vhub]
+                               [--zones {1, 2, 3}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --allow-active-ftp
+    parameterValueGroup: false, true
+    summary: Allow Active FTP. By default it is false. It's only allowed for azure firewall on virtual network.
+    description: ''
+  - name: --count --public-ip-count
+    summary: Number of Public IP Address associated with azure firewall. It's used to add public ip addresses into this firewall.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --firewall-policy --policy
+    summary: Name or ID of the firewallPolicy associated with this azure firewall.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --private-ranges
+    summary: Space-separated list of SNAT private range. Validate values are single Ip, Ip prefixes or a single special value "IANAPrivateRanges".
+    description: ''
+  - name: --public-ips
+    summary: Space-separated list of Public IP addresses associated with azure firewall. It's used to delete public ip addresses from this firewall.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+  - name: --vhub --virtual-hub
+    summary: Name or ID of the virtualHub to which the firewall belongs.
+    description: ''
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
+    description: ''
+commands:
+- az_network_firewall_application-rule
+- az_network_firewall_application-rule_collection
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+- az_network_firewall_application-rule_create
+- az_network_firewall_application-rule_delete
+- az_network_firewall_application-rule_list
+- az_network_firewall_application-rule_show
+- az_network_firewall_create
+- az_network_firewall_delete
+- az_network_firewall_ip-config
+- az_network_firewall_ip-config_create
+- az_network_firewall_ip-config_delete
+- az_network_firewall_ip-config_list
+- az_network_firewall_ip-config_show
+- az_network_firewall_list
+- az_network_firewall_list-fqdn-tags
+- az_network_firewall_management-ip-config
+- az_network_firewall_management-ip-config_show
+- az_network_firewall_management-ip-config_update
+- az_network_firewall_nat-rule
+- az_network_firewall_nat-rule_collection
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+- az_network_firewall_nat-rule_create
+- az_network_firewall_nat-rule_delete
+- az_network_firewall_nat-rule_list
+- az_network_firewall_nat-rule_show
+- az_network_firewall_network-rule
+- az_network_firewall_network-rule_collection
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+- az_network_firewall_network-rule_create
+- az_network_firewall_network-rule_delete
+- az_network_firewall_network-rule_list
+- az_network_firewall_network-rule_show
+- az_network_firewall_policy
+- az_network_firewall_policy_create
+- az_network_firewall_policy_delete
+- az_network_firewall_policy_intrusion-detection
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+- az_network_firewall_policy_list
+- az_network_firewall_policy_rule-collection-group
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+- az_network_firewall_policy_show
+- az_network_firewall_policy_update
+- az_network_firewall_show
+- az_network_firewall_threat-intel-allowlist
+- az_network_firewall_threat-intel-allowlist_create
+- az_network_firewall_threat-intel-allowlist_delete
+- az_network_firewall_threat-intel-allowlist_show
+- az_network_firewall_threat-intel-allowlist_update
+- az_network_firewall_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewalls.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/application-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/application-rule.yml
new file mode 100644
index 0000000000..92fbf232b1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/application-rule.yml
@@ -0,0 +1,170 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_application-rule
+name: az network firewall application-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall application-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall application rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_application-rule_create
+  name: az network firewall application-rule create
+  summary: Create an Azure Firewall application rule.
+  description: ''
+  syntax: >-
+    az network firewall application-rule create --collection-name
+                                                --firewall-name
+                                                --name
+                                                --protocols
+                                                --resource-group
+                                                [--action {Allow, Deny}]
+                                                [--description]
+                                                [--fqdn-tags]
+                                                [--priority]
+                                                [--source-addresses]
+                                                [--source-ip-groups]
+                                                [--target-fqdns]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application rule.
+    description: ''
+  - isRequired: true
+    name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Deny
+    summary: The action to apply for the rule collection. Supply only if you want to create the collection.
+    description: ''
+  - name: --description
+    summary: Rule description.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule collection from 100 (high) to 65000 (low). Supply only if you want to create the collection.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of fully qualified domain names (FDQN).
+    description: ''
+- uid: az_network_firewall_application-rule_delete
+  name: az network firewall application-rule delete
+  summary: Delete an Azure Firewall application rule.
+  description: ''
+  syntax: >-
+    az network firewall application-rule delete --collection-name
+                                                --firewall-name
+                                                --name
+                                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_list
+  name: az network firewall application-rule list
+  summary: List Azure Firewall application rules.
+  description: ''
+  syntax: >-
+    az network firewall application-rule list --collection-name
+                                              --firewall-name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_show
+  name: az network firewall application-rule show
+  summary: Get the details of an Azure Firewall application rule.
+  description: ''
+  syntax: >-
+    az network firewall application-rule show --collection-name
+                                              --firewall-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_application-rule_collection
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+- az_network_firewall_application-rule_create
+- az_network_firewall_application-rule_delete
+- az_network_firewall_application-rule_list
+- az_network_firewall_application-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall application rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/application-rule/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/application-rule/collection.yml
new file mode 100644
index 0000000000..29177f48c5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/application-rule/collection.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_application-rule_collection
+name: az network firewall application-rule collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall application-rule collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall application rule collections.
+description: Collections are created as part of the `az network firewall application-rule create` command.
+directCommands:
+- uid: az_network_firewall_application-rule_collection_delete
+  name: az network firewall application-rule collection delete
+  summary: Delete an Azure Firewall application rule collection.
+  description: ''
+  syntax: >-
+    az network firewall application-rule collection delete --collection-name
+                                                           --firewall-name
+                                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_collection_list
+  name: az network firewall application-rule collection list
+  summary: List Azure Firewall application rule collections.
+  description: ''
+  syntax: >-
+    az network firewall application-rule collection list --firewall-name
+                                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_application-rule_collection_show
+  name: az network firewall application-rule collection show
+  summary: Get the details of an Azure Firewall application rule collection.
+  description: ''
+  syntax: >-
+    az network firewall application-rule collection show --collection-name
+                                                         --firewall-name
+                                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_application-rule_collection_delete
+- az_network_firewall_application-rule_collection_list
+- az_network_firewall_application-rule_collection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Collections are created as part of the `az network firewall application-rule create` command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/ip-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/ip-config.yml
new file mode 100644
index 0000000000..bf97b81624
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/ip-config.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_ip-config
+name: az network firewall ip-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall ip-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall IP configurations.
+description: ''
+directCommands:
+- uid: az_network_firewall_ip-config_create
+  name: az network firewall ip-config create
+  summary: Create an Azure Firewall IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall ip-config create --firewall-name
+                                         --name
+                                         --public-ip-address
+                                         --resource-group
+                                         [--m-name]
+                                         [--m-public-ip-address]
+                                         [--m-vnet-name]
+                                         [--vnet-name]
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IP configuration.
+    description: ''
+  - isRequired: true
+    name: --public-ip-address
+    summary: Name or ID of the public IP to use.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --m-name
+    summary: Name of the management IP configuration.
+    description: ''
+  - name: --m-public-ip-address
+    summary: Name or ID of the public IP to use for management ip configuation.
+    description: ''
+  - name: --m-vnet-name
+    summary: The virtual network (VNet) name for management ip configuation. It should contain one subnet called "AzureFirewallManagementSubnet".
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallSubnet".
+    description: ''
+- uid: az_network_firewall_ip-config_delete
+  name: az network firewall ip-config delete
+  summary: Delete an Azure Firewall IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall ip-config delete --firewall-name
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_ip-config_list
+  name: az network firewall ip-config list
+  summary: List Azure Firewall IP configurations.
+  description: ''
+  syntax: >-
+    az network firewall ip-config list --firewall-name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_ip-config_show
+  name: az network firewall ip-config show
+  summary: Get the details of an Azure Firewall IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall ip-config show --firewall-name
+                                       --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IP configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_ip-config_create
+- az_network_firewall_ip-config_delete
+- az_network_firewall_ip-config_list
+- az_network_firewall_ip-config_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall IP configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/management-ip-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/management-ip-config.yml
new file mode 100644
index 0000000000..0694e0f492
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/management-ip-config.yml
@@ -0,0 +1,87 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_management-ip-config
+name: az network firewall management-ip-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall management-ip-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall Management IP configurations.
+description: ''
+directCommands:
+- uid: az_network_firewall_management-ip-config_show
+  name: az network firewall management-ip-config show
+  summary: Get the details of an Azure Firewall Management IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall management-ip-config show --firewall-name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_management-ip-config_update
+  name: az network firewall management-ip-config update
+  summary: Update an Azure Firewall Management IP configuration.
+  description: ''
+  syntax: >-
+    az network firewall management-ip-config update --firewall-name
+                                                    --resource-group
+                                                    [--add]
+                                                    [--force-string]
+                                                    [--public-ip-address]
+                                                    [--remove]
+                                                    [--set]
+                                                    [--vnet-name]
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP to use.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name. It should contain one subnet called "AzureFirewallManagementSubnet".
+    description: ''
+commands:
+- az_network_firewall_management-ip-config_show
+- az_network_firewall_management-ip-config_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall Management IP configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/nat-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/nat-rule.yml
new file mode 100644
index 0000000000..f68dda9483
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/nat-rule.yml
@@ -0,0 +1,186 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_nat-rule
+name: az network firewall nat-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall nat-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall NAT rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_nat-rule_create
+  name: az network firewall nat-rule create
+  summary: Create an Azure Firewall NAT rule.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule create --collection-name
+                                        --dest-addr
+                                        --destination-ports
+                                        --firewall-name
+                                        --name
+                                        --protocols {Any, ICMP, TCP, UDP}
+                                        --resource-group
+                                        --translated-port
+                                        [--action {Dnat, Snat}]
+                                        [--description]
+                                        [--priority]
+                                        [--source-addresses]
+                                        [--source-ip-groups]
+                                        [--translated-address]
+                                        [--translated-fqdn]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
+    description: ''
+  - isRequired: true
+    name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
+    description: ''
+  - isRequired: true
+    name: --destination-ports
+    summary: Space-separated list of destination ports. Use '\*' to match all.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the NAT rule.
+    description: ''
+  - isRequired: true
+    name: --protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of protocols.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --translated-port
+    summary: Translated port for this NAT rule.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Dnat, Snat
+    summary: The action to apply for the rule collection. Supply only if you want to create the collection.
+    description: ''
+  - name: --description
+    summary: Rule description.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule collection from 100 (high) to 65000 (low). Supply only if you want to create the collection.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule.
+    description: ''
+  - name: --translated-fqdn
+    summary: Translated FQDN for this NAT rule.
+    description: ''
+- uid: az_network_firewall_nat-rule_delete
+  name: az network firewall nat-rule delete
+  summary: Delete an Azure Firewall NAT rule.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule delete --collection-name
+                                        --firewall-name
+                                        --name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the NAT rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_list
+  name: az network firewall nat-rule list
+  summary: List Azure Firewall NAT rules.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule list --collection-name
+                                      --firewall-name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_show
+  name: az network firewall nat-rule show
+  summary: Get the details of an Azure Firewall NAT rule.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule show --collection-name
+                                      --firewall-name
+                                      --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the NAT rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_nat-rule_collection
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+- az_network_firewall_nat-rule_create
+- az_network_firewall_nat-rule_delete
+- az_network_firewall_nat-rule_list
+- az_network_firewall_nat-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall NAT rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/nat-rule/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/nat-rule/collection.yml
new file mode 100644
index 0000000000..59ade1ea7f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/nat-rule/collection.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_nat-rule_collection
+name: az network firewall nat-rule collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall nat-rule collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall NAT rules.
+description: Collections are created as part of the `az network firewall nat-rule create` command.
+directCommands:
+- uid: az_network_firewall_nat-rule_collection_delete
+  name: az network firewall nat-rule collection delete
+  summary: Delete an Azure Firewall NAT rule collection.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule collection delete --collection-name
+                                                   --firewall-name
+                                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_collection_list
+  name: az network firewall nat-rule collection list
+  summary: List Azure Firewall NAT rule collections.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule collection list --firewall-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_nat-rule_collection_show
+  name: az network firewall nat-rule collection show
+  summary: Get the details of an Azure Firewall NAT rule collection.
+  description: ''
+  syntax: >-
+    az network firewall nat-rule collection show --collection-name
+                                                 --firewall-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_nat-rule_collection_delete
+- az_network_firewall_nat-rule_collection_list
+- az_network_firewall_nat-rule_collection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Collections are created as part of the `az network firewall nat-rule create` command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/network-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/network-rule.yml
new file mode 100644
index 0000000000..7790a66016
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/network-rule.yml
@@ -0,0 +1,180 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_network-rule
+name: az network firewall network-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall network-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall network rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_network-rule_create
+  name: az network firewall network-rule create
+  summary: Create an Azure Firewall network rule.
+  description: ''
+  syntax: >-
+    az network firewall network-rule create --collection-name
+                                            --destination-ports
+                                            --firewall-name
+                                            --name
+                                            --protocols {Any, ICMP, TCP, UDP}
+                                            --resource-group
+                                            [--action {Allow, Deny}]
+                                            [--description]
+                                            [--dest-addr]
+                                            [--destination-fqdns]
+                                            [--destination-ip-groups]
+                                            [--priority]
+                                            [--source-addresses]
+                                            [--source-ip-groups]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the collection to create the rule in. Will create the collection if it does not exist.
+    description: ''
+  - isRequired: true
+    name: --destination-ports
+    summary: Space-separated list of destination ports. Use '\*' to match all.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network rule.
+    description: ''
+  - isRequired: true
+    name: --protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of protocols.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Deny
+    summary: The action to apply for the rule collection. Supply only if you want to create the collection.
+    description: ''
+  - name: --description
+    summary: Rule description.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --destination-fqdns
+    summary: Space-separated list of destination FQDNs.
+    description: ''
+  - name: --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule collection from 100 (high) to 65000 (low). Supply only if you want to create the collection.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses. Use '\*' to match all.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+- uid: az_network_firewall_network-rule_delete
+  name: az network firewall network-rule delete
+  summary: Delete an Azure Firewall network rule. If you want to delete the last rule in a collection, please delete the collection instead.
+  description: ''
+  syntax: >-
+    az network firewall network-rule delete --collection-name
+                                            --firewall-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_list
+  name: az network firewall network-rule list
+  summary: List Azure Firewall network rules.
+  description: ''
+  syntax: >-
+    az network firewall network-rule list --collection-name
+                                          --firewall-name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_show
+  name: az network firewall network-rule show
+  summary: Get the details of an Azure Firewall network rule.
+  description: ''
+  syntax: >-
+    az network firewall network-rule show --collection-name
+                                          --firewall-name
+                                          --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the network rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_network-rule_collection
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+- az_network_firewall_network-rule_create
+- az_network_firewall_network-rule_delete
+- az_network_firewall_network-rule_list
+- az_network_firewall_network-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall network rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/network-rule/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/network-rule/collection.yml
new file mode 100644
index 0000000000..aa375de356
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/network-rule/collection.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_network-rule_collection
+name: az network firewall network-rule collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall network-rule collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall network rule collections.
+description: Collections are created as part of the `az network firewall network-rule create` command.
+directCommands:
+- uid: az_network_firewall_network-rule_collection_delete
+  name: az network firewall network-rule collection delete
+  summary: Delete an Azure Firewall network rule collection.
+  description: ''
+  syntax: >-
+    az network firewall network-rule collection delete --collection-name
+                                                       --firewall-name
+                                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_collection_list
+  name: az network firewall network-rule collection list
+  summary: List Azure Firewall network rule collections.
+  description: ''
+  syntax: >-
+    az network firewall network-rule collection list --firewall-name
+                                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_network-rule_collection_show
+  name: az network firewall network-rule collection show
+  summary: Get the details of an Azure Firewall network rule collection.
+  description: ''
+  syntax: >-
+    az network firewall network-rule collection show --collection-name
+                                                     --firewall-name
+                                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name -c
+    summary: Name of the rule collection.
+    description: ''
+  - isRequired: true
+    name: --firewall-name -f
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_network-rule_collection_delete
+- az_network_firewall_network-rule_collection_list
+- az_network_firewall_network-rule_collection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Collections are created as part of the `az network firewall network-rule create` command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy.yml
new file mode 100644
index 0000000000..ca551d4620
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy.yml
@@ -0,0 +1,252 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy
+name: az network firewall policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure firewall policy.
+description: ''
+directCommands:
+- uid: az_network_firewall_policy_create
+  name: az network firewall policy create
+  summary: Create an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy create --name
+                                      --resource-group
+                                      [--base-policy]
+                                      [--cert-name]
+                                      [--dns-servers]
+                                      [--enable-dns-proxy {false, true}]
+                                      [--fqdns]
+                                      [--identity]
+                                      [--idps-mode {Alert, Deny, Off}]
+                                      [--ip-addresses]
+                                      [--key-vault-secret-id]
+                                      [--location]
+                                      [--sku {Premium, Standard}]
+                                      [--tags]
+                                      [--threat-intel-mode {Alert, Deny, Off}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --base-policy
+    summary: The name or ID of parent firewall policy from which rules are inherited.
+    description: ''
+  - name: --cert-name
+    summary: Name of the CA certificate.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --identity
+    summary: Name or ID of the ManagedIdentity Resource.
+    description: ''
+  - name: --idps-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: IDPS mode.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+  - name: --key-vault-secret-id
+    summary: Secret Id of (base-64 encoded unencrypted pfx) Secret or Certificate object stored in KeyVault.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Premium, Standard
+    summary: SKU of Firewall policy.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+- uid: az_network_firewall_policy_delete
+  name: az network firewall policy delete
+  summary: Delete an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy delete --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_list
+  name: az network firewall policy list
+  summary: List all Azure firewall policies.
+  description: ''
+  syntax: az network firewall policy list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_show
+  name: az network firewall policy show
+  summary: Show an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy show --name
+                                    --resource-group
+                                    [--expand]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+- uid: az_network_firewall_policy_update
+  name: az network firewall policy update
+  summary: Update an Azure firewall policy.
+  description: ''
+  syntax: >-
+    az network firewall policy update --name
+                                      --resource-group
+                                      [--add]
+                                      [--cert-name]
+                                      [--dns-servers]
+                                      [--enable-dns-proxy {false, true}]
+                                      [--force-string]
+                                      [--fqdns]
+                                      [--identity]
+                                      [--idps-mode {Alert, Deny, Off}]
+                                      [--ip-addresses]
+                                      [--key-vault-secret-id]
+                                      [--remove]
+                                      [--set]
+                                      [--sku {Premium, Standard}]
+                                      [--tags]
+                                      [--threat-intel-mode {Alert, Deny, Off}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --cert-name
+    summary: Name of the CA certificate.
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --enable-dns-proxy
+    parameterValueGroup: false, true
+    summary: Enable DNS Proxy.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --identity
+    summary: Name or ID of the ManagedIdentity Resource.
+    description: ''
+  - name: --idps-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: IDPS mode.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+  - name: --key-vault-secret-id
+    summary: Secret Id of (base-64 encoded unencrypted pfx) Secret or Certificate object stored in KeyVault.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Premium, Standard
+    summary: SKU of Firewall policy.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --threat-intel-mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The operation mode for Threat Intelligence.
+    description: ''
+commands:
+- az_network_firewall_policy_create
+- az_network_firewall_policy_delete
+- az_network_firewall_policy_intrusion-detection
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+- az_network_firewall_policy_list
+- az_network_firewall_policy_rule-collection-group
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+- az_network_firewall_policy_show
+- az_network_firewall_policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure firewall policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/intrusion-detection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/intrusion-detection.yml
new file mode 100644
index 0000000000..44de901d7e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/intrusion-detection.yml
@@ -0,0 +1,131 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_intrusion-detection
+name: az network firewall policy intrusion-detection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy intrusion-detection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage intrusion signature rules and bypass rules.
+description: ''
+directCommands:
+- uid: az_network_firewall_policy_intrusion-detection_add
+  name: az network firewall policy intrusion-detection add
+  summary: Add overrided intrusion signature or a bypass rule for intrusion detection.
+  description: ''
+  syntax: >-
+    az network firewall policy intrusion-detection add --policy-name
+                                                       --resource-group
+                                                       [--mode {Alert, Deny, Off}]
+                                                       [--rule-description]
+                                                       [--rule-dest-addresses]
+                                                       [--rule-dest-ip-groups]
+                                                       [--rule-dest-ports]
+                                                       [--rule-name]
+                                                       [--rule-protocol {ANY, ICMP, TCP, UDP}]
+                                                       [--rule-src-addresses]
+                                                       [--rule-src-ip-groups]
+                                                       [--signature-id]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --mode
+    parameterValueGroup: Alert, Deny, Off
+    summary: The signature state.
+    description: ''
+  - name: --rule-description
+    summary: Description of the bypass traffic rule.
+    description: ''
+  - name: --rule-dest-addresses
+    summary: Space-separated list of destination IP addresses or ranges for this rule.
+    description: ''
+  - name: --rule-dest-ip-groups
+    summary: Space-separated list of destination IpGroups for this rule.
+    description: ''
+  - name: --rule-dest-ports
+    summary: Space-separated list of destination ports or ranges.
+    description: ''
+  - name: --rule-name
+    summary: Name of the bypass traffic rule.
+    description: ''
+  - name: --rule-protocol
+    parameterValueGroup: ANY, ICMP, TCP, UDP
+    summary: The rule bypass protocol.
+    description: ''
+  - name: --rule-src-addresses
+    summary: Space-separated list of source IP addresses or ranges for this rule.
+    description: ''
+  - name: --rule-src-ip-groups
+    summary: Space-separated list of source IpGroups for this rule.
+    description: ''
+  - name: --signature-id
+    summary: Signature id.
+    description: ''
+- uid: az_network_firewall_policy_intrusion-detection_list
+  name: az network firewall policy intrusion-detection list
+  summary: List all intrusion detection configuration.
+  description: ''
+  syntax: >-
+    az network firewall policy intrusion-detection list --policy-name
+                                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_intrusion-detection_remove
+  name: az network firewall policy intrusion-detection remove
+  summary: Remove overrided intrusion signature or a bypass rule.
+  description: ''
+  syntax: >-
+    az network firewall policy intrusion-detection remove --policy-name
+                                                          --resource-group
+                                                          [--rule-name]
+                                                          [--signature-id]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --rule-name
+    summary: Name of the bypass traffic rule.
+    description: ''
+  - name: --signature-id
+    summary: Signature id.
+    description: ''
+commands:
+- az_network_firewall_policy_intrusion-detection_add
+- az_network_firewall_policy_intrusion-detection_list
+- az_network_firewall_policy_intrusion-detection_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage intrusion signature rules and bypass rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group.yml
new file mode 100644
index 0000000000..74887e1bdc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group.yml
@@ -0,0 +1,172 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_rule-collection-group
+name: az network firewall policy rule-collection-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy rule-collection-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure firewall policy rule collection group.
+description: ''
+directCommands:
+- uid: az_network_firewall_policy_rule-collection-group_create
+  name: az network firewall policy rule-collection-group create
+  summary: Create an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group create --name
+                                                            --policy-name
+                                                            --priority
+                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --priority
+    summary: Priority of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_delete
+  name: az network firewall policy rule-collection-group delete
+  summary: Delete an Azure Firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group delete --name
+                                                            --policy-name
+                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_list
+  name: az network firewall policy rule-collection-group list
+  summary: List all Azure firewall policy rule collection groups.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group list --policy-name
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_show
+  name: az network firewall policy rule-collection-group show
+  summary: Show an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group show --name
+                                                          --policy-name
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_update
+  name: az network firewall policy rule-collection-group update
+  summary: Update an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group update --name
+                                                            --policy-name
+                                                            --resource-group
+                                                            [--add]
+                                                            [--force-string]
+                                                            [--priority]
+                                                            [--remove]
+                                                            [--set]
+                                                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --priority
+    summary: Priority of the Firewall Policy Rule Collection Group.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_network_firewall_policy_rule-collection-group_collection
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+- az_network_firewall_policy_rule-collection-group_create
+- az_network_firewall_policy_rule-collection-group_delete
+- az_network_firewall_policy_rule-collection-group_list
+- az_network_firewall_policy_rule-collection-group_show
+- az_network_firewall_policy_rule-collection-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure firewall policy rule collection group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection.yml
new file mode 100644
index 0000000000..e6c512936d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection.yml
@@ -0,0 +1,275 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_rule-collection-group_collection
+name: az network firewall policy rule-collection-group collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy rule-collection-group collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure firewall policy rule collections in the rule collection group.
+description: >-
+  Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are three kinds of rules which are application rule, network rule and nat rule.
+
+  NAT collection support having a list of nat rule. Filter collection support including a list of rules(network rule or application rule) in it. But all of rules should be the same type.
+directCommands:
+- uid: az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+  name: az network firewall policy rule-collection-group collection add-filter-collection
+  summary: Add a filter collection into an Azure firewall policy rule collection group.
+  description: Common Rule Arguments are used for both Network rule and Application rule. If you want to add more rules into filter collection, please use "az network policy rule-collection-group collection rule add/remove".
+  syntax: >-
+    az network firewall policy rule-collection-group collection add-filter-collection --collection-priority
+                                                                                      --name
+                                                                                      --policy-name
+                                                                                      --rcg-name
+                                                                                      --resource-group
+                                                                                      [--action {Allow, Deny}]
+                                                                                      [--description]
+                                                                                      [--dest-addr]
+                                                                                      [--dest-ipg]
+                                                                                      [--destination-ports]
+                                                                                      [--enable-tls-insp {false, true}]
+                                                                                      [--fqdn-tags]
+                                                                                      [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                                      [--protocols]
+                                                                                      [--rule-name]
+                                                                                      [--rule-type {ApplicationRule, NatRule, NetworkRule}]
+                                                                                      [--source-addresses]
+                                                                                      [--source-ip-groups]
+                                                                                      [--target-fqdns]
+                                                                                      [--target-urls]
+                                                                                      [--web-categories]
+  examples:
+  - summary: Add a filter collection with Network rule into the rule collection group
+    syntax: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name network_rule --rule-type NetworkRule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --destination-ports 12003 12004 --ip-protocols TCP UDP --collection-priority 11002
+  - summary: Add a filter collection with Application rule into the rule collection group
+    syntax: az network firewall policy rule-collection-group collection add-filter-collection -g {rg} --policy-name {policy} --rule-collection-group-name {collectiongroup} --name filter_collection --action Allow --rule-name application_rule --rule-type ApplicationRule --description "test" --destination-addresses "202.120.36.15" "202.120.36.16" --source-addresses "202.120.36.13" "202.120.36.14" --protocols Http=12800 Https=12801 --fqdn-tags AzureBackup HDInsight --collection-priority 11100
+  requiredParameters:
+  - isRequired: true
+    name: --collection-priority
+    summary: The priority of the rule in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Deny
+    summary: The action type of a rule collection.
+    description: ''
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --dest-ipg --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --enable-tls-insp --enable-tls-inspection
+    parameterValueGroup: false, true
+    summary: Enable flag to terminate TLS connection for this rule.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags for this rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - name: --rule-name
+    summary: The name of rule.
+    description: ''
+  - name: --rule-type
+    parameterValueGroup: ApplicationRule, NatRule, NetworkRule
+    summary: The type of rule.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of FQDNs for this rule.
+    description: ''
+  - name: --target-urls
+    summary: Space-separated list of target urls for this rule.
+    description: ''
+  - name: --web-categories
+    summary: Space-separated list of web categories for this rule.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+  name: az network firewall policy rule-collection-group collection add-nat-collection
+  summary: Add a NAT collection into an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group collection add-nat-collection --collection-priority
+                                                                                   --name
+                                                                                   --policy-name
+                                                                                   --rcg-name
+                                                                                   --resource-group
+                                                                                   [--action {DNAT, SNAT}]
+                                                                                   [--description]
+                                                                                   [--dest-addr]
+                                                                                   [--destination-ports]
+                                                                                   [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                                   [--rule-name]
+                                                                                   [--source-addresses]
+                                                                                   [--source-ip-groups]
+                                                                                   [--translated-address]
+                                                                                   [--translated-fqdn]
+                                                                                   [--translated-port]
+  examples:
+  - summary: Add a NAT collection into the rule collection group
+    syntax: az network firewall policy rule-collection-group collection add-nat-collection -n nat_collection --collection-priority 10003 --policy-name {policy} -g {rg} --rule-collection-group-name {collectiongroup} --action DNAT --rule-name network_rule --description "test" --destination-addresses "202.120.36.15" --source-addresses "202.120.36.13" "202.120.36.14" --translated-address 128.1.1.1 --translated-port 1234 --destination-ports 12000 12001 --ip-protocols TCP UDP
+  requiredParameters:
+  - isRequired: true
+    name: --collection-priority
+    summary: The priority of the rule in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: DNAT, SNAT
+    summary: The action type of a rule collection.
+    description: ''
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --rule-name
+    summary: The name of rule.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule collection.
+    description: ''
+  - name: --translated-fqdn
+    summary: Translated FQDN for this NAT rule collection.
+    description: ''
+  - name: --translated-port
+    summary: Translated port for this NAT rule collection.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_list
+  name: az network firewall policy rule-collection-group collection list
+  summary: List all rule collections of an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group collection list --policy-name
+                                                                     --rcg-name
+                                                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_remove
+  name: az network firewall policy rule-collection-group collection remove
+  summary: Remove a rule collection from an Azure firewall policy rule collection group.
+  description: ''
+  syntax: >-
+    az network firewall policy rule-collection-group collection remove --name
+                                                                       --policy-name
+                                                                       --rcg-name
+                                                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_firewall_policy_rule-collection-group_collection_add-filter-collection
+- az_network_firewall_policy_rule-collection-group_collection_add-nat-collection
+- az_network_firewall_policy_rule-collection-group_collection_list
+- az_network_firewall_policy_rule-collection-group_collection_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Currently, Azure Firewall policy support two kinds of rule collections which are Filter collection and NAT collection. There are three kinds of rules which are application rule, network rule and nat rule.
+
+    NAT collection support having a list of nat rule. Filter collection support including a list of rules(network rule or application rule) in it. But all of rules should be the same type.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection/rule.yml
new file mode 100644
index 0000000000..39216bb787
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/policy/rule-collection-group/collection/rule.yml
@@ -0,0 +1,290 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_policy_rule-collection-group_collection_rule
+name: az network firewall policy rule-collection-group collection rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall policy rule-collection-group collection rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure the rule of a filter collection in the rule collection group of Azure firewall policy.
+description: >-
+  Filter collection supports having a list of network rules or application rules.
+
+  NatRule collection supports including a list of nat rules.
+directCommands:
+- uid: az_network_firewall_policy_rule-collection-group_collection_rule_add
+  name: az network firewall policy rule-collection-group collection rule add
+  summary: Add a rule into an Azure firewall policy rule collection.
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
+  syntax: >-
+    az network firewall policy rule-collection-group collection rule add --collection-name
+                                                                         --name
+                                                                         --policy-name
+                                                                         --rcg-name
+                                                                         --resource-group
+                                                                         --rule-type {ApplicationRule, NatRule, NetworkRule}
+                                                                         [--description]
+                                                                         [--dest-addr]
+                                                                         [--dest-ipg]
+                                                                         [--destination-ports]
+                                                                         [--enable-tls-insp {false, true}]
+                                                                         [--fqdn-tags]
+                                                                         [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                         [--protocols]
+                                                                         [--source-addresses]
+                                                                         [--source-ip-groups]
+                                                                         [--target-fqdns]
+                                                                         [--target-urls]
+                                                                         [--translated-address]
+                                                                         [--translated-port]
+                                                                         [--web-categories]
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name
+    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-type
+    parameterValueGroup: ApplicationRule, NatRule, NetworkRule
+    summary: The type of rule.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --dest-ipg --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --enable-tls-insp --enable-tls-inspection
+    parameterValueGroup: false, true
+    summary: Enable flag to terminate TLS connection for this rule.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags for this rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of FQDNs for this rule.
+    description: ''
+  - name: --target-urls
+    summary: Space-separated list of target urls for this rule.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule collection.
+    description: ''
+  - name: --translated-port
+    summary: Translated port for this NAT rule collection.
+    description: ''
+  - name: --web-categories
+    summary: Space-separated list of web categories for this rule.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_rule_remove
+  name: az network firewall policy rule-collection-group collection rule remove
+  summary: Remove a rule from an Azure firewall policy rule collection.
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
+  syntax: >-
+    az network firewall policy rule-collection-group collection rule remove --collection-name
+                                                                            --name
+                                                                            --policy-name
+                                                                            --rcg-name
+                                                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name
+    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_policy_rule-collection-group_collection_rule_update
+  name: az network firewall policy rule-collection-group collection rule update
+  summary: Update a rule of an Azure firewall policy rule collection.
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
+  syntax: >-
+    az network firewall policy rule-collection-group collection rule update --collection-name
+                                                                            --name
+                                                                            --policy-name
+                                                                            --rcg-name
+                                                                            --resource-group
+                                                                            [--add]
+                                                                            [--description]
+                                                                            [--dest-addr]
+                                                                            [--dest-ipg]
+                                                                            [--destination-ports]
+                                                                            [--enable-tls-insp {false, true}]
+                                                                            [--force-string]
+                                                                            [--fqdn-tags]
+                                                                            [--ip-protocols {Any, ICMP, TCP, UDP}]
+                                                                            [--protocols]
+                                                                            [--remove]
+                                                                            [--set]
+                                                                            [--source-addresses]
+                                                                            [--source-ip-groups]
+                                                                            [--target-fqdns]
+                                                                            [--target-urls]
+                                                                            [--translated-address]
+                                                                            [--translated-port]
+                                                                            [--web-categories]
+  examples:
+  - summary: Update a rule of an Azure firewall policy rule collection.
+    syntax: az network firewall policy rule-collection-group collection rule update -g {rg} --policy-name {policy} --rule-collection-group-name {rcg} --collection-name {cn} -n {rule_name} --target-fqdns XXX
+  requiredParameters:
+  - isRequired: true
+    name: --collection-name
+    summary: The name of the rule collection in Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: The name of the Firewall Policy.
+    description: ''
+  - isRequired: true
+    name: --rcg-name --rule-collection-group-name
+    summary: The name of the Firewall Policy Rule Collection Group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --description
+    summary: The description of rule.
+    description: ''
+  - name: --dest-addr --destination-addresses
+    summary: Space-separated list of destination IP addresses.
+    description: ''
+  - name: --dest-ipg --destination-ip-groups
+    summary: Space-separated list of name or resource id of destination IpGroups.
+    description: ''
+  - name: --destination-ports
+    summary: Space-separated list of destination ports. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --enable-tls-insp --enable-tls-inspection
+    parameterValueGroup: false, true
+    summary: Enable flag to terminate TLS connection for this rule.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fqdn-tags
+    summary: Space-separated list of FQDN tags for this rule.
+    description: ''
+  - name: --ip-protocols
+    parameterValueGroup: Any, ICMP, TCP, UDP
+    summary: Space-separated list of IP protocols. This argument is supported for Nat and Network Rule.
+    description: ''
+  - name: --protocols
+    summary: Space-separated list of protocols and port numbers to use, in PROTOCOL=PORT format. Valid protocols are Http, Https.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --source-addresses
+    summary: Space-separated list of source IP addresses.
+    description: ''
+  - name: --source-ip-groups
+    summary: Space-separated list of name or resource id of source IpGroups.
+    description: ''
+  - name: --target-fqdns
+    summary: Space-separated list of FQDNs for this rule.
+    description: ''
+  - name: --target-urls
+    summary: Space-separated list of target urls for this rule.
+    description: ''
+  - name: --translated-address
+    summary: Translated address for this NAT rule collection.
+    description: ''
+  - name: --translated-port
+    summary: Translated port for this NAT rule collection.
+    description: ''
+  - name: --web-categories
+    summary: Space-separated list of web categories for this rule.
+    description: ''
+commands:
+- az_network_firewall_policy_rule-collection-group_collection_rule_add
+- az_network_firewall_policy_rule-collection-group_collection_rule_remove
+- az_network_firewall_policy_rule-collection-group_collection_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: >-
+    Filter collection supports having a list of network rules or application rules.
+
+    NatRule collection supports including a list of nat rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/firewall/threat-intel-allowlist.yml b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/threat-intel-allowlist.yml
new file mode 100644
index 0000000000..fd99421e64
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/firewall/threat-intel-allowlist.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_firewall_threat-intel-allowlist
+name: az network firewall threat-intel-allowlist
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-firewall** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az network firewall threat-intel-allowlist** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage and configure Azure Firewall Threat Intelligence Allow List.
+description: ''
+directCommands:
+- uid: az_network_firewall_threat-intel-allowlist_create
+  name: az network firewall threat-intel-allowlist create
+  summary: Create an Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist create --name
+                                                      --resource-group
+                                                      [--fqdns]
+                                                      [--ip-addresses]
+  examples:
+  - summary: Create a threat intelligence allow list
+    syntax: az network firewall threat-intel-allowlist create -g MyResourceGroup -n MyFirewall --ip-addresses 10.0.0.0 10.0.0.1 --fqdns *.microsoft.com www.bing.com *google.com
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+- uid: az_network_firewall_threat-intel-allowlist_delete
+  name: az network firewall threat-intel-allowlist delete
+  summary: Delete an Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist delete --name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_threat-intel-allowlist_show
+  name: az network firewall threat-intel-allowlist show
+  summary: Get the details of an Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist show --name
+                                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_firewall_threat-intel-allowlist_update
+  name: az network firewall threat-intel-allowlist update
+  summary: Update Azure Firewall Threat Intelligence Allow List.
+  description: ''
+  syntax: >-
+    az network firewall threat-intel-allowlist update --name
+                                                      --resource-group
+                                                      [--add]
+                                                      [--force-string]
+                                                      [--fqdns]
+                                                      [--ip-addresses]
+                                                      [--remove]
+                                                      [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Azure Firewall name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fqdns
+    summary: Space-separated list of FQDNs.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IPv4 addresses.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_network_firewall_threat-intel-allowlist_create
+- az_network_firewall_threat-intel-allowlist_delete
+- az_network_firewall_threat-intel-allowlist_show
+- az_network_firewall_threat-intel-allowlist_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage and configure Azure Firewall Threat Intelligence Allow List.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door.yml
new file mode 100644
index 0000000000..83247c1ac7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door.yml
@@ -0,0 +1,417 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door
+name: az network front-door
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Doors.
+description: ''
+directCommands:
+- uid: az_network_front-door_check-custom-domain
+  name: az network front-door check-custom-domain
+  summary: Validates the custom domain mapping to ensure it maps to the correct Front Door endpoint in DNS.
+  description: ''
+  syntax: >-
+    az network front-door check-custom-domain --host-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --host-name
+    summary: Required. The host name of the custom domain. Must be a domain name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_check-name-availability
+  name: az network front-door check-name-availability
+  summary: Check the availability of a Front Door resource name.
+  description: ''
+  syntax: >-
+    az network front-door check-name-availability --name
+                                                  --resource-type {Microsoft.Network/frontDoors, Microsoft.Network/frontDoors/frontendEndpoints}
+  examples:
+  - summary: Check the availability of a Front Door resource name.
+    syntax: az network front-door check-name-availability --name frontdoor1 --resource-type Microsoft.Network/frontDoors
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The resource name to be validated.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    parameterValueGroup: Microsoft.Network/frontDoors, Microsoft.Network/frontDoors/frontendEndpoints
+    summary: The type of the resource whose name is to be validated.
+    description: ''
+- uid: az_network_front-door_create
+  name: az network front-door create
+  summary: Create a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door create --backend-address
+                                 --name
+                                 --resource-group
+                                 [--accepted-protocols]
+                                 [--backend-host-header]
+                                 [--disabled {false, true}]
+                                 [--enforce-certificate-name-check {Disabled, Enabled}]
+                                 [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                 [--friendly-name]
+                                 [--frontend-host-name]
+                                 [--interval]
+                                 [--no-wait]
+                                 [--path]
+                                 [--patterns]
+                                 [--probeMethod {GET, HEAD}]
+                                 [--protocol {Http, Https}]
+                                 [--send-recv-timeout]
+                                 [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --backend-address
+    summary: FQDN of the backend endpoint.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accepted-protocols
+    summary: 'Space-separated list of protocols to accept. Default: Http.'
+    description: ''
+  - name: --backend-host-header
+    summary: Host header sent to the backend.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --enforce-certificate-name-check
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
+    description: ''
+  - name: --forwarding-protocol
+    defaultValue: MatchRequest
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of the Front Door.
+    description: ''
+  - name: --frontend-host-name
+    summary: Domain name of the frontend endpoint.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Interval in seconds between probes.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --path
+    defaultValue: /
+    summary: Path to probe.
+    description: ''
+  - name: --patterns
+    summary: "Space-separated list of patterns to match. Default: '/\\*'."
+    description: ''
+  - name: --probeMethod
+    defaultValue: HEAD
+    parameterValueGroup: GET, HEAD
+    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
+    description: ''
+  - name: --protocol
+    defaultValue: Https
+    parameterValueGroup: Http, Https
+    summary: Protocol to use for sending probes.
+    description: ''
+  - name: --send-recv-timeout
+    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_front-door_delete
+  name: az network front-door delete
+  summary: Delete a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door delete --name
+                                 --resource-group
+                                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_front-door_list
+  name: az network front-door list
+  summary: List Front Doors.
+  description: ''
+  syntax: az network front-door list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_purge-endpoint
+  name: az network front-door purge-endpoint
+  summary: Removes a content from Front Door.
+  description: ''
+  syntax: >-
+    az network front-door purge-endpoint --content-paths
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --content-paths
+    summary: The path to the content to be purged. Can describe a file path or a wildcard directory.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_show
+  name: az network front-door show
+  summary: Get the details of a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door show --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_update
+  name: az network front-door update
+  summary: Update settings of a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door update --name
+                                 --resource-group
+                                 [--add]
+                                 [--enforce-certificate-name-check {Disabled, Enabled}]
+                                 [--force-string]
+                                 [--remove]
+                                 [--send-recv-timeout]
+                                 [--set]
+                                 [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --enforce-certificate-name-check
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to disable certificate name check on HTTPS requests to all backend pools. No effect on non-HTTPS requests.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --send-recv-timeout
+    summary: Send and receive timeout in seconds on forwarding request to the backend. When timeout is reached, the request fails and returns.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_front-door_wait
+  name: az network front-door wait
+  summary: Place the CLI in a waiting state until a condition of the Front Door is met.
+  description: ''
+  syntax: >-
+    az network front-door wait --name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Wait until a front door is created.
+    syntax: az network front-door wait -g MyResourceGroup --name frontdoor1 --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_front-door_backend-pool
+- az_network_front-door_backend-pool_backend
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+- az_network_front-door_backend-pool_create
+- az_network_front-door_backend-pool_delete
+- az_network_front-door_backend-pool_list
+- az_network_front-door_backend-pool_show
+- az_network_front-door_check-custom-domain
+- az_network_front-door_check-name-availability
+- az_network_front-door_create
+- az_network_front-door_delete
+- az_network_front-door_frontend-endpoint
+- az_network_front-door_frontend-endpoint_create
+- az_network_front-door_frontend-endpoint_delete
+- az_network_front-door_frontend-endpoint_disable-https
+- az_network_front-door_frontend-endpoint_enable-https
+- az_network_front-door_frontend-endpoint_list
+- az_network_front-door_frontend-endpoint_show
+- az_network_front-door_frontend-endpoint_wait
+- az_network_front-door_list
+- az_network_front-door_load-balancing
+- az_network_front-door_load-balancing_create
+- az_network_front-door_load-balancing_delete
+- az_network_front-door_load-balancing_list
+- az_network_front-door_load-balancing_show
+- az_network_front-door_load-balancing_update
+- az_network_front-door_probe
+- az_network_front-door_probe_create
+- az_network_front-door_probe_delete
+- az_network_front-door_probe_list
+- az_network_front-door_probe_show
+- az_network_front-door_probe_update
+- az_network_front-door_purge-endpoint
+- az_network_front-door_routing-rule
+- az_network_front-door_routing-rule_create
+- az_network_front-door_routing-rule_delete
+- az_network_front-door_routing-rule_list
+- az_network_front-door_routing-rule_show
+- az_network_front-door_routing-rule_update
+- az_network_front-door_rules-engine
+- az_network_front-door_rules-engine_delete
+- az_network_front-door_rules-engine_list
+- az_network_front-door_rules-engine_rule
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+- az_network_front-door_rules-engine_show
+- az_network_front-door_show
+- az_network_front-door_update
+- az_network_front-door_waf-policy
+- az_network_front-door_waf-policy_create
+- az_network_front-door_waf-policy_delete
+- az_network_front-door_waf-policy_list
+- az_network_front-door_waf-policy_managed-rule-definition
+- az_network_front-door_waf-policy_managed-rule-definition_list
+- az_network_front-door_waf-policy_managed-rules
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+- az_network_front-door_waf-policy_rule
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+- az_network_front-door_waf-policy_show
+- az_network_front-door_waf-policy_update
+- az_network_front-door_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Doors.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/backend-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/backend-pool.yml
new file mode 100644
index 0000000000..8caef02025
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/backend-pool.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_backend-pool
+name: az network front-door backend-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door backend-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door backend pools.
+description: ''
+directCommands:
+- uid: az_network_front-door_backend-pool_create
+  name: az network front-door backend-pool create
+  summary: Create a Front Door backend pool.
+  description: Since a backend pool must contain a backend, this command also creates the first backend. To add additional backends, use the `az network front-door backend-pool backend add` command.
+  syntax: >-
+    az network front-door backend-pool create --address
+                                              --front-door-name
+                                              --load-balancing
+                                              --name
+                                              --probe
+                                              --resource-group
+                                              [--backend-host-header]
+                                              [--disabled {false, true}]
+                                              [--http-port]
+                                              [--https-port]
+                                              [--priority]
+                                              [--weight]
+  requiredParameters:
+  - isRequired: true
+    name: --address
+    summary: FQDN of the backend endpoint.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --load-balancing
+    summary: Name or ID of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --probe
+    summary: Name or ID of the probe settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-host-header
+    summary: Host header sent to the backend.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --http-port
+    defaultValue: "80"
+    summary: HTTP TCP port number.
+    description: ''
+  - name: --https-port
+    defaultValue: "443"
+    summary: HTTPS TCP port number.
+    description: ''
+  - name: --priority
+    defaultValue: "1"
+    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
+    description: ''
+  - name: --weight
+    defaultValue: "50"
+    summary: Weight of this endpoint for load balancing purposes.
+    description: ''
+- uid: az_network_front-door_backend-pool_delete
+  name: az network front-door backend-pool delete
+  summary: Delete a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool delete --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_backend-pool_list
+  name: az network front-door backend-pool list
+  summary: List Front Door backend pools.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool list --front-door-name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_backend-pool_show
+  name: az network front-door backend-pool show
+  summary: Get the details of a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool show --front-door-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_backend-pool_backend
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+- az_network_front-door_backend-pool_create
+- az_network_front-door_backend-pool_delete
+- az_network_front-door_backend-pool_list
+- az_network_front-door_backend-pool_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door backend pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/backend-pool/backend.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/backend-pool/backend.yml
new file mode 100644
index 0000000000..1e533acda0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/backend-pool/backend.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_backend-pool_backend
+name: az network front-door backend-pool backend
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door backend-pool backend** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage backends of Front Door backend pools.
+description: ''
+directCommands:
+- uid: az_network_front-door_backend-pool_backend_add
+  name: az network front-door backend-pool backend add
+  summary: Add a backend to a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool backend add --address
+                                                   --front-door-name
+                                                   --pool-name
+                                                   --resource-group
+                                                   [--backend-host-header]
+                                                   [--disabled {false, true}]
+                                                   [--http-port]
+                                                   [--https-port]
+                                                   [--priority]
+                                                   [--private-link-alias]
+                                                   [--private-link-approval-message]
+                                                   [--private-link-location]
+                                                   [--private-link-resource-id]
+                                                   [--weight]
+  requiredParameters:
+  - isRequired: true
+    name: --address
+    summary: FQDN of the backend endpoint.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backend-host-header
+    summary: Host header sent to the backend.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --http-port
+    defaultValue: "80"
+    summary: HTTP TCP port number.
+    description: ''
+  - name: --https-port
+    defaultValue: "443"
+    summary: HTTPS TCP port number.
+    description: ''
+  - name: --priority
+    defaultValue: "1"
+    summary: Priority to use for load balancing. Higher priorities will not be used for load balancing if any lower priority backend is healthy.
+    description: ''
+  - name: --private-link-alias
+    summary: The Alias of the Private Link resource. Populating this optional field indicates that this backend is 'Private'.
+    description: ''
+  - name: --private-link-approval-message
+    summary: A custom message to be included in the approval request to connect to the Private Link.
+    description: ''
+  - name: --private-link-location
+    summary: The location of the Private Link resource. Required only if 'privateLinkResourceId' is populated.
+    description: ''
+  - name: --private-link-resource-id
+    summary: The Resource Id of the Private Link. Populating this optional field indicates that this backend is 'Private'.
+    description: ''
+  - name: --weight
+    defaultValue: "50"
+    summary: Weight of this endpoint for load balancing purposes.
+    description: ''
+- uid: az_network_front-door_backend-pool_backend_list
+  name: az network front-door backend-pool backend list
+  summary: List backends of a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool backend list --front-door-name
+                                                    --pool-name
+                                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_backend-pool_backend_remove
+  name: az network front-door backend-pool backend remove
+  summary: Remove a backend from a Front Door backend pool.
+  description: ''
+  syntax: >-
+    az network front-door backend-pool backend remove --front-door-name
+                                                      --index
+                                                      --pool-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: Index of the backend to remove (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: Name of the backend pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_backend-pool_backend_add
+- az_network_front-door_backend-pool_backend_list
+- az_network_front-door_backend-pool_backend_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage backends of Front Door backend pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/frontend-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/frontend-endpoint.yml
new file mode 100644
index 0000000000..82513715a9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/frontend-endpoint.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_frontend-endpoint
+name: az network front-door frontend-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door frontend-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door frontend endpoints.
+description: ''
+directCommands:
+- uid: az_network_front-door_frontend-endpoint_create
+  name: az network front-door frontend-endpoint create
+  summary: Create a Front Door frontend endpoint.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint create --front-door-name
+                                                   --host-name
+                                                   --name
+                                                   --resource-group
+                                                   [--session-affinity-enabled {Disabled, Enabled}]
+                                                   [--session-affinity-ttl]
+                                                   [--waf-policy]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --host-name
+    summary: Domain name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --session-affinity-enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to allow session affinity on this host.
+    description: ''
+  - name: --session-affinity-ttl
+    summary: The TTL to use in seconds for session affinity.
+    description: ''
+  - name: --waf-policy
+    summary: Name or ID of a web application firewall policy.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_delete
+  name: az network front-door frontend-endpoint delete
+  summary: Delete a Front Door frontend endpoint.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint delete --front-door-name
+                                                   --name
+                                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_disable-https
+  name: az network front-door frontend-endpoint disable-https
+  summary: Disable HTTPS protocol for a custom domain.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint disable-https --front-door-name
+                                                          --name
+                                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_enable-https
+  name: az network front-door frontend-endpoint enable-https
+  summary: Enable HTTPS protocol for a custom domain.
+  description: HTTPS protocol for a custom domain can be enabled using Front Door managed certificate or using your own certificate in Azure Key Vault. For Azure Key Vault, right permissions need to be set for Front Door to access the Key vault. Learn more at https://aka.ms/FrontDoorCustomDomain.
+  syntax: >-
+    az network front-door frontend-endpoint enable-https --front-door-name
+                                                         --name
+                                                         --resource-group
+                                                         [--certificate-source {AzureKeyVault, FrontDoor}]
+                                                         [--minimum-tls-version {1.0, 1.2}]
+                                                         [--secret-name]
+                                                         [--secret-version]
+                                                         [--vault-id]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --certificate-source
+    defaultValue: FrontDoor
+    parameterValueGroup: AzureKeyVault, FrontDoor
+    summary: Certificate source to enable HTTPS.
+    description: ''
+  - name: --minimum-tls-version
+    defaultValue: "1.2"
+    parameterValueGroup: 1.0, 1.2
+    summary: The minimum TLS version required from the clients to establish an SSL handshake with Front Door.
+    description: ''
+  - name: --secret-name
+    summary: The name of the Key Vault secret representing the full certificate PFX.
+    description: ''
+  - name: --secret-version
+    summary: The version of the Key Vault secret representing the full certificate PFX, the "Latest" version will always be used if not specified and your certificate will be auto-rotated when a new version of secret generated.
+    description: ''
+  - name: --vault-id
+    summary: The resource id of the Key Vault containing the SSL certificate.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_list
+  name: az network front-door frontend-endpoint list
+  summary: List Front Door frontend endpoints.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint list --front-door-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_show
+  name: az network front-door frontend-endpoint show
+  summary: Get the details of a Front Door frontend endpoint.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint show --front-door-name
+                                                 --name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_frontend-endpoint_wait
+  name: az network front-door frontend-endpoint wait
+  summary: Place the CLI in a waiting state until a condition of the Front Door frontend endpoint is met.
+  description: ''
+  syntax: >-
+    az network front-door frontend-endpoint wait --front-door-name
+                                                 --name
+                                                 --resource-group
+                                                 [--created]
+                                                 [--custom]
+                                                 [--deleted]
+                                                 [--exists]
+                                                 [--interval]
+                                                 [--timeout]
+                                                 [--updated]
+  examples:
+  - summary: Wait until a front endpoint's certificate is deployed.
+    syntax: az network front-door frontend-endpoint wait -g MyResourceGroup --name endpoint1 --front-door-name frontdoor1 --custom "customHttpsProvisioningState=='Enabled'"
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the frontend endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_front-door_frontend-endpoint_create
+- az_network_front-door_frontend-endpoint_delete
+- az_network_front-door_frontend-endpoint_disable-https
+- az_network_front-door_frontend-endpoint_enable-https
+- az_network_front-door_frontend-endpoint_list
+- az_network_front-door_frontend-endpoint_show
+- az_network_front-door_frontend-endpoint_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door frontend endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/load-balancing.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/load-balancing.yml
new file mode 100644
index 0000000000..f513fdb524
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/load-balancing.yml
@@ -0,0 +1,177 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_load-balancing
+name: az network front-door load-balancing
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door load-balancing** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door load-balancing settings.
+description: ''
+directCommands:
+- uid: az_network_front-door_load-balancing_create
+  name: az network front-door load-balancing create
+  summary: Create Front Door load-balancing settings.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing create --front-door-name
+                                                --name
+                                                --resource-group
+                                                --sample-size
+                                                --successful-samples-required
+                                                [--additional-latency]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sample-size
+    summary: The number of samples to consider for load balancing decisions.
+    description: ''
+  - isRequired: true
+    name: --successful-samples-required -s
+    summary: The number of samples within the sample period that must succeed.
+    description: ''
+  optionalParameters:
+  - name: --additional-latency
+    summary: The additional latency in milliseconds for probes to fall in the lowest latency bucket.
+    description: ''
+- uid: az_network_front-door_load-balancing_delete
+  name: az network front-door load-balancing delete
+  summary: Delete Front Door load-balancing settings.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing delete --front-door-name
+                                                --name
+                                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_load-balancing_list
+  name: az network front-door load-balancing list
+  summary: List Front Door load-balancing settingss.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing list --front-door-name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_load-balancing_show
+  name: az network front-door load-balancing show
+  summary: Get the details of a Front Door load-balancing settings bundle.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing show --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_load-balancing_update
+  name: az network front-door load-balancing update
+  summary: Update Front Door load-balancing settings.
+  description: ''
+  syntax: >-
+    az network front-door load-balancing update --front-door-name
+                                                --name
+                                                --resource-group
+                                                [--add]
+                                                [--additional-latency]
+                                                [--force-string]
+                                                [--remove]
+                                                [--sample-size]
+                                                [--set]
+                                                [--successful-samples-required]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the load balancing settings.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --additional-latency
+    summary: The additional latency in milliseconds for probes to fall in the lowest latency bucket.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --sample-size
+    summary: The number of samples to consider for load balancing decisions.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --successful-samples-required -s
+    summary: The number of samples within the sample period that must succeed.
+    description: ''
+commands:
+- az_network_front-door_load-balancing_create
+- az_network_front-door_load-balancing_delete
+- az_network_front-door_load-balancing_list
+- az_network_front-door_load-balancing_show
+- az_network_front-door_load-balancing_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door load-balancing settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/probe.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/probe.yml
new file mode 100644
index 0000000000..5dfccbbe32
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/probe.yml
@@ -0,0 +1,185 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_probe
+name: az network front-door probe
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door probe** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door health probe settings.
+description: ''
+directCommands:
+- uid: az_network_front-door_probe_create
+  name: az network front-door probe create
+  summary: Create Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe create --front-door-name
+                                       --interval
+                                       --name
+                                       --path
+                                       --resource-group
+                                       [--enabled {Disabled, Enabled}]
+                                       [--probeMethod {GET, HEAD}]
+                                       [--protocol {Http, Https}]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --interval
+    summary: Interval in seconds between probes.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --path
+    summary: Path to probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled status.
+    description: ''
+  - name: --probeMethod
+    defaultValue: HEAD
+    parameterValueGroup: GET, HEAD
+    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Http, Https
+    summary: Protocol to use for sending probes.
+    description: ''
+- uid: az_network_front-door_probe_delete
+  name: az network front-door probe delete
+  summary: Delete Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe delete --front-door-name
+                                       --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_probe_list
+  name: az network front-door probe list
+  summary: List Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe list --front-door-name
+                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_probe_show
+  name: az network front-door probe show
+  summary: Get the details of a Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe show --front-door-name
+                                     --name
+                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_probe_update
+  name: az network front-door probe update
+  summary: Update Front Door health probe settings.
+  description: ''
+  syntax: >-
+    az network front-door probe update --front-door-name
+                                       --name
+                                       --resource-group
+                                       [--enabled {Disabled, Enabled}]
+                                       [--interval]
+                                       [--path]
+                                       [--probeMethod {GET, HEAD}]
+                                       [--protocol {Http, Https}]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the health probe.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled status.
+    description: ''
+  - name: --interval
+    summary: Interval in seconds between probes.
+    description: ''
+  - name: --path
+    summary: Path to probe.
+    description: ''
+  - name: --probeMethod
+    parameterValueGroup: GET, HEAD
+    summary: Configures which HTTP method to use to probe the backends defined under backendPools.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Http, Https
+    summary: Protocol to use for sending probes.
+    description: ''
+commands:
+- az_network_front-door_probe_create
+- az_network_front-door_probe_delete
+- az_network_front-door_probe_list
+- az_network_front-door_probe_show
+- az_network_front-door_probe_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door health probe settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/routing-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/routing-rule.yml
new file mode 100644
index 0000000000..0674c908ee
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/routing-rule.yml
@@ -0,0 +1,333 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_routing-rule
+name: az network front-door routing-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door routing-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door routing rules.
+description: ''
+directCommands:
+- uid: az_network_front-door_routing-rule_create
+  name: az network front-door routing-rule create
+  summary: Create a Front Door routing rule.
+  description: >-
+    Create a Front Door routing rule to either forward the requests to a backend or redirect the users to a different URL.
+
+
+    Example 1: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Forward --backend-pool DefaultBackendPool -n forwardRoutingrule1 --patterns /forward1
+
+
+    Example 2: az network front-door routing-rule create -f frontdoor1 -g rg1 --frontend-endpoints DefaultFrontendEndpoint --route-type Redirect --custom-host redirecthost.com -n redirectRouteRule1 --patterns /redirect1 --custom-query-string querystring.
+  syntax: >-
+    az network front-door routing-rule create --front-door-name
+                                              --frontend-endpoints
+                                              --name
+                                              --resource-group
+                                              --route-type {Forward, Redirect}
+                                              [--accepted-protocols]
+                                              [--backend-pool]
+                                              [--cache-duration]
+                                              [--caching {Disabled, Enabled}]
+                                              [--custom-forwarding-path]
+                                              [--custom-fragment]
+                                              [--custom-host]
+                                              [--custom-path]
+                                              [--custom-query-string]
+                                              [--disabled {false, true}]
+                                              [--dynamic-compression {Disabled, Enabled}]
+                                              [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--patterns]
+                                              [--query-parameter-strip-directive {StripAll, StripAllExcept, StripNone, StripOnly}]
+                                              [--query-parameters]
+                                              [--redirect-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--redirect-type {Found, Moved, PermanentRedirect, TemporaryRedirect}]
+                                              [--rules-engine]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --frontend-endpoints
+    summary: Space-separated list of frontend endpoint names or IDs.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --route-type
+    parameterValueGroup: Forward, Redirect
+    summary: Route type to define how Front Door should handle requests for this route i.e. forward them to a backend or redirect the users to a different URL.
+    description: ''
+  optionalParameters:
+  - name: --accepted-protocols
+    summary: 'Space-separated list of protocols to accept. Default: Http.'
+    description: ''
+  - name: --backend-pool
+    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
+    description: ''
+  - name: --cache-duration
+    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
+    description: ''
+  - name: --caching
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to enable caching for this route.
+    description: ''
+  - name: --custom-forwarding-path
+    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
+    description: ''
+  - name: --custom-fragment
+    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
+    description: ''
+  - name: --custom-host
+    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
+    description: ''
+  - name: --custom-path
+    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
+    description: ''
+  - name: --custom-query-string
+    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --dynamic-compression
+    parameterValueGroup: Disabled, Enabled
+    summary: Use dynamic compression for cached content.
+    description: ''
+  - name: --forwarding-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --patterns
+    summary: "Space-separated list of patterns to match. Default: '/\\*'."
+    description: ''
+  - name: --query-parameter-strip-directive
+    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
+    summary: Treatment of URL query terms when forming the cache key.
+    description: ''
+  - name: --query-parameters
+    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
+    description: ''
+  - name: --redirect-protocol
+    defaultValue: MatchRequest
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: The protocol of the destination to where the traffic is redirected.
+    description: ''
+  - name: --redirect-type
+    defaultValue: Moved
+    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
+    summary: The redirect type the rule will use when redirecting traffic.
+    description: ''
+  - name: --rules-engine
+    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
+    description: ''
+- uid: az_network_front-door_routing-rule_delete
+  name: az network front-door routing-rule delete
+  summary: Delete a Front Door routing rule.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule delete --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_routing-rule_list
+  name: az network front-door routing-rule list
+  summary: List Front Door routing rules.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule list --front-door-name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_routing-rule_show
+  name: az network front-door routing-rule show
+  summary: Get the details of a Front Door routing rule.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule show --front-door-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_routing-rule_update
+  name: az network front-door routing-rule update
+  summary: Update a Front Door routing rule.
+  description: ''
+  syntax: >-
+    az network front-door routing-rule update --front-door-name
+                                              --name
+                                              --resource-group
+                                              [--accepted-protocols]
+                                              [--add]
+                                              [--backend-pool]
+                                              [--cache-duration]
+                                              [--caching {Disabled, Enabled}]
+                                              [--custom-forwarding-path]
+                                              [--custom-fragment]
+                                              [--custom-host]
+                                              [--custom-path]
+                                              [--custom-query-string]
+                                              [--dynamic-compression {Disabled, Enabled}]
+                                              [--enabled {Disabled, Enabled}]
+                                              [--force-string]
+                                              [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--frontend-endpoints]
+                                              [--patterns]
+                                              [--query-parameter-strip-directive {StripAll, StripAllExcept, StripNone, StripOnly}]
+                                              [--query-parameters]
+                                              [--redirect-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                              [--redirect-type {Found, Moved, PermanentRedirect, TemporaryRedirect}]
+                                              [--remove]
+                                              [--rules-engine]
+                                              [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the routing rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accepted-protocols
+    summary: 'Space-separated list of protocols to accept. Default: Http.'
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --backend-pool
+    summary: Name or ID of a backend pool. It's required to create a Forward routing rule.
+    description: ''
+  - name: --cache-duration
+    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
+    description: ''
+  - name: --caching
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to enable caching for this route.
+    description: ''
+  - name: --custom-forwarding-path
+    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
+    description: ''
+  - name: --custom-fragment
+    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
+    description: ''
+  - name: --custom-host
+    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
+    description: ''
+  - name: --custom-path
+    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
+    description: ''
+  - name: --custom-query-string
+    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
+    description: ''
+  - name: --dynamic-compression
+    parameterValueGroup: Disabled, Enabled
+    summary: Use dynamic compression for cached content.
+    description: ''
+  - name: --enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled status.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --forwarding-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --frontend-endpoints
+    summary: Space-separated list of frontend endpoint names or IDs.
+    description: ''
+  - name: --patterns
+    summary: "Space-separated list of patterns to match. Default: '/\\*'."
+    description: ''
+  - name: --query-parameter-strip-directive
+    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
+    summary: Treatment of URL query terms when forming the cache key.
+    description: ''
+  - name: --query-parameters
+    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
+    description: ''
+  - name: --redirect-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: The protocol of the destination to where the traffic is redirected.
+    description: ''
+  - name: --redirect-type
+    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
+    summary: The redirect type the rule will use when redirecting traffic.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --rules-engine
+    summary: Name or ID of a Rules Engine configuration. To unlink property, "--remove rulesEngine".
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_network_front-door_routing-rule_create
+- az_network_front-door_routing-rule_delete
+- az_network_front-door_routing-rule_list
+- az_network_front-door_routing-rule_show
+- az_network_front-door_routing-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door routing rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine.yml
new file mode 100644
index 0000000000..540224e052
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine.yml
@@ -0,0 +1,103 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine
+name: az network front-door rules-engine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Front Door rules engines.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_delete
+  name: az network front-door rules-engine delete
+  summary: Deletes an existing Rules Engine Configuration with the specified parameters.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine delete --front-door-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Rules Engine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_rules-engine_list
+  name: az network front-door rules-engine list
+  summary: Lists all of the Rules Engine Configurations within a Front Door.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine list --front-door-name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_rules-engine_show
+  name: az network front-door rules-engine show
+  summary: Gets a Rules Engine Configuration with the specified name within the specified Front Door.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine show --front-door-name
+                                            --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Rules Engine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_delete
+- az_network_front-door_rules-engine_list
+- az_network_front-door_rules-engine_rule
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+- az_network_front-door_rules-engine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Front Door rules engines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule.yml
new file mode 100644
index 0000000000..f147293adc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule.yml
@@ -0,0 +1,234 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine_rule
+name: az network front-door rules-engine rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Rules Engine rules.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_rule_create
+  name: az network front-door rules-engine rule create
+  summary: Create a Rules Engine rule for a Front Door.
+  description: This command allows creating Rules Engine configuration with Header action type. To add additional actions like Route overrides, use the `az network front-door rules-engine rule action add` command.
+  syntax: >-
+    az network front-door rules-engine rule create --action-type {RequestHeader, ResponseHeader}
+                                                   --front-door-name
+                                                   --name
+                                                   --priority
+                                                   --resource-group
+                                                   --rules-engine-name
+                                                   [--header-action {Append, Delete, Overwrite}]
+                                                   [--header-name]
+                                                   [--header-value]
+                                                   [--match-processing-behavior {Continue, Stop}]
+                                                   [--match-values]
+                                                   [--match-variable {IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri}]
+                                                   [--negate-condition {false, true}]
+                                                   [--operator {Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual}]
+                                                   [--selector]
+                                                   [--transforms {Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode}]
+  requiredParameters:
+  - isRequired: true
+    name: --action-type
+    parameterValueGroup: RequestHeader, ResponseHeader
+    summary: Action type to apply for a rule.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --priority
+    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --header-action
+    parameterValueGroup: Append, Delete, Overwrite
+    summary: Header action type for the requests.
+    description: ''
+  - name: --header-name
+    summary: Name of the header to modify.
+    description: ''
+  - name: --header-value
+    summary: Value of the header.
+    description: ''
+  - name: --match-processing-behavior
+    parameterValueGroup: Continue, Stop
+    summary: Whether to stop processing rules after conditions in a rule is satisfied.
+    description: ''
+  - name: --match-values
+    summary: Space-separated list of values to match against.
+    description: ''
+  - name: --match-variable
+    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
+    summary: Name of the match condition.
+    description: ''
+  - name: --negate-condition
+    parameterValueGroup: false, true
+    summary: Applies "Not" to the operator.
+    description: ''
+  - name: --operator
+    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
+    summary: Operator of the match condition.
+    description: ''
+  - name: --selector
+    summary: Optional selector for the match condition variable.
+    description: ''
+  - name: --transforms
+    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
+    summary: Space-separated list of transforms to apply.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_delete
+  name: az network front-door rules-engine rule delete
+  summary: Delete a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule delete --front-door-name
+                                                   --name
+                                                   --resource-group
+                                                   --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_list
+  name: az network front-door rules-engine rule list
+  summary: List rules of a Rules Engine configuration.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule list --front-door-name
+                                                 --name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Rules Engine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_show
+  name: az network front-door rules-engine rule show
+  summary: Get the details of a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule show --front-door-name
+                                                 --name
+                                                 --resource-group
+                                                 --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_update
+  name: az network front-door rules-engine rule update
+  summary: Update Rules Engine configuration of a rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule update --front-door-name
+                                                   --name
+                                                   --resource-group
+                                                   --rules-engine-name
+                                                   [--match-processing-behavior {Continue, Stop}]
+                                                   [--priority]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --match-processing-behavior
+    parameterValueGroup: Continue, Stop
+    summary: Whether to stop processing rules after conditions in a rule is satisfied.
+    description: ''
+  - name: --priority
+    summary: The priority number must start from 0 and consecutive. Rule with greater priority value will be applied later.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_rule_action
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+- az_network_front-door_rules-engine_rule_condition
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+- az_network_front-door_rules-engine_rule_create
+- az_network_front-door_rules-engine_rule_delete
+- az_network_front-door_rules-engine_rule_list
+- az_network_front-door_rules-engine_rule_show
+- az_network_front-door_rules-engine_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Rules Engine rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule/action.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule/action.yml
new file mode 100644
index 0000000000..01b0b38ee8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule/action.yml
@@ -0,0 +1,204 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine_rule_action
+name: az network front-door rules-engine rule action
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine rule action** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Rules Engine actions for Front Door.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_rule_action_add
+  name: az network front-door rules-engine rule action add
+  summary: Add an action to a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule action add --action-type {ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader}
+                                                       --front-door-name
+                                                       --name
+                                                       --resource-group
+                                                       --rules-engine-name
+                                                       [--backend-pool]
+                                                       [--cache-duration]
+                                                       [--caching {Disabled, Enabled}]
+                                                       [--custom-forwarding-path]
+                                                       [--custom-fragment]
+                                                       [--custom-host]
+                                                       [--custom-path]
+                                                       [--custom-query-string]
+                                                       [--dynamic-compression {Disabled, Enabled}]
+                                                       [--forwarding-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                                       [--header-action {Append, Delete, Overwrite}]
+                                                       [--header-name]
+                                                       [--header-value]
+                                                       [--query-parameter-strip-directive {StripAll, StripAllExcept, StripNone, StripOnly}]
+                                                       [--query-parameters]
+                                                       [--redirect-protocol {HttpOnly, HttpsOnly, MatchRequest}]
+                                                       [--redirect-type {Found, Moved, PermanentRedirect, TemporaryRedirect}]
+  requiredParameters:
+  - isRequired: true
+    name: --action-type
+    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
+    summary: Action type to apply for a rule.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --backend-pool
+    summary: Name or ID of a backend pool.
+    description: ''
+  - name: --cache-duration
+    summary: The duration for which the content needs to be cached. Allowed format is ISO 8601 duration.
+    description: ''
+  - name: --caching
+    parameterValueGroup: Disabled, Enabled
+    summary: Whether to enable caching for this route.
+    description: ''
+  - name: --custom-forwarding-path
+    summary: Custom path used to rewrite resource paths matched by this rule. Leave empty to use incoming path.
+    description: ''
+  - name: --custom-fragment
+    summary: 'Fragment to add to the redirect URL. Fragment is the part of the URL that comes after #. Do not include the #.'
+    description: ''
+  - name: --custom-host
+    summary: Host to redirect. Leave empty to use use the incoming host as the destination host.
+    description: ''
+  - name: --custom-path
+    summary: The full path to redirect. Path cannot be empty and must start with /. Leave empty to use the incoming path as destination path.
+    description: ''
+  - name: --custom-query-string
+    summary: The set of query strings to be placed in the redirect URL. Setting this value would replace any existing query string; leave empty to preserve the incoming query string. Query string must be in <key>=<value> format. The first ? and & will be added automatically so do not include them in the front, but do separate multiple query strings with &.
+    description: ''
+  - name: --dynamic-compression
+    parameterValueGroup: Disabled, Enabled
+    summary: Use dynamic compression for cached content.
+    description: ''
+  - name: --forwarding-protocol
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: Protocol to use for forwarding traffic.
+    description: ''
+  - name: --header-action
+    parameterValueGroup: Append, Delete, Overwrite
+    summary: Header action type for the requests.
+    description: ''
+  - name: --header-name
+    summary: Name of the header to modify.
+    description: ''
+  - name: --header-value
+    summary: Value of the header.
+    description: ''
+  - name: --query-parameter-strip-directive
+    parameterValueGroup: StripAll, StripAllExcept, StripNone, StripOnly
+    summary: Treatment of URL query terms when forming the cache key.
+    description: ''
+  - name: --query-parameters
+    summary: Query parameters to include or exclude (comma separated) when using query-parameter-strip-directive type StripAllExcept or StripOnly respectively.
+    description: ''
+  - name: --redirect-protocol
+    defaultValue: MatchRequest
+    parameterValueGroup: HttpOnly, HttpsOnly, MatchRequest
+    summary: The protocol of the destination to where the traffic is redirected.
+    description: ''
+  - name: --redirect-type
+    defaultValue: Moved
+    parameterValueGroup: Found, Moved, PermanentRedirect, TemporaryRedirect
+    summary: The redirect type the rule will use when redirecting traffic.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_action_list
+  name: az network front-door rules-engine rule action list
+  summary: Show all actions that apply for a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule action list --front-door-name
+                                                        --name
+                                                        --resource-group
+                                                        --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_action_remove
+  name: az network front-door rules-engine rule action remove
+  summary: Remove an action from a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule action remove --action-type {ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader}
+                                                          --front-door-name
+                                                          --name
+                                                          --resource-group
+                                                          --rules-engine-name
+                                                          [--index]
+  requiredParameters:
+  - isRequired: true
+    name: --action-type
+    parameterValueGroup: ForwardRouteOverride, RedirectRouteOverride, RequestHeader, ResponseHeader
+    summary: Action type to apply for a rule.
+    description: ''
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --index
+    summary: 0-based index of the request or response header action to remove. Index parameter is not required for "ForwardRouteOverride" or "RedirectRouteOverride" action remove.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_rule_action_add
+- az_network_front-door_rules-engine_rule_action_list
+- az_network_front-door_rules-engine_rule_action_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Rules Engine actions for Front Door.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule/condition.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule/condition.yml
new file mode 100644
index 0000000000..1186953e0c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/rules-engine/rule/condition.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_rules-engine_rule_condition
+name: az network front-door rules-engine rule condition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door rules-engine rule condition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Rules Engine match conditions for Front Door.
+description: ''
+directCommands:
+- uid: az_network_front-door_rules-engine_rule_condition_add
+  name: az network front-door rules-engine rule condition add
+  summary: Add a match condition to a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule condition add --front-door-name
+                                                          --name
+                                                          --resource-group
+                                                          --rules-engine-name
+                                                          [--match-values]
+                                                          [--match-variable {IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri}]
+                                                          [--negate-condition {false, true}]
+                                                          [--operator {Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual}]
+                                                          [--selector]
+                                                          [--transforms {Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode}]
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+  optionalParameters:
+  - name: --match-values
+    summary: Space-separated list of values to match against.
+    description: ''
+  - name: --match-variable
+    parameterValueGroup: IsMobile, PostArgs, QueryString, RemoteAddr, RequestBody, RequestFilename, RequestFilenameExtension, RequestHeader, RequestMethod, RequestPath, RequestScheme, RequestUri
+    summary: Name of the match condition.
+    description: ''
+  - name: --negate-condition
+    parameterValueGroup: false, true
+    summary: Applies "Not" to the operator.
+    description: ''
+  - name: --operator
+    parameterValueGroup: Any, BeginsWith, Contains, EndsWith, Equal, GeoMatch, GreaterThan, GreaterThanOrEqual, IPMatch, LessThan, LessThanOrEqual
+    summary: Operator of the match condition.
+    description: ''
+  - name: --selector
+    summary: Optional selector for the match condition variable.
+    description: ''
+  - name: --transforms
+    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
+    summary: Space-separated list of transforms to apply.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_condition_list
+  name: az network front-door rules-engine rule condition list
+  summary: Show all match conditions associated with a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule condition list --front-door-name
+                                                           --name
+                                                           --resource-group
+                                                           --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+- uid: az_network_front-door_rules-engine_rule_condition_remove
+  name: az network front-door rules-engine rule condition remove
+  summary: Remove a match condition from a Rules Engine rule.
+  description: ''
+  syntax: >-
+    az network front-door rules-engine rule condition remove --front-door-name
+                                                             --index
+                                                             --name
+                                                             --resource-group
+                                                             --rules-engine-name
+  requiredParameters:
+  - isRequired: true
+    name: --front-door-name -f
+    summary: Name of the Front Door.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: 0-based index of the match condition to remove.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rules-engine-name -r
+    summary: Name of the Rules Engine.
+    description: ''
+commands:
+- az_network_front-door_rules-engine_rule_condition_add
+- az_network_front-door_rules-engine_rule_condition_list
+- az_network_front-door_rules-engine_rule_condition_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Rules Engine match conditions for Front Door.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy.yml
new file mode 100644
index 0000000000..cc050f2621
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy.yml
@@ -0,0 +1,221 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy
+name: az network front-door waf-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage WebApplication Firewall (WAF) policies.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_create
+  name: az network front-door waf-policy create
+  summary: Create a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy create --name
+                                            --resource-group
+                                            [--custom-block-response-body]
+                                            [--custom-block-response-status-code]
+                                            [--disabled {false, true}]
+                                            [--mode {Detection, Prevention}]
+                                            [--redirect-url]
+                                            [--request-body-check {Disabled, Enabled}]
+                                            [--sku {Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor}]
+                                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-block-response-body
+    summary: Body to return for blocked requests.
+    description: ''
+  - name: --custom-block-response-status-code
+    summary: HTTP status to return for blocked requests.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --mode
+    parameterValueGroup: Detection, Prevention
+    summary: Firewall policy mode.
+    description: ''
+  - name: --redirect-url
+    summary: URL used for redirect rule action.
+    description: ''
+  - name: --request-body-check
+    parameterValueGroup: Disabled, Enabled
+    summary: Disabled or Enabled status. Default value is Disabled.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor
+    summary: SKU of Firewall policy. This field cannot be updated after creation. Default value is Classic_AzureFrontDoor.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_front-door_waf-policy_delete
+  name: az network front-door waf-policy delete
+  summary: Delete a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy delete --name
+                                            --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_list
+  name: az network front-door waf-policy list
+  summary: List WAF policies.
+  description: ''
+  syntax: az network front-door waf-policy list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_show
+  name: az network front-door waf-policy show
+  summary: Get the details of a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy show --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_update
+  name: az network front-door waf-policy update
+  summary: Update settings of a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy update --name
+                                            --resource-group
+                                            [--add]
+                                            [--custom-block-response-body]
+                                            [--custom-block-response-status-code]
+                                            [--disabled {false, true}]
+                                            [--force-string]
+                                            [--mode {Detection, Prevention}]
+                                            [--redirect-url]
+                                            [--remove]
+                                            [--request-body-check {Disabled, Enabled}]
+                                            [--set]
+                                            [--sku {Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor}]
+                                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --custom-block-response-body
+    summary: Body to return for blocked requests.
+    description: ''
+  - name: --custom-block-response-status-code
+    summary: HTTP status to return for blocked requests.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Create in a disabled state.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --mode
+    parameterValueGroup: Detection, Prevention
+    summary: Firewall policy mode.
+    description: ''
+  - name: --redirect-url
+    summary: URL used for redirect rule action.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --request-body-check
+    parameterValueGroup: Disabled, Enabled
+    summary: Disabled or Enabled status. Default value is Disabled.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Classic_AzureFrontDoor, Premium_AzureFrontDoor, Standard_AzureFrontDoor
+    summary: SKU of Firewall policy. This field cannot be updated after creation. Default value is Classic_AzureFrontDoor.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_network_front-door_waf-policy_create
+- az_network_front-door_waf-policy_delete
+- az_network_front-door_waf-policy_list
+- az_network_front-door_waf-policy_managed-rule-definition
+- az_network_front-door_waf-policy_managed-rule-definition_list
+- az_network_front-door_waf-policy_managed-rules
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+- az_network_front-door_waf-policy_rule
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+- az_network_front-door_waf-policy_show
+- az_network_front-door_waf-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage WebApplication Firewall (WAF) policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rule-definition.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rule-definition.yml
new file mode 100644
index 0000000000..8305fae7f1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rule-definition.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rule-definition
+name: az network front-door waf-policy managed-rule-definition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rule-definition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Learn about available managed rule sets.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rule-definition_list
+  name: az network front-door waf-policy managed-rule-definition list
+  summary: Show a detailed list of available managed rule sets.
+  description: ''
+  syntax: az network front-door waf-policy managed-rule-definition list
+commands:
+- az_network_front-door_waf-policy_managed-rule-definition_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Learn about available managed rule sets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules.yml
new file mode 100644
index 0000000000..dfec7355bc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules.yml
@@ -0,0 +1,102 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rules
+name: az network front-door waf-policy managed-rules
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rules** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Change and view managed rule sets associated with your WAF policy.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rules_add
+  name: az network front-door waf-policy managed-rules add
+  summary: Add a managed rule set to a WAF policy.
+  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available managed rulesets.
+  syntax: >-
+    az network front-door waf-policy managed-rules add --policy-name
+                                                       --resource-group
+                                                       --type
+                                                       --version
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to apply.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Rule set version.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_list
+  name: az network front-door waf-policy managed-rules list
+  summary: Show which managed rule sets are applied to a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules list --policy-name
+                                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_remove
+  name: az network front-door waf-policy managed-rules remove
+  summary: Remove a managed rule set from a WAF policy.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules remove --policy-name
+                                                          --resource-group
+                                                          --type
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to remove.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_managed-rules_add
+- az_network_front-door_waf-policy_managed-rules_exclusion
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+- az_network_front-door_waf-policy_managed-rules_list
+- az_network_front-door_waf-policy_managed-rules_override
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+- az_network_front-door_waf-policy_managed-rules_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Change and view managed rule sets associated with your WAF policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules/exclusion.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules/exclusion.yml
new file mode 100644
index 0000000000..b7d9ca1e7f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules/exclusion.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rules_exclusion
+name: az network front-door waf-policy managed-rules exclusion
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rules exclusion** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: View and alter exclusions on a managed rule set, rule group, or rule within a managed rule set.
+description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rules_exclusion_add
+  name: az network front-door waf-policy managed-rules exclusion add
+  summary: Add an exclusion on a managed rule set, rule group, or rule within a managed rule set.
+  description: Prevents the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules exclusion add --match-variable
+                                                                 --operator
+                                                                 --policy-name
+                                                                 --resource-group
+                                                                 --type
+                                                                 --value
+                                                                 [--rule-group-id]
+                                                                 [--rule-id]
+  requiredParameters:
+  - isRequired: true
+    name: --match-variable
+    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
+    description: ''
+  - isRequired: true
+    name: --operator
+    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to exclusion.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Values to match the variable name against.
+    description: ''
+  optionalParameters:
+  - name: --rule-group-id
+    summary: ID of the rule group containing the rule to exclusion.
+    description: ''
+  - name: --rule-id
+    summary: ID of the rule to apply exclusion.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_exclusion_list
+  name: az network front-door waf-policy managed-rules exclusion list
+  summary: List the exclusions on managed rule set, rule group, or rule within a managed rule set.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules exclusion list --policy-name
+                                                                  --resource-group
+                                                                  --type
+                                                                  [--rule-group-id]
+                                                                  [--rule-id]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the exclusions to list.
+    description: ''
+  optionalParameters:
+  - name: --rule-group-id
+    summary: ID of the rule group containing the exclusions to list.
+    description: ''
+  - name: --rule-id
+    summary: ID of the rule to list exclusion for.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_exclusion_remove
+  name: az network front-door waf-policy managed-rules exclusion remove
+  summary: Remove an exclusion on a managed rule set, rule group, or rule within a managed rule set.
+  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules exclusion remove --match-variable
+                                                                    --operator
+                                                                    --policy-name
+                                                                    --resource-group
+                                                                    --type
+                                                                    --value
+                                                                    [--rule-group-id]
+                                                                    [--rule-id]
+  requiredParameters:
+  - isRequired: true
+    name: --match-variable
+    summary: Which kind of variable's content will be ignored, e.g. RequestHeaderNames, RequestCookieNames, QueryStringArgNames, RequestBodyPostArgNames.
+    description: ''
+  - isRequired: true
+    name: --operator
+    summary: Operator used to compare the variable name to the value, e.g. Equals, Contains, StartsWith, EndsWith, EqualsAny.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the exclusion to remove.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Values to match the variable name against.
+    description: ''
+  optionalParameters:
+  - name: --rule-group-id
+    summary: ID of the rule group containing the exclusion to remove.
+    description: ''
+  - name: --rule-id
+    summary: ID of the rule to remove from exclusion.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_managed-rules_exclusion_add
+- az_network_front-door_waf-policy_managed-rules_exclusion_list
+- az_network_front-door_waf-policy_managed-rules_exclusion_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Exclusions prevent the rule set, rule group, or rule from being applied to the content of the specified variable. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules/override.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules/override.yml
new file mode 100644
index 0000000000..32b8bc7ab7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/managed-rules/override.yml
@@ -0,0 +1,125 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_managed-rules_override
+name: az network front-door waf-policy managed-rules override
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy managed-rules override** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: View and alter overrides on managed rules within a managed rule set.
+description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+directCommands:
+- uid: az_network_front-door_waf-policy_managed-rules_override_add
+  name: az network front-door waf-policy managed-rules override add
+  summary: Add an override on a managed rule within a managed rule set.
+  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules override add --policy-name
+                                                                --resource-group
+                                                                --rule-group-id
+                                                                --rule-id
+                                                                --type
+                                                                [--action {Allow, Block, Log, Redirect}]
+                                                                [--disabled {false, true}]
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-group-id
+    summary: ID of the rule group containing the rule to override.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: ID of the rule to override.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset to override.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Block, Log, Redirect
+    summary: Action for applied rulesets.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Whether to disable the rule.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_override_list
+  name: az network front-door waf-policy managed-rules override list
+  summary: List the overrides on managed rules within a managed rule set.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy managed-rules override list --policy-name
+                                                                 --resource-group
+                                                                 --type
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the overrides to list.
+    description: ''
+- uid: az_network_front-door_waf-policy_managed-rules_override_remove
+  name: az network front-door waf-policy managed-rules override remove
+  summary: Remove an override on a managed rule within a managed rule set.
+  description: After this command, the standard behavior for the rule within the managed rule set will apply. Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
+  syntax: >-
+    az network front-door waf-policy managed-rules override remove --policy-name
+                                                                   --resource-group
+                                                                   --rule-group-id
+                                                                   --rule-id
+                                                                   --type
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-group-id
+    summary: ID of the rule group containing the override to remove.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: ID of the rule override to remove.
+    description: ''
+  - isRequired: true
+    name: --type
+    summary: ID of the ruleset with the override to remove.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_managed-rules_override_add
+- az_network_front-door_waf-policy_managed-rules_override_list
+- az_network_front-door_waf-policy_managed-rules_override_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Use 'az network front-door waf-policy managed-rule-definition list' to see the available rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/rule.yml
new file mode 100644
index 0000000000..84266b6aac
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/rule.yml
@@ -0,0 +1,191 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_rule
+name: az network front-door waf-policy rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage WAF policy custom rules.
+description: ''
+directCommands:
+- uid: az_network_front-door_waf-policy_rule_create
+  name: az network front-door waf-policy rule create
+  summary: Create a WAF policy custom rule. Use --defer and add a rule match-condition.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule create --action {Allow, Block, Log, Redirect}
+                                                 --name
+                                                 --policy-name
+                                                 --priority
+                                                 --resource-group
+                                                 --rule-type {MatchRule, RateLimitRule}
+                                                 [--disabled {false, true}]
+                                                 [--rate-limit-duration]
+                                                 [--rate-limit-threshold]
+  requiredParameters:
+  - isRequired: true
+    name: --action
+    parameterValueGroup: Allow, Block, Log, Redirect
+    summary: Rule action.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --priority
+    summary: Priority of the rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-type
+    parameterValueGroup: MatchRule, RateLimitRule
+    summary: Type of rule.
+    description: ''
+  optionalParameters:
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Whether to disable the rule.
+    description: ''
+  - name: --rate-limit-duration
+    summary: Rate limit duration in minutes.
+    description: ''
+  - name: --rate-limit-threshold
+    summary: Rate limit threshold.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_delete
+  name: az network front-door waf-policy rule delete
+  summary: Delete a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule delete --name
+                                                 --policy-name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_list
+  name: az network front-door waf-policy rule list
+  summary: List WAF policy custom rules.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule list --policy-name
+                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_show
+  name: az network front-door waf-policy rule show
+  summary: Get the details of a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule show --name
+                                               --policy-name
+                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_update
+  name: az network front-door waf-policy rule update
+  summary: Alter the details of a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule update --name
+                                                 --policy-name
+                                                 --resource-group
+                                                 [--action {Allow, Block, Log, Redirect}]
+                                                 [--disabled {false, true}]
+                                                 [--priority]
+                                                 [--rate-limit-duration]
+                                                 [--rate-limit-threshold]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    parameterValueGroup: Allow, Block, Log, Redirect
+    summary: Rule action.
+    description: ''
+  - name: --disabled
+    parameterValueGroup: false, true
+    summary: Whether to disable the rule.
+    description: ''
+  - name: --priority
+    summary: Priority of the rule.
+    description: ''
+  - name: --rate-limit-duration
+    summary: Rate limit duration in minutes.
+    description: ''
+  - name: --rate-limit-threshold
+    summary: Rate limit threshold.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_rule_create
+- az_network_front-door_waf-policy_rule_delete
+- az_network_front-door_waf-policy_rule_list
+- az_network_front-door_waf-policy_rule_match-condition
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+- az_network_front-door_waf-policy_rule_show
+- az_network_front-door_waf-policy_rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage WAF policy custom rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/rule/match-condition.yml b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/rule/match-condition.yml
new file mode 100644
index 0000000000..28327cdb12
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/front-door/waf-policy/rule/match-condition.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_front-door_waf-policy_rule_match-condition
+name: az network front-door waf-policy rule match-condition
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **front-door** extension for Azure CLI and requires version 2.0.68 or higher.  The extension will automatically install the first time you run an **az network front-door waf-policy rule match-condition** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Alter match-conditions associated with a WAF policy custom rule.
+description: Note that at least one match-condition must be associated with a custom rule.
+directCommands:
+- uid: az_network_front-door_waf-policy_rule_match-condition_add
+  name: az network front-door waf-policy rule match-condition add
+  summary: Add a match-condition to a WAF policy custom rule.
+  description: >-
+    Usage:   [--negate] --match-variable VARIABLE[.selector] --operator OPERATOR --value [VALUE [VALUE ...]]
+
+      Variable allowed values: RemoteAddr, RequestMethod, QueryString, PostArgs, RequestUri, RequestHeader, RequestBody, Cookies, SocketAddr
+
+      Operator allowed values: Any, IPMatch, GeoMatch, Equal, Contains, LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, BeginsWith, EndsWith, RegEx.
+  syntax: >-
+    az network front-door waf-policy rule match-condition add --match-variable
+                                                              --name
+                                                              --operator
+                                                              --policy-name
+                                                              --resource-group
+                                                              --values
+                                                              [--negate {false, true}]
+                                                              [--transforms {Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode}]
+  requiredParameters:
+  - isRequired: true
+    name: --match-variable
+    summary: Variable[.Selector] Request variable to test with optional selector.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --operator
+    summary: Operator used to compare the variable to the values.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --values
+    summary: Space-separated list of values to match against.
+    description: ''
+  optionalParameters:
+  - name: --negate
+    parameterValueGroup: false, true
+    summary: Applies "Not" to the operator.
+    description: ''
+  - name: --transforms
+    parameterValueGroup: Lowercase, RemoveNulls, Trim, Uppercase, UrlDecode, UrlEncode
+    summary: Space-separated list of transforms to apply.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_match-condition_list
+  name: az network front-door waf-policy rule match-condition list
+  summary: Show all match-conditions associated with a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule match-condition list --name
+                                                               --policy-name
+                                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_front-door_waf-policy_rule_match-condition_remove
+  name: az network front-door waf-policy rule match-condition remove
+  summary: Remove a match-condition from a WAF policy custom rule.
+  description: ''
+  syntax: >-
+    az network front-door waf-policy rule match-condition remove --index
+                                                                 --name
+                                                                 --policy-name
+                                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: 0-based index of the match condition to remove.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the custom rule.
+    description: ''
+  - isRequired: true
+    name: --policy-name
+    summary: Name of the WAF policy.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_front-door_waf-policy_rule_match-condition_add
+- az_network_front-door_waf-policy_rule_match-condition_list
+- az_network_front-door_waf-policy_rule_match-condition_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Note that at least one match-condition must be associated with a custom rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/ip-group.yml b/2018-03-01-hybrid/docs-ref-autogen/network/ip-group.yml
new file mode 100644
index 0000000000..f8861300c3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/ip-group.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_ip-group
+name: az network ip-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ip-group** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network ip-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage IpGroup.
+description: ''
+directCommands:
+- uid: az_network_ip-group_create
+  name: az network ip-group create
+  summary: Create an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group create --ip-addresses
+                               --name
+                               --resource-group
+                               [--location]
+                               [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --ip-addresses
+    summary: Space-separated list of IpAddress or IpAddressPrefix.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_ip-group_delete
+  name: az network ip-group delete
+  summary: Delete an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_ip-group_list
+  name: az network ip-group list
+  summary: List all of IpGroup.
+  description: ''
+  syntax: az network ip-group list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_ip-group_show
+  name: az network ip-group show
+  summary: Show details of an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group show --name
+                             --resource-group
+                             [--expand]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Expands resourceIds (of Firewalls/Network Security Groups etc.) back referenced by the IpGroups resource.
+    description: ''
+- uid: az_network_ip-group_update
+  name: az network ip-group update
+  summary: Update an IpGroup.
+  description: ''
+  syntax: >-
+    az network ip-group update --name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--ip-addresses]
+                               [--remove]
+                               [--set]
+                               [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the IpGroup.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ip-addresses
+    summary: Space-separated list of IpAddress or IpAddressPrefix.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_network_ip-group_create
+- az_network_ip-group_delete
+- az_network_ip-group_list
+- az_network_ip-group_show
+- az_network_ip-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage IpGroup.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb.yml
index efaa1770d7..de32889ce5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb.yml
@@ -1,48 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb
-  name: az network lb
-  summary: Manage and configure load balancers.
-  description: To learn more about Azure Load Balancer visit <a href="https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli">https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_create
-  - az_network_lb_delete
-  - az_network_lb_list
-  - az_network_lb_show
-  - az_network_lb_update
+### YamlMime:AzureCLIGroup
+uid: az_network_lb
+name: az network lb
+summary: Manage and configure load balancers.
+description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
+directCommands:
 - uid: az_network_lb_create
   name: az network lb create
   summary: Create a load balancer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb create --name
+                         --resource-group
+                         [--backend-pool-name]
+                         [--frontend-ip-name]
+                         [--frontend-ip-zone {1, 2, 3}]
+                         [--location]
+                         [--no-wait]
+                         [--private-ip-address]
+                         [--public-ip-address]
+                         [--public-ip-address-allocation {Dynamic, Static}]
+                         [--public-ip-dns-name]
+                         [--public-ip-zone {1, 2, 3}]
+                         [--sku {Basic, Standard}]
+                         [--subnet]
+                         [--subnet-address-prefix]
+                         [--subscription]
+                         [--tags]
+                         [--validate]
+                         [--vnet-address-prefix]
+                         [--vnet-name]
   examples:
   - summary: Create a basic load balancer.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic
   - summary: Create a basic load balancer on a specific virtual network and subnet. If a virtual network with the same name is found in the same resource group, the load balancer will utilize this virtual network.  If one is not found a new one will be created.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic --vnet-name MyVnet --subnet MySubnet
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic --vnet-name MyVnet --subnet MySubnet
   - summary: Create a basic load balancer on a subnet of a pre-existing virtual network. The subnet can be in arbitary resource group or subscription by providing the ID of the subnet.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic --subnet {subnetID}
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic --subnet {subnetID}
   - summary: Create a basic zone flavored internal load balancer, through provisioning a zonal public ip.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Basic --public-ip-zone 2
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Basic --public-ip-zone 2
   - summary: Create a standard zone flavored public-facing load balancer, through provisioning a zonal frontend ip configuration and Vnet.
-    syntax:
-      content: az network lb create -g MyResourceGroup -n MyLb --sku Standard --frontend-ip-zone 1 --vnet-name MyVnet --subnet MySubnet
-  parameters:
+    syntax: az network lb create -g MyResourceGroup -n MyLb --sku Standard --frontend-ip-zone 1 --vnet-name MyVnet --subnet MySubnet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The load balancer name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --backend-pool-name
     summary: The name of the backend address pool.
     description: ''
@@ -55,7 +62,7 @@ items:
     summary: Used to create internal facing Load balancer.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -63,17 +70,6 @@ items:
   - name: --private-ip-address
     summary: Static private IP address to use.
     description: ''
-  - name: --sku
-    defaultValue: Basic
-    parameterValueGroup: Basic, Standard
-    summary: Load balancer SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
   - name: --public-ip-address
     summary: Name or ID of the public IP address, or "" for none. Uses existing resource if available or will create a new resource with defaults if omitted.
     description: ''
@@ -88,6 +84,11 @@ items:
     parameterValueGroup: 1, 2, 3
     summary: Used to created a new public ip for the load balancer, a.k.a public facing Load balancer.
     description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: Basic, Standard
+    summary: Load balancer SKU.
+    description: ''
   - name: --subnet
     summary: Name or ID of a subnet. Uses existing resource or creates new if specified, or none if omitted. If name specified, also specify --vnet-name. If you want to use an existing subnet in other resource group or subscription, please provide the ID instead of the name of the subnet.
     description: ''
@@ -95,6 +96,15 @@ items:
     defaultValue: 10.0.0.0/24
     summary: The CIDR address prefix to use when creating a new subnet.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
   - name: --vnet-address-prefix
     defaultValue: 10.0.0.0/16
     summary: The CIDR address prefix to use when creating a new VNet.
@@ -102,26 +112,20 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_delete
   name: az network lb delete
   summary: Delete a load balancer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb delete [--ids]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Delete a load balancer.
-    syntax:
-      content: az network lb delete -g MyResourceGroup -n MyLb
-  parameters:
+    syntax: az network lb delete -g MyResourceGroup -n MyLb
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -129,51 +133,75 @@ items:
     summary: The load balancer name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_list
   name: az network lb list
   summary: List load balancers.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb list [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: List load balancers.
-    syntax:
-      content: az network lb list -g MyResourceGroup
-  parameters:
+    syntax: az network lb list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_list-nic
+  name: az network lb list-nic
+  summary: List associated load balancer network interfaces.
+  description: ''
+  syntax: >-
+    az network lb list-nic [--ids]
+                           [--name]
+                           [--resource-group]
+                           [--subscription]
+  examples:
+  - summary: List associated load balancer network interfaces.
+    syntax: az network lb list-nic -g MyResourceGroup --name MyLb
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_show
   name: az network lb show
   summary: Get the details of a load balancer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb show [--expand]
+                       [--ids]
+                       [--name]
+                       [--query-examples]
+                       [--resource-group]
+                       [--subscription]
   examples:
   - summary: Get the details of a load balancer.
-    syntax:
-      content: az network lb show -g MyResourceGroup -n MyLb
-  parameters:
+    syntax: az network lb show -g MyResourceGroup -n MyLb
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -183,180 +211,165 @@ items:
   - name: --name -n
     summary: The load balancer name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_update
   name: az network lb update
   summary: Update a load balancer.
   description: This command can only be used to update the tags for a load balancer. Name and resource group are immutable and cannot be updated.
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb update [--add]
+                         [--force-string]
+                         [--ids]
+                         [--name]
+                         [--remove]
+                         [--resource-group]
+                         [--set]
+                         [--subscription]
   examples:
   - summary: Update the tags of a load balancer.
-    syntax:
-      content: az network lb update -g MyResourceGroup -n MyLb --set tags.CostCenter=MyBusinessGroup
-  parameters:
+    syntax: az network lb update -g MyResourceGroup -n MyLb --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The load balancer name.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_wait
+  name: az network lb wait
+  summary: Place the CLI in a waiting state until a condition of the load balancer is met.
+  description: ''
+  syntax: >-
+    az network lb wait [--created]
+                       [--custom]
+                       [--deleted]
+                       [--exists]
+                       [--expand]
+                       [--ids]
+                       [--interval]
+                       [--name]
+                       [--resource-group]
+                       [--subscription]
+                       [--timeout]
+                       [--updated]
+  examples:
+  - summary: Wait for load balancer to return as created.
+    syntax: az network lb wait -g MyResourceGroup -n MyLB --created
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --deleted
+    summary: Wait until deleted.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --name -n
+    summary: The load balancer name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_address_pool
-  name: az network lb address-pool
-  summary: Manage address pools of a load balancer.
-- uid: az_network_lb_address_pool_create
-  name: az network lb address-pool create
-  summary: Create an address pool.
-- uid: az_network_lb_address_pool_delete
-  name: az network lb address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_lb_address_pool_list
-  name: az network lb address-pool list
-  summary: List address pools.
-- uid: az_network_lb_address_pool_show
-  name: az network lb address-pool show
-  summary: Get the details of an address pool.
-- uid: az_network_lb_create
-  name: az network lb create
-  summary: Create a load balancer.
-- uid: az_network_lb_delete
-  name: az network lb delete
-  summary: Delete a load balancer.
-- uid: az_network_lb_frontend_ip
-  name: az network lb frontend-ip
-  summary: Manage frontend IP addresses of a load balancer.
-- uid: az_network_lb_frontend_ip_create
-  name: az network lb frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_lb_frontend_ip_delete
-  name: az network lb frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_lb_frontend_ip_list
-  name: az network lb frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_lb_frontend_ip_show
-  name: az network lb frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_lb_frontend_ip_update
-  name: az network lb frontend-ip update
-  summary: Update a frontend IP address.
-- uid: az_network_lb_inbound_nat_pool
-  name: az network lb inbound-nat-pool
-  summary: Manage inbound NAT address pools of a load balancer.
-- uid: az_network_lb_inbound_nat_pool_create
-  name: az network lb inbound-nat-pool create
-  summary: Create an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_delete
-  name: az network lb inbound-nat-pool delete
-  summary: Delete an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_list
-  name: az network lb inbound-nat-pool list
-  summary: List inbound NAT address pools.
-- uid: az_network_lb_inbound_nat_pool_show
-  name: az network lb inbound-nat-pool show
-  summary: Get the details of an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_update
-  name: az network lb inbound-nat-pool update
-  summary: Update an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_rule
-  name: az network lb inbound-nat-rule
-  summary: Manage inbound NAT rules of a load balancer.
-- uid: az_network_lb_inbound_nat_rule_create
-  name: az network lb inbound-nat-rule create
-  summary: Create an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_delete
-  name: az network lb inbound-nat-rule delete
-  summary: Delete an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_list
-  name: az network lb inbound-nat-rule list
-  summary: List inbound NAT rules.
-- uid: az_network_lb_inbound_nat_rule_show
-  name: az network lb inbound-nat-rule show
-  summary: Get the details of an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_update
-  name: az network lb inbound-nat-rule update
-  summary: Update an inbound NAT rule.
-- uid: az_network_lb_list
-  name: az network lb list
-  summary: List load balancers.
-- uid: az_network_lb_probe
-  name: az network lb probe
-  summary: Evaluate probe information and define routing rules.
-- uid: az_network_lb_probe_create
-  name: az network lb probe create
-  summary: Create a probe.
-- uid: az_network_lb_probe_delete
-  name: az network lb probe delete
-  summary: Delete a probe.
-- uid: az_network_lb_probe_list
-  name: az network lb probe list
-  summary: List probes.
-- uid: az_network_lb_probe_show
-  name: az network lb probe show
-  summary: Get the details of a probe.
-- uid: az_network_lb_probe_update
-  name: az network lb probe update
-  summary: Update a probe.
-- uid: az_network_lb_rule
-  name: az network lb rule
-  summary: Manage load balancing rules.
-- uid: az_network_lb_rule_create
-  name: az network lb rule create
-  summary: Create a load balancing rule.
-- uid: az_network_lb_rule_delete
-  name: az network lb rule delete
-  summary: Delete a load balancing rule.
-- uid: az_network_lb_rule_list
-  name: az network lb rule list
-  summary: List load balancing rules.
-- uid: az_network_lb_rule_show
-  name: az network lb rule show
-  summary: Get the details of a load balancing rule.
-- uid: az_network_lb_rule_update
-  name: az network lb rule update
-  summary: Update a load balancing rule.
-- uid: az_network_lb_show
-  name: az network lb show
-  summary: Get the details of a load balancer.
-- uid: az_network_lb_update
-  name: az network lb update
-  summary: Update a load balancer.
+- az_network_lb_address-pool
+- az_network_lb_address-pool_address
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+- az_network_lb_address-pool_create
+- az_network_lb_address-pool_delete
+- az_network_lb_address-pool_list
+- az_network_lb_address-pool_show
+- az_network_lb_create
+- az_network_lb_delete
+- az_network_lb_frontend-ip
+- az_network_lb_frontend-ip_create
+- az_network_lb_frontend-ip_delete
+- az_network_lb_frontend-ip_list
+- az_network_lb_frontend-ip_show
+- az_network_lb_frontend-ip_update
+- az_network_lb_inbound-nat-pool
+- az_network_lb_inbound-nat-pool_create
+- az_network_lb_inbound-nat-pool_delete
+- az_network_lb_inbound-nat-pool_list
+- az_network_lb_inbound-nat-pool_show
+- az_network_lb_inbound-nat-pool_update
+- az_network_lb_inbound-nat-rule
+- az_network_lb_inbound-nat-rule_create
+- az_network_lb_inbound-nat-rule_delete
+- az_network_lb_inbound-nat-rule_list
+- az_network_lb_inbound-nat-rule_show
+- az_network_lb_inbound-nat-rule_update
+- az_network_lb_list
+- az_network_lb_list-nic
+- az_network_lb_probe
+- az_network_lb_probe_create
+- az_network_lb_probe_delete
+- az_network_lb_probe_list
+- az_network_lb_probe_show
+- az_network_lb_probe_update
+- az_network_lb_rule
+- az_network_lb_rule_create
+- az_network_lb_rule_delete
+- az_network_lb_rule_list
+- az_network_lb_rule_show
+- az_network_lb_rule_update
+- az_network_lb_show
+- az_network_lb_update
+- az_network_lb_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -372,10 +385,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Azure Load Balancer visit <a href="https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli">https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Azure Load Balancer visit https://docs.microsoft.com/azure/load-balancer/load-balancer-get-started-internet-arm-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool.yml
index 8ab737c708..d633decd45 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool.yml
@@ -1,59 +1,110 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_address_pool
-  name: az network lb address-pool
-  summary: Manage address pools of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_address_pool_create
-  - az_network_lb_address_pool_delete
-  - az_network_lb_address_pool_list
-  - az_network_lb_address_pool_show
-- uid: az_network_lb_address_pool_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_address-pool
+name: az network lb address-pool
+summary: Manage address pools of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_address-pool_create
   name: az network lb address-pool create
   summary: Create an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool create --lb-name
+                                      --name
+                                      --resource-group
+                                      [--backend-address]
+                                      [--backend-addresses-config-file]
+                                      [--subscription]
+                                      [--vnet]
   examples:
   - summary: Create an address pool.
-    syntax:
-      content: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool
-  parameters:
+    syntax: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  - summary: Create an address pool with several backend addresses using key-value arguments.
+    syntax: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --vnet {VnetResourceId} --backend-address name=addr1 ip-address=10.0.0.1 --backend-address name=addr2 ip-address=10.0.0.3
+  - summary: Create an address pool with several backend addresses using config file
+    syntax: az network lb address-pool create -g MyResourceGroup --lb-name MyLb -n MyAddressPool --backend-addresses-config-file @config_file.json
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The load balancer name.
     description: ''
   - isRequired: true
     name: --name -n
-    summary: The name of the backend address pool.
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
+  - name: --backend-address
+    summary: Backend addresses information for backend address pool. If it's used, --vnet is required or subnet is required.
+    description: >-
+      Usage1: --backend-address name=addr1 ip-address=10.0.0.1 --vnet MyVnet
+
+      Usage2: --backend-address name=addr1 ip-address=10.0.0.1 subnet=/subscriptions/000/resourceGroups/MyRg/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet1
+
+      Usage3: --backend-address name=addr1 ip-address=10.0.0.1 subnet=subnet1 --vnet MyVnet
+
+
+      name: Required. The name of the backend address.
+
+      ip-address: Required. Ip Address within the Virtual Network.
+
+      subnet: Name or Id of the subnet.
+
+
+      Multiple backend addresses can be specified by using more than one `--backend-address` argument.
+  - name: --backend-addresses-config-file
+    summary: A config file used to set backend addresses. This argument is for experienced users. You may encounter parse errors if the json file is invalid.
+    description: >-
+      Usage: --backend-addresses-config-file @"{config_file.json}"
+
+
+      A example config file is
+
+      [
+        {
+          "name": "address1",
+          "virtualNetwork": "clitestvnet",
+          "ipAddress": "10.0.0.4"
+        },
+        {
+          "name": "address2",
+          "virtualNetwork": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_lb_address_pool_addresses000001/providers/Microsoft.Network/virtualNetworks/clitestvnet",
+          "ipAddress": "10.0.0.5"
+        },
+        {
+          "name": "address3",
+          "subnet": "subnet3",
+          "ipAddress": "10.0.0.6"
+        },
+        {
+          "name": "address4",
+          "subnet": "/subscriptions/000/resourceGroups/MyRg/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet4",
+          "ipAddress": "10.0.0.7"
+        }
+      ].
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_address_pool_delete
+  - name: --vnet
+    summary: Name or Id of the virtual network applied to all backend addresses.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_delete
   name: az network lb address-pool delete
   summary: Delete an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool delete --lb-name
+                                      --name
+                                      --resource-group
+                                      [--subscription]
   examples:
   - summary: Delete an address pool.
-    syntax:
-      content: az network lb address-pool delete -g MyResourceGroup --lb-name MyLb -n MyAddressPool
-  parameters:
+    syntax: az network lb address-pool delete -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -64,56 +115,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_address_pool_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_list
   name: az network lb address-pool list
   summary: List address pools.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool list --lb-name
+                                    --resource-group
+                                    [--query-examples]
+                                    [--subscription]
   examples:
   - summary: List address pools.
-    syntax:
-      content: az network lb address-pool list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb address-pool list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_address_pool_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_show
   name: az network lb address-pool show
   summary: Get the details of an address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb address-pool show --lb-name
+                                    --name
+                                    --resource-group
+                                    [--query-examples]
+                                    [--subscription]
   examples:
   - summary: Get the details of an address pool.
-    syntax:
-      content: az network lb address-pool show -g MyResourceGroup --lb-name MyLb -n MyAddressPool
-  parameters:
+    syntax: az network lb address-pool show -g MyResourceGroup --lb-name MyLb -n MyAddressPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -124,30 +175,25 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_address_pool_create
-  name: az network lb address-pool create
-  summary: Create an address pool.
-- uid: az_network_lb_address_pool_delete
-  name: az network lb address-pool delete
-  summary: Delete an address pool.
-- uid: az_network_lb_address_pool_list
-  name: az network lb address-pool list
-  summary: List address pools.
-- uid: az_network_lb_address_pool_show
-  name: az network lb address-pool show
-  summary: Get the details of an address pool.
+- az_network_lb_address-pool_address
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+- az_network_lb_address-pool_create
+- az_network_lb_address-pool_delete
+- az_network_lb_address-pool_list
+- az_network_lb_address-pool_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -163,10 +209,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage address pools of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools of a load balancer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool/address.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool/address.yml
new file mode 100644
index 0000000000..de25a33618
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/address-pool/address.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_address-pool_address
+name: az network lb address-pool address
+summary: Manage backend addresses of the load balance backend address pool.
+description: ''
+directCommands:
+- uid: az_network_lb_address-pool_address_add
+  name: az network lb address-pool address add
+  summary: Add one backend address into the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network lb address-pool address add --ip-address
+                                           --lb-name
+                                           --name
+                                           --pool-name
+                                           --resource-group
+                                           [--subscription]
+                                           [--vnet]
+  examples:
+  - summary: Add one backend address into the load balance backend address pool.
+    syntax: az network lb address-pool address add -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress --vnet MyVnet --ip-address 10.0.0.1
+  - summary: Add one backend address into the load balance backend address pool with subnet.
+    syntax: az network lb address-pool address add -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress --subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyRg/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet2 --ip-address 10.0.0.1
+  requiredParameters:
+  - isRequired: true
+    name: --ip-address
+    summary: Ip Address within the Virtual Network.
+    description: ''
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet
+    summary: Name or Id of the virtual network.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_address_list
+  name: az network lb address-pool address list
+  summary: List all backend addresses of the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network lb address-pool address list --lb-name
+                                            --pool-name
+                                            --resource-group
+                                            [--query-examples]
+                                            [--subscription]
+  examples:
+  - summary: List all backend addresses of the load balance backend address pool.
+    syntax: az network lb address-pool address list -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_address-pool_address_remove
+  name: az network lb address-pool address remove
+  summary: Remove one backend address from the load balance backend address pool.
+  description: ''
+  syntax: >-
+    az network lb address-pool address remove --lb-name
+                                              --name
+                                              --pool-name
+                                              --resource-group
+                                              [--subscription]
+  examples:
+  - summary: Remove one backend address from the load balance backend address pool.
+    syntax: az network lb address-pool address remove -g MyResourceGroup --lb-name MyLb --pool-name MyAddressPool -n MyAddress
+  requiredParameters:
+  - isRequired: true
+    name: --lb-name
+    summary: The load balancer name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the backend address.
+    description: ''
+  - isRequired: true
+    name: --pool-name
+    summary: The name of the backend address pool. If only one exists, omit to use as default.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_lb_address-pool_address_add
+- az_network_lb_address-pool_address_list
+- az_network_lb_address-pool_address_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage backend addresses of the load balance backend address pool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/frontend-ip.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/frontend-ip.yml
index e7cd83a439..86498d401c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb/frontend-ip.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/frontend-ip.yml
@@ -1,33 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_frontend_ip
-  name: az network lb frontend-ip
-  summary: Manage frontend IP addresses of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_frontend_ip_create
-  - az_network_lb_frontend_ip_delete
-  - az_network_lb_frontend_ip_list
-  - az_network_lb_frontend_ip_show
-  - az_network_lb_frontend_ip_update
-- uid: az_network_lb_frontend_ip_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_frontend-ip
+name: az network lb frontend-ip
+summary: Manage frontend IP addresses of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_frontend-ip_create
   name: az network lb frontend-ip create
   summary: Create a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip create --lb-name
+                                     --name
+                                     --resource-group
+                                     [--private-ip-address]
+                                     [--public-ip-address]
+                                     [--subnet]
+                                     [--subscription]
+                                     [--vnet-name]
+                                     [--zone {1, 2, 3}]
   examples:
   - summary: Create a frontend ip address for a public load balancer.
-    syntax:
-      content: az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb --public-ip-address MyFrontendIp
+    syntax: az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb --public-ip-address MyFrontendIp
   - summary: Create a frontend ip address for an internal load balancer.
-    syntax:
-      content: >-
-        az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb \
-            --private-ip-address 10.10.10.100 --subnet MySubnet --vnet-name MyVnet
-  parameters:
+    syntax: >-
+      az network lb frontend-ip create -g MyResourceGroup -n MyFrontendIp --lb-name MyLb \
+          --private-ip-address 10.10.10.100 --subnet MySubnet --vnet-name MyVnet
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The load balancer name.
@@ -38,8 +36,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --private-ip-address
     summary: Static private IP address to associate with the configuration.
     description: ''
@@ -49,6 +48,9 @@ items:
   - name: --subnet
     summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --vnet-name
     summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
     description: ''
@@ -56,26 +58,20 @@ items:
     parameterValueGroup: 1, 2, 3
     summary: Availability zone into which to provision the resource.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_delete
   name: az network lb frontend-ip delete
   summary: Delete a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip delete --lb-name
+                                     --name
+                                     --resource-group
+                                     [--subscription]
   examples:
   - summary: Delete a frontend IP address.
-    syntax:
-      content: az network lb frontend-ip delete -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
-  parameters:
+    syntax: az network lb frontend-ip delete -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -86,59 +82,58 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_list
   name: az network lb frontend-ip list
   summary: List frontend IP addresses.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip list --lb-name
+                                   --resource-group
+                                   [--query-examples]
+                                   [--subscription]
   examples:
   - summary: List frontend IP addresses.
-    syntax:
-      content: az network lb frontend-ip list -g MyResourceGroup --lb-name MyLb
-  parameters:
+    syntax: az network lb frontend-ip list -g MyResourceGroup --lb-name MyLb
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_show
   name: az network lb frontend-ip show
   summary: Get the details of a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip show --lb-name
+                                   --name
+                                   --resource-group
+                                   [--query-examples]
+                                   [--subscription]
   examples:
   - summary: Get the details of a frontend IP address.
-    syntax:
-      content: az network lb frontend-ip show -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
+    syntax: az network lb frontend-ip show -g MyResourceGroup --lb-name MyLb -n MyFrontendIp
   - summary: Get the details of a frontend IP address (autogenerated)
-    syntax:
-      content: az network lb frontend-ip show --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network lb frontend-ip show --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -149,45 +144,47 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_frontend_ip_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_frontend-ip_update
   name: az network lb frontend-ip update
   summary: Update a frontend IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb frontend-ip update [--add]
+                                     [--force-string]
+                                     [--ids]
+                                     [--lb-name]
+                                     [--name]
+                                     [--private-ip-address]
+                                     [--public-ip-address]
+                                     [--remove]
+                                     [--resource-group]
+                                     [--set]
+                                     [--subnet]
+                                     [--subscription]
+                                     [--vnet-name]
   examples:
   - summary: Update the frontend IP address of a public load balancer.
-    syntax:
-      content: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --public-ip-address MyNewPublicIp
+    syntax: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --public-ip-address MyNewPublicIp
   - summary: Update the frontend IP address of an internal load balancer.
-    syntax:
-      content: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --private-ip-address 10.10.10.50
+    syntax: az network lb frontend-ip update -g MyResourceGroup --lb-name MyLb -n MyFrontendIp --private-ip-address 10.10.10.50
   - summary: Update a frontend IP address. (autogenerated)
-    syntax:
-      content: az network lb frontend-ip update --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
-  parameters:
-  - name: --private-ip-address
-    summary: Static private IP address to associate with the configuration. Use "" to remove the static address and use a dynamic address instead.
-    description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the existing public IP to associate with the configuration.
-    description: ''
-  - name: --subnet
-    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    syntax: az network lb frontend-ip update --lb-name MyLb --name MyFrontendIp --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -198,46 +195,37 @@ items:
   - name: --name -n
     summary: The name of the frontend IP configuration.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --private-ip-address
+    summary: Static private IP address to associate with the configuration. Use ""('""' in PowerShell) to remove the static address and use a dynamic address instead.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --public-ip-address
+    summary: Name or ID of the existing public IP to associate with the configuration.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subnet
+    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_frontend_ip_create
-  name: az network lb frontend-ip create
-  summary: Create a frontend IP address.
-- uid: az_network_lb_frontend_ip_delete
-  name: az network lb frontend-ip delete
-  summary: Delete a frontend IP address.
-- uid: az_network_lb_frontend_ip_list
-  name: az network lb frontend-ip list
-  summary: List frontend IP addresses.
-- uid: az_network_lb_frontend_ip_show
-  name: az network lb frontend-ip show
-  summary: Get the details of a frontend IP address.
-- uid: az_network_lb_frontend_ip_update
-  name: az network lb frontend-ip update
-  summary: Update a frontend IP address.
+- az_network_lb_frontend-ip_create
+- az_network_lb_frontend-ip_delete
+- az_network_lb_frontend-ip_list
+- az_network_lb_frontend-ip_show
+- az_network_lb_frontend-ip_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -253,10 +241,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage frontend IP addresses of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage frontend IP addresses of a load balancer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-pool.yml
index 27a9e0aacc..1a8bdc946e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-pool.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-pool.yml
@@ -1,33 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_inbound_nat_pool
-  name: az network lb inbound-nat-pool
-  summary: Manage inbound NAT address pools of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_inbound_nat_pool_create
-  - az_network_lb_inbound_nat_pool_delete
-  - az_network_lb_inbound_nat_pool_list
-  - az_network_lb_inbound_nat_pool_show
-  - az_network_lb_inbound_nat_pool_update
-- uid: az_network_lb_inbound_nat_pool_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_inbound-nat-pool
+name: az network lb inbound-nat-pool
+summary: Manage inbound NAT address pools of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_inbound-nat-pool_create
   name: az network lb inbound-nat-pool create
   summary: Create an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool create --backend-port
+                                          --frontend-port-range-end
+                                          --frontend-port-range-start
+                                          --lb-name
+                                          --name
+                                          --protocol {All, Tcp, Udp}
+                                          --resource-group
+                                          [--floating-ip {false, true}]
+                                          [--frontend-ip-name]
+                                          [--idle-timeout]
+                                          [--subscription]
   examples:
   - summary: Create an inbound NAT address pool.
-    syntax:
-      content: >-
-        az network lb inbound-nat-pool create -g MyResourceGroup --lb-name MyLb \
+    syntax: >-
+      az network lb inbound-nat-pool create -g MyResourceGroup --lb-name MyLb \
 
-        -n MyNatPool --protocol Tcp --frontend-port-range-start 80 --frontend-port-range-end 89 \
+      -n MyNatPool --protocol Tcp --frontend-port-range-start 80 --frontend-port-range-end 89 \
 
-        --backend-port 80 --frontend-ip-name MyFrontendIp
-  parameters:
+      --backend-port 80 --frontend-ip-name MyFrontendIp
+  requiredParameters:
   - isRequired: true
     name: --backend-port
     summary: Port number.
@@ -55,8 +56,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --floating-ip
     parameterValueGroup: false, true
     summary: Enable floating IP.
@@ -70,23 +72,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_delete
   name: az network lb inbound-nat-pool delete
   summary: Delete an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool delete --lb-name
+                                          --name
+                                          --resource-group
+                                          [--subscription]
   examples:
   - summary: Delete an inbound NAT address pool.
-    syntax:
-      content: az network lb inbound-nat-pool delete -g MyResourceGroup --lb-name MyLb -n MyNatPool
-  parameters:
+    syntax: az network lb inbound-nat-pool delete -g MyResourceGroup --lb-name MyLb -n MyNatPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -97,56 +96,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_list
   name: az network lb inbound-nat-pool list
   summary: List inbound NAT address pools.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool list --lb-name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: List inbound NAT address pools.
-    syntax:
-      content: az network lb inbound-nat-pool list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb inbound-nat-pool list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_show
   name: az network lb inbound-nat-pool show
   summary: Get the details of an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool show --lb-name
+                                        --name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: Get the details of an inbound NAT address pool.
-    syntax:
-      content: az network lb inbound-nat-pool show -g MyResourceGroup --lb-name MyLb -n MyNatPool
-  parameters:
+    syntax: az network lb inbound-nat-pool show -g MyResourceGroup --lb-name MyLb -n MyNatPool
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -157,36 +156,52 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_pool_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-pool_update
   name: az network lb inbound-nat-pool update
   summary: Update an inbound NAT address pool.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-pool update [--add]
+                                          [--backend-port]
+                                          [--floating-ip {false, true}]
+                                          [--force-string]
+                                          [--frontend-ip-name]
+                                          [--frontend-port-range-end]
+                                          [--frontend-port-range-start]
+                                          [--idle-timeout]
+                                          [--ids]
+                                          [--lb-name]
+                                          [--name]
+                                          [--protocol {All, Tcp, Udp}]
+                                          [--remove]
+                                          [--resource-group]
+                                          [--set]
+                                          [--subscription]
   examples:
   - summary: Update an inbound NAT address pool to a different backend port.
-    syntax:
-      content: >-
-        az network lb inbound-nat-pool update -g MyResourceGroup --lb-name MyLb -n MyNatPool \
-            --protocol Tcp --backend-port 8080
+    syntax: >-
+      az network lb inbound-nat-pool update -g MyResourceGroup --lb-name MyLb -n MyNatPool \
+          --protocol Tcp --backend-port 8080
   - summary: Update an inbound NAT address pool. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-pool update --backend-port 8080 --enable-tcp-reset true --frontend-port-range-end 89 --frontend-port-range-start 80 --lb-name MyLb --name MyNatPool --resource-group MyResourceGroup
+    syntax: az network lb inbound-nat-pool update --backend-port 8080 --enable-tcp-reset true --frontend-port-range-end 89 --frontend-port-range-start 80 --lb-name MyLb --name MyNatPool --resource-group MyResourceGroup
   - summary: Update an inbound NAT address pool. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-pool update --enable-tcp-reset true --lb-name MyLb --name MyNatPool --protocol Udp --resource-group MyResourceGroup
-  parameters:
+    syntax: az network lb inbound-nat-pool update --enable-tcp-reset true --lb-name MyLb --name MyNatPool --protocol Udp --resource-group MyResourceGroup
+  - summary: Update an inbound NAT address pool. (autogenerated)
+    syntax: az network lb inbound-nat-pool update --backend-port 8080 --floating-ip true --frontend-port-range-end 89 --frontend-port-range-start 80 --lb-name MyLb --name MyNatPool --protocol Udp --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --backend-port
     summary: Port number.
     description: ''
@@ -194,6 +209,9 @@ items:
     parameterValueGroup: false, true
     summary: Enable floating IP.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip-name
     summary: The name of the frontend IP configuration.
     description: ''
@@ -206,10 +224,6 @@ items:
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
-  - name: --protocol
-    parameterValueGroup: All, Tcp, Udp
-    summary: Network transport protocol.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -219,46 +233,29 @@ items:
   - name: --name -n
     summary: The name of the inbound NAT pool.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: All, Tcp, Udp
+    summary: Network transport protocol.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_inbound_nat_pool_create
-  name: az network lb inbound-nat-pool create
-  summary: Create an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_delete
-  name: az network lb inbound-nat-pool delete
-  summary: Delete an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_list
-  name: az network lb inbound-nat-pool list
-  summary: List inbound NAT address pools.
-- uid: az_network_lb_inbound_nat_pool_show
-  name: az network lb inbound-nat-pool show
-  summary: Get the details of an inbound NAT address pool.
-- uid: az_network_lb_inbound_nat_pool_update
-  name: az network lb inbound-nat-pool update
-  summary: Update an inbound NAT address pool.
+- az_network_lb_inbound-nat-pool_create
+- az_network_lb_inbound-nat-pool_delete
+- az_network_lb_inbound-nat-pool_list
+- az_network_lb_inbound-nat-pool_show
+- az_network_lb_inbound-nat-pool_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -274,10 +271,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage inbound NAT address pools of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage inbound NAT address pools of a load balancer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-rule.yml
index ec1a233cfa..fd56c6bcd2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/inbound-nat-rule.yml
@@ -1,35 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_inbound_nat_rule
-  name: az network lb inbound-nat-rule
-  summary: Manage inbound NAT rules of a load balancer.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_inbound_nat_rule_create
-  - az_network_lb_inbound_nat_rule_delete
-  - az_network_lb_inbound_nat_rule_list
-  - az_network_lb_inbound_nat_rule_show
-  - az_network_lb_inbound_nat_rule_update
-- uid: az_network_lb_inbound_nat_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_inbound-nat-rule
+name: az network lb inbound-nat-rule
+summary: Manage inbound NAT rules of a load balancer.
+description: ''
+directCommands:
+- uid: az_network_lb_inbound-nat-rule_create
   name: az network lb inbound-nat-rule create
   summary: Create an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule create --backend-port
+                                          --frontend-port
+                                          --lb-name
+                                          --name
+                                          --protocol {All, Tcp, Udp}
+                                          --resource-group
+                                          [--floating-ip {false, true}]
+                                          [--frontend-ip-name]
+                                          [--idle-timeout]
+                                          [--subscription]
   examples:
   - summary: Create a basic inbound NAT rule for port 80.
-    syntax:
-      content: >-
-        az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule \
-            --protocol Tcp --frontend-port 80 --backend-port 80
+    syntax: >-
+      az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule \
+          --protocol Tcp --frontend-port 80 --backend-port 80
   - summary: Create a basic inbound NAT rule for a specific frontend IP and enable floating IP for NAT Rule.
-    syntax:
-      content: >-
-        az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule --protocol Tcp \
-            --frontend-port 5432 --backend-port 3389 --frontend-ip-name MyFrontendIp --floating-ip true
-  parameters:
+    syntax: >-
+      az network lb inbound-nat-rule create -g MyResourceGroup --lb-name MyLb -n MyNatRule --protocol Tcp \
+          --frontend-port 5432 --backend-port 3389 --frontend-ip-name MyFrontendIp --floating-ip true
+  requiredParameters:
   - isRequired: true
     name: --backend-port
     summary: Port number.
@@ -53,8 +52,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --floating-ip
     parameterValueGroup: false, true
     summary: Enable floating IP.
@@ -68,23 +68,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_delete
   name: az network lb inbound-nat-rule delete
   summary: Delete an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule delete --lb-name
+                                          --name
+                                          --resource-group
+                                          [--subscription]
   examples:
   - summary: Delete an inbound NAT rule.
-    syntax:
-      content: az network lb inbound-nat-rule delete -g MyResourceGroup --lb-name MyLb -n MyNatRule
-  parameters:
+    syntax: az network lb inbound-nat-rule delete -g MyResourceGroup --lb-name MyLb -n MyNatRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -95,56 +92,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_list
   name: az network lb inbound-nat-rule list
   summary: List inbound NAT rules.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule list --lb-name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: List inbound NAT rules.
-    syntax:
-      content: az network lb inbound-nat-rule list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb inbound-nat-rule list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_show
   name: az network lb inbound-nat-rule show
   summary: Get the details of an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule show --lb-name
+                                        --name
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: Get the details of an inbound NAT rule.
-    syntax:
-      content: az network lb inbound-nat-rule show -g MyResourceGroup --lb-name MyLb -n MyNatRule
-  parameters:
+    syntax: az network lb inbound-nat-rule show -g MyResourceGroup --lb-name MyLb -n MyNatRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -155,36 +152,49 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_lb_inbound_nat_rule_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_lb_inbound-nat-rule_update
   name: az network lb inbound-nat-rule update
   summary: Update an inbound NAT rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb inbound-nat-rule update [--add]
+                                          [--backend-port]
+                                          [--floating-ip {false, true}]
+                                          [--force-string]
+                                          [--frontend-ip-name]
+                                          [--frontend-port]
+                                          [--idle-timeout]
+                                          [--ids]
+                                          [--lb-name]
+                                          [--name]
+                                          [--protocol {All, Tcp, Udp}]
+                                          [--remove]
+                                          [--resource-group]
+                                          [--set]
+                                          [--subscription]
   examples:
   - summary: Update an inbound NAT rule to disable floating IP and modify idle timeout duration.
-    syntax:
-      content: >-
-        az network lb inbound-nat-rule update -g MyResourceGroup --lb-name MyLb -n MyNatRule \
-            --floating-ip false --idle-timeout 5
+    syntax: >-
+      az network lb inbound-nat-rule update -g MyResourceGroup --lb-name MyLb -n MyNatRule \
+          --floating-ip false --idle-timeout 5
   - summary: Update an inbound NAT rule. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-rule update --backend-port 3389 --frontend-port 5432 --lb-name MyLb --name MyNatRule --protocol Udp --resource-group MyResourceGroup
+    syntax: az network lb inbound-nat-rule update --backend-port 3389 --frontend-port 5432 --lb-name MyLb --name MyNatRule --protocol Udp --resource-group MyResourceGroup
   - summary: Update an inbound NAT rule. (autogenerated)
-    syntax:
-      content: az network lb inbound-nat-rule update --lb-name MyLb --name MyNatRule --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
-  parameters:
+    syntax: az network lb inbound-nat-rule update --lb-name MyLb --name MyNatRule --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --backend-port
     summary: Port number.
     description: ''
@@ -192,6 +202,9 @@ items:
     parameterValueGroup: false, true
     summary: Enable floating IP.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip-name
     summary: The name of the frontend IP configuration.
     description: ''
@@ -201,10 +214,6 @@ items:
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
-  - name: --protocol
-    parameterValueGroup: All, Tcp, Udp
-    summary: Network transport protocol.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -214,46 +223,29 @@ items:
   - name: --name -n
     summary: The name of the inbound NAT rule.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: All, Tcp, Udp
+    summary: Network transport protocol.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_inbound_nat_rule_create
-  name: az network lb inbound-nat-rule create
-  summary: Create an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_delete
-  name: az network lb inbound-nat-rule delete
-  summary: Delete an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_list
-  name: az network lb inbound-nat-rule list
-  summary: List inbound NAT rules.
-- uid: az_network_lb_inbound_nat_rule_show
-  name: az network lb inbound-nat-rule show
-  summary: Get the details of an inbound NAT rule.
-- uid: az_network_lb_inbound_nat_rule_update
-  name: az network lb inbound-nat-rule update
-  summary: Update an inbound NAT rule.
+- az_network_lb_inbound-nat-rule_create
+- az_network_lb_inbound-nat-rule_delete
+- az_network_lb_inbound-nat-rule_list
+- az_network_lb_inbound-nat-rule_show
+- az_network_lb_inbound-nat-rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -269,10 +261,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage inbound NAT rules of a load balancer.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage inbound NAT rules of a load balancer.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/probe.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/probe.yml
index 8cf02b6311..a22bd3fd69 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb/probe.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/probe.yml
@@ -1,35 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_probe
-  name: az network lb probe
-  summary: Evaluate probe information and define routing rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_probe_create
-  - az_network_lb_probe_delete
-  - az_network_lb_probe_list
-  - az_network_lb_probe_show
-  - az_network_lb_probe_update
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_probe
+name: az network lb probe
+summary: Evaluate probe information and define routing rules.
+description: ''
+directCommands:
 - uid: az_network_lb_probe_create
   name: az network lb probe create
   summary: Create a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe create --lb-name
+                               --name
+                               --port
+                               --protocol {Http, Tcp}
+                               --resource-group
+                               [--interval]
+                               [--path]
+                               [--subscription]
+                               [--threshold]
   examples:
   - summary: Create a probe on a load balancer over HTTP and port 80.
-    syntax:
-      content: >-
-        az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
-            --protocol http --port 80 --path /
+    syntax: >-
+      az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol http --port 80 --path /
   - summary: Create a probe on a load balancer over TCP on port 443.
-    syntax:
-      content: >-
-        az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
-            --protocol tcp --port 443
-  parameters:
+    syntax: >-
+      az network lb probe create -g MyResourceGroup --lb-name MyLb -n MyProbe \
+          --protocol tcp --port 443
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The load balancer name.
@@ -49,37 +47,35 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --interval
     summary: Probing time interval in seconds.
     description: ''
   - name: --path
     summary: The endpoint to interrogate (http only).
     description: ''
-  - name: --threshold
-    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_delete
   name: az network lb probe delete
   summary: Delete a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe delete --lb-name
+                               --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Delete a probe.
-    syntax:
-      content: az network lb probe delete -g MyResourceGroup --lb-name MyLb -n MyProbe
-  parameters:
+    syntax: az network lb probe delete -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -90,56 +86,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_list
   name: az network lb probe list
   summary: List probes.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe list --lb-name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List probes.
-    syntax:
-      content: az network lb probe list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb probe list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_show
   name: az network lb probe show
   summary: Get the details of a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe show --lb-name
+                             --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get the details of a probe.
-    syntax:
-      content: az network lb probe show -g MyResourceGroup --lb-name MyLb -n MyProbe
-  parameters:
+    syntax: az network lb probe show -g MyResourceGroup --lb-name MyLb -n MyProbe
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -150,93 +146,91 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_probe_update
   name: az network lb probe update
   summary: Update a probe.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb probe update [--add]
+                               [--force-string]
+                               [--ids]
+                               [--interval]
+                               [--lb-name]
+                               [--name]
+                               [--path]
+                               [--port]
+                               [--protocol {Http, Tcp}]
+                               [--remove]
+                               [--resource-group]
+                               [--set]
+                               [--subscription]
+                               [--threshold]
   examples:
   - summary: Update a probe with a different port and interval.
-    syntax:
-      content: az network lb probe update -g MyResourceGroup --lb-name MyLb -n MyProbe --port 81 --interval 10
-  parameters:
-  - name: --interval
-    summary: Probing time interval in seconds.
-    description: ''
-  - name: --path
-    summary: The endpoint to interrogate (http only).
-    description: ''
-  - name: --port
-    summary: The port to interrogate.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: Http, Tcp
-    summary: The protocol to probe.
+    syntax: az network lb probe update -g MyResourceGroup --lb-name MyLb -n MyProbe --port 81 --interval 10
+  - summary: Update a probe. (autogenerated)
+    syntax: az network lb probe update --lb-name MyLb --name MyProbe --port 81 --protocol Http --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --threshold
-    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --interval
+    summary: Probing time interval in seconds.
+    description: ''
   - name: --lb-name
     summary: The load balancer name.
     description: ''
   - name: --name -n
     summary: The name of the probe.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --path
+    summary: The endpoint to interrogate (http only).
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --port
+    summary: The port to interrogate.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --protocol
+    parameterValueGroup: Http, Tcp
+    summary: The protocol to probe.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --threshold
+    summary: The number of consecutive probe failures before an instance is deemed unhealthy.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_probe_create
-  name: az network lb probe create
-  summary: Create a probe.
-- uid: az_network_lb_probe_delete
-  name: az network lb probe delete
-  summary: Delete a probe.
-- uid: az_network_lb_probe_list
-  name: az network lb probe list
-  summary: List probes.
-- uid: az_network_lb_probe_show
-  name: az network lb probe show
-  summary: Get the details of a probe.
-- uid: az_network_lb_probe_update
-  name: az network lb probe update
-  summary: Update a probe.
+- az_network_lb_probe_create
+- az_network_lb_probe_delete
+- az_network_lb_probe_list
+- az_network_lb_probe_show
+- az_network_lb_probe_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -252,10 +246,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Evaluate probe information and define routing rules.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Evaluate probe information and define routing rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/lb/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/lb/rule.yml
index 469d23b7a1..82dd075dc5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/lb/rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/lb/rule.yml
@@ -1,43 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_lb_rule
-  name: az network lb rule
-  summary: Manage load balancing rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_lb_rule_create
-  - az_network_lb_rule_delete
-  - az_network_lb_rule_list
-  - az_network_lb_rule_show
-  - az_network_lb_rule_update
+### YamlMime:AzureCLIGroup
+uid: az_network_lb_rule
+name: az network lb rule
+summary: Manage load balancing rules.
+description: ''
+directCommands:
 - uid: az_network_lb_rule_create
   name: az network lb rule create
   summary: Create a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule create --backend-port
+                              --frontend-port
+                              --lb-name
+                              --name
+                              --protocol {All, Tcp, Udp}
+                              --resource-group
+                              [--backend-pool-name]
+                              [--floating-ip {false, true}]
+                              [--frontend-ip-name]
+                              [--idle-timeout]
+                              [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                              [--probe-name]
+                              [--subscription]
   examples:
   - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port.
-    syntax:
-      content: >-
-        az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
-            --frontend-ip-name MyFrontEndIp --frontend-port 80 \
-            --backend-pool-name MyAddressPool --backend-port 80
+    syntax: >-
+      az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --frontend-port 80 \
+          --backend-pool-name MyAddressPool --backend-port 80
   - summary: Create a load balancing rule that assigns a front-facing IP configuration and port to an address pool and port with the floating ip feature.
-    syntax:
-      content: >-
-        az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
-            --frontend-ip-name MyFrontEndIp --backend-pool-name MyAddressPool  \
-            --floating-ip true --frontend-port 80 --backend-port 80
+    syntax: >-
+      az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Tcp \
+          --frontend-ip-name MyFrontEndIp --backend-pool-name MyAddressPool  \
+          --floating-ip true --frontend-port 80 --backend-port 80
   - summary: Create an HA ports load balancing rule that assigns a frontend IP and port to use all available backend IPs in a pool on the same port.
-    syntax:
-      content: >-
-        az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyHAPortsRule \
-            --protocol All --frontend-port 0 --backend-port 0 --frontend-ip-name MyFrontendIp \
-            --backend-pool-name MyAddressPool
-  parameters:
+    syntax: >-
+      az network lb rule create -g MyResourceGroup --lb-name MyLb -n MyHAPortsRule \
+          --protocol All --frontend-port 0 --backend-port 0 --frontend-ip-name MyFrontendIp \
+          --backend-pool-name MyAddressPool
+  requiredParameters:
   - isRequired: true
     name: --backend-port
     summary: Port number.
@@ -61,8 +62,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --backend-pool-name
     summary: The name of the backend address pool. If only one exists, omit to use as default.
     description: ''
@@ -87,23 +89,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_delete
   name: az network lb rule delete
   summary: Delete a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule delete --lb-name
+                              --name
+                              --resource-group
+                              [--subscription]
   examples:
   - summary: Delete a load balancing rule.
-    syntax:
-      content: az network lb rule delete -g MyResourceGroup --lb-name MyLb -n MyLbRule
-  parameters:
+    syntax: az network lb rule delete -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -114,56 +113,56 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_list
   name: az network lb rule list
   summary: List load balancing rules.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule list --lb-name
+                            --resource-group
+                            [--query-examples]
+                            [--subscription]
   examples:
   - summary: List load balancing rules.
-    syntax:
-      content: az network lb rule list -g MyResourceGroup --lb-name MyLb -o table
-  parameters:
+    syntax: az network lb rule list -g MyResourceGroup --lb-name MyLb -o table
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_show
   name: az network lb rule show
   summary: Get the details of a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule show --lb-name
+                            --name
+                            --resource-group
+                            [--query-examples]
+                            [--subscription]
   examples:
   - summary: Get the details of a load balancing rule.
-    syntax:
-      content: az network lb rule show -g MyResourceGroup --lb-name MyLb -n MyLbRule
-  parameters:
+    syntax: az network lb rule show -g MyResourceGroup --lb-name MyLb -n MyLbRule
+  requiredParameters:
   - isRequired: true
     name: --lb-name
     summary: The name of the load balancer.
@@ -174,34 +173,52 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_lb_rule_update
   name: az network lb rule update
   summary: Update a load balancing rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network lb rule update [--add]
+                              [--backend-pool-name]
+                              [--backend-port]
+                              [--floating-ip {false, true}]
+                              [--force-string]
+                              [--frontend-ip-name]
+                              [--frontend-port]
+                              [--idle-timeout]
+                              [--ids]
+                              [--lb-name]
+                              [--load-distribution {Default, SourceIP, SourceIPProtocol}]
+                              [--name]
+                              [--probe-name]
+                              [--protocol {All, Tcp, Udp}]
+                              [--remove]
+                              [--resource-group]
+                              [--set]
+                              [--subscription]
   examples:
   - summary: Update a load balancing rule to change the protocol to UDP.
-    syntax:
-      content: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Udp
+    syntax: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule --protocol Udp
   - summary: Update a load balancing rule to support HA ports.
-    syntax:
-      content: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule \ --protocol All --frontend-port 0 --backend-port 0
+    syntax: az network lb rule update -g MyResourceGroup --lb-name MyLb -n MyLbRule \ --protocol All --frontend-port 0 --backend-port 0
+  - summary: Update a load balancing rule. (autogenerated)
+    syntax: az network lb rule update --disable-outbound-snat true --lb-name MyLb --name MyLbRule --resource-group MyResourceGroup
   - summary: Update a load balancing rule. (autogenerated)
-    syntax:
-      content: az network lb rule update --disable-outbound-snat true --lb-name MyLb --name MyLbRule --resource-group MyResourceGroup
-  parameters:
+    syntax: az network lb rule update --idle-timeout 5 --lb-name MyLb --name MyLbRule --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --backend-pool-name
     summary: The name of the backend address pool.
     description: ''
@@ -212,6 +229,9 @@ items:
     parameterValueGroup: false, true
     summary: Enable floating IP.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --frontend-ip-name
     summary: The name of the frontend IP configuration.
     description: ''
@@ -221,11 +241,20 @@ items:
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --lb-name
+    summary: The load balancer name.
+    description: ''
   - name: --load-distribution
     defaultValue: default
     parameterValueGroup: Default, SourceIP, SourceIPProtocol
     summary: Affinity rule settings.
     description: ''
+  - name: --name -n
+    summary: The name of the load balancing rule.
+    description: ''
   - name: --probe-name
     summary: Name of an existing probe to associate with this rule.
     description: ''
@@ -233,55 +262,25 @@ items:
     parameterValueGroup: All, Tcp, Udp
     summary: Network transport protocol.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --lb-name
-    summary: The load balancer name.
-    description: ''
-  - name: --name -n
-    summary: The name of the load balancing rule.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_lb_rule_create
-  name: az network lb rule create
-  summary: Create a load balancing rule.
-- uid: az_network_lb_rule_delete
-  name: az network lb rule delete
-  summary: Delete a load balancing rule.
-- uid: az_network_lb_rule_list
-  name: az network lb rule list
-  summary: List load balancing rules.
-- uid: az_network_lb_rule_show
-  name: az network lb rule show
-  summary: Get the details of a load balancing rule.
-- uid: az_network_lb_rule_update
-  name: az network lb rule update
-  summary: Update a load balancing rule.
+- az_network_lb_rule_create
+- az_network_lb_rule_delete
+- az_network_lb_rule_list
+- az_network_lb_rule_show
+- az_network_lb_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -297,10 +296,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage load balancing rules.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage load balancing rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/local-gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/network/local-gateway.yml
index ad861c20b0..689256798e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/local-gateway.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/local-gateway.yml
@@ -1,31 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_local_gateway
-  name: az network local-gateway
-  summary: Manage local gateways.
-  description: 'For more information on local gateways, visit: <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet</a>.'
-  langs:
-  - azurecli
-  children:
-  - az_network_local_gateway_create
-  - az_network_local_gateway_delete
-  - az_network_local_gateway_list
-  - az_network_local_gateway_show
-  - az_network_local_gateway_update
-  - az_network_local_gateway_wait
-- uid: az_network_local_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_local-gateway
+name: az network local-gateway
+summary: Manage local gateways.
+description: 'For more information on local gateways, visit: https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet.'
+directCommands:
+- uid: az_network_local-gateway_create
   name: az network local-gateway create
   summary: Create a local VPN gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway create --gateway-ip-address
+                                    --name
+                                    --resource-group
+                                    [--asn]
+                                    [--bgp-peering-address]
+                                    [--local-address-prefixes]
+                                    [--location]
+                                    [--no-wait]
+                                    [--peer-weight]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Create a Local Network Gateway to represent your on-premises site.
-    syntax:
-      content: >-
-        az network local-gateway create -g MyResourceGroup -n MyLocalGateway \
-            --gateway-ip-address 23.99.221.164 --local-address-prefixes 10.0.0.0/24 20.0.0.0/24
-  parameters:
+    syntax: >-
+      az network local-gateway create -g MyResourceGroup -n MyLocalGateway \
+          --gateway-ip-address 23.99.221.164 --local-address-prefixes 10.0.0.0/24 20.0.0.0/24
+  requiredParameters:
   - isRequired: true
     name: --gateway-ip-address
     summary: Gateway's public IP address. (e.g. 10.1.1.1).
@@ -36,216 +36,214 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: Autonomous System Number to use for the BGP settings.
+    description: ''
+  - name: --bgp-peering-address
+    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
     description: ''
   - name: --local-address-prefixes
     summary: List of CIDR block prefixes representing the address space of the OnPremise VPN's subnet.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --asn
-    summary: Autonomous System Number to use for the BGP settings.
-    description: ''
-  - name: --bgp-peering-address
-    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
-    description: ''
   - name: --peer-weight
     summary: Weight (0-100) added to routes learned through BGP peering.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_delete
   name: az network local-gateway delete
   summary: Delete a local VPN gateway.
-  description: 'In order to delete a Local Network Gateway, you must first delete ALL Connection objects in Azure that are connected to the Gateway. After deleting the Gateway, proceed to delete other resources now not in use. For more information, follow the order of instructions on this page: <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal</a>.'
-  langs:
-  - azurecli
+  description: 'In order to delete a Local Network Gateway, you must first delete ALL Connection objects in Azure that are connected to the Gateway. After deleting the Gateway, proceed to delete other resources now not in use. For more information, follow the order of instructions on this page: https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal.'
+  syntax: >-
+    az network local-gateway delete [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Create a Local Network Gateway to represent your on-premises site.
-    syntax:
-      content: az network local-gateway delete -g MyResourceGroup -n MyLocalGateway
+    syntax: az network local-gateway delete -g MyResourceGroup -n MyLocalGateway
   - summary: Delete a local VPN gateway. (autogenerated)
-    syntax:
-      content: az network local-gateway delete --name MyLocalGateway --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network local-gateway delete --name MyLocalGateway --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the local network gateway.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_list
   name: az network local-gateway list
   summary: List all local VPN gateways in a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway list --resource-group
+                                  [--query-examples]
+                                  [--subscription]
   examples:
   - summary: List all local VPN gateways in a resource group.
-    syntax:
-      content: az network local-gateway list -g MyResourceGroup
-  parameters:
+    syntax: az network local-gateway list -g MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_show
   name: az network local-gateway show
   summary: Get the details of a local VPN gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway show [--ids]
+                                  [--name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Get the details of a local VPN gateway.
-    syntax:
-      content: az network local-gateway show -g MyResourceGroup -n MyLocalGateway
-  parameters:
+    syntax: az network local-gateway show -g MyResourceGroup -n MyLocalGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the local network gateway.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_update
   name: az network local-gateway update
   summary: Update a local VPN gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway update [--add]
+                                    [--asn]
+                                    [--bgp-peering-address]
+                                    [--force-string]
+                                    [--gateway-ip-address]
+                                    [--ids]
+                                    [--local-address-prefixes]
+                                    [--name]
+                                    [--no-wait]
+                                    [--peer-weight]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+                                    [--subscription]
+                                    [--tags]
   examples:
   - summary: Update a Local Network Gateway provisioned with a 10.0.0.0/24 address prefix with additional prefixes.
-    syntax:
-      content: >-
-        az network local-gateway update -g MyResourceGroup -n MyLocalGateway \
-            --local-address-prefixes 10.0.0.0/24 20.0.0.0/24 30.0.0.0/24
+    syntax: >-
+      az network local-gateway update -g MyResourceGroup -n MyLocalGateway \
+          --local-address-prefixes 10.0.0.0/24 20.0.0.0/24 30.0.0.0/24
   - summary: Update a local VPN gateway. (autogenerated)
-    syntax:
-      content: az network local-gateway update --gateway-ip-address 23.99.221.164 --name MyLocalGateway --resource-group MyResourceGroup
-  parameters:
-  - name: --gateway-ip-address
-    summary: Gateway's public IP address. (e.g. 10.1.1.1).
+    syntax: az network local-gateway update --gateway-ip-address 23.99.221.164 --name MyLocalGateway --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --local-address-prefixes
-    summary: List of CIDR block prefixes representing the address space of the OnPremise VPN's subnet.
+  - name: --asn
+    summary: Autonomous System Number to use for the BGP settings.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --bgp-peering-address
+    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-ip-address
+    summary: Gateway's public IP address. (e.g. 10.1.1.1).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --local-address-prefixes
+    summary: List of CIDR block prefixes representing the address space of the OnPremise VPN's subnet.
+    description: ''
   - name: --name -n
     summary: Name of the local network gateway.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --asn
-    summary: Autonomous System Number to use for the BGP settings.
-    description: ''
-  - name: --bgp-peering-address
-    summary: IP address from the OnPremise VPN's subnet to use for BGP peering.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --peer-weight
     summary: Weight (0-100) added to routes learned through BGP peering.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_local_gateway_wait
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_local-gateway_wait
   name: az network local-gateway wait
   summary: Place the CLI in a waiting state until a condition of the local gateway is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network local-gateway wait [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--ids]
+                                  [--interval]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
   examples:
   - summary: Wait for Local Network Gateway to return as created.
-    syntax:
-      content: az network local-gateway wait -g MyResourceGroup -n MyLocalGateway --created
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the local network gateway.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network local-gateway wait -g MyResourceGroup -n MyLocalGateway --created
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -258,10 +256,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the local network gateway.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -269,31 +279,14 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_local_gateway_create
-  name: az network local-gateway create
-  summary: Create a local VPN gateway.
-- uid: az_network_local_gateway_delete
-  name: az network local-gateway delete
-  summary: Delete a local VPN gateway.
-- uid: az_network_local_gateway_list
-  name: az network local-gateway list
-  summary: List all local VPN gateways in a resource group.
-- uid: az_network_local_gateway_show
-  name: az network local-gateway show
-  summary: Get the details of a local VPN gateway.
-- uid: az_network_local_gateway_update
-  name: az network local-gateway update
-  summary: Update a local VPN gateway.
-- uid: az_network_local_gateway_wait
-  name: az network local-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the local gateway is met.
+- az_network_local-gateway_create
+- az_network_local-gateway_delete
+- az_network_local-gateway_list
+- az_network_local-gateway_show
+- az_network_local-gateway_update
+- az_network_local-gateway_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -309,10 +302,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: 'For more information on local gateways, visit: <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet</a>.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: 'For more information on local gateways, visit: https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli#localnet.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nic.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nic.yml
index b2ca26da67..912ac50b9c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/nic.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nic.yml
@@ -1,66 +1,95 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic
-  name: az network nic
-  summary: Manage network interfaces.
-  description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_create
-  - az_network_nic_delete
-  - az_network_nic_list
-  - az_network_nic_list_effective_nsg
-  - az_network_nic_show
-  - az_network_nic_show_effective_route_table
-  - az_network_nic_update
-  - az_network_nic_wait
+### YamlMime:AzureCLIGroup
+uid: az_network_nic
+name: az network nic
+summary: Manage network interfaces.
+description: To learn more about network interfaces in Azure visit https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface.
+directCommands:
 - uid: az_network_nic_create
   name: az network nic create
   summary: Create a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic create --name
+                          --resource-group
+                          --subnet
+                          [--accelerated-networking {false, true}]
+                          [--app-gateway-address-pools]
+                          [--application-security-groups]
+                          [--dns-servers]
+                          [--gateway-name]
+                          [--internal-dns-name]
+                          [--ip-forwarding {false, true}]
+                          [--lb-address-pools]
+                          [--lb-inbound-nat-rules]
+                          [--lb-name]
+                          [--location]
+                          [--network-security-group]
+                          [--no-wait]
+                          [--private-ip-address]
+                          [--private-ip-address-version {IPv4, IPv6}]
+                          [--public-ip-address]
+                          [--subscription]
+                          [--tags]
+                          [--vnet-name]
   examples:
   - summary: Create a network interface for a specified subnet on a specified virtual network.
-    syntax:
-      content: az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic
+    syntax: az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic
   - summary: Create a network interface for a specified subnet on a virtual network which allows
-    syntax:
-      content: >-
-        az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
-            --ip-forwarding --network-security-group MyNsg
+    syntax: >-
+      az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
+          --ip-forwarding --network-security-group MyNsg
   - summary: Create a network interface for a specified subnet on a virtual network with network security group and application security groups.
-    syntax:
-      content: >-
-        az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
-            --network-security-group MyNsg --application-security-groups Web App
-  parameters:
+    syntax: >-
+      az network nic create -g MyResourceGroup --vnet-name MyVnet --subnet MySubnet -n MyNic \
+          --network-security-group MyNsg --application-security-groups Web App
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The network interface (NIC).
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --subnet
     summary: Name or ID of an existing subnet. If name specified, also specify --vnet-name. If you want to use an existing subnet in other resource group, please provide the ID instead of the name of the subnet.
     description: ''
+  optionalParameters:
   - name: --accelerated-networking
     parameterValueGroup: false, true
     summary: Enable accelerated networking.
     description: ''
+  - name: --app-gateway-address-pools
+    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
+    description: ''
   - name: --application-security-groups
     summary: Space-separated list of application security groups.
     description: ''
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses.
+    description: ''
+  - name: --gateway-name
+    summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
+    description: ''
+  - name: --internal-dns-name
+    summary: The internal DNS name label.
+    description: ''
   - name: --ip-forwarding
     parameterValueGroup: false, true
     summary: Enable IP forwarding.
     description: ''
+  - name: --lb-address-pools
+    summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
+    description: ''
+  - name: --lb-inbound-nat-rules
+    summary: Space-separated list of names or IDs of load balancer inbound NAT rules to associate with the NIC. If names are used, --lb-name must be specified.
+    description: ''
+  - name: --lb-name
+    summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --network-security-group
     summary: Name or ID of an existing network security group, or none by default.
@@ -79,108 +108,81 @@ items:
   - name: --public-ip-address
     summary: Name or ID of an existing public IP address, or none by default.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --app-gateway-address-pools
-    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
-    description: ''
-  - name: --gateway-name
-    summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
-    description: ''
-  - name: --dns-servers
-    summary: Space-separated list of DNS server IP addresses.
-    description: ''
-  - name: --internal-dns-name
-    summary: The internal DNS name label.
-    description: ''
-  - name: --lb-address-pools
-    summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
-    description: ''
-  - name: --lb-inbound-nat-rules
-    summary: Space-separated list of names or IDs of load balancer inbound NAT rules to associate with the NIC. If names are used, --lb-name must be specified.
-    description: ''
-  - name: --lb-name
-    summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_delete
   name: az network nic delete
   summary: Delete a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic delete [--ids]
+                          [--name]
+                          [--no-wait]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Delete a network interface.
-    syntax:
-      content: az network nic delete -g MyResourceGroup -n MyNic
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network nic delete -g MyResourceGroup -n MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The network interface (NIC).
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_list
   name: az network nic list
   summary: List network interfaces.
   description: To list network interfaces attached to VMs in VM scale sets use 'az vmss nic list' or 'az vmss nic list-vm-nics'.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic list [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: List all NICs by internal DNS suffix.
-    syntax:
-      content: az network nic list --query "[?dnsSettings.internalDomainNameSuffix=`{dnsSuffix}`]"
-  parameters:
+    syntax: az network nic list --query "[?dnsSettings.internalDomainNameSuffix=`{dnsSuffix}`]"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_list_effective_nsg
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_list-effective-nsg
   name: az network nic list-effective-nsg
   summary: List all effective network security groups applied to a network interface.
-  description: To learn more about troubleshooting using effective security rules visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-nsg-troubleshoot-portal">https://docs.microsoft.com/azure/virtual-network/virtual-network-nsg-troubleshoot-portal</a>.
-  langs:
-  - azurecli
+  description: To learn more about troubleshooting using effective security rules visit https://docs.microsoft.com/azure/virtual-network/virtual-network-nsg-troubleshoot-portal.
+  syntax: >-
+    az network nic list-effective-nsg [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
   examples:
   - summary: List the effective security groups associated with a NIC.
-    syntax:
-      content: az network nic list-effective-nsg -g MyResourceGroup -n MyNic
-  parameters:
+    syntax: az network nic list-effective-nsg -g MyResourceGroup -n MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -188,28 +190,27 @@ items:
     summary: The network interface (NIC).
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_show
   name: az network nic show
   summary: Get the details of a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic show [--expand]
+                        [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Get the internal domain name suffix of a NIC.
-    syntax:
-      content: az network nic show -g MyResourceGroup -n MyNic --query "dnsSettings.internalDomainNameSuffix"
-  parameters:
+    syntax: az network nic show -g MyResourceGroup -n MyNic --query "dnsSettings.internalDomainNameSuffix"
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -219,29 +220,29 @@ items:
   - name: --name -n
     summary: The network interface (NIC).
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_show_effective_route_table
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_show-effective-route-table
   name: az network nic show-effective-route-table
   summary: Show the effective route table applied to a network interface.
-  description: To learn more about troubleshooting using the effective route tables visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-routes-troubleshoot-portal#using-effective-routes-to-troubleshoot-vm-traffic-flow">https://docs.microsoft.com/azure/virtual-network/virtual-network-routes-troubleshoot-portal#using-effective-routes-to-troubleshoot-vm-traffic-flow</a>.
-  langs:
-  - azurecli
+  description: To learn more about troubleshooting using the effective route tables visit https://docs.microsoft.com/azure/virtual-network/virtual-network-routes-troubleshoot-portal#using-effective-routes-to-troubleshoot-vm-traffic-flow.
+  syntax: >-
+    az network nic show-effective-route-table [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: Show the effective routes applied to a network interface.
-    syntax:
-      content: az network nic show-effective-route-table -g MyResourceGroup -n MyNic
-  parameters:
+    syntax: az network nic show-effective-route-table -g MyResourceGroup -n MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -249,107 +250,105 @@ items:
     summary: The network interface (NIC).
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_update
   name: az network nic update
   summary: Update a network interface.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic update [--accelerated-networking {false, true}]
+                          [--add]
+                          [--dns-servers]
+                          [--force-string]
+                          [--ids]
+                          [--internal-dns-name]
+                          [--ip-forwarding {false, true}]
+                          [--name]
+                          [--network-security-group]
+                          [--no-wait]
+                          [--remove]
+                          [--resource-group]
+                          [--set]
+                          [--subscription]
   examples:
   - summary: Update a network interface to use a different network security group.
-    syntax:
-      content: az network nic update -g MyResourceGroup -n MyNic --network-security-group MyNewNsg
+    syntax: az network nic update -g MyResourceGroup -n MyNic --network-security-group MyNewNsg
   - summary: Update a network interface. (autogenerated)
-    syntax:
-      content: az network nic update --accelerated-networking true --name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic update --accelerated-networking true --name MyNic --resource-group MyResourceGroup
+  optionalParameters:
   - name: --accelerated-networking
     parameterValueGroup: false, true
     summary: Enable accelerated networking.
     description: ''
-  - name: --ip-forwarding
-    parameterValueGroup: false, true
-    summary: Enable IP forwarding.
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --network-security-group
-    summary: Name or ID of the associated network security group.
+  - name: --dns-servers
+    summary: Space-separated list of DNS server IP addresses. Use ""('""' in PowerShell) to revert to default Azure servers.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --name -n
-    summary: The network interface (NIC).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --dns-servers
-    summary: Space-separated list of DNS server IP addresses. Use "" to revert to default Azure servers.
-    description: ''
   - name: --internal-dns-name
     summary: The internal DNS name label.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --ip-forwarding
+    parameterValueGroup: false, true
+    summary: Enable IP forwarding.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --name -n
+    summary: The network interface (NIC).
+    description: ''
+  - name: --network-security-group
+    summary: Name or ID of the associated network security group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nic_wait
   name: az network nic wait
   summary: Place the CLI in a waiting state until a condition of the network interface is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic wait [--created]
+                        [--custom]
+                        [--deleted]
+                        [--exists]
+                        [--expand]
+                        [--ids]
+                        [--interval]
+                        [--name]
+                        [--resource-group]
+                        [--subscription]
+                        [--timeout]
+                        [--updated]
   examples:
   - summary: Pause CLI until the network interface is created.
-    syntax:
-      content: az network nic wait -g MyResourceGroup -n MyNic --created
-  parameters:
-  - name: --expand
-    summary: Expands referenced resources.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The network interface (NIC).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network nic wait -g MyResourceGroup -n MyNic --created
+  - summary: Place the CLI in a waiting state until a condition of the network interface is met. (autogenerated)
+    syntax: az network nic wait --deleted --name MyNic --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -362,10 +361,25 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --expand
+    summary: Expands referenced resources.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The network interface (NIC).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -373,73 +387,33 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_create
-  name: az network nic create
-  summary: Create a network interface.
-- uid: az_network_nic_delete
-  name: az network nic delete
-  summary: Delete a network interface.
-- uid: az_network_nic_ip_config
-  name: az network nic ip-config
-  summary: Manage IP configurations of a network interface.
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
-- uid: az_network_nic_ip_config_create
-  name: az network nic ip-config create
-  summary: Create an IP configuration.
-- uid: az_network_nic_ip_config_delete
-  name: az network nic ip-config delete
-  summary: Delete an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
-- uid: az_network_nic_ip_config_list
-  name: az network nic ip-config list
-  summary: List the IP configurations of a NIC.
-- uid: az_network_nic_ip_config_show
-  name: az network nic ip-config show
-  summary: Show the details of an IP configuration.
-- uid: az_network_nic_ip_config_update
-  name: az network nic ip-config update
-  summary: Update an IP configuration.
-- uid: az_network_nic_list
-  name: az network nic list
-  summary: List network interfaces.
-- uid: az_network_nic_list_effective_nsg
-  name: az network nic list-effective-nsg
-  summary: List all effective network security groups applied to a network interface.
-- uid: az_network_nic_show
-  name: az network nic show
-  summary: Get the details of a network interface.
-- uid: az_network_nic_show_effective_route_table
-  name: az network nic show-effective-route-table
-  summary: Show the effective route table applied to a network interface.
-- uid: az_network_nic_update
-  name: az network nic update
-  summary: Update a network interface.
-- uid: az_network_nic_wait
-  name: az network nic wait
-  summary: Place the CLI in a waiting state until a condition of the network interface is met.
+- az_network_nic_create
+- az_network_nic_delete
+- az_network_nic_ip-config
+- az_network_nic_ip-config_address-pool
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
+- az_network_nic_ip-config_create
+- az_network_nic_ip-config_delete
+- az_network_nic_ip-config_inbound-nat-rule
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
+- az_network_nic_ip-config_list
+- az_network_nic_ip-config_show
+- az_network_nic_ip-config_update
+- az_network_nic_list
+- az_network_nic_list-effective-nsg
+- az_network_nic_show
+- az_network_nic_show-effective-route-table
+- az_network_nic_update
+- az_network_nic_vtap-config
+- az_network_nic_vtap-config_create
+- az_network_nic_vtap-config_delete
+- az_network_nic_vtap-config_list
+- az_network_nic_vtap-config_show
+- az_network_nic_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -455,10 +429,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about network interfaces in Azure visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about network interfaces in Azure visit https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config.yml
index a0000d0fa8..42e5154bac 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config.yml
@@ -1,31 +1,36 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic_ip_config
-  name: az network nic ip-config
-  summary: Manage IP configurations of a network interface.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_ip_config_create
-  - az_network_nic_ip_config_delete
-  - az_network_nic_ip_config_list
-  - az_network_nic_ip_config_show
-  - az_network_nic_ip_config_update
-- uid: az_network_nic_ip_config_create
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_ip-config
+name: az network nic ip-config
+summary: Manage IP configurations of a network interface.
+description: ''
+directCommands:
+- uid: az_network_nic_ip-config_create
   name: az network nic ip-config create
   summary: Create an IP configuration.
   description: You must have the Microsoft.Network/AllowMultipleIpConfigurationsPerNic feature enabled for your subscription. Only one configuration may be designated as the primary IP configuration per NIC, using the `--make-primary` flag.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config create --name
+                                    --nic-name
+                                    --resource-group
+                                    [--app-gateway-address-pools]
+                                    [--application-security-groups]
+                                    [--gateway-name]
+                                    [--lb-address-pools]
+                                    [--lb-inbound-nat-rules]
+                                    [--lb-name]
+                                    [--make-primary]
+                                    [--private-ip-address]
+                                    [--private-ip-address-version {IPv4, IPv6}]
+                                    [--public-ip-address]
+                                    [--subnet]
+                                    [--subscription]
+                                    [--vnet-name]
   examples:
   - summary: Create a primary IP configuration for a NIC.
-    syntax:
-      content: az network nic ip-config create -g MyResourceGroup -n MyIpConfig --nic-name MyNic --make-primary
+    syntax: az network nic ip-config create -g MyResourceGroup -n MyIpConfig --nic-name MyNic --make-primary
   - summary: Create an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config create --name MyIpConfig --nic-name MyNic --private-ip-address 10.0.0.9 --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config create --name MyIpConfig --nic-name MyNic --private-ip-address 10.0.0.9 --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the IP configuration.
@@ -36,16 +41,32 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-gateway-address-pools
+    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
     description: ''
   - name: --application-security-groups
     summary: Space-separated list of application security groups.
     description: ''
+  - name: --gateway-name
+    summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
+    description: ''
+  - name: --lb-address-pools
+    summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
+    description: ''
+  - name: --lb-inbound-nat-rules
+    summary: Space-separated list of names or IDs of load balancer inbound NAT rules to associate with the NIC. If names are used, --lb-name must be specified.
+    description: ''
+  - name: --lb-name
+    summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
+    description: ''
   - name: --make-primary
     summary: Set to make this configuration the primary one for the NIC.
     description: ''
   - name: --private-ip-address
-    summary: Static IP address to use or "" to use a dynamic address.
+    summary: Static IP address to use or ""('""' in PowerShell) to use a dynamic address.
     description: ''
   - name: --private-ip-address-version
     parameterValueGroup: IPv4, IPv6
@@ -57,44 +78,27 @@ items:
   - name: --subnet
     summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
-    description: ''
-  - name: --app-gateway-address-pools
-    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
-    description: ''
-  - name: --gateway-name
-    summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
-    description: ''
-  - name: --lb-address-pools
-    summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
-    description: ''
-  - name: --lb-inbound-nat-rules
-    summary: Space-separated list of names or IDs of load balancer inbound NAT rules to associate with the NIC. If names are used, --lb-name must be specified.
-    description: ''
-  - name: --lb-name
-    summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_delete
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_delete
   name: az network nic ip-config delete
   summary: Delete an IP configuration.
   description: A NIC must have at least one IP configuration.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config delete [--ids]
+                                    [--name]
+                                    [--nic-name]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Delete an IP configuration.
-    syntax:
-      content: az network nic ip-config delete -g MyResourceGroup -n MyIpConfig --nic-name MyNic
-  parameters:
+    syntax: az network nic ip-config delete -g MyResourceGroup -n MyIpConfig --nic-name MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -105,56 +109,56 @@ items:
     summary: The network interface (NIC).
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_list
   name: az network nic ip-config list
   summary: List the IP configurations of a NIC.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config list --nic-name
+                                  --resource-group
+                                  [--query-examples]
+                                  [--subscription]
   examples:
   - summary: List the IP configurations of a NIC.
-    syntax:
-      content: az network nic ip-config list -g MyResourceGroup --nic-name MyNic
-  parameters:
+    syntax: az network nic ip-config list -g MyResourceGroup --nic-name MyNic
+  requiredParameters:
   - isRequired: true
     name: --nic-name
     summary: The network interface (NIC).
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_show
   name: az network nic ip-config show
   summary: Show the details of an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config show [--ids]
+                                  [--name]
+                                  [--nic-name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Show the details of an IP configuration of a NIC.
-    syntax:
-      content: az network nic ip-config show -g MyResourceGroup -n MyIpConfig --nic-name MyNic
-  parameters:
+    syntax: az network nic ip-config show -g MyResourceGroup -n MyIpConfig --nic-name MyNic
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -164,60 +168,65 @@ items:
   - name: --nic-name
     summary: The network interface (NIC).
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_update
   name: az network nic ip-config update
   summary: Update an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config update [--add]
+                                    [--app-gateway-address-pools]
+                                    [--application-security-groups]
+                                    [--force-string]
+                                    [--gateway-name]
+                                    [--ids]
+                                    [--lb-address-pools]
+                                    [--lb-inbound-nat-rules]
+                                    [--lb-name]
+                                    [--make-primary]
+                                    [--name]
+                                    [--nic-name]
+                                    [--private-ip-address]
+                                    [--private-ip-address-version {IPv4, IPv6}]
+                                    [--public-ip-address]
+                                    [--remove]
+                                    [--resource-group]
+                                    [--set]
+                                    [--subnet]
+                                    [--subscription]
+                                    [--vnet-name]
   examples:
   - summary: Update a NIC to use a new private IP address.
-    syntax:
-      content: >-
-        az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --private-ip-address 10.0.0.9
+    syntax: >-
+      az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --private-ip-address 10.0.0.9
   - summary: Make an IP configuration the default for the supplied NIC.
-    syntax:
-      content: >-
-        az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --make-primary
+    syntax: >-
+      az network nic ip-config update -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --make-primary
   - summary: Update an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config update --name MyIpConfig --nic-name MyNic --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup
-  parameters:
-  - name: --application-security-groups
-    summary: Space-separated list of application security groups.
-    description: ''
-  - name: --make-primary
-    summary: Set to make this configuration the primary one for the NIC.
-    description: ''
-  - name: --private-ip-address
-    summary: Static IP address to use or "" to use a dynamic address.
-    description: ''
-  - name: --private-ip-address-version
-    parameterValueGroup: IPv4, IPv6
-    summary: ''
+    syntax: az network nic ip-config update --name MyIpConfig --nic-name MyNic --public-ip-address MyAppGatewayPublicIp --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --public-ip-address
-    summary: Name or ID of the public IP to use.
+  - name: --app-gateway-address-pools
+    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
     description: ''
-  - name: --subnet
-    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+  - name: --application-security-groups
+    summary: Space-separated list of application security groups.
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --gateway-name
     summary: The name of the application gateway to use when adding address pools by name (ignored when IDs are specified).
@@ -225,21 +234,6 @@ items:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --name -n
-    summary: The name of the IP configuration.
-    description: ''
-  - name: --nic-name
-    summary: The network interface (NIC).
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --app-gateway-address-pools
-    summary: Space-separated list of names or IDs of application gateway backend address pools to associate with the NIC. If names are used, --gateway-name must be specified.
-    description: ''
   - name: --lb-address-pools
     summary: Space-separated list of names or IDs of load balancer address pools to associate with the NIC. If names are used, --lb-name must be specified.
     description: ''
@@ -249,58 +243,56 @@ items:
   - name: --lb-name
     summary: The name of the load balancer to use when adding NAT rules or address pools by name (ignored when IDs are specified).
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --make-primary
+    summary: Set to make this configuration the primary one for the NIC.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --name -n
+    summary: The name of the IP configuration.
+    description: ''
+  - name: --nic-name
+    summary: The network interface (NIC).
+    description: ''
+  - name: --private-ip-address
+    summary: Static IP address to use or ""('""' in PowerShell) to use a dynamic address.
+    description: ''
+  - name: --private-ip-address-version
+    parameterValueGroup: IPv4, IPv6
+    summary: ''
+    description: ''
+  - name: --public-ip-address
+    summary: Name or ID of the public IP to use.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subnet
+    summary: Name or ID of an existing subnet. If name is specified, also specify --vnet-name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
-- uid: az_network_nic_ip_config_create
-  name: az network nic ip-config create
-  summary: Create an IP configuration.
-- uid: az_network_nic_ip_config_delete
-  name: az network nic ip-config delete
-  summary: Delete an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
-- uid: az_network_nic_ip_config_list
-  name: az network nic ip-config list
-  summary: List the IP configurations of a NIC.
-- uid: az_network_nic_ip_config_show
-  name: az network nic ip-config show
-  summary: Show the details of an IP configuration.
-- uid: az_network_nic_ip_config_update
-  name: az network nic ip-config update
-  summary: Update an IP configuration.
+- az_network_nic_ip-config_address-pool
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
+- az_network_nic_ip-config_create
+- az_network_nic_ip-config_delete
+- az_network_nic_ip-config_inbound-nat-rule
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
+- az_network_nic_ip-config_list
+- az_network_nic_ip-config_show
+- az_network_nic_ip-config_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -316,10 +308,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage IP configurations of a network interface.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage IP configurations of a network interface.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/address-pool.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/address-pool.yml
index 7fda258d4e..87419fb8fb 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/address-pool.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/address-pool.yml
@@ -1,30 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic_ip_config_address_pool
-  name: az network nic ip-config address-pool
-  summary: Manage address pools in an IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_ip_config_address_pool_add
-  - az_network_nic_ip_config_address_pool_remove
-- uid: az_network_nic_ip_config_address_pool_add
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_ip-config_address-pool
+name: az network nic ip-config address-pool
+summary: Manage address pools in an IP configuration.
+description: ''
+directCommands:
+- uid: az_network_nic_ip-config_address-pool_add
   name: az network nic ip-config address-pool add
   summary: Add an address pool to an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config address-pool add --address-pool
+                                              --ip-config-name
+                                              --nic-name
+                                              --resource-group
+                                              [--gateway-name]
+                                              [--lb-name]
+                                              [--subscription]
   examples:
   - summary: Add an address pool to an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config address-pool add -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --address-pool MyAddressPool
+    syntax: >-
+      az network nic ip-config address-pool add -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --address-pool MyAddressPool
   - summary: Add an address pool to an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config address-pool add --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config address-pool add --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --address-pool
     summary: The name or ID of an existing backend address pool.
@@ -39,8 +38,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --gateway-name
     summary: The name of an application gateway containing the address pool (Omit if suppying an address pool ID).
     description: ''
@@ -50,28 +50,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_address_pool_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_address-pool_remove
   name: az network nic ip-config address-pool remove
   summary: Remove an address pool of an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config address-pool remove --address-pool
+                                                 --ip-config-name
+                                                 --nic-name
+                                                 --resource-group
+                                                 [--gateway-name]
+                                                 [--lb-name]
+                                                 [--subscription]
   examples:
   - summary: Remove an address pool of an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config address-pool remove -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --address-pool MyAddressPool
+    syntax: >-
+      az network nic ip-config address-pool remove -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --address-pool MyAddressPool
   - summary: Remove an address pool of an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config address-pool remove --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config address-pool remove --address-pool MyAddressPool --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --address-pool
     summary: The name or ID of an existing backend address pool.
@@ -86,8 +85,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --gateway-name
     summary: The name of an application gateway containing the address pool (Omit if suppying an address pool ID).
     description: ''
@@ -97,19 +97,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_ip_config_address_pool_add
-  name: az network nic ip-config address-pool add
-  summary: Add an address pool to an IP configuration.
-- uid: az_network_nic_ip_config_address_pool_remove
-  name: az network nic ip-config address-pool remove
-  summary: Remove an address pool of an IP configuration.
+- az_network_nic_ip-config_address-pool_add
+- az_network_nic_ip-config_address-pool_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -125,10 +116,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage address pools in an IP configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage address pools in an IP configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml
index a4dcb86483..3869f0486c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nic/ip-config/inbound-nat-rule.yml
@@ -1,30 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nic_ip_config_inbound_nat_rule
-  name: az network nic ip-config inbound-nat-rule
-  summary: Manage inbound NAT rules of an IP configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nic_ip_config_inbound_nat_rule_add
-  - az_network_nic_ip_config_inbound_nat_rule_remove
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_ip-config_inbound-nat-rule
+name: az network nic ip-config inbound-nat-rule
+summary: Manage inbound NAT rules of an IP configuration.
+description: ''
+directCommands:
+- uid: az_network_nic_ip-config_inbound-nat-rule_add
   name: az network nic ip-config inbound-nat-rule add
   summary: Add an inbound NAT rule to an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config inbound-nat-rule add --inbound-nat-rule
+                                                  --ip-config-name
+                                                  --nic-name
+                                                  --resource-group
+                                                  [--lb-name]
+                                                  [--subscription]
   examples:
   - summary: Add an inbound NAT rule to an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config inbound-nat-rule add -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --inbound-nat-rule MyNatRule
+    syntax: >-
+      az network nic ip-config inbound-nat-rule add -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --inbound-nat-rule MyNatRule
   - summary: Add an inbound NAT rule to an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config inbound-nat-rule add --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config inbound-nat-rule add --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --inbound-nat-rule
     summary: The name or ID of an existing inbound NAT rule.
@@ -39,36 +37,35 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --lb-name
     summary: The name of the load balancer associated with the NAT rule (Omit if suppying a NAT rule ID).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_nic_ip-config_inbound-nat-rule_remove
   name: az network nic ip-config inbound-nat-rule remove
   summary: Remove an inbound NAT rule of an IP configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nic ip-config inbound-nat-rule remove --inbound-nat-rule
+                                                     --ip-config-name
+                                                     --nic-name
+                                                     --resource-group
+                                                     [--lb-name]
+                                                     [--subscription]
   examples:
   - summary: Remove an inbound NAT rule of an IP configuration.
-    syntax:
-      content: >-
-        az network nic ip-config inbound-nat-rule remove -g MyResourceGroup --nic-name MyNic \
-            -n MyIpConfig --inbound-nat-rule MyNatRule
+    syntax: >-
+      az network nic ip-config inbound-nat-rule remove -g MyResourceGroup --nic-name MyNic \
+          -n MyIpConfig --inbound-nat-rule MyNatRule
   - summary: Remove an inbound NAT rule of an IP configuration. (autogenerated)
-    syntax:
-      content: az network nic ip-config inbound-nat-rule remove --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
-  parameters:
+    syntax: az network nic ip-config inbound-nat-rule remove --inbound-nat-rule MyNatRule --ip-config-name MyIpConfig --lb-name MyLb --nic-name MyNic --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --inbound-nat-rule
     summary: The name or ID of an existing inbound NAT rule.
@@ -83,27 +80,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --lb-name
     summary: The name of the load balancer associated with the NAT rule (Omit if suppying a NAT rule ID).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nic_ip_config_inbound_nat_rule_add
-  name: az network nic ip-config inbound-nat-rule add
-  summary: Add an inbound NAT rule to an IP configuration.
-- uid: az_network_nic_ip_config_inbound_nat_rule_remove
-  name: az network nic ip-config inbound-nat-rule remove
-  summary: Remove an inbound NAT rule of an IP configuration.
+- az_network_nic_ip-config_inbound-nat-rule_add
+- az_network_nic_ip-config_inbound-nat-rule_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -119,10 +108,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage inbound NAT rules of an IP configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage inbound NAT rules of an IP configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nic/vtap-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nic/vtap-config.yml
new file mode 100644
index 0000000000..5ca58e6ce0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nic/vtap-config.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_nic_vtap-config
+name: az network nic vtap-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-network-tap** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az network nic vtap-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual network tap configurations.
+description: ''
+directCommands:
+- uid: az_network_nic_vtap-config_create
+  name: az network nic vtap-config create
+  summary: Create a virtual network tap configuration.
+  description: ''
+  syntax: >-
+    az network nic vtap-config create --name
+                                      --nic-name
+                                      --resource-group
+                                      --vnet-tap
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual network tap configuration.
+    description: ''
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vnet-tap
+    summary: Name or ID of the virtual network tap.
+    description: ''
+- uid: az_network_nic_vtap-config_delete
+  name: az network nic vtap-config delete
+  summary: Delete a virtual network tap configuration.
+  description: ''
+  syntax: >-
+    az network nic vtap-config delete --name
+                                      --nic-name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual network tap configuration.
+    description: ''
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_nic_vtap-config_list
+  name: az network nic vtap-config list
+  summary: List virtual network tap configurations.
+  description: ''
+  syntax: >-
+    az network nic vtap-config list --nic-name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_nic_vtap-config_show
+  name: az network nic vtap-config show
+  summary: Get details of a virtual network tap configuration.
+  description: ''
+  syntax: >-
+    az network nic vtap-config show --name
+                                    --nic-name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual network tap configuration.
+    description: ''
+  - isRequired: true
+    name: --nic-name
+    summary: Name of the network interface (NIC).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_nic_vtap-config_create
+- az_network_nic_vtap-config_delete
+- az_network_nic_vtap-config_list
+- az_network_nic_vtap-config_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual network tap configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nsg.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nsg.yml
index 6f50e8f3a8..74e37304a2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/nsg.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nsg.yml
@@ -1,62 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nsg
-  name: az network nsg
-  summary: Manage Azure Network Security Groups (NSGs).
-  description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli">https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_nsg_create
-  - az_network_nsg_delete
-  - az_network_nsg_list
-  - az_network_nsg_show
-  - az_network_nsg_update
+### YamlMime:AzureCLIGroup
+uid: az_network_nsg
+name: az network nsg
+summary: Manage Azure Network Security Groups (NSGs).
+description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
+directCommands:
 - uid: az_network_nsg_create
   name: az network nsg create
   summary: Create a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg create --name
+                          --resource-group
+                          [--location]
+                          [--subscription]
+                          [--tags]
   examples:
   - summary: Create an NSG in a resource group within a region with tags.
-    syntax:
-      content: az network nsg create -g MyResourceGroup -n MyNsg --tags super_secure no_80 no_22
-  parameters:
+    syntax: az network nsg create -g MyResourceGroup -n MyNsg --tags super_secure no_80 no_22
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the network security group.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_delete
   name: az network nsg delete
   summary: Delete a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg delete [--ids]
+                          [--name]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Delete an NSG in a resource group.
-    syntax:
-      content: az network nsg delete -g MyResourceGroup -n MyNsg
-  parameters:
+    syntax: az network nsg delete -g MyResourceGroup -n MyNsg
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -64,57 +57,53 @@ items:
     summary: Name of the network security group.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_list
   name: az network nsg list
   summary: List network security groups.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg list [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: List all NSGs in the 'westus' region.
-    syntax:
-      content: az network nsg list --query "[?location=='westus']"
-  parameters:
+    syntax: az network nsg list --query "[?location=='westus']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_show
   name: az network nsg show
   summary: Get information about a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg show [--expand]
+                        [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Get basic information about an NSG.
-    syntax:
-      content: az network nsg show -g MyResourceGroup -n MyNsg
+    syntax: az network nsg show -g MyResourceGroup -n MyNsg
   - summary: Get the default security rules of an NSG and format the output as a table.
-    syntax:
-      content: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[]" -o table
+    syntax: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[]" -o table
   - summary: Get all default NSG rules with "Allow" access and format the output as a table.
-    syntax:
-      content: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[?access=='Allow']" -o table
-  parameters:
+    syntax: az network nsg show -g MyResourceGroup -n MyNsg --query "defaultSecurityRules[?access=='Allow']" -o table
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -124,96 +113,72 @@ items:
   - name: --name -n
     summary: Name of the network security group.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_update
   name: az network nsg update
   summary: Update a network security group.
   description: This command can only be used to update the tags of an NSG. Name and resource group are immutable and cannot be updated.
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg update [--add]
+                          [--force-string]
+                          [--ids]
+                          [--name]
+                          [--remove]
+                          [--resource-group]
+                          [--set]
+                          [--subscription]
   examples:
   - summary: Remove a tag of an NSG.
-    syntax:
-      content: az network nsg update -g MyResourceGroup -n MyNsg --remove tags.no_80
+    syntax: az network nsg update -g MyResourceGroup -n MyNsg --remove tags.no_80
   - summary: Update a network security group. (autogenerated)
-    syntax:
-      content: az network nsg update --name MyNsg --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the network security group.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network nsg update --name MyNsg --resource-group MyResourceGroup --set tags.CostCenter=MyBusinessGroup
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Name of the network security group.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nsg_create
-  name: az network nsg create
-  summary: Create a network security group.
-- uid: az_network_nsg_delete
-  name: az network nsg delete
-  summary: Delete a network security group.
-- uid: az_network_nsg_list
-  name: az network nsg list
-  summary: List network security groups.
-- uid: az_network_nsg_rule
-  name: az network nsg rule
-  summary: Manage network security group rules.
-- uid: az_network_nsg_rule_create
-  name: az network nsg rule create
-  summary: Create a network security group rule.
-- uid: az_network_nsg_rule_delete
-  name: az network nsg rule delete
-  summary: Delete a network security group rule.
-- uid: az_network_nsg_rule_list
-  name: az network nsg rule list
-  summary: List all rules in a network security group.
-- uid: az_network_nsg_rule_show
-  name: az network nsg rule show
-  summary: Get the details of a network security group rule.
-- uid: az_network_nsg_rule_update
-  name: az network nsg rule update
-  summary: Update a network security group rule.
-- uid: az_network_nsg_show
-  name: az network nsg show
-  summary: Get information about a network security group.
-- uid: az_network_nsg_update
-  name: az network nsg update
-  summary: Update a network security group.
+- az_network_nsg_create
+- az_network_nsg_delete
+- az_network_nsg_list
+- az_network_nsg_rule
+- az_network_nsg_rule_create
+- az_network_nsg_rule_delete
+- az_network_nsg_rule_list
+- az_network_nsg_rule_show
+- az_network_nsg_rule_update
+- az_network_nsg_show
+- az_network_nsg_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -229,10 +194,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli">https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/nsg/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/nsg/rule.yml
index ba2bd67d9c..93f1d7c153 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/nsg/rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/nsg/rule.yml
@@ -1,47 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_nsg_rule
-  name: az network nsg rule
-  summary: Manage network security group rules.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_nsg_rule_create
-  - az_network_nsg_rule_delete
-  - az_network_nsg_rule_list
-  - az_network_nsg_rule_show
-  - az_network_nsg_rule_update
+### YamlMime:AzureCLIGroup
+uid: az_network_nsg_rule
+name: az network nsg rule
+summary: Manage network security group rules.
+description: ''
+directCommands:
 - uid: az_network_nsg_rule_create
   name: az network nsg rule create
   summary: Create a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule create --name
+                               --nsg-name
+                               --priority
+                               --resource-group
+                               [--access {Allow, Deny}]
+                               [--description]
+                               [--destination-address-prefixes]
+                               [--destination-asgs]
+                               [--destination-port-ranges]
+                               [--direction {Inbound, Outbound}]
+                               [--protocol {*, Tcp, Udp}]
+                               [--source-address-prefixes]
+                               [--source-asgs]
+                               [--source-port-ranges]
+                               [--subscription]
   examples:
   - summary: Create a basic "Allow" NSG rule with the highest priority.
-    syntax:
-      content: az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 100
+    syntax: az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 100
   - summary: Create a "Deny" rule over TCP for a specific IP address range with the lowest priority.
-    syntax:
-      content: >-
-        az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 4096 \
-            --source-address-prefixes 208.130.28/24 --source-port-ranges 80 \
-            --destination-address-prefixes '*' --destination-port-ranges 80 8080 --access Deny \
-            --protocol Tcp --description "Deny from specific IP address ranges on 80 and 8080."
+    syntax: >-
+      az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --priority 4096 \
+          --source-address-prefixes 208.130.28/24 --source-port-ranges 80 \
+          --destination-address-prefixes '*' --destination-port-ranges 80 8080 --access Deny \
+          --protocol Tcp --description "Deny from specific IP address ranges on 80 and 8080."
   - summary: Create a security rule using service tags. For more details visit https://aka.ms/servicetags
-    syntax:
-      content: >-
-        az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithTags \
-            --priority 400 --source-address-prefixes VirtualNetwork --destination-address-prefixes Storage \
-            --destination-port-ranges * --direction Outbound --access Allow --protocol Tcp --description "Allow VirtualNetwork to Storage."
+    syntax: >-
+      az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithTags \
+          --priority 400 --source-address-prefixes VirtualNetwork --destination-address-prefixes Storage \
+          --destination-port-ranges '*' --direction Outbound --access Allow --protocol Tcp --description "Allow VirtualNetwork to Storage."
   - summary: Create a security rule using application security groups. https://aka.ms/applicationsecuritygroups
-    syntax:
-      content: >-
-        az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithAsg \
-            --priority 500 --source-address-prefixes Internet --destination-port-ranges 80 8080 \
-            --destination-asgs Web --access Allow --protocol Tcp --description "Allow Internet to Web ASG on ports 80,8080."
-  parameters:
+    syntax: >-
+      az network nsg rule create -g MyResourceGroup --nsg-name MyNsg -n MyNsgRuleWithAsg \
+          --priority 500 --source-address-prefixes Internet --destination-port-ranges 80 8080 \
+          --destination-asgs Web --access Allow --protocol Tcp --description "Allow Internet to Web ASG on ports 80,8080."
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the network security group rule.
@@ -56,8 +58,9 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --access
     defaultValue: Allow
     parameterValueGroup: Allow, Deny
@@ -66,16 +69,6 @@ items:
   - name: --description
     summary: Rule description.
     description: ''
-  - name: --direction
-    defaultValue: Inbound
-    parameterValueGroup: Inbound, Outbound
-    summary: ''
-    description: ''
-  - name: --protocol
-    defaultValue: ''
-    parameterValueGroup: '*, Tcp, Udp'
-    summary: Network protocol this rule applies to.
-    description: ''
   - name: --destination-address-prefixes
     defaultValue: ''
     summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
@@ -87,6 +80,16 @@ items:
     defaultValue: "80"
     summary: Space-separated list of ports or port ranges between 0-65535. Use '\*' to match all ports.
     description: ''
+  - name: --direction
+    defaultValue: Inbound
+    parameterValueGroup: Inbound, Outbound
+    summary: ''
+    description: ''
+  - name: --protocol
+    defaultValue: ''
+    parameterValueGroup: '*, Tcp, Udp'
+    summary: Network protocol this rule applies to.
+    description: ''
   - name: --source-address-prefixes
     defaultValue: ''
     summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
@@ -101,23 +104,21 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_delete
   name: az network nsg rule delete
   summary: Delete a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule delete [--ids]
+                               [--name]
+                               [--nsg-name]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Delete a network security group rule.
-    syntax:
-      content: az network nsg rule delete -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
-  parameters:
+    syntax: az network nsg rule delete -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -128,59 +129,60 @@ items:
     summary: Name of the network security group.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_list
   name: az network nsg rule list
   summary: List all rules in a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule list --nsg-name
+                             --resource-group
+                             [--include-default]
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List all rules in a network security group.
-    syntax:
-      content: az network nsg rule list -g MyResourceGroup --nsg-name MyNsg
-  parameters:
+    syntax: az network nsg rule list -g MyResourceGroup --nsg-name MyNsg
+  requiredParameters:
   - isRequired: true
     name: --nsg-name
     summary: Name of the network security group.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --include-default
     summary: Include default security rules in the output.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_show
   name: az network nsg rule show
   summary: Get the details of a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule show [--ids]
+                             [--name]
+                             [--nsg-name]
+                             [--query-examples]
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: Get the details of a network security group rule.
-    syntax:
-      content: az network nsg rule show -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
-  parameters:
+    syntax: az network nsg rule show -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -190,49 +192,72 @@ items:
   - name: --nsg-name
     summary: Name of the network security group.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_nsg_rule_update
   name: az network nsg rule update
   summary: Update a network security group rule.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network nsg rule update [--access {Allow, Deny}]
+                               [--add]
+                               [--description]
+                               [--destination-address-prefixes]
+                               [--destination-asgs]
+                               [--destination-port-ranges]
+                               [--direction {Inbound, Outbound}]
+                               [--force-string]
+                               [--ids]
+                               [--name]
+                               [--nsg-name]
+                               [--priority]
+                               [--protocol {*, Tcp, Udp}]
+                               [--remove]
+                               [--resource-group]
+                               [--set]
+                               [--source-address-prefixes]
+                               [--source-asgs]
+                               [--source-port-ranges]
+                               [--subscription]
   examples:
   - summary: Update an NSG rule with a new wildcard destination address prefix.
-    syntax:
-      content: az network nsg rule update -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --destination-address-prefix '*'
+    syntax: az network nsg rule update -g MyResourceGroup --nsg-name MyNsg -n MyNsgRule --destination-address-prefix '*'
   - summary: Update a network security group rule. (autogenerated)
-    syntax:
-      content: az network nsg rule update --name MyNsgRule --nsg-name MyNsg --resource-group MyResourceGroup --source-address-prefixes 208.130.28/24
-  parameters:
+    syntax: az network nsg rule update --name MyNsgRule --nsg-name MyNsg --resource-group MyResourceGroup --source-address-prefixes 208.130.28/24
+  optionalParameters:
   - name: --access
     parameterValueGroup: Allow, Deny
     summary: ''
     description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --description
     summary: Rule description.
     description: ''
+  - name: --destination-address-prefixes
+    summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
+    description: ''
+  - name: --destination-asgs
+    summary: Space-separated list of application security group names or IDs. Limited by backend server, temporarily this argument only supports one application security group name or ID.
+    description: ''
+  - name: --destination-port-ranges
+    summary: Space-separated list of ports or port ranges between 0-65535. Use '\*' to match all ports.
+    description: ''
   - name: --direction
     parameterValueGroup: Inbound, Outbound
     summary: ''
     description: ''
-  - name: --priority
-    summary: Rule priority, between 100 (highest priority) and 4096 (lowest priority). Must be unique for each rule in the collection.
-    description: ''
-  - name: --protocol
-    parameterValueGroup: '*, Tcp, Udp'
-    summary: Network protocol this rule applies to.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -243,20 +268,21 @@ items:
   - name: --nsg-name
     summary: Name of the network security group.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --priority
+    summary: Rule priority, between 100 (highest priority) and 4096 (lowest priority). Must be unique for each rule in the collection.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --protocol
+    parameterValueGroup: '*, Tcp, Udp'
+    summary: Network protocol this rule applies to.
     description: ''
-  - name: --destination-address-prefixes
-    summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
-  - name: --destination-asgs
-    summary: Space-separated list of application security group names or IDs. Limited by backend server, temporarily this argument only supports one application security group name or ID.
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --destination-port-ranges
-    summary: Space-separated list of ports or port ranges between 0-65535. Use '\*' to match all ports.
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --source-address-prefixes
     summary: Space-separated list of CIDR prefixes or IP ranges. Alternatively, specify ONE of 'VirtualNetwork', 'AzureLoadBalancer', 'Internet' or '\*' to match all IPs. Besides, it also supports all available Service Tags like 'ApiManagement', 'SqlManagement', 'AzureMonitor', etc.
@@ -267,40 +293,16 @@ items:
   - name: --source-port-ranges
     summary: Space-separated list of ports or port ranges between 0-65535. Use '\*' to match all ports.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_nsg_rule_create
-  name: az network nsg rule create
-  summary: Create a network security group rule.
-- uid: az_network_nsg_rule_delete
-  name: az network nsg rule delete
-  summary: Delete a network security group rule.
-- uid: az_network_nsg_rule_list
-  name: az network nsg rule list
-  summary: List all rules in a network security group.
-- uid: az_network_nsg_rule_show
-  name: az network nsg rule show
-  summary: Get the details of a network security group rule.
-- uid: az_network_nsg_rule_update
-  name: az network nsg rule update
-  summary: Update a network security group rule.
+- az_network_nsg_rule_create
+- az_network_nsg_rule_delete
+- az_network_nsg_rule_list
+- az_network_nsg_rule_show
+- az_network_nsg_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -316,10 +318,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage network security group rules.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage network security group rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway.yml
new file mode 100644
index 0000000000..bc593b2195
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway.yml
@@ -0,0 +1,273 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_p2s-vpn-gateway
+name: az network p2s-vpn-gateway
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network p2s-vpn-gateway** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage point-to-site VPN gateway.
+description: ''
+directCommands:
+- uid: az_network_p2s-vpn-gateway_create
+  name: az network p2s-vpn-gateway create
+  summary: Create a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway create --name
+                                      --resource-group
+                                      --scale-unit
+                                      --vhub
+                                      [--address-space]
+                                      [--associated]
+                                      [--config-name]
+                                      [--labels]
+                                      [--location]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--tags]
+                                      [--vpn-server-config]
+  examples:
+  - summary: Create a point-to-site VPN gateway.
+    syntax: az network p2s-vpn-gateway create -g MyRG -n MyP2SVPNGateway --scale-unit 2 --vhub MyVhub --vpn-server-config MyVPNServerConfig --address-space 10.0.0.0/24 11.0.0.0/24
+  - summary: Create a point-to-site VPN gateway with routing configuration.
+    syntax: az network p2s-vpn-gateway create -g MyRG -n MyP2SVPNGateway --scale-unit 2 --vhub MyVhub --vpn-server-config MyVPNServerConfig --address-space 10.0.0.0/24 11.0.0.0/24 --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable2 --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --vhub
+    summary: Name or ID of a virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --address-space
+    summary: Address space for P2S VpnClient. Space-separated list of IP address ranges.
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --config-name
+    defaultValue: P2SConnectionConfigDefault
+    summary: Name or p2s connection configuration.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vpn-server-config
+    summary: Name or ID of a vpn server configuration.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_delete
+  name: az network p2s-vpn-gateway delete
+  summary: Delete a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway delete --name
+                                      --resource-group
+                                      [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_list
+  name: az network p2s-vpn-gateway list
+  summary: List all point-to-site VPN gateway.
+  description: ''
+  syntax: az network p2s-vpn-gateway list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_show
+  name: az network p2s-vpn-gateway show
+  summary: Show the details of a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway show --name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_update
+  name: az network p2s-vpn-gateway update
+  summary: Update settings of a point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway update --name
+                                      --resource-group
+                                      [--add]
+                                      [--address-space]
+                                      [--associated]
+                                      [--config-name]
+                                      [--force-string]
+                                      [--labels]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--remove]
+                                      [--scale-unit]
+                                      [--set]
+                                      [--tags]
+                                      [--vpn-server-config]
+  examples:
+  - summary: Update settings of a point-to-site VPN gateway with routing configuration.
+    syntax: az network p2s-vpn-gateway update -g MyRG -n MyP2SVPNGateway --labels Newlabel1 Newlabel2 Newlabel3
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-space
+    summary: Address space for P2S VpnClient. Space-separated list of IP address ranges.
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --config-name
+    summary: Name or p2s connection configuration.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vpn-server-config
+    summary: Name or ID of a vpn server configuration.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_wait
+  name: az network p2s-vpn-gateway wait
+  summary: Place the CLI in a waiting state until a condition of the point-to-site VPN gateway is met.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway wait --name
+                                    --resource-group
+                                    [--created]
+                                    [--custom]
+                                    [--deleted]
+                                    [--exists]
+                                    [--interval]
+                                    [--timeout]
+                                    [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_p2s-vpn-gateway_connection
+- az_network_p2s-vpn-gateway_connection_list
+- az_network_p2s-vpn-gateway_connection_show
+- az_network_p2s-vpn-gateway_create
+- az_network_p2s-vpn-gateway_delete
+- az_network_p2s-vpn-gateway_list
+- az_network_p2s-vpn-gateway_show
+- az_network_p2s-vpn-gateway_update
+- az_network_p2s-vpn-gateway_vpn-client
+- az_network_p2s-vpn-gateway_vpn-client_generate
+- az_network_p2s-vpn-gateway_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage point-to-site VPN gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway/connection.yml
new file mode 100644
index 0000000000..ad0b196c75
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway/connection.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_p2s-vpn-gateway_connection
+name: az network p2s-vpn-gateway connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network p2s-vpn-gateway connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage point-to-site VPN gateway connections.
+description: ''
+directCommands:
+- uid: az_network_p2s-vpn-gateway_connection_list
+  name: az network p2s-vpn-gateway connection list
+  summary: List all connections for a given point-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway connection list --gateway-name
+                                               --resource-group
+  examples:
+  - summary: List all connections for a given point-to-site VPN gateway
+    syntax: az network p2s-vpn-gateway connection list -g MyRG --gateway-name MyP2SVPNGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the P2S VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_p2s-vpn-gateway_connection_show
+  name: az network p2s-vpn-gateway connection show
+  summary: Show the details of a point-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway connection show --gateway-name
+                                               --name
+                                               --resource-group
+  examples:
+  - summary: Show the details of a point-to-site VPN gateway connection
+    syntax: az network p2s-vpn-gateway connection show -g MyRG -n connection --gateway-name MyP2SVPNGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the P2S VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_network_p2s-vpn-gateway_connection_list
+- az_network_p2s-vpn-gateway_connection_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage point-to-site VPN gateway connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway/vpn-client.yml b/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway/vpn-client.yml
new file mode 100644
index 0000000000..5f4f153990
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/p2s-vpn-gateway/vpn-client.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_p2s-vpn-gateway_vpn-client
+name: az network p2s-vpn-gateway vpn-client
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network p2s-vpn-gateway vpn-client** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Download a VPN client configuration required to connect to Azure via point-to-site.
+description: ''
+directCommands:
+- uid: az_network_p2s-vpn-gateway_vpn-client_generate
+  name: az network p2s-vpn-gateway vpn-client generate
+  summary: Generate VPN profile for P2S client of the P2SVpnGateway in the specified resource group.
+  description: ''
+  syntax: >-
+    az network p2s-vpn-gateway vpn-client generate --name
+                                                   --resource-group
+                                                   [--authentication-method {EAPMSCHAPv2, EAPTLS}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the P2S Vpn Gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --authentication-method
+    parameterValueGroup: EAPMSCHAPv2, EAPTLS
+    summary: VPN client authentication method.
+    description: ''
+commands:
+- az_network_p2s-vpn-gateway_vpn-client_generate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Download a VPN client configuration required to connect to Azure via point-to-site.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns.yml
index 967d4d2f39..0441c1801e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns.yml
@@ -1,247 +1,87 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns
-  name: az network private-dns
-  summary: Manage Private DNS domains in Azure.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns
+name: az network private-dns
+summary: Manage Private DNS domains in Azure.
+description: ''
 commands:
-- uid: az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
-- uid: az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
-- uid: az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-- uid: az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: az_network_private_dns_zone_export
-  name: az network private-dns zone export
-  summary: Export a Private DNS zone as a DNS zone file.
-- uid: az_network_private_dns_zone_import
-  name: az network private-dns zone import
-  summary: Create a Private DNS zone using a DNS zone file.
-- uid: az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
+- az_network_private-dns_link
+- az_network_private-dns_link_vnet
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
+- az_network_private-dns_record-set
+- az_network_private-dns_record-set_a
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
+- az_network_private-dns_record-set_aaaa
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
+- az_network_private-dns_record-set_cname
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
+- az_network_private-dns_record-set_list
+- az_network_private-dns_record-set_mx
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
+- az_network_private-dns_record-set_ptr
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
+- az_network_private-dns_record-set_soa
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
+- az_network_private-dns_record-set_srv
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
+- az_network_private-dns_record-set_txt
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
+- az_network_private-dns_zone
+- az_network_private-dns_zone_create
+- az_network_private-dns_zone_delete
+- az_network_private-dns_zone_export
+- az_network_private-dns_zone_import
+- az_network_private-dns_zone_list
+- az_network_private-dns_zone_show
+- az_network_private-dns_zone_update
+- az_network_private-dns_zone_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -257,10 +97,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS domains in Azure.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS domains in Azure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link.yml
index 1740b3e823..91db1bec1e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link.yml
@@ -1,34 +1,16 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_link
-  name: az network private-dns link
-  summary: Manage Private DNS links.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_link
+name: az network private-dns link
+summary: Manage Private DNS links.
+description: ''
 commands:
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
+- az_network_private-dns_link_vnet
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -44,10 +26,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS links.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS links.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link/vnet.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link/vnet.yml
index d9a5dfbd6d..14890c90a3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link/vnet.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/link/vnet.yml
@@ -1,34 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_link_vnet
-  name: az network private-dns link vnet
-  summary: Manage virtual network links to the specified Private DNS zone.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_link_vnet_create
-  - az_network_private_dns_link_vnet_delete
-  - az_network_private_dns_link_vnet_list
-  - az_network_private_dns_link_vnet_show
-  - az_network_private_dns_link_vnet_update
-  - az_network_private_dns_link_vnet_wait
-- uid: az_network_private_dns_link_vnet_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_link_vnet
+name: az network private-dns link vnet
+summary: Manage virtual network links to the specified Private DNS zone.
+description: ''
+directCommands:
+- uid: az_network_private-dns_link_vnet_create
   name: az network private-dns link vnet create
   summary: Create a virtual network link to the specified Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet create --name
+                                            --registration-enabled {false, true}
+                                            --resource-group
+                                            --virtual-network
+                                            --zone-name
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--tags]
   examples:
   - summary: Create a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: >-
-        az network private-dns link vnet create -g MyResourceGroup -n MyLinkName -z www.mysite.com \
-            -v MyVirtualNetworkId -e False
+    syntax: >-
+      az network private-dns link vnet create -g MyResourceGroup -n MyLinkName -z www.mysite.com \
+          -v MyVirtualNetworkId -e False
   - summary: Create a virtual network link to the specified Private DNS zone. (autogenerated)
-    syntax:
-      content: az network private-dns link vnet create --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --subscription MySubscription --tags CostCenter=Marketing --virtual-network MyVirtualNetworkId --zone-name www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet create --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --subscription MySubscription --tags CostCenter=Marketing --virtual-network MyVirtualNetworkId --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
@@ -40,7 +36,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --virtual-network -v
@@ -50,151 +46,168 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_delete
+  - name: --tags
+    summary: Resource tags for the virtual network link.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_delete
   name: az network private-dns link vnet delete
   summary: Delete a virtual network link to the specified Private DNS zone.
   description: In case of a registration virtual network, all auto-registered DNS records in the zone for the virtual network will also be deleted. This operation cannot be undone.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet delete --name
+                                            --resource-group
+                                            --zone-name
+                                            [--if-match]
+                                            [--no-wait]
+                                            [--subscription]
+                                            [--yes]
   examples:
   - summary: Delete a virtual network link to the specified Private DNS zone.
-    syntax:
-      content: az network private-dns link vnet delete -g MyResourceGroup -z www.mysite.com -n MyLinkName
-  parameters:
+    syntax: az network private-dns link vnet delete -g MyResourceGroup -z www.mysite.com -n MyLinkName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the virtual network link to the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_list
   name: az network private-dns link vnet list
   summary: List the virtual network links to the specified Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet list --resource-group
+                                          --zone-name
+                                          [--query-examples]
+                                          [--subscription]
+                                          [--top]
   examples:
   - summary: List virtual network links to the specified Private DNS zone in a resource group.
-    syntax:
-      content: az network private-dns link vnet list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --top
-    summary: The maximum number of virtual network links to return. If not specified, returns up to 100 virtual network links.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_show
+  - name: --top
+    summary: The maximum number of virtual network links to return. If not specified, returns up to 100 virtual network links.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_show
   name: az network private-dns link vnet show
   summary: Get a virtual network link to the specified Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet show --name
+                                          --resource-group
+                                          --zone-name
+                                          [--query-examples]
+                                          [--subscription]
   examples:
   - summary: Get a virtual network link to the specified Private DNS zone..
-    syntax:
-      content: az network private-dns link vnet show -g MyResourceGroup -n MyLinkName -z www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet show -g MyResourceGroup -n MyLinkName -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_update
   name: az network private-dns link vnet update
   summary: Update a virtual network link's properties. Does not modify virtual network within the link.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet update --name
+                                            --resource-group
+                                            --zone-name
+                                            [--add]
+                                            [--force-string]
+                                            [--if-match]
+                                            [--no-wait]
+                                            [--registration-enabled {false, true}]
+                                            [--remove]
+                                            [--set]
+                                            [--subscription]
+                                            [--tags]
   examples:
   - summary: Update a virtual network link properties to enable registration.
-    syntax:
-      content: az network private-dns link vnet update -g MyResourceGroup -n MyLinkName -z www.mysite.com -e True
+    syntax: az network private-dns link vnet update -g MyResourceGroup -n MyLinkName -z www.mysite.com -e True
   - summary: Update a virtual network link's properties (autogenerated)
-    syntax:
-      content: az network private-dns link vnet update --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --tags CostCenter=Marketing --zone-name www.mysite.com
-  parameters:
+    syntax: az network private-dns link vnet update --name MyLinkName --registration-enabled true --resource-group MyResourceGroup --tags CostCenter=Marketing --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --if-match
     summary: The ETag of the virtual network link to the Private DNS zone.
     description: Omit this value to always overwrite the current virtual network link. Specify the last-seen ETag value to prevent accidentally overwritting any concurrent changes.
@@ -205,15 +218,6 @@ items:
     parameterValueGroup: false, true
     summary: Specify if the link is registration enabled.
     description: ''
-  - name: --tags
-    summary: Resource tags for the virtual network link.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -223,35 +227,43 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_link_vnet_wait
+  - name: --tags
+    summary: Resource tags for the virtual network link.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_link_vnet_wait
   name: az network private-dns link vnet wait
   summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns link vnet wait --name
+                                          --resource-group
+                                          --zone-name
+                                          [--created]
+                                          [--custom]
+                                          [--deleted]
+                                          [--exists]
+                                          [--interval]
+                                          [--subscription]
+                                          [--timeout]
+                                          [--updated]
   examples:
   - summary: Pause executing next line of CLI script until the virtual network link to the specified Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns link vnet wait -g MyResourceGroup -n MyLinkName -z www.mysite.com --created
-  parameters:
+    syntax: az network private-dns link vnet wait -g MyResourceGroup -n MyLinkName -z www.mysite.com --created
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the virtual network link to the specified Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -268,6 +280,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -275,34 +290,14 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_link_vnet_create
-  name: az network private-dns link vnet create
-  summary: Create a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_delete
-  name: az network private-dns link vnet delete
-  summary: Delete a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_list
-  name: az network private-dns link vnet list
-  summary: List the virtual network links to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_show
-  name: az network private-dns link vnet show
-  summary: Get a virtual network link to the specified Private DNS zone.
-- uid: az_network_private_dns_link_vnet_update
-  name: az network private-dns link vnet update
-  summary: Update a virtual network link's properties. Does not modify virtual network within the link.
-- uid: az_network_private_dns_link_vnet_wait
-  name: az network private-dns link vnet wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network link to the specified Private DNS zone is met.
+- az_network_private-dns_link_vnet_create
+- az_network_private-dns_link_vnet_delete
+- az_network_private-dns_link_vnet_list
+- az_network_private-dns_link_vnet_show
+- az_network_private-dns_link_vnet_update
+- az_network_private-dns_link_vnet_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -318,10 +313,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage virtual network links to the specified Private DNS zone.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage virtual network links to the specified Private DNS zone.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set.yml
index 7cd87d347a..842eaddf12 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set.yml
@@ -1,224 +1,101 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set
-  name: az network private-dns record-set
-  summary: Manage Private DNS records and record sets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_list
-- uid: az_network_private_dns_record_set_list
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set
+name: az network private-dns record-set
+summary: Manage Private DNS records and record sets.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_list
   name: az network private-dns record-set list
   summary: List all record sets within a Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set list --resource-group
+                                           --zone-name
+                                           [--query-examples]
+                                           [--subscription]
   examples:
   - summary: List all "@" record sets within this zone.
-    syntax:
-      content: >-
-        az network private-dns record-set list -g MyResourceGroup -z www.mysite.com \
-            --query "[?name=='@']"
-  parameters:
+    syntax: >-
+      az network private-dns record-set list -g MyResourceGroup -z www.mysite.com \
+          --query "[?name=='@']"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
-- uid: az_network_private_dns_record_set_list
-  name: az network private-dns record-set list
-  summary: List all record sets within a Private DNS zone.
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_private-dns_record-set_a
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
+- az_network_private-dns_record-set_aaaa
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
+- az_network_private-dns_record-set_cname
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
+- az_network_private-dns_record-set_list
+- az_network_private-dns_record-set_mx
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
+- az_network_private-dns_record-set_ptr
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
+- az_network_private-dns_record-set_soa
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
+- az_network_private-dns_record-set_srv
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
+- az_network_private-dns_record-set_txt
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -234,10 +111,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS records and record sets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS records and record sets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/a.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/a.yml
index 83d31afa0a..6b91830cde 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/a.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/a.yml
@@ -1,32 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_a
-  name: az network private-dns record-set a
-  summary: Manage Private DNS A records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_a_add_record
-  - az_network_private_dns_record_set_a_create
-  - az_network_private_dns_record_set_a_delete
-  - az_network_private_dns_record_set_a_list
-  - az_network_private_dns_record_set_a_remove_record
-  - az_network_private_dns_record_set_a_show
-  - az_network_private_dns_record_set_a_update
-- uid: az_network_private_dns_record_set_a_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_a
+name: az network private-dns record-set a
+summary: Manage Private DNS A records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_a_add-record
   name: az network private-dns record-set a add-record
   summary: Add an A record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a add-record --ipv4-address
+                                                   --record-set-name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--subscription]
   examples:
   - summary: Add an A record.
-    syntax:
-      content: >-
-        az network private-dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set a add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPV4 address in string notation.
@@ -37,139 +30,140 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_create
   name: az network private-dns record-set a create
   summary: Create an empty A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a create --name
+                                               --resource-group
+                                               --zone-name
+                                               [--metadata]
+                                               [--subscription]
+                                               [--ttl]
   examples:
   - summary: Create an empty A record set.
-    syntax:
-      content: az network private-dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set a create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_delete
   name: az network private-dns record-set a delete
   summary: Delete an A record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a delete --name
+                                               --resource-group
+                                               --zone-name
+                                               [--if-match]
+                                               [--subscription]
+                                               [--yes]
   examples:
   - summary: Delete an A record set and all associated records.
-    syntax:
-      content: az network private-dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set a delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_list
   name: az network private-dns record-set a list
   summary: List all A record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a list --resource-group
+                                             --zone-name
+                                             [--query-examples]
+                                             [--subscription]
   examples:
   - summary: List all A record sets in a zone.
-    syntax:
-      content: az network private-dns record-set a list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set a list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_remove-record
   name: az network private-dns record-set a remove-record
   summary: Remove an A record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a remove-record --ipv4-address
+                                                      --record-set-name
+                                                      --resource-group
+                                                      --zone-name
+                                                      [--keep-empty-record-set]
+                                                      [--subscription]
   examples:
   - summary: Remove an A record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv4Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set a remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv4Address
+  requiredParameters:
   - isRequired: true
     name: --ipv4-address -a
     summary: IPV4 address in string notation.
@@ -180,96 +174,102 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_show
   name: az network private-dns record-set a show
   summary: Get the details of an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a show --name
+                                             --resource-group
+                                             --zone-name
+                                             [--query-examples]
+                                             [--subscription]
   examples:
   - summary: Get the details of an A record set.
-    syntax:
-      content: az network private-dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set a show -g MyResourceGroup -n MyRecordSet -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_a_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_a_update
   name: az network private-dns record-set a update
   summary: Update an A record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set a update --name
+                                               --resource-group
+                                               --zone-name
+                                               [--add]
+                                               [--force-string]
+                                               [--if-match]
+                                               [--metadata]
+                                               [--remove]
+                                               [--set]
+                                               [--subscription]
   examples:
   - summary: Update an A record set.
-    syntax:
-      content: >-
-        az network private-dns record-set a update -g MyResourceGroup -n MyRecordSet \
-            -z www.mysite.com --metadata owner=WebTeam
+    syntax: >-
+      az network private-dns record-set a update -g MyResourceGroup -n MyRecordSet \
+          -z www.mysite.com --metadata owner=WebTeam
   - summary: Update an A record set. (autogenerated)
-    syntax:
-      content: az network private-dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set useRemoteGateways=true --subscription MySubscription --zone-name www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set a update --name MyRecordSet --resource-group MyResourceGroup --set useRemoteGateways=true --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -279,34 +279,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_a_add_record
-  name: az network private-dns record-set a add-record
-  summary: Add an A record.
-- uid: az_network_private_dns_record_set_a_create
-  name: az network private-dns record-set a create
-  summary: Create an empty A record set.
-- uid: az_network_private_dns_record_set_a_delete
-  name: az network private-dns record-set a delete
-  summary: Delete an A record set and all associated records.
-- uid: az_network_private_dns_record_set_a_list
-  name: az network private-dns record-set a list
-  summary: List all A record sets in a zone.
-- uid: az_network_private_dns_record_set_a_remove_record
-  name: az network private-dns record-set a remove-record
-  summary: Remove an A record from its record set.
-- uid: az_network_private_dns_record_set_a_show
-  name: az network private-dns record-set a show
-  summary: Get the details of an A record set.
-- uid: az_network_private_dns_record_set_a_update
-  name: az network private-dns record-set a update
-  summary: Update an A record set.
+- az_network_private-dns_record-set_a_add-record
+- az_network_private-dns_record-set_a_create
+- az_network_private-dns_record-set_a_delete
+- az_network_private-dns_record-set_a_list
+- az_network_private-dns_record-set_a_remove-record
+- az_network_private-dns_record-set_a_show
+- az_network_private-dns_record-set_a_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -322,10 +303,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS A records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS A records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/aaaa.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/aaaa.yml
index cca24af755..221f877f11 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/aaaa.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/aaaa.yml
@@ -1,32 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_aaaa
-  name: az network private-dns record-set aaaa
-  summary: Manage Private DNS AAAA records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_aaaa_add_record
-  - az_network_private_dns_record_set_aaaa_create
-  - az_network_private_dns_record_set_aaaa_delete
-  - az_network_private_dns_record_set_aaaa_list
-  - az_network_private_dns_record_set_aaaa_remove_record
-  - az_network_private_dns_record_set_aaaa_show
-  - az_network_private_dns_record_set_aaaa_update
-- uid: az_network_private_dns_record_set_aaaa_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_aaaa
+name: az network private-dns record-set aaaa
+summary: Manage Private DNS AAAA records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_aaaa_add-record
   name: az network private-dns record-set aaaa add-record
   summary: Add an AAAA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa add-record --ipv6-address
+                                                      --record-set-name
+                                                      --resource-group
+                                                      --zone-name
+                                                      [--subscription]
   examples:
   - summary: Add an AAAA record.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set aaaa add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPV6 address in string notation.
@@ -37,139 +30,140 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_create
   name: az network private-dns record-set aaaa create
   summary: Create an empty AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa create --name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--metadata]
+                                                  [--subscription]
+                                                  [--ttl]
   examples:
   - summary: Create an empty AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set aaaa create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_delete
   name: az network private-dns record-set aaaa delete
   summary: Delete an AAAA record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa delete --name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--if-match]
+                                                  [--subscription]
+                                                  [--yes]
   examples:
   - summary: Delete an AAAA record set and all associated records.
-    syntax:
-      content: az network private-dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set aaaa delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_list
   name: az network private-dns record-set aaaa list
   summary: List all AAAA record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa list --resource-group
+                                                --zone-name
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: List all AAAA record sets in a zone.
-    syntax:
-      content: az network private-dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set aaaa list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_remove-record
   name: az network private-dns record-set aaaa remove-record
   summary: Remove AAAA record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa remove-record --ipv6-address
+                                                         --record-set-name
+                                                         --resource-group
+                                                         --zone-name
+                                                         [--keep-empty-record-set]
+                                                         [--subscription]
   examples:
   - summary: Remove an AAAA record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -a MyIpv6Address
-  parameters:
+    syntax: >-
+      az network private-dns record-set aaaa remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -a MyIpv6Address
+  requiredParameters:
   - isRequired: true
     name: --ipv6-address -a
     summary: IPV6 address in string notation.
@@ -180,93 +174,100 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_show
   name: az network private-dns record-set aaaa show
   summary: Get the details of an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa show --name
+                                                --resource-group
+                                                --zone-name
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: Get the details of an AAAA record set.
-    syntax:
-      content: az network private-dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set aaaa show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_aaaa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_aaaa_update
   name: az network private-dns record-set aaaa update
   summary: Update an AAAA record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set aaaa update --name
+                                                  --resource-group
+                                                  --zone-name
+                                                  [--add]
+                                                  [--force-string]
+                                                  [--if-match]
+                                                  [--metadata]
+                                                  [--remove]
+                                                  [--set]
+                                                  [--subscription]
   examples:
   - summary: Update an AAAA record set.
-    syntax:
-      content: >-
-        az network private-dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set aaaa update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +277,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_aaaa_add_record
-  name: az network private-dns record-set aaaa add-record
-  summary: Add an AAAA record.
-- uid: az_network_private_dns_record_set_aaaa_create
-  name: az network private-dns record-set aaaa create
-  summary: Create an empty AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_delete
-  name: az network private-dns record-set aaaa delete
-  summary: Delete an AAAA record set and all associated records.
-- uid: az_network_private_dns_record_set_aaaa_list
-  name: az network private-dns record-set aaaa list
-  summary: List all AAAA record sets in a zone.
-- uid: az_network_private_dns_record_set_aaaa_remove_record
-  name: az network private-dns record-set aaaa remove-record
-  summary: Remove AAAA record from its record set.
-- uid: az_network_private_dns_record_set_aaaa_show
-  name: az network private-dns record-set aaaa show
-  summary: Get the details of an AAAA record set.
-- uid: az_network_private_dns_record_set_aaaa_update
-  name: az network private-dns record-set aaaa update
-  summary: Update an AAAA record set.
+- az_network_private-dns_record-set_aaaa_add-record
+- az_network_private-dns_record-set_aaaa_create
+- az_network_private-dns_record-set_aaaa_delete
+- az_network_private-dns_record-set_aaaa_list
+- az_network_private-dns_record-set_aaaa_remove-record
+- az_network_private-dns_record-set_aaaa_show
+- az_network_private-dns_record-set_aaaa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +301,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS AAAA records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS AAAA records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/cname.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/cname.yml
index ec4599b4c2..aceab0b1ee 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/cname.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/cname.yml
@@ -1,137 +1,136 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_cname
-  name: az network private-dns record-set cname
-  summary: Manage Private DNS CNAME records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_cname_create
-  - az_network_private_dns_record_set_cname_delete
-  - az_network_private_dns_record_set_cname_list
-  - az_network_private_dns_record_set_cname_remove_record
-  - az_network_private_dns_record_set_cname_set_record
-  - az_network_private_dns_record_set_cname_show
-  - az_network_private_dns_record_set_cname_update
-- uid: az_network_private_dns_record_set_cname_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_cname
+name: az network private-dns record-set cname
+summary: Manage Private DNS CNAME records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_cname_create
   name: az network private-dns record-set cname create
   summary: Create an empty CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname create --name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--metadata]
+                                                   [--subscription]
+                                                   [--ttl]
   examples:
   - summary: Create an empty CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set cname create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Create an empty CNAME record set (autogenerated)
+    syntax: az network private-dns record-set cname create --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --ttl 300 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_delete
   name: az network private-dns record-set cname delete
   summary: Delete a CNAME record set and its associated record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname delete --name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--if-match]
+                                                   [--subscription]
+                                                   [--yes]
   examples:
   - summary: Delete a CNAME record set and its associated record.
-    syntax:
-      content: az network private-dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set cname delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Delete a CNAME record set and its associated record. (autogenerated)
+    syntax: az network private-dns record-set cname delete --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --yes --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_list
   name: az network private-dns record-set cname list
   summary: List the CNAME record set in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname list --resource-group
+                                                 --zone-name
+                                                 [--query-examples]
+                                                 [--subscription]
   examples:
   - summary: List the CNAME record set in a zone.
-    syntax:
-      content: az network private-dns record-set cname list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set cname list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_remove-record
   name: az network private-dns record-set cname remove-record
   summary: Remove a CNAME record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname remove-record --cname
+                                                          --record-set-name
+                                                          --resource-group
+                                                          --zone-name
+                                                          [--keep-empty-record-set]
+                                                          [--subscription]
   examples:
   - summary: Remove a CNAME record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set cname remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
     summary: Canonical name.
@@ -142,37 +141,36 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_set_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_set-record
   name: az network private-dns record-set cname set-record
   summary: Set the value of a CNAME record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname set-record --cname
+                                                       --record-set-name
+                                                       --resource-group
+                                                       --zone-name
+                                                       [--subscription]
   examples:
   - summary: Set the value of a CNAME record.
-    syntax:
-      content: >-
-        az network private-dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -c www.contoso.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set cname set-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -c www.contoso.com
+  requiredParameters:
   - isRequired: true
     name: --cname -c
     summary: Canonical name.
@@ -183,90 +181,99 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_show
   name: az network private-dns record-set cname show
   summary: Get the details of a CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname show --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--query-examples]
+                                                 [--subscription]
   examples:
   - summary: Get the details of a CNAME record set.
-    syntax:
-      content: az network private-dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set cname show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  - summary: Get the details of a CNAME record set (autogenerated)
+    syntax: az network private-dns record-set cname show --name MyRecordSet --resource-group MyResourceGroup --subscription MySubscription --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_cname_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_cname_update
   name: az network private-dns record-set cname update
   summary: Update a CNAME record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set cname update --name
+                                                   --resource-group
+                                                   --zone-name
+                                                   [--add]
+                                                   [--force-string]
+                                                   [--if-match]
+                                                   [--metadata]
+                                                   [--remove]
+                                                   [--set]
+                                                   [--subscription]
   examples:
   - summary: Update a CNAME record set.
-    syntax:
-      content: >-
-        az network private-dns record-set cname update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set cname update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +283,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_cname_create
-  name: az network private-dns record-set cname create
-  summary: Create an empty CNAME record set.
-- uid: az_network_private_dns_record_set_cname_delete
-  name: az network private-dns record-set cname delete
-  summary: Delete a CNAME record set and its associated record.
-- uid: az_network_private_dns_record_set_cname_list
-  name: az network private-dns record-set cname list
-  summary: List the CNAME record set in a zone.
-- uid: az_network_private_dns_record_set_cname_remove_record
-  name: az network private-dns record-set cname remove-record
-  summary: Remove a CNAME record from its record set.
-- uid: az_network_private_dns_record_set_cname_set_record
-  name: az network private-dns record-set cname set-record
-  summary: Set the value of a CNAME record.
-- uid: az_network_private_dns_record_set_cname_show
-  name: az network private-dns record-set cname show
-  summary: Get the details of a CNAME record set.
-- uid: az_network_private_dns_record_set_cname_update
-  name: az network private-dns record-set cname update
-  summary: Update a CNAME record set.
+- az_network_private-dns_record-set_cname_create
+- az_network_private-dns_record-set_cname_delete
+- az_network_private-dns_record-set_cname_list
+- az_network_private-dns_record-set_cname_remove-record
+- az_network_private-dns_record-set_cname_set-record
+- az_network_private-dns_record-set_cname_show
+- az_network_private-dns_record-set_cname_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +307,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS CNAME records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS CNAME records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/mx.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/mx.yml
index 311dad72ff..e909fb5c23 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/mx.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/mx.yml
@@ -1,32 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_mx
-  name: az network private-dns record-set mx
-  summary: Manage Private DNS MX records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_mx_add_record
-  - az_network_private_dns_record_set_mx_create
-  - az_network_private_dns_record_set_mx_delete
-  - az_network_private_dns_record_set_mx_list
-  - az_network_private_dns_record_set_mx_remove_record
-  - az_network_private_dns_record_set_mx_show
-  - az_network_private_dns_record_set_mx_update
-- uid: az_network_private_dns_record_set_mx_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_mx
+name: az network private-dns record-set mx
+summary: Manage Private DNS MX records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_mx_add-record
   name: az network private-dns record-set mx add-record
   summary: Add an MX record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx add-record --exchange
+                                                    --preference
+                                                    --record-set-name
+                                                    --resource-group
+                                                    --zone-name
+                                                    [--subscription]
   examples:
   - summary: Add an MX record.
-    syntax:
-      content: >-
-        az network private-dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set mx add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -41,139 +35,141 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_create
   name: az network private-dns record-set mx create
   summary: Create an empty MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx create --name
+                                                --resource-group
+                                                --zone-name
+                                                [--metadata]
+                                                [--subscription]
+                                                [--ttl]
   examples:
   - summary: Create an empty MX record set.
-    syntax:
-      content: az network private-dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set mx create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_delete
   name: az network private-dns record-set mx delete
   summary: Delete an MX record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx delete --name
+                                                --resource-group
+                                                --zone-name
+                                                [--if-match]
+                                                [--subscription]
+                                                [--yes]
   examples:
   - summary: Delete an MX record set and all associated records.
-    syntax:
-      content: az network private-dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set mx delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_list
   name: az network private-dns record-set mx list
   summary: List all MX record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx list --resource-group
+                                              --zone-name
+                                              [--query-examples]
+                                              [--subscription]
   examples:
   - summary: List all MX record sets in a zone.
-    syntax:
-      content: az network private-dns record-set mx list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set mx list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_remove-record
   name: az network private-dns record-set mx remove-record
   summary: Remove an MX record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx remove-record --exchange
+                                                       --preference
+                                                       --record-set-name
+                                                       --resource-group
+                                                       --zone-name
+                                                       [--keep-empty-record-set]
+                                                       [--subscription]
   examples:
   - summary: Remove an MX record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -e mail.mysite.com -p 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set mx remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -e mail.mysite.com -p 10
+  requiredParameters:
   - isRequired: true
     name: --exchange -e
     summary: Exchange metric.
@@ -188,93 +184,100 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_show
   name: az network private-dns record-set mx show
   summary: Get the details of an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx show --name
+                                              --resource-group
+                                              --zone-name
+                                              [--query-examples]
+                                              [--subscription]
   examples:
   - summary: Get the details of an MX record set.
-    syntax:
-      content: az network private-dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set mx show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_mx_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_mx_update
   name: az network private-dns record-set mx update
   summary: Update an MX record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set mx update --name
+                                                --resource-group
+                                                --zone-name
+                                                [--add]
+                                                [--force-string]
+                                                [--if-match]
+                                                [--metadata]
+                                                [--remove]
+                                                [--set]
+                                                [--subscription]
   examples:
   - summary: Update an MX record set.
-    syntax:
-      content: >-
-        az network private-dns record-set mx update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set mx update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -284,34 +287,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_mx_add_record
-  name: az network private-dns record-set mx add-record
-  summary: Add an MX record.
-- uid: az_network_private_dns_record_set_mx_create
-  name: az network private-dns record-set mx create
-  summary: Create an empty MX record set.
-- uid: az_network_private_dns_record_set_mx_delete
-  name: az network private-dns record-set mx delete
-  summary: Delete an MX record set and all associated records.
-- uid: az_network_private_dns_record_set_mx_list
-  name: az network private-dns record-set mx list
-  summary: List all MX record sets in a zone.
-- uid: az_network_private_dns_record_set_mx_remove_record
-  name: az network private-dns record-set mx remove-record
-  summary: Remove an MX record from its record set.
-- uid: az_network_private_dns_record_set_mx_show
-  name: az network private-dns record-set mx show
-  summary: Get the details of an MX record set.
-- uid: az_network_private_dns_record_set_mx_update
-  name: az network private-dns record-set mx update
-  summary: Update an MX record set.
+- az_network_private-dns_record-set_mx_add-record
+- az_network_private-dns_record-set_mx_create
+- az_network_private-dns_record-set_mx_delete
+- az_network_private-dns_record-set_mx_list
+- az_network_private-dns_record-set_mx_remove-record
+- az_network_private-dns_record-set_mx_show
+- az_network_private-dns_record-set_mx_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -327,10 +311,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS MX records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS MX records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/ptr.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/ptr.yml
index 7e5fb2c52e..f3211f2f53 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/ptr.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/ptr.yml
@@ -1,32 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_ptr
-  name: az network private-dns record-set ptr
-  summary: Manage Private DNS PTR records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_ptr_add_record
-  - az_network_private_dns_record_set_ptr_create
-  - az_network_private_dns_record_set_ptr_delete
-  - az_network_private_dns_record_set_ptr_list
-  - az_network_private_dns_record_set_ptr_remove_record
-  - az_network_private_dns_record_set_ptr_show
-  - az_network_private_dns_record_set_ptr_update
-- uid: az_network_private_dns_record_set_ptr_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_ptr
+name: az network private-dns record-set ptr
+summary: Manage Private DNS PTR records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_ptr_add-record
   name: az network private-dns record-set ptr add-record
   summary: Add a PTR record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr add-record --ptrdname
+                                                     --record-set-name
+                                                     --resource-group
+                                                     --zone-name
+                                                     [--subscription]
   examples:
   - summary: Add a PTR record.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set ptr add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -37,139 +30,140 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_create
   name: az network private-dns record-set ptr create
   summary: Create an empty PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr create --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--metadata]
+                                                 [--subscription]
+                                                 [--ttl]
   examples:
   - summary: Create an empty PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set ptr create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_delete
   name: az network private-dns record-set ptr delete
   summary: Delete a PTR record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr delete --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--if-match]
+                                                 [--subscription]
+                                                 [--yes]
   examples:
   - summary: Delete a PTR record set and all associated records.
-    syntax:
-      content: az network private-dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set ptr delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_list
   name: az network private-dns record-set ptr list
   summary: List all PTR record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr list --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: List all PTR record sets in a zone.
-    syntax:
-      content: az network private-dns record-set ptr list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set ptr list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_remove-record
   name: az network private-dns record-set ptr remove-record
   summary: Remove a PTR record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr remove-record --ptrdname
+                                                        --record-set-name
+                                                        --resource-group
+                                                        --zone-name
+                                                        [--keep-empty-record-set]
+                                                        [--subscription]
   examples:
   - summary: Remove a PTR record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -d another.site.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set ptr remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -d another.site.com
+  requiredParameters:
   - isRequired: true
     name: --ptrdname -d
     summary: PTR target domain name.
@@ -180,93 +174,100 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_show
   name: az network private-dns record-set ptr show
   summary: Get the details of a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr show --name
+                                               --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of a PTR record set.
-    syntax:
-      content: az network private-dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set ptr show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_ptr_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_ptr_update
   name: az network private-dns record-set ptr update
   summary: Update a PTR record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set ptr update --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--if-match]
+                                                 [--metadata]
+                                                 [--remove]
+                                                 [--set]
+                                                 [--subscription]
   examples:
   - summary: Update a PTR record set.
-    syntax:
-      content: >-
-        az network private-dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set ptr update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +277,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_ptr_add_record
-  name: az network private-dns record-set ptr add-record
-  summary: Add a PTR record.
-- uid: az_network_private_dns_record_set_ptr_create
-  name: az network private-dns record-set ptr create
-  summary: Create an empty PTR record set.
-- uid: az_network_private_dns_record_set_ptr_delete
-  name: az network private-dns record-set ptr delete
-  summary: Delete a PTR record set and all associated records.
-- uid: az_network_private_dns_record_set_ptr_list
-  name: az network private-dns record-set ptr list
-  summary: List all PTR record sets in a zone.
-- uid: az_network_private_dns_record_set_ptr_remove_record
-  name: az network private-dns record-set ptr remove-record
-  summary: Remove a PTR record from its record set.
-- uid: az_network_private_dns_record_set_ptr_show
-  name: az network private-dns record-set ptr show
-  summary: Get the details of a PTR record set.
-- uid: az_network_private_dns_record_set_ptr_update
-  name: az network private-dns record-set ptr update
-  summary: Update a PTR record set.
+- az_network_private-dns_record-set_ptr_add-record
+- az_network_private-dns_record-set_ptr_create
+- az_network_private-dns_record-set_ptr_delete
+- az_network_private-dns_record-set_ptr_list
+- az_network_private-dns_record-set_ptr_remove-record
+- az_network_private-dns_record-set_ptr_show
+- az_network_private-dns_record-set_ptr_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +301,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS PTR records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS PTR records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/soa.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/soa.yml
index 20fe18afb8..e54a73ffdb 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/soa.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/soa.yml
@@ -1,63 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_soa
-  name: az network private-dns record-set soa
-  summary: Manage Private DNS SOA record.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_soa_show
-  - az_network_private_dns_record_set_soa_update
-- uid: az_network_private_dns_record_set_soa_show
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_soa
+name: az network private-dns record-set soa
+summary: Manage Private DNS SOA record.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_soa_show
   name: az network private-dns record-set soa show
   summary: Get the details of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set soa show --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of an SOA record.
-    syntax:
-      content: az network private-dns record-set soa show -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set soa show -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_soa_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_soa_update
   name: az network private-dns record-set soa update
   summary: Update properties of an SOA record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set soa update --resource-group
+                                                 --zone-name
+                                                 [--email]
+                                                 [--expire-time]
+                                                 [--host]
+                                                 [--minimum-ttl]
+                                                 [--refresh-time]
+                                                 [--retry-time]
+                                                 [--serial-number]
+                                                 [--subscription]
   examples:
   - summary: Update properties of an SOA record.
-    syntax:
-      content: >-
-        az network private-dns record-set soa update -g MyResourceGroup -z www.mysite.com \
-            -e myhostmaster.mysite.com
-  parameters:
+    syntax: >-
+      az network private-dns record-set soa update -g MyResourceGroup -z www.mysite.com \
+          -e myhostmaster.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --email -e
     summary: Email address.
     description: ''
@@ -82,19 +87,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_soa_show
-  name: az network private-dns record-set soa show
-  summary: Get the details of an SOA record.
-- uid: az_network_private_dns_record_set_soa_update
-  name: az network private-dns record-set soa update
-  summary: Update properties of an SOA record.
+- az_network_private-dns_record-set_soa_show
+- az_network_private-dns_record-set_soa_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -110,10 +106,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS SOA record.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS SOA record.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/srv.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/srv.yml
index 657c650962..03b496f650 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/srv.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/srv.yml
@@ -1,32 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_srv
-  name: az network private-dns record-set srv
-  summary: Manage Private DNS SRV records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_srv_add_record
-  - az_network_private_dns_record_set_srv_create
-  - az_network_private_dns_record_set_srv_delete
-  - az_network_private_dns_record_set_srv_list
-  - az_network_private_dns_record_set_srv_remove_record
-  - az_network_private_dns_record_set_srv_show
-  - az_network_private_dns_record_set_srv_update
-- uid: az_network_private_dns_record_set_srv_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_srv
+name: az network private-dns record-set srv
+summary: Manage Private DNS SRV records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_srv_add-record
   name: az network private-dns record-set srv add-record
   summary: Add an SRV record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv add-record --port
+                                                     --priority
+                                                     --record-set-name
+                                                     --resource-group
+                                                     --target
+                                                     --weight
+                                                     --zone-name
+                                                     [--subscription]
   examples:
   - summary: Add an SRV record.
-    syntax:
-      content: >-
-        az network private-dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -41,7 +37,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -55,135 +51,141 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_create
   name: az network private-dns record-set srv create
   summary: Create an empty SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv create --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--metadata]
+                                                 [--subscription]
+                                                 [--ttl]
   examples:
   - summary: Create an empty SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv create -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv create -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet
+  - summary: Create an empty SRV record set. (autogenerated)
+    syntax: az network private-dns record-set srv create --name MyRecordSet --resource-group MyResourceGroup --ttl 300 --zone-name www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_delete
   name: az network private-dns record-set srv delete
   summary: Delete an SRV record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv delete --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--if-match]
+                                                 [--subscription]
+                                                 [--yes]
   examples:
   - summary: Delete an SRV record set and all associated records.
-    syntax:
-      content: az network private-dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set srv delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_list
   name: az network private-dns record-set srv list
   summary: List all SRV record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv list --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: List all SRV record sets in a zone.
-    syntax:
-      content: az network private-dns record-set srv list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set srv list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_remove-record
   name: az network private-dns record-set srv remove-record
   summary: Remove an SRV record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv remove-record --port
+                                                        --priority
+                                                        --record-set-name
+                                                        --resource-group
+                                                        --target
+                                                        --weight
+                                                        --zone-name
+                                                        [--keep-empty-record-set]
+                                                        [--subscription]
   examples:
   - summary: Remove an SRV record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -t webserver.mysite.com -r 8081 -p 10 -w 10
+  requiredParameters:
   - isRequired: true
     name: --port -r
     summary: Service port.
@@ -198,7 +200,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --target -t
@@ -212,87 +214,94 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_show
   name: az network private-dns record-set srv show
   summary: Get the details of an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv show --name
+                                               --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of an SRV record set.
-    syntax:
-      content: az network private-dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set srv show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_srv_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_srv_update
   name: az network private-dns record-set srv update
   summary: Update an SRV record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set srv update --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--if-match]
+                                                 [--metadata]
+                                                 [--remove]
+                                                 [--set]
+                                                 [--subscription]
   examples:
   - summary: Update an SRV record set.
-    syntax:
-      content: >-
-        az network private-dns record-set srv update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set srv update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -302,34 +311,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_srv_add_record
-  name: az network private-dns record-set srv add-record
-  summary: Add an SRV record.
-- uid: az_network_private_dns_record_set_srv_create
-  name: az network private-dns record-set srv create
-  summary: Create an empty SRV record set.
-- uid: az_network_private_dns_record_set_srv_delete
-  name: az network private-dns record-set srv delete
-  summary: Delete an SRV record set and all associated records.
-- uid: az_network_private_dns_record_set_srv_list
-  name: az network private-dns record-set srv list
-  summary: List all SRV record sets in a zone.
-- uid: az_network_private_dns_record_set_srv_remove_record
-  name: az network private-dns record-set srv remove-record
-  summary: Remove an SRV record from its record set.
-- uid: az_network_private_dns_record_set_srv_show
-  name: az network private-dns record-set srv show
-  summary: Get the details of an SRV record set.
-- uid: az_network_private_dns_record_set_srv_update
-  name: az network private-dns record-set srv update
-  summary: Update an SRV record set.
+- az_network_private-dns_record-set_srv_add-record
+- az_network_private-dns_record-set_srv_create
+- az_network_private-dns_record-set_srv_delete
+- az_network_private-dns_record-set_srv_list
+- az_network_private-dns_record-set_srv_remove-record
+- az_network_private-dns_record-set_srv_show
+- az_network_private-dns_record-set_srv_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -345,10 +335,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS SRV records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS SRV records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/txt.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/txt.yml
index 577e902cc7..eb3566b41f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/txt.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/record-set/txt.yml
@@ -1,39 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_record_set_txt
-  name: az network private-dns record-set txt
-  summary: Manage Private DNS TXT records.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_record_set_txt_add_record
-  - az_network_private_dns_record_set_txt_create
-  - az_network_private_dns_record_set_txt_delete
-  - az_network_private_dns_record_set_txt_list
-  - az_network_private_dns_record_set_txt_remove_record
-  - az_network_private_dns_record_set_txt_show
-  - az_network_private_dns_record_set_txt_update
-- uid: az_network_private_dns_record_set_txt_add_record
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_record-set_txt
+name: az network private-dns record-set txt
+summary: Manage Private DNS TXT records.
+description: ''
+directCommands:
+- uid: az_network_private-dns_record-set_txt_add-record
   name: az network private-dns record-set txt add-record
   summary: Add a TXT record.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt add-record --record-set-name
+                                                     --resource-group
+                                                     --value
+                                                     --zone-name
+                                                     [--subscription]
   examples:
   - summary: Add a TXT record.
-    syntax:
-      content: >-
-        az network private-dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set txt add-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone. Creates a new record set if one does not exist.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -43,140 +36,141 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_create
   name: az network private-dns record-set txt create
   summary: Create an empty TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt create --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--metadata]
+                                                 [--subscription]
+                                                 [--ttl]
   examples:
   - summary: Create an empty TXT record set.
-    syntax:
-      content: az network private-dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set txt create -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --ttl
     defaultValue: "3600"
     summary: Record set TTL (time-to-live).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_delete
   name: az network private-dns record-set txt delete
   summary: Delete a TXT record set and all associated records.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt delete --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--if-match]
+                                                 [--subscription]
+                                                 [--yes]
   examples:
   - summary: Delete a TXT record set and all associated records.
-    syntax:
-      content: az network private-dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set txt delete -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the record set. Omit this value to always delete the current record set. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_list
   name: az network private-dns record-set txt list
   summary: List all TXT record sets in a zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt list --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: List all TXT record sets in a zone.
-    syntax:
-      content: az network private-dns record-set txt list -g MyResourceGroup -z www.mysite.com
-  parameters:
+    syntax: az network private-dns record-set txt list -g MyResourceGroup -z www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_remove_record
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_remove-record
   name: az network private-dns record-set txt remove-record
   summary: Remove a TXT record from its record set.
   description: By default, if the last record in a set is removed, the record set is deleted. To retain the empty record set, include --keep-empty-record-set.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt remove-record --record-set-name
+                                                        --resource-group
+                                                        --value
+                                                        --zone-name
+                                                        [--keep-empty-record-set]
+                                                        [--subscription]
   examples:
   - summary: Remove a TXT record from its record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet -v Owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set txt remove-record -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet -v Owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --record-set-name -n
     summary: The name of the record set relative to the zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --value -v
@@ -186,87 +180,94 @@ items:
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
   - name: --keep-empty-record-set
     summary: Keep the empty record set if the last record is removed.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_show
   name: az network private-dns record-set txt show
   summary: Get the details of a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt show --name
+                                               --resource-group
+                                               --zone-name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get the details of a TXT record set.
-    syntax:
-      content: az network private-dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
-  parameters:
+    syntax: az network private-dns record-set txt show -g MyResourceGroup -z www.mysite.com -n MyRecordSet
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_record_set_txt_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_record-set_txt_update
   name: az network private-dns record-set txt update
   summary: Update a TXT record set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns record-set txt update --name
+                                                 --resource-group
+                                                 --zone-name
+                                                 [--add]
+                                                 [--force-string]
+                                                 [--if-match]
+                                                 [--metadata]
+                                                 [--remove]
+                                                 [--set]
+                                                 [--subscription]
   examples:
   - summary: Update a TXT record set.
-    syntax:
-      content: >-
-        az network private-dns record-set txt update -g MyResourceGroup -z www.mysite.com \
-            -n MyRecordSet --metadata owner=WebTeam
-  parameters:
+    syntax: >-
+      az network private-dns record-set txt update -g MyResourceGroup -z www.mysite.com \
+          -n MyRecordSet --metadata owner=WebTeam
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the record set, relative to the name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --zone-name -z
     summary: The name of the Private DNS zone.
     description: ''
-  - name: --if-match
-    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the record set. Omit this value to always overwrite the current record set. Specify the last-seen ETag value to prevent accidentally overwriting concurrent changes.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -276,34 +277,15 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_record_set_txt_add_record
-  name: az network private-dns record-set txt add-record
-  summary: Add a TXT record.
-- uid: az_network_private_dns_record_set_txt_create
-  name: az network private-dns record-set txt create
-  summary: Create an empty TXT record set.
-- uid: az_network_private_dns_record_set_txt_delete
-  name: az network private-dns record-set txt delete
-  summary: Delete a TXT record set and all associated records.
-- uid: az_network_private_dns_record_set_txt_list
-  name: az network private-dns record-set txt list
-  summary: List all TXT record sets in a zone.
-- uid: az_network_private_dns_record_set_txt_remove_record
-  name: az network private-dns record-set txt remove-record
-  summary: Remove a TXT record from its record set.
-- uid: az_network_private_dns_record_set_txt_show
-  name: az network private-dns record-set txt show
-  summary: Get the details of a TXT record set.
-- uid: az_network_private_dns_record_set_txt_update
-  name: az network private-dns record-set txt update
-  summary: Update a TXT record set.
+- az_network_private-dns_record-set_txt_add-record
+- az_network_private-dns_record-set_txt_create
+- az_network_private-dns_record-set_txt_delete
+- az_network_private-dns_record-set_txt_list
+- az_network_private-dns_record-set_txt_remove-record
+- az_network_private-dns_record-set_txt_show
+- az_network_private-dns_record-set_txt_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +301,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS TXT records.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS TXT records.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/zone.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/zone.yml
index d112f6b8dd..ef143f96a6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/zone.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-dns/zone.yml
@@ -1,133 +1,121 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_dns_zone
-  name: az network private-dns zone
-  summary: Manage Private DNS zones.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_dns_zone_create
-  - az_network_private_dns_zone_delete
-  - az_network_private_dns_zone_export
-  - az_network_private_dns_zone_import
-  - az_network_private_dns_zone_list
-  - az_network_private_dns_zone_show
-  - az_network_private_dns_zone_update
-  - az_network_private_dns_zone_wait
-- uid: az_network_private_dns_zone_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-dns_zone
+name: az network private-dns zone
+summary: Manage Private DNS zones.
+description: ''
+directCommands:
+- uid: az_network_private-dns_zone_create
   name: az network private-dns zone create
   summary: Create a Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone create --name
+                                       --resource-group
+                                       [--no-wait]
+                                       [--subscription]
+                                       [--tags]
   examples:
   - summary: Create a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone create -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network private-dns zone create -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_delete
+  - name: --tags
+    summary: Resource tags for the Private DNS zone.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_delete
   name: az network private-dns zone delete
   summary: Delete a Private DNS zone.
   description: All DNS records in the zone will also be deleted. This operation cannot be undone. Private DNS zone cannot be deleted unless all virtual network links to it are removed.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone delete --name
+                                       --resource-group
+                                       [--if-match]
+                                       [--no-wait]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone delete -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network private-dns zone delete -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --if-match
     summary: The ETag of the Private DNS zone. Omit this value to always delete the current zone. Specify the last-seen ETag value to prevent accidentally deleting any concurrent changes.
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_export
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_export
   name: az network private-dns zone export
   summary: Export a Private DNS zone as a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone export --name
+                                       --resource-group
+                                       [--file-name]
+                                       [--subscription]
   examples:
   - summary: Export a Private DNS zone as a DNS zone file.
-    syntax:
-      content: az network private-dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
-  parameters:
+    syntax: az network private-dns zone export -g MyResourceGroup -n www.mysite.com -f mysite_com_zone.txt
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --file-name -f
     summary: Path to the Private DNS zone file to save.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_import
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_import
   name: az network private-dns zone import
   summary: Create a Private DNS zone using a DNS zone file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone import --file-name
+                                       --name
+                                       --resource-group
+                                       [--subscription]
   examples:
   - summary: Import a local zone file into a Private DNS zone resource.
-    syntax:
-      content: az network private-dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
-  parameters:
+    syntax: az network private-dns zone import -g MyResourceGroup -n MyZone -f /path/to/zone/file
+  requiredParameters:
   - isRequired: true
     name: --file-name -f
     summary: Path to the Private DNS zone file to import.
@@ -138,102 +126,104 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_list
   name: az network private-dns zone list
   summary: List Private DNS zones.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone list [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: List Private DNS zones in a resource group.
-    syntax:
-      content: az network private-dns zone list -g MyResourceGroup
-  parameters:
+    syntax: az network private-dns zone list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_show
   name: az network private-dns zone show
   summary: Get a Private DNS zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone show --name
+                                     --resource-group
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Get a Private DNS zone using a fully qualified domain name.
-    syntax:
-      content: az network private-dns zone show -g MyResourceGroup -n www.mysite.com
-  parameters:
+    syntax: az network private-dns zone show -g MyResourceGroup -n www.mysite.com
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_update
   name: az network private-dns zone update
   summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone update --name
+                                       --resource-group
+                                       [--add]
+                                       [--force-string]
+                                       [--if-match]
+                                       [--no-wait]
+                                       [--remove]
+                                       [--set]
+                                       [--subscription]
+                                       [--tags]
   examples:
   - summary: Update a Private DNS zone properties to change the user-defined value of a previously set tag.
-    syntax:
-      content: az network private-dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
-  parameters:
+    syntax: az network private-dns zone update -g MyResourceGroup -n www.mysite.com --tags CostCenter=Marketing
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --if-match
-    summary: The ETag of the Private DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen ETag value to prevent accidentally overwriting any concurrent changes.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --tags
-    summary: Resource tags for the Private DNS zone.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --if-match
+    summary: The ETag of the Private DNS zone. Omit this value to always overwrite the current zone. Specify the last-seen ETag value to prevent accidentally overwriting any concurrent changes.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
@@ -243,31 +233,38 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_dns_zone_wait
+  - name: --tags
+    summary: Resource tags for the Private DNS zone.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-dns_zone_wait
   name: az network private-dns zone wait
   summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-dns zone wait --name
+                                     --resource-group
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--subscription]
+                                     [--timeout]
+                                     [--updated]
   examples:
   - summary: Pause executing next line of CLI script until the Private DNS zone is successfully provisioned.
-    syntax:
-      content: az network private-dns zone wait -g MyResourceGroup -n www.mysite.com --created
-  parameters:
+    syntax: az network private-dns zone wait -g MyResourceGroup -n www.mysite.com --created
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Private DNS zone.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -284,6 +281,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -291,40 +291,16 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_dns_zone_create
-  name: az network private-dns zone create
-  summary: Create a Private DNS zone.
-- uid: az_network_private_dns_zone_delete
-  name: az network private-dns zone delete
-  summary: Delete a Private DNS zone.
-- uid: az_network_private_dns_zone_export
-  name: az network private-dns zone export
-  summary: Export a Private DNS zone as a DNS zone file.
-- uid: az_network_private_dns_zone_import
-  name: az network private-dns zone import
-  summary: Create a Private DNS zone using a DNS zone file.
-- uid: az_network_private_dns_zone_list
-  name: az network private-dns zone list
-  summary: List Private DNS zones.
-- uid: az_network_private_dns_zone_show
-  name: az network private-dns zone show
-  summary: Get a Private DNS zone.
-- uid: az_network_private_dns_zone_update
-  name: az network private-dns zone update
-  summary: Update a Private DNS zone's properties. Does not modify Private DNS records or virtual network links within the zone.
-- uid: az_network_private_dns_zone_wait
-  name: az network private-dns zone wait
-  summary: Place the CLI in a waiting state until a condition of the Private DNS zone is met.
+- az_network_private-dns_zone_create
+- az_network_private-dns_zone_delete
+- az_network_private-dns_zone_export
+- az_network_private-dns_zone_import
+- az_network_private-dns_zone_list
+- az_network_private-dns_zone_show
+- az_network_private-dns_zone_update
+- az_network_private-dns_zone_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -340,10 +316,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Private DNS zones.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Private DNS zones.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint-connection.yml
index 0c4b4e942c..69878861e3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint-connection.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint-connection.yml
@@ -1,34 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_endpoint_connection
-  name: az network private-endpoint-connection
-  summary: Manage private endpoint connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_endpoint_connection_approve
-  - az_network_private_endpoint_connection_delete
-  - az_network_private_endpoint_connection_list
-  - az_network_private_endpoint_connection_reject
-  - az_network_private_endpoint_connection_show
-- uid: az_network_private_endpoint_connection_approve
+### YamlMime:AzureCLIGroup
+uid: az_network_private-endpoint-connection
+name: az network private-endpoint-connection
+summary: Manage private endpoint connections.
+description: ''
+directCommands:
+- uid: az_network_private-endpoint-connection_approve
   name: az network private-endpoint-connection approve
   summary: Approve a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection approve [--description]
+                                                   [--id]
+                                                   [--name]
+                                                   [--resource-group]
+                                                   [--resource-name]
+                                                   [--subscription]
+                                                   [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: Approve a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Approved"
+    syntax: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Approved"
   - summary: Approve a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Approved"
+    syntax: az network private-endpoint-connection approve -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Approved"
   - summary: Approve a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection approve --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Approved"
-  parameters:
+    syntax: az network private-endpoint-connection approve --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Approved"
+  optionalParameters:
   - name: --description -d
     summary: Comments for the approval.
     description: ''
@@ -39,41 +34,39 @@ items:
     summary: Name of the private endpoint connection.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_delete
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_delete
   name: az network private-endpoint-connection delete
   summary: Delete a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection delete [--id]
+                                                  [--name]
+                                                  [--resource-group]
+                                                  [--resource-name]
+                                                  [--subscription]
+                                                  [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
+                                                  [--yes]
   examples:
   - summary: Delete a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
   - summary: Delete a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-endpoint-connection delete -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
   - summary: Delete a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection delete --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
-  parameters:
+    syntax: az network private-endpoint-connection delete --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
+  optionalParameters:
   - name: --id
     summary: ID of the private endpoint connection.
     description: ''
@@ -81,83 +74,81 @@ items:
     summary: Name of the private endpoint connection.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
     summary: Type of the resource.
     description: ''
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_list
   name: az network private-endpoint-connection list
   summary: List all private endpoint connections.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection list [--id]
+                                                [--name]
+                                                [--query-examples]
+                                                [--resource-group]
+                                                [--subscription]
+                                                [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: List all private endpoint connections for a storage account.
-    syntax:
-      content: az network private-endpoint-connection list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-endpoint-connection list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
   - summary: List all private endpoint connections for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-endpoint-connection list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
   - summary: List all private endpoint connections for an ACR.
-    syntax:
-      content: az network private-endpoint-connection list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
-  parameters:
+    syntax: az network private-endpoint-connection list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
+  optionalParameters:
   - name: --id
     summary: ID of the resource.
     description: ''
   - name: --name -n
-    summary: Name of the resource.
+    summary: Name of the resource. If provided, --type and --resource-group must be provided too.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
+  - name: --resource-group -g
+    summary: Name of resource group. If provided, --name and --type must be provided too.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_reject
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource. If provided, --name and --resource-group must be provided too.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_reject
   name: az network private-endpoint-connection reject
   summary: Reject a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection reject [--description]
+                                                  [--id]
+                                                  [--name]
+                                                  [--resource-group]
+                                                  [--resource-name]
+                                                  [--subscription]
+                                                  [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: Reject a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Rejected"
+    syntax: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts --description "Rejected"
   - summary: Reject a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Rejected"
+    syntax: az network private-endpoint-connection reject -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults --description "Rejected"
   - summary: Reject a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection reject --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Rejected"
-  parameters:
+    syntax: az network private-endpoint-connection reject --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d --description "Rejected"
+  optionalParameters:
   - name: --description -d
     summary: Comments for the rejection.
     description: ''
@@ -168,82 +159,68 @@ items:
     summary: Name of the private endpoint connection.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_endpoint_connection_show
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-endpoint-connection_show
   name: az network private-endpoint-connection show
   summary: Show a private endpoint connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-endpoint-connection show [--id]
+                                                [--name]
+                                                [--query-examples]
+                                                [--resource-group]
+                                                [--resource-name]
+                                                [--subscription]
+                                                [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: Show a private endpoint connection for a storage account.
-    syntax:
-      content: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MySA --type Microsoft.Storage/storageAccounts
   - summary: Show a private endpoint connection for a keyvault.
-    syntax:
-      content: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-endpoint-connection show -g MyResourceGroup -n MyPrivateEndpoint --resource-name MyKV --type Microsoft.Keyvault/vaults
   - summary: Show a private endpoint connection for an ACR.
-    syntax:
-      content: az network private-endpoint-connection show --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
-  parameters:
+    syntax: az network private-endpoint-connection show --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002/privateEndpointConnections/testreg000002.6e6bf72bc59d41cc89c698d4cc5ee79d
+  optionalParameters:
   - name: --id
     summary: ID of the private endpoint connection.
     description: ''
   - name: --name -n
     summary: Name of the private endpoint connection.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-name
     summary: Name of the resource.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_endpoint_connection_approve
-  name: az network private-endpoint-connection approve
-  summary: Approve a private endpoint connection.
-- uid: az_network_private_endpoint_connection_delete
-  name: az network private-endpoint-connection delete
-  summary: Delete a private endpoint connection.
-- uid: az_network_private_endpoint_connection_list
-  name: az network private-endpoint-connection list
-  summary: List all private endpoint connections.
-- uid: az_network_private_endpoint_connection_reject
-  name: az network private-endpoint-connection reject
-  summary: Reject a private endpoint connection.
-- uid: az_network_private_endpoint_connection_show
-  name: az network private-endpoint-connection show
-  summary: Show a private endpoint connection.
+- az_network_private-endpoint-connection_approve
+- az_network_private-endpoint-connection_delete
+- az_network_private-endpoint-connection_list
+- az_network_private-endpoint-connection_reject
+- az_network_private-endpoint-connection_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -259,10 +236,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private endpoint connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private endpoint connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint.yml
index 66bf38d4da..59eba26c0c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-endpoint.yml
@@ -1,36 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_endpoint
-  name: az network private-endpoint
-  summary: Manage private endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_endpoint_list
-- uid: az_network_private_endpoint_list
+### YamlMime:AzureCLIGroup
+uid: az_network_private-endpoint
+name: az network private-endpoint
+summary: Manage private endpoints.
+description: ''
+directCommands:
+- uid: az_network_private-endpoint_list
   name: az network private-endpoint list
   summary: List private endpoints.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network private-endpoint list [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_endpoint_list
-  name: az network private-endpoint list
-  summary: List private endpoints.
+- az_network_private-endpoint_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -46,10 +40,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private endpoints.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-link-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-link-resource.yml
index 628d0ca4cf..6c49d567f7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-link-resource.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-link-resource.yml
@@ -1,56 +1,50 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_link_resource
-  name: az network private-link-resource
-  summary: Manage private link resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_link_resource_list
-- uid: az_network_private_link_resource_list
+### YamlMime:AzureCLIGroup
+uid: az_network_private-link-resource
+name: az network private-link-resource
+summary: Manage private link resources.
+description: ''
+directCommands:
+- uid: az_network_private-link-resource_list
   name: az network private-link-resource list
   summary: List all private link resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-link-resource list [--id]
+                                          [--name]
+                                          [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--type {Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes}]
   examples:
   - summary: List all private link resources for a storage account.
-    syntax:
-      content: az network private-link-resource list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
+    syntax: az network private-link-resource list -g MyResourceGroup -n MySA --type Microsoft.Storage/storageAccounts
   - summary: List all private link resources for a keyvault.
-    syntax:
-      content: az network private-link-resource list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
+    syntax: az network private-link-resource list -g MyResourceGroup -n MyKV --type Microsoft.Keyvault/vaults
   - summary: List all private link resources for an ACR.
-    syntax:
-      content: az network private-link-resource list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
-  parameters:
+    syntax: az network private-link-resource list --id /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.ContainerRegistry/registries/testreg000002
+  optionalParameters:
   - name: --id
     summary: ID of the resource.
     description: ''
   - name: --name -n
-    summary: Name of the resource.
+    summary: Name of the resource. If provided, --type and --resource-group must be provided too.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
-  - name: --type
-    parameterValueGroup: Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.Keyvault/vaults, Microsoft.Storage/storageAccounts, microsoft.insights/privateLinkScopes
-    summary: Type of the resource.
+  - name: --resource-group -g
+    summary: Name of resource group. If provided, --name and --type must be provided too.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --type
+    parameterValueGroup: Microsoft.AppConfiguration/configurationStores, Microsoft.Automation/automationAccounts, Microsoft.Batch/batchAccounts, Microsoft.CognitiveServices/accounts, Microsoft.Compute/diskAccesses, Microsoft.ContainerRegistry/registries, Microsoft.DBforMariaDB/servers, Microsoft.DBforMySQL/servers, Microsoft.DBforPostgreSQL/servers, Microsoft.Devices/IotHubs, Microsoft.DigitalTwins/digitalTwinsInstances, Microsoft.DocumentDB/databaseAccounts, Microsoft.EventGrid/domains, Microsoft.EventGrid/topics, Microsoft.EventHub/namespaces, Microsoft.HealthcareApis/services, Microsoft.KeyVault/managedHSMs, Microsoft.Keyvault/vaults, Microsoft.Network/applicationGateways, Microsoft.Search/searchServices, Microsoft.SignalRService/signalr, Microsoft.Sql/servers, Microsoft.Storage/storageAccounts, Microsoft.Synapse/workspaces, Microsoft.Web/sites, microsoft.insights/privateLinkScopes
+    summary: Type of the resource. If provided, --name and --resource-group must be provided too.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_link_resource_list
-  name: az network private-link-resource list
-  summary: List all private link resources.
+- az_network_private-link-resource_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -66,10 +60,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private link resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private link resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service.yml
index 59d8315bc7..356fdfdb86 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service.yml
@@ -1,25 +1,34 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_link_service
-  name: az network private-link-service
-  summary: Manage private link services.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_link_service_create
-  - az_network_private_link_service_list
-- uid: az_network_private_link_service_create
+### YamlMime:AzureCLIGroup
+uid: az_network_private-link-service
+name: az network private-link-service
+summary: Manage private link services.
+description: ''
+directCommands:
+- uid: az_network_private-link-service_create
   name: az network private-link-service create
   summary: Create a private link service.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-link-service create --lb-frontend-ip-configs
+                                           --name
+                                           --resource-group
+                                           --subnet
+                                           [--auto-approval]
+                                           [--fqdns]
+                                           [--lb-name]
+                                           [--location]
+                                           [--private-ip-address]
+                                           [--private-ip-address-version {IPv4, IPv6}]
+                                           [--private-ip-allocation-method {Dynamic, Static}]
+                                           [--public-ip-address]
+                                           [--subscription]
+                                           [--tags]
+                                           [--visibility]
+                                           [--vnet-name]
   examples:
   - summary: Create a private link service
-    syntax:
-      content: az network private-link-service create -g MyResourceGroup -n MyPLSName --vnet-name MyVnetName --subnet MySubnet --lb-name MyLBName --lb-frontend-ip-configs LoadBalancerFrontEnd -l centralus
-  parameters:
+    syntax: az network private-link-service create -g MyResourceGroup -n MyPLSName --vnet-name MyVnetName --subnet MySubnet --lb-name MyLBName --lb-frontend-ip-configs LoadBalancerFrontEnd -l centralus
+  requiredParameters:
   - isRequired: true
     name: --lb-frontend-ip-configs
     summary: Space-separated list of names or IDs of load balancer frontend IP configurations to link to. If names are used, also supply `--lb-name`.
@@ -30,8 +39,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --subnet
+    summary: Name or ID of subnet to use. If name provided, also supply `--vnet-name`.
     description: ''
+  optionalParameters:
   - name: --auto-approval
     summary: Space-separated list of subscription IDs to auto-approve.
     description: ''
@@ -42,17 +56,7 @@ items:
     summary: Name of the load balancer to retrieve frontend IP configs from. Ignored if a frontend IP configuration ID is supplied.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --visibility
-    summary: Space-separated list of subscription IDs for which the private link service is visible.
-    description: ''
-  - isRequired: true
-    name: --subnet
-    summary: Name or ID of subnet to use. If name provided, also supply `--vnet-name`.
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --private-ip-address
     summary: Static private IP address to use.
@@ -69,50 +73,43 @@ items:
   - name: --public-ip-address
     summary: Name or ID of the a public IP address to use.
     description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_private_link_service_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --visibility
+    summary: Space-separated list of subscription IDs for which the private link service is visible.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_private-link-service_list
   name: az network private-link-service list
   summary: List private link services.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network private-link-service list [--query-examples]
+                                         [--resource-group]
+                                         [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_link_service_connection
-  name: az network private-link-service connection
-  summary: Manage private link service endpoint connections.
-- uid: az_network_private_link_service_connection_update
-  name: az network private-link-service connection update
-  summary: Update a private link service endpoint connection.
-- uid: az_network_private_link_service_create
-  name: az network private-link-service create
-  summary: Create a private link service.
-- uid: az_network_private_link_service_list
-  name: az network private-link-service list
-  summary: List private link services.
+- az_network_private-link-service_connection
+- az_network_private-link-service_connection_update
+- az_network_private-link-service_create
+- az_network_private-link-service_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -128,10 +125,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private link services.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private link services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service/connection.yml
index 4ee8a31b02..08e7241ad5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service/connection.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/private-link-service/connection.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_private_link_service_connection
-  name: az network private-link-service connection
-  summary: Manage private link service endpoint connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_private_link_service_connection_update
-- uid: az_network_private_link_service_connection_update
+### YamlMime:AzureCLIGroup
+uid: az_network_private-link-service_connection
+name: az network private-link-service connection
+summary: Manage private link service endpoint connections.
+description: ''
+directCommands:
+- uid: az_network_private-link-service_connection_update
   name: az network private-link-service connection update
   summary: Update a private link service endpoint connection.
   description: To update the connection status, the name of the connection should be provided. Please obtain this name by running 'az network private-link-service show -g MyResourceGroup -n MyPLSName'. The connection name is under the 'privateEndpointConnections' filed.
-  langs:
-  - azurecli
+  syntax: >-
+    az network private-link-service connection update --connection-status {Approved, Rejected, Removed}
+                                                      --name
+                                                      --resource-group
+                                                      --service-name
+                                                      [--action-required]
+                                                      [--description]
+                                                      [--subscription]
   examples:
   - summary: Update the endpoint connections status of private link service
-    syntax:
-      content: az network private-link-service connection update -g MyResourceGroup -n MyEndpointName.f072a430-2d82-4470-ab30-d23fcfee58d1 --service-name MyPLSName --connection-status Rejected
-  parameters:
+    syntax: az network private-link-service connection update -g MyResourceGroup -n MyEndpointName.f072a430-2d82-4470-ab30-d23fcfee58d1 --service-name MyPLSName --connection-status Rejected
+  requiredParameters:
   - isRequired: true
     name: --connection-status
     parameterValueGroup: Approved, Rejected, Removed
@@ -30,12 +31,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --service-name
     summary: Name of the private link service.
     description: ''
+  optionalParameters:
   - name: --action-required
     summary: A message indicating if changes on the service provider require any updates on the consumer.
     description: ''
@@ -45,16 +47,9 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_private_link_service_connection_update
-  name: az network private-link-service connection update
-  summary: Update a private link service endpoint connection.
+- az_network_private-link-service_connection_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -70,10 +65,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage private link service endpoint connections.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage private link service endpoint connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/profile.yml b/2018-03-01-hybrid/docs-ref-autogen/network/profile.yml
index 7ea8b95010..d3e7ca6f14 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/profile.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/profile.yml
@@ -1,40 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_profile
-  name: az network profile
-  summary: Manage network profiles.
-  description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
-  langs:
-  - azurecli
-  children:
-  - az_network_profile_list
+### YamlMime:AzureCLIGroup
+uid: az_network_profile
+name: az network profile
+summary: Manage network profiles.
+description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
+directCommands:
 - uid: az_network_profile_list
   name: az network profile list
   summary: List network profiles.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network profile list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: List network profiles (autogenerated)
-    syntax:
-      content: az network profile list --resource-group MyResourceGroup
-  parameters:
+    syntax: az network profile list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_profile_list
-  name: az network profile list
-  summary: List network profiles.
+- az_network_profile_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -50,10 +43,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To create a network profile, see the create command for the relevant resource. Currently, only Azure Container Instances are supported.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/public-ip.yml b/2018-03-01-hybrid/docs-ref-autogen/network/public-ip.yml
index d60303fe2b..effa9f2e4d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/public-ip.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/public-ip.yml
@@ -1,42 +1,43 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_public_ip
-  name: az network public-ip
-  summary: Manage public IP addresses.
-  description: To learn more about public IP addresses visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address">https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_public_ip_create
-  - az_network_public_ip_delete
-  - az_network_public_ip_list
-  - az_network_public_ip_show
-  - az_network_public_ip_update
-- uid: az_network_public_ip_create
+### YamlMime:AzureCLIGroup
+uid: az_network_public-ip
+name: az network public-ip
+summary: Manage public IP addresses.
+description: To learn more about public IP addresses visit https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address.
+directCommands:
+- uid: az_network_public-ip_create
   name: az network public-ip create
   summary: Create a public IP address.
-  description: '[Coming breaking change] In the coming release, the default behavior will be changed as follows when sku is Standard and zone is not provided: For zonal regions, you will get a zone-redundant IP indicated by zones:["1","2","3"]; For non-zonal regions, you will get a non zone-redundant IP indicated by zones:[].'
-  langs:
-  - azurecli
+  description: ''
+  syntax: >-
+    az network public-ip create --name
+                                --resource-group
+                                [--allocation-method {Dynamic, Static}]
+                                [--dns-name]
+                                [--idle-timeout]
+                                [--location]
+                                [--reverse-fqdn]
+                                [--sku {Basic, Standard}]
+                                [--subscription]
+                                [--tags]
+                                [--version {IPv4, IPv6}]
+                                [--zone {1, 2, 3}]
   examples:
   - summary: Create a basic public IP resource.
-    syntax:
-      content: az network public-ip create -g MyResourceGroup -n MyIp
+    syntax: az network public-ip create -g MyResourceGroup -n MyIp
   - summary: Create a static public IP resource for a DNS name label.
-    syntax:
-      content: az network public-ip create -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
+    syntax: az network public-ip create -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
   - summary: Create a public IP resource in an availability zone in the current resource group region.
-    syntax:
-      content: az network public-ip create -g MyResourceGroup -n MyIp --zone 2
-  parameters:
+    syntax: az network public-ip create -g MyResourceGroup -n MyIp --zone 2
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the public IP address.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --allocation-method
     parameterValueGroup: Dynamic, Static
     summary: IP address allocation method.
@@ -49,14 +50,17 @@ items:
     summary: Idle timeout in minutes.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --reverse-fqdn
     summary: Reverse FQDN (fully qualified domain name).
     description: ''
   - name: --sku
     parameterValueGroup: Basic, Standard
-    summary: Public IP SKU.
+    summary: Name of a public IP address SKU.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -70,26 +74,20 @@ items:
     parameterValueGroup: 1, 2, 3
     summary: Availability zone into which to provision the resource.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_delete
   name: az network public-ip delete
   summary: Delete a public IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip delete [--ids]
+                                [--name]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Delete a public IP address.
-    syntax:
-      content: az network public-ip delete -g MyResourceGroup -n MyIp
-  parameters:
+    syntax: az network public-ip delete -g MyResourceGroup -n MyIp
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -97,60 +95,55 @@ items:
     summary: The name of the public IP address.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_list
   name: az network public-ip list
   summary: List public IP addresses.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip list [--query-examples]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: List all public IPs in a subscription.
-    syntax:
-      content: az network public-ip list
+    syntax: az network public-ip list
   - summary: List all public IPs in a resource group.
-    syntax:
-      content: az network public-ip list -g MyResourceGroup
+    syntax: az network public-ip list -g MyResourceGroup
   - summary: List all public IPs of a domain name label.
-    syntax:
-      content: az network public-ip list -g MyResourceGroup --query "[?dnsSettings.domainNameLabel=='MyLabel']"
-  parameters:
+    syntax: az network public-ip list -g MyResourceGroup --query "[?dnsSettings.domainNameLabel=='MyLabel']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_show
   name: az network public-ip show
   summary: Get the details of a public IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip show [--expand]
+                              [--ids]
+                              [--name]
+                              [--query-examples]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: Get information about a public IP resource.
-    syntax:
-      content: az network public-ip show -g MyResourceGroup -n MyIp
+    syntax: az network public-ip show -g MyResourceGroup -n MyIp
   - summary: Get the FQDN and IP address of a public IP resource.
-    syntax:
-      content: 'az network public-ip show -g MyResourceGroup -n MyIp --query "{fqdn: dnsSettings.fqdn, address: ipAddress}"'
-  parameters:
+    syntax: 'az network public-ip show -g MyResourceGroup -n MyIp --query "{fqdn: dnsSettings.fqdn, address: ipAddress}"'
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -160,29 +153,43 @@ items:
   - name: --name -n
     summary: The name of the public IP address.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_update
   name: az network public-ip update
   summary: Update a public IP address.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip update [--add]
+                                [--allocation-method {Dynamic, Static}]
+                                [--dns-name]
+                                [--force-string]
+                                [--idle-timeout]
+                                [--ids]
+                                [--name]
+                                [--remove]
+                                [--resource-group]
+                                [--reverse-fqdn]
+                                [--set]
+                                [--sku {Basic, Standard}]
+                                [--subscription]
+                                [--tags]
+                                [--version {IPv4, IPv6}]
   examples:
   - summary: Update a public IP resource with a DNS name label and static allocation.
-    syntax:
-      content: az network public-ip update -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
-  parameters:
+    syntax: az network public-ip update -g MyResourceGroup -n MyIp --dns-name MyLabel --allocation-method Static
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --allocation-method
     parameterValueGroup: Dynamic, Static
     summary: IP address allocation method.
@@ -190,16 +197,37 @@ items:
   - name: --dns-name
     summary: Globally unique DNS entry.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --idle-timeout
     summary: Idle timeout in minutes.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the public IP address.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --reverse-fqdn
     summary: Reverse FQDN (fully qualified domain name).
     description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
   - name: --sku
     parameterValueGroup: Basic, Standard
     summary: Public IP SKU.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
@@ -208,61 +236,16 @@ items:
     parameterValueGroup: IPv4, IPv6
     summary: IP address type.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the public IP address.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_public_ip_create
-  name: az network public-ip create
-  summary: Create a public IP address.
-- uid: az_network_public_ip_delete
-  name: az network public-ip delete
-  summary: Delete a public IP address.
-- uid: az_network_public_ip_list
-  name: az network public-ip list
-  summary: List public IP addresses.
-- uid: az_network_public_ip_prefix
-  name: az network public-ip prefix
-  summary: Manage public IP prefix resources.
-- uid: az_network_public_ip_prefix_create
-  name: az network public-ip prefix create
-  summary: Create a public IP prefix resource.
-- uid: az_network_public_ip_prefix_list
-  name: az network public-ip prefix list
-  summary: List public IP prefix resources.
-- uid: az_network_public_ip_show
-  name: az network public-ip show
-  summary: Get the details of a public IP address.
-- uid: az_network_public_ip_update
-  name: az network public-ip update
-  summary: Update a public IP address.
+- az_network_public-ip_create
+- az_network_public-ip_delete
+- az_network_public-ip_list
+- az_network_public-ip_prefix
+- az_network_public-ip_prefix_create
+- az_network_public-ip_prefix_list
+- az_network_public-ip_show
+- az_network_public-ip_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -278,10 +261,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about public IP addresses visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address">https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about public IP addresses visit https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/public-ip/prefix.yml b/2018-03-01-hybrid/docs-ref-autogen/network/public-ip/prefix.yml
index 962e4f0d6f..85c45a7564 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/public-ip/prefix.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/public-ip/prefix.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_public_ip_prefix
-  name: az network public-ip prefix
-  summary: Manage public IP prefix resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_public_ip_prefix_create
-  - az_network_public_ip_prefix_list
-- uid: az_network_public_ip_prefix_create
+### YamlMime:AzureCLIGroup
+uid: az_network_public-ip_prefix
+name: az network public-ip prefix
+summary: Manage public IP prefix resources.
+description: ''
+directCommands:
+- uid: az_network_public-ip_prefix_create
   name: az network public-ip prefix create
   summary: Create a public IP prefix resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network public-ip prefix create --length
+                                       --name
+                                       --resource-group
+                                       [--location]
+                                       [--subscription]
+                                       [--tags]
+                                       [--zone {1, 2, 3}]
   examples:
   - summary: Create a public IP prefix resource. (autogenerated)
-    syntax:
-      content: az network public-ip prefix create --length 28 --location westus2 --name MyPublicIPPrefix --resource-group MyResourceGroup
-  parameters:
+    syntax: az network public-ip prefix create --length 28 --location westus2 --name MyPublicIPPrefix --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --length
-    summary: Length of the prefix (i.e. `XX.XX.XX.XX/&lt;Length&gt;`).
+    summary: Length of the prefix (i.e. `XX.XX.XX.XX/<Length>`).
     description: ''
   - isRequired: true
     name: --name -n
@@ -30,10 +30,14 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -42,41 +46,29 @@ items:
     parameterValueGroup: 1, 2, 3
     summary: Availability zone into which to provision the resource.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_public_ip_prefix_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_public-ip_prefix_list
   name: az network public-ip prefix list
   summary: List public IP prefix resources.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network public-ip prefix list [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_public_ip_prefix_create
-  name: az network public-ip prefix create
-  summary: Create a public IP prefix resource.
-- uid: az_network_public_ip_prefix_list
-  name: az network public-ip prefix list
-  summary: List public IP prefix resources.
+- az_network_public-ip_prefix_create
+- az_network_public-ip_prefix_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -92,10 +84,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage public IP prefix resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage public IP prefix resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/route-filter.yml b/2018-03-01-hybrid/docs-ref-autogen/network/route-filter.yml
index 3ff7885195..7ddcdbed05 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/route-filter.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/route-filter.yml
@@ -1,159 +1,152 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_route_filter
-  name: az network route-filter
-  summary: Manage route filters.
-  description: To learn more about route filters with Microsoft peering with ExpressRoute, visit <a href="https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli">https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_route_filter_create
-  - az_network_route_filter_delete
-  - az_network_route_filter_list
-  - az_network_route_filter_show
-  - az_network_route_filter_update
-- uid: az_network_route_filter_create
+### YamlMime:AzureCLIGroup
+uid: az_network_route-filter
+name: az network route-filter
+summary: Manage route filters.
+description: To learn more about route filters with Microsoft peering with ExpressRoute, visit https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli.
+directCommands:
+- uid: az_network_route-filter_create
   name: az network route-filter create
   summary: Create a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter create --name
+                                   --resource-group
+                                   [--location]
+                                   [--subscription]
+                                   [--tags]
   examples:
   - summary: Create a route filter.
-    syntax:
-      content: az network route-filter create -g MyResourceGroup -n MyRouteFilter
+    syntax: az network route-filter create -g MyResourceGroup -n MyRouteFilter
   - summary: Create a route filter. (autogenerated)
-    syntax:
-      content: az network route-filter create --location westus2 --name MyRouteFilter --resource-group MyResourceGroup
-  parameters:
+    syntax: az network route-filter create --location westus2 --name MyRouteFilter --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the route filter.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_delete
   name: az network route-filter delete
   summary: Delete a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter delete --name
+                                   --resource-group
+                                   [--subscription]
   examples:
   - summary: Delete a route filter.
-    syntax:
-      content: az network route-filter delete -g MyResourceGroup -n MyRouteFilter
-  parameters:
+    syntax: az network route-filter delete -g MyResourceGroup -n MyRouteFilter
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the route filter.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_list
   name: az network route-filter list
   summary: List route filters.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter list [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List route filters in a resource group.
-    syntax:
-      content: az network route-filter list -g MyResourceGroup
-  parameters:
+    syntax: az network route-filter list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_show
   name: az network route-filter show
   summary: Get the details of a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter show --name
+                                 --resource-group
+                                 [--expand {peerings}]
+                                 [--query-examples]
+                                 [--subscription]
   examples:
   - summary: Get the details of a route filter.
-    syntax:
-      content: az network route-filter show -g MyResourceGroup -n MyRouteFilter
+    syntax: az network route-filter show -g MyResourceGroup -n MyRouteFilter
   - summary: Get the details of a route filter. (autogenerated)
-    syntax:
-      content: az network route-filter show --expand peerings --name MyRouteFilter --resource-group MyResourceGroup
-  parameters:
+    syntax: az network route-filter show --expand peerings --name MyRouteFilter --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the route filter.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --expand
     parameterValueGroup: peerings
     summary: Expands referenced express route bgp peering resources.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_update
   name: az network route-filter update
   summary: Update a route filter.
   description: This command can only be used to update the tags for a route filter. Name and resource group are immutable and cannot be updated.
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter update --name
+                                   --resource-group
+                                   [--add]
+                                   [--force-string]
+                                   [--remove]
+                                   [--set]
+                                   [--subscription]
   examples:
   - summary: Update the tags on a route filter.
-    syntax:
-      content: az network route-filter update -g MyResourceGroup -n MyRouteFilter --set tags.CostCenter=MyBusinessGroup
-  parameters:
+    syntax: az network route-filter update -g MyResourceGroup -n MyRouteFilter --set tags.CostCenter=MyBusinessGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the route filter.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
@@ -169,49 +162,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_route_filter_create
-  name: az network route-filter create
-  summary: Create a route filter.
-- uid: az_network_route_filter_delete
-  name: az network route-filter delete
-  summary: Delete a route filter.
-- uid: az_network_route_filter_list
-  name: az network route-filter list
-  summary: List route filters.
-- uid: az_network_route_filter_rule
-  name: az network route-filter rule
-  summary: Manage rules in a route filter.
-- uid: az_network_route_filter_rule_create
-  name: az network route-filter rule create
-  summary: Create a rule in a route filter.
-- uid: az_network_route_filter_rule_delete
-  name: az network route-filter rule delete
-  summary: Delete a rule from a route filter.
-- uid: az_network_route_filter_rule_list
-  name: az network route-filter rule list
-  summary: List rules in a route filter.
-- uid: az_network_route_filter_rule_list_service_communities
-  name: az network route-filter rule list-service-communities
-  summary: Gets all the available BGP service communities.
-- uid: az_network_route_filter_rule_show
-  name: az network route-filter rule show
-  summary: Get the details of a rule in a route filter.
-- uid: az_network_route_filter_rule_update
-  name: az network route-filter rule update
-  summary: Update a rule in a route filter.
-- uid: az_network_route_filter_show
-  name: az network route-filter show
-  summary: Get the details of a route filter.
-- uid: az_network_route_filter_update
-  name: az network route-filter update
-  summary: Update a route filter.
+- az_network_route-filter_create
+- az_network_route-filter_delete
+- az_network_route-filter_list
+- az_network_route-filter_rule
+- az_network_route-filter_rule_create
+- az_network_route-filter_rule_delete
+- az_network_route-filter_rule_list
+- az_network_route-filter_rule_list-service-communities
+- az_network_route-filter_rule_show
+- az_network_route-filter_rule_update
+- az_network_route-filter_show
+- az_network_route-filter_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,10 +191,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about route filters with Microsoft peering with ExpressRoute, visit <a href="https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli">https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about route filters with Microsoft peering with ExpressRoute, visit https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/route-filter/rule.yml b/2018-03-01-hybrid/docs-ref-autogen/network/route-filter/rule.yml
index ff71da1064..d9f8cb429b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/route-filter/rule.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/route-filter/rule.yml
@@ -1,31 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_route_filter_rule
-  name: az network route-filter rule
-  summary: Manage rules in a route filter.
-  description: To learn more about route filters with Microsoft peering with ExpressRoute, visit <a href="https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli">https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_route_filter_rule_create
-  - az_network_route_filter_rule_delete
-  - az_network_route_filter_rule_list
-  - az_network_route_filter_rule_list_service_communities
-  - az_network_route_filter_rule_show
-  - az_network_route_filter_rule_update
-- uid: az_network_route_filter_rule_create
+### YamlMime:AzureCLIGroup
+uid: az_network_route-filter_rule
+name: az network route-filter rule
+summary: Manage rules in a route filter.
+description: To learn more about route filters with Microsoft peering with ExpressRoute, visit https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli.
+directCommands:
+- uid: az_network_route-filter_rule_create
   name: az network route-filter rule create
   summary: Create a rule in a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter rule create --access {Allow, Deny}
+                                        --communities
+                                        --filter-name
+                                        --name
+                                        --resource-group
+                                        [--location]
+                                        [--subscription]
   examples:
   - summary: Create a rule in a route filter to allow Dynamics 365.
-    syntax:
-      content: >-
-        az network route-filter rule create -g MyResourceGroup --filter-name MyRouteFilter \
-            -n MyRouteFilterRule --communities 12076:5040 --access Allow
-  parameters:
+    syntax: >-
+      az network route-filter rule create -g MyResourceGroup --filter-name MyRouteFilter \
+          -n MyRouteFilterRule --communities 12076:5040 --access Allow
+  requiredParameters:
   - isRequired: true
     name: --access
     parameterValueGroup: Allow, Deny
@@ -46,31 +42,30 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_rule_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_rule_delete
   name: az network route-filter rule delete
   summary: Delete a rule from a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter rule delete [--filter-name]
+                                        [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Delete a rule from a route filter.
-    syntax:
-      content: az network route-filter rule delete -g MyResourceGroup --filter-name MyRouteFilter -n MyRouteFilterRule
-  parameters:
+    syntax: az network route-filter rule delete -g MyResourceGroup --filter-name MyRouteFilter -n MyRouteFilterRule
+  optionalParameters:
   - name: --filter-name
     summary: Name of the route filter.
     description: ''
@@ -81,81 +76,73 @@ items:
     summary: Name of the route filter rule.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_rule_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_rule_list
   name: az network route-filter rule list
   summary: List rules in a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter rule list --filter-name
+                                      --resource-group
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List rules in a route filter.
-    syntax:
-      content: az network route-filter rule list -g MyResourceGroup --filter-name MyRouteFilter
-  parameters:
+    syntax: az network route-filter rule list -g MyResourceGroup --filter-name MyRouteFilter
+  requiredParameters:
   - isRequired: true
     name: --filter-name
     summary: Name of the route filter.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_rule_list_service_communities
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_rule_list-service-communities
   name: az network route-filter rule list-service-communities
   summary: Gets all the available BGP service communities.
   description: ''
-  langs:
-  - azurecli
+  syntax: az network route-filter rule list-service-communities [--subscription]
   examples:
   - summary: Gets all the available BGP service communities.
-    syntax:
-      content: az network route-filter rule list-service-communities -o table
+    syntax: az network route-filter rule list-service-communities -o table
   - summary: Get the community value for Exchange.
-    syntax:
-      content: >-
-        az network route-filter rule list-service-communities \
-            --query '[].bgpCommunities[?communityName==`Exchange`].[communityValue][][]' -o tsv
-  parameters:
+    syntax: >-
+      az network route-filter rule list-service-communities \
+          --query '[].bgpCommunities[?communityName==`Exchange`].[communityValue][][]' -o tsv
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_rule_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_rule_show
   name: az network route-filter rule show
   summary: Get the details of a rule in a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter rule show [--filter-name]
+                                      [--ids]
+                                      [--name]
+                                      [--query-examples]
+                                      [--resource-group]
+                                      [--subscription]
   examples:
   - summary: Get the details of a rule in a route filter.
-    syntax:
-      content: az network route-filter rule show -g MyResourceGroup --filter-name MyRouteFilter -n MyRouteFilterRule
-  parameters:
+    syntax: az network route-filter rule show -g MyResourceGroup --filter-name MyRouteFilter -n MyRouteFilterRule
+  optionalParameters:
   - name: --filter-name
     summary: Name of the route filter.
     description: ''
@@ -165,83 +152,71 @@ items:
   - name: --name -n
     summary: Name of the route filter rule.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_filter_rule_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-filter_rule_update
   name: az network route-filter rule update
   summary: Update a rule in a route filter.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-filter rule update [--add]
+                                        [--filter-name]
+                                        [--force-string]
+                                        [--ids]
+                                        [--name]
+                                        [--remove]
+                                        [--resource-group]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update a rule in a route filter to add Exchange to rule list.
-    syntax:
-      content: >-
-        az network route-filter rule update -g MyResourceGroup --filter-name MyRouteFilter \
-            -n MyRouteFilterRule --add communities='12076:5010'
-  parameters:
+    syntax: >-
+      az network route-filter rule update -g MyResourceGroup --filter-name MyRouteFilter \
+          -n MyRouteFilterRule --add communities='12076:5010'
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --filter-name
     summary: Name of the route filter.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the route filter rule.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_route_filter_rule_create
-  name: az network route-filter rule create
-  summary: Create a rule in a route filter.
-- uid: az_network_route_filter_rule_delete
-  name: az network route-filter rule delete
-  summary: Delete a rule from a route filter.
-- uid: az_network_route_filter_rule_list
-  name: az network route-filter rule list
-  summary: List rules in a route filter.
-- uid: az_network_route_filter_rule_list_service_communities
-  name: az network route-filter rule list-service-communities
-  summary: Gets all the available BGP service communities.
-- uid: az_network_route_filter_rule_show
-  name: az network route-filter rule show
-  summary: Get the details of a rule in a route filter.
-- uid: az_network_route_filter_rule_update
-  name: az network route-filter rule update
-  summary: Update a rule in a route filter.
+- az_network_route-filter_rule_create
+- az_network_route-filter_rule_delete
+- az_network_route-filter_rule_list
+- az_network_route-filter_rule_list-service-communities
+- az_network_route-filter_rule_show
+- az_network_route-filter_rule_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -257,10 +232,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about route filters with Microsoft peering with ExpressRoute, visit <a href="https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli">https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about route filters with Microsoft peering with ExpressRoute, visit https://docs.microsoft.com/azure/expressroute/how-to-routefilter-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/route-table.yml b/2018-03-01-hybrid/docs-ref-autogen/network/route-table.yml
index 8dec16ff81..975759d069 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/route-table.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/route-table.yml
@@ -1,66 +1,60 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_route_table
-  name: az network route-table
-  summary: Manage route tables.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_route_table_create
-  - az_network_route_table_delete
-  - az_network_route_table_list
-  - az_network_route_table_show
-  - az_network_route_table_update
-- uid: az_network_route_table_create
+### YamlMime:AzureCLIGroup
+uid: az_network_route-table
+name: az network route-table
+summary: Manage route tables.
+description: ''
+directCommands:
+- uid: az_network_route-table_create
   name: az network route-table create
   summary: Create a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table create --name
+                                  --resource-group
+                                  [--disable-bgp-route-propagation {false, true}]
+                                  [--location]
+                                  [--subscription]
+                                  [--tags]
   examples:
   - summary: Create a route table.
-    syntax:
-      content: az network route-table create -g MyResourceGroup -n MyRouteTable
-  parameters:
+    syntax: az network route-table create -g MyResourceGroup -n MyRouteTable
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the route table.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --disable-bgp-route-propagation
     parameterValueGroup: false, true
     summary: Disable routes learned by BGP.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_delete
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_delete
   name: az network route-table delete
   summary: Delete a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table delete [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Delete a route table.
-    syntax:
-      content: az network route-table delete -g MyResourceGroup -n MyRouteTable
-  parameters:
+    syntax: az network route-table delete -g MyResourceGroup -n MyRouteTable
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -68,51 +62,49 @@ items:
     summary: Name of the route table.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_list
   name: az network route-table list
   summary: List route tables.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table list [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: List all route tables in a subscription.
-    syntax:
-      content: az network route-table list -g MyResourceGroup
-  parameters:
+    syntax: az network route-table list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_show
   name: az network route-table show
   summary: Get the details of a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table show [--expand]
+                                [--ids]
+                                [--name]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Get the details of a route table.
-    syntax:
-      content: az network route-table show -g MyResourceGroup -n MyRouteTable
-  parameters:
+    syntax: az network route-table show -g MyResourceGroup -n MyRouteTable
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -122,35 +114,44 @@ items:
   - name: --name -n
     summary: Name of the route table.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_update
   name: az network route-table update
   summary: Update a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table update [--add]
+                                  [--disable-bgp-route-propagation {false, true}]
+                                  [--force-string]
+                                  [--ids]
+                                  [--name]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--subscription]
+                                  [--tags]
   examples:
   - summary: Update a route table to disable BGP route propogation.
-    syntax:
-      content: az network route-table update -g MyResourceGroup -n MyRouteTable --disable-bgp-route-propagation true
-  parameters:
+    syntax: az network route-table update -g MyResourceGroup -n MyRouteTable --disable-bgp-route-propagation true
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --disable-bgp-route-propagation
     parameterValueGroup: false, true
     summary: Disable routes learned by BGP.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -158,64 +159,34 @@ items:
   - name: --name -n
     summary: Name of the route table.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_route_table_create
-  name: az network route-table create
-  summary: Create a route table.
-- uid: az_network_route_table_delete
-  name: az network route-table delete
-  summary: Delete a route table.
-- uid: az_network_route_table_list
-  name: az network route-table list
-  summary: List route tables.
-- uid: az_network_route_table_route
-  name: az network route-table route
-  summary: Manage routes in a route table.
-- uid: az_network_route_table_route_create
-  name: az network route-table route create
-  summary: Create a route in a route table.
-- uid: az_network_route_table_route_delete
-  name: az network route-table route delete
-  summary: Delete a route from a route table.
-- uid: az_network_route_table_route_list
-  name: az network route-table route list
-  summary: List routes in a route table.
-- uid: az_network_route_table_route_show
-  name: az network route-table route show
-  summary: Get the details of a route in a route table.
-- uid: az_network_route_table_route_update
-  name: az network route-table route update
-  summary: Update a route in a route table.
-- uid: az_network_route_table_show
-  name: az network route-table show
-  summary: Get the details of a route table.
-- uid: az_network_route_table_update
-  name: az network route-table update
-  summary: Update a route table.
+- az_network_route-table_create
+- az_network_route-table_delete
+- az_network_route-table_list
+- az_network_route-table_route
+- az_network_route-table_route_create
+- az_network_route-table_route_delete
+- az_network_route-table_route_list
+- az_network_route-table_route_show
+- az_network_route-table_route_update
+- az_network_route-table_show
+- az_network_route-table_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -231,10 +202,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage route tables.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage route tables.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/route-table/route.yml b/2018-03-01-hybrid/docs-ref-autogen/network/route-table/route.yml
index 83bcbedfd9..0ffc865778 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/route-table/route.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/route-table/route.yml
@@ -1,30 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_route_table_route
-  name: az network route-table route
-  summary: Manage routes in a route table.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_route_table_route_create
-  - az_network_route_table_route_delete
-  - az_network_route_table_route_list
-  - az_network_route_table_route_show
-  - az_network_route_table_route_update
-- uid: az_network_route_table_route_create
+### YamlMime:AzureCLIGroup
+uid: az_network_route-table_route
+name: az network route-table route
+summary: Manage routes in a route table.
+description: ''
+directCommands:
+- uid: az_network_route-table_route_create
   name: az network route-table route create
   summary: Create a route in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route create --address-prefix
+                                        --name
+                                        --next-hop-type {Internet, None, VirtualAppliance, VirtualNetworkGateway, VnetLocal}
+                                        --resource-group
+                                        --route-table-name
+                                        [--next-hop-ip-address]
+                                        [--subscription]
   examples:
   - summary: Create a route that forces all inbound traffic to a Network Virtual Appliance.
-    syntax:
-      content: >-
-        az network route-table route create -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute \
-            --next-hop-type VirtualAppliance --address-prefix 10.0.0.0/16 --next-hop-ip-address 10.0.100.4
-  parameters:
+    syntax: >-
+      az network route-table route create -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute \
+          --next-hop-type VirtualAppliance --address-prefix 10.0.0.0/16 --next-hop-ip-address 10.0.100.4
+  requiredParameters:
   - isRequired: true
     name: --address-prefix
     summary: The destination CIDR to which the route applies.
@@ -40,35 +37,34 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --route-table-name
     summary: Route table name.
     description: ''
+  optionalParameters:
   - name: --next-hop-ip-address
     summary: The IP address packets should be forwarded to when using the VirtualAppliance hop type.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_delete
   name: az network route-table route delete
   summary: Delete a route from a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route delete [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--route-table-name]
+                                        [--subscription]
   examples:
   - summary: Delete a route from a route table.
-    syntax:
-      content: az network route-table route delete -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute
-  parameters:
+    syntax: az network route-table route delete -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -76,7 +72,7 @@ items:
     summary: Route name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --route-table-name
     summary: Route table name.
@@ -84,59 +80,62 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_list
   name: az network route-table route list
   summary: List routes in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route list --resource-group
+                                      --route-table-name
+                                      [--query-examples]
+                                      [--subscription]
   examples:
   - summary: List routes in a route table.
-    syntax:
-      content: az network route-table route list -g MyResourceGroup --route-table-name MyRouteTable
-  parameters:
+    syntax: az network route-table route list -g MyResourceGroup --route-table-name MyRouteTable
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --route-table-name
     summary: Route table name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_show
   name: az network route-table route show
   summary: Get the details of a route in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route show [--ids]
+                                      [--name]
+                                      [--query-examples]
+                                      [--resource-group]
+                                      [--route-table-name]
+                                      [--subscription]
   examples:
   - summary: Get the details of a route in a route table.
-    syntax:
-      content: az network route-table route show -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute -o table
-  parameters:
+    syntax: az network route-table route show -g MyResourceGroup --route-table-name MyRouteTable -n MyRoute -o table
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Route name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --route-table-name
     summary: Route table name.
@@ -144,29 +143,45 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_route_table_route_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_route-table_route_update
   name: az network route-table route update
   summary: Update a route in a route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network route-table route update [--add]
+                                        [--address-prefix]
+                                        [--force-string]
+                                        [--ids]
+                                        [--name]
+                                        [--next-hop-ip-address]
+                                        [--next-hop-type {Internet, None, VirtualAppliance, VirtualNetworkGateway, VnetLocal}]
+                                        [--remove]
+                                        [--resource-group]
+                                        [--route-table-name]
+                                        [--set]
+                                        [--subscription]
   examples:
   - summary: Update a route in a route table to change the next hop ip address.
-    syntax:
-      content: az network route-table route update -g MyResourceGroup --route-table-name MyRouteTable \ -n MyRoute --next-hop-ip-address 10.0.100.5
+    syntax: az network route-table route update -g MyResourceGroup --route-table-name MyRouteTable \ -n MyRoute --next-hop-ip-address 10.0.100.5
   - summary: Update a route in a route table. (autogenerated)
-    syntax:
-      content: az network route-table route update --address-prefix 10.0.0.0/16 --name MyRoute --next-hop-ip-address 10.0.100.5 --next-hop-type VirtualNetworkGateway --route-table-name MyRouteTable
-  parameters:
+    syntax: az network route-table route update --address-prefix 10.0.0.0/16 --name MyRoute --next-hop-ip-address 10.0.100.5 --next-hop-type VirtualNetworkGateway --resource-group MyResourceGroup --route-table-name MyRouteTable
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-prefix
     summary: The destination CIDR to which the route applies.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Route name.
+    description: ''
   - name: --next-hop-ip-address
     summary: The IP address packets should be forwarded to when using the VirtualAppliance hop type.
     description: ''
@@ -174,55 +189,28 @@ items:
     parameterValueGroup: Internet, None, VirtualAppliance, VirtualNetworkGateway, VnetLocal
     summary: The type of Azure hop the packet should be sent to.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Route name.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --route-table-name
     summary: Route table name.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_route_table_route_create
-  name: az network route-table route create
-  summary: Create a route in a route table.
-- uid: az_network_route_table_route_delete
-  name: az network route-table route delete
-  summary: Delete a route from a route table.
-- uid: az_network_route_table_route_list
-  name: az network route-table route list
-  summary: List routes in a route table.
-- uid: az_network_route_table_route_show
-  name: az network route-table route show
-  summary: Get the details of a route in a route table.
-- uid: az_network_route_table_route_update
-  name: az network route-table route update
-  summary: Update a route in a route table.
+- az_network_route-table_route_create
+- az_network_route-table_route_delete
+- az_network_route-table_route_list
+- az_network_route-table_route_show
+- az_network_route-table_route_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -238,10 +226,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage routes in a route table.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage routes in a route table.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/security-partner-provider.yml b/2018-03-01-hybrid/docs-ref-autogen/network/security-partner-provider.yml
index 6bcfb74a9e..c6502c096a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/security-partner-provider.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/security-partner-provider.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_security_partner_provider
-  name: az network security-partner-provider
-  summary: Manage Azure security partner provider.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_security_partner_provider_create
-  - az_network_security_partner_provider_list
-- uid: az_network_security_partner_provider_create
+### YamlMime:AzureCLIGroup
+uid: az_network_security-partner-provider
+name: az network security-partner-provider
+summary: Manage Azure security partner provider.
+description: ''
+directCommands:
+- uid: az_network_security-partner-provider_create
   name: az network security-partner-provider create
   summary: Create a Azure security partner provider.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network security-partner-provider create --name
+                                                --provider
+                                                --resource-group
+                                                --vhub
+                                                [--location]
+                                                [--subscription]
+                                                [--tags]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the Security Partner Provider.
@@ -26,53 +27,45 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vhub
     summary: Name or ID of the virtual hub to which the Security Partner Provider belongs.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_security_partner_provider_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_security-partner-provider_list
   name: az network security-partner-provider list
   summary: List all Azure security partner provider.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network security-partner-provider list [--query-examples]
+                                              [--resource-group]
+                                              [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_security_partner_provider_create
-  name: az network security-partner-provider create
-  summary: Create a Azure security partner provider.
-- uid: az_network_security_partner_provider_list
-  name: az network security-partner-provider list
-  summary: List all Azure security partner provider.
+- az_network_security-partner-provider_create
+- az_network_security-partner-provider_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -88,10 +81,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure security partner provider.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure security partner provider.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint.yml
index 332f88b90a..22699374d0 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint.yml
@@ -1,52 +1,37 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_service_endpoint
-  name: az network service-endpoint
-  summary: Manage policies related to service endpoints.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_service_endpoint_list
-- uid: az_network_service_endpoint_list
+### YamlMime:AzureCLIGroup
+uid: az_network_service-endpoint
+name: az network service-endpoint
+summary: Manage policies related to service endpoints.
+description: ''
+directCommands:
+- uid: az_network_service-endpoint_list
   name: az network service-endpoint list
   summary: List what values of endpoint services are available for use.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network service-endpoint list --location
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_service_endpoint_list
-  name: az network service-endpoint list
-  summary: List what values of endpoint services are available for use.
-- uid: az_network_service_endpoint_policy
-  name: az network service-endpoint policy
-  summary: Manage service endpoint policies.
-- uid: az_network_service_endpoint_policy_create
-  name: az network service-endpoint policy create
-  summary: Create a service endpoint policy.
-- uid: az_network_service_endpoint_policy_list
-  name: az network service-endpoint policy list
-  summary: List service endpoint policies.
-- uid: az_network_service_endpoint_policy_definition
-  name: az network service-endpoint policy-definition
-  summary: Manage service endpoint policy definitions.
-- uid: az_network_service_endpoint_policy_definition_create
-  name: az network service-endpoint policy-definition create
-  summary: Create a service endpoint policy definition.
+- az_network_service-endpoint_list
+- az_network_service-endpoint_policy
+- az_network_service-endpoint_policy_create
+- az_network_service-endpoint_policy_list
+- az_network_service-endpoint_policy-definition
+- az_network_service-endpoint_policy-definition_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -62,10 +47,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage policies related to service endpoints.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage policies related to service endpoints.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy-definition.yml b/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy-definition.yml
index 23ed7e6b51..59eff69437 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy-definition.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy-definition.yml
@@ -1,20 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_service_endpoint_policy_definition
-  name: az network service-endpoint policy-definition
-  summary: Manage service endpoint policy definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_service_endpoint_policy_definition_create
-- uid: az_network_service_endpoint_policy_definition_create
+### YamlMime:AzureCLIGroup
+uid: az_network_service-endpoint_policy-definition
+name: az network service-endpoint policy-definition
+summary: Manage service endpoint policy definitions.
+description: ''
+directCommands:
+- uid: az_network_service-endpoint_policy-definition_create
   name: az network service-endpoint policy-definition create
   summary: Create a service endpoint policy definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network service-endpoint policy-definition create --name
+                                                         --policy-name
+                                                         --resource-group
+                                                         --service
+                                                         --service-resources
+                                                         [--description]
+                                                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the service endpoint policy definition.
@@ -25,7 +27,7 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --service
@@ -36,22 +38,16 @@ items:
     name: --service-resources
     summary: Space-separated list of service resources the definition applies to.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the policy definition.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_service_endpoint_policy_definition_create
-  name: az network service-endpoint policy-definition create
-  summary: Create a service endpoint policy definition.
+- az_network_service-endpoint_policy-definition_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -67,10 +63,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage service endpoint policy definitions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage service endpoint policy definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy.yml
index c961275bf5..50680bb0a5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/service-endpoint/policy.yml
@@ -1,78 +1,67 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_service_endpoint_policy
-  name: az network service-endpoint policy
-  summary: Manage service endpoint policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_service_endpoint_policy_create
-  - az_network_service_endpoint_policy_list
-- uid: az_network_service_endpoint_policy_create
+### YamlMime:AzureCLIGroup
+uid: az_network_service-endpoint_policy
+name: az network service-endpoint policy
+summary: Manage service endpoint policies.
+description: ''
+directCommands:
+- uid: az_network_service-endpoint_policy_create
   name: az network service-endpoint policy create
   summary: Create a service endpoint policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network service-endpoint policy create --name
+                                              --resource-group
+                                              [--location]
+                                              [--subscription]
+                                              [--tags]
   examples:
   - summary: Create a service endpoint policy. (autogenerated)
-    syntax:
-      content: az network service-endpoint policy create --name MyServiceEndpointPolicy --resource-group MyResourceGroup
-  parameters:
+    syntax: az network service-endpoint policy create --name MyServiceEndpointPolicy --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the service endpoint policy.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_service_endpoint_policy_list
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_service-endpoint_policy_list
   name: az network service-endpoint policy list
   summary: List service endpoint policies.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network service-endpoint policy list [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: List service endpoint policies. (autogenerated)
-    syntax:
-      content: az network service-endpoint policy list --resource-group MyResourceGroup
-  parameters:
+    syntax: az network service-endpoint policy list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_service_endpoint_policy_create
-  name: az network service-endpoint policy create
-  summary: Create a service endpoint policy.
-- uid: az_network_service_endpoint_policy_list
-  name: az network service-endpoint policy list
-  summary: List service endpoint policies.
+- az_network_service-endpoint_policy_create
+- az_network_service-endpoint_policy_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -88,10 +77,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage service endpoint policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage service endpoint policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager.yml b/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager.yml
index b67ecf5d31..2a199efab6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager.yml
@@ -1,55 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_traffic_manager
-  name: az network traffic-manager
-  summary: Manage the routing of incoming traffic.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_network_traffic-manager
+name: az network traffic-manager
+summary: Manage the routing of incoming traffic.
+description: ''
 commands:
-- uid: az_network_traffic_manager_endpoint
-  name: az network traffic-manager endpoint
-  summary: Manage Azure Traffic Manager end points.
-- uid: az_network_traffic_manager_endpoint_create
-  name: az network traffic-manager endpoint create
-  summary: Create a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_delete
-  name: az network traffic-manager endpoint delete
-  summary: Delete a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_list
-  name: az network traffic-manager endpoint list
-  summary: List traffic manager endpoints.
-- uid: az_network_traffic_manager_endpoint_show
-  name: az network traffic-manager endpoint show
-  summary: Get the details of a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  name: az network traffic-manager endpoint show-geographic-hierarchy
-  summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-- uid: az_network_traffic_manager_endpoint_update
-  name: az network traffic-manager endpoint update
-  summary: Update a traffic manager endpoint.
-- uid: az_network_traffic_manager_profile
-  name: az network traffic-manager profile
-  summary: Manage Azure Traffic Manager profiles.
-- uid: az_network_traffic_manager_profile_check_dns
-  name: az network traffic-manager profile check-dns
-  summary: Check the availability of a relative DNS name.
-- uid: az_network_traffic_manager_profile_create
-  name: az network traffic-manager profile create
-  summary: Create a traffic manager profile.
-- uid: az_network_traffic_manager_profile_delete
-  name: az network traffic-manager profile delete
-  summary: Delete a traffic manager profile.
-- uid: az_network_traffic_manager_profile_list
-  name: az network traffic-manager profile list
-  summary: List traffic manager profiles.
-- uid: az_network_traffic_manager_profile_show
-  name: az network traffic-manager profile show
-  summary: Get the details of a traffic manager profile.
-- uid: az_network_traffic_manager_profile_update
-  name: az network traffic-manager profile update
-  summary: Update a traffic manager profile.
+- az_network_traffic-manager_endpoint
+- az_network_traffic-manager_endpoint_create
+- az_network_traffic-manager_endpoint_delete
+- az_network_traffic-manager_endpoint_list
+- az_network_traffic-manager_endpoint_show
+- az_network_traffic-manager_endpoint_show-geographic-hierarchy
+- az_network_traffic-manager_endpoint_update
+- az_network_traffic-manager_profile
+- az_network_traffic-manager_profile_check-dns
+- az_network_traffic-manager_profile_create
+- az_network_traffic-manager_profile_delete
+- az_network_traffic-manager_profile_list
+- az_network_traffic-manager_profile_show
+- az_network_traffic-manager_profile_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -65,10 +33,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the routing of incoming traffic.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the routing of incoming traffic.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/endpoint.yml
index 2b31a0a71e..cebc113b51 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/endpoint.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/endpoint.yml
@@ -1,31 +1,36 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_traffic_manager_endpoint
-  name: az network traffic-manager endpoint
-  summary: Manage Azure Traffic Manager end points.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_traffic_manager_endpoint_create
-  - az_network_traffic_manager_endpoint_delete
-  - az_network_traffic_manager_endpoint_list
-  - az_network_traffic_manager_endpoint_show
-  - az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  - az_network_traffic_manager_endpoint_update
-- uid: az_network_traffic_manager_endpoint_create
+### YamlMime:AzureCLIGroup
+uid: az_network_traffic-manager_endpoint
+name: az network traffic-manager endpoint
+summary: Manage Azure Traffic Manager end points.
+description: ''
+directCommands:
+- uid: az_network_traffic-manager_endpoint_create
   name: az network traffic-manager endpoint create
   summary: Create a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint create --name
+                                               --profile-name
+                                               --resource-group
+                                               --type {azureEndpoints, externalEndpoints, nestedEndpoints}
+                                               [--custom-headers]
+                                               [--endpoint-location]
+                                               [--endpoint-monitor-status]
+                                               [--endpoint-status {Disabled, Enabled}]
+                                               [--geo-mapping]
+                                               [--min-child-endpoints]
+                                               [--priority]
+                                               [--subnets]
+                                               [--subscription]
+                                               [--target]
+                                               [--target-resource-id]
+                                               [--weight]
   examples:
   - summary: Create an endpoint for a performance profile to point to an Azure Web App endpoint.
-    syntax:
-      content: >-
-        az network traffic-manager endpoint create -g MyResourceGroup --profile-name MyTmProfile \
-            -n MyEndpoint --type azureEndpoints --target-resource-id $MyWebApp1Id --endpoint-status enabled
-  parameters:
+    syntax: >-
+      az network traffic-manager endpoint create -g MyResourceGroup --profile-name MyTmProfile \
+          -n MyEndpoint --type azureEndpoints --target-resource-id $MyWebApp1Id --endpoint-status enabled
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Endpoint name.
@@ -36,13 +41,14 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --type -t
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
+  optionalParameters:
   - name: --custom-headers
     summary: Space-separated list of custom headers in KEY=VALUE format.
     description: ''
@@ -69,6 +75,9 @@ items:
   - name: --subnets
     summary: Space-separated list of subnet CIDR prefixes (10.0.0.0/24) or subnet ranges (10.0.0.0-11.0.0.0).
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target
     summary: Fully-qualified DNS name of the endpoint.
     description: ''
@@ -78,29 +87,24 @@ items:
   - name: --weight
     summary: Weight of the endpoint when using the 'Weighted' traffic routing method. Values range from 1 to 1000.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_delete
   name: az network traffic-manager endpoint delete
   summary: Delete a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint delete [--ids]
+                                               [--name]
+                                               [--profile-name]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
   examples:
   - summary: Delete a traffic manager endpoint.
-    syntax:
-      content: az network traffic-manager endpoint delete -g MyResourceGroup \ --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
+    syntax: az network traffic-manager endpoint delete -g MyResourceGroup \ --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
   - summary: Delete a traffic manager endpoint. (autogenerated)
-    syntax:
-      content: az network traffic-manager endpoint delete --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription --type azureEndpoints
-  parameters:
+    syntax: az network traffic-manager endpoint delete --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription --type azureEndpoints
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -111,7 +115,7 @@ items:
     summary: Name of parent profile.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -120,57 +124,59 @@ items:
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_list
   name: az network traffic-manager endpoint list
   summary: List traffic manager endpoints.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint list --profile-name
+                                             --resource-group
+                                             [--query-examples]
+                                             [--subscription]
+                                             [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
   examples:
   - summary: List traffic manager endpoints.
-    syntax:
-      content: az network traffic-manager endpoint list -g MyResourceGroup --profile-name MyTmProfile
-  parameters:
+    syntax: az network traffic-manager endpoint list -g MyResourceGroup --profile-name MyTmProfile
+  requiredParameters:
   - isRequired: true
     name: --profile-name
     summary: Name of parent profile.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --type -t
-    parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
-    summary: Endpoint type.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_show
+  - name: --type -t
+    parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
+    summary: Endpoint type.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_show
   name: az network traffic-manager endpoint show
   summary: Get the details of a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint show [--ids]
+                                             [--name]
+                                             [--profile-name]
+                                             [--query-examples]
+                                             [--resource-group]
+                                             [--subscription]
+                                             [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
   examples:
   - summary: Get the details of a traffic manager endpoint.
-    syntax:
-      content: >-
-        az network traffic-manager endpoint show -g MyResourceGroup \
-            --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
-  parameters:
+    syntax: >-
+      az network traffic-manager endpoint show -g MyResourceGroup \
+          --profile-name MyTmProfile -n MyEndpoint --type azureEndpoints
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -180,8 +186,11 @@ items:
   - name: --profile-name
     summary: Name of parent profile.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -190,49 +199,57 @@ items:
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_show-geographic-hierarchy
   name: az network traffic-manager endpoint show-geographic-hierarchy
   summary: Get the default geographic hierarchy used by the geographic traffic routing method.
   description: ''
-  langs:
-  - azurecli
+  syntax: az network traffic-manager endpoint show-geographic-hierarchy [--subscription]
   examples:
   - summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-    syntax:
-      content: az network traffic-manager endpoint show-geographic-hierarchy
-  parameters:
+    syntax: az network traffic-manager endpoint show-geographic-hierarchy
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_endpoint_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_endpoint_update
   name: az network traffic-manager endpoint update
   summary: Update a traffic manager endpoint.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager endpoint update [--add]
+                                               [--custom-headers]
+                                               [--endpoint-location]
+                                               [--endpoint-monitor-status]
+                                               [--endpoint-status {Disabled, Enabled}]
+                                               [--force-string]
+                                               [--geo-mapping]
+                                               [--ids]
+                                               [--min-child-endpoints]
+                                               [--name]
+                                               [--priority]
+                                               [--profile-name]
+                                               [--remove]
+                                               [--resource-group]
+                                               [--set]
+                                               [--subnets]
+                                               [--subscription]
+                                               [--target]
+                                               [--target-resource-id]
+                                               [--type {azureEndpoints, externalEndpoints, nestedEndpoints}]
+                                               [--weight]
   examples:
   - summary: Update a traffic manager endpoint to change its weight.
-    syntax:
-      content: az network traffic-manager endpoint update -g MyResourceGroup --profile-name MyTmProfile \ -n MyEndpoint --weight 20 --type azureEndpoints
+    syntax: az network traffic-manager endpoint update -g MyResourceGroup --profile-name MyTmProfile \ -n MyEndpoint --weight 20 --type azureEndpoints
   - summary: Update a traffic manager endpoint. (autogenerated)
-    syntax:
-      content: az network traffic-manager endpoint update --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --target webserver.mysite.com --type azureEndpoints
+    syntax: az network traffic-manager endpoint update --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --target webserver.mysite.com --type azureEndpoints
   - summary: Update a traffic manager endpoint. (autogenerated)
-    syntax:
-      content: az network traffic-manager endpoint update --endpoint-status Enabled --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --type azureEndpoints
-  parameters:
+    syntax: az network traffic-manager endpoint update --endpoint-status Enabled --name MyEndpoint --profile-name MyTmProfile --resource-group MyResourceGroup --type azureEndpoints
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --custom-headers
     summary: Space-separated list of custom headers in KEY=VALUE format.
     description: ''
@@ -246,83 +263,63 @@ items:
     parameterValueGroup: Disabled, Enabled
     summary: The status of the endpoint. If enabled the endpoint is probed for endpoint health and included in the traffic routing method.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --geo-mapping
     summary: Space-separated list of country/region codes mapped to this endpoint when using the 'Geographic' routing method.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --min-child-endpoints
     summary: The minimum number of endpoints that must be available in the child profile for the parent profile to be considered available. Only applicable to an endpoint of type 'NestedEndpoints'.
     description: ''
+  - name: --name -n
+    summary: Endpoint name.
+    description: ''
   - name: --priority
     summary: Priority of the endpoint when using the 'Priority' traffic routing method. Values range from 1 to 1000, with lower values representing higher priority.
     description: ''
+  - name: --profile-name
+    summary: Name of parent profile.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
   - name: --subnets
     summary: Space-separated list of subnet CIDR prefixes (10.0.0.0/24) or subnet ranges (10.0.0.0-11.0.0.0).
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target
     summary: Fully-qualified DNS name of the endpoint.
     description: ''
   - name: --target-resource-id
     summary: The Azure Resource URI of the endpoint. Not applicable for endpoints of type 'ExternalEndpoints'.
     description: ''
-  - name: --weight
-    summary: Weight of the endpoint when using the 'Weighted' traffic routing method. Values range from 1 to 1000.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Endpoint name.
-    description: ''
-  - name: --profile-name
-    summary: Name of parent profile.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
   - name: --type -t
     parameterValueGroup: azureEndpoints, externalEndpoints, nestedEndpoints
     summary: Endpoint type.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --weight
+    summary: Weight of the endpoint when using the 'Weighted' traffic routing method. Values range from 1 to 1000.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_traffic_manager_endpoint_create
-  name: az network traffic-manager endpoint create
-  summary: Create a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_delete
-  name: az network traffic-manager endpoint delete
-  summary: Delete a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_list
-  name: az network traffic-manager endpoint list
-  summary: List traffic manager endpoints.
-- uid: az_network_traffic_manager_endpoint_show
-  name: az network traffic-manager endpoint show
-  summary: Get the details of a traffic manager endpoint.
-- uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-  name: az network traffic-manager endpoint show-geographic-hierarchy
-  summary: Get the default geographic hierarchy used by the geographic traffic routing method.
-- uid: az_network_traffic_manager_endpoint_update
-  name: az network traffic-manager endpoint update
-  summary: Update a traffic manager endpoint.
+- az_network_traffic-manager_endpoint_create
+- az_network_traffic-manager_endpoint_delete
+- az_network_traffic-manager_endpoint_list
+- az_network_traffic-manager_endpoint_show
+- az_network_traffic-manager_endpoint_show-geographic-hierarchy
+- az_network_traffic-manager_endpoint_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -338,10 +335,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure Traffic Manager end points.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Traffic Manager end points.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/profile.yml b/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/profile.yml
index a0e48135f4..89272c3802 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/profile.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/traffic-manager/profile.yml
@@ -1,62 +1,64 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_traffic_manager_profile
-  name: az network traffic-manager profile
-  summary: Manage Azure Traffic Manager profiles.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_traffic_manager_profile_check_dns
-  - az_network_traffic_manager_profile_create
-  - az_network_traffic_manager_profile_delete
-  - az_network_traffic_manager_profile_list
-  - az_network_traffic_manager_profile_show
-  - az_network_traffic_manager_profile_update
-- uid: az_network_traffic_manager_profile_check_dns
+### YamlMime:AzureCLIGroup
+uid: az_network_traffic-manager_profile
+name: az network traffic-manager profile
+summary: Manage Azure Traffic Manager profiles.
+description: ''
+directCommands:
+- uid: az_network_traffic-manager_profile_check-dns
   name: az network traffic-manager profile check-dns
   summary: Check the availability of a relative DNS name.
   description: This checks for the avabilility of dns prefixes for trafficmanager.net.
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile check-dns --name
+                                                 [--subscription]
   examples:
   - summary: Check the availability of 'mywebapp.trafficmanager.net' in Azure.
-    syntax:
-      content: az network traffic-manager profile check-dns -n mywebapp
-  parameters:
+    syntax: az network traffic-manager profile check-dns -n mywebapp
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: DNS prefix to verify availability for.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_create
   name: az network traffic-manager profile create
   summary: Create a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile create --name
+                                              --resource-group
+                                              --routing-method {Geographic, Multivalue, Performance, Priority, Subnet, Weighted}
+                                              --unique-dns-name
+                                              [--custom-headers]
+                                              [--interval]
+                                              [--max-failures]
+                                              [--max-return]
+                                              [--path]
+                                              [--port]
+                                              [--protocol {HTTP, HTTPS, TCP}]
+                                              [--status {Disabled, Enabled}]
+                                              [--status-code-ranges]
+                                              [--subscription]
+                                              [--tags]
+                                              [--timeout]
+                                              [--ttl]
   examples:
   - summary: Create a traffic manager profile with performance routing.
-    syntax:
-      content: >-
-        az network traffic-manager profile create -g MyResourceGroup -n MyTmProfile --routing-method Performance \
-            --unique-dns-name mywebapp --ttl 30 --protocol HTTP --port 80 --path "/"
-  parameters:
+    syntax: >-
+      az network traffic-manager profile create -g MyResourceGroup -n MyTmProfile --routing-method Performance \
+          --unique-dns-name mywebapp --ttl 30 --protocol HTTP --port 80 --path "/"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Traffic manager profile name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --routing-method
@@ -65,20 +67,9 @@ items:
     description: ''
   - isRequired: true
     name: --unique-dns-name
-    summary: Relative DNS name for the traffic manager profile. Resulting FQDN will be `&lt;unique-dns-name&gt;.trafficmanager.net` and must be globally unique.
-    description: ''
-  - name: --status
-    defaultValue: Enabled
-    parameterValueGroup: Disabled, Enabled
-    summary: Status of the Traffic Manager profile.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --ttl
-    defaultValue: "30"
-    summary: DNS config time-to-live in seconds.
+    summary: Relative DNS name for the traffic manager profile. Resulting FQDN will be `<unique-dns-name>.trafficmanager.net` and must be globally unique.
     description: ''
+  optionalParameters:
   - name: --custom-headers
     summary: Space-separated list of NAME=VALUE pairs.
     description: ''
@@ -88,8 +79,11 @@ items:
   - name: --max-failures
     summary: The number of consecutive failed health checks tolerated before an endpoint is considered degraded.
     description: ''
+  - name: --max-return
+    summary: Maximum number of endpoints to be returned for MultiValue routing type.
+    description: ''
   - name: --path
-    summary: Path to monitor. Use "" for none.
+    summary: Path to monitor. Use ""('""' in PowerShell) for none.
     description: ''
   - name: --port
     defaultValue: "80"
@@ -100,35 +94,43 @@ items:
     parameterValueGroup: HTTP, HTTPS, TCP
     summary: Monitor protocol.
     description: ''
+  - name: --status
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Status of the Traffic Manager profile.
+    description: ''
   - name: --status-code-ranges
     summary: Space-separated list of status codes in MIN-MAX or VAL format.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
   - name: --timeout
     summary: The time in seconds allowed for endpoints to respond to a health check.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --ttl
+    defaultValue: "30"
+    summary: DNS config time-to-live in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_delete
   name: az network traffic-manager profile delete
   summary: Delete a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile delete [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: Delete a traffic manager profile.
-    syntax:
-      content: az network traffic-manager profile delete -g MyResourceGroup -n MyTmProfile
+    syntax: az network traffic-manager profile delete -g MyResourceGroup -n MyTmProfile
   - summary: Delete a traffic manager profile. (autogenerated)
-    syntax:
-      content: az network traffic-manager profile delete --name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network traffic-manager profile delete --name MyTmProfile --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -136,120 +138,122 @@ items:
     summary: The name of the Traffic Manager profile to be deleted.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_list
   name: az network traffic-manager profile list
   summary: List traffic manager profiles.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile list [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: List traffic manager profiles.
-    syntax:
-      content: az network traffic-manager profile list -g MyResourceGroup
-  parameters:
+    syntax: az network traffic-manager profile list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_show
   name: az network traffic-manager profile show
   summary: Get the details of a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile show [--ids]
+                                            [--name]
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: Get the details of a traffic manager profile.
-    syntax:
-      content: az network traffic-manager profile show -g MyResourceGroup -n MyTmProfile
-  parameters:
+    syntax: az network traffic-manager profile show -g MyResourceGroup -n MyTmProfile
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the Traffic Manager profile.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_traffic_manager_profile_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_traffic-manager_profile_update
   name: az network traffic-manager profile update
   summary: Update a traffic manager profile.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network traffic-manager profile update [--add]
+                                              [--custom-headers]
+                                              [--force-string]
+                                              [--ids]
+                                              [--interval]
+                                              [--max-failures]
+                                              [--max-return]
+                                              [--name]
+                                              [--path]
+                                              [--port]
+                                              [--protocol {HTTP, HTTPS, TCP}]
+                                              [--remove]
+                                              [--resource-group]
+                                              [--routing-method {Geographic, Multivalue, Performance, Priority, Subnet, Weighted}]
+                                              [--set]
+                                              [--status {Disabled, Enabled}]
+                                              [--status-code-ranges]
+                                              [--subscription]
+                                              [--tags]
+                                              [--timeout]
+                                              [--ttl]
   examples:
   - summary: Update a traffic manager profile to change the TTL to 300.
-    syntax:
-      content: az network traffic-manager profile update -g MyResourceGroup -n MyTmProfile --ttl 300
+    syntax: az network traffic-manager profile update -g MyResourceGroup -n MyTmProfile --ttl 300
   - summary: Update a traffic manager profile. (autogenerated)
-    syntax:
-      content: az network traffic-manager profile update --name MyTmProfile --resource-group MyResourceGroup --status Enabled
-  parameters:
-  - name: --routing-method
-    parameterValueGroup: Geographic, Multivalue, Performance, Priority, Subnet, Weighted
-    summary: Routing method.
-    description: ''
-  - name: --status
-    parameterValueGroup: Disabled, Enabled
-    summary: Status of the Traffic Manager profile.
+    syntax: az network traffic-manager profile update --name MyTmProfile --resource-group MyResourceGroup --status Enabled
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - name: --custom-headers
+    summary: Space-separated list of NAME=VALUE pairs.
     description: ''
-  - name: --ttl
-    summary: DNS config time-to-live in seconds.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
-  - name: --name -n
-    summary: The name of the Traffic Manager profile.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --custom-headers
-    summary: Space-separated list of NAME=VALUE pairs.
-    description: ''
   - name: --interval
     summary: The interval in seconds at which health checks are conducted.
     description: ''
   - name: --max-failures
     summary: The number of consecutive failed health checks tolerated before an endpoint is considered degraded.
     description: ''
+  - name: --max-return
+    summary: Maximum number of endpoints to be returned for MultiValue routing type.
+    description: ''
+  - name: --name -n
+    summary: The name of the Traffic Manager profile.
+    description: ''
   - name: --path
-    summary: Path to monitor. Use "" for none.
+    summary: Path to monitor. Use ""('""' in PowerShell) for none.
     description: ''
   - name: --port
     summary: Port to monitor.
@@ -258,49 +262,46 @@ items:
     parameterValueGroup: HTTP, HTTPS, TCP
     summary: Monitor protocol.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --routing-method
+    parameterValueGroup: Geographic, Multivalue, Performance, Priority, Subnet, Weighted
+    summary: Routing method.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Status of the Traffic Manager profile.
+    description: ''
   - name: --status-code-ranges
     summary: Space-separated list of status codes in MIN-MAX or VAL format.
     description: ''
-  - name: --timeout
-    summary: The time in seconds allowed for endpoints to respond to a health check.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --timeout
+    summary: The time in seconds allowed for endpoints to respond to a health check.
     description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+  - name: --ttl
+    summary: DNS config time-to-live in seconds.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_traffic_manager_profile_check_dns
-  name: az network traffic-manager profile check-dns
-  summary: Check the availability of a relative DNS name.
-- uid: az_network_traffic_manager_profile_create
-  name: az network traffic-manager profile create
-  summary: Create a traffic manager profile.
-- uid: az_network_traffic_manager_profile_delete
-  name: az network traffic-manager profile delete
-  summary: Delete a traffic manager profile.
-- uid: az_network_traffic_manager_profile_list
-  name: az network traffic-manager profile list
-  summary: List traffic manager profiles.
-- uid: az_network_traffic_manager_profile_show
-  name: az network traffic-manager profile show
-  summary: Get the details of a traffic manager profile.
-- uid: az_network_traffic_manager_profile_update
-  name: az network traffic-manager profile update
-  summary: Update a traffic manager profile.
+- az_network_traffic-manager_profile_check-dns
+- az_network_traffic-manager_profile_create
+- az_network_traffic-manager_profile_delete
+- az_network_traffic-manager_profile_list
+- az_network_traffic-manager_profile_show
+- az_network_traffic-manager_profile_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -316,10 +317,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage Azure Traffic Manager profiles.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Traffic Manager profiles.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vhub.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vhub.yml
new file mode 100644
index 0000000000..fc63c06184
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vhub.yml
@@ -0,0 +1,230 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub
+name: az network vhub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual hubs.
+description: ''
+directCommands:
+- uid: az_network_vhub_create
+  name: az network vhub create
+  summary: Create a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub create --address-prefix
+                           --name
+                           --resource-group
+                           --vwan
+                           [--location]
+                           [--no-wait]
+                           [--sku {Basic, Standard}]
+                           [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --address-prefix
+    summary: CIDR address prefix for the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vwan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The sku of the VirtualHub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_vhub_delete
+  name: az network vhub delete
+  summary: Delete a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub delete --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vhub_get-effective-routes
+  name: az network vhub get-effective-routes
+  summary: Get the effective routes configured for the Virtual Hub resource or the specified resource.
+  description: ''
+  syntax: >-
+    az network vhub get-effective-routes --name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--resource-id]
+                                         [--resource-type]
+  examples:
+  - summary: Get the effective routes configured for route table in the virtual hub.
+    syntax: az network vhub get-effective-routes --resource-type RouteTable --resource-id /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable -g MyRG -n MyHub
+  - summary: Get the effective routes configured for P2S connection in the virtual hub.
+    syntax: az network vhub get-effective-routes --resource-type P2SConnection --resource-id /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/p2sVpnGateways/MyGateway/p2sConnectionConfigurations/MyConnection -g MyRG -n MyHub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-id
+    summary: The resource whose effective routes are being requested.
+    description: ''
+  - name: --resource-type
+    summary: The type of the specified resource like RouteTable, ExpressRouteConnection, HubVirtualNetworkConnection, VpnConnection and P2SConnection.
+    description: ''
+- uid: az_network_vhub_list
+  name: az network vhub list
+  summary: List virtual hubs.
+  description: ''
+  syntax: az network vhub list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vhub_show
+  name: az network vhub show
+  summary: Get the details of a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vhub_update
+  name: az network vhub update
+  summary: Update settings of a virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub update --name
+                           --resource-group
+                           [--add]
+                           [--address-prefix]
+                           [--force-string]
+                           [--no-wait]
+                           [--remove]
+                           [--set]
+                           [--sku {Basic, Standard}]
+                           [--tags]
+                           [--vwan]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-prefix
+    summary: CIDR address prefix for the virtual hub.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The sku of the VirtualHub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vwan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+commands:
+- az_network_vhub_connection
+- az_network_vhub_connection_create
+- az_network_vhub_connection_delete
+- az_network_vhub_connection_list
+- az_network_vhub_connection_show
+- az_network_vhub_connection_update
+- az_network_vhub_connection_wait
+- az_network_vhub_create
+- az_network_vhub_delete
+- az_network_vhub_get-effective-routes
+- az_network_vhub_list
+- az_network_vhub_route
+- az_network_vhub_route_add
+- az_network_vhub_route_list
+- az_network_vhub_route_remove
+- az_network_vhub_route_reset
+- az_network_vhub_route-table
+- az_network_vhub_route-table_create
+- az_network_vhub_route-table_delete
+- az_network_vhub_route-table_list
+- az_network_vhub_route-table_route
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+- az_network_vhub_route-table_show
+- az_network_vhub_route-table_update
+- az_network_vhub_route-table_wait
+- az_network_vhub_show
+- az_network_vhub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual hubs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vhub/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/connection.yml
new file mode 100644
index 0000000000..7850bd5c9b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/connection.yml
@@ -0,0 +1,299 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_connection
+name: az network vhub connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual hub VNet connections.
+description: ''
+directCommands:
+- uid: az_network_vhub_connection_create
+  name: az network vhub connection create
+  summary: Create a virtual hub VNet connection.
+  description: ''
+  syntax: >-
+    az network vhub connection create --name
+                                      --remote-vnet
+                                      --resource-group
+                                      --vhub-name
+                                      [--address-prefixes]
+                                      [--associated]
+                                      [--internet-security {false, true}]
+                                      [--labels]
+                                      [--next-hop]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--remote-vnet-transit {false, true}]
+                                      [--route-name]
+                                      [--use-hub-vnet-gateways {false, true}]
+  examples:
+  - summary: Create a virtual hub VNet connection without routing configuration.
+    syntax: az network vhub connection create -n MyConnection --vhub-name MyHub -g MyRG --remote-vnet MyVNet
+  - summary: Create a virtual hub VNet connection with routing configuration.
+    syntax: az network vhub connection create -n MyConnection --vhub-name MyHub -g MyRG --remote-vnet MyVNet --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable2 --labels label1 label2 --route-name route1 --next-hop 70.0.0.2 --address-prefixes 10.80.0.0/16 10.90.0.0/16
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --remote-vnet
+    summary: Name of ID of the remote VNet to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --address-prefixes
+    summary: Space-separated list of all address prefixes.
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --internet-security
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: Enable internet security and default is enabled.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --next-hop
+    summary: The ip address of the next hop.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remote-vnet-transit
+    parameterValueGroup: false, true
+    summary: Enable hub to remote VNet transit.
+    description: ''
+  - name: --route-name
+    summary: The name of the Static Route that is unique within a Vnet Route.
+    description: ''
+  - name: --use-hub-vnet-gateways
+    parameterValueGroup: false, true
+    summary: Allow remote VNet to use hub's VNet gateways.
+    description: ''
+- uid: az_network_vhub_connection_delete
+  name: az network vhub connection delete
+  summary: Delete a virtual hub VNet connection.
+  description: ''
+  syntax: >-
+    az network vhub connection delete --name
+                                      --resource-group
+                                      --vhub-name
+                                      [--no-wait]
+                                      [--yes]
+  examples:
+  - summary: Delete a virtual hub VNet connection.
+    syntax: az network vhub connection delete -n MyConnection --vhub-name MyHub -g MyRG
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_network_vhub_connection_list
+  name: az network vhub connection list
+  summary: List virtual hub VNet connections.
+  description: ''
+  syntax: >-
+    az network vhub connection list --resource-group
+                                    --vhub-name
+  examples:
+  - summary: List VNet connections in a given virtual hub.
+    syntax: az network vhub connection list --vhub-name MyHub -g MyRG
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_connection_show
+  name: az network vhub connection show
+  summary: Get the details of a virtual hub VNet connection.
+  description: ''
+  syntax: >-
+    az network vhub connection show --name
+                                    --resource-group
+                                    --vhub-name
+  examples:
+  - summary: Get the details of a virtual hub VNet connection.
+    syntax: az network vhub connection show -n MyConnection --vhub-name MyHub -g MyRG
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_connection_update
+  name: az network vhub connection update
+  summary: Update settings of a virtual hub connection.
+  description: ''
+  syntax: >-
+    az network vhub connection update --name
+                                      --resource-group
+                                      --vhub-name
+                                      [--add]
+                                      [--associated]
+                                      [--force-string]
+                                      [--labels]
+                                      [--no-wait]
+                                      [--propagated]
+                                      [--remove]
+                                      [--set]
+  examples:
+  - summary: Add labels of a virtual hub connection.
+    syntax: az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --labels Newlabel1 Newlabel2
+  - summary: Add labels for propagatedRouteTables of a virtual hub connection.
+    syntax: az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --add routingConfiguration.propagatedRouteTables.labels Newlabel1 Newlabel2
+  - summary: Reset labels of a virtual hub connection.
+    syntax: az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --set routingConfiguration.propagatedRouteTables.labels[0]=Newlabel
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_network_vhub_connection_wait
+  name: az network vhub connection wait
+  summary: Place the CLI in a waiting state until a condition of virtual hub VNet connection is met.
+  description: ''
+  syntax: >-
+    az network vhub connection wait --name
+                                    --resource-group
+                                    --vhub-name
+                                    [--created]
+                                    [--custom]
+                                    [--deleted]
+                                    [--exists]
+                                    [--interval]
+                                    [--timeout]
+                                    [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vhub_connection_create
+- az_network_vhub_connection_delete
+- az_network_vhub_connection_list
+- az_network_vhub_connection_show
+- az_network_vhub_connection_update
+- az_network_vhub_connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual hub VNet connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route-table.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route-table.yml
new file mode 100644
index 0000000000..914b61c441
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route-table.yml
@@ -0,0 +1,256 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_route-table
+name: az network vhub route-table
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub route-table** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage route table in the virtual hub.
+description: ''
+directCommands:
+- uid: az_network_vhub_route-table_create
+  name: az network vhub route-table create
+  summary: Create a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table create --name
+                                       --resource-group
+                                       --vhub-name
+                                       [--connections {All_Branches, All_Vnets}]
+                                       [--destination-type {CIDR, ResourceId, Service}]
+                                       [--destinations]
+                                       [--labels]
+                                       [--next-hop]
+                                       [--next-hop-type {IPAddress, ResourceId}]
+                                       [--next-hops]
+                                       [--no-wait]
+                                       [--route-name]
+  examples:
+  - summary: Create a v3 route table in the virtual hub.
+    syntax: az network vhub route-table create -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --route-name MyRoute --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type ResourceId --next-hop /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/azureFirewalls/MyFirewall --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --connections
+    parameterValueGroup: All_Branches, All_Vnets
+    summary: List of all connections attached to this route table.
+    description: ''
+  - name: --destination-type
+    parameterValueGroup: CIDR, ResourceId, Service
+    summary: The type of destinations.
+    description: ''
+  - name: --destinations
+    summary: Space-separated list of all destinations.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of all labels associated with this route table.
+    description: ''
+  - name: --next-hop
+    summary: The resource ID of the next hop.
+    description: ''
+  - name: --next-hop-type
+    parameterValueGroup: IPAddress, ResourceId
+    summary: The type of next hop. If --next-hops (v2) is provided, it should be IPAddress; if --next-hop (v3) is provided, it should be ResourceId.
+    description: ''
+  - name: --next-hops
+    summary: Space-separated list of IP address of the next hop. Currently only one next hop is allowed for every route.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --route-name
+    summary: The name of the route.
+    description: ''
+- uid: az_network_vhub_route-table_delete
+  name: az network vhub route-table delete
+  summary: Delete a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table delete --name
+                                       --resource-group
+                                       --vhub-name
+  examples:
+  - summary: Delete a route table in the virtual hub.
+    syntax: az network vhub route-table delete -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_list
+  name: az network vhub route-table list
+  summary: List all route tables in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table list --resource-group
+                                     --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_show
+  name: az network vhub route-table show
+  summary: Show a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table show --name
+                                     --resource-group
+                                     --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_update
+  name: az network vhub route-table update
+  summary: Update a route table in the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table update --name
+                                       --resource-group
+                                       --vhub-name
+                                       [--connections {All_Branches, All_Vnets}]
+                                       [--labels]
+                                       [--no-wait]
+  examples:
+  - summary: Update the labels for a v3 route table in the virtual hub.
+    syntax: az network vhub route-table update -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --connections
+    parameterValueGroup: All_Branches, All_Vnets
+    summary: List of all connections attached to this route table.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of all labels associated with this route table.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vhub_route-table_wait
+  name: az network vhub route-table wait
+  summary: Place the CLI in a waiting state until a condition of the vhub route-table is met.
+  description: ''
+  syntax: >-
+    az network vhub route-table wait --name
+                                     --resource-group
+                                     --vhub-name
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--timeout]
+                                     [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the route table is successfully provisioned.
+    syntax: az network vhub route-table wait -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vhub_route-table_create
+- az_network_vhub_route-table_delete
+- az_network_vhub_route-table_list
+- az_network_vhub_route-table_route
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+- az_network_vhub_route-table_show
+- az_network_vhub_route-table_update
+- az_network_vhub_route-table_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage route table in the virtual hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route-table/route.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route-table/route.yml
new file mode 100644
index 0000000000..01c91c0173
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route-table/route.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_route-table_route
+name: az network vhub route-table route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub route-table route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage routes of route table in the virtual hub.
+description: ''
+directCommands:
+- uid: az_network_vhub_route-table_route_add
+  name: az network vhub route-table route add
+  summary: Add a route into route table of the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table route add --destination-type {CIDR, ResourceId, Service}
+                                          --destinations
+                                          --name
+                                          --next-hop-type {IPAddress, ResourceId}
+                                          --resource-group
+                                          --vhub-name
+                                          [--next-hop]
+                                          [--next-hops]
+                                          [--no-wait]
+                                          [--route-name]
+  examples:
+  - summary: Add a route with firewall as next hop into route table of the virtual hub (route table v3).
+    syntax: az network vhub route-table route add -n MyRouteTable -g MyResourceGroup --vhub-name MyVhub --destination-type CIDR --destinations "10.4.0.0/16" "10.6.0.0/16" --next-hop-type ResourceId --next-hop /subscriptions/MySub/resourceGroups/MyResourceGroup/providers/Microsoft.Network/azureFirewalls/MyFirewall
+  requiredParameters:
+  - isRequired: true
+    name: --destination-type
+    parameterValueGroup: CIDR, ResourceId, Service
+    summary: The type of destinations.
+    description: ''
+  - isRequired: true
+    name: --destinations
+    summary: Space-separated list of all destinations.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --next-hop-type
+    parameterValueGroup: IPAddress, ResourceId
+    summary: The type of next hop. If --next-hops (v2) is provided, it should be IPAddress; if --next-hop (v3) is provided, it should be ResourceId.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --next-hop
+    summary: The resource ID of the next hop.
+    description: ''
+  - name: --next-hops
+    summary: Space-separated list of IP address of the next hop. Currently only one next hop is allowed for every route.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --route-name
+    summary: The name of the route.
+    description: ''
+- uid: az_network_vhub_route-table_route_list
+  name: az network vhub route-table route list
+  summary: List routes in the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route-table route list --name
+                                           --resource-group
+                                           --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route-table_route_remove
+  name: az network vhub route-table route remove
+  summary: Remove a route from route table of the virtual hub.
+  description: ''
+  syntax: >-
+    az network vhub route-table route remove --index
+                                             --name
+                                             --resource-group
+                                             --vhub-name
+                                             [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: List index of the item (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual hub route table.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_network_vhub_route-table_route_add
+- az_network_vhub_route-table_route_list
+- az_network_vhub_route-table_route_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage routes of route table in the virtual hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route.yml
new file mode 100644
index 0000000000..7f6db8e970
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vhub/route.yml
@@ -0,0 +1,126 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vhub_route
+name: az network vhub route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vhub route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage entries in the virtual hub route table.
+description: ''
+directCommands:
+- uid: az_network_vhub_route_add
+  name: az network vhub route add
+  summary: Add a route to the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route add --address-prefixes
+                              --next-hop
+                              --resource-group
+                              --vhub-name
+                              [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --address-prefixes
+    summary: Space-separated list of CIDR prefixes.
+    description: ''
+  - isRequired: true
+    name: --next-hop
+    summary: IP address of the next hop.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vhub_route_list
+  name: az network vhub route list
+  summary: List routes in the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route list --resource-group
+                               --vhub-name
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+- uid: az_network_vhub_route_remove
+  name: az network vhub route remove
+  summary: Remove a route from the virtual hub route table.
+  description: ''
+  syntax: >-
+    az network vhub route remove --index
+                                 --resource-group
+                                 --vhub-name
+                                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: List index of the item (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vhub_route_reset
+  name: az network vhub route reset
+  summary: Reset virtual hub route when the route state is failed.
+  description: ''
+  syntax: >-
+    az network vhub route reset --resource-group
+                                --vhub-name
+                                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub-name
+    summary: Name of the virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_network_vhub_route_add
+- az_network_vhub_route_list
+- az_network_vhub_route_remove
+- az_network_vhub_route_reset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage entries in the virtual hub route table.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/virtual-appliance.yml b/2018-03-01-hybrid/docs-ref-autogen/network/virtual-appliance.yml
new file mode 100644
index 0000000000..6eeb13fe9c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/virtual-appliance.yml
@@ -0,0 +1,118 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_virtual-appliance
+name: az network virtual-appliance
+summary: Manage Azure Network Virtual Appliance.
+description: ''
+directCommands:
+- uid: az_network_virtual-appliance_create
+  name: az network virtual-appliance create
+  summary: Create an Azure network virtual appliance.
+  description: ''
+  syntax: >-
+    az network virtual-appliance create --name
+                                        --resource-group
+                                        --scale-unit
+                                        --vendor
+                                        --version
+                                        --vhub
+                                        [--asn]
+                                        [--boot-blobs]
+                                        [--cloud-blobs]
+                                        [--cloud-init-config]
+                                        [--location]
+                                        [--subscription]
+                                        [--tags]
+  examples:
+  - summary: Create an Azure network virtual appliance.
+    syntax: az network virtual-appliance create -n MyName -g MyRG --vhub {vhubID} --vendor "barracudasdwanrelease" --scale-unit 2 -v latest --asn 10000 --init-config "echo $hello" --boot-blobs {blobUrl1} {blobUrl2} --cloud-blobs {blobUrl3} {blobUrl4}
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of Network Virtual Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scale-unit
+    summary: Virtual Appliance Scale Unit.
+    description: ''
+  - isRequired: true
+    name: --vendor
+    summary: Virtual Appliance Vendor.
+    description: ''
+  - isRequired: true
+    name: --version -v
+    summary: Virtual Appliance Version.
+    description: ''
+  - isRequired: true
+    name: --vhub
+    summary: Name or ID of the virtual hub to which the Security Partner Provider belongs.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: VirtualAppliance ASN. The valid value ranges from 1 to 4294967295.
+    description: ''
+  - name: --boot-blobs --boot-strap-config-blobs
+    summary: Space-separated list of BootStrapConfigurationBlobs storage URLs.
+    description: ''
+  - name: --cloud-blobs --cloud-init-config-blobs
+    summary: Space-separated list of CloudInitConfigurationBlob storage URLs.
+    description: ''
+  - name: --cloud-init-config --init-config
+    summary: CloudInitConfiguration scripts that will be run during cloud initialization.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_virtual-appliance_list
+  name: az network virtual-appliance list
+  summary: List all Azure network virtual appliance.
+  description: ''
+  syntax: >-
+    az network virtual-appliance list [--query-examples]
+                                      [--resource-group]
+                                      [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_virtual-appliance_create
+- az_network_virtual-appliance_list
+- az_network_virtual-appliance_site
+- az_network_virtual-appliance_site_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Network Virtual Appliance.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/virtual-appliance/site.yml b/2018-03-01-hybrid/docs-ref-autogen/network/virtual-appliance/site.yml
new file mode 100644
index 0000000000..ebd5c60735
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/virtual-appliance/site.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_virtual-appliance_site
+name: az network virtual-appliance site
+summary: Manage Azure Network Virtual Appliance Site.
+description: ''
+directCommands:
+- uid: az_network_virtual-appliance_site_create
+  name: az network virtual-appliance site create
+  summary: Create an Azure network virtual appliance site.
+  description: ''
+  syntax: >-
+    az network virtual-appliance site create --address-prefix
+                                             --appliance-name
+                                             --name
+                                             --resource-group
+                                             [--allow {false, true}]
+                                             [--default {false, true}]
+                                             [--optimize {false, true}]
+                                             [--subscription]
+  examples:
+  - summary: Create an Azure network virtual appliance site.
+    syntax: az network virtual-appliance site create -n MyName -g MyRG --appliance-name MyAppliance --address-prefix 10.0.0.0/24 --allow --default --optimize
+  requiredParameters:
+  - isRequired: true
+    name: --address-prefix
+    summary: Address Prefix of Network Virtual Appliance Site.
+    description: ''
+  - isRequired: true
+    name: --appliance-name
+    summary: The name of Network Virtual Appliance.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of Network Virtual Appliance Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allow
+    parameterValueGroup: false, true
+    summary: Flag to control breakout of o365 allow category.
+    description: ''
+  - name: --default
+    parameterValueGroup: false, true
+    summary: Flag to control breakout of o365 default category.
+    description: ''
+  - name: --optimize
+    parameterValueGroup: false, true
+    summary: Flag to control breakout of o365 optimize category.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+commands:
+- az_network_virtual-appliance_site_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage Azure Network Virtual Appliance Site.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway.yml
index a51bef4c44..35e4d1c8b5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway.yml
@@ -1,44 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway
-  name: az network vnet-gateway
-  summary: Use an Azure Virtual Network Gateway to establish secure, cross-premises connectivity.
-  description: To learn more about Azure Virtual Network Gateways, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_create
-  - az_network_vnet_gateway_delete
-  - az_network_vnet_gateway_list
-  - az_network_vnet_gateway_list_advertised_routes
-  - az_network_vnet_gateway_list_bgp_peer_status
-  - az_network_vnet_gateway_list_learned_routes
-  - az_network_vnet_gateway_reset
-  - az_network_vnet_gateway_show
-  - az_network_vnet_gateway_update
-  - az_network_vnet_gateway_wait
-- uid: az_network_vnet_gateway_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway
+name: az network vnet-gateway
+summary: Use an Azure Virtual Network Gateway to establish secure, cross-premises connectivity.
+description: To learn more about Azure Virtual Network Gateways, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli.
+directCommands:
+- uid: az_network_vnet-gateway_create
   name: az network vnet-gateway create
   summary: Create a virtual network gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway create --name
+                                   --public-ip-addresses
+                                   --resource-group
+                                   --vnet
+                                   [--address-prefixes]
+                                   [--asn]
+                                   [--bgp-peering-address]
+                                   [--client-protocol {IkeV2, SSTP}]
+                                   [--gateway-default-site]
+                                   [--gateway-type {ExpressRoute, Vpn}]
+                                   [--location]
+                                   [--no-wait]
+                                   [--peer-weight]
+                                   [--radius-secret]
+                                   [--radius-server]
+                                   [--sku {Basic, HighPerformance, Standard, UltraPerformance, VpnGw1, VpnGw2, VpnGw3}]
+                                   [--subscription]
+                                   [--tags]
+                                   [--vpn-type {PolicyBased, RouteBased}]
   examples:
   - summary: Create a basic virtual network gateway for site-to-site connectivity.
-    syntax:
-      content: >-
-        az network vnet-gateway create -g MyResourceGroup -n MyVnetGateway --public-ip-address MyGatewayIp \
-            --vnet MyVnet --gateway-type Vpn --sku VpnGw1 --vpn-type RouteBased --no-wait
+    syntax: >-
+      az network vnet-gateway create -g MyResourceGroup -n MyVnetGateway --public-ip-address MyGatewayIp \
+          --vnet MyVnet --gateway-type Vpn --sku VpnGw1 --vpn-type RouteBased --no-wait
   - summary: Create a basic virtual network gateway that provides point-to-site connectivity with a RADIUS secret that matches what is configured on a RADIUS server.
-    syntax:
-      content: >-
-        az network vnet-gateway create -g MyResourceGroup -n MyVnetGateway --public-ip-address MyGatewayIp \
-            --vnet MyVnet --gateway-type Vpn --sku VpnGw1 --vpn-type RouteBased --address-prefixes 40.1.0.0/24 \
-            --client-protocol IkeV2 SSTP --radius-secret 111_aaa --radius-server 30.1.1.15 --vpn-gateway-generation Generation1
+    syntax: >-
+      az network vnet-gateway create -g MyResourceGroup -n MyVnetGateway --public-ip-address MyGatewayIp \
+          --vnet MyVnet --gateway-type Vpn --sku VpnGw1 --vpn-type RouteBased --address-prefixes 40.1.0.0/24 \
+          --client-protocol IkeV2 SSTP --radius-secret 111_aaa --radius-server 30.1.1.15 --vpn-gateway-generation Generation1
+  - summary: Create a basic virtual network gateway with multi authentication
+    syntax: az network vnet-gateway create -g MyResourceGroup -n MyVnetGateway --public-ip-address MyGatewayIp --vnet MyVnet --gateway-type Vpn --sku VpnGw1 --vpn-type RouteBased --address-prefixes 40.1.0.0/24 --client-protocol OpenVPN --radius-secret 111_aaa --radius-server 30.1.1.15 --aad-issuer https://sts.windows.net/00000-000000-00000-0000-000/ --aad-tenant https://login.microsoftonline.com/000 --aad-audience 0000-000 --root-cert-name root-cert --root-cert-data "root-cert.cer" --vpn-auth-type AAD Certificate Radius
   - summary: Create a virtual network gateway. (autogenerated)
-    syntax:
-      content: az network vnet-gateway create --gateway-type Vpn --location westus2 --name MyVnetGateway --no-wait --public-ip-addresses myVGPublicIPAddress --resource-group MyResourceGroup --sku Basic --vnet MyVnet --vpn-type PolicyBased
-  parameters:
+    syntax: az network vnet-gateway create --gateway-type Vpn --location westus2 --name MyVnetGateway --no-wait --public-ip-addresses myVGPublicIPAddress --resource-group MyResourceGroup --sku Basic --vnet MyVnet --vpn-type PolicyBased
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the VNet gateway.
@@ -49,12 +53,26 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet
     summary: Name or ID of an existing virtual network which has a subnet named 'GatewaySubnet'.
     description: ''
+  optionalParameters:
+  - name: --address-prefixes
+    summary: Space-separated list of CIDR prefixes representing the address space for the P2S Vpnclient.
+    description: ''
+  - name: --asn
+    summary: Autonomous System Number to use for the BGP settings.
+    description: ''
+  - name: --bgp-peering-address
+    summary: IP address to use for BGP peering.
+    description: ''
+  - name: --client-protocol
+    parameterValueGroup: IkeV2, SSTP
+    summary: Protocols to use for connecting.
+    description: ''
   - name: --gateway-default-site
     summary: Name or ID of a local network gateway representing a local network site with default routes.
     description: ''
@@ -64,16 +82,28 @@ items:
     summary: The gateway type.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --peer-weight
+    summary: Weight (0-100) added to routes learned through BGP peering.
+    description: ''
+  - name: --radius-secret
+    summary: Radius secret to use for authentication.
+    description: ''
+  - name: --radius-server
+    summary: Radius server address to connect to.
+    description: ''
   - name: --sku
     defaultValue: Basic
     parameterValueGroup: Basic, HighPerformance, Standard, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
     summary: VNet gateway SKU.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
@@ -82,112 +112,84 @@ items:
     parameterValueGroup: PolicyBased, RouteBased
     summary: VPN routing type.
     description: ''
-  - name: --asn
-    summary: Autonomous System Number to use for the BGP settings.
-    description: ''
-  - name: --bgp-peering-address
-    summary: IP address to use for BGP peering.
-    description: ''
-  - name: --peer-weight
-    summary: Weight (0-100) added to routes learned through BGP peering.
-    description: ''
-  - name: --address-prefixes
-    summary: Space-separated list of CIDR prefixes representing the address space for the P2S Vpnclient.
-    description: ''
-  - name: --client-protocol
-    parameterValueGroup: IkeV2, SSTP
-    summary: Protocols to use for connecting.
-    description: ''
-  - name: --radius-secret
-    summary: Radius secret to use for authentication.
-    description: ''
-  - name: --radius-server
-    summary: Radius server address to connect to.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_delete
   name: az network vnet-gateway delete
   summary: Delete a virtual network gateway.
   description: >-
     In order to delete a Virtual Network Gateway, you must first delete ALL Connection objects in Azure that are
      connected to the Gateway. After deleting the Gateway, proceed to delete other resources now not in use.
      For more information, follow the order of instructions on this page:
-     <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal</a>.
-  langs:
-  - azurecli
+     https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-delete-vnet-gateway-portal.
+  syntax: >-
+    az network vnet-gateway delete [--ids]
+                                   [--name]
+                                   [--no-wait]
+                                   [--resource-group]
+                                   [--subscription]
   examples:
   - summary: Delete a virtual network gateway.
-    syntax:
-      content: az network vnet-gateway delete -g MyResourceGroup -n MyVnetGateway
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az network vnet-gateway delete -g MyResourceGroup -n MyVnetGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the VNet gateway.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_list
   name: az network vnet-gateway list
   summary: List virtual network gateways.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway list --resource-group
+                                 [--query-examples]
+                                 [--subscription]
   examples:
   - summary: List virtual network gateways in a resource group.
-    syntax:
-      content: az network vnet-gateway list -g MyResourceGroup
-  parameters:
+    syntax: az network vnet-gateway list -g MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_list_advertised_routes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_list-advertised-routes
   name: az network vnet-gateway list-advertised-routes
   summary: List the routes of a virtual network gateway advertised to the specified peer.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway list-advertised-routes --peer
+                                                   [--ids]
+                                                   [--name]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
   - summary: List the routes of a virtual network gateway advertised to the specified peer.
-    syntax:
-      content: az network vnet-gateway list-advertised-routes -g MyResourceGroup -n MyVnetGateway --peer 23.10.10.9
-  parameters:
+    syntax: az network vnet-gateway list-advertised-routes -g MyResourceGroup -n MyVnetGateway --peer 23.10.10.9
+  requiredParameters:
   - isRequired: true
     name: --peer
     summary: The IP address of the peer.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -195,60 +197,55 @@ items:
     summary: Name of the VNet gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_list_bgp_peer_status
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_list-bgp-peer-status
   name: az network vnet-gateway list-bgp-peer-status
   summary: Retrieve the status of BGP peers.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway list-bgp-peer-status [--ids]
+                                                 [--name]
+                                                 [--peer]
+                                                 [--resource-group]
+                                                 [--subscription]
   examples:
   - summary: Retrieve the status of a BGP peer.
-    syntax:
-      content: az network vnet-gateway list-bgp-peer-status -g MyResourceGroup -n MyVnetGateway --peer 23.10.10.9
-  parameters:
-  - name: --peer
-    summary: The IP address of the peer to retrieve the status of.
-    description: ''
+    syntax: az network vnet-gateway list-bgp-peer-status -g MyResourceGroup -n MyVnetGateway --peer 23.10.10.9
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the VNet gateway.
     description: ''
+  - name: --peer
+    summary: The IP address of the peer to retrieve the status of.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_list_learned_routes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_list-learned-routes
   name: az network vnet-gateway list-learned-routes
   summary: This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway list-learned-routes [--ids]
+                                                [--name]
+                                                [--resource-group]
+                                                [--subscription]
   examples:
   - summary: Retrieve a list of learned routes.
-    syntax:
-      content: az network vnet-gateway list-learned-routes -g MyResourceGroup -n MyVnetGateway
-  parameters:
+    syntax: az network vnet-gateway list-learned-routes -g MyResourceGroup -n MyVnetGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -256,31 +253,28 @@ items:
     summary: Name of the VNet gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_reset
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_reset
   name: az network vnet-gateway reset
   summary: Reset a virtual network gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway reset [--gateway-vip]
+                                  [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Reset a virtual network gateway.
-    syntax:
-      content: az network vnet-gateway reset -g MyResourceGroup -n MyVnetGateway
+    syntax: az network vnet-gateway reset -g MyResourceGroup -n MyVnetGateway
   - summary: Reset a virtual network gateway with Active-Active feature enabled.
-    syntax:
-      content: az network vnet-gateway reset -g MyResourceGroup -n MyVnetGateway --gateway-vip MyGatewayIP
-  parameters:
+    syntax: az network vnet-gateway reset -g MyResourceGroup -n MyVnetGateway --gateway-vip MyGatewayIP
+  optionalParameters:
   - name: --gateway-vip
     summary: Virtual network gateway vip address supplied to the begin reset of the active-active feature enabled gateway.
     description: ''
@@ -291,87 +285,55 @@ items:
     summary: Name of the VNet gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_show
   name: az network vnet-gateway show
   summary: Get the details of a virtual network gateway.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway show [--ids]
+                                 [--name]
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Get the details of a virtual network gateway.
-    syntax:
-      content: az network vnet-gateway show -g MyResourceGroup -n MyVnetGateway
-  parameters:
+    syntax: az network vnet-gateway show -g MyResourceGroup -n MyVnetGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the VNet gateway.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_update
-  name: az network vnet-gateway update
-  summary: Update a virtual network gateway.
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_show-supported-devices
+  name: az network vnet-gateway show-supported-devices
+  summary: Get a xml format representation for supported vpn devices.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway show-supported-devices [--ids]
+                                                   [--name]
+                                                   [--resource-group]
+                                                   [--subscription]
   examples:
-  - summary: Change the SKU of a virtual network gateway.
-    syntax:
-      content: az network vnet-gateway update -g MyResourceGroup -n MyVnetGateway --sku VpnGw2
-  - summary: Update a virtual network gateway. (autogenerated)
-    syntax:
-      content: az network vnet-gateway update --address-prefixes 40.1.0.0/24 --client-protocol IkeV2 --name MyVnetGateway --resource-group MyResourceGroup
-  parameters:
-  - name: --gateway-default-site
-    summary: Name or ID of a local network gateway representing a local network site with default routes.
-    description: ''
-  - name: --gateway-type
-    parameterValueGroup: ExpressRoute, Vpn
-    summary: The gateway type.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --public-ip-addresses
-    summary: Specify a single public IP (name or ID) for an active-standby gateway. Specify two space-separated public IPs for an active-active gateway.
-    description: ''
-  - name: --sku
-    parameterValueGroup: Basic, HighPerformance, Standard, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
-    summary: VNet gateway SKU.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vnet
-    summary: Name or ID of a virtual network that contains a subnet named 'GatewaySubnet'.
-    description: ''
-  - name: --vpn-type
-    parameterValueGroup: PolicyBased, RouteBased
-    summary: VPN routing type.
-    description: ''
+  - summary: Get a xml format representation for supported vpn devices.
+    syntax: az network vnet-gateway show-supported-devices -g MyResourceGroup -n MyVnetGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -379,30 +341,91 @@ items:
     summary: Name of the VNet gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_update
+  name: az network vnet-gateway update
+  summary: Update a virtual network gateway.
+  description: ''
+  syntax: >-
+    az network vnet-gateway update [--add]
+                                   [--address-prefixes]
+                                   [--asn]
+                                   [--bgp-peering-address]
+                                   [--client-protocol {IkeV2, SSTP}]
+                                   [--enable-bgp {false, true}]
+                                   [--force-string]
+                                   [--gateway-default-site]
+                                   [--gateway-type {ExpressRoute, Vpn}]
+                                   [--ids]
+                                   [--name]
+                                   [--no-wait]
+                                   [--peer-weight]
+                                   [--public-ip-addresses]
+                                   [--radius-secret]
+                                   [--radius-server]
+                                   [--remove]
+                                   [--resource-group]
+                                   [--set]
+                                   [--sku {Basic, HighPerformance, Standard, UltraPerformance, VpnGw1, VpnGw2, VpnGw3}]
+                                   [--subscription]
+                                   [--tags]
+                                   [--vnet]
+                                   [--vpn-type {PolicyBased, RouteBased}]
+  examples:
+  - summary: Change the SKU of a virtual network gateway.
+    syntax: az network vnet-gateway update -g MyResourceGroup -n MyVnetGateway --sku VpnGw2
+  - summary: Update a virtual network gateway. (autogenerated)
+    syntax: az network vnet-gateway update --address-prefixes 40.1.0.0/24 --client-protocol IkeV2 --name MyVnetGateway --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-prefixes
+    summary: Space-separated list of CIDR prefixes representing the address space for the P2S Vpnclient.
+    description: ''
   - name: --asn
     summary: Autonomous System Number to use for the BGP settings.
     description: ''
   - name: --bgp-peering-address
     summary: IP address to use for BGP peering.
     description: ''
+  - name: --client-protocol
+    parameterValueGroup: IkeV2, SSTP
+    summary: Protocols to use for connecting.
+    description: ''
   - name: --enable-bgp
     parameterValueGroup: false, true
     summary: Enable BGP (Border Gateway Protocol).
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --gateway-default-site
+    summary: Name or ID of a local network gateway representing a local network site with default routes.
+    description: ''
+  - name: --gateway-type
+    parameterValueGroup: ExpressRoute, Vpn
+    summary: The gateway type.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Name of the VNet gateway.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --peer-weight
     summary: Weight (0-100) added to routes learned through BGP peering.
     description: ''
-  - name: --address-prefixes
-    summary: Space-separated list of CIDR prefixes representing the address space for the P2S Vpnclient.
-    description: ''
-  - name: --client-protocol
-    parameterValueGroup: IkeV2, SSTP
-    summary: Protocols to use for connecting.
+  - name: --public-ip-addresses
+    summary: Specify a single public IP (name or ID) for an active-standby gateway. Specify two space-separated public IPs for an active-active gateway.
     description: ''
   - name: --radius-secret
     summary: Radius secret to use for authentication.
@@ -410,50 +433,55 @@ items:
   - name: --radius-server
     summary: Radius server address to connect to.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_wait
+  - name: --sku
+    parameterValueGroup: Basic, HighPerformance, Standard, UltraPerformance, VpnGw1, VpnGw2, VpnGw3
+    summary: VNet gateway SKU.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet
+    summary: Name or ID of a virtual network that contains a subnet named 'GatewaySubnet'.
+    description: ''
+  - name: --vpn-type
+    parameterValueGroup: PolicyBased, RouteBased
+    summary: VPN routing type.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_wait
   name: az network vnet-gateway wait
   summary: Place the CLI in a waiting state until a condition of the virtual network gateway is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway wait [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--ids]
+                                 [--interval]
+                                 [--name]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--updated]
   examples:
   - summary: Pause CLI until the virtual network gateway is created.
-    syntax:
-      content: az network vnet-gateway wait -g MyResourceGroup -n MyVnetGateway --created
+    syntax: az network vnet-gateway wait -g MyResourceGroup -n MyVnetGateway --created
   - summary: Place the CLI in a waiting state until a condition of the virtual network gateway is met. (autogenerated)
-    syntax:
-      content: az network vnet-gateway wait --name MyVnetGateway --resource-group MyResourceGroup --updated
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the VNet gateway.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az network vnet-gateway wait --name MyVnetGateway --resource-group MyResourceGroup --updated
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -466,10 +494,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the VNet gateway.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -477,70 +517,28 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_create
-  name: az network vnet-gateway create
-  summary: Create a virtual network gateway.
-- uid: az_network_vnet_gateway_delete
-  name: az network vnet-gateway delete
-  summary: Delete a virtual network gateway.
-- uid: az_network_vnet_gateway_list
-  name: az network vnet-gateway list
-  summary: List virtual network gateways.
-- uid: az_network_vnet_gateway_list_advertised_routes
-  name: az network vnet-gateway list-advertised-routes
-  summary: List the routes of a virtual network gateway advertised to the specified peer.
-- uid: az_network_vnet_gateway_list_bgp_peer_status
-  name: az network vnet-gateway list-bgp-peer-status
-  summary: Retrieve the status of BGP peers.
-- uid: az_network_vnet_gateway_list_learned_routes
-  name: az network vnet-gateway list-learned-routes
-  summary: This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
-- uid: az_network_vnet_gateway_reset
-  name: az network vnet-gateway reset
-  summary: Reset a virtual network gateway.
-- uid: az_network_vnet_gateway_revoked_cert
-  name: az network vnet-gateway revoked-cert
-  summary: Manage revoked certificates in a virtual network gateway.
-- uid: az_network_vnet_gateway_revoked_cert_create
-  name: az network vnet-gateway revoked-cert create
-  summary: Revoke a certificate.
-- uid: az_network_vnet_gateway_revoked_cert_delete
-  name: az network vnet-gateway revoked-cert delete
-  summary: Delete a revoked certificate.
-- uid: az_network_vnet_gateway_root_cert
-  name: az network vnet-gateway root-cert
-  summary: Manage root certificates of a virtual network gateway.
-- uid: az_network_vnet_gateway_root_cert_create
-  name: az network vnet-gateway root-cert create
-  summary: Upload a root certificate.
-- uid: az_network_vnet_gateway_root_cert_delete
-  name: az network vnet-gateway root-cert delete
-  summary: Delete a root certificate.
-- uid: az_network_vnet_gateway_show
-  name: az network vnet-gateway show
-  summary: Get the details of a virtual network gateway.
-- uid: az_network_vnet_gateway_update
-  name: az network vnet-gateway update
-  summary: Update a virtual network gateway.
-- uid: az_network_vnet_gateway_vpn_client
-  name: az network vnet-gateway vpn-client
-  summary: Download a VPN client configuration required to connect to Azure via point-to-site.
-- uid: az_network_vnet_gateway_vpn_client_generate
-  name: az network vnet-gateway vpn-client generate
-  summary: Generate VPN client configuration.
-- uid: az_network_vnet_gateway_vpn_client_show_url
-  name: az network vnet-gateway vpn-client show-url
-  summary: Retrieve a pre-generated VPN client configuration.
-- uid: az_network_vnet_gateway_wait
-  name: az network vnet-gateway wait
-  summary: Place the CLI in a waiting state until a condition of the virtual network gateway is met.
+- az_network_vnet-gateway_create
+- az_network_vnet-gateway_delete
+- az_network_vnet-gateway_list
+- az_network_vnet-gateway_list-advertised-routes
+- az_network_vnet-gateway_list-bgp-peer-status
+- az_network_vnet-gateway_list-learned-routes
+- az_network_vnet-gateway_reset
+- az_network_vnet-gateway_revoked-cert
+- az_network_vnet-gateway_revoked-cert_create
+- az_network_vnet-gateway_revoked-cert_delete
+- az_network_vnet-gateway_root-cert
+- az_network_vnet-gateway_root-cert_create
+- az_network_vnet-gateway_root-cert_delete
+- az_network_vnet-gateway_show
+- az_network_vnet-gateway_show-supported-devices
+- az_network_vnet-gateway_update
+- az_network_vnet-gateway_vpn-client
+- az_network_vnet-gateway_vpn-client_generate
+- az_network_vnet-gateway_vpn-client_show-url
+- az_network_vnet-gateway_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -556,10 +554,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Azure Virtual Network Gateways, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Azure Virtual Network Gateways, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml
index 2ba649e9ce..af65bade8c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/revoked-cert.yml
@@ -1,27 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway_revoked_cert
-  name: az network vnet-gateway revoked-cert
-  summary: Manage revoked certificates in a virtual network gateway.
-  description: Prevent machines using this certificate from accessing Azure through this gateway.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_revoked_cert_create
-  - az_network_vnet_gateway_revoked_cert_delete
-- uid: az_network_vnet_gateway_revoked_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway_revoked-cert
+name: az network vnet-gateway revoked-cert
+summary: Manage revoked certificates in a virtual network gateway.
+description: Prevent machines using this certificate from accessing Azure through this gateway.
+directCommands:
+- uid: az_network_vnet-gateway_revoked-cert_create
   name: az network vnet-gateway revoked-cert create
   summary: Revoke a certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway revoked-cert create --gateway-name
+                                                --name
+                                                --resource-group
+                                                --thumbprint
+                                                [--subscription]
   examples:
   - summary: Revoke a certificate.
-    syntax:
-      content: >-
-        az network vnet-gateway revoked-cert create -g MyResourceGroup -n MyRootCertificate \
-            --gateway-name MyVnetGateway --thumbprint abc123
-  parameters:
+    syntax: >-
+      az network vnet-gateway revoked-cert create -g MyResourceGroup -n MyRootCertificate \
+          --gateway-name MyVnetGateway --thumbprint abc123
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -32,35 +30,32 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --thumbprint
     summary: Certificate thumbprint.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_revoked_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_revoked-cert_delete
   name: az network vnet-gateway revoked-cert delete
   summary: Delete a revoked certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway revoked-cert delete --gateway-name
+                                                --name
+                                                --resource-group
+                                                [--subscription]
   examples:
   - summary: Delete a revoked certificate.
-    syntax:
-      content: az network vnet-gateway revoked-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
+    syntax: az network vnet-gateway revoked-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
   - summary: Delete a revoked certificate. (autogenerated)
-    syntax:
-      content: az network vnet-gateway revoked-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vnet-gateway revoked-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -71,24 +66,16 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_revoked_cert_create
-  name: az network vnet-gateway revoked-cert create
-  summary: Revoke a certificate.
-- uid: az_network_vnet_gateway_revoked_cert_delete
-  name: az network vnet-gateway revoked-cert delete
-  summary: Delete a revoked certificate.
+- az_network_vnet-gateway_revoked-cert_create
+- az_network_vnet-gateway_revoked-cert_delete
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +91,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Prevent machines using this certificate from accessing Azure through this gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Prevent machines using this certificate from accessing Azure through this gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/root-cert.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/root-cert.yml
index 6e4e2febc1..cc643ec99e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/root-cert.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/root-cert.yml
@@ -1,27 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway_root_cert
-  name: az network vnet-gateway root-cert
-  summary: Manage root certificates of a virtual network gateway.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_root_cert_create
-  - az_network_vnet_gateway_root_cert_delete
-- uid: az_network_vnet_gateway_root_cert_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway_root-cert
+name: az network vnet-gateway root-cert
+summary: Manage root certificates of a virtual network gateway.
+description: ''
+directCommands:
+- uid: az_network_vnet-gateway_root-cert_create
   name: az network vnet-gateway root-cert create
   summary: Upload a root certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway root-cert create --gateway-name
+                                             --name
+                                             --public-cert-data
+                                             --resource-group
+                                             [--subscription]
   examples:
   - summary: Add a Root Certificate to the list of certs allowed to connect to this Gateway.
-    syntax:
-      content: >-
-        az network vnet-gateway root-cert create -g MyResourceGroup -n MyRootCertificate \
-            --gateway-name MyVnetGateway --public-cert-data MyCertificateData
-  parameters:
+    syntax: >-
+      az network vnet-gateway root-cert create -g MyResourceGroup -n MyRootCertificate \
+          --gateway-name MyVnetGateway --public-cert-data MyCertificateData
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -36,31 +34,28 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_root_cert_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_root-cert_delete
   name: az network vnet-gateway root-cert delete
   summary: Delete a root certificate.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway root-cert delete --gateway-name
+                                             --name
+                                             --resource-group
+                                             [--subscription]
   examples:
   - summary: Remove a certificate from the list of Root Certificates whose children are allowed to access this Gateway.
-    syntax:
-      content: az network vnet-gateway root-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
+    syntax: az network vnet-gateway root-cert delete -g MyResourceGroup -n MyRootCertificate --gateway-name MyVnetGateway
   - summary: Delete a root certificate. (autogenerated)
-    syntax:
-      content: az network vnet-gateway root-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vnet-gateway root-cert delete --gateway-name MyVnetGateway --name MyRootCertificate --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --gateway-name
     summary: Virtual network gateway name.
@@ -71,24 +66,16 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_root_cert_create
-  name: az network vnet-gateway root-cert create
-  summary: Upload a root certificate.
-- uid: az_network_vnet_gateway_root_cert_delete
-  name: az network vnet-gateway root-cert delete
-  summary: Delete a root certificate.
+- az_network_vnet-gateway_root-cert_create
+- az_network_vnet-gateway_root-cert_delete
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +91,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage root certificates of a virtual network gateway.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage root certificates of a virtual network gateway.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/vpn-client.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/vpn-client.yml
index 1fe27c0572..14539487cf 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/vpn-client.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet-gateway/vpn-client.yml
@@ -1,31 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_gateway_vpn_client
-  name: az network vnet-gateway vpn-client
-  summary: Download a VPN client configuration required to connect to Azure via point-to-site.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_gateway_vpn_client_generate
-  - az_network_vnet_gateway_vpn_client_show_url
-- uid: az_network_vnet_gateway_vpn_client_generate
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet-gateway_vpn-client
+name: az network vnet-gateway vpn-client
+summary: Download a VPN client configuration required to connect to Azure via point-to-site.
+description: ''
+directCommands:
+- uid: az_network_vnet-gateway_vpn-client_generate
   name: az network vnet-gateway vpn-client generate
   summary: Generate VPN client configuration.
   description: The command outputs a URL to a zip file for the generated VPN client configuration.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway vpn-client generate [--authentication-method {EAPMSCHAPv2, EAPTLS}]
+                                                [--client-root-certificates]
+                                                [--ids]
+                                                [--name]
+                                                [--processor-architecture {Amd64, X86}]
+                                                [--radius-server-auth-certificate]
+                                                [--resource-group]
+                                                [--subscription]
+                                                [--use-legacy {false, true}]
   examples:
   - summary: Create the VPN client configuration for RADIUS with EAP-MSCHAV2 authentication.
-    syntax:
-      content: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --authentication-method EAPMSCHAPv2
+    syntax: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --authentication-method EAPMSCHAPv2
   - summary: Create the VPN client configuration for AMD64 architecture.
-    syntax:
-      content: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --processor-architecture Amd64
+    syntax: az network vnet-gateway vpn-client generate -g MyResourceGroup -n MyVnetGateway --processor-architecture Amd64
   - summary: Generate VPN client configuration. (autogenerated)
-    syntax:
-      content: az network vnet-gateway vpn-client generate --name MyVnetGateway --processor-architecture Amd64 --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vnet-gateway vpn-client generate --name MyVnetGateway --processor-architecture Amd64 --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --authentication-method
     parameterValueGroup: EAPMSCHAPv2, EAPTLS
     summary: Method used to authenticate with the generated client.
@@ -33,6 +33,12 @@ items:
   - name: --client-root-certificates
     summary: Space-separated list of client root certificate public certificate data in Base-64 format. Optional for external Radius-based auth with EAPTLS.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Name of the VNet gateway.
+    description: ''
   - name: --processor-architecture
     parameterValueGroup: Amd64, X86
     summary: Processor architecture of the target system.
@@ -40,39 +46,30 @@ items:
   - name: --radius-server-auth-certificate
     summary: Public certificate data for the Radius server auth certificate in Base-64 format. Required only if external Radius auth has been configured with EAPTLS auth.
     description: ''
-  - name: --use-legacy
-    parameterValueGroup: false, true
-    summary: Generate VPN client package using legacy implementation.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the VNet gateway.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_gateway_vpn_client_show_url
+  - name: --use-legacy
+    parameterValueGroup: false, true
+    summary: Generate VPN client package using legacy implementation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet-gateway_vpn-client_show-url
   name: az network vnet-gateway vpn-client show-url
   summary: Retrieve a pre-generated VPN client configuration.
   description: The profile needs to be generated first using vpn-client generate command.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet-gateway vpn-client show-url [--ids]
+                                                [--name]
+                                                [--resource-group]
+                                                [--subscription]
   examples:
   - summary: Get the pre-generated point-to-site VPN client of the virtual network gateway.
-    syntax:
-      content: az network vnet-gateway vpn-client show-url -g MyResourceGroup -n MyVnetGateway
-  parameters:
+    syntax: az network vnet-gateway vpn-client show-url -g MyResourceGroup -n MyVnetGateway
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -80,24 +77,15 @@ items:
     summary: Name of the VNet gateway.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_gateway_vpn_client_generate
-  name: az network vnet-gateway vpn-client generate
-  summary: Generate VPN client configuration.
-- uid: az_network_vnet_gateway_vpn_client_show_url
-  name: az network vnet-gateway vpn-client show-url
-  summary: Retrieve a pre-generated VPN client configuration.
+- az_network_vnet-gateway_vpn-client_generate
+- az_network_vnet-gateway_vpn-client_show-url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -113,10 +101,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Download a VPN client configuration required to connect to Azure via point-to-site.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Download a VPN client configuration required to connect to Azure via point-to-site.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet.yml
index 9f30c08968..9e2822df01 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet.yml
@@ -1,35 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet
-  name: az network vnet
-  summary: Manage Azure Virtual Networks.
-  description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_check_ip_address
-  - az_network_vnet_create
-  - az_network_vnet_delete
-  - az_network_vnet_list
-  - az_network_vnet_list_available_ips
-  - az_network_vnet_list_endpoint_services
-  - az_network_vnet_show
-  - az_network_vnet_update
-- uid: az_network_vnet_check_ip_address
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet
+name: az network vnet
+summary: Manage Azure Virtual Networks.
+description: To learn more about Virtual Networks visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network.
+directCommands:
+- uid: az_network_vnet_check-ip-address
   name: az network vnet check-ip-address
   summary: Check if a private IP address is available for use within a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet check-ip-address --ip-address
+                                     [--ids]
+                                     [--name]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: Check whether 10.0.0.4 is available within MyVnet.
-    syntax:
-      content: az network vnet check-ip-address -g MyResourceGroup -n MyVnet --ip-address 10.0.0.4
-  parameters:
+    syntax: az network vnet check-ip-address -g MyResourceGroup -n MyVnet --ip-address 10.0.0.4
+  requiredParameters:
   - isRequired: true
     name: --ip-address
     summary: The private IP address to be verified.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -37,44 +30,49 @@ items:
     summary: The virtual network (VNet) name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_create
   name: az network vnet create
   summary: Create a virtual network.
-  description: You may also create a subnet at the same time by specifying a subnet name and (optionally) an address prefix. To learn about how to create a virtual network visit <a href="https://docs.microsoft.com/azure/virtual-network/manage-virtual-network#create-a-virtual-network">https://docs.microsoft.com/azure/virtual-network/manage-virtual-network#create-a-virtual-network</a>.
-  langs:
-  - azurecli
+  description: You may also create a subnet at the same time by specifying a subnet name and (optionally) an address prefix. To learn about how to create a virtual network visit https://docs.microsoft.com/azure/virtual-network/manage-virtual-network#create-a-virtual-network.
+  syntax: >-
+    az network vnet create --name
+                           --resource-group
+                           [--address-prefixes]
+                           [--ddos-protection {false, true}]
+                           [--defer]
+                           [--dns-servers]
+                           [--location]
+                           [--network-security-group]
+                           [--subnet-name]
+                           [--subnet-prefix]
+                           [--subscription]
+                           [--tags]
+                           [--vm-protection {false, true}]
   examples:
   - summary: Create a virtual network.
-    syntax:
-      content: az network vnet create -g MyResourceGroup -n MyVnet
+    syntax: az network vnet create -g MyResourceGroup -n MyVnet
   - summary: Create a virtual network with a specific address prefix and one subnet.
-    syntax:
-      content: >-
-        az network vnet create -g MyResourceGroup -n MyVnet --address-prefix 10.0.0.0/16 \
-            --subnet-name MySubnet --subnet-prefix 10.0.0.0/24
+    syntax: >-
+      az network vnet create -g MyResourceGroup -n MyVnet --address-prefix 10.0.0.0/16 \
+          --subnet-name MySubnet --subnet-prefix 10.0.0.0/24
   - summary: Create a virtual network. (autogenerated)
-    syntax:
-      content: az network vnet create --address-prefixes 10.0.0.0/16 --name MyVirtualNetwork --resource-group MyResourceGroup --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
-  parameters:
+    syntax: az network vnet create --address-prefixes 10.0.0.0/16 --name MyVirtualNetwork --resource-group MyResourceGroup --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The virtual network (VNet) name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --address-prefixes
     defaultValue: 10.0.0.0/16
     summary: Space-separated list of IP address prefixes for the VNet.
@@ -90,14 +88,10 @@ items:
     summary: Space-separated list of DNS server IP addresses.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --vm-protection
-    parameterValueGroup: false, true
-    summary: Enable VM protection for all subnets in the VNet.
+  - name: --network-security-group --nsg
+    summary: Name or ID of a network security group (NSG).
     description: ''
   - name: --subnet-name
     summary: Name of a new subnet to create within the VNet.
@@ -108,23 +102,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vm-protection
+    parameterValueGroup: false, true
+    summary: Enable VM protection for all subnets in the VNet.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_delete
   name: az network vnet delete
   summary: Delete a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet delete [--ids]
+                           [--name]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Delete a virtual network.
-    syntax:
-      content: az network vnet delete -g MyResourceGroup -n myVNet
-  parameters:
+    syntax: az network vnet delete -g MyResourceGroup -n myVNet
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -132,57 +130,51 @@ items:
     summary: The virtual network (VNet) name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_list
   name: az network vnet list
   summary: List virtual networks.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet list [--query-examples]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: List all virtual networks in a subscription.
-    syntax:
-      content: az network vnet list
+    syntax: az network vnet list
   - summary: List all virtual networks in a resource group.
-    syntax:
-      content: az network vnet list -g MyResourceGroup
+    syntax: az network vnet list -g MyResourceGroup
   - summary: List virtual networks in a subscription which specify a certain address prefix.
-    syntax:
-      content: az network vnet list --query "[?contains(addressSpace.addressPrefixes, '10.0.0.0/16')]"
-  parameters:
+    syntax: az network vnet list --query "[?contains(addressSpace.addressPrefixes, '10.0.0.0/16')]"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_list_available_ips
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet_list-available-ips
   name: az network vnet list-available-ips
   summary: List some available ips in the vnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet list-available-ips [--ids]
+                                       [--name]
+                                       [--resource-group]
+                                       [--subscription]
   examples:
   - summary: List some available ips in the vnet.
-    syntax:
-      content: az network vnet list-available-ips -g MyResourceGroup -n MyVNet
-  parameters:
+    syntax: az network vnet list-available-ips -g MyResourceGroup -n MyVNet
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -190,52 +182,47 @@ items:
     summary: The virtual network (VNet) name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vnet_list_endpoint_services
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vnet_list-endpoint-services
   name: az network vnet list-endpoint-services
   summary: List which services support VNET service tunneling in a given region.
-  description: To learn more about service endpoints visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-configure#azure-cli">https://docs.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-configure#azure-cli</a>.
-  langs:
-  - azurecli
+  description: To learn more about service endpoints visit https://docs.microsoft.com/azure/virtual-network/virtual-network-service-endpoints-configure#azure-cli.
+  syntax: >-
+    az network vnet list-endpoint-services --location
+                                           [--subscription]
   examples:
   - summary: List the endpoint services available for use in the West US region.
-    syntax:
-      content: az network vnet list-endpoint-services -l westus -o table
-  parameters:
+    syntax: az network vnet list-endpoint-services -l westus -o table
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_show
   name: az network vnet show
   summary: Get the details of a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet show [--expand]
+                         [--ids]
+                         [--name]
+                         [--query-examples]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Get details for MyVNet.
-    syntax:
-      content: az network vnet show -g MyResourceGroup -n MyVNet
-  parameters:
+    syntax: az network vnet show -g MyResourceGroup -n MyVNet
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -245,32 +232,45 @@ items:
   - name: --name -n
     summary: The virtual network (VNet) name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_update
   name: az network vnet update
   summary: Update a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet update [--add]
+                           [--address-prefixes]
+                           [--ddos-protection {false, true}]
+                           [--defer]
+                           [--dns-servers]
+                           [--force-string]
+                           [--ids]
+                           [--name]
+                           [--remove]
+                           [--resource-group]
+                           [--set]
+                           [--subscription]
+                           [--vm-protection {false, true}]
   examples:
   - summary: Update a virtual network with the IP address of a DNS server.
-    syntax:
-      content: az network vnet update -g MyResourceGroup -n MyVNet --dns-servers 10.2.0.8
+    syntax: az network vnet update -g MyResourceGroup -n MyVNet --dns-servers 10.2.0.8
+  - summary: Update a virtual network to delete DNS server.
+    syntax: az network vnet update -g MyResourceGroup -n MyVNet --dns-servers ''
   - summary: Update a virtual network. (autogenerated)
-    syntax:
-      content: az network vnet update --address-prefixes 40.1.0.0/24 --name MyVNet --resource-group MyResourceGroup
-  parameters:
+    syntax: az network vnet update --address-prefixes 40.1.0.0/24 --name MyVNet --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-prefixes
     summary: Space-separated list of IP address prefixes for the VNet.
     description: ''
@@ -284,9 +284,8 @@ items:
   - name: --dns-servers
     summary: Space-separated list of DNS server IP addresses.
     description: ''
-  - name: --vm-protection
-    parameterValueGroup: false, true
-    summary: Enable VM protection for all subnets in the VNet.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -294,91 +293,50 @@ items:
   - name: --name -n
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-protection
+    parameterValueGroup: false, true
+    summary: Enable VM protection for all subnets in the VNet.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_check_ip_address
-  name: az network vnet check-ip-address
-  summary: Check if a private IP address is available for use within a virtual network.
-- uid: az_network_vnet_create
-  name: az network vnet create
-  summary: Create a virtual network.
-- uid: az_network_vnet_delete
-  name: az network vnet delete
-  summary: Delete a virtual network.
-- uid: az_network_vnet_list
-  name: az network vnet list
-  summary: List virtual networks.
-- uid: az_network_vnet_list_available_ips
-  name: az network vnet list-available-ips
-  summary: List some available ips in the vnet.
-- uid: az_network_vnet_list_endpoint_services
-  name: az network vnet list-endpoint-services
-  summary: List which services support VNET service tunneling in a given region.
-- uid: az_network_vnet_peering
-  name: az network vnet peering
-  summary: Manage peering connections between Azure Virtual Networks.
-- uid: az_network_vnet_peering_create
-  name: az network vnet peering create
-  summary: Create a virtual network peering connection.
-- uid: az_network_vnet_peering_delete
-  name: az network vnet peering delete
-  summary: Delete a peering.
-- uid: az_network_vnet_peering_list
-  name: az network vnet peering list
-  summary: List peerings.
-- uid: az_network_vnet_peering_show
-  name: az network vnet peering show
-  summary: Show details of a peering.
-- uid: az_network_vnet_peering_update
-  name: az network vnet peering update
-  summary: Update a peering.
-- uid: az_network_vnet_show
-  name: az network vnet show
-  summary: Get the details of a virtual network.
-- uid: az_network_vnet_subnet
-  name: az network vnet subnet
-  summary: Manage subnets in an Azure Virtual Network.
-- uid: az_network_vnet_subnet_create
-  name: az network vnet subnet create
-  summary: Create a subnet and associate an existing NSG and route table.
-- uid: az_network_vnet_subnet_delete
-  name: az network vnet subnet delete
-  summary: Delete a subnet.
-- uid: az_network_vnet_subnet_list
-  name: az network vnet subnet list
-  summary: List the subnets in a virtual network.
-- uid: az_network_vnet_subnet_show
-  name: az network vnet subnet show
-  summary: Show details of a subnet.
-- uid: az_network_vnet_subnet_update
-  name: az network vnet subnet update
-  summary: Update a subnet.
-- uid: az_network_vnet_update
-  name: az network vnet update
-  summary: Update a virtual network.
+- az_network_vnet_check-ip-address
+- az_network_vnet_create
+- az_network_vnet_delete
+- az_network_vnet_list
+- az_network_vnet_list-available-ips
+- az_network_vnet_list-endpoint-services
+- az_network_vnet_peering
+- az_network_vnet_peering_create
+- az_network_vnet_peering_delete
+- az_network_vnet_peering_list
+- az_network_vnet_peering_show
+- az_network_vnet_peering_update
+- az_network_vnet_show
+- az_network_vnet_subnet
+- az_network_vnet_subnet_create
+- az_network_vnet_subnet_delete
+- az_network_vnet_subnet_list
+- az_network_vnet_subnet_show
+- az_network_vnet_subnet_update
+- az_network_vnet_tap
+- az_network_vnet_tap_create
+- az_network_vnet_tap_delete
+- az_network_vnet_tap_list
+- az_network_vnet_tap_show
+- az_network_vnet_tap_update
+- az_network_vnet_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -394,10 +352,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about Virtual Networks visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about Virtual Networks visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet/peering.yml
index 3770851a58..8684296065 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet/peering.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet/peering.yml
@@ -1,30 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_peering
-  name: az network vnet peering
-  summary: Manage peering connections between Azure Virtual Networks.
-  description: To learn more about virtual network peering visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-peering">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-peering</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_peering_create
-  - az_network_vnet_peering_delete
-  - az_network_vnet_peering_list
-  - az_network_vnet_peering_show
-  - az_network_vnet_peering_update
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet_peering
+name: az network vnet peering
+summary: Manage peering connections between Azure Virtual Networks.
+description: To learn more about virtual network peering visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-peering.
+directCommands:
 - uid: az_network_vnet_peering_create
   name: az network vnet peering create
   summary: Create a virtual network peering connection.
   description: To successfully peer two virtual networks this command must be called twice with the values for --vnet-name and --remote-vnet reversed.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet peering create --name
+                                   --remote-vnet
+                                   --resource-group
+                                   --vnet-name
+                                   [--allow-forwarded-traffic]
+                                   [--allow-gateway-transit]
+                                   [--allow-vnet-access]
+                                   [--subscription]
+                                   [--use-remote-gateways]
   examples:
   - summary: Create a peering connection between two virtual networks.
-    syntax:
-      content: >-
-        az network vnet peering create -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 \
-            --remote-vnet MyVnet2Id --allow-vnet-access
-  parameters:
+    syntax: >-
+      az network vnet peering create -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 \
+          --remote-vnet MyVnet2Id --allow-vnet-access
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the VNet peering.
@@ -35,12 +34,13 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
+  optionalParameters:
   - name: --allow-forwarded-traffic
     summary: Allows forwarded traffic from the local VNet to the remote VNet.
     description: ''
@@ -50,29 +50,27 @@ items:
   - name: --allow-vnet-access
     summary: Allows access from the local VNet to the remote VNet.
     description: ''
-  - name: --use-remote-gateways
-    summary: Allows VNet to use the remote VNet's gateway. Remote VNet gateway must have --allow-gateway-transit enabled for remote peering. Only 1 peering can have this flag enabled. Cannot be set if the VNet already has a gateway.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --use-remote-gateways
+    summary: Allows VNet to use the remote VNet's gateway. Remote VNet gateway must have --allow-gateway-transit enabled for remote peering. Only 1 peering can have this flag enabled. Cannot be set if the VNet already has a gateway.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_peering_delete
   name: az network vnet peering delete
   summary: Delete a peering.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet peering delete [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
+                                   [--vnet-name]
   examples:
   - summary: Delete a virtual network peering connection.
-    syntax:
-      content: az network vnet peering delete -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1
-  parameters:
+    syntax: az network vnet peering delete -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -80,7 +78,7 @@ items:
     summary: The name of the VNet peering.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -88,59 +86,62 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_peering_list
   name: az network vnet peering list
   summary: List peerings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet peering list --resource-group
+                                 --vnet-name
+                                 [--query-examples]
+                                 [--subscription]
   examples:
   - summary: List all peerings of a specified virtual network.
-    syntax:
-      content: az network vnet peering list -g MyResourceGroup --vnet-name MyVnet1
-  parameters:
+    syntax: az network vnet peering list -g MyResourceGroup --vnet-name MyVnet1
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_peering_show
   name: az network vnet peering show
   summary: Show details of a peering.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet peering show [--ids]
+                                 [--name]
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--vnet-name]
   examples:
   - summary: Show all details of the specified virtual network peering.
-    syntax:
-      content: az network vnet peering show -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1
-  parameters:
+    syntax: az network vnet peering show -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the VNet peering.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -148,40 +149,51 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_peering_update
   name: az network vnet peering update
   summary: Update a peering.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet peering update [--add]
+                                   [--force-string]
+                                   [--ids]
+                                   [--name]
+                                   [--remove]
+                                   [--resource-group]
+                                   [--set]
+                                   [--subscription]
+                                   [--vnet-name]
   examples:
   - summary: Change forwarded traffic configuration of a virtual network peering.
-    syntax:
-      content: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set allowForwardedTraffic=true
+    syntax: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set allowForwardedTraffic=true
   - summary: Change virtual network access of a virtual network peering.
-    syntax:
-      content: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set allowVirtualNetworkAccess=true
+    syntax: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set allowVirtualNetworkAccess=true
   - summary: Change gateway transit property configuration of a virtual network peering.
-    syntax:
-      content: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set allowGatewayTransit=true
+    syntax: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set allowGatewayTransit=true
   - summary: Use remote gateways in virtual network peering.
-    syntax:
-      content: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set useRemoteGateways=true
-  parameters:
+    syntax: az network vnet peering update -g MyResourceGroup -n MyVnet1ToMyVnet2 --vnet-name MyVnet1 --set useRemoteGateways=true
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the VNet peering.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -189,40 +201,13 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_peering_create
-  name: az network vnet peering create
-  summary: Create a virtual network peering connection.
-- uid: az_network_vnet_peering_delete
-  name: az network vnet peering delete
-  summary: Delete a peering.
-- uid: az_network_vnet_peering_list
-  name: az network vnet peering list
-  summary: List peerings.
-- uid: az_network_vnet_peering_show
-  name: az network vnet peering show
-  summary: Show details of a peering.
-- uid: az_network_vnet_peering_update
-  name: az network vnet peering update
-  summary: Update a peering.
+- az_network_vnet_peering_create
+- az_network_vnet_peering_delete
+- az_network_vnet_peering_list
+- az_network_vnet_peering_show
+- az_network_vnet_peering_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -238,10 +223,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about virtual network peering visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-peering">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-peering</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about virtual network peering visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet/subnet.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet/subnet.yml
index 69d9ea9f2c..5b78e147ca 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vnet/subnet.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet/subnet.yml
@@ -1,33 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vnet_subnet
-  name: az network vnet subnet
-  summary: Manage subnets in an Azure Virtual Network.
-  description: To learn more about subnets visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vnet_subnet_create
-  - az_network_vnet_subnet_delete
-  - az_network_vnet_subnet_list
-  - az_network_vnet_subnet_show
-  - az_network_vnet_subnet_update
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet_subnet
+name: az network vnet subnet
+summary: Manage subnets in an Azure Virtual Network.
+description: To learn more about subnets visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
+directCommands:
 - uid: az_network_vnet_subnet_create
   name: az network vnet subnet create
   summary: Create a subnet and associate an existing NSG and route table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet create --address-prefix
+                                  --name
+                                  --resource-group
+                                  --vnet-name
+                                  [--defer]
+                                  [--delegations]
+                                  [--network-security-group]
+                                  [--route-table]
+                                  [--service-endpoints]
+                                  [--subscription]
   examples:
   - summary: Create new subnet attached to an NSG with a custom route table.
-    syntax:
-      content: >-
-        az network vnet subnet create -g MyResourceGroup --vnet-name MyVnet -n MySubnet \
-            --address-prefixes 10.0.0.0/24 --network-security-group MyNsg --route-table MyRouteTable
+    syntax: >-
+      az network vnet subnet create -g MyResourceGroup --vnet-name MyVnet -n MySubnet \
+          --address-prefixes 10.0.0.0/24 --network-security-group MyNsg --route-table MyRouteTable
   - summary: Create new subnet attached to a NAT gateway.
-    syntax:
-      content: az network vnet subnet create -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
-  parameters:
+    syntax: az network vnet subnet create -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
+  requiredParameters:
   - isRequired: true
     name: --address-prefix
     summary: Address prefix in CIDR format.
@@ -38,19 +37,20 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
+  optionalParameters:
   - name: --defer
     summary: Temporarily store the object in the local cache instead of sending to Azure. Use `az cache` commands to view/clear.
     description: ''
   - name: --delegations
     summary: Space-separated list of services to whom the subnet should be delegated. (e.g. Microsoft.Sql/servers).
     description: ''
-  - name: --network-security-group
+  - name: --network-security-group --nsg
     summary: Name or ID of a network security group (NSG).
     description: ''
   - name: --route-table
@@ -63,26 +63,23 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_delete
   name: az network vnet subnet delete
   summary: Delete a subnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet delete [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--vnet-name]
   examples:
   - summary: Delete a subnet.
-    syntax:
-      content: az network vnet subnet delete -g MyResourceGroup -n MySubnet
+    syntax: az network vnet subnet delete -g MyResourceGroup -n MySubnet
   - summary: Delete a subnet. (autogenerated)
-    syntax:
-      content: az network vnet subnet delete --name MySubnet --resource-group MyResourceGroup --vnet-name MyVnet
-  parameters:
+    syntax: az network vnet subnet delete --name MySubnet --resource-group MyResourceGroup --vnet-name MyVnet
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -90,7 +87,7 @@ items:
     summary: The subnet name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -98,51 +95,52 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_list
   name: az network vnet subnet list
   summary: List the subnets in a virtual network.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet list --resource-group
+                                --vnet-name
+                                [--query-examples]
+                                [--subscription]
   examples:
   - summary: List the subnets in a virtual network.
-    syntax:
-      content: az network vnet subnet list -g MyResourceGroup --vnet-name MyVNet
-  parameters:
+    syntax: az network vnet subnet list -g MyResourceGroup --vnet-name MyVNet
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_show
   name: az network vnet subnet show
   summary: Show details of a subnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet show [--expand]
+                                [--ids]
+                                [--name]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
+                                [--vnet-name]
   examples:
   - summary: Show the details of a subnet associated with a virtual network.
-    syntax:
-      content: az network vnet subnet show -g MyResourceGroup -n MySubnet --vnet-name MyVNet
-  parameters:
+    syntax: az network vnet subnet show -g MyResourceGroup -n MySubnet --vnet-name MyVNet
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -152,8 +150,11 @@ items:
   - name: --name -n
     summary: The subnet name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -161,94 +162,84 @@ items:
   - name: --vnet-name
     summary: The virtual network (VNet) name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vnet_subnet_update
   name: az network vnet subnet update
   summary: Update a subnet.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vnet subnet update [--add]
+                                  [--address-prefix]
+                                  [--delegations]
+                                  [--force-string]
+                                  [--ids]
+                                  [--name]
+                                  [--network-security-group]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--route-table]
+                                  [--service-endpoints]
+                                  [--set]
+                                  [--subscription]
+                                  [--vnet-name]
   examples:
   - summary: Associate a network security group to a subnet.
-    syntax:
-      content: az network vnet subnet update -g MyResourceGroup -n MySubnet --vnet-name MyVNet --network-security-group MyNsg
+    syntax: az network vnet subnet update -g MyResourceGroup -n MySubnet --vnet-name MyVNet --network-security-group MyNsg
   - summary: Update subnet with NAT gateway.
-    syntax:
-      content: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
+    syntax: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --nat-gateway MyNatGateway --address-prefixes "10.0.0.0/21"
   - summary: Disable the private endpoint network policies
-    syntax:
-      content: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --disable-private-endpoint-network-policies
-  parameters:
+    syntax: az network vnet subnet update -n MySubnet --vnet-name MyVnet -g MyResourceGroup --disable-private-endpoint-network-policies
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --address-prefix
     summary: Address prefix in CIDR format.
     description: ''
   - name: --delegations
     summary: Space-separated list of services to whom the subnet should be delegated. (e.g. Microsoft.Sql/servers).
     description: ''
-  - name: --network-security-group
-    summary: Name or ID of a network security group (NSG). Use empty string "" to detach it.
-    description: ''
-  - name: --route-table
-    summary: Name or ID of a route table to associate with the subnet. Use empty string "" to detach it. You can also append "--remove routeTable" in "az network vnet subnet update" to detach it.
-    description: ''
-  - name: --service-endpoints
-    summary: Space-separated list of services allowed private access to this subnet.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
-    valueFrom: az network vnet list-endpoint-services
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The subnet name.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  - name: --network-security-group --nsg
+    summary: Name or ID of a network security group (NSG). Use empty string ""('""' in PowerShell) to detach it.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --vnet-name
-    summary: The virtual network (VNet) name.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --route-table
+    summary: Name or ID of a route table to associate with the subnet. Use empty string ""('""' in PowerShell) to detach it. You can also append "--remove routeTable" in "az network vnet subnet update" to detach it.
     description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+  - name: --service-endpoints
+    summary: Space-separated list of services allowed private access to this subnet.
     description: ''
+    valueFrom: az network vnet list-endpoint-services
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vnet-name
+    summary: The virtual network (VNet) name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vnet_subnet_create
-  name: az network vnet subnet create
-  summary: Create a subnet and associate an existing NSG and route table.
-- uid: az_network_vnet_subnet_delete
-  name: az network vnet subnet delete
-  summary: Delete a subnet.
-- uid: az_network_vnet_subnet_list
-  name: az network vnet subnet list
-  summary: List the subnets in a virtual network.
-- uid: az_network_vnet_subnet_show
-  name: az network vnet subnet show
-  summary: Show details of a subnet.
-- uid: az_network_vnet_subnet_update
-  name: az network vnet subnet update
-  summary: Update a subnet.
+- az_network_vnet_subnet_create
+- az_network_vnet_subnet_delete
+- az_network_vnet_subnet_list
+- az_network_vnet_subnet_show
+- az_network_vnet_subnet_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -264,10 +255,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: To learn more about subnets visit <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet">https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: To learn more about subnets visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vnet/tap.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vnet/tap.yml
new file mode 100644
index 0000000000..a98cce60bd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vnet/tap.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vnet_tap
+name: az network vnet tap
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-network-tap** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az network vnet tap** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual network taps.
+description: ''
+directCommands:
+- uid: az_network_vnet_tap_create
+  name: az network vnet tap create
+  summary: Create a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap create --destination
+                               --name
+                               --resource-group
+                               [--location]
+                               [--port]
+                               [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --destination
+    summary: ID of the ILB or NIC IP configuration to receive the tap.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --port
+    summary: The VXLAN port that will receive the tapped traffic.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_vnet_tap_delete
+  name: az network vnet tap delete
+  summary: Delete a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vnet_tap_list
+  name: az network vnet tap list
+  summary: List virtual network taps.
+  description: ''
+  syntax: az network vnet tap list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vnet_tap_show
+  name: az network vnet tap show
+  summary: Get the details of a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap show --name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vnet_tap_update
+  name: az network vnet tap update
+  summary: Update settings of a virtual network tap.
+  description: ''
+  syntax: >-
+    az network vnet tap update --name
+                               --resource-group
+                               [--add]
+                               [--force-string]
+                               [--remove]
+                               [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VNet TAP.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_network_vnet_tap_create
+- az_network_vnet_tap_delete
+- az_network_vnet_tap_list
+- az_network_vnet_tap_show
+- az_network_vnet_tap_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual network taps.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection.yml
index ba838dab5d..6b24c037d0 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection.yml
@@ -1,54 +1,66 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vpn_connection
-  name: az network vpn-connection
-  summary: Manage VPN connections.
-  description: For more information on site-to-site connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>. For more information on Vnet-to-Vnet connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_vpn_connection_create
-  - az_network_vpn_connection_delete
-  - az_network_vpn_connection_list
-  - az_network_vpn_connection_show
-  - az_network_vpn_connection_update
-- uid: az_network_vpn_connection_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-connection
+name: az network vpn-connection
+summary: Manage VPN connections.
+description: For more information on site-to-site connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli. For more information on Vnet-to-Vnet connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli.
+directCommands:
+- uid: az_network_vpn-connection_create
   name: az network vpn-connection create
   summary: Create a VPN connection.
   description: The VPN Gateway and Local Network Gateway must be provisioned before creating the connection between them.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection create --name
+                                     --resource-group
+                                     --vnet-gateway1
+                                     [--authorization-key]
+                                     [--enable-bgp]
+                                     [--express-route-circuit2]
+                                     [--local-gateway2]
+                                     [--location]
+                                     [--routing-weight]
+                                     [--shared-key]
+                                     [--subscription]
+                                     [--tags]
+                                     [--use-policy-based-traffic-selectors {false, true}]
+                                     [--validate]
+                                     [--vnet-gateway2]
   examples:
   - summary: Create a site-to-site connection between an Azure virtual network and an on-premises local network gateway.
-    syntax:
-      content: az network vpn-connection create -g MyResourceGroup -n MyConnection --vnet-gateway1 MyVnetGateway --local-gateway2 MyLocalGateway --shared-key Abc123
+    syntax: az network vpn-connection create -g MyResourceGroup -n MyConnection --vnet-gateway1 MyVnetGateway --local-gateway2 MyLocalGateway --shared-key Abc123
+  - summary: Create a VPN connection with --ingress-nat-rule.
+    syntax: az network vpn-connection create -g MyResourceGroup -n MyConnection --vnet-gateway1 MyVnetGateway --local-gateway2 MyLocalGateway --shared-key Abc123 --ingress-nat-rule /subscriptions/000/resourceGroups/TestBGPRG1/providers/Microsoft.Network/virtualNetworkGateways/gwx/natRules/nat
   - summary: Create a VPN connection. (autogenerated)
-    syntax:
-      content: az network vpn-connection create --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway --vnet-gateway2 /subscriptions/{subscriptionID}/resourceGroups/TestBGPRG1/providers/Microsoft.Network/virtualNetworkGateways/VNet1GW
+    syntax: az network vpn-connection create --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway --vnet-gateway2 /subscriptions/{subscriptionID}/resourceGroups/TestBGPRG1/providers/Microsoft.Network/virtualNetworkGateways/VNet1GW
   - summary: Create a VPN connection. (autogenerated)
-    syntax:
-      content: az network vpn-connection create --local-gateway2 MyLocalGateway --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway
-  parameters:
+    syntax: az network vpn-connection create --local-gateway2 MyLocalGateway --location westus2 --name MyConnection --resource-group MyResourceGroup --shared-key Abc123 --vnet-gateway1 MyVnetGateway
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Connection name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vnet-gateway1
     summary: Name or ID of the source virtual network gateway.
     description: ''
+  optionalParameters:
   - name: --authorization-key
     summary: The authorization key for the VPN connection.
     description: ''
   - name: --enable-bgp
     summary: Enable BGP for this VPN connection.
     description: ''
+  - name: --express-route-circuit2
+    summary: Name or ID of the destination ExpressRoute to connect to using an 'ExpressRoute' connection.
+    description: ''
+  - name: --local-gateway2
+    summary: Name or ID of the destination local network gateway to connect to using an 'IPSec' connection.
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --routing-weight
     defaultValue: "10"
@@ -57,6 +69,9 @@ items:
   - name: --shared-key
     summary: Shared IPSec key.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
@@ -67,35 +82,23 @@ items:
   - name: --validate
     summary: Display and validate the ARM template but do not create any resources.
     description: ''
-  - name: --express-route-circuit2
-    summary: Name or ID of the destination ExpressRoute to connect to using an 'ExpressRoute' connection.
-    description: ''
-  - name: --local-gateway2
-    summary: Name or ID of the destination local network gateway to connect to using an 'IPSec' connection.
-    description: ''
   - name: --vnet-gateway2
     summary: Name or ID of the destination virtual network gateway to connect to using a 'Vnet2Vnet' connection.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_delete
   name: az network vpn-connection delete
   summary: Delete a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection delete [--ids]
+                                     [--name]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: Delete a VPN connection.
-    syntax:
-      content: az network vpn-connection delete -g MyResourceGroup -n MyConnection
-  parameters:
+    syntax: az network vpn-connection delete -g MyResourceGroup -n MyConnection
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -103,101 +106,101 @@ items:
     summary: Connection name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_list
   name: az network vpn-connection list
-  summary: List all VPN connections in a resource group.
+  summary: List all VPN connections.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection list --resource-group
+                                   [--query-examples]
+                                   [--subscription]
+                                   [--vnet-gateway]
   examples:
   - summary: List all VPN connections in a resource group.
-    syntax:
-      content: az network vpn-connection list -g MyResourceGroup
-  parameters:
+    syntax: az network vpn-connection list -g MyResourceGroup
+  - summary: List all VPN connections in a virtual network gateway.
+    syntax: az network vpn-connection list -g MyResourceGroup --vnet-gateway MyVnetGateway
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_show
+  - name: --vnet-gateway
+    summary: Name of the VNet gateway.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_show
   name: az network vpn-connection show
   summary: Get the details of a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection show [--ids]
+                                   [--name]
+                                   [--query-examples]
+                                   [--resource-group]
+                                   [--subscription]
   examples:
   - summary: View the details of a VPN connection.
-    syntax:
-      content: az network vpn-connection show -g MyResourceGroup -n MyConnection
-  parameters:
+    syntax: az network vpn-connection show -g MyResourceGroup -n MyConnection
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Connection name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_update
-  name: az network vpn-connection update
-  summary: Update a VPN connection.
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_show-device-config-script
+  name: az network vpn-connection show-device-config-script
+  summary: Get a XML format representation for VPN connection device configuration script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection show-device-config-script --device-family
+                                                        --firmware-version
+                                                        --vendor
+                                                        [--ids]
+                                                        [--name]
+                                                        [--resource-group]
+                                                        [--subscription]
   examples:
-  - summary: Add BGP to an existing connection.
-    syntax:
-      content: az network vpn-connection update -g MyResourceGroup -n MyConnection --enable-bgp True
-  - summary: Update a VPN connection. (autogenerated)
-    syntax:
-      content: az network vpn-connection update --name MyConnection --resource-group MyResourceGroup --use-policy-based-traffic-selectors true
-  parameters:
-  - name: --enable-bgp
-    parameterValueGroup: false, true
-    summary: Enable BGP (Border Gateway Protocol).
-    description: ''
-  - name: --routing-weight
-    summary: Connection routing weight.
-    description: ''
-  - name: --shared-key
-    summary: Shared IPSec key.
+  - summary: Get a XML format representation for VPN connection device configuration script.
+    syntax: az network vpn-connection show-device-config-script -g MyResourceGroup -n MyConnection --vendor "Cisco" --device-family "Cisco-ISR(IOS)" --firmware-version "Cisco-ISR-15.x--IKEv2+BGP"
+  requiredParameters:
+  - isRequired: true
+    name: --device-family
+    summary: The device family for the vpn device.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  - isRequired: true
+    name: --firmware-version
+    summary: The firmware version for the vpn device.
     description: ''
-  - name: --use-policy-based-traffic-selectors
-    parameterValueGroup: false, true
-    summary: Enable policy-based traffic selectors.
+  - isRequired: true
+    name: --vendor
+    summary: The vendor for the VPN device.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -205,69 +208,93 @@ items:
     summary: Connection name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_update
+  name: az network vpn-connection update
+  summary: Update a VPN connection.
+  description: ''
+  syntax: >-
+    az network vpn-connection update [--add]
+                                     [--enable-bgp {false, true}]
+                                     [--force-string]
+                                     [--ids]
+                                     [--name]
+                                     [--remove]
+                                     [--resource-group]
+                                     [--routing-weight]
+                                     [--set]
+                                     [--shared-key]
+                                     [--subscription]
+                                     [--tags]
+                                     [--use-policy-based-traffic-selectors {false, true}]
+  examples:
+  - summary: Add BGP to an existing connection.
+    syntax: az network vpn-connection update -g MyResourceGroup -n MyConnection --enable-bgp True
+  - summary: Update a VPN connection. (autogenerated)
+    syntax: az network vpn-connection update --name MyConnection --resource-group MyResourceGroup --use-policy-based-traffic-selectors true
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --enable-bgp
+    parameterValueGroup: false, true
+    summary: Enable BGP (Border Gateway Protocol).
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Connection name.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --routing-weight
+    summary: Connection routing weight.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --shared-key
+    summary: Shared IPSec key.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --use-policy-based-traffic-selectors
+    parameterValueGroup: false, true
+    summary: Enable policy-based traffic selectors.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vpn_connection_create
-  name: az network vpn-connection create
-  summary: Create a VPN connection.
-- uid: az_network_vpn_connection_delete
-  name: az network vpn-connection delete
-  summary: Delete a VPN connection.
-- uid: az_network_vpn_connection_ipsec_policy
-  name: az network vpn-connection ipsec-policy
-  summary: Manage VPN connection IPSec policies.
-- uid: az_network_vpn_connection_ipsec_policy_add
-  name: az network vpn-connection ipsec-policy add
-  summary: Add a VPN connection IPSec policy.
-- uid: az_network_vpn_connection_ipsec_policy_clear
-  name: az network vpn-connection ipsec-policy clear
-  summary: Delete all IPsec policies on a VPN connection.
-- uid: az_network_vpn_connection_ipsec_policy_list
-  name: az network vpn-connection ipsec-policy list
-  summary: List IPSec policies associated with a VPN connection.
-- uid: az_network_vpn_connection_list
-  name: az network vpn-connection list
-  summary: List all VPN connections in a resource group.
-- uid: az_network_vpn_connection_shared_key
-  name: az network vpn-connection shared-key
-  summary: Manage VPN shared keys.
-- uid: az_network_vpn_connection_shared_key_reset
-  name: az network vpn-connection shared-key reset
-  summary: Reset a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_show
-  name: az network vpn-connection shared-key show
-  summary: Retrieve a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_update
-  name: az network vpn-connection shared-key update
-  summary: Update a VPN connection shared key.
-- uid: az_network_vpn_connection_show
-  name: az network vpn-connection show
-  summary: Get the details of a VPN connection.
-- uid: az_network_vpn_connection_update
-  name: az network vpn-connection update
-  summary: Update a VPN connection.
+- az_network_vpn-connection_create
+- az_network_vpn-connection_delete
+- az_network_vpn-connection_ipsec-policy
+- az_network_vpn-connection_ipsec-policy_add
+- az_network_vpn-connection_ipsec-policy_clear
+- az_network_vpn-connection_ipsec-policy_list
+- az_network_vpn-connection_list
+- az_network_vpn-connection_shared-key
+- az_network_vpn-connection_shared-key_reset
+- az_network_vpn-connection_shared-key_show
+- az_network_vpn-connection_shared-key_update
+- az_network_vpn-connection_show
+- az_network_vpn-connection_show-device-config-script
+- az_network_vpn-connection_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -283,10 +310,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information on site-to-site connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli</a>. For more information on Vnet-to-Vnet connections, visit <a href="https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli">https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information on site-to-site connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-site-to-site-resource-manager-cli. For more information on Vnet-to-Vnet connections, visit https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-howto-vnet-vnet-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/ipsec-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/ipsec-policy.yml
index 93cd57069d..902fbc1ebc 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/ipsec-policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/ipsec-policy.yml
@@ -1,29 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vpn_connection_ipsec_policy
-  name: az network vpn-connection ipsec-policy
-  summary: Manage VPN connection IPSec policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vpn_connection_ipsec_policy_add
-  - az_network_vpn_connection_ipsec_policy_clear
-  - az_network_vpn_connection_ipsec_policy_list
-- uid: az_network_vpn_connection_ipsec_policy_add
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-connection_ipsec-policy
+name: az network vpn-connection ipsec-policy
+summary: Manage VPN connection IPSec policies.
+description: ''
+directCommands:
+- uid: az_network_vpn-connection_ipsec-policy_add
   name: az network vpn-connection ipsec-policy add
   summary: Add a VPN connection IPSec policy.
   description: Set all IPsec policies of a VPN connection. If you want to set any IPsec policy, you must set them all.
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection ipsec-policy add --connection-name
+                                               --dh-group {DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+                                               --ike-encryption {AES128, AES192, AES256, DES, DES3}
+                                               --ike-integrity {MD5, SHA1, SHA256, SHA384}
+                                               --ipsec-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None}
+                                               --ipsec-integrity {GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256}
+                                               --pfs-group {ECP256, ECP384, None, PFS1, PFS2, PFS2048, PFS24}
+                                               --resource-group
+                                               --sa-lifetime
+                                               --sa-max-size
+                                               [--no-wait]
+                                               [--subscription]
   examples:
   - summary: Add specified IPsec policies to a connection instead of relying on defaults.
-    syntax:
-      content: >-
-        az network vpn-connection ipsec-policy add -g MyResourceGroup --connection-name MyConnection \
-            --dh-group DHGroup14 --ike-encryption AES256 --ike-integrity SHA384 --ipsec-encryption DES3 \
-            --ipsec-integrity GCMAES256 --pfs-group PFS2048 --sa-lifetime 27000 --sa-max-size 102400000
-  parameters:
+    syntax: >-
+      az network vpn-connection ipsec-policy add -g MyResourceGroup --connection-name MyConnection \
+          --dh-group DHGroup14 --ike-encryption AES256 --ike-integrity SHA384 --ipsec-encryption DES3 \
+          --ipsec-integrity GCMAES256 --pfs-group PFS2048 --sa-lifetime 27000 --sa-max-size 102400000
+  requiredParameters:
   - isRequired: true
     name: --connection-name
     summary: Connection name.
@@ -31,126 +35,115 @@ items:
   - isRequired: true
     name: --dh-group
     parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
-    summary: Required. The DH Groups used in IKE Phase 1 for initial SA.
+    summary: The DH Groups used for initial SA.
     description: ''
   - isRequired: true
     name: --ike-encryption
     parameterValueGroup: AES128, AES192, AES256, DES, DES3
-    summary: Required. The IKE encryption algorithm (IKE phase 2).
+    summary: The IKE encryption algorithm.
     description: ''
   - isRequired: true
     name: --ike-integrity
     parameterValueGroup: MD5, SHA1, SHA256, SHA384
-    summary: Required. The IKE integrity algorithm (IKE phase 2).
+    summary: The IKE integrity algorithm.
     description: ''
   - isRequired: true
     name: --ipsec-encryption
     parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
-    summary: Required. The IPSec encryption algorithm (IKE phase 1).
+    summary: The IPSec encryption algorithm.
     description: ''
   - isRequired: true
     name: --ipsec-integrity
     parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
-    summary: Required. The IPSec integrity algorithm (IKE phase 1).
+    summary: The IPSec integrity algorithm.
     description: ''
   - isRequired: true
     name: --pfs-group
     parameterValueGroup: ECP256, ECP384, None, PFS1, PFS2, PFS2048, PFS24
-    summary: Required. The DH Groups used in IKE Phase 2 for new child SA.
+    summary: The Pfs Groups used for new child SA.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --sa-lifetime
-    summary: Required. The IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site to site VPN tunnel.
+    summary: The lifetime in seconds for P2S client.
     description: ''
   - isRequired: true
     name: --sa-max-size
-    summary: Required. The IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site to site VPN tunnel.
+    summary: The payload size in KB for P2S client.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_ipsec_policy_clear
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_ipsec-policy_clear
   name: az network vpn-connection ipsec-policy clear
   summary: Delete all IPsec policies on a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection ipsec-policy clear --connection-name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--subscription]
   examples:
   - summary: Remove all previously specified IPsec policies from a connection.
-    syntax:
-      content: az network vpn-connection ipsec-policy clear -g MyResourceGroup --connection-name MyConnection
-  parameters:
+    syntax: az network vpn-connection ipsec-policy clear -g MyResourceGroup --connection-name MyConnection
+  requiredParameters:
   - isRequired: true
     name: --connection-name
     summary: Connection name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_ipsec_policy_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_ipsec-policy_list
   name: az network vpn-connection ipsec-policy list
   summary: List IPSec policies associated with a VPN connection.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection ipsec-policy list --connection-name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: List the IPsec policies set on a connection.
-    syntax:
-      content: az network vpn-connection ipsec-policy list -g MyResourceGroup --connection-name MyConnection
-  parameters:
+    syntax: az network vpn-connection ipsec-policy list -g MyResourceGroup --connection-name MyConnection
+  requiredParameters:
   - isRequired: true
     name: --connection-name
     summary: Connection name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vpn_connection_ipsec_policy_add
-  name: az network vpn-connection ipsec-policy add
-  summary: Add a VPN connection IPSec policy.
-- uid: az_network_vpn_connection_ipsec_policy_clear
-  name: az network vpn-connection ipsec-policy clear
-  summary: Delete all IPsec policies on a VPN connection.
-- uid: az_network_vpn_connection_ipsec_policy_list
-  name: az network vpn-connection ipsec-policy list
-  summary: List IPSec policies associated with a VPN connection.
+- az_network_vpn-connection_ipsec-policy_add
+- az_network_vpn-connection_ipsec-policy_clear
+- az_network_vpn-connection_ipsec-policy_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -166,10 +159,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage VPN connection IPSec policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage VPN connection IPSec policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/shared-key.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/shared-key.yml
index 30ea077a8d..762dac1201 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/shared-key.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-connection/shared-key.yml
@@ -1,30 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vpn_connection_shared_key
-  name: az network vpn-connection shared-key
-  summary: Manage VPN shared keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vpn_connection_shared_key_reset
-  - az_network_vpn_connection_shared_key_show
-  - az_network_vpn_connection_shared_key_update
-- uid: az_network_vpn_connection_shared_key_reset
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-connection_shared-key
+name: az network vpn-connection shared-key
+summary: Manage VPN shared keys.
+description: ''
+directCommands:
+- uid: az_network_vpn-connection_shared-key_reset
   name: az network vpn-connection shared-key reset
   summary: Reset a VPN connection shared key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection shared-key reset --key-length
+                                               [--connection-name]
+                                               [--ids]
+                                               [--resource-group]
+                                               [--subscription]
   examples:
   - summary: Reset the shared key on a connection.
-    syntax:
-      content: az network vpn-connection shared-key reset -g MyResourceGroup --connection-name MyConnection --key-length 128
-  parameters:
+    syntax: az network vpn-connection shared-key reset -g MyResourceGroup --connection-name MyConnection --key-length 128
+  - summary: Reset a VPN connection shared key. (autogenerated)
+    syntax: az network vpn-connection shared-key reset --connection-name MyConnection --key-length 128 --resource-group MyResourceGroup --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --key-length
     summary: The virtual network connection reset shared key length, should between 1 and 128.
     description: ''
+  optionalParameters:
   - name: --connection-name
     summary: Connection name.
     description: ''
@@ -32,107 +32,98 @@ items:
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_shared_key_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_shared-key_show
   name: az network vpn-connection shared-key show
   summary: Retrieve a VPN connection shared key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection shared-key show [--connection-name]
+                                              [--ids]
+                                              [--query-examples]
+                                              [--resource-group]
+                                              [--subscription]
   examples:
   - summary: View the shared key of a connection.
-    syntax:
-      content: az network vpn-connection shared-key show -g MyResourceGroup --connection-name MyConnection
+    syntax: az network vpn-connection shared-key show -g MyResourceGroup --connection-name MyConnection
   - summary: Retrieve a VPN connection shared key. (autogenerated)
-    syntax:
-      content: az network vpn-connection shared-key show --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az network vpn-connection shared-key show --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --connection-name
     summary: Connection name.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_vpn_connection_shared_key_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vpn-connection_shared-key_update
   name: az network vpn-connection shared-key update
   summary: Update a VPN connection shared key.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network vpn-connection shared-key update --value
+                                                [--add]
+                                                [--connection-name]
+                                                [--force-string]
+                                                [--ids]
+                                                [--remove]
+                                                [--resource-group]
+                                                [--set]
+                                                [--subscription]
   examples:
   - summary: Change the shared key for the connection to "Abc123".
-    syntax:
-      content: az network vpn-connection shared-key update -g MyResourceGroup --connection-name MyConnection --value Abc123
+    syntax: az network vpn-connection shared-key update -g MyResourceGroup --connection-name MyConnection --value Abc123
   - summary: Update a VPN connection shared key. (autogenerated)
-    syntax:
-      content: az network vpn-connection shared-key update --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription --value Abc123
-  parameters:
+    syntax: az network vpn-connection shared-key update --connection-name MyConnection --resource-group MyResourceGroup --subscription MySubscription --value Abc123
+  requiredParameters:
   - isRequired: true
     name: --value
     summary: The virtual network connection shared key value.
     description: ''
-  - name: --connection-name
-    summary: Connection name.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --connection-name
+    summary: Connection name.
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vpn_connection_shared_key_reset
-  name: az network vpn-connection shared-key reset
-  summary: Reset a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_show
-  name: az network vpn-connection shared-key show
-  summary: Retrieve a VPN connection shared key.
-- uid: az_network_vpn_connection_shared_key_update
-  name: az network vpn-connection shared-key update
-  summary: Update a VPN connection shared key.
+- az_network_vpn-connection_shared-key_reset
+- az_network_vpn-connection_shared-key_show
+- az_network_vpn-connection_shared-key_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -148,10 +139,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage VPN shared keys.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage VPN shared keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway.yml
new file mode 100644
index 0000000000..a94a631b86
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway.yml
@@ -0,0 +1,196 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-gateway
+name: az network vpn-gateway
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-gateway** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage site-to-site VPN gateways.
+description: ''
+directCommands:
+- uid: az_network_vpn-gateway_create
+  name: az network vpn-gateway create
+  summary: Create a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway create --name
+                                  --resource-group
+                                  --vhub
+                                  [--asn]
+                                  [--bgp-peering-address]
+                                  [--location]
+                                  [--no-wait]
+                                  [--peer-weight]
+                                  [--scale-unit]
+                                  [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vhub
+    summary: Name or ID of a virtual hub.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_network_vpn-gateway_delete
+  name: az network vpn-gateway delete
+  summary: Delete a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway delete --name
+                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_list
+  name: az network vpn-gateway list
+  summary: List site-to-site VPN gateways.
+  description: ''
+  syntax: az network vpn-gateway list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_show
+  name: az network vpn-gateway show
+  summary: Get the details of a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway show --name
+                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_update
+  name: az network vpn-gateway update
+  summary: Update settings of a site-to-site VPN gateway.
+  description: ''
+  syntax: >-
+    az network vpn-gateway update --name
+                                  --resource-group
+                                  [--add]
+                                  [--asn]
+                                  [--bgp-peering-address]
+                                  [--force-string]
+                                  [--no-wait]
+                                  [--peer-weight]
+                                  [--remove]
+                                  [--scale-unit]
+                                  [--set]
+                                  [--tags]
+                                  [--vhub]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --scale-unit
+    summary: The scale unit for this VPN gateway.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vhub
+    summary: Name or ID of a virtual hub.
+    description: ''
+commands:
+- az_network_vpn-gateway_connection
+- az_network_vpn-gateway_connection_create
+- az_network_vpn-gateway_connection_delete
+- az_network_vpn-gateway_connection_ipsec-policy
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+- az_network_vpn-gateway_connection_list
+- az_network_vpn-gateway_connection_show
+- az_network_vpn-gateway_connection_update
+- az_network_vpn-gateway_connection_wait
+- az_network_vpn-gateway_create
+- az_network_vpn-gateway_delete
+- az_network_vpn-gateway_list
+- az_network_vpn-gateway_show
+- az_network_vpn-gateway_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage site-to-site VPN gateways.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway/connection.yml
new file mode 100644
index 0000000000..d33d6d5bf7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway/connection.yml
@@ -0,0 +1,296 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-gateway_connection
+name: az network vpn-gateway connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-gateway connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage site-to-site VPN gateway connections.
+description: ''
+directCommands:
+- uid: az_network_vpn-gateway_connection_create
+  name: az network vpn-gateway connection create
+  summary: Create a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection create --gateway-name
+                                             --name
+                                             --remote-vpn-site
+                                             --resource-group
+                                             [--associated]
+                                             [--connection-bandwidth]
+                                             [--enable-bgp {false, true}]
+                                             [--internet-security {false, true}]
+                                             [--labels]
+                                             [--no-wait]
+                                             [--propagated]
+                                             [--protocol-type {IKEv1, IKEv2}]
+                                             [--rate-limiting {false, true}]
+                                             [--routing-weight]
+                                             [--shared-key]
+  examples:
+  - summary: Create a site-to-site VPN gateway connection
+    syntax: az network vpn-gateway connection create -g MyRG -n MyConnection --gateway-name MyGateway --remote-vpn-site /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/vpnSites/MyVPNSite --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/MyRouteTable2 --labels label1 label2
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --remote-vpn-site
+    summary: Name of ID of the remote VPN site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --connection-bandwidth
+    summary: Expected bandwidth in Mbps.
+    description: ''
+  - name: --enable-bgp
+    parameterValueGroup: false, true
+    summary: Enable BGP.
+    description: ''
+  - name: --internet-security
+    parameterValueGroup: false, true
+    summary: Enable internet security.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --protocol-type
+    parameterValueGroup: IKEv1, IKEv2
+    summary: Connection protocol.
+    description: ''
+  - name: --rate-limiting
+    parameterValueGroup: false, true
+    summary: Enable rate limiting.
+    description: ''
+  - name: --routing-weight
+    summary: Routing weight.
+    description: ''
+  - name: --shared-key
+    summary: Shared key.
+    description: ''
+- uid: az_network_vpn-gateway_connection_delete
+  name: az network vpn-gateway connection delete
+  summary: Delete a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection delete --gateway-name
+                                             --name
+                                             --resource-group
+  examples:
+  - summary: Delete a site-to-site VPN gateway connection
+    syntax: az network vpn-gateway connection delete -g MyRG -n MyConnection --gateway-name MyGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_list
+  name: az network vpn-gateway connection list
+  summary: List site-to-site VPN gateway connections.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection list --gateway-name
+                                           --resource-group
+  examples:
+  - summary: List all connections for a given site-to-site VPN gateway
+    syntax: az network vpn-gateway connection list -g MyRG --gateway-name MyGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_show
+  name: az network vpn-gateway connection show
+  summary: Get the details of a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection show --gateway-name
+                                           --name
+                                           --resource-group
+  examples:
+  - summary: Get the details of a site-to-site VPN gateway connection
+    syntax: az network vpn-gateway connection show -g MyRG -n MyConnection --gateway-name MyGateway
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_update
+  name: az network vpn-gateway connection update
+  summary: Update settings of VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection update --gateway-name
+                                             --name
+                                             --resource-group
+                                             [--add]
+                                             [--associated]
+                                             [--force-string]
+                                             [--labels]
+                                             [--no-wait]
+                                             [--propagated]
+                                             [--remove]
+                                             [--set]
+  examples:
+  - summary: Update settings of VPN gateway connection.
+    syntax: az network vpn-gateway connection update -g MyRG -n MyConnection --gateway-name MyGateway --labels NewLabel1 NewLabels2
+  - summary: Add labels of VPN gateway connection.
+    syntax: az network vpn-gateway connection update -g MyRG -n MyConnection --gateway-name MyGateway --add routingConfiguration.propagatedRouteTables.labels Newlabel1 Newlabel2
+  - summary: Reset labels of VPN gateway connection.
+    syntax: az network vpn-gateway connection update -g MyRG -n MyConnection --gateway-name MyGateway --set routingConfiguration.propagatedRouteTables.labels[0]=Newlabel1
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --associated --associated-route-table
+    summary: The resource id of route table associated with this routing configuration.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --labels
+    summary: Space-separated list of labels for propagated route tables.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --propagated --propagated-route-tables
+    summary: Space-separated list of resource id of propagated route tables.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_network_vpn-gateway_connection_wait
+  name: az network vpn-gateway connection wait
+  summary: Place the CLI in a waiting state until a condition of the site-to-site VPN gateway connection is met.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection wait --gateway-name
+                                           --name
+                                           --resource-group
+                                           [--created]
+                                           [--custom]
+                                           [--deleted]
+                                           [--exists]
+                                           [--interval]
+                                           [--timeout]
+                                           [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vpn-gateway_connection_create
+- az_network_vpn-gateway_connection_delete
+- az_network_vpn-gateway_connection_ipsec-policy
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+- az_network_vpn-gateway_connection_list
+- az_network_vpn-gateway_connection_show
+- az_network_vpn-gateway_connection_update
+- az_network_vpn-gateway_connection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage site-to-site VPN gateway connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway/connection/ipsec-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway/connection/ipsec-policy.yml
new file mode 100644
index 0000000000..b385eaaabf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-gateway/connection/ipsec-policy.yml
@@ -0,0 +1,155 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-gateway_connection_ipsec-policy
+name: az network vpn-gateway connection ipsec-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-gateway connection ipsec-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage site-to-site VPN gateway connection IPSec policies.
+description: ''
+directCommands:
+- uid: az_network_vpn-gateway_connection_ipsec-policy_add
+  name: az network vpn-gateway connection ipsec-policy add
+  summary: Add an IPSec policy to a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection ipsec-policy add --connection-name
+                                                       --dh-group {DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+                                                       --gateway-name
+                                                       --ike-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256}
+                                                       --ike-integrity {GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384}
+                                                       --ipsec-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None}
+                                                       --ipsec-integrity {GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256}
+                                                       --pfs-group {ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM}
+                                                       --resource-group
+                                                       --sa-data-size
+                                                       --sa-lifetime
+                                                       [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --connection-name
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --dh-group
+    parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
+    summary: DH Groups used in IKE Phase 1 for initial SA.
+    description: ''
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --ike-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256
+    summary: IKE encryption algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ike-integrity
+    parameterValueGroup: GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384
+    summary: IKE integrity algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ipsec-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
+    summary: IPSec encryption algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --ipsec-integrity
+    parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
+    summary: IPSec integrity algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --pfs-group
+    parameterValueGroup: ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM
+    summary: The Pfs Groups used in IKE Phase 2 for new child SA.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sa-data-size
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site-to-site VPN tunnel.
+    description: ''
+  - isRequired: true
+    name: --sa-lifetime
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site-to-site VPN tunnel.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vpn-gateway_connection_ipsec-policy_list
+  name: az network vpn-gateway connection ipsec-policy list
+  summary: List site-to-site VPN gateway connection IPSec policies.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection ipsec-policy list --connection-name
+                                                        --gateway-name
+                                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-name
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-gateway_connection_ipsec-policy_remove
+  name: az network vpn-gateway connection ipsec-policy remove
+  summary: Remove an IPSec policy from a site-to-site VPN gateway connection.
+  description: ''
+  syntax: >-
+    az network vpn-gateway connection ipsec-policy remove --connection-name
+                                                          --gateway-name
+                                                          --index
+                                                          --resource-group
+                                                          [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --connection-name
+    summary: Name of the VPN gateway connection.
+    description: ''
+  - isRequired: true
+    name: --gateway-name
+    summary: Name of the VPN gateway.
+    description: ''
+  - isRequired: true
+    name: --index
+    summary: List index of the item (starting with 1).
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_network_vpn-gateway_connection_ipsec-policy_add
+- az_network_vpn-gateway_connection_ipsec-policy_list
+- az_network_vpn-gateway_connection_ipsec-policy_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage site-to-site VPN gateway connection IPSec policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-server-config.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-server-config.yml
new file mode 100644
index 0000000000..5203a168ee
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-server-config.yml
@@ -0,0 +1,272 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-server-config
+name: az network vpn-server-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-server-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VPN server configuration.
+description: ''
+directCommands:
+- uid: az_network_vpn-server-config_create
+  name: az network vpn-server-config create
+  summary: Create a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config create --name
+                                        --resource-group
+                                        [--aad-audience]
+                                        [--aad-issuer]
+                                        [--aad-tenant]
+                                        [--auth-types {AAD, Certificate, Radius}]
+                                        [--location]
+                                        [--no-wait]
+                                        [--protocols {IkeV2, OpenVPN}]
+                                        [--radius-client-root-certs]
+                                        [--radius-server-root-certs]
+                                        [--radius-servers]
+                                        [--vpn-client-revoked-certs]
+                                        [--vpn-client-root-certs]
+  examples:
+  - summary: Create a VPN server configuration with VPN auth type
+    syntax: az network vpn-server-config create -n MyVPNServerConfig -g MyRG --vpn-client-root-certs "ApplicationGatewayAuthCert.cer" --vpn-client-revoked-certs "ApplicationGatewayAuthCert.pem"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-audience
+    summary: AAD Vpn authentication parameter AAD audience.
+    description: ''
+  - name: --aad-issuer
+    summary: AAD Vpn authentication parameter AAD issuer.
+    description: ''
+  - name: --aad-tenant
+    summary: AAD Vpn authentication parameter AAD tenant.
+    description: ''
+  - name: --auth-types
+    parameterValueGroup: AAD, Certificate, Radius
+    summary: List of VPN authentication types for the VpnServerConfiguration.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protocols
+    parameterValueGroup: IkeV2, OpenVPN
+    summary: VPN protocols for the VpnServerConfiguration.
+    description: ''
+  - name: --radius-client-root-certs
+    summary: List of Radius client root certificate file paths.
+    description: ''
+  - name: --radius-server-root-certs
+    summary: List of Radius server root certificate file paths.
+    description: ''
+  - name: --radius-servers
+    summary: Radius Server configuration.
+    description: ''
+  - name: --vpn-client-revoked-certs
+    summary: List of VPN client revoked certificate file paths.
+    description: ''
+  - name: --vpn-client-root-certs
+    summary: List of VPN client root certificate file paths.
+    description: ''
+- uid: az_network_vpn-server-config_delete
+  name: az network vpn-server-config delete
+  summary: Delete a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config delete --name
+                                        --resource-group
+                                        [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_network_vpn-server-config_list
+  name: az network vpn-server-config list
+  summary: List all VPN server configuration.
+  description: ''
+  syntax: az network vpn-server-config list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-server-config_set
+  name: az network vpn-server-config set
+  summary: Set settings of a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config set --name
+                                     --resource-group
+                                     [--aad-audience]
+                                     [--aad-issuer]
+                                     [--aad-tenant]
+                                     [--auth-types {AAD, Certificate, Radius}]
+                                     [--location]
+                                     [--no-wait]
+                                     [--protocols {IkeV2, OpenVPN}]
+                                     [--radius-client-root-certs]
+                                     [--radius-server-root-certs]
+                                     [--radius-servers]
+                                     [--vpn-client-revoked-certs]
+                                     [--vpn-client-root-certs]
+  examples:
+  - summary: Set a VPN server configuration with Radius auth type
+    syntax: az network vpn-server-config set -n MyVPNServerConfig -g MyRG --radius-client-root-certs "ApplicationGatewayAuthCert.cer" --radius-server-root-certs "ApplicationGatewayAuthCert.pem" --radius-servers address=test1 secret=clitest score=10 --radius-servers address=test2 secret=clitest score=10
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-audience
+    summary: AAD Vpn authentication parameter AAD audience.
+    description: ''
+  - name: --aad-issuer
+    summary: AAD Vpn authentication parameter AAD issuer.
+    description: ''
+  - name: --aad-tenant
+    summary: AAD Vpn authentication parameter AAD tenant.
+    description: ''
+  - name: --auth-types
+    parameterValueGroup: AAD, Certificate, Radius
+    summary: List of VPN authentication types for the VpnServerConfiguration.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protocols
+    parameterValueGroup: IkeV2, OpenVPN
+    summary: VPN protocols for the VpnServerConfiguration.
+    description: ''
+  - name: --radius-client-root-certs
+    summary: List of Radius client root certificate file paths.
+    description: ''
+  - name: --radius-server-root-certs
+    summary: List of Radius server root certificate file paths.
+    description: ''
+  - name: --radius-servers
+    summary: Radius Server configuration.
+    description: ''
+  - name: --vpn-client-revoked-certs
+    summary: List of VPN client revoked certificate file paths.
+    description: ''
+  - name: --vpn-client-root-certs
+    summary: List of VPN client root certificate file paths.
+    description: ''
+- uid: az_network_vpn-server-config_show
+  name: az network vpn-server-config show
+  summary: Show the details of a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config show --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-server-config_wait
+  name: az network vpn-server-config wait
+  summary: Place the CLI in a waiting state until a condition of the VPN server configuration is met.
+  description: ''
+  syntax: >-
+    az network vpn-server-config wait --name
+                                      --resource-group
+                                      [--created]
+                                      [--custom]
+                                      [--deleted]
+                                      [--exists]
+                                      [--interval]
+                                      [--timeout]
+                                      [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vpn-server-config_create
+- az_network_vpn-server-config_delete
+- az_network_vpn-server-config_ipsec-policy
+- az_network_vpn-server-config_ipsec-policy_add
+- az_network_vpn-server-config_ipsec-policy_list
+- az_network_vpn-server-config_ipsec-policy_remove
+- az_network_vpn-server-config_ipsec-policy_wait
+- az_network_vpn-server-config_list
+- az_network_vpn-server-config_set
+- az_network_vpn-server-config_show
+- az_network_vpn-server-config_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VPN server configuration.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-server-config/ipsec-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-server-config/ipsec-policy.yml
new file mode 100644
index 0000000000..188d186a56
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-server-config/ipsec-policy.yml
@@ -0,0 +1,188 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-server-config_ipsec-policy
+name: az network vpn-server-config ipsec-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-server-config ipsec-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VPN server configuration IPSec policies.
+description: ''
+directCommands:
+- uid: az_network_vpn-server-config_ipsec-policy_add
+  name: az network vpn-server-config ipsec-policy add
+  summary: Add an IPSec policy to a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy add --dh-group {DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+                                                  --ike-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256}
+                                                  --ike-integrity {GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384}
+                                                  --ipsec-encryption {AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None}
+                                                  --ipsec-integrity {GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256}
+                                                  --name
+                                                  --pfs-group {ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM}
+                                                  --resource-group
+                                                  --sa-data-size
+                                                  --sa-lifetime
+                                                  [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --dh-group
+    parameterValueGroup: DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None
+    summary: DH Groups used in IKE Phase 1 for initial SA.
+    description: ''
+  - isRequired: true
+    name: --ike-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES256
+    summary: IKE encryption algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ike-integrity
+    parameterValueGroup: GCMAES128, GCMAES256, MD5, SHA1, SHA256, SHA384
+    summary: IKE integrity algorithm (IKE phase 2).
+    description: ''
+  - isRequired: true
+    name: --ipsec-encryption
+    parameterValueGroup: AES128, AES192, AES256, DES, DES3, GCMAES128, GCMAES192, GCMAES256, None
+    summary: IPSec encryption algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --ipsec-integrity
+    parameterValueGroup: GCMAES128, GCMAES192, GCMAES256, MD5, SHA1, SHA256
+    summary: IPSec integrity algorithm (IKE phase 1).
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --pfs-group
+    parameterValueGroup: ECP256, ECP384, None, PFS1, PFS14, PFS2, PFS2048, PFS24, PFSMM
+    summary: The Pfs Groups used in IKE Phase 2 for new child SA.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sa-data-size
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) payload size in KB for a site-to-site VPN tunnel.
+    description: ''
+  - isRequired: true
+    name: --sa-lifetime
+    summary: IPSec Security Association (also called Quick Mode or Phase 2 SA) lifetime in seconds for a site-to-site VPN tunnel.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vpn-server-config_ipsec-policy_list
+  name: az network vpn-server-config ipsec-policy list
+  summary: List VPN server configuration IPSec policies.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy list --name
+                                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-server-config_ipsec-policy_remove
+  name: az network vpn-server-config ipsec-policy remove
+  summary: Remove an IPSec policy from a VPN server configuration.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy remove --index
+                                                     --name
+                                                     --resource-group
+                                                     [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --index
+    summary: List index of the ipsec policy(starting with 0).
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_network_vpn-server-config_ipsec-policy_wait
+  name: az network vpn-server-config ipsec-policy wait
+  summary: Place the CLI in a waiting state until a condition of the IPSec policy of a VPN server configuration is met.
+  description: ''
+  syntax: >-
+    az network vpn-server-config ipsec-policy wait --name
+                                                   --resource-group
+                                                   [--created]
+                                                   [--custom]
+                                                   [--deleted]
+                                                   [--exists]
+                                                   [--interval]
+                                                   [--timeout]
+                                                   [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Vpn server configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_network_vpn-server-config_ipsec-policy_add
+- az_network_vpn-server-config_ipsec-policy_list
+- az_network_vpn-server-config_ipsec-policy_remove
+- az_network_vpn-server-config_ipsec-policy_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VPN server configuration IPSec policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vpn-site.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-site.yml
new file mode 100644
index 0000000000..9005b5ce11
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vpn-site.yml
@@ -0,0 +1,257 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vpn-site
+name: az network vpn-site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vpn-site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VPN site configurations.
+description: ''
+directCommands:
+- uid: az_network_vpn-site_create
+  name: az network vpn-site create
+  summary: Create a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site create --ip-address
+                               --name
+                               --resource-group
+                               [--address-prefixes]
+                               [--asn]
+                               [--bgp-peering-address]
+                               [--device-model]
+                               [--device-vendor]
+                               [--link-speed]
+                               [--location]
+                               [--no-wait]
+                               [--peer-weight]
+                               [--security-site {false, true}]
+                               [--site-key]
+                               [--tags]
+                               [--virtual-wan]
+  requiredParameters:
+  - isRequired: true
+    name: --ip-address
+    summary: IP address of the VPN site.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --address-prefixes
+    summary: Space-separated list of CIDR address prefixes.
+    description: ''
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --device-model
+    summary: Model of the device.
+    description: ''
+  - name: --device-vendor
+    summary: Name of the device vendor.
+    description: ''
+  - name: --link-speed
+    summary: Link speed in Mbps.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --security-site
+    parameterValueGroup: false, true
+    summary: Whether the VPN site is security-related.
+    description: ''
+  - name: --site-key
+    summary: Key for the VPN site that can be used for connections.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-wan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+- uid: az_network_vpn-site_delete
+  name: az network vpn-site delete
+  summary: Delete a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site delete --name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-site_download
+  name: az network vpn-site download
+  summary: Provide a SAS-URL to download the configuration for a VPN site.
+  description: ''
+  syntax: >-
+    az network vpn-site download --request
+                                 --resource-group
+                                 --vwan-name
+  requiredParameters:
+  - isRequired: true
+    name: --request
+    summary: Parameters supplied to download vpn-sites configuration.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vwan-name
+    summary: Name of the virtual WAN.
+    description: ''
+- uid: az_network_vpn-site_list
+  name: az network vpn-site list
+  summary: List VPN site configurations.
+  description: ''
+  syntax: az network vpn-site list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-site_show
+  name: az network vpn-site show
+  summary: Get the details of a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site show --name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vpn-site_update
+  name: az network vpn-site update
+  summary: Update settings of a VPN site configuration.
+  description: ''
+  syntax: >-
+    az network vpn-site update --name
+                               --resource-group
+                               [--add]
+                               [--address-prefixes]
+                               [--asn]
+                               [--bgp-peering-address]
+                               [--device-model]
+                               [--device-vendor]
+                               [--force-string]
+                               [--ip-address]
+                               [--link-speed]
+                               [--no-wait]
+                               [--peer-weight]
+                               [--remove]
+                               [--security-site {false, true}]
+                               [--set]
+                               [--site-key]
+                               [--tags]
+                               [--virtual-wan]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the VPN site config.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-prefixes
+    summary: Space-separated list of CIDR address prefixes.
+    description: ''
+  - name: --asn
+    summary: BGP speaker's ASN.
+    description: ''
+  - name: --bgp-peering-address
+    summary: Peering address and BGP identifier of this BGP speaker.
+    description: ''
+  - name: --device-model
+    summary: Model of the device.
+    description: ''
+  - name: --device-vendor
+    summary: Name of the device vendor.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ip-address
+    summary: IP address of the VPN site.
+    description: ''
+  - name: --link-speed
+    summary: Link speed in Mbps.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --peer-weight
+    summary: Weight added to routes learned from this BGP speaker.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --security-site
+    parameterValueGroup: false, true
+    summary: Whether the VPN site is security-related.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --site-key
+    summary: Key for the VPN site that can be used for connections.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-wan
+    summary: Name or ID of the virtual WAN.
+    description: ''
+commands:
+- az_network_vpn-site_create
+- az_network_vpn-site_delete
+- az_network_vpn-site_download
+- az_network_vpn-site_list
+- az_network_vpn-site_show
+- az_network_vpn-site_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VPN site configurations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vrouter.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vrouter.yml
index 25fe39a8d9..9ad4caf07d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vrouter.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vrouter.yml
@@ -1,80 +1,124 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vrouter
-  name: az network vrouter
-  summary: Manage the virtual router.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vrouter_create
-  - az_network_vrouter_list
+### YamlMime:AzureCLIGroup
+uid: az_network_vrouter
+name: az network vrouter
+summary: Manage the virtual router. This feature supports both VirtualHub and VirtualRouter. Considering VirtualRouter is deprecated, we recommend to create VirtualRouter with --hosted-subnet instead.
+description: ''
+directCommands:
 - uid: az_network_vrouter_create
   name: az network vrouter create
   summary: Create a virtual router.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --hosted-gateway
-    summary: Name or ID of the virtual network gateway with ExpressRouter on which VirtualRouter is hosted.
-    description: ''
+  syntax: >-
+    az network vrouter create --name
+                              --resource-group
+                              [--hosted-gateway]
+                              [--hosted-subnet]
+                              [--location]
+                              [--subscription]
+                              [--tags]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Virtual Router.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --hosted-gateway
+    summary: Name or ID of the virtual network gateway with ExpressRouter on which VirtualRouter is hosted.
+    description: ''
+  - name: --hosted-subnet
+    summary: The ID of a subnet where VirtualRouter would be deployed.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_delete
+  name: az network vrouter delete
+  summary: Delete a virtual router under a resource group.
+  description: ''
+  syntax: >-
+    az network vrouter delete --name
+                              --resource-group
+                              [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_vrouter_list
   name: az network vrouter list
   summary: List all virtual routers under a subscription or a resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network vrouter list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_show
+  name: az network vrouter show
+  summary: Show a virtual router.
+  description: ''
+  syntax: >-
+    az network vrouter show --name
+                            --resource-group
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vrouter_create
-  name: az network vrouter create
-  summary: Create a virtual router.
-- uid: az_network_vrouter_list
-  name: az network vrouter list
-  summary: List all virtual routers under a subscription or a resource group.
-- uid: az_network_vrouter_peering
-  name: az network vrouter peering
-  summary: Manage the virtual router peering.
-- uid: az_network_vrouter_peering_create
-  name: az network vrouter peering create
-  summary: Create a virtual router peering.
+- az_network_vrouter_create
+- az_network_vrouter_delete
+- az_network_vrouter_list
+- az_network_vrouter_peering
+- az_network_vrouter_peering_create
+- az_network_vrouter_peering_delete
+- az_network_vrouter_peering_list
+- az_network_vrouter_peering_show
+- az_network_vrouter_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -90,10 +134,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the virtual router.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the virtual router. This feature supports both VirtualHub and VirtualRouter. Considering VirtualRouter is deprecated, we recommend to create VirtualRouter with --hosted-subnet instead.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vrouter/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vrouter/peering.yml
index 78e37a6785..82c17d0256 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/vrouter/peering.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vrouter/peering.yml
@@ -1,20 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_vrouter_peering
-  name: az network vrouter peering
-  summary: Manage the virtual router peering.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_network_vrouter_peering_create
+### YamlMime:AzureCLIGroup
+uid: az_network_vrouter_peering
+name: az network vrouter peering
+summary: Manage the virtual router peering.
+description: ''
+directCommands:
 - uid: az_network_vrouter_peering_create
   name: az network vrouter peering create
   summary: Create a virtual router peering.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az network vrouter peering create --name
+                                      --peer-asn
+                                      --peer-ip
+                                      --resource-group
+                                      --vrouter-name
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the Virtual Router Peering.
@@ -29,25 +30,106 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vrouter-name
+    summary: The name of the Virtual Router.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_peering_delete
+  name: az network vrouter peering delete
+  summary: Delete a virtual router peering.
+  description: ''
+  syntax: >-
+    az network vrouter peering delete --name
+                                      --resource-group
+                                      --vrouter-name
+                                      [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router Peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vrouter-name
     summary: The name of the Virtual Router.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_peering_list
+  name: az network vrouter peering list
+  summary: List all virtual router peerings under a resource group.
+  description: ''
+  syntax: >-
+    az network vrouter peering list --resource-group
+                                    --vrouter-name
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vrouter-name
+    summary: The name of the Virtual Router.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_vrouter_peering_show
+  name: az network vrouter peering show
+  summary: Show a virtual router peering.
+  description: ''
+  syntax: >-
+    az network vrouter peering show --name
+                                    --resource-group
+                                    --vrouter-name
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Router Peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vrouter-name
+    summary: The name of the Virtual Router.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_vrouter_peering_create
-  name: az network vrouter peering create
-  summary: Create a virtual router peering.
+- az_network_vrouter_peering_create
+- az_network_vrouter_peering_delete
+- az_network_vrouter_peering_list
+- az_network_vrouter_peering_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -63,10 +145,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Manage the virtual router peering.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Manage the virtual router peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/vwan.yml b/2018-03-01-hybrid/docs-ref-autogen/network/vwan.yml
new file mode 100644
index 0000000000..e5c25f10ef
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/vwan.yml
@@ -0,0 +1,182 @@
+### YamlMime:AzureCLIGroup
+uid: az_network_vwan
+name: az network vwan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **virtual-wan** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az network vwan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual WANs.
+description: ''
+directCommands:
+- uid: az_network_vwan_create
+  name: az network vwan create
+  summary: Create a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan create --name
+                           --resource-group
+                           [--branch-to-branch-traffic {false, true}]
+                           [--disable-vpn-encryption {false, true}]
+                           [--location]
+                           [--office365-category]
+                           [--security-provider-name]
+                           [--tags]
+                           [--type {Basic, Standard}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --branch-to-branch-traffic
+    parameterValueGroup: false, true
+    summary: Allow branch-to-branch traffic flow.
+    description: ''
+  - name: --disable-vpn-encryption
+    parameterValueGroup: false, true
+    summary: State of VPN encryption.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --office365-category
+    summary: The office local breakout category.
+    description: ''
+  - name: --security-provider-name
+    summary: The security provider name.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: Basic, Standard
+    summary: The type of the VirtualWAN.
+    description: ''
+- uid: az_network_vwan_delete
+  name: az network vwan delete
+  summary: Delete a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan delete --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vwan_list
+  name: az network vwan list
+  summary: List virtual WANs.
+  description: ''
+  syntax: az network vwan list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vwan_show
+  name: az network vwan show
+  summary: Get the details of a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_network_vwan_update
+  name: az network vwan update
+  summary: Update settings of a virtual WAN.
+  description: ''
+  syntax: >-
+    az network vwan update --name
+                           --resource-group
+                           [--add]
+                           [--branch-to-branch-traffic {false, true}]
+                           [--disable-vpn-encryption {false, true}]
+                           [--force-string]
+                           [--office365-category]
+                           [--remove]
+                           [--security-provider-name]
+                           [--set]
+                           [--tags]
+                           [--type {Basic, Standard}]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual WAN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --branch-to-branch-traffic
+    parameterValueGroup: false, true
+    summary: Allow branch-to-branch traffic flow.
+    description: ''
+  - name: --disable-vpn-encryption
+    parameterValueGroup: false, true
+    summary: State of VPN encryption.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --office365-category
+    summary: The office local breakout category.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --security-provider-name
+    summary: The security provider name.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: Basic, Standard
+    summary: The type of the VirtualWAN.
+    description: ''
+commands:
+- az_network_vwan_create
+- az_network_vwan_delete
+- az_network_vwan_list
+- az_network_vwan_show
+- az_network_vwan_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual WANs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/watcher.yml b/2018-03-01-hybrid/docs-ref-autogen/network/watcher.yml
index 6311d1a3a7..eada48781f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/watcher.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/watcher.yml
@@ -1,34 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_watcher
-  name: az network watcher
-  summary: Manage the Azure Network Watcher.
-  description: Network Watcher assists with monitoring and diagnosing conditions at a network scenario level. To learn more visit <a href="https://docs.microsoft.com/azure/network-watcher/">https://docs.microsoft.com/azure/network-watcher/</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_watcher_configure
-  - az_network_watcher_list
-  - az_network_watcher_show_next_hop
-  - az_network_watcher_show_security_group_view
-  - az_network_watcher_show_topology
-  - az_network_watcher_test_connectivity
-  - az_network_watcher_test_ip_flow
+### YamlMime:AzureCLIGroup
+uid: az_network_watcher
+name: az network watcher
+summary: Manage the Azure Network Watcher.
+description: Network Watcher assists with monitoring and diagnosing conditions at a network scenario level. To learn more visit https://docs.microsoft.com/azure/network-watcher/.
+directCommands:
 - uid: az_network_watcher_configure
   name: az network watcher configure
   summary: Configure the Network Watcher service for different regions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher configure --locations
+                                 [--enabled {false, true}]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--tags]
   examples:
   - summary: Configure Network Watcher for the West US region.
-    syntax:
-      content: az network watcher configure -g NetworkWatcherRG  -l westus --enabled true
-  parameters:
+    syntax: az network watcher configure -g NetworkWatcherRG  -l westus --enabled true
+  requiredParameters:
   - isRequired: true
     name: --locations -l
     summary: Space-separated list of locations to configure.
     description: ''
+  optionalParameters:
   - name: --enabled
     parameterValueGroup: false, true
     summary: Enabled status of Network Watcher in the specified regions.
@@ -38,49 +32,46 @@ items:
     description: >-
       When a previously disabled region is enabled to use Network Watcher, a
           Network Watcher resource will be created in this resource group.
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_watcher_list
   name: az network watcher list
   summary: List Network Watchers.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher list [--query-examples]
+                            [--subscription]
   examples:
   - summary: List all Network Watchers in a subscription.
-    syntax:
-      content: az network watcher list
-  parameters:
+    syntax: az network watcher list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_show_next_hop
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_show-next-hop
   name: az network watcher show-next-hop
   summary: Get information on the 'next hop' of a VM.
-  description: Requires that Network Watcher is enabled for the region in which the VM is located. For more information about show-next-hop visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-check-next-hop-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-check-next-hop-cli</a>.
-  langs:
-  - azurecli
+  description: Requires that Network Watcher is enabled for the region in which the VM is located. For more information about show-next-hop visit https://docs.microsoft.com/azure/network-watcher/network-watcher-check-next-hop-cli.
+  syntax: >-
+    az network watcher show-next-hop --dest-ip
+                                     --resource-group
+                                     --source-ip
+                                     --vm
+                                     [--nic]
+                                     [--subscription]
   examples:
   - summary: Get the next hop from a VMs assigned IP address to a destination at 10.1.0.4.
-    syntax:
-      content: az network watcher show-next-hop -g MyResourceGroup --vm MyVm --source-ip 10.0.0.4 --dest-ip 10.1.0.4
-  parameters:
+    syntax: az network watcher show-next-hop -g MyResourceGroup --vm MyVm --source-ip 10.0.0.4 --dest-ip 10.1.0.4
+  requiredParameters:
   - isRequired: true
     name: --dest-ip
     summary: Destination IPv4 address.
@@ -97,29 +88,26 @@ items:
     name: --vm
     summary: Name or ID of the VM to target. If the name of the VM is provided, the --resource-group is required.
     description: ''
+  optionalParameters:
   - name: --nic
     summary: Name or ID of the NIC resource to test. If the VM has multiple NICs and IP forwarding is enabled on any of them, this parameter is required.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_show_security_group_view
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_show-security-group-view
   name: az network watcher show-security-group-view
   summary: Get detailed security information on a VM for the currently configured network security group.
-  description: For more information on using security group view visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-security-group-view-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-security-group-view-cli</a>.
-  langs:
-  - azurecli
+  description: For more information on using security group view visit https://docs.microsoft.com/azure/network-watcher/network-watcher-security-group-view-cli.
+  syntax: >-
+    az network watcher show-security-group-view --resource-group
+                                                --vm
+                                                [--subscription]
   examples:
   - summary: Get the network security group information for the specified VM.
-    syntax:
-      content: az network watcher show-security-group-view -g MyResourceGroup --vm MyVm
-  parameters:
+    syntax: az network watcher show-security-group-view -g MyResourceGroup --vm MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: Name of the resource group the target VM is in.
@@ -128,26 +116,25 @@ items:
     name: --vm
     summary: Name or ID of the VM to target. If the name of the VM is provided, the --resource-group is required.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_show_topology
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_show-topology
   name: az network watcher show-topology
   summary: Get the network topology of a resource group, virtual network or subnet.
-  description: For more information about using network topology visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-topology-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-topology-cli</a>.
-  langs:
-  - azurecli
+  description: For more information about using network topology visit https://docs.microsoft.com/azure/network-watcher/network-watcher-topology-cli.
+  syntax: >-
+    az network watcher show-topology [--location]
+                                     [--resource-group]
+                                     [--subnet]
+                                     [--subscription]
+                                     [--vnet]
   examples:
   - summary: Use show-topology to get the topology of resources within a resource group.
-    syntax:
-      content: az network watcher show-topology -g MyResourceGroup
-  parameters:
+    syntax: az network watcher show-topology -g MyResourceGroup
+  optionalParameters:
   - name: --location -l
     summary: Location. Defaults to the location of the target resource group.
     description: Topology information is only shown for resources within the target resource group that are within the specified region.
@@ -157,46 +144,40 @@ items:
   - name: --subnet
     summary: Name or ID of the subnet to target. If name is used, --vnet NAME must also be supplied.
     description: ''
-  - name: --vnet
-    summary: Name or ID of the virtual network to target.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_test_connectivity
+  - name: --vnet
+    summary: Name or ID of the virtual network to target.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_test-connectivity
   name: az network watcher test-connectivity
   summary: Test if a connection can be established between a Virtual Machine and a given endpoint.
-  description: To check connectivity between two VMs in different regions, use the VM ids instead of the VM names for the source and destination resource arguments. To register for this feature or see additional examples visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-connectivity-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-connectivity-cli</a>.
-  langs:
-  - azurecli
+  description: To check connectivity between two VMs in different regions, use the VM ids instead of the VM names for the source and destination resource arguments. To register for this feature or see additional examples visit https://docs.microsoft.com/azure/network-watcher/network-watcher-connectivity-cli.
+  syntax: >-
+    az network watcher test-connectivity --source-resource
+                                         [--dest-address]
+                                         [--dest-port]
+                                         [--dest-resource]
+                                         [--headers]
+                                         [--method]
+                                         [--protocol {TCP, UDP}]
+                                         [--resource-group]
+                                         [--source-port]
+                                         [--subscription]
+                                         [--valid-status-codes]
   examples:
   - summary: Check connectivity between two virtual machines in the same resource group over port 80.
-    syntax:
-      content: az network watcher test-connectivity -g MyResourceGroup --source-resource MyVmName1 --dest-resource MyVmName2 --dest-port 80
+    syntax: az network watcher test-connectivity -g MyResourceGroup --source-resource MyVmName1 --dest-resource MyVmName2 --dest-port 80
   - summary: Check connectivity between two virtual machines in the same subscription in two different resource groups over port 80.
-    syntax:
-      content: az network watcher test-connectivity --source-resource MyVmId1 --dest-resource MyVmId2 --dest-port 80
-  parameters:
+    syntax: az network watcher test-connectivity --source-resource MyVmId1 --dest-resource MyVmId2 --dest-port 80
+  requiredParameters:
   - isRequired: true
     name: --source-resource
     summary: Name or ID of the resource from which to originate traffic.
     description: Currently only Virtual Machines are supported.
-  - name: --protocol
-    parameterValueGroup: TCP, UDP
-    summary: Protocol to test on.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --source-port
-    summary: Port number from which to originate traffic.
-    description: ''
+  optionalParameters:
   - name: --dest-address
     summary: The IP address or URI at which to receive traffic.
     description: ''
@@ -212,31 +193,42 @@ items:
   - name: --method
     summary: HTTP method to use.
     description: ''
-  - name: --valid-status-codes
-    summary: Space-separated list of HTTP status codes considered valid.
+  - name: --protocol
+    parameterValueGroup: TCP, UDP
+    summary: Protocol to test on.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --source-port
+    summary: Port number from which to originate traffic.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_test_ip_flow
+  - name: --valid-status-codes
+    summary: Space-separated list of HTTP status codes considered valid.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_test-ip-flow
   name: az network watcher test-ip-flow
   summary: Test IP flow to/from a VM given the currently configured network security group rules.
-  description: Requires that Network Watcher is enabled for the region in which the VM is located. For more information visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-check-ip-flow-verify-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-check-ip-flow-verify-cli</a>.
-  langs:
-  - azurecli
+  description: Requires that Network Watcher is enabled for the region in which the VM is located. For more information visit https://docs.microsoft.com/azure/network-watcher/network-watcher-check-ip-flow-verify-cli.
+  syntax: >-
+    az network watcher test-ip-flow --direction {Inbound, Outbound}
+                                    --local
+                                    --protocol {TCP, UDP}
+                                    --remote
+                                    --vm
+                                    [--nic]
+                                    [--resource-group]
+                                    [--subscription]
   examples:
   - summary: Run test-ip-flow verify to test logical connectivity from a VM to the specified destination IPv4 address and port.
-    syntax:
-      content: >-
-        az network watcher test-ip-flow -g MyResourceGroup --direction Outbound \
-            --protocol TCP --local 10.0.0.4:* --remote 10.1.0.4:80 --vm MyVm
-  parameters:
+    syntax: >-
+      az network watcher test-ip-flow -g MyResourceGroup --direction Outbound \
+          --protocol TCP --local 10.0.0.4:* --remote 10.1.0.4:80 --vm MyVm
+  requiredParameters:
   - isRequired: true
     name: --direction
     parameterValueGroup: Inbound, Outbound
@@ -259,6 +251,7 @@ items:
     name: --vm
     summary: Name or ID of the VM to target. If the name of the VM is provided, the --resource-group is required.
     description: ''
+  optionalParameters:
   - name: --nic
     summary: Name or ID of the NIC resource to test. If the VM has multiple NICs and IP forwarding is enabled on any of them, this parameter is required.
     description: ''
@@ -268,73 +261,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_watcher_configure
-  name: az network watcher configure
-  summary: Configure the Network Watcher service for different regions.
-- uid: az_network_watcher_flow_log
-  name: az network watcher flow-log
-  summary: Manage network security group flow logging.
-- uid: az_network_watcher_flow_log_configure
-  name: az network watcher flow-log configure
-  summary: Configure flow logging on a network security group.
-- uid: az_network_watcher_flow_log_show
-  name: az network watcher flow-log show
-  summary: Get the flow log configuration of a network security group.
-- uid: az_network_watcher_list
-  name: az network watcher list
-  summary: List Network Watchers.
-- uid: az_network_watcher_packet_capture
-  name: az network watcher packet-capture
-  summary: Manage packet capture sessions on VMs.
-- uid: az_network_watcher_packet_capture_create
-  name: az network watcher packet-capture create
-  summary: Create and start a packet capture session.
-- uid: az_network_watcher_packet_capture_delete
-  name: az network watcher packet-capture delete
-  summary: Delete a packet capture session.
-- uid: az_network_watcher_packet_capture_list
-  name: az network watcher packet-capture list
-  summary: List all packet capture sessions within a resource group.
-- uid: az_network_watcher_packet_capture_show
-  name: az network watcher packet-capture show
-  summary: Show details of a packet capture session.
-- uid: az_network_watcher_packet_capture_show_status
-  name: az network watcher packet-capture show-status
-  summary: Show the status of a packet capture session.
-- uid: az_network_watcher_packet_capture_stop
-  name: az network watcher packet-capture stop
-  summary: Stop a running packet capture session.
-- uid: az_network_watcher_show_next_hop
-  name: az network watcher show-next-hop
-  summary: Get information on the 'next hop' of a VM.
-- uid: az_network_watcher_show_security_group_view
-  name: az network watcher show-security-group-view
-  summary: Get detailed security information on a VM for the currently configured network security group.
-- uid: az_network_watcher_show_topology
-  name: az network watcher show-topology
-  summary: Get the network topology of a resource group, virtual network or subnet.
-- uid: az_network_watcher_test_connectivity
-  name: az network watcher test-connectivity
-  summary: Test if a connection can be established between a Virtual Machine and a given endpoint.
-- uid: az_network_watcher_test_ip_flow
-  name: az network watcher test-ip-flow
-  summary: Test IP flow to/from a VM given the currently configured network security group rules.
-- uid: az_network_watcher_troubleshooting
-  name: az network watcher troubleshooting
-  summary: Manage Network Watcher troubleshooting sessions.
-- uid: az_network_watcher_troubleshooting_show
-  name: az network watcher troubleshooting show
-  summary: Get the results of the last troubleshooting operation.
-- uid: az_network_watcher_troubleshooting_start
-  name: az network watcher troubleshooting start
-  summary: Troubleshoot issues with VPN connections or gateway connectivity.
+- az_network_watcher_configure
+- az_network_watcher_flow-log
+- az_network_watcher_flow-log_configure
+- az_network_watcher_flow-log_show
+- az_network_watcher_list
+- az_network_watcher_packet-capture
+- az_network_watcher_packet-capture_create
+- az_network_watcher_packet-capture_delete
+- az_network_watcher_packet-capture_list
+- az_network_watcher_packet-capture_show
+- az_network_watcher_packet-capture_show-status
+- az_network_watcher_packet-capture_stop
+- az_network_watcher_show-next-hop
+- az_network_watcher_show-security-group-view
+- az_network_watcher_show-topology
+- az_network_watcher_test-connectivity
+- az_network_watcher_test-ip-flow
+- az_network_watcher_troubleshooting
+- az_network_watcher_troubleshooting_show
+- az_network_watcher_troubleshooting_start
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -350,10 +298,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: Network Watcher assists with monitoring and diagnosing conditions at a network scenario level. To learn more visit <a href="https://docs.microsoft.com/azure/network-watcher/">https://docs.microsoft.com/azure/network-watcher/</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: Network Watcher assists with monitoring and diagnosing conditions at a network scenario level. To learn more visit https://docs.microsoft.com/azure/network-watcher/.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/watcher/flow-log.yml b/2018-03-01-hybrid/docs-ref-autogen/network/watcher/flow-log.yml
index 8e1e1a39e3..7f7d4d2fb6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/watcher/flow-log.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/watcher/flow-log.yml
@@ -1,39 +1,38 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_watcher_flow_log
-  name: az network watcher flow-log
-  summary: Manage network security group flow logging.
-  description: For more information about configuring flow logs visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-nsg-flow-logging-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-nsg-flow-logging-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_watcher_flow_log_configure
-  - az_network_watcher_flow_log_show
-- uid: az_network_watcher_flow_log_configure
+### YamlMime:AzureCLIGroup
+uid: az_network_watcher_flow-log
+name: az network watcher flow-log
+summary: Manage network security group flow logging.
+description: For more information about configuring flow logs visit https://docs.microsoft.com/azure/network-watcher/network-watcher-nsg-flow-logging-cli.
+directCommands:
+- uid: az_network_watcher_flow-log_configure
   name: az network watcher flow-log configure
   summary: Configure flow logging on a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher flow-log configure --nsg
+                                          [--enabled {false, true}]
+                                          [--resource-group]
+                                          [--retention]
+                                          [--storage-account]
+                                          [--subscription]
   examples:
   - summary: Enable NSG flow logs.
-    syntax:
-      content: az network watcher flow-log configure -g MyResourceGroup --enabled true --nsg MyNsg --storage-account MyStorageAccount
+    syntax: az network watcher flow-log configure -g MyResourceGroup --enabled true --nsg MyNsg --storage-account MyStorageAccount
   - summary: Disable NSG flow logs.
-    syntax:
-      content: az network watcher flow-log configure -g MyResourceGroup --enabled false --nsg MyNsg
-  parameters:
+    syntax: az network watcher flow-log configure -g MyResourceGroup --enabled false --nsg MyNsg
+  requiredParameters:
   - isRequired: true
     name: --nsg
     summary: Name or ID of the Network Security Group to target.
     description: ''
+  optionalParameters:
   - name: --enabled
     defaultValue: "true"
     parameterValueGroup: false, true
     summary: Enable logging.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --retention
     summary: Number of days to retain logs.
@@ -44,51 +43,42 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_flow_log_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_flow-log_show
   name: az network watcher flow-log show
   summary: Get the flow log configuration of a network security group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher flow-log show [--location]
+                                     [--nsg]
+                                     [--query-examples]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: Show NSG flow logs. (Deprecated)
-    syntax:
-      content: az network watcher flow-log show -g MyResourceGroup --nsg MyNsg
+    syntax: az network watcher flow-log show -g MyResourceGroup --nsg MyNsg
   - summary: Show NSG flow logs with Azure Resource Management formatted.
-    syntax:
-      content: az network watcher flow-log show --location MyNetworkWatcher --name MyFlowLog
-  parameters:
+    syntax: az network watcher flow-log show --location MyNetworkWatcher --name MyFlowLog
+  optionalParameters:
   - name: --location -l
     summary: Location to identify the exclusive Network Watcher under a region. Only one Network Watcher can be existed per subscription and region.
     description: ''
   - name: --nsg
     summary: Name or ID of the network security group.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_watcher_flow_log_configure
-  name: az network watcher flow-log configure
-  summary: Configure flow logging on a network security group.
-- uid: az_network_watcher_flow_log_show
-  name: az network watcher flow-log show
-  summary: Get the flow log configuration of a network security group.
+- az_network_watcher_flow-log_configure
+- az_network_watcher_flow-log_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +94,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information about configuring flow logs visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-nsg-flow-logging-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-nsg-flow-logging-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information about configuring flow logs visit https://docs.microsoft.com/azure/network-watcher/network-watcher-nsg-flow-logging-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/watcher/packet-capture.yml b/2018-03-01-hybrid/docs-ref-autogen/network/watcher/packet-capture.yml
index a3b77f3eee..b3548acbd8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/watcher/packet-capture.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/watcher/packet-capture.yml
@@ -1,55 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_watcher_packet_capture
-  name: az network watcher packet-capture
-  summary: Manage packet capture sessions on VMs.
-  description: These commands require that both Azure Network Watcher is enabled for the VMs region and that AzureNetworkWatcherExtension is enabled on the VM. For more information visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-packet-capture-manage-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-packet-capture-manage-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_watcher_packet_capture_create
-  - az_network_watcher_packet_capture_delete
-  - az_network_watcher_packet_capture_list
-  - az_network_watcher_packet_capture_show
-  - az_network_watcher_packet_capture_show_status
-  - az_network_watcher_packet_capture_stop
-- uid: az_network_watcher_packet_capture_create
+### YamlMime:AzureCLIGroup
+uid: az_network_watcher_packet-capture
+name: az network watcher packet-capture
+summary: Manage packet capture sessions on VMs.
+description: These commands require that both Azure Network Watcher is enabled for the VMs region and that AzureNetworkWatcherExtension is enabled on the VM. For more information visit https://docs.microsoft.com/azure/network-watcher/network-watcher-packet-capture-manage-cli.
+directCommands:
+- uid: az_network_watcher_packet-capture_create
   name: az network watcher packet-capture create
   summary: Create and start a packet capture session.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher packet-capture create --name
+                                             --resource-group
+                                             --vm
+                                             [--capture-limit]
+                                             [--capture-size]
+                                             [--file-path]
+                                             [--filters]
+                                             [--storage-account]
+                                             [--storage-path]
+                                             [--subscription]
+                                             [--time-limit]
   examples:
   - summary: Create a packet capture session on a VM.
-    syntax:
-      content: az network watcher packet-capture create -g MyResourceGroup -n MyPacketCaptureName --vm MyVm --storage-account MyStorageAccount
+    syntax: az network watcher packet-capture create -g MyResourceGroup -n MyPacketCaptureName --vm MyVm --storage-account MyStorageAccount
   - summary: Create a packet capture session on a VM with optional filters for protocols, local IP address and remote IP address ranges and ports.
-    syntax:
-      content: >-
-        az network watcher packet-capture create -g MyResourceGroup -n MyPacketCaptureName --vm MyVm \
-            --storage-account MyStorageAccount --filters '[ \
-                { \
-                    "protocol":"TCP", \
-                    "remoteIPAddress":"1.1.1.1-255.255.255", \
-                    "localIPAddress":"10.0.0.3", \
-                    "remotePort":"20" \
-                }, \
-                { \
-                    "protocol":"TCP", \
-                    "remoteIPAddress":"1.1.1.1-255.255.255", \
-                    "localIPAddress":"10.0.0.3", \
-                    "remotePort":"80" \
-                }, \
-                { \
-                    "protocol":"TCP", \
-                    "remoteIPAddress":"1.1.1.1-255.255.255", \
-                    "localIPAddress":"10.0.0.3", \
-                    "remotePort":"443" \
-                }, \
-                { \
-                    "protocol":"UDP" \
-                }]'
-  parameters:
+    syntax: >-
+      az network watcher packet-capture create -g MyResourceGroup -n MyPacketCaptureName --vm MyVm \
+          --storage-account MyStorageAccount --filters '[ \
+              { \
+                  "protocol":"TCP", \
+                  "remoteIPAddress":"1.1.1.1-255.255.255", \
+                  "localIPAddress":"10.0.0.3", \
+                  "remotePort":"20" \
+              }, \
+              { \
+                  "protocol":"TCP", \
+                  "remoteIPAddress":"1.1.1.1-255.255.255", \
+                  "localIPAddress":"10.0.0.3", \
+                  "remotePort":"80" \
+              }, \
+              { \
+                  "protocol":"TCP", \
+                  "remoteIPAddress":"1.1.1.1-255.255.255", \
+                  "localIPAddress":"10.0.0.3", \
+                  "remotePort":"443" \
+              }, \
+              { \
+                  "protocol":"UDP" \
+              }]'
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the packet capture session.
@@ -62,21 +61,19 @@ items:
     name: --vm
     summary: Name or ID of the VM to target.
     description: ''
+  optionalParameters:
   - name: --capture-limit
     summary: The maximum size in bytes of the capture output.
     description: ''
   - name: --capture-size
     summary: Number of bytes captured per packet. Excess bytes are truncated.
     description: ''
-  - name: --filters
-    summary: JSON encoded list of packet filters. Use `@{path}` to load from file.
-    description: ''
-  - name: --time-limit
-    summary: Maximum duration of the capture session in seconds.
-    description: ''
   - name: --file-path
     summary: Local path on the targeted VM at which to save the packet capture. For Linux VMs, the path must start with /var/captures.
     description: ''
+  - name: --filters
+    summary: JSON encoded list of packet filters. Use `@{path}` to load from file.
+    description: ''
   - name: --storage-account
     summary: Name or ID of a storage account to save the packet capture to.
     description: ''
@@ -86,173 +83,149 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_packet_capture_delete
+  - name: --time-limit
+    summary: Maximum duration of the capture session in seconds.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_packet-capture_delete
   name: az network watcher packet-capture delete
   summary: Delete a packet capture session.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher packet-capture delete --location
+                                             --name
+                                             [--subscription]
   examples:
   - summary: Delete a packet capture session. This only deletes the session and not the capture file.
-    syntax:
-      content: az network watcher packet-capture delete -n packetCaptureName -l westcentralus
+    syntax: az network watcher packet-capture delete -n packetCaptureName -l westcentralus
   - summary: Delete a packet capture session. (autogenerated)
-    syntax:
-      content: az network watcher packet-capture delete --location westcentralus --name packetCaptureName --subscription MySubscription
-  parameters:
+    syntax: az network watcher packet-capture delete --location westcentralus --name packetCaptureName --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
     summary: The name of the packet capture session.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_packet_capture_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_packet-capture_list
   name: az network watcher packet-capture list
   summary: List all packet capture sessions within a resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher packet-capture list --location
+                                           [--query-examples]
+                                           [--subscription]
   examples:
   - summary: List all packet capture sessions within a region.
-    syntax:
-      content: az network watcher packet-capture list -l westus
+    syntax: az network watcher packet-capture list -l westus
   - summary: List all packet capture sessions within a resource group (autogenerated)
-    syntax:
-      content: az network watcher packet-capture list --location westus --subscription MySubscription
-  parameters:
+    syntax: az network watcher packet-capture list --location westus --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_packet_capture_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_packet-capture_show
   name: az network watcher packet-capture show
   summary: Show details of a packet capture session.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher packet-capture show --location
+                                           --name
+                                           [--query-examples]
+                                           [--subscription]
   examples:
   - summary: Show a packet capture session.
-    syntax:
-      content: az network watcher packet-capture show -l westus -n MyPacketCapture
-  parameters:
+    syntax: az network watcher packet-capture show -l westus -n MyPacketCapture
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
     summary: The name of the packet capture session.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_packet_capture_show_status
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_packet-capture_show-status
   name: az network watcher packet-capture show-status
   summary: Show the status of a packet capture session.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher packet-capture show-status --location
+                                                  --name
+                                                  [--subscription]
   examples:
   - summary: Show the status of a packet capture session.
-    syntax:
-      content: az network watcher packet-capture show-status -l westus -n MyPacketCapture
-  parameters:
+    syntax: az network watcher packet-capture show-status -l westus -n MyPacketCapture
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
     summary: The name given to the packet capture session.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_network_watcher_packet_capture_stop
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
+- uid: az_network_watcher_packet-capture_stop
   name: az network watcher packet-capture stop
   summary: Stop a running packet capture session.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher packet-capture stop --location
+                                           --name
+                                           [--subscription]
   examples:
   - summary: Stop a running packet capture session.
-    syntax:
-      content: az network watcher packet-capture stop -l westus -n MyPacketCapture
-  parameters:
+    syntax: az network watcher packet-capture stop -l westus -n MyPacketCapture
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
     summary: The name of the packet capture session.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_watcher_packet_capture_create
-  name: az network watcher packet-capture create
-  summary: Create and start a packet capture session.
-- uid: az_network_watcher_packet_capture_delete
-  name: az network watcher packet-capture delete
-  summary: Delete a packet capture session.
-- uid: az_network_watcher_packet_capture_list
-  name: az network watcher packet-capture list
-  summary: List all packet capture sessions within a resource group.
-- uid: az_network_watcher_packet_capture_show
-  name: az network watcher packet-capture show
-  summary: Show details of a packet capture session.
-- uid: az_network_watcher_packet_capture_show_status
-  name: az network watcher packet-capture show-status
-  summary: Show the status of a packet capture session.
-- uid: az_network_watcher_packet_capture_stop
-  name: az network watcher packet-capture stop
-  summary: Stop a running packet capture session.
+- az_network_watcher_packet-capture_create
+- az_network_watcher_packet-capture_delete
+- az_network_watcher_packet-capture_list
+- az_network_watcher_packet-capture_show
+- az_network_watcher_packet-capture_show-status
+- az_network_watcher_packet-capture_stop
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -268,10 +241,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: These commands require that both Azure Network Watcher is enabled for the VMs region and that AzureNetworkWatcherExtension is enabled on the VM. For more information visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-packet-capture-manage-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-packet-capture-manage-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: These commands require that both Azure Network Watcher is enabled for the VMs region and that AzureNetworkWatcherExtension is enabled on the VM. For more information visit https://docs.microsoft.com/azure/network-watcher/network-watcher-packet-capture-manage-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/network/watcher/troubleshooting.yml b/2018-03-01-hybrid/docs-ref-autogen/network/watcher/troubleshooting.yml
index 8229b515a2..a21fbf1af8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/network/watcher/troubleshooting.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/network/watcher/troubleshooting.yml
@@ -1,31 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_network_watcher_troubleshooting
-  name: az network watcher troubleshooting
-  summary: Manage Network Watcher troubleshooting sessions.
-  description: For more information on configuring troubleshooting visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-troubleshoot-manage-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-troubleshoot-manage-cli</a>.
-  langs:
-  - azurecli
-  children:
-  - az_network_watcher_troubleshooting_show
-  - az_network_watcher_troubleshooting_start
+### YamlMime:AzureCLIGroup
+uid: az_network_watcher_troubleshooting
+name: az network watcher troubleshooting
+summary: Manage Network Watcher troubleshooting sessions.
+description: For more information on configuring troubleshooting visit https://docs.microsoft.com/azure/network-watcher/network-watcher-troubleshoot-manage-cli.
+directCommands:
 - uid: az_network_watcher_troubleshooting_show
   name: az network watcher troubleshooting show
   summary: Get the results of the last troubleshooting operation.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher troubleshooting show --resource
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--resource-type {vnetGateway, vpnConnection}]
+                                            [--subscription]
   examples:
   - summary: Show the results or status of a troubleshooting operation for a Vnet Gateway.
-    syntax:
-      content: az network watcher troubleshooting show -g MyResourceGroup --resource MyVnetGateway --resource-type vnetGateway
-  parameters:
+    syntax: az network watcher troubleshooting show -g MyResourceGroup --resource MyVnetGateway --resource-type vnetGateway
+  requiredParameters:
   - isRequired: true
     name: --resource
     summary: Name or ID of the resource to troubleshoot.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type -t
     parameterValueGroup: vnetGateway, vpnConnection
@@ -34,26 +36,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 - uid: az_network_watcher_troubleshooting_start
   name: az network watcher troubleshooting start
   summary: Troubleshoot issues with VPN connections or gateway connectivity.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az network watcher troubleshooting start --resource
+                                             --storage-account
+                                             --storage-path
+                                             [--no-wait]
+                                             [--resource-group]
+                                             [--resource-type {vnetGateway, vpnConnection}]
+                                             [--subscription]
   examples:
   - summary: Start a troubleshooting operation on a VPN Connection.
-    syntax:
-      content: >-
-        az network watcher troubleshooting start -g MyResourceGroup --resource MyVPNConnection \
-            --resource-type vpnConnection --storage-account MyStorageAccount \
-            --storage-path https://{storageAccountName}.blob.core.windows.net/{containerName}
-  parameters:
+    syntax: >-
+      az network watcher troubleshooting start -g MyResourceGroup --resource MyVPNConnection \
+          --resource-type vpnConnection --storage-account MyStorageAccount \
+          --storage-path https://{storageAccountName}.blob.core.windows.net/{containerName}
+  requiredParameters:
   - isRequired: true
     name: --resource
     summary: Name or ID of the resource to troubleshoot.
@@ -66,11 +68,12 @@ items:
     name: --storage-path
     summary: Fully qualified URI to the storage blob container in which to store the troubleshooting results.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type -t
     parameterValueGroup: vnetGateway, vpnConnection
@@ -79,19 +82,10 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/network/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/network/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
 commands:
-- uid: az_network_watcher_troubleshooting_show
-  name: az network watcher troubleshooting show
-  summary: Get the results of the last troubleshooting operation.
-- uid: az_network_watcher_troubleshooting_start
-  name: az network watcher troubleshooting start
-  summary: Troubleshoot issues with VPN connections or gateway connectivity.
+- az_network_watcher_troubleshooting_show
+- az_network_watcher_troubleshooting_start
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -107,10 +101,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/network/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/network/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/0342c0029838c2102111ff937dac12fd7fb48731/src/azure-cli/azure/cli/command_modules/network/_help.py
-updated_at: 5/20/2020 7:45:37 AM
-ms.date: 05/20/2020
-description: For more information on configuring troubleshooting visit <a href="https://docs.microsoft.com/azure/network-watcher/network-watcher-troubleshoot-manage-cli">https://docs.microsoft.com/azure/network-watcher/network-watcher-troubleshoot-manage-cli</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/20/2021
+  description: For more information on configuring troubleshooting visit https://docs.microsoft.com/azure/network-watcher/network-watcher-troubleshoot-manage-cli.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub.yml
new file mode 100644
index 0000000000..f0f4b330b0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub
+name: az notification-hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Notification Hubs.
+description: ''
+directCommands:
+- uid: az_notification-hub_check-availability
+  name: az notification-hub check-availability
+  summary: Check the availability of the given notificationHub in a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub check-availability --name
+                                           --namespace-name
+                                           --resource-group
+  examples:
+  - summary: Check the availability of the given notificationHub name
+    syntax: >-
+      az notification-hub check-availability --resource-group MyResourceGroup \
+
+      --namespace-name "locp-newns" --name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name to check.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_create
+  name: az notification-hub create
+  summary: Create a NotificationHub in a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub create --location
+                               --name
+                               --namespace-name
+                               --resource-group
+                               [--registration-ttl]
+                               [--tags]
+  examples:
+  - summary: Create a Notification Hub
+    syntax: >-
+      az notification-hub create --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --name my-hub --location "South Central US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --registration-ttl
+    summary: The RegistrationTtl of the created NotificationHub.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_notification-hub_delete
+  name: az notification-hub delete
+  summary: Delete a notification hub associated with a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub delete --name
+                               --namespace-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a notification hub
+    syntax: >-
+      az notification-hub delete --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_notification-hub_list
+  name: az notification-hub list
+  summary: List the notification hubs associated with a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub list --namespace-name
+                             --resource-group
+  examples:
+  - summary: List the notification hubs
+    syntax: az notification-hub list --resource-group MyResourceGroup --namespace-name my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_show
+  name: az notification-hub show
+  summary: Show the notification hub information.
+  description: ''
+  syntax: >-
+    az notification-hub show --name
+                             --namespace-name
+                             --resource-group
+  examples:
+  - summary: Show the Notification Hub info
+    syntax: >-
+      az notification-hub show --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_test-send
+  name: az notification-hub test-send
+  summary: Test send a push notification.
+  description: ''
+  syntax: >-
+    az notification-hub test-send --namespace-name
+                                  --notification-format {apple, baidu, gcm, template, windows, windowsphone}
+                                  --notification-hub-name
+                                  --resource-group
+                                  [--message]
+                                  [--payload]
+                                  [--tag]
+                                  [--title]
+  examples:
+  - summary: test send notification with message body
+    syntax: >-
+      az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --notification-format gcm \
+
+      --message "test notification"
+  - summary: test send notification from file
+    syntax: >-
+      az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --notification-format gcm \
+
+      --payload @path/to/file
+  - summary: test send notification with json string
+    syntax: >-
+      az notification-hub test-send --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --notification-format gcm \
+
+      --payload "{\"data\":{\"message\":\"test notification\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-format
+    parameterValueGroup: apple, baidu, gcm, template, windows, windowsphone
+    summary: The format of notification message.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --message
+    summary: The message body to send. If not None, payload will be ignored.
+    description: ''
+  - name: --payload
+    summary: The payload for the message in JSON format.
+    description: ''
+  - name: --tag
+    summary: You can send test notifications to a specific set of registrations using this option. Leave this field empty if you like to send push notifications to 10 random registrations on the selected platform.
+    description: ''
+  - name: --title
+    summary: The title of the notification.
+    description: ''
+- uid: az_notification-hub_update
+  name: az notification-hub update
+  summary: Update a Notification Hub in a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub update --name
+                               --namespace-name
+                               --resource-group
+                               [--tags]
+  examples:
+  - summary: Update the Notification Hub
+    syntax: >-
+      az notification-hub update --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --name "sdk-notificationHubs-8708"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_notification-hub_authorization-rule
+- az_notification-hub_authorization-rule_create
+- az_notification-hub_authorization-rule_delete
+- az_notification-hub_authorization-rule_list
+- az_notification-hub_authorization-rule_list-keys
+- az_notification-hub_authorization-rule_regenerate-keys
+- az_notification-hub_authorization-rule_show
+- az_notification-hub_check-availability
+- az_notification-hub_create
+- az_notification-hub_credential
+- az_notification-hub_credential_adm
+- az_notification-hub_credential_adm_update
+- az_notification-hub_credential_apns
+- az_notification-hub_credential_apns_update
+- az_notification-hub_credential_baidu
+- az_notification-hub_credential_baidu_update
+- az_notification-hub_credential_gcm
+- az_notification-hub_credential_gcm_update
+- az_notification-hub_credential_list
+- az_notification-hub_credential_mpns
+- az_notification-hub_credential_mpns_update
+- az_notification-hub_credential_wns
+- az_notification-hub_credential_wns_update
+- az_notification-hub_delete
+- az_notification-hub_list
+- az_notification-hub_namespace
+- az_notification-hub_namespace_authorization-rule
+- az_notification-hub_namespace_authorization-rule_create
+- az_notification-hub_namespace_authorization-rule_delete
+- az_notification-hub_namespace_authorization-rule_list
+- az_notification-hub_namespace_authorization-rule_list-keys
+- az_notification-hub_namespace_authorization-rule_regenerate-keys
+- az_notification-hub_namespace_authorization-rule_show
+- az_notification-hub_namespace_check-availability
+- az_notification-hub_namespace_create
+- az_notification-hub_namespace_delete
+- az_notification-hub_namespace_list
+- az_notification-hub_namespace_show
+- az_notification-hub_namespace_update
+- az_notification-hub_namespace_wait
+- az_notification-hub_show
+- az_notification-hub_test-send
+- az_notification-hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Notification Hubs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/authorization-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/authorization-rule.yml
new file mode 100644
index 0000000000..c8cd0ff962
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/authorization-rule.yml
@@ -0,0 +1,240 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_authorization-rule
+name: az notification-hub authorization-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub authorization-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hubs authorization rule.
+description: ''
+directCommands:
+- uid: az_notification-hub_authorization-rule_create
+  name: az notification-hub authorization-rule create
+  summary: Create an authorization rule for a NotificationHub.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule create --name
+                                                  --namespace-name
+                                                  --notification-hub-name
+                                                  --resource-group
+                                                  --rights
+  examples:
+  - summary: Create an authorization rule
+    syntax: >-
+      az notification-hub authorization-rule create --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature --rights Listen Send
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rights
+    summary: The rights associated with the rule.
+    description: ''
+- uid: az_notification-hub_authorization-rule_delete
+  name: az notification-hub authorization-rule delete
+  summary: Delete a notificationHub authorization rule.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule delete --name
+                                                  --namespace-name
+                                                  --notification-hub-name
+                                                  --resource-group
+  examples:
+  - summary: Delete the authorization rule
+    syntax: >-
+      az notification-hub authorization-rule delete --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_list
+  name: az notification-hub authorization-rule list
+  summary: List the authorization rules for a NotificationHub.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule list --namespace-name
+                                                --notification-hub-name
+                                                --resource-group
+  examples:
+  - summary: List authorization rules
+    syntax: >-
+      az notification-hub authorization-rule list --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_list-keys
+  name: az notification-hub authorization-rule list-keys
+  summary: List the Primary and Secondary ConnectionStrings to the NotificationHub.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule list-keys --name
+                                                     --namespace-name
+                                                     --notification-hub-name
+                                                     --resource-group
+  examples:
+  - summary: List connectionStrings of the authorization rule
+    syntax: >-
+      az notification-hub authorization-rule list-keys --resource-group MyResourceGroup --namespace-name my-namespace \
+
+      --notification-hub-name my-hub --name "sdk-AuthRules-5800"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_regenerate-keys
+  name: az notification-hub authorization-rule regenerate-keys
+  summary: Regenerate the Primary/Secondary Keys to the NotificationHub Authorization Rule.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule regenerate-keys --name
+                                                           --namespace-name
+                                                           --notification-hub-name
+                                                           --policy-key {Primary Key, Secondary Key}
+                                                           --resource-group
+  examples:
+  - summary: Regenerate the Notification Hub authorization rule
+    syntax: >-
+      az notification-hub authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature --policy-key "Secondary Key"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --policy-key
+    parameterValueGroup: Primary Key, Secondary Key
+    summary: Name of the key that has to be regenerated for the Notification Hub Authorization Rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_authorization-rule_show
+  name: az notification-hub authorization-rule show
+  summary: Show an authorization rule for a NotificationHub by name.
+  description: ''
+  syntax: >-
+    az notification-hub authorization-rule show --name
+                                                --namespace-name
+                                                --notification-hub-name
+                                                --resource-group
+  examples:
+  - summary: Show the authorization rule information
+    syntax: >-
+      az notification-hub authorization-rule show --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --name \
+
+      DefaultListenSharedAccessSignature
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_authorization-rule_create
+- az_notification-hub_authorization-rule_delete
+- az_notification-hub_authorization-rule_list
+- az_notification-hub_authorization-rule_list-keys
+- az_notification-hub_authorization-rule_regenerate-keys
+- az_notification-hub_authorization-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hubs authorization rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential.yml
new file mode 100644
index 0000000000..00ffabd2a6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential.yml
@@ -0,0 +1,68 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential
+name: az notification-hub credential
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential.
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_list
+  name: az notification-hub credential list
+  summary: List the PNS Credentials associated with a notification hub .
+  description: ''
+  syntax: >-
+    az notification-hub credential list --namespace-name
+                                        --notification-hub-name
+                                        --resource-group
+  examples:
+  - summary: List the PNS Credentials
+    syntax: >-
+      az notification-hub credential list --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --notification-hub-name my-hub
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_adm
+- az_notification-hub_credential_adm_update
+- az_notification-hub_credential_apns
+- az_notification-hub_credential_apns_update
+- az_notification-hub_credential_baidu
+- az_notification-hub_credential_baidu_update
+- az_notification-hub_credential_gcm
+- az_notification-hub_credential_gcm_update
+- az_notification-hub_credential_list
+- az_notification-hub_credential_mpns
+- az_notification-hub_credential_mpns_update
+- az_notification-hub_credential_wns
+- az_notification-hub_credential_wns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/adm.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/adm.yml
new file mode 100644
index 0000000000..c5e6974667
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/adm.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_adm
+name: az notification-hub credential adm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential adm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Amazon(ADM).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_adm_update
+  name: az notification-hub credential adm update
+  summary: Update credential for Amazon(ADM).
+  description: ''
+  syntax: >-
+    az notification-hub credential adm update --client-id
+                                              --client-secret
+                                              --namespace-name
+                                              --notification-hub-name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --client-id
+    summary: The client identifier.
+    description: ''
+  - isRequired: true
+    name: --client-secret
+    summary: The credential secret access key.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_adm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Amazon(ADM).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/apns.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/apns.yml
new file mode 100644
index 0000000000..9521314e97
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/apns.yml
@@ -0,0 +1,88 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_apns
+name: az notification-hub credential apns
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential apns** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Apple(APNS).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_apns_update
+  name: az notification-hub credential apns update
+  summary: Update credential for Apple(APNS).
+  description: ''
+  syntax: >-
+    az notification-hub credential apns update --namespace-name
+                                               --notification-hub-name
+                                               --resource-group
+                                               [--apns-certificate]
+                                               [--app-id]
+                                               [--app-name]
+                                               [--certificate-key]
+                                               [--endpoint]
+                                               [--key-id]
+                                               [--token]
+  examples:
+  - summary: Update APNS certificate
+    syntax: >-
+      az notification-hub credential apns update --namespace-name my-namespace \
+
+      --notification-hub-name my-hub --apns-certificate "/path/to/certificate" \
+
+      --certificate-key "xxxxxx" --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --apns-certificate
+    summary: The APNS certificate.
+    description: ''
+  - name: --app-id
+    summary: The issuer (iss) registered claim key, whose value is your 10-character Team ID, obtained from your developer account.
+    description: ''
+  - name: --app-name
+    summary: The name of the application/bundle id.
+    description: ''
+  - name: --certificate-key
+    summary: The certificate key.
+    description: ''
+  - name: --endpoint
+    defaultValue: gateway.push.apple.com
+    summary: The endpoint of this credential. Example values:"gateway.sandbox.push.apple.com","gateway.push.apple.com".
+    description: ''
+  - name: --key-id
+    summary: A 10-character key identifier (kid) key, obtained from your developer account.
+    description: ''
+  - name: --token
+    summary: Provider Authentication Token, obtained through your developer account.
+    description: ''
+commands:
+- az_notification-hub_credential_apns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Apple(APNS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/baidu.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/baidu.yml
new file mode 100644
index 0000000000..f769100f46
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/baidu.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_baidu
+name: az notification-hub credential baidu
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential baidu** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Baidu(Andrioid China).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_baidu_update
+  name: az notification-hub credential baidu update
+  summary: Update credential for Baidu(Andrioid China).
+  description: ''
+  syntax: >-
+    az notification-hub credential baidu update --api-key
+                                                --namespace-name
+                                                --notification-hub-name
+                                                --resource-group
+                                                --secret-key
+  requiredParameters:
+  - isRequired: true
+    name: --api-key
+    summary: Baidu API key.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-key
+    summary: Baidu secret key.
+    description: ''
+commands:
+- az_notification-hub_credential_baidu_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Baidu(Andrioid China).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/gcm.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/gcm.yml
new file mode 100644
index 0000000000..46f43e189c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/gcm.yml
@@ -0,0 +1,63 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_gcm
+name: az notification-hub credential gcm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential gcm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Google(GCM/FCM).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_gcm_update
+  name: az notification-hub credential gcm update
+  summary: Update the Google GCM/FCM API key.
+  description: ''
+  syntax: >-
+    az notification-hub credential gcm update --google-api-key
+                                              --namespace-name
+                                              --notification-hub-name
+                                              --resource-group
+  examples:
+  - summary: Update gcm key
+    syntax: >-
+      az notification-hub credential gcm update --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --notification-hub-name my-hub --google-api-key \
+
+      "xxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --google-api-key
+    summary: Google GCM/FCM API key.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_gcm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Google(GCM/FCM).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/mpns.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/mpns.yml
new file mode 100644
index 0000000000..a6f250bedd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/mpns.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_mpns
+name: az notification-hub credential mpns
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential mpns** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Windows Phone(MPNS).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_mpns_update
+  name: az notification-hub credential mpns update
+  summary: Update credential for Windows Phone(MPNS).
+  description: ''
+  syntax: >-
+    az notification-hub credential mpns update --certificate-key
+                                               --mpns-certificate
+                                               --namespace-name
+                                               --notification-hub-name
+                                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --certificate-key
+    summary: The certificate key for this credential.
+    description: ''
+  - isRequired: true
+    name: --mpns-certificate
+    summary: The MPNS certificate.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_credential_mpns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Windows Phone(MPNS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/wns.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/wns.yml
new file mode 100644
index 0000000000..d4a42d471a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/credential/wns.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_credential_wns
+name: az notification-hub credential wns
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub credential wns** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub credential for Windows(WNS).
+description: ''
+directCommands:
+- uid: az_notification-hub_credential_wns_update
+  name: az notification-hub credential wns update
+  summary: Update credential for Windows(WNS).
+  description: ''
+  syntax: >-
+    az notification-hub credential wns update --namespace-name
+                                              --notification-hub-name
+                                              --package-sid
+                                              --resource-group
+                                              --secret-key
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --notification-hub-name
+    summary: The notification hub name.
+    description: ''
+  - isRequired: true
+    name: --package-sid
+    summary: The package ID for this credential.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-key
+    summary: The secret key.
+    description: ''
+commands:
+- az_notification-hub_credential_wns_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub credential for Windows(WNS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/namespace.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/namespace.yml
new file mode 100644
index 0000000000..41bd002e3a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/namespace.yml
@@ -0,0 +1,241 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_namespace
+name: az notification-hub namespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub namespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hub namespace.
+description: ''
+directCommands:
+- uid: az_notification-hub_namespace_check-availability
+  name: az notification-hub namespace check-availability
+  summary: Check the availability of the given service namespace across all Azure subscriptions. This is useful because the domain name is created based on the service namespace name.
+  description: ''
+  syntax: az notification-hub namespace check-availability --name
+  examples:
+  - summary: Check name availability of namespace
+    syntax: az notification-hub namespace check-availability --name "my-test-space"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name to check.
+    description: ''
+- uid: az_notification-hub_namespace_create
+  name: az notification-hub namespace create
+  summary: Create a service namespace. Once created, this namespace's resource manifest is immutable. This operation is idempotent.
+  description: ''
+  syntax: >-
+    az notification-hub namespace create --name
+                                         --resource-group
+                                         --sku {Basic, Free, Standard}
+                                         [--location]
+                                         [--tags]
+  examples:
+  - summary: Create a namespace
+    syntax: >-
+      az notification-hub namespace create --resource-group MyResourceGroup --name \
+
+      my-namespace --location "South Central US" --sku Standard
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: Basic, Free, Standard
+    summary: Name of the notification hub sku.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_notification-hub_namespace_delete
+  name: az notification-hub namespace delete
+  summary: Delete an existing namespace. This operation also removes all associated notification hubs under the namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace delete --name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete the namespace
+    syntax: >-
+      az notification-hub namespace delete --resource-group MyResourceGroup --name \
+
+      my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_notification-hub_namespace_list
+  name: az notification-hub namespace list
+  summary: List available namespaces.
+  description: ''
+  syntax: az notification-hub namespace list [--resource-group]
+  examples:
+  - summary: List available namespaces within a resource group
+    syntax: az notification-hub namespace list --resource-group MyResourceGroup
+  - summary: List all the available namespaces within the subscription irrespective of the resourceGroups
+    syntax: az notification-hub namespace list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_show
+  name: az notification-hub namespace show
+  summary: Return the description for the specified namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace show --name
+                                       --resource-group
+  examples:
+  - summary: Show namespace info
+    syntax: >-
+      az notification-hub namespace show --resource-group MyResourceGroup --name \
+
+      my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_update
+  name: az notification-hub namespace update
+  summary: Update a service namespace. The namespace's resource manifest is immutable and cannot be modified.
+  description: ''
+  syntax: >-
+    az notification-hub namespace update --name
+                                         --resource-group
+                                         [--sku {Basic, Free, Standard}]
+                                         [--tags]
+  examples:
+  - summary: Update the namespace
+    syntax: >-
+      az notification-hub namespace update --resource-group MyResourceGroup --name \
+
+      my-namespace --sku Standard
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: Basic, Free, Standard
+    summary: Name of the notification hub sku.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_notification-hub_namespace_wait
+  name: az notification-hub namespace wait
+  summary: Place the CLI in a waiting state until a condition of the Notification Hub Namesapce is met.
+  description: ''
+  syntax: >-
+    az notification-hub namespace wait --name
+                                       --resource-group
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Notification Hub Namesapce is successfully provisioned.
+    syntax: az notification-hub namespace wait --resource-group MyResourceGroup --name \ my-namespace --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_notification-hub_namespace_authorization-rule
+- az_notification-hub_namespace_authorization-rule_create
+- az_notification-hub_namespace_authorization-rule_delete
+- az_notification-hub_namespace_authorization-rule_list
+- az_notification-hub_namespace_authorization-rule_list-keys
+- az_notification-hub_namespace_authorization-rule_regenerate-keys
+- az_notification-hub_namespace_authorization-rule_show
+- az_notification-hub_namespace_check-availability
+- az_notification-hub_namespace_create
+- az_notification-hub_namespace_delete
+- az_notification-hub_namespace_list
+- az_notification-hub_namespace_show
+- az_notification-hub_namespace_update
+- az_notification-hub_namespace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hub namespace.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/notification-hub/namespace/authorization-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/namespace/authorization-rule.yml
new file mode 100644
index 0000000000..95fb1791bd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/notification-hub/namespace/authorization-rule.yml
@@ -0,0 +1,207 @@
+### YamlMime:AzureCLIGroup
+uid: az_notification-hub_namespace_authorization-rule
+name: az notification-hub namespace authorization-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **notification-hub** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az notification-hub namespace authorization-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage notification hubs namespace authorization rule.
+description: ''
+directCommands:
+- uid: az_notification-hub_namespace_authorization-rule_create
+  name: az notification-hub namespace authorization-rule create
+  summary: Create an authorization rule for a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule create --name
+                                                            --namespace-name
+                                                            --resource-group
+                                                            --rights
+  examples:
+  - summary: Create a namespace authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule create --resource-group \
+
+      MyResourceGroup --namespace-name my-namespace --name "sdk-AuthRules-1788" --rights Listen Send
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rights
+    summary: The rights associated with the rule.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_delete
+  name: az notification-hub namespace authorization-rule delete
+  summary: Delete a namespace authorization rule.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule delete --name
+                                                            --namespace-name
+                                                            --resource-group
+                                                            [--yes]
+  examples:
+  - summary: Delete a namespace authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule delete --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --name "RootManageSharedAccessKey"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_list
+  name: az notification-hub namespace authorization-rule list
+  summary: List the authorization rules for a namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule list --namespace-name
+                                                          --resource-group
+  examples:
+  - summary: List authorization rules of the namespace
+    syntax: >-
+      az notification-hub namespace authorization-rule list --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace
+  requiredParameters:
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_list-keys
+  name: az notification-hub namespace authorization-rule list-keys
+  summary: List the Primary and Secondary ConnectionStrings to the namespace.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule list-keys --name
+                                                               --namespace-name
+                                                               --resource-group
+  examples:
+  - summary: List keys of the namesapce authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule list-keys --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --name "RootManageSharedAccessKey"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_regenerate-keys
+  name: az notification-hub namespace authorization-rule regenerate-keys
+  summary: Regenerate the Primary/Secondary Keys to the Namespace Authorization Rule.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule regenerate-keys --name
+                                                                     --namespace-name
+                                                                     --policy-key {Primary Key, Secondary Key}
+                                                                     --resource-group
+  examples:
+  - summary: Regenerate keys of the namesapce authorization rule
+    syntax: >-
+      az notification-hub namespace authorization-rule regenerate-keys --resource-group MyResourceGroup --namespace-name \
+
+      my-namespace --name "RootManageSharedAccessKey" --policy-key "Secondary Key"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --policy-key
+    parameterValueGroup: Primary Key, Secondary Key
+    summary: Name of the key that has to be regenerated for the Namespace Authorization Rule.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_notification-hub_namespace_authorization-rule_show
+  name: az notification-hub namespace authorization-rule show
+  summary: Show an authorization rule for a namespace by name.
+  description: ''
+  syntax: >-
+    az notification-hub namespace authorization-rule show --name
+                                                          --namespace-name
+                                                          --resource-group
+  examples:
+  - summary: Show namespace authorization rule info
+    syntax: >-
+      az notification-hub namespace authorization-rule show --resource-group MyResourceGroup \
+
+      --namespace-name my-namespace --name "RootManageSharedAccessKey"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The authorization rule name.
+    description: ''
+  - isRequired: true
+    name: --namespace-name
+    summary: The namespace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_notification-hub_namespace_authorization-rule_create
+- az_notification-hub_namespace_authorization-rule_delete
+- az_notification-hub_namespace_authorization-rule_list
+- az_notification-hub_namespace_authorization-rule_list-keys
+- az_notification-hub_namespace_authorization-rule_regenerate-keys
+- az_notification-hub_namespace_authorization-rule_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage notification hubs namespace authorization rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure.yml
new file mode 100644
index 0000000000..1282ba9c68
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure
+name: az offazure
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage on-premise resources for migrate.
+description: ''
+commands:
+- az_offazure_hyperv
+- az_offazure_hyperv_cluster
+- az_offazure_hyperv_cluster_list
+- az_offazure_hyperv_cluster_show
+- az_offazure_hyperv_host
+- az_offazure_hyperv_host_list
+- az_offazure_hyperv_host_show
+- az_offazure_hyperv_machine
+- az_offazure_hyperv_machine_list
+- az_offazure_hyperv_machine_show
+- az_offazure_hyperv_run-as-account
+- az_offazure_hyperv_run-as-account_list
+- az_offazure_hyperv_run-as-account_show
+- az_offazure_hyperv_site
+- az_offazure_hyperv_site_create
+- az_offazure_hyperv_site_delete
+- az_offazure_hyperv_site_show
+- az_offazure_vmware
+- az_offazure_vmware_machine
+- az_offazure_vmware_machine_list
+- az_offazure_vmware_machine_show
+- az_offazure_vmware_run-as-account
+- az_offazure_vmware_run-as-account_list
+- az_offazure_vmware_run-as-account_show
+- az_offazure_vmware_site
+- az_offazure_vmware_site_create
+- az_offazure_vmware_site_delete
+- az_offazure_vmware_site_show
+- az_offazure_vmware_vcenter
+- az_offazure_vmware_vcenter_list
+- az_offazure_vmware_vcenter_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage on-premise resources for migrate.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv.yml
new file mode 100644
index 0000000000..9cc3a6c144
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv.yml
@@ -0,0 +1,43 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv
+name: az offazure hyperv
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V on-premise resources.
+description: ''
+commands:
+- az_offazure_hyperv_cluster
+- az_offazure_hyperv_cluster_list
+- az_offazure_hyperv_cluster_show
+- az_offazure_hyperv_host
+- az_offazure_hyperv_host_list
+- az_offazure_hyperv_host_show
+- az_offazure_hyperv_machine
+- az_offazure_hyperv_machine_list
+- az_offazure_hyperv_machine_show
+- az_offazure_hyperv_run-as-account
+- az_offazure_hyperv_run-as-account_list
+- az_offazure_hyperv_run-as-account_show
+- az_offazure_hyperv_site
+- az_offazure_hyperv_site_create
+- az_offazure_hyperv_site_delete
+- az_offazure_hyperv_site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V on-premise resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/cluster.yml
new file mode 100644
index 0000000000..ac999837e2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/cluster.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_cluster
+name: az offazure hyperv cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V cluster.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_cluster_list
+  name: az offazure hyperv cluster list
+  summary: Get all clusters on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv cluster list --resource-group
+                                    --site-name
+  examples:
+  - summary: List clusters by site
+    syntax: az offazure hyperv cluster list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_cluster_show
+  name: az offazure hyperv cluster show
+  summary: Get the details of a Hyper-V cluster.
+  description: ''
+  syntax: >-
+    az offazure hyperv cluster show --cluster-name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a cluster
+    syntax: az offazure hyperv cluster show --cluster-name MyClusterName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_cluster_list
+- az_offazure_hyperv_cluster_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/host.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/host.yml
new file mode 100644
index 0000000000..4d80bc63c0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/host.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_host
+name: az offazure hyperv host
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv host** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V host.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_host_list
+  name: az offazure hyperv host list
+  summary: Get all hosts on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv host list --resource-group
+                                 --site-name
+  examples:
+  - summary: List hosts by site
+    syntax: az offazure hyperv host list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_host_show
+  name: az offazure hyperv host show
+  summary: Get the details of a Hyper-V host.
+  description: ''
+  syntax: >-
+    az offazure hyperv host show --host-name
+                                 --resource-group
+                                 --site-name
+  examples:
+  - summary: Get a host
+    syntax: az offazure hyperv host show --host-name MyHostName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --host-name --name -n
+    summary: Name of the host.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_host_list
+- az_offazure_hyperv_host_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V host.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/machine.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/machine.yml
new file mode 100644
index 0000000000..060cbc18b4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/machine.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_machine
+name: az offazure hyperv machine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv machine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V machine.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_machine_list
+  name: az offazure hyperv machine list
+  summary: List all machines on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv machine list --resource-group
+                                    --site-name
+  examples:
+  - summary: List machines by site
+    syntax: az offazure hyperv machine list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_machine_show
+  name: az offazure hyperv machine show
+  summary: Get the details of a machine.
+  description: ''
+  syntax: >-
+    az offazure hyperv machine show --machine-name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a machine.
+    syntax: az offazure hyperv machine show --machine-name MyMachineName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: Name of the machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_machine_list
+- az_offazure_hyperv_machine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V machine.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/run-as-account.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/run-as-account.yml
new file mode 100644
index 0000000000..6087e3dd8a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/run-as-account.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_run-as-account
+name: az offazure hyperv run-as-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv run-as-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V run-as-account.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_run-as-account_list
+  name: az offazure hyperv run-as-account list
+  summary: List all run-as-accounts on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure hyperv run-as-account list --resource-group
+                                           --site-name
+  examples:
+  - summary: List run-as-accounts by site
+    syntax: az offazure hyperv run-as-account list --resource-group MyResourceGroup                  --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_hyperv_run-as-account_show
+  name: az offazure hyperv run-as-account show
+  summary: Get the details of a run-as-account.
+  description: ''
+  syntax: >-
+    az offazure hyperv run-as-account show --account-name
+                                           --resource-group
+                                           --site-name
+  examples:
+  - summary: Get a run-as-account.
+    syntax: az offazure hyperv run-as-account show --account-name MyAccount --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --account-name --name -n
+    summary: Name of the run-as-account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+commands:
+- az_offazure_hyperv_run-as-account_list
+- az_offazure_hyperv_run-as-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V run-as-account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/site.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/site.yml
new file mode 100644
index 0000000000..366683bb34
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/hyperv/site.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_hyperv_site
+name: az offazure hyperv site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure hyperv site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Hyper-V site.
+description: ''
+directCommands:
+- uid: az_offazure_hyperv_site_create
+  name: az offazure hyperv site create
+  summary: Create a Hyper-V site.
+  description: ''
+  syntax: >-
+    az offazure hyperv site create --name
+                                   --resource-group
+                                   [--agent]
+                                   [--appliance-name]
+                                   [--identity]
+                                   [--location]
+                                   [--solution-id]
+                                   [--tags]
+  examples:
+  - summary: Create a Hyper-V site
+    syntax: az offazure hyperv site create --resource-group MyResourceGroup --site-name MySiteName                  --location centralus
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the Hyper-V Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent
+    summary: On-premises agent details.
+    description: >-
+      Usage: --agent key-vault-uri=XX key-vault-id=XX
+
+
+      key-vault-uri: Key vault URI.
+
+      key-vault-id: Key vault ARM Id.
+  - name: --appliance-name
+    summary: Name of the appliance.
+    description: ''
+  - name: --identity
+    summary: Service principal identity details used by agent for communication to the service.
+    description: >-
+      Usage: --identity tenant-id=XX application-id=XX object-id=XX audience=XX aad-authority=XX raw-cert-data=XX
+
+
+      tenant-id: Tenant Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      application-id: Application/client Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      object-id: Object Id of the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      audience: Intended audience for the service principal.
+
+      aad-authority: AAD Authority URL which was used to request the token for the service principal.
+
+      raw-cert-data: Raw certificate data for building certificate expiry flows.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --solution-id
+    summary: ARM ID of migration hub solution for SDS.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_offazure_hyperv_site_delete
+  name: az offazure hyperv site delete
+  summary: Delete a Hyper-V site.
+  description: ''
+  syntax: >-
+    az offazure hyperv site delete --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Delete a Hyper-V site.
+    syntax: az offazure hyperv site delete --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the Hyper-V Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_offazure_hyperv_site_show
+  name: az offazure hyperv site show
+  summary: Get the details of a site.
+  description: ''
+  syntax: >-
+    az offazure hyperv site show --name
+                                 --resource-group
+  examples:
+  - summary: Get a Hyper-V site
+    syntax: az offazure hyperv site show --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the Hyper-V Site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_offazure_hyperv_site_create
+- az_offazure_hyperv_site_delete
+- az_offazure_hyperv_site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Hyper-V site.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware.yml
new file mode 100644
index 0000000000..5c74092003
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware
+name: az offazure vmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware on-premise resources.
+description: ''
+commands:
+- az_offazure_vmware_machine
+- az_offazure_vmware_machine_list
+- az_offazure_vmware_machine_show
+- az_offazure_vmware_run-as-account
+- az_offazure_vmware_run-as-account_list
+- az_offazure_vmware_run-as-account_show
+- az_offazure_vmware_site
+- az_offazure_vmware_site_create
+- az_offazure_vmware_site_delete
+- az_offazure_vmware_site_show
+- az_offazure_vmware_vcenter
+- az_offazure_vmware_vcenter_list
+- az_offazure_vmware_vcenter_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware on-premise resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/machine.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/machine.yml
new file mode 100644
index 0000000000..79785634a3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/machine.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_machine
+name: az offazure vmware machine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware machine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware machine.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_machine_list
+  name: az offazure vmware machine list
+  summary: List all machines on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure vmware machine list --resource-group
+                                    --site-name
+  examples:
+  - summary: List VMware machines by site
+    syntax: az offazure vmware machine list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the Hyper-V Site.
+    description: ''
+- uid: az_offazure_vmware_machine_show
+  name: az offazure vmware machine show
+  summary: Get the details of a machine.
+  description: ''
+  syntax: >-
+    az offazure vmware machine show --machine-name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a VMware machine.
+    syntax: az offazure vmware machine show --name MyMachineName --resource-group MyResourceGroup                  --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: Name of the machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+commands:
+- az_offazure_vmware_machine_list
+- az_offazure_vmware_machine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware machine.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/run-as-account.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/run-as-account.yml
new file mode 100644
index 0000000000..50f7f777a1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/run-as-account.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_run-as-account
+name: az offazure vmware run-as-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware run-as-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware run-as-account.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_run-as-account_list
+  name: az offazure vmware run-as-account list
+  summary: List all run-as-accounts on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure vmware run-as-account list --resource-group
+                                           --site-name
+  examples:
+  - summary: List VMware run-as-accounts by site.
+    syntax: az offazure vmware run-as-account list --resource-group MyResourceGroup                  --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+- uid: az_offazure_vmware_run-as-account_show
+  name: az offazure vmware run-as-account show
+  summary: Get the details of a run-as-account.
+  description: ''
+  syntax: >-
+    az offazure vmware run-as-account show --account-name
+                                           --resource-group
+                                           --site-name
+  examples:
+  - summary: Get a VMware run-as-account.
+    syntax: az offazure vmware run-as-account show --account-name MyAccountName --resource-group                  MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --account-name --name -n
+    summary: Name of the run-as-account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+commands:
+- az_offazure_vmware_run-as-account_list
+- az_offazure_vmware_run-as-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware run-as-account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/site.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/site.yml
new file mode 100644
index 0000000000..dd555002ea
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/site.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_site
+name: az offazure vmware site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware site.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_site_create
+  name: az offazure vmware site create
+  summary: Create a site for VMware resources.
+  description: ''
+  syntax: >-
+    az offazure vmware site create --name
+                                   --resource-group
+                                   [--agent]
+                                   [--appliance-name]
+                                   [--identity]
+                                   [--location]
+                                   [--solution-id]
+                                   [--tags]
+  examples:
+  - summary: Create a VMware site
+    syntax: az offazure vmware site create -g MyResourceGroup --site-name MySiteName --location centralus
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the VMware site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent
+    summary: On-premises agent details.
+    description: >-
+      Usage: --agent key-vault-uri=XX key-vault-id=XX
+
+
+      key-vault-uri: Key vault URI.
+
+      key-vault-id: Key vault ARM Id.
+  - name: --appliance-name
+    summary: Name of the appliance.
+    description: ''
+  - name: --identity
+    summary: Service principal identity details used by agent for communication to the service.
+    description: >-
+      Usage: --identity tenant-id=XX application-id=XX object-id=XX audience=XX aad-authority=XX raw-cert-data=XX
+
+
+      tenant-id: Tenant Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      application-id: Application/client Id for the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      object-id: Object Id of the service principal with which the on-premise management/data plane components would communicate with our Azure services.
+
+      audience: Intended audience for the service principal.
+
+      aad-authority: AAD Authority URL which was used to request the token for the service principal.
+
+      raw-cert-data: Raw certificate data for building certificate expiry flows.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --solution-id
+    summary: ARM ID of migration hub solution for SDS.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_offazure_vmware_site_delete
+  name: az offazure vmware site delete
+  summary: Delete a VMware site.
+  description: ''
+  syntax: >-
+    az offazure vmware site delete --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Delete a VMware site
+    syntax: az offazure vmware site delete --resource-group MyResourceGroup --name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the VMware site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_offazure_vmware_site_show
+  name: az offazure vmware site show
+  summary: Get the details of a VMware site.
+  description: ''
+  syntax: >-
+    az offazure vmware site show --name
+                                 --resource-group
+  examples:
+  - summary: Get a VMware site
+    syntax: az offazure vmware site show --resource-group MyResourceGroup --name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --name --site-name -n
+    summary: Name of the VMware site.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_offazure_vmware_site_create
+- az_offazure_vmware_site_delete
+- az_offazure_vmware_site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware site.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/vcenter.yml b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/vcenter.yml
new file mode 100644
index 0000000000..fdbe2361a3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/offazure/vmware/vcenter.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_offazure_vmware_vcenter
+name: az offazure vmware vcenter
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **offazure** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az offazure vmware vcenter** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware vCenter.
+description: ''
+directCommands:
+- uid: az_offazure_vmware_vcenter_list
+  name: az offazure vmware vcenter list
+  summary: List all vCenters on the on-premise site.
+  description: ''
+  syntax: >-
+    az offazure vmware vcenter list --resource-group
+                                    --site-name
+  examples:
+  - summary: List VMware vCenters by site
+    syntax: az offazure vmware vcenter list --resource-group MyResourceGroup --site-name MySiteName
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+- uid: az_offazure_vmware_vcenter_show
+  name: az offazure vmware vcenter show
+  summary: Get the details of a vCenter.
+  description: ''
+  syntax: >-
+    az offazure vmware vcenter show --name
+                                    --resource-group
+                                    --site-name
+  examples:
+  - summary: Get a VMware vCenter.
+    syntax: az offazure vmware vcenter show --resource-group MyResourceGroup --site-name MySiteName                  --name MyVCenterName
+  requiredParameters:
+  - isRequired: true
+    name: --name --vcenter-name -n
+    summary: VCenter ARM name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --site-name
+    summary: Name of the VMware site.
+    description: ''
+commands:
+- az_offazure_vmware_vcenter_list
+- az_offazure_vmware_vcenter_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware vCenter.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/peering.yml
new file mode 100644
index 0000000000..90048733f9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering.yml
@@ -0,0 +1,74 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering
+name: az peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage peering.
+description: ''
+commands:
+- az_peering_asn
+- az_peering_asn_create
+- az_peering_asn_delete
+- az_peering_asn_list
+- az_peering_asn_show
+- az_peering_legacy
+- az_peering_legacy_list
+- az_peering_location
+- az_peering_location_list
+- az_peering_peering
+- az_peering_peering_create
+- az_peering_peering_delete
+- az_peering_peering_list
+- az_peering_peering_show
+- az_peering_peering_update
+- az_peering_received-route
+- az_peering_received-route_list
+- az_peering_registered-asn
+- az_peering_registered-asn_create
+- az_peering_registered-asn_delete
+- az_peering_registered-asn_list
+- az_peering_registered-asn_show
+- az_peering_registered-asn_update
+- az_peering_registered-prefix
+- az_peering_registered-prefix_create
+- az_peering_registered-prefix_delete
+- az_peering_registered-prefix_list
+- az_peering_registered-prefix_show
+- az_peering_registered-prefix_update
+- az_peering_service
+- az_peering_service_country
+- az_peering_service_country_list
+- az_peering_service_create
+- az_peering_service_delete
+- az_peering_service_list
+- az_peering_service_location
+- az_peering_service_location_list
+- az_peering_service_prefix
+- az_peering_service_prefix_create
+- az_peering_service_prefix_delete
+- az_peering_service_prefix_list
+- az_peering_service_prefix_show
+- az_peering_service_prefix_update
+- az_peering_service_provider
+- az_peering_service_provider_list
+- az_peering_service_show
+- az_peering_service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/asn.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/asn.yml
new file mode 100644
index 0000000000..4a4b190ed0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/asn.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_asn
+name: az peering asn
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering asn** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering asn.
+description: ''
+directCommands:
+- uid: az_peering_asn_create
+  name: az peering asn create
+  summary: Creates a new peer ASN or updates an existing peer ASN with the specified name under the given subscription.
+  description: ''
+  syntax: >-
+    az peering asn create --peer-asn-name
+                          [--peer-asn]
+                          [--peer-contact-detail]
+                          [--peer-name]
+                          [--validation-state {Approved, Failed, None, Pending}]
+  examples:
+  - summary: Create a peer ASN
+    syntax: az peering asn create --peer-asn 65000 --peer-contact-detail email="noc@contoso.com" phone="+1 (234) 567-8999" role="Noc" --peer-contact-detail email="abc@contoso.com" phone="+1 (234) 567-8900" role="Policy" --peer-contact-detail email="xyz@contoso.com" phone="+1 (234) 567-8900" role="Technical" --peer-name "Contoso" --peer-asn-name "peerAsnName"
+  requiredParameters:
+  - isRequired: true
+    name: --peer-asn-name
+    summary: The peer ASN name.
+    description: ''
+  optionalParameters:
+  - name: --peer-asn
+    summary: The Autonomous System Number (ASN) of the peer.
+    description: ''
+  - name: --peer-contact-detail
+    summary: 'The contact details of the peer. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: role, email, phone.'
+    description: ''
+  - name: --peer-name
+    summary: The name of the peer.
+    description: ''
+  - name: --validation-state
+    parameterValueGroup: Approved, Failed, None, Pending
+    summary: The validation state of the ASN associated with the peer.
+    description: ''
+- uid: az_peering_asn_delete
+  name: az peering asn delete
+  summary: Deletes an existing peer ASN with the specified name under the given subscription.
+  description: ''
+  syntax: az peering asn delete --peer-asn-name
+  examples:
+  - summary: Delete a peer ASN
+    syntax: az peering asn delete --peer-asn-name "peerAsnName"
+  requiredParameters:
+  - isRequired: true
+    name: --peer-asn-name
+    summary: The peer ASN name.
+    description: ''
+- uid: az_peering_asn_list
+  name: az peering asn list
+  summary: Lists all of the peer ASNs under the given subscription.
+  description: ''
+  syntax: az peering asn list
+  examples:
+  - summary: List peer ASNs in a subscription
+    syntax: az peering asn list
+- uid: az_peering_asn_show
+  name: az peering asn show
+  summary: Gets the peer ASN with the specified name under the given subscription.
+  description: ''
+  syntax: az peering asn show --peer-asn-name
+  examples:
+  - summary: Get a peer ASN
+    syntax: az peering asn show --peer-asn-name "peerAsnName"
+  requiredParameters:
+  - isRequired: true
+    name: --peer-asn-name
+    summary: The peer ASN name.
+    description: ''
+commands:
+- az_peering_asn_create
+- az_peering_asn_delete
+- az_peering_asn_list
+- az_peering_asn_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering asn.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/legacy.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/legacy.yml
new file mode 100644
index 0000000000..6814c3a5e4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/legacy.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_legacy
+name: az peering legacy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering legacy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering legacy.
+description: ''
+directCommands:
+- uid: az_peering_legacy_list
+  name: az peering legacy list
+  summary: Lists all of the legacy peerings under the given subscription matching the specified kind and location.
+  description: ''
+  syntax: >-
+    az peering legacy list --kind {Direct, Exchange}
+                           --peering-location
+                           [--asn]
+  examples:
+  - summary: List legacy peerings
+    syntax: az peering legacy list --kind "Exchange" --peering-location "peeringLocation0"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: Direct, Exchange
+    summary: The kind of the peering.
+    description: ''
+  - isRequired: true
+    name: --peering-location
+    summary: The location of the peering.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: The ASN number associated with a legacy peering.
+    description: ''
+commands:
+- az_peering_legacy_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering legacy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/location.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/location.yml
new file mode 100644
index 0000000000..997c676762
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/location.yml
@@ -0,0 +1,52 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_location
+name: az peering location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering location.
+description: ''
+directCommands:
+- uid: az_peering_location_list
+  name: az peering location list
+  summary: Lists all of the available peering locations for the specified kind of peering.
+  description: ''
+  syntax: >-
+    az peering location list --kind {Direct, Exchange}
+                             [--direct-peering-type {Cdn, Edge, Internal, Ix, IxRs, Transit}]
+  examples:
+  - summary: List direct peering locations
+    syntax: az peering location list --kind "Direct"
+  - summary: List exchange peering locations
+    syntax: az peering location list --kind "Exchange"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: Direct, Exchange
+    summary: The kind of the peering.
+    description: ''
+  optionalParameters:
+  - name: --direct-peering-type
+    parameterValueGroup: Cdn, Edge, Internal, Ix, IxRs, Transit
+    summary: The type of direct peering.
+    description: ''
+commands:
+- az_peering_location_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/peering.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/peering.yml
new file mode 100644
index 0000000000..bceb09ffc1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/peering.yml
@@ -0,0 +1,163 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_peering
+name: az peering peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering peering.
+description: ''
+directCommands:
+- uid: az_peering_peering_create
+  name: az peering peering create
+  summary: Creates a new peering or updates an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering create --kind {Direct, Exchange}
+                              --location
+                              --peering-name
+                              --resource-group
+                              --sku
+                              [--direct]
+                              [--exchange]
+                              [--peering-location]
+                              [--tags]
+  examples:
+  - summary: Create a direct peering
+    syntax: az peering peering create --kind "Direct" --location "eastus" --direct "{\"connections\":[{\"bandwidthInMbps\":10000,\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"md5AuthenticationKey\":\"test-md5-auth-key\",\"sessionPrefixV4\":\"192.168.0.0/31\",\"sessionPrefixV6\":\"fd00::0/127\"},\"connectionIdentifier\":\"5F4CB5C7-6B43-4444-9338-9ABC72606C16\",\"peeringDBFacilityId\":99999,\"sessionAddressProvider\":\"Peer\",\"useForPeeringService\":false},{\"bandwidthInMbps\":10000,\"connectionIdentifier\":\"8AB00818-D533-4504-A25A-03A17F61201C\",\"peeringDBFacilityId\":99999,\"sessionAddressProvider\":\"Microsoft\",\"useForPeeringService\":true}],\"directPeeringType\":\"Edge\",\"peerAsn\":{\"id\":\"/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1\"}}" --peering-location "peeringLocation0" --sku name="Basic_Direct_Free" --peering-name "peeringName" --resource-group "rgName"
+  - summary: Create a peering with exchange route server
+    syntax: az peering peering create --kind "Direct" --location "eastus" --direct "{\"connections\":[{\"bandwidthInMbps\":10000,\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"microsoftSessionIPv4Address\":\"192.168.0.123\",\"peerSessionIPv4Address\":\"192.168.0.234\",\"sessionPrefixV4\":\"192.168.0.0/24\"},\"connectionIdentifier\":\"5F4CB5C7-6B43-4444-9338-9ABC72606C16\",\"peeringDBFacilityId\":99999,\"sessionAddressProvider\":\"Peer\",\"useForPeeringService\":true}],\"directPeeringType\":\"IxRs\",\"peerAsn\":{\"id\":\"/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1\"}}" --peering-location "peeringLocation0" --sku name="Premium_Direct_Free" --peering-name "peeringName" --resource-group "rgName"
+  - summary: Create an exchange peering
+    syntax: az peering peering create --kind "Exchange" --location "eastus" --exchange "{\"connections\":[{\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"md5AuthenticationKey\":\"test-md5-auth-key\",\"peerSessionIPv4Address\":\"192.168.2.1\",\"peerSessionIPv6Address\":\"fd00::1\"},\"connectionIdentifier\":\"CE495334-0E94-4E51-8164-8116D6CD284D\",\"peeringDBFacilityId\":99999},{\"bgpSession\":{\"maxPrefixesAdvertisedV4\":1000,\"maxPrefixesAdvertisedV6\":100,\"md5AuthenticationKey\":\"test-md5-auth-key\",\"peerSessionIPv4Address\":\"192.168.2.2\",\"peerSessionIPv6Address\":\"fd00::2\"},\"connectionIdentifier\":\"CDD8E673-CB07-47E6-84DE-3739F778762B\",\"peeringDBFacilityId\":99999}],\"peerAsn\":{\"id\":\"/subscriptions/subId/providers/Microsoft.Peering/peerAsns/myAsn1\"}}" --peering-location "peeringLocation0" --sku name="Basic_Exchange_Free" --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --kind
+    parameterValueGroup: Direct, Exchange
+    summary: The kind of the peering.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: 'The SKU that defines the tier and kind of the peering. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: name, tier, family, size.'
+    description: ''
+  optionalParameters:
+  - name: --direct
+    summary: 'The properties that define a direct peering. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --exchange
+    summary: 'The properties that define an exchange peering. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --peering-location
+    summary: The location of the peering.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_peering_peering_delete
+  name: az peering peering delete
+  summary: Deletes an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering delete --peering-name
+                              --resource-group
+  examples:
+  - summary: Delete a peering
+    syntax: az peering peering delete --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_peering_list
+  name: az peering peering list
+  summary: Lists all of the peerings under the given subscription.
+  description: ''
+  syntax: az peering peering list [--resource-group]
+  examples:
+  - summary: List peerings in a resource group
+    syntax: az peering peering list --resource-group "rgName"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_peering_show
+  name: az peering peering show
+  summary: Gets an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering show --peering-name
+                            --resource-group
+  examples:
+  - summary: Get a peering
+    syntax: az peering peering show --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_peering_update
+  name: az peering peering update
+  summary: Updates tags for a peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering peering update --peering-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Update peering tags
+    syntax: az peering peering update --peering-name "peeringName" --resource-group "rgName" --tags tags={"tag0":"value0","tag1":"value1"}
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_peering_peering_create
+- az_peering_peering_delete
+- az_peering_peering_list
+- az_peering_peering_show
+- az_peering_peering_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering peering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/received-route.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/received-route.yml
new file mode 100644
index 0000000000..e95e80aeba
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/received-route.yml
@@ -0,0 +1,69 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_received-route
+name: az peering received-route
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering received-route** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering received-route.
+description: ''
+directCommands:
+- uid: az_peering_received-route_list
+  name: az peering received-route list
+  summary: Lists the prefixes received over the specified peering under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering received-route list --peering-name
+                                   --resource-group
+                                   [--as-path]
+                                   [--origin-as-validation-state]
+                                   [--prefix]
+                                   [--rpki-validation-state]
+                                   [--skip-token]
+  examples:
+  - summary: Lists the prefixes received over the specified peering under the given subscription and resource group.
+    syntax: az peering received-route list --as-path "123 456" --origin-as-validation-state "Valid" --peering-name "peeringName" --prefix "1.1.1.0/24" --resource-group "rgName" --rpki-validation-state "Valid"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --as-path
+    summary: The optional AS path that can be used to filter the routes.
+    description: ''
+  - name: --origin-as-validation-state
+    summary: The optional origin AS validation state that can be used to filter the routes.
+    description: ''
+  - name: --prefix
+    summary: The optional prefix that can be used to filter the routes.
+    description: ''
+  - name: --rpki-validation-state
+    summary: The optional RPKI validation state that can be used to filter the routes.
+    description: ''
+  - name: --skip-token
+    summary: The optional page continuation token that is used in the event of paginated result.
+    description: ''
+commands:
+- az_peering_received-route_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering received-route.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/registered-asn.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/registered-asn.yml
new file mode 100644
index 0000000000..4e883dd2fb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/registered-asn.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_registered-asn
+name: az peering registered-asn
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering registered-asn** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering registered-asn.
+description: ''
+directCommands:
+- uid: az_peering_registered-asn_create
+  name: az peering registered-asn create
+  summary: Creates a new registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn create --peering-name
+                                     --registered-asn-name
+                                     --resource-group
+                                     [--asn]
+  examples:
+  - summary: Create or update a registered ASN for the peering
+    syntax: az peering registered-asn create --peering-name "peeringName" --asn 65000 --registered-asn-name "registeredAsnName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: The customer's ASN from which traffic originates.
+    description: ''
+- uid: az_peering_registered-asn_delete
+  name: az peering registered-asn delete
+  summary: Deletes an existing registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn delete --peering-name
+                                     --registered-asn-name
+                                     --resource-group
+  examples:
+  - summary: Deletes a registered ASN associated with the peering
+    syntax: az peering registered-asn delete --peering-name "peeringName" --registered-asn-name "registeredAsnName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the registered ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-asn_list
+  name: az peering registered-asn list
+  summary: Lists all registered ASNs under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn list --peering-name
+                                   --resource-group
+  examples:
+  - summary: List all the registered ASNs associated with the peering
+    syntax: az peering registered-asn list --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-asn_show
+  name: az peering registered-asn show
+  summary: Gets an existing registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn show --peering-name
+                                   --registered-asn-name
+                                   --resource-group
+  examples:
+  - summary: Get a registered ASN associated with the peering
+    syntax: az peering registered-asn show --peering-name "peeringName" --registered-asn-name "registeredAsnName0" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the registered ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-asn_update
+  name: az peering registered-asn update
+  summary: Creates a new registered ASN with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-asn update --peering-name
+                                     --registered-asn-name
+                                     --resource-group
+                                     [--asn]
+  examples:
+  - summary: Create or update a registered ASN for the peering
+    syntax: az peering registered-asn update --peering-name "peeringName" --asn 65000 --registered-asn-name "registeredAsnName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-asn-name
+    summary: The name of the ASN.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --asn
+    summary: The customer's ASN from which traffic originates.
+    description: ''
+commands:
+- az_peering_registered-asn_create
+- az_peering_registered-asn_delete
+- az_peering_registered-asn_list
+- az_peering_registered-asn_show
+- az_peering_registered-asn_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering registered-asn.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/registered-prefix.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/registered-prefix.yml
new file mode 100644
index 0000000000..09aaeda6d1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/registered-prefix.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_registered-prefix
+name: az peering registered-prefix
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering registered-prefix** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering registered-prefix.
+description: ''
+directCommands:
+- uid: az_peering_registered-prefix_create
+  name: az peering registered-prefix create
+  summary: Creates a new registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix create --peering-name
+                                        --registered-prefix-name
+                                        --resource-group
+                                        [--prefix]
+  examples:
+  - summary: Create or update a registered prefix for the peering
+    syntax: az peering registered-prefix create --peering-name "peeringName" --prefix "10.22.20.0/24" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --prefix
+    summary: The customer's prefix from which traffic originates.
+    description: ''
+- uid: az_peering_registered-prefix_delete
+  name: az peering registered-prefix delete
+  summary: Deletes an existing registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix delete --peering-name
+                                        --registered-prefix-name
+                                        --resource-group
+  examples:
+  - summary: Deletes a registered prefix associated with the peering
+    syntax: az peering registered-prefix delete --peering-name "peeringName" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-prefix_list
+  name: az peering registered-prefix list
+  summary: Lists all registered prefixes under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix list --peering-name
+                                      --resource-group
+  examples:
+  - summary: List all the registered prefixes associated with the peering
+    syntax: az peering registered-prefix list --peering-name "peeringName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-prefix_show
+  name: az peering registered-prefix show
+  summary: Gets an existing registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix show --peering-name
+                                      --registered-prefix-name
+                                      --resource-group
+  examples:
+  - summary: Get a registered prefix associated with the peering
+    syntax: az peering registered-prefix show --peering-name "peeringName" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_registered-prefix_update
+  name: az peering registered-prefix update
+  summary: Creates a new registered prefix with the specified name under the given subscription, resource group and peering.
+  description: ''
+  syntax: >-
+    az peering registered-prefix update --peering-name
+                                        --registered-prefix-name
+                                        --resource-group
+                                        [--prefix]
+  examples:
+  - summary: Create or update a registered prefix for the peering
+    syntax: az peering registered-prefix update --peering-name "peeringName" --prefix "10.22.20.0/24" --registered-prefix-name "registeredPrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --registered-prefix-name
+    summary: The name of the registered prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --prefix
+    summary: The customer's prefix from which traffic originates.
+    description: ''
+commands:
+- az_peering_registered-prefix_create
+- az_peering_registered-prefix_delete
+- az_peering_registered-prefix_list
+- az_peering_registered-prefix_show
+- az_peering_registered-prefix_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering registered-prefix.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/service.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/service.yml
new file mode 100644
index 0000000000..1a2f668727
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/service.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service
+name: az peering service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service.
+description: ''
+directCommands:
+- uid: az_peering_service_create
+  name: az peering service create
+  summary: Creates a new peering service or updates an existing peering with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service create --location
+                              --peering-service-name
+                              --resource-group
+                              [--peering-service-location]
+                              [--peering-service-provider]
+                              [--sku]
+                              [--tags]
+  examples:
+  - summary: Create a  peering service
+    syntax: az peering service create --location "eastus" --peering-service-location "state1" --peering-service-provider "serviceProvider1" --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --peering-service-location
+    summary: The PeeringServiceLocation of the Customer.
+    description: ''
+  - name: --peering-service-provider
+    summary: The MAPS Provider Name.
+    description: ''
+  - name: --sku
+    summary: 'The SKU that defines the type of the peering service. Expect value: name=xx.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_peering_service_delete
+  name: az peering service delete
+  summary: Deletes an existing peering service with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service delete --peering-service-name
+                              --resource-group
+  examples:
+  - summary: Delete a peering service
+    syntax: az peering service delete --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_list
+  name: az peering service list
+  summary: Lists all of the peerings under the given subscription.
+  description: ''
+  syntax: az peering service list [--resource-group]
+  examples:
+  - summary: List peering services in a resource group
+    syntax: az peering service list --resource-group "rgName"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_show
+  name: az peering service show
+  summary: Gets an existing peering service with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service show --peering-service-name
+                            --resource-group
+  examples:
+  - summary: Get a peering service
+    syntax: az peering service show --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_update
+  name: az peering service update
+  summary: Updates tags for a peering service with the specified name under the given subscription and resource group.
+  description: ''
+  syntax: >-
+    az peering service update --peering-service-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Update peering service tags
+    syntax: az peering service update --peering-service-name "peeringServiceName" --resource-group "rgName" --tags tags={"tag0":"value0","tag1":"value1"}
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_peering_service_country
+- az_peering_service_country_list
+- az_peering_service_create
+- az_peering_service_delete
+- az_peering_service_list
+- az_peering_service_location
+- az_peering_service_location_list
+- az_peering_service_prefix
+- az_peering_service_prefix_create
+- az_peering_service_prefix_delete
+- az_peering_service_prefix_list
+- az_peering_service_prefix_show
+- az_peering_service_prefix_update
+- az_peering_service_provider
+- az_peering_service_provider_list
+- az_peering_service_show
+- az_peering_service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/service/country.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/service/country.yml
new file mode 100644
index 0000000000..27e3f96115
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/service/country.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_country
+name: az peering service country
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service country** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service country.
+description: ''
+directCommands:
+- uid: az_peering_service_country_list
+  name: az peering service country list
+  summary: Lists all of the available countries for peering service.
+  description: ''
+  syntax: az peering service country list
+  examples:
+  - summary: List peering service countries
+    syntax: az peering service country list
+commands:
+- az_peering_service_country_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service country.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/service/location.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/service/location.yml
new file mode 100644
index 0000000000..5ab435b6f4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/service/location.yml
@@ -0,0 +1,41 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_location
+name: az peering service location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service location.
+description: ''
+directCommands:
+- uid: az_peering_service_location_list
+  name: az peering service location list
+  summary: Lists all of the available locations for peering service.
+  description: ''
+  syntax: az peering service location list [--country]
+  examples:
+  - summary: List peering service locations
+    syntax: az peering service location list
+  optionalParameters:
+  - name: --country
+    summary: The country of interest, in which the locations are to be present.
+    description: ''
+commands:
+- az_peering_service_location_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/service/prefix.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/service/prefix.yml
new file mode 100644
index 0000000000..0e8d1e6695
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/service/prefix.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_prefix
+name: az peering service prefix
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service prefix** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service prefix.
+description: ''
+directCommands:
+- uid: az_peering_service_prefix_create
+  name: az peering service prefix create
+  summary: Creates a new prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix create --peering-service-name
+                                     --prefix-name
+                                     --resource-group
+                                     [--peering-service-prefix-key]
+                                     [--prefix]
+  examples:
+  - summary: Create or update a prefix for the peering service
+    syntax: az peering service prefix create --peering-service-name "peeringServiceName" --peering-service-prefix-key "00000000-0000-0000-0000-000000000000" --prefix "192.168.1.0/24" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --peering-service-prefix-key
+    summary: The peering service prefix key.
+    description: ''
+  - name: --prefix
+    summary: The prefix from which your traffic originates.
+    description: ''
+- uid: az_peering_service_prefix_delete
+  name: az peering service prefix delete
+  summary: Deletes an existing prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix delete --peering-service-name
+                                     --prefix-name
+                                     --resource-group
+  examples:
+  - summary: Delete a prefix associated with the peering service
+    syntax: az peering service prefix delete --peering-service-name "peeringServiceName" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_peering_service_prefix_list
+  name: az peering service prefix list
+  summary: Lists all prefixes under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix list --peering-service-name
+                                   --resource-group
+                                   [--expand]
+  examples:
+  - summary: List all the prefixes associated with the peering service
+    syntax: az peering service prefix list --peering-service-name "peeringServiceName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The properties to be expanded.
+    description: ''
+- uid: az_peering_service_prefix_show
+  name: az peering service prefix show
+  summary: Gets an existing prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix show --peering-service-name
+                                   --prefix-name
+                                   --resource-group
+                                   [--expand]
+  examples:
+  - summary: Get a prefix associated with the peering service
+    syntax: az peering service prefix show --peering-service-name "peeringServiceName" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The properties to be expanded.
+    description: ''
+- uid: az_peering_service_prefix_update
+  name: az peering service prefix update
+  summary: Creates a new prefix with the specified name under the given subscription, resource group and peering service.
+  description: ''
+  syntax: >-
+    az peering service prefix update --peering-service-name
+                                     --prefix-name
+                                     --resource-group
+                                     [--peering-service-prefix-key]
+                                     [--prefix]
+  examples:
+  - summary: Create or update a prefix for the peering service
+    syntax: az peering service prefix update --peering-service-name "peeringServiceName" --peering-service-prefix-key "00000000-0000-0000-0000-000000000000" --prefix "192.168.1.0/24" --prefix-name "peeringServicePrefixName" --resource-group "rgName"
+  requiredParameters:
+  - isRequired: true
+    name: --peering-service-name
+    summary: The name of the peering service.
+    description: ''
+  - isRequired: true
+    name: --prefix-name
+    summary: The name of the prefix.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --peering-service-prefix-key
+    summary: The peering service prefix key.
+    description: ''
+  - name: --prefix
+    summary: The prefix from which your traffic originates.
+    description: ''
+commands:
+- az_peering_service_prefix_create
+- az_peering_service_prefix_delete
+- az_peering_service_prefix_list
+- az_peering_service_prefix_show
+- az_peering_service_prefix_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service prefix.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/peering/service/provider.yml b/2018-03-01-hybrid/docs-ref-autogen/peering/service/provider.yml
new file mode 100644
index 0000000000..660cb08a99
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/peering/service/provider.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_peering_service_provider
+name: az peering service provider
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **peering** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az peering service provider** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Peering service provider.
+description: ''
+directCommands:
+- uid: az_peering_service_provider_list
+  name: az peering service provider list
+  summary: Lists all of the available peering service locations for the specified kind of peering.
+  description: ''
+  syntax: az peering service provider list
+  examples:
+  - summary: List peering service providers
+    syntax: az peering service provider list
+commands:
+- az_peering_service_provider_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Peering service provider.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines.yml
index 7c1c0caf96..63ec8f1a9c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines.yml
@@ -1,62 +1,62 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_create
-  - az_pipelines_delete
-  - az_pipelines_list
-  - az_pipelines_run
-  - az_pipelines_show
-  - az_pipelines_update
+### YamlMime:AzureCLIGroup
+uid: az_pipelines
+name: az pipelines
+summary: Manage Azure Pipelines.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_pipelines_create
   name: az pipelines create
   summary: Create a new Azure Pipeline (YAML based).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az pipelines create --name
+                        [--branch]
+                        [--description]
+                        [--detect {false, true}]
+                        [--folder-path]
+                        [--org]
+                        [--project]
+                        [--queue-id]
+                        [--repository]
+                        [--repository-type {github, tfsgit}]
+                        [--service-connection]
+                        [--skip-first-run {false, true}]
+                        [--subscription]
+                        [--yaml-path]
   examples:
   - summary: Create an Azure Pipeline from local checkout repository context
-    syntax:
-      content: >-
-        Repository name/url (--repository), type (--repository-type) and branch name (--branch) will be detected from the local git repository
+    syntax: >-
+      Repository name/url (--repository), type (--repository-type) and branch name (--branch) will be detected from the local git repository
 
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
   - summary: Create an Azure Pipeline for a repository hosted on Github using clone url
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+    syntax: >-
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository https://github.com/SampleOrg/SampleRepo --branch master
+      --repository https://github.com/SampleOrg/SampleRepo --branch master
   - summary: Create an Azure Pipeline for a repository hosted on Github organization SampleOrg, repository name SampleRepo
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+    syntax: >-
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository SampleOrg/SampleRepoName --branch master --repository-type github
+      --repository SampleOrg/SampleRepoName --branch master --repository-type github
   - summary: Create an Azure Pipeline for a repository hosted in a Azure Repo in the same project
-    syntax:
-      content: >-
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+    syntax: >-
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository SampleRepoName --branch master --repository-type tfsgit
+      --repository SampleRepoName --branch master --repository-type tfsgit
   - summary: Create an Azure Pipeline for a repository with the pipeline yaml already checked in into the repository
-    syntax:
-      content: >-
-        Service connection required for non Azure Repos can be optionally provided in the command to run it non interatively
+    syntax: >-
+      Service connection required for non Azure Repos can be optionally provided in the command to run it non interatively
 
-        az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
+      az pipelines create --name 'ContosoBuild' --description 'Pipeline for contoso project'
 
-        --repository https://github.com/SampleOrg/SampleRepo --branch master --yml-path azure-pipelines.yml [--service-connection SERVICE_CONNECTION]
-  parameters:
+      --repository https://github.com/SampleOrg/SampleRepo --branch master --yml-path azure-pipelines.yml [--service-connection SERVICE_CONNECTION]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new pipeline.
     description: ''
+  optionalParameters:
   - name: --branch
     summary: Branch name for which the pipeline will be configured. If omitted, it will be auto-detected from local repository.
     description: ''
@@ -71,7 +71,7 @@ items:
     summary: Path of the folder where the pipeline needs to be created. Default is root folder. e.g. "user1/test_pipelines".
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -93,46 +93,62 @@ items:
     parameterValueGroup: false, true
     summary: Specify this flag to prevent the first run being triggered by the command. Command will return a pipeline if run is skipped else it will output a pipeline run.
     description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo (if yaml is already present in the repo).
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yaml-path --yml-path
+    summary: Path of the pipelines yaml file in the repo (if yaml is already present in the repo).
+    description: ''
 - uid: az_pipelines_delete
   name: az pipelines delete
   summary: Delete a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines delete --id
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--subscription]
+                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pipeline.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_pipelines_list
   name: az pipelines list
   summary: List pipelines.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines list [--detect {false, true}]
+                      [--folder-path]
+                      [--name]
+                      [--org]
+                      [--project]
+                      [--query-examples]
+                      [--query-order {ModifiedAsc, ModifiedDesc, NameAsc, NameDesc, None}]
+                      [--repository]
+                      [--repository-type {bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol}]
+                      [--subscription]
+                      [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -144,11 +160,14 @@ items:
     summary: 'Limit results to pipelines with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     parameterValueGroup: ModifiedAsc, ModifiedDesc, NameAsc, NameDesc, None
     summary: Order of the results.
@@ -160,19 +179,29 @@ items:
     parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
     summary: Limit results to pipelines associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
     description: ''
-  - name: --top
-    summary: Maximum number of pipelines to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of pipelines to list.
+    description: ''
 - uid: az_pipelines_run
   name: az pipelines run
   summary: Queue (run) a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines run [--branch]
+                     [--commit-id]
+                     [--detect {false, true}]
+                     [--folder-path]
+                     [--id]
+                     [--name]
+                     [--open]
+                     [--org]
+                     [--project]
+                     [--subscription]
+                     [--variables]
+  optionalParameters:
   - name: --branch
     summary: 'Name of the branch on which the pipeline run is to be queued. Example: refs/heads/master or master or refs/pull/1/merge.'
     description: ''
@@ -196,24 +225,32 @@ items:
     summary: Open the pipeline results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --variables
+    summary: Space separated "name=value" pairs for the variables you would like to set.
+    description: ''
 - uid: az_pipelines_show
   name: az pipelines show
   summary: Get the details of a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines show [--detect {false, true}]
+                      [--folder-path]
+                      [--id]
+                      [--name]
+                      [--open]
+                      [--org]
+                      [--project]
+                      [--query-examples]
+                      [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -231,11 +268,14 @@ items:
     summary: Open the pipeline summary page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -243,9 +283,20 @@ items:
   name: az pipelines update
   summary: Update a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines update [--branch]
+                        [--description]
+                        [--detect {false, true}]
+                        [--id]
+                        [--name]
+                        [--new-folder-path]
+                        [--new-name]
+                        [--org]
+                        [--project]
+                        [--queue-id]
+                        [--subscription]
+                        [--yaml-path]
+  optionalParameters:
   - name: --branch
     summary: Branch name for which the pipeline will be configured.
     description: ''
@@ -269,7 +320,7 @@ items:
     summary: New updated name of the pipeline.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -277,208 +328,78 @@ items:
   - name: --queue-id
     summary: Queue id of the agent pool where the pipeline needs to run.
     description: ''
-  - name: --yaml-path --yml-path
-    summary: Path of the pipelines yaml file in the repo.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yaml-path --yml-path
+    summary: Path of the pipelines yaml file in the repo.
+    description: ''
 commands:
-- uid: az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-- uid: az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
-- uid: az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-- uid: az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
-- uid: az_pipelines_create
-  name: az pipelines create
-  summary: Create a new Azure Pipeline (YAML based).
-- uid: az_pipelines_delete
-  name: az pipelines delete
-  summary: Delete a pipeline.
-- uid: az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-- uid: az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
-- uid: az_pipelines_list
-  name: az pipelines list
-  summary: List pipelines.
-- uid: az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-- uid: az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
-- uid: az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-- uid: az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
-- uid: az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-- uid: az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
-- uid: az_pipelines_run
-  name: az pipelines run
-  summary: Queue (run) a pipeline.
-- uid: az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-- uid: az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
-- uid: az_pipelines_show
-  name: az pipelines show
-  summary: Get the details of a pipeline.
-- uid: az_pipelines_update
-  name: az pipelines update
-  summary: Update a pipeline.
-- uid: az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-- uid: az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
-- uid: az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-- uid: az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
+- az_pipelines_agent
+- az_pipelines_agent_list
+- az_pipelines_agent_show
+- az_pipelines_build
+- az_pipelines_build_definition
+- az_pipelines_build_definition_list
+- az_pipelines_build_definition_show
+- az_pipelines_build_list
+- az_pipelines_build_queue
+- az_pipelines_build_show
+- az_pipelines_build_tag
+- az_pipelines_build_tag_add
+- az_pipelines_build_tag_delete
+- az_pipelines_build_tag_list
+- az_pipelines_create
+- az_pipelines_delete
+- az_pipelines_folder
+- az_pipelines_folder_create
+- az_pipelines_folder_delete
+- az_pipelines_folder_list
+- az_pipelines_folder_update
+- az_pipelines_list
+- az_pipelines_pool
+- az_pipelines_pool_list
+- az_pipelines_pool_show
+- az_pipelines_queue
+- az_pipelines_queue_list
+- az_pipelines_queue_show
+- az_pipelines_release
+- az_pipelines_release_create
+- az_pipelines_release_definition
+- az_pipelines_release_definition_list
+- az_pipelines_release_definition_show
+- az_pipelines_release_list
+- az_pipelines_release_show
+- az_pipelines_run
+- az_pipelines_runs
+- az_pipelines_runs_artifact
+- az_pipelines_runs_artifact_download
+- az_pipelines_runs_artifact_list
+- az_pipelines_runs_artifact_upload
+- az_pipelines_runs_list
+- az_pipelines_runs_show
+- az_pipelines_runs_tag
+- az_pipelines_runs_tag_add
+- az_pipelines_runs_tag_delete
+- az_pipelines_runs_tag_list
+- az_pipelines_show
+- az_pipelines_update
+- az_pipelines_variable
+- az_pipelines_variable_create
+- az_pipelines_variable_delete
+- az_pipelines_variable_list
+- az_pipelines_variable_update
+- az_pipelines_variable-group
+- az_pipelines_variable-group_create
+- az_pipelines_variable-group_delete
+- az_pipelines_variable-group_list
+- az_pipelines_variable-group_show
+- az_pipelines_variable-group_update
+- az_pipelines_variable-group_variable
+- az_pipelines_variable-group_variable_create
+- az_pipelines_variable-group_variable_delete
+- az_pipelines_variable-group_variable_list
+- az_pipelines_variable-group_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -494,4 +415,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/agent.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/agent.yml
index c7d5618f35..e8651264c7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/agent.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/agent.yml
@@ -1,25 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_agent
-  name: az pipelines agent
-  summary: Manage agents.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_agent_list
-  - az_pipelines_agent_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_agent
+name: az pipelines agent
+summary: Manage agents.
+description: ''
+directCommands:
 - uid: az_pipelines_agent_list
   name: az pipelines agent list
   summary: Get a list of agents in a pool.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines agent list --pool-id
+                            [--agent-name]
+                            [--demands]
+                            [--detect {false, true}]
+                            [--include-assigned-request {false, true}]
+                            [--include-capabilities {false, true}]
+                            [--include-last-completed-request {false, true}]
+                            [--org]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --pool-id
     summary: The agent pool containing the agents.
     description: ''
+  optionalParameters:
   - name: --agent-name
     summary: Filter on agent name.
     description: ''
@@ -43,7 +48,10 @@ items:
     summary: Whether to include details about the agents' most recent completed work.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -52,9 +60,17 @@ items:
   name: az pipelines agent show
   summary: Show agent details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines agent show --agent-id
+                            --pool-id
+                            [--detect {false, true}]
+                            [--include-assigned-request {false, true}]
+                            [--include-capabilities {false, true}]
+                            [--include-last-completed-request {false, true}]
+                            [--org]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --agent-id --id
     summary: The agent ID to get information about.
@@ -63,6 +79,7 @@ items:
     name: --pool-id
     summary: The agent pool containing the agent.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -80,18 +97,17 @@ items:
     summary: Whether to include details about the agents' most recent completed work.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_agent_list
-  name: az pipelines agent list
-  summary: Get a list of agents in a pool.
-- uid: az_pipelines_agent_show
-  name: az pipelines agent show
-  summary: Show agent details.
+- az_pipelines_agent_list
+- az_pipelines_agent_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -107,4 +123,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agents.
+metadata:
+  description: Manage agents.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/build.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/build.yml
index 97f403fc19..5fbf0e659b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/build.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/build.yml
@@ -1,22 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_build
-  name: az pipelines build
-  summary: Manage builds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_build_list
-  - az_pipelines_build_queue
-  - az_pipelines_build_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_build
+name: az pipelines build
+summary: Manage builds.
+description: ''
+directCommands:
 - uid: az_pipelines_build_list
   name: az pipelines build list
   summary: List build results.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build list [--branch]
+                            [--definition-ids]
+                            [--detect {false, true}]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--reason {all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset}]
+                            [--requested-for]
+                            [--result {canceled, failed, none, partiallySucceeded, succeeded}]
+                            [--status {all, cancelling, completed, inProgress, none, notStarted, postponed}]
+                            [--subscription]
+                            [--tags]
+                            [--top]
+  optionalParameters:
   - name: --branch
     summary: Filter by builds for this branch.
     description: ''
@@ -28,11 +34,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --reason
     parameterValueGroup: all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset
     summary: Limit to builds with this reason.
@@ -48,22 +57,32 @@ items:
     parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
     summary: Limit to builds with this status.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: Limit to builds with each of the specified tags. Space separated.
     description: ''
   - name: --top
     summary: Maximum number of builds to list.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_pipelines_build_queue
   name: az pipelines build queue
   summary: Request (queue) a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build queue [--branch]
+                             [--commit-id]
+                             [--definition-id]
+                             [--definition-name]
+                             [--detect {false, true}]
+                             [--open]
+                             [--org]
+                             [--project]
+                             [--queue-id]
+                             [--subscription]
+                             [--variables]
+  optionalParameters:
   - name: --branch
     summary: 'Branch to build. Required if there is not a default branch set up on the definition. Example: refs/heads/master or master or refs/pull/1/merge.'
     description: ''
@@ -84,7 +103,7 @@ items:
     summary: Open the build results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -92,23 +111,30 @@ items:
   - name: --queue-id
     summary: Queue Id of the pool that will be used to queue the build.
     description: ''
-  - name: --variables
-    summary: Space separated "name=value" pairs for the variables you would like to set.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --variables
+    summary: Space separated "name=value" pairs for the variables you would like to set.
+    description: ''
 - uid: az_pipelines_build_show
   name: az pipelines build show
   summary: Get the details of a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build show --id
+                            [--detect {false, true}]
+                            [--open]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the build.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -117,45 +143,28 @@ items:
     summary: Open the build results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-- uid: az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
-- uid: az_pipelines_build_list
-  name: az pipelines build list
-  summary: List build results.
-- uid: az_pipelines_build_queue
-  name: az pipelines build queue
-  summary: Request (queue) a build.
-- uid: az_pipelines_build_show
-  name: az pipelines build show
-  summary: Get the details of a build.
-- uid: az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-- uid: az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
+- az_pipelines_build_definition
+- az_pipelines_build_definition_list
+- az_pipelines_build_definition_show
+- az_pipelines_build_list
+- az_pipelines_build_queue
+- az_pipelines_build_show
+- az_pipelines_build_tag
+- az_pipelines_build_tag_add
+- az_pipelines_build_tag_delete
+- az_pipelines_build_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -171,4 +180,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage builds.
+metadata:
+  description: Manage builds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/definition.yml
index cd62e774ba..4e5f264372 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/definition.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/definition.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_build_definition
-  name: az pipelines build definition
-  summary: Manage build definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_build_definition_list
-  - az_pipelines_build_definition_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_build_definition
+name: az pipelines build definition
+summary: Manage build definitions.
+description: ''
+directCommands:
 - uid: az_pipelines_build_definition_list
   name: az pipelines build definition list
   summary: List build definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build definition list [--detect {false, true}]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--query-examples]
+                                       [--repository]
+                                       [--repository-type {bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol}]
+                                       [--subscription]
+                                       [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -24,11 +27,14 @@ items:
     summary: 'Limit results to definitions with this name or starting with this name. Examples: "FabCI" or "Fab\*".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository
     summary: Limit results to definitions associated with this repository.
     description: ''
@@ -36,19 +42,26 @@ items:
     parameterValueGroup: bitbucket, git, github, githubenterprise, svn, tfsgit, tfsversioncontrol
     summary: Limit results to definitions associated with this repository type. It is mandatory to pass 'repository' argument along with this argument.
     description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of definitions to list.
+    description: ''
 - uid: az_pipelines_build_definition_show
   name: az pipelines build definition show
   summary: Get the details of a build definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build definition show [--detect {false, true}]
+                                       [--id]
+                                       [--name]
+                                       [--open]
+                                       [--org]
+                                       [--project]
+                                       [--query-examples]
+                                       [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -63,21 +76,20 @@ items:
     summary: Open the definition summary page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_build_definition_list
-  name: az pipelines build definition list
-  summary: List build definitions.
-- uid: az_pipelines_build_definition_show
-  name: az pipelines build definition show
-  summary: Get the details of a build definition.
+- az_pipelines_build_definition_list
+- az_pipelines_build_definition_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -93,4 +105,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build definitions.
+metadata:
+  description: Manage build definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/tag.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/tag.yml
index 906776a4de..7e57d98962 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/tag.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/build/tag.yml
@@ -1,22 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_build_tag
-  name: az pipelines build tag
-  summary: Manage build tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_build_tag_add
-  - az_pipelines_build_tag_delete
-  - az_pipelines_build_tag_list
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_build_tag
+name: az pipelines build tag
+summary: Manage build tags.
+description: ''
+directCommands:
 - uid: az_pipelines_build_tag_add
   name: az pipelines build tag add
   summary: Add tag(s) for a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build tag add --build-id
+                               --tags
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --build-id
     summary: ID of the build.
@@ -25,12 +24,13 @@ items:
     name: --tags
     summary: Tag(s) to be added to the build. [Comma seperated values].
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -42,9 +42,14 @@ items:
   name: az pipelines build tag delete
   summary: Delete a build tag.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build tag delete --build-id
+                                  --tag
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --build-id
     summary: ID of the build.
@@ -53,12 +58,13 @@ items:
     name: --tag
     summary: Tag to be deleted from the build.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -70,36 +76,39 @@ items:
   name: az pipelines build tag list
   summary: Get tags for a build.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines build tag list --build-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --build-id
     summary: ID of the build.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_build_tag_add
-  name: az pipelines build tag add
-  summary: Add tag(s) for a build.
-- uid: az_pipelines_build_tag_delete
-  name: az pipelines build tag delete
-  summary: Delete a build tag.
-- uid: az_pipelines_build_tag_list
-  name: az pipelines build tag list
-  summary: Get tags for a build.
+- az_pipelines_build_tag_add
+- az_pipelines_build_tag_delete
+- az_pipelines_build_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -115,4 +124,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build tags.
+metadata:
+  description: Manage build tags.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/folder.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/folder.yml
index b673c523c4..20f6aac0d6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/folder.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/folder.yml
@@ -1,27 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_folder
-  name: az pipelines folder
-  summary: Manage folders for organizing pipelines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_folder_create
-  - az_pipelines_folder_delete
-  - az_pipelines_folder_list
-  - az_pipelines_folder_update
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_folder
+name: az pipelines folder
+summary: Manage folders for organizing pipelines.
+description: ''
+directCommands:
 - uid: az_pipelines_folder_create
   name: az pipelines folder create
   summary: Create a folder.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder create --path
+                               [--description]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Full path of the folder.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the folder.
     description: ''
@@ -30,7 +29,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -42,42 +41,54 @@ items:
   name: az pipelines folder delete
   summary: Delete a folder.
   description: This will delete all pipelines in the folder.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder delete --path
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Full path of the folder.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_pipelines_folder_list
   name: az pipelines folder list
   summary: List all folders.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder list [--detect {false, true}]
+                             [--org]
+                             [--path]
+                             [--project]
+                             [--query-examples]
+                             [--query-order {Asc, Desc, None}]
+                             [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Full path of the folder.
@@ -85,6 +96,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     parameterValueGroup: Asc, Desc, None
     summary: Order in which folders are returned.
@@ -96,13 +110,20 @@ items:
   name: az pipelines folder update
   summary: Update a folder name or description.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines folder update --path
+                               [--detect {false, true}]
+                               [--new-description]
+                               [--new-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Full path of the folder.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -114,7 +135,7 @@ items:
     summary: New full path of the folder.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -123,18 +144,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_folder_create
-  name: az pipelines folder create
-  summary: Create a folder.
-- uid: az_pipelines_folder_delete
-  name: az pipelines folder delete
-  summary: Delete a folder.
-- uid: az_pipelines_folder_list
-  name: az pipelines folder list
-  summary: List all folders.
-- uid: az_pipelines_folder_update
-  name: az pipelines folder update
-  summary: Update a folder name or description.
+- az_pipelines_folder_create
+- az_pipelines_folder_delete
+- az_pipelines_folder_list
+- az_pipelines_folder_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -150,4 +163,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage folders for organizing pipelines.
+metadata:
+  description: Manage folders for organizing pipelines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/pool.yml
index 9e21723417..53472b2d4b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/pool.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/pool.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_pool
-  name: az pipelines pool
-  summary: Manage agent pools.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_pool_list
-  - az_pipelines_pool_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_pool
+name: az pipelines pool
+summary: Manage agent pools.
+description: ''
+directCommands:
 - uid: az_pipelines_pool_list
   name: az pipelines pool list
   summary: List agent pools.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines pool list [--action {manage, none, use}]
+                           [--detect {false, true}]
+                           [--org]
+                           [--pool-name]
+                           [--pool-type {automation, deployment}]
+                           [--query-examples]
+                           [--subscription]
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter the list with user action permitted.
@@ -25,7 +26,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pool-name
     summary: Filter the list with matching pool name.
@@ -34,6 +35,9 @@ items:
     parameterValueGroup: automation, deployment
     summary: Filter the list with type of pool.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -41,13 +45,19 @@ items:
   name: az pipelines pool show
   summary: Show agent pool details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines pool show --id
+                           [--action {manage, none, use}]
+                           [--detect {false, true}]
+                           [--org]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --pool-id
     summary: Id of the pool to list the details.
     description: ''
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter the list with user action permitted.
@@ -57,18 +67,17 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_pool_list
-  name: az pipelines pool list
-  summary: List agent pools.
-- uid: az_pipelines_pool_show
-  name: az pipelines pool show
-  summary: Show agent pool details.
+- az_pipelines_pool_list
+- az_pipelines_pool_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -84,4 +93,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent pools.
+metadata:
+  description: Manage agent pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/queue.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/queue.yml
index d9c5a7a257..000178013e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/queue.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/queue.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_queue
-  name: az pipelines queue
-  summary: Manage agent queues.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_queue_list
-  - az_pipelines_queue_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_queue
+name: az pipelines queue
+summary: Manage agent queues.
+description: ''
+directCommands:
 - uid: az_pipelines_queue_list
   name: az pipelines queue list
   summary: List agent queues.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines queue list [--action {manage, none, use}]
+                            [--detect {false, true}]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--queue-name]
+                            [--subscription]
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter by whether the calling user has use or manage permissions.
@@ -25,11 +26,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --queue-name
     summary: Filter the list with matching queue name regex. e.g. \*ubuntu\* for queue with name 'Hosted Ubuntu 1604'.
     description: ''
@@ -40,13 +44,20 @@ items:
   name: az pipelines queue show
   summary: Show details of agent queue.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines queue show --id
+                            [--action {manage, none, use}]
+                            [--detect {false, true}]
+                            [--org]
+                            [--project]
+                            [--query-examples]
+                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --queue-id
     summary: Id of the agent queue to get information about.
     description: ''
+  optionalParameters:
   - name: --action
     parameterValueGroup: manage, none, use
     summary: Filter by whether the calling user has use or manage permissions.
@@ -56,21 +67,20 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_queue_list
-  name: az pipelines queue list
-  summary: List agent queues.
-- uid: az_pipelines_queue_show
-  name: az pipelines queue show
-  summary: Show details of agent queue.
+- az_pipelines_queue_list
+- az_pipelines_queue_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -86,4 +96,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage agent queues.
+metadata:
+  description: Manage agent queues.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/release.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/release.yml
index 3abf5e02f3..c695830fe7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/release.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/release.yml
@@ -1,22 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_release
-  name: az pipelines release
-  summary: Manage releases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_release_create
-  - az_pipelines_release_list
-  - az_pipelines_release_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_release
+name: az pipelines release
+summary: Manage releases.
+description: ''
+directCommands:
 - uid: az_pipelines_release_create
   name: az pipelines release create
   summary: Request (create) a release.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release create [--artifact-metadata-list]
+                                [--definition-id]
+                                [--definition-name]
+                                [--description]
+                                [--detect {false, true}]
+                                [--open]
+                                [--org]
+                                [--project]
+                                [--subscription]
+  optionalParameters:
   - name: --artifact-metadata-list
     summary: Space separated "alias=version_id" pairs.
     description: ''
@@ -37,7 +39,7 @@ items:
     summary: Open the release results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -49,9 +51,17 @@ items:
   name: az pipelines release list
   summary: List release results.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release list [--definition-id]
+                              [--detect {false, true}]
+                              [--org]
+                              [--project]
+                              [--query-examples]
+                              [--source-branch]
+                              [--status]
+                              [--subscription]
+                              [--top]
+  optionalParameters:
   - name: --definition-id
     summary: ID of definition to list releases for.
     description: ''
@@ -60,34 +70,44 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --source-branch
     summary: Filter releases for this branch.
     description: ''
   - name: --status
     summary: Limit to releases with this status.
     description: ''
-  - name: --top
-    summary: Maximum number of releases to list. Default is 50.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of releases to list. Default is 50.
+    description: ''
 - uid: az_pipelines_release_show
   name: az pipelines release show
   summary: Get the details of a release.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release show --id
+                              [--detect {false, true}]
+                              [--open]
+                              [--org]
+                              [--project]
+                              [--query-examples]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the release.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -96,33 +116,24 @@ items:
     summary: Open the release results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_release_create
-  name: az pipelines release create
-  summary: Request (create) a release.
-- uid: az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-- uid: az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
-- uid: az_pipelines_release_list
-  name: az pipelines release list
-  summary: List release results.
-- uid: az_pipelines_release_show
-  name: az pipelines release show
-  summary: Get the details of a release.
+- az_pipelines_release_create
+- az_pipelines_release_definition
+- az_pipelines_release_definition_list
+- az_pipelines_release_definition_show
+- az_pipelines_release_list
+- az_pipelines_release_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -138,4 +149,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage releases.
+metadata:
+  description: Manage releases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/release/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/release/definition.yml
index 9aa1222374..a73132637c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/release/definition.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/release/definition.yml
@@ -1,23 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_release_definition
-  name: az pipelines release definition
-  summary: Manage release definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_release_definition_list
-  - az_pipelines_release_definition_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_release_definition
+name: az pipelines release definition
+summary: Manage release definitions.
+description: ''
+directCommands:
 - uid: az_pipelines_release_definition_list
   name: az pipelines release definition list
   summary: List release definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release definition list [--artifact-source-id]
+                                         [--artifact-type {build, externaltfsbuild, git, github, jenkins, tfvc}]
+                                         [--detect {false, true}]
+                                         [--name]
+                                         [--org]
+                                         [--project]
+                                         [--query-examples]
+                                         [--subscription]
+                                         [--top]
+  optionalParameters:
   - name: --artifact-source-id
-    summary: Limit results to definitions associated with this artifact_source_id. e.g. For build it would be {projectGuid}:{BuildDefinitionId}, for Jenkins it would be {JenkinsConnectionId}:{JenkinsDefinitionId}, for TfsOnPrem it would be {TfsOnPremConnectionId}:{ProjectName}:{TfsOnPremDefinitionId}. For third-party artifacts e.g. TeamCity, BitBucket you may refer 'uniqueSourceIdentifier' inside vss-extension.json at <a href="https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions">https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions</a>.
+    summary: Limit results to definitions associated with this artifact_source_id. e.g. For build it would be {projectGuid}:{BuildDefinitionId}, for Jenkins it would be {JenkinsConnectionId}:{JenkinsDefinitionId}, for TfsOnPrem it would be {TfsOnPremConnectionId}:{ProjectName}:{TfsOnPremDefinitionId}. For third-party artifacts e.g. TeamCity, BitBucket you may refer 'uniqueSourceIdentifier' inside vss-extension.json at https://github.com/Microsoft/vsts-rm-extensions/blob/master/Extensions.
     description: ''
   - name: --artifact-type
     parameterValueGroup: build, externaltfsbuild, git, github, jenkins, tfvc
@@ -31,24 +34,34 @@ items:
     summary: 'Limit results to definitions with this name or contains this name. Example: "FabCI".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --top
-    summary: Maximum number of definitions to list.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of definitions to list.
+    description: ''
 - uid: az_pipelines_release_definition_show
   name: az pipelines release definition show
   summary: Get the details of a release definition.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines release definition show [--detect {false, true}]
+                                         [--id]
+                                         [--name]
+                                         [--open]
+                                         [--org]
+                                         [--project]
+                                         [--query-examples]
+                                         [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -63,21 +76,20 @@ items:
     summary: Open the definition summary page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_release_definition_list
-  name: az pipelines release definition list
-  summary: List release definitions.
-- uid: az_pipelines_release_definition_show
-  name: az pipelines release definition show
-  summary: Get the details of a release definition.
+- az_pipelines_release_definition_list
+- az_pipelines_release_definition_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -93,4 +105,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage release definitions.
+metadata:
+  description: Manage release definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs.yml
index 2c0926795f..e30318d054 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs.yml
@@ -1,21 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_runs
-  name: az pipelines runs
-  summary: Manage pipeline runs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_runs_list
-  - az_pipelines_runs_show
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_runs
+name: az pipelines runs
+summary: Manage pipeline runs.
+description: ''
+directCommands:
 - uid: az_pipelines_runs_list
   name: az pipelines runs list
   summary: List the pipeline runs in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs list [--branch]
+                           [--detect {false, true}]
+                           [--org]
+                           [--pipeline-ids]
+                           [--project]
+                           [--query-examples]
+                           [--query-order {FinishTimeAsc, FinishTimeDesc, QueueTimeAsc, QueueTimeDesc, StartTimeAsc, StartTimeDesc}]
+                           [--reason {all, batchedCI, buildCompletion, checkInShelveset, individualCI, manual, pullRequest, schedule, triggered, userCreated, validateShelveset}]
+                           [--requested-for]
+                           [--result {canceled, failed, none, partiallySucceeded, succeeded}]
+                           [--status {all, cancelling, completed, inProgress, none, notStarted, postponed}]
+                           [--subscription]
+                           [--tags]
+                           [--top]
+  optionalParameters:
   - name: --branch
     summary: Filter by builds for this branch.
     description: ''
@@ -24,7 +32,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-ids
     summary: IDs (space separated) of definitions to list builds for.
@@ -32,6 +40,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     parameterValueGroup: FinishTimeAsc, FinishTimeDesc, QueueTimeAsc, QueueTimeDesc, StartTimeAsc, StartTimeDesc
     summary: Order of pipeline runs.
@@ -51,26 +62,33 @@ items:
     parameterValueGroup: all, cancelling, completed, inProgress, none, notStarted, postponed
     summary: Limit to builds with this status.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: Limit to builds with each of the specified tags. Space separated.
     description: ''
   - name: --top
     summary: Maximum number of builds to list.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_pipelines_runs_show
   name: az pipelines runs show
   summary: Show details of a pipeline run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs show --id
+                           [--detect {false, true}]
+                           [--open]
+                           [--org]
+                           [--project]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pipeline run.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -79,45 +97,28 @@ items:
     summary: Open the build results page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-- uid: az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
-- uid: az_pipelines_runs_list
-  name: az pipelines runs list
-  summary: List the pipeline runs in a project.
-- uid: az_pipelines_runs_show
-  name: az pipelines runs show
-  summary: Show details of a pipeline run.
-- uid: az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-- uid: az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
+- az_pipelines_runs_artifact
+- az_pipelines_runs_artifact_download
+- az_pipelines_runs_artifact_list
+- az_pipelines_runs_artifact_upload
+- az_pipelines_runs_list
+- az_pipelines_runs_show
+- az_pipelines_runs_tag
+- az_pipelines_runs_tag_add
+- az_pipelines_runs_tag_delete
+- az_pipelines_runs_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -133,4 +134,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline runs.
+metadata:
+  description: Manage pipeline runs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/artifact.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/artifact.yml
index 5bd7176ea3..2fca9caadb 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/artifact.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/artifact.yml
@@ -1,22 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_runs_artifact
-  name: az pipelines runs artifact
-  summary: Manage pipeline run artifacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_runs_artifact_download
-  - az_pipelines_runs_artifact_list
-  - az_pipelines_runs_artifact_upload
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_runs_artifact
+name: az pipelines runs artifact
+summary: Manage pipeline run artifacts.
+description: ''
+directCommands:
 - uid: az_pipelines_runs_artifact_download
   name: az pipelines runs artifact download
   summary: Download a pipeline artifact.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs artifact download --artifact-name
+                                        --path
+                                        --run-id
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--project]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --artifact-name
     summary: Name of the artifact to download.
@@ -29,12 +29,13 @@ items:
     name: --run-id
     summary: ID of the run that the artifact is associated to.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -46,23 +47,32 @@ items:
   name: az pipelines runs artifact list
   summary: List artifacts associated with a run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs artifact list --run-id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the run that the artifact is associated to.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -70,9 +80,15 @@ items:
   name: az pipelines runs artifact upload
   summary: Upload a pipeline artifact.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs artifact upload --artifact-name
+                                      --path
+                                      --run-id
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --artifact-name
     summary: Name of the artifact to upload.
@@ -85,12 +101,13 @@ items:
     name: --run-id
     summary: ID of the run that the artifact is associated to.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -99,15 +116,9 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_runs_artifact_download
-  name: az pipelines runs artifact download
-  summary: Download a pipeline artifact.
-- uid: az_pipelines_runs_artifact_list
-  name: az pipelines runs artifact list
-  summary: List artifacts associated with a run.
-- uid: az_pipelines_runs_artifact_upload
-  name: az pipelines runs artifact upload
-  summary: Upload a pipeline artifact.
+- az_pipelines_runs_artifact_download
+- az_pipelines_runs_artifact_list
+- az_pipelines_runs_artifact_upload
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -123,4 +134,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run artifacts.
+metadata:
+  description: Manage pipeline run artifacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/tag.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/tag.yml
index 8bf44f59cd..094858d90a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/tag.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/runs/tag.yml
@@ -1,22 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_runs_tag
-  name: az pipelines runs tag
-  summary: Manage pipeline run tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_runs_tag_add
-  - az_pipelines_runs_tag_delete
-  - az_pipelines_runs_tag_list
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_runs_tag
+name: az pipelines runs tag
+summary: Manage pipeline run tags.
+description: ''
+directCommands:
 - uid: az_pipelines_runs_tag_add
   name: az pipelines runs tag add
   summary: Add tag(s) for a pipeline run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs tag add --run-id
+                              --tags
+                              [--detect {false, true}]
+                              [--org]
+                              [--project]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the pipeline run.
@@ -25,12 +24,13 @@ items:
     name: --tags
     summary: Tag(s) to be added to the pipeline run. [Comma seperated values].
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -42,9 +42,14 @@ items:
   name: az pipelines runs tag delete
   summary: Delete a pipeline run tag.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs tag delete --run-id
+                                 --tag
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the pipeline run.
@@ -53,12 +58,13 @@ items:
     name: --tag
     summary: Tag to be deleted from the pipeline run.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -70,36 +76,39 @@ items:
   name: az pipelines runs tag list
   summary: Get tags for a pipeline run.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines runs tag list --run-id
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--query-examples]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --run-id
     summary: ID of the  pipeline run.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_runs_tag_add
-  name: az pipelines runs tag add
-  summary: Add tag(s) for a pipeline run.
-- uid: az_pipelines_runs_tag_delete
-  name: az pipelines runs tag delete
-  summary: Delete a pipeline run tag.
-- uid: az_pipelines_runs_tag_list
-  name: az pipelines runs tag list
-  summary: Get tags for a pipeline run.
+- az_pipelines_runs_tag_add
+- az_pipelines_runs_tag_delete
+- az_pipelines_runs_tag_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -115,4 +124,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline run tags.
+metadata:
+  description: Manage pipeline run tags.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group.yml
index 5c14256a36..6daf067a12 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_variable_group
-  name: az pipelines variable-group
-  summary: Manage variable groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_variable_group_create
-  - az_pipelines_variable_group_delete
-  - az_pipelines_variable_group_list
-  - az_pipelines_variable_group_show
-  - az_pipelines_variable_group_update
-- uid: az_pipelines_variable_group_create
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_variable-group
+name: az pipelines variable-group
+summary: Manage variable groups.
+description: ''
+directCommands:
+- uid: az_pipelines_variable-group_create
   name: az pipelines variable-group create
   summary: Create a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group create --name
+                                       --variables
+                                       [--authorize {false, true}]
+                                       [--description]
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable group.
@@ -27,6 +26,7 @@ items:
     name: --variables
     summary: Variables in format key=value space separated pairs. Secret variables should be managed using `az pipelines variable-group variable` commands.
     description: ''
+  optionalParameters:
   - name: --authorize
     parameterValueGroup: false, true
     summary: Whether the variable group should be accessible by all pipelines.
@@ -39,7 +39,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,40 +47,55 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_delete
+- uid: az_pipelines_variable-group_delete
   name: az pipelines variable-group delete
   summary: Delete a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group delete --group-id
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+                                       [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_pipelines_variable-group_list
   name: az pipelines variable-group list
   summary: List variable groups.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group list [--action {manage, none, use}]
+                                     [--continuation-token]
+                                     [--detect {false, true}]
+                                     [--group-name]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--query-order {Asc, Desc}]
+                                     [--subscription]
+                                     [--top]
+  optionalParameters:
   - name: --action --action-filter
     parameterValueGroup: manage, none, use
     summary: Action filter for the variable group. It specifies the action which can be performed on the variable groups.
@@ -96,57 +111,77 @@ items:
     summary: Name of the variable group. Wildcards are accepted. e.g. var_group\*.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --query-order
     defaultValue: Desc
     parameterValueGroup: Asc, Desc
     summary: Gets the results in the defined order.
     description: ''
-  - name: --top
-    summary: Number of variable groups to get.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_show
+  - name: --top
+    summary: Number of variable groups to get.
+    description: ''
+- uid: az_pipelines_variable-group_show
   name: az pipelines variable-group show
   summary: Show variable group details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group show --group-id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: ID of the variable group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_update
+- uid: az_pipelines_variable-group_update
   name: az pipelines variable-group update
   summary: Update a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group update --group-id
+                                       [--authorize {false, true}]
+                                       [--description]
+                                       [--detect {false, true}]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
     description: ''
+  optionalParameters:
   - name: --authorize
     parameterValueGroup: false, true
     summary: Whether the variable group should be accessible by all pipelines.
@@ -162,7 +197,7 @@ items:
     summary: New name of the variable group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -171,36 +206,16 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_pipelines_variable_group_create
-  name: az pipelines variable-group create
-  summary: Create a variable group.
-- uid: az_pipelines_variable_group_delete
-  name: az pipelines variable-group delete
-  summary: Delete a variable group.
-- uid: az_pipelines_variable_group_list
-  name: az pipelines variable-group list
-  summary: List variable groups.
-- uid: az_pipelines_variable_group_show
-  name: az pipelines variable-group show
-  summary: Show variable group details.
-- uid: az_pipelines_variable_group_update
-  name: az pipelines variable-group update
-  summary: Update a variable group.
-- uid: az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-- uid: az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
+- az_pipelines_variable-group_create
+- az_pipelines_variable-group_delete
+- az_pipelines_variable-group_list
+- az_pipelines_variable-group_show
+- az_pipelines_variable-group_update
+- az_pipelines_variable-group_variable
+- az_pipelines_variable-group_variable_create
+- az_pipelines_variable-group_variable_delete
+- az_pipelines_variable-group_variable_list
+- az_pipelines_variable-group_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -216,4 +231,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variable groups.
+metadata:
+  description: Manage variable groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group/variable.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group/variable.yml
index 7ffe37c9b2..1e88643a42 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group/variable.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable-group/variable.yml
@@ -1,23 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_variable_group_variable
-  name: az pipelines variable-group variable
-  summary: Manage variables in a variable group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_variable_group_variable_create
-  - az_pipelines_variable_group_variable_delete
-  - az_pipelines_variable_group_variable_list
-  - az_pipelines_variable_group_variable_update
-- uid: az_pipelines_variable_group_variable_create
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_variable-group_variable
+name: az pipelines variable-group variable
+summary: Manage variables in a variable group.
+description: ''
+directCommands:
+- uid: az_pipelines_variable-group_variable_create
   name: az pipelines variable-group variable create
   summary: Add a variable to a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable create --group-id
+                                                --name
+                                                [--detect {false, true}]
+                                                [--org]
+                                                [--project]
+                                                [--secret {false, true}]
+                                                [--subscription]
+                                                [--value]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
@@ -26,12 +26,13 @@ items:
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -40,19 +41,25 @@ items:
     parameterValueGroup: false, true
     summary: If the value of the variable is a secret.
     description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_variable_delete
+  - name: --value
+    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
+    description: ''
+- uid: az_pipelines_variable-group_variable_delete
   name: az pipelines variable-group variable delete
   summary: Delete a variable from variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable delete --group-id
+                                                --name
+                                                [--detect {false, true}]
+                                                [--org]
+                                                [--project]
+                                                [--subscription]
+                                                [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
@@ -61,53 +68,72 @@ items:
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_variable_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_pipelines_variable-group_variable_list
   name: az pipelines variable-group variable list
   summary: List the variables in a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable list --group-id
+                                              [--detect {false, true}]
+                                              [--org]
+                                              [--project]
+                                              [--query-examples]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_pipelines_variable_group_variable_update
+- uid: az_pipelines_variable-group_variable_update
   name: az pipelines variable-group variable update
   summary: Update a variable in a variable group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable-group variable update --group-id
+                                                --name
+                                                [--detect {false, true}]
+                                                [--new-name]
+                                                [--org]
+                                                [--project]
+                                                [--prompt-value {false, true}]
+                                                [--secret {false, true}]
+                                                [--subscription]
+                                                [--value]
+  requiredParameters:
   - isRequired: true
     name: --group-id --id
     summary: Id of the variable group.
@@ -116,6 +142,7 @@ items:
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -124,7 +151,7 @@ items:
     summary: New name of the variable.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -137,25 +164,17 @@ items:
     parameterValueGroup: false, true
     summary: If the value of the variable is a secret.
     description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --value
+    summary: New value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with AZURE_DEVOPS_EXT_PIPELINE_VAR_ or user will be prompted to enter it via standard input. e.g. PersonalAccessToken can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_PersonalAccessToken.
+    description: ''
 commands:
-- uid: az_pipelines_variable_group_variable_create
-  name: az pipelines variable-group variable create
-  summary: Add a variable to a variable group.
-- uid: az_pipelines_variable_group_variable_delete
-  name: az pipelines variable-group variable delete
-  summary: Delete a variable from variable group.
-- uid: az_pipelines_variable_group_variable_list
-  name: az pipelines variable-group variable list
-  summary: List the variables in a variable group.
-- uid: az_pipelines_variable_group_variable_update
-  name: az pipelines variable-group variable update
-  summary: Update a variable in a variable group.
+- az_pipelines_variable-group_variable_create
+- az_pipelines_variable-group_variable_delete
+- az_pipelines_variable-group_variable_list
+- az_pipelines_variable-group_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -171,4 +190,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage variables in a variable group.
+metadata:
+  description: Manage variables in a variable group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable.yml b/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable.yml
index 45b5d9ad9d..0f747467fd 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/pipelines/variable.yml
@@ -1,27 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_pipelines_variable
-  name: az pipelines variable
-  summary: Manage pipeline variables.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_pipelines_variable_create
-  - az_pipelines_variable_delete
-  - az_pipelines_variable_list
-  - az_pipelines_variable_update
+### YamlMime:AzureCLIGroup
+uid: az_pipelines_variable
+name: az pipelines variable
+summary: Manage pipeline variables.
+description: ''
+directCommands:
 - uid: az_pipelines_variable_create
   name: az pipelines variable create
   summary: Add a variable to a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable create --name
+                                 [--allow-override {false, true}]
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--pipeline-id]
+                                 [--pipeline-name]
+                                 [--project]
+                                 [--secret {false, true}]
+                                 [--subscription]
+                                 [--value]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --allow-override
     parameterValueGroup: false, true
     summary: Indicates whether the value can be set at queue time.
@@ -31,7 +34,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -46,29 +49,37 @@ items:
     parameterValueGroup: false, true
     summary: Indicates whether the variable's value is a secret.
     description: ''
-  - name: --value
-    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with <problematic ids="id30" refid="id29">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> or user will be prompted to enter it via standard input. e.g. A variable named `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --value
+    summary: Value of the variable. For secret variables, if --value parameter is not given, it will be picked from environment variable prefixed with <problematic ids="id30" refid="id29">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> or user will be prompted to enter it via standard input. e.g. A variable named `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
+    description: ''
 - uid: az_pipelines_variable_delete
   name: az pipelines variable delete
   summary: Delete a variable from pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable delete --name
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--pipeline-id]
+                                 [--pipeline-name]
+                                 [--project]
+                                 [--subscription]
+                                 [--yes]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -79,25 +90,31 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_pipelines_variable_list
   name: az pipelines variable list
   summary: List the variables in a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable list [--detect {false, true}]
+                               [--org]
+                               [--pipeline-id]
+                               [--pipeline-name]
+                               [--project]
+                               [--query-examples]
+                               [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -108,6 +125,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -115,13 +135,25 @@ items:
   name: az pipelines variable update
   summary: Update a variable in a pipeline.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az pipelines variable update --name
+                                 [--allow-override {false, true}]
+                                 [--detect {false, true}]
+                                 [--new-name]
+                                 [--org]
+                                 [--pipeline-id]
+                                 [--pipeline-name]
+                                 [--project]
+                                 [--prompt-value {false, true}]
+                                 [--secret {false, true}]
+                                 [--subscription]
+                                 [--value]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the variable.
     description: ''
+  optionalParameters:
   - name: --allow-override
     parameterValueGroup: false, true
     summary: Indicates whether the value can be set at queue time.
@@ -134,7 +166,7 @@ items:
     summary: New name of the variable.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --pipeline-id
     summary: Id of the pipeline.
@@ -153,25 +185,17 @@ items:
     parameterValueGroup: false, true
     summary: If the value of the variable is a secret.
     description: ''
-  - name: --value
-    summary: New value of the variable. For secret variables, use --prompt-value parameter, to be prompted to enter it via standard input. For non-interactive consoles it can be picked from environment variable prefixed with <problematic ids="id32" refid="id31">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> e.g. A variable nameed `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --value
+    summary: New value of the variable. For secret variables, use --prompt-value parameter, to be prompted to enter it via standard input. For non-interactive consoles it can be picked from environment variable prefixed with <problematic ids="id32" refid="id31">AZURE_DEVOPS_EXT_PIPELINE_VAR_</problematic> e.g. A variable nameed `MySecret` can be input using environment variable AZURE_DEVOPS_EXT_PIPELINE_VAR_MySecret.
+    description: ''
 commands:
-- uid: az_pipelines_variable_create
-  name: az pipelines variable create
-  summary: Add a variable to a pipeline.
-- uid: az_pipelines_variable_delete
-  name: az pipelines variable delete
-  summary: Delete a variable from pipeline.
-- uid: az_pipelines_variable_list
-  name: az pipelines variable list
-  summary: List the variables in a pipeline.
-- uid: az_pipelines_variable_update
-  name: az pipelines variable update
-  summary: Update a variable in a pipeline.
+- az_pipelines_variable_create
+- az_pipelines_variable_delete
+- az_pipelines_variable_list
+- az_pipelines_variable_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -187,4 +211,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pipeline variables.
+metadata:
+  description: Manage pipeline variables.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/policy.yml
index 8264f6b2e0..2a465ac223 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/policy.yml
@@ -1,46 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_policy
-  name: az policy
-  summary: Manage resource policies.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_policy
+name: az policy
+summary: Manage resource policies.
+description: ''
 commands:
-- uid: az_policy_assignment
-  name: az policy assignment
-  summary: Manage resource policy assignments.
-- uid: az_policy_assignment_create
-  name: az policy assignment create
-  summary: Create a resource policy assignment.
-- uid: az_policy_assignment_delete
-  name: az policy assignment delete
-  summary: Delete a resource policy assignment.
-- uid: az_policy_assignment_list
-  name: az policy assignment list
-  summary: List resource policy assignments.
-- uid: az_policy_assignment_show
-  name: az policy assignment show
-  summary: Show a resource policy assignment.
-- uid: az_policy_definition
-  name: az policy definition
-  summary: Manage resource policy definitions.
-- uid: az_policy_definition_create
-  name: az policy definition create
-  summary: Create a policy definition.
-- uid: az_policy_definition_delete
-  name: az policy definition delete
-  summary: Delete a policy definition.
-- uid: az_policy_definition_list
-  name: az policy definition list
-  summary: List policy definitions.
-- uid: az_policy_definition_show
-  name: az policy definition show
-  summary: Show a policy definition.
-- uid: az_policy_definition_update
-  name: az policy definition update
-  summary: Update a policy definition.
+- az_policy_assignment
+- az_policy_assignment_create
+- az_policy_assignment_delete
+- az_policy_assignment_list
+- az_policy_assignment_show
+- az_policy_definition
+- az_policy_definition_create
+- az_policy_definition_delete
+- az_policy_definition_list
+- az_policy_definition_show
+- az_policy_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -56,10 +30,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/policy/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/policy/assignment.yml
index cd670b844f..572ade2f3c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/policy/assignment.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/policy/assignment.yml
@@ -1,50 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_policy_assignment
-  name: az policy assignment
-  summary: Manage resource policy assignments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_policy_assignment_create
-  - az_policy_assignment_delete
-  - az_policy_assignment_list
-  - az_policy_assignment_show
+### YamlMime:AzureCLIGroup
+uid: az_policy_assignment
+name: az policy assignment
+summary: Manage resource policy assignments.
+description: ''
+directCommands:
 - uid: az_policy_assignment_create
   name: az policy assignment create
   summary: Create a resource policy assignment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy assignment create [--display-name]
+                                [--name]
+                                [--not-scopes]
+                                [--params]
+                                [--policy]
+                                [--resource-group]
+                                [--scope]
   examples:
   - summary: Create a resource policy assignment at scope
-    syntax:
-      content: >-
-        Valid scopes are management group, subscription, resource group, and resource, for example
-           management group:  /providers/Microsoft.Management/managementGroups/MyManagementGroup
-           subscription:      /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333
-           resource group:    /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup
-           resource:          /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM
-             az policy assignment create --scope \
-                "/providers/Microsoft.Management/managementGroups/MyManagementGroup" \
-                    --policy {PolicyName} -p "{ \"allowedLocations\": \
-                        { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
+    syntax: >-
+      Valid scopes are management group, subscription, resource group, and resource, for example
+         management group:  /providers/Microsoft.Management/managementGroups/MyManagementGroup
+         subscription:      /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333
+         resource group:    /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup
+         resource:          /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM
+           az policy assignment create --scope \
+              "/providers/Microsoft.Management/managementGroups/MyManagementGroup" \
+                  --policy {PolicyName} -p "{ \"allowedLocations\": \
+                      { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
   - summary: Create a resource policy assignment and provide rule parameter values.
-    syntax:
-      content: >-
-        az policy assignment create --policy {PolicyName} -p "{ \"allowedLocations\": \
-            { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
+    syntax: >-
+      az policy assignment create --policy {PolicyName} -p "{ \"allowedLocations\": \
+          { \"value\": [ \"australiaeast\", \"eastus\", \"japaneast\" ] } }"
   - summary: Create a resource policy assignment with a system assigned identity.
-    syntax:
-      content: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity
+    syntax: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity
   - summary: Create a resource policy assignment with a system assigned identity. The identity will have 'Contributor' role access to the subscription.
-    syntax:
-      content: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity --identity-scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --role Contributor
+    syntax: az policy assignment create --name myPolicy --policy {PolicyName} --assign-identity --identity-scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --role Contributor
   - summary: Create a resource policy assignment with an enforcement mode. It indicates whether a policy effect will be enforced or not during assignment creation and update. Please visit https://aka.ms/azure-policyAssignment-enforcement-mode for more information.
-    syntax:
-      content: az policy assignment create --name myPolicy --policy {PolicyName} --enforcement-mode 'DoNotEnforce'
-  parameters:
+    syntax: az policy assignment create --name myPolicy --policy {PolicyName} --enforcement-mode 'DoNotEnforce'
+  optionalParameters:
   - name: --display-name
     summary: Display name of the policy assignment.
     description: ''
@@ -66,101 +60,87 @@ items:
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_assignment_delete
   name: az policy assignment delete
   summary: Delete a resource policy assignment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy assignment delete --name
+                                [--resource-group]
+                                [--scope]
   examples:
   - summary: Delete a resource policy assignment. (autogenerated)
-    syntax:
-      content: az policy assignment delete --name MyPolicyAssignment
-  parameters:
+    syntax: az policy assignment delete --name MyPolicyAssignment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the policy assignment.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
     summary: The resource group where the policy will be applied.
     description: ''
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_assignment_list
   name: az policy assignment list
   summary: List resource policy assignments.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az policy assignment list [--disable-scope-strict-match]
+                              [--query-examples]
+                              [--resource-group]
+                              [--scope]
+  optionalParameters:
   - name: --disable-scope-strict-match
     summary: Include policy assignments either inherited from parent scope or at child scope.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: The resource group where the policy will be applied.
     description: ''
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_assignment_show
   name: az policy assignment show
   summary: Show a resource policy assignment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy assignment show --name
+                              [--query-examples]
+                              [--resource-group]
+                              [--scope]
   examples:
   - summary: Show a resource policy assignment. (autogenerated)
-    syntax:
-      content: az policy assignment show --name MyPolicyAssignment
-  parameters:
+    syntax: az policy assignment show --name MyPolicyAssignment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the policy assignment.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: The resource group where the policy will be applied.
     description: ''
   - name: --scope
     summary: Scope to which this policy assignment applies.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_policy_assignment_create
-  name: az policy assignment create
-  summary: Create a resource policy assignment.
-- uid: az_policy_assignment_delete
-  name: az policy assignment delete
-  summary: Delete a resource policy assignment.
-- uid: az_policy_assignment_list
-  name: az policy assignment list
-  summary: List resource policy assignments.
-- uid: az_policy_assignment_show
-  name: az policy assignment show
-  summary: Show a resource policy assignment.
+- az_policy_assignment_create
+- az_policy_assignment_delete
+- az_policy_assignment_list
+- az_policy_assignment_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,10 +156,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource policy assignments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource policy assignments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/policy/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/policy/definition.yml
index a71aab3129..ed55717230 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/policy/definition.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/policy/definition.yml
@@ -1,62 +1,58 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_policy_definition
-  name: az policy definition
-  summary: Manage resource policy definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_policy_definition_create
-  - az_policy_definition_delete
-  - az_policy_definition_list
-  - az_policy_definition_show
-  - az_policy_definition_update
+### YamlMime:AzureCLIGroup
+uid: az_policy_definition
+name: az policy definition
+summary: Manage resource policy definitions.
+description: ''
+directCommands:
 - uid: az_policy_definition_create
   name: az policy definition create
   summary: Create a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition create --name
+                                [--description]
+                                [--display-name]
+                                [--management-group]
+                                [--mode]
+                                [--params]
+                                [--rules]
+                                [--subscription]
   examples:
   - summary: Create a read-only policy.
-    syntax:
-      content: >-
-        az policy definition create --name readOnlyStorage --rules "{ \"if\": \
-            { \"field\": \"type\", \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
-                \"then\": { \"effect\": \"deny\" } }"
+    syntax: >-
+      az policy definition create --name readOnlyStorage --rules "{ \"if\": \
+          { \"field\": \"type\", \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
+              \"then\": { \"effect\": \"deny\" } }"
   - summary: Create a policy parameter definition.
-    syntax:
-      content: >-
-        az policy definition create --name allowedLocations \
-            --rules "{ \"if\": { \"allOf\": [ \
-                { \"field\": \"location\",\"notIn\": \"[parameters('listOfAllowedLocations')]\" }, \
-                    { \"field\": \"location\", \"notEquals\": \"global\" }, \
-                        { \"field\": \"type\", \"notEquals\": \
-                            \"Microsoft.AzureActiveDirectory/b2cDirectories\"} \
-                                ] }, \"then\": { \"effect\": \"deny\" } }" \
-            --params "{ \"allowedLocations\": { \
-                \"type\": \"array\", \"metadata\": { \"description\": \
-                    \"The list of locations that can be specified when deploying resources\", \
-                        \"strongType\": \"location\", \"displayName\": \"Allowed locations\" } } }"
+    syntax: >-
+      az policy definition create --name allowedLocations \
+          --rules "{ \"if\": { \"allOf\": [ \
+              { \"field\": \"location\",\"notIn\": \"[parameters('listOfAllowedLocations')]\" }, \
+                  { \"field\": \"location\", \"notEquals\": \"global\" }, \
+                      { \"field\": \"type\", \"notEquals\": \
+                          \"Microsoft.AzureActiveDirectory/b2cDirectories\"} \
+                              ] }, \"then\": { \"effect\": \"deny\" } }" \
+          --params "{ \"allowedLocations\": { \
+              \"type\": \"array\", \"metadata\": { \"description\": \
+                  \"The list of locations that can be specified when deploying resources\", \
+                      \"strongType\": \"location\", \"displayName\": \"Allowed locations\" } } }"
   - summary: Create a read-only policy that can be applied within a management group.
-    syntax:
-      content: >-
-        az policy definition create -n readOnlyStorage --management-group "MyManagementGroup" \
-            --rules "{ \"if\": { \"field\": \"type\", \
-                \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
-                    \"then\": { \"effect\": \"deny\" } }"
+    syntax: >-
+      az policy definition create -n readOnlyStorage --management-group "MyManagementGroup" \
+          --rules "{ \"if\": { \"field\": \"type\", \
+              \"equals\": \"Microsoft.Storage/storageAccounts/write\" }, \
+                  \"then\": { \"effect\": \"deny\" } }"
   - summary: Create a policy definition with mode. The mode 'Indexed' indicates the policy should be evaluated only for resource types that support tags and location.
-    syntax:
-      content: >-
-        az policy definition create --name TagsPolicyDefinition --subscription "MySubscription" \
-            --mode Indexed --rules "{ \"if\": { \"field\": \"tags\", \"exists\": \"false\" }, \
-                \"then\": { \"effect\": \"deny\" } }"
-  parameters:
+    syntax: >-
+      az policy definition create --name TagsPolicyDefinition --subscription "MySubscription" \
+          --mode Indexed --rules "{ \"if\": { \"field\": \"tags\", \"exists\": \"false\" }, \
+              \"then\": { \"effect\": \"deny\" } }"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the new policy definition.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of policy definition.
     description: ''
@@ -67,7 +63,7 @@ items:
     summary: Name of the management group the new policy definition can be assigned in.
     description: ''
   - name: --mode -m
-    summary: Mode of the policy definition, e.g. All, Indexed. Please visit <a href="https://aka.ms/azure-policy-mode">https://aka.ms/azure-policy-mode</a> for more information.
+    summary: Mode of the policy definition, e.g. All, Indexed. Please visit https://aka.ms/azure-policy-mode for more information.
     description: ''
   - name: --params
     summary: JSON formatted string or a path to a file or uri with parameter definitions.
@@ -78,100 +74,100 @@ items:
   - name: --subscription
     summary: Name or id of the subscription the new policy definition can be assigned in.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_delete
   name: az policy definition delete
   summary: Delete a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition delete --name
+                                [--management-group]
+                                [--subscription]
   examples:
   - summary: Delete a policy definition. (autogenerated)
-    syntax:
-      content: az policy definition delete --name MyPolicyDefinition
-  parameters:
+    syntax: az policy definition delete --name MyPolicyDefinition
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The policy definition name.
     description: ''
+  optionalParameters:
   - name: --management-group
     summary: The name of the management group of the policy [set] definition.
     description: ''
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_list
   name: az policy definition list
   summary: List policy definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az policy definition list [--management-group]
+                              [--query-examples]
+                              [--subscription]
+  optionalParameters:
   - name: --management-group
     summary: The name of the management group of the policy [set] definition.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_show
   name: az policy definition show
   summary: Show a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition show --name
+                              [--management-group]
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Show a policy definition. (autogenerated)
-    syntax:
-      content: az policy definition show --name MyPolicyDefinition
-  parameters:
+    syntax: az policy definition show --name MyPolicyDefinition
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The policy definition name.
     description: ''
+  optionalParameters:
   - name: --management-group
     summary: The name of the management group of the policy [set] definition.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_policy_definition_update
   name: az policy definition update
   summary: Update a policy definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az policy definition update --name
+                                [--description]
+                                [--display-name]
+                                [--management-group]
+                                [--mode]
+                                [--params]
+                                [--rules]
+                                [--subscription]
   examples:
   - summary: Update a policy definition. (autogenerated)
-    syntax:
-      content: az policy definition update --name MyPolicyDefinition
-  parameters:
+    syntax: az policy definition update --name MyPolicyDefinition
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The policy definition name.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of policy definition.
     description: ''
@@ -182,7 +178,7 @@ items:
     summary: The name of the management group of the policy [set] definition.
     description: ''
   - name: --mode -m
-    summary: Mode of the policy definition, e.g. All, Indexed. Please visit <a href="https://aka.ms/azure-policy-mode">https://aka.ms/azure-policy-mode</a> for more information.
+    summary: Mode of the policy definition, e.g. All, Indexed. Please visit https://aka.ms/azure-policy-mode for more information.
     description: ''
   - name: --params
     summary: JSON formatted string or a path to a file or uri with parameter definitions.
@@ -193,28 +189,13 @@ items:
   - name: --subscription
     summary: The subscription id of the policy [set] definition.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_policy_definition_create
-  name: az policy definition create
-  summary: Create a policy definition.
-- uid: az_policy_definition_delete
-  name: az policy definition delete
-  summary: Delete a policy definition.
-- uid: az_policy_definition_list
-  name: az policy definition list
-  summary: List policy definitions.
-- uid: az_policy_definition_show
-  name: az policy definition show
-  summary: Show a policy definition.
-- uid: az_policy_definition_update
-  name: az policy definition update
-  summary: Update a policy definition.
+- az_policy_definition_create
+- az_policy_definition_delete
+- az_policy_definition_list
+- az_policy_definition_show
+- az_policy_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -230,10 +211,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource policy definitions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource policy definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/portal.yml b/2018-03-01-hybrid/docs-ref-autogen/portal.yml
new file mode 100644
index 0000000000..b350b445b5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/portal.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_portal
+name: az portal
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **portal** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az portal** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_portal_dashboard
+- az_portal_dashboard_create
+- az_portal_dashboard_delete
+- az_portal_dashboard_import
+- az_portal_dashboard_list
+- az_portal_dashboard_show
+- az_portal_dashboard_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/portal/dashboard.yml b/2018-03-01-hybrid/docs-ref-autogen/portal/dashboard.yml
new file mode 100644
index 0000000000..56b829231a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/portal/dashboard.yml
@@ -0,0 +1,183 @@
+### YamlMime:AzureCLIGroup
+uid: az_portal_dashboard
+name: az portal dashboard
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **portal** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az portal dashboard** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage portal dashboards.
+description: ''
+directCommands:
+- uid: az_portal_dashboard_create
+  name: az portal dashboard create
+  summary: Creates or updates a dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard create --input-path
+                               --name
+                               --resource-group
+                               [--location]
+                               [--tags]
+  examples:
+  - summary: Create or update a Dashboard
+    syntax: >-
+      az portal dashboard create --location "eastus" --name "testDashboard" \
+
+      --resource-group "testRG" --input-path "/src/json/properties.json" \
+
+      --tags aKey=aValue anotherKey=anotherValue
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The path to the dashboard properties JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_portal_dashboard_delete
+  name: az portal dashboard delete
+  summary: Deletes a dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard delete --name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Dashboard
+    syntax: az portal dashboard delete --name "testDashboard" --resource-group "testRG"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_portal_dashboard_import
+  name: az portal dashboard import
+  summary: Imports a dashboard from a JSON file.
+  description: ''
+  syntax: >-
+    az portal dashboard import --input-path
+                               --resource-group
+                               [--name]
+  examples:
+  - summary: Import a Dashboard
+    syntax: >-
+      az portal dashboard import --name "testDashboard" --resource-group "testRG" \
+
+      --input-path "/src/json/dashboard.json"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The path to the dashboard json file.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+- uid: az_portal_dashboard_list
+  name: az portal dashboard list
+  summary: Lists the dashboards within a subscription or resource group.
+  description: ''
+  syntax: az portal dashboard list [--resource-group]
+  examples:
+  - summary: List all dashboards in a resourceGroup
+    syntax: az portal dashboard list --resource-group "testRG"
+  - summary: List all dashboards in a subscription
+    syntax: az portal dashboard list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+- uid: az_portal_dashboard_show
+  name: az portal dashboard show
+  summary: Gets details for a single dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard show --name
+                             --resource-group
+  examples:
+  - summary: Get a Dashboard
+    syntax: az portal dashboard show --name "testDashboard" --resource-group "testRG"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_portal_dashboard_update
+  name: az portal dashboard update
+  summary: Updates an existing dashboard.
+  description: ''
+  syntax: >-
+    az portal dashboard update --input-path
+                               --name
+                               --resource-group
+  examples:
+  - summary: Update a Dashboard
+    syntax: >-
+      az portal dashboard update --name "testDashboard" --resource-group "testRG" \
+
+      --input-path "/src/json/properties.json"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The path to the dashboard properties JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dashboard.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: The name of the resource group.
+    description: ''
+commands:
+- az_portal_dashboard_create
+- az_portal_dashboard_delete
+- az_portal_dashboard_import
+- az_portal_dashboard_list
+- az_portal_dashboard_show
+- az_portal_dashboard_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage portal dashboards.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/postgres.yml b/2018-03-01-hybrid/docs-ref-autogen/postgres.yml
new file mode 100644
index 0000000000..b93e611767
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/postgres.yml
@@ -0,0 +1,164 @@
+### YamlMime:AzureCLIGroup
+uid: az_postgres
+name: az postgres
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **db-up** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az postgres** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for PostgreSQL servers.
+description: ''
+directCommands:
+- uid: az_postgres_down
+  name: az postgres down
+  summary: Delete the PostgreSQL server and its cached information.
+  description: ''
+  syntax: >-
+    az postgres down [--delete-group]
+                     [--no-wait]
+                     [--resource-group]
+                     [--server-name]
+                     [--yes]
+  examples:
+  - summary: Delete the server and the cached data, aside from the resource group.
+    syntax: az postgres down
+  - summary: Delete the resource group and the full cache.
+    syntax: az postgres down --delete-group
+  optionalParameters:
+  - name: --delete-group
+    summary: Delete the resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_postgres_show-connection-string
+  name: az postgres show-connection-string
+  summary: Show the connection strings for a PostgreSQL server database.
+  description: ''
+  syntax: >-
+    az postgres show-connection-string [--admin-password]
+                                       [--admin-user]
+                                       [--database-name]
+                                       [--server-name]
+  optionalParameters:
+  - name: --admin-password -p
+    defaultValue: '{password}'
+    summary: The login password of the administrator.
+    description: ''
+  - name: --admin-user -u
+    defaultValue: '{login}'
+    summary: The login username of the administrator.
+    description: ''
+  - name: --database-name -d
+    defaultValue: '{database}'
+    summary: The name of a database.
+    description: ''
+  - name: --server-name -s
+    defaultValue: '{server}'
+    summary: Name of the server.
+    description: ''
+- uid: az_postgres_up
+  name: az postgres up
+  summary: Set up an Azure Database for PostgreSQL server and configurations.
+  description: ''
+  syntax: >-
+    az postgres up [--admin-password]
+                   [--admin-user]
+                   [--backup-retention]
+                   [--database-name]
+                   [--generate-password]
+                   [--geo-redundant-backup {Disabled, Enabled}]
+                   [--location]
+                   [--resource-group]
+                   [--server-name]
+                   [--sku-name]
+                   [--ssl-enforcement {Disabled, Enabled}]
+                   [--storage-size]
+                   [--tags]
+                   [--version]
+  examples:
+  - summary: Ensure that a Azure Database for PostgreSQL server is up and running and configured for immediate use.
+    syntax: az postgres up
+  - summary: To override default names, provide parameters indicating desired values/existing resources.
+    syntax: az postgres up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
+  optionalParameters:
+  - name: --admin-password -p
+    summary: 'The login password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.Your password cannot contain all or part of the login name. Part of a login name is defined as three or more consecutive alphanumeric characters.'
+    description: ''
+  - name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - name: --backup-retention
+    summary: The number of days a backup is retained.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database to initialize.
+    description: ''
+  - name: --generate-password
+    summary: Generate a password.
+    description: ''
+  - name: --geo-redundant-backup
+    defaultValue: Disabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable Geo-redundant or not for server backup.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --sku-name
+    defaultValue: GP_Gen5_2
+    summary: The name of the sku, typically, tier + family + cores, e.g. B_Gen4_1, GP_Gen5_8.
+    description: ''
+  - name: --ssl-enforcement
+    defaultValue: Enabled
+    parameterValueGroup: Disabled, Enabled
+    summary: Enable ssl enforcement or not when connect to server.
+    description: ''
+  - name: --storage-size
+    summary: The max storage size of the server. Unit is megabytes.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --version
+    defaultValue: "10"
+    summary: Server version.
+    description: ''
+commands:
+- az_postgres_down
+- az_postgres_flexible-server
+- az_postgres_flexible-server_connect
+- az_postgres_flexible-server_execute
+- az_postgres_show-connection-string
+- az_postgres_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for PostgreSQL servers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/postgres/flexible-server.yml b/2018-03-01-hybrid/docs-ref-autogen/postgres/flexible-server.yml
new file mode 100644
index 0000000000..8b4849f0e9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/postgres/flexible-server.yml
@@ -0,0 +1,97 @@
+### YamlMime:AzureCLIGroup
+uid: az_postgres_flexible-server
+name: az postgres flexible-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **rdbms-connect** extension for Azure CLI and requires version 2.19.0 or higher.  The extension will automatically install the first time you run an **az postgres flexible-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Database for PostgreSQL Flexible Servers.
+description: ''
+directCommands:
+- uid: az_postgres_flexible-server_connect
+  name: az postgres flexible-server connect
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az postgres flexible-server connect --admin-user
+                                        --name
+                                        [--admin-password]
+                                        [--database-name]
+                                        [--interactive]
+                                        [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --interactive
+    summary: Pass this parameter to connect to database in interactive mode.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+- uid: az_postgres_flexible-server_execute
+  name: az postgres flexible-server execute
+  summary: Connect to a flexible server.
+  description: ''
+  syntax: >-
+    az postgres flexible-server execute --admin-password
+                                        --admin-user
+                                        --name
+                                        [--database-name]
+                                        [--file-path]
+                                        [--querytext]
+  requiredParameters:
+  - isRequired: true
+    name: --admin-password -p
+    summary: The login password of the administrator.
+    description: ''
+  - isRequired: true
+    name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the server. The name can contain only lowercase letters, numbers, and the hyphen (-) character. Minimum 3 characters and maximum 63 characters.
+    description: ''
+  optionalParameters:
+  - name: --database-name -d
+    summary: The name of a database.
+    description: ''
+  - name: --file-path -f
+    summary: The path of the sql file to execute.
+    description: ''
+  - name: --querytext -q
+    summary: A query to run against the flexible server.
+    description: ''
+commands:
+- az_postgres_flexible-server_connect
+- az_postgres_flexible-server_execute
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Database for PostgreSQL Flexible Servers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/powerbi.yml b/2018-03-01-hybrid/docs-ref-autogen/powerbi.yml
new file mode 100644
index 0000000000..8c5a7febf7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/powerbi.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_powerbi
+name: az powerbi
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **powerbidedicated** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az powerbi** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage PowerBI resources.
+description: ''
+commands:
+- az_powerbi_embedded-capacity
+- az_powerbi_embedded-capacity_create
+- az_powerbi_embedded-capacity_delete
+- az_powerbi_embedded-capacity_list
+- az_powerbi_embedded-capacity_show
+- az_powerbi_embedded-capacity_update
+- az_powerbi_embedded-capacity_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage PowerBI resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/powerbi/embedded-capacity.yml b/2018-03-01-hybrid/docs-ref-autogen/powerbi/embedded-capacity.yml
new file mode 100644
index 0000000000..e3978cb23e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/powerbi/embedded-capacity.yml
@@ -0,0 +1,257 @@
+### YamlMime:AzureCLIGroup
+uid: az_powerbi_embedded-capacity
+name: az powerbi embedded-capacity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **powerbidedicated** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az powerbi embedded-capacity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage PowerBI embedded capacity.
+description: ''
+directCommands:
+- uid: az_powerbi_embedded-capacity_create
+  name: az powerbi embedded-capacity create
+  summary: Create a new PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity create --administration-members
+                                        --location
+                                        --name
+                                        --resource-group
+                                        --sku-name {A1, A2, A3, A4, A5, A6}
+                                        [--no-wait]
+                                        [--sku-tier {PBIE_Azure}]
+                                        [--tags]
+  examples:
+  - summary: Create a new PowerBI embedded capacity.
+    syntax: >-
+      az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
+
+      --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
+
+      "azsdktest@microsoft.com" "azsdktest2@microsoft.com"
+  - summary: Create a new PowerBI embedded capacity without waiting.
+    syntax: >-
+      az powerbi embedded-capacity create --resource-group "TestRG" --name "azsdktest" \
+
+      --location eastus --sku-name "A1" --sku-tier "PBIE_Azure" --administration-members \
+
+      "azsdktest@microsoft.com" "azsdktest2@microsoft.com" --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --administration-members
+    summary: An array of administrator user identities.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku-name
+    parameterValueGroup: A1, A2, A3, A4, A5, A6
+    summary: Name of the SKU level. For more information, please refer to https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-tier
+    parameterValueGroup: PBIE_Azure
+    summary: The name of the Azure pricing tier to which the SKU applies.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_powerbi_embedded-capacity_delete
+  name: az powerbi embedded-capacity delete
+  summary: Delete the specified PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity delete --name
+                                        --resource-group
+                                        [--no-wait]
+                                        [--yes]
+  examples:
+  - summary: Delete a capacity in specified resource group.
+    syntax: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest"
+  - summary: Delete a capacity in specified resource group without prompt.
+    syntax: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" -y
+  - summary: Delete a capacity in specified resource group without waiting.
+    syntax: az powerbi embedded-capacity delete --resource-group "TestRG" --name "azsdktest" --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_powerbi_embedded-capacity_list
+  name: az powerbi embedded-capacity list
+  summary: List all the embedded capacities for the given resource group.
+  description: ''
+  syntax: az powerbi embedded-capacity list [--resource-group]
+  examples:
+  - summary: List capacities in resource group
+    syntax: az powerbi embedded-capacity list --resource-group "TestRG"
+  - summary: List all capacities in default subscription.
+    syntax: az powerbi embedded-capacity list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_powerbi_embedded-capacity_show
+  name: az powerbi embedded-capacity show
+  summary: Get details about the specified PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity show --name
+                                      --resource-group
+  examples:
+  - summary: Get details of a capacity
+    syntax: az powerbi embedded-capacity show --resource-group "TestRG" --name "azsdktest"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_powerbi_embedded-capacity_update
+  name: az powerbi embedded-capacity update
+  summary: Update the specified PowerBI embedded capacity.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity update --name
+                                        --resource-group
+                                        [--administration-members]
+                                        [--no-wait]
+                                        [--sku-name {A1, A2, A3, A4, A5, A6}]
+                                        [--sku-tier {PBIE_Azure}]
+                                        [--tags]
+  examples:
+  - summary: Update sku name for the specified PowerBI embedded capacity.
+    syntax: az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" --sku-name "A1"
+  - summary: Update administrator members the specified PowerBI embedded capacity without waiting.
+    syntax: >-
+      az powerbi embedded-capacity update --resource-group "TestRG" --name "azsdktest" \
+
+      --sku-name "A1" --administration-members "azsdktest3@microsoft.com" --no-wait
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --administration-members
+    summary: An array of administrator user identities.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-name
+    parameterValueGroup: A1, A2, A3, A4, A5, A6
+    summary: Name of the SKU level. For more information, please refer to https://azure.microsoft.com/en-us/pricing/details/power-bi-embedded/.
+    description: ''
+  - name: --sku-tier
+    parameterValueGroup: PBIE_Azure
+    summary: The name of the Azure pricing tier to which the SKU applies.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_powerbi_embedded-capacity_wait
+  name: az powerbi embedded-capacity wait
+  summary: Place the CLI in a waiting state until a condition of PowerBI embedded capacity is met.
+  description: ''
+  syntax: >-
+    az powerbi embedded-capacity wait --name
+                                      --resource-group
+                                      [--created]
+                                      [--custom]
+                                      [--deleted]
+                                      [--exists]
+                                      [--interval]
+                                      [--timeout]
+                                      [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until the powerbi embedded capacity is created.
+    syntax: az powerbi embedded-capacity wait --resource-group "TestRG" --name "azsdktest" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Dedicated capacity. It must be at least 3 characters in length, and no more than 63.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_powerbi_embedded-capacity_create
+- az_powerbi_embedded-capacity_delete
+- az_powerbi_embedded-capacity_list
+- az_powerbi_embedded-capacity_show
+- az_powerbi_embedded-capacity_update
+- az_powerbi_embedded-capacity_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage PowerBI embedded capacity.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/provider.yml b/2018-03-01-hybrid/docs-ref-autogen/provider.yml
index 74f50f148f..893cfdca9f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/provider.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/provider.yml
@@ -1,138 +1,124 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_provider
-  name: az provider
-  summary: Manage resource providers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_provider_list
-  - az_provider_register
-  - az_provider_show
-  - az_provider_unregister
+### YamlMime:AzureCLIGroup
+uid: az_provider
+name: az provider
+summary: Manage resource providers.
+description: ''
+directCommands:
 - uid: az_provider_list
   name: az provider list
   summary: Gets all resource providers for a subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider list [--expand]
+                     [--query-examples]
+                     [--subscription]
   examples:
   - summary: Display all resource types for the network resource provider.
-    syntax:
-      content: az provider list --query [?namespace=='Microsoft.Network'].resourceTypes[].resourceType
-  parameters:
+    syntax: az provider list --query [?namespace=='Microsoft.Network'].resourceTypes[].resourceType
+  optionalParameters:
   - name: --expand
     summary: The properties to include in the results. For example, use &$expand=metadata in the query string to retrieve resource provider metadata. To include property aliases in response, use $expand=resourceTypes/aliases.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_register
   name: az provider register
   summary: Register a provider.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider register --namespace
+                         [--accept-terms]
+                         [--management-group-id]
+                         [--subscription]
+                         [--wait]
   examples:
   - summary: Register a provider. (autogenerated)
-    syntax:
-      content: az provider register --namespace 'Microsoft.PolicyInsights'
-  parameters:
+    syntax: az provider register --namespace 'Microsoft.PolicyInsights'
+  - summary: Register a provider from RPaaS.
+    syntax: az provider register -n 'Microsoft.Confluent' --accept-terms
+  - summary: Register a management group.
+    syntax: az provider register --namespace Microsoft.Automation -m mgID
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
-  - name: --wait
-    summary: Wait for the registration to finish.
+  optionalParameters:
+  - name: --accept-terms
+    summary: Accept market place terms and RP terms for RPaaS. Required when registering RPs from RPaaS, such as 'Microsoft.Confluent' and 'Microsoft.Datadog'.
+    description: ''
+  - name: --management-group-id -m
+    summary: The management group id to register.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --wait
+    summary: Wait for the registration to finish.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_show
   name: az provider show
   summary: Gets the specified resource provider.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az provider show --namespace
+                     [--expand]
+                     [--query-examples]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
+  optionalParameters:
   - name: --expand
     summary: The $expand query parameter. For example, to include property aliases in response, use $expand=resourceTypes/aliases.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_unregister
   name: az provider unregister
   summary: Unregister a provider.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider unregister --namespace
+                           [--subscription]
+                           [--wait]
   examples:
   - summary: Unregister a provider. (autogenerated)
-    syntax:
-      content: az provider unregister --namespace Microsoft.Automation
-  parameters:
+    syntax: az provider unregister --namespace Microsoft.Automation
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
-  - name: --wait
-    summary: Wait for unregistration to finish.
-    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --wait
+    summary: Wait for unregistration to finish.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_provider_list
-  name: az provider list
-  summary: Gets all resource providers for a subscription.
-- uid: az_provider_operation
-  name: az provider operation
-  summary: Get provider operations metadatas.
-- uid: az_provider_operation_list
-  name: az provider operation list
-  summary: Get operations from all providers.
-- uid: az_provider_operation_show
-  name: az provider operation show
-  summary: Get an individual provider's operations.
-- uid: az_provider_register
-  name: az provider register
-  summary: Register a provider.
-- uid: az_provider_show
-  name: az provider show
-  summary: Gets the specified resource provider.
-- uid: az_provider_unregister
-  name: az provider unregister
-  summary: Unregister a provider.
+- az_provider_list
+- az_provider_operation
+- az_provider_operation_list
+- az_provider_operation_show
+- az_provider_register
+- az_provider_show
+- az_provider_unregister
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -148,10 +134,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource providers.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage resource providers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/provider/operation.yml b/2018-03-01-hybrid/docs-ref-autogen/provider/operation.yml
index f7c9493cd1..f95ebb466e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/provider/operation.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/provider/operation.yml
@@ -1,61 +1,51 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_provider_operation
-  name: az provider operation
-  summary: Get provider operations metadatas.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_provider_operation_list
-  - az_provider_operation_show
+### YamlMime:AzureCLIGroup
+uid: az_provider_operation
+name: az provider operation
+summary: Get provider operations metadatas.
+description: ''
+directCommands:
 - uid: az_provider_operation_list
   name: az provider operation list
   summary: Get operations from all providers.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az provider operation list [--query-examples]
+                               [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_provider_operation_show
   name: az provider operation show
   summary: Get an individual provider's operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az provider operation show --namespace
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Get an individual provider's operations. (autogenerated)
-    syntax:
-      content: az provider operation show --namespace Microsoft.Storage
-  parameters:
+    syntax: az provider operation show --namespace Microsoft.Storage
+  requiredParameters:
   - isRequired: true
     name: --namespace -n
     summary: The resource namespace, aka 'provider'.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_provider_operation_list
-  name: az provider operation list
-  summary: Get operations from all providers.
-- uid: az_provider_operation_show
-  name: az provider operation show
-  summary: Get an individual provider's operations.
+- az_provider_operation_list
+- az_provider_operation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -71,10 +61,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Get provider operations metadatas.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Get provider operations metadatas.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/providerhub.yml b/2018-03-01-hybrid/docs-ref-autogen/providerhub.yml
new file mode 100644
index 0000000000..58327e9e75
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/providerhub.yml
@@ -0,0 +1,52 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub
+name: az providerhub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_providerhub_custom-rollout
+- az_providerhub_custom-rollout_create
+- az_providerhub_custom-rollout_list
+- az_providerhub_custom-rollout_show
+- az_providerhub_default-rollout
+- az_providerhub_default-rollout_create
+- az_providerhub_default-rollout_delete
+- az_providerhub_default-rollout_list
+- az_providerhub_default-rollout_show
+- az_providerhub_default-rollout_stop
+- az_providerhub_default-rollout_wait
+- az_providerhub_manifest
+- az_providerhub_manifest_checkin
+- az_providerhub_manifest_generate
+- az_providerhub_provider-registration
+- az_providerhub_provider-registration_create
+- az_providerhub_provider-registration_delete
+- az_providerhub_provider-registration_generate-operation
+- az_providerhub_provider-registration_list
+- az_providerhub_provider-registration_show
+- az_providerhub_provider-registration_wait
+- az_providerhub_resource-type-registration
+- az_providerhub_resource-type-registration_create
+- az_providerhub_resource-type-registration_delete
+- az_providerhub_resource-type-registration_list
+- az_providerhub_resource-type-registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/providerhub/custom-rollout.yml b/2018-03-01-hybrid/docs-ref-autogen/providerhub/custom-rollout.yml
new file mode 100644
index 0000000000..1e6e80c224
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/providerhub/custom-rollout.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_custom-rollout
+name: az providerhub custom-rollout
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub custom-rollout** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage custom rollout with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_custom-rollout_create
+  name: az providerhub custom-rollout create
+  summary: Create the rollout details.
+  description: ''
+  syntax: >-
+    az providerhub custom-rollout create --canary
+                                         --provider-namespace
+                                         --rollout-name
+  examples:
+  - summary: CustomRollouts_CreateOrUpdate
+    syntax: az providerhub custom-rollout create --provider-namespace "Microsoft.Contoso" --rollout-name "canaryTesting99" --canary regions="EastUS2EUAP"
+  requiredParameters:
+  - isRequired: true
+    name: --canary
+    summary: The canary regions to apply the manifest.
+    description: >-
+      Usage: --canary regions=XX
+
+
+      regions: Required. Comma separated list of canary regions.
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+- uid: az_providerhub_custom-rollout_list
+  name: az providerhub custom-rollout list
+  summary: Gets the list of the custom rollouts for the given provider.
+  description: ''
+  syntax: az providerhub custom-rollout list --provider-namespace
+  examples:
+  - summary: CustomRollouts_ListByProviderRegistration
+    syntax: az providerhub custom-rollout list --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_custom-rollout_show
+  name: az providerhub custom-rollout show
+  summary: Gets the custom rollout details.
+  description: ''
+  syntax: >-
+    az providerhub custom-rollout show --provider-namespace
+                                       --rollout-name
+  examples:
+  - summary: CustomRollouts_Get
+    syntax: az providerhub custom-rollout show --provider-namespace "Microsoft.Contoso" --rollout-name "canaryTesting99"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+commands:
+- az_providerhub_custom-rollout_create
+- az_providerhub_custom-rollout_list
+- az_providerhub_custom-rollout_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage custom rollout with providerhub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/providerhub/default-rollout.yml b/2018-03-01-hybrid/docs-ref-autogen/providerhub/default-rollout.yml
new file mode 100644
index 0000000000..e9d3326ecd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/providerhub/default-rollout.yml
@@ -0,0 +1,192 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_default-rollout
+name: az providerhub default-rollout
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub default-rollout** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage default rollout with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_default-rollout_create
+  name: az providerhub default-rollout create
+  summary: Create the rollout details.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout create --provider-namespace
+                                          --rollout-name
+                                          --row2-wait-duration
+                                          [--no-wait]
+                                          [--skip-regions]
+  examples:
+  - summary: DefaultRollouts_CreateOrUpdate
+    syntax: az providerhub default-rollout create --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10" --skip-regions "brazilus, centraluseuap" --row2-wait-duration "PT24H"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+  - isRequired: true
+    name: --row2-wait-duration
+    summary: Optional. The wait duration before rolling out to the Rest of the World Two regions.
+    description: 'Usage: --row2-wait-duration "PT24H".'
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --skip-regions
+    summary: Optional. The canary regions to skip applying the manifest in.
+    description: 'Usage: --skip-regions "brazilus, centraluseuap".'
+- uid: az_providerhub_default-rollout_delete
+  name: az providerhub default-rollout delete
+  summary: Deletes the rollout resource. Rollout must be in terminal state.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout delete --provider-namespace
+                                          --rollout-name
+                                          [--yes]
+  examples:
+  - summary: DefaultRollouts_Delete
+    syntax: az providerhub default-rollout delete --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_providerhub_default-rollout_list
+  name: az providerhub default-rollout list
+  summary: Gets the list of the rollouts for the given provider.
+  description: ''
+  syntax: az providerhub default-rollout list --provider-namespace
+  examples:
+  - summary: DefaultRollouts_ListByProviderRegistration
+    syntax: az providerhub default-rollout list --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_default-rollout_show
+  name: az providerhub default-rollout show
+  summary: Gets the default rollout details.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout show --provider-namespace
+                                        --rollout-name
+  examples:
+  - summary: DefaultRollouts_Get
+    syntax: az providerhub default-rollout show --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+- uid: az_providerhub_default-rollout_stop
+  name: az providerhub default-rollout stop
+  summary: Stops or cancels the rollout, if in progress.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout stop --provider-namespace
+                                        --rollout-name
+  examples:
+  - summary: DefaultRollouts_Stop
+    syntax: az providerhub default-rollout stop --provider-namespace "Microsoft.Contoso" --rollout-name "2021week10"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+- uid: az_providerhub_default-rollout_wait
+  name: az providerhub default-rollout wait
+  summary: Place the CLI in a waiting state until a condition of the providerhub default-rollout is met.
+  description: ''
+  syntax: >-
+    az providerhub default-rollout wait --provider-namespace
+                                        --rollout-name
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--interval]
+                                        [--timeout]
+                                        [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the providerhub default-rollout is successfully created.
+    syntax: az providerhub default-rollout wait --provider-namespace "Microsoft.Contoso" --rollout-name "2020week10" --created
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --rollout-name
+    summary: The rollout name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_providerhub_default-rollout_create
+- az_providerhub_default-rollout_delete
+- az_providerhub_default-rollout_list
+- az_providerhub_default-rollout_show
+- az_providerhub_default-rollout_stop
+- az_providerhub_default-rollout_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage default rollout with providerhub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/providerhub/manifest.yml b/2018-03-01-hybrid/docs-ref-autogen/providerhub/manifest.yml
new file mode 100644
index 0000000000..d1c1c73cdd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/providerhub/manifest.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_manifest
+name: az providerhub manifest
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub manifest** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage manifest with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_manifest_checkin
+  name: az providerhub manifest checkin
+  summary: Checkin the manifest.
+  description: ''
+  syntax: >-
+    az providerhub manifest checkin --arm-manifest-location
+                                    --environment
+                                    --provider-namespace
+  examples:
+  - summary: CheckinManifest
+    syntax: az providerhub manifest checkin --provider-namespace "Microsoft.Contoso" --environment "Canary" --arm-manifest-location "EastUS2EUAP"
+  requiredParameters:
+  - isRequired: true
+    name: --arm-manifest-location
+    summary: The baseline ARM manifest location.
+    description: ''
+  - isRequired: true
+    name: --environment
+    summary: The environment to checkin the manifest.
+    description: ''
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_manifest_generate
+  name: az providerhub manifest generate
+  summary: Generates the manifest for the given provider.
+  description: ''
+  syntax: az providerhub manifest generate --provider-namespace
+  examples:
+  - summary: GenerateManifest
+    syntax: az providerhub manifest generate --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+commands:
+- az_providerhub_manifest_checkin
+- az_providerhub_manifest_generate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage manifest with providerhub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/providerhub/provider-registration.yml b/2018-03-01-hybrid/docs-ref-autogen/providerhub/provider-registration.yml
new file mode 100644
index 0000000000..bf78d89837
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/providerhub/provider-registration.yml
@@ -0,0 +1,290 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_provider-registration
+name: az providerhub provider-registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub provider-registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage provider registration with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_provider-registration_create
+  name: az providerhub provider-registration create
+  summary: Create the provider registration.
+  description: ''
+  syntax: >-
+    az providerhub provider-registration create --provider-namespace
+                                                [--capabilities]
+                                                [--incident-contact-email]
+                                                [--incident-routing-service]
+                                                [--incident-routing-team]
+                                                [--lighthouse-authorizations]
+                                                [--managed-by-tenant-id]
+                                                [--manifest-owners]
+                                                [--metadata]
+                                                [--namespace]
+                                                [--no-wait]
+                                                [--opt-in-headers {ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership}]
+                                                [--provider-authentication]
+                                                [--provider-authorizations]
+                                                [--provider-type {AuthorizationFree, External, Hidden, Internal, LegacyRegistrationRequired, NotSpecified, RegistrationFree, TenantOnly}]
+                                                [--provider-version]
+                                                [--providerhub-metadata-provider-authorizations]
+                                                [--providerhub-metadata-rp-authentication]
+                                                [--required-features-policy {All, Any}]
+                                                [--resource-access-policy {AcisActionAllowed, AcisReadAllowed, NotSpecified}]
+                                                [--schema-owners]
+                                                [--service-tree-infos]
+                                                [--template-deployment-options]
+  examples:
+  - summary: ProviderRegistrations_CreateOrUpdate
+    syntax: az providerhub provider-registration create --capabilities effect="Allow" quota-id="CSP_2015-05-01" --capabilities effect="Allow" quota-id="CSP_MG_2017-12-01" --incident-contact-email "helpme@contoso.com" --incident-routing-service "Contoso Resource Provider" --incident-routing-team "Contoso Triage" --provider-type "Internal" --provider-version "2.0" --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  optionalParameters:
+  - name: --capabilities
+    summary: The resource provider capabilities.
+    description: >-
+      Usage: --capabilities quota-id=XX effect=XX required-features=XX
+
+
+      Multiple actions can be specified by using more than one --capabilities argument.
+  - name: --incident-contact-email
+    summary: The email address of contacts for incidents related to the RP.
+    description: 'Usage: --incident-contact-email "helpme@contoso.com".'
+  - name: --incident-routing-service
+    summary: The service in IcM when creating or transferring incidents to the RP.
+    description: 'Usage: --incident-routing-service "Contoso Resource Provider".'
+  - name: --incident-routing-team
+    summary: The team in IcM when creating or transferring incidents to the RP.
+    description: 'Usage: --incident-routing-team "Contoso Triage".'
+  - name: --lighthouse-authorizations
+    summary: The lighthouse authorizations.
+    description: >-
+      Usage: --lighthouse-authorizations principal-id=XX role-definition-id=XX
+
+
+      principal-id: Required. The principal ID.
+
+      role-definition-id: Required. The role definition ID.
+  - name: --managed-by-tenant-id
+    summary: The managed by tenant ID.
+    description: 'Usage: --managed-by-tenant-id "00000000-0000-0000-0000-000000000000".'
+  - name: --manifest-owners
+    summary: Specifies an array of required ACIS claims to modify the resource provider's manifest content via ACIS.
+    description: >-
+      Usage: --manifest-owners "SPARTA-PlatformServiceAdministrator"
+
+       Multiple actions can be specified by using more than one --manifest-owners argument.
+  - name: --metadata
+    summary: The metadata.
+    description: ''
+  - name: --namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: 'Usage: --namespace "Microsoft.Contoso".'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --opt-in-headers
+    parameterValueGroup: ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership
+    summary: The opt-in headers.
+    description: 'Usage: --opt-in-headers "SignedUserToken".'
+  - name: --provider-authentication
+    summary: Used to set alternative audiences or resources that ARM should accept from the token while authenticating requests for the provider.
+    description: >-
+      Usage: --provider-authentication allowed-audiences=XX
+
+
+      allowed-audiences: Required. The allowed audiences.
+  - name: --provider-authorizations
+    summary: The resource provider authorizations.
+    description: >-
+      Usage: --provider-authorizations application-id=XX role-definition-id=XX managed-by-role-definition-id=XX
+
+
+      application-id: Required. The application ID.
+
+      role-definition-id: Required. The role definition ID.
+
+      managed-by-role-definition-id: Required. The managed by role definition ID.
+  - name: --provider-type
+    parameterValueGroup: AuthorizationFree, External, Hidden, Internal, LegacyRegistrationRequired, NotSpecified, RegistrationFree, TenantOnly
+    summary: The provider type.
+    description: 'Usage: --provider-type "Internal".'
+  - name: --provider-version
+    defaultValue: "2.0"
+    summary: The provider version.
+    description: 'Usage: --provider-version "2.0".'
+  - name: --providerhub-metadata-provider-authorizations
+    summary: The provider authorizations.
+    description: >-
+      Usage: --providerhub-metadata-provider-authorizations application-id=XX role-definition-id=XX managed-by-role-definition-id=XX
+
+
+      application-id: Required. The application ID.
+
+      role-definition-id: Required. The role definition ID.
+
+      managed-by-role-definition-id: Required. The managed by role definition ID.
+  - name: --providerhub-metadata-rp-authentication
+    summary: Used to set alternative audiences or resources that ARM should accept from the token while authenticating requests for the provider. Only available to tenant level providers.
+    description: >-
+      Usage: --providerhub-metadata-rp-authentication allowed-audiences=XX
+
+
+      allowed-audiences: Required. The allowed audiences.
+  - name: --required-features-policy
+    parameterValueGroup: All, Any
+    summary: The accepted values are "Any" or "All". If the value is "All", then only the subscriptions registered to all the corresponding feature flag will be allowed.​.
+    description: 'Usage: --required-features-policy "All".'
+  - name: --resource-access-policy
+    parameterValueGroup: AcisActionAllowed, AcisReadAllowed, NotSpecified
+    summary: The resource access policy.
+    description: 'Usage: --resource-access-policy "AcisReadAllowed, AcisActionAllowed".'
+  - name: --schema-owners
+    summary: Specifies an array of needed ACIS claims to modify the resource provider schema via ACIS.
+    description: >-
+      Usage: --schema-owners "Contoso schema owners"
+
+       Multiple actions can be specified by using more than one --schema-owners argument.
+  - name: --service-tree-infos
+    summary: The ServiceTree information for the resource provider.
+    description: >-
+      Usage: --service-tree-infos service-id=XX component-id=XX
+
+
+      service-id: Required. The service ID.
+
+      component-id: Required. The component ID.
+  - name: --template-deployment-options
+    summary: The template deployment options.
+    description: 'Usage: --template-deployment-options preflight-supported=XX preflight-options=XX.'
+- uid: az_providerhub_provider-registration_delete
+  name: az providerhub provider-registration delete
+  summary: Deletes a provider registration.
+  description: ''
+  syntax: >-
+    az providerhub provider-registration delete --provider-namespace
+                                                [--yes]
+  examples:
+  - summary: ProviderRegistrations_Delete
+    syntax: az providerhub provider-registration delete --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_providerhub_provider-registration_generate-operation
+  name: az providerhub provider-registration generate-operation
+  summary: Generates the operations api for the given provider.
+  description: ''
+  syntax: az providerhub provider-registration generate-operation --provider-namespace
+  examples:
+  - summary: ProviderRegistrations_GenerateOperations
+    syntax: az providerhub provider-registration generate-operation --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_provider-registration_list
+  name: az providerhub provider-registration list
+  summary: Gets the list of the provider registrations in the subscription.
+  description: ''
+  syntax: az providerhub provider-registration list [--resource-group]
+  examples:
+  - summary: ProviderRegistrations_List
+    syntax: az providerhub provider-registration list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_providerhub_provider-registration_show
+  name: az providerhub provider-registration show
+  summary: Gets the provider registration details.
+  description: ''
+  syntax: az providerhub provider-registration show --provider-namespace
+  examples:
+  - summary: ProviderRegistrations_Get
+    syntax: az providerhub provider-registration show --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_provider-registration_wait
+  name: az providerhub provider-registration wait
+  summary: Place the CLI in a waiting state until a condition of the providerhub provider-registration is met.
+  description: ''
+  syntax: >-
+    az providerhub provider-registration wait --provider-namespace
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the providerhub provider-registration is successfully created.
+    syntax: az providerhub provider-registration wait --provider-namespace "Microsoft.Contoso" --created
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_providerhub_provider-registration_create
+- az_providerhub_provider-registration_delete
+- az_providerhub_provider-registration_generate-operation
+- az_providerhub_provider-registration_list
+- az_providerhub_provider-registration_show
+- az_providerhub_provider-registration_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage provider registration with providerhub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/providerhub/resource-type-registration.yml b/2018-03-01-hybrid/docs-ref-autogen/providerhub/resource-type-registration.yml
new file mode 100644
index 0000000000..e9c685bb2c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/providerhub/resource-type-registration.yml
@@ -0,0 +1,360 @@
+### YamlMime:AzureCLIGroup
+uid: az_providerhub_resource-type-registration
+name: az providerhub resource-type-registration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **providerhub** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az providerhub resource-type-registration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage resource type registration with providerhub.
+description: ''
+directCommands:
+- uid: az_providerhub_resource-type-registration_create
+  name: az providerhub resource-type-registration create
+  summary: Create a resource type.
+  description: ''
+  syntax: >-
+    az providerhub resource-type-registration create --provider-namespace
+                                                     --resource-type
+                                                     [--allowed-unauthorized-actions]
+                                                     [--authorization-action-mappings]
+                                                     [--check-name-availability-specifications]
+                                                     [--default-api-version]
+                                                     [--disallowed-action-verbs]
+                                                     [--enable-async-operation {false, true}]
+                                                     [--enable-third-party-s2s {false, true}]
+                                                     [--endpoints]
+                                                     [--extended-locations]
+                                                     [--identity-management]
+                                                     [--is-pure-proxy {false, true}]
+                                                     [--linked-access-checks]
+                                                     [--logging-rules]
+                                                     [--marketplace-type {AddOn, Bypass, NotSpecified, Store}]
+                                                     [--opt-in-headers {ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership}]
+                                                     [--regionality {Global, NotSpecified, Regional}]
+                                                     [--required-features]
+                                                     [--required-features-policy {All, Any}]
+                                                     [--resource-creation-begin]
+                                                     [--resource-deletion-policy {CascadeDeleteAll, CascadeDeleteProxyOnlyChildren, NotSpecified}]
+                                                     [--resource-move-policy]
+                                                     [--resource-patch-begin]
+                                                     [--routing-type {CascadeExtension, Default, Extension, Failover, Fanout, HostBased, LocationBased, ProxyOnly, Tenant}]
+                                                     [--service-tree-infos]
+                                                     [--subscription-state-rules]
+                                                     [--swagger-specifications]
+                                                     [--template-deployment-options]
+                                                     [--throttling-rules]
+  examples:
+  - summary: ResourceTypeRegistration_CreateOrUpdate
+    syntax: az providerhub resource-type-registration create --endpoints api-versions="2020-01-01-preview,2019-01-01" locations="West US, West Central US" required-features="Microsoft.Contoso/SampleApp" --regionality "regional" --routing-type "Default" --swagger-specifications api-versions="2020-06-01-preview" swagger-spec-folder-uri="https://rp-swagger-spec-uri.com/" --provider-namespace "Microsoft.Contoso" --resource-type "testResourceType"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The resource type.
+    description: ''
+  optionalParameters:
+  - name: --allowed-unauthorized-actions
+    summary: The allowed unauthorized actions.
+    description: 'Usage: --allowed-unauthorized-actions "Microsoft.Contoso/rpResourceType/read, Microsoft.Contoso/rpResourceType/delete".'
+  - name: --authorization-action-mappings
+    summary: Allows RP to override action verb for RBAC purposes at ARM.
+    description: >-
+      Usage: --authorization-action-mappings original=XX desired=XX
+
+
+      original: Required. The original action name.
+
+      desired: Required. The desired action name.
+
+
+      Multiple actions can be specified by using more than one --authorization-action-mappings argument.
+  - name: --check-name-availability-specifications
+    summary: Name availability checks feature at the platform level.
+    description: >-
+      Usage: --check-name-availability-specifications enable-default-validation=XX resource-types-with-custom-validation=XX
+
+
+      enable-default-validation: Boolean indicating whether RP has chosen to opt-out of RPaaS to perform check name.
+
+      resource-types-with-custom-validation: The types which needs additional validation from the RP.
+  - name: --default-api-version
+    summary: The default API version for the endpoint.
+    description: 'Usage: --default-api-version "2021-01-01".'
+  - name: --disallowed-action-verbs
+    summary: The disallowed action verbs.
+    description: 'Usage: --disallowed-action-verbs "read".'
+  - name: --enable-async-operation
+    parameterValueGroup: false, true
+    summary: Indicates whether the async operation is enabled for this resource type.
+    description: 'Usage: --enable-async-operation "false".'
+  - name: --enable-third-party-s2s
+    parameterValueGroup: false, true
+    summary: Indicates whether third party s2s is enabled for this resource type.
+    description: 'Usage: --enable-third-party-s2s "false".'
+  - name: --endpoints
+    summary: The resource type endpoints.
+    description: >-
+      Usage: --endpoints api-versions=XX locations=XX required-features=XX
+
+
+      api-versions: Required. Comma separated list of API versions.
+
+      locations: Required. Comma separated list of locations.
+
+      required-features: Required. Comma separated list of required features.
+
+
+      Multiple actions can be specified by using more than one --endpoints argument.
+  - name: --extended-locations
+    summary: The extended location options.
+    description: >-
+      Usage: --extended-locations type=XX supported-policy=XX
+
+
+      type: The extended location type.
+
+      supported-policy: The supported policy.
+
+
+      Multiple actions can be specified by using more than one --extended-locations argument.
+  - name: --identity-management
+    summary: MSI related settings.
+    description: >-
+      Usage: --identity-management type=XX application-id=XX
+
+
+      type: The type of the identity management.
+
+      application-id: The application ID that handles the identity.
+  - name: --is-pure-proxy
+    parameterValueGroup: false, true
+    summary: Indicates whether this is a PureProxy resource type.
+    description: 'Usage: --is-pure-proxy "false".'
+  - name: --linked-access-checks
+    summary: Enables additional Role Based Access Control (RBAC) checks on related resources.
+    description: >-
+      Usage: --linked-access-checks action-name=XX linked-property=XX linked-action=XX linked-action-verb=XX linked-type=XX
+
+
+      action-name: The action name.
+
+      linked-property: The linked property.
+
+      linked-action: The linked action.
+
+      linked-action-verb: The linked action verb.
+
+      linked-type: The linked type.
+
+
+      Multiple actions can be specified by using more than one --linked-access-checks argument.
+  - name: --logging-rules
+    summary: The logging rules.
+    description: >-
+      Usage: --logging-rules action=XX direction=XX detail-level=XX
+
+
+      action: Required. The action name.
+
+      direction: Required. The direction.
+
+      detail-level: Required. The detail level.
+
+
+      Multiple actions can be specified by using more than one --logging-rules argument.
+  - name: --marketplace-type
+    parameterValueGroup: AddOn, Bypass, NotSpecified, Store
+    summary: The type of marketplace behavior for the resource type.
+    description: 'Usage: --marketplace-type "AddOn".'
+  - name: --opt-in-headers
+    parameterValueGroup: ClientGroupMembership, NotSpecified, SignedAuxiliaryTokens, SignedUserToken, UnboundedClientGroupMembership
+    summary: The opt-in headers.
+    description: 'Usage: --opt-in-headers "SignedUserToken".'
+  - name: --regionality
+    parameterValueGroup: Global, NotSpecified, Regional
+    summary: The regionality of the resource type.
+    description: 'Usage: --regionality "Regional".'
+  - name: --required-features
+    summary: The required features.
+    description: 'Usage: --required-features "Microsoft.Contoso/feature1, Microsoft.Contoso/feature2".'
+  - name: --required-features-policy
+    parameterValueGroup: All, Any
+    summary: The accepted values are "Any" or "All". If the value is "All", then only the subscriptions registered to all the corresponding feature flag will be allowed.​.
+    description: 'Usage: --required-features-policy "All".'
+  - name: --resource-creation-begin
+    summary: Extension options for handling the resource creation begin extension request.
+    description: >-
+      Usage: --resource-creation-begin request=XX response=XX
+
+
+      request: The comma separated list of extension option types.
+
+      response: The comma separated list of extension option types.
+  - name: --resource-deletion-policy
+    parameterValueGroup: CascadeDeleteAll, CascadeDeleteProxyOnlyChildren, NotSpecified
+    summary: The resource deletion policy.
+    description: 'Usage: --resource-deletion-policy "CascadeDeleteAll".'
+  - name: --resource-move-policy
+    summary: The resource move policy.
+    description: >-
+      Usage: --resource-move-policy validation-required=XX cross-resource-group-move-enabled=XX cross-subscription-move-enabled=XX
+
+
+      validation-required: Boolean indicating whether validation is required for moving the resource.
+
+      cross-resource-group-move-enabled: Boolean indicating whether moving resources across resource groups is allowed.
+
+      cross-subscription-move-enabled: Boolean indicating whether moving resources across subscriptions is allowed.
+  - name: --resource-patch-begin
+    summary: Extension options for handling the resource patch begin extension request.
+    description: >-
+      Usage: --resource-patch-begin request=XX response=XX
+
+
+      request: The comma separated list of extension option types.
+
+      response: The comma separated list of extension option types.
+  - name: --routing-type
+    parameterValueGroup: CascadeExtension, Default, Extension, Failover, Fanout, HostBased, LocationBased, ProxyOnly, Tenant
+    summary: The resource routing type.​.
+    description: 'Usage: --routing-type "Default".'
+  - name: --service-tree-infos
+    summary: The ServiceTree information for the resource provider.
+    description: >-
+      Usage: --service-tree-infos service-id=XX component-id=XX
+
+
+      service-id: Required. The service ID.
+
+      component-id: Required. The component ID.
+
+
+      Multiple actions can be specified by using more than one --service-tree-infos argument.
+  - name: --subscription-state-rules
+    summary: The subscription state rules.
+    description: >-
+      Usage: --subscription-state-rules state=XX allowed-actions=XX
+
+
+      state: The subscription state.
+
+      allowed-actions: The allowed actions.
+
+
+      Multiple actions can be specified by using more than one --subscription-state-rules argument.
+  - name: --swagger-specifications
+    summary: The Swagger spec of the resource type.
+    description: >-
+      Usage: --swagger-specifications api-versions=XX swagger-spec-folder-uri=XX
+
+
+      api-versions: Required. The resource type API versions, separated by commas.
+
+      swagger-spec-folder-uri: Required. The Swagger spec URI.
+
+
+      Multiple actions can be specified by using more than one --swagger-specifications argument.
+  - name: --template-deployment-options
+    summary: The template deployment options.
+    description: >-
+      Usage: --template-deployment-options preflight-supported=XX preflight-options=XX
+
+
+      preflight-supported: Boolean indicating whether preflight validation is supported.
+
+      preflight-options: The preflight options.
+  - name: --throttling-rules
+    summary: Enables setting individual limits for different actions in terms of number of requests or number of resources (for collection read requests only).
+    description: >-
+      Usage: --throttling-rules action=XX metrics=XX required-features=XX
+
+
+      action: Required. The action name.
+
+      metrics: Required. The throttling metrics.
+
+      required-features: The throttling rule required features.
+
+
+      Multiple actions can be specified by using more than one --throttling-rules argument.
+- uid: az_providerhub_resource-type-registration_delete
+  name: az providerhub resource-type-registration delete
+  summary: Deletes a resource type.
+  description: ''
+  syntax: >-
+    az providerhub resource-type-registration delete --provider-namespace
+                                                     --resource-type
+                                                     [--yes]
+  examples:
+  - summary: ResourceTypeRegistration_Delete
+    syntax: az providerhub resource-type-registration delete --provider-namespace "Microsoft.Contoso" --resource-type "testResourceType"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The resource type.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_providerhub_resource-type-registration_list
+  name: az providerhub resource-type-registration list
+  summary: Gets the list of the resource types for the given provider.
+  description: ''
+  syntax: az providerhub resource-type-registration list --provider-namespace
+  examples:
+  - summary: ResourceTypeRegistrations_ListByProviderRegistration
+    syntax: az providerhub resource-type-registration list --provider-namespace "Microsoft.Contoso"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+- uid: az_providerhub_resource-type-registration_show
+  name: az providerhub resource-type-registration show
+  summary: Gets a resource type details in the given subscription and provider.
+  description: ''
+  syntax: >-
+    az providerhub resource-type-registration show --provider-namespace
+                                                   --resource-type
+  examples:
+  - summary: ResourceTypeRegistrations_Get
+    syntax: az providerhub resource-type-registration show --provider-namespace "Microsoft.Contoso" --resource-type "testResourceType"
+  requiredParameters:
+  - isRequired: true
+    name: --provider-namespace
+    summary: The name of the resource provider hosted within ProviderHub.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The resource type.
+    description: ''
+commands:
+- az_providerhub_resource-type-registration_create
+- az_providerhub_resource-type-registration_delete
+- az_providerhub_resource-type-registration_list
+- az_providerhub_resource-type-registration_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage resource type registration with providerhub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/quantum.yml b/2018-03-01-hybrid/docs-ref-autogen/quantum.yml
new file mode 100644
index 0000000000..f076428e25
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/quantum.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum
+name: az quantum
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Quantum Workspaces and submit jobs to Azure Quantum Providers.
+description: ''
+directCommands:
+- uid: az_quantum_execute
+  name: az quantum execute
+  summary: Submit a job to run on Azure Quantum, and waits for the result.
+  description: ''
+  syntax: >-
+    az quantum execute [--job-name]
+                       [--location]
+                       [--no-build]
+                       [--project]
+                       [--resource-group]
+                       [--shots]
+                       [--storage]
+                       [--target-id]
+                       [--workspace-name]
+                       [<PROGRAM_ARGS>]
+  examples:
+  - summary: Submit the Q# program from the current folder and wait for the result.
+    syntax: az quantum execute -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --job-name
+    summary: A friendly name to give to this run of the program.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-build
+    summary: If specified, the Q# program is not built before submitting.
+    description: ''
+  - name: --project
+    summary: The location of the Q# project to submit. Defaults to current folder.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --shots
+    summary: The number of times to run the Q# program on the given target.
+    description: ''
+  - name: --storage
+    summary: If specified, the ConnectionString of an Azure Storage is used to store job data and results.
+    description: ''
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+  - name: <PROGRAM_ARGS>
+    summary: List of arguments expected by the Q# operation specified as --name=value after `--`.
+    description: ''
+- uid: az_quantum_run
+  name: az quantum run
+  summary: Equivalent to `az quantum execute`.
+  description: ''
+  syntax: >-
+    az quantum run [--job-name]
+                   [--location]
+                   [--no-build]
+                   [--project]
+                   [--resource-group]
+                   [--shots]
+                   [--storage]
+                   [--target-id]
+                   [--workspace-name]
+                   [<PROGRAM_ARGS>]
+  examples:
+  - summary: Submit the Q# program from the current folder and wait for the result.
+    syntax: az quantum run -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --job-name
+    summary: A friendly name to give to this run of the program.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-build
+    summary: If specified, the Q# program is not built before submitting.
+    description: ''
+  - name: --project
+    summary: The location of the Q# project to submit. Defaults to current folder.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --shots
+    summary: The number of times to run the Q# program on the given target.
+    description: ''
+  - name: --storage
+    summary: If specified, the ConnectionString of an Azure Storage is used to store job data and results.
+    description: ''
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+  - name: <PROGRAM_ARGS>
+    summary: List of arguments expected by the Q# operation specified as --name=value after `--`.
+    description: ''
+commands:
+- az_quantum_execute
+- az_quantum_job
+- az_quantum_job_list
+- az_quantum_job_output
+- az_quantum_job_show
+- az_quantum_job_submit
+- az_quantum_job_wait
+- az_quantum_offerings
+- az_quantum_offerings_accept-terms
+- az_quantum_offerings_list
+- az_quantum_offerings_show-terms
+- az_quantum_run
+- az_quantum_target
+- az_quantum_target_clear
+- az_quantum_target_list
+- az_quantum_target_set
+- az_quantum_target_show
+- az_quantum_workspace
+- az_quantum_workspace_clear
+- az_quantum_workspace_create
+- az_quantum_workspace_delete
+- az_quantum_workspace_list
+- az_quantum_workspace_quotas
+- az_quantum_workspace_set
+- az_quantum_workspace_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Quantum Workspaces and submit jobs to Azure Quantum Providers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/quantum/job.yml b/2018-03-01-hybrid/docs-ref-autogen/quantum/job.yml
new file mode 100644
index 0000000000..ddc95de9af
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/quantum/job.yml
@@ -0,0 +1,197 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_job
+name: az quantum job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage jobs for Azure Quantum.
+description: ''
+directCommands:
+- uid: az_quantum_job_list
+  name: az quantum job list
+  summary: Get the list of jobs in a Quantum Workspace.
+  description: ''
+  syntax: >-
+    az quantum job list [--location]
+                        [--resource-group]
+                        [--workspace-name]
+  examples:
+  - summary: Get the list of jobs from an Azure Quantum workspace.
+    syntax: az quantum job list -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_job_output
+  name: az quantum job output
+  summary: Get the results of running a Q# job.
+  description: ''
+  syntax: >-
+    az quantum job output --job-id
+                          [--location]
+                          [--resource-group]
+                          [--workspace-name]
+  examples:
+  - summary: Print the results of a successful Azure Quantum job.
+    syntax: >-
+      az quantum job output -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -j yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy -o table
+  requiredParameters:
+  - isRequired: true
+    name: --job-id -j
+    summary: Job unique identifier in GUID format.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_job_show
+  name: az quantum job show
+  summary: Get the job's status and details.
+  description: ''
+  syntax: >-
+    az quantum job show --job-id
+                        [--location]
+                        [--resource-group]
+                        [--workspace-name]
+  examples:
+  - summary: Get the status of an Azure Quantum job.
+    syntax: >-
+      az quantum job show -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -j yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy --query status
+  requiredParameters:
+  - isRequired: true
+    name: --job-id -j
+    summary: Job unique identifier in GUID format.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_job_submit
+  name: az quantum job submit
+  summary: Submit a Q# project to run on Azure Quantum.
+  description: ''
+  syntax: >-
+    az quantum job submit [--job-name]
+                          [--location]
+                          [--no-build]
+                          [--project]
+                          [--resource-group]
+                          [--shots]
+                          [--storage]
+                          [--target-id]
+                          [--workspace-name]
+                          [<PROGRAM_ARGS>]
+  examples:
+  - summary: Submit the Q# program from the current folder.
+    syntax: >-
+      az quantum job submit -g MyResourceGroup -w MyWorkspace -l MyLocation \
+         -l MyLocation --job-name MyJob
+  optionalParameters:
+  - name: --job-name
+    summary: A friendly name to give to this run of the program.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-build
+    summary: If specified, the Q# program is not built before submitting.
+    description: ''
+  - name: --project
+    summary: The location of the Q# project to submit. Defaults to current folder.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --shots
+    summary: The number of times to run the Q# program on the given target.
+    description: ''
+  - name: --storage
+    summary: If specified, the ConnectionString of an Azure Storage is used to store job data and results.
+    description: ''
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+  - name: <PROGRAM_ARGS>
+    summary: List of arguments expected by the Q# operation specified as --name=value after `--`.
+    description: ''
+- uid: az_quantum_job_wait
+  name: az quantum job wait
+  summary: Place the CLI in a waiting state until the job finishes running.
+  description: ''
+  syntax: >-
+    az quantum job wait --job-id
+                        [--location]
+                        [--max-poll-wait-secs]
+                        [--resource-group]
+                        [--workspace-name]
+  examples:
+  - summary: Wait for completion of a job for 60 seconds.
+    syntax: >-
+      az quantum job wait -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -j yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy --max-poll-wait-secs 60 -o table
+  requiredParameters:
+  - isRequired: true
+    name: --job-id -j
+    summary: Job unique identifier in GUID format.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --max-poll-wait-secs
+    defaultValue: "5"
+    summary: Poll time in seconds to query Azure Quantum for results of the corresponding job.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+commands:
+- az_quantum_job_list
+- az_quantum_job_output
+- az_quantum_job_show
+- az_quantum_job_submit
+- az_quantum_job_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage jobs for Azure Quantum.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/quantum/offerings.yml b/2018-03-01-hybrid/docs-ref-autogen/quantum/offerings.yml
new file mode 100644
index 0000000000..434e3d170c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/quantum/offerings.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_offerings
+name: az quantum offerings
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum offerings** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage provider offerings for Azure Quantum.
+description: ''
+directCommands:
+- uid: az_quantum_offerings_accept-terms
+  name: az quantum offerings accept-terms
+  summary: Accept the terms of a provider and SKU combination to enable it for workspace creation.
+  description: ''
+  syntax: >-
+    az quantum offerings accept-terms [--location]
+                                      [--provider-id]
+                                      [--sku]
+  examples:
+  - summary: Once terms have been reviewed, accept the invoking this command.
+    syntax: az quantum offerings accept-terms -p MyProviderId -k MySKU -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --provider-id -p
+    summary: Identifier of an Azure Quantum provider.
+    description: ''
+  - name: --sku -k
+    summary: Identify a plan or SKU offered by an Azure Quantum provider.
+    description: ''
+- uid: az_quantum_offerings_list
+  name: az quantum offerings list
+  summary: Get the list of all provider offerings available on the given location.
+  description: ''
+  syntax: az quantum offerings list [--location]
+  examples:
+  - summary: List offerings available in an Azure location.
+    syntax: az quantum offerings list -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_quantum_offerings_show-terms
+  name: az quantum offerings show-terms
+  summary: Show the terms of a provider and SKU combination including license URL and acceptance status.
+  description: ''
+  syntax: >-
+    az quantum offerings show-terms [--location]
+                                    [--provider-id]
+                                    [--sku]
+  examples:
+  - summary: Use a Provider Id and SKU from `az quantum offerings list` to review the terms.
+    syntax: az quantum offerings show-terms -p MyProviderId -k MySKU -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --provider-id -p
+    summary: Identifier of an Azure Quantum provider.
+    description: ''
+  - name: --sku -k
+    summary: Identify a plan or SKU offered by an Azure Quantum provider.
+    description: ''
+commands:
+- az_quantum_offerings_accept-terms
+- az_quantum_offerings_list
+- az_quantum_offerings_show-terms
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage provider offerings for Azure Quantum.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/quantum/target.yml b/2018-03-01-hybrid/docs-ref-autogen/quantum/target.yml
new file mode 100644
index 0000000000..b5f9a65967
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/quantum/target.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_target
+name: az quantum target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage targets for Azure Quantum workspaces.
+description: ''
+directCommands:
+- uid: az_quantum_target_clear
+  name: az quantum target clear
+  summary: Clear the default target-id.
+  description: ''
+  syntax: az quantum target clear
+  examples:
+  - summary: Clear the default target-id.
+    syntax: az quantum target clear
+- uid: az_quantum_target_list
+  name: az quantum target list
+  summary: Get the list of providers and their targets in an Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum target list [--location]
+                           [--resource-group]
+                           [--workspace-name]
+  examples:
+  - summary: Get the list of targets available in a Azure Quantum workspaces
+    syntax: az quantum target list -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_target_set
+  name: az quantum target set
+  summary: Select the default target to use when submitting jobs to Azure Quantum.
+  description: ''
+  syntax: az quantum target set [--target-id]
+  examples:
+  - summary: Select a default when submitting jobs to Azure Quantum.
+    syntax: az quantum target set -t target-id
+  optionalParameters:
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+- uid: az_quantum_target_show
+  name: az quantum target show
+  summary: Get the details of the given (or current) target to use when submitting jobs to Azure Quantum.
+  description: ''
+  syntax: az quantum target show [--target-id]
+  examples:
+  - summary: Show the currently selected default target
+    syntax: az quantum target show
+  optionalParameters:
+  - name: --target-id -t
+    summary: Execution engine for quantum computing jobs. When a workspace is configured with a set of provider, they each enable one or more targets.
+    description: ''
+commands:
+- az_quantum_target_clear
+- az_quantum_target_list
+- az_quantum_target_set
+- az_quantum_target_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage targets for Azure Quantum workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/quantum/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/quantum/workspace.yml
new file mode 100644
index 0000000000..59ddda3d5c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/quantum/workspace.yml
@@ -0,0 +1,183 @@
+### YamlMime:AzureCLIGroup
+uid: az_quantum_workspace
+name: az quantum workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **quantum** extension for Azure CLI and requires version 2.23.0 or higher.  The extension will automatically install the first time you run an **az quantum workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Quantum workspaces.
+description: ''
+directCommands:
+- uid: az_quantum_workspace_clear
+  name: az quantum workspace clear
+  summary: Clear the default Azure Quantum workspace.
+  description: ''
+  syntax: az quantum workspace clear
+  examples:
+  - summary: Clear the default Azure Quantum workspace if previously set.
+    syntax: az quantum workspace clear
+- uid: az_quantum_workspace_create
+  name: az quantum workspace create
+  summary: Create a new Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace create [--location]
+                                [--provider-sku-list]
+                                [--resource-group]
+                                [--skip-role-assignment]
+                                [--storage-account]
+                                [--workspace-name]
+  examples:
+  - summary: Create a new Azure Quantum workspace with a specific list of providers.
+    syntax: >-
+      az quantum workspace create -g MyResourceGroup -w MyWorkspace -l MyLocation \
+          -r "MyProvider1 / MySKU1, MyProvider2 / MySKU2" -a MyStorageAccountName
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --provider-sku-list -r
+    summary: Comma separated list of Provider/SKU pairs.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --skip-role-assignment
+    summary: Skip the role assignment step for the quantum workspace in the storage account.
+    description: ''
+  - name: --storage-account -a
+    summary: Name of the storage account to be used by a quantum workspace.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_delete
+  name: az quantum workspace delete
+  summary: Delete the given (or current) Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace delete [--resource-group]
+                                [--workspace-name]
+  examples:
+  - summary: Delete an Azure Quantum workspace by name and group.
+    syntax: az quantum workspace delete -g MyResourceGroup -w MyWorkspace
+  - summary: Delete and clear the default Azure Quantum workspace (if one has been set).
+    syntax: az quantum workspace delete
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_list
+  name: az quantum workspace list
+  summary: Get the list of Azure Quantum workspaces available.
+  description: ''
+  syntax: >-
+    az quantum workspace list [--location]
+                              [--resource-group]
+                              [--tag]
+  examples:
+  - summary: Get the list of all Azure Quantum workspaces available.
+    syntax: az quantum workspace list
+  - summary: Get the list Azure Quantum workspaces available in a location.
+    syntax: az quantum workspace list -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --tag
+    summary: Show only quantum workspaces that have associated the specified tag.
+    description: ''
+- uid: az_quantum_workspace_quotas
+  name: az quantum workspace quotas
+  summary: List the quotas for the given (or current) Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace quotas [--location]
+                                [--resource-group]
+                                [--workspace-name]
+  examples:
+  - summary: List the quota information of the default workspace if set.
+    syntax: az quantum workspace quotas
+  - summary: List the quota information of a specified Azure Quantum workspace.
+    syntax: az quantum workspace quotas -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_set
+  name: az quantum workspace set
+  summary: Select a default Azure Quantum workspace for future commands.
+  description: ''
+  syntax: >-
+    az quantum workspace set [--location]
+                             [--resource-group]
+                             [--workspace-name]
+  examples:
+  - summary: Set the default Azure Quantum workspace.
+    syntax: az quantum workspace set -g MyResourceGroup -w MyWorkspace -l MyLocation
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+- uid: az_quantum_workspace_show
+  name: az quantum workspace show
+  summary: Get the details of the given (or current) Azure Quantum workspace.
+  description: ''
+  syntax: >-
+    az quantum workspace show [--resource-group]
+                              [--workspace-name]
+  examples:
+  - summary: Show the currently selected default Azure Quantum workspace.
+    syntax: az quantum workspace show
+  - summary: Show the details of a provided Azure Quantum workspace.
+    syntax: az quantum workspace show -g MyResourceGroup -w MyWorkspace
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --workspace-name -w
+    summary: Name of the Quantum Workspace. You can configure the default workspace using `az quantum workspace set`.
+    description: ''
+commands:
+- az_quantum_workspace_clear
+- az_quantum_workspace_create
+- az_quantum_workspace_delete
+- az_quantum_workspace_list
+- az_quantum_workspace_quotas
+- az_quantum_workspace_set
+- az_quantum_workspace_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Quantum workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/redisenterprise.yml b/2018-03-01-hybrid/docs-ref-autogen/redisenterprise.yml
new file mode 100644
index 0000000000..300f510cf9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/redisenterprise.yml
@@ -0,0 +1,310 @@
+### YamlMime:AzureCLIGroup
+uid: az_redisenterprise
+name: az redisenterprise
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **redisenterprise** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az redisenterprise** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage dedicated Redis Enterprise caches for your Azure applications.
+description: ''
+directCommands:
+- uid: az_redisenterprise_create
+  name: az redisenterprise create
+  summary: Create new Redis Enterprise cache instance.
+  description: Create or update an existing (overwrite/recreate, with potential downtime) cache cluster with an associated database.
+  syntax: >-
+    az redisenterprise create --cluster-name
+                              --resource-group
+                              --sku {EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50}
+                              [--capacity]
+                              [--client-protocol {Encrypted, Plaintext}]
+                              [--clustering-policy {EnterpriseCluster, OSSCluster}]
+                              [--eviction-policy {AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL}]
+                              [--location]
+                              [--minimum-tls-version {1.0, 1.1, 1.2}]
+                              [--modules]
+                              [--no-database]
+                              [--no-wait]
+                              [--persistence]
+                              [--port]
+                              [--tags]
+                              [--zones]
+  examples:
+  - summary: Create new Redis Enterprise cache cluster with database.
+    syntax: az redisenterprise create --cluster-name "cache1" --location "East US" --minimum-tls-version "1.2" --sku "Enterprise_E20" --capacity 4 --tags tag1="value1" --zones "1" "2" "3" --client-protocol "Encrypted" --clustering-policy "EnterpriseCluster" --eviction-policy "NoEviction" --modules name="RedisBloom" args="ERROR_RATE 0.00 INITIAL_SIZE 400" --modules name="RedisTimeSeries" args="RETENTION_POLICY 20" --modules name="RediSearch" --persistence aof-enabled=true aof-frequency="1s" --port 10000 --resource-group "rg1"
+  - summary: Create new Redis Enterprise cache cluster without database (warning - the cache will not be usable until you create a database).
+    syntax: az redisenterprise create --cluster-name "cache1" --location "West US" --minimum-tls-version "1.2" --sku "EnterpriseFlash_F300" --capacity 3 --tags tag1="value1" --zones "1" "2" "3" --resource-group "rg1" --no-database
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50
+    summary: The type of RedisEnterprise cluster to deploy.
+    description: ''
+  optionalParameters:
+  - name: --capacity
+    summary: The size of the RedisEnterprise cluster. Defaults to 2 or 3 depending on SKU. Valid values are (2, 4, 6, ...) for Enterprise SKUs and (3, 9, 15, ...) for Flash SKUs.
+    description: ''
+  - name: --client-protocol
+    parameterValueGroup: Encrypted, Plaintext
+    summary: Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is TLS-encrypted.
+    description: ''
+  - name: --clustering-policy
+    parameterValueGroup: EnterpriseCluster, OSSCluster
+    summary: Clustering policy - default is OSSCluster. Specified at create time.
+    description: ''
+  - name: --eviction-policy
+    parameterValueGroup: AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL
+    summary: Redis eviction policy - default is VolatileLRU.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --minimum-tls-version
+    parameterValueGroup: 1.0, 1.1, 1.2
+    summary: The minimum TLS version for the cluster to support.
+    description: ''
+  - name: --modules
+    summary: Optional set of redis modules to enable in this database - modules can only be added at creation time.
+    description: >-
+      Usage: --modules name=XX args=XX
+
+
+      name: Required. The name of the module, e.g. 'RedisBloom', 'RediSearch', 'RedisTimeSeries'
+
+      args: Configuration options for the module, e.g. 'ERROR_RATE 0.00 INITIAL_SIZE 400'.
+
+
+      Multiple actions can be specified by using more than one --modules argument.
+  - name: --no-database
+    summary: 'Advanced. Do not automatically create a default database. Warning: the cache will not be usable until you create a database.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --persistence
+    summary: Persistence settings.
+    description: >-
+      Usage: --persistence aof-enabled=XX aof-frequency=XX rdb-enabled=XX rdb-frequency=XX
+
+
+      aof-enabled: Sets whether AOF is enabled.  Allowed values: true, false.
+
+      aof-frequency: Sets the frequency at which data is written to disk.  Allowed values: 1s, always.
+
+      rdb-enabled: Sets whether RDB is enabled.  Allowed values: true, false.
+
+      rdb-frequency: Sets the frequency at which a snapshot of the database is created.  Allowed values: 1h, 6h, 12h.
+
+
+      After enabling persistence, you will be unable to disable it. Support for disabling persistence after enabling will be added at a later date.
+  - name: --port
+    summary: TCP port of the database endpoint. Specified at create time. Defaults to an available port.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zones -z
+    summary: The Availability Zones where this cluster will be deployed.
+    description: ''
+- uid: az_redisenterprise_delete
+  name: az redisenterprise delete
+  summary: Delete a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise delete --cluster-name
+                              --resource-group
+                              [--no-wait]
+                              [--yes]
+  examples:
+  - summary: Delete a Redis Enterprise cache.
+    syntax: az redisenterprise delete --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_redisenterprise_list
+  name: az redisenterprise list
+  summary: List Redis Enterprise caches.
+  description: List details about all caches within current Subscription or provided Resource Group.
+  syntax: az redisenterprise list [--resource-group]
+  examples:
+  - summary: List all Redis Enterprise caches in a resource group.
+    syntax: az redisenterprise list --resource-group "rg1"
+  - summary: List all Redis Enterprise caches within the current subscription.
+    syntax: az redisenterprise list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_show
+  name: az redisenterprise show
+  summary: Get information about a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise show --cluster-name
+                            --resource-group
+  examples:
+  - summary: Get information about a Redis Enterprise cache.
+    syntax: az redisenterprise show --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_update
+  name: az redisenterprise update
+  summary: Update an existing Redis Enterprise cache cluster.
+  description: ''
+  syntax: >-
+    az redisenterprise update --cluster-name
+                              --resource-group
+                              [--capacity]
+                              [--minimum-tls-version {1.0, 1.1, 1.2}]
+                              [--no-wait]
+                              [--sku {EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50}]
+                              [--tags]
+  examples:
+  - summary: Update an existing Redis Enterprise cache cluster.
+    syntax: az redisenterprise update --cluster-name "cache1" --minimum-tls-version "1.2" --sku "EnterpriseFlash_F300" --capacity 9 --tags tag1="value1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --capacity
+    summary: The size of the RedisEnterprise cluster. Defaults to 2 or 3 depending on SKU. Valid values are (2, 4, 6, ...) for Enterprise SKUs and (3, 9, 15, ...) for Flash SKUs.
+    description: ''
+  - name: --minimum-tls-version
+    parameterValueGroup: 1.0, 1.1, 1.2
+    summary: The minimum TLS version for the cluster to support.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    parameterValueGroup: EnterpriseFlash_F1500, EnterpriseFlash_F300, EnterpriseFlash_F700, Enterprise_E10, Enterprise_E100, Enterprise_E20, Enterprise_E50
+    summary: The type of RedisEnterprise cluster to deploy.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_redisenterprise_wait
+  name: az redisenterprise wait
+  summary: Place the CLI in a waiting state until a condition of the Redis Enterprise cache cluster is met.
+  description: ''
+  syntax: >-
+    az redisenterprise wait --cluster-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Redis Enterprise cache cluster is successfully created.
+    syntax: az redisenterprise wait --cluster-name "cache1" --resource-group "rg1" --created
+  - summary: Pause executing next line of CLI script until the Redis Enterprise cache cluster is successfully updated.
+    syntax: az redisenterprise wait --cluster-name "cache1" --resource-group "rg1" --updated
+  - summary: Pause executing next line of CLI script until the Redis Enterprise cache is successfully deleted.
+    syntax: az redisenterprise wait --cluster-name "cache1" --resource-group "rg1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_redisenterprise_create
+- az_redisenterprise_database
+- az_redisenterprise_database_create
+- az_redisenterprise_database_delete
+- az_redisenterprise_database_export
+- az_redisenterprise_database_import
+- az_redisenterprise_database_list
+- az_redisenterprise_database_list-keys
+- az_redisenterprise_database_regenerate-key
+- az_redisenterprise_database_show
+- az_redisenterprise_database_update
+- az_redisenterprise_database_wait
+- az_redisenterprise_delete
+- az_redisenterprise_list
+- az_redisenterprise_operation-status
+- az_redisenterprise_operation-status_show
+- az_redisenterprise_show
+- az_redisenterprise_update
+- az_redisenterprise_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage dedicated Redis Enterprise caches for your Azure applications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/redisenterprise/database.yml b/2018-03-01-hybrid/docs-ref-autogen/redisenterprise/database.yml
new file mode 100644
index 0000000000..c792ef2df6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/redisenterprise/database.yml
@@ -0,0 +1,389 @@
+### YamlMime:AzureCLIGroup
+uid: az_redisenterprise_database
+name: az redisenterprise database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **redisenterprise** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az redisenterprise database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Redis Enterprise databases.
+description: ''
+directCommands:
+- uid: az_redisenterprise_database_create
+  name: az redisenterprise database create
+  summary: Create new database for a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise database create --cluster-name
+                                       --resource-group
+                                       [--client-protocol {Encrypted, Plaintext}]
+                                       [--clustering-policy {EnterpriseCluster, OSSCluster}]
+                                       [--eviction-policy {AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL}]
+                                       [--modules]
+                                       [--no-wait]
+                                       [--persistence]
+                                       [--port]
+  examples:
+  - summary: Create new database for a Redis Enterprise cache.
+    syntax: az redisenterprise database create --cluster-name "cache1" --client-protocol "Encrypted" --clustering-policy "EnterpriseCluster" --eviction-policy "AllKeysLRU" --modules name="RedisBloom" args="ERROR_RATE 0.00 INITIAL_SIZE 400" --modules name="RedisTimeSeries" args="RETENTION_POLICY 20" --modules name="RediSearch" --persistence aof-enabled=true aof-frequency="1s" --port 10000 --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --client-protocol
+    parameterValueGroup: Encrypted, Plaintext
+    summary: Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is TLS-encrypted.
+    description: ''
+  - name: --clustering-policy
+    parameterValueGroup: EnterpriseCluster, OSSCluster
+    summary: Clustering policy - default is OSSCluster. Specified at create time.
+    description: ''
+  - name: --eviction-policy
+    parameterValueGroup: AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL
+    summary: Redis eviction policy - default is VolatileLRU.
+    description: ''
+  - name: --modules
+    summary: Optional set of redis modules to enable in this database - modules can only be added at creation time.
+    description: >-
+      Usage: --modules name=XX args=XX
+
+
+      name: Required. The name of the module, e.g. 'RedisBloom', 'RediSearch', 'RedisTimeSeries'
+
+      args: Configuration options for the module, e.g. 'ERROR_RATE 0.00 INITIAL_SIZE 400'.
+
+
+      Multiple actions can be specified by using more than one --modules argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --persistence
+    summary: Persistence settings.
+    description: >-
+      Usage: --persistence aof-enabled=XX aof-frequency=XX rdb-enabled=XX rdb-frequency=XX
+
+
+      aof-enabled: Sets whether AOF is enabled.  Allowed values: true, false.
+
+      aof-frequency: Sets the frequency at which data is written to disk.  Allowed values: 1s, always.
+
+      rdb-enabled: Sets whether RDB is enabled.  Allowed values: true, false.
+
+      rdb-frequency: Sets the frequency at which a snapshot of the database is created.  Allowed values: 1h, 6h, 12h.
+
+
+      After enabling persistence, you will be unable to disable it. Support for disabling persistence after enabling will be added at a later date.
+  - name: --port
+    summary: TCP port of the database endpoint. Specified at create time. Defaults to an available port.
+    description: ''
+- uid: az_redisenterprise_database_delete
+  name: az redisenterprise database delete
+  summary: Delete a single database in a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise database delete --cluster-name
+                                       --resource-group
+                                       [--no-wait]
+                                       [--yes]
+  examples:
+  - summary: Delete a single database in a Redis Enterprise cache.
+    syntax: az redisenterprise database delete --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_redisenterprise_database_export
+  name: az redisenterprise database export
+  summary: Export data stored in a Redis Enterprise database.
+  description: Export data stored in a Redis Enterprise database to a target database file.
+  syntax: >-
+    az redisenterprise database export --cluster-name
+                                       --resource-group
+                                       --sas-uri
+                                       [--no-wait]
+  examples:
+  - summary: Export data stored in a Redis Enterprise database to a target database file.
+    syntax: az redisenterprise database export --cluster-name "cache1" --sas-uri "https://contosostorage.blob.core.window.net/urlToBlobContainer?sasKeyParameters" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sas-uri
+    summary: SAS URI for the target directory to export to.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_redisenterprise_database_import
+  name: az redisenterprise database import
+  summary: Import data into a Redis Enterprise database.
+  description: Import data from a database file into a target Redis Enterprise database.
+  syntax: >-
+    az redisenterprise database import --cluster-name
+                                       --resource-group
+                                       --sas-uri
+                                       [--no-wait]
+  examples:
+  - summary: Import data from a database file into a target Redis Enterprise database.
+    syntax: az redisenterprise database import --cluster-name "cache1" --sas-uri "https://contosostorage.blob.core.window.net/urltoBlobFile?sasKeyParameters" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sas-uri
+    summary: SAS URI for the target blob to import from.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_redisenterprise_database_list
+  name: az redisenterprise database list
+  summary: List all databases in a Redis Enterprise cache.
+  description: List details about all databases in the specified Redis Enterprise cache.
+  syntax: >-
+    az redisenterprise database list --cluster-name
+                                     --resource-group
+  examples:
+  - summary: List all databases in the specified Redis Enterprise cache.
+    syntax: az redisenterprise database list --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_database_list-keys
+  name: az redisenterprise database list-keys
+  summary: Retrieve all access keys for a Redis Enterprise database.
+  description: ''
+  syntax: >-
+    az redisenterprise database list-keys --cluster-name
+                                          --resource-group
+  examples:
+  - summary: Retrieve all access keys for a Redis Enterprise database.
+    syntax: az redisenterprise database list-keys --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_database_regenerate-key
+  name: az redisenterprise database regenerate-key
+  summary: Regenerate an access key for a Redis Enterprise database.
+  description: ''
+  syntax: >-
+    az redisenterprise database regenerate-key --cluster-name
+                                               --key-type {Primary, Secondary}
+                                               --resource-group
+                                               [--no-wait]
+  examples:
+  - summary: Regenerate an access key for a Redis Enterprise database.
+    syntax: az redisenterprise database regenerate-key --cluster-name "cache1" --key-type "Primary" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --key-type
+    parameterValueGroup: Primary, Secondary
+    summary: Which access key to regenerate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_redisenterprise_database_show
+  name: az redisenterprise database show
+  summary: Get information about a database in a Redis Enterprise cache.
+  description: ''
+  syntax: >-
+    az redisenterprise database show --cluster-name
+                                     --resource-group
+  examples:
+  - summary: Get information about a database in a Redis Enterprise cache.
+    syntax: az redisenterprise database show --cluster-name "cache1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_redisenterprise_database_update
+  name: az redisenterprise database update
+  summary: Update an existing Redis Enterprise database.
+  description: ''
+  syntax: >-
+    az redisenterprise database update --cluster-name
+                                       --resource-group
+                                       [--client-protocol {Encrypted, Plaintext}]
+                                       [--eviction-policy {AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL}]
+                                       [--no-wait]
+                                       [--persistence]
+  examples:
+  - summary: Update an existing Redis Enterprise database.
+    syntax: az redisenterprise database update --cluster-name "cache1" --client-protocol "Encrypted" --eviction-policy "AllKeysLRU" --persistence rdb-enabled=true rdb-frequency="12h" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --client-protocol
+    parameterValueGroup: Encrypted, Plaintext
+    summary: Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols.
+    description: ''
+  - name: --eviction-policy
+    parameterValueGroup: AllKeysLFU, AllKeysLRU, AllKeysRandom, NoEviction, VolatileLFU, VolatileLRU, VolatileRandom, VolatileTTL
+    summary: Redis eviction policy.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --persistence
+    summary: Persistence settings.
+    description: >-
+      Usage: --persistence aof-enabled=XX aof-frequency=XX rdb-enabled=XX rdb-frequency=XX
+
+
+      aof-enabled: Sets whether AOF is enabled.  Allowed values: true, false.
+
+      aof-frequency: Sets the frequency at which data is written to disk.  Allowed values: 1s, always.
+
+      rdb-enabled: Sets whether RDB is enabled.  Allowed values: true, false.
+
+      rdb-frequency: Sets the frequency at which a snapshot of the database is created.  Allowed values: 1h, 6h, 12h.
+
+
+      After enabling persistence, you will be unable to disable it. Support for disabling persistence after enabling will be added at a later date.
+- uid: az_redisenterprise_database_wait
+  name: az redisenterprise database wait
+  summary: Place the CLI in a waiting state until a condition of the Redis Enterprise database is met.
+  description: ''
+  syntax: >-
+    az redisenterprise database wait --cluster-name
+                                     --resource-group
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--timeout]
+                                     [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Redis Enterprise database is successfully created.
+    syntax: az redisenterprise database wait --cluster-name "cache1" --resource-group "rg1" --created
+  - summary: Pause executing next line of CLI script until the Redis Enterprise database is successfully updated.
+    syntax: az redisenterprise database wait --cluster-name "cache1" --resource-group "rg1" --updated
+  - summary: Pause executing next line of CLI script until the Redis Enterprise database is successfully deleted.
+    syntax: az redisenterprise database wait --cluster-name "cache1" --resource-group "rg1" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name --name -n
+    summary: The name of the RedisEnterprise cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_redisenterprise_database_create
+- az_redisenterprise_database_delete
+- az_redisenterprise_database_export
+- az_redisenterprise_database_import
+- az_redisenterprise_database_list
+- az_redisenterprise_database_list-keys
+- az_redisenterprise_database_regenerate-key
+- az_redisenterprise_database_show
+- az_redisenterprise_database_update
+- az_redisenterprise_database_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Redis Enterprise databases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/redisenterprise/operation-status.yml b/2018-03-01-hybrid/docs-ref-autogen/redisenterprise/operation-status.yml
new file mode 100644
index 0000000000..572cc57000
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/redisenterprise/operation-status.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_redisenterprise_operation-status
+name: az redisenterprise operation-status
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **redisenterprise** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az redisenterprise operation-status** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Redis Enterprise operation status.
+description: ''
+directCommands:
+- uid: az_redisenterprise_operation-status_show
+  name: az redisenterprise operation-status show
+  summary: Get the status of an operation.
+  description: ''
+  syntax: >-
+    az redisenterprise operation-status show --location
+                                             --operation-id
+  examples:
+  - summary: Get the status of an operation.
+    syntax: az redisenterprise operation-status show --operation-id "testoperationid" --location "West US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The operation's unique identifier.
+    description: ''
+commands:
+- az_redisenterprise_operation-status_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Redis Enterprise operation status.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/reference-index.yml b/2018-03-01-hybrid/docs-ref-autogen/reference-index.yml
index 1fed7a2bf7..ef211db2fe 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/reference-index.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/reference-index.yml
@@ -1,35 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az
-  name: az
-  summary: ''
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_configure
-  - az_feedback
-  - az_find
-  - az_interactive
-  - az_login
-  - az_logout
-  - az_rest
-  - az_self_test
-  - az_version
+### YamlMime:AzureCLIGroup
+uid: az
+name: az
+summary: ''
+description: ''
+directCommands:
 - uid: az_configure
   name: az configure
   summary: Manage Azure CLI configuration. This command is interactive.
-  description: ''
-  langs:
-  - azurecli
+  description: For automation scenarios or to set all available options, use the new `az config`.
+  syntax: >-
+    az configure [--defaults]
+                 [--list-defaults {false, true}]
+                 [--scope {global, local}]
   examples:
   - summary: Set default resource group, webapp and VM names.
-    syntax:
-      content: az configure --defaults group=myRG web=myweb vm=myvm
+    syntax: az configure --defaults group=myRG web=myweb vm=myvm
   - summary: Clear default webapp and VM names.
-    syntax:
-      content: az configure --defaults vm='' web=''
-  parameters:
+    syntax: az configure --defaults vm='' web=''
+  optionalParameters:
   - name: --defaults -d
     summary: Space-separated 'name=value' pairs for common argument defaults.
     description: ''
@@ -42,58 +30,38 @@ items:
     parameterValueGroup: global, local
     summary: Scope of defaults. Using "local" for settings only effective under current folder.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/configure/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/configure/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/configure/_help.py
 - uid: az_feedback
   name: az feedback
-  summary: Send feedback to the Azure CLI Team!
-  description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/feedback/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/feedback/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  summary: Send feedback to the Azure CLI Team.
+  description: This command is interactive. If possible, it launches the default web browser to open GitHub issue creation page with the body auto-generated and pre-filled. You will have a chance to edit the issue body before submitting it.
+  syntax: az feedback
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/feedback/_help.py
 - uid: az_find
   name: az find
   summary: I'm an AI robot, my advice is based on our Azure documentation as well as the usage patterns of Azure CLI and Azure ARM users. Using me improves Azure products and documentation.
   description: ''
-  langs:
-  - azurecli
+  syntax: az find [<CLI_TERM>]
   examples:
   - summary: Give me any Azure CLI group and I’ll show the most popular commands within the group.
-    syntax:
-      content: az find "az storage"
+    syntax: az find "az storage"
   - summary: Give me any Azure CLI command and I’ll show the most popular parameters and subcommands.
-    syntax:
-      content: az find "az monitor activity-log list"
+    syntax: az find "az monitor activity-log list"
   - summary: You can also enter a search term, and I'll try to help find the best commands.
-    syntax:
-      content: az find "arm template"
-  parameters:
+    syntax: az find "arm template"
+  optionalParameters:
   - name: <CLI_TERM>
     summary: An Azure CLI command or group for which you need an example.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/find/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/find/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/find/_help.py
 - uid: az_interactive
   name: az interactive
   summary: Start interactive mode. Installs the Interactive extension if not installed already.
-  description: 'For more information on interactive mode, see: <a href="https://azure.microsoft.com/blog/welcome-to-azure-cli-shell/">https://azure.microsoft.com/blog/welcome-to-azure-cli-shell/</a>.'
-  langs:
-  - azurecli
-  parameters:
+  description: 'For more information on interactive mode, see: https://azure.microsoft.com/blog/welcome-to-azure-cli-shell/.'
+  syntax: >-
+    az interactive [--style {bg, br, contrast, default, grey, halloween, neon, none, pastel, primary, purple, quiet}]
+                   [--update]
+  optionalParameters:
   - name: --style -s
     parameterValueGroup: bg, br, contrast, default, grey, halloween, neon, none, pastel, primary, purple, quiet
     summary: The colors of the shell.
@@ -105,34 +73,42 @@ items:
   name: az login
   summary: Log in to Azure.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az login [--allow-no-subscriptions]
+             [--identity]
+             [--password]
+             [--scope]
+             [--service-principal]
+             [--tenant]
+             [--use-cert-sn-issuer]
+             [--use-device-code]
+             [--username]
   examples:
   - summary: Log in interactively.
-    syntax:
-      content: az login
+    syntax: az login
   - summary: Log in with user name and password. This doesn't work with Microsoft accounts or accounts that have two-factor authentication enabled. Use -p=secret if the first character of the password is '-'.
-    syntax:
-      content: az login -u johndoe@contoso.com -p VerySecret
+    syntax: az login -u johndoe@contoso.com -p VerySecret
   - summary: Log in with a service principal using client secret. Use -p=secret if the first character of the password is '-'.
-    syntax:
-      content: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p VerySecret --tenant contoso.onmicrosoft.com
+    syntax: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p VerySecret --tenant contoso.onmicrosoft.com
   - summary: Log in with a service principal using client certificate.
-    syntax:
-      content: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p ~/mycertfile.pem --tenant contoso.onmicrosoft.com
+    syntax: az login --service-principal -u http://azure-cli-2016-08-05-14-31-15 -p ~/mycertfile.pem --tenant contoso.onmicrosoft.com
   - summary: Log in using a VM's system assigned identity
-    syntax:
-      content: az login --identity
+    syntax: az login --identity
   - summary: Log in using a VM's user assigned identity. Client or object ids of the service identity also work
-    syntax:
-      content: az login --identity -u /subscriptions/<subscriptionId>/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
-  parameters:
+    syntax: az login --identity -u /subscriptions/<subscriptionId>/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+  optionalParameters:
   - name: --allow-no-subscriptions
     summary: Support access tenants without subscriptions. It's uncommon but useful to run tenant level commands, such as 'az ad'.
     description: ''
+  - name: --identity -i
+    summary: Log in using the Virtual Machine's identity.
+    description: ''
   - name: --password -p
     summary: Credentials like user password, or for a service principal, provide client secret or a pem file with key and public certificate. Will prompt if not given.
     description: ''
+  - name: --scope
+    summary: Used in the /authorize request. It can cover only one static resource.
+    description: ''
   - name: --service-principal
     summary: The credential representing a service principal.
     description: ''
@@ -148,60 +124,78 @@ items:
   - name: --username -u
     summary: User name, service principal, or managed service identity ID.
     description: ''
-  - name: --identity -i
-    summary: Log in using the Virtual Machine's identity.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_logout
   name: az logout
   summary: Log out to remove access to Azure subscriptions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az logout [--username]
+  optionalParameters:
   - name: --username
     summary: Account user, if missing, logout the current active account.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_next
+  name: az next
+  summary: Recommend the possible next set of commands to take.
+  description: >-
+    There are some custom configurations:
+
+
+    [1] az config set next.execute_in_prompt=True/False
+        Turn on/off the step of executing recommended commands in interactive mode. Turn on by default.
+
+    [2] az config set next.filter_type=True/False
+        Turn on/off the step of filtering recommendation type. Turn off by default.
+
+    [3] az config set next.output=json/jsonc/none/table/tsv/yaml/yamlc/status
+        Set default output format. Status is the default.
+
+    [4] az config set next.num_limit={amount_limit}
+        Set the limit of recommended items. 5 is the default.
+
+    [5] az config set next.show_arguments=True/False
+        Show/hide the arguments of recommended items. False is the default.
+
+    [6] az config set next.print_help=True/False
+        Enable/disable whether to print help actively before executing each command. False is the default.
+  syntax: az next
 - uid: az_rest
   name: az rest
   summary: Invoke a custom request.
   description: >-
-    This command automatically authenticates using the credential logged in: If Authorization header is not set, it attaches header `Authorization: Bearer &lt;token&gt;`, where `&lt;token&gt;` is retrieved from AAD. The target resource of the token is derived from --url if --url starts with an endpoint from `az cloud show --query endpoints`. You may also use --resource for a custom resource.
+    This command automatically authenticates using the logged-in credential: If Authorization header is not set, it attaches header `Authorization: Bearer <token>`, where `<token>` is retrieved from AAD. The target resource of the token is derived from --url if --url starts with an endpoint from `az cloud show --query endpoints`. You may also use --resource for a custom resource.
 
     If Content-Type header is not set and --body is a valid JSON string, Content-Type header will default to application/json.
-  langs:
-  - azurecli
+  syntax: >-
+    az rest --uri
+            [--body]
+            [--headers]
+            [--method {delete, get, head, options, patch, post, put}]
+            [--output-file]
+            [--resource]
+            [--skip-authorization-header]
+            [--subscription]
+            [--uri-parameters]
   examples:
   - summary: Get Audit log through Microsoft Graph
-    syntax:
-      content: az rest --method get --uri https://graph.microsoft.com/beta/auditLogs/directoryAudits
+    syntax: az rest --method get --url https://graph.microsoft.com/beta/auditLogs/directoryAudits
   - summary: Update a Azure Active Directory Graph User's display name
-    syntax:
-      content: 'az rest --method patch --uri "https://graph.microsoft.com/v1.0/users/johndoe@azuresdkteam.onmicrosoft.com" --body "{\"displayName\": \"jondoe2\"}"'
+    syntax: 'az rest --method patch --url "https://graph.microsoft.com/v1.0/users/johndoe@azuresdkteam.onmicrosoft.com" --body "{\"displayName\": \"jondoe2\"}"'
   - summary: Get a virtual machine
-    syntax:
-      content: az rest --method get --uri /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}?api-version=2019-03-01
+    syntax: az rest --method get --uri /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}?api-version=2019-03-01
   - summary: Create a public IP address from body.json file
-    syntax:
-      content: az rest --method put --uri https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}?api-version=2019-09-01 --body @body.json
-  parameters:
+    syntax: az rest --method put --url https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}?api-version=2019-09-01 --body @body.json
+  - summary: List the top three resources (Bash)
+    syntax: az rest --method get --url https://management.azure.com/subscriptions/{subscriptionId}/resources?api-version=2019-07-01 --url-parameters \$top=3
+  requiredParameters:
   - isRequired: true
     name: --uri --url -u
     summary: Request URL. If it doesn't start with a host, CLI assumes it as an Azure resource ID and prefixes it with the ARM endpoint of the current cloud shown by `az cloud show --query endpoints.resourceManager`. Common token {subscriptionId} will be replaced with the current subscription ID specified by `az account set`.
     description: ''
+  optionalParameters:
   - name: --body -b
-    summary: Request body. Use @{file} to load from a file. For quoting issues in different terminals, see <a href="https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#quoting-issues">https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#quoting-issues</a>.
+    summary: Request body. Use @{file} to load from a file. For quoting issues in different terminals, see https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#quoting-issues.
     description: ''
   - name: --headers
     summary: Space-separated headers in KEY=VALUE format or JSON string. Use @{file} to load from a file.
@@ -220,156 +214,187 @@ items:
   - name: --skip-authorization-header
     summary: Do not auto-append Authorization header.
     description: ''
-  - name: --uri-parameters
-    summary: Space-separated queries in KEY=VALUE format or JSON string. Use @{file} to load from a file.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_self_test
+  - name: --uri-parameters --url-parameters
+    summary: Query parameters in the URL. Space-separated queries in KEY=VALUE format or JSON string. Use @{file} to load from a file.
+    description: ''
+- uid: az_self-test
   name: az self-test
   summary: Runs a self-test of the CLI.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az self-test [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_upgrade
+  name: az upgrade
+  summary: Upgrade Azure CLI and extensions.
+  description: ''
+  syntax: >-
+    az upgrade [--all {false, true}]
+               [--subscription]
+               [--yes]
+  optionalParameters:
+  - name: --all
+    defaultValue: "true"
+    parameterValueGroup: false, true
+    summary: Enable updating extensions as well.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for checking release notes.
+    description: ''
 - uid: az_version
   name: az version
   summary: Show the versions of Azure CLI modules and extensions in JSON format by default or format configured by --output.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az version [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_account
-  name: az account
-  summary: Manage Azure subscription information.
-- uid: az_ad
-  name: az ad
-  summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
-- uid: az_appconfig
-  name: az appconfig
-  summary: Manage App Configurations.
-- uid: az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-- uid: az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-- uid: az_cache
-  name: az cache
-  summary: Commands to manage CLI objects cached using the `--defer` argument.
-- uid: az_cloud
-  name: az cloud
-  summary: Manage registered Azure clouds.
-- uid: az_configure
-  name: az configure
-  summary: Manage Azure CLI configuration. This command is interactive.
-- uid: az_deployment
-  name: az deployment
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-- uid: az_deployment_scripts
-  name: az deployment-scripts
-  summary: Manage deployment scripts at subscription or resource group scope.
-- uid: az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-- uid: az_disk
-  name: az disk
-  summary: Manage Azure Managed Disks.
-- uid: az_extension
-  name: az extension
-  summary: Manage and update CLI extensions.
-- uid: az_feedback
-  name: az feedback
-  summary: Send feedback to the Azure CLI Team!
-- uid: az_find
-  name: az find
-  summary: I'm an AI robot, my advice is based on our Azure documentation as well as the usage patterns of Azure CLI and Azure ARM users. Using me improves Azure products and documentation.
-- uid: az_group
-  name: az group
-  summary: Manage resource groups and template deployments.
-- uid: az_hdinsight
-  name: az hdinsight
-  summary: Manage HDInsight resources.
-- uid: az_image
-  name: az image
-  summary: Manage custom virtual machine images.
-- uid: az_interactive
-  name: az interactive
-  summary: Start interactive mode. Installs the Interactive extension if not installed already.
-- uid: az_keyvault
-  name: az keyvault
-  summary: Manage KeyVault keys, secrets, and certificates.
-- uid: az_local_context
-  name: az local-context
-  summary: Manage Local Context.
-- uid: az_lock
-  name: az lock
-  summary: Manage Azure locks.
-- uid: az_login
-  name: az login
-  summary: Log in to Azure.
-- uid: az_logout
-  name: az logout
-  summary: Log out to remove access to Azure subscriptions.
-- uid: az_managedapp
-  name: az managedapp
-  summary: Manage template solutions provided and maintained by Independent Software Vendors (ISVs).
-- uid: az_network
-  name: az network
-  summary: Manage Azure Network resources.
-- uid: az_pipelines
-  name: az pipelines
-  summary: Manage Azure Pipelines.
-- uid: az_policy
-  name: az policy
-  summary: Manage resource policies.
-- uid: az_provider
-  name: az provider
-  summary: Manage resource providers.
-- uid: az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-- uid: az_resource
-  name: az resource
-  summary: Manage Azure resources.
-- uid: az_rest
-  name: az rest
-  summary: Invoke a custom request.
-- uid: az_role
-  name: az role
-  summary: Manage user roles for access control with Azure Active Directory and service principals.
-- uid: az_security
-  name: az security
-  summary: Manage your security posture with Azure Security Center.
-- uid: az_self_test
-  name: az self-test
-  summary: Runs a self-test of the CLI.
-- uid: az_snapshot
-  name: az snapshot
-  summary: Manage point-in-time copies of managed disks, native blobs, or other snapshots.
-- uid: az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-- uid: az_tag
-  name: az tag
-  summary: Manage resource tags.
-- uid: az_version
-  name: az version
-  summary: Show the versions of Azure CLI modules and extensions in JSON format by default or format configured by --output.
-- uid: az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-- uid: az_vmss
-  name: az vmss
-  summary: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
+- az_account
+- az_acr
+- az_ad
+- az_ai-examples
+- az_aks
+- az_alias
+- az_appconfig
+- az_arcappliance
+- az_artifacts
+- az_attestation
+- az_automation
+- az_baremetalinstance
+- az_batch
+- az_bicep
+- az_blockchain
+- az_blueprint
+- az_boards
+- az_cache
+- az_cli-translator
+- az_cloud
+- az_cloud-service
+- az_codespace
+- az_communication
+- az_config
+- az_configure
+- az_confluent
+- az_connectedk8s
+- az_connectedmachine
+- az_container
+- az_cosmosdb
+- az_costmanagement
+- az_csvmware
+- az_customlocation
+- az_custom-providers
+- az_databox
+- az_databricks
+- az_datadog
+- az_datafactory
+- az_datashare
+- az_dedicated-hsm
+- az_demo
+- az_deployment
+- az_deployment-scripts
+- az_desktopvirtualization
+- az_devops
+- az_disk
+- az_disk-pool
+- az_dms
+- az_dt
+- az_eventgrid
+- az_extension
+- az_feedback
+- az_find
+- az_footprint
+- az_functionapp
+- az_fzf
+- az_graph
+- az_group
+- az_guestconfig
+- az_hack
+- az_hanainstance
+- az_hdinsight
+- az_healthbot
+- az_healthcareapis
+- az_hpc-cache
+- az_image
+- az_import-export
+- az_interactive
+- az_internet-analyzer
+- az_iot
+- az_k8sconfiguration
+- az_k8s-configuration
+- az_k8s-extension
+- az_keyvault
+- az_kusto
+- az_local-context
+- az_lock
+- az_logic
+- az_login
+- az_logout
+- az_maintenance
+- az_managedapp
+- az_managed-cassandra
+- az_managementpartner
+- az_mesh
+- az_ml
+- az_ml(v1)
+- az_monitor
+- az_mysql
+- az_netappfiles
+- az_network
+- az_next
+- az_notification-hub
+- az_offazure
+- az_peering
+- az_pipelines
+- az_policy
+- az_portal
+- az_postgres
+- az_powerbi
+- az_provider
+- az_providerhub
+- az_quantum
+- az_redisenterprise
+- az_remote-rendering-account
+- az_repos
+- az_resource
+- az_resource-mover
+- az_rest
+- az_role
+- az_sapmonitor
+- az_security
+- az_self-test
+- az_sentinel
+- az_snapshot
+- az_spatial-anchors-account
+- az_spring-cloud
+- az_sql
+- az_ssh
+- az_sshkey
+- az_stack-hci
+- az_storage
+- az_storagesync
+- az_stream-analytics
+- az_support
+- az_synapse
+- az_tag
+- az_term
+- az_tsi
+- az_upgrade
+- az_version
+- az_vm
+- az_vmss
+- az_vmware
+- az_webapp
+- az_webpubsub
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -385,9 +410,6 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
diff --git a/2018-03-01-hybrid/docs-ref-autogen/remote-rendering-account.yml b/2018-03-01-hybrid/docs-ref-autogen/remote-rendering-account.yml
new file mode 100644
index 0000000000..da3493699e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/remote-rendering-account.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_remote-rendering-account
+name: az remote-rendering-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az remote-rendering-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage remote rendering account with mixed reality.
+description: ''
+directCommands:
+- uid: az_remote-rendering-account_create
+  name: az remote-rendering-account create
+  summary: Create a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account create --name
+                                       --resource-group
+                                       [--kind]
+                                       [--location]
+                                       [--sku]
+                                       [--storage-account-name]
+                                       [--tags]
+  examples:
+  - summary: Create remote rendering account
+    syntax: az remote-rendering-account create -n "MyAccount" --location "eastus2euap" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_remote-rendering-account_delete
+  name: az remote-rendering-account delete
+  summary: Delete a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account delete --name
+                                       --resource-group
+  examples:
+  - summary: Delete remote rendering account
+    syntax: az remote-rendering-account delete -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_remote-rendering-account_list
+  name: az remote-rendering-account list
+  summary: List resources by resource group and list remote rendering accounts by subscription.
+  description: ''
+  syntax: az remote-rendering-account list [--resource-group]
+  examples:
+  - summary: List remote rendering accounts by resource group
+    syntax: az remote-rendering-account list --resource-group "MyResourceGroup"
+  - summary: List remote rendering accounts by subscription
+    syntax: az remote-rendering-account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_remote-rendering-account_show
+  name: az remote-rendering-account show
+  summary: Retrieve a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account show --name
+                                     --resource-group
+  examples:
+  - summary: Get remote rendering account
+    syntax: az remote-rendering-account show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_remote-rendering-account_update
+  name: az remote-rendering-account update
+  summary: Update a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account update --name
+                                       --resource-group
+                                       [--kind]
+                                       [--location]
+                                       [--sku]
+                                       [--storage-account-name]
+                                       [--tags]
+  examples:
+  - summary: Update remote rendering account
+    syntax: az remote-rendering-account update -n "MyAccount" --tags hero="romeo" heroine="juliet" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_remote-rendering-account_create
+- az_remote-rendering-account_delete
+- az_remote-rendering-account_key
+- az_remote-rendering-account_key_renew
+- az_remote-rendering-account_key_show
+- az_remote-rendering-account_list
+- az_remote-rendering-account_show
+- az_remote-rendering-account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage remote rendering account with mixed reality.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/remote-rendering-account/key.yml b/2018-03-01-hybrid/docs-ref-autogen/remote-rendering-account/key.yml
new file mode 100644
index 0000000000..15b71ebf56
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/remote-rendering-account/key.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_remote-rendering-account_key
+name: az remote-rendering-account key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az remote-rendering-account key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage developer keys of a remote rendering account.
+description: ''
+directCommands:
+- uid: az_remote-rendering-account_key_renew
+  name: az remote-rendering-account key renew
+  summary: Regenerate specified key of a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account key renew --name
+                                          --resource-group
+                                          [--key {primary, secondary}]
+  examples:
+  - summary: Regenerate remote rendering account keys
+    syntax: az remote-rendering-account key renew -n "MyAccount" -k primary --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key -k
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Key to be regenerated.
+    description: ''
+- uid: az_remote-rendering-account_key_show
+  name: az remote-rendering-account key show
+  summary: List both of the 2 keys of a remote rendering account.
+  description: ''
+  syntax: >-
+    az remote-rendering-account key show --name
+                                         --resource-group
+  examples:
+  - summary: List remote rendering account key
+    syntax: az remote-rendering-account key show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_remote-rendering-account_key_renew
+- az_remote-rendering-account_key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage developer keys of a remote rendering account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos.yml b/2018-03-01-hybrid/docs-ref-autogen/repos.yml
index 3a91e6eb5e..250c017d40 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos.yml
@@ -1,28 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos
-  name: az repos
-  summary: Manage Azure Repos.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_repos_create
-  - az_repos_delete
-  - az_repos_list
-  - az_repos_show
-  - az_repos_update
+### YamlMime:AzureCLIGroup
+uid: az_repos
+name: az repos
+summary: Manage Azure Repos.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_repos_create
   name: az repos create
   summary: Create a Git repository in a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos create --name
+                    [--detect {false, true}]
+                    [--open]
+                    [--org]
+                    [--project]
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name for the new repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -31,7 +29,7 @@ items:
     summary: Open the repository page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -43,46 +41,59 @@ items:
   name: az repos delete
   summary: Delete a Git repository in a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos delete --id
+                    [--detect {false, true}]
+                    [--org]
+                    [--project]
+                    [--subscription]
+                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_repos_list
   name: az repos list
   summary: List Git repositories of a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos list [--detect {false, true}]
+                  [--org]
+                  [--project]
+                  [--query-examples]
+                  [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -90,13 +101,20 @@ items:
   name: az repos show
   summary: Get the details of a Git repository.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos show --repository
+                  [--detect {false, true}]
+                  [--open]
+                  [--org]
+                  [--project]
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --repository -r
     summary: Name or ID of the repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -105,11 +123,14 @@ items:
     summary: Open the repository page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -117,13 +138,20 @@ items:
   name: az repos update
   summary: Update the Git repository.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos update --repository
+                    [--default-branch]
+                    [--detect {false, true}]
+                    [--name]
+                    [--org]
+                    [--project]
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --repository -r
     summary: Name or ID of the repository.
     description: ''
+  optionalParameters:
   - name: --default-branch
     summary: "Default branch to be set for the repository. Example: 'refs/heads/live' or 'live'."
     description: ''
@@ -135,7 +163,7 @@ items:
     summary: New name for the repository.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -144,189 +172,67 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_create
-  name: az repos create
-  summary: Create a Git repository in a team project.
-- uid: az_repos_delete
-  name: az repos delete
-  summary: Delete a Git repository in a team project.
-- uid: az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-- uid: az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
-- uid: az_repos_list
-  name: az repos list
-  summary: List Git repositories of a team project.
-- uid: az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-- uid: az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
-- uid: az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-- uid: az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
-- uid: az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-- uid: az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
-- uid: az_repos_show
-  name: az repos show
-  summary: Get the details of a Git repository.
-- uid: az_repos_update
-  name: az repos update
-  summary: Update the Git repository.
+- az_repos_create
+- az_repos_delete
+- az_repos_import
+- az_repos_import_create
+- az_repos_list
+- az_repos_policy
+- az_repos_policy_approver-count
+- az_repos_policy_approver-count_create
+- az_repos_policy_approver-count_update
+- az_repos_policy_build
+- az_repos_policy_build_create
+- az_repos_policy_build_update
+- az_repos_policy_case-enforcement
+- az_repos_policy_case-enforcement_create
+- az_repos_policy_case-enforcement_update
+- az_repos_policy_comment-required
+- az_repos_policy_comment-required_create
+- az_repos_policy_comment-required_update
+- az_repos_policy_create
+- az_repos_policy_delete
+- az_repos_policy_file-size
+- az_repos_policy_file-size_create
+- az_repos_policy_file-size_update
+- az_repos_policy_list
+- az_repos_policy_merge-strategy
+- az_repos_policy_merge-strategy_create
+- az_repos_policy_merge-strategy_update
+- az_repos_policy_required-reviewer
+- az_repos_policy_required-reviewer_create
+- az_repos_policy_required-reviewer_update
+- az_repos_policy_show
+- az_repos_policy_update
+- az_repos_policy_work-item-linking
+- az_repos_policy_work-item-linking_create
+- az_repos_policy_work-item-linking_update
+- az_repos_pr
+- az_repos_pr_checkout
+- az_repos_pr_create
+- az_repos_pr_list
+- az_repos_pr_policy
+- az_repos_pr_policy_list
+- az_repos_pr_policy_queue
+- az_repos_pr_reviewer
+- az_repos_pr_reviewer_add
+- az_repos_pr_reviewer_list
+- az_repos_pr_reviewer_remove
+- az_repos_pr_set-vote
+- az_repos_pr_show
+- az_repos_pr_update
+- az_repos_pr_work-item
+- az_repos_pr_work-item_add
+- az_repos_pr_work-item_list
+- az_repos_pr_work-item_remove
+- az_repos_ref
+- az_repos_ref_create
+- az_repos_ref_delete
+- az_repos_ref_list
+- az_repos_ref_lock
+- az_repos_ref_unlock
+- az_repos_show
+- az_repos_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -342,4 +248,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/import.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/import.yml
index db02953c64..0f76682e34 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/import.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/import.yml
@@ -1,24 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_import
-  name: az repos import
-  summary: Manage Git repositories import.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_import_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_import
+name: az repos import
+summary: Manage Git repositories import.
+description: ''
+directCommands:
 - uid: az_repos_import_create
   name: az repos import create
   summary: Create a git import request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos import create --git-source-url
+                           [--detect {false, true}]
+                           [--git-service-endpoint-id]
+                           [--org]
+                           [--project]
+                           [--repository]
+                           [--requires-authorization]
+                           [--subscription]
+                           [--user-name]
+  requiredParameters:
   - isRequired: true
     name: --git-source-url --git-url
     summary: Url of the source git repository.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -27,7 +32,7 @@ items:
     summary: Service Endpoint for connection to external endpoint.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -38,16 +43,14 @@ items:
   - name: --requires-authorization
     summary: Flag to tell if source git repository is private.
     description: ''
-  - name: --user-name
-    summary: User name in case source git repository is private.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --user-name
+    summary: User name in case source git repository is private.
+    description: ''
 commands:
-- uid: az_repos_import_create
-  name: az repos import create
-  summary: Create a git import request.
+- az_repos_import_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -63,4 +66,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git repositories import.
+metadata:
+  description: Manage Git repositories import.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy.yml
index 97a36edcbb..22eba56aac 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy.yml
@@ -1,34 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy
-  name: az repos policy
-  summary: Manage branch policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_create
-  - az_repos_policy_delete
-  - az_repos_policy_list
-  - az_repos_policy_show
-  - az_repos_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy
+name: az repos policy
+summary: Manage branch policy.
+description: ''
+directCommands:
 - uid: az_repos_policy_create
   name: az repos policy create
   summary: Create a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
+  description: Recommended when creating policies using multiple scopes for a policy. See https://aka.ms/azure-devops-cli-docs-policy-file for more information.
+  syntax: >-
+    az repos policy create --config
+                           [--detect {false, true}]
+                           [--org]
+                           [--project]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --config --policy-configuration
     summary: Local file path for configuration file. Please use / backslash when typing in directory path.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -40,36 +37,48 @@ items:
   name: az repos policy delete
   summary: Delete a policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy delete --id
+                           [--detect {false, true}]
+                           [--org]
+                           [--project]
+                           [--subscription]
+                           [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_repos_policy_list
   name: az repos policy list
   summary: List all policies in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy list [--branch]
+                         [--detect {false, true}]
+                         [--org]
+                         [--project]
+                         [--query-examples]
+                         [--repository-id]
+                         [--subscription]
+  optionalParameters:
   - name: --branch
     summary: 'Branch name to filter results by exact match of branch name. The --repository-id parameter is required to use the branch filter. For example: --branch master.'
     description: ''
@@ -78,11 +87,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository-id
     summary: ID of the repository to filter results by exact match of the repository ID. For example --repository-ID e556f204-53c9-4153-9cd9-ef41a11e3345.
     description: ''
@@ -93,33 +105,47 @@ items:
   name: az repos policy show
   summary: Show policy details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy show --id
+                         [--detect {false, true}]
+                         [--org]
+                         [--project]
+                         [--query-examples]
+                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_repos_policy_update
   name: az repos policy update
   summary: Update a policy using a configuration file.
-  description: Recommended when creating policies using multiple scopes for a policy. See <a href="https://aka.ms/azure-devops-cli-docs-policy-file">https://aka.ms/azure-devops-cli-docs-policy-file</a> for more information.
-  langs:
-  - azurecli
-  parameters:
+  description: Recommended when creating policies using multiple scopes for a policy. See https://aka.ms/azure-devops-cli-docs-policy-file for more information.
+  syntax: >-
+    az repos policy update --config
+                           --id
+                           [--detect {false, true}]
+                           [--org]
+                           [--project]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --config --policy-configuration
     summary: Local file path for configuration file. Please use / backslash when typing in directory path.
@@ -128,12 +154,13 @@ items:
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -142,93 +169,35 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-- uid: az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
-- uid: az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-- uid: az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
-- uid: az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-- uid: az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
-- uid: az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-- uid: az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
-- uid: az_repos_policy_create
-  name: az repos policy create
-  summary: Create a policy using a configuration file.
-- uid: az_repos_policy_delete
-  name: az repos policy delete
-  summary: Delete a policy.
-- uid: az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-- uid: az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
-- uid: az_repos_policy_list
-  name: az repos policy list
-  summary: List all policies in a project.
-- uid: az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-- uid: az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
-- uid: az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-- uid: az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
-- uid: az_repos_policy_show
-  name: az repos policy show
-  summary: Show policy details.
-- uid: az_repos_policy_update
-  name: az repos policy update
-  summary: Update a policy using a configuration file.
-- uid: az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-- uid: az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
+- az_repos_policy_approver-count
+- az_repos_policy_approver-count_create
+- az_repos_policy_approver-count_update
+- az_repos_policy_build
+- az_repos_policy_build_create
+- az_repos_policy_build_update
+- az_repos_policy_case-enforcement
+- az_repos_policy_case-enforcement_create
+- az_repos_policy_case-enforcement_update
+- az_repos_policy_comment-required
+- az_repos_policy_comment-required_create
+- az_repos_policy_comment-required_update
+- az_repos_policy_create
+- az_repos_policy_delete
+- az_repos_policy_file-size
+- az_repos_policy_file-size_create
+- az_repos_policy_file-size_update
+- az_repos_policy_list
+- az_repos_policy_merge-strategy
+- az_repos_policy_merge-strategy_create
+- az_repos_policy_merge-strategy_update
+- az_repos_policy_required-reviewer
+- az_repos_policy_required-reviewer_create
+- az_repos_policy_required-reviewer_update
+- az_repos_policy_show
+- az_repos_policy_update
+- az_repos_policy_work-item-linking
+- az_repos_policy_work-item-linking_create
+- az_repos_policy_work-item-linking_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -244,4 +213,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage branch policy.
+metadata:
+  description: Manage branch policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/approver-count.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/approver-count.yml
index 23e1a5aa71..6f27782c1e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/approver-count.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/approver-count.yml
@@ -1,21 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_approver_count
-  name: az repos policy approver-count
-  summary: Manage approver count policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_approver_count_create
-  - az_repos_policy_approver_count_update
-- uid: az_repos_policy_approver_count_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_approver-count
+name: az repos policy approver-count
+summary: Manage approver count policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_approver-count_create
   name: az repos policy approver-count create
   summary: Create approver count policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy approver-count create --allow-downvotes {false, true}
+                                          --blocking {false, true}
+                                          --branch
+                                          --creator-vote-counts {false, true}
+                                          --enabled {false, true}
+                                          --minimum-approver-count
+                                          --repository-id
+                                          --reset-on-source-push {false, true}
+                                          [--branch-match-type {exact, prefix}]
+                                          [--detect {false, true}]
+                                          [--org]
+                                          [--project]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --allow-downvotes
     parameterValueGroup: false, true
@@ -53,6 +60,7 @@ items:
     parameterValueGroup: false, true
     summary: Whether to reset source on push.
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -63,7 +71,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -71,17 +79,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_approver_count_update
+- uid: az_repos_policy_approver-count_update
   name: az repos policy approver-count update
   summary: Update approver count policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy approver-count update --id
+                                          [--allow-downvotes {false, true}]
+                                          [--blocking {false, true}]
+                                          [--branch]
+                                          [--branch-match-type {exact, prefix}]
+                                          [--creator-vote-counts {false, true}]
+                                          [--detect {false, true}]
+                                          [--enabled {false, true}]
+                                          [--minimum-approver-count]
+                                          [--org]
+                                          [--project]
+                                          [--repository-id]
+                                          [--reset-on-source-push {false, true}]
+                                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --allow-downvotes
     parameterValueGroup: false, true
     summary: Whether to allow downvotes or not.
@@ -113,7 +135,7 @@ items:
     summary: 'Minimum number of approvers required. For example: 2.'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -129,12 +151,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_approver_count_create
-  name: az repos policy approver-count create
-  summary: Create approver count policy.
-- uid: az_repos_policy_approver_count_update
-  name: az repos policy approver-count update
-  summary: Update approver count policy.
+- az_repos_policy_approver-count_create
+- az_repos_policy_approver-count_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -150,4 +168,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage approver count policy.
+metadata:
+  description: Manage approver count policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/build.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/build.yml
index aa66419e88..22a2c238d0 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/build.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/build.yml
@@ -1,21 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_build
-  name: az repos policy build
-  summary: Manage build policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_build_create
-  - az_repos_policy_build_update
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_build
+name: az repos policy build
+summary: Manage build policy.
+description: ''
+directCommands:
 - uid: az_repos_policy_build_create
   name: az repos policy build create
   summary: Create build policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy build create --blocking {false, true}
+                                 --branch
+                                 --build-definition-id
+                                 --display-name
+                                 --enabled {false, true}
+                                 --manual-queue-only {false, true}
+                                 --queue-on-source-update-only {false, true}
+                                 --repository-id
+                                 --valid-duration
+                                 [--branch-match-type {exact, prefix}]
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--path-filter]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -56,6 +65,7 @@ items:
     name: --valid-duration
     summary: Policy validity duration (in minutes).
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -66,7 +76,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -81,13 +91,29 @@ items:
   name: az repos policy build update
   summary: Update build policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy build update --id
+                                 [--blocking {false, true}]
+                                 [--branch]
+                                 [--branch-match-type {exact, prefix}]
+                                 [--build-definition-id]
+                                 [--detect {false, true}]
+                                 [--display-name]
+                                 [--enabled {false, true}]
+                                 [--manual-queue-only {false, true}]
+                                 [--org]
+                                 [--path-filter]
+                                 [--project]
+                                 [--queue-on-source-update-only {false, true}]
+                                 [--repository-id]
+                                 [--subscription]
+                                 [--valid-duration]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -118,7 +144,7 @@ items:
     summary: Whether to allow only manual queue of builds.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -133,19 +159,15 @@ items:
   - name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
-  - name: --valid-duration
-    summary: Policy validity duration (in minutes).
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --valid-duration
+    summary: Policy validity duration (in minutes).
+    description: ''
 commands:
-- uid: az_repos_policy_build_create
-  name: az repos policy build create
-  summary: Create build policy.
-- uid: az_repos_policy_build_update
-  name: az repos policy build update
-  summary: Update build policy.
+- az_repos_policy_build_create
+- az_repos_policy_build_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -161,4 +183,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage build policy.
+metadata:
+  description: Manage build policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/case-enforcement.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/case-enforcement.yml
index 5c7bdcf073..d2f5d64083 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/case-enforcement.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/case-enforcement.yml
@@ -1,21 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_case_enforcement
-  name: az repos policy case-enforcement
-  summary: Manage case enforcement policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_case_enforcement_create
-  - az_repos_policy_case_enforcement_update
-- uid: az_repos_policy_case_enforcement_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_case-enforcement
+name: az repos policy case-enforcement
+summary: Manage case enforcement policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_case-enforcement_create
   name: az repos policy case-enforcement create
   summary: Create case enforcement policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy case-enforcement create --blocking {false, true}
+                                            --enabled {false, true}
+                                            --repository-id
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -30,12 +31,13 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -43,17 +45,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_case_enforcement_update
+- uid: az_repos_policy_case-enforcement_update
   name: az repos policy case-enforcement update
   summary: Update case enforcement policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy case-enforcement update --id
+                                            [--blocking {false, true}]
+                                            [--detect {false, true}]
+                                            [--enabled {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--repository-id]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -67,7 +77,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -79,12 +89,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_case_enforcement_create
-  name: az repos policy case-enforcement create
-  summary: Create case enforcement policy.
-- uid: az_repos_policy_case_enforcement_update
-  name: az repos policy case-enforcement update
-  summary: Update case enforcement policy.
+- az_repos_policy_case-enforcement_create
+- az_repos_policy_case-enforcement_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -100,4 +106,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage case enforcement policy.
+metadata:
+  description: Manage case enforcement policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/comment-required.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/comment-required.yml
index 4c94a046fe..666e866ba1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/comment-required.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/comment-required.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_comment_required
-  name: az repos policy comment-required
-  summary: Manage comment required policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_comment_required_create
-  - az_repos_policy_comment_required_update
-- uid: az_repos_policy_comment_required_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_comment-required
+name: az repos policy comment-required
+summary: Manage comment required policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_comment-required_create
   name: az repos policy comment-required create
   summary: Create comment resolution required policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy comment-required create --blocking {false, true}
+                                            --branch
+                                            --enabled {false, true}
+                                            --repository-id
+                                            [--branch-match-type {exact, prefix}]
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -34,6 +37,7 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -44,7 +48,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,17 +56,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_comment_required_update
+- uid: az_repos_policy_comment-required_update
   name: az repos policy comment-required update
   summary: Update comment resolution required policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy comment-required update --id
+                                            [--blocking {false, true}]
+                                            [--branch]
+                                            [--branch-match-type {exact, prefix}]
+                                            [--detect {false, true}]
+                                            [--enabled {false, true}]
+                                            [--org]
+                                            [--project]
+                                            [--repository-id]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -83,7 +97,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -95,12 +109,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_comment_required_create
-  name: az repos policy comment-required create
-  summary: Create comment resolution required policy.
-- uid: az_repos_policy_comment_required_update
-  name: az repos policy comment-required update
-  summary: Update comment resolution required policy.
+- az_repos_policy_comment-required_create
+- az_repos_policy_comment-required_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,4 +126,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage comment required policy.
+metadata:
+  description: Manage comment required policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/file-size.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/file-size.yml
index 58482060e4..937a501e79 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/file-size.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/file-size.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_file_size
-  name: az repos policy file-size
-  summary: Manage file size policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_file_size_create
-  - az_repos_policy_file_size_update
-- uid: az_repos_policy_file_size_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_file-size
+name: az repos policy file-size
+summary: Manage file size policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_file-size_create
   name: az repos policy file-size create
   summary: Create file size policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy file-size create --blocking {false, true}
+                                     --enabled {false, true}
+                                     --maximum-git-blob-size
+                                     --repository-id
+                                     --use-uncompressed-size {false, true}
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -39,12 +42,13 @@ items:
     parameterValueGroup: false, true
     summary: Whether to use uncompressed size.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,17 +56,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_file_size_update
+- uid: az_repos_policy_file-size_update
   name: az repos policy file-size update
   summary: Update file size policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy file-size update --id
+                                     [--blocking {false, true}]
+                                     [--detect {false, true}]
+                                     [--enabled {false, true}]
+                                     [--maximum-git-blob-size]
+                                     [--org]
+                                     [--project]
+                                     [--repository-id]
+                                     [--subscription]
+                                     [--use-uncompressed-size {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -79,7 +93,7 @@ items:
     summary: Maximum git blob size in bytes. For example, to specify a 10byte limit, --maximum-git-blob-size 10.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -87,20 +101,16 @@ items:
   - name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-uncompressed-size
     parameterValueGroup: false, true
     summary: Whether to use uncompressed size.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_repos_policy_file_size_create
-  name: az repos policy file-size create
-  summary: Create file size policy.
-- uid: az_repos_policy_file_size_update
-  name: az repos policy file-size update
-  summary: Update file size policy.
+- az_repos_policy_file-size_create
+- az_repos_policy_file-size_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,4 +126,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage file size policy.
+metadata:
+  description: Manage file size policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/merge-strategy.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/merge-strategy.yml
index 51c84dbd7d..5e7a1517d9 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/merge-strategy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/merge-strategy.yml
@@ -1,21 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_merge_strategy
-  name: az repos policy merge-strategy
-  summary: Manage merge strategy policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_merge_strategy_create
-  - az_repos_policy_merge_strategy_update
-- uid: az_repos_policy_merge_strategy_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_merge-strategy
+name: az repos policy merge-strategy
+summary: Manage merge strategy policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_merge-strategy_create
   name: az repos policy merge-strategy create
   summary: Create merge strategy policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy merge-strategy create --blocking {false, true}
+                                          --branch
+                                          --enabled {false, true}
+                                          --repository-id
+                                          [--allow-no-fast-forward {false, true}]
+                                          [--allow-rebase {false, true}]
+                                          [--allow-rebase-merge {false, true}]
+                                          [--allow-squash {false, true}]
+                                          [--branch-match-type {exact, prefix}]
+                                          [--detect {false, true}]
+                                          [--org]
+                                          [--project]
+                                          [--subscription]
+                                          [--use-squash-merge {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -34,6 +42,7 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --allow-no-fast-forward
     parameterValueGroup: false, true
     summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
@@ -60,29 +69,44 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-squash-merge
     parameterValueGroup: false, true
     summary: Whether to squash merge always. This option does not work for allowing other merge types.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-- uid: az_repos_policy_merge_strategy_update
+- uid: az_repos_policy_merge-strategy_update
   name: az repos policy merge-strategy update
   summary: Update merge strategy policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy merge-strategy update --id
+                                          [--allow-no-fast-forward {false, true}]
+                                          [--allow-rebase {false, true}]
+                                          [--allow-rebase-merge {false, true}]
+                                          [--allow-squash {false, true}]
+                                          [--blocking {false, true}]
+                                          [--branch]
+                                          [--branch-match-type {exact, prefix}]
+                                          [--detect {false, true}]
+                                          [--enabled {false, true}]
+                                          [--org]
+                                          [--project]
+                                          [--repository-id]
+                                          [--subscription]
+                                          [--use-squash-merge {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --allow-no-fast-forward
     parameterValueGroup: false, true
     summary: Basic merge (no fast-forward) - Preserves nonlinear history exactly as it happened during development.
@@ -119,7 +143,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -127,20 +151,16 @@ items:
   - name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-squash-merge
     parameterValueGroup: false, true
     summary: Whether to squash merge always. This option does not work for allowing other merge types.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_repos_policy_merge_strategy_create
-  name: az repos policy merge-strategy create
-  summary: Create merge strategy policy.
-- uid: az_repos_policy_merge_strategy_update
-  name: az repos policy merge-strategy update
-  summary: Update merge strategy policy.
+- az_repos_policy_merge-strategy_create
+- az_repos_policy_merge-strategy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -156,4 +176,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage merge strategy policy.
+metadata:
+  description: Manage merge strategy policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/required-reviewer.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/required-reviewer.yml
index a4801b04f0..16cf941448 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/required-reviewer.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/required-reviewer.yml
@@ -1,21 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_required_reviewer
-  name: az repos policy required-reviewer
-  summary: Manage required reviewer policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_required_reviewer_create
-  - az_repos_policy_required_reviewer_update
-- uid: az_repos_policy_required_reviewer_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_required-reviewer
+name: az repos policy required-reviewer
+summary: Manage required reviewer policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_required-reviewer_create
   name: az repos policy required-reviewer create
   summary: Create required reviewer policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy required-reviewer create --blocking {false, true}
+                                             --branch
+                                             --enabled {false, true}
+                                             --message
+                                             --repository-id
+                                             --required-reviewer-ids
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--path-filter]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -42,6 +48,7 @@ items:
     name: --required-reviewer-ids
     summary: "Required reviewers email addresses separated by ';'. For example: john@contoso.com;alice@contoso.com."
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -52,7 +59,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -63,17 +70,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_required_reviewer_update
+- uid: az_repos_policy_required-reviewer_update
   name: az repos policy required-reviewer update
   summary: Update required reviewer policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy required-reviewer update --id
+                                             [--blocking {false, true}]
+                                             [--branch]
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--enabled {false, true}]
+                                             [--message]
+                                             [--org]
+                                             [--path-filter]
+                                             [--project]
+                                             [--repository-id]
+                                             [--required-reviewer-ids]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -97,7 +117,7 @@ items:
     summary: Message.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path-filter
     summary: "Filter path(s) on which the policy is applied. Supports absolute paths, wildcards and multiple paths separated by ';'. Example: /WebApp/Models/Data.cs, /WebApp/\\* or \\*.cs,/WebApp/Models/Data.cs;ClientApp/Models/Data.cs."
@@ -115,12 +135,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_required_reviewer_create
-  name: az repos policy required-reviewer create
-  summary: Create required reviewer policy.
-- uid: az_repos_policy_required_reviewer_update
-  name: az repos policy required-reviewer update
-  summary: Update required reviewer policy.
+- az_repos_policy_required-reviewer_create
+- az_repos_policy_required-reviewer_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -136,4 +152,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage required reviewer policy.
+metadata:
+  description: Manage required reviewer policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/work-item-linking.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/work-item-linking.yml
index d58ba18449..1de60f3b07 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/policy/work-item-linking.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/policy/work-item-linking.yml
@@ -1,21 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_policy_work_item_linking
-  name: az repos policy work-item-linking
-  summary: Manage work item linking policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_policy_work_item_linking_create
-  - az_repos_policy_work_item_linking_update
-- uid: az_repos_policy_work_item_linking_create
+### YamlMime:AzureCLIGroup
+uid: az_repos_policy_work-item-linking
+name: az repos policy work-item-linking
+summary: Manage work item linking policy.
+description: ''
+directCommands:
+- uid: az_repos_policy_work-item-linking_create
   name: az repos policy work-item-linking create
   summary: Create work item linking policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy work-item-linking create --blocking {false, true}
+                                             --branch
+                                             --enabled {false, true}
+                                             --repository-id
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --blocking
     parameterValueGroup: false, true
@@ -34,6 +37,7 @@ items:
     name: --repository-id
     summary: Id of the repository on which to apply the policy.
     description: ''
+  optionalParameters:
   - name: --branch-match-type
     defaultValue: exact
     parameterValueGroup: exact, prefix
@@ -44,7 +48,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,17 +56,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_policy_work_item_linking_update
+- uid: az_repos_policy_work-item-linking_update
   name: az repos policy work-item-linking update
   summary: Update work item linking policy.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos policy work-item-linking update --id
+                                             [--blocking {false, true}]
+                                             [--branch]
+                                             [--branch-match-type {exact, prefix}]
+                                             [--detect {false, true}]
+                                             [--enabled {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--repository-id]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --policy-id
     summary: ID of the policy.
     description: ''
+  optionalParameters:
   - name: --blocking
     parameterValueGroup: false, true
     summary: Whether the policy should be blocking or not.
@@ -83,7 +97,7 @@ items:
     summary: Whether the policy is enabled or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -95,12 +109,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_policy_work_item_linking_create
-  name: az repos policy work-item-linking create
-  summary: Create work item linking policy.
-- uid: az_repos_policy_work_item_linking_update
-  name: az repos policy work-item-linking update
-  summary: Update work item linking policy.
+- az_repos_policy_work-item-linking_create
+- az_repos_policy_work-item-linking_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,4 +126,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item linking policy.
+metadata:
+  description: Manage work item linking policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/pr.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/pr.yml
index 0e1442cefc..d6f09199d1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/pr.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/pr.yml
@@ -1,29 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr
-  name: az repos pr
-  summary: Manage pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_checkout
-  - az_repos_pr_create
-  - az_repos_pr_list
-  - az_repos_pr_set_vote
-  - az_repos_pr_show
-  - az_repos_pr_update
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr
+name: az repos pr
+summary: Manage pull requests.
+description: ''
+directCommands:
 - uid: az_repos_pr_checkout
   name: az repos pr checkout
   summary: Checkout the PR source branch locally, if no local changes are present.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr checkout --id
+                         [--remote-name]
+                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --remote-name
     defaultValue: origin
     summary: Name of git remote against which PR is raised.
@@ -35,9 +29,28 @@ items:
   name: az repos pr create
   summary: Create a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr create [--auto-complete {false, true}]
+                       [--bypass-policy {false, true}]
+                       [--bypass-policy-reason]
+                       [--delete-source-branch {false, true}]
+                       [--description]
+                       [--detect {false, true}]
+                       [--draft {false, true}]
+                       [--merge-commit-message]
+                       [--open]
+                       [--org]
+                       [--project]
+                       [--repository]
+                       [--reviewers]
+                       [--source-branch]
+                       [--squash {false, true}]
+                       [--subscription]
+                       [--target-branch]
+                       [--title]
+                       [--transition-work-items {false, true}]
+                       [--work-items]
+  optionalParameters:
   - name: --auto-complete
     parameterValueGroup: false, true
     summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
@@ -71,7 +84,7 @@ items:
     summary: Open the pull request in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -89,6 +102,9 @@ items:
     parameterValueGroup: false, true
     summary: Squash the commits in the source branch when merging into the target branch.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target-branch -t
     summary: Name of the target branch. If not specified, defaults to the default branch of the target repository.
     description: ''
@@ -102,16 +118,26 @@ items:
   - name: --work-items
     summary: IDs of the work items to link to the new pull request. Space separated.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_repos_pr_list
   name: az repos pr list
   summary: List pull requests.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr list [--creator]
+                     [--detect {false, true}]
+                     [--include-links]
+                     [--org]
+                     [--project]
+                     [--query-examples]
+                     [--repository]
+                     [--reviewer]
+                     [--skip]
+                     [--source-branch]
+                     [--status {abandoned, active, all, completed}]
+                     [--subscription]
+                     [--target-branch]
+                     [--top]
+  optionalParameters:
   - name: --creator
     summary: Limit results to pull requests created by this user.
     description: ''
@@ -123,11 +149,14 @@ items:
     summary: Include _links for each pull request.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository -r
     summary: Name or ID of the repository.
     description: ''
@@ -144,22 +173,26 @@ items:
     parameterValueGroup: abandoned, active, all, completed
     summary: Limit results to pull requests with this status.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --target-branch -t
     summary: Limit results to pull requests that target this branch.
     description: ''
   - name: --top
     summary: Maximum number of pull requests to list.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-- uid: az_repos_pr_set_vote
+- uid: az_repos_pr_set-vote
   name: az repos pr set-vote
   summary: Vote on a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr set-vote --id
+                         --vote {approve, approve-with-suggestions, reject, reset, wait-for-author}
+                         [--detect {false, true}]
+                         [--org]
+                         [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -169,12 +202,13 @@ items:
     parameterValueGroup: approve, approve-with-suggestions, reject, reset, wait-for-author
     summary: New vote value for the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -183,13 +217,19 @@ items:
   name: az repos pr show
   summary: Get the details of a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr show --id
+                     [--detect {false, true}]
+                     [--open]
+                     [--org]
+                     [--query-examples]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -198,7 +238,10 @@ items:
     summary: Open the pull request in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -207,13 +250,28 @@ items:
   name: az repos pr update
   summary: Update a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr update --id
+                       [--auto-complete {false, true}]
+                       [--bypass-policy {false, true}]
+                       [--bypass-policy-reason]
+                       [--delete-source-branch {false, true}]
+                       [--description]
+                       [--detect {false, true}]
+                       [--draft {false, true}]
+                       [--merge-commit-message]
+                       [--org]
+                       [--squash {false, true}]
+                       [--status {abandoned, active, completed}]
+                       [--subscription]
+                       [--title]
+                       [--transition-work-items {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --auto-complete
     parameterValueGroup: false, true
     summary: Set the pull request to complete automatically when all policies have passed and the source branch can be merged into the target branch.
@@ -244,7 +302,7 @@ items:
     summary: Message displayed when commits are merged.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --squash
     parameterValueGroup: false, true
@@ -254,6 +312,9 @@ items:
     parameterValueGroup: abandoned, active, completed
     summary: Set the new state of pull request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --title
     summary: New title for the pull request.
     description: ''
@@ -261,61 +322,24 @@ items:
     parameterValueGroup: false, true
     summary: Transition any work items linked to the pull request into the next logical state. (e.g. Active -> Resolved).
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_repos_pr_checkout
-  name: az repos pr checkout
-  summary: Checkout the PR source branch locally, if no local changes are present.
-- uid: az_repos_pr_create
-  name: az repos pr create
-  summary: Create a pull request.
-- uid: az_repos_pr_list
-  name: az repos pr list
-  summary: List pull requests.
-- uid: az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-- uid: az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
-- uid: az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-- uid: az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
-- uid: az_repos_pr_set_vote
-  name: az repos pr set-vote
-  summary: Vote on a pull request.
-- uid: az_repos_pr_show
-  name: az repos pr show
-  summary: Get the details of a pull request.
-- uid: az_repos_pr_update
-  name: az repos pr update
-  summary: Update a pull request.
-- uid: az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-- uid: az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
+- az_repos_pr_checkout
+- az_repos_pr_create
+- az_repos_pr_list
+- az_repos_pr_policy
+- az_repos_pr_policy_list
+- az_repos_pr_policy_queue
+- az_repos_pr_reviewer
+- az_repos_pr_reviewer_add
+- az_repos_pr_reviewer_list
+- az_repos_pr_reviewer_remove
+- az_repos_pr_set-vote
+- az_repos_pr_show
+- az_repos_pr_update
+- az_repos_pr_work-item
+- az_repos_pr_work-item_add
+- az_repos_pr_work-item_list
+- az_repos_pr_work-item_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -331,4 +355,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull requests.
+metadata:
+  description: Manage pull requests.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/pr/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/pr/policy.yml
index e3a3307bd3..ec4d200093 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/pr/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/pr/policy.yml
@@ -1,48 +1,57 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr_policy
-  name: az repos pr policy
-  summary: Manage pull request policy.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_policy_list
-  - az_repos_pr_policy_queue
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr_policy
+name: az repos pr policy
+summary: Manage pull request policy.
+description: ''
+directCommands:
 - uid: az_repos_pr_policy_list
   name: az repos pr policy list
   summary: List policies of a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr policy list --id
+                            [--detect {false, true}]
+                            [--org]
+                            [--query-examples]
+                            [--skip]
+                            [--subscription]
+                            [--top]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: Number of policies to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of policies to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of policies to list.
+    description: ''
 - uid: az_repos_pr_policy_queue
   name: az repos pr policy queue
   summary: Queue an evaluation of a policy for a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr policy queue --evaluation-id
+                             --id
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --evaluation-id -e
     summary: ID of the policy evaluation to queue.
@@ -51,23 +60,20 @@ items:
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_pr_policy_list
-  name: az repos pr policy list
-  summary: List policies of a pull request.
-- uid: az_repos_pr_policy_queue
-  name: az repos pr policy queue
-  summary: Queue an evaluation of a policy for a pull request.
+- az_repos_pr_policy_list
+- az_repos_pr_policy_queue
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -83,4 +89,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request policy.
+metadata:
+  description: Manage pull request policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/pr/reviewer.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/pr/reviewer.yml
index 9d22a65707..582499e289 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/pr/reviewer.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/pr/reviewer.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr_reviewer
-  name: az repos pr reviewer
-  summary: Manage pull request reviewers.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_reviewer_add
-  - az_repos_pr_reviewer_list
-  - az_repos_pr_reviewer_remove
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr_reviewer
+name: az repos pr reviewer
+summary: Manage pull request reviewers.
+description: ''
+directCommands:
 - uid: az_repos_pr_reviewer_add
   name: az repos pr reviewer add
   summary: Add one or more reviewers to a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr reviewer add --id
+                             --reviewers
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -25,12 +23,13 @@ items:
     name: --reviewers
     summary: Users or groups to include as reviewers on a pull request. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -39,19 +38,27 @@ items:
   name: az repos pr reviewer list
   summary: List reviewers of a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr reviewer list --id
+                              [--detect {false, true}]
+                              [--org]
+                              [--query-examples]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -60,9 +67,13 @@ items:
   name: az repos pr reviewer remove
   summary: Remove one or more reviewers from a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr reviewer remove --id
+                                --reviewers
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -71,26 +82,21 @@ items:
     name: --reviewers
     summary: Users or groups to remove as reviewers on a pull request. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_pr_reviewer_add
-  name: az repos pr reviewer add
-  summary: Add one or more reviewers to a pull request.
-- uid: az_repos_pr_reviewer_list
-  name: az repos pr reviewer list
-  summary: List reviewers of a pull request.
-- uid: az_repos_pr_reviewer_remove
-  name: az repos pr reviewer remove
-  summary: Remove one or more reviewers from a pull request.
+- az_repos_pr_reviewer_add
+- az_repos_pr_reviewer_list
+- az_repos_pr_reviewer_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,4 +112,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage pull request reviewers.
+metadata:
+  description: Manage pull request reviewers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/pr/work-item.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/pr/work-item.yml
index 52af9b7aee..69b23242d8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/pr/work-item.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/pr/work-item.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_pr_work_item
-  name: az repos pr work-item
-  summary: Manage work items associated with pull requests.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_pr_work_item_add
-  - az_repos_pr_work_item_list
-  - az_repos_pr_work_item_remove
-- uid: az_repos_pr_work_item_add
+### YamlMime:AzureCLIGroup
+uid: az_repos_pr_work-item
+name: az repos pr work-item
+summary: Manage work items associated with pull requests.
+description: ''
+directCommands:
+- uid: az_repos_pr_work-item_add
   name: az repos pr work-item add
   summary: Link one or more work items to a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr work-item add --id
+                              --work-items
+                              [--detect {false, true}]
+                              [--org]
+                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -25,44 +23,57 @@ items:
     name: --work-items
     summary: IDs of the work items to link. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_pr_work_item_list
+- uid: az_repos_pr_work-item_list
   name: az repos pr work-item list
   summary: List linked work items for a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr work-item list --id
+                               [--detect {false, true}]
+                               [--org]
+                               [--query-examples]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_repos_pr_work_item_remove
+- uid: az_repos_pr_work-item_remove
   name: az repos pr work-item remove
   summary: Unlink one or more work items from a pull request.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos pr work-item remove --id
+                                 --work-items
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the pull request.
@@ -71,26 +82,21 @@ items:
     name: --work-items
     summary: IDs of the work items to unlink. Space separated.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_pr_work_item_add
-  name: az repos pr work-item add
-  summary: Link one or more work items to a pull request.
-- uid: az_repos_pr_work_item_list
-  name: az repos pr work-item list
-  summary: List linked work items for a pull request.
-- uid: az_repos_pr_work_item_remove
-  name: az repos pr work-item remove
-  summary: Unlink one or more work items from a pull request.
+- az_repos_pr_work-item_add
+- az_repos_pr_work-item_list
+- az_repos_pr_work-item_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,4 +112,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items associated with pull requests.
+metadata:
+  description: Manage work items associated with pull requests.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/repos/ref.yml b/2018-03-01-hybrid/docs-ref-autogen/repos/ref.yml
index a79e64ce8e..270b227c4e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/repos/ref.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/repos/ref.yml
@@ -1,24 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_repos_ref
-  name: az repos ref
-  summary: Manage Git references.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_repos_ref_create
-  - az_repos_ref_delete
-  - az_repos_ref_list
-  - az_repos_ref_lock
-  - az_repos_ref_unlock
+### YamlMime:AzureCLIGroup
+uid: az_repos_ref
+name: az repos ref
+summary: Manage Git references.
+description: ''
+directCommands:
 - uid: az_repos_ref_create
   name: az repos ref create
   summary: Create a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref create --name
+                        --object-id
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--repository]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to create (example: heads/my_branch or tags/my_tag).'
@@ -27,12 +25,13 @@ items:
     name: --object-id
     summary: Id of the object to create the reference from.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,9 +46,15 @@ items:
   name: az repos ref delete
   summary: Delete a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref delete --name
+                        --object-id
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--repository]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to delete (example: heads/my_branch).'
@@ -58,12 +63,13 @@ items:
     name: --object-id
     summary: Id of the reference to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -78,9 +84,15 @@ items:
   name: az repos ref list
   summary: List the references.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref list [--detect {false, true}]
+                      [--filter]
+                      [--org]
+                      [--project]
+                      [--query-examples]
+                      [--repository]
+                      [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -89,11 +101,14 @@ items:
     summary: 'A filter to apply to the refs (starts with). Example: head or heads/ for the branches.'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --repository -r
     summary: Name or ID of the repository.
     description: ''
@@ -104,19 +119,25 @@ items:
   name: az repos ref lock
   summary: Lock a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref lock --name
+                      [--detect {false, true}]
+                      [--org]
+                      [--project]
+                      [--repository]
+                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to update (example: heads/my_branch).'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -131,19 +152,25 @@ items:
   name: az repos ref unlock
   summary: Unlock a reference.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az repos ref unlock --name
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--repository]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: 'Name of the reference to update (example: heads/my_branch).'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -155,21 +182,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_repos_ref_create
-  name: az repos ref create
-  summary: Create a reference.
-- uid: az_repos_ref_delete
-  name: az repos ref delete
-  summary: Delete a reference.
-- uid: az_repos_ref_list
-  name: az repos ref list
-  summary: List the references.
-- uid: az_repos_ref_lock
-  name: az repos ref lock
-  summary: Lock a reference.
-- uid: az_repos_ref_unlock
-  name: az repos ref unlock
-  summary: Unlock a reference.
+- az_repos_ref_create
+- az_repos_ref_delete
+- az_repos_ref_list
+- az_repos_ref_lock
+- az_repos_ref_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -185,4 +202,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Git references.
+metadata:
+  description: Manage Git references.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/resource-mover.yml b/2018-03-01-hybrid/docs-ref-autogen/resource-mover.yml
new file mode 100644
index 0000000000..e4d4f110b1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/resource-mover.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_resource-mover
+name: az resource-mover
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-mover** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az resource-mover** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Move resources in Azure.
+description: ''
+commands:
+- az_resource-mover_move-collection
+- az_resource-mover_move-collection_bulk-remove
+- az_resource-mover_move-collection_commit
+- az_resource-mover_move-collection_create
+- az_resource-mover_move-collection_delete
+- az_resource-mover_move-collection_discard
+- az_resource-mover_move-collection_initiate-move
+- az_resource-mover_move-collection_list
+- az_resource-mover_move-collection_list-required-for
+- az_resource-mover_move-collection_list-unresolved-dependency
+- az_resource-mover_move-collection_prepare
+- az_resource-mover_move-collection_resolve-dependency
+- az_resource-mover_move-collection_show
+- az_resource-mover_move-collection_update
+- az_resource-mover_move-collection_wait
+- az_resource-mover_move-resource
+- az_resource-mover_move-resource_add
+- az_resource-mover_move-resource_delete
+- az_resource-mover_move-resource_list
+- az_resource-mover_move-resource_show
+- az_resource-mover_move-resource_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Move resources in Azure.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/resource-mover/move-collection.yml b/2018-03-01-hybrid/docs-ref-autogen/resource-mover/move-collection.yml
new file mode 100644
index 0000000000..9cb1238525
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/resource-mover/move-collection.yml
@@ -0,0 +1,502 @@
+### YamlMime:AzureCLIGroup
+uid: az_resource-mover_move-collection
+name: az resource-mover move-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-mover** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az resource-mover move-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage move-collection.
+description: ''
+directCommands:
+- uid: az_resource-mover_move-collection_bulk-remove
+  name: az resource-mover move-collection bulk-remove
+  summary: Remove the set of move-resources from move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection bulk-remove --move-collection-name
+                                                  --resource-group
+                                                  [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                                  [--move-resources]
+                                                  [--no-wait]
+                                                  [--validate-only {false, true}]
+  examples:
+  - summary: Remove a move-resource in a move-collection.
+    syntax: az resource-mover move-collection bulk-remove --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: Name of the move-collection.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_commit
+  name: az resource-mover move-collection commit
+  summary: Commit the set of resources. The commit operation is triggered on the move-resources in the move-state 'CommitPending' or 'CommitFailed', on a successful completion the move-resource's move-state do a transition to Committed.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection commit --move-collection-name
+                                             --resource-group
+                                             [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                             [--move-resources]
+                                             [--no-wait]
+                                             [--validate-only {false, true}]
+  examples:
+  - summary: Commit a move-resource.
+    syntax: az resource-mover move-collection commit --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_create
+  name: az resource-mover move-collection create
+  summary: Create a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection create --move-collection-name
+                                             --resource-group
+                                             [--identity]
+                                             [--location]
+                                             [--source-region]
+                                             [--tags]
+                                             [--target-region]
+  examples:
+  - summary: Create a move-collection with system assigned identity.
+    syntax: az resource-mover move-collection create --identity type=SystemAssigned --location eastus2 --source-region eastus --target-region westus --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    summary: Define the MSI properties of the move-collection.
+    description: >-
+      Usage: --identity type=XX principal-id=XX tenant-id=XX
+
+
+      type: The type of identity used for the resource mover service.
+
+      principal-id: The principal id.
+
+      tenant-id: The tenant id.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --source-region
+    summary: The source region.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --target-region
+    summary: The target region.
+    description: ''
+- uid: az_resource-mover_move-collection_delete
+  name: az resource-mover move-collection delete
+  summary: Delete a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection delete --move-collection-name
+                                             --resource-group
+                                             [--no-wait]
+                                             [--yes]
+  examples:
+  - summary: Delete a move-collection.
+    syntax: az resource-mover move-collection delete --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_resource-mover_move-collection_discard
+  name: az resource-mover move-collection discard
+  summary: Discard the set of resources. The discard operation is triggered on the move-resources in the move-state 'CommitPending' or 'DiscardFailed', on a successful completion the move-resource's move-state do a transition to MovePending.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection discard --move-collection-name
+                                              --resource-group
+                                              [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                              [--move-resources]
+                                              [--no-wait]
+                                              [--validate-only {false, true}]
+  examples:
+  - summary: Discard a remove-resource.
+    syntax: az resource-mover move-collection discard --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_initiate-move
+  name: az resource-mover move-collection initiate-move
+  summary: Move the set of resources. The move operation is triggered after the move-resources are in the move-state 'MovePending' or 'MoveFailed', on a successful completion the move-resource's move-state do a transition to CommitPending.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection initiate-move --move-collection-name
+                                                    --resource-group
+                                                    [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                                    [--move-resources]
+                                                    [--no-wait]
+                                                    [--validate-only {false, true}]
+  examples:
+  - summary: Move the set of resources.
+    syntax: az resource-mover move-collection initiate-move --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_list
+  name: az resource-mover move-collection list
+  summary: List details of the move-collections.
+  description: ''
+  syntax: az resource-mover move-collection list [--resource-group]
+  examples:
+  - summary: List all move-collections.
+    syntax: az resource-mover move-collection list
+  - summary: List all move-collections by resource group.
+    syntax: az resource-mover move-collection list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-collection_list-required-for
+  name: az resource-mover move-collection list-required-for
+  summary: List the move-resources for which an arm resource is required for.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection list-required-for --move-collection-name
+                                                        --resource-group
+                                                        --source-id
+  examples:
+  - summary: List the move-resources for which an arm resource is required for.
+    syntax: az resource-mover move-collection list-required-for --name MyMoveCollection --resource-group MyResourceGroup --source-id "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/nic1"
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The Move Collection Name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source-id
+    summary: The sourceId for which the api is invoked.
+    description: ''
+- uid: az_resource-mover_move-collection_list-unresolved-dependency
+  name: az resource-mover move-collection list-unresolved-dependency
+  summary: List the details of the unresolved dependencies in a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection list-unresolved-dependency --move-collection-name
+                                                                 --resource-group
+                                                                 [--dependency-level {Descendant, Direct}]
+  examples:
+  - summary: List the unresolved dependencies.
+    syntax: az resource-mover move-collection list-unresolved-dependency --move-collection-name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dependency-level
+    parameterValueGroup: Descendant, Direct
+    summary: The dependency level.
+    description: ''
+- uid: az_resource-mover_move-collection_prepare
+  name: az resource-mover move-collection prepare
+  summary: Prepare the set of resources. The prepare operation is on the move-resources that are in the move-state 'PreparePending' or 'PrepareFailed', on a successful completion the move-resource's move-state do a transition to MovePending.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection prepare --move-collection-name
+                                              --resource-group
+                                              [--input-type {MoveResourceId, MoveResourceSourceId}]
+                                              [--move-resources]
+                                              [--no-wait]
+                                              [--validate-only {false, true}]
+  examples:
+  - summary: Prepare a move-resource.
+    syntax: az resource-mover move-collection prepare --move-resources "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Migrate/MoveCollections/movecollection1/MoveResources/moveresource1" --validate-only false --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --input-type
+    parameterValueGroup: MoveResourceId, MoveResourceSourceId
+    summary: Define the input type of --move-resources.
+    description: ''
+  - name: --move-resources
+    summary: The list of resource Id's, by default it accepts move-resource id's unless the input type is switched via --input-type.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --validate-only
+    parameterValueGroup: false, true
+    summary: Indicate whether the operation needs to only run pre-requisite.
+    description: ''
+- uid: az_resource-mover_move-collection_resolve-dependency
+  name: az resource-mover move-collection resolve-dependency
+  summary: Compute, resolve and validate the dependencies of the move-resources in the move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection resolve-dependency --move-collection-name
+                                                         --resource-group
+                                                         [--no-wait]
+  examples:
+  - summary: Resolve the dependency of the move-resources.
+    syntax: az resource-mover move-collection resolve-dependency --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_resource-mover_move-collection_show
+  name: az resource-mover move-collection show
+  summary: Get the details of a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection show --move-collection-name
+                                           --resource-group
+  examples:
+  - summary: Show information about a move-collection.
+    syntax: az resource-mover move-collection show --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-collection_update
+  name: az resource-mover move-collection update
+  summary: Update a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection update --move-collection-name
+                                             --resource-group
+                                             [--identity]
+                                             [--tags]
+  examples:
+  - summary: Update a move-collection.
+    syntax: az resource-mover move-collection update --identity type=SystemAssigned --tags key1=value1 --name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --identity
+    summary: Define the MSI properties of the move-collection.
+    description: >-
+      Usage: --identity type=XX principal-id=XX tenant-id=XX
+
+
+      type: The type of identity used for the resource mover service.
+
+      principal-id: The principal id.
+
+      tenant-id: The tenant id.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_resource-mover_move-collection_wait
+  name: az resource-mover move-collection wait
+  summary: Place the CLI in a waiting state until a condition of the move-collection is met.
+  description: ''
+  syntax: >-
+    az resource-mover move-collection wait --move-collection-name
+                                           --resource-group
+                                           [--created]
+                                           [--custom]
+                                           [--deleted]
+                                           [--exists]
+                                           [--interval]
+                                           [--timeout]
+                                           [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the move-collection is successfully deleted.
+    syntax: az resource-mover move-collection wait --name MyMoveCollection --resource-group MyResourceGroup --deleted
+  - summary: Pause executing next line of CLI script until the move-collection is successfully created.
+    syntax: az resource-mover move-collection wait --name MyMoveCollection --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name --name -n
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_resource-mover_move-collection_bulk-remove
+- az_resource-mover_move-collection_commit
+- az_resource-mover_move-collection_create
+- az_resource-mover_move-collection_delete
+- az_resource-mover_move-collection_discard
+- az_resource-mover_move-collection_initiate-move
+- az_resource-mover_move-collection_list
+- az_resource-mover_move-collection_list-required-for
+- az_resource-mover_move-collection_list-unresolved-dependency
+- az_resource-mover_move-collection_prepare
+- az_resource-mover_move-collection_resolve-dependency
+- az_resource-mover_move-collection_show
+- az_resource-mover_move-collection_update
+- az_resource-mover_move-collection_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage move-collection.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/resource-mover/move-resource.yml b/2018-03-01-hybrid/docs-ref-autogen/resource-mover/move-resource.yml
new file mode 100644
index 0000000000..1ae0264b3e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/resource-mover/move-resource.yml
@@ -0,0 +1,250 @@
+### YamlMime:AzureCLIGroup
+uid: az_resource-mover_move-resource
+name: az resource-mover move-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **resource-mover** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az resource-mover move-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage move-resource.
+description: ''
+directCommands:
+- uid: az_resource-mover_move-resource_add
+  name: az resource-mover move-resource add
+  summary: Create or update a move-resource to the move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource add --move-collection-name
+                                        --move-resource-name
+                                        --resource-group
+                                        [--depends-on-overrides]
+                                        [--existing-target-id]
+                                        [--no-wait]
+                                        [--resource-settings]
+                                        [--source-id]
+  examples:
+  - summary: Add a vNet as a move-resource to the move-collection.
+    syntax: >-
+      az resource-mover move-resource add --resource-group MyResourceGroup --move-collection-name MyMoveCollection --name MoveResourceName
+
+      --source-id "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/MyVNet"
+
+      --resource-settings '{
+          "resourceType": "Microsoft.Network/virtualNetworks",
+          "targetResourceName": "MyVNet-target"
+      }'
+  - summary: Add a vNet as a move-resource to the move-collection.
+    syntax: >-
+      az resource-mover move-resource add --resource-group MyResourceGroup --move-collection-name MyMoveCollection --name MoveResourceName
+
+      --source-id "/subscriptions/subID/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/MyVNet"
+
+      --resource-settings @resource-settings.json
+  - summary: Add a VM as a move-resource to the move-collection.
+    syntax: >-
+      az resource-mover move-resource add --resource-group MyResourceGroup --move-collection-name MyMoveCollection --name MoveResourceName
+
+      --source-id "/subscriptions/subID/resourceGroups/eastusRG/providers/Microsoft.Compute/virtualMachines/MyVM"
+
+      --depends-on-overrides id="/subscriptions/subID/resourceGroups/eastusRG/providers/Microsoft.Network/networkInterfaces/MyNIC" target-id="/subscriptions/subID/resourceGroups/westusRG/providers/Microsoft.Network/networkInterfaces/MyNIC"
+
+      --resource-settings '{
+          "resourceType": "Microsoft.Compute/virtualMachines",
+          "targetAvailabilitySetId": "/subscriptions/subID/resourceGroups/eastusRG/providers/Microsoft.Compute/availabilitySets/MyAVSet",
+          "targetAvailabilityZone": "2",
+          "targetResourceName": "MyVM-target",
+          "targetVmSize": null
+      }'
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --depends-on-overrides
+    summary: The move-resource dependencies overrides.
+    description: >-
+      Usage: --depends-on-overrides id=XX target-id=XX
+
+
+      id: The ARM ID of the dependent resource.
+
+      target-id: The resource ARM ID of either the move-resource or the resource ARM ID of the dependent resource.
+
+
+      Multiple actions can be specified by using more than one --depends-on-overrides argument.
+  - name: --existing-target-id
+    summary: The existing target ARM Id of the resource.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-settings
+    summary: 'The resource settings. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --source-id
+    summary: The Source ARM Id of the resource.
+    description: ''
+- uid: az_resource-mover_move-resource_delete
+  name: az resource-mover move-resource delete
+  summary: Delete a move-resource from the move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource delete --move-collection-name
+                                           --move-resource-name
+                                           --resource-group
+                                           [--no-wait]
+                                           [--yes]
+  examples:
+  - summary: Delete a move-resource from the move-collection.
+    syntax: az resource-mover move-resource delete --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_resource-mover_move-resource_list
+  name: az resource-mover move-resource list
+  summary: List the move-resources in a move-collection.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource list --move-collection-name
+                                         --resource-group
+  examples:
+  - summary: List the move-resources in a move-collection.
+    syntax: az resource-mover move-resource list --move-collection-name MyMoveCollection --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-resource_show
+  name: az resource-mover move-resource show
+  summary: Get the details of a move-resource.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource show --move-collection-name
+                                         --move-resource-name
+                                         --resource-group
+  examples:
+  - summary: Get the details of a move-resource.
+    syntax: az resource-mover move-resource show --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_resource-mover_move-resource_wait
+  name: az resource-mover move-resource wait
+  summary: Place the CLI in a waiting state until a condition of the move-resource is met.
+  description: ''
+  syntax: >-
+    az resource-mover move-resource wait --move-collection-name
+                                         --move-resource-name
+                                         --resource-group
+                                         [--created]
+                                         [--custom]
+                                         [--deleted]
+                                         [--exists]
+                                         [--interval]
+                                         [--timeout]
+                                         [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the move-resource is successfully created.
+    syntax: az resource-mover move-resource wait --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup --created
+  - summary: Pause executing next line of CLI script until the move-resource is successfully deleted.
+    syntax: az resource-mover move-resource wait --move-collection-name MyMoveCollection --name MyMoveResource --resource-group MyResourceGroup --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --move-collection-name
+    summary: The move-collection name.
+    description: ''
+  - isRequired: true
+    name: --move-resource-name --name -n
+    summary: The move-resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_resource-mover_move-resource_add
+- az_resource-mover_move-resource_delete
+- az_resource-mover_move-resource_list
+- az_resource-mover_move-resource_show
+- az_resource-mover_move-resource_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage move-resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/resource.yml b/2018-03-01-hybrid/docs-ref-autogen/resource.yml
index 9487c8b3c8..cf634653fd 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/resource.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/resource.yml
@@ -1,61 +1,63 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_resource
-  name: az resource
-  summary: Manage Azure resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_resource_create
-  - az_resource_delete
-  - az_resource_invoke_action
-  - az_resource_list
-  - az_resource_move
-  - az_resource_show
-  - az_resource_tag
-  - az_resource_update
-  - az_resource_wait
+### YamlMime:AzureCLIGroup
+uid: az_resource
+name: az resource
+summary: Manage Azure resources.
+description: ''
+directCommands:
 - uid: az_resource_create
   name: az resource create
   summary: Create a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource create --properties
+                       [--api-version]
+                       [--id]
+                       [--is-full-object]
+                       [--latest-include-preview]
+                       [--location]
+                       [--name]
+                       [--namespace]
+                       [--parent]
+                       [--resource-group]
+                       [--resource-type]
+                       [--subscription]
   examples:
   - summary: Create an API app by providing a full JSON configuration.
-    syntax:
-      content: >-
-        az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites \
-            --is-full-object --properties "{ \"kind\": \"api\", \"location\": \
-                \"West US\", \"properties\": { \"serverFarmId\": \
-                    \"/subscriptions/{SubID}/resourcegroups/{ResourceGroup} \
-                        /providers/Microsoft.Web/serverfarms/{ServicePlan}\" } }"
+    syntax: >-
+      az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites \
+          --is-full-object --properties "{ \"kind\": \"api\", \"location\": \
+              \"West US\", \"properties\": { \"serverFarmId\": \
+                  \"/subscriptions/{SubID}/resourcegroups/{ResourceGroup} \
+                      /providers/Microsoft.Web/serverfarms/{ServicePlan}\" } }"
   - summary: Create a resource by loading JSON configuration from a file.
-    syntax:
-      content: az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites --is-full-object --properties @jsonConfigFile
+    syntax: az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites --is-full-object --properties @jsonConfigFile
   - summary: Create a web app with the minimum required configuration information.
-    syntax:
-      content: >-
-        az resource create -g myRG -n myWeb --resource-type Microsoft.web/sites \
-            --properties "{ \"serverFarmId\":\"/subscriptions/{SubID}/resourcegroups/ \
-                {ResourceGroup}/providers/Microsoft.Web/serverfarms/{ServicePlan}\" }"
-  parameters:
+    syntax: >-
+      az resource create -g myRG -n myWeb --resource-type Microsoft.web/sites \
+          --properties "{ \"serverFarmId\":\"/subscriptions/{SubID}/resourcegroups/ \
+              {ResourceGroup}/providers/Microsoft.Web/serverfarms/{ServicePlan}\" }"
+  - summary: Create a resource by using the latest api-version whether this version is a preview version.
+    syntax: az resource create -g myRG -n myApiApp --resource-type Microsoft.web/sites --is-full-object --properties @jsonConfigFile --latest-include-preview
+  requiredParameters:
   - isRequired: true
     name: --properties -p
     summary: A JSON-formatted string containing resource properties.
     description: ''
+  optionalParameters:
+  - name: --api-version
+    summary: The api version of the resource (omit for the latest stable version).
+    description: ''
   - name: --id
     summary: Resource ID.
     description: ''
   - name: --is-full-object
-    summary: Indicates that the properties object includes other options such as location, tags, sku, and/or plan.
+    summary: Indicate that the properties object includes other options such as location, tags, sku, and/or plan.
     description: ''
-  - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
     description: ''
-  - name: --api-version
-    summary: The api version of the resource (omit for latest).
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
@@ -67,7 +69,7 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -75,35 +77,40 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_delete
   name: az resource delete
   summary: Delete a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource delete [--api-version]
+                       [--ids]
+                       [--latest-include-preview]
+                       [--name]
+                       [--namespace]
+                       [--parent]
+                       [--resource-group]
+                       [--resource-type]
+                       [--subscription]
   examples:
   - summary: Delete a virtual machine named 'MyVm'.
-    syntax:
-      content: az resource delete -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
+    syntax: az resource delete -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
   - summary: Delete a web app using a resource identifier.
-    syntax:
-      content: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
+    syntax: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
   - summary: Delete a subnet using a resource identifier.
-    syntax:
-      content: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
-  parameters:
+    syntax: az resource delete --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
+  - summary: Delete a virtual machine named 'MyVm' by using the latest api-version whether this version is a preview version.
+    syntax: az resource delete -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" --latest-include-preview
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -114,7 +121,7 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -122,49 +129,52 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_resource_invoke_action
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
+- uid: az_resource_invoke-action
   name: az resource invoke-action
   summary: Invoke an action on the resource.
-  description: A list of possible actions corresponding to a resource can be found at <a href="https://docs.microsoft.com/rest/api/">https://docs.microsoft.com/rest/api/</a>. All POST requests are actions that can be invoked and are specified at the end of the URI path. For instance, to stop a VM, the request URI is <a href="https://management.azure.com/subscriptions">https://management.azure.com/subscriptions</a>/{SubscriptionId}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VM}/powerOff?api-version={APIVersion} and the corresponding action is `powerOff`. This can be found at <a href="https://docs.microsoft.com/rest/api/compute/virtualmachines/virtualmachines-stop">https://docs.microsoft.com/rest/api/compute/virtualmachines/virtualmachines-stop</a>.
-  langs:
-  - azurecli
+  description: A list of possible actions corresponding to a resource can be found at https://docs.microsoft.com/rest/api/. All POST requests are actions that can be invoked and are specified at the end of the URI path. For instance, to stop a VM, the request URI is https://management.azure.com/subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VM}/powerOff?api-version={APIVersion} and the corresponding action is `powerOff`. This can be found at https://docs.microsoft.com/rest/api/compute/virtualmachines/virtualmachines-stop.
+  syntax: >-
+    az resource invoke-action --action
+                              [--api-version]
+                              [--ids]
+                              [--latest-include-preview]
+                              [--name]
+                              [--namespace]
+                              [--parent]
+                              [--request-body]
+                              [--resource-group]
+                              [--resource-type]
+                              [--subscription]
   examples:
   - summary: Power-off a vm, specified by Id.
-    syntax:
-      content: >-
-        az resource invoke-action --action powerOff \
-          --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VMName}
+    syntax: >-
+      az resource invoke-action --action powerOff \
+        --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Compute/virtualMachines/{VMName}
   - summary: Capture information for a stopped vm.
-    syntax:
-      content: >-
-        az resource invoke-action --action capture \
-          --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
-            Microsoft.Compute/virtualMachines/{VMName} \
-          --request-body "{ \"vhdPrefix\": \"myPrefix\", \"destinationContainerName\": \
-            \"myContainer\", \"overwriteVhds\": true }"
+    syntax: >-
+      az resource invoke-action --action capture \
+        --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/ \
+          Microsoft.Compute/virtualMachines/{VMName} \
+        --request-body "{ \"vhdPrefix\": \"myPrefix\", \"destinationContainerName\": \
+          \"myContainer\", \"overwriteVhds\": true }"
   - summary: Invoke an action on the resource. (autogenerated)
-    syntax:
-      content: az resource invoke-action --action capture --name MyResource --resource-group MyResourceGroup --resource-type Microsoft.web/sites
-  parameters:
+    syntax: az resource invoke-action --action capture --name MyResource --resource-group MyResourceGroup --resource-type Microsoft.web/sites
+  requiredParameters:
   - isRequired: true
     name: --action
     summary: The action that will be invoked on the specified resource.
     description: ''
-  - name: --request-body
-    summary: JSON encoded parameter arguments for the action that will be passed along in the post request body. Use @{file} to load from a file.
-    description: ''
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -174,8 +184,11 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --request-body
+    summary: JSON encoded parameter arguments for the action that will be passed along in the post request body. Use @{file} to load from a file.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -183,49 +196,46 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_list
   name: az resource list
   summary: List resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource list [--location]
+                     [--name]
+                     [--namespace]
+                     [--query-examples]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
+                     [--tag]
   examples:
   - summary: List all resources in the West US region.
-    syntax:
-      content: az resource list --location westus
+    syntax: az resource list --location westus
   - summary: List all resources with the name 'resourceName'.
-    syntax:
-      content: az resource list --name 'resourceName'
+    syntax: az resource list --name 'resourceName'
   - summary: List all resources with the tag 'test'.
-    syntax:
-      content: az resource list --tag test
+    syntax: az resource list --tag test
   - summary: List all resources with a tag that starts with 'test'.
-    syntax:
-      content: az resource list --tag 'test*'
+    syntax: az resource list --tag 'test*'
   - summary: List all resources with the tag 'test' that have the value 'example'.
-    syntax:
-      content: az resource list --tag test=example
-  parameters:
+    syntax: az resource list --tag test=example
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
-  - name: --tag
-    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -233,19 +243,20 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tag
+    summary: A single tag in 'key[=value]' format. Use "" to clear existing tags.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_move
   name: az resource move
   summary: Moves resources from one resource group to another(can be under different subscription).
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az resource move --destination-group
+                     --ids
+                     [--destination-subscription-id]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --destination-group
     summary: The destination resource group name.
@@ -254,51 +265,57 @@ items:
     name: --ids
     summary: The space-separated resource ids to be moved.
     description: ''
+  optionalParameters:
   - name: --destination-subscription-id
     summary: The destination subscription identifier.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_show
   name: az resource show
   summary: Get the details of a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource show [--api-version]
+                     [--ids]
+                     [--include-response-body {false, true}]
+                     [--latest-include-preview]
+                     [--name]
+                     [--namespace]
+                     [--parent]
+                     [--query-examples]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
   examples:
   - summary: Show a virtual machine resource named 'MyVm'.
-    syntax:
-      content: az resource show -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
+    syntax: az resource show -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
   - summary: Show a web app using a resource identifier.
-    syntax:
-      content: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
+    syntax: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Web/sites/MyWebapp
   - summary: Show a subnet.
-    syntax:
-      content: az resource show -g MyResourceGroup -n MySubnet --namespace Microsoft.Network --parent virtualnetworks/MyVnet --resource-type subnets
+    syntax: az resource show -g MyResourceGroup -n MySubnet --namespace Microsoft.Network --parent virtualnetworks/MyVnet --resource-type subnets
   - summary: Show a subnet using a resource identifier.
-    syntax:
-      content: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
+    syntax: az resource show --ids /subscriptions/0b1f6471-1bf0-4dda-aec3-111111111111/resourceGroups/MyResourceGroup/providers/Microsoft.Network/virtualNetworks/MyVnet/subnets/MySubnet
   - summary: Show an application gateway path rule.
-    syntax:
-      content: az resource show -g MyResourceGroup --namespace Microsoft.Network --parent applicationGateways/ag1/urlPathMaps/map1 --resource-type pathRules -n rule1
-  parameters:
-  - name: --include-response-body
-    parameterValueGroup: false, true
-    summary: Use if the default command output doesn't capture all of the property data.
-    description: ''
+    syntax: az resource show -g MyResourceGroup --namespace Microsoft.Network --parent applicationGateways/ag1/urlPathMaps/map1 --resource-type pathRules -n rule1
+  - summary: Show a virtual machine resource named 'MyVm' by using the latest api-version whether this version is a preview version.
+    syntax: az resource show -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" --latest-include-preview
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --include-response-body
+    parameterValueGroup: false, true
+    summary: Use if the default command output doesn't capture all of the property data.
+    description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -308,8 +325,11 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -317,42 +337,50 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_tag
   name: az resource tag
   summary: Tag a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource tag --tags
+                    [--api-version]
+                    [--ids]
+                    [--is-incremental]
+                    [--latest-include-preview]
+                    [--name]
+                    [--namespace]
+                    [--parent]
+                    [--resource-group]
+                    [--resource-type]
+                    [--subscription]
   examples:
   - summary: Tag the virtual machine 'MyVm' with the key 'vmlist' and value 'vm1'.
-    syntax:
-      content: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
+    syntax: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines"
   - summary: Tag a web app with the key 'vmlist' and value 'vm1', using a resource identifier.
-    syntax:
-      content: az resource tag --tags vmlist=vm1 --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
+    syntax: az resource tag --tags vmlist=vm1 --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
   - summary: Tag the virtual machine 'MyVm' with the key 'vmlist' and value 'vm1' incrementally. It doesn't empty the existing tags.
-    syntax:
-      content: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" -i
-  parameters:
+    syntax: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" -i
+  - summary: Tag the virtual machine 'MyVm' with the key 'vmlist' and value 'vm1' by using the latest api-version whether this version is a preview version.
+    syntax: az resource tag --tags vmlist=vm1 -g MyResourceGroup -n MyVm --resource-type "Microsoft.Compute/virtualMachines" --latest-include-preview
+  requiredParameters:
   - isRequired: true
     name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --is-incremental -i
-    summary: The option to add tags incrementally without deleting the original tags. If the key of new tag and original tag are duplicated, the original value will be overwritten.
-    description: ''
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --is-incremental -i
+    summary: The option to add tags incrementally without deleting the original tags. If the key of new tag and original tag are duplicated, the original value will be overwritten.
+    description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -363,7 +391,7 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
@@ -371,33 +399,53 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_update
   name: az resource update
   summary: Update a resource.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource update [--add]
+                       [--api-version]
+                       [--force-string]
+                       [--ids]
+                       [--include-response-body {false, true}]
+                       [--latest-include-preview]
+                       [--name]
+                       [--namespace]
+                       [--parent]
+                       [--remove]
+                       [--resource-group]
+                       [--resource-type]
+                       [--set]
+                       [--subscription]
   examples:
+  - summary: Update a webapp by using the latest api-version whether this version is a preview version.
+    syntax: az resource update --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp} --set tags.key=value --latest-include-preview
   - summary: Update a resource. (autogenerated)
-    syntax:
-      content: az resource update --ids $id --set properties.connectionType=Proxy
-  parameters:
-  - name: --include-response-body
-    parameterValueGroup: false, true
-    summary: Use if the default command output doesn't capture all of the property data.
+    syntax: az resource update --ids $id --set properties.connectionType=Proxy
+  - summary: Update a resource. (autogenerated)
+    syntax: az resource update --name myresource --resource-group myresourcegroup --resource-type subnets --set tags.key=value
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --include-response-body
+    parameterValueGroup: false, true
+    summary: Use if the default command output doesn't capture all of the property data.
+    description: ''
+  - name: --latest-include-preview -v
+    summary: 'Indicate that the latest api-version will be used regardless of whether it is preview version (like 2020-01-01-preview) or not. For example, if the supported api-version of resource provider is 2020-01-01-preview and 2019-01-01: when passing in this parameter it will take the latest version 2020-01-01-preview, otherwise it will take the latest stable version 2019-01-01 without passing in this parameter.'
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -407,60 +455,77 @@ items:
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_wait
   name: az resource wait
   summary: Place the CLI in a waiting state until a condition of a resources is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource wait [--api-version]
+                     [--created]
+                     [--custom]
+                     [--deleted]
+                     [--exists]
+                     [--ids]
+                     [--include-response-body {false, true}]
+                     [--interval]
+                     [--name]
+                     [--namespace]
+                     [--parent]
+                     [--resource-group]
+                     [--resource-type]
+                     [--subscription]
+                     [--timeout]
+                     [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a condition of a resources is met. (autogenerated)
-    syntax:
-      content: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
+    syntax: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
   - summary: Place the CLI in a waiting state until a condition of a resources is met. (autogenerated)
-    syntax:
-      content: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp} --include-response-body true
+    syntax: az resource wait --exists --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp} --include-response-body true
   - summary: Place the CLI in a waiting state until a condition of a resources is met. (autogenerated)
-    syntax:
-      content: az resource wait --exists --name MyResource --resource-group MyResourceGroup --resource-type subnets
-  parameters:
-  - name: --include-response-body
-    parameterValueGroup: false, true
-    summary: Use if the default command output doesn't capture all of the property data.
-    description: ''
+    syntax: az resource wait --exists --name MyResource --resource-group MyResourceGroup --resource-type subnets
+  optionalParameters:
   - name: --api-version
-    summary: The api version of the resource (omit for latest).
+    summary: The api version of the resource (omit for the latest stable version).
+    description: ''
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
+  - name: --include-response-body
+    parameterValueGroup: false, true
+    summary: Use if the default command output doesn't capture all of the property data.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
   - name: --name -n
     summary: 'The resource name. (Ex: myC).'
     description: ''
@@ -471,26 +536,13 @@ items:
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
-  - name: --created
-    summary: Wait until created with 'provisioningState' at 'Succeeded'.
-    description: ''
-  - name: --custom
-    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
-    description: ''
-  - name: --deleted
-    summary: Wait until deleted.
-    description: ''
-  - name: --exists
-    summary: Wait until the resource exists.
-    description: ''
-  - name: --interval
-    defaultValue: "30"
-    summary: Polling interval in seconds.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --timeout
     defaultValue: "3600"
@@ -499,79 +551,29 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_resource_create
-  name: az resource create
-  summary: Create a resource.
-- uid: az_resource_delete
-  name: az resource delete
-  summary: Delete a resource.
-- uid: az_resource_invoke_action
-  name: az resource invoke-action
-  summary: Invoke an action on the resource.
-- uid: az_resource_link
-  name: az resource link
-  summary: Manage links between resources.
-- uid: az_resource_link_create
-  name: az resource link create
-  summary: Create a new link between resources.
-- uid: az_resource_link_delete
-  name: az resource link delete
-  summary: Delete a link between resources.
-- uid: az_resource_link_list
-  name: az resource link list
-  summary: List resource links.
-- uid: az_resource_link_show
-  name: az resource link show
-  summary: Gets a resource link with the specified ID.
-- uid: az_resource_link_update
-  name: az resource link update
-  summary: Update link between resources.
-- uid: az_resource_list
-  name: az resource list
-  summary: List resources.
-- uid: az_resource_lock
-  name: az resource lock
-  summary: Manage Azure resource level locks.
-- uid: az_resource_lock_create
-  name: az resource lock create
-  summary: Create a resource-level lock.
-- uid: az_resource_lock_delete
-  name: az resource lock delete
-  summary: Delete a resource-level lock.
-- uid: az_resource_lock_list
-  name: az resource lock list
-  summary: List lock information in the resource-level.
-- uid: az_resource_lock_show
-  name: az resource lock show
-  summary: Show the details of a resource-level lock.
-- uid: az_resource_lock_update
-  name: az resource lock update
-  summary: Update a resource-level lock.
-- uid: az_resource_move
-  name: az resource move
-  summary: Moves resources from one resource group to another(can be under different subscription).
-- uid: az_resource_show
-  name: az resource show
-  summary: Get the details of a resource.
-- uid: az_resource_tag
-  name: az resource tag
-  summary: Tag a resource.
-- uid: az_resource_update
-  name: az resource update
-  summary: Update a resource.
-- uid: az_resource_wait
-  name: az resource wait
-  summary: Place the CLI in a waiting state until a condition of a resources is met.
+- az_resource_create
+- az_resource_delete
+- az_resource_invoke-action
+- az_resource_link
+- az_resource_link_create
+- az_resource_link_delete
+- az_resource_link_list
+- az_resource_link_show
+- az_resource_link_update
+- az_resource_list
+- az_resource_lock
+- az_resource_lock_create
+- az_resource_lock_delete
+- az_resource_lock_list
+- az_resource_lock_show
+- az_resource_lock_update
+- az_resource_move
+- az_resource_show
+- az_resource_tag
+- az_resource_update
+- az_resource_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -587,10 +589,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/resource/link.yml b/2018-03-01-hybrid/docs-ref-autogen/resource/link.yml
index 9a391d9c5f..bff6bfd9e6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/resource/link.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/resource/link.yml
@@ -1,28 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_resource_link
-  name: az resource link
-  summary: Manage links between resources.
-  description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
-  langs:
-  - azurecli
-  children:
-  - az_resource_link_create
-  - az_resource_link_delete
-  - az_resource_link_list
-  - az_resource_link_show
-  - az_resource_link_update
+### YamlMime:AzureCLIGroup
+uid: az_resource_link
+name: az resource link
+summary: Manage links between resources.
+description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
+directCommands:
 - uid: az_resource_link_create
   name: az resource link create
   summary: Create a new link between resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link create --link
+                            --target
+                            [--notes]
+                            [--subscription]
   examples:
   - summary: Create a link from {SourceID} to {ResourceID} with notes
-    syntax:
-      content: az resource link create --link {SourceID} --target {ResourceID} --notes "SourceID depends on ResourceID"
-  parameters:
+    syntax: az resource link create --link {SourceID} --target {ResourceID} --notes "SourceID depends on ResourceID"
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
@@ -31,137 +25,117 @@ items:
     name: --target
     summary: Fully-qualified resource ID of the resource link target.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes for the link.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_delete
   name: az resource link delete
   summary: Delete a link between resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link delete --link
+                            [--subscription]
   examples:
   - summary: Delete link {LinkID}
-    syntax:
-      content: az resource link delete --link {LinkID}
-  parameters:
+    syntax: az resource link delete --link {LinkID}
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
     description: 'Format: /subscriptions/{SubID}/resourceGroups/{ResourceGroupID}/providers/{ProviderNamespace}/{ResourceType}/{ResourceName}/providers/Microsoft.Resources/links/{LinkName}.'
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_list
   name: az resource link list
   summary: List resource links.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link list [--filter]
+                          [--query-examples]
+                          [--scope]
+                          [--subscription]
   examples:
   - summary: List links, filtering with {filter-string}
-    syntax:
-      content: az resource link list --filter {filter-string}
+    syntax: az resource link list --filter {filter-string}
   - summary: List all links for resource group {ResourceGroup} in subscription {SubID}
-    syntax:
-      content: az resource link list --scope /subscriptions/{SubID}/resourceGroups/{ResourceGroup}
-  parameters:
+    syntax: az resource link list --scope /subscriptions/{SubID}/resourceGroups/{ResourceGroup}
+  optionalParameters:
   - name: --filter
     summary: Filter string for limiting results.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     summary: Fully-qualified scope for retrieving links.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_show
   name: az resource link show
   summary: Gets a resource link with the specified ID.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az resource link show --link
+                          [--query-examples]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_link_update
   name: az resource link update
   summary: Update link between resources.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource link update --link
+                            [--notes]
+                            [--subscription]
+                            [--target]
   examples:
   - summary: Update the notes for {LinkID} notes "some notes to explain this link"
-    syntax:
-      content: az resource link update --link {LinkID} --notes "some notes to explain this link"
-  parameters:
+    syntax: az resource link update --link {LinkID} --notes "some notes to explain this link"
+  requiredParameters:
   - isRequired: true
     name: --link
     summary: Fully-qualified resource ID of the resource link.
     description: 'Format: /subscriptions/{SubID}/resourceGroups/{ResourceGroupID}/providers/{ProviderNamespace}/{ResourceType}/{ResourceName}/providers/Microsoft.Resources/links/{LinkName}.'
+  optionalParameters:
   - name: --notes
     summary: Notes for the link.
     description: ''
-  - name: --target
-    summary: Fully-qualified resource ID of the resource link target.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --target
+    summary: Fully-qualified resource ID of the resource link target.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_resource_link_create
-  name: az resource link create
-  summary: Create a new link between resources.
-- uid: az_resource_link_delete
-  name: az resource link delete
-  summary: Delete a link between resources.
-- uid: az_resource_link_list
-  name: az resource link list
-  summary: List resource links.
-- uid: az_resource_link_show
-  name: az resource link show
-  summary: Gets a resource link with the specified ID.
-- uid: az_resource_link_update
-  name: az resource link update
-  summary: Update link between resources.
+- az_resource_link_create
+- az_resource_link_delete
+- az_resource_link_list
+- az_resource_link_show
+- az_resource_link_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -177,10 +151,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Linking is a feature of the Resource Manager. It enables declaring relationships between resources even if they do not reside in the same resource group. Linking has no impact on resource usage, billing, or role-based access. It allows for managing multiple resources across groups as a single unit.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/resource/lock.yml b/2018-03-01-hybrid/docs-ref-autogen/resource/lock.yml
index 592b464af0..c5b0aabcbf 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/resource/lock.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/resource/lock.yml
@@ -1,31 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_resource_lock
-  name: az resource lock
-  summary: Manage Azure resource level locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_resource_lock_create
-  - az_resource_lock_delete
-  - az_resource_lock_list
-  - az_resource_lock_show
-  - az_resource_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_resource_lock
+name: az resource lock
+summary: Manage Azure resource level locks.
+description: ''
+directCommands:
 - uid: az_resource_lock_create
   name: az resource lock create
   summary: Create a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock create --lock-type {CanNotDelete, ReadOnly}
+                            --name
+                            [--namespace]
+                            [--notes]
+                            [--parent]
+                            [--resource]
+                            [--resource-group]
+                            [--resource-type]
+                            [--subscription]
   examples:
   - summary: Create a read-only resource level lock on a vnet.
-    syntax:
-      content: az resource lock create --lock-type ReadOnly -n lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+    syntax: az resource lock create --lock-type ReadOnly -n lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
   - summary: Create a read-only resource level lock on a vnet using a vnet id.
-    syntax:
-      content: az resource lock create --lock-type ReadOnly -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VNETName}
-  parameters:
+    syntax: az resource lock create --lock-type ReadOnly -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VNETName}
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -35,59 +33,56 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --notes
-    summary: Notes about this lock.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
+  optionalParameters:
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
+  - name: --notes
+    summary: Notes about this lock.
+    description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_delete
   name: az resource lock delete
   summary: Delete a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock delete [--ids]
+                            [--name]
+                            [--namespace]
+                            [--parent]
+                            [--resource]
+                            [--resource-group]
+                            [--resource-type]
+                            [--subscription]
   examples:
   - summary: Delete a resource level lock
-    syntax:
-      content: az resource lock delete --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+    syntax: az resource lock delete --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
   - summary: Delete a resource level lock on a vnet using a vnet id.
-    syntax:
-      content: az resource lock delete -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VMName}
+    syntax: az resource lock delete -n lockName --resource /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VMName}
   - summary: Delete a resource-level lock. (autogenerated)
-    syntax:
-      content: az resource lock delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
-  parameters:
+    syntax: az resource lock delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Web/sites/{WebApp}
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
@@ -97,108 +92,125 @@ items:
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_list
   name: az resource lock list
   summary: List lock information in the resource-level.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock list [--filter-string]
+                          [--namespace]
+                          [--parent]
+                          [--query-examples]
+                          [--resource]
+                          [--resource-group]
+                          [--resource-type]
+                          [--subscription]
   examples:
   - summary: List out all locks on a vnet
-    syntax:
-      content: az resource lock list -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
-  parameters:
+    syntax: az resource lock list -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_show
   name: az resource lock show
   summary: Show the details of a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock show [--ids]
+                          [--name]
+                          [--namespace]
+                          [--parent]
+                          [--query-examples]
+                          [--resource]
+                          [--resource-group]
+                          [--resource-type]
+                          [--subscription]
   examples:
   - summary: Show a resource level lock
-    syntax:
-      content: az resource lock show -n lockname -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
-  parameters:
+    syntax: az resource lock show -n lockname -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_resource_lock_update
   name: az resource lock update
   summary: Update a resource-level lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az resource lock update [--ids]
+                            [--lock-type {CanNotDelete, ReadOnly}]
+                            [--name]
+                            [--namespace]
+                            [--notes]
+                            [--parent]
+                            [--resource]
+                            [--resource-group]
+                            [--resource-type]
+                            [--subscription]
   examples:
   - summary: Update a resource level lock with new notes and type
-    syntax:
-      content: az resource lock update --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az resource lock update --name lockName -g MyResourceGroup --resource myvnet --resource-type Microsoft.Network/virtualNetworks --notes newNotesHere --lock-type CanNotDelete
+  - summary: Update a resource-level lock. (autogenerated)
+    syntax: az resource lock update --lock-type CanNotDelete --name lockName --namespace Microsoft.Network --resource-group MyResourceGroup --resource-name myvnet --resource-type Microsoft.Network/virtualNetworks
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -209,49 +221,34 @@ items:
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  - name: --notes
-    summary: Notes about this lock.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --namespace
     summary: "Provider namespace (Ex: 'Microsoft.Provider')."
     description: ''
+  - name: --notes
+    summary: Notes about this lock.
+    description: ''
   - name: --parent
     summary: "The parent path (Ex: 'resA/myA/resB/myB')."
     description: ''
   - name: --resource --resource-name
     summary: If an ID is given, other resource arguments should not be given.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --resource-type
     summary: "The resource type (Ex: 'resC'). Can also accept namespace/type format (Ex: 'Microsoft.Provider/resC')."
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_resource_lock_create
-  name: az resource lock create
-  summary: Create a resource-level lock.
-- uid: az_resource_lock_delete
-  name: az resource lock delete
-  summary: Delete a resource-level lock.
-- uid: az_resource_lock_list
-  name: az resource lock list
-  summary: List lock information in the resource-level.
-- uid: az_resource_lock_show
-  name: az resource lock show
-  summary: Show the details of a resource-level lock.
-- uid: az_resource_lock_update
-  name: az resource lock update
-  summary: Update a resource-level lock.
+- az_resource_lock_create
+- az_resource_lock_delete
+- az_resource_lock_list
+- az_resource_lock_show
+- az_resource_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -267,10 +264,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure resource level locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure resource level locks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/role.yml b/2018-03-01-hybrid/docs-ref-autogen/role.yml
index ef303df531..ec64993703 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/role.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/role.yml
@@ -1,43 +1,19 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_role
-  name: az role
-  summary: Manage user roles for access control with Azure Active Directory and service principals.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_role
+name: az role
+summary: Manage user roles for access control with Azure Active Directory and service principals.
+description: ''
 commands:
-- uid: az_role_assignment
-  name: az role assignment
-  summary: Manage role assignments.
-- uid: az_role_assignment_create
-  name: az role assignment create
-  summary: Create a new role assignment for a user, group, or service principal.
-- uid: az_role_assignment_delete
-  name: az role assignment delete
-  summary: Delete role assignments.
-- uid: az_role_assignment_list
-  name: az role assignment list
-  summary: List role assignments.
-- uid: az_role_assignment_list_changelogs
-  name: az role assignment list-changelogs
-  summary: List changelogs for role assignments.
-- uid: az_role_definition
-  name: az role definition
-  summary: Manage role definitions.
-- uid: az_role_definition_create
-  name: az role definition create
-  summary: Create a custom role definition.
-- uid: az_role_definition_delete
-  name: az role definition delete
-  summary: Delete a role definition.
-- uid: az_role_definition_list
-  name: az role definition list
-  summary: List role definitions.
-- uid: az_role_definition_update
-  name: az role definition update
-  summary: Update a role definition.
+- az_role_assignment
+- az_role_assignment_create
+- az_role_assignment_delete
+- az_role_assignment_list
+- az_role_assignment_list-changelogs
+- az_role_definition
+- az_role_definition_create
+- az_role_definition_delete
+- az_role_definition_list
+- az_role_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -53,10 +29,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage user roles for access control with Azure Active Directory and service principals.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage user roles for access control with Azure Active Directory and service principals.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/role/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/role/assignment.yml
index dbb77a39c6..3809ee615f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/role/assignment.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/role/assignment.yml
@@ -1,42 +1,36 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_role_assignment
-  name: az role assignment
-  summary: Manage role assignments.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_role_assignment_create
-  - az_role_assignment_delete
-  - az_role_assignment_list
-  - az_role_assignment_list_changelogs
+### YamlMime:AzureCLIGroup
+uid: az_role_assignment
+name: az role assignment
+summary: Manage role assignments.
+description: ''
+directCommands:
 - uid: az_role_assignment_create
   name: az role assignment create
   summary: Create a new role assignment for a user, group, or service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role assignment create --role
+                              [--assignee]
+                              [--assignee-object-id]
+                              [--resource-group]
+                              [--scope]
+                              [--subscription]
   examples:
   - summary: Create role assignment for an assignee.
-    syntax:
-      content: az role assignment create --assignee sp_name --role a_role
+    syntax: az role assignment create --assignee sp_name --role a_role
   - summary: Create a new role assignment for a user, group, or service principal. (autogenerated)
-    syntax:
-      content: az role assignment create --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role" --scope $id
-  parameters:
+    syntax: az role assignment create --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role" --scope $id
+  requiredParameters:
   - isRequired: true
     name: --role
     summary: Role name or id.
     description: ''
+  optionalParameters:
   - name: --assignee
     summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
     description: ''
   - name: --assignee-object-id
-    summary: Use this parameter instead of '--assignee' to bypass graph permission issues. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
-    description: ''
-  - name: --assignee-principal-type
-    summary: ''
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
     description: ''
   - name: --resource-group -g
     summary: Use it only if the role or assignment was added at the level of a resource group.
@@ -47,23 +41,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_assignment_delete
   name: az role assignment delete
   summary: Delete role assignments.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role assignment delete [--assignee]
+                              [--ids]
+                              [--include-inherited]
+                              [--resource-group]
+                              [--role]
+                              [--scope]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Delete role assignments. (autogenerated)
-    syntax:
-      content: az role assignment delete --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role"
-  parameters:
+    syntax: az role assignment delete --assignee 00000000-0000-0000-0000-000000000000 --role "Storage Account Key Operator Service Role"
+  optionalParameters:
   - name: --assignee
     summary: 'Represent a user, group, or service principal. supported format: object id, user sign-in name, or service principal name.'
     description: ''
@@ -82,25 +77,29 @@ items:
   - name: --scope
     summary: Scope at which the role assignment or definition applies to, e.g., /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333, /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup, or /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM.
     description: ''
-  - name: --yes -y
-    summary: Continue to delete all assignments under the subscription.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Continue to delete all assignments under the subscription.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_assignment_list
   name: az role assignment list
   summary: List role assignments.
   description: By default, only assignments scoped to subscription will be displayed. To view assignments scoped by resource or group, use `--all`.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az role assignment list [--all]
+                            [--assignee]
+                            [--include-classic-administrators {false, true}]
+                            [--include-groups]
+                            [--include-inherited]
+                            [--query-examples]
+                            [--resource-group]
+                            [--role]
+                            [--scope]
+                            [--subscription]
+  optionalParameters:
   - name: --all
     summary: Show all assignments under the current subscription.
     description: ''
@@ -117,6 +116,9 @@ items:
   - name: --include-inherited
     summary: Include assignments applied on parent scopes.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: Use it only if the role or assignment was added at the level of a resource group.
     description: ''
@@ -129,19 +131,16 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_role_assignment_list_changelogs
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_role_assignment_list-changelogs
   name: az role assignment list-changelogs
   summary: List changelogs for role assignments.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az role assignment list-changelogs [--end-time]
+                                       [--start-time]
+                                       [--subscription]
+  optionalParameters:
   - name: --end-time
     summary: The end time of the query in the format of %Y-%m-%dT%H:%M:%SZ, e.g. 2000-12-31T12:59:59Z. Defaults to the current time.
     description: ''
@@ -151,25 +150,12 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_role_assignment_create
-  name: az role assignment create
-  summary: Create a new role assignment for a user, group, or service principal.
-- uid: az_role_assignment_delete
-  name: az role assignment delete
-  summary: Delete role assignments.
-- uid: az_role_assignment_list
-  name: az role assignment list
-  summary: List role assignments.
-- uid: az_role_assignment_list_changelogs
-  name: az role assignment list-changelogs
-  summary: List changelogs for role assignments.
+- az_role_assignment_create
+- az_role_assignment_delete
+- az_role_assignment_list
+- az_role_assignment_list-changelogs
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -185,10 +171,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage role assignments.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage role assignments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/role/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/role/definition.yml
index 2c8e0833d9..54da24f2b3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/role/definition.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/role/definition.yml
@@ -1,81 +1,73 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_role_definition
-  name: az role definition
-  summary: Manage role definitions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_role_definition_create
-  - az_role_definition_delete
-  - az_role_definition_list
-  - az_role_definition_update
+### YamlMime:AzureCLIGroup
+uid: az_role_definition
+name: az role definition
+summary: Manage role definitions.
+description: ''
+directCommands:
 - uid: az_role_definition_create
   name: az role definition create
   summary: Create a custom role definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role definition create --role-definition
+                              [--subscription]
   examples:
-  - summary: Create a role with read-only access to storage and network resources, and the ability to start or restart VMs.
-    syntax:
-      content: >-
-        az role definition create --role-definition '{ \
-            "Name": "Contoso On-call", \
-            "Description": "Perform VM actions and read storage and network information.", \
-            "Actions": [ \
-                "Microsoft.Compute/*/read", \
-                    "Microsoft.Compute/virtualMachines/start/action", \
-                    "Microsoft.Compute/virtualMachines/restart/action", \
-                    "Microsoft.Network/*/read", \
-                "Microsoft.Storage/*/read", \
-                    "Microsoft.Authorization/*/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/resources/read", \
-                "Microsoft.Insights/alertRules/*", \
-                    "Microsoft.Support/*" \
-            ], \
-            "DataActions": [ \
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*" \
-            ], \
-            "NotDataActions": [ \
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write" \
-            ], \
-            "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"] \
-        }'
+  - summary: Create a role with read-only access to storage and network resources, and the ability to start or restart VMs. (Bash)
+    syntax: >-
+      az role definition create --role-definition '{
+          "Name": "Contoso On-call",
+          "Description": "Perform VM actions and read storage and network information.",
+          "Actions": [
+              "Microsoft.Compute/*/read",
+                  "Microsoft.Compute/virtualMachines/start/action",
+                  "Microsoft.Compute/virtualMachines/restart/action",
+                  "Microsoft.Network/*/read",
+              "Microsoft.Storage/*/read",
+                  "Microsoft.Authorization/*/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/resources/read",
+              "Microsoft.Insights/alertRules/*",
+                  "Microsoft.Support/*"
+          ],
+          "DataActions": [
+              "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*"
+          ],
+          "NotDataActions": [
+              "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write"
+          ],
+          "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]
+      }'
   - summary: Create a role from a file containing a JSON description.
-    syntax:
-      content: az role definition create --role-definition @ad-role.json
-  parameters:
+    syntax: az role definition create --role-definition @ad-role.json
+  requiredParameters:
   - isRequired: true
     name: --role-definition
     summary: Description of a role as JSON, or a path to a file containing a JSON description.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_definition_delete
   name: az role definition delete
   summary: Delete a role definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role definition delete --name
+                              [--custom-role-only {false, true}]
+                              [--resource-group]
+                              [--scope]
+                              [--subscription]
   examples:
   - summary: Delete a role definition. (autogenerated)
-    syntax:
-      content: az role definition delete --name MyRole
-  parameters:
+    syntax: az role definition delete --name MyRole
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The role's name.
     description: ''
+  optionalParameters:
   - name: --custom-role-only
     parameterValueGroup: false, true
     summary: Custom roles only(vs. build-in ones).
@@ -89,19 +81,19 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_definition_list
   name: az role definition list
   summary: List role definitions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az role definition list [--custom-role-only {false, true}]
+                            [--name]
+                            [--query-examples]
+                            [--resource-group]
+                            [--scope]
+                            [--subscription]
+  optionalParameters:
   - name: --custom-role-only
     parameterValueGroup: false, true
     summary: Custom roles only(vs. build-in ones).
@@ -109,6 +101,9 @@ items:
   - name: --name -n
     summary: The role's name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
     summary: Use it only if the role or assignment was added at the level of a resource group.
     description: ''
@@ -118,74 +113,57 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_role_definition_update
   name: az role definition update
   summary: Update a role definition.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az role definition update --role-definition
+                              [--subscription]
   examples:
-  - summary: Update a role using the output of "az role definition list"
-    syntax:
-      content: >-
-        az role definition update --role-definition '{ \
-            "roleName": "Contoso On-call", \
-            "Description": "Perform VM actions and read storage and network information.", \
-            "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/providers/Microsoft.Authorization/roleDefinitions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", \
-            "roleType": "CustomRole", \
-            "type": "Microsoft.Authorization/roleDefinitions", \
-            "Actions": [ \
-                "Microsoft.Compute/*/read", \
-                    "Microsoft.Compute/virtualMachines/start/action", \
-                    "Microsoft.Compute/virtualMachines/restart/action", \
-                    "Microsoft.Network/*/read", \
-                "Microsoft.Storage/*/read", \
-                    "Microsoft.Authorization/*/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/read", \
-                "Microsoft.Resources/subscriptions/resourceGroups/resources/read", \
-                "Microsoft.Support/*" \
-                ], \
-                "DataActions": [ \
-                    "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*" \
-            ], \
-            "NotDataActions": [ \
-                "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write" \
-            ], \
-            "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"] \
-        }'
-  parameters:
+  - summary: Update a role using the output of "az role definition list". (Bash)
+    syntax: >-
+      az role definition update --role-definition '{
+          "roleName": "Contoso On-call",
+          "Description": "Perform VM actions and read storage and network information.",
+          "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/providers/Microsoft.Authorization/roleDefinitions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+          "roleType": "CustomRole",
+          "type": "Microsoft.Authorization/roleDefinitions",
+          "Actions": [
+              "Microsoft.Compute/*/read",
+                  "Microsoft.Compute/virtualMachines/start/action",
+                  "Microsoft.Compute/virtualMachines/restart/action",
+                  "Microsoft.Network/*/read",
+              "Microsoft.Storage/*/read",
+                  "Microsoft.Authorization/*/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/read",
+              "Microsoft.Resources/subscriptions/resourceGroups/resources/read",
+              "Microsoft.Support/*"
+              ],
+              "DataActions": [
+                  "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/*"
+          ],
+          "NotDataActions": [
+              "Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write"
+          ],
+          "AssignableScopes": ["/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"]
+      }'
+  requiredParameters:
   - isRequired: true
     name: --role-definition
     summary: Description of an existing role as JSON, or a path to a file containing a JSON description.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_role_definition_create
-  name: az role definition create
-  summary: Create a custom role definition.
-- uid: az_role_definition_delete
-  name: az role definition delete
-  summary: Delete a role definition.
-- uid: az_role_definition_list
-  name: az role definition list
-  summary: List role definitions.
-- uid: az_role_definition_update
-  name: az role definition update
-  summary: Update a role definition.
+- az_role_definition_create
+- az_role_definition_delete
+- az_role_definition_list
+- az_role_definition_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -201,10 +179,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage role definitions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage role definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sapmonitor.yml b/2018-03-01-hybrid/docs-ref-autogen/sapmonitor.yml
new file mode 100644
index 0000000000..a31f3acb4e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sapmonitor.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_sapmonitor
+name: az sapmonitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sap-hana** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az sapmonitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage Azure SAP Monitor.
+description: ''
+directCommands:
+- uid: az_sapmonitor_create
+  name: az sapmonitor create
+  summary: Create a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor create --hana-subnet
+                         --monitor-name
+                         --region
+                         --resource-group
+                         [--dca]
+                         [--lawsid]
+                         [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --hana-subnet --hdbsn
+    summary: ARM ID of an Azure Subnet with access to the HANA instance.
+    description: ''
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --region
+    summary: The region to create this SAP monitor on.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --dca --disable_customer_analytics
+    summary: Disable sending analytics to Microsoft.
+    description: ''
+  - name: --lawsid --log-analytics-workspace-arm-id
+    summary: Existing log analytics workspace id to use for log monitoring.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_sapmonitor_delete
+  name: az sapmonitor delete
+  summary: Delete a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor delete --monitor-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_list
+  name: az sapmonitor list
+  summary: List SAP Monitors.
+  description: ''
+  syntax: az sapmonitor list
+- uid: az_sapmonitor_show
+  name: az sapmonitor show
+  summary: Get the details of a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor show --monitor-name
+                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_update
+  name: az sapmonitor update
+  summary: Updates the tags field of a SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor update --monitor-name
+                         --resource-group
+                         [--add]
+                         [--force-string]
+                         [--no-wait]
+                         [--remove]
+                         [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_sapmonitor_create
+- az_sapmonitor_delete
+- az_sapmonitor_list
+- az_sapmonitor_provider-instance
+- az_sapmonitor_provider-instance_create
+- az_sapmonitor_provider-instance_delete
+- az_sapmonitor_provider-instance_list
+- az_sapmonitor_provider-instance_show
+- az_sapmonitor_show
+- az_sapmonitor_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage Azure SAP Monitor.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sapmonitor/provider-instance.yml b/2018-03-01-hybrid/docs-ref-autogen/sapmonitor/provider-instance.yml
new file mode 100644
index 0000000000..9c9ca6d472
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sapmonitor/provider-instance.yml
@@ -0,0 +1,126 @@
+### YamlMime:AzureCLIGroup
+uid: az_sapmonitor_provider-instance
+name: az sapmonitor provider-instance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sap-hana** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az sapmonitor provider-instance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the provider instance for the SAP Monitor.
+description: ''
+directCommands:
+- uid: az_sapmonitor_provider-instance_create
+  name: az sapmonitor provider-instance create
+  summary: Create a new provider instance for the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance create --monitor-name
+                                           --provider-instance-name
+                                           --provider-instance-properties
+                                           --provider-instance-type
+                                           --resource-group
+                                           [--provider-instance-metadata]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-name
+    summary: The name of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-properties
+    summary: The properties of the provider instance (Should be of JSON format).
+    description: ''
+  - isRequired: true
+    name: --provider-instance-type
+    summary: The type of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --provider-instance-metadata
+    summary: The metadata of the provider instance (Should be of JSON format).
+    description: ''
+- uid: az_sapmonitor_provider-instance_delete
+  name: az sapmonitor provider-instance delete
+  summary: Delete a provider instance from the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance delete --monitor-name
+                                           --provider-instance-name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-name
+    summary: The name of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_provider-instance_list
+  name: az sapmonitor provider-instance list
+  summary: List provider instances for the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance list --monitor-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_sapmonitor_provider-instance_show
+  name: az sapmonitor provider-instance show
+  summary: Get the details of a provider instance for the SAP Monitor.
+  description: ''
+  syntax: >-
+    az sapmonitor provider-instance show --monitor-name
+                                         --provider-instance-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name -n
+    summary: The name of the SAP monitor.
+    description: ''
+  - isRequired: true
+    name: --provider-instance-name
+    summary: The name of the provider instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_sapmonitor_provider-instance_create
+- az_sapmonitor_provider-instance_delete
+- az_sapmonitor_provider-instance_list
+- az_sapmonitor_provider-instance_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the provider instance for the SAP Monitor.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security.yml b/2018-03-01-hybrid/docs-ref-autogen/security.yml
index d7f30feb27..d505c0f489 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security.yml
@@ -1,154 +1,125 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security
-  name: az security
-  summary: Manage your security posture with Azure Security Center.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_security
+name: az security
+summary: Manage your security posture with Azure Security Center.
+description: ''
 commands:
-- uid: az_security_alert
-  name: az security alert
-  summary: View security alerts.
-- uid: az_security_alert_list
-  name: az security alert list
-  summary: List security alerts.
-- uid: az_security_alert_show
-  name: az security alert show
-  summary: Shows a security alert.
-- uid: az_security_alert_update
-  name: az security alert update
-  summary: Updates a security alert status.
-- uid: az_security_atp
-  name: az security atp
-  summary: View and manage Advanced Threat Protection settings.
-- uid: az_security_atp_storage
-  name: az security atp storage
-  summary: View and manage Advanced Threat Protection settings for storage accounts.
-- uid: az_security_atp_storage_show
-  name: az security atp storage show
-  summary: Display Advanced Threat Protection settings for a storage account.
-- uid: az_security_atp_storage_update
-  name: az security atp storage update
-  summary: Toggle status of Advanced Threat Protection for a storage account.
-- uid: az_security_auto_provisioning_setting
-  name: az security auto-provisioning-setting
-  summary: View your auto provisioning settings.
-- uid: az_security_auto_provisioning_setting_list
-  name: az security auto-provisioning-setting list
-  summary: List the auto provisioning settings.
-- uid: az_security_auto_provisioning_setting_show
-  name: az security auto-provisioning-setting show
-  summary: Shows an auto provisioning setting.
-- uid: az_security_auto_provisioning_setting_update
-  name: az security auto-provisioning-setting update
-  summary: Updates your automatic provisioning settings on the subscription.
-- uid: az_security_contact
-  name: az security contact
-  summary: View your security contacts.
-- uid: az_security_contact_create
-  name: az security contact create
-  summary: Creates a security contact.
-- uid: az_security_contact_delete
-  name: az security contact delete
-  summary: Deletes a security contact.
-- uid: az_security_contact_list
-  name: az security contact list
-  summary: List security contact.
-- uid: az_security_contact_show
-  name: az security contact show
-  summary: Shows a security contact.
-- uid: az_security_discovered_security_solution
-  name: az security discovered-security-solution
-  summary: View your discovered security solutions.
-- uid: az_security_discovered_security_solution_list
-  name: az security discovered-security-solution list
-  summary: List the discovered security solutions.
-- uid: az_security_discovered_security_solution_show
-  name: az security discovered-security-solution show
-  summary: Shows a discovered security solution.
-- uid: az_security_external_security_solution
-  name: az security external-security-solution
-  summary: View your external security solutions.
-- uid: az_security_external_security_solution_list
-  name: az security external-security-solution list
-  summary: List the external security solutions.
-- uid: az_security_external_security_solution_show
-  name: az security external-security-solution show
-  summary: Shows an external security solution.
-- uid: az_security_jit_policy
-  name: az security jit-policy
-  summary: Manage your Just in Time network access policies.
-- uid: az_security_jit_policy_list
-  name: az security jit-policy list
-  summary: List your Just in Time network access policies.
-- uid: az_security_jit_policy_show
-  name: az security jit-policy show
-  summary: Shows a Just in Time network access policy.
-- uid: az_security_location
-  name: az security location
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_location_list
-  name: az security location list
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_location_show
-  name: az security location show
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_pricing
-  name: az security pricing
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_create
-  name: az security pricing create
-  summary: Updates the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_list
-  name: az security pricing list
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_show
-  name: az security pricing show
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_setting
-  name: az security setting
-  summary: View your security settings.
-- uid: az_security_setting_list
-  name: az security setting list
-  summary: List security settings.
-- uid: az_security_setting_show
-  name: az security setting show
-  summary: Shows a security setting.
-- uid: az_security_task
-  name: az security task
-  summary: View security tasks (recommendations).
-- uid: az_security_task_list
-  name: az security task list
-  summary: List security tasks (recommendations).
-- uid: az_security_task_show
-  name: az security task show
-  summary: Shows a security task (recommendation).
-- uid: az_security_topology
-  name: az security topology
-  summary: Shows the network topology in your subscription.
-- uid: az_security_topology_list
-  name: az security topology list
-  summary: Shows the network topology in your subscription.
-- uid: az_security_topology_show
-  name: az security topology show
-  summary: Shows the network topology in your subscription.
-- uid: az_security_workspace_setting
-  name: az security workspace-setting
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_create
-  name: az security workspace-setting create
-  summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_delete
-  name: az security workspace-setting delete
-  summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace.
-- uid: az_security_workspace_setting_list
-  name: az security workspace-setting list
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_show
-  name: az security workspace-setting show
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+- az_security_adaptive_network_hardenings
+- az_security_adaptive_network_hardenings_list
+- az_security_adaptive_network_hardenings_show
+- az_security_adaptive-application-controls
+- az_security_adaptive-application-controls_list
+- az_security_adaptive-application-controls_show
+- az_security_alert
+- az_security_alert_list
+- az_security_alert_show
+- az_security_alert_update
+- az_security_allowed_connections
+- az_security_allowed_connections_list
+- az_security_allowed_connections_show
+- az_security_assessment
+- az_security_assessment_create
+- az_security_assessment_delete
+- az_security_assessment_list
+- az_security_assessment_show
+- az_security_assessment-metadata
+- az_security_assessment-metadata_create
+- az_security_assessment-metadata_delete
+- az_security_assessment-metadata_list
+- az_security_assessment-metadata_show
+- az_security_atp
+- az_security_atp_storage
+- az_security_atp_storage_show
+- az_security_atp_storage_update
+- az_security_auto-provisioning-setting
+- az_security_auto-provisioning-setting_list
+- az_security_auto-provisioning-setting_show
+- az_security_auto-provisioning-setting_update
+- az_security_contact
+- az_security_contact_create
+- az_security_contact_delete
+- az_security_contact_list
+- az_security_contact_show
+- az_security_discovered-security-solution
+- az_security_discovered-security-solution_list
+- az_security_discovered-security-solution_show
+- az_security_external-security-solution
+- az_security_external-security-solution_list
+- az_security_external-security-solution_show
+- az_security_iot-alerts
+- az_security_iot-alerts_delete
+- az_security_iot-alerts_list
+- az_security_iot-alerts_show
+- az_security_iot-analytics
+- az_security_iot-analytics_list
+- az_security_iot-analytics_show
+- az_security_iot-recommendations
+- az_security_iot-recommendations_list
+- az_security_iot-recommendations_show
+- az_security_iot-solution
+- az_security_iot-solution_create
+- az_security_iot-solution_delete
+- az_security_iot-solution_list
+- az_security_iot-solution_show
+- az_security_iot-solution_update
+- az_security_jit-policy
+- az_security_jit-policy_list
+- az_security_jit-policy_show
+- az_security_location
+- az_security_location_list
+- az_security_location_show
+- az_security_pricing
+- az_security_pricing_create
+- az_security_pricing_list
+- az_security_pricing_show
+- az_security_regulatory-compliance-assessments
+- az_security_regulatory-compliance-assessments_list
+- az_security_regulatory-compliance-assessments_show
+- az_security_regulatory-compliance-controls
+- az_security_regulatory-compliance-controls_list
+- az_security_regulatory-compliance-controls_show
+- az_security_regulatory-compliance-standards
+- az_security_regulatory-compliance-standards_list
+- az_security_regulatory-compliance-standards_show
+- az_security_secure-score-control-definitions
+- az_security_secure-score-control-definitions_list
+- az_security_secure-score-controls
+- az_security_secure-score-controls_list
+- az_security_secure-score-controls_list_by_score
+- az_security_secure-scores
+- az_security_secure-scores_list
+- az_security_secure-scores_show
+- az_security_setting
+- az_security_setting_list
+- az_security_setting_show
+- az_security_sub-assessment
+- az_security_sub-assessment_list
+- az_security_sub-assessment_show
+- az_security_task
+- az_security_task_list
+- az_security_task_show
+- az_security_topology
+- az_security_topology_list
+- az_security_topology_show
+- az_security_va
+- az_security_va_sql
+- az_security_va_sql_baseline
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+- az_security_va_sql_results
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+- az_security_va_sql_scans
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+- az_security_workspace-setting
+- az_security_workspace-setting_create
+- az_security_workspace-setting_delete
+- az_security_workspace-setting_list
+- az_security_workspace-setting_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -164,10 +135,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Manage your security posture with Azure Security Center.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Manage your security posture with Azure Security Center.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/adaptive-application-controls.yml b/2018-03-01-hybrid/docs-ref-autogen/security/adaptive-application-controls.yml
new file mode 100644
index 0000000000..097dde5afd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/adaptive-application-controls.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_adaptive-application-controls
+name: az security adaptive-application-controls
+summary: Enable control which applications can run on your Azure and non-Azure machines (Windows and Linux).
+description: ''
+directCommands:
+- uid: az_security_adaptive-application-controls_list
+  name: az security adaptive-application-controls list
+  summary: Adaptive Application Controls - List.
+  description: ''
+  syntax: >-
+    az security adaptive-application-controls list [--query-examples]
+                                                   [--subscription]
+  examples:
+  - summary: list all application control VM/server groups.
+    syntax: az security adaptive-application-controls list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_adaptive-application-controls_show
+  name: az security adaptive-application-controls show
+  summary: Adaptive Application Controls - Get.
+  description: ''
+  syntax: >-
+    az security adaptive-application-controls show --group-name
+                                                   [--query-examples]
+                                                   [--subscription]
+  examples:
+  - summary: Get a single application control VM/server group.
+    syntax: az security adaptive-application-controls show --group-name GROUP1
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: Name of an application control VM/server group.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_adaptive-application-controls_list
+- az_security_adaptive-application-controls_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Enable control which applications can run on your Azure and non-Azure machines (Windows and Linux).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/adaptive_network_hardenings.yml b/2018-03-01-hybrid/docs-ref-autogen/security/adaptive_network_hardenings.yml
new file mode 100644
index 0000000000..8d6ae159f6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/adaptive_network_hardenings.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_adaptive_network_hardenings
+name: az security adaptive_network_hardenings
+summary: View all Adaptive Network Hardening resources.
+description: ''
+directCommands:
+- uid: az_security_adaptive_network_hardenings_list
+  name: az security adaptive_network_hardenings list
+  summary: Gets a list of Adaptive Network Hardenings resources in scope of an extended resource.
+  description: ''
+  syntax: >-
+    az security adaptive_network_hardenings list --resource-group
+                                                 --resource-name
+                                                 --resource-namespace
+                                                 --resource-type
+                                                 [--query-examples]
+                                                 [--subscription]
+  examples:
+  - summary: Adaptive Network Hardenings - List By Extended Resource
+    syntax: az security adaptive_network_hardenings list --resource-group 'RG1' --resource-type 'virtualMachines' --resource-namespace 'Microsoft.Compute' --resource-name 'VM1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Name of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-namespace
+    summary: The Namespace of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The type of the resource.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_adaptive_network_hardenings_show
+  name: az security adaptive_network_hardenings show
+  summary: Gets a single Adaptive Network Hardening resource.
+  description: ''
+  syntax: >-
+    az security adaptive_network_hardenings show --adaptive-network-hardenings-resource-name
+                                                 --resource-group
+                                                 --resource-name
+                                                 --resource-namespace
+                                                 --resource-type
+                                                 [--query-examples]
+                                                 [--subscription]
+  examples:
+  - summary: Adaptive Network Hardenings - Get.
+    syntax: az security adaptive_network_hardenings show --resource-group 'RG1' --resource-type 'virtualMachines' --resource-namespace 'Microsoft.Compute' --resource-name 'VM1' --adaptive-network-hardenings-resource-name 'default'
+  requiredParameters:
+  - isRequired: true
+    name: --adaptive-network-hardenings-resource-name
+    summary: Adaptive Network Hardening resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-name
+    summary: Name of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-namespace
+    summary: The Namespace of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-type
+    summary: The type of the resource.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_adaptive_network_hardenings_list
+- az_security_adaptive_network_hardenings_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View all Adaptive Network Hardening resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/alert.yml b/2018-03-01-hybrid/docs-ref-autogen/security/alert.yml
index fa137b2395..00844ec22a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/alert.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/alert.yml
@@ -1,58 +1,53 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_alert
-  name: az security alert
-  summary: View security alerts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_alert_list
-  - az_security_alert_show
-  - az_security_alert_update
+### YamlMime:AzureCLIGroup
+uid: az_security_alert
+name: az security alert
+summary: View security alerts.
+description: ''
+directCommands:
 - uid: az_security_alert_list
   name: az security alert list
   summary: List security alerts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security alert list [--location]
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Get security alerts on a subscription scope.
-    syntax:
-      content: az security alert list
+    syntax: az security alert list
   - summary: Get security alerts on a resource group scope.
-    syntax:
-      content: az security alert list -g "myRg"
-  parameters:
+    syntax: az security alert list -g "myRg"
+  optionalParameters:
   - name: --location -l
     summary: Location of the resource.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_alert_show
   name: az security alert show
   summary: Shows a security alert.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security alert show --location
+                           --name
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Get a security alert on a subscription scope.
-    syntax:
-      content: az security alert show --location "centralus" -n "alertName"
+    syntax: az security alert show --location "centralus" -n "alertName"
   - summary: Get a security alert on a resource group scope.
-    syntax:
-      content: az security alert show -g "myRg" --location "centralus" -n "alertName"
-  parameters:
+    syntax: az security alert show -g "myRg" --location "centralus" -n "alertName"
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: Location of the resource.
@@ -61,38 +56,37 @@ items:
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_alert_update
   name: az security alert update
   summary: Updates a security alert status.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security alert update --location
+                             --name
+                             --status
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: Dismiss a security alert on a subscription scope.
-    syntax:
-      content: az security alert update --location "centralus" -n "alertName" --status "dismiss"
+    syntax: az security alert update --location "centralus" -n "alertName" --status "dismiss"
   - summary: Dismiss a security alert on a resource group scope.
-    syntax:
-      content: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "dismiss"
+    syntax: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "dismiss"
   - summary: Activate a security alert on a subscritpion scope.
-    syntax:
-      content: az security alert update --location "centralus" -n "alertName" --status "activate"
+    syntax: az security alert update --location "centralus" -n "alertName" --status "activate"
   - summary: Activate a security alert on a resource group scope.
-    syntax:
-      content: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "activate"
-  parameters:
+    syntax: az security alert update -g "myRg" --location "centralus" -n "alertName" --status "activate"
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: Location of the resource.
@@ -105,28 +99,18 @@ items:
     name: --status
     summary: Target status of the alert. possible values are "dismiss" and "activate".
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_alert_list
-  name: az security alert list
-  summary: List security alerts.
-- uid: az_security_alert_show
-  name: az security alert show
-  summary: Shows a security alert.
-- uid: az_security_alert_update
-  name: az security alert update
-  summary: Updates a security alert status.
+- az_security_alert_list
+- az_security_alert_show
+- az_security_alert_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -142,10 +126,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View security alerts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View security alerts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/allowed_connections.yml b/2018-03-01-hybrid/docs-ref-autogen/security/allowed_connections.yml
new file mode 100644
index 0000000000..fa4ab73497
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/allowed_connections.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_allowed_connections
+name: az security allowed_connections
+summary: View all possible traffic between resources for the subscription and location, based on connection type.
+description: ''
+directCommands:
+- uid: az_security_allowed_connections_list
+  name: az security allowed_connections list
+  summary: List of all possible traffic between resources for the subscription.
+  description: ''
+  syntax: >-
+    az security allowed_connections list [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get possible traffic between resources at the subscription level.
+    syntax: az security allowed_connections list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_allowed_connections_show
+  name: az security allowed_connections show
+  summary: List all possible traffic between resources for the subscription and location, based on connection type.
+  description: ''
+  syntax: >-
+    az security allowed_connections show --name
+                                         --resource-group
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get all possible traffic between resources for the subscription and location, based on connection type.
+    syntax: az security allowed_connections show --name Internal --resource-group mygroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_allowed_connections_list
+- az_security_allowed_connections_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View all possible traffic between resources for the subscription and location, based on connection type.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/assessment-metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/security/assessment-metadata.yml
new file mode 100644
index 0000000000..aed6848405
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/assessment-metadata.yml
@@ -0,0 +1,131 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_assessment-metadata
+name: az security assessment-metadata
+summary: View your security assessment metadata.
+description: ''
+directCommands:
+- uid: az_security_assessment-metadata_create
+  name: az security assessment-metadata create
+  summary: Creates a customer managed security assessment type.
+  description: ''
+  syntax: >-
+    az security assessment-metadata create --description
+                                           --display-name
+                                           --name
+                                           --severity
+                                           [--remediation-description]
+                                           [--subscription]
+  examples:
+  - summary: Creates a security assessment type.
+    syntax: az security assessment-metadata create -n "4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d" --display-name  "Resource should be secured" --severity "high" --description "The resource should be secured according to my company security policy"
+  requiredParameters:
+  - isRequired: true
+    name: --description
+    summary: Detailed string that will help users to understand the assessment and how it is calculated.
+    description: ''
+  - isRequired: true
+    name: --display-name
+    summary: Human readable title for this object.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --severity
+    summary: Indicates the importance of the security risk if the assessment is unhealthy.
+    description: ''
+  optionalParameters:
+  - name: --remediation-description
+    summary: Detailed string that will help users to understand the different ways to mitigate or fix the security issue.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment-metadata_delete
+  name: az security assessment-metadata delete
+  summary: Deletes a security assessment type and all it's assessment results.
+  description: ''
+  syntax: >-
+    az security assessment-metadata delete --name
+                                           [--subscription]
+  examples:
+  - summary: Deletes a security assessment type.
+    syntax: az security assessment-metadata delete -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment-metadata_list
+  name: az security assessment-metadata list
+  summary: List all security assessment results.
+  description: ''
+  syntax: >-
+    az security assessment-metadata list [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get security assessment metadata.
+    syntax: az security assessment-metadata list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment-metadata_show
+  name: az security assessment-metadata show
+  summary: Shows a security assessment.
+  description: ''
+  syntax: >-
+    az security assessment-metadata show --name
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get a security assessment metadata.
+    syntax: az security assessment-metadata show -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_assessment-metadata_create
+- az_security_assessment-metadata_delete
+- az_security_assessment-metadata_list
+- az_security_assessment-metadata_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security assessment metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/assessment.yml b/2018-03-01-hybrid/docs-ref-autogen/security/assessment.yml
new file mode 100644
index 0000000000..05be37bbae
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/assessment.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_assessment
+name: az security assessment
+summary: View your security assessment results.
+description: ''
+directCommands:
+- uid: az_security_assessment_create
+  name: az security assessment create
+  summary: Creates a customer managed security assessment.
+  description: ''
+  syntax: >-
+    az security assessment create --name
+                                  --status-code
+                                  [--additional-data]
+                                  [--assessed-resource-id]
+                                  [--status-cause]
+                                  [--status-description]
+                                  [--subscription]
+  examples:
+  - summary: Creates a security assessment.
+    syntax: az security assessment create -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d' --status-code  'unhealthy'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --status-code
+    summary: Progremmatic code for the result of the assessment. can be "Healthy", "Unhealthy" or "NotApplicable".
+    description: ''
+  optionalParameters:
+  - name: --additional-data
+    summary: Data that is attached to the assessment result for better investigations or status clarity.
+    description: ''
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --status-cause
+    summary: Progremmatic code for the cause of the assessment result.
+    description: ''
+  - name: --status-description
+    summary: Human readable description of the cause of the assessment result.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment_delete
+  name: az security assessment delete
+  summary: Deletes a security assessment.
+  description: ''
+  syntax: >-
+    az security assessment delete --name
+                                  [--assessed-resource-id]
+                                  [--subscription]
+  examples:
+  - summary: Deletes a security assessment.
+    syntax: az security assessment delete -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment_list
+  name: az security assessment list
+  summary: List all security assessment results.
+  description: ''
+  syntax: >-
+    az security assessment list [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get security assessments.
+    syntax: az security assessment list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_assessment_show
+  name: az security assessment show
+  summary: Shows a security assessment.
+  description: ''
+  syntax: >-
+    az security assessment show --name
+                                [--assessed-resource-id]
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get a security assessment.
+    syntax: az security assessment show -n '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_assessment_create
+- az_security_assessment_delete
+- az_security_assessment_list
+- az_security_assessment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security assessment results.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/atp.yml b/2018-03-01-hybrid/docs-ref-autogen/security/atp.yml
index 0d889ec72f..31ef901037 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/atp.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/atp.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_atp
-  name: az security atp
-  summary: View and manage Advanced Threat Protection settings.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_security_atp
+name: az security atp
+summary: View and manage Advanced Threat Protection settings.
+description: ''
 commands:
-- uid: az_security_atp_storage
-  name: az security atp storage
-  summary: View and manage Advanced Threat Protection settings for storage accounts.
-- uid: az_security_atp_storage_show
-  name: az security atp storage show
-  summary: Display Advanced Threat Protection settings for a storage account.
-- uid: az_security_atp_storage_update
-  name: az security atp storage update
-  summary: Toggle status of Advanced Threat Protection for a storage account.
+- az_security_atp_storage
+- az_security_atp_storage_show
+- az_security_atp_storage_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,10 +22,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View and manage Advanced Threat Protection settings.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View and manage Advanced Threat Protection settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/atp/storage.yml b/2018-03-01-hybrid/docs-ref-autogen/security/atp/storage.yml
index c3bf919b5c..ba21a8cb0d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/atp/storage.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/atp/storage.yml
@@ -1,56 +1,53 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_atp_storage
-  name: az security atp storage
-  summary: View and manage Advanced Threat Protection settings for storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_atp_storage_show
-  - az_security_atp_storage_update
+### YamlMime:AzureCLIGroup
+uid: az_security_atp_storage
+name: az security atp storage
+summary: View and manage Advanced Threat Protection settings for storage accounts.
+description: ''
+directCommands:
 - uid: az_security_atp_storage_show
   name: az security atp storage show
   summary: Display Advanced Threat Protection settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security atp storage show --resource-group
+                                 --storage-account
+                                 [--query-examples]
+                                 [--subscription]
   examples:
   - summary: Retrieve Advanced Threat Protection settings for a storage account on a subscription scope.
-    syntax:
-      content: az security atp storage show --resource-group MyResourceGroup --storage-account MyStorageAccount
-  parameters:
+    syntax: az security atp storage show --resource-group MyResourceGroup --storage-account MyStorageAccount
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --storage-account
     summary: Name of an existing storage account.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_atp_storage_update
   name: az security atp storage update
   summary: Toggle status of Advanced Threat Protection for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security atp storage update --is-enabled {false, true}
+                                   --resource-group
+                                   --storage-account
+                                   [--subscription]
   examples:
   - summary: Enable Advanced Threat Protection for a storage account on a subscription scope.
-    syntax:
-      content: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled true
+    syntax: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled true
   - summary: Disable Advanced Threat Protection for a storage account on a subscription scope.
-    syntax:
-      content: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled false
-  parameters:
+    syntax: az security atp storage update --resource-group MyResourceGroup --storage-account MyStorageAccount --is-enabled false
+  requiredParameters:
   - isRequired: true
     name: --is-enabled
     parameterValueGroup: false, true
@@ -58,28 +55,20 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --storage-account
     summary: Name of an existing storage account.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_atp_storage_show
-  name: az security atp storage show
-  summary: Display Advanced Threat Protection settings for a storage account.
-- uid: az_security_atp_storage_update
-  name: az security atp storage update
-  summary: Toggle status of Advanced Threat Protection for a storage account.
+- az_security_atp_storage_show
+- az_security_atp_storage_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -95,10 +84,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View and manage Advanced Threat Protection settings for storage accounts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View and manage Advanced Threat Protection settings for storage accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/auto-provisioning-setting.yml b/2018-03-01-hybrid/docs-ref-autogen/security/auto-provisioning-setting.yml
index b5f06b3819..7f49441f98 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/auto-provisioning-setting.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/auto-provisioning-setting.yml
@@ -1,76 +1,67 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_auto_provisioning_setting
-  name: az security auto-provisioning-setting
-  summary: View your auto provisioning settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_auto_provisioning_setting_list
-  - az_security_auto_provisioning_setting_show
-  - az_security_auto_provisioning_setting_update
-- uid: az_security_auto_provisioning_setting_list
+### YamlMime:AzureCLIGroup
+uid: az_security_auto-provisioning-setting
+name: az security auto-provisioning-setting
+summary: View your auto provisioning settings.
+description: ''
+directCommands:
+- uid: az_security_auto-provisioning-setting_list
   name: az security auto-provisioning-setting list
   summary: List the auto provisioning settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security auto-provisioning-setting list [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get auto provisioning settings.
-    syntax:
-      content: az security auto-provisioning-setting list
-  parameters:
+    syntax: az security auto-provisioning-setting list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_auto_provisioning_setting_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_auto-provisioning-setting_show
   name: az security auto-provisioning-setting show
   summary: Shows an auto provisioning setting.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security auto-provisioning-setting show --name
+                                               [--query-examples]
+                                               [--subscription]
   examples:
   - summary: Get an auto provisioning setting.
-    syntax:
-      content: az security auto-provisioning-setting show -n "default"
-  parameters:
+    syntax: az security auto-provisioning-setting show -n "default"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_auto_provisioning_setting_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_auto-provisioning-setting_update
   name: az security auto-provisioning-setting update
   summary: Updates your automatic provisioning settings on the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security auto-provisioning-setting update --auto-provision
+                                                 --name
+                                                 [--subscription]
   examples:
   - summary: Turns on automatic provisioning on the subscription.
-    syntax:
-      content: az security auto-provisioning-setting update -n "default" --auto-provision "On"
+    syntax: az security auto-provisioning-setting update -n "default" --auto-provision "On"
   - summary: Turns off automatic provisioning on the subscription.
-    syntax:
-      content: az security auto-provisioning-setting update -n "default" --auto-provision "Off"
+    syntax: az security auto-provisioning-setting update -n "default" --auto-provision "Off"
   - summary: Updates your automatic provisioning settings on the subscription. (autogenerated)
-    syntax:
-      content: az security auto-provisioning-setting update --auto-provision "Off" --name "default" --subscription MySubscription
-  parameters:
+    syntax: az security auto-provisioning-setting update --auto-provision "Off" --name "default" --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --auto-provision
     summary: Automatic provisioning toggle. possible values are "On" or "Off".
@@ -79,25 +70,15 @@ items:
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_auto_provisioning_setting_list
-  name: az security auto-provisioning-setting list
-  summary: List the auto provisioning settings.
-- uid: az_security_auto_provisioning_setting_show
-  name: az security auto-provisioning-setting show
-  summary: Shows an auto provisioning setting.
-- uid: az_security_auto_provisioning_setting_update
-  name: az security auto-provisioning-setting update
-  summary: Updates your automatic provisioning settings on the subscription.
+- az_security_auto-provisioning-setting_list
+- az_security_auto-provisioning-setting_show
+- az_security_auto-provisioning-setting_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -113,10 +94,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your auto provisioning settings.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your auto provisioning settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/contact.yml b/2018-03-01-hybrid/docs-ref-autogen/security/contact.yml
index 8d10a3b3d5..c9d0b72337 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/contact.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/contact.yml
@@ -1,27 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_contact
-  name: az security contact
-  summary: View your security contacts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_contact_create
-  - az_security_contact_delete
-  - az_security_contact_list
-  - az_security_contact_show
+### YamlMime:AzureCLIGroup
+uid: az_security_contact
+name: az security contact
+summary: View your security contacts.
+description: ''
+directCommands:
 - uid: az_security_contact_create
   name: az security contact create
   summary: Creates a security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact create --email
+                               --name
+                               [--alert-notifications]
+                               [--alerts-admins]
+                               [--phone]
+                               [--subscription]
   examples:
   - summary: Creates a security contact.
-    syntax:
-      content: az security contact create -n "default1" --email 'john@contoso.com' --phone '(214)275-4038' --alert-notifications 'on' --alerts-admins 'on'
-  parameters:
+    syntax: az security contact create -n "default1" --email 'john@contoso.com' --phone '(214)275-4038' --alert-notifications 'on' --alerts-admins 'on'
+  requiredParameters:
   - isRequired: true
     name: --email
     summary: E-mail of the security contact.
@@ -30,6 +27,7 @@ items:
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --alert-notifications
     summary: Whether to send mail notifications to the security contacts.
     description: ''
@@ -42,93 +40,74 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_contact_delete
   name: az security contact delete
   summary: Deletes a security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact delete --name
+                               [--subscription]
   examples:
   - summary: Deletes a security contact.
-    syntax:
-      content: az security contact delete -n "default1"
-  parameters:
+    syntax: az security contact delete -n "default1"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_contact_list
   name: az security contact list
   summary: List security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact list [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get security contacts.
-    syntax:
-      content: az security contact list
-  parameters:
+    syntax: az security contact list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_contact_show
   name: az security contact show
   summary: Shows a security contact.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security contact show --name
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get a security contact.
-    syntax:
-      content: az security contact show -n "default1"
-  parameters:
+    syntax: az security contact show -n "default1"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_contact_create
-  name: az security contact create
-  summary: Creates a security contact.
-- uid: az_security_contact_delete
-  name: az security contact delete
-  summary: Deletes a security contact.
-- uid: az_security_contact_list
-  name: az security contact list
-  summary: List security contact.
-- uid: az_security_contact_show
-  name: az security contact show
-  summary: Shows a security contact.
+- az_security_contact_create
+- az_security_contact_delete
+- az_security_contact_list
+- az_security_contact_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -144,10 +123,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your security contacts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security contacts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/discovered-security-solution.yml b/2018-03-01-hybrid/docs-ref-autogen/security/discovered-security-solution.yml
index 37977c9db2..bccd5ae3e6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/discovered-security-solution.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/discovered-security-solution.yml
@@ -1,69 +1,59 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_discovered_security_solution
-  name: az security discovered-security-solution
-  summary: View your discovered security solutions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_discovered_security_solution_list
-  - az_security_discovered_security_solution_show
-- uid: az_security_discovered_security_solution_list
+### YamlMime:AzureCLIGroup
+uid: az_security_discovered-security-solution
+name: az security discovered-security-solution
+summary: View your discovered security solutions.
+description: ''
+directCommands:
+- uid: az_security_discovered-security-solution_list
   name: az security discovered-security-solution list
   summary: List the discovered security solutions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security discovered-security-solution list [--query-examples]
+                                                  [--subscription]
   examples:
   - summary: Get discovered security solutions.
-    syntax:
-      content: az security discovered-security-solution list
-  parameters:
+    syntax: az security discovered-security-solution list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_discovered_security_solution_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_discovered-security-solution_show
   name: az security discovered-security-solution show
   summary: Shows a discovered security solution.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security discovered-security-solution show --name
+                                                  --resource-group
+                                                  [--query-examples]
+                                                  [--subscription]
   examples:
   - summary: Get a discovered security solution.
-    syntax:
-      content: az security discovered-security-solution show -n ContosoWAF2 -g myService1
-  parameters:
+    syntax: az security discovered-security-solution show -n ContosoWAF2 -g myService1
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_discovered_security_solution_list
-  name: az security discovered-security-solution list
-  summary: List the discovered security solutions.
-- uid: az_security_discovered_security_solution_show
-  name: az security discovered-security-solution show
-  summary: Shows a discovered security solution.
+- az_security_discovered-security-solution_list
+- az_security_discovered-security-solution_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -79,10 +69,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your discovered security solutions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your discovered security solutions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/external-security-solution.yml b/2018-03-01-hybrid/docs-ref-autogen/security/external-security-solution.yml
index 4318da78ca..ca1f16735e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/external-security-solution.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/external-security-solution.yml
@@ -1,69 +1,59 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_external_security_solution
-  name: az security external-security-solution
-  summary: View your external security solutions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_external_security_solution_list
-  - az_security_external_security_solution_show
-- uid: az_security_external_security_solution_list
+### YamlMime:AzureCLIGroup
+uid: az_security_external-security-solution
+name: az security external-security-solution
+summary: View your external security solutions.
+description: ''
+directCommands:
+- uid: az_security_external-security-solution_list
   name: az security external-security-solution list
   summary: List the external security solutions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security external-security-solution list [--query-examples]
+                                                [--subscription]
   examples:
   - summary: Get external security solutions.
-    syntax:
-      content: az security external-security-solution list
-  parameters:
+    syntax: az security external-security-solution list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_external_security_solution_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_external-security-solution_show
   name: az security external-security-solution show
   summary: Shows an external security solution.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security external-security-solution show --name
+                                                --resource-group
+                                                [--query-examples]
+                                                [--subscription]
   examples:
   - summary: Get an external security solution.
-    syntax:
-      content: az security external-security-solution show -n aad_defaultworkspace-20ff7fc3-e762-44dd-bd96-b71116dcdc23-eus -g defaultresourcegroup-eus
-  parameters:
+    syntax: az security external-security-solution show -n aad_defaultworkspace-20ff7fc3-e762-44dd-bd96-b71116dcdc23-eus -g defaultresourcegroup-eus
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_external_security_solution_list
-  name: az security external-security-solution list
-  summary: List the external security solutions.
-- uid: az_security_external_security_solution_show
-  name: az security external-security-solution show
-  summary: Shows an external security solution.
+- az_security_external-security-solution_list
+- az_security_external-security-solution_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -79,10 +69,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your external security solutions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your external security solutions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/iot-alerts.yml b/2018-03-01-hybrid/docs-ref-autogen/security/iot-alerts.yml
new file mode 100644
index 0000000000..434f7ad9ed
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/iot-alerts.yml
@@ -0,0 +1,122 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-alerts
+name: az security iot-alerts
+summary: View IoT Security aggregated alerts.
+description: ''
+directCommands:
+- uid: az_security_iot-alerts_delete
+  name: az security iot-alerts delete
+  summary: Dismiss an aggregated IoT Security Alert.
+  description: ''
+  syntax: >-
+    az security iot-alerts delete --name
+                                  --resource-group
+                                  --solution-name
+                                  [--subscription]
+  examples:
+  - summary: Dismiss an aggregated IoT Security Alert.
+    syntax: az security iot-alerts delete --solution-name 'IoT-Hub1' --resource-group 'rg1' --name 'IoT_CryptoMiner/2020-06-24'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-alerts_list
+  name: az security iot-alerts list
+  summary: List all yours IoT Security solution aggregated alerts.
+  description: ''
+  syntax: >-
+    az security iot-alerts list --resource-group
+                                --solution-name
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get list of all IoT Security solution aggregated alerts.
+    syntax: az security iot-alerts list --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-alerts_show
+  name: az security iot-alerts show
+  summary: Shows a single aggregated alert of yours IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-alerts show --name
+                                --resource-group
+                                --solution-name
+                                [--query-examples]
+                                [--subscription]
+  examples:
+  - summary: Get an IoT Security solution aggregated alert.
+    syntax: az security iot-alerts show --solution-name 'IoT-Hub1' --resource-group 'rg1' --name 'IoT_CryptoMiner/2020-06-24'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-alerts_delete
+- az_security_iot-alerts_list
+- az_security_iot-alerts_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View IoT Security aggregated alerts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/iot-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/security/iot-analytics.yml
new file mode 100644
index 0000000000..fe67a98d05
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/iot-analytics.yml
@@ -0,0 +1,86 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-analytics
+name: az security iot-analytics
+summary: View IoT Security Analytics metrics.
+description: ''
+directCommands:
+- uid: az_security_iot-analytics_list
+  name: az security iot-analytics list
+  summary: List all IoT security Analytics metrics.
+  description: ''
+  syntax: >-
+    az security iot-analytics list --resource-group
+                                   --solution-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get List of all IoT security Analytics metrics.
+    syntax: az security iot-analytics list --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-analytics_show
+  name: az security iot-analytics show
+  summary: Shows IoT Security Analytics metrics.
+  description: ''
+  syntax: >-
+    az security iot-analytics show --resource-group
+                                   --solution-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get an IoT Security Analytics metrics.
+    syntax: az security iot-analytics show --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-analytics_list
+- az_security_iot-analytics_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View IoT Security Analytics metrics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/iot-recommendations.yml b/2018-03-01-hybrid/docs-ref-autogen/security/iot-recommendations.yml
new file mode 100644
index 0000000000..b0bb32255e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/iot-recommendations.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-recommendations
+name: az security iot-recommendations
+summary: View IoT Security aggregated recommendations.
+description: ''
+directCommands:
+- uid: az_security_iot-recommendations_list
+  name: az security iot-recommendations list
+  summary: List all yours IoT Security solution aggregated recommendations.
+  description: ''
+  syntax: >-
+    az security iot-recommendations list --resource-group
+                                         --solution-name
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get list of all IoT Security solution aggregated recommendations.
+    syntax: az security iot-recommendations list --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-recommendations_show
+  name: az security iot-recommendations show
+  summary: Shows a single aggregated recommendation of yours IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-recommendations show --name
+                                         --resource-group
+                                         --solution-name
+                                         [--query-examples]
+                                         [--subscription]
+  examples:
+  - summary: Get an IoT Security solution aggregated recommendation.
+    syntax: az security iot-recommendations show --solution-name 'IoT-Hub1' --resource-group 'rg1' --name 'IoT_PermissiveFirewallPolicy'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-recommendations_list
+- az_security_iot-recommendations_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View IoT Security aggregated recommendations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/iot-solution.yml b/2018-03-01-hybrid/docs-ref-autogen/security/iot-solution.yml
new file mode 100644
index 0000000000..f10d65fb92
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/iot-solution.yml
@@ -0,0 +1,180 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_iot-solution
+name: az security iot-solution
+summary: Manage your IoT Security solution.
+description: ''
+directCommands:
+- uid: az_security_iot-solution_create
+  name: az security iot-solution create
+  summary: Create your IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution create --display-name
+                                    --iot-hubs
+                                    --location
+                                    --resource-group
+                                    --solution-name
+                                    [--subscription]
+  examples:
+  - summary: create an IoT Security solution on existing IoT Hub.
+    syntax: az security iot-solution create --solution-name 'IoT-Hub1' --resource-group 'rg1' --iot-hubs /subscriptions/subscriptionId/resourcegroups/rg1/providers/Microsoft.Devices/IotHubs/IoT-Hub1 --display-name "Solution Default" --location "eastus"
+  requiredParameters:
+  - isRequired: true
+    name: --display-name
+    summary: Resource display name.
+    description: ''
+  - isRequired: true
+    name: --iot-hubs
+    summary: IoT Hub resource IDs.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location of the resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_delete
+  name: az security iot-solution delete
+  summary: Delete your IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution delete --resource-group
+                                    --solution-name
+                                    [--subscription]
+  examples:
+  - summary: Delete an IoT Security solutions.
+    syntax: az security iot-solution delete --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_list
+  name: az security iot-solution list
+  summary: List all IoT Security solutions.
+  description: ''
+  syntax: >-
+    az security iot-solution list [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
+  examples:
+  - summary: Get List of all IoT Security solutions in subscription.
+    syntax: az security iot-solution list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_show
+  name: az security iot-solution show
+  summary: Shows a IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution show --resource-group
+                                  --solution-name
+                                  [--query-examples]
+                                  [--subscription]
+  examples:
+  - summary: Get an IoT Security solutions.
+    syntax: az security iot-solution show --solution-name 'IoT-Hub1' --resource-group 'rg1'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_iot-solution_update
+  name: az security iot-solution update
+  summary: Update your IoT Security solution.
+  description: ''
+  syntax: >-
+    az security iot-solution update --resource-group
+                                    --solution-name
+                                    [--display-name]
+                                    [--iot-hubs]
+                                    [--subscription]
+  examples:
+  - summary: Update your IoT Security solution.
+    syntax: az security iot-solution update --solution-name 'IoT-Hub1' --resource-group 'rg1' --iot-hubs /subscriptions/subscriptionId/resourcegroups/rg1/providers/Microsoft.Devices/IotHubs/IoT-Hub1 --display-name "Solution Default"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --solution-name
+    summary: Name of the IoT Security solution.
+    description: ''
+  optionalParameters:
+  - name: --display-name
+    summary: Resource display name.
+    description: ''
+  - name: --iot-hubs
+    summary: IoT Hub resource IDs.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_iot-solution_create
+- az_security_iot-solution_delete
+- az_security_iot-solution_list
+- az_security_iot-solution_show
+- az_security_iot-solution_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Manage your IoT Security solution.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/jit-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/security/jit-policy.yml
index 6ae37368ac..fd64e1f06d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/jit-policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/jit-policy.yml
@@ -1,51 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_jit_policy
-  name: az security jit-policy
-  summary: Manage your Just in Time network access policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_jit_policy_list
-  - az_security_jit_policy_show
-- uid: az_security_jit_policy_list
+### YamlMime:AzureCLIGroup
+uid: az_security_jit-policy
+name: az security jit-policy
+summary: Manage your Just in Time network access policies.
+description: ''
+directCommands:
+- uid: az_security_jit-policy_list
   name: az security jit-policy list
   summary: List your Just in Time network access policies.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security jit-policy list [--location]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Get all the Just in Time network access policies.
-    syntax:
-      content: az security jit-policy list
-  parameters:
+    syntax: az security jit-policy list
+  optionalParameters:
   - name: --location -l
     summary: Location of the resource.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_jit_policy_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_jit-policy_show
   name: az security jit-policy show
   summary: Shows a Just in Time network access policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security jit-policy show --location
+                                --name
+                                --resource-group
+                                [--query-examples]
+                                [--subscription]
   examples:
   - summary: Get a Just in Time network access policy.
-    syntax:
-      content: az security jit-policy show -l northeurope -n default -g myService1
-  parameters:
+    syntax: az security jit-policy show -l northeurope -n default -g myService1
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: Location of the resource.
@@ -56,24 +54,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_jit_policy_list
-  name: az security jit-policy list
-  summary: List your Just in Time network access policies.
-- uid: az_security_jit_policy_show
-  name: az security jit-policy show
-  summary: Shows a Just in Time network access policy.
+- az_security_jit-policy_list
+- az_security_jit-policy_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -89,10 +82,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Manage your Just in Time network access policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Manage your Just in Time network access policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/location.yml b/2018-03-01-hybrid/docs-ref-autogen/security/location.yml
index bf19239561..8c75a45f6f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/location.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/location.yml
@@ -1,65 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_location
-  name: az security location
-  summary: Shows the Azure Security Center Home region location.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_location_list
-  - az_security_location_show
+### YamlMime:AzureCLIGroup
+uid: az_security_location
+name: az security location
+summary: Shows the Azure Security Center Home region location.
+description: ''
+directCommands:
 - uid: az_security_location_list
   name: az security location list
   summary: Shows the Azure Security Center Home region location.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security location list [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the Azure Security Center Home region location.
-    syntax:
-      content: az security location list
-  parameters:
+    syntax: az security location list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_location_show
   name: az security location show
   summary: Shows the Azure Security Center Home region location.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security location show --name
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the Azure Security Center Home region location.
-    syntax:
-      content: az security location show -n centralus
-  parameters:
+    syntax: az security location show -n centralus
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_location_list
-  name: az security location list
-  summary: Shows the Azure Security Center Home region location.
-- uid: az_security_location_show
-  name: az security location show
-  summary: Shows the Azure Security Center Home region location.
+- az_security_location_list
+- az_security_location_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +64,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the Azure Security Center Home region location.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Shows the Azure Security Center Home region location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/pricing.yml b/2018-03-01-hybrid/docs-ref-autogen/security/pricing.yml
index 81f0dc080b..a0862ac6b1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/pricing.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/pricing.yml
@@ -1,29 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_pricing
-  name: az security pricing
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_pricing_create
-  - az_security_pricing_list
-  - az_security_pricing_show
+### YamlMime:AzureCLIGroup
+uid: az_security_pricing
+name: az security pricing
+summary: Enables managing the Azure Defender plan for the subscription.
+description: ''
+directCommands:
 - uid: az_security_pricing_create
   name: az security pricing create
-  summary: Updates the Azure Security Center Pricing tier for the subscription.
+  summary: Updates the Azure defender plan for the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security pricing create --name
+                               --tier
+                               [--subscription]
   examples:
-  - summary: Updates the Azure Security Center Pricing tier for the subscription.
-    syntax:
-      content: az security pricing create -n default --tier 'standard'
-  - summary: Updates the Azure Security Center Pricing tier for the subscription. (autogenerated)
-    syntax:
-      content: az security pricing create --name default --subscription MySubscription --tier 'standard'
-  parameters:
+  - summary: Updates the Azure defender plan for the subscription.
+    syntax: az security pricing create -n VirtualMachines --tier 'standard'
+  - summary: Updates the Azure defender plan for the subscription. (autogenerated)
+    syntax: az security pricing create -n VirtualMachines --tier 'standard'
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
@@ -32,75 +26,57 @@ items:
     name: --tier
     summary: Pricing tier type.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_pricing_list
   name: az security pricing list
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
+  summary: Shows the Azure Defender plans for the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security pricing list [--query-examples]
+                             [--subscription]
   examples:
-  - summary: Shows the Azure Security Center Pricing tier for the subscription.
-    syntax:
-      content: az security pricing list
-  parameters:
+  - summary: Shows the Azure Defender plans for the subscription.
+    syntax: az security pricing list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_pricing_show
   name: az security pricing show
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
+  summary: Shows the Azure Defender plan for the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security pricing show --name
+                             [--query-examples]
+                             [--subscription]
   examples:
-  - summary: Shows the Azure Security Center Pricing tier for the subscription.
-    syntax:
-      content: az security pricing show -n default
-  parameters:
+  - summary: Shows the Azure Defender plan for the subscription
+    syntax: az security pricing show -n VirtualMachines
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_pricing_create
-  name: az security pricing create
-  summary: Updates the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_list
-  name: az security pricing list
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
-- uid: az_security_pricing_show
-  name: az security pricing show
-  summary: Shows the Azure Security Center Pricing tier for the subscription.
+- az_security_pricing_create
+- az_security_pricing_list
+- az_security_pricing_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -116,10 +92,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the Azure Security Center Pricing tier for the subscription.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Enables managing the Azure Defender plan for the subscription.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-assessments.yml b/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-assessments.yml
new file mode 100644
index 0000000000..ad1eb4711f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-assessments.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_regulatory-compliance-assessments
+name: az security regulatory-compliance-assessments
+summary: Regulatory compliance assessments.
+description: ''
+directCommands:
+- uid: az_security_regulatory-compliance-assessments_list
+  name: az security regulatory-compliance-assessments list
+  summary: Get details and state of assessments mapped to selected regulatory compliance control.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-assessments list --control-name
+                                                       --standard-name
+                                                       [--query-examples]
+                                                       [--subscription]
+  examples:
+  - summary: Get state of mapped assessments.
+    syntax: az security regulatory-compliance-assessments list --standard-name 'Azure-CIS-1.1.0' --control-name '1.1'
+  requiredParameters:
+  - isRequired: true
+    name: --control-name
+    summary: The compliance control name.
+    description: ''
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_regulatory-compliance-assessments_show
+  name: az security regulatory-compliance-assessments show
+  summary: Shows supported regulatory compliance details and state for selected assessment.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-assessments show --control-name
+                                                       --name
+                                                       --standard-name
+                                                       [--query-examples]
+                                                       [--subscription]
+  examples:
+  - summary: Get selected regulatory compliance control details and state.
+    syntax: az security regulatory-compliance-assessments show --standard-name 'Azure-CIS-1.1.0' --control-name '1.1' -n '94290b00-4d0c-d7b4-7cea-064a9554e681'
+  requiredParameters:
+  - isRequired: true
+    name: --control-name
+    summary: The compliance control name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_regulatory-compliance-assessments_list
+- az_security_regulatory-compliance-assessments_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Regulatory compliance assessments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-controls.yml b/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-controls.yml
new file mode 100644
index 0000000000..665bedf541
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-controls.yml
@@ -0,0 +1,81 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_regulatory-compliance-controls
+name: az security regulatory-compliance-controls
+summary: Regulatory compliance controls.
+description: ''
+directCommands:
+- uid: az_security_regulatory-compliance-controls_list
+  name: az security regulatory-compliance-controls list
+  summary: List supported of regulatory compliance controls details and state for selected standard.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-controls list --standard-name
+                                                    [--query-examples]
+                                                    [--subscription]
+  examples:
+  - summary: Get regulatory compliance controls list.
+    syntax: az security regulatory-compliance-controls list --standard-name 'Azure-CIS-1.1.0'
+  requiredParameters:
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_regulatory-compliance-controls_show
+  name: az security regulatory-compliance-controls show
+  summary: Shows a regulatory compliance details state for selected standard.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-controls show --name
+                                                    --standard-name
+                                                    [--query-examples]
+                                                    [--subscription]
+  examples:
+  - summary: Get selected regulatory compliance control details and state.
+    syntax: az security regulatory-compliance-controls show --standard-name 'Azure-CIS-1.1.0' -n '1.1'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  - isRequired: true
+    name: --standard-name
+    summary: The compliance standard name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_regulatory-compliance-controls_list
+- az_security_regulatory-compliance-controls_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Regulatory compliance controls.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-standards.yml b/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-standards.yml
new file mode 100644
index 0000000000..737e63b7a1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/regulatory-compliance-standards.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_regulatory-compliance-standards
+name: az security regulatory-compliance-standards
+summary: Regulatory compliance standards.
+description: ''
+directCommands:
+- uid: az_security_regulatory-compliance-standards_list
+  name: az security regulatory-compliance-standards list
+  summary: List supported regulatory compliance standards details and state results.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-standards list [--query-examples]
+                                                     [--subscription]
+  examples:
+  - summary: Get regulatory compliance standards list.
+    syntax: az security regulatory-compliance-standards list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_regulatory-compliance-standards_show
+  name: az security regulatory-compliance-standards show
+  summary: Shows a regulatory compliance details state for selected standard.
+  description: ''
+  syntax: >-
+    az security regulatory-compliance-standards show --name
+                                                     [--query-examples]
+                                                     [--subscription]
+  examples:
+  - summary: Get regulatory compliance standard details.
+    syntax: az security regulatory-compliance-standards show -n 'Azure-CIS-1.1.0'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_regulatory-compliance-standards_list
+- az_security_regulatory-compliance-standards_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Regulatory compliance standards.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/secure-score-control-definitions.yml b/2018-03-01-hybrid/docs-ref-autogen/security/secure-score-control-definitions.yml
new file mode 100644
index 0000000000..5e1135f0bb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/secure-score-control-definitions.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_secure-score-control-definitions
+name: az security secure-score-control-definitions
+summary: Secure score control definitions.
+description: ''
+directCommands:
+- uid: az_security_secure-score-control-definitions_list
+  name: az security secure-score-control-definitions list
+  summary: Get details of secure score control definitions.
+  description: ''
+  syntax: >-
+    az security secure-score-control-definitions list [--query-examples]
+                                                      [--subscription]
+  examples:
+  - summary: Get secure score control definitions.
+    syntax: az security secure-score-control-definitions list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_secure-score-control-definitions_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Secure score control definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/secure-score-controls.yml b/2018-03-01-hybrid/docs-ref-autogen/security/secure-score-controls.yml
new file mode 100644
index 0000000000..17a331bf11
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/secure-score-controls.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_secure-score-controls
+name: az security secure-score-controls
+summary: Secure score controls.
+description: ''
+directCommands:
+- uid: az_security_secure-score-controls_list
+  name: az security secure-score-controls list
+  summary: List supported of secure score controls details and state for scope.
+  description: ''
+  syntax: >-
+    az security secure-score-controls list [--query-examples]
+                                           [--subscription]
+  examples:
+  - summary: Get secure score controls list.
+    syntax: az security secure-score-controls list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_secure-score-controls_list_by_score
+  name: az security secure-score-controls list_by_score
+  summary: List supported of secure score controls details and state for selected score.
+  description: ''
+  syntax: >-
+    az security secure-score-controls list_by_score --name
+                                                    [--subscription]
+  examples:
+  - summary: Get secure score controls list.
+    syntax: az security secure-score-controls list_by_score -n 'ascScore'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_secure-score-controls_list
+- az_security_secure-score-controls_list_by_score
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Secure score controls.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/secure-scores.yml b/2018-03-01-hybrid/docs-ref-autogen/security/secure-scores.yml
new file mode 100644
index 0000000000..29e882f7f1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/secure-scores.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_secure-scores
+name: az security secure-scores
+summary: Secure scores.
+description: ''
+directCommands:
+- uid: az_security_secure-scores_list
+  name: az security secure-scores list
+  summary: List of secure-scores details and state results.
+  description: ''
+  syntax: >-
+    az security secure-scores list [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get secure scores list.
+    syntax: az security secure-scores list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_secure-scores_show
+  name: az security secure-scores show
+  summary: Shows a secure score details for selected initiative.
+  description: ''
+  syntax: >-
+    az security secure-scores show --name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get secure score details.
+    syntax: az security secure-scores show -n 'ascScore'
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_secure-scores_list
+- az_security_secure-scores_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Secure scores.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/setting.yml b/2018-03-01-hybrid/docs-ref-autogen/security/setting.yml
index 02dcafe82d..827ff009a4 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/setting.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/setting.yml
@@ -1,65 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_setting
-  name: az security setting
-  summary: View your security settings.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_setting_list
-  - az_security_setting_show
+### YamlMime:AzureCLIGroup
+uid: az_security_setting
+name: az security setting
+summary: View your security settings.
+description: ''
+directCommands:
 - uid: az_security_setting_list
   name: az security setting list
   summary: List security settings.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security setting list [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get security settings.
-    syntax:
-      content: az security setting list
-  parameters:
+    syntax: az security setting list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_setting_show
   name: az security setting show
   summary: Shows a security setting.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security setting show --name
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Get a security setting.
-    syntax:
-      content: az security setting show -n "MCAS"
-  parameters:
+    syntax: az security setting show -n "MCAS"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_setting_list
-  name: az security setting list
-  summary: List security settings.
-- uid: az_security_setting_show
-  name: az security setting show
-  summary: Shows a security setting.
+- az_security_setting_list
+- az_security_setting_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +64,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View your security settings.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/sub-assessment.yml b/2018-03-01-hybrid/docs-ref-autogen/security/sub-assessment.yml
new file mode 100644
index 0000000000..70efbda6dc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/sub-assessment.yml
@@ -0,0 +1,87 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_sub-assessment
+name: az security sub-assessment
+summary: View your security sub assessments.
+description: ''
+directCommands:
+- uid: az_security_sub-assessment_list
+  name: az security sub-assessment list
+  summary: List all security sub assessment results.
+  description: ''
+  syntax: >-
+    az security sub-assessment list [--assessed-resource-id]
+                                    [--assessment-name]
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get security sub assessments.
+    syntax: az security sub-assessment list
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --assessment-name
+    summary: Name of the assessment resource.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_sub-assessment_show
+  name: az security sub-assessment show
+  summary: Shows a security sub assessment.
+  description: ''
+  syntax: >-
+    az security sub-assessment show --assessment-name
+                                    --name
+                                    [--assessed-resource-id]
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get a security sub assessment.
+    syntax: az security sub-assessment show --assessed-resource-id '/subscriptions/f8b197db-3b2b-4404-a3a3-0dfec293d0d0/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1' --assessment-name '4fb6c0a0-1137-42c7-a1c7-4bd37c91de8d' -n 'd7c4d9ec-227c-4fb3-acf9-25fdd97c1bf1'
+  requiredParameters:
+  - isRequired: true
+    name: --assessment-name
+    summary: Name of the assessment resource.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the resource to be fetched.
+    description: ''
+  optionalParameters:
+  - name: --assessed-resource-id
+    summary: The target resource for this assessment.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_sub-assessment_list
+- az_security_sub-assessment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View your security sub assessments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/task.yml b/2018-03-01-hybrid/docs-ref-autogen/security/task.yml
index ce36941fe0..570ab3f5db 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/task.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/task.yml
@@ -1,77 +1,66 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_task
-  name: az security task
-  summary: View security tasks (recommendations).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_task_list
-  - az_security_task_show
+### YamlMime:AzureCLIGroup
+uid: az_security_task
+name: az security task
+summary: View security tasks (recommendations).
+description: ''
+directCommands:
 - uid: az_security_task_list
   name: az security task list
   summary: List security tasks (recommendations).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security task list [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Get security tasks (recommendations) on a subscription scope.
-    syntax:
-      content: az security task list
+    syntax: az security task list
   - summary: Get security tasks (recommendations) on a resource group scope.
-    syntax:
-      content: az security task list -g "myRg"
-  parameters:
+    syntax: az security task list -g "myRg"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_task_show
   name: az security task show
   summary: Shows a security task (recommendation).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security task show --name
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Get a security task (recommendation) on a subscription scope.
-    syntax:
-      content: az security task show -n "taskName"
+    syntax: az security task show -n "taskName"
   - summary: Get a security task (recommendation) on a resource group scope.
-    syntax:
-      content: az security task show -g "myRg" -n "taskName"
-  parameters:
+    syntax: az security task show -g "myRg" -n "taskName"
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_task_list
-  name: az security task list
-  summary: List security tasks (recommendations).
-- uid: az_security_task_show
-  name: az security task show
-  summary: Shows a security task (recommendation).
+- az_security_task_list
+- az_security_task_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -87,10 +76,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: View security tasks (recommendations).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View security tasks (recommendations).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/topology.yml b/2018-03-01-hybrid/docs-ref-autogen/security/topology.yml
index 3f6ff9629e..f2937008d1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/topology.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/topology.yml
@@ -1,69 +1,59 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_topology
-  name: az security topology
-  summary: Shows the network topology in your subscription.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_topology_list
-  - az_security_topology_show
+### YamlMime:AzureCLIGroup
+uid: az_security_topology
+name: az security topology
+summary: Shows the network topology in your subscription.
+description: ''
+directCommands:
 - uid: az_security_topology_list
   name: az security topology list
   summary: Shows the network topology in your subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security topology list [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the network topology in your subscription.
-    syntax:
-      content: az security topology list
-  parameters:
+    syntax: az security topology list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 - uid: az_security_topology_show
   name: az security topology show
   summary: Shows the network topology in your subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security topology show --name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Shows the network topology in your subscription.
-    syntax:
-      content: az security topology show -n default -g myService1
-  parameters:
+    syntax: az security topology show -n default -g myService1
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_topology_list
-  name: az security topology list
-  summary: Shows the network topology in your subscription.
-- uid: az_security_topology_show
-  name: az security topology show
-  summary: Shows the network topology in your subscription.
+- az_security_topology_list
+- az_security_topology_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -79,10 +69,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the network topology in your subscription.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Shows the network topology in your subscription.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/va.yml b/2018-03-01-hybrid/docs-ref-autogen/security/va.yml
new file mode 100644
index 0000000000..0ee0897e72
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/va.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va
+name: az security va
+summary: ''
+description: ''
+commands:
+- az_security_va_sql
+- az_security_va_sql_baseline
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+- az_security_va_sql_results
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+- az_security_va_sql_scans
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/va/sql.yml b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql.yml
new file mode 100644
index 0000000000..54828381ee
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql
+name: az security va sql
+summary: View Sql Vulnerability Assessment scan results and manage baseline.
+description: ''
+commands:
+- az_security_va_sql_baseline
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+- az_security_va_sql_results
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+- az_security_va_sql_scans
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View Sql Vulnerability Assessment scan results and manage baseline.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/baseline.yml b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/baseline.yml
new file mode 100644
index 0000000000..81d5824479
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/baseline.yml
@@ -0,0 +1,325 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql_baseline
+name: az security va sql baseline
+summary: View and manage Sql Vulnerability Assessment baseline.
+description: ''
+directCommands:
+- uid: az_security_va_sql_baseline_delete
+  name: az security va sql baseline delete
+  summary: Delete Sql Vulnerability Assessment rule baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline delete --database-name
+                                       --rule-id
+                                       --server-name
+                                       --vm-resource-id
+                                       --workspace-id
+                                       [--agent-id]
+                                       [--subscription]
+                                       [--vm-name]
+                                       [--vm-uuid]
+  examples:
+  - summary: Delete Sql Vulnerability Assessment rule baseline on an Azure virtual machine.
+    syntax: az security va sql baseline delete --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999
+  - summary: Delete Sql Vulnerability Assessment rule baseline on an On-Premise machine.
+    syntax: az security va sql baseline delete --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_list
+  name: az security va sql baseline list
+  summary: View Sql Vulnerability Assessment baseline for all rules.
+  description: ''
+  syntax: >-
+    az security va sql baseline list --database-name
+                                     --server-name
+                                     --vm-resource-id
+                                     --workspace-id
+                                     [--agent-id]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--vm-name]
+                                     [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment baseline for all rules on an Azure virtual machine.
+    syntax: az security va sql baseline list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName
+  - summary: View Sql Vulnerability Assessment baseline for all rules on an On-Premise machine.
+    syntax: az security va sql baseline list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_set
+  name: az security va sql baseline set
+  summary: Sets Sql Vulnerability Assessment baseline. Replaces the current baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline set --database-name
+                                    --server-name
+                                    --vm-resource-id
+                                    --workspace-id
+                                    [--agent-id]
+                                    [--baseline]
+                                    [--latest {false, true}]
+                                    [--subscription]
+                                    [--vm-name]
+                                    [--vm-uuid]
+  examples:
+  - summary: Sets Sql Vulnerability Assessment baseline on an Azure virtual machine. Replaces the current baseline with latest scan results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --latest
+  - summary: Sets Sql Vulnerability Assessment baseline on an Azure virtual machine. Replaces the current baseline with provided results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --baseline rule=VA9999 Line1_col1 Line1_col2 Line1_col3 --baseline rule=VA8888 Line1_col1 Line1_col2 --baseline rule=VA9999 Line2_col1 Line2_col2 Line2_col3
+  - summary: Sets Sql Vulnerability Assessment baseline on an On-Premise machine. Replaces the current baseline with latest scan results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --latest
+  - summary: Sets Sql Vulnerability Assessment baseline on an On-Premise machine. Replaces the current baseline with provided results.
+    syntax: az security va sql baseline set --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --baseline rule=VA9999 Line1_col1 Line1_col2 Line1_col3 --baseline rule=VA8888 Line1_col1 Line1_col2 --baseline rule=VA9999 Line2_col1 Line2_col2 Line2_col3
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --baseline -b
+    summary: 'Baseline records to be set. The following example will set a baseline for two rules: --baseline rule=VA1111 line1_w1 line1_w2 --baseline rule=VA2222 line1_w1 line1_w2 line1_w3 --baseline rule=VA1111 line2_w1 line2_w2.'
+    description: ''
+  - name: --latest
+    parameterValueGroup: false, true
+    summary: Use this argument without parameters to set baseline upon latest scan results.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_show
+  name: az security va sql baseline show
+  summary: View Sql Vulnerability Assessment rule baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline show --database-name
+                                     --rule-id
+                                     --server-name
+                                     --vm-resource-id
+                                     --workspace-id
+                                     [--agent-id]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--vm-name]
+                                     [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment rule baseline on an Azure virtual machine.
+    syntax: az security va sql baseline show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999
+  - summary: View Sql Vulnerability Assessment rule baseline on an On-Premise machine.
+    syntax: az security va sql baseline show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_baseline_update
+  name: az security va sql baseline update
+  summary: Update Sql Vulnerability Assessment rule baseline. Replaces the current rule baseline.
+  description: ''
+  syntax: >-
+    az security va sql baseline update --database-name
+                                       --rule-id
+                                       --server-name
+                                       --vm-resource-id
+                                       --workspace-id
+                                       [--agent-id]
+                                       [--baseline]
+                                       [--latest {false, true}]
+                                       [--subscription]
+                                       [--vm-name]
+                                       [--vm-uuid]
+  examples:
+  - summary: Update Sql Vulnerability Assessment rule baseline on an Azure virtual machine. Replaces the current rule baseline with latest scan results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999 --latest
+  - summary: Update Sql Vulnerability Assessment rule baseline on an Azure virtual machine. Replaces the current rule baseline with provided results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --rule-id VA9999 --baseline Line1_Col1 Line1_Col2 --baseline Line2_Col1 Line2_Col2
+  - summary: Update Sql Vulnerability Assessment rule baseline on an On-Premise machine. Replaces the current rule baseline with latest scan results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999 --latest
+  - summary: Update Sql Vulnerability Assessment rule baseline on an On-Premise machine. Replaces the current rule baseline with provided results.
+    syntax: az security va sql baseline update --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --rule-id VA9999 --baseline Line1_Col1 Line1_Col2 --baseline Line2_Col1 Line2_Col2
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --baseline -b
+    summary: 'Baseline records to be set. The following example will set a baseline with two records: --baseline line1_w1 line1_w2 line1_w3 --baseline line2_w1 line2_w2 line2_w3.'
+    description: ''
+  - name: --latest
+    parameterValueGroup: false, true
+    summary: Use this argument without parameters to set baseline upon latest scan results.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_va_sql_baseline_delete
+- az_security_va_sql_baseline_list
+- az_security_va_sql_baseline_set
+- az_security_va_sql_baseline_show
+- az_security_va_sql_baseline_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View and manage Sql Vulnerability Assessment baseline.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/results.yml b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/results.yml
new file mode 100644
index 0000000000..b69612ce2a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/results.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql_results
+name: az security va sql results
+summary: View Sql Vulnerability Assessment scan results.
+description: ''
+directCommands:
+- uid: az_security_va_sql_results_list
+  name: az security va sql results list
+  summary: View all Sql Vulnerability Assessment scan results.
+  description: ''
+  syntax: >-
+    az security va sql results list --database-name
+                                    --scan-id
+                                    --server-name
+                                    --vm-resource-id
+                                    --workspace-id
+                                    [--agent-id]
+                                    [--query-examples]
+                                    [--subscription]
+                                    [--vm-name]
+                                    [--vm-uuid]
+  examples:
+  - summary: View all Sql Vulnerability Assessment scan results on an Azure virtual machine.
+    syntax: az security va sql results list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --scan-id MyScanId
+  - summary: View all Sql Vulnerability Assessment scan results on an On-Premise machine.
+    syntax: az security va sql results list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --scan-id MyScanId
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: The ID of the scan.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_results_show
+  name: az security va sql results show
+  summary: View Sql Vulnerability Assessment scan results.
+  description: ''
+  syntax: >-
+    az security va sql results show --database-name
+                                    --rule-id
+                                    --scan-id
+                                    --server-name
+                                    --vm-resource-id
+                                    --workspace-id
+                                    [--agent-id]
+                                    [--query-examples]
+                                    [--subscription]
+                                    [--vm-name]
+                                    [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment scan results on an Azure virtual machine.
+    syntax: az security va sql results show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --scan-id MyScanId --rule-id VA9999
+  - summary: View Sql Vulnerability Assessment scan results on an On-Premise machine.
+    syntax: az security va sql results show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --scan-id MyScanId --rule-id VA9999
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: 'The ID of the scanned rule. Format: "VAXXXX", where XXXX indicates the number of the rule.'
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: The ID of the scan.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_va_sql_results_list
+- az_security_va_sql_results_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View Sql Vulnerability Assessment scan results.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/scans.yml b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/scans.yml
new file mode 100644
index 0000000000..511474cb6f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/va/sql/scans.yml
@@ -0,0 +1,139 @@
+### YamlMime:AzureCLIGroup
+uid: az_security_va_sql_scans
+name: az security va sql scans
+summary: View Sql Vulnerability Assessment scan summaries.
+description: ''
+directCommands:
+- uid: az_security_va_sql_scans_list
+  name: az security va sql scans list
+  summary: List all Sql Vulnerability Assessment scan summaries.
+  description: ''
+  syntax: >-
+    az security va sql scans list --database-name
+                                  --server-name
+                                  --vm-resource-id
+                                  --workspace-id
+                                  [--agent-id]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--vm-name]
+                                  [--vm-uuid]
+  examples:
+  - summary: List all Sql Vulnerability Assessment scan summaries on an Azure virtual machine.
+    syntax: az security va sql scans list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName
+  - summary: List all Sql Vulnerability Assessment scan summaries on an On-Premise machine.
+    syntax: az security va sql scans list --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_va_sql_scans_show
+  name: az security va sql scans show
+  summary: View Sql Vulnerability Assessment scan summaries.
+  description: ''
+  syntax: >-
+    az security va sql scans show --database-name
+                                  --scan-id
+                                  --server-name
+                                  --vm-resource-id
+                                  --workspace-id
+                                  [--agent-id]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--vm-name]
+                                  [--vm-uuid]
+  examples:
+  - summary: View Sql Vulnerability Assessment scan summary on an Azure virtual machine.
+    syntax: az security va sql scans show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.Compute/VirtualMachines/MyVmName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --scan-id MyScanId
+  - summary: View Sql Vulnerability Assessment scan summary on an On-Premise machine.
+    syntax: az security va sql scans show --vm-resource-id subscriptions/MySubscription/ResourceGroups/MyResourceGroup/Providers/Microsoft.OperationalInsights/Workspaces/MyWorkspaceName --workspace-id 00000000-0000-0000-0000-000000000000 --server-name MyServerName --database-name MyDbName --vm-name MyVmName --agent-id MyAgentId --vm-uuid MyVmUUID --scan-id MyScanId
+  requiredParameters:
+  - isRequired: true
+    name: --database-name
+    summary: The name of the scanned database.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: The ID of the scan.
+    description: ''
+  - isRequired: true
+    name: --server-name
+    summary: The name of the scanned server.
+    description: ''
+  - isRequired: true
+    name: --vm-resource-id
+    summary: Resource ID of the scanned machine. For On-Premise machines, please provide your workspace resource ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-id
+    summary: The ID of the workspace connected to the scanned machine.
+    description: ''
+  optionalParameters:
+  - name: --agent-id
+    summary: Provide the ID of the agent on the scanned machine, for On-Premise resources only.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --vm-name
+    summary: Provide the name of the machine, for On-Premise resources only.
+    description: ''
+  - name: --vm-uuid
+    summary: Provide the UUID of the scanned machine, for On-Premise resources only.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+commands:
+- az_security_va_sql_scans_list
+- az_security_va_sql_scans_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: View Sql Vulnerability Assessment scan summaries.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/security/workspace-setting.yml b/2018-03-01-hybrid/docs-ref-autogen/security/workspace-setting.yml
index 691efafeb3..950af0a53f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/security/workspace-setting.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/security/workspace-setting.yml
@@ -1,27 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_security_workspace_setting
-  name: az security workspace-setting
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_security_workspace_setting_create
-  - az_security_workspace_setting_delete
-  - az_security_workspace_setting_list
-  - az_security_workspace_setting_show
-- uid: az_security_workspace_setting_create
+### YamlMime:AzureCLIGroup
+uid: az_security_workspace-setting
+name: az security workspace-setting
+summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+description: ''
+directCommands:
+- uid: az_security_workspace-setting_create
   name: az security workspace-setting create
   summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting create --name
+                                         --target-workspace
+                                         [--subscription]
   examples:
   - summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data
-    syntax:
-      content: az security workspace-setting create -n default --target-workspace '/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace'
-  parameters:
+    syntax: az security workspace-setting create -n default --target-workspace '/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/myRg/providers/Microsoft.OperationalInsights/workspaces/myWorkspace'
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
@@ -30,96 +24,78 @@ items:
     name: --target-workspace
     summary: An ID of the workspace resource that will hold the security data.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_workspace_setting_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_workspace-setting_delete
   name: az security workspace-setting delete
   summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting delete --name
+                                         [--subscription]
   examples:
   - summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace
-    syntax:
-      content: az security workspace-setting delete -n default
-  parameters:
+    syntax: az security workspace-setting delete -n default
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_workspace_setting_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_workspace-setting_list
   name: az security workspace-setting list
   summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting list [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data
-    syntax:
-      content: az security workspace-setting list
-  parameters:
+    syntax: az security workspace-setting list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_security_workspace_setting_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
+- uid: az_security_workspace-setting_show
   name: az security workspace-setting show
   summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az security workspace-setting show --name
+                                       [--query-examples]
+                                       [--subscription]
   examples:
   - summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data
-    syntax:
-      content: az security workspace-setting show -n default
-  parameters:
+    syntax: az security workspace-setting show -n default
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the resource to be fetched.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/security/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/security/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
 commands:
-- uid: az_security_workspace_setting_create
-  name: az security workspace-setting create
-  summary: Creates a workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_delete
-  name: az security workspace-setting delete
-  summary: Deletes the workspace settings in your subscription - this will make the security events on the subscription be reported to the default workspace.
-- uid: az_security_workspace_setting_list
-  name: az security workspace-setting list
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
-- uid: az_security_workspace_setting_show
-  name: az security workspace-setting show
-  summary: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+- az_security_workspace-setting_create
+- az_security_workspace-setting_delete
+- az_security_workspace-setting_list
+- az_security_workspace-setting_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -135,10 +111,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/security/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/security/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/ca9405e5f77a43197019568b845612bd33849ec3/src/azure-cli/azure/cli/command_modules/security/_help.py
-updated_at: 1/30/2020 6:43:43 AM
-ms.date: 01/30/2020
-description: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 02/03/2021
+  description: Shows the workspace settings in your subscription - these settings let you control which workspace will hold your security data.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel.yml
new file mode 100644
index 0000000000..91cb140453
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel
+name: az sentinel
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_sentinel_action
+- az_sentinel_action_list
+- az_sentinel_alert-rule
+- az_sentinel_alert-rule_create
+- az_sentinel_alert-rule_delete
+- az_sentinel_alert-rule_get-action
+- az_sentinel_alert-rule_list
+- az_sentinel_alert-rule_show
+- az_sentinel_alert-rule_update
+- az_sentinel_alert-rule-template
+- az_sentinel_alert-rule-template_list
+- az_sentinel_alert-rule-template_show
+- az_sentinel_bookmark
+- az_sentinel_bookmark_create
+- az_sentinel_bookmark_delete
+- az_sentinel_bookmark_list
+- az_sentinel_bookmark_show
+- az_sentinel_bookmark_update
+- az_sentinel_data-connector
+- az_sentinel_data-connector_create
+- az_sentinel_data-connector_delete
+- az_sentinel_data-connector_list
+- az_sentinel_data-connector_show
+- az_sentinel_data-connector_update
+- az_sentinel_incident
+- az_sentinel_incident_create
+- az_sentinel_incident_delete
+- az_sentinel_incident_list
+- az_sentinel_incident_show
+- az_sentinel_incident_update
+- az_sentinel_incident-comment
+- az_sentinel_incident-comment_create
+- az_sentinel_incident-comment_list
+- az_sentinel_incident-comment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/action.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/action.yml
new file mode 100644
index 0000000000..159a81e6fb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/action.yml
@@ -0,0 +1,53 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_action
+name: az sentinel action
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel action** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel action.
+description: ''
+directCommands:
+- uid: az_sentinel_action_list
+  name: az sentinel action list
+  summary: Gets all actions of alert rule.
+  description: ''
+  syntax: >-
+    az sentinel action list --resource-group
+                            --rule-id
+                            --workspace-name
+  examples:
+  - summary: Get all actions of alert rule.
+    syntax: az sentinel action list --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+commands:
+- az_sentinel_action_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel action.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/alert-rule-template.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/alert-rule-template.yml
new file mode 100644
index 0000000000..a4697abf63
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/alert-rule-template.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_alert-rule-template
+name: az sentinel alert-rule-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel alert-rule-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel alert-rule-template.
+description: ''
+directCommands:
+- uid: az_sentinel_alert-rule-template_list
+  name: az sentinel alert-rule-template list
+  summary: Gets all alert rule templates.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule-template list --resource-group
+                                         --workspace-name
+  examples:
+  - summary: Get all alert rule templates.
+    syntax: az sentinel alert-rule-template list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule-template_show
+  name: az sentinel alert-rule-template show
+  summary: Gets the alert rule template.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule-template show --alert-rule-template-id
+                                         --resource-group
+                                         --workspace-name
+  examples:
+  - summary: Get alert rule template by Id.
+    syntax: az sentinel alert-rule-template show --alert-rule-template-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --alert-rule-template-id
+    summary: Alert rule template ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+commands:
+- az_sentinel_alert-rule-template_list
+- az_sentinel_alert-rule-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel alert-rule-template.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/alert-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/alert-rule.yml
new file mode 100644
index 0000000000..6ed23c034e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/alert-rule.yml
@@ -0,0 +1,378 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_alert-rule
+name: az sentinel alert-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel alert-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel alert-rule.
+description: ''
+directCommands:
+- uid: az_sentinel_alert-rule_create
+  name: az sentinel alert-rule create
+  summary: Creates or updates the action of alert rule. And Create the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule create --resource-group
+                                  --rule-id
+                                  --workspace-name
+                                  [--action-id]
+                                  [--etag]
+                                  [--fusion-alert-rule]
+                                  [--logic-app-resource-id]
+                                  [--microsoft-security-incident-creation-alert-rule]
+                                  [--scheduled-alert-rule]
+                                  [--trigger-uri]
+  examples:
+  - summary: Creates or updates an action of alert rule.
+    syntax: az sentinel alert-rule create --etag "{etag}" --logic-app-resource-id "/subscriptions/{subs}/resourceGroups/myRg/providers/Microsoft.Logic/workflows/MyAlerts" --trigger-uri "https://xxx.northcentralus.logic.azure.com:443/workflows/xxx/triggers/manual/paths/invoke?api-version=2016-10-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=signature" --action-id "{action-id}" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  - summary: Creates or updates a Fusion alert rule.
+    syntax: az sentinel alert-rule create --fusion-alert-rule etag="{etag}" alert-rule-template-name="{name}" enabled=true --resource-group "myRg" --rule-id "myFirstFusionRule" --workspace-name "myWorkspace"
+  - summary: Creates or updates a MicrosoftSecurityIncidentCreation rule.
+    syntax: az sentinel alert-rule create --microsoft-security-incident-creation-alert-rule etag="{etag}" product-filter="Microsoft Cloud App Security" display-name="testing displayname" enabled=true --resource-group "myRg" --rule-id "microsoftSecurityIncidentCreationRuleExample" --workspace-name "myWorkspace"
+  - summary: Creates or updates a Scheduled alert rule.
+    syntax: az sentinel alert-rule create --scheduled-alert-rule etag="{etag}" query="ProtectionStatus | extend HostCustomEntity = Computer | extend IPCustomEntity = ComputerIP_Hidden" query-frequency="PT1H" query-period="P2DT1H30M" severity="High" trigger-operator="GreaterThan" trigger-threshold=0 description="" display-name="Rule2" enabled=true suppression-duration="PT1H" suppression-enabled=false tactics="Persistence" tactics="LateralMovement" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --action-id
+    summary: Action ID.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --fusion-alert-rule
+    summary: Represents Fusion alert rule.
+    description: >-
+      Usage: --fusion-alert-rule alert-rule-template-name=XX enabled=XX kind=XX etag=XX
+
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --logic-app-resource-id
+    summary: Logic App Resource Id, /subscriptions/{my-subscription}/resourceGroups/{my-resource-group}/providers/Microsoft.Logic/workflows/{my-workflow-id}.
+    description: ''
+  - name: --microsoft-security-incident-creation-alert-rule
+    summary: Represents MicrosoftSecurityIncidentCreation rule.
+    description: >-
+      Usage: --microsoft-security-incident-creation-alert-rule display-names-filter=XX display-names-exclude-filter=XX product-filter=XX severities-filter=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX kind=XX etag=XX
+
+
+      display-names-filter: the alerts' displayNames on which the cases will be generated
+
+      display-names-exclude-filter: the alerts' displayNames on which the cases will not be generated
+
+      product-filter: The alerts' productName on which the cases will be generated
+
+      severities-filter: the alerts' severities on which the cases will be generated
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --scheduled-alert-rule
+    summary: Represents scheduled alert rule.
+    description: >-
+      Usage: --scheduled-alert-rule query=XX query-frequency=XX query-period=XX severity=XX trigger-operator=XX trigger-threshold=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX suppression-duration=XX suppression-enabled=XX tactics=XX kind=XX etag=XX
+
+
+      query: The query that creates alerts for this rule.
+
+      query-frequency: The frequency (in ISO 8601 duration format) for this alert rule to run.
+
+      query-period: The period (in ISO 8601 duration format) that this alert rule looks at.
+
+      severity: The severity for alerts created by this alert rule.
+
+      trigger-operator: The operation against the threshold that triggers alert rule.
+
+      trigger-threshold: The threshold triggers this alert rule.
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      suppression-duration: The suppression (in ISO 8601 duration format) to wait since last time this alert rule been triggered.
+
+      suppression-enabled: Determines whether the suppression for this alert rule is enabled or disabled.
+
+      tactics: The tactics of the alert rule
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --trigger-uri
+    summary: Logic App Callback URL for this specific workflow.
+    description: ''
+- uid: az_sentinel_alert-rule_delete
+  name: az sentinel alert-rule delete
+  summary: Delete the action of alert rule. And Delete the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule delete --resource-group
+                                  --rule-id
+                                  --workspace-name
+                                  [--action-id]
+                                  [--yes]
+  examples:
+  - summary: Delete an action of alert rule.
+    syntax: az sentinel alert-rule delete --action-id "{action-id}" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  - summary: Delete an alert rule.
+    syntax: az sentinel alert-rule delete --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --action-id
+    summary: Action ID.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_alert-rule_get-action
+  name: az sentinel alert-rule get-action
+  summary: Gets the action of alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule get-action --action-id
+                                      --resource-group
+                                      --rule-id
+                                      --workspace-name
+  examples:
+  - summary: Get an action of alert rule.
+    syntax: az sentinel alert-rule get-action --action-id "{action-id}" --resource-group "myRg" --rule-id "{rule-id}" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --action-id
+    summary: Action ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule_list
+  name: az sentinel alert-rule list
+  summary: Gets all alert rules.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule list --resource-group
+                                --workspace-name
+  examples:
+  - summary: Get all alert rules.
+    syntax: az sentinel alert-rule list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule_show
+  name: az sentinel alert-rule show
+  summary: Gets the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule show --resource-group
+                                --rule-id
+                                --workspace-name
+  examples:
+  - summary: Get an alert rule.
+    syntax: az sentinel alert-rule show --resource-group "myRg" --rule-id "myFirstFusionRule" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_alert-rule_update
+  name: az sentinel alert-rule update
+  summary: Update the alert rule.
+  description: ''
+  syntax: >-
+    az sentinel alert-rule update --resource-group
+                                  --rule-id
+                                  --workspace-name
+                                  [--add]
+                                  [--force-string]
+                                  [--fusion-alert-rule]
+                                  [--microsoft-security-incident-creation-alert-rule]
+                                  [--remove]
+                                  [--scheduled-alert-rule]
+                                  [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-id
+    summary: Alert rule ID.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --fusion-alert-rule
+    summary: Represents Fusion alert rule.
+    description: >-
+      Usage: --fusion-alert-rule alert-rule-template-name=XX enabled=XX kind=XX etag=XX
+
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --microsoft-security-incident-creation-alert-rule
+    summary: Represents MicrosoftSecurityIncidentCreation rule.
+    description: >-
+      Usage: --microsoft-security-incident-creation-alert-rule display-names-filter=XX display-names-exclude-filter=XX product-filter=XX severities-filter=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX kind=XX etag=XX
+
+
+      display-names-filter: the alerts' displayNames on which the cases will be generated
+
+      display-names-exclude-filter: the alerts' displayNames on which the cases will not be generated
+
+      product-filter: The alerts' productName on which the cases will be generated
+
+      severities-filter: the alerts' severities on which the cases will be generated
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --scheduled-alert-rule
+    summary: Represents scheduled alert rule.
+    description: >-
+      Usage: --scheduled-alert-rule query=XX query-frequency=XX query-period=XX severity=XX trigger-operator=XX trigger-threshold=XX alert-rule-template-name=XX description=XX display-name=XX enabled=XX suppression-duration=XX suppression-enabled=XX tactics=XX kind=XX etag=XX
+
+
+      query: The query that creates alerts for this rule.
+
+      query-frequency: The frequency (in ISO 8601 duration format) for this alert rule to run.
+
+      query-period: The period (in ISO 8601 duration format) that this alert rule looks at.
+
+      severity: The severity for alerts created by this alert rule.
+
+      trigger-operator: The operation against the threshold that triggers alert rule.
+
+      trigger-threshold: The threshold triggers this alert rule.
+
+      alert-rule-template-name: The Name of the alert rule template used to create this rule.
+
+      description: The description of the alert rule.
+
+      display-name: The display name for alerts created by this alert rule.
+
+      enabled: Determines whether this alert rule is enabled or disabled.
+
+      suppression-duration: The suppression (in ISO 8601 duration format) to wait since last time this alert rule been triggered.
+
+      suppression-enabled: Determines whether the suppression for this alert rule is enabled or disabled.
+
+      tactics: The tactics of the alert rule
+
+      kind: Required. The alert rule kind
+
+      etag: Etag of the azure resource.
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_sentinel_alert-rule_create
+- az_sentinel_alert-rule_delete
+- az_sentinel_alert-rule_get-action
+- az_sentinel_alert-rule_list
+- az_sentinel_alert-rule_show
+- az_sentinel_alert-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel alert-rule.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/bookmark.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/bookmark.yml
new file mode 100644
index 0000000000..1b605c0351
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/bookmark.yml
@@ -0,0 +1,252 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_bookmark
+name: az sentinel bookmark
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel bookmark** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel bookmark.
+description: ''
+directCommands:
+- uid: az_sentinel_bookmark_create
+  name: az sentinel bookmark create
+  summary: Create the bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark create --bookmark-id
+                                --resource-group
+                                --workspace-name
+                                [--created]
+                                [--display-name]
+                                [--etag]
+                                [--incident-info]
+                                [--labels]
+                                [--notes]
+                                [--query-result]
+                                [--updated]
+                                [--updated-by-object-id]
+                                [-q]
+  examples:
+  - summary: Creates or updates a bookmark.
+    syntax: az sentinel bookmark create --etag "{etag}" --created "2019-01-01T13:15:30Z" --display-name "My bookmark" --labels "Tag1" --labels "Tag2" --notes "Found a suspicious activity" -q "SecurityEvent | where TimeGenerated > ago(1d) and TimeGenerated < ago(2d)" --query-result "Security Event query result" --updated "2019-01-01T13:15:30Z" --bookmark-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time the bookmark was created.
+    description: ''
+  - name: --display-name
+    summary: The display name of the bookmark.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --incident-info
+    summary: Describes an incident that relates to bookmark.
+    description: >-
+      Usage: --incident-info incident-id=XX severity=XX title=XX relation-name=XX
+
+
+      incident-id: Required. Incident Id
+
+      severity: Required. The severity of the incident
+
+      title: Required. The title of the incident
+
+      relation-name: Required. Relation Name.
+  - name: --labels
+    summary: List of labels relevant to this bookmark.
+    description: ''
+  - name: --notes
+    summary: The notes of the bookmark.
+    description: ''
+  - name: --query-result
+    summary: The query result of the bookmark.
+    description: ''
+  - name: --updated
+    summary: The last time the bookmark was updated.
+    description: ''
+  - name: --updated-by-object-id
+    summary: The object id of the user.
+    description: ''
+  - name: -q
+    summary: The query of the bookmark.
+    description: ''
+- uid: az_sentinel_bookmark_delete
+  name: az sentinel bookmark delete
+  summary: Delete the bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark delete --bookmark-id
+                                --resource-group
+                                --workspace-name
+                                [--yes]
+  examples:
+  - summary: Delete a bookmark.
+    syntax: az sentinel bookmark delete --bookmark-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_bookmark_list
+  name: az sentinel bookmark list
+  summary: Gets all bookmarks.
+  description: ''
+  syntax: >-
+    az sentinel bookmark list --resource-group
+                              --workspace-name
+  examples:
+  - summary: Get all bookmarks.
+    syntax: az sentinel bookmark list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_bookmark_show
+  name: az sentinel bookmark show
+  summary: Gets a bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark show --bookmark-id
+                              --resource-group
+                              --workspace-name
+  examples:
+  - summary: Get a bookmark.
+    syntax: az sentinel bookmark show --bookmark-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_bookmark_update
+  name: az sentinel bookmark update
+  summary: Update the bookmark.
+  description: ''
+  syntax: >-
+    az sentinel bookmark update --bookmark-id
+                                --resource-group
+                                --workspace-name
+                                [--created]
+                                [--display-name]
+                                [--etag]
+                                [--incident-info]
+                                [--labels]
+                                [--notes]
+                                [--query-result]
+                                [--updated]
+                                [--updated-by-object-id]
+                                [-q]
+  requiredParameters:
+  - isRequired: true
+    name: --bookmark-id
+    summary: Bookmark ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time the bookmark was created.
+    description: ''
+  - name: --display-name
+    summary: The display name of the bookmark.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --incident-info
+    summary: Describes an incident that relates to bookmark.
+    description: >-
+      Usage: --incident-info incident-id=XX severity=XX title=XX relation-name=XX
+
+
+      incident-id: Required. Incident Id
+
+      severity: Required. The severity of the incident
+
+      title: Required. The title of the incident
+
+      relation-name: Required. Relation Name.
+  - name: --labels
+    summary: List of labels relevant to this bookmark.
+    description: ''
+  - name: --notes
+    summary: The notes of the bookmark.
+    description: ''
+  - name: --query-result
+    summary: The query result of the bookmark.
+    description: ''
+  - name: --updated
+    summary: The last time the bookmark was updated.
+    description: ''
+  - name: --updated-by-object-id
+    summary: The object id of the user.
+    description: ''
+  - name: -q
+    summary: The query of the bookmark.
+    description: ''
+commands:
+- az_sentinel_bookmark_create
+- az_sentinel_bookmark_delete
+- az_sentinel_bookmark_list
+- az_sentinel_bookmark_show
+- az_sentinel_bookmark_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel bookmark.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/data-connector.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/data-connector.yml
new file mode 100644
index 0000000000..76fdbbaedd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/data-connector.yml
@@ -0,0 +1,400 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_data-connector
+name: az sentinel data-connector
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel data-connector** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel data-connector.
+description: ''
+directCommands:
+- uid: az_sentinel_data-connector_create
+  name: az sentinel data-connector create
+  summary: Create the data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector create --data-connector-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--aad-data-connector]
+                                      [--aatp-data-connector]
+                                      [--asc-data-connector]
+                                      [--aws-cloud-trail-data-connector]
+                                      [--mcas-data-connector]
+                                      [--mdatp-data-connector]
+                                      [--office-data-connector]
+                                      [--ti-data-connector]
+  examples:
+  - summary: Creates or updates an Office365 data connector.
+    syntax: az sentinel data-connector create --office-data-connector etag="{etag}"                tenant-id="{tenant-id}" --data-connector-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --aad-data-connector
+    summary: Represents AAD (Azure Active Directory) data connector.
+    description: >-
+      Usage: --aad-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aatp-data-connector
+    summary: Represents AATP (Azure Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --aatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --asc-data-connector
+    summary: Represents ASC (Azure Security Center) data connector.
+    description: >-
+      Usage: --asc-data-connector subscription-id=XX state=XX kind=XX etag=XX
+
+
+      subscription-id: The subscription id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aws-cloud-trail-data-connector
+    summary: Represents Amazon Web Services CloudTrail data connector.
+    description: >-
+      Usage: --aws-cloud-trail-data-connector aws-role-arn=XX state=XX kind=XX etag=XX
+
+
+      aws-role-arn: The Aws Role Arn (with CloudTrailReadOnly policy) that is used to access the Aws account.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --mcas-data-connector
+    summary: Represents MCAS (Microsoft Cloud App Security) data connector.
+    description: >-
+      Usage: --mcas-data-connector tenant-id=XX state-data-types-alerts-state=XX state-data-types-discovery-logs-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-alerts-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-discovery-logs-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --mdatp-data-connector
+    summary: Represents MDATP (Microsoft Defender Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --mdatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --office-data-connector
+    summary: Represents office data connector.
+    description: >-
+      Usage: --office-data-connector tenant-id=XX state-data-types-share-point-state=XX state-data-types-exchange-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-share-point-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-exchange-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --ti-data-connector
+    summary: Represents threat intelligence data connector.
+    description: >-
+      Usage: --ti-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+- uid: az_sentinel_data-connector_delete
+  name: az sentinel data-connector delete
+  summary: Delete the data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector delete --data-connector-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--yes]
+  examples:
+  - summary: Delete a data connector.
+    syntax: az sentinel data-connector delete --data-connector-id "{id}" --resource-group "myRg"                --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_data-connector_list
+  name: az sentinel data-connector list
+  summary: Gets all data connectors.
+  description: ''
+  syntax: >-
+    az sentinel data-connector list --resource-group
+                                    --workspace-name
+  examples:
+  - summary: Get all data connectors.
+    syntax: az sentinel data-connector list --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_data-connector_show
+  name: az sentinel data-connector show
+  summary: Gets a data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector show --data-connector-id
+                                    --resource-group
+                                    --workspace-name
+  examples:
+  - summary: Get a data connector.
+    syntax: az sentinel data-connector show --data-connector-id "{id}" --resource-group "myRg"                --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_data-connector_update
+  name: az sentinel data-connector update
+  summary: Update the data connector.
+  description: ''
+  syntax: >-
+    az sentinel data-connector update --data-connector-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--aad-data-connector]
+                                      [--aatp-data-connector]
+                                      [--add]
+                                      [--asc-data-connector]
+                                      [--aws-cloud-trail-data-connector]
+                                      [--force-string]
+                                      [--mcas-data-connector]
+                                      [--mdatp-data-connector]
+                                      [--office-data-connector]
+                                      [--remove]
+                                      [--set]
+                                      [--ti-data-connector]
+  requiredParameters:
+  - isRequired: true
+    name: --data-connector-id
+    summary: Connector ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --aad-data-connector
+    summary: Represents AAD (Azure Active Directory) data connector.
+    description: >-
+      Usage: --aad-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aatp-data-connector
+    summary: Represents AATP (Azure Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --aatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --asc-data-connector
+    summary: Represents ASC (Azure Security Center) data connector.
+    description: >-
+      Usage: --asc-data-connector subscription-id=XX state=XX kind=XX etag=XX
+
+
+      subscription-id: The subscription id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --aws-cloud-trail-data-connector
+    summary: Represents Amazon Web Services CloudTrail data connector.
+    description: >-
+      Usage: --aws-cloud-trail-data-connector aws-role-arn=XX state=XX kind=XX etag=XX
+
+
+      aws-role-arn: The Aws Role Arn (with CloudTrailReadOnly policy) that is used to access the Aws account.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --mcas-data-connector
+    summary: Represents MCAS (Microsoft Cloud App Security) data connector.
+    description: >-
+      Usage: --mcas-data-connector tenant-id=XX state-data-types-alerts-state=XX state-data-types-discovery-logs-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-alerts-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-discovery-logs-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --mdatp-data-connector
+    summary: Represents MDATP (Microsoft Defender Advanced Threat Protection) data connector.
+    description: >-
+      Usage: --mdatp-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --office-data-connector
+    summary: Represents office data connector.
+    description: >-
+      Usage: --office-data-connector tenant-id=XX state-data-types-share-point-state=XX state-data-types-exchange-state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state-data-types-share-point-state: Describe whether this data type connection is enabled or not.
+
+      state-data-types-exchange-state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --ti-data-connector
+    summary: Represents threat intelligence data connector.
+    description: >-
+      Usage: --ti-data-connector tenant-id=XX state=XX kind=XX etag=XX
+
+
+      tenant-id: The tenant id to connect to, and get the data from.
+
+      state: Describe whether this data type connection is enabled or not.
+
+      kind: Required. The data connector kind
+
+      etag: Etag of the azure resource.
+commands:
+- az_sentinel_data-connector_create
+- az_sentinel_data-connector_delete
+- az_sentinel_data-connector_list
+- az_sentinel_data-connector_show
+- az_sentinel_data-connector_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel data-connector.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/incident-comment.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/incident-comment.yml
new file mode 100644
index 0000000000..6318b8a8fd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/incident-comment.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_incident-comment
+name: az sentinel incident-comment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel incident-comment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel incident-comment.
+description: ''
+directCommands:
+- uid: az_sentinel_incident-comment_create
+  name: az sentinel incident-comment create
+  summary: Creates the incident comment.
+  description: ''
+  syntax: >-
+    az sentinel incident-comment create --incident-comment-id
+                                        --incident-id
+                                        --resource-group
+                                        --workspace-name
+                                        [--message]
+  examples:
+  - summary: Creates an incident comment.
+    syntax: az sentinel incident-comment create --message "Some message" --incident-comment-id "4bb36b7b-26ff-4d1c-9cbe-0d8ab3da0014" --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-comment-id
+    summary: Incident comment ID.
+    description: ''
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --message
+    summary: The comment message.
+    description: ''
+- uid: az_sentinel_incident-comment_list
+  name: az sentinel incident-comment list
+  summary: Gets all incident comments.
+  description: ''
+  syntax: >-
+    az sentinel incident-comment list --incident-id
+                                      --resource-group
+                                      --workspace-name
+                                      [--filter]
+                                      [--orderby]
+                                      [--skip-token]
+                                      [--top]
+  examples:
+  - summary: Get all incident comments.
+    syntax: az sentinel incident-comment list --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: Filters the results, based on a Boolean condition. Optional.
+    description: ''
+  - name: --orderby
+    summary: Sorts the results. Optional.
+    description: ''
+  - name: --skip-token
+    summary: Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.
+    description: ''
+  - name: --top
+    summary: Returns only the first n results. Optional.
+    description: ''
+- uid: az_sentinel_incident-comment_show
+  name: az sentinel incident-comment show
+  summary: Gets an incident comment.
+  description: ''
+  syntax: >-
+    az sentinel incident-comment show --incident-comment-id
+                                      --incident-id
+                                      --resource-group
+                                      --workspace-name
+  examples:
+  - summary: Get an incident comment.
+    syntax: az sentinel incident-comment show --incident-comment-id "{comment-id}" --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-comment-id
+    summary: Incident comment ID.
+    description: ''
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+commands:
+- az_sentinel_incident-comment_create
+- az_sentinel_incident-comment_list
+- az_sentinel_incident-comment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel incident-comment.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sentinel/incident.yml b/2018-03-01-hybrid/docs-ref-autogen/sentinel/incident.yml
new file mode 100644
index 0000000000..c267f311fd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sentinel/incident.yml
@@ -0,0 +1,307 @@
+### YamlMime:AzureCLIGroup
+uid: az_sentinel_incident
+name: az sentinel incident
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **sentinel** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az sentinel incident** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Sentinel incident.
+description: ''
+directCommands:
+- uid: az_sentinel_incident_create
+  name: az sentinel incident create
+  summary: Create the incident.
+  description: ''
+  syntax: >-
+    az sentinel incident create --incident-id
+                                --resource-group
+                                --workspace-name
+                                [--classification {BenignPositive, FalsePositive, TruePositive, Undetermined}]
+                                [--classification-comment]
+                                [--classification-reason {InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected}]
+                                [--description]
+                                [--etag]
+                                [--first-activity-time-utc]
+                                [--labels]
+                                [--last-activity-time-utc]
+                                [--owner]
+                                [--severity {High, Informational, Low, Medium}]
+                                [--status {Active, Closed, New}]
+                                [--title]
+  examples:
+  - summary: Creates or updates an incident.
+    syntax: az sentinel incident create --etag "{etag}" --description "This is a demo incident" --classification "FalsePositive" --classification-comment "Not a malicious activity" --classification-reason "IncorrectAlertLogic" --first-activity-time-utc "2019-01-01T13:00:30Z" --last-activity-time-utc "2019-01-01T13:05:30Z" --owner object-id="{oid}" --severity "High" --status "Closed" --title "My incident" --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --classification
+    parameterValueGroup: BenignPositive, FalsePositive, TruePositive, Undetermined
+    summary: The reason the incident was closed.
+    description: ''
+  - name: --classification-comment
+    summary: Describes the reason the incident was closed.
+    description: ''
+  - name: --classification-reason
+    parameterValueGroup: InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected
+    summary: The classification reason the incident was closed with.
+    description: ''
+  - name: --description
+    summary: The description of the incident.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --first-activity-time-utc
+    summary: The time of the first activity in the incident.
+    description: ''
+  - name: --labels
+    summary: List of labels relevant to this incident.
+    description: >-
+      Usage: --labels label-name=XX
+
+
+      label-name: Required. The name of the label
+
+
+      Multiple actions can be specified by using more than one --labels argument.
+  - name: --last-activity-time-utc
+    summary: The time of the last activity in the incident.
+    description: ''
+  - name: --owner
+    summary: Describes a user that the incident is assigned to.
+    description: >-
+      Usage: --owner email=XX assigned-to=XX object-id=XX user-principal-name=XX
+
+
+      email: The email of the user the incident is assigned to.
+
+      assigned-to: The name of the user the incident is assigned to.
+
+      object-id: The object id of the user the incident is assigned to.
+
+      user-principal-name: The user principal name of the user the incident is assigned to.
+  - name: --severity
+    parameterValueGroup: High, Informational, Low, Medium
+    summary: The severity of the incident.
+    description: ''
+  - name: --status
+    parameterValueGroup: Active, Closed, New
+    summary: The status of the incident.
+    description: ''
+  - name: --title
+    summary: The title of the incident.
+    description: ''
+- uid: az_sentinel_incident_delete
+  name: az sentinel incident delete
+  summary: Delete the incident.
+  description: ''
+  syntax: >-
+    az sentinel incident delete --incident-id
+                                --resource-group
+                                --workspace-name
+                                [--yes]
+  examples:
+  - summary: Delete an incident.
+    syntax: az sentinel incident delete --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sentinel_incident_list
+  name: az sentinel incident list
+  summary: Gets all incidents.
+  description: ''
+  syntax: >-
+    az sentinel incident list --resource-group
+                              --workspace-name
+                              [--filter]
+                              [--orderby]
+                              [--skip-token]
+                              [--top]
+  examples:
+  - summary: Get all incidents.
+    syntax: az sentinel incident list --orderby "properties/createdTimeUtc desc" --top 1 --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: Filters the results, based on a Boolean condition. Optional.
+    description: ''
+  - name: --orderby
+    summary: Sorts the results. Optional.
+    description: ''
+  - name: --skip-token
+    summary: Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.
+    description: ''
+  - name: --top
+    summary: Returns only the first n results. Optional.
+    description: ''
+- uid: az_sentinel_incident_show
+  name: az sentinel incident show
+  summary: Gets an incident.
+  description: ''
+  syntax: >-
+    az sentinel incident show --incident-id
+                              --resource-group
+                              --workspace-name
+  examples:
+  - summary: Get an incident.
+    syntax: az sentinel incident show --incident-id "{id}" --resource-group "myRg" --workspace-name "myWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_sentinel_incident_update
+  name: az sentinel incident update
+  summary: Update the incident.
+  description: ''
+  syntax: >-
+    az sentinel incident update --incident-id
+                                --resource-group
+                                --workspace-name
+                                [--classification {BenignPositive, FalsePositive, TruePositive, Undetermined}]
+                                [--classification-comment]
+                                [--classification-reason {InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected}]
+                                [--description]
+                                [--etag]
+                                [--first-activity-time-utc]
+                                [--labels]
+                                [--last-activity-time-utc]
+                                [--owner]
+                                [--severity {High, Informational, Low, Medium}]
+                                [--status {Active, Closed, New}]
+                                [--title]
+  requiredParameters:
+  - isRequired: true
+    name: --incident-id
+    summary: Incident ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --classification
+    parameterValueGroup: BenignPositive, FalsePositive, TruePositive, Undetermined
+    summary: The reason the incident was closed.
+    description: ''
+  - name: --classification-comment
+    summary: Describes the reason the incident was closed.
+    description: ''
+  - name: --classification-reason
+    parameterValueGroup: InaccurateData, IncorrectAlertLogic, SuspiciousActivity, SuspiciousButExpected
+    summary: The classification reason the incident was closed with.
+    description: ''
+  - name: --description
+    summary: The description of the incident.
+    description: ''
+  - name: --etag
+    summary: Etag of the azure resource.
+    description: ''
+  - name: --first-activity-time-utc
+    summary: The time of the first activity in the incident.
+    description: ''
+  - name: --labels
+    summary: List of labels relevant to this incident.
+    description: >-
+      Usage: --labels label-name=XX
+
+
+      label-name: Required. The name of the label
+
+
+      Multiple actions can be specified by using more than one --labels argument.
+  - name: --last-activity-time-utc
+    summary: The time of the last activity in the incident.
+    description: ''
+  - name: --owner
+    summary: Describes a user that the incident is assigned to.
+    description: >-
+      Usage: --owner email=XX assigned-to=XX object-id=XX user-principal-name=XX
+
+
+      email: The email of the user the incident is assigned to.
+
+      assigned-to: The name of the user the incident is assigned to.
+
+      object-id: The object id of the user the incident is assigned to.
+
+      user-principal-name: The user principal name of the user the incident is assigned to.
+  - name: --severity
+    parameterValueGroup: High, Informational, Low, Medium
+    summary: The severity of the incident.
+    description: ''
+  - name: --status
+    parameterValueGroup: Active, Closed, New
+    summary: The status of the incident.
+    description: ''
+  - name: --title
+    summary: The title of the incident.
+    description: ''
+commands:
+- az_sentinel_incident_create
+- az_sentinel_incident_delete
+- az_sentinel_incident_list
+- az_sentinel_incident_show
+- az_sentinel_incident_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Sentinel incident.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/API Management.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/API Management.yml
new file mode 100644
index 0000000000..026202def3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/API Management.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-API_Management
+name: API Management
+commands:
+- az_apim
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure API for FHIR.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure API for FHIR.yml
new file mode 100644
index 0000000000..1c533bfc6a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure API for FHIR.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_API_for_FHIR
+name: Azure API for FHIR
+commands:
+- az_healthcareapis
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Active Directory.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Active Directory.yml
new file mode 100644
index 0000000000..e400d19d89
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Active Directory.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Active_Directory
+name: Azure Active Directory
+commands:
+- az_ad
+- az_identity
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Advisor.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Advisor.yml
new file mode 100644
index 0000000000..0139838877
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Advisor.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Advisor
+name: Azure Advisor
+commands:
+- az_advisor
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure App Configuration.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure App Configuration.yml
new file mode 100644
index 0000000000..3fb8225b0c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure App Configuration.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_App_Configuration
+name: Azure App Configuration
+commands:
+- az_appconfig
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure App Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure App Service.yml
new file mode 100644
index 0000000000..c5b50b25a9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure App Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_App_Service
+name: Azure App Service
+commands:
+- az_appservice
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Application Insights.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Application Insights.yml
new file mode 100644
index 0000000000..ec454b8062
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Application Insights.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Application_Insights
+name: Azure Application Insights
+commands:
+- az_find
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Arc for VMware PrivateCloud.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Arc for VMware PrivateCloud.yml
new file mode 100644
index 0000000000..53afdbd096
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Arc for VMware PrivateCloud.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Arc_for_VMware_PrivateCloud
+name: Azure Arc for VMware PrivateCloud
+commands:
+- az_connectedvmware
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Arc.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Arc.yml
new file mode 100644
index 0000000000..c413ababb4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Arc.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Arc
+name: Azure Arc
+commands:
+- az_connectedmachine
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Artifacts.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Artifacts.yml
new file mode 100644
index 0000000000..575378dd34
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Artifacts.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Artifacts
+name: Azure Artifacts
+commands:
+- az_artifacts
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Attestation.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Attestation.yml
new file mode 100644
index 0000000000..a94703073c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Attestation.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Attestation
+name: Azure Attestation
+commands:
+- az_attestation
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Automation.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Automation.yml
new file mode 100644
index 0000000000..f216e23704
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Automation.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Automation
+name: Azure Automation
+commands:
+- az_automation
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Backup.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Backup.yml
new file mode 100644
index 0000000000..a9fba9eb4c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Backup.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Backup
+name: Azure Backup
+commands:
+- az_backup
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Batch.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Batch.yml
new file mode 100644
index 0000000000..a38b6de3f9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Batch.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Batch
+name: Azure Batch
+commands:
+- az_batch
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Blockchain.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Blockchain.yml
new file mode 100644
index 0000000000..1fda3d4d4e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Blockchain.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Blockchain
+name: Azure Blockchain
+commands:
+- az_blockchain
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Blueprint.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Blueprint.yml
new file mode 100644
index 0000000000..48ed016176
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Blueprint.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Blueprint
+name: Azure Blueprint
+commands:
+- az_blueprint
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Boards.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Boards.yml
new file mode 100644
index 0000000000..d60431267d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Boards.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Boards
+name: Azure Boards
+commands:
+- az_boards
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Bot Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Bot Service.yml
new file mode 100644
index 0000000000..219ce56ba5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Bot Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Bot_Service
+name: Azure Bot Service
+commands:
+- az_bot
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Bot.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Bot.yml
new file mode 100644
index 0000000000..72eb95c738
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Bot.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Bot
+name: Azure Bot
+commands:
+- az_healthbot
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure CLI.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure CLI.yml
new file mode 100644
index 0000000000..3d16597f0b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure CLI.yml	
@@ -0,0 +1,25 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_CLI
+name: Azure CLI
+commands:
+- az_account
+- az_alias
+- az_cache
+- az_cli-translator
+- az_cloud
+- az_config
+- az_configure
+- az_demo
+- az_extension
+- az_feedback
+- az_fzf
+- az_interactive
+- az_local-context
+- az_login
+- az_logout
+- az_next
+- az_rest
+- az_self-test
+- az_upgrade
+- az_version
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cache for Redis.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cache for Redis.yml
new file mode 100644
index 0000000000..6f4bf4590b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cache for Redis.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cache_for_Redis
+name: Azure Cache for Redis
+commands:
+- az_redis
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cloud Services (extended support).yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cloud Services (extended support).yml
new file mode 100644
index 0000000000..fcc9172d48
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cloud Services (extended support).yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cloud_Services_(extended_support)
+name: Azure Cloud Services (extended support)
+commands:
+- az_cloud-service
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cognitive Search.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cognitive Search.yml
new file mode 100644
index 0000000000..403be5e7a5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cognitive Search.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cognitive_Search
+name: Azure Cognitive Search
+commands:
+- az_search
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cognitive Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cognitive Service.yml
new file mode 100644
index 0000000000..9889d5a61d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cognitive Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cognitive_Service
+name: Azure Cognitive Service
+commands:
+- az_cognitiveservices
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Communication Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Communication Service.yml
new file mode 100644
index 0000000000..0cc8464e8a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Communication Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Communication_Service
+name: Azure Communication Service
+commands:
+- az_communication
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Instances.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Instances.yml
new file mode 100644
index 0000000000..857865fe17
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Instances.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Container_Instances
+name: Azure Container Instances
+commands:
+- az_container
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Registries.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Registries.yml
new file mode 100644
index 0000000000..9a82832b1b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Registries.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Container_Registries
+name: Azure Container Registries
+commands:
+- az_acr
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Services.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Services.yml
new file mode 100644
index 0000000000..fc0a0995cf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Container Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Container_Services
+name: Azure Container Services
+commands:
+- az_acs
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cosmos DB.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cosmos DB.yml
new file mode 100644
index 0000000000..84a1452f05
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cosmos DB.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cosmos_DB
+name: Azure Cosmos DB
+commands:
+- az_cosmosdb
+- az_managed-cassandra
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cost Management + Billing.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cost Management + Billing.yml
new file mode 100644
index 0000000000..2e7e6f4fec
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Cost Management + Billing.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Cost_Management_+_Billing
+name: Azure Cost Management + Billing
+commands:
+- az_billing
+- az_consumption
+- az_costmanagement
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Custom Providers.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Custom Providers.yml
new file mode 100644
index 0000000000..a617834136
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Custom Providers.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Custom_Providers
+name: Azure Custom Providers
+commands:
+- az_custom-providers
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Explorer (Kusto).yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Explorer (Kusto).yml
new file mode 100644
index 0000000000..19dd397078
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Explorer (Kusto).yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Explorer_(Kusto)
+name: Azure Data Explorer (Kusto)
+commands:
+- az_kusto
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Explorer.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Explorer.yml
new file mode 100644
index 0000000000..b3fbf9b5b9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Explorer.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Explorer
+name: Azure Data Explorer
+commands:
+- az_kusto
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Factory.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Factory.yml
new file mode 100644
index 0000000000..e8b588b662
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Factory.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Factory
+name: Azure Data Factory
+commands:
+- az_datafactory
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Lake Analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Lake Analytics.yml
new file mode 100644
index 0000000000..eaf6f6169d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Lake Analytics.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Lake_Analytics
+name: Azure Data Lake Analytics
+commands:
+- az_dla
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Lake Storage.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Lake Storage.yml
new file mode 100644
index 0000000000..208ec81824
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Lake Storage.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Lake_Storage
+name: Azure Data Lake Storage
+commands:
+- az_dls
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Migration.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Migration.yml
new file mode 100644
index 0000000000..acd6ef254d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Migration.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Migration
+name: Azure Data Migration
+commands:
+- az_dms
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Share.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Share.yml
new file mode 100644
index 0000000000..7ee5f914f5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Data Share.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Data_Share
+name: Azure Data Share
+commands:
+- az_datashare
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database Migration Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database Migration Service.yml
new file mode 100644
index 0000000000..dfc4f019b1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database Migration Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_Migration_Service
+name: Azure Database Migration Service
+commands:
+- az_dms
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for MariaDB.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for MariaDB.yml
new file mode 100644
index 0000000000..c0074f76b4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for MariaDB.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_for_MariaDB
+name: Azure Database for MariaDB
+commands:
+- az_mariadb
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for MySQL.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for MySQL.yml
new file mode 100644
index 0000000000..417f7086e8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for MySQL.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_for_MySQL
+name: Azure Database for MySQL
+commands:
+- az_mysql
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for PostgreSQL.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for PostgreSQL.yml
new file mode 100644
index 0000000000..9d591b253e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Database for PostgreSQL.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Database_for_PostgreSQL
+name: Azure Database for PostgreSQL
+commands:
+- az_postgres
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Databox.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Databox.yml
new file mode 100644
index 0000000000..c21dee6296
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Databox.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Databox
+name: Azure Databox
+commands:
+- az_databox
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Databricks.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Databricks.yml
new file mode 100644
index 0000000000..48a7d09ef4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Databricks.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Databricks
+name: Azure Databricks
+commands:
+- az_databricks
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Dedicated HSM.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Dedicated HSM.yml
new file mode 100644
index 0000000000..fc131a0c99
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Dedicated HSM.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Dedicated_HSM
+name: Azure Dedicated HSM
+commands:
+- az_dedicated-hsm
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure DevOps.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure DevOps.yml
new file mode 100644
index 0000000000..d00cb3fdbe
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure DevOps.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_DevOps
+name: Azure DevOps
+commands:
+- az_devops
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure DevTest Labs.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure DevTest Labs.yml
new file mode 100644
index 0000000000..c8a580ccd6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure DevTest Labs.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_DevTest_Labs
+name: Azure DevTest Labs
+commands:
+- az_lab
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Digital Twins.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Digital Twins.yml
new file mode 100644
index 0000000000..c66c9aaf0f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Digital Twins.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Digital_Twins
+name: Azure Digital Twins
+commands:
+- az_dt
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Disk Pool Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Disk Pool Service.yml
new file mode 100644
index 0000000000..76690b3d4e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Disk Pool Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Disk_Pool_Service
+name: Azure Disk Pool Service
+commands:
+- az_disk-pool
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Disk Storage.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Disk Storage.yml
new file mode 100644
index 0000000000..f0433b2073
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Disk Storage.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Disk_Storage
+name: Azure Disk Storage
+commands:
+- az_disk
+- az_disk-access
+- az_disk-encryption-set
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Event Grid.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Event Grid.yml
new file mode 100644
index 0000000000..c85dd6c3df
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Event Grid.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Event_Grid
+name: Azure Event Grid
+commands:
+- az_eventgrid
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Event Hubs.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Event Hubs.yml
new file mode 100644
index 0000000000..ce37f69506
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Event Hubs.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Event_Hubs
+name: Azure Event Hubs
+commands:
+- az_eventhubs
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure File Sync.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure File Sync.yml
new file mode 100644
index 0000000000..3a7f61a336
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure File Sync.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_File_Sync
+name: Azure File Sync
+commands:
+- az_storagesync
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Front Door.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Front Door.yml
new file mode 100644
index 0000000000..bb14b19e1c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Front Door.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Front_Door
+name: Azure Front Door
+commands:
+- az_afd
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Functions.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Functions.yml
new file mode 100644
index 0000000000..8b7b6509e6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Functions.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Functions
+name: Azure Functions
+commands:
+- az_functionapp
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure HDInsight.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure HDInsight.yml
new file mode 100644
index 0000000000..72973efff3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure HDInsight.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_HDInsight
+name: Azure HDInsight
+commands:
+- az_hdinsight
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure HPC Cache.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure HPC Cache.yml
new file mode 100644
index 0000000000..78a8341845
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure HPC Cache.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_HPC_Cache
+name: Azure HPC Cache
+commands:
+- az_hpc-cache
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure IoT.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure IoT.yml
new file mode 100644
index 0000000000..72720515ba
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure IoT.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_IoT
+name: Azure IoT
+commands:
+- az_iot
+- az_iotcentral
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Key Vault.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Key Vault.yml
new file mode 100644
index 0000000000..13f029142a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Key Vault.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Key_Vault
+name: Azure Key Vault
+commands:
+- az_keyvault
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Configuration Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Configuration Service.yml
new file mode 100644
index 0000000000..8ba4f8dbb3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Configuration Service.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Kubernetes_Configuration_Service
+name: Azure Kubernetes Configuration Service
+commands:
+- az_k8sconfiguration
+- az_k8s-configuration
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Extension Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Extension Service.yml
new file mode 100644
index 0000000000..638de54846
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Extension Service.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Kubernetes_Extension_Service
+name: Azure Kubernetes Extension Service
+commands:
+- az_k8s-extension
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Service.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Service.yml
new file mode 100644
index 0000000000..f684ca8a1c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Kubernetes Service.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Kubernetes_Service
+name: Azure Kubernetes Service
+commands:
+- az_aks
+- az_connectedk8s
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Lab Services.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Lab Services.yml
new file mode 100644
index 0000000000..236cda57b3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Lab Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Lab_Services
+name: Azure Lab Services
+commands:
+- az_hack
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Logic Apps.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Logic Apps.yml
new file mode 100644
index 0000000000..45f55f6007
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Logic Apps.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Logic_Apps
+name: Azure Logic Apps
+commands:
+- az_logic
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Machine Learning.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Machine Learning.yml
new file mode 100644
index 0000000000..3ee08582c1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Machine Learning.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Machine_Learning
+name: Azure Machine Learning
+commands:
+- az_batchai
+- az_ml
+- az_ml(v1)
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Managed Applications.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Managed Applications.yml
new file mode 100644
index 0000000000..90046988d8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Managed Applications.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Managed_Applications
+name: Azure Managed Applications
+commands:
+- az_managedapp
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Managed Services.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Managed Services.yml
new file mode 100644
index 0000000000..f7ed43c627
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Managed Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Managed_Services
+name: Azure Managed Services
+commands:
+- az_managedservices
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Maps.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Maps.yml
new file mode 100644
index 0000000000..f4be4224d1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Maps.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Maps
+name: Azure Maps
+commands:
+- az_maps
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Marketplace Ordering.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Marketplace Ordering.yml
new file mode 100644
index 0000000000..aa90b05c98
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Marketplace Ordering.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Marketplace_Ordering
+name: Azure Marketplace Ordering
+commands:
+- az_term
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Media Services.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Media Services.yml
new file mode 100644
index 0000000000..cb079b0a4a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Media Services.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Media_Services
+name: Azure Media Services
+commands:
+- az_ams
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Migrate.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Migrate.yml
new file mode 100644
index 0000000000..2f99d9f75f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Migrate.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Migrate
+name: Azure Migrate
+commands:
+- az_offazure
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Monitor.yml
new file mode 100644
index 0000000000..b06bf2d7eb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Monitor.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Monitor
+name: Azure Monitor
+commands:
+- az_footprint
+- az_monitor
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure NetApp Files.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure NetApp Files.yml
new file mode 100644
index 0000000000..bd856f3f47
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure NetApp Files.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_NetApp_Files
+name: Azure NetApp Files
+commands:
+- az_netappfiles
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Network.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Network.yml
new file mode 100644
index 0000000000..e6b0053c83
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Network.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Network
+name: Azure Network
+commands:
+- az_internet-analyzer
+- az_network
+- az_peering
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Notification Hubs.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Notification Hubs.yml
new file mode 100644
index 0000000000..fcc2db277c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Notification Hubs.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Notification_Hubs
+name: Azure Notification Hubs
+commands:
+- az_notification-hub
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Pipelines.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Pipelines.yml
new file mode 100644
index 0000000000..7d83a4b474
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Pipelines.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Pipelines
+name: Azure Pipelines
+commands:
+- az_pipelines
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Policy.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Policy.yml
new file mode 100644
index 0000000000..a105b6a0d4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Policy.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Policy
+name: Azure Policy
+commands:
+- az_guestconfig
+- az_policy
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Providers.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Providers.yml
new file mode 100644
index 0000000000..13603c1ae5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Providers.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Providers
+name: Azure Providers
+commands:
+- az_providerhub
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Quantum.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Quantum.yml
new file mode 100644
index 0000000000..edf71621fb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Quantum.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Quantum
+name: Azure Quantum
+commands:
+- az_quantum
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Red Hat OpenShift.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Red Hat OpenShift.yml
new file mode 100644
index 0000000000..cd61c33d91
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Red Hat OpenShift.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Red_Hat_OpenShift
+name: Azure Red Hat OpenShift
+commands:
+- az_aro
+- az_openshift
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Relay.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Relay.yml
new file mode 100644
index 0000000000..9995f428b3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Relay.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Relay
+name: Azure Relay
+commands:
+- az_relay
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Remote Rendering.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Remote Rendering.yml
new file mode 100644
index 0000000000..35dc5a52fc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Remote Rendering.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Remote_Rendering
+name: Azure Remote Rendering
+commands:
+- az_remote-rendering-account
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Repos.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Repos.yml
new file mode 100644
index 0000000000..321f7e055b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Repos.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Repos
+name: Azure Repos
+commands:
+- az_repos
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Reservations.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Reservations.yml
new file mode 100644
index 0000000000..2b8aab196d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Reservations.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Reservations
+name: Azure Reservations
+commands:
+- az_reservations
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Graph.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Graph.yml
new file mode 100644
index 0000000000..e613e02da1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Graph.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Resource_Graph
+name: Azure Resource Graph
+commands:
+- az_graph
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Manager.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Manager.yml
new file mode 100644
index 0000000000..9eb37dd7a8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Manager.yml	
@@ -0,0 +1,14 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Resource_Manager
+name: Azure Resource Manager
+commands:
+- az_deployment
+- az_deploymentmanager
+- az_deployment-scripts
+- az_group
+- az_lock
+- az_provider
+- az_resource
+- az_tag
+- az_ts
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Mover.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Mover.yml
new file mode 100644
index 0000000000..5d963a4ab0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Resource Mover.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Resource_Mover
+name: Azure Resource Mover
+commands:
+- az_resource-mover
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SQL Server.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SQL Server.yml
new file mode 100644
index 0000000000..9a3ee066a7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SQL Server.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_SQL_Server
+name: Azure SQL Server
+commands:
+- az_sql
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SQL.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SQL.yml
new file mode 100644
index 0000000000..afa5a88322
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SQL.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_SQL
+name: Azure SQL
+commands:
+- az_sql
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Security Center.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Security Center.yml
new file mode 100644
index 0000000000..2275d0b973
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Security Center.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Security_Center
+name: Azure Security Center
+commands:
+- az_security
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Sentinel.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Sentinel.yml
new file mode 100644
index 0000000000..3dc2f1c250
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Sentinel.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Sentinel
+name: Azure Sentinel
+commands:
+- az_sentinel
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Bus Messaging.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Bus Messaging.yml
new file mode 100644
index 0000000000..8f45721300
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Bus Messaging.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Service_Bus_Messaging
+name: Azure Service Bus Messaging
+commands:
+- az_servicebus
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Fabric Mesh.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Fabric Mesh.yml
new file mode 100644
index 0000000000..889e25961b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Fabric Mesh.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Service_Fabric_Mesh
+name: Azure Service Fabric Mesh
+commands:
+- az_mesh
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Fabric.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Fabric.yml
new file mode 100644
index 0000000000..07a6e2b3a4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Service Fabric.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Service_Fabric
+name: Azure Service Fabric
+commands:
+- az_sf
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SignalR.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SignalR.yml
new file mode 100644
index 0000000000..4f5711810d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure SignalR.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_SignalR
+name: Azure SignalR
+commands:
+- az_signalr
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Spatial Anchors.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Spatial Anchors.yml
new file mode 100644
index 0000000000..9960e968dc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Spatial Anchors.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Spatial_Anchors
+name: Azure Spatial Anchors
+commands:
+- az_spatial-anchors-account
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Spring Cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Spring Cloud.yml
new file mode 100644
index 0000000000..2fccc61809
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Spring Cloud.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Spring_Cloud
+name: Azure Spring Cloud
+commands:
+- az_spring-cloud
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stack Edge.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stack Edge.yml
new file mode 100644
index 0000000000..df3253f32e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stack Edge.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Stack_Edge
+name: Azure Stack Edge
+commands:
+- az_databoxedge
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stack HCI.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stack HCI.yml
new file mode 100644
index 0000000000..4af5298c3e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stack HCI.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Stack_HCI
+name: Azure Stack HCI
+commands:
+- az_stack-hci
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Storage.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Storage.yml
new file mode 100644
index 0000000000..43a5079d76
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Storage.yml	
@@ -0,0 +1,8 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Storage
+name: Azure Storage
+commands:
+- az_import-export
+- az_snapshot
+- az_storage
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stream Analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stream Analytics.yml
new file mode 100644
index 0000000000..2e9a11d5d4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Stream Analytics.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Stream_Analytics
+name: Azure Stream Analytics
+commands:
+- az_stream-analytics
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Support.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Support.yml
new file mode 100644
index 0000000000..f0bdab06d2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Support.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Support
+name: Azure Support
+commands:
+- az_support
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Synapse Analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Synapse Analytics.yml
new file mode 100644
index 0000000000..882cdadd8d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Synapse Analytics.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Synapse_Analytics
+name: Azure Synapse Analytics
+commands:
+- az_synapse
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Time Series Insights.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Time Series Insights.yml
new file mode 100644
index 0000000000..fbee1d484a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Time Series Insights.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Time_Series_Insights
+name: Azure Time Series Insights
+commands:
+- az_tsi
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure VMWare Solution.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure VMWare Solution.yml
new file mode 100644
index 0000000000..7a069d488a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure VMWare Solution.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_VMWare_Solution
+name: Azure VMWare Solution
+commands:
+- az_csvmware
+- az_vmware
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Virtual Machine scale sets.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Virtual Machine scale sets.yml
new file mode 100644
index 0000000000..07d71301b0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Virtual Machine scale sets.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Virtual_Machine_scale_sets
+name: Azure Virtual Machine scale sets
+commands:
+- az_vmss
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Virtual Machines.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Virtual Machines.yml
new file mode 100644
index 0000000000..33a95ecbca
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Virtual Machines.yml	
@@ -0,0 +1,13 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Virtual_Machines
+name: Azure Virtual Machines
+commands:
+- az_desktopvirtualization
+- az_image
+- az_maintenance
+- az_ppg
+- az_sig
+- az_ssh
+- az_sshkey
+- az_vm
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Web Apps.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Web Apps.yml
new file mode 100644
index 0000000000..d0c0d8515e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Web Apps.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Web_Apps
+name: Azure Web Apps
+commands:
+- az_staticwebapp
+- az_webapp
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Web PubSub.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Web PubSub.yml
new file mode 100644
index 0000000000..e538369aa7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure Web PubSub.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Web_PubSub
+name: Azure Web PubSub
+commands:
+- az_webpubsub
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure portal.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure portal.yml
new file mode 100644
index 0000000000..e4237e56a5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure portal.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_Portal
+name: Azure Portal
+commands:
+- az_portal
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure resource providers.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure resource providers.yml
new file mode 100644
index 0000000000..8157908727
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure resource providers.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_resource_providers
+name: Azure resource providers
+commands:
+- az_feature
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure role-based access Control.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure role-based access Control.yml
new file mode 100644
index 0000000000..bdacbd8a01
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Azure role-based access Control.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Azure_role-based_access_Control
+name: Azure role-based access Control
+commands:
+- az_role
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Bicep.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Bicep.yml
new file mode 100644
index 0000000000..e90629469d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Bicep.yml
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Bicep
+name: Bicep
+commands:
+- az_bicep
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Content Delivery Network.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Content Delivery Network.yml
new file mode 100644
index 0000000000..d79c9308a0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Content Delivery Network.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Content_Delivery_Network
+name: Content Delivery Network
+commands:
+- az_cdn
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/List A - Z.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/List A - Z.yml
new file mode 100644
index 0000000000..54721e505b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/List A - Z.yml	
@@ -0,0 +1,131 @@
+### YamlMime:AzureCLIGroup
+uid: sp-List_A_-_Z
+name: All Azure CLI Command Reference List A - Z
+summary: These are all the command groups for Azure CLI 2.0
+commands:
+- az_account
+- az_acr
+- az_ad
+- az_ai-examples
+- az_aks
+- az_alias
+- az_appconfig
+- az_arcappliance
+- az_artifacts
+- az_attestation
+- az_automation
+- az_baremetalinstance
+- az_batch
+- az_bicep
+- az_blockchain
+- az_blueprint
+- az_boards
+- az_cache
+- az_cli-translator
+- az_cloud
+- az_cloud-service
+- az_codespace
+- az_communication
+- az_config
+- az_confluent
+- az_connectedk8s
+- az_connectedmachine
+- az_container
+- az_cosmosdb
+- az_costmanagement
+- az_csvmware
+- az_customlocation
+- az_custom-providers
+- az_databox
+- az_databricks
+- az_datadog
+- az_datafactory
+- az_datashare
+- az_dedicated-hsm
+- az_demo
+- az_deployment
+- az_deployment-scripts
+- az_desktopvirtualization
+- az_devops
+- az_disk
+- az_disk-pool
+- az_dms
+- az_dt
+- az_eventgrid
+- az_extension
+- az_footprint
+- az_functionapp
+- az_fzf
+- az_graph
+- az_group
+- az_guestconfig
+- az_hack
+- az_hanainstance
+- az_hdinsight
+- az_healthbot
+- az_healthcareapis
+- az_hpc-cache
+- az_image
+- az_import-export
+- az_internet-analyzer
+- az_iot
+- az_k8sconfiguration
+- az_k8s-configuration
+- az_k8s-extension
+- az_keyvault
+- az_kusto
+- az_local-context
+- az_lock
+- az_logic
+- az_maintenance
+- az_managedapp
+- az_managed-cassandra
+- az_managementpartner
+- az_mesh
+- az_ml(v1)
+- az_ml
+- az_monitor
+- az_mysql
+- az_netappfiles
+- az_network
+- az_notification-hub
+- az_offazure
+- az_peering
+- az_pipelines
+- az_policy
+- az_portal
+- az_postgres
+- az_powerbi
+- az_provider
+- az_providerhub
+- az_quantum
+- az_redisenterprise
+- az_remote-rendering-account
+- az_repos
+- az_resource
+- az_resource-mover
+- az_role
+- az_sapmonitor
+- az_security
+- az_sentinel
+- az_snapshot
+- az_spatial-anchors-account
+- az_spring-cloud
+- az_sql
+- az_ssh
+- az_sshkey
+- az_stack-hci
+- az_storage
+- az_storagesync
+- az_stream-analytics
+- az_support
+- az_synapse
+- az_tag
+- az_term
+- az_tsi
+- az_vm
+- az_vmss
+- az_vmware
+- az_webapp
+- az_webpubsub
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft AI.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft AI.yml
new file mode 100644
index 0000000000..b7eaaa3269
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft AI.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_AI
+name: Microsoft AI
+commands:
+- az_ai-examples
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Partner Network.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Partner Network.yml
new file mode 100644
index 0000000000..3c895a91b9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Partner Network.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_Partner_Network
+name: Microsoft Partner Network
+commands:
+- az_managementpartner
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Partner Services.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Partner Services.yml
new file mode 100644
index 0000000000..eb423cfb6a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Partner Services.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_Partner_Services
+name: Microsoft Partner Services
+commands:
+- az_confluent
+- az_datadog
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Windows.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Windows.yml
new file mode 100644
index 0000000000..78b5971130
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Microsoft Windows.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Microsoft_Windows
+name: Microsoft Windows
+commands:
+- az_baremetalinstance
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Power BI.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Power BI.yml
new file mode 100644
index 0000000000..febb9c9863
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Power BI.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Power_BI
+name: Power BI
+commands:
+- az_powerbi
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/SAP HANA on Azure.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/SAP HANA on Azure.yml
new file mode 100644
index 0000000000..5b587a371a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/SAP HANA on Azure.yml	
@@ -0,0 +1,7 @@
+### YamlMime:AzureCLIGroup
+uid: sp-SAP_HANA_on_Azure
+name: SAP HANA on Azure
+commands:
+- az_hanainstance
+- az_sapmonitor
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/service-page/Visual Studio.yml b/2018-03-01-hybrid/docs-ref-autogen/service-page/Visual Studio.yml
new file mode 100644
index 0000000000..7834ab743b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/service-page/Visual Studio.yml	
@@ -0,0 +1,6 @@
+### YamlMime:AzureCLIGroup
+uid: sp-Visual_Studio
+name: Visual Studio
+commands:
+- az_codespace
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/snapshot.yml b/2018-03-01-hybrid/docs-ref-autogen/snapshot.yml
index 7c7de4b784..3aeff7da58 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/snapshot.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/snapshot.yml
@@ -1,50 +1,47 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_snapshot
-  name: az snapshot
-  summary: Manage point-in-time copies of managed disks, native blobs, or other snapshots.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_snapshot_create
-  - az_snapshot_delete
-  - az_snapshot_grant_access
-  - az_snapshot_list
-  - az_snapshot_revoke_access
-  - az_snapshot_show
-  - az_snapshot_update
-  - az_snapshot_wait
+### YamlMime:AzureCLIGroup
+uid: az_snapshot
+name: az snapshot
+summary: Manage point-in-time copies of managed disks, native blobs, or other snapshots.
+description: ''
+directCommands:
 - uid: az_snapshot_create
   name: az snapshot create
   summary: Create a snapshot.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az snapshot create --name
+                       --resource-group
+                       [--location]
+                       [--no-wait]
+                       [--size-gb]
+                       [--sku {Premium_LRS, Standard_LRS}]
+                       [--source]
+                       [--source-storage-account-id]
+                       [--subscription]
+                       [--tags]
   examples:
   - summary: Create a snapshot by importing from a blob uri.
-    syntax:
-      content: az snapshot create -g MyResourceGroup -n MySnapshot --source https://vhd1234.blob.core.windows.net/vhds/osdisk1234.vhd
+    syntax: az snapshot create -g MyResourceGroup -n MySnapshot --source https://vhd1234.blob.core.windows.net/vhds/osdisk1234.vhd
   - summary: Create an empty snapshot.
-    syntax:
-      content: az snapshot create -g MyResourceGroup -n MySnapshot --size-gb 10
+    syntax: az snapshot create -g MyResourceGroup -n MySnapshot --size-gb 10
   - summary: Create a snapshot by copying an existing disk in the same resource group.
-    syntax:
-      content: az snapshot create -g MyResourceGroup -n MySnapshot2 --source MyDisk
+    syntax: az snapshot create -g MyResourceGroup -n MySnapshot2 --source MyDisk
   - summary: Create a snapshot from an existing disk in another resource group.
-    syntax:
-      content: az snapshot create -g MyResourceGroup -n MySnapshot2 --source "/subscriptions/00000/resourceGroups/AnotherResourceGroup/providers/Microsoft.Compute/disks/MyDisk"
-  parameters:
+    syntax: az snapshot create -g MyResourceGroup -n MySnapshot2 --source "/subscriptions/00000/resourceGroups/AnotherResourceGroup/providers/Microsoft.Compute/disks/MyDisk"
+  - summary: Create a snapshot and associate it with a disk access resource.
+    syntax: az snapshot create -g MyResourceGroup -n MySnapshot --size-gb 10 --network-access-policy AllowPrivate --disk-access MyDiskAccessID
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the snapshot.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`. If location is not specified and no default location specified, location will be automatically set as same as the resource group.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`. If location is not specified and no default location specified, location will be automatically set as same as the resource group.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -63,19 +60,22 @@ items:
   - name: --source-storage-account-id
     summary: Used when source blob is in a different subscription.
     description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
 - uid: az_snapshot_delete
   name: az snapshot delete
   summary: Deletes a snapshot.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az snapshot delete [--ids]
+                       [--name]
+                       [--resource-group]
+                       [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -83,26 +83,30 @@ items:
     summary: The name of the snapshot.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_snapshot_grant_access
+- uid: az_snapshot_grant-access
   name: az snapshot grant-access
   summary: Grant read access to a snapshot.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az snapshot grant-access --duration-in-seconds
+                             [--ids]
+                             [--name]
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: Grant read access to a snapshot. (autogenerated)
-    syntax:
-      content: az snapshot grant-access --duration-in-seconds 3600 --name MySnapshot --resource-group MyResourceGroup
-  parameters:
+    syntax: az snapshot grant-access --duration-in-seconds 3600 --name MySnapshot --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --duration-in-seconds
     summary: Time duration in seconds until the SAS access expires.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -110,7 +114,7 @@ items:
     summary: The name of the snapshot.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -119,26 +123,33 @@ items:
   name: az snapshot list
   summary: List snapshots.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az snapshot list [--query-examples]
+                     [--resource-group]
+                     [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_snapshot_revoke_access
+- uid: az_snapshot_revoke-access
   name: az snapshot revoke-access
   summary: Revoke read access to a snapshot.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az snapshot revoke-access [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: Revoke read access to a snapshot. (autogenerated)
-    syntax:
-      content: az snapshot revoke-access --name MySnapshot --resource-group MyResourceGroup
-  parameters:
+    syntax: az snapshot revoke-access --name MySnapshot --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -146,7 +157,7 @@ items:
     summary: The name of the snapshot.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -155,17 +166,24 @@ items:
   name: az snapshot show
   summary: Gets information about a snapshot.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az snapshot show [--ids]
+                     [--name]
+                     [--query-examples]
+                     [--resource-group]
+                     [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the snapshot.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -174,19 +192,28 @@ items:
   name: az snapshot update
   summary: Update a snapshot.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az snapshot update [--add]
+                       [--force-string]
+                       [--ids]
+                       [--name]
+                       [--no-wait]
+                       [--remove]
+                       [--resource-group]
+                       [--set]
+                       [--sku {Premium_LRS, Standard_LRS}]
+                       [--subscription]
   examples:
+  - summary: Update a snapshot and associate it with a disk access resource.
+    syntax: az snapshot update --name MySnapshot --resource-group MyResourceGroup --network-access-policy AllowPrivate --disk-access MyDiskAccessID
   - summary: Update a snapshot. (autogenerated)
-    syntax:
-      content: az snapshot update --name MySnapshot --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+    syntax: az snapshot update --name MySnapshot --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --sku
-    parameterValueGroup: Premium_LRS, Standard_LRS
-    summary: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -194,50 +221,47 @@ items:
   - name: --name -n
     summary: The name of the snapshot.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
+  - name: --sku
+    parameterValueGroup: Premium_LRS, Standard_LRS
+    summary: ''
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
 - uid: az_snapshot_wait
   name: az snapshot wait
   summary: Place the CLI in a waiting state until a condition of a snapshot is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az snapshot wait [--created]
+                     [--custom]
+                     [--deleted]
+                     [--exists]
+                     [--ids]
+                     [--interval]
+                     [--name]
+                     [--resource-group]
+                     [--subscription]
+                     [--timeout]
+                     [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a condition of a snapshot is met. (autogenerated)
-    syntax:
-      content: az snapshot wait --exists --name MySnapshot --resource-group MyResourceGroup
+    syntax: az snapshot wait --exists --name MySnapshot --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until a condition of a snapshot is met. (autogenerated)
-    syntax:
-      content: az snapshot wait --created --name MySnapshot --resource-group MyResourceGroup
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the snapshot.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az snapshot wait --created --name MySnapshot --resource-group MyResourceGroup
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -250,10 +274,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The name of the snapshot.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -262,30 +298,14 @@ items:
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
 commands:
-- uid: az_snapshot_create
-  name: az snapshot create
-  summary: Create a snapshot.
-- uid: az_snapshot_delete
-  name: az snapshot delete
-  summary: Deletes a snapshot.
-- uid: az_snapshot_grant_access
-  name: az snapshot grant-access
-  summary: Grant read access to a snapshot.
-- uid: az_snapshot_list
-  name: az snapshot list
-  summary: List snapshots.
-- uid: az_snapshot_revoke_access
-  name: az snapshot revoke-access
-  summary: Revoke read access to a snapshot.
-- uid: az_snapshot_show
-  name: az snapshot show
-  summary: Gets information about a snapshot.
-- uid: az_snapshot_update
-  name: az snapshot update
-  summary: Update a snapshot.
-- uid: az_snapshot_wait
-  name: az snapshot wait
-  summary: Place the CLI in a waiting state until a condition of a snapshot is met.
+- az_snapshot_create
+- az_snapshot_delete
+- az_snapshot_grant-access
+- az_snapshot_list
+- az_snapshot_revoke-access
+- az_snapshot_show
+- az_snapshot_update
+- az_snapshot_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -301,4 +321,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage point-in-time copies of managed disks, native blobs, or other snapshots.
+metadata:
+  description: Manage point-in-time copies of managed disks, native blobs, or other snapshots.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spatial-anchors-account.yml b/2018-03-01-hybrid/docs-ref-autogen/spatial-anchors-account.yml
new file mode 100644
index 0000000000..c3c4b5a96b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spatial-anchors-account.yml
@@ -0,0 +1,232 @@
+### YamlMime:AzureCLIGroup
+uid: az_spatial-anchors-account
+name: az spatial-anchors-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az spatial-anchors-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage spatial anchor account with mixed reality.
+description: ''
+directCommands:
+- uid: az_spatial-anchors-account_create
+  name: az spatial-anchors-account create
+  summary: Create a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account create --name
+                                      --resource-group
+                                      [--kind]
+                                      [--location]
+                                      [--sku]
+                                      [--storage-account-name]
+                                      [--tags]
+  examples:
+  - summary: Create spatial anchor account
+    syntax: az spatial-anchors-account create -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_spatial-anchors-account_delete
+  name: az spatial-anchors-account delete
+  summary: Delete a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account delete --name
+                                      --resource-group
+  examples:
+  - summary: Delete spatial anchors account
+    syntax: az spatial-anchors-account delete -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spatial-anchors-account_list
+  name: az spatial-anchors-account list
+  summary: List resources by resource group and list spatial anchors accounts by subscription.
+  description: ''
+  syntax: az spatial-anchors-account list [--resource-group]
+  examples:
+  - summary: List spatial anchor accounts by resource group
+    syntax: az spatial-anchors-account list --resource-group "MyResourceGroup"
+  - summary: List spatial anchors accounts by subscription
+    syntax: az spatial-anchors-account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spatial-anchors-account_show
+  name: az spatial-anchors-account show
+  summary: Retrieve a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account show --name
+                                    --resource-group
+  examples:
+  - summary: Get spatial anchors account
+    syntax: az spatial-anchors-account show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spatial-anchors-account_update
+  name: az spatial-anchors-account update
+  summary: Update a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account update --name
+                                      --resource-group
+                                      [--add]
+                                      [--force-string]
+                                      [--kind]
+                                      [--location]
+                                      [--remove]
+                                      [--set]
+                                      [--sku]
+                                      [--storage-account-name]
+                                      [--tags]
+  examples:
+  - summary: Update spatial anchors account
+    syntax: az spatial-anchors-account update -n "MyAccount" --resource-group "MyResourceGroup" --location "eastus2euap" --tags hero="romeo" heroine="juliet"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --kind
+    summary: The kind of account, if supported.
+    description: >-
+      Usage: --kind name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    summary: The SKU associated with this account.
+    description: >-
+      Usage: --sku name=XX tier=XX size=XX family=XX capacity=XX
+
+
+      name: Required. The name of the SKU. Ex - P3. It is typically a letter+number code
+
+      tier: This field is required to be implemented by the resource provider if the service has more than one tier, but is not required on a PUT.
+
+      size: The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code.
+
+      family: If the service has different generations of hardware, for the same SKU, then that can be captured here.
+
+      capacity: If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted.
+  - name: --storage-account-name
+    summary: The name of the storage account associated with this accountId.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_spatial-anchors-account_create
+- az_spatial-anchors-account_delete
+- az_spatial-anchors-account_key
+- az_spatial-anchors-account_key_renew
+- az_spatial-anchors-account_key_show
+- az_spatial-anchors-account_list
+- az_spatial-anchors-account_show
+- az_spatial-anchors-account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage spatial anchor account with mixed reality.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spatial-anchors-account/key.yml b/2018-03-01-hybrid/docs-ref-autogen/spatial-anchors-account/key.yml
new file mode 100644
index 0000000000..4bbf0a2aa3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spatial-anchors-account/key.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_spatial-anchors-account_key
+name: az spatial-anchors-account key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **mixed-reality** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az spatial-anchors-account key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage developer keys of a spatial anchors account.
+description: ''
+directCommands:
+- uid: az_spatial-anchors-account_key_renew
+  name: az spatial-anchors-account key renew
+  summary: Regenerate specified key of a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account key renew --name
+                                         --resource-group
+                                         [--key {primary, secondary}]
+  examples:
+  - summary: Regenerate spatial anchors account keys
+    syntax: az spatial-anchors-account key renew -n "MyAccount" -k primary --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key -k
+    defaultValue: primary
+    parameterValueGroup: primary, secondary
+    summary: Key to be regenerated.
+    description: ''
+- uid: az_spatial-anchors-account_key_show
+  name: az spatial-anchors-account key show
+  summary: List both of the 2 keys of a spatial anchors account.
+  description: ''
+  syntax: >-
+    az spatial-anchors-account key show --name
+                                        --resource-group
+  examples:
+  - summary: List spatial anchor account key
+    syntax: az spatial-anchors-account key show -n "MyAccount" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of an mixed reality account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_spatial-anchors-account_key_renew
+- az_spatial-anchors-account_key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage developer keys of a spatial anchors account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud.yml
new file mode 100644
index 0000000000..e0dcae9444
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud.yml
@@ -0,0 +1,296 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud
+name: az spring-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_create
+  name: az spring-cloud create
+  summary: Create an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud create --name
+                           --resource-group
+                           [--app-insights]
+                           [--app-insights-key]
+                           [--app-network-resource-group]
+                           [--app-subnet]
+                           [--disable-app-insights {false, true}]
+                           [--disable-distributed-tracing {false, true}]
+                           [--enable-java-agent {false, true}]
+                           [--location]
+                           [--no-wait]
+                           [--reserved-cidr-range]
+                           [--service-runtime-network-resource-group]
+                           [--service-runtime-subnet]
+                           [--sku]
+                           [--tags]
+                           [--vnet]
+  examples:
+  - summary: Create a new Azure Spring Cloud in westus.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup -l westus
+  - summary: Create a new Azure Spring Cloud in westus with an existing Application Insights by using the instrumentation key.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup -l westus --app-insights-key MyInstrumentationKey
+  - summary: Create a new Azure Spring Cloud in westus with an existing Application Insights and enable Java In-Process Agent.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup -l westus --enable-java-agent true --app-insights MyInstrumentationName
+  - summary: Create a new Azure Spring Cloud with distributed tracing disabled.
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup --disable-app-insights
+  - summary: Create a new Azure Spring Cloud with VNet-injected via giving VNet name in current resource group
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup --vnet MyVNet --app-subnet MyAppSubnet --service-runtime-subnet MyServiceRuntimeSubnet
+  - summary: Create a new Azure Spring Cloud with VNet-injected via giving subnets resource ID
+    syntax: az spring-cloud create -n MyService -g MyResourceGroup --app-subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyVnetRg/providers/Microsoft.Network/VirtualNetworks/test-vnet/subnets/app --service-runtime-subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyVnetRg/providers/Microsoft.Network/VirtualNetworks/test-vnet/subnets/svc --reserved-cidr-range 10.0.0.0/16,10.1.0.0/16,10.2.0.1/16
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-insights
+    summary: Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.
+    description: ''
+  - name: --app-insights-key
+    summary: Instrumentation key of the existing Application Insights.
+    description: ''
+  - name: --app-network-resource-group --app-nrg
+    summary: The resource group where all network resources for apps will be created in.
+    description: ''
+  - name: --app-subnet
+    summary: 'The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud app. Required when deploying into a Virtual Network. Smaller subnet sizes are supported, please refer: https://aka.ms/azure-spring-cloud-smaller-subnet-vnet-docs.'
+    description: ''
+  - name: --disable-app-insights
+    parameterValueGroup: false, true
+    summary: Disable Application Insights, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --disable-distributed-tracing
+    parameterValueGroup: false, true
+    summary: Disable distributed tracing, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --enable-java-agent
+    parameterValueGroup: false, true
+    summary: Enable java in-process agent.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --reserved-cidr-range
+    summary: Comma-separated list of IP address ranges in CIDR format. The IP ranges are reserved to host underlying Azure Spring Cloud infrastructure, which should be 3 at least /16 unused IP ranges, must not overlap with any Subnet IP ranges.
+    description: ''
+  - name: --service-runtime-network-resource-group --svc-nrg
+    summary: The resource group where all network resources for Azure Spring Cloud service runtime will be created in.
+    description: ''
+  - name: --service-runtime-subnet --svc-subnet
+    summary: The name or ID of an existing subnet in "vnet" into which to deploy the Spring Cloud service runtime. Required when deploying into a Virtual Network.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    summary: Name of SKU, the value is "Basic" or "Standard".
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet
+    summary: The name or ID of an existing Virtual Network into which to deploy the Spring Cloud instance.
+    description: ''
+- uid: az_spring-cloud_delete
+  name: az spring-cloud delete
+  summary: Delete an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud delete --name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_list
+  name: az spring-cloud list
+  summary: List all Azure Spring Cloud in the given resource group, otherwise list the subscription's.
+  description: ''
+  syntax: az spring-cloud list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_show
+  name: az spring-cloud show
+  summary: Show the details for an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud show --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_update
+  name: az spring-cloud update
+  summary: Update an Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud update --name
+                           --resource-group
+                           [--app-insights]
+                           [--app-insights-key]
+                           [--disable-app-insights {false, true}]
+                           [--disable-distributed-tracing {false, true}]
+                           [--no-wait]
+                           [--sku]
+                           [--tags]
+  examples:
+  - summary: Update pricing tier.
+    syntax: az spring-cloud update -n MyService --sku Standard -g MyResourceGroup
+  - summary: Enable the distributed tracing of the existing Azure Spring Cloud.
+    syntax: az spring-cloud update -n MyService -g MyResourceGroup --disable-app-insights false
+  - summary: Update the tags of the existing Azure Spring Cloud.
+    syntax: az spring-cloud update -n MyService -g MyResourceGroup --tags key1=value1 key2=value2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-insights
+    summary: Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.
+    description: ''
+  - name: --app-insights-key
+    summary: Instrumentation key of the existing Application Insights.
+    description: ''
+  - name: --disable-app-insights
+    parameterValueGroup: false, true
+    summary: Disable Application Insights, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --disable-distributed-tracing
+    parameterValueGroup: false, true
+    summary: Disable distributed tracing, if not disabled and no existing Application Insights specified with --app-insights-key or --app-insights, will create a new Application Insights instance in the same resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: Name of SKU, the value is "Basic" or "Standard".
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_spring-cloud_app
+- az_spring-cloud_app_binding
+- az_spring-cloud_app_binding_cosmos
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+- az_spring-cloud_app_binding_list
+- az_spring-cloud_app_binding_mysql
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+- az_spring-cloud_app_binding_redis
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+- az_spring-cloud_app_binding_remove
+- az_spring-cloud_app_binding_show
+- az_spring-cloud_app_create
+- az_spring-cloud_app_custom-domain
+- az_spring-cloud_app_custom-domain_bind
+- az_spring-cloud_app_custom-domain_list
+- az_spring-cloud_app_custom-domain_show
+- az_spring-cloud_app_custom-domain_unbind
+- az_spring-cloud_app_custom-domain_update
+- az_spring-cloud_app_delete
+- az_spring-cloud_app_deploy
+- az_spring-cloud_app_deployment
+- az_spring-cloud_app_deployment_create
+- az_spring-cloud_app_deployment_delete
+- az_spring-cloud_app_deployment_list
+- az_spring-cloud_app_deployment_show
+- az_spring-cloud_app_identity
+- az_spring-cloud_app_identity_assign
+- az_spring-cloud_app_identity_remove
+- az_spring-cloud_app_identity_show
+- az_spring-cloud_app_list
+- az_spring-cloud_app_log
+- az_spring-cloud_app_log_tail
+- az_spring-cloud_app_logs
+- az_spring-cloud_app_restart
+- az_spring-cloud_app_scale
+- az_spring-cloud_app_set-deployment
+- az_spring-cloud_app_show
+- az_spring-cloud_app_show-deploy-log
+- az_spring-cloud_app_start
+- az_spring-cloud_app_stop
+- az_spring-cloud_app_unset-deployment
+- az_spring-cloud_app_update
+- az_spring-cloud_app-insights
+- az_spring-cloud_app-insights_show
+- az_spring-cloud_app-insights_update
+- az_spring-cloud_certificate
+- az_spring-cloud_certificate_add
+- az_spring-cloud_certificate_list
+- az_spring-cloud_certificate_remove
+- az_spring-cloud_certificate_show
+- az_spring-cloud_config-server
+- az_spring-cloud_config-server_clear
+- az_spring-cloud_config-server_git
+- az_spring-cloud_config-server_git_repo
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+- az_spring-cloud_config-server_git_set
+- az_spring-cloud_config-server_set
+- az_spring-cloud_config-server_show
+- az_spring-cloud_create
+- az_spring-cloud_delete
+- az_spring-cloud_list
+- az_spring-cloud_show
+- az_spring-cloud_test-endpoint
+- az_spring-cloud_test-endpoint_disable
+- az_spring-cloud_test-endpoint_enable
+- az_spring-cloud_test-endpoint_list
+- az_spring-cloud_test-endpoint_renew-key
+- az_spring-cloud_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app-insights.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app-insights.yml
new file mode 100644
index 0000000000..947b728028
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app-insights.yml
@@ -0,0 +1,85 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app-insights
+name: az spring-cloud app-insights
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app-insights** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to management Application Insights in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app-insights_show
+  name: az spring-cloud app-insights show
+  summary: Show Application Insights settings.
+  description: ''
+  syntax: >-
+    az spring-cloud app-insights show --name
+                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_app-insights_update
+  name: az spring-cloud app-insights update
+  summary: Update Application Insights settings.
+  description: ''
+  syntax: >-
+    az spring-cloud app-insights update --name
+                                        --resource-group
+                                        [--app-insights]
+                                        [--app-insights-key]
+                                        [--disable {false, true}]
+                                        [--sampling-rate]
+  examples:
+  - summary: Enable Application Insights and Java In-process Agent.
+    syntax: az spring-cloud app-insights update -n MyService -g MyResourceGroup --app-insights-key MyInstrumentationKey --sampling-rate 100
+  - summary: Disable Application Insights.
+    syntax: az spring-cloud app-insights update -n MyService -g MyResourceGroup --disable
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-insights
+    summary: Name of the existing Application Insights in the same Resource Group. Or Resource ID of the existing Application Insights in a different Resource Group.
+    description: ''
+  - name: --app-insights-key
+    summary: Instrumentation key of the existing Application Insights.
+    description: ''
+  - name: --disable
+    parameterValueGroup: false, true
+    summary: Disable Application Insights.
+    description: ''
+  - name: --sampling-rate
+    summary: Sampling Rate of application insights. Maximum is 100.
+    description: ''
+commands:
+- az_spring-cloud_app-insights_show
+- az_spring-cloud_app-insights_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to management Application Insights in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app.yml
new file mode 100644
index 0000000000..a615640828
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app.yml
@@ -0,0 +1,613 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app
+name: az spring-cloud app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage apps in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_create
+  name: az spring-cloud app create
+  summary: Create a new app with a default deployment in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app create --name
+                               --resource-group
+                               --service
+                               [--assign-endpoint {false, true}]
+                               [--assign-identity {false, true}]
+                               [--cpu]
+                               [--enable-persistent-storage {false, true}]
+                               [--env]
+                               [--instance-count]
+                               [--jvm-options]
+                               [--memory]
+                               [--runtime-version {Java_11, Java_8, NetCore_31}]
+  examples:
+  - summary: Create an app with the default configuration.
+    syntax: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup
+  - summary: Create an public accessible app with 3 instances and 2 cpu cores and 3 GB of memory per instance.
+    syntax: az spring-cloud app create -n MyApp -s MyCluster -g MyResourceGroup --assign-endpoint true --cpu 2 --memory 3 --instance-count 3
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --assign-endpoint
+    parameterValueGroup: false, true
+    summary: If true, assign endpoint URL for direct access.
+    description: ''
+  - name: --assign-identity
+    parameterValueGroup: false, true
+    summary: If true, assign managed service identity.
+    description: ''
+  - name: --cpu
+    defaultValue: "1"
+    summary: Number of virtual cpu cores per instance.
+    description: ''
+  - name: --enable-persistent-storage
+    parameterValueGroup: false, true
+    summary: If true, mount a 50G (Standard Pricing tier) or 1G (Basic Pricing tier) disk with default path.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --instance-count
+    defaultValue: "1"
+    summary: Number of instance.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --memory
+    defaultValue: "1"
+    summary: Number of GB of memory per instance.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+- uid: az_spring-cloud_app_delete
+  name: az spring-cloud app delete
+  summary: Delete an app in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app delete --name
+                               --resource-group
+                               --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_deploy
+  name: az spring-cloud app deploy
+  summary: Deploy source code or pre-built binary to an app and update related configurations.
+  description: ''
+  syntax: >-
+    az spring-cloud app deploy --name
+                               --resource-group
+                               --service
+                               [--artifact-path]
+                               [--deployment]
+                               [--env]
+                               [--jvm-options]
+                               [--main-entry]
+                               [--no-wait]
+                               [--runtime-version {Java_11, Java_8, NetCore_31}]
+                               [--target-module]
+                               [--version]
+  examples:
+  - summary: Deploy source code to an app. This will pack current directory, build binary with Pivotal Build Service and then deploy to the app.
+    syntax: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup
+  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
+    syntax: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
+  - summary: Deploy source code to a specific deployment of an app.
+    syntax: az spring-cloud app deploy -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --artifact-path --jar-path -p
+    summary: If provided, deploy pre-built artifact (jar or netcore zip), otherwise deploy current folder as tar.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --main-entry -m
+    summary: A string containing the path to the .NET executable relative to zip root.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+  - name: --target-module
+    summary: Child module to be deployed, required for multiple jar packages built from source code.
+    description: ''
+  - name: --version
+    summary: Deployment version, keep unchanged if not set.
+    description: ''
+- uid: az_spring-cloud_app_list
+  name: az spring-cloud app list
+  summary: List all apps in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app list --resource-group
+                             --service
+  examples:
+  - summary: Query status of persistent storage of all apps
+    syntax: az spring-cloud app list -s MyCluster -g MyResourceGroup -o json --query '[].{Name:name, PersistentStorage:properties.persistentDisk}'
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_logs
+  name: az spring-cloud app logs
+  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
+  description: ''
+  syntax: >-
+    az spring-cloud app logs --name
+                             --resource-group
+                             --service
+                             [--deployment]
+                             [--follow]
+                             [--format-json]
+                             [--instance]
+                             [--limit]
+                             [--lines]
+                             [--since]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --follow  -f
+    summary: Specify if the logs should be streamed.
+    description: ''
+  - name: --format-json
+    summary: Format JSON logs if structured log is enabled.
+    description: ''
+  - name: --instance -i
+    summary: Name of an existing instance of the deployment.
+    description: ''
+  - name: --limit
+    defaultValue: "2048"
+    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
+    description: ''
+  - name: --lines
+    defaultValue: "50"
+    summary: Number of lines to show. Maximum is 10000.
+    description: ''
+  - name: --since
+    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
+    description: ''
+- uid: az_spring-cloud_app_restart
+  name: az spring-cloud app restart
+  summary: Restart instances of the app, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app restart --name
+                                --resource-group
+                                --service
+                                [--deployment]
+                                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_scale
+  name: az spring-cloud app scale
+  summary: Manually scale an app or its deployments.
+  description: ''
+  syntax: >-
+    az spring-cloud app scale --name
+                              --resource-group
+                              --service
+                              [--cpu]
+                              [--deployment]
+                              [--instance-count]
+                              [--memory]
+                              [--no-wait]
+  examples:
+  - summary: Scale up an app to 4 cpu cores and 8 Gb of memory per instance.
+    syntax: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup --cpu 3 --memory 8
+  - summary: Scale out a deployment of the app to 5 instances.
+    syntax: az spring-cloud app scale -n MyApp -s MyCluster -g MyResourceGroup -d green-deployment --instance-count 5
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --cpu
+    summary: Number of virtual cpu cores per instance.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --instance-count
+    summary: Number of instance.
+    description: ''
+  - name: --memory
+    summary: Number of GB of memory per instance.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_set-deployment
+  name: az spring-cloud app set-deployment
+  summary: Set production deployment of an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app set-deployment --deployment
+                                       --name
+                                       --resource-group
+                                       --service
+                                       [--no-wait]
+  examples:
+  - summary: Swap a staging deployment of an app to production.
+    syntax: az spring-cloud app set-deployment -d green-deployment -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --deployment -d
+    summary: Name of an existing deployment of the app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_show
+  name: az spring-cloud app show
+  summary: Show the details of an app in the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud app show --name
+                             --resource-group
+                             --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_show-deploy-log
+  name: az spring-cloud app show-deploy-log
+  summary: Show build log of the last deploy, only apply to source code deploy, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app show-deploy-log --name
+                                        --resource-group
+                                        --service
+                                        [--deployment]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+- uid: az_spring-cloud_app_start
+  name: az spring-cloud app start
+  summary: Start instances of the app, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app start --name
+                              --resource-group
+                              --service
+                              [--deployment]
+                              [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_stop
+  name: az spring-cloud app stop
+  summary: Stop instances of the app, default to production deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app stop --name
+                             --resource-group
+                             --service
+                             [--deployment]
+                             [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_unset-deployment
+  name: az spring-cloud app unset-deployment
+  summary: Unset production deployment of an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app unset-deployment --name
+                                         --resource-group
+                                         --service
+                                         [--no-wait]
+  examples:
+  - summary: Swap the production deployment of an app to staging if the app has the production deployment.
+    syntax: az spring-cloud app unset-deployment -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_app_update
+  name: az spring-cloud app update
+  summary: Update configurations of an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app update --name
+                               --resource-group
+                               --service
+                               [--assign-endpoint {false, true}]
+                               [--deployment]
+                               [--enable-end-to-end-tls {false, true}]
+                               [--enable-persistent-storage {false, true}]
+                               [--env]
+                               [--https-only {false, true}]
+                               [--jvm-options]
+                               [--main-entry]
+                               [--runtime-version {Java_11, Java_8, NetCore_31}]
+  examples:
+  - summary: Add an environment variable for the app.
+    syntax: az spring-cloud app update -n MyApp -s MyCluster -g MyResourceGroup --env foo=bar
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --assign-endpoint
+    parameterValueGroup: false, true
+    summary: If true, assign endpoint URL for direct access.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --enable-end-to-end-tls
+    parameterValueGroup: false, true
+    summary: If true, enable end to end tls.
+    description: ''
+  - name: --enable-persistent-storage
+    parameterValueGroup: false, true
+    summary: If true, mount a 50G (Standard Pricing tier) or 1G (Basic Pricing tier) disk with default path.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --https-only
+    parameterValueGroup: false, true
+    summary: If true, access app via https.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --main-entry -m
+    summary: The path to the .NET executable relative to zip root.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+commands:
+- az_spring-cloud_app_binding
+- az_spring-cloud_app_binding_cosmos
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+- az_spring-cloud_app_binding_list
+- az_spring-cloud_app_binding_mysql
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+- az_spring-cloud_app_binding_redis
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+- az_spring-cloud_app_binding_remove
+- az_spring-cloud_app_binding_show
+- az_spring-cloud_app_create
+- az_spring-cloud_app_custom-domain
+- az_spring-cloud_app_custom-domain_bind
+- az_spring-cloud_app_custom-domain_list
+- az_spring-cloud_app_custom-domain_show
+- az_spring-cloud_app_custom-domain_unbind
+- az_spring-cloud_app_custom-domain_update
+- az_spring-cloud_app_delete
+- az_spring-cloud_app_deploy
+- az_spring-cloud_app_deployment
+- az_spring-cloud_app_deployment_create
+- az_spring-cloud_app_deployment_delete
+- az_spring-cloud_app_deployment_list
+- az_spring-cloud_app_deployment_show
+- az_spring-cloud_app_identity
+- az_spring-cloud_app_identity_assign
+- az_spring-cloud_app_identity_remove
+- az_spring-cloud_app_identity_show
+- az_spring-cloud_app_list
+- az_spring-cloud_app_log
+- az_spring-cloud_app_log_tail
+- az_spring-cloud_app_logs
+- az_spring-cloud_app_restart
+- az_spring-cloud_app_scale
+- az_spring-cloud_app_set-deployment
+- az_spring-cloud_app_show
+- az_spring-cloud_app_show-deploy-log
+- az_spring-cloud_app_start
+- az_spring-cloud_app_stop
+- az_spring-cloud_app_unset-deployment
+- az_spring-cloud_app_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage apps in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding.yml
new file mode 100644
index 0000000000..b27d5b8c85
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding.yml
@@ -0,0 +1,113 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding
+name: az spring-cloud app binding
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_list
+  name: az spring-cloud app binding list
+  summary: List all service bindings in an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding list --app
+                                     --resource-group
+                                     --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_binding_remove
+  name: az spring-cloud app binding remove
+  summary: Remove a service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding remove --app
+                                       --name
+                                       --resource-group
+                                       --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_binding_show
+  name: az spring-cloud app binding show
+  summary: Show the details of a service binding.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding show --app
+                                     --name
+                                     --resource-group
+                                     --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_cosmos
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+- az_spring-cloud_app_binding_list
+- az_spring-cloud_app_binding_mysql
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+- az_spring-cloud_app_binding_redis
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+- az_spring-cloud_app_binding_remove
+- az_spring-cloud_app_binding_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage bindings with Azure Data Services, you need to manually restart app to make settings take effect.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/cosmos.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/cosmos.yml
new file mode 100644
index 0000000000..e343816de0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/cosmos.yml
@@ -0,0 +1,122 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding_cosmos
+name: az spring-cloud app binding cosmos
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding cosmos** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Cosmos DB bindings.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_cosmos_add
+  name: az spring-cloud app binding cosmos add
+  summary: Bind an Azure Cosmos DB with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding cosmos add --api-type {cassandra, gremlin, mongo, sql, table}
+                                           --app
+                                           --name
+                                           --resource-group
+                                           --resource-id
+                                           --service
+                                           [--collection-name]
+                                           [--database-name]
+                                           [--key-space]
+  examples:
+  - summary: Bind an Azure Cosmos DB.
+    syntax: az spring-cloud app binding cosmos add -n cosmosProduction --app MyApp --resource-id ${COSMOSDB_ID} --api-type mongo --database mymongo -g MyResourceGroup -s MyService
+  requiredParameters:
+  - isRequired: true
+    name: --api-type
+    parameterValueGroup: cassandra, gremlin, mongo, sql, table
+    summary: Type of API.
+    description: ''
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: Azure resource ID of the service to bind with.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --collection-name
+    summary: Name of collection. Required for gremlin.
+    description: ''
+  - name: --database-name
+    summary: Name of database. Required for mongo, sql, gremlin.
+    description: ''
+  - name: --key-space
+    summary: Cassandra key space. Required for cassandra.
+    description: ''
+- uid: az_spring-cloud_app_binding_cosmos_update
+  name: az spring-cloud app binding cosmos update
+  summary: Update an Azure Cosmos DB service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding cosmos update --app
+                                              --name
+                                              --resource-group
+                                              --service
+                                              [--collection-name]
+                                              [--database-name]
+                                              [--key-space]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --collection-name
+    summary: Name of collection. Required for gremlin.
+    description: ''
+  - name: --database-name
+    summary: Name of database. Required for mongo, sql, gremlin.
+    description: ''
+  - name: --key-space
+    summary: Cassandra key space. Required for cassandra.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_cosmos_add
+- az_spring-cloud_app_binding_cosmos_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Cosmos DB bindings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/mysql.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/mysql.yml
new file mode 100644
index 0000000000..0c76f9ed26
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/mysql.yml
@@ -0,0 +1,115 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding_mysql
+name: az spring-cloud app binding mysql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding mysql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Database for MySQL bindings.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_mysql_add
+  name: az spring-cloud app binding mysql add
+  summary: Bind an Azure Database for MySQL with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding mysql add --app
+                                          --database-name
+                                          --key
+                                          --name
+                                          --resource-group
+                                          --resource-id
+                                          --service
+                                          --username
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --database-name
+    summary: Database name.
+    description: ''
+  - isRequired: true
+    name: --key
+    summary: API key of the service.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: Azure resource ID of the service to bind with.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  - isRequired: true
+    name: --username
+    summary: Username of the database.
+    description: ''
+- uid: az_spring-cloud_app_binding_mysql_update
+  name: az spring-cloud app binding mysql update
+  summary: Update an Azure Database for MySQL service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding mysql update --app
+                                             --name
+                                             --resource-group
+                                             --service
+                                             [--database-name]
+                                             [--key]
+                                             [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --database-name
+    summary: Database name.
+    description: ''
+  - name: --key
+    summary: API key of the service.
+    description: ''
+  - name: --username
+    summary: Username of the database.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_mysql_add
+- az_spring-cloud_app_binding_mysql_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Database for MySQL bindings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/redis.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/redis.yml
new file mode 100644
index 0000000000..a779084689
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/binding/redis.yml
@@ -0,0 +1,99 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_binding_redis
+name: az spring-cloud app binding redis
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app binding redis** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure Cache for Redis bindings.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_binding_redis_add
+  name: az spring-cloud app binding redis add
+  summary: Bind an Azure Cache for Redis with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding redis add --app
+                                          --name
+                                          --resource-group
+                                          --resource-id
+                                          --service
+                                          [--disable-ssl {false, true}]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-id
+    summary: Azure resource ID of the service to bind with.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --disable-ssl
+    parameterValueGroup: false, true
+    summary: If true, disable SSL. If false, enable SSL.
+    description: ''
+- uid: az_spring-cloud_app_binding_redis_update
+  name: az spring-cloud app binding redis update
+  summary: Update an Azure Cache for Redis service binding of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app binding redis update --app
+                                             --name
+                                             --resource-group
+                                             --service
+                                             [--disable-ssl {false, true}]
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of service binding.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --disable-ssl
+    parameterValueGroup: false, true
+    summary: If true, disable SSL. If false, enable SSL.
+    description: ''
+commands:
+- az_spring-cloud_app_binding_redis_add
+- az_spring-cloud_app_binding_redis_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure Cache for Redis bindings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/custom-domain.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/custom-domain.yml
new file mode 100644
index 0000000000..f5b1d7d26d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/custom-domain.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_custom-domain
+name: az spring-cloud app custom-domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app custom-domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage custom domains.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_custom-domain_bind
+  name: az spring-cloud app custom-domain bind
+  summary: Bind a custom domain with the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain bind --app
+                                           --domain-name
+                                           --resource-group
+                                           --service
+                                           [--certificate]
+                                           [--enable-end-to-end-tls {false, true}]
+  examples:
+  - summary: Bind a custom domain to app.
+    syntax: az spring-cloud app custom-domain bind --domain-name MyDomainName --certificate MyCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --certificate
+    summary: Certificate name in Azure Spring Cloud.
+    description: ''
+  - name: --enable-end-to-end-tls
+    parameterValueGroup: false, true
+    summary: If true, enable end to end tls.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_list
+  name: az spring-cloud app custom-domain list
+  summary: List all custom domains of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain list --app
+                                           --resource-group
+                                           --service
+  examples:
+  - summary: List all custom domains of the app.
+    syntax: az spring-cloud app custom-domain list --app MyAppName --service MyCluster --resource-group MyResourceGroup -o table
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_show
+  name: az spring-cloud app custom-domain show
+  summary: Show details of a custom domain.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain show --app
+                                           --domain-name
+                                           --resource-group
+                                           --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_unbind
+  name: az spring-cloud app custom-domain unbind
+  summary: Unbind a custom-domain of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain unbind --app
+                                             --domain-name
+                                             --resource-group
+                                             --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_custom-domain_update
+  name: az spring-cloud app custom-domain update
+  summary: Update a custom domain of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app custom-domain update --app
+                                             --domain-name
+                                             --resource-group
+                                             --service
+                                             [--certificate]
+                                             [--enable-end-to-end-tls {false, true}]
+  examples:
+  - summary: Bind custom domain with a specified certificate.
+    syntax: az spring-cloud app custom-domain update --domain-name MyDomainName --certificate MCertName --app MyAppName --service MyCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --domain-name
+    summary: Name of custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --certificate
+    summary: Certificate name in Azure Spring Cloud.
+    description: ''
+  - name: --enable-end-to-end-tls
+    parameterValueGroup: false, true
+    summary: If true, enable end to end tls.
+    description: ''
+commands:
+- az_spring-cloud_app_custom-domain_bind
+- az_spring-cloud_app_custom-domain_list
+- az_spring-cloud_app_custom-domain_show
+- az_spring-cloud_app_custom-domain_unbind
+- az_spring-cloud_app_custom-domain_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage custom domains.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/deployment.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/deployment.yml
new file mode 100644
index 0000000000..d6cb139133
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/deployment.yml
@@ -0,0 +1,186 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_deployment
+name: az spring-cloud app deployment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app deployment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_deployment_create
+  name: az spring-cloud app deployment create
+  summary: Create a staging deployment for the app. To deploy code or update setting to an existing deployment, use `az spring-cloud app deploy/update --deployment <staging deployment>`.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment create --app
+                                          --name
+                                          --resource-group
+                                          --service
+                                          [--artifact-path]
+                                          [--cpu]
+                                          [--env]
+                                          [--instance-count]
+                                          [--jvm-options]
+                                          [--main-entry]
+                                          [--memory]
+                                          [--no-wait]
+                                          [--runtime-version {Java_11, Java_8, NetCore_31}]
+                                          [--skip-clone-settings]
+                                          [--target-module]
+                                          [--version]
+  examples:
+  - summary: Deploy source code to a new deployment of an app. This will pack current directory, build binary with Pivotal Build Service and then deploy.
+    syntax: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup
+  - summary: Deploy a pre-built jar to an app with jvm options and environment variables.
+    syntax: az spring-cloud app deployment create -n green-deployment --app MyApp -s MyCluster -g MyResourceGroup --jar-path app.jar --jvm-options="-XX:+UseG1GC -XX:+UseStringDeduplication" --env foo=bar
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of deployment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --artifact-path --jar-path -p
+    summary: If provided, deploy pre-built artifact (jar or netcore zip), otherwise deploy current folder as tar.
+    description: ''
+  - name: --cpu
+    summary: Number of virtual cpu cores per instance.
+    description: ''
+  - name: --env
+    summary: Space-separated environment variables in 'key[=value]' format.
+    description: ''
+  - name: --instance-count
+    summary: Number of instance.
+    description: ''
+  - name: --jvm-options
+    summary: "A string containing jvm options, use '=' instead of ' ' for this argument to avoid bash parse error, eg: --jvm-options='-Xms1024m -Xmx2048m'."
+    description: ''
+  - name: --main-entry -m
+    summary: A string containing the path to the .NET executable relative to zip root.
+    description: ''
+  - name: --memory
+    summary: Number of GB of memory per instance.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --runtime-version
+    parameterValueGroup: Java_11, Java_8, NetCore_31
+    summary: Runtime version of used language.
+    description: ''
+  - name: --skip-clone-settings
+    summary: Create staging deployment will automatically copy settings from production deployment.
+    description: ''
+  - name: --target-module
+    summary: Child module to be deployed, required for multiple jar packages built from source code.
+    description: ''
+  - name: --version
+    summary: Deployment version, keep unchanged if not set.
+    description: ''
+- uid: az_spring-cloud_app_deployment_delete
+  name: az spring-cloud app deployment delete
+  summary: Delete a deployment of the app.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment delete --app
+                                          --name
+                                          --resource-group
+                                          --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of deployment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_deployment_list
+  name: az spring-cloud app deployment list
+  summary: List all deployments in an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment list --app
+                                        --resource-group
+                                        --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_deployment_show
+  name: az spring-cloud app deployment show
+  summary: Show details of a deployment.
+  description: ''
+  syntax: >-
+    az spring-cloud app deployment show --app
+                                        --name
+                                        --resource-group
+                                        --service
+  requiredParameters:
+  - isRequired: true
+    name: --app
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of deployment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_app_deployment_create
+- az_spring-cloud_app_deployment_delete
+- az_spring-cloud_app_deployment_list
+- az_spring-cloud_app_deployment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage life cycle of deployments of an app in Azure Spring Cloud. More operations on deployments can be done on app level with parameter --deployment. e.g. az spring-cloud app deploy --deployment <staging deployment>.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/identity.yml
new file mode 100644
index 0000000000..743be5fed5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/identity.yml
@@ -0,0 +1,114 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_identity
+name: az spring-cloud app identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage an app's managed service identity.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_identity_assign
+  name: az spring-cloud app identity assign
+  summary: Enable managed service identity on an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app identity assign --name
+                                        --resource-group
+                                        --service
+                                        [--role]
+                                        [--scope]
+  examples:
+  - summary: Enable the system assigned identity.
+    syntax: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup
+  - summary: Enable the system assigned identity on an app with the 'Reader' role.
+    syntax: az spring-cloud app identity assign -n MyApp -s MyCluster -g MyResourceGroup --role Reader --scope /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/xxxxx/providers/Microsoft.KeyVault/vaults/xxxxx
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --role
+    summary: Role name or id the managed identity will be assigned.
+    description: ''
+  - name: --scope
+    summary: The scope the managed identity has access to.
+    description: ''
+- uid: az_spring-cloud_app_identity_remove
+  name: az spring-cloud app identity remove
+  summary: Remove managed service identity from an app.
+  description: ''
+  syntax: >-
+    az spring-cloud app identity remove --name
+                                        --resource-group
+                                        --service
+  examples:
+  - summary: Remove the system assigned identity from an app.
+    syntax: az spring-cloud app identity remove -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_app_identity_show
+  name: az spring-cloud app identity show
+  summary: Display app's managed identity info.
+  description: ''
+  syntax: >-
+    az spring-cloud app identity show --name
+                                      --resource-group
+                                      --service
+  examples:
+  - summary: Display an app's managed identity info.
+    syntax: az spring-cloud app identity show -n MyApp -s MyCluster -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_app_identity_assign
+- az_spring-cloud_app_identity_remove
+- az_spring-cloud_app_identity_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage an app's managed service identity.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/log.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/log.yml
new file mode 100644
index 0000000000..2480245f21
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/app/log.yml
@@ -0,0 +1,81 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_app_log
+name: az spring-cloud app log
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud app log** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
+description: ''
+directCommands:
+- uid: az_spring-cloud_app_log_tail
+  name: az spring-cloud app log tail
+  summary: Show logs of an app instance, logs will be streamed when setting '-f/--follow'.
+  description: ''
+  syntax: >-
+    az spring-cloud app log tail --name
+                                 --resource-group
+                                 --service
+                                 [--deployment]
+                                 [--follow]
+                                 [--format-json]
+                                 [--instance]
+                                 [--limit]
+                                 [--lines]
+                                 [--since]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of app.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  optionalParameters:
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+  - name: --follow  -f
+    summary: Specify if the logs should be streamed.
+    description: ''
+  - name: --format-json
+    summary: Format JSON logs if structured log is enabled.
+    description: ''
+  - name: --instance -i
+    summary: Name of an existing instance of the deployment.
+    description: ''
+  - name: --limit
+    defaultValue: "2048"
+    summary: Maximum kilobytes of logs to return. Ceiling number is 2048.
+    description: ''
+  - name: --lines
+    defaultValue: "50"
+    summary: Number of lines to show. Maximum is 10000.
+    description: ''
+  - name: --since
+    summary: Only return logs newer than a relative duration like 5s, 2m, or 1h. Maximum is 1h.
+    description: ''
+commands:
+- az_spring-cloud_app_log_tail
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to tail app instances logs with multiple options. If the app has only one instance, the instance name is optional.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/certificate.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/certificate.yml
new file mode 100644
index 0000000000..2cc8bda2d1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/certificate.yml
@@ -0,0 +1,127 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_certificate
+name: az spring-cloud certificate
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud certificate** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage certificates.
+description: ''
+directCommands:
+- uid: az_spring-cloud_certificate_add
+  name: az spring-cloud certificate add
+  summary: Add a certificate in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate add --name
+                                    --resource-group
+                                    --service
+                                    --vault-certificate-name
+                                    --vault-uri
+  examples:
+  - summary: Import certificate from key vault.
+    syntax: az spring-cloud certificate add --name MyCertName --vault-uri MyKeyVaultUri --vault-certificate-name MyKeyVaultCertName --service MyCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of certificate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+  - isRequired: true
+    name: --vault-certificate-name
+    summary: The certificate name in key vault.
+    description: ''
+  - isRequired: true
+    name: --vault-uri
+    summary: The key vault uri where store the certificate.
+    description: ''
+- uid: az_spring-cloud_certificate_list
+  name: az spring-cloud certificate list
+  summary: List all certificates in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate list --resource-group
+                                     --service
+  examples:
+  - summary: List all certificates in spring cloud service.
+    syntax: az spring-cloud certificate list --service MyCluster --resource-group MyResourceGroup -o table
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_certificate_remove
+  name: az spring-cloud certificate remove
+  summary: Remove a certificate in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate remove --name
+                                       --resource-group
+                                       --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of certificate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+- uid: az_spring-cloud_certificate_show
+  name: az spring-cloud certificate show
+  summary: Show a certificate in Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud certificate show --name
+                                     --resource-group
+                                     --service
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of certificate.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --service -s
+    summary: Name of Azure Spring Cloud, you can configure the default service using az configure --defaults spring-cloud=<name>.
+    description: ''
+commands:
+- az_spring-cloud_certificate_add
+- az_spring-cloud_certificate_list
+- az_spring-cloud_certificate_remove
+- az_spring-cloud_certificate_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server.yml
new file mode 100644
index 0000000000..75929d265c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_config-server
+name: az spring-cloud config-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud config-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Config Server in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_config-server_clear
+  name: az spring-cloud config-server clear
+  summary: Erase all settings in Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server clear --name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_config-server_set
+  name: az spring-cloud config-server set
+  summary: Set Config Server from a yaml file.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server set --config-file
+                                      --name
+                                      --resource-group
+                                      [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: A yaml file path for the configuration of Spring Cloud config server.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_spring-cloud_config-server_show
+  name: az spring-cloud config-server show
+  summary: Show Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server show --name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_spring-cloud_config-server_clear
+- az_spring-cloud_config-server_git
+- az_spring-cloud_config-server_git_repo
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+- az_spring-cloud_config-server_git_set
+- az_spring-cloud_config-server_set
+- az_spring-cloud_config-server_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Config Server in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server/git.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server/git.yml
new file mode 100644
index 0000000000..963e1f394c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server/git.yml
@@ -0,0 +1,88 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_config-server_git
+name: az spring-cloud config-server git
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud config-server git** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Config Server git property in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_config-server_git_set
+  name: az spring-cloud config-server git set
+  summary: Set git property of Config Server, will totally override the old one.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git set --name
+                                          --resource-group
+                                          --uri
+                                          [--host-key]
+                                          [--host-key-algorithm]
+                                          [--label]
+                                          [--password]
+                                          [--private-key]
+                                          [--search-paths]
+                                          [--strict-host-key-checking]
+                                          [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --uri
+    summary: Uri of the added config.
+    description: ''
+  optionalParameters:
+  - name: --host-key
+    summary: Host key of the added config.
+    description: ''
+  - name: --host-key-algorithm
+    summary: Host key algorithm of the added config.
+    description: ''
+  - name: --label
+    summary: Label of the added config.
+    description: ''
+  - name: --password
+    summary: Password of the added config.
+    description: ''
+  - name: --private-key
+    summary: Private_key of the added config.
+    description: ''
+  - name: --search-paths
+    summary: Search_paths of the added config, use , as delimiter for multiple paths.
+    description: ''
+  - name: --strict-host-key-checking
+    summary: Strict_host_key_checking of the added config.
+    description: ''
+  - name: --username
+    summary: Username of the added config.
+    description: ''
+commands:
+- az_spring-cloud_config-server_git_repo
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+- az_spring-cloud_config-server_git_set
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Config Server git property in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server/git/repo.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server/git/repo.yml
new file mode 100644
index 0000000000..7106842be8
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/config-server/git/repo.yml
@@ -0,0 +1,194 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_config-server_git_repo
+name: az spring-cloud config-server git repo
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud config-server git repo** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Config Server git repository in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_config-server_git_repo_add
+  name: az spring-cloud config-server git repo add
+  summary: Add a new repository of git property of Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo add --name
+                                               --repo-name
+                                               --resource-group
+                                               --uri
+                                               [--host-key]
+                                               [--host-key-algorithm]
+                                               [--label]
+                                               [--password]
+                                               [--pattern]
+                                               [--private-key]
+                                               [--search-paths]
+                                               [--strict-host-key-checking]
+                                               [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --repo-name
+    summary: Name of the repo.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --uri
+    summary: Uri of the added config.
+    description: ''
+  optionalParameters:
+  - name: --host-key
+    summary: Host key of the added config.
+    description: ''
+  - name: --host-key-algorithm
+    summary: Host key algorithm of the added config.
+    description: ''
+  - name: --label
+    summary: Label of the added config.
+    description: ''
+  - name: --password
+    summary: Password of the added config.
+    description: ''
+  - name: --pattern
+    summary: Pattern of the repo, use , as delimiter for multiple patterns.
+    description: ''
+  - name: --private-key
+    summary: Private_key of the added config.
+    description: ''
+  - name: --search-paths
+    summary: Search_paths of the added config, use , as delimiter for multiple paths.
+    description: ''
+  - name: --strict-host-key-checking
+    summary: Strict_host_key_checking of the added config.
+    description: ''
+  - name: --username
+    summary: Username of the added config.
+    description: ''
+- uid: az_spring-cloud_config-server_git_repo_list
+  name: az spring-cloud config-server git repo list
+  summary: List all repositories of git property of Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo list --name
+                                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_config-server_git_repo_remove
+  name: az spring-cloud config-server git repo remove
+  summary: Remove an existing repository of git property of Config Server.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo remove --name
+                                                  --repo-name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --repo-name
+    summary: Name of the repo.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_config-server_git_repo_update
+  name: az spring-cloud config-server git repo update
+  summary: Override an existing repository of git property of Config Server, will totally override the old one.
+  description: ''
+  syntax: >-
+    az spring-cloud config-server git repo update --name
+                                                  --repo-name
+                                                  --resource-group
+                                                  [--host-key]
+                                                  [--host-key-algorithm]
+                                                  [--label]
+                                                  [--password]
+                                                  [--pattern]
+                                                  [--private-key]
+                                                  [--search-paths]
+                                                  [--strict-host-key-checking]
+                                                  [--uri]
+                                                  [--username]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --repo-name
+    summary: Name of the repo.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --host-key
+    summary: Host key of the added config.
+    description: ''
+  - name: --host-key-algorithm
+    summary: Host key algorithm of the added config.
+    description: ''
+  - name: --label
+    summary: Label of the added config.
+    description: ''
+  - name: --password
+    summary: Password of the added config.
+    description: ''
+  - name: --pattern
+    summary: Pattern of the repo, use , as delimiter for multiple patterns.
+    description: ''
+  - name: --private-key
+    summary: Private_key of the added config.
+    description: ''
+  - name: --search-paths
+    summary: Search_paths of the added config, use , as delimiter for multiple paths.
+    description: ''
+  - name: --strict-host-key-checking
+    summary: Strict_host_key_checking of the added config.
+    description: ''
+  - name: --uri
+    summary: Uri of the added config.
+    description: ''
+  - name: --username
+    summary: Username of the added config.
+    description: ''
+commands:
+- az_spring-cloud_config-server_git_repo_add
+- az_spring-cloud_config-server_git_repo_list
+- az_spring-cloud_config-server_git_repo_remove
+- az_spring-cloud_config-server_git_repo_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Config Server git repository in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/test-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/test-endpoint.yml
new file mode 100644
index 0000000000..0803da2997
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/spring-cloud/test-endpoint.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_spring-cloud_test-endpoint
+name: az spring-cloud test-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **spring-cloud** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az spring-cloud test-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage test endpoint in Azure Spring Cloud.
+description: ''
+directCommands:
+- uid: az_spring-cloud_test-endpoint_disable
+  name: az spring-cloud test-endpoint disable
+  summary: Disable test endpoint of the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint disable --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_test-endpoint_enable
+  name: az spring-cloud test-endpoint enable
+  summary: Enable test endpoint of the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint enable --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_spring-cloud_test-endpoint_list
+  name: az spring-cloud test-endpoint list
+  summary: List test endpoint keys of the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint list --name
+                                       --resource-group
+                                       [--app]
+                                       [--deployment]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app
+    summary: Name of app.
+    description: ''
+  - name: --deployment -d
+    summary: Name of an existing deployment of the app. Default to the production deployment if not specified.
+    description: ''
+- uid: az_spring-cloud_test-endpoint_renew-key
+  name: az spring-cloud test-endpoint renew-key
+  summary: Regenerate a test-endpoint key for the Azure Spring Cloud.
+  description: ''
+  syntax: >-
+    az spring-cloud test-endpoint renew-key --name
+                                            --resource-group
+                                            --type {Primary, Secondary}
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of Azure Spring Cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Primary, Secondary
+    summary: Type of test-endpoint key.
+    description: ''
+commands:
+- az_spring-cloud_test-endpoint_disable
+- az_spring-cloud_test-endpoint_enable
+- az_spring-cloud_test-endpoint_list
+- az_spring-cloud_test-endpoint_renew-key
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage test endpoint in Azure Spring Cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sql.yml b/2018-03-01-hybrid/docs-ref-autogen/sql.yml
new file mode 100644
index 0000000000..a8783f16af
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sql.yml
@@ -0,0 +1,109 @@
+### YamlMime:AzureCLIGroup
+uid: az_sql
+name: az sql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **db-up** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az sql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure SQL Databases and Data Warehouses.
+description: ''
+directCommands:
+- uid: az_sql_down
+  name: az sql down
+  summary: Delete the SQL server and its cached information.
+  description: ''
+  syntax: >-
+    az sql down [--delete-group]
+                [--no-wait]
+                [--resource-group]
+                [--server-name]
+                [--yes]
+  examples:
+  - summary: Delete the server and the cached data, aside from the resource group.
+    syntax: az sql down
+  - summary: Delete the resource group and the full cache.
+    syntax: az sql down --delete-group
+  optionalParameters:
+  - name: --delete-group
+    summary: Delete the resource group.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sql_up
+  name: az sql up
+  summary: Set up an Azure Database for SQL server and configurations.
+  description: ''
+  syntax: >-
+    az sql up [--admin-password]
+              [--admin-user]
+              [--database-name]
+              [--generate-password]
+              [--location]
+              [--resource-group]
+              [--server-name]
+              [--tags]
+              [--version]
+  examples:
+  - summary: Ensure that a Azure Database for SQL server is up and running and configured for immediate use.
+    syntax: az sql up
+  - summary: To override default names, provide parameters indicating desired values/existing resources.
+    syntax: az sql up -g MyResourceGroup -s MyServer -d MyDatabase -u MyUsername -p MyPassword
+  optionalParameters:
+  - name: --admin-password -p
+    summary: 'The login password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.Your password cannot contain all or part of the login name. Part of a login name is defined as three or more consecutive alphanumeric characters.'
+    description: ''
+  - name: --admin-user -u
+    summary: The login username of the administrator.
+    description: ''
+  - name: --database-name -d
+    summary: The name of a database to initialize.
+    description: ''
+  - name: --generate-password
+    summary: Generate a password.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --server-name -s
+    summary: Name of the server.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --version
+    defaultValue: "12.0"
+    summary: Server version.
+    description: ''
+commands:
+- az_sql_down
+- az_sql_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure SQL Databases and Data Warehouses.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/ssh.yml b/2018-03-01-hybrid/docs-ref-autogen/ssh.yml
new file mode 100644
index 0000000000..1c4cb4e483
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/ssh.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_ssh
+name: az ssh
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ssh** extension for Azure CLI and requires version 2.4.0 or higher.  The extension will automatically install the first time you run an **az ssh** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: SSH into resources (Azure VMs, etc) using AAD issued openssh certificates.
+description: ''
+directCommands:
+- uid: az_ssh_cert
+  name: az ssh cert
+  summary: Create an SSH RSA certificate signed by AAD.
+  description: ''
+  syntax: >-
+    az ssh cert [--file]
+                [--public-key-file]
+  examples:
+  - summary: Create a short lived ssh certificate signed by AAD
+    syntax: az ssh cert --public-key-file ./id_rsa.pub --file ./id_rsa-aadcert.pub
+  optionalParameters:
+  - name: --file -f
+    summary: The file path to write the SSH cert to, defaults to public key path with -aadcert.pub appened.
+    description: ''
+  - name: --public-key-file -p
+    summary: The RSA public key file path.
+    description: ''
+- uid: az_ssh_config
+  name: az ssh config
+  summary: Create an SSH config for resources (Azure VMs, etc) which can then be used by clients that support OpenSSH configs and certificates.
+  description: Other software (git/rsync/etc) that support setting an SSH command can be set to use the config file by setting the command to 'ssh -F /path/to/config' e.g. rsync -e 'ssh -F /path/to/config'.
+  syntax: >-
+    az ssh config --file
+                  [--ip]
+                  [--name]
+                  [--overwrite]
+                  [--prefer-private-ip]
+                  [--private-key-file]
+                  [--public-key-file]
+                  [--resource-group]
+  examples:
+  - summary: Give a resource group and VM for which to create a config, and save in a local file
+    syntax: az ssh config --resource-group myResourceGroup --vm-name myVm --file ./sshconfig
+  - summary: Give the public IP (or hostname) of a VM for which to create a config and then ssh
+    syntax: >-
+      az ssh config --ip 1.2.3.4 --file ./sshconfig
+
+      ssh -F ./sshconfig 1.2.3.4
+  - summary: Create a generic config for use with any host
+    syntax: >-
+      #Bash
+
+      az ssh config --ip \* --file ./sshconfig
+
+      #PowerShell
+
+      az ssh config --ip * --file ./sshconfig
+  - summary: Examples with other software
+    syntax: >-
+      #Bash
+
+      az ssh config --ip \* --file ./sshconfig
+
+      rsync -e 'ssh -F ./sshconfig' -avP directory/ myvm:~/directory
+
+      GIT_SSH_COMMAND="ssh -F ./sshconfig" git clone myvm:~/gitrepo
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The file path to write the SSH config to.
+    description: ''
+  optionalParameters:
+  - name: --ip
+    summary: The public IP address (or hostname) of the VM.
+    description: ''
+  - name: --name --vm-name -n
+    summary: The name of the VM.
+    description: ''
+  - name: --overwrite
+    summary: Overwrites the config file if this flag is set.
+    description: ''
+  - name: --prefer-private-ip
+    summary: Will use a private IP if available. By default only public IPs are used.
+    description: ''
+  - name: --private-key-file -i
+    summary: The RSA private key file path.
+    description: ''
+  - name: --public-key-file -p
+    summary: The RSA public key file path.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ssh_vm
+  name: az ssh vm
+  summary: SSH into Azure VMs using an ssh certificate.
+  description: ''
+  syntax: >-
+    az ssh vm [--ip]
+              [--name]
+              [--prefer-private-ip]
+              [--private-key-file]
+              [--public-key-file]
+              [--resource-group]
+  examples:
+  - summary: Give a resource group and VM to SSH to
+    syntax: az ssh vm --resource-group myResourceGroup --vm-name myVm
+  - summary: Give the public IP (or hostname) of a VM to SSH to
+    syntax: az ssh vm --ip 1.2.3.4
+  - summary: Using a custom private key file
+    syntax: az ssh vm --ip 1.2.3.4 --private-key-file key --public-key-file key.pub
+  optionalParameters:
+  - name: --ip
+    summary: The public IP address (or hostname) of the VM.
+    description: ''
+  - name: --name --vm-name -n
+    summary: The name of the VM.
+    description: ''
+  - name: --prefer-private-ip
+    summary: Will use a private IP if available. By default only public IPs are used.
+    description: ''
+  - name: --private-key-file -i
+    summary: The RSA private key file path.
+    description: ''
+  - name: --public-key-file -p
+    summary: The RSA public key file path.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_ssh_cert
+- az_ssh_config
+- az_ssh_vm
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: SSH into resources (Azure VMs, etc) using AAD issued openssh certificates.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/sshkey.yml b/2018-03-01-hybrid/docs-ref-autogen/sshkey.yml
new file mode 100644
index 0000000000..e87c1a17fc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/sshkey.yml
@@ -0,0 +1,172 @@
+### YamlMime:AzureCLIGroup
+uid: az_sshkey
+name: az sshkey
+summary: Manage ssh public key with vm.
+description: ''
+directCommands:
+- uid: az_sshkey_create
+  name: az sshkey create
+  summary: Create a new SSH public key resource.
+  description: ''
+  syntax: >-
+    az sshkey create --name
+                     --resource-group
+                     [--location]
+                     [--public-key]
+                     [--subscription]
+                     [--tags]
+  examples:
+  - summary: Create a new SSH public key resource.
+    syntax: az sshkey create --location "westus" --public-key "{ssh-rsa public key}" --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  - summary: Create a new SSH public key resource using public key in a file.
+    syntax: az sshkey create --location "westus" --public-key "@filename" --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  - summary: Create a new SSH public key resource with auto-generated value.
+    syntax: az sshkey create --location "westus" --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  requiredParameters:
+  - isRequired: true
+    name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --public-key
+    summary: SSH public key used to authenticate to a virtual machine through ssh. If this property is not initially provided when the resource is created, the publicKey property will be populated when generateKeyPair is called. If the public key is provided upon resource creation, the provided public key needs to be at least 2048-bit and in ssh-rsa format.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_sshkey_delete
+  name: az sshkey delete
+  summary: Delete an SSH public key.
+  description: ''
+  syntax: >-
+    az sshkey delete [--ids]
+                     [--name]
+                     [--resource-group]
+                     [--subscription]
+                     [--yes]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_sshkey_list
+  name: az sshkey list
+  summary: List all of the SSH public keys.
+  description: ''
+  syntax: >-
+    az sshkey list [--query-examples]
+                   [--resource-group]
+                   [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_sshkey_show
+  name: az sshkey show
+  summary: Retrieve information about an SSH public key.
+  description: ''
+  syntax: >-
+    az sshkey show [--ids]
+                   [--name]
+                   [--query-examples]
+                   [--resource-group]
+                   [--subscription]
+  examples:
+  - summary: Get an ssh public key.
+    syntax: az sshkey show --resource-group "myResourceGroup" --name "mySshPublicKeyName"
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_sshkey_update
+  name: az sshkey update
+  summary: Update an SSH public key resource.
+  description: ''
+  syntax: >-
+    az sshkey update [--ids]
+                     [--name]
+                     [--public-key]
+                     [--resource-group]
+                     [--subscription]
+                     [--tags]
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name --ssh-public-key-name -n
+    summary: The name of the SSH public key.
+    description: ''
+  - name: --public-key
+    summary: SSH public key used to authenticate to a virtual machine through ssh. If this property is not initially provided when the resource is created, the publicKey property will be populated when generateKeyPair is called. If the public key is provided upon resource creation, the provided public key needs to be at least 2048-bit and in ssh-rsa format.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_sshkey_create
+- az_sshkey_delete
+- az_sshkey_list
+- az_sshkey_show
+- az_sshkey_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ssh public key with vm.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stack-hci.yml b/2018-03-01-hybrid/docs-ref-autogen/stack-hci.yml
new file mode 100644
index 0000000000..ac4f3e4074
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stack-hci.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_stack-hci
+name: az stack-hci
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stack-hci** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stack-hci** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_stack-hci_cluster
+- az_stack-hci_cluster_create
+- az_stack-hci_cluster_delete
+- az_stack-hci_cluster_list
+- az_stack-hci_cluster_show
+- az_stack-hci_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stack-hci/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/stack-hci/cluster.yml
new file mode 100644
index 0000000000..465e6e4dd6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stack-hci/cluster.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_stack-hci_cluster
+name: az stack-hci cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stack-hci** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stack-hci cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stack-hci cluster.
+description: ''
+directCommands:
+- uid: az_stack-hci_cluster_create
+  name: az stack-hci cluster create
+  summary: Create an HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster create --aad-client-id
+                                --name
+                                --resource-group
+                                [--aad-tenant-id]
+                                [--location]
+                                [--tags]
+  examples:
+  - summary: Create an HCI cluster
+    syntax: az stack-hci cluster create --location "East US" --aad-client-id "24a6e53d-04e5-44d2-b7cc-1b732a847dfc" --aad-tenant-id "7e589cc1-a8b6-4dff-91bd-5ec0fa18db94" --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --aad-client-id
+    summary: App ID of cluster AAD identity.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-tenant-id
+    summary: Tenant ID of cluster AAD identity. Default is the current tenant ID.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_stack-hci_cluster_delete
+  name: az stack-hci cluster delete
+  summary: Delete an HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster delete --name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: Delete an HCI cluster
+    syntax: az stack-hci cluster delete --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_stack-hci_cluster_list
+  name: az stack-hci cluster list
+  summary: List all HCI clusters in a subscription.
+  description: ''
+  syntax: az stack-hci cluster list [--resource-group]
+  examples:
+  - summary: List all HCI clusters in a resource group
+    syntax: az stack-hci cluster list --resource-group "test-rg"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stack-hci_cluster_show
+  name: az stack-hci cluster show
+  summary: Get HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster show --name
+                              --resource-group
+  examples:
+  - summary: Get a HCI cluster
+    syntax: az stack-hci cluster show --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stack-hci_cluster_update
+  name: az stack-hci cluster update
+  summary: Update an HCI cluster.
+  description: ''
+  syntax: >-
+    az stack-hci cluster update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update an HCI cluster
+    syntax: az stack-hci cluster update --tags tag1="value1" tag2="value2" --name "myCluster" --resource-group "test-rg"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_stack-hci_cluster_create
+- az_stack-hci_cluster_delete
+- az_stack-hci_cluster_list
+- az_stack-hci_cluster_show
+- az_stack-hci_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stack-hci cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage.yml b/2018-03-01-hybrid/docs-ref-autogen/storage.yml
index 2655a0dd4f..4aae99062f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage.yml
@@ -1,118 +1,96 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage
-  name: az storage
-  summary: Manage Azure Cloud Storage resources.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_copy
-  - az_storage_remove
+### YamlMime:AzureCLIGroup
+uid: az_storage
+name: az storage
+summary: Manage Azure Cloud Storage resources.
+description: ''
+directCommands:
 - uid: az_storage_copy
   name: az storage copy
   summary: Copy files or directories to or from Azure storage.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage copy --destination
+                    --source
+                    [--blob-type {AppendBlob, BlockBlob, PageBlob}]
+                    [--content-type]
+                    [--exclude-path]
+                    [--exclude-pattern]
+                    [--follow-symlinks]
+                    [--include-path]
+                    [--include-pattern]
+                    [--preserve-s2s-access-tier {false, true}]
+                    [--put-md5]
+                    [--recursive]
+                    [--subscription]
   examples:
   - summary: Upload a single file to Azure Blob using url.
-    syntax:
-      content: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob]
+    syntax: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob]
   - summary: Upload a single file to Azure Blob using account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/file.txt --destination-account-name mystorageaccount --destination-container mycontainer
+    syntax: az storage copy -s /path/to/file.txt --destination-account-name mystorageaccount --destination-container mycontainer
   - summary: Upload a single file to Azure Blob with MD5 hash of the file content and save it as the blob's Content-MD5 property.
-    syntax:
-      content: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob] --put-md5
+    syntax: az storage copy -s /path/to/file.txt -d https://[account].blob.core.windows.net/[container]/[path/to/blob] --put-md5
   - summary: Upload an entire directory to Azure Blob using url.
-    syntax:
-      content: az storage copy -s /path/to/dir -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/to/dir -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
   - summary: Upload an entire directory to Azure Blob using account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/dir --destination-account-name mystorageaccount --destination-container mycontainer --recursive
+    syntax: az storage copy -s /path/to/dir --destination-account-name mystorageaccount --destination-container mycontainer --recursive
   - summary: Upload a set of files to Azure Blob using wildcards with url.
-    syntax:
-      content: az storage copy -s /path/*foo/*bar/*.pdf -d https://[account].blob.core.windows.net/[container]/[path/to/directory]
+    syntax: az storage copy -s /path/*foo/*bar/*.pdf -d https://[account].blob.core.windows.net/[container]/[path/to/directory]
   - summary: Upload a set of files to Azure Blob using wildcards with account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-container mycontainer
+    syntax: az storage copy -s /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-container mycontainer
   - summary: Upload files and directories to Azure Blob using wildcards with url.
-    syntax:
-      content: az storage copy -s /path/*foo/*bar* -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/*foo/*bar* -d https://[account].blob.core.windows.net/[container]/[path/to/directory] --recursive
   - summary: Upload files and directories to Azure Blob using wildcards with account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar* --destination-account-name mystorageaccount --destination-container mycontainer --recursive
+    syntax: az storage copy -s /path/*foo/*bar* --destination-account-name mystorageaccount --destination-container mycontainer --recursive
   - summary: Download a single file from Azure Blob using url, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/blob] -d /path/to/file.txt
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/blob] -d /path/to/file.txt
   - summary: Download an entire directory from Azure Blob, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/directory] -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container]/[path/to/directory] -d /path/to/dir --recursive
   - summary: Download a subset of containers within a storage account by using a wildcard symbol (*) in the container name, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container*name] -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container*name] -d /path/to/dir --recursive
   - summary: Download a subset of files from Azure Blob. (Only jpg files and file names don't start with test will be included.)
-    syntax:
-      content: az storage copy -s https://[account].blob.core.windows.net/[container] --include-pattern "*.jpg" --exclude-pattern test* -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].blob.core.windows.net/[container] --include-pattern "*.jpg" --exclude-pattern test* -d /path/to/dir --recursive
   - summary: Copy a single blob to another blob, and you can also specify the storage account and container information of source and destination as above.
-    syntax:
-      content: az storage copy -s https://[srcaccount].blob.core.windows.net/[container]/[path/to/blob] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
+    syntax: az storage copy -s https://[srcaccount].blob.core.windows.net/[container]/[path/to/blob] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
   - summary: Copy an entire account data from blob account to another blob account, and you can also specify the storage account and container information of source and destination as above.
-    syntax:
-      content: az storage copy -s https://[srcaccount].blob.core.windows.net -d https://[destaccount].blob.core.windows.net --recursive
+    syntax: az storage copy -s https://[srcaccount].blob.core.windows.net -d https://[destaccount].blob.core.windows.net --recursive
   - summary: Copy a single object from S3 with access key to blob, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://s3.amazonaws.com/[bucket]/[object] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
+    syntax: az storage copy -s https://s3.amazonaws.com/[bucket]/[object] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/blob]
   - summary: Copy an entire directory from S3 with access key to blob virtual directory, and you can also specify your storage account and container information as above.
-    syntax:
-      content: az storage copy -s https://s3.amazonaws.com/[bucket]/[folder] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/directory] --recursive
+    syntax: az storage copy -s https://s3.amazonaws.com/[bucket]/[folder] -d https://[destaccount].blob.core.windows.net/[container]/[path/to/directory] --recursive
   - summary: Copy all buckets in S3 service with access key to blob account, and you can also specify your storage account information as above.
-    syntax:
-      content: az storage copy -s https://s3.amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
+    syntax: az storage copy -s https://s3.amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
   - summary: Copy all buckets in a S3 region with access key to blob account, and you can also specify your storage account information as above.
-    syntax:
-      content: az storage copy -s https://s3-[region].amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
+    syntax: az storage copy -s https://s3-[region].amazonaws.com/ -d https://[destaccount].blob.core.windows.net --recursive
   - summary: Upload a single file to Azure File Share using url.
-    syntax:
-      content: az storage copy -s /path/to/file.txt -d https://[account].file.core.windows.net/[share]/[path/to/file]
+    syntax: az storage copy -s /path/to/file.txt -d https://[account].file.core.windows.net/[share]/[path/to/file]
   - summary: Upload a single file to Azure File Share using account name and share name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/file.txt --destination-account-name mystorageaccount --destination-share myshare
+    syntax: az storage copy -s /path/to/file.txt --destination-account-name mystorageaccount --destination-share myshare
   - summary: Upload an entire directory to Azure File Share using url.
-    syntax:
-      content: az storage copy -s /path/to/dir -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/to/dir -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
   - summary: Upload an entire directory to Azure File Share using account name and container name.
-    syntax:
-      content: az storage copy --source-local-path /path/to/dir --destination-account-name mystorageaccount --destination-share myshare --recursive
+    syntax: az storage copy -s /path/to/dir --destination-account-name mystorageaccount --destination-share myshare --recursive
   - summary: Upload a set of files to Azure File Share using wildcards with account name and share name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-share myshare
+    syntax: az storage copy -s /path/*foo/*bar/*.pdf --destination-account-name mystorageaccount --destination-share myshare
   - summary: Upload files and directories to Azure File Share using wildcards with url.
-    syntax:
-      content: az storage copy -s /path/*foo/*bar* -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
+    syntax: az storage copy -s /path/*foo/*bar* -d https://[account].file.core.windows.net/[share]/[path/to/directory] --recursive
   - summary: Upload files and directories to Azure File Share using wildcards with account name and share name.
-    syntax:
-      content: az storage copy --source-local-path /path/*foo/*bar* --destination-account-name mystorageaccount --destination-share myshare --recursive
+    syntax: az storage copy -s /path/*foo/*bar* --destination-account-name mystorageaccount --destination-share myshare --recursive
   - summary: Download a single file from Azure File Share using url, and you can also specify your storage account and share information as above.
-    syntax:
-      content: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/file] -d /path/to/file.txt
+    syntax: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/file] -d /path/to/file.txt
   - summary: Download an entire directory from Azure File Share, and you can also specify your storage account and share information as above.
-    syntax:
-      content: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/directory] -d /path/to/dir --recursive
+    syntax: az storage copy -s https://[account].file.core.windows.net/[share]/[path/to/directory] -d /path/to/dir --recursive
   - summary: Download a set of files from Azure File Share using wildcards, and you can also specify your storage account and share information as above.
-    syntax:
-      content: az storage copy -s https://[account].file.core.windows.net/[share]/ --include-pattern foo* -d /path/to/dir --recursive
-  parameters:
-  - name: --destination -d
+    syntax: az storage copy -s https://[account].file.core.windows.net/[share]/ --include-pattern foo* -d /path/to/dir --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --destination -d
     summary: The path/url of copy destination. It can be a local path, an url to azure storage server. If you provide destination parameter here, you do not need to provide arguments in copy destination arguments group and copy destination arguments will be deprecated in future.
     description: ''
-  - name: --recursive -r
-    summary: Look into sub-directories recursively.
-    description: ''
-  - name: --source -s
+  - isRequired: true
+    name: --source -s
     summary: The path/url of copy source. It can be a local path, an url to azure storage server or AWS S3 buckets. If you provide source parameter here, you do not need to provide arguments in copy source arguments group and copy source arguments will be deprecated in future.
     description: ''
+  optionalParameters:
   - name: --blob-type
     parameterValueGroup: AppendBlob, BlockBlob, PageBlob
     summary: The type of blob at the destination.
@@ -137,105 +115,68 @@ items:
     description: ''
   - name: --preserve-s2s-access-tier
     parameterValueGroup: false, true
-    summary: Preserve access tier during service to service copy. Please refer to <a href="https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers">https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers</a> to ensure destination storage account support setting access tier. In the cases that setting access tier is not supported, please use `--preserve-s2s-access-tier false` to bypass copying access tier. (Default true).
+    summary: Preserve access tier during service to service copy. Please refer to https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-storage-tiers to ensure destination storage account support setting access tier. In the cases that setting access tier is not supported, please use `--preserve-s2s-access-tier false` to bypass copying access tier. (Default true).
     description: ''
   - name: --put-md5
     summary: Create an MD5 hash of each file, and save the hash as the Content-MD5 property of the destination blob/file.Only available when uploading.
     description: ''
-  - name: --destination-account-name
-    summary: Storage account name of copy destination.
-    description: ''
-  - name: --destination-blob
-    summary: Blob name in blob container of copy destination storage account.
-    description: ''
-  - name: --destination-container
-    summary: Container name of copy destination storage account.
-    description: ''
-  - name: --destination-file-path
-    summary: File path in file share of copy destination storage account.
-    description: ''
-  - name: --destination-local-path
-    summary: Local file path.
-    description: ''
-  - name: --destination-share
-    summary: File share name of copy destination storage account.
-    description: ''
-  - name: --source-account-name
-    summary: Storage account name of copy source.
-    description: ''
-  - name: --source-blob
-    summary: Blob name in blob container of copy source storage account.
-    description: ''
-  - name: --source-container
-    summary: Container name of copy source storage account.
-    description: ''
-  - name: --source-file-path
-    summary: File path in file share of copy source storage account.
-    description: ''
-  - name: --source-local-path
-    summary: Local file path.
-    description: ''
-  - name: --source-share
-    summary: File share name of copy source storage account.
+  - name: --recursive -r
+    summary: Look into sub-directories recursively.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_remove
   name: az storage remove
   summary: Delete blobs or files from Azure Storage.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage remove [--account-key]
+                      [--account-name]
+                      [--connection-string]
+                      [--container-name]
+                      [--exclude-path]
+                      [--exclude-pattern]
+                      [--include-path]
+                      [--include-pattern]
+                      [--name]
+                      [--path]
+                      [--recursive]
+                      [--sas-token]
+                      [--share-name]
+                      [--subscription]
   examples:
   - summary: Remove a single blob.
-    syntax:
-      content: az storage remove -c MyContainer -n MyBlob
+    syntax: az storage remove -c mycontainer -n MyBlob
   - summary: Remove an entire virtual directory.
-    syntax:
-      content: az storage remove -c MyContainer -n path/to/directory --recursive
+    syntax: az storage remove -c mycontainer -n path/to/directory --recursive
   - summary: Remove only the top blobs inside a virtual directory but not its sub-directories.
-    syntax:
-      content: az storage remove -c MyContainer --recursive
+    syntax: az storage remove -c mycontainer --recursive
   - summary: Remove all the blobs in a Storage Container.
-    syntax:
-      content: az storage remove -c MyContainer -n path/to/directory
+    syntax: az storage remove -c mycontainer -n path/to/directory
   - summary: Remove a subset of blobs in a virtual directory (For example, only jpg and pdf files, or if the blob name is "exactName" and file names don't start with "test").
-    syntax:
-      content: az storage remove -c MyContainer --include-path path/to/directory --include-pattern "*.jpg;*.pdf;exactName" --exclude-pattern "test*" --recursive
+    syntax: az storage remove -c mycontainer --include-path path/to/directory --include-pattern "*.jpg;*.pdf;exactName" --exclude-pattern "test*" --recursive
   - summary: Remove an entire virtual directory but exclude certain blobs from the scope (For example, every blob that starts with foo or ends with bar).
-    syntax:
-      content: az storage remove -c MyContainer --include-path path/to/directory --exclude-pattern "foo*;*bar" --recursive
+    syntax: az storage remove -c mycontainer --include-path path/to/directory --exclude-pattern "foo*;*bar" --recursive
   - summary: Remove a single file.
-    syntax:
-      content: az storage remove -s MyShare -p MyFile
+    syntax: az storage remove -s MyShare -p MyFile
   - summary: Remove an entire directory.
-    syntax:
-      content: az storage remove -s MyShare -p path/to/directory --recursive
+    syntax: az storage remove -s MyShare -p path/to/directory --recursive
   - summary: Remove all the files in a Storage File Share.
-    syntax:
-      content: az storage remove -s MyShare --recursive
-  parameters:
-  - name: --container-name -c
-    summary: The container name.
-    description: ''
-  - name: --name -n
-    summary: The blob name.
+    syntax: az storage remove -s MyShare --recursive
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --path -p
-    summary: The path to the file within the file share.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --recursive -r
-    summary: Look into sub-directories recursively.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --share-name -s
-    summary: The file share name.
+  - name: --container-name -c
+    summary: The container name.
     description: ''
   - name: --exclude-path
     summary: 'Exclude these paths. This option does not support wildcard characters (\*). Checks relative path prefix. For example: myFolder;myFolder/subDirName/file.pdf.'
@@ -249,559 +190,261 @@ items:
   - name: --include-pattern
     summary: 'Include only these files where the name matches the pattern list. For example: \*.jpg;\*.pdf;exactName. This option supports wildcard characters (\*).'
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+  - name: --name -n
+    summary: The blob name.
     description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --path -p
+    summary: The path to the file within the file share.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --recursive -r
+    summary: Look into sub-directories recursively.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --share-name -s
+    summary: The file share name.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-- uid: az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: az_storage_account_generate_sas
-  name: az storage account generate-sas
-  summary: Generates a shared access signature for the account.
-- uid: az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: az_storage_account_show_connection_string
-  name: az storage account show-connection-string
-  summary: Get the connection string for a storage account.
-- uid: az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
-- uid: az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-- uid: az_storage_blob_copy
-  name: az storage blob copy
-  summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_cancel
-  name: az storage blob copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_copy_start
-  name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_delete
-  name: az storage blob delete
-  summary: Mark a blob or snapshot for deletion.
-- uid: az_storage_blob_delete_batch
-  name: az storage blob delete-batch
-  summary: Delete blobs from a blob container recursively.
-- uid: az_storage_blob_download
-  name: az storage blob download
-  summary: Downloads a blob to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_blob_download_batch
-  name: az storage blob download-batch
-  summary: Download blobs from a blob container recursively.
-- uid: az_storage_blob_exists
-  name: az storage blob exists
-  summary: Check for the existence of a blob in a container.
-- uid: az_storage_blob_generate_sas
-  name: az storage blob generate-sas
-  summary: Generate a shared access signature for the blob.
-- uid: az_storage_blob_incremental_copy
-  name: az storage blob incremental-copy
-  summary: Manage blob incremental copy operations.
-- uid: az_storage_blob_incremental_copy_cancel
-  name: az storage blob incremental-copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_incremental_copy_start
-  name: az storage blob incremental-copy start
-  summary: Copies an incremental copy of a blob asynchronously.
-- uid: az_storage_blob_lease
-  name: az storage blob lease
-  summary: Manage storage blob leases.
-- uid: az_storage_blob_lease_acquire
-  name: az storage blob lease acquire
-  summary: Requests a new lease.
-- uid: az_storage_blob_lease_break
-  name: az storage blob lease break
-  summary: Breaks the lease, if the blob has an active lease.
-- uid: az_storage_blob_lease_change
-  name: az storage blob lease change
-  summary: Changes the lease ID of an active lease.
-- uid: az_storage_blob_lease_release
-  name: az storage blob lease release
-  summary: Releases the lease.
-- uid: az_storage_blob_lease_renew
-  name: az storage blob lease renew
-  summary: Renews the lease.
-- uid: az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: az_storage_blob_metadata
-  name: az storage blob metadata
-  summary: Manage blob metadata.
-- uid: az_storage_blob_metadata_show
-  name: az storage blob metadata show
-  summary: Returns all user-defined metadata for the specified blob or snapshot.
-- uid: az_storage_blob_metadata_update
-  name: az storage blob metadata update
-  summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
-- uid: az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-- uid: az_storage_blob_set_tier
-  name: az storage blob set-tier
-  summary: Set the block or page tiers on the blob.
-- uid: az_storage_blob_show
-  name: az storage blob show
-  summary: Get the details of a blob.
-- uid: az_storage_blob_snapshot
-  name: az storage blob snapshot
-  summary: Creates a read-only snapshot of a blob.
-- uid: az_storage_blob_sync
-  name: az storage blob sync
-  summary: Sync blobs recursively to a storage blob container.
-- uid: az_storage_blob_update
-  name: az storage blob update
-  summary: Sets system properties on the blob.
-- uid: az_storage_blob_upload
-  name: az storage blob upload
-  summary: Upload a file to a storage blob.
-- uid: az_storage_blob_upload_batch
-  name: az storage blob upload-batch
-  summary: Upload files from a local directory to a blob container.
-- uid: az_storage_blob_url
-  name: az storage blob url
-  summary: Create the url to access a blob.
-- uid: az_storage_container
-  name: az storage container
-  summary: Manage blob storage containers.
-- uid: az_storage_container_create
-  name: az storage container create
-  summary: Create a container in a storage account.
-- uid: az_storage_container_delete
-  name: az storage container delete
-  summary: Marks the specified container for deletion.
-- uid: az_storage_container_exists
-  name: az storage container exists
-  summary: Check for the existence of a storage container.
-- uid: az_storage_container_generate_sas
-  name: az storage container generate-sas
-  summary: Generate a SAS token for a storage container.
-- uid: az_storage_container_lease
-  name: az storage container lease
-  summary: Manage blob storage container leases.
-- uid: az_storage_container_lease_acquire
-  name: az storage container lease acquire
-  summary: Requests a new lease.
-- uid: az_storage_container_lease_break
-  name: az storage container lease break
-  summary: Break the lease, if the container has an active lease.
-- uid: az_storage_container_lease_change
-  name: az storage container lease change
-  summary: Change the lease ID of an active lease.
-- uid: az_storage_container_lease_release
-  name: az storage container lease release
-  summary: Release the lease.
-- uid: az_storage_container_lease_renew
-  name: az storage container lease renew
-  summary: Renews the lease.
-- uid: az_storage_container_list
-  name: az storage container list
-  summary: List containers in a storage account.
-- uid: az_storage_container_metadata
-  name: az storage container metadata
-  summary: Manage container metadata.
-- uid: az_storage_container_metadata_show
-  name: az storage container metadata show
-  summary: Returns all user-defined metadata for the specified container.
-- uid: az_storage_container_metadata_update
-  name: az storage container metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified container.
-- uid: az_storage_container_policy
-  name: az storage container policy
-  summary: Manage container stored access policies.
-- uid: az_storage_container_policy_create
-  name: az storage container policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_container_policy_delete
-  name: az storage container policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_container_policy_list
-  name: az storage container policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_container_policy_show
-  name: az storage container policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_container_policy_update
-  name: az storage container policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_container_set_permission
-  name: az storage container set-permission
-  summary: Sets the permissions for the specified container or stored access  policies that may be used with Shared Access Signatures.
-- uid: az_storage_container_show
-  name: az storage container show
-  summary: Returns all user-defined metadata and system properties for the specified container.
-- uid: az_storage_container_show_permission
-  name: az storage container show-permission
-  summary: Gets the permissions for the specified container.
-- uid: az_storage_copy
-  name: az storage copy
-  summary: Copy files or directories to or from Azure storage.
-- uid: az_storage_cors
-  name: az storage cors
-  summary: Manage storage service Cross-Origin Resource Sharing (CORS).
-- uid: az_storage_cors_add
-  name: az storage cors add
-  summary: Add a CORS rule to a storage account.
-- uid: az_storage_cors_clear
-  name: az storage cors clear
-  summary: Remove all CORS rules from a storage account.
-- uid: az_storage_cors_list
-  name: az storage cors list
-  summary: List all CORS rules for a storage account.
-- uid: az_storage_directory
-  name: az storage directory
-  summary: Manage file storage directories.
-- uid: az_storage_directory_create
-  name: az storage directory create
-  summary: Creates a new directory under the specified share or parent directory.
-- uid: az_storage_directory_delete
-  name: az storage directory delete
-  summary: Deletes the specified empty directory.
-- uid: az_storage_directory_exists
-  name: az storage directory exists
-  summary: Check for the existence of a storage directory.
-- uid: az_storage_directory_list
-  name: az storage directory list
-  summary: List directories in a share.
-- uid: az_storage_directory_metadata
-  name: az storage directory metadata
-  summary: Manage file storage directory metadata.
-- uid: az_storage_directory_metadata_show
-  name: az storage directory metadata show
-  summary: Returns all user-defined metadata for the specified directory.
-- uid: az_storage_directory_metadata_update
-  name: az storage directory metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified directory.
-- uid: az_storage_directory_show
-  name: az storage directory show
-  summary: Returns all user-defined metadata and system properties for the specified directory.
-- uid: az_storage_entity
-  name: az storage entity
-  summary: Manage table storage entities.
-- uid: az_storage_entity_delete
-  name: az storage entity delete
-  summary: Deletes an existing entity in a table.
-- uid: az_storage_entity_insert
-  name: az storage entity insert
-  summary: Insert an entity into a table.
-- uid: az_storage_entity_merge
-  name: az storage entity merge
-  summary: Updates an existing entity by merging the entity's properties.
-- uid: az_storage_entity_query
-  name: az storage entity query
-  summary: List entities which satisfy a query.
-- uid: az_storage_entity_replace
-  name: az storage entity replace
-  summary: Updates an existing entity in a table.
-- uid: az_storage_entity_show
-  name: az storage entity show
-  summary: Get an entity from the specified table.
-- uid: az_storage_file
-  name: az storage file
-  summary: Manage file shares that use the SMB 3.0 protocol.
-- uid: az_storage_file_copy
-  name: az storage file copy
-  summary: Manage file copy operations.
-- uid: az_storage_file_copy_cancel
-  name: az storage file copy cancel
-  summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
-- uid: az_storage_file_copy_start
-  name: az storage file copy start
-  summary: Copy a file asynchronously.
-- uid: az_storage_file_copy_start_batch
-  name: az storage file copy start-batch
-  summary: Copy multiple files or blobs to a file share.
-- uid: az_storage_file_delete
-  name: az storage file delete
-  summary: Marks the specified file for deletion.
-- uid: az_storage_file_delete_batch
-  name: az storage file delete-batch
-  summary: Delete files from an Azure Storage File Share.
-- uid: az_storage_file_download
-  name: az storage file download
-  summary: Downloads a file to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_file_download_batch
-  name: az storage file download-batch
-  summary: Download files from an Azure Storage File Share to a local directory in a batch operation.
-- uid: az_storage_file_exists
-  name: az storage file exists
-  summary: Check for the existence of a file.
-- uid: az_storage_file_generate_sas
-  name: az storage file generate-sas
-  summary: Generates a shared access signature for the file.
-- uid: az_storage_file_list
-  name: az storage file list
-  summary: List files and directories in a share.
-- uid: az_storage_file_metadata
-  name: az storage file metadata
-  summary: Manage file metadata.
-- uid: az_storage_file_metadata_show
-  name: az storage file metadata show
-  summary: Returns all user-defined metadata for the specified file.
-- uid: az_storage_file_metadata_update
-  name: az storage file metadata update
-  summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
-- uid: az_storage_file_resize
-  name: az storage file resize
-  summary: Resizes a file to the specified size.
-- uid: az_storage_file_show
-  name: az storage file show
-  summary: Returns all user-defined metadata, standard HTTP properties, and system properties for the file.
-- uid: az_storage_file_update
-  name: az storage file update
-  summary: Sets system properties on the file.
-- uid: az_storage_file_upload
-  name: az storage file upload
-  summary: Upload a file to a share that uses the SMB 3.0 protocol.
-- uid: az_storage_file_upload_batch
-  name: az storage file upload-batch
-  summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
-- uid: az_storage_file_url
-  name: az storage file url
-  summary: Create the url to access a file.
-- uid: az_storage_logging
-  name: az storage logging
-  summary: Manage storage service logging information.
-- uid: az_storage_logging_off
-  name: az storage logging off
-  summary: Turn off logging for a storage account.
-- uid: az_storage_logging_show
-  name: az storage logging show
-  summary: Show logging settings for a storage account.
-- uid: az_storage_logging_update
-  name: az storage logging update
-  summary: Update logging settings for a storage account.
-- uid: az_storage_message
-  name: az storage message
-  summary: Manage queue storage messages.
-- uid: az_storage_message_clear
-  name: az storage message clear
-  summary: Deletes all messages from the specified queue.
-- uid: az_storage_message_delete
-  name: az storage message delete
-  summary: Deletes the specified message.
-- uid: az_storage_message_get
-  name: az storage message get
-  summary: Retrieves one or more messages from the front of the queue.
-- uid: az_storage_message_peek
-  name: az storage message peek
-  summary: Retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.
-- uid: az_storage_message_put
-  name: az storage message put
-  summary: Adds a new message to the back of the message queue.
-- uid: az_storage_message_update
-  name: az storage message update
-  summary: Updates the visibility timeout of a message.
-- uid: az_storage_metrics
-  name: az storage metrics
-  summary: Manage storage service metrics.
-- uid: az_storage_metrics_show
-  name: az storage metrics show
-  summary: Show metrics settings for a storage account.
-- uid: az_storage_metrics_update
-  name: az storage metrics update
-  summary: Update metrics settings for a storage account.
-- uid: az_storage_queue
-  name: az storage queue
-  summary: Manage shared access policies of a storage table.
-- uid: az_storage_queue_create
-  name: az storage queue create
-  summary: Creates a queue under the given account.
-- uid: az_storage_queue_delete
-  name: az storage queue delete
-  summary: Deletes the specified queue and any messages it contains.
-- uid: az_storage_queue_exists
-  name: az storage queue exists
-  summary: Returns a boolean indicating whether the queue exists.
-- uid: az_storage_queue_generate_sas
-  name: az storage queue generate-sas
-  summary: Generates a shared access signature for the queue.
-- uid: az_storage_queue_list
-  name: az storage queue list
-  summary: List queues in a storage account.
-- uid: az_storage_queue_metadata
-  name: az storage queue metadata
-  summary: Manage the metadata for a storage queue.
-- uid: az_storage_queue_metadata_show
-  name: az storage queue metadata show
-  summary: Retrieves user-defined metadata and queue properties on the specified queue.
-- uid: az_storage_queue_metadata_update
-  name: az storage queue metadata update
-  summary: Sets user-defined metadata on the specified queue.
-- uid: az_storage_queue_policy
-  name: az storage queue policy
-  summary: Manage shared access policies for a storage queue.
-- uid: az_storage_queue_policy_create
-  name: az storage queue policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_queue_policy_delete
-  name: az storage queue policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_queue_policy_list
-  name: az storage queue policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_queue_policy_show
-  name: az storage queue policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_queue_policy_update
-  name: az storage queue policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_queue_stats
-  name: az storage queue stats
-  summary: Retrieves statistics related to replication for the Queue service.
-- uid: az_storage_remove
-  name: az storage remove
-  summary: Delete blobs or files from Azure Storage.
-- uid: az_storage_share
-  name: az storage share
-  summary: Manage file shares.
-- uid: az_storage_share_create
-  name: az storage share create
-  summary: Creates a new share under the specified account.
-- uid: az_storage_share_delete
-  name: az storage share delete
-  summary: Marks the specified share for deletion.
-- uid: az_storage_share_exists
-  name: az storage share exists
-  summary: Check for the existence of a file share.
-- uid: az_storage_share_generate_sas
-  name: az storage share generate-sas
-  summary: Generates a shared access signature for the share.
-- uid: az_storage_share_list
-  name: az storage share list
-  summary: List the file shares in a storage account.
-- uid: az_storage_share_metadata
-  name: az storage share metadata
-  summary: Manage the metadata of a file share.
-- uid: az_storage_share_metadata_show
-  name: az storage share metadata show
-  summary: Returns all user-defined metadata for the specified share.
-- uid: az_storage_share_metadata_update
-  name: az storage share metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified share.
-- uid: az_storage_share_policy
-  name: az storage share policy
-  summary: Manage shared access policies of a storage file share.
-- uid: az_storage_share_policy_create
-  name: az storage share policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_share_policy_delete
-  name: az storage share policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_share_policy_list
-  name: az storage share policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_share_policy_show
-  name: az storage share policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_share_policy_update
-  name: az storage share policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_share_show
-  name: az storage share show
-  summary: Returns all user-defined metadata and system properties for the specified share.
-- uid: az_storage_share_snapshot
-  name: az storage share snapshot
-  summary: Creates a snapshot of an existing share under the specified account.
-- uid: az_storage_share_stats
-  name: az storage share stats
-  summary: Gets the approximate size of the data stored on the share, rounded up to the nearest gigabyte.
-- uid: az_storage_share_update
-  name: az storage share update
-  summary: Sets service-defined properties for the specified share.
-- uid: az_storage_share_url
-  name: az storage share url
-  summary: Create a URI to access a file share.
-- uid: az_storage_table
-  name: az storage table
-  summary: Manage NoSQL key-value storage.
-- uid: az_storage_table_create
-  name: az storage table create
-  summary: Creates a new table in the storage account.
-- uid: az_storage_table_delete
-  name: az storage table delete
-  summary: Deletes the specified table and any data it contains.
-- uid: az_storage_table_exists
-  name: az storage table exists
-  summary: Returns a boolean indicating whether the table exists.
-- uid: az_storage_table_generate_sas
-  name: az storage table generate-sas
-  summary: Generates a shared access signature for the table.
-- uid: az_storage_table_list
-  name: az storage table list
-  summary: List tables in a storage account.
-- uid: az_storage_table_policy
-  name: az storage table policy
-  summary: Manage shared access policies of a storage table.
-- uid: az_storage_table_policy_create
-  name: az storage table policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_table_policy_delete
-  name: az storage table policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_table_policy_list
-  name: az storage table policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_table_policy_show
-  name: az storage table policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_table_policy_update
-  name: az storage table policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_table_stats
-  name: az storage table stats
-  summary: Retrieves statistics related to replication for the Table service.
+- az_storage_account
+- az_storage_account_blob-inventory-policy
+- az_storage_account_blob-inventory-policy_create
+- az_storage_account_blob-inventory-policy_delete
+- az_storage_account_blob-inventory-policy_show
+- az_storage_account_blob-inventory-policy_update
+- az_storage_account_blob-service-properties
+- az_storage_account_blob-service-properties_show
+- az_storage_account_blob-service-properties_update
+- az_storage_account_check-name
+- az_storage_account_create
+- az_storage_account_delete
+- az_storage_account_file-service-properties
+- az_storage_account_file-service-properties_show
+- az_storage_account_file-service-properties_update
+- az_storage_account_generate-sas
+- az_storage_account_keys
+- az_storage_account_keys_list
+- az_storage_account_keys_renew
+- az_storage_account_list
+- az_storage_account_network-rule
+- az_storage_account_network-rule_add
+- az_storage_account_network-rule_list
+- az_storage_account_network-rule_remove
+- az_storage_account_show
+- az_storage_account_show-connection-string
+- az_storage_account_show-usage
+- az_storage_azcopy
+- az_storage_azcopy_blob
+- az_storage_azcopy_blob_delete
+- az_storage_azcopy_blob_download
+- az_storage_azcopy_blob_sync
+- az_storage_azcopy_blob_upload
+- az_storage_azcopy_run-command
+- az_storage_blob
+- az_storage_blob_access
+- az_storage_blob_access_set
+- az_storage_blob_access_show
+- az_storage_blob_access_update
+- az_storage_blob_copy
+- az_storage_blob_copy_cancel
+- az_storage_blob_copy_start
+- az_storage_blob_copy_start-batch
+- az_storage_blob_delete
+- az_storage_blob_delete-batch
+- az_storage_blob_directory
+- az_storage_blob_directory_access
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+- az_storage_blob_directory_create
+- az_storage_blob_directory_delete
+- az_storage_blob_directory_download
+- az_storage_blob_directory_exists
+- az_storage_blob_directory_list
+- az_storage_blob_directory_metadata
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+- az_storage_blob_directory_move
+- az_storage_blob_directory_show
+- az_storage_blob_directory_upload
+- az_storage_blob_download
+- az_storage_blob_download-batch
+- az_storage_blob_exists
+- az_storage_blob_filter
+- az_storage_blob_generate-sas
+- az_storage_blob_incremental-copy
+- az_storage_blob_incremental-copy_cancel
+- az_storage_blob_incremental-copy_start
+- az_storage_blob_lease
+- az_storage_blob_lease_acquire
+- az_storage_blob_lease_break
+- az_storage_blob_lease_change
+- az_storage_blob_lease_release
+- az_storage_blob_lease_renew
+- az_storage_blob_list
+- az_storage_blob_metadata
+- az_storage_blob_metadata_show
+- az_storage_blob_metadata_update
+- az_storage_blob_move
+- az_storage_blob_service-properties
+- az_storage_blob_service-properties_delete-policy
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+- az_storage_blob_service-properties_show
+- az_storage_blob_service-properties_update
+- az_storage_blob_set-tier
+- az_storage_blob_show
+- az_storage_blob_snapshot
+- az_storage_blob_sync
+- az_storage_blob_tag
+- az_storage_blob_tag_list
+- az_storage_blob_tag_set
+- az_storage_blob_undelete
+- az_storage_blob_update
+- az_storage_blob_upload
+- az_storage_blob_upload-batch
+- az_storage_blob_url
+- az_storage_container
+- az_storage_container_create
+- az_storage_container_delete
+- az_storage_container_exists
+- az_storage_container_generate-sas
+- az_storage_container_lease
+- az_storage_container_lease_acquire
+- az_storage_container_lease_break
+- az_storage_container_lease_change
+- az_storage_container_lease_release
+- az_storage_container_lease_renew
+- az_storage_container_list
+- az_storage_container_metadata
+- az_storage_container_metadata_show
+- az_storage_container_metadata_update
+- az_storage_container_policy
+- az_storage_container_policy_create
+- az_storage_container_policy_delete
+- az_storage_container_policy_list
+- az_storage_container_policy_show
+- az_storage_container_policy_update
+- az_storage_container_restore
+- az_storage_container_set-permission
+- az_storage_container_show
+- az_storage_container_show-permission
+- az_storage_copy
+- az_storage_cors
+- az_storage_cors_add
+- az_storage_cors_clear
+- az_storage_cors_list
+- az_storage_directory
+- az_storage_directory_create
+- az_storage_directory_delete
+- az_storage_directory_exists
+- az_storage_directory_list
+- az_storage_directory_metadata
+- az_storage_directory_metadata_show
+- az_storage_directory_metadata_update
+- az_storage_directory_show
+- az_storage_entity
+- az_storage_entity_delete
+- az_storage_entity_insert
+- az_storage_entity_merge
+- az_storage_entity_query
+- az_storage_entity_replace
+- az_storage_entity_show
+- az_storage_file
+- az_storage_file_copy
+- az_storage_file_copy_cancel
+- az_storage_file_copy_start
+- az_storage_file_copy_start-batch
+- az_storage_file_delete
+- az_storage_file_delete-batch
+- az_storage_file_download
+- az_storage_file_download-batch
+- az_storage_file_exists
+- az_storage_file_generate-sas
+- az_storage_file_list
+- az_storage_file_metadata
+- az_storage_file_metadata_show
+- az_storage_file_metadata_update
+- az_storage_file_resize
+- az_storage_file_show
+- az_storage_file_update
+- az_storage_file_upload
+- az_storage_file_upload-batch
+- az_storage_file_url
+- az_storage_fs
+- az_storage_fs_list-deleted-path
+- az_storage_fs_service-properties
+- az_storage_fs_service-properties_show
+- az_storage_fs_service-properties_update
+- az_storage_fs_undelete-path
+- az_storage_logging
+- az_storage_logging_off
+- az_storage_logging_show
+- az_storage_logging_update
+- az_storage_message
+- az_storage_message_clear
+- az_storage_message_delete
+- az_storage_message_get
+- az_storage_message_peek
+- az_storage_message_put
+- az_storage_message_update
+- az_storage_metrics
+- az_storage_metrics_show
+- az_storage_metrics_update
+- az_storage_queue
+- az_storage_queue_create
+- az_storage_queue_delete
+- az_storage_queue_exists
+- az_storage_queue_generate-sas
+- az_storage_queue_list
+- az_storage_queue_metadata
+- az_storage_queue_metadata_show
+- az_storage_queue_metadata_update
+- az_storage_queue_policy
+- az_storage_queue_policy_create
+- az_storage_queue_policy_delete
+- az_storage_queue_policy_list
+- az_storage_queue_policy_show
+- az_storage_queue_policy_update
+- az_storage_queue_stats
+- az_storage_remove
+- az_storage_share
+- az_storage_share_create
+- az_storage_share_delete
+- az_storage_share_exists
+- az_storage_share_generate-sas
+- az_storage_share_list
+- az_storage_share_metadata
+- az_storage_share_metadata_show
+- az_storage_share_metadata_update
+- az_storage_share_policy
+- az_storage_share_policy_create
+- az_storage_share_policy_delete
+- az_storage_share_policy_list
+- az_storage_share_policy_show
+- az_storage_share_policy_update
+- az_storage_share_show
+- az_storage_share_snapshot
+- az_storage_share_stats
+- az_storage_share_update
+- az_storage_share_url
+- az_storage_table
+- az_storage_table_create
+- az_storage_table_delete
+- az_storage_table_exists
+- az_storage_table_generate-sas
+- az_storage_table_list
+- az_storage_table_policy
+- az_storage_table_policy_create
+- az_storage_table_policy_delete
+- az_storage_table_policy_list
+- az_storage_table_policy_show
+- az_storage_table_policy_update
+- az_storage_table_stats
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -817,10 +460,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage Azure Cloud Storage resources.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage Azure Cloud Storage resources.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/account.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/account.yml
index 1f14a80e76..754cf2177d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/account.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/account.yml
@@ -1,115 +1,167 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_account
-  name: az storage account
-  summary: Manage storage accounts.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_account_check_name
-  - az_storage_account_create
-  - az_storage_account_delete
-  - az_storage_account_generate_sas
-  - az_storage_account_list
-  - az_storage_account_show
-  - az_storage_account_show_connection_string
-  - az_storage_account_show_usage
-- uid: az_storage_account_check_name
+### YamlMime:AzureCLIGroup
+uid: az_storage_account
+name: az storage account
+summary: Manage storage accounts.
+description: ''
+directCommands:
+- uid: az_storage_account_check-name
   name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
+  summary: Check that the storage account name is valid and is not already in use.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage account check-name --name
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: ''
+    summary: The name of the storage account within the specified resource group.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_create
   name: az storage account create
   summary: Create a storage account.
   description: The SKU of the storage account defaults to 'Standard_RAGRS'.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account create --name
+                              --resource-group
+                              [--access-tier {Cool, Hot}]
+                              [--allow-blob-public-access]
+                              [--allow-cross-tenant-replication]
+                              [--allow-shared-key-access]
+                              [--custom-domain]
+                              [--default-share-permission]
+                              [--edge-zone]
+                              [--encryption-key-name]
+                              [--encryption-key-source]
+                              [--encryption-key-vault]
+                              [--encryption-key-version]
+                              [--https-only {false, true}]
+                              [--identity-type]
+                              [--key-expiration-period-in-days]
+                              [--key-vault-user-identity-id]
+                              [--kind {BlobStorage, Storage}]
+                              [--location]
+                              [--min-tls-version]
+                              [--require-infrastructure-encryption]
+                              [--sas-expiration-period]
+                              [--sku {Premium_LRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS}]
+                              [--subscription]
+                              [--tags]
+                              [--user-identity-id]
   examples:
   - summary: Create a storage account 'mystorageaccount' in resource group 'MyResourceGroup' in the West US region with locally redundant storage.
-    syntax:
-      content: az storage account create -n mystorageaccount -g MyResourceGroup -l westus --sku Standard_LRS
+    syntax: az storage account create -n mystorageaccount -g MyResourceGroup -l westus --sku Standard_LRS
   - summary: Create a storage account 'mystorageaccount' in resource group 'MyResourceGroup' in the eastus2euap region with account-scoped encryption key enabled for Table Service.
-    syntax:
-      content: az storage account create -n mystorageaccount -g MyResourceGroup --kind StorageV2 -l eastus2euap -t Account
-  parameters:
+    syntax: az storage account create -n mystorageaccount -g MyResourceGroup --kind StorageV2 -l eastus2euap -t Account
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The storage account name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --access-tier
     parameterValueGroup: Cool, Hot
     summary: The access tier used for billing StandardBlob accounts. Cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. It is required for StandardBlob accounts during creation.
     description: ''
+  - name: --allow-blob-public-access
+    summary: ''
+    description: ''
+  - name: --allow-cross-tenant-replication
+    summary: ''
+    description: ''
+  - name: --allow-shared-key-access
+    summary: ''
+    description: ''
   - name: --custom-domain
     summary: User domain assigned to the storage account. Name is the CNAME source.
     description: ''
+  - name: --default-share-permission
+    summary: ''
+    description: ''
+  - name: --edge-zone
+    summary: ''
+    description: ''
+  - name: --encryption-key-name
+    summary: ''
+    description: ''
+  - name: --encryption-key-source
+    summary: ''
+    description: ''
+  - name: --encryption-key-vault
+    summary: ''
+    description: ''
+  - name: --encryption-key-version
+    summary: ''
+    description: ''
   - name: --https-only
     parameterValueGroup: false, true
     summary: Allow https traffic only to storage service if set to true. The default value is false.
     description: ''
+  - name: --identity-type
+    summary: ''
+    description: ''
+  - name: --key-expiration-period-in-days
+    summary: ''
+    description: ''
+  - name: --key-vault-user-identity-id
+    summary: ''
+    description: ''
   - name: --kind
     defaultValue: Storage
     parameterValueGroup: BlobStorage, Storage
-    summary: Indicates the type of storage account.
+    summary: Indicate the type of storage account.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --min-tls-version
+    summary: ''
+    description: ''
+  - name: --require-infrastructure-encryption
+    summary: ''
+    description: ''
+  - name: --sas-expiration-period
+    summary: ''
     description: ''
   - name: --sku
     defaultValue: Standard_RAGRS
     parameterValueGroup: Premium_LRS, Standard_GRS, Standard_LRS, Standard_RAGRS, Standard_ZRS
     summary: The storage account SKU.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --user-identity-id
+    summary: ''
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_delete
   name: az storage account delete
   summary: Delete a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account delete [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Delete a storage account using a resource ID.
-    syntax:
-      content: az storage account delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
+    syntax: az storage account delete --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
   - summary: Delete a storage account using an account name and resource group.
-    syntax:
-      content: az storage account delete -n MyStorageAccount -g MyResourceGroup
-  parameters:
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az storage account delete -n MyStorageAccount -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -117,40 +169,46 @@ items:
     summary: The storage account name.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_account_generate_sas
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_account_generate-sas
   name: az storage account generate-sas
-  summary: Generates a shared access signature for the account.
+  summary: Generate a shared access signature for the storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account generate-sas --expiry
+                                    --permissions
+                                    --resource-types
+                                    --services
+                                    [--account-key]
+                                    [--account-name]
+                                    [--connection-string]
+                                    [--https-only]
+                                    [--ids]
+                                    [--ip]
+                                    [--start]
+                                    [--subscription]
   examples:
   - summary: Generate a sas token for the account that is valid for queue and table services on Linux.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
+      az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
   - summary: Generate a sas token for the account that is valid for queue and table services on MacOS.
-    syntax:
-      content: >-
-        end=`date -v+30M '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -v+30M '+%Y-%m-%dT%H:%MZ'`
 
-        az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
+      az storage account generate-sas --permissions cdlruwap --account-name MyStorageAccount --services qt --resource-types sco --expiry $end -o tsv
   - summary: Generate a shared access signature for the account (autogenerated)
-    syntax:
-      content: az storage account generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2020-01-01 --https-only --permissions acuw --resource-types co --services bfqt
-  parameters:
+    syntax: az storage account generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2020-01-01 --https-only --permissions acuw --resource-types co --services bfqt
+  requiredParameters:
   - isRequired: true
     name: --expiry
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes invalid.
@@ -167,119 +225,127 @@ items:
     name: --services
     summary: 'The storage services the SAS is applicable for. Allowed values: (b)lob (f)ile (q)ueue (t)able. Can be combined.'
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Must be used in conjunction with either storage account key or a SAS token. Environment Variable: AZURE_STORAGE_ACCOUNT.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --https-only
     summary: Only permit requests made with the HTTPS protocol. If omitted, requests from both the HTTP and HTTPS protocol are permitted.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --ip
     summary: Specifies the IP address or range of IP addresses from which to accept requests. Supports only IPv4 style addresses.
     description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Defaults to the time of the request.
     description: ''
-  - name: --account-name
-    summary: 'Storage account name. Must be used in conjunction with either storage account key or a SAS token. Environment Variable: AZURE_STORAGE_ACCOUNT.'
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_list
   name: az storage account list
   summary: List storage accounts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: List all storage accounts in a subscription.
-    syntax:
-      content: az storage account list
+    syntax: az storage account list
   - summary: List all storage accounts in a resource group.
-    syntax:
-      content: az storage account list -g MyResourceGroup
-  parameters:
+    syntax: az storage account list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_show
   name: az storage account show
   summary: Show storage account properties.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account show [--ids]
+                            [--name]
+                            [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Show properties for a storage account by resource ID.
-    syntax:
-      content: az storage account show --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
+    syntax: az storage account show --ids /subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Storage/storageAccounts/{StorageAccount}
   - summary: Show properties for a storage account using an account name and resource group.
-    syntax:
-      content: az storage account show -g MyResourceGroup -n MyStorageAccount
-  parameters:
+    syntax: az storage account show -g MyResourceGroup -n MyStorageAccount
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The storage account name.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_account_show_connection_string
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_account_show-connection-string
   name: az storage account show-connection-string
   summary: Get the connection string for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account show-connection-string [--blob-endpoint]
+                                              [--file-endpoint]
+                                              [--ids]
+                                              [--key {primary, secondary}]
+                                              [--name]
+                                              [--protocol {http, https}]
+                                              [--queue-endpoint]
+                                              [--resource-group]
+                                              [--sas-token]
+                                              [--subscription]
+                                              [--table-endpoint]
   examples:
   - summary: Get a connection string for a storage account.
-    syntax:
-      content: az storage account show-connection-string -g MyResourceGroup -n MyStorageAccount
+    syntax: az storage account show-connection-string -g MyResourceGroup -n MyStorageAccount
   - summary: Get the connection string for a storage account. (autogenerated)
-    syntax:
-      content: az storage account show-connection-string --name MyStorageAccount --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
+    syntax: az storage account show-connection-string --name MyStorageAccount --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --blob-endpoint
     summary: Custom endpoint for blobs.
     description: ''
   - name: --file-endpoint
     summary: Custom endpoint for files.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --key
     defaultValue: primary
     parameterValueGroup: primary, secondary
     summary: The key to use.
     description: ''
+  - name: --name -n
+    summary: The storage account name.
+    description: ''
   - name: --protocol
     defaultValue: https
     parameterValueGroup: http, https
@@ -288,84 +354,59 @@ items:
   - name: --queue-endpoint
     summary: Custom endpoint for queues.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --sas-token
     summary: The SAS token to be used in the connection-string.
     description: ''
-  - name: --table-endpoint
-    summary: Custom endpoint for tables.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The storage account name.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_account_show_usage
+  - name: --table-endpoint
+    summary: Custom endpoint for tables.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_account_show-usage
   name: az storage account show-usage
   summary: Show the current count and limit of the storage accounts under the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: az storage account show-usage [--subscription]
   examples:
   - summary: Show the current count and limit of the storage accounts under the subscription. (autogenerated)
-    syntax:
-      content: az storage account show-usage --location westus2
-  parameters:
+    syntax: az storage account show-usage --location westus2
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_account_check_name
-  name: az storage account check-name
-  summary: Checks that the storage account name is valid and is not already in use.
-- uid: az_storage_account_create
-  name: az storage account create
-  summary: Create a storage account.
-- uid: az_storage_account_delete
-  name: az storage account delete
-  summary: Delete a storage account.
-- uid: az_storage_account_generate_sas
-  name: az storage account generate-sas
-  summary: Generates a shared access signature for the account.
-- uid: az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-- uid: az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_list
-  name: az storage account list
-  summary: List storage accounts.
-- uid: az_storage_account_show
-  name: az storage account show
-  summary: Show storage account properties.
-- uid: az_storage_account_show_connection_string
-  name: az storage account show-connection-string
-  summary: Get the connection string for a storage account.
-- uid: az_storage_account_show_usage
-  name: az storage account show-usage
-  summary: Show the current count and limit of the storage accounts under the subscription.
+- az_storage_account_blob-inventory-policy
+- az_storage_account_blob-inventory-policy_create
+- az_storage_account_blob-inventory-policy_delete
+- az_storage_account_blob-inventory-policy_show
+- az_storage_account_blob-inventory-policy_update
+- az_storage_account_blob-service-properties
+- az_storage_account_blob-service-properties_show
+- az_storage_account_blob-service-properties_update
+- az_storage_account_check-name
+- az_storage_account_create
+- az_storage_account_delete
+- az_storage_account_file-service-properties
+- az_storage_account_file-service-properties_show
+- az_storage_account_file-service-properties_update
+- az_storage_account_generate-sas
+- az_storage_account_keys
+- az_storage_account_keys_list
+- az_storage_account_keys_renew
+- az_storage_account_list
+- az_storage_account_network-rule
+- az_storage_account_network-rule_add
+- az_storage_account_network-rule_list
+- az_storage_account_network-rule_remove
+- az_storage_account_show
+- az_storage_account_show-connection-string
+- az_storage_account_show-usage
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -381,10 +422,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage accounts.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage accounts.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/account/blob-inventory-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/account/blob-inventory-policy.yml
new file mode 100644
index 0000000000..cc7a3570b7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/account/blob-inventory-policy.yml
@@ -0,0 +1,133 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_blob-inventory-policy
+name: az storage account blob-inventory-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage account blob-inventory-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage storage account Blob Inventory Policy.
+description: ''
+directCommands:
+- uid: az_storage_account_blob-inventory-policy_create
+  name: az storage account blob-inventory-policy create
+  summary: Create Blob Inventory Policy for storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy create --account-name
+                                                    --policy
+                                                    [--resource-group]
+  examples:
+  - summary: Create Blob Inventory Policy trough json file for storage account.
+    syntax: az storage account blob-inventory-policy create -g ResourceGroupName --account-name storageAccountName --policy @policy.json
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  - isRequired: true
+    name: --policy
+    summary: 'The Storage Account Blob Inventory Policy, string in JSON format or json file path. See more details in: {https://review.docs.microsoft.com/en-us/azure/storage/blobs/blob-inventory?branch=pr-en-us-135665}.'
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_blob-inventory-policy_delete
+  name: az storage account blob-inventory-policy delete
+  summary: Delete Blob Inventory Policy associated with the specified storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy delete --account-name
+                                                    [--resource-group]
+                                                    [--yes]
+  examples:
+  - summary: Delete Blob Inventory Policy associated with the specified storage account without prompt.
+    syntax: az storage account blob-inventory-policy delete -g ResourceGroupName --account-name storageAccountName -y
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storage_account_blob-inventory-policy_show
+  name: az storage account blob-inventory-policy show
+  summary: Show Blob Inventory Policy properties associated with the specified storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy show --account-name
+                                                  [--resource-group]
+  examples:
+  - summary: Show Blob Inventory Policy properties associated with the specified storage account without prompt.
+    syntax: az storage account blob-inventory-policy show -g ResourceGroupName --account-name storageAccountName
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_blob-inventory-policy_update
+  name: az storage account blob-inventory-policy update
+  summary: Update Blob Inventory Policy associated with the specified storage account.
+  description: ''
+  syntax: >-
+    az storage account blob-inventory-policy update --account-name
+                                                    [--add]
+                                                    [--force-string]
+                                                    [--remove]
+                                                    [--resource-group]
+                                                    [--set]
+  examples:
+  - summary: Update Blob Inventory Policy associated with the specified storage account.
+    syntax: az storage account blob-inventory-policy update -g ResourceGroupName --account-name storageAccountName --set "policy.rules[0].name=newname"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_storage_account_blob-inventory-policy_create
+- az_storage_account_blob-inventory-policy_delete
+- az_storage_account_blob-inventory-policy_show
+- az_storage_account_blob-inventory-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage storage account Blob Inventory Policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/account/blob-service-properties.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/account/blob-service-properties.yml
new file mode 100644
index 0000000000..a05e53fcc4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/account/blob-service-properties.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_blob-service-properties
+name: az storage account blob-service-properties
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-blob-preview** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az storage account blob-service-properties** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the properties of a storage account's blob service.
+description: ''
+directCommands:
+- uid: az_storage_account_blob-service-properties_show
+  name: az storage account blob-service-properties show
+  summary: Show the properties of a storage account's blob service.
+  description: Show the properties of a storage account's blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+  syntax: >-
+    az storage account blob-service-properties show --account-name
+                                                    [--resource-group]
+  examples:
+  - summary: Show the properties of the storage account 'mystorageaccount' in resource group 'MyResourceGroup'.
+    syntax: az storage account blob-service-properties show -n mystorageaccount -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_blob-service-properties_update
+  name: az storage account blob-service-properties update
+  summary: Update the properties of a storage account's blob service.
+  description: Update the properties of a storage account's blob service, including properties for Storage Analytics and CORS (Cross-Origin Resource Sharing) rules.
+  syntax: >-
+    az storage account blob-service-properties update --account-name
+                                                      [--add]
+                                                      [--change-feed-days]
+                                                      [--container-days]
+                                                      [--container-retention {false, true}]
+                                                      [--default-service-version]
+                                                      [--delete-retention-days]
+                                                      [--enable-change-feed {false, true}]
+                                                      [--enable-delete-retention {false, true}]
+                                                      [--enable-last-access-tracking {false, true}]
+                                                      [--enable-restore-policy {false, true}]
+                                                      [--enable-versioning {false, true}]
+                                                      [--force-string]
+                                                      [--remove]
+                                                      [--resource-group]
+                                                      [--restore-days]
+                                                      [--set]
+  examples:
+  - summary: Enable change feed and set change feed retention days to infinite for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-change-feed true -n mystorageaccount -g myresourcegroup
+  - summary: Enable change feed and set change feed retention days to 100 for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-change-feed --change-feed-days 100 -n mystorageaccount -g myresourcegroup
+  - summary: Disable change feed for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-change-feed false -n mystorageaccount -g myresourcegroup
+  - summary: Enable delete retention policy and set delete retention days to 100 for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-delete-retention true --delete-retention-days 100 -n mystorageaccount -g myresourcegroup
+  - summary: Enable versioning for the storage account 'mystorageaccount' in resource group 'myresourcegroup'.
+    syntax: az storage account blob-service-properties update --enable-versioning -n mystorageaccount -g myresourcegroup
+  - summary: Set default version for incoming request for storage account 'mystorageaccount'.
+    syntax: az storage account blob-service-properties update --default-service-version 2020-04-08 -n mystorageaccount -g myresourcegroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --change-feed-days --change-feed-retention-days
+    summary: Indicate the duration of changeFeed retention in days. Minimum value is 1 day and maximum value is 146000 days (400 years). A null value indicates an infinite retention of the change feed.(Use `--enable-change-feed` without `--change-feed-days` to indicate null).
+    description: ''
+  - name: --container-days --container-delete-retention-days
+    summary: Indicate the number of days that the deleted container should be retained. The minimum specified value can be 1 and the maximum value can be 365.
+    description: ''
+  - name: --container-retention --enable-container-delete-retention
+    parameterValueGroup: false, true
+    summary: Enable container delete retention policy for container soft delete when set to true. Disable container delete retention policy when set to false.
+    description: ''
+  - name: --default-service-version -d
+    summary: Indicate the default version to use for requests to the Blob service if an incoming request's version is not specified.
+    description: ''
+  - name: --delete-retention-days
+    summary: Indicate the number of days that the deleted blob should be retained. The value must be in range [1,365]. It must be provided when `--enable-delete-retention` is true.
+    description: ''
+  - name: --enable-change-feed
+    parameterValueGroup: false, true
+    summary: Indicate whether change feed event logging is enabled. If it is true, you enable the storage account to begin capturing changes. The default value is true. You can see more details in https://docs.microsoft.com/en-us/azure/storage/blobs/storage-blob-change-feed?tabs=azure-portal#register-by-using-azure-cli.
+    description: ''
+  - name: --enable-delete-retention
+    parameterValueGroup: false, true
+    summary: Indicate whether delete retention policy is enabled for the blob service.
+    description: ''
+  - name: --enable-last-access-tracking -t
+    parameterValueGroup: false, true
+    summary: When set to true last access time based tracking policy is enabled.
+    description: ''
+  - name: --enable-restore-policy
+    parameterValueGroup: false, true
+    summary: Enable blob restore policy when it set to true.
+    description: ''
+  - name: --enable-versioning
+    parameterValueGroup: false, true
+    summary: Versioning is enabled if set to true.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --restore-days
+    summary: The number of days for the blob can be restored. It should be greater than zero and less than Delete Retention Days.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_storage_account_blob-service-properties_show
+- az_storage_account_blob-service-properties_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the properties of a storage account's blob service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/account/file-service-properties.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/account/file-service-properties.yml
new file mode 100644
index 0000000000..e430d0d39d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/account/file-service-properties.yml
@@ -0,0 +1,122 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_file-service-properties
+name: az storage account file-service-properties
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage account file-service-properties** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the properties of file service in storage account.
+description: ''
+directCommands:
+- uid: az_storage_account_file-service-properties_show
+  name: az storage account file-service-properties show
+  summary: Show the properties of file service in storage account.
+  description: Show the properties of file service in storage account.
+  syntax: >-
+    az storage account file-service-properties show --account-name
+                                                    [--resource-group]
+  examples:
+  - summary: Show the properties of file service in storage account.
+    syntax: az storage account file-service-properties show -n mystorageaccount -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_file-service-properties_update
+  name: az storage account file-service-properties update
+  summary: Update the properties of file service in storage account.
+  description: Update the properties of file service in storage account.
+  syntax: >-
+    az storage account file-service-properties update --account-name
+                                                      [--add]
+                                                      [--auth-methods]
+                                                      [--channel-encryption]
+                                                      [--delete-retention-days]
+                                                      [--enable-delete-retention {false, true}]
+                                                      [--enable-smb-multichannel {false, true}]
+                                                      [--force-string]
+                                                      [--kerb-ticket-encryption]
+                                                      [--remove]
+                                                      [--resource-group]
+                                                      [--set]
+                                                      [--versions]
+  examples:
+  - summary: Enable soft delete policy and set delete retention days to 100 for file service in storage account.
+    syntax: az storage account file-service-properties update --enable-delete-retention true --delete-retention-days 100 -n mystorageaccount -g MyResourceGroup
+  - summary: Disable soft delete policy for file service.
+    syntax: az storage account file-service-properties update --enable-delete-retention false -n mystorageaccount -g MyResourceGroup
+  - summary: Enable SMB Multichannel setting for file service.
+    syntax: az storage account file-service-properties update --enable-smb-multichannel -n mystorageaccount -g MyResourceGroup
+  - summary: Disable SMB Multichannel setting for file service.
+    syntax: az storage account file-service-properties update --enable-smb-multichannel false -n mystorageaccount -g MyResourceGroup
+  - summary: Set secured SMB setting for file service.
+    syntax: az storage account file-service-properties update --versions SMB2.1;SMB3.0;SMB3.1.1 --auth-methods NTLMv2;Kerberos --kerb-ticket-encryption RC4-HMAC;AES-256 --channel-encryption AES-CCM-128;AES-GCM-128;AES-GCM-256 -n mystorageaccount -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --auth-methods
+    summary: SMB authentication methods supported by server. Valid values are NTLMv2, Kerberos. Should be passed as a string with delimiter ';'.
+    description: ''
+  - name: --channel-encryption
+    summary: SMB channel encryption supported by server. Valid values are AES-CCM-128, AES-GCM-128, AES-GCM-256. Should be passed as a string with delimiter ';'.
+    description: ''
+  - name: --delete-retention-days
+    summary: Indicate the number of days that the deleted item should be retained. The minimum specified value can be 1 and the maximum value can be 365.
+    description: ''
+  - name: --enable-delete-retention
+    parameterValueGroup: false, true
+    summary: Enable file service properties for share soft delete.
+    description: ''
+  - name: --enable-smb-multichannel --mc
+    parameterValueGroup: false, true
+    summary: Set SMB Multichannel setting for file service. Applies to Premium FileStorage only.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --kerb-ticket-encryption -k
+    summary: Kerberos ticket encryption supported by server. Valid values are RC4-HMAC, AES-256. Should be passed as a string with delimiter ';'.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --versions
+    summary: SMB protocol versions supported by server. Valid values are SMB2.1, SMB3.0, SMB3.1.1. Should be passed as a string with delimiter ';'.
+    description: ''
+commands:
+- az_storage_account_file-service-properties_show
+- az_storage_account_file-service-properties_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the properties of file service in storage account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/account/keys.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/account/keys.yml
index d328766a90..5ce854451a 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/account/keys.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/account/keys.yml
@@ -1,58 +1,54 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_account_keys
-  name: az storage account keys
-  summary: Manage storage account keys.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_account_keys_list
-  - az_storage_account_keys_renew
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_keys
+name: az storage account keys
+summary: Manage storage account keys.
+description: ''
+directCommands:
 - uid: az_storage_account_keys_list
   name: az storage account keys list
   summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account keys list --account-name
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List the access keys for a storage account.
-    syntax:
-      content: az storage account keys list -g MyResourceGroup -n MyStorageAccount
+    syntax: az storage account keys list -g MyResourceGroup -n MyStorageAccount
   - summary: List the access keys and Kerberos keys (if active directory enabled) for a storage account.
-    syntax:
-      content: az storage account keys list -g MyResourceGroup -n MyStorageAccount --expand-key-type kerb
-  parameters:
+    syntax: az storage account keys list -g MyResourceGroup -n MyStorageAccount --expand-key-type kerb
+  requiredParameters:
   - isRequired: true
     name: --account-name -n
     summary: The storage account name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_account_keys_renew
   name: az storage account keys renew
   summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
   description: Kerberos key is generated per storage account for Azure Files identity based authentication either with Azure Active Directory Domain Service (Azure AD DS) or Active Directory Domain Service (AD DS). It is used as the password of the identity registered in the domain service that represents the storage account. Kerberos key does not provide access permission to perform any control or data plane read or write operations against the storage account.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage account keys renew --account-name
+                                  --key {primary, secondary}
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Regenerate one of the access keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key primary
+    syntax: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key primary
   - summary: Regenerate one of the Kerberos keys for a storage account.
-    syntax:
-      content: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key secondary --key-type kerb
-  parameters:
+    syntax: az storage account keys renew -g MyResourceGroup -n MyStorageAccount --key secondary --key-type kerb
+  requiredParameters:
   - isRequired: true
     name: --account-name -n
     summary: The storage account name.
@@ -62,25 +58,17 @@ items:
     parameterValueGroup: primary, secondary
     summary: The key options to regenerate.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_account_keys_list
-  name: az storage account keys list
-  summary: List the access keys or Kerberos keys (if active directory enabled) for a storage account.
-- uid: az_storage_account_keys_renew
-  name: az storage account keys renew
-  summary: Regenerate one of the access keys or Kerberos keys (if active directory enabled) for a storage account.
+- az_storage_account_keys_list
+- az_storage_account_keys_renew
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -96,10 +84,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage account keys.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage account keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/account/network-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/account/network-rule.yml
new file mode 100644
index 0000000000..f805ab1aaa
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/account/network-rule.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_account_network-rule
+name: az storage account network-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage account network-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage network rules.
+description: ''
+directCommands:
+- uid: az_storage_account_network-rule_add
+  name: az storage account network-rule add
+  summary: Add a network rule.
+  description: Rules can be created for an IPv4 address, address range (CIDR format), or a virtual network subnet.
+  syntax: >-
+    az storage account network-rule add --account-name
+                                        --resource-group
+                                        [--action]
+                                        [--ip-address]
+                                        [--resource-id]
+                                        [--subnet]
+                                        [--tenant-id]
+                                        [--vnet-name]
+  examples:
+  - summary: Create a rule to allow a specific address-range.
+    syntax: az storage account network-rule add -g myRg --account-name mystorageaccount --ip-address 23.45.1.0/24
+  - summary: Create a rule to allow access for a subnet.
+    syntax: az storage account network-rule add -g myRg --account-name mystorageaccount --vnet-name myvnet --subnet mysubnet
+  - summary: Create a rule to allow access for a subnet in another resource group.
+    syntax: az storage account network-rule add -g myRg --account-name mystorageaccount  --subnet $subnetId
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action
+    defaultValue: Allow
+    summary: The action of virtual network rule.
+    description: ''
+  - name: --ip-address
+    summary: IPv4 address or CIDR range.
+    description: ''
+  - name: --resource-id
+    summary: The resource id to add in network rule.
+    description: ''
+  - name: --subnet
+    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id to add in network rule.
+    description: ''
+  - name: --vnet-name
+    summary: Name of a virtual network.
+    description: ''
+- uid: az_storage_account_network-rule_list
+  name: az storage account network-rule list
+  summary: List network rules.
+  description: ''
+  syntax: >-
+    az storage account network-rule list --account-name
+                                         --resource-group
+  examples:
+  - summary: List network rules. (autogenerated)
+    syntax: az storage account network-rule list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storage_account_network-rule_remove
+  name: az storage account network-rule remove
+  summary: Remove a network rule.
+  description: ''
+  syntax: >-
+    az storage account network-rule remove --account-name
+                                           --resource-group
+                                           [--ip-address]
+                                           [--resource-id]
+                                           [--subnet]
+                                           [--tenant-id]
+                                           [--vnet-name]
+  examples:
+  - summary: Remove a network rule. (autogenerated)
+    syntax: az storage account network-rule remove --account-name MyAccount --resource-group MyResourceGroup --subnet MySubnetID
+  - summary: Remove a network rule. (autogenerated)
+    syntax: az storage account network-rule remove --account-name MyAccount --ip-address 23.45.1.0/24 --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -n
+    summary: The storage account name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --ip-address
+    summary: IPv4 address or CIDR range.
+    description: ''
+  - name: --resource-id
+    summary: The resource id to add in network rule.
+    description: ''
+  - name: --subnet
+    summary: Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.
+    description: ''
+  - name: --tenant-id
+    summary: The tenant id to add in network rule.
+    description: ''
+  - name: --vnet-name
+    summary: Name of a virtual network.
+    description: ''
+commands:
+- az_storage_account_network-rule_add
+- az_storage_account_network-rule_list
+- az_storage_account_network-rule_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage network rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/azcopy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/azcopy.yml
new file mode 100644
index 0000000000..b3fc397ae4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/azcopy.yml
@@ -0,0 +1,43 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_azcopy
+name: az storage azcopy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage azcopy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: '[EXPERIMENTAL] Manage storage operations utilizing AzCopy.'
+description: 'Open issues here: https://github.com/Azure/azure-storage-azcopy.'
+directCommands:
+- uid: az_storage_azcopy_run-command
+  name: az storage azcopy run-command
+  summary: Run a command directly using the AzCopy CLI. Please use SAS tokens for authentication.
+  description: ''
+  syntax: az storage azcopy run-command [<COMMAND_ARGS>]
+  optionalParameters:
+  - name: <COMMAND_ARGS>
+    summary: Command to run using azcopy. Please start commands with "azcopy ".
+    description: ''
+commands:
+- az_storage_azcopy_blob
+- az_storage_azcopy_blob_delete
+- az_storage_azcopy_blob_download
+- az_storage_azcopy_blob_sync
+- az_storage_azcopy_blob_upload
+- az_storage_azcopy_run-command
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: 'Open issues here: https://github.com/Azure/azure-storage-azcopy.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/azcopy/blob.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/azcopy/blob.yml
new file mode 100644
index 0000000000..ef4be977e2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/azcopy/blob.yml
@@ -0,0 +1,233 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_azcopy_blob
+name: az storage azcopy blob
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage azcopy blob** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage object storage for unstructured data (blobs) using AzCopy.
+description: ''
+directCommands:
+- uid: az_storage_azcopy_blob_delete
+  name: az storage azcopy blob delete
+  summary: Delete blobs from a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob delete --container
+                                  [--account-key]
+                                  [--account-name]
+                                  [--auth-mode {key, login}]
+                                  [--connection-string]
+                                  [--recursive]
+                                  [--sas-token]
+                                  [--target]
+  examples:
+  - summary: Delete a single blob from a container.
+    syntax: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t TargetBlob
+  - summary: Delete all blobs from a container.
+    syntax: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount --recursive
+  - summary: Delete all blobs in a virtual directory.
+    syntax: az storage azcopy blob delete -c MyContainer --account-name MyStorageAccount -t "path/to/virtual_directory" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The delete target container.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively delete blobs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --target -t
+    summary: The delete target path.
+    description: ''
+- uid: az_storage_azcopy_blob_download
+  name: az storage azcopy blob download
+  summary: Download blobs from a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob download --container
+                                    --destination
+                                    [--account-key]
+                                    [--account-name]
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--recursive]
+                                    [--sas-token]
+                                    [--source]
+  examples:
+  - summary: Download a single blob from a container.
+    syntax: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "path/to/file"
+  - summary: Download a virtual directory from a container.
+    syntax: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s "path/to/virtual_directory" -d "download/path" --recursive
+  - summary: Download the contents of a container onto a local file system.
+    syntax: az storage azcopy blob download -c MyContainer --account-name MyStorageAccount -s * -d "download/path" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The download source container.
+    description: ''
+  - isRequired: true
+    name: --destination -d
+    summary: The destination file path to download to.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively download blobs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --source -s
+    summary: The download source path.
+    description: ''
+- uid: az_storage_azcopy_blob_sync
+  name: az storage azcopy blob sync
+  summary: Sync blobs recursively to a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob sync --container
+                                --source
+                                [--account-key]
+                                [--account-name]
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--destination]
+                                [--sas-token]
+  examples:
+  - summary: Sync a single blob to a container.
+    syntax: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
+  - summary: Sync a directory to a container.
+    syntax: az storage azcopy blob sync -c MyContainer --account-name MyStorageAccount -s "path/to/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The sync destination container.
+    description: ''
+  - isRequired: true
+    name: --source -s
+    summary: The source file path to sync from.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination -d
+    summary: The sync destination path.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_azcopy_blob_upload
+  name: az storage azcopy blob upload
+  summary: Upload blobs to a storage blob container using AzCopy.
+  description: ''
+  syntax: >-
+    az storage azcopy blob upload --container
+                                  --source
+                                  [--account-key]
+                                  [--account-name]
+                                  [--auth-mode {key, login}]
+                                  [--connection-string]
+                                  [--destination]
+                                  [--recursive]
+                                  [--sas-token]
+  examples:
+  - summary: Upload a single blob to a container.
+    syntax: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d NewBlob
+  - summary: Upload a directory to a container.
+    syntax: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" --recursive
+  - summary: Upload the contents of a directory to a container.
+    syntax: az storage azcopy blob upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory/*" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The upload destination container.
+    description: ''
+  - isRequired: true
+    name: --source -s
+    summary: The source file path to upload from.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination -d
+    summary: The upload destination path.
+    description: ''
+  - name: --recursive -r
+    summary: Recursively upload blobs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+commands:
+- az_storage_azcopy_blob_delete
+- az_storage_azcopy_blob_download
+- az_storage_azcopy_blob_sync
+- az_storage_azcopy_blob_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage object storage for unstructured data (blobs) using AzCopy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob.yml
index 739724a396..e6f3c9052f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/blob.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob.yml
@@ -1,41 +1,35 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob
-  name: az storage blob
-  summary: Manage object storage for unstructured data (blobs).
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_delete
-  - az_storage_blob_delete_batch
-  - az_storage_blob_download
-  - az_storage_blob_download_batch
-  - az_storage_blob_exists
-  - az_storage_blob_generate_sas
-  - az_storage_blob_list
-  - az_storage_blob_set_tier
-  - az_storage_blob_show
-  - az_storage_blob_snapshot
-  - az_storage_blob_sync
-  - az_storage_blob_update
-  - az_storage_blob_upload
-  - az_storage_blob_upload_batch
-  - az_storage_blob_url
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob
+name: az storage blob
+summary: Manage object storage for unstructured data (blobs).
+description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+directCommands:
 - uid: az_storage_blob_delete
   name: az storage blob delete
   summary: Mark a blob or snapshot for deletion.
   description: The blob is marked for later deletion during garbage collection.  In order to delete a blob, all of its snapshots must also be deleted. Both can be removed at the same time.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob delete --container-name
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--delete-snapshots {include, only}]
+                           [--if-match]
+                           [--if-modified-since]
+                           [--if-none-match]
+                           [--if-unmodified-since]
+                           [--lease-id]
+                           [--sas-token]
+                           [--snapshot]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Delete a blob.
-    syntax:
-      content: az storage blob delete -c mycontainer -n MyBlob
+    syntax: az storage blob delete -c mycontainer -n MyBlob
   - summary: Delete a blob using login credentials.
-    syntax:
-      content: az storage blob delete -c mycontainer -n MyBlob --account-name mystorageaccount --auth-mode login
-  parameters:
+    syntax: az storage blob delete -c mycontainer -n MyBlob --account-name mystorageaccount --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -44,18 +38,19 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --delete-snapshots
-    parameterValueGroup: include, only
-    summary: Required if the blob has associated snapshots.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to delete.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --delete-snapshots
+    parameterValueGroup: include, only
+    summary: Required if the blob has associated snapshots.
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -69,54 +64,69 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to delete.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_delete_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_delete-batch
   name: az storage blob delete-batch
   summary: Delete blobs from a blob container recursively.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob delete-batch --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--delete-snapshots {include, only}]
+                                 [--dryrun]
+                                 [--if-match]
+                                 [--if-modified-since]
+                                 [--if-none-match]
+                                 [--if-unmodified-since]
+                                 [--lease-id]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--timeout]
   examples:
   - summary: Delete all blobs ending with ".py" in a container that have not been modified for 10 days.
-    syntax:
-      content: >-
-        date=`date -d "10 days ago" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      date=`date -d "10 days ago" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage blob delete-batch -s mycontainer --account-name mystorageaccount --pattern *.py --if-unmodified-since $date --auth-mode login
+      az storage blob delete-batch -s mycontainer --account-name mystorageaccount --pattern *.py --if-unmodified-since $date --auth-mode login
   - summary: Delete all the blobs in a directory named "dir" in a container named "mycontainer".
-    syntax:
-      content: az storage blob delete-batch -s mycontainer --pattern dir/*
+    syntax: az storage blob delete-batch -s mycontainer --pattern dir/*
   - summary: Delete the blobs with the format 'cli-2018-xx-xx.txt' or 'cli-2019-xx-xx.txt' in a container.
-    syntax:
-      content: az storage blob delete-batch -s mycontainer --pattern cli-201[89]-??-??.txt
+    syntax: az storage blob delete-batch -s mycontainer --pattern cli-201[89]-??-??.txt
   - summary: Delete all blobs with the format 'cli-201x-xx-xx.txt' except cli-2018-xx-xx.txt' and 'cli-2019-xx-xx.txt' in a container.
-    syntax:
-      content: az storage blob delete-batch -s mycontainer --pattern cli-201[!89]-??-??.txt
-  parameters:
+    syntax: az storage blob delete-batch -s mycontainer --pattern cli-201[!89]-??-??.txt
+  requiredParameters:
   - isRequired: true
     name: --source -s
     summary: The blob container from where the files will be deleted.
     description: The source can be the container URL or the container name. When the source is the container URL, the storage account name will be parsed from the URL.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --delete-snapshots
     parameterValueGroup: include, only
     summary: Required if the blob has associated snapshots.
@@ -124,15 +134,6 @@ items:
   - name: --dryrun
     summary: Show the summary of the operations to be taken instead of actually deleting the file(s).
     description: If this is specified, it will ignore all the Precondition Arguments that include --if-modified-since and --if-unmodified-since. So the file(s) will be deleted with the command without --dryrun may be different from the result list with --dryrun flag on.
-  - name: --lease-id
-    summary: The active lease id for the blob.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'. You can also try "az stroage remove" command with --include and --exclude with azure cli >= 2.0.70 to match multiple patterns.
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
     description: ''
@@ -145,34 +146,50 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: The active lease id for the blob.
     description: ''
+  - name: --pattern
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'. You can also try "az storage remove" command with --include and --exclude with azure cli >= 2.0.70 to match multiple patterns.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_download
   name: az storage blob download
   summary: Downloads a blob to a file path, with automatic chunking and progress notifications.
   description: Returns an instance of Blob with properties and metadata.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob download --container-name
+                             --file
+                             --name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--end-range]
+                             [--if-match]
+                             [--if-modified-since]
+                             [--if-none-match]
+                             [--if-unmodified-since]
+                             [--lease-id]
+                             [--max-connections]
+                             [--no-progress]
+                             [--open-mode]
+                             [--sas-token]
+                             [--snapshot]
+                             [--socket-timeout]
+                             [--start-range]
+                             [--subscription]
+                             [--timeout]
+                             [--validate-content]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -185,9 +202,31 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --end-range
     summary: 'End of byte range to use for downloading a section of the blob. If end_range is given, start_range must be provided. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of blob.'
     description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --lease-id
     summary: Required if the blob has an active lease.
     description: ''
@@ -202,6 +241,9 @@ items:
     defaultValue: wb
     summary: Mode to use when opening the file. Note that specifying append only open_mode prevents parallel download. So, max_connections must be set to 1 if this open_mode is used.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --snapshot
     summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
     description: ''
@@ -211,65 +253,43 @@ items:
   - name: --start-range
     summary: 'Start of byte range to use for downloading a section of the blob. If no end_range is given, all bytes after the start_range will be downloaded. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of blob.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
   - name: --validate-content
     summary: If set to true, validates an MD5 hash for each retrieved portion of the blob. This is primarily valuable for detecting bitflips on the wire if using http instead of https as https (the default) will already validate. Note that the service will only return transactional MD5s for chunks 4MB or less so the first get request will be of size self.MAX_CHUNK_GET_SIZE instead of self.MAX_SINGLE_GET_SIZE. If self.MAX_CHUNK_GET_SIZE was set to greater than 4MB an error will be thrown. As computing the MD5 takes processing time and more requests will need to be done due to the reduced chunk size there may be some increase in latency.
     description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_download_batch
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_download-batch
   name: az storage blob download-batch
   summary: Download blobs from a blob container recursively.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob download-batch --destination
+                                   --source
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--dryrun]
+                                   [--max-connections]
+                                   [--no-progress]
+                                   [--pattern]
+                                   [--sas-token]
+                                   [--socket-timeout]
+                                   [--subscription]
   examples:
   - summary: Download all blobs that end with .py
-    syntax:
-      content: az storage blob download-batch -d . --pattern *.py -s mycontainer --account-name mystorageaccount --account-key 00000000
+    syntax: az storage blob download-batch -d . --pattern *.py -s mycontainer --account-name mystorageaccount --account-key 00000000
   - summary: Download all blobs in a directory named "dir" from container named "mycontainer".
-    syntax:
-      content: az storage blob download-batch -d . -s mycontainer --pattern dir/*
+    syntax: az storage blob download-batch -d . -s mycontainer --pattern dir/*
   - summary: Download all blobs with the format 'cli-2018-xx-xx.txt' or 'cli-2019-xx-xx.txt' in container to current path.
-    syntax:
-      content: az storage blob download-batch -d . -s mycontainer --pattern cli-201[89]-??-??.txt
+    syntax: az storage blob download-batch -d . -s mycontainer --pattern cli-201[89]-??-??.txt
   - summary: Download all blobs with the format 'cli-201x-xx-xx.txt' except cli-2018-xx-xx.txt' and 'cli-2019-xx-xx.txt' in container to current path.
-    syntax:
-      content: az storage blob download-batch -d . -s mycontainer --pattern cli-201[!89]-??-??.txt
-  parameters:
+    syntax: az storage blob download-batch -d . -s mycontainer --pattern cli-201[!89]-??-??.txt
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The existing destination folder for this download operation.
@@ -278,6 +298,16 @@ items:
     name: --source -s
     summary: The blob container from where the files will be downloaded.
     description: The source can be the container URL or the container name. When the source is the container URL, the storage account name will be parsed from the URL.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --dryrun
     summary: Show the summary of the operations to be taken instead of actually downloading the file(s).
     description: ''
@@ -289,43 +319,36 @@ items:
     summary: Include this flag to disable progress reporting for the command.
     description: ''
   - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
     description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --socket-timeout
-    summary: The socket timeout(secs), used by the service to regulate data flow.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --socket-timeout
+    summary: The socket timeout(secs), used by the service to regulate data flow.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_exists
   name: az storage blob exists
   summary: Check for the existence of a blob in a container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob exists --container-name
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--snapshot]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Check for the existence of a blob in a container. (autogenerated)
-    syntax:
-      content: az storage blob exists --account-key 00000000 --account-name MyAccount --container-name MyContainer --name MyBlob
-  parameters:
+    syntax: az storage blob exists --account-key 00000000 --account-name MyAccount --container-name mycontainer --name MyBlob
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -334,50 +357,100 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --snapshot
     summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the snapshot.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_filter
+  name: az storage blob filter
+  summary: List blobs across all containers whose tags match a given search expression.
+  description: Filter blobs searches across all containers within a storage account but can be scoped within the expression to a single container.
+  syntax: >-
+    az storage blob filter --tag-filter
+                           [--account-key]
+                           [--account-name]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--sas-token]
+  requiredParameters:
+  - isRequired: true
+    name: --tag-filter
+    summary: The expression to find blobs whose tags matches the specified condition. eg. ""yourtagname"='firsttag' and "yourtagname2"='secondtag'" To specify a container, eg. "@container='containerName' and "Name"='C'".
+    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_generate_sas
+- uid: az_storage_blob_generate-sas
   name: az storage blob generate-sas
   summary: Generate a shared access signature for the blob.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob generate-sas --container-name
+                                 --name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--cache-control]
+                                 [--connection-string]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-type]
+                                 [--expiry]
+                                 [--full-uri]
+                                 [--https-only]
+                                 [--ip]
+                                 [--permissions]
+                                 [--policy-name]
+                                 [--sas-token]
+                                 [--start]
+                                 [--subscription]
   examples:
   - summary: Generate a sas token for a blob with read-only permissions.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+
+      az storage blob generate-sas -c myycontainer -n MyBlob --permissions r --expiry $end --https-only
+  - summary: Generate a sas token for a blob with ip range specified.
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage blob generate-sas -c myycontainer -n MyBlob --permissions r --expiry $end --https-only
+      az storage blob generate-sas -c myycontainer -n MyBlob --ip "176.134.171.0-176.134.171.255" --permissions r --expiry $end --https-only
   - summary: Generate a shared access signature for the blob. (autogenerated)
-    syntax:
-      content: az storage blob generate-sas --account-key 00000000 --account-name MyStorageAccount --container-name MyContainer --expiry 2018-01-01T00:00:00Z --name MyBlob --permissions r
-  parameters:
+    syntax: az storage blob generate-sas --account-key 00000000 --account-name MyStorageAccount --container-name mycontainer --expiry 2018-01-01T00:00:00Z --name MyBlob --permissions r
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -386,9 +459,19 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessedusing this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessedusing this shared access signature.
     description: ''
@@ -419,50 +502,57 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the container's ACL.
     description: ''
-  - name: --start
-    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_list
   name: az storage blob list
   summary: List blobs in a given container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob list --container-name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--delimiter]
+                         [--include]
+                         [--marker]
+                         [--num-results]
+                         [--prefix]
+                         [--query-examples]
+                         [--sas-token]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: List all storage blobs in a container whose names start with 'foo'; will match names such as 'foo', 'foobar', and 'foo/bar'
-    syntax:
-      content: az storage blob list -c MyContainer --prefix foo
-  parameters:
+    syntax: az storage blob list -c mycontainer --prefix foo
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --delimiter
     summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
     description: ''
   - name: --include
-    summary: 'Specifies additional datasets to include: (c)opy-info, (m)etadata, (s)napshots, (d)eleted-soft. Can be combined.'
+    summary: Specifies one or more additional datasets to include in the response.
     description: ''
   - name: --marker
     summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
@@ -474,41 +564,112 @@ items:
   - name: --prefix
     summary: Filters the results to return only blobs whose names begin with the specified prefix.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_move
+  name: az storage blob move
+  summary: Move a blob in a storage container.
+  description: ''
+  syntax: >-
+    az storage blob move --container-name
+                         --destination-blob
+                         --source-blob
+                         [--account-key]
+                         [--account-name]
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--lease-id]
+                         [--sas-token]
+                         [--source-if-match]
+                         [--source-if-modified-since]
+                         [--source-if-none-match]
+                         [--source-if-unmodified-since]
+                         [--source-lease-id]
+                         [--timeout]
+  examples:
+  - summary: Move a blob in a storage container.
+    syntax: az storage blob move -c MyContainer -d DestinationBlobPath -s SourceBlobPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --destination-blob -d
+    summary: The destination blob name. It should be an absolute path under the container. e.g.'topdir1/dirbar'.
+    description: ''
+  - isRequired: true
+    name: --source-blob -s
+    summary: The source blob name. It should be an absolute path under the container. e.g.'topdir1/dirsubfoo'.
+    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: Optional. A lease ID for the new_path. The new_path must have an active lease and the lease ID must match.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --source-if-match
+    summary: Optional. An ETag value. Specify this header to perform the rename operation only if the source's ETag matches the value specified.
+    description: ''
+  - name: --source-if-modified-since
+    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has been modified since the specified date and time.
+    description: ''
+  - name: --source-if-none-match
+    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the rename operation only if the source's ETag does not match the value specified.
+    description: ''
+  - name: --source-if-unmodified-since
+    summary: Optional. A date and time value. Specify this header to perform the rename operation only if the source has not been modified since the specified date and time.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_set_tier
+  - name: --source-lease-id
+    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_set-tier
   name: az storage blob set-tier
   summary: Set the block or page tiers on the blob.
   description: For block blob this command only supports block blob on standard storage accounts. For page blob, this command only supports for page blobs on premium accounts.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob set-tier --container-name
+                             --name
+                             --tier
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+                             [--type {block, page}]
   examples:
   - summary: Set the block or page tiers on the blob. (autogenerated)
-    syntax:
-      content: az storage blob set-tier --account-key 00000000 --account-name MyAccount --container-name MyContainer --name MyBlob --tier P10
-  parameters:
+    syntax: az storage blob set-tier --account-key 00000000 --account-name MyAccount --container-name mycontainer --name MyBlob --tier P10
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -521,14 +682,7 @@ items:
     name: --tier
     summary: The tier value to set the blob to.
     description: ''
-  - name: --timeout
-    summary: The timeout parameter is expressed in seconds. This method may make multiple calls to the Azure service and the timeout will apply to each call individually.
-    description: ''
-  - name: --type -t
-    defaultValue: block
-    parameterValueGroup: block, page
-    summary: The blob type.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -544,26 +698,41 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: The timeout parameter is expressed in seconds. This method may make multiple calls to the Azure service and the timeout will apply to each call individually.
+    description: ''
+  - name: --type -t
+    defaultValue: block
+    parameterValueGroup: block, page
+    summary: The blob type.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_show
   name: az storage blob show
   summary: Get the details of a blob.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob show --container-name
+                         --name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--if-match]
+                         [--if-modified-since]
+                         [--if-none-match]
+                         [--if-unmodified-since]
+                         [--lease-id]
+                         [--query-examples]
+                         [--sas-token]
+                         [--snapshot]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: Show all properties of a blob.
-    syntax:
-      content: az storage blob show -c MyContainer -n MyBlob
+    syntax: az storage blob show -c mycontainer -n MyBlob
   - summary: Get the details of a blob (autogenerated)
-    syntax:
-      content: az storage blob show --account-name mystorageccount --account-key 00000000 --container-name MyContainer --name MyBlob
-  parameters:
+    syntax: az storage blob show --account-name mystorageccount --account-key 00000000 --container-name mycontainer --name MyBlob
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -572,14 +741,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -593,34 +763,45 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_snapshot
   name: az storage blob snapshot
   summary: Creates a read-only snapshot of a blob.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob snapshot --container-name
+                             --name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--if-match]
+                             [--if-modified-since]
+                             [--if-none-match]
+                             [--if-unmodified-since]
+                             [--lease-id]
+                             [--metadata]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -629,14 +810,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -650,14 +832,11 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -665,26 +844,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_sync
   name: az storage blob sync
   summary: Sync blobs recursively to a storage blob container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob sync --container
+                         --source
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--destination]
+                         [--exclude-path]
+                         [--exclude-pattern]
+                         [--include-pattern]
+                         [--sas-token]
+                         [--subscription]
   examples:
   - summary: Sync a single blob to a container.
-    syntax:
-      content: az storage blob sync -c mycontainer -s "path/to/file" -d NewBlob
+    syntax: az storage blob sync -c mycontainer -s "path/to/file" -d NewBlob
   - summary: Sync a directory to a container.
-    syntax:
-      content: az storage blob sync -c mycontainer --account-name mystorageccount --account-key 00000000 -s "path/to/directory"
-  parameters:
+    syntax: az storage blob sync -c mycontainer --account-name mystorageccount --account-key 00000000 -s "path/to/directory"
+  requiredParameters:
   - isRequired: true
     name: --container -c
     summary: The sync destination container.
@@ -693,8 +878,18 @@ items:
     name: --source -s
     summary: The source file path to sync from.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --destination -d
-    summary: The destination path that will be appended to the blob name.
+    summary: The destination path that will be prepended to the blob name.
     description: ''
   - name: --exclude-path
     summary: 'Exclude these paths. This option does not support wildcard characters (\*). Checks relative path prefix. For example: myFolder;myFolder/subDirName/file.pdf.'
@@ -705,34 +900,85 @@ items:
   - name: --include-pattern
     summary: 'Include only these files where the name matches the pattern list. For example: \*.jpg;\*.pdf;exactName. This option supports wildcard characters (\*).'
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_undelete
+  name: az storage blob undelete
+  summary: Restore soft-deleted blobs or snapshots.
+  description: Operation will only be successful if used within the specified number of days set in the delete retention policy.
+  syntax: >-
+    az storage blob undelete [--account-key]
+                             [--account-name]
+                             [--auth-mode {key, login}]
+                             [--blob-url]
+                             [--connection-string]
+                             [--container-name]
+                             [--name]
+                             [--sas-token]
+                             [--timeout]
+  examples:
+  - summary: Restore soft-deleted blob.
+    syntax: az storage blob undelete -n myblob -c mycontainer --account-name mystorageaccount --account-key 0000-0000
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --blob-url
+    summary: The full endpoint URL to the Blob, including SAS token and snapshot if used. This could be either the primary endpoint, or the secondary endpoint depending on the current `location_mode`.
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --container-name -c
+    summary: The container name.
+    description: ''
+  - name: --name -n
+    summary: The blob name.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
 - uid: az_storage_blob_update
   name: az storage blob update
   summary: Sets system properties on the blob.
   description: If one property is set for the content_settings, all properties will be overriden.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob update --container-name
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--clear-content-settings {false, true}]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--if-match]
+                           [--if-modified-since]
+                           [--if-none-match]
+                           [--if-unmodified-since]
+                           [--lease-id]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -741,11 +987,21 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --clear-content-settings
     parameterValueGroup: false, true
     summary: If this flag is set, then if any one or more of the following properties (--content-cache-control, --content-disposition, --content-encoding, --content-language, --content-md5, --content-type) is set, then all of these properties are set together. If a value is not provided for a given property when at least one of the properties listed below is set, then that property will be cleared.
     description: ''
-  - name: --content-cache-control
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -763,12 +1019,6 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
     description: ''
@@ -781,14 +1031,8 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -796,23 +1040,50 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_upload
   name: az storage blob upload
   summary: Upload a file to a storage blob.
   description: Creates a new blob from a file path, or updates the content of an existing blob with automatic chunking and progress notifications.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob upload --container-name
+                           --file
+                           --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--encryption-scope]
+                           [--if-match]
+                           [--if-modified-since]
+                           [--if-none-match]
+                           [--if-unmodified-since]
+                           [--lease-id]
+                           [--max-connections]
+                           [--maxsize-condition]
+                           [--metadata]
+                           [--no-progress]
+                           [--sas-token]
+                           [--socket-timeout]
+                           [--subscription]
+                           [--tier {P10, P20, P30, P4, P40, P50, P6, P60}]
+                           [--timeout]
+                           [--type {append, block, page}]
+                           [--validate-content]
   examples:
   - summary: Upload to a blob.
-    syntax:
-      content: az storage blob upload -f /path/to/file -c MyContainer -n MyBlob
-  parameters:
+    syntax: az storage blob upload -f /path/to/file -c mycontainer -n MyBlob
+  - summary: Upload a file to a storage blob. (autogenerated)
+    syntax: az storage blob upload --account-name mystorageaccount --account-key 0000-0000 --container-name mycontainer --file /path/to/file --name myblob
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -825,7 +1096,17 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --content-cache-control
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -846,6 +1127,18 @@ items:
   - name: --encryption-scope
     summary: A predefined encryption scope used to encrypt the data on the service.
     description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --lease-id
     summary: Required if the blob has an active lease.
     description: ''
@@ -862,9 +1155,15 @@ items:
   - name: --no-progress
     summary: Include this flag to disable progress reporting for the command.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --socket-timeout
     summary: The socket timeout(secs), used by the service to regulate data flow.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tier
     parameterValueGroup: P10, P20, P30, P4, P40, P50, P6, P60
     summary: A page blob tier value to set the blob to. The tier correlates to the size of the blob and number of allowed IOPS. This is only applicable to page blobs on premium storage accounts.
@@ -879,59 +1178,51 @@ items:
   - name: --validate-content
     summary: Specifies that an MD5 hash shall be calculated for each chunk of the blob and verified by the service when the chunk has arrived.
     description: ''
-  - name: --if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_upload_batch
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_upload-batch
   name: az storage blob upload-batch
   summary: Upload files from a local directory to a blob container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob upload-batch --destination
+                                 --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--content-cache]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-md5]
+                                 [--content-type]
+                                 [--destination-path]
+                                 [--dryrun]
+                                 [--if-match]
+                                 [--if-modified-since]
+                                 [--if-none-match]
+                                 [--if-unmodified-since]
+                                 [--lease-id]
+                                 [--max-connections]
+                                 [--maxsize-condition]
+                                 [--metadata]
+                                 [--no-progress]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--socket-timeout]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--type {append, block, page}]
+                                 [--validate-content]
   examples:
   - summary: Upload all files that end with .py unless blob exists and has been modified since given date.
-    syntax:
-      content: az storage blob upload-batch -d mycontainer --account-name mystorageaccount --account-key 00000000 -s <path-to-directory> --pattern *.py --if-unmodified-since 2018-08-27T20:51Z
+    syntax: az storage blob upload-batch -d mycontainer --account-name mystorageaccount --account-key 00000000 -s <path-to-directory> --pattern *.py --if-unmodified-since 2018-08-27T20:51Z
   - summary: Upload all files from local path directory to a container named "mycontainer".
-    syntax:
-      content: az storage blob upload-batch -d mycontainer -s <path-to-directory>
+    syntax: az storage blob upload-batch -d mycontainer -s <path-to-directory>
   - summary: Upload all files with the format 'cli-2018-xx-xx.txt' or 'cli-2019-xx-xx.txt' in local path directory.
-    syntax:
-      content: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[89]-??-??.txt
+    syntax: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[89]-??-??.txt
   - summary: Upload all files with the format 'cli-201x-xx-xx.txt' except cli-2018-xx-xx.txt' and 'cli-2019-xx-xx.txt' in a container.
-    syntax:
-      content: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[!89]-??-??.txt
-  parameters:
+    syntax: az storage blob upload-batch -d mycontainer -s <path-to-directory> --pattern cli-201[!89]-??-??.txt
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The blob container where the files will be uploaded.
@@ -940,39 +1231,17 @@ items:
     name: --source -s
     summary: The directory where the files to be uploaded are located.
     description: ''
-  - name: --destination-path
-    summary: The destination path that will be appended to the blob name.
-    description: ''
-  - name: --dryrun
-    summary: Show the summary of the operations to be taken instead of actually uploading the file(s).
-    description: ''
-  - name: --lease-id
-    summary: The active lease id for the blob.
-    description: ''
-  - name: --max-connections
-    defaultValue: "2"
-    summary: Maximum number of parallel connections to use when the blob size exceeds 64MB.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --no-progress
-    summary: Include this flag to disable progress reporting for the command.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --socket-timeout
-    summary: The socket timeout(secs), used by the service to regulate data flow.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --type -t
-    parameterValueGroup: append, block, page
-    summary: Defaults to 'page' for \*.vhd files, or 'block' otherwise. The setting will override blob types for every file.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --content-cache-control
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -990,11 +1259,11 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
-  - name: --maxsize-condition
-    summary: The max length in bytes permitted for an append blob.
+  - name: --destination-path
+    summary: The destination path that will be prepended to the blob name.
     description: ''
-  - name: --validate-content
-    summary: Specifies that an MD5 hash shall be calculated for each chunk of the blob and verified by the service when the chunk has arrived.
+  - name: --dryrun
+    summary: Show the summary of the operations to be taken instead of actually uploading the file(s).
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -1008,41 +1277,65 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+  - name: --lease-id
+    summary: The active lease id for the blob.
     description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --max-connections
+    defaultValue: "2"
+    summary: Maximum number of parallel connections to use when the blob size exceeds 64MB.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --maxsize-condition
+    summary: The max length in bytes permitted for an append blob.
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --no-progress
+    summary: Include this flag to disable progress reporting for the command.
+    description: ''
+  - name: --pattern
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --socket-timeout
+    summary: The socket timeout(secs), used by the service to regulate data flow.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --type -t
+    parameterValueGroup: append, block, page
+    summary: Defaults to 'page' for \*.vhd files, or 'block' otherwise. The setting will override blob types for every file.
+    description: ''
+  - name: --validate-content
+    summary: Specifies that an MD5 hash shall be calculated for each chunk of the blob and verified by the service when the chunk has arrived.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_url
   name: az storage blob url
   summary: Create the url to access a blob.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob url --container-name
+                        --name
+                        [--account-key]
+                        [--account-name]
+                        [--connection-string]
+                        [--protocol {http, https}]
+                        [--sas-token]
+                        [--snapshot]
+                        [--subscription]
   examples:
   - summary: Create the url to access a blob (autogenerated)
-    syntax:
-      content: az storage blob url --connection-string $connectionString --container-name container1 --name blob1
+    syntax: az storage blob url --connection-string $connectionString --container-name container1 --name blob1
   - summary: Create the url to access a blob (autogenerated)
-    syntax:
-      content: az storage blob url --account-name storageacct --account-key 00000000 --container-name container1 --name blob1
-  parameters:
+    syntax: az storage blob url --account-name storageacct --account-key 00000000 --container-name container1 --name blob1
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -1051,14 +1344,7 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --protocol
-    defaultValue: https
-    parameterValueGroup: http, https
-    summary: Protocol to use.
-    description: ''
-  - name: --snapshot
-    summary: An string value that uniquely identifies the snapshot. The value ofthis query parameter indicates the snapshot version.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -1068,121 +1354,85 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --protocol
+    defaultValue: https
+    parameterValueGroup: http, https
+    summary: Protocol to use.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: An string value that uniquely identifies the snapshot. The value ofthis query parameter indicates the snapshot version.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_copy
-  name: az storage blob copy
-  summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_cancel
-  name: az storage blob copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_copy_start
-  name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_delete
-  name: az storage blob delete
-  summary: Mark a blob or snapshot for deletion.
-- uid: az_storage_blob_delete_batch
-  name: az storage blob delete-batch
-  summary: Delete blobs from a blob container recursively.
-- uid: az_storage_blob_download
-  name: az storage blob download
-  summary: Downloads a blob to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_blob_download_batch
-  name: az storage blob download-batch
-  summary: Download blobs from a blob container recursively.
-- uid: az_storage_blob_exists
-  name: az storage blob exists
-  summary: Check for the existence of a blob in a container.
-- uid: az_storage_blob_generate_sas
-  name: az storage blob generate-sas
-  summary: Generate a shared access signature for the blob.
-- uid: az_storage_blob_incremental_copy
-  name: az storage blob incremental-copy
-  summary: Manage blob incremental copy operations.
-- uid: az_storage_blob_incremental_copy_cancel
-  name: az storage blob incremental-copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_incremental_copy_start
-  name: az storage blob incremental-copy start
-  summary: Copies an incremental copy of a blob asynchronously.
-- uid: az_storage_blob_lease
-  name: az storage blob lease
-  summary: Manage storage blob leases.
-- uid: az_storage_blob_lease_acquire
-  name: az storage blob lease acquire
-  summary: Requests a new lease.
-- uid: az_storage_blob_lease_break
-  name: az storage blob lease break
-  summary: Breaks the lease, if the blob has an active lease.
-- uid: az_storage_blob_lease_change
-  name: az storage blob lease change
-  summary: Changes the lease ID of an active lease.
-- uid: az_storage_blob_lease_release
-  name: az storage blob lease release
-  summary: Releases the lease.
-- uid: az_storage_blob_lease_renew
-  name: az storage blob lease renew
-  summary: Renews the lease.
-- uid: az_storage_blob_list
-  name: az storage blob list
-  summary: List blobs in a given container.
-- uid: az_storage_blob_metadata
-  name: az storage blob metadata
-  summary: Manage blob metadata.
-- uid: az_storage_blob_metadata_show
-  name: az storage blob metadata show
-  summary: Returns all user-defined metadata for the specified blob or snapshot.
-- uid: az_storage_blob_metadata_update
-  name: az storage blob metadata update
-  summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
-- uid: az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-- uid: az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
-- uid: az_storage_blob_set_tier
-  name: az storage blob set-tier
-  summary: Set the block or page tiers on the blob.
-- uid: az_storage_blob_show
-  name: az storage blob show
-  summary: Get the details of a blob.
-- uid: az_storage_blob_snapshot
-  name: az storage blob snapshot
-  summary: Creates a read-only snapshot of a blob.
-- uid: az_storage_blob_sync
-  name: az storage blob sync
-  summary: Sync blobs recursively to a storage blob container.
-- uid: az_storage_blob_update
-  name: az storage blob update
-  summary: Sets system properties on the blob.
-- uid: az_storage_blob_upload
-  name: az storage blob upload
-  summary: Upload a file to a storage blob.
-- uid: az_storage_blob_upload_batch
-  name: az storage blob upload-batch
-  summary: Upload files from a local directory to a blob container.
-- uid: az_storage_blob_url
-  name: az storage blob url
-  summary: Create the url to access a blob.
+- az_storage_blob_access
+- az_storage_blob_access_set
+- az_storage_blob_access_show
+- az_storage_blob_access_update
+- az_storage_blob_copy
+- az_storage_blob_copy_cancel
+- az_storage_blob_copy_start
+- az_storage_blob_copy_start-batch
+- az_storage_blob_delete
+- az_storage_blob_delete-batch
+- az_storage_blob_directory
+- az_storage_blob_directory_access
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+- az_storage_blob_directory_create
+- az_storage_blob_directory_delete
+- az_storage_blob_directory_download
+- az_storage_blob_directory_exists
+- az_storage_blob_directory_list
+- az_storage_blob_directory_metadata
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+- az_storage_blob_directory_move
+- az_storage_blob_directory_show
+- az_storage_blob_directory_upload
+- az_storage_blob_download
+- az_storage_blob_download-batch
+- az_storage_blob_exists
+- az_storage_blob_filter
+- az_storage_blob_generate-sas
+- az_storage_blob_incremental-copy
+- az_storage_blob_incremental-copy_cancel
+- az_storage_blob_incremental-copy_start
+- az_storage_blob_lease
+- az_storage_blob_lease_acquire
+- az_storage_blob_lease_break
+- az_storage_blob_lease_change
+- az_storage_blob_lease_release
+- az_storage_blob_lease_renew
+- az_storage_blob_list
+- az_storage_blob_metadata
+- az_storage_blob_metadata_show
+- az_storage_blob_metadata_update
+- az_storage_blob_move
+- az_storage_blob_service-properties
+- az_storage_blob_service-properties_delete-policy
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+- az_storage_blob_service-properties_show
+- az_storage_blob_service-properties_update
+- az_storage_blob_set-tier
+- az_storage_blob_show
+- az_storage_blob_snapshot
+- az_storage_blob_sync
+- az_storage_blob_tag
+- az_storage_blob_tag_list
+- az_storage_blob_tag_set
+- az_storage_blob_undelete
+- az_storage_blob_update
+- az_storage_blob_upload
+- az_storage_blob_upload-batch
+- az_storage_blob_url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1198,10 +1448,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/access.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/access.yml
new file mode 100644
index 0000000000..b1c258486d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/access.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_access
+name: az storage blob access
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob access** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
+description: ''
+directCommands:
+- uid: az_storage_blob_access_set
+  name: az storage blob access set
+  summary: Set the access control properties of a blob.
+  description: ''
+  syntax: >-
+    az storage blob access set --acl-spec
+                               --blob-name
+                               --container-name
+                               [--account-key]
+                               [--account-name]
+                               [--auth-mode {key, login}]
+                               [--connection-string]
+                               [--if-match]
+                               [--if-modified-since]
+                               [--if-none-match]
+                               [--if-unmodified-since]
+                               [--lease-id]
+                               [--sas-token]
+                               [--timeout]
+  examples:
+  - summary: Set the access control properties of a blob.
+    syntax: az storage blob access set -a "user::rwx,group::r--,other::---" -b MyBlob -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - isRequired: true
+    name: --blob-name -b
+    summary: The blob name.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_access_show
+  name: az storage blob access show
+  summary: Show the access control properties of a blob.
+  description: ''
+  syntax: >-
+    az storage blob access show --blob-name
+                                --container-name
+                                [--account-key]
+                                [--account-name]
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--if-match]
+                                [--if-modified-since]
+                                [--if-none-match]
+                                [--if-unmodified-since]
+                                [--lease-id]
+                                [--sas-token]
+                                [--timeout]
+                                [--user-principle-names]
+  examples:
+  - summary: Show the access control properties of a blob.
+    syntax: az storage blob access show -b MyBlob -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --blob-name -b
+    summary: The blob name.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --user-principle-names
+    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
+    description: ''
+- uid: az_storage_blob_access_update
+  name: az storage blob access update
+  summary: Update the access control properties of a blob.
+  description: ''
+  syntax: >-
+    az storage blob access update --blob-name
+                                  --container-name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--acl-spec]
+                                  [--auth-mode {key, login}]
+                                  [--connection-string]
+                                  [--group]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--lease-id]
+                                  [--owner]
+                                  [--permissions]
+                                  [--sas-token]
+                                  [--timeout]
+  examples:
+  - summary: Update the access permissions of a blob.
+    syntax: az storage blob access update --permissions "rwxrwxrwx" -b MyBlob -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning user of a blob.
+    syntax: az storage blob access update --owner [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning group of a blob.
+    syntax: az storage blob access update --group [entityId/UPN] -b MyBlob -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --blob-name -b
+    summary: The blob name.
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --group
+    summary: The owning group for the directory.
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --owner
+    summary: The owning user for the directory.
+    description: ''
+  - name: --permissions
+    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_blob_access_set
+- az_storage_blob_access_show
+- az_storage_blob_access_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the access control properties of a blob when Hierarchical Namespace is enabled.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/copy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/copy.yml
index 960f850dd1..210c5c82e4 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/copy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/copy.yml
@@ -1,22 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_copy
-  name: az storage blob copy
-  summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_copy_cancel
-  - az_storage_blob_copy_start
-  - az_storage_blob_copy_start_batch
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_copy
+name: az storage blob copy
+summary: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
+description: ''
+directCommands:
 - uid: az_storage_blob_copy_cancel
   name: az storage blob copy cancel
   summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob copy cancel --copy-id
+                                --destination-blob
+                                --destination-container
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--lease-id]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --copy-id
     summary: Copy identifier provided in the copy.id of the original copy_blob operation.
@@ -29,12 +32,7 @@ items:
     name: --destination-container -c
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: Required if the destination blob has an active infinite lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -44,32 +42,58 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: Required if the destination blob has an active infinite lease.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_copy_start
   name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
+  summary: Copy a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob copy start --destination-blob
+                               --destination-container
+                               [--account-key]
+                               [--account-name]
+                               [--connection-string]
+                               [--destination-if-match]
+                               [--destination-if-modified-since]
+                               [--destination-if-none-match]
+                               [--destination-if-unmodified-since]
+                               [--destination-lease-id]
+                               [--metadata]
+                               [--sas-token]
+                               [--source-account-key]
+                               [--source-account-name]
+                               [--source-blob]
+                               [--source-container]
+                               [--source-if-match]
+                               [--source-if-modified-since]
+                               [--source-if-none-match]
+                               [--source-if-unmodified-since]
+                               [--source-lease-id]
+                               [--source-path]
+                               [--source-sas]
+                               [--source-share]
+                               [--source-snapshot]
+                               [--source-uri]
+                               [--subscription]
+                               [--timeout]
   examples:
-  - summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs. (autogenerated)
-    syntax:
-      content: az storage blob copy start --account-key 00000000 --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --source-uri https://storage.blob.core.windows.net/photos
-  - summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs (autogenerated)
-    syntax:
-      content: az storage blob copy start --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --sas-token $sas --source-uri https://storage.blob.core.windows.net/photos
-  parameters:
+  - summary: Copy a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
+    syntax: az storage blob copy start --account-key 00000000 --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --source-uri https://storage.blob.core.windows.net/photos
+  - summary: Copy a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
+    syntax: az storage blob copy start --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --sas-token $sas --source-uri https://storage.blob.core.windows.net/photos
+  requiredParameters:
   - isRequired: true
     name: --destination-blob -b
     summary: Name of the destination blob. If the exists, it will be overwritten.
@@ -78,14 +102,36 @@ items:
     name: --destination-container -c
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination-if-match
+    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value matches the ETag value for an existing destination blob. If the ETag for the destination blob does not match the ETag specified for If-Match, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-modified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has been modified since the specified date/time. If the destination blob has not been modified, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value does not match the ETag value for the destination blob. Specify the wildcard character (\*) to perform the operation only if the destination blob does not exist. If the specified condition isn't met, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-unmodified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has not been modified since the specified date/time. If the destination blob has been modified, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
   - name: --destination-lease-id
     summary: The lease ID specified for this header must match the lease ID of the destination blob. If the request does not include the lease ID or it is not valid, the operation fails with status code 412 (Precondition Failed).
     description: ''
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --source-account-key
     summary: The storage account key of the source blob.
@@ -99,6 +145,18 @@ items:
   - name: --source-container
     summary: The container name for the source storage account.
     description: ''
+  - name: --source-if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the source blob only if its ETag matches the value specified. If the ETag values do not match, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+    description: ''
+  - name: --source-if-modified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has been modified since the specified date/time.
+    description: ''
+  - name: --source-if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the blob only if its ETag does not match the value specified. If the values are identical, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+    description: ''
+  - name: --source-if-unmodified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has not been modified since the specified date/time.
+    description: ''
   - name: --source-lease-id
     summary: Specify this to perform the Copy Blob operation only if the lease ID given matches the active lease ID of the source blob.
     description: ''
@@ -115,32 +173,39 @@ items:
     summary: The blob snapshot for the source storage account.
     description: ''
   - name: --source-uri -u
-    summary: 'A URL of up to 2 KB in length that specifies an Azure file or blob. The value should be URL-encoded as it would appear in a request URI. If the source is in another account, the source must either be public or must be authenticated via a shared access signature. If the source is public, no authentication is required. Examples: <a href="https://myaccount.blob.core.windows.net/mycontainer/myblob">https://myaccount.blob.core.windows.net/mycontainer/myblob</a> <a href="https://myaccount.blob.core.windows.net/mycontainer/myblob">https://myaccount.blob.core.windows.net/mycontainer/myblob</a>?snapshot=&lt;DateTime&gt; <a href="https://otheraccount.blob.core.windows.net/mycontainer/myblob?sastoken">https://otheraccount.blob.core.windows.net/mycontainer/myblob?sastoken</a>.'
-    description: ''
-  - name: --destination-if-match
-    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value matches the ETag value for an existing destination blob. If the ETag for the destination blob does not match the ETag specified for If-Match, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-modified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has been modified since the specified date/time. If the destination blob has not been modified, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value does not match the ETag value for the destination blob. Specify the wildcard character (\*) to perform the operation only if the destination blob does not exist. If the specified condition isn't met, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-unmodified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has not been modified since the specified date/time. If the destination blob has been modified, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --source-if-match
-    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the source blob only if its ETag matches the value specified. If the ETag values do not match, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+    summary: 'A URL of up to 2 KB in length that specifies an Azure file or blob. The value should be URL-encoded as it would appear in a request URI. If the source is in another account, the source must either be public or must be authenticated via a shared access signature. If the source is public, no authentication is required. Examples: `https://myaccount.blob.core.windows.net/mycontainer/myblob`, `https://myaccount.blob.core.windows.net/mycontainer/myblob?snapshot=<DateTime>`, `https://otheraccount.blob.core.windows.net/mycontainer/myblob?sastoken`.'
     description: ''
-  - name: --source-if-modified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has been modified since the specified date/time.
-    description: ''
-  - name: --source-if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify this conditional header to copy the blob only if its ETag does not match the value specified. If the values are identical, the Blob service returns status code 412 (Precondition Failed). This header cannot be specified if the source is an Azure File.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --source-if-unmodified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the source blob has not been modified since the specified date/time.
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_copy_start-batch
+  name: az storage blob copy start-batch
+  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
+  description: ''
+  syntax: >-
+    az storage blob copy start-batch [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--destination-container]
+                                     [--destination-path]
+                                     [--dryrun]
+                                     [--pattern]
+                                     [--sas-token]
+                                     [--source-account-key]
+                                     [--source-account-name]
+                                     [--source-container]
+                                     [--source-sas]
+                                     [--source-share]
+                                     [--source-uri]
+                                     [--subscription]
+  examples:
+  - summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs. (autogenerated)
+    syntax: az storage blob copy start-batch --account-key 00000000 --account-name MyAccount --destination-container MyDestinationContainer --source-account-key MySourceKey --source-account-name MySourceAccount --source-container MySourceContainer
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -150,41 +215,21 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
-  description: ''
-  langs:
-  - azurecli
-  examples:
-  - summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs. (autogenerated)
-    syntax:
-      content: az storage blob copy start-batch --account-key 00000000 --account-name MyAccount --destination-container MyDestinationContainer --source-account-key MySourceKey --source-account-name MySourceAccount --source-container MySourceContainer
-  parameters:
   - name: --destination-container -c
     summary: The blob container where the selected source files or blobs will be copied to.
     description: ''
   - name: --destination-path
-    summary: The destination path that will be appended to the blob name.
+    summary: The destination path that will be prepended to the blob name.
     description: ''
   - name: --dryrun
     summary: List the files or blobs to be uploaded. No actual data transfer will occur.
     description: ''
   - name: --pattern
-    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
+    summary: The pattern used for globbing files or blobs in the source. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
     description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --source-account-key
     summary: The account key for the source storage account.
     description: ''
@@ -203,37 +248,14 @@ items:
   - name: --source-uri
     summary: A URI specifying a file share or blob container from which the files or blobs are copied.
     description: If the source is in another account, the source must either be public or be authenticated by using a shared access signature.
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_copy_cancel
-  name: az storage blob copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_copy_start
-  name: az storage blob copy start
-  summary: Copies a blob asynchronously. Use `az storage blob show` to check the status of the blobs.
-- uid: az_storage_blob_copy_start_batch
-  name: az storage blob copy start-batch
-  summary: Copy multiple blobs to a blob container. Use `az storage blob show` to check the status of the blobs.
+- az_storage_blob_copy_cancel
+- az_storage_blob_copy_start
+- az_storage_blob_copy_start-batch
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -249,10 +271,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob copy operations. Use `az storage blob show` to check the status of the blobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory.yml
new file mode 100644
index 0000000000..caa542c0c3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory.yml
@@ -0,0 +1,555 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_directory
+name: az storage blob directory
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob directory** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage blob directories in storage account container.
+description: To use the directory commands, please make sure your storage account type is StorageV2.
+directCommands:
+- uid: az_storage_blob_directory_create
+  name: az storage blob directory create
+  summary: Create a storage blob directory in a storage container.
+  description: Create a storage blob directory which can contain other directories or blobs in a storage container.
+  syntax: >-
+    az storage blob directory create --container-name
+                                     --directory-path
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--lease-id]
+                                     [--metadata]
+                                     [--permissions]
+                                     [--sas-token]
+                                     [--timeout]
+                                     [--umask]
+  examples:
+  - summary: Create a storage blob directory in a storage container.
+    syntax: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  - summary: Create a storage blob directory with permissions and umask.
+    syntax: az storage blob directory create -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount --permissions rwxrwxrwx --umask 0000
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --lease-id
+    summary: Required if the directory to be overwritten has an active lease.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --permissions
+    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. Sets POSIX access permissions for the file owner, the file owning group, and others. Each class may be granted read, write, or execute permission. The sticky bit is also supported. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --umask
+    defaultValue: "0027"
+    summary: Optional and only valid if Hierarchical Namespace is enabled for the account. The umask restricts permission settings for file and directory, and will only be applied when default Acl does not exist in parent directory. If the umask bit has set, it means that the corresponding permission will be disabled. In this way, the resulting permission is given by p & ^u, where p is the permission and u is the umask. Only 4-digit octal notation (e.g. 0022) is supported here.
+    description: ''
+- uid: az_storage_blob_directory_delete
+  name: az storage blob directory delete
+  summary: Delete a storage blob directory in a storage container.
+  description: This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, then the delete operation can be atomic and instantaneous; if not, the operation is performed in batches and a continuation token could be returned.
+  syntax: >-
+    az storage blob directory delete --container-name
+                                     --directory-path
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--fail-not-exist]
+                                     [--if-match]
+                                     [--if-modified-since]
+                                     [--if-none-match]
+                                     [--if-unmodified-since]
+                                     [--lease-id]
+                                     [--marker]
+                                     [--recursive]
+                                     [--sas-token]
+                                     [--timeout]
+  examples:
+  - summary: Delete a storage blob directory in a storage container.
+    syntax: az storage blob directory delete -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --fail-not-exist
+    summary: Specify whether to throw an exception when the directory doesn't exist.
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the directory has an active lease.
+    description: ''
+  - name: --marker
+    summary: Optional. When deleting a directory without the Hierarchical Namespace, the number of paths that are deleted with each invocation is limited. If the number of paths to be deleted exceeds this limit, a continuation token is returned. When a continuation token is returned, it must be specified in a subsequent invocation of the delete operation to continue deleting the directory.
+    description: ''
+  - name: --recursive
+    summary: If "true", all paths beneath the directory will be deleted. If "false" and the directory is non-empty, an error occurs.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_download
+  name: az storage blob directory download
+  summary: Download blobs to a local file path.
+  description: ''
+  syntax: >-
+    az storage blob directory download --container
+                                       --destination-path
+                                       --source-path
+                                       [--account-key]
+                                       [--account-name]
+                                       [--auth-mode {key, login}]
+                                       [--connection-string]
+                                       [--recursive]
+                                       [--sas-token]
+  examples:
+  - summary: Download a single blob in a storage blob directory.
+    syntax: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/blob" -d "<local-path>"
+  - summary: Download the entire directory in a storage container.
+    syntax: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s SourceDirectoryPath -d "<local-path>" --recursive
+  - summary: Download an entire subdirectory of a storage blob directory.
+    syntax: az storage blob directory download -c MyContainer --account-name MyStorageAccount -s "path/to/subdirectory" -d "<local-path>" --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The download source container.
+    description: ''
+  - isRequired: true
+    name: --destination-path -d
+    summary: The destination local directory path to download.
+    description: ''
+  - isRequired: true
+    name: --source-path -s
+    summary: The download source directory path. It should be an absolute path to container.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively download blobs. If enabled, all the blobs including the blobs in subdirectories will be downloaded.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_blob_directory_exists
+  name: az storage blob directory exists
+  summary: Check for the existence of a blob directory in a storage container.
+  description: ''
+  syntax: >-
+    az storage blob directory exists --container-name
+                                     --directory-path
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--sas-token]
+                                     [--snapshot]
+                                     [--timeout]
+  examples:
+  - summary: Check for the existence of a blob directory in a storage container.
+    syntax: az storage blob directory exists -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the snapshot.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_list
+  name: az storage blob directory list
+  summary: List blobs and blob subdirectories in a storage directory.
+  description: ''
+  syntax: >-
+    az storage blob directory list --container-name
+                                   --directory-path
+                                   [--account-key]
+                                   [--account-name]
+                                   [--auth-mode {key, login}]
+                                   [--connection-string]
+                                   [--delimiter]
+                                   [--include]
+                                   [--marker]
+                                   [--num-results]
+                                   [--prefix]
+                                   [--sas-token]
+                                   [--timeout]
+  examples:
+  - summary: List blobs and blob subdirectories in a storage directory.
+    syntax: az storage blob directory list -c MyContainer -d DestinationDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --delimiter
+    summary: When the request includes this parameter, the operation returns a BlobPrefix element in the result list that acts as a placeholder for all blobs whose names begin with the same substring up to the appearance of the delimiter character. The delimiter may be a single character or a string.
+    description: ''
+  - name: --include
+    defaultValue: mc
+    summary: Specifies one or more additional datasets to include in the response.
+    description: ''
+  - name: --marker
+    summary: An opaque continuation token. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
+    description: ''
+  - name: --num-results
+    defaultValue: "5000"
+    summary: Specifies the maximum number of results to return. Provide "\*" to return all.
+    description: ''
+  - name: --prefix
+    summary: Filters the results to return only blobs whose names begin with the specified prefix.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_move
+  name: az storage blob directory move
+  summary: Move a storage directory to another storage blob directory in a storage container.
+  description: Move a storage directory and all its content (which can contain other directories or blobs) to another storage blob directory in a storage container. This operation's behavior is different depending on whether Hierarchical Namespace is enabled; if yes, the move operation is atomic and no marker is returned; if not, the operation is performed in batches and a continuation token could be returned.
+  syntax: >-
+    az storage blob directory move --container-name
+                                   --destination-path
+                                   --source-path
+                                   [--account-key]
+                                   [--account-name]
+                                   [--auth-mode {key, login}]
+                                   [--connection-string]
+                                   [--lease-id]
+                                   [--move-mode {legacy, posix}]
+                                   [--sas-token]
+                                   [--source-if-match]
+                                   [--source-if-modified-since]
+                                   [--source-if-none-match]
+                                   [--source-if-unmodified-since]
+                                   [--source-lease-id]
+                                   [--timeout]
+  examples:
+  - summary: Move a storage directory to another storage blob directory in a storage container.
+    syntax: az storage blob directory move -c MyContainer -d my-new-directory -s dir --account-name MyStorageAccount
+  - summary: Move a storage subdirectory to another storage blob directory in a storage container.
+    syntax: az storage blob directory move -c MyContainer -d my-new-directory -s dir/subdirectory --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --destination-path -d
+    summary: The destination blob directory path. It can be a directory or subdirectory name, e.g. dir, dir/subdir. If the destination path exists and is empty, the source will be moved into the destination path. If the destination path does not exist, the destination path will be created and overwritten by the source. To control the move operation for nonempty path, you can use --move-mode to determine its behavior.
+    description: ''
+  - isRequired: true
+    name: --source-path -s
+    summary: The source blob directory path.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --lease-id
+    summary: A lease ID for destination directory_path. The destination directory_path must have an active lease and the lease ID must match.
+    description: ''
+  - name: --move-mode
+    defaultValue: posix
+    parameterValueGroup: legacy, posix
+    summary: Valid only when namespace is enabled. This parameter determines the behavior of the move operation. If the destination directory is empty, for both two mode, the destination directory will be overwritten. But if the destination directory is not empty, in legacy mode the move operation will fail and in posix mode, the source directory will be moved into the destination directory.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --source-if-match
+    summary: Optional. An ETag value. Specify this header to perform the move operation only if the source's ETag matches the value specified.
+    description: ''
+  - name: --source-if-modified-since
+    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has been modified since the specified date and time.
+    description: ''
+  - name: --source-if-none-match
+    summary: Optional. An ETag value or the special wildcard ("\*") value. Specify this header to perform the move operation only if the source's ETag does not match the value specified.
+    description: ''
+  - name: --source-if-unmodified-since
+    summary: Optional. A date and time value. Specify this header to perform the move operation only if the source has not been modified since the specified date and time.
+    description: ''
+  - name: --source-lease-id
+    summary: Optional. A lease ID for the source_path. The source_path must have an active lease and the lease ID must match.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_show
+  name: az storage blob directory show
+  summary: Show a storage blob directory properties in a storage container.
+  description: ''
+  syntax: >-
+    az storage blob directory show --container-name
+                                   --directory-path
+                                   [--account-key]
+                                   [--account-name]
+                                   [--auth-mode {key, login}]
+                                   [--connection-string]
+                                   [--if-match]
+                                   [--if-modified-since]
+                                   [--if-none-match]
+                                   [--if-unmodified-since]
+                                   [--lease-id]
+                                   [--sas-token]
+                                   [--timeout]
+  examples:
+  - summary: Show a storage blob directory properties in a storage container.
+    syntax: az storage blob directory show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform theoperation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to performthe operation only if the resource's ETag does not match the value specified. Specify the wildcardcharacter (\*) to perform the operation only if the resource does not exist, and fail the operationif it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_upload
+  name: az storage blob directory upload
+  summary: Upload blobs or subdirectories to a storage blob directory.
+  description: ''
+  syntax: >-
+    az storage blob directory upload --container
+                                     --destination-path
+                                     --source
+                                     [--account-key]
+                                     [--account-name]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--recursive]
+                                     [--sas-token]
+  examples:
+  - summary: Upload a single blob to a storage blob directory.
+    syntax: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file" -d directory
+  - summary: Upload a local directory to a storage blob directory.
+    syntax: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/directory" -d directory --recursive
+  - summary: Upload a set of files in a local directory to a storage blob directory.
+    syntax: az storage blob directory upload -c MyContainer --account-name MyStorageAccount -s "path/to/file*" -d directory --recursive
+  requiredParameters:
+  - isRequired: true
+    name: --container -c
+    summary: The upload destination container.
+    description: ''
+  - isRequired: true
+    name: --destination-path -d
+    summary: The upload destination directory path. It should be an absolute path to container. If the specified destination path does not exist, a new directory path will be created.
+    description: ''
+  - isRequired: true
+    name: --source -s
+    summary: The source file path to upload from.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --recursive -r
+    summary: Recursively upload blobs. If enabled, all the blobs including the blobs in subdirectories will be uploaded.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+commands:
+- az_storage_blob_directory_access
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+- az_storage_blob_directory_create
+- az_storage_blob_directory_delete
+- az_storage_blob_directory_download
+- az_storage_blob_directory_exists
+- az_storage_blob_directory_list
+- az_storage_blob_directory_metadata
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+- az_storage_blob_directory_move
+- az_storage_blob_directory_show
+- az_storage_blob_directory_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: To use the directory commands, please make sure your storage account type is StorageV2.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory/access.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory/access.yml
new file mode 100644
index 0000000000..754b33c564
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory/access.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_directory_access
+name: az storage blob directory access
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob directory access** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
+description: ''
+directCommands:
+- uid: az_storage_blob_directory_access_set
+  name: az storage blob directory access set
+  summary: Set the access control properties of a directory.
+  description: ''
+  syntax: >-
+    az storage blob directory access set --acl-spec
+                                         --container-name
+                                         --directory-path
+                                         [--account-key]
+                                         [--account-name]
+                                         [--auth-mode {key, login}]
+                                         [--connection-string]
+                                         [--if-match]
+                                         [--if-modified-since]
+                                         [--if-none-match]
+                                         [--if-unmodified-since]
+                                         [--lease-id]
+                                         [--sas-token]
+                                         [--timeout]
+  examples:
+  - summary: Set the access control properties of a directory.
+    syntax: az storage blob directory access set -a "user::rwx,group::r--,other::---" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_access_show
+  name: az storage blob directory access show
+  summary: Show the access control properties of a directory.
+  description: ''
+  syntax: >-
+    az storage blob directory access show --container-name
+                                          --directory-path
+                                          [--account-key]
+                                          [--account-name]
+                                          [--auth-mode {key, login}]
+                                          [--connection-string]
+                                          [--if-match]
+                                          [--if-modified-since]
+                                          [--if-none-match]
+                                          [--if-unmodified-since]
+                                          [--lease-id]
+                                          [--sas-token]
+                                          [--timeout]
+                                          [--user-principle-names]
+  examples:
+  - summary: Show the access control properties of a directory.
+    syntax: az storage blob directory access show -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --user-principle-names
+    summary: Valid only when Hierarchical Namespace is enabled for the account. If "true", the user identity values returned for owner, group, and acl will be transformed from Azure Active Directory Object IDs to User Principal Names. If "false", the values will be returned as Azure Active Directory Object IDs. The default value is false. Note that group and application Object IDs are not translated because they do not have unique friendly names.
+    description: ''
+- uid: az_storage_blob_directory_access_update
+  name: az storage blob directory access update
+  summary: Update the access control properties of a directory.
+  description: ''
+  syntax: >-
+    az storage blob directory access update --container-name
+                                            --directory-path
+                                            [--account-key]
+                                            [--account-name]
+                                            [--acl-spec]
+                                            [--auth-mode {key, login}]
+                                            [--connection-string]
+                                            [--group]
+                                            [--if-match]
+                                            [--if-modified-since]
+                                            [--if-none-match]
+                                            [--if-unmodified-since]
+                                            [--lease-id]
+                                            [--owner]
+                                            [--permissions]
+                                            [--sas-token]
+                                            [--timeout]
+  examples:
+  - summary: Update the access permissions of a directory.
+    syntax: az storage blob directory access update --permissions "rwxrwxrwx" -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning user of a directory.
+    syntax: az storage blob directory access update --owner [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  - summary: Update the owning group of a directory.
+    syntax: az storage blob directory access update --group [entityId/UPN] -d MyDirectoryPath -c MyContainer --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --acl-spec -a
+    summary: The ACL specification to set on the path in the format "[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,[default:]user|group|other|mask:[entity id or UPN]:r|-w|-x|-,...". e.g."user::rwx,user:john.doe@contoso:rwx,group::r--,other::---,mask::rwx".
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --group
+    summary: The owning group for the directory.
+    description: ''
+  - name: --if-match
+    summary: An ETag value. Specify this header to perform the operation only if the resource's ETag matches the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value or the special wildcard ("\*") value. Specify this header to perform the operation only if the resource's ETag does not match the value specified. The ETag must be specified in quotes.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the path has an active lease.
+    description: ''
+  - name: --owner
+    summary: The owning user for the directory.
+    description: ''
+  - name: --permissions
+    summary: The POSIX access permissions for the file owner,the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit octal notation (e.g. 0766) are supported.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_blob_directory_access_set
+- az_storage_blob_directory_access_show
+- az_storage_blob_directory_access_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the access control properties of a directory when Hierarchical Namespace is enabled.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory/metadata.yml
new file mode 100644
index 0000000000..0bcade77b2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/directory/metadata.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_directory_metadata
+name: az storage blob directory metadata
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage blob directory metadata** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage directory metadata.
+description: ''
+directCommands:
+- uid: az_storage_blob_directory_metadata_show
+  name: az storage blob directory metadata show
+  summary: Show all user-defined metadata for the specified blob directory.
+  description: ''
+  syntax: >-
+    az storage blob directory metadata show --container-name
+                                            --directory-path
+                                            [--account-key]
+                                            [--account-name]
+                                            [--auth-mode {key, login}]
+                                            [--connection-string]
+                                            [--cpk]
+                                            [--if-match]
+                                            [--if-modified-since]
+                                            [--if-none-match]
+                                            [--if-unmodified-since]
+                                            [--lease-id]
+                                            [--sas-token]
+                                            [--snapshot]
+                                            [--timeout]
+  examples:
+  - summary: Show all user-defined metadata for the specified blob directory.
+    syntax: az storage blob directory metadata show -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --cpk
+    summary: Decrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_blob_directory_metadata_update
+  name: az storage blob directory metadata update
+  summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
+  description: ''
+  syntax: >-
+    az storage blob directory metadata update --container-name
+                                              --directory-path
+                                              [--account-key]
+                                              [--account-name]
+                                              [--auth-mode {key, login}]
+                                              [--connection-string]
+                                              [--cpk]
+                                              [--if-match]
+                                              [--if-modified-since]
+                                              [--if-none-match]
+                                              [--if-unmodified-since]
+                                              [--lease-id]
+                                              [--metadata]
+                                              [--sas-token]
+                                              [--timeout]
+  examples:
+  - summary: Set user-defined metadata for the specified blob directory as one or more name-value pairs.
+    syntax: az storage blob directory metadata update --metadata tag1=value1 -c MyContainer -d MyDirectoryPath --account-name MyStorageAccount
+  requiredParameters:
+  - isRequired: true
+    name: --container-name -c
+    summary: The container name.
+    description: ''
+  - isRequired: true
+    name: --directory-path -d
+    summary: The directory path name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --cpk
+    summary: Encrypts the data on the service-side with the given key. Use of customer-provided keys must be done over HTTPS. As the encryption key itself is provided in the request, a secure connection must be established to transfer the key.
+    description: ''
+  - name: --if-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
+    description: ''
+  - name: --if-modified-since
+    summary: Alter only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag does not match the value specified. Specify the wildcard character (\*) to perform the operation only if the resource does not exist, and fail the operation if it does exist.
+    description: ''
+  - name: --if-unmodified-since
+    summary: Alter only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_blob_directory_metadata_show
+- az_storage_blob_directory_metadata_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage directory metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/incremental-copy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/incremental-copy.yml
index ea07e4cf29..b01cd31857 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/incremental-copy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/incremental-copy.yml
@@ -1,21 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_incremental_copy
-  name: az storage blob incremental-copy
-  summary: Manage blob incremental copy operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_incremental_copy_cancel
-  - az_storage_blob_incremental_copy_start
-- uid: az_storage_blob_incremental_copy_cancel
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_incremental-copy
+name: az storage blob incremental-copy
+summary: Manage blob incremental copy operations.
+description: ''
+directCommands:
+- uid: az_storage_blob_incremental-copy_cancel
   name: az storage blob incremental-copy cancel
   summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob incremental-copy cancel --container-name
+                                            --copy-id
+                                            --name
+                                            [--account-key]
+                                            [--account-name]
+                                            [--connection-string]
+                                            [--lease-id]
+                                            [--sas-token]
+                                            [--subscription]
+                                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -28,12 +32,7 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the destination blob has an active infinite lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -43,32 +42,54 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: Required if the destination blob has an active infinite lease.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_incremental_copy_start
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_incremental-copy_start
   name: az storage blob incremental-copy start
   summary: Copies an incremental copy of a blob asynchronously.
   description: This operation returns a copy operation properties object, including a copy ID you can use to check or abort the copy operation. The Blob service copies blobs on a best-effort basis. The source blob for an incremental copy operation must be a page blob. Call get_blob_properties on the destination blob to check the status of the copy operation. The final blob will be committed when the copy completes.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob incremental-copy start --destination-blob
+                                           --destination-container
+                                           [--account-key]
+                                           [--account-name]
+                                           [--connection-string]
+                                           [--destination-if-match]
+                                           [--destination-if-modified-since]
+                                           [--destination-if-none-match]
+                                           [--destination-if-unmodified-since]
+                                           [--destination-lease-id]
+                                           [--metadata]
+                                           [--sas-token]
+                                           [--source-account-key]
+                                           [--source-account-name]
+                                           [--source-blob]
+                                           [--source-container]
+                                           [--source-lease-id]
+                                           [--source-sas]
+                                           [--source-snapshot]
+                                           [--source-uri]
+                                           [--subscription]
+                                           [--timeout]
   examples:
   - summary: Upload all files that end with .py unless blob exists and has been modified since given date.
-    syntax:
-      content: az storage blob incremental-copy start --source-container MySourceContainer --source-blob MyBlob --source-account-name MySourceAccount --source-account-key MySourceKey --source-snapshot MySnapshot --destination-container MyDestinationContainer --destination-blob MyDestinationBlob
+    syntax: az storage blob incremental-copy start --source-container MySourceContainer --source-blob MyBlob --source-account-name MySourceAccount --source-account-key MySourceKey --source-snapshot MySnapshot --destination-container MyDestinationContainer --destination-blob MyDestinationBlob
   - summary: Copies an incremental copy of a blob asynchronously. (autogenerated)
-    syntax:
-      content: az storage blob incremental-copy start --account-key 00000000 --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --source-account-key MySourceKey --source-account-name MySourceAccount --source-blob MyBlob --source-container MySourceContainer --source-snapshot MySnapshot
-  parameters:
+    syntax: az storage blob incremental-copy start --account-key 00000000 --account-name MyAccount --destination-blob MyDestinationBlob --destination-container MyDestinationContainer --source-account-key MySourceKey --source-account-name MySourceAccount --source-blob MyBlob --source-container MySourceContainer --source-snapshot MySnapshot
+  - summary: Copy an incremental copy of a blob asynchronously. (autogenerated)
+    syntax: az storage blob incremental-copy start --connection-string myconnectionstring --destination-blob mydestinationblob --destination-container MyDestinationContainer --source-uri https://storage.blob.core.windows.net/photos
+  requiredParameters:
   - isRequired: true
     name: --destination-blob -b
     summary: Name of the destination blob. If the exists, it will be overwritten.
@@ -77,14 +98,36 @@ items:
     name: --destination-container -c
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --destination-if-match
+    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value matches the ETag value for an existing destination blob. If the ETag for the destination blob does not match the ETag specified for If-Match, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-modified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has been modified since the specified date/time. If the destination blob has not been modified, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-none-match
+    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value does not match the ETag value for the destination blob. Specify the wildcard character (\*) to perform the operation only if the destination blob does not exist. If the specified condition isn't met, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
+  - name: --destination-if-unmodified-since
+    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has not been modified since the specified ate/time. If the destination blob has been modified, the Blob service returns status code 412 (Precondition Failed).
+    description: ''
   - name: --destination-lease-id
     summary: The lease ID specified for this header must match the lease ID of the destination blob. If the request does not include the lease ID or it is not valid, the operation fails with status code 412 (Precondition Failed).
     description: ''
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --source-account-key
     summary: The storage account key of the source blob.
@@ -108,48 +151,18 @@ items:
     summary: The blob snapshot for the source storage account.
     description: ''
   - name: --source-uri -u
-    summary: 'A URL of up to 2 KB in length that specifies an Azure page blob. The value should be URL-encoded as it would appear in a request URI. The copy source must be a snapshot and include a valid SAS token or be public. Example: <a href="https://myaccount.blob.core.windows.net/mycontainer/myblob">https://myaccount.blob.core.windows.net/mycontainer/myblob</a>?snapshot=&lt;DateTime&gt;&amp;sastoken.'
-    description: ''
-  - name: --destination-if-match
-    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value matches the ETag value for an existing destination blob. If the ETag for the destination blob does not match the ETag specified for If-Match, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-modified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has been modified since the specified date/time. If the destination blob has not been modified, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-none-match
-    summary: An ETag value, or the wildcard character (\*). Specify an ETag value for this conditional header to copy the blob only if the specified ETag value does not match the ETag value for the destination blob. Specify the wildcard character (\*) to perform the operation only if the destination blob does not exist. If the specified condition isn't met, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --destination-if-unmodified-since
-    summary: A DateTime value. Azure expects the date value passed in to be UTC. If timezone is included, any non-UTC datetimes will be converted to UTC. If a date is passed in without timezone info, it is assumed to be UTC. Specify this conditional header to copy the blob only if the destination blob has not been modified since the specified ate/time. If the destination blob has been modified, the Blob service returns status code 412 (Precondition Failed).
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    summary: 'A URL of up to 2 KB in length that specifies an Azure page blob. The value should be URL-encoded as it would appear in a request URI. The copy source must be a snapshot and include a valid SAS token or be public. Example: `https://myaccount.blob.core.windows.net/mycontainer/myblob?snapshot=<DateTime>&sastoken`.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_incremental_copy_cancel
-  name: az storage blob incremental-copy cancel
-  summary: Aborts a pending copy_blob operation, and leaves a destination blob with zero length and full metadata.
-- uid: az_storage_blob_incremental_copy_start
-  name: az storage blob incremental-copy start
-  summary: Copies an incremental copy of a blob asynchronously.
+- az_storage_blob_incremental-copy_cancel
+- az_storage_blob_incremental-copy_start
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -165,10 +178,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob incremental copy operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob incremental copy operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/lease.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/lease.yml
index a36ed13739..a74b227f70 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/lease.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/lease.yml
@@ -1,24 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_lease
-  name: az storage blob lease
-  summary: Manage storage blob leases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_lease_acquire
-  - az_storage_blob_lease_break
-  - az_storage_blob_lease_change
-  - az_storage_blob_lease_release
-  - az_storage_blob_lease_renew
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_lease
+name: az storage blob lease
+summary: Manage storage blob leases.
+description: ''
+directCommands:
 - uid: az_storage_blob_lease_acquire
   name: az storage blob lease acquire
-  summary: Requests a new lease.
-  description: If the blob does not have an active lease, the Blob service creates a lease on the blob and returns a new lease ID.
-  langs:
-  - azurecli
-  parameters:
+  summary: Request a new lease.
+  description: ''
+  syntax: >-
+    az storage blob lease acquire --blob-name
+                                  --container-name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--lease-duration]
+                                  [--proposed-lease-id]
+                                  [--sas-token]
+                                  [--subscription]
+                                  [--timeout]
+  examples:
+  - summary: Request a new lease.
+    syntax: az storage blob lease acquire -b myblob -c mycontainer --account-name mystorageaccount --account-key 0000-0000
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -27,15 +35,15 @@ items:
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-duration
-    defaultValue: "-1"
-    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --proposed-lease-id
-    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -49,14 +57,12 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-duration
+    defaultValue: "-1"
+    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --proposed-lease-id
+    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -64,19 +70,29 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_break
   name: az storage blob lease break
   summary: Breaks the lease, if the blob has an active lease.
   description: Once a lease is broken, it cannot be renewed. Any authorized request can break the lease; the request is not required to specify a matching lease ID. When a lease is broken, the lease break period is allowed to elapse, during which time no lease operation except break and release can be performed on the blob. When a lease is successfully broken, the response indicates the interval in seconds until a new lease can be acquired.   A lease that has been broken can also be released, in which case another client may immediately acquire the lease on the blob.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob lease break --blob-name
+                                --container-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--if-match]
+                                [--if-modified-since]
+                                [--if-none-match]
+                                [--if-unmodified-since]
+                                [--lease-break-period]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -85,11 +101,15 @@ items:
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-break-period
-    summary: For a break operation, this is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -103,14 +123,8 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-break-period
+    summary: For a break operation, this is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -118,19 +132,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_change
   name: az storage blob lease change
   summary: Changes the lease ID of an active lease.
   description: A change must include the current lease ID and a new lease ID.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob lease change --blob-name
+                                 --container-name
+                                 --lease-id
+                                 --proposed-lease-id
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--if-match]
+                                 [--if-modified-since]
+                                 [--if-none-match]
+                                 [--if-unmodified-since]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -147,8 +172,15 @@ items:
     name: --proposed-lease-id
     summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -162,34 +194,35 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_release
   name: az storage blob lease release
   summary: Releases the lease.
   description: The lease may be released if the lease ID specified on the request matches that associated with the blob. Releasing the lease allows another client to immediately acquire the lease for the blob as soon as the release is complete.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob lease release --blob-name
+                                  --container-name
+                                  --lease-id
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--sas-token]
+                                  [--subscription]
+                                  [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -202,8 +235,15 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -217,34 +257,38 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_lease_renew
   name: az storage blob lease renew
-  summary: Renews the lease.
-  description: The lease can be renewed if the lease ID specified on the request matches that associated with the blob. Note that the lease may be renewed even if it has expired as long as the blob has not been modified or leased again since the expiration of that lease. When you renew a lease, the lease duration clock resets.
-  langs:
-  - azurecli
-  parameters:
+  summary: Renew the lease.
+  description: ''
+  syntax: >-
+    az storage blob lease renew --blob-name
+                                --container-name
+                                --lease-id
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--if-match]
+                                [--if-modified-since]
+                                [--if-none-match]
+                                [--if-unmodified-since]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  examples:
+  - summary: Renew the lease.
+    syntax: az storage blob lease renew -b myblob -c mycontainer --lease-id "32fe23cd-4779-4919-adb3-357e76c9b1bb" --account-name mystorageaccount --account-key 0000-0000
+  requiredParameters:
   - isRequired: true
     name: --blob-name -b
     summary: The blob name.
@@ -257,8 +301,15 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -272,43 +323,22 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_lease_acquire
-  name: az storage blob lease acquire
-  summary: Requests a new lease.
-- uid: az_storage_blob_lease_break
-  name: az storage blob lease break
-  summary: Breaks the lease, if the blob has an active lease.
-- uid: az_storage_blob_lease_change
-  name: az storage blob lease change
-  summary: Changes the lease ID of an active lease.
-- uid: az_storage_blob_lease_release
-  name: az storage blob lease release
-  summary: Releases the lease.
-- uid: az_storage_blob_lease_renew
-  name: az storage blob lease renew
-  summary: Renews the lease.
+- az_storage_blob_lease_acquire
+- az_storage_blob_lease_break
+- az_storage_blob_lease_change
+- az_storage_blob_lease_release
+- az_storage_blob_lease_renew
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -324,10 +354,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage blob leases.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage blob leases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/metadata.yml
index f58ea692b1..3042caa51c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/metadata.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/metadata.yml
@@ -1,21 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_metadata
-  name: az storage blob metadata
-  summary: Manage blob metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_metadata_show
-  - az_storage_blob_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_metadata
+name: az storage blob metadata
+summary: Manage blob metadata.
+description: ''
+directCommands:
 - uid: az_storage_blob_metadata_show
   name: az storage blob metadata show
   summary: Returns all user-defined metadata for the specified blob or snapshot.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob metadata show --container-name
+                                  --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--if-match]
+                                  [--if-modified-since]
+                                  [--if-none-match]
+                                  [--if-unmodified-since]
+                                  [--lease-id]
+                                  [--query-examples]
+                                  [--sas-token]
+                                  [--snapshot]
+                                  [--subscription]
+                                  [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -24,14 +33,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --snapshot
-    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -45,34 +55,45 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_blob_metadata_update
   name: az storage blob metadata update
   summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage blob metadata update --container-name
+                                    --name
+                                    [--account-key]
+                                    [--account-name]
+                                    [--connection-string]
+                                    [--if-match]
+                                    [--if-modified-since]
+                                    [--if-none-match]
+                                    [--if-unmodified-since]
+                                    [--lease-id]
+                                    [--metadata]
+                                    [--sas-token]
+                                    [--subscription]
+                                    [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -81,14 +102,15 @@ items:
     name: --name -n
     summary: The blob name.
     description: ''
-  - name: --lease-id
-    summary: Required if the blob has an active lease.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-match
     summary: An ETag value, or the wildcard character (\*). Specify this header to perform the operation only if the resource's ETag matches the value specified.
@@ -102,14 +124,11 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: Required if the blob has an active lease.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -117,19 +136,13 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_metadata_show
-  name: az storage blob metadata show
-  summary: Returns all user-defined metadata for the specified blob or snapshot.
-- uid: az_storage_blob_metadata_update
-  name: az storage blob metadata update
-  summary: Sets user-defined metadata for the specified blob as one or more name-value pairs.
+- az_storage_blob_metadata_show
+- az_storage_blob_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -145,10 +158,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties.yml
index f05dd14e99..2a71b3f054 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties.yml
@@ -1,24 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_blob_service_properties
-  name: az storage blob service-properties
-  summary: Manage storage blob service properties.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_blob_service_properties_show
-  - az_storage_blob_service_properties_update
-- uid: az_storage_blob_service_properties_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_service-properties
+name: az storage blob service-properties
+summary: Manage storage blob service properties.
+description: ''
+directCommands:
+- uid: az_storage_blob_service-properties_show
   name: az storage blob service-properties show
   summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  syntax: >-
+    az storage blob service-properties show [--account-key]
+                                            [--account-name]
+                                            [--connection-string]
+                                            [--query-examples]
+                                            [--sas-token]
+                                            [--subscription]
+                                            [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -28,72 +26,75 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_blob_service_properties_update
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_blob_service-properties_update
   name: az storage blob service-properties update
   summary: Update storage blob service properties.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage blob service-properties update [--account-key]
+                                              [--account-name]
+                                              [--add]
+                                              [--connection-string]
+                                              [--force-string]
+                                              [--remove]
+                                              [--sas-token]
+                                              [--set]
+                                              [--subscription]
+                                              [--timeout]
   examples:
   - summary: Update storage blob service properties. (autogenerated)
-    syntax:
-      content: az storage blob service-properties update --404-document error.html --account-name mystorageccount --account-key 00000000 --index-document index.html --static-website true
-  parameters:
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage blob service-properties update --404-document error.html --account-name mystorageccount --account-key 00000000 --index-document index.html --static-website true
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_blob_service_properties_show
-  name: az storage blob service-properties show
-  summary: Gets the properties of a storage account's Blob service, including Azure Storage Analytics.
-- uid: az_storage_blob_service_properties_update
-  name: az storage blob service-properties update
-  summary: Update storage blob service properties.
+- az_storage_blob_service-properties_delete-policy
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+- az_storage_blob_service-properties_show
+- az_storage_blob_service-properties_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -109,10 +110,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage blob service properties.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage blob service properties.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties/delete-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties/delete-policy.yml
new file mode 100644
index 0000000000..8b995822c5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/service-properties/delete-policy.yml
@@ -0,0 +1,101 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_service-properties_delete-policy
+name: az storage blob service-properties delete-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-blob-preview** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az storage blob service-properties delete-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage storage blob delete-policy service properties.
+description: ''
+directCommands:
+- uid: az_storage_blob_service-properties_delete-policy_show
+  name: az storage blob service-properties delete-policy show
+  summary: Show the storage blob delete-policy.
+  description: ''
+  syntax: >-
+    az storage blob service-properties delete-policy show [--account-key]
+                                                          [--account-name]
+                                                          [--auth-mode {key, login}]
+                                                          [--connection-string]
+                                                          [--sas-token]
+  examples:
+  - summary: Show the storage blob delete-policy. (autogenerated)
+    syntax: az storage blob service-properties delete-policy show --account-name mystorageccount --account-key 00000000
+  - summary: Show the storage blob delete-policy. (autogenerated)
+    syntax: az storage blob service-properties delete-policy show --account-name mystorageccount --auth-mode login
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_blob_service-properties_delete-policy_update
+  name: az storage blob service-properties delete-policy update
+  summary: Update the storage blob delete-policy.
+  description: ''
+  syntax: >-
+    az storage blob service-properties delete-policy update [--account-key]
+                                                            [--account-name]
+                                                            [--auth-mode {key, login}]
+                                                            [--connection-string]
+                                                            [--days-retained]
+                                                            [--enable {false, true}]
+                                                            [--sas-token]
+  examples:
+  - summary: Update the storage blob delete-policy. (autogenerated)
+    syntax: az storage blob service-properties delete-policy update --account-name mystorageccount --account-key 00000000 --days-retained 7 --enable true
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --days-retained
+    summary: Number of days that soft-deleted blob will be retained. Must be in range [1,365].
+    description: ''
+  - name: --enable
+    parameterValueGroup: false, true
+    summary: Enables/disables soft-delete.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+commands:
+- az_storage_blob_service-properties_delete-policy_show
+- az_storage_blob_service-properties_delete-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage storage blob delete-policy service properties.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/blob/tag.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/tag.yml
new file mode 100644
index 0000000000..c72e5d9826
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/blob/tag.yml
@@ -0,0 +1,142 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_blob_tag
+name: az storage blob tag
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-blob-preview** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az storage blob tag** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage blob tags.
+description: ''
+directCommands:
+- uid: az_storage_blob_tag_list
+  name: az storage blob tag list
+  summary: Get tags on a blob or specific blob version, or snapshot.
+  description: ''
+  syntax: >-
+    az storage blob tag list [--account-key]
+                             [--account-name]
+                             [--auth-mode {key, login}]
+                             [--blob-url]
+                             [--connection-string]
+                             [--container-name]
+                             [--name]
+                             [--sas-token]
+                             [--snapshot]
+                             [--tags-condition]
+                             [--timeout]
+                             [--version-id]
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --blob-url
+    summary: The full endpoint URL to the Blob, including SAS token and snapshot if used. This could be either the primary endpoint, or the secondary endpoint depending on the current `location_mode`.
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --container-name -c
+    summary: The container name.
+    description: ''
+  - name: --name -n
+    summary: The blob name.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --snapshot
+    summary: The snapshot parameter is an opaque DateTime value that, when present, specifies the blob snapshot to retrieve.
+    description: ''
+  - name: --tags-condition
+    summary: Specify a SQL where clause on blob tags to operate only on blobs with a matching value.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --version-id
+    summary: An optional blob version ID. This parameter is only for versioning enabled account.
+    description: ''
+- uid: az_storage_blob_tag_set
+  name: az storage blob tag set
+  summary: Set tags on a blob or specific blob version, but not snapshot.
+  description: Each call to this operation replaces all existing tags attached to the blob. To remove all tags from the blob, call this operation with no tags set.
+  syntax: >-
+    az storage blob tag set --tags
+                            [--account-key]
+                            [--account-name]
+                            [--auth-mode {key, login}]
+                            [--blob-url]
+                            [--connection-string]
+                            [--container-name]
+                            [--name]
+                            [--sas-token]
+                            [--tags-condition]
+                            [--timeout]
+                            [--version-id]
+  requiredParameters:
+  - isRequired: true
+    name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Tags are case-sensitive. The tag set may contain at most 10 tags.  Tag keys must be between 1 and 128 characters, and tag values must be between 0 and 256 characters. Valid tag key and value characters include: lowercase and uppercase letters, digits (0-9), space (` `), plus (+), minus (-), period (.), solidus (/), colon (:), equals (=), underscore (_).'
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --blob-url
+    summary: The full endpoint URL to the Blob, including SAS token and snapshot if used. This could be either the primary endpoint, or the secondary endpoint depending on the current `location_mode`.
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --container-name -c
+    summary: The container name.
+    description: ''
+  - name: --name -n
+    summary: The blob name.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --tags-condition
+    summary: Specify a SQL where clause on blob tags to operate only on blobs with a matching value.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --version-id
+    summary: An optional blob version ID. This parameter is only for versioning enabled account.
+    description: ''
+commands:
+- az_storage_blob_tag_list
+- az_storage_blob_tag_set
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage blob tags.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/container.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/container.yml
index cd93a144d4..eb14377cf5 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/container.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/container.yml
@@ -1,72 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container
-  name: az storage container
-  summary: Manage blob storage containers.
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_create
-  - az_storage_container_delete
-  - az_storage_container_exists
-  - az_storage_container_generate_sas
-  - az_storage_container_list
-  - az_storage_container_set_permission
-  - az_storage_container_show
-  - az_storage_container_show_permission
+### YamlMime:AzureCLIGroup
+uid: az_storage_container
+name: az storage container
+summary: Manage blob storage containers.
+description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+directCommands:
 - uid: az_storage_container_create
   name: az storage container create
   summary: Create a container in a storage account.
   description: By default, container data is private ("off") to the account owner. Use "blob" to allow public read access for blobs. Use "container" to allow public read and list access to the entire container. You can configure the --public-access using `az storage container set-permission -n CONTAINER_NAME --public-access blob/container/off`.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container create --name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--default-encryption-scope]
+                                [--fail-on-exist]
+                                [--metadata]
+                                [--prevent-encryption-scope-override {false, true}]
+                                [--public-access {blob, container, off}]
+                                [--resource-group]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Create a storage container in a storage account.
-    syntax:
-      content: az storage container create -n MyStorageContainer
+    syntax: az storage container create -n mystoragecontainer
   - summary: Create a storage container in a storage account and return an error if the container already exists.
-    syntax:
-      content: az storage container create -n MyStorageContainer --fail-on-exist
+    syntax: az storage container create -n mystoragecontainer --fail-on-exist
   - summary: Create a storage container in a storage account and allow public read access for blobs.
-    syntax:
-      content: az storage container create -n MyStorageContainer --public-access blob
-  parameters:
+    syntax: az storage container create -n mystoragecontainer --public-access blob
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT.'
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --default-encryption-scope -d
+    summary: Default the container to use specified encryption scope for all writes.
+    description: ''
   - name: --fail-on-exist
     summary: Throw an exception if the container already exists.
     description: ''
   - name: --metadata
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --public-access
-    parameterValueGroup: blob, container, off
-    summary: Specifies whether data in the container may be accessed publicly.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --default-encryption-scope -d
-    summary: Default the container to use specified encryption scope for all writes.
-    description: ''
   - name: --prevent-encryption-scope-override -p
     parameterValueGroup: false, true
     summary: Block override of encryption scope from the container default.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+  - name: --public-access
+    parameterValueGroup: blob, container, off
+    summary: Specifies whether data in the container may be accessed publicly.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -74,53 +70,59 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_delete
   name: az storage container delete
   summary: Marks the specified container for deletion.
   description: The container and any blobs contained within it are later deleted during garbage collection.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container delete --name
+                                [--account-key]
+                                [--account-name]
+                                [--bypass-immutability-policy]
+                                [--connection-string]
+                                [--fail-not-exist]
+                                [--if-modified-since]
+                                [--if-unmodified-since]
+                                [--lease-id]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Marks the specified container for deletion. (autogenerated)
-    syntax:
-      content: az storage container delete --account-key 00000000 --account-name MyAccount --name MyContainer
-  parameters:
+    syntax: az storage container delete --account-key 00000000 --account-name MyAccount --name mycontainer
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --bypass-immutability-policy
     summary: Bypasses upcoming service behavior that will block a container from being deleted if it has a immutability-policy. Specifying this will ignore arguments aside from those used to identify the container ("--name", "--account-name").
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --fail-not-exist
     summary: Throw an exception if the container does not exist.
     description: ''
-  - name: --lease-id
-    summary: If specified, delete_container only succeeds if the container's lease is active and matches this ID. Required if the container has an active lease.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --if-modified-since
     summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --lease-id
+    summary: If specified, delete_container only succeeds if the container's lease is active and matches this ID. Required if the container has an active lease.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -128,30 +130,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_exists
   name: az storage container exists
   summary: Check for the existence of a storage container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container exists --name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Check for the existence of a storage container. (autogenerated)
-    syntax:
-      content: az storage container exists --account-name mystorageccount --account-key 00000000 --name mycontainer
-  parameters:
+    syntax: az storage container exists --account-name mystorageccount --account-key 00000000 --name mycontainer
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -167,38 +170,62 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_generate-sas
   name: az storage container generate-sas
   summary: Generate a SAS token for a storage container.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage container generate-sas --name
+                                      [--account-key]
+                                      [--account-name]
+                                      [--cache-control]
+                                      [--connection-string]
+                                      [--content-disposition]
+                                      [--content-encoding]
+                                      [--content-language]
+                                      [--content-type]
+                                      [--expiry]
+                                      [--https-only]
+                                      [--ip]
+                                      [--permissions]
+                                      [--policy-name]
+                                      [--sas-token]
+                                      [--start]
+                                      [--subscription]
   examples:
   - summary: Generate a sas token for blob container and use it to upload a blob.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        sas=`az storage container generate-sas -n mycontainer --https-only --permissions dlrw --expiry $end -o tsv`
+      sas=`az storage container generate-sas -n mycontainer --https-only --permissions dlrw --expiry $end -o tsv`
 
-        az storage blob upload -n MyBlob -c mycontainer -f file.txt --sas-token $sas
+      az storage blob upload -n MyBlob -c mycontainer -f file.txt --sas-token $sas
   - summary: Generate a shared access signature for the container (autogenerated)
-    syntax:
-      content: az storage container generate-sas --account-key 00000000 --account-name mystorageaccount --expiry 2020-01-01 --name mycontainer --permissions dlrw
-  parameters:
+    syntax: az storage container generate-sas --account-key 00000000 --account-name mystorageaccount --expiry 2020-01-01 --name mycontainer --permissions dlrw
+  - summary: Generate a SAS token for a storage container. (autogenerated)
+    syntax: az storage container generate-sas --account-name mystorageaccount --as-user --auth-mode login --expiry 2020-01-01 --name container1 --permissions dlrw
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessedusing this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessedusing this shared access signature.
     description: ''
@@ -226,9 +253,33 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the container's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_list
+  name: az storage container list
+  summary: List containers in a storage account.
+  description: ''
+  syntax: >-
+    az storage container list [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--include-metadata]
+                              [--marker]
+                              [--num-results]
+                              [--prefix]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -238,25 +289,6 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_list
-  name: az storage container list
-  summary: List containers in a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
   - name: --include-metadata
     summary: Specifies that container metadata be returned in the response.
     description: ''
@@ -270,50 +302,91 @@ items:
   - name: --prefix
     summary: Filters the results to return only containers whose names begin with the specified prefix.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_restore
+  name: az storage container restore
+  summary: Restores soft-deleted container.
+  description: "Operation will only be successful if used within the specified number of days set in the delete retention policy.  .. versionadded:: 12.4.0     This operation was introduced in API version '2019-12-12'."
+  syntax: >-
+    az storage container restore --deleted-version
+                                 --name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--sas-token]
+                                 [--timeout]
+  requiredParameters:
+  - isRequired: true
+    name: --deleted-version
+    summary: Specify the version of the deleted container to restore.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Specify the name of the deleted container to restore.
+    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_set_permission
+- uid: az_storage_container_set-permission
   name: az storage container set-permission
   summary: Sets the permissions for the specified container or stored access  policies that may be used with Shared Access Signatures.
   description: The permissions indicate whether blobs in a container may be accessed publicly.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container set-permission --name
+                                        [--account-key]
+                                        [--account-name]
+                                        [--connection-string]
+                                        [--if-modified-since]
+                                        [--if-unmodified-since]
+                                        [--lease-id]
+                                        [--public-access {blob, container, off}]
+                                        [--sas-token]
+                                        [--subscription]
+                                        [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, set_container_acl only succeeds if the container's lease is active and matches this ID.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --public-access
-    parameterValueGroup: blob, container, off
-    summary: Specifies whether data in the container may be accessed publicly.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-modified-since
     summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
@@ -321,14 +394,12 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-id
+    summary: If specified, set_container_acl only succeeds if the container's lease is active and matches this ID.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --public-access
+    parameterValueGroup: blob, container, off
+    summary: Specifies whether data in the container may be accessed publicly.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -336,29 +407,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_show
   name: az storage container show
   summary: Returns all user-defined metadata and system properties for the specified container.
   description: The data returned does not include the container's list of blobs.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container show --name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--lease-id]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, get_container_properties only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -368,35 +440,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: If specified, get_container_properties only succeeds if the container's lease is active and matches this ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_container_show_permission
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_container_show-permission
   name: az storage container show-permission
   summary: Gets the permissions for the specified container.
   description: The permissions indicate whether container data may be accessed publicly.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container show-permission --name
+                                         [--account-key]
+                                         [--account-name]
+                                         [--connection-string]
+                                         [--lease-id]
+                                         [--sas-token]
+                                         [--subscription]
+                                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, get_container_acl only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -406,88 +484,44 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: If specified, get_container_acl only succeeds if the container's lease is active and matches this ID.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_create
-  name: az storage container create
-  summary: Create a container in a storage account.
-- uid: az_storage_container_delete
-  name: az storage container delete
-  summary: Marks the specified container for deletion.
-- uid: az_storage_container_exists
-  name: az storage container exists
-  summary: Check for the existence of a storage container.
-- uid: az_storage_container_generate_sas
-  name: az storage container generate-sas
-  summary: Generate a SAS token for a storage container.
-- uid: az_storage_container_lease
-  name: az storage container lease
-  summary: Manage blob storage container leases.
-- uid: az_storage_container_lease_acquire
-  name: az storage container lease acquire
-  summary: Requests a new lease.
-- uid: az_storage_container_lease_break
-  name: az storage container lease break
-  summary: Break the lease, if the container has an active lease.
-- uid: az_storage_container_lease_change
-  name: az storage container lease change
-  summary: Change the lease ID of an active lease.
-- uid: az_storage_container_lease_release
-  name: az storage container lease release
-  summary: Release the lease.
-- uid: az_storage_container_lease_renew
-  name: az storage container lease renew
-  summary: Renews the lease.
-- uid: az_storage_container_list
-  name: az storage container list
-  summary: List containers in a storage account.
-- uid: az_storage_container_metadata
-  name: az storage container metadata
-  summary: Manage container metadata.
-- uid: az_storage_container_metadata_show
-  name: az storage container metadata show
-  summary: Returns all user-defined metadata for the specified container.
-- uid: az_storage_container_metadata_update
-  name: az storage container metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified container.
-- uid: az_storage_container_policy
-  name: az storage container policy
-  summary: Manage container stored access policies.
-- uid: az_storage_container_policy_create
-  name: az storage container policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_container_policy_delete
-  name: az storage container policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_container_policy_list
-  name: az storage container policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_container_policy_show
-  name: az storage container policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_container_policy_update
-  name: az storage container policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_container_set_permission
-  name: az storage container set-permission
-  summary: Sets the permissions for the specified container or stored access  policies that may be used with Shared Access Signatures.
-- uid: az_storage_container_show
-  name: az storage container show
-  summary: Returns all user-defined metadata and system properties for the specified container.
-- uid: az_storage_container_show_permission
-  name: az storage container show-permission
-  summary: Gets the permissions for the specified container.
+- az_storage_container_create
+- az_storage_container_delete
+- az_storage_container_exists
+- az_storage_container_generate-sas
+- az_storage_container_lease
+- az_storage_container_lease_acquire
+- az_storage_container_lease_break
+- az_storage_container_lease_change
+- az_storage_container_lease_release
+- az_storage_container_lease_renew
+- az_storage_container_list
+- az_storage_container_metadata
+- az_storage_container_metadata_show
+- az_storage_container_metadata_update
+- az_storage_container_policy
+- az_storage_container_policy_create
+- az_storage_container_policy_delete
+- az_storage_container_policy_list
+- az_storage_container_policy_show
+- az_storage_container_policy_update
+- az_storage_container_restore
+- az_storage_container_set-permission
+- az_storage_container_show
+- az_storage_container_show-permission
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -503,10 +537,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/container/lease.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/container/lease.yml
index 979d8d20f1..cb8387897b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/container/lease.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/container/lease.yml
@@ -1,37 +1,39 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container_lease
-  name: az storage container lease
-  summary: Manage blob storage container leases.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_lease_acquire
-  - az_storage_container_lease_break
-  - az_storage_container_lease_change
-  - az_storage_container_lease_release
-  - az_storage_container_lease_renew
+### YamlMime:AzureCLIGroup
+uid: az_storage_container_lease
+name: az storage container lease
+summary: Manage blob storage container leases.
+description: ''
+directCommands:
 - uid: az_storage_container_lease_acquire
   name: az storage container lease acquire
   summary: Requests a new lease.
   description: If the container does not have an active lease, the Blob service creates a lease on the container and returns a new lease ID.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease acquire --container-name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--if-modified-since]
+                                       [--if-unmodified-since]
+                                       [--lease-duration]
+                                       [--proposed-lease-id]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-duration
-    defaultValue: "-1"
-    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --proposed-lease-id
-    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --if-modified-since
     summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
@@ -39,14 +41,12 @@ items:
   - name: --if-unmodified-since
     summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --lease-duration
+    defaultValue: "-1"
+    summary: Specifies the duration of the lease, in seconds, or negative one (-1) for a lease that never expires. A non-infinite lease can be between 15 and 60 seconds. A lease duration cannot be changed using renew or change. Default is -1 (infinite lease).
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --proposed-lease-id
+    summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -54,35 +54,31 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_break
   name: az storage container lease break
   summary: Break the lease, if the container has an active lease.
   description: Once a lease is broken, it cannot be renewed. Any authorized request can break the lease; the request is not required to specify a matching lease ID. When a lease is broken, the lease break period is allowed to elapse, during which time no lease operation except break and release can be performed on the container. When a lease is successfully broken, the response indicates the interval in seconds until a new lease can be acquired.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease break --container-name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--if-modified-since]
+                                     [--if-unmodified-since]
+                                     [--lease-break-period]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-break-period
-    summary: This is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -92,25 +88,42 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-break-period
+    summary: This is the proposed duration of seconds that the lease should continue before it is broken, between 0 and 60 seconds. This break period is only used if it is shorter than the time remaining on the lease. If longer, the time remaining on the lease is used. A new lease will not be available before the break period has expired, but the lease may be held for longer than the break period. If this header does not appear with a break operation, a fixed-duration lease breaks after the remaining lease period elapses, and an infinite lease breaks immediately.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_change
   name: az storage container lease change
   summary: Change the lease ID of an active lease.
   description: A change must include the current lease ID and a new lease ID.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease change --container-name
+                                      --lease-id
+                                      --proposed-lease-id
+                                      [--account-key]
+                                      [--account-name]
+                                      [--connection-string]
+                                      [--if-modified-since]
+                                      [--if-unmodified-since]
+                                      [--sas-token]
+                                      [--subscription]
+                                      [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -123,15 +136,7 @@ items:
     name: --proposed-lease-id
     summary: Proposed lease ID, in a GUID string format. The Blob service returns 400 (Invalid request) if the proposed lease ID is not in the correct format.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -141,25 +146,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_release
   name: az storage container lease release
   summary: Release the lease.
   description: The lease may be released if the lease_id specified matches that associated with the container. Releasing the lease allows another client to immediately acquire the lease for the container as soon as the release is complete.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease release --container-name
+                                       --lease-id
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--if-modified-since]
+                                       [--if-unmodified-since]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -168,15 +186,7 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -186,25 +196,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_lease_renew
   name: az storage container lease renew
   summary: Renews the lease.
   description: The lease can be renewed if the lease ID specified matches that associated with the container. Note that the lease may be renewed even if it has expired as long as the container has not been leased again since the expiration of that lease. When you renew a lease, the lease duration clock resets.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container lease renew --container-name
+                                     --lease-id
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--if-modified-since]
+                                     [--if-unmodified-since]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -213,15 +236,7 @@ items:
     name: --lease-id
     summary: Lease ID for active lease.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
-  - name: --if-unmodified-since
-    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -231,34 +246,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --if-unmodified-since
+    summary: Commence only if unmodified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_lease_acquire
-  name: az storage container lease acquire
-  summary: Requests a new lease.
-- uid: az_storage_container_lease_break
-  name: az storage container lease break
-  summary: Break the lease, if the container has an active lease.
-- uid: az_storage_container_lease_change
-  name: az storage container lease change
-  summary: Change the lease ID of an active lease.
-- uid: az_storage_container_lease_release
-  name: az storage container lease release
-  summary: Release the lease.
-- uid: az_storage_container_lease_renew
-  name: az storage container lease renew
-  summary: Renews the lease.
+- az_storage_container_lease_acquire
+- az_storage_container_lease_break
+- az_storage_container_lease_change
+- az_storage_container_lease_release
+- az_storage_container_lease_renew
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -274,10 +283,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage blob storage container leases.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage blob storage container leases.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/container/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/container/metadata.yml
index f483df2c1d..eba57bef1e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/container/metadata.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/container/metadata.yml
@@ -1,31 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container_metadata
-  name: az storage container metadata
-  summary: Manage container metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_metadata_show
-  - az_storage_container_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_container_metadata
+name: az storage container metadata
+summary: Manage container metadata.
+description: ''
+directCommands:
 - uid: az_storage_container_metadata_show
   name: az storage container metadata show
   summary: Returns all user-defined metadata for the specified container.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container metadata show --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--lease-id]
+                                       [--query-examples]
+                                       [--sas-token]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, get_container_metadata only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -35,41 +33,43 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: If specified, get_container_metadata only succeeds if the container's lease is active and matches this ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_metadata_update
   name: az storage container metadata update
   summary: Sets one or more user-defined name-value pairs for the specified container.
   description: Each call to this operation replaces all existing metadata attached to the container. To remove all metadata from the container, call this operation with no metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container metadata update --name
+                                         [--account-key]
+                                         [--account-name]
+                                         [--connection-string]
+                                         [--if-modified-since]
+                                         [--lease-id]
+                                         [--metadata]
+                                         [--sas-token]
+                                         [--subscription]
+                                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: If specified, set_container_metadata only succeeds if the container's lease is active and matches this ID.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-modified-since
-    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -79,25 +79,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-modified-since
+    summary: Commence only if modified since supplied UTC datetime (Y-m-d'T'H:M'Z').
+    description: ''
+  - name: --lease-id
+    summary: If specified, set_container_metadata only succeeds if the container's lease is active and matches this ID.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_metadata_show
-  name: az storage container metadata show
-  summary: Returns all user-defined metadata for the specified container.
-- uid: az_storage_container_metadata_update
-  name: az storage container metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified container.
+- az_storage_container_metadata_show
+- az_storage_container_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -113,10 +116,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage container metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage container metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/container/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/container/policy.yml
index 47d1142cdd..8c0f7583d8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/container/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/container/policy.yml
@@ -1,24 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_container_policy
-  name: az storage container policy
-  summary: Manage container stored access policies.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_container_policy_create
-  - az_storage_container_policy_delete
-  - az_storage_container_policy_list
-  - az_storage_container_policy_show
-  - az_storage_container_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_container_policy
+name: az storage container policy
+summary: Manage container stored access policies.
+description: ''
+directCommands:
 - uid: az_storage_container_policy_create
   name: az storage container policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy create --container-name
+                                       --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--expiry]
+                                       [--lease-id]
+                                       [--permissions]
+                                       [--sas-token]
+                                       [--start]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -27,18 +29,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -48,25 +39,39 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_delete
   name: az storage container policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy delete --container-name
+                                       --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--lease-id]
+                                       [--sas-token]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -75,9 +80,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,32 +90,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_list
   name: az storage container policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy list --container-name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--lease-id]
+                                     [--query-examples]
+                                     [--sas-token]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
     description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -122,25 +128,34 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_show
   name: az storage container policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy show --container-name
+                                     --name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--lease-id]
+                                     [--query-examples]
+                                     [--sas-token]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -149,9 +164,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -161,25 +174,36 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_container_policy_update
   name: az storage container policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage container policy update --container-name
+                                       --name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--expiry]
+                                       [--lease-id]
+                                       [--permissions]
+                                       [--sas-token]
+                                       [--start]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --container-name -c
     summary: The container name.
@@ -188,18 +212,7 @@ items:
     name: --name -n
     summary: The stored access policy name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --lease-id
-    summary: The container lease ID.
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -209,34 +222,31 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --lease-id
+    summary: The container lease ID.
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_container_policy_create
-  name: az storage container policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_container_policy_delete
-  name: az storage container policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_container_policy_list
-  name: az storage container policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_container_policy_show
-  name: az storage container policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_container_policy_update
-  name: az storage container policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_container_policy_create
+- az_storage_container_policy_delete
+- az_storage_container_policy_list
+- az_storage_container_policy_show
+- az_storage_container_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -252,10 +262,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage container stored access policies.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage container stored access policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/cors.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/cors.yml
index 3a428386bb..d0a84d2a2c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/cors.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/cors.yml
@@ -1,22 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_cors
-  name: az storage cors
-  summary: Manage storage service Cross-Origin Resource Sharing (CORS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_cors_add
-  - az_storage_cors_clear
-  - az_storage_cors_list
+### YamlMime:AzureCLIGroup
+uid: az_storage_cors
+name: az storage cors
+summary: Manage storage service Cross-Origin Resource Sharing (CORS).
+description: ''
+directCommands:
 - uid: az_storage_cors_add
   name: az storage cors add
   summary: Add a CORS rule to a storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage cors add --methods {DELETE, GET, HEAD, MERGE, OPTIONS, POST, PUT}
+                        --origins
+                        --services
+                        [--account-key]
+                        [--account-name]
+                        [--allowed-headers]
+                        [--connection-string]
+                        [--exposed-headers]
+                        [--max-age]
+                        [--sas-token]
+                        [--subscription]
+                        [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --methods
     parameterValueGroup: DELETE, GET, HEAD, MERGE, OPTIONS, POST, PUT
@@ -30,57 +35,56 @@ items:
     name: --services
     summary: 'The storage service(s) to add rules to. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
     description: ''
-  - name: --allowed-headers
-    summary: Space-separated list of response headers allowed to be part of the cross-origin request.
-    description: ''
-  - name: --exposed-headers
-    summary: Space-separated list of response headers to expose to CORS clients.
-    description: ''
-  - name: --max-age
-    summary: The maximum number of seconds the client/browser should cache a preflight response.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
   - name: --account-name
     summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
+  - name: --allowed-headers
+    summary: Space-separated list of response headers allowed to be part of the cross-origin request.
+    description: ''
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --exposed-headers
+    summary: Space-separated list of response headers to expose to CORS clients.
+    description: ''
+  - name: --max-age
+    summary: The maximum number of seconds the client/browser should cache a preflight response.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_cors_clear
   name: az storage cors clear
   summary: Remove all CORS rules from a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage cors clear --services
+                          [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
   examples:
   - summary: Remove all CORS rules from a storage account. (autogenerated)
-    syntax:
-      content: az storage cors clear --account-name MyAccount --services bfqt
-  parameters:
+    syntax: az storage cors clear --account-name MyAccount --services bfqt
+  requiredParameters:
   - isRequired: true
     name: --services
     summary: 'The storage service(s) to remove rules from. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -96,30 +100,27 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_cors_list
   name: az storage cors list
   summary: List all CORS rules for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage cors list [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--query-examples]
+                         [--sas-token]
+                         [--services]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: List all CORS rules for a storage account. (autogenerated)
-    syntax:
-      content: az storage cors list --account-name MyAccount
-  parameters:
-  - name: --services
-    defaultValue: bqft
-    summary: 'The storage service(s) to list rules for. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage cors list --account-key 00000000 --account-name mystorageaccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -129,28 +130,27 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bqft
+    summary: 'The storage service(s) to list rules for. Allowed options are: (b)lob, (f)ile, (q)ueue, (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_cors_add
-  name: az storage cors add
-  summary: Add a CORS rule to a storage account.
-- uid: az_storage_cors_clear
-  name: az storage cors clear
-  summary: Remove all CORS rules from a storage account.
-- uid: az_storage_cors_list
-  name: az storage cors list
-  summary: List all CORS rules for a storage account.
+- az_storage_cors_add
+- az_storage_cors_clear
+- az_storage_cors_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -166,10 +166,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage service Cross-Origin Resource Sharing (CORS).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage service Cross-Origin Resource Sharing (CORS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/directory.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/directory.yml
index 1b8944ba3c..dea066187d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/directory.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/directory.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_directory
-  name: az storage directory
-  summary: Manage file storage directories.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_directory_create
-  - az_storage_directory_delete
-  - az_storage_directory_exists
-  - az_storage_directory_list
-  - az_storage_directory_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_directory
+name: az storage directory
+summary: Manage file storage directories.
+description: ''
+directCommands:
 - uid: az_storage_directory_create
   name: az storage directory create
   summary: Creates a new directory under the specified share or parent directory.
   description: If the directory with the same name already exists, the operation fails on the service. By default, the exception is swallowed by the client. To expose the exception, specify True for fail_on_exists.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory create --name
+                                --share-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--fail-on-exist]
+                                [--metadata]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -27,15 +28,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --fail-on-exist
-    summary: Specify whether to throw an exception when the directory exists. False by default.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Specify whether to throw an exception when the directory exists. False by default.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_delete
   name: az storage directory delete
   summary: Deletes the specified empty directory.
   description: Note that the directory must be empty before it can be deleted. Attempting to delete directories  that are not empty will fail.  If the directory does not exist, the operation fails on the service. By default, the exception is swallowed by the client. To expose the exception, specify True for fail_not_exist.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory delete --name
+                                --share-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--fail-not-exist]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -72,12 +77,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --fail-not-exist
-    summary: Specify whether to throw an exception when the directory doesn't exist.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,29 +87,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specify whether to throw an exception when the directory doesn't exist.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_exists
   name: az storage directory exists
   summary: Check for the existence of a storage directory.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage directory exists --name
+                                --share-name
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--sas-token]
+                                [--snapshot]
+                                [--subscription]
+                                [--timeout]
   examples:
   - summary: Check for the existence of a storage directory. (autogenerated)
-    syntax:
-      content: az storage directory exists --account-key 00000000 --account-name MyAccount --name MyDirectory --share-name MyShare
-  parameters:
+    syntax: az storage directory exists --account-key 00000000 --account-name MyAccount --name MyDirectory --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -118,12 +126,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -136,36 +139,39 @@ items:
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_list
   name: az storage directory list
   summary: List directories in a share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage directory list --share-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--name]
+                              [--query-examples]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
   examples:
   - summary: List directories in a share. (autogenerated)
-    syntax:
-      content: az storage directory list --account-key 00000000 --account-name MyAccount --share-name MyShare
-  parameters:
+    syntax: az storage directory list --account-key 00000000 --account-name MyAccount --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --name -n
-    summary: The directory name.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -175,25 +181,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --name -n
+    summary: The directory name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_show
   name: az storage directory show
   summary: Returns all user-defined metadata and system properties for the specified directory.
   description: The data returned does not include the directory's list of files.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory show --name
+                              --share-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--query-examples]
+                              [--sas-token]
+                              [--snapshot]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -202,12 +221,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -217,43 +231,31 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_directory_create
-  name: az storage directory create
-  summary: Creates a new directory under the specified share or parent directory.
-- uid: az_storage_directory_delete
-  name: az storage directory delete
-  summary: Deletes the specified empty directory.
-- uid: az_storage_directory_exists
-  name: az storage directory exists
-  summary: Check for the existence of a storage directory.
-- uid: az_storage_directory_list
-  name: az storage directory list
-  summary: List directories in a share.
-- uid: az_storage_directory_metadata
-  name: az storage directory metadata
-  summary: Manage file storage directory metadata.
-- uid: az_storage_directory_metadata_show
-  name: az storage directory metadata show
-  summary: Returns all user-defined metadata for the specified directory.
-- uid: az_storage_directory_metadata_update
-  name: az storage directory metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified directory.
-- uid: az_storage_directory_show
-  name: az storage directory show
-  summary: Returns all user-defined metadata and system properties for the specified directory.
+- az_storage_directory_create
+- az_storage_directory_delete
+- az_storage_directory_exists
+- az_storage_directory_list
+- az_storage_directory_metadata
+- az_storage_directory_metadata_show
+- az_storage_directory_metadata_update
+- az_storage_directory_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -269,10 +271,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file storage directories.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file storage directories.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/directory/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/directory/metadata.yml
index 7e734ab757..1ef452e575 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/directory/metadata.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/directory/metadata.yml
@@ -1,21 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_directory_metadata
-  name: az storage directory metadata
-  summary: Manage file storage directory metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_directory_metadata_show
-  - az_storage_directory_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_directory_metadata
+name: az storage directory metadata
+summary: Manage file storage directory metadata.
+description: ''
+directCommands:
 - uid: az_storage_directory_metadata_show
   name: az storage directory metadata show
   summary: Returns all user-defined metadata for the specified directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory metadata show --name
+                                       --share-name
+                                       [--account-key]
+                                       [--account-name]
+                                       [--connection-string]
+                                       [--query-examples]
+                                       [--sas-token]
+                                       [--snapshot]
+                                       [--subscription]
+                                       [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -24,12 +28,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -39,25 +38,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_directory_metadata_update
   name: az storage directory metadata update
   summary: Sets one or more user-defined name-value pairs for the specified directory.
   description: Each call to this operation replaces all existing metadata attached to the directory. To remove all metadata from the directory, call this operation with no metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage directory metadata update --name
+                                         --share-name
+                                         [--account-key]
+                                         [--account-name]
+                                         [--connection-string]
+                                         [--metadata]
+                                         [--sas-token]
+                                         [--subscription]
+                                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The directory name.
@@ -66,12 +77,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -81,25 +87,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_directory_metadata_show
-  name: az storage directory metadata show
-  summary: Returns all user-defined metadata for the specified directory.
-- uid: az_storage_directory_metadata_update
-  name: az storage directory metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified directory.
+- az_storage_directory_metadata_show
+- az_storage_directory_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -115,10 +118,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file storage directory metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file storage directory metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/entity.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/entity.yml
index 59269d34cd..dd4a34e0d9 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/entity.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/entity.yml
@@ -1,25 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_entity
-  name: az storage entity
-  summary: Manage table storage entities.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_entity_delete
-  - az_storage_entity_insert
-  - az_storage_entity_merge
-  - az_storage_entity_query
-  - az_storage_entity_replace
-  - az_storage_entity_show
+### YamlMime:AzureCLIGroup
+uid: az_storage_entity
+name: az storage entity
+summary: Manage table storage entities.
+description: ''
+directCommands:
 - uid: az_storage_entity_delete
   name: az storage entity delete
   summary: Deletes an existing entity in a table.
   description: Throws if the entity does not exist.  When an entity is successfully deleted, the entity is immediately marked  for deletion and is no longer accessible to clients. The entity is later  removed from the Table service during garbage collection.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity delete --partition-key
+                             --row-key
+                             --table-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--if-match]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --partition-key
     summary: The PartitionKey of the entity.
@@ -32,13 +32,7 @@ items:
     name: --table-name -t
     summary: The name of the table containing the entity to delete.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    defaultValue: ''
-    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The delete operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional delete, set If-Match to the wildcard character (\*).
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -48,29 +42,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-match
+    defaultValue: ''
+    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The delete operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional delete, set If-Match to the wildcard character (\*).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_insert
   name: az storage entity insert
   summary: Insert an entity into a table.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage entity insert --entity
+                             --table-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--if-exists {fail, merge, replace}]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
   examples:
   - summary: Insert an entity into a table. (autogenerated)
-    syntax:
-      content: az storage entity insert --connection-string $connectionString --entity PartitionKey=AAA RowKey=BBB Content=ASDF2 --if-exists fail --table-name MyTable
-  parameters:
+    syntax: az storage entity insert --connection-string $connectionString --entity PartitionKey=AAA RowKey=BBB Content=ASDF2 --if-exists fail --table-name MyTable
+  requiredParameters:
   - isRequired: true
     name: --entity -e
     summary: Space-separated list of key=value pairs. Must contain a PartitionKey and a RowKey.
@@ -79,14 +82,7 @@ items:
     name: --table-name -t
     summary: The name of the table to insert the entity into.
     description: ''
-  - name: --if-exists
-    defaultValue: fail
-    parameterValueGroup: fail, merge, replace
-    summary: Behavior when an entity already exists for the specified PartitionKey and RowKey.
-    description: ''
-  - name: --timeout
-    summary: The server timeout, expressed in seconds.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -96,25 +92,36 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-exists
+    defaultValue: fail
+    parameterValueGroup: fail, merge, replace
+    summary: Behavior when an entity already exists for the specified PartitionKey and RowKey.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: The server timeout, expressed in seconds.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_merge
   name: az storage entity merge
   summary: Updates an existing entity by merging the entity's properties.
   description: Throws  if the entity does not exist.   This operation does not replace the existing entity as the update_entity operation does. A property cannot be removed with merge_entity.  Any properties with null values are ignored. All other properties will be  updated or added.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity merge --entity
+                            --table-name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--if-match]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --entity -e
     summary: The entity to merge. Could be a dict or an entity object. Must contain a PartitionKey and a RowKey.
@@ -123,13 +130,7 @@ items:
     name: --table-name -t
     summary: The name of the table containing the entity to merge.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    defaultValue: ''
-    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The merge operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional merge, set If-Match to the wildcard character (\*).
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -139,53 +140,51 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-match
+    defaultValue: ''
+    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The merge operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional merge, set If-Match to the wildcard character (\*).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_query
   name: az storage entity query
   summary: List entities which satisfy a query.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage entity query --table-name
+                            [--accept {full, minimal, none}]
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--filter]
+                            [--marker]
+                            [--num-results]
+                            [--sas-token]
+                            [--select]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: List entities which satisfy a query. (autogenerated)
-    syntax:
-      content: az storage entity query --table-name MyTable
-  parameters:
+    syntax: az storage entity query --table-name MyTable
+  requiredParameters:
   - isRequired: true
     name: --table-name -t
     summary: The name of the table to query.
     description: ''
+  optionalParameters:
   - name: --accept
     defaultValue: minimal
     parameterValueGroup: full, minimal, none
     summary: Specifies how much metadata to include in the response payload.
     description: ''
-  - name: --filter
-    summary: Returns only entities that satisfy the specified filter. Note that no more than 15 discrete comparisons are permitted within a $filter string. See <a href="http://msdn.microsoft.com/en-us/library/windowsazure/dd894031.aspx">http://msdn.microsoft.com/en-us/library/windowsazure/dd894031.aspx</a> for more information on constructing filters.
-    description: ''
-  - name: --marker
-    summary: Space-separated list of key=value pairs. Must contain a nextpartitionkey and a nextrowkey.
-    description: This value can be retrieved from the next_marker field of a previous generator object if max_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-  - name: --num-results
-    summary: The maximum number of entities to return.
-    description: ''
-  - name: --select
-    summary: Space-separated list of properties to return for each entity.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -195,25 +194,43 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --filter
+    summary: Returns only entities that satisfy the specified filter. Note that no more than 15 discrete comparisons are permitted within a $filter string. See http://msdn.microsoft.com/en-us/library/windowsazure/dd894031.aspx for more information on constructing filters.
+    description: ''
+  - name: --marker
+    summary: Space-separated list of key=value pairs. Must contain a nextpartitionkey and a nextrowkey.
+    description: This value can be retrieved from the next_marker field of a previous generator object if max_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
+  - name: --num-results
+    summary: The maximum number of entities to return.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --select
+    summary: Space-separated list of properties to return for each entity.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_replace
   name: az storage entity replace
   summary: Updates an existing entity in a table.
   description: Throws if the entity does not exist.  The update_entity operation replaces the entire entity and can be used to  remove properties.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity replace --entity
+                              --table-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--if-match]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --entity -e
     summary: The entity to update. Could be a dict or an entity object. Must contain a PartitionKey and a RowKey.
@@ -222,13 +239,7 @@ items:
     name: --table-name -t
     summary: The name of the table containing the entity to update.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --if-match
-    defaultValue: ''
-    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The update operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional update, set If-Match to the wildcard character (\*).
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -238,25 +249,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --if-match
+    defaultValue: ''
+    summary: The client may specify the ETag for the entity on the request in order to compare to the ETag maintained by the service for the purpose of optimistic concurrency. The update operation will be performed only if the ETag sent by the client matches the value maintained by the server, indicating that the entity has not been modified since it was retrieved by the client. To force an unconditional update, set If-Match to the wildcard character (\*).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_entity_show
   name: az storage entity show
   summary: Get an entity from the specified table.
   description: Throws if the entity does not exist.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage entity show --partition-key
+                           --row-key
+                           --table-name
+                           [--accept]
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--query-examples]
+                           [--sas-token]
+                           [--select]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --partition-key
     summary: The PartitionKey of the entity.
@@ -269,16 +293,11 @@ items:
     name: --table-name -t
     summary: The name of the table to get the entity from.
     description: ''
+  optionalParameters:
   - name: --accept
     defaultValue: application/json;odata=minimalmetadata
     summary: Specifies the accepted content type of the response payload. See TablePayloadFormat for possible values.
     description: ''
-  - name: --select
-    summary: Space-separated list of properties to return for each entity.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -288,37 +307,29 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --select
+    summary: Space-separated list of properties to return for each entity.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_entity_delete
-  name: az storage entity delete
-  summary: Deletes an existing entity in a table.
-- uid: az_storage_entity_insert
-  name: az storage entity insert
-  summary: Insert an entity into a table.
-- uid: az_storage_entity_merge
-  name: az storage entity merge
-  summary: Updates an existing entity by merging the entity's properties.
-- uid: az_storage_entity_query
-  name: az storage entity query
-  summary: List entities which satisfy a query.
-- uid: az_storage_entity_replace
-  name: az storage entity replace
-  summary: Updates an existing entity in a table.
-- uid: az_storage_entity_show
-  name: az storage entity show
-  summary: Get an entity from the specified table.
+- az_storage_entity_delete
+- az_storage_entity_insert
+- az_storage_entity_merge
+- az_storage_entity_query
+- az_storage_entity_replace
+- az_storage_entity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -334,10 +345,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage table storage entities.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage table storage entities.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/file.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/file.yml
index 2971553b0f..eedb87d915 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/file.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/file.yml
@@ -1,32 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_file
-  name: az storage file
-  summary: Manage file shares that use the SMB 3.0 protocol.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_file_delete
-  - az_storage_file_delete_batch
-  - az_storage_file_download
-  - az_storage_file_download_batch
-  - az_storage_file_exists
-  - az_storage_file_generate_sas
-  - az_storage_file_list
-  - az_storage_file_resize
-  - az_storage_file_show
-  - az_storage_file_update
-  - az_storage_file_upload
-  - az_storage_file_upload_batch
-  - az_storage_file_url
+### YamlMime:AzureCLIGroup
+uid: az_storage_file
+name: az storage file
+summary: Manage file shares that use the SMB 3.0 protocol.
+description: ''
+directCommands:
 - uid: az_storage_file_delete
   name: az storage file delete
   summary: Marks the specified file for deletion.
   description: The file is later deleted during garbage collection.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file delete --path
+                           --share-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -35,9 +26,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -53,39 +42,35 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_delete_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_delete-batch
   name: az storage file delete-batch
   summary: Delete files from an Azure Storage File Share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file delete-batch --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--dryrun]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--timeout]
   examples:
   - summary: Delete files from an Azure Storage File Share. (autogenerated)
-    syntax:
-      content: az storage file delete-batch --account-key 00000000 --account-name MyAccount --source /path/to/file
+    syntax: az storage file delete-batch --account-key 00000000 --account-name MyAccount --source /path/to/file
   - summary: Delete files from an Azure Storage File Share. (autogenerated)
-    syntax:
-      content: az storage file delete-batch --account-key 00000000 --account-name MyAccount --pattern *.py --source /path/to/file
-  parameters:
+    syntax: az storage file delete-batch --account-key 00000000 --account-name MyAccount --pattern *.py --source /path/to/file
+  requiredParameters:
   - isRequired: true
     name: --source -s
     summary: The source of the file delete operation. The source can be the file share URL or the share name.
     description: ''
-  - name: --dryrun
-    summary: List the files and blobs to be deleted. No actual data deletion will occur.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -95,25 +80,44 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --dryrun
+    summary: List the files and blobs to be deleted. No actual data deletion will occur.
+    description: ''
+  - name: --pattern
+    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_download
   name: az storage file download
   summary: Downloads a file to a file path, with automatic chunking and progress notifications.
   description: Returns an instance of File with properties and metadata.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file download --path
+                             --share-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--dest]
+                             [--end-range]
+                             [--max-connections]
+                             [--no-progress]
+                             [--open-mode]
+                             [--sas-token]
+                             [--snapshot]
+                             [--start-range]
+                             [--subscription]
+                             [--timeout]
+                             [--validate-content]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -122,6 +126,16 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --dest
     summary: Path of the file to write to. The source filename will be used if not specified.
     description: ''
@@ -139,50 +153,47 @@ items:
     defaultValue: wb
     summary: Mode to use when opening the file. Note that specifying append only open_mode prevents parallel download. So, max_connections must be set to 1 if this open_mode is used.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --snapshot
     summary: A string that represents the snapshot version, if applicable.
     description: ''
   - name: --start-range
     summary: 'Start of byte range to use for downloading a section of the file. If no end_range is given, all bytes after the start_range will be downloaded. The start_range and end_range params are inclusive. Ex: start_range=0, end_range=511 will download first 512 bytes of file.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     summary: Request timeout in seconds. Applies to each call to the service.
     description: ''
   - name: --validate-content
     summary: If set to true, validates an MD5 hash for each retrieved portion of the file. This is primarily valuable for detecting bitflips on the wire if using http instead of https as https (the default) will already validate. Note that the service will only return transactional MD5s for chunks 4MB or less so the first get request will be of size self.MAX_CHUNK_GET_SIZE instead of self.MAX_SINGLE_GET_SIZE. If self.MAX_CHUNK_GET_SIZE was set to greater than 4MB an error will be thrown. As computing the MD5 takes processing time and more requests will need to be done due to the reduced chunk size there may be some increase in latency.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_download_batch
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_download-batch
   name: az storage file download-batch
   summary: Download files from an Azure Storage File Share to a local directory in a batch operation.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file download-batch --destination
+                                   --source
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--dryrun]
+                                   [--max-connections]
+                                   [--no-progress]
+                                   [--pattern]
+                                   [--sas-token]
+                                   [--snapshot]
+                                   [--subscription]
+                                   [--validate-content]
   examples:
   - summary: Download files from an Azure Storage File Share to a local directory in a batch operation. (autogenerated)
-    syntax:
-      content: az storage file download-batch --account-key 00000000 --account-name MyAccount --destination . --no-progress --source /path/to/file
-  parameters:
+    syntax: az storage file download-batch --account-key 00000000 --account-name MyAccount --destination . --no-progress --source /path/to/file
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The local directory where the files are downloaded to. This directory must already exist.
@@ -191,25 +202,7 @@ items:
     name: --source -s
     summary: The source of the file download operation. The source can be the file share URL or the share name.
     description: ''
-  - name: --dryrun
-    summary: List the files and blobs to be downloaded. No actual data transfer will occur.
-    description: ''
-  - name: --no-progress
-    summary: Include this flag to disable progress reporting for the command.
-    description: ''
-  - name: --pattern
-    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --validate-content
-    summary: If set, calculates an MD5 hash for each range of the file for validation.
-    description: The storage service checks the hash of the content that has arrived is identical to the hash that was sent. This is mostly valuable for detecting bitflips during transfer if using HTTP instead of HTTPS. This hash is not stored.
-  - name: --max-connections
-    defaultValue: "1"
-    summary: The maximum number of parallel connections to use. Default value is 1.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -219,32 +212,52 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --dryrun
+    summary: List the files and blobs to be downloaded. No actual data transfer will occur.
+    description: ''
+  - name: --max-connections
+    defaultValue: "1"
+    summary: The maximum number of parallel connections to use. Default value is 1.
+    description: ''
+  - name: --no-progress
+    summary: Include this flag to disable progress reporting for the command.
+    description: ''
+  - name: --pattern
+    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --validate-content
+    summary: If set, calculates an MD5 hash for each range of the file for validation.
+    description: The storage service checks the hash of the content that has arrived is identical to the hash that was sent. This is mostly valuable for detecting bitflips during transfer if using HTTP instead of HTTPS. This hash is not stored.
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_exists
   name: az storage file exists
   summary: Check for the existence of a file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file exists --path
+                           --share-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--snapshot]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Check for the existence of a file. (autogenerated)
-    syntax:
-      content: az storage file exists --account-key 00000000 --account-name MyAccount --path path/file.txt --share-name MyShare
+    syntax: az storage file exists --account-key 00000000 --account-name MyAccount --path path/file.txt --share-name MyShare
   - summary: Check for the existence of a file. (autogenerated)
-    syntax:
-      content: az storage file exists --connection-string $connectionString --path path/file.txt --share-name MyShare
-  parameters:
+    syntax: az storage file exists --connection-string $connectionString --path path/file.txt --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -253,12 +266,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -271,32 +279,50 @@ items:
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_generate-sas
   name: az storage file generate-sas
   summary: Generates a shared access signature for the file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file generate-sas --path
+                                 --share-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--cache-control]
+                                 [--connection-string]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-type]
+                                 [--expiry]
+                                 [--https-only]
+                                 [--ip]
+                                 [--permissions]
+                                 [--policy-name]
+                                 [--sas-token]
+                                 [--start]
+                                 [--subscription]
   examples:
   - summary: Generate a sas token for a file.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        az storage file generate-sas -p path/file.txt -s MyShare --account-name MyStorageAccount --permissions rcdw --https-only --expiry $end
+      az storage file generate-sas -p path/file.txt -s MyShare --account-name MyStorageAccount --permissions rcdw --https-only --expiry $end
+  - summary: Generate a shared access signature for the file. (autogenerated)
+    syntax: az storage file generate-sas --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --path path/file.txt --permissions rcdw --share-name MyShare --start 2019-01-01T12:20Z
   - summary: Generate a shared access signature for the file. (autogenerated)
-    syntax:
-      content: az storage file generate-sas --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --path path/file.txt --permissions rcdw --share-name MyShare --start 2019-01-01T12:20Z
-  parameters:
+    syntax: az storage file generate-sas --account-key 00000000 --account-name mystorageaccount --expiry 2037-12-31T23:59:00Z --https-only --path path/file.txt --permissions rcdw --share-name myshare
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -305,9 +331,19 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessed using this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessed using this shared access signature.
     description: ''
@@ -335,45 +371,52 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the container's ACL.
     description: ''
-  - name: --start
-    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_list
   name: az storage file list
   summary: List files and directories in a share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file list --share-name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--exclude-dir]
+                         [--marker]
+                         [--num-results]
+                         [--path]
+                         [--query-examples]
+                         [--sas-token]
+                         [--snapshot]
+                         [--subscription]
+                         [--timeout]
   examples:
   - summary: List files and directories in a share. (autogenerated)
-    syntax:
-      content: az storage file list --share-name MyShare
-  parameters:
+    syntax: az storage file list --share-name MyShare
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --exclude-dir
     summary: List only files in the given share.
     description: ''
@@ -387,40 +430,37 @@ items:
   - name: --path -p
     summary: The directory path within the file share.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_resize
   name: az storage file resize
   summary: Resizes a file to the specified size.
   description: If the specified byte value is less than the current size of the file, then all ranges above the specified byte value are cleared.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file resize --path
+                           --share-name
+                           --size
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -433,9 +473,7 @@ items:
     name: --size
     summary: The length to resize the file to.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -451,19 +489,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_show
   name: az storage file show
   summary: Returns all user-defined metadata, standard HTTP properties, and system properties for the file.
   description: Returns an instance of File with FileProperties and a metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file show --path
+                         --share-name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--query-examples]
+                         [--sas-token]
+                         [--snapshot]
+                         [--subscription]
+                         [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -472,12 +517,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -487,25 +527,43 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_update
   name: az storage file update
   summary: Sets system properties on the file.
   description: If one property is set for the content_settings, all properties will be overriden.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file update --path
+                           --share-name
+                           [--account-key]
+                           [--account-name]
+                           [--clear-content-settings {false, true}]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -514,11 +572,21 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --clear-content-settings
     parameterValueGroup: false, true
     summary: If this flag is set, then if any one or more of the following properties (--content-cache-control, --content-disposition, --content-encoding, --content-language, --content-md5, --content-type) is set, then all of these properties are set together. If a value is not provided for a given property when at least one of the properties listed below is set, then that property will be cleared.
     description: ''
-  - name: --content-cache-control
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -536,44 +604,46 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_upload
   name: az storage file upload
   summary: Upload a file to a share that uses the SMB 3.0 protocol.
   description: Creates or updates an Azure file from a source path with automatic chunking and progress notifications.
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file upload --share-name
+                           --source
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--content-cache]
+                           [--content-disposition]
+                           [--content-encoding]
+                           [--content-language]
+                           [--content-md5]
+                           [--content-type]
+                           [--max-connections]
+                           [--metadata]
+                           [--no-progress]
+                           [--path]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+                           [--validate-content]
   examples:
   - summary: Upload to a local file to a share.
-    syntax:
-      content: az storage file upload -s MyShare --source /path/to/file
+    syntax: az storage file upload -s MyShare --source /path/to/file
   - summary: Upload a file to a share that uses the SMB 3.0 protocol. (autogenerated)
-    syntax:
-      content: az storage file upload --account-key 00000000 --account-name MyStorageAccount --path path/file.txt --share-name MyShare --source /path/to/file
-  parameters:
+    syntax: az storage file upload --account-key 00000000 --account-name MyStorageAccount --path path/file.txt --share-name MyShare --source /path/to/file
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
@@ -582,7 +652,17 @@ items:
     name: --source
     summary: Path of the local file to upload as the file content.
     description: ''
-  - name: --content-cache-control
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -613,44 +693,50 @@ items:
   - name: --path -p
     summary: The path to the file within the file share. If the file name is omitted, the source file name will be used.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --validate-content
-    summary: If true, calculates an MD5 hash for each range of the file. The storage service checks the hash of the content that has arrived with the hash that was sent. This is primarily valuable for detecting bitflips on the wire if using http instead of https as https (the default) will already validate. Note that this MD5 hash is not stored with the file.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_upload_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --validate-content
+    summary: If true, calculates an MD5 hash for each range of the file. The storage service checks the hash of the content that has arrived with the hash that was sent. This is primarily valuable for detecting bitflips on the wire if using http instead of https as https (the default) will already validate. Note that this MD5 hash is not stored with the file.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_upload-batch
   name: az storage file upload-batch
   summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file upload-batch --destination
+                                 --source
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--content-cache]
+                                 [--content-disposition]
+                                 [--content-encoding]
+                                 [--content-language]
+                                 [--content-md5]
+                                 [--content-type]
+                                 [--destination-path]
+                                 [--dryrun]
+                                 [--max-connections]
+                                 [--metadata]
+                                 [--no-progress]
+                                 [--pattern]
+                                 [--sas-token]
+                                 [--subscription]
+                                 [--validate-content]
   examples:
-  - summary: Upload files from a local directory to an Azure Storage File Share in a batch operation. (autogenerated)
-    syntax:
-      content: az storage file upload-batch --account-key 00000000 --account-name MyAccount --destination . --source /path/to/file
-  parameters:
+  - summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
+    syntax: az storage file upload-batch --destination myshare --source . --account-name myaccount --account-key 00000000
+  - summary: Upload files from a local directory to an Azure Storage File Share with url in a batch operation.
+    syntax: az storage file upload-batch --destination https://myaccount.file.core.windows.net/myshare --source . --account-key 00000000
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     summary: The destination of the upload operation.
@@ -659,25 +745,17 @@ items:
     name: --source -s
     summary: The directory to upload files from.
     description: ''
-  - name: --destination-path
-    summary: The directory where the source data is copied to. If omitted, data is copied to the root directory.
-    description: ''
-  - name: --dryrun
-    summary: List the files and blobs to be uploaded. No actual data transfer will occur.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
     description: ''
-  - name: --no-progress
-    summary: Include this flag to disable progress reporting for the command.
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --pattern
-    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
-    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --validate-content
-    summary: If set, calculates an MD5 hash for each range of the file for validation.
-    description: The storage service checks the hash of the content that has arrived is identical to the hash that was sent. This is mostly valuable for detecting bitflips during transfer if using HTTP instead of HTTPS. This hash is not stored.
-  - name: --content-cache-control
+  - name: --content-cache --content-cache-control
     summary: The cache control string.
     description: ''
   - name: --content-disposition
@@ -695,42 +773,52 @@ items:
   - name: --content-type
     summary: The content MIME type.
     description: ''
+  - name: --destination-path
+    summary: The directory where the source data is copied to. If omitted, data is copied to the root directory.
+    description: ''
+  - name: --dryrun
+    summary: List the files and blobs to be uploaded. No actual data transfer will occur.
+    description: ''
   - name: --max-connections
     defaultValue: "1"
     summary: The maximum number of parallel connections to use. Default value is 1.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --no-progress
+    summary: Include this flag to disable progress reporting for the command.
     description: ''
+  - name: --pattern
+    summary: The pattern used for file globbing. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
+    description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --validate-content
+    summary: If set, calculates an MD5 hash for each range of the file for validation.
+    description: The storage service checks the hash of the content that has arrived is identical to the hash that was sent. This is mostly valuable for detecting bitflips during transfer if using HTTP instead of HTTPS. This hash is not stored.
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_url
   name: az storage file url
   summary: Create the url to access a file.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file url --path
+                        --share-name
+                        [--account-key]
+                        [--account-name]
+                        [--connection-string]
+                        [--protocol {http, https}]
+                        [--sas-token]
+                        [--subscription]
   examples:
   - summary: Create the url to access a file. (autogenerated)
-    syntax:
-      content: az storage file url --account-name MyAccount --path path/file.txt --share-name MyShare
-  parameters:
+    syntax: az storage file url --account-key 00000000 --account-name mystorageaccount --path path/file.txt --share-name myshare
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -739,11 +827,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --protocol
-    defaultValue: https
-    parameterValueGroup: http, https
-    summary: Protocol to use.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -753,79 +837,39 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --protocol
+    defaultValue: https
+    parameterValueGroup: http, https
+    summary: Protocol to use.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_file_copy
-  name: az storage file copy
-  summary: Manage file copy operations.
-- uid: az_storage_file_copy_cancel
-  name: az storage file copy cancel
-  summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
-- uid: az_storage_file_copy_start
-  name: az storage file copy start
-  summary: Copy a file asynchronously.
-- uid: az_storage_file_copy_start_batch
-  name: az storage file copy start-batch
-  summary: Copy multiple files or blobs to a file share.
-- uid: az_storage_file_delete
-  name: az storage file delete
-  summary: Marks the specified file for deletion.
-- uid: az_storage_file_delete_batch
-  name: az storage file delete-batch
-  summary: Delete files from an Azure Storage File Share.
-- uid: az_storage_file_download
-  name: az storage file download
-  summary: Downloads a file to a file path, with automatic chunking and progress notifications.
-- uid: az_storage_file_download_batch
-  name: az storage file download-batch
-  summary: Download files from an Azure Storage File Share to a local directory in a batch operation.
-- uid: az_storage_file_exists
-  name: az storage file exists
-  summary: Check for the existence of a file.
-- uid: az_storage_file_generate_sas
-  name: az storage file generate-sas
-  summary: Generates a shared access signature for the file.
-- uid: az_storage_file_list
-  name: az storage file list
-  summary: List files and directories in a share.
-- uid: az_storage_file_metadata
-  name: az storage file metadata
-  summary: Manage file metadata.
-- uid: az_storage_file_metadata_show
-  name: az storage file metadata show
-  summary: Returns all user-defined metadata for the specified file.
-- uid: az_storage_file_metadata_update
-  name: az storage file metadata update
-  summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
-- uid: az_storage_file_resize
-  name: az storage file resize
-  summary: Resizes a file to the specified size.
-- uid: az_storage_file_show
-  name: az storage file show
-  summary: Returns all user-defined metadata, standard HTTP properties, and system properties for the file.
-- uid: az_storage_file_update
-  name: az storage file update
-  summary: Sets system properties on the file.
-- uid: az_storage_file_upload
-  name: az storage file upload
-  summary: Upload a file to a share that uses the SMB 3.0 protocol.
-- uid: az_storage_file_upload_batch
-  name: az storage file upload-batch
-  summary: Upload files from a local directory to an Azure Storage File Share in a batch operation.
-- uid: az_storage_file_url
-  name: az storage file url
-  summary: Create the url to access a file.
+- az_storage_file_copy
+- az_storage_file_copy_cancel
+- az_storage_file_copy_start
+- az_storage_file_copy_start-batch
+- az_storage_file_delete
+- az_storage_file_delete-batch
+- az_storage_file_download
+- az_storage_file_download-batch
+- az_storage_file_exists
+- az_storage_file_generate-sas
+- az_storage_file_list
+- az_storage_file_metadata
+- az_storage_file_metadata_show
+- az_storage_file_metadata_update
+- az_storage_file_resize
+- az_storage_file_show
+- az_storage_file_update
+- az_storage_file_upload
+- az_storage_file_upload-batch
+- az_storage_file_url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -841,10 +885,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file shares that use the SMB 3.0 protocol.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file shares that use the SMB 3.0 protocol.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/file/copy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/file/copy.yml
index 9e8bf26fa0..94e3b88c45 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/file/copy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/file/copy.yml
@@ -1,22 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_file_copy
-  name: az storage file copy
-  summary: Manage file copy operations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_file_copy_cancel
-  - az_storage_file_copy_start
-  - az_storage_file_copy_start_batch
+### YamlMime:AzureCLIGroup
+uid: az_storage_file_copy
+name: az storage file copy
+summary: Manage file copy operations.
+description: ''
+directCommands:
 - uid: az_storage_file_copy_cancel
   name: az storage file copy cancel
   summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file copy cancel --copy-id
+                                --destination-path
+                                --destination-share
+                                [--account-key]
+                                [--account-name]
+                                [--connection-string]
+                                [--sas-token]
+                                [--subscription]
+                                [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --copy-id
     summary: Copy identifier provided in the copy.id of the original copy_file operation.
@@ -29,9 +31,7 @@ items:
     name: --destination-share -s
     summary: Name of the destination share. The share must exist.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -47,29 +47,42 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_copy_start
   name: az storage file copy start
   summary: Copy a file asynchronously.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file copy start --destination-path
+                               --destination-share
+                               [--account-key]
+                               [--account-name]
+                               [--connection-string]
+                               [--file-snapshot]
+                               [--metadata]
+                               [--sas-token]
+                               [--source-account-key]
+                               [--source-account-name]
+                               [--source-blob]
+                               [--source-container]
+                               [--source-path]
+                               [--source-sas]
+                               [--source-share]
+                               [--source-snapshot]
+                               [--source-uri]
+                               [--subscription]
+                               [--timeout]
   examples:
   - summary: Copy a file asynchronously.
-    syntax:
-      content: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --account-key 00000000
+    syntax: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --account-key 00000000
   - summary: Copy a file asynchronously from source uri to destination storage account with sas token.
-    syntax:
-      content: az storage file copy start --source-uri "https://srcaccount.file.core.windows.net/myshare/mydir/myfile?<sastoken>" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destinaition-sas>
+    syntax: az storage file copy start --source-uri "https://srcaccount.file.core.windows.net/myshare/mydir/myfile?<sastoken>" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destination-sas>
   - summary: Copy a file asynchronously from file snapshot to destination storage account with sas token.
-    syntax:
-      content: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --file-snapshot "2020-03-02T13:51:54.0000000Z" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destinaition-sas>
-  parameters:
+    syntax: az storage file copy start --source-account-name srcaccount --source-account-key 00000000 --source-path <srcpath-to-file> --source-share srcshare --file-snapshot "2020-03-02T13:51:54.0000000Z" --destination-path <destpath-to-file> --destination-share destshare --account-name destaccount --sas-token <destination-sas>
+  requiredParameters:
   - isRequired: true
     name: --destination-path -p
     summary: The path to the file within the file share.
@@ -78,15 +91,25 @@ items:
     name: --destination-share -s
     summary: Name of the destination share. The share must exist.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
   - name: --file-snapshot
     summary: The file snapshot for the source storage account.
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --source-account-key
     summary: The storage account key of the source blob.
     description: ''
@@ -112,43 +135,52 @@ items:
     summary: The blob snapshot for the source storage account.
     description: ''
   - name: --source-uri -u
-    summary: 'A URL of up to 2 KB in length that specifies an Azure file or blob. The value should be URL-encoded as it would appear in a request URI. If the source is in another account, the source must either be public or must be authenticated via a shared access signature. If the source is public, no authentication is required. Examples: <a href="https://myaccount.file.core.windows.net/myshare/mydir/myfile">https://myaccount.file.core.windows.net/myshare/mydir/myfile</a> <a href="https://otheraccount.file.core.windows.net/myshare/mydir/myfile?sastoken">https://otheraccount.file.core.windows.net/myshare/mydir/myfile?sastoken</a>.'
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    summary: 'A URL of up to 2 KB in length that specifies an Azure file or blob. The value should be URL-encoded as it would appear in a request URI. If the source is in another account, the source must either be public or must be authenticated via a shared access signature. If the source is public, no authentication is required. Examples: https://myaccount.file.core.windows.net/myshare/mydir/myfilehttps://otheraccount.file.core.windows.net/myshare/mydir/myfile?sastoken.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_file_copy_start_batch
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_file_copy_start-batch
   name: az storage file copy start-batch
   summary: Copy multiple files or blobs to a file share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage file copy start-batch [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--destination-path]
+                                     [--destination-share]
+                                     [--dryrun]
+                                     [--metadata]
+                                     [--pattern]
+                                     [--sas-token]
+                                     [--source-account-key]
+                                     [--source-account-name]
+                                     [--source-container]
+                                     [--source-sas]
+                                     [--source-share]
+                                     [--source-uri]
+                                     [--subscription]
+                                     [--timeout]
   examples:
   - summary: Copy all files in a file share to another storage account.
-    syntax:
-      content: az storage file copy start-batch --source-account-name srcaccount --source-account-key 00000000 --source-share srcshare --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --account-key 00000000
+    syntax: az storage file copy start-batch --source-account-name srcaccount --source-account-key 00000000 --source-share srcshare --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --account-key 00000000
   - summary: Copy all files in a file share to another storage account. with sas token.
-    syntax:
-      content: az storage file copy start-batch --source-uri "https://srcaccount.file.core.windows.net/myshare?<sastoken>" --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --sas-token <destinaition-sas>
-  parameters:
+    syntax: az storage file copy start-batch --source-uri "https://srcaccount.file.core.windows.net/myshare?<sastoken>" --destination-path <destpath-to-directory> --destination-share destshare --account-name destaccount --sas-token <destination-sas>
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --destination-path
     summary: The directory where the source data is copied to. If omitted, data is copied to the root directory.
     description: ''
@@ -162,10 +194,10 @@ items:
     summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
     description: ''
   - name: --pattern
-    summary: The pattern used for globbing files and blobs. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to <a href="https://docs.python.org/3.7/library/fnmatch.html">https://docs.python.org/3.7/library/fnmatch.html</a>.
+    summary: The pattern used for globbing files and blobs. The supported patterns are '\*', '?', '[seq]', and '[!seq]'. For more information, please refer to https://docs.python.org/3.7/library/fnmatch.html.
     description: When you use '*' in --pattern, it will match any character including the the directory separator '/'.
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --source-account-key
     summary: The account key for the source storage account. If omitted, the active login is used to determine the account key.
@@ -185,37 +217,17 @@ items:
   - name: --source-uri
     summary: A URI that specifies a the source file share or blob container.
     description: If the source is in another account, the source must either be public or authenticated via a shared access signature.
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_file_copy_cancel
-  name: az storage file copy cancel
-  summary: Aborts a pending copy_file operation, and leaves a destination file  with zero length and full metadata.
-- uid: az_storage_file_copy_start
-  name: az storage file copy start
-  summary: Copy a file asynchronously.
-- uid: az_storage_file_copy_start_batch
-  name: az storage file copy start-batch
-  summary: Copy multiple files or blobs to a file share.
+- az_storage_file_copy_cancel
+- az_storage_file_copy_start
+- az_storage_file_copy_start-batch
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -231,10 +243,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file copy operations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file copy operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/file/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/file/metadata.yml
index 4cd40d40b6..6246500a47 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/file/metadata.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/file/metadata.yml
@@ -1,21 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_file_metadata
-  name: az storage file metadata
-  summary: Manage file metadata.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_file_metadata_show
-  - az_storage_file_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_file_metadata
+name: az storage file metadata
+summary: Manage file metadata.
+description: ''
+directCommands:
 - uid: az_storage_file_metadata_show
   name: az storage file metadata show
   summary: Returns all user-defined metadata for the specified file.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file metadata show --path
+                                  --share-name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--query-examples]
+                                  [--sas-token]
+                                  [--snapshot]
+                                  [--subscription]
+                                  [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -24,12 +28,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -39,25 +38,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_file_metadata_update
   name: az storage file metadata update
   summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage file metadata update --path
+                                    --share-name
+                                    [--account-key]
+                                    [--account-name]
+                                    [--connection-string]
+                                    [--metadata]
+                                    [--sas-token]
+                                    [--subscription]
+                                    [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --path -p
     summary: The path to the file within the file share.
@@ -66,12 +77,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -81,25 +87,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_file_metadata_show
-  name: az storage file metadata show
-  summary: Returns all user-defined metadata for the specified file.
-- uid: az_storage_file_metadata_update
-  name: az storage file metadata update
-  summary: Sets user-defined metadata for the specified file as one or more name-value pairs.
+- az_storage_file_metadata_show
+- az_storage_file_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -115,10 +118,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file metadata.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file metadata.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/fs.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/fs.yml
new file mode 100644
index 0000000000..7d6bcfcc69
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/fs.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_fs
+name: az storage fs
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage fs** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage file systems in Azure Data Lake Storage Gen2 account.
+description: ''
+directCommands:
+- uid: az_storage_fs_list-deleted-path
+  name: az storage fs list-deleted-path
+  summary: List the deleted (file or directory) paths under the specified file system.
+  description: ''
+  syntax: >-
+    az storage fs list-deleted-path --file-system
+                                    [--account-key]
+                                    [--account-name]
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--marker]
+                                    [--num-results]
+                                    [--path-prefix]
+                                    [--sas-token]
+                                    [--timeout]
+  examples:
+  - summary: List the deleted (file or directory) paths under the specified file system..
+    syntax: az storage fs list-deleted-path -f myfilesystem --account-name mystorageccount --account-key 00000000
+  requiredParameters:
+  - isRequired: true
+    name: --file-system -f
+    summary: File system name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --marker
+    summary: A string value that identifies the portion of the list of containers to be returned with the next listing operation. The operation returns the NextMarker value within the response body if the listing operation did not return all containers remaining to be listed with the current page. If specified, this generator will begin returning results from the point where the previous generator stopped.
+    description: ''
+  - name: --num-results
+    summary: Specify the maximum number to return.
+    description: ''
+  - name: --path-prefix
+    summary: Filter the results to return only paths under the specified path.
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+- uid: az_storage_fs_undelete-path
+  name: az storage fs undelete-path
+  summary: Restore soft-deleted path.
+  description: Operation will only be successful if used within the specified number of days set in the delete retention policy.
+  syntax: >-
+    az storage fs undelete-path --deleted-path-name
+                                --deletion-id
+                                --file-system
+                                [--account-key]
+                                [--account-name]
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--sas-token]
+                                [--timeout]
+  examples:
+  - summary: Restore soft-deleted path.
+    syntax: az storage fs undelete-path -f myfilesystem --deleted-path-name dir --deletion-id 0000 --account-name mystorageccount --account-key 00000000
+  requiredParameters:
+  - isRequired: true
+    name: --deleted-path-name
+    summary: Specifies the path (file or directory) to restore.
+    description: ''
+  - isRequired: true
+    name: --deletion-id
+    summary: 'Specifies the version of the deleted path to restore. :keyword int timeout: The timeout parameter is expressed in seconds.'
+    description: ''
+  - isRequired: true
+    name: --file-system -f
+    summary: File system name.
+    description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+commands:
+- az_storage_fs_list-deleted-path
+- az_storage_fs_service-properties
+- az_storage_fs_service-properties_show
+- az_storage_fs_service-properties_update
+- az_storage_fs_undelete-path
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage file systems in Azure Data Lake Storage Gen2 account.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/fs/service-properties.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/fs/service-properties.yml
new file mode 100644
index 0000000000..b68773644e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/fs/service-properties.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_storage_fs_service-properties
+name: az storage fs service-properties
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storage-preview** extension for Azure CLI and requires version 2.21.0 or higher.  The extension will automatically install the first time you run an **az storage fs service-properties** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage storage datalake service properties.
+description: ''
+directCommands:
+- uid: az_storage_fs_service-properties_show
+  name: az storage fs service-properties show
+  summary: Show the properties of a storage account's datalake service, including Azure Storage Analytics.
+  description: ''
+  syntax: >-
+    az storage fs service-properties show [--account-key]
+                                          [--account-name]
+                                          [--auth-mode {key, login}]
+                                          [--connection-string]
+                                          [--sas-token]
+  examples:
+  - summary: Show the properties of a storage account's datalake service
+    syntax: az storage fs service-properties show --account-name mystorageccount --account-key 00000000
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+- uid: az_storage_fs_service-properties_update
+  name: az storage fs service-properties update
+  summary: Update the properties of a storage account's datalake service, including Azure Storage Analytics.
+  description: ''
+  syntax: >-
+    az storage fs service-properties update [--404-document]
+                                            [--account-key]
+                                            [--account-name]
+                                            [--auth-mode {key, login}]
+                                            [--connection-string]
+                                            [--delete-retention {false, true}]
+                                            [--delete-retention-period]
+                                            [--index-document]
+                                            [--sas-token]
+                                            [--static-website {false, true}]
+  examples:
+  - summary: Update the properties of a storage account's datalake service
+    syntax: az storage fs service-properties update --delete-retention --delete-retention-period 7 --account-name mystorageccount --account-key 00000000
+  optionalParameters:
+  - name: --404-document
+    summary: Represent the path to the error document that should be shown when an error 404 is issued, in other words, when a browser requests a page that does not exist.
+    description: ''
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --auth-mode
+    parameterValueGroup: key, login
+    summary: 'The mode in which to run the command. "login" mode will directly use your login credentials for the authentication. The legacy "key" mode will attempt to query for an account key if no authentication parameters for the account are provided. Environment variable: AZURE_STORAGE_AUTH_MODE.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
+  - name: --delete-retention
+    parameterValueGroup: false, true
+    summary: Enable soft-delete.
+    description: ''
+  - name: --delete-retention-period --period
+    summary: Number of days that soft-deleted fs will be retained. Must be in range [1,365].
+    description: ''
+  - name: --index-document
+    summary: Represent the name of the index document. This is commonly "index.html".
+    description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
+  - name: --static-website
+    parameterValueGroup: false, true
+    summary: Enable static-website.
+    description: ''
+commands:
+- az_storage_fs_service-properties_show
+- az_storage_fs_service-properties_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage storage datalake service properties.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/logging.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/logging.yml
index 43299d17db..aae411ca1e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/logging.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/logging.yml
@@ -1,33 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_logging
-  name: az storage logging
-  summary: Manage storage service logging information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_logging_off
-  - az_storage_logging_show
-  - az_storage_logging_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_logging
+name: az storage logging
+summary: Manage storage service logging information.
+description: ''
+directCommands:
 - uid: az_storage_logging_off
   name: az storage logging off
   summary: Turn off logging for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage logging off [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--services]
+                           [--subscription]
+                           [--timeout]
   examples:
   - summary: Turn off logging for a storage account.
-    syntax:
-      content: az storage logging off --account-name MyAccount
-  parameters:
-  - name: --services
-    defaultValue: bqt
-    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage logging off --account-name MyAccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -40,33 +32,34 @@ items:
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bqt
+    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_logging_show
   name: az storage logging show
   summary: Show logging settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage logging show [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--query-examples]
+                            [--sas-token]
+                            [--services]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Show logging settings for a storage account. (autogenerated)
-    syntax:
-      content: az storage logging show --account-name MyAccount --services qt
-  parameters:
-  - name: --services
-    defaultValue: bqt
-    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage logging show --account-name MyAccount --services qt
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -76,25 +69,39 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bqt
+    summary: 'The storage services from which to retrieve logging info: (b)lob (q)ueue (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_logging_update
   name: az storage logging update
   summary: Update logging settings for a storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage logging update --log
+                              --retention
+                              --services
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+                              [--version]
+  requiredParameters:
   - isRequired: true
     name: --log
     summary: 'The operations for which to enable logging: (r)ead (w)rite (d)elete. Can be combined.'
@@ -107,12 +114,7 @@ items:
     name: --services
     summary: 'The storage service(s) for which to update logging info: (b)lob (q)ueue (t)able. Can be combined.'
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --version
-    summary: Version of the logging schema.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -128,22 +130,17 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --version
+    summary: Version of the logging schema.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_logging_off
-  name: az storage logging off
-  summary: Turn off logging for a storage account.
-- uid: az_storage_logging_show
-  name: az storage logging show
-  summary: Show logging settings for a storage account.
-- uid: az_storage_logging_update
-  name: az storage logging update
-  summary: Update logging settings for a storage account.
+- az_storage_logging_off
+- az_storage_logging_show
+- az_storage_logging_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -159,10 +156,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage service logging information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage service logging information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/message.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/message.yml
index e11f6acaf1..ba4d836ee2 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/message.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/message.yml
@@ -1,32 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_message
-  name: az storage message
-  summary: Manage queue storage messages.
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_message_clear
-  - az_storage_message_delete
-  - az_storage_message_get
-  - az_storage_message_peek
-  - az_storage_message_put
-  - az_storage_message_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_message
+name: az storage message
+summary: Manage queue storage messages.
+description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+directCommands:
 - uid: az_storage_message_clear
   name: az storage message clear
   summary: Deletes all messages from the specified queue.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message clear --queue-name
+                             [--account-key]
+                             [--account-name]
+                             [--connection-string]
+                             [--sas-token]
+                             [--subscription]
+                             [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -42,19 +37,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_delete
   name: az storage message delete
   summary: Deletes the specified message.
   description: 'Normally after a client retrieves a message with the get_messages operation,  the client is expected to process and delete the message. To delete the  message, you must have two items of data: id and pop_receipt. The  id is returned from the previous get_messages operation. The  pop_receipt is returned from the most recent get_messages() or  update_message() operation. In order for the delete_message operation  to succeed, the pop_receipt specified on the request must match the  pop_receipt returned from the get_messages() or update_message()  operation.'
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message delete --id
+                              --pop-receipt
+                              --queue-name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The message id identifying the message to delete.
@@ -67,9 +68,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -85,32 +84,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_get
   name: az storage message get
   summary: Retrieves one or more messages from the front of the queue.
   description: When a message is retrieved from the queue, the response includes the message  content and a pop_receipt value, which is required to delete the message.  The message is not automatically deleted from the queue, but after it has  been retrieved, it is not visible to other clients for the time interval  specified by the visibility_timeout parameter.  If the key-encryption-key or resolver field is set on the local service object, the messages will be decrypted before being returned.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message get --queue-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--num-messages]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+                           [--visibility-timeout]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --num-messages
-    summary: A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --visibility-timeout
-    summary: Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 1 second, and cannot be larger than 7 days. The visibility timeout of a message can be set to a value later than the expiry time.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -120,35 +117,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --num-messages
+    summary: A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. If fewer are visible, the visible messages are returned. By default, a single message is retrieved from the queue with this operation.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --visibility-timeout
+    summary: Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 1 second, and cannot be larger than 7 days. The visibility timeout of a message can be set to a value later than the expiry time.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_peek
   name: az storage message peek
   summary: Retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.
   description: Only messages that are visible may be retrieved. When a message is retrieved  for the first time with a call to get_messages, its dequeue_count property  is set to 1. If it is not deleted and is subsequently retrieved again, the  dequeue_count property is incremented. The client may use this value to  determine how many times a message has been retrieved. Note that a call  to peek_messages does not increment the value of DequeueCount, but returns  this value for the client to read.  If the key-encryption-key or resolver field is set on the local service object, the messages will be decrypted before being returned.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message peek --queue-name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--num-messages]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --num-messages
-    summary: A nonzero integer value that specifies the number of messages to peek from the queue, up to a maximum of 32. By default, a single message is peeked from the queue with this operation.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -158,25 +161,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --num-messages
+    summary: A nonzero integer value that specifies the number of messages to peek from the queue, up to a maximum of 32. By default, a single message is peeked from the queue with this operation.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_put
   name: az storage message put
   summary: Adds a new message to the back of the message queue.
   description: The visibility timeout specifies the time that the message will be  invisible. After the timeout expires, the message will become visible.  If a visibility timeout is not specified, the default value of 0 is used.  The message time-to-live specifies how long a message will remain in the  queue. The message will be deleted from the queue when the time-to-live  period expires.  If the key-encryption-key field is set on the local service object, this method will encrypt the content before uploading.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message put --content
+                           --queue-name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--time-to-live]
+                           [--timeout]
+                           [--visibility-timeout]
+  requiredParameters:
   - isRequired: true
     name: --content
     summary: Message content, up to 64KB in size.
@@ -185,15 +198,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --time-to-live
-    summary: Specifies the time-to-live interval for the message, in seconds. The maximum time-to-live allowed is 7 days. If this parameter is omitted, the default time-to-live is 7 days.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --visibility-timeout
-    summary: If not specified, the default value is 0. Specifies the new visibility timeout value, in seconds, relative to server time. The value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. visibility_timeout should be set to a value smaller than the time-to-live value.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -209,19 +214,33 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --time-to-live
+    summary: Specifies the time-to-live interval for the message, in seconds. The maximum time-to-live allowed is 7 days. If this parameter is omitted, the default time-to-live is 7 days.
+    description: ''
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  - name: --visibility-timeout
+    summary: If not specified, the default value is 0. Specifies the new visibility timeout value, in seconds, relative to server time. The value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. visibility_timeout should be set to a value smaller than the time-to-live value.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_message_update
   name: az storage message update
   summary: Updates the visibility timeout of a message.
   description: You can also use this operation to update the contents of a message.  This operation can be used to continually extend the invisibility of a  queue message. This functionality can be useful if you want a worker role  to "lease" a queue message. For example, if a worker role calls get_messages  and recognizes that it needs more time to process a message, it can  continually extend the message's invisibility until it is processed. If  the worker role were to fail during processing, eventually the message  would become visible again and another worker role could process it.  If the key-encryption-key field is set on the local service object, this method will encrypt the content before uploading.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage message update --id
+                              --pop-receipt
+                              --queue-name
+                              --visibility-timeout
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--content]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The message id identifying the message to update.
@@ -238,12 +257,7 @@ items:
     name: --visibility-timeout
     summary: Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. A message can be updated until it has been deleted or has expired.
     description: ''
-  - name: --content
-    summary: Message content, up to 64KB in size.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -253,37 +267,26 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --content
+    summary: Message content, up to 64KB in size.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_message_clear
-  name: az storage message clear
-  summary: Deletes all messages from the specified queue.
-- uid: az_storage_message_delete
-  name: az storage message delete
-  summary: Deletes the specified message.
-- uid: az_storage_message_get
-  name: az storage message get
-  summary: Retrieves one or more messages from the front of the queue.
-- uid: az_storage_message_peek
-  name: az storage message peek
-  summary: Retrieves one or more messages from the front of the queue, but does not alter the visibility of the message.
-- uid: az_storage_message_put
-  name: az storage message put
-  summary: Adds a new message to the back of the message queue.
-- uid: az_storage_message_update
-  name: az storage message update
-  summary: Updates the visibility timeout of a message.
+- az_storage_message_clear
+- az_storage_message_delete
+- az_storage_message_get
+- az_storage_message_peek
+- az_storage_message_put
+- az_storage_message_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -299,10 +302,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/metrics.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/metrics.yml
index ab73363829..748f4eb664 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/metrics.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/metrics.yml
@@ -1,37 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_metrics
-  name: az storage metrics
-  summary: Manage storage service metrics.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_metrics_show
-  - az_storage_metrics_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_metrics
+name: az storage metrics
+summary: Manage storage service metrics.
+description: ''
+directCommands:
 - uid: az_storage_metrics_show
   name: az storage metrics show
   summary: Show metrics settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage metrics show [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--interval {both, hour, minute}]
+                            [--query-examples]
+                            [--sas-token]
+                            [--services]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Show metrics settings for a storage account. (autogenerated)
-    syntax:
-      content: az storage metrics show --account-key 00000000 --account-name MyAccount
-  parameters:
-  - name: --interval
-    defaultValue: both
-    parameterValueGroup: both, hour, minute
-    summary: Filter the set of metrics to retrieve by time interval.
-    description: ''
-  - name: --services
-    defaultValue: bfqt
-    summary: 'The storage services from which to retrieve metrics info: (b)lob (q)ueue (t)able. Can be combined.'
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+    syntax: az storage metrics show --account-key 00000000 --account-name MyAccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -41,29 +31,50 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --interval
+    defaultValue: both
+    parameterValueGroup: both, hour, minute
+    summary: Filter the set of metrics to retrieve by time interval.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --services
+    defaultValue: bfqt
+    summary: 'The storage services from which to retrieve metrics info: (b)lob (q)ueue (t)able. Can be combined.'
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_metrics_update
   name: az storage metrics update
   summary: Update metrics settings for a storage account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage metrics update --retention
+                              --services
+                              [--account-key]
+                              [--account-name]
+                              [--api {false, true}]
+                              [--connection-string]
+                              [--hour {false, true}]
+                              [--minute {false, true}]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
   examples:
   - summary: Update metrics settings for a storage account. (autogenerated)
-    syntax:
-      content: az storage metrics update --account-name MyAccount --api true --hour true --minute true --retention 10 --services bfqt
-  parameters:
+    syntax: az storage metrics update --account-name MyAccount --api true --hour true --minute true --retention 10 --services bfqt
+  - summary: Update metrics settings for a storage account by connection string. (autogenerated)
+    syntax: az storage metrics update --api true --connection-string $connectionString --hour true --minute true --retention 10 --services bfqt
+  requiredParameters:
   - isRequired: true
     name: --retention
     summary: Number of days for which to retain metrics. 0 to disable. Applies to both hour and minute metrics if both are specified.
@@ -72,10 +83,20 @@ items:
     name: --services
     summary: 'The storage services from which to retrieve metrics info: (b)lob (q)ueue (t)able. Can be combined.'
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --api
     parameterValueGroup: false, true
     summary: Specify whether to include API in metrics. Applies to both hour and minute metrics if both are specified. Must be specified if hour or minute metrics are enabled and being updated.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --hour
     parameterValueGroup: false, true
     summary: Update the hourly metrics.
@@ -84,37 +105,19 @@ items:
     parameterValueGroup: false, true
     summary: Update the by-minute metrics.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_metrics_show
-  name: az storage metrics show
-  summary: Show metrics settings for a storage account.
-- uid: az_storage_metrics_update
-  name: az storage metrics update
-  summary: Update metrics settings for a storage account.
+- az_storage_metrics_show
+- az_storage_metrics_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -130,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage storage service metrics.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage service metrics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/queue.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/queue.yml
index 8721041970..7f174b01be 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/queue.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/queue.yml
@@ -1,38 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_queue
-  name: az storage queue
-  summary: Manage shared access policies of a storage table.
-  description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
-  langs:
-  - azurecli
-  children:
-  - az_storage_queue_create
-  - az_storage_queue_delete
-  - az_storage_queue_exists
-  - az_storage_queue_generate_sas
-  - az_storage_queue_list
-  - az_storage_queue_stats
+### YamlMime:AzureCLIGroup
+uid: az_storage_queue
+name: az storage queue
+summary: Manage storage queues.
+description: ''
+directCommands:
 - uid: az_storage_queue_create
   name: az storage queue create
   summary: Creates a queue under the given account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue create --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-on-exist]
+                            [--metadata]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --fail-on-exist
-    summary: Specifies whether to throw an exception if the queue already exists.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -42,35 +33,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Specifies whether to throw an exception if the queue already exists.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_delete
   name: az storage queue delete
   summary: Deletes the specified queue and any messages it contains.
   description: When a queue is successfully deleted, it is immediately marked for deletion  and is no longer accessible to clients. The queue is later removed from  the Queue service during garbage collection.  Note that deleting a queue is likely to take at least 40 seconds to complete.  If an operation is attempted against the queue while it was being deleted,  an AzureConflictHttpError will be thrown.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue delete --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-not-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --fail-not-exist
-    summary: Specifies whether to throw an exception if the queue doesn't exist.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -80,32 +77,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specifies whether to throw an exception if the queue doesn't exist.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_exists
   name: az storage queue exists
   summary: Returns a boolean indicating whether the queue exists.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue exists --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -121,23 +123,42 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_queue_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_queue_generate-sas
   name: az storage queue generate-sas
   summary: Generates a shared access signature for the queue.
   description: Use the returned signature with the sas_token parameter of QueueService.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue generate-sas --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--expiry]
+                                  [--https-only]
+                                  [--ip]
+                                  [--permissions]
+                                  [--policy-name]
+                                  [--sas-token]
+                                  [--start]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --expiry
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes invalid. Do not use if a stored access policy is referenced with --id that specifies this value.
     description: ''
@@ -153,9 +174,36 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the share's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_queue_list
+  name: az storage queue list
+  summary: List queues in a storage account.
+  description: ''
+  syntax: >-
+    az storage queue list [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--include-metadata]
+                          [--marker]
+                          [--num-results]
+                          [--prefix]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  examples:
+  - summary: List queues whose names begin with 'myprefix' under the storage account 'mystorageaccount'(account name)
+    syntax: az storage queue list --prefix myprefix --account-name mystorageaccount
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -165,25 +213,6 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_queue_list
-  name: az storage queue list
-  summary: List queues in a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
   - name: --include-metadata
     summary: Specifies that container metadata be returned in the response.
     description: ''
@@ -196,17 +225,8 @@ items:
   - name: --prefix
     summary: Filters the results to return only queues with names that begin with the specified prefix.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -214,22 +234,22 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_stats
   name: az storage queue stats
   summary: Retrieves statistics related to replication for the Queue service.
   description: It is  only available when read-access geo-redundant replication is enabled for  the storage account.  With geo-redundant replication, Azure Storage maintains your data durable  in two locations. In both locations, Azure Storage constantly maintains  multiple healthy replicas of your data. The location where you read,  create, update, or delete data is the primary storage account location.  The primary location exists in the region you choose at the time you  create an account via the Azure Management Azure classic portal, for  example, North Central US. The location to which your data is replicated  is the secondary location. The secondary location is automatically  determined based on the location of the primary; it is in a second data  center that resides in the same region as the primary location. Read-only  access is available from the secondary location, if read-access geo-redundant  replication is enabled for your storage account.
-  langs:
-  - azurecli
-  parameters:
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  syntax: >-
+    az storage queue stats [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -245,58 +265,26 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_queue_create
-  name: az storage queue create
-  summary: Creates a queue under the given account.
-- uid: az_storage_queue_delete
-  name: az storage queue delete
-  summary: Deletes the specified queue and any messages it contains.
-- uid: az_storage_queue_exists
-  name: az storage queue exists
-  summary: Returns a boolean indicating whether the queue exists.
-- uid: az_storage_queue_generate_sas
-  name: az storage queue generate-sas
-  summary: Generates a shared access signature for the queue.
-- uid: az_storage_queue_list
-  name: az storage queue list
-  summary: List queues in a storage account.
-- uid: az_storage_queue_metadata
-  name: az storage queue metadata
-  summary: Manage the metadata for a storage queue.
-- uid: az_storage_queue_metadata_show
-  name: az storage queue metadata show
-  summary: Retrieves user-defined metadata and queue properties on the specified queue.
-- uid: az_storage_queue_metadata_update
-  name: az storage queue metadata update
-  summary: Sets user-defined metadata on the specified queue.
-- uid: az_storage_queue_policy
-  name: az storage queue policy
-  summary: Manage shared access policies for a storage queue.
-- uid: az_storage_queue_policy_create
-  name: az storage queue policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_queue_policy_delete
-  name: az storage queue policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_queue_policy_list
-  name: az storage queue policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_queue_policy_show
-  name: az storage queue policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_queue_policy_update
-  name: az storage queue policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_queue_stats
-  name: az storage queue stats
-  summary: Retrieves statistics related to replication for the Queue service.
+- az_storage_queue_create
+- az_storage_queue_delete
+- az_storage_queue_exists
+- az_storage_queue_generate-sas
+- az_storage_queue_list
+- az_storage_queue_metadata
+- az_storage_queue_metadata_show
+- az_storage_queue_metadata_update
+- az_storage_queue_policy
+- az_storage_queue_policy_create
+- az_storage_queue_policy_delete
+- az_storage_queue_policy_list
+- az_storage_queue_policy_show
+- az_storage_queue_policy_update
+- az_storage_queue_stats
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -312,10 +300,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: 'Please specify one of the following authentication parameters for your commands: --auth-mode, --account-key, --connection-string, --sas-token. You also can use corresponding environment variables to store your authentication credentials, e.g. AZURE_STORAGE_KEY, AZURE_STORAGE_CONNECTION_STRING and AZURE_STORAGE_SAS_TOKEN.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage storage queues.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/queue/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/queue/metadata.yml
index e01082a00d..d418ae5332 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/queue/metadata.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/queue/metadata.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_queue_metadata
-  name: az storage queue metadata
-  summary: Manage the metadata for a storage queue.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_queue_metadata_show
-  - az_storage_queue_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_queue_metadata
+name: az storage queue metadata
+summary: Manage the metadata for a storage queue.
+description: ''
+directCommands:
 - uid: az_storage_queue_metadata_show
   name: az storage queue metadata show
   summary: Retrieves user-defined metadata and queue properties on the specified queue.
   description: Metadata is associated with the queue as name-value pairs.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue metadata show --name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--query-examples]
+                                   [--sas-token]
+                                   [--subscription]
+                                   [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -32,35 +32,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_metadata_update
   name: az storage queue metadata update
   summary: Sets user-defined metadata on the specified queue.
   description: Metadata is associated with the queue as name-value pairs.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue metadata update --name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--metadata]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The queue name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -70,25 +73,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_queue_metadata_show
-  name: az storage queue metadata show
-  summary: Retrieves user-defined metadata and queue properties on the specified queue.
-- uid: az_storage_queue_metadata_update
-  name: az storage queue metadata update
-  summary: Sets user-defined metadata on the specified queue.
+- az_storage_queue_metadata_show
+- az_storage_queue_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -104,10 +104,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage the metadata for a storage queue.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage the metadata for a storage queue.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/queue/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/queue/policy.yml
index a7b5a6c2ad..0c83d78191 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/queue/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/queue/policy.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_queue_policy
-  name: az storage queue policy
-  summary: Manage shared access policies for a storage queue.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_queue_policy_create
-  - az_storage_queue_policy_delete
-  - az_storage_queue_policy_list
-  - az_storage_queue_policy_show
-  - az_storage_queue_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_queue_policy
+name: az storage queue policy
+summary: Manage shared access policies for a storage queue.
+description: ''
+directCommands:
 - uid: az_storage_queue_policy_create
   name: az storage queue policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy create --name
+                                   --queue-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -27,15 +28,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_delete
   name: az storage queue policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy delete --name
+                                   --queue-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--sas-token]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -72,6 +75,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,23 +91,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_list
   name: az storage queue policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy list --queue-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --queue-name -q
     summary: The queue name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -113,25 +119,30 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_show
   name: az storage queue policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy show --name
+                                 --queue-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -140,6 +151,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -149,25 +161,32 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_queue_policy_update
   name: az storage queue policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage queue policy update --name
+                                   --queue-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -176,15 +195,7 @@ items:
     name: --queue-name -q
     summary: The queue name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -194,34 +205,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (a)dd (p)rocess (r)ead (u)pdate. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_queue_policy_create
-  name: az storage queue policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_queue_policy_delete
-  name: az storage queue policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_queue_policy_list
-  name: az storage queue policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_queue_policy_show
-  name: az storage queue policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_queue_policy_update
-  name: az storage queue policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_queue_policy_create
+- az_storage_queue_policy_delete
+- az_storage_queue_policy_list
+- az_storage_queue_policy_show
+- az_storage_queue_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -237,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage shared access policies for a storage queue.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage shared access policies for a storage queue.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/share.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/share.yml
index aa86336e98..f1ddb182ff 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/share.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/share.yml
@@ -1,49 +1,33 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_share
-  name: az storage share
-  summary: Manage file shares.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_share_create
-  - az_storage_share_delete
-  - az_storage_share_exists
-  - az_storage_share_generate_sas
-  - az_storage_share_list
-  - az_storage_share_show
-  - az_storage_share_snapshot
-  - az_storage_share_stats
-  - az_storage_share_update
-  - az_storage_share_url
+### YamlMime:AzureCLIGroup
+uid: az_storage_share
+name: az storage share
+summary: Manage file shares.
+description: ''
+directCommands:
 - uid: az_storage_share_create
   name: az storage share create
   summary: Creates a new share under the specified account.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share create --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-on-exist]
+                            [--metadata]
+                            [--quota]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Creates a new share under the specified account. (autogenerated)
-    syntax:
-      content: az storage share create --account-name MyAccount --name MyFileShare
-  parameters:
+    syntax: az storage share create --account-name MyAccount --name MyFileShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --fail-on-exist
-    summary: Specify whether to throw an exception when the share exists. False by default.
-    description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --quota
-    summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120).
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -53,42 +37,46 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Specify whether to throw an exception when the share exists. False by default.
+    description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --quota
+    summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_delete
   name: az storage share delete
   summary: Marks the specified share for deletion.
   description: If the share does not exist, the operation fails on the service. By  default, the exception is swallowed by the client. To expose the exception, specify True for fail_not_exist.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share delete --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--delete-snapshots {include}]
+                            [--fail-not-exist]
+                            [--sas-token]
+                            [--snapshot]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --delete-snapshots
-    parameterValueGroup: include
-    summary: Specify the deletion strategy when the share has snapshots.
-    description: ''
-  - name: --fail-not-exist
-    summary: Specify whether to throw an exception when the share doesn't exist. False by default.
-    description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable. Specify this argument to delete a specific snapshot only. delete_snapshots must be None if this is specified.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -98,42 +86,50 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --delete-snapshots
+    parameterValueGroup: include
+    summary: Specify the deletion strategy when the share has snapshots.
+    description: ''
+  - name: --fail-not-exist
+    summary: Specify whether to throw an exception when the share doesn't exist. False by default.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable. Specify this argument to delete a specific snapshot only. delete_snapshots must be None if this is specified.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_exists
   name: az storage share exists
   summary: Check for the existence of a file share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share exists --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--snapshot]
+                            [--subscription]
+                            [--timeout]
   examples:
   - summary: Check for the existence of a file share. (autogenerated)
-    syntax:
-      content: az storage share exists --account-key 00000000 --account-name MyAccount --name MyFileShare
+    syntax: az storage share exists --account-key 00000000 --account-name MyAccount --name MyFileShare
   - summary: Check for the existence of a file share (autogenerated)
-    syntax:
-      content: az storage share exists --connection-string $connectionString --name MyFileShare
-  parameters:
+    syntax: az storage share exists --connection-string $connectionString --name MyFileShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -146,44 +142,68 @@ items:
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_share_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_share_generate-sas
   name: az storage share generate-sas
   summary: Generates a shared access signature for the share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share generate-sas --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--cache-control]
+                                  [--connection-string]
+                                  [--content-disposition]
+                                  [--content-encoding]
+                                  [--content-language]
+                                  [--content-type]
+                                  [--expiry]
+                                  [--https-only]
+                                  [--ip]
+                                  [--permissions]
+                                  [--policy-name]
+                                  [--sas-token]
+                                  [--start]
+                                  [--subscription]
   examples:
   - summary: Generate a sas token for a fileshare and use it to upload a file.
-    syntax:
-      content: >-
-        end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
+    syntax: >-
+      end=`date -u -d "30 minutes" '+%Y-%m-%dT%H:%MZ'`
 
-        sas=`az storage share generate-sas -n MyShare --account-name MyStorageAccount --https-only --permissions dlrw --expiry $end -o tsv`
+      sas=`az storage share generate-sas -n MyShare --account-name MyStorageAccount --https-only --permissions dlrw --expiry $end -o tsv`
 
-        az storage file upload -s MyShare --account-name MyStorageAccount --source file.txt  --sas-token $sas
+      az storage file upload -s MyShare --account-name MyStorageAccount --source file.txt  --sas-token $sas
   - summary: Generate a shared access signature for the share. (autogenerated)
-    syntax:
-      content: az storage share generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --name MyShare --permissions dlrw
+    syntax: az storage share generate-sas --account-key 00000000 --account-name MyStorageAccount --expiry 2037-12-31T23:59:00Z --name MyShare --permissions dlrw
   - summary: Generate a shared access signature for the share. (autogenerated)
-    syntax:
-      content: az storage share generate-sas --connection-string $connectionString --expiry 2019-02-01T12:20Z --name MyShare --permissions dlrw
-  parameters:
+    syntax: az storage share generate-sas --connection-string $connectionString --expiry 2019-02-01T12:20Z --name MyShare --permissions dlrw
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
   - name: --cache-control
     summary: Response header value for Cache-Control when resource is accessed using this shared access signature.
     description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --content-disposition
     summary: Response header value for Content-Disposition when resource is accessed using this shared access signature.
     description: ''
@@ -211,9 +231,34 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the share's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_share_list
+  name: az storage share list
+  summary: List the file shares in a storage account.
+  description: ''
+  syntax: >-
+    az storage share list [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--include-metadata]
+                          [--include-snapshots]
+                          [--marker]
+                          [--num-results]
+                          [--prefix]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -223,25 +268,6 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_share_list
-  name: az storage share list
-  summary: List the file shares in a storage account.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
   - name: --include-metadata
     summary: Specifies that share metadata be returned in the response.
     description: ''
@@ -258,17 +284,8 @@ items:
   - name: --prefix
     summary: Filters the results to return only shares whose names begin with the specified prefix.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
@@ -276,29 +293,30 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_show
   name: az storage share show
   summary: Returns all user-defined metadata and system properties for the specified share.
   description: The data returned does not include the shares's list of files or directories.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share show --name
+                          [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--query-examples]
+                          [--sas-token]
+                          [--snapshot]
+                          [--subscription]
+                          [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -308,38 +326,42 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_snapshot
   name: az storage share snapshot
   summary: Creates a snapshot of an existing share under the specified account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share snapshot --name
+                              [--account-key]
+                              [--account-name]
+                              [--connection-string]
+                              [--metadata]
+                              [--quota]
+                              [--sas-token]
+                              [--subscription]
+                              [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --quota
-    summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120).
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -349,32 +371,40 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
+  - name: --quota
+    summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120).
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_stats
   name: az storage share stats
   summary: Gets the approximate size of the data stored on the share, rounded up to the nearest gigabyte.
   description: Note that this value may not include all recently created or recently resized files.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share stats --name
+                           [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -390,19 +420,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_update
   name: az storage share update
   summary: Sets service-defined properties for the specified share.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share update --name
+                            --quota
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
@@ -411,9 +446,7 @@ items:
     name: --quota
     summary: Specifies the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5 TB (5120 GB).
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -429,35 +462,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_url
   name: az storage share url
   summary: Create a URI to access a file share.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az storage share url --name
+                         [--account-key]
+                         [--account-name]
+                         [--connection-string]
+                         [--protocol {http, https}]
+                         [--sas-token]
+                         [--subscription]
+                         [--unc]
   examples:
   - summary: Create a URI to access a file share. (autogenerated)
-    syntax:
-      content: az storage share url --account-key 00000000 --account-name MyAccount --name MyFileShare
-  parameters:
+    syntax: az storage share url --account-key 00000000 --account-name MyAccount --name MyFileShare
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --protocol
-    defaultValue: https
-    parameterValueGroup: http, https
-    summary: Protocol to use.
-    description: ''
-  - name: --unc
-    summary: Output UNC network path.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -467,76 +497,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --protocol
+    defaultValue: https
+    parameterValueGroup: http, https
+    summary: Protocol to use.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --unc
+    summary: Output UNC network path.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_share_create
-  name: az storage share create
-  summary: Creates a new share under the specified account.
-- uid: az_storage_share_delete
-  name: az storage share delete
-  summary: Marks the specified share for deletion.
-- uid: az_storage_share_exists
-  name: az storage share exists
-  summary: Check for the existence of a file share.
-- uid: az_storage_share_generate_sas
-  name: az storage share generate-sas
-  summary: Generates a shared access signature for the share.
-- uid: az_storage_share_list
-  name: az storage share list
-  summary: List the file shares in a storage account.
-- uid: az_storage_share_metadata
-  name: az storage share metadata
-  summary: Manage the metadata of a file share.
-- uid: az_storage_share_metadata_show
-  name: az storage share metadata show
-  summary: Returns all user-defined metadata for the specified share.
-- uid: az_storage_share_metadata_update
-  name: az storage share metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified share.
-- uid: az_storage_share_policy
-  name: az storage share policy
-  summary: Manage shared access policies of a storage file share.
-- uid: az_storage_share_policy_create
-  name: az storage share policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_share_policy_delete
-  name: az storage share policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_share_policy_list
-  name: az storage share policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_share_policy_show
-  name: az storage share policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_share_policy_update
-  name: az storage share policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_share_show
-  name: az storage share show
-  summary: Returns all user-defined metadata and system properties for the specified share.
-- uid: az_storage_share_snapshot
-  name: az storage share snapshot
-  summary: Creates a snapshot of an existing share under the specified account.
-- uid: az_storage_share_stats
-  name: az storage share stats
-  summary: Gets the approximate size of the data stored on the share, rounded up to the nearest gigabyte.
-- uid: az_storage_share_update
-  name: az storage share update
-  summary: Sets service-defined properties for the specified share.
-- uid: az_storage_share_url
-  name: az storage share url
-  summary: Create a URI to access a file share.
+- az_storage_share_create
+- az_storage_share_delete
+- az_storage_share_exists
+- az_storage_share_generate-sas
+- az_storage_share_list
+- az_storage_share_metadata
+- az_storage_share_metadata_show
+- az_storage_share_metadata_update
+- az_storage_share_policy
+- az_storage_share_policy_create
+- az_storage_share_policy_delete
+- az_storage_share_policy_list
+- az_storage_share_policy_show
+- az_storage_share_policy_update
+- az_storage_share_show
+- az_storage_share_snapshot
+- az_storage_share_stats
+- az_storage_share_update
+- az_storage_share_url
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -552,10 +547,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage file shares.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage file shares.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/share/metadata.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/share/metadata.yml
index 3163481c91..2f1c5aa4b1 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/share/metadata.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/share/metadata.yml
@@ -1,31 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_share_metadata
-  name: az storage share metadata
-  summary: Manage the metadata of a file share.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_share_metadata_show
-  - az_storage_share_metadata_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_share_metadata
+name: az storage share metadata
+summary: Manage the metadata of a file share.
+description: ''
+directCommands:
 - uid: az_storage_share_metadata_show
   name: az storage share metadata show
   summary: Returns all user-defined metadata for the specified share.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share metadata show --name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--query-examples]
+                                   [--sas-token]
+                                   [--snapshot]
+                                   [--subscription]
+                                   [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --snapshot
-    summary: A string that represents the snapshot version, if applicable.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -35,35 +33,41 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --snapshot
+    summary: A string that represents the snapshot version, if applicable.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_metadata_update
   name: az storage share metadata update
   summary: Sets one or more user-defined name-value pairs for the specified share.
   description: Each call to this operation replaces all existing metadata attached to the share. To remove all metadata from the share, call this operation with no metadata dict.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share metadata update --name
+                                     [--account-key]
+                                     [--account-name]
+                                     [--connection-string]
+                                     [--metadata]
+                                     [--sas-token]
+                                     [--subscription]
+                                     [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The file share name.
     description: ''
-  - name: --metadata
-    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -73,25 +77,22 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --metadata
+    summary: Metadata in space-separated key=value pairs. This overwrites any existing metadata.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_share_metadata_show
-  name: az storage share metadata show
-  summary: Returns all user-defined metadata for the specified share.
-- uid: az_storage_share_metadata_update
-  name: az storage share metadata update
-  summary: Sets one or more user-defined name-value pairs for the specified share.
+- az_storage_share_metadata_show
+- az_storage_share_metadata_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -107,10 +108,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage the metadata of a file share.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage the metadata of a file share.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/share/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/share/policy.yml
index 7c95de47c3..a0d0588118 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/share/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/share/policy.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_share_policy
-  name: az storage share policy
-  summary: Manage shared access policies of a storage file share.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_share_policy_create
-  - az_storage_share_policy_delete
-  - az_storage_share_policy_list
-  - az_storage_share_policy_show
-  - az_storage_share_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_share_policy
+name: az storage share policy
+summary: Manage shared access policies of a storage file share.
+description: ''
+directCommands:
 - uid: az_storage_share_policy_create
   name: az storage share policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy create --name
+                                   --share-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -27,15 +28,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_delete
   name: az storage share policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy delete --name
+                                   --share-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--sas-token]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -72,6 +75,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,23 +91,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_list
   name: az storage share policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy list --share-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -113,25 +119,30 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_show
   name: az storage share policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy show --name
+                                 --share-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -140,6 +151,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -149,25 +161,32 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_share_policy_update
   name: az storage share policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage share policy update --name
+                                   --share-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -176,15 +195,7 @@ items:
     name: --share-name -s
     summary: The file share name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -194,34 +205,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (d)elete (l)ist (r)ead (w)rite. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_share_policy_create
-  name: az storage share policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_share_policy_delete
-  name: az storage share policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_share_policy_list
-  name: az storage share policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_share_policy_show
-  name: az storage share policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_share_policy_update
-  name: az storage share policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_share_policy_create
+- az_storage_share_policy_delete
+- az_storage_share_policy_list
+- az_storage_share_policy_show
+- az_storage_share_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -237,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage shared access policies of a storage file share.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage shared access policies of a storage file share.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/table.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/table.yml
index 7941108390..e9518e5ee8 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/table.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/table.yml
@@ -1,35 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_table
-  name: az storage table
-  summary: Manage NoSQL key-value storage.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_table_create
-  - az_storage_table_delete
-  - az_storage_table_exists
-  - az_storage_table_generate_sas
-  - az_storage_table_list
-  - az_storage_table_stats
+### YamlMime:AzureCLIGroup
+uid: az_storage_table
+name: az storage table
+summary: Manage NoSQL key-value storage.
+description: ''
+directCommands:
 - uid: az_storage_table_create
   name: az storage table create
   summary: Creates a new table in the storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table create --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-on-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the table to create. The table name may contain only alphanumeric characters and cannot begin with a numeric character. It is case-insensitive and must be from 3 to 63 characters long.
     description: ''
-  - name: --fail-on-exist
-    summary: Throw an exception if the table already exists.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -39,35 +32,38 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-on-exist
+    summary: Throw an exception if the table already exists.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_delete
   name: az storage table delete
   summary: Deletes the specified table and any data it contains.
   description: When a table is successfully deleted, it is immediately marked for deletion  and is no longer accessible to clients. The table is later removed from  the Table service during garbage collection.  Note that deleting a table is likely to take at least 40 seconds to complete.  If an operation is attempted against the table while it was being deleted,  an AzureConflictHttpError will be thrown.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table delete --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--fail-not-exist]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the table to delete.
     description: ''
-  - name: --fail-not-exist
-    summary: Specifies whether to throw an exception if the table doesn't exist.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -77,32 +73,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --fail-not-exist
+    summary: Specifies whether to throw an exception if the table doesn't exist.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_exists
   name: az storage table exists
   summary: Returns a boolean indicating whether the table exists.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table exists --name
+                            [--account-key]
+                            [--account-name]
+                            [--connection-string]
+                            [--sas-token]
+                            [--subscription]
+                            [--timeout]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of table to check for existence.
     description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -118,23 +119,46 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_storage_table_generate_sas
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
+- uid: az_storage_table_generate-sas
   name: az storage table generate-sas
   summary: Generates a shared access signature for the table.
   description: Use the returned signature with the sas_token parameter of TableService.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table generate-sas --name
+                                  [--account-key]
+                                  [--account-name]
+                                  [--connection-string]
+                                  [--end-pk]
+                                  [--end-rk]
+                                  [--expiry]
+                                  [--https-only]
+                                  [--ip]
+                                  [--permissions]
+                                  [--policy-name]
+                                  [--sas-token]
+                                  [--start]
+                                  [--start-pk]
+                                  [--start-rk]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the table to create a SAS token for.
     description: ''
+  optionalParameters:
+  - name: --account-key
+    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
+    description: ''
+  - name: --connection-string
+    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
+    description: ''
   - name: --end-pk
     summary: The maximum partition key accessible with this shared access signature. endpk must accompany endrk. Key values are inclusive. If omitted, there is no upper bound on the table entities that can be accessed.
     description: ''
@@ -156,6 +180,9 @@ items:
   - name: --policy-name
     summary: The name of a stored access policy within the table's ACL.
     description: ''
+  - name: --sas-token
+    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
+    description: ''
   - name: --start
     summary: Specifies the UTC datetime (Y-m-d'T'H:M'Z') at which the SAS becomes valid. Do not use if a stored access policy is referenced with --id that specifies this value. Defaults to the time of the request.
     description: ''
@@ -165,43 +192,25 @@ items:
   - name: --start-rk
     summary: The minimum row key accessible with this shared access signature. startpk must accompany startrk. Key values are inclusive. If omitted, there is no lower bound on the table entities that can be accessed.
     description: ''
-  - name: --account-key
-    summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
-    description: ''
-  - name: --account-name
-    summary: 'Storage account name. Related environment variable: AZURE_STORAGE_ACCOUNT. Must be used in conjunction with either storage account key or a SAS token. If neither are present, the command will try to query the storage account key using the authenticated Azure account. If a large number of storage commands are executed the API quota may be hit.'
-    description: ''
-  - name: --connection-string
-    summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
-    description: ''
-  - name: --sas-token
-    summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_list
   name: az storage table list
   summary: List tables in a storage account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --marker
-    summary: An opaque continuation object. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
-    description: ''
-  - name: --num-results
-    summary: The maximum number of tables to return.
-    description: ''
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  syntax: >-
+    az storage table list [--account-key]
+                          [--account-name]
+                          [--connection-string]
+                          [--marker]
+                          [--num-results]
+                          [--query-examples]
+                          [--sas-token]
+                          [--subscription]
+                          [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -211,28 +220,37 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --marker
+    summary: An opaque continuation object. This value can be retrieved from the next_marker field of a previous generator object if num_results was specified and that generator has finished enumerating results. If specified, this generator will begin returning results from the point where the previous generator stopped.
+    description: ''
+  - name: --num-results
+    summary: The maximum number of tables to return.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_stats
   name: az storage table stats
   summary: Retrieves statistics related to replication for the Table service.
   description: It is  only available when read-access geo-redundant replication is enabled for  the storage account.  With geo-redundant replication, Azure Storage maintains your data durable  in two locations. In both locations, Azure Storage constantly maintains  multiple healthy replicas of your data. The location where you read,  create, update, or delete data is the primary storage account location.  The primary location exists in the region you choose at the time you  create an account via the Azure Management Azure classic portal, for  example, North Central US. The location to which your data is replicated  is the secondary location. The secondary location is automatically  determined based on the location of the primary; it is in a second data  center that resides in the same region as the primary location. Read-only  access is available from the secondary location, if read-access geo-redundant  replication is enabled for your storage account.
-  langs:
-  - azurecli
-  parameters:
-  - name: --timeout
-    summary: Request timeout in seconds. Applies to each call to the service.
-    description: ''
+  syntax: >-
+    az storage table stats [--account-key]
+                           [--account-name]
+                           [--connection-string]
+                           [--sas-token]
+                           [--subscription]
+                           [--timeout]
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -248,49 +266,23 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timeout
+    summary: Request timeout in seconds. Applies to each call to the service.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_table_create
-  name: az storage table create
-  summary: Creates a new table in the storage account.
-- uid: az_storage_table_delete
-  name: az storage table delete
-  summary: Deletes the specified table and any data it contains.
-- uid: az_storage_table_exists
-  name: az storage table exists
-  summary: Returns a boolean indicating whether the table exists.
-- uid: az_storage_table_generate_sas
-  name: az storage table generate-sas
-  summary: Generates a shared access signature for the table.
-- uid: az_storage_table_list
-  name: az storage table list
-  summary: List tables in a storage account.
-- uid: az_storage_table_policy
-  name: az storage table policy
-  summary: Manage shared access policies of a storage table.
-- uid: az_storage_table_policy_create
-  name: az storage table policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_table_policy_delete
-  name: az storage table policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_table_policy_list
-  name: az storage table policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_table_policy_show
-  name: az storage table policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_table_policy_update
-  name: az storage table policy update
-  summary: Set a stored access policy on a containing object.
-- uid: az_storage_table_stats
-  name: az storage table stats
-  summary: Retrieves statistics related to replication for the Table service.
+- az_storage_table_create
+- az_storage_table_delete
+- az_storage_table_exists
+- az_storage_table_generate-sas
+- az_storage_table_list
+- az_storage_table_policy
+- az_storage_table_policy_create
+- az_storage_table_policy_delete
+- az_storage_table_policy_list
+- az_storage_table_policy_show
+- az_storage_table_policy_update
+- az_storage_table_stats
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -306,10 +298,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage NoSQL key-value storage.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage NoSQL key-value storage.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storage/table/policy.yml b/2018-03-01-hybrid/docs-ref-autogen/storage/table/policy.yml
index 66fea260c4..b079e94dd4 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/storage/table/policy.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/storage/table/policy.yml
@@ -1,24 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_storage_table_policy
-  name: az storage table policy
-  summary: Manage shared access policies of a storage table.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_storage_table_policy_create
-  - az_storage_table_policy_delete
-  - az_storage_table_policy_list
-  - az_storage_table_policy_show
-  - az_storage_table_policy_update
+### YamlMime:AzureCLIGroup
+uid: az_storage_table_policy
+name: az storage table policy
+summary: Manage shared access policies of a storage table.
+description: ''
+directCommands:
 - uid: az_storage_table_policy_create
   name: az storage table policy create
   summary: Create a stored access policy on the containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy create --name
+                                   --table-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -27,15 +28,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -45,25 +38,35 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_delete
   name: az storage table policy delete
   summary: Delete a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy delete --name
+                                   --table-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--sas-token]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -72,6 +75,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -87,23 +91,25 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_list
   name: az storage table policy list
   summary: List stored access policies on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy list --table-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --table-name -t
     summary: The container name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -113,25 +119,30 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_show
   name: az storage table policy show
   summary: Show a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy show --name
+                                 --table-name
+                                 [--account-key]
+                                 [--account-name]
+                                 [--connection-string]
+                                 [--query-examples]
+                                 [--sas-token]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -140,6 +151,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -149,25 +161,32 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 - uid: az_storage_table_policy_update
   name: az storage table policy update
   summary: Set a stored access policy on a containing object.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az storage table policy update --name
+                                   --table-name
+                                   [--account-key]
+                                   [--account-name]
+                                   [--connection-string]
+                                   [--expiry]
+                                   [--permissions]
+                                   [--sas-token]
+                                   [--start]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The stored access policy name.
@@ -176,15 +195,7 @@ items:
     name: --table-name -t
     summary: The container name.
     description: ''
-  - name: --expiry
-    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
-    description: ''
-  - name: --permissions
-    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
-    description: ''
-  - name: --start
-    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
-    description: ''
+  optionalParameters:
   - name: --account-key
     summary: 'Storage account key. Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_KEY.'
     description: ''
@@ -194,34 +205,28 @@ items:
   - name: --connection-string
     summary: 'Storage account connection string. Environment variable: AZURE_STORAGE_CONNECTION_STRING.'
     description: ''
+  - name: --expiry
+    summary: Expiration UTC datetime in (Y-m-d'T'H:M:S'Z').
+    description: ''
+  - name: --permissions
+    summary: 'Allowed values: (r)ead/query (a)dd (u)pdate (d)elete. Can be combined.'
+    description: ''
   - name: --sas-token
     summary: 'A Shared Access Signature (SAS). Must be used in conjunction with storage account name. Environment variable: AZURE_STORAGE_SAS_TOKEN.'
     description: ''
+  - name: --start
+    summary: Start UTC datetime (Y-m-d'T'H:M:S'Z'). Defaults to time of request.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
 commands:
-- uid: az_storage_table_policy_create
-  name: az storage table policy create
-  summary: Create a stored access policy on the containing object.
-- uid: az_storage_table_policy_delete
-  name: az storage table policy delete
-  summary: Delete a stored access policy on a containing object.
-- uid: az_storage_table_policy_list
-  name: az storage table policy list
-  summary: List stored access policies on a containing object.
-- uid: az_storage_table_policy_show
-  name: az storage table policy show
-  summary: Show a stored access policy on a containing object.
-- uid: az_storage_table_policy_update
-  name: az storage table policy update
-  summary: Set a stored access policy on a containing object.
+- az_storage_table_policy_create
+- az_storage_table_policy_delete
+- az_storage_table_policy_list
+- az_storage_table_policy_show
+- az_storage_table_policy_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -237,10 +242,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/storage/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/540a360ead985c68b87aeed3dcc7229cfa7626b2/src/azure-cli/azure/cli/command_modules/storage/_help.py
-updated_at: 5/29/2020 3:01:49 AM
-ms.date: 05/29/2020
-description: Manage shared access policies of a storage table.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/28/2021
+  description: Manage shared access policies of a storage table.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storagesync.yml b/2018-03-01-hybrid/docs-ref-autogen/storagesync.yml
new file mode 100644
index 0000000000..050c7c2802
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storagesync.yml
@@ -0,0 +1,148 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync
+name: az storagesync
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure File Sync.
+description: ''
+directCommands:
+- uid: az_storagesync_create
+  name: az storagesync create
+  summary: Create a new storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync create --name
+                          --resource-group
+                          [--location]
+                          [--tags]
+  examples:
+  - summary: Create a new storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
+    syntax: >-
+      az storagesync create --resource-group "SampleResourceGroup" \
+
+      --name "SampleStorageSyncService" --location "WestUS" --tags key1=value1
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_storagesync_delete
+  name: az storagesync delete
+  summary: Delete a given storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync delete --name
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: Delete a storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
+    syntax: >-
+      az storagesync delete --resource-group "SampleResourceGroup" \
+
+      --name "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_list
+  name: az storagesync list
+  summary: List all storage sync services in a resource group or a subscription.
+  description: ''
+  syntax: az storagesync list [--resource-group]
+  examples:
+  - summary: List all storage sync services in a resource group "SampleResourceGroup".
+    syntax: az storagesync list --resource-group "SampleResourceGroup"
+  - summary: List all storage sync services in current subscription
+    syntax: az storagesync list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_show
+  name: az storagesync show
+  summary: Show the properties for a given storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync show --name
+                        [--resource-group]
+  examples:
+  - summary: Show the properties for storage sync service "SampleStorageSyncService" in resource group 'SampleResourceGroup'.
+    syntax: >-
+      az storagesync show --resource-group "SampleResourceGroup" --name \
+
+      "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_storagesync_create
+- az_storagesync_delete
+- az_storagesync_list
+- az_storagesync_registered-server
+- az_storagesync_registered-server_delete
+- az_storagesync_registered-server_list
+- az_storagesync_registered-server_show
+- az_storagesync_registered-server_wait
+- az_storagesync_show
+- az_storagesync_sync-group
+- az_storagesync_sync-group_cloud-endpoint
+- az_storagesync_sync-group_cloud-endpoint_create
+- az_storagesync_sync-group_cloud-endpoint_delete
+- az_storagesync_sync-group_cloud-endpoint_list
+- az_storagesync_sync-group_cloud-endpoint_show
+- az_storagesync_sync-group_cloud-endpoint_wait
+- az_storagesync_sync-group_create
+- az_storagesync_sync-group_delete
+- az_storagesync_sync-group_list
+- az_storagesync_sync-group_server-endpoint
+- az_storagesync_sync-group_server-endpoint_create
+- az_storagesync_sync-group_server-endpoint_delete
+- az_storagesync_sync-group_server-endpoint_list
+- az_storagesync_sync-group_server-endpoint_show
+- az_storagesync_sync-group_server-endpoint_update
+- az_storagesync_sync-group_server-endpoint_wait
+- az_storagesync_sync-group_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure File Sync.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storagesync/registered-server.yml b/2018-03-01-hybrid/docs-ref-autogen/storagesync/registered-server.yml
new file mode 100644
index 0000000000..6bad156c85
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storagesync/registered-server.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_registered-server
+name: az storagesync registered-server
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync registered-server** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage registered server.
+description: ''
+directCommands:
+- uid: az_storagesync_registered-server_delete
+  name: az storagesync registered-server delete
+  summary: Unregister an on-premises server from it's storage sync service.
+  description: Unregister an on-premises server from it's storage sync service which will result in cascading deletes of all server endpoints on this server.
+  syntax: >-
+    az storagesync registered-server delete --server-id
+                                            --storage-sync-service
+                                            [--no-wait]
+                                            [--resource-group]
+                                            [--yes]
+  examples:
+  - summary: Unregister an on-premises server "41166691-ab03-43e9-ab3e-0330eda162ac" from it's storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync registered-server delete --resource-group "SampleResourceGroup" --storage-sync-service \
+
+      "SampleStorageSyncService" --server-id "41166691-ab03-43e9-ab3e-0330eda162ac"
+  requiredParameters:
+  - isRequired: true
+    name: --server-id
+    summary: GUID identifying the on-premises server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_registered-server_list
+  name: az storagesync registered-server list
+  summary: List all registered servers for a given storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync registered-server list --storage-sync-service
+                                          [--resource-group]
+  examples:
+  - summary: List all registered servers for storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync registered-server list --resource-group "SampleResourceGroup" --storage-sync-service \
+
+      "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_registered-server_show
+  name: az storagesync registered-server show
+  summary: Show the properties for a given registered server.
+  description: ''
+  syntax: >-
+    az storagesync registered-server show --server-id
+                                          --storage-sync-service
+                                          [--resource-group]
+  examples:
+  - summary: Show the properties for registered server "080d4133-bdb5-40a0-96a0-71a6057bfe9a".
+    syntax: >-
+      az storagesync registered-server show --resource-group "SampleResourceGroup" --storage-sync-service \
+
+      "SampleStorageSyncService" --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a"
+  requiredParameters:
+  - isRequired: true
+    name: --server-id
+    summary: GUID identifying the on-premises server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_registered-server_wait
+  name: az storagesync registered-server wait
+  summary: Place the CLI in a waiting state until a condition of a registered server is met.
+  description: ''
+  syntax: >-
+    az storagesync registered-server wait --resource-group
+                                          --server-id
+                                          --storage-sync-service-name
+                                          [--created]
+                                          [--custom]
+                                          [--deleted]
+                                          [--exists]
+                                          [--interval]
+                                          [--timeout]
+                                          [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a condition of a registered server is deleted.
+    syntax: >-
+      az storagesync registered-server wait --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" \
+
+      --server-id "080d4133-bdb5-40a0-96a0-71a6057bfe9a" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --server-id
+    summary: GUID identifying the on-premises server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service-name
+    summary: Name of Storage Sync Service resource.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_storagesync_registered-server_delete
+- az_storagesync_registered-server_list
+- az_storagesync_registered-server_show
+- az_storagesync_registered-server_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage registered server.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group.yml b/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group.yml
new file mode 100644
index 0000000000..48011d32da
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_sync-group
+name: az storagesync sync-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync sync-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage sync group.
+description: ''
+directCommands:
+- uid: az_storagesync_sync-group_create
+  name: az storagesync sync-group create
+  summary: Create a new sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group create --name
+                                     --storage-sync-service
+                                     [--resource-group]
+  examples:
+  - summary: Create a new sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group create --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of sync group.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_delete
+  name: az storagesync sync-group delete
+  summary: Delete a given sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group delete --name
+                                     --storage-sync-service
+                                     [--resource-group]
+                                     [--yes]
+  examples:
+  - summary: Delete sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group delete --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of sync group.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_sync-group_list
+  name: az storagesync sync-group list
+  summary: List all sync groups in a storage sync service.
+  description: ''
+  syntax: >-
+    az storagesync sync-group list --storage-sync-service
+                                   [--resource-group]
+  examples:
+  - summary: List all sync groups in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group list --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_show
+  name: az storagesync sync-group show
+  summary: Show the properties for a given sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group show --name
+                                   --storage-sync-service
+                                   [--resource-group]
+  examples:
+  - summary: Show the properties for sync group "SampleSyncGroup" in storage sync service "SampleStorageSyncService".
+    syntax: >-
+      az storagesync sync-group show --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --name "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of sync group.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_storagesync_sync-group_cloud-endpoint
+- az_storagesync_sync-group_cloud-endpoint_create
+- az_storagesync_sync-group_cloud-endpoint_delete
+- az_storagesync_sync-group_cloud-endpoint_list
+- az_storagesync_sync-group_cloud-endpoint_show
+- az_storagesync_sync-group_cloud-endpoint_wait
+- az_storagesync_sync-group_create
+- az_storagesync_sync-group_delete
+- az_storagesync_sync-group_list
+- az_storagesync_sync-group_server-endpoint
+- az_storagesync_sync-group_server-endpoint_create
+- az_storagesync_sync-group_server-endpoint_delete
+- az_storagesync_sync-group_server-endpoint_list
+- az_storagesync_sync-group_server-endpoint_show
+- az_storagesync_sync-group_server-endpoint_update
+- az_storagesync_sync-group_server-endpoint_wait
+- az_storagesync_sync-group_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage sync group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group/cloud-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group/cloud-endpoint.yml
new file mode 100644
index 0000000000..c5056b4678
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group/cloud-endpoint.yml
@@ -0,0 +1,255 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_sync-group_cloud-endpoint
+name: az storagesync sync-group cloud-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync sync-group cloud-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud endpoint.
+description: ''
+directCommands:
+- uid: az_storagesync_sync-group_cloud-endpoint_create
+  name: az storagesync sync-group cloud-endpoint create
+  summary: Create a new cloud endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint create --name
+                                                    --storage-sync-service
+                                                    --sync-group-name
+                                                    [--azure-file-share-name]
+                                                    [--no-wait]
+                                                    [--resource-group]
+                                                    [--storage-account]
+                                                    [--storage-account-tenant-id]
+  examples:
+  - summary: Create a new cloud endpoint "SampleCloudEndpoint" in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint create --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint" --storage-account storageaccountnameorid --azure-file-share-name \
+
+      "cvcloud-afscv-0719-058-a94a1354-a1fd-4e9a-9a50-919fad8c4ba4"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --azure-file-share-name
+    summary: The name of Azure file share.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --storage-account
+    summary: The name or ID of the storage account.
+    description: ''
+  - name: --storage-account-tenant-id
+    summary: The id of the tenant that the storage account is in.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_delete
+  name: az storagesync sync-group cloud-endpoint delete
+  summary: Delete a given cloud endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint delete --name
+                                                    --storage-sync-service
+                                                    --sync-group-name
+                                                    [--no-wait]
+                                                    [--resource-group]
+                                                    [--yes]
+  examples:
+  - summary: Delete cloud endpoint "SampleCloudEndpoint".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint delete --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_list
+  name: az storagesync sync-group cloud-endpoint list
+  summary: List all cloud endpoints in a sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint list --storage-sync-service
+                                                  --sync-group-name
+                                                  [--resource-group]
+  examples:
+  - summary: List all cloud endpoints in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint list --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_show
+  name: az storagesync sync-group cloud-endpoint show
+  summary: Show the properties for a given cloud endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint show --name
+                                                  --storage-sync-service
+                                                  --sync-group-name
+                                                  [--resource-group]
+  examples:
+  - summary: Show the properties for cloud endpoint "SampleCloudEndpoint".
+    syntax: >-
+      az storagesync sync-group cloud-endpoint show --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_cloud-endpoint_wait
+  name: az storagesync sync-group cloud-endpoint wait
+  summary: Place the CLI in a waiting state until a condition of a cloud endpoint is met.
+  description: ''
+  syntax: >-
+    az storagesync sync-group cloud-endpoint wait --name
+                                                  --resource-group
+                                                  --storage-sync-service-name
+                                                  --sync-group-name
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a condition of a cloud endpoint is created.
+    syntax: >-
+      az storagesync sync-group cloud-endpoint wait --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleCloudEndpoint" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of cloud endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service-name
+    summary: Name of Storage Sync Service resource.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: Name of Sync Group resource.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_storagesync_sync-group_cloud-endpoint_create
+- az_storagesync_sync-group_cloud-endpoint_delete
+- az_storagesync_sync-group_cloud-endpoint_list
+- az_storagesync_sync-group_cloud-endpoint_show
+- az_storagesync_sync-group_cloud-endpoint_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud endpoint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group/server-endpoint.yml b/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group/server-endpoint.yml
new file mode 100644
index 0000000000..84ee6f4de9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/storagesync/sync-group/server-endpoint.yml
@@ -0,0 +1,342 @@
+### YamlMime:AzureCLIGroup
+uid: az_storagesync_sync-group_server-endpoint
+name: az storagesync sync-group server-endpoint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **storagesync** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az storagesync sync-group server-endpoint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage server endpoint.
+description: ''
+directCommands:
+- uid: az_storagesync_sync-group_server-endpoint_create
+  name: az storagesync sync-group server-endpoint create
+  summary: Create a new server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint create --name
+                                                     --registered-server-id
+                                                     --server-local-path
+                                                     --storage-sync-service
+                                                     --sync-group-name
+                                                     [--cloud-tiering {off, on}]
+                                                     [--no-wait]
+                                                     [--offline-data-transfer {off, on}]
+                                                     [--offline-data-transfer-share-name]
+                                                     [--resource-group]
+                                                     [--tier-files-older-than-days]
+                                                     [--volume-free-space-percent]
+  examples:
+  - summary: Create a new server endpoint "SampleServerEndpoint" in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group server-endpoint create --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint" --server-id 91beed22-7e9e-4bda-9313-fec96cf286e0 \
+
+      --server-local-path "d:\abc" --cloud-tiering "off" --volume-free-space-percent 80 --tier-files-older-than-days 20 \
+
+      --offline-data-transfer "on" --offline-data-transfer-share-name "myfileshare"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --registered-server-id --server-id
+    summary: The resource id or GUID of the registered server.
+    description: ''
+  - isRequired: true
+    name: --server-local-path
+    summary: The local path of the registered server.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --cloud-tiering
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offline-data-transfer
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
+    description: ''
+  - name: --offline-data-transfer-share-name
+    summary: The name of Azure file share that is used to transfer data offline.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --tier-files-older-than-days
+    summary: The days that the files are older than will be tiered.
+    description: ''
+  - name: --volume-free-space-percent
+    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_delete
+  name: az storagesync sync-group server-endpoint delete
+  summary: Delete a given server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint delete --name
+                                                     --storage-sync-service
+                                                     --sync-group-name
+                                                     [--no-wait]
+                                                     [--resource-group]
+                                                     [--yes]
+  examples:
+  - summary: Delete a server endpoint "SampleServerEndpoint".
+    syntax: >-
+      az storagesync sync-group server-endpoint delete --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_list
+  name: az storagesync sync-group server-endpoint list
+  summary: List all server endpoints in a sync group.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint list --storage-sync-service
+                                                   --sync-group-name
+                                                   [--resource-group]
+  examples:
+  - summary: List all server endpoints in sync group "SampleSyncGroup".
+    syntax: >-
+      az storagesync sync-group server-endpoint list --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_show
+  name: az storagesync sync-group server-endpoint show
+  summary: Show the properties for a given server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint show --name
+                                                   --storage-sync-service
+                                                   --sync-group-name
+                                                   [--resource-group]
+  examples:
+  - summary: Show the properties for server endpoint "SampleServerEndpoint".
+    syntax: >-
+      az storagesync sync-group server-endpoint show --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_update
+  name: az storagesync sync-group server-endpoint update
+  summary: Update the properties for a given server endpoint.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint update --name
+                                                     --storage-sync-service
+                                                     --sync-group-name
+                                                     [--cloud-tiering {off, on}]
+                                                     [--no-wait]
+                                                     [--offline-data-transfer {off, on}]
+                                                     [--offline-data-transfer-share-name]
+                                                     [--resource-group]
+                                                     [--tier-files-older-than-days]
+                                                     [--volume-free-space-percent]
+  examples:
+  - summary: Update the properties for server endpoint "SampleServerEndpoint".
+    syntax: >-
+      az storagesync sync-group server-endpoint update --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint" --cloud-tiering "off" \
+
+      --volume-free-space-percent "100" --tier-files-older-than-days "0" \
+
+      --offline-data-transfer "off"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service
+    summary: The name or ID of storage sync service.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: The name of sync group.
+    description: ''
+  optionalParameters:
+  - name: --cloud-tiering
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable cloud tiering. With cloud tiering, infrequently used or accessed files can be tiered to Azure Files.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offline-data-transfer
+    parameterValueGroup: off, on
+    summary: A switch to enable or disable offline data transfer. With offline data transfer, you can use alternative means, like Azure Data Box, to transport large amounts of files into Azure without network.
+    description: ''
+  - name: --offline-data-transfer-share-name
+    summary: The name of Azure file share that is used to transfer data offline.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --tier-files-older-than-days
+    summary: The days that the files are older than will be tiered.
+    description: ''
+  - name: --volume-free-space-percent
+    summary: The amount of free space to reserve on the volume on which the server endpoint is located. For example, if volume free space is set to 50% on a volume that has a single server endpoint, roughly half the amount of data is tiered to Azure Files. Regardless of whether cloud tiering is enabled, your Azure file share always has a complete copy of the data in the sync group.
+    description: ''
+- uid: az_storagesync_sync-group_server-endpoint_wait
+  name: az storagesync sync-group server-endpoint wait
+  summary: Place the CLI in a waiting state until a condition of a server endpoint is met.
+  description: ''
+  syntax: >-
+    az storagesync sync-group server-endpoint wait --name
+                                                   --resource-group
+                                                   --storage-sync-service-name
+                                                   --sync-group-name
+                                                   [--created]
+                                                   [--custom]
+                                                   [--deleted]
+                                                   [--exists]
+                                                   [--interval]
+                                                   [--timeout]
+                                                   [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a condition of a server endpoint is created.
+    syntax: >-
+      az storagesync sync-group server-endpoint wait --resource-group "SampleResourceGroup" \
+
+      --storage-sync-service "SampleStorageSyncService" --sync-group-name \
+
+      "SampleSyncGroup" --name "SampleServerEndpoint" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of server endpoint.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-sync-service-name
+    summary: Name of Storage Sync Service resource.
+    description: ''
+  - isRequired: true
+    name: --sync-group-name
+    summary: Name of Sync Group resource.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_storagesync_sync-group_server-endpoint_create
+- az_storagesync_sync-group_server-endpoint_delete
+- az_storagesync_sync-group_server-endpoint_list
+- az_storagesync_sync-group_server-endpoint_show
+- az_storagesync_sync-group_server-endpoint_update
+- az_storagesync_sync-group_server-endpoint_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage server endpoint.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics.yml
new file mode 100644
index 0000000000..bf1f12f4f6
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics
+name: az stream-analytics
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Stream Analytics.
+description: ''
+commands:
+- az_stream-analytics_function
+- az_stream-analytics_function_create
+- az_stream-analytics_function_delete
+- az_stream-analytics_function_list
+- az_stream-analytics_function_show
+- az_stream-analytics_function_test
+- az_stream-analytics_input
+- az_stream-analytics_input_create
+- az_stream-analytics_input_delete
+- az_stream-analytics_input_list
+- az_stream-analytics_input_show
+- az_stream-analytics_input_test
+- az_stream-analytics_job
+- az_stream-analytics_job_create
+- az_stream-analytics_job_delete
+- az_stream-analytics_job_list
+- az_stream-analytics_job_show
+- az_stream-analytics_job_start
+- az_stream-analytics_job_stop
+- az_stream-analytics_job_update
+- az_stream-analytics_job_wait
+- az_stream-analytics_output
+- az_stream-analytics_output_create
+- az_stream-analytics_output_delete
+- az_stream-analytics_output_list
+- az_stream-analytics_output_show
+- az_stream-analytics_output_test
+- az_stream-analytics_quota
+- az_stream-analytics_quota_show
+- az_stream-analytics_transformation
+- az_stream-analytics_transformation_create
+- az_stream-analytics_transformation_show
+- az_stream-analytics_transformation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Stream Analytics.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/function.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/function.yml
new file mode 100644
index 0000000000..13ce634c47
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/function.yml
@@ -0,0 +1,231 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_function
+name: az stream-analytics function
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics function** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics function.
+description: ''
+directCommands:
+- uid: az_stream-analytics_function_create
+  name: az stream-analytics function create
+  summary: Create a function or replaces an already existing function under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics function create --binding
+                                        --function-output
+                                        --inputs
+                                        --job-name
+                                        --name
+                                        --resource-group
+                                        [--type {Scalar}]
+  examples:
+  - summary: Create a function
+    syntax: >-
+      az stream-analytics function create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyFunctionName --inputs @inputs.json --function-output @output.json --binding \
+
+      @binding.json
+       (below is an example for "inputs.json")
+       [
+           {
+               "dataType": "Any"
+           }
+       ]
+       (below is an example for "output.json")
+       {
+           "dataType": "Any"
+       }
+       (below is an example of JavascripUDF for "binding.json")
+       {
+           "type": "Microsoft.StreamAnalytics/JavascriptUdf",
+           "properties": {
+               "script": "function (x, y) { return x + y; }"
+           }
+       }
+       (below is an example of Azure Machine Learning for "binding.json")
+       {
+           "type": "Microsoft.MachineLearning/WebService",
+           "properties": {
+               "endpoint": "someAzureMLEndpointURL",
+               "apiKey": "someApiKey==",
+               "inputs": {
+                   "name": "input1",
+                   "columnNames": [
+                       {
+                           "name": "tweet",
+                           "dataType": "string",
+                           "mapTo": 0
+                       }
+                   ]
+               },
+               "outputs": [
+                   {
+                       "name": "Sentiment",
+                       "dataType": "string"
+                   }
+               ],
+               "batchSize": 1000
+           }
+       }
+  requiredParameters:
+  - isRequired: true
+    name: --binding
+    summary: The binding of the function.
+    description: ''
+  - isRequired: true
+    name: --function-output
+    summary: The output of the function.
+    description: ''
+  - isRequired: true
+    name: --inputs
+    summary: The inputs of the function.
+    description: ''
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --type
+    defaultValue: Scalar
+    parameterValueGroup: Scalar
+    summary: The udf type of the function.
+    description: ''
+- uid: az_stream-analytics_function_delete
+  name: az stream-analytics function delete
+  summary: Delete a function from the streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics function delete --job-name
+                                        --name
+                                        --resource-group
+  examples:
+  - summary: Delete a function
+    syntax: >-
+      az stream-analytics function delete --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyFunctionName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_function_list
+  name: az stream-analytics function list
+  summary: List all of the functions under the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics function list --job-name
+                                      --resource-group
+  examples:
+  - summary: List all functions in a streaming job
+    syntax: az stream-analytics function list --resource-group MyResourceGroup --job-name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_function_show
+  name: az stream-analytics function show
+  summary: Get details about the specified function.
+  description: ''
+  syntax: >-
+    az stream-analytics function show --job-name
+                                      --name
+                                      --resource-group
+  examples:
+  - summary: Get details about a function
+    syntax: >-
+      az stream-analytics function show --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyFunctionName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_function_test
+  name: az stream-analytics function test
+  summary: Test if the information provided for a function is valid.
+  description: ''
+  syntax: >-
+    az stream-analytics function test --job-name
+                                      --name
+                                      --resource-group
+                                      [--no-wait]
+  examples:
+  - summary: Test the connection for a function
+    syntax: >-
+      az stream-analytics function test --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyFunctionName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the function.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_stream-analytics_function_create
+- az_stream-analytics_function_delete
+- az_stream-analytics_function_list
+- az_stream-analytics_function_show
+- az_stream-analytics_function_test
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics function.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/input.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/input.yml
new file mode 100644
index 0000000000..52ca83422a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/input.yml
@@ -0,0 +1,232 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_input
+name: az stream-analytics input
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics input** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics input.
+description: ''
+directCommands:
+- uid: az_stream-analytics_input_create
+  name: az stream-analytics input create
+  summary: Create an input or replaces an already existing input under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics input create --datasource
+                                     --job-name
+                                     --name
+                                     --resource-group
+                                     --serialization
+                                     --type {Reference, Stream}
+  examples:
+  - summary: Create an input
+    syntax: >-
+      az stream-analytics input create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyInputName --type Stream --datasource @datasource.json --serialization \
+
+      @serialization.json
+       (below is an example of Blob Storage for "datasource.json")
+       {
+           "type": "Microsoft.Storage/Blob",
+           "properties": {
+               "storageAccounts": [
+                   {
+                       "accountName": "someAccountName",
+                       "accountKey": "someAccountKey=="
+                   }
+               ],
+               "container": "state",
+               "pathPattern": "{date}/{time}",
+               "dateFormat": "yyyy/MM/dd",
+               "timeFormat": "HH",
+               "sourcePartitionCount": 16
+           }
+       }
+       (below is an example of Event Hub for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/EventHub",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "someSharedAccessPolicyKey==",
+               "eventHubName": "sdkeventhub",
+               "consumerGroupName": "sdkconsumergroup"
+           }
+       }
+       (below is an example of Iot Hub for "datasource.json")
+       {
+           "type": "Microsoft.Devices/IotHubs",
+           "properties": {
+               "iotHubNamespace": "iothub",
+               "sharedAccessPolicyName": "owner",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "consumerGroupName": "sdkconsumergroup",
+               "endpoint": "messages/events"
+           }
+       }
+       (below is an example of Csv for "serialization.json")
+       {
+           "type": "Csv",
+           "properties": {
+               "fieldDelimiter": ",",
+               "encoding": "UTF8"
+           }
+       }
+       (below is an example of Json for "serialization.json")
+       {
+           "type": "Json",
+           "properties": {
+               "encoding": "UTF8"
+           }
+       }
+       (below is an example of Avro for "serialization.json")
+       {
+           "type": "Avro"
+       }
+  requiredParameters:
+  - isRequired: true
+    name: --datasource
+    summary: The datasource of the input.
+    description: ''
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --serialization
+    summary: The serialization of the input.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Reference, Stream
+    summary: The type of the input.
+    description: ''
+- uid: az_stream-analytics_input_delete
+  name: az stream-analytics input delete
+  summary: Delete an input from the streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics input delete --job-name
+                                     --name
+                                     --resource-group
+  examples:
+  - summary: Delete an input
+    syntax: az stream-analytics input delete --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_input_list
+  name: az stream-analytics input list
+  summary: List all of the inputs under the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics input list --job-name
+                                   --resource-group
+  examples:
+  - summary: List all inputs in a streaming job
+    syntax: az stream-analytics input list --resource-group MyResourceGroup --job-name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_input_show
+  name: az stream-analytics input show
+  summary: Get details about the specified input.
+  description: ''
+  syntax: >-
+    az stream-analytics input show --job-name
+                                   --name
+                                   --resource-group
+  examples:
+  - summary: Get details about specified input
+    syntax: az stream-analytics input show --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_input_test
+  name: az stream-analytics input test
+  summary: Test an input.
+  description: ''
+  syntax: >-
+    az stream-analytics input test --job-name
+                                   --name
+                                   --resource-group
+                                   [--no-wait]
+  examples:
+  - summary: Test the connection for an input
+    syntax: az stream-analytics input test --resource-group MyResourceGroup --job-name MyJobName --name MyInputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the input.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_stream-analytics_input_create
+- az_stream-analytics_input_delete
+- az_stream-analytics_input_list
+- az_stream-analytics_input_show
+- az_stream-analytics_input_test
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics input.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/job.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/job.yml
new file mode 100644
index 0000000000..ba171e1553
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/job.yml
@@ -0,0 +1,343 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_job
+name: az stream-analytics job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics streaming job.
+description: ''
+directCommands:
+- uid: az_stream-analytics_job_create
+  name: az stream-analytics job create
+  summary: Create a streaming job or replaces an already existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job create --name
+                                   --resource-group
+                                   [--compatibility-level {1.0}]
+                                   [--data-locale]
+                                   [--events-late-arrival-max-delay]
+                                   [--events-outoforder-max-delay]
+                                   [--events-outoforder-policy {Adjust, Drop}]
+                                   [--location]
+                                   [--no-wait]
+                                   [--output-error-policy {Drop, Stop}]
+                                   [--sku {Standard}]
+                                   [--tags]
+  examples:
+  - summary: Create a streaming job
+    syntax: >-
+      az stream-analytics job create --resource-group MyResourceGroup --name MyJobName \
+
+      --location "West US" --output-error-policy "Drop" --events-outoforder-policy "Drop" \
+
+      --events-outoforder-max-delay 5 --events-late-arrival-max-delay 16 --data-locale "en-US"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compatibility-level
+    defaultValue: "1.0"
+    parameterValueGroup: "1.0"
+    summary: Controls certain runtime behaviors of the streaming job.
+    description: ''
+  - name: --data-locale
+    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx. Defaults to "en-US" if none specified.
+    description: ''
+  - name: --events-late-arrival-max-delay
+    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
+    description: ''
+  - name: --events-outoforder-max-delay
+    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
+    description: ''
+  - name: --events-outoforder-policy
+    parameterValueGroup: Adjust, Drop
+    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --output-error-policy
+    parameterValueGroup: Drop, Stop
+    summary: Indicates the policy to apply to events that arrive at the output.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    parameterValueGroup: Standard
+    summary: The name of the SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_stream-analytics_job_delete
+  name: az stream-analytics job delete
+  summary: Delete a streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job delete --name
+                                   --resource-group
+                                   [--no-wait]
+  examples:
+  - summary: Delete a streaming job
+    syntax: az stream-analytics job delete --resource-group MyResourceGroup --name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_stream-analytics_job_list
+  name: az stream-analytics job list
+  summary: List all of the streaming jobs in the specified resource group.
+  description: ''
+  syntax: >-
+    az stream-analytics job list [--expand]
+                                 [--resource-group]
+  examples:
+  - summary: List all streaming jobs in current subscription
+    syntax: az stream-analytics job list
+  - summary: List all streaming jobs in a resource group
+    syntax: az stream-analytics job list --resource-group MyResourceGroup
+  - summary: List all streaming jobs and expand their inputs, outputs, transformation, and functions
+    syntax: az stream-analytics job list --resource-group MyResourceGroup --expand
+  optionalParameters:
+  - name: --expand
+    summary: Expand inputs, transformation, outputs and functions of the streaming job.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_job_show
+  name: az stream-analytics job show
+  summary: Get details about the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job show --name
+                                 --resource-group
+                                 [--expand]
+  examples:
+  - summary: Get a streaming job
+    syntax: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName
+  - summary: Get a streaming job and expand its inputs, outputs, transformation, and functions
+    syntax: az stream-analytics job show --resource-group MyResourceGroup --name MyJobName --expand
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Expand inputs, transformation, outputs and functions of the streaming job.
+    description: ''
+- uid: az_stream-analytics_job_start
+  name: az stream-analytics job start
+  summary: Start a streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job start --name
+                                  --resource-group
+                                  [--no-wait]
+                                  [--output-start-mode {CustomTime, JobStartTime, LastOutputEventTime}]
+                                  [--output-start-time]
+  examples:
+  - summary: Start a streaming job with LastOutputEventTime output start mode
+    syntax: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode LastOutputEventTime
+  - summary: Start a streaming job with JobStartTime output start mode
+    syntax: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode JobStartTime
+  - summary: Start a streaming job with CustomTime output start mode
+    syntax: az stream-analytics job start --resource-group MyResourceGroup --name MyJobName --output-start-mode CustomTime --output-start-time 2020-01-01T00:00:00Z
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --output-start-mode
+    defaultValue: JobStartTime
+    parameterValueGroup: CustomTime, JobStartTime, LastOutputEventTime
+    summary: Output start mode.
+    description: ''
+  - name: --output-start-time
+    summary: Output start time, must have a value if --output-start-mode is set to CustomTime.
+    description: ''
+- uid: az_stream-analytics_job_stop
+  name: az stream-analytics job stop
+  summary: Stop a running streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job stop --name
+                                 --resource-group
+                                 [--no-wait]
+  examples:
+  - summary: Stop a streaming job
+    syntax: az stream-analytics job stop --resource-group MyResourceGroup --name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_stream-analytics_job_update
+  name: az stream-analytics job update
+  summary: Update existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics job update --name
+                                   --resource-group
+                                   [--data-locale]
+                                   [--events-late-arrival-max-delay]
+                                   [--events-outoforder-max-delay]
+                                   [--events-outoforder-policy {Adjust, Drop}]
+                                   [--output-error-policy {Drop, Stop}]
+                                   [--tags]
+  examples:
+  - summary: Update a streaming job
+    syntax: >-
+      az stream-analytics job update --resource-group MyResourceGroup --name MyJobName \
+
+      --events-outoforder-max-delay 21 --events-late-arrival-max-delay 13
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-locale
+    summary: The data locale of the stream analytics job. Value should be the name of a supported .NET Culture from the set https://msdn.microsoft.com/en-us/library/system.globalization.culturetypes(v=vs.110).aspx.
+    description: ''
+  - name: --events-late-arrival-max-delay
+    summary: The maximum tolerable delay in seconds where events arriving late could be included.  Supported range is -1 to 1814399 (20.23:59:59 days) and -1 is used to specify wait indefinitely.
+    description: ''
+  - name: --events-outoforder-max-delay
+    summary: The maximum tolerable delay in seconds where out-of-order events can be adjusted to be back in order.
+    description: ''
+  - name: --events-outoforder-policy
+    parameterValueGroup: Adjust, Drop
+    summary: Indicates the policy to apply to events that arrive out of order in the input event stream.
+    description: ''
+  - name: --output-error-policy
+    parameterValueGroup: Drop, Stop
+    summary: Indicates the policy to apply to events that arrive at the output.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_stream-analytics_job_wait
+  name: az stream-analytics job wait
+  summary: Place the CLI in a waiting state until a condition of the streaming job is met.
+  description: ''
+  syntax: >-
+    az stream-analytics job wait --name
+                                 --resource-group
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--expand]
+                                 [--interval]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the streaming job is successfully provisioned.
+    syntax: az stream-analytics job wait --resource-group MyResourceGroup --name MyJobName --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: The $expand OData query parameter. This is a comma-separated list of additional streaming job properties to include in the response, beyond the default set returned when this parameter is absent. The default set is all streaming job properties other than 'inputs', 'transformation', 'outputs', and 'functions'.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_stream-analytics_job_create
+- az_stream-analytics_job_delete
+- az_stream-analytics_job_list
+- az_stream-analytics_job_show
+- az_stream-analytics_job_start
+- az_stream-analytics_job_stop
+- az_stream-analytics_job_update
+- az_stream-analytics_job_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics streaming job.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/output.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/output.yml
new file mode 100644
index 0000000000..133d89d5cf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/output.yml
@@ -0,0 +1,316 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_output
+name: az stream-analytics output
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics output** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics output.
+description: ''
+directCommands:
+- uid: az_stream-analytics_output_create
+  name: az stream-analytics output create
+  summary: Create an output or replaces an already existing output under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics output create --datasource
+                                      --job-name
+                                      --name
+                                      --resource-group
+                                      [--serialization]
+  examples:
+  - summary: Create an output
+    syntax: >-
+      az stream-analytics output create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name MyOutputName --datasource @datasource.json --serialization @serialization.json
+       (below is an example of DataLake for "datasource.json")
+       {
+           "type": "Microsoft.DataLake/Accounts",
+           "properties": {
+               "accountName": "someaccount",
+               "tenantId": "cea4e98b-c798-49e7-8c40-4a2b3beb47dd",
+               "refreshToken": "someRefreshToken==",
+               "tokenUserPrincipalName": "bobsmith@contoso.com",
+               "tokenUserDisplayName": "Bob Smith",
+               "filePathPrefix": "{date}/{time}",
+               "dateFormat": "yyyy/MM/dd",
+               "timeFormat": "HH"
+           }
+       }
+       (below is an example of SQL Database for "datasource.json")
+       {
+           "type": "Microsoft.Sql/Server/Database",
+           "properties": {
+               "server": "someServer",
+               "database": "someDatabase",
+               "user": "someUser",
+               "password": "somePassword",
+               "table": "someTable"
+           }
+       }
+       (below is an example of Table Storage for "datasource.json")
+       {
+           "type": "Microsoft.Storage/Table",
+           "properties": {
+               "accountName": "someAccountName",
+               "accountKey": "accountKey==",
+               "table": "samples",
+               "partitionKey": "partitionKey",
+               "rowKey": "rowKey",
+               "columnsToRemove": [
+                   "column1",
+                   "column2"
+               ],
+               "batchSize": 25
+           }
+       }
+       (below is an example of Blob Storage for "datasource.json")
+       {
+           "type": "Microsoft.Storage/Blob",
+           "properties": {
+               "storageAccounts": [
+                   {
+                       "accountName": "someAccountName",
+                       "accountKey": "accountKey=="
+                   }
+               ],
+               "container": "state",
+               "pathPattern": "{date}/{time}",
+               "dateFormat": "yyyy/MM/dd",
+               "timeFormat": "HH"
+           }
+       }
+       (below is an example of DocumentDB for "datasource.json")
+       {
+           "type": "Microsoft.Storage/DocumentDB",
+           "properties": {
+               "accountId": "someAccountId",
+               "accountKey": "accountKey==",
+               "database": "db01",
+               "collectionNamePattern": "collection",
+               "partitionKey": "key",
+               "documentId": "documentId"
+           }
+       }
+       (below is an example of Event Hub for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/EventHub",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "eventHubName": "sdkeventhub",
+               "partitionKey": "partitionKey"
+           }
+       }
+       (below is an example of PowerBI for "datasource.json")
+       {
+           "type": "PowerBI",
+           "properties": {
+               "dataset": "someDataset",
+               "table": "someTable",
+               "refreshToken": "someRefreshToken==",
+               "tokenUserPrincipalName": "bobsmith@contoso.com",
+               "tokenUserDisplayName": "Bob Smith",
+               "groupId": "ac40305e-3e8d-43ac-8161-c33799f43e95",
+               "groupName": "MyPowerBIGroup"
+           }
+       }
+       (below is an example of Service Bus Queue for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/Queue",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "queueName": "sdkqueue",
+               "propertyColumns": [
+                   "column1",
+                   "column2"
+               ]
+           }
+       }
+       (below is an example of Service Bus Topic for "datasource.json")
+       {
+           "type": "Microsoft.ServiceBus/Topic",
+           "properties": {
+               "serviceBusNamespace": "sdktest",
+               "sharedAccessPolicyName": "RootManageSharedAccessKey",
+               "sharedAccessPolicyKey": "sharedAccessPolicyKey=",
+               "topicName": "sdktopic",
+               "propertyColumns": [
+                   "column1",
+                   "column2"
+               ]
+           }
+       }
+       (below is an example of Csv for "serialization.json")
+       {
+           "type": "Csv",
+           "properties": {
+               "fieldDelimiter": ",",
+               "encoding": "UTF8"
+           }
+       }
+       (below is an example of Json for "serialization.json")
+       {
+           "type": "Json",
+           "properties": {
+               "encoding": "UTF8",
+               "format": "Array"
+           }
+       }
+       (below is an example of Avro for "serialization.json")
+       {
+           "type": "Avro"
+       }
+  requiredParameters:
+  - isRequired: true
+    name: --datasource
+    summary: The datasource of the output.
+    description: ''
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --serialization
+    summary: The serialization of the output.
+    description: ''
+- uid: az_stream-analytics_output_delete
+  name: az stream-analytics output delete
+  summary: Delete an output from the streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics output delete --job-name
+                                      --name
+                                      --resource-group
+  examples:
+  - summary: Delete an output
+    syntax: >-
+      az stream-analytics output delete --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyOutputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_output_list
+  name: az stream-analytics output list
+  summary: List all of the outputs under the specified streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics output list --job-name
+                                    --resource-group
+  examples:
+  - summary: List all outputs in a streaming job
+    syntax: az stream-analytics output list --resource-group MyResourceGroup --job-name MyJobName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_output_show
+  name: az stream-analytics output show
+  summary: Get details about the specified output.
+  description: ''
+  syntax: >-
+    az stream-analytics output show --job-name
+                                    --name
+                                    --resource-group
+  examples:
+  - summary: Get details about an output
+    syntax: >-
+      az stream-analytics output show --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyOutputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_output_test
+  name: az stream-analytics output test
+  summary: Test an output.
+  description: ''
+  syntax: >-
+    az stream-analytics output test --job-name
+                                    --name
+                                    --resource-group
+                                    [--no-wait]
+  examples:
+  - summary: Test the connection for an output
+    syntax: >-
+      az stream-analytics output test --resource-group MyResourceGroup --job-name MyJobName --name \
+
+      MyOutputName
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the output.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+commands:
+- az_stream-analytics_output_create
+- az_stream-analytics_output_delete
+- az_stream-analytics_output_list
+- az_stream-analytics_output_show
+- az_stream-analytics_output_test
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics output.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/quota.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/quota.yml
new file mode 100644
index 0000000000..5c1a78559d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/quota.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_quota
+name: az stream-analytics quota
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics quota** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to show quota information.
+description: ''
+directCommands:
+- uid: az_stream-analytics_quota_show
+  name: az stream-analytics quota show
+  summary: Retrieve quota information in a particular region.
+  description: ''
+  syntax: az stream-analytics quota show --location
+  examples:
+  - summary: List quota information in West US
+    syntax: az stream-analytics quota show --location "West US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_stream-analytics_quota_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to show quota information.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/transformation.yml b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/transformation.yml
new file mode 100644
index 0000000000..1c8d3e4e03
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/stream-analytics/transformation.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_stream-analytics_transformation
+name: az stream-analytics transformation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **stream-analytics** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az stream-analytics transformation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage stream-analytics transformation.
+description: ''
+directCommands:
+- uid: az_stream-analytics_transformation_create
+  name: az stream-analytics transformation create
+  summary: Create a transformation or replaces an already existing transformation under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics transformation create --job-name
+                                              --name
+                                              --resource-group
+                                              [--streaming-units]
+                                              [--transformation-query]
+  examples:
+  - summary: Create a transformation
+    syntax: >-
+      az stream-analytics transformation create --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name Transformation --streaming-units "6" --transformation-query "Select Id, Name from inputtest"
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the transformation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --streaming-units
+    summary: The number of streaming units that the streaming job uses.
+    description: ''
+  - name: --transformation-query
+    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: https://msdn.microsoft.com/library/azure/dn834998 .'
+    description: ''
+- uid: az_stream-analytics_transformation_show
+  name: az stream-analytics transformation show
+  summary: Get details about the specified transformation.
+  description: ''
+  syntax: >-
+    az stream-analytics transformation show --job-name
+                                            --name
+                                            --resource-group
+  examples:
+  - summary: Get a transformation
+    syntax: >-
+      az stream-analytics transformation show --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name Transformation
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the transformation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_stream-analytics_transformation_update
+  name: az stream-analytics transformation update
+  summary: Update transformation under an existing streaming job.
+  description: ''
+  syntax: >-
+    az stream-analytics transformation update --job-name
+                                              --name
+                                              --resource-group
+                                              [--streaming-units]
+                                              [--transformation-query]
+  examples:
+  - summary: Update a transformation
+    syntax: >-
+      az stream-analytics transformation update --resource-group MyResourceGroup --job-name MyJobName \
+
+      --name Transformation --transformation-query "New query"
+  requiredParameters:
+  - isRequired: true
+    name: --job-name
+    summary: The name of the streaming job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the transformation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --streaming-units
+    summary: The number of streaming units that the streaming job uses.
+    description: ''
+  - name: --transformation-query
+    summary: 'The query that will be run in the streaming job. You can learn more about the Stream Analytics Query Language (SAQL) here: https://msdn.microsoft.com/library/azure/dn834998 .'
+    description: ''
+commands:
+- az_stream-analytics_transformation_create
+- az_stream-analytics_transformation_show
+- az_stream-analytics_transformation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage stream-analytics transformation.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/support.yml b/2018-03-01-hybrid/docs-ref-autogen/support.yml
new file mode 100644
index 0000000000..e1e6b04c88
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/support.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_support
+name: az support
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure support resource.
+description: ''
+commands:
+- az_support_services
+- az_support_services_list
+- az_support_services_problem-classifications
+- az_support_services_problem-classifications_list
+- az_support_services_problem-classifications_show
+- az_support_services_show
+- az_support_tickets
+- az_support_tickets_communications
+- az_support_tickets_communications_create
+- az_support_tickets_communications_list
+- az_support_tickets_communications_show
+- az_support_tickets_create
+- az_support_tickets_list
+- az_support_tickets_show
+- az_support_tickets_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure support resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/support/services.yml b/2018-03-01-hybrid/docs-ref-autogen/support/services.yml
new file mode 100644
index 0000000000..36f2446588
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/support/services.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_services
+name: az support services
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support services** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Azure services and related problem categories.
+description: ''
+directCommands:
+- uid: az_support_services_list
+  name: az support services list
+  summary: Lists all the Azure services available for support ticket creation. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
+  description: ''
+  syntax: az support services list
+  examples:
+  - summary: Gets list of services for which a support ticket can be created.
+    syntax: az support services list
+- uid: az_support_services_show
+  name: az support services show
+  summary: Gets a specific Azure service for support ticket creation.
+  description: ''
+  syntax: az support services show --service-name
+  examples:
+  - summary: Gets details of Azure service.
+    syntax: az support services show --service-name "ServiceNameGuid"
+  requiredParameters:
+  - isRequired: true
+    name: --service-name
+    summary: Name of Azure service.
+    description: ''
+commands:
+- az_support_services_list
+- az_support_services_problem-classifications
+- az_support_services_problem-classifications_list
+- az_support_services_problem-classifications_show
+- az_support_services_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Azure services and related problem categories.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/support/services/problem-classifications.yml b/2018-03-01-hybrid/docs-ref-autogen/support/services/problem-classifications.yml
new file mode 100644
index 0000000000..efa6090afb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/support/services/problem-classifications.yml
@@ -0,0 +1,65 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_services_problem-classifications
+name: az support services problem-classifications
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support services problem-classifications** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Problem classifications for an Azure service.
+description: ''
+directCommands:
+- uid: az_support_services_problem-classifications_list
+  name: az support services problem-classifications list
+  summary: Lists all the problem classifications (categories) available for an Azure service. Always use the service and it's corresponding problem classification(s) obtained programmatically for support ticket creation. This practice ensures that you always have the most recent set of service and problem classification Ids.
+  description: ''
+  syntax: az support services problem-classifications list --service-name
+  examples:
+  - summary: Gets list of problemClassifications for a service for which a support ticket can be created.
+    syntax: az support services problem-classifications list --service-name "ServiceNameGuid"
+  requiredParameters:
+  - isRequired: true
+    name: --service-name
+    summary: Name of Azure service.
+    description: ''
+- uid: az_support_services_problem-classifications_show
+  name: az support services problem-classifications show
+  summary: Gets the problem classification details for an Azure service.
+  description: ''
+  syntax: >-
+    az support services problem-classifications show --problem-classification-name
+                                                     --service-name
+  examples:
+  - summary: Gets details of problemClassification for Azure service.
+    syntax: >-
+      az support services problem-classifications show \
+        --service-name "ServiceNameGuid" \
+        --problem-classification-name "ProblemClassificationNameGuid"
+  requiredParameters:
+  - isRequired: true
+    name: --problem-classification-name
+    summary: Name of problem classification.
+    description: ''
+  - isRequired: true
+    name: --service-name
+    summary: Name of Azure service.
+    description: ''
+commands:
+- az_support_services_problem-classifications_list
+- az_support_services_problem-classifications_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Problem classifications for an Azure service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/support/tickets.yml b/2018-03-01-hybrid/docs-ref-autogen/support/tickets.yml
new file mode 100644
index 0000000000..2b72af14d2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/support/tickets.yml
@@ -0,0 +1,571 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_tickets
+name: az support tickets
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support tickets** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Create and manage Azure support ticket.
+description: ''
+directCommands:
+- uid: az_support_tickets_create
+  name: az support tickets create
+  summary: Creates a new support ticket for Quota increase, Technical, Billing, and Subscription Management issues for the specified subscription.
+  description: ''
+  syntax: >-
+    az support tickets create --contact-country
+                              --contact-email
+                              --contact-first-name
+                              --contact-language
+                              --contact-last-name
+                              --contact-method {email, phone}
+                              --contact-timezone
+                              --description
+                              --problem-classification
+                              --severity {critical, highestcriticalimpact, minimal, moderate}
+                              --ticket-name
+                              --title
+                              [--contact-additional-emails]
+                              [--contact-phone-number]
+                              [--partner-tenant-id]
+                              [--quota-change-payload]
+                              [--quota-change-regions]
+                              [--quota-change-subtype]
+                              [--quota-change-version]
+                              [--require-24-by-7-response {false, true}]
+                              [--start-time]
+                              [--technical-resource]
+  examples:
+  - summary: Create a ticket for Billing related issues.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "BillingTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "BillingTestTicketName" \
+        --title "BillingTicketTitle"
+  - summary: Create a ticket for Subscription Management related issues.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "SubMgmtTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/SubMgmtServiceNameGuid/problemClassifications/SubMgmtProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "SubMgmtTestTicketName" \
+        --title "SubMgmtTicketTitle"
+  - summary: Create a ticket for Technical issue related to a specific resource.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "TechnicalTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/TechnicalServiceNameGuid/problemClassifications/TechnicalProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "TechnicalTestTicketName" \
+        --title "TechnicalTicketTitle" \
+        --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
+        --technical-resource "/subscriptions/SubscriptionGuid/resourceGroups/RgName/providers/Microsoft.Compute/virtualMachines/RName"
+  - summary: Create a ticket for Billing related issues in admin on behalf of (AOBO) mode.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "BillingTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/BillingServiceNameGuid/problemClassifications/BillingProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "BillingTestTicketName" \
+        --title "BillingTicketTitle" \
+        --partner-tenant-id "CSPPartnerTenantIdGuid"
+  - summary: Create a ticket for Generic Quota increase for any Azure Service.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/GenericProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle"
+  - summary: Create a ticket to request Quota increase for Compute VM Cores.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/CoresQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"SKU\":\"DSv3 Series\", \"NewLimit\":104}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0"
+  - summary: Create a ticket to request Quota increase for Low-priority cores for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"LowPriority\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for specific VM family cores for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for Pools for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Pools\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for Active Jobs and Job Schedules for a Batch account.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"AccountName\":\"test\", \"NewLimit\":200, \"Type\":\"Jobs\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Account"
+  - summary: Create a ticket to request Quota increase for number of Batch accounts for a subscription.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/BatchQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":200, \"Type\":\"Account\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Subscription"
+  - summary: Create a ticket to request Quota increase for DTUs for SQL Database.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "DTUs"
+  - summary: Create a ticket to request Quota increase for Servers for SQL Database.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDatabaseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":54000}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Servers"
+  - summary: Create a ticket to request Quota increase for DTUs for SQL Data Warehouse.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"ServerName\":\"testserver\", \"NewLimit\":54000}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "DTUs"
+  - summary: Create a ticket to request Quota increase for Servers for SQL Data Warehouse.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/SqlDataWarehouseQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":200}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "Servers"
+  - summary: Create a ticket to request Quota increase for specific VM family cores for Machine Learning service.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"VMFamily\":\"standardA0_A7Family\", \"NewLimit\":200, \"Type\":\"Dedicated\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "BatchAml"
+  - summary: Create a ticket to request Quota increase for Low-priority cores for Machine Learning service.
+    syntax: >-
+      az support tickets create \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "email" \
+        --contact-timezone "Pacific Standard Time" \
+        --description "QuotaTicketDescription" \
+        --problem-classification "/providers/Microsoft.Support/services/QuotaServiceNameGuid/problemClassifications/MachineLearningQuotaProblemClassificationNameGuid" \
+        --severity "minimal" \
+        --ticket-name "QuotaTestTicketName" \
+        --title "QuotaTicketTitle" \
+        --quota-change-payload "{\"NewLimit\":200, \"Type\":\"LowPriority\"}" \
+        --quota-change-regions "EastUS" \
+        --quota-change-version "1.0" \
+        --quota-change-subtype "BatchAml"
+  requiredParameters:
+  - isRequired: true
+    name: --contact-country
+    summary: Country of the user. This is the ISO Alpha-3 code.
+    description: ''
+  - isRequired: true
+    name: --contact-email
+    summary: Primary email address.
+    description: ''
+  - isRequired: true
+    name: --contact-first-name
+    summary: First Name.
+    description: ''
+  - isRequired: true
+    name: --contact-language
+    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
+    description: ''
+  - isRequired: true
+    name: --contact-last-name
+    summary: Last Name.
+    description: ''
+  - isRequired: true
+    name: --contact-method
+    parameterValueGroup: email, phone
+    summary: Preferred contact method.
+    description: ''
+  - isRequired: true
+    name: --contact-timezone
+    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
+    description: ''
+  - isRequired: true
+    name: --description
+    summary: Detailed description of the question or issue.
+    description: ''
+  - isRequired: true
+    name: --problem-classification
+    summary: Each Azure service has its own set of issue category called problem classification that corresponds to the type of problem you are experiencing. This parameter is the resource id of ProblemClassification resource.
+    description: ''
+  - isRequired: true
+    name: --severity
+    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
+    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
+    description: ''
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  - isRequired: true
+    name: --title
+    summary: Title of the support ticket.
+    description: ''
+  optionalParameters:
+  - name: --contact-additional-emails
+    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
+    description: ''
+  - name: --contact-phone-number
+    summary: Phone number. This is required if preferred contact method is phone.
+    description: ''
+  - name: --partner-tenant-id
+    summary: Partner tenant id for Admin On Behalf of (AOBO) scenario. In addition to logging in to the customer tenant, logging in to the partner tenant (PT) using "az login -t PT --allow-no-subscriptions" is required.
+    description: ''
+  - name: --quota-change-payload
+    summary: Space seperated list of serialized payload of the quota increase request corresponding to regions. Visit https://aka.ms/supportrpquotarequestpayload for details.
+    description: ''
+  - name: --quota-change-regions
+    summary: Space seperated list of region for which the quota increase request is being made.
+    description: ''
+  - name: --quota-change-subtype
+    summary: 'Required for certain quota types when there is a sub type that you are requesting quota increase for. Example: Batch.'
+    description: ''
+  - name: --quota-change-version
+    summary: Quota change request version.
+    description: ''
+  - name: --require-24-by-7-response
+    parameterValueGroup: false, true
+    summary: Indicates if this requires a 24x7 response from Azure. Default is false.
+    description: ''
+  - name: --start-time
+    summary: Time in UTC datetime (Y-m-d'T'H:M:S'Z') when the problem started. Default is today.
+    description: ''
+  - name: --technical-resource
+    summary: This is the resource id of the Azure service resource for which the support ticket is created.
+    description: ''
+- uid: az_support_tickets_list
+  name: az support tickets list
+  summary: Lists all the support tickets for an Azure subscription.
+  description: ''
+  syntax: az support tickets list [--filters]
+  examples:
+  - summary: List support tickets for a subscription.
+    syntax: az support tickets list
+  - summary: List support tickets in open state for a subscription.
+    syntax: az support tickets list --filters "Status eq 'Open'"
+  - summary: List support tickets created on or after a certain date and in open state for a subscription.
+    syntax: az support tickets list --filters "CreatedDate ge 2020-01-01 and Status eq 'Open'"
+  optionalParameters:
+  - name: --filters
+    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "Status" property using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator. Default is CreatedDate >= one week.
+    description: ''
+- uid: az_support_tickets_show
+  name: az support tickets show
+  summary: Gets support ticket details for an Azure subscription.
+  description: ''
+  syntax: az support tickets show --ticket-name
+  examples:
+  - summary: Get details of a subscription ticket.
+    syntax: az support tickets show --ticket-name "TestTicketName"
+  requiredParameters:
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+- uid: az_support_tickets_update
+  name: az support tickets update
+  summary: Updates severity level, status and customer contact information for a support ticket.
+  description: ''
+  syntax: >-
+    az support tickets update --ticket-name
+                              [--contact-additional-emails]
+                              [--contact-country]
+                              [--contact-email]
+                              [--contact-first-name]
+                              [--contact-language]
+                              [--contact-last-name]
+                              [--contact-method {email, phone}]
+                              [--contact-phone-number]
+                              [--contact-timezone]
+                              [--severity {critical, highestcriticalimpact, minimal, moderate}]
+                              [--status {closed, open}]
+  examples:
+  - summary: Update support ticket severity.
+    syntax: az support tickets update --ticket-name "TestTicketName" --severity "moderate"
+  - summary: Update support ticket status.
+    syntax: az support tickets update --ticket-name "TestTicketName" --status "closed"
+  - summary: Update support ticket customer contact details properties.
+    syntax: >-
+      az support tickets update --ticket-name "TestTicketName" \
+        --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "phone" \
+        --contact-phone-number "123-456-7890" \
+        --contact-timezone "Pacific Standard Time"
+  - summary: Update support ticket severity, status and customer contact details properties.
+    syntax: >-
+      az support tickets update --ticket-name "TestTicketName" \
+        --status "open" \
+        --contact-additional-emails "xyz@contoso.com" "devs@contoso.com" \
+        --contact-country "USA" \
+        --contact-email "abc@contoso.com" \
+        --contact-first-name "Foo" \
+        --contact-language "en-US" \
+        --contact-last-name "Bar" \
+        --contact-method "phone" \
+        --contact-phone-number "123-456-7890" \
+        --contact-timezone "Pacific Standard Time" \
+        --severity "moderate"
+  requiredParameters:
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  optionalParameters:
+  - name: --contact-additional-emails
+    summary: Space seperated list of additional email addresses. Additional email addresses will be copied on any correspondence about the support ticket.
+    description: ''
+  - name: --contact-country
+    summary: Country of the user. This is the ISO Alpha-3 code.
+    description: ''
+  - name: --contact-email
+    summary: Primary email address.
+    description: ''
+  - name: --contact-first-name
+    summary: First Name.
+    description: ''
+  - name: --contact-language
+    summary: Preferred language of support from Azure. Support languages vary based on the severity you choose for your support ticket. This is the standard country-language code.
+    description: ''
+  - name: --contact-last-name
+    summary: Last Name.
+    description: ''
+  - name: --contact-method
+    parameterValueGroup: email, phone
+    summary: Preferred contact method.
+    description: ''
+  - name: --contact-phone-number
+    summary: Phone number. This is required if preferred contact method is phone.
+    description: ''
+  - name: --contact-timezone
+    summary: Time zone of the user. This is the name of the time zone from Microsoft Time Zone Index Values.
+    description: ''
+  - name: --severity
+    parameterValueGroup: critical, highestcriticalimpact, minimal, moderate
+    summary: A value that indicates the urgency of the case, which in turn determines the response time according to the service level agreement of the technical support plan you have with Azure.
+    description: ''
+  - name: --status
+    parameterValueGroup: closed, open
+    summary: Status to be updated on the ticket.
+    description: ''
+commands:
+- az_support_tickets_communications
+- az_support_tickets_communications_create
+- az_support_tickets_communications_list
+- az_support_tickets_communications_show
+- az_support_tickets_create
+- az_support_tickets_list
+- az_support_tickets_show
+- az_support_tickets_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Create and manage Azure support ticket.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/support/tickets/communications.yml b/2018-03-01-hybrid/docs-ref-autogen/support/tickets/communications.yml
new file mode 100644
index 0000000000..4a4b82e569
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/support/tickets/communications.yml
@@ -0,0 +1,121 @@
+### YamlMime:AzureCLIGroup
+uid: az_support_tickets_communications
+name: az support tickets communications
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **support** extension for Azure CLI and requires version 2.0.81 or higher.  The extension will automatically install the first time you run an **az support tickets communications** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage support ticket communications.
+description: ''
+directCommands:
+- uid: az_support_tickets_communications_create
+  name: az support tickets communications create
+  summary: Adds a new customer communication to an Azure support ticket.
+  description: ''
+  syntax: >-
+    az support tickets communications create --communication-body
+                                             --communication-name
+                                             --communication-subject
+                                             --ticket-name
+                                             [--communication-sender]
+  examples:
+  - summary: Add communication to subscription ticket.
+    syntax: >-
+      az support tickets communications create \
+        --ticket-name "TestTicketName" \
+        --communication-name "TestTicketCommunicationName" \
+        --communication-body "TicketCommunicationBody" \
+        --communication-subject "TicketCommunicationSubject"
+  requiredParameters:
+  - isRequired: true
+    name: --communication-body
+    summary: Text of the communication.
+    description: ''
+  - isRequired: true
+    name: --communication-name
+    summary: Communication name.
+    description: ''
+  - isRequired: true
+    name: --communication-subject
+    summary: Subject of the communication.
+    description: ''
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  optionalParameters:
+  - name: --communication-sender
+    summary: Email address of the sender.
+    description: ''
+- uid: az_support_tickets_communications_list
+  name: az support tickets communications list
+  summary: Lists all communications (attachments not included) for a support ticket.
+  description: ''
+  syntax: >-
+    az support tickets communications list --ticket-name
+                                           [--filters]
+  examples:
+  - summary: List communications for a subscription support ticket.
+    syntax: az support tickets communications list --ticket-name "TestTicketName"
+  - summary: List web communications for a subscription support ticket.
+    syntax: >-
+      az support tickets communications list \
+        --ticket-name "TestTicketName" \
+        --filters "communicationType eq 'Web'"
+  - summary: List web communication created on or after a specific date for a subscription support ticket.
+    syntax: >-
+      az support tickets communications list \
+        --ticket-name "TestTicketName" \
+        --filters "CreatedDate ge 2020-01-01 and communicationType eq 'Web'"
+  requiredParameters:
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: The filter to apply on the operation. We support OData v4.0 semtantics. Filter can be specified on "CommunicationType" using eq operator or on "CreatedDate" using gt/ge. To combine both filters, use the logical and operator.
+    description: ''
+- uid: az_support_tickets_communications_show
+  name: az support tickets communications show
+  summary: Gets communication details for a support ticket.
+  description: ''
+  syntax: >-
+    az support tickets communications show --communication-name
+                                           --ticket-name
+  examples:
+  - summary: Get communication details for a subscription support ticket.
+    syntax: >-
+      az support tickets communications show \
+        --ticket-name "TestTicketName" \
+        --communication-name "TestTicketCommunicationName"
+  requiredParameters:
+  - isRequired: true
+    name: --communication-name
+    summary: Communication name.
+    description: ''
+  - isRequired: true
+    name: --ticket-name
+    summary: Support ticket name.
+    description: ''
+commands:
+- az_support_tickets_communications_create
+- az_support_tickets_communications_list
+- az_support_tickets_communications_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage support ticket communications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse.yml
new file mode 100644
index 0000000000..3e9a79d507
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse.yml
@@ -0,0 +1,201 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse
+name: az synapse
+summary: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
+description: ''
+commands:
+- az_synapse_activity-run
+- az_synapse_activity-run_query-by-pipeline-run
+- az_synapse_data-flow
+- az_synapse_data-flow_create
+- az_synapse_data-flow_delete
+- az_synapse_data-flow_list
+- az_synapse_data-flow_set
+- az_synapse_data-flow_show
+- az_synapse_dataset
+- az_synapse_dataset_create
+- az_synapse_dataset_delete
+- az_synapse_dataset_list
+- az_synapse_dataset_set
+- az_synapse_dataset_show
+- az_synapse_integration-runtime
+- az_synapse_integration-runtime_create
+- az_synapse_integration-runtime_delete
+- az_synapse_integration-runtime_get-connection-info
+- az_synapse_integration-runtime_get-monitoring-data
+- az_synapse_integration-runtime_get-status
+- az_synapse_integration-runtime_list
+- az_synapse_integration-runtime_list-auth-key
+- az_synapse_integration-runtime_regenerate-auth-key
+- az_synapse_integration-runtime_show
+- az_synapse_integration-runtime_sync-credentials
+- az_synapse_integration-runtime_update
+- az_synapse_integration-runtime_upgrade
+- az_synapse_integration-runtime_wait
+- az_synapse_integration-runtime-node
+- az_synapse_integration-runtime-node_delete
+- az_synapse_integration-runtime-node_get-ip-address
+- az_synapse_integration-runtime-node_show
+- az_synapse_integration-runtime-node_update
+- az_synapse_linked-service
+- az_synapse_linked-service_create
+- az_synapse_linked-service_delete
+- az_synapse_linked-service_list
+- az_synapse_linked-service_set
+- az_synapse_linked-service_show
+- az_synapse_notebook
+- az_synapse_notebook_create
+- az_synapse_notebook_delete
+- az_synapse_notebook_export
+- az_synapse_notebook_import
+- az_synapse_notebook_list
+- az_synapse_notebook_set
+- az_synapse_notebook_show
+- az_synapse_pipeline
+- az_synapse_pipeline_create
+- az_synapse_pipeline_create-run
+- az_synapse_pipeline_delete
+- az_synapse_pipeline_list
+- az_synapse_pipeline_set
+- az_synapse_pipeline_show
+- az_synapse_pipeline-run
+- az_synapse_pipeline-run_cancel
+- az_synapse_pipeline-run_query-by-workspace
+- az_synapse_pipeline-run_show
+- az_synapse_role
+- az_synapse_role_assignment
+- az_synapse_role_assignment_create
+- az_synapse_role_assignment_delete
+- az_synapse_role_assignment_list
+- az_synapse_role_assignment_show
+- az_synapse_role_definition
+- az_synapse_role_definition_list
+- az_synapse_role_definition_show
+- az_synapse_role_scope
+- az_synapse_role_scope_list
+- az_synapse_spark
+- az_synapse_spark_job
+- az_synapse_spark_job_cancel
+- az_synapse_spark_job_list
+- az_synapse_spark_job_show
+- az_synapse_spark_job_submit
+- az_synapse_spark_pool
+- az_synapse_spark_pool_create
+- az_synapse_spark_pool_delete
+- az_synapse_spark_pool_list
+- az_synapse_spark_pool_show
+- az_synapse_spark_pool_update
+- az_synapse_spark_pool_wait
+- az_synapse_spark_session
+- az_synapse_spark_session_cancel
+- az_synapse_spark_session_create
+- az_synapse_spark_session_list
+- az_synapse_spark_session_reset-timeout
+- az_synapse_spark_session_show
+- az_synapse_spark_statement
+- az_synapse_spark_statement_cancel
+- az_synapse_spark_statement_invoke
+- az_synapse_spark_statement_list
+- az_synapse_spark_statement_show
+- az_synapse_sql
+- az_synapse_sql_ad-admin
+- az_synapse_sql_ad-admin_create
+- az_synapse_sql_ad-admin_delete
+- az_synapse_sql_ad-admin_show
+- az_synapse_sql_ad-admin_update
+- az_synapse_sql_ad-admin_wait
+- az_synapse_sql_audit-policy
+- az_synapse_sql_audit-policy_show
+- az_synapse_sql_audit-policy_update
+- az_synapse_sql_audit-policy_wait
+- az_synapse_sql_pool
+- az_synapse_sql_pool_audit-policy
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+- az_synapse_sql_pool_classification
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+- az_synapse_sql_pool_create
+- az_synapse_sql_pool_delete
+- az_synapse_sql_pool_list
+- az_synapse_sql_pool_list-deleted
+- az_synapse_sql_pool_pause
+- az_synapse_sql_pool_restore
+- az_synapse_sql_pool_resume
+- az_synapse_sql_pool_show
+- az_synapse_sql_pool_show-connection-string
+- az_synapse_sql_pool_tde
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+- az_synapse_sql_pool_threat-policy
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+- az_synapse_sql_pool_update
+- az_synapse_sql_pool_wait
+- az_synapse_trigger
+- az_synapse_trigger_create
+- az_synapse_trigger_delete
+- az_synapse_trigger_get-event-subscription-status
+- az_synapse_trigger_list
+- az_synapse_trigger_set
+- az_synapse_trigger_show
+- az_synapse_trigger_start
+- az_synapse_trigger_stop
+- az_synapse_trigger_subscribe-to-event
+- az_synapse_trigger_unsubscribe-from-event
+- az_synapse_trigger-run
+- az_synapse_trigger-run_query-by-workspace
+- az_synapse_trigger-run_rerun
+- az_synapse_workspace
+- az_synapse_workspace_check-name
+- az_synapse_workspace_create
+- az_synapse_workspace_delete
+- az_synapse_workspace_firewall-rule
+- az_synapse_workspace_firewall-rule_create
+- az_synapse_workspace_firewall-rule_delete
+- az_synapse_workspace_firewall-rule_list
+- az_synapse_workspace_firewall-rule_show
+- az_synapse_workspace_firewall-rule_update
+- az_synapse_workspace_firewall-rule_wait
+- az_synapse_workspace_key
+- az_synapse_workspace_key_create
+- az_synapse_workspace_key_delete
+- az_synapse_workspace_key_list
+- az_synapse_workspace_key_show
+- az_synapse_workspace_key_update
+- az_synapse_workspace_key_wait
+- az_synapse_workspace_list
+- az_synapse_workspace_managed-identity
+- az_synapse_workspace_managed-identity_grant-sql-access
+- az_synapse_workspace_managed-identity_revoke-sql-access
+- az_synapse_workspace_managed-identity_show-sql-access
+- az_synapse_workspace_managed-identity_wait
+- az_synapse_workspace_show
+- az_synapse_workspace_update
+- az_synapse_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage and operate Synapse Workspace, Spark Pool, SQL Pool.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/activity-run.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/activity-run.yml
new file mode 100644
index 0000000000..ef5614a651
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/activity-run.yml
@@ -0,0 +1,82 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_activity-run
+name: az synapse activity-run
+summary: Synapse activity-run.
+description: ''
+directCommands:
+- uid: az_synapse_activity-run_query-by-pipeline-run
+  name: az synapse activity-run query-by-pipeline-run
+  summary: Query activity runs based on input filter conditions.
+  description: ''
+  syntax: >-
+    az synapse activity-run query-by-pipeline-run --last-updated-after
+                                                  --last-updated-before
+                                                  --name
+                                                  --run-id
+                                                  --workspace-name
+                                                  [--continuation-token]
+                                                  [--filters]
+                                                  [--order-by]
+                                                  [--subscription]
+  examples:
+  - summary: Query activity runs based on input filter conditions.
+    syntax: >-
+      az synapse activity-run query-by-pipeline-run --workspace-name testsynapseworkspace \
+        --last-updated-after "2020-09-03T00:36:44.3345758Z" --last-updated-before "2020-09-03T00:49:48.3686473Z" \
+        --name testpipeline --run-id "53eeed66-ec46-11ea-8bd5-448500a5b1ac"
+  requiredParameters:
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: ''
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_activity-run_query-by-pipeline-run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Synapse activity-run.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/data-flow.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/data-flow.yml
new file mode 100644
index 0000000000..5ac043d18e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/data-flow.yml
@@ -0,0 +1,193 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_data-flow
+name: az synapse data-flow
+summary: Manage Synapse's data flows.
+description: ''
+directCommands:
+- uid: az_synapse_data-flow_create
+  name: az synapse data-flow create
+  summary: Create a data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow create --file
+                                --name
+                                --workspace-name
+                                [--no-wait]
+                                [--subscription]
+  examples:
+  - summary: Create a data flow.
+    syntax: >-
+      az synapse data-flow create --workspace-name testsynapseworkspace \
+        --name testdataflow --file @path/dataflow.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_delete
+  name: az synapse data-flow delete
+  summary: Delete a data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow delete --name
+                                --workspace-name
+                                [--no-wait]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a data flow.
+    syntax: >-
+      az synapse data-flow delete --workspace-name testsynapseworkspace \
+        --name testdataflow
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_list
+  name: az synapse data-flow list
+  summary: List data flows.
+  description: ''
+  syntax: >-
+    az synapse data-flow list --workspace-name
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: List data flows.
+    syntax: az synapse data-flow list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_set
+  name: az synapse data-flow set
+  summary: Set an exist data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow set --file
+                             --name
+                             --workspace-name
+                             [--no-wait]
+                             [--subscription]
+  examples:
+  - summary: Set an exist data flow.
+    syntax: >-
+      az synapse data-flow set --workspace-name testsynapseworkspace \
+        --name testdataflow --file @path/dataflow.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_data-flow_show
+  name: az synapse data-flow show
+  summary: Get a data flow.
+  description: ''
+  syntax: >-
+    az synapse data-flow show --name
+                              --workspace-name
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: Get a data flow.
+    syntax: >-
+      az synapse data-flow show --workspace-name testsynapseworkspace \
+        --name testdataflow
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The data flow name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_data-flow_create
+- az_synapse_data-flow_delete
+- az_synapse_data-flow_list
+- az_synapse_data-flow_set
+- az_synapse_data-flow_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's data flows.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/dataset.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/dataset.yml
new file mode 100644
index 0000000000..8875207187
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/dataset.yml
@@ -0,0 +1,193 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_dataset
+name: az synapse dataset
+summary: Manage Synapse's datasets.
+description: ''
+directCommands:
+- uid: az_synapse_dataset_create
+  name: az synapse dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset create --file
+                              --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+  examples:
+  - summary: Create a dataset.
+    syntax: >-
+      az synapse dataset create --workspace-name testsynapseworkspace \
+        --name testdataset --file @path/dataset.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_delete
+  name: az synapse dataset delete
+  summary: Delete a dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset delete --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+                              [--yes]
+  examples:
+  - summary: Delete a dataset.
+    syntax: >-
+      az synapse dataset delete --workspace-name testsynapseworkspace \
+        --name testdataset
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_list
+  name: az synapse dataset list
+  summary: List datasets.
+  description: ''
+  syntax: >-
+    az synapse dataset list --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: List datasets.
+    syntax: az synapse dataset list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_set
+  name: az synapse dataset set
+  summary: Set an exist dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset set --file
+                           --name
+                           --workspace-name
+                           [--no-wait]
+                           [--subscription]
+  examples:
+  - summary: Set an exist dataset.
+    syntax: >-
+      az synapse dataset set --workspace-name testsynapseworkspace \
+        --name testdataset --file @path/dataset.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_dataset_show
+  name: az synapse dataset show
+  summary: Get a dataset.
+  description: ''
+  syntax: >-
+    az synapse dataset show --name
+                            --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: Get a dataset.
+    syntax: >-
+      az synapse dataset show --workspace-name testsynapseworkspace \
+        --name testdataset
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_dataset_create
+- az_synapse_dataset_delete
+- az_synapse_dataset_list
+- az_synapse_dataset_set
+- az_synapse_dataset_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's datasets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/integration-runtime-node.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/integration-runtime-node.yml
new file mode 100644
index 0000000000..5b257482d4
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/integration-runtime-node.yml
@@ -0,0 +1,201 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_integration-runtime-node
+name: az synapse integration-runtime-node
+summary: Manage Synapse's self-hosted integration runtime nodes.
+description: ''
+directCommands:
+- uid: az_synapse_integration-runtime-node_delete
+  name: az synapse integration-runtime-node delete
+  summary: Remove a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node delete --node-name
+                                               [--ids]
+                                               [--name]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--workspace-name]
+                                               [--yes]
+  examples:
+  - summary: Remove a self-hosted integration runtime node.
+    syntax: >-
+      az synapse integration-runtime-node delete --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode
+  requiredParameters:
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime-node_get-ip-address
+  name: az synapse integration-runtime-node get-ip-address
+  summary: Get self-hosted integration runtime node ip.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node get-ip-address --node-name
+                                                       [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Get self-hosted integration runtime node ip.
+    syntax: >-
+      az synapse integration-runtime-node get-ip-address --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode
+  requiredParameters:
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime-node_show
+  name: az synapse integration-runtime-node show
+  summary: Get self-hosted integration runtime node information.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node show --node-name
+                                             [--ids]
+                                             [--name]
+                                             [--query-examples]
+                                             [--resource-group]
+                                             [--subscription]
+                                             [--workspace-name]
+  examples:
+  - summary: Get self-hosted integration runtime node information.
+    syntax: >-
+      az synapse integration-runtime-node show --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode
+  requiredParameters:
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime-node_update
+  name: az synapse integration-runtime-node update
+  summary: Update self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime-node update --auto-update {Off, On}
+                                               --node-name
+                                               --update-delay-offset
+                                               [--ids]
+                                               [--name]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--workspace-name]
+  examples:
+  - summary: Update self-hosted integration runtime node.
+    syntax: >-
+      az synapse integration-runtime-node update --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --node-name testnode --auto-update On --update-delay-offset 'PT03H'
+  requiredParameters:
+  - isRequired: true
+    name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enable or disable the self-hosted integration runtime auto-update.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --update-delay-offset
+    summary: The time of the day for the self-hosted integration runtime auto-update.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_integration-runtime-node_delete
+- az_synapse_integration-runtime-node_get-ip-address
+- az_synapse_integration-runtime-node_show
+- az_synapse_integration-runtime-node_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's self-hosted integration runtime nodes.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/integration-runtime.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/integration-runtime.yml
new file mode 100644
index 0000000000..b936a8496a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/integration-runtime.yml
@@ -0,0 +1,553 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_integration-runtime
+name: az synapse integration-runtime
+summary: Manage Synapse's integration runtimes.
+description: ''
+directCommands:
+- uid: az_synapse_integration-runtime_create
+  name: az synapse integration-runtime create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime create --name
+                                          --resource-group
+                                          --type {Managed, SelfHosted}
+                                          --workspace-name
+                                          [--compute-type {ComputeOptimized, General, MemoryOptimized}]
+                                          [--core-count]
+                                          [--description]
+                                          [--if-match]
+                                          [--location]
+                                          [--no-wait]
+                                          [--subscription]
+                                          [--time-to-live]
+  examples:
+  - summary: Create an integration runtime.
+    syntax: >-
+      az synapse integration-runtime create --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime --type Managed
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Managed, SelfHosted
+    summary: The integration runtime type.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --compute-type
+    defaultValue: General
+    parameterValueGroup: ComputeOptimized, General, MemoryOptimized
+    summary: Compute type of the data flow cluster which will execute data flow job.
+    description: ''
+  - name: --core-count
+    defaultValue: "8"
+    summary: Core count of the data flow cluster which will execute data flow job.
+    description: ''
+  - name: --description
+    summary: The integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --location -l
+    defaultValue: AutoResolve
+    summary: The integration runtime location.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time-to-live
+    summary: Time to live (in minutes) setting of the data flow cluster which will execute data flow job.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_delete
+  name: az synapse integration-runtime delete
+  summary: Delete an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime delete [--ids]
+                                          [--name]
+                                          [--no-wait]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--workspace-name]
+                                          [--yes]
+  examples:
+  - summary: Delete an integration runtime.
+    syntax: >-
+      az synapse integration-runtime delete --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_get-connection-info
+  name: az synapse integration-runtime get-connection-info
+  summary: Get the integration runtime connection infomation.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime get-connection-info [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Get the integration runtime connection infomation.
+    syntax: >-
+      az synapse integration-runtime get-connection-info --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_get-monitoring-data
+  name: az synapse integration-runtime get-monitoring-data
+  summary: Get metric data for a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime get-monitoring-data [--ids]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Get metric data for a self-hosted integration runtime.
+    syntax: >-
+      az synapse integration-runtime get-monitoring-data --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_get-status
+  name: az synapse integration-runtime get-status
+  summary: Gets detailed status information for an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime get-status [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Gets detailed status information for an integration runtime.
+    syntax: >-
+      az synapse integration-runtime get-status --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_list
+  name: az synapse integration-runtime list
+  summary: List integration runtimes.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime list --resource-group
+                                        --workspace-name
+                                        [--query-examples]
+                                        [--subscription]
+  examples:
+  - summary: List integration runtimes.
+    syntax: az synapse integration-runtime list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_list-auth-key
+  name: az synapse integration-runtime list-auth-key
+  summary: Get keys for a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime list-auth-key --name
+                                                 --resource-group
+                                                 --workspace-name
+                                                 [--subscription]
+  examples:
+  - summary: Get keys for a self-hosted integration runtime.
+    syntax: >-
+      az synapse integration-runtime list-auth-key --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_regenerate-auth-key
+  name: az synapse integration-runtime regenerate-auth-key
+  summary: Regenerate self-hosted integration runtime key.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime regenerate-auth-key [--ids]
+                                                       [--key-name {authKey1, authKey2}]
+                                                       [--name]
+                                                       [--resource-group]
+                                                       [--subscription]
+                                                       [--workspace-name]
+  examples:
+  - summary: Regenerate self-hosted integration runtime key.
+    syntax: >-
+      az synapse integration-runtime regenerate-auth-key --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime --key-name authKey1
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --key-name
+    defaultValue: default
+    parameterValueGroup: authKey1, authKey2
+    summary: The name of the authentication key to regenerate.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_show
+  name: az synapse integration-runtime show
+  summary: Get an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime show [--ids]
+                                        [--if-none-match]
+                                        [--name]
+                                        [--query-examples]
+                                        [--resource-group]
+                                        [--subscription]
+                                        [--workspace-name]
+  examples:
+  - summary: Get an integration runtime.
+    syntax: >-
+      az synapse integration-runtime show --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_sync-credentials
+  name: az synapse integration-runtime sync-credentials
+  summary: Synchronize credentials among integration runtime nodes.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime sync-credentials [--ids]
+                                                    [--name]
+                                                    [--resource-group]
+                                                    [--subscription]
+                                                    [--workspace-name]
+  examples:
+  - summary: Synchronize credentials among integration runtime nodes.
+    syntax: >-
+      az synapse integration-runtime sync-credentials --workspace-name testsynapseworkspace --resource-group rg \
+        --name selfhostedintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_update
+  name: az synapse integration-runtime update
+  summary: Update an integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime update --auto-update {Off, On}
+                                          --update-delay-offset
+                                          [--ids]
+                                          [--name]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--workspace-name]
+  examples:
+  - summary: Update an integration runtime.
+    syntax: >-
+      az synapse integration-runtime update --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime --auto-update On --update-delay-offset '"PT03H"'
+  requiredParameters:
+  - isRequired: true
+    name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enable or disable the self-hosted integration runtime auto-update.
+    description: ''
+  - isRequired: true
+    name: --update-delay-offset
+    summary: The time of the day for the self-hosted integration runtime auto-update.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_upgrade
+  name: az synapse integration-runtime upgrade
+  summary: Upgrade self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime upgrade [--ids]
+                                           [--name]
+                                           [--resource-group]
+                                           [--subscription]
+                                           [--workspace-name]
+  examples:
+  - summary: Upgrade self-hosted integration runtime.
+    syntax: >-
+      az synapse integration-runtime upgrade --workspace-name testsynapseworkspace --resource-group rg \
+        --name testintegrationruntime
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_integration-runtime_wait
+  name: az synapse integration-runtime wait
+  summary: Place the CLI in a waiting state until a condition of a integration runtime is met.
+  description: ''
+  syntax: >-
+    az synapse integration-runtime wait --name
+                                        --resource-group
+                                        --workspace-name
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--if-none-match]
+                                        [--interval]
+                                        [--subscription]
+                                        [--timeout]
+                                        [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_integration-runtime_create
+- az_synapse_integration-runtime_delete
+- az_synapse_integration-runtime_get-connection-info
+- az_synapse_integration-runtime_get-monitoring-data
+- az_synapse_integration-runtime_get-status
+- az_synapse_integration-runtime_list
+- az_synapse_integration-runtime_list-auth-key
+- az_synapse_integration-runtime_regenerate-auth-key
+- az_synapse_integration-runtime_show
+- az_synapse_integration-runtime_sync-credentials
+- az_synapse_integration-runtime_update
+- az_synapse_integration-runtime_upgrade
+- az_synapse_integration-runtime_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's integration runtimes.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/linked-service.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/linked-service.yml
new file mode 100644
index 0000000000..ee30941a8e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/linked-service.yml
@@ -0,0 +1,193 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_linked-service
+name: az synapse linked-service
+summary: Manage Synapse's linked services.
+description: ''
+directCommands:
+- uid: az_synapse_linked-service_create
+  name: az synapse linked-service create
+  summary: Create a linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service create --file
+                                     --name
+                                     --workspace-name
+                                     [--no-wait]
+                                     [--subscription]
+  examples:
+  - summary: Create a linked service.
+    syntax: >-
+      az synapse linked-service create --workspace-name testsynapseworkspace \
+        --name testlinkedservice --file @path/linkedservice.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_delete
+  name: az synapse linked-service delete
+  summary: Delete a linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service delete --name
+                                     --workspace-name
+                                     [--no-wait]
+                                     [--subscription]
+                                     [--yes]
+  examples:
+  - summary: Delete a linked service.
+    syntax: >-
+      az synapse linked-service delete --workspace-name testsynapseworkspace \
+        --name testlinkedservice
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_list
+  name: az synapse linked-service list
+  summary: List linked services.
+  description: ''
+  syntax: >-
+    az synapse linked-service list --workspace-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: List linked services.
+    syntax: az synapse linked-service list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_set
+  name: az synapse linked-service set
+  summary: Set an exist linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service set --file
+                                  --name
+                                  --workspace-name
+                                  [--no-wait]
+                                  [--subscription]
+  examples:
+  - summary: Set an exist linked service.
+    syntax: >-
+      az synapse linked-service set --workspace-name testsynapseworkspace \
+        --name testlinkedservice --file @path/linkedservice.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_linked-service_show
+  name: az synapse linked-service show
+  summary: Get a linked service.
+  description: ''
+  syntax: >-
+    az synapse linked-service show --name
+                                   --workspace-name
+                                   [--query-examples]
+                                   [--subscription]
+  examples:
+  - summary: Get a linked service.
+    syntax: >-
+      az synapse linked-service show --workspace-name testsynapseworkspace \
+        --name testlinkedservice
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_linked-service_create
+- az_synapse_linked-service_delete
+- az_synapse_linked-service_list
+- az_synapse_linked-service_set
+- az_synapse_linked-service_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's linked services.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/notebook.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/notebook.yml
new file mode 100644
index 0000000000..fb4cb267c1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/notebook.yml
@@ -0,0 +1,311 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_notebook
+name: az synapse notebook
+summary: Manage Synapse's notebooks.
+description: ''
+directCommands:
+- uid: az_synapse_notebook_create
+  name: az synapse notebook create
+  summary: Create a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook create --file
+                               --name
+                               --workspace-name
+                               [--executor-count]
+                               [--executor-size {Large, Medium, Small}]
+                               [--no-wait]
+                               [--spark-pool-name]
+                               [--subscription]
+  examples:
+  - summary: Create a notebook.
+    syntax: >-
+      az synapse notebook create --workspace-name testsynapseworkspace \
+        --name testnotebook --file @path/notebook.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --executor-count
+    defaultValue: "2"
+    summary: Number of executors to be allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --executor-size
+    defaultValue: Small
+    parameterValueGroup: Large, Medium, Small
+    summary: Number of core and memory to be used for executors allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_delete
+  name: az synapse notebook delete
+  summary: Delete a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook delete --name
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+                               [--yes]
+  examples:
+  - summary: Delete a notebook.
+    syntax: >-
+      az synapse notebook delete --workspace-name testsynapseworkspace \
+        --name testnotebook
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_export
+  name: az synapse notebook export
+  summary: Export notebooks.
+  description: ''
+  syntax: >-
+    az synapse notebook export --output-folder
+                               --workspace-name
+                               [--name]
+                               [--subscription]
+  examples:
+  - summary: Export a notebook.
+    syntax: >-
+      az synapse notebook export --workspace-name testsynapseworkspace \
+        --name testnotebook --output-folder C:/output
+  - summary: Export all notebooks under a workspace.
+    syntax: >-
+      az synapse notebook export --workspace-name testsynapseworkspace \
+        --output-folder C:/output
+  requiredParameters:
+  - isRequired: true
+    name: --output-folder
+    summary: The folder where the notebook should be placed.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The notebook name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_import
+  name: az synapse notebook import
+  summary: Import a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook import --file
+                               --name
+                               --workspace-name
+                               [--executor-count]
+                               [--executor-size {Large, Medium, Small}]
+                               [--no-wait]
+                               [--spark-pool-name]
+                               [--subscription]
+  examples:
+  - summary: Import a notebook.
+    syntax: >-
+      az synapse notebook import --workspace-name testsynapseworkspace \
+        --name testnotebook --file @path/notebook.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --executor-count
+    defaultValue: "2"
+    summary: Number of executors to be allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --executor-size
+    defaultValue: Small
+    parameterValueGroup: Large, Medium, Small
+    summary: Number of core and memory to be used for executors allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_list
+  name: az synapse notebook list
+  summary: List notebooks.
+  description: ''
+  syntax: >-
+    az synapse notebook list --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: List notebooks.
+    syntax: az synapse notebook list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_set
+  name: az synapse notebook set
+  summary: Set an exist notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook set --file
+                            --name
+                            --workspace-name
+                            [--executor-count]
+                            [--executor-size {Large, Medium, Small}]
+                            [--no-wait]
+                            [--spark-pool-name]
+                            [--subscription]
+  examples:
+  - summary: Set an exist notebook.
+    syntax: >-
+      az synapse notebook set --workspace-name testsynapseworkspace \
+        --name testnotebook --file @path/notebook.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --executor-count
+    defaultValue: "2"
+    summary: Number of executors to be allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --executor-size
+    defaultValue: Small
+    parameterValueGroup: Large, Medium, Small
+    summary: Number of core and memory to be used for executors allocated in the specified Spark pool for the job.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_notebook_show
+  name: az synapse notebook show
+  summary: Get a notebook.
+  description: ''
+  syntax: >-
+    az synapse notebook show --name
+                             --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: Get a notebook.
+    syntax: >-
+      az synapse notebook show --workspace-name testsynapseworkspace \
+        --name testnotebook
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The notebook name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_notebook_create
+- az_synapse_notebook_delete
+- az_synapse_notebook_export
+- az_synapse_notebook_import
+- az_synapse_notebook_list
+- az_synapse_notebook_set
+- az_synapse_notebook_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's notebooks.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/pipeline-run.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/pipeline-run.yml
new file mode 100644
index 0000000000..2461da7dfc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/pipeline-run.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_pipeline-run
+name: az synapse pipeline-run
+summary: Manage Synapse's pipeline run.
+description: ''
+directCommands:
+- uid: az_synapse_pipeline-run_cancel
+  name: az synapse pipeline-run cancel
+  summary: Cancel a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az synapse pipeline-run cancel --run-id
+                                   --workspace-name
+                                   [--is-recursive {false, true}]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Cancel a pipeline run by its run ID.
+    syntax: >-
+      az synapse pipeline-run cancel --workspace-name testsynapseworkspace \
+        --run-id "16ac5348-ff82-4f95-a80d-638c1d47b721"
+  requiredParameters:
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --is-recursive
+    parameterValueGroup: false, true
+    summary: If true, cancel all the Child pipelines that are triggered by the current pipeline.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline-run_query-by-workspace
+  name: az synapse pipeline-run query-by-workspace
+  summary: Query pipeline runs in the workspace based on input filter conditions.
+  description: ''
+  syntax: >-
+    az synapse pipeline-run query-by-workspace --last-updated-after
+                                               --last-updated-before
+                                               --workspace-name
+                                               [--continuation-token]
+                                               [--filters]
+                                               [--order-by]
+                                               [--subscription]
+  examples:
+  - summary: Query pipeline runs in the workspace based on input filter conditions.
+    syntax: >-
+      az synapse pipeline-run query-by-workspace --workspace-name testsynapseworkspace --filters \
+        operand="PipelineName" operator="Equals" values="testpipeline" --last-updated-after "2020-09-03T00:36:44.3345758Z" \
+        --last-updated-before "2020-09-03T00:49:48.3686473Z"
+  requiredParameters:
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: ''
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline-run_show
+  name: az synapse pipeline-run show
+  summary: Get a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az synapse pipeline-run show --run-id
+                                 --workspace-name
+                                 [--query-examples]
+                                 [--subscription]
+  examples:
+  - summary: Get a pipeline run by its run ID.
+    syntax: >-
+      az synapse pipeline-run show --workspace-name testsynapseworkspace \
+        --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_pipeline-run_cancel
+- az_synapse_pipeline-run_query-by-workspace
+- az_synapse_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's pipeline run.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/pipeline.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/pipeline.yml
new file mode 100644
index 0000000000..836b1fe989
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/pipeline.yml
@@ -0,0 +1,238 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_pipeline
+name: az synapse pipeline
+summary: Manage Synapse's pipelines.
+description: ''
+directCommands:
+- uid: az_synapse_pipeline_create
+  name: az synapse pipeline create
+  summary: Create a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline create --file
+                               --name
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+  examples:
+  - summary: Create a pipeline.
+    syntax: >-
+      az synapse pipeline create --workspace-name testsynapseworkspace \
+        --name testpipeline --file @path/pipeline.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_create-run
+  name: az synapse pipeline create-run
+  summary: Creates a run of a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline create-run --name
+                                   --workspace-name
+                                   [--is-recovery {false, true}]
+                                   [--parameters]
+                                   [--reference-pipeline-run-id]
+                                   [--start-activity-name]
+                                   [--subscription]
+  examples:
+  - summary: Pipelines_CreateRun
+    syntax: >-
+      az synapse pipeline create-run --workspace-name testsynapseworkspace --name "myPipeline" \
+        --parameters "{\"OutputBlobNameList\":[\"exampleoutput.csv\"]}"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --is-recovery
+    parameterValueGroup: false, true
+    summary: Recovery mode flag. If recovery mode is set to true, the specified referenced pipeline run and the new run will be grouped under the same groupId.
+    description: ''
+  - name: --parameters
+    summary: Parameters for pipeline run. Can be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - name: --reference-pipeline-run-id --run-id
+    summary: The pipeline run ID for rerun. If run ID is specified, the parameters of the specified run will be used to create a new run.
+    description: ''
+  - name: --start-activity-name
+    summary: In recovery mode, the rerun will start from this activity. If not specified, all activities will run.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_delete
+  name: az synapse pipeline delete
+  summary: Delete a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline delete --name
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+                               [--yes]
+  examples:
+  - summary: Delete a pipeline.
+    syntax: >-
+      az synapse pipeline delete --workspace-name testsynapseworkspace \
+        --name testpipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_list
+  name: az synapse pipeline list
+  summary: List pipelines.
+  description: ''
+  syntax: >-
+    az synapse pipeline list --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: List pipelines.
+    syntax: az synapse pipeline list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_set
+  name: az synapse pipeline set
+  summary: Set an exist pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline set --file
+                            --name
+                            --workspace-name
+                            [--no-wait]
+                            [--subscription]
+  examples:
+  - summary: Set an exist pipeline.
+    syntax: >-
+      az synapse pipeline set --workspace-name testsynapseworkspace \
+        --name testpipeline --file @path/pipeline.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_pipeline_show
+  name: az synapse pipeline show
+  summary: Get a pipeline.
+  description: ''
+  syntax: >-
+    az synapse pipeline show --name
+                             --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: Get a pipeline.
+    syntax: >-
+      az synapse pipeline show --workspace-name testsynapseworkspace \
+        --name testpipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_pipeline_create
+- az_synapse_pipeline_create-run
+- az_synapse_pipeline_delete
+- az_synapse_pipeline_list
+- az_synapse_pipeline_set
+- az_synapse_pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's pipelines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/role.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/role.yml
new file mode 100644
index 0000000000..ab18fe4176
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/role.yml
@@ -0,0 +1,35 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role
+name: az synapse role
+summary: Manage Synapse's role assignments and definitions.
+description: ''
+commands:
+- az_synapse_role_assignment
+- az_synapse_role_assignment_create
+- az_synapse_role_assignment_delete
+- az_synapse_role_assignment_list
+- az_synapse_role_assignment_show
+- az_synapse_role_definition
+- az_synapse_role_definition_list
+- az_synapse_role_definition_show
+- az_synapse_role_scope
+- az_synapse_role_scope_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role assignments and definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/role/assignment.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/role/assignment.yml
new file mode 100644
index 0000000000..53d99fd7b5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/role/assignment.yml
@@ -0,0 +1,302 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role_assignment
+name: az synapse role assignment
+summary: Manage Synapse's role assignments.
+description: ''
+directCommands:
+- uid: az_synapse_role_assignment_create
+  name: az synapse role assignment create
+  summary: Create a role assignment.
+  description: ''
+  syntax: >-
+    az synapse role assignment create --role
+                                      --workspace-name
+                                      [--assignee]
+                                      [--assignee-object-id]
+                                      [--assignee-principal-type {Group, ServicePrincipal, User}]
+                                      [--assignment-id]
+                                      [--item]
+                                      [--item-type {bigDataPools, credentials, integrationRuntimes, linkedServices}]
+                                      [--scope]
+                                      [--subscription]
+  examples:
+  - summary: Create a role assignment using service principal name.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee sp_name
+  - summary: Create a role assignment using user principal name.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee username@contoso.com
+  - summary: Create a role assignment using objectId of the User, Group or Service Principal.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee 00000000-0000-0000-0000-000000000000
+  - summary: Create a role assignment at scope.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --scope "workspaces/{workspaceName}" --role "Synapse Administrator" --assignee username@contoso.com
+  - summary: Create a role assignment at scope that combination of item type and item name.
+    syntax: >-
+      az synapse role assignment create --workspace-name testsynapseworkspace \
+
+      --item-type "bigDataPools" --item "bigDataPoolName" --role "Synapse Administrator" \
+
+      --assignee username@contoso.com
+  requiredParameters:
+  - isRequired: true
+    name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user or service principal. Supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --assignee-object-id
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
+    description: ''
+  - name: --assignee-principal-type --assignee-type
+    parameterValueGroup: Group, ServicePrincipal, User
+    summary: Use with --assignee-object-id to avoid errors caused by propagation latency in AAD Graph.
+    description: ''
+  - name: --assignment-id
+    summary: Custom role assignment id in guid format, if not specified, assignment id will be randomly generated.
+    description: ''
+  - name: --item
+    summary: Item granted access in the workspace. Using with --item-type to combine the scope of assignment.
+    description: ''
+  - name: --item-type
+    parameterValueGroup: bigDataPools, credentials, integrationRuntimes, linkedServices
+    summary: Item type granted access in the workspace. Using with --item to combine the scope of assignment.
+    description: ''
+  - name: --scope
+    summary: A scope defines the resources or artifacts that the access applies to. Synapse supports hierarchical scopes. Permissions granted at a higher-level scope are inherited by objects at a lower level. In Synapse RBAC, the top-level scope is a workspace. Assigning a role with workspace scope grants permissions to all applicable objects in the workspace.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_assignment_delete
+  name: az synapse role assignment delete
+  summary: Delete role assignments of workspace.
+  description: ''
+  syntax: >-
+    az synapse role assignment delete --workspace-name
+                                      [--assignee]
+                                      [--assignee-object-id]
+                                      [--ids]
+                                      [--item]
+                                      [--item-type {bigDataPools, credentials, integrationRuntimes, linkedServices}]
+                                      [--role]
+                                      [--scope]
+                                      [--subscription]
+                                      [--yes]
+  examples:
+  - summary: Delete role assignments by role and assignee.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator" --assignee sp_name
+  - summary: Delete role assignments by role id/name.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --role "Synapse Administrator"
+  - summary: Delete role assignments by service principal name.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --assignee sp_name
+  - summary: Delete role assignments by user principal name.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --assignee username@contoso.com
+  - summary: Delete role assignments by objectId of the User, Group or Service Principal.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --assignee 00000000-0000-0000-0000-000000000001
+  - summary: Delete role assignments by ids.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --ids 10000000-0000-0000-0000-10000000-10000000-0000-0000-0000-10000000
+  - summary: Delete role assignments by scope.
+    syntax: >-
+      az synapse role assignment delete --workspace-name testsynapseworkspace \
+
+      --scope "workspaces/testsynapseworkspace/linkedServices/testlinkedServices"
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user or service principal. Supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --assignee-object-id
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
+    description: ''
+  - name: --ids
+    summary: Space-separated role assignment ids. You should not provide --role or --assignee when --ids is provided.
+    description: ''
+  - name: --item
+    summary: Item granted access in the workspace. Using with --item-type to combine the scope of assignment.Using az role assignment with filter condition before executing delete operation to be clearly aware of which assignments will be deleted.
+    description: ''
+  - name: --item-type
+    parameterValueGroup: bigDataPools, credentials, integrationRuntimes, linkedServices
+    summary: Item type granted access in the workspace. Using with --item to combine the scope of assignment.Using az role assignment with filter condition before executing delete operation to be clearly aware of which assignments will be deleted.
+    description: ''
+  - name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - name: --scope
+    summary: A scope defines the resources or artifacts that the access applies to. Synapse supports hierarchical scopes. Permissions granted at a higher-level scope are inherited by objects at a lower level. In Synapse RBAC, the top-level scope is a workspace. Using az role assignment with filter condition before executing delete operation to be clearly aware of which assignments will be deleted.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_assignment_list
+  name: az synapse role assignment list
+  summary: List role assignments.
+  description: ''
+  syntax: >-
+    az synapse role assignment list --workspace-name
+                                    [--assignee]
+                                    [--assignee-object-id]
+                                    [--item]
+                                    [--item-type {bigDataPools, credentials, integrationRuntimes, linkedServices}]
+                                    [--query-examples]
+                                    [--role]
+                                    [--scope]
+                                    [--subscription]
+  examples:
+  - summary: List role assignments.
+    syntax: az synapse role assignment list --workspace-name testsynapseworkspace
+  - summary: List role assignments by role id/name.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --role "Synapse Apache Spark Administrator"
+  - summary: List role assignments by assignee.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --assignee sp_name
+  - summary: List role assignments by objectId of the User, Group or Service Principal.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --assignee-object-id 00000000-0000-0000-0000-000000000000
+  - summary: List role assignments by scope.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --scope "workspaces/{workspaceName}"
+  - summary: List role assignments by item type and item name.
+    syntax: >-
+      az synapse role assignment list --workspace-name testsynapseworkspace \
+
+      --item-type "bigDataPools" --item "bigDataPoolName"
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --assignee
+    summary: 'Represent a user or service principal. Supported format: object id, user sign-in name, or service principal name.'
+    description: ''
+  - name: --assignee-object-id
+    summary: Use this parameter instead of '--assignee' to bypass Graph API invocation in case of insufficient privileges. This parameter only works with object ids for users, groups, service principals, and managed identities. For managed identities use the principal id. For service principals, use the object id and not the app id.
+    description: ''
+  - name: --item
+    summary: Item granted access in the workspace. Using with --item-type to combine the scope of assignment.
+    description: ''
+  - name: --item-type
+    parameterValueGroup: bigDataPools, credentials, integrationRuntimes, linkedServices
+    summary: Item type granted access in the workspace. Using with --item to combine the scope of assignment.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - name: --scope
+    summary: A scope defines the resources or artifacts that the access applies to. Synapse supports hierarchical scopes. Permissions granted at a higher-level scope are inherited by objects at a lower level. In Synapse RBAC, the top-level scope is a workspace. Assigning a role with workspace scope grants permissions to all applicable objects in the workspace.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_assignment_show
+  name: az synapse role assignment show
+  summary: Get a role assignment by id.
+  description: ''
+  syntax: >-
+    az synapse role assignment show --id
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get a role assignment by id.
+    syntax: >-
+      az synapse role assignment show --workspace-name testsynapseworkspace \
+
+      --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the role that is assigned to the principal.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_role_assignment_create
+- az_synapse_role_assignment_delete
+- az_synapse_role_assignment_list
+- az_synapse_role_assignment_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role assignments.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/role/definition.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/role/definition.yml
new file mode 100644
index 0000000000..c8b2d1b556
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/role/definition.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role_definition
+name: az synapse role definition
+summary: Manage Synapse's role definitions.
+description: ''
+directCommands:
+- uid: az_synapse_role_definition_list
+  name: az synapse role definition list
+  summary: List role definitions.
+  description: ''
+  syntax: >-
+    az synapse role definition list --workspace-name
+                                    [--is-built-in {false, true}]
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: List role definitions.
+    syntax: az synapse role definition list --workspace-name testsynapseworkspace
+  - summary: List role definitions built-in by Synapse.
+    syntax: az synapse role definition list --workspace-name testsynapseworkspace --is-built-in True
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --is-built-in
+    parameterValueGroup: false, true
+    summary: Is a Synapse Built-In Role or not.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_role_definition_show
+  name: az synapse role definition show
+  summary: Get role definition by role id/name.
+  description: ''
+  syntax: >-
+    az synapse role definition show --role
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get role definition by role id.
+    syntax: >-
+      az synapse role definition show --workspace-name testsynapseworkspace \
+
+      --role 00000000-0000-0000-0000-000000000000
+  - summary: Get role definition by role name.
+    syntax: >-
+      az synapse role definition show --workspace-name testsynapseworkspace \
+
+      --role "Synapse SQL Administrator"
+  requiredParameters:
+  - isRequired: true
+    name: --role
+    summary: The role name/id that is assigned to the principal.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_role_definition_list
+- az_synapse_role_definition_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role definitions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/role/scope.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/role/scope.yml
new file mode 100644
index 0000000000..494b144be9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/role/scope.yml
@@ -0,0 +1,51 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_role_scope
+name: az synapse role scope
+summary: Manage Synapse's role scopes.
+description: ''
+directCommands:
+- uid: az_synapse_role_scope_list
+  name: az synapse role scope list
+  summary: List role scopes.
+  description: ''
+  syntax: >-
+    az synapse role scope list --workspace-name
+                               [--query-examples]
+                               [--subscription]
+  examples:
+  - summary: List role scopes.
+    syntax: az synapse role scope list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_role_scope_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's role scopes.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/spark.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark.yml
new file mode 100644
index 0000000000..5a94807d16
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark.yml
@@ -0,0 +1,48 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark
+name: az synapse spark
+summary: Manage Spark pools and Spark jobs.
+description: ''
+commands:
+- az_synapse_spark_job
+- az_synapse_spark_job_cancel
+- az_synapse_spark_job_list
+- az_synapse_spark_job_show
+- az_synapse_spark_job_submit
+- az_synapse_spark_pool
+- az_synapse_spark_pool_create
+- az_synapse_spark_pool_delete
+- az_synapse_spark_pool_list
+- az_synapse_spark_pool_show
+- az_synapse_spark_pool_update
+- az_synapse_spark_pool_wait
+- az_synapse_spark_session
+- az_synapse_spark_session_cancel
+- az_synapse_spark_session_create
+- az_synapse_spark_session_list
+- az_synapse_spark_session_reset-timeout
+- az_synapse_spark_session_show
+- az_synapse_spark_statement
+- az_synapse_spark_statement_cancel
+- az_synapse_spark_statement_invoke
+- az_synapse_spark_statement_list
+- az_synapse_spark_statement_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Spark pools and Spark jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/job.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/job.yml
new file mode 100644
index 0000000000..dd865497ec
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/job.yml
@@ -0,0 +1,225 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_job
+name: az synapse spark job
+summary: Manage Synapse Spark batch jobs.
+description: ''
+directCommands:
+- uid: az_synapse_spark_job_cancel
+  name: az synapse spark job cancel
+  summary: Cancel a Spark job.
+  description: ''
+  syntax: >-
+    az synapse spark job cancel --livy-id
+                                --spark-pool-name
+                                --workspace-name
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Cancel a Spark job.
+    syntax: az synapse spark job cancel --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_job_list
+  name: az synapse spark job list
+  summary: List all Spark jobs.
+  description: ''
+  syntax: >-
+    az synapse spark job list --spark-pool-name
+                              --workspace-name
+                              [--from-index]
+                              [--query-examples]
+                              [--size]
+                              [--subscription]
+  examples:
+  - summary: List all Spark jobs.
+    syntax: az synapse spark job list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --from-index
+    summary: Optional parameter specifying which index the list should begin from.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --size
+    summary: The size of the returned list.By default it is 20 and that is the maximum.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_job_show
+  name: az synapse spark job show
+  summary: Get a Spark job.
+  description: ''
+  syntax: >-
+    az synapse spark job show --livy-id
+                              --spark-pool-name
+                              --workspace-name
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: Get a Spark job.
+    syntax: az synapse spark job show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_job_submit
+  name: az synapse spark job submit
+  summary: Submit a Spark job.
+  description: ''
+  syntax: >-
+    az synapse spark job submit --executor-size {Large, Medium, Small}
+                                --executors
+                                --main-class-name
+                                --main-definition-file
+                                --name
+                                --spark-pool-name
+                                --workspace-name
+                                [--archives]
+                                [--arguments]
+                                [--configuration]
+                                [--language {CSharp, PySpark, Python, Scala, Spark, SparkDotNet}]
+                                [--reference-files]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Submit a Java Spark job.
+    syntax: >-
+      az synapse spark job submit --name WordCount_Java --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool \
+
+      --main-definition-file abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/wordcount.jar \
+
+      --main-class-name WordCount \
+
+      --arguments abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/shakespeare.txt \
+
+      abfss://testfilesystem@testadlsgen2.dfs.core.windows.net/samples/java/wordcount/result/ \
+
+      --executors 2 --executor-size Small
+  requiredParameters:
+  - isRequired: true
+    name: --executor-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The executor size.
+    description: ''
+  - isRequired: true
+    name: --executors
+    summary: The number of executors.
+    description: ''
+  - isRequired: true
+    name: --main-class-name
+    summary: The fully-qualified identifier or the main class that is in the main definition file.
+    description: ''
+  - isRequired: true
+    name: --main-definition-file
+    summary: The main file used for the job.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The Spark job name.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --archives
+    summary: The array of archives.
+    description: ''
+  - name: --arguments
+    summary: 'Optional arguments to the job (Note: please use storage URIs for file arguments).'
+    description: ''
+  - name: --configuration
+    summary: The configuration of Spark job.
+    description: ''
+  - name: --language
+    defaultValue: Scala
+    parameterValueGroup: CSharp, PySpark, Python, Scala, Spark, SparkDotNet
+    summary: The Spark job language.
+    description: ''
+  - name: --reference-files
+    summary: Additional files used for reference in the main definition file.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_job_cancel
+- az_synapse_spark_job_list
+- az_synapse_spark_job_show
+- az_synapse_spark_job_submit
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse Spark batch jobs.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/pool.yml
new file mode 100644
index 0000000000..3ebc2047cb
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/pool.yml
@@ -0,0 +1,376 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_pool
+name: az synapse spark pool
+summary: Manage Spark pools.
+description: ''
+directCommands:
+- uid: az_synapse_spark_pool_create
+  name: az synapse spark pool create
+  summary: Create a Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool create --name
+                                 --node-count
+                                 --node-size {Large, Medium, Small}
+                                 --resource-group
+                                 --spark-version
+                                 --workspace-name
+                                 [--delay]
+                                 [--enable-auto-pause {false, true}]
+                                 [--enable-auto-scale {false, true}]
+                                 [--library-requirements]
+                                 [--max-node-count]
+                                 [--min-node-count]
+                                 [--no-wait]
+                                 [--node-size-family]
+                                 [--spark-events-folder]
+                                 [--spark-log-folder]
+                                 [--subscription]
+                                 [--tags]
+  examples:
+  - summary: Create a Spark pool.
+    syntax: >-
+      az synapse spark pool create --name testpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --spark-version 2.4 --node-count 3 --node-size Medium
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --node-count
+    summary: The number of node.
+    description: ''
+  - isRequired: true
+    name: --node-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The node size.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --spark-version
+    summary: The supported Spark version is 2.4 now.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --delay
+    summary: The delay time whose unit is minute.
+    description: ''
+  - name: --enable-auto-pause
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto pause.
+    description: ''
+  - name: --enable-auto-scale
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto scale.
+    description: ''
+  - name: --library-requirements
+    summary: The library requirements file.
+    description: ''
+  - name: --max-node-count
+    summary: The max node count.
+    description: ''
+  - name: --min-node-count
+    summary: The min node count.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-size-family
+    defaultValue: MemoryOptimized
+    summary: The node size family.
+    description: ''
+  - name: --spark-events-folder
+    defaultValue: /events
+    summary: The Spark events folder.
+    description: ''
+  - name: --spark-log-folder
+    defaultValue: /logs
+    summary: The default Spark log folder.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_delete
+  name: az synapse spark pool delete
+  summary: Delete a Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool delete [--ids]
+                                 [--name]
+                                 [--no-wait]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--workspace-name]
+                                 [--yes]
+  examples:
+  - summary: Delete a Spark pool.
+    syntax: az synapse spark pool delete --name testpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_list
+  name: az synapse spark pool list
+  summary: List all Spark pools.
+  description: ''
+  syntax: >-
+    az synapse spark pool list --resource-group
+                               --workspace-name
+                               [--query-examples]
+                               [--subscription]
+  examples:
+  - summary: List all Spark pools.
+    syntax: az synapse spark pool list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_show
+  name: az synapse spark pool show
+  summary: Get a Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool show [--ids]
+                               [--name]
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
+                               [--workspace-name]
+  examples:
+  - summary: Get a Spark pool.
+    syntax: az synapse spark pool show --name testpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_update
+  name: az synapse spark pool update
+  summary: Update the Spark pool.
+  description: ''
+  syntax: >-
+    az synapse spark pool update [--delay]
+                                 [--enable-auto-pause {false, true}]
+                                 [--enable-auto-scale {false, true}]
+                                 [--force {false, true}]
+                                 [--ids]
+                                 [--library-requirements]
+                                 [--max-node-count]
+                                 [--min-node-count]
+                                 [--name]
+                                 [--no-wait]
+                                 [--node-count]
+                                 [--node-size {Large, Medium, Small}]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--tags]
+                                 [--workspace-name]
+  examples:
+  - summary: Update the Spark pool's tags.
+    syntax: >-
+      az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --tags key1=value1
+  - summary: Update the Spark pool's auto scale configuration.
+    syntax: >-
+      az synapse spark pool update --name testpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --enable-auto-scale --min-node-count 3 --max-node-count 100
+  optionalParameters:
+  - name: --delay
+    summary: The delay time whose unit is minute.
+    description: ''
+  - name: --enable-auto-pause
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto pause.
+    description: ''
+  - name: --enable-auto-scale
+    parameterValueGroup: false, true
+    summary: The flag of enabling auto scale.
+    description: ''
+  - name: --force
+    parameterValueGroup: false, true
+    summary: The flag of force operation.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --library-requirements
+    summary: The library requirements file.
+    description: ''
+  - name: --max-node-count
+    summary: The max node count.
+    description: ''
+  - name: --min-node-count
+    summary: The min node count.
+    description: ''
+  - name: --name -n
+    summary: The name of the Spark pool.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count
+    summary: The number of node.
+    description: ''
+  - name: --node-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The node size.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_pool_wait
+  name: az synapse spark pool wait
+  summary: Place the CLI in a waiting state until a condition of a Spark pool is met.
+  description: ''
+  syntax: >-
+    az synapse spark pool wait --big-data-pool-name
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--ids]
+                               [--interval]
+                               [--resource-group]
+                               [--subscription]
+                               [--timeout]
+                               [--updated]
+                               [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --big-data-pool-name
+    summary: Big Data pool name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_pool_create
+- az_synapse_spark_pool_delete
+- az_synapse_spark_pool_list
+- az_synapse_spark_pool_show
+- az_synapse_spark_pool_update
+- az_synapse_spark_pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Spark pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/session.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/session.yml
new file mode 100644
index 0000000000..6aeda8fc79
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/session.yml
@@ -0,0 +1,222 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_session
+name: az synapse spark session
+summary: Manage Synapse Spark sessions.
+description: ''
+directCommands:
+- uid: az_synapse_spark_session_cancel
+  name: az synapse spark session cancel
+  summary: Cancel a Spark session.
+  description: ''
+  syntax: >-
+    az synapse spark session cancel --livy-id
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--subscription]
+                                    [--yes]
+  examples:
+  - summary: Cancel a Spark session.
+    syntax: az synapse spark session cancel  --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark session job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_create
+  name: az synapse spark session create
+  summary: Create a Spark session.
+  description: ''
+  syntax: >-
+    az synapse spark session create --executor-size {Large, Medium, Small}
+                                    --executors
+                                    --name
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--configuration]
+                                    [--reference-files]
+                                    [--subscription]
+                                    [--tags]
+  examples:
+  - summary: Create a Spark session.
+    syntax: >-
+      az synapse spark session create --name testsession  --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool --executor-size Small --executors 4
+  requiredParameters:
+  - isRequired: true
+    name: --executor-size
+    parameterValueGroup: Large, Medium, Small
+    summary: The executor size.
+    description: ''
+  - isRequired: true
+    name: --executors
+    summary: The number of executors.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The Spark session name.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --configuration
+    summary: The configuration of Spark session.
+    description: ''
+  - name: --reference-files
+    summary: Additional files used for reference in the main definition file.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_list
+  name: az synapse spark session list
+  summary: List all Spark sessions.
+  description: ''
+  syntax: >-
+    az synapse spark session list --spark-pool-name
+                                  --workspace-name
+                                  [--from-index]
+                                  [--query-examples]
+                                  [--size]
+                                  [--subscription]
+  examples:
+  - summary: List all Spark sessions.
+    syntax: az synapse spark session list --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --from-index
+    summary: Optional parameter specifying which index the list should begin from.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --size
+    summary: The size of the returned list.By default it is 20 and that is the maximum.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_reset-timeout
+  name: az synapse spark session reset-timeout
+  summary: Reset a Spark session timeout time.
+  description: ''
+  syntax: >-
+    az synapse spark session reset-timeout --livy-id
+                                           --spark-pool-name
+                                           --workspace-name
+                                           [--subscription]
+  examples:
+  - summary: Reset a Spark session's timeout time.
+    syntax: az synapse spark session reset-timeout --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark session job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_session_show
+  name: az synapse spark session show
+  summary: Get a Spark session.
+  description: ''
+  syntax: >-
+    az synapse spark session show --livy-id
+                                  --spark-pool-name
+                                  --workspace-name
+                                  [--query-examples]
+                                  [--subscription]
+  examples:
+  - summary: Get a Spark session.
+    syntax: az synapse spark session show --livy-id 1 --workspace-name testsynapseworkspace --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the Spark session job.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_session_cancel
+- az_synapse_spark_session_create
+- az_synapse_spark_session_list
+- az_synapse_spark_session_reset-timeout
+- az_synapse_spark_session_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse Spark sessions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/statement.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/statement.yml
new file mode 100644
index 0000000000..95cedd02cf
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/spark/statement.yml
@@ -0,0 +1,200 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_spark_statement
+name: az synapse spark statement
+summary: Manage Synapse Spark statements.
+description: ''
+directCommands:
+- uid: az_synapse_spark_statement_cancel
+  name: az synapse spark statement cancel
+  summary: Cancel a Spark statement.
+  description: ''
+  syntax: >-
+    az synapse spark statement cancel --livy-id
+                                      --session-id
+                                      --spark-pool-name
+                                      --workspace-name
+                                      [--subscription]
+                                      [--yes]
+  examples:
+  - summary: Cancel a Spark statement.
+    syntax: >-
+      az synapse spark statement cancel --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the statement.
+    description: ''
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_statement_invoke
+  name: az synapse spark statement invoke
+  summary: Invoke a Spark statement.
+  description: ''
+  syntax: >-
+    az synapse spark statement invoke --code
+                                      --language {CSharp, PySpark, Python, SQL, Scala, Spark, SparkDotNet}
+                                      --session-id
+                                      --spark-pool-name
+                                      --workspace-name
+                                      [--subscription]
+  examples:
+  - summary: Invoke a Spark statement.
+    syntax: >-
+      az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool --code "print('hello, Azure CLI')" --language pyspark
+  - summary: Submit a Spark statement by reading code content from file.
+    syntax: >-
+      az synapse spark statement invoke --session-id 1 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool --code @file-path --language pyspark
+  requiredParameters:
+  - isRequired: true
+    name: --code
+    summary: The code of Spark statement. This is either the code contents or use `@<file path>` to load the content from a file.
+    description: ''
+  - isRequired: true
+    name: --language
+    parameterValueGroup: CSharp, PySpark, Python, SQL, Scala, Spark, SparkDotNet
+    summary: The language of Spark statement.
+    description: ''
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_statement_list
+  name: az synapse spark statement list
+  summary: List all Spark statements.
+  description: ''
+  syntax: >-
+    az synapse spark statement list --session-id
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: List all Spark statements.
+    syntax: >-
+      az synapse spark statement list --session-id 11 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_spark_statement_show
+  name: az synapse spark statement show
+  summary: Get a Spark statement.
+  description: ''
+  syntax: >-
+    az synapse spark statement show --livy-id
+                                    --session-id
+                                    --spark-pool-name
+                                    --workspace-name
+                                    [--query-examples]
+                                    [--subscription]
+  examples:
+  - summary: Get a Spark statement.
+    syntax: >-
+      az synapse spark statement show --livy-id 1 --session-id 11 --workspace-name testsynapseworkspace \
+
+      --spark-pool-name testsparkpool
+  requiredParameters:
+  - isRequired: true
+    name: --livy-id
+    summary: The id of the statement.
+    description: ''
+  - isRequired: true
+    name: --session-id
+    summary: The id of Spark session.
+    description: ''
+  - isRequired: true
+    name: --spark-pool-name
+    summary: The name of the Spark pool.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_spark_statement_cancel
+- az_synapse_spark_statement_invoke
+- az_synapse_spark_statement_list
+- az_synapse_spark_statement_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse Spark statements.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql.yml
new file mode 100644
index 0000000000..dc83a3cd70
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql
+name: az synapse sql
+summary: Manage SQL pools.
+description: ''
+commands:
+- az_synapse_sql_ad-admin
+- az_synapse_sql_ad-admin_create
+- az_synapse_sql_ad-admin_delete
+- az_synapse_sql_ad-admin_show
+- az_synapse_sql_ad-admin_update
+- az_synapse_sql_ad-admin_wait
+- az_synapse_sql_audit-policy
+- az_synapse_sql_audit-policy_show
+- az_synapse_sql_audit-policy_update
+- az_synapse_sql_audit-policy_wait
+- az_synapse_sql_pool
+- az_synapse_sql_pool_audit-policy
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+- az_synapse_sql_pool_classification
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+- az_synapse_sql_pool_create
+- az_synapse_sql_pool_delete
+- az_synapse_sql_pool_list
+- az_synapse_sql_pool_list-deleted
+- az_synapse_sql_pool_pause
+- az_synapse_sql_pool_restore
+- az_synapse_sql_pool_resume
+- az_synapse_sql_pool_show
+- az_synapse_sql_pool_show-connection-string
+- az_synapse_sql_pool_tde
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+- az_synapse_sql_pool_threat-policy
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+- az_synapse_sql_pool_update
+- az_synapse_sql_pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/ad-admin.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/ad-admin.yml
new file mode 100644
index 0000000000..3b0c7879d3
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/ad-admin.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_ad-admin
+name: az synapse sql ad-admin
+summary: Manage SQL Active Directory administrator.
+description: ''
+directCommands:
+- uid: az_synapse_sql_ad-admin_create
+  name: az synapse sql ad-admin create
+  summary: Create the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin create --display-name
+                                   --object-id
+                                   --resource-group
+                                   --workspace-name
+                                   [--no-wait]
+                                   [--subscription]
+  examples:
+  - summary: Create the SQL Azure Active admin.
+    syntax: >-
+      az synapse sql ad-admin create --workspace-name testsynapseworkspace --resource-group rg \
+
+      --display-name youraccount@yourdomain --object-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --display-name -u
+    summary: Display name of the Azure AD administrator user or group.
+    description: ''
+  - isRequired: true
+    name: --object-id -i
+    summary: The unique ID of the Azure AD administrator.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_delete
+  name: az synapse sql ad-admin delete
+  summary: Delete the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin delete --resource-group
+                                   --workspace-name
+                                   [--no-wait]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Delete the SQL Azure Active admin.
+    syntax: az synapse sql ad-admin delete --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_show
+  name: az synapse sql ad-admin show
+  summary: Get the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin show --resource-group
+                                 --workspace-name
+                                 [--query-examples]
+                                 [--subscription]
+  examples:
+  - summary: Get the SQL Azure Active admin.
+    syntax: az synapse sql ad-admin show --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_update
+  name: az synapse sql ad-admin update
+  summary: Update the SQL Azure Active Directory administrator.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin update --resource-group
+                                   --workspace-name
+                                   [--add]
+                                   [--display-name]
+                                   [--force-string]
+                                   [--no-wait]
+                                   [--object-id]
+                                   [--remove]
+                                   [--set]
+                                   [--subscription]
+  examples:
+  - summary: Update the SQL Azure Active admin.
+    syntax: >-
+      az synapse sql ad-admin update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --display-name youraccount@yourdomain --object-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --display-name -u
+    summary: Display name of the Azure AD administrator user or group.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --object-id -i
+    summary: The unique ID of the Azure AD administrator.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_ad-admin_wait
+  name: az synapse sql ad-admin wait
+  summary: Place the CLI in a waiting state until a condition is met.
+  description: ''
+  syntax: >-
+    az synapse sql ad-admin wait --resource-group
+                                 --workspace-name
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_ad-admin_create
+- az_synapse_sql_ad-admin_delete
+- az_synapse_sql_ad-admin_show
+- az_synapse_sql_ad-admin_update
+- az_synapse_sql_ad-admin_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL Active Directory administrator.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/audit-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/audit-policy.yml
new file mode 100644
index 0000000000..6933de228b
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/audit-policy.yml
@@ -0,0 +1,237 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_audit-policy
+name: az synapse sql audit-policy
+summary: Manage SQL auditing policy.
+description: ''
+directCommands:
+- uid: az_synapse_sql_audit-policy_show
+  name: az synapse sql audit-policy show
+  summary: Get a SQL's auditing policy.
+  description: ''
+  syntax: >-
+    az synapse sql audit-policy show --blob-auditing-policy-name
+                                     --resource-group
+                                     --workspace-name
+                                     [--query-examples]
+                                     [--subscription]
+  examples:
+  - summary: Get a SQL's auditing policy.
+    syntax: >-
+      az synapse sql audit-policy show --workspace-name testsynapseworkspace --resource-group rg \
+
+      --blob-auditing-policy-name bapolicyname
+  requiredParameters:
+  - isRequired: true
+    name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_audit-policy_update
+  name: az synapse sql audit-policy update
+  summary: Update a SQL's auditing policy.
+  description: If the policy is being enabled, `--storage-account` or both `--storage-endpoint` and `--storage-key` must be specified.
+  syntax: >-
+    az synapse sql audit-policy update --resource-group
+                                       --workspace-name
+                                       [--actions]
+                                       [--add]
+                                       [--blob-auditing-policy-name]
+                                       [--enable-azure-monitor {false, true}]
+                                       [--force-string]
+                                       [--no-wait]
+                                       [--queue-delay-milliseconds]
+                                       [--remove]
+                                       [--retention-days]
+                                       [--set]
+                                       [--state {Disabled, Enabled}]
+                                       [--storage-account]
+                                       [--storage-endpoint]
+                                       [--storage-key]
+                                       [--storage-subscription]
+                                       [--subscription]
+                                       [--use-secondary-key {false, true}]
+  examples:
+  - summary: Enable by storage account name.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-account mystorageaccount --blob-auditing-policy-name bapolicyname
+  - summary: Enable by storage endpoint and key.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-endpoint https://mystorage.blob.core.windows.net --storage-key MYKEY== \
+
+      --blob-auditing-policy-name bapolicyname
+  - summary: Set the list of audit actions.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --actions FAILED_DATABASE_AUTHENTICATION_GROUP 'UPDATE on database::mydb by public' \
+
+      --blob-auditing-policy-name bapolicyname
+  - summary: Disable an auditing policy.
+    syntax: >-
+      az synapse sql audit-policy update --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Disabled --blob-auditing-policy-name bapolicyname
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --actions
+    summary: List of actions and action groups to audit.
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - name: --enable-azure-monitor
+    parameterValueGroup: false, true
+    summary: Whether enabling azure monitor target or not.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --queue-delay-milliseconds --queue-delay-time
+    summary: The amount of time in milliseconds that can elapse before audit actions are forced to be processed.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --retention-days
+    summary: The number of days to retain audit logs.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    parameterValueGroup: Disabled, Enabled
+    summary: Auditing policy state.
+    description: ''
+  - name: --storage-account
+    summary: Name of the storage account.
+    description: ''
+  - name: --storage-endpoint
+    summary: The storage account endpoint.
+    description: ''
+  - name: --storage-key
+    summary: Access key for the storage account.
+    description: ''
+  - name: --storage-subscription
+    summary: The subscription id of storage account.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --use-secondary-key
+    parameterValueGroup: false, true
+    summary: Indicates whether using the secondary storeage key or not.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_audit-policy_wait
+  name: az synapse sql audit-policy wait
+  summary: Place the CLI in a waiting state until a condition is met.
+  description: ''
+  syntax: >-
+    az synapse sql audit-policy wait --blob-auditing-policy-name
+                                     --resource-group
+                                     --workspace-name
+                                     [--created]
+                                     [--custom]
+                                     [--deleted]
+                                     [--exists]
+                                     [--interval]
+                                     [--subscription]
+                                     [--timeout]
+                                     [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_audit-policy_show
+- az_synapse_sql_audit-policy_update
+- az_synapse_sql_audit-policy_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL auditing policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool.yml
new file mode 100644
index 0000000000..2077b56211
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool.yml
@@ -0,0 +1,480 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool
+name: az synapse sql pool
+summary: Manage SQL pools.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_create
+  name: az synapse sql pool create
+  summary: Create a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool create --name
+                               --performance-level
+                               --resource-group
+                               --workspace-name
+                               [--no-wait]
+                               [--subscription]
+                               [--tags]
+  examples:
+  - summary: Create a SQL pool.
+    syntax: >-
+      az synapse sql pool create --name sqlpool --performance-level "DW1000c" \
+
+      --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --performance-level
+    summary: The performance level.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_delete
+  name: az synapse sql pool delete
+  summary: Delete a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool delete [--ids]
+                               [--name]
+                               [--no-wait]
+                               [--resource-group]
+                               [--subscription]
+                               [--workspace-name]
+                               [--yes]
+  examples:
+  - summary: Delete a SQL pool.
+    syntax: az synapse sql pool delete --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_list
+  name: az synapse sql pool list
+  summary: List all SQL pools.
+  description: ''
+  syntax: >-
+    az synapse sql pool list --resource-group
+                             --workspace-name
+                             [--query-examples]
+                             [--subscription]
+  examples:
+  - summary: List SQL pools.
+    syntax: az synapse sql pool list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_list-deleted
+  name: az synapse sql pool list-deleted
+  summary: List all deleted SQL pools.
+  description: ''
+  syntax: >-
+    az synapse sql pool list-deleted --resource-group
+                                     --workspace-name
+                                     [--subscription]
+  examples:
+  - summary: List deleted SQL pools.
+    syntax: az synapse sql pool list-deleted --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_pause
+  name: az synapse sql pool pause
+  summary: Pause a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool pause [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+                              [--workspace-name]
+  examples:
+  - summary: Pause a SQL pool.
+    syntax: az synapse sql pool pause --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_restore
+  name: az synapse sql pool restore
+  summary: Create a new SQL pool by restoring from a backup.
+  description: ''
+  syntax: >-
+    az synapse sql pool restore --dest-name
+                                [--deleted-time]
+                                [--ids]
+                                [--name]
+                                [--performance-level]
+                                [--resource-group]
+                                [--subscription]
+                                [--time]
+                                [--workspace-name]
+  examples:
+  - summary: Create a new SQL pool by restoring an existing SQL pool's restore point.
+    syntax: >-
+      az synapse sql pool restore --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --dest-name newsqlpool --time 2020-11-25T02:47:37
+  requiredParameters:
+  - isRequired: true
+    name: --dest-name --destination-name
+    summary: Name of the sql pool that will be created as the restore destination.
+    description: ''
+  optionalParameters:
+  - name: --deleted-time
+    summary: 'If specified, restore from a deleted database instead of from an existing database. Must match the deleted time of a deleted database in the same server. Either --time or --deleted-time (or both) must be specified. Time should be in following format: "YYYY-MM-DDTHH:MM:SS".'
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --performance-level
+    summary: The performance level.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --time -t
+    summary: "The point in time of the source database that will be restored to create the new database. Must be greater than or equal to the source database's earliestRestoreDate value. Either --time or --deleted-time (or both) must be specified. Time should be in following format: \"YYYY-MM-DDTHH:MM:SS\"."
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_resume
+  name: az synapse sql pool resume
+  summary: Resume a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool resume [--ids]
+                               [--name]
+                               [--resource-group]
+                               [--subscription]
+                               [--workspace-name]
+  examples:
+  - summary: Resume a SQL pool.
+    syntax: az synapse sql pool resume --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_show
+  name: az synapse sql pool show
+  summary: Get a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool show [--ids]
+                             [--name]
+                             [--query-examples]
+                             [--resource-group]
+                             [--subscription]
+                             [--workspace-name]
+  examples:
+  - summary: Get a SQL pool.
+    syntax: az synapse sql pool show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_show-connection-string
+  name: az synapse sql pool show-connection-string
+  summary: Generate a connection string to a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool show-connection-string --client {ado.net, jdbc, odbc, php, php_pdo}
+                                               [--auth-type {ADIntegrated, ADPassword, SqlPassword}]
+                                               [--ids]
+                                               [--name]
+                                               [--subscription]
+                                               [--workspace-name]
+  examples:
+  - summary: Generate connection string for ado.net
+    syntax: az synapse sql pool show-connection-string --name sqlpool --workspace-name testsynapseworkspace -c ado.net
+  requiredParameters:
+  - isRequired: true
+    name: --client -c
+    parameterValueGroup: ado.net, jdbc, odbc, php, php_pdo
+    summary: Type of client connection provider.
+    description: ''
+  optionalParameters:
+  - name: --auth-type -a
+    defaultValue: SqlPassword
+    parameterValueGroup: ADIntegrated, ADPassword, SqlPassword
+    summary: Type of authentication.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    defaultValue: <sql pool name>
+    summary: The SQL pool name.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    defaultValue: <workspace name>
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_update
+  name: az synapse sql pool update
+  summary: Update a SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool update [--ids]
+                               [--name]
+                               [--performance-level]
+                               [--resource-group]
+                               [--subscription]
+                               [--tags]
+                               [--workspace-name]
+  examples:
+  - summary: Update a SQL pool.
+    syntax: >-
+      az synapse sql pool update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --tags key1=value1
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --performance-level
+    summary: The performance level.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_wait
+  name: az synapse sql pool wait
+  summary: Place the CLI in a waiting state until a condition of a SQL pool is met.
+  description: ''
+  syntax: >-
+    az synapse sql pool wait --sql-pool-name
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--ids]
+                             [--interval]
+                             [--resource-group]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
+                             [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --sql-pool-name
+    summary: SQL pool name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_audit-policy
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+- az_synapse_sql_pool_classification
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+- az_synapse_sql_pool_create
+- az_synapse_sql_pool_delete
+- az_synapse_sql_pool_list
+- az_synapse_sql_pool_list-deleted
+- az_synapse_sql_pool_pause
+- az_synapse_sql_pool_restore
+- az_synapse_sql_pool_resume
+- az_synapse_sql_pool_show
+- az_synapse_sql_pool_show-connection-string
+- az_synapse_sql_pool_tde
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+- az_synapse_sql_pool_threat-policy
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+- az_synapse_sql_pool_update
+- az_synapse_sql_pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage SQL pools.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/audit-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/audit-policy.yml
new file mode 100644
index 0000000000..cb1fd84b27
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/audit-policy.yml
@@ -0,0 +1,173 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_audit-policy
+name: az synapse sql pool audit-policy
+summary: Manage a SQL pool's auditing policy.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_audit-policy_show
+  name: az synapse sql pool audit-policy show
+  summary: Get a SQL pool's auditing policy.
+  description: ''
+  syntax: >-
+    az synapse sql pool audit-policy show [--ids]
+                                          [--name]
+                                          [--query-examples]
+                                          [--resource-group]
+                                          [--subscription]
+                                          [--workspace-name]
+  examples:
+  - summary: Get a SQL pool's auditing policy.
+    syntax: az synapse sql pool audit-policy show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_audit-policy_update
+  name: az synapse sql pool audit-policy update
+  summary: Update a SQL pool's auditing policy.
+  description: If the policy is being enabled, `--storage-account` or both `--storage-endpoint` and `--storage-key` must be specified.
+  syntax: >-
+    az synapse sql pool audit-policy update [--actions]
+                                            [--add]
+                                            [--blob-auditing-policy-name]
+                                            [--enable-azure-monitor {false, true}]
+                                            [--force-string]
+                                            [--ids]
+                                            [--name]
+                                            [--remove]
+                                            [--resource-group]
+                                            [--retention-days]
+                                            [--set]
+                                            [--state {Disabled, Enabled}]
+                                            [--storage-account]
+                                            [--storage-endpoint]
+                                            [--storage-key]
+                                            [--storage-subscription]
+                                            [--subscription]
+                                            [--use-secondary-key {false, true}]
+                                            [--workspace-name]
+  examples:
+  - summary: Enable by storage account name.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-account mystorageaccount --blob-auditing-policy-name bapname
+  - summary: Enable by storage endpoint and key.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-endpoint https://mystorage.blob.core.windows.net --storage-key MYKEY== \
+
+      --blob-auditing-policy-name bapname
+  - summary: Set the list of audit actions.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --actions FAILED_DATABASE_AUTHENTICATION_GROUP 'UPDATE on database::mydb by public' \
+
+      --blob-auditing-policy-name bapname
+  - summary: Disable an auditing policy.
+    syntax: >-
+      az synapse sql pool audit-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Disabled --blob-auditing-policy-name bapname
+  optionalParameters:
+  - name: --actions
+    summary: List of actions and action groups to audit.
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --blob-auditing-policy-name -b
+    summary: Name of the blob auditing policy name.
+    description: ''
+  - name: --enable-azure-monitor
+    parameterValueGroup: false, true
+    summary: Whether enabling azure monitor target or not.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --retention-days
+    summary: The number of days to retain audit logs.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    parameterValueGroup: Disabled, Enabled
+    summary: Auditing policy state.
+    description: ''
+  - name: --storage-account
+    summary: Name of the storage account.
+    description: ''
+  - name: --storage-endpoint
+    summary: The storage account endpoint.
+    description: ''
+  - name: --storage-key
+    summary: Access key for the storage account.
+    description: ''
+  - name: --storage-subscription
+    summary: The subscription id of storage account.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --use-secondary-key
+    parameterValueGroup: false, true
+    summary: Indicates whether using the secondary storeage key or not.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_audit-policy_show
+- az_synapse_sql_pool_audit-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a SQL pool's auditing policy.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/classification.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/classification.yml
new file mode 100644
index 0000000000..4292dafb76
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/classification.yml
@@ -0,0 +1,294 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_classification
+name: az synapse sql pool classification
+summary: Manage sensitivity classifications.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_classification_create
+  name: az synapse sql pool classification create
+  summary: Create a column's sensitivity classification.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification create --column
+                                              --information-type
+                                              --label
+                                              --name
+                                              --resource-group
+                                              --schema
+                                              --table
+                                              --workspace-name
+                                              [--subscription]
+  examples:
+  - summary: Create sensitivity classification for a given column.
+    syntax: >-
+      az synapse sql pool classification create --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn \
+
+      --information-type Name --label "Confidential - GDPR"
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --information-type
+    summary: The information type.
+    description: ''
+  - isRequired: true
+    name: --label
+    summary: The label name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_delete
+  name: az synapse sql pool classification delete
+  summary: Delete the sensitivity classification of a given column.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification delete --column
+                                              --schema
+                                              --table
+                                              [--ids]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Delete the sensitivity classification of a given column.
+    syntax: >-
+      az synapse sql pool classification delete --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_list
+  name: az synapse sql pool classification list
+  summary: Get the sensitivity classifications of a given SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification list --name
+                                            --resource-group
+                                            --workspace-name
+                                            [--filter]
+                                            [--query-examples]
+                                            [--subscription]
+  examples:
+  - summary: List the sensitivity classification of a given SQL pool.
+    syntax: az synapse sql pool classification list --name sqlpool --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: An OData filter expression that filters elements in the collection.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_show
+  name: az synapse sql pool classification show
+  summary: Get the sensitivity classification of a given column.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification show --column
+                                            --schema
+                                            --table
+                                            [--ids]
+                                            [--name]
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
+                                            [--workspace-name]
+  examples:
+  - summary: Get the sensitivity classification of a given column.
+    syntax: >-
+      az synapse sql pool classification show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_update
+  name: az synapse sql pool classification update
+  summary: Update a column's sensitivity classification.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification update --column
+                                              --schema
+                                              --table
+                                              [--ids]
+                                              [--information-type]
+                                              [--label]
+                                              [--name]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Update sensitivity classification for a given column.
+    syntax: >-
+      az synapse sql pool classification update --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn \
+
+      --information-type Name --label "Confidential - GDPR"
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --information-type
+    summary: The information type.
+    description: ''
+  - name: --label
+    summary: The label name.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_classification_create
+- az_synapse_sql_pool_classification_delete
+- az_synapse_sql_pool_classification_list
+- az_synapse_sql_pool_classification_recommendation
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+- az_synapse_sql_pool_classification_show
+- az_synapse_sql_pool_classification_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage sensitivity classifications.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/classification/recommendation.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/classification/recommendation.yml
new file mode 100644
index 0000000000..f8803a8385
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/classification/recommendation.yml
@@ -0,0 +1,177 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_classification_recommendation
+name: az synapse sql pool classification recommendation
+summary: Manage sensitivity classification recommendations.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_classification_recommendation_disable
+  name: az synapse sql pool classification recommendation disable
+  summary: Disable sensitivity recommendations for a given column(recommendations are enabled by default on all columns).
+  description: ''
+  syntax: >-
+    az synapse sql pool classification recommendation disable --column
+                                                              --schema
+                                                              --table
+                                                              [--ids]
+                                                              [--name]
+                                                              [--resource-group]
+                                                              [--subscription]
+                                                              [--workspace-name]
+  examples:
+  - summary: Disable sensitivity recommendations for a given column.
+    syntax: >-
+      az synapse sql pool classification recommendation disable --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_recommendation_enable
+  name: az synapse sql pool classification recommendation enable
+  summary: Enable sensitivity recommendations for a given column(recommendations are enabled by default on all columns).
+  description: ''
+  syntax: >-
+    az synapse sql pool classification recommendation enable --column
+                                                             --schema
+                                                             --table
+                                                             [--ids]
+                                                             [--name]
+                                                             [--resource-group]
+                                                             [--subscription]
+                                                             [--workspace-name]
+  examples:
+  - summary: Enable sensitivity recommendations for a given column.
+    syntax: >-
+      az synapse sql pool classification recommendation enable --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --schema dbo --table mytable --column mycolumn
+  requiredParameters:
+  - isRequired: true
+    name: --column
+    summary: The name of column.
+    description: ''
+  - isRequired: true
+    name: --schema
+    summary: The name of schema.
+    description: ''
+  - isRequired: true
+    name: --table
+    summary: The name of table.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_classification_recommendation_list
+  name: az synapse sql pool classification recommendation list
+  summary: List the recommended sensitivity classifications of a given SQL pool.
+  description: ''
+  syntax: >-
+    az synapse sql pool classification recommendation list --name
+                                                           --resource-group
+                                                           --workspace-name
+                                                           [--filter]
+                                                           [--included-disabled {false, true}]
+                                                           [--query-examples]
+                                                           [--skip-token]
+                                                           [--subscription]
+  examples:
+  - summary: List the recommended sensitivity classifications of a given SQL pool.
+    syntax: >-
+      az synapse sql pool classification recommendation list --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --filter
+    summary: An OData filter expression that filters elements in the collection.
+    description: ''
+  - name: --included-disabled
+    parameterValueGroup: false, true
+    summary: Indicates whether the result should include disabled recommendations.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --skip-token
+    summary: An OData query option to indicate how many elements to skip in the collection.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_classification_recommendation_disable
+- az_synapse_sql_pool_classification_recommendation_enable
+- az_synapse_sql_pool_classification_recommendation_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage sensitivity classification recommendations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/tde.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/tde.yml
new file mode 100644
index 0000000000..5468d98bbe
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/tde.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_tde
+name: az synapse sql pool tde
+summary: Manage a SQL pool's transparent data encryption.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_tde_set
+  name: az synapse sql pool tde set
+  summary: Set a SQL pool's transparent data encryption configuration.
+  description: ''
+  syntax: >-
+    az synapse sql pool tde set --status {Disabled, Enabled}
+                                --transparent-data-encryption-name
+                                [--ids]
+                                [--name]
+                                [--resource-group]
+                                [--subscription]
+                                [--workspace-name]
+  examples:
+  - summary: Set a SQL pool's transparent data encryption configuration. (autogenerated)
+    syntax: >-
+      az synapse sql pool tde set --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --status Enabled --transparent-data-encryption-name tdename
+  requiredParameters:
+  - isRequired: true
+    name: --status
+    parameterValueGroup: Disabled, Enabled
+    summary: Status of the transparent data encryption.
+    description: ''
+  - isRequired: true
+    name: --transparent-data-encryption-name -d
+    summary: Name of the transparent data encryption.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_tde_show
+  name: az synapse sql pool tde show
+  summary: Get a SQL pool's transparent data encryption configuration.
+  description: ''
+  syntax: >-
+    az synapse sql pool tde show --transparent-data-encryption-name
+                                 [--ids]
+                                 [--name]
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--workspace-name]
+  examples:
+  - summary: Get a SQL pool's transparent data encryption configuration. (autogenerated)
+    syntax: >-
+      az synapse sql pool tde show --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --transparent-data-encryption-name tdename
+  requiredParameters:
+  - isRequired: true
+    name: --transparent-data-encryption-name -d
+    summary: Name of the transparent data encryption.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_tde_set
+- az_synapse_sql_pool_tde_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a SQL pool's transparent data encryption.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/threat-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/threat-policy.yml
new file mode 100644
index 0000000000..06cf2a249c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/sql/pool/threat-policy.yml
@@ -0,0 +1,182 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_sql_pool_threat-policy
+name: az synapse sql pool threat-policy
+summary: Manage a SQL pool's threat detection policies.
+description: ''
+directCommands:
+- uid: az_synapse_sql_pool_threat-policy_show
+  name: az synapse sql pool threat-policy show
+  summary: Get a SQL pool's threat detection policy.
+  description: ''
+  syntax: >-
+    az synapse sql pool threat-policy show --security-alert-policy-name
+                                           [--ids]
+                                           [--name]
+                                           [--query-examples]
+                                           [--resource-group]
+                                           [--subscription]
+                                           [--workspace-name]
+  examples:
+  - summary: Get a SQL pool's threat detection policy.
+    syntax: >-
+      az synapse sql pool threat-policy show --name sqlpool --workspace-name testsynapseworkspace \
+
+      --resource-group rg --security-alert-policy-name threatpolicy
+  requiredParameters:
+  - isRequired: true
+    name: --security-alert-policy-name -s
+    summary: Name of the security alert policy.
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_sql_pool_threat-policy_update
+  name: az synapse sql pool threat-policy update
+  summary: Update a SQL pool's threat detection policy.
+  description: If the policy is being enabled, storage_account or both storage_endpoint and storage_account_access_key must be specified.
+  syntax: >-
+    az synapse sql pool threat-policy update [--add]
+                                             [--disabled-alerts]
+                                             [--email-account-admins {false, true}]
+                                             [--email-addresses]
+                                             [--force-string]
+                                             [--ids]
+                                             [--name]
+                                             [--remove]
+                                             [--resource-group]
+                                             [--retention-days]
+                                             [--security-alert-policy-name]
+                                             [--set]
+                                             [--state {Disabled, Enabled, New}]
+                                             [--storage-account]
+                                             [--storage-endpoint]
+                                             [--storage-key]
+                                             [--subscription]
+                                             [--workspace-name]
+  examples:
+  - summary: Enable by storage account name.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-account mystorageaccount --security-alert-policy-name threatpolicy
+  - summary: Enable by storage endpoint and key.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Enabled --storage-endpoint https://mystorage.blob.core.windows.net --storage-key MYKEY== \
+
+      --security-alert-policy-name threatpolicy
+  - summary: Disable a subset of alert types.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --disabled-alerts Sql_Injection_Vulnerability Access_Anomaly --security-alert-policy-name threatpolicy
+  - summary: Configure email recipients for a policy.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --email-addresses me@examlee.comyou@example.com --email-account-admins true \
+
+      --security-alert-policy-name threatpolicy
+  - summary: Disable a threat policy.
+    syntax: >-
+      az synapse sql pool threat-policy update --name sqlpool --workspace-name testsynapseworkspace --resource-group rg \
+
+      --state Disabled --security-alert-policy-name threatpolicy
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --disabled-alerts
+    summary: List of disabled alerts.
+    description: ''
+  - name: --email-account-admins
+    parameterValueGroup: false, true
+    summary: Whether the alert is sent to the account administrators.
+    description: ''
+  - name: --email-addresses
+    summary: List of email addresses that alerts are sent to.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The SQL pool name.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --retention-days
+    summary: The number of days to retain threat detection logs.
+    description: ''
+  - name: --security-alert-policy-name -s
+    summary: Name of the security alert policy.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    parameterValueGroup: Disabled, Enabled, New
+    summary: Threat detection policy state.
+    description: ''
+  - name: --storage-account
+    summary: Name of the storage account.
+    description: ''
+  - name: --storage-endpoint
+    summary: The storage account endpoint.
+    description: ''
+  - name: --storage-key
+    summary: Access key for the storage account.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_sql_pool_threat-policy_show
+- az_synapse_sql_pool_threat-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a SQL pool's threat detection policies.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/trigger-run.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/trigger-run.yml
new file mode 100644
index 0000000000..ca59126a5f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/trigger-run.yml
@@ -0,0 +1,105 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_trigger-run
+name: az synapse trigger-run
+summary: Synapse trigger-run.
+description: ''
+directCommands:
+- uid: az_synapse_trigger-run_query-by-workspace
+  name: az synapse trigger-run query-by-workspace
+  summary: Query trigger runs in the workspace based on input filter conditions.
+  description: ''
+  syntax: >-
+    az synapse trigger-run query-by-workspace --last-updated-after
+                                              --last-updated-before
+                                              --workspace-name
+                                              [--continuation-token]
+                                              [--filters]
+                                              [--order-by]
+                                              [--subscription]
+  examples:
+  - summary: Query trigger runs in the workspace based on input filter conditions.
+    syntax: >-
+      az synapse trigger-run query-by-workspace --workspace-name testsynapseworkspace --filters \
+        operand="TriggerName" operator="Equals" values="testtrigger" --last-updated-after "2020-09-03T00:36:44.3345758Z" \
+        --last-updated-before "2020-09-03T00:49:48.3686473Z"
+  requiredParameters:
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: ''
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger-run_rerun
+  name: az synapse trigger-run rerun
+  summary: Rerun single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az synapse trigger-run rerun --name
+                                 --run-id
+                                 --workspace-name
+                                 [--subscription]
+  examples:
+  - summary: Rerun single trigger instance by runId.
+    syntax: >-
+      az synapse trigger-run rerun --workspace-name testsynapseworkspace \
+        --name testtrigger --run-id 08586024068106001417583731803CU31
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The trigger run identifier.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_trigger-run_query-by-workspace
+- az_synapse_trigger-run_rerun
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Synapse trigger-run.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/trigger.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/trigger.yml
new file mode 100644
index 0000000000..d6090bf70e
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/trigger.yml
@@ -0,0 +1,349 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_trigger
+name: az synapse trigger
+summary: Manage Synapse's triggers.
+description: ''
+directCommands:
+- uid: az_synapse_trigger_create
+  name: az synapse trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger create --file
+                              --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+  examples:
+  - summary: Create a trigger.
+    syntax: >-
+      az synapse trigger create --workspace-name testsynapseworkspace \
+        --name testtrigger --file @path/trigger.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_delete
+  name: az synapse trigger delete
+  summary: Delete a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger delete --name
+                              --workspace-name
+                              [--no-wait]
+                              [--subscription]
+                              [--yes]
+  examples:
+  - summary: Delete a trigger.
+    syntax: >-
+      az synapse trigger delete --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_get-event-subscription-status
+  name: az synapse trigger get-event-subscription-status
+  summary: Get a trigger's event subscription status.
+  description: ''
+  syntax: >-
+    az synapse trigger get-event-subscription-status --name
+                                                     --workspace-name
+                                                     [--subscription]
+  examples:
+  - summary: Get a trigger's event subscription status.
+    syntax: >-
+      az synapse trigger get-event-subscription-status --workspace-name testsynapseworkspace \
+        --name eventtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_list
+  name: az synapse trigger list
+  summary: List triggers.
+  description: ''
+  syntax: >-
+    az synapse trigger list --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: List triggers.
+    syntax: az synapse trigger list --workspace-name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_set
+  name: az synapse trigger set
+  summary: Set an exist trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger set --file
+                           --name
+                           --workspace-name
+                           [--no-wait]
+                           [--subscription]
+  examples:
+  - summary: Set an exist trigger.
+    syntax: >-
+      az synapse trigger set --workspace-name testsynapseworkspace \
+        --name testtrigger --file @path/trigger.json
+  requiredParameters:
+  - isRequired: true
+    name: --file
+    summary: Properties may be supplied from a JSON file using the `@{path}` syntax or a JSON string.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_show
+  name: az synapse trigger show
+  summary: Get a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger show --name
+                            --workspace-name
+                            [--query-examples]
+                            [--subscription]
+  examples:
+  - summary: Get a trigger.
+    syntax: >-
+      az synapse trigger show --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_start
+  name: az synapse trigger start
+  summary: Starts a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger start --name
+                             --workspace-name
+                             [--no-wait]
+                             [--subscription]
+  examples:
+  - summary: Starts a trigger.
+    syntax: >-
+      az synapse trigger start --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_stop
+  name: az synapse trigger stop
+  summary: Stops a trigger.
+  description: ''
+  syntax: >-
+    az synapse trigger stop --name
+                            --workspace-name
+                            [--no-wait]
+                            [--subscription]
+  examples:
+  - summary: Stops a trigger.
+    syntax: >-
+      az synapse trigger stop --workspace-name testsynapseworkspace \
+        --name testtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_subscribe-to-event
+  name: az synapse trigger subscribe-to-event
+  summary: Subscribe event trigger to events.
+  description: ''
+  syntax: >-
+    az synapse trigger subscribe-to-event --name
+                                          --workspace-name
+                                          [--no-wait]
+                                          [--subscription]
+  examples:
+  - summary: Subscribe event trigger to events.
+    syntax: >-
+      az synapse trigger subscribe-to-event --workspace-name testsynapseworkspace \
+        --name eventtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_trigger_unsubscribe-from-event
+  name: az synapse trigger unsubscribe-from-event
+  summary: Unsubscribe event trigger from events.
+  description: ''
+  syntax: >-
+    az synapse trigger unsubscribe-from-event --name
+                                              --workspace-name
+                                              [--no-wait]
+                                              [--subscription]
+  examples:
+  - summary: Unsubscribe event trigger from events.
+    syntax: >-
+      az synapse trigger unsubscribe-from-event --workspace-name testsynapseworkspace \
+        --name eventtrigger
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_trigger_create
+- az_synapse_trigger_delete
+- az_synapse_trigger_get-event-subscription-status
+- az_synapse_trigger_list
+- az_synapse_trigger_set
+- az_synapse_trigger_show
+- az_synapse_trigger_start
+- az_synapse_trigger_stop
+- az_synapse_trigger_subscribe-to-event
+- az_synapse_trigger_unsubscribe-from-event
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse's triggers.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace.yml
new file mode 100644
index 0000000000..f9771a9c7f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace.yml
@@ -0,0 +1,354 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace
+name: az synapse workspace
+summary: Manage Synapse workspaces.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_check-name
+  name: az synapse workspace check-name
+  summary: Check if a Synapse workspace name is available or not.
+  description: ''
+  syntax: >-
+    az synapse workspace check-name --name
+                                    [--subscription]
+  examples:
+  - summary: Check if a Synapse workspace name is available or not.
+    syntax: az synapse workspace check-name --name testsynapseworkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name you wanted to check.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_create
+  name: az synapse workspace create
+  summary: Create a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace create --file-system
+                                --name
+                                --resource-group
+                                --sql-admin-login-password
+                                --sql-admin-login-user
+                                --storage-account
+                                [--allowed-tenant-ids]
+                                [--cmk]
+                                [--enable-managed-virtual-network {false, true}]
+                                [--key-name]
+                                [--location]
+                                [--no-wait]
+                                [--prevent-data-exfiltration {false, true}]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Create a Synapse workspace
+    syntax: >-
+      az synapse workspace create --name fromcli4 --resource-group rg \
+        --storage-account testadlsgen2 --file-system testfilesystem \
+        --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
+  - summary: Create a Synapse workspace with storage resource id
+    syntax: >-
+      az synapse workspace create --name fromcli4 --resource-group rg \
+        --storage-account /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/testadlsgen2 --file-system testfilesystem \
+        --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US"
+  - summary: Create a Synapse workspace using customer-managed key
+    syntax: >-
+      az synapse workspace create --name fromcli4 --resource-group rg \
+        --storage-account testadlsgen2 --file-system testfilesystem \
+        --sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US" \
+        --key-identifier https://{keyvaultname}.vault.azure.net/keys/{keyname} --key-name testcmk
+  requiredParameters:
+  - isRequired: true
+    name: --file-system
+    summary: The file system of the data lake storage account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The workspace name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sql-admin-login-password -p
+    summary: The sql administrator login password.
+    description: ''
+  - isRequired: true
+    name: --sql-admin-login-user -u
+    summary: The sql administrator login user name.
+    description: ''
+  - isRequired: true
+    name: --storage-account
+    summary: The data lake storage account name or resource id.
+    description: ''
+  optionalParameters:
+  - name: --allowed-tenant-ids
+    summary: The approved Azure AD tenants which outbound data traffic allowed to. The Azure AD tenant of the current user will be included by default. Use ('' in PowerShell) to disable all allowed tenant ids.
+    description: ''
+  - name: --cmk --key-identifier
+    summary: 'The customer-managed key used to encrypt all data at rest in the workspace. Key identifier should be in the format of: https://{keyvaultname}.vault.azure.net/keys/{keyname}.'
+    description: ''
+  - name: --enable-managed-virtual-network --enable-managed-vnet
+    parameterValueGroup: false, true
+    summary: The flag indicates whether enable managed virtual network.
+    description: ''
+  - name: --key-name
+    defaultValue: default
+    summary: The workspace customer-managed key display name. All existing keys can be found using "az synapse workspace key list" cmdlet.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prevent-data-exfiltration --prevent-exfiltration
+    parameterValueGroup: false, true
+    summary: The flag indicates whether enable data exfiltration.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_delete
+  name: az synapse workspace delete
+  summary: Delete a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace delete [--ids]
+                                [--name]
+                                [--no-wait]
+                                [--resource-group]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a Synapse workspace.
+    syntax: az synapse workspace delete --name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_list
+  name: az synapse workspace list
+  summary: List all Synapse workspaces.
+  description: ''
+  syntax: >-
+    az synapse workspace list [--query-examples]
+                              [--resource-group]
+                              [--subscription]
+  examples:
+  - summary: List all Synapse workspaces under a subscription
+    syntax: az synapse workspace list
+  - summary: List all Synapse workspaces under a specific resource group
+    syntax: az synapse workspace list --resource-group rg
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_show
+  name: az synapse workspace show
+  summary: Get a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace show [--ids]
+                              [--name]
+                              [--query-examples]
+                              [--resource-group]
+                              [--subscription]
+  examples:
+  - summary: Get a Synapse workspace.
+    syntax: az synapse workspace show --name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_update
+  name: az synapse workspace update
+  summary: Update a Synapse workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace update [--allowed-tenant-ids]
+                                [--ids]
+                                [--key-name]
+                                [--name]
+                                [--no-wait]
+                                [--resource-group]
+                                [--sql-admin-login-password]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Update a Synapse workspace
+    syntax: >-
+      az synapse workspace update --name fromcli4 --resource-group rg \
+        --tags key1=value1
+  optionalParameters:
+  - name: --allowed-tenant-ids
+    summary: The approved Azure AD tenants which outbound data traffic allowed to. The Azure AD tenant of the current user will be included by default. Use ('' in PowerShell) to disable all allowed tenant ids.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --key-name
+    summary: The workspace customer-managed key display name. All existing keys can be found using "az synapse workspace key list" cmdlet.
+    description: ''
+  - name: --name -n
+    summary: The workspace name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sql-admin-login-password -p
+    summary: The sql administrator login password.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_wait
+  name: az synapse workspace wait
+  summary: Place the CLI in a waiting state until a condition of the workspace is met.
+  description: ''
+  syntax: >-
+    az synapse workspace wait --resource-group
+                              --workspace-name
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--subscription]
+                              [--timeout]
+                              [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_check-name
+- az_synapse_workspace_create
+- az_synapse_workspace_delete
+- az_synapse_workspace_firewall-rule
+- az_synapse_workspace_firewall-rule_create
+- az_synapse_workspace_firewall-rule_delete
+- az_synapse_workspace_firewall-rule_list
+- az_synapse_workspace_firewall-rule_show
+- az_synapse_workspace_firewall-rule_update
+- az_synapse_workspace_firewall-rule_wait
+- az_synapse_workspace_key
+- az_synapse_workspace_key_create
+- az_synapse_workspace_key_delete
+- az_synapse_workspace_key_list
+- az_synapse_workspace_key_show
+- az_synapse_workspace_key_update
+- az_synapse_workspace_key_wait
+- az_synapse_workspace_list
+- az_synapse_workspace_managed-identity
+- az_synapse_workspace_managed-identity_grant-sql-access
+- az_synapse_workspace_managed-identity_revoke-sql-access
+- az_synapse_workspace_managed-identity_show-sql-access
+- az_synapse_workspace_managed-identity_wait
+- az_synapse_workspace_show
+- az_synapse_workspace_update
+- az_synapse_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage Synapse workspaces.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/firewall-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/firewall-rule.yml
new file mode 100644
index 0000000000..5ed693c723
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/firewall-rule.yml
@@ -0,0 +1,284 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace_firewall-rule
+name: az synapse workspace firewall-rule
+summary: Manage a workspace's firewall rules.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_firewall-rule_create
+  name: az synapse workspace firewall-rule create
+  summary: Create a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule create --end-ip-address
+                                              --name
+                                              --resource-group
+                                              --start-ip-address
+                                              --workspace-name
+                                              [--no-wait]
+                                              [--subscription]
+  examples:
+  - summary: Create a firewall rule.
+    syntax: >-
+      az synapse workspace firewall-rule create --name allowAll --workspace-name testsynapseworkspace \
+
+      --resource-group rg --start-ip-address 0.0.0.0 --end-ip-address 255.255.255.255
+  requiredParameters:
+  - isRequired: true
+    name: --end-ip-address
+    summary: The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start-ip-address
+    summary: The start IP address of the firewall rule. Must be IPv4 format.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_delete
+  name: az synapse workspace firewall-rule delete
+  summary: Delete a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule delete [--ids]
+                                              [--name]
+                                              [--no-wait]
+                                              [--resource-group]
+                                              [--subscription]
+                                              [--workspace-name]
+                                              [--yes]
+  examples:
+  - summary: Delete a firewall rule.
+    syntax: az synapse workspace firewall-rule delete --name rule1 --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_list
+  name: az synapse workspace firewall-rule list
+  summary: List all firewall rules.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule list --resource-group
+                                            --workspace-name
+                                            [--query-examples]
+                                            [--subscription]
+  examples:
+  - summary: List all firewall rules.
+    syntax: az synapse workspace firewall-rule list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_show
+  name: az synapse workspace firewall-rule show
+  summary: Get a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule show [--ids]
+                                            [--name]
+                                            [--query-examples]
+                                            [--resource-group]
+                                            [--subscription]
+                                            [--workspace-name]
+  examples:
+  - summary: Get a firewall rule.
+    syntax: az synapse workspace firewall-rule show --name rule1 --workspace-name testsynapseworkspace --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_update
+  name: az synapse workspace firewall-rule update
+  summary: Update a firewall rule.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule update [--end-ip-address]
+                                              [--ids]
+                                              [--name]
+                                              [--no-wait]
+                                              [--resource-group]
+                                              [--start-ip-address]
+                                              [--subscription]
+                                              [--workspace-name]
+  examples:
+  - summary: Update a firewall rule.
+    syntax: >-
+      az synapse workspace firewall-rule update --name allowAll --workspace-name testsynapseworkspace \
+
+      --resource-group rg --start-ip-address 172.0.0.0
+  optionalParameters:
+  - name: --end-ip-address
+    summary: The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The IP firewall rule name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --start-ip-address
+    summary: The start IP address of the firewall rule. Must be IPv4 format.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_firewall-rule_wait
+  name: az synapse workspace firewall-rule wait
+  summary: Place the CLI in a waiting state until a condition of a firewall rule is met.
+  description: ''
+  syntax: >-
+    az synapse workspace firewall-rule wait --rule-name
+                                            [--created]
+                                            [--custom]
+                                            [--deleted]
+                                            [--exists]
+                                            [--ids]
+                                            [--interval]
+                                            [--resource-group]
+                                            [--subscription]
+                                            [--timeout]
+                                            [--updated]
+                                            [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --rule-name
+    summary: The IP firewall rule name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_firewall-rule_create
+- az_synapse_workspace_firewall-rule_delete
+- az_synapse_workspace_firewall-rule_list
+- az_synapse_workspace_firewall-rule_show
+- az_synapse_workspace_firewall-rule_update
+- az_synapse_workspace_firewall-rule_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage a workspace's firewall rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/key.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/key.yml
new file mode 100644
index 0000000000..c9ded1573f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/key.yml
@@ -0,0 +1,283 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace_key
+name: az synapse workspace key
+summary: Manage workspace's keys.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_key_create
+  name: az synapse workspace key create
+  summary: Create a workspace's key.
+  description: ''
+  syntax: >-
+    az synapse workspace key create --key-identifier
+                                    --name
+                                    --resource-group
+                                    --workspace-name
+                                    [--no-wait]
+                                    [--subscription]
+  examples:
+  - summary: Create a workspace's key.
+    syntax: >-
+      az synapse workspace key create --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg --key-identifier https://{keyvaultname}.vault.azure.net/keys/{keyname}
+  requiredParameters:
+  - isRequired: true
+    name: --key-identifier
+    summary: 'The Key Vault Url of the workspace encryption key. should be in the format of: https://{keyvaultname}.vault.azure.net/keys/{keyname}.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_delete
+  name: az synapse workspace key delete
+  summary: Delete a workspace's key. The key at active status can't be deleted.
+  description: ''
+  syntax: >-
+    az synapse workspace key delete [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--workspace-name]
+                                    [--yes]
+  examples:
+  - summary: Delete a workspace's key.
+    syntax: >-
+      az synapse workspace key delete --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_list
+  name: az synapse workspace key list
+  summary: List keys under specified workspace.
+  description: ''
+  syntax: >-
+    az synapse workspace key list --resource-group
+                                  --workspace-name
+                                  [--query-examples]
+                                  [--subscription]
+  examples:
+  - summary: List keys under specified workspace.
+    syntax: az synapse workspace key list --workspace-name testsynapseworkspace --resource-group rg
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_show
+  name: az synapse workspace key show
+  summary: Show a workspace's key by name.
+  description: ''
+  syntax: >-
+    az synapse workspace key show [--ids]
+                                  [--name]
+                                  [--query-examples]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--workspace-name]
+  examples:
+  - summary: Show a workspace's key.
+    syntax: >-
+      az synapse workspace key show --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_update
+  name: az synapse workspace key update
+  summary: Update a workspace's key or update the state of key to change the workspace state from pending to success state when the workspace is first being provisioned.
+  description: ''
+  syntax: >-
+    az synapse workspace key update --key-identifier
+                                    [--ids]
+                                    [--name]
+                                    [--no-wait]
+                                    [--resource-group]
+                                    [--subscription]
+                                    [--workspace-name]
+  examples:
+  - summary: Update a workspace's key.
+    syntax: >-
+      az synapse workspace key update --name newkey --workspace-name testsynapseworkspace \
+
+      --resource-group rg --key-identifier https://{keyvaultname}.vault.azure.net/keys/{keyname}
+  requiredParameters:
+  - isRequired: true
+    name: --key-identifier
+    summary: 'The Key Vault Url of the workspace encryption key. should be in the format of: https://{keyvaultname}.vault.azure.net/keys/{keyname}.'
+    description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The workspace customer-managed key display name. All existing keys can be found using /"az synapse workspace key list/" cmdlet.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_key_wait
+  name: az synapse workspace key wait
+  summary: Place the CLI in a waiting state until a condition of a workspace key is met.
+  description: ''
+  syntax: >-
+    az synapse workspace key wait --key-name
+                                  [--created]
+                                  [--custom]
+                                  [--deleted]
+                                  [--exists]
+                                  [--ids]
+                                  [--interval]
+                                  [--resource-group]
+                                  [--subscription]
+                                  [--timeout]
+                                  [--updated]
+                                  [--workspace-name]
+  requiredParameters:
+  - isRequired: true
+    name: --key-name
+    summary: The name of the workspace key.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_key_create
+- az_synapse_workspace_key_delete
+- az_synapse_workspace_key_list
+- az_synapse_workspace_key_show
+- az_synapse_workspace_key_update
+- az_synapse_workspace_key_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage workspace's keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/managed-identity.yml b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/managed-identity.yml
new file mode 100644
index 0000000000..ee63673a0a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/synapse/workspace/managed-identity.yml
@@ -0,0 +1,178 @@
+### YamlMime:AzureCLIGroup
+uid: az_synapse_workspace_managed-identity
+name: az synapse workspace managed-identity
+summary: Manage workspace's managed-identity.
+description: ''
+directCommands:
+- uid: az_synapse_workspace_managed-identity_grant-sql-access
+  name: az synapse workspace managed-identity grant-sql-access
+  summary: Grant workspace's sql-access to managed-identity.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity grant-sql-access [--ids]
+                                                           [--no-wait]
+                                                           [--resource-group]
+                                                           [--subscription]
+                                                           [--workspace-name]
+  examples:
+  - summary: Grant workspace's sql-access to managed-identity.
+    syntax: >-
+      az synapse workspace managed-identity grant-sql-access --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_managed-identity_revoke-sql-access
+  name: az synapse workspace managed-identity revoke-sql-access
+  summary: Revoke workspace's sql-access to managed-identity.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity revoke-sql-access [--ids]
+                                                            [--no-wait]
+                                                            [--resource-group]
+                                                            [--subscription]
+                                                            [--workspace-name]
+  examples:
+  - summary: Revoke workspace's sql-access to managed-identity.
+    syntax: >-
+      az synapse workspace managed-identity revoke-sql-access --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_managed-identity_show-sql-access
+  name: az synapse workspace managed-identity show-sql-access
+  summary: Show workspace's sql-access state to managed-identity.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity show-sql-access [--ids]
+                                                          [--resource-group]
+                                                          [--subscription]
+                                                          [--workspace-name]
+  examples:
+  - summary: Show workspace's sql-access state to managed-identity.
+    syntax: >-
+      az synapse workspace managed-identity show-sql-access --workspace-name testsynapseworkspace \
+
+      --resource-group rg
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+- uid: az_synapse_workspace_managed-identity_wait
+  name: az synapse workspace managed-identity wait
+  summary: Place the CLI in a waiting state until a condition of sql-access state to managed-identity is met.
+  description: ''
+  syntax: >-
+    az synapse workspace managed-identity wait [--created]
+                                               [--custom]
+                                               [--deleted]
+                                               [--exists]
+                                               [--ids]
+                                               [--interval]
+                                               [--resource-group]
+                                               [--subscription]
+                                               [--timeout]
+                                               [--updated]
+                                               [--workspace-name]
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  - name: --workspace-name
+    summary: The workspace name.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/synapse/_help.py
+commands:
+- az_synapse_workspace_managed-identity_grant-sql-access
+- az_synapse_workspace_managed-identity_revoke-sql-access
+- az_synapse_workspace_managed-identity_show-sql-access
+- az_synapse_workspace_managed-identity_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 06/02/2021
+  description: Manage workspace's managed-identity.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tag.yml b/2018-03-01-hybrid/docs-ref-autogen/tag.yml
index 89bca20399..f3bc2ef974 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/tag.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/tag.yml
@@ -1,137 +1,140 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_tag
-  name: az tag
-  summary: Manage resource tags.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_tag_add_value
-  - az_tag_create
-  - az_tag_delete
-  - az_tag_list
-  - az_tag_remove_value
-- uid: az_tag_add_value
+### YamlMime:AzureCLIGroup
+uid: az_tag
+name: az tag
+summary: Tag Management on a resource.
+description: ''
+directCommands:
+- uid: az_tag_add-value
   name: az tag add-value
-  summary: Creates a tag value.
-  description: The name of the tag must already exist.
-  langs:
-  - azurecli
-  parameters:
+  summary: Create a tag value.
+  description: ''
+  syntax: >-
+    az tag add-value --name
+                     --value
+                     [--subscription]
+  examples:
+  - summary: Create a tag value.
+    syntax: az tag add-value --name MyTag --value MyValue
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: The name of the tag.
+    summary: The tag name.
     description: ''
   - isRequired: true
     name: --value
-    summary: The value of the tag to create.
+    summary: The tag value.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_tag_create
   name: az tag create
-  summary: Creates a tag in the subscription.
-  description: The tag name can have a maximum of 512 characters and is case insensitive. Tag names created by Azure have prefixes of microsoft, azure, or windows. You cannot create tags with one of these prefixes.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
+  summary: Create tags on a specific resource.
+  description: The az tag create command with an id creates or updates the entire set of tags on a resource, resource group or subscription. This operation allows adding or replacing the entire set of tags on the specified resource, resource group or subscription. The specified entity can have a maximum of 50 tags.
+  syntax: >-
+    az tag create [--name]
+                  [--subscription]
+                  [--tags]
+  examples:
+  - summary: Create a tag in the subscription.
+    syntax: az tag create --name MyTag
+  - summary: Create or update the entire set of tags on a subscription.
+    syntax: az tag create --resource-id /subscriptions/{subId} --tags Dept=Finance Status=Normal
+  - summary: Create or update the entire set of tags on a resource group.
+    syntax: az tag create --resource-id /subscriptions/{sub-id}/resourcegroups/{rg} --tags Dept=Finance Status=Normal
+  - summary: Create or update the entire set of tags on a resource.
+    syntax: az tag create --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName} --tags Dept=Finance Status=Normal
+  optionalParameters:
+  - name: --name -n
     summary: The name of the tag to create.
     description: ''
   - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    summary: Name or ID of subscription. You can configure the default subscription using az account set -s NAME_OR_ID.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: The tags to be applied on the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_tag_delete
   name: az tag delete
-  summary: Deletes a tag from the subscription.
-  description: You must remove all values from a resource tag before you can delete it.
-  langs:
-  - azurecli
-  parameters:
-  - isRequired: true
-    name: --name -n
-    summary: The name of the tag.
+  summary: Delete tags on a specific resource.
+  description: The az tag delete command with an id deletes the entire set of tags on a resource, resource group or subscription.
+  syntax: >-
+    az tag delete [--name]
+                  [--subscription]
+                  [--yes]
+  examples:
+  - summary: Delete a tag from the subscription.
+    syntax: az tag delete --name MyTag
+  - summary: Delete the entire set of tags on a subscription.
+    syntax: az tag delete --resource-id /subscriptions/{sub-id}
+  - summary: Delete the entire set of tags on a resource group.
+    syntax: az tag delete --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}
+  - summary: Delete the entire set of tags on a resource.
+    syntax: az tag delete --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName}
+  optionalParameters:
+  - name: --name -n
+    summary: The name of the tag to be deleted.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_tag_list
   name: az tag list
-  summary: Gets the names and values of all resource tags that are defined in a subscription.
-  description: ''
-  langs:
-  - azurecli
-  parameters:
+  summary: List the entire set of tags on a specific resource.
+  description: The az tag list command with an id lists the entire set of tags on a resource, resource group or subscription.
+  syntax: >-
+    az tag list [--query-examples]
+                [--subscription]
+  examples:
+  - summary: List the entire set of tags on a subscription.
+    syntax: az tag list --resource-id /subscriptions/{sub-id}
+  - summary: List the entire set of tags on a resource group.
+    syntax: az tag list --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}
+  - summary: List the entire set of tags on a resource.
+    syntax: az tag list --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName}
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_tag_remove_value
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
+- uid: az_tag_remove-value
   name: az tag remove-value
   summary: Deletes a tag value.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az tag remove-value --name
+                        --value
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: The name of the tag.
+    summary: The tag name.
     description: ''
   - isRequired: true
     name: --value
-    summary: The value of the tag to delete.
+    summary: The tag value.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_tag_add_value
-  name: az tag add-value
-  summary: Creates a tag value.
-- uid: az_tag_create
-  name: az tag create
-  summary: Creates a tag in the subscription.
-- uid: az_tag_delete
-  name: az tag delete
-  summary: Deletes a tag from the subscription.
-- uid: az_tag_list
-  name: az tag list
-  summary: Gets the names and values of all resource tags that are defined in a subscription.
-- uid: az_tag_remove_value
-  name: az tag remove-value
-  summary: Deletes a tag value.
+- az_tag_add-value
+- az_tag_create
+- az_tag_delete
+- az_tag_list
+- az_tag_remove-value
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -147,10 +150,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage resource tags.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Tag Management on a resource.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/term.yml b/2018-03-01-hybrid/docs-ref-autogen/term.yml
new file mode 100644
index 0000000000..dce9d5570a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/term.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_term
+name: az term
+summary: Manage marketplace agreement with marketplaceordering.
+description: ''
+directCommands:
+- uid: az_term_accept
+  name: az term accept
+  summary: Accept marketplace terms.
+  description: ''
+  syntax: >-
+    az term accept --plan
+                   --product
+                   --publisher
+                   [--subscription]
+  examples:
+  - summary: Set marketplace terms.
+    syntax: az term accept --product "windows-data-science-vm" --plan "windows2016" --publisher "microsoft-ads"
+  requiredParameters:
+  - isRequired: true
+    name: --plan
+    summary: Plan identifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --product
+    summary: Offer identifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --publisher
+    summary: Publisher identifier string of image being deployed.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/marketplaceordering/_help.py
+- uid: az_term_show
+  name: az term show
+  summary: Get marketplace terms.
+  description: ''
+  syntax: >-
+    az term show --plan
+                 --product
+                 --publisher
+                 [--query-examples]
+                 [--subscription]
+  examples:
+  - summary: Get marketeplace terms.
+    syntax: az term show --product "windows-data-science-vm" --plan "windows2016" --publisher "microsoft-ads"
+  requiredParameters:
+  - isRequired: true
+    name: --plan
+    summary: Plan identifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --product
+    summary: Offeridentifier string of image being deployed.
+    description: ''
+  - isRequired: true
+    name: --publisher
+    summary: Publisher identifier string of image being deployed.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/marketplaceordering/_help.py
+commands:
+- az_term_accept
+- az_term_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/28/2021
+  description: Manage marketplace agreement with marketplaceordering.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi.yml
new file mode 100644
index 0000000000..8f8c67676f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi
+name: az tsi
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Time Series Insights.
+description: ''
+commands:
+- az_tsi_access-policy
+- az_tsi_access-policy_create
+- az_tsi_access-policy_delete
+- az_tsi_access-policy_list
+- az_tsi_access-policy_show
+- az_tsi_access-policy_update
+- az_tsi_environment
+- az_tsi_environment_delete
+- az_tsi_environment_gen1
+- az_tsi_environment_gen1_create
+- az_tsi_environment_gen1_update
+- az_tsi_environment_gen2
+- az_tsi_environment_gen2_create
+- az_tsi_environment_gen2_update
+- az_tsi_environment_list
+- az_tsi_environment_show
+- az_tsi_environment_wait
+- az_tsi_event-source
+- az_tsi_event-source_delete
+- az_tsi_event-source_eventhub
+- az_tsi_event-source_eventhub_create
+- az_tsi_event-source_eventhub_update
+- az_tsi_event-source_iothub
+- az_tsi_event-source_iothub_create
+- az_tsi_event-source_iothub_update
+- az_tsi_event-source_list
+- az_tsi_event-source_show
+- az_tsi_reference-data-set
+- az_tsi_reference-data-set_create
+- az_tsi_reference-data-set_delete
+- az_tsi_reference-data-set_list
+- az_tsi_reference-data-set_show
+- az_tsi_reference-data-set_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Time Series Insights.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/access-policy.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/access-policy.yml
new file mode 100644
index 0000000000..a666cb7d7c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/access-policy.yml
@@ -0,0 +1,176 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_access-policy
+name: az tsi access-policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi access-policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage access policy with timeseriesinsights.
+description: ''
+directCommands:
+- uid: az_tsi_access-policy_create
+  name: az tsi access-policy create
+  summary: Create an access policy in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi access-policy create --access-policy-name
+                                --environment-name
+                                --resource-group
+                                [--description]
+                                [--principal-object-id]
+                                [--roles]
+  examples:
+  - summary: AccessPoliciesCreate
+    syntax: az tsi access-policy create --name "ap1" --environment-name "env1" --description "some description" --principal-object-id "aGuid" --roles Reader Contributor --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: An description of the access policy.
+    description: ''
+  - name: --principal-object-id
+    summary: The objectId of the principal in Azure Active Directory.
+    description: ''
+    valueFrom: az ad user, az ad sp
+  - name: --roles
+    summary: The list of roles the principal is assigned on the environment.
+    description: ''
+- uid: az_tsi_access-policy_delete
+  name: az tsi access-policy delete
+  summary: Delete the access policy.
+  description: ''
+  syntax: >-
+    az tsi access-policy delete --access-policy-name
+                                --environment-name
+                                --resource-group
+                                [--yes]
+  examples:
+  - summary: AccessPoliciesDelete
+    syntax: az tsi access-policy delete --name "ap1" --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_access-policy_list
+  name: az tsi access-policy list
+  summary: List all the available access policies associated with the environment.
+  description: ''
+  syntax: >-
+    az tsi access-policy list --environment-name
+                              --resource-group
+  examples:
+  - summary: AccessPoliciesByEnvironment
+    syntax: az tsi access-policy list --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_access-policy_show
+  name: az tsi access-policy show
+  summary: Show the access policy with the specified name in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi access-policy show --access-policy-name
+                              --environment-name
+                              --resource-group
+  examples:
+  - summary: AccessPoliciesGet
+    syntax: az tsi access-policy show --name "ap1" --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_access-policy_update
+  name: az tsi access-policy update
+  summary: Update the access policy.
+  description: ''
+  syntax: >-
+    az tsi access-policy update --access-policy-name
+                                --environment-name
+                                --resource-group
+                                [--description]
+                                [--roles]
+  examples:
+  - summary: AccessPoliciesUpdate
+    syntax: az tsi access-policy update --name "ap1" --roles "Reader" --roles "Contributor" --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --access-policy-name --name -n
+    summary: The name of the Time Series Insights access policy associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: An description of the access policy.
+    description: ''
+  - name: --roles
+    summary: The list of roles the principal is assigned on the environment.
+    description: ''
+commands:
+- az_tsi_access-policy_create
+- az_tsi_access-policy_delete
+- az_tsi_access-policy_list
+- az_tsi_access-policy_show
+- az_tsi_access-policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage access policy with timeseriesinsights.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/environment.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/environment.yml
new file mode 100644
index 0000000000..f16e995300
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/environment.yml
@@ -0,0 +1,156 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_environment
+name: az tsi environment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi environment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage environment with Azure Time Series Insights.
+description: ''
+directCommands:
+- uid: az_tsi_environment_delete
+  name: az tsi environment delete
+  summary: Delete the environment with the specified name in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment delete --environment-name
+                              --resource-group
+                              [--yes]
+  examples:
+  - summary: EnvironmentsDelete
+    syntax: az tsi environment delete --name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_environment_list
+  name: az tsi environment list
+  summary: List all the available environments associated with the subscription and within the specified     resource group.
+  description: ''
+  syntax: az tsi environment list [--resource-group]
+  examples:
+  - summary: EnvironmentsByResourceGroup
+    syntax: az tsi environment list --resource-group "rg1"
+  - summary: EnvironmentsBySubscription
+    syntax: az tsi environment list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_environment_show
+  name: az tsi environment show
+  summary: Show the environment with the specified name in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment show --environment-name
+                            --resource-group
+                            [--expand]
+  examples:
+  - summary: EnvironmentsGet
+    syntax: az tsi environment show --name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: Setting $expand=status will include the status of the internal services of the environment in the Time Series Insights service.
+    description: ''
+- uid: az_tsi_environment_wait
+  name: az tsi environment wait
+  summary: Place the CLI in a waiting state until a condition of the timeseriesinsights environment is met.
+  description: ''
+  syntax: >-
+    az tsi environment wait --environment-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--expand]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the timeseriesinsights environment is successfully created.
+    syntax: az tsi environment wait --name "env1" --resource-group "rg1" --created
+  - summary: Pause executing next line of CLI script until the timeseriesinsights environment is successfully updated.
+    syntax: az tsi environment wait --name "env1" --resource-group "rg1" --updated
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --expand
+    summary: Setting $expand=status will include the status of the internal services of the environment in the Time Series Insights service.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_tsi_environment_delete
+- az_tsi_environment_gen1
+- az_tsi_environment_gen1_create
+- az_tsi_environment_gen1_update
+- az_tsi_environment_gen2
+- az_tsi_environment_gen2_create
+- az_tsi_environment_gen2_update
+- az_tsi_environment_list
+- az_tsi_environment_show
+- az_tsi_environment_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage environment with Azure Time Series Insights.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/environment/gen1.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/environment/gen1.yml
new file mode 100644
index 0000000000..c23c21c14d
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/environment/gen1.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_environment_gen1
+name: az tsi environment gen1
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi environment gen1** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage a gen1 environment in the specified subscription and resource group.
+description: ''
+directCommands:
+- uid: az_tsi_environment_gen1_create
+  name: az tsi environment gen1 create
+  summary: Create a gen1 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen1 create --data-retention-time
+                                   --environment-name
+                                   --location
+                                   --resource-group
+                                   --sku
+                                   [--exceeded-behavior {PauseIngress, PurgeOldData}]
+                                   [--key-properties]
+                                   [--no-wait]
+                                   [--tags]
+  examples:
+  - summary: EnvironmentsGen1Create
+    syntax: az tsi environment gen1 create --name "env1" --location westus --data-retention-time "P31D" --partition-key-properties name="DeviceId1" type="String" --sku name="S1" capacity=1 --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --data-retention-time
+    summary: ISO8601 timespan specifying the minimum number of days the environment's events will be available for query.
+    description: ''
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The sku determines the type of environment, either S1 or S2. For Gen1 environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
+    description: >-
+      Usage: --sku name=XX capacity=XX
+
+
+      name: Required. The name of this SKU.
+
+      capacity: Required. The capacity of the sku. This value can be changed to support scale out of             environments after they have been created.
+  optionalParameters:
+  - name: --exceeded-behavior --storage-limit-exceeded-behavior
+    parameterValueGroup: PauseIngress, PurgeOldData
+    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
+    description: ''
+  - name: --key-properties --partition-key-properties
+    summary: The list of event properties which will be used to partition data in the environment. Currently, only a single partition key property is supported.
+    description: >-
+      Usage: --partition-key-properties name=XX type=XX
+
+
+      name: The name of the property.
+
+      type: The type of the property.
+
+
+      Multiple actions can be specified by using more than one --partition-key-properties argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_tsi_environment_gen1_update
+  name: az tsi environment gen1 update
+  summary: Update a gen1 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen1 update --environment-name
+                                   --resource-group
+                                   [--data-retention-time]
+                                   [--exceeded-behavior {PauseIngress, PurgeOldData}]
+                                   [--no-wait]
+                                   [--sku]
+                                   [--tags]
+  examples:
+  - summary: EnvironmentsGen1Update
+    syntax: az tsi environment gen1 update --name "env1" --sku name="S1" capacity=2                --resource-group "rg1" --data-retention-time "P30D" --storage-limit-exceeded-behavior PurgeOldData
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-retention-time
+    summary: ISO8601 timespan specifying the minimum number of days the environment's events will be available for query.
+    description: ''
+  - name: --exceeded-behavior --storage-limit-exceeded-behavior
+    parameterValueGroup: PauseIngress, PurgeOldData
+    summary: The behavior the Time Series Insights service should take when the environment's capacity has been exceeded. If "PauseIngress" is specified, new events will not be read from the event source. If "PurgeOldData" is specified, new events will continue to be read and old events will be deleted from the environment. The default behavior is PurgeOldData.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: The sku determines the type of environment, either S1 or S2. For Gen1 environments the sku determines the capacity of the environment, the ingress rate, and the billing rate.
+    description: >-
+      Usage: --sku name=XX capacity=XX
+
+
+      name: Required. The name of this SKU.
+
+      capacity: Required. The capacity of the sku. This value can be changed to support scale out of             environments after they have been created.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_tsi_environment_gen1_create
+- az_tsi_environment_gen1_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage a gen1 environment in the specified subscription and resource group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/environment/gen2.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/environment/gen2.yml
new file mode 100644
index 0000000000..6146c2bcef
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/environment/gen2.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_environment_gen2
+name: az tsi environment gen2
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi environment gen2** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage a gen2 environment in the specified subscription and resource group.
+description: ''
+directCommands:
+- uid: az_tsi_environment_gen2_create
+  name: az tsi environment gen2 create
+  summary: Create a gen2 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen2 create --environment-name
+                                   --id-properties
+                                   --location
+                                   --resource-group
+                                   --sku
+                                   --storage-config
+                                   [--no-wait]
+                                   [--tags]
+                                   [--warm-store-config]
+  examples:
+  - summary: EnvironmentsGen2Create
+    syntax: az tsi environment gen2 create --name "env2" --location westus --resource-group "rg1"                --sku name="L1" capacity=1 --time-series-id-properties name=idName type=String                --storage-configuration account-name=your-account-name management-key=your-account-key
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --id-properties --time-series-id-properties
+    summary: The list of event properties which will be used to define the environment's time series id.
+    description: >-
+      Usage: --time-series-id-properties name=XX type=String
+
+
+      name: The name of the property.
+
+      type: The type of the property.
+
+
+      Multiple actions can be specified by using more than one --time-series-id-properties argument.
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The sku determines the type of environment, L1.
+    description: >-
+      Usage: --sku name=XX capacity=XX
+
+
+      name: Required. The name of this SKU.
+
+      capacity: Required. The capacity of the sku.
+  - isRequired: true
+    name: --storage-config --storage-configuration
+    summary: The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data.
+    description: >-
+      Usage: --storage-configuration account-name=XX management-key=XX
+
+
+      account-name: Required. The name of the storage account that will hold the environment's Gen2 data.
+
+      management-key: Required. The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --warm-store-config --warm-store-configuration
+    summary: The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query.
+    description: >-
+      Usage: --warm-store-configuration data-retention=XX
+
+
+      data-retention: Required. ISO8601 timespan specifying the number of days the environment's events will be available for query from the warm store.
+- uid: az_tsi_environment_gen2_update
+  name: az tsi environment gen2 update
+  summary: Update a gen2 environment in the specified subscription and resource group.
+  description: ''
+  syntax: >-
+    az tsi environment gen2 update --environment-name
+                                   --resource-group
+                                   [--no-wait]
+                                   [--storage-config]
+                                   [--tags]
+                                   [--warm-store-config]
+  examples:
+  - summary: EnvironmentsGen2Update
+    syntax: az tsi environment gen2 update --name "env2" --resource-group "rg1"                --warm-store-configuration data-retention=P30D                --storage-configuration account-name=your-account-name management-key=your-account-key
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name --name -n
+    summary: Name of the environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --storage-config --storage-configuration
+    summary: The storage configuration provides the connection details that allows the Time Series Insights service to connect to the customer storage account that is used to store the environment's data.
+    description: >-
+      Usage: --storage-configuration account-name=XX management-key=XX
+
+
+      account-name: Required. The name of the storage account that will hold the environment's Gen2 data.
+
+      management-key: Required. The value of the management key that grants the Time Series Insights service write access to the storage account. This property is not shown in environment responses.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --warm-store-config --warm-store-configuration
+    summary: The warm store configuration provides the details to create a warm store cache that will retain a copy of the environment's data available for faster query.
+    description: >-
+      Usage: --warm-store-configuration data-retention=XX
+
+
+      data-retention: Required. ISO8601 timespan specifying the number of days the environment's events will be available for query from the warm store.
+commands:
+- az_tsi_environment_gen2_create
+- az_tsi_environment_gen2_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage a gen2 environment in the specified subscription and resource group.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source.yml
new file mode 100644
index 0000000000..4fc277cff9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source.yml
@@ -0,0 +1,109 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_event-source
+name: az tsi event-source
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi event-source** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event source with timeseriesinsights.
+description: ''
+directCommands:
+- uid: az_tsi_event-source_delete
+  name: az tsi event-source delete
+  summary: Delete the event source with the specified name in the specified subscription, resource group, and environment.
+  description: ''
+  syntax: >-
+    az tsi event-source delete --environment-name
+                               --event-source-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: DeleteEventSource
+    syntax: az tsi event-source delete --environment-name "env1" --name "es1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_event-source_list
+  name: az tsi event-source list
+  summary: List all the available event sources associated with the subscription and within the specified resource group and environment.
+  description: ''
+  syntax: >-
+    az tsi event-source list --environment-name
+                             --resource-group
+  examples:
+  - summary: ListEventSourcesByEnvironment
+    syntax: az tsi event-source list --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_event-source_show
+  name: az tsi event-source show
+  summary: Show the event source with the specified name in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source show --environment-name
+                             --event-source-name
+                             --resource-group
+  examples:
+  - summary: GetEventHubEventSource
+    syntax: az tsi event-source show --environment-name "env1" --name "es1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_tsi_event-source_delete
+- az_tsi_event-source_eventhub
+- az_tsi_event-source_eventhub_create
+- az_tsi_event-source_eventhub_update
+- az_tsi_event-source_iothub
+- az_tsi_event-source_iothub_create
+- az_tsi_event-source_iothub_update
+- az_tsi_event-source_list
+- az_tsi_event-source_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event source with timeseriesinsights.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source/eventhub.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source/eventhub.yml
new file mode 100644
index 0000000000..63c1d57372
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source/eventhub.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_event-source_eventhub
+name: az tsi event-source eventhub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi event-source eventhub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event source with timeseriesinsights sub group event-hub.
+description: ''
+directCommands:
+- uid: az_tsi_event-source_eventhub_create
+  name: az tsi event-source eventhub create
+  summary: Create an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source eventhub create --consumer-group-name
+                                        --environment-name
+                                        --event-hub-name
+                                        --event-source-name
+                                        --event-source-resource-id
+                                        --key-name
+                                        --location
+                                        --namespace
+                                        --resource-group
+                                        --shared-access-key
+                                        [--local-timestamp]
+                                        [--tags]
+                                        [--timestamp-property-name]
+  examples:
+  - summary: CreateEventHubEventSource
+    syntax: az tsi event-source eventhub create --environment-name "env1" --name "es1" --location westus --consumer-group-name "cgn" --event-hub-name "ehn" --event-source-resource-id "somePathInArm" --key-name "managementKey" --service-bus-namespace "sbn" --shared-access-key "someSecretvalue" --timestamp-property-name "someTimestampProperty" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --consumer-group-name
+    summary: The name of the event hub's consumer group that holds the partitions from which events will be read.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-hub-name
+    summary: The name of the event hub.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --event-source-resource-id --resource-id
+    summary: The resource id of the event source in Azure Resource Manager.
+    description: ''
+  - isRequired: true
+    name: --key-name --shared-access-policy-name
+    summary: The name of the SAS key that grants the Time Series Insights service access to the event hub. The shared access policies for this key must grant 'Listen' permissions to the event hub.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --namespace --service-bus-namespace
+    summary: The name of the service bus that contains the event hub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --shared-access-key
+    summary: The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+- uid: az_tsi_event-source_eventhub_update
+  name: az tsi event-source eventhub update
+  summary: Update an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source eventhub update --environment-name
+                                        --event-source-name
+                                        --resource-group
+                                        [--local-timestamp]
+                                        [--shared-access-key]
+                                        [--tags]
+                                        [--timestamp-property-name]
+  examples:
+  - summary: UpdateEventHubEventSource
+    syntax: az tsi event-source eventhub update --environment-name "env1" --name "es1" --shared-access-key "someSecretvalue" --timestamp-property-name "someTimestampProperty" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --shared-access-key
+    summary: The value of the shared access key that grants the Time Series Insights service read access to the event hub. This property is not shown in event source responses.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+commands:
+- az_tsi_event-source_eventhub_create
+- az_tsi_event-source_eventhub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event source with timeseriesinsights sub group event-hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source/iothub.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source/iothub.yml
new file mode 100644
index 0000000000..3d6605b5ec
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/event-source/iothub.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_event-source_iothub
+name: az tsi event-source iothub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi event-source iothub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage event source with timeseriesinsights sub group iot-hub.
+description: ''
+directCommands:
+- uid: az_tsi_event-source_iothub_create
+  name: az tsi event-source iothub create
+  summary: Create an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source iothub create --consumer-group-name
+                                      --environment-name
+                                      --event-source-name
+                                      --event-source-resource-id
+                                      --iot-hub-name
+                                      --key-name
+                                      --location
+                                      --resource-group
+                                      --shared-access-key
+                                      [--local-timestamp]
+                                      [--tags]
+                                      [--timestamp-property-name]
+  examples:
+  - summary: CreateIotHubEventSource
+    syntax: az tsi event-source iothub create -g "rg" --environment-name "env1" --name "eventsource" --consumer-group-name "consumer-group" --iot-hub-name "iothub" --location westus --key-name "key-name" --shared-access-key "someSecretvalue" --event-source-resource-id "resource-id"
+  requiredParameters:
+  - isRequired: true
+    name: --consumer-group-name
+    summary: The name of the iot hub's consumer group that holds the partitions from which events will be read.
+    description: ''
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --event-source-resource-id --resource-id
+    summary: The resource id of the event source in Azure Resource Manager.
+    description: ''
+  - isRequired: true
+    name: --iot-hub-name
+    summary: The name of the iot hub.
+    description: ''
+  - isRequired: true
+    name: --key-name --shared-access-policy-name
+    summary: The name of the Shared Access Policy key that grants the Time Series Insights service access to the iot hub. This shared access policy key must grant 'service connect' permissions to the iot hub.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --shared-access-key
+    summary: The value of the Shared Access Policy key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+- uid: az_tsi_event-source_iothub_update
+  name: az tsi event-source iothub update
+  summary: Update an event source under the specified environment.
+  description: ''
+  syntax: >-
+    az tsi event-source iothub update --environment-name
+                                      --event-source-name
+                                      --resource-group
+                                      [--local-timestamp]
+                                      [--shared-access-key]
+                                      [--tags]
+                                      [--timestamp-property-name]
+  examples:
+  - summary: UpdateIotHubEventSource
+    syntax: az tsi event-source iothub update -g "rg" --environment-name "env1" --name "eventsource"  --timestamp-property-name timestampProp --shared-access-key "someSecretvalue" --tags test=tag
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --event-source-name --name -n
+    summary: The name of the Time Series Insights event source associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group of environment. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --local-timestamp
+    summary: "An object that represents the local timestamp property. It contains the format of local timestamp that needs to be used and the corresponding timezone offset information. If a value isn't specified for localTimestamp, or if null, then the local timestamp will not be ingressed with the events. Expected value: json-string/@json-file."
+    description: ''
+  - name: --shared-access-key
+    summary: The value of the Shared Access Policy key that grants the Time Series Insights service read access to the iot hub. This property is not shown in event source responses.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --timestamp-property-name --ts-property-name
+    summary: The event property that will be used as the event source's timestamp. If a value isn't specified for timestampPropertyName, or if null or empty-string is specified, the event creation time will be used.
+    description: ''
+commands:
+- az_tsi_event-source_iothub_create
+- az_tsi_event-source_iothub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage event source with timeseriesinsights sub group iot-hub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/tsi/reference-data-set.yml b/2018-03-01-hybrid/docs-ref-autogen/tsi/reference-data-set.yml
new file mode 100644
index 0000000000..773c684ef1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/tsi/reference-data-set.yml
@@ -0,0 +1,187 @@
+### YamlMime:AzureCLIGroup
+uid: az_tsi_reference-data-set
+name: az tsi reference-data-set
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **timeseriesinsights** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az tsi reference-data-set** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage reference data set with timeseriesinsights.
+description: ''
+directCommands:
+- uid: az_tsi_reference-data-set_create
+  name: az tsi reference-data-set create
+  summary: Create a reference data set in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set create --environment-name
+                                     --key-properties
+                                     --location
+                                     --name
+                                     --resource-group
+                                     [--comparison-behavior {Ordinal, OrdinalIgnoreCase}]
+                                     [--tags]
+  examples:
+  - summary: ReferenceDataSetsCreate
+    syntax: az tsi reference-data-set create --environment-name "env1" --location westus --key-properties name="DeviceId1" type="String" --key-properties name="DeviceFloor" type="Double" --name "rds1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --key-properties
+    summary: The list of key properties for the reference data set.
+    description: >-
+      Usage: --key-properties name=XX type=XX
+
+
+      name: The name of the key property.
+
+      type: The type of the key property.
+
+
+      Multiple actions can be specified by using more than one --key-properties argument.
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --comparison-behavior --data-string-comparison-behavior
+    parameterValueGroup: Ordinal, OrdinalIgnoreCase
+    summary: The reference data set key comparison behavior can be set using this property. By default, the value is 'Ordinal' - which means case sensitive key comparison will be performed while joining reference data with events or while adding new reference data. When 'OrdinalIgnoreCase' is set, case insensitive comparison will be used.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_tsi_reference-data-set_delete
+  name: az tsi reference-data-set delete
+  summary: Delete the reference data set.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set delete --environment-name
+                                     --name
+                                     --resource-group
+                                     [--yes]
+  examples:
+  - summary: ReferenceDataSetsDelete
+    syntax: az tsi reference-data-set delete --environment-name "env1" --name "rds1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_tsi_reference-data-set_list
+  name: az tsi reference-data-set list
+  summary: List all the available reference data sets associated with the subscription and within the specified resource group and environment.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set list --environment-name
+                                   --resource-group
+  examples:
+  - summary: ReferenceDataSetsListByEnvironment
+    syntax: az tsi reference-data-set list --environment-name "env1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_reference-data-set_show
+  name: az tsi reference-data-set show
+  summary: Show the reference data set with the specified name in the specified environment.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set show --environment-name
+                                   --name
+                                   --resource-group
+  examples:
+  - summary: ReferenceDataSetsGet
+    syntax: az tsi reference-data-set show --environment-name "env1" --name "rds1" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_tsi_reference-data-set_update
+  name: az tsi reference-data-set update
+  summary: Update the reference data set.
+  description: ''
+  syntax: >-
+    az tsi reference-data-set update --environment-name
+                                     --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: ReferenceDataSetsUpdate
+    syntax: az tsi reference-data-set update --environment-name "env1" --name "rds1" --tags someKey="someValue" --resource-group "rg1"
+  requiredParameters:
+  - isRequired: true
+    name: --environment-name
+    summary: The name of the Time Series Insights environment associated with the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --name --reference-data-set-name -n
+    summary: The name of the Time Series Insights reference data set associated with the specified environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_tsi_reference-data-set_create
+- az_tsi_reference-data-set_delete
+- az_tsi_reference-data-set_list
+- az_tsi_reference-data-set_show
+- az_tsi_reference-data-set_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage reference data set with timeseriesinsights.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm.yml b/2018-03-01-hybrid/docs-ref-autogen/vm.yml
index ec710a108a..1d3bcecbe7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm.yml
@@ -1,242 +1,289 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm
-  name: az vm
-  summary: Manage Linux or Windows virtual machines.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_auto_shutdown
-  - az_vm_capture
-  - az_vm_convert
-  - az_vm_create
-  - az_vm_deallocate
-  - az_vm_delete
-  - az_vm_generalize
-  - az_vm_get_instance_view
-  - az_vm_list
-  - az_vm_list_ip_addresses
-  - az_vm_list_sizes
-  - az_vm_list_skus
-  - az_vm_list_usage
-  - az_vm_list_vm_resize_options
-  - az_vm_open_port
-  - az_vm_perform_maintenance
-  - az_vm_redeploy
-  - az_vm_resize
-  - az_vm_restart
-  - az_vm_show
-  - az_vm_start
-  - az_vm_stop
-  - az_vm_update
-  - az_vm_wait
-- uid: az_vm_auto_shutdown
+### YamlMime:AzureCLIGroup
+uid: az_vm
+name: az vm
+summary: Manage Linux or Windows virtual machines.
+description: ''
+directCommands:
+- uid: az_vm_auto-shutdown
   name: az vm auto-shutdown
   summary: Manage auto-shutdown for VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm auto-shutdown [--email]
+                        [--ids]
+                        [--location]
+                        [--name]
+                        [--off]
+                        [--resource-group]
+                        [--subscription]
+                        [--time]
+                        [--webhook]
   examples:
   - summary: Create auto-shutdown schedule for a VM.
-    syntax:
-      content: az vm auto-shutdown -g MyResourceGroup -n MyVm --time 1730 --email "foo@bar.com" --webhook "https://example.com/"
+    syntax: az vm auto-shutdown -g MyResourceGroup -n MyVm --time 1730 --email "foo@bar.com" --webhook "https://example.com/"
   - summary: Delete auto-shutdown schedule for a VM.
-    syntax:
-      content: az vm auto-shutdown -g MyResourceGroup -n MyVm --off
-  parameters:
+    syntax: az vm auto-shutdown -g MyResourceGroup -n MyVm --off
+  optionalParameters:
   - name: --email
     summary: The email recipient to send notifications to (can be a list of semi-colon separated email addresses).
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --off
     summary: Turn off auto-shutdown for VM. Configuration will be cleared.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --time
     summary: 'The UTC time of day the schedule will occur every day. Format: hhmm. Example: 1730.'
     description: ''
   - name: --webhook
     summary: The webhook URL to which the notification will be sent.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_capture
   name: az vm capture
   summary: Capture information for a stopped VM.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image.
+  syntax: >-
+    az vm capture --vhd-name-prefix
+                  [--ids]
+                  [--name]
+                  [--overwrite]
+                  [--resource-group]
+                  [--storage-container]
+                  [--subscription]
   examples:
   - summary: Deallocate, generalize, and capture a stopped virtual machine.
-    syntax:
-      content: >-
-        az vm deallocate -g MyResourceGroup -n MyVm
+    syntax: >-
+      az vm deallocate -g MyResourceGroup -n MyVm
 
-        az vm generalize -g MyResourceGroup -n MyVm
+      az vm generalize -g MyResourceGroup -n MyVm
 
-        az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
+      az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
   - summary: Deallocate, generalize, and capture multiple stopped virtual machines.
-    syntax:
-      content: >-
-        vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: >-
+      vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 
-        az vm deallocate --ids {vms_ids}
+      az vm deallocate --ids {vms_ids}
 
-        az vm generalize --ids {vms_ids}
+      az vm generalize --ids {vms_ids}
 
-        az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
-  parameters:
+      az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
+  requiredParameters:
   - isRequired: true
     name: --vhd-name-prefix
     summary: The VHD name prefix specify for the VM disks.
     description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
   - name: --overwrite
     defaultValue: "1"
     summary: Overwrite the existing disk file.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --storage-container
     defaultValue: vhds
     summary: The storage account container name in which to save the disks.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_convert
   name: az vm convert
   summary: Convert a VM with unmanaged disks to use managed disks.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm convert [--ids]
+                  [--name]
+                  [--resource-group]
+                  [--subscription]
   examples:
   - summary: Convert a VM with unmanaged disks to use managed disks.
-    syntax:
-      content: az vm convert -g MyResourceGroup -n MyVm
+    syntax: az vm convert -g MyResourceGroup -n MyVm
   - summary: Convert all VMs with unmanaged disks in a resource group to use managed disks.
-    syntax:
-      content: az vm convert --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm convert --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_create
   name: az vm create
   summary: Create an Azure Virtual Machine.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-quick-create-cli">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-quick-create-cli</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/linux/quick-create-cli.
+  syntax: >-
+    az vm create --name
+                 --resource-group
+                 [--accelerated-networking {false, true}]
+                 [--admin-password]
+                 [--admin-username]
+                 [--asgs]
+                 [--assign-identity]
+                 [--attach-data-disks]
+                 [--attach-os-disk]
+                 [--authentication-type {all, password, ssh}]
+                 [--availability-set]
+                 [--boot-diagnostics-storage]
+                 [--computer-name]
+                 [--count]
+                 [--custom-data]
+                 [--data-disk-caching]
+                 [--data-disk-sizes-gb]
+                 [--encryption-at-host {false, true}]
+                 [--eviction-policy]
+                 [--generate-ssh-keys]
+                 [--image]
+                 [--license-type {None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server}]
+                 [--location]
+                 [--nics]
+                 [--no-wait]
+                 [--nsg]
+                 [--nsg-rule {NONE, RDP, SSH}]
+                 [--os-disk-caching {None, ReadOnly, ReadWrite}]
+                 [--os-disk-name]
+                 [--os-disk-size-gb]
+                 [--os-type {linux, windows}]
+                 [--plan-name]
+                 [--plan-product]
+                 [--plan-promotion-code]
+                 [--plan-publisher]
+                 [--private-ip-address]
+                 [--public-ip-address]
+                 [--public-ip-address-allocation {dynamic, static}]
+                 [--public-ip-address-dns-name]
+                 [--public-ip-sku {Basic, Standard}]
+                 [--role]
+                 [--scope]
+                 [--secrets]
+                 [--size]
+                 [--specialized {false, true}]
+                 [--ssh-dest-key-path]
+                 [--ssh-key-name]
+                 [--ssh-key-values]
+                 [--storage-account]
+                 [--storage-container-name]
+                 [--storage-sku]
+                 [--subnet]
+                 [--subnet-address-prefix]
+                 [--subscription]
+                 [--tags]
+                 [--use-unmanaged-disk]
+                 [--validate]
+                 [--vmss]
+                 [--vnet-address-prefix]
+                 [--vnet-name]
+                 [--workspace]
+                 [--zone {1, 2, 3}]
   examples:
   - summary: Create a default Ubuntu VM with automatic SSH authentication.
-    syntax:
-      content: az vm create -n MyVm -g MyResourceGroup --image UbuntuLTS
+    syntax: az vm create -n MyVm -g MyResourceGroup --image UbuntuLTS
   - summary: Create a default RedHat VM with automatic SSH authentication using an image URN.
-    syntax:
-      content: az vm create -n MyVm -g MyResourceGroup --image RedHat:RHEL:7-RAW:7.4.2018010506
+    syntax: az vm create -n MyVm -g MyResourceGroup --image RedHat:RHEL:7-RAW:7.4.2018010506
   - summary: Create a default Windows Server VM with a private IP address.
-    syntax:
-      content: az vm create -n MyVm -g MyResourceGroup --public-ip-address "" --image Win2012R2Datacenter
+    syntax: az vm create -n MyVm -g MyResourceGroup --public-ip-address "" --image Win2012R2Datacenter
   - summary: Create a VM from a custom managed image.
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --image MyImage
+    syntax: az vm create -g MyResourceGroup -n MyVm --image MyImage
   - summary: Create a VM from a specialized image version.
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --image $id --specialized
+    syntax: az vm create -g MyResourceGroup -n MyVm --image $id --specialized
   - summary: Create a VM by attaching to a managed operating system disk.
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --attach-os-disk MyOsDisk --os-type linux
-  - summary: 'Create an Ubuntu Linux VM using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init.'
-    syntax:
-      content: az vm create -g MyResourceGroup -n MyVm --image debian --custom-data MyCloudInitScript.yml
+    syntax: az vm create -g MyResourceGroup -n MyVm --attach-os-disk MyOsDisk --os-type linux
+  - summary: 'Create an Ubuntu Linux VM using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/linux/using-cloud-init.'
+    syntax: az vm create -g MyResourceGroup -n MyVm --image debian --custom-data MyCloudInitScript.yml
   - summary: Create a Debian VM with SSH key authentication and a public DNS entry, located on an existing virtual network and availability set.
-    syntax:
-      content: >-
-        az vm create -n MyVm -g MyResourceGroup --image debian --vnet-name MyVnet --subnet subnet1 \
-            --availability-set MyAvailabilitySet --public-ip-address-dns-name MyUniqueDnsName \
-            --ssh-key-values @key-file
+    syntax: >-
+      az vm create -n MyVm -g MyResourceGroup --image debian --vnet-name MyVnet --subnet subnet1 \
+          --availability-set MyAvailabilitySet --public-ip-address-dns-name MyUniqueDnsName \
+          --ssh-key-values @key-file
   - summary: Create a simple Ubuntu Linux VM with a public IP address, DNS entry, two data disks (10GB and 20GB), and then generate ssh key pairs.
-    syntax:
-      content: >-
-        az vm create -n MyVm -g MyResourceGroup --public-ip-address-dns-name MyUniqueDnsName \
-            --image ubuntults --data-disk-sizes-gb 10 20 --size Standard_DS2_v2 \
-            --generate-ssh-keys
+    syntax: >-
+      az vm create -n MyVm -g MyResourceGroup --public-ip-address-dns-name MyUniqueDnsName \
+          --image ubuntults --data-disk-sizes-gb 10 20 --size Standard_DS2_v2 \
+          --generate-ssh-keys
   - summary: Create a Debian VM using Key Vault secrets.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
   - summary: Create a CentOS VM with a system assigned identity. The VM will have a 'Contributor' role with access to a storage account.
-    syntax:
-      content: az vm create -n MyVm -g rg1 --image centos --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
+    syntax: az vm create -n MyVm -g rg1 --image centos --assign-identity [system] --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
   - summary: Create a debian VM with a user assigned identity.
-    syntax:
-      content: az vm create -n MyVm -g rg1 --image debian --assign-identity  /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+    syntax: az vm create -n MyVm -g rg1 --image debian --assign-identity /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
   - summary: Create a debian VM with both system and user assigned identity.
-    syntax:
-      content: az vm create -n MyVm -g rg1 --image debian --assign-identity  [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
-  parameters:
+    syntax: az vm create -n MyVm -g rg1 --image debian --assign-identity [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+  - summary: Create multiple VMs. In this example, 3 VMs are created. They are MyVm0, MyVm1, MyVm2.
+    syntax: az vm create -n MyVm -g MyResourceGroup --image centos --count 3
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the virtual machine.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accelerated-networking
+    parameterValueGroup: false, true
+    summary: Enable accelerated networking. Unless specified, CLI will enable it based on machine image and size.
+    description: ''
+  - name: --admin-password
+    summary: Password for the VM if authentication type is 'Password'.
+    description: ''
+  - name: --admin-username
+    summary: Username for the VM. Default value is current username of OS. If the default value is system reserved, then default value will be set to azureuser. Please refer to https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/createorupdate#osprofile to get a full list of reserved values.
+    description: ''
+  - name: --asgs
+    summary: Space-separated list of existing application security groups to associate with the VM.
+    description: ''
+  - name: --assign-identity
+    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+    description: ''
+  - name: --attach-data-disks
+    summary: Attach existing data disks to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
+    description: ''
+  - name: --attach-os-disk
+    summary: Attach an existing OS disk to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
+    description: ''
+  - name: --authentication-type
+    parameterValueGroup: all, password, ssh
+    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
     description: ''
   - name: --availability-set
     summary: Name or ID of an existing availability set to add the VM to. None by default.
@@ -247,76 +294,65 @@ items:
   - name: --computer-name
     summary: The host OS name of the virtual machine. Defaults to the name of the VM.
     description: ''
+  - name: --count
+    summary: Number of virtual machines to create. Value range is [2, 250], inclusive. Don't specify this parameter if you want to create a normal single VM. The VMs are created in parallel. The output of this command is an array of VMs instead of one single VM. Each VM has its own public IP, NIC. VNET and NSG are shared. It is recommended that no existing public IP, NIC, VNET and NSG are in resource group. When --count is specified, --attach-data-disks, --attach-os-disk, --boot-diagnostics-storage, --computer-name, --host, --host-group, --nics, --os-disk-name, --private-ip-address, --public-ip-address, --public-ip-address-dns-name, --storage-account, --storage-container-name, --subnet, --use-unmanaged-disk, --vnet-name are not allowed.
+    description: ''
   - name: --custom-data
     summary: Custom init script file or text (cloud-init, cloud-config, etc..).
     description: ''
+  - name: --data-disk-caching
+    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `<lun>=<vaule1> <lun>=<value2>` to configure individual disk.
+    description: ''
+  - name: --data-disk-sizes-gb
+    summary: Space-separated empty managed data disk sizes in GB to create.
+    description: ''
+  - name: --encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable Host Encryption for the VM or VMSS. This will enable the encryption for all the disks including Resource/Temp disk at host itself.
+    description: ''
   - name: --eviction-policy
     summary: ''
     description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
+    description: ''
   - name: --image
-    summary: 'The name of the operating system image as a URN alias, URN, custom image name or ID, custom image version ID, or VHD blob URI. This parameter is required unless using `--attach-os-disk.` Valid URN format: "Publisher:Offer:Sku:Version".'
+    summary: 'The name of the operating system image as a URN alias, URN, custom image name or ID, custom image version ID, or VHD blob URI. This parameter is required unless using `--attach-os-disk.` Valid URN format: "Publisher:Offer:Sku:Version". For more information, see https://docs.microsoft.com/azure/virtual-machines/linux/cli-ps-findimage.'
     description: ''
     valueFrom: az vm image list, az vm image show
   - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
+    parameterValueGroup: None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server
     summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
   - name: --location -l
     summary: Location in which to create VM and related resources. If default location is not configured, will default to the resource group's location.
     description: ''
+  - name: --nics
+    summary: Names or IDs of existing NICs to attach to the VM. The first NIC will be designated as primary. If omitted, a new NIC will be created. If an existing NIC is specified, do not specify subnet, VNet, public IP or NSG.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --secrets
-    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
-    description: ''
-  - name: --size
-    defaultValue: Standard_DS1_v2
-    summary: The VM size to be created. See <a href="https://azure.microsoft.com/pricing/details/virtual-machines/">https://azure.microsoft.com/pricing/details/virtual-machines/</a> for size info.
-    description: ''
-    valueFrom: az vm list-sizes
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
-  - name: --vmss
-    summary: Name or ID of an existing virtual machine scale set that the virtual machine should be assigned to. None by default.
-    description: ''
-  - name: --zone -z
-    parameterValueGroup: 1, 2, 3
-    summary: Availability zone into which to provision the resource.
-    description: ''
-  - name: --admin-password
-    summary: Password for the VM if authentication type is 'Password'.
-    description: ''
-  - name: --admin-username
-    defaultValue: your_system_user_login_name
-    summary: Username for the VM.
-    description: ''
-  - name: --authentication-type
-    parameterValueGroup: all, password, ssh
-    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
-    description: ''
-  - name: --generate-ssh-keys
-    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
+  - name: --nsg
+    summary: The name to use when creating a new Network Security Group (default) or referencing an existing one. Can also reference an existing NSG by ID or specify "" for none ('""' in Azure CLI using PowerShell or --% operator).
     description: ''
-  - name: --ssh-dest-key-path
-    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+  - name: --nsg-rule
+    parameterValueGroup: NONE, RDP, SSH
+    summary: NSG rule to create when creating a new NSG. Defaults to open ports for allowing RDP on Windows and allowing SSH on Linux. NONE represents no NSG rule.
     description: ''
-  - name: --ssh-key-values
-    summary: Space-separated list of SSH public keys or public key file paths.
+  - name: --os-disk-caching
+    parameterValueGroup: None, ReadOnly, ReadWrite
+    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
     description: ''
-  - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+  - name: --os-disk-name
+    summary: The name of the new VM OS disk.
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
+  - name: --os-disk-size-gb
+    summary: OS disk size in GB to create.
     description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
+  - name: --os-type
+    parameterValueGroup: linux, windows
+    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
     description: ''
   - name: --plan-name
     summary: Plan name.
@@ -330,26 +366,6 @@ items:
   - name: --plan-publisher
     summary: Plan publisher.
     description: ''
-  - name: --workspace
-    summary: Name or ID of Log Analytics Workspace. If you specify the workspace through its name, the workspace should be in the same resource group with the vm, otherwise a new workspace will be created.
-    description: ''
-  - name: --accelerated-networking
-    parameterValueGroup: false, true
-    summary: Enable accelerated networking. Unless specified, CLI will enable it based on machine image and size.
-    description: ''
-  - name: --asgs
-    summary: Space-separated list of existing application security groups to associate with the VM.
-    description: ''
-  - name: --nics
-    summary: Names or IDs of existing NICs to attach to the VM. The first NIC will be designated as primary. If omitted, a new NIC will be created. If an existing NIC is specified, do not specify subnet, VNet, public IP or NSG.
-    description: ''
-  - name: --nsg
-    summary: The name to use when creating a new Network Security Group (default) or referencing an existing one. Can also reference an existing NSG by ID or specify "" for none ('""' in Azure CLI using PowerShell or --% operator).
-    description: ''
-  - name: --nsg-rule
-    parameterValueGroup: NONE, RDP, SSH
-    summary: NSG rule to create when creating a new NSG. Defaults to open ports for allowing RDP on Windows and allowing SSH on Linux. NONE represents no NSG rule.
-    description: ''
   - name: --private-ip-address
     summary: Static private IP address (e.g. 10.0.0.5).
     description: ''
@@ -367,50 +383,34 @@ items:
     parameterValueGroup: Basic, Standard
     summary: Public IP SKU. It is set to Basic by default.
     description: ''
-  - name: --subnet
-    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
-    description: ''
-  - name: --subnet-address-prefix
-    defaultValue: 10.0.0.0/24
-    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vnet-address-prefix
-    defaultValue: 10.0.0.0/16
-    summary: The IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network when creating a new one or referencing an existing one.
-    description: ''
-  - name: --attach-data-disks
-    summary: Attach existing data disks to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
-    description: ''
-  - name: --attach-os-disk
-    summary: Attach an existing OS disk to the VM. Can use the name or ID of a managed disk or the URI to an unmanaged disk VHD.
-    description: ''
-  - name: --data-disk-caching
-    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `&lt;lun&gt;=&lt;vaule1&gt; &lt;lun&gt;=&lt;value2&gt;` to configure individual disk.
-    description: ''
-  - name: --data-disk-sizes-gb
-    summary: Space-separated empty managed data disk sizes in GB to create.
-    description: ''
-  - name: --os-disk-caching
-    parameterValueGroup: None, ReadOnly, ReadWrite
-    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
     description: ''
-  - name: --os-disk-name
-    summary: The name of the new VM OS disk.
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
-  - name: --os-disk-size-gb
-    summary: OS disk size in GB to create.
+  - name: --secrets
+    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
     description: ''
-  - name: --os-type
-    parameterValueGroup: linux, windows
-    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
+  - name: --size
+    defaultValue: Standard_DS1_v2
+    summary: The VM size to be created. See https://azure.microsoft.com/pricing/details/virtual-machines/ for size info.
     description: ''
+    valueFrom: az vm list-sizes
   - name: --specialized
     parameterValueGroup: false, true
     summary: Indicate whether the source image is specialized.
     description: ''
+  - name: --ssh-dest-key-path
+    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+    description: ''
+  - name: --ssh-key-name
+    summary: Use it as public key in virtual machine. It should be an existing SSH key resource in Azure.
+    description: ''
+  - name: --ssh-key-values
+    summary: Space-separated list of SSH public keys or public key file paths.
+    description: ''
   - name: --storage-account
     summary: Only applicable when used with `--use-unmanaged-disk`. The name to use when creating a new storage account or referencing an existing one. If omitted, an appropriate storage account in the same resource group and location will be used, or a new one will be created.
     description: ''
@@ -420,204 +420,219 @@ items:
   - name: --storage-sku
     summary: 'The SKU of the storage account with which to persist VM. Use a singular sku that would be applied across all disks, or specify individual disks. Usage: [--storage-sku SKU | --storage-sku ID=SKU ID=SKU ID=SKU...], where each ID is "os" or a 0-indexed lun. Allowed values: Standard_LRS, Premium_LRS.'
     description: ''
-  - name: --use-unmanaged-disk
-    summary: Do not use managed disk to persist VM.
+  - name: --subnet
+    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
+    description: ''
+  - name: --subnet-address-prefix
+    defaultValue: 10.0.0.0/24
+    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --use-unmanaged-disk
+    summary: Do not use managed disk to persist VM.
+    description: ''
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
+    description: ''
+  - name: --vmss
+    summary: Name or ID of an existing virtual machine scale set that the virtual machine should be assigned to. None by default.
+    description: ''
+  - name: --vnet-address-prefix
+    defaultValue: 10.0.0.0/16
+    summary: The IP address prefix to use when creating a new VNet in CIDR format.
+    description: ''
+  - name: --vnet-name
+    summary: Name of the virtual network when creating a new one or referencing an existing one.
+    description: ''
+  - name: --workspace
+    summary: Name or ID of Log Analytics Workspace. If you specify the workspace through its name, the workspace should be in the same resource group with the vm, otherwise a new workspace will be created.
+    description: ''
+  - name: --zone -z
+    parameterValueGroup: 1, 2, 3
+    summary: Availability zone into which to provision the resource.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_deallocate
   name: az vm deallocate
   summary: Deallocate a VM.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image.
+  syntax: >-
+    az vm deallocate [--ids]
+                     [--name]
+                     [--no-wait]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Deallocate, generalize, and capture a stopped virtual machine.
-    syntax:
-      content: >-
-        az vm deallocate -g MyResourceGroup -n MyVm
+    syntax: >-
+      az vm deallocate -g MyResourceGroup -n MyVm
 
-        az vm generalize -g MyResourceGroup -n MyVm
+      az vm generalize -g MyResourceGroup -n MyVm
 
-        az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
+      az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
   - summary: Deallocate, generalize, and capture multiple stopped virtual machines.
-    syntax:
-      content: >-
-        vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: >-
+      vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 
-        az vm deallocate --ids {vms_ids}
+      az vm deallocate --ids {vms_ids}
 
-        az vm generalize --ids {vms_ids}
+      az vm generalize --ids {vms_ids}
 
-        az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
+      az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
   - summary: Deallocate a VM. (autogenerated)
-    syntax:
-      content: az vm deallocate --name MyVm --no-wait --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm deallocate --name MyVm --no-wait --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_delete
   name: az vm delete
   summary: Delete a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm delete [--ids]
+                 [--name]
+                 [--no-wait]
+                 [--resource-group]
+                 [--subscription]
+                 [--yes]
   examples:
   - summary: Delete a VM without a prompt for confirmation.
-    syntax:
-      content: az vm delete -g MyResourceGroup -n MyVm --yes
+    syntax: az vm delete -g MyResourceGroup -n MyVm --yes
   - summary: Delete all VMs in a resource group.
-    syntax:
-      content: az vm delete --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az vm delete --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_generalize
   name: az vm generalize
   summary: Mark a VM as generalized, allowing it to be imaged for multiple deployments.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-capture-image.
+  syntax: >-
+    az vm generalize [--ids]
+                     [--name]
+                     [--no-wait]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Deallocate, generalize, and capture a stopped virtual machine.
-    syntax:
-      content: >-
-        az vm deallocate -g MyResourceGroup -n MyVm
+    syntax: >-
+      az vm deallocate -g MyResourceGroup -n MyVm
 
-        az vm generalize -g MyResourceGroup -n MyVm
+      az vm generalize -g MyResourceGroup -n MyVm
 
-        az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
+      az vm capture -g MyResourceGroup -n MyVm --vhd-name-prefix MyPrefix
   - summary: Deallocate, generalize, and capture multiple stopped virtual machines.
-    syntax:
-      content: >-
-        vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: >-
+      vms_ids=$(az vm list -g MyResourceGroup --query "[].id" -o tsv)
 
-        az vm deallocate --ids {vms_ids}
+      az vm deallocate --ids ${vms_ids}
 
-        az vm generalize --ids {vms_ids}
+      az vm generalize --ids ${vms_ids}
 
-        az vm capture --ids {vms_ids} --vhd-name-prefix MyPrefix
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+      az vm capture --ids ${vms_ids} --vhd-name-prefix MyPrefix
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_get_instance_view
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_get-instance-view
   name: az vm get-instance-view
   summary: Get instance information about a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm get-instance-view [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Use a resource group and name to get instance view information of a VM.
-    syntax:
-      content: az vm get-instance-view -g MyResourceGroup -n MyVm
+    syntax: az vm get-instance-view -g MyResourceGroup -n MyVm
   - summary: Get instance views for all VMs in a resource group.
-    syntax:
-      content: az vm get-instance-view --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm get-instance-view --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_list
   name: az vm list
   summary: List details of Virtual Machines.
-  description: For more information on querying information about Virtual Machines, see <a href="https://docs.microsoft.com/cli/azure/query-az-cli2">https://docs.microsoft.com/cli/azure/query-az-cli2</a>.
-  langs:
-  - azurecli
+  description: '`--resource-group` can pass in an empty string as a parameter, which will output all VM information under the subscription. For more information on querying information about Virtual Machines, see https://docs.microsoft.com/cli/azure/query-az-cli2.'
+  syntax: >-
+    az vm list [--query-examples]
+               [--resource-group]
+               [--show-details]
+               [--subscription]
   examples:
   - summary: List all VMs.
-    syntax:
-      content: az vm list
+    syntax: az vm list
   - summary: List all VMs by resource group.
-    syntax:
-      content: az vm list -g MyResourceGroup
+    syntax: az vm list -g MyResourceGroup
   - summary: List all VMs by resource group with details.
-    syntax:
-      content: az vm list -g MyResourceGroup -d
-  parameters:
+    syntax: az vm list -g MyResourceGroup -d
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --show-details -d
     summary: Show public ip address, FQDN, and power states. command will run slow.
@@ -625,94 +640,82 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_ip_addresses
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-ip-addresses
   name: az vm list-ip-addresses
   summary: List IP addresses associated with a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-ip-addresses [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Get the IP addresses for a VM.
-    syntax:
-      content: az vm list-ip-addresses -g MyResourceGroup -n MyVm
+    syntax: az vm list-ip-addresses -g MyResourceGroup -n MyVm
   - summary: Get IP addresses for all VMs in a resource group.
-    syntax:
-      content: az vm list-ip-addresses --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm list-ip-addresses --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_sizes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-sizes
   name: az vm list-sizes
   summary: List available sizes for VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-sizes --location
+                     [--subscription]
   examples:
   - summary: List the available VM sizes in the West US region.
-    syntax:
-      content: az vm list-sizes -l westus
-  parameters:
+    syntax: az vm list-sizes -l westus
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_skus
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-skus
   name: az vm list-skus
   summary: Get details for compute-related resource SKUs.
   description: This command incorporates subscription level restriction, offering the most accurate information.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-skus [--all {false, true}]
+                    [--location]
+                    [--resource-type]
+                    [--size]
+                    [--subscription]
+                    [--zone {false, true}]
   examples:
   - summary: List all SKUs in the West US region.
-    syntax:
-      content: az vm list-skus -l westus
+    syntax: az vm list-skus -l westus
   - summary: List all available vm sizes in the East US2 region which support availability zone.
-    syntax:
-      content: az vm list-skus -l eastus2 --zone
+    syntax: az vm list-skus -l eastus2 --zone
   - summary: List all available vm sizes in the East US2 region which support availability zone with name like "standard_ds1...".
-    syntax:
-      content: az vm list-skus -l eastus2 --zone --size standard_ds1
+    syntax: az vm list-skus -l eastus2 --zone --size standard_ds1
   - summary: List availability set related sku information in The West US region.
-    syntax:
-      content: az vm list-skus -l westus --resource-type availabilitySets
-  parameters:
+    syntax: az vm list-skus -l westus --resource-type availabilitySets
+  optionalParameters:
   - name: --all
     parameterValueGroup: false, true
     summary: Show all information including vm sizes not available under the current subscription.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --resource-type -r
     summary: Resource types e.g. "availabilitySets", "snapshots", "disks", etc.
@@ -720,99 +723,99 @@ items:
   - name: --size -s
     summary: Size name, partial name is accepted.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --zone -z
     parameterValueGroup: false, true
     summary: Show skus supporting availability zones.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_usage
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-usage
   name: az vm list-usage
   summary: List available usage resources for VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-usage --location
+                     [--subscription]
   examples:
   - summary: Get the compute resource usage for the West US region.
-    syntax:
-      content: az vm list-usage -l westus
-  parameters:
+    syntax: az vm list-usage -l westus
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_list_vm_resize_options
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_list-vm-resize-options
   name: az vm list-vm-resize-options
   summary: List available resizing options for VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm list-vm-resize-options [--ids]
+                                 [--name]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List all available VM sizes for resizing.
-    syntax:
-      content: az vm list-vm-resize-options -g MyResourceGroup -n MyVm
+    syntax: az vm list-vm-resize-options -g MyResourceGroup -n MyVm
   - summary: List available sizes for all VMs in a resource group.
-    syntax:
-      content: az vm list-vm-resize-options --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm list-vm-resize-options --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_open_port
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_open-port
   name: az vm open-port
   summary: Opens a VM to inbound traffic on specified ports.
   description: Adds a security rule to the network security group (NSG) that is attached to the VM's network interface (NIC) or subnet. The existing NSG will be used or a new one will be created. The rule name is 'open-port-{port}' and will overwrite an existing rule with this name. For multi-NIC VMs, or for more fine-grained control, use the appropriate network commands directly (nsg rule create, etc).
-  langs:
-  - azurecli
+  syntax: >-
+    az vm open-port --port
+                    [--apply-to-subnet]
+                    [--ids]
+                    [--name]
+                    [--nsg-name]
+                    [--priority]
+                    [--resource-group]
+                    [--subscription]
   examples:
   - summary: Open all ports on a VM to inbound traffic.
-    syntax:
-      content: az vm open-port -g MyResourceGroup -n MyVm --port '*'
+    syntax: az vm open-port -g MyResourceGroup -n MyVm --port '*'
   - summary: Open a range of ports on a VM to inbound traffic with the highest priority.
-    syntax:
-      content: az vm open-port -g MyResourceGroup -n MyVm --port 80-100 --priority 100
+    syntax: az vm open-port -g MyResourceGroup -n MyVm --port 80-100 --priority 100
+  - summary: Open ports 555, 557, 558, and 559 to inbound traffic with the highest priority.
+    syntax: az vm open-port -g MyResourceGroup -n MyVm --port 555,557-559 --priority 100
   - summary: Open all ports for all VMs in a resource group.
-    syntax:
-      content: az vm open-port --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv) --port '*'
-  parameters:
+    syntax: az vm open-port --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv) --port '*'
+  requiredParameters:
   - isRequired: true
     name: --port
-    summary: "The port or port range (ex: 80-100) to open inbound traffic to. Use '\\*' to allow traffic to all ports."
+    summary: "The port or port range (ex: 80-100) to open inbound traffic to. Use '\\*' to allow traffic to all ports. Use comma separated values to specify more than one port or port range."
     description: ''
+  optionalParameters:
   - name: --apply-to-subnet
     summary: Allow inbound traffic on the subnet instead of the NIC.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the virtual machine to open inbound traffic on.
+    description: ''
   - name: --nsg-name
     summary: The name of the network security group to create if one does not exist. Ignored if an NSG already exists.
     description: ''
@@ -820,314 +823,306 @@ items:
     defaultValue: "900"
     summary: Rule priority, between 100 (highest priority) and 4096 (lowest priority). Must be unique for each rule in the collection.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the virtual machine to open inbound traffic on.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_perform_maintenance
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_perform-maintenance
   name: az vm perform-maintenance
   summary: The operation to perform maintenance on a virtual machine.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vm perform-maintenance [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_redeploy
   name: az vm redeploy
   summary: Redeploy an existing VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm redeploy [--ids]
+                   [--name]
+                   [--no-wait]
+                   [--resource-group]
+                   [--subscription]
   examples:
   - summary: Redeploy a VM.
-    syntax:
-      content: az vm redeploy -g MyResourceGroup -n MyVm
+    syntax: az vm redeploy -g MyResourceGroup -n MyVm
   - summary: Redeploy all VMs in a resource group.
-    syntax:
-      content: az vm redeploy --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm redeploy --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_resize
   name: az vm resize
   summary: Update a VM's size.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm resize --size
+                 [--ids]
+                 [--name]
+                 [--no-wait]
+                 [--resource-group]
+                 [--subscription]
   examples:
   - summary: Resize a VM.
-    syntax:
-      content: az vm resize -g MyResourceGroup -n MyVm --size Standard_DS3_v2
+    syntax: az vm resize -g MyResourceGroup -n MyVm --size Standard_DS3_v2
   - summary: Resize all VMs in a resource group.
-    syntax:
-      content: az vm resize --size Standard_DS3_v2 --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm resize --size Standard_DS3_v2 --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  requiredParameters:
   - isRequired: true
     name: --size
     summary: The VM size.
     description: ''
     valueFrom: az vm list-vm-resize-options
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_restart
   name: az vm restart
   summary: Restart VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm restart [--force]
+                  [--ids]
+                  [--name]
+                  [--no-wait]
+                  [--resource-group]
+                  [--subscription]
   examples:
   - summary: Restart a VM.
-    syntax:
-      content: az vm restart -g MyResourceGroup -n MyVm
+    syntax: az vm restart -g MyResourceGroup -n MyVm
   - summary: Restart all VMs in a resource group.
-    syntax:
-      content: az vm restart --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm restart --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --force
     summary: Force the VM to restart by redeploying it. Use if the VM is unresponsive.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_show
   name: az vm show
   summary: Get the details of a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm show [--ids]
+               [--name]
+               [--query-examples]
+               [--resource-group]
+               [--show-details]
+               [--subscription]
   examples:
   - summary: Show information about a VM.
-    syntax:
-      content: az vm show -g MyResourceGroup -n MyVm -d
+    syntax: az vm show -g MyResourceGroup -n MyVm -d
   - summary: Get the details for all VMs in a resource group.
-    syntax:
-      content: az vm show -d --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --show-details -d
-    summary: Show public ip address, FQDN, and power states. command will run slow.
-    description: ''
+    syntax: az vm show -d --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --show-details -d
+    summary: Show public ip address, FQDN, and power states. command will run slow.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_start
   name: az vm start
   summary: Start a stopped VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm start [--ids]
+                [--name]
+                [--no-wait]
+                [--resource-group]
+                [--subscription]
   examples:
   - summary: Start a stopped VM.
-    syntax:
-      content: az vm start -g MyResourceGroup -n MyVm
+    syntax: az vm start -g MyResourceGroup -n MyVm
   - summary: Start all VMs in a resource group.
-    syntax:
-      content: az vm start --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm start --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Start a stopped VM. (autogenerated)
-    syntax:
-      content: az vm start --name MyVm --no-wait --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm start --name MyVm --no-wait --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_stop
   name: az vm stop
   summary: Power off (stop) a running VM.
   description: The VM will continue to be billed. To avoid this, you can deallocate the VM through "az vm deallocate".
-  langs:
-  - azurecli
+  syntax: >-
+    az vm stop [--ids]
+               [--name]
+               [--no-wait]
+               [--resource-group]
+               [--subscription]
   examples:
   - summary: Power off (stop) a running VM.
-    syntax:
-      content: az vm stop --resource-group MyResourceGroup --name MyVm
+    syntax: az vm stop --resource-group MyResourceGroup --name MyVm
   - summary: Power off a running VM without shutting down.
-    syntax:
-      content: az vm stop --resource-group MyResourceGroup --name MyVm --skip-shutdown
+    syntax: az vm stop --resource-group MyResourceGroup --name MyVm --skip-shutdown
   - summary: Power off VMs in a resource group.
-    syntax:
-      content: az vm stop --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm stop --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_update
   name: az vm update
   summary: Update the properties of a VM.
   description: Update VM objects and properties using paths that correspond to 'az vm show'.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm update [--add]
+                 [--disk-caching]
+                 [--force-string]
+                 [--ids]
+                 [--license-type {None, RHEL_BYOS, RHEL_ELS_6, SLES_BYOS, Windows_Client, Windows_Server}]
+                 [--name]
+                 [--no-wait]
+                 [--remove]
+                 [--resource-group]
+                 [--set]
+                 [--subscription]
+                 [--workspace]
   examples:
   - summary: Add or update a tag.
-    syntax:
-      content: az vm update -n name -g group --set tags.tagName=tagValue
+    syntax: az vm update -n name -g group --set tags.tagName=tagValue
   - summary: Remove a tag.
-    syntax:
-      content: az vm update -n name -g group --remove tags.tagName
+    syntax: az vm update -n name -g group --remove tags.tagName
   - summary: Set the primary NIC of a VM.
-    syntax:
-      content: az vm update -n name -g group --set networkProfile.networkInterfaces[1].primary=false networkProfile.networkInterfaces[0].primary=true
+    syntax: az vm update -n name -g group --set networkProfile.networkInterfaces[1].primary=false networkProfile.networkInterfaces[0].primary=true
   - summary: Add a new non-primary NIC to a VM.
-    syntax:
-      content: az vm update -n name -g group --add networkProfile.networkInterfaces primary=false id={NIC_ID}
+    syntax: az vm update -n name -g group --add networkProfile.networkInterfaces primary=false id={NIC_ID}
   - summary: Remove the fourth NIC from a VM.
-    syntax:
-      content: az vm update -n name -g group --remove networkProfile.networkInterfaces 3
-  parameters:
+    syntax: az vm update -n name -g group --remove networkProfile.networkInterfaces 3
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --disk-caching
     summary: Use singular value to apply across, or specify individual disks, e.g. 'os=ReadWrite 0=None 1=ReadOnly' should enable update os disk and 2 data disks.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
+    parameterValueGroup: None, RHEL_BYOS, RHEL_ELS_6, SLES_BYOS, Windows_Client, Windows_Server
     summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -1135,50 +1130,29 @@ items:
   - name: --workspace
     summary: Name or ID of Log Analytics Workspace. If you specify the workspace through its name, the workspace should be in the same resource group with the vm, otherwise a new workspace will be created.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
-  - name: --set
-    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_wait
   name: az vm wait
   summary: Place the CLI in a waiting state until a condition of the VM is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm wait [--created]
+               [--custom]
+               [--deleted]
+               [--exists]
+               [--ids]
+               [--interval]
+               [--name]
+               [--resource-group]
+               [--subscription]
+               [--timeout]
+               [--updated]
   examples:
   - summary: Wait until a VM is created.
-    syntax:
-      content: az vm wait -g MyResourceGroup -n MyVm --created
+    syntax: az vm wait -g MyResourceGroup -n MyVm --created
   - summary: Wait until all VMs in a resource group are deleted.
-    syntax:
-      content: az vm wait --deleted --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az vm wait --deleted --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -1191,10 +1165,22 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -1202,304 +1188,114 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_auto_shutdown
-  name: az vm auto-shutdown
-  summary: Manage auto-shutdown for VM.
-- uid: az_vm_availability_set
-  name: az vm availability-set
-  summary: Group resources into availability sets.
-- uid: az_vm_availability_set_convert
-  name: az vm availability-set convert
-  summary: Convert an Azure Availability Set to contain VMs with managed disks.
-- uid: az_vm_availability_set_create
-  name: az vm availability-set create
-  summary: Create an Azure Availability Set.
-- uid: az_vm_availability_set_delete
-  name: az vm availability-set delete
-  summary: Delete an availability set.
-- uid: az_vm_availability_set_list
-  name: az vm availability-set list
-  summary: List availability sets.
-- uid: az_vm_availability_set_list_sizes
-  name: az vm availability-set list-sizes
-  summary: List VM sizes for an availability set.
-- uid: az_vm_availability_set_show
-  name: az vm availability-set show
-  summary: Get information for an availability set.
-- uid: az_vm_availability_set_update
-  name: az vm availability-set update
-  summary: Update an Azure Availability Set.
-- uid: az_vm_boot_diagnostics
-  name: az vm boot-diagnostics
-  summary: Troubleshoot the startup of an Azure Virtual Machine.
-- uid: az_vm_boot_diagnostics_disable
-  name: az vm boot-diagnostics disable
-  summary: Disable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_enable
-  name: az vm boot-diagnostics enable
-  summary: Enable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_get_boot_log
-  name: az vm boot-diagnostics get-boot-log
-  summary: Get the boot diagnostics log from a VM.
-- uid: az_vm_capture
-  name: az vm capture
-  summary: Capture information for a stopped VM.
-- uid: az_vm_convert
-  name: az vm convert
-  summary: Convert a VM with unmanaged disks to use managed disks.
-- uid: az_vm_create
-  name: az vm create
-  summary: Create an Azure Virtual Machine.
-- uid: az_vm_deallocate
-  name: az vm deallocate
-  summary: Deallocate a VM.
-- uid: az_vm_delete
-  name: az vm delete
-  summary: Delete a VM.
-- uid: az_vm_diagnostics
-  name: az vm diagnostics
-  summary: Configure the Azure Virtual Machine diagnostics extension.
-- uid: az_vm_diagnostics_get_default_config
-  name: az vm diagnostics get-default-config
-  summary: Get the default configuration settings for a VM.
-- uid: az_vm_diagnostics_set
-  name: az vm diagnostics set
-  summary: Configure the Azure VM diagnostics extension.
-- uid: az_vm_disk
-  name: az vm disk
-  summary: Manage the managed data disks attached to a VM.
-- uid: az_vm_disk_attach
-  name: az vm disk attach
-  summary: Attach a managed persistent disk to a VM.
-- uid: az_vm_disk_detach
-  name: az vm disk detach
-  summary: Detach a managed disk from a VM.
-- uid: az_vm_encryption
-  name: az vm encryption
-  summary: Manage encryption of VM disks.
-- uid: az_vm_encryption_disable
-  name: az vm encryption disable
-  summary: Disable disk encryption on the OS disk and/or data disks. Decrypt mounted disks.
-- uid: az_vm_encryption_enable
-  name: az vm encryption enable
-  summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks.
-- uid: az_vm_encryption_show
-  name: az vm encryption show
-  summary: Show encryption status.
-- uid: az_vm_extension
-  name: az vm extension
-  summary: Manage extensions on VMs.
-- uid: az_vm_extension_delete
-  name: az vm extension delete
-  summary: Remove an extension attached to a VM.
-- uid: az_vm_extension_image
-  name: az vm extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vm_extension_image_list
-  name: az vm extension image list
-  summary: List the information on available extensions.
-- uid: az_vm_extension_image_list_names
-  name: az vm extension image list-names
-  summary: List the names of available extensions.
-- uid: az_vm_extension_image_list_versions
-  name: az vm extension image list-versions
-  summary: List the versions for available extensions.
-- uid: az_vm_extension_image_show
-  name: az vm extension image show
-  summary: Display information for an extension.
-- uid: az_vm_extension_list
-  name: az vm extension list
-  summary: List the extensions attached to a VM.
-- uid: az_vm_extension_set
-  name: az vm extension set
-  summary: Set extensions for a VM.
-- uid: az_vm_extension_show
-  name: az vm extension show
-  summary: Display information about extensions attached to a VM.
-- uid: az_vm_extension_wait
-  name: az vm extension wait
-  summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met.
-- uid: az_vm_generalize
-  name: az vm generalize
-  summary: Mark a VM as generalized, allowing it to be imaged for multiple deployments.
-- uid: az_vm_get_instance_view
-  name: az vm get-instance-view
-  summary: Get instance information about a VM.
-- uid: az_vm_identity
-  name: az vm identity
-  summary: Manage service identities of a VM.
-- uid: az_vm_identity_assign
-  name: az vm identity assign
-  summary: Enable managed service identity on a VM.
-- uid: az_vm_identity_show
-  name: az vm identity show
-  summary: Display VM's managed identity info.
-- uid: az_vm_image
-  name: az vm image
-  summary: Information on available virtual machine images.
-- uid: az_vm_image_accept_terms
-  name: az vm image accept-terms
-  summary: Accept Azure Marketplace term so that the image can be used to create VMs.
-- uid: az_vm_image_list
-  name: az vm image list
-  summary: List the VM/VMSS images available in the Azure Marketplace.
-- uid: az_vm_image_list_offers
-  name: az vm image list-offers
-  summary: List the VM image offers available in the Azure Marketplace.
-- uid: az_vm_image_list_publishers
-  name: az vm image list-publishers
-  summary: List the VM image publishers available in the Azure Marketplace.
-- uid: az_vm_image_list_skus
-  name: az vm image list-skus
-  summary: List the VM image SKUs available in the Azure Marketplace.
-- uid: az_vm_image_show
-  name: az vm image show
-  summary: Get the details for a VM image available in the Azure Marketplace.
-- uid: az_vm_image_terms
-  name: az vm image terms
-  summary: Manage Azure Marketplace image terms.
-- uid: az_vm_image_terms_accept
-  name: az vm image terms accept
-  summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-- uid: az_vm_image_terms_cancel
-  name: az vm image terms cancel
-  summary: Cancel Azure Marketplace image terms.
-- uid: az_vm_image_terms_show
-  name: az vm image terms show
-  summary: Get the details of Azure Marketplace image terms.
-- uid: az_vm_list
-  name: az vm list
-  summary: List details of Virtual Machines.
-- uid: az_vm_list_ip_addresses
-  name: az vm list-ip-addresses
-  summary: List IP addresses associated with a VM.
-- uid: az_vm_list_sizes
-  name: az vm list-sizes
-  summary: List available sizes for VMs.
-- uid: az_vm_list_skus
-  name: az vm list-skus
-  summary: Get details for compute-related resource SKUs.
-- uid: az_vm_list_usage
-  name: az vm list-usage
-  summary: List available usage resources for VMs.
-- uid: az_vm_list_vm_resize_options
-  name: az vm list-vm-resize-options
-  summary: List available resizing options for VMs.
-- uid: az_vm_monitor
-  name: az vm monitor
-  summary: Manage monitor aspect for a vm.
-- uid: az_vm_monitor_log
-  name: az vm monitor log
-  summary: Manage log analytics workspace for a vm.
-- uid: az_vm_monitor_log_show
-  name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
-- uid: az_vm_nic
-  name: az vm nic
-  summary: Manage network interfaces. See also `az network nic`.
-- uid: az_vm_nic_add
-  name: az vm nic add
-  summary: Add existing NICs to a VM.
-- uid: az_vm_nic_list
-  name: az vm nic list
-  summary: List the NICs available on a VM.
-- uid: az_vm_nic_remove
-  name: az vm nic remove
-  summary: Remove NICs from a VM.
-- uid: az_vm_nic_set
-  name: az vm nic set
-  summary: Configure settings of a NIC attached to a VM.
-- uid: az_vm_nic_show
-  name: az vm nic show
-  summary: Display information for a NIC attached to a VM.
-- uid: az_vm_open_port
-  name: az vm open-port
-  summary: Opens a VM to inbound traffic on specified ports.
-- uid: az_vm_perform_maintenance
-  name: az vm perform-maintenance
-  summary: The operation to perform maintenance on a virtual machine.
-- uid: az_vm_redeploy
-  name: az vm redeploy
-  summary: Redeploy an existing VM.
-- uid: az_vm_resize
-  name: az vm resize
-  summary: Update a VM's size.
-- uid: az_vm_restart
-  name: az vm restart
-  summary: Restart VMs.
-- uid: az_vm_run_command
-  name: az vm run-command
-  summary: Manage run commands on a Virtual Machine.
-- uid: az_vm_run_command_invoke
-  name: az vm run-command invoke
-  summary: Execute a specific run command on a vm.
-- uid: az_vm_run_command_list
-  name: az vm run-command list
-  summary: Lists all available run commands for a subscription in a location.
-- uid: az_vm_run_command_show
-  name: az vm run-command show
-  summary: Gets specific run command for a subscription in a location.
-- uid: az_vm_secret
-  name: az vm secret
-  summary: Manage VM secrets.
-- uid: az_vm_secret_add
-  name: az vm secret add
-  summary: Add a secret to a VM.
-- uid: az_vm_secret_format
-  name: az vm secret format
-  summary: Transform secrets into a form that can be used by VMs and VMSSes.
-- uid: az_vm_secret_list
-  name: az vm secret list
-  summary: List secrets on a VM.
-- uid: az_vm_secret_remove
-  name: az vm secret remove
-  summary: Remove a secret from a VM.
-- uid: az_vm_show
-  name: az vm show
-  summary: Get the details of a VM.
-- uid: az_vm_start
-  name: az vm start
-  summary: Start a stopped VM.
-- uid: az_vm_stop
-  name: az vm stop
-  summary: Power off (stop) a running VM.
-- uid: az_vm_unmanaged_disk
-  name: az vm unmanaged-disk
-  summary: Manage the unmanaged data disks attached to a VM.
-- uid: az_vm_unmanaged_disk_attach
-  name: az vm unmanaged-disk attach
-  summary: Attach an unmanaged persistent disk to a VM.
-- uid: az_vm_unmanaged_disk_detach
-  name: az vm unmanaged-disk detach
-  summary: Detach an unmanaged disk from a VM.
-- uid: az_vm_unmanaged_disk_list
-  name: az vm unmanaged-disk list
-  summary: List unmanaged disks of a VM.
-- uid: az_vm_update
-  name: az vm update
-  summary: Update the properties of a VM.
-- uid: az_vm_user
-  name: az vm user
-  summary: Manage user accounts for a VM.
-- uid: az_vm_user_delete
-  name: az vm user delete
-  summary: Delete a user account from a VM.
-- uid: az_vm_user_reset_ssh
-  name: az vm user reset-ssh
-  summary: Reset the SSH configuration on a VM.
-- uid: az_vm_user_update
-  name: az vm user update
-  summary: Update a user account.
-- uid: az_vm_wait
-  name: az vm wait
-  summary: Place the CLI in a waiting state until a condition of the VM is met.
+- az_vm_aem
+- az_vm_aem_delete
+- az_vm_aem_set
+- az_vm_aem_verify
+- az_vm_auto-shutdown
+- az_vm_availability-set
+- az_vm_availability-set_convert
+- az_vm_availability-set_create
+- az_vm_availability-set_delete
+- az_vm_availability-set_list
+- az_vm_availability-set_list-sizes
+- az_vm_availability-set_show
+- az_vm_availability-set_update
+- az_vm_boot-diagnostics
+- az_vm_boot-diagnostics_disable
+- az_vm_boot-diagnostics_enable
+- az_vm_boot-diagnostics_get-boot-log
+- az_vm_capture
+- az_vm_convert
+- az_vm_create
+- az_vm_deallocate
+- az_vm_delete
+- az_vm_diagnostics
+- az_vm_diagnostics_get-default-config
+- az_vm_diagnostics_set
+- az_vm_disk
+- az_vm_disk_attach
+- az_vm_disk_detach
+- az_vm_encryption
+- az_vm_encryption_disable
+- az_vm_encryption_enable
+- az_vm_encryption_show
+- az_vm_extension
+- az_vm_extension_delete
+- az_vm_extension_image
+- az_vm_extension_image_list
+- az_vm_extension_image_list-names
+- az_vm_extension_image_list-versions
+- az_vm_extension_image_show
+- az_vm_extension_list
+- az_vm_extension_set
+- az_vm_extension_show
+- az_vm_extension_wait
+- az_vm_generalize
+- az_vm_get-instance-view
+- az_vm_identity
+- az_vm_identity_assign
+- az_vm_identity_show
+- az_vm_image
+- az_vm_image_accept-terms
+- az_vm_image_list
+- az_vm_image_list-offers
+- az_vm_image_list-publishers
+- az_vm_image_list-skus
+- az_vm_image_show
+- az_vm_image_terms
+- az_vm_image_terms_accept
+- az_vm_image_terms_cancel
+- az_vm_image_terms_show
+- az_vm_list
+- az_vm_list-ip-addresses
+- az_vm_list-sizes
+- az_vm_list-skus
+- az_vm_list-usage
+- az_vm_list-vm-resize-options
+- az_vm_monitor
+- az_vm_monitor_log
+- az_vm_monitor_log_show
+- az_vm_nic
+- az_vm_nic_add
+- az_vm_nic_list
+- az_vm_nic_remove
+- az_vm_nic_set
+- az_vm_nic_show
+- az_vm_open-port
+- az_vm_perform-maintenance
+- az_vm_redeploy
+- az_vm_repair
+- az_vm_repair_create
+- az_vm_repair_list-scripts
+- az_vm_repair_restore
+- az_vm_repair_run
+- az_vm_resize
+- az_vm_restart
+- az_vm_run-command
+- az_vm_run-command_invoke
+- az_vm_run-command_list
+- az_vm_run-command_show
+- az_vm_secret
+- az_vm_secret_add
+- az_vm_secret_format
+- az_vm_secret_list
+- az_vm_secret_remove
+- az_vm_show
+- az_vm_start
+- az_vm_stop
+- az_vm_unmanaged-disk
+- az_vm_unmanaged-disk_attach
+- az_vm_unmanaged-disk_detach
+- az_vm_unmanaged-disk_list
+- az_vm_update
+- az_vm_user
+- az_vm_user_delete
+- az_vm_user_reset-ssh
+- az_vm_user_update
+- az_vm_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1515,10 +1311,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage Linux or Windows virtual machines.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage Linux or Windows virtual machines.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/aem.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/aem.yml
new file mode 100644
index 0000000000..f0f5bad17c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/aem.yml
@@ -0,0 +1,102 @@
+### YamlMime:AzureCLIGroup
+uid: az_vm_aem
+name: az vm aem
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aem** extension for Azure CLI and requires version 2.19.1 or higher.  The extension will automatically install the first time you run an **az vm aem** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Enhanced Monitoring Extension for SAP.
+description: ''
+directCommands:
+- uid: az_vm_aem_delete
+  name: az vm aem delete
+  summary: Remove Azure Enhanced Monitoring Extension.
+  description: ''
+  syntax: >-
+    az vm aem delete --name
+                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vm_aem_set
+  name: az vm aem set
+  summary: Configure Azure Enhanced Monitoring Extension.
+  description: It can take up to 15 minutes for the monitoring data to appear in the SAP system.
+  syntax: >-
+    az vm aem set --name
+                  --resource-group
+                  [--install-new-extension]
+                  [--set-access-to-individual-resources]
+                  [--skip-storage-analytics]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --install-new-extension -i
+    summary: Install the new VM Extension for SAP.
+    description: ''
+  - name: --set-access-to-individual-resources -s
+    summary: Set the access of the VM identity to the individual resources, e.g. data disks instead of the complete resource group.
+    description: ''
+  - name: --skip-storage-analytics
+    summary: Skip enabling analytics on storage accounts.
+    description: ''
+- uid: az_vm_aem_verify
+  name: az vm aem verify
+  summary: Verify Azure Enhanced Monitoring Extensions configured correctly.
+  description: ''
+  syntax: >-
+    az vm aem verify --name
+                     --resource-group
+                     [--skip-storage-check]
+                     [--wait-time-in-minutes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --skip-storage-check
+    summary: Disables the test for table content.
+    description: ''
+  - name: --wait-time-in-minutes
+    defaultValue: "15"
+    summary: Maximum minutes to wait for the storage metrics to be available.
+    description: ''
+commands:
+- az_vm_aem_delete
+- az_vm_aem_set
+- az_vm_aem_verify
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Enhanced Monitoring Extension for SAP.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/availability-set.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/availability-set.yml
index d524f51df4..c4506f541d 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/availability-set.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/availability-set.yml
@@ -1,33 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_availability_set
-  name: az vm availability-set
-  summary: Group resources into availability sets.
-  description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
-  langs:
-  - azurecli
-  children:
-  - az_vm_availability_set_convert
-  - az_vm_availability_set_create
-  - az_vm_availability_set_delete
-  - az_vm_availability_set_list
-  - az_vm_availability_set_list_sizes
-  - az_vm_availability_set_show
-  - az_vm_availability_set_update
-- uid: az_vm_availability_set_convert
+### YamlMime:AzureCLIGroup
+uid: az_vm_availability-set
+name: az vm availability-set
+summary: Group resources into availability sets.
+description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
+directCommands:
+- uid: az_vm_availability-set_convert
   name: az vm availability-set convert
   summary: Convert an Azure Availability Set to contain VMs with managed disks.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set convert [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
   examples:
   - summary: Convert an availabiity set to use managed disks by name.
-    syntax:
-      content: az vm availability-set convert -g MyResourceGroup -n MyAvSet
+    syntax: az vm availability-set convert -g MyResourceGroup -n MyAvSet
   - summary: Convert an availability set to use managed disks by ID.
-    syntax:
-      content: az vm availability-set convert --ids $(az vm availability-set list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm availability-set convert --ids $(az vm availability-set list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -35,38 +26,42 @@ items:
     summary: Name of the availability set.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_create
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_create
   name: az vm availability-set create
   summary: Create an Azure Availability Set.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability">https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability</a>.
-  langs:
-  - azurecli
+  description: For more information, see https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-manage-availability.
+  syntax: >-
+    az vm availability-set create --name
+                                  --resource-group
+                                  [--location]
+                                  [--no-wait]
+                                  [--platform-fault-domain-count]
+                                  [--platform-update-domain-count]
+                                  [--subscription]
+                                  [--tags]
+                                  [--unmanaged]
+                                  [--validate]
   examples:
   - summary: Create an availability set.
-    syntax:
-      content: az vm availability-set create -n MyAvSet -g MyResourceGroup --platform-fault-domain-count 2 --platform-update-domain-count 2
-  parameters:
+    syntax: az vm availability-set create -n MyAvSet -g MyResourceGroup --platform-fault-domain-count 2 --platform-update-domain-count 2
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the availability set.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -78,6 +73,9 @@ items:
   - name: --platform-update-domain-count
     summary: Update Domain count. If unspecified, the server will pick the most optimal number like 5.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
@@ -87,26 +85,20 @@ items:
   - name: --validate
     summary: Generate and validate the ARM template without creating any resources.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_delete
   name: az vm availability-set delete
   summary: Delete an availability set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set delete [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
   examples:
   - summary: Delete an availability set.
-    syntax:
-      content: az vm availability-set delete -n MyAvSet -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set delete -n MyAvSet -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -114,51 +106,47 @@ items:
     summary: Name of the availability set.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_list
   name: az vm availability-set list
   summary: List availability sets.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set list [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: List availability sets.
-    syntax:
-      content: az vm availability-set list -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_list_sizes
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_list-sizes
   name: az vm availability-set list-sizes
   summary: List VM sizes for an availability set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set list-sizes [--ids]
+                                      [--name]
+                                      [--resource-group]
+                                      [--subscription]
   examples:
   - summary: List VM sizes for an availability set.
-    syntax:
-      content: az vm availability-set list-sizes -n MyAvSet -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set list-sizes -n MyAvSet -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -166,115 +154,96 @@ items:
     summary: Name of the availability set.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_show
   name: az vm availability-set show
   summary: Get information for an availability set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set show [--ids]
+                                [--name]
+                                [--query-examples]
+                                [--resource-group]
+                                [--subscription]
   examples:
   - summary: Get information about an availability set.
-    syntax:
-      content: az vm availability-set show -n MyAvSet -g MyResourceGroup
-  parameters:
+    syntax: az vm availability-set show -n MyAvSet -g MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the availability set.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_availability_set_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_availability-set_update
   name: az vm availability-set update
   summary: Update an Azure Availability Set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm availability-set update [--add]
+                                  [--force-string]
+                                  [--ids]
+                                  [--name]
+                                  [--remove]
+                                  [--resource-group]
+                                  [--set]
+                                  [--subscription]
   examples:
   - summary: Update an availability set.
-    syntax:
-      content: az vm availability-set update -n MyAvSet -g MyResourceGroup
+    syntax: az vm availability-set update -n MyAvSet -g MyResourceGroup
   - summary: Update an availability set tag.
-    syntax:
-      content: az vm availability-set update -n MyAvSet -g MyResourceGroup --set tags.foo=value
+    syntax: az vm availability-set update -n MyAvSet -g MyResourceGroup --set tags.foo=value
   - summary: Remove an availability set tag.
-    syntax:
-      content: az vm availability-set update -n MyAvSet -g MyResourceGroup --remove tags.foo
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the availability set.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az vm availability-set update -n MyAvSet -g MyResourceGroup --remove tags.foo
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: Name of the availability set.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_availability_set_convert
-  name: az vm availability-set convert
-  summary: Convert an Azure Availability Set to contain VMs with managed disks.
-- uid: az_vm_availability_set_create
-  name: az vm availability-set create
-  summary: Create an Azure Availability Set.
-- uid: az_vm_availability_set_delete
-  name: az vm availability-set delete
-  summary: Delete an availability set.
-- uid: az_vm_availability_set_list
-  name: az vm availability-set list
-  summary: List availability sets.
-- uid: az_vm_availability_set_list_sizes
-  name: az vm availability-set list-sizes
-  summary: List VM sizes for an availability set.
-- uid: az_vm_availability_set_show
-  name: az vm availability-set show
-  summary: Get information for an availability set.
-- uid: az_vm_availability_set_update
-  name: az vm availability-set update
-  summary: Update an Azure Availability Set.
+- az_vm_availability-set_convert
+- az_vm_availability-set_create
+- az_vm_availability-set_delete
+- az_vm_availability-set_list
+- az_vm_availability-set_list-sizes
+- az_vm_availability-set_show
+- az_vm_availability-set_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -290,10 +259,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: To provide redundancy to an application, it is recommended to group two or more virtual machines in an availability set. This configuration ensures that during either a planned or unplanned maintenance event, at least one virtual machine will be available.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/boot-diagnostics.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/boot-diagnostics.yml
index 73e5ac1fea..7eb6931808 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/boot-diagnostics.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/boot-diagnostics.yml
@@ -1,125 +1,101 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_boot_diagnostics
-  name: az vm boot-diagnostics
-  summary: Troubleshoot the startup of an Azure Virtual Machine.
-  description: Use this feature to troubleshoot boot failures for custom or platform images.
-  langs:
-  - azurecli
-  children:
-  - az_vm_boot_diagnostics_disable
-  - az_vm_boot_diagnostics_enable
-  - az_vm_boot_diagnostics_get_boot_log
-- uid: az_vm_boot_diagnostics_disable
+### YamlMime:AzureCLIGroup
+uid: az_vm_boot-diagnostics
+name: az vm boot-diagnostics
+summary: Troubleshoot the startup of an Azure Virtual Machine.
+description: Use this feature to troubleshoot boot failures for custom or platform images.
+directCommands:
+- uid: az_vm_boot-diagnostics_disable
   name: az vm boot-diagnostics disable
   summary: Disable the boot diagnostics on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm boot-diagnostics disable [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
   examples:
   - summary: Disable boot diagnostics on all VMs in a resource group.
-    syntax:
-      content: az vm boot-diagnostics disable --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm boot-diagnostics disable --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Disable the boot diagnostics on a VM
-    syntax:
-      content: az vm boot-diagnostics disable --ids $(az vm list --resource-group MyResourceGroup --query "[].id" -o tsv) --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm boot-diagnostics disable --ids $(az vm list --resource-group MyResourceGroup --query "[].id" -o tsv) --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_boot_diagnostics_enable
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_boot-diagnostics_enable
   name: az vm boot-diagnostics enable
   summary: Enable the boot diagnostics on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm boot-diagnostics enable [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--storage]
+                                  [--subscription]
   examples:
   - summary: Enable boot diagnostics on all VMs in a resource group.
-    syntax:
-      content: az vm boot-diagnostics enable --storage https://mystor.blob.core.windows.net/ --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm boot-diagnostics enable --storage https://mystor.blob.core.windows.net/ --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Enable the boot diagnostics on a VM. (autogenerated)
-    syntax:
-      content: az vm boot-diagnostics enable --name MyVirtualMachine --resource-group MyResourceGroup --storage https://mystor.blob.core.windows.net/
-  parameters:
-  - isRequired: true
-    name: --storage
-    summary: Name or URI of a storage account (e.g. <a href="https://your_storage_account_name.blob.core.windows.net/">https://your_storage_account_name.blob.core.windows.net/</a>).
-    description: ''
+    syntax: az vm boot-diagnostics enable --name MyVirtualMachine --resource-group MyResourceGroup --storage https://mystor.blob.core.windows.net/
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --storage
+    summary: Name or URI of a storage account (e.g. https://your_storage_account_name.blob.core.windows.net/). If it's not specified, managed storage will be used.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_boot_diagnostics_get_boot_log
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_boot-diagnostics_get-boot-log
   name: az vm boot-diagnostics get-boot-log
   summary: Get the boot diagnostics log from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm boot-diagnostics get-boot-log [--ids]
+                                        [--name]
+                                        [--resource-group]
+                                        [--subscription]
   examples:
   - summary: Get diagnostics logs for all VMs in a resource group.
-    syntax:
-      content: az vm boot-diagnostics get-boot-log --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+    syntax: az vm boot-diagnostics get-boot-log --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
   - summary: Get the boot diagnostics log from a VM. (autogenerated)
-    syntax:
-      content: az vm boot-diagnostics get-boot-log --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm boot-diagnostics get-boot-log --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_boot_diagnostics_disable
-  name: az vm boot-diagnostics disable
-  summary: Disable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_enable
-  name: az vm boot-diagnostics enable
-  summary: Enable the boot diagnostics on a VM.
-- uid: az_vm_boot_diagnostics_get_boot_log
-  name: az vm boot-diagnostics get-boot-log
-  summary: Get the boot diagnostics log from a VM.
+- az_vm_boot-diagnostics_disable
+- az_vm_boot-diagnostics_enable
+- az_vm_boot-diagnostics_get-boot-log
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -135,10 +111,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Use this feature to troubleshoot boot failures for custom or platform images.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Use this feature to troubleshoot boot failures for custom or platform images.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/diagnostics.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/diagnostics.yml
index 7e6cabfef4..bf7976ad93 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/diagnostics.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/diagnostics.yml
@@ -1,161 +1,152 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_diagnostics
-  name: az vm diagnostics
-  summary: Configure the Azure Virtual Machine diagnostics extension.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_diagnostics_get_default_config
-  - az_vm_diagnostics_set
-- uid: az_vm_diagnostics_get_default_config
+### YamlMime:AzureCLIGroup
+uid: az_vm_diagnostics
+name: az vm diagnostics
+summary: Configure the Azure Virtual Machine diagnostics extension.
+description: ''
+directCommands:
+- uid: az_vm_diagnostics_get-default-config
   name: az vm diagnostics get-default-config
   summary: Get the default configuration settings for a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm diagnostics get-default-config [--is-windows-os]
+                                         [--subscription]
   examples:
   - summary: Get the default diagnostics for a Linux VM and override the storage account name and the VM resource ID.
-    syntax:
-      content: >-
-        az vm diagnostics get-default-config \
-            | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#MyStorageAccount#g" \
-            | sed "s#__VM_OR_VMSS_RESOURCE_ID__#MyVmResourceId#g"
+    syntax: >-
+      az vm diagnostics get-default-config \
+          | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#MyStorageAccount#g" \
+          | sed "s#__VM_OR_VMSS_RESOURCE_ID__#MyVmResourceId#g"
   - summary: Get the default diagnostics for a Windows VM.
-    syntax:
-      content: az vm diagnostics get-default-config --is-windows-os
-  parameters:
+    syntax: az vm diagnostics get-default-config --is-windows-os
+  optionalParameters:
   - name: --is-windows-os
     summary: For Windows VMs.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_diagnostics_set
   name: az vm diagnostics set
   summary: Configure the Azure VM diagnostics extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm diagnostics set --settings
+                          [--ids]
+                          [--no-auto-upgrade {false, true}]
+                          [--no-auto-upgrade-minor-version {false, true}]
+                          [--protected-settings]
+                          [--resource-group]
+                          [--subscription]
+                          [--version]
+                          [--vm-name]
   examples:
   - summary: Set up default diagnostics on a Linux VM for Azure Portal VM metrics graphs and syslog collection.
-    syntax:
-      content: >-
-        # Set the following 3 parameters first.
+    syntax: >-
+      # Set the following 3 parameters first.
 
-        my_resource_group={Resource group name containing your Linux VM and the storage account}
+      my_resource_group={Resource group name containing your Linux VM and the storage account}
 
-        my_linux_vm={Your Azure Linux VM name}
+      my_linux_vm={Your Azure Linux VM name}
 
-        my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
+      my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
 
 
-        my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_linux_vm --query "id" -o tsv)
+      my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_linux_vm --query "id" -o tsv)
 
 
-        default_config=$(az vm diagnostics get-default-config \
-            | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
-            | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
+      default_config=$(az vm diagnostics get-default-config \
+          | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
+          | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
 
-        storage_sastoken=$(az storage account generate-sas \
-            --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
-            --permissions wlacu --resource-types co --services bt -o tsv)
+      storage_sastoken=$(az storage account generate-sas \
+          --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
+          --permissions wlacu --resource-types co --services bt -o tsv)
 
-        protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
-            'storageAccountSasToken': '$storage_sastoken'}"
+      protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
+          'storageAccountSasToken': '$storage_sastoken'}"
 
-        az vm diagnostics set --settings "$default_config" \
-            --protected-settings "$protected_settings" \
-            --resource-group $my_resource_group --vm-name $my_linux_vm
+      az vm diagnostics set --settings "$default_config" \
+          --protected-settings "$protected_settings" \
+          --resource-group $my_resource_group --vm-name $my_linux_vm
   - summary: Set up default diagnostics on a Windows VM.
-    syntax:
-      content: >-
-        # Set the following 3 parameters first.
+    syntax: >-
+      # Set the following 3 parameters first.
 
-        my_resource_group={Resource group name containing your Windows VM and the storage account}
+      my_resource_group={Resource group name containing your Windows VM and the storage account}
 
-        my_windows_vm={Your Azure Windows VM name}
+      my_windows_vm={Your Azure Windows VM name}
 
-        my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
+      my_diagnostic_storage_account={Your Azure storage account for storing VM diagnostic data}
 
 
-        my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_windows_vm --query "id" -o tsv)
+      my_vm_resource_id=$(az vm show -g $my_resource_group -n $my_windows_vm --query "id" -o tsv)
 
 
-        default_config=$(az vm diagnostics get-default-config  --is-windows-os \
-            | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
-            | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
+      default_config=$(az vm diagnostics get-default-config  --is-windows-os \
+          | sed "s#__DIAGNOSTIC_STORAGE_ACCOUNT__#$my_diagnostic_storage_account#g" \
+          | sed "s#__VM_OR_VMSS_RESOURCE_ID__#$my_vm_resource_id#g")
 
-        # Please use the same options, the WAD diagnostic extension has strict
+      # Please use the same options, the WAD diagnostic extension has strict
 
-        # expectations of the sas token's format. Set the expiry as desired.
+      # expectations of the sas token's format. Set the expiry as desired.
 
-        storage_sastoken=$(az storage account generate-sas \
-            --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
-            --permissions acuw --resource-types co --services bt --https-only --output tsv)
+      storage_sastoken=$(az storage account generate-sas \
+          --account-name $my_diagnostic_storage_account --expiry 2037-12-31T23:59:00Z \
+          --permissions acuw --resource-types co --services bt --https-only --output tsv)
 
-        protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
-            'storageAccountSasToken': '$storage_sastoken'}"
+      protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
+          'storageAccountSasToken': '$storage_sastoken'}"
 
-        az vm diagnostics set --settings "$default_config" \
-            --protected-settings "$protected_settings" \
-            --resource-group $my_resource_group --vm-name $my_windows_vm
+      az vm diagnostics set --settings "$default_config" \
+          --protected-settings "$protected_settings" \
+          --resource-group $my_resource_group --vm-name $my_windows_vm
 
-        # # Alternatively, if the WAD extension has issues parsing the sas token,
+      # # Alternatively, if the WAD extension has issues parsing the sas token,
 
-        # # one can use a storage account key instead.
+      # # one can use a storage account key instead.
 
-        storage_account_key=$(az storage account keys list --account-name {my_storage_account} \
-          --query [0].value -o tsv)
-        protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
-          'storageAccountKey': '$storage_account_key'}"
-  parameters:
+      storage_account_key=$(az storage account keys list --account-name {my_storage_account} \
+        --query [0].value -o tsv)
+      protected_settings="{'storageAccountName': '$my_diagnostic_storage_account', \
+        'storageAccountKey': '$storage_account_key'}"
+  requiredParameters:
   - isRequired: true
     name: --settings
     summary: Json string or a file path, which defines data to be collected.
     description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --protected-settings
     summary: Json string or a file path containing private configurations such as storage account keys, etc.
     description: ''
-  - name: --version
-    summary: Version of the diagnostics extension. Will use the latest if not specfied.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version
+    summary: Version of the diagnostics extension. Will use the latest if not specfied.
+    description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_diagnostics_get_default_config
-  name: az vm diagnostics get-default-config
-  summary: Get the default configuration settings for a VM.
-- uid: az_vm_diagnostics_set
-  name: az vm diagnostics set
-  summary: Configure the Azure VM diagnostics extension.
+- az_vm_diagnostics_get-default-config
+- az_vm_diagnostics_set
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -171,10 +162,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Configure the Azure Virtual Machine diagnostics extension.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Configure the Azure Virtual Machine diagnostics extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/disk.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/disk.yml
index 957891305f..1c07b1679c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/disk.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/disk.yml
@@ -1,55 +1,67 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_disk
-  name: az vm disk
-  summary: Manage the managed data disks attached to a VM.
-  description: >-
-    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+### YamlMime:AzureCLIGroup
+uid: az_vm_disk
+name: az vm disk
+summary: Manage the managed data disks attached to a VM.
+description: >-
+  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
 
-    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
 
-    For more information, see:
+  For more information, see:
 
-    - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+  - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-    - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+  - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-    - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
-  langs:
-  - azurecli
-  children:
-  - az_vm_disk_attach
-  - az_vm_disk_detach
+  - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
+directCommands:
 - uid: az_vm_disk_attach
   name: az vm disk attach
-  summary: Attach a managed persistent disk to a VM.
+  summary: Attach a managed persistent disk to a VM. Please note that --ids only supports one disk.
   description: This allows for the preservation of data, even if the VM is reprovisioned due to maintenance or resizing.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm disk attach --vm-name
+                      [--caching {None, ReadOnly, ReadWrite}]
+                      [--ids]
+                      [--lun]
+                      [--name]
+                      [--new]
+                      [--resource-group]
+                      [--size-gb]
+                      [--sku {Premium_LRS, Standard_LRS}]
+                      [--subscription]
   examples:
   - summary: Attach a new default sized (1023 GB) managed data disk to a VM.
-    syntax:
-      content: az vm disk attach -g MyResourceGroup --vm-name MyVm --name disk_name --new
+    syntax: az vm disk attach -g MyResourceGroup --vm-name MyVm --name disk_name --new
   - summary: Attach a managed persistent disk to a VM. (autogenerated)
-    syntax:
-      content: az vm disk attach --disk $diskId --new --resource-group MyResourceGroup --size-gb 128 --sku Standard_LRS --vm-name MyVm
-  parameters:
+    syntax: az vm disk attach --disk $diskId --new --resource-group MyResourceGroup --size-gb 128 --sku Standard_LRS --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --caching
     parameterValueGroup: None, ReadOnly, ReadWrite
     summary: Disk caching policy.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --lun
     summary: 0-based logical unit number (LUN). Max value depends on the Virtual Machine size.
     description: ''
+  - name: --name -n
+    summary: The name or ID of the managed disk.
+    description: ''
   - name: --new
     summary: Create a new disk.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --size-gb -z
     defaultValue: "1023"
     summary: 'Size in GB. Max size: 4095 GB (certain preview disks can be larger).'
@@ -58,63 +70,43 @@ items:
     parameterValueGroup: Premium_LRS, Standard_LRS
     summary: Underlying storage SKU.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name or ID of the managed disk.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_disk_detach
   name: az vm disk detach
   summary: Detach a managed disk from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm disk detach --name
+                      --resource-group
+                      --vm-name
+                      [--subscription]
   examples:
   - summary: Detach a data disk from a VM.
-    syntax:
-      content: az vm disk detach -g MyResourceGroup --vm-name MyVm --name disk_name
-  parameters:
+    syntax: az vm disk detach -g MyResourceGroup --vm-name MyVm --name disk_name
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The data disk name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_disk_attach
-  name: az vm disk attach
-  summary: Attach a managed persistent disk to a VM.
-- uid: az_vm_disk_detach
-  name: az vm disk detach
-  summary: Detach a managed disk from a VM.
+- az_vm_disk_attach
+- az_vm_disk_detach
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -130,23 +122,20 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: >-
-  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: >-
+    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
 
-  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
 
-  For more information, see:
+    For more information, see:
 
-  - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+    - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-  - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+    - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-  - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
+    - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/encryption.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/encryption.yml
index 2eabf62112..64f854130b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/encryption.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/encryption.yml
@@ -1,57 +1,50 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_encryption
-  name: az vm encryption
-  summary: Manage encryption of VM disks.
-  description: >-
-    For more information, see:
+### YamlMime:AzureCLIGroup
+uid: az_vm_encryption
+name: az vm encryption
+summary: Manage encryption of VM disks.
+description: >-
+  For more information, see:
 
-    <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>".
-  langs:
-  - azurecli
-  children:
-  - az_vm_encryption_disable
-  - az_vm_encryption_enable
-  - az_vm_encryption_show
+  https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview".
+directCommands:
 - uid: az_vm_encryption_disable
   name: az vm encryption disable
   summary: Disable disk encryption on the OS disk and/or data disks. Decrypt mounted disks.
   description: >-
     For Linux VMs, disabling encryption is only permitted on data volumes.
 
-    For Windows VMS, disabling encryption is permitted on both OS and data volumes.
-  langs:
-  - azurecli
+    For Windows VMs, disabling encryption is permitted on both OS and data volumes.
+  syntax: >-
+    az vm encryption disable [--force]
+                             [--ids]
+                             [--name]
+                             [--resource-group]
+                             [--subscription]
+                             [--volume-type {ALL, DATA, OS}]
   examples:
   - summary: Disable disk encryption on the OS disk and/or data disks. (autogenerated)
-    syntax:
-      content: az vm encryption disable --name MyVirtualMachine --resource-group MyResourceGroup --volume-type DATA
-  parameters:
+    syntax: az vm encryption disable --name MyVirtualMachine --resource-group MyResourceGroup --volume-type DATA
+  optionalParameters:
   - name: --force
     summary: Continue by ignoring client side validation errors.
     description: ''
-  - name: --volume-type
-    parameterValueGroup: ALL, DATA, OS
-    summary: Type of volume that the encryption operation is performed on.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --volume-type
+    parameterValueGroup: ALL, DATA, OS
+    summary: Type of volume that the encryption operation is performed on.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_encryption_enable
   name: az vm encryption enable
   summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks.
@@ -60,27 +53,51 @@ items:
 
     For more information, see:
 
-    <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>.
-  langs:
-  - azurecli
+    https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview.
+  syntax: >-
+    az vm encryption enable --disk-encryption-keyvault
+                            [--aad-client-cert-thumbprint]
+                            [--aad-client-id]
+                            [--aad-client-secret]
+                            [--encrypt-format-all]
+                            [--force]
+                            [--ids]
+                            [--key-encryption-algorithm]
+                            [--key-encryption-key]
+                            [--key-encryption-keyvault]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+                            [--volume-type {ALL, DATA, OS}]
   examples:
   - summary: encrypt a VM using a key vault in the same resource group
-    syntax:
-      content: az vm encryption enable -g MyResourceGroup -n MyVm --disk-encryption-keyvault MyVault
+    syntax: az vm encryption enable -g MyResourceGroup -n MyVm --disk-encryption-keyvault MyVault
   - summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks. (autogenerated)
-    syntax:
-      content: az vm encryption enable --disk-encryption-keyvault MyVault --name MyVm --resource-group MyResourceGroup --volume-type DATA
-  parameters:
+    syntax: az vm encryption enable --disk-encryption-keyvault MyVault --name MyVm --resource-group MyResourceGroup --volume-type DATA
+  requiredParameters:
   - isRequired: true
     name: --disk-encryption-keyvault
     summary: Name or ID of the key vault where the generated encryption key will be placed.
     description: ''
+  optionalParameters:
+  - name: --aad-client-cert-thumbprint
+    summary: Thumbprint of the AAD app certificate with permissions to write secrets to the key vault.
+    description: ''
+  - name: --aad-client-id
+    summary: Client ID of an AAD app with permissions to write secrets to the key vault.
+    description: ''
+  - name: --aad-client-secret
+    summary: Client secret of the AAD app with permissions to write secrets to the key vault.
+    description: ''
   - name: --encrypt-format-all
     summary: Encrypts-formats data disks instead of encrypting them. Encrypt-formatting is a lot faster than in-place encryption but wipes out the partition getting encrypt-formatted.
     description: ''
   - name: --force
     summary: Continue by ignoring client side validation errors.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --key-encryption-algorithm
     defaultValue: RSA-OAEP
     summary: ''
@@ -91,76 +108,54 @@ items:
   - name: --key-encryption-keyvault
     summary: Name or ID of the key vault containing the key encryption key used to encrypt the disk encryption key. If missing, CLI will use `--disk-encryption-keyvault`.
     description: ''
-  - name: --volume-type
-    parameterValueGroup: ALL, DATA, OS
-    summary: Type of volume that the encryption operation is performed on.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --aad-client-cert-thumbprint
-    summary: Thumbprint of the AAD app certificate with permissions to write secrets to the key vault.
-    description: ''
-  - name: --aad-client-id
-    summary: Client ID of an AAD app with permissions to write secrets to the key vault.
-    description: ''
-  - name: --aad-client-secret
-    summary: Client secret of the AAD app with permissions to write secrets to the key vault.
+  - name: --volume-type
+    parameterValueGroup: ALL, DATA, OS
+    summary: Type of volume that the encryption operation is performed on.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_encryption_show
   name: az vm encryption show
   summary: Show encryption status.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm encryption show [--ids]
+                          [--name]
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: Show encryption status. (autogenerated)
-    syntax:
-      content: az vm encryption show --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm encryption show --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_encryption_disable
-  name: az vm encryption disable
-  summary: Disable disk encryption on the OS disk and/or data disks. Decrypt mounted disks.
-- uid: az_vm_encryption_enable
-  name: az vm encryption enable
-  summary: Enable disk encryption on the OS disk and/or data disks. Encrypt mounted disks.
-- uid: az_vm_encryption_show
-  name: az vm encryption show
-  summary: Show encryption status.
+- az_vm_encryption_disable
+- az_vm_encryption_enable
+- az_vm_encryption_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,13 +171,10 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: >-
-  For more information, see:
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: >-
+    For more information, see:
 
-  <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>".
+    https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview".
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/extension.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/extension.yml
index 8d961c82d4..80c9c53c56 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/extension.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/extension.yml
@@ -1,102 +1,110 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_extension
-  name: az vm extension
-  summary: Manage extensions on VMs.
-  description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
-  langs:
-  - azurecli
-  children:
-  - az_vm_extension_delete
-  - az_vm_extension_list
-  - az_vm_extension_set
-  - az_vm_extension_show
-  - az_vm_extension_wait
+### YamlMime:AzureCLIGroup
+uid: az_vm_extension
+name: az vm extension
+summary: Manage extensions on VMs.
+description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
+directCommands:
 - uid: az_vm_extension_delete
   name: az vm extension delete
   summary: Remove an extension attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension delete [--ids]
+                           [--name]
+                           [--no-wait]
+                           [--resource-group]
+                           [--subscription]
+                           [--vm-name]
   examples:
   - summary: Use a VM name and extension to delete an extension from a VM.
-    syntax:
-      content: az vm extension delete -g MyResourceGroup --vm-name MyVm -n extension_name
+    syntax: az vm extension delete -g MyResourceGroup --vm-name MyVm -n extension_name
   - summary: Delete extensions with IDs containing the string "MyExtension" from a VM.
-    syntax:
-      content: >-
-        az vm extension delete --ids \
-            $(az resource list --query "[?contains(name, 'MyExtension')].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: >-
+      az vm extension delete --ids \
+          $(az resource list --query "[?contains(name, 'MyExtension')].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: Name of the extension.
     description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_list
   name: az vm extension list
   summary: List the extensions attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension list --resource-group
+                         --vm-name
+                         [--query-examples]
+                         [--subscription]
   examples:
   - summary: List attached extensions to a named VM.
-    syntax:
-      content: az vm extension list -g MyResourceGroup --vm-name MyVm
-  parameters:
+    syntax: az vm extension list -g MyResourceGroup --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_set
   name: az vm extension set
   summary: Set extensions for a VM.
   description: Get extension details from `az vm extension image list`.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension set --name
+                        --publisher
+                        [--enable-auto-upgrade {false, true}]
+                        [--extension-instance-name]
+                        [--force-update]
+                        [--ids]
+                        [--no-auto-upgrade {false, true}]
+                        [--no-auto-upgrade-minor-version {false, true}]
+                        [--no-wait]
+                        [--protected-settings]
+                        [--resource-group]
+                        [--settings]
+                        [--subscription]
+                        [--version]
+                        [--vm-name]
   examples:
   - summary: Add a user account to a Linux VM.
-    syntax:
-      content: >-
-        az vm extension set -n VMAccessForLinux --publisher Microsoft.OSTCExtensions --version 1.4 \
-            --vm-name MyVm --resource-group MyResourceGroup \
-            --protected-settings '{"username":"user1", "ssh_key":"ssh_rsa ..."}'
+    syntax: >-
+      az vm extension set -n VMAccessForLinux --publisher Microsoft.OSTCExtensions --version 1.4 \
+          --vm-name MyVm --resource-group MyResourceGroup \
+          --protected-settings '{"username":"user1", "ssh_key":"ssh_rsa ..."}'
   - summary: Add a customScript extension to VM(s) specified by --ids.
-    syntax:
-      content: az vm extension set -n customScript --publisher Microsoft.Azure.Extensions --ids {vm_id}
-  parameters:
+    syntax: az vm extension set -n customScript --publisher Microsoft.Azure.Extensions --ids {vm_id}
+  - summary: Add an extension and enable automatic upgrade by the platform if there is a newer version of the extension available.
+    syntax: >-
+      az vm extension set -n extName --publisher publisher --vm-name MyVM -g MyResourceGroup \
+
+      --enable-auto-upgrade true
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
@@ -106,57 +114,66 @@ items:
     name: --publisher
     summary: The name of the extension publisher.
     description: ''
+  optionalParameters:
+  - name: --enable-auto-upgrade
+    parameterValueGroup: false, true
+    summary: Indicate the extension should be automatically upgraded by the platform if there is a newer version of the extension available.
+    description: ''
   - name: --extension-instance-name
     summary: 'Name of extension instance, which can be customized. Default: name of the extension.'
     description: ''
   - name: --force-update
     summary: Force to update even if the extension configuration has not changed.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --protected-settings
     summary: Protected settings in JSON format for sensitive information like credentials. A JSON file path is also accepted.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --settings
     summary: Extension settings in JSON format. A JSON file path is also accepted.
     description: ''
-  - name: --version
-    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version
+    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade-minor-version.
+    description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_show
   name: az vm extension show
   summary: Display information about extensions attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension show [--expand]
+                         [--ids]
+                         [--name]
+                         [--query-examples]
+                         [--resource-group]
+                         [--subscription]
+                         [--vm-name]
   examples:
   - summary: Use VM name and extension name to show the extensions attached to a VM.
-    syntax:
-      content: az vm extension show -g MyResourceGroup --vm-name MyVm -n extension_name
-  parameters:
+    syntax: az vm extension show -g MyResourceGroup --vm-name MyVm -n extension_name
+  optionalParameters:
   - name: --expand
     summary: The expand expression to apply on the operation.
     description: ''
@@ -166,56 +183,45 @@ items:
   - name: --name -n
     summary: Name of the extension.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_wait
   name: az vm extension wait
   summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension wait [--created]
+                         [--custom]
+                         [--deleted]
+                         [--exists]
+                         [--expand]
+                         [--ids]
+                         [--interval]
+                         [--name]
+                         [--resource-group]
+                         [--subscription]
+                         [--timeout]
+                         [--updated]
+                         [--vm-name]
   examples:
   - summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met. (autogenerated)
-    syntax:
-      content: az vm extension wait --created --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
+    syntax: az vm extension wait --created --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
   - summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met. (autogenerated)
-    syntax:
-      content: az vm extension wait --exists --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
+    syntax: az vm extension wait --exists --name MyExtension --resource-group MyResourceGroup --vm-name MyVm
   - summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met. (autogenerated)
-    syntax:
-      content: az vm extension wait --ids @- --name MyExtension --subscription MySubscription --updated --vm-name MyVm
-  parameters:
-  - name: --expand
-    summary: The expand expression to apply on the operation.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: Name of the extension.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
+    syntax: az vm extension wait --ids @- --name MyExtension --subscription MySubscription --updated --vm-name MyVm
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -228,10 +234,25 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --expand
+    summary: The expand expression to apply on the operation.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Name of the extension.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -239,43 +260,21 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vm-name
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_extension_delete
-  name: az vm extension delete
-  summary: Remove an extension attached to a VM.
-- uid: az_vm_extension_image
-  name: az vm extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vm_extension_image_list
-  name: az vm extension image list
-  summary: List the information on available extensions.
-- uid: az_vm_extension_image_list_names
-  name: az vm extension image list-names
-  summary: List the names of available extensions.
-- uid: az_vm_extension_image_list_versions
-  name: az vm extension image list-versions
-  summary: List the versions for available extensions.
-- uid: az_vm_extension_image_show
-  name: az vm extension image show
-  summary: Display information for an extension.
-- uid: az_vm_extension_list
-  name: az vm extension list
-  summary: List the extensions attached to a VM.
-- uid: az_vm_extension_set
-  name: az vm extension set
-  summary: Set extensions for a VM.
-- uid: az_vm_extension_show
-  name: az vm extension show
-  summary: Display information about extensions attached to a VM.
-- uid: az_vm_extension_wait
-  name: az vm extension wait
-  summary: Place the CLI in a waiting state until a condition of a virtual machine extension is met.
+- az_vm_extension_delete
+- az_vm_extension_image
+- az_vm_extension_image_list
+- az_vm_extension_image_list-names
+- az_vm_extension_image_list-versions
+- az_vm_extension_image_show
+- az_vm_extension_list
+- az_vm_extension_set
+- az_vm_extension_show
+- az_vm_extension_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -291,10 +290,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines. For example, if a virtual machine requires software installation, anti-virus protection, or Docker configuration, a VM extension can be used to complete these tasks. Extensions can be bundled with a new virtual machine deployment or run against any existing system.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/extension/image.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/extension/image.yml
index d6cbb5f238..1064c45e69 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/extension/image.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/extension/image.yml
@@ -1,36 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_extension_image
-  name: az vm extension image
-  summary: Find the available VM extensions for a subscription and region.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_extension_image_list
-  - az_vm_extension_image_list_names
-  - az_vm_extension_image_list_versions
-  - az_vm_extension_image_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_extension_image
+name: az vm extension image
+summary: Find the available VM extensions for a subscription and region.
+description: ''
+directCommands:
 - uid: az_vm_extension_image_list
   name: az vm extension image list
   summary: List the information on available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image list [--latest]
+                               [--location]
+                               [--name]
+                               [--publisher]
+                               [--query-examples]
+                               [--subscription]
+                               [--version]
   examples:
   - summary: List the unique publishers for extensions.
-    syntax:
-      content: az vm extension image list --query "[].publisher" -o tsv | sort -u
+    syntax: az vm extension image list --query "[].publisher" -o tsv | sort -u
   - summary: Find extensions with "Docker" in the name.
-    syntax:
-      content: az vm extension image list --query "[].name" -o tsv | sort -u | grep Docker
+    syntax: az vm extension image list --query "[].name" -o tsv | sort -u | grep Docker
   - summary: List extension names where the publisher name starts with "Microsoft.Azure.App".
-    syntax:
-      content: >-
-        az vm extension image list --query \
-            "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
-            -o tsv | sort -u | xargs -I{} az vm extension image list-names --publisher {} -l westus
-  parameters:
+    syntax: >-
+      az vm extension image list --query \
+          "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
+          -o tsv | sort -u | xargs -I{} az vm extension image list-names --publisher {} -l westus
+  optionalParameters:
   - name: --latest
     summary: Show the latest version only.
     description: ''
@@ -43,69 +39,68 @@ items:
   - name: --publisher -p
     summary: Image publisher name.
     description: ''
-  - name: --version
-    summary: Extension version.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_extension_image_list_names
+  - name: --version
+    summary: Extension version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_extension_image_list-names
   name: az vm extension image list-names
   summary: List the names of available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image list-names --location
+                                     --publisher
+                                     [--subscription]
   examples:
   - summary: Find Docker extensions by publisher and location.
-    syntax:
-      content: >-
-        az vm extension image list-names --publisher Microsoft.Azure.Extensions \
-            -l westus --query "[?starts_with(name, 'Docker')]"
+    syntax: >-
+      az vm extension image list-names --publisher Microsoft.Azure.Extensions \
+          -l westus --query "[?starts_with(name, 'Docker')]"
   - summary: Find CustomScript extensions by publisher and location.
-    syntax:
-      content: >-
-        az vm extension image list-names --publisher Microsoft.Azure.Extensions \
-            -l westus --query "[?starts_with(name, 'Custom')]"
-  parameters:
+    syntax: >-
+      az vm extension image list-names --publisher Microsoft.Azure.Extensions \
+          -l westus --query "[?starts_with(name, 'Custom')]"
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_extension_image_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_extension_image_list-versions
   name: az vm extension image list-versions
   summary: List the versions for available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image list-versions --location
+                                        --name
+                                        --publisher
+                                        [--filter]
+                                        [--orderby]
+                                        [--subscription]
+                                        [--top]
   examples:
   - summary: Find the available versions for the Docker extension.
-    syntax:
-      content: >-
-        az vm extension image list-versions --publisher Microsoft.Azure.Extensions \
-            -l westus -n DockerExtension -otable
-  parameters:
+    syntax: >-
+      az vm extension image list-versions --publisher Microsoft.Azure.Extensions \
+          -l westus -n DockerExtension -otable
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -115,56 +110,55 @@ items:
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --filter
     summary: The filter to apply on the operation.
     description: ''
   - name: --orderby
     summary: The $orderby odata query option.
     description: ''
-  - name: --top
-    summary: The $top odata query option.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: The $top odata query option.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_extension_image_show
   name: az vm extension image show
   summary: Display information for an extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm extension image show --location
+                               --name
+                               --publisher
+                               --version
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Show the CustomScript extension version 2.0.2.
-    syntax:
-      content: >-
-        az vm extension image show -l westus -n CustomScript \
-          --publisher Microsoft.Azure.Extensions --version 2.0.2
+    syntax: >-
+      az vm extension image show -l westus -n CustomScript \
+        --publisher Microsoft.Azure.Extensions --version 2.0.2
   - summary: Show the latest version of the Docker extension.
-    syntax:
-      content: >-
-        publisher=Microsoft.Azure.Extensions
+    syntax: >-
+      publisher=Microsoft.Azure.Extensions
 
-        extension=DockerExtension
+      extension=DockerExtension
 
-        location=westus
+      location=westus
 
 
-        latest=$(az vm extension image list-versions \
-          --publisher {publisher} -l {location} -n {extension} \
-          --query "[].name" -o tsv | sort | tail -n 1)
+      latest=$(az vm extension image list-versions \
+        --publisher ${publisher} -l ${location} -n ${extension} \
+        --query "[].name" -o tsv | sort | tail -n 1)
 
-        az vm extension image show -l {location} \
-          --publisher {publisher} -n {extension} --version {latest}
-  parameters:
+      az vm extension image show -l ${location} \
+        --publisher ${publisher} -n ${extension} --version ${latest}
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -178,28 +172,19 @@ items:
     name: --version
     summary: Extension version.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_extension_image_list
-  name: az vm extension image list
-  summary: List the information on available extensions.
-- uid: az_vm_extension_image_list_names
-  name: az vm extension image list-names
-  summary: List the names of available extensions.
-- uid: az_vm_extension_image_list_versions
-  name: az vm extension image list-versions
-  summary: List the versions for available extensions.
-- uid: az_vm_extension_image_show
-  name: az vm extension image show
-  summary: Display information for an extension.
+- az_vm_extension_image_list
+- az_vm_extension_image_list-names
+- az_vm_extension_image_list-versions
+- az_vm_extension_image_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -215,10 +200,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Find the available VM extensions for a subscription and region.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Find the available VM extensions for a subscription and region.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/identity.yml
index 56d2f89ded..7ab627d9e3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/identity.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/identity.yml
@@ -1,92 +1,83 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_identity
-  name: az vm identity
-  summary: Manage service identities of a VM.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_identity_assign
-  - az_vm_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_identity
+name: az vm identity
+summary: Manage service identities of a VM.
+description: ''
+directCommands:
 - uid: az_vm_identity_assign
   name: az vm identity assign
   summary: Enable managed service identity on a VM.
   description: This is required to authenticate and interact with other Azure services using bearer tokens.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm identity assign [--identities]
+                          [--ids]
+                          [--name]
+                          [--resource-group]
+                          [--role]
+                          [--scope]
+                          [--subscription]
   examples:
   - summary: Enable the system assigned identity on a VM with the 'Reader' role.
-    syntax:
-      content: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
+    syntax: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
   - summary: Enable the system assigned identity and a user assigned identity on a VM.
-    syntax:
-      content: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --identities [system] myAssignedId
-  parameters:
+    syntax: az vm identity assign -g MyResourceGroup -n MyVm --role Reader --identities [system] myAssignedId
+  optionalParameters:
   - name: --identities
     summary: "Space-separated identities to assign. Use '[system]' to refer to the system assigned identity. Default: '[system]'."
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
-    description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
+    description: ''
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_identity_show
   name: az vm identity show
   summary: Display VM's managed identity info.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm identity show [--ids]
+                        [--name]
+                        [--query-examples]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: display VM's managed identity info. (autogenerated)
-    syntax:
-      content: az vm identity show --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm identity show --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_identity_assign
-  name: az vm identity assign
-  summary: Enable managed service identity on a VM.
-- uid: az_vm_identity_show
-  name: az vm identity show
-  summary: Display VM's managed identity info.
+- az_vm_identity_assign
+- az_vm_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +93,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage service identities of a VM.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage service identities of a VM.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/image.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/image.yml
index 5794ba621a..7e0ca0432e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/image.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/image.yml
@@ -1,29 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_image
-  name: az vm image
-  summary: Information on available virtual machine images.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_image_accept_terms
-  - az_vm_image_list
-  - az_vm_image_list_offers
-  - az_vm_image_list_publishers
-  - az_vm_image_list_skus
-  - az_vm_image_show
-- uid: az_vm_image_accept_terms
+### YamlMime:AzureCLIGroup
+uid: az_vm_image
+name: az vm image
+summary: Information on available virtual machine images.
+description: ''
+directCommands:
+- uid: az_vm_image_accept-terms
   name: az vm image accept-terms
   summary: Accept Azure Marketplace term so that the image can be used to create VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image accept-terms [--offer]
+                             [--plan]
+                             [--publisher]
+                             [--subscription]
+                             [--urn]
   examples:
   - summary: Accept Azure Marketplace term so that the image can be used to create VMs. (autogenerated)
-    syntax:
-      content: az vm image accept-terms --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image accept-terms --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -33,40 +27,38 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_list
   name: az vm image list
   summary: List the VM/VMSS images available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list [--all]
+                     [--location]
+                     [--offer]
+                     [--publisher]
+                     [--query-examples]
+                     [--sku]
+                     [--subscription]
   examples:
   - summary: List all available images.
-    syntax:
-      content: az vm image list --all
+    syntax: az vm image list --all
   - summary: List all offline cached CentOS images.
-    syntax:
-      content: az vm image list -f CentOS
+    syntax: az vm image list -f CentOS
   - summary: List all CentOS images.
-    syntax:
-      content: az vm image list -f CentOS --all
-  parameters:
+    syntax: az vm image list -f CentOS --all
+  optionalParameters:
   - name: --all
     summary: Retrieve image list from live Azure service rather using an offline image list.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --offer -f
     summary: Image offer name, partial name is accepted.
@@ -74,91 +66,82 @@ items:
   - name: --publisher -p
     summary: Image publisher name, partial name is accepted.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sku -s
     summary: Image sku name, partial name is accepted.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_image_list_offers
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_image_list-offers
   name: az vm image list-offers
   summary: List the VM image offers available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list-offers --location
+                            --publisher
+                            [--subscription]
   examples:
   - summary: List all offers from Microsoft in the West US region.
-    syntax:
-      content: az vm image list-offers -l westus -p MicrosoftWindowsServer
+    syntax: az vm image list-offers -l westus -p MicrosoftWindowsServer
   - summary: List all offers from OpenLocic in the West US region.
-    syntax:
-      content: az vm image list-offers -l westus -p OpenLogic
-  parameters:
+    syntax: az vm image list-offers -l westus -p OpenLogic
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --publisher -p
     summary: A valid image publisher.
     description: ''
     valueFrom: az vm image list-publishers
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_image_list_publishers
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_image_list-publishers
   name: az vm image list-publishers
   summary: List the VM image publishers available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list-publishers --location
+                                [--subscription]
   examples:
   - summary: List all publishers in the West US region.
-    syntax:
-      content: az vm image list-publishers -l westus
+    syntax: az vm image list-publishers -l westus
   - summary: List all publishers with names starting with "Open" in westus.
-    syntax:
-      content: az vm image list-publishers -l westus --query "[?starts_with(name, 'Open')]"
-  parameters:
+    syntax: az vm image list-publishers -l westus --query "[?starts_with(name, 'Open')]"
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_image_list_skus
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_image_list-skus
   name: az vm image list-skus
   summary: List the VM image SKUs available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image list-skus --location
+                          --offer
+                          --publisher
+                          [--subscription]
   examples:
   - summary: List all skus available for CentOS published by OpenLogic in the West US region.
-    syntax:
-      content: az vm image list-skus -l westus -f CentOS -p OpenLogic
-  parameters:
+    syntax: az vm image list-skus -l westus -f CentOS -p OpenLogic
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --offer -f
@@ -169,34 +152,35 @@ items:
     summary: A valid image publisher.
     description: ''
     valueFrom: az vm image list-publishers
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_show
   name: az vm image show
   summary: Get the details for a VM image available in the Azure Marketplace.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image show [--location]
+                     [--offer]
+                     [--publisher]
+                     [--query-examples]
+                     [--sku]
+                     [--subscription]
+                     [--urn]
+                     [--version]
   examples:
   - summary: Show information for the latest available CentOS image from OpenLogic.
-    syntax:
-      content: >-
-        latest=$(az vm image list -p OpenLogic -s 7.3 --all --query \
-            "[?offer=='CentOS'].version" -o tsv | sort -u | tail -n 1)
-        az vm image show -l westus -f CentOS -p OpenLogic --sku 7.3 --version {latest}
+    syntax: >-
+      latest=$(az vm image list -p OpenLogic -s 7.3 --all --query \
+          "[?offer=='CentOS'].version" -o tsv | sort -u | tail -n 1)
+      az vm image show -l westus -f CentOS -p OpenLogic --sku 7.3 --version ${latest}
   - summary: Get the details for a VM image available in the Azure Marketplace. (autogenerated)
-    syntax:
-      content: az vm image show --location westus --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image show --location westus --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --offer -f
     summary: Image offer.
@@ -204,55 +188,33 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sku -s
     summary: Image sku.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --urn
     summary: URN, in format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
     description: ''
   - name: --version
     summary: Image sku's version.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_image_accept_terms
-  name: az vm image accept-terms
-  summary: Accept Azure Marketplace term so that the image can be used to create VMs.
-- uid: az_vm_image_list
-  name: az vm image list
-  summary: List the VM/VMSS images available in the Azure Marketplace.
-- uid: az_vm_image_list_offers
-  name: az vm image list-offers
-  summary: List the VM image offers available in the Azure Marketplace.
-- uid: az_vm_image_list_publishers
-  name: az vm image list-publishers
-  summary: List the VM image publishers available in the Azure Marketplace.
-- uid: az_vm_image_list_skus
-  name: az vm image list-skus
-  summary: List the VM image SKUs available in the Azure Marketplace.
-- uid: az_vm_image_show
-  name: az vm image show
-  summary: Get the details for a VM image available in the Azure Marketplace.
-- uid: az_vm_image_terms
-  name: az vm image terms
-  summary: Manage Azure Marketplace image terms.
-- uid: az_vm_image_terms_accept
-  name: az vm image terms accept
-  summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-- uid: az_vm_image_terms_cancel
-  name: az vm image terms cancel
-  summary: Cancel Azure Marketplace image terms.
-- uid: az_vm_image_terms_show
-  name: az vm image terms show
-  summary: Get the details of Azure Marketplace image terms.
+- az_vm_image_accept-terms
+- az_vm_image_list
+- az_vm_image_list-offers
+- az_vm_image_list-publishers
+- az_vm_image_list-skus
+- az_vm_image_show
+- az_vm_image_terms
+- az_vm_image_terms_accept
+- az_vm_image_terms_cancel
+- az_vm_image_terms_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -268,10 +230,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Information on available virtual machine images.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Information on available virtual machine images.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/image/terms.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/image/terms.yml
index de0fbeec4a..b621b99fa7 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/image/terms.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/image/terms.yml
@@ -1,26 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_image_terms
-  name: az vm image terms
-  summary: Manage Azure Marketplace image terms.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_image_terms_accept
-  - az_vm_image_terms_cancel
-  - az_vm_image_terms_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_image_terms
+name: az vm image terms
+summary: Manage Azure Marketplace image terms.
+description: ''
+directCommands:
 - uid: az_vm_image_terms_accept
   name: az vm image terms accept
   summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image terms accept [--offer]
+                             [--plan]
+                             [--publisher]
+                             [--subscription]
+                             [--urn]
   examples:
   - summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-    syntax:
-      content: az vm image terms accept --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image terms accept --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -30,32 +27,29 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_terms_cancel
   name: az vm image terms cancel
   summary: Cancel Azure Marketplace image terms.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image terms cancel [--offer]
+                             [--plan]
+                             [--publisher]
+                             [--subscription]
+                             [--urn]
   examples:
   - summary: Cancel Azure Marketplace image terms.
-    syntax:
-      content: az vm image terms cancel --urn publisher:offer:sku:version
+    syntax: az vm image terms cancel --urn publisher:offer:sku:version
   - summary: Cancel Azure Marketplace image terms. (autogenerated)
-    syntax:
-      content: az vm image terms cancel --subscription MySubscription --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image terms cancel --subscription MySubscription --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -65,29 +59,28 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_image_terms_show
   name: az vm image terms show
   summary: Get the details of Azure Marketplace image terms.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm image terms show [--offer]
+                           [--plan]
+                           [--publisher]
+                           [--query-examples]
+                           [--subscription]
+                           [--urn]
   examples:
   - summary: Get the details of Azure Marketplace image terms.
-    syntax:
-      content: az vm image terms show --urn publisher:offer:sku:version
-  parameters:
+    syntax: az vm image terms show --urn publisher:offer:sku:version
+  optionalParameters:
   - name: --offer -f
     summary: Image offer.
     description: ''
@@ -97,28 +90,20 @@ items:
   - name: --publisher -p
     summary: Image publisher.
     description: ''
-  - name: --urn
-    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --urn
+    summary: URN, in the format of 'publisher:offer:sku:version'. If specified, other argument values can be omitted.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_image_terms_accept
-  name: az vm image terms accept
-  summary: Accept Azure Marketplace image terms so that the image can be used to create VMs.
-- uid: az_vm_image_terms_cancel
-  name: az vm image terms cancel
-  summary: Cancel Azure Marketplace image terms.
-- uid: az_vm_image_terms_show
-  name: az vm image terms show
-  summary: Get the details of Azure Marketplace image terms.
+- az_vm_image_terms_accept
+- az_vm_image_terms_cancel
+- az_vm_image_terms_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -134,10 +119,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage Azure Marketplace image terms.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage Azure Marketplace image terms.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/monitor.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/monitor.yml
index e70c63323b..6c1f70b1ea 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/monitor.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/monitor.yml
@@ -1,19 +1,11 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_monitor
-  name: az vm monitor
-  summary: Manage monitor aspect for a vm.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_vm_monitor
+name: az vm monitor
+summary: Manage monitor aspect for a vm.
+description: ''
 commands:
-- uid: az_vm_monitor_log
-  name: az vm monitor log
-  summary: Manage log analytics workspace for a vm.
-- uid: az_vm_monitor_log_show
-  name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
+- az_vm_monitor_log
+- az_vm_monitor_log_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -29,10 +21,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage monitor aspect for a vm.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage monitor aspect for a vm.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/monitor/log.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/monitor/log.yml
index 4922baab91..a97458db05 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/monitor/log.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/monitor/log.yml
@@ -1,49 +1,51 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_monitor_log
-  name: az vm monitor log
-  summary: Manage log analytics workspace for a vm.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_monitor_log_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_monitor_log
+name: az vm monitor log
+summary: Manage log analytics workspace for a vm.
+description: ''
+directCommands:
 - uid: az_vm_monitor_log_show
   name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
+  summary: Execute a query against the Log Analytics workspace linked with a VM.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vm monitor log show --analytics-query
+                           [--ids]
+                           [--name]
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
+                           [--timespan]
+  examples:
+  - summary: Get performance log for a VM linked with a workspace
+    syntax: az vm monitor log show --name myVM -g myRG -q "Perf | limit 10"
+  requiredParameters:
   - isRequired: true
     name: --analytics-query -q
     summary: Query to execute over Log Analytics data.
     description: ''
-  - name: --timespan
-    summary: Timespan over which to query. Defaults to querying all available data.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --timespan
+    summary: Timespan over which to query. Defaults to querying all available data.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_monitor_log_show
-  name: az vm monitor log show
-  summary: Executes a query against the Log Analytics workspace linked with a vm.
+- az_vm_monitor_log_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -59,10 +61,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage log analytics workspace for a vm.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage log analytics workspace for a vm.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/nic.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/nic.yml
index 1d11e61bcf..5115a1820f 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/nic.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/nic.yml
@@ -1,201 +1,182 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_nic
-  name: az vm nic
-  summary: Manage network interfaces. See also `az network nic`.
-  description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview</a>.
-  langs:
-  - azurecli
-  children:
-  - az_vm_nic_add
-  - az_vm_nic_list
-  - az_vm_nic_remove
-  - az_vm_nic_set
-  - az_vm_nic_show
+### YamlMime:AzureCLIGroup
+uid: az_vm_nic
+name: az vm nic
+summary: Manage network interfaces. See also `az network nic`.
+description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview.
+directCommands:
 - uid: az_vm_nic_add
   name: az vm nic add
   summary: Add existing NICs to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic add --nics
+                  --resource-group
+                  --vm-name
+                  [--primary-nic]
+                  [--subscription]
   examples:
   - summary: Add two NICs to a VM.
-    syntax:
-      content: az vm nic add -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
-  parameters:
+    syntax: az vm nic add -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
+  requiredParameters:
   - isRequired: true
     name: --nics
     summary: Names or IDs of NICs.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --primary-nic
     summary: Name or ID of the primary NIC. If missing, the first NIC in the list will be the primary.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_list
   name: az vm nic list
   summary: List the NICs available on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic list --resource-group
+                   --vm-name
+                   [--query-examples]
+                   [--subscription]
   examples:
   - summary: List all of the NICs on a VM.
-    syntax:
-      content: az vm nic list -g MyResourceGroup --vm-name MyVm
-  parameters:
+    syntax: az vm nic list -g MyResourceGroup --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_remove
   name: az vm nic remove
   summary: Remove NICs from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic remove --nics
+                     --resource-group
+                     --vm-name
+                     [--primary-nic]
+                     [--subscription]
   examples:
   - summary: Remove two NICs from a VM.
-    syntax:
-      content: az vm nic remove -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
-  parameters:
+    syntax: az vm nic remove -g MyResourceGroup --vm-name MyVm --nics nic_name1 nic_name2
+  requiredParameters:
   - isRequired: true
     name: --nics
     summary: Names or IDs of NICs.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --primary-nic
     summary: Name or ID of the primary NIC. If missing, the first NIC in the list will be the primary.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_set
   name: az vm nic set
   summary: Configure settings of a NIC attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic set --nics
+                  --resource-group
+                  --vm-name
+                  [--primary-nic]
+                  [--subscription]
   examples:
   - summary: Set a NIC on a VM to be the primary interface.
-    syntax:
-      content: az vm nic set -g MyResourceGroup --vm-name MyVm --nic nic_name1 nic_name2 --primary-nic nic_name2
+    syntax: az vm nic set -g MyResourceGroup --vm-name MyVm --nic nic_name1 nic_name2 --primary-nic nic_name2
   - summary: Configure settings of a NIC attached to a VM. (autogenerated)
-    syntax:
-      content: az vm nic set --nics nic_name1 nic_name2 --primary-nic nic_name2 --resource-group MyResourceGroup --vm-name MyVm
-  parameters:
+    syntax: az vm nic set --nics nic_name1 nic_name2 --primary-nic nic_name2 --resource-group MyResourceGroup --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --nics
     summary: Names or IDs of NICs.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --primary-nic
     summary: Name or ID of the primary NIC. If missing, the first NIC in the list will be the primary.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_nic_show
   name: az vm nic show
   summary: Display information for a NIC attached to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm nic show --nic
+                   --resource-group
+                   --vm-name
+                   [--query-examples]
+                   [--subscription]
   examples:
   - summary: Show details of a NIC on a VM.
-    syntax:
-      content: az vm nic show -g MyResourceGroup --vm-name MyVm --nic nic_name1
-  parameters:
+    syntax: az vm nic show -g MyResourceGroup --vm-name MyVm --nic nic_name1
+  requiredParameters:
   - isRequired: true
     name: --nic
     summary: NIC name or ID.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_nic_add
-  name: az vm nic add
-  summary: Add existing NICs to a VM.
-- uid: az_vm_nic_list
-  name: az vm nic list
-  summary: List the NICs available on a VM.
-- uid: az_vm_nic_remove
-  name: az vm nic remove
-  summary: Remove NICs from a VM.
-- uid: az_vm_nic_set
-  name: az vm nic set
-  summary: Configure settings of a NIC attached to a VM.
-- uid: az_vm_nic_show
-  name: az vm nic show
-  summary: Display information for a NIC attached to a VM.
+- az_vm_nic_add
+- az_vm_nic_list
+- az_vm_nic_remove
+- az_vm_nic_set
+- az_vm_nic_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,10 +192,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see <a href="https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview">https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: A network interface (NIC) is the interconnection between a VM and the underlying software network. For more information, see https://docs.microsoft.com/azure/virtual-network/virtual-network-network-interface-overview.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/repair.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/repair.yml
new file mode 100644
index 0000000000..c954935efa
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/repair.yml
@@ -0,0 +1,174 @@
+### YamlMime:AzureCLIGroup
+uid: az_vm_repair
+name: az vm repair
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vm-repair** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az vm repair** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Auto repair commands to fix VMs.
+description: VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
+directCommands:
+- uid: az_vm_repair_create
+  name: az vm repair create
+  summary: Create a new repair VM and attach the source VM's copied OS disk as a data disk.
+  description: ''
+  syntax: >-
+    az vm repair create --name
+                        --resource-group
+                        [--copy-disk-name]
+                        [--enable-nested]
+                        [--repair-group-name]
+                        [--repair-password]
+                        [--repair-username]
+                        [--repair-vm-name]
+                        [--unlock-encrypted-vm]
+  examples:
+  - summary: Create a repair VM
+    syntax: az vm repair create -g MyResourceGroup -n myVM --verbose
+  - summary: Create a repair VM and set the VM authentication
+    syntax: az vm repair create -g MyResourceGroup -n myVM --repair-username username --repair-password password!234 --verbose
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --copy-disk-name
+    summary: Name of OS disk copy.
+    description: ''
+  - name: --enable-nested
+    summary: Enable nested hyperv.
+    description: ''
+  - name: --repair-group-name
+    summary: Repair resource group name.
+    description: ''
+  - name: --repair-password
+    summary: Admin password for the repair VM.
+    description: ''
+  - name: --repair-username
+    summary: Admin username for repair VM.
+    description: ''
+  - name: --repair-vm-name
+    summary: Name of repair VM.
+    description: ''
+  - name: --unlock-encrypted-vm
+    summary: Option to auto-unlock encrypted VMs using current subscription auth.
+    description: ''
+- uid: az_vm_repair_list-scripts
+  name: az vm repair list-scripts
+  summary: List available scripts. Located https://github.com/Azure/repair-script-library.
+  description: ''
+  syntax: az vm repair list-scripts
+  examples:
+  - summary: List scripts
+    syntax: az vm repair list-scripts --verbose
+  - summary: List windows scripts only.
+    syntax: az vm repair list-scripts --query "[?starts_with(id, 'win')]"
+  - summary: List scripts with test in its description.
+    syntax: az vm repair list-scripts --query "[?contains(description, 'test')]"
+- uid: az_vm_repair_restore
+  name: az vm repair restore
+  summary: Replace source VM's OS disk with data disk from repair VM.
+  description: ''
+  syntax: >-
+    az vm repair restore --name
+                         --resource-group
+                         [--disk-name]
+                         [--repair-vm-id]
+                         [--yes]
+  examples:
+  - summary: Restore from the repair VM, command will auto-search for repair-vm
+    syntax: az vm repair restore -g MyResourceGroup -n MyVM --verbose
+  - summary: Restore from the repair VM, specify the disk to restore
+    syntax: az vm repair restore -g MyResourceGroup -n MyVM --disk-name MyDiskCopy --verbose
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disk-name
+    summary: Name of fixed data disk. Defaults to the first data disk in the repair VM.
+    description: ''
+  - name: --repair-vm-id
+    summary: Repair VM resource id.
+    description: ''
+  - name: --yes
+    summary: Deletes the repair resources without confirmation.
+    description: ''
+- uid: az_vm_repair_run
+  name: az vm repair run
+  summary: Run verified scripts from GitHub on a VM. 'az vm repair list-scripts' to view available scripts.
+  description: ''
+  syntax: >-
+    az vm repair run --name
+                     --resource-group
+                     [--custom-script-file]
+                     [--parameters]
+                     [--repair-vm-id]
+                     [--run-id]
+                     [--run-on-repair]
+  examples:
+  - summary: Run the script with <run-id> directly on the VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --verbose
+  - summary: Run the script with <run-id> on the linked repair VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --run-on-repair --verbose
+  - summary: Run a script with parameters on the VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --run-id win-hello-world --parameters hello=hi world=earth --verbose
+  - summary: Run a local custom script on the VM.
+    syntax: az vm repair run -g MyResourceGroup -n MySourceWinVM --custom-script-file ./file.ps1 --verbose
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-script-file
+    summary: Custom script file to run on VM. Script should be PowerShell for windows, Bash for Linux.
+    description: ''
+  - name: --parameters
+    summary: Space-separated parameters in the format of '[name=]value'. Positional for bash scripts.
+    description: ''
+  - name: --repair-vm-id
+    summary: Repair VM resource id.
+    description: ''
+  - name: --run-id
+    summary: Unique run id for run scripts.
+    description: ''
+  - name: --run-on-repair
+    summary: Script will be run on the linked repair VM.
+    description: ''
+commands:
+- az_vm_repair_create
+- az_vm_repair_list-scripts
+- az_vm_repair_restore
+- az_vm_repair_run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM's OS disk and attaching it to a newly created repair VM.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/run-command.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/run-command.yml
index b77c7b037e..e9722691ce 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/run-command.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/run-command.yml
@@ -1,114 +1,109 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_run_command
-  name: az vm run-command
-  summary: Manage run commands on a Virtual Machine.
-  description: For more information, see <a href="https://docs.microsoft.com/azure/virtual-machines/windows/run-command">https://docs.microsoft.com/azure/virtual-machines/windows/run-command</a> or <a href="https://docs.microsoft.com/azure/virtual-machines/linux/run-command">https://docs.microsoft.com/azure/virtual-machines/linux/run-command</a>.
-  langs:
-  - azurecli
-  children:
-  - az_vm_run_command_invoke
-  - az_vm_run_command_list
-  - az_vm_run_command_show
-- uid: az_vm_run_command_invoke
+### YamlMime:AzureCLIGroup
+uid: az_vm_run-command
+name: az vm run-command
+summary: Manage run commands on a Virtual Machine.
+description: For more information, see https://docs.microsoft.com/azure/virtual-machines/windows/run-command or https://docs.microsoft.com/azure/virtual-machines/linux/run-command.
+directCommands:
+- uid: az_vm_run-command_invoke
   name: az vm run-command invoke
   summary: Execute a specific run command on a vm.
   description: "`az vm run-command show` returns helpful information on each run-command. Discover Run command-id's via `az vmss run-command list`."
-  langs:
-  - azurecli
+  syntax: >-
+    az vm run-command invoke --command-id
+                             [--ids]
+                             [--name]
+                             [--parameters]
+                             [--resource-group]
+                             [--scripts]
+                             [--subscription]
   examples:
   - summary: Install nginx on a linux VM.
-    syntax:
-      content: az vm run-command invoke -g MyResourceGroup -n MyVm --command-id RunShellScript --scripts "sudo apt-get update && sudo apt-get install -y nginx"
+    syntax: az vm run-command invoke -g MyResourceGroup -n MyVm --command-id RunShellScript --scripts "sudo apt-get update && sudo apt-get install -y nginx"
   - summary: Run shell command on a linux VM with parameters.
-    syntax:
-      content: az vm run-command invoke -g MyResourceGroup -n MyVm --command-id RunShellScript --scripts 'echo $1 $2' --parameters hello world
+    syntax: az vm run-command invoke -g MyResourceGroup -n MyVm --command-id RunShellScript --scripts 'echo $1 $2' --parameters hello world
   - summary: Run powershell script on a windows VM with parameters. Script supplied inline. Be wary of single-quoting in CMD.exe.
-    syntax:
-      content: >-
-        az vm run-command invoke  --command-id RunPowerShellScript --name win-vm -g my-resource-group  \
-            --scripts 'param([string]$arg1,[string]$arg2)' \
-            'Write-Host This is a sample script with parameters $arg1 and $arg2' \
-            --parameters 'arg1=somefoo' 'arg2=somebar'
+    syntax: >-
+      az vm run-command invoke  --command-id RunPowerShellScript --name win-vm -g my-resource-group  \
+          --scripts 'param([string]$arg1,[string]$arg2)' \
+          'Write-Host This is a sample script with parameters $arg1 and $arg2' \
+          --parameters 'arg1=somefoo' 'arg2=somebar'
   - summary: Run powershell script on a windows VM with parameters. Script supplied from file.
-    syntax:
-      content: >-
-        # script.ps1
+    syntax: >-
+      # script.ps1
 
-        #   param(
+      #   param(
 
-        #       [string]$arg1,
+      #       [string]$arg1,
 
-        #       [string]$arg2
+      #       [string]$arg2
 
-        #   )
+      #   )
 
-        #   Write-Host This is a sample script with parameters $arg1 and $arg2
+      #   Write-Host This is a sample script with parameters $arg1 and $arg2
 
 
-        az vm run-command invoke  --command-id RunPowerShellScript --name win-vm -g my-resource-group \
-            --scripts @script.ps1 --parameters "arg1=somefoo" "arg2=somebar"
-  parameters:
+      az vm run-command invoke  --command-id RunPowerShellScript --name win-vm -g my-resource-group \
+          --scripts @script.ps1 --parameters "arg1=somefoo" "arg2=somebar"
+  requiredParameters:
   - isRequired: true
     name: --command-id
     summary: The command id.
     description: ''
     valueFrom: az vm run-command list
-  - name: --parameters
-    summary: Space-separated parameters in the format of '[name=]value'.
-    description: ''
-  - name: --scripts
-    summary: Space-separated script lines. Use @{file} to load script from a file.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --parameters
+    summary: Space-separated parameters in the format of '[name=]value'.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --scripts
+    summary: Space-separated script lines. Use @{file} to load script from a file.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_run_command_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_run-command_list
   name: az vm run-command list
   summary: Lists all available run commands for a subscription in a location.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vm run-command list --location
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_run_command_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_run-command_show
   name: az vm run-command show
   summary: Gets specific run command for a subscription in a location.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm run-command show --command-id
+                           --location
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: vm run-command show (autogenerated)
-    syntax:
-      content: az vm run-command show --command-id RunShellScript --location westus2
-  parameters:
+    syntax: az vm run-command show --command-id RunShellScript --location westus2
+  requiredParameters:
   - isRequired: true
     name: --command-id
     summary: The command id.
@@ -116,27 +111,20 @@ items:
     valueFrom: az vm run-command list
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_run_command_invoke
-  name: az vm run-command invoke
-  summary: Execute a specific run command on a vm.
-- uid: az_vm_run_command_list
-  name: az vm run-command list
-  summary: Lists all available run commands for a subscription in a location.
-- uid: az_vm_run_command_show
-  name: az vm run-command show
-  summary: Gets specific run command for a subscription in a location.
+- az_vm_run-command_invoke
+- az_vm_run-command_list
+- az_vm_run-command_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -152,10 +140,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: For more information, see <a href="https://docs.microsoft.com/azure/virtual-machines/windows/run-command">https://docs.microsoft.com/azure/virtual-machines/windows/run-command</a> or <a href="https://docs.microsoft.com/azure/virtual-machines/linux/run-command">https://docs.microsoft.com/azure/virtual-machines/linux/run-command</a>.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: For more information, see https://docs.microsoft.com/azure/virtual-machines/windows/run-command or https://docs.microsoft.com/azure/virtual-machines/linux/run-command.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/secret.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/secret.yml
index d268a39b20..3941f64342 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/secret.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/secret.yml
@@ -1,27 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_secret
-  name: az vm secret
-  summary: Manage VM secrets.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_secret_add
-  - az_vm_secret_format
-  - az_vm_secret_list
-  - az_vm_secret_remove
+### YamlMime:AzureCLIGroup
+uid: az_vm_secret
+name: az vm secret
+summary: Manage VM secrets.
+description: ''
+directCommands:
 - uid: az_vm_secret_add
   name: az vm secret add
   summary: Add a secret to a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm secret add --certificate
+                     --keyvault
+                     [--certificate-store]
+                     [--ids]
+                     [--name]
+                     [--resource-group]
+                     [--subscription]
   examples:
   - summary: Add a secret to a VM. (autogenerated)
-    syntax:
-      content: az vm secret add --certificate {certificate} --keyvault {keyvault} --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm secret add --certificate {certificate} --keyvault {keyvault} --name MyVirtualMachine --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --certificate
     summary: Key vault certificate name or its full secret URL.
@@ -30,6 +28,7 @@ items:
     name: --keyvault
     summary: Name or ID of the key vault.
     description: ''
+  optionalParameters:
   - name: --certificate-store
     summary: 'Windows certificate store names. Default: My.'
     description: ''
@@ -37,45 +36,44 @@ items:
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_secret_format
   name: az vm secret format
   summary: Transform secrets into a form that can be used by VMs and VMSSes.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm secret format --secrets
+                        [--certificate-store]
+                        [--keyvault]
+                        [--resource-group]
+                        [--subscription]
   examples:
   - summary: Create a self-signed certificate with the default policy, and add it to a virtual machine.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
-        az vm create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
-  parameters:
+      az vm create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
+  requiredParameters:
   - isRequired: true
     name: --secrets -s
     summary: Space-separated list of key vault secret URIs. Perhaps, produced by 'az keyvault secret list-versions --vault-name vaultname -n cert1 --query "[?attributes.enabled].id" -o tsv'.
     description: 'The command will attempt to resolve the vault ID for each secret. If it is unable to do so, specify the vault ID to use for *all* secrets using: --keyvault NAME --resource-group NAME | --keyvault ID.'
+  optionalParameters:
   - name: --certificate-store
     summary: 'Windows certificate store names. Default: My.'
     description: ''
@@ -83,56 +81,58 @@ items:
     summary: Name or ID of the key vault.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_secret_list
   name: az vm secret list
   summary: List secrets on a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm secret list --name
+                      --resource-group
+                      [--query-examples]
+                      [--subscription]
   examples:
   - summary: List secrets on a VM. (autogenerated)
-    syntax:
-      content: az vm secret list --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vm secret list --name MyVirtualMachine --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_secret_remove
   name: az vm secret remove
   summary: Remove a secret from a VM.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vm secret remove --keyvault
+                        [--certificate]
+                        [--ids]
+                        [--name]
+                        [--resource-group]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --keyvault
     summary: Name or ID of the key vault.
     description: ''
+  optionalParameters:
   - name: --certificate
     summary: Key vault certificate name or its full secret URL.
     description: ''
@@ -140,33 +140,20 @@ items:
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_secret_add
-  name: az vm secret add
-  summary: Add a secret to a VM.
-- uid: az_vm_secret_format
-  name: az vm secret format
-  summary: Transform secrets into a form that can be used by VMs and VMSSes.
-- uid: az_vm_secret_list
-  name: az vm secret list
-  summary: List secrets on a VM.
-- uid: az_vm_secret_remove
-  name: az vm secret remove
-  summary: Remove a secret from a VM.
+- az_vm_secret_add
+- az_vm_secret_format
+- az_vm_secret_list
+- az_vm_secret_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -182,10 +169,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage VM secrets.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage VM secrets.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/unmanaged-disk.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/unmanaged-disk.yml
index 23028a97c7..4ba31f3b68 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/unmanaged-disk.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/unmanaged-disk.yml
@@ -1,55 +1,55 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_unmanaged_disk
-  name: az vm unmanaged-disk
-  summary: Manage the unmanaged data disks attached to a VM.
-  description: >-
-    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+### YamlMime:AzureCLIGroup
+uid: az_vm_unmanaged-disk
+name: az vm unmanaged-disk
+summary: Manage the unmanaged data disks attached to a VM.
+description: >-
+  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
 
-    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
 
-    For more information, see:
+  For more information, see:
 
-    - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+  - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-    - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+  - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-    - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
-  langs:
-  - azurecli
-  children:
-  - az_vm_unmanaged_disk_attach
-  - az_vm_unmanaged_disk_detach
-  - az_vm_unmanaged_disk_list
-- uid: az_vm_unmanaged_disk_attach
+  - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
+directCommands:
+- uid: az_vm_unmanaged-disk_attach
   name: az vm unmanaged-disk attach
   summary: Attach an unmanaged persistent disk to a VM.
   description: This allows for the preservation of data, even if the VM is reprovisioned due to maintenance or resizing.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm unmanaged-disk attach --resource-group
+                                --vm-name
+                                [--caching {None, ReadOnly, ReadWrite}]
+                                [--lun]
+                                [--name]
+                                [--new]
+                                [--size-gb]
+                                [--subscription]
+                                [--vhd-uri]
   examples:
   - summary: Attach a new default sized (1023 GB) unmanaged data disk to a VM.
-    syntax:
-      content: az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --new
+    syntax: az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --new
   - summary: Attach an existing data disk to a VM as unmanaged.
-    syntax:
-      content: >-
-        az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --name MyDataDisk \
-            --vhd-uri https://mystorage.blob.core.windows.net/vhds/d1.vhd
+    syntax: >-
+      az vm unmanaged-disk attach -g MyResourceGroup --vm-name MyVm --name MyDataDisk \
+          --vhd-uri https://mystorage.blob.core.windows.net/vhds/d1.vhd
   - summary: Attach an unmanaged persistent disk to a VM. (autogenerated)
-    syntax:
-      content: az vm unmanaged-disk attach --name MyDataDisk --new --resource-group MyResourceGroup --size-gb 50 --vm-name MyVm
-  parameters:
+    syntax: az vm unmanaged-disk attach --name MyDataDisk --new --resource-group MyResourceGroup --size-gb 50 --vm-name MyVm
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --caching
     parameterValueGroup: None, ReadOnly, ReadWrite
     summary: Disk caching policy.
@@ -67,93 +67,80 @@ items:
     defaultValue: "1023"
     summary: 'Size in GB. Max size: 4095 GB (certain preview disks can be larger).'
     description: ''
-  - name: --vhd-uri
-    summary: 'Virtual hard disk URI. For example: <a href="https://mystorage.blob.core.windows.net/vhds/d1.vhd">https://mystorage.blob.core.windows.net/vhds/d1.vhd</a>.'
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_unmanaged_disk_detach
+  - name: --vhd-uri
+    summary: 'Virtual hard disk URI. For example: https://mystorage.blob.core.windows.net/vhds/d1.vhd.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_unmanaged-disk_detach
   name: az vm unmanaged-disk detach
   summary: Detach an unmanaged disk from a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm unmanaged-disk detach --name
+                                --resource-group
+                                --vm-name
+                                [--subscription]
   examples:
   - summary: Detach a data disk from a VM.
-    syntax:
-      content: az vm unmanaged-disk detach -g MyResourceGroup --vm-name MyVm -n disk_name
-  parameters:
+    syntax: az vm unmanaged-disk detach -g MyResourceGroup --vm-name MyVm -n disk_name
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The data disk name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vm-name
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_unmanaged_disk_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_unmanaged-disk_list
   name: az vm unmanaged-disk list
   summary: List unmanaged disks of a VM.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vm unmanaged-disk list --name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: List the unmanaged disks attached to a VM.
-    syntax:
-      content: az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm
+    syntax: az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm
   - summary: List unmanaged disks with names containing the string "data_disk".
-    syntax:
-      content: >-
-        az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm \
-            --query "[?contains(name, 'data_disk')]" --output table
-  parameters:
+    syntax: >-
+      az vm unmanaged-disk list -g MyResourceGroup --vm-name MyVm \
+          --query "[?contains(name, 'data_disk')]" --output table
+  requiredParameters:
   - isRequired: true
     name: --name --vm-name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_unmanaged_disk_attach
-  name: az vm unmanaged-disk attach
-  summary: Attach an unmanaged persistent disk to a VM.
-- uid: az_vm_unmanaged_disk_detach
-  name: az vm unmanaged-disk detach
-  summary: Detach an unmanaged disk from a VM.
-- uid: az_vm_unmanaged_disk_list
-  name: az vm unmanaged-disk list
-  summary: List unmanaged disks of a VM.
+- az_vm_unmanaged-disk_attach
+- az_vm_unmanaged-disk_detach
+- az_vm_unmanaged-disk_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -169,23 +156,20 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: >-
-  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: >-
+    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
 
-  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
 
-  For more information, see:
+    For more information, see:
 
-  - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+    - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-  - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+    - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-  - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
+    - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vm/user.yml b/2018-03-01-hybrid/docs-ref-autogen/vm/user.yml
index 31ff8707a0..3cddeaa3b6 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vm/user.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vm/user.yml
@@ -1,147 +1,131 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vm_user
-  name: az vm user
-  summary: Manage user accounts for a VM.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vm_user_delete
-  - az_vm_user_reset_ssh
-  - az_vm_user_update
+### YamlMime:AzureCLIGroup
+uid: az_vm_user
+name: az vm user
+summary: Manage user accounts for a VM.
+description: ''
+directCommands:
 - uid: az_vm_user_delete
   name: az vm user delete
   summary: Delete a user account from a VM.
   description: Also deletes the user home directory on Linux VMs.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm user delete --username
+                      [--ids]
+                      [--name]
+                      [--no-wait]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: Delete a user account.
-    syntax:
-      content: az vm user delete -u username -n MyVm -g MyResourceGroup
+    syntax: az vm user delete -u username -n MyVm -g MyResourceGroup
   - summary: Delete a user on all VMs in a resource group.
-    syntax:
-      content: az vm user delete -u username --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm user delete -u username --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  requiredParameters:
   - isRequired: true
     name: --username -u
     summary: The user name.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vm_user_reset_ssh
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vm_user_reset-ssh
   name: az vm user reset-ssh
   summary: Reset the SSH configuration on a VM.
   description: The extension will restart the SSH service, open the SSH port on your VM, and reset the SSH configuration to default values. The user account (name, password, and SSH keys) are not changed.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm user reset-ssh [--ids]
+                         [--name]
+                         [--no-wait]
+                         [--resource-group]
+                         [--subscription]
   examples:
   - summary: Reset the SSH configuration.
-    syntax:
-      content: az vm user reset-ssh -n MyVm -g MyResourceGroup
+    syntax: az vm user reset-ssh -n MyVm -g MyResourceGroup
   - summary: Reset the SSH server on all VMs in a resource group.
-    syntax:
-      content: az vm user reset-ssh --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vm user reset-ssh --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vm_user_update
   name: az vm user update
   summary: Update a user account.
   description: This command uses VMAccessForLinux 1.5 for Linux operating system and VMAccessAgent 2.4 for Window operating system.
-  langs:
-  - azurecli
+  syntax: >-
+    az vm user update --username
+                      [--ids]
+                      [--name]
+                      [--no-wait]
+                      [--password]
+                      [--resource-group]
+                      [--ssh-key-value]
+                      [--subscription]
   examples:
   - summary: Update a Windows user account. If username does not exist, a new user will be created.
-    syntax:
-      content: az vm user update -u username -p password -n MyVm -g MyResourceGroup
+    syntax: az vm user update -u username -p password -n MyVm -g MyResourceGroup
   - summary: Update a Linux user account. ("$(< filename)" syntax is not supported on Command Prompt or PowerShell.)
-    syntax:
-      content: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" -n MyVm -g MyResourceGroup
+    syntax: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" -n MyVm -g MyResourceGroup
   - summary: Update a user on all VMs in a resource group. ("$(< filename)" syntax is not supported on Command Prompt or PowerShell.)
-    syntax:
-      content: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
-  parameters:
+    syntax: az vm user update -u username --ssh-key-value "$(< ~/.ssh/id_rsa.pub)" --ids $(az vm list -g MyResourceGroup --query "[].id" -o tsv)
+  requiredParameters:
   - isRequired: true
     name: --username -u
     summary: The user name.
     description: ''
+  optionalParameters:
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --password -p
     summary: The user password.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --ssh-key-value
     summary: SSH public key file value or public key file path. This command appends the new public key text to the ~/.ssh/authorized_keys file for the admin user on the VM. This does not replace or remove any existing SSH keys.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vm_user_delete
-  name: az vm user delete
-  summary: Delete a user account from a VM.
-- uid: az_vm_user_reset_ssh
-  name: az vm user reset-ssh
-  summary: Reset the SSH configuration on a VM.
-- uid: az_vm_user_update
-  name: az vm user update
-  summary: Update a user account.
+- az_vm_user_delete
+- az_vm_user_reset-ssh
+- az_vm_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -157,10 +141,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage user accounts for a VM.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage user accounts for a VM.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss.yml
index fedb2da2d1..c75f2fecbc 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss.yml
@@ -1,93 +1,163 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss
-  name: az vmss
-  summary: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_create
-  - az_vmss_deallocate
-  - az_vmss_delete
-  - az_vmss_delete_instances
-  - az_vmss_get_instance_view
-  - az_vmss_list
-  - az_vmss_list_instance_connection_info
-  - az_vmss_list_instance_public_ips
-  - az_vmss_list_instances
-  - az_vmss_list_skus
-  - az_vmss_reimage
-  - az_vmss_restart
-  - az_vmss_scale
-  - az_vmss_set_orchestration_service_state
-  - az_vmss_show
-  - az_vmss_start
-  - az_vmss_stop
-  - az_vmss_update
-  - az_vmss_update_instances
-  - az_vmss_wait
+### YamlMime:AzureCLIGroup
+uid: az_vmss
+name: az vmss
+summary: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
+description: ''
+directCommands:
 - uid: az_vmss_create
   name: az vmss create
   summary: Create an Azure Virtual Machine Scale Set.
-  description: For an end-to-end tutorial, see <a href="https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli">https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli</a>.
-  langs:
-  - azurecli
+  description: For an end-to-end tutorial, see https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli.
+  syntax: >-
+    az vmss create --name
+                   --resource-group
+                   [--accelerated-networking {false, true}]
+                   [--admin-password]
+                   [--admin-username]
+                   [--app-gateway]
+                   [--app-gateway-capacity]
+                   [--app-gateway-sku]
+                   [--app-gateway-subnet-address-prefix]
+                   [--assign-identity]
+                   [--authentication-type {all, password, ssh}]
+                   [--backend-pool-name]
+                   [--backend-port]
+                   [--computer-name-prefix]
+                   [--custom-data]
+                   [--data-disk-caching]
+                   [--data-disk-sizes-gb]
+                   [--disable-overprovision]
+                   [--dns-servers]
+                   [--encryption-at-host {false, true}]
+                   [--generate-ssh-keys]
+                   [--health-probe]
+                   [--image]
+                   [--instance-count]
+                   [--lb]
+                   [--lb-nat-pool-name]
+                   [--lb-sku {Basic, Standard}]
+                   [--license-type {None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server}]
+                   [--location]
+                   [--no-wait]
+                   [--nsg]
+                   [--orchestration-mode {Flexible, Uniform}]
+                   [--os-disk-caching {None, ReadOnly, ReadWrite}]
+                   [--os-disk-name]
+                   [--os-disk-size-gb]
+                   [--os-type {linux, windows}]
+                   [--plan-name]
+                   [--plan-product]
+                   [--plan-promotion-code]
+                   [--plan-publisher]
+                   [--public-ip-address]
+                   [--public-ip-address-allocation {dynamic, static}]
+                   [--public-ip-address-dns-name]
+                   [--public-ip-per-vm]
+                   [--role]
+                   [--scale-in-policy]
+                   [--scope]
+                   [--secrets]
+                   [--single-placement-group {false, true}]
+                   [--specialized {false, true}]
+                   [--ssh-dest-key-path]
+                   [--ssh-key-values]
+                   [--storage-container-name]
+                   [--storage-sku]
+                   [--subnet]
+                   [--subnet-address-prefix]
+                   [--subscription]
+                   [--tags]
+                   [--upgrade-policy-mode {Automatic, Manual, Rolling}]
+                   [--use-unmanaged-disk]
+                   [--validate]
+                   [--vm-domain-name]
+                   [--vm-sku]
+                   [--vnet-address-prefix]
+                   [--vnet-name]
+                   [--zones {1, 2, 3}]
   examples:
   - summary: Create a Windows VM scale set with 5 instances, a load balancer, a public IP address, a 2GB data disk and 40GB OS disk.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --instance-count 5 --image Win2016Datacenter --data-disk-sizes-gb 2 --os-disk-size-gb 40
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --instance-count 5 --image Win2016Datacenter --data-disk-sizes-gb 2 --os-disk-size-gb 40
   - summary: Create a Linux VM scale set with an auto-generated ssh key pair, a public IP address, a DNS entry, an existing load balancer, and an existing virtual network.
-    syntax:
-      content: >-
-        az vmss create -n MyVmss -g MyResourceGroup --public-ip-address-dns-name my-globally-dns-name \
-            --load-balancer MyLoadBalancer --vnet-name MyVnet --subnet MySubnet --image UbuntuLTS \
-            --generate-ssh-keys
+    syntax: >-
+      az vmss create -n MyVmss -g MyResourceGroup --public-ip-address-dns-name my-globally-dns-name \
+          --load-balancer MyLoadBalancer --vnet-name MyVnet --subnet MySubnet --image UbuntuLTS \
+          --generate-ssh-keys
   - summary: Create a Linux VM scale set from a custom image using the default existing public SSH key.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --image MyImage
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --image MyImage
   - summary: Create a Linux VM scale set with a load balancer and custom DNS servers. Each VM has a public-ip address and a custom domain name.
-    syntax:
-      content: >-
-        az vmss create -n MyVmss -g MyResourceGroup --image centos \
-            --public-ip-per-vm --vm-domain-name myvmss --dns-servers 10.0.0.6 10.0.0.5
-  - summary: 'Create a Linux VM scale set using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init'
-    syntax:
-      content: az vmss create -g MyResourceGroup -n MyVmss --image debian --custom-data MyCloudInitScript.yml
+    syntax: >-
+      az vmss create -n MyVmss -g MyResourceGroup --image centos \
+          --public-ip-per-vm --vm-domain-name myvmss --dns-servers 10.0.0.6 10.0.0.5
+  - summary: 'Create a Linux VM scale set using a cloud-init script for configuration. See: https://docs.microsoft.com/azure/virtual-machines/linux/using-cloud-init'
+    syntax: az vmss create -g MyResourceGroup -n MyVmss --image debian --custom-data MyCloudInitScript.yml
   - summary: Create a Linux VM scale set from a specialized image version.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --image $id --specialized
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --image $id --specialized
   - summary: Create a Debian VM scaleset using Key Vault secrets.
-    syntax:
-      content: >-
-        az keyvault certificate create --vault-name vaultname -n cert1 \
-          -p "$(az keyvault certificate get-default-policy)"
+    syntax: >-
+      az keyvault certificate create --vault-name vaultname -n cert1 \
+        -p "$(az keyvault certificate get-default-policy)"
 
-        secrets=$(az keyvault secret list-versions --vault-name vaultname \
-          -n cert1 --query "[?attributes.enabled].id" -o tsv)
+      secrets=$(az keyvault secret list-versions --vault-name vaultname \
+        -n cert1 --query "[?attributes.enabled].id" -o tsv)
 
-        vm_secrets=$(az vm secret format -s "$secrets")
+      vm_secrets=$(az vm secret format -s "$secrets")
 
 
-        az vmss create -g group-name -n vm-name --admin-username deploy  \
-          --image debian --secrets "$vm_secrets"
+      az vmss create -g group-name -n vm-name --admin-username deploy  \
+        --image debian --secrets "$vm_secrets"
   - summary: Create a VM scaleset with system assigned identity. The VM will have a 'Contributor' Role with access to a storage account.
-    syntax:
-      content: az vmss create -n MyVmss -g MyResourceGroup --image centos --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
+    syntax: az vmss create -n MyVmss -g MyResourceGroup --image centos --assign-identity --scope /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/MyResourceGroup/myRG/providers/Microsoft.Storage/storageAccounts/storage1
   - summary: Create a debian VM scaleset with a user assigned identity.
-    syntax:
-      content: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+    syntax: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
   - summary: Create a debian VM scaleset with both system and user assigned identity.
-    syntax:
-      content: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
-  parameters:
+    syntax: az vmss create -n MyVmss -g rg1 --image debian --assign-identity  [system] /subscriptions/99999999-1bf0-4dda-aec3-cb9272f09590/resourcegroups/myRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myID
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the virtual machine scale set.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accelerated-networking
+    parameterValueGroup: false, true
+    summary: Enable accelerated networking. Unless specified, CLI will enable it based on machine image and size.
+    description: ''
+  - name: --admin-password
+    summary: Password for the VM if authentication type is 'Password'.
+    description: ''
+  - name: --admin-username
+    summary: Username for the VM. Default value is current username of OS. If the default value is system reserved, then default value will be set to azureuser. Please refer to https://docs.microsoft.com/en-us/rest/api/compute/virtualmachines/createorupdate#osprofile to get a full list of reserved values.
+    description: ''
+  - name: --app-gateway
+    summary: Name to use when creating a new application gateway (default) or referencing an existing one. Can also reference an existing application gateway by ID or specify "" for none.
+    description: ''
+  - name: --app-gateway-capacity
+    defaultValue: "10"
+    summary: The number of instances to use when creating a new application gateway.
+    description: ''
+  - name: --app-gateway-sku
+    defaultValue: Standard_Large
+    summary: SKU when creating a new application gateway.
+    description: ''
+  - name: --app-gateway-subnet-address-prefix
+    summary: The subnet IP address prefix to use when creating a new application gateway in CIDR format.
+    description: ''
+  - name: --assign-identity
+    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+    description: ''
+  - name: --authentication-type
+    parameterValueGroup: all, password, ssh
+    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
+    description: ''
+  - name: --backend-pool-name
+    summary: Name to use for the backend pool when creating a new load balancer or application gateway.
+    description: ''
+  - name: --backend-port
+    summary: When creating a new load balancer, backend port to open with NAT rules (Defaults to 22 on Linux and 3389 on Windows). When creating an application gateway, the backend port to use for the backend HTTP settings.
     description: ''
   - name: --computer-name-prefix
     summary: Computer name prefix for all of the virtual machines in the scale set. Computer name prefixes must be 1 to 15 characters long.
@@ -95,8 +165,24 @@ items:
   - name: --custom-data
     summary: Custom init script file or text (cloud-init, cloud-config, etc..).
     description: ''
+  - name: --data-disk-caching
+    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `<lun>=<vaule1> <lun>=<value2>` to configure individual disk.
+    description: ''
+  - name: --data-disk-sizes-gb
+    summary: Space-separated empty managed data disk sizes in GB to create.
+    description: ''
   - name: --disable-overprovision
-    summary: Overprovision option (see <a href="https://azure.microsoft.com/documentation/articles/virtual-machine-scale-sets-overview/">https://azure.microsoft.com/documentation/articles/virtual-machine-scale-sets-overview/</a> for details).
+    summary: Overprovision option (see https://azure.microsoft.com/documentation/articles/virtual-machine-scale-sets-overview/ for details).
+    description: ''
+  - name: --dns-servers
+    summary: Space-separated IP addresses of DNS servers, e.g. 10.0.0.5 10.0.0.6.
+    description: ''
+  - name: --encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable Host Encryption for the VM or VMSS. This will enable the encryption for all the disks including Resource/Temp disk at host itself.
+    description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
     description: ''
   - name: --health-probe
     summary: Probe name from the existing load balancer, mainly used for rolling upgrade or automatic repairs.
@@ -109,8 +195,18 @@ items:
     defaultValue: "2"
     summary: Number of VMs in the scale set.
     description: ''
+  - name: --lb --load-balancer
+    summary: Name to use when creating a new load balancer (default) or referencing an existing one. Can also reference an existing load balancer by ID or specify "" for none.
+    description: ''
+  - name: --lb-nat-pool-name --nat-pool-name
+    summary: Name to use for the NAT pool when creating a new load balancer.
+    description: ''
+  - name: --lb-sku
+    parameterValueGroup: Basic, Standard
+    summary: Sku of the Load Balancer to create. Default to 'Standard' when single placement group is turned off; otherwise, default to 'Basic'.
+    description: ''
   - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
+    parameterValueGroup: None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server
     summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
   - name: --location -l
@@ -119,68 +215,27 @@ items:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --orchestration-mode
-    defaultValue: ScaleSetVM
-    parameterValueGroup: ScaleSetVM, VM
-    summary: Choose how virtual machines are managed by the scale set. In VM mode, you manually create and add a virtual machine of any configuration to the scale set. In ScaleSetVM mode, you define a virtual machine model and Azure will generate identical instances based on that model.
-    description: ''
-  - name: --scale-in-policy
-    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
-    description: ''
-  - name: --secrets
-    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
-    description: ''
-  - name: --single-placement-group
-    parameterValueGroup: false, true
-    summary: Limit the scale set to a single placement group. See <a href="https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups">https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups</a> for details.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
-    description: ''
-  - name: --upgrade-policy-mode
-    defaultValue: manual
-    parameterValueGroup: Automatic, Manual, Rolling
-    summary: ''
-    description: ''
-  - name: --validate
-    summary: Generate and validate the ARM template without creating any resources.
-    description: ''
-  - name: --vm-sku
-    summary: Size of VMs in the scale set. Default to "Standard_DS1_v2". See <a href="https://azure.microsoft.com/pricing/details/virtual-machines/">https://azure.microsoft.com/pricing/details/virtual-machines/</a> for size info.
-    description: ''
-  - name: --zones -z
-    parameterValueGroup: 1, 2, 3
-    summary: Space-separated list of availability zones into which to provision the resource.
-    description: ''
-  - name: --admin-password
-    summary: Password for the VM if authentication type is 'Password'.
-    description: ''
-  - name: --admin-username
-    defaultValue: your_system_user_login_name
-    summary: Username for the VM.
-    description: ''
-  - name: --authentication-type
-    parameterValueGroup: all, password, ssh
-    summary: Type of authentication to use with the VM. Defaults to password for Windows and SSH public key for Linux. "all" enables both ssh and password authentication.
-    description: ''
-  - name: --generate-ssh-keys
-    summary: Generate SSH public and private key files if missing. The keys will be stored in the ~/.ssh directory.
+  - name: --nsg
+    summary: Name or ID of an existing Network Security Group.
     description: ''
-  - name: --ssh-dest-key-path
-    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
+  - name: --orchestration-mode
+    defaultValue: Uniform
+    parameterValueGroup: Flexible, Uniform
+    summary: Choose how virtual machines are managed by the scale set. In Uniform mode, you define a virtual machine model and Azure will generate identical instances based on that model. In Flexible mode, you manually create and add a virtual machine of any configuration to the scale set or generate identical instances based on virtual machine model defined for the scale set.
     description: ''
-  - name: --ssh-key-values
-    summary: Space-separated list of SSH public keys or public key file paths.
+  - name: --os-disk-caching
+    parameterValueGroup: None, ReadOnly, ReadWrite
+    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
     description: ''
-  - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, or a resource id to refer user assigned identity. Check out help for more examples.
+  - name: --os-disk-name
+    summary: The name of the new VM OS disk.
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
+  - name: --os-disk-size-gb
+    summary: OS disk size in GB to create.
     description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
+  - name: --os-type
+    parameterValueGroup: linux, windows
+    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
     description: ''
   - name: --plan-name
     summary: Plan name.
@@ -194,16 +249,6 @@ items:
   - name: --plan-publisher
     summary: Plan publisher.
     description: ''
-  - name: --accelerated-networking
-    parameterValueGroup: false, true
-    summary: Enable accelerated networking. Unless specified, CLI will enable it based on machine image and size.
-    description: ''
-  - name: --dns-servers
-    summary: Space-separated IP addresses of DNS servers, e.g. 10.0.0.5 10.0.0.6.
-    description: ''
-  - name: --nsg
-    summary: Name or ID of an existing Network Security Group.
-    description: ''
   - name: --public-ip-address
     summary: Name of the public IP address when creating one (default) or referencing an existing one. Can also reference an existing public IP by ID or specify "" for None ('""' in Azure CLI using PowerShell or --% operator).
     description: ''
@@ -217,114 +262,104 @@ items:
   - name: --public-ip-per-vm
     summary: Each VM instance will have a public ip. For security, you can use '--nsg' to apply appropriate rules.
     description: ''
-  - name: --subnet
-    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
-    description: ''
-  - name: --subnet-address-prefix
-    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
-    description: ''
-  - name: --vm-domain-name
-    summary: Domain name of VM instances, once configured, the FQDN is `vm&lt;vm-index&gt;.&lt;vm-domain-name&gt;.&lt;..rest..&gt;`.
-    description: ''
-  - name: --vnet-address-prefix
-    defaultValue: 10.0.0.0/16
-    summary: The IP address prefix to use when creating a new VNet in CIDR format.
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
     description: ''
-  - name: --vnet-name
-    summary: Name of the virtual network when creating a new one or referencing an existing one.
+  - name: --scale-in-policy
+    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
     description: ''
-  - name: --app-gateway
-    summary: Name to use when creating a new application gateway (default) or referencing an existing one. Can also reference an existing application gateway by ID or specify "" for none.
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
-  - name: --app-gateway-capacity
-    defaultValue: "10"
-    summary: The number of instances to use when creating a new application gateway.
+  - name: --secrets
+    summary: 'One or many Key Vault secrets as JSON strings or files via `@{path}` containing `[{ "sourceVault": { "id": "value" }, "vaultCertificates": [{ "certificateUrl": "value", "certificateStore": "cert store name (only on windows)"}] }]`.'
     description: ''
-  - name: --app-gateway-sku
-    defaultValue: Standard_Large
-    summary: SKU when creating a new application gateway.
+  - name: --single-placement-group
+    parameterValueGroup: false, true
+    summary: Limit the scale set to a single placement group. See https://docs.microsoft.com/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups for details.
     description: ''
-  - name: --app-gateway-subnet-address-prefix
-    summary: The subnet IP address prefix to use when creating a new application gateway in CIDR format.
+  - name: --specialized
+    parameterValueGroup: false, true
+    summary: Indicate whether the source image is specialized.
     description: ''
-  - name: --backend-pool-name
-    summary: Name to use for the backend pool when creating a new load balancer or application gateway.
+  - name: --ssh-dest-key-path
+    summary: Destination file path on the VM for the SSH key. If the file already exists, the specified key(s) are appended to the file. Destination path for SSH public keys is currently limited to its default value "/home/username/.ssh/authorized_keys" due to a known issue in Linux provisioning agent.
     description: ''
-  - name: --backend-port
-    summary: When creating a new load balancer, backend port to open with NAT rules (Defaults to 22 on Linux and 3389 on Windows). When creating an application gateway, the backend port to use for the backend HTTP settings.
+  - name: --ssh-key-values
+    summary: Space-separated list of SSH public keys or public key file paths.
     description: ''
-  - name: --lb --load-balancer
-    summary: Name to use when creating a new load balancer (default) or referencing an existing one. Can also reference an existing load balancer by ID or specify "" for none.
+  - name: --storage-container-name
+    defaultValue: vhds
+    summary: 'Only applicable when used with `--use-unmanaged-disk`. Name of the storage container for the VM OS disk. Default: vhds.'
     description: ''
-  - name: --lb-nat-pool-name --nat-pool-name
-    summary: Name to use for the NAT pool when creating a new load balancer.
+  - name: --storage-sku
+    summary: 'The SKU of the storage account with which to persist VM. Use a singular sku that would be applied across all disks, or specify individual disks. Usage: [--storage-sku SKU | --storage-sku ID=SKU ID=SKU ID=SKU...], where each ID is "os" or a 0-indexed lun. Allowed values: Standard_LRS, Premium_LRS.'
     description: ''
-  - name: --lb-sku
-    parameterValueGroup: Basic, Standard
-    summary: Sku of the Load Balancer to create. Default to 'Standard' when single placement group is turned off; otherwise, default to 'Basic'.
+  - name: --subnet
+    summary: The name of the subnet when creating a new VNet or referencing an existing one. Can also reference an existing subnet by ID. If both vnet-name and subnet are omitted, an appropriate VNet and subnet will be selected automatically, or a new one will be created.
     description: ''
-  - name: --data-disk-caching
-    summary: Storage caching type for data disk(s), including 'None', 'ReadOnly', 'ReadWrite', etc. Use a singular value to apply on all disks, or use `&lt;lun&gt;=&lt;vaule1&gt; &lt;lun&gt;=&lt;value2&gt;` to configure individual disk.
+  - name: --subnet-address-prefix
+    summary: The subnet IP address prefix to use when creating a new VNet in CIDR format.
     description: ''
-  - name: --data-disk-sizes-gb
-    summary: Space-separated empty managed data disk sizes in GB to create.
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  - name: --os-disk-caching
-    parameterValueGroup: None, ReadOnly, ReadWrite
-    summary: 'Storage caching type for the VM OS disk. Default: ReadWrite.'
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
-  - name: --os-disk-name
-    summary: The name of the new VM OS disk.
+  - name: --upgrade-policy-mode
+    defaultValue: manual
+    parameterValueGroup: Automatic, Manual, Rolling
+    summary: ''
     description: ''
-  - name: --os-disk-size-gb
-    summary: OS disk size in GB to create.
+  - name: --use-unmanaged-disk
+    summary: Do not use managed disk to persist VM.
     description: ''
-  - name: --os-type
-    parameterValueGroup: linux, windows
-    summary: Type of OS installed on a custom VHD. Do not use when specifying an URN or URN alias.
+  - name: --validate
+    summary: Generate and validate the ARM template without creating any resources.
     description: ''
-  - name: --specialized
-    parameterValueGroup: false, true
-    summary: Indicate whether the source image is specialized.
+  - name: --vm-domain-name
+    summary: Domain name of VM instances, once configured, the FQDN is `vm<vm-index>.<vm-domain-name>.<..rest..>`.
     description: ''
-  - name: --storage-container-name
-    defaultValue: vhds
-    summary: 'Only applicable when used with `--use-unmanaged-disk`. Name of the storage container for the VM OS disk. Default: vhds.'
+  - name: --vm-sku
+    summary: Size of VMs in the scale set. Default to "Standard_DS1_v2". See https://azure.microsoft.com/pricing/details/virtual-machines/ for size info.
     description: ''
-  - name: --storage-sku
-    summary: 'The SKU of the storage account with which to persist VM. Use a singular sku that would be applied across all disks, or specify individual disks. Usage: [--storage-sku SKU | --storage-sku ID=SKU ID=SKU ID=SKU...], where each ID is "os" or a 0-indexed lun. Allowed values: Standard_LRS, Premium_LRS.'
+  - name: --vnet-address-prefix
+    defaultValue: 10.0.0.0/16
+    summary: The IP address prefix to use when creating a new VNet in CIDR format.
     description: ''
-  - name: --use-unmanaged-disk
-    summary: Do not use managed disk to persist VM.
+  - name: --vnet-name
+    summary: Name of the virtual network when creating a new one or referencing an existing one.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: Space-separated list of availability zones into which to provision the resource.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_deallocate
   name: az vmss deallocate
   summary: Deallocate VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss deallocate --name
+                       --resource-group
+                       [--instance-ids]
+                       [--no-wait]
+                       [--subscription]
   examples:
   - summary: Deallocate VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss deallocate --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss deallocate --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -334,86 +369,82 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_delete
   name: az vmss delete
   summary: Deletes a VM scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  syntax: >-
+    az vmss delete [--ids]
+                   [--name]
+                   [--no-wait]
+                   [--resource-group]
+                   [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_delete_instances
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_delete-instances
   name: az vmss delete-instances
   summary: Delete VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss delete-instances --instance-ids
+                             --name
+                             --resource-group
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Delete VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss delete-instances --instance-ids 0 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss delete-instances --instance-ids 0 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_get_instance_view
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_get-instance-view
   name: az vmss get-instance-view
   summary: View an instance of a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss get-instance-view [--ids]
+                              [--instance-id]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
   examples:
   - summary: View an instance of a VMSS. (autogenerated)
-    syntax:
-      content: az vmss get-instance-view --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss get-instance-view --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -421,170 +452,162 @@ items:
     summary: A VM instance ID or "\*" to list instance view for all VMs in a scale set.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_list
   name: az vmss list
   summary: List VMSS.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss list [--query-examples]
+                 [--resource-group]
+                 [--subscription]
+  examples:
+  - summary: List VMSS (autogenerated)
+    syntax: az vmss list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_instance_connection_info
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-instance-connection-info
   name: az vmss list-instance-connection-info
   summary: Get the IP address and port number used to connect to individual VM instances within a set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss list-instance-connection-info [--ids]
+                                          [--name]
+                                          [--resource-group]
+                                          [--subscription]
   examples:
   - summary: Get the IP address and port number used to connect to individual VM instances within a set. (autogenerated)
-    syntax:
-      content: az vmss list-instance-connection-info --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss list-instance-connection-info --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_instance_public_ips
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-instance-public-ips
   name: az vmss list-instance-public-ips
   summary: List public IP addresses of VM instances within a set.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss list-instance-public-ips [--ids]
+                                     [--name]
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: List public IP addresses of VM instances within a set. (autogenerated)
-    syntax:
-      content: az vmss list-instance-public-ips --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss list-instance-public-ips --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_instances
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-instances
   name: az vmss list-instances
   summary: Gets a list of all virtual machines in a VM scale sets.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss list-instances [--expand]
+                           [--filter]
+                           [--ids]
+                           [--name]
+                           [--resource-group]
+                           [--select]
+                           [--subscription]
+  optionalParameters:
   - name: --expand
-    summary: The expand expression to apply to the operation.
+    summary: The expand expression to apply to the operation. Allowed values are 'instanceView'.
     description: ''
   - name: --filter
-    summary: The filter to apply to the operation.
-    description: ''
-  - name: --select
-    summary: The list parameters.
+    summary: The filter to apply to the operation. Allowed values are 'startswith(instanceView/statuses/code, 'PowerState') eq true', 'properties/latestModelApplied eq true', 'properties/latestModelApplied eq false'.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --select
+    summary: The list parameters. Allowed values are 'instanceView', 'instanceView/statuses'.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_list_skus
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_list-skus
   name: az vmss list-skus
   summary: Gets a list of SKUs available for your VM scale set, including the minimum and maximum VM instances allowed for each SKU.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss list-skus [--ids]
+                      [--name]
+                      [--resource-group]
+                      [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_reimage
   name: az vmss reimage
   summary: Reimage VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss reimage [--ids]
+                    [--instance-id]
+                    [--name]
+                    [--no-wait]
+                    [--resource-group]
+                    [--subscription]
   examples:
   - summary: Reimage VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss reimage --instance-id 1 --name MyScaleSet --resource-group MyResourceGroup --subscription MySubscription
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+    syntax: az vmss reimage --instance-id 1 --name MyScaleSet --resource-group MyResourceGroup --subscription MySubscription
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -592,39 +615,41 @@ items:
     summary: VM instance ID. If missing, reimage all instances.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_restart
   name: az vmss restart
   summary: Restart VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss restart --name
+                    --resource-group
+                    [--instance-ids]
+                    [--no-wait]
+                    [--subscription]
   examples:
   - summary: Restart VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss restart --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss restart --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -634,59 +659,59 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_scale
   name: az vmss scale
   summary: Change the number of VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss scale --new-capacity
+                  [--ids]
+                  [--name]
+                  [--no-wait]
+                  [--resource-group]
+                  [--subscription]
   examples:
   - summary: Change the number of VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss scale --name MyScaleSet --new-capacity 6 --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss scale --name MyScaleSet --new-capacity 6 --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --new-capacity
     summary: Number of VMs in the VMSS.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_set_orchestration_service_state
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_set-orchestration-service-state
   name: az vmss set-orchestration-service-state
   summary: Change ServiceState property for a given service within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss set-orchestration-service-state --action
+                                            --service-name
+                                            [--ids]
+                                            [--name]
+                                            [--no-wait]
+                                            [--resource-group]
+                                            [--subscription]
   examples:
   - summary: Change ServiceState property for AutomaticRepairs
-    syntax:
-      content: az vmss set-orchestration-service-state --service-name AutomaticRepairs --action Resume --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss set-orchestration-service-state --service-name AutomaticRepairs --action Resume --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --action
     summary: The action to be performed.
@@ -695,77 +720,79 @@ items:
     name: --service-name
     summary: The name of the orchestration service.
     description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_show
   name: az vmss show
   summary: Get details on VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss show --name
+                 --resource-group
+                 [--instance-id]
+                 [--query-examples]
+                 [--subscription]
   examples:
   - summary: Get details on VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss show --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss show --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-id
     summary: VM instance ID. If missing, show the VMSS.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_start
   name: az vmss start
   summary: Start VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss start --name
+                  --resource-group
+                  [--instance-ids]
+                  [--no-wait]
+                  [--subscription]
   examples:
   - summary: Start VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss start --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss start --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -775,34 +802,32 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_stop
   name: az vmss stop
   summary: Power off (stop) VMs within a VMSS.
   description: The VMs will continue to be billed. To avoid this, you can deallocate VM instances within a VMSS through "az vmss deallocate".
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss stop --name
+                 --resource-group
+                 [--instance-ids]
+                 [--no-wait]
+                 [--subscription]
   examples:
   - summary: Power off VMs within a VMSS without shutting down.
-    syntax:
-      content: az vmss stop --name MyScaleSet --resource-group MyResourceGroup --skip-shutdown
+    syntax: az vmss stop --name MyScaleSet --resource-group MyResourceGroup --skip-shutdown
   - summary: Power off (stop) VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss stop --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss stop --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances. If not provided, the action will be applied on the scaleset itself.'
     description: ''
@@ -812,44 +837,43 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_update
   name: az vmss update
-  summary: Update a VMSS.
+  summary: Update a VMSS. Run 'az vmss update-instances' command to roll out the changes to VMs if you have not configured upgrade policy.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss update [--add]
+                   [--force-string]
+                   [--ids]
+                   [--instance-id]
+                   [--license-type {None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server}]
+                   [--name]
+                   [--no-wait]
+                   [--remove]
+                   [--resource-group]
+                   [--scale-in-policy]
+                   [--set]
+                   [--subscription]
   examples:
   - summary: Update a VMSS' license type for Azure Hybrid Benefit.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --license-type windows_server
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --license-type windows_server
   - summary: Update a VM instance's protection policies.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --protect-from-scale-set-actions False --protect-from-scale-in
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --protect-from-scale-set-actions False --protect-from-scale-in
   - summary: Update a VM instance's protection policies.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --set protectionPolicy.protectFromScaleIn=True protectionPolicy.protectFromScaleSetActions=False
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --instance-id 4 --set protectionPolicy.protectFromScaleIn=True protectionPolicy.protectFromScaleSetActions=False
   - summary: Update a VM instance's Read-Write IOPS of the managed disk.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskIOPSReadWrite=444
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskIOPSReadWrite=444
   - summary: Update a VM instance's bandwidth in MB per second of the managed disk.
-    syntax:
-      content: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskMBpsReadWrite=66
-  parameters:
-  - name: --license-type
-    parameterValueGroup: None, Windows_Client, Windows_Server
-    summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
-    description: ''
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.dataDisks[0].diskMBpsReadWrite=66
+  - summary: Update a VM to use a custom image.
+    syntax: az vmss update --name MyScaleSet --resource-group MyResourceGroup --set virtualMachineProfile.storageProfile.imageReference.id=imageID
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --scale-in-policy
-    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -857,100 +881,91 @@ items:
   - name: --instance-id
     summary: Update the VM instance with this ID. If missing, Update the VMSS.
     description: ''
-  - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+  - name: --license-type
+    parameterValueGroup: None, RHEL_BYOS, SLES_BYOS, Windows_Client, Windows_Server
+    summary: Specifies that the Windows image or disk was licensed on-premises. To enable Azure Hybrid Benefit for Windows Server, use 'Windows_Server'. To enable Multitenant Hosting Rights for Windows 10, use 'Windows_Client'. For more information see the Azure Windows VM online docs.
     description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --name -n
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --scale-in-policy
+    summary: Specify the scale-in policy (space delimited) that decides which virtual machines are chosen for removal when a Virtual Machine Scale Set is scaled-in.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_update_instances
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_update-instances
   name: az vmss update-instances
   summary: Upgrade VMs within a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss update-instances --instance-ids
+                             --name
+                             --resource-group
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Upgrade VMs within a VMSS. (autogenerated)
-    syntax:
-      content: az vmss update-instances --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss update-instances --instance-ids 1 --name MyScaleSet --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --instance-ids
     summary: 'Space-separated list of IDs (ex: 1 2 3 ...) or \* for all instances.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_wait
   name: az vmss wait
   summary: Place the CLI in a waiting state until a condition of a scale set is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss wait [--created]
+                 [--custom]
+                 [--deleted]
+                 [--exists]
+                 [--ids]
+                 [--instance-id]
+                 [--interval]
+                 [--name]
+                 [--resource-group]
+                 [--subscription]
+                 [--timeout]
+                 [--updated]
   examples:
   - summary: Place the CLI in a waiting state until the VMSS has been updated.
-    syntax:
-      content: az vmss wait --updated --name MyScaleSet --resource-group MyResourceGroup
+    syntax: az vmss wait --updated --name MyScaleSet --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until the VMSS instance has been updated.
-    syntax:
-      content: az vmss wait --updated --instance-id 1 --name MyScaleSet --resource-group MyResourceGroup
+    syntax: az vmss wait --updated --instance-id 1 --name MyScaleSet --resource-group MyResourceGroup
   - summary: Place the CLI in a waiting state until a condition of a scale set is met. (autogenerated)
-    syntax:
-      content: az vmss wait --created --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --instance-id
-    summary: Wait on the VM instance with this ID. If missing, Wait on the VMSS.
-    description: ''
-  - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
+    syntax: az vmss wait --created --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -963,10 +978,25 @@ items:
   - name: --exists
     summary: Wait until the resource exists.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --instance-id
+    summary: Wait on the VM instance with this ID. If missing, Wait on the VMSS.
+    description: ''
   - name: --interval
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --name -n
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -974,166 +1004,59 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_create
-  name: az vmss create
-  summary: Create an Azure Virtual Machine Scale Set.
-- uid: az_vmss_deallocate
-  name: az vmss deallocate
-  summary: Deallocate VMs within a VMSS.
-- uid: az_vmss_delete
-  name: az vmss delete
-  summary: Deletes a VM scale set.
-- uid: az_vmss_delete_instances
-  name: az vmss delete-instances
-  summary: Delete VMs within a VMSS.
-- uid: az_vmss_diagnostics
-  name: az vmss diagnostics
-  summary: Configure the Azure Virtual Machine Scale Set diagnostics extension.
-- uid: az_vmss_diagnostics_get_default_config
-  name: az vmss diagnostics get-default-config
-  summary: Show the default config file which defines data to be collected.
-- uid: az_vmss_diagnostics_set
-  name: az vmss diagnostics set
-  summary: Enable diagnostics on a VMSS.
-- uid: az_vmss_disk
-  name: az vmss disk
-  summary: Manage data disks of a VMSS.
-- uid: az_vmss_disk_attach
-  name: az vmss disk attach
-  summary: Attach managed data disks to a scale set or its instances.
-- uid: az_vmss_disk_detach
-  name: az vmss disk detach
-  summary: Detach managed data disks from a scale set or its instances.
-- uid: az_vmss_encryption
-  name: az vmss encryption
-  summary: Manage encryption of VMSS.
-- uid: az_vmss_encryption_disable
-  name: az vmss encryption disable
-  summary: Disable the encryption on a VMSS with managed disks.
-- uid: az_vmss_encryption_enable
-  name: az vmss encryption enable
-  summary: Encrypt a VMSS with managed disks.
-- uid: az_vmss_encryption_show
-  name: az vmss encryption show
-  summary: Show encryption status.
-- uid: az_vmss_extension
-  name: az vmss extension
-  summary: Manage extensions on a VM scale set.
-- uid: az_vmss_extension_delete
-  name: az vmss extension delete
-  summary: Delete an extension from a VMSS.
-- uid: az_vmss_extension_image
-  name: az vmss extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vmss_extension_image_list
-  name: az vmss extension image list
-  summary: List the information on available extensions.
-- uid: az_vmss_extension_image_list_names
-  name: az vmss extension image list-names
-  summary: Gets a list of virtual machine extension image types.
-- uid: az_vmss_extension_image_list_versions
-  name: az vmss extension image list-versions
-  summary: Gets a list of virtual machine extension image versions.
-- uid: az_vmss_extension_image_show
-  name: az vmss extension image show
-  summary: Gets a virtual machine extension image.
-- uid: az_vmss_extension_list
-  name: az vmss extension list
-  summary: List extensions associated with a VMSS.
-- uid: az_vmss_extension_set
-  name: az vmss extension set
-  summary: Add an extension to a VMSS or update an existing extension.
-- uid: az_vmss_extension_show
-  name: az vmss extension show
-  summary: Show details on a VMSS extension.
-- uid: az_vmss_get_instance_view
-  name: az vmss get-instance-view
-  summary: View an instance of a VMSS.
-- uid: az_vmss_identity
-  name: az vmss identity
-  summary: Manage service identities of a VM scaleset.
-- uid: az_vmss_identity_assign
-  name: az vmss identity assign
-  summary: Enable managed service identity on a VMSS.
-- uid: az_vmss_identity_show
-  name: az vmss identity show
-  summary: Display VM scaleset's managed identity info.
-- uid: az_vmss_list
-  name: az vmss list
-  summary: List VMSS.
-- uid: az_vmss_list_instance_connection_info
-  name: az vmss list-instance-connection-info
-  summary: Get the IP address and port number used to connect to individual VM instances within a set.
-- uid: az_vmss_list_instance_public_ips
-  name: az vmss list-instance-public-ips
-  summary: List public IP addresses of VM instances within a set.
-- uid: az_vmss_list_instances
-  name: az vmss list-instances
-  summary: Gets a list of all virtual machines in a VM scale sets.
-- uid: az_vmss_list_skus
-  name: az vmss list-skus
-  summary: Gets a list of SKUs available for your VM scale set, including the minimum and maximum VM instances allowed for each SKU.
-- uid: az_vmss_nic
-  name: az vmss nic
-  summary: Manage network interfaces of a VMSS.
-- uid: az_vmss_nic_list
-  name: az vmss nic list
-  summary: Gets all network interfaces in a virtual machine scale set.
-- uid: az_vmss_nic_list_vm_nics
-  name: az vmss nic list-vm-nics
-  summary: Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
-- uid: az_vmss_nic_show
-  name: az vmss nic show
-  summary: Get the specified network interface in a virtual machine scale set.
-- uid: az_vmss_reimage
-  name: az vmss reimage
-  summary: Reimage VMs within a VMSS.
-- uid: az_vmss_restart
-  name: az vmss restart
-  summary: Restart VMs within a VMSS.
-- uid: az_vmss_rolling_upgrade
-  name: az vmss rolling-upgrade
-  summary: Manage rolling upgrades.
-- uid: az_vmss_rolling_upgrade_cancel
-  name: az vmss rolling-upgrade cancel
-  summary: Cancels the current virtual machine scale set rolling upgrade.
-- uid: az_vmss_rolling_upgrade_get_latest
-  name: az vmss rolling-upgrade get-latest
-  summary: Gets the status of the latest virtual machine scale set rolling upgrade.
-- uid: az_vmss_rolling_upgrade_start
-  name: az vmss rolling-upgrade start
-  summary: Starts a rolling upgrade to move all virtual machine scale set instances to the latest available Platform Image OS version.
-- uid: az_vmss_scale
-  name: az vmss scale
-  summary: Change the number of VMs within a VMSS.
-- uid: az_vmss_set_orchestration_service_state
-  name: az vmss set-orchestration-service-state
-  summary: Change ServiceState property for a given service within a VMSS.
-- uid: az_vmss_show
-  name: az vmss show
-  summary: Get details on VMs within a VMSS.
-- uid: az_vmss_start
-  name: az vmss start
-  summary: Start VMs within a VMSS.
-- uid: az_vmss_stop
-  name: az vmss stop
-  summary: Power off (stop) VMs within a VMSS.
-- uid: az_vmss_update
-  name: az vmss update
-  summary: Update a VMSS.
-- uid: az_vmss_update_instances
-  name: az vmss update-instances
-  summary: Upgrade VMs within a VMSS.
-- uid: az_vmss_wait
-  name: az vmss wait
-  summary: Place the CLI in a waiting state until a condition of a scale set is met.
+- az_vmss_create
+- az_vmss_deallocate
+- az_vmss_delete
+- az_vmss_delete-instances
+- az_vmss_diagnostics
+- az_vmss_diagnostics_get-default-config
+- az_vmss_diagnostics_set
+- az_vmss_disk
+- az_vmss_disk_attach
+- az_vmss_disk_detach
+- az_vmss_encryption
+- az_vmss_encryption_disable
+- az_vmss_encryption_enable
+- az_vmss_encryption_show
+- az_vmss_extension
+- az_vmss_extension_delete
+- az_vmss_extension_image
+- az_vmss_extension_image_list
+- az_vmss_extension_image_list-names
+- az_vmss_extension_image_list-versions
+- az_vmss_extension_image_show
+- az_vmss_extension_list
+- az_vmss_extension_set
+- az_vmss_extension_show
+- az_vmss_get-instance-view
+- az_vmss_identity
+- az_vmss_identity_assign
+- az_vmss_identity_show
+- az_vmss_list
+- az_vmss_list-instance-connection-info
+- az_vmss_list-instance-public-ips
+- az_vmss_list-instances
+- az_vmss_list-skus
+- az_vmss_nic
+- az_vmss_nic_list
+- az_vmss_nic_list-vm-nics
+- az_vmss_nic_show
+- az_vmss_reimage
+- az_vmss_restart
+- az_vmss_rolling-upgrade
+- az_vmss_rolling-upgrade_cancel
+- az_vmss_rolling-upgrade_get-latest
+- az_vmss_rolling-upgrade_start
+- az_vmss_scale
+- az_vmss_set-orchestration-service-state
+- az_vmss_show
+- az_vmss_start
+- az_vmss_stop
+- az_vmss_update
+- az_vmss_update-instances
+- az_vmss_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -1149,10 +1072,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage groupings of virtual machines in an Azure Virtual Machine Scale Set (VMSS).
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/diagnostics.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/diagnostics.yml
index 09a1bf851c..d4b9f5111b 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/diagnostics.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/diagnostics.yml
@@ -1,47 +1,44 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_diagnostics
-  name: az vmss diagnostics
-  summary: Configure the Azure Virtual Machine Scale Set diagnostics extension.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_diagnostics_get_default_config
-  - az_vmss_diagnostics_set
-- uid: az_vmss_diagnostics_get_default_config
+### YamlMime:AzureCLIGroup
+uid: az_vmss_diagnostics
+name: az vmss diagnostics
+summary: Configure the Azure Virtual Machine Scale Set diagnostics extension.
+description: ''
+directCommands:
+- uid: az_vmss_diagnostics_get-default-config
   name: az vmss diagnostics get-default-config
   summary: Show the default config file which defines data to be collected.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss diagnostics get-default-config [--is-windows-os]
+                                           [--subscription]
+  optionalParameters:
   - name: --is-windows-os
     summary: For Windows VMs.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_diagnostics_set
   name: az vmss diagnostics set
   summary: Enable diagnostics on a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss diagnostics set --resource-group
+                            --settings
+                            --vmss-name
+                            [--no-auto-upgrade {false, true}]
+                            [--no-auto-upgrade-minor-version {false, true}]
+                            [--protected-settings]
+                            [--subscription]
+                            [--version]
   examples:
   - summary: Enable diagnostics on a VMSS. (autogenerated)
-    syntax:
-      content: "az vmss diagnostics set --protected-settings {protected-settings} --resource-group MyResourceGroup --settings '{\"commandToExecute\": \"echo testing\"}' --vmss-name MyVmss"
-  parameters:
+    syntax: "az vmss diagnostics set --protected-settings {protected-settings} --resource-group MyResourceGroup --settings '{\"commandToExecute\": \"echo testing\"}' --vmss-name MyVmss"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --settings
@@ -51,32 +48,28 @@ items:
     name: --vmss-name
     summary: Scale set name.
     description: ''
+  optionalParameters:
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --protected-settings
     summary: Json string or a file path containing private configurations such as storage account keys, etc.
     description: ''
-  - name: --version
-    summary: Version of the diagnostics extension. Will use the latest if not specfied.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --version
+    summary: Version of the diagnostics extension. Will use the latest if not specfied.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_diagnostics_get_default_config
-  name: az vmss diagnostics get-default-config
-  summary: Show the default config file which defines data to be collected.
-- uid: az_vmss_diagnostics_set
-  name: az vmss diagnostics set
-  summary: Enable diagnostics on a VMSS.
+- az_vmss_diagnostics_get-default-config
+- az_vmss_diagnostics_set
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -92,10 +85,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Configure the Azure Virtual Machine Scale Set diagnostics extension.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Configure the Azure Virtual Machine Scale Set diagnostics extension.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/disk.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/disk.yml
index 86e74a6cb2..ad3231bc7c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/disk.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/disk.yml
@@ -1,35 +1,41 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_disk
-  name: az vmss disk
-  summary: Manage data disks of a VMSS.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_disk_attach
-  - az_vmss_disk_detach
+### YamlMime:AzureCLIGroup
+uid: az_vmss_disk
+name: az vmss disk
+summary: Manage data disks of a VMSS.
+description: ''
+directCommands:
 - uid: az_vmss_disk_attach
   name: az vmss disk attach
   summary: Attach managed data disks to a scale set or its instances.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss disk attach [--caching {None, ReadOnly, ReadWrite}]
+                        [--ids]
+                        [--lun]
+                        [--resource-group]
+                        [--size-gb]
+                        [--sku {Premium_LRS, Standard_LRS}]
+                        [--subscription]
+                        [--vmss-name]
   examples:
   - summary: Attach managed data disks to a scale set or its instances. (autogenerated)
-    syntax:
-      content: az vmss disk attach --disk {disk} --instance-id 0 --resource-group MyResourceGroup
+    syntax: az vmss disk attach --disk {disk} --instance-id 0 --resource-group MyResourceGroup
   - summary: Attach managed data disks of a given size to a scale set or its instances. (autogenerated)
-    syntax:
-      content: az vmss disk attach --vmss-name MyVmss --resource-group MyResourceGroup --size-gb 50
-  parameters:
+    syntax: az vmss disk attach --vmss-name MyVmss --resource-group MyResourceGroup --size-gb 50
+  optionalParameters:
   - name: --caching
     parameterValueGroup: None, ReadOnly, ReadWrite
     summary: Disk caching policy.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --lun
     summary: 0-based logical unit number (LUN). Max value depends on the Virtual Machine instance size.
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --size-gb -z
     summary: 'Size in GB. Max size: 4095 GB (certain preview disks can be larger).'
     description: ''
@@ -37,64 +43,48 @@ items:
     parameterValueGroup: Premium_LRS, Standard_LRS
     summary: Underlying storage SKU.
     description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_disk_detach
   name: az vmss disk detach
   summary: Detach managed data disks from a scale set or its instances.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss disk detach --lun
+                        [--ids]
+                        [--resource-group]
+                        [--subscription]
+                        [--vmss-name]
   examples:
   - summary: Detach managed data disks from a scale set or its instances. (autogenerated)
-    syntax:
-      content: az vmss disk detach --instance-id 0 --lun {lun} --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss disk detach --instance-id 0 --lun {lun} --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --lun
     summary: 0-based logical unit number (LUN). Max value depends on the Virtual Machine instance size.
     description: ''
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_disk_attach
-  name: az vmss disk attach
-  summary: Attach managed data disks to a scale set or its instances.
-- uid: az_vmss_disk_detach
-  name: az vmss disk detach
-  summary: Detach managed data disks from a scale set or its instances.
+- az_vmss_disk_attach
+- az_vmss_disk_detach
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -110,10 +100,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage data disks of a VMSS.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage data disks of a VMSS.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/encryption.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/encryption.yml
index 3b5a966ead..3d5570e78e 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/encryption.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/encryption.yml
@@ -1,72 +1,76 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_encryption
-  name: az vmss encryption
-  summary: Manage encryption of VMSS.
-  description: 'For more information, see: <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>.'
-  langs:
-  - azurecli
-  children:
-  - az_vmss_encryption_disable
-  - az_vmss_encryption_enable
-  - az_vmss_encryption_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_encryption
+name: az vmss encryption
+summary: Manage encryption of VMSS.
+description: 'For more information, see: https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview.'
+directCommands:
 - uid: az_vmss_encryption_disable
   name: az vmss encryption disable
   summary: Disable the encryption on a VMSS with managed disks.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss encryption disable [--force]
+                               [--ids]
+                               [--name]
+                               [--resource-group]
+                               [--subscription]
+                               [--volume-type {ALL, DATA, OS}]
   examples:
   - summary: disable encryption a VMSS
-    syntax:
-      content: az vmss encryption disable -g MyResourceGroup -n MyVm
-  parameters:
+    syntax: az vmss encryption disable -g MyResourceGroup -n MyVm
+  optionalParameters:
   - name: --force
     summary: Continue by ignoring client side validation errors.
     description: ''
-  - name: --volume-type
-    parameterValueGroup: ALL, DATA, OS
-    summary: Type of volume that the encryption operation is performed on.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --volume-type
+    parameterValueGroup: ALL, DATA, OS
+    summary: Type of volume that the encryption operation is performed on.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_encryption_enable
   name: az vmss encryption enable
   summary: Encrypt a VMSS with managed disks.
-  description: 'For more information, see: For more information, see: <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>.'
-  langs:
-  - azurecli
+  description: 'For more information, see: For more information, see: https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview.'
+  syntax: >-
+    az vmss encryption enable --disk-encryption-keyvault
+                              [--force]
+                              [--ids]
+                              [--key-encryption-algorithm]
+                              [--key-encryption-key]
+                              [--key-encryption-keyvault]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+                              [--volume-type {ALL, DATA, OS}]
   examples:
   - summary: encrypt a VM scale set using a key vault in the same resource group
-    syntax:
-      content: az vmss encryption enable -g MyResourceGroup -n MyVmss --disk-encryption-keyvault MyVault
+    syntax: az vmss encryption enable -g MyResourceGroup -n MyVmss --disk-encryption-keyvault MyVault
   - summary: Encrypt a VMSS with managed disks. (autogenerated)
-    syntax:
-      content: az vmss encryption enable --disk-encryption-keyvault MyVault --name MyVmss --resource-group MyResourceGroup --volume-type DATA
-  parameters:
+    syntax: az vmss encryption enable --disk-encryption-keyvault MyVault --name MyVmss --resource-group MyResourceGroup --volume-type DATA
+  requiredParameters:
   - isRequired: true
     name: --disk-encryption-keyvault
     summary: Name or ID of the key vault where the generated encryption key will be placed.
     description: ''
+  optionalParameters:
   - name: --force
     summary: Continue by ignoring client side validation errors.
     description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
   - name: --key-encryption-algorithm
     defaultValue: RSA-OAEP
     summary: ''
@@ -77,67 +81,54 @@ items:
   - name: --key-encryption-keyvault
     summary: Name or ID of the key vault containing the key encryption key used to encrypt the disk encryption key. If missing, CLI will use `--disk-encryption-keyvault`.
     description: ''
-  - name: --volume-type
-    parameterValueGroup: ALL, DATA, OS
-    summary: Type of volume that the encryption operation is performed on.
-    description: ''
-  - name: --ids
-    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
-    description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --volume-type
+    parameterValueGroup: ALL, DATA, OS
+    summary: Type of volume that the encryption operation is performed on.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_encryption_show
   name: az vmss encryption show
   summary: Show encryption status.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss encryption show [--ids]
+                            [--name]
+                            [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Show encryption status. (autogenerated)
-    syntax:
-      content: az vmss encryption show --name MyScaleSet --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss encryption show --name MyScaleSet --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_encryption_disable
-  name: az vmss encryption disable
-  summary: Disable the encryption on a VMSS with managed disks.
-- uid: az_vmss_encryption_enable
-  name: az vmss encryption enable
-  summary: Encrypt a VMSS with managed disks.
-- uid: az_vmss_encryption_show
-  name: az vmss encryption show
-  summary: Show encryption status.
+- az_vmss_encryption_disable
+- az_vmss_encryption_enable
+- az_vmss_encryption_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -153,10 +144,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: 'For more information, see: <a href="https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview">https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview</a>.'
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: 'For more information, see: https://docs.microsoft.com/azure/security/azure-security-disk-encryption-overview.'
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/extension.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/extension.yml
index 032a93e64b..1886b1263c 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/extension.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/extension.yml
@@ -1,94 +1,99 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_extension
-  name: az vmss extension
-  summary: Manage extensions on a VM scale set.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_extension_delete
-  - az_vmss_extension_list
-  - az_vmss_extension_set
-  - az_vmss_extension_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_extension
+name: az vmss extension
+summary: Manage extensions on a VM scale set.
+description: ''
+directCommands:
 - uid: az_vmss_extension_delete
   name: az vmss extension delete
   summary: Delete an extension from a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension delete --name
+                             --resource-group
+                             --vmss-name
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Delete an extension from a VMSS. (autogenerated)
-    syntax:
-      content: az vmss extension delete --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
-  parameters:
+    syntax: az vmss extension delete --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_list
   name: az vmss extension list
   summary: List extensions associated with a VMSS.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension list --resource-group
+                           --vmss-name
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: List extensions associated with a VMSS. (autogenerated)
-    syntax:
-      content: az vmss extension list --resource-group MyResourceGroup --vmss-name MyVmss
-  parameters:
+    syntax: az vmss extension list --resource-group MyResourceGroup --vmss-name MyVmss
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_set
   name: az vmss extension set
   summary: Add an extension to a VMSS or update an existing extension.
   description: Get extension details from `az vmss extension image list`.
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension set --name
+                          --publisher
+                          --resource-group
+                          --vmss-name
+                          [--enable-auto-upgrade {false, true}]
+                          [--no-auto-upgrade {false, true}]
+                          [--no-auto-upgrade-minor-version {false, true}]
+                          [--no-wait]
+                          [--protected-settings]
+                          [--settings]
+                          [--subscription]
+                          [--version]
   examples:
   - summary: Set an extension which depends on two previously set extensions. That is, When a VMSS instance is created or reimaged, the customScript extension will be provisioned only after all extensions that it depends on have been provisioned. The extension need not depend on the other extensions for pre-requisite configurations.
-    syntax:
-      content: >-
-        az vmss extension set --vmss-name my-vmss --name customScript --resource-group my-group \
-            --version 2.0 --publisher Microsoft.Azure.Extensions \
-            --provision-after-extensions NetworkWatcherAgentLinux VMAccessForLinux  \
-            --settings '{"commandToExecute": "echo testing"}'
-  parameters:
+    syntax: >-
+      az vmss extension set --vmss-name my-vmss --name customScript --resource-group my-group \
+          --version 2.0 --publisher Microsoft.Azure.Extensions \
+          --provision-after-extensions NetworkWatcherAgentLinux VMAccessForLinux  \
+          --settings '{"commandToExecute": "echo testing"}'
+  - summary: Add an extension and enable automatic upgrade by the platform if there is a newer version of the extension available.
+    syntax: az vmss extension set -n extName --publisher publisher --vmss-name my-vmss -g my-group \ --enable-auto-upgrade true
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
@@ -100,16 +105,25 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --enable-auto-upgrade
+    parameterValueGroup: false, true
+    summary: Indicate the extension should be automatically upgraded by the platform if there is a newer version of the extension available.
     description: ''
   - name: --no-auto-upgrade
     parameterValueGroup: false, true
     summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
     description: ''
+  - name: --no-auto-upgrade-minor-version
+    parameterValueGroup: false, true
+    summary: If set, the extension service will not automatically pick or upgrade to the latest minor version, even if the extension is redeployed.
+    description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
@@ -119,78 +133,57 @@ items:
   - name: --settings
     summary: Extension settings in JSON format. A JSON file path is also accepted.
     description: ''
-  - name: --version
-    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --version
+    summary: The version of the extension. To pin extension version to this value, please specify --no-auto-upgrade-minor-version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_show
   name: az vmss extension show
   summary: Show details on a VMSS extension.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension show --name
+                           --resource-group
+                           --vmss-name
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: Show details on a VMSS extension. (autogenerated)
-    syntax:
-      content: az vmss extension show --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
-  parameters:
+    syntax: az vmss extension show --name MyExtension --resource-group MyResourceGroup --vmss-name MyVmss
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the extension.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_extension_delete
-  name: az vmss extension delete
-  summary: Delete an extension from a VMSS.
-- uid: az_vmss_extension_image
-  name: az vmss extension image
-  summary: Find the available VM extensions for a subscription and region.
-- uid: az_vmss_extension_image_list
-  name: az vmss extension image list
-  summary: List the information on available extensions.
-- uid: az_vmss_extension_image_list_names
-  name: az vmss extension image list-names
-  summary: Gets a list of virtual machine extension image types.
-- uid: az_vmss_extension_image_list_versions
-  name: az vmss extension image list-versions
-  summary: Gets a list of virtual machine extension image versions.
-- uid: az_vmss_extension_image_show
-  name: az vmss extension image show
-  summary: Gets a virtual machine extension image.
-- uid: az_vmss_extension_list
-  name: az vmss extension list
-  summary: List extensions associated with a VMSS.
-- uid: az_vmss_extension_set
-  name: az vmss extension set
-  summary: Add an extension to a VMSS or update an existing extension.
-- uid: az_vmss_extension_show
-  name: az vmss extension show
-  summary: Show details on a VMSS extension.
+- az_vmss_extension_delete
+- az_vmss_extension_image
+- az_vmss_extension_image_list
+- az_vmss_extension_image_list-names
+- az_vmss_extension_image_list-versions
+- az_vmss_extension_image_show
+- az_vmss_extension_list
+- az_vmss_extension_set
+- az_vmss_extension_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -206,10 +199,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage extensions on a VM scale set.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage extensions on a VM scale set.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/extension/image.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/extension/image.yml
index c4c7fade20..7bf2e62ec3 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/extension/image.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/extension/image.yml
@@ -1,36 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_extension_image
-  name: az vmss extension image
-  summary: Find the available VM extensions for a subscription and region.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_extension_image_list
-  - az_vmss_extension_image_list_names
-  - az_vmss_extension_image_list_versions
-  - az_vmss_extension_image_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_extension_image
+name: az vmss extension image
+summary: Find the available VM extensions for a subscription and region.
+description: ''
+directCommands:
 - uid: az_vmss_extension_image_list
   name: az vmss extension image list
   summary: List the information on available extensions.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss extension image list [--latest]
+                                 [--location]
+                                 [--name]
+                                 [--publisher]
+                                 [--query-examples]
+                                 [--subscription]
+                                 [--version]
   examples:
   - summary: List the unique publishers for extensions.
-    syntax:
-      content: az vmss extension image list --query "[].publisher" -o tsv | sort -u
+    syntax: az vmss extension image list --query "[].publisher" -o tsv | sort -u
   - summary: Find extensions with "Docker" in the name.
-    syntax:
-      content: az vmss extension image list --query "[].name" -o tsv | sort -u | grep Docker
+    syntax: az vmss extension image list --query "[].name" -o tsv | sort -u | grep Docker
   - summary: List extension names where the publisher name starts with "Microsoft.Azure.App".
-    syntax:
-      content: >-
-        az vmss extension image list --query \
-            "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
-            -o tsv | sort -u | xargs -I{} az vmss extension image list-names --publisher {} -l westus
-  parameters:
+    syntax: >-
+      az vmss extension image list --query \
+          "[?starts_with(publisher, 'Microsoft.Azure.App')].publisher" \
+          -o tsv | sort -u | xargs -I{} az vmss extension image list-names --publisher {} -l westus
+  optionalParameters:
   - name: --latest
     summary: Show the latest version only.
     description: ''
@@ -43,52 +39,54 @@ items:
   - name: --publisher -p
     summary: Image publisher name.
     description: ''
-  - name: --version
-    summary: Extension version.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_extension_image_list_names
+  - name: --version
+    summary: Extension version.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_extension_image_list-names
   name: az vmss extension image list-names
   summary: Gets a list of virtual machine extension image types.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss extension image list-names --location
+                                       --publisher
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_extension_image_list_versions
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_extension_image_list-versions
   name: az vmss extension image list-versions
   summary: Gets a list of virtual machine extension image versions.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss extension image list-versions --location
+                                          --name
+                                          --publisher
+                                          [--filter]
+                                          [--orderby]
+                                          [--subscription]
+                                          [--top]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -98,34 +96,35 @@ items:
     name: --publisher -p
     summary: Image publisher name.
     description: ''
+  optionalParameters:
   - name: --filter
     summary: The filter to apply on the operation.
     description: ''
   - name: --orderby
     summary: The $orderby odata query option.
     description: ''
-  - name: --top
-    summary: The $top odata query option.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top
+    summary: The $top odata query option.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_extension_image_show
   name: az vmss extension image show
   summary: Gets a virtual machine extension image.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss extension image show --location
+                                 --name
+                                 --publisher
+                                 --version
+                                 [--query-examples]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
@@ -139,28 +138,19 @@ items:
     name: --version
     summary: Extension version.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_extension_image_list
-  name: az vmss extension image list
-  summary: List the information on available extensions.
-- uid: az_vmss_extension_image_list_names
-  name: az vmss extension image list-names
-  summary: Gets a list of virtual machine extension image types.
-- uid: az_vmss_extension_image_list_versions
-  name: az vmss extension image list-versions
-  summary: Gets a list of virtual machine extension image versions.
-- uid: az_vmss_extension_image_show
-  name: az vmss extension image show
-  summary: Gets a virtual machine extension image.
+- az_vmss_extension_image_list
+- az_vmss_extension_image_list-names
+- az_vmss_extension_image_list-versions
+- az_vmss_extension_image_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,10 +166,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Find the available VM extensions for a subscription and region.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Find the available VM extensions for a subscription and region.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/identity.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/identity.yml
index f7267fa823..1eb175cddd 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/identity.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/identity.yml
@@ -1,92 +1,83 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_identity
-  name: az vmss identity
-  summary: Manage service identities of a VM scaleset.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_identity_assign
-  - az_vmss_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_identity
+name: az vmss identity
+summary: Manage service identities of a VM scaleset.
+description: ''
+directCommands:
 - uid: az_vmss_identity_assign
   name: az vmss identity assign
   summary: Enable managed service identity on a VMSS.
   description: This is required to authenticate and interact with other Azure services using bearer tokens.
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss identity assign [--identities]
+                            [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--role]
+                            [--scope]
+                            [--subscription]
   examples:
   - summary: Enable system assigned identity on a VMSS with the 'Owner' role.
-    syntax:
-      content: az vmss identity assign -g MyResourceGroup -n MyVmss --role Owner --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
+    syntax: az vmss identity assign -g MyResourceGroup -n MyVmss --role Owner --scope /subscriptions/db5eb68e-73e2-4fa8-b18a-0123456789999/resourceGroups/MyResourceGroup
   - summary: Enable managed service identity on a VMSS. (autogenerated)
-    syntax:
-      content: az vmss identity assign --identities readerId writerId --name MyVmss --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss identity assign --identities readerId writerId --name MyVmss --resource-group MyResourceGroup
+  optionalParameters:
   - name: --identities
     summary: "Space-separated identities to assign. Use '[system]' to refer to the system assigned identity. Default: '[system]'."
     description: ''
-  - name: --role
-    defaultValue: Contributor
-    summary: Role name or id the system assigned identity will have.
-    description: ''
-  - name: --scope
-    summary: Scope that the system assigned identity can access.
-    description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --role
+    defaultValue: Contributor
+    summary: Role name or id the system assigned identity will have.
+    description: ''
+  - name: --scope
+    summary: Scope that the system assigned identity can access.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_identity_show
   name: az vmss identity show
   summary: Display VM scaleset's managed identity info.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az vmss identity show [--ids]
+                          [--name]
+                          [--query-examples]
+                          [--resource-group]
+                          [--subscription]
   examples:
   - summary: display VM scaleset's managed identity info. (autogenerated)
-    syntax:
-      content: az vmss identity show --name MyVirtualMachine --resource-group MyResourceGroup
-  parameters:
+    syntax: az vmss identity show --name MyVirtualMachine --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=&lt;name&gt;`.
+    summary: The name of the Virtual Machine. You can configure the default using `az configure --defaults vm=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_identity_assign
-  name: az vmss identity assign
-  summary: Enable managed service identity on a VMSS.
-- uid: az_vmss_identity_show
-  name: az vmss identity show
-  summary: Display VM scaleset's managed identity info.
+- az_vmss_identity_assign
+- az_vmss_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +93,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage service identities of a VM scaleset.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage service identities of a VM scaleset.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/nic.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/nic.yml
index eabd7977ee..8d0596d448 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/nic.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/nic.yml
@@ -1,46 +1,46 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_nic
-  name: az vmss nic
-  summary: Manage network interfaces of a VMSS.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_nic_list
-  - az_vmss_nic_list_vm_nics
-  - az_vmss_nic_show
+### YamlMime:AzureCLIGroup
+uid: az_vmss_nic
+name: az vmss nic
+summary: Manage network interfaces of a VMSS.
+description: ''
+directCommands:
 - uid: az_vmss_nic_list
   name: az vmss nic list
   summary: Gets all network interfaces in a virtual machine scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss nic list --resource-group
+                     --vmss-name
+                     [--query-examples]
+                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --vmss-name
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_nic_list_vm_nics
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_nic_list-vm-nics
   name: az vmss nic list-vm-nics
   summary: Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss nic list-vm-nics [--ids]
+                             [--instance-id]
+                             [--resource-group]
+                             [--subscription]
+                             [--vmss-name]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -48,7 +48,7 @@ items:
     summary: The virtual machine index.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -56,19 +56,21 @@ items:
   - name: --vmss-name
     summary: Scale set name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 - uid: az_vmss_nic_show
   name: az vmss nic show
   summary: Get the specified network interface in a virtual machine scale set.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss nic show [--expand]
+                     [--ids]
+                     [--instance-id]
+                     [--name]
+                     [--query-examples]
+                     [--resource-group]
+                     [--subscription]
+                     [--vmss-name]
+  optionalParameters:
   - name: --expand
     summary: Expands referenced resources.
     description: ''
@@ -81,8 +83,11 @@ items:
   - name: --name -n
     summary: The network interface (NIC).
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -90,22 +95,11 @@ items:
   - name: --vmss-name
     summary: Scale set name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_nic_list
-  name: az vmss nic list
-  summary: Gets all network interfaces in a virtual machine scale set.
-- uid: az_vmss_nic_list_vm_nics
-  name: az vmss nic list-vm-nics
-  summary: Gets information about all network interfaces in a virtual machine in a virtual machine scale set.
-- uid: az_vmss_nic_show
-  name: az vmss nic show
-  summary: Get the specified network interface in a virtual machine scale set.
+- az_vmss_nic_list
+- az_vmss_nic_list-vm-nics
+- az_vmss_nic_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -121,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage network interfaces of a VMSS.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage network interfaces of a VMSS.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmss/rolling-upgrade.yml b/2018-03-01-hybrid/docs-ref-autogen/vmss/rolling-upgrade.yml
index 203feb6019..77ede3dbbe 100644
--- a/2018-03-01-hybrid/docs-ref-autogen/vmss/rolling-upgrade.yml
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmss/rolling-upgrade.yml
@@ -1,100 +1,82 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_vmss_rolling_upgrade
-  name: az vmss rolling-upgrade
-  summary: Manage rolling upgrades.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_vmss_rolling_upgrade_cancel
-  - az_vmss_rolling_upgrade_get_latest
-  - az_vmss_rolling_upgrade_start
-- uid: az_vmss_rolling_upgrade_cancel
+### YamlMime:AzureCLIGroup
+uid: az_vmss_rolling-upgrade
+name: az vmss rolling-upgrade
+summary: Manage rolling upgrades.
+description: ''
+directCommands:
+- uid: az_vmss_rolling-upgrade_cancel
   name: az vmss rolling-upgrade cancel
   summary: Cancels the current virtual machine scale set rolling upgrade.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss rolling-upgrade cancel [--ids]
+                                   [--name]
+                                   [--resource-group]
+                                   [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_rolling_upgrade_get_latest
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_rolling-upgrade_get-latest
   name: az vmss rolling-upgrade get-latest
   summary: Gets the status of the latest virtual machine scale set rolling upgrade.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss rolling-upgrade get-latest [--ids]
+                                       [--name]
+                                       [--resource-group]
+                                       [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_vmss_rolling_upgrade_start
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
+- uid: az_vmss_rolling-upgrade_start
   name: az vmss rolling-upgrade start
   summary: Starts a rolling upgrade to move all virtual machine scale set instances to the latest available Platform Image OS version.
   description: Instances which are already running the latest available OS version are not affected.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az vmss rolling-upgrade start [--ids]
+                                  [--name]
+                                  [--resource-group]
+                                  [--subscription]
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
-    summary: Scale set name. You can configure the default using `az configure --defaults vmss=&lt;name&gt;`.
+    summary: Scale set name. You can configure the default using `az configure --defaults vmss=<name>`.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
 commands:
-- uid: az_vmss_rolling_upgrade_cancel
-  name: az vmss rolling-upgrade cancel
-  summary: Cancels the current virtual machine scale set rolling upgrade.
-- uid: az_vmss_rolling_upgrade_get_latest
-  name: az vmss rolling-upgrade get-latest
-  summary: Gets the status of the latest virtual machine scale set rolling upgrade.
-- uid: az_vmss_rolling_upgrade_start
-  name: az vmss rolling-upgrade start
-  summary: Starts a rolling upgrade to move all virtual machine scale set instances to the latest available Platform Image OS version.
+- az_vmss_rolling-upgrade_cancel
+- az_vmss_rolling-upgrade_get-latest
+- az_vmss_rolling-upgrade_start
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -110,10 +92,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/vm/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/vm/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/e6a19f23783f9cb09908e4e03b03e6150873bfb2/src/azure-cli/azure/cli/command_modules/vm/_help.py
-updated_at: 5/7/2020 3:11:18 AM
-ms.date: 05/07/2020
-description: Manage rolling upgrades.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 04/15/2021
+  description: Manage rolling upgrades.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware.yml
new file mode 100644
index 0000000000..0cef810548
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware.yml
@@ -0,0 +1,60 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware
+name: az vmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Azure VMware Solution.
+description: ''
+commands:
+- az_vmware_authorization
+- az_vmware_authorization_create
+- az_vmware_authorization_delete
+- az_vmware_authorization_list
+- az_vmware_authorization_show
+- az_vmware_cluster
+- az_vmware_cluster_create
+- az_vmware_cluster_delete
+- az_vmware_cluster_list
+- az_vmware_cluster_show
+- az_vmware_cluster_update
+- az_vmware_datastore
+- az_vmware_datastore_create
+- az_vmware_datastore_delete
+- az_vmware_datastore_list
+- az_vmware_datastore_show
+- az_vmware_hcx-enterprise-site
+- az_vmware_hcx-enterprise-site_create
+- az_vmware_hcx-enterprise-site_delete
+- az_vmware_hcx-enterprise-site_list
+- az_vmware_hcx-enterprise-site_show
+- az_vmware_location
+- az_vmware_location_checkquotaavailability
+- az_vmware_location_checktrialavailability
+- az_vmware_private-cloud
+- az_vmware_private-cloud_addidentitysource
+- az_vmware_private-cloud_create
+- az_vmware_private-cloud_delete
+- az_vmware_private-cloud_deleteidentitysource
+- az_vmware_private-cloud_list
+- az_vmware_private-cloud_listadmincredentials
+- az_vmware_private-cloud_show
+- az_vmware_private-cloud_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Azure VMware Solution.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware/authorization.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware/authorization.yml
new file mode 100644
index 0000000000..db50af1441
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware/authorization.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_authorization
+name: az vmware authorization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware authorization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage the authorizations of an ExpressRoute Circuit for a private cloud.
+description: ''
+directCommands:
+- uid: az_vmware_authorization_create
+  name: az vmware authorization create
+  summary: Create an authorization for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization create --name
+                                   --private-cloud
+                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the authorization.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_authorization_delete
+  name: az vmware authorization delete
+  summary: Delete an authorization for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization delete --name
+                                   --private-cloud
+                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the authorization.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_authorization_list
+  name: az vmware authorization list
+  summary: List authorizations for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization list --private-cloud
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_authorization_show
+  name: az vmware authorization show
+  summary: Show details of an authorization for an ExpressRoute Circuit in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware authorization show --name
+                                 --private-cloud
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the authorization.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_vmware_authorization_create
+- az_vmware_authorization_delete
+- az_vmware_authorization_list
+- az_vmware_authorization_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage the authorizations of an ExpressRoute Circuit for a private cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware/cluster.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware/cluster.yml
new file mode 100644
index 0000000000..57f5e9df2a
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware/cluster.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_cluster
+name: az vmware cluster
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware cluster** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage clusters in a private cloud.
+description: ''
+directCommands:
+- uid: az_vmware_cluster_create
+  name: az vmware cluster create
+  summary: Create a cluster in a private cloud. The maximum number of clusters is 4.
+  description: ''
+  syntax: >-
+    az vmware cluster create --name
+                             --private-cloud
+                             --resource-group
+                             --size
+                             --sku
+                             [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --size
+    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The product SKU.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_vmware_cluster_delete
+  name: az vmware cluster delete
+  summary: Delete a cluster in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster delete --name
+                             --private-cloud
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_cluster_list
+  name: az vmware cluster list
+  summary: List clusters in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster list --private-cloud
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_cluster_show
+  name: az vmware cluster show
+  summary: Show details of a cluster in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster show --name
+                           --private-cloud
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_cluster_update
+  name: az vmware cluster update
+  summary: Update a cluster in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware cluster update --name
+                             --private-cloud
+                             --resource-group
+                             --size
+                             [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --size
+    summary: Number of hosts for the cluster. Minimum of 3 and a maximum of 16.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_vmware_cluster_create
+- az_vmware_cluster_delete
+- az_vmware_cluster_list
+- az_vmware_cluster_show
+- az_vmware_cluster_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage clusters in a private cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware/datastore.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware/datastore.yml
new file mode 100644
index 0000000000..f4315252da
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware/datastore.yml
@@ -0,0 +1,164 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_datastore
+name: az vmware datastore
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware datastore** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage a datastore in a private cloud cluster.
+description: ''
+directCommands:
+- uid: az_vmware_datastore_create
+  name: az vmware datastore create
+  summary: Create a datastore in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore create --cluster
+                               --name
+                               --private-cloud
+                               --resource-group
+                               [--endpoints]
+                               [--lun-name]
+                               [--nfs-file-path]
+                               [--nfs-provider-ip]
+  examples:
+  - summary: Create a new Microsoft.StoragePool provided disk pool based iSCSI datastore.
+    syntax: az vmware datastore create --name iSCSIDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud --endpoints 10.10.0.1:3260 --lun-name lun0
+  - summary: Create a new Microsoft.StoragePool provided disk pool based iSCSI datastore with multiple endpoints.
+    syntax: az vmware datastore create --name iSCSIDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud --endpoints 10.10.0.1:3260 10.10.0.2:3260 --lun-name lun0
+  - summary: Create a new Microsoft.NetApp provided NetApp volume based NFSv3 datastore.
+    syntax: az vmware datastore create --name ANFDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud --nfs-file-path ANFVol1FilePath --nfs-provider-ip 10.10.0.1
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --endpoints
+    summary: ISCSI provider target IP address list.
+    description: ''
+  - name: --lun-name
+    summary: Name of the LUN to be used.
+    description: ''
+  - name: --nfs-file-path
+    summary: File path through which the NFS volume is exposed by the provider.
+    description: ''
+  - name: --nfs-provider-ip
+    summary: IP address of the NFS provider.
+    description: ''
+- uid: az_vmware_datastore_delete
+  name: az vmware datastore delete
+  summary: Delete a datastore in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore delete --cluster
+                               --name
+                               --private-cloud
+                               --resource-group
+  examples:
+  - summary: Delete an iSCSI or NFS based datastore.
+    syntax: az vmware datastore delete --name MyCloudSANDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_datastore_list
+  name: az vmware datastore list
+  summary: List datastores in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore list --cluster
+                             --private-cloud
+                             --resource-group
+  examples:
+  - summary: List all iSCSI or NFS based datastores under Cluster-1.
+    syntax: az vmware datastore list --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_datastore_show
+  name: az vmware datastore show
+  summary: Show details of a datastore in a private cloud cluster.
+  description: ''
+  syntax: >-
+    az vmware datastore show --cluster
+                             --name
+                             --private-cloud
+                             --resource-group
+  examples:
+  - summary: Show the details of an iSCSI or NFS based datastore.
+    syntax: az vmware datastore show --name MyCloudSANDatastore1 --resource-group MyResourceGroup --cluster Cluster-1 --private-cloud MyPrivateCloud
+  requiredParameters:
+  - isRequired: true
+    name: --cluster
+    summary: The name of the cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datastore.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_vmware_datastore_create
+- az_vmware_datastore_delete
+- az_vmware_datastore_list
+- az_vmware_datastore_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage a datastore in a private cloud cluster.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware/hcx-enterprise-site.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware/hcx-enterprise-site.yml
new file mode 100644
index 0000000000..217eba5222
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware/hcx-enterprise-site.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_hcx-enterprise-site
+name: az vmware hcx-enterprise-site
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware hcx-enterprise-site** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage HCX Enterprise Sites in a private cloud.
+description: ''
+directCommands:
+- uid: az_vmware_hcx-enterprise-site_create
+  name: az vmware hcx-enterprise-site create
+  summary: Create an HCX Enterprise Site in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site create --name
+                                         --private-cloud
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the HCX Enterprise Site.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_hcx-enterprise-site_delete
+  name: az vmware hcx-enterprise-site delete
+  summary: Delete an HCX Enterprise Site in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site delete --name
+                                         --private-cloud
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the HCX Enterprise Site.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_hcx-enterprise-site_list
+  name: az vmware hcx-enterprise-site list
+  summary: List HCX Enterprise Sites in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site list --private-cloud
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_hcx-enterprise-site_show
+  name: az vmware hcx-enterprise-site show
+  summary: Show details of an HCX Enterprise Site in a private cloud.
+  description: ''
+  syntax: >-
+    az vmware hcx-enterprise-site show --name
+                                       --private-cloud
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the HCX Enterprise Site.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_vmware_hcx-enterprise-site_create
+- az_vmware_hcx-enterprise-site_delete
+- az_vmware_hcx-enterprise-site_list
+- az_vmware_hcx-enterprise-site_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage HCX Enterprise Sites in a private cloud.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware/location.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware/location.yml
new file mode 100644
index 0000000000..1ef3454d59
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware/location.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_location
+name: az vmware location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to check availability by location.
+description: ''
+directCommands:
+- uid: az_vmware_location_checkquotaavailability
+  name: az vmware location checkquotaavailability
+  summary: Return quota for subscription by region.
+  description: ''
+  syntax: az vmware location checkquotaavailability --location
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_vmware_location_checktrialavailability
+  name: az vmware location checktrialavailability
+  summary: Return trial status for subscription by region.
+  description: ''
+  syntax: az vmware location checktrialavailability --location
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_vmware_location_checkquotaavailability
+- az_vmware_location_checktrialavailability
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to check availability by location.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/vmware/private-cloud.yml b/2018-03-01-hybrid/docs-ref-autogen/vmware/private-cloud.yml
new file mode 100644
index 0000000000..34e55c4e15
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/vmware/private-cloud.yml
@@ -0,0 +1,285 @@
+### YamlMime:AzureCLIGroup
+uid: az_vmware_private-cloud
+name: az vmware private-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **vmware** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az vmware private-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage private clouds.
+description: ''
+directCommands:
+- uid: az_vmware_private-cloud_addidentitysource
+  name: az vmware private-cloud addidentitysource
+  summary: Add a vCenter Single Sign On Identity Source to a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud addidentitysource --alias
+                                              --base-group-dn
+                                              --base-user-dn
+                                              --domain
+                                              --name
+                                              --password
+                                              --primary-server
+                                              --private-cloud
+                                              --resource-group
+                                              --username
+                                              [--secondary-server]
+                                              [--ssl]
+  requiredParameters:
+  - isRequired: true
+    name: --alias
+    summary: The domain's NetBIOS name.
+    description: ''
+  - isRequired: true
+    name: --base-group-dn
+    summary: The base distinguished name for groups.
+    description: ''
+  - isRequired: true
+    name: --base-user-dn
+    summary: The base distinguished name for users.
+    description: ''
+  - isRequired: true
+    name: --domain
+    summary: The domain's dns name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the identity source.
+    description: ''
+  - isRequired: true
+    name: --password
+    summary: The password of the Active Directory user with a minimum of read-only access to Base DN for users and groups.
+    description: ''
+  - isRequired: true
+    name: --primary-server
+    summary: Primary server URL.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --username
+    summary: The ID of an Active Directory user with a minimum of read-only access to Base DN for users and group.
+    description: ''
+  optionalParameters:
+  - name: --secondary-server
+    summary: Secondary server URL.
+    description: ''
+  - name: --ssl
+    defaultValue: Disabled
+    summary: Protect LDAP communication using SSL certificate (LDAPS). Specify "Enabled" or "Disabled".
+    description: ''
+- uid: az_vmware_private-cloud_create
+  name: az vmware private-cloud create
+  summary: Create a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud create --cluster-size
+                                   --location
+                                   --name
+                                   --network-block
+                                   --resource-group
+                                   --sku
+                                   [--accept-eula]
+                                   [--circuit-primary-subnet]
+                                   [--circuit-secondary-subnet]
+                                   [--internet]
+                                   [--nsxt-password]
+                                   [--tags]
+                                   [--vcenter-password]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-size
+    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --network-block
+    summary: A subnet at least of size /22. Make sure the CIDR format is conformed to (A.B.C.D/X) where A,B,C,D are between 0 and 255, and X is between 0 and 22.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: The product SKU.
+    description: ''
+  optionalParameters:
+  - name: --accept-eula
+    summary: Accept the end-user license agreement without prompting.
+    description: ''
+  - name: --circuit-primary-subnet
+    summary: A /30 subnet for the primary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
+    description: ''
+  - name: --circuit-secondary-subnet
+    summary: A /30 subnet for the secondary circuit in the Express Route to configure routing between your network and Microsoft's Enterprise edge (MSEEs) routers.
+    description: ''
+  - name: --internet
+    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
+    description: ''
+  - name: --nsxt-password
+    summary: NSX-T Manager password.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vcenter-password
+    summary: VCenter admin password.
+    description: ''
+- uid: az_vmware_private-cloud_delete
+  name: az vmware private-cloud delete
+  summary: Delete a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud delete --name
+                                   --resource-group
+                                   [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes
+    summary: Deletes without confirmation.
+    description: ''
+- uid: az_vmware_private-cloud_deleteidentitysource
+  name: az vmware private-cloud deleteidentitysource
+  summary: Delete a vCenter Single Sign On Identity Source for a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud deleteidentitysource --alias
+                                                 --domain
+                                                 --name
+                                                 --private-cloud
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --alias
+    summary: The domain's NetBIOS name.
+    description: ''
+  - isRequired: true
+    name: --domain
+    summary: The domain's dns name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the identity source.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_list
+  name: az vmware private-cloud list
+  summary: List the private clouds.
+  description: ''
+  syntax: az vmware private-cloud list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_listadmincredentials
+  name: az vmware private-cloud listadmincredentials
+  summary: List the admin credentials for the private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud listadmincredentials --private-cloud
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --private-cloud -c
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_show
+  name: az vmware private-cloud show
+  summary: Show details of a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud show --name
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_vmware_private-cloud_update
+  name: az vmware private-cloud update
+  summary: Update a private cloud.
+  description: ''
+  syntax: >-
+    az vmware private-cloud update --name
+                                   --resource-group
+                                   [--cluster-size]
+                                   [--internet]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --cluster-size
+    summary: Number of hosts for the default management cluster. Minimum of 3 and maximum of 16.
+    description: ''
+  - name: --internet
+    summary: Connectivity to internet. Specify "Enabled" or "Disabled".
+    description: ''
+commands:
+- az_vmware_private-cloud_addidentitysource
+- az_vmware_private-cloud_create
+- az_vmware_private-cloud_delete
+- az_vmware_private-cloud_deleteidentitysource
+- az_vmware_private-cloud_list
+- az_vmware_private-cloud_listadmincredentials
+- az_vmware_private-cloud_show
+- az_vmware_private-cloud_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage private clouds.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webapp.yml b/2018-03-01-hybrid/docs-ref-autogen/webapp.yml
new file mode 100644
index 0000000000..964d78c0c1
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webapp.yml
@@ -0,0 +1,105 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp
+name: az webapp
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage web apps.
+description: ''
+directCommands:
+- uid: az_webapp_deploy
+  name: az webapp deploy
+  summary: Deploys a provided artifact to Azure Web Apps.
+  description: ''
+  syntax: >-
+    az webapp deploy --name
+                     --resource-group
+                     [--async {false, true}]
+                     [--clean {false, true}]
+                     [--ignore-stack {false, true}]
+                     [--restart {false, true}]
+                     [--slot]
+                     [--src-path]
+                     [--src-url]
+                     [--target-path]
+                     [--timeout]
+                     [--type]
+  examples:
+  - summary: Deploy a war file asynchronously.
+    syntax: az webapp deploy --resource-group ResouceGroup --name AppName --src-path SourcePath --type war --async IsAsync
+  - summary: Deploy a static text file to wwwroot/staticfiles/test.txt
+    syntax: az webapp deploy --resource-group ResouceGroup --name AppName --src-path SourcePath --type static --target-path staticfiles/test.txt
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --async
+    parameterValueGroup: false, true
+    summary: Asynchronous deployment.
+    description: ''
+  - name: --clean
+    parameterValueGroup: false, true
+    summary: Clean or not. default is target-type specific.
+    description: ''
+  - name: --ignore-stack
+    parameterValueGroup: false, true
+    summary: Should override the default stack check.
+    description: ''
+  - name: --restart
+    parameterValueGroup: false, true
+    summary: Restart or not. default behavior is to restart.
+    description: ''
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+  - name: --src-path
+    summary: 'Path of the file to be deployed. Example: /mnt/apps/myapp.war.'
+    description: ''
+  - name: --src-url
+    summary: 'Url to download the package from. Example: http://mysite.com/files/myapp.war?key=123.'
+    description: ''
+  - name: --target-path
+    summary: Target path relative to wwwroot to which the file will be deployed to.
+    description: ''
+  - name: --timeout
+    summary: Timeout for operation in milliseconds.
+    description: ''
+  - name: --type
+    summary: Type of deployment requested.
+    description: ''
+commands:
+- az_webapp_container
+- az_webapp_container_up
+- az_webapp_deploy
+- az_webapp_remote-connection
+- az_webapp_remote-connection_create
+- az_webapp_scan
+- az_webapp_scan_list-result
+- az_webapp_scan_show-result
+- az_webapp_scan_start
+- az_webapp_scan_stop
+- az_webapp_scan_track
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage web apps.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webapp/container.yml b/2018-03-01-hybrid/docs-ref-autogen/webapp/container.yml
new file mode 100644
index 0000000000..896b73acbc
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webapp/container.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp_container
+name: az webapp container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Group of commands related to webapp container operations.
+description: ''
+directCommands:
+- uid: az_webapp_container_up
+  name: az webapp container up
+  summary: Experimental command to create and deploy a container webapp.
+  description: ''
+  syntax: >-
+    az webapp container up --name
+                           [--docker-custom-image-name]
+                           [--dryrun]
+                           [--registry-name]
+                           [--registry-rg]
+                           [--source-location]
+  examples:
+  - summary: Deploy a container using an image from DockerHub. This example uses nginx.
+    syntax: az webapp container up -n AppName -i nginx
+  - summary: Upload files from the current directory to an Azure Container Registry, then build a container image and deploy it to a web app. The Azure Container Registry must already exist.
+    syntax: az webapp container up -n AppName --registry-rg ContainerRegistryResourceGroup --registry-name ContainerRegistryName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp. You can configure the default using 'az configure --defaults web=<name>'.
+    description: ''
+  optionalParameters:
+  - name: --docker-custom-image-name -i
+    summary: The container image name and optionally the tag name (currently public DockerHub images only).
+    description: ''
+  - name: --dryrun
+    summary: Show summary of the create and deploy operation instead of executing it.
+    description: ''
+  - name: --registry-name
+    summary: The name of the Azure Container Registry.
+    description: ''
+  - name: --registry-rg
+    summary: The resource group of the Azure Container Registry.
+    description: ''
+  - name: --source-location -s
+    summary: The path to the web app source directory.
+    description: ''
+commands:
+- az_webapp_container_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Group of commands related to webapp container operations.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webapp/remote-connection.yml b/2018-03-01-hybrid/docs-ref-autogen/webapp/remote-connection.yml
new file mode 100644
index 0000000000..6e4211ab30
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webapp/remote-connection.yml
@@ -0,0 +1,54 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp_remote-connection
+name: az webapp remote-connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp remote-connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Create a remote connection using a tcp tunnel to your web app.
+description: ''
+directCommands:
+- uid: az_webapp_remote-connection_create
+  name: az webapp remote-connection create
+  summary: Creates a remote connection using a tcp tunnel to your web app.
+  description: ''
+  syntax: >-
+    az webapp remote-connection create --name
+                                       --resource-group
+                                       [--port]
+                                       [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --port -p
+    summary: 'Port for the remote connection. Default: Random available port.'
+    description: ''
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+commands:
+- az_webapp_remote-connection_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Create a remote connection using a tcp tunnel to your web app.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webapp/scan.yml b/2018-03-01-hybrid/docs-ref-autogen/webapp/scan.yml
new file mode 100644
index 0000000000..ead3c8b051
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webapp/scan.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_webapp_scan
+name: az webapp scan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webapp** extension for Azure CLI and requires version 2.0.46 or higher.  The extension will automatically install the first time you run an **az webapp scan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
+description: ''
+directCommands:
+- uid: az_webapp_scan_list-result
+  name: az webapp scan list-result
+  summary: Get details of all scans conducted on webapp, upto max scan limit set on the webapp This will get you the scan log results in addition to the scan status of each scan conducted on the webapp.
+  description: ''
+  syntax: >-
+    az webapp scan list-result --name
+                               --resource-group
+                               [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+- uid: az_webapp_scan_show-result
+  name: az webapp scan show-result
+  summary: Get results of specified scan-id. This will fetch you the Scan log results of the specified scan-id.
+  description: ''
+  syntax: >-
+    az webapp scan show-result --name
+                               --resource-group
+                               --scan-id
+                               [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: Unique scan id.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+- uid: az_webapp_scan_start
+  name: az webapp scan start
+  summary: Starts the scan on the specified webapp files in the wwwroot directory. It returns a JSON containing the ScanID, traking and results URL.
+  description: ''
+  syntax: >-
+    az webapp scan start --name
+                         --resource-group
+                         [--slot]
+                         [--timeout]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+  - name: --timeout
+    summary: Timeout for operation in milliseconds.
+    description: ''
+- uid: az_webapp_scan_stop
+  name: az webapp scan stop
+  summary: Stops the current executing scan. Does nothing if no scan is executing.
+  description: ''
+  syntax: >-
+    az webapp scan stop --name
+                        --resource-group
+                        [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+- uid: az_webapp_scan_track
+  name: az webapp scan track
+  summary: Track status of scan by providing scan-id. You can track the status of the scan from [Starting, Success, Failed, TimeoutFailure, Executing].
+  description: ''
+  syntax: >-
+    az webapp scan track --name
+                         --resource-group
+                         --scan-id
+                         [--slot]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the webapp to connect to.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --scan-id
+    summary: Unique scan id.
+    description: ''
+  optionalParameters:
+  - name: --slot
+    summary: Name of the deployment slot to use.
+    description: ''
+commands:
+- az_webapp_scan_list-result
+- az_webapp_scan_show-result
+- az_webapp_scan_start
+- az_webapp_scan_stop
+- az_webapp_scan_track
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Holds group of commands which cater to webapp scans. Currently available only for Linux based webapps.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub.yml
new file mode 100644
index 0000000000..2056bfb9b0
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub.yml
@@ -0,0 +1,213 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub
+name: az webpubsub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub.
+description: ''
+directCommands:
+- uid: az_webpubsub_create
+  name: az webpubsub create
+  summary: Create a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub create --name
+                        --resource-group
+                        --sku {Free_F1, Standard_S1}
+                        [--location]
+                        [--tags]
+                        [--unit-count]
+  examples:
+  - summary: Create a WebPubSub Service with Standard SKU and unit 2.
+    syntax: az webpubsub create -n MyWebPubSub -g MyResourceGroup --sku Standard_S1 --unit-count 2
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: Free_F1, Standard_S1
+    summary: The sku name of the signalr service.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --unit-count
+    defaultValue: "1"
+    summary: The number of signalr service unit count.
+    description: ''
+- uid: az_webpubsub_delete
+  name: az webpubsub delete
+  summary: Delete a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub delete --name
+                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_list
+  name: az webpubsub list
+  summary: List Webpubsub.
+  description: ''
+  syntax: az webpubsub list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_restart
+  name: az webpubsub restart
+  summary: Restart a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub restart --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_show
+  name: az webpubsub show
+  summary: Show details of a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub show --name
+                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_update
+  name: az webpubsub update
+  summary: Update a Webpubsub.
+  description: ''
+  syntax: >-
+    az webpubsub update --name
+                        --resource-group
+                        [--add]
+                        [--force-string]
+                        [--remove]
+                        [--set]
+                        [--sku {Free_F1, Standard_S1}]
+                        [--tags]
+                        [--unit-count]
+  examples:
+  - summary: Update a WebPubSub Service to unit 10.
+    syntax: az webpubsub update -n MyWebPubSub -g MyResourceGroup --sku Standard_S1 --unit-count 10
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --sku
+    parameterValueGroup: Free_F1, Standard_S1
+    summary: The sku name of the signalr service.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --unit-count
+    summary: The number of signalr service unit count.
+    description: ''
+commands:
+- az_webpubsub_client
+- az_webpubsub_client_start
+- az_webpubsub_create
+- az_webpubsub_delete
+- az_webpubsub_event-handler
+- az_webpubsub_event-handler_clear
+- az_webpubsub_event-handler_hub
+- az_webpubsub_event-handler_hub_remove
+- az_webpubsub_event-handler_hub_update
+- az_webpubsub_event-handler_show
+- az_webpubsub_event-handler_update
+- az_webpubsub_key
+- az_webpubsub_key_regenerate
+- az_webpubsub_key_show
+- az_webpubsub_list
+- az_webpubsub_network-rule
+- az_webpubsub_network-rule_show
+- az_webpubsub_network-rule_update
+- az_webpubsub_restart
+- az_webpubsub_service
+- az_webpubsub_service_broadcast
+- az_webpubsub_service_connection
+- az_webpubsub_service_connection_close
+- az_webpubsub_service_connection_exist
+- az_webpubsub_service_connection_send
+- az_webpubsub_service_group
+- az_webpubsub_service_group_add-connection
+- az_webpubsub_service_group_add-user
+- az_webpubsub_service_group_remove-connection
+- az_webpubsub_service_group_remove-user
+- az_webpubsub_service_group_send
+- az_webpubsub_service_permission
+- az_webpubsub_service_permission_check
+- az_webpubsub_service_permission_grant
+- az_webpubsub_service_permission_revoke
+- az_webpubsub_service_user
+- az_webpubsub_service_user_exist
+- az_webpubsub_service_user_send
+- az_webpubsub_show
+- az_webpubsub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/client.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/client.yml
new file mode 100644
index 0000000000..1349ca2b9c
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/client.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_client
+name: az webpubsub client
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub client** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage client connections.
+description: ''
+directCommands:
+- uid: az_webpubsub_client_start
+  name: az webpubsub client start
+  summary: Start a interactive client connection.
+  description: ''
+  syntax: >-
+    az webpubsub client start --hub-name
+                              --name
+                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub which client connects to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_client_start
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage client connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/event-handler.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/event-handler.yml
new file mode 100644
index 0000000000..199451d74f
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/event-handler.yml
@@ -0,0 +1,90 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_event-handler
+name: az webpubsub event-handler
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub event-handler** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub event handler settings.
+description: ''
+directCommands:
+- uid: az_webpubsub_event-handler_clear
+  name: az webpubsub event-handler clear
+  summary: Clear event handler settings for WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler clear --name
+                                     --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_event-handler_show
+  name: az webpubsub event-handler show
+  summary: Show event handler settings for WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler show --name
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_event-handler_update
+  name: az webpubsub event-handler update
+  summary: Update event handler settings for WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler update --items
+                                      --name
+                                      --resource-group
+  examples:
+  - summary: Update event handler to handler connect event.
+    syntax: "az webpubsub event-handler update -n MyWebPubSub -g MyResourceGroup --items '{\"myHub\": [{\"urlTemplate\": \"http://host.com\", \"systemEventPattern\": \"connect\"}]}'"
+  requiredParameters:
+  - isRequired: true
+    name: --items
+    summary: A JSON-formatted string containing event handler items.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_event-handler_clear
+- az_webpubsub_event-handler_hub
+- az_webpubsub_event-handler_hub_remove
+- az_webpubsub_event-handler_hub_update
+- az_webpubsub_event-handler_show
+- az_webpubsub_event-handler_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub event handler settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/event-handler/hub.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/event-handler/hub.yml
new file mode 100644
index 0000000000..b3b7c913fd
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/event-handler/hub.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_event-handler_hub
+name: az webpubsub event-handler hub
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub event-handler hub** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub hub settings.
+description: ''
+directCommands:
+- uid: az_webpubsub_event-handler_hub_remove
+  name: az webpubsub event-handler hub remove
+  summary: Remove a hub's event handler settings.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler hub remove --hub-name
+                                          --name
+                                          --resource-group
+  examples:
+  - summary: Remove all event handler settings in a hub
+    syntax: az webpubsub event-handler hub remove -n MyWebPubSub -g MyResourceGroup --hub-name MyHub
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub whose event handler settings need to delete.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_event-handler_hub_update
+  name: az webpubsub event-handler hub update
+  summary: Update a hub's event handler settings.
+  description: ''
+  syntax: >-
+    az webpubsub event-handler hub update --hub-name
+                                          --name
+                                          --resource-group
+                                          --template
+  examples:
+  - summary: Update two event handler settings in a hub
+    syntax: az webpubsub event-handler hub update -n MyWebPubSub -g MyResourceGroup --hub-name MyHub --template url-template='http://host.com user-event-pattern="MyEvent" --template url-template="http://host2.com" system-event-pattern="connect"'
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub whose event handler settings need to delete.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: Template item for event handler settings. Use key=value pattern to set properties. Supported keys are "url-template", "user-event-pattern", "system-event-pattern".
+    description: ''
+commands:
+- az_webpubsub_event-handler_hub_remove
+- az_webpubsub_event-handler_hub_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub hub settings.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/key.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/key.yml
new file mode 100644
index 0000000000..fee44b95f5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/key.yml
@@ -0,0 +1,74 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_key
+name: az webpubsub key
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub key** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub keys.
+description: ''
+directCommands:
+- uid: az_webpubsub_key_regenerate
+  name: az webpubsub key regenerate
+  summary: Regenerate keys for a WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub key regenerate --key-type {primary, secondary}
+                                --name
+                                --resource-group
+  examples:
+  - summary: Regenerate the primary key for a WebPubSub Service.
+    syntax: az webpubsub key regenerate -n MyWebPubSub -g MyResourceGroup --key-type primary --query primaryKey -o tsv
+  requiredParameters:
+  - isRequired: true
+    name: --key-type
+    parameterValueGroup: primary, secondary
+    summary: The name of access key to regenerate.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_key_show
+  name: az webpubsub key show
+  summary: Show connetion strings and keys for a WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub key show --name
+                          --resource-group
+  examples:
+  - summary: Get the primary key for a WebPubSub Service.
+    syntax: az webpubsub key show -n MyWebPubSub -g MyResourceGroup --query primaryKey -o tsv
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_key_regenerate
+- az_webpubsub_key_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub keys.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/network-rule.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/network-rule.yml
new file mode 100644
index 0000000000..26b5e340b7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/network-rule.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_network-rule
+name: az webpubsub network-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub network-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub network rules.
+description: ''
+directCommands:
+- uid: az_webpubsub_network-rule_show
+  name: az webpubsub network-rule show
+  summary: Get the Network access control of WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub network-rule show --name
+                                   --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_network-rule_update
+  name: az webpubsub network-rule update
+  summary: Update the Network access control of WebPubSub Service.
+  description: ''
+  syntax: >-
+    az webpubsub network-rule update --name
+                                     --resource-group
+                                     [--allow {ClientConnection, RESTAPI, ServerConnection, Trace}]
+                                     [--connection-name]
+                                     [--deny {ClientConnection, RESTAPI, ServerConnection, Trace}]
+                                     [--public-network {false, true}]
+  examples:
+  - summary: Set allowing RESTAPI only for public network.
+    syntax: az webpubsub network-rule update --public-network -n MyWebPubSub -g MyResourceGroup --allow RESTAPI
+  - summary: Set allowing client connection and server connection for a private endpoint connection
+    syntax: az webpubsub network-rule update --connection-name MyPrivateEndpointConnection -n MyWebPubSub -g MyResourceGroup --allow ClientConnection ServerConnection
+  - summary: Set denying client connection for both public network and private endpoint connections
+    syntax: az webpubsub network-rule update --public-network --connection-name MyPrivateEndpointConnection1 MyPrivateEndpointConnection2 -n MyWebPubSub -g MyResourceGroup --deny ClientConnection
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --allow
+    parameterValueGroup: ClientConnection, RESTAPI, ServerConnection, Trace
+    summary: The allowed virtual network rule. Space-separeted list of scope to assign.
+    description: ''
+  - name: --connection-name
+    summary: Space-separeted list of private endpoint connection name.
+    description: ''
+  - name: --deny
+    parameterValueGroup: ClientConnection, RESTAPI, ServerConnection, Trace
+    summary: The denied virtual network rule. Space-separeted list of scope to assign.
+    description: ''
+  - name: --public-network
+    parameterValueGroup: false, true
+    summary: Set rules for public network.
+    description: ''
+commands:
+- az_webpubsub_network-rule_show
+- az_webpubsub_network-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub network rules.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service.yml
new file mode 100644
index 0000000000..3a3b17d3b5
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service.yml
@@ -0,0 +1,75 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service
+name: az webpubsub service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_broadcast
+  name: az webpubsub service broadcast
+  summary: Broadcast messages to hub.
+  description: ''
+  syntax: >-
+    az webpubsub service broadcast --hub-name
+                                   --name
+                                   --payload
+                                   --resource-group
+  examples:
+  - summary: Send a message to hub
+    syntax: az webpubsub service broadcast -n MyWebPubSub -g MyResourceGroup --hub-name MyHub --payload MyPayload
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_broadcast
+- az_webpubsub_service_connection
+- az_webpubsub_service_connection_close
+- az_webpubsub_service_connection_exist
+- az_webpubsub_service_connection_send
+- az_webpubsub_service_group
+- az_webpubsub_service_group_add-connection
+- az_webpubsub_service_group_add-user
+- az_webpubsub_service_group_remove-connection
+- az_webpubsub_service_group_remove-user
+- az_webpubsub_service_group_send
+- az_webpubsub_service_permission
+- az_webpubsub_service_permission_check
+- az_webpubsub_service_permission_grant
+- az_webpubsub_service_permission_revoke
+- az_webpubsub_service_user
+- az_webpubsub_service_user_exist
+- az_webpubsub_service_user_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/connection.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/connection.yml
new file mode 100644
index 0000000000..11662a38b9
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/connection.yml
@@ -0,0 +1,114 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_connection
+name: az webpubsub service connection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service connection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service connections.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_connection_close
+  name: az webpubsub service connection close
+  summary: Close a specific client connection.
+  description: ''
+  syntax: >-
+    az webpubsub service connection close --connection-id
+                                          --hub-name
+                                          --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_connection_exist
+  name: az webpubsub service connection exist
+  summary: Check whether client connection exists.
+  description: ''
+  syntax: >-
+    az webpubsub service connection exist --connection-id
+                                          --hub-name
+                                          --name
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_connection_send
+  name: az webpubsub service connection send
+  summary: Send a message to connection.
+  description: ''
+  syntax: >-
+    az webpubsub service connection send --connection-id
+                                         --hub-name
+                                         --name
+                                         --payload
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_connection_close
+- az_webpubsub_service_connection_exist
+- az_webpubsub_service_connection_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service connections.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/group.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/group.yml
new file mode 100644
index 0000000000..929676eb29
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/group.yml
@@ -0,0 +1,188 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_group
+name: az webpubsub service group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service groups.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_group_add-connection
+  name: az webpubsub service group add-connection
+  summary: Add a connection to group.
+  description: ''
+  syntax: >-
+    az webpubsub service group add-connection --connection-id
+                                              --group-name
+                                              --hub-name
+                                              --name
+                                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_group_add-user
+  name: az webpubsub service group add-user
+  summary: Add a user to group.
+  description: ''
+  syntax: >-
+    az webpubsub service group add-user --group-name
+                                        --hub-name
+                                        --name
+                                        --resource-group
+                                        --user-id
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+- uid: az_webpubsub_service_group_remove-connection
+  name: az webpubsub service group remove-connection
+  summary: Remove a connection from group.
+  description: ''
+  syntax: >-
+    az webpubsub service group remove-connection --connection-id
+                                                 --group-name
+                                                 --hub-name
+                                                 --name
+                                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_group_remove-user
+  name: az webpubsub service group remove-user
+  summary: Remove a user from group.
+  description: ''
+  syntax: >-
+    az webpubsub service group remove-user --hub-name
+                                           --name
+                                           --resource-group
+                                           --user-id
+                                           [--group-name]
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+  optionalParameters:
+  - name: --group-name
+    summary: The group name.
+    description: ''
+- uid: az_webpubsub_service_group_send
+  name: az webpubsub service group send
+  summary: Send a message to group.
+  description: ''
+  syntax: >-
+    az webpubsub service group send --group-name
+                                    --hub-name
+                                    --name
+                                    --payload
+                                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_group_add-connection
+- az_webpubsub_service_group_add-user
+- az_webpubsub_service_group_remove-connection
+- az_webpubsub_service_group_remove-user
+- az_webpubsub_service_group_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service groups.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/permission.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/permission.yml
new file mode 100644
index 0000000000..3f86a71bd7
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/permission.yml
@@ -0,0 +1,142 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_permission
+name: az webpubsub service permission
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service permission** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service permissions.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_permission_check
+  name: az webpubsub service permission check
+  summary: Check if a connection has permission to the specified group.
+  description: ''
+  syntax: >-
+    az webpubsub service permission check --connection-id
+                                          --group-name
+                                          --hub-name
+                                          --name
+                                          --permission {joinLeaveGroup, sendToGroup}
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --permission
+    parameterValueGroup: joinLeaveGroup, sendToGroup
+    summary: The permission.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_permission_grant
+  name: az webpubsub service permission grant
+  summary: Grant a group permission to the connection.
+  description: ''
+  syntax: >-
+    az webpubsub service permission grant --connection-id
+                                          --group-name
+                                          --hub-name
+                                          --name
+                                          --permission {joinLeaveGroup, sendToGroup}
+                                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --permission
+    parameterValueGroup: joinLeaveGroup, sendToGroup
+    summary: The permission.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_webpubsub_service_permission_revoke
+  name: az webpubsub service permission revoke
+  summary: Revoke a group permission from the connection.
+  description: ''
+  syntax: >-
+    az webpubsub service permission revoke --connection-id
+                                           --group-name
+                                           --hub-name
+                                           --name
+                                           --permission {joinLeaveGroup, sendToGroup}
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --connection-id
+    summary: The connection id.
+    description: ''
+  - isRequired: true
+    name: --group-name
+    summary: The group name.
+    description: ''
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --permission
+    parameterValueGroup: joinLeaveGroup, sendToGroup
+    summary: The permission.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_webpubsub_service_permission_check
+- az_webpubsub_service_permission_grant
+- az_webpubsub_service_permission_revoke
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service permissions.
diff --git a/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/user.yml b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/user.yml
new file mode 100644
index 0000000000..303aa424d2
--- /dev/null
+++ b/2018-03-01-hybrid/docs-ref-autogen/webpubsub/service/user.yml
@@ -0,0 +1,87 @@
+### YamlMime:AzureCLIGroup
+uid: az_webpubsub_service_user
+name: az webpubsub service user
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **webpubsub** extension for Azure CLI and requires version 2.22.0 or higher.  The extension will automatically install the first time you run an **az webpubsub service user** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage Webpubsub service users.
+description: ''
+directCommands:
+- uid: az_webpubsub_service_user_exist
+  name: az webpubsub service user exist
+  summary: Check if there are any client connections connected for the given user.
+  description: ''
+  syntax: >-
+    az webpubsub service user exist --hub-name
+                                    --name
+                                    --resource-group
+                                    --user-id
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+- uid: az_webpubsub_service_user_send
+  name: az webpubsub service user send
+  summary: Send a message to user.
+  description: ''
+  syntax: >-
+    az webpubsub service user send --hub-name
+                                   --name
+                                   --payload
+                                   --resource-group
+                                   --user-id
+  requiredParameters:
+  - isRequired: true
+    name: --hub-name
+    summary: The hub to manage.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Webpubsub.
+    description: ''
+  - isRequired: true
+    name: --payload
+    summary: A string payload to send.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --user-id
+    summary: The user id.
+    description: ''
+commands:
+- az_webpubsub_service_user_exist
+- az_webpubsub_service_user_send
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage Webpubsub service users.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/TOC.yml b/2019-03-01-hybrid/docs-ref-autogen/TOC.yml
index e65cb3392a..bc957c567d 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/TOC.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/TOC.yml
@@ -1,15909 +1,4988 @@
 - name: Reference
+  displayName: Reference
   items:
-  - name: Overview
+  - name: List A - Z
     uid: az
-  - name: configure
-    uid: az_configure
-    displayName: az configure
-  - name: feedback
-    uid: az_feedback
-    displayName: az feedback
-  - name: find
-    uid: az_find
-    displayName: az find
-  - name: interactive
-    uid: az_interactive
-    displayName: az interactive
-  - name: login
-    uid: az_login
-    displayName: az login
-  - name: logout
-    uid: az_logout
-    displayName: az logout
-  - name: rest
-    uid: az_rest
-    displayName: az rest
-  - name: self-test
-    uid: az_self_test
-    displayName: az self-test
-  - name: version
-    uid: az_version
-    displayName: az version
-  - name: App Service
-    displayName: az appservice
-    items:
-    - name: Overview
-      uid: az_appservice
-      displayName: az appservice
-    - name: list-locations
-      uid: az_appservice_list_locations
-      displayName: az appservice list-locations
-    - name: Plans
-      displayName: az appservice plan
-      items:
-      - name: Overview
-        uid: az_appservice_plan
-        displayName: az appservice plan
-      - name: create
-        uid: az_appservice_plan_create
-        displayName: az appservice plan create
-      - name: delete
-        uid: az_appservice_plan_delete
-        displayName: az appservice plan delete
-      - name: list
-        uid: az_appservice_plan_list
-        displayName: az appservice plan list
-      - name: show
-        uid: az_appservice_plan_show
-        displayName: az appservice plan show
-      - name: update
-        uid: az_appservice_plan_update
-        displayName: az appservice plan update
-    - name: ase
-      displayName: az appservice ase
-      items:
-      - name: Overview
-        uid: az_appservice_ase
-        displayName: az appservice ase
-      - name: create
-        uid: az_appservice_ase_create
-        displayName: az appservice ase create
-      - name: delete
-        uid: az_appservice_ase_delete
-        displayName: az appservice ase delete
-      - name: list
-        uid: az_appservice_ase_list
-        displayName: az appservice ase list
-      - name: list-addresses
-        uid: az_appservice_ase_list_addresses
-        displayName: az appservice ase list-addresses
-      - name: list-plans
-        uid: az_appservice_ase_list_plans
-        displayName: az appservice ase list-plans
-      - name: show
-        uid: az_appservice_ase_show
-        displayName: az appservice ase show
-      - name: update
-        uid: az_appservice_ase_update
-        displayName: az appservice ase update
-    - name: hybrid-connection
-      displayName: az appservice hybrid-connection
-      items:
-      - name: Overview
-        uid: az_appservice_hybrid_connection
-        displayName: az appservice hybrid-connection
-      - name: set-key
-        uid: az_appservice_hybrid_connection_set_key
-        displayName: az appservice hybrid-connection set-key
-    - name: vnet-integration
-      displayName: az appservice vnet-integration
-      items:
-      - name: Overview
-        uid: az_appservice_vnet_integration
-        displayName: az appservice vnet-integration
-      - name: list
-        uid: az_appservice_vnet_integration_list
-        displayName: az appservice vnet-integration list
+    displayName: List A - Z
+  - name: API Management
+    uid: sp-API_Management
+    displayName: API Management
+    items: []
   - name: Azure Active Directory
-    displayName: az ad
     items:
-    - name: Overview
-      uid: az_ad
-      displayName: az ad
-    - name: Applications
-      displayName: az ad app
-      items:
-      - name: Overview
-        uid: az_ad_app
-        displayName: az ad app
-      - name: create
-        uid: az_ad_app_create
-        displayName: az ad app create
-      - name: delete
-        uid: az_ad_app_delete
-        displayName: az ad app delete
-      - name: list
-        uid: az_ad_app_list
-        displayName: az ad app list
-      - name: show
-        uid: az_ad_app_show
-        displayName: az ad app show
-      - name: update
-        uid: az_ad_app_update
-        displayName: az ad app update
-      - name: credential
-        displayName: az ad app credential
+    - name: Summary
+      uid: sp-Azure_Active_Directory
+      displayName: Azure Active Directory
+    - name: ad - Azure Active Directory
+      items:
+      - name: Summary
+        uid: az_ad
+        displayName: az ad
+      - name: app
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_app
+          displayName: az ad app
+        - name: credential
           uid: az_ad_app_credential
           displayName: az ad app credential
-        - name: delete
-          uid: az_ad_app_credential_delete
-          displayName: az ad app credential delete
-        - name: list
-          uid: az_ad_app_credential_list
-          displayName: az ad app credential list
-        - name: reset
-          uid: az_ad_app_credential_reset
-          displayName: az ad app credential reset
-      - name: owner
-        displayName: az ad app owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_app_owner
           displayName: az ad app owner
-        - name: add
-          uid: az_ad_app_owner_add
-          displayName: az ad app owner add
-        - name: list
-          uid: az_ad_app_owner_list
-          displayName: az ad app owner list
-        - name: remove
-          uid: az_ad_app_owner_remove
-          displayName: az ad app owner remove
-      - name: permission
-        displayName: az ad app permission
-        items:
-        - name: Overview
+          items: []
+        - name: permission
           uid: az_ad_app_permission
           displayName: az ad app permission
-        - name: add
-          uid: az_ad_app_permission_add
-          displayName: az ad app permission add
-        - name: admin-consent
-          uid: az_ad_app_permission_admin_consent
-          displayName: az ad app permission admin-consent
-        - name: delete
-          uid: az_ad_app_permission_delete
-          displayName: az ad app permission delete
-        - name: grant
-          uid: az_ad_app_permission_grant
-          displayName: az ad app permission grant
-        - name: list
-          uid: az_ad_app_permission_list
-          displayName: az ad app permission list
-        - name: list-grants
-          uid: az_ad_app_permission_list_grants
-          displayName: az ad app permission list-grants
-    - name: Groups
-      displayName: az ad group
-      items:
-      - name: Overview
-        uid: az_ad_group
-        displayName: az ad group
-      - name: create
-        uid: az_ad_group_create
-        displayName: az ad group create
-      - name: delete
-        uid: az_ad_group_delete
-        displayName: az ad group delete
-      - name: get-member-groups
-        uid: az_ad_group_get_member_groups
-        displayName: az ad group get-member-groups
-      - name: list
-        uid: az_ad_group_list
-        displayName: az ad group list
-      - name: show
-        uid: az_ad_group_show
-        displayName: az ad group show
-      - name: member
-        displayName: az ad group member
+          items: []
+      - name: ds
+        uid: az_ad_ds
+        displayName: az ad ds
+        items: []
+      - name: group
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_group
+          displayName: az ad group
+        - name: member
           uid: az_ad_group_member
           displayName: az ad group member
-        - name: add
-          uid: az_ad_group_member_add
-          displayName: az ad group member add
-        - name: check
-          uid: az_ad_group_member_check
-          displayName: az ad group member check
-        - name: list
-          uid: az_ad_group_member_list
-          displayName: az ad group member list
-        - name: remove
-          uid: az_ad_group_member_remove
-          displayName: az ad group member remove
-      - name: owner
-        displayName: az ad group owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_group_owner
           displayName: az ad group owner
-        - name: add
-          uid: az_ad_group_owner_add
-          displayName: az ad group owner add
-        - name: list
-          uid: az_ad_group_owner_list
-          displayName: az ad group owner list
-        - name: remove
-          uid: az_ad_group_owner_remove
-          displayName: az ad group owner remove
-    - name: Service principals
-      displayName: az ad sp
-      items:
-      - name: Overview
-        uid: az_ad_sp
-        displayName: az ad sp
-      - name: create
-        uid: az_ad_sp_create
-        displayName: az ad sp create
-      - name: create-for-rbac
-        uid: az_ad_sp_create_for_rbac
-        displayName: az ad sp create-for-rbac
-      - name: delete
-        uid: az_ad_sp_delete
-        displayName: az ad sp delete
-      - name: list
-        uid: az_ad_sp_list
-        displayName: az ad sp list
-      - name: show
-        uid: az_ad_sp_show
-        displayName: az ad sp show
-      - name: update
-        uid: az_ad_sp_update
-        displayName: az ad sp update
-      - name: credential
-        displayName: az ad sp credential
+          items: []
+      - name: signed-in-user
+        uid: az_ad_signed-in-user
+        displayName: az ad signed-in-user
+        items: []
+      - name: ad sp - service principals
         items:
-        - name: Overview
+        - name: Summary
+          uid: az_ad_sp
+          displayName: az ad sp
+        - name: credential
           uid: az_ad_sp_credential
           displayName: az ad sp credential
-        - name: delete
-          uid: az_ad_sp_credential_delete
-          displayName: az ad sp credential delete
-        - name: list
-          uid: az_ad_sp_credential_list
-          displayName: az ad sp credential list
-        - name: reset
-          uid: az_ad_sp_credential_reset
-          displayName: az ad sp credential reset
-      - name: owner
-        displayName: az ad sp owner
-        items:
-        - name: Overview
+          items: []
+        - name: owner
           uid: az_ad_sp_owner
           displayName: az ad sp owner
-        - name: list
-          uid: az_ad_sp_owner_list
-          displayName: az ad sp owner list
-    - name: Users
-      displayName: az ad user
-      items:
-      - name: Overview
+          items: []
+      - name: user
         uid: az_ad_user
         displayName: az ad user
-      - name: create
-        uid: az_ad_user_create
-        displayName: az ad user create
-      - name: delete
-        uid: az_ad_user_delete
-        displayName: az ad user delete
-      - name: get-member-groups
-        uid: az_ad_user_get_member_groups
-        displayName: az ad user get-member-groups
-      - name: list
-        uid: az_ad_user_list
-        displayName: az ad user list
-      - name: show
-        uid: az_ad_user_show
-        displayName: az ad user show
-      - name: update
-        uid: az_ad_user_update
-        displayName: az ad user update
-    - name: signed-in-user
-      displayName: az ad signed-in-user
-      items:
-      - name: Overview
-        uid: az_ad_signed_in_user
-        displayName: az ad signed-in-user
-      - name: list-owned-objects
-        uid: az_ad_signed_in_user_list_owned_objects
-        displayName: az ad signed-in-user list-owned-objects
-      - name: show
-        uid: az_ad_signed_in_user_show
-        displayName: az ad signed-in-user show
-  - name: Cloud management
-    displayName: az cloud
-    items:
-    - name: Overview
-      uid: az_cloud
-      displayName: az cloud
-    - name: list
-      uid: az_cloud_list
-      displayName: az cloud list
-    - name: list-profiles
-      uid: az_cloud_list_profiles
-      displayName: az cloud list-profiles
-    - name: register
-      uid: az_cloud_register
-      displayName: az cloud register
-    - name: set
-      uid: az_cloud_set
-      displayName: az cloud set
-    - name: show
-      uid: az_cloud_show
-      displayName: az cloud show
-    - name: unregister
-      uid: az_cloud_unregister
-      displayName: az cloud unregister
-    - name: update
-      uid: az_cloud_update
-      displayName: az cloud update
-  - name: Functions
-    displayName: az functionapp
+        items: []
+  - name: Azure Advisor
+    uid: sp-Azure_Advisor
+    displayName: Azure Advisor
+    items: []
+  - name: Azure API for FHIR
     items:
-    - name: Overview
-      uid: az_functionapp
-      displayName: az functionapp
-    - name: create
-      uid: az_functionapp_create
-      displayName: az functionapp create
-    - name: delete
-      uid: az_functionapp_delete
-      displayName: az functionapp delete
-    - name: list
-      uid: az_functionapp_list
-      displayName: az functionapp list
-    - name: list-consumption-locations
-      uid: az_functionapp_list_consumption_locations
-      displayName: az functionapp list-consumption-locations
-    - name: restart
-      uid: az_functionapp_restart
-      displayName: az functionapp restart
-    - name: show
-      uid: az_functionapp_show
-      displayName: az functionapp show
-    - name: start
-      uid: az_functionapp_start
-      displayName: az functionapp start
-    - name: stop
-      uid: az_functionapp_stop
-      displayName: az functionapp stop
-    - name: update
-      uid: az_functionapp_update
-      displayName: az functionapp update
-    - name: config
-      displayName: az functionapp config
-      items:
-      - name: Overview
-        uid: az_functionapp_config
-        displayName: az functionapp config
-      - name: set
-        uid: az_functionapp_config_set
-        displayName: az functionapp config set
-      - name: show
-        uid: az_functionapp_config_show
-        displayName: az functionapp config show
-      - name: access-restriction
-        displayName: az functionapp config access-restriction
-        items:
-        - name: Overview
-          uid: az_functionapp_config_access_restriction
-          displayName: az functionapp config access-restriction
-        - name: add
-          uid: az_functionapp_config_access_restriction_add
-          displayName: az functionapp config access-restriction add
-        - name: remove
-          uid: az_functionapp_config_access_restriction_remove
-          displayName: az functionapp config access-restriction remove
-        - name: set
-          uid: az_functionapp_config_access_restriction_set
-          displayName: az functionapp config access-restriction set
-        - name: show
-          uid: az_functionapp_config_access_restriction_show
-          displayName: az functionapp config access-restriction show
-      - name: appsettings
-        displayName: az functionapp config appsettings
-        items:
-        - name: Overview
-          uid: az_functionapp_config_appsettings
-          displayName: az functionapp config appsettings
-        - name: delete
-          uid: az_functionapp_config_appsettings_delete
-          displayName: az functionapp config appsettings delete
-        - name: list
-          uid: az_functionapp_config_appsettings_list
-          displayName: az functionapp config appsettings list
-        - name: set
-          uid: az_functionapp_config_appsettings_set
-          displayName: az functionapp config appsettings set
-      - name: container
-        displayName: az functionapp config container
-        items:
-        - name: Overview
-          uid: az_functionapp_config_container
-          displayName: az functionapp config container
-        - name: delete
-          uid: az_functionapp_config_container_delete
-          displayName: az functionapp config container delete
-        - name: set
-          uid: az_functionapp_config_container_set
-          displayName: az functionapp config container set
-        - name: show
-          uid: az_functionapp_config_container_show
-          displayName: az functionapp config container show
-      - name: hostname
-        displayName: az functionapp config hostname
-        items:
-        - name: Overview
-          uid: az_functionapp_config_hostname
-          displayName: az functionapp config hostname
-        - name: add
-          uid: az_functionapp_config_hostname_add
-          displayName: az functionapp config hostname add
-        - name: delete
-          uid: az_functionapp_config_hostname_delete
-          displayName: az functionapp config hostname delete
-        - name: get-external-ip
-          uid: az_functionapp_config_hostname_get_external_ip
-          displayName: az functionapp config hostname get-external-ip
-        - name: list
-          uid: az_functionapp_config_hostname_list
-          displayName: az functionapp config hostname list
-      - name: ssl
-        displayName: az functionapp config ssl
-        items:
-        - name: Overview
-          uid: az_functionapp_config_ssl
-          displayName: az functionapp config ssl
-        - name: bind
-          uid: az_functionapp_config_ssl_bind
-          displayName: az functionapp config ssl bind
-        - name: create
-          uid: az_functionapp_config_ssl_create
-          displayName: az functionapp config ssl create
-        - name: delete
-          uid: az_functionapp_config_ssl_delete
-          displayName: az functionapp config ssl delete
-        - name: import
-          uid: az_functionapp_config_ssl_import
-          displayName: az functionapp config ssl import
-        - name: list
-          uid: az_functionapp_config_ssl_list
-          displayName: az functionapp config ssl list
-        - name: unbind
-          uid: az_functionapp_config_ssl_unbind
-          displayName: az functionapp config ssl unbind
-        - name: upload
-          uid: az_functionapp_config_ssl_upload
-          displayName: az functionapp config ssl upload
-    - name: cors
-      displayName: az functionapp cors
-      items:
-      - name: Overview
-        uid: az_functionapp_cors
-        displayName: az functionapp cors
-      - name: add
-        uid: az_functionapp_cors_add
-        displayName: az functionapp cors add
-      - name: remove
-        uid: az_functionapp_cors_remove
-        displayName: az functionapp cors remove
-      - name: show
-        uid: az_functionapp_cors_show
-        displayName: az functionapp cors show
-    - name: deployment
-      displayName: az functionapp deployment
+    - name: Summary
+      uid: sp-Azure_API_for_FHIR
+      displayName: Azure API for FHIR
+    - name: healthcareapis
       items:
-      - name: Overview
-        uid: az_functionapp_deployment
-        displayName: az functionapp deployment
-      - name: list-publishing-credentials
-        uid: az_functionapp_deployment_list_publishing_credentials
-        displayName: az functionapp deployment list-publishing-credentials
-      - name: list-publishing-profiles
-        uid: az_functionapp_deployment_list_publishing_profiles
-        displayName: az functionapp deployment list-publishing-profiles
-      - name: container
-        displayName: az functionapp deployment container
-        items:
-        - name: Overview
-          uid: az_functionapp_deployment_container
-          displayName: az functionapp deployment container
-        - name: config
-          uid: az_functionapp_deployment_container_config
-          displayName: az functionapp deployment container config
-        - name: show-cd-url
-          uid: az_functionapp_deployment_container_show_cd_url
-          displayName: az functionapp deployment container show-cd-url
-      - name: slot
-        displayName: az functionapp deployment slot
-        items:
-        - name: Overview
-          uid: az_functionapp_deployment_slot
-          displayName: az functionapp deployment slot
-        - name: auto-swap
-          uid: az_functionapp_deployment_slot_auto_swap
-          displayName: az functionapp deployment slot auto-swap
-        - name: create
-          uid: az_functionapp_deployment_slot_create
-          displayName: az functionapp deployment slot create
-        - name: delete
-          uid: az_functionapp_deployment_slot_delete
-          displayName: az functionapp deployment slot delete
-        - name: list
-          uid: az_functionapp_deployment_slot_list
-          displayName: az functionapp deployment slot list
-        - name: swap
-          uid: az_functionapp_deployment_slot_swap
-          displayName: az functionapp deployment slot swap
-      - name: source
-        displayName: az functionapp deployment source
-        items:
-        - name: Overview
-          uid: az_functionapp_deployment_source
-          displayName: az functionapp deployment source
-        - name: config
-          uid: az_functionapp_deployment_source_config
-          displayName: az functionapp deployment source config
-        - name: config-local-git
-          uid: az_functionapp_deployment_source_config_local_git
-          displayName: az functionapp deployment source config-local-git
-        - name: config-zip
-          uid: az_functionapp_deployment_source_config_zip
-          displayName: az functionapp deployment source config-zip
-        - name: delete
-          uid: az_functionapp_deployment_source_delete
-          displayName: az functionapp deployment source delete
-        - name: show
-          uid: az_functionapp_deployment_source_show
-          displayName: az functionapp deployment source show
-        - name: sync
-          uid: az_functionapp_deployment_source_sync
-          displayName: az functionapp deployment source sync
-        - name: update-token
-          uid: az_functionapp_deployment_source_update_token
-          displayName: az functionapp deployment source update-token
-      - name: user
-        displayName: az functionapp deployment user
+      - name: Summary
+        uid: az_healthcareapis
+        displayName: az healthcareapis
+      - name: acr
+        uid: az_healthcareapis_acr
+        displayName: az healthcareapis acr
+        items: []
+      - name: operation-result
+        uid: az_healthcareapis_operation-result
+        displayName: az healthcareapis operation-result
+        items: []
+      - name: private-endpoint-connection
+        uid: az_healthcareapis_private-endpoint-connection
+        displayName: az healthcareapis private-endpoint-connection
+        items: []
+      - name: private-link-resource
+        uid: az_healthcareapis_private-link-resource
+        displayName: az healthcareapis private-link-resource
+        items: []
+      - name: service
+        uid: az_healthcareapis_service
+        displayName: az healthcareapis service
+        items: []
+  - name: Azure App Configuration
+    items:
+    - name: Summary
+      uid: sp-Azure_App_Configuration
+      displayName: Azure App Configuration
+    - name: appconfig
+      items:
+      - name: Summary
+        uid: az_appconfig
+        displayName: az appconfig
+      - name: credential
+        uid: az_appconfig_credential
+        displayName: az appconfig credential
+        items: []
+      - name: feature
         items:
-        - name: Overview
-          uid: az_functionapp_deployment_user
-          displayName: az functionapp deployment user
-        - name: set
-          uid: az_functionapp_deployment_user_set
-          displayName: az functionapp deployment user set
-        - name: show
-          uid: az_functionapp_deployment_user_show
-          displayName: az functionapp deployment user show
-    - name: devops-pipeline
-      displayName: az functionapp devops-pipeline
-      items:
-      - name: Overview
-        uid: az_functionapp_devops_pipeline
-        displayName: az functionapp devops-pipeline
-      - name: create
-        uid: az_functionapp_devops_pipeline_create
-        displayName: az functionapp devops-pipeline create
-    - name: hybrid-connection
-      displayName: az functionapp hybrid-connection
-      items:
-      - name: Overview
-        uid: az_functionapp_hybrid_connection
-        displayName: az functionapp hybrid-connection
-      - name: add
-        uid: az_functionapp_hybrid_connection_add
-        displayName: az functionapp hybrid-connection add
-      - name: list
-        uid: az_functionapp_hybrid_connection_list
-        displayName: az functionapp hybrid-connection list
-      - name: remove
-        uid: az_functionapp_hybrid_connection_remove
-        displayName: az functionapp hybrid-connection remove
-    - name: identity
-      displayName: az functionapp identity
-      items:
-      - name: Overview
-        uid: az_functionapp_identity
-        displayName: az functionapp identity
-      - name: assign
-        uid: az_functionapp_identity_assign
-        displayName: az functionapp identity assign
-      - name: remove
-        uid: az_functionapp_identity_remove
-        displayName: az functionapp identity remove
-      - name: show
-        uid: az_functionapp_identity_show
-        displayName: az functionapp identity show
-    - name: plan
-      displayName: az functionapp plan
-      items:
-      - name: Overview
-        uid: az_functionapp_plan
-        displayName: az functionapp plan
-      - name: create
-        uid: az_functionapp_plan_create
-        displayName: az functionapp plan create
-      - name: delete
-        uid: az_functionapp_plan_delete
-        displayName: az functionapp plan delete
-      - name: list
-        uid: az_functionapp_plan_list
-        displayName: az functionapp plan list
-      - name: show
-        uid: az_functionapp_plan_show
-        displayName: az functionapp plan show
-      - name: update
-        uid: az_functionapp_plan_update
-        displayName: az functionapp plan update
-    - name: vnet-integration
-      displayName: az functionapp vnet-integration
+        - name: Summary
+          uid: az_appconfig_feature
+          displayName: az appconfig feature
+        - name: filter
+          uid: az_appconfig_feature_filter
+          displayName: az appconfig feature filter
+          items: []
+      - name: identity
+        uid: az_appconfig_identity
+        displayName: az appconfig identity
+        items: []
+      - name: kv
+        uid: az_appconfig_kv
+        displayName: az appconfig kv
+        items: []
+      - name: revision
+        uid: az_appconfig_revision
+        displayName: az appconfig revision
+        items: []
+  - name: Azure App Service
+    items:
+    - name: Summary
+      uid: sp-Azure_App_Service
+      displayName: Azure App Service
+    - name: appservice
+      items:
+      - name: Summary
+        uid: az_appservice
+        displayName: az appservice
+      - name: ase
+        uid: az_appservice_ase
+        displayName: az appservice ase
+        items: []
+      - name: domain
+        uid: az_appservice_domain
+        displayName: az appservice domain
+        items: []
+      - name: hybrid-connection
+        uid: az_appservice_hybrid-connection
+        displayName: az appservice hybrid-connection
+        items: []
+      - name: plan
+        uid: az_appservice_plan
+        displayName: az appservice plan
+        items: []
+      - name: vnet-integration
+        uid: az_appservice_vnet-integration
+        displayName: az appservice vnet-integration
+        items: []
+  - name: Azure Application Insights
+    uid: sp-Azure_Application_Insights
+    displayName: Azure Application Insights
+    items: []
+  - name: Azure Arc
+    items:
+    - name: Summary
+      uid: sp-Azure_Arc
+      displayName: Azure Arc
+    - name: connectedmachine
       items:
-      - name: Overview
-        uid: az_functionapp_vnet_integration
-        displayName: az functionapp vnet-integration
-      - name: add
-        uid: az_functionapp_vnet_integration_add
-        displayName: az functionapp vnet-integration add
-      - name: list
-        uid: az_functionapp_vnet_integration_list
-        displayName: az functionapp vnet-integration list
-      - name: remove
-        uid: az_functionapp_vnet_integration_remove
-        displayName: az functionapp vnet-integration remove
-  - name: HDInsight
-    displayName: az hdinsight
+      - name: Summary
+        uid: az_connectedmachine
+        displayName: az connectedmachine
+      - name: extension
+        uid: az_connectedmachine_extension
+        displayName: az connectedmachine extension
+        items: []
+  - name: Azure Arc for VMware PrivateCloud
+    uid: sp-Azure_Arc_for_VMware_PrivateCloud
+    displayName: Azure Arc for VMware PrivateCloud
+    items: []
+  - name: Azure Artifacts
     items:
-    - name: Overview
-      uid: az_hdinsight
-      displayName: az hdinsight
-    - name: create
-      uid: az_hdinsight_create
-      displayName: az hdinsight create
-    - name: delete
-      uid: az_hdinsight_delete
-      displayName: az hdinsight delete
-    - name: list
-      uid: az_hdinsight_list
-      displayName: az hdinsight list
-    - name: list-usage
-      uid: az_hdinsight_list_usage
-      displayName: az hdinsight list-usage
-    - name: resize
-      uid: az_hdinsight_resize
-      displayName: az hdinsight resize
-    - name: rotate-disk-encryption-key
-      uid: az_hdinsight_rotate_disk_encryption_key
-      displayName: az hdinsight rotate-disk-encryption-key
-    - name: show
-      uid: az_hdinsight_show
-      displayName: az hdinsight show
-    - name: update
-      uid: az_hdinsight_update
-      displayName: az hdinsight update
-    - name: wait
-      uid: az_hdinsight_wait
-      displayName: az hdinsight wait
-    - name: application
-      displayName: az hdinsight application
+    - name: Summary
+      uid: sp-Azure_Artifacts
+      displayName: Azure Artifacts
+    - name: artifacts
       items:
-      - name: Overview
-        uid: az_hdinsight_application
-        displayName: az hdinsight application
-      - name: create
-        uid: az_hdinsight_application_create
-        displayName: az hdinsight application create
-      - name: delete
-        uid: az_hdinsight_application_delete
-        displayName: az hdinsight application delete
-      - name: list
-        uid: az_hdinsight_application_list
-        displayName: az hdinsight application list
-      - name: show
-        uid: az_hdinsight_application_show
-        displayName: az hdinsight application show
-      - name: wait
-        uid: az_hdinsight_application_wait
-        displayName: az hdinsight application wait
-    - name: monitor
-      displayName: az hdinsight monitor
+      - name: Summary
+        uid: az_artifacts
+        displayName: az artifacts
+      - name: universal
+        uid: az_artifacts_universal
+        displayName: az artifacts universal
+        items: []
+  - name: Azure Attestation
+    items:
+    - name: Summary
+      uid: sp-Azure_Attestation
+      displayName: Azure Attestation
+    - name: attestation
+      items:
+      - name: Summary
+        uid: az_attestation
+        displayName: az attestation
+      - name: policy
+        uid: az_attestation_policy
+        displayName: az attestation policy
+        items: []
+      - name: signer
+        uid: az_attestation_signer
+        displayName: az attestation signer
+        items: []
+  - name: Azure Automation
+    items:
+    - name: Summary
+      uid: sp-Azure_Automation
+      displayName: Azure Automation
+    - name: automation
+      items:
+      - name: Summary
+        uid: az_automation
+        displayName: az automation
+      - name: account
+        uid: az_automation_account
+        displayName: az automation account
+        items: []
+      - name: job
+        uid: az_automation_job
+        displayName: az automation job
+        items: []
+      - name: runbook
+        uid: az_automation_runbook
+        displayName: az automation runbook
+        items: []
+  - name: Azure Backup
+    uid: sp-Azure_Backup
+    displayName: Azure Backup
+    items: []
+  - name: Azure Batch
+    items:
+    - name: Summary
+      uid: sp-Azure_Batch
+      displayName: Azure Batch
+    - name: batch
       items:
-      - name: Overview
-        uid: az_hdinsight_monitor
-        displayName: az hdinsight monitor
-      - name: disable
-        uid: az_hdinsight_monitor_disable
-        displayName: az hdinsight monitor disable
-      - name: enable
-        uid: az_hdinsight_monitor_enable
-        displayName: az hdinsight monitor enable
-      - name: show
-        uid: az_hdinsight_monitor_show
-        displayName: az hdinsight monitor show
-    - name: script-action
-      displayName: az hdinsight script-action
+      - name: Summary
+        uid: az_batch
+        displayName: az batch
+      - name: file
+        uid: az_batch_file
+        displayName: az batch file
+        items: []
+      - name: job
+        uid: az_batch_job
+        displayName: az batch job
+        items: []
+      - name: pool
+        uid: az_batch_pool
+        displayName: az batch pool
+        items: []
+  - name: Azure Blockchain
+    items:
+    - name: Summary
+      uid: sp-Azure_Blockchain
+      displayName: Azure Blockchain
+    - name: blockchain
       items:
-      - name: Overview
-        uid: az_hdinsight_script_action
-        displayName: az hdinsight script-action
-      - name: delete
-        uid: az_hdinsight_script_action_delete
-        displayName: az hdinsight script-action delete
-      - name: execute
-        uid: az_hdinsight_script_action_execute
-        displayName: az hdinsight script-action execute
-      - name: list
-        uid: az_hdinsight_script_action_list
-        displayName: az hdinsight script-action list
-      - name: list-execution-history
-        uid: az_hdinsight_script_action_list_execution_history
-        displayName: az hdinsight script-action list-execution-history
-      - name: promote
-        uid: az_hdinsight_script_action_promote
-        displayName: az hdinsight script-action promote
-      - name: show-execution-details
-        uid: az_hdinsight_script_action_show_execution_details
-        displayName: az hdinsight script-action show-execution-details
-  - name: IoT
-    displayName: az iot
+      - name: Summary
+        uid: az_blockchain
+        displayName: az blockchain
+      - name: consortium
+        uid: az_blockchain_consortium
+        displayName: az blockchain consortium
+        items: []
+      - name: member
+        uid: az_blockchain_member
+        displayName: az blockchain member
+        items: []
+      - name: transaction-node
+        uid: az_blockchain_transaction-node
+        displayName: az blockchain transaction-node
+        items: []
+  - name: Azure Blueprint
     items:
-    - name: Overview
-      uid: az_iot
-      displayName: az iot
-    - name: Hubs
-      displayName: az iot hub
+    - name: Summary
+      uid: sp-Azure_Blueprint
+      displayName: Azure Blueprint
+    - name: blueprint
       items:
-      - name: Overview
-        uid: az_iot_hub
-        displayName: az iot hub
-      - name: create
-        uid: az_iot_hub_create
-        displayName: az iot hub create
-      - name: delete
-        uid: az_iot_hub_delete
-        displayName: az iot hub delete
-      - name: list
-        uid: az_iot_hub_list
-        displayName: az iot hub list
-      - name: list-skus
-        uid: az_iot_hub_list_skus
-        displayName: az iot hub list-skus
-      - name: manual-failover
-        uid: az_iot_hub_manual_failover
-        displayName: az iot hub manual-failover
-      - name: show
-        uid: az_iot_hub_show
-        displayName: az iot hub show
-      - name: show-connection-string
-        uid: az_iot_hub_show_connection_string
-        displayName: az iot hub show-connection-string
-      - name: show-quota-metrics
-        uid: az_iot_hub_show_quota_metrics
-        displayName: az iot hub show-quota-metrics
-      - name: show-stats
-        uid: az_iot_hub_show_stats
-        displayName: az iot hub show-stats
-      - name: update
-        uid: az_iot_hub_update
-        displayName: az iot hub update
-      - name: Consumer groups
-        displayName: az iot hub consumer-group
-        items:
-        - name: Overview
-          uid: az_iot_hub_consumer_group
-          displayName: az iot hub consumer-group
-        - name: create
-          uid: az_iot_hub_consumer_group_create
-          displayName: az iot hub consumer-group create
-        - name: delete
-          uid: az_iot_hub_consumer_group_delete
-          displayName: az iot hub consumer-group delete
-        - name: list
-          uid: az_iot_hub_consumer_group_list
-          displayName: az iot hub consumer-group list
-        - name: show
-          uid: az_iot_hub_consumer_group_show
-          displayName: az iot hub consumer-group show
-      - name: Jobs
-        displayName: az iot hub job
-        items:
-        - name: Overview
-          uid: az_iot_hub_job
-          displayName: az iot hub job
-        - name: cancel
-          uid: az_iot_hub_job_cancel
-          displayName: az iot hub job cancel
-        - name: list
-          uid: az_iot_hub_job_list
-          displayName: az iot hub job list
-        - name: show
-          uid: az_iot_hub_job_show
-          displayName: az iot hub job show
-      - name: Policies
-        displayName: az iot hub policy
-        items:
-        - name: Overview
-          uid: az_iot_hub_policy
-          displayName: az iot hub policy
-        - name: create
-          uid: az_iot_hub_policy_create
-          displayName: az iot hub policy create
-        - name: delete
-          uid: az_iot_hub_policy_delete
-          displayName: az iot hub policy delete
-        - name: list
-          uid: az_iot_hub_policy_list
-          displayName: az iot hub policy list
-        - name: renew-key
-          uid: az_iot_hub_policy_renew_key
-          displayName: az iot hub policy renew-key
-        - name: show
-          uid: az_iot_hub_policy_show
-          displayName: az iot hub policy show
-      - name: certificate
-        displayName: az iot hub certificate
-        items:
-        - name: Overview
-          uid: az_iot_hub_certificate
-          displayName: az iot hub certificate
-        - name: create
-          uid: az_iot_hub_certificate_create
-          displayName: az iot hub certificate create
-        - name: delete
-          uid: az_iot_hub_certificate_delete
-          displayName: az iot hub certificate delete
-        - name: generate-verification-code
-          uid: az_iot_hub_certificate_generate_verification_code
-          displayName: az iot hub certificate generate-verification-code
-        - name: list
-          uid: az_iot_hub_certificate_list
-          displayName: az iot hub certificate list
-        - name: show
-          uid: az_iot_hub_certificate_show
-          displayName: az iot hub certificate show
-        - name: update
-          uid: az_iot_hub_certificate_update
-          displayName: az iot hub certificate update
-        - name: verify
-          uid: az_iot_hub_certificate_verify
-          displayName: az iot hub certificate verify
-      - name: route
-        displayName: az iot hub route
-        items:
-        - name: Overview
-          uid: az_iot_hub_route
-          displayName: az iot hub route
-        - name: create
-          uid: az_iot_hub_route_create
-          displayName: az iot hub route create
-        - name: delete
-          uid: az_iot_hub_route_delete
-          displayName: az iot hub route delete
-        - name: list
-          uid: az_iot_hub_route_list
-          displayName: az iot hub route list
-        - name: show
-          uid: az_iot_hub_route_show
-          displayName: az iot hub route show
-        - name: test
-          uid: az_iot_hub_route_test
-          displayName: az iot hub route test
-        - name: update
-          uid: az_iot_hub_route_update
-          displayName: az iot hub route update
-      - name: routing-endpoint
-        displayName: az iot hub routing-endpoint
+      - name: Summary
+        uid: az_blueprint
+        displayName: az blueprint
+      - name: artifact
         items:
-        - name: Overview
-          uid: az_iot_hub_routing_endpoint
-          displayName: az iot hub routing-endpoint
-        - name: create
-          uid: az_iot_hub_routing_endpoint_create
-          displayName: az iot hub routing-endpoint create
-        - name: delete
-          uid: az_iot_hub_routing_endpoint_delete
-          displayName: az iot hub routing-endpoint delete
-        - name: list
-          uid: az_iot_hub_routing_endpoint_list
-          displayName: az iot hub routing-endpoint list
-        - name: show
-          uid: az_iot_hub_routing_endpoint_show
-          displayName: az iot hub routing-endpoint show
-    - name: central
-      displayName: az iot central
-      items:
-      - name: Overview
-        uid: az_iot_central
-        displayName: az iot central
-      - name: app
-        displayName: az iot central app
+        - name: Summary
+          uid: az_blueprint_artifact
+          displayName: az blueprint artifact
+        - name: policy
+          uid: az_blueprint_artifact_policy
+          displayName: az blueprint artifact policy
+          items: []
+        - name: role
+          uid: az_blueprint_artifact_role
+          displayName: az blueprint artifact role
+          items: []
+        - name: template
+          uid: az_blueprint_artifact_template
+          displayName: az blueprint artifact template
+          items: []
+      - name: assignment
+        uid: az_blueprint_assignment
+        displayName: az blueprint assignment
+        items: []
+      - name: resource-group
+        uid: az_blueprint_resource-group
+        displayName: az blueprint resource-group
+        items: []
+      - name: version
         items:
-        - name: Overview
-          uid: az_iot_central_app
-          displayName: az iot central app
-        - name: create
-          uid: az_iot_central_app_create
-          displayName: az iot central app create
-        - name: delete
-          uid: az_iot_central_app_delete
-          displayName: az iot central app delete
-        - name: list
-          uid: az_iot_central_app_list
-          displayName: az iot central app list
-        - name: show
-          uid: az_iot_central_app_show
-          displayName: az iot central app show
-        - name: update
-          uid: az_iot_central_app_update
-          displayName: az iot central app update
-    - name: dps
-      displayName: az iot dps
+        - name: Summary
+          uid: az_blueprint_version
+          displayName: az blueprint version
+        - name: artifact
+          uid: az_blueprint_version_artifact
+          displayName: az blueprint version artifact
+          items: []
+  - name: Azure Boards
+    items:
+    - name: Summary
+      uid: sp-Azure_Boards
+      displayName: Azure Boards
+    - name: boards
       items:
-      - name: Overview
-        uid: az_iot_dps
-        displayName: az iot dps
-      - name: create
-        uid: az_iot_dps_create
-        displayName: az iot dps create
-      - name: delete
-        uid: az_iot_dps_delete
-        displayName: az iot dps delete
-      - name: list
-        uid: az_iot_dps_list
-        displayName: az iot dps list
-      - name: show
-        uid: az_iot_dps_show
-        displayName: az iot dps show
-      - name: update
-        uid: az_iot_dps_update
-        displayName: az iot dps update
-      - name: access-policy
-        displayName: az iot dps access-policy
+      - name: Summary
+        uid: az_boards
+        displayName: az boards
+      - name: area
         items:
-        - name: Overview
-          uid: az_iot_dps_access_policy
-          displayName: az iot dps access-policy
-        - name: create
-          uid: az_iot_dps_access_policy_create
-          displayName: az iot dps access-policy create
-        - name: delete
-          uid: az_iot_dps_access_policy_delete
-          displayName: az iot dps access-policy delete
-        - name: list
-          uid: az_iot_dps_access_policy_list
-          displayName: az iot dps access-policy list
-        - name: show
-          uid: az_iot_dps_access_policy_show
-          displayName: az iot dps access-policy show
-        - name: update
-          uid: az_iot_dps_access_policy_update
-          displayName: az iot dps access-policy update
-      - name: certificate
-        displayName: az iot dps certificate
+        - name: Summary
+          uid: az_boards_area
+          displayName: az boards area
+        - name: project
+          uid: az_boards_area_project
+          displayName: az boards area project
+          items: []
+        - name: team
+          uid: az_boards_area_team
+          displayName: az boards area team
+          items: []
+      - name: iteration
         items:
-        - name: Overview
-          uid: az_iot_dps_certificate
-          displayName: az iot dps certificate
-        - name: create
-          uid: az_iot_dps_certificate_create
-          displayName: az iot dps certificate create
-        - name: delete
-          uid: az_iot_dps_certificate_delete
-          displayName: az iot dps certificate delete
-        - name: generate-verification-code
-          uid: az_iot_dps_certificate_generate_verification_code
-          displayName: az iot dps certificate generate-verification-code
-        - name: list
-          uid: az_iot_dps_certificate_list
-          displayName: az iot dps certificate list
-        - name: show
-          uid: az_iot_dps_certificate_show
-          displayName: az iot dps certificate show
-        - name: update
-          uid: az_iot_dps_certificate_update
-          displayName: az iot dps certificate update
-        - name: verify
-          uid: az_iot_dps_certificate_verify
-          displayName: az iot dps certificate verify
-      - name: linked-hub
-        displayName: az iot dps linked-hub
-        items:
-        - name: Overview
-          uid: az_iot_dps_linked_hub
-          displayName: az iot dps linked-hub
-        - name: create
-          uid: az_iot_dps_linked_hub_create
-          displayName: az iot dps linked-hub create
-        - name: delete
-          uid: az_iot_dps_linked_hub_delete
-          displayName: az iot dps linked-hub delete
-        - name: list
-          uid: az_iot_dps_linked_hub_list
-          displayName: az iot dps linked-hub list
-        - name: show
-          uid: az_iot_dps_linked_hub_show
-          displayName: az iot dps linked-hub show
-        - name: update
-          uid: az_iot_dps_linked_hub_update
-          displayName: az iot dps linked-hub update
-    - name: pnp
-      displayName: az iot pnp
-      items:
-      - name: Overview
-        uid: az_iot_pnp
-        displayName: az iot pnp
-      - name: key
-        displayName: az iot pnp key
+        - name: Summary
+          uid: az_boards_iteration
+          displayName: az boards iteration
+        - name: project
+          uid: az_boards_iteration_project
+          displayName: az boards iteration project
+          items: []
+        - name: team
+          uid: az_boards_iteration_team
+          displayName: az boards iteration team
+          items: []
+      - name: work-item
         items:
-        - name: Overview
-          uid: az_iot_pnp_key
-          displayName: az iot pnp key
-        - name: create
-          uid: az_iot_pnp_key_create
-          displayName: az iot pnp key create
-        - name: delete
-          uid: az_iot_pnp_key_delete
-          displayName: az iot pnp key delete
-        - name: list
-          uid: az_iot_pnp_key_list
-          displayName: az iot pnp key list
-        - name: show
-          uid: az_iot_pnp_key_show
-          displayName: az iot pnp key show
-        - name: update
-          uid: az_iot_pnp_key_update
-          displayName: az iot pnp key update
-      - name: repository
-        displayName: az iot pnp repository
-        items:
-        - name: Overview
-          uid: az_iot_pnp_repository
-          displayName: az iot pnp repository
-        - name: create
-          uid: az_iot_pnp_repository_create
-          displayName: az iot pnp repository create
-        - name: delete
-          uid: az_iot_pnp_repository_delete
-          displayName: az iot pnp repository delete
-        - name: get-provision-status
-          uid: az_iot_pnp_repository_get_provision_status
-          displayName: az iot pnp repository get-provision-status
-        - name: list
-          uid: az_iot_pnp_repository_list
-          displayName: az iot pnp repository list
-        - name: show
-          uid: az_iot_pnp_repository_show
-          displayName: az iot pnp repository show
-        - name: update
-          uid: az_iot_pnp_repository_update
-          displayName: az iot pnp repository update
-  - name: Key Vault
-    displayName: az keyvault
-    items:
-    - name: Overview
-      uid: az_keyvault
-      displayName: az keyvault
-    - name: create
-      uid: az_keyvault_create
-      displayName: az keyvault create
-    - name: delete
-      uid: az_keyvault_delete
-      displayName: az keyvault delete
-    - name: delete-policy
-      uid: az_keyvault_delete_policy
-      displayName: az keyvault delete-policy
-    - name: list
-      uid: az_keyvault_list
-      displayName: az keyvault list
-    - name: list-deleted
-      uid: az_keyvault_list_deleted
-      displayName: az keyvault list-deleted
-    - name: purge
-      uid: az_keyvault_purge
-      displayName: az keyvault purge
-    - name: recover
-      uid: az_keyvault_recover
-      displayName: az keyvault recover
-    - name: set-policy
-      uid: az_keyvault_set_policy
-      displayName: az keyvault set-policy
-    - name: show
-      uid: az_keyvault_show
-      displayName: az keyvault show
-    - name: update
-      uid: az_keyvault_update
-      displayName: az keyvault update
-    - name: Certificates
-      displayName: az keyvault certificate
-      items:
-      - name: Overview
-        uid: az_keyvault_certificate
-        displayName: az keyvault certificate
-      - name: create
-        uid: az_keyvault_certificate_create
-        displayName: az keyvault certificate create
-      - name: delete
-        uid: az_keyvault_certificate_delete
-        displayName: az keyvault certificate delete
-      - name: download
-        uid: az_keyvault_certificate_download
-        displayName: az keyvault certificate download
-      - name: get-default-policy
-        uid: az_keyvault_certificate_get_default_policy
-        displayName: az keyvault certificate get-default-policy
-      - name: import
-        uid: az_keyvault_certificate_import
-        displayName: az keyvault certificate import
-      - name: list
-        uid: az_keyvault_certificate_list
-        displayName: az keyvault certificate list
-      - name: list-deleted
-        uid: az_keyvault_certificate_list_deleted
-        displayName: az keyvault certificate list-deleted
-      - name: list-versions
-        uid: az_keyvault_certificate_list_versions
-        displayName: az keyvault certificate list-versions
-      - name: purge
-        uid: az_keyvault_certificate_purge
-        displayName: az keyvault certificate purge
-      - name: recover
-        uid: az_keyvault_certificate_recover
-        displayName: az keyvault certificate recover
-      - name: set-attributes
-        uid: az_keyvault_certificate_set_attributes
-        displayName: az keyvault certificate set-attributes
-      - name: show
-        uid: az_keyvault_certificate_show
-        displayName: az keyvault certificate show
-      - name: show-deleted
-        uid: az_keyvault_certificate_show_deleted
-        displayName: az keyvault certificate show-deleted
-      - name: Contacts
-        displayName: az keyvault certificate contact
-        items:
-        - name: Overview
-          uid: az_keyvault_certificate_contact
-          displayName: az keyvault certificate contact
-        - name: add
-          uid: az_keyvault_certificate_contact_add
-          displayName: az keyvault certificate contact add
-        - name: delete
-          uid: az_keyvault_certificate_contact_delete
-          displayName: az keyvault certificate contact delete
-        - name: list
-          uid: az_keyvault_certificate_contact_list
-          displayName: az keyvault certificate contact list
-      - name: Issuers
-        displayName: az keyvault certificate issuer
-        items:
-        - name: Overview
-          uid: az_keyvault_certificate_issuer
-          displayName: az keyvault certificate issuer
-        - name: create
-          uid: az_keyvault_certificate_issuer_create
-          displayName: az keyvault certificate issuer create
-        - name: delete
-          uid: az_keyvault_certificate_issuer_delete
-          displayName: az keyvault certificate issuer delete
-        - name: list
-          uid: az_keyvault_certificate_issuer_list
-          displayName: az keyvault certificate issuer list
-        - name: show
-          uid: az_keyvault_certificate_issuer_show
-          displayName: az keyvault certificate issuer show
-        - name: update
-          uid: az_keyvault_certificate_issuer_update
-          displayName: az keyvault certificate issuer update
-        - name: Administration
-          displayName: az keyvault certificate issuer admin
-          items:
-          - name: Overview
-            uid: az_keyvault_certificate_issuer_admin
-            displayName: az keyvault certificate issuer admin
-          - name: add
-            uid: az_keyvault_certificate_issuer_admin_add
-            displayName: az keyvault certificate issuer admin add
-          - name: delete
-            uid: az_keyvault_certificate_issuer_admin_delete
-            displayName: az keyvault certificate issuer admin delete
-          - name: list
-            uid: az_keyvault_certificate_issuer_admin_list
-            displayName: az keyvault certificate issuer admin list
-      - name: Pending
-        displayName: az keyvault certificate pending
-        items:
-        - name: Overview
-          uid: az_keyvault_certificate_pending
-          displayName: az keyvault certificate pending
-        - name: delete
-          uid: az_keyvault_certificate_pending_delete
-          displayName: az keyvault certificate pending delete
-        - name: merge
-          uid: az_keyvault_certificate_pending_merge
-          displayName: az keyvault certificate pending merge
-        - name: show
-          uid: az_keyvault_certificate_pending_show
-          displayName: az keyvault certificate pending show
-    - name: Keys
-      displayName: az keyvault key
-      items:
-      - name: Overview
-        uid: az_keyvault_key
-        displayName: az keyvault key
-      - name: backup
-        uid: az_keyvault_key_backup
-        displayName: az keyvault key backup
-      - name: create
-        uid: az_keyvault_key_create
-        displayName: az keyvault key create
-      - name: delete
-        uid: az_keyvault_key_delete
-        displayName: az keyvault key delete
-      - name: download
-        uid: az_keyvault_key_download
-        displayName: az keyvault key download
-      - name: import
-        uid: az_keyvault_key_import
-        displayName: az keyvault key import
-      - name: list
-        uid: az_keyvault_key_list
-        displayName: az keyvault key list
-      - name: list-deleted
-        uid: az_keyvault_key_list_deleted
-        displayName: az keyvault key list-deleted
-      - name: list-versions
-        uid: az_keyvault_key_list_versions
-        displayName: az keyvault key list-versions
-      - name: purge
-        uid: az_keyvault_key_purge
-        displayName: az keyvault key purge
-      - name: recover
-        uid: az_keyvault_key_recover
-        displayName: az keyvault key recover
-      - name: restore
-        uid: az_keyvault_key_restore
-        displayName: az keyvault key restore
-      - name: set-attributes
-        uid: az_keyvault_key_set_attributes
-        displayName: az keyvault key set-attributes
-      - name: show
-        uid: az_keyvault_key_show
-        displayName: az keyvault key show
-      - name: show-deleted
-        uid: az_keyvault_key_show_deleted
-        displayName: az keyvault key show-deleted
-    - name: Secrets
-      displayName: az keyvault secret
-      items:
-      - name: Overview
-        uid: az_keyvault_secret
-        displayName: az keyvault secret
-      - name: backup
-        uid: az_keyvault_secret_backup
-        displayName: az keyvault secret backup
-      - name: delete
-        uid: az_keyvault_secret_delete
-        displayName: az keyvault secret delete
-      - name: download
-        uid: az_keyvault_secret_download
-        displayName: az keyvault secret download
-      - name: list
-        uid: az_keyvault_secret_list
-        displayName: az keyvault secret list
-      - name: list-deleted
-        uid: az_keyvault_secret_list_deleted
-        displayName: az keyvault secret list-deleted
-      - name: list-versions
-        uid: az_keyvault_secret_list_versions
-        displayName: az keyvault secret list-versions
-      - name: purge
-        uid: az_keyvault_secret_purge
-        displayName: az keyvault secret purge
-      - name: recover
-        uid: az_keyvault_secret_recover
-        displayName: az keyvault secret recover
-      - name: restore
-        uid: az_keyvault_secret_restore
-        displayName: az keyvault secret restore
-      - name: set
-        uid: az_keyvault_secret_set
-        displayName: az keyvault secret set
-      - name: set-attributes
-        uid: az_keyvault_secret_set_attributes
-        displayName: az keyvault secret set-attributes
-      - name: show
-        uid: az_keyvault_secret_show
-        displayName: az keyvault secret show
-      - name: show-deleted
-        uid: az_keyvault_secret_show_deleted
-        displayName: az keyvault secret show-deleted
-  - name: Locks
-    displayName: az lock
+        - name: Summary
+          uid: az_boards_work-item
+          displayName: az boards work-item
+        - name: relation
+          uid: az_boards_work-item_relation
+          displayName: az boards work-item relation
+          items: []
+  - name: Azure Bot
     items:
-    - name: Overview
-      uid: az_lock
-      displayName: az lock
-    - name: create
-      uid: az_lock_create
-      displayName: az lock create
-    - name: delete
-      uid: az_lock_delete
-      displayName: az lock delete
-    - name: list
-      uid: az_lock_list
-      displayName: az lock list
-    - name: show
-      uid: az_lock_show
-      displayName: az lock show
-    - name: update
-      uid: az_lock_update
-      displayName: az lock update
-  - name: Managed App
-    displayName: az managedapp
+    - name: Summary
+      uid: sp-Azure_Bot
+      displayName: Azure Bot
+    - name: healthbot
+      uid: az_healthbot
+      displayName: az healthbot
+      items: []
+  - name: Azure Bot Service
+    uid: sp-Azure_Bot_Service
+    displayName: Azure Bot Service
+    items: []
+  - name: Azure Cache for Redis
+    uid: sp-Azure_Cache_for_Redis
+    displayName: Azure Cache for Redis
+    items: []
+  - name: Azure CLI
     items:
-    - name: Overview
-      uid: az_managedapp
-      displayName: az managedapp
-    - name: create
-      uid: az_managedapp_create
-      displayName: az managedapp create
-    - name: delete
-      uid: az_managedapp_delete
-      displayName: az managedapp delete
-    - name: list
-      uid: az_managedapp_list
-      displayName: az managedapp list
-    - name: show
-      uid: az_managedapp_show
-      displayName: az managedapp show
-    - name: Definition
-      displayName: az managedapp definition
+    - name: Summary
+      uid: sp-Azure_CLI
+      displayName: Azure CLI
+    - name: account
       items:
-      - name: Overview
-        uid: az_managedapp_definition
-        displayName: az managedapp definition
-      - name: create
-        uid: az_managedapp_definition_create
-        displayName: az managedapp definition create
-      - name: delete
-        uid: az_managedapp_definition_delete
-        displayName: az managedapp definition delete
-      - name: list
-        uid: az_managedapp_definition_list
-        displayName: az managedapp definition list
-      - name: show
-        uid: az_managedapp_definition_show
-        displayName: az managedapp definition show
-  - name: Managed Disks
-    displayName: az disk
+      - name: Summary
+        uid: az_account
+        displayName: az account
+      - name: alias
+        uid: az_account_alias
+        displayName: az account alias
+        items: []
+      - name: lock
+        uid: az_account_lock
+        displayName: az account lock
+        items: []
+      - name: management-group
+        items:
+        - name: Summary
+          uid: az_account_management-group
+          displayName: az account management-group
+        - name: subscription
+          uid: az_account_management-group_subscription
+          displayName: az account management-group subscription
+          items: []
+      - name: subscription
+        uid: az_account_subscription
+        displayName: az account subscription
+        items: []
+      - name: tenant
+        uid: az_account_tenant
+        displayName: az account tenant
+        items: []
+    - name: alias
+      uid: az_alias
+      displayName: az alias
+      items: []
+    - name: cache
+      uid: az_cache
+      displayName: az cache
+      items: []
+    - name: cli-translator
+      items:
+      - name: Summary
+        uid: az_cli-translator
+        displayName: az cli-translator
+      - name: arm
+        uid: az_cli-translator_arm
+        displayName: az cli-translator arm
+        items: []
+    - name: cloud
+      uid: az_cloud
+      displayName: az cloud
+      items: []
+    - name: config
+      items:
+      - name: Summary
+        uid: az_config
+        displayName: az config
+      - name: param-persist
+        uid: az_config_param-persist
+        displayName: az config param-persist
+        items: []
+    - name: demo
+      uid: az_demo
+      displayName: az demo
+      items: []
+    - name: extension
+      uid: az_extension
+      displayName: az extension
+      items: []
+    - name: fzf
+      uid: az_fzf
+      displayName: az fzf
+      items: []
+    - name: local-context
+      uid: az_local-context
+      displayName: az local-context
+      items: []
+  - name: Azure Cloud Services (extended support)
     items:
-    - name: Overview
-      uid: az_disk
-      displayName: az disk
-    - name: create
-      uid: az_disk_create
-      displayName: az disk create
-    - name: delete
-      uid: az_disk_delete
-      displayName: az disk delete
-    - name: grant-access
-      uid: az_disk_grant_access
-      displayName: az disk grant-access
-    - name: list
-      uid: az_disk_list
-      displayName: az disk list
-    - name: revoke-access
-      uid: az_disk_revoke_access
-      displayName: az disk revoke-access
-    - name: show
-      uid: az_disk_show
-      displayName: az disk show
-    - name: update
-      uid: az_disk_update
-      displayName: az disk update
-    - name: wait
-      uid: az_disk_wait
-      displayName: az disk wait
-  - name: Networking
-    displayName: az network
+    - name: Summary
+      uid: sp-Azure_Cloud_Services_(extended_support)
+      displayName: Azure Cloud Services (extended support)
+    - name: cloud-service
+      items:
+      - name: Summary
+        uid: az_cloud-service
+        displayName: az cloud-service
+      - name: role
+        uid: az_cloud-service_role
+        displayName: az cloud-service role
+        items: []
+      - name: role-instance
+        uid: az_cloud-service_role-instance
+        displayName: az cloud-service role-instance
+        items: []
+      - name: update-domain
+        uid: az_cloud-service_update-domain
+        displayName: az cloud-service update-domain
+        items: []
+  - name: Azure Cognitive Search
+    uid: sp-Azure_Cognitive_Search
+    displayName: Azure Cognitive Search
+    items: []
+  - name: Azure Cognitive Service
+    uid: sp-Azure_Cognitive_Service
+    displayName: Azure Cognitive Service
+    items: []
+  - name: Azure Communication Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Communication_Service
+      displayName: Azure Communication Service
+    - name: communication
+      uid: az_communication
+      displayName: az communication
+      items: []
+  - name: Azure Container Instances
     items:
-    - name: Overview
-      uid: az_network
-      displayName: az network
-    - name: list-service-aliases
-      uid: az_network_list_service_aliases
-      displayName: az network list-service-aliases
-    - name: list-usages
-      uid: az_network_list_usages
-      displayName: az network list-usages
-    - name: Application Gateway
-      displayName: az network application-gateway
+    - name: Summary
+      uid: sp-Azure_Container_Instances
+      displayName: Azure Container Instances
+    - name: container
       items:
-      - name: Overview
-        uid: az_network_application_gateway
-        displayName: az network application-gateway
-      - name: create
-        uid: az_network_application_gateway_create
-        displayName: az network application-gateway create
-      - name: delete
-        uid: az_network_application_gateway_delete
-        displayName: az network application-gateway delete
-      - name: list
-        uid: az_network_application_gateway_list
-        displayName: az network application-gateway list
-      - name: show
-        uid: az_network_application_gateway_show
-        displayName: az network application-gateway show
-      - name: show-backend-health
-        uid: az_network_application_gateway_show_backend_health
-        displayName: az network application-gateway show-backend-health
-      - name: start
-        uid: az_network_application_gateway_start
-        displayName: az network application-gateway start
-      - name: stop
-        uid: az_network_application_gateway_stop
-        displayName: az network application-gateway stop
-      - name: update
-        uid: az_network_application_gateway_update
-        displayName: az network application-gateway update
-      - name: wait
-        uid: az_network_application_gateway_wait
-        displayName: az network application-gateway wait
-      - name: Address pools
-        displayName: az network application-gateway address-pool
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_address_pool
-          displayName: az network application-gateway address-pool
-        - name: create
-          uid: az_network_application_gateway_address_pool_create
-          displayName: az network application-gateway address-pool create
-        - name: delete
-          uid: az_network_application_gateway_address_pool_delete
-          displayName: az network application-gateway address-pool delete
-        - name: list
-          uid: az_network_application_gateway_address_pool_list
-          displayName: az network application-gateway address-pool list
-        - name: show
-          uid: az_network_application_gateway_address_pool_show
-          displayName: az network application-gateway address-pool show
-        - name: update
-          uid: az_network_application_gateway_address_pool_update
-          displayName: az network application-gateway address-pool update
-      - name: Authorization certificates
-        displayName: az network application-gateway auth-cert
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_auth_cert
-          displayName: az network application-gateway auth-cert
-        - name: create
-          uid: az_network_application_gateway_auth_cert_create
-          displayName: az network application-gateway auth-cert create
-        - name: delete
-          uid: az_network_application_gateway_auth_cert_delete
-          displayName: az network application-gateway auth-cert delete
-        - name: list
-          uid: az_network_application_gateway_auth_cert_list
-          displayName: az network application-gateway auth-cert list
-        - name: show
-          uid: az_network_application_gateway_auth_cert_show
-          displayName: az network application-gateway auth-cert show
-        - name: update
-          uid: az_network_application_gateway_auth_cert_update
-          displayName: az network application-gateway auth-cert update
-      - name: Front-end IP addresses
-        displayName: az network application-gateway frontend-ip
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_frontend_ip
-          displayName: az network application-gateway frontend-ip
-        - name: create
-          uid: az_network_application_gateway_frontend_ip_create
-          displayName: az network application-gateway frontend-ip create
-        - name: delete
-          uid: az_network_application_gateway_frontend_ip_delete
-          displayName: az network application-gateway frontend-ip delete
-        - name: list
-          uid: az_network_application_gateway_frontend_ip_list
-          displayName: az network application-gateway frontend-ip list
-        - name: show
-          uid: az_network_application_gateway_frontend_ip_show
-          displayName: az network application-gateway frontend-ip show
-        - name: update
-          uid: az_network_application_gateway_frontend_ip_update
-          displayName: az network application-gateway frontend-ip update
-      - name: Front-end ports
-        displayName: az network application-gateway frontend-port
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_frontend_port
-          displayName: az network application-gateway frontend-port
-        - name: create
-          uid: az_network_application_gateway_frontend_port_create
-          displayName: az network application-gateway frontend-port create
-        - name: delete
-          uid: az_network_application_gateway_frontend_port_delete
-          displayName: az network application-gateway frontend-port delete
-        - name: list
-          uid: az_network_application_gateway_frontend_port_list
-          displayName: az network application-gateway frontend-port list
-        - name: show
-          uid: az_network_application_gateway_frontend_port_show
-          displayName: az network application-gateway frontend-port show
-        - name: update
-          uid: az_network_application_gateway_frontend_port_update
-          displayName: az network application-gateway frontend-port update
-      - name: HTTP listeners
-        displayName: az network application-gateway http-listener
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_http_listener
-          displayName: az network application-gateway http-listener
-        - name: create
-          uid: az_network_application_gateway_http_listener_create
-          displayName: az network application-gateway http-listener create
-        - name: delete
-          uid: az_network_application_gateway_http_listener_delete
-          displayName: az network application-gateway http-listener delete
-        - name: list
-          uid: az_network_application_gateway_http_listener_list
-          displayName: az network application-gateway http-listener list
-        - name: show
-          uid: az_network_application_gateway_http_listener_show
-          displayName: az network application-gateway http-listener show
-        - name: update
-          uid: az_network_application_gateway_http_listener_update
-          displayName: az network application-gateway http-listener update
-      - name: HTTP settings
-        displayName: az network application-gateway http-settings
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_http_settings
-          displayName: az network application-gateway http-settings
-        - name: create
-          uid: az_network_application_gateway_http_settings_create
-          displayName: az network application-gateway http-settings create
-        - name: delete
-          uid: az_network_application_gateway_http_settings_delete
-          displayName: az network application-gateway http-settings delete
-        - name: list
-          uid: az_network_application_gateway_http_settings_list
-          displayName: az network application-gateway http-settings list
-        - name: show
-          uid: az_network_application_gateway_http_settings_show
-          displayName: az network application-gateway http-settings show
-        - name: update
-          uid: az_network_application_gateway_http_settings_update
-          displayName: az network application-gateway http-settings update
-      - name: Probes
-        displayName: az network application-gateway probe
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_probe
-          displayName: az network application-gateway probe
-        - name: create
-          uid: az_network_application_gateway_probe_create
-          displayName: az network application-gateway probe create
-        - name: delete
-          uid: az_network_application_gateway_probe_delete
-          displayName: az network application-gateway probe delete
-        - name: list
-          uid: az_network_application_gateway_probe_list
-          displayName: az network application-gateway probe list
-        - name: show
-          uid: az_network_application_gateway_probe_show
-          displayName: az network application-gateway probe show
-        - name: update
-          uid: az_network_application_gateway_probe_update
-          displayName: az network application-gateway probe update
-      - name: Routing rules
-        displayName: az network application-gateway rule
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_rule
-          displayName: az network application-gateway rule
-        - name: create
-          uid: az_network_application_gateway_rule_create
-          displayName: az network application-gateway rule create
-        - name: delete
-          uid: az_network_application_gateway_rule_delete
-          displayName: az network application-gateway rule delete
-        - name: list
-          uid: az_network_application_gateway_rule_list
-          displayName: az network application-gateway rule list
-        - name: show
-          uid: az_network_application_gateway_rule_show
-          displayName: az network application-gateway rule show
-        - name: update
-          uid: az_network_application_gateway_rule_update
-          displayName: az network application-gateway rule update
-      - name: SSL certificates
-        displayName: az network application-gateway ssl-cert
+      - name: Summary
+        uid: az_container
+        displayName: az container
+      - name: app
+        uid: az_container_app
+        displayName: az container app
+        items: []
+  - name: Azure Container Registries
+    items:
+    - name: Summary
+      uid: sp-Azure_Container_Registries
+      displayName: Azure Container Registries
+    - name: acr
+      items:
+      - name: Summary
+        uid: az_acr
+        displayName: az acr
+      - name: export-pipeline
+        uid: az_acr_export-pipeline
+        displayName: az acr export-pipeline
+        items: []
+      - name: import-pipeline
+        uid: az_acr_import-pipeline
+        displayName: az acr import-pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_acr_pipeline-run
+        displayName: az acr pipeline-run
+        items: []
+  - name: Azure Container Services
+    uid: sp-Azure_Container_Services
+    displayName: Azure Container Services
+    items: []
+  - name: Azure Cosmos DB
+    items:
+    - name: Summary
+      uid: sp-Azure_Cosmos_DB
+      displayName: Azure Cosmos DB
+    - name: cosmosdb
+      items:
+      - name: Summary
+        uid: az_cosmosdb
+        displayName: az cosmosdb
+      - name: mongodb
+        items:
+        - name: Summary
+          uid: az_cosmosdb_mongodb
+          displayName: az cosmosdb mongodb
+        - name: restorable-collection
+          uid: az_cosmosdb_mongodb_restorable-collection
+          displayName: az cosmosdb mongodb restorable-collection
+          items: []
+        - name: restorable-database
+          uid: az_cosmosdb_mongodb_restorable-database
+          displayName: az cosmosdb mongodb restorable-database
+          items: []
+        - name: restorable-resource
+          uid: az_cosmosdb_mongodb_restorable-resource
+          displayName: az cosmosdb mongodb restorable-resource
+          items: []
+      - name: restorable-database-account
+        uid: az_cosmosdb_restorable-database-account
+        displayName: az cosmosdb restorable-database-account
+        items: []
+      - name: sql
         items:
-        - name: Overview
-          uid: az_network_application_gateway_ssl_cert
-          displayName: az network application-gateway ssl-cert
-        - name: create
-          uid: az_network_application_gateway_ssl_cert_create
-          displayName: az network application-gateway ssl-cert create
-        - name: delete
-          uid: az_network_application_gateway_ssl_cert_delete
-          displayName: az network application-gateway ssl-cert delete
-        - name: list
-          uid: az_network_application_gateway_ssl_cert_list
-          displayName: az network application-gateway ssl-cert list
-        - name: show
-          uid: az_network_application_gateway_ssl_cert_show
-          displayName: az network application-gateway ssl-cert show
-        - name: update
-          uid: az_network_application_gateway_ssl_cert_update
-          displayName: az network application-gateway ssl-cert update
-      - name: SSL policies
-        displayName: az network application-gateway ssl-policy
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_ssl_policy
-          displayName: az network application-gateway ssl-policy
-        - name: list-options
-          uid: az_network_application_gateway_ssl_policy_list_options
-          displayName: az network application-gateway ssl-policy list-options
-        - name: set
-          uid: az_network_application_gateway_ssl_policy_set
-          displayName: az network application-gateway ssl-policy set
-        - name: show
-          uid: az_network_application_gateway_ssl_policy_show
-          displayName: az network application-gateway ssl-policy show
-        - name: predefined
-          displayName: az network application-gateway ssl-policy predefined
-          items:
-          - name: Overview
-            uid: az_network_application_gateway_ssl_policy_predefined
-            displayName: az network application-gateway ssl-policy predefined
-          - name: list
-            uid: az_network_application_gateway_ssl_policy_predefined_list
-            displayName: az network application-gateway ssl-policy predefined list
-          - name: show
-            uid: az_network_application_gateway_ssl_policy_predefined_show
-            displayName: az network application-gateway ssl-policy predefined show
-      - name: URL path maps
-        displayName: az network application-gateway url-path-map
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_url_path_map
-          displayName: az network application-gateway url-path-map
-        - name: create
-          uid: az_network_application_gateway_url_path_map_create
-          displayName: az network application-gateway url-path-map create
-        - name: delete
-          uid: az_network_application_gateway_url_path_map_delete
-          displayName: az network application-gateway url-path-map delete
-        - name: list
-          uid: az_network_application_gateway_url_path_map_list
-          displayName: az network application-gateway url-path-map list
-        - name: show
-          uid: az_network_application_gateway_url_path_map_show
-          displayName: az network application-gateway url-path-map show
-        - name: update
-          uid: az_network_application_gateway_url_path_map_update
-          displayName: az network application-gateway url-path-map update
-        - name: Rules
-          displayName: az network application-gateway url-path-map rule
-          items:
-          - name: Overview
-            uid: az_network_application_gateway_url_path_map_rule
-            displayName: az network application-gateway url-path-map rule
-          - name: create
-            uid: az_network_application_gateway_url_path_map_rule_create
-            displayName: az network application-gateway url-path-map rule create
-          - name: delete
-            uid: az_network_application_gateway_url_path_map_rule_delete
-            displayName: az network application-gateway url-path-map rule delete
-      - name: Web application firewall settings
-        displayName: az network application-gateway waf-config
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_waf_config
-          displayName: az network application-gateway waf-config
-        - name: list-rule-sets
-          uid: az_network_application_gateway_waf_config_list_rule_sets
-          displayName: az network application-gateway waf-config list-rule-sets
-        - name: set
-          uid: az_network_application_gateway_waf_config_set
-          displayName: az network application-gateway waf-config set
-        - name: show
-          uid: az_network_application_gateway_waf_config_show
-          displayName: az network application-gateway waf-config show
-      - name: redirect-config
-        displayName: az network application-gateway redirect-config
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_redirect_config
-          displayName: az network application-gateway redirect-config
-        - name: create
-          uid: az_network_application_gateway_redirect_config_create
-          displayName: az network application-gateway redirect-config create
-        - name: delete
-          uid: az_network_application_gateway_redirect_config_delete
-          displayName: az network application-gateway redirect-config delete
-        - name: list
-          uid: az_network_application_gateway_redirect_config_list
-          displayName: az network application-gateway redirect-config list
-        - name: show
-          uid: az_network_application_gateway_redirect_config_show
-          displayName: az network application-gateway redirect-config show
-        - name: update
-          uid: az_network_application_gateway_redirect_config_update
-          displayName: az network application-gateway redirect-config update
-      - name: rewrite-rule
-        displayName: az network application-gateway rewrite-rule
-        items:
-        - name: Overview
-          uid: az_network_application_gateway_rewrite_rule
-          displayName: az network application-gateway rewrite-rule
-        - name: set
-          displayName: az network application-gateway rewrite-rule set
-          items:
-          - name: Overview
-            uid: az_network_application_gateway_rewrite_rule_set
-            displayName: az network application-gateway rewrite-rule set
-          - name: create
-            uid: az_network_application_gateway_rewrite_rule_set_create
-            displayName: az network application-gateway rewrite-rule set create
-          - name: delete
-            uid: az_network_application_gateway_rewrite_rule_set_delete
-            displayName: az network application-gateway rewrite-rule set delete
-          - name: list
-            uid: az_network_application_gateway_rewrite_rule_set_list
-            displayName: az network application-gateway rewrite-rule set list
-          - name: show
-            uid: az_network_application_gateway_rewrite_rule_set_show
-            displayName: az network application-gateway rewrite-rule set show
-          - name: update
-            uid: az_network_application_gateway_rewrite_rule_set_update
-            displayName: az network application-gateway rewrite-rule set update
-    - name: DNS
-      displayName: az network dns
-      items:
-      - name: Overview
-        uid: az_network_dns
-        displayName: az network dns
-      - name: Record sets
-        displayName: az network dns record-set
-        items:
-        - name: Overview
-          uid: az_network_dns_record_set
-          displayName: az network dns record-set
-        - name: list
-          uid: az_network_dns_record_set_list
-          displayName: az network dns record-set list
-        - name: A
-          displayName: az network dns record-set a
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_a
-            displayName: az network dns record-set a
-          - name: add-record
-            uid: az_network_dns_record_set_a_add_record
-            displayName: az network dns record-set a add-record
-          - name: create
-            uid: az_network_dns_record_set_a_create
-            displayName: az network dns record-set a create
-          - name: delete
-            uid: az_network_dns_record_set_a_delete
-            displayName: az network dns record-set a delete
-          - name: list
-            uid: az_network_dns_record_set_a_list
-            displayName: az network dns record-set a list
-          - name: remove-record
-            uid: az_network_dns_record_set_a_remove_record
-            displayName: az network dns record-set a remove-record
-          - name: show
-            uid: az_network_dns_record_set_a_show
-            displayName: az network dns record-set a show
-          - name: update
-            uid: az_network_dns_record_set_a_update
-            displayName: az network dns record-set a update
-        - name: AAAA
-          displayName: az network dns record-set aaaa
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_aaaa
-            displayName: az network dns record-set aaaa
-          - name: add-record
-            uid: az_network_dns_record_set_aaaa_add_record
-            displayName: az network dns record-set aaaa add-record
-          - name: create
-            uid: az_network_dns_record_set_aaaa_create
-            displayName: az network dns record-set aaaa create
-          - name: delete
-            uid: az_network_dns_record_set_aaaa_delete
-            displayName: az network dns record-set aaaa delete
-          - name: list
-            uid: az_network_dns_record_set_aaaa_list
-            displayName: az network dns record-set aaaa list
-          - name: remove-record
-            uid: az_network_dns_record_set_aaaa_remove_record
-            displayName: az network dns record-set aaaa remove-record
-          - name: show
-            uid: az_network_dns_record_set_aaaa_show
-            displayName: az network dns record-set aaaa show
-          - name: update
-            uid: az_network_dns_record_set_aaaa_update
-            displayName: az network dns record-set aaaa update
-        - name: CNAME
-          displayName: az network dns record-set cname
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_cname
-            displayName: az network dns record-set cname
-          - name: create
-            uid: az_network_dns_record_set_cname_create
-            displayName: az network dns record-set cname create
-          - name: delete
-            uid: az_network_dns_record_set_cname_delete
-            displayName: az network dns record-set cname delete
-          - name: list
-            uid: az_network_dns_record_set_cname_list
-            displayName: az network dns record-set cname list
-          - name: remove-record
-            uid: az_network_dns_record_set_cname_remove_record
-            displayName: az network dns record-set cname remove-record
-          - name: set-record
-            uid: az_network_dns_record_set_cname_set_record
-            displayName: az network dns record-set cname set-record
-          - name: show
-            uid: az_network_dns_record_set_cname_show
-            displayName: az network dns record-set cname show
-        - name: MX (mail)
-          displayName: az network dns record-set mx
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_mx
-            displayName: az network dns record-set mx
-          - name: add-record
-            uid: az_network_dns_record_set_mx_add_record
-            displayName: az network dns record-set mx add-record
-          - name: create
-            uid: az_network_dns_record_set_mx_create
-            displayName: az network dns record-set mx create
-          - name: delete
-            uid: az_network_dns_record_set_mx_delete
-            displayName: az network dns record-set mx delete
-          - name: list
-            uid: az_network_dns_record_set_mx_list
-            displayName: az network dns record-set mx list
-          - name: remove-record
-            uid: az_network_dns_record_set_mx_remove_record
-            displayName: az network dns record-set mx remove-record
-          - name: show
-            uid: az_network_dns_record_set_mx_show
-            displayName: az network dns record-set mx show
-          - name: update
-            uid: az_network_dns_record_set_mx_update
-            displayName: az network dns record-set mx update
-        - name: NS (nameserver)
-          displayName: az network dns record-set ns
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_ns
-            displayName: az network dns record-set ns
-          - name: add-record
-            uid: az_network_dns_record_set_ns_add_record
-            displayName: az network dns record-set ns add-record
-          - name: create
-            uid: az_network_dns_record_set_ns_create
-            displayName: az network dns record-set ns create
-          - name: delete
-            uid: az_network_dns_record_set_ns_delete
-            displayName: az network dns record-set ns delete
-          - name: list
-            uid: az_network_dns_record_set_ns_list
-            displayName: az network dns record-set ns list
-          - name: remove-record
-            uid: az_network_dns_record_set_ns_remove_record
-            displayName: az network dns record-set ns remove-record
-          - name: show
-            uid: az_network_dns_record_set_ns_show
-            displayName: az network dns record-set ns show
-          - name: update
-            uid: az_network_dns_record_set_ns_update
-            displayName: az network dns record-set ns update
-        - name: PTR (pointer)
-          displayName: az network dns record-set ptr
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_ptr
-            displayName: az network dns record-set ptr
-          - name: add-record
-            uid: az_network_dns_record_set_ptr_add_record
-            displayName: az network dns record-set ptr add-record
-          - name: create
-            uid: az_network_dns_record_set_ptr_create
-            displayName: az network dns record-set ptr create
-          - name: delete
-            uid: az_network_dns_record_set_ptr_delete
-            displayName: az network dns record-set ptr delete
-          - name: list
-            uid: az_network_dns_record_set_ptr_list
-            displayName: az network dns record-set ptr list
-          - name: remove-record
-            uid: az_network_dns_record_set_ptr_remove_record
-            displayName: az network dns record-set ptr remove-record
-          - name: show
-            uid: az_network_dns_record_set_ptr_show
-            displayName: az network dns record-set ptr show
-          - name: update
-            uid: az_network_dns_record_set_ptr_update
-            displayName: az network dns record-set ptr update
-        - name: SRV
-          displayName: az network dns record-set srv
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_srv
-            displayName: az network dns record-set srv
-          - name: add-record
-            uid: az_network_dns_record_set_srv_add_record
-            displayName: az network dns record-set srv add-record
-          - name: create
-            uid: az_network_dns_record_set_srv_create
-            displayName: az network dns record-set srv create
-          - name: delete
-            uid: az_network_dns_record_set_srv_delete
-            displayName: az network dns record-set srv delete
-          - name: list
-            uid: az_network_dns_record_set_srv_list
-            displayName: az network dns record-set srv list
-          - name: remove-record
-            uid: az_network_dns_record_set_srv_remove_record
-            displayName: az network dns record-set srv remove-record
-          - name: show
-            uid: az_network_dns_record_set_srv_show
-            displayName: az network dns record-set srv show
-          - name: update
-            uid: az_network_dns_record_set_srv_update
-            displayName: az network dns record-set srv update
-        - name: TXT
-          displayName: az network dns record-set txt
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_txt
-            displayName: az network dns record-set txt
-          - name: add-record
-            uid: az_network_dns_record_set_txt_add_record
-            displayName: az network dns record-set txt add-record
-          - name: create
-            uid: az_network_dns_record_set_txt_create
-            displayName: az network dns record-set txt create
-          - name: delete
-            uid: az_network_dns_record_set_txt_delete
-            displayName: az network dns record-set txt delete
-          - name: list
-            uid: az_network_dns_record_set_txt_list
-            displayName: az network dns record-set txt list
-          - name: remove-record
-            uid: az_network_dns_record_set_txt_remove_record
-            displayName: az network dns record-set txt remove-record
-          - name: show
-            uid: az_network_dns_record_set_txt_show
-            displayName: az network dns record-set txt show
-          - name: update
-            uid: az_network_dns_record_set_txt_update
-            displayName: az network dns record-set txt update
-        - name: soa
-          displayName: az network dns record-set soa
-          items:
-          - name: Overview
-            uid: az_network_dns_record_set_soa
-            displayName: az network dns record-set soa
-          - name: show
-            uid: az_network_dns_record_set_soa_show
-            displayName: az network dns record-set soa show
-          - name: update
-            uid: az_network_dns_record_set_soa_update
-            displayName: az network dns record-set soa update
-      - name: Zones
-        displayName: az network dns zone
-        items:
-        - name: Overview
-          uid: az_network_dns_zone
-          displayName: az network dns zone
-        - name: create
-          uid: az_network_dns_zone_create
-          displayName: az network dns zone create
-        - name: delete
-          uid: az_network_dns_zone_delete
-          displayName: az network dns zone delete
-        - name: export
-          uid: az_network_dns_zone_export
-          displayName: az network dns zone export
-        - name: import
-          uid: az_network_dns_zone_import
-          displayName: az network dns zone import
-        - name: list
-          uid: az_network_dns_zone_list
-          displayName: az network dns zone list
-        - name: show
-          uid: az_network_dns_zone_show
-          displayName: az network dns zone show
-        - name: update
-          uid: az_network_dns_zone_update
-          displayName: az network dns zone update
-    - name: Express Route
-      displayName: az network express-route
+        - name: Summary
+          uid: az_cosmosdb_sql
+          displayName: az cosmosdb sql
+        - name: restorable-container
+          uid: az_cosmosdb_sql_restorable-container
+          displayName: az cosmosdb sql restorable-container
+          items: []
+        - name: restorable-database
+          uid: az_cosmosdb_sql_restorable-database
+          displayName: az cosmosdb sql restorable-database
+          items: []
+        - name: restorable-resource
+          uid: az_cosmosdb_sql_restorable-resource
+          displayName: az cosmosdb sql restorable-resource
+          items: []
+    - name: managed-cassandra
+      items:
+      - name: Summary
+        uid: az_managed-cassandra
+        displayName: az managed-cassandra
+      - name: cluster
+        uid: az_managed-cassandra_cluster
+        displayName: az managed-cassandra cluster
+        items: []
+      - name: datacenter
+        uid: az_managed-cassandra_datacenter
+        displayName: az managed-cassandra datacenter
+        items: []
+  - name: Azure Cost Management + Billing
+    items:
+    - name: Summary
+      uid: sp-Azure_Cost_Management_+_Billing
+      displayName: Azure Cost Management + Billing
+    - name: costmanagement
       items:
-      - name: Overview
-        uid: az_network_express_route
-        displayName: az network express-route
-      - name: create
-        uid: az_network_express_route_create
-        displayName: az network express-route create
-      - name: delete
-        uid: az_network_express_route_delete
-        displayName: az network express-route delete
-      - name: get-stats
-        uid: az_network_express_route_get_stats
-        displayName: az network express-route get-stats
-      - name: list
-        uid: az_network_express_route_list
-        displayName: az network express-route list
-      - name: list-arp-tables
-        uid: az_network_express_route_list_arp_tables
-        displayName: az network express-route list-arp-tables
-      - name: list-route-tables
-        uid: az_network_express_route_list_route_tables
-        displayName: az network express-route list-route-tables
-      - name: list-service-providers
-        uid: az_network_express_route_list_service_providers
-        displayName: az network express-route list-service-providers
-      - name: show
-        uid: az_network_express_route_show
-        displayName: az network express-route show
-      - name: update
-        uid: az_network_express_route_update
-        displayName: az network express-route update
-      - name: wait
-        uid: az_network_express_route_wait
-        displayName: az network express-route wait
-      - name: Circuit authentication
-        displayName: az network express-route auth
-        items:
-        - name: Overview
-          uid: az_network_express_route_auth
-          displayName: az network express-route auth
-        - name: create
-          uid: az_network_express_route_auth_create
-          displayName: az network express-route auth create
-        - name: delete
-          uid: az_network_express_route_auth_delete
-          displayName: az network express-route auth delete
-        - name: list
-          uid: az_network_express_route_auth_list
-          displayName: az network express-route auth list
-        - name: show
-          uid: az_network_express_route_auth_show
-          displayName: az network express-route auth show
-      - name: Peering
-        displayName: az network express-route peering
-        items:
-        - name: Overview
-          uid: az_network_express_route_peering
-          displayName: az network express-route peering
-        - name: create
-          uid: az_network_express_route_peering_create
-          displayName: az network express-route peering create
-        - name: delete
-          uid: az_network_express_route_peering_delete
-          displayName: az network express-route peering delete
-        - name: list
-          uid: az_network_express_route_peering_list
-          displayName: az network express-route peering list
-        - name: show
-          uid: az_network_express_route_peering_show
-          displayName: az network express-route peering show
-        - name: update
-          uid: az_network_express_route_peering_update
-          displayName: az network express-route peering update
-        - name: connection
-          displayName: az network express-route peering connection
-          items:
-          - name: Overview
-            uid: az_network_express_route_peering_connection
-            displayName: az network express-route peering connection
-          - name: create
-            uid: az_network_express_route_peering_connection_create
-            displayName: az network express-route peering connection create
-      - name: gateway
-        displayName: az network express-route gateway
-        items:
-        - name: Overview
-          uid: az_network_express_route_gateway
-          displayName: az network express-route gateway
-        - name: create
-          uid: az_network_express_route_gateway_create
-          displayName: az network express-route gateway create
-        - name: list
-          uid: az_network_express_route_gateway_list
-          displayName: az network express-route gateway list
-        - name: connection
-          displayName: az network express-route gateway connection
-          items:
-          - name: Overview
-            uid: az_network_express_route_gateway_connection
-            displayName: az network express-route gateway connection
-          - name: create
-            uid: az_network_express_route_gateway_connection_create
-            displayName: az network express-route gateway connection create
-      - name: port
-        displayName: az network express-route port
-        items:
-        - name: Overview
-          uid: az_network_express_route_port
-          displayName: az network express-route port
-        - name: create
-          uid: az_network_express_route_port_create
-          displayName: az network express-route port create
-        - name: list
-          uid: az_network_express_route_port_list
-          displayName: az network express-route port list
-    - name: Local gateways
-      displayName: az network local-gateway
+      - name: Summary
+        uid: az_costmanagement
+        displayName: az costmanagement
+      - name: export
+        uid: az_costmanagement_export
+        displayName: az costmanagement export
+        items: []
+  - name: Azure Custom Providers
+    items:
+    - name: Summary
+      uid: sp-Azure_Custom_Providers
+      displayName: Azure Custom Providers
+    - name: custom-providers
       items:
-      - name: Overview
-        uid: az_network_local_gateway
-        displayName: az network local-gateway
-      - name: create
-        uid: az_network_local_gateway_create
-        displayName: az network local-gateway create
-      - name: delete
-        uid: az_network_local_gateway_delete
-        displayName: az network local-gateway delete
-      - name: list
-        uid: az_network_local_gateway_list
-        displayName: az network local-gateway list
-      - name: show
-        uid: az_network_local_gateway_show
-        displayName: az network local-gateway show
-      - name: update
-        uid: az_network_local_gateway_update
-        displayName: az network local-gateway update
-      - name: wait
-        uid: az_network_local_gateway_wait
-        displayName: az network local-gateway wait
-    - name: Network Load Balancer
-      displayName: az network lb
+      - name: Summary
+        uid: az_custom-providers
+        displayName: az custom-providers
+      - name: resource-provider
+        uid: az_custom-providers_resource-provider
+        displayName: az custom-providers resource-provider
+        items: []
+  - name: Azure Data Explorer
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Explorer
+      displayName: Azure Data Explorer
+    - name: kusto
       items:
-      - name: Overview
-        uid: az_network_lb
-        displayName: az network lb
-      - name: create
-        uid: az_network_lb_create
-        displayName: az network lb create
-      - name: delete
-        uid: az_network_lb_delete
-        displayName: az network lb delete
-      - name: list
-        uid: az_network_lb_list
-        displayName: az network lb list
-      - name: show
-        uid: az_network_lb_show
-        displayName: az network lb show
-      - name: update
-        uid: az_network_lb_update
-        displayName: az network lb update
-      - name: Back-end address pools
-        displayName: az network lb address-pool
-        items:
-        - name: Overview
-          uid: az_network_lb_address_pool
-          displayName: az network lb address-pool
-        - name: create
-          uid: az_network_lb_address_pool_create
-          displayName: az network lb address-pool create
-        - name: delete
-          uid: az_network_lb_address_pool_delete
-          displayName: az network lb address-pool delete
-        - name: list
-          uid: az_network_lb_address_pool_list
-          displayName: az network lb address-pool list
-        - name: show
-          uid: az_network_lb_address_pool_show
-          displayName: az network lb address-pool show
-      - name: Front-end IP addresses
-        displayName: az network lb frontend-ip
-        items:
-        - name: Overview
-          uid: az_network_lb_frontend_ip
-          displayName: az network lb frontend-ip
-        - name: create
-          uid: az_network_lb_frontend_ip_create
-          displayName: az network lb frontend-ip create
-        - name: delete
-          uid: az_network_lb_frontend_ip_delete
-          displayName: az network lb frontend-ip delete
-        - name: list
-          uid: az_network_lb_frontend_ip_list
-          displayName: az network lb frontend-ip list
-        - name: show
-          uid: az_network_lb_frontend_ip_show
-          displayName: az network lb frontend-ip show
-        - name: update
-          uid: az_network_lb_frontend_ip_update
-          displayName: az network lb frontend-ip update
-      - name: Inbound NAT address pools
-        displayName: az network lb inbound-nat-pool
-        items:
-        - name: Overview
-          uid: az_network_lb_inbound_nat_pool
-          displayName: az network lb inbound-nat-pool
-        - name: create
-          uid: az_network_lb_inbound_nat_pool_create
-          displayName: az network lb inbound-nat-pool create
-        - name: delete
-          uid: az_network_lb_inbound_nat_pool_delete
-          displayName: az network lb inbound-nat-pool delete
-        - name: list
-          uid: az_network_lb_inbound_nat_pool_list
-          displayName: az network lb inbound-nat-pool list
-        - name: show
-          uid: az_network_lb_inbound_nat_pool_show
-          displayName: az network lb inbound-nat-pool show
-        - name: update
-          uid: az_network_lb_inbound_nat_pool_update
-          displayName: az network lb inbound-nat-pool update
-      - name: Inbound NAT address rules
-        displayName: az network lb inbound-nat-rule
+      - name: Summary
+        uid: az_kusto
+        displayName: az kusto
+      - name: attached-database-configuration
+        uid: az_kusto_attached-database-configuration
+        displayName: az kusto attached-database-configuration
+        items: []
+      - name: cluster
+        uid: az_kusto_cluster
+        displayName: az kusto cluster
+        items: []
+      - name: cluster-principal-assignment
+        uid: az_kusto_cluster-principal-assignment
+        displayName: az kusto cluster-principal-assignment
+        items: []
+      - name: database
+        uid: az_kusto_database
+        displayName: az kusto database
+        items: []
+      - name: database-principal-assignment
+        uid: az_kusto_database-principal-assignment
+        displayName: az kusto database-principal-assignment
+        items: []
+      - name: data-connection
         items:
-        - name: Overview
-          uid: az_network_lb_inbound_nat_rule
-          displayName: az network lb inbound-nat-rule
-        - name: create
-          uid: az_network_lb_inbound_nat_rule_create
-          displayName: az network lb inbound-nat-rule create
-        - name: delete
-          uid: az_network_lb_inbound_nat_rule_delete
-          displayName: az network lb inbound-nat-rule delete
-        - name: list
-          uid: az_network_lb_inbound_nat_rule_list
-          displayName: az network lb inbound-nat-rule list
-        - name: show
-          uid: az_network_lb_inbound_nat_rule_show
-          displayName: az network lb inbound-nat-rule show
-        - name: update
-          uid: az_network_lb_inbound_nat_rule_update
-          displayName: az network lb inbound-nat-rule update
-      - name: Probes
-        displayName: az network lb probe
+        - name: Summary
+          uid: az_kusto_data-connection
+          displayName: az kusto data-connection
+        - name: event-grid
+          uid: az_kusto_data-connection_event-grid
+          displayName: az kusto data-connection event-grid
+          items: []
+        - name: event-hub
+          uid: az_kusto_data-connection_event-hub
+          displayName: az kusto data-connection event-hub
+          items: []
+        - name: iot-hub
+          uid: az_kusto_data-connection_iot-hub
+          displayName: az kusto data-connection iot-hub
+          items: []
+      - name: operation-result
+        uid: az_kusto_operation-result
+        displayName: az kusto operation-result
+        items: []
+      - name: script
+        uid: az_kusto_script
+        displayName: az kusto script
+        items: []
+  - name: Azure Data Explorer (Kusto)
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Explorer_(Kusto)
+      displayName: Azure Data Explorer (Kusto)
+    - name: kusto
+      items:
+      - name: Summary
+        uid: az_kusto
+        displayName: az kusto
+      - name: attached-database-configuration
+        uid: az_kusto_attached-database-configuration
+        displayName: az kusto attached-database-configuration
+        items: []
+      - name: cluster
+        uid: az_kusto_cluster
+        displayName: az kusto cluster
+        items: []
+      - name: cluster-principal-assignment
+        uid: az_kusto_cluster-principal-assignment
+        displayName: az kusto cluster-principal-assignment
+        items: []
+      - name: database
+        uid: az_kusto_database
+        displayName: az kusto database
+        items: []
+      - name: database-principal-assignment
+        uid: az_kusto_database-principal-assignment
+        displayName: az kusto database-principal-assignment
+        items: []
+      - name: data-connection
         items:
-        - name: Overview
-          uid: az_network_lb_probe
-          displayName: az network lb probe
-        - name: create
-          uid: az_network_lb_probe_create
-          displayName: az network lb probe create
-        - name: delete
-          uid: az_network_lb_probe_delete
-          displayName: az network lb probe delete
-        - name: list
-          uid: az_network_lb_probe_list
-          displayName: az network lb probe list
-        - name: show
-          uid: az_network_lb_probe_show
-          displayName: az network lb probe show
-        - name: update
-          uid: az_network_lb_probe_update
-          displayName: az network lb probe update
-      - name: Rules
-        displayName: az network lb rule
+        - name: Summary
+          uid: az_kusto_data-connection
+          displayName: az kusto data-connection
+        - name: event-grid
+          uid: az_kusto_data-connection_event-grid
+          displayName: az kusto data-connection event-grid
+          items: []
+        - name: event-hub
+          uid: az_kusto_data-connection_event-hub
+          displayName: az kusto data-connection event-hub
+          items: []
+        - name: iot-hub
+          uid: az_kusto_data-connection_iot-hub
+          displayName: az kusto data-connection iot-hub
+          items: []
+      - name: operation-result
+        uid: az_kusto_operation-result
+        displayName: az kusto operation-result
+        items: []
+      - name: script
+        uid: az_kusto_script
+        displayName: az kusto script
+        items: []
+  - name: Azure Data Factory
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Factory
+      displayName: Azure Data Factory
+    - name: datafactory
+      items:
+      - name: Summary
+        uid: az_datafactory
+        displayName: az datafactory
+      - name: activity-run
+        uid: az_datafactory_activity-run
+        displayName: az datafactory activity-run
+        items: []
+      - name: dataset
+        uid: az_datafactory_dataset
+        displayName: az datafactory dataset
+        items: []
+      - name: integration-runtime
+        items:
+        - name: Summary
+          uid: az_datafactory_integration-runtime
+          displayName: az datafactory integration-runtime
+        - name: linked-integration-runtime
+          uid: az_datafactory_integration-runtime_linked-integration-runtime
+          displayName: az datafactory integration-runtime linked-integration-runtime
+          items: []
+        - name: managed
+          uid: az_datafactory_integration-runtime_managed
+          displayName: az datafactory integration-runtime managed
+          items: []
+        - name: self-hosted
+          uid: az_datafactory_integration-runtime_self-hosted
+          displayName: az datafactory integration-runtime self-hosted
+          items: []
+      - name: integration-runtime-node
+        uid: az_datafactory_integration-runtime-node
+        displayName: az datafactory integration-runtime-node
+        items: []
+      - name: linked-service
+        uid: az_datafactory_linked-service
+        displayName: az datafactory linked-service
+        items: []
+      - name: pipeline
+        uid: az_datafactory_pipeline
+        displayName: az datafactory pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_datafactory_pipeline-run
+        displayName: az datafactory pipeline-run
+        items: []
+      - name: trigger
+        uid: az_datafactory_trigger
+        displayName: az datafactory trigger
+        items: []
+      - name: trigger-run
+        uid: az_datafactory_trigger-run
+        displayName: az datafactory trigger-run
+        items: []
+  - name: Azure Data Lake Analytics
+    uid: sp-Azure_Data_Lake_Analytics
+    displayName: Azure Data Lake Analytics
+    items: []
+  - name: Azure Data Lake Storage
+    uid: sp-Azure_Data_Lake_Storage
+    displayName: Azure Data Lake Storage
+    items: []
+  - name: Azure Data Migration
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Migration
+      displayName: Azure Data Migration
+    - name: dms
+      items:
+      - name: Summary
+        uid: az_dms
+        displayName: az dms
+      - name: project
         items:
-        - name: Overview
-          uid: az_network_lb_rule
-          displayName: az network lb rule
-        - name: create
-          uid: az_network_lb_rule_create
-          displayName: az network lb rule create
-        - name: delete
-          uid: az_network_lb_rule_delete
-          displayName: az network lb rule delete
-        - name: list
-          uid: az_network_lb_rule_list
-          displayName: az network lb rule list
-        - name: show
-          uid: az_network_lb_rule_show
-          displayName: az network lb rule show
-        - name: update
-          uid: az_network_lb_rule_update
-          displayName: az network lb rule update
-    - name: Network interfaces
-      displayName: az network nic
+        - name: Summary
+          uid: az_dms_project
+          displayName: az dms project
+        - name: task
+          uid: az_dms_project_task
+          displayName: az dms project task
+          items: []
+  - name: Azure Data Share
+    items:
+    - name: Summary
+      uid: sp-Azure_Data_Share
+      displayName: Azure Data Share
+    - name: datashare
       items:
-      - name: Overview
-        uid: az_network_nic
-        displayName: az network nic
-      - name: create
-        uid: az_network_nic_create
-        displayName: az network nic create
-      - name: delete
-        uid: az_network_nic_delete
-        displayName: az network nic delete
-      - name: list
-        uid: az_network_nic_list
-        displayName: az network nic list
-      - name: list-effective-nsg
-        uid: az_network_nic_list_effective_nsg
-        displayName: az network nic list-effective-nsg
-      - name: show
-        uid: az_network_nic_show
-        displayName: az network nic show
-      - name: show-effective-route-table
-        uid: az_network_nic_show_effective_route_table
-        displayName: az network nic show-effective-route-table
-      - name: update
-        uid: az_network_nic_update
-        displayName: az network nic update
-      - name: wait
-        uid: az_network_nic_wait
-        displayName: az network nic wait
-      - name: NIC IP configurations
-        displayName: az network nic ip-config
-        items:
-        - name: Overview
-          uid: az_network_nic_ip_config
-          displayName: az network nic ip-config
-        - name: create
-          uid: az_network_nic_ip_config_create
-          displayName: az network nic ip-config create
-        - name: delete
-          uid: az_network_nic_ip_config_delete
-          displayName: az network nic ip-config delete
-        - name: list
-          uid: az_network_nic_ip_config_list
-          displayName: az network nic ip-config list
-        - name: show
-          uid: az_network_nic_ip_config_show
-          displayName: az network nic ip-config show
-        - name: update
-          uid: az_network_nic_ip_config_update
-          displayName: az network nic ip-config update
-        - name: Address pools
-          displayName: az network nic ip-config address-pool
-          items:
-          - name: Overview
-            uid: az_network_nic_ip_config_address_pool
-            displayName: az network nic ip-config address-pool
-          - name: add
-            uid: az_network_nic_ip_config_address_pool_add
-            displayName: az network nic ip-config address-pool add
-          - name: remove
-            uid: az_network_nic_ip_config_address_pool_remove
-            displayName: az network nic ip-config address-pool remove
-        - name: Inbound NAT rules
-          displayName: az network nic ip-config inbound-nat-rule
+      - name: Summary
+        uid: az_datashare
+        displayName: az datashare
+      - name: account
+        uid: az_datashare_account
+        displayName: az datashare account
+        items: []
+      - name: consumer
+        items:
+        - name: Summary
+          uid: az_datashare_consumer
+          displayName: az datashare consumer
+        - name: dataset-mapping
+          uid: az_datashare_consumer_dataset-mapping
+          displayName: az datashare consumer dataset-mapping
+          items: []
+        - name: invitation
+          uid: az_datashare_consumer_invitation
+          displayName: az datashare consumer invitation
+          items: []
+        - name: share-subscription
           items:
-          - name: Overview
-            uid: az_network_nic_ip_config_inbound_nat_rule
-            displayName: az network nic ip-config inbound-nat-rule
-          - name: add
-            uid: az_network_nic_ip_config_inbound_nat_rule_add
-            displayName: az network nic ip-config inbound-nat-rule add
-          - name: remove
-            uid: az_network_nic_ip_config_inbound_nat_rule_remove
-            displayName: az network nic ip-config inbound-nat-rule remove
-    - name: Network security groups
-      displayName: az network nsg
+          - name: Summary
+            uid: az_datashare_consumer_share-subscription
+            displayName: az datashare consumer share-subscription
+          - name: synchronization
+            uid: az_datashare_consumer_share-subscription_synchronization
+            displayName: az datashare consumer share-subscription synchronization
+            items: []
+        - name: trigger
+          uid: az_datashare_consumer_trigger
+          displayName: az datashare consumer trigger
+          items: []
+      - name: dataset
+        uid: az_datashare_dataset
+        displayName: az datashare dataset
+        items: []
+      - name: invitation
+        uid: az_datashare_invitation
+        displayName: az datashare invitation
+        items: []
+      - name: provider-share-subscription
+        uid: az_datashare_provider-share-subscription
+        displayName: az datashare provider-share-subscription
+        items: []
+      - name: synchronization
+        uid: az_datashare_synchronization
+        displayName: az datashare synchronization
+        items: []
+      - name: synchronization-setting
+        uid: az_datashare_synchronization-setting
+        displayName: az datashare synchronization-setting
+        items: []
+  - name: Azure Database for MariaDB
+    uid: sp-Azure_Database_for_MariaDB
+    displayName: Azure Database for MariaDB
+    items: []
+  - name: Azure Database for MySQL
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_for_MySQL
+      displayName: Azure Database for MySQL
+    - name: mysql
       items:
-      - name: Overview
-        uid: az_network_nsg
-        displayName: az network nsg
-      - name: create
-        uid: az_network_nsg_create
-        displayName: az network nsg create
-      - name: delete
-        uid: az_network_nsg_delete
-        displayName: az network nsg delete
-      - name: list
-        uid: az_network_nsg_list
-        displayName: az network nsg list
-      - name: show
-        uid: az_network_nsg_show
-        displayName: az network nsg show
-      - name: update
-        uid: az_network_nsg_update
-        displayName: az network nsg update
-      - name: Rules
-        displayName: az network nsg rule
-        items:
-        - name: Overview
-          uid: az_network_nsg_rule
-          displayName: az network nsg rule
-        - name: create
-          uid: az_network_nsg_rule_create
-          displayName: az network nsg rule create
-        - name: delete
-          uid: az_network_nsg_rule_delete
-          displayName: az network nsg rule delete
-        - name: list
-          uid: az_network_nsg_rule_list
-          displayName: az network nsg rule list
-        - name: show
-          uid: az_network_nsg_rule_show
-          displayName: az network nsg rule show
-        - name: update
-          uid: az_network_nsg_rule_update
-          displayName: az network nsg rule update
-    - name: Public IP addresses
-      displayName: az network public-ip
+      - name: Summary
+        uid: az_mysql
+        displayName: az mysql
+      - name: flexible-server
+        uid: az_mysql_flexible-server
+        displayName: az mysql flexible-server
+        items: []
+  - name: Azure Database for PostgreSQL
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_for_PostgreSQL
+      displayName: Azure Database for PostgreSQL
+    - name: postgres
       items:
-      - name: Overview
-        uid: az_network_public_ip
-        displayName: az network public-ip
-      - name: create
-        uid: az_network_public_ip_create
-        displayName: az network public-ip create
-      - name: delete
-        uid: az_network_public_ip_delete
-        displayName: az network public-ip delete
-      - name: list
-        uid: az_network_public_ip_list
-        displayName: az network public-ip list
-      - name: show
-        uid: az_network_public_ip_show
-        displayName: az network public-ip show
-      - name: update
-        uid: az_network_public_ip_update
-        displayName: az network public-ip update
-      - name: prefix
-        displayName: az network public-ip prefix
-        items:
-        - name: Overview
-          uid: az_network_public_ip_prefix
-          displayName: az network public-ip prefix
-        - name: create
-          uid: az_network_public_ip_prefix_create
-          displayName: az network public-ip prefix create
-        - name: list
-          uid: az_network_public_ip_prefix_list
-          displayName: az network public-ip prefix list
-    - name: Route tables
-      displayName: az network route-table
+      - name: Summary
+        uid: az_postgres
+        displayName: az postgres
+      - name: flexible-server
+        uid: az_postgres_flexible-server
+        displayName: az postgres flexible-server
+        items: []
+  - name: Azure Database Migration Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Database_Migration_Service
+      displayName: Azure Database Migration Service
+    - name: dms
       items:
-      - name: Overview
-        uid: az_network_route_table
-        displayName: az network route-table
-      - name: create
-        uid: az_network_route_table_create
-        displayName: az network route-table create
-      - name: delete
-        uid: az_network_route_table_delete
-        displayName: az network route-table delete
-      - name: list
-        uid: az_network_route_table_list
-        displayName: az network route-table list
-      - name: show
-        uid: az_network_route_table_show
-        displayName: az network route-table show
-      - name: update
-        uid: az_network_route_table_update
-        displayName: az network route-table update
-      - name: Routes
-        displayName: az network route-table route
+      - name: Summary
+        uid: az_dms
+        displayName: az dms
+      - name: project
         items:
-        - name: Overview
-          uid: az_network_route_table_route
-          displayName: az network route-table route
-        - name: create
-          uid: az_network_route_table_route_create
-          displayName: az network route-table route create
-        - name: delete
-          uid: az_network_route_table_route_delete
-          displayName: az network route-table route delete
-        - name: list
-          uid: az_network_route_table_route_list
-          displayName: az network route-table route list
-        - name: show
-          uid: az_network_route_table_route_show
-          displayName: az network route-table route show
-        - name: update
-          uid: az_network_route_table_route_update
-          displayName: az network route-table route update
-    - name: Traffic Manager
-      displayName: az network traffic-manager
+        - name: Summary
+          uid: az_dms_project
+          displayName: az dms project
+        - name: task
+          uid: az_dms_project_task
+          displayName: az dms project task
+          items: []
+  - name: Azure Databox
+    items:
+    - name: Summary
+      uid: sp-Azure_Databox
+      displayName: Azure Databox
+    - name: databox
       items:
-      - name: Overview
-        uid: az_network_traffic_manager
-        displayName: az network traffic-manager
-      - name: End points
-        displayName: az network traffic-manager endpoint
-        items:
-        - name: Overview
-          uid: az_network_traffic_manager_endpoint
-          displayName: az network traffic-manager endpoint
-        - name: create
-          uid: az_network_traffic_manager_endpoint_create
-          displayName: az network traffic-manager endpoint create
-        - name: delete
-          uid: az_network_traffic_manager_endpoint_delete
-          displayName: az network traffic-manager endpoint delete
-        - name: list
-          uid: az_network_traffic_manager_endpoint_list
-          displayName: az network traffic-manager endpoint list
-        - name: show
-          uid: az_network_traffic_manager_endpoint_show
-          displayName: az network traffic-manager endpoint show
-        - name: show-geographic-hierarchy
-          uid: az_network_traffic_manager_endpoint_show_geographic_hierarchy
-          displayName: az network traffic-manager endpoint show-geographic-hierarchy
-        - name: update
-          uid: az_network_traffic_manager_endpoint_update
-          displayName: az network traffic-manager endpoint update
-      - name: Profiles
-        displayName: az network traffic-manager profile
+      - name: Summary
+        uid: az_databox
+        displayName: az databox
+      - name: job
+        uid: az_databox_job
+        displayName: az databox job
+        items: []
+  - name: Azure Databricks
+    items:
+    - name: Summary
+      uid: sp-Azure_Databricks
+      displayName: Azure Databricks
+    - name: databricks
+      items:
+      - name: Summary
+        uid: az_databricks
+        displayName: az databricks
+      - name: workspace
         items:
-        - name: Overview
-          uid: az_network_traffic_manager_profile
-          displayName: az network traffic-manager profile
-        - name: check-dns
-          uid: az_network_traffic_manager_profile_check_dns
-          displayName: az network traffic-manager profile check-dns
-        - name: create
-          uid: az_network_traffic_manager_profile_create
-          displayName: az network traffic-manager profile create
-        - name: delete
-          uid: az_network_traffic_manager_profile_delete
-          displayName: az network traffic-manager profile delete
-        - name: list
-          uid: az_network_traffic_manager_profile_list
-          displayName: az network traffic-manager profile list
-        - name: show
-          uid: az_network_traffic_manager_profile_show
-          displayName: az network traffic-manager profile show
-        - name: update
-          uid: az_network_traffic_manager_profile_update
-          displayName: az network traffic-manager profile update
-    - name: VPN connections
-      displayName: az network vpn-connection
+        - name: Summary
+          uid: az_databricks_workspace
+          displayName: az databricks workspace
+        - name: vnet-peering
+          uid: az_databricks_workspace_vnet-peering
+          displayName: az databricks workspace vnet-peering
+          items: []
+  - name: Azure Dedicated HSM
+    items:
+    - name: Summary
+      uid: sp-Azure_Dedicated_HSM
+      displayName: Azure Dedicated HSM
+    - name: dedicated-hsm
+      uid: az_dedicated-hsm
+      displayName: az dedicated-hsm
+      items: []
+  - name: Azure DevOps
+    items:
+    - name: Summary
+      uid: sp-Azure_DevOps
+      displayName: Azure DevOps
+    - name: devops
       items:
-      - name: Overview
-        uid: az_network_vpn_connection
-        displayName: az network vpn-connection
-      - name: create
-        uid: az_network_vpn_connection_create
-        displayName: az network vpn-connection create
-      - name: delete
-        uid: az_network_vpn_connection_delete
-        displayName: az network vpn-connection delete
-      - name: list
-        uid: az_network_vpn_connection_list
-        displayName: az network vpn-connection list
-      - name: show
-        uid: az_network_vpn_connection_show
-        displayName: az network vpn-connection show
-      - name: update
-        uid: az_network_vpn_connection_update
-        displayName: az network vpn-connection update
-      - name: Shared keys
-        displayName: az network vpn-connection shared-key
+      - name: Summary
+        uid: az_devops
+        displayName: az devops
+      - name: admin
         items:
-        - name: Overview
-          uid: az_network_vpn_connection_shared_key
-          displayName: az network vpn-connection shared-key
-        - name: reset
-          uid: az_network_vpn_connection_shared_key_reset
-          displayName: az network vpn-connection shared-key reset
-        - name: show
-          uid: az_network_vpn_connection_shared_key_show
-          displayName: az network vpn-connection shared-key show
-        - name: update
-          uid: az_network_vpn_connection_shared_key_update
-          displayName: az network vpn-connection shared-key update
-      - name: ipsec-policy
-        displayName: az network vpn-connection ipsec-policy
+        - name: Summary
+          uid: az_devops_admin
+          displayName: az devops admin
+        - name: banner
+          uid: az_devops_admin_banner
+          displayName: az devops admin banner
+          items: []
+      - name: extension
+        uid: az_devops_extension
+        displayName: az devops extension
+        items: []
+      - name: project
+        uid: az_devops_project
+        displayName: az devops project
+        items: []
+      - name: security
         items:
-        - name: Overview
-          uid: az_network_vpn_connection_ipsec_policy
-          displayName: az network vpn-connection ipsec-policy
-        - name: add
-          uid: az_network_vpn_connection_ipsec_policy_add
-          displayName: az network vpn-connection ipsec-policy add
-        - name: clear
-          uid: az_network_vpn_connection_ipsec_policy_clear
-          displayName: az network vpn-connection ipsec-policy clear
-        - name: list
-          uid: az_network_vpn_connection_ipsec_policy_list
-          displayName: az network vpn-connection ipsec-policy list
-    - name: Virtual Network
-      displayName: az network vnet
-      items:
-      - name: Overview
-        uid: az_network_vnet
-        displayName: az network vnet
-      - name: check-ip-address
-        uid: az_network_vnet_check_ip_address
-        displayName: az network vnet check-ip-address
-      - name: create
-        uid: az_network_vnet_create
-        displayName: az network vnet create
-      - name: delete
-        uid: az_network_vnet_delete
-        displayName: az network vnet delete
-      - name: list
-        uid: az_network_vnet_list
-        displayName: az network vnet list
-      - name: list-available-ips
-        uid: az_network_vnet_list_available_ips
-        displayName: az network vnet list-available-ips
-      - name: list-endpoint-services
-        uid: az_network_vnet_list_endpoint_services
-        displayName: az network vnet list-endpoint-services
-      - name: show
-        uid: az_network_vnet_show
-        displayName: az network vnet show
-      - name: update
-        uid: az_network_vnet_update
-        displayName: az network vnet update
-      - name: Peering connections
-        displayName: az network vnet peering
+        - name: Summary
+          uid: az_devops_security
+          displayName: az devops security
+        - name: group
+          items:
+          - name: Summary
+            uid: az_devops_security_group
+            displayName: az devops security group
+          - name: membership
+            uid: az_devops_security_group_membership
+            displayName: az devops security group membership
+            items: []
+        - name: permission
+          items:
+          - name: Summary
+            uid: az_devops_security_permission
+            displayName: az devops security permission
+          - name: namespace
+            uid: az_devops_security_permission_namespace
+            displayName: az devops security permission namespace
+            items: []
+      - name: service-endpoint
         items:
-        - name: Overview
-          uid: az_network_vnet_peering
-          displayName: az network vnet peering
-        - name: create
-          uid: az_network_vnet_peering_create
-          displayName: az network vnet peering create
-        - name: delete
-          uid: az_network_vnet_peering_delete
-          displayName: az network vnet peering delete
-        - name: list
-          uid: az_network_vnet_peering_list
-          displayName: az network vnet peering list
-        - name: show
-          uid: az_network_vnet_peering_show
-          displayName: az network vnet peering show
-        - name: update
-          uid: az_network_vnet_peering_update
-          displayName: az network vnet peering update
-      - name: Subnets
-        displayName: az network vnet subnet
+        - name: Summary
+          uid: az_devops_service-endpoint
+          displayName: az devops service-endpoint
+        - name: azurerm
+          uid: az_devops_service-endpoint_azurerm
+          displayName: az devops service-endpoint azurerm
+          items: []
+        - name: github
+          uid: az_devops_service-endpoint_github
+          displayName: az devops service-endpoint github
+          items: []
+      - name: team
+        uid: az_devops_team
+        displayName: az devops team
+        items: []
+      - name: user
+        uid: az_devops_user
+        displayName: az devops user
+        items: []
+      - name: wiki
         items:
-        - name: Overview
-          uid: az_network_vnet_subnet
-          displayName: az network vnet subnet
-        - name: create
-          uid: az_network_vnet_subnet_create
-          displayName: az network vnet subnet create
-        - name: delete
-          uid: az_network_vnet_subnet_delete
-          displayName: az network vnet subnet delete
-        - name: list
-          uid: az_network_vnet_subnet_list
-          displayName: az network vnet subnet list
-        - name: show
-          uid: az_network_vnet_subnet_show
-          displayName: az network vnet subnet show
-        - name: update
-          uid: az_network_vnet_subnet_update
-          displayName: az network vnet subnet update
-    - name: Virtual Network gateways
-      displayName: az network vnet-gateway
+        - name: Summary
+          uid: az_devops_wiki
+          displayName: az devops wiki
+        - name: page
+          uid: az_devops_wiki_page
+          displayName: az devops wiki page
+          items: []
+  - name: Azure DevTest Labs
+    uid: sp-Azure_DevTest_Labs
+    displayName: Azure DevTest Labs
+    items: []
+  - name: Azure Digital Twins
+    items:
+    - name: Summary
+      uid: sp-Azure_Digital_Twins
+      displayName: Azure Digital Twins
+    - name: dt
       items:
-      - name: Overview
-        uid: az_network_vnet_gateway
-        displayName: az network vnet-gateway
-      - name: create
-        uid: az_network_vnet_gateway_create
-        displayName: az network vnet-gateway create
-      - name: delete
-        uid: az_network_vnet_gateway_delete
-        displayName: az network vnet-gateway delete
-      - name: list
-        uid: az_network_vnet_gateway_list
-        displayName: az network vnet-gateway list
-      - name: list-advertised-routes
-        uid: az_network_vnet_gateway_list_advertised_routes
-        displayName: az network vnet-gateway list-advertised-routes
-      - name: list-bgp-peer-status
-        uid: az_network_vnet_gateway_list_bgp_peer_status
-        displayName: az network vnet-gateway list-bgp-peer-status
-      - name: list-learned-routes
-        uid: az_network_vnet_gateway_list_learned_routes
-        displayName: az network vnet-gateway list-learned-routes
-      - name: reset
-        uid: az_network_vnet_gateway_reset
-        displayName: az network vnet-gateway reset
-      - name: show
-        uid: az_network_vnet_gateway_show
-        displayName: az network vnet-gateway show
-      - name: update
-        uid: az_network_vnet_gateway_update
-        displayName: az network vnet-gateway update
-      - name: wait
-        uid: az_network_vnet_gateway_wait
-        displayName: az network vnet-gateway wait
-      - name: Revoked certificates
-        displayName: az network vnet-gateway revoked-cert
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_revoked_cert
-          displayName: az network vnet-gateway revoked-cert
-        - name: create
-          uid: az_network_vnet_gateway_revoked_cert_create
-          displayName: az network vnet-gateway revoked-cert create
-        - name: delete
-          uid: az_network_vnet_gateway_revoked_cert_delete
-          displayName: az network vnet-gateway revoked-cert delete
-      - name: Root certificates
-        displayName: az network vnet-gateway root-cert
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_root_cert
-          displayName: az network vnet-gateway root-cert
+      - name: Summary
+        uid: az_dt
+        displayName: az dt
+      - name: endpoint
+        items:
+        - name: Summary
+          uid: az_dt_endpoint
+          displayName: az dt endpoint
         - name: create
-          uid: az_network_vnet_gateway_root_cert_create
-          displayName: az network vnet-gateway root-cert create
-        - name: delete
-          uid: az_network_vnet_gateway_root_cert_delete
-          displayName: az network vnet-gateway root-cert delete
-      - name: vpn-client
-        displayName: az network vnet-gateway vpn-client
-        items:
-        - name: Overview
-          uid: az_network_vnet_gateway_vpn_client
-          displayName: az network vnet-gateway vpn-client
-        - name: generate
-          uid: az_network_vnet_gateway_vpn_client_generate
-          displayName: az network vnet-gateway vpn-client generate
-        - name: show-url
-          uid: az_network_vnet_gateway_vpn_client_show_url
-          displayName: az network vnet-gateway vpn-client show-url
-    - name: asg
-      displayName: az network asg
-      items:
-      - name: Overview
-        uid: az_network_asg
-        displayName: az network asg
-      - name: create
-        uid: az_network_asg_create
-        displayName: az network asg create
-      - name: delete
-        uid: az_network_asg_delete
-        displayName: az network asg delete
-      - name: list
-        uid: az_network_asg_list
-        displayName: az network asg list
-      - name: show
-        uid: az_network_asg_show
-        displayName: az network asg show
-      - name: update
-        uid: az_network_asg_update
-        displayName: az network asg update
-    - name: bastion
-      displayName: az network bastion
-      items:
-      - name: Overview
-        uid: az_network_bastion
-        displayName: az network bastion
-      - name: create
-        uid: az_network_bastion_create
-        displayName: az network bastion create
-      - name: list
-        uid: az_network_bastion_list
-        displayName: az network bastion list
-    - name: private-dns
-      displayName: az network private-dns
-      items:
-      - name: Overview
-        uid: az_network_private_dns
-        displayName: az network private-dns
-      - name: link
-        displayName: az network private-dns link
+          uid: az_dt_endpoint_create
+          displayName: az dt endpoint create
+          items: []
+      - name: model
+        uid: az_dt_model
+        displayName: az dt model
+        items: []
+      - name: network
         items:
-        - name: Overview
-          uid: az_network_private_dns_link
-          displayName: az network private-dns link
-        - name: vnet
-          displayName: az network private-dns link vnet
-          items:
-          - name: Overview
-            uid: az_network_private_dns_link_vnet
-            displayName: az network private-dns link vnet
-          - name: create
-            uid: az_network_private_dns_link_vnet_create
-            displayName: az network private-dns link vnet create
-          - name: delete
-            uid: az_network_private_dns_link_vnet_delete
-            displayName: az network private-dns link vnet delete
-          - name: list
-            uid: az_network_private_dns_link_vnet_list
-            displayName: az network private-dns link vnet list
-          - name: show
-            uid: az_network_private_dns_link_vnet_show
-            displayName: az network private-dns link vnet show
-          - name: update
-            uid: az_network_private_dns_link_vnet_update
-            displayName: az network private-dns link vnet update
-          - name: wait
-            uid: az_network_private_dns_link_vnet_wait
-            displayName: az network private-dns link vnet wait
-      - name: record-set
-        displayName: az network private-dns record-set
-        items:
-        - name: Overview
-          uid: az_network_private_dns_record_set
-          displayName: az network private-dns record-set
-        - name: list
-          uid: az_network_private_dns_record_set_list
-          displayName: az network private-dns record-set list
-        - name: a
-          displayName: az network private-dns record-set a
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_a
-            displayName: az network private-dns record-set a
-          - name: add-record
-            uid: az_network_private_dns_record_set_a_add_record
-            displayName: az network private-dns record-set a add-record
-          - name: create
-            uid: az_network_private_dns_record_set_a_create
-            displayName: az network private-dns record-set a create
-          - name: delete
-            uid: az_network_private_dns_record_set_a_delete
-            displayName: az network private-dns record-set a delete
-          - name: list
-            uid: az_network_private_dns_record_set_a_list
-            displayName: az network private-dns record-set a list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_a_remove_record
-            displayName: az network private-dns record-set a remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_a_show
-            displayName: az network private-dns record-set a show
-          - name: update
-            uid: az_network_private_dns_record_set_a_update
-            displayName: az network private-dns record-set a update
-        - name: aaaa
-          displayName: az network private-dns record-set aaaa
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_aaaa
-            displayName: az network private-dns record-set aaaa
-          - name: add-record
-            uid: az_network_private_dns_record_set_aaaa_add_record
-            displayName: az network private-dns record-set aaaa add-record
-          - name: create
-            uid: az_network_private_dns_record_set_aaaa_create
-            displayName: az network private-dns record-set aaaa create
-          - name: delete
-            uid: az_network_private_dns_record_set_aaaa_delete
-            displayName: az network private-dns record-set aaaa delete
-          - name: list
-            uid: az_network_private_dns_record_set_aaaa_list
-            displayName: az network private-dns record-set aaaa list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_aaaa_remove_record
-            displayName: az network private-dns record-set aaaa remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_aaaa_show
-            displayName: az network private-dns record-set aaaa show
-          - name: update
-            uid: az_network_private_dns_record_set_aaaa_update
-            displayName: az network private-dns record-set aaaa update
-        - name: cname
-          displayName: az network private-dns record-set cname
-          items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_cname
-            displayName: az network private-dns record-set cname
-          - name: create
-            uid: az_network_private_dns_record_set_cname_create
-            displayName: az network private-dns record-set cname create
-          - name: delete
-            uid: az_network_private_dns_record_set_cname_delete
-            displayName: az network private-dns record-set cname delete
-          - name: list
-            uid: az_network_private_dns_record_set_cname_list
-            displayName: az network private-dns record-set cname list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_cname_remove_record
-            displayName: az network private-dns record-set cname remove-record
-          - name: set-record
-            uid: az_network_private_dns_record_set_cname_set_record
-            displayName: az network private-dns record-set cname set-record
-          - name: show
-            uid: az_network_private_dns_record_set_cname_show
-            displayName: az network private-dns record-set cname show
-          - name: update
-            uid: az_network_private_dns_record_set_cname_update
-            displayName: az network private-dns record-set cname update
-        - name: mx
-          displayName: az network private-dns record-set mx
+        - name: Summary
+          uid: az_dt_network
+          displayName: az dt network
+        - name: private-endpoint
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_mx
-            displayName: az network private-dns record-set mx
-          - name: add-record
-            uid: az_network_private_dns_record_set_mx_add_record
-            displayName: az network private-dns record-set mx add-record
-          - name: create
-            uid: az_network_private_dns_record_set_mx_create
-            displayName: az network private-dns record-set mx create
-          - name: delete
-            uid: az_network_private_dns_record_set_mx_delete
-            displayName: az network private-dns record-set mx delete
-          - name: list
-            uid: az_network_private_dns_record_set_mx_list
-            displayName: az network private-dns record-set mx list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_mx_remove_record
-            displayName: az network private-dns record-set mx remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_mx_show
-            displayName: az network private-dns record-set mx show
-          - name: update
-            uid: az_network_private_dns_record_set_mx_update
-            displayName: az network private-dns record-set mx update
-        - name: ptr
-          displayName: az network private-dns record-set ptr
+          - name: Summary
+            uid: az_dt_network_private-endpoint
+            displayName: az dt network private-endpoint
+          - name: connection
+            uid: az_dt_network_private-endpoint_connection
+            displayName: az dt network private-endpoint connection
+            items: []
+        - name: private-link
+          uid: az_dt_network_private-link
+          displayName: az dt network private-link
+          items: []
+      - name: role-assignment
+        uid: az_dt_role-assignment
+        displayName: az dt role-assignment
+        items: []
+      - name: route
+        uid: az_dt_route
+        displayName: az dt route
+        items: []
+      - name: twin
+        items:
+        - name: Summary
+          uid: az_dt_twin
+          displayName: az dt twin
+        - name: component
+          uid: az_dt_twin_component
+          displayName: az dt twin component
+          items: []
+        - name: relationship
+          uid: az_dt_twin_relationship
+          displayName: az dt twin relationship
+          items: []
+        - name: telemetry
+          uid: az_dt_twin_telemetry
+          displayName: az dt twin telemetry
+          items: []
+  - name: Azure Disk Pool Service
+    items:
+    - name: Summary
+      uid: sp-Azure_Disk_Pool_Service
+      displayName: Azure Disk Pool Service
+    - name: disk-pool
+      items:
+      - name: Summary
+        uid: az_disk-pool
+        displayName: az disk-pool
+      - name: iscsi-target
+        uid: az_disk-pool_iscsi-target
+        displayName: az disk-pool iscsi-target
+        items: []
+  - name: Azure Disk Storage
+    items:
+    - name: Summary
+      uid: sp-Azure_Disk_Storage
+      displayName: Azure Disk Storage
+    - name: disk - Managed Disks
+      uid: az_disk
+      displayName: az disk
+      items: []
+  - name: Azure Event Grid
+    items:
+    - name: Summary
+      uid: sp-Azure_Event_Grid
+      displayName: Azure Event Grid
+    - name: eventgrid
+      items:
+      - name: Summary
+        uid: az_eventgrid
+        displayName: az eventgrid
+      - name: domain
+        items:
+        - name: Summary
+          uid: az_eventgrid_domain
+          displayName: az eventgrid domain
+        - name: key
+          uid: az_eventgrid_domain_key
+          displayName: az eventgrid domain key
+          items: []
+        - name: private-endpoint-connection
+          uid: az_eventgrid_domain_private-endpoint-connection
+          displayName: az eventgrid domain private-endpoint-connection
+          items: []
+        - name: private-link-resource
+          uid: az_eventgrid_domain_private-link-resource
+          displayName: az eventgrid domain private-link-resource
+          items: []
+        - name: topic
+          uid: az_eventgrid_domain_topic
+          displayName: az eventgrid domain topic
+          items: []
+      - name: event-subscription
+        uid: az_eventgrid_event-subscription
+        displayName: az eventgrid event-subscription
+        items: []
+      - name: extension-topic
+        uid: az_eventgrid_extension-topic
+        displayName: az eventgrid extension-topic
+        items: []
+      - name: partner
+        items:
+        - name: Summary
+          uid: az_eventgrid_partner
+          displayName: az eventgrid partner
+        - name: namespace
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_ptr
-            displayName: az network private-dns record-set ptr
-          - name: add-record
-            uid: az_network_private_dns_record_set_ptr_add_record
-            displayName: az network private-dns record-set ptr add-record
-          - name: create
-            uid: az_network_private_dns_record_set_ptr_create
-            displayName: az network private-dns record-set ptr create
-          - name: delete
-            uid: az_network_private_dns_record_set_ptr_delete
-            displayName: az network private-dns record-set ptr delete
-          - name: list
-            uid: az_network_private_dns_record_set_ptr_list
-            displayName: az network private-dns record-set ptr list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_ptr_remove_record
-            displayName: az network private-dns record-set ptr remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_ptr_show
-            displayName: az network private-dns record-set ptr show
-          - name: update
-            uid: az_network_private_dns_record_set_ptr_update
-            displayName: az network private-dns record-set ptr update
-        - name: soa
-          displayName: az network private-dns record-set soa
+          - name: Summary
+            uid: az_eventgrid_partner_namespace
+            displayName: az eventgrid partner namespace
+          - name: event-channel
+            uid: az_eventgrid_partner_namespace_event-channel
+            displayName: az eventgrid partner namespace event-channel
+            items: []
+          - name: key
+            uid: az_eventgrid_partner_namespace_key
+            displayName: az eventgrid partner namespace key
+            items: []
+        - name: registration
+          uid: az_eventgrid_partner_registration
+          displayName: az eventgrid partner registration
+          items: []
+        - name: topic
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_soa
-            displayName: az network private-dns record-set soa
-          - name: show
-            uid: az_network_private_dns_record_set_soa_show
-            displayName: az network private-dns record-set soa show
-          - name: update
-            uid: az_network_private_dns_record_set_soa_update
-            displayName: az network private-dns record-set soa update
-        - name: srv
-          displayName: az network private-dns record-set srv
+          - name: Summary
+            uid: az_eventgrid_partner_topic
+            displayName: az eventgrid partner topic
+          - name: event-subscription
+            uid: az_eventgrid_partner_topic_event-subscription
+            displayName: az eventgrid partner topic event-subscription
+            items: []
+      - name: system-topic
+        items:
+        - name: Summary
+          uid: az_eventgrid_system-topic
+          displayName: az eventgrid system-topic
+        - name: event-subscription
+          uid: az_eventgrid_system-topic_event-subscription
+          displayName: az eventgrid system-topic event-subscription
+          items: []
+      - name: topic
+        items:
+        - name: Summary
+          uid: az_eventgrid_topic
+          displayName: az eventgrid topic
+        - name: key
+          uid: az_eventgrid_topic_key
+          displayName: az eventgrid topic key
+          items: []
+        - name: private-endpoint-connection
+          uid: az_eventgrid_topic_private-endpoint-connection
+          displayName: az eventgrid topic private-endpoint-connection
+          items: []
+        - name: private-link-resource
+          uid: az_eventgrid_topic_private-link-resource
+          displayName: az eventgrid topic private-link-resource
+          items: []
+      - name: topic-type
+        uid: az_eventgrid_topic-type
+        displayName: az eventgrid topic-type
+        items: []
+  - name: Azure Event Hubs
+    items:
+    - name: Summary
+      uid: sp-Azure_Event_Hubs
+      displayName: Azure Event Hubs
+    - name: eventhubs
+      items:
+      - name: Summary
+        uid: az_eventhubs
+        displayName: az eventhubs
+      - name: cluster
+        items:
+        - name: Summary
+          uid: az_eventhubs_cluster
+          displayName: az eventhubs cluster
+        - name: namespace
+          uid: az_eventhubs_cluster_namespace
+          displayName: az eventhubs cluster namespace
+          items: []
+      - name: eventhub
+        items:
+        - name: Summary
+          uid: az_eventhubs_eventhub
+          displayName: az eventhubs eventhub
+        - name: authorization-rule
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_srv
-            displayName: az network private-dns record-set srv
-          - name: add-record
-            uid: az_network_private_dns_record_set_srv_add_record
-            displayName: az network private-dns record-set srv add-record
-          - name: create
-            uid: az_network_private_dns_record_set_srv_create
-            displayName: az network private-dns record-set srv create
-          - name: delete
-            uid: az_network_private_dns_record_set_srv_delete
-            displayName: az network private-dns record-set srv delete
-          - name: list
-            uid: az_network_private_dns_record_set_srv_list
-            displayName: az network private-dns record-set srv list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_srv_remove_record
-            displayName: az network private-dns record-set srv remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_srv_show
-            displayName: az network private-dns record-set srv show
-          - name: update
-            uid: az_network_private_dns_record_set_srv_update
-            displayName: az network private-dns record-set srv update
-        - name: txt
-          displayName: az network private-dns record-set txt
+          - name: Summary
+            uid: az_eventhubs_eventhub_authorization-rule
+            displayName: az eventhubs eventhub authorization-rule
+          - name: keys
+            uid: az_eventhubs_eventhub_authorization-rule_keys
+            displayName: az eventhubs eventhub authorization-rule keys
+            items: []
+        - name: consumer-group
+          uid: az_eventhubs_eventhub_consumer-group
+          displayName: az eventhubs eventhub consumer-group
+          items: []
+      - name: georecovery-alias
+        items:
+        - name: Summary
+          uid: az_eventhubs_georecovery-alias
+          displayName: az eventhubs georecovery-alias
+        - name: authorization-rule
           items:
-          - name: Overview
-            uid: az_network_private_dns_record_set_txt
-            displayName: az network private-dns record-set txt
-          - name: add-record
-            uid: az_network_private_dns_record_set_txt_add_record
-            displayName: az network private-dns record-set txt add-record
-          - name: create
-            uid: az_network_private_dns_record_set_txt_create
-            displayName: az network private-dns record-set txt create
-          - name: delete
-            uid: az_network_private_dns_record_set_txt_delete
-            displayName: az network private-dns record-set txt delete
-          - name: list
-            uid: az_network_private_dns_record_set_txt_list
-            displayName: az network private-dns record-set txt list
-          - name: remove-record
-            uid: az_network_private_dns_record_set_txt_remove_record
-            displayName: az network private-dns record-set txt remove-record
-          - name: show
-            uid: az_network_private_dns_record_set_txt_show
-            displayName: az network private-dns record-set txt show
-          - name: update
-            uid: az_network_private_dns_record_set_txt_update
-            displayName: az network private-dns record-set txt update
-      - name: zone
-        displayName: az network private-dns zone
-        items:
-        - name: Overview
-          uid: az_network_private_dns_zone
-          displayName: az network private-dns zone
-        - name: create
-          uid: az_network_private_dns_zone_create
-          displayName: az network private-dns zone create
-        - name: delete
-          uid: az_network_private_dns_zone_delete
-          displayName: az network private-dns zone delete
-        - name: export
-          uid: az_network_private_dns_zone_export
-          displayName: az network private-dns zone export
-        - name: import
-          uid: az_network_private_dns_zone_import
-          displayName: az network private-dns zone import
-        - name: list
-          uid: az_network_private_dns_zone_list
-          displayName: az network private-dns zone list
-        - name: show
-          uid: az_network_private_dns_zone_show
-          displayName: az network private-dns zone show
-        - name: update
-          uid: az_network_private_dns_zone_update
-          displayName: az network private-dns zone update
-        - name: wait
-          uid: az_network_private_dns_zone_wait
-          displayName: az network private-dns zone wait
-    - name: private-endpoint
-      displayName: az network private-endpoint
-      items:
-      - name: Overview
-        uid: az_network_private_endpoint
-        displayName: az network private-endpoint
-      - name: list
-        uid: az_network_private_endpoint_list
-        displayName: az network private-endpoint list
-    - name: private-endpoint-connection
-      displayName: az network private-endpoint-connection
-      items:
-      - name: Overview
-        uid: az_network_private_endpoint_connection
-        displayName: az network private-endpoint-connection
-      - name: approve
-        uid: az_network_private_endpoint_connection_approve
-        displayName: az network private-endpoint-connection approve
-      - name: delete
-        uid: az_network_private_endpoint_connection_delete
-        displayName: az network private-endpoint-connection delete
-      - name: list
-        uid: az_network_private_endpoint_connection_list
-        displayName: az network private-endpoint-connection list
-      - name: reject
-        uid: az_network_private_endpoint_connection_reject
-        displayName: az network private-endpoint-connection reject
-      - name: show
-        uid: az_network_private_endpoint_connection_show
-        displayName: az network private-endpoint-connection show
-    - name: private-link-resource
-      displayName: az network private-link-resource
-      items:
-      - name: Overview
-        uid: az_network_private_link_resource
-        displayName: az network private-link-resource
-      - name: list
-        uid: az_network_private_link_resource_list
-        displayName: az network private-link-resource list
-    - name: private-link-service
-      displayName: az network private-link-service
-      items:
-      - name: Overview
-        uid: az_network_private_link_service
-        displayName: az network private-link-service
-      - name: create
-        uid: az_network_private_link_service_create
-        displayName: az network private-link-service create
-      - name: list
-        uid: az_network_private_link_service_list
-        displayName: az network private-link-service list
-      - name: connection
-        displayName: az network private-link-service connection
-        items:
-        - name: Overview
-          uid: az_network_private_link_service_connection
-          displayName: az network private-link-service connection
-        - name: update
-          uid: az_network_private_link_service_connection_update
-          displayName: az network private-link-service connection update
-    - name: profile
-      displayName: az network profile
-      items:
-      - name: Overview
-        uid: az_network_profile
-        displayName: az network profile
-      - name: list
-        uid: az_network_profile_list
-        displayName: az network profile list
-    - name: route-filter
-      displayName: az network route-filter
-      items:
-      - name: Overview
-        uid: az_network_route_filter
-        displayName: az network route-filter
-      - name: create
-        uid: az_network_route_filter_create
-        displayName: az network route-filter create
-      - name: delete
-        uid: az_network_route_filter_delete
-        displayName: az network route-filter delete
-      - name: list
-        uid: az_network_route_filter_list
-        displayName: az network route-filter list
-      - name: show
-        uid: az_network_route_filter_show
-        displayName: az network route-filter show
-      - name: update
-        uid: az_network_route_filter_update
-        displayName: az network route-filter update
-      - name: rule
-        displayName: az network route-filter rule
+          - name: Summary
+            uid: az_eventhubs_georecovery-alias_authorization-rule
+            displayName: az eventhubs georecovery-alias authorization-rule
+          - name: keys
+            uid: az_eventhubs_georecovery-alias_authorization-rule_keys
+            displayName: az eventhubs georecovery-alias authorization-rule keys
+            items: []
+      - name: namespace
         items:
-        - name: Overview
-          uid: az_network_route_filter_rule
-          displayName: az network route-filter rule
-        - name: create
-          uid: az_network_route_filter_rule_create
-          displayName: az network route-filter rule create
-        - name: delete
-          uid: az_network_route_filter_rule_delete
-          displayName: az network route-filter rule delete
-        - name: list
-          uid: az_network_route_filter_rule_list
-          displayName: az network route-filter rule list
-        - name: list-service-communities
-          uid: az_network_route_filter_rule_list_service_communities
-          displayName: az network route-filter rule list-service-communities
-        - name: show
-          uid: az_network_route_filter_rule_show
-          displayName: az network route-filter rule show
-        - name: update
-          uid: az_network_route_filter_rule_update
-          displayName: az network route-filter rule update
-    - name: security-partner-provider
-      displayName: az network security-partner-provider
-      items:
-      - name: Overview
-        uid: az_network_security_partner_provider
-        displayName: az network security-partner-provider
-      - name: create
-        uid: az_network_security_partner_provider_create
-        displayName: az network security-partner-provider create
-      - name: list
-        uid: az_network_security_partner_provider_list
-        displayName: az network security-partner-provider list
-    - name: service-endpoint
-      displayName: az network service-endpoint
+        - name: Summary
+          uid: az_eventhubs_namespace
+          displayName: az eventhubs namespace
+        - name: authorization-rule
+          items:
+          - name: Summary
+            uid: az_eventhubs_namespace_authorization-rule
+            displayName: az eventhubs namespace authorization-rule
+          - name: keys
+            uid: az_eventhubs_namespace_authorization-rule_keys
+            displayName: az eventhubs namespace authorization-rule keys
+            items: []
+        - name: network-rule
+          uid: az_eventhubs_namespace_network-rule
+          displayName: az eventhubs namespace network-rule
+          items: []
+  - name: Azure File Sync
+    items:
+    - name: Summary
+      uid: sp-Azure_File_Sync
+      displayName: Azure File Sync
+    - name: storagesync
       items:
-      - name: Overview
-        uid: az_network_service_endpoint
-        displayName: az network service-endpoint
-      - name: list
-        uid: az_network_service_endpoint_list
-        displayName: az network service-endpoint list
-      - name: policy
-        displayName: az network service-endpoint policy
+      - name: Summary
+        uid: az_storagesync
+        displayName: az storagesync
+      - name: registered-server
+        uid: az_storagesync_registered-server
+        displayName: az storagesync registered-server
+        items: []
+      - name: sync-group
         items:
-        - name: Overview
-          uid: az_network_service_endpoint_policy
-          displayName: az network service-endpoint policy
-        - name: create
-          uid: az_network_service_endpoint_policy_create
-          displayName: az network service-endpoint policy create
-        - name: list
-          uid: az_network_service_endpoint_policy_list
-          displayName: az network service-endpoint policy list
-      - name: policy-definition
-        displayName: az network service-endpoint policy-definition
-        items:
-        - name: Overview
-          uid: az_network_service_endpoint_policy_definition
-          displayName: az network service-endpoint policy-definition
-        - name: create
-          uid: az_network_service_endpoint_policy_definition_create
-          displayName: az network service-endpoint policy-definition create
-    - name: vrouter
-      displayName: az network vrouter
+        - name: Summary
+          uid: az_storagesync_sync-group
+          displayName: az storagesync sync-group
+        - name: cloud-endpoint
+          uid: az_storagesync_sync-group_cloud-endpoint
+          displayName: az storagesync sync-group cloud-endpoint
+          items: []
+        - name: server-endpoint
+          uid: az_storagesync_sync-group_server-endpoint
+          displayName: az storagesync sync-group server-endpoint
+          items: []
+  - name: Azure Front Door
+    uid: sp-Azure_Front_Door
+    displayName: Azure Front Door
+    items: []
+  - name: Azure Functions
+    items:
+    - name: Summary
+      uid: sp-Azure_Functions
+      displayName: Azure Functions
+    - name: functionapp
       items:
-      - name: Overview
-        uid: az_network_vrouter
-        displayName: az network vrouter
-      - name: create
-        uid: az_network_vrouter_create
-        displayName: az network vrouter create
-      - name: list
-        uid: az_network_vrouter_list
-        displayName: az network vrouter list
-      - name: peering
-        displayName: az network vrouter peering
+      - name: Summary
+        uid: az_functionapp
+        displayName: az functionapp
+      - name: app
+        uid: az_functionapp_app
+        displayName: az functionapp app
+        items: []
+      - name: config
         items:
-        - name: Overview
-          uid: az_network_vrouter_peering
-          displayName: az network vrouter peering
-        - name: create
-          uid: az_network_vrouter_peering_create
-          displayName: az network vrouter peering create
-    - name: watcher
-      displayName: az network watcher
-      items:
-      - name: Overview
-        uid: az_network_watcher
-        displayName: az network watcher
-      - name: configure
-        uid: az_network_watcher_configure
-        displayName: az network watcher configure
-      - name: list
-        uid: az_network_watcher_list
-        displayName: az network watcher list
-      - name: show-next-hop
-        uid: az_network_watcher_show_next_hop
-        displayName: az network watcher show-next-hop
-      - name: show-security-group-view
-        uid: az_network_watcher_show_security_group_view
-        displayName: az network watcher show-security-group-view
-      - name: show-topology
-        uid: az_network_watcher_show_topology
-        displayName: az network watcher show-topology
-      - name: test-connectivity
-        uid: az_network_watcher_test_connectivity
-        displayName: az network watcher test-connectivity
-      - name: test-ip-flow
-        uid: az_network_watcher_test_ip_flow
-        displayName: az network watcher test-ip-flow
-      - name: flow-log
-        displayName: az network watcher flow-log
-        items:
-        - name: Overview
-          uid: az_network_watcher_flow_log
-          displayName: az network watcher flow-log
-        - name: configure
-          uid: az_network_watcher_flow_log_configure
-          displayName: az network watcher flow-log configure
-        - name: show
-          uid: az_network_watcher_flow_log_show
-          displayName: az network watcher flow-log show
-      - name: packet-capture
-        displayName: az network watcher packet-capture
-        items:
-        - name: Overview
-          uid: az_network_watcher_packet_capture
-          displayName: az network watcher packet-capture
-        - name: create
-          uid: az_network_watcher_packet_capture_create
-          displayName: az network watcher packet-capture create
-        - name: delete
-          uid: az_network_watcher_packet_capture_delete
-          displayName: az network watcher packet-capture delete
-        - name: list
-          uid: az_network_watcher_packet_capture_list
-          displayName: az network watcher packet-capture list
-        - name: show
-          uid: az_network_watcher_packet_capture_show
-          displayName: az network watcher packet-capture show
-        - name: show-status
-          uid: az_network_watcher_packet_capture_show_status
-          displayName: az network watcher packet-capture show-status
-        - name: stop
-          uid: az_network_watcher_packet_capture_stop
-          displayName: az network watcher packet-capture stop
-      - name: troubleshooting
-        displayName: az network watcher troubleshooting
-        items:
-        - name: Overview
-          uid: az_network_watcher_troubleshooting
-          displayName: az network watcher troubleshooting
-        - name: show
-          uid: az_network_watcher_troubleshooting_show
-          displayName: az network watcher troubleshooting show
-        - name: start
-          uid: az_network_watcher_troubleshooting_start
-          displayName: az network watcher troubleshooting start
-  - name: Resource groups
-    displayName: az group
+        - name: Summary
+          uid: az_functionapp_config
+          displayName: az functionapp config
+        - name: access-restriction
+          uid: az_functionapp_config_access-restriction
+          displayName: az functionapp config access-restriction
+          items: []
+        - name: appsettings
+          uid: az_functionapp_config_appsettings
+          displayName: az functionapp config appsettings
+          items: []
+        - name: container
+          uid: az_functionapp_config_container
+          displayName: az functionapp config container
+          items: []
+        - name: hostname
+          uid: az_functionapp_config_hostname
+          displayName: az functionapp config hostname
+          items: []
+        - name: ssl
+          uid: az_functionapp_config_ssl
+          displayName: az functionapp config ssl
+          items: []
+      - name: cors
+        uid: az_functionapp_cors
+        displayName: az functionapp cors
+        items: []
+      - name: deployment
+        items:
+        - name: Summary
+          uid: az_functionapp_deployment
+          displayName: az functionapp deployment
+        - name: container
+          uid: az_functionapp_deployment_container
+          displayName: az functionapp deployment container
+          items: []
+        - name: slot
+          uid: az_functionapp_deployment_slot
+          displayName: az functionapp deployment slot
+          items: []
+        - name: source
+          uid: az_functionapp_deployment_source
+          displayName: az functionapp deployment source
+          items: []
+        - name: user
+          uid: az_functionapp_deployment_user
+          displayName: az functionapp deployment user
+          items: []
+      - name: devops-pipeline
+        uid: az_functionapp_devops-pipeline
+        displayName: az functionapp devops-pipeline
+        items: []
+      - name: function
+        items:
+        - name: Summary
+          uid: az_functionapp_function
+          displayName: az functionapp function
+        - name: keys
+          uid: az_functionapp_function_keys
+          displayName: az functionapp function keys
+          items: []
+      - name: hybrid-connection
+        uid: az_functionapp_hybrid-connection
+        displayName: az functionapp hybrid-connection
+        items: []
+      - name: identity
+        uid: az_functionapp_identity
+        displayName: az functionapp identity
+        items: []
+      - name: keys
+        uid: az_functionapp_keys
+        displayName: az functionapp keys
+        items: []
+      - name: log
+        items:
+        - name: Summary
+          uid: az_functionapp_log
+          displayName: az functionapp log
+        - name: deployment
+          uid: az_functionapp_log_deployment
+          displayName: az functionapp log deployment
+          items: []
+      - name: plan
+        uid: az_functionapp_plan
+        displayName: az functionapp plan
+        items: []
+      - name: vnet-integration
+        uid: az_functionapp_vnet-integration
+        displayName: az functionapp vnet-integration
+        items: []
+  - name: Azure HDInsight
     items:
-    - name: Overview
-      uid: az_group
-      displayName: az group
-    - name: create
-      uid: az_group_create
-      displayName: az group create
-    - name: delete
-      uid: az_group_delete
-      displayName: az group delete
-    - name: exists
-      uid: az_group_exists
-      displayName: az group exists
-    - name: export
-      uid: az_group_export
-      displayName: az group export
-    - name: list
-      uid: az_group_list
-      displayName: az group list
-    - name: show
-      uid: az_group_show
-      displayName: az group show
-    - name: update
-      uid: az_group_update
-      displayName: az group update
-    - name: wait
-      uid: az_group_wait
-      displayName: az group wait
-    - name: Deployments
-      displayName: az group deployment
-      items:
-      - name: Overview
-        uid: az_group_deployment
-        displayName: az group deployment
-      - name: cancel
-        uid: az_group_deployment_cancel
-        displayName: az group deployment cancel
-      - name: create
-        uid: az_group_deployment_create
-        displayName: az group deployment create
-      - name: delete
-        uid: az_group_deployment_delete
-        displayName: az group deployment delete
-      - name: export
-        uid: az_group_deployment_export
-        displayName: az group deployment export
-      - name: list
-        uid: az_group_deployment_list
-        displayName: az group deployment list
-      - name: show
-        uid: az_group_deployment_show
-        displayName: az group deployment show
-      - name: validate
-        uid: az_group_deployment_validate
-        displayName: az group deployment validate
-      - name: wait
-        uid: az_group_deployment_wait
-        displayName: az group deployment wait
-      - name: Operations
-        displayName: az group deployment operation
-        items:
-        - name: Overview
-          uid: az_group_deployment_operation
-          displayName: az group deployment operation
-        - name: list
-          uid: az_group_deployment_operation_list
-          displayName: az group deployment operation list
-        - name: show
-          uid: az_group_deployment_operation_show
-          displayName: az group deployment operation show
-    - name: lock
-      displayName: az group lock
-      items:
-      - name: Overview
-        uid: az_group_lock
-        displayName: az group lock
-      - name: create
-        uid: az_group_lock_create
-        displayName: az group lock create
-      - name: delete
-        uid: az_group_lock_delete
-        displayName: az group lock delete
-      - name: list
-        uid: az_group_lock_list
-        displayName: az group lock list
-      - name: show
-        uid: az_group_lock_show
-        displayName: az group lock show
-      - name: update
-        uid: az_group_lock_update
-        displayName: az group lock update
-  - name: Resource policies
-    displayName: az policy
+    - name: Summary
+      uid: sp-Azure_HDInsight
+      displayName: Azure HDInsight
+    - name: hdinsight
+      items:
+      - name: Summary
+        uid: az_hdinsight
+        displayName: az hdinsight
+      - name: application
+        uid: az_hdinsight_application
+        displayName: az hdinsight application
+        items: []
+      - name: autoscale
+        items:
+        - name: Summary
+          uid: az_hdinsight_autoscale
+          displayName: az hdinsight autoscale
+        - name: condition
+          uid: az_hdinsight_autoscale_condition
+          displayName: az hdinsight autoscale condition
+          items: []
+      - name: host
+        uid: az_hdinsight_host
+        displayName: az hdinsight host
+        items: []
+      - name: monitor
+        uid: az_hdinsight_monitor
+        displayName: az hdinsight monitor
+        items: []
+      - name: script-action
+        uid: az_hdinsight_script-action
+        displayName: az hdinsight script-action
+        items: []
+  - name: Azure HPC Cache
     items:
-    - name: Overview
-      uid: az_policy
-      displayName: az policy
-    - name: Assignments
-      displayName: az policy assignment
+    - name: Summary
+      uid: sp-Azure_HPC_Cache
+      displayName: Azure HPC Cache
+    - name: hpc-cache
       items:
-      - name: Overview
-        uid: az_policy_assignment
-        displayName: az policy assignment
-      - name: create
-        uid: az_policy_assignment_create
-        displayName: az policy assignment create
-      - name: delete
-        uid: az_policy_assignment_delete
-        displayName: az policy assignment delete
-      - name: list
-        uid: az_policy_assignment_list
-        displayName: az policy assignment list
-      - name: show
-        uid: az_policy_assignment_show
-        displayName: az policy assignment show
-    - name: Definitions
-      displayName: az policy definition
+      - name: Summary
+        uid: az_hpc-cache
+        displayName: az hpc-cache
+      - name: blob-storage-target
+        uid: az_hpc-cache_blob-storage-target
+        displayName: az hpc-cache blob-storage-target
+        items: []
+      - name: nfs-storage-target
+        uid: az_hpc-cache_nfs-storage-target
+        displayName: az hpc-cache nfs-storage-target
+        items: []
+      - name: skus
+        uid: az_hpc-cache_skus
+        displayName: az hpc-cache skus
+        items: []
+      - name: storage-target
+        uid: az_hpc-cache_storage-target
+        displayName: az hpc-cache storage-target
+        items: []
+      - name: usage-model
+        uid: az_hpc-cache_usage-model
+        displayName: az hpc-cache usage-model
+        items: []
+  - name: Azure IoT
+    items:
+    - name: Summary
+      uid: sp-Azure_IoT
+      displayName: Azure IoT
+    - name: iot
       items:
-      - name: Overview
-        uid: az_policy_definition
-        displayName: az policy definition
-      - name: create
-        uid: az_policy_definition_create
-        displayName: az policy definition create
-      - name: delete
-        uid: az_policy_definition_delete
-        displayName: az policy definition delete
-      - name: list
-        uid: az_policy_definition_list
-        displayName: az policy definition list
-      - name: show
-        uid: az_policy_definition_show
-        displayName: az policy definition show
-      - name: update
-        uid: az_policy_definition_update
-        displayName: az policy definition update
-  - name: Resource providers
-    displayName: az provider
+      - name: Summary
+        uid: az_iot
+        displayName: az iot
+      - name: central
+        items:
+        - name: Summary
+          uid: az_iot_central
+          displayName: az iot central
+        - name: api-token
+          uid: az_iot_central_api-token
+          displayName: az iot central api-token
+          items: []
+        - name: app
+          uid: az_iot_central_app
+          displayName: az iot central app
+          items: []
+        - name: device
+          items:
+          - name: Summary
+            uid: az_iot_central_device
+            displayName: az iot central device
+          - name: command
+            uid: az_iot_central_device_command
+            displayName: az iot central device command
+            items: []
+          - name: twin
+            uid: az_iot_central_device_twin
+            displayName: az iot central device twin
+            items: []
+        - name: device-template
+          uid: az_iot_central_device-template
+          displayName: az iot central device-template
+          items: []
+        - name: diagnostics
+          uid: az_iot_central_diagnostics
+          displayName: az iot central diagnostics
+          items: []
+        - name: user
+          uid: az_iot_central_user
+          displayName: az iot central user
+          items: []
+      - name: device
+        items:
+        - name: Summary
+          uid: az_iot_device
+          displayName: az iot device
+        - name: c2d-message
+          uid: az_iot_device_c2d-message
+          displayName: az iot device c2d-message
+          items: []
+      - name: dps
+        items:
+        - name: Summary
+          uid: az_iot_dps
+          displayName: az iot dps
+        - name: access-policy
+          uid: az_iot_dps_access-policy
+          displayName: az iot dps access-policy
+          items: []
+        - name: certificate
+          uid: az_iot_dps_certificate
+          displayName: az iot dps certificate
+          items: []
+        - name: enrollment
+          uid: az_iot_dps_enrollment
+          displayName: az iot dps enrollment
+          items: []
+        - name: enrollment-group
+          uid: az_iot_dps_enrollment-group
+          displayName: az iot dps enrollment-group
+          items: []
+        - name: linked-hub
+          uid: az_iot_dps_linked-hub
+          displayName: az iot dps linked-hub
+          items: []
+        - name: registration
+          uid: az_iot_dps_registration
+          displayName: az iot dps registration
+          items: []
+      - name: edge
+        items:
+        - name: Summary
+          uid: az_iot_edge
+          displayName: az iot edge
+        - name: deployment
+          uid: az_iot_edge_deployment
+          displayName: az iot edge deployment
+          items: []
+      - name: hub
+        items:
+        - name: Summary
+          uid: az_iot_hub
+          displayName: az iot hub
+        - name: certificate
+          uid: az_iot_hub_certificate
+          displayName: az iot hub certificate
+          items: []
+        - name: configuration
+          uid: az_iot_hub_configuration
+          displayName: az iot hub configuration
+          items: []
+        - name: connection-string
+          uid: az_iot_hub_connection-string
+          displayName: az iot hub connection-string
+          items: []
+        - name: consumer-group
+          uid: az_iot_hub_consumer-group
+          displayName: az iot hub consumer-group
+          items: []
+        - name: device-identity
+          items:
+          - name: Summary
+            uid: az_iot_hub_device-identity
+            displayName: az iot hub device-identity
+          - name: children
+            uid: az_iot_hub_device-identity_children
+            displayName: az iot hub device-identity children
+            items: []
+          - name: connection-string
+            uid: az_iot_hub_device-identity_connection-string
+            displayName: az iot hub device-identity connection-string
+            items: []
+          - name: parent
+            uid: az_iot_hub_device-identity_parent
+            displayName: az iot hub device-identity parent
+            items: []
+        - name: device-twin
+          uid: az_iot_hub_device-twin
+          displayName: az iot hub device-twin
+          items: []
+        - name: digital-twin
+          uid: az_iot_hub_digital-twin
+          displayName: az iot hub digital-twin
+          items: []
+        - name: distributed-tracing
+          uid: az_iot_hub_distributed-tracing
+          displayName: az iot hub distributed-tracing
+          items: []
+        - name: identity
+          uid: az_iot_hub_identity
+          displayName: az iot hub identity
+          items: []
+        - name: job
+          uid: az_iot_hub_job
+          displayName: az iot hub job
+          items: []
+        - name: module-identity
+          items:
+          - name: Summary
+            uid: az_iot_hub_module-identity
+            displayName: az iot hub module-identity
+          - name: connection-string
+            uid: az_iot_hub_module-identity_connection-string
+            displayName: az iot hub module-identity connection-string
+            items: []
+        - name: module-twin
+          uid: az_iot_hub_module-twin
+          displayName: az iot hub module-twin
+          items: []
+        - name: policy
+          uid: az_iot_hub_policy
+          displayName: az iot hub policy
+          items: []
+        - name: route
+          uid: az_iot_hub_route
+          displayName: az iot hub route
+          items: []
+        - name: routing-endpoint
+          uid: az_iot_hub_routing-endpoint
+          displayName: az iot hub routing-endpoint
+          items: []
+      - name: product
+        items:
+        - name: Summary
+          uid: az_iot_product
+          displayName: az iot product
+        - name: requirement
+          uid: az_iot_product_requirement
+          displayName: az iot product requirement
+          items: []
+        - name: test
+          items:
+          - name: Summary
+            uid: az_iot_product_test
+            displayName: az iot product test
+          - name: case
+            uid: az_iot_product_test_case
+            displayName: az iot product test case
+            items: []
+          - name: run
+            uid: az_iot_product_test_run
+            displayName: az iot product test run
+            items: []
+          - name: task
+            uid: az_iot_product_test_task
+            displayName: az iot product test task
+            items: []
+  - name: Azure Key Vault
     items:
-    - name: Overview
-      uid: az_provider
-      displayName: az provider
-    - name: list
-      uid: az_provider_list
-      displayName: az provider list
-    - name: register
-      uid: az_provider_register
-      displayName: az provider register
-    - name: show
-      uid: az_provider_show
-      displayName: az provider show
-    - name: unregister
-      uid: az_provider_unregister
-      displayName: az provider unregister
-    - name: operation
-      displayName: az provider operation
+    - name: Summary
+      uid: sp-Azure_Key_Vault
+      displayName: Azure Key Vault
+    - name: keyvault
       items:
-      - name: Overview
-        uid: az_provider_operation
-        displayName: az provider operation
-      - name: list
-        uid: az_provider_operation_list
-        displayName: az provider operation list
-      - name: show
-        uid: az_provider_operation_show
-        displayName: az provider operation show
-  - name: Resource tags
-    displayName: az tag
+      - name: Summary
+        uid: az_keyvault
+        displayName: az keyvault
+      - name: certificate
+        items:
+        - name: Summary
+          uid: az_keyvault_certificate
+          displayName: az keyvault certificate
+        - name: contact
+          uid: az_keyvault_certificate_contact
+          displayName: az keyvault certificate contact
+          items: []
+        - name: issuer
+          items:
+          - name: Summary
+            uid: az_keyvault_certificate_issuer
+            displayName: az keyvault certificate issuer
+          - name: admin
+            uid: az_keyvault_certificate_issuer_admin
+            displayName: az keyvault certificate issuer admin
+            items: []
+        - name: pending
+          uid: az_keyvault_certificate_pending
+          displayName: az keyvault certificate pending
+          items: []
+      - name: key
+        uid: az_keyvault_key
+        displayName: az keyvault key
+        items: []
+      - name: secret
+        uid: az_keyvault_secret
+        displayName: az keyvault secret
+        items: []
+  - name: Azure Kubernetes Configuration Service
     items:
-    - name: Overview
-      uid: az_tag
-      displayName: az tag
-    - name: add-value
-      uid: az_tag_add_value
-      displayName: az tag add-value
-    - name: create
-      uid: az_tag_create
-      displayName: az tag create
-    - name: delete
-      uid: az_tag_delete
-      displayName: az tag delete
-    - name: list
-      uid: az_tag_list
-      displayName: az tag list
-    - name: remove-value
-      uid: az_tag_remove_value
-      displayName: az tag remove-value
-  - name: Resources
-    displayName: az resource
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Configuration_Service
+      displayName: Azure Kubernetes Configuration Service
+    - name: k8sconfiguration
+      uid: az_k8sconfiguration
+      displayName: az k8sconfiguration
+      items: []
+    - name: k8s-configuration
+      uid: az_k8s-configuration
+      displayName: az k8s-configuration
+      items: []
+  - name: Azure Kubernetes Extension Service
     items:
-    - name: Overview
-      uid: az_resource
-      displayName: az resource
-    - name: create
-      uid: az_resource_create
-      displayName: az resource create
-    - name: delete
-      uid: az_resource_delete
-      displayName: az resource delete
-    - name: invoke-action
-      uid: az_resource_invoke_action
-      displayName: az resource invoke-action
-    - name: list
-      uid: az_resource_list
-      displayName: az resource list
-    - name: move
-      uid: az_resource_move
-      displayName: az resource move
-    - name: show
-      uid: az_resource_show
-      displayName: az resource show
-    - name: tag
-      uid: az_resource_tag
-      displayName: az resource tag
-    - name: update
-      uid: az_resource_update
-      displayName: az resource update
-    - name: wait
-      uid: az_resource_wait
-      displayName: az resource wait
-    - name: Links
-      displayName: az resource link
-      items:
-      - name: Overview
-        uid: az_resource_link
-        displayName: az resource link
-      - name: create
-        uid: az_resource_link_create
-        displayName: az resource link create
-      - name: delete
-        uid: az_resource_link_delete
-        displayName: az resource link delete
-      - name: list
-        uid: az_resource_link_list
-        displayName: az resource link list
-      - name: show
-        uid: az_resource_link_show
-        displayName: az resource link show
-      - name: update
-        uid: az_resource_link_update
-        displayName: az resource link update
-    - name: lock
-      displayName: az resource lock
-      items:
-      - name: Overview
-        uid: az_resource_lock
-        displayName: az resource lock
-      - name: create
-        uid: az_resource_lock_create
-        displayName: az resource lock create
-      - name: delete
-        uid: az_resource_lock_delete
-        displayName: az resource lock delete
-      - name: list
-        uid: az_resource_lock_list
-        displayName: az resource lock list
-      - name: show
-        uid: az_resource_lock_show
-        displayName: az resource lock show
-      - name: update
-        uid: az_resource_lock_update
-        displayName: az resource lock update
-  - name: Roles
-    displayName: az role
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Extension_Service
+      displayName: Azure Kubernetes Extension Service
+    - name: k8s-extension
+      uid: az_k8s-extension
+      displayName: az k8s-extension
+      items: []
+  - name: Azure Kubernetes Service
     items:
-    - name: Overview
-      uid: az_role
-      displayName: az role
-    - name: Assignments
-      displayName: az role assignment
-      items:
-      - name: Overview
-        uid: az_role_assignment
-        displayName: az role assignment
-      - name: create
-        uid: az_role_assignment_create
-        displayName: az role assignment create
-      - name: delete
-        uid: az_role_assignment_delete
-        displayName: az role assignment delete
-      - name: list
-        uid: az_role_assignment_list
-        displayName: az role assignment list
-      - name: list-changelogs
-        uid: az_role_assignment_list_changelogs
-        displayName: az role assignment list-changelogs
-    - name: Definitions
-      displayName: az role definition
+    - name: Summary
+      uid: sp-Azure_Kubernetes_Service
+      displayName: Azure Kubernetes Service
+    - name: aks
       items:
-      - name: Overview
-        uid: az_role_definition
-        displayName: az role definition
-      - name: create
-        uid: az_role_definition_create
-        displayName: az role definition create
-      - name: delete
-        uid: az_role_definition_delete
-        displayName: az role definition delete
-      - name: list
-        uid: az_role_definition_list
-        displayName: az role definition list
-      - name: update
-        uid: az_role_definition_update
-        displayName: az role definition update
-  - name: Storage
-    displayName: az storage
+      - name: Summary
+        uid: az_aks
+        displayName: az aks
+      - name: app
+        uid: az_aks_app
+        displayName: az aks app
+        items: []
+      - name: command
+        uid: az_aks_command
+        displayName: az aks command
+        items: []
+      - name: maintenanceconfiguration
+        uid: az_aks_maintenanceconfiguration
+        displayName: az aks maintenanceconfiguration
+        items: []
+      - name: nodepool
+        uid: az_aks_nodepool
+        displayName: az aks nodepool
+        items: []
+      - name: pod-identity
+        items:
+        - name: Summary
+          uid: az_aks_pod-identity
+          displayName: az aks pod-identity
+        - name: exception
+          uid: az_aks_pod-identity_exception
+          displayName: az aks pod-identity exception
+          items: []
+    - name: connectedk8s
+      uid: az_connectedk8s
+      displayName: az connectedk8s
+      items: []
+  - name: Azure Lab Services
     items:
-    - name: Overview
-      uid: az_storage
-      displayName: az storage
-    - name: copy
-      uid: az_storage_copy
-      displayName: az storage copy
-    - name: remove
-      uid: az_storage_remove
-      displayName: az storage remove
-    - name: Accounts
-      displayName: az storage account
+    - name: Summary
+      uid: sp-Azure_Lab_Services
+      displayName: Azure Lab Services
+    - name: hack
+      uid: az_hack
+      displayName: az hack
+      items: []
+  - name: Azure Logic Apps
+    items:
+    - name: Summary
+      uid: sp-Azure_Logic_Apps
+      displayName: Azure Logic Apps
+    - name: logic
       items:
-      - name: Overview
-        uid: az_storage_account
-        displayName: az storage account
-      - name: check-name
-        uid: az_storage_account_check_name
-        displayName: az storage account check-name
-      - name: create
-        uid: az_storage_account_create
-        displayName: az storage account create
-      - name: delete
-        uid: az_storage_account_delete
-        displayName: az storage account delete
-      - name: generate-sas
-        uid: az_storage_account_generate_sas
-        displayName: az storage account generate-sas
-      - name: list
-        uid: az_storage_account_list
-        displayName: az storage account list
-      - name: show
-        uid: az_storage_account_show
-        displayName: az storage account show
-      - name: show-connection-string
-        uid: az_storage_account_show_connection_string
-        displayName: az storage account show-connection-string
-      - name: show-usage
-        uid: az_storage_account_show_usage
-        displayName: az storage account show-usage
-      - name: update
-        uid: az_storage_account_update
-        displayName: az storage account update
-      - name: Keys
-        displayName: az storage account keys
-        items:
-        - name: Overview
-          uid: az_storage_account_keys
-          displayName: az storage account keys
-        - name: list
-          uid: az_storage_account_keys_list
-          displayName: az storage account keys list
-        - name: renew
-          uid: az_storage_account_keys_renew
-          displayName: az storage account keys renew
-      - name: network-rule
-        displayName: az storage account network-rule
-        items:
-        - name: Overview
-          uid: az_storage_account_network_rule
-          displayName: az storage account network-rule
-        - name: add
-          uid: az_storage_account_network_rule_add
-          displayName: az storage account network-rule add
-        - name: list
-          uid: az_storage_account_network_rule_list
-          displayName: az storage account network-rule list
-        - name: remove
-          uid: az_storage_account_network_rule_remove
-          displayName: az storage account network-rule remove
-    - name: Blob
-      displayName: az storage blob
+      - name: Summary
+        uid: az_logic
+        displayName: az logic
+      - name: integration-account
+        uid: az_logic_integration-account
+        displayName: az logic integration-account
+        items: []
+      - name: workflow
+        uid: az_logic_workflow
+        displayName: az logic workflow
+        items: []
+  - name: Azure Machine Learning
+    items:
+    - name: Summary
+      uid: sp-Azure_Machine_Learning
+      displayName: Azure Machine Learning
+    - name: ml
       items:
-      - name: Overview
-        uid: az_storage_blob
-        displayName: az storage blob
-      - name: delete
-        uid: az_storage_blob_delete
-        displayName: az storage blob delete
-      - name: delete-batch
-        uid: az_storage_blob_delete_batch
-        displayName: az storage blob delete-batch
-      - name: download
-        uid: az_storage_blob_download
-        displayName: az storage blob download
-      - name: download-batch
-        uid: az_storage_blob_download_batch
-        displayName: az storage blob download-batch
-      - name: exists
-        uid: az_storage_blob_exists
-        displayName: az storage blob exists
-      - name: generate-sas
-        uid: az_storage_blob_generate_sas
-        displayName: az storage blob generate-sas
-      - name: list
-        uid: az_storage_blob_list
-        displayName: az storage blob list
-      - name: set-tier
-        uid: az_storage_blob_set_tier
-        displayName: az storage blob set-tier
-      - name: show
-        uid: az_storage_blob_show
-        displayName: az storage blob show
-      - name: snapshot
-        uid: az_storage_blob_snapshot
-        displayName: az storage blob snapshot
-      - name: sync
-        uid: az_storage_blob_sync
-        displayName: az storage blob sync
-      - name: undelete
-        uid: az_storage_blob_undelete
-        displayName: az storage blob undelete
-      - name: update
-        uid: az_storage_blob_update
-        displayName: az storage blob update
-      - name: upload
-        uid: az_storage_blob_upload
-        displayName: az storage blob upload
-      - name: upload-batch
-        uid: az_storage_blob_upload_batch
-        displayName: az storage blob upload-batch
-      - name: url
-        uid: az_storage_blob_url
-        displayName: az storage blob url
-      - name: Copy operations
-        displayName: az storage blob copy
-        items:
-        - name: Overview
-          uid: az_storage_blob_copy
-          displayName: az storage blob copy
-        - name: cancel
-          uid: az_storage_blob_copy_cancel
-          displayName: az storage blob copy cancel
-        - name: start
-          uid: az_storage_blob_copy_start
-          displayName: az storage blob copy start
-        - name: start-batch
-          uid: az_storage_blob_copy_start_batch
-          displayName: az storage blob copy start-batch
-      - name: Leases
-        displayName: az storage blob lease
-        items:
-        - name: Overview
-          uid: az_storage_blob_lease
-          displayName: az storage blob lease
-        - name: acquire
-          uid: az_storage_blob_lease_acquire
-          displayName: az storage blob lease acquire
-        - name: break
-          uid: az_storage_blob_lease_break
-          displayName: az storage blob lease break
-        - name: change
-          uid: az_storage_blob_lease_change
-          displayName: az storage blob lease change
-        - name: release
-          uid: az_storage_blob_lease_release
-          displayName: az storage blob lease release
-        - name: renew
-          uid: az_storage_blob_lease_renew
-          displayName: az storage blob lease renew
-      - name: Metadata
-        displayName: az storage blob metadata
-        items:
-        - name: Overview
-          uid: az_storage_blob_metadata
-          displayName: az storage blob metadata
-        - name: show
-          uid: az_storage_blob_metadata_show
-          displayName: az storage blob metadata show
-        - name: update
-          uid: az_storage_blob_metadata_update
-          displayName: az storage blob metadata update
-      - name: Service properties
-        displayName: az storage blob service-properties
-        items:
-        - name: Overview
-          uid: az_storage_blob_service_properties
-          displayName: az storage blob service-properties
-        - name: show
-          uid: az_storage_blob_service_properties_show
-          displayName: az storage blob service-properties show
-        - name: update
-          uid: az_storage_blob_service_properties_update
-          displayName: az storage blob service-properties update
-        - name: delete-policy
-          displayName: az storage blob service-properties delete-policy
-          items:
-          - name: Overview
-            uid: az_storage_blob_service_properties_delete_policy
-            displayName: az storage blob service-properties delete-policy
-          - name: show
-            uid: az_storage_blob_service_properties_delete_policy_show
-            displayName: az storage blob service-properties delete-policy show
-          - name: update
-            uid: az_storage_blob_service_properties_delete_policy_update
-            displayName: az storage blob service-properties delete-policy update
-      - name: incremental-copy
-        displayName: az storage blob incremental-copy
-        items:
-        - name: Overview
-          uid: az_storage_blob_incremental_copy
-          displayName: az storage blob incremental-copy
-        - name: cancel
-          uid: az_storage_blob_incremental_copy_cancel
-          displayName: az storage blob incremental-copy cancel
-        - name: start
-          uid: az_storage_blob_incremental_copy_start
-          displayName: az storage blob incremental-copy start
-    - name: Containers
-      displayName: az storage container
+      - name: Summary
+        uid: az_ml
+        displayName: az ml
+      - name: code
+        uid: az_ml_code
+        displayName: az ml code
+        items: []
+      - name: compute
+        uid: az_ml_compute
+        displayName: az ml compute
+        items: []
+      - name: data
+        uid: az_ml_data
+        displayName: az ml data
+        items: []
+      - name: datastore
+        uid: az_ml_datastore
+        displayName: az ml datastore
+        items: []
+      - name: endpoint
+        uid: az_ml_endpoint
+        displayName: az ml endpoint
+        items: []
+      - name: environment
+        uid: az_ml_environment
+        displayName: az ml environment
+        items: []
+      - name: job
+        uid: az_ml_job
+        displayName: az ml job
+        items: []
+      - name: model
+        uid: az_ml_model
+        displayName: az ml model
+        items: []
+      - name: workspace
+        uid: az_ml_workspace
+        displayName: az ml workspace
+        items: []
+    - name: ml(v1)
       items:
-      - name: Overview
-        uid: az_storage_container
-        displayName: az storage container
-      - name: create
-        uid: az_storage_container_create
-        displayName: az storage container create
-      - name: delete
-        uid: az_storage_container_delete
-        displayName: az storage container delete
-      - name: exists
-        uid: az_storage_container_exists
-        displayName: az storage container exists
-      - name: generate-sas
-        uid: az_storage_container_generate_sas
-        displayName: az storage container generate-sas
-      - name: list
-        uid: az_storage_container_list
-        displayName: az storage container list
-      - name: set-permission
-        uid: az_storage_container_set_permission
-        displayName: az storage container set-permission
-      - name: show
-        uid: az_storage_container_show
-        displayName: az storage container show
-      - name: show-permission
-        uid: az_storage_container_show_permission
-        displayName: az storage container show-permission
-      - name: Leases
-        displayName: az storage container lease
-        items:
-        - name: Overview
-          uid: az_storage_container_lease
-          displayName: az storage container lease
-        - name: acquire
-          uid: az_storage_container_lease_acquire
-          displayName: az storage container lease acquire
-        - name: break
-          uid: az_storage_container_lease_break
-          displayName: az storage container lease break
-        - name: change
-          uid: az_storage_container_lease_change
-          displayName: az storage container lease change
-        - name: release
-          uid: az_storage_container_lease_release
-          displayName: az storage container lease release
-        - name: renew
-          uid: az_storage_container_lease_renew
-          displayName: az storage container lease renew
-      - name: Metadata
-        displayName: az storage container metadata
-        items:
-        - name: Overview
-          uid: az_storage_container_metadata
-          displayName: az storage container metadata
-        - name: show
-          uid: az_storage_container_metadata_show
-          displayName: az storage container metadata show
-        - name: update
-          uid: az_storage_container_metadata_update
-          displayName: az storage container metadata update
-      - name: Policies
-        displayName: az storage container policy
+      - name: Summary
+        uid: az_ml(v1)
+        displayName: az ml
+      - name: computetarget
         items:
-        - name: Overview
-          uid: az_storage_container_policy
-          displayName: az storage container policy
+        - name: Summary
+          uid: az_ml(v1)_computetarget
+          displayName: az ml computetarget
+        - name: amlcompute
+          items:
+          - name: Summary
+            uid: az_ml(v1)_computetarget_amlcompute
+            displayName: az ml computetarget amlcompute
+          - name: identity
+            uid: az_ml(v1)_computetarget_amlcompute_identity
+            displayName: az ml computetarget amlcompute identity
+            items: []
+        - name: attach
+          uid: az_ml(v1)_computetarget_attach
+          displayName: az ml computetarget attach
+          items: []
+        - name: computeinstance
+          uid: az_ml(v1)_computetarget_computeinstance
+          displayName: az ml computetarget computeinstance
+          items: []
         - name: create
-          uid: az_storage_container_policy_create
-          displayName: az storage container policy create
-        - name: delete
-          uid: az_storage_container_policy_delete
-          displayName: az storage container policy delete
-        - name: list
-          uid: az_storage_container_policy_list
-          displayName: az storage container policy list
-        - name: show
-          uid: az_storage_container_policy_show
-          displayName: az storage container policy show
-        - name: update
-          uid: az_storage_container_policy_update
-          displayName: az storage container policy update
-    - name: Cross-origin resource sharing
-      displayName: az storage cors
-      items:
-      - name: Overview
-        uid: az_storage_cors
-        displayName: az storage cors
-      - name: add
-        uid: az_storage_cors_add
-        displayName: az storage cors add
-      - name: clear
-        uid: az_storage_cors_clear
-        displayName: az storage cors clear
-      - name: list
-        uid: az_storage_cors_list
-        displayName: az storage cors list
-    - name: Directories
-      displayName: az storage directory
-      items:
-      - name: Overview
-        uid: az_storage_directory
-        displayName: az storage directory
-      - name: create
-        uid: az_storage_directory_create
-        displayName: az storage directory create
-      - name: delete
-        uid: az_storage_directory_delete
-        displayName: az storage directory delete
-      - name: exists
-        uid: az_storage_directory_exists
-        displayName: az storage directory exists
-      - name: list
-        uid: az_storage_directory_list
-        displayName: az storage directory list
-      - name: show
-        uid: az_storage_directory_show
-        displayName: az storage directory show
-      - name: Metadata
-        displayName: az storage directory metadata
-        items:
-        - name: Overview
-          uid: az_storage_directory_metadata
-          displayName: az storage directory metadata
-        - name: show
-          uid: az_storage_directory_metadata_show
-          displayName: az storage directory metadata show
-        - name: update
-          uid: az_storage_directory_metadata_update
-          displayName: az storage directory metadata update
-    - name: File shares
-      displayName: az storage share
-      items:
-      - name: Overview
-        uid: az_storage_share
-        displayName: az storage share
-      - name: create
-        uid: az_storage_share_create
-        displayName: az storage share create
-      - name: delete
-        uid: az_storage_share_delete
-        displayName: az storage share delete
-      - name: exists
-        uid: az_storage_share_exists
-        displayName: az storage share exists
-      - name: generate-sas
-        uid: az_storage_share_generate_sas
-        displayName: az storage share generate-sas
-      - name: list
-        uid: az_storage_share_list
-        displayName: az storage share list
-      - name: show
-        uid: az_storage_share_show
-        displayName: az storage share show
-      - name: snapshot
-        uid: az_storage_share_snapshot
-        displayName: az storage share snapshot
-      - name: stats
-        uid: az_storage_share_stats
-        displayName: az storage share stats
-      - name: update
-        uid: az_storage_share_update
-        displayName: az storage share update
-      - name: url
-        uid: az_storage_share_url
-        displayName: az storage share url
-      - name: Metadata
-        displayName: az storage share metadata
-        items:
-        - name: Overview
-          uid: az_storage_share_metadata
-          displayName: az storage share metadata
-        - name: show
-          uid: az_storage_share_metadata_show
-          displayName: az storage share metadata show
+          uid: az_ml(v1)_computetarget_create
+          displayName: az ml computetarget create
+          items: []
         - name: update
-          uid: az_storage_share_metadata_update
-          displayName: az storage share metadata update
-      - name: Policies
-        displayName: az storage share policy
-        items:
-        - name: Overview
-          uid: az_storage_share_policy
-          displayName: az storage share policy
-        - name: create
-          uid: az_storage_share_policy_create
-          displayName: az storage share policy create
-        - name: delete
-          uid: az_storage_share_policy_delete
-          displayName: az storage share policy delete
-        - name: list
-          uid: az_storage_share_policy_list
-          displayName: az storage share policy list
-        - name: show
-          uid: az_storage_share_policy_show
-          displayName: az storage share policy show
-        - name: update
-          uid: az_storage_share_policy_update
-          displayName: az storage share policy update
-    - name: Files
-      displayName: az storage file
-      items:
-      - name: Overview
-        uid: az_storage_file
-        displayName: az storage file
-      - name: delete
-        uid: az_storage_file_delete
-        displayName: az storage file delete
-      - name: delete-batch
-        uid: az_storage_file_delete_batch
-        displayName: az storage file delete-batch
-      - name: download
-        uid: az_storage_file_download
-        displayName: az storage file download
-      - name: download-batch
-        uid: az_storage_file_download_batch
-        displayName: az storage file download-batch
-      - name: exists
-        uid: az_storage_file_exists
-        displayName: az storage file exists
-      - name: generate-sas
-        uid: az_storage_file_generate_sas
-        displayName: az storage file generate-sas
-      - name: list
-        uid: az_storage_file_list
-        displayName: az storage file list
-      - name: resize
-        uid: az_storage_file_resize
-        displayName: az storage file resize
-      - name: show
-        uid: az_storage_file_show
-        displayName: az storage file show
-      - name: update
-        uid: az_storage_file_update
-        displayName: az storage file update
-      - name: upload
-        uid: az_storage_file_upload
-        displayName: az storage file upload
-      - name: upload-batch
-        uid: az_storage_file_upload_batch
-        displayName: az storage file upload-batch
-      - name: url
-        uid: az_storage_file_url
-        displayName: az storage file url
-      - name: Copy operations
-        displayName: az storage file copy
-        items:
-        - name: Overview
-          uid: az_storage_file_copy
-          displayName: az storage file copy
-        - name: cancel
-          uid: az_storage_file_copy_cancel
-          displayName: az storage file copy cancel
-        - name: start
-          uid: az_storage_file_copy_start
-          displayName: az storage file copy start
-        - name: start-batch
-          uid: az_storage_file_copy_start_batch
-          displayName: az storage file copy start-batch
-      - name: Metadata
-        displayName: az storage file metadata
-        items:
-        - name: Overview
-          uid: az_storage_file_metadata
-          displayName: az storage file metadata
-        - name: show
-          uid: az_storage_file_metadata_show
-          displayName: az storage file metadata show
-        - name: update
-          uid: az_storage_file_metadata_update
-          displayName: az storage file metadata update
-    - name: Logging
-      displayName: az storage logging
-      items:
-      - name: Overview
-        uid: az_storage_logging
-        displayName: az storage logging
-      - name: off
-        uid: az_storage_logging_off
-        displayName: az storage logging off
-      - name: show
-        uid: az_storage_logging_show
-        displayName: az storage logging show
-      - name: update
-        uid: az_storage_logging_update
-        displayName: az storage logging update
-    - name: Messages
-      displayName: az storage message
-      items:
-      - name: Overview
-        uid: az_storage_message
-        displayName: az storage message
-      - name: clear
-        uid: az_storage_message_clear
-        displayName: az storage message clear
-      - name: delete
-        uid: az_storage_message_delete
-        displayName: az storage message delete
-      - name: get
-        uid: az_storage_message_get
-        displayName: az storage message get
-      - name: peek
-        uid: az_storage_message_peek
-        displayName: az storage message peek
-      - name: put
-        uid: az_storage_message_put
-        displayName: az storage message put
-      - name: update
-        uid: az_storage_message_update
-        displayName: az storage message update
-    - name: Metrics
-      displayName: az storage metrics
-      items:
-      - name: Overview
-        uid: az_storage_metrics
-        displayName: az storage metrics
-      - name: show
-        uid: az_storage_metrics_show
-        displayName: az storage metrics show
-      - name: update
-        uid: az_storage_metrics_update
-        displayName: az storage metrics update
-    - name: Queues
-      displayName: az storage queue
-      items:
-      - name: Overview
-        uid: az_storage_queue
-        displayName: az storage queue
-      - name: create
-        uid: az_storage_queue_create
-        displayName: az storage queue create
-      - name: delete
-        uid: az_storage_queue_delete
-        displayName: az storage queue delete
-      - name: exists
-        uid: az_storage_queue_exists
-        displayName: az storage queue exists
-      - name: generate-sas
-        uid: az_storage_queue_generate_sas
-        displayName: az storage queue generate-sas
-      - name: list
-        uid: az_storage_queue_list
-        displayName: az storage queue list
-      - name: stats
-        uid: az_storage_queue_stats
-        displayName: az storage queue stats
-      - name: Metadata
-        displayName: az storage queue metadata
-        items:
-        - name: Overview
-          uid: az_storage_queue_metadata
-          displayName: az storage queue metadata
-        - name: show
-          uid: az_storage_queue_metadata_show
-          displayName: az storage queue metadata show
-        - name: update
-          uid: az_storage_queue_metadata_update
-          displayName: az storage queue metadata update
-      - name: Policies
-        displayName: az storage queue policy
-        items:
-        - name: Overview
-          uid: az_storage_queue_policy
-          displayName: az storage queue policy
-        - name: create
-          uid: az_storage_queue_policy_create
-          displayName: az storage queue policy create
-        - name: delete
-          uid: az_storage_queue_policy_delete
-          displayName: az storage queue policy delete
-        - name: list
-          uid: az_storage_queue_policy_list
-          displayName: az storage queue policy list
-        - name: show
-          uid: az_storage_queue_policy_show
-          displayName: az storage queue policy show
-        - name: update
-          uid: az_storage_queue_policy_update
-          displayName: az storage queue policy update
-    - name: Table storage entities
-      displayName: az storage entity
-      items:
-      - name: Overview
-        uid: az_storage_entity
-        displayName: az storage entity
-      - name: delete
-        uid: az_storage_entity_delete
-        displayName: az storage entity delete
-      - name: insert
-        uid: az_storage_entity_insert
-        displayName: az storage entity insert
-      - name: merge
-        uid: az_storage_entity_merge
-        displayName: az storage entity merge
-      - name: query
-        uid: az_storage_entity_query
-        displayName: az storage entity query
-      - name: replace
-        uid: az_storage_entity_replace
-        displayName: az storage entity replace
-      - name: show
-        uid: az_storage_entity_show
-        displayName: az storage entity show
-    - name: Tables
-      displayName: az storage table
-      items:
-      - name: Overview
-        uid: az_storage_table
-        displayName: az storage table
-      - name: create
-        uid: az_storage_table_create
-        displayName: az storage table create
-      - name: delete
-        uid: az_storage_table_delete
-        displayName: az storage table delete
-      - name: exists
-        uid: az_storage_table_exists
-        displayName: az storage table exists
-      - name: generate-sas
-        uid: az_storage_table_generate_sas
-        displayName: az storage table generate-sas
-      - name: list
-        uid: az_storage_table_list
-        displayName: az storage table list
-      - name: stats
-        uid: az_storage_table_stats
-        displayName: az storage table stats
-      - name: Policies
-        displayName: az storage table policy
-        items:
-        - name: Overview
-          uid: az_storage_table_policy
-          displayName: az storage table policy
-        - name: create
-          uid: az_storage_table_policy_create
-          displayName: az storage table policy create
-        - name: delete
-          uid: az_storage_table_policy_delete
-          displayName: az storage table policy delete
-        - name: list
-          uid: az_storage_table_policy_list
-          displayName: az storage table policy list
-        - name: show
-          uid: az_storage_table_policy_show
-          displayName: az storage table policy show
-        - name: update
-          uid: az_storage_table_policy_update
-          displayName: az storage table policy update
-  - name: Subscriptions
-    displayName: az account
-    items:
-    - name: Overview
-      uid: az_account
-      displayName: az account
-    - name: clear
-      uid: az_account_clear
-      displayName: az account clear
-    - name: get-access-token
-      uid: az_account_get_access_token
-      displayName: az account get-access-token
-    - name: list
-      uid: az_account_list
-      displayName: az account list
-    - name: list-locations
-      uid: az_account_list_locations
-      displayName: az account list-locations
-    - name: set
-      uid: az_account_set
-      displayName: az account set
-    - name: show
-      uid: az_account_show
-      displayName: az account show
-    - name: lock
-      displayName: az account lock
-      items:
-      - name: Overview
-        uid: az_account_lock
-        displayName: az account lock
-      - name: create
-        uid: az_account_lock_create
-        displayName: az account lock create
-      - name: delete
-        uid: az_account_lock_delete
-        displayName: az account lock delete
-      - name: list
-        uid: az_account_lock_list
-        displayName: az account lock list
-      - name: show
-        uid: az_account_lock_show
-        displayName: az account lock show
-      - name: update
-        uid: az_account_lock_update
-        displayName: az account lock update
-    - name: management-group
-      displayName: az account management-group
-      items:
-      - name: Overview
-        uid: az_account_management_group
-        displayName: az account management-group
-      - name: create
-        uid: az_account_management_group_create
-        displayName: az account management-group create
-      - name: delete
-        uid: az_account_management_group_delete
-        displayName: az account management-group delete
-      - name: list
-        uid: az_account_management_group_list
-        displayName: az account management-group list
-      - name: show
-        uid: az_account_management_group_show
-        displayName: az account management-group show
-      - name: update
-        uid: az_account_management_group_update
-        displayName: az account management-group update
-      - name: subscription
-        displayName: az account management-group subscription
-        items:
-        - name: Overview
-          uid: az_account_management_group_subscription
-          displayName: az account management-group subscription
-        - name: add
-          uid: az_account_management_group_subscription_add
-          displayName: az account management-group subscription add
-        - name: remove
-          uid: az_account_management_group_subscription_remove
-          displayName: az account management-group subscription remove
-  - name: VM Images
-    displayName: az image
-    items:
-    - name: Overview
-      uid: az_image
-      displayName: az image
-    - name: create
-      uid: az_image_create
-      displayName: az image create
-    - name: delete
-      uid: az_image_delete
-      displayName: az image delete
-    - name: list
-      uid: az_image_list
-      displayName: az image list
-    - name: show
-      uid: az_image_show
-      displayName: az image show
-    - name: update
-      uid: az_image_update
-      displayName: az image update
-    - name: builder
-      displayName: az image builder
-      items:
-      - name: Overview
-        uid: az_image_builder
-        displayName: az image builder
-      - name: create
-        uid: az_image_builder_create
-        displayName: az image builder create
-      - name: delete
-        uid: az_image_builder_delete
-        displayName: az image builder delete
-      - name: list
-        uid: az_image_builder_list
-        displayName: az image builder list
-      - name: run
-        uid: az_image_builder_run
-        displayName: az image builder run
-      - name: show
-        uid: az_image_builder_show
-        displayName: az image builder show
-      - name: show-runs
-        uid: az_image_builder_show_runs
-        displayName: az image builder show-runs
-      - name: update
-        uid: az_image_builder_update
-        displayName: az image builder update
-      - name: wait
-        uid: az_image_builder_wait
-        displayName: az image builder wait
-      - name: customizer
-        displayName: az image builder customizer
-        items:
-        - name: Overview
-          uid: az_image_builder_customizer
-          displayName: az image builder customizer
-        - name: add
-          uid: az_image_builder_customizer_add
-          displayName: az image builder customizer add
-        - name: clear
-          uid: az_image_builder_customizer_clear
-          displayName: az image builder customizer clear
-        - name: remove
-          uid: az_image_builder_customizer_remove
-          displayName: az image builder customizer remove
-      - name: output
-        displayName: az image builder output
-        items:
-        - name: Overview
-          uid: az_image_builder_output
-          displayName: az image builder output
-        - name: add
-          uid: az_image_builder_output_add
-          displayName: az image builder output add
-        - name: clear
-          uid: az_image_builder_output_clear
-          displayName: az image builder output clear
-        - name: remove
-          uid: az_image_builder_output_remove
-          displayName: az image builder output remove
-  - name: VM Scale Sets
-    displayName: az vmss
-    items:
-    - name: Overview
-      uid: az_vmss
-      displayName: az vmss
-    - name: create
-      uid: az_vmss_create
-      displayName: az vmss create
-    - name: deallocate
-      uid: az_vmss_deallocate
-      displayName: az vmss deallocate
-    - name: delete
-      uid: az_vmss_delete
-      displayName: az vmss delete
-    - name: delete-instances
-      uid: az_vmss_delete_instances
-      displayName: az vmss delete-instances
-    - name: get-instance-view
-      uid: az_vmss_get_instance_view
-      displayName: az vmss get-instance-view
-    - name: list
-      uid: az_vmss_list
-      displayName: az vmss list
-    - name: list-instance-connection-info
-      uid: az_vmss_list_instance_connection_info
-      displayName: az vmss list-instance-connection-info
-    - name: list-instance-public-ips
-      uid: az_vmss_list_instance_public_ips
-      displayName: az vmss list-instance-public-ips
-    - name: list-instances
-      uid: az_vmss_list_instances
-      displayName: az vmss list-instances
-    - name: list-skus
-      uid: az_vmss_list_skus
-      displayName: az vmss list-skus
-    - name: perform-maintenance
-      uid: az_vmss_perform_maintenance
-      displayName: az vmss perform-maintenance
-    - name: reimage
-      uid: az_vmss_reimage
-      displayName: az vmss reimage
-    - name: restart
-      uid: az_vmss_restart
-      displayName: az vmss restart
-    - name: scale
-      uid: az_vmss_scale
-      displayName: az vmss scale
-    - name: set-orchestration-service-state
-      uid: az_vmss_set_orchestration_service_state
-      displayName: az vmss set-orchestration-service-state
-    - name: show
-      uid: az_vmss_show
-      displayName: az vmss show
-    - name: start
-      uid: az_vmss_start
-      displayName: az vmss start
-    - name: stop
-      uid: az_vmss_stop
-      displayName: az vmss stop
-    - name: update
-      uid: az_vmss_update
-      displayName: az vmss update
-    - name: update-instances
-      uid: az_vmss_update_instances
-      displayName: az vmss update-instances
-    - name: wait
-      uid: az_vmss_wait
-      displayName: az vmss wait
-    - name: Diagnostics
-      displayName: az vmss diagnostics
-      items:
-      - name: Overview
-        uid: az_vmss_diagnostics
-        displayName: az vmss diagnostics
-      - name: get-default-config
-        uid: az_vmss_diagnostics_get_default_config
-        displayName: az vmss diagnostics get-default-config
-      - name: set
-        uid: az_vmss_diagnostics_set
-        displayName: az vmss diagnostics set
-    - name: Disks
-      displayName: az vmss disk
-      items:
-      - name: Overview
-        uid: az_vmss_disk
-        displayName: az vmss disk
-      - name: attach
-        uid: az_vmss_disk_attach
-        displayName: az vmss disk attach
-      - name: detach
-        uid: az_vmss_disk_detach
-        displayName: az vmss disk detach
-    - name: Extensions
-      displayName: az vmss extension
-      items:
-      - name: Overview
-        uid: az_vmss_extension
-        displayName: az vmss extension
-      - name: delete
-        uid: az_vmss_extension_delete
-        displayName: az vmss extension delete
-      - name: list
-        uid: az_vmss_extension_list
-        displayName: az vmss extension list
-      - name: set
-        uid: az_vmss_extension_set
-        displayName: az vmss extension set
-      - name: show
-        uid: az_vmss_extension_show
-        displayName: az vmss extension show
-      - name: Images
-        displayName: az vmss extension image
-        items:
-        - name: Overview
-          uid: az_vmss_extension_image
-          displayName: az vmss extension image
-        - name: list
-          uid: az_vmss_extension_image_list
-          displayName: az vmss extension image list
-        - name: list-names
-          uid: az_vmss_extension_image_list_names
-          displayName: az vmss extension image list-names
-        - name: list-versions
-          uid: az_vmss_extension_image_list_versions
-          displayName: az vmss extension image list-versions
-        - name: show
-          uid: az_vmss_extension_image_show
-          displayName: az vmss extension image show
-    - name: Network interfaces
-      displayName: az vmss nic
-      items:
-      - name: Overview
-        uid: az_vmss_nic
-        displayName: az vmss nic
-      - name: list
-        uid: az_vmss_nic_list
-        displayName: az vmss nic list
-      - name: list-vm-nics
-        uid: az_vmss_nic_list_vm_nics
-        displayName: az vmss nic list-vm-nics
-      - name: show
-        uid: az_vmss_nic_show
-        displayName: az vmss nic show
-    - name: encryption
-      displayName: az vmss encryption
-      items:
-      - name: Overview
-        uid: az_vmss_encryption
-        displayName: az vmss encryption
-      - name: disable
-        uid: az_vmss_encryption_disable
-        displayName: az vmss encryption disable
-      - name: enable
-        uid: az_vmss_encryption_enable
-        displayName: az vmss encryption enable
-      - name: show
-        uid: az_vmss_encryption_show
-        displayName: az vmss encryption show
-    - name: identity
-      displayName: az vmss identity
-      items:
-      - name: Overview
-        uid: az_vmss_identity
-        displayName: az vmss identity
-      - name: assign
-        uid: az_vmss_identity_assign
-        displayName: az vmss identity assign
-      - name: remove
-        uid: az_vmss_identity_remove
-        displayName: az vmss identity remove
-      - name: show
-        uid: az_vmss_identity_show
-        displayName: az vmss identity show
-    - name: rolling-upgrade
-      displayName: az vmss rolling-upgrade
-      items:
-      - name: Overview
-        uid: az_vmss_rolling_upgrade
-        displayName: az vmss rolling-upgrade
-      - name: cancel
-        uid: az_vmss_rolling_upgrade_cancel
-        displayName: az vmss rolling-upgrade cancel
-      - name: get-latest
-        uid: az_vmss_rolling_upgrade_get_latest
-        displayName: az vmss rolling-upgrade get-latest
-      - name: start
-        uid: az_vmss_rolling_upgrade_start
-        displayName: az vmss rolling-upgrade start
-  - name: VM Snapshots
-    displayName: az snapshot
-    items:
-    - name: Overview
-      uid: az_snapshot
-      displayName: az snapshot
-    - name: create
-      uid: az_snapshot_create
-      displayName: az snapshot create
-    - name: delete
-      uid: az_snapshot_delete
-      displayName: az snapshot delete
-    - name: grant-access
-      uid: az_snapshot_grant_access
-      displayName: az snapshot grant-access
-    - name: list
-      uid: az_snapshot_list
-      displayName: az snapshot list
-    - name: revoke-access
-      uid: az_snapshot_revoke_access
-      displayName: az snapshot revoke-access
-    - name: show
-      uid: az_snapshot_show
-      displayName: az snapshot show
-    - name: update
-      uid: az_snapshot_update
-      displayName: az snapshot update
-    - name: wait
-      uid: az_snapshot_wait
-      displayName: az snapshot wait
-  - name: Virtual Machines
-    displayName: az vm
-    items:
-    - name: Overview
-      uid: az_vm
-      displayName: az vm
-    - name: auto-shutdown
-      uid: az_vm_auto_shutdown
-      displayName: az vm auto-shutdown
-    - name: capture
-      uid: az_vm_capture
-      displayName: az vm capture
-    - name: convert
-      uid: az_vm_convert
-      displayName: az vm convert
-    - name: create
-      uid: az_vm_create
-      displayName: az vm create
-    - name: deallocate
-      uid: az_vm_deallocate
-      displayName: az vm deallocate
-    - name: delete
-      uid: az_vm_delete
-      displayName: az vm delete
-    - name: generalize
-      uid: az_vm_generalize
-      displayName: az vm generalize
-    - name: get-instance-view
-      uid: az_vm_get_instance_view
-      displayName: az vm get-instance-view
-    - name: list
-      uid: az_vm_list
-      displayName: az vm list
-    - name: list-ip-addresses
-      uid: az_vm_list_ip_addresses
-      displayName: az vm list-ip-addresses
-    - name: list-sizes
-      uid: az_vm_list_sizes
-      displayName: az vm list-sizes
-    - name: list-skus
-      uid: az_vm_list_skus
-      displayName: az vm list-skus
-    - name: list-usage
-      uid: az_vm_list_usage
-      displayName: az vm list-usage
-    - name: list-vm-resize-options
-      uid: az_vm_list_vm_resize_options
-      displayName: az vm list-vm-resize-options
-    - name: open-port
-      uid: az_vm_open_port
-      displayName: az vm open-port
-    - name: perform-maintenance
-      uid: az_vm_perform_maintenance
-      displayName: az vm perform-maintenance
-    - name: redeploy
-      uid: az_vm_redeploy
-      displayName: az vm redeploy
-    - name: resize
-      uid: az_vm_resize
-      displayName: az vm resize
-    - name: restart
-      uid: az_vm_restart
-      displayName: az vm restart
-    - name: show
-      uid: az_vm_show
-      displayName: az vm show
-    - name: start
-      uid: az_vm_start
-      displayName: az vm start
-    - name: stop
-      uid: az_vm_stop
-      displayName: az vm stop
-    - name: update
-      uid: az_vm_update
-      displayName: az vm update
-    - name: wait
-      uid: az_vm_wait
-      displayName: az vm wait
-    - name: Availability sets
-      displayName: az vm availability-set
-      items:
-      - name: Overview
-        uid: az_vm_availability_set
-        displayName: az vm availability-set
-      - name: convert
-        uid: az_vm_availability_set_convert
-        displayName: az vm availability-set convert
-      - name: create
-        uid: az_vm_availability_set_create
-        displayName: az vm availability-set create
-      - name: delete
-        uid: az_vm_availability_set_delete
-        displayName: az vm availability-set delete
-      - name: list
-        uid: az_vm_availability_set_list
-        displayName: az vm availability-set list
-      - name: list-sizes
-        uid: az_vm_availability_set_list_sizes
-        displayName: az vm availability-set list-sizes
-      - name: show
-        uid: az_vm_availability_set_show
-        displayName: az vm availability-set show
-      - name: update
-        uid: az_vm_availability_set_update
-        displayName: az vm availability-set update
-    - name: Boot diagnostics
-      displayName: az vm boot-diagnostics
-      items:
-      - name: Overview
-        uid: az_vm_boot_diagnostics
-        displayName: az vm boot-diagnostics
-      - name: disable
-        uid: az_vm_boot_diagnostics_disable
-        displayName: az vm boot-diagnostics disable
-      - name: enable
-        uid: az_vm_boot_diagnostics_enable
-        displayName: az vm boot-diagnostics enable
-      - name: get-boot-log
-        uid: az_vm_boot_diagnostics_get_boot_log
-        displayName: az vm boot-diagnostics get-boot-log
-    - name: Diagnostics
-      displayName: az vm diagnostics
-      items:
-      - name: Overview
-        uid: az_vm_diagnostics
-        displayName: az vm diagnostics
-      - name: get-default-config
-        uid: az_vm_diagnostics_get_default_config
-        displayName: az vm diagnostics get-default-config
-      - name: set
-        uid: az_vm_diagnostics_set
-        displayName: az vm diagnostics set
-    - name: Encryption
-      displayName: az vm encryption
-      items:
-      - name: Overview
-        uid: az_vm_encryption
-        displayName: az vm encryption
-      - name: disable
-        uid: az_vm_encryption_disable
-        displayName: az vm encryption disable
-      - name: enable
-        uid: az_vm_encryption_enable
-        displayName: az vm encryption enable
-      - name: show
-        uid: az_vm_encryption_show
-        displayName: az vm encryption show
-    - name: Extensions
-      displayName: az vm extension
-      items:
-      - name: Overview
-        uid: az_vm_extension
-        displayName: az vm extension
-      - name: delete
-        uid: az_vm_extension_delete
-        displayName: az vm extension delete
-      - name: list
-        uid: az_vm_extension_list
-        displayName: az vm extension list
-      - name: set
-        uid: az_vm_extension_set
-        displayName: az vm extension set
-      - name: show
-        uid: az_vm_extension_show
-        displayName: az vm extension show
-      - name: wait
-        uid: az_vm_extension_wait
-        displayName: az vm extension wait
-      - name: Extension images
-        displayName: az vm extension image
-        items:
-        - name: Overview
-          uid: az_vm_extension_image
-          displayName: az vm extension image
-        - name: list
-          uid: az_vm_extension_image_list
-          displayName: az vm extension image list
-        - name: list-names
-          uid: az_vm_extension_image_list_names
-          displayName: az vm extension image list-names
-        - name: list-versions
-          uid: az_vm_extension_image_list_versions
-          displayName: az vm extension image list-versions
-        - name: show
-          uid: az_vm_extension_image_show
-          displayName: az vm extension image show
-    - name: Images
-      displayName: az vm image
-      items:
-      - name: Overview
-        uid: az_vm_image
-        displayName: az vm image
-      - name: accept-terms
-        uid: az_vm_image_accept_terms
-        displayName: az vm image accept-terms
-      - name: list
-        uid: az_vm_image_list
-        displayName: az vm image list
-      - name: list-offers
-        uid: az_vm_image_list_offers
-        displayName: az vm image list-offers
-      - name: list-publishers
-        uid: az_vm_image_list_publishers
-        displayName: az vm image list-publishers
-      - name: list-skus
-        uid: az_vm_image_list_skus
-        displayName: az vm image list-skus
-      - name: show
-        uid: az_vm_image_show
-        displayName: az vm image show
-      - name: terms
-        displayName: az vm image terms
-        items:
-        - name: Overview
-          uid: az_vm_image_terms
-          displayName: az vm image terms
-        - name: accept
-          uid: az_vm_image_terms_accept
-          displayName: az vm image terms accept
-        - name: cancel
-          uid: az_vm_image_terms_cancel
-          displayName: az vm image terms cancel
-        - name: show
-          uid: az_vm_image_terms_show
-          displayName: az vm image terms show
-    - name: Network interfaces
-      displayName: az vm nic
-      items:
-      - name: Overview
-        uid: az_vm_nic
-        displayName: az vm nic
-      - name: add
-        uid: az_vm_nic_add
-        displayName: az vm nic add
-      - name: list
-        uid: az_vm_nic_list
-        displayName: az vm nic list
-      - name: remove
-        uid: az_vm_nic_remove
-        displayName: az vm nic remove
-      - name: set
-        uid: az_vm_nic_set
-        displayName: az vm nic set
-      - name: show
-        uid: az_vm_nic_show
-        displayName: az vm nic show
-    - name: Storage disks
-      displayName: az vm disk
-      items:
-      - name: Overview
-        uid: az_vm_disk
-        displayName: az vm disk
-      - name: attach
-        uid: az_vm_disk_attach
-        displayName: az vm disk attach
-      - name: detach
-        uid: az_vm_disk_detach
-        displayName: az vm disk detach
-    - name: Unmanaged disks
-      displayName: az vm unmanaged-disk
-      items:
-      - name: Overview
-        uid: az_vm_unmanaged_disk
-        displayName: az vm unmanaged-disk
-      - name: attach
-        uid: az_vm_unmanaged_disk_attach
-        displayName: az vm unmanaged-disk attach
-      - name: detach
-        uid: az_vm_unmanaged_disk_detach
-        displayName: az vm unmanaged-disk detach
-      - name: list
-        uid: az_vm_unmanaged_disk_list
-        displayName: az vm unmanaged-disk list
-    - name: Users
-      displayName: az vm user
-      items:
-      - name: Overview
-        uid: az_vm_user
-        displayName: az vm user
-      - name: delete
-        uid: az_vm_user_delete
-        displayName: az vm user delete
-      - name: reset-ssh
-        uid: az_vm_user_reset_ssh
-        displayName: az vm user reset-ssh
-      - name: update
-        uid: az_vm_user_update
-        displayName: az vm user update
-    - name: identity
-      displayName: az vm identity
-      items:
-      - name: Overview
-        uid: az_vm_identity
-        displayName: az vm identity
-      - name: assign
-        uid: az_vm_identity_assign
-        displayName: az vm identity assign
-      - name: remove
-        uid: az_vm_identity_remove
-        displayName: az vm identity remove
-      - name: show
-        uid: az_vm_identity_show
-        displayName: az vm identity show
-    - name: monitor
-      displayName: az vm monitor
-      items:
-      - name: Overview
-        uid: az_vm_monitor
-        displayName: az vm monitor
-      - name: log
-        displayName: az vm monitor log
-        items:
-        - name: Overview
-          uid: az_vm_monitor_log
-          displayName: az vm monitor log
-        - name: show
-          uid: az_vm_monitor_log_show
-          displayName: az vm monitor log show
-    - name: run-command
-      displayName: az vm run-command
-      items:
-      - name: Overview
-        uid: az_vm_run_command
-        displayName: az vm run-command
-      - name: invoke
-        uid: az_vm_run_command_invoke
-        displayName: az vm run-command invoke
-      - name: list
-        uid: az_vm_run_command_list
-        displayName: az vm run-command list
-      - name: show
-        uid: az_vm_run_command_show
-        displayName: az vm run-command show
-    - name: secret
-      displayName: az vm secret
-      items:
-      - name: Overview
-        uid: az_vm_secret
-        displayName: az vm secret
-      - name: add
-        uid: az_vm_secret_add
-        displayName: az vm secret add
-      - name: format
-        uid: az_vm_secret_format
-        displayName: az vm secret format
-      - name: list
-        uid: az_vm_secret_list
-        displayName: az vm secret list
-      - name: remove
-        uid: az_vm_secret_remove
-        displayName: az vm secret remove
-  - name: Web Apps
-    displayName: az webapp
-    items:
-    - name: Overview
-      uid: az_webapp
-      displayName: az webapp
-    - name: browse
-      uid: az_webapp_browse
-      displayName: az webapp browse
-    - name: create
-      uid: az_webapp_create
-      displayName: az webapp create
-    - name: create-remote-connection
-      uid: az_webapp_create_remote_connection
-      displayName: az webapp create-remote-connection
-    - name: delete
-      uid: az_webapp_delete
-      displayName: az webapp delete
-    - name: list
-      uid: az_webapp_list
-      displayName: az webapp list
-    - name: list-runtimes
-      uid: az_webapp_list_runtimes
-      displayName: az webapp list-runtimes
-    - name: restart
-      uid: az_webapp_restart
-      displayName: az webapp restart
-    - name: show
-      uid: az_webapp_show
-      displayName: az webapp show
-    - name: ssh
-      uid: az_webapp_ssh
-      displayName: az webapp ssh
-    - name: start
-      uid: az_webapp_start
-      displayName: az webapp start
-    - name: stop
-      uid: az_webapp_stop
-      displayName: az webapp stop
-    - name: up
-      uid: az_webapp_up
-      displayName: az webapp up
-    - name: update
-      uid: az_webapp_update
-      displayName: az webapp update
-    - name: auth
-      displayName: az webapp auth
-      items:
-      - name: Overview
-        uid: az_webapp_auth
-        displayName: az webapp auth
-      - name: show
-        uid: az_webapp_auth_show
-        displayName: az webapp auth show
-      - name: update
-        uid: az_webapp_auth_update
-        displayName: az webapp auth update
-    - name: config
-      displayName: az webapp config
-      items:
-      - name: Overview
-        uid: az_webapp_config
-        displayName: az webapp config
-      - name: set
-        uid: az_webapp_config_set
-        displayName: az webapp config set
-      - name: show
-        uid: az_webapp_config_show
-        displayName: az webapp config show
-      - name: access-restriction
-        displayName: az webapp config access-restriction
-        items:
-        - name: Overview
-          uid: az_webapp_config_access_restriction
-          displayName: az webapp config access-restriction
-        - name: add
-          uid: az_webapp_config_access_restriction_add
-          displayName: az webapp config access-restriction add
-        - name: remove
-          uid: az_webapp_config_access_restriction_remove
-          displayName: az webapp config access-restriction remove
-        - name: set
-          uid: az_webapp_config_access_restriction_set
-          displayName: az webapp config access-restriction set
-        - name: show
-          uid: az_webapp_config_access_restriction_show
-          displayName: az webapp config access-restriction show
-      - name: appsettings
-        displayName: az webapp config appsettings
-        items:
-        - name: Overview
-          uid: az_webapp_config_appsettings
-          displayName: az webapp config appsettings
-        - name: delete
-          uid: az_webapp_config_appsettings_delete
-          displayName: az webapp config appsettings delete
-        - name: list
-          uid: az_webapp_config_appsettings_list
-          displayName: az webapp config appsettings list
-        - name: set
-          uid: az_webapp_config_appsettings_set
-          displayName: az webapp config appsettings set
-      - name: backup
-        displayName: az webapp config backup
-        items:
-        - name: Overview
-          uid: az_webapp_config_backup
-          displayName: az webapp config backup
-        - name: create
-          uid: az_webapp_config_backup_create
-          displayName: az webapp config backup create
-        - name: list
-          uid: az_webapp_config_backup_list
-          displayName: az webapp config backup list
-        - name: restore
-          uid: az_webapp_config_backup_restore
-          displayName: az webapp config backup restore
-        - name: show
-          uid: az_webapp_config_backup_show
-          displayName: az webapp config backup show
-        - name: update
-          uid: az_webapp_config_backup_update
-          displayName: az webapp config backup update
-      - name: connection-string
-        displayName: az webapp config connection-string
-        items:
-        - name: Overview
-          uid: az_webapp_config_connection_string
-          displayName: az webapp config connection-string
-        - name: delete
-          uid: az_webapp_config_connection_string_delete
-          displayName: az webapp config connection-string delete
-        - name: list
-          uid: az_webapp_config_connection_string_list
-          displayName: az webapp config connection-string list
-        - name: set
-          uid: az_webapp_config_connection_string_set
-          displayName: az webapp config connection-string set
-      - name: container
-        displayName: az webapp config container
-        items:
-        - name: Overview
-          uid: az_webapp_config_container
-          displayName: az webapp config container
-        - name: delete
-          uid: az_webapp_config_container_delete
-          displayName: az webapp config container delete
-        - name: set
-          uid: az_webapp_config_container_set
-          displayName: az webapp config container set
-        - name: show
-          uid: az_webapp_config_container_show
-          displayName: az webapp config container show
-      - name: hostname
-        displayName: az webapp config hostname
-        items:
-        - name: Overview
-          uid: az_webapp_config_hostname
-          displayName: az webapp config hostname
-        - name: add
-          uid: az_webapp_config_hostname_add
-          displayName: az webapp config hostname add
-        - name: delete
-          uid: az_webapp_config_hostname_delete
-          displayName: az webapp config hostname delete
-        - name: get-external-ip
-          uid: az_webapp_config_hostname_get_external_ip
-          displayName: az webapp config hostname get-external-ip
-        - name: list
-          uid: az_webapp_config_hostname_list
-          displayName: az webapp config hostname list
-      - name: snapshot
-        displayName: az webapp config snapshot
-        items:
-        - name: Overview
-          uid: az_webapp_config_snapshot
-          displayName: az webapp config snapshot
-        - name: list
-          uid: az_webapp_config_snapshot_list
-          displayName: az webapp config snapshot list
-        - name: restore
-          uid: az_webapp_config_snapshot_restore
-          displayName: az webapp config snapshot restore
-      - name: ssl
-        displayName: az webapp config ssl
-        items:
-        - name: Overview
-          uid: az_webapp_config_ssl
-          displayName: az webapp config ssl
-        - name: bind
-          uid: az_webapp_config_ssl_bind
-          displayName: az webapp config ssl bind
-        - name: create
-          uid: az_webapp_config_ssl_create
-          displayName: az webapp config ssl create
-        - name: delete
-          uid: az_webapp_config_ssl_delete
-          displayName: az webapp config ssl delete
-        - name: import
-          uid: az_webapp_config_ssl_import
-          displayName: az webapp config ssl import
-        - name: list
-          uid: az_webapp_config_ssl_list
-          displayName: az webapp config ssl list
-        - name: unbind
-          uid: az_webapp_config_ssl_unbind
-          displayName: az webapp config ssl unbind
-        - name: upload
-          uid: az_webapp_config_ssl_upload
-          displayName: az webapp config ssl upload
-      - name: storage-account
-        displayName: az webapp config storage-account
-        items:
-        - name: Overview
-          uid: az_webapp_config_storage_account
-          displayName: az webapp config storage-account
-        - name: add
-          uid: az_webapp_config_storage_account_add
-          displayName: az webapp config storage-account add
-        - name: delete
-          uid: az_webapp_config_storage_account_delete
-          displayName: az webapp config storage-account delete
-        - name: list
-          uid: az_webapp_config_storage_account_list
-          displayName: az webapp config storage-account list
-        - name: update
-          uid: az_webapp_config_storage_account_update
-          displayName: az webapp config storage-account update
-    - name: cors
-      displayName: az webapp cors
-      items:
-      - name: Overview
-        uid: az_webapp_cors
-        displayName: az webapp cors
-      - name: add
-        uid: az_webapp_cors_add
-        displayName: az webapp cors add
-      - name: remove
-        uid: az_webapp_cors_remove
-        displayName: az webapp cors remove
-      - name: show
-        uid: az_webapp_cors_show
-        displayName: az webapp cors show
-    - name: deleted
-      displayName: az webapp deleted
-      items:
-      - name: Overview
-        uid: az_webapp_deleted
-        displayName: az webapp deleted
-      - name: list
-        uid: az_webapp_deleted_list
-        displayName: az webapp deleted list
-      - name: restore
-        uid: az_webapp_deleted_restore
-        displayName: az webapp deleted restore
-    - name: deployment
-      displayName: az webapp deployment
-      items:
-      - name: Overview
-        uid: az_webapp_deployment
-        displayName: az webapp deployment
-      - name: list-publishing-credentials
-        uid: az_webapp_deployment_list_publishing_credentials
-        displayName: az webapp deployment list-publishing-credentials
-      - name: list-publishing-profiles
-        uid: az_webapp_deployment_list_publishing_profiles
-        displayName: az webapp deployment list-publishing-profiles
-      - name: container
-        displayName: az webapp deployment container
-        items:
-        - name: Overview
-          uid: az_webapp_deployment_container
-          displayName: az webapp deployment container
-        - name: config
-          uid: az_webapp_deployment_container_config
-          displayName: az webapp deployment container config
-        - name: show-cd-url
-          uid: az_webapp_deployment_container_show_cd_url
-          displayName: az webapp deployment container show-cd-url
-      - name: slot
-        displayName: az webapp deployment slot
-        items:
-        - name: Overview
-          uid: az_webapp_deployment_slot
-          displayName: az webapp deployment slot
-        - name: auto-swap
-          uid: az_webapp_deployment_slot_auto_swap
-          displayName: az webapp deployment slot auto-swap
-        - name: create
-          uid: az_webapp_deployment_slot_create
-          displayName: az webapp deployment slot create
-        - name: delete
-          uid: az_webapp_deployment_slot_delete
-          displayName: az webapp deployment slot delete
-        - name: list
-          uid: az_webapp_deployment_slot_list
-          displayName: az webapp deployment slot list
-        - name: swap
-          uid: az_webapp_deployment_slot_swap
-          displayName: az webapp deployment slot swap
-      - name: source
-        displayName: az webapp deployment source
-        items:
-        - name: Overview
-          uid: az_webapp_deployment_source
-          displayName: az webapp deployment source
-        - name: config
-          uid: az_webapp_deployment_source_config
-          displayName: az webapp deployment source config
-        - name: config-local-git
-          uid: az_webapp_deployment_source_config_local_git
-          displayName: az webapp deployment source config-local-git
-        - name: config-zip
-          uid: az_webapp_deployment_source_config_zip
-          displayName: az webapp deployment source config-zip
-        - name: delete
-          uid: az_webapp_deployment_source_delete
-          displayName: az webapp deployment source delete
-        - name: show
-          uid: az_webapp_deployment_source_show
-          displayName: az webapp deployment source show
-        - name: sync
-          uid: az_webapp_deployment_source_sync
-          displayName: az webapp deployment source sync
-        - name: update-token
-          uid: az_webapp_deployment_source_update_token
-          displayName: az webapp deployment source update-token
-      - name: user
-        displayName: az webapp deployment user
-        items:
-        - name: Overview
-          uid: az_webapp_deployment_user
-          displayName: az webapp deployment user
-        - name: set
-          uid: az_webapp_deployment_user_set
-          displayName: az webapp deployment user set
-        - name: show
-          uid: az_webapp_deployment_user_show
-          displayName: az webapp deployment user show
-    - name: hybrid-connection
-      displayName: az webapp hybrid-connection
-      items:
-      - name: Overview
-        uid: az_webapp_hybrid_connection
-        displayName: az webapp hybrid-connection
-      - name: add
-        uid: az_webapp_hybrid_connection_add
-        displayName: az webapp hybrid-connection add
-      - name: list
-        uid: az_webapp_hybrid_connection_list
-        displayName: az webapp hybrid-connection list
-      - name: remove
-        uid: az_webapp_hybrid_connection_remove
-        displayName: az webapp hybrid-connection remove
-    - name: identity
-      displayName: az webapp identity
-      items:
-      - name: Overview
-        uid: az_webapp_identity
-        displayName: az webapp identity
-      - name: assign
-        uid: az_webapp_identity_assign
-        displayName: az webapp identity assign
-      - name: remove
-        uid: az_webapp_identity_remove
-        displayName: az webapp identity remove
-      - name: show
-        uid: az_webapp_identity_show
-        displayName: az webapp identity show
-    - name: log
-      displayName: az webapp log
-      items:
-      - name: Overview
-        uid: az_webapp_log
-        displayName: az webapp log
-      - name: config
-        uid: az_webapp_log_config
-        displayName: az webapp log config
-      - name: download
-        uid: az_webapp_log_download
-        displayName: az webapp log download
-      - name: show
-        uid: az_webapp_log_show
-        displayName: az webapp log show
-      - name: tail
-        uid: az_webapp_log_tail
-        displayName: az webapp log tail
-    - name: traffic-routing
-      displayName: az webapp traffic-routing
-      items:
-      - name: Overview
-        uid: az_webapp_traffic_routing
-        displayName: az webapp traffic-routing
-      - name: clear
-        uid: az_webapp_traffic_routing_clear
-        displayName: az webapp traffic-routing clear
-      - name: set
-        uid: az_webapp_traffic_routing_set
-        displayName: az webapp traffic-routing set
-      - name: show
-        uid: az_webapp_traffic_routing_show
-        displayName: az webapp traffic-routing show
-    - name: vnet-integration
-      displayName: az webapp vnet-integration
-      items:
-      - name: Overview
-        uid: az_webapp_vnet_integration
-        displayName: az webapp vnet-integration
-      - name: add
-        uid: az_webapp_vnet_integration_add
-        displayName: az webapp vnet-integration add
-      - name: list
-        uid: az_webapp_vnet_integration_list
-        displayName: az webapp vnet-integration list
-      - name: remove
-        uid: az_webapp_vnet_integration_remove
-        displayName: az webapp vnet-integration remove
-    - name: webjob
-      displayName: az webapp webjob
-      items:
-      - name: Overview
-        uid: az_webapp_webjob
-        displayName: az webapp webjob
-      - name: continuous
-        displayName: az webapp webjob continuous
-        items:
-        - name: Overview
-          uid: az_webapp_webjob_continuous
-          displayName: az webapp webjob continuous
-        - name: list
-          uid: az_webapp_webjob_continuous_list
-          displayName: az webapp webjob continuous list
-        - name: remove
-          uid: az_webapp_webjob_continuous_remove
-          displayName: az webapp webjob continuous remove
-        - name: start
-          uid: az_webapp_webjob_continuous_start
-          displayName: az webapp webjob continuous start
-        - name: stop
-          uid: az_webapp_webjob_continuous_stop
-          displayName: az webapp webjob continuous stop
-      - name: triggered
-        displayName: az webapp webjob triggered
-        items:
-        - name: Overview
-          uid: az_webapp_webjob_triggered
-          displayName: az webapp webjob triggered
-        - name: list
-          uid: az_webapp_webjob_triggered_list
-          displayName: az webapp webjob triggered list
-        - name: log
-          uid: az_webapp_webjob_triggered_log
-          displayName: az webapp webjob triggered log
-        - name: remove
-          uid: az_webapp_webjob_triggered_remove
-          displayName: az webapp webjob triggered remove
-        - name: run
-          uid: az_webapp_webjob_triggered_run
-          displayName: az webapp webjob triggered run
-  - name: appconfig
-    displayName: az appconfig
-    items:
-    - name: Overview
-      uid: az_appconfig
-      displayName: az appconfig
-    - name: create
-      uid: az_appconfig_create
-      displayName: az appconfig create
-    - name: delete
-      uid: az_appconfig_delete
-      displayName: az appconfig delete
-    - name: list
-      uid: az_appconfig_list
-      displayName: az appconfig list
-    - name: show
-      uid: az_appconfig_show
-      displayName: az appconfig show
-    - name: update
-      uid: az_appconfig_update
-      displayName: az appconfig update
-    - name: credential
-      displayName: az appconfig credential
-      items:
-      - name: Overview
-        uid: az_appconfig_credential
-        displayName: az appconfig credential
-      - name: list
-        uid: az_appconfig_credential_list
-        displayName: az appconfig credential list
-      - name: regenerate
-        uid: az_appconfig_credential_regenerate
-        displayName: az appconfig credential regenerate
-    - name: feature
-      displayName: az appconfig feature
-      items:
-      - name: Overview
-        uid: az_appconfig_feature
-        displayName: az appconfig feature
-      - name: delete
-        uid: az_appconfig_feature_delete
-        displayName: az appconfig feature delete
-      - name: disable
-        uid: az_appconfig_feature_disable
-        displayName: az appconfig feature disable
-      - name: enable
-        uid: az_appconfig_feature_enable
-        displayName: az appconfig feature enable
-      - name: list
-        uid: az_appconfig_feature_list
-        displayName: az appconfig feature list
-      - name: lock
-        uid: az_appconfig_feature_lock
-        displayName: az appconfig feature lock
-      - name: set
-        uid: az_appconfig_feature_set
-        displayName: az appconfig feature set
-      - name: show
-        uid: az_appconfig_feature_show
-        displayName: az appconfig feature show
-      - name: unlock
-        uid: az_appconfig_feature_unlock
-        displayName: az appconfig feature unlock
-      - name: filter
-        displayName: az appconfig feature filter
-        items:
-        - name: Overview
-          uid: az_appconfig_feature_filter
-          displayName: az appconfig feature filter
-        - name: add
-          uid: az_appconfig_feature_filter_add
-          displayName: az appconfig feature filter add
-        - name: delete
-          uid: az_appconfig_feature_filter_delete
-          displayName: az appconfig feature filter delete
-        - name: list
-          uid: az_appconfig_feature_filter_list
-          displayName: az appconfig feature filter list
-        - name: show
-          uid: az_appconfig_feature_filter_show
-          displayName: az appconfig feature filter show
-    - name: identity
-      displayName: az appconfig identity
-      items:
-      - name: Overview
-        uid: az_appconfig_identity
-        displayName: az appconfig identity
-      - name: assign
-        uid: az_appconfig_identity_assign
-        displayName: az appconfig identity assign
-      - name: remove
-        uid: az_appconfig_identity_remove
-        displayName: az appconfig identity remove
-      - name: show
-        uid: az_appconfig_identity_show
-        displayName: az appconfig identity show
-    - name: kv
-      displayName: az appconfig kv
-      items:
-      - name: Overview
-        uid: az_appconfig_kv
-        displayName: az appconfig kv
-      - name: delete
-        uid: az_appconfig_kv_delete
-        displayName: az appconfig kv delete
-      - name: export
-        uid: az_appconfig_kv_export
-        displayName: az appconfig kv export
-      - name: import
-        uid: az_appconfig_kv_import
-        displayName: az appconfig kv import
-      - name: list
-        uid: az_appconfig_kv_list
-        displayName: az appconfig kv list
-      - name: lock
-        uid: az_appconfig_kv_lock
-        displayName: az appconfig kv lock
-      - name: restore
-        uid: az_appconfig_kv_restore
-        displayName: az appconfig kv restore
-      - name: set
-        uid: az_appconfig_kv_set
-        displayName: az appconfig kv set
-      - name: set-keyvault
-        uid: az_appconfig_kv_set_keyvault
-        displayName: az appconfig kv set-keyvault
-      - name: show
-        uid: az_appconfig_kv_show
-        displayName: az appconfig kv show
-      - name: unlock
-        uid: az_appconfig_kv_unlock
-        displayName: az appconfig kv unlock
-    - name: revision
-      displayName: az appconfig revision
-      items:
-      - name: Overview
-        uid: az_appconfig_revision
-        displayName: az appconfig revision
-      - name: list
-        uid: az_appconfig_revision_list
-        displayName: az appconfig revision list
-  - name: artifacts
-    displayName: az artifacts
-    items:
-    - name: Overview
-      uid: az_artifacts
-      displayName: az artifacts
-    - name: universal
-      displayName: az artifacts universal
-      items:
-      - name: Overview
-        uid: az_artifacts_universal
-        displayName: az artifacts universal
-      - name: download
-        uid: az_artifacts_universal_download
-        displayName: az artifacts universal download
-      - name: publish
-        uid: az_artifacts_universal_publish
-        displayName: az artifacts universal publish
-  - name: boards
-    displayName: az boards
-    items:
-    - name: Overview
-      uid: az_boards
-      displayName: az boards
-    - name: query
-      uid: az_boards_query
-      displayName: az boards query
-    - name: area
-      displayName: az boards area
-      items:
-      - name: Overview
-        uid: az_boards_area
-        displayName: az boards area
-      - name: project
-        displayName: az boards area project
-        items:
-        - name: Overview
-          uid: az_boards_area_project
-          displayName: az boards area project
-        - name: create
-          uid: az_boards_area_project_create
-          displayName: az boards area project create
-        - name: delete
-          uid: az_boards_area_project_delete
-          displayName: az boards area project delete
-        - name: list
-          uid: az_boards_area_project_list
-          displayName: az boards area project list
-        - name: show
-          uid: az_boards_area_project_show
-          displayName: az boards area project show
-        - name: update
-          uid: az_boards_area_project_update
-          displayName: az boards area project update
-      - name: team
-        displayName: az boards area team
-        items:
-        - name: Overview
-          uid: az_boards_area_team
-          displayName: az boards area team
-        - name: add
-          uid: az_boards_area_team_add
-          displayName: az boards area team add
-        - name: list
-          uid: az_boards_area_team_list
-          displayName: az boards area team list
-        - name: remove
-          uid: az_boards_area_team_remove
-          displayName: az boards area team remove
-        - name: update
-          uid: az_boards_area_team_update
-          displayName: az boards area team update
-    - name: iteration
-      displayName: az boards iteration
-      items:
-      - name: Overview
-        uid: az_boards_iteration
-        displayName: az boards iteration
-      - name: project
-        displayName: az boards iteration project
-        items:
-        - name: Overview
-          uid: az_boards_iteration_project
-          displayName: az boards iteration project
-        - name: create
-          uid: az_boards_iteration_project_create
-          displayName: az boards iteration project create
-        - name: delete
-          uid: az_boards_iteration_project_delete
-          displayName: az boards iteration project delete
-        - name: list
-          uid: az_boards_iteration_project_list
-          displayName: az boards iteration project list
-        - name: show
-          uid: az_boards_iteration_project_show
-          displayName: az boards iteration project show
-        - name: update
-          uid: az_boards_iteration_project_update
-          displayName: az boards iteration project update
-      - name: team
-        displayName: az boards iteration team
-        items:
-        - name: Overview
-          uid: az_boards_iteration_team
-          displayName: az boards iteration team
-        - name: add
-          uid: az_boards_iteration_team_add
-          displayName: az boards iteration team add
-        - name: list
-          uid: az_boards_iteration_team_list
-          displayName: az boards iteration team list
-        - name: list-work-items
-          uid: az_boards_iteration_team_list_work_items
-          displayName: az boards iteration team list-work-items
-        - name: remove
-          uid: az_boards_iteration_team_remove
-          displayName: az boards iteration team remove
-        - name: set-backlog-iteration
-          uid: az_boards_iteration_team_set_backlog_iteration
-          displayName: az boards iteration team set-backlog-iteration
-        - name: set-default-iteration
-          uid: az_boards_iteration_team_set_default_iteration
-          displayName: az boards iteration team set-default-iteration
-        - name: show-backlog-iteration
-          uid: az_boards_iteration_team_show_backlog_iteration
-          displayName: az boards iteration team show-backlog-iteration
-        - name: show-default-iteration
-          uid: az_boards_iteration_team_show_default_iteration
-          displayName: az boards iteration team show-default-iteration
-    - name: work-item
-      displayName: az boards work-item
-      items:
-      - name: Overview
-        uid: az_boards_work_item
-        displayName: az boards work-item
-      - name: create
-        uid: az_boards_work_item_create
-        displayName: az boards work-item create
-      - name: delete
-        uid: az_boards_work_item_delete
-        displayName: az boards work-item delete
-      - name: show
-        uid: az_boards_work_item_show
-        displayName: az boards work-item show
-      - name: update
-        uid: az_boards_work_item_update
-        displayName: az boards work-item update
-      - name: relation
-        displayName: az boards work-item relation
-        items:
-        - name: Overview
-          uid: az_boards_work_item_relation
-          displayName: az boards work-item relation
-        - name: add
-          uid: az_boards_work_item_relation_add
-          displayName: az boards work-item relation add
-        - name: list-type
-          uid: az_boards_work_item_relation_list_type
-          displayName: az boards work-item relation list-type
-        - name: remove
-          uid: az_boards_work_item_relation_remove
-          displayName: az boards work-item relation remove
-        - name: show
-          uid: az_boards_work_item_relation_show
-          displayName: az boards work-item relation show
-  - name: cache
-    displayName: az cache
-    items:
-    - name: Overview
-      uid: az_cache
-      displayName: az cache
-    - name: delete
-      uid: az_cache_delete
-      displayName: az cache delete
-    - name: list
-      uid: az_cache_list
-      displayName: az cache list
-    - name: purge
-      uid: az_cache_purge
-      displayName: az cache purge
-    - name: show
-      uid: az_cache_show
-      displayName: az cache show
-  - name: deployment
-    displayName: az deployment
-    items:
-    - name: Overview
-      uid: az_deployment
-      displayName: az deployment
-    - name: cancel
-      uid: az_deployment_cancel
-      displayName: az deployment cancel
-    - name: create
-      uid: az_deployment_create
-      displayName: az deployment create
-    - name: delete
-      uid: az_deployment_delete
-      displayName: az deployment delete
-    - name: export
-      uid: az_deployment_export
-      displayName: az deployment export
-    - name: list
-      uid: az_deployment_list
-      displayName: az deployment list
-    - name: show
-      uid: az_deployment_show
-      displayName: az deployment show
-    - name: validate
-      uid: az_deployment_validate
-      displayName: az deployment validate
-    - name: wait
-      uid: az_deployment_wait
-      displayName: az deployment wait
-    - name: group
-      displayName: az deployment group
-      items:
-      - name: Overview
-        uid: az_deployment_group
-        displayName: az deployment group
-      - name: cancel
-        uid: az_deployment_group_cancel
-        displayName: az deployment group cancel
-      - name: create
-        uid: az_deployment_group_create
-        displayName: az deployment group create
-      - name: delete
-        uid: az_deployment_group_delete
-        displayName: az deployment group delete
-      - name: export
-        uid: az_deployment_group_export
-        displayName: az deployment group export
-      - name: list
-        uid: az_deployment_group_list
-        displayName: az deployment group list
-      - name: show
-        uid: az_deployment_group_show
-        displayName: az deployment group show
-      - name: validate
-        uid: az_deployment_group_validate
-        displayName: az deployment group validate
-      - name: wait
-        uid: az_deployment_group_wait
-        displayName: az deployment group wait
-    - name: operation
-      displayName: az deployment operation
-      items:
-      - name: Overview
-        uid: az_deployment_operation
-        displayName: az deployment operation
-      - name: list
-        uid: az_deployment_operation_list
-        displayName: az deployment operation list
-      - name: show
-        uid: az_deployment_operation_show
-        displayName: az deployment operation show
-      - name: group
-        displayName: az deployment operation group
-        items:
-        - name: Overview
-          uid: az_deployment_operation_group
-          displayName: az deployment operation group
-        - name: list
-          uid: az_deployment_operation_group_list
-          displayName: az deployment operation group list
-        - name: show
-          uid: az_deployment_operation_group_show
-          displayName: az deployment operation group show
-      - name: sub
-        displayName: az deployment operation sub
-        items:
-        - name: Overview
-          uid: az_deployment_operation_sub
-          displayName: az deployment operation sub
-        - name: list
-          uid: az_deployment_operation_sub_list
-          displayName: az deployment operation sub list
-        - name: show
-          uid: az_deployment_operation_sub_show
-          displayName: az deployment operation sub show
-    - name: sub
-      displayName: az deployment sub
-      items:
-      - name: Overview
-        uid: az_deployment_sub
-        displayName: az deployment sub
-      - name: cancel
-        uid: az_deployment_sub_cancel
-        displayName: az deployment sub cancel
-      - name: create
-        uid: az_deployment_sub_create
-        displayName: az deployment sub create
-      - name: delete
-        uid: az_deployment_sub_delete
-        displayName: az deployment sub delete
-      - name: export
-        uid: az_deployment_sub_export
-        displayName: az deployment sub export
-      - name: list
-        uid: az_deployment_sub_list
-        displayName: az deployment sub list
-      - name: show
-        uid: az_deployment_sub_show
-        displayName: az deployment sub show
-      - name: validate
-        uid: az_deployment_sub_validate
-        displayName: az deployment sub validate
-      - name: wait
-        uid: az_deployment_sub_wait
-        displayName: az deployment sub wait
-  - name: deployment-scripts
-    displayName: az deployment-scripts
-    items:
-    - name: Overview
-      uid: az_deployment_scripts
-      displayName: az deployment-scripts
-    - name: delete
-      uid: az_deployment_scripts_delete
-      displayName: az deployment-scripts delete
-    - name: list
-      uid: az_deployment_scripts_list
-      displayName: az deployment-scripts list
-    - name: show
-      uid: az_deployment_scripts_show
-      displayName: az deployment-scripts show
-    - name: show-log
-      uid: az_deployment_scripts_show_log
-      displayName: az deployment-scripts show-log
-  - name: devops
-    displayName: az devops
-    items:
-    - name: Overview
-      uid: az_devops
-      displayName: az devops
-    - name: configure
-      uid: az_devops_configure
-      displayName: az devops configure
-    - name: feedback
-      uid: az_devops_feedback
-      displayName: az devops feedback
-    - name: invoke
-      uid: az_devops_invoke
-      displayName: az devops invoke
-    - name: login
-      uid: az_devops_login
-      displayName: az devops login
-    - name: logout
-      uid: az_devops_logout
-      displayName: az devops logout
-    - name: admin
-      displayName: az devops admin
-      items:
-      - name: Overview
-        uid: az_devops_admin
-        displayName: az devops admin
-      - name: banner
-        displayName: az devops admin banner
-        items:
-        - name: Overview
-          uid: az_devops_admin_banner
-          displayName: az devops admin banner
-        - name: add
-          uid: az_devops_admin_banner_add
-          displayName: az devops admin banner add
-        - name: list
-          uid: az_devops_admin_banner_list
-          displayName: az devops admin banner list
-        - name: remove
-          uid: az_devops_admin_banner_remove
-          displayName: az devops admin banner remove
-        - name: show
-          uid: az_devops_admin_banner_show
-          displayName: az devops admin banner show
-        - name: update
-          uid: az_devops_admin_banner_update
-          displayName: az devops admin banner update
-    - name: extension
-      displayName: az devops extension
-      items:
-      - name: Overview
-        uid: az_devops_extension
-        displayName: az devops extension
-      - name: disable
-        uid: az_devops_extension_disable
-        displayName: az devops extension disable
-      - name: enable
-        uid: az_devops_extension_enable
-        displayName: az devops extension enable
-      - name: install
-        uid: az_devops_extension_install
-        displayName: az devops extension install
-      - name: list
-        uid: az_devops_extension_list
-        displayName: az devops extension list
-      - name: search
-        uid: az_devops_extension_search
-        displayName: az devops extension search
-      - name: show
-        uid: az_devops_extension_show
-        displayName: az devops extension show
-      - name: uninstall
-        uid: az_devops_extension_uninstall
-        displayName: az devops extension uninstall
-    - name: project
-      displayName: az devops project
-      items:
-      - name: Overview
-        uid: az_devops_project
-        displayName: az devops project
-      - name: create
-        uid: az_devops_project_create
-        displayName: az devops project create
-      - name: delete
-        uid: az_devops_project_delete
-        displayName: az devops project delete
-      - name: list
-        uid: az_devops_project_list
-        displayName: az devops project list
-      - name: show
-        uid: az_devops_project_show
-        displayName: az devops project show
-    - name: security
-      displayName: az devops security
-      items:
-      - name: Overview
-        uid: az_devops_security
-        displayName: az devops security
-      - name: group
-        displayName: az devops security group
-        items:
-        - name: Overview
-          uid: az_devops_security_group
-          displayName: az devops security group
-        - name: create
-          uid: az_devops_security_group_create
-          displayName: az devops security group create
-        - name: delete
-          uid: az_devops_security_group_delete
-          displayName: az devops security group delete
-        - name: list
-          uid: az_devops_security_group_list
-          displayName: az devops security group list
-        - name: show
-          uid: az_devops_security_group_show
-          displayName: az devops security group show
-        - name: update
-          uid: az_devops_security_group_update
-          displayName: az devops security group update
-        - name: membership
-          displayName: az devops security group membership
-          items:
-          - name: Overview
-            uid: az_devops_security_group_membership
-            displayName: az devops security group membership
-          - name: add
-            uid: az_devops_security_group_membership_add
-            displayName: az devops security group membership add
-          - name: list
-            uid: az_devops_security_group_membership_list
-            displayName: az devops security group membership list
-          - name: remove
-            uid: az_devops_security_group_membership_remove
-            displayName: az devops security group membership remove
-      - name: permission
-        displayName: az devops security permission
-        items:
-        - name: Overview
-          uid: az_devops_security_permission
-          displayName: az devops security permission
-        - name: list
-          uid: az_devops_security_permission_list
-          displayName: az devops security permission list
-        - name: reset
-          uid: az_devops_security_permission_reset
-          displayName: az devops security permission reset
-        - name: reset-all
-          uid: az_devops_security_permission_reset_all
-          displayName: az devops security permission reset-all
-        - name: show
-          uid: az_devops_security_permission_show
-          displayName: az devops security permission show
-        - name: update
-          uid: az_devops_security_permission_update
-          displayName: az devops security permission update
-        - name: namespace
-          displayName: az devops security permission namespace
-          items:
-          - name: Overview
-            uid: az_devops_security_permission_namespace
-            displayName: az devops security permission namespace
-          - name: list
-            uid: az_devops_security_permission_namespace_list
-            displayName: az devops security permission namespace list
-          - name: show
-            uid: az_devops_security_permission_namespace_show
-            displayName: az devops security permission namespace show
-    - name: service-endpoint
-      displayName: az devops service-endpoint
-      items:
-      - name: Overview
-        uid: az_devops_service_endpoint
-        displayName: az devops service-endpoint
-      - name: create
-        uid: az_devops_service_endpoint_create
-        displayName: az devops service-endpoint create
-      - name: delete
-        uid: az_devops_service_endpoint_delete
-        displayName: az devops service-endpoint delete
-      - name: list
-        uid: az_devops_service_endpoint_list
-        displayName: az devops service-endpoint list
-      - name: show
-        uid: az_devops_service_endpoint_show
-        displayName: az devops service-endpoint show
-      - name: update
-        uid: az_devops_service_endpoint_update
-        displayName: az devops service-endpoint update
-      - name: azurerm
-        displayName: az devops service-endpoint azurerm
-        items:
-        - name: Overview
-          uid: az_devops_service_endpoint_azurerm
-          displayName: az devops service-endpoint azurerm
-        - name: create
-          uid: az_devops_service_endpoint_azurerm_create
-          displayName: az devops service-endpoint azurerm create
-      - name: github
-        displayName: az devops service-endpoint github
-        items:
-        - name: Overview
-          uid: az_devops_service_endpoint_github
-          displayName: az devops service-endpoint github
-        - name: create
-          uid: az_devops_service_endpoint_github_create
-          displayName: az devops service-endpoint github create
-    - name: team
-      displayName: az devops team
-      items:
-      - name: Overview
-        uid: az_devops_team
-        displayName: az devops team
-      - name: create
-        uid: az_devops_team_create
-        displayName: az devops team create
-      - name: delete
-        uid: az_devops_team_delete
-        displayName: az devops team delete
-      - name: list
-        uid: az_devops_team_list
-        displayName: az devops team list
-      - name: list-member
-        uid: az_devops_team_list_member
-        displayName: az devops team list-member
-      - name: show
-        uid: az_devops_team_show
-        displayName: az devops team show
-      - name: update
-        uid: az_devops_team_update
-        displayName: az devops team update
-    - name: user
-      displayName: az devops user
-      items:
-      - name: Overview
-        uid: az_devops_user
-        displayName: az devops user
-      - name: add
-        uid: az_devops_user_add
-        displayName: az devops user add
-      - name: list
-        uid: az_devops_user_list
-        displayName: az devops user list
-      - name: remove
-        uid: az_devops_user_remove
-        displayName: az devops user remove
-      - name: show
-        uid: az_devops_user_show
-        displayName: az devops user show
-      - name: update
-        uid: az_devops_user_update
-        displayName: az devops user update
-    - name: wiki
-      displayName: az devops wiki
-      items:
-      - name: Overview
-        uid: az_devops_wiki
-        displayName: az devops wiki
-      - name: create
-        uid: az_devops_wiki_create
-        displayName: az devops wiki create
-      - name: delete
-        uid: az_devops_wiki_delete
-        displayName: az devops wiki delete
-      - name: list
-        uid: az_devops_wiki_list
-        displayName: az devops wiki list
-      - name: show
-        uid: az_devops_wiki_show
-        displayName: az devops wiki show
-      - name: page
-        displayName: az devops wiki page
-        items:
-        - name: Overview
-          uid: az_devops_wiki_page
-          displayName: az devops wiki page
-        - name: create
-          uid: az_devops_wiki_page_create
-          displayName: az devops wiki page create
-        - name: delete
-          uid: az_devops_wiki_page_delete
-          displayName: az devops wiki page delete
-        - name: show
-          uid: az_devops_wiki_page_show
-          displayName: az devops wiki page show
-        - name: update
-          uid: az_devops_wiki_page_update
-          displayName: az devops wiki page update
-  - name: eventhubs
-    displayName: az eventhubs
-    items:
-    - name: Overview
-      uid: az_eventhubs
-      displayName: az eventhubs
-    - name: eventhub
-      displayName: az eventhubs eventhub
-      items:
-      - name: Overview
-        uid: az_eventhubs_eventhub
-        displayName: az eventhubs eventhub
-      - name: create
-        uid: az_eventhubs_eventhub_create
-        displayName: az eventhubs eventhub create
-      - name: delete
-        uid: az_eventhubs_eventhub_delete
-        displayName: az eventhubs eventhub delete
-      - name: list
-        uid: az_eventhubs_eventhub_list
-        displayName: az eventhubs eventhub list
-      - name: show
-        uid: az_eventhubs_eventhub_show
-        displayName: az eventhubs eventhub show
-      - name: update
-        uid: az_eventhubs_eventhub_update
-        displayName: az eventhubs eventhub update
-      - name: authorization-rule
-        displayName: az eventhubs eventhub authorization-rule
-        items:
-        - name: Overview
-          uid: az_eventhubs_eventhub_authorization_rule
-          displayName: az eventhubs eventhub authorization-rule
-        - name: create
-          uid: az_eventhubs_eventhub_authorization_rule_create
-          displayName: az eventhubs eventhub authorization-rule create
-        - name: delete
-          uid: az_eventhubs_eventhub_authorization_rule_delete
-          displayName: az eventhubs eventhub authorization-rule delete
-        - name: list
-          uid: az_eventhubs_eventhub_authorization_rule_list
-          displayName: az eventhubs eventhub authorization-rule list
-        - name: show
-          uid: az_eventhubs_eventhub_authorization_rule_show
-          displayName: az eventhubs eventhub authorization-rule show
-        - name: update
-          uid: az_eventhubs_eventhub_authorization_rule_update
-          displayName: az eventhubs eventhub authorization-rule update
-        - name: keys
-          displayName: az eventhubs eventhub authorization-rule keys
-          items:
-          - name: Overview
-            uid: az_eventhubs_eventhub_authorization_rule_keys
-            displayName: az eventhubs eventhub authorization-rule keys
-          - name: list
-            uid: az_eventhubs_eventhub_authorization_rule_keys_list
-            displayName: az eventhubs eventhub authorization-rule keys list
-          - name: renew
-            uid: az_eventhubs_eventhub_authorization_rule_keys_renew
-            displayName: az eventhubs eventhub authorization-rule keys renew
-      - name: consumer-group
-        displayName: az eventhubs eventhub consumer-group
-        items:
-        - name: Overview
-          uid: az_eventhubs_eventhub_consumer_group
-          displayName: az eventhubs eventhub consumer-group
-        - name: create
-          uid: az_eventhubs_eventhub_consumer_group_create
-          displayName: az eventhubs eventhub consumer-group create
-        - name: delete
-          uid: az_eventhubs_eventhub_consumer_group_delete
-          displayName: az eventhubs eventhub consumer-group delete
-        - name: list
-          uid: az_eventhubs_eventhub_consumer_group_list
-          displayName: az eventhubs eventhub consumer-group list
-        - name: show
-          uid: az_eventhubs_eventhub_consumer_group_show
-          displayName: az eventhubs eventhub consumer-group show
-        - name: update
-          uid: az_eventhubs_eventhub_consumer_group_update
-          displayName: az eventhubs eventhub consumer-group update
-    - name: georecovery-alias
-      displayName: az eventhubs georecovery-alias
-      items:
-      - name: Overview
-        uid: az_eventhubs_georecovery_alias
-        displayName: az eventhubs georecovery-alias
-      - name: break-pair
-        uid: az_eventhubs_georecovery_alias_break_pair
-        displayName: az eventhubs georecovery-alias break-pair
-      - name: delete
-        uid: az_eventhubs_georecovery_alias_delete
-        displayName: az eventhubs georecovery-alias delete
-      - name: exists
-        uid: az_eventhubs_georecovery_alias_exists
-        displayName: az eventhubs georecovery-alias exists
-      - name: fail-over
-        uid: az_eventhubs_georecovery_alias_fail_over
-        displayName: az eventhubs georecovery-alias fail-over
-      - name: list
-        uid: az_eventhubs_georecovery_alias_list
-        displayName: az eventhubs georecovery-alias list
-      - name: set
-        uid: az_eventhubs_georecovery_alias_set
-        displayName: az eventhubs georecovery-alias set
-      - name: show
-        uid: az_eventhubs_georecovery_alias_show
-        displayName: az eventhubs georecovery-alias show
-      - name: authorization-rule
-        displayName: az eventhubs georecovery-alias authorization-rule
-        items:
-        - name: Overview
-          uid: az_eventhubs_georecovery_alias_authorization_rule
-          displayName: az eventhubs georecovery-alias authorization-rule
-        - name: list
-          uid: az_eventhubs_georecovery_alias_authorization_rule_list
-          displayName: az eventhubs georecovery-alias authorization-rule list
-        - name: show
-          uid: az_eventhubs_georecovery_alias_authorization_rule_show
-          displayName: az eventhubs georecovery-alias authorization-rule show
-        - name: keys
-          displayName: az eventhubs georecovery-alias authorization-rule keys
-          items:
-          - name: Overview
-            uid: az_eventhubs_georecovery_alias_authorization_rule_keys
-            displayName: az eventhubs georecovery-alias authorization-rule keys
-          - name: list
-            uid: az_eventhubs_georecovery_alias_authorization_rule_keys_list
-            displayName: az eventhubs georecovery-alias authorization-rule keys list
-    - name: namespace
-      displayName: az eventhubs namespace
-      items:
-      - name: Overview
-        uid: az_eventhubs_namespace
-        displayName: az eventhubs namespace
-      - name: create
-        uid: az_eventhubs_namespace_create
-        displayName: az eventhubs namespace create
-      - name: delete
-        uid: az_eventhubs_namespace_delete
-        displayName: az eventhubs namespace delete
-      - name: exists
-        uid: az_eventhubs_namespace_exists
-        displayName: az eventhubs namespace exists
-      - name: list
-        uid: az_eventhubs_namespace_list
-        displayName: az eventhubs namespace list
-      - name: show
-        uid: az_eventhubs_namespace_show
-        displayName: az eventhubs namespace show
-      - name: update
-        uid: az_eventhubs_namespace_update
-        displayName: az eventhubs namespace update
-      - name: authorization-rule
-        displayName: az eventhubs namespace authorization-rule
-        items:
-        - name: Overview
-          uid: az_eventhubs_namespace_authorization_rule
-          displayName: az eventhubs namespace authorization-rule
-        - name: create
-          uid: az_eventhubs_namespace_authorization_rule_create
-          displayName: az eventhubs namespace authorization-rule create
-        - name: delete
-          uid: az_eventhubs_namespace_authorization_rule_delete
-          displayName: az eventhubs namespace authorization-rule delete
-        - name: list
-          uid: az_eventhubs_namespace_authorization_rule_list
-          displayName: az eventhubs namespace authorization-rule list
-        - name: show
-          uid: az_eventhubs_namespace_authorization_rule_show
-          displayName: az eventhubs namespace authorization-rule show
-        - name: update
-          uid: az_eventhubs_namespace_authorization_rule_update
-          displayName: az eventhubs namespace authorization-rule update
-        - name: keys
-          displayName: az eventhubs namespace authorization-rule keys
-          items:
-          - name: Overview
-            uid: az_eventhubs_namespace_authorization_rule_keys
-            displayName: az eventhubs namespace authorization-rule keys
-          - name: list
-            uid: az_eventhubs_namespace_authorization_rule_keys_list
-            displayName: az eventhubs namespace authorization-rule keys list
-          - name: renew
-            uid: az_eventhubs_namespace_authorization_rule_keys_renew
-            displayName: az eventhubs namespace authorization-rule keys renew
-      - name: network-rule
-        displayName: az eventhubs namespace network-rule
-        items:
-        - name: Overview
-          uid: az_eventhubs_namespace_network_rule
-          displayName: az eventhubs namespace network-rule
-        - name: add
-          uid: az_eventhubs_namespace_network_rule_add
-          displayName: az eventhubs namespace network-rule add
-        - name: list
-          uid: az_eventhubs_namespace_network_rule_list
-          displayName: az eventhubs namespace network-rule list
-        - name: remove
-          uid: az_eventhubs_namespace_network_rule_remove
-          displayName: az eventhubs namespace network-rule remove
-  - name: extension
-    displayName: az extension
-    items:
-    - name: Overview
-      uid: az_extension
-      displayName: az extension
-    - name: add
-      uid: az_extension_add
-      displayName: az extension add
-    - name: list
-      uid: az_extension_list
-      displayName: az extension list
-    - name: list-available
-      uid: az_extension_list_available
-      displayName: az extension list-available
-    - name: remove
-      uid: az_extension_remove
-      displayName: az extension remove
-    - name: show
-      uid: az_extension_show
-      displayName: az extension show
-    - name: update
-      uid: az_extension_update
-      displayName: az extension update
-  - name: local-context
-    displayName: az local-context
-    items:
-    - name: Overview
-      uid: az_local_context
-      displayName: az local-context
-    - name: delete
-      uid: az_local_context_delete
-      displayName: az local-context delete
-    - name: off
-      uid: az_local_context_off
-      displayName: az local-context off
-    - name: on
-      uid: az_local_context_on
-      displayName: az local-context on
-    - name: show
-      uid: az_local_context_show
-      displayName: az local-context show
-  - name: pipelines
-    displayName: az pipelines
-    items:
-    - name: Overview
-      uid: az_pipelines
-      displayName: az pipelines
-    - name: create
-      uid: az_pipelines_create
-      displayName: az pipelines create
-    - name: delete
-      uid: az_pipelines_delete
-      displayName: az pipelines delete
-    - name: list
-      uid: az_pipelines_list
-      displayName: az pipelines list
-    - name: run
-      uid: az_pipelines_run
-      displayName: az pipelines run
-    - name: show
-      uid: az_pipelines_show
-      displayName: az pipelines show
-    - name: update
-      uid: az_pipelines_update
-      displayName: az pipelines update
-    - name: agent
-      displayName: az pipelines agent
-      items:
-      - name: Overview
-        uid: az_pipelines_agent
-        displayName: az pipelines agent
-      - name: list
-        uid: az_pipelines_agent_list
-        displayName: az pipelines agent list
-      - name: show
-        uid: az_pipelines_agent_show
-        displayName: az pipelines agent show
-    - name: build
-      displayName: az pipelines build
-      items:
-      - name: Overview
-        uid: az_pipelines_build
-        displayName: az pipelines build
-      - name: list
-        uid: az_pipelines_build_list
-        displayName: az pipelines build list
-      - name: queue
-        uid: az_pipelines_build_queue
-        displayName: az pipelines build queue
-      - name: show
-        uid: az_pipelines_build_show
-        displayName: az pipelines build show
-      - name: definition
-        displayName: az pipelines build definition
-        items:
-        - name: Overview
-          uid: az_pipelines_build_definition
-          displayName: az pipelines build definition
-        - name: list
-          uid: az_pipelines_build_definition_list
-          displayName: az pipelines build definition list
-        - name: show
-          uid: az_pipelines_build_definition_show
-          displayName: az pipelines build definition show
-      - name: tag
-        displayName: az pipelines build tag
-        items:
-        - name: Overview
-          uid: az_pipelines_build_tag
-          displayName: az pipelines build tag
-        - name: add
-          uid: az_pipelines_build_tag_add
-          displayName: az pipelines build tag add
-        - name: delete
-          uid: az_pipelines_build_tag_delete
-          displayName: az pipelines build tag delete
-        - name: list
-          uid: az_pipelines_build_tag_list
-          displayName: az pipelines build tag list
-    - name: folder
-      displayName: az pipelines folder
-      items:
-      - name: Overview
-        uid: az_pipelines_folder
-        displayName: az pipelines folder
-      - name: create
-        uid: az_pipelines_folder_create
-        displayName: az pipelines folder create
-      - name: delete
-        uid: az_pipelines_folder_delete
-        displayName: az pipelines folder delete
-      - name: list
-        uid: az_pipelines_folder_list
-        displayName: az pipelines folder list
-      - name: update
-        uid: az_pipelines_folder_update
-        displayName: az pipelines folder update
-    - name: pool
-      displayName: az pipelines pool
-      items:
-      - name: Overview
-        uid: az_pipelines_pool
-        displayName: az pipelines pool
-      - name: list
-        uid: az_pipelines_pool_list
-        displayName: az pipelines pool list
-      - name: show
-        uid: az_pipelines_pool_show
-        displayName: az pipelines pool show
-    - name: queue
-      displayName: az pipelines queue
-      items:
-      - name: Overview
-        uid: az_pipelines_queue
-        displayName: az pipelines queue
-      - name: list
-        uid: az_pipelines_queue_list
-        displayName: az pipelines queue list
-      - name: show
-        uid: az_pipelines_queue_show
-        displayName: az pipelines queue show
-    - name: release
-      displayName: az pipelines release
-      items:
-      - name: Overview
-        uid: az_pipelines_release
-        displayName: az pipelines release
-      - name: create
-        uid: az_pipelines_release_create
-        displayName: az pipelines release create
-      - name: list
-        uid: az_pipelines_release_list
-        displayName: az pipelines release list
-      - name: show
-        uid: az_pipelines_release_show
-        displayName: az pipelines release show
-      - name: definition
-        displayName: az pipelines release definition
-        items:
-        - name: Overview
-          uid: az_pipelines_release_definition
-          displayName: az pipelines release definition
-        - name: list
-          uid: az_pipelines_release_definition_list
-          displayName: az pipelines release definition list
-        - name: show
-          uid: az_pipelines_release_definition_show
-          displayName: az pipelines release definition show
-    - name: runs
-      displayName: az pipelines runs
-      items:
-      - name: Overview
-        uid: az_pipelines_runs
-        displayName: az pipelines runs
-      - name: list
-        uid: az_pipelines_runs_list
-        displayName: az pipelines runs list
-      - name: show
-        uid: az_pipelines_runs_show
-        displayName: az pipelines runs show
-      - name: artifact
-        displayName: az pipelines runs artifact
-        items:
-        - name: Overview
-          uid: az_pipelines_runs_artifact
-          displayName: az pipelines runs artifact
-        - name: download
-          uid: az_pipelines_runs_artifact_download
-          displayName: az pipelines runs artifact download
-        - name: list
-          uid: az_pipelines_runs_artifact_list
-          displayName: az pipelines runs artifact list
-        - name: upload
-          uid: az_pipelines_runs_artifact_upload
-          displayName: az pipelines runs artifact upload
-      - name: tag
-        displayName: az pipelines runs tag
-        items:
-        - name: Overview
-          uid: az_pipelines_runs_tag
-          displayName: az pipelines runs tag
-        - name: add
-          uid: az_pipelines_runs_tag_add
-          displayName: az pipelines runs tag add
-        - name: delete
-          uid: az_pipelines_runs_tag_delete
-          displayName: az pipelines runs tag delete
-        - name: list
-          uid: az_pipelines_runs_tag_list
-          displayName: az pipelines runs tag list
-    - name: variable
-      displayName: az pipelines variable
-      items:
-      - name: Overview
-        uid: az_pipelines_variable
-        displayName: az pipelines variable
-      - name: create
-        uid: az_pipelines_variable_create
-        displayName: az pipelines variable create
-      - name: delete
-        uid: az_pipelines_variable_delete
-        displayName: az pipelines variable delete
-      - name: list
-        uid: az_pipelines_variable_list
-        displayName: az pipelines variable list
-      - name: update
-        uid: az_pipelines_variable_update
-        displayName: az pipelines variable update
-    - name: variable-group
-      displayName: az pipelines variable-group
-      items:
-      - name: Overview
-        uid: az_pipelines_variable_group
-        displayName: az pipelines variable-group
-      - name: create
-        uid: az_pipelines_variable_group_create
-        displayName: az pipelines variable-group create
-      - name: delete
-        uid: az_pipelines_variable_group_delete
-        displayName: az pipelines variable-group delete
-      - name: list
-        uid: az_pipelines_variable_group_list
-        displayName: az pipelines variable-group list
-      - name: show
-        uid: az_pipelines_variable_group_show
-        displayName: az pipelines variable-group show
-      - name: update
-        uid: az_pipelines_variable_group_update
-        displayName: az pipelines variable-group update
-      - name: variable
-        displayName: az pipelines variable-group variable
-        items:
-        - name: Overview
-          uid: az_pipelines_variable_group_variable
-          displayName: az pipelines variable-group variable
-        - name: create
-          uid: az_pipelines_variable_group_variable_create
-          displayName: az pipelines variable-group variable create
-        - name: delete
-          uid: az_pipelines_variable_group_variable_delete
-          displayName: az pipelines variable-group variable delete
-        - name: list
-          uid: az_pipelines_variable_group_variable_list
-          displayName: az pipelines variable-group variable list
-        - name: update
-          uid: az_pipelines_variable_group_variable_update
-          displayName: az pipelines variable-group variable update
-  - name: repos
-    displayName: az repos
-    items:
-    - name: Overview
-      uid: az_repos
-      displayName: az repos
-    - name: create
-      uid: az_repos_create
-      displayName: az repos create
-    - name: delete
-      uid: az_repos_delete
-      displayName: az repos delete
-    - name: list
-      uid: az_repos_list
-      displayName: az repos list
-    - name: show
-      uid: az_repos_show
-      displayName: az repos show
-    - name: update
-      uid: az_repos_update
-      displayName: az repos update
-    - name: import
-      displayName: az repos import
-      items:
-      - name: Overview
-        uid: az_repos_import
-        displayName: az repos import
-      - name: create
-        uid: az_repos_import_create
-        displayName: az repos import create
-    - name: policy
-      displayName: az repos policy
-      items:
-      - name: Overview
-        uid: az_repos_policy
-        displayName: az repos policy
-      - name: create
-        uid: az_repos_policy_create
-        displayName: az repos policy create
-      - name: delete
-        uid: az_repos_policy_delete
-        displayName: az repos policy delete
-      - name: list
-        uid: az_repos_policy_list
-        displayName: az repos policy list
-      - name: show
-        uid: az_repos_policy_show
-        displayName: az repos policy show
-      - name: update
-        uid: az_repos_policy_update
-        displayName: az repos policy update
-      - name: approver-count
-        displayName: az repos policy approver-count
-        items:
-        - name: Overview
-          uid: az_repos_policy_approver_count
-          displayName: az repos policy approver-count
-        - name: create
-          uid: az_repos_policy_approver_count_create
-          displayName: az repos policy approver-count create
-        - name: update
-          uid: az_repos_policy_approver_count_update
-          displayName: az repos policy approver-count update
-      - name: build
-        displayName: az repos policy build
-        items:
-        - name: Overview
-          uid: az_repos_policy_build
-          displayName: az repos policy build
-        - name: create
-          uid: az_repos_policy_build_create
-          displayName: az repos policy build create
-        - name: update
-          uid: az_repos_policy_build_update
-          displayName: az repos policy build update
-      - name: case-enforcement
-        displayName: az repos policy case-enforcement
-        items:
-        - name: Overview
-          uid: az_repos_policy_case_enforcement
-          displayName: az repos policy case-enforcement
-        - name: create
-          uid: az_repos_policy_case_enforcement_create
-          displayName: az repos policy case-enforcement create
-        - name: update
-          uid: az_repos_policy_case_enforcement_update
-          displayName: az repos policy case-enforcement update
-      - name: comment-required
-        displayName: az repos policy comment-required
-        items:
-        - name: Overview
-          uid: az_repos_policy_comment_required
-          displayName: az repos policy comment-required
-        - name: create
-          uid: az_repos_policy_comment_required_create
-          displayName: az repos policy comment-required create
-        - name: update
-          uid: az_repos_policy_comment_required_update
-          displayName: az repos policy comment-required update
-      - name: file-size
-        displayName: az repos policy file-size
-        items:
-        - name: Overview
-          uid: az_repos_policy_file_size
-          displayName: az repos policy file-size
-        - name: create
-          uid: az_repos_policy_file_size_create
-          displayName: az repos policy file-size create
-        - name: update
-          uid: az_repos_policy_file_size_update
-          displayName: az repos policy file-size update
-      - name: merge-strategy
-        displayName: az repos policy merge-strategy
-        items:
-        - name: Overview
-          uid: az_repos_policy_merge_strategy
-          displayName: az repos policy merge-strategy
-        - name: create
-          uid: az_repos_policy_merge_strategy_create
-          displayName: az repos policy merge-strategy create
-        - name: update
-          uid: az_repos_policy_merge_strategy_update
-          displayName: az repos policy merge-strategy update
-      - name: required-reviewer
-        displayName: az repos policy required-reviewer
-        items:
-        - name: Overview
-          uid: az_repos_policy_required_reviewer
-          displayName: az repos policy required-reviewer
-        - name: create
-          uid: az_repos_policy_required_reviewer_create
-          displayName: az repos policy required-reviewer create
-        - name: update
-          uid: az_repos_policy_required_reviewer_update
-          displayName: az repos policy required-reviewer update
-      - name: work-item-linking
-        displayName: az repos policy work-item-linking
-        items:
-        - name: Overview
-          uid: az_repos_policy_work_item_linking
-          displayName: az repos policy work-item-linking
-        - name: create
-          uid: az_repos_policy_work_item_linking_create
-          displayName: az repos policy work-item-linking create
-        - name: update
-          uid: az_repos_policy_work_item_linking_update
-          displayName: az repos policy work-item-linking update
-    - name: pr
-      displayName: az repos pr
-      items:
-      - name: Overview
-        uid: az_repos_pr
-        displayName: az repos pr
-      - name: checkout
-        uid: az_repos_pr_checkout
-        displayName: az repos pr checkout
-      - name: create
-        uid: az_repos_pr_create
-        displayName: az repos pr create
-      - name: list
-        uid: az_repos_pr_list
-        displayName: az repos pr list
-      - name: set-vote
-        uid: az_repos_pr_set_vote
-        displayName: az repos pr set-vote
-      - name: show
-        uid: az_repos_pr_show
-        displayName: az repos pr show
-      - name: update
-        uid: az_repos_pr_update
-        displayName: az repos pr update
-      - name: policy
-        displayName: az repos pr policy
-        items:
-        - name: Overview
-          uid: az_repos_pr_policy
-          displayName: az repos pr policy
-        - name: list
-          uid: az_repos_pr_policy_list
-          displayName: az repos pr policy list
-        - name: queue
-          uid: az_repos_pr_policy_queue
-          displayName: az repos pr policy queue
-      - name: reviewer
-        displayName: az repos pr reviewer
-        items:
-        - name: Overview
-          uid: az_repos_pr_reviewer
-          displayName: az repos pr reviewer
-        - name: add
-          uid: az_repos_pr_reviewer_add
-          displayName: az repos pr reviewer add
-        - name: list
-          uid: az_repos_pr_reviewer_list
-          displayName: az repos pr reviewer list
-        - name: remove
-          uid: az_repos_pr_reviewer_remove
-          displayName: az repos pr reviewer remove
-      - name: work-item
-        displayName: az repos pr work-item
-        items:
-        - name: Overview
-          uid: az_repos_pr_work_item
-          displayName: az repos pr work-item
-        - name: add
-          uid: az_repos_pr_work_item_add
-          displayName: az repos pr work-item add
-        - name: list
-          uid: az_repos_pr_work_item_list
-          displayName: az repos pr work-item list
-        - name: remove
-          uid: az_repos_pr_work_item_remove
-          displayName: az repos pr work-item remove
-    - name: ref
-      displayName: az repos ref
-      items:
-      - name: Overview
-        uid: az_repos_ref
-        displayName: az repos ref
-      - name: create
-        uid: az_repos_ref_create
-        displayName: az repos ref create
-      - name: delete
-        uid: az_repos_ref_delete
-        displayName: az repos ref delete
-      - name: list
-        uid: az_repos_ref_list
-        displayName: az repos ref list
-      - name: lock
-        uid: az_repos_ref_lock
-        displayName: az repos ref lock
-      - name: unlock
-        uid: az_repos_ref_unlock
-        displayName: az repos ref unlock
-  - name: security
-    displayName: az security
-    items:
-    - name: Overview
-      uid: az_security
-      displayName: az security
-    - name: alert
-      displayName: az security alert
-      items:
-      - name: Overview
-        uid: az_security_alert
-        displayName: az security alert
-      - name: list
-        uid: az_security_alert_list
-        displayName: az security alert list
-      - name: show
-        uid: az_security_alert_show
-        displayName: az security alert show
-      - name: update
-        uid: az_security_alert_update
-        displayName: az security alert update
-    - name: atp
-      displayName: az security atp
-      items:
-      - name: Overview
-        uid: az_security_atp
-        displayName: az security atp
-      - name: storage
-        displayName: az security atp storage
-        items:
-        - name: Overview
-          uid: az_security_atp_storage
-          displayName: az security atp storage
-        - name: show
-          uid: az_security_atp_storage_show
-          displayName: az security atp storage show
-        - name: update
-          uid: az_security_atp_storage_update
-          displayName: az security atp storage update
-    - name: auto-provisioning-setting
-      displayName: az security auto-provisioning-setting
-      items:
-      - name: Overview
-        uid: az_security_auto_provisioning_setting
-        displayName: az security auto-provisioning-setting
-      - name: list
-        uid: az_security_auto_provisioning_setting_list
-        displayName: az security auto-provisioning-setting list
-      - name: show
-        uid: az_security_auto_provisioning_setting_show
-        displayName: az security auto-provisioning-setting show
-      - name: update
-        uid: az_security_auto_provisioning_setting_update
-        displayName: az security auto-provisioning-setting update
-    - name: contact
-      displayName: az security contact
-      items:
-      - name: Overview
-        uid: az_security_contact
-        displayName: az security contact
-      - name: create
-        uid: az_security_contact_create
-        displayName: az security contact create
-      - name: delete
-        uid: az_security_contact_delete
-        displayName: az security contact delete
-      - name: list
-        uid: az_security_contact_list
-        displayName: az security contact list
-      - name: show
-        uid: az_security_contact_show
-        displayName: az security contact show
-    - name: discovered-security-solution
-      displayName: az security discovered-security-solution
-      items:
-      - name: Overview
-        uid: az_security_discovered_security_solution
-        displayName: az security discovered-security-solution
-      - name: list
-        uid: az_security_discovered_security_solution_list
-        displayName: az security discovered-security-solution list
-      - name: show
-        uid: az_security_discovered_security_solution_show
-        displayName: az security discovered-security-solution show
-    - name: external-security-solution
-      displayName: az security external-security-solution
-      items:
-      - name: Overview
-        uid: az_security_external_security_solution
-        displayName: az security external-security-solution
-      - name: list
-        uid: az_security_external_security_solution_list
-        displayName: az security external-security-solution list
-      - name: show
-        uid: az_security_external_security_solution_show
-        displayName: az security external-security-solution show
-    - name: jit-policy
-      displayName: az security jit-policy
-      items:
-      - name: Overview
-        uid: az_security_jit_policy
-        displayName: az security jit-policy
-      - name: list
-        uid: az_security_jit_policy_list
-        displayName: az security jit-policy list
-      - name: show
-        uid: az_security_jit_policy_show
-        displayName: az security jit-policy show
-    - name: location
-      displayName: az security location
-      items:
-      - name: Overview
-        uid: az_security_location
-        displayName: az security location
-      - name: list
-        uid: az_security_location_list
-        displayName: az security location list
-      - name: show
-        uid: az_security_location_show
-        displayName: az security location show
-    - name: pricing
-      displayName: az security pricing
-      items:
-      - name: Overview
-        uid: az_security_pricing
-        displayName: az security pricing
-      - name: create
-        uid: az_security_pricing_create
-        displayName: az security pricing create
-      - name: list
-        uid: az_security_pricing_list
-        displayName: az security pricing list
-      - name: show
-        uid: az_security_pricing_show
-        displayName: az security pricing show
-    - name: setting
-      displayName: az security setting
-      items:
-      - name: Overview
-        uid: az_security_setting
-        displayName: az security setting
-      - name: list
-        uid: az_security_setting_list
-        displayName: az security setting list
-      - name: show
-        uid: az_security_setting_show
-        displayName: az security setting show
-    - name: task
-      displayName: az security task
-      items:
-      - name: Overview
-        uid: az_security_task
-        displayName: az security task
-      - name: list
-        uid: az_security_task_list
-        displayName: az security task list
-      - name: show
-        uid: az_security_task_show
-        displayName: az security task show
-    - name: topology
-      displayName: az security topology
-      items:
-      - name: Overview
-        uid: az_security_topology
-        displayName: az security topology
-      - name: list
-        uid: az_security_topology_list
-        displayName: az security topology list
-      - name: show
-        uid: az_security_topology_show
-        displayName: az security topology show
-    - name: workspace-setting
-      displayName: az security workspace-setting
-      items:
-      - name: Overview
-        uid: az_security_workspace_setting
-        displayName: az security workspace-setting
-      - name: create
-        uid: az_security_workspace_setting_create
-        displayName: az security workspace-setting create
-      - name: delete
-        uid: az_security_workspace_setting_delete
-        displayName: az security workspace-setting delete
-      - name: list
-        uid: az_security_workspace_setting_list
-        displayName: az security workspace-setting list
-      - name: show
-        uid: az_security_workspace_setting_show
-        displayName: az security workspace-setting show
-- name: Extensions Reference
-  items:
-  - name: account
-    items:
-    - name: Overview
-      uid: ext_account_az
-    - name: Subscriptions
-      displayName: az account
-      items:
-      - name: Overview
-        uid: ext_account_az_account
-        displayName: az account
-      - name: subscription
-        displayName: az account subscription
-        items:
-        - name: Overview
-          uid: ext_account_az_account_subscription
-          displayName: az account subscription
-        - name: cancel
-          uid: ext_account_az_account_subscription_cancel
-          displayName: az account subscription cancel
-        - name: create
-          uid: ext_account_az_account_subscription_create
-          displayName: az account subscription create
-        - name: create-csp
-          uid: ext_account_az_account_subscription_create_csp
-          displayName: az account subscription create-csp
-        - name: create-in-enrollment-account
-          uid: ext_account_az_account_subscription_create_in_enrollment_account
-          displayName: az account subscription create-in-enrollment-account
-        - name: enable
-          uid: ext_account_az_account_subscription_enable
-          displayName: az account subscription enable
-        - name: rename
-          uid: ext_account_az_account_subscription_rename
-          displayName: az account subscription rename
-  - name: aem
-    items:
-    - name: Overview
-      uid: ext_aem_az
-    - name: Virtual Machines
-      displayName: az vm
-      items:
-      - name: Overview
-        uid: ext_aem_az_vm
-        displayName: az vm
-      - name: aem
-        displayName: az vm aem
-        items:
-        - name: Overview
-          uid: ext_aem_az_vm_aem
-          displayName: az vm aem
-        - name: delete
-          uid: ext_aem_az_vm_aem_delete
-          displayName: az vm aem delete
-        - name: set
-          uid: ext_aem_az_vm_aem_set
-          displayName: az vm aem set
-        - name: verify
-          uid: ext_aem_az_vm_aem_verify
-          displayName: az vm aem verify
-  - name: ai-did-you-mean-this
-    items:
-    - name: Overview
-      uid: ext_ai-did-you-mean-this_az
-    - name: ai-did-you-mean-this
-      displayName: az ai-did-you-mean-this
-      items:
-      - name: Overview
-        uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this
-        displayName: az ai-did-you-mean-this
-      - name: version
-        uid: ext_ai-did-you-mean-this_az_ai_did_you_mean_this_version
-        displayName: az ai-did-you-mean-this version
-  - name: ai-examples
-    items:
-    - name: Overview
-      uid: ext_ai-examples_az
-    - name: ai-examples
-      displayName: az ai-examples
-      items:
-      - name: Overview
-        uid: ext_ai-examples_az_ai_examples
-        displayName: az ai-examples
-      - name: check-connection
-        uid: ext_ai-examples_az_ai_examples_check_connection
-        displayName: az ai-examples check-connection
-  - name: aks-preview
-    items:
-    - name: Overview
-      uid: ext_aks-preview_az
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_aks-preview_az_aks
-        displayName: az aks
-      - name: browse
-        uid: ext_aks-preview_az_aks_browse
-        displayName: az aks browse
-      - name: create
-        uid: ext_aks-preview_az_aks_create
-        displayName: az aks create
-      - name: disable-addons
-        uid: ext_aks-preview_az_aks_disable_addons
-        displayName: az aks disable-addons
-      - name: enable-addons
-        uid: ext_aks-preview_az_aks_enable_addons
-        displayName: az aks enable-addons
-      - name: get-credentials
-        uid: ext_aks-preview_az_aks_get_credentials
-        displayName: az aks get-credentials
-      - name: get-upgrades
-        uid: ext_aks-preview_az_aks_get_upgrades
-        displayName: az aks get-upgrades
-      - name: get-versions
-        uid: ext_aks-preview_az_aks_get_versions
-        displayName: az aks get-versions
-      - name: kanalyze
-        uid: ext_aks-preview_az_aks_kanalyze
-        displayName: az aks kanalyze
-      - name: kollect
-        uid: ext_aks-preview_az_aks_kollect
-        displayName: az aks kollect
-      - name: rotate-certs
-        uid: ext_aks-preview_az_aks_rotate_certs
-        displayName: az aks rotate-certs
-      - name: scale
-        uid: ext_aks-preview_az_aks_scale
-        displayName: az aks scale
-      - name: show
-        uid: ext_aks-preview_az_aks_show
-        displayName: az aks show
-      - name: update
-        uid: ext_aks-preview_az_aks_update
-        displayName: az aks update
-      - name: upgrade
-        uid: ext_aks-preview_az_aks_upgrade
-        displayName: az aks upgrade
-      - name: wait
-        uid: ext_aks-preview_az_aks_wait
-        displayName: az aks wait
-      - name: nodepool
-        displayName: az aks nodepool
-        items:
-        - name: Overview
-          uid: ext_aks-preview_az_aks_nodepool
-          displayName: az aks nodepool
-        - name: add
-          uid: ext_aks-preview_az_aks_nodepool_add
-          displayName: az aks nodepool add
-        - name: delete
-          uid: ext_aks-preview_az_aks_nodepool_delete
-          displayName: az aks nodepool delete
-        - name: list
-          uid: ext_aks-preview_az_aks_nodepool_list
-          displayName: az aks nodepool list
-        - name: scale
-          uid: ext_aks-preview_az_aks_nodepool_scale
-          displayName: az aks nodepool scale
-        - name: show
-          uid: ext_aks-preview_az_aks_nodepool_show
-          displayName: az aks nodepool show
-        - name: update
-          uid: ext_aks-preview_az_aks_nodepool_update
-          displayName: az aks nodepool update
-        - name: upgrade
-          uid: ext_aks-preview_az_aks_nodepool_upgrade
-          displayName: az aks nodepool upgrade
-  - name: alertsmanagement
-    items:
-    - name: Overview
-      uid: ext_alertsmanagement_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_alertsmanagement_az_monitor
-        displayName: az monitor
-      - name: action-rule
-        displayName: az monitor action-rule
-        items:
-        - name: Overview
-          uid: ext_alertsmanagement_az_monitor_action_rule
-          displayName: az monitor action-rule
-        - name: create
-          uid: ext_alertsmanagement_az_monitor_action_rule_create
-          displayName: az monitor action-rule create
-        - name: delete
-          uid: ext_alertsmanagement_az_monitor_action_rule_delete
-          displayName: az monitor action-rule delete
-        - name: list
-          uid: ext_alertsmanagement_az_monitor_action_rule_list
-          displayName: az monitor action-rule list
-        - name: show
-          uid: ext_alertsmanagement_az_monitor_action_rule_show
-          displayName: az monitor action-rule show
-        - name: update
-          uid: ext_alertsmanagement_az_monitor_action_rule_update
-          displayName: az monitor action-rule update
-  - name: alias
-    items:
-    - name: Overview
-      uid: ext_alias_az
-    - name: alias
-      displayName: az alias
-      items:
-      - name: Overview
-        uid: ext_alias_az_alias
-        displayName: az alias
-      - name: create
-        uid: ext_alias_az_alias_create
-        displayName: az alias create
-      - name: export
-        uid: ext_alias_az_alias_export
-        displayName: az alias export
-      - name: import
-        uid: ext_alias_az_alias_import
-        displayName: az alias import
-      - name: list
-        uid: ext_alias_az_alias_list
-        displayName: az alias list
-      - name: remove
-        uid: ext_alias_az_alias_remove
-        displayName: az alias remove
-      - name: remove-all
-        uid: ext_alias_az_alias_remove_all
-        displayName: az alias remove-all
-  - name: application-insights
-    items:
-    - name: Overview
-      uid: ext_application-insights_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_application-insights_az_monitor
-        displayName: az monitor
-      - name: app-insights
-        displayName: az monitor app-insights
-        items:
-        - name: Overview
-          uid: ext_application-insights_az_monitor_app_insights
-          displayName: az monitor app-insights
-        - name: query
-          uid: ext_application-insights_az_monitor_app_insights_query
-          displayName: az monitor app-insights query
-        - name: api-key
-          displayName: az monitor app-insights api-key
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_api_key
-            displayName: az monitor app-insights api-key
-          - name: create
-            uid: ext_application-insights_az_monitor_app_insights_api_key_create
-            displayName: az monitor app-insights api-key create
-          - name: delete
-            uid: ext_application-insights_az_monitor_app_insights_api_key_delete
-            displayName: az monitor app-insights api-key delete
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_api_key_show
-            displayName: az monitor app-insights api-key show
-        - name: component
-          displayName: az monitor app-insights component
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_component
-            displayName: az monitor app-insights component
-          - name: create
-            uid: ext_application-insights_az_monitor_app_insights_component_create
-            displayName: az monitor app-insights component create
-          - name: delete
-            uid: ext_application-insights_az_monitor_app_insights_component_delete
-            displayName: az monitor app-insights component delete
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_component_show
-            displayName: az monitor app-insights component show
-          - name: update
-            uid: ext_application-insights_az_monitor_app_insights_component_update
-            displayName: az monitor app-insights component update
-          - name: update-tags
-            uid: ext_application-insights_az_monitor_app_insights_component_update_tags
-            displayName: az monitor app-insights component update-tags
-          - name: billing
-            displayName: az monitor app-insights component billing
-            items:
-            - name: Overview
-              uid: ext_application-insights_az_monitor_app_insights_component_billing
-              displayName: az monitor app-insights component billing
-            - name: show
-              uid: ext_application-insights_az_monitor_app_insights_component_billing_show
-              displayName: az monitor app-insights component billing show
-            - name: update
-              uid: ext_application-insights_az_monitor_app_insights_component_billing_update
-              displayName: az monitor app-insights component billing update
-          - name: linked-storage
-            displayName: az monitor app-insights component linked-storage
-            items:
-            - name: Overview
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage
-              displayName: az monitor app-insights component linked-storage
-            - name: link
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_link
-              displayName: az monitor app-insights component linked-storage link
-            - name: show
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_show
-              displayName: az monitor app-insights component linked-storage show
-            - name: unlink
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_unlink
-              displayName: az monitor app-insights component linked-storage unlink
-            - name: update
-              uid: ext_application-insights_az_monitor_app_insights_component_linked_storage_update
-              displayName: az monitor app-insights component linked-storage update
-        - name: events
-          displayName: az monitor app-insights events
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_events
-            displayName: az monitor app-insights events
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_events_show
-            displayName: az monitor app-insights events show
-        - name: metrics
-          displayName: az monitor app-insights metrics
-          items:
-          - name: Overview
-            uid: ext_application-insights_az_monitor_app_insights_metrics
-            displayName: az monitor app-insights metrics
-          - name: get-metadata
-            uid: ext_application-insights_az_monitor_app_insights_metrics_get_metadata
-            displayName: az monitor app-insights metrics get-metadata
-          - name: show
-            uid: ext_application-insights_az_monitor_app_insights_metrics_show
-            displayName: az monitor app-insights metrics show
-  - name: azure-batch-cli-extensions
-    items:
-    - name: Overview
-      uid: ext_azure-batch-cli-extensions_az
-    - name: Batch
-      displayName: az batch
-      items:
-      - name: Overview
-        uid: ext_azure-batch-cli-extensions_az_batch
-        displayName: az batch
-      - name: Jobs
-        displayName: az batch job
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_job
-          displayName: az batch job
-        - name: create
-          uid: ext_azure-batch-cli-extensions_az_batch_job_create
-          displayName: az batch job create
-      - name: Pools
-        displayName: az batch pool
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_pool
-          displayName: az batch pool
-        - name: create
-          uid: ext_azure-batch-cli-extensions_az_batch_pool_create
-          displayName: az batch pool create
-      - name: file
-        displayName: az batch file
-        items:
-        - name: Overview
-          uid: ext_azure-batch-cli-extensions_az_batch_file
-          displayName: az batch file
-        - name: download
-          uid: ext_azure-batch-cli-extensions_az_batch_file_download
-          displayName: az batch file download
-        - name: upload
-          uid: ext_azure-batch-cli-extensions_az_batch_file_upload
-          displayName: az batch file upload
-  - name: azure-cli-iot-ext
-    items:
-    - name: Overview
-      uid: ext_azure-cli-iot-ext_az
-    - name: IoT
-      displayName: az iot
-      items:
-      - name: Overview
-        uid: ext_azure-cli-iot-ext_az_iot
-        displayName: az iot
-      - name: Devices
-        displayName: az iot device
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_device
-          displayName: az iot device
-        - name: send-d2c-message
-          uid: ext_azure-cli-iot-ext_az_iot_device_send_d2c_message
-          displayName: az iot device send-d2c-message
-        - name: simulate
-          uid: ext_azure-cli-iot-ext_az_iot_device_simulate
-          displayName: az iot device simulate
-        - name: upload-file
-          uid: ext_azure-cli-iot-ext_az_iot_device_upload_file
-          displayName: az iot device upload-file
-        - name: c2d-message
-          displayName: az iot device c2d-message
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message
-            displayName: az iot device c2d-message
-          - name: abandon
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_abandon
-            displayName: az iot device c2d-message abandon
-          - name: complete
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_complete
-            displayName: az iot device c2d-message complete
-          - name: receive
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_receive
-            displayName: az iot device c2d-message receive
-          - name: reject
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_reject
-            displayName: az iot device c2d-message reject
-          - name: send
-            uid: ext_azure-cli-iot-ext_az_iot_device_c2d_message_send
-            displayName: az iot device c2d-message send
-      - name: Hubs
-        displayName: az iot hub
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_hub
-          displayName: az iot hub
-        - name: generate-sas-token
-          uid: ext_azure-cli-iot-ext_az_iot_hub_generate_sas_token
-          displayName: az iot hub generate-sas-token
-        - name: invoke-device-method
-          uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_device_method
-          displayName: az iot hub invoke-device-method
-        - name: invoke-module-method
-          uid: ext_azure-cli-iot-ext_az_iot_hub_invoke_module_method
-          displayName: az iot hub invoke-module-method
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_events
-          displayName: az iot hub monitor-events
-        - name: monitor-feedback
-          uid: ext_azure-cli-iot-ext_az_iot_hub_monitor_feedback
-          displayName: az iot hub monitor-feedback
-        - name: query
-          uid: ext_azure-cli-iot-ext_az_iot_hub_query
-          displayName: az iot hub query
-        - name: Jobs
-          displayName: az iot hub job
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job
-            displayName: az iot hub job
-          - name: cancel
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_cancel
-            displayName: az iot hub job cancel
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_create
-            displayName: az iot hub job create
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_list
-            displayName: az iot hub job list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_job_show
-            displayName: az iot hub job show
-        - name: configuration
-          displayName: az iot hub configuration
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration
-            displayName: az iot hub configuration
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_create
-            displayName: az iot hub configuration create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_delete
-            displayName: az iot hub configuration delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_list
-            displayName: az iot hub configuration list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show
-            displayName: az iot hub configuration show
-          - name: show-metric
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_show_metric
-            displayName: az iot hub configuration show-metric
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_configuration_update
-            displayName: az iot hub configuration update
-        - name: device-identity
-          displayName: az iot hub device-identity
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity
-            displayName: az iot hub device-identity
-          - name: add-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_add_children
-            displayName: az iot hub device-identity add-children
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_create
-            displayName: az iot hub device-identity create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_delete
-            displayName: az iot hub device-identity delete
-          - name: export
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_export
-            displayName: az iot hub device-identity export
-          - name: get-parent
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_get_parent
-            displayName: az iot hub device-identity get-parent
-          - name: import
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_import
-            displayName: az iot hub device-identity import
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list
-            displayName: az iot hub device-identity list
-          - name: list-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_list_children
-            displayName: az iot hub device-identity list-children
-          - name: remove-children
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_remove_children
-            displayName: az iot hub device-identity remove-children
-          - name: set-parent
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_set_parent
-            displayName: az iot hub device-identity set-parent
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show
-            displayName: az iot hub device-identity show
-          - name: show-connection-string
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_show_connection_string
-            displayName: az iot hub device-identity show-connection-string
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_identity_update
-            displayName: az iot hub device-identity update
-        - name: device-twin
-          displayName: az iot hub device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin
-            displayName: az iot hub device-twin
-          - name: replace
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_replace
-            displayName: az iot hub device-twin replace
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_show
-            displayName: az iot hub device-twin show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_device_twin_update
-            displayName: az iot hub device-twin update
-        - name: distributed-tracing
-          displayName: az iot hub distributed-tracing
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing
-            displayName: az iot hub distributed-tracing
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_show
-            displayName: az iot hub distributed-tracing show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_distributed_tracing_update
-            displayName: az iot hub distributed-tracing update
-        - name: module-identity
-          displayName: az iot hub module-identity
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity
-            displayName: az iot hub module-identity
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_create
-            displayName: az iot hub module-identity create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_delete
-            displayName: az iot hub module-identity delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_list
-            displayName: az iot hub module-identity list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show
-            displayName: az iot hub module-identity show
-          - name: show-connection-string
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_show_connection_string
-            displayName: az iot hub module-identity show-connection-string
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_identity_update
-            displayName: az iot hub module-identity update
-        - name: module-twin
-          displayName: az iot hub module-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin
-            displayName: az iot hub module-twin
-          - name: replace
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_replace
-            displayName: az iot hub module-twin replace
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_show
-            displayName: az iot hub module-twin show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_hub_module_twin_update
-            displayName: az iot hub module-twin update
-      - name: central
-        displayName: az iot central
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_central
-          displayName: az iot central
-        - name: app
-          displayName: az iot central app
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_central_app
-            displayName: az iot central app
-          - name: monitor-events
-            uid: ext_azure-cli-iot-ext_az_iot_central_app_monitor_events
-            displayName: az iot central app monitor-events
-        - name: device-twin
-          displayName: az iot central device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_central_device_twin
-            displayName: az iot central device-twin
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_central_device_twin_show
-            displayName: az iot central device-twin show
-      - name: dps
-        displayName: az iot dps
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_dps
-          displayName: az iot dps
-        - name: enrollment
-          displayName: az iot dps enrollment
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment
-            displayName: az iot dps enrollment
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_create
-            displayName: az iot dps enrollment create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_delete
-            displayName: az iot dps enrollment delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_list
-            displayName: az iot dps enrollment list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_show
-            displayName: az iot dps enrollment show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_update
-            displayName: az iot dps enrollment update
-        - name: enrollment-group
-          displayName: az iot dps enrollment-group
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group
-            displayName: az iot dps enrollment-group
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_create
-            displayName: az iot dps enrollment-group create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_delete
-            displayName: az iot dps enrollment-group delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_list
-            displayName: az iot dps enrollment-group list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_show
-            displayName: az iot dps enrollment-group show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_dps_enrollment_group_update
-            displayName: az iot dps enrollment-group update
-        - name: registration
-          displayName: az iot dps registration
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration
-            displayName: az iot dps registration
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_delete
-            displayName: az iot dps registration delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_list
-            displayName: az iot dps registration list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_dps_registration_show
-            displayName: az iot dps registration show
-      - name: dt
-        displayName: az iot dt
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_dt
-          displayName: az iot dt
-        - name: invoke-command
-          uid: ext_azure-cli-iot-ext_az_iot_dt_invoke_command
-          displayName: az iot dt invoke-command
-        - name: list-commands
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_commands
-          displayName: az iot dt list-commands
-        - name: list-interfaces
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_interfaces
-          displayName: az iot dt list-interfaces
-        - name: list-properties
-          uid: ext_azure-cli-iot-ext_az_iot_dt_list_properties
-          displayName: az iot dt list-properties
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iot_dt_monitor_events
-          displayName: az iot dt monitor-events
-        - name: update-property
-          uid: ext_azure-cli-iot-ext_az_iot_dt_update_property
-          displayName: az iot dt update-property
-      - name: edge
-        displayName: az iot edge
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_edge
-          displayName: az iot edge
-        - name: set-modules
-          uid: ext_azure-cli-iot-ext_az_iot_edge_set_modules
-          displayName: az iot edge set-modules
-        - name: deployment
-          displayName: az iot edge deployment
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment
-            displayName: az iot edge deployment
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_create
-            displayName: az iot edge deployment create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_delete
-            displayName: az iot edge deployment delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_list
-            displayName: az iot edge deployment list
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show
-            displayName: az iot edge deployment show
-          - name: show-metric
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_show_metric
-            displayName: az iot edge deployment show-metric
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_edge_deployment_update
-            displayName: az iot edge deployment update
-      - name: pnp
-        displayName: az iot pnp
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iot_pnp
-          displayName: az iot pnp
-        - name: capability-model
-          displayName: az iot pnp capability-model
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model
-            displayName: az iot pnp capability-model
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_create
-            displayName: az iot pnp capability-model create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_delete
-            displayName: az iot pnp capability-model delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_list
-            displayName: az iot pnp capability-model list
-          - name: publish
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_publish
-            displayName: az iot pnp capability-model publish
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_show
-            displayName: az iot pnp capability-model show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_capability_model_update
-            displayName: az iot pnp capability-model update
-        - name: interface
-          displayName: az iot pnp interface
-          items:
-          - name: Overview
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface
-            displayName: az iot pnp interface
-          - name: create
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_create
-            displayName: az iot pnp interface create
-          - name: delete
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_delete
-            displayName: az iot pnp interface delete
-          - name: list
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_list
-            displayName: az iot pnp interface list
-          - name: publish
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_publish
-            displayName: az iot pnp interface publish
-          - name: show
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_show
-            displayName: az iot pnp interface show
-          - name: update
-            uid: ext_azure-cli-iot-ext_az_iot_pnp_interface_update
-            displayName: az iot pnp interface update
-    - name: iotcentral
-      displayName: az iotcentral
-      items:
-      - name: Overview
-        uid: ext_azure-cli-iot-ext_az_iotcentral
-        displayName: az iotcentral
-      - name: app
-        displayName: az iotcentral app
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iotcentral_app
-          displayName: az iotcentral app
-        - name: monitor-events
-          uid: ext_azure-cli-iot-ext_az_iotcentral_app_monitor_events
-          displayName: az iotcentral app monitor-events
-      - name: device-twin
-        displayName: az iotcentral device-twin
-        items:
-        - name: Overview
-          uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin
-          displayName: az iotcentral device-twin
-        - name: show
-          uid: ext_azure-cli-iot-ext_az_iotcentral_device_twin_show
-          displayName: az iotcentral device-twin show
-  - name: azure-cli-ml
-    items:
-    - name: Overview
-      uid: ext_azure-cli-ml_az
-    - name: ml
-      displayName: az ml
-      items:
-      - name: Overview
-        uid: ext_azure-cli-ml_az_ml
-        displayName: az ml
-      - name: computetarget
-        displayName: az ml computetarget
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_computetarget
-          displayName: az ml computetarget
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_computetarget_delete
-          displayName: az ml computetarget delete
-        - name: detach
-          uid: ext_azure-cli-ml_az_ml_computetarget_detach
-          displayName: az ml computetarget detach
-        - name: get-credentials
-          uid: ext_azure-cli-ml_az_ml_computetarget_get_credentials
-          displayName: az ml computetarget get-credentials
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_computetarget_list
-          displayName: az ml computetarget list
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_computetarget_show
-          displayName: az ml computetarget show
-        - name: amlcompute
-          displayName: az ml computetarget amlcompute
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute
-            displayName: az ml computetarget amlcompute
-          - name: identity
-            displayName: az ml computetarget amlcompute identity
-            items:
-            - name: Overview
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity
-              displayName: az ml computetarget amlcompute identity
-            - name: assign
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_assign
-              displayName: az ml computetarget amlcompute identity assign
-            - name: remove
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_remove
-              displayName: az ml computetarget amlcompute identity remove
-            - name: show
-              uid: ext_azure-cli-ml_az_ml_computetarget_amlcompute_identity_show
-              displayName: az ml computetarget amlcompute identity show
-        - name: attach
-          displayName: az ml computetarget attach
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach
-            displayName: az ml computetarget attach
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach_aks
-            displayName: az ml computetarget attach aks
-          - name: remote
-            uid: ext_azure-cli-ml_az_ml_computetarget_attach_remote
-            displayName: az ml computetarget attach remote
-        - name: create
-          displayName: az ml computetarget create
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_create
-            displayName: az ml computetarget create
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_aks
-            displayName: az ml computetarget create aks
-          - name: amlcompute
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_amlcompute
-            displayName: az ml computetarget create amlcompute
-          - name: datafactory
-            uid: ext_azure-cli-ml_az_ml_computetarget_create_datafactory
-            displayName: az ml computetarget create datafactory
-        - name: update
-          displayName: az ml computetarget update
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_computetarget_update
-            displayName: az ml computetarget update
-          - name: aks
-            uid: ext_azure-cli-ml_az_ml_computetarget_update_aks
-            displayName: az ml computetarget update aks
-          - name: amlcompute
-            uid: ext_azure-cli-ml_az_ml_computetarget_update_amlcompute
-            displayName: az ml computetarget update amlcompute
-      - name: dataset
-        displayName: az ml dataset
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_dataset
-          displayName: az ml dataset
-        - name: archive
-          uid: ext_azure-cli-ml_az_ml_dataset_archive
-          displayName: az ml dataset archive
-        - name: deprecate
-          uid: ext_azure-cli-ml_az_ml_dataset_deprecate
-          displayName: az ml dataset deprecate
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_dataset_list
-          displayName: az ml dataset list
-        - name: reactivate
-          uid: ext_azure-cli-ml_az_ml_dataset_reactivate
-          displayName: az ml dataset reactivate
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_dataset_register
-          displayName: az ml dataset register
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_dataset_show
-          displayName: az ml dataset show
-        - name: unregister
-          uid: ext_azure-cli-ml_az_ml_dataset_unregister
-          displayName: az ml dataset unregister
-      - name: datastore
-        displayName: az ml datastore
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_datastore
-          displayName: az ml datastore
-        - name: attach-adls
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_adls
-          displayName: az ml datastore attach-adls
-        - name: attach-adls-gen2
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_adls_gen2
-          displayName: az ml datastore attach-adls-gen2
-        - name: attach-blob
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_blob
-          displayName: az ml datastore attach-blob
-        - name: attach-dbfs
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_dbfs
-          displayName: az ml datastore attach-dbfs
-        - name: attach-file
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_file
-          displayName: az ml datastore attach-file
-        - name: attach-mysqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_mysqldb
-          displayName: az ml datastore attach-mysqldb
-        - name: attach-psqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_psqldb
-          displayName: az ml datastore attach-psqldb
-        - name: attach-sqldb
-          uid: ext_azure-cli-ml_az_ml_datastore_attach_sqldb
-          displayName: az ml datastore attach-sqldb
-        - name: detach
-          uid: ext_azure-cli-ml_az_ml_datastore_detach
-          displayName: az ml datastore detach
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_datastore_download
-          displayName: az ml datastore download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_datastore_list
-          displayName: az ml datastore list
-        - name: set-default
-          uid: ext_azure-cli-ml_az_ml_datastore_set_default
-          displayName: az ml datastore set-default
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_datastore_show
-          displayName: az ml datastore show
-        - name: show-default
-          uid: ext_azure-cli-ml_az_ml_datastore_show_default
-          displayName: az ml datastore show-default
-        - name: upload
-          uid: ext_azure-cli-ml_az_ml_datastore_upload
-          displayName: az ml datastore upload
-      - name: endpoint
-        displayName: az ml endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_endpoint
-          displayName: az ml endpoint
-        - name: realtime
-          displayName: az ml endpoint realtime
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime
-            displayName: az ml endpoint realtime
-          - name: create-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_create_version
-            displayName: az ml endpoint realtime create-version
-          - name: delete
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete
-            displayName: az ml endpoint realtime delete
-          - name: delete-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_delete_version
-            displayName: az ml endpoint realtime delete-version
-          - name: get-access-token
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_access_token
-            displayName: az ml endpoint realtime get-access-token
-          - name: get-keys
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_keys
-            displayName: az ml endpoint realtime get-keys
-          - name: get-logs
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_get_logs
-            displayName: az ml endpoint realtime get-logs
-          - name: list
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_list
-            displayName: az ml endpoint realtime list
-          - name: regen-key
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_regen_key
-            displayName: az ml endpoint realtime regen-key
-          - name: run
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_run
-            displayName: az ml endpoint realtime run
-          - name: show
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_show
-            displayName: az ml endpoint realtime show
-          - name: update
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update
-            displayName: az ml endpoint realtime update
-          - name: update-version
-            uid: ext_azure-cli-ml_az_ml_endpoint_realtime_update_version
-            displayName: az ml endpoint realtime update-version
-      - name: environment
-        displayName: az ml environment
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_environment
-          displayName: az ml environment
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_environment_download
-          displayName: az ml environment download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_environment_list
-          displayName: az ml environment list
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_environment_register
-          displayName: az ml environment register
-        - name: scaffold
-          uid: ext_azure-cli-ml_az_ml_environment_scaffold
-          displayName: az ml environment scaffold
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_environment_show
-          displayName: az ml environment show
-      - name: experiment
-        displayName: az ml experiment
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_experiment
-          displayName: az ml experiment
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_experiment_list
-          displayName: az ml experiment list
-      - name: folder
-        displayName: az ml folder
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_folder
-          displayName: az ml folder
-        - name: attach
-          uid: ext_azure-cli-ml_az_ml_folder_attach
-          displayName: az ml folder attach
-      - name: model
-        displayName: az ml model
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_model
-          displayName: az ml model
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_model_delete
-          displayName: az ml model delete
-        - name: deploy
-          uid: ext_azure-cli-ml_az_ml_model_deploy
-          displayName: az ml model deploy
-        - name: download
-          uid: ext_azure-cli-ml_az_ml_model_download
-          displayName: az ml model download
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_model_list
-          displayName: az ml model list
-        - name: package
-          uid: ext_azure-cli-ml_az_ml_model_package
-          displayName: az ml model package
-        - name: profile
-          uid: ext_azure-cli-ml_az_ml_model_profile
-          displayName: az ml model profile
-        - name: register
-          uid: ext_azure-cli-ml_az_ml_model_register
-          displayName: az ml model register
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_model_show
-          displayName: az ml model show
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_model_update
-          displayName: az ml model update
-      - name: pipeline
-        displayName: az ml pipeline
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_pipeline
-          displayName: az ml pipeline
-        - name: clone
-          uid: ext_azure-cli-ml_az_ml_pipeline_clone
-          displayName: az ml pipeline clone
-        - name: clone-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_clone_draft
-          displayName: az ml pipeline clone-draft
-        - name: create
-          uid: ext_azure-cli-ml_az_ml_pipeline_create
-          displayName: az ml pipeline create
-        - name: create-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_create_draft
-          displayName: az ml pipeline create-draft
-        - name: create-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_create_schedule
-          displayName: az ml pipeline create-schedule
-        - name: delete-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_delete_draft
-          displayName: az ml pipeline delete-draft
-        - name: disable
-          uid: ext_azure-cli-ml_az_ml_pipeline_disable
-          displayName: az ml pipeline disable
-        - name: disable-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_disable_schedule
-          displayName: az ml pipeline disable-schedule
-        - name: enable
-          uid: ext_azure-cli-ml_az_ml_pipeline_enable
-          displayName: az ml pipeline enable
-        - name: enable-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_enable_schedule
-          displayName: az ml pipeline enable-schedule
-        - name: get
-          uid: ext_azure-cli-ml_az_ml_pipeline_get
-          displayName: az ml pipeline get
-        - name: last-pipeline-run
-          uid: ext_azure-cli-ml_az_ml_pipeline_last_pipeline_run
-          displayName: az ml pipeline last-pipeline-run
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_pipeline_list
-          displayName: az ml pipeline list
-        - name: list-drafts
-          uid: ext_azure-cli-ml_az_ml_pipeline_list_drafts
-          displayName: az ml pipeline list-drafts
-        - name: list-steps
-          uid: ext_azure-cli-ml_az_ml_pipeline_list_steps
-          displayName: az ml pipeline list-steps
-        - name: pipeline-runs-list
-          uid: ext_azure-cli-ml_az_ml_pipeline_pipeline_runs_list
-          displayName: az ml pipeline pipeline-runs-list
-        - name: publish-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_publish_draft
-          displayName: az ml pipeline publish-draft
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_pipeline_show
-          displayName: az ml pipeline show
-        - name: show-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_show_draft
-          displayName: az ml pipeline show-draft
-        - name: show-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_show_schedule
-          displayName: az ml pipeline show-schedule
-        - name: submit-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_submit_draft
-          displayName: az ml pipeline submit-draft
-        - name: update-draft
-          uid: ext_azure-cli-ml_az_ml_pipeline_update_draft
-          displayName: az ml pipeline update-draft
-        - name: update-schedule
-          uid: ext_azure-cli-ml_az_ml_pipeline_update_schedule
-          displayName: az ml pipeline update-schedule
-      - name: run
-        displayName: az ml run
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_run
-          displayName: az ml run
-        - name: cancel
-          uid: ext_azure-cli-ml_az_ml_run_cancel
-          displayName: az ml run cancel
-        - name: download-logs
-          uid: ext_azure-cli-ml_az_ml_run_download_logs
-          displayName: az ml run download-logs
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_run_list
-          displayName: az ml run list
-        - name: monitor-logs
-          uid: ext_azure-cli-ml_az_ml_run_monitor_logs
-          displayName: az ml run monitor-logs
-        - name: monitor-tensorboard
-          uid: ext_azure-cli-ml_az_ml_run_monitor_tensorboard
-          displayName: az ml run monitor-tensorboard
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_run_show
-          displayName: az ml run show
-        - name: submit-hyperdrive
-          uid: ext_azure-cli-ml_az_ml_run_submit_hyperdrive
-          displayName: az ml run submit-hyperdrive
-        - name: submit-pipeline
-          uid: ext_azure-cli-ml_az_ml_run_submit_pipeline
-          displayName: az ml run submit-pipeline
-        - name: submit-script
-          uid: ext_azure-cli-ml_az_ml_run_submit_script
-          displayName: az ml run submit-script
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_run_update
-          displayName: az ml run update
-      - name: service
-        displayName: az ml service
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_service
-          displayName: az ml service
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_service_delete
-          displayName: az ml service delete
-        - name: get-access-token
-          uid: ext_azure-cli-ml_az_ml_service_get_access_token
-          displayName: az ml service get-access-token
-        - name: get-keys
-          uid: ext_azure-cli-ml_az_ml_service_get_keys
-          displayName: az ml service get-keys
-        - name: get-logs
-          uid: ext_azure-cli-ml_az_ml_service_get_logs
-          displayName: az ml service get-logs
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_service_list
-          displayName: az ml service list
-        - name: regen-key
-          uid: ext_azure-cli-ml_az_ml_service_regen_key
-          displayName: az ml service regen-key
-        - name: run
-          uid: ext_azure-cli-ml_az_ml_service_run
-          displayName: az ml service run
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_service_show
-          displayName: az ml service show
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_service_update
-          displayName: az ml service update
-      - name: workspace
-        displayName: az ml workspace
-        items:
-        - name: Overview
-          uid: ext_azure-cli-ml_az_ml_workspace
-          displayName: az ml workspace
-        - name: create
-          uid: ext_azure-cli-ml_az_ml_workspace_create
-          displayName: az ml workspace create
-        - name: delete
-          uid: ext_azure-cli-ml_az_ml_workspace_delete
-          displayName: az ml workspace delete
-        - name: list
-          uid: ext_azure-cli-ml_az_ml_workspace_list
-          displayName: az ml workspace list
-        - name: share
-          uid: ext_azure-cli-ml_az_ml_workspace_share
-          displayName: az ml workspace share
-        - name: show
-          uid: ext_azure-cli-ml_az_ml_workspace_show
-          displayName: az ml workspace show
-        - name: sync-keys
-          uid: ext_azure-cli-ml_az_ml_workspace_sync_keys
-          displayName: az ml workspace sync-keys
-        - name: update
-          uid: ext_azure-cli-ml_az_ml_workspace_update
-          displayName: az ml workspace update
-        - name: private-endpoint
-          displayName: az ml workspace private-endpoint
-          items:
-          - name: Overview
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint
-            displayName: az ml workspace private-endpoint
-          - name: add
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_add
-            displayName: az ml workspace private-endpoint add
-          - name: delete
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_delete
-            displayName: az ml workspace private-endpoint delete
-          - name: list
-            uid: ext_azure-cli-ml_az_ml_workspace_private_endpoint_list
-            displayName: az ml workspace private-endpoint list
-  - name: azure-devops
-    items:
-    - name: Overview
-      uid: ext_azure-devops_az
-    - name: artifacts
-      displayName: az artifacts
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_artifacts
-        displayName: az artifacts
-      - name: universal
-        displayName: az artifacts universal
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_artifacts_universal
-          displayName: az artifacts universal
-        - name: download
-          uid: ext_azure-devops_az_artifacts_universal_download
-          displayName: az artifacts universal download
-        - name: publish
-          uid: ext_azure-devops_az_artifacts_universal_publish
-          displayName: az artifacts universal publish
-    - name: boards
-      displayName: az boards
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_boards
-        displayName: az boards
-      - name: query
-        uid: ext_azure-devops_az_boards_query
-        displayName: az boards query
-      - name: area
-        displayName: az boards area
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_area
-          displayName: az boards area
-        - name: project
-          displayName: az boards area project
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_area_project
-            displayName: az boards area project
-          - name: create
-            uid: ext_azure-devops_az_boards_area_project_create
-            displayName: az boards area project create
-          - name: delete
-            uid: ext_azure-devops_az_boards_area_project_delete
-            displayName: az boards area project delete
-          - name: list
-            uid: ext_azure-devops_az_boards_area_project_list
-            displayName: az boards area project list
-          - name: show
-            uid: ext_azure-devops_az_boards_area_project_show
-            displayName: az boards area project show
-          - name: update
-            uid: ext_azure-devops_az_boards_area_project_update
-            displayName: az boards area project update
-        - name: team
-          displayName: az boards area team
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_area_team
-            displayName: az boards area team
-          - name: add
-            uid: ext_azure-devops_az_boards_area_team_add
-            displayName: az boards area team add
-          - name: list
-            uid: ext_azure-devops_az_boards_area_team_list
-            displayName: az boards area team list
-          - name: remove
-            uid: ext_azure-devops_az_boards_area_team_remove
-            displayName: az boards area team remove
-          - name: update
-            uid: ext_azure-devops_az_boards_area_team_update
-            displayName: az boards area team update
-      - name: iteration
-        displayName: az boards iteration
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_iteration
-          displayName: az boards iteration
-        - name: project
-          displayName: az boards iteration project
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_iteration_project
-            displayName: az boards iteration project
-          - name: create
-            uid: ext_azure-devops_az_boards_iteration_project_create
-            displayName: az boards iteration project create
-          - name: delete
-            uid: ext_azure-devops_az_boards_iteration_project_delete
-            displayName: az boards iteration project delete
-          - name: list
-            uid: ext_azure-devops_az_boards_iteration_project_list
-            displayName: az boards iteration project list
-          - name: show
-            uid: ext_azure-devops_az_boards_iteration_project_show
-            displayName: az boards iteration project show
-          - name: update
-            uid: ext_azure-devops_az_boards_iteration_project_update
-            displayName: az boards iteration project update
-        - name: team
-          displayName: az boards iteration team
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_iteration_team
-            displayName: az boards iteration team
-          - name: add
-            uid: ext_azure-devops_az_boards_iteration_team_add
-            displayName: az boards iteration team add
-          - name: list
-            uid: ext_azure-devops_az_boards_iteration_team_list
-            displayName: az boards iteration team list
-          - name: list-work-items
-            uid: ext_azure-devops_az_boards_iteration_team_list_work_items
-            displayName: az boards iteration team list-work-items
-          - name: remove
-            uid: ext_azure-devops_az_boards_iteration_team_remove
-            displayName: az boards iteration team remove
-          - name: set-backlog-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_set_backlog_iteration
-            displayName: az boards iteration team set-backlog-iteration
-          - name: set-default-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_set_default_iteration
-            displayName: az boards iteration team set-default-iteration
-          - name: show-backlog-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_show_backlog_iteration
-            displayName: az boards iteration team show-backlog-iteration
-          - name: show-default-iteration
-            uid: ext_azure-devops_az_boards_iteration_team_show_default_iteration
-            displayName: az boards iteration team show-default-iteration
-      - name: work-item
-        displayName: az boards work-item
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_boards_work_item
-          displayName: az boards work-item
-        - name: create
-          uid: ext_azure-devops_az_boards_work_item_create
-          displayName: az boards work-item create
-        - name: delete
-          uid: ext_azure-devops_az_boards_work_item_delete
-          displayName: az boards work-item delete
-        - name: show
-          uid: ext_azure-devops_az_boards_work_item_show
-          displayName: az boards work-item show
-        - name: update
-          uid: ext_azure-devops_az_boards_work_item_update
-          displayName: az boards work-item update
-        - name: relation
-          displayName: az boards work-item relation
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_boards_work_item_relation
-            displayName: az boards work-item relation
-          - name: add
-            uid: ext_azure-devops_az_boards_work_item_relation_add
-            displayName: az boards work-item relation add
-          - name: list-type
-            uid: ext_azure-devops_az_boards_work_item_relation_list_type
-            displayName: az boards work-item relation list-type
-          - name: remove
-            uid: ext_azure-devops_az_boards_work_item_relation_remove
-            displayName: az boards work-item relation remove
-          - name: show
-            uid: ext_azure-devops_az_boards_work_item_relation_show
-            displayName: az boards work-item relation show
-    - name: devops
-      displayName: az devops
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_devops
-        displayName: az devops
-      - name: configure
-        uid: ext_azure-devops_az_devops_configure
-        displayName: az devops configure
-      - name: feedback
-        uid: ext_azure-devops_az_devops_feedback
-        displayName: az devops feedback
-      - name: invoke
-        uid: ext_azure-devops_az_devops_invoke
-        displayName: az devops invoke
-      - name: login
-        uid: ext_azure-devops_az_devops_login
-        displayName: az devops login
-      - name: logout
-        uid: ext_azure-devops_az_devops_logout
-        displayName: az devops logout
-      - name: admin
-        displayName: az devops admin
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_admin
-          displayName: az devops admin
-        - name: banner
-          displayName: az devops admin banner
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_admin_banner
-            displayName: az devops admin banner
-          - name: add
-            uid: ext_azure-devops_az_devops_admin_banner_add
-            displayName: az devops admin banner add
-          - name: list
-            uid: ext_azure-devops_az_devops_admin_banner_list
-            displayName: az devops admin banner list
-          - name: remove
-            uid: ext_azure-devops_az_devops_admin_banner_remove
-            displayName: az devops admin banner remove
-          - name: show
-            uid: ext_azure-devops_az_devops_admin_banner_show
-            displayName: az devops admin banner show
-          - name: update
-            uid: ext_azure-devops_az_devops_admin_banner_update
-            displayName: az devops admin banner update
-      - name: extension
-        displayName: az devops extension
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_extension
-          displayName: az devops extension
-        - name: disable
-          uid: ext_azure-devops_az_devops_extension_disable
-          displayName: az devops extension disable
-        - name: enable
-          uid: ext_azure-devops_az_devops_extension_enable
-          displayName: az devops extension enable
-        - name: install
-          uid: ext_azure-devops_az_devops_extension_install
-          displayName: az devops extension install
-        - name: list
-          uid: ext_azure-devops_az_devops_extension_list
-          displayName: az devops extension list
-        - name: search
-          uid: ext_azure-devops_az_devops_extension_search
-          displayName: az devops extension search
-        - name: show
-          uid: ext_azure-devops_az_devops_extension_show
-          displayName: az devops extension show
-        - name: uninstall
-          uid: ext_azure-devops_az_devops_extension_uninstall
-          displayName: az devops extension uninstall
-      - name: project
-        displayName: az devops project
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_project
-          displayName: az devops project
-        - name: create
-          uid: ext_azure-devops_az_devops_project_create
-          displayName: az devops project create
-        - name: delete
-          uid: ext_azure-devops_az_devops_project_delete
-          displayName: az devops project delete
-        - name: list
-          uid: ext_azure-devops_az_devops_project_list
-          displayName: az devops project list
-        - name: show
-          uid: ext_azure-devops_az_devops_project_show
-          displayName: az devops project show
-      - name: security
-        displayName: az devops security
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_security
-          displayName: az devops security
-        - name: group
-          displayName: az devops security group
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_security_group
-            displayName: az devops security group
-          - name: create
-            uid: ext_azure-devops_az_devops_security_group_create
-            displayName: az devops security group create
-          - name: delete
-            uid: ext_azure-devops_az_devops_security_group_delete
-            displayName: az devops security group delete
-          - name: list
-            uid: ext_azure-devops_az_devops_security_group_list
-            displayName: az devops security group list
-          - name: show
-            uid: ext_azure-devops_az_devops_security_group_show
-            displayName: az devops security group show
-          - name: update
-            uid: ext_azure-devops_az_devops_security_group_update
-            displayName: az devops security group update
-          - name: membership
-            displayName: az devops security group membership
-            items:
-            - name: Overview
-              uid: ext_azure-devops_az_devops_security_group_membership
-              displayName: az devops security group membership
-            - name: add
-              uid: ext_azure-devops_az_devops_security_group_membership_add
-              displayName: az devops security group membership add
-            - name: list
-              uid: ext_azure-devops_az_devops_security_group_membership_list
-              displayName: az devops security group membership list
-            - name: remove
-              uid: ext_azure-devops_az_devops_security_group_membership_remove
-              displayName: az devops security group membership remove
-        - name: permission
-          displayName: az devops security permission
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_security_permission
-            displayName: az devops security permission
-          - name: list
-            uid: ext_azure-devops_az_devops_security_permission_list
-            displayName: az devops security permission list
-          - name: reset
-            uid: ext_azure-devops_az_devops_security_permission_reset
-            displayName: az devops security permission reset
-          - name: reset-all
-            uid: ext_azure-devops_az_devops_security_permission_reset_all
-            displayName: az devops security permission reset-all
-          - name: show
-            uid: ext_azure-devops_az_devops_security_permission_show
-            displayName: az devops security permission show
-          - name: update
-            uid: ext_azure-devops_az_devops_security_permission_update
-            displayName: az devops security permission update
-          - name: namespace
-            displayName: az devops security permission namespace
-            items:
-            - name: Overview
-              uid: ext_azure-devops_az_devops_security_permission_namespace
-              displayName: az devops security permission namespace
-            - name: list
-              uid: ext_azure-devops_az_devops_security_permission_namespace_list
-              displayName: az devops security permission namespace list
-            - name: show
-              uid: ext_azure-devops_az_devops_security_permission_namespace_show
-              displayName: az devops security permission namespace show
-      - name: service-endpoint
-        displayName: az devops service-endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_service_endpoint
-          displayName: az devops service-endpoint
-        - name: create
-          uid: ext_azure-devops_az_devops_service_endpoint_create
-          displayName: az devops service-endpoint create
-        - name: delete
-          uid: ext_azure-devops_az_devops_service_endpoint_delete
-          displayName: az devops service-endpoint delete
-        - name: list
-          uid: ext_azure-devops_az_devops_service_endpoint_list
-          displayName: az devops service-endpoint list
-        - name: show
-          uid: ext_azure-devops_az_devops_service_endpoint_show
-          displayName: az devops service-endpoint show
-        - name: update
-          uid: ext_azure-devops_az_devops_service_endpoint_update
-          displayName: az devops service-endpoint update
-        - name: azurerm
-          displayName: az devops service-endpoint azurerm
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_service_endpoint_azurerm
-            displayName: az devops service-endpoint azurerm
-          - name: create
-            uid: ext_azure-devops_az_devops_service_endpoint_azurerm_create
-            displayName: az devops service-endpoint azurerm create
-        - name: github
-          displayName: az devops service-endpoint github
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_service_endpoint_github
-            displayName: az devops service-endpoint github
-          - name: create
-            uid: ext_azure-devops_az_devops_service_endpoint_github_create
-            displayName: az devops service-endpoint github create
-      - name: team
-        displayName: az devops team
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_team
-          displayName: az devops team
-        - name: create
-          uid: ext_azure-devops_az_devops_team_create
-          displayName: az devops team create
-        - name: delete
-          uid: ext_azure-devops_az_devops_team_delete
-          displayName: az devops team delete
-        - name: list
-          uid: ext_azure-devops_az_devops_team_list
-          displayName: az devops team list
-        - name: list-member
-          uid: ext_azure-devops_az_devops_team_list_member
-          displayName: az devops team list-member
-        - name: show
-          uid: ext_azure-devops_az_devops_team_show
-          displayName: az devops team show
-        - name: update
-          uid: ext_azure-devops_az_devops_team_update
-          displayName: az devops team update
-      - name: user
-        displayName: az devops user
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_user
-          displayName: az devops user
-        - name: add
-          uid: ext_azure-devops_az_devops_user_add
-          displayName: az devops user add
-        - name: list
-          uid: ext_azure-devops_az_devops_user_list
-          displayName: az devops user list
-        - name: remove
-          uid: ext_azure-devops_az_devops_user_remove
-          displayName: az devops user remove
-        - name: show
-          uid: ext_azure-devops_az_devops_user_show
-          displayName: az devops user show
-        - name: update
-          uid: ext_azure-devops_az_devops_user_update
-          displayName: az devops user update
-      - name: wiki
-        displayName: az devops wiki
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_devops_wiki
-          displayName: az devops wiki
-        - name: create
-          uid: ext_azure-devops_az_devops_wiki_create
-          displayName: az devops wiki create
-        - name: delete
-          uid: ext_azure-devops_az_devops_wiki_delete
-          displayName: az devops wiki delete
-        - name: list
-          uid: ext_azure-devops_az_devops_wiki_list
-          displayName: az devops wiki list
-        - name: show
-          uid: ext_azure-devops_az_devops_wiki_show
-          displayName: az devops wiki show
-        - name: page
-          displayName: az devops wiki page
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_devops_wiki_page
-            displayName: az devops wiki page
-          - name: create
-            uid: ext_azure-devops_az_devops_wiki_page_create
-            displayName: az devops wiki page create
-          - name: delete
-            uid: ext_azure-devops_az_devops_wiki_page_delete
-            displayName: az devops wiki page delete
-          - name: show
-            uid: ext_azure-devops_az_devops_wiki_page_show
-            displayName: az devops wiki page show
-          - name: update
-            uid: ext_azure-devops_az_devops_wiki_page_update
-            displayName: az devops wiki page update
-    - name: pipelines
-      displayName: az pipelines
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_pipelines
-        displayName: az pipelines
-      - name: create
-        uid: ext_azure-devops_az_pipelines_create
-        displayName: az pipelines create
-      - name: delete
-        uid: ext_azure-devops_az_pipelines_delete
-        displayName: az pipelines delete
-      - name: list
-        uid: ext_azure-devops_az_pipelines_list
-        displayName: az pipelines list
-      - name: run
-        uid: ext_azure-devops_az_pipelines_run
-        displayName: az pipelines run
-      - name: show
-        uid: ext_azure-devops_az_pipelines_show
-        displayName: az pipelines show
-      - name: update
-        uid: ext_azure-devops_az_pipelines_update
-        displayName: az pipelines update
-      - name: agent
-        displayName: az pipelines agent
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_agent
-          displayName: az pipelines agent
-        - name: list
-          uid: ext_azure-devops_az_pipelines_agent_list
-          displayName: az pipelines agent list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_agent_show
-          displayName: az pipelines agent show
-      - name: build
-        displayName: az pipelines build
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_build
-          displayName: az pipelines build
-        - name: list
-          uid: ext_azure-devops_az_pipelines_build_list
-          displayName: az pipelines build list
-        - name: queue
-          uid: ext_azure-devops_az_pipelines_build_queue
-          displayName: az pipelines build queue
-        - name: show
-          uid: ext_azure-devops_az_pipelines_build_show
-          displayName: az pipelines build show
-        - name: definition
-          displayName: az pipelines build definition
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_build_definition
-            displayName: az pipelines build definition
-          - name: list
-            uid: ext_azure-devops_az_pipelines_build_definition_list
-            displayName: az pipelines build definition list
-          - name: show
-            uid: ext_azure-devops_az_pipelines_build_definition_show
-            displayName: az pipelines build definition show
-        - name: tag
-          displayName: az pipelines build tag
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_build_tag
-            displayName: az pipelines build tag
-          - name: add
-            uid: ext_azure-devops_az_pipelines_build_tag_add
-            displayName: az pipelines build tag add
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_build_tag_delete
-            displayName: az pipelines build tag delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_build_tag_list
-            displayName: az pipelines build tag list
-      - name: folder
-        displayName: az pipelines folder
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_folder
-          displayName: az pipelines folder
-        - name: create
-          uid: ext_azure-devops_az_pipelines_folder_create
-          displayName: az pipelines folder create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_folder_delete
-          displayName: az pipelines folder delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_folder_list
-          displayName: az pipelines folder list
-        - name: update
-          uid: ext_azure-devops_az_pipelines_folder_update
-          displayName: az pipelines folder update
-      - name: pool
-        displayName: az pipelines pool
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_pool
-          displayName: az pipelines pool
-        - name: list
-          uid: ext_azure-devops_az_pipelines_pool_list
-          displayName: az pipelines pool list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_pool_show
-          displayName: az pipelines pool show
-      - name: queue
-        displayName: az pipelines queue
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_queue
-          displayName: az pipelines queue
-        - name: list
-          uid: ext_azure-devops_az_pipelines_queue_list
-          displayName: az pipelines queue list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_queue_show
-          displayName: az pipelines queue show
-      - name: release
-        displayName: az pipelines release
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_release
-          displayName: az pipelines release
-        - name: create
-          uid: ext_azure-devops_az_pipelines_release_create
-          displayName: az pipelines release create
-        - name: list
-          uid: ext_azure-devops_az_pipelines_release_list
-          displayName: az pipelines release list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_release_show
-          displayName: az pipelines release show
-        - name: definition
-          displayName: az pipelines release definition
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_release_definition
-            displayName: az pipelines release definition
-          - name: list
-            uid: ext_azure-devops_az_pipelines_release_definition_list
-            displayName: az pipelines release definition list
-          - name: show
-            uid: ext_azure-devops_az_pipelines_release_definition_show
-            displayName: az pipelines release definition show
-      - name: runs
-        displayName: az pipelines runs
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_runs
-          displayName: az pipelines runs
-        - name: list
-          uid: ext_azure-devops_az_pipelines_runs_list
-          displayName: az pipelines runs list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_runs_show
-          displayName: az pipelines runs show
-        - name: artifact
-          displayName: az pipelines runs artifact
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_runs_artifact
-            displayName: az pipelines runs artifact
-          - name: download
-            uid: ext_azure-devops_az_pipelines_runs_artifact_download
-            displayName: az pipelines runs artifact download
-          - name: list
-            uid: ext_azure-devops_az_pipelines_runs_artifact_list
-            displayName: az pipelines runs artifact list
-          - name: upload
-            uid: ext_azure-devops_az_pipelines_runs_artifact_upload
-            displayName: az pipelines runs artifact upload
-        - name: tag
-          displayName: az pipelines runs tag
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_runs_tag
-            displayName: az pipelines runs tag
-          - name: add
-            uid: ext_azure-devops_az_pipelines_runs_tag_add
-            displayName: az pipelines runs tag add
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_runs_tag_delete
-            displayName: az pipelines runs tag delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_runs_tag_list
-            displayName: az pipelines runs tag list
-      - name: variable
-        displayName: az pipelines variable
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_variable
-          displayName: az pipelines variable
-        - name: create
-          uid: ext_azure-devops_az_pipelines_variable_create
-          displayName: az pipelines variable create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_variable_delete
-          displayName: az pipelines variable delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_variable_list
-          displayName: az pipelines variable list
-        - name: update
-          uid: ext_azure-devops_az_pipelines_variable_update
-          displayName: az pipelines variable update
-      - name: variable-group
-        displayName: az pipelines variable-group
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_pipelines_variable_group
-          displayName: az pipelines variable-group
-        - name: create
-          uid: ext_azure-devops_az_pipelines_variable_group_create
-          displayName: az pipelines variable-group create
-        - name: delete
-          uid: ext_azure-devops_az_pipelines_variable_group_delete
-          displayName: az pipelines variable-group delete
-        - name: list
-          uid: ext_azure-devops_az_pipelines_variable_group_list
-          displayName: az pipelines variable-group list
-        - name: show
-          uid: ext_azure-devops_az_pipelines_variable_group_show
-          displayName: az pipelines variable-group show
-        - name: update
-          uid: ext_azure-devops_az_pipelines_variable_group_update
-          displayName: az pipelines variable-group update
-        - name: variable
-          displayName: az pipelines variable-group variable
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_pipelines_variable_group_variable
-            displayName: az pipelines variable-group variable
-          - name: create
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_create
-            displayName: az pipelines variable-group variable create
-          - name: delete
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_delete
-            displayName: az pipelines variable-group variable delete
-          - name: list
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_list
-            displayName: az pipelines variable-group variable list
-          - name: update
-            uid: ext_azure-devops_az_pipelines_variable_group_variable_update
-            displayName: az pipelines variable-group variable update
-    - name: repos
-      displayName: az repos
-      items:
-      - name: Overview
-        uid: ext_azure-devops_az_repos
-        displayName: az repos
-      - name: create
-        uid: ext_azure-devops_az_repos_create
-        displayName: az repos create
-      - name: delete
-        uid: ext_azure-devops_az_repos_delete
-        displayName: az repos delete
-      - name: list
-        uid: ext_azure-devops_az_repos_list
-        displayName: az repos list
-      - name: show
-        uid: ext_azure-devops_az_repos_show
-        displayName: az repos show
-      - name: update
-        uid: ext_azure-devops_az_repos_update
-        displayName: az repos update
-      - name: import
-        displayName: az repos import
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_import
-          displayName: az repos import
-        - name: create
-          uid: ext_azure-devops_az_repos_import_create
-          displayName: az repos import create
-      - name: policy
-        displayName: az repos policy
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_policy
-          displayName: az repos policy
-        - name: create
-          uid: ext_azure-devops_az_repos_policy_create
-          displayName: az repos policy create
-        - name: delete
-          uid: ext_azure-devops_az_repos_policy_delete
-          displayName: az repos policy delete
-        - name: list
-          uid: ext_azure-devops_az_repos_policy_list
-          displayName: az repos policy list
-        - name: show
-          uid: ext_azure-devops_az_repos_policy_show
-          displayName: az repos policy show
-        - name: update
-          uid: ext_azure-devops_az_repos_policy_update
-          displayName: az repos policy update
-        - name: approver-count
-          displayName: az repos policy approver-count
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_approver_count
-            displayName: az repos policy approver-count
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_approver_count_create
-            displayName: az repos policy approver-count create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_approver_count_update
-            displayName: az repos policy approver-count update
-        - name: build
-          displayName: az repos policy build
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_build
-            displayName: az repos policy build
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_build_create
-            displayName: az repos policy build create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_build_update
-            displayName: az repos policy build update
-        - name: case-enforcement
-          displayName: az repos policy case-enforcement
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_case_enforcement
-            displayName: az repos policy case-enforcement
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_case_enforcement_create
-            displayName: az repos policy case-enforcement create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_case_enforcement_update
-            displayName: az repos policy case-enforcement update
-        - name: comment-required
-          displayName: az repos policy comment-required
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_comment_required
-            displayName: az repos policy comment-required
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_comment_required_create
-            displayName: az repos policy comment-required create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_comment_required_update
-            displayName: az repos policy comment-required update
-        - name: file-size
-          displayName: az repos policy file-size
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_file_size
-            displayName: az repos policy file-size
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_file_size_create
-            displayName: az repos policy file-size create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_file_size_update
-            displayName: az repos policy file-size update
-        - name: merge-strategy
-          displayName: az repos policy merge-strategy
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_merge_strategy
-            displayName: az repos policy merge-strategy
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_merge_strategy_create
-            displayName: az repos policy merge-strategy create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_merge_strategy_update
-            displayName: az repos policy merge-strategy update
-        - name: required-reviewer
-          displayName: az repos policy required-reviewer
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_required_reviewer
-            displayName: az repos policy required-reviewer
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_required_reviewer_create
-            displayName: az repos policy required-reviewer create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_required_reviewer_update
-            displayName: az repos policy required-reviewer update
-        - name: work-item-linking
-          displayName: az repos policy work-item-linking
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_policy_work_item_linking
-            displayName: az repos policy work-item-linking
-          - name: create
-            uid: ext_azure-devops_az_repos_policy_work_item_linking_create
-            displayName: az repos policy work-item-linking create
-          - name: update
-            uid: ext_azure-devops_az_repos_policy_work_item_linking_update
-            displayName: az repos policy work-item-linking update
-      - name: pr
-        displayName: az repos pr
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_pr
-          displayName: az repos pr
-        - name: checkout
-          uid: ext_azure-devops_az_repos_pr_checkout
-          displayName: az repos pr checkout
-        - name: create
-          uid: ext_azure-devops_az_repos_pr_create
-          displayName: az repos pr create
-        - name: list
-          uid: ext_azure-devops_az_repos_pr_list
-          displayName: az repos pr list
-        - name: set-vote
-          uid: ext_azure-devops_az_repos_pr_set_vote
-          displayName: az repos pr set-vote
-        - name: show
-          uid: ext_azure-devops_az_repos_pr_show
-          displayName: az repos pr show
-        - name: update
-          uid: ext_azure-devops_az_repos_pr_update
-          displayName: az repos pr update
-        - name: policy
-          displayName: az repos pr policy
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_policy
-            displayName: az repos pr policy
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_policy_list
-            displayName: az repos pr policy list
-          - name: queue
-            uid: ext_azure-devops_az_repos_pr_policy_queue
-            displayName: az repos pr policy queue
-        - name: reviewer
-          displayName: az repos pr reviewer
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_reviewer
-            displayName: az repos pr reviewer
-          - name: add
-            uid: ext_azure-devops_az_repos_pr_reviewer_add
-            displayName: az repos pr reviewer add
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_reviewer_list
-            displayName: az repos pr reviewer list
-          - name: remove
-            uid: ext_azure-devops_az_repos_pr_reviewer_remove
-            displayName: az repos pr reviewer remove
-        - name: work-item
-          displayName: az repos pr work-item
-          items:
-          - name: Overview
-            uid: ext_azure-devops_az_repos_pr_work_item
-            displayName: az repos pr work-item
-          - name: add
-            uid: ext_azure-devops_az_repos_pr_work_item_add
-            displayName: az repos pr work-item add
-          - name: list
-            uid: ext_azure-devops_az_repos_pr_work_item_list
-            displayName: az repos pr work-item list
-          - name: remove
-            uid: ext_azure-devops_az_repos_pr_work_item_remove
-            displayName: az repos pr work-item remove
-      - name: ref
-        displayName: az repos ref
-        items:
-        - name: Overview
-          uid: ext_azure-devops_az_repos_ref
-          displayName: az repos ref
-        - name: create
-          uid: ext_azure-devops_az_repos_ref_create
-          displayName: az repos ref create
-        - name: delete
-          uid: ext_azure-devops_az_repos_ref_delete
-          displayName: az repos ref delete
-        - name: list
-          uid: ext_azure-devops_az_repos_ref_list
-          displayName: az repos ref list
-        - name: lock
-          uid: ext_azure-devops_az_repos_ref_lock
-          displayName: az repos ref lock
-        - name: unlock
-          uid: ext_azure-devops_az_repos_ref_unlock
-          displayName: az repos ref unlock
-  - name: azure-firewall
-    items:
-    - name: Overview
-      uid: ext_azure-firewall_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_azure-firewall_az_network
-        displayName: az network
-      - name: firewall
-        displayName: az network firewall
-        items:
-        - name: Overview
-          uid: ext_azure-firewall_az_network_firewall
-          displayName: az network firewall
-        - name: create
-          uid: ext_azure-firewall_az_network_firewall_create
-          displayName: az network firewall create
-        - name: delete
-          uid: ext_azure-firewall_az_network_firewall_delete
-          displayName: az network firewall delete
-        - name: list
-          uid: ext_azure-firewall_az_network_firewall_list
-          displayName: az network firewall list
-        - name: list-fqdn-tags
-          uid: ext_azure-firewall_az_network_firewall_list_fqdn_tags
-          displayName: az network firewall list-fqdn-tags
-        - name: show
-          uid: ext_azure-firewall_az_network_firewall_show
-          displayName: az network firewall show
-        - name: update
-          uid: ext_azure-firewall_az_network_firewall_update
-          displayName: az network firewall update
-        - name: application-rule
-          displayName: az network firewall application-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_application_rule
-            displayName: az network firewall application-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_application_rule_create
-            displayName: az network firewall application-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_application_rule_delete
-            displayName: az network firewall application-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_application_rule_list
-            displayName: az network firewall application-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_application_rule_show
-            displayName: az network firewall application-rule show
-          - name: collection
-            displayName: az network firewall application-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection
-              displayName: az network firewall application-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_delete
-              displayName: az network firewall application-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_list
-              displayName: az network firewall application-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_application_rule_collection_show
-              displayName: az network firewall application-rule collection show
-        - name: ip-config
-          displayName: az network firewall ip-config
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_ip_config
-            displayName: az network firewall ip-config
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_ip_config_create
-            displayName: az network firewall ip-config create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_ip_config_delete
-            displayName: az network firewall ip-config delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_ip_config_list
-            displayName: az network firewall ip-config list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_ip_config_show
-            displayName: az network firewall ip-config show
-        - name: management-ip-config
-          displayName: az network firewall management-ip-config
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config
-            displayName: az network firewall management-ip-config
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config_show
-            displayName: az network firewall management-ip-config show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_management_ip_config_update
-            displayName: az network firewall management-ip-config update
-        - name: nat-rule
-          displayName: az network firewall nat-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_nat_rule
-            displayName: az network firewall nat-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_create
-            displayName: az network firewall nat-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_delete
-            displayName: az network firewall nat-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_list
-            displayName: az network firewall nat-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_nat_rule_show
-            displayName: az network firewall nat-rule show
-          - name: collection
-            displayName: az network firewall nat-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection
-              displayName: az network firewall nat-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_delete
-              displayName: az network firewall nat-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_list
-              displayName: az network firewall nat-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_nat_rule_collection_show
-              displayName: az network firewall nat-rule collection show
-        - name: network-rule
-          displayName: az network firewall network-rule
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_network_rule
-            displayName: az network firewall network-rule
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_network_rule_create
-            displayName: az network firewall network-rule create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_network_rule_delete
-            displayName: az network firewall network-rule delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_network_rule_list
-            displayName: az network firewall network-rule list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_network_rule_show
-            displayName: az network firewall network-rule show
-          - name: collection
-            displayName: az network firewall network-rule collection
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection
-              displayName: az network firewall network-rule collection
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_delete
-              displayName: az network firewall network-rule collection delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_list
-              displayName: az network firewall network-rule collection list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_network_rule_collection_show
-              displayName: az network firewall network-rule collection show
-        - name: policy
-          displayName: az network firewall policy
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_policy
-            displayName: az network firewall policy
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_policy_create
-            displayName: az network firewall policy create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_policy_delete
-            displayName: az network firewall policy delete
-          - name: list
-            uid: ext_azure-firewall_az_network_firewall_policy_list
-            displayName: az network firewall policy list
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_policy_show
-            displayName: az network firewall policy show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_policy_update
-            displayName: az network firewall policy update
-          - name: rule-collection-group
-            displayName: az network firewall policy rule-collection-group
-            items:
-            - name: Overview
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group
-              displayName: az network firewall policy rule-collection-group
-            - name: create
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_create
-              displayName: az network firewall policy rule-collection-group create
-            - name: delete
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_delete
-              displayName: az network firewall policy rule-collection-group delete
-            - name: list
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_list
-              displayName: az network firewall policy rule-collection-group list
-            - name: show
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_show
-              displayName: az network firewall policy rule-collection-group show
-            - name: update
-              uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_update
-              displayName: az network firewall policy rule-collection-group update
-            - name: collection
-              displayName: az network firewall policy rule-collection-group collection
-              items:
-              - name: Overview
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection
-                displayName: az network firewall policy rule-collection-group collection
-              - name: add-filter-collection
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_filter_collection
-                displayName: az network firewall policy rule-collection-group collection add-filter-collection
-              - name: add-nat-collection
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_add_nat_collection
-                displayName: az network firewall policy rule-collection-group collection add-nat-collection
-              - name: list
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_list
-                displayName: az network firewall policy rule-collection-group collection list
-              - name: remove
-                uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_remove
-                displayName: az network firewall policy rule-collection-group collection remove
-              - name: rule
-                displayName: az network firewall policy rule-collection-group collection rule
-                items:
-                - name: Overview
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule
-                  displayName: az network firewall policy rule-collection-group collection rule
-                - name: add
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_add
-                  displayName: az network firewall policy rule-collection-group collection rule add
-                - name: remove
-                  uid: ext_azure-firewall_az_network_firewall_policy_rule_collection_group_collection_rule_remove
-                  displayName: az network firewall policy rule-collection-group collection rule remove
-        - name: threat-intel-whitelist
-          displayName: az network firewall threat-intel-whitelist
-          items:
-          - name: Overview
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist
-            displayName: az network firewall threat-intel-whitelist
-          - name: create
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_create
-            displayName: az network firewall threat-intel-whitelist create
-          - name: delete
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_delete
-            displayName: az network firewall threat-intel-whitelist delete
-          - name: show
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_show
-            displayName: az network firewall threat-intel-whitelist show
-          - name: update
-            uid: ext_azure-firewall_az_network_firewall_threat_intel_whitelist_update
-            displayName: az network firewall threat-intel-whitelist update
-  - name: azure-iot
-    items:
-    - name: Overview
-      uid: ext_azure-iot_az
-    - name: IoT
-      displayName: az iot
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_iot
-        displayName: az iot
-      - name: Devices
-        displayName: az iot device
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_device
-          displayName: az iot device
-        - name: send-d2c-message
-          uid: ext_azure-iot_az_iot_device_send_d2c_message
-          displayName: az iot device send-d2c-message
-        - name: simulate
-          uid: ext_azure-iot_az_iot_device_simulate
-          displayName: az iot device simulate
-        - name: upload-file
-          uid: ext_azure-iot_az_iot_device_upload_file
-          displayName: az iot device upload-file
-        - name: c2d-message
-          displayName: az iot device c2d-message
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_device_c2d_message
-            displayName: az iot device c2d-message
-          - name: abandon
-            uid: ext_azure-iot_az_iot_device_c2d_message_abandon
-            displayName: az iot device c2d-message abandon
-          - name: complete
-            uid: ext_azure-iot_az_iot_device_c2d_message_complete
-            displayName: az iot device c2d-message complete
-          - name: receive
-            uid: ext_azure-iot_az_iot_device_c2d_message_receive
-            displayName: az iot device c2d-message receive
-          - name: reject
-            uid: ext_azure-iot_az_iot_device_c2d_message_reject
-            displayName: az iot device c2d-message reject
-          - name: send
-            uid: ext_azure-iot_az_iot_device_c2d_message_send
-            displayName: az iot device c2d-message send
-      - name: Hubs
-        displayName: az iot hub
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_hub
-          displayName: az iot hub
-        - name: generate-sas-token
-          uid: ext_azure-iot_az_iot_hub_generate_sas_token
-          displayName: az iot hub generate-sas-token
-        - name: invoke-device-method
-          uid: ext_azure-iot_az_iot_hub_invoke_device_method
-          displayName: az iot hub invoke-device-method
-        - name: invoke-module-method
-          uid: ext_azure-iot_az_iot_hub_invoke_module_method
-          displayName: az iot hub invoke-module-method
-        - name: monitor-events
-          uid: ext_azure-iot_az_iot_hub_monitor_events
-          displayName: az iot hub monitor-events
-        - name: monitor-feedback
-          uid: ext_azure-iot_az_iot_hub_monitor_feedback
-          displayName: az iot hub monitor-feedback
-        - name: query
-          uid: ext_azure-iot_az_iot_hub_query
-          displayName: az iot hub query
-        - name: Jobs
-          displayName: az iot hub job
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_job
-            displayName: az iot hub job
-          - name: cancel
-            uid: ext_azure-iot_az_iot_hub_job_cancel
-            displayName: az iot hub job cancel
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_job_create
-            displayName: az iot hub job create
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_job_list
-            displayName: az iot hub job list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_job_show
-            displayName: az iot hub job show
-        - name: configuration
-          displayName: az iot hub configuration
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_configuration
-            displayName: az iot hub configuration
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_configuration_create
-            displayName: az iot hub configuration create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_configuration_delete
-            displayName: az iot hub configuration delete
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_configuration_list
-            displayName: az iot hub configuration list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_configuration_show
-            displayName: az iot hub configuration show
-          - name: show-metric
-            uid: ext_azure-iot_az_iot_hub_configuration_show_metric
-            displayName: az iot hub configuration show-metric
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_configuration_update
-            displayName: az iot hub configuration update
-        - name: device-identity
-          displayName: az iot hub device-identity
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_device_identity
-            displayName: az iot hub device-identity
-          - name: add-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_add_children
-            displayName: az iot hub device-identity add-children
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_device_identity_create
-            displayName: az iot hub device-identity create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_device_identity_delete
-            displayName: az iot hub device-identity delete
-          - name: export
-            uid: ext_azure-iot_az_iot_hub_device_identity_export
-            displayName: az iot hub device-identity export
-          - name: get-parent
-            uid: ext_azure-iot_az_iot_hub_device_identity_get_parent
-            displayName: az iot hub device-identity get-parent
-          - name: import
-            uid: ext_azure-iot_az_iot_hub_device_identity_import
-            displayName: az iot hub device-identity import
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_device_identity_list
-            displayName: az iot hub device-identity list
-          - name: list-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_list_children
-            displayName: az iot hub device-identity list-children
-          - name: remove-children
-            uid: ext_azure-iot_az_iot_hub_device_identity_remove_children
-            displayName: az iot hub device-identity remove-children
-          - name: set-parent
-            uid: ext_azure-iot_az_iot_hub_device_identity_set_parent
-            displayName: az iot hub device-identity set-parent
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_device_identity_show
-            displayName: az iot hub device-identity show
-          - name: show-connection-string
-            uid: ext_azure-iot_az_iot_hub_device_identity_show_connection_string
-            displayName: az iot hub device-identity show-connection-string
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_device_identity_update
-            displayName: az iot hub device-identity update
-        - name: device-twin
-          displayName: az iot hub device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_device_twin
-            displayName: az iot hub device-twin
-          - name: replace
-            uid: ext_azure-iot_az_iot_hub_device_twin_replace
-            displayName: az iot hub device-twin replace
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_device_twin_show
-            displayName: az iot hub device-twin show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_device_twin_update
-            displayName: az iot hub device-twin update
-        - name: distributed-tracing
-          displayName: az iot hub distributed-tracing
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing
-            displayName: az iot hub distributed-tracing
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing_show
-            displayName: az iot hub distributed-tracing show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_distributed_tracing_update
-            displayName: az iot hub distributed-tracing update
-        - name: module-identity
-          displayName: az iot hub module-identity
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_module_identity
-            displayName: az iot hub module-identity
-          - name: create
-            uid: ext_azure-iot_az_iot_hub_module_identity_create
-            displayName: az iot hub module-identity create
-          - name: delete
-            uid: ext_azure-iot_az_iot_hub_module_identity_delete
-            displayName: az iot hub module-identity delete
-          - name: list
-            uid: ext_azure-iot_az_iot_hub_module_identity_list
-            displayName: az iot hub module-identity list
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_module_identity_show
-            displayName: az iot hub module-identity show
-          - name: show-connection-string
-            uid: ext_azure-iot_az_iot_hub_module_identity_show_connection_string
-            displayName: az iot hub module-identity show-connection-string
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_module_identity_update
-            displayName: az iot hub module-identity update
-        - name: module-twin
-          displayName: az iot hub module-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_hub_module_twin
-            displayName: az iot hub module-twin
-          - name: replace
-            uid: ext_azure-iot_az_iot_hub_module_twin_replace
-            displayName: az iot hub module-twin replace
-          - name: show
-            uid: ext_azure-iot_az_iot_hub_module_twin_show
-            displayName: az iot hub module-twin show
-          - name: update
-            uid: ext_azure-iot_az_iot_hub_module_twin_update
-            displayName: az iot hub module-twin update
-      - name: central
-        displayName: az iot central
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_central
-          displayName: az iot central
-        - name: app
-          displayName: az iot central app
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_central_app
-            displayName: az iot central app
-          - name: monitor-events
-            uid: ext_azure-iot_az_iot_central_app_monitor_events
-            displayName: az iot central app monitor-events
-          - name: validate-messages
-            uid: ext_azure-iot_az_iot_central_app_validate_messages
-            displayName: az iot central app validate-messages
-          - name: device
-            displayName: az iot central app device
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device
-              displayName: az iot central app device
-            - name: create
-              uid: ext_azure-iot_az_iot_central_app_device_create
-              displayName: az iot central app device create
-            - name: delete
-              uid: ext_azure-iot_az_iot_central_app_device_delete
-              displayName: az iot central app device delete
-            - name: list
-              uid: ext_azure-iot_az_iot_central_app_device_list
-              displayName: az iot central app device list
-            - name: registration-info
-              uid: ext_azure-iot_az_iot_central_app_device_registration_info
-              displayName: az iot central app device registration-info
-            - name: registration-summary
-              uid: ext_azure-iot_az_iot_central_app_device_registration_summary
-              displayName: az iot central app device registration-summary
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_show
-              displayName: az iot central app device show
-          - name: device-template
-            displayName: az iot central app device-template
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device_template
-              displayName: az iot central app device-template
-            - name: create
-              uid: ext_azure-iot_az_iot_central_app_device_template_create
-              displayName: az iot central app device-template create
-            - name: delete
-              uid: ext_azure-iot_az_iot_central_app_device_template_delete
-              displayName: az iot central app device-template delete
-            - name: list
-              uid: ext_azure-iot_az_iot_central_app_device_template_list
-              displayName: az iot central app device-template list
-            - name: map
-              uid: ext_azure-iot_az_iot_central_app_device_template_map
-              displayName: az iot central app device-template map
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_template_show
-              displayName: az iot central app device-template show
-          - name: device-twin
-            displayName: az iot central app device-twin
-            items:
-            - name: Overview
-              uid: ext_azure-iot_az_iot_central_app_device_twin
-              displayName: az iot central app device-twin
-            - name: show
-              uid: ext_azure-iot_az_iot_central_app_device_twin_show
-              displayName: az iot central app device-twin show
-        - name: device-twin
-          displayName: az iot central device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_central_device_twin
-            displayName: az iot central device-twin
-          - name: show
-            uid: ext_azure-iot_az_iot_central_device_twin_show
-            displayName: az iot central device-twin show
-      - name: dps
-        displayName: az iot dps
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_dps
-          displayName: az iot dps
-        - name: enrollment
-          displayName: az iot dps enrollment
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_enrollment
-            displayName: az iot dps enrollment
-          - name: create
-            uid: ext_azure-iot_az_iot_dps_enrollment_create
-            displayName: az iot dps enrollment create
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_enrollment_delete
-            displayName: az iot dps enrollment delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_enrollment_list
-            displayName: az iot dps enrollment list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_enrollment_show
-            displayName: az iot dps enrollment show
-          - name: update
-            uid: ext_azure-iot_az_iot_dps_enrollment_update
-            displayName: az iot dps enrollment update
-        - name: enrollment-group
-          displayName: az iot dps enrollment-group
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_enrollment_group
-            displayName: az iot dps enrollment-group
-          - name: create
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_create
-            displayName: az iot dps enrollment-group create
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_delete
-            displayName: az iot dps enrollment-group delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_list
-            displayName: az iot dps enrollment-group list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_show
-            displayName: az iot dps enrollment-group show
-          - name: update
-            uid: ext_azure-iot_az_iot_dps_enrollment_group_update
-            displayName: az iot dps enrollment-group update
-        - name: registration
-          displayName: az iot dps registration
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_dps_registration
-            displayName: az iot dps registration
-          - name: delete
-            uid: ext_azure-iot_az_iot_dps_registration_delete
-            displayName: az iot dps registration delete
-          - name: list
-            uid: ext_azure-iot_az_iot_dps_registration_list
-            displayName: az iot dps registration list
-          - name: show
-            uid: ext_azure-iot_az_iot_dps_registration_show
-            displayName: az iot dps registration show
-      - name: dt
-        displayName: az iot dt
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_dt
-          displayName: az iot dt
-        - name: invoke-command
-          uid: ext_azure-iot_az_iot_dt_invoke_command
-          displayName: az iot dt invoke-command
-        - name: list-commands
-          uid: ext_azure-iot_az_iot_dt_list_commands
-          displayName: az iot dt list-commands
-        - name: list-interfaces
-          uid: ext_azure-iot_az_iot_dt_list_interfaces
-          displayName: az iot dt list-interfaces
-        - name: list-properties
-          uid: ext_azure-iot_az_iot_dt_list_properties
-          displayName: az iot dt list-properties
-        - name: monitor-events
-          uid: ext_azure-iot_az_iot_dt_monitor_events
-          displayName: az iot dt monitor-events
-        - name: update-property
-          uid: ext_azure-iot_az_iot_dt_update_property
-          displayName: az iot dt update-property
-      - name: edge
-        displayName: az iot edge
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_edge
-          displayName: az iot edge
-        - name: set-modules
-          uid: ext_azure-iot_az_iot_edge_set_modules
-          displayName: az iot edge set-modules
-        - name: deployment
-          displayName: az iot edge deployment
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_edge_deployment
-            displayName: az iot edge deployment
-          - name: create
-            uid: ext_azure-iot_az_iot_edge_deployment_create
-            displayName: az iot edge deployment create
-          - name: delete
-            uid: ext_azure-iot_az_iot_edge_deployment_delete
-            displayName: az iot edge deployment delete
-          - name: list
-            uid: ext_azure-iot_az_iot_edge_deployment_list
-            displayName: az iot edge deployment list
-          - name: show
-            uid: ext_azure-iot_az_iot_edge_deployment_show
-            displayName: az iot edge deployment show
-          - name: show-metric
-            uid: ext_azure-iot_az_iot_edge_deployment_show_metric
-            displayName: az iot edge deployment show-metric
-          - name: update
-            uid: ext_azure-iot_az_iot_edge_deployment_update
-            displayName: az iot edge deployment update
-      - name: pnp
-        displayName: az iot pnp
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iot_pnp
-          displayName: az iot pnp
-        - name: capability-model
-          displayName: az iot pnp capability-model
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_pnp_capability_model
-            displayName: az iot pnp capability-model
-          - name: create
-            uid: ext_azure-iot_az_iot_pnp_capability_model_create
-            displayName: az iot pnp capability-model create
-          - name: delete
-            uid: ext_azure-iot_az_iot_pnp_capability_model_delete
-            displayName: az iot pnp capability-model delete
-          - name: list
-            uid: ext_azure-iot_az_iot_pnp_capability_model_list
-            displayName: az iot pnp capability-model list
-          - name: publish
-            uid: ext_azure-iot_az_iot_pnp_capability_model_publish
-            displayName: az iot pnp capability-model publish
-          - name: show
-            uid: ext_azure-iot_az_iot_pnp_capability_model_show
-            displayName: az iot pnp capability-model show
-          - name: update
-            uid: ext_azure-iot_az_iot_pnp_capability_model_update
-            displayName: az iot pnp capability-model update
-        - name: interface
-          displayName: az iot pnp interface
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iot_pnp_interface
-            displayName: az iot pnp interface
-          - name: create
-            uid: ext_azure-iot_az_iot_pnp_interface_create
-            displayName: az iot pnp interface create
-          - name: delete
-            uid: ext_azure-iot_az_iot_pnp_interface_delete
-            displayName: az iot pnp interface delete
-          - name: list
-            uid: ext_azure-iot_az_iot_pnp_interface_list
-            displayName: az iot pnp interface list
-          - name: publish
-            uid: ext_azure-iot_az_iot_pnp_interface_publish
-            displayName: az iot pnp interface publish
-          - name: show
-            uid: ext_azure-iot_az_iot_pnp_interface_show
-            displayName: az iot pnp interface show
-          - name: update
-            uid: ext_azure-iot_az_iot_pnp_interface_update
-            displayName: az iot pnp interface update
-    - name: dt
-      displayName: az dt
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_dt
-        displayName: az dt
-      - name: create
-        uid: ext_azure-iot_az_dt_create
-        displayName: az dt create
-      - name: delete
-        uid: ext_azure-iot_az_dt_delete
-        displayName: az dt delete
-      - name: list
-        uid: ext_azure-iot_az_dt_list
-        displayName: az dt list
-      - name: show
-        uid: ext_azure-iot_az_dt_show
-        displayName: az dt show
-      - name: endpoint
-        displayName: az dt endpoint
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_endpoint
-          displayName: az dt endpoint
-        - name: delete
-          uid: ext_azure-iot_az_dt_endpoint_delete
-          displayName: az dt endpoint delete
-        - name: list
-          uid: ext_azure-iot_az_dt_endpoint_list
-          displayName: az dt endpoint list
-        - name: show
-          uid: ext_azure-iot_az_dt_endpoint_show
-          displayName: az dt endpoint show
-        - name: create
-          displayName: az dt endpoint create
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_endpoint_create
-            displayName: az dt endpoint create
-          - name: eventgrid
-            uid: ext_azure-iot_az_dt_endpoint_create_eventgrid
-            displayName: az dt endpoint create eventgrid
-          - name: eventhub
-            uid: ext_azure-iot_az_dt_endpoint_create_eventhub
-            displayName: az dt endpoint create eventhub
-          - name: servicebus
-            uid: ext_azure-iot_az_dt_endpoint_create_servicebus
-            displayName: az dt endpoint create servicebus
-      - name: model
-        displayName: az dt model
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_model
-          displayName: az dt model
-        - name: create
-          uid: ext_azure-iot_az_dt_model_create
-          displayName: az dt model create
-        - name: delete
-          uid: ext_azure-iot_az_dt_model_delete
-          displayName: az dt model delete
-        - name: list
-          uid: ext_azure-iot_az_dt_model_list
-          displayName: az dt model list
-        - name: show
-          uid: ext_azure-iot_az_dt_model_show
-          displayName: az dt model show
-        - name: update
-          uid: ext_azure-iot_az_dt_model_update
-          displayName: az dt model update
-      - name: role-assignment
-        displayName: az dt role-assignment
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_role_assignment
-          displayName: az dt role-assignment
-        - name: create
-          uid: ext_azure-iot_az_dt_role_assignment_create
-          displayName: az dt role-assignment create
-        - name: delete
-          uid: ext_azure-iot_az_dt_role_assignment_delete
-          displayName: az dt role-assignment delete
-        - name: list
-          uid: ext_azure-iot_az_dt_role_assignment_list
-          displayName: az dt role-assignment list
-      - name: route
-        displayName: az dt route
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_route
-          displayName: az dt route
-        - name: create
-          uid: ext_azure-iot_az_dt_route_create
-          displayName: az dt route create
-        - name: delete
-          uid: ext_azure-iot_az_dt_route_delete
-          displayName: az dt route delete
-        - name: list
-          uid: ext_azure-iot_az_dt_route_list
-          displayName: az dt route list
-        - name: show
-          uid: ext_azure-iot_az_dt_route_show
-          displayName: az dt route show
-      - name: twin
-        displayName: az dt twin
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_dt_twin
-          displayName: az dt twin
-        - name: create
-          uid: ext_azure-iot_az_dt_twin_create
-          displayName: az dt twin create
-        - name: delete
-          uid: ext_azure-iot_az_dt_twin_delete
-          displayName: az dt twin delete
-        - name: query
-          uid: ext_azure-iot_az_dt_twin_query
-          displayName: az dt twin query
-        - name: show
-          uid: ext_azure-iot_az_dt_twin_show
-          displayName: az dt twin show
-        - name: update
-          uid: ext_azure-iot_az_dt_twin_update
-          displayName: az dt twin update
-        - name: component
-          displayName: az dt twin component
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_component
-            displayName: az dt twin component
-          - name: show
-            uid: ext_azure-iot_az_dt_twin_component_show
-            displayName: az dt twin component show
-          - name: update
-            uid: ext_azure-iot_az_dt_twin_component_update
-            displayName: az dt twin component update
-        - name: relationship
-          displayName: az dt twin relationship
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_relationship
-            displayName: az dt twin relationship
-          - name: create
-            uid: ext_azure-iot_az_dt_twin_relationship_create
-            displayName: az dt twin relationship create
-          - name: delete
-            uid: ext_azure-iot_az_dt_twin_relationship_delete
-            displayName: az dt twin relationship delete
-          - name: list
-            uid: ext_azure-iot_az_dt_twin_relationship_list
-            displayName: az dt twin relationship list
-          - name: show
-            uid: ext_azure-iot_az_dt_twin_relationship_show
-            displayName: az dt twin relationship show
-          - name: update
-            uid: ext_azure-iot_az_dt_twin_relationship_update
-            displayName: az dt twin relationship update
-        - name: telemetry
-          displayName: az dt twin telemetry
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_dt_twin_telemetry
-            displayName: az dt twin telemetry
-          - name: send
-            uid: ext_azure-iot_az_dt_twin_telemetry_send
-            displayName: az dt twin telemetry send
-    - name: iotcentral
-      displayName: az iotcentral
-      items:
-      - name: Overview
-        uid: ext_azure-iot_az_iotcentral
-        displayName: az iotcentral
-      - name: app
-        displayName: az iotcentral app
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iotcentral_app
-          displayName: az iotcentral app
-        - name: monitor-events
-          uid: ext_azure-iot_az_iotcentral_app_monitor_events
-          displayName: az iotcentral app monitor-events
-        - name: device-twin
-          displayName: az iotcentral app device-twin
-          items:
-          - name: Overview
-            uid: ext_azure-iot_az_iotcentral_app_device_twin
-            displayName: az iotcentral app device-twin
-          - name: show
-            uid: ext_azure-iot_az_iotcentral_app_device_twin_show
-            displayName: az iotcentral app device-twin show
-      - name: device-twin
-        displayName: az iotcentral device-twin
-        items:
-        - name: Overview
-          uid: ext_azure-iot_az_iotcentral_device_twin
-          displayName: az iotcentral device-twin
-        - name: show
-          uid: ext_azure-iot_az_iotcentral_device_twin_show
-          displayName: az iotcentral device-twin show
-  - name: blockchain
-    items:
-    - name: Overview
-      uid: ext_blockchain_az
-    - name: blockchain
-      displayName: az blockchain
-      items:
-      - name: Overview
-        uid: ext_blockchain_az_blockchain
-        displayName: az blockchain
-      - name: consortium
-        displayName: az blockchain consortium
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_consortium
-          displayName: az blockchain consortium
-        - name: list
-          uid: ext_blockchain_az_blockchain_consortium_list
-          displayName: az blockchain consortium list
-      - name: member
-        displayName: az blockchain member
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_member
-          displayName: az blockchain member
-        - name: create
-          uid: ext_blockchain_az_blockchain_member_create
-          displayName: az blockchain member create
-        - name: delete
-          uid: ext_blockchain_az_blockchain_member_delete
-          displayName: az blockchain member delete
-        - name: list
-          uid: ext_blockchain_az_blockchain_member_list
-          displayName: az blockchain member list
-        - name: list-api-key
-          uid: ext_blockchain_az_blockchain_member_list_api_key
-          displayName: az blockchain member list-api-key
-        - name: list-consortium-member
-          uid: ext_blockchain_az_blockchain_member_list_consortium_member
-          displayName: az blockchain member list-consortium-member
-        - name: regenerate-api-key
-          uid: ext_blockchain_az_blockchain_member_regenerate_api_key
-          displayName: az blockchain member regenerate-api-key
-        - name: show
-          uid: ext_blockchain_az_blockchain_member_show
-          displayName: az blockchain member show
-        - name: update
-          uid: ext_blockchain_az_blockchain_member_update
-          displayName: az blockchain member update
-        - name: wait
-          uid: ext_blockchain_az_blockchain_member_wait
-          displayName: az blockchain member wait
-      - name: transaction-node
-        displayName: az blockchain transaction-node
-        items:
-        - name: Overview
-          uid: ext_blockchain_az_blockchain_transaction_node
-          displayName: az blockchain transaction-node
-        - name: create
-          uid: ext_blockchain_az_blockchain_transaction_node_create
-          displayName: az blockchain transaction-node create
-        - name: delete
-          uid: ext_blockchain_az_blockchain_transaction_node_delete
-          displayName: az blockchain transaction-node delete
-        - name: list
-          uid: ext_blockchain_az_blockchain_transaction_node_list
-          displayName: az blockchain transaction-node list
-        - name: list-api-key
-          uid: ext_blockchain_az_blockchain_transaction_node_list_api_key
-          displayName: az blockchain transaction-node list-api-key
-        - name: regenerate-api-key
-          uid: ext_blockchain_az_blockchain_transaction_node_regenerate_api_key
-          displayName: az blockchain transaction-node regenerate-api-key
-        - name: show
-          uid: ext_blockchain_az_blockchain_transaction_node_show
-          displayName: az blockchain transaction-node show
-        - name: update
-          uid: ext_blockchain_az_blockchain_transaction_node_update
-          displayName: az blockchain transaction-node update
-        - name: wait
-          uid: ext_blockchain_az_blockchain_transaction_node_wait
-          displayName: az blockchain transaction-node wait
-  - name: blueprint
-    items:
-    - name: Overview
-      uid: ext_blueprint_az
-    - name: blueprint
-      displayName: az blueprint
-      items:
-      - name: Overview
-        uid: ext_blueprint_az_blueprint
-        displayName: az blueprint
-      - name: create
-        uid: ext_blueprint_az_blueprint_create
-        displayName: az blueprint create
-      - name: delete
-        uid: ext_blueprint_az_blueprint_delete
-        displayName: az blueprint delete
-      - name: import
-        uid: ext_blueprint_az_blueprint_import
-        displayName: az blueprint import
-      - name: list
-        uid: ext_blueprint_az_blueprint_list
-        displayName: az blueprint list
-      - name: publish
-        uid: ext_blueprint_az_blueprint_publish
-        displayName: az blueprint publish
-      - name: show
-        uid: ext_blueprint_az_blueprint_show
-        displayName: az blueprint show
-      - name: update
-        uid: ext_blueprint_az_blueprint_update
-        displayName: az blueprint update
-      - name: artifact
-        displayName: az blueprint artifact
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_artifact
-          displayName: az blueprint artifact
-        - name: delete
-          uid: ext_blueprint_az_blueprint_artifact_delete
-          displayName: az blueprint artifact delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_artifact_list
-          displayName: az blueprint artifact list
-        - name: show
-          uid: ext_blueprint_az_blueprint_artifact_show
-          displayName: az blueprint artifact show
-        - name: policy
-          displayName: az blueprint artifact policy
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_policy
-            displayName: az blueprint artifact policy
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_policy_create
-            displayName: az blueprint artifact policy create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_policy_update
-            displayName: az blueprint artifact policy update
-        - name: role
-          displayName: az blueprint artifact role
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_role
-            displayName: az blueprint artifact role
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_role_create
-            displayName: az blueprint artifact role create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_role_update
-            displayName: az blueprint artifact role update
-        - name: template
-          displayName: az blueprint artifact template
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_artifact_template
-            displayName: az blueprint artifact template
-          - name: create
-            uid: ext_blueprint_az_blueprint_artifact_template_create
-            displayName: az blueprint artifact template create
-          - name: update
-            uid: ext_blueprint_az_blueprint_artifact_template_update
-            displayName: az blueprint artifact template update
-      - name: assignment
-        displayName: az blueprint assignment
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_assignment
-          displayName: az blueprint assignment
-        - name: create
-          uid: ext_blueprint_az_blueprint_assignment_create
-          displayName: az blueprint assignment create
-        - name: delete
-          uid: ext_blueprint_az_blueprint_assignment_delete
-          displayName: az blueprint assignment delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_assignment_list
-          displayName: az blueprint assignment list
-        - name: show
-          uid: ext_blueprint_az_blueprint_assignment_show
-          displayName: az blueprint assignment show
-        - name: update
-          uid: ext_blueprint_az_blueprint_assignment_update
-          displayName: az blueprint assignment update
-        - name: wait
-          uid: ext_blueprint_az_blueprint_assignment_wait
-          displayName: az blueprint assignment wait
-        - name: who
-          uid: ext_blueprint_az_blueprint_assignment_who
-          displayName: az blueprint assignment who
-      - name: resource-group
-        displayName: az blueprint resource-group
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_resource_group
-          displayName: az blueprint resource-group
-        - name: add
-          uid: ext_blueprint_az_blueprint_resource_group_add
-          displayName: az blueprint resource-group add
-        - name: list
-          uid: ext_blueprint_az_blueprint_resource_group_list
-          displayName: az blueprint resource-group list
-        - name: remove
-          uid: ext_blueprint_az_blueprint_resource_group_remove
-          displayName: az blueprint resource-group remove
-        - name: show
-          uid: ext_blueprint_az_blueprint_resource_group_show
-          displayName: az blueprint resource-group show
-        - name: update
-          uid: ext_blueprint_az_blueprint_resource_group_update
-          displayName: az blueprint resource-group update
-      - name: version
-        displayName: az blueprint version
-        items:
-        - name: Overview
-          uid: ext_blueprint_az_blueprint_version
-          displayName: az blueprint version
-        - name: delete
-          uid: ext_blueprint_az_blueprint_version_delete
-          displayName: az blueprint version delete
-        - name: list
-          uid: ext_blueprint_az_blueprint_version_list
-          displayName: az blueprint version list
-        - name: show
-          uid: ext_blueprint_az_blueprint_version_show
-          displayName: az blueprint version show
-        - name: artifact
-          displayName: az blueprint version artifact
-          items:
-          - name: Overview
-            uid: ext_blueprint_az_blueprint_version_artifact
-            displayName: az blueprint version artifact
-          - name: list
-            uid: ext_blueprint_az_blueprint_version_artifact_list
-            displayName: az blueprint version artifact list
-          - name: show
-            uid: ext_blueprint_az_blueprint_version_artifact_show
-            displayName: az blueprint version artifact show
-  - name: codespaces
-    items:
-    - name: Overview
-      uid: ext_codespaces_az
-    - name: codespace
-      displayName: az codespace
-      items:
-      - name: Overview
-        uid: ext_codespaces_az_codespace
-        displayName: az codespace
-      - name: create
-        uid: ext_codespaces_az_codespace_create
-        displayName: az codespace create
-      - name: delete
-        uid: ext_codespaces_az_codespace_delete
-        displayName: az codespace delete
-      - name: list
-        uid: ext_codespaces_az_codespace_list
-        displayName: az codespace list
-      - name: open
-        uid: ext_codespaces_az_codespace_open
-        displayName: az codespace open
-      - name: resume
-        uid: ext_codespaces_az_codespace_resume
-        displayName: az codespace resume
-      - name: show
-        uid: ext_codespaces_az_codespace_show
-        displayName: az codespace show
-      - name: suspend
-        uid: ext_codespaces_az_codespace_suspend
-        displayName: az codespace suspend
-      - name: location
-        displayName: az codespace location
-        items:
-        - name: Overview
-          uid: ext_codespaces_az_codespace_location
-          displayName: az codespace location
-        - name: list
-          uid: ext_codespaces_az_codespace_location_list
-          displayName: az codespace location list
-        - name: show
-          uid: ext_codespaces_az_codespace_location_show
-          displayName: az codespace location show
-      - name: plan
-        displayName: az codespace plan
-        items:
-        - name: Overview
-          uid: ext_codespaces_az_codespace_plan
-          displayName: az codespace plan
-        - name: create
-          uid: ext_codespaces_az_codespace_plan_create
-          displayName: az codespace plan create
-        - name: delete
-          uid: ext_codespaces_az_codespace_plan_delete
-          displayName: az codespace plan delete
-        - name: list
-          uid: ext_codespaces_az_codespace_plan_list
-          displayName: az codespace plan list
-        - name: show
-          uid: ext_codespaces_az_codespace_plan_show
-          displayName: az codespace plan show
-  - name: connectedk8s
-    items:
-    - name: Overview
-      uid: ext_connectedk8s_az
-    - name: connectedk8s
-      displayName: az connectedk8s
-      items:
-      - name: Overview
-        uid: ext_connectedk8s_az_connectedk8s
-        displayName: az connectedk8s
-      - name: connect
-        uid: ext_connectedk8s_az_connectedk8s_connect
-        displayName: az connectedk8s connect
-      - name: delete
-        uid: ext_connectedk8s_az_connectedk8s_delete
-        displayName: az connectedk8s delete
-      - name: list
-        uid: ext_connectedk8s_az_connectedk8s_list
-        displayName: az connectedk8s list
-      - name: show
-        uid: ext_connectedk8s_az_connectedk8s_show
-        displayName: az connectedk8s show
-  - name: connectedmachine
-    items:
-    - name: Overview
-      uid: ext_connectedmachine_az
-    - name: connectedmachine
-      displayName: az connectedmachine
-      items:
-      - name: Overview
-        uid: ext_connectedmachine_az_connectedmachine
-        displayName: az connectedmachine
-      - name: delete
-        uid: ext_connectedmachine_az_connectedmachine_delete
-        displayName: az connectedmachine delete
-      - name: list
-        uid: ext_connectedmachine_az_connectedmachine_list
-        displayName: az connectedmachine list
-      - name: show
-        uid: ext_connectedmachine_az_connectedmachine_show
-        displayName: az connectedmachine show
-  - name: costmanagement
-    items:
-    - name: Overview
-      uid: ext_costmanagement_az
-    - name: costmanagement
-      displayName: az costmanagement
-      items:
-      - name: Overview
-        uid: ext_costmanagement_az_costmanagement
-        displayName: az costmanagement
-      - name: query
-        uid: ext_costmanagement_az_costmanagement_query
-        displayName: az costmanagement query
-      - name: export
-        displayName: az costmanagement export
-        items:
-        - name: Overview
-          uid: ext_costmanagement_az_costmanagement_export
-          displayName: az costmanagement export
-        - name: create
-          uid: ext_costmanagement_az_costmanagement_export_create
-          displayName: az costmanagement export create
-        - name: delete
-          uid: ext_costmanagement_az_costmanagement_export_delete
-          displayName: az costmanagement export delete
-        - name: list
-          uid: ext_costmanagement_az_costmanagement_export_list
-          displayName: az costmanagement export list
-        - name: show
-          uid: ext_costmanagement_az_costmanagement_export_show
-          displayName: az costmanagement export show
-        - name: update
-          uid: ext_costmanagement_az_costmanagement_export_update
-          displayName: az costmanagement export update
-  - name: csvmware
-    items:
-    - name: Overview
-      uid: ext_csvmware_az
-    - name: csvmware
-      displayName: az csvmware
-      items:
-      - name: Overview
-        uid: ext_csvmware_az_csvmware
-        displayName: az csvmware
-      - name: private-cloud
-        displayName: az csvmware private-cloud
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_private_cloud
-          displayName: az csvmware private-cloud
-        - name: list
-          uid: ext_csvmware_az_csvmware_private_cloud_list
-          displayName: az csvmware private-cloud list
-        - name: show
-          uid: ext_csvmware_az_csvmware_private_cloud_show
-          displayName: az csvmware private-cloud show
-      - name: resource-pool
-        displayName: az csvmware resource-pool
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_resource_pool
-          displayName: az csvmware resource-pool
-        - name: list
-          uid: ext_csvmware_az_csvmware_resource_pool_list
-          displayName: az csvmware resource-pool list
-        - name: show
-          uid: ext_csvmware_az_csvmware_resource_pool_show
-          displayName: az csvmware resource-pool show
-      - name: virtual-network
-        displayName: az csvmware virtual-network
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_virtual_network
-          displayName: az csvmware virtual-network
-        - name: list
-          uid: ext_csvmware_az_csvmware_virtual_network_list
-          displayName: az csvmware virtual-network list
-        - name: show
-          uid: ext_csvmware_az_csvmware_virtual_network_show
-          displayName: az csvmware virtual-network show
-      - name: vm
-        displayName: az csvmware vm
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_vm
-          displayName: az csvmware vm
-        - name: create
-          uid: ext_csvmware_az_csvmware_vm_create
-          displayName: az csvmware vm create
-        - name: delete
-          uid: ext_csvmware_az_csvmware_vm_delete
-          displayName: az csvmware vm delete
-        - name: list
-          uid: ext_csvmware_az_csvmware_vm_list
-          displayName: az csvmware vm list
-        - name: show
-          uid: ext_csvmware_az_csvmware_vm_show
-          displayName: az csvmware vm show
-        - name: start
-          uid: ext_csvmware_az_csvmware_vm_start
-          displayName: az csvmware vm start
-        - name: stop
-          uid: ext_csvmware_az_csvmware_vm_stop
-          displayName: az csvmware vm stop
-        - name: update
-          uid: ext_csvmware_az_csvmware_vm_update
-          displayName: az csvmware vm update
-        - name: disk
-          displayName: az csvmware vm disk
-          items:
-          - name: Overview
-            uid: ext_csvmware_az_csvmware_vm_disk
-            displayName: az csvmware vm disk
-          - name: add
-            uid: ext_csvmware_az_csvmware_vm_disk_add
-            displayName: az csvmware vm disk add
-          - name: delete
-            uid: ext_csvmware_az_csvmware_vm_disk_delete
-            displayName: az csvmware vm disk delete
-          - name: list
-            uid: ext_csvmware_az_csvmware_vm_disk_list
-            displayName: az csvmware vm disk list
-          - name: show
-            uid: ext_csvmware_az_csvmware_vm_disk_show
-            displayName: az csvmware vm disk show
-        - name: nic
-          displayName: az csvmware vm nic
-          items:
-          - name: Overview
-            uid: ext_csvmware_az_csvmware_vm_nic
-            displayName: az csvmware vm nic
-          - name: add
-            uid: ext_csvmware_az_csvmware_vm_nic_add
-            displayName: az csvmware vm nic add
-          - name: delete
-            uid: ext_csvmware_az_csvmware_vm_nic_delete
-            displayName: az csvmware vm nic delete
-          - name: list
-            uid: ext_csvmware_az_csvmware_vm_nic_list
-            displayName: az csvmware vm nic list
-          - name: show
-            uid: ext_csvmware_az_csvmware_vm_nic_show
-            displayName: az csvmware vm nic show
-      - name: vm-template
-        displayName: az csvmware vm-template
-        items:
-        - name: Overview
-          uid: ext_csvmware_az_csvmware_vm_template
-          displayName: az csvmware vm-template
-        - name: list
-          uid: ext_csvmware_az_csvmware_vm_template_list
-          displayName: az csvmware vm-template list
-        - name: show
-          uid: ext_csvmware_az_csvmware_vm_template_show
-          displayName: az csvmware vm-template show
-  - name: custom-providers
-    items:
-    - name: Overview
-      uid: ext_custom-providers_az
-    - name: custom-providers
-      displayName: az custom-providers
-      items:
-      - name: Overview
-        uid: ext_custom-providers_az_custom_providers
-        displayName: az custom-providers
-      - name: resource-provider
-        displayName: az custom-providers resource-provider
-        items:
-        - name: Overview
-          uid: ext_custom-providers_az_custom_providers_resource_provider
-          displayName: az custom-providers resource-provider
-        - name: create
-          uid: ext_custom-providers_az_custom_providers_resource_provider_create
-          displayName: az custom-providers resource-provider create
-        - name: delete
-          uid: ext_custom-providers_az_custom_providers_resource_provider_delete
-          displayName: az custom-providers resource-provider delete
-        - name: list
-          uid: ext_custom-providers_az_custom_providers_resource_provider_list
-          displayName: az custom-providers resource-provider list
-        - name: show
-          uid: ext_custom-providers_az_custom_providers_resource_provider_show
-          displayName: az custom-providers resource-provider show
-        - name: update
-          uid: ext_custom-providers_az_custom_providers_resource_provider_update
-          displayName: az custom-providers resource-provider update
-  - name: databox
-    items:
-    - name: Overview
-      uid: ext_databox_az
-    - name: databox
-      displayName: az databox
-      items:
-      - name: Overview
-        uid: ext_databox_az_databox
-        displayName: az databox
-      - name: job
-        displayName: az databox job
-        items:
-        - name: Overview
-          uid: ext_databox_az_databox_job
-          displayName: az databox job
-        - name: cancel
-          uid: ext_databox_az_databox_job_cancel
-          displayName: az databox job cancel
-        - name: create
-          uid: ext_databox_az_databox_job_create
-          displayName: az databox job create
-        - name: delete
-          uid: ext_databox_az_databox_job_delete
-          displayName: az databox job delete
-        - name: list
-          uid: ext_databox_az_databox_job_list
-          displayName: az databox job list
-        - name: list-credentials
-          uid: ext_databox_az_databox_job_list_credentials
-          displayName: az databox job list-credentials
-        - name: show
-          uid: ext_databox_az_databox_job_show
-          displayName: az databox job show
-        - name: update
-          uid: ext_databox_az_databox_job_update
-          displayName: az databox job update
-  - name: databricks
-    items:
-    - name: Overview
-      uid: ext_databricks_az
-    - name: databricks
-      displayName: az databricks
-      items:
-      - name: Overview
-        uid: ext_databricks_az_databricks
-        displayName: az databricks
-      - name: workspace
-        displayName: az databricks workspace
-        items:
-        - name: Overview
-          uid: ext_databricks_az_databricks_workspace
-          displayName: az databricks workspace
-        - name: create
-          uid: ext_databricks_az_databricks_workspace_create
-          displayName: az databricks workspace create
-        - name: delete
-          uid: ext_databricks_az_databricks_workspace_delete
-          displayName: az databricks workspace delete
-        - name: list
-          uid: ext_databricks_az_databricks_workspace_list
-          displayName: az databricks workspace list
-        - name: show
-          uid: ext_databricks_az_databricks_workspace_show
-          displayName: az databricks workspace show
-        - name: update
-          uid: ext_databricks_az_databricks_workspace_update
-          displayName: az databricks workspace update
-        - name: wait
-          uid: ext_databricks_az_databricks_workspace_wait
-          displayName: az databricks workspace wait
-  - name: datashare
-    items:
-    - name: Overview
-      uid: ext_datashare_az
-    - name: datashare
-      displayName: az datashare
-      items:
-      - name: Overview
-        uid: ext_datashare_az_datashare
-        displayName: az datashare
-      - name: create
-        uid: ext_datashare_az_datashare_create
-        displayName: az datashare create
-      - name: delete
-        uid: ext_datashare_az_datashare_delete
-        displayName: az datashare delete
-      - name: list
-        uid: ext_datashare_az_datashare_list
-        displayName: az datashare list
-      - name: show
-        uid: ext_datashare_az_datashare_show
-        displayName: az datashare show
-      - name: wait
-        uid: ext_datashare_az_datashare_wait
-        displayName: az datashare wait
-      - name: account
-        displayName: az datashare account
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_account
-          displayName: az datashare account
-        - name: create
-          uid: ext_datashare_az_datashare_account_create
-          displayName: az datashare account create
-        - name: delete
-          uid: ext_datashare_az_datashare_account_delete
-          displayName: az datashare account delete
-        - name: list
-          uid: ext_datashare_az_datashare_account_list
-          displayName: az datashare account list
-        - name: show
-          uid: ext_datashare_az_datashare_account_show
-          displayName: az datashare account show
-        - name: update
-          uid: ext_datashare_az_datashare_account_update
-          displayName: az datashare account update
-        - name: wait
-          uid: ext_datashare_az_datashare_account_wait
-          displayName: az datashare account wait
-      - name: consumer
-        displayName: az datashare consumer
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_consumer
-          displayName: az datashare consumer
-        - name: dataset-mapping
-          displayName: az datashare consumer dataset-mapping
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping
-            displayName: az datashare consumer dataset-mapping
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_create
-            displayName: az datashare consumer dataset-mapping create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_delete
-            displayName: az datashare consumer dataset-mapping delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_list
-            displayName: az datashare consumer dataset-mapping list
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_dataset_mapping_show
-            displayName: az datashare consumer dataset-mapping show
-        - name: invitation
-          displayName: az datashare consumer invitation
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_invitation
-            displayName: az datashare consumer invitation
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_invitation_list
-            displayName: az datashare consumer invitation list
-          - name: reject
-            uid: ext_datashare_az_datashare_consumer_invitation_reject
-            displayName: az datashare consumer invitation reject
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_invitation_show
-            displayName: az datashare consumer invitation show
-        - name: share-subscription
-          displayName: az datashare consumer share-subscription
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_share_subscription
-            displayName: az datashare consumer share-subscription
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_share_subscription_create
-            displayName: az datashare consumer share-subscription create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_share_subscription_delete
-            displayName: az datashare consumer share-subscription delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list
-            displayName: az datashare consumer share-subscription list
-          - name: list-source-dataset
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_dataset
-            displayName: az datashare consumer share-subscription list-source-dataset
-          - name: list-source-share-synchronization-setting
-            uid: ext_datashare_az_datashare_consumer_share_subscription_list_source_share_synchronization_setting
-            displayName: az datashare consumer share-subscription list-source-share-synchronization-setting
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_share_subscription_show
-            displayName: az datashare consumer share-subscription show
-          - name: wait
-            uid: ext_datashare_az_datashare_consumer_share_subscription_wait
-            displayName: az datashare consumer share-subscription wait
-          - name: synchronization
-            displayName: az datashare consumer share-subscription synchronization
-            items:
-            - name: Overview
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization
-              displayName: az datashare consumer share-subscription synchronization
-            - name: cancel
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_cancel
-              displayName: az datashare consumer share-subscription synchronization cancel
-            - name: list
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list
-              displayName: az datashare consumer share-subscription synchronization list
-            - name: list-detail
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_list_detail
-              displayName: az datashare consumer share-subscription synchronization list-detail
-            - name: start
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_start
-              displayName: az datashare consumer share-subscription synchronization start
-            - name: wait
-              uid: ext_datashare_az_datashare_consumer_share_subscription_synchronization_wait
-              displayName: az datashare consumer share-subscription synchronization wait
-        - name: trigger
-          displayName: az datashare consumer trigger
-          items:
-          - name: Overview
-            uid: ext_datashare_az_datashare_consumer_trigger
-            displayName: az datashare consumer trigger
-          - name: create
-            uid: ext_datashare_az_datashare_consumer_trigger_create
-            displayName: az datashare consumer trigger create
-          - name: delete
-            uid: ext_datashare_az_datashare_consumer_trigger_delete
-            displayName: az datashare consumer trigger delete
-          - name: list
-            uid: ext_datashare_az_datashare_consumer_trigger_list
-            displayName: az datashare consumer trigger list
-          - name: show
-            uid: ext_datashare_az_datashare_consumer_trigger_show
-            displayName: az datashare consumer trigger show
-          - name: wait
-            uid: ext_datashare_az_datashare_consumer_trigger_wait
-            displayName: az datashare consumer trigger wait
-      - name: dataset
-        displayName: az datashare dataset
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_dataset
-          displayName: az datashare dataset
-        - name: create
-          uid: ext_datashare_az_datashare_dataset_create
-          displayName: az datashare dataset create
-        - name: delete
-          uid: ext_datashare_az_datashare_dataset_delete
-          displayName: az datashare dataset delete
-        - name: list
-          uid: ext_datashare_az_datashare_dataset_list
-          displayName: az datashare dataset list
-        - name: show
-          uid: ext_datashare_az_datashare_dataset_show
-          displayName: az datashare dataset show
-        - name: wait
-          uid: ext_datashare_az_datashare_dataset_wait
-          displayName: az datashare dataset wait
-      - name: invitation
-        displayName: az datashare invitation
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_invitation
-          displayName: az datashare invitation
-        - name: create
-          uid: ext_datashare_az_datashare_invitation_create
-          displayName: az datashare invitation create
-        - name: delete
-          uid: ext_datashare_az_datashare_invitation_delete
-          displayName: az datashare invitation delete
-        - name: list
-          uid: ext_datashare_az_datashare_invitation_list
-          displayName: az datashare invitation list
-        - name: show
-          uid: ext_datashare_az_datashare_invitation_show
-          displayName: az datashare invitation show
-      - name: provider-share-subscription
-        displayName: az datashare provider-share-subscription
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_provider_share_subscription
-          displayName: az datashare provider-share-subscription
-        - name: list
-          uid: ext_datashare_az_datashare_provider_share_subscription_list
-          displayName: az datashare provider-share-subscription list
-        - name: reinstate
-          uid: ext_datashare_az_datashare_provider_share_subscription_reinstate
-          displayName: az datashare provider-share-subscription reinstate
-        - name: revoke
-          uid: ext_datashare_az_datashare_provider_share_subscription_revoke
-          displayName: az datashare provider-share-subscription revoke
-        - name: show
-          uid: ext_datashare_az_datashare_provider_share_subscription_show
-          displayName: az datashare provider-share-subscription show
-        - name: wait
-          uid: ext_datashare_az_datashare_provider_share_subscription_wait
-          displayName: az datashare provider-share-subscription wait
-      - name: synchronization
-        displayName: az datashare synchronization
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_synchronization
-          displayName: az datashare synchronization
-        - name: list
-          uid: ext_datashare_az_datashare_synchronization_list
-          displayName: az datashare synchronization list
-        - name: list-detail
-          uid: ext_datashare_az_datashare_synchronization_list_detail
-          displayName: az datashare synchronization list-detail
-      - name: synchronization-setting
-        displayName: az datashare synchronization-setting
-        items:
-        - name: Overview
-          uid: ext_datashare_az_datashare_synchronization_setting
-          displayName: az datashare synchronization-setting
-        - name: create
-          uid: ext_datashare_az_datashare_synchronization_setting_create
-          displayName: az datashare synchronization-setting create
-        - name: delete
-          uid: ext_datashare_az_datashare_synchronization_setting_delete
-          displayName: az datashare synchronization-setting delete
-        - name: list
-          uid: ext_datashare_az_datashare_synchronization_setting_list
-          displayName: az datashare synchronization-setting list
-        - name: show
-          uid: ext_datashare_az_datashare_synchronization_setting_show
-          displayName: az datashare synchronization-setting show
-        - name: wait
-          uid: ext_datashare_az_datashare_synchronization_setting_wait
-          displayName: az datashare synchronization-setting wait
-  - name: db-up
-    items:
-    - name: Overview
-      uid: ext_db-up_az
-    - name: MySQL
-      displayName: az mysql
-      items:
-      - name: Overview
-        uid: ext_db-up_az_mysql
-        displayName: az mysql
-      - name: down
-        uid: ext_db-up_az_mysql_down
-        displayName: az mysql down
-      - name: show-connection-string
-        uid: ext_db-up_az_mysql_show_connection_string
-        displayName: az mysql show-connection-string
-      - name: up
-        uid: ext_db-up_az_mysql_up
-        displayName: az mysql up
-    - name: PostgreSQL
-      displayName: az postgres
-      items:
-      - name: Overview
-        uid: ext_db-up_az_postgres
-        displayName: az postgres
-      - name: down
-        uid: ext_db-up_az_postgres_down
-        displayName: az postgres down
-      - name: show-connection-string
-        uid: ext_db-up_az_postgres_show_connection_string
-        displayName: az postgres show-connection-string
-      - name: up
-        uid: ext_db-up_az_postgres_up
-        displayName: az postgres up
-    - name: SQL
-      displayName: az sql
-      items:
-      - name: Overview
-        uid: ext_db-up_az_sql
-        displayName: az sql
-      - name: down
-        uid: ext_db-up_az_sql_down
-        displayName: az sql down
-      - name: up
-        uid: ext_db-up_az_sql_up
-        displayName: az sql up
-  - name: deploy-to-azure
-    items:
-    - name: Overview
-      uid: ext_deploy-to-azure_az
-    - name: Container
-      displayName: az container
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_container
-        displayName: az container
-      - name: app
-        displayName: az container app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_container_app
-          displayName: az container app
-        - name: up
-          uid: ext_deploy-to-azure_az_container_app_up
-          displayName: az container app up
-    - name: Functions
-      displayName: az functionapp
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_functionapp
-        displayName: az functionapp
-      - name: app
-        displayName: az functionapp app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_functionapp_app
-          displayName: az functionapp app
-        - name: up
-          uid: ext_deploy-to-azure_az_functionapp_app_up
-          displayName: az functionapp app up
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_deploy-to-azure_az_aks
-        displayName: az aks
-      - name: app
-        displayName: az aks app
-        items:
-        - name: Overview
-          uid: ext_deploy-to-azure_az_aks_app
-          displayName: az aks app
-        - name: up
-          uid: ext_deploy-to-azure_az_aks_app_up
-          displayName: az aks app up
-  - name: dev-spaces
-    items:
-    - name: Overview
-      uid: ext_dev-spaces_az
-    - name: aks
-      displayName: az aks
-      items:
-      - name: Overview
-        uid: ext_dev-spaces_az_aks
-        displayName: az aks
-      - name: use-dev-spaces
-        uid: ext_dev-spaces_az_aks_use_dev_spaces
-        displayName: az aks use-dev-spaces
-  - name: dms-preview
-    items:
-    - name: Overview
-      uid: ext_dms-preview_az
-    - name: dms
-      displayName: az dms
-      items:
-      - name: Overview
-        uid: ext_dms-preview_az_dms
-        displayName: az dms
-      - name: project
-        displayName: az dms project
-        items:
-        - name: Overview
-          uid: ext_dms-preview_az_dms_project
-          displayName: az dms project
-        - name: create
-          uid: ext_dms-preview_az_dms_project_create
-          displayName: az dms project create
-        - name: task
-          displayName: az dms project task
-          items:
-          - name: Overview
-            uid: ext_dms-preview_az_dms_project_task
-            displayName: az dms project task
-          - name: cancel
-            uid: ext_dms-preview_az_dms_project_task_cancel
-            displayName: az dms project task cancel
-          - name: create
-            uid: ext_dms-preview_az_dms_project_task_create
-            displayName: az dms project task create
-          - name: cutover
-            uid: ext_dms-preview_az_dms_project_task_cutover
-            displayName: az dms project task cutover
-          - name: restart
-            uid: ext_dms-preview_az_dms_project_task_restart
-            displayName: az dms project task restart
-          - name: stop
-            uid: ext_dms-preview_az_dms_project_task_stop
-            displayName: az dms project task stop
-      - name: task
-        displayName: az dms task
-        items:
-        - name: Overview
-          uid: ext_dms-preview_az_dms_task
-          displayName: az dms task
-        - name: cancel
-          uid: ext_dms-preview_az_dms_task_cancel
-          displayName: az dms task cancel
-        - name: create
-          uid: ext_dms-preview_az_dms_task_create
-          displayName: az dms task create
-        - name: delete
-          uid: ext_dms-preview_az_dms_task_delete
-          displayName: az dms task delete
-        - name: list
-          uid: ext_dms-preview_az_dms_task_list
-          displayName: az dms task list
-        - name: show
-          uid: ext_dms-preview_az_dms_task_show
-          displayName: az dms task show
-  - name: eventgrid
-    items:
-    - name: Overview
-      uid: ext_eventgrid_az
-    - name: eventgrid
-      displayName: az eventgrid
-      items:
-      - name: Overview
-        uid: ext_eventgrid_az_eventgrid
-        displayName: az eventgrid
-      - name: domain
-        displayName: az eventgrid domain
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_domain
-          displayName: az eventgrid domain
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_domain_create
-          displayName: az eventgrid domain create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_domain_delete
-          displayName: az eventgrid domain delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_domain_list
-          displayName: az eventgrid domain list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_domain_show
-          displayName: az eventgrid domain show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_domain_update
-          displayName: az eventgrid domain update
-        - name: key
-          displayName: az eventgrid domain key
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_key
-            displayName: az eventgrid domain key
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_key_list
-            displayName: az eventgrid domain key list
-          - name: regenerate
-            uid: ext_eventgrid_az_eventgrid_domain_key_regenerate
-            displayName: az eventgrid domain key regenerate
-        - name: private-endpoint-connection
-          displayName: az eventgrid domain private-endpoint-connection
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection
-            displayName: az eventgrid domain private-endpoint-connection
-          - name: approve
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_approve
-            displayName: az eventgrid domain private-endpoint-connection approve
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_delete
-            displayName: az eventgrid domain private-endpoint-connection delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_list
-            displayName: az eventgrid domain private-endpoint-connection list
-          - name: reject
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_reject
-            displayName: az eventgrid domain private-endpoint-connection reject
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_private_endpoint_connection_show
-            displayName: az eventgrid domain private-endpoint-connection show
-        - name: private-link-resource
-          displayName: az eventgrid domain private-link-resource
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource
-            displayName: az eventgrid domain private-link-resource
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_list
-            displayName: az eventgrid domain private-link-resource list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_private_link_resource_show
-            displayName: az eventgrid domain private-link-resource show
-        - name: topic
-          displayName: az eventgrid domain topic
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_domain_topic
-            displayName: az eventgrid domain topic
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_domain_topic_create
-            displayName: az eventgrid domain topic create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_domain_topic_delete
-            displayName: az eventgrid domain topic delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_domain_topic_list
-            displayName: az eventgrid domain topic list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_domain_topic_show
-            displayName: az eventgrid domain topic show
-      - name: event-subscription
-        displayName: az eventgrid event-subscription
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_event_subscription
-          displayName: az eventgrid event-subscription
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_event_subscription_create
-          displayName: az eventgrid event-subscription create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_event_subscription_delete
-          displayName: az eventgrid event-subscription delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_event_subscription_list
-          displayName: az eventgrid event-subscription list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_event_subscription_show
-          displayName: az eventgrid event-subscription show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_event_subscription_update
-          displayName: az eventgrid event-subscription update
-      - name: extension-topic
-        displayName: az eventgrid extension-topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_extension_topic
-          displayName: az eventgrid extension-topic
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_extension_topic_show
-          displayName: az eventgrid extension-topic show
-      - name: partner
-        displayName: az eventgrid partner
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_partner
-          displayName: az eventgrid partner
-        - name: namespace
-          displayName: az eventgrid partner namespace
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_namespace
-            displayName: az eventgrid partner namespace
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_create
-            displayName: az eventgrid partner namespace create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_delete
-            displayName: az eventgrid partner namespace delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_list
-            displayName: az eventgrid partner namespace list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_namespace_show
-            displayName: az eventgrid partner namespace show
-          - name: event-channel
-            displayName: az eventgrid partner namespace event-channel
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel
-              displayName: az eventgrid partner namespace event-channel
-            - name: create
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_create
-              displayName: az eventgrid partner namespace event-channel create
-            - name: delete
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_delete
-              displayName: az eventgrid partner namespace event-channel delete
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_list
-              displayName: az eventgrid partner namespace event-channel list
-            - name: show
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_event_channel_show
-              displayName: az eventgrid partner namespace event-channel show
-          - name: key
-            displayName: az eventgrid partner namespace key
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key
-              displayName: az eventgrid partner namespace key
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key_list
-              displayName: az eventgrid partner namespace key list
-            - name: regenerate
-              uid: ext_eventgrid_az_eventgrid_partner_namespace_key_regenerate
-              displayName: az eventgrid partner namespace key regenerate
-        - name: registration
-          displayName: az eventgrid partner registration
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_registration
-            displayName: az eventgrid partner registration
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_partner_registration_create
-            displayName: az eventgrid partner registration create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_registration_delete
-            displayName: az eventgrid partner registration delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_registration_list
-            displayName: az eventgrid partner registration list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_registration_show
-            displayName: az eventgrid partner registration show
-        - name: topic
-          displayName: az eventgrid partner topic
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_partner_topic
-            displayName: az eventgrid partner topic
-          - name: activate
-            uid: ext_eventgrid_az_eventgrid_partner_topic_activate
-            displayName: az eventgrid partner topic activate
-          - name: deactivate
-            uid: ext_eventgrid_az_eventgrid_partner_topic_deactivate
-            displayName: az eventgrid partner topic deactivate
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_partner_topic_delete
-            displayName: az eventgrid partner topic delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_partner_topic_list
-            displayName: az eventgrid partner topic list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_partner_topic_show
-            displayName: az eventgrid partner topic show
-          - name: event-subscription
-            displayName: az eventgrid partner topic event-subscription
-            items:
-            - name: Overview
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription
-              displayName: az eventgrid partner topic event-subscription
-            - name: create
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_create
-              displayName: az eventgrid partner topic event-subscription create
-            - name: delete
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_delete
-              displayName: az eventgrid partner topic event-subscription delete
-            - name: list
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_list
-              displayName: az eventgrid partner topic event-subscription list
-            - name: show
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_show
-              displayName: az eventgrid partner topic event-subscription show
-            - name: update
-              uid: ext_eventgrid_az_eventgrid_partner_topic_event_subscription_update
-              displayName: az eventgrid partner topic event-subscription update
-      - name: system-topic
-        displayName: az eventgrid system-topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_system_topic
-          displayName: az eventgrid system-topic
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_system_topic_create
-          displayName: az eventgrid system-topic create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_system_topic_delete
-          displayName: az eventgrid system-topic delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_system_topic_list
-          displayName: az eventgrid system-topic list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_system_topic_show
-          displayName: az eventgrid system-topic show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_system_topic_update
-          displayName: az eventgrid system-topic update
-        - name: event-subscription
-          displayName: az eventgrid system-topic event-subscription
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription
-            displayName: az eventgrid system-topic event-subscription
-          - name: create
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_create
-            displayName: az eventgrid system-topic event-subscription create
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_delete
-            displayName: az eventgrid system-topic event-subscription delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_list
-            displayName: az eventgrid system-topic event-subscription list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_show
-            displayName: az eventgrid system-topic event-subscription show
-          - name: update
-            uid: ext_eventgrid_az_eventgrid_system_topic_event_subscription_update
-            displayName: az eventgrid system-topic event-subscription update
-      - name: topic
-        displayName: az eventgrid topic
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_topic
-          displayName: az eventgrid topic
-        - name: create
-          uid: ext_eventgrid_az_eventgrid_topic_create
-          displayName: az eventgrid topic create
-        - name: delete
-          uid: ext_eventgrid_az_eventgrid_topic_delete
-          displayName: az eventgrid topic delete
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_topic_list
-          displayName: az eventgrid topic list
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_topic_show
-          displayName: az eventgrid topic show
-        - name: update
-          uid: ext_eventgrid_az_eventgrid_topic_update
-          displayName: az eventgrid topic update
-        - name: key
-          displayName: az eventgrid topic key
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_key
-            displayName: az eventgrid topic key
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_key_list
-            displayName: az eventgrid topic key list
-          - name: regenerate
-            uid: ext_eventgrid_az_eventgrid_topic_key_regenerate
-            displayName: az eventgrid topic key regenerate
-        - name: private-endpoint-connection
-          displayName: az eventgrid topic private-endpoint-connection
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection
-            displayName: az eventgrid topic private-endpoint-connection
-          - name: approve
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_approve
-            displayName: az eventgrid topic private-endpoint-connection approve
-          - name: delete
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_delete
-            displayName: az eventgrid topic private-endpoint-connection delete
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_list
-            displayName: az eventgrid topic private-endpoint-connection list
-          - name: reject
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_reject
-            displayName: az eventgrid topic private-endpoint-connection reject
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_topic_private_endpoint_connection_show
-            displayName: az eventgrid topic private-endpoint-connection show
-        - name: private-link-resource
-          displayName: az eventgrid topic private-link-resource
-          items:
-          - name: Overview
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource
-            displayName: az eventgrid topic private-link-resource
-          - name: list
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_list
-            displayName: az eventgrid topic private-link-resource list
-          - name: show
-            uid: ext_eventgrid_az_eventgrid_topic_private_link_resource_show
-            displayName: az eventgrid topic private-link-resource show
-      - name: topic-type
-        displayName: az eventgrid topic-type
-        items:
-        - name: Overview
-          uid: ext_eventgrid_az_eventgrid_topic_type
-          displayName: az eventgrid topic-type
-        - name: list
-          uid: ext_eventgrid_az_eventgrid_topic_type_list
-          displayName: az eventgrid topic-type list
-        - name: list-event-types
-          uid: ext_eventgrid_az_eventgrid_topic_type_list_event_types
-          displayName: az eventgrid topic-type list-event-types
-        - name: show
-          uid: ext_eventgrid_az_eventgrid_topic_type_show
-          displayName: az eventgrid topic-type show
-  - name: express-route
-    items:
-    - name: Overview
-      uid: ext_express-route_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_express-route_az_network
-        displayName: az network
-      - name: Express Route
-        displayName: az network express-route
-        items:
-        - name: Overview
-          uid: ext_express-route_az_network_express_route
-          displayName: az network express-route
-        - name: create
-          uid: ext_express-route_az_network_express_route_create
-          displayName: az network express-route create
-        - name: list
-          uid: ext_express-route_az_network_express_route_list
-          displayName: az network express-route list
-        - name: show
-          uid: ext_express-route_az_network_express_route_show
-          displayName: az network express-route show
-        - name: update
-          uid: ext_express-route_az_network_express_route_update
-          displayName: az network express-route update
-        - name: gateway
-          displayName: az network express-route gateway
-          items:
-          - name: Overview
-            uid: ext_express-route_az_network_express_route_gateway
-            displayName: az network express-route gateway
-          - name: create
-            uid: ext_express-route_az_network_express_route_gateway_create
-            displayName: az network express-route gateway create
-          - name: delete
-            uid: ext_express-route_az_network_express_route_gateway_delete
-            displayName: az network express-route gateway delete
-          - name: list
-            uid: ext_express-route_az_network_express_route_gateway_list
-            displayName: az network express-route gateway list
-          - name: show
-            uid: ext_express-route_az_network_express_route_gateway_show
-            displayName: az network express-route gateway show
-          - name: update
-            uid: ext_express-route_az_network_express_route_gateway_update
-            displayName: az network express-route gateway update
-          - name: connection
-            displayName: az network express-route gateway connection
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_gateway_connection
-              displayName: az network express-route gateway connection
-            - name: create
-              uid: ext_express-route_az_network_express_route_gateway_connection_create
-              displayName: az network express-route gateway connection create
-            - name: delete
-              uid: ext_express-route_az_network_express_route_gateway_connection_delete
-              displayName: az network express-route gateway connection delete
-            - name: list
-              uid: ext_express-route_az_network_express_route_gateway_connection_list
-              displayName: az network express-route gateway connection list
-            - name: show
-              uid: ext_express-route_az_network_express_route_gateway_connection_show
-              displayName: az network express-route gateway connection show
-            - name: update
-              uid: ext_express-route_az_network_express_route_gateway_connection_update
-              displayName: az network express-route gateway connection update
-        - name: port
-          displayName: az network express-route port
-          items:
-          - name: Overview
-            uid: ext_express-route_az_network_express_route_port
-            displayName: az network express-route port
-          - name: create
-            uid: ext_express-route_az_network_express_route_port_create
-            displayName: az network express-route port create
-          - name: delete
-            uid: ext_express-route_az_network_express_route_port_delete
-            displayName: az network express-route port delete
-          - name: list
-            uid: ext_express-route_az_network_express_route_port_list
-            displayName: az network express-route port list
-          - name: show
-            uid: ext_express-route_az_network_express_route_port_show
-            displayName: az network express-route port show
-          - name: update
-            uid: ext_express-route_az_network_express_route_port_update
-            displayName: az network express-route port update
-          - name: link
-            displayName: az network express-route port link
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_port_link
-              displayName: az network express-route port link
-            - name: list
-              uid: ext_express-route_az_network_express_route_port_link_list
-              displayName: az network express-route port link list
-            - name: show
-              uid: ext_express-route_az_network_express_route_port_link_show
-              displayName: az network express-route port link show
-          - name: location
-            displayName: az network express-route port location
-            items:
-            - name: Overview
-              uid: ext_express-route_az_network_express_route_port_location
-              displayName: az network express-route port location
-            - name: list
-              uid: ext_express-route_az_network_express_route_port_location_list
-              displayName: az network express-route port location list
-            - name: show
-              uid: ext_express-route_az_network_express_route_port_location_show
-              displayName: az network express-route port location show
-  - name: express-route-cross-connection
-    items:
-    - name: Overview
-      uid: ext_express-route-cross-connection_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_express-route-cross-connection_az_network
-        displayName: az network
-      - name: cross-connection
-        displayName: az network cross-connection
-        items:
-        - name: Overview
-          uid: ext_express-route-cross-connection_az_network_cross_connection
-          displayName: az network cross-connection
-        - name: list
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list
-          displayName: az network cross-connection list
-        - name: list-arp-tables
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list_arp_tables
-          displayName: az network cross-connection list-arp-tables
-        - name: list-route-tables
-          uid: ext_express-route-cross-connection_az_network_cross_connection_list_route_tables
-          displayName: az network cross-connection list-route-tables
-        - name: show
-          uid: ext_express-route-cross-connection_az_network_cross_connection_show
-          displayName: az network cross-connection show
-        - name: summarize-route-table
-          uid: ext_express-route-cross-connection_az_network_cross_connection_summarize_route_table
-          displayName: az network cross-connection summarize-route-table
-        - name: update
-          uid: ext_express-route-cross-connection_az_network_cross_connection_update
-          displayName: az network cross-connection update
-        - name: wait
-          uid: ext_express-route-cross-connection_az_network_cross_connection_wait
-          displayName: az network cross-connection wait
-        - name: peering
-          displayName: az network cross-connection peering
-          items:
-          - name: Overview
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering
-            displayName: az network cross-connection peering
-          - name: create
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_create
-            displayName: az network cross-connection peering create
-          - name: delete
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_delete
-            displayName: az network cross-connection peering delete
-          - name: list
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_list
-            displayName: az network cross-connection peering list
-          - name: show
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_show
-            displayName: az network cross-connection peering show
-          - name: update
-            uid: ext_express-route-cross-connection_az_network_cross_connection_peering_update
-            displayName: az network cross-connection peering update
-  - name: front-door
-    items:
-    - name: Overview
-      uid: ext_front-door_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_front-door_az_network
-        displayName: az network
-      - name: front-door
-        displayName: az network front-door
-        items:
-        - name: Overview
-          uid: ext_front-door_az_network_front_door
-          displayName: az network front-door
-        - name: check-custom-domain
-          uid: ext_front-door_az_network_front_door_check_custom_domain
-          displayName: az network front-door check-custom-domain
-        - name: create
-          uid: ext_front-door_az_network_front_door_create
-          displayName: az network front-door create
-        - name: delete
-          uid: ext_front-door_az_network_front_door_delete
-          displayName: az network front-door delete
-        - name: list
-          uid: ext_front-door_az_network_front_door_list
-          displayName: az network front-door list
-        - name: purge-endpoint
-          uid: ext_front-door_az_network_front_door_purge_endpoint
-          displayName: az network front-door purge-endpoint
-        - name: show
-          uid: ext_front-door_az_network_front_door_show
-          displayName: az network front-door show
-        - name: update
-          uid: ext_front-door_az_network_front_door_update
-          displayName: az network front-door update
-        - name: backend-pool
-          displayName: az network front-door backend-pool
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_backend_pool
-            displayName: az network front-door backend-pool
-          - name: create
-            uid: ext_front-door_az_network_front_door_backend_pool_create
-            displayName: az network front-door backend-pool create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_backend_pool_delete
-            displayName: az network front-door backend-pool delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_backend_pool_list
-            displayName: az network front-door backend-pool list
-          - name: show
-            uid: ext_front-door_az_network_front_door_backend_pool_show
-            displayName: az network front-door backend-pool show
-          - name: backend
-            displayName: az network front-door backend-pool backend
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_backend_pool_backend
-              displayName: az network front-door backend-pool backend
-            - name: add
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_add
-              displayName: az network front-door backend-pool backend add
-            - name: list
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_list
-              displayName: az network front-door backend-pool backend list
-            - name: remove
-              uid: ext_front-door_az_network_front_door_backend_pool_backend_remove
-              displayName: az network front-door backend-pool backend remove
-        - name: frontend-endpoint
-          displayName: az network front-door frontend-endpoint
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_frontend_endpoint
-            displayName: az network front-door frontend-endpoint
-          - name: create
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_create
-            displayName: az network front-door frontend-endpoint create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_delete
-            displayName: az network front-door frontend-endpoint delete
-          - name: disable-https
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_disable_https
-            displayName: az network front-door frontend-endpoint disable-https
-          - name: enable-https
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_enable_https
-            displayName: az network front-door frontend-endpoint enable-https
-          - name: list
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_list
-            displayName: az network front-door frontend-endpoint list
-          - name: show
-            uid: ext_front-door_az_network_front_door_frontend_endpoint_show
-            displayName: az network front-door frontend-endpoint show
-        - name: load-balancing
-          displayName: az network front-door load-balancing
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_load_balancing
-            displayName: az network front-door load-balancing
-          - name: create
-            uid: ext_front-door_az_network_front_door_load_balancing_create
-            displayName: az network front-door load-balancing create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_load_balancing_delete
-            displayName: az network front-door load-balancing delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_load_balancing_list
-            displayName: az network front-door load-balancing list
-          - name: show
-            uid: ext_front-door_az_network_front_door_load_balancing_show
-            displayName: az network front-door load-balancing show
-        - name: probe
-          displayName: az network front-door probe
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_probe
-            displayName: az network front-door probe
-          - name: create
-            uid: ext_front-door_az_network_front_door_probe_create
-            displayName: az network front-door probe create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_probe_delete
-            displayName: az network front-door probe delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_probe_list
-            displayName: az network front-door probe list
-          - name: show
-            uid: ext_front-door_az_network_front_door_probe_show
-            displayName: az network front-door probe show
-          - name: update
-            uid: ext_front-door_az_network_front_door_probe_update
-            displayName: az network front-door probe update
-        - name: routing-rule
-          displayName: az network front-door routing-rule
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_routing_rule
-            displayName: az network front-door routing-rule
-          - name: create
-            uid: ext_front-door_az_network_front_door_routing_rule_create
-            displayName: az network front-door routing-rule create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_routing_rule_delete
-            displayName: az network front-door routing-rule delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_routing_rule_list
-            displayName: az network front-door routing-rule list
-          - name: show
-            uid: ext_front-door_az_network_front_door_routing_rule_show
-            displayName: az network front-door routing-rule show
-          - name: update
-            uid: ext_front-door_az_network_front_door_routing_rule_update
-            displayName: az network front-door routing-rule update
-        - name: rules-engine
-          displayName: az network front-door rules-engine
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_rules_engine
-            displayName: az network front-door rules-engine
-          - name: delete
-            uid: ext_front-door_az_network_front_door_rules_engine_delete
-            displayName: az network front-door rules-engine delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_rules_engine_list
-            displayName: az network front-door rules-engine list
-          - name: show
-            uid: ext_front-door_az_network_front_door_rules_engine_show
-            displayName: az network front-door rules-engine show
-          - name: rule
-            displayName: az network front-door rules-engine rule
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_rules_engine_rule
-              displayName: az network front-door rules-engine rule
-            - name: create
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_create
-              displayName: az network front-door rules-engine rule create
-            - name: delete
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_delete
-              displayName: az network front-door rules-engine rule delete
-            - name: list
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_list
-              displayName: az network front-door rules-engine rule list
-            - name: show
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_show
-              displayName: az network front-door rules-engine rule show
-            - name: update
-              uid: ext_front-door_az_network_front_door_rules_engine_rule_update
-              displayName: az network front-door rules-engine rule update
-            - name: action
-              displayName: az network front-door rules-engine rule action
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action
-                displayName: az network front-door rules-engine rule action
-              - name: add
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_add
-                displayName: az network front-door rules-engine rule action add
-              - name: list
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_list
-                displayName: az network front-door rules-engine rule action list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_action_remove
-                displayName: az network front-door rules-engine rule action remove
-            - name: condition
-              displayName: az network front-door rules-engine rule condition
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition
-                displayName: az network front-door rules-engine rule condition
-              - name: add
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_add
-                displayName: az network front-door rules-engine rule condition add
-              - name: list
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_list
-                displayName: az network front-door rules-engine rule condition list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_rules_engine_rule_condition_remove
-                displayName: az network front-door rules-engine rule condition remove
-        - name: waf-policy
-          displayName: az network front-door waf-policy
-          items:
-          - name: Overview
-            uid: ext_front-door_az_network_front_door_waf_policy
-            displayName: az network front-door waf-policy
-          - name: create
-            uid: ext_front-door_az_network_front_door_waf_policy_create
-            displayName: az network front-door waf-policy create
-          - name: delete
-            uid: ext_front-door_az_network_front_door_waf_policy_delete
-            displayName: az network front-door waf-policy delete
-          - name: list
-            uid: ext_front-door_az_network_front_door_waf_policy_list
-            displayName: az network front-door waf-policy list
-          - name: show
-            uid: ext_front-door_az_network_front_door_waf_policy_show
-            displayName: az network front-door waf-policy show
-          - name: update
-            uid: ext_front-door_az_network_front_door_waf_policy_update
-            displayName: az network front-door waf-policy update
-          - name: managed-rule-definition
-            displayName: az network front-door waf-policy managed-rule-definition
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition
-              displayName: az network front-door waf-policy managed-rule-definition
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rule_definition_list
-              displayName: az network front-door waf-policy managed-rule-definition list
-          - name: managed-rules
-            displayName: az network front-door waf-policy managed-rules
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules
-              displayName: az network front-door waf-policy managed-rules
-            - name: add
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_add
-              displayName: az network front-door waf-policy managed-rules add
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_list
-              displayName: az network front-door waf-policy managed-rules list
-            - name: remove
-              uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_remove
-              displayName: az network front-door waf-policy managed-rules remove
-            - name: exclusion
-              displayName: az network front-door waf-policy managed-rules exclusion
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion
-                displayName: az network front-door waf-policy managed-rules exclusion
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_add
-                displayName: az network front-door waf-policy managed-rules exclusion add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_list
-                displayName: az network front-door waf-policy managed-rules exclusion list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_exclusion_remove
-                displayName: az network front-door waf-policy managed-rules exclusion remove
-            - name: override
-              displayName: az network front-door waf-policy managed-rules override
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override
-                displayName: az network front-door waf-policy managed-rules override
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_add
-                displayName: az network front-door waf-policy managed-rules override add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_list
-                displayName: az network front-door waf-policy managed-rules override list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_managed_rules_override_remove
-                displayName: az network front-door waf-policy managed-rules override remove
-          - name: rule
-            displayName: az network front-door waf-policy rule
-            items:
-            - name: Overview
-              uid: ext_front-door_az_network_front_door_waf_policy_rule
-              displayName: az network front-door waf-policy rule
-            - name: create
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_create
-              displayName: az network front-door waf-policy rule create
-            - name: delete
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_delete
-              displayName: az network front-door waf-policy rule delete
-            - name: list
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_list
-              displayName: az network front-door waf-policy rule list
-            - name: show
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_show
-              displayName: az network front-door waf-policy rule show
-            - name: update
-              uid: ext_front-door_az_network_front_door_waf_policy_rule_update
-              displayName: az network front-door waf-policy rule update
-            - name: match-condition
-              displayName: az network front-door waf-policy rule match-condition
-              items:
-              - name: Overview
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition
-                displayName: az network front-door waf-policy rule match-condition
-              - name: add
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_add
-                displayName: az network front-door waf-policy rule match-condition add
-              - name: list
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_list
-                displayName: az network front-door waf-policy rule match-condition list
-              - name: remove
-                uid: ext_front-door_az_network_front_door_waf_policy_rule_match_condition_remove
-                displayName: az network front-door waf-policy rule match-condition remove
-  - name: hack
-    items:
-    - name: Overview
-      uid: ext_hack_az
-    - name: hack
-      displayName: az hack
-      items:
-      - name: Overview
-        uid: ext_hack_az_hack
-        displayName: az hack
-      - name: create
-        uid: ext_hack_az_hack_create
-        displayName: az hack create
-      - name: show
-        uid: ext_hack_az_hack_show
-        displayName: az hack show
-  - name: hardware-security-modules
-    items:
-    - name: Overview
-      uid: ext_hardware-security-modules_az
-    - name: dedicated-hsm
-      displayName: az dedicated-hsm
-      items:
-      - name: Overview
-        uid: ext_hardware-security-modules_az_dedicated_hsm
-        displayName: az dedicated-hsm
-      - name: create
-        uid: ext_hardware-security-modules_az_dedicated_hsm_create
-        displayName: az dedicated-hsm create
-      - name: delete
-        uid: ext_hardware-security-modules_az_dedicated_hsm_delete
-        displayName: az dedicated-hsm delete
-      - name: list
-        uid: ext_hardware-security-modules_az_dedicated_hsm_list
-        displayName: az dedicated-hsm list
-      - name: show
-        uid: ext_hardware-security-modules_az_dedicated_hsm_show
-        displayName: az dedicated-hsm show
-      - name: update
-        uid: ext_hardware-security-modules_az_dedicated_hsm_update
-        displayName: az dedicated-hsm update
-      - name: wait
-        uid: ext_hardware-security-modules_az_dedicated_hsm_wait
-        displayName: az dedicated-hsm wait
-  - name: healthcareapis
-    items:
-    - name: Overview
-      uid: ext_healthcareapis_az
-    - name: healthcareapis
-      displayName: az healthcareapis
-      items:
-      - name: Overview
-        uid: ext_healthcareapis_az_healthcareapis
-        displayName: az healthcareapis
-      - name: operation-result
-        displayName: az healthcareapis operation-result
+          uid: az_ml(v1)_computetarget_update
+          displayName: az ml computetarget update
+          items: []
+      - name: dataset
+        uid: az_ml(v1)_dataset
+        displayName: az ml dataset
+        items: []
+      - name: datastore
+        uid: az_ml(v1)_datastore
+        displayName: az ml datastore
+        items: []
+      - name: endpoint
         items:
-        - name: Overview
-          uid: ext_healthcareapis_az_healthcareapis_operation_result
-          displayName: az healthcareapis operation-result
-        - name: show
-          uid: ext_healthcareapis_az_healthcareapis_operation_result_show
-          displayName: az healthcareapis operation-result show
+        - name: Summary
+          uid: az_ml(v1)_endpoint
+          displayName: az ml endpoint
+        - name: realtime
+          uid: az_ml(v1)_endpoint_realtime
+          displayName: az ml endpoint realtime
+          items: []
+      - name: environment
+        uid: az_ml(v1)_environment
+        displayName: az ml environment
+        items: []
+      - name: experiment
+        uid: az_ml(v1)_experiment
+        displayName: az ml experiment
+        items: []
+      - name: folder
+        uid: az_ml(v1)_folder
+        displayName: az ml folder
+        items: []
+      - name: model
+        uid: az_ml(v1)_model
+        displayName: az ml model
+        items: []
+      - name: pipeline
+        uid: az_ml(v1)_pipeline
+        displayName: az ml pipeline
+        items: []
+      - name: run
+        uid: az_ml(v1)_run
+        displayName: az ml run
+        items: []
       - name: service
-        displayName: az healthcareapis service
+        uid: az_ml(v1)_service
+        displayName: az ml service
+        items: []
+      - name: workspace
         items:
-        - name: Overview
-          uid: ext_healthcareapis_az_healthcareapis_service
-          displayName: az healthcareapis service
-        - name: create
-          uid: ext_healthcareapis_az_healthcareapis_service_create
-          displayName: az healthcareapis service create
-        - name: delete
-          uid: ext_healthcareapis_az_healthcareapis_service_delete
-          displayName: az healthcareapis service delete
-        - name: list
-          uid: ext_healthcareapis_az_healthcareapis_service_list
-          displayName: az healthcareapis service list
-        - name: show
-          uid: ext_healthcareapis_az_healthcareapis_service_show
-          displayName: az healthcareapis service show
-        - name: update
-          uid: ext_healthcareapis_az_healthcareapis_service_update
-          displayName: az healthcareapis service update
-  - name: hpc-cache
+        - name: Summary
+          uid: az_ml(v1)_workspace
+          displayName: az ml workspace
+        - name: private-endpoint
+          uid: az_ml(v1)_workspace_private-endpoint
+          displayName: az ml workspace private-endpoint
+          items: []
+  - name: Azure Managed Applications
     items:
-    - name: Overview
-      uid: ext_hpc-cache_az
-    - name: hpc-cache
-      displayName: az hpc-cache
-      items:
-      - name: Overview
-        uid: ext_hpc-cache_az_hpc_cache
-        displayName: az hpc-cache
-      - name: create
-        uid: ext_hpc-cache_az_hpc_cache_create
-        displayName: az hpc-cache create
-      - name: delete
-        uid: ext_hpc-cache_az_hpc_cache_delete
-        displayName: az hpc-cache delete
-      - name: flush
-        uid: ext_hpc-cache_az_hpc_cache_flush
-        displayName: az hpc-cache flush
-      - name: list
-        uid: ext_hpc-cache_az_hpc_cache_list
-        displayName: az hpc-cache list
-      - name: show
-        uid: ext_hpc-cache_az_hpc_cache_show
-        displayName: az hpc-cache show
-      - name: start
-        uid: ext_hpc-cache_az_hpc_cache_start
-        displayName: az hpc-cache start
-      - name: stop
-        uid: ext_hpc-cache_az_hpc_cache_stop
-        displayName: az hpc-cache stop
-      - name: update
-        uid: ext_hpc-cache_az_hpc_cache_update
-        displayName: az hpc-cache update
-      - name: upgrade-firmware
-        uid: ext_hpc-cache_az_hpc_cache_upgrade_firmware
-        displayName: az hpc-cache upgrade-firmware
-      - name: wait
-        uid: ext_hpc-cache_az_hpc_cache_wait
-        displayName: az hpc-cache wait
-      - name: blob-storage-target
-        displayName: az hpc-cache blob-storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target
-          displayName: az hpc-cache blob-storage-target
-        - name: add
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_add
-          displayName: az hpc-cache blob-storage-target add
-        - name: update
-          uid: ext_hpc-cache_az_hpc_cache_blob_storage_target_update
-          displayName: az hpc-cache blob-storage-target update
-      - name: nfs-storage-target
-        displayName: az hpc-cache nfs-storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target
-          displayName: az hpc-cache nfs-storage-target
-        - name: add
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_add
-          displayName: az hpc-cache nfs-storage-target add
-        - name: update
-          uid: ext_hpc-cache_az_hpc_cache_nfs_storage_target_update
-          displayName: az hpc-cache nfs-storage-target update
-      - name: skus
-        displayName: az hpc-cache skus
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_skus
-          displayName: az hpc-cache skus
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_skus_list
-          displayName: az hpc-cache skus list
-      - name: storage-target
-        displayName: az hpc-cache storage-target
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_storage_target
-          displayName: az hpc-cache storage-target
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_list
-          displayName: az hpc-cache storage-target list
-        - name: remove
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_remove
-          displayName: az hpc-cache storage-target remove
-        - name: show
-          uid: ext_hpc-cache_az_hpc_cache_storage_target_show
-          displayName: az hpc-cache storage-target show
-      - name: usage-model
-        displayName: az hpc-cache usage-model
-        items:
-        - name: Overview
-          uid: ext_hpc-cache_az_hpc_cache_usage_model
-          displayName: az hpc-cache usage-model
-        - name: list
-          uid: ext_hpc-cache_az_hpc_cache_usage_model_list
-          displayName: az hpc-cache usage-model list
-  - name: image-copy-extension
+    - name: Summary
+      uid: sp-Azure_Managed_Applications
+      displayName: Azure Managed Applications
+    - name: managedapp
+      items:
+      - name: Summary
+        uid: az_managedapp
+        displayName: az managedapp
+      - name: definition
+        uid: az_managedapp_definition
+        displayName: az managedapp definition
+        items: []
+  - name: Azure Managed Services
+    uid: sp-Azure_Managed_Services
+    displayName: Azure Managed Services
+    items: []
+  - name: Azure Maps
+    uid: sp-Azure_Maps
+    displayName: Azure Maps
+    items: []
+  - name: Azure Marketplace Ordering
     items:
-    - name: Overview
-      uid: ext_image-copy-extension_az
-    - name: VM Images
-      displayName: az image
-      items:
-      - name: Overview
-        uid: ext_image-copy-extension_az_image
-        displayName: az image
-      - name: copy
-        uid: ext_image-copy-extension_az_image_copy
-        displayName: az image copy
-  - name: import-export
+    - name: Summary
+      uid: sp-Azure_Marketplace_Ordering
+      displayName: Azure Marketplace Ordering
+    - name: term
+      uid: az_term
+      displayName: az term
+      items: []
+  - name: Azure Media Services
+    uid: sp-Azure_Media_Services
+    displayName: Azure Media Services
+    items: []
+  - name: Azure Migrate
     items:
-    - name: Overview
-      uid: ext_import-export_az
-    - name: import-export
-      displayName: az import-export
-      items:
-      - name: Overview
-        uid: ext_import-export_az_import_export
-        displayName: az import-export
-      - name: create
-        uid: ext_import-export_az_import_export_create
-        displayName: az import-export create
-      - name: delete
-        uid: ext_import-export_az_import_export_delete
-        displayName: az import-export delete
-      - name: list
-        uid: ext_import-export_az_import_export_list
-        displayName: az import-export list
-      - name: show
-        uid: ext_import-export_az_import_export_show
-        displayName: az import-export show
-      - name: update
-        uid: ext_import-export_az_import_export_update
-        displayName: az import-export update
-      - name: bit-locker-key
-        displayName: az import-export bit-locker-key
-        items:
-        - name: Overview
-          uid: ext_import-export_az_import_export_bit_locker_key
-          displayName: az import-export bit-locker-key
-        - name: list
-          uid: ext_import-export_az_import_export_bit_locker_key_list
-          displayName: az import-export bit-locker-key list
-      - name: location
-        displayName: az import-export location
-        items:
-        - name: Overview
-          uid: ext_import-export_az_import_export_location
-          displayName: az import-export location
-        - name: list
-          uid: ext_import-export_az_import_export_location_list
-          displayName: az import-export location list
-        - name: show
-          uid: ext_import-export_az_import_export_location_show
-          displayName: az import-export location show
-  - name: interactive
-    uid: ext_interactive_az
-  - name: internet-analyzer
+    - name: Summary
+      uid: sp-Azure_Migrate
+      displayName: Azure Migrate
+    - name: offazure
+      items:
+      - name: Summary
+        uid: az_offazure
+        displayName: az offazure
+      - name: hyperv
+        items:
+        - name: Summary
+          uid: az_offazure_hyperv
+          displayName: az offazure hyperv
+        - name: cluster
+          uid: az_offazure_hyperv_cluster
+          displayName: az offazure hyperv cluster
+          items: []
+        - name: host
+          uid: az_offazure_hyperv_host
+          displayName: az offazure hyperv host
+          items: []
+        - name: machine
+          uid: az_offazure_hyperv_machine
+          displayName: az offazure hyperv machine
+          items: []
+        - name: run-as-account
+          uid: az_offazure_hyperv_run-as-account
+          displayName: az offazure hyperv run-as-account
+          items: []
+        - name: site
+          uid: az_offazure_hyperv_site
+          displayName: az offazure hyperv site
+          items: []
+      - name: vmware
+        items:
+        - name: Summary
+          uid: az_offazure_vmware
+          displayName: az offazure vmware
+        - name: machine
+          uid: az_offazure_vmware_machine
+          displayName: az offazure vmware machine
+          items: []
+        - name: run-as-account
+          uid: az_offazure_vmware_run-as-account
+          displayName: az offazure vmware run-as-account
+          items: []
+        - name: site
+          uid: az_offazure_vmware_site
+          displayName: az offazure vmware site
+          items: []
+        - name: vcenter
+          uid: az_offazure_vmware_vcenter
+          displayName: az offazure vmware vcenter
+          items: []
+  - name: Azure Monitor
     items:
-    - name: Overview
-      uid: ext_internet-analyzer_az
-    - name: internet-analyzer
-      displayName: az internet-analyzer
-      items:
-      - name: Overview
-        uid: ext_internet-analyzer_az_internet_analyzer
-        displayName: az internet-analyzer
-      - name: show-scorecard
-        uid: ext_internet-analyzer_az_internet_analyzer_show_scorecard
-        displayName: az internet-analyzer show-scorecard
-      - name: show-timeseries
-        uid: ext_internet-analyzer_az_internet_analyzer_show_timeseries
-        displayName: az internet-analyzer show-timeseries
-      - name: preconfigured-endpoint
-        displayName: az internet-analyzer preconfigured-endpoint
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint
-          displayName: az internet-analyzer preconfigured-endpoint
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_preconfigured_endpoint_list
-          displayName: az internet-analyzer preconfigured-endpoint list
+    - name: Summary
+      uid: sp-Azure_Monitor
+      displayName: Azure Monitor
+    - name: footprint
+      items:
+      - name: Summary
+        uid: az_footprint
+        displayName: az footprint
+      - name: experiment
+        uid: az_footprint_experiment
+        displayName: az footprint experiment
+        items: []
+      - name: measurement-endpoint
+        uid: az_footprint_measurement-endpoint
+        displayName: az footprint measurement-endpoint
+        items: []
+      - name: measurement-endpoint-condition
+        uid: az_footprint_measurement-endpoint-condition
+        displayName: az footprint measurement-endpoint-condition
+        items: []
       - name: profile
-        displayName: az internet-analyzer profile
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_profile
-          displayName: az internet-analyzer profile
-        - name: create
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_create
-          displayName: az internet-analyzer profile create
-        - name: delete
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_delete
-          displayName: az internet-analyzer profile delete
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_list
-          displayName: az internet-analyzer profile list
-        - name: show
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_show
-          displayName: az internet-analyzer profile show
-        - name: update
-          uid: ext_internet-analyzer_az_internet_analyzer_profile_update
-          displayName: az internet-analyzer profile update
-      - name: test
-        displayName: az internet-analyzer test
-        items:
-        - name: Overview
-          uid: ext_internet-analyzer_az_internet_analyzer_test
-          displayName: az internet-analyzer test
-        - name: create
-          uid: ext_internet-analyzer_az_internet_analyzer_test_create
-          displayName: az internet-analyzer test create
-        - name: delete
-          uid: ext_internet-analyzer_az_internet_analyzer_test_delete
-          displayName: az internet-analyzer test delete
-        - name: list
-          uid: ext_internet-analyzer_az_internet_analyzer_test_list
-          displayName: az internet-analyzer test list
-        - name: show
-          uid: ext_internet-analyzer_az_internet_analyzer_test_show
-          displayName: az internet-analyzer test show
-        - name: update
-          uid: ext_internet-analyzer_az_internet_analyzer_test_update
-          displayName: az internet-analyzer test update
-  - name: ip-group
-    items:
-    - name: Overview
-      uid: ext_ip-group_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_ip-group_az_network
-        displayName: az network
-      - name: ip-group
-        displayName: az network ip-group
-        items:
-        - name: Overview
-          uid: ext_ip-group_az_network_ip_group
-          displayName: az network ip-group
-        - name: create
-          uid: ext_ip-group_az_network_ip_group_create
-          displayName: az network ip-group create
-        - name: delete
-          uid: ext_ip-group_az_network_ip_group_delete
-          displayName: az network ip-group delete
-        - name: list
-          uid: ext_ip-group_az_network_ip_group_list
-          displayName: az network ip-group list
-        - name: show
-          uid: ext_ip-group_az_network_ip_group_show
-          displayName: az network ip-group show
-        - name: update
-          uid: ext_ip-group_az_network_ip_group_update
-          displayName: az network ip-group update
-  - name: k8sconfiguration
-    items:
-    - name: Overview
-      uid: ext_k8sconfiguration_az
-    - name: k8sconfiguration
-      displayName: az k8sconfiguration
-      items:
-      - name: Overview
-        uid: ext_k8sconfiguration_az_k8sconfiguration
-        displayName: az k8sconfiguration
-      - name: create
-        uid: ext_k8sconfiguration_az_k8sconfiguration_create
-        displayName: az k8sconfiguration create
-      - name: delete
-        uid: ext_k8sconfiguration_az_k8sconfiguration_delete
-        displayName: az k8sconfiguration delete
-      - name: list
-        uid: ext_k8sconfiguration_az_k8sconfiguration_list
-        displayName: az k8sconfiguration list
-      - name: show
-        uid: ext_k8sconfiguration_az_k8sconfiguration_show
-        displayName: az k8sconfiguration show
-      - name: update
-        uid: ext_k8sconfiguration_az_k8sconfiguration_update
-        displayName: az k8sconfiguration update
-  - name: keyvault-preview
-    items:
-    - name: Overview
-      uid: ext_keyvault-preview_az
-    - name: Key Vault
-      displayName: az keyvault
-      items:
-      - name: Overview
-        uid: ext_keyvault-preview_az_keyvault
-        displayName: az keyvault
-      - name: create
-        uid: ext_keyvault-preview_az_keyvault_create
-        displayName: az keyvault create
-      - name: delete
-        uid: ext_keyvault-preview_az_keyvault_delete
-        displayName: az keyvault delete
-      - name: delete-policy
-        uid: ext_keyvault-preview_az_keyvault_delete_policy
-        displayName: az keyvault delete-policy
-      - name: list
-        uid: ext_keyvault-preview_az_keyvault_list
-        displayName: az keyvault list
-      - name: list-deleted
-        uid: ext_keyvault-preview_az_keyvault_list_deleted
-        displayName: az keyvault list-deleted
-      - name: purge
-        uid: ext_keyvault-preview_az_keyvault_purge
-        displayName: az keyvault purge
-      - name: recover
-        uid: ext_keyvault-preview_az_keyvault_recover
-        displayName: az keyvault recover
-      - name: set-policy
-        uid: ext_keyvault-preview_az_keyvault_set_policy
-        displayName: az keyvault set-policy
-      - name: show
-        uid: ext_keyvault-preview_az_keyvault_show
-        displayName: az keyvault show
-      - name: update
-        uid: ext_keyvault-preview_az_keyvault_update
-        displayName: az keyvault update
-      - name: Certificates
-        displayName: az keyvault certificate
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_certificate
-          displayName: az keyvault certificate
-        - name: create
-          uid: ext_keyvault-preview_az_keyvault_certificate_create
-          displayName: az keyvault certificate create
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_certificate_delete
-          displayName: az keyvault certificate delete
-        - name: download
-          uid: ext_keyvault-preview_az_keyvault_certificate_download
-          displayName: az keyvault certificate download
-        - name: get-default-policy
-          uid: ext_keyvault-preview_az_keyvault_certificate_get_default_policy
-          displayName: az keyvault certificate get-default-policy
-        - name: import
-          uid: ext_keyvault-preview_az_keyvault_certificate_import
-          displayName: az keyvault certificate import
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_certificate_list
-          displayName: az keyvault certificate list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_certificate_list_deleted
-          displayName: az keyvault certificate list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_certificate_list_versions
-          displayName: az keyvault certificate list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_certificate_purge
-          displayName: az keyvault certificate purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_certificate_recover
-          displayName: az keyvault certificate recover
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_certificate_set_attributes
-          displayName: az keyvault certificate set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_certificate_show
-          displayName: az keyvault certificate show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_certificate_show_deleted
-          displayName: az keyvault certificate show-deleted
-        - name: Contacts
-          displayName: az keyvault certificate contact
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact
-            displayName: az keyvault certificate contact
-          - name: add
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_add
-            displayName: az keyvault certificate contact add
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_delete
-            displayName: az keyvault certificate contact delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_certificate_contact_list
-            displayName: az keyvault certificate contact list
-        - name: Issuers
-          displayName: az keyvault certificate issuer
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer
-            displayName: az keyvault certificate issuer
-          - name: create
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_create
-            displayName: az keyvault certificate issuer create
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_delete
-            displayName: az keyvault certificate issuer delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_list
-            displayName: az keyvault certificate issuer list
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_show
-            displayName: az keyvault certificate issuer show
-          - name: update
-            uid: ext_keyvault-preview_az_keyvault_certificate_issuer_update
-            displayName: az keyvault certificate issuer update
-          - name: Administration
-            displayName: az keyvault certificate issuer admin
-            items:
-            - name: Overview
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin
-              displayName: az keyvault certificate issuer admin
-            - name: add
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_add
-              displayName: az keyvault certificate issuer admin add
-            - name: delete
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_delete
-              displayName: az keyvault certificate issuer admin delete
-            - name: list
-              uid: ext_keyvault-preview_az_keyvault_certificate_issuer_admin_list
-              displayName: az keyvault certificate issuer admin list
-        - name: Pending
-          displayName: az keyvault certificate pending
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending
-            displayName: az keyvault certificate pending
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_delete
-            displayName: az keyvault certificate pending delete
-          - name: merge
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_merge
-            displayName: az keyvault certificate pending merge
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_certificate_pending_show
-            displayName: az keyvault certificate pending show
-      - name: Keys
-        displayName: az keyvault key
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_key
-          displayName: az keyvault key
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_key_backup
-          displayName: az keyvault key backup
-        - name: create
-          uid: ext_keyvault-preview_az_keyvault_key_create
-          displayName: az keyvault key create
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_key_delete
-          displayName: az keyvault key delete
-        - name: import
-          uid: ext_keyvault-preview_az_keyvault_key_import
-          displayName: az keyvault key import
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_key_list
-          displayName: az keyvault key list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_key_list_deleted
-          displayName: az keyvault key list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_key_list_versions
-          displayName: az keyvault key list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_key_purge
-          displayName: az keyvault key purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_key_recover
-          displayName: az keyvault key recover
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_key_restore
-          displayName: az keyvault key restore
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_key_set_attributes
-          displayName: az keyvault key set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_key_show
-          displayName: az keyvault key show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_key_show_deleted
-          displayName: az keyvault key show-deleted
-      - name: Secrets
-        displayName: az keyvault secret
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_secret
-          displayName: az keyvault secret
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_secret_backup
-          displayName: az keyvault secret backup
-        - name: delete
-          uid: ext_keyvault-preview_az_keyvault_secret_delete
-          displayName: az keyvault secret delete
-        - name: download
-          uid: ext_keyvault-preview_az_keyvault_secret_download
-          displayName: az keyvault secret download
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_secret_list
-          displayName: az keyvault secret list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_secret_list_deleted
-          displayName: az keyvault secret list-deleted
-        - name: list-versions
-          uid: ext_keyvault-preview_az_keyvault_secret_list_versions
-          displayName: az keyvault secret list-versions
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_secret_purge
-          displayName: az keyvault secret purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_secret_recover
-          displayName: az keyvault secret recover
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_secret_restore
-          displayName: az keyvault secret restore
-        - name: set
-          uid: ext_keyvault-preview_az_keyvault_secret_set
-          displayName: az keyvault secret set
-        - name: set-attributes
-          uid: ext_keyvault-preview_az_keyvault_secret_set_attributes
-          displayName: az keyvault secret set-attributes
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_secret_show
-          displayName: az keyvault secret show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_secret_show_deleted
-          displayName: az keyvault secret show-deleted
-      - name: network-rule
-        displayName: az keyvault network-rule
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_network_rule
-          displayName: az keyvault network-rule
-        - name: add
-          uid: ext_keyvault-preview_az_keyvault_network_rule_add
-          displayName: az keyvault network-rule add
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_network_rule_list
-          displayName: az keyvault network-rule list
-        - name: remove
-          uid: ext_keyvault-preview_az_keyvault_network_rule_remove
-          displayName: az keyvault network-rule remove
-      - name: storage
-        displayName: az keyvault storage
-        items:
-        - name: Overview
-          uid: ext_keyvault-preview_az_keyvault_storage
-          displayName: az keyvault storage
-        - name: add
-          uid: ext_keyvault-preview_az_keyvault_storage_add
-          displayName: az keyvault storage add
-        - name: backup
-          uid: ext_keyvault-preview_az_keyvault_storage_backup
-          displayName: az keyvault storage backup
-        - name: list
-          uid: ext_keyvault-preview_az_keyvault_storage_list
-          displayName: az keyvault storage list
-        - name: list-deleted
-          uid: ext_keyvault-preview_az_keyvault_storage_list_deleted
-          displayName: az keyvault storage list-deleted
-        - name: purge
-          uid: ext_keyvault-preview_az_keyvault_storage_purge
-          displayName: az keyvault storage purge
-        - name: recover
-          uid: ext_keyvault-preview_az_keyvault_storage_recover
-          displayName: az keyvault storage recover
-        - name: regenerate-key
-          uid: ext_keyvault-preview_az_keyvault_storage_regenerate_key
-          displayName: az keyvault storage regenerate-key
-        - name: remove
-          uid: ext_keyvault-preview_az_keyvault_storage_remove
-          displayName: az keyvault storage remove
-        - name: restore
-          uid: ext_keyvault-preview_az_keyvault_storage_restore
-          displayName: az keyvault storage restore
-        - name: show
-          uid: ext_keyvault-preview_az_keyvault_storage_show
-          displayName: az keyvault storage show
-        - name: show-deleted
-          uid: ext_keyvault-preview_az_keyvault_storage_show_deleted
-          displayName: az keyvault storage show-deleted
-        - name: update
-          uid: ext_keyvault-preview_az_keyvault_storage_update
-          displayName: az keyvault storage update
-        - name: sas-definition
-          displayName: az keyvault storage sas-definition
-          items:
-          - name: Overview
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition
-            displayName: az keyvault storage sas-definition
-          - name: create
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_create
-            displayName: az keyvault storage sas-definition create
-          - name: delete
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_delete
-            displayName: az keyvault storage sas-definition delete
-          - name: list
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list
-            displayName: az keyvault storage sas-definition list
-          - name: list-deleted
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_list_deleted
-            displayName: az keyvault storage sas-definition list-deleted
-          - name: recover
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_recover
-            displayName: az keyvault storage sas-definition recover
-          - name: show
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show
-            displayName: az keyvault storage sas-definition show
-          - name: show-deleted
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_show_deleted
-            displayName: az keyvault storage sas-definition show-deleted
-          - name: update
-            uid: ext_keyvault-preview_az_keyvault_storage_sas_definition_update
-            displayName: az keyvault storage sas-definition update
-  - name: kusto
-    items:
-    - name: Overview
-      uid: ext_kusto_az
-    - name: kusto
-      displayName: az kusto
-      items:
-      - name: Overview
-        uid: ext_kusto_az_kusto
-        displayName: az kusto
-      - name: attached-database-configuration
-        displayName: az kusto attached-database-configuration
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_attached_database_configuration
-          displayName: az kusto attached-database-configuration
-        - name: create
-          uid: ext_kusto_az_kusto_attached_database_configuration_create
-          displayName: az kusto attached-database-configuration create
-        - name: delete
-          uid: ext_kusto_az_kusto_attached_database_configuration_delete
-          displayName: az kusto attached-database-configuration delete
-        - name: list
-          uid: ext_kusto_az_kusto_attached_database_configuration_list
-          displayName: az kusto attached-database-configuration list
-        - name: show
-          uid: ext_kusto_az_kusto_attached_database_configuration_show
-          displayName: az kusto attached-database-configuration show
-        - name: update
-          uid: ext_kusto_az_kusto_attached_database_configuration_update
-          displayName: az kusto attached-database-configuration update
-        - name: wait
-          uid: ext_kusto_az_kusto_attached_database_configuration_wait
-          displayName: az kusto attached-database-configuration wait
-      - name: cluster
-        displayName: az kusto cluster
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_cluster
-          displayName: az kusto cluster
-        - name: add-language-extension
-          uid: ext_kusto_az_kusto_cluster_add_language_extension
-          displayName: az kusto cluster add-language-extension
-        - name: create
-          uid: ext_kusto_az_kusto_cluster_create
-          displayName: az kusto cluster create
-        - name: delete
-          uid: ext_kusto_az_kusto_cluster_delete
-          displayName: az kusto cluster delete
-        - name: detach-follower-database
-          uid: ext_kusto_az_kusto_cluster_detach_follower_database
-          displayName: az kusto cluster detach-follower-database
-        - name: diagnose-virtual-network
-          uid: ext_kusto_az_kusto_cluster_diagnose_virtual_network
-          displayName: az kusto cluster diagnose-virtual-network
-        - name: list
-          uid: ext_kusto_az_kusto_cluster_list
-          displayName: az kusto cluster list
-        - name: list-follower-database
-          uid: ext_kusto_az_kusto_cluster_list_follower_database
-          displayName: az kusto cluster list-follower-database
-        - name: list-language-extension
-          uid: ext_kusto_az_kusto_cluster_list_language_extension
-          displayName: az kusto cluster list-language-extension
-        - name: list-sku
-          uid: ext_kusto_az_kusto_cluster_list_sku
-          displayName: az kusto cluster list-sku
-        - name: remove-language-extension
-          uid: ext_kusto_az_kusto_cluster_remove_language_extension
-          displayName: az kusto cluster remove-language-extension
-        - name: show
-          uid: ext_kusto_az_kusto_cluster_show
-          displayName: az kusto cluster show
-        - name: start
-          uid: ext_kusto_az_kusto_cluster_start
-          displayName: az kusto cluster start
-        - name: stop
-          uid: ext_kusto_az_kusto_cluster_stop
-          displayName: az kusto cluster stop
-        - name: update
-          uid: ext_kusto_az_kusto_cluster_update
-          displayName: az kusto cluster update
-        - name: wait
-          uid: ext_kusto_az_kusto_cluster_wait
-          displayName: az kusto cluster wait
-      - name: cluster-principal-assignment
-        displayName: az kusto cluster-principal-assignment
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_cluster_principal_assignment
-          displayName: az kusto cluster-principal-assignment
-        - name: create
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_create
-          displayName: az kusto cluster-principal-assignment create
-        - name: delete
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_delete
-          displayName: az kusto cluster-principal-assignment delete
-        - name: list
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_list
-          displayName: az kusto cluster-principal-assignment list
-        - name: show
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_show
-          displayName: az kusto cluster-principal-assignment show
-        - name: update
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_update
-          displayName: az kusto cluster-principal-assignment update
-        - name: wait
-          uid: ext_kusto_az_kusto_cluster_principal_assignment_wait
-          displayName: az kusto cluster-principal-assignment wait
-      - name: data-connection
-        displayName: az kusto data-connection
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_data_connection
-          displayName: az kusto data-connection
-        - name: delete
-          uid: ext_kusto_az_kusto_data_connection_delete
-          displayName: az kusto data-connection delete
-        - name: list
-          uid: ext_kusto_az_kusto_data_connection_list
-          displayName: az kusto data-connection list
-        - name: show
-          uid: ext_kusto_az_kusto_data_connection_show
-          displayName: az kusto data-connection show
-        - name: wait
-          uid: ext_kusto_az_kusto_data_connection_wait
-          displayName: az kusto data-connection wait
-        - name: event-grid
-          displayName: az kusto data-connection event-grid
-          items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_event_grid
-            displayName: az kusto data-connection event-grid
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_event_grid_create
-            displayName: az kusto data-connection event-grid create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_event_grid_data_connection_validation
-            displayName: az kusto data-connection event-grid data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_event_grid_update
-            displayName: az kusto data-connection event-grid update
-        - name: event-hub
-          displayName: az kusto data-connection event-hub
-          items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_event_hub
-            displayName: az kusto data-connection event-hub
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_event_hub_create
-            displayName: az kusto data-connection event-hub create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_event_hub_data_connection_validation
-            displayName: az kusto data-connection event-hub data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_event_hub_update
-            displayName: az kusto data-connection event-hub update
-        - name: iot-hub
-          displayName: az kusto data-connection iot-hub
-          items:
-          - name: Overview
-            uid: ext_kusto_az_kusto_data_connection_iot_hub
-            displayName: az kusto data-connection iot-hub
-          - name: create
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_create
-            displayName: az kusto data-connection iot-hub create
-          - name: data-connection-validation
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_data_connection_validation
-            displayName: az kusto data-connection iot-hub data-connection-validation
-          - name: update
-            uid: ext_kusto_az_kusto_data_connection_iot_hub_update
-            displayName: az kusto data-connection iot-hub update
-      - name: database
-        displayName: az kusto database
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_database
-          displayName: az kusto database
-        - name: add-principal
-          uid: ext_kusto_az_kusto_database_add_principal
-          displayName: az kusto database add-principal
-        - name: create
-          uid: ext_kusto_az_kusto_database_create
-          displayName: az kusto database create
-        - name: delete
-          uid: ext_kusto_az_kusto_database_delete
-          displayName: az kusto database delete
-        - name: list
-          uid: ext_kusto_az_kusto_database_list
-          displayName: az kusto database list
-        - name: list-principal
-          uid: ext_kusto_az_kusto_database_list_principal
-          displayName: az kusto database list-principal
-        - name: remove-principal
-          uid: ext_kusto_az_kusto_database_remove_principal
-          displayName: az kusto database remove-principal
-        - name: show
-          uid: ext_kusto_az_kusto_database_show
-          displayName: az kusto database show
-        - name: update
-          uid: ext_kusto_az_kusto_database_update
-          displayName: az kusto database update
-        - name: wait
-          uid: ext_kusto_az_kusto_database_wait
-          displayName: az kusto database wait
-      - name: database-principal-assignment
-        displayName: az kusto database-principal-assignment
-        items:
-        - name: Overview
-          uid: ext_kusto_az_kusto_database_principal_assignment
-          displayName: az kusto database-principal-assignment
-        - name: create
-          uid: ext_kusto_az_kusto_database_principal_assignment_create
-          displayName: az kusto database-principal-assignment create
-        - name: delete
-          uid: ext_kusto_az_kusto_database_principal_assignment_delete
-          displayName: az kusto database-principal-assignment delete
-        - name: list
-          uid: ext_kusto_az_kusto_database_principal_assignment_list
-          displayName: az kusto database-principal-assignment list
-        - name: show
-          uid: ext_kusto_az_kusto_database_principal_assignment_show
-          displayName: az kusto database-principal-assignment show
-        - name: update
-          uid: ext_kusto_az_kusto_database_principal_assignment_update
-          displayName: az kusto database-principal-assignment update
-        - name: wait
-          uid: ext_kusto_az_kusto_database_principal_assignment_wait
-          displayName: az kusto database-principal-assignment wait
-  - name: log-analytics
-    items:
-    - name: Overview
-      uid: ext_log-analytics_az
-    - name: Monitoring
-      displayName: az monitor
+        uid: az_footprint_profile
+        displayName: az footprint profile
+        items: []
+    - name: monitor
       items:
-      - name: Overview
-        uid: ext_log-analytics_az_monitor
+      - name: Summary
+        uid: az_monitor
         displayName: az monitor
-      - name: log-analytics
-        displayName: az monitor log-analytics
+      - name: action-rule
+        uid: az_monitor_action-rule
+        displayName: az monitor action-rule
+        items: []
+      - name: app-insights
         items:
-        - name: Overview
-          uid: ext_log-analytics_az_monitor_log_analytics
-          displayName: az monitor log-analytics
-        - name: query
-          uid: ext_log-analytics_az_monitor_log_analytics_query
-          displayName: az monitor log-analytics query
-  - name: log-analytics-solution
-    items:
-    - name: Overview
-      uid: ext_log-analytics-solution_az
-    - name: Monitoring
-      displayName: az monitor
-      items:
-      - name: Overview
-        uid: ext_log-analytics-solution_az_monitor
-        displayName: az monitor
+        - name: Summary
+          uid: az_monitor_app-insights
+          displayName: az monitor app-insights
+        - name: api-key
+          uid: az_monitor_app-insights_api-key
+          displayName: az monitor app-insights api-key
+          items: []
+        - name: component
+          items:
+          - name: Summary
+            uid: az_monitor_app-insights_component
+            displayName: az monitor app-insights component
+          - name: billing
+            uid: az_monitor_app-insights_component_billing
+            displayName: az monitor app-insights component billing
+            items: []
+          - name: continues-export
+            uid: az_monitor_app-insights_component_continues-export
+            displayName: az monitor app-insights component continues-export
+            items: []
+          - name: linked-storage
+            uid: az_monitor_app-insights_component_linked-storage
+            displayName: az monitor app-insights component linked-storage
+            items: []
+        - name: events
+          uid: az_monitor_app-insights_events
+          displayName: az monitor app-insights events
+          items: []
+        - name: metrics
+          uid: az_monitor_app-insights_metrics
+          displayName: az monitor app-insights metrics
+          items: []
+      - name: data-collection
+        items:
+        - name: Summary
+          uid: az_monitor_data-collection
+          displayName: az monitor data-collection
+        - name: rule
+          items:
+          - name: Summary
+            uid: az_monitor_data-collection_rule
+            displayName: az monitor data-collection rule
+          - name: association
+            uid: az_monitor_data-collection_rule_association
+            displayName: az monitor data-collection rule association
+            items: []
+          - name: data-flow
+            uid: az_monitor_data-collection_rule_data-flow
+            displayName: az monitor data-collection rule data-flow
+            items: []
+          - name: log-analytics
+            uid: az_monitor_data-collection_rule_log-analytics
+            displayName: az monitor data-collection rule log-analytics
+            items: []
+          - name: performance-counter
+            uid: az_monitor_data-collection_rule_performance-counter
+            displayName: az monitor data-collection rule performance-counter
+            items: []
+          - name: syslog
+            uid: az_monitor_data-collection_rule_syslog
+            displayName: az monitor data-collection rule syslog
+            items: []
+          - name: windows-event-log
+            uid: az_monitor_data-collection_rule_windows-event-log
+            displayName: az monitor data-collection rule windows-event-log
+            items: []
       - name: log-analytics
-        displayName: az monitor log-analytics
         items:
-        - name: Overview
-          uid: ext_log-analytics-solution_az_monitor_log_analytics
+        - name: Summary
+          uid: az_monitor_log-analytics
           displayName: az monitor log-analytics
         - name: solution
+          uid: az_monitor_log-analytics_solution
           displayName: az monitor log-analytics solution
-          items:
-          - name: Overview
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution
-            displayName: az monitor log-analytics solution
-          - name: create
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_create
-            displayName: az monitor log-analytics solution create
-          - name: delete
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_delete
-            displayName: az monitor log-analytics solution delete
-          - name: list
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_list
-            displayName: az monitor log-analytics solution list
-          - name: show
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_show
-            displayName: az monitor log-analytics solution show
-          - name: update
-            uid: ext_log-analytics-solution_az_monitor_log_analytics_solution_update
-            displayName: az monitor log-analytics solution update
-  - name: logic
-    items:
-    - name: Overview
-      uid: ext_logic_az
-    - name: logic
-      displayName: az logic
-      items:
-      - name: Overview
-        uid: ext_logic_az_logic
-        displayName: az logic
-      - name: integration-account
-        displayName: az logic integration-account
-        items:
-        - name: Overview
-          uid: ext_logic_az_logic_integration_account
-          displayName: az logic integration-account
-        - name: create
-          uid: ext_logic_az_logic_integration_account_create
-          displayName: az logic integration-account create
-        - name: delete
-          uid: ext_logic_az_logic_integration_account_delete
-          displayName: az logic integration-account delete
-        - name: import
-          uid: ext_logic_az_logic_integration_account_import
-          displayName: az logic integration-account import
-        - name: list
-          uid: ext_logic_az_logic_integration_account_list
-          displayName: az logic integration-account list
-        - name: show
-          uid: ext_logic_az_logic_integration_account_show
-          displayName: az logic integration-account show
-        - name: update
-          uid: ext_logic_az_logic_integration_account_update
-          displayName: az logic integration-account update
-      - name: workflow
-        displayName: az logic workflow
-        items:
-        - name: Overview
-          uid: ext_logic_az_logic_workflow
-          displayName: az logic workflow
-        - name: create
-          uid: ext_logic_az_logic_workflow_create
-          displayName: az logic workflow create
-        - name: delete
-          uid: ext_logic_az_logic_workflow_delete
-          displayName: az logic workflow delete
-        - name: list
-          uid: ext_logic_az_logic_workflow_list
-          displayName: az logic workflow list
-        - name: show
-          uid: ext_logic_az_logic_workflow_show
-          displayName: az logic workflow show
-        - name: update
-          uid: ext_logic_az_logic_workflow_update
-          displayName: az logic workflow update
-  - name: maintenance
+          items: []
+      - name: scheduled-query
+        uid: az_monitor_scheduled-query
+        displayName: az monitor scheduled-query
+        items: []
+  - name: Azure NetApp Files
     items:
-    - name: Overview
-      uid: ext_maintenance_az
-    - name: maintenance
-      displayName: az maintenance
+    - name: Summary
+      uid: sp-Azure_NetApp_Files
+      displayName: Azure NetApp Files
+    - name: netappfiles
       items:
-      - name: Overview
-        uid: ext_maintenance_az_maintenance
-        displayName: az maintenance
-      - name: applyupdate
-        displayName: az maintenance applyupdate
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_applyupdate
-          displayName: az maintenance applyupdate
-        - name: create
-          uid: ext_maintenance_az_maintenance_applyupdate_create
-          displayName: az maintenance applyupdate create
-        - name: get
-          uid: ext_maintenance_az_maintenance_applyupdate_get
-          displayName: az maintenance applyupdate get
-        - name: show
-          uid: ext_maintenance_az_maintenance_applyupdate_show
-          displayName: az maintenance applyupdate show
-      - name: assignment
-        displayName: az maintenance assignment
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_assignment
-          displayName: az maintenance assignment
-        - name: create
-          uid: ext_maintenance_az_maintenance_assignment_create
-          displayName: az maintenance assignment create
-        - name: delete
-          uid: ext_maintenance_az_maintenance_assignment_delete
-          displayName: az maintenance assignment delete
-        - name: list
-          uid: ext_maintenance_az_maintenance_assignment_list
-          displayName: az maintenance assignment list
-      - name: configuration
-        displayName: az maintenance configuration
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_configuration
-          displayName: az maintenance configuration
-        - name: create
-          uid: ext_maintenance_az_maintenance_configuration_create
-          displayName: az maintenance configuration create
-        - name: delete
-          uid: ext_maintenance_az_maintenance_configuration_delete
-          displayName: az maintenance configuration delete
-        - name: list
-          uid: ext_maintenance_az_maintenance_configuration_list
-          displayName: az maintenance configuration list
-        - name: show
-          uid: ext_maintenance_az_maintenance_configuration_show
-          displayName: az maintenance configuration show
-        - name: update
-          uid: ext_maintenance_az_maintenance_configuration_update
-          displayName: az maintenance configuration update
-      - name: update
-        displayName: az maintenance update
-        items:
-        - name: Overview
-          uid: ext_maintenance_az_maintenance_update
-          displayName: az maintenance update
-        - name: list
-          uid: ext_maintenance_az_maintenance_update_list
-          displayName: az maintenance update list
-  - name: managementpartner
+      - name: Summary
+        uid: az_netappfiles
+        displayName: az netappfiles
+      - name: account
+        uid: az_netappfiles_account
+        displayName: az netappfiles account
+        items: []
+      - name: mount-target
+        uid: az_netappfiles_mount-target
+        displayName: az netappfiles mount-target
+        items: []
+      - name: pool
+        uid: az_netappfiles_pool
+        displayName: az netappfiles pool
+        items: []
+      - name: snapshot
+        uid: az_netappfiles_snapshot
+        displayName: az netappfiles snapshot
+        items: []
+      - name: volume
+        uid: az_netappfiles_volume
+        displayName: az netappfiles volume
+        items: []
+  - name: Azure Network
     items:
-    - name: Overview
-      uid: ext_managementpartner_az
-    - name: managementpartner
-      displayName: az managementpartner
+    - name: Summary
+      uid: sp-Azure_Network
+      displayName: Azure Network
+    - name: internet-analyzer
       items:
-      - name: Overview
-        uid: ext_managementpartner_az_managementpartner
-        displayName: az managementpartner
-      - name: create
-        uid: ext_managementpartner_az_managementpartner_create
-        displayName: az managementpartner create
-      - name: delete
-        uid: ext_managementpartner_az_managementpartner_delete
-        displayName: az managementpartner delete
-      - name: show
-        uid: ext_managementpartner_az_managementpartner_show
-        displayName: az managementpartner show
-      - name: update
-        uid: ext_managementpartner_az_managementpartner_update
-        displayName: az managementpartner update
-  - name: mesh
-    items:
-    - name: Overview
-      uid: ext_mesh_az
-    - name: mesh
-      displayName: az mesh
+      - name: Summary
+        uid: az_internet-analyzer
+        displayName: az internet-analyzer
+      - name: preconfigured-endpoint
+        uid: az_internet-analyzer_preconfigured-endpoint
+        displayName: az internet-analyzer preconfigured-endpoint
+        items: []
+      - name: profile
+        uid: az_internet-analyzer_profile
+        displayName: az internet-analyzer profile
+        items: []
+      - name: test
+        uid: az_internet-analyzer_test
+        displayName: az internet-analyzer test
+        items: []
+    - name: network
       items:
-      - name: Overview
-        uid: ext_mesh_az_mesh
-        displayName: az mesh
-      - name: app
-        displayName: az mesh app
+      - name: Summary
+        uid: az_network
+        displayName: az network
+      - name: application-gateway
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_app
-          displayName: az mesh app
-        - name: delete
-          uid: ext_mesh_az_mesh_app_delete
-          displayName: az mesh app delete
-        - name: list
-          uid: ext_mesh_az_mesh_app_list
-          displayName: az mesh app list
-        - name: show
-          uid: ext_mesh_az_mesh_app_show
-          displayName: az mesh app show
-      - name: code-package-log
-        displayName: az mesh code-package-log
+        - name: Summary
+          uid: az_network_application-gateway
+          displayName: az network application-gateway
+        - name: address-pool
+          uid: az_network_application-gateway_address-pool
+          displayName: az network application-gateway address-pool
+          items: []
+        - name: auth-cert
+          uid: az_network_application-gateway_auth-cert
+          displayName: az network application-gateway auth-cert
+          items: []
+        - name: frontend-ip
+          uid: az_network_application-gateway_frontend-ip
+          displayName: az network application-gateway frontend-ip
+          items: []
+        - name: frontend-port
+          uid: az_network_application-gateway_frontend-port
+          displayName: az network application-gateway frontend-port
+          items: []
+        - name: http-listener
+          uid: az_network_application-gateway_http-listener
+          displayName: az network application-gateway http-listener
+          items: []
+        - name: http-settings
+          uid: az_network_application-gateway_http-settings
+          displayName: az network application-gateway http-settings
+          items: []
+        - name: probe
+          uid: az_network_application-gateway_probe
+          displayName: az network application-gateway probe
+          items: []
+        - name: redirect-config
+          uid: az_network_application-gateway_redirect-config
+          displayName: az network application-gateway redirect-config
+          items: []
+        - name: rewrite-rule
+          items:
+          - name: Summary
+            uid: az_network_application-gateway_rewrite-rule
+            displayName: az network application-gateway rewrite-rule
+          - name: set
+            uid: az_network_application-gateway_rewrite-rule_set
+            displayName: az network application-gateway rewrite-rule set
+            items: []
+        - name: rule
+          uid: az_network_application-gateway_rule
+          displayName: az network application-gateway rule
+          items: []
+        - name: ssl-cert
+          uid: az_network_application-gateway_ssl-cert
+          displayName: az network application-gateway ssl-cert
+          items: []
+        - name: ssl-policy
+          items:
+          - name: Summary
+            uid: az_network_application-gateway_ssl-policy
+            displayName: az network application-gateway ssl-policy
+          - name: predefined
+            uid: az_network_application-gateway_ssl-policy_predefined
+            displayName: az network application-gateway ssl-policy predefined
+            items: []
+        - name: url-path-map
+          items:
+          - name: Summary
+            uid: az_network_application-gateway_url-path-map
+            displayName: az network application-gateway url-path-map
+          - name: rule
+            uid: az_network_application-gateway_url-path-map_rule
+            displayName: az network application-gateway url-path-map rule
+            items: []
+        - name: waf-config
+          uid: az_network_application-gateway_waf-config
+          displayName: az network application-gateway waf-config
+          items: []
+      - name: asg
+        uid: az_network_asg
+        displayName: az network asg
+        items: []
+      - name: bastion
+        uid: az_network_bastion
+        displayName: az network bastion
+        items: []
+      - name: cross-connection
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_code_package_log
-          displayName: az mesh code-package-log
-        - name: get
-          uid: ext_mesh_az_mesh_code_package_log_get
-          displayName: az mesh code-package-log get
-      - name: deployment
-        displayName: az mesh deployment
+        - name: Summary
+          uid: az_network_cross-connection
+          displayName: az network cross-connection
+        - name: peering
+          uid: az_network_cross-connection_peering
+          displayName: az network cross-connection peering
+          items: []
+      - name: cross-region-lb
+        items:
+        - name: Summary
+          uid: az_network_cross-region-lb
+          displayName: az network cross-region-lb
+        - name: address-pool
+          items:
+          - name: Summary
+            uid: az_network_cross-region-lb_address-pool
+            displayName: az network cross-region-lb address-pool
+          - name: address
+            uid: az_network_cross-region-lb_address-pool_address
+            displayName: az network cross-region-lb address-pool address
+            items: []
+        - name: frontend-ip
+          uid: az_network_cross-region-lb_frontend-ip
+          displayName: az network cross-region-lb frontend-ip
+          items: []
+        - name: probe
+          uid: az_network_cross-region-lb_probe
+          displayName: az network cross-region-lb probe
+          items: []
+        - name: rule
+          uid: az_network_cross-region-lb_rule
+          displayName: az network cross-region-lb rule
+          items: []
+      - name: dns
+        items:
+        - name: Summary
+          uid: az_network_dns
+          displayName: az network dns
+        - name: record-set
+          items:
+          - name: Summary
+            uid: az_network_dns_record-set
+            displayName: az network dns record-set
+          - name: a
+            uid: az_network_dns_record-set_a
+            displayName: az network dns record-set a
+            items: []
+          - name: aaaa
+            uid: az_network_dns_record-set_aaaa
+            displayName: az network dns record-set aaaa
+            items: []
+          - name: cname
+            uid: az_network_dns_record-set_cname
+            displayName: az network dns record-set cname
+            items: []
+          - name: mx
+            uid: az_network_dns_record-set_mx
+            displayName: az network dns record-set mx
+            items: []
+          - name: ns
+            uid: az_network_dns_record-set_ns
+            displayName: az network dns record-set ns
+            items: []
+          - name: network dns record-set ptr - pointer
+            uid: az_network_dns_record-set_ptr
+            displayName: az network dns record-set ptr
+            items: []
+          - name: soa
+            uid: az_network_dns_record-set_soa
+            displayName: az network dns record-set soa
+            items: []
+          - name: srv
+            uid: az_network_dns_record-set_srv
+            displayName: az network dns record-set srv
+            items: []
+          - name: txt
+            uid: az_network_dns_record-set_txt
+            displayName: az network dns record-set txt
+            items: []
+        - name: zone
+          uid: az_network_dns_zone
+          displayName: az network dns zone
+          items: []
+      - name: express-route
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_deployment
-          displayName: az mesh deployment
-        - name: create
-          uid: ext_mesh_az_mesh_deployment_create
-          displayName: az mesh deployment create
-      - name: gateway
-        displayName: az mesh gateway
+        - name: Summary
+          uid: az_network_express-route
+          displayName: az network express-route
+        - name: auth
+          uid: az_network_express-route_auth
+          displayName: az network express-route auth
+          items: []
+        - name: gateway
+          items:
+          - name: Summary
+            uid: az_network_express-route_gateway
+            displayName: az network express-route gateway
+          - name: connection
+            uid: az_network_express-route_gateway_connection
+            displayName: az network express-route gateway connection
+            items: []
+        - name: peering
+          items:
+          - name: Summary
+            uid: az_network_express-route_peering
+            displayName: az network express-route peering
+          - name: connection
+            uid: az_network_express-route_peering_connection
+            displayName: az network express-route peering connection
+            items: []
+        - name: port
+          uid: az_network_express-route_port
+          displayName: az network express-route port
+          items: []
+      - name: firewall
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_gateway
-          displayName: az mesh gateway
-        - name: delete
-          uid: ext_mesh_az_mesh_gateway_delete
-          displayName: az mesh gateway delete
-        - name: list
-          uid: ext_mesh_az_mesh_gateway_list
-          displayName: az mesh gateway list
-        - name: show
-          uid: ext_mesh_az_mesh_gateway_show
-          displayName: az mesh gateway show
-      - name: generate
-        displayName: az mesh generate
+        - name: Summary
+          uid: az_network_firewall
+          displayName: az network firewall
+        - name: application-rule
+          items:
+          - name: Summary
+            uid: az_network_firewall_application-rule
+            displayName: az network firewall application-rule
+          - name: collection
+            uid: az_network_firewall_application-rule_collection
+            displayName: az network firewall application-rule collection
+            items: []
+        - name: ip-config
+          uid: az_network_firewall_ip-config
+          displayName: az network firewall ip-config
+          items: []
+        - name: management-ip-config
+          uid: az_network_firewall_management-ip-config
+          displayName: az network firewall management-ip-config
+          items: []
+        - name: nat-rule
+          items:
+          - name: Summary
+            uid: az_network_firewall_nat-rule
+            displayName: az network firewall nat-rule
+          - name: collection
+            uid: az_network_firewall_nat-rule_collection
+            displayName: az network firewall nat-rule collection
+            items: []
+        - name: network-rule
+          items:
+          - name: Summary
+            uid: az_network_firewall_network-rule
+            displayName: az network firewall network-rule
+          - name: collection
+            uid: az_network_firewall_network-rule_collection
+            displayName: az network firewall network-rule collection
+            items: []
+        - name: policy
+          items:
+          - name: Summary
+            uid: az_network_firewall_policy
+            displayName: az network firewall policy
+          - name: intrusion-detection
+            uid: az_network_firewall_policy_intrusion-detection
+            displayName: az network firewall policy intrusion-detection
+            items: []
+          - name: rule-collection-group
+            items:
+            - name: Summary
+              uid: az_network_firewall_policy_rule-collection-group
+              displayName: az network firewall policy rule-collection-group
+            - name: collection
+              items:
+              - name: Summary
+                uid: az_network_firewall_policy_rule-collection-group_collection
+                displayName: az network firewall policy rule-collection-group collection
+              - name: rule
+                uid: az_network_firewall_policy_rule-collection-group_collection_rule
+                displayName: az network firewall policy rule-collection-group collection rule
+                items: []
+        - name: threat-intel-allowlist
+          uid: az_network_firewall_threat-intel-allowlist
+          displayName: az network firewall threat-intel-allowlist
+          items: []
+      - name: front-door
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_generate
-          displayName: az mesh generate
-        - name: armtemplate
-          uid: ext_mesh_az_mesh_generate_armtemplate
-          displayName: az mesh generate armtemplate
-      - name: network
-        displayName: az mesh network
+        - name: Summary
+          uid: az_network_front-door
+          displayName: az network front-door
+        - name: backend-pool
+          items:
+          - name: Summary
+            uid: az_network_front-door_backend-pool
+            displayName: az network front-door backend-pool
+          - name: backend
+            uid: az_network_front-door_backend-pool_backend
+            displayName: az network front-door backend-pool backend
+            items: []
+        - name: frontend-endpoint
+          uid: az_network_front-door_frontend-endpoint
+          displayName: az network front-door frontend-endpoint
+          items: []
+        - name: load-balancing
+          uid: az_network_front-door_load-balancing
+          displayName: az network front-door load-balancing
+          items: []
+        - name: probe
+          uid: az_network_front-door_probe
+          displayName: az network front-door probe
+          items: []
+        - name: routing-rule
+          uid: az_network_front-door_routing-rule
+          displayName: az network front-door routing-rule
+          items: []
+        - name: rules-engine
+          items:
+          - name: Summary
+            uid: az_network_front-door_rules-engine
+            displayName: az network front-door rules-engine
+          - name: rule
+            items:
+            - name: Summary
+              uid: az_network_front-door_rules-engine_rule
+              displayName: az network front-door rules-engine rule
+            - name: action
+              uid: az_network_front-door_rules-engine_rule_action
+              displayName: az network front-door rules-engine rule action
+              items: []
+            - name: condition
+              uid: az_network_front-door_rules-engine_rule_condition
+              displayName: az network front-door rules-engine rule condition
+              items: []
+        - name: waf-policy
+          items:
+          - name: Summary
+            uid: az_network_front-door_waf-policy
+            displayName: az network front-door waf-policy
+          - name: managed-rule-definition
+            uid: az_network_front-door_waf-policy_managed-rule-definition
+            displayName: az network front-door waf-policy managed-rule-definition
+            items: []
+          - name: managed-rules
+            items:
+            - name: Summary
+              uid: az_network_front-door_waf-policy_managed-rules
+              displayName: az network front-door waf-policy managed-rules
+            - name: exclusion
+              uid: az_network_front-door_waf-policy_managed-rules_exclusion
+              displayName: az network front-door waf-policy managed-rules exclusion
+              items: []
+            - name: override
+              uid: az_network_front-door_waf-policy_managed-rules_override
+              displayName: az network front-door waf-policy managed-rules override
+              items: []
+          - name: rule
+            items:
+            - name: Summary
+              uid: az_network_front-door_waf-policy_rule
+              displayName: az network front-door waf-policy rule
+            - name: match-condition
+              uid: az_network_front-door_waf-policy_rule_match-condition
+              displayName: az network front-door waf-policy rule match-condition
+              items: []
+      - name: ip-group
+        uid: az_network_ip-group
+        displayName: az network ip-group
+        items: []
+      - name: lb
+        items:
+        - name: Summary
+          uid: az_network_lb
+          displayName: az network lb
+        - name: address-pool
+          items:
+          - name: Summary
+            uid: az_network_lb_address-pool
+            displayName: az network lb address-pool
+          - name: address
+            uid: az_network_lb_address-pool_address
+            displayName: az network lb address-pool address
+            items: []
+        - name: frontend-ip
+          uid: az_network_lb_frontend-ip
+          displayName: az network lb frontend-ip
+          items: []
+        - name: inbound-nat-pool
+          uid: az_network_lb_inbound-nat-pool
+          displayName: az network lb inbound-nat-pool
+          items: []
+        - name: inbound-nat-rule
+          uid: az_network_lb_inbound-nat-rule
+          displayName: az network lb inbound-nat-rule
+          items: []
+        - name: probe
+          uid: az_network_lb_probe
+          displayName: az network lb probe
+          items: []
+        - name: rule
+          uid: az_network_lb_rule
+          displayName: az network lb rule
+          items: []
+      - name: local-gateway
+        uid: az_network_local-gateway
+        displayName: az network local-gateway
+        items: []
+      - name: nic
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_network
-          displayName: az mesh network
-        - name: delete
-          uid: ext_mesh_az_mesh_network_delete
-          displayName: az mesh network delete
-        - name: list
-          uid: ext_mesh_az_mesh_network_list
-          displayName: az mesh network list
-        - name: show
-          uid: ext_mesh_az_mesh_network_show
-          displayName: az mesh network show
-      - name: secret
-        displayName: az mesh secret
+        - name: Summary
+          uid: az_network_nic
+          displayName: az network nic
+        - name: ip-config
+          items:
+          - name: Summary
+            uid: az_network_nic_ip-config
+            displayName: az network nic ip-config
+          - name: address-pool
+            uid: az_network_nic_ip-config_address-pool
+            displayName: az network nic ip-config address-pool
+            items: []
+          - name: inbound-nat-rule
+            uid: az_network_nic_ip-config_inbound-nat-rule
+            displayName: az network nic ip-config inbound-nat-rule
+            items: []
+        - name: vtap-config
+          uid: az_network_nic_vtap-config
+          displayName: az network nic vtap-config
+          items: []
+      - name: nsg
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_secret
-          displayName: az mesh secret
-        - name: delete
-          uid: ext_mesh_az_mesh_secret_delete
-          displayName: az mesh secret delete
-        - name: list
-          uid: ext_mesh_az_mesh_secret_list
-          displayName: az mesh secret list
-        - name: show
-          uid: ext_mesh_az_mesh_secret_show
-          displayName: az mesh secret show
-      - name: secretvalue
-        displayName: az mesh secretvalue
+        - name: Summary
+          uid: az_network_nsg
+          displayName: az network nsg
+        - name: rule
+          uid: az_network_nsg_rule
+          displayName: az network nsg rule
+          items: []
+      - name: p2s-vpn-gateway
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_secretvalue
-          displayName: az mesh secretvalue
-        - name: delete
-          uid: ext_mesh_az_mesh_secretvalue_delete
-          displayName: az mesh secretvalue delete
-        - name: list
-          uid: ext_mesh_az_mesh_secretvalue_list
-          displayName: az mesh secretvalue list
-        - name: show
-          uid: ext_mesh_az_mesh_secretvalue_show
-          displayName: az mesh secretvalue show
-      - name: service
-        displayName: az mesh service
+        - name: Summary
+          uid: az_network_p2s-vpn-gateway
+          displayName: az network p2s-vpn-gateway
+        - name: connection
+          uid: az_network_p2s-vpn-gateway_connection
+          displayName: az network p2s-vpn-gateway connection
+          items: []
+        - name: vpn-client
+          uid: az_network_p2s-vpn-gateway_vpn-client
+          displayName: az network p2s-vpn-gateway vpn-client
+          items: []
+      - name: private-dns
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_service
-          displayName: az mesh service
-        - name: list
-          uid: ext_mesh_az_mesh_service_list
-          displayName: az mesh service list
-        - name: show
-          uid: ext_mesh_az_mesh_service_show
-          displayName: az mesh service show
-      - name: service-replica
-        displayName: az mesh service-replica
+        - name: Summary
+          uid: az_network_private-dns
+          displayName: az network private-dns
+        - name: link
+          items:
+          - name: Summary
+            uid: az_network_private-dns_link
+            displayName: az network private-dns link
+          - name: vnet
+            uid: az_network_private-dns_link_vnet
+            displayName: az network private-dns link vnet
+            items: []
+        - name: record-set
+          items:
+          - name: Summary
+            uid: az_network_private-dns_record-set
+            displayName: az network private-dns record-set
+          - name: a
+            uid: az_network_private-dns_record-set_a
+            displayName: az network private-dns record-set a
+            items: []
+          - name: aaaa
+            uid: az_network_private-dns_record-set_aaaa
+            displayName: az network private-dns record-set aaaa
+            items: []
+          - name: cname
+            uid: az_network_private-dns_record-set_cname
+            displayName: az network private-dns record-set cname
+            items: []
+          - name: mx
+            uid: az_network_private-dns_record-set_mx
+            displayName: az network private-dns record-set mx
+            items: []
+          - name: ptr
+            uid: az_network_private-dns_record-set_ptr
+            displayName: az network private-dns record-set ptr
+            items: []
+          - name: soa
+            uid: az_network_private-dns_record-set_soa
+            displayName: az network private-dns record-set soa
+            items: []
+          - name: srv
+            uid: az_network_private-dns_record-set_srv
+            displayName: az network private-dns record-set srv
+            items: []
+          - name: txt
+            uid: az_network_private-dns_record-set_txt
+            displayName: az network private-dns record-set txt
+            items: []
+        - name: zone
+          uid: az_network_private-dns_zone
+          displayName: az network private-dns zone
+          items: []
+      - name: private-endpoint
+        uid: az_network_private-endpoint
+        displayName: az network private-endpoint
+        items: []
+      - name: private-endpoint-connection
+        uid: az_network_private-endpoint-connection
+        displayName: az network private-endpoint-connection
+        items: []
+      - name: private-link-resource
+        uid: az_network_private-link-resource
+        displayName: az network private-link-resource
+        items: []
+      - name: private-link-service
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_service_replica
-          displayName: az mesh service-replica
-        - name: list
-          uid: ext_mesh_az_mesh_service_replica_list
-          displayName: az mesh service-replica list
-        - name: show
-          uid: ext_mesh_az_mesh_service_replica_show
-          displayName: az mesh service-replica show
-      - name: volume
-        displayName: az mesh volume
+        - name: Summary
+          uid: az_network_private-link-service
+          displayName: az network private-link-service
+        - name: connection
+          uid: az_network_private-link-service_connection
+          displayName: az network private-link-service connection
+          items: []
+      - name: profile
+        uid: az_network_profile
+        displayName: az network profile
+        items: []
+      - name: public-ip
         items:
-        - name: Overview
-          uid: ext_mesh_az_mesh_volume
-          displayName: az mesh volume
-        - name: create
-          uid: ext_mesh_az_mesh_volume_create
-          displayName: az mesh volume create
-        - name: delete
-          uid: ext_mesh_az_mesh_volume_delete
-          displayName: az mesh volume delete
-        - name: list
-          uid: ext_mesh_az_mesh_volume_list
-          displayName: az mesh volume list
-        - name: show
-          uid: ext_mesh_az_mesh_volume_show
-          displayName: az mesh volume show
-  - name: mixed-reality
-    items:
-    - name: Overview
-      uid: ext_mixed-reality_az
-    - name: spatial-anchors-account
-      displayName: az spatial-anchors-account
-      items:
-      - name: Overview
-        uid: ext_mixed-reality_az_spatial_anchors_account
-        displayName: az spatial-anchors-account
-      - name: create
-        uid: ext_mixed-reality_az_spatial_anchors_account_create
-        displayName: az spatial-anchors-account create
-      - name: delete
-        uid: ext_mixed-reality_az_spatial_anchors_account_delete
-        displayName: az spatial-anchors-account delete
-      - name: list
-        uid: ext_mixed-reality_az_spatial_anchors_account_list
-        displayName: az spatial-anchors-account list
-      - name: show
-        uid: ext_mixed-reality_az_spatial_anchors_account_show
-        displayName: az spatial-anchors-account show
-      - name: key
-        displayName: az spatial-anchors-account key
+        - name: Summary
+          uid: az_network_public-ip
+          displayName: az network public-ip
+        - name: prefix
+          uid: az_network_public-ip_prefix
+          displayName: az network public-ip prefix
+          items: []
+      - name: route-filter
+        items:
+        - name: Summary
+          uid: az_network_route-filter
+          displayName: az network route-filter
+        - name: rule
+          uid: az_network_route-filter_rule
+          displayName: az network route-filter rule
+          items: []
+      - name: route-table
         items:
-        - name: Overview
-          uid: ext_mixed-reality_az_spatial_anchors_account_key
-          displayName: az spatial-anchors-account key
-        - name: renew
-          uid: ext_mixed-reality_az_spatial_anchors_account_key_renew
-          displayName: az spatial-anchors-account key renew
-        - name: show
-          uid: ext_mixed-reality_az_spatial_anchors_account_key_show
-          displayName: az spatial-anchors-account key show
-  - name: netappfiles-preview
-    items:
-    - name: Overview
-      uid: ext_netappfiles-preview_az
-    - name: netappfiles
-      displayName: az netappfiles
-      items:
-      - name: Overview
-        uid: ext_netappfiles-preview_az_netappfiles
-        displayName: az netappfiles
-      - name: account
-        displayName: az netappfiles account
+        - name: Summary
+          uid: az_network_route-table
+          displayName: az network route-table
+        - name: route
+          uid: az_network_route-table_route
+          displayName: az network route-table route
+          items: []
+      - name: security-partner-provider
+        uid: az_network_security-partner-provider
+        displayName: az network security-partner-provider
+        items: []
+      - name: service-endpoint
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_account
-          displayName: az netappfiles account
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_account_create
-          displayName: az netappfiles account create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_account_delete
-          displayName: az netappfiles account delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_account_list
-          displayName: az netappfiles account list
-        - name: set
-          uid: ext_netappfiles-preview_az_netappfiles_account_set
-          displayName: az netappfiles account set
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_account_show
-          displayName: az netappfiles account show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_account_update
-          displayName: az netappfiles account update
-      - name: mount-target
-        displayName: az netappfiles mount-target
+        - name: Summary
+          uid: az_network_service-endpoint
+          displayName: az network service-endpoint
+        - name: policy
+          uid: az_network_service-endpoint_policy
+          displayName: az network service-endpoint policy
+          items: []
+        - name: policy-definition
+          uid: az_network_service-endpoint_policy-definition
+          displayName: az network service-endpoint policy-definition
+          items: []
+      - name: traffic-manager
+        items:
+        - name: Summary
+          uid: az_network_traffic-manager
+          displayName: az network traffic-manager
+        - name: endpoint
+          uid: az_network_traffic-manager_endpoint
+          displayName: az network traffic-manager endpoint
+          items: []
+        - name: profile
+          uid: az_network_traffic-manager_profile
+          displayName: az network traffic-manager profile
+          items: []
+      - name: vhub
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_mount_target
-          displayName: az netappfiles mount-target
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_mount_target_list
-          displayName: az netappfiles mount-target list
-      - name: pool
-        displayName: az netappfiles pool
+        - name: Summary
+          uid: az_network_vhub
+          displayName: az network vhub
+        - name: connection
+          uid: az_network_vhub_connection
+          displayName: az network vhub connection
+          items: []
+        - name: route
+          uid: az_network_vhub_route
+          displayName: az network vhub route
+          items: []
+        - name: route-table
+          items:
+          - name: Summary
+            uid: az_network_vhub_route-table
+            displayName: az network vhub route-table
+          - name: route
+            uid: az_network_vhub_route-table_route
+            displayName: az network vhub route-table route
+            items: []
+      - name: virtual-appliance
+        items:
+        - name: Summary
+          uid: az_network_virtual-appliance
+          displayName: az network virtual-appliance
+        - name: site
+          uid: az_network_virtual-appliance_site
+          displayName: az network virtual-appliance site
+          items: []
+      - name: vnet
+        items:
+        - name: Summary
+          uid: az_network_vnet
+          displayName: az network vnet
+        - name: peering
+          uid: az_network_vnet_peering
+          displayName: az network vnet peering
+          items: []
+        - name: subnet
+          uid: az_network_vnet_subnet
+          displayName: az network vnet subnet
+          items: []
+        - name: tap
+          uid: az_network_vnet_tap
+          displayName: az network vnet tap
+          items: []
+      - name: vnet-gateway
+        items:
+        - name: Summary
+          uid: az_network_vnet-gateway
+          displayName: az network vnet-gateway
+        - name: revoked-cert
+          uid: az_network_vnet-gateway_revoked-cert
+          displayName: az network vnet-gateway revoked-cert
+          items: []
+        - name: root-cert
+          uid: az_network_vnet-gateway_root-cert
+          displayName: az network vnet-gateway root-cert
+          items: []
+        - name: vpn-client
+          uid: az_network_vnet-gateway_vpn-client
+          displayName: az network vnet-gateway vpn-client
+          items: []
+      - name: vpn-connection
+        items:
+        - name: Summary
+          uid: az_network_vpn-connection
+          displayName: az network vpn-connection
+        - name: ipsec-policy
+          uid: az_network_vpn-connection_ipsec-policy
+          displayName: az network vpn-connection ipsec-policy
+          items: []
+        - name: shared-key
+          uid: az_network_vpn-connection_shared-key
+          displayName: az network vpn-connection shared-key
+          items: []
+      - name: vpn-gateway
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_pool
-          displayName: az netappfiles pool
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_pool_create
-          displayName: az netappfiles pool create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_pool_delete
-          displayName: az netappfiles pool delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_pool_list
-          displayName: az netappfiles pool list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_pool_show
-          displayName: az netappfiles pool show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_pool_update
-          displayName: az netappfiles pool update
-      - name: snapshot
-        displayName: az netappfiles snapshot
+        - name: Summary
+          uid: az_network_vpn-gateway
+          displayName: az network vpn-gateway
+        - name: connection
+          items:
+          - name: Summary
+            uid: az_network_vpn-gateway_connection
+            displayName: az network vpn-gateway connection
+          - name: ipsec-policy
+            uid: az_network_vpn-gateway_connection_ipsec-policy
+            displayName: az network vpn-gateway connection ipsec-policy
+            items: []
+      - name: vpn-server-config
+        items:
+        - name: Summary
+          uid: az_network_vpn-server-config
+          displayName: az network vpn-server-config
+        - name: ipsec-policy
+          uid: az_network_vpn-server-config_ipsec-policy
+          displayName: az network vpn-server-config ipsec-policy
+          items: []
+      - name: vpn-site
+        uid: az_network_vpn-site
+        displayName: az network vpn-site
+        items: []
+      - name: vrouter
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot
-          displayName: az netappfiles snapshot
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_create
-          displayName: az netappfiles snapshot create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_delete
-          displayName: az netappfiles snapshot delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_list
-          displayName: az netappfiles snapshot list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_snapshot_show
-          displayName: az netappfiles snapshot show
-      - name: volume
-        displayName: az netappfiles volume
+        - name: Summary
+          uid: az_network_vrouter
+          displayName: az network vrouter
+        - name: peering
+          uid: az_network_vrouter_peering
+          displayName: az network vrouter peering
+          items: []
+      - name: vwan
+        uid: az_network_vwan
+        displayName: az network vwan
+        items: []
+      - name: watcher
+        items:
+        - name: Summary
+          uid: az_network_watcher
+          displayName: az network watcher
+        - name: flow-log
+          uid: az_network_watcher_flow-log
+          displayName: az network watcher flow-log
+          items: []
+        - name: packet-capture
+          uid: az_network_watcher_packet-capture
+          displayName: az network watcher packet-capture
+          items: []
+        - name: troubleshooting
+          uid: az_network_watcher_troubleshooting
+          displayName: az network watcher troubleshooting
+          items: []
+    - name: peering
+      items:
+      - name: Summary
+        uid: az_peering
+        displayName: az peering
+      - name: asn
+        uid: az_peering_asn
+        displayName: az peering asn
+        items: []
+      - name: legacy
+        uid: az_peering_legacy
+        displayName: az peering legacy
+        items: []
+      - name: location
+        uid: az_peering_location
+        displayName: az peering location
+        items: []
+      - name: peering
+        uid: az_peering_peering
+        displayName: az peering peering
+        items: []
+      - name: received-route
+        uid: az_peering_received-route
+        displayName: az peering received-route
+        items: []
+      - name: registered-asn
+        uid: az_peering_registered-asn
+        displayName: az peering registered-asn
+        items: []
+      - name: registered-prefix
+        uid: az_peering_registered-prefix
+        displayName: az peering registered-prefix
+        items: []
+      - name: service
         items:
-        - name: Overview
-          uid: ext_netappfiles-preview_az_netappfiles_volume
-          displayName: az netappfiles volume
-        - name: create
-          uid: ext_netappfiles-preview_az_netappfiles_volume_create
-          displayName: az netappfiles volume create
-        - name: delete
-          uid: ext_netappfiles-preview_az_netappfiles_volume_delete
-          displayName: az netappfiles volume delete
-        - name: list
-          uid: ext_netappfiles-preview_az_netappfiles_volume_list
-          displayName: az netappfiles volume list
-        - name: show
-          uid: ext_netappfiles-preview_az_netappfiles_volume_show
-          displayName: az netappfiles volume show
-        - name: update
-          uid: ext_netappfiles-preview_az_netappfiles_volume_update
-          displayName: az netappfiles volume update
-  - name: notification-hub
+        - name: Summary
+          uid: az_peering_service
+          displayName: az peering service
+        - name: country
+          uid: az_peering_service_country
+          displayName: az peering service country
+          items: []
+        - name: location
+          uid: az_peering_service_location
+          displayName: az peering service location
+          items: []
+        - name: prefix
+          uid: az_peering_service_prefix
+          displayName: az peering service prefix
+          items: []
+        - name: provider
+          uid: az_peering_service_provider
+          displayName: az peering service provider
+          items: []
+  - name: Azure Notification Hubs
     items:
-    - name: Overview
-      uid: ext_notification-hub_az
+    - name: Summary
+      uid: sp-Azure_Notification_Hubs
+      displayName: Azure Notification Hubs
     - name: notification-hub
-      displayName: az notification-hub
       items:
-      - name: Overview
-        uid: ext_notification-hub_az_notification_hub
+      - name: Summary
+        uid: az_notification-hub
         displayName: az notification-hub
-      - name: check-availability
-        uid: ext_notification-hub_az_notification_hub_check_availability
-        displayName: az notification-hub check-availability
-      - name: create
-        uid: ext_notification-hub_az_notification_hub_create
-        displayName: az notification-hub create
-      - name: delete
-        uid: ext_notification-hub_az_notification_hub_delete
-        displayName: az notification-hub delete
-      - name: list
-        uid: ext_notification-hub_az_notification_hub_list
-        displayName: az notification-hub list
-      - name: show
-        uid: ext_notification-hub_az_notification_hub_show
-        displayName: az notification-hub show
-      - name: test-send
-        uid: ext_notification-hub_az_notification_hub_test_send
-        displayName: az notification-hub test-send
-      - name: update
-        uid: ext_notification-hub_az_notification_hub_update
-        displayName: az notification-hub update
       - name: authorization-rule
+        uid: az_notification-hub_authorization-rule
         displayName: az notification-hub authorization-rule
-        items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_authorization_rule
-          displayName: az notification-hub authorization-rule
-        - name: create
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_create
-          displayName: az notification-hub authorization-rule create
-        - name: delete
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_delete
-          displayName: az notification-hub authorization-rule delete
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_list
-          displayName: az notification-hub authorization-rule list
-        - name: list-keys
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_list_keys
-          displayName: az notification-hub authorization-rule list-keys
-        - name: regenerate-keys
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_regenerate_keys
-          displayName: az notification-hub authorization-rule regenerate-keys
-        - name: show
-          uid: ext_notification-hub_az_notification_hub_authorization_rule_show
-          displayName: az notification-hub authorization-rule show
+        items: []
       - name: credential
-        displayName: az notification-hub credential
         items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_credential
+        - name: Summary
+          uid: az_notification-hub_credential
           displayName: az notification-hub credential
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_credential_list
-          displayName: az notification-hub credential list
         - name: adm
+          uid: az_notification-hub_credential_adm
           displayName: az notification-hub credential adm
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_adm
-            displayName: az notification-hub credential adm
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_adm_update
-            displayName: az notification-hub credential adm update
+          items: []
         - name: apns
+          uid: az_notification-hub_credential_apns
           displayName: az notification-hub credential apns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_apns
-            displayName: az notification-hub credential apns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_apns_update
-            displayName: az notification-hub credential apns update
+          items: []
         - name: baidu
+          uid: az_notification-hub_credential_baidu
           displayName: az notification-hub credential baidu
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_baidu
-            displayName: az notification-hub credential baidu
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_baidu_update
-            displayName: az notification-hub credential baidu update
+          items: []
         - name: gcm
+          uid: az_notification-hub_credential_gcm
           displayName: az notification-hub credential gcm
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_gcm
-            displayName: az notification-hub credential gcm
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_gcm_update
-            displayName: az notification-hub credential gcm update
+          items: []
         - name: mpns
+          uid: az_notification-hub_credential_mpns
           displayName: az notification-hub credential mpns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_mpns
-            displayName: az notification-hub credential mpns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_mpns_update
-            displayName: az notification-hub credential mpns update
+          items: []
         - name: wns
+          uid: az_notification-hub_credential_wns
           displayName: az notification-hub credential wns
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_credential_wns
-            displayName: az notification-hub credential wns
-          - name: update
-            uid: ext_notification-hub_az_notification_hub_credential_wns_update
-            displayName: az notification-hub credential wns update
+          items: []
       - name: namespace
-        displayName: az notification-hub namespace
         items:
-        - name: Overview
-          uid: ext_notification-hub_az_notification_hub_namespace
+        - name: Summary
+          uid: az_notification-hub_namespace
           displayName: az notification-hub namespace
-        - name: check-availability
-          uid: ext_notification-hub_az_notification_hub_namespace_check_availability
-          displayName: az notification-hub namespace check-availability
-        - name: create
-          uid: ext_notification-hub_az_notification_hub_namespace_create
-          displayName: az notification-hub namespace create
-        - name: delete
-          uid: ext_notification-hub_az_notification_hub_namespace_delete
-          displayName: az notification-hub namespace delete
-        - name: list
-          uid: ext_notification-hub_az_notification_hub_namespace_list
-          displayName: az notification-hub namespace list
-        - name: show
-          uid: ext_notification-hub_az_notification_hub_namespace_show
-          displayName: az notification-hub namespace show
-        - name: update
-          uid: ext_notification-hub_az_notification_hub_namespace_update
-          displayName: az notification-hub namespace update
-        - name: wait
-          uid: ext_notification-hub_az_notification_hub_namespace_wait
-          displayName: az notification-hub namespace wait
         - name: authorization-rule
+          uid: az_notification-hub_namespace_authorization-rule
           displayName: az notification-hub namespace authorization-rule
-          items:
-          - name: Overview
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule
-            displayName: az notification-hub namespace authorization-rule
-          - name: create
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_create
-            displayName: az notification-hub namespace authorization-rule create
-          - name: delete
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_delete
-            displayName: az notification-hub namespace authorization-rule delete
-          - name: list
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list
-            displayName: az notification-hub namespace authorization-rule list
-          - name: list-keys
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_list_keys
-            displayName: az notification-hub namespace authorization-rule list-keys
-          - name: regenerate-keys
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_regenerate_keys
-            displayName: az notification-hub namespace authorization-rule regenerate-keys
-          - name: show
-            uid: ext_notification-hub_az_notification_hub_namespace_authorization_rule_show
-            displayName: az notification-hub namespace authorization-rule show
-  - name: peering
+          items: []
+  - name: Azure Pipelines
     items:
-    - name: Overview
-      uid: ext_peering_az
-    - name: peering
-      displayName: az peering
+    - name: Summary
+      uid: sp-Azure_Pipelines
+      displayName: Azure Pipelines
+    - name: pipelines
       items:
-      - name: Overview
-        uid: ext_peering_az_peering
-        displayName: az peering
-      - name: create
-        uid: ext_peering_az_peering_create
-        displayName: az peering create
-      - name: delete
-        uid: ext_peering_az_peering_delete
-        displayName: az peering delete
-      - name: list
-        uid: ext_peering_az_peering_list
-        displayName: az peering list
-      - name: show
-        uid: ext_peering_az_peering_show
-        displayName: az peering show
-      - name: update
-        uid: ext_peering_az_peering_update
-        displayName: az peering update
-      - name: asn
-        displayName: az peering asn
+      - name: Summary
+        uid: az_pipelines
+        displayName: az pipelines
+      - name: agent
+        uid: az_pipelines_agent
+        displayName: az pipelines agent
+        items: []
+      - name: build
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_asn
-          displayName: az peering asn
-        - name: create
-          uid: ext_peering_az_peering_asn_create
-          displayName: az peering asn create
-        - name: delete
-          uid: ext_peering_az_peering_asn_delete
-          displayName: az peering asn delete
-        - name: list
-          uid: ext_peering_az_peering_asn_list
-          displayName: az peering asn list
-        - name: show
-          uid: ext_peering_az_peering_asn_show
-          displayName: az peering asn show
-        - name: update
-          uid: ext_peering_az_peering_asn_update
-          displayName: az peering asn update
-      - name: legacy
-        displayName: az peering legacy
+        - name: Summary
+          uid: az_pipelines_build
+          displayName: az pipelines build
+        - name: definition
+          uid: az_pipelines_build_definition
+          displayName: az pipelines build definition
+          items: []
+        - name: tag
+          uid: az_pipelines_build_tag
+          displayName: az pipelines build tag
+          items: []
+      - name: folder
+        uid: az_pipelines_folder
+        displayName: az pipelines folder
+        items: []
+      - name: pool
+        uid: az_pipelines_pool
+        displayName: az pipelines pool
+        items: []
+      - name: queue
+        uid: az_pipelines_queue
+        displayName: az pipelines queue
+        items: []
+      - name: release
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_legacy
-          displayName: az peering legacy
-        - name: list
-          uid: ext_peering_az_peering_legacy_list
-          displayName: az peering legacy list
-      - name: location
-        displayName: az peering location
+        - name: Summary
+          uid: az_pipelines_release
+          displayName: az pipelines release
+        - name: definition
+          uid: az_pipelines_release_definition
+          displayName: az pipelines release definition
+          items: []
+      - name: runs
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_location
-          displayName: az peering location
-        - name: list
-          uid: ext_peering_az_peering_location_list
-          displayName: az peering location list
-      - name: service
-        displayName: az peering service
+        - name: Summary
+          uid: az_pipelines_runs
+          displayName: az pipelines runs
+        - name: artifact
+          uid: az_pipelines_runs_artifact
+          displayName: az pipelines runs artifact
+          items: []
+        - name: tag
+          uid: az_pipelines_runs_tag
+          displayName: az pipelines runs tag
+          items: []
+      - name: variable
+        uid: az_pipelines_variable
+        displayName: az pipelines variable
+        items: []
+      - name: variable-group
         items:
-        - name: Overview
-          uid: ext_peering_az_peering_service
-          displayName: az peering service
-        - name: create
-          uid: ext_peering_az_peering_service_create
-          displayName: az peering service create
-        - name: delete
-          uid: ext_peering_az_peering_service_delete
-          displayName: az peering service delete
-        - name: list
-          uid: ext_peering_az_peering_service_list
-          displayName: az peering service list
-        - name: show
-          uid: ext_peering_az_peering_service_show
-          displayName: az peering service show
-        - name: update
-          uid: ext_peering_az_peering_service_update
-          displayName: az peering service update
-        - name: location
-          displayName: az peering service location
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_location
-            displayName: az peering service location
-          - name: list
-            uid: ext_peering_az_peering_service_location_list
-            displayName: az peering service location list
-        - name: prefix
-          displayName: az peering service prefix
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_prefix
-            displayName: az peering service prefix
-          - name: create
-            uid: ext_peering_az_peering_service_prefix_create
-            displayName: az peering service prefix create
-          - name: delete
-            uid: ext_peering_az_peering_service_prefix_delete
-            displayName: az peering service prefix delete
-          - name: list
-            uid: ext_peering_az_peering_service_prefix_list
-            displayName: az peering service prefix list
-          - name: show
-            uid: ext_peering_az_peering_service_prefix_show
-            displayName: az peering service prefix show
-          - name: update
-            uid: ext_peering_az_peering_service_prefix_update
-            displayName: az peering service prefix update
-        - name: provider
-          displayName: az peering service provider
-          items:
-          - name: Overview
-            uid: ext_peering_az_peering_service_provider
-            displayName: az peering service provider
-          - name: list
-            uid: ext_peering_az_peering_service_provider_list
-            displayName: az peering service provider list
-  - name: portal
+        - name: Summary
+          uid: az_pipelines_variable-group
+          displayName: az pipelines variable-group
+        - name: variable
+          uid: az_pipelines_variable-group_variable
+          displayName: az pipelines variable-group variable
+          items: []
+  - name: Azure Policy
+    items:
+    - name: Summary
+      uid: sp-Azure_Policy
+      displayName: Azure Policy
+    - name: guestconfig
+      items:
+      - name: Summary
+        uid: az_guestconfig
+        displayName: az guestconfig
+      - name: guest-configuration-assignment
+        uid: az_guestconfig_guest-configuration-assignment
+        displayName: az guestconfig guest-configuration-assignment
+        items: []
+      - name: guest-configuration-assignment-report
+        uid: az_guestconfig_guest-configuration-assignment-report
+        displayName: az guestconfig guest-configuration-assignment-report
+        items: []
+      - name: guest-configuration-hcrp-assignment
+        uid: az_guestconfig_guest-configuration-hcrp-assignment
+        displayName: az guestconfig guest-configuration-hcrp-assignment
+        items: []
+      - name: guest-configuration-hcrp-assignment-report
+        uid: az_guestconfig_guest-configuration-hcrp-assignment-report
+        displayName: az guestconfig guest-configuration-hcrp-assignment-report
+        items: []
+    - name: policy
+      items:
+      - name: Summary
+        uid: az_policy
+        displayName: az policy
+      - name: assignment
+        uid: az_policy_assignment
+        displayName: az policy assignment
+        items: []
+      - name: definition
+        uid: az_policy_definition
+        displayName: az policy definition
+        items: []
+  - name: Azure Portal
     items:
-    - name: Overview
-      uid: ext_portal_az
+    - name: Summary
+      uid: sp-Azure_Portal
+      displayName: Azure Portal
     - name: portal
-      displayName: az portal
       items:
-      - name: Overview
-        uid: ext_portal_az_portal
+      - name: Summary
+        uid: az_portal
         displayName: az portal
       - name: dashboard
+        uid: az_portal_dashboard
         displayName: az portal dashboard
-        items:
-        - name: Overview
-          uid: ext_portal_az_portal_dashboard
-          displayName: az portal dashboard
-        - name: create
-          uid: ext_portal_az_portal_dashboard_create
-          displayName: az portal dashboard create
-        - name: delete
-          uid: ext_portal_az_portal_dashboard_delete
-          displayName: az portal dashboard delete
-        - name: import
-          uid: ext_portal_az_portal_dashboard_import
-          displayName: az portal dashboard import
-        - name: list
-          uid: ext_portal_az_portal_dashboard_list
-          displayName: az portal dashboard list
-        - name: show
-          uid: ext_portal_az_portal_dashboard_show
-          displayName: az portal dashboard show
-        - name: update
-          uid: ext_portal_az_portal_dashboard_update
-          displayName: az portal dashboard update
-  - name: powerbidedicated
+        items: []
+  - name: Azure Providers
     items:
-    - name: Overview
-      uid: ext_powerbidedicated_az
-    - name: powerbi
-      displayName: az powerbi
+    - name: Summary
+      uid: sp-Azure_Providers
+      displayName: Azure Providers
+    - name: providerhub
+      items:
+      - name: Summary
+        uid: az_providerhub
+        displayName: az providerhub
+      - name: custom-rollout
+        uid: az_providerhub_custom-rollout
+        displayName: az providerhub custom-rollout
+        items: []
+      - name: default-rollout
+        uid: az_providerhub_default-rollout
+        displayName: az providerhub default-rollout
+        items: []
+      - name: manifest
+        uid: az_providerhub_manifest
+        displayName: az providerhub manifest
+        items: []
+      - name: provider-registration
+        uid: az_providerhub_provider-registration
+        displayName: az providerhub provider-registration
+        items: []
+      - name: resource-type-registration
+        uid: az_providerhub_resource-type-registration
+        displayName: az providerhub resource-type-registration
+        items: []
+  - name: Azure Quantum
+    items:
+    - name: Summary
+      uid: sp-Azure_Quantum
+      displayName: Azure Quantum
+    - name: quantum
+      items:
+      - name: Summary
+        uid: az_quantum
+        displayName: az quantum
+      - name: job
+        uid: az_quantum_job
+        displayName: az quantum job
+        items: []
+      - name: offerings
+        uid: az_quantum_offerings
+        displayName: az quantum offerings
+        items: []
+      - name: target
+        uid: az_quantum_target
+        displayName: az quantum target
+        items: []
+      - name: workspace
+        uid: az_quantum_workspace
+        displayName: az quantum workspace
+        items: []
+  - name: Azure Red Hat OpenShift
+    uid: sp-Azure_Red_Hat_OpenShift
+    displayName: Azure Red Hat OpenShift
+    items: []
+  - name: Azure Relay
+    uid: sp-Azure_Relay
+    displayName: Azure Relay
+    items: []
+  - name: Azure Remote Rendering
+    items:
+    - name: Summary
+      uid: sp-Azure_Remote_Rendering
+      displayName: Azure Remote Rendering
+    - name: remote-rendering-account
+      items:
+      - name: Summary
+        uid: az_remote-rendering-account
+        displayName: az remote-rendering-account
+      - name: key
+        uid: az_remote-rendering-account_key
+        displayName: az remote-rendering-account key
+        items: []
+  - name: Azure Repos
+    items:
+    - name: Summary
+      uid: sp-Azure_Repos
+      displayName: Azure Repos
+    - name: repos
       items:
-      - name: Overview
-        uid: ext_powerbidedicated_az_powerbi
-        displayName: az powerbi
-      - name: embedded-capacity
-        displayName: az powerbi embedded-capacity
+      - name: Summary
+        uid: az_repos
+        displayName: az repos
+      - name: import
+        uid: az_repos_import
+        displayName: az repos import
+        items: []
+      - name: policy
         items:
-        - name: Overview
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity
-          displayName: az powerbi embedded-capacity
-        - name: create
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_create
-          displayName: az powerbi embedded-capacity create
-        - name: delete
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_delete
-          displayName: az powerbi embedded-capacity delete
-        - name: list
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_list
-          displayName: az powerbi embedded-capacity list
-        - name: show
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_show
-          displayName: az powerbi embedded-capacity show
-        - name: update
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_update
-          displayName: az powerbi embedded-capacity update
-        - name: wait
-          uid: ext_powerbidedicated_az_powerbi_embedded_capacity_wait
-          displayName: az powerbi embedded-capacity wait
-  - name: privatedns
+        - name: Summary
+          uid: az_repos_policy
+          displayName: az repos policy
+        - name: approver-count
+          uid: az_repos_policy_approver-count
+          displayName: az repos policy approver-count
+          items: []
+        - name: build
+          uid: az_repos_policy_build
+          displayName: az repos policy build
+          items: []
+        - name: case-enforcement
+          uid: az_repos_policy_case-enforcement
+          displayName: az repos policy case-enforcement
+          items: []
+        - name: comment-required
+          uid: az_repos_policy_comment-required
+          displayName: az repos policy comment-required
+          items: []
+        - name: file-size
+          uid: az_repos_policy_file-size
+          displayName: az repos policy file-size
+          items: []
+        - name: merge-strategy
+          uid: az_repos_policy_merge-strategy
+          displayName: az repos policy merge-strategy
+          items: []
+        - name: required-reviewer
+          uid: az_repos_policy_required-reviewer
+          displayName: az repos policy required-reviewer
+          items: []
+        - name: work-item-linking
+          uid: az_repos_policy_work-item-linking
+          displayName: az repos policy work-item-linking
+          items: []
+      - name: pr
+        items:
+        - name: Summary
+          uid: az_repos_pr
+          displayName: az repos pr
+        - name: policy
+          uid: az_repos_pr_policy
+          displayName: az repos pr policy
+          items: []
+        - name: reviewer
+          uid: az_repos_pr_reviewer
+          displayName: az repos pr reviewer
+          items: []
+        - name: work-item
+          uid: az_repos_pr_work-item
+          displayName: az repos pr work-item
+          items: []
+      - name: ref
+        uid: az_repos_ref
+        displayName: az repos ref
+        items: []
+  - name: Azure Reservations
+    uid: sp-Azure_Reservations
+    displayName: Azure Reservations
+    items: []
+  - name: Azure Resource Graph
+    items:
+    - name: Summary
+      uid: sp-Azure_Resource_Graph
+      displayName: Azure Resource Graph
+    - name: graph
+      uid: az_graph
+      displayName: az graph
+      items: []
+  - name: Azure Resource Manager
     items:
-    - name: Overview
-      uid: ext_privatedns_az
-    - name: Networking
-      displayName: az network
+    - name: Summary
+      uid: sp-Azure_Resource_Manager
+      displayName: Azure Resource Manager
+    - name: deployment
       items:
-      - name: Overview
-        uid: ext_privatedns_az_network
-        displayName: az network
-      - name: private-dns
-        displayName: az network private-dns
+      - name: Summary
+        uid: az_deployment
+        displayName: az deployment
+      - name: group
+        uid: az_deployment_group
+        displayName: az deployment group
+        items: []
+      - name: operation
         items:
-        - name: Overview
-          uid: ext_privatedns_az_network_private_dns
-          displayName: az network private-dns
-        - name: link
-          displayName: az network private-dns link
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_link
-            displayName: az network private-dns link
-          - name: vnet
-            displayName: az network private-dns link vnet
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_link_vnet
-              displayName: az network private-dns link vnet
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_link_vnet_create
-              displayName: az network private-dns link vnet create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_link_vnet_delete
-              displayName: az network private-dns link vnet delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_link_vnet_list
-              displayName: az network private-dns link vnet list
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_link_vnet_show
-              displayName: az network private-dns link vnet show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_link_vnet_update
-              displayName: az network private-dns link vnet update
-            - name: wait
-              uid: ext_privatedns_az_network_private_dns_link_vnet_wait
-              displayName: az network private-dns link vnet wait
-        - name: record-set
-          displayName: az network private-dns record-set
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_record_set
-            displayName: az network private-dns record-set
-          - name: list
-            uid: ext_privatedns_az_network_private_dns_record_set_list
-            displayName: az network private-dns record-set list
-          - name: a
-            displayName: az network private-dns record-set a
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_a
-              displayName: az network private-dns record-set a
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_a_add_record
-              displayName: az network private-dns record-set a add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_a_create
-              displayName: az network private-dns record-set a create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_a_delete
-              displayName: az network private-dns record-set a delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_a_list
-              displayName: az network private-dns record-set a list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_a_remove_record
-              displayName: az network private-dns record-set a remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_a_show
-              displayName: az network private-dns record-set a show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_a_update
-              displayName: az network private-dns record-set a update
-          - name: aaaa
-            displayName: az network private-dns record-set aaaa
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa
-              displayName: az network private-dns record-set aaaa
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_add_record
-              displayName: az network private-dns record-set aaaa add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_create
-              displayName: az network private-dns record-set aaaa create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_delete
-              displayName: az network private-dns record-set aaaa delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_list
-              displayName: az network private-dns record-set aaaa list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_remove_record
-              displayName: az network private-dns record-set aaaa remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_show
-              displayName: az network private-dns record-set aaaa show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_aaaa_update
-              displayName: az network private-dns record-set aaaa update
-          - name: cname
-            displayName: az network private-dns record-set cname
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_cname
-              displayName: az network private-dns record-set cname
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_create
-              displayName: az network private-dns record-set cname create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_delete
-              displayName: az network private-dns record-set cname delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_list
-              displayName: az network private-dns record-set cname list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_remove_record
-              displayName: az network private-dns record-set cname remove-record
-            - name: set-record
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_set_record
-              displayName: az network private-dns record-set cname set-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_show
-              displayName: az network private-dns record-set cname show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_cname_update
-              displayName: az network private-dns record-set cname update
-          - name: mx
-            displayName: az network private-dns record-set mx
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_mx
-              displayName: az network private-dns record-set mx
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_add_record
-              displayName: az network private-dns record-set mx add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_create
-              displayName: az network private-dns record-set mx create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_delete
-              displayName: az network private-dns record-set mx delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_list
-              displayName: az network private-dns record-set mx list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_remove_record
-              displayName: az network private-dns record-set mx remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_show
-              displayName: az network private-dns record-set mx show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_mx_update
-              displayName: az network private-dns record-set mx update
-          - name: ptr
-            displayName: az network private-dns record-set ptr
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr
-              displayName: az network private-dns record-set ptr
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_add_record
-              displayName: az network private-dns record-set ptr add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_create
-              displayName: az network private-dns record-set ptr create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_delete
-              displayName: az network private-dns record-set ptr delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_list
-              displayName: az network private-dns record-set ptr list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_remove_record
-              displayName: az network private-dns record-set ptr remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_show
-              displayName: az network private-dns record-set ptr show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_ptr_update
-              displayName: az network private-dns record-set ptr update
-          - name: soa
-            displayName: az network private-dns record-set soa
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_soa
-              displayName: az network private-dns record-set soa
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_soa_show
-              displayName: az network private-dns record-set soa show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_soa_update
-              displayName: az network private-dns record-set soa update
-          - name: srv
-            displayName: az network private-dns record-set srv
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_srv
-              displayName: az network private-dns record-set srv
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_add_record
-              displayName: az network private-dns record-set srv add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_create
-              displayName: az network private-dns record-set srv create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_delete
-              displayName: az network private-dns record-set srv delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_list
-              displayName: az network private-dns record-set srv list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_remove_record
-              displayName: az network private-dns record-set srv remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_show
-              displayName: az network private-dns record-set srv show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_srv_update
-              displayName: az network private-dns record-set srv update
-          - name: txt
-            displayName: az network private-dns record-set txt
-            items:
-            - name: Overview
-              uid: ext_privatedns_az_network_private_dns_record_set_txt
-              displayName: az network private-dns record-set txt
-            - name: add-record
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_add_record
-              displayName: az network private-dns record-set txt add-record
-            - name: create
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_create
-              displayName: az network private-dns record-set txt create
-            - name: delete
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_delete
-              displayName: az network private-dns record-set txt delete
-            - name: list
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_list
-              displayName: az network private-dns record-set txt list
-            - name: remove-record
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_remove_record
-              displayName: az network private-dns record-set txt remove-record
-            - name: show
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_show
-              displayName: az network private-dns record-set txt show
-            - name: update
-              uid: ext_privatedns_az_network_private_dns_record_set_txt_update
-              displayName: az network private-dns record-set txt update
-        - name: zone
-          displayName: az network private-dns zone
-          items:
-          - name: Overview
-            uid: ext_privatedns_az_network_private_dns_zone
-            displayName: az network private-dns zone
-          - name: create
-            uid: ext_privatedns_az_network_private_dns_zone_create
-            displayName: az network private-dns zone create
-          - name: delete
-            uid: ext_privatedns_az_network_private_dns_zone_delete
-            displayName: az network private-dns zone delete
-          - name: list
-            uid: ext_privatedns_az_network_private_dns_zone_list
-            displayName: az network private-dns zone list
-          - name: show
-            uid: ext_privatedns_az_network_private_dns_zone_show
-            displayName: az network private-dns zone show
-          - name: update
-            uid: ext_privatedns_az_network_private_dns_zone_update
-            displayName: az network private-dns zone update
-          - name: wait
-            uid: ext_privatedns_az_network_private_dns_zone_wait
-            displayName: az network private-dns zone wait
-  - name: resource-graph
+        - name: Summary
+          uid: az_deployment_operation
+          displayName: az deployment operation
+        - name: group
+          uid: az_deployment_operation_group
+          displayName: az deployment operation group
+          items: []
+        - name: sub
+          uid: az_deployment_operation_sub
+          displayName: az deployment operation sub
+          items: []
+      - name: sub
+        uid: az_deployment_sub
+        displayName: az deployment sub
+        items: []
+    - name: deployment-scripts
+      uid: az_deployment-scripts
+      displayName: az deployment-scripts
+      items: []
+    - name: group
+      items:
+      - name: Summary
+        uid: az_group
+        displayName: az group
+      - name: deployment
+        items:
+        - name: Summary
+          uid: az_group_deployment
+          displayName: az group deployment
+        - name: operation
+          uid: az_group_deployment_operation
+          displayName: az group deployment operation
+          items: []
+      - name: lock
+        uid: az_group_lock
+        displayName: az group lock
+        items: []
+    - name: lock
+      uid: az_lock
+      displayName: az lock
+      items: []
+    - name: provider
+      items:
+      - name: Summary
+        uid: az_provider
+        displayName: az provider
+      - name: operation
+        uid: az_provider_operation
+        displayName: az provider operation
+        items: []
+    - name: resource
+      items:
+      - name: Summary
+        uid: az_resource
+        displayName: az resource
+      - name: link
+        uid: az_resource_link
+        displayName: az resource link
+        items: []
+      - name: lock
+        uid: az_resource_lock
+        displayName: az resource lock
+        items: []
+    - name: tag
+      uid: az_tag
+      displayName: az tag
+      items: []
+  - name: Azure Resource Mover
     items:
-    - name: Overview
-      uid: ext_resource-graph_az
-    - name: graph
-      displayName: az graph
+    - name: Summary
+      uid: sp-Azure_Resource_Mover
+      displayName: Azure Resource Mover
+    - name: resource-mover
+      items:
+      - name: Summary
+        uid: az_resource-mover
+        displayName: az resource-mover
+      - name: move-collection
+        uid: az_resource-mover_move-collection
+        displayName: az resource-mover move-collection
+        items: []
+      - name: move-resource
+        uid: az_resource-mover_move-resource
+        displayName: az resource-mover move-resource
+        items: []
+  - name: Azure resource providers
+    uid: sp-Azure_resource_providers
+    displayName: Azure resource providers
+    items: []
+  - name: Azure role-based access Control
+    items:
+    - name: Summary
+      uid: sp-Azure_role-based_access_Control
+      displayName: Azure role-based access Control
+    - name: role
+      items:
+      - name: Summary
+        uid: az_role
+        displayName: az role
+      - name: assignment
+        uid: az_role_assignment
+        displayName: az role assignment
+        items: []
+      - name: definition
+        uid: az_role_definition
+        displayName: az role definition
+        items: []
+  - name: Azure Security Center
+    items:
+    - name: Summary
+      uid: sp-Azure_Security_Center
+      displayName: Azure Security Center
+    - name: security
       items:
-      - name: Overview
-        uid: ext_resource-graph_az_graph
-        displayName: az graph
-      - name: query
-        uid: ext_resource-graph_az_graph_query
-        displayName: az graph query
-      - name: shared-query
-        displayName: az graph shared-query
-        items:
-        - name: Overview
-          uid: ext_resource-graph_az_graph_shared_query
-          displayName: az graph shared-query
-        - name: create
-          uid: ext_resource-graph_az_graph_shared_query_create
-          displayName: az graph shared-query create
-        - name: delete
-          uid: ext_resource-graph_az_graph_shared_query_delete
-          displayName: az graph shared-query delete
-        - name: list
-          uid: ext_resource-graph_az_graph_shared_query_list
-          displayName: az graph shared-query list
-        - name: show
-          uid: ext_resource-graph_az_graph_shared_query_show
-          displayName: az graph shared-query show
-  - name: sap-hana
+      - name: Summary
+        uid: az_security
+        displayName: az security
+      - name: adaptive_network_hardenings
+        uid: az_security_adaptive_network_hardenings
+        displayName: az security adaptive_network_hardenings
+        items: []
+      - name: adaptive-application-controls
+        uid: az_security_adaptive-application-controls
+        displayName: az security adaptive-application-controls
+        items: []
+      - name: alert
+        uid: az_security_alert
+        displayName: az security alert
+        items: []
+      - name: allowed_connections
+        uid: az_security_allowed_connections
+        displayName: az security allowed_connections
+        items: []
+      - name: assessment
+        uid: az_security_assessment
+        displayName: az security assessment
+        items: []
+      - name: assessment-metadata
+        uid: az_security_assessment-metadata
+        displayName: az security assessment-metadata
+        items: []
+      - name: atp
+        items:
+        - name: Summary
+          uid: az_security_atp
+          displayName: az security atp
+        - name: storage
+          uid: az_security_atp_storage
+          displayName: az security atp storage
+          items: []
+      - name: auto-provisioning-setting
+        uid: az_security_auto-provisioning-setting
+        displayName: az security auto-provisioning-setting
+        items: []
+      - name: contact
+        uid: az_security_contact
+        displayName: az security contact
+        items: []
+      - name: discovered-security-solution
+        uid: az_security_discovered-security-solution
+        displayName: az security discovered-security-solution
+        items: []
+      - name: external-security-solution
+        uid: az_security_external-security-solution
+        displayName: az security external-security-solution
+        items: []
+      - name: iot-alerts
+        uid: az_security_iot-alerts
+        displayName: az security iot-alerts
+        items: []
+      - name: iot-analytics
+        uid: az_security_iot-analytics
+        displayName: az security iot-analytics
+        items: []
+      - name: iot-recommendations
+        uid: az_security_iot-recommendations
+        displayName: az security iot-recommendations
+        items: []
+      - name: iot-solution
+        uid: az_security_iot-solution
+        displayName: az security iot-solution
+        items: []
+      - name: jit-policy
+        uid: az_security_jit-policy
+        displayName: az security jit-policy
+        items: []
+      - name: location
+        uid: az_security_location
+        displayName: az security location
+        items: []
+      - name: pricing
+        uid: az_security_pricing
+        displayName: az security pricing
+        items: []
+      - name: regulatory-compliance-assessments
+        uid: az_security_regulatory-compliance-assessments
+        displayName: az security regulatory-compliance-assessments
+        items: []
+      - name: regulatory-compliance-controls
+        uid: az_security_regulatory-compliance-controls
+        displayName: az security regulatory-compliance-controls
+        items: []
+      - name: regulatory-compliance-standards
+        uid: az_security_regulatory-compliance-standards
+        displayName: az security regulatory-compliance-standards
+        items: []
+      - name: secure-score-control-definitions
+        uid: az_security_secure-score-control-definitions
+        displayName: az security secure-score-control-definitions
+        items: []
+      - name: secure-score-controls
+        uid: az_security_secure-score-controls
+        displayName: az security secure-score-controls
+        items: []
+      - name: secure-scores
+        uid: az_security_secure-scores
+        displayName: az security secure-scores
+        items: []
+      - name: setting
+        uid: az_security_setting
+        displayName: az security setting
+        items: []
+      - name: sub-assessment
+        uid: az_security_sub-assessment
+        displayName: az security sub-assessment
+        items: []
+      - name: task
+        uid: az_security_task
+        displayName: az security task
+        items: []
+      - name: topology
+        uid: az_security_topology
+        displayName: az security topology
+        items: []
+      - name: va
+        items:
+        - name: Summary
+          uid: az_security_va
+          displayName: az security va
+        - name: sql
+          items:
+          - name: Summary
+            uid: az_security_va_sql
+            displayName: az security va sql
+          - name: baseline
+            uid: az_security_va_sql_baseline
+            displayName: az security va sql baseline
+            items: []
+          - name: results
+            uid: az_security_va_sql_results
+            displayName: az security va sql results
+            items: []
+          - name: scans
+            uid: az_security_va_sql_scans
+            displayName: az security va sql scans
+            items: []
+      - name: workspace-setting
+        uid: az_security_workspace-setting
+        displayName: az security workspace-setting
+        items: []
+  - name: Azure Sentinel
     items:
-    - name: Overview
-      uid: ext_sap-hana_az
-    - name: hanainstance
-      displayName: az hanainstance
+    - name: Summary
+      uid: sp-Azure_Sentinel
+      displayName: Azure Sentinel
+    - name: sentinel
+      items:
+      - name: Summary
+        uid: az_sentinel
+        displayName: az sentinel
+      - name: action
+        uid: az_sentinel_action
+        displayName: az sentinel action
+        items: []
+      - name: alert-rule
+        uid: az_sentinel_alert-rule
+        displayName: az sentinel alert-rule
+        items: []
+      - name: alert-rule-template
+        uid: az_sentinel_alert-rule-template
+        displayName: az sentinel alert-rule-template
+        items: []
+      - name: bookmark
+        uid: az_sentinel_bookmark
+        displayName: az sentinel bookmark
+        items: []
+      - name: data-connector
+        uid: az_sentinel_data-connector
+        displayName: az sentinel data-connector
+        items: []
+      - name: incident
+        uid: az_sentinel_incident
+        displayName: az sentinel incident
+        items: []
+      - name: incident-comment
+        uid: az_sentinel_incident-comment
+        displayName: az sentinel incident-comment
+        items: []
+  - name: Azure Service Bus Messaging
+    uid: sp-Azure_Service_Bus_Messaging
+    displayName: Azure Service Bus Messaging
+    items: []
+  - name: Azure Service Fabric
+    uid: sp-Azure_Service_Fabric
+    displayName: Azure Service Fabric
+    items: []
+  - name: Azure Service Fabric Mesh
+    items:
+    - name: Summary
+      uid: sp-Azure_Service_Fabric_Mesh
+      displayName: Azure Service Fabric Mesh
+    - name: mesh
       items:
-      - name: Overview
-        uid: ext_sap-hana_az_hanainstance
-        displayName: az hanainstance
-      - name: create
-        uid: ext_sap-hana_az_hanainstance_create
-        displayName: az hanainstance create
-      - name: delete
-        uid: ext_sap-hana_az_hanainstance_delete
-        displayName: az hanainstance delete
-      - name: list
-        uid: ext_sap-hana_az_hanainstance_list
-        displayName: az hanainstance list
-      - name: restart
-        uid: ext_sap-hana_az_hanainstance_restart
-        displayName: az hanainstance restart
-      - name: show
-        uid: ext_sap-hana_az_hanainstance_show
-        displayName: az hanainstance show
-      - name: shutdown
-        uid: ext_sap-hana_az_hanainstance_shutdown
-        displayName: az hanainstance shutdown
-      - name: start
-        uid: ext_sap-hana_az_hanainstance_start
-        displayName: az hanainstance start
-      - name: update
-        uid: ext_sap-hana_az_hanainstance_update
-        displayName: az hanainstance update
-    - name: sapmonitor
-      displayName: az sapmonitor
+      - name: Summary
+        uid: az_mesh
+        displayName: az mesh
+      - name: app
+        uid: az_mesh_app
+        displayName: az mesh app
+        items: []
+      - name: code-package-log
+        uid: az_mesh_code-package-log
+        displayName: az mesh code-package-log
+        items: []
+      - name: deployment
+        uid: az_mesh_deployment
+        displayName: az mesh deployment
+        items: []
+      - name: gateway
+        uid: az_mesh_gateway
+        displayName: az mesh gateway
+        items: []
+      - name: generate
+        uid: az_mesh_generate
+        displayName: az mesh generate
+        items: []
+      - name: network
+        uid: az_mesh_network
+        displayName: az mesh network
+        items: []
+      - name: secret
+        uid: az_mesh_secret
+        displayName: az mesh secret
+        items: []
+      - name: secretvalue
+        uid: az_mesh_secretvalue
+        displayName: az mesh secretvalue
+        items: []
+      - name: service
+        uid: az_mesh_service
+        displayName: az mesh service
+        items: []
+      - name: service-replica
+        uid: az_mesh_service-replica
+        displayName: az mesh service-replica
+        items: []
+      - name: volume
+        uid: az_mesh_volume
+        displayName: az mesh volume
+        items: []
+  - name: Azure SignalR
+    uid: sp-Azure_SignalR
+    displayName: Azure SignalR
+    items: []
+  - name: Azure Spatial Anchors
+    items:
+    - name: Summary
+      uid: sp-Azure_Spatial_Anchors
+      displayName: Azure Spatial Anchors
+    - name: spatial-anchors-account
       items:
-      - name: Overview
-        uid: ext_sap-hana_az_sapmonitor
-        displayName: az sapmonitor
-      - name: create
-        uid: ext_sap-hana_az_sapmonitor_create
-        displayName: az sapmonitor create
-      - name: delete
-        uid: ext_sap-hana_az_sapmonitor_delete
-        displayName: az sapmonitor delete
-      - name: list
-        uid: ext_sap-hana_az_sapmonitor_list
-        displayName: az sapmonitor list
-      - name: show
-        uid: ext_sap-hana_az_sapmonitor_show
-        displayName: az sapmonitor show
-      - name: update
-        uid: ext_sap-hana_az_sapmonitor_update
-        displayName: az sapmonitor update
-      - name: provider-instance
-        displayName: az sapmonitor provider-instance
-        items:
-        - name: Overview
-          uid: ext_sap-hana_az_sapmonitor_provider_instance
-          displayName: az sapmonitor provider-instance
-        - name: create
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_create
-          displayName: az sapmonitor provider-instance create
-        - name: delete
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_delete
-          displayName: az sapmonitor provider-instance delete
-        - name: list
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_list
-          displayName: az sapmonitor provider-instance list
-        - name: show
-          uid: ext_sap-hana_az_sapmonitor_provider_instance_show
-          displayName: az sapmonitor provider-instance show
-  - name: spring-cloud
+      - name: Summary
+        uid: az_spatial-anchors-account
+        displayName: az spatial-anchors-account
+      - name: key
+        uid: az_spatial-anchors-account_key
+        displayName: az spatial-anchors-account key
+        items: []
+  - name: Azure Spring Cloud
     items:
-    - name: Overview
-      uid: ext_spring-cloud_az
+    - name: Summary
+      uid: sp-Azure_Spring_Cloud
+      displayName: Azure Spring Cloud
     - name: spring-cloud
-      displayName: az spring-cloud
       items:
-      - name: Overview
-        uid: ext_spring-cloud_az_spring_cloud
+      - name: Summary
+        uid: az_spring-cloud
         displayName: az spring-cloud
-      - name: create
-        uid: ext_spring-cloud_az_spring_cloud_create
-        displayName: az spring-cloud create
-      - name: delete
-        uid: ext_spring-cloud_az_spring_cloud_delete
-        displayName: az spring-cloud delete
-      - name: list
-        uid: ext_spring-cloud_az_spring_cloud_list
-        displayName: az spring-cloud list
-      - name: show
-        uid: ext_spring-cloud_az_spring_cloud_show
-        displayName: az spring-cloud show
-      - name: update
-        uid: ext_spring-cloud_az_spring_cloud_update
-        displayName: az spring-cloud update
       - name: app
-        displayName: az spring-cloud app
         items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_app
+        - name: Summary
+          uid: az_spring-cloud_app
           displayName: az spring-cloud app
-        - name: create
-          uid: ext_spring-cloud_az_spring_cloud_app_create
-          displayName: az spring-cloud app create
-        - name: delete
-          uid: ext_spring-cloud_az_spring_cloud_app_delete
-          displayName: az spring-cloud app delete
-        - name: deploy
-          uid: ext_spring-cloud_az_spring_cloud_app_deploy
-          displayName: az spring-cloud app deploy
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_app_list
-          displayName: az spring-cloud app list
-        - name: logs
-          uid: ext_spring-cloud_az_spring_cloud_app_logs
-          displayName: az spring-cloud app logs
-        - name: restart
-          uid: ext_spring-cloud_az_spring_cloud_app_restart
-          displayName: az spring-cloud app restart
-        - name: scale
-          uid: ext_spring-cloud_az_spring_cloud_app_scale
-          displayName: az spring-cloud app scale
-        - name: set-deployment
-          uid: ext_spring-cloud_az_spring_cloud_app_set_deployment
-          displayName: az spring-cloud app set-deployment
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_app_show
-          displayName: az spring-cloud app show
-        - name: show-deploy-log
-          uid: ext_spring-cloud_az_spring_cloud_app_show_deploy_log
-          displayName: az spring-cloud app show-deploy-log
-        - name: start
-          uid: ext_spring-cloud_az_spring_cloud_app_start
-          displayName: az spring-cloud app start
-        - name: stop
-          uid: ext_spring-cloud_az_spring_cloud_app_stop
-          displayName: az spring-cloud app stop
-        - name: update
-          uid: ext_spring-cloud_az_spring_cloud_app_update
-          displayName: az spring-cloud app update
         - name: binding
-          displayName: az spring-cloud app binding
           items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_binding
+          - name: Summary
+            uid: az_spring-cloud_app_binding
             displayName: az spring-cloud app binding
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_list
-            displayName: az spring-cloud app binding list
-          - name: remove
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_remove
-            displayName: az spring-cloud app binding remove
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_binding_show
-            displayName: az spring-cloud app binding show
           - name: cosmos
+            uid: az_spring-cloud_app_binding_cosmos
             displayName: az spring-cloud app binding cosmos
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos
-              displayName: az spring-cloud app binding cosmos
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_add
-              displayName: az spring-cloud app binding cosmos add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_cosmos_update
-              displayName: az spring-cloud app binding cosmos update
+            items: []
           - name: mysql
+            uid: az_spring-cloud_app_binding_mysql
             displayName: az spring-cloud app binding mysql
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql
-              displayName: az spring-cloud app binding mysql
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_add
-              displayName: az spring-cloud app binding mysql add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_mysql_update
-              displayName: az spring-cloud app binding mysql update
+            items: []
           - name: redis
+            uid: az_spring-cloud_app_binding_redis
             displayName: az spring-cloud app binding redis
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis
-              displayName: az spring-cloud app binding redis
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_add
-              displayName: az spring-cloud app binding redis add
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_app_binding_redis_update
-              displayName: az spring-cloud app binding redis update
+            items: []
         - name: custom-domain
+          uid: az_spring-cloud_app_custom-domain
           displayName: az spring-cloud app custom-domain
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain
-            displayName: az spring-cloud app custom-domain
-          - name: bind
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_bind
-            displayName: az spring-cloud app custom-domain bind
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_list
-            displayName: az spring-cloud app custom-domain list
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_show
-            displayName: az spring-cloud app custom-domain show
-          - name: unbind
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_unbind
-            displayName: az spring-cloud app custom-domain unbind
-          - name: update
-            uid: ext_spring-cloud_az_spring_cloud_app_custom_domain_update
-            displayName: az spring-cloud app custom-domain update
+          items: []
         - name: deployment
+          uid: az_spring-cloud_app_deployment
           displayName: az spring-cloud app deployment
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment
-            displayName: az spring-cloud app deployment
-          - name: create
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_create
-            displayName: az spring-cloud app deployment create
-          - name: delete
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_delete
-            displayName: az spring-cloud app deployment delete
-          - name: list
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_list
-            displayName: az spring-cloud app deployment list
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_deployment_show
-            displayName: az spring-cloud app deployment show
+          items: []
         - name: identity
+          uid: az_spring-cloud_app_identity
           displayName: az spring-cloud app identity
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_identity
-            displayName: az spring-cloud app identity
-          - name: assign
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_assign
-            displayName: az spring-cloud app identity assign
-          - name: remove
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_remove
-            displayName: az spring-cloud app identity remove
-          - name: show
-            uid: ext_spring-cloud_az_spring_cloud_app_identity_show
-            displayName: az spring-cloud app identity show
+          items: []
         - name: log
+          uid: az_spring-cloud_app_log
           displayName: az spring-cloud app log
-          items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_app_log
-            displayName: az spring-cloud app log
-          - name: tail
-            uid: ext_spring-cloud_az_spring_cloud_app_log_tail
-            displayName: az spring-cloud app log tail
+          items: []
+      - name: app-insights
+        uid: az_spring-cloud_app-insights
+        displayName: az spring-cloud app-insights
+        items: []
       - name: certificate
+        uid: az_spring-cloud_certificate
         displayName: az spring-cloud certificate
-        items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_certificate
-          displayName: az spring-cloud certificate
-        - name: add
-          uid: ext_spring-cloud_az_spring_cloud_certificate_add
-          displayName: az spring-cloud certificate add
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_certificate_list
-          displayName: az spring-cloud certificate list
-        - name: remove
-          uid: ext_spring-cloud_az_spring_cloud_certificate_remove
-          displayName: az spring-cloud certificate remove
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_certificate_show
-          displayName: az spring-cloud certificate show
+        items: []
       - name: config-server
-        displayName: az spring-cloud config-server
         items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_config_server
+        - name: Summary
+          uid: az_spring-cloud_config-server
           displayName: az spring-cloud config-server
-        - name: clear
-          uid: ext_spring-cloud_az_spring_cloud_config_server_clear
-          displayName: az spring-cloud config-server clear
-        - name: set
-          uid: ext_spring-cloud_az_spring_cloud_config_server_set
-          displayName: az spring-cloud config-server set
-        - name: show
-          uid: ext_spring-cloud_az_spring_cloud_config_server_show
-          displayName: az spring-cloud config-server show
         - name: git
-          displayName: az spring-cloud config-server git
           items:
-          - name: Overview
-            uid: ext_spring-cloud_az_spring_cloud_config_server_git
+          - name: Summary
+            uid: az_spring-cloud_config-server_git
             displayName: az spring-cloud config-server git
-          - name: set
-            uid: ext_spring-cloud_az_spring_cloud_config_server_git_set
-            displayName: az spring-cloud config-server git set
           - name: repo
+            uid: az_spring-cloud_config-server_git_repo
             displayName: az spring-cloud config-server git repo
-            items:
-            - name: Overview
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo
-              displayName: az spring-cloud config-server git repo
-            - name: add
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_add
-              displayName: az spring-cloud config-server git repo add
-            - name: list
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_list
-              displayName: az spring-cloud config-server git repo list
-            - name: remove
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_remove
-              displayName: az spring-cloud config-server git repo remove
-            - name: update
-              uid: ext_spring-cloud_az_spring_cloud_config_server_git_repo_update
-              displayName: az spring-cloud config-server git repo update
+            items: []
       - name: test-endpoint
+        uid: az_spring-cloud_test-endpoint
         displayName: az spring-cloud test-endpoint
-        items:
-        - name: Overview
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint
-          displayName: az spring-cloud test-endpoint
-        - name: disable
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_disable
-          displayName: az spring-cloud test-endpoint disable
-        - name: enable
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_enable
-          displayName: az spring-cloud test-endpoint enable
-        - name: list
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_list
-          displayName: az spring-cloud test-endpoint list
-        - name: renew-key
-          uid: ext_spring-cloud_az_spring_cloud_test_endpoint_renew_key
-          displayName: az spring-cloud test-endpoint renew-key
-  - name: storage-or-preview
+        items: []
+  - name: Azure SQL
     items:
-    - name: Overview
-      uid: ext_storage-or-preview_az
-    - name: Storage
-      displayName: az storage
-      items:
-      - name: Overview
-        uid: ext_storage-or-preview_az_storage
-        displayName: az storage
-      - name: Accounts
-        displayName: az storage account
-        items:
-        - name: Overview
-          uid: ext_storage-or-preview_az_storage_account
-          displayName: az storage account
-        - name: or-policy
-          displayName: az storage account or-policy
-          items:
-          - name: Overview
-            uid: ext_storage-or-preview_az_storage_account_or_policy
-            displayName: az storage account or-policy
-          - name: create
-            uid: ext_storage-or-preview_az_storage_account_or_policy_create
-            displayName: az storage account or-policy create
-          - name: delete
-            uid: ext_storage-or-preview_az_storage_account_or_policy_delete
-            displayName: az storage account or-policy delete
-          - name: list
-            uid: ext_storage-or-preview_az_storage_account_or_policy_list
-            displayName: az storage account or-policy list
-          - name: show
-            uid: ext_storage-or-preview_az_storage_account_or_policy_show
-            displayName: az storage account or-policy show
-          - name: update
-            uid: ext_storage-or-preview_az_storage_account_or_policy_update
-            displayName: az storage account or-policy update
-          - name: rule
-            displayName: az storage account or-policy rule
-            items:
-            - name: Overview
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule
-              displayName: az storage account or-policy rule
-            - name: add
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_add
-              displayName: az storage account or-policy rule add
-            - name: list
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_list
-              displayName: az storage account or-policy rule list
-            - name: remove
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_remove
-              displayName: az storage account or-policy rule remove
-            - name: show
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_show
-              displayName: az storage account or-policy rule show
-            - name: update
-              uid: ext_storage-or-preview_az_storage_account_or_policy_rule_update
-              displayName: az storage account or-policy rule update
-  - name: storage-preview
+    - name: Summary
+      uid: sp-Azure_SQL
+      displayName: Azure SQL
+    - name: sql
+      uid: az_sql
+      displayName: az sql
+      items: []
+  - name: Azure SQL Server
+    items:
+    - name: Summary
+      uid: sp-Azure_SQL_Server
+      displayName: Azure SQL Server
+    - name: sql
+      uid: az_sql
+      displayName: az sql
+      items: []
+  - name: Azure Stack Edge
+    items:
+    - name: Summary
+      uid: sp-Azure_Stack_Edge
+      displayName: Azure Stack Edge
+    - name: databoxedge
+      items:
+      - name: Summary
+        uid: az_databoxedge
+        displayName: az databoxedge
+      - name: alert
+        uid: az_databoxedge_alert
+        displayName: az databoxedge alert
+        items: []
+      - name: bandwidth-schedule
+        uid: az_databoxedge_bandwidth-schedule
+        displayName: az databoxedge bandwidth-schedule
+        items: []
+      - name: device
+        uid: az_databoxedge_device
+        displayName: az databoxedge device
+        items: []
+      - name: order
+        uid: az_databoxedge_order
+        displayName: az databoxedge order
+        items: []
+  - name: Azure Stack HCI
     items:
-    - name: Overview
-      uid: ext_storage-preview_az
-    - name: Storage
-      displayName: az storage
+    - name: Summary
+      uid: sp-Azure_Stack_HCI
+      displayName: Azure Stack HCI
+    - name: stack-hci
+      items:
+      - name: Summary
+        uid: az_stack-hci
+        displayName: az stack-hci
+      - name: cluster
+        uid: az_stack-hci_cluster
+        displayName: az stack-hci cluster
+        items: []
+  - name: Azure Storage
+    items:
+    - name: Summary
+      uid: sp-Azure_Storage
+      displayName: Azure Storage
+    - name: import-export
+      items:
+      - name: Summary
+        uid: az_import-export
+        displayName: az import-export
+      - name: bit-locker-key
+        uid: az_import-export_bit-locker-key
+        displayName: az import-export bit-locker-key
+        items: []
+      - name: location
+        uid: az_import-export_location
+        displayName: az import-export location
+        items: []
+    - name: snapshot
+      uid: az_snapshot
+      displayName: az snapshot
+      items: []
+    - name: storage
       items:
-      - name: Overview
-        uid: ext_storage-preview_az_storage
+      - name: Summary
+        uid: az_storage
         displayName: az storage
-      - name: Accounts
-        displayName: az storage account
+      - name: account
         items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_account
+        - name: Summary
+          uid: az_storage_account
           displayName: az storage account
-        - name: check-name
-          uid: ext_storage-preview_az_storage_account_check_name
-          displayName: az storage account check-name
-        - name: create
-          uid: ext_storage-preview_az_storage_account_create
-          displayName: az storage account create
-        - name: delete
-          uid: ext_storage-preview_az_storage_account_delete
-          displayName: az storage account delete
-        - name: failover
-          uid: ext_storage-preview_az_storage_account_failover
-          displayName: az storage account failover
-        - name: list
-          uid: ext_storage-preview_az_storage_account_list
-          displayName: az storage account list
-        - name: show
-          uid: ext_storage-preview_az_storage_account_show
-          displayName: az storage account show
-        - name: show-usage
-          uid: ext_storage-preview_az_storage_account_show_usage
-          displayName: az storage account show-usage
-        - name: update
-          uid: ext_storage-preview_az_storage_account_update
-          displayName: az storage account update
-        - name: Keys
+        - name: blob-inventory-policy
+          uid: az_storage_account_blob-inventory-policy
+          displayName: az storage account blob-inventory-policy
+          items: []
+        - name: blob-service-properties
+          uid: az_storage_account_blob-service-properties
+          displayName: az storage account blob-service-properties
+          items: []
+        - name: file-service-properties
+          uid: az_storage_account_file-service-properties
+          displayName: az storage account file-service-properties
+          items: []
+        - name: keys
+          uid: az_storage_account_keys
           displayName: az storage account keys
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_keys
-            displayName: az storage account keys
-          - name: list
-            uid: ext_storage-preview_az_storage_account_keys_list
-            displayName: az storage account keys list
-          - name: renew
-            uid: ext_storage-preview_az_storage_account_keys_renew
-            displayName: az storage account keys renew
-        - name: management-policy
-          displayName: az storage account management-policy
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_management_policy
-            displayName: az storage account management-policy
-          - name: create
-            uid: ext_storage-preview_az_storage_account_management_policy_create
-            displayName: az storage account management-policy create
-          - name: delete
-            uid: ext_storage-preview_az_storage_account_management_policy_delete
-            displayName: az storage account management-policy delete
-          - name: show
-            uid: ext_storage-preview_az_storage_account_management_policy_show
-            displayName: az storage account management-policy show
-          - name: update
-            uid: ext_storage-preview_az_storage_account_management_policy_update
-            displayName: az storage account management-policy update
+          items: []
         - name: network-rule
+          uid: az_storage_account_network-rule
           displayName: az storage account network-rule
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_account_network_rule
-            displayName: az storage account network-rule
-          - name: add
-            uid: ext_storage-preview_az_storage_account_network_rule_add
-            displayName: az storage account network-rule add
-          - name: list
-            uid: ext_storage-preview_az_storage_account_network_rule_list
-            displayName: az storage account network-rule list
-          - name: remove
-            uid: ext_storage-preview_az_storage_account_network_rule_remove
-            displayName: az storage account network-rule remove
-      - name: Blob
-        displayName: az storage blob
-        items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_blob
+          items: []
+      - name: azcopy
+        items:
+        - name: Summary
+          uid: az_storage_azcopy
+          displayName: az storage azcopy
+        - name: blob
+          uid: az_storage_azcopy_blob
+          displayName: az storage azcopy blob
+          items: []
+      - name: blob
+        items:
+        - name: Summary
+          uid: az_storage_blob
           displayName: az storage blob
-        - name: list
-          uid: ext_storage-preview_az_storage_blob_list
-          displayName: az storage blob list
-        - name: move
-          uid: ext_storage-preview_az_storage_blob_move
-          displayName: az storage blob move
-        - name: Service properties
-          displayName: az storage blob service-properties
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_service_properties
-            displayName: az storage blob service-properties
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_service_properties_show
-            displayName: az storage blob service-properties show
-          - name: update
-            uid: ext_storage-preview_az_storage_blob_service_properties_update
-            displayName: az storage blob service-properties update
         - name: access
+          uid: az_storage_blob_access
           displayName: az storage blob access
-          items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_access
-            displayName: az storage blob access
-          - name: set
-            uid: ext_storage-preview_az_storage_blob_access_set
-            displayName: az storage blob access set
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_access_show
-            displayName: az storage blob access show
-          - name: update
-            uid: ext_storage-preview_az_storage_blob_access_update
-            displayName: az storage blob access update
+          items: []
+        - name: copy
+          uid: az_storage_blob_copy
+          displayName: az storage blob copy
+          items: []
         - name: directory
-          displayName: az storage blob directory
           items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_blob_directory
+          - name: Summary
+            uid: az_storage_blob_directory
             displayName: az storage blob directory
-          - name: create
-            uid: ext_storage-preview_az_storage_blob_directory_create
-            displayName: az storage blob directory create
-          - name: delete
-            uid: ext_storage-preview_az_storage_blob_directory_delete
-            displayName: az storage blob directory delete
-          - name: download
-            uid: ext_storage-preview_az_storage_blob_directory_download
-            displayName: az storage blob directory download
-          - name: exists
-            uid: ext_storage-preview_az_storage_blob_directory_exists
-            displayName: az storage blob directory exists
-          - name: list
-            uid: ext_storage-preview_az_storage_blob_directory_list
-            displayName: az storage blob directory list
-          - name: move
-            uid: ext_storage-preview_az_storage_blob_directory_move
-            displayName: az storage blob directory move
-          - name: show
-            uid: ext_storage-preview_az_storage_blob_directory_show
-            displayName: az storage blob directory show
-          - name: upload
-            uid: ext_storage-preview_az_storage_blob_directory_upload
-            displayName: az storage blob directory upload
           - name: access
+            uid: az_storage_blob_directory_access
             displayName: az storage blob directory access
-            items:
-            - name: Overview
-              uid: ext_storage-preview_az_storage_blob_directory_access
-              displayName: az storage blob directory access
-            - name: set
-              uid: ext_storage-preview_az_storage_blob_directory_access_set
-              displayName: az storage blob directory access set
-            - name: show
-              uid: ext_storage-preview_az_storage_blob_directory_access_show
-              displayName: az storage blob directory access show
-            - name: update
-              uid: ext_storage-preview_az_storage_blob_directory_access_update
-              displayName: az storage blob directory access update
+            items: []
           - name: metadata
+            uid: az_storage_blob_directory_metadata
             displayName: az storage blob directory metadata
-            items:
-            - name: Overview
-              uid: ext_storage-preview_az_storage_blob_directory_metadata
-              displayName: az storage blob directory metadata
-            - name: show
-              uid: ext_storage-preview_az_storage_blob_directory_metadata_show
-              displayName: az storage blob directory metadata show
-            - name: update
-              uid: ext_storage-preview_az_storage_blob_directory_metadata_update
-              displayName: az storage blob directory metadata update
-      - name: azcopy
-        displayName: az storage azcopy
-        items:
-        - name: Overview
-          uid: ext_storage-preview_az_storage_azcopy
-          displayName: az storage azcopy
-        - name: run-command
-          uid: ext_storage-preview_az_storage_azcopy_run_command
-          displayName: az storage azcopy run-command
-        - name: blob
-          displayName: az storage azcopy blob
+            items: []
+        - name: incremental-copy
+          uid: az_storage_blob_incremental-copy
+          displayName: az storage blob incremental-copy
+          items: []
+        - name: lease
+          uid: az_storage_blob_lease
+          displayName: az storage blob lease
+          items: []
+        - name: metadata
+          uid: az_storage_blob_metadata
+          displayName: az storage blob metadata
+          items: []
+        - name: service-properties
           items:
-          - name: Overview
-            uid: ext_storage-preview_az_storage_azcopy_blob
-            displayName: az storage azcopy blob
-          - name: delete
-            uid: ext_storage-preview_az_storage_azcopy_blob_delete
-            displayName: az storage azcopy blob delete
-          - name: download
-            uid: ext_storage-preview_az_storage_azcopy_blob_download
-            displayName: az storage azcopy blob download
-          - name: sync
-            uid: ext_storage-preview_az_storage_azcopy_blob_sync
-            displayName: az storage azcopy blob sync
-          - name: upload
-            uid: ext_storage-preview_az_storage_azcopy_blob_upload
-            displayName: az storage azcopy blob upload
-  - name: storagesync
-    items:
-    - name: Overview
-      uid: ext_storagesync_az
-    - name: storagesync
-      displayName: az storagesync
-      items:
-      - name: Overview
-        uid: ext_storagesync_az_storagesync
-        displayName: az storagesync
-      - name: create
-        uid: ext_storagesync_az_storagesync_create
-        displayName: az storagesync create
-      - name: delete
-        uid: ext_storagesync_az_storagesync_delete
-        displayName: az storagesync delete
-      - name: list
-        uid: ext_storagesync_az_storagesync_list
-        displayName: az storagesync list
-      - name: show
-        uid: ext_storagesync_az_storagesync_show
-        displayName: az storagesync show
-      - name: registered-server
-        displayName: az storagesync registered-server
+          - name: Summary
+            uid: az_storage_blob_service-properties
+            displayName: az storage blob service-properties
+          - name: delete-policy
+            uid: az_storage_blob_service-properties_delete-policy
+            displayName: az storage blob service-properties delete-policy
+            items: []
+        - name: tag
+          uid: az_storage_blob_tag
+          displayName: az storage blob tag
+          items: []
+      - name: container
         items:
-        - name: Overview
-          uid: ext_storagesync_az_storagesync_registered_server
-          displayName: az storagesync registered-server
-        - name: delete
-          uid: ext_storagesync_az_storagesync_registered_server_delete
-          displayName: az storagesync registered-server delete
-        - name: list
-          uid: ext_storagesync_az_storagesync_registered_server_list
-          displayName: az storagesync registered-server list
-        - name: show
-          uid: ext_storagesync_az_storagesync_registered_server_show
-          displayName: az storagesync registered-server show
-        - name: wait
-          uid: ext_storagesync_az_storagesync_registered_server_wait
-          displayName: az storagesync registered-server wait
-      - name: sync-group
-        displayName: az storagesync sync-group
+        - name: Summary
+          uid: az_storage_container
+          displayName: az storage container
+        - name: lease
+          uid: az_storage_container_lease
+          displayName: az storage container lease
+          items: []
+        - name: metadata
+          uid: az_storage_container_metadata
+          displayName: az storage container metadata
+          items: []
+        - name: policy
+          uid: az_storage_container_policy
+          displayName: az storage container policy
+          items: []
+      - name: storage cors - Cross-origin resource sharing
+        uid: az_storage_cors
+        displayName: az storage cors
+        items: []
+      - name: directory
         items:
-        - name: Overview
-          uid: ext_storagesync_az_storagesync_sync_group
-          displayName: az storagesync sync-group
-        - name: create
-          uid: ext_storagesync_az_storagesync_sync_group_create
-          displayName: az storagesync sync-group create
-        - name: delete
-          uid: ext_storagesync_az_storagesync_sync_group_delete
-          displayName: az storagesync sync-group delete
-        - name: list
-          uid: ext_storagesync_az_storagesync_sync_group_list
-          displayName: az storagesync sync-group list
-        - name: show
-          uid: ext_storagesync_az_storagesync_sync_group_show
-          displayName: az storagesync sync-group show
-        - name: cloud-endpoint
-          displayName: az storagesync sync-group cloud-endpoint
-          items:
-          - name: Overview
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint
-            displayName: az storagesync sync-group cloud-endpoint
-          - name: create
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_create
-            displayName: az storagesync sync-group cloud-endpoint create
-          - name: delete
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_delete
-            displayName: az storagesync sync-group cloud-endpoint delete
-          - name: list
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_list
-            displayName: az storagesync sync-group cloud-endpoint list
-          - name: show
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_show
-            displayName: az storagesync sync-group cloud-endpoint show
-          - name: wait
-            uid: ext_storagesync_az_storagesync_sync_group_cloud_endpoint_wait
-            displayName: az storagesync sync-group cloud-endpoint wait
-        - name: server-endpoint
-          displayName: az storagesync sync-group server-endpoint
-          items:
-          - name: Overview
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint
-            displayName: az storagesync sync-group server-endpoint
-          - name: create
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_create
-            displayName: az storagesync sync-group server-endpoint create
-          - name: delete
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_delete
-            displayName: az storagesync sync-group server-endpoint delete
-          - name: list
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_list
-            displayName: az storagesync sync-group server-endpoint list
-          - name: show
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_show
-            displayName: az storagesync sync-group server-endpoint show
-          - name: update
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_update
-            displayName: az storagesync sync-group server-endpoint update
-          - name: wait
-            uid: ext_storagesync_az_storagesync_sync_group_server_endpoint_wait
-            displayName: az storagesync sync-group server-endpoint wait
-  - name: stream-analytics
+        - name: Summary
+          uid: az_storage_directory
+          displayName: az storage directory
+        - name: metadata
+          uid: az_storage_directory_metadata
+          displayName: az storage directory metadata
+          items: []
+      - name: entity
+        uid: az_storage_entity
+        displayName: az storage entity
+        items: []
+      - name: file
+        items:
+        - name: Summary
+          uid: az_storage_file
+          displayName: az storage file
+        - name: copy
+          uid: az_storage_file_copy
+          displayName: az storage file copy
+          items: []
+        - name: metadata
+          uid: az_storage_file_metadata
+          displayName: az storage file metadata
+          items: []
+      - name: fs
+        items:
+        - name: Summary
+          uid: az_storage_fs
+          displayName: az storage fs
+        - name: service-properties
+          uid: az_storage_fs_service-properties
+          displayName: az storage fs service-properties
+          items: []
+      - name: logging
+        uid: az_storage_logging
+        displayName: az storage logging
+        items: []
+      - name: message
+        uid: az_storage_message
+        displayName: az storage message
+        items: []
+      - name: metrics
+        uid: az_storage_metrics
+        displayName: az storage metrics
+        items: []
+      - name: queue
+        items:
+        - name: Summary
+          uid: az_storage_queue
+          displayName: az storage queue
+        - name: metadata
+          uid: az_storage_queue_metadata
+          displayName: az storage queue metadata
+          items: []
+        - name: policy
+          uid: az_storage_queue_policy
+          displayName: az storage queue policy
+          items: []
+      - name: share
+        items:
+        - name: Summary
+          uid: az_storage_share
+          displayName: az storage share
+        - name: metadata
+          uid: az_storage_share_metadata
+          displayName: az storage share metadata
+          items: []
+        - name: policy
+          uid: az_storage_share_policy
+          displayName: az storage share policy
+          items: []
+      - name: table
+        items:
+        - name: Summary
+          uid: az_storage_table
+          displayName: az storage table
+        - name: policy
+          uid: az_storage_table_policy
+          displayName: az storage table policy
+          items: []
+  - name: Azure Stream Analytics
     items:
-    - name: Overview
-      uid: ext_stream-analytics_az
+    - name: Summary
+      uid: sp-Azure_Stream_Analytics
+      displayName: Azure Stream Analytics
     - name: stream-analytics
-      displayName: az stream-analytics
       items:
-      - name: Overview
-        uid: ext_stream-analytics_az_stream_analytics
+      - name: Summary
+        uid: az_stream-analytics
         displayName: az stream-analytics
       - name: function
+        uid: az_stream-analytics_function
         displayName: az stream-analytics function
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_function
-          displayName: az stream-analytics function
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_function_create
-          displayName: az stream-analytics function create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_function_delete
-          displayName: az stream-analytics function delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_function_list
-          displayName: az stream-analytics function list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_function_show
-          displayName: az stream-analytics function show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_function_test
-          displayName: az stream-analytics function test
+        items: []
       - name: input
+        uid: az_stream-analytics_input
         displayName: az stream-analytics input
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_input
-          displayName: az stream-analytics input
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_input_create
-          displayName: az stream-analytics input create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_input_delete
-          displayName: az stream-analytics input delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_input_list
-          displayName: az stream-analytics input list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_input_show
-          displayName: az stream-analytics input show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_input_test
-          displayName: az stream-analytics input test
+        items: []
       - name: job
+        uid: az_stream-analytics_job
         displayName: az stream-analytics job
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_job
-          displayName: az stream-analytics job
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_job_create
-          displayName: az stream-analytics job create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_job_delete
-          displayName: az stream-analytics job delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_job_list
-          displayName: az stream-analytics job list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_job_show
-          displayName: az stream-analytics job show
-        - name: start
-          uid: ext_stream-analytics_az_stream_analytics_job_start
-          displayName: az stream-analytics job start
-        - name: stop
-          uid: ext_stream-analytics_az_stream_analytics_job_stop
-          displayName: az stream-analytics job stop
-        - name: update
-          uid: ext_stream-analytics_az_stream_analytics_job_update
-          displayName: az stream-analytics job update
-        - name: wait
-          uid: ext_stream-analytics_az_stream_analytics_job_wait
-          displayName: az stream-analytics job wait
+        items: []
       - name: output
+        uid: az_stream-analytics_output
         displayName: az stream-analytics output
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_output
-          displayName: az stream-analytics output
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_output_create
-          displayName: az stream-analytics output create
-        - name: delete
-          uid: ext_stream-analytics_az_stream_analytics_output_delete
-          displayName: az stream-analytics output delete
-        - name: list
-          uid: ext_stream-analytics_az_stream_analytics_output_list
-          displayName: az stream-analytics output list
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_output_show
-          displayName: az stream-analytics output show
-        - name: test
-          uid: ext_stream-analytics_az_stream_analytics_output_test
-          displayName: az stream-analytics output test
+        items: []
       - name: quota
+        uid: az_stream-analytics_quota
         displayName: az stream-analytics quota
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_quota
-          displayName: az stream-analytics quota
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_quota_show
-          displayName: az stream-analytics quota show
+        items: []
       - name: transformation
+        uid: az_stream-analytics_transformation
         displayName: az stream-analytics transformation
-        items:
-        - name: Overview
-          uid: ext_stream-analytics_az_stream_analytics_transformation
-          displayName: az stream-analytics transformation
-        - name: create
-          uid: ext_stream-analytics_az_stream_analytics_transformation_create
-          displayName: az stream-analytics transformation create
-        - name: show
-          uid: ext_stream-analytics_az_stream_analytics_transformation_show
-          displayName: az stream-analytics transformation show
-        - name: update
-          uid: ext_stream-analytics_az_stream_analytics_transformation_update
-          displayName: az stream-analytics transformation update
-  - name: subscription
+        items: []
+  - name: Azure Support
     items:
-    - name: Overview
-      uid: ext_subscription_az
-    - name: Subscriptions
-      displayName: az account
-      items:
-      - name: Overview
-        uid: ext_subscription_az_account
-        displayName: az account
-      - name: create
-        uid: ext_subscription_az_account_create
-        displayName: az account create
-  - name: support
-    items:
-    - name: Overview
-      uid: ext_support_az
+    - name: Summary
+      uid: sp-Azure_Support
+      displayName: Azure Support
     - name: support
-      displayName: az support
       items:
-      - name: Overview
-        uid: ext_support_az_support
+      - name: Summary
+        uid: az_support
         displayName: az support
       - name: services
-        displayName: az support services
         items:
-        - name: Overview
-          uid: ext_support_az_support_services
+        - name: Summary
+          uid: az_support_services
           displayName: az support services
-        - name: list
-          uid: ext_support_az_support_services_list
-          displayName: az support services list
-        - name: show
-          uid: ext_support_az_support_services_show
-          displayName: az support services show
         - name: problem-classifications
+          uid: az_support_services_problem-classifications
           displayName: az support services problem-classifications
-          items:
-          - name: Overview
-            uid: ext_support_az_support_services_problem_classifications
-            displayName: az support services problem-classifications
-          - name: list
-            uid: ext_support_az_support_services_problem_classifications_list
-            displayName: az support services problem-classifications list
-          - name: show
-            uid: ext_support_az_support_services_problem_classifications_show
-            displayName: az support services problem-classifications show
+          items: []
       - name: tickets
-        displayName: az support tickets
         items:
-        - name: Overview
-          uid: ext_support_az_support_tickets
+        - name: Summary
+          uid: az_support_tickets
           displayName: az support tickets
-        - name: create
-          uid: ext_support_az_support_tickets_create
-          displayName: az support tickets create
-        - name: list
-          uid: ext_support_az_support_tickets_list
-          displayName: az support tickets list
-        - name: show
-          uid: ext_support_az_support_tickets_show
-          displayName: az support tickets show
-        - name: update
-          uid: ext_support_az_support_tickets_update
-          displayName: az support tickets update
         - name: communications
+          uid: az_support_tickets_communications
           displayName: az support tickets communications
-          items:
-          - name: Overview
-            uid: ext_support_az_support_tickets_communications
-            displayName: az support tickets communications
-          - name: create
-            uid: ext_support_az_support_tickets_communications_create
-            displayName: az support tickets communications create
-          - name: list
-            uid: ext_support_az_support_tickets_communications_list
-            displayName: az support tickets communications list
-          - name: show
-            uid: ext_support_az_support_tickets_communications_show
-            displayName: az support tickets communications show
-  - name: synapse
+          items: []
+  - name: Azure Synapse Analytics
     items:
-    - name: Overview
-      uid: ext_synapse_az
+    - name: Summary
+      uid: sp-Azure_Synapse_Analytics
+      displayName: Azure Synapse Analytics
     - name: synapse
-      displayName: az synapse
       items:
-      - name: Overview
-        uid: ext_synapse_az_synapse
+      - name: Summary
+        uid: az_synapse
         displayName: az synapse
+      - name: activity-run
+        uid: az_synapse_activity-run
+        displayName: az synapse activity-run
+        items: []
+      - name: data-flow
+        uid: az_synapse_data-flow
+        displayName: az synapse data-flow
+        items: []
+      - name: dataset
+        uid: az_synapse_dataset
+        displayName: az synapse dataset
+        items: []
+      - name: integration-runtime
+        uid: az_synapse_integration-runtime
+        displayName: az synapse integration-runtime
+        items: []
+      - name: integration-runtime-node
+        uid: az_synapse_integration-runtime-node
+        displayName: az synapse integration-runtime-node
+        items: []
+      - name: linked-service
+        uid: az_synapse_linked-service
+        displayName: az synapse linked-service
+        items: []
+      - name: notebook
+        uid: az_synapse_notebook
+        displayName: az synapse notebook
+        items: []
+      - name: pipeline
+        uid: az_synapse_pipeline
+        displayName: az synapse pipeline
+        items: []
+      - name: pipeline-run
+        uid: az_synapse_pipeline-run
+        displayName: az synapse pipeline-run
+        items: []
+      - name: role
+        items:
+        - name: Summary
+          uid: az_synapse_role
+          displayName: az synapse role
+        - name: assignment
+          uid: az_synapse_role_assignment
+          displayName: az synapse role assignment
+          items: []
+        - name: definition
+          uid: az_synapse_role_definition
+          displayName: az synapse role definition
+          items: []
+        - name: scope
+          uid: az_synapse_role_scope
+          displayName: az synapse role scope
+          items: []
       - name: spark
-        displayName: az synapse spark
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_spark
+        - name: Summary
+          uid: az_synapse_spark
           displayName: az synapse spark
         - name: job
+          uid: az_synapse_spark_job
           displayName: az synapse spark job
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_job
-            displayName: az synapse spark job
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_job_cancel
-            displayName: az synapse spark job cancel
-          - name: list
-            uid: ext_synapse_az_synapse_spark_job_list
-            displayName: az synapse spark job list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_job_show
-            displayName: az synapse spark job show
-          - name: submit
-            uid: ext_synapse_az_synapse_spark_job_submit
-            displayName: az synapse spark job submit
+          items: []
         - name: pool
+          uid: az_synapse_spark_pool
           displayName: az synapse spark pool
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_pool
-            displayName: az synapse spark pool
-          - name: create
-            uid: ext_synapse_az_synapse_spark_pool_create
-            displayName: az synapse spark pool create
-          - name: delete
-            uid: ext_synapse_az_synapse_spark_pool_delete
-            displayName: az synapse spark pool delete
-          - name: list
-            uid: ext_synapse_az_synapse_spark_pool_list
-            displayName: az synapse spark pool list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_pool_show
-            displayName: az synapse spark pool show
-          - name: update
-            uid: ext_synapse_az_synapse_spark_pool_update
-            displayName: az synapse spark pool update
-          - name: wait
-            uid: ext_synapse_az_synapse_spark_pool_wait
-            displayName: az synapse spark pool wait
+          items: []
         - name: session
+          uid: az_synapse_spark_session
           displayName: az synapse spark session
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_session
-            displayName: az synapse spark session
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_session_cancel
-            displayName: az synapse spark session cancel
-          - name: create
-            uid: ext_synapse_az_synapse_spark_session_create
-            displayName: az synapse spark session create
-          - name: list
-            uid: ext_synapse_az_synapse_spark_session_list
-            displayName: az synapse spark session list
-          - name: reset-timeout
-            uid: ext_synapse_az_synapse_spark_session_reset_timeout
-            displayName: az synapse spark session reset-timeout
-          - name: show
-            uid: ext_synapse_az_synapse_spark_session_show
-            displayName: az synapse spark session show
+          items: []
         - name: statement
+          uid: az_synapse_spark_statement
           displayName: az synapse spark statement
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_spark_statement
-            displayName: az synapse spark statement
-          - name: cancel
-            uid: ext_synapse_az_synapse_spark_statement_cancel
-            displayName: az synapse spark statement cancel
-          - name: invoke
-            uid: ext_synapse_az_synapse_spark_statement_invoke
-            displayName: az synapse spark statement invoke
-          - name: list
-            uid: ext_synapse_az_synapse_spark_statement_list
-            displayName: az synapse spark statement list
-          - name: show
-            uid: ext_synapse_az_synapse_spark_statement_show
-            displayName: az synapse spark statement show
+          items: []
       - name: sql
-        displayName: az synapse sql
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_sql
+        - name: Summary
+          uid: az_synapse_sql
           displayName: az synapse sql
+        - name: ad-admin
+          uid: az_synapse_sql_ad-admin
+          displayName: az synapse sql ad-admin
+          items: []
+        - name: audit-policy
+          uid: az_synapse_sql_audit-policy
+          displayName: az synapse sql audit-policy
+          items: []
         - name: pool
-          displayName: az synapse sql pool
           items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_sql_pool
+          - name: Summary
+            uid: az_synapse_sql_pool
             displayName: az synapse sql pool
-          - name: create
-            uid: ext_synapse_az_synapse_sql_pool_create
-            displayName: az synapse sql pool create
-          - name: delete
-            uid: ext_synapse_az_synapse_sql_pool_delete
-            displayName: az synapse sql pool delete
-          - name: list
-            uid: ext_synapse_az_synapse_sql_pool_list
-            displayName: az synapse sql pool list
-          - name: pause
-            uid: ext_synapse_az_synapse_sql_pool_pause
-            displayName: az synapse sql pool pause
-          - name: resume
-            uid: ext_synapse_az_synapse_sql_pool_resume
-            displayName: az synapse sql pool resume
-          - name: show
-            uid: ext_synapse_az_synapse_sql_pool_show
-            displayName: az synapse sql pool show
-          - name: update
-            uid: ext_synapse_az_synapse_sql_pool_update
-            displayName: az synapse sql pool update
-          - name: wait
-            uid: ext_synapse_az_synapse_sql_pool_wait
-            displayName: az synapse sql pool wait
+          - name: audit-policy
+            uid: az_synapse_sql_pool_audit-policy
+            displayName: az synapse sql pool audit-policy
+            items: []
+          - name: classification
+            items:
+            - name: Summary
+              uid: az_synapse_sql_pool_classification
+              displayName: az synapse sql pool classification
+            - name: recommendation
+              uid: az_synapse_sql_pool_classification_recommendation
+              displayName: az synapse sql pool classification recommendation
+              items: []
+          - name: tde
+            uid: az_synapse_sql_pool_tde
+            displayName: az synapse sql pool tde
+            items: []
+          - name: threat-policy
+            uid: az_synapse_sql_pool_threat-policy
+            displayName: az synapse sql pool threat-policy
+            items: []
+      - name: trigger
+        uid: az_synapse_trigger
+        displayName: az synapse trigger
+        items: []
+      - name: trigger-run
+        uid: az_synapse_trigger-run
+        displayName: az synapse trigger-run
+        items: []
       - name: workspace
-        displayName: az synapse workspace
         items:
-        - name: Overview
-          uid: ext_synapse_az_synapse_workspace
+        - name: Summary
+          uid: az_synapse_workspace
           displayName: az synapse workspace
-        - name: check-name
-          uid: ext_synapse_az_synapse_workspace_check_name
-          displayName: az synapse workspace check-name
-        - name: create
-          uid: ext_synapse_az_synapse_workspace_create
-          displayName: az synapse workspace create
-        - name: delete
-          uid: ext_synapse_az_synapse_workspace_delete
-          displayName: az synapse workspace delete
-        - name: list
-          uid: ext_synapse_az_synapse_workspace_list
-          displayName: az synapse workspace list
-        - name: show
-          uid: ext_synapse_az_synapse_workspace_show
-          displayName: az synapse workspace show
-        - name: update
-          uid: ext_synapse_az_synapse_workspace_update
-          displayName: az synapse workspace update
-        - name: wait
-          uid: ext_synapse_az_synapse_workspace_wait
-          displayName: az synapse workspace wait
         - name: firewall-rule
+          uid: az_synapse_workspace_firewall-rule
           displayName: az synapse workspace firewall-rule
-          items:
-          - name: Overview
-            uid: ext_synapse_az_synapse_workspace_firewall_rule
-            displayName: az synapse workspace firewall-rule
-          - name: create
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_create
-            displayName: az synapse workspace firewall-rule create
-          - name: delete
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_delete
-            displayName: az synapse workspace firewall-rule delete
-          - name: list
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_list
-            displayName: az synapse workspace firewall-rule list
-          - name: show
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_show
-            displayName: az synapse workspace firewall-rule show
-          - name: wait
-            uid: ext_synapse_az_synapse_workspace_firewall_rule_wait
-            displayName: az synapse workspace firewall-rule wait
-  - name: timeseriesinsights
+          items: []
+        - name: key
+          uid: az_synapse_workspace_key
+          displayName: az synapse workspace key
+          items: []
+        - name: managed-identity
+          uid: az_synapse_workspace_managed-identity
+          displayName: az synapse workspace managed-identity
+          items: []
+  - name: Azure Time Series Insights
     items:
-    - name: Overview
-      uid: ext_timeseriesinsights_az
-    - name: timeseriesinsights
-      displayName: az timeseriesinsights
-      items:
-      - name: Overview
-        uid: ext_timeseriesinsights_az_timeseriesinsights
-        displayName: az timeseriesinsights
+    - name: Summary
+      uid: sp-Azure_Time_Series_Insights
+      displayName: Azure Time Series Insights
+    - name: tsi
+      items:
+      - name: Summary
+        uid: az_tsi
+        displayName: az tsi
       - name: access-policy
-        displayName: az timeseriesinsights access-policy
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy
-          displayName: az timeseriesinsights access-policy
-        - name: create
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_create
-          displayName: az timeseriesinsights access-policy create
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_delete
-          displayName: az timeseriesinsights access-policy delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_list
-          displayName: az timeseriesinsights access-policy list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_show
-          displayName: az timeseriesinsights access-policy show
-        - name: update
-          uid: ext_timeseriesinsights_az_timeseriesinsights_access_policy_update
-          displayName: az timeseriesinsights access-policy update
+        uid: az_tsi_access-policy
+        displayName: az tsi access-policy
+        items: []
       - name: environment
-        displayName: az timeseriesinsights environment
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment
-          displayName: az timeseriesinsights environment
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_delete
-          displayName: az timeseriesinsights environment delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_list
-          displayName: az timeseriesinsights environment list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_environment_show
-          displayName: az timeseriesinsights environment show
-        - name: longterm
-          displayName: az timeseriesinsights environment longterm
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm
-            displayName: az timeseriesinsights environment longterm
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_create
-            displayName: az timeseriesinsights environment longterm create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_longterm_update
-            displayName: az timeseriesinsights environment longterm update
-        - name: standard
-          displayName: az timeseriesinsights environment standard
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard
-            displayName: az timeseriesinsights environment standard
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_create
-            displayName: az timeseriesinsights environment standard create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_environment_standard_update
-            displayName: az timeseriesinsights environment standard update
+        items:
+        - name: Summary
+          uid: az_tsi_environment
+          displayName: az tsi environment
+        - name: gen1
+          uid: az_tsi_environment_gen1
+          displayName: az tsi environment gen1
+          items: []
+        - name: gen2
+          uid: az_tsi_environment_gen2
+          displayName: az tsi environment gen2
+          items: []
       - name: event-source
-        displayName: az timeseriesinsights event-source
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source
-          displayName: az timeseriesinsights event-source
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_delete
-          displayName: az timeseriesinsights event-source delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_list
-          displayName: az timeseriesinsights event-source list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_show
-          displayName: az timeseriesinsights event-source show
+        items:
+        - name: Summary
+          uid: az_tsi_event-source
+          displayName: az tsi event-source
         - name: eventhub
-          displayName: az timeseriesinsights event-source eventhub
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub
-            displayName: az timeseriesinsights event-source eventhub
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_create
-            displayName: az timeseriesinsights event-source eventhub create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_eventhub_update
-            displayName: az timeseriesinsights event-source eventhub update
+          uid: az_tsi_event-source_eventhub
+          displayName: az tsi event-source eventhub
+          items: []
         - name: iothub
-          displayName: az timeseriesinsights event-source iothub
-          items:
-          - name: Overview
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub
-            displayName: az timeseriesinsights event-source iothub
-          - name: create
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_create
-            displayName: az timeseriesinsights event-source iothub create
-          - name: update
-            uid: ext_timeseriesinsights_az_timeseriesinsights_event_source_iothub_update
-            displayName: az timeseriesinsights event-source iothub update
+          uid: az_tsi_event-source_iothub
+          displayName: az tsi event-source iothub
+          items: []
       - name: reference-data-set
-        displayName: az timeseriesinsights reference-data-set
-        items:
-        - name: Overview
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set
-          displayName: az timeseriesinsights reference-data-set
-        - name: create
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_create
-          displayName: az timeseriesinsights reference-data-set create
-        - name: delete
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_delete
-          displayName: az timeseriesinsights reference-data-set delete
-        - name: list
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_list
-          displayName: az timeseriesinsights reference-data-set list
-        - name: show
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_show
-          displayName: az timeseriesinsights reference-data-set show
-        - name: update
-          uid: ext_timeseriesinsights_az_timeseriesinsights_reference_data_set_update
-          displayName: az timeseriesinsights reference-data-set update
-  - name: virtual-network-tap
+        uid: az_tsi_reference-data-set
+        displayName: az tsi reference-data-set
+        items: []
+  - name: Azure Virtual Machine scale sets
     items:
-    - name: Overview
-      uid: ext_virtual-network-tap_az
-    - name: Networking
-      displayName: az network
-      items:
-      - name: Overview
-        uid: ext_virtual-network-tap_az_network
-        displayName: az network
-      - name: Network interfaces
-        displayName: az network nic
+    - name: Summary
+      uid: sp-Azure_Virtual_Machine_scale_sets
+      displayName: Azure Virtual Machine scale sets
+    - name: vmss - VM Scale Sets
+      items:
+      - name: Summary
+        uid: az_vmss
+        displayName: az vmss
+      - name: diagnostics
+        uid: az_vmss_diagnostics
+        displayName: az vmss diagnostics
+        items: []
+      - name: disk
+        uid: az_vmss_disk
+        displayName: az vmss disk
+        items: []
+      - name: encryption
+        uid: az_vmss_encryption
+        displayName: az vmss encryption
+        items: []
+      - name: extension
         items:
-        - name: Overview
-          uid: ext_virtual-network-tap_az_network_nic
-          displayName: az network nic
-        - name: vtap-config
-          displayName: az network nic vtap-config
-          items:
-          - name: Overview
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config
-            displayName: az network nic vtap-config
-          - name: create
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_create
-            displayName: az network nic vtap-config create
-          - name: delete
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_delete
-            displayName: az network nic vtap-config delete
-          - name: list
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_list
-            displayName: az network nic vtap-config list
-          - name: show
-            uid: ext_virtual-network-tap_az_network_nic_vtap_config_show
-            displayName: az network nic vtap-config show
-      - name: Virtual Network
-        displayName: az network vnet
-        items:
-        - name: Overview
-          uid: ext_virtual-network-tap_az_network_vnet
-          displayName: az network vnet
-        - name: tap
-          displayName: az network vnet tap
-          items:
-          - name: Overview
-            uid: ext_virtual-network-tap_az_network_vnet_tap
-            displayName: az network vnet tap
-          - name: create
-            uid: ext_virtual-network-tap_az_network_vnet_tap_create
-            displayName: az network vnet tap create
-          - name: delete
-            uid: ext_virtual-network-tap_az_network_vnet_tap_delete
-            displayName: az network vnet tap delete
-          - name: list
-            uid: ext_virtual-network-tap_az_network_vnet_tap_list
-            displayName: az network vnet tap list
-          - name: show
-            uid: ext_virtual-network-tap_az_network_vnet_tap_show
-            displayName: az network vnet tap show
-          - name: update
-            uid: ext_virtual-network-tap_az_network_vnet_tap_update
-            displayName: az network vnet tap update
-  - name: virtual-wan
+        - name: Summary
+          uid: az_vmss_extension
+          displayName: az vmss extension
+        - name: image
+          uid: az_vmss_extension_image
+          displayName: az vmss extension image
+          items: []
+      - name: identity
+        uid: az_vmss_identity
+        displayName: az vmss identity
+        items: []
+      - name: nic
+        uid: az_vmss_nic
+        displayName: az vmss nic
+        items: []
+      - name: rolling-upgrade
+        uid: az_vmss_rolling-upgrade
+        displayName: az vmss rolling-upgrade
+        items: []
+  - name: Azure Virtual Machines
     items:
-    - name: Overview
-      uid: ext_virtual-wan_az
-    - name: Networking
-      displayName: az network
+    - name: Summary
+      uid: sp-Azure_Virtual_Machines
+      displayName: Azure Virtual Machines
+    - name: desktopvirtualization
+      items:
+      - name: Summary
+        uid: az_desktopvirtualization
+        displayName: az desktopvirtualization
+      - name: applicationgroup
+        uid: az_desktopvirtualization_applicationgroup
+        displayName: az desktopvirtualization applicationgroup
+        items: []
+      - name: hostpool
+        uid: az_desktopvirtualization_hostpool
+        displayName: az desktopvirtualization hostpool
+        items: []
+      - name: workspace
+        uid: az_desktopvirtualization_workspace
+        displayName: az desktopvirtualization workspace
+        items: []
+    - name: image - VM Images
       items:
-      - name: Overview
-        uid: ext_virtual-wan_az_network
-        displayName: az network
-      - name: vhub
-        displayName: az network vhub
+      - name: Summary
+        uid: az_image
+        displayName: az image
+      - name: builder
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vhub
-          displayName: az network vhub
-        - name: create
-          uid: ext_virtual-wan_az_network_vhub_create
-          displayName: az network vhub create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vhub_delete
-          displayName: az network vhub delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vhub_list
-          displayName: az network vhub list
-        - name: show
-          uid: ext_virtual-wan_az_network_vhub_show
-          displayName: az network vhub show
-        - name: update
-          uid: ext_virtual-wan_az_network_vhub_update
-          displayName: az network vhub update
-        - name: connection
-          displayName: az network vhub connection
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_connection
-            displayName: az network vhub connection
-          - name: create
-            uid: ext_virtual-wan_az_network_vhub_connection_create
-            displayName: az network vhub connection create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vhub_connection_delete
-            displayName: az network vhub connection delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_connection_list
-            displayName: az network vhub connection list
-          - name: show
-            uid: ext_virtual-wan_az_network_vhub_connection_show
-            displayName: az network vhub connection show
-        - name: route
-          displayName: az network vhub route
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_route
-            displayName: az network vhub route
-          - name: add
-            uid: ext_virtual-wan_az_network_vhub_route_add
-            displayName: az network vhub route add
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_route_list
-            displayName: az network vhub route list
-          - name: remove
-            uid: ext_virtual-wan_az_network_vhub_route_remove
-            displayName: az network vhub route remove
-        - name: route-table
-          displayName: az network vhub route-table
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vhub_route_table
-            displayName: az network vhub route-table
-          - name: create
-            uid: ext_virtual-wan_az_network_vhub_route_table_create
-            displayName: az network vhub route-table create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vhub_route_table_delete
-            displayName: az network vhub route-table delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vhub_route_table_list
-            displayName: az network vhub route-table list
-          - name: show
-            uid: ext_virtual-wan_az_network_vhub_route_table_show
-            displayName: az network vhub route-table show
-          - name: update
-            uid: ext_virtual-wan_az_network_vhub_route_table_update
-            displayName: az network vhub route-table update
-          - name: route
-            displayName: az network vhub route-table route
-            items:
-            - name: Overview
-              uid: ext_virtual-wan_az_network_vhub_route_table_route
-              displayName: az network vhub route-table route
-            - name: add
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_add
-              displayName: az network vhub route-table route add
-            - name: list
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_list
-              displayName: az network vhub route-table route list
-            - name: remove
-              uid: ext_virtual-wan_az_network_vhub_route_table_route_remove
-              displayName: az network vhub route-table route remove
-      - name: vpn-gateway
-        displayName: az network vpn-gateway
+        - name: Summary
+          uid: az_image_builder
+          displayName: az image builder
+        - name: customizer
+          uid: az_image_builder_customizer
+          displayName: az image builder customizer
+          items: []
+        - name: output
+          uid: az_image_builder_output
+          displayName: az image builder output
+          items: []
+    - name: maintenance
+      items:
+      - name: Summary
+        uid: az_maintenance
+        displayName: az maintenance
+      - name: applyupdate
+        uid: az_maintenance_applyupdate
+        displayName: az maintenance applyupdate
+        items: []
+      - name: applyupdate-for-resource-group
+        uid: az_maintenance_applyupdate-for-resource-group
+        displayName: az maintenance applyupdate-for-resource-group
+        items: []
+      - name: assignment
+        uid: az_maintenance_assignment
+        displayName: az maintenance assignment
+        items: []
+      - name: configuration
+        uid: az_maintenance_configuration
+        displayName: az maintenance configuration
+        items: []
+      - name: configuration-for-resource-group
+        uid: az_maintenance_configuration-for-resource-group
+        displayName: az maintenance configuration-for-resource-group
+        items: []
+      - name: public-configuration
+        uid: az_maintenance_public-configuration
+        displayName: az maintenance public-configuration
+        items: []
+      - name: update
+        uid: az_maintenance_update
+        displayName: az maintenance update
+        items: []
+    - name: ssh
+      uid: az_ssh
+      displayName: az ssh
+      items: []
+    - name: sshkey
+      uid: az_sshkey
+      displayName: az sshkey
+      items: []
+    - name: vm
+      items:
+      - name: Summary
+        uid: az_vm
+        displayName: az vm
+      - name: aem
+        uid: az_vm_aem
+        displayName: az vm aem
+        items: []
+      - name: availability-set
+        uid: az_vm_availability-set
+        displayName: az vm availability-set
+        items: []
+      - name: boot-diagnostics
+        uid: az_vm_boot-diagnostics
+        displayName: az vm boot-diagnostics
+        items: []
+      - name: diagnostics
+        uid: az_vm_diagnostics
+        displayName: az vm diagnostics
+        items: []
+      - name: disk
+        uid: az_vm_disk
+        displayName: az vm disk
+        items: []
+      - name: encryption
+        uid: az_vm_encryption
+        displayName: az vm encryption
+        items: []
+      - name: extension
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vpn_gateway
-          displayName: az network vpn-gateway
-        - name: create
-          uid: ext_virtual-wan_az_network_vpn_gateway_create
-          displayName: az network vpn-gateway create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vpn_gateway_delete
-          displayName: az network vpn-gateway delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vpn_gateway_list
-          displayName: az network vpn-gateway list
-        - name: show
-          uid: ext_virtual-wan_az_network_vpn_gateway_show
-          displayName: az network vpn-gateway show
-        - name: update
-          uid: ext_virtual-wan_az_network_vpn_gateway_update
-          displayName: az network vpn-gateway update
-        - name: connection
-          displayName: az network vpn-gateway connection
-          items:
-          - name: Overview
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection
-            displayName: az network vpn-gateway connection
-          - name: create
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_create
-            displayName: az network vpn-gateway connection create
-          - name: delete
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_delete
-            displayName: az network vpn-gateway connection delete
-          - name: list
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_list
-            displayName: az network vpn-gateway connection list
-          - name: show
-            uid: ext_virtual-wan_az_network_vpn_gateway_connection_show
-            displayName: az network vpn-gateway connection show
-          - name: ipsec-policy
-            displayName: az network vpn-gateway connection ipsec-policy
-            items:
-            - name: Overview
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy
-              displayName: az network vpn-gateway connection ipsec-policy
-            - name: add
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_add
-              displayName: az network vpn-gateway connection ipsec-policy add
-            - name: list
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_list
-              displayName: az network vpn-gateway connection ipsec-policy list
-            - name: remove
-              uid: ext_virtual-wan_az_network_vpn_gateway_connection_ipsec_policy_remove
-              displayName: az network vpn-gateway connection ipsec-policy remove
-      - name: vpn-site
-        displayName: az network vpn-site
+        - name: Summary
+          uid: az_vm_extension
+          displayName: az vm extension
+        - name: image
+          uid: az_vm_extension_image
+          displayName: az vm extension image
+          items: []
+      - name: identity
+        uid: az_vm_identity
+        displayName: az vm identity
+        items: []
+      - name: image
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vpn_site
-          displayName: az network vpn-site
-        - name: create
-          uid: ext_virtual-wan_az_network_vpn_site_create
-          displayName: az network vpn-site create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vpn_site_delete
-          displayName: az network vpn-site delete
-        - name: download
-          uid: ext_virtual-wan_az_network_vpn_site_download
-          displayName: az network vpn-site download
-        - name: list
-          uid: ext_virtual-wan_az_network_vpn_site_list
-          displayName: az network vpn-site list
-        - name: show
-          uid: ext_virtual-wan_az_network_vpn_site_show
-          displayName: az network vpn-site show
-        - name: update
-          uid: ext_virtual-wan_az_network_vpn_site_update
-          displayName: az network vpn-site update
-      - name: vwan
-        displayName: az network vwan
+        - name: Summary
+          uid: az_vm_image
+          displayName: az vm image
+        - name: terms
+          uid: az_vm_image_terms
+          displayName: az vm image terms
+          items: []
+      - name: monitor
         items:
-        - name: Overview
-          uid: ext_virtual-wan_az_network_vwan
-          displayName: az network vwan
-        - name: create
-          uid: ext_virtual-wan_az_network_vwan_create
-          displayName: az network vwan create
-        - name: delete
-          uid: ext_virtual-wan_az_network_vwan_delete
-          displayName: az network vwan delete
-        - name: list
-          uid: ext_virtual-wan_az_network_vwan_list
-          displayName: az network vwan list
-        - name: show
-          uid: ext_virtual-wan_az_network_vwan_show
-          displayName: az network vwan show
-        - name: update
-          uid: ext_virtual-wan_az_network_vwan_update
-          displayName: az network vwan update
-  - name: vm-repair
-    items:
-    - name: Overview
-      uid: ext_vm-repair_az
-    - name: Virtual Machines
-      displayName: az vm
-      items:
-      - name: Overview
-        uid: ext_vm-repair_az_vm
-        displayName: az vm
+        - name: Summary
+          uid: az_vm_monitor
+          displayName: az vm monitor
+        - name: log
+          uid: az_vm_monitor_log
+          displayName: az vm monitor log
+          items: []
+      - name: nic
+        uid: az_vm_nic
+        displayName: az vm nic
+        items: []
       - name: repair
+        uid: az_vm_repair
         displayName: az vm repair
-        items:
-        - name: Overview
-          uid: ext_vm-repair_az_vm_repair
-          displayName: az vm repair
-        - name: create
-          uid: ext_vm-repair_az_vm_repair_create
-          displayName: az vm repair create
-        - name: list-scripts
-          uid: ext_vm-repair_az_vm_repair_list_scripts
-          displayName: az vm repair list-scripts
-        - name: restore
-          uid: ext_vm-repair_az_vm_repair_restore
-          displayName: az vm repair restore
-        - name: run
-          uid: ext_vm-repair_az_vm_repair_run
-          displayName: az vm repair run
-  - name: vmware
+        items: []
+      - name: run-command
+        uid: az_vm_run-command
+        displayName: az vm run-command
+        items: []
+      - name: secret
+        uid: az_vm_secret
+        displayName: az vm secret
+        items: []
+      - name: unmanaged-disk
+        uid: az_vm_unmanaged-disk
+        displayName: az vm unmanaged-disk
+        items: []
+      - name: user
+        uid: az_vm_user
+        displayName: az vm user
+        items: []
+  - name: Azure VMWare Solution
     items:
-    - name: Overview
-      uid: ext_vmware_az
+    - name: Summary
+      uid: sp-Azure_VMWare_Solution
+      displayName: Azure VMWare Solution
+    - name: csvmware
+      items:
+      - name: Summary
+        uid: az_csvmware
+        displayName: az csvmware
+      - name: private-cloud
+        uid: az_csvmware_private-cloud
+        displayName: az csvmware private-cloud
+        items: []
+      - name: resource-pool
+        uid: az_csvmware_resource-pool
+        displayName: az csvmware resource-pool
+        items: []
+      - name: virtual-network
+        uid: az_csvmware_virtual-network
+        displayName: az csvmware virtual-network
+        items: []
+      - name: vm
+        items:
+        - name: Summary
+          uid: az_csvmware_vm
+          displayName: az csvmware vm
+        - name: disk
+          uid: az_csvmware_vm_disk
+          displayName: az csvmware vm disk
+          items: []
+        - name: nic
+          uid: az_csvmware_vm_nic
+          displayName: az csvmware vm nic
+          items: []
+      - name: vm-template
+        uid: az_csvmware_vm-template
+        displayName: az csvmware vm-template
+        items: []
     - name: vmware
-      displayName: az vmware
       items:
-      - name: Overview
-        uid: ext_vmware_az_vmware
+      - name: Summary
+        uid: az_vmware
         displayName: az vmware
-      - name: checkquotaavailability
-        uid: ext_vmware_az_vmware_checkquotaavailability
-        displayName: az vmware checkquotaavailability
+      - name: authorization
+        uid: az_vmware_authorization
+        displayName: az vmware authorization
+        items: []
       - name: cluster
+        uid: az_vmware_cluster
         displayName: az vmware cluster
-        items:
-        - name: Overview
-          uid: ext_vmware_az_vmware_cluster
-          displayName: az vmware cluster
-        - name: create
-          uid: ext_vmware_az_vmware_cluster_create
-          displayName: az vmware cluster create
-        - name: delete
-          uid: ext_vmware_az_vmware_cluster_delete
-          displayName: az vmware cluster delete
-        - name: list
-          uid: ext_vmware_az_vmware_cluster_list
-          displayName: az vmware cluster list
-        - name: show
-          uid: ext_vmware_az_vmware_cluster_show
-          displayName: az vmware cluster show
-        - name: update
-          uid: ext_vmware_az_vmware_cluster_update
-          displayName: az vmware cluster update
+        items: []
+      - name: datastore
+        uid: az_vmware_datastore
+        displayName: az vmware datastore
+        items: []
+      - name: hcx-enterprise-site
+        uid: az_vmware_hcx-enterprise-site
+        displayName: az vmware hcx-enterprise-site
+        items: []
+      - name: location
+        uid: az_vmware_location
+        displayName: az vmware location
+        items: []
       - name: private-cloud
+        uid: az_vmware_private-cloud
         displayName: az vmware private-cloud
-        items:
-        - name: Overview
-          uid: ext_vmware_az_vmware_private_cloud
-          displayName: az vmware private-cloud
-        - name: addauthorization
-          uid: ext_vmware_az_vmware_private_cloud_addauthorization
-          displayName: az vmware private-cloud addauthorization
-        - name: addidentitysource
-          uid: ext_vmware_az_vmware_private_cloud_addidentitysource
-          displayName: az vmware private-cloud addidentitysource
-        - name: create
-          uid: ext_vmware_az_vmware_private_cloud_create
-          displayName: az vmware private-cloud create
-        - name: delete
-          uid: ext_vmware_az_vmware_private_cloud_delete
-          displayName: az vmware private-cloud delete
-        - name: deleteauthorization
-          uid: ext_vmware_az_vmware_private_cloud_deleteauthorization
-          displayName: az vmware private-cloud deleteauthorization
-        - name: deleteidentitysource
-          uid: ext_vmware_az_vmware_private_cloud_deleteidentitysource
-          displayName: az vmware private-cloud deleteidentitysource
-        - name: list
-          uid: ext_vmware_az_vmware_private_cloud_list
-          displayName: az vmware private-cloud list
-        - name: listadmincredentials
-          uid: ext_vmware_az_vmware_private_cloud_listadmincredentials
-          displayName: az vmware private-cloud listadmincredentials
-        - name: show
-          uid: ext_vmware_az_vmware_private_cloud_show
-          displayName: az vmware private-cloud show
-        - name: update
-          uid: ext_vmware_az_vmware_private_cloud_update
-          displayName: az vmware private-cloud update
-  - name: webapp
+        items: []
+  - name: Azure Web Apps
     items:
-    - name: Overview
-      uid: ext_webapp_az
-    - name: Web Apps
-      displayName: az webapp
-      items:
-      - name: Overview
-        uid: ext_webapp_az_webapp
+    - name: Summary
+      uid: sp-Azure_Web_Apps
+      displayName: Azure Web Apps
+    - name: staticwebapp
+      items:
+      - name: Summary
+        uid: az_staticwebapp
+        displayName: az staticwebapp
+      - name: appsettings
+        uid: az_staticwebapp_appsettings
+        displayName: az staticwebapp appsettings
+        items: []
+      - name: environment
+        uid: az_staticwebapp_environment
+        displayName: az staticwebapp environment
+        items: []
+      - name: hostname
+        uid: az_staticwebapp_hostname
+        displayName: az staticwebapp hostname
+        items: []
+      - name: users
+        uid: az_staticwebapp_users
+        displayName: az staticwebapp users
+        items: []
+    - name: webapp
+      items:
+      - name: Summary
+        uid: az_webapp
         displayName: az webapp
+      - name: auth
+        uid: az_webapp_auth
+        displayName: az webapp auth
+        items: []
+      - name: config
+        items:
+        - name: Summary
+          uid: az_webapp_config
+          displayName: az webapp config
+        - name: access-restriction
+          uid: az_webapp_config_access-restriction
+          displayName: az webapp config access-restriction
+          items: []
+        - name: appsettings
+          uid: az_webapp_config_appsettings
+          displayName: az webapp config appsettings
+          items: []
+        - name: backup
+          uid: az_webapp_config_backup
+          displayName: az webapp config backup
+          items: []
+        - name: connection-string
+          uid: az_webapp_config_connection-string
+          displayName: az webapp config connection-string
+          items: []
+        - name: container
+          uid: az_webapp_config_container
+          displayName: az webapp config container
+          items: []
+        - name: hostname
+          uid: az_webapp_config_hostname
+          displayName: az webapp config hostname
+          items: []
+        - name: snapshot
+          uid: az_webapp_config_snapshot
+          displayName: az webapp config snapshot
+          items: []
+        - name: ssl
+          uid: az_webapp_config_ssl
+          displayName: az webapp config ssl
+          items: []
+        - name: storage-account
+          uid: az_webapp_config_storage-account
+          displayName: az webapp config storage-account
+          items: []
       - name: container
+        uid: az_webapp_container
         displayName: az webapp container
+        items: []
+      - name: cors
+        uid: az_webapp_cors
+        displayName: az webapp cors
+        items: []
+      - name: deleted
+        uid: az_webapp_deleted
+        displayName: az webapp deleted
+        items: []
+      - name: deployment
         items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_container
-          displayName: az webapp container
-        - name: up
-          uid: ext_webapp_az_webapp_container_up
-          displayName: az webapp container up
+        - name: Summary
+          uid: az_webapp_deployment
+          displayName: az webapp deployment
+        - name: container
+          uid: az_webapp_deployment_container
+          displayName: az webapp deployment container
+          items: []
+        - name: slot
+          uid: az_webapp_deployment_slot
+          displayName: az webapp deployment slot
+          items: []
+        - name: source
+          uid: az_webapp_deployment_source
+          displayName: az webapp deployment source
+          items: []
+        - name: user
+          uid: az_webapp_deployment_user
+          displayName: az webapp deployment user
+          items: []
+      - name: hybrid-connection
+        uid: az_webapp_hybrid-connection
+        displayName: az webapp hybrid-connection
+        items: []
+      - name: identity
+        uid: az_webapp_identity
+        displayName: az webapp identity
+        items: []
+      - name: log
+        items:
+        - name: Summary
+          uid: az_webapp_log
+          displayName: az webapp log
+        - name: deployment
+          uid: az_webapp_log_deployment
+          displayName: az webapp log deployment
+          items: []
       - name: remote-connection
+        uid: az_webapp_remote-connection
         displayName: az webapp remote-connection
-        items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_remote_connection
-          displayName: az webapp remote-connection
-        - name: create
-          uid: ext_webapp_az_webapp_remote_connection_create
-          displayName: az webapp remote-connection create
+        items: []
       - name: scan
+        uid: az_webapp_scan
         displayName: az webapp scan
+        items: []
+      - name: traffic-routing
+        uid: az_webapp_traffic-routing
+        displayName: az webapp traffic-routing
+        items: []
+      - name: vnet-integration
+        uid: az_webapp_vnet-integration
+        displayName: az webapp vnet-integration
+        items: []
+      - name: webjob
+        items:
+        - name: Summary
+          uid: az_webapp_webjob
+          displayName: az webapp webjob
+        - name: continuous
+          uid: az_webapp_webjob_continuous
+          displayName: az webapp webjob continuous
+          items: []
+        - name: triggered
+          uid: az_webapp_webjob_triggered
+          displayName: az webapp webjob triggered
+          items: []
+  - name: Azure Web PubSub
+    items:
+    - name: Summary
+      uid: sp-Azure_Web_PubSub
+      displayName: Azure Web PubSub
+    - name: webpubsub
+      items:
+      - name: Summary
+        uid: az_webpubsub
+        displayName: az webpubsub
+      - name: client
+        uid: az_webpubsub_client
+        displayName: az webpubsub client
+        items: []
+      - name: event-handler
+        items:
+        - name: Summary
+          uid: az_webpubsub_event-handler
+          displayName: az webpubsub event-handler
+        - name: hub
+          uid: az_webpubsub_event-handler_hub
+          displayName: az webpubsub event-handler hub
+          items: []
+      - name: key
+        uid: az_webpubsub_key
+        displayName: az webpubsub key
+        items: []
+      - name: network-rule
+        uid: az_webpubsub_network-rule
+        displayName: az webpubsub network-rule
+        items: []
+      - name: service
         items:
-        - name: Overview
-          uid: ext_webapp_az_webapp_scan
-          displayName: az webapp scan
-        - name: list-result
-          uid: ext_webapp_az_webapp_scan_list_result
-          displayName: az webapp scan list-result
-        - name: show-result
-          uid: ext_webapp_az_webapp_scan_show_result
-          displayName: az webapp scan show-result
-        - name: start
-          uid: ext_webapp_az_webapp_scan_start
-          displayName: az webapp scan start
-        - name: stop
-          uid: ext_webapp_az_webapp_scan_stop
-          displayName: az webapp scan stop
-        - name: track
-          uid: ext_webapp_az_webapp_scan_track
-          displayName: az webapp scan track
+        - name: Summary
+          uid: az_webpubsub_service
+          displayName: az webpubsub service
+        - name: connection
+          uid: az_webpubsub_service_connection
+          displayName: az webpubsub service connection
+          items: []
+        - name: group
+          uid: az_webpubsub_service_group
+          displayName: az webpubsub service group
+          items: []
+        - name: permission
+          uid: az_webpubsub_service_permission
+          displayName: az webpubsub service permission
+          items: []
+        - name: user
+          uid: az_webpubsub_service_user
+          displayName: az webpubsub service user
+          items: []
+  - name: Bicep
+    items:
+    - name: Summary
+      uid: sp-Bicep
+      displayName: Bicep
+    - name: bicep
+      uid: az_bicep
+      displayName: az bicep
+      items: []
+  - name: Content Delivery Network
+    uid: sp-Content_Delivery_Network
+    displayName: Content Delivery Network
+    items: []
+  - name: Microsoft AI
+    items:
+    - name: Summary
+      uid: sp-Microsoft_AI
+      displayName: Microsoft AI
+    - name: ai-examples
+      uid: az_ai-examples
+      displayName: az ai-examples
+      items: []
+  - name: Microsoft Partner Network
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Partner_Network
+      displayName: Microsoft Partner Network
+    - name: managementpartner
+      uid: az_managementpartner
+      displayName: az managementpartner
+      items: []
+  - name: Microsoft Partner Services
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Partner_Services
+      displayName: Microsoft Partner Services
+    - name: confluent
+      items:
+      - name: Summary
+        uid: az_confluent
+        displayName: az confluent
+      - name: organization
+        uid: az_confluent_organization
+        displayName: az confluent organization
+        items: []
+      - name: terms
+        uid: az_confluent_terms
+        displayName: az confluent terms
+        items: []
+    - name: datadog
+      items:
+      - name: Summary
+        uid: az_datadog
+        displayName: az datadog
+      - name: monitor
+        uid: az_datadog_monitor
+        displayName: az datadog monitor
+        items: []
+      - name: sso-config
+        uid: az_datadog_sso-config
+        displayName: az datadog sso-config
+        items: []
+      - name: tag-rule
+        uid: az_datadog_tag-rule
+        displayName: az datadog tag-rule
+        items: []
+      - name: terms
+        uid: az_datadog_terms
+        displayName: az datadog terms
+        items: []
+  - name: Microsoft Windows
+    items:
+    - name: Summary
+      uid: sp-Microsoft_Windows
+      displayName: Microsoft Windows
+    - name: baremetalinstance
+      uid: az_baremetalinstance
+      displayName: az baremetalinstance
+      items: []
+  - name: Power BI
+    items:
+    - name: Summary
+      uid: sp-Power_BI
+      displayName: Power BI
+    - name: powerbi
+      items:
+      - name: Summary
+        uid: az_powerbi
+        displayName: az powerbi
+      - name: embedded-capacity
+        uid: az_powerbi_embedded-capacity
+        displayName: az powerbi embedded-capacity
+        items: []
+  - name: SAP HANA on Azure
+    items:
+    - name: Summary
+      uid: sp-SAP_HANA_on_Azure
+      displayName: SAP HANA on Azure
+    - name: hanainstance
+      uid: az_hanainstance
+      displayName: az hanainstance
+      items: []
+    - name: sapmonitor
+      items:
+      - name: Summary
+        uid: az_sapmonitor
+        displayName: az sapmonitor
+      - name: provider-instance
+        uid: az_sapmonitor_provider-instance
+        displayName: az sapmonitor provider-instance
+        items: []
+  - name: Visual Studio
+    items:
+    - name: Summary
+      uid: sp-Visual_Studio
+      displayName: Visual Studio
+    - name: codespace
+      items:
+      - name: Summary
+        uid: az_codespace
+        displayName: az codespace
+      - name: location
+        uid: az_codespace_location
+        displayName: az codespace location
+        items: []
+      - name: plan
+        uid: az_codespace_plan
+        displayName: az codespace plan
+        items: []
+      - name: secret
+        uid: az_codespace_secret
+        displayName: az codespace secret
+        items: []
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account.yml b/2019-03-01-hybrid/docs-ref-autogen/account.yml
index 31b3df8f08..bbc0d30658 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/account.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/account.yml
@@ -1,51 +1,68 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account
-  name: az account
-  summary: Manage Azure subscription information.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_clear
-  - az_account_get_access_token
-  - az_account_list
-  - az_account_list_locations
-  - az_account_set
-  - az_account_show
+### YamlMime:AzureCLIGroup
+uid: az_account
+name: az account
+summary: Manage Azure subscription information.
+description: ''
+directCommands:
 - uid: az_account_clear
   name: az account clear
   summary: Clear all subscriptions from the CLI's local cache.
   description: To clear the current subscription, use 'az logout'.
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_get_access_token
+  syntax: az account clear
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_create
+  name: az account create
+  summary: Create a subscription.
+  description: ''
+  syntax: >-
+    az account create --enrollment-account-name
+                      --offer-type {MS-AZR-0017P, MS-AZR-0148P}
+                      [--display-name]
+                      [--owner-object-id]
+                      [--owner-spn]
+                      [--owner-upn]
+  requiredParameters:
+  - isRequired: true
+    name: --enrollment-account-name --enrollment-account-object-id
+    summary: The name of the enrollment account which should be used to create a subscription.
+    description: ''
+  - isRequired: true
+    name: --offer-type
+    parameterValueGroup: MS-AZR-0017P, MS-AZR-0148P
+    summary: The offer type of the subscription. For example, MS-AZR-0017P (EnterpriseAgreement) and MS-AZR-0148P (EnterpriseAgreement devTest) are available.
+    description: ''
+  optionalParameters:
+  - name: --display-name
+    summary: The display name of the subscription.
+    description: ''
+  - name: --owner-object-id
+    summary: The object id(s) of the owner(s) which should be granted access to the new subscription.
+    description: ''
+  - name: --owner-spn
+    summary: The service principal name(s) of the owner(s) which should be granted access to the new subscription.
+    description: ''
+  - name: --owner-upn
+    summary: The user principal name(s) of owner(s) who should be granted access to the new subscription.
+    description: ''
+- uid: az_account_get-access-token
   name: az account get-access-token
   summary: Get a token for utilities to access Azure.
   description: The token will be valid for at least 5 minutes with the maximum at 60 minutes. If the subscription argument isn't specified, the current account is used.
-  langs:
-  - azurecli
+  syntax: >-
+    az account get-access-token [--resource]
+                                [--resource-type {aad-graph, arm, batch, data-lake, media, ms-graph, oss-rdbms}]
+                                [--subscription]
+                                [--tenant]
   examples:
   - summary: Get an access token for the current account
-    syntax:
-      content: az account get-access-token
+    syntax: az account get-access-token
   - summary: Get an access token for a specific subscription
-    syntax:
-      content: az account get-access-token --subscription 00000000-0000-0000-0000-000000000000
+    syntax: az account get-access-token --subscription 00000000-0000-0000-0000-000000000000
   - summary: Get an access token for a specific tenant
-    syntax:
-      content: az account get-access-token --tenant 00000000-0000-0000-0000-000000000000
+    syntax: az account get-access-token --tenant 00000000-0000-0000-0000-000000000000
   - summary: Get an access token to use with MS Graph API
-    syntax:
-      content: az account get-access-token --resource-type ms-graph
-  parameters:
+    syntax: az account get-access-token --resource-type ms-graph
+  optionalParameters:
   - name: --resource
     summary: Azure resource endpoints. Default to Azure Resource Manager.
     description: ''
@@ -59,144 +76,104 @@ items:
   - name: --tenant -t
     summary: Tenant ID for which the token is acquired. Only available for user and service principal account, not for MSI or Cloud Shell account.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_list
   name: az account list
   summary: Get a list of subscriptions for the logged in account.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az account list [--all]
+                    [--query-examples]
+                    [--refresh]
+  optionalParameters:
   - name: --all
     summary: List all subscriptions, rather than just 'Enabled' ones.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --refresh
     summary: Retrieve up-to-date subscriptions from server.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_list_locations
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_list-locations
   name: az account list-locations
   summary: List supported regions for the current subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  syntax: az account list-locations
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_set
   name: az account set
   summary: Set a subscription to be the current active subscription.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az account set --subscription
+  requiredParameters:
   - isRequired: true
     name: --subscription -s
     summary: Name or ID of subscription.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_show
   name: az account show
   summary: Get the details of a subscription.
-  description: If the subscription isn't specified, shows the details of the default subscription.
-  langs:
-  - azurecli
-  parameters:
+  description: >-
+    If the subscription isn't specified, shows the details of the default subscription.
+
+
+    When --sdk-auth is used, the output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az account show [--query-examples]
+                    [--sdk-auth]
+                    [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --sdk-auth
     summary: Output result to a file compatible with Azure SDK auth. Only applicable when authenticating with a Service Principal.
     description: ''
   - name: --subscription -s
     summary: Name or ID of subscription.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_clear
-  name: az account clear
-  summary: Clear all subscriptions from the CLI's local cache.
-- uid: az_account_get_access_token
-  name: az account get-access-token
-  summary: Get a token for utilities to access Azure.
-- uid: az_account_list
-  name: az account list
-  summary: Get a list of subscriptions for the logged in account.
-- uid: az_account_list_locations
-  name: az account list-locations
-  summary: List supported regions for the current subscription.
-- uid: az_account_lock
-  name: az account lock
-  summary: Manage Azure subscription level locks.
-- uid: az_account_lock_create
-  name: az account lock create
-  summary: Create a subscription lock.
-- uid: az_account_lock_delete
-  name: az account lock delete
-  summary: Delete a subscription lock.
-- uid: az_account_lock_list
-  name: az account lock list
-  summary: List lock information in the subscription.
-- uid: az_account_lock_show
-  name: az account lock show
-  summary: Show the details of a subscription lock.
-- uid: az_account_lock_update
-  name: az account lock update
-  summary: Update a subscription lock.
-- uid: az_account_management_group
-  name: az account management-group
-  summary: Manage Azure Management Groups.
-- uid: az_account_management_group_create
-  name: az account management-group create
-  summary: Create a new management group.
-- uid: az_account_management_group_delete
-  name: az account management-group delete
-  summary: Delete an existing management group.
-- uid: az_account_management_group_list
-  name: az account management-group list
-  summary: List all management groups.
-- uid: az_account_management_group_show
-  name: az account management-group show
-  summary: Get a specific management group.
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
-- uid: az_account_management_group_update
-  name: az account management-group update
-  summary: Update an existing management group.
-- uid: az_account_set
-  name: az account set
-  summary: Set a subscription to be the current active subscription.
-- uid: az_account_show
-  name: az account show
-  summary: Get the details of a subscription.
+- az_account_alias
+- az_account_alias_create
+- az_account_alias_delete
+- az_account_alias_list
+- az_account_alias_show
+- az_account_alias_wait
+- az_account_clear
+- az_account_create
+- az_account_get-access-token
+- az_account_list
+- az_account_list-locations
+- az_account_lock
+- az_account_lock_create
+- az_account_lock_delete
+- az_account_lock_list
+- az_account_lock_show
+- az_account_lock_update
+- az_account_management-group
+- az_account_management-group_create
+- az_account_management-group_delete
+- az_account_management-group_list
+- az_account_management-group_show
+- az_account_management-group_subscription
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
+- az_account_management-group_update
+- az_account_set
+- az_account_show
+- az_account_subscription
+- az_account_subscription_cancel
+- az_account_subscription_enable
+- az_account_subscription_list
+- az_account_subscription_list-location
+- az_account_subscription_rename
+- az_account_subscription_show
+- az_account_tenant
+- az_account_tenant_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -212,10 +189,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure subscription information.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure subscription information.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account/alias.yml b/2019-03-01-hybrid/docs-ref-autogen/account/alias.yml
new file mode 100644
index 0000000000..3b1e1fe6d7
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/account/alias.yml
@@ -0,0 +1,152 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_alias
+name: az account alias
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account alias** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage subscription alias.
+description: ''
+directCommands:
+- uid: az_account_alias_create
+  name: az account alias create
+  summary: Create Alias Subscription.
+  description: ''
+  syntax: >-
+    az account alias create --name
+                            [--billing-scope]
+                            [--display-name]
+                            [--no-wait]
+                            [--reseller-id]
+                            [--subscription-id]
+                            [--workload {DevTest, Production}]
+  examples:
+  - summary: CreateAlias
+    syntax: az account alias create --name "aliasForNewSub" --billing-scope "/providers/Microsoft.Billing/billingAccounts/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx:024cabf4-7321-4cf9-be59-df0c77ca51de_2019-05-31/billingProfiles/PE2Q-NOIT-BG7-TGB/invoiceSections/MTT4-OBS7-PJA-TGB" --display-name "Contoso MCA subscription" --workload "Production"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+  optionalParameters:
+  - name: --billing-scope
+    summary: Billing scope. It determines whether the subscription is Field-Led, Partner-Led or LegacyEA.
+    description: ''
+  - name: --display-name
+    summary: The friendly name of the subscription.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --reseller-id
+    summary: Reseller ID, basically MPN Id.
+    description: ''
+  - name: --subscription-id
+    summary: This parameter can be used to create alias for existing subscription ID.
+    description: ''
+  - name: --workload
+    parameterValueGroup: DevTest, Production
+    summary: The workload type of the subscription. It can be either Production or DevTest.
+    description: ''
+- uid: az_account_alias_delete
+  name: az account alias delete
+  summary: Delete Alias.
+  description: ''
+  syntax: az account alias delete --name
+  examples:
+  - summary: DeleteAlias
+    syntax: az account alias delete --name "aliasForNewSub"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+- uid: az_account_alias_list
+  name: az account alias list
+  summary: List Alias Subscriptions.
+  description: ''
+  syntax: az account alias list
+  examples:
+  - summary: List Alias Subscriptions
+    syntax: az account alias list
+- uid: az_account_alias_show
+  name: az account alias show
+  summary: Get Alias Subscription.
+  description: ''
+  syntax: az account alias show --name
+  examples:
+  - summary: GetAlias
+    syntax: az account alias show --name "aliasForNewSub"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+- uid: az_account_alias_wait
+  name: az account alias wait
+  summary: Place the CLI in a waiting state until a condition of the account alias is met.
+  description: ''
+  syntax: >-
+    az account alias wait --name
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the account alias is successfully created.
+    syntax: az account alias wait --name "aliasForNewSub" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Alias Name.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_account_alias_create
+- az_account_alias_delete
+- az_account_alias_list
+- az_account_alias_show
+- az_account_alias_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage subscription alias.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account/lock.yml b/2019-03-01-hybrid/docs-ref-autogen/account/lock.yml
index 7df0034c5d..eedcad460e 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/account/lock.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/account/lock.yml
@@ -1,28 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_lock
-  name: az account lock
-  summary: Manage Azure subscription level locks.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_lock_create
-  - az_account_lock_delete
-  - az_account_lock_list
-  - az_account_lock_show
-  - az_account_lock_update
+### YamlMime:AzureCLIGroup
+uid: az_account_lock
+name: az account lock
+summary: Manage Azure subscription level locks.
+description: ''
+directCommands:
 - uid: az_account_lock_create
   name: az account lock create
   summary: Create a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock create --lock-type {CanNotDelete, ReadOnly}
+                           --name
+                           [--notes]
   examples:
   - summary: Create a read-only subscription level lock.
-    syntax:
-      content: az account lock create --lock-type ReadOnly -n lockName
-  parameters:
+    syntax: az account lock create --lock-type ReadOnly -n lockName
+  requiredParameters:
   - isRequired: true
     name: --lock-type -t
     parameterValueGroup: CanNotDelete, ReadOnly
@@ -32,92 +25,82 @@ items:
     name: --name -n
     summary: Name of the lock.
     description: ''
+  optionalParameters:
   - name: --notes
     summary: Notes about this lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_delete
   name: az account lock delete
   summary: Delete a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock delete [--ids]
+                           [--name]
   examples:
   - summary: Delete a subscription lock
-    syntax:
-      content: az account lock delete --name lockName
-  parameters:
+    syntax: az account lock delete --name lockName
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_list
   name: az account lock list
   summary: List lock information in the subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock list [--filter-string]
+                         [--query-examples]
   examples:
   - summary: List out all locks on the subscription level
-    syntax:
-      content: az account lock list
-  parameters:
+    syntax: az account lock list
+  optionalParameters:
   - name: --filter-string
     summary: A query filter to use to restrict the results.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_show
   name: az account lock show
   summary: Show the details of a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock show [--ids]
+                         [--name]
+                         [--query-examples]
   examples:
   - summary: Show a subscription level lock
-    syntax:
-      content: az account lock show -n lockname
-  parameters:
+    syntax: az account lock show -n lockname
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
   - name: --name -n
     summary: Name of the lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 - uid: az_account_lock_update
   name: az account lock update
   summary: Update a subscription lock.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az account lock update [--ids]
+                           [--lock-type {CanNotDelete, ReadOnly}]
+                           [--name]
+                           [--notes]
   examples:
   - summary: Update a subscription lock with new notes and type
-    syntax:
-      content: az account lock update --name lockName --notes newNotesHere --lock-type CanNotDelete
-  parameters:
+    syntax: az account lock update --name lockName --notes newNotesHere --lock-type CanNotDelete
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). If provided, no other "Resource Id" arguments should be specified.
     description: ''
@@ -131,28 +114,13 @@ items:
   - name: --notes
     summary: Notes about this lock.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_lock_create
-  name: az account lock create
-  summary: Create a subscription lock.
-- uid: az_account_lock_delete
-  name: az account lock delete
-  summary: Delete a subscription lock.
-- uid: az_account_lock_list
-  name: az account lock list
-  summary: List lock information in the subscription.
-- uid: az_account_lock_show
-  name: az account lock show
-  summary: Show the details of a subscription lock.
-- uid: az_account_lock_update
-  name: az account lock update
-  summary: Update a subscription lock.
+- az_account_lock_create
+- az_account_lock_delete
+- az_account_lock_list
+- az_account_lock_show
+- az_account_lock_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -168,10 +136,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure subscription level locks.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure subscription level locks.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account/management-group.yml b/2019-03-01-hybrid/docs-ref-autogen/account/management-group.yml
index 6639f53f26..6c12c4fca8 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/account/management-group.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/account/management-group.yml
@@ -1,194 +1,151 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_management_group
-  name: az account management-group
-  summary: Manage Azure Management Groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_management_group_create
-  - az_account_management_group_delete
-  - az_account_management_group_list
-  - az_account_management_group_show
-  - az_account_management_group_update
-- uid: az_account_management_group_create
+### YamlMime:AzureCLIGroup
+uid: az_account_management-group
+name: az account management-group
+summary: Manage Azure Management Groups.
+description: ''
+directCommands:
+- uid: az_account_management-group_create
   name: az account management-group create
   summary: Create a new management group.
   description: Create a new management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group create --name
+                                       [--display-name]
+                                       [--parent]
   examples:
   - summary: Create a new management group.
-    syntax:
-      content: az account management-group create --name GroupName
+    syntax: az account management-group create --name GroupName
   - summary: Create a new management group with a specific display name.
-    syntax:
-      content: az account management-group create --name GroupName --display-name DisplayName
+    syntax: az account management-group create --name GroupName --display-name DisplayName
   - summary: Create a new management group with a specific parent.
-    syntax:
-      content: az account management-group create --name GroupName --parent ParentId/ParentName
+    syntax: az account management-group create --name GroupName --parent ParentId/ParentName
   - summary: Create a new management group with a specific display name and parent.
-    syntax:
-      content: az account management-group create --name GroupName --display-name DisplayName --parent ParentId/ParentName
-  parameters:
+    syntax: az account management-group create --name GroupName --display-name DisplayName --parent ParentId/ParentName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
+  optionalParameters:
   - name: --display-name -d
     summary: Sets the display name of the management group. If null, the group name is set as the display name.
     description: ''
   - name: --parent -p
     summary: Sets the parent of the management group. Can be the fully qualified id or the name of the management group. If null, the root tenant group is set as the parent.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_delete
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_delete
   name: az account management-group delete
   summary: Delete an existing management group.
   description: Delete an existing management group.
-  langs:
-  - azurecli
+  syntax: az account management-group delete --name
   examples:
   - summary: Delete an existing management group
-    syntax:
-      content: az account management-group delete --name GroupName
-  parameters:
+    syntax: az account management-group delete --name GroupName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_list
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_list
   name: az account management-group list
   summary: List all management groups.
   description: List of all management groups in the current tenant.
-  langs:
-  - azurecli
+  syntax: az account management-group list [--query-examples]
   examples:
   - summary: List all management groups
-    syntax:
-      content: az account management-group list
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_show
+    syntax: az account management-group list
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_show
   name: az account management-group show
   summary: Get a specific management group.
   description: Get the details of the management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group show --name
+                                     [--expand]
+                                     [--query-examples]
+                                     [--recurse]
   examples:
   - summary: Get a management group.
-    syntax:
-      content: az account management-group show --name GroupName
+    syntax: az account management-group show --name GroupName
   - summary: Get a management group with children in the first level of hierarchy.
-    syntax:
-      content: az account management-group show --name GroupName -e
+    syntax: az account management-group show --name GroupName -e
   - summary: Get a management group with children in all levels of hierarchy.
-    syntax:
-      content: az account management-group show --name GroupName -e -r
-  parameters:
+    syntax: az account management-group show --name GroupName -e -r
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the management group.
+    summary: Name of the management group (the last segment of the resource ID). Do not use display name.
     description: ''
+  optionalParameters:
   - name: --expand -e
     summary: If given, lists the children in the first level of hierarchy.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --recurse -r
     summary: If given, lists the children in all levels of hierarchy.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_update
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_update
   name: az account management-group update
   summary: Update an existing management group.
   description: Update an existing management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group update --name
+                                       [--add]
+                                       [--display-name]
+                                       [--force-string]
+                                       [--parent]
+                                       [--remove]
+                                       [--set]
   examples:
   - summary: Update an existing management group with a specific display name.
-    syntax:
-      content: az account management-group update --name GroupName --display-name DisplayName
+    syntax: az account management-group update --name GroupName --display-name DisplayName
   - summary: Update an existing management group with a specific parent.
-    syntax:
-      content: az account management-group update --name GroupName --parent ParentId/ParentName
+    syntax: az account management-group update --name GroupName --parent ParentId/ParentName
   - summary: Update an existing management group with a specific display name and parent.
-    syntax:
-      content: az account management-group update --name GroupName --display-name DisplayName --parent ParentId/ParentName
-  parameters:
+    syntax: az account management-group update --name GroupName --display-name DisplayName --parent ParentId/ParentName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
     description: ''
-  - name: --display-name -d
-    summary: Updates the display name of the management group. If null, no change is made.
-    description: ''
-  - name: --parent -p
-    summary: Update the parent of the management group. Can be the fully qualified id or the name of the management group. If null, no change is made.
-    description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
+  - name: --display-name -d
+    summary: Updates the display name of the management group. If null, no change is made.
+    description: ''
   - name: --force-string
     summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
+  - name: --parent -p
+    summary: Update the parent of the management group. Can be the fully qualified id or the name of the management group. If null, no change is made.
+    description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_management_group_create
-  name: az account management-group create
-  summary: Create a new management group.
-- uid: az_account_management_group_delete
-  name: az account management-group delete
-  summary: Delete an existing management group.
-- uid: az_account_management_group_list
-  name: az account management-group list
-  summary: List all management groups.
-- uid: az_account_management_group_show
-  name: az account management-group show
-  summary: Get a specific management group.
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
-- uid: az_account_management_group_update
-  name: az account management-group update
-  summary: Update an existing management group.
+- az_account_management-group_create
+- az_account_management-group_delete
+- az_account_management-group_list
+- az_account_management-group_show
+- az_account_management-group_subscription
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
+- az_account_management-group_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -204,10 +161,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Manage Azure Management Groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Manage Azure Management Groups.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml b/2019-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml
index dba31b3417..9dd07e642c 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/account/management-group/subscription.yml
@@ -1,25 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_account_management_group_subscription
-  name: az account management-group subscription
-  summary: Subscription operations for Management Groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_account_management_group_subscription_add
-  - az_account_management_group_subscription_remove
-- uid: az_account_management_group_subscription_add
+### YamlMime:AzureCLIGroup
+uid: az_account_management-group_subscription
+name: az account management-group subscription
+summary: Subscription operations for Management Groups.
+description: ''
+directCommands:
+- uid: az_account_management-group_subscription_add
   name: az account management-group subscription add
   summary: Add a subscription to a management group.
   description: Add a subscription to a management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group subscription add --name
+                                                 --subscription
   examples:
   - summary: Add a subscription to a management group.
-    syntax:
-      content: az account management-group subscription add --name GroupName --subscription Subscription
-  parameters:
+    syntax: az account management-group subscription add --name GroupName --subscription Subscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
@@ -28,23 +23,18 @@ items:
     name: --subscription -s
     summary: Subscription Id or Name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_account_management_group_subscription_remove
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
+- uid: az_account_management-group_subscription_remove
   name: az account management-group subscription remove
   summary: Remove an existing subscription from a management group.
   description: Remove an existing subscription from a management group.
-  langs:
-  - azurecli
+  syntax: >-
+    az account management-group subscription remove --name
+                                                    --subscription
   examples:
   - summary: Remove an existing subscription from a management group.
-    syntax:
-      content: az account management-group subscription remove --name GroupName --subscription Subscription
-  parameters:
+    syntax: az account management-group subscription remove --name GroupName --subscription Subscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the management group.
@@ -53,19 +43,10 @@ items:
     name: --subscription -s
     summary: Subscription Id or Name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
 commands:
-- uid: az_account_management_group_subscription_add
-  name: az account management-group subscription add
-  summary: Add a subscription to a management group.
-- uid: az_account_management_group_subscription_remove
-  name: az account management-group subscription remove
-  summary: Remove an existing subscription from a management group.
+- az_account_management-group_subscription_add
+- az_account_management-group_subscription_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -81,10 +62,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/profile/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/profile/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/10b5e966121d2b7fda114bcbdfad5b6f6aa0aae8/src/azure-cli/azure/cli/command_modules/profile/_help.py
-updated_at: 3/16/2020 9:14:21 AM
-ms.date: 03/16/2020
-description: Subscription operations for Management Groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/18/2020
+  description: Subscription operations for Management Groups.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account/subscription.yml b/2019-03-01-hybrid/docs-ref-autogen/account/subscription.yml
new file mode 100644
index 0000000000..e70ff8195a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/account/subscription.yml
@@ -0,0 +1,119 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_subscription
+name: az account subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage subscriptions.
+description: ''
+directCommands:
+- uid: az_account_subscription_cancel
+  name: az account subscription cancel
+  summary: Cancel subscription.
+  description: ''
+  syntax: >-
+    az account subscription cancel --id
+                                   [--yes]
+  examples:
+  - summary: Cancel subscription
+    syntax: az account subscription cancel --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_account_subscription_enable
+  name: az account subscription enable
+  summary: Enable subscription.
+  description: ''
+  syntax: az account subscription enable --id
+  examples:
+  - summary: Enable subscription
+    syntax: az account subscription enable --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+- uid: az_account_subscription_list
+  name: az account subscription list
+  summary: Get all subscriptions for a tenant.
+  description: ''
+  syntax: az account subscription list
+  examples:
+  - summary: listSubscriptions
+    syntax: az account subscription list
+- uid: az_account_subscription_list-location
+  name: az account subscription list-location
+  summary: This operation provides all the locations that are available for resource providers; however, each resource provider may support a subset of this list.
+  description: ''
+  syntax: az account subscription list-location --id
+  examples:
+  - summary: listLocations
+    syntax: az account subscription list-location --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: The ID of the target subscription.
+    description: ''
+- uid: az_account_subscription_rename
+  name: az account subscription rename
+  summary: Rename subscription.
+  description: ''
+  syntax: >-
+    az account subscription rename --id
+                                   [--name]
+  examples:
+  - summary: Rename subscription
+    syntax: az account subscription rename --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: Subscription Id.
+    description: ''
+  optionalParameters:
+  - name: --name --subscription-name -n
+    summary: New subscription name.
+    description: ''
+- uid: az_account_subscription_show
+  name: az account subscription show
+  summary: Get details about a specified subscription.
+  description: ''
+  syntax: az account subscription show --id
+  examples:
+  - summary: getSubscription
+    syntax: az account subscription show --subscription-id "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  requiredParameters:
+  - isRequired: true
+    name: --id --subscription-id
+    summary: The ID of the target subscription.
+    description: ''
+commands:
+- az_account_subscription_cancel
+- az_account_subscription_enable
+- az_account_subscription_list
+- az_account_subscription_list-location
+- az_account_subscription_rename
+- az_account_subscription_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage subscriptions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/account/tenant.yml b/2019-03-01-hybrid/docs-ref-autogen/account/tenant.yml
new file mode 100644
index 0000000000..92816bcd8c
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/account/tenant.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_account_tenant
+name: az account tenant
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **account** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az account tenant** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tenant.
+description: ''
+directCommands:
+- uid: az_account_tenant_list
+  name: az account tenant list
+  summary: Get the tenants for your account.
+  description: ''
+  syntax: az account tenant list
+  examples:
+  - summary: listTenants
+    syntax: az account tenant list
+commands:
+- az_account_tenant_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tenant.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/acr.yml b/2019-03-01-hybrid/docs-ref-autogen/acr.yml
new file mode 100644
index 0000000000..5ecc4212a7
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/acr.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr
+name: az acr
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage private registries with Azure Container Registries.
+description: ''
+commands:
+- az_acr_export-pipeline
+- az_acr_export-pipeline_create
+- az_acr_export-pipeline_delete
+- az_acr_export-pipeline_list
+- az_acr_export-pipeline_show
+- az_acr_import-pipeline
+- az_acr_import-pipeline_create
+- az_acr_import-pipeline_delete
+- az_acr_import-pipeline_list
+- az_acr_import-pipeline_show
+- az_acr_pipeline-run
+- az_acr_pipeline-run_create
+- az_acr_pipeline-run_delete
+- az_acr_pipeline-run_list
+- az_acr_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage private registries with Azure Container Registries.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/acr/export-pipeline.yml b/2019-03-01-hybrid/docs-ref-autogen/acr/export-pipeline.yml
new file mode 100644
index 0000000000..a1a4be6601
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/acr/export-pipeline.yml
@@ -0,0 +1,144 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_export-pipeline
+name: az acr export-pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr export-pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR export pipelines.
+description: ''
+directCommands:
+- uid: az_acr_export-pipeline_create
+  name: az acr export-pipeline create
+  summary: Create an export pipeline.
+  description: ''
+  syntax: >-
+    az acr export-pipeline create --name
+                                  --registry
+                                  --resource-group
+                                  --secret-uri
+                                  --storage-container-uri
+                                  [--assign-identity]
+                                  [--options]
+  examples:
+  - summary: Create an export pipeline.
+    syntax: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
+  - summary: Create an export pipeline with a user assigned identity and all available options.
+    syntax: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options OverwriteBlobs ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-uri -s
+    summary: Keyvault secret URI containing a valid SAS token to the associated storage account of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  - isRequired: true
+    name: --storage-container-uri -c
+    summary: Storage account container URI of the source or target storage account container of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity -i
+    summary: User assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.
+    description: ''
+  - name: --options -z
+    summary: 'Space-separated list of options. May only container the following options: OverwriteBlobs,ContinueOnErrors.'
+    description: ''
+- uid: az_acr_export-pipeline_delete
+  name: az acr export-pipeline delete
+  summary: Delete an export pipeline.
+  description: ''
+  syntax: >-
+    az acr export-pipeline delete --name
+                                  --registry
+                                  --resource-group
+  examples:
+  - summary: Delete an export pipeline.
+    syntax: az acr export-pipeline delete --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_export-pipeline_list
+  name: az acr export-pipeline list
+  summary: List export pipelines on a Container Registry.
+  description: ''
+  syntax: >-
+    az acr export-pipeline list --registry
+                                --resource-group
+  examples:
+  - summary: List export pipelines on a container registry
+    syntax: az acr export-pipeline list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_export-pipeline_show
+  name: az acr export-pipeline show
+  summary: Show an export pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr export-pipeline show --name
+                                --registry
+                                --resource-group
+  examples:
+  - summary: Show a specific export pipeline in detail.
+    syntax: az acr export-pipeline show --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the export pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_export-pipeline_create
+- az_acr_export-pipeline_delete
+- az_acr_export-pipeline_list
+- az_acr_export-pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR export pipelines.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/acr/import-pipeline.yml b/2019-03-01-hybrid/docs-ref-autogen/acr/import-pipeline.yml
new file mode 100644
index 0000000000..d67f5b3523
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/acr/import-pipeline.yml
@@ -0,0 +1,150 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_import-pipeline
+name: az acr import-pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr import-pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR import pipelines.
+description: ''
+directCommands:
+- uid: az_acr_import-pipeline_create
+  name: az acr import-pipeline create
+  summary: Create an import pipeline.
+  description: ''
+  syntax: >-
+    az acr import-pipeline create --name
+                                  --registry
+                                  --resource-group
+                                  --secret-uri
+                                  --storage-container-uri
+                                  [--assign-identity]
+                                  [--options]
+                                  [--source-trigger-enabled {false, true}]
+  examples:
+  - summary: Create an import pipeline.
+    syntax: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
+  - summary: Create an import pipeline with a user assigned identity, all available options, and source trigger disabled.
+    syntax: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options DeleteSourceBlobOnSuccess OverwriteTags ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity --source-trigger-enabled False
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --secret-uri -s
+    summary: Keyvault secret URI containing a valid SAS token to the associated storage account of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  - isRequired: true
+    name: --storage-container-uri -c
+    summary: Storage account container URI of the source or target storage account container of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note that the URI may be different outside of AzureCloud.
+    description: ''
+  optionalParameters:
+  - name: --assign-identity -i
+    summary: User assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.
+    description: ''
+  - name: --options -z
+    summary: 'Space-separated list of options. May only contain the following options: DeleteSourceBlobOnSuccess,OverwriteTags,ContinueOnErrors,DisableSourceTrigger.'
+    description: ''
+  - name: --source-trigger-enabled -e
+    defaultValue: "1"
+    parameterValueGroup: false, true
+    summary: Boolean parameter that determines whether source trigger is enabled on the pipeline. Must be either True or False. True by default.
+    description: ''
+- uid: az_acr_import-pipeline_delete
+  name: az acr import-pipeline delete
+  summary: Delete an import pipeline.
+  description: ''
+  syntax: >-
+    az acr import-pipeline delete --name
+                                  --registry
+                                  --resource-group
+  examples:
+  - summary: Delete an import pipeline.
+    syntax: az acr import-pipeline delete --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_import-pipeline_list
+  name: az acr import-pipeline list
+  summary: List import pipelines on a Container Registry.
+  description: ''
+  syntax: >-
+    az acr import-pipeline list --registry
+                                --resource-group
+  examples:
+  - summary: List import pipelines on a container registry
+    syntax: az acr import-pipeline list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_import-pipeline_show
+  name: az acr import-pipeline show
+  summary: Show an import pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr import-pipeline show --name
+                                --registry
+                                --resource-group
+  examples:
+  - summary: Show a specific import pipeline in detail.
+    syntax: az acr import-pipeline show --resource-group $MyRG --registry $MyReg --name $MyPipeline
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the import pipeline.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_import-pipeline_create
+- az_acr_import-pipeline_delete
+- az_acr_import-pipeline_list
+- az_acr_import-pipeline_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR import pipelines.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/acr/pipeline-run.yml b/2019-03-01-hybrid/docs-ref-autogen/acr/pipeline-run.yml
new file mode 100644
index 0000000000..3e3b2410c4
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/acr/pipeline-run.yml
@@ -0,0 +1,149 @@
+### YamlMime:AzureCLIGroup
+uid: az_acr_pipeline-run
+name: az acr pipeline-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **acrtransfer** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az acr pipeline-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage ACR import and export pipeline runs.
+description: ''
+directCommands:
+- uid: az_acr_pipeline-run_create
+  name: az acr pipeline-run create
+  summary: Create a pipeline run.
+  description: ''
+  syntax: >-
+    az acr pipeline-run create --name
+                               --pipeline
+                               --pipeline-type
+                               --registry
+                               --resource-group
+                               --storage-blob
+                               [--artifacts]
+                               [--force-redeploy]
+  examples:
+  - summary: Create an import pipeline run.
+    syntax: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type import --storage-blob $MyBlob
+  - summary: Create an export pipeline run and force redeploy.
+    syntax: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type export --storage-blob $MyBlob --artifacts hello-world:latest hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042 --force-redeploy
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --pipeline -p
+    summary: Name of the pipeline to run.
+    description: ''
+  - isRequired: true
+    name: --pipeline-type -t
+    summary: Type of pipeline. Must be either import or export.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --storage-blob -b
+    summary: Name of the storage blob to be imported or exported.
+    description: ''
+  optionalParameters:
+  - name: --artifacts -a
+    summary: Space-separated list of container artifacts. Artifacts must be either of the form `repository:tag` or `repository@digest` such as hello-world:latest or hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042.
+    description: ''
+  - name: --force-redeploy -f
+    summary: Flag that forces ARM to redeploy resource even if no parameters have changed.
+    description: ''
+- uid: az_acr_pipeline-run_delete
+  name: az acr pipeline-run delete
+  summary: Delete an export pipeline.
+  description: ''
+  syntax: >-
+    az acr pipeline-run delete --name
+                               --registry
+                               --resource-group
+  examples:
+  - summary: Delete an export pipeline.
+    syntax: az acr pipeline-run delete --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_pipeline-run_list
+  name: az acr pipeline-run list
+  summary: List pipelineruns of all pipelines on a container registry.
+  description: ''
+  syntax: >-
+    az acr pipeline-run list --registry
+                             --resource-group
+  examples:
+  - summary: List all export pipelines on a container registry
+    syntax: az acr pipeline-run list --resource-group $MyRG --registry $MyReg
+  requiredParameters:
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_acr_pipeline-run_show
+  name: az acr pipeline-run show
+  summary: Show an export pipeline in detail.
+  description: ''
+  syntax: >-
+    az acr pipeline-run show --name
+                             --registry
+                             --resource-group
+  examples:
+  - summary: Show a specific export pipeline in detail.
+    syntax: az acr pipeline-run show --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the pipeline run.
+    description: ''
+  - isRequired: true
+    name: --registry -r
+    summary: Name of registry.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_acr_pipeline-run_create
+- az_acr_pipeline-run_delete
+- az_acr_pipeline-run_list
+- az_acr_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage ACR import and export pipeline runs.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad.yml b/2019-03-01-hybrid/docs-ref-autogen/ad.yml
index f843119468..4e8e0c6308 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad.yml
@@ -1,190 +1,75 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad
-  name: az ad
-  summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_ad
+name: az ad
+summary: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
+description: ''
 commands:
-- uid: az_ad_app
-  name: az ad app
-  summary: Manage applications with AAD Graph.
-- uid: az_ad_app_create
-  name: az ad app create
-  summary: Create a web application, web API or native application.
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
-- uid: az_ad_app_delete
-  name: az ad app delete
-  summary: Delete an application.
-- uid: az_ad_app_list
-  name: az ad app list
-  summary: List applications.
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
-- uid: az_ad_app_show
-  name: az ad app show
-  summary: Get the details of an application.
-- uid: az_ad_app_update
-  name: az ad app update
-  summary: Update an application.
-- uid: az_ad_group
-  name: az ad group
-  summary: Manage Azure Active Directory groups.
-- uid: az_ad_group_create
-  name: az ad group create
-  summary: Create a group in the directory.
-- uid: az_ad_group_delete
-  name: az ad group delete
-  summary: Delete a group from the directory.
-- uid: az_ad_group_get_member_groups
-  name: az ad group get-member-groups
-  summary: Gets a collection of object IDs of groups of which the specified group is a member.
-- uid: az_ad_group_list
-  name: az ad group list
-  summary: List groups in the directory.
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
-- uid: az_ad_group_show
-  name: az ad group show
-  summary: Gets group information from the directory.
-- uid: az_ad_signed_in_user
-  name: az ad signed-in-user
-  summary: Show graph information about current signed-in user in CLI.
-- uid: az_ad_signed_in_user_list_owned_objects
-  name: az ad signed-in-user list-owned-objects
-  summary: Get the list of directory objects that are owned by the user.
-- uid: az_ad_signed_in_user_show
-  name: az ad signed-in-user show
-  summary: Gets the details for the currently logged-in user.
-- uid: az_ad_sp
-  name: az ad sp
-  summary: Manage Azure Active Directory service principals for automation authentication.
-- uid: az_ad_sp_create
-  name: az ad sp create
-  summary: Create a service principal.
-- uid: az_ad_sp_create_for_rbac
-  name: az ad sp create-for-rbac
-  summary: Create a service principal and configure its access to Azure resources.
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
-- uid: az_ad_sp_delete
-  name: az ad sp delete
-  summary: Delete a service principal and its role assignments.
-- uid: az_ad_sp_list
-  name: az ad sp list
-  summary: List service principals.
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
-- uid: az_ad_sp_show
-  name: az ad sp show
-  summary: Get the details of a service principal.
-- uid: az_ad_sp_update
-  name: az ad sp update
-  summary: Update a service principal.
-- uid: az_ad_user
-  name: az ad user
-  summary: Manage Azure Active Directory users and user authentication.
-- uid: az_ad_user_create
-  name: az ad user create
-  summary: Create an Azure Active Directory user.
-- uid: az_ad_user_delete
-  name: az ad user delete
-  summary: Delete a user.
-- uid: az_ad_user_get_member_groups
-  name: az ad user get-member-groups
-  summary: Get groups of which the user is a member.
-- uid: az_ad_user_list
-  name: az ad user list
-  summary: List Azure Active Directory users.
-- uid: az_ad_user_show
-  name: az ad user show
-  summary: Gets user information from the directory.
-- uid: az_ad_user_update
-  name: az ad user update
-  summary: Update Azure Active Directory users.
+- az_ad_app
+- az_ad_app_create
+- az_ad_app_credential
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
+- az_ad_app_delete
+- az_ad_app_list
+- az_ad_app_owner
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
+- az_ad_app_permission
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
+- az_ad_app_show
+- az_ad_app_update
+- az_ad_ds
+- az_ad_ds_create
+- az_ad_ds_delete
+- az_ad_ds_list
+- az_ad_ds_show
+- az_ad_ds_update
+- az_ad_ds_wait
+- az_ad_group
+- az_ad_group_create
+- az_ad_group_delete
+- az_ad_group_get-member-groups
+- az_ad_group_list
+- az_ad_group_member
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
+- az_ad_group_owner
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
+- az_ad_group_show
+- az_ad_signed-in-user
+- az_ad_signed-in-user_list-owned-objects
+- az_ad_signed-in-user_show
+- az_ad_sp
+- az_ad_sp_create
+- az_ad_sp_create-for-rbac
+- az_ad_sp_credential
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
+- az_ad_sp_delete
+- az_ad_sp_list
+- az_ad_sp_owner
+- az_ad_sp_owner_list
+- az_ad_sp_show
+- az_ad_sp_update
+- az_ad_user
+- az_ad_user_create
+- az_ad_user_delete
+- az_ad_user_get-member-groups
+- az_ad_user_list
+- az_ad_user_show
+- az_ad_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +85,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory Graph entities needed for Role Based Access Control.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/app.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/app.yml
index 5ed3dbe609..e704c73e5f 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/app.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/app.yml
@@ -1,84 +1,90 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app
-  name: az ad app
-  summary: Manage applications with AAD Graph.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_create
-  - az_ad_app_delete
-  - az_ad_app_list
-  - az_ad_app_show
-  - az_ad_app_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_app
+name: az ad app
+summary: Manage applications with AAD Graph.
+description: ''
+directCommands:
 - uid: az_ad_app_create
   name: az ad app create
   summary: Create a web application, web API or native application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app create --display-name
+                     [--app-roles]
+                     [--available-to-other-tenants {false, true}]
+                     [--credential-description]
+                     [--end-date]
+                     [--homepage]
+                     [--identifier-uris]
+                     [--key-type {AsymmetricX509Cert, Password, Symmetric}]
+                     [--key-usage {Sign, Verify}]
+                     [--key-value]
+                     [--native-app {false, true}]
+                     [--oauth2-allow-implicit-flow {false, true}]
+                     [--optional-claims]
+                     [--password]
+                     [--reply-urls]
+                     [--required-resource-accesses]
+                     [--start-date]
   examples:
   - summary: Create a native application with delegated permission of "access the AAD directory as the signed-in user"
-    syntax:
-      content: >-
-        az ad app create --display-name my-native --native-app --required-resource-accesses @manifest.json
+    syntax: >-
+      az ad app create --display-name my-native --native-app --required-resource-accesses @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "resourceAppId": "00000002-0000-0000-c000-000000000000",
-            "resourceAccess": [
-                {
-                    "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
-                    "type": "Scope"
-                }
-           ]
-        }]
+      [{
+          "resourceAppId": "00000002-0000-0000-c000-000000000000",
+          "resourceAccess": [
+              {
+                  "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
+                  "type": "Scope"
+              }
+         ]
+      }]
   - summary: Create an application with a role
-    syntax:
-      content: >-
-        az ad app create --id e042ec79-34cd-498f-9d9f-123456781234 --display-name mytestapp --identifier-uris https://mytestapp.websites.net --app-roles @manifest.json
+    syntax: >-
+      az ad app create --display-name mytestapp --identifier-uris https://mytestapp.websites.net --app-roles @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "allowedMemberTypes": [
-              "User"
-            ],
-            "description": "Approvers can mark documents as approved",
-            "displayName": "Approver",
-            "isEnabled": "true",
-            "value": "approver"
-        }]
+      [{
+          "allowedMemberTypes": [
+            "User"
+          ],
+          "description": "Approvers can mark documents as approved",
+          "displayName": "Approver",
+          "isEnabled": "true",
+          "value": "approver"
+      }]
   - summary: Create an application with optional claims
-    syntax:
-      content: >-
-        az ad app create --display-name mytestapp --optional-claims @manifest.json
+    syntax: >-
+      az ad app create --display-name mytestapp --optional-claims @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        {
-            "idToken": [
-                {
-                    "name": "auth_time",
-                    "source": null,
-                    "essential": false
-                }
-            ],
-            "accessToken": [
-                {
-                    "name": "email",
-                    "source": null,
-                    "essential": false
-                }
-            ]
-        }
-  parameters:
+      {
+          "idToken": [
+              {
+                  "name": "auth_time",
+                  "source": null,
+                  "essential": false
+              }
+          ],
+          "accessToken": [
+              {
+                  "name": "email",
+                  "source": null,
+                  "essential": false
+              }
+          ]
+      }
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: The display name of the application.
     description: ''
+  optionalParameters:
   - name: --app-roles
     summary: Declare the roles you want to associate with your application. Should be in manifest json format. See examples below for details.
     description: ''
@@ -120,7 +126,7 @@ items:
     summary: Whether to allow implicit grant flow for OAuth2.
     description: ''
   - name: --optional-claims
-    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference <a href="https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type">https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type</a> for optional claim properties.
+    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type for optional claim properties.
     description: ''
   - name: --password
     summary: App password, aka 'client secret'.
@@ -134,40 +140,34 @@ items:
   - name: --start-date
     summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_delete
   name: az ad app delete
   summary: Delete an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad app delete --id
   examples:
   - summary: Delete an application. (autogenerated)
-    syntax:
-      content: az ad app delete --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app delete --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_list
   name: az ad app list
   summary: List applications.
   description: For low latency, by default, only the first 100 will be returned unless you provide filter arguments or use "--all".
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad app list [--all]
+                   [--app-id]
+                   [--display-name]
+                   [--filter]
+                   [--identifier-uri]
+                   [--query-examples]
+                   [--show-mine]
+  optionalParameters:
   - name: --all
     summary: List all entities, expect long delay if under a big organization.
     description: ''
@@ -183,106 +183,123 @@ items:
   - name: --identifier-uri
     summary: Graph application identifier, must be in uri format.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --show-mine
     summary: List entities owned by the current user.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_show
   name: az ad app show
   summary: Get the details of an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app show --id
+                   [--query-examples]
   examples:
   - summary: Get the details of an application. (autogenerated)
-    syntax:
-      content: az ad app show --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app show --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_update
   name: az ad app update
   summary: Update an application.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app update --id
+                     [--add]
+                     [--app-roles]
+                     [--available-to-other-tenants {false, true}]
+                     [--credential-description]
+                     [--display-name]
+                     [--end-date]
+                     [--force-string]
+                     [--homepage]
+                     [--identifier-uris]
+                     [--key-type {AsymmetricX509Cert, Password, Symmetric}]
+                     [--key-usage {Sign, Verify}]
+                     [--key-value]
+                     [--oauth2-allow-implicit-flow {false, true}]
+                     [--optional-claims]
+                     [--password]
+                     [--remove]
+                     [--reply-urls]
+                     [--required-resource-accesses]
+                     [--set]
+                     [--start-date]
   examples:
   - summary: update a native application with delegated permission of "access the AAD directory as the signed-in user"
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --required-resource-accesses @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --required-resource-accesses @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "resourceAppId": "00000002-0000-0000-c000-000000000000",
-            "resourceAccess": [
-                {
-                    "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
-                    "type": "Scope"
-                }
-           ]
-        }]
+      [{
+          "resourceAppId": "00000002-0000-0000-c000-000000000000",
+          "resourceAccess": [
+              {
+                  "id": "a42657d6-7f20-40e3-b6f0-cee03008a62a",
+                  "type": "Scope"
+              }
+         ]
+      }]
   - summary: declare an application role
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --app-roles @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --app-roles @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        [{
-            "allowedMemberTypes": [
-              "User"
-            ],
-            "description": "Approvers can mark documents as approved",
-            "displayName": "Approver",
-            "isEnabled": "true",
-            "value": "approver"
-        }]
+      [{
+          "allowedMemberTypes": [
+            "User"
+          ],
+          "description": "Approvers can mark documents as approved",
+          "displayName": "Approver",
+          "isEnabled": "true",
+          "value": "approver"
+      }]
   - summary: update optional claims
-    syntax:
-      content: >-
-        az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --optional-claims @manifest.json
+    syntax: >-
+      az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --optional-claims @manifest.json
 
-        ("manifest.json" contains the following content)
+      ("manifest.json" contains the following content)
 
-        {
-            "idToken": [
-                {
-                    "name": "auth_time",
-                    "source": null,
-                    "essential": false
-                }
-            ],
-            "accessToken": [
-                {
-                    "name": "email",
-                    "source": null,
-                    "essential": false
-                }
-            ]
-        }
+      {
+          "idToken": [
+              {
+                  "name": "auth_time",
+                  "source": null,
+                  "essential": false
+              }
+          ],
+          "accessToken": [
+              {
+                  "name": "email",
+                  "source": null,
+                  "essential": false
+              }
+          ]
+      }
   - summary: update an application's group membership claims to "All"
-    syntax:
-      content: az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --set groupMembershipClaims=All
-  parameters:
+    syntax: az ad app update --id e042ec79-34cd-498f-9d9f-123456781234 --set groupMembershipClaims=All
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
   - name: --app-roles
     summary: Declare the roles you want to associate with your application. Should be in manifest json format. See examples below for details.
     description: ''
@@ -299,6 +316,9 @@ items:
   - name: --end-date
     summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
     description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
   - name: --homepage
     summary: The url where users can sign in and use your app.
     description: ''
@@ -323,99 +343,48 @@ items:
     summary: Whether to allow implicit grant flow for OAuth2.
     description: ''
   - name: --optional-claims
-    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference <a href="https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type">https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type</a> for optional claim properties.
+    summary: Declare the optional claims for the application. Should be in manifest json format. See examples below for details. Please reference https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-optional-claims#optionalclaim-type for optional claim properties.
     description: ''
   - name: --password
     summary: App password, aka 'client secret'.
     description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
   - name: --reply-urls
     summary: Space-separated URIs to which Azure AD will redirect in response to an OAuth 2.0 request. The value does not need to be a physical endpoint, but must be a valid URI.
     description: ''
   - name: --required-resource-accesses
     summary: Resource scopes and roles the application requires access to. Should be in manifest json format. See examples below for details.
     description: ''
-  - name: --start-date
-    summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
-    description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
-    description: ''
-  - name: --remove
-    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
-    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --start-date
+    summary: Date or datetime at which credentials become valid(e.g. '2017-01-01T01:00:00+00:00' or '2017-01-01'). Default value is current time.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_create
-  name: az ad app create
-  summary: Create a web application, web API or native application.
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
-- uid: az_ad_app_delete
-  name: az ad app delete
-  summary: Delete an application.
-- uid: az_ad_app_list
-  name: az ad app list
-  summary: List applications.
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
-- uid: az_ad_app_show
-  name: az ad app show
-  summary: Get the details of an application.
-- uid: az_ad_app_update
-  name: az ad app update
-  summary: Update an application.
+- az_ad_app_create
+- az_ad_app_credential
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
+- az_ad_app_delete
+- az_ad_app_list
+- az_ad_app_owner
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
+- az_ad_app_permission
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
+- az_ad_app_show
+- az_ad_app_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -431,10 +400,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage applications with AAD Graph.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage applications with AAD Graph.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml
index b56156ff5a..b58c58b89a 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/app/credential.yml
@@ -1,26 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_credential
-  name: az ad app credential
-  summary: Manage an application's password or certificate credentials.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_credential_delete
-  - az_ad_app_credential_list
-  - az_ad_app_credential_reset
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_credential
+name: az ad app credential
+summary: Manage an application's password or certificate credentials.
+description: ''
+directCommands:
 - uid: az_ad_app_credential_delete
   name: az ad app credential delete
   summary: Delete an application's password or certificate credentials.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app credential delete --id
+                                --key-id
+                                [--cert]
   examples:
   - summary: delete an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad app credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -29,69 +24,86 @@ items:
     name: --key-id
     summary: Credential key id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_credential_list
   name: az ad app credential list
-  summary: List an application's password or certificate credentials.
+  summary: List an application's password or certificate credential metadata. (The content of the password or certificate credential is not retrievable.).
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app credential list --id
+                              [--cert]
+                              [--query-examples]
   examples:
   - summary: list an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app credential list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_credential_reset
   name: az ad app credential reset
   summary: Append or overwrite an application's password or certificate credentials.
-  description: ''
-  langs:
-  - azurecli
+  description: The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az ad app credential reset --id
+                               [--append]
+                               [--cert]
+                               [--create-cert]
+                               [--credential-description]
+                               [--end-date]
+                               [--keyvault]
+                               [--password]
+                               [--years]
   examples:
+  - summary: Append a certificate to the application with the certificate string.
+    syntax: az ad app credential reset --id 00000000-0000-0000-0000-000000000000 --cert "MIICoT..." --append
+  - summary: Append a certificate to the application with the certificate file.
+    syntax: >-
+      az ad app credential reset --id 00000000-0000-0000-0000-000000000000 --cert "@~/cert.pem" --append
+
+      cert.pem contains the following content
+
+      -----BEGIN CERTIFICATE-----  <<< this line is optional
+
+      MIICoT...
+
+      -----END CERTIFICATE-----    <<< this line is optional
   - summary: append or overwrite an application's password or certificate credentials (autogenerated)
-    syntax:
-      content: az ad app credential reset --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app credential reset --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --append
     summary: Append the new credential instead of overwriting.
     description: ''
-  - name: --credential-description
-    summary: The description of the password.
-    description: ''
-  - name: --end-date
-    summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
-    description: ''
   - name: --cert
     summary: Certificate to use for credentials.
     description: ''
   - name: --create-cert
     summary: Create a self-signed certificate to use for the credential.
     description: ''
+  - name: --credential-description
+    summary: The description of the password.
+    description: ''
+  - name: --end-date
+    summary: Date or datetime after which credentials expire(e.g. '2017-12-31T11:59:59+00:00' or '2017-12-31'). Default value is one year after current time.
+    description: ''
   - name: --keyvault
     summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
     description: ''
@@ -101,22 +113,11 @@ items:
   - name: --years
     summary: Number of years for which the credentials will be valid.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_credential_delete
-  name: az ad app credential delete
-  summary: Delete an application's password or certificate credentials.
-- uid: az_ad_app_credential_list
-  name: az ad app credential list
-  summary: List an application's password or certificate credentials.
-- uid: az_ad_app_credential_reset
-  name: az ad app credential reset
-  summary: Append or overwrite an application's password or certificate credentials.
+- az_ad_app_credential_delete
+- az_ad_app_credential_list
+- az_ad_app_credential_reset
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -132,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage an application's password or certificate credentials.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage an application's password or certificate credentials.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml
index 0b8fbdc9e9..e023aa07a3 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/app/owner.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_owner
-  name: az ad app owner
-  summary: Manage application owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_owner_add
-  - az_ad_app_owner_list
-  - az_ad_app_owner_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_owner
+name: az ad app owner
+summary: Manage application owners.
+description: ''
+directCommands:
 - uid: az_ad_app_owner_add
   name: az ad app owner add
   summary: Add an application owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app owner add --id
+                        --owner-object-id
   examples:
   - summary: add an application owner. (autogenerated)
-    syntax:
-      content: az ad app owner add --id 00000000-0000-0000-0000-000000000000 --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad app owner add --id 00000000-0000-0000-0000-000000000000 --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -29,40 +23,35 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_owner_list
   name: az ad app owner list
   summary: List application owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app owner list --id
+                         [--query-examples]
   examples:
   - summary: List application owners. (autogenerated)
-    syntax:
-      content: az ad app owner list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad app owner list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_owner_remove
   name: az ad app owner remove
   summary: Remove an application owner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad app owner remove --id
+                           --owner-object-id
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
@@ -71,22 +60,11 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_owner_add
-  name: az ad app owner add
-  summary: Add an application owner.
-- uid: az_ad_app_owner_list
-  name: az ad app owner list
-  summary: List application owners.
-- uid: az_ad_app_owner_remove
-  name: az ad app owner remove
-  summary: Remove an application owner.
+- az_ad_app_owner_add
+- az_ad_app_owner_list
+- az_ad_app_owner_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -102,10 +80,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage application owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage application owners.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml
index 0452d8f7b7..74f2d3e691 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/app/permission.yml
@@ -1,112 +1,111 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_app_permission
-  name: az ad app permission
-  summary: Manage an application's OAuth2 permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_app_permission_add
-  - az_ad_app_permission_admin_consent
-  - az_ad_app_permission_delete
-  - az_ad_app_permission_grant
-  - az_ad_app_permission_list
-  - az_ad_app_permission_list_grants
+### YamlMime:AzureCLIGroup
+uid: az_ad_app_permission
+name: az ad app permission
+summary: Manage an application's OAuth2 permissions.
+description: ''
+directCommands:
 - uid: az_ad_app_permission_add
   name: az ad app permission add
   summary: Add an API permission.
-  description: Invoking "az ad app permission grant" is needed to activate it.
-  langs:
-  - azurecli
+  description: >-
+    Invoking "az ad app permission grant" is needed to activate it.
+
+
+    To get available permissions of the resource app, run `az ad sp show --id <resource-appId>`. For example, to get available permissions for Graph API:
+      - Azure Active Directory Graph: `az ad sp show --id 00000002-0000-0000-c000-000000000000`
+      - Microsoft Graph: `az ad sp show --id 00000003-0000-0000-c000-000000000000`
+    Application permissions under the `appRoles` property correspond to `Role` in --api-permissions. Delegated permissions under the `oauth2Permissions` property correspond to `Scope` in --api-permissions.
+  syntax: >-
+    az ad app permission add --api
+                             --api-permissions
+                             --id
   examples:
-  - summary: add a Graph API permission of "Sign in and read user profile"
-    syntax:
-      content: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6=Scope
-  parameters:
+  - summary: Add Azure Active Directory Graph delegated permission User.Read (Sign in and read user profile).
+    syntax: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6=Scope
+  - summary: Add Azure Active Directory Graph application permission Application.ReadWrite.All (Read and write all applications).
+    syntax: az ad app permission add --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 1cda74f2-2616-4834-b122-5cb1b07f8a59=Role
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --api-permissions
-    summary: Space separated list of `&lt;resource-access-id&gt;=&lt;type&gt;`.
+    summary: Specify `ResourceAccess.id` - The unique identifier for one of the OAuth2Permission or AppRole instances that the resource application exposes. Space-separated list of `<resource-access-id>=<type>`.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_app_permission_admin_consent
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_app_permission_admin-consent
   name: az ad app permission admin-consent
   summary: Grant Application & Delegated permissions through admin-consent.
   description: You must login as a directory administrator.
-  langs:
-  - azurecli
+  syntax: az ad app permission admin-consent --id
   examples:
-  - summary: grant Application & Delegated permissions through admin-consent. (autogenerated)
-    syntax:
-      content: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
-  parameters:
+  - summary: Grant Application & Delegated permissions through admin-consent. (autogenerated)
+    syntax: az ad app permission admin-consent --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_delete
   name: az ad app permission delete
   summary: Remove an API permission.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission delete --api
+                                --id
+                                [--api-permissions]
   examples:
-  - summary: remove an AAD graph permission
-    syntax:
-      content: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000
-  parameters:
+  - summary: Remove Azure Active Directory Graph permissions.
+    syntax: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000
+  - summary: Remove Azure Active Directory Graph delegated permission User.Read (Sign in and read user profile).
+    syntax: az ad app permission delete --id eeba0b46-78e5-4a1a-a1aa-cafe6c123456 --api 00000002-0000-0000-c000-000000000000 --api-permissions 311a71cc-e848-46a1-bdf8-97ff7156d8e6
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --api-permissions
+    summary: Specify `ResourceAccess.id` - The unique identifier for one of the OAuth2Permission or AppRole instances that the resource application exposes. Space-separated list of `<resource-access-id>`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_grant
   name: az ad app permission grant
   summary: Grant the app an API Delegated permissions.
-  description: For Application permissions, please use "ad app permission admin-consent".
-  langs:
-  - azurecli
+  description: >-
+    A service principal must exist for the app when running this command. To create a corresponding service principal, use `az ad sp create --id {appId}`.
+
+    For Application permissions, please use "ad app permission admin-consent".
+  syntax: >-
+    az ad app permission grant --api
+                               --id
+                               [--consent-type {AllPrincipals, Principal}]
+                               [--expires]
+                               [--principal-id]
+                               [--scope]
   examples:
   - summary: Grant a native application with permissions to access an existing API with TTL of 2 years
-    syntax:
-      content: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --api a0322f79-57df-498f-9d9f-12678 --expires 2
-  parameters:
+    syntax: az ad app permission grant --id e042ec79-34cd-498f-9d9f-1234234 --api a0322f79-57df-498f-9d9f-12678 --expires 2
+  requiredParameters:
   - isRequired: true
     name: --api
-    summary: The target API to access.
+    summary: Specify `RequiredResourceAccess.resourceAppId` - The unique identifier for the resource that the application requires access to. This should be equal to the appId declared on the target resource application.
     description: ''
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id.
     description: ''
+  optionalParameters:
   - name: --consent-type
     defaultValue: AllPrincipals
     parameterValueGroup: AllPrincipals, Principal
@@ -123,44 +122,39 @@ items:
     defaultValue: user_impersonation
     summary: Specifies the value of the scope claim that the resource application should expect in the OAuth 2.0 access token, e.g. User.Read.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_app_permission_list
   name: az ad app permission list
   summary: List API permissions the application has requested.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission list --id
+                              [--query-examples]
   examples:
   - summary: List the OAuth2 permissions for an existing AAD app
-    syntax:
-      content: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234
-  parameters:
+    syntax: az ad app permission list --id e042ec79-34cd-498f-9d9f-1234234
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the associated application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_app_permission_list_grants
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_app_permission_list-grants
   name: az ad app permission list-grants
   summary: List Oauth2 permission grants.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad app permission list-grants [--filter]
+                                     [--id]
+                                     [--show-resource-name {false, true}]
   examples:
   - summary: list oauth2 permissions granted to the service principal
-    syntax:
-      content: az ad app permission list-grants --id e042ec79-34cd-498f-9d9f-1234234123456
-  parameters:
+    syntax: az ad app permission list-grants --id e042ec79-34cd-498f-9d9f-1234234123456
+  optionalParameters:
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
@@ -171,31 +165,14 @@ items:
     parameterValueGroup: false, true
     summary: Show resource's display name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_app_permission_add
-  name: az ad app permission add
-  summary: Add an API permission.
-- uid: az_ad_app_permission_admin_consent
-  name: az ad app permission admin-consent
-  summary: Grant Application & Delegated permissions through admin-consent.
-- uid: az_ad_app_permission_delete
-  name: az ad app permission delete
-  summary: Remove an API permission.
-- uid: az_ad_app_permission_grant
-  name: az ad app permission grant
-  summary: Grant the app an API Delegated permissions.
-- uid: az_ad_app_permission_list
-  name: az ad app permission list
-  summary: List API permissions the application has requested.
-- uid: az_ad_app_permission_list_grants
-  name: az ad app permission list-grants
-  summary: List Oauth2 permission grants.
+- az_ad_app_permission_add
+- az_ad_app_permission_admin-consent
+- az_ad_app_permission_delete
+- az_ad_app_permission_grant
+- az_ad_app_permission_list
+- az_ad_app_permission_list-grants
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,10 +188,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage an application's OAuth2 permissions.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage an application's OAuth2 permissions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/ds.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/ds.yml
new file mode 100644
index 0000000000..f02cede4fd
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/ds.yml
@@ -0,0 +1,438 @@
+### YamlMime:AzureCLIGroup
+uid: az_ad_ds
+name: az ad ds
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ad** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az ad ds** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage domain service with azure active directory.
+description: ''
+directCommands:
+- uid: az_ad_ds_create
+  name: az ad ds create
+  summary: Create a new domain service with the specified parameters.
+  description: ''
+  syntax: >-
+    az ad ds create --domain
+                    --name
+                    --replica-sets
+                    --resource-group
+                    [--domain-config-type {FullySynced, ResourceTrusting}]
+                    [--external-access {Disabled, Enabled}]
+                    [--filtered-sync {Disabled, Enabled}]
+                    [--ldaps {Disabled, Enabled}]
+                    [--no-wait]
+                    [--notify-dc-admins {Disabled, Enabled}]
+                    [--notify-global-admins {Disabled, Enabled}]
+                    [--notify-others]
+                    [--ntlm-v1 {Disabled, Enabled}]
+                    [--pfx-cert]
+                    [--pfx-cert-pwd]
+                    [--resource-forest {Disabled, Enabled}]
+                    [--settings]
+                    [--sku {Enterprise, Premium, Standard}]
+                    [--sync-kerberos-pwd {Disabled, Enabled}]
+                    [--sync-ntlm-pwd {Disabled, Enabled}]
+                    [--sync-on-prem-pwd {Disabled, Enabled}]
+                    [--tags]
+                    [--tls-v1 {Disabled, Enabled}]
+  examples:
+  - summary: Create Domain Service
+    syntax: az ad ds create --domain "TestDS.com" --replica-sets location="West US" subnet-id="<subnetId>" --name "TestDS.com" --resource-group "rg"
+  - summary: Create Domain Service with specified settings (Line breaks for legibility only)
+    syntax: >-
+      az ad ds create --domain "TestDS.com" --replica-sets location="West US" subnet-id="<subnetId>" --name "TestDS.com" --resource-group "rg"
+
+      --ntlm-v1 "Enabled" --sync-ntlm-pwd "Enabled" --tls-v1 "Disabled" --filtered-sync "Enabled" --external-access "Enabled"
+
+      --ldaps "Enabled" --pfx-cert "cert or path to cert" --pfx-cert-pwd "<pfxCertificatePassword>"
+
+      --notify-others "a@gmail.com" "b@gmail.com" --notify-dc-admins "Enabled" --notify-global-admins "Enabled"
+  requiredParameters:
+  - isRequired: true
+    name: --domain
+    summary: The name of the Azure domain that the user would like to deploy Domain Services to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --replica-sets
+    summary: List of ReplicaSets.
+    description: >-
+      Usage: --replica-sets location=XX subnet-id=XX
+
+
+      location: Virtual network location
+
+      subnet-id: The id of the subnet that Domain Services will be deployed on.
+
+
+      Multiple actions can be specified by using more than one --replica-sets argument.
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --domain-config-type
+    parameterValueGroup: FullySynced, ResourceTrusting
+    summary: Domain Configuration Type.
+    description: ''
+  - name: --external-access
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP access over the internet is enabled or disabled.
+    description: ''
+  - name: --filtered-sync
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled or Disabled flag to turn on Group-based filtered sync.
+    description: ''
+  - name: --ldaps
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP is enabled or disabled.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notify-dc-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should domain controller admins be notified.
+    description: ''
+  - name: --notify-global-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should global admins be notified.
+    description: ''
+  - name: --notify-others
+    summary: The list of additional recipients.
+    description: ''
+  - name: --ntlm-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not NtlmV1 is enabled or disabled.
+    description: ''
+  - name: --pfx-cert
+    summary: The certificate required to configure Secure LDAP. The parameter passed here should be the file path to the certificate pfx file or a base64encoded representation of the certificate pfx file.
+    description: ''
+  - name: --pfx-cert-pwd
+    summary: The password to decrypt the provided Secure LDAP certificate pfx file.
+    description: ''
+  - name: --resource-forest
+    parameterValueGroup: Disabled, Enabled
+    summary: Resource Forest.
+    description: ''
+  - name: --settings
+    summary: List of settings for Resource Forest. This can be either a JSON-formatted string or the location to a file containing the JSON object.
+    description: >-
+      The format of the settings JSON object for Resource Forest:
+
+      [
+          {
+              "trusted_domain_fqdn": "XX",
+              "trust_direction": "XX",
+              "friendly_name": "XX",
+              "remote_dns_ips": "XX",
+              "trust_password": "XX"
+          },
+          ...n
+      ].
+  - name: --sku
+    parameterValueGroup: Enterprise, Premium, Standard
+    summary: Sku Type.
+    description: ''
+  - name: --sync-kerberos-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncKerberosPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-ntlm-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-on-prem-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncOnPremPasswords is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --tls-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not TlsV1 is enabled or disabled.
+    description: ''
+- uid: az_ad_ds_delete
+  name: az ad ds delete
+  summary: The Delete Domain Service operation deletes an existing Domain Service.
+  description: ''
+  syntax: >-
+    az ad ds delete --name
+                    --resource-group
+                    [--no-wait]
+                    [--yes]
+  examples:
+  - summary: Delete Domain Service
+    syntax: az ad ds delete --name "TestDomainService.com" --resource-group "TestResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_ad_ds_list
+  name: az ad ds list
+  summary: List domain services in resource group or in subscription.
+  description: ''
+  syntax: az ad ds list [--resource-group]
+  examples:
+  - summary: List Domain Service By Group
+    syntax: az ad ds list --resource-group "TestResourceGroup"
+  - summary: List Domain Service By Sub
+    syntax: az ad ds list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ad_ds_show
+  name: az ad ds show
+  summary: Get the specified domain service.
+  description: ''
+  syntax: >-
+    az ad ds show --name
+                  --resource-group
+  examples:
+  - summary: Get Domain Service
+    syntax: az ad ds show --name "TestDomainService.com" --resource-group "TestResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_ad_ds_update
+  name: az ad ds update
+  summary: Update the existing deployment properties for domain service.
+  description: ''
+  syntax: >-
+    az ad ds update --name
+                    --resource-group
+                    [--domain-config-type {FullySynced, ResourceTrusting}]
+                    [--external-access {Disabled, Enabled}]
+                    [--filtered-sync {Disabled, Enabled}]
+                    [--ldaps {Disabled, Enabled}]
+                    [--no-wait]
+                    [--notify-dc-admins {Disabled, Enabled}]
+                    [--notify-global-admins {Disabled, Enabled}]
+                    [--notify-others]
+                    [--ntlm-v1 {Disabled, Enabled}]
+                    [--pfx-cert]
+                    [--pfx-cert-pwd]
+                    [--replica-sets]
+                    [--resource-forest {Disabled, Enabled}]
+                    [--settings]
+                    [--sku {Enterprise, Premium, Standard}]
+                    [--sync-kerberos-pwd {Disabled, Enabled}]
+                    [--sync-ntlm-pwd {Disabled, Enabled}]
+                    [--sync-on-prem-pwd {Disabled, Enabled}]
+                    [--tags]
+                    [--tls-v1 {Disabled, Enabled}]
+  examples:
+  - summary: Update sku
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --sku "Enterprise"
+  - summary: Update domain security settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --ntlm-v1 "Enabled" --tls-v1 "Disabled"
+  - summary: Update ldaps settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --external-access "Enabled" --ldaps "Enabled" --pfx-cert "MIIDPDCCAiSg..." --pfx-cert-pwd "<pfxCertificatePassword>"
+  - summary: Update notification settings
+    syntax: az ad ds update --name "TestDS.com" --resource-group "rg" --notify-dc-admins "Enabled" --notify-global-admins "Disabled"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --domain-config-type
+    parameterValueGroup: FullySynced, ResourceTrusting
+    summary: Domain Configuration Type.
+    description: ''
+  - name: --external-access
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP access over the internet is enabled or disabled.
+    description: ''
+  - name: --filtered-sync
+    parameterValueGroup: Disabled, Enabled
+    summary: Enabled or Disabled flag to turn on Group-based filtered sync.
+    description: ''
+  - name: --ldaps
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not Secure LDAP is enabled or disabled.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --notify-dc-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should domain controller admins be notified.
+    description: ''
+  - name: --notify-global-admins
+    parameterValueGroup: Disabled, Enabled
+    summary: Should global admins be notified.
+    description: ''
+  - name: --notify-others
+    summary: The list of additional recipients.
+    description: ''
+  - name: --ntlm-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not NtlmV1 is enabled or disabled.
+    description: ''
+  - name: --pfx-cert
+    summary: The certificate required to configure Secure LDAP. The parameter passed here should be the file path to the certificate pfx file or a base64encoded representation of the certificate pfx file.
+    description: ''
+  - name: --pfx-cert-pwd
+    summary: The password to decrypt the provided Secure LDAP certificate pfx file.
+    description: ''
+  - name: --replica-sets
+    summary: List of ReplicaSets.
+    description: >-
+      Usage: --replica-sets location=XX subnet-id=XX
+
+
+      location: Virtual network location
+
+      subnet-id: The id of the subnet that Domain Services will be deployed on.
+
+
+      Multiple actions can be specified by using more than one --replica-sets argument.
+  - name: --resource-forest
+    parameterValueGroup: Disabled, Enabled
+    summary: Resource Forest.
+    description: ''
+  - name: --settings
+    summary: List of settings for Resource Forest. This can be either a JSON-formatted string or the location to a file containing the JSON object.
+    description: >-
+      The format of the settings JSON object for Resource Forest:
+
+      [
+          {
+              "trusted_domain_fqdn": "XX",
+              "trust_direction": "XX",
+              "friendly_name": "XX",
+              "remote_dns_ips": "XX",
+              "trust_password": "XX"
+          },
+          ...n
+      ].
+  - name: --sku
+    parameterValueGroup: Enterprise, Premium, Standard
+    summary: Sku Type.
+    description: ''
+  - name: --sync-kerberos-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncKerberosPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-ntlm-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncNtlmPasswords is enabled or disabled.
+    description: ''
+  - name: --sync-on-prem-pwd
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not SyncOnPremPasswords is enabled or disabled.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --tls-v1
+    parameterValueGroup: Disabled, Enabled
+    summary: A flag to determine whether or not TlsV1 is enabled or disabled.
+    description: ''
+- uid: az_ad_ds_wait
+  name: az ad ds wait
+  summary: Place the CLI in a waiting state until a condition of the ad ds is met.
+  description: ''
+  syntax: >-
+    az ad ds wait --name
+                  --resource-group
+                  [--created]
+                  [--custom]
+                  [--deleted]
+                  [--exists]
+                  [--interval]
+                  [--timeout]
+                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the ad ds is successfully created.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the ad ds is successfully updated.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the ad ds is successfully deleted.
+    syntax: az ad ds wait --name "TestDomainService.com" --resource-group "TestResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the domain service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_ad_ds_create
+- az_ad_ds_delete
+- az_ad_ds_list
+- az_ad_ds_show
+- az_ad_ds_update
+- az_ad_ds_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage domain service with azure active directory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/group.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/group.yml
index 12abd57e91..083e51c7e2 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/group.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/group.yml
@@ -1,28 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group
-  name: az ad group
-  summary: Manage Azure Active Directory groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_create
-  - az_ad_group_delete
-  - az_ad_group_get_member_groups
-  - az_ad_group_list
-  - az_ad_group_show
+### YamlMime:AzureCLIGroup
+uid: az_ad_group
+name: az ad group
+summary: Manage Azure Active Directory groups.
+description: ''
+directCommands:
 - uid: az_ad_group_create
   name: az ad group create
   summary: Create a group in the directory.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group create --display-name
+                       --mail-nickname
+                       [--description]
+                       [--force {false, true}]
   examples:
   - summary: Create a group in the directory. (autogenerated)
-    syntax:
-      content: az ad group create --display-name MyDisplay --mail-nickname MyDisplay
-  parameters:
+    syntax: az ad group create --display-name MyDisplay --mail-nickname MyDisplay
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: Object's display name or its prefix.
@@ -31,44 +25,40 @@ items:
     name: --mail-nickname
     summary: Mail nickname.
     description: ''
+  optionalParameters:
+  - name: --description
+    summary: Group description.
+    description: ''
   - name: --force
     parameterValueGroup: false, true
     summary: Always create a new group instead of updating the one with same display and mail nickname.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_delete
   name: az ad group delete
   summary: Delete a group from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad group delete --group
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_group_get_member_groups
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_group_get-member-groups
   name: az ad group get-member-groups
   summary: Gets a collection of object IDs of groups of which the specified group is a member.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group get-member-groups --group
+                                  [--additional-properties]
+                                  [--security-enabled-only {false, true}]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
+  optionalParameters:
   - name: --additional-properties
     summary: Unmatched properties from the message are deserialized this collection.
     description: ''
@@ -76,91 +66,58 @@ items:
     parameterValueGroup: false, true
     summary: If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_list
   name: az ad group list
   summary: List groups in the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group list [--display-name]
+                     [--filter]
+                     [--query-examples]
+  optionalParameters:
   - name: --display-name
     summary: Object's display name or its prefix.
     description: ''
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_show
   name: az ad group show
   summary: Gets group information from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group show --group
+                     [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_create
-  name: az ad group create
-  summary: Create a group in the directory.
-- uid: az_ad_group_delete
-  name: az ad group delete
-  summary: Delete a group from the directory.
-- uid: az_ad_group_get_member_groups
-  name: az ad group get-member-groups
-  summary: Gets a collection of object IDs of groups of which the specified group is a member.
-- uid: az_ad_group_list
-  name: az ad group list
-  summary: List groups in the directory.
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
-- uid: az_ad_group_show
-  name: az ad group show
-  summary: Gets group information from the directory.
+- az_ad_group_create
+- az_ad_group_delete
+- az_ad_group_get-member-groups
+- az_ad_group_list
+- az_ad_group_member
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
+- az_ad_group_owner
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
+- az_ad_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -176,10 +133,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory groups.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory groups.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/group/member.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/group/member.yml
index 89af3cbdaa..e5705aa209 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/group/member.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/group/member.yml
@@ -1,23 +1,18 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group_member
-  name: az ad group member
-  summary: Manage Azure Active Directory group members.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_member_add
-  - az_ad_group_member_check
-  - az_ad_group_member_list
-  - az_ad_group_member_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_group_member
+name: az ad group member
+summary: Manage Azure Active Directory group members.
+description: ''
+directCommands:
 - uid: az_ad_group_member_add
   name: az ad group member add
   summary: Add a member to a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member add --group
+                           --member-id
+                           [--additional-properties]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -26,26 +21,22 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
+  optionalParameters:
   - name: --additional-properties
     summary: Unmatched properties from the message are deserialized this collection.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_check
   name: az ad group member check
   summary: Check if a member is in a group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group member check --group
+                             --member-id
   examples:
   - summary: Check if a member is in a group. (autogenerated)
-    syntax:
-      content: az ad group member check --group MyGroupDisplayName --member-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group member check --group MyGroupDisplayName --member-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -54,36 +45,32 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_list
   name: az ad group member list
   summary: Gets the members of a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member list --group
+                            [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_member_remove
   name: az ad group member remove
   summary: Remove a member from a group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad group member remove --group
+                              --member-id
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -92,25 +79,12 @@ items:
     name: --member-id
     summary: The object ID of the contact, group, user, or service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_member_add
-  name: az ad group member add
-  summary: Add a member to a group.
-- uid: az_ad_group_member_check
-  name: az ad group member check
-  summary: Check if a member is in a group.
-- uid: az_ad_group_member_list
-  name: az ad group member list
-  summary: Gets the members of a group.
-- uid: az_ad_group_member_remove
-  name: az ad group member remove
-  summary: Remove a member from a group.
+- az_ad_group_member_add
+- az_ad_group_member_check
+- az_ad_group_member_list
+- az_ad_group_member_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -126,10 +100,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory group members.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory group members.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml
index e58e19029f..5a879fb16d 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/group/owner.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_group_owner
-  name: az ad group owner
-  summary: Manage Azure Active Directory group owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_group_owner_add
-  - az_ad_group_owner_list
-  - az_ad_group_owner_remove
+### YamlMime:AzureCLIGroup
+uid: az_ad_group_owner
+name: az ad group owner
+summary: Manage Azure Active Directory group owners.
+description: ''
+directCommands:
 - uid: az_ad_group_owner_add
   name: az ad group owner add
   summary: Add a group owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner add --group
+                          --owner-object-id
   examples:
   - summary: add a group owner. (autogenerated)
-    syntax:
-      content: az ad group owner add --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group owner add --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -29,44 +23,38 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_owner_list
   name: az ad group owner list
   summary: List group owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner list --group
+                           [--query-examples]
   examples:
   - summary: List group owners. (autogenerated)
-    syntax:
-      content: az ad group owner list --group MyGroupDisplayName
-  parameters:
+    syntax: az ad group owner list --group MyGroupDisplayName
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_group_owner_remove
   name: az ad group owner remove
   summary: Remove a group owner.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad group owner remove --group
+                             --owner-object-id
   examples:
   - summary: remove a group owner. (autogenerated)
-    syntax:
-      content: az ad group owner remove --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+    syntax: az ad group owner remove --group MyGroupDisplayName --owner-object-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --group -g
     summary: Group's object id or display name(prefix also works if there is a unique match).
@@ -75,22 +63,11 @@ items:
     name: --owner-object-id
     summary: Owner's object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_group_owner_add
-  name: az ad group owner add
-  summary: Add a group owner.
-- uid: az_ad_group_owner_list
-  name: az ad group owner list
-  summary: List group owners.
-- uid: az_ad_group_owner_remove
-  name: az ad group owner remove
-  summary: Remove a group owner.
+- az_ad_group_owner_add
+- az_ad_group_owner_list
+- az_ad_group_owner_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -106,10 +83,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory group owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory group owners.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml
index 88125e52b8..e485ad5b81 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/signed-in-user.yml
@@ -1,50 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_signed_in_user
-  name: az ad signed-in-user
-  summary: Show graph information about current signed-in user in CLI.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_signed_in_user_list_owned_objects
-  - az_ad_signed_in_user_show
-- uid: az_ad_signed_in_user_list_owned_objects
+### YamlMime:AzureCLIGroup
+uid: az_ad_signed-in-user
+name: az ad signed-in-user
+summary: Show graph information about current signed-in user in CLI.
+description: ''
+directCommands:
+- uid: az_ad_signed-in-user_list-owned-objects
   name: az ad signed-in-user list-owned-objects
   summary: Get the list of directory objects that are owned by the user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad signed-in-user list-owned-objects [--type]
+  optionalParameters:
   - name: --type -t
     summary: Object type filter, e.g. "application", "servicePrincipal"  "group", etc.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_signed_in_user_show
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_signed-in-user_show
   name: az ad signed-in-user show
   summary: Gets the details for the currently logged-in user.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  syntax: az ad signed-in-user show [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_signed_in_user_list_owned_objects
-  name: az ad signed-in-user list-owned-objects
-  summary: Get the list of directory objects that are owned by the user.
-- uid: az_ad_signed_in_user_show
-  name: az ad signed-in-user show
-  summary: Gets the details for the currently logged-in user.
+- az_ad_signed-in-user_list-owned-objects
+- az_ad_signed-in-user_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -60,10 +42,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Show graph information about current signed-in user in CLI.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Show graph information about current signed-in user in CLI.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/sp.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/sp.yml
index 45ef6d1a48..b25acb5f25 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/sp.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/sp.yml
@@ -1,80 +1,77 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp
-  name: az ad sp
-  summary: Manage Azure Active Directory service principals for automation authentication.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_create
-  - az_ad_sp_create_for_rbac
-  - az_ad_sp_delete
-  - az_ad_sp_list
-  - az_ad_sp_show
-  - az_ad_sp_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp
+name: az ad sp
+summary: Manage Azure Active Directory service principals for automation authentication.
+description: ''
+directCommands:
 - uid: az_ad_sp_create
   name: az ad sp create
   summary: Create a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad sp create --id
   examples:
   - summary: Create a service principal. (autogenerated)
-    syntax:
-      content: az ad sp create --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp create --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier uri, application id, or object id of the associated application.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_sp_create_for_rbac
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_sp_create-for-rbac
   name: az ad sp create-for-rbac
   summary: Create a service principal and configure its access to Azure resources.
-  description: ''
-  langs:
-  - azurecli
+  description: >-
+    The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+
+
+    By default, this command assigns the 'Contributor' role to the service principal at the subscription scope. To reduce your risk of a compromised service principal, use --skip-assignment to avoid creating a role assignment, then assign a more specific role and narrow the scope to a resource or resource group. See [steps to add a role assignment](https://aka.ms/azadsp-more) for more information.
+
+
+    WARNING: In a future release, this command will NOT create a 'Contributor' role assignment by default. If needed, use the --role argument to explicitly create a role assignment.
+  syntax: >-
+    az ad sp create-for-rbac [--cert]
+                             [--create-cert]
+                             [--keyvault]
+                             [--name]
+                             [--role]
+                             [--scopes]
+                             [--sdk-auth {false, true}]
+                             [--skip-assignment {false, true}]
+                             [--years]
   examples:
   - summary: Create with a default role assignment.
-    syntax:
-      content: az ad sp create-for-rbac
+    syntax: az ad sp create-for-rbac
   - summary: Create using a custom name, and with a default assignment.
-    syntax:
-      content: az ad sp create-for-rbac -n "MyApp"
+    syntax: az ad sp create-for-rbac -n "MyApp"
   - summary: Create without a default assignment.
-    syntax:
-      content: az ad sp create-for-rbac --skip-assignment
-  - summary: Create with customized contributor assignments.
-    syntax:
-      content: >-
-        az ad sp create-for-rbac -n "MyApp" --role contributor \
-            --scopes /subscriptions/{SubID}/resourceGroups/{ResourceGroup1} \
-            /subscriptions/{SubID}/resourceGroups/{ResourceGroup2}
+    syntax: az ad sp create-for-rbac --skip-assignment
+  - summary: Create with a Contributor role assignments on specified scope.
+    syntax: az ad sp create-for-rbac -n "MyApp" --role Contributor --scopes /subscriptions/{SubID}/resourceGroups/{ResourceGroup1} /subscriptions/{SubID}/resourceGroups/{ResourceGroup2}
   - summary: Create using a self-signed certificate.
-    syntax:
-      content: az ad sp create-for-rbac --create-cert
+    syntax: az ad sp create-for-rbac --create-cert
   - summary: Create using a self-signed certificate, and store it within KeyVault.
-    syntax:
-      content: az ad sp create-for-rbac --keyvault MyVault --cert CertName --create-cert
+    syntax: az ad sp create-for-rbac --keyvault MyVault --cert CertName --create-cert
   - summary: Create using existing certificate in KeyVault.
-    syntax:
-      content: az ad sp create-for-rbac --keyvault MyVault --cert CertName
-  parameters:
+    syntax: az ad sp create-for-rbac --keyvault MyVault --cert CertName
+  optionalParameters:
+  - name: --cert
+    summary: Certificate to use for credentials.
+    description: When used with `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
+  - name: --create-cert
+    summary: Create a self-signed certificate to use for the credential. Only the current OS user has read/write permission to this certificate.
+    description: Use with `--keyvault` to create the certificate in Key Vault. Otherwise, a certificate will be created locally.
+  - name: --keyvault
+    summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
+    description: ''
   - name: --name -n
     summary: A URI to use as the logic name. It doesn't need to exist. If not present, CLI will generate one.
     description: ''
   - name: --role
-    defaultValue: Contributor
     summary: Role of the service principal.
     description: ''
   - name: --scopes
-    summary: Space-separated list of scopes the service principal's role assignment applies to. Defaults to the root of the current subscription.
+    summary: Space-separated list of scopes the service principal's role assignment applies to. Defaults to the root of the current subscription. e.g., /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333, /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup, or /subscriptions/0b1f6471-1bf0-4dda-aec3-111122223333/resourceGroups/myGroup/providers/Microsoft.Compute/virtualMachines/myVM.
     description: ''
   - name: --sdk-auth
     parameterValueGroup: false, true
@@ -82,54 +79,38 @@ items:
     description: ''
   - name: --skip-assignment
     parameterValueGroup: false, true
-    summary: Skip creating the default assignment, which allows the service principal to access resources under the current subscription.
-    description: ''
-  - name: --cert
-    summary: Certificate to use for credentials.
-    description: When used with `--keyvault,` indicates the name of the cert to use or create. Otherwise, supply a PEM or DER formatted public certificate string. Use `@{path}` to load from a file. Do not include private key info.
-  - name: --create-cert
-    summary: Create a self-signed certificate to use for the credential.
-    description: Use with `--keyvault` to create the certificate in Key Vault. Otherwise, a certificate will be created locally.
-  - name: --keyvault
-    summary: Name or ID of a KeyVault to use for creating or retrieving certificates.
+    summary: Skip creating the default assignment, which allows the service principal to access resources under the current subscription. When specified, --scopes will be ignored. You may use `az role assignment create` to create role assignments for this service principal later.
     description: ''
   - name: --years
     summary: 'Number of years for which the credentials will be valid. Default: 1 year.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_delete
   name: az ad sp delete
   summary: Delete a service principal and its role assignments.
   description: ''
-  langs:
-  - azurecli
+  syntax: az ad sp delete --id
   examples:
   - summary: Delete a service principal and its role assignments. (autogenerated)
-    syntax:
-      content: az ad sp delete --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp delete --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_list
   name: az ad sp list
   summary: List service principals.
   description: For low latency, by default, only the first 100 will be returned unless you provide filter arguments or use "--all".
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad sp list [--all]
+                  [--display-name]
+                  [--filter]
+                  [--query-examples]
+                  [--show-mine]
+                  [--spn]
+  optionalParameters:
   - name: --all
     summary: List all entities, expect long delay if under a big organization.
     description: ''
@@ -139,54 +120,55 @@ items:
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --show-mine
     summary: List entities owned by the current user.
     description: ''
   - name: --spn
     summary: Service principal name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_show
   name: az ad sp show
   summary: Get the details of a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp show --id
+                  [--query-examples]
   examples:
   - summary: Get the details of a service principal. (autogenerated)
-    syntax:
-      content: az ad sp show --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp show --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_update
   name: az ad sp update
   summary: Update a service principal.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp update --id
+                    [--add]
+                    [--force-string]
+                    [--remove]
+                    [--set]
   examples:
   - summary: update a service principal (autogenerated)
-    syntax:
-      content: az ad sp update --id 00000000-0000-0000-0000-000000000000 --set groupMembershipClaims=All
-  parameters:
+    syntax: az ad sp update --id 00000000-0000-0000-0000-000000000000 --set groupMembershipClaims=All
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
+  optionalParameters:
   - name: --add
     summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
@@ -199,49 +181,20 @@ items:
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_create
-  name: az ad sp create
-  summary: Create a service principal.
-- uid: az_ad_sp_create_for_rbac
-  name: az ad sp create-for-rbac
-  summary: Create a service principal and configure its access to Azure resources.
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
-- uid: az_ad_sp_delete
-  name: az ad sp delete
-  summary: Delete a service principal and its role assignments.
-- uid: az_ad_sp_list
-  name: az ad sp list
-  summary: List service principals.
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
-- uid: az_ad_sp_show
-  name: az ad sp show
-  summary: Get the details of a service principal.
-- uid: az_ad_sp_update
-  name: az ad sp update
-  summary: Update a service principal.
+- az_ad_sp_create
+- az_ad_sp_create-for-rbac
+- az_ad_sp_credential
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
+- az_ad_sp_delete
+- az_ad_sp_list
+- az_ad_sp_owner
+- az_ad_sp_owner_list
+- az_ad_sp_show
+- az_ad_sp_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -257,10 +210,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory service principals for automation authentication.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory service principals for automation authentication.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml
index 80370c6e38..a383215bb5 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/sp/credential.yml
@@ -1,26 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp_credential
-  name: az ad sp credential
-  summary: Manage a service principal's credentials.
-  description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_credential_delete
-  - az_ad_sp_credential_list
-  - az_ad_sp_credential_reset
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp_credential
+name: az ad sp credential
+summary: Manage a service principal's credentials.
+description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
+directCommands:
 - uid: az_ad_sp_credential_delete
   name: az ad sp credential delete
   summary: Delete a service principal's credential.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp credential delete --id
+                               --key-id
+                               [--cert]
   examples:
-  - summary: delete a service principal's credential. (autogenerated)
-    syntax:
-      content: az ad sp credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  parameters:
+  - summary: Delete a service principal's credential. (autogenerated)
+    syntax: az ad sp credential delete --id 00000000-0000-0000-0000-000000000000 --key-id xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
@@ -29,54 +24,75 @@ items:
     name: --key-id
     summary: Credential key id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_credential_list
   name: az ad sp credential list
   summary: List a service principal's credentials.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp credential list --id
+                             [--cert]
+                             [--query-examples]
   examples:
-  - summary: list a service principal's credentials. (autogenerated)
-    syntax:
-      content: az ad sp credential list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+  - summary: List a service principal's credentials. (autogenerated)
+    syntax: az ad sp credential list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id.
     description: ''
+  optionalParameters:
   - name: --cert
     summary: A certificate based credential.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_sp_credential_reset
   name: az ad sp credential reset
   summary: Reset a service principal credential.
-  description: Use upon expiration of the service principal's credentials, or in the event that login credentials are lost.
-  langs:
-  - azurecli
+  description: >-
+    Use upon expiration of the service principal's credentials, or in the event that login credentials are lost.
+
+
+    The output includes credentials that you must protect. Be sure that you do not include these credentials in your code or check the credentials into your source control. As an alternative, consider using [managed identities](https://aka.ms/azadsp-managed-identities) if available to avoid the need to use credentials.
+  syntax: >-
+    az ad sp credential reset --name
+                              [--append]
+                              [--cert]
+                              [--create-cert]
+                              [--credential-description]
+                              [--end-date]
+                              [--keyvault]
+                              [--password]
+                              [--years]
   examples:
+  - summary: Append a certificate to the service principal with the certificate string.
+    syntax: az ad sp credential reset --name myapp --cert "MIICoT..." --append
+  - summary: Append a certificate to the service principal with the certificate file.
+    syntax: >-
+      az ad sp credential reset --name myapp --cert "@~/cert.pem" --append
+
+      cert.pem contains the following content
+
+      -----BEGIN CERTIFICATE-----  <<< this line is optional
+
+      MIICoT...
+
+      -----END CERTIFICATE-----    <<< this line is optional
   - summary: Reset a service principal credential. (autogenerated)
-    syntax:
-      content: az ad sp credential reset --name MyAppURIForCredential
-  parameters:
+    syntax: az ad sp credential reset --name MyAppURIForCredential
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name or app ID of the service principal.
     description: ''
+  optionalParameters:
   - name: --append
     summary: Append the new credential instead of overwriting.
     description: ''
@@ -101,22 +117,11 @@ items:
   - name: --years
     summary: 'Number of years for which the credentials will be valid. Default: 1 year.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_credential_delete
-  name: az ad sp credential delete
-  summary: Delete a service principal's credential.
-- uid: az_ad_sp_credential_list
-  name: az ad sp credential list
-  summary: List a service principal's credentials.
-- uid: az_ad_sp_credential_reset
-  name: az ad sp credential reset
-  summary: Reset a service principal credential.
+- az_ad_sp_credential_delete
+- az_ad_sp_credential_list
+- az_ad_sp_credential_reset
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -132,10 +137,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: The credential update will be applied on the Application object the service principal is associated with. In other words, you can accomplish the same thing using "az ad app credential".
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml
index 2480bcb6bc..ef2fe89a5c 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/sp/owner.yml
@@ -1,38 +1,31 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_sp_owner
-  name: az ad sp owner
-  summary: Manage service principal owners.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_sp_owner_list
+### YamlMime:AzureCLIGroup
+uid: az_ad_sp_owner
+name: az ad sp owner
+summary: Manage service principal owners.
+description: ''
+directCommands:
 - uid: az_ad_sp_owner_list
   name: az ad sp owner list
   summary: List service principal owners.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad sp owner list --id
+                        [--query-examples]
   examples:
   - summary: List service principal owners. (autogenerated)
-    syntax:
-      content: az ad sp owner list --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad sp owner list --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Service principal name, or object id or the service principal.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_sp_owner_list
-  name: az ad sp owner list
-  summary: List service principal owners.
+- az_ad_sp_owner_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -48,10 +41,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage service principal owners.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage service principal owners.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ad/user.yml b/2019-03-01-hybrid/docs-ref-autogen/ad/user.yml
index 01908ef4d4..b743b865df 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/ad/user.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/ad/user.yml
@@ -1,25 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_ad_user
-  name: az ad user
-  summary: Manage Azure Active Directory users and user authentication.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_ad_user_create
-  - az_ad_user_delete
-  - az_ad_user_get_member_groups
-  - az_ad_user_list
-  - az_ad_user_show
-  - az_ad_user_update
+### YamlMime:AzureCLIGroup
+uid: az_ad_user
+name: az ad user
+summary: Manage Azure Active Directory users and user authentication.
+description: ''
+directCommands:
 - uid: az_ad_user_create
   name: az ad user create
   summary: Create an Azure Active Directory user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user create --display-name
+                      --password
+                      --user-principal-name
+                      [--force-change-password-next-login {false, true}]
+                      [--immutable-id]
+                      [--mail-nickname]
+  requiredParameters:
   - isRequired: true
     name: --display-name
     summary: Object's display name or its prefix.
@@ -32,9 +28,10 @@ items:
     name: --user-principal-name
     summary: Required. The user principal name (someuser@contoso.com). It must contain one of the verified domains for the tenant.
     description: ''
+  optionalParameters:
   - name: --force-change-password-next-login
     parameterValueGroup: false, true
-    summary: Marks this user as needing to update their password the next time they authenticate.
+    summary: Marks this user as needing to update their password the next time they authenticate. If omitted, false will be used.
     description: ''
   - name: --immutable-id
     summary: This must be specified if you are using a federated domain for the user's userPrincipalName (UPN) property when creating a new user account. It is used to associate an on-premises Active Directory user account with their Azure AD user object.
@@ -42,107 +39,98 @@ items:
   - name: --mail-nickname
     summary: Mail alias. Defaults to user principal name.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_delete
   name: az ad user delete
   summary: Delete a user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az ad user delete --id
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_ad_user_get_member_groups
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
+- uid: az_ad_user_get-member-groups
   name: az ad user get-member-groups
   summary: Get groups of which the user is a member.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad user get-member-groups --id
+                                 [--security-enabled-only]
   examples:
   - summary: Get groups of which the user is a member (autogenerated)
-    syntax:
-      content: az ad user get-member-groups --upn-or-object-id myuser@consoso.com
-  parameters:
+    syntax: az ad user get-member-groups --upn-or-object-id myuser@contoso.com
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
+  optionalParameters:
   - name: --security-enabled-only
     summary: If true, only membership in security-enabled groups should be checked. Otherwise, membership in all groups should be checked.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_list
   name: az ad user list
   summary: List Azure Active Directory users.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user list [--display-name]
+                    [--filter]
+                    [--query-examples]
+                    [--upn]
+  optionalParameters:
   - name: --display-name
     summary: Object's display name or its prefix.
     description: ''
   - name: --filter
     summary: OData filter, e.g. --filter "displayname eq 'test' and servicePrincipalType eq 'Application'".
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --upn
     summary: User principal name, e.g. john.doe@contoso.com.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_show
   name: az ad user show
   summary: Gets user information from the directory.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az ad user show --id
+                    [--query-examples]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 - uid: az_ad_user_update
   name: az ad user update
   summary: Update Azure Active Directory users.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az ad user update --id
+                      [--account-enabled {false, true}]
+                      [--display-name]
+                      [--force-change-password-next-login {false, true}]
+                      [--mail-nickname]
+                      [--password]
   examples:
   - summary: Update Azure Active Directory users. (autogenerated)
-    syntax:
-      content: az ad user update --id 00000000-0000-0000-0000-000000000000
-  parameters:
+    syntax: az ad user update --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The object ID or principal name of the user for which to get information.
     description: ''
+  optionalParameters:
   - name: --account-enabled
     parameterValueGroup: false, true
     summary: Enable the user account.
@@ -160,31 +148,14 @@ items:
   - name: --password
     summary: User password.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/role/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/role/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
 commands:
-- uid: az_ad_user_create
-  name: az ad user create
-  summary: Create an Azure Active Directory user.
-- uid: az_ad_user_delete
-  name: az ad user delete
-  summary: Delete a user.
-- uid: az_ad_user_get_member_groups
-  name: az ad user get-member-groups
-  summary: Get groups of which the user is a member.
-- uid: az_ad_user_list
-  name: az ad user list
-  summary: List Azure Active Directory users.
-- uid: az_ad_user_show
-  name: az ad user show
-  summary: Gets user information from the directory.
-- uid: az_ad_user_update
-  name: az ad user update
-  summary: Update Azure Active Directory users.
+- az_ad_user_create
+- az_ad_user_delete
+- az_ad_user_get-member-groups
+- az_ad_user_list
+- az_ad_user_show
+- az_ad_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -200,10 +171,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/role/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/role/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/1f34245e83fbb68777c26a764f9cb5e8b86c0051/src/azure-cli/azure/cli/command_modules/role/_help.py
-updated_at: 4/15/2020 1:14:42 PM
-ms.date: 04/15/2020
-description: Manage Azure Active Directory users and user authentication.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/20/2021
+  description: Manage Azure Active Directory users and user authentication.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/ai-examples.yml b/2019-03-01-hybrid/docs-ref-autogen/ai-examples.yml
new file mode 100644
index 0000000000..f36fbab675
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/ai-examples.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_ai-examples
+name: az ai-examples
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **ai-examples** extension for Azure CLI and requires version 2.2.0 or higher.  The extension will automatically install the first time you run an **az ai-examples** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Add AI powered examples to help content.
+description: ''
+directCommands:
+- uid: az_ai-examples_check-connection
+  name: az ai-examples check-connection
+  summary: Check if the client can connect to the AI example service.
+  description: ''
+  syntax: az ai-examples check-connection
+commands:
+- az_ai-examples_check-connection
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Add AI powered examples to help content.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks.yml b/2019-03-01-hybrid/docs-ref-autogen/aks.yml
new file mode 100644
index 0000000000..3263ce5a10
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks.yml
@@ -0,0 +1,1359 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks
+name: az aks
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Kubernetes Services.
+description: ''
+directCommands:
+- uid: az_aks_browse
+  name: az aks browse
+  summary: Show the dashboard for a Kubernetes cluster in a web browser.
+  description: ''
+  syntax: >-
+    az aks browse --name
+                  --resource-group
+                  [--disable-browser]
+                  [--listen-address]
+                  [--listen-port]
+  examples:
+  - summary: Show the dashboard for a Kubernetes cluster in a web browser. (autogenerated)
+    syntax: az aks browse --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disable-browser
+    summary: Don't launch a web browser after establishing port-forwarding.
+    description: Add this argument when launching a web browser manually, or for automated testing.
+  - name: --listen-address
+    defaultValue: 127.0.0.1
+    summary: The listening address for the dashboard.
+    description: Add this argument to listen on a specific IP address.
+  - name: --listen-port
+    defaultValue: "8001"
+    summary: The listening port for the dashboard.
+    description: Add this argument when the default listening port is used by another process or unavailable.
+- uid: az_aks_create
+  name: az aks create
+  summary: Create a new managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks create --name
+                  --resource-group
+                  [--aad-admin-group-object-ids]
+                  [--aad-client-app-id]
+                  [--aad-server-app-id]
+                  [--aad-server-app-secret]
+                  [--aad-tenant-id]
+                  [--aci-subnet-name]
+                  [--admin-username]
+                  [--aks-custom-headers]
+                  [--api-server-authorized-ip-ranges]
+                  [--appgw-id]
+                  [--appgw-name]
+                  [--appgw-subnet-cidr]
+                  [--appgw-subnet-id]
+                  [--appgw-subnet-prefix]
+                  [--appgw-watch-namespace]
+                  [--assign-identity]
+                  [--assign-kubelet-identity]
+                  [--attach-acr]
+                  [--auto-upgrade-channel {node-image, none, patch, rapid, stable}]
+                  [--client-secret]
+                  [--cluster-autoscaler-profile]
+                  [--disable-local-accounts]
+                  [--disable-rbac]
+                  [--dns-name-prefix]
+                  [--dns-service-ip]
+                  [--docker-bridge-address]
+                  [--enable-aad]
+                  [--enable-addons]
+                  [--enable-ahub]
+                  [--enable-azure-rbac]
+                  [--enable-cluster-autoscaler]
+                  [--enable-encryption-at-host {false, true}]
+                  [--enable-fips-image]
+                  [--enable-managed-identity]
+                  [--enable-node-public-ip]
+                  [--enable-pod-identity]
+                  [--enable-pod-identity-with-kubenet]
+                  [--enable-pod-security-policy]
+                  [--enable-private-cluster]
+                  [--enable-rbac]
+                  [--enable-secret-rotation]
+                  [--enable-sgxquotehelper]
+                  [--enable-vmss]
+                  [--fqdn-subdomain]
+                  [--generate-ssh-keys]
+                  [--kubelet-config]
+                  [--kubernetes-version]
+                  [--linux-os-config]
+                  [--load-balancer-idle-timeout]
+                  [--load-balancer-managed-outbound-ip-count]
+                  [--load-balancer-outbound-ip-prefixes]
+                  [--load-balancer-outbound-ips]
+                  [--load-balancer-outbound-ports]
+                  [--load-balancer-sku]
+                  [--location]
+                  [--max-count]
+                  [--max-pods]
+                  [--min-count]
+                  [--network-plugin {azure, kubenet}]
+                  [--network-policy]
+                  [--no-ssh-key]
+                  [--no-wait]
+                  [--node-count]
+                  [--node-osdisk-diskencryptionset-id]
+                  [--node-osdisk-size]
+                  [--node-osdisk-type]
+                  [--node-public-ip-prefix-id]
+                  [--node-resource-group]
+                  [--node-vm-size]
+                  [--node-zones {1, 2, 3}]
+                  [--nodepool-labels]
+                  [--nodepool-name]
+                  [--nodepool-tags]
+                  [--os-sku]
+                  [--outbound-type {loadBalancer, userDefinedRouting}]
+                  [--pod-cidr]
+                  [--pod-subnet-id]
+                  [--ppg]
+                  [--private-dns-zone]
+                  [--service-cidr]
+                  [--service-principal]
+                  [--skip-subnet-role-assignment]
+                  [--ssh-key-value]
+                  [--tags]
+                  [--uptime-sla]
+                  [--vm-set-type]
+                  [--vnet-subnet-id]
+                  [--windows-admin-password]
+                  [--windows-admin-username]
+                  [--workspace-resource-id]
+                  [--yes]
+  examples:
+  - summary: Create a Kubernetes cluster with an existing SSH public key.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --ssh-key-value /path/to/publickey
+  - summary: Create a Kubernetes cluster with a specific version.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9
+  - summary: Create a Kubernetes cluster with a larger node pool.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-count 7
+  - summary: Create a kubernetes cluster with cluster autosclaler enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --node-count 3 --enable-cluster-autoscaler --min-count 1 --max-count 5
+  - summary: Create a kubernetes cluster with k8s 1.13.9 but use vmas.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --kubernetes-version 1.13.9 --vm-set-type AvailabilitySet
+  - summary: Create a kubernetes cluster with default kubernetes vesrion, default SKU load balancer(standard) and default vm set type(VirtualMachineScaleSets).
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster
+  - summary: Create a kubernetes cluster with standard SKU load balancer and two AKS created IPs for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
+  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IPs for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
+  - summary: Create a kubernetes cluster with standard SKU load balancer and use the provided public IP prefixes for the load balancer outbound connection usage.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
+  - summary: Create a kubernetes cluster with a standard SKU load balancer, with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
+  - summary: Create a kubernetes cluster with basic SKU load balancer and AvailabilitySet vm set type.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku basic --vm-set-type AvailabilitySet
+  - summary: Create a kubernetes cluster with authorized apiserver IP ranges.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24,195.168.1.0
+  - summary: Create a kubernetes cluster with server side encryption using your owned key.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-diskencryptionset-id <disk-encryption-set-resource-id>
+  - summary: Create a kubernetes cluster with userDefinedRouting, standard load balancer SKU and a custom subnet preconfigured with a route table
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --outbound-type userDefinedRouting --load-balancer-sku standard --vnet-subnet-id customUserSubnetVnetID
+  - summary: Create a kubernetes cluster with supporting Windows agent pools with AHUB enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --load-balancer-sku Standard --network-plugin azure --windows-admin-username azure --windows-admin-password 'replacePassword1234$' --enable-ahub
+  - summary: Create a kubernetes cluster with managed AAD enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Create a kubernetes cluster with ephemeral os enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --node-osdisk-type Ephemeral --node-osdisk-size 48
+  - summary: Create a kubernetes cluster with custom tags
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --tags "foo=bar" "baz=qux"
+  - summary: Create a kubernetes cluster with EncryptionAtHost enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-encryption-at-host
+  - summary: Create a kubernetes cluster with custom control plane identity and kubelet identity.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --assign-identity <control-plane-identity-resource-id> --assign-kubelet-identity <kubelet-identity-resource-id>
+  - summary: Create a kubernetes cluster with Azure RBAC enabled.
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --enable-azure-rbac
+  - summary: Create a kubernetes cluster with a specific os-sku
+    syntax: az aks create -g MyResourceGroup -n MyManagedCluster --os-sku Ubuntu
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-admin-group-object-ids
+    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
+    description: ''
+  - name: --aad-client-app-id
+    summary: The ID of an Azure Active Directory client application of type "Native". This application is for user login via kubectl.
+    description: ''
+  - name: --aad-server-app-id
+    summary: The ID of an Azure Active Directory server application of type "Web app/API". This application represents the managed cluster's apiserver (Server application).
+    description: ''
+  - name: --aad-server-app-secret
+    summary: The secret of an Azure Active Directory server application.
+    description: ''
+  - name: --aad-tenant-id
+    summary: The ID of an Azure Active Directory tenant.
+    description: ''
+  - name: --aci-subnet-name
+    summary: The name of a subnet in an existing VNet into which to deploy the virtual nodes.
+    description: ''
+  - name: --admin-username -u
+    defaultValue: azureuser
+    summary: User account to create on node VMs for SSH access.
+    description: ''
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --api-server-authorized-ip-ranges
+    summary: Comma seperated list of authorized apiserver IP ranges. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
+    description: ''
+  - name: --appgw-id
+    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-name
+    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-cidr
+    summary: Subnet CIDR to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-id
+    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-prefix
+    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-watch-namespace
+    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces.
+    description: ''
+  - name: --assign-identity
+    summary: Specify an existing user assigned identity to manage cluster resource group.
+    description: ''
+  - name: --assign-kubelet-identity
+    summary: Specify an existing user assigned identity for kubelet's usage, which is typically used to pull image from ACR.
+    description: ''
+  - name: --attach-acr
+    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --auto-upgrade-channel
+    parameterValueGroup: node-image, none, patch, rapid, stable
+    summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade.
+    description: ''
+  - name: --client-secret
+    summary: Secret associated with the service principal. This argument is required if `--service-principal` is specified.
+    description: ''
+  - name: --cluster-autoscaler-profile
+    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
+    description: ''
+  - name: --disable-local-accounts
+    summary: (Preview) If set to true, getting static credential will be disabled for this cluster.
+    description: ''
+  - name: --disable-rbac
+    summary: Disable Kubernetes Role-Based Access Control.
+    description: ''
+  - name: --dns-name-prefix -p
+    summary: Prefix for hostnames that are created. If not specified, generate a hostname using the managed cluster and resource group names.
+    description: ''
+  - name: --dns-service-ip
+    summary: An IP address assigned to the Kubernetes DNS service.
+    description: This address must be within the Kubernetes service address range specified by "--service-cidr". For example, 10.0.0.10.
+  - name: --docker-bridge-address
+    summary: A specific IP address and netmask for the Docker bridge, using standard CIDR notation.
+    description: This address must not be in any Subnet IP ranges, or the Kubernetes service address range. For example, 172.17.0.1/16.
+  - name: --enable-aad
+    summary: Enable managed AAD feature for cluster.
+    description: ''
+  - name: --enable-addons -a
+    summary: Enable the Kubernetes addons in a comma-separated list.
+    description: >-
+      These addons are available:
+          http_application_routing        - configure ingress with automatic public DNS name creation.
+          monitoring                      - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
+                                            If monitoring addon is enabled --no-wait argument will have no effect
+          virtual-node                    - enable AKS Virtual Node. Requires --aci-subnet-name to provide the name of an existing subnet for the Virtual Node to use.
+                                            aci-subnet-name must be in the same vnet which is specified by --vnet-subnet-id (required as well).
+          azure-policy                    - enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
+                                            Learn more at aka.ms/aks/policy.
+          ingress-appgw                   - enable Application Gateway Ingress Controller addon (PREVIEW).
+          confcom                         - enable confcom addon, this will enable SGX device plugin by default(PREVIEW).
+          open-service-mesh               - enable Open Service Mesh addon (PREVIEW).
+          gitops                          - enable GitOps (PREVIEW).
+          azure-keyvault-secrets-provider - enable Azure Keyvault Secrets Provider addon (PREVIEW).
+          azure-defender                  - enable Azure Defender addon (PREVIEW).
+  - name: --enable-ahub
+    summary: Enable Azure Hybrid User Benefits (AHUB) for Windows VMs.
+    description: ''
+  - name: --enable-azure-rbac
+    summary: Enable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --enable-cluster-autoscaler
+    summary: Enable cluster autoscaler, default value is false.
+    description: If specified, please make sure the kubernetes version is larger than 1.10.6.
+  - name: --enable-encryption-at-host
+    parameterValueGroup: false, true
+    summary: Enable EncryptionAtHost on agent node pool.
+    description: ''
+  - name: --enable-fips-image
+    summary: Use FIPS-enabled OS on agent nodes.
+    description: ''
+  - name: --enable-managed-identity
+    defaultValue: "1"
+    summary: Using managed identity to manage cluster resource group. Default value is true, you can explicitly specify "--client-id" and "--secret" to disable managed identity.
+    description: ''
+  - name: --enable-node-public-ip
+    summary: Enable VMSS node public IP.
+    description: ''
+  - name: --enable-pod-identity
+    summary: (PREVIEW) Enable pod identity addon.
+    description: ''
+  - name: --enable-pod-identity-with-kubenet
+    summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin.
+    description: ''
+  - name: --enable-pod-security-policy
+    summary: (PREVIEW) Enable pod security policy.
+    description: ''
+  - name: --enable-private-cluster
+    summary: Enable private cluster.
+    description: ''
+  - name: --enable-rbac -r
+    summary: 'Enable Kubernetes Role-Based Access Control. Default: enabled.'
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-sgxquotehelper
+    summary: Enable SGX quote helper for confcom addon.
+    description: ''
+  - name: --enable-vmss
+    summary: To be deprecated. Use vm_set_type instead.
+    description: ''
+  - name: --fqdn-subdomain
+    summary: Prefix for FQDN that is created for private cluster with custom private dns zone scenario.
+    description: ''
+  - name: --generate-ssh-keys
+    summary: Generate SSH public and private key files if missing.
+    description: ''
+  - name: --kubelet-config
+    summary: Kubelet configurations for agent nodes.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
+    description: ''
+    valueFrom: '`az aks get-versions`'
+  - name: --linux-os-config
+    summary: OS configurations for Linux agent nodes.
+    description: ''
+  - name: --load-balancer-idle-timeout
+    summary: Load balancer idle timeout in minutes.
+    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --load-balancer-managed-outbound-ip-count
+    summary: Load balancer managed outbound IP count.
+    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ip-prefixes
+    summary: Load balancer outbound IP prefix resource IDs.
+    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ips
+    summary: Load balancer outbound IP resource IDs.
+    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only.
+  - name: --load-balancer-outbound-ports
+    summary: Load balancer outbound allocated ports.
+    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
+  - name: --load-balancer-sku
+    summary: Azure Load Balancer SKU selection for your cluster. basic or standard.
+    description: Select between Basic or Standard Azure Load Balancer SKU for your AKS cluster.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-pods -m
+    summary: The maximum number of pods deployable to a node.
+    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --network-plugin
+    parameterValueGroup: azure, kubenet
+    summary: The Kubernetes network plugin to use.
+    description: Specify "azure" for advanced networking configurations. Defaults to "kubenet".
+  - name: --network-policy
+    summary: (PREVIEW) The Kubernetes network policy to use.
+    description: >-
+      Using together with "azure" network plugin.
+
+      Specify "azure" for Azure network policy manager and "calico" for calico network policy controller.
+
+      Defaults to "" (network policy disabled).
+  - name: --no-ssh-key -x
+    summary: Do not use or create a local SSH key.
+    description: To access nodes after creating a cluster with this option, use the Azure Portal.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes node pool. It is required when --enable-cluster-autoscaler specified. After creating a cluster, you can change the size of its node pool with `az aks scale`.
+    description: ''
+  - name: --node-osdisk-diskencryptionset-id
+    summary: ResourceId of the disk encryption set to use for enabling encryption at rest.
+    description: ''
+  - name: --node-osdisk-size
+    summary: Size in GB of the OS disk for each node in the node pool. Minimum 30 GB.
+    description: ''
+  - name: --node-osdisk-type
+    summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Managed'. May not be changed for this pool after creation.
+    description: ''
+  - name: --node-public-ip-prefix-id
+    summary: Public IP prefix ID used to assign public IPs to VMSS nodes.
+    description: ''
+  - name: --node-resource-group
+    summary: The node resource group is the resource group where all customer's resources will be created in, such as virtual machines.
+    description: ''
+  - name: --node-vm-size -s
+    defaultValue: Standard_DS2_v2
+    summary: Size of Virtual Machines to create as Kubernetes nodes.
+    description: ''
+  - name: --node-zones --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: (--node-zones will be deprecated, use --zones) Space-separated list of availability zones where agent nodes will be placed.
+    description: ''
+  - name: --nodepool-labels
+    summary: 'Space-separated labels: key[=value] [key[=value] ...]. You can not change the node labels through CLI after creation. See https://aka.ms/node-labels for syntax of labels.'
+    description: ''
+  - name: --nodepool-name
+    defaultValue: nodepool1
+    summary: Node pool name, upto 12 alphanumeric characters.
+    description: ''
+  - name: --nodepool-tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --os-sku
+    summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+    description: ''
+  - name: --outbound-type
+    parameterValueGroup: loadBalancer, userDefinedRouting
+    summary: How outbound traffic will be configured for a cluster.
+    description: Select between loadBalancer and userDefinedRouting. If not set, defaults to type loadBalancer. Requires --vnet-subnet-id to be provided with a preconfigured route table and --load-balancer-sku to be Standard.
+  - name: --pod-cidr
+    summary: A CIDR notation IP range from which to assign pod IPs when kubenet is used.
+    description: This range must not overlap with any Subnet IP ranges. For example, 172.244.0.0/16.
+  - name: --pod-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    description: ''
+  - name: --ppg
+    summary: The ID of a PPG.
+    description: ''
+  - name: --private-dns-zone
+    summary: Private dns zone mode for private cluster. "none" mode is in preview.
+    description: Allowed values are "system", "none" (Preview) or your custom private dns zone resource id. If not set, defaults to type system. Requires --enable-private-cluster to be used.
+  - name: --service-cidr
+    summary: A CIDR notation IP range from which to assign service cluster IPs.
+    description: This range must not overlap with any Subnet IP ranges. For example, 10.0.0.0/16.
+  - name: --service-principal
+    summary: Service principal used for authentication to Azure APIs.
+    description: If not specified, a new service principal is created and cached at $HOME.azureaksServicePrincipal.json to be used by subsequent `az aks` commands.
+  - name: --skip-subnet-role-assignment
+    summary: Skip role assignment for subnet (advanced networking).
+    description: If specified, please make sure your service principal has the access to your subnet.
+  - name: --ssh-key-value
+    defaultValue: ~\.ssh\id_rsa.pub
+    summary: Public key path or key contents to install on node VMs for SSH access. For example, 'ssh-rsa AAAAB...snip...UcyupgH azureuser@linuxvm'.
+    description: ''
+  - name: --tags
+    summary: The tags of the managed cluster. The managed cluster instance and all resources managed by the cloud provider will be tagged.
+    description: ''
+  - name: --uptime-sla
+    summary: Enable a paid managed cluster service with a financially backed SLA.
+    description: ''
+  - name: --vm-set-type
+    summary: Agent pool vm set type. VirtualMachineScaleSets or AvailabilitySet.
+    description: ''
+  - name: --vnet-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+    description: ''
+  - name: --windows-admin-password
+    summary: User account password to use on windows node VMs.
+    description: >-
+      Rules for windows-admin-password:
+          - Minimum-length: 14 characters
+          - Max-length: 123 characters
+          - Complexity requirements: 3 out of 4 conditions below need to be fulfilled
+            * Has lower characters
+            * Has upper characters
+            * Has a digit
+            * Has a special character (Regex match [W_])
+          - Disallowed values:  "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminpassword?view=azure-dotnet.
+  - name: --windows-admin-username
+    summary: User account to create on windows node VMs.
+    description: >-
+      Rules for windows-admin-username:
+          - restriction: Cannot end in "."
+          - Disallowed values: "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5".
+          - Minimum-length: 1 character
+          - Max-length: 20 characters
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminusername?view=azure-dotnet.
+  - name: --workspace-resource-id
+    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data. If not specified, uses the default Log Analytics Workspace if it exists, otherwise creates one.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_disable-addons
+  name: az aks disable-addons
+  summary: Disable Kubernetes addons.
+  description: ''
+  syntax: >-
+    az aks disable-addons --addons
+                          --name
+                          --resource-group
+                          [--no-wait]
+  examples:
+  - summary: Disable Kubernetes addons. (autogenerated)
+    syntax: az aks disable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --addons -a
+    summary: Disable the Kubernetes addons in a comma-separated list.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_enable-addons
+  name: az aks enable-addons
+  summary: Enable Kubernetes addons.
+  description: >-
+    These addons are available:
+        http_application_routing        - configure ingress with automatic public DNS name creation.
+        monitoring                      - turn on Log Analytics monitoring. Uses the Log Analytics Default Workspace if it exists, else creates one. Specify "--workspace-resource-id" to use an existing workspace.
+                                          If monitoring addon is enabled --no-wait argument will have no effect
+        virtual-node                    - enable AKS Virtual Node. Requires --subnet-name to provide the name of an existing subnet for the Virtual Node to use.
+        azure-policy                    - enable Azure policy. The Azure Policy add-on for AKS enables at-scale enforcements and safeguards on your clusters in a centralized, consistent manner.
+                                          Learn more at aka.ms/aks/policy.
+        ingress-appgw                   - enable Application Gateway Ingress Controller addon (PREVIEW).
+        open-service-mesh               - enable Open Service Mesh addon (PREVIEW).
+        gitops                          - enable GitOps (PREVIEW).
+        azure-keyvault-secrets-provider - enable Azure Keyvault Secrets Provider addon (PREVIEW).
+        azure-defender                  - enable Azure Defender addon (PREVIEW).
+  syntax: >-
+    az aks enable-addons --addons
+                         --name
+                         --resource-group
+                         [--appgw-id]
+                         [--appgw-name]
+                         [--appgw-subnet-cidr]
+                         [--appgw-subnet-id]
+                         [--appgw-subnet-prefix]
+                         [--appgw-watch-namespace]
+                         [--enable-secret-rotation]
+                         [--enable-sgxquotehelper]
+                         [--no-wait]
+                         [--subnet-name]
+                         [--workspace-resource-id]
+  examples:
+  - summary: Enable Kubernetes addons. (autogenerated)
+    syntax: az aks enable-addons --addons virtual-node --name MyManagedCluster --resource-group MyResourceGroup --subnet-name VirtualNodeSubnet
+  - summary: Enable ingress-appgw addon with subnet prefix.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons ingress-appgw --appgw-subnet-cidr 10.2.0.0/16 --appgw-name gateway
+  - summary: Enable open-service-mesh addon.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons open-service-mesh
+  - summary: Enable azure-defender addon with workspace resourceId.
+    syntax: az aks enable-addons --name MyManagedCluster --resource-group MyResourceGroup --addons azure-defender --workspace-resource-id WorkspaceResourceId
+  requiredParameters:
+  - isRequired: true
+    name: --addons -a
+    summary: Enable the Kubernetes addons in a comma-separated list.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --appgw-id
+    summary: Resource Id of an existing Application Gateway to use with AGIC. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-name
+    summary: Name of the application gateway to create/use in the node resource group. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-cidr
+    summary: Subnet CIDR to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-id
+    summary: Resource Id of an existing Subnet used to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-subnet-prefix
+    summary: Subnet Prefix to use for a new subnet created to deploy the Application Gateway. Use with ingress-azure addon.
+    description: ''
+  - name: --appgw-watch-namespace
+    summary: Specify the namespace, which AGIC should watch. This could be a single string value, or a comma-separated list of namespaces. Use with ingress-azure addon.
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-sgxquotehelper
+    summary: Enable SGX quote helper for confcom addon.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subnet-name -s
+    summary: The subnet name for the virtual node to use.
+    description: ''
+  - name: --workspace-resource-id
+    summary: The resource ID of an existing Log Analytics Workspace to use for storing monitoring data.
+    description: ''
+- uid: az_aks_get-credentials
+  name: az aks get-credentials
+  summary: Get access credentials for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks get-credentials --name
+                           --resource-group
+                           [--admin]
+                           [--context]
+                           [--file]
+                           [--overwrite-existing]
+                           [--user]
+  examples:
+  - summary: Get access credentials for a managed Kubernetes cluster. (autogenerated)
+    syntax: az aks get-credentials --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --admin -a
+    summary: 'Get cluster administrator credentials.  Default: cluster user credentials.'
+    description: ''
+  - name: --context
+    summary: If specified, overwrite the default context name.
+    description: ''
+  - name: --file -f
+    defaultValue: ~/.kube/config
+    summary: Kubernetes configuration file to update. Use "-" to print YAML to stdout instead.
+    description: ''
+  - name: --overwrite-existing
+    summary: Overwrite any existing cluster entry with the same name.
+    description: ''
+  - name: --user -u
+    defaultValue: clusterUser
+    summary: 'Get credentials for the user. Only valid when --admin is False.  Default: cluster user credentials.'
+    description: ''
+- uid: az_aks_get-os-options
+  name: az aks get-os-options
+  summary: Get the OS options available for creating a managed Kubernetes cluster.
+  description: ''
+  syntax: az aks get-os-options --location
+  examples:
+  - summary: Get the OS options available for creating a managed Kubernetes cluster
+    syntax: az aks get-os-options --location westus2
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_aks_get-upgrades
+  name: az aks get-upgrades
+  summary: Get the upgrade versions available for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks get-upgrades --name
+                        --resource-group
+  examples:
+  - summary: Get the upgrade versions available for a managed Kubernetes cluster
+    syntax: az aks get-upgrades --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_get-versions
+  name: az aks get-versions
+  summary: Get the versions available for creating a managed Kubernetes cluster.
+  description: ''
+  syntax: az aks get-versions --location
+  examples:
+  - summary: Get the versions available for creating a managed Kubernetes cluster
+    syntax: az aks get-versions --location westus2
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_aks_kanalyze
+  name: az aks kanalyze
+  summary: Display diagnostic results for the Kubernetes cluster after kollect is done.
+  description: ''
+  syntax: >-
+    az aks kanalyze --name
+                    --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_kollect
+  name: az aks kollect
+  summary: Collecting diagnostic information for the Kubernetes cluster.
+  description: >-
+    Collect diagnostic information for the Kubernetes cluster and store it in the specified storage account.
+
+    You can provide the storage account in three ways:
+      storage account name and a shared access signature with write permission.
+      resource Id to a storage account you own.
+      the storagea account in diagnostics settings for your managed cluster.
+  syntax: >-
+    az aks kollect --name
+                   --resource-group
+                   [--container-logs]
+                   [--kube-objects]
+                   [--node-logs]
+                   [--sas-token]
+                   [--storage-account]
+  examples:
+  - summary: using storage account name and a shared access signature token with write permission
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account MyStorageAccount --sas-token "MySasToken"
+  - summary: using the resource id of a storagea account resource you own.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --storage-account "MyStoreageAccountResourceId"
+  - summary: using the storagea account in diagnostics settings for your managed cluster.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster
+  - summary: customize the container logs to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --container-logs "mynamespace1/mypod1 myns2"
+  - summary: customize the kubernetes objects to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --kube-objects "mynamespace1/service myns2/deployment/deployment1"
+  - summary: customize the node log files to collect.
+    syntax: az aks kollect -g MyResourceGroup -n MyManagedCluster --node-logs "/var/log/azure-vnet.log /var/log/azure-vnet-ipam.log"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --container-logs
+    summary: The list of container logs to collect.
+    description: >-
+      The list of container logs to collect. Its value can be either all containers
+
+      in a namespace, for example, kube-system, or a specific container in a
+
+      namespace, for example, kube-system/tunnelfront.
+  - name: --kube-objects
+    summary: The list of kubernetes objects to describe.
+    description: >-
+      The list of kubernetes objects to describe. Its value can be either all objects of a type
+
+      in a namespace, for example, kube-system/pod, or a specific object of a type in a namespace,
+
+      for example, kube-system/deployment/tunnelfront.
+  - name: --node-logs
+    summary: The list of node logs to collect. For example, /var/log/cloud-init.log.
+    description: ''
+  - name: --sas-token
+    summary: The SAS token with writable permission for the storage account.
+    description: ''
+  - name: --storage-account
+    summary: Name or ID of the storage account to save the diagnostic information.
+    description: ''
+- uid: az_aks_rotate-certs
+  name: az aks rotate-certs
+  summary: Rotate certificates and keys on a managed Kubernetes cluster.
+  description: Kubernetes will be unavailable during cluster certificate rotation.
+  syntax: >-
+    az aks rotate-certs --name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_scale
+  name: az aks scale
+  summary: Scale the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks scale --name
+                 --node-count
+                 --resource-group
+                 [--no-wait]
+                 [--nodepool-name]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --node-count -c
+    summary: Number of nodes in the Kubernetes node pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --nodepool-name
+    summary: Node pool name, upto 12 alphanumeric characters.
+    description: ''
+- uid: az_aks_show
+  name: az aks show
+  summary: Show the details for a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks show --name
+                --resource-group
+  examples:
+  - summary: Show the details for a managed Kubernetes cluster
+    syntax: az aks show --name MyManagedCluster --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_start
+  name: az aks start
+  summary: Start Managed Cluster.
+  description: Starts a Stopped Managed Cluster.
+  syntax: >-
+    az aks start --name
+                 --resource-group
+                 [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_stop
+  name: az aks stop
+  summary: Stop Managed Cluster.
+  description: Stops a Running Managed Cluster.
+  syntax: >-
+    az aks stop --name
+                --resource-group
+                [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_update
+  name: az aks update
+  summary: Update a managed Kubernetes cluster properties, such as enable/disable cluster-autoscaler.
+  description: ''
+  syntax: >-
+    az aks update --name
+                  --resource-group
+                  [--aad-admin-group-object-ids]
+                  [--aad-tenant-id]
+                  [--aks-custom-headers]
+                  [--api-server-authorized-ip-ranges]
+                  [--assign-identity]
+                  [--attach-acr]
+                  [--auto-upgrade-channel {node-image, none, patch, rapid, stable}]
+                  [--cluster-autoscaler-profile]
+                  [--detach-acr]
+                  [--disable-ahub]
+                  [--disable-azure-rbac]
+                  [--disable-cluster-autoscaler]
+                  [--disable-local-accounts]
+                  [--disable-pod-identity]
+                  [--disable-pod-security-policy]
+                  [--disable-secret-rotation]
+                  [--enable-aad]
+                  [--enable-ahub]
+                  [--enable-azure-rbac]
+                  [--enable-cluster-autoscaler]
+                  [--enable-local-accounts]
+                  [--enable-managed-identity]
+                  [--enable-pod-identity]
+                  [--enable-pod-identity-with-kubenet]
+                  [--enable-pod-security-policy]
+                  [--enable-secret-rotation]
+                  [--load-balancer-idle-timeout]
+                  [--load-balancer-managed-outbound-ip-count]
+                  [--load-balancer-outbound-ip-prefixes]
+                  [--load-balancer-outbound-ips]
+                  [--load-balancer-outbound-ports]
+                  [--max-count]
+                  [--min-count]
+                  [--no-uptime-sla]
+                  [--no-wait]
+                  [--tags]
+                  [--update-cluster-autoscaler]
+                  [--uptime-sla]
+                  [--windows-admin-password]
+                  [--yes]
+  examples:
+  - summary: Enable cluster-autoscaler within node count range [1,5]
+    syntax: az aks update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n MyManagedCluster
+  - summary: Disable cluster-autoscaler for an existing cluster
+    syntax: az aks update --disable-cluster-autoscaler -g MyResourceGroup -n MyManagedCluster
+  - summary: Update min-count or max-count for cluster autoscaler.
+    syntax: az aks update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n MyManagedCluster
+  - summary: Enable pod security policy.
+    syntax: az aks update --enable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
+  - summary: Disable pod security policy.
+    syntax: az aks update --disable-pod-security-policy -g MyResourceGroup -n MyManagedCluster
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use two AKS created IPs for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IPs for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ips <ip-resource-id-1,ip-resource-id-2>
+  - summary: Update a kubernetes cluster with standard SKU load balancer to use the provided public IP prefixes for the load balancer outbound connection usage.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-outbound-ip-prefixes <ip-prefix-resource-id-1,ip-prefix-resource-id-2>
+  - summary: Update a kubernetes cluster with two outbound AKS managed IPs an idle flow timeout of 5 minutes and 8000 allocated ports per machine
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --load-balancer-managed-outbound-ip-count 2 --load-balancer-idle-timeout 5 --load-balancer-outbound-ports 8000
+  - summary: Update a kubernetes cluster with authorized apiserver ip ranges.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 193.168.1.0/24,194.168.1.0/24
+  - summary: Disable authorized apiserver ip ranges feature for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges ""
+  - summary: Restrict apiserver traffic in a kubernetes cluster to agentpool nodes.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --api-server-authorized-ip-ranges 0.0.0.0/32
+  - summary: Update a AKS-managed AAD cluster with tenant ID or admin group object IDs.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Migrate a AKS AAD-Integrated cluster or a non-AAAAD cluster to a AKS-managed AAD cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids <id-1,id-2> --aad-tenant-id <id>
+  - summary: Enable Azure Hybrid User Benefits featture for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-ahub
+  - summary: Disable Azure Hybrid User Benefits featture for a kubernetes cluster.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-ahub
+  - summary: Update the cluster to use system assigned managed identity in control plane.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-managed-identity
+  - summary: Update the cluster to use user assigned managed identity in control plane.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-managed-identity --assign-identity <user_assigned_identity_resource_id>
+  - summary: Enable pod identity addon.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-pod-identity
+  - summary: Disable pod identity addon.
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-pod-identity
+  - summary: Update the tags of a kubernetes cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCLuster --tags "foo=bar" "baz=qux"
+  - summary: Update Windows password of a kubernetes cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCLuster --windows-admin-password "Repl@cePassw0rd12345678"
+  - summary: Update a managed AAD AKS cluster to use Azure RBAC
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --enable-azure-rbac
+  - summary: Disable Azure RBAC in a managed AAD AKS cluster
+    syntax: az aks update -g MyResourceGroup -n MyManagedCluster --disable-azure-rbac
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aad-admin-group-object-ids
+    summary: Comma seperated list of aad group object IDs that will be set as cluster admin.
+    description: ''
+  - name: --aad-tenant-id
+    summary: The ID of an Azure Active Directory tenant.
+    description: ''
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --api-server-authorized-ip-ranges
+    summary: Comma seperated list of authorized apiserver IP ranges. Set to "" to allow all traffic on a previously restricted cluster. Set to 0.0.0.0/32 to restrict apiserver traffic to node pools.
+    description: ''
+  - name: --assign-identity
+    summary: (PREVIEW) Specify an existing user assigned identity to manage cluster resource group.
+    description: ''
+  - name: --attach-acr
+    summary: Grant the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --auto-upgrade-channel
+    parameterValueGroup: node-image, none, patch, rapid, stable
+    summary: Specify the upgrade channel for autoupgrade. It could be rapid, stable, patch, node-image or none, none means disable autoupgrade.
+    description: ''
+  - name: --cluster-autoscaler-profile
+    summary: Space-separated list of key=value pairs for configuring cluster autoscaler. Pass an empty string to clear the profile.
+    description: ''
+  - name: --detach-acr
+    summary: Disable the 'acrpull' role assignment to the ACR specified by name or resource ID.
+    description: ''
+  - name: --disable-ahub
+    summary: Disable Azure Hybrid User Benefits (AHUB) feature for cluster.
+    description: ''
+  - name: --disable-azure-rbac
+    summary: Disable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --disable-cluster-autoscaler -d
+    summary: Disable cluster autoscaler.
+    description: ''
+  - name: --disable-local-accounts
+    summary: (Preview) If set to true, getting static credential will be disabled for this cluster.
+    description: ''
+  - name: --disable-pod-identity
+    summary: (PREVIEW) Disable Pod Identity addon for cluster.
+    description: ''
+  - name: --disable-pod-security-policy
+    summary: (PREVIEW) Disable pod security policy.
+    description: ''
+  - name: --disable-secret-rotation
+    summary: Disable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --enable-aad
+    summary: Enable managed AAD feature for cluster.
+    description: ''
+  - name: --enable-ahub
+    summary: Enable Azure Hybrid User Benefits (AHUB) feature for cluster.
+    description: ''
+  - name: --enable-azure-rbac
+    summary: Enable Azure RBAC to control authorization checks on cluster.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --enable-local-accounts
+    summary: (Preview) If set to true, will enable getting static credential for this cluster.
+    description: ''
+  - name: --enable-managed-identity
+    summary: (PREVIEW) Update current cluster to managed identity to manage cluster resource group.
+    description: ''
+  - name: --enable-pod-identity
+    summary: (PREVIEW) Enable Pod Identity addon for cluster.
+    description: ''
+  - name: --enable-pod-identity-with-kubenet
+    summary: (PREVIEW) Enable pod identity addon for cluster using Kubnet network plugin.
+    description: ''
+  - name: --enable-pod-security-policy
+    summary: (PREVIEW) Enable pod security policy.
+    description: ''
+  - name: --enable-secret-rotation
+    summary: Enable secret rotation. Use with azure-keyvault-secrets-provider addon.
+    description: ''
+  - name: --load-balancer-idle-timeout
+    summary: Load balancer idle timeout in minutes.
+    description: Desired idle timeout for load balancer outbound flows, default is 30 minutes. Please specify a value in the range of [4, 100].
+  - name: --load-balancer-managed-outbound-ip-count
+    summary: Load balancer managed outbound IP count.
+    description: Desired number of managed outbound IPs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ip-prefixes
+    summary: Load balancer outbound IP prefix resource IDs.
+    description: Comma-separated public IP prefix resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ips
+    summary: Load balancer outbound IP resource IDs.
+    description: Comma-separated public IP resource IDs for load balancer outbound connection. Valid for Standard SKU load balancer cluster only. If updated, it will wipe off the existing setting on Load balancer managed outbound IP count; Load balancer outbound IP resource IDs and Load balancer outbound IP prefix resource IDs.
+  - name: --load-balancer-outbound-ports
+    summary: Load balancer outbound allocated ports.
+    description: Desired static number of outbound ports per VM in the load balancer backend pool. By default, set to 0 which uses the default allocation based on the number of VMs. Please specify a value in the range of [0, 64000] that is a multiple of 8.
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --no-uptime-sla
+    summary: Change a paid managed cluster to a free one.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: The tags of the managed cluster. The managed cluster instance and all resources managed by the cloud provider will be tagged.
+    description: ''
+  - name: --update-cluster-autoscaler -u
+    summary: Update min-count or max-count for cluster autoscaler.
+    description: ''
+  - name: --uptime-sla
+    summary: Enable a paid managed cluster service with a financially backed SLA.
+    description: ''
+  - name: --windows-admin-password
+    summary: User account password to use on windows node VMs.
+    description: >-
+      Rules for windows-admin-password:
+          - Minimum-length: 14 characters
+          - Max-length: 123 characters
+          - Complexity requirements: 3 out of 4 conditions below need to be fulfilled
+            * Has lower characters
+            * Has upper characters
+            * Has a digit
+            * Has a special character (Regex match [W_])
+          - Disallowed values:  "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!"
+      Reference: https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.management.compute.models.virtualmachinescalesetosprofile.adminpassword?view=azure-dotnet.
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_upgrade
+  name: az aks upgrade
+  summary: Upgrade a managed Kubernetes cluster to a newer version.
+  description: Kubernetes will be unavailable during cluster upgrades.
+  syntax: >-
+    az aks upgrade --name
+                   --resource-group
+                   [--aks-custom-headers]
+                   [--control-plane-only]
+                   [--kubernetes-version]
+                   [--no-wait]
+                   [--node-image-only]
+                   [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --control-plane-only
+    summary: Upgrade the cluster control plane only. If not specified, control plane AND all node pools will be upgraded.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to upgrade the cluster to, such as "1.11.12".
+    description: ''
+    valueFrom: '`az aks get-upgrades`'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-image-only
+    summary: Only upgrade node image for agent pools.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_aks_use-dev-spaces
+  name: az aks use-dev-spaces
+  summary: Use Azure Dev Spaces with a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks use-dev-spaces --name
+                          --resource-group
+                          [--endpoint {None, Private, Public}]
+                          [--space]
+                          [--update]
+                          [--yes]
+  examples:
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, interactively selecting a dev space.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, updating to the latest Azure Dev Spaces             client components and selecting a new or existing dev space 'my-space'.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks --update --space my-space
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster, selecting a new or existing dev space             'develop/my-space' without prompting for confirmation.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks -s develop/my-space -y
+  - summary: Use Azure Dev Spaces with a managed Kubernetes cluster with a private endpoint.
+    syntax: az aks use-dev-spaces -g my-aks-group -n my-aks -e private
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --endpoint -e
+    defaultValue: Public
+    parameterValueGroup: None, Private, Public
+    summary: The endpoint type to be used for a Azure Dev Spaces controller. See https://aka.ms/azds-networking for more information.
+    description: ''
+  - name: --space -s
+    summary: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
+    description: ''
+  - name: --update
+    summary: Update to the latest Azure Dev Spaces client components.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Requires --space.
+    description: ''
+- uid: az_aks_wait
+  name: az aks wait
+  summary: Wait for a managed Kubernetes cluster to reach a desired state.
+  description: If an operation on a cluster was interrupted or was started with `--no-wait`, use this command to wait for it to complete.
+  syntax: >-
+    az aks wait --name
+                --resource-group
+                [--created]
+                [--custom]
+                [--deleted]
+                [--exists]
+                [--interval]
+                [--timeout]
+                [--updated]
+  examples:
+  - summary: Wait for a cluster to be upgraded, polling every minute for up to thirty minutes.
+    syntax: az aks wait -g MyResourceGroup -n MyManagedCluster --updated --interval 60 --timeout 1800
+  - summary: Wait for a managed Kubernetes cluster to reach a desired state (autogenerated)
+    syntax: az aks wait --created --interval 60 --name MyManagedCluster --resource-group MyResourceGroup --timeout 1800
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_aks_app
+- az_aks_app_up
+- az_aks_browse
+- az_aks_command
+- az_aks_command_invoke
+- az_aks_command_result
+- az_aks_create
+- az_aks_disable-addons
+- az_aks_enable-addons
+- az_aks_get-credentials
+- az_aks_get-os-options
+- az_aks_get-upgrades
+- az_aks_get-versions
+- az_aks_kanalyze
+- az_aks_kollect
+- az_aks_maintenanceconfiguration
+- az_aks_maintenanceconfiguration_add
+- az_aks_maintenanceconfiguration_delete
+- az_aks_maintenanceconfiguration_list
+- az_aks_maintenanceconfiguration_show
+- az_aks_maintenanceconfiguration_update
+- az_aks_nodepool
+- az_aks_nodepool_add
+- az_aks_nodepool_delete
+- az_aks_nodepool_get-upgrades
+- az_aks_nodepool_list
+- az_aks_nodepool_scale
+- az_aks_nodepool_show
+- az_aks_nodepool_update
+- az_aks_nodepool_upgrade
+- az_aks_pod-identity
+- az_aks_pod-identity_add
+- az_aks_pod-identity_delete
+- az_aks_pod-identity_exception
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+- az_aks_pod-identity_list
+- az_aks_rotate-certs
+- az_aks_scale
+- az_aks_show
+- az_aks_start
+- az_aks_stop
+- az_aks_update
+- az_aks_upgrade
+- az_aks_use-dev-spaces
+- az_aks_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Kubernetes Services.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks/app.yml b/2019-03-01-hybrid/docs-ref-autogen/aks/app.yml
new file mode 100644
index 0000000000..0a759a89e8
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks/app.yml
@@ -0,0 +1,59 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_app
+name: az aks app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az aks app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage AKS app.
+description: ''
+directCommands:
+- uid: az_aks_app_up
+  name: az aks app up
+  summary: Deploy to AKS via GitHub actions.
+  description: ''
+  syntax: >-
+    az aks app up [--acr]
+                  [--aks-cluster]
+                  [--branch-name]
+                  [--do-not-wait]
+                  [--port]
+                  [--repository]
+  optionalParameters:
+  - name: --acr
+    summary: Name of the Azure Container Registry to be used for pushing the image.
+    description: ''
+  - name: --aks-cluster
+    summary: Name of the cluster to select for deployment.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --port
+    summary: Port on which your application runs. Default is 8080.
+    description: ''
+  - name: --repository -r
+    summary: GitHub repository URL e.g. https://github.com/azure/azure-cli.
+    description: ''
+commands:
+- az_aks_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage AKS app.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks/command.yml b/2019-03-01-hybrid/docs-ref-autogen/aks/command.yml
new file mode 100644
index 0000000000..0f5c8907d8
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks/command.yml
@@ -0,0 +1,80 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_command
+name: az aks command
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks command** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: See detail usage in 'az aks command invoke', 'az aks command result'.
+description: ''
+directCommands:
+- uid: az_aks_command_invoke
+  name: az aks command invoke
+  summary: Run a shell command (with kubectl, helm) on your aks cluster, support attaching files as well.
+  description: ''
+  syntax: >-
+    az aks command invoke --name
+                          --resource-group
+                          [--command]
+                          [--file]
+                          [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --command -c
+    summary: Command or shell script you want run.
+    description: ''
+  - name: --file -f
+    summary: Files will be used by the command, use '.' to attach the current folder.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_command_result
+  name: az aks command result
+  summary: Fetch result from previously triggered 'aks command invoke'.
+  description: ''
+  syntax: >-
+    az aks command result --name
+                          --resource-group
+                          [--command-id]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the managed cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --command-id -i
+    summary: CommandId returned from 'aks command invoke'.
+    description: ''
+commands:
+- az_aks_command_invoke
+- az_aks_command_result
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: See detail usage in 'az aks command invoke', 'az aks command result'.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks/maintenanceconfiguration.yml b/2019-03-01-hybrid/docs-ref-autogen/aks/maintenanceconfiguration.yml
new file mode 100644
index 0000000000..fd69697c85
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks/maintenanceconfiguration.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_maintenanceconfiguration
+name: az aks maintenanceconfiguration
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks maintenanceconfiguration** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage maintenance configurations in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_maintenanceconfiguration_add
+  name: az aks maintenanceconfiguration add
+  summary: Add a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration add --cluster-name
+                                        --name
+                                        --resource-group
+                                        [--config-file]
+                                        [--start-hour]
+                                        [--weekday]
+  examples:
+  - summary: Add a maintenance configuration with --weekday and --start-hour.
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday  --start-hour 1
+        The maintenance is allowed on Monday 1:00am to 2:00am
+  - summary: Add a maintenance configuration with --weekday.The maintenance is allowd on any time of that day.
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday
+        The maintenance is allowed on Monday.
+  - summary: Add a maintenance configuration with maintenance configuration json file
+    syntax: >-
+      az aks maintenanceconfiguration add -g xiazhan-mtc-stg --cluster-name test1 -n default --config-file ./test.json
+          The content of json file looks below. It means the maintenance is allowed on UTC time Tuesday 1:00am - 3:00 am and Wednesday 1:00am - 2:00am, 6:00am-7:00am
+          No maintenance is allowed from 2020-11-26T03:00:00Z to 2020-11-30T12:00:00Z and from 2020-12-26T03:00:00Z to 2020-12-26T12:00:00Z even if they are allowed in the above weekly setting
+          {
+                "timeInWeek": [
+                  {
+                    "day": "Tuesday",
+                    "hour_slots": [
+                      1,
+                      2
+                    ]
+                  },
+                  {
+                    "day": "Wednesday",
+                    "hour_slots": [
+                      1,
+                      6
+                    ]
+                  }
+                ],
+                "notAllowedTime": [
+                  {
+                    "start": "2021-11-26T03:00:00Z",
+                    "end": "2021-11-30T12:00:00Z"
+                  },
+                  {
+                    "start": "2021-12-26T03:00:00Z",
+                    "end": "2021-12-26T12:00:00Z"
+                  }
+                ]
+        }
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --config-file
+    summary: The maintenance configuration json file.
+    description: ''
+  - name: --start-hour
+    summary: The start time of 1 hour window which maintenance is allowd. E.g. 1 means it's allowd between 1:00 am and 2:00 am.
+    description: ''
+  - name: --weekday
+    summary: A day in week on which maintenance is allowed. E.g. Monday.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_delete
+  name: az aks maintenanceconfiguration delete
+  summary: Delete a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration delete --cluster-name
+                                           --name
+                                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_list
+  name: az aks maintenanceconfiguration list
+  summary: List maintenance configurations in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration list --cluster-name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_show
+  name: az aks maintenanceconfiguration show
+  summary: Show the details of a maintenance configuration in managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration show --cluster-name
+                                         --name
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_maintenanceconfiguration_update
+  name: az aks maintenanceconfiguration update
+  summary: Update a maintenance configuration of a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks maintenanceconfiguration update --cluster-name
+                                           --name
+                                           --resource-group
+                                           [--config-file]
+                                           [--start-hour]
+                                           [--weekday]
+  examples:
+  - summary: Update a maintenance configuration with --weekday and --start-hour.
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday  --start-hour 1
+        The maintenance is allowed on Monday 1:00am to 2:00am
+  - summary: Update a maintenance configuration with --weekday.The maintenance is allowd on any time of that day.
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --weekday Monday
+        The maintenance is allowed on Monday.
+  - summary: Update a maintenance configuration with maintenance configuration json file
+    syntax: >-
+      az aks maintenanceconfiguration update -g xiazhan-mtc-stg --cluster-name test1 -n default --config-file ./test.json
+          The content of json file looks below. It means the maintenance is allowed on UTC time Tuesday 1:00am - 3:00 am and Wednesday 1:00am - 2:00am, 6:00am-7:00am
+          No maintenance is allowed from 2020-11-26T03:00:00Z to 2020-11-30T12:00:00Z and from 2020-12-26T03:00:00Z to 2020-12-26T12:00:00Z even if they are allowed in the above weekly setting
+          {
+                "timeInWeek": [
+                  {
+                    "day": "Tuesday",
+                    "hour_slots": [
+                      1,
+                      2
+                    ]
+                  },
+                  {
+                    "day": "Wednesday",
+                    "hour_slots": [
+                      1,
+                      6
+                    ]
+                  }
+                ],
+                "notAllowedTime": [
+                  {
+                    "start": "2021-11-26T03:00:00Z",
+                    "end": "2021-11-30T12:00:00Z"
+                  },
+                  {
+                    "start": "2021-12-26T03:00:00Z",
+                    "end": "2021-12-26T12:00:00Z"
+                  }
+                ]
+        }
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The config name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --config-file
+    summary: The maintenance configuration json file.
+    description: ''
+  - name: --start-hour
+    summary: The start time of 1 hour window which maintenance is allowd. E.g. 1 means it's allowd between 1:00 am and 2:00 am.
+    description: ''
+  - name: --weekday
+    summary: A day in week on which maintenance is allowed. E.g. Monday.
+    description: ''
+commands:
+- az_aks_maintenanceconfiguration_add
+- az_aks_maintenanceconfiguration_delete
+- az_aks_maintenanceconfiguration_list
+- az_aks_maintenanceconfiguration_show
+- az_aks_maintenanceconfiguration_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage maintenance configurations in managed Kubernetes cluster.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks/nodepool.yml b/2019-03-01-hybrid/docs-ref-autogen/aks/nodepool.yml
new file mode 100644
index 0000000000..a82717b4b4
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks/nodepool.yml
@@ -0,0 +1,424 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_nodepool
+name: az aks nodepool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks nodepool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage node pools in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_nodepool_add
+  name: az aks nodepool add
+  summary: Add a node pool to the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool add --cluster-name
+                        --name
+                        --resource-group
+                        [--aks-custom-headers]
+                        [--enable-cluster-autoscaler]
+                        [--enable-encryption-at-host]
+                        [--enable-fips-image]
+                        [--enable-node-public-ip]
+                        [--eviction-policy {Deallocate, Delete}]
+                        [--kubelet-config]
+                        [--kubernetes-version]
+                        [--labels]
+                        [--linux-os-config]
+                        [--max-count]
+                        [--max-pods]
+                        [--max-surge]
+                        [--min-count]
+                        [--mode {System, User}]
+                        [--no-wait]
+                        [--node-count]
+                        [--node-osdisk-size]
+                        [--node-osdisk-type]
+                        [--node-public-ip-prefix-id]
+                        [--node-taints]
+                        [--node-vm-size]
+                        [--node-zones {1, 2, 3}]
+                        [--os-sku]
+                        [--os-type]
+                        [--pod-subnet-id]
+                        [--ppg]
+                        [--priority {Regular, Spot}]
+                        [--spot-max-price]
+                        [--tags]
+                        [--vnet-subnet-id]
+  examples:
+  - summary: Create a nodepool in an existing AKS cluster with ephemeral os enabled.
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster --node-osdisk-type Ephemeral --node-osdisk-size 48
+  - summary: Create a nodepool with EncryptionAtHost enabled.
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster --enable-encryption-at-host
+  - summary: Create a nodepool cluster with a specific os-sku
+    syntax: az aks nodepool add -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster  --os-sku Ubuntu
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --aks-custom-headers
+    summary: Send custom headers. When specified, format should be Key1=Value1,Key2=Value2.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --enable-encryption-at-host
+    summary: Enable EncryptionAtHost on agent node pool.
+    description: ''
+  - name: --enable-fips-image
+    summary: Use FIPS-enabled OS on agent nodes.
+    description: ''
+  - name: --enable-node-public-ip
+    summary: Enable VMSS node public IP.
+    description: ''
+  - name: --eviction-policy
+    defaultValue: Delete
+    parameterValueGroup: Deallocate, Delete
+    summary: The eviction policy of the Spot node pool. It can only be set when --priority is Spot.
+    description: ''
+  - name: --kubelet-config
+    summary: Kubelet configurations for agent nodes.
+    description: ''
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to use for creating the cluster, such as "1.7.12" or "1.8.7".
+    description: ''
+    valueFrom: '`az aks get-versions`'
+  - name: --labels
+    summary: The node labels for the node pool. You can't change the node labels through CLI after the node pool is created. See https://aka.ms/node-labels for syntax of labels.
+    description: ''
+  - name: --linux-os-config
+    summary: OS configurations for Linux agent nodes.
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-pods -m
+    summary: The maximum number of pods deployable to a node.
+    description: If not specified, defaults to 110, or 30 for advanced networking configurations.
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --mode
+    defaultValue: User
+    parameterValueGroup: System, User
+    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes agent pool. After creating a cluster, you can change the size of its node pool with `az aks scale`.
+    description: ''
+  - name: --node-osdisk-size
+    summary: Size in GB of the OS disk for each node in the agent pool. Minimum 30 GB.
+    description: ''
+  - name: --node-osdisk-type
+    summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Managed'. May not be changed for this pool after creation.
+    description: ''
+  - name: --node-public-ip-prefix-id
+    summary: Public IP prefix ID used to assign public IPs to VMSS nodes.
+    description: ''
+  - name: --node-taints
+    summary: The node taints for the node pool. You can't change the node taints through CLI after the node pool is created.
+    description: ''
+  - name: --node-vm-size -s
+    summary: Size of Virtual Machines to create as Kubernetes nodes.
+    description: ''
+  - name: --node-zones --zones -z
+    parameterValueGroup: 1, 2, 3
+    summary: (will be deprecated, use --zones) Availability zones where agent nodes will be placed.
+    description: ''
+  - name: --os-sku
+    summary: The os-sku of the agent node pool. Ubuntu or CBLMariner.
+    description: ''
+  - name: --os-type
+    defaultValue: Linux
+    summary: The OS Type. Linux or Windows.
+    description: ''
+  - name: --pod-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to assign pods in the cluster (requires azure network-plugin).
+    description: ''
+  - name: --ppg
+    summary: The ID of a PPG.
+    description: ''
+  - name: --priority
+    defaultValue: Regular
+    parameterValueGroup: Regular, Spot
+    summary: The priority of the node pool.
+    description: ''
+  - name: --spot-max-price
+    defaultValue: nan
+    summary: It can only be set when --priority is Spot. Specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. It can only include up to 5 decimal places.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet-subnet-id
+    summary: The ID of a subnet in an existing VNet into which to deploy the cluster.
+    description: ''
+- uid: az_aks_nodepool_delete
+  name: az aks nodepool delete
+  summary: Delete the agent pool in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool delete --cluster-name
+                           --name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_aks_nodepool_get-upgrades
+  name: az aks nodepool get-upgrades
+  summary: Get the available upgrade versions for an agent pool of the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool get-upgrades --cluster-name
+                                 --nodepool-name
+                                 --resource-group
+  examples:
+  - summary: Get the available upgrade versions for an agent pool of the managed Kubernetes cluster.
+    syntax: az aks nodepool get-upgrades --resource-group MyResourceGroup --cluster-name MyManagedCluster --nodepool-name MyNodePool
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --nodepool-name
+    summary: Name of the node pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_list
+  name: az aks nodepool list
+  summary: List node pools in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool list --cluster-name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_scale
+  name: az aks nodepool scale
+  summary: Scale the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool scale --cluster-name
+                          --name
+                          --resource-group
+                          [--no-wait]
+                          [--node-count]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-count -c
+    defaultValue: "3"
+    summary: Number of nodes in the Kubernetes node pool.
+    description: ''
+- uid: az_aks_nodepool_show
+  name: az aks nodepool show
+  summary: Show the details for a node pool in the managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool show --cluster-name
+                         --name
+                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_nodepool_update
+  name: az aks nodepool update
+  summary: Update a node pool to enable/disable cluster-autoscaler or change min-count or max-count.
+  description: ''
+  syntax: >-
+    az aks nodepool update --cluster-name
+                           --name
+                           --resource-group
+                           [--disable-cluster-autoscaler]
+                           [--enable-cluster-autoscaler]
+                           [--max-count]
+                           [--max-surge]
+                           [--min-count]
+                           [--mode {System, User}]
+                           [--no-wait]
+                           [--tags]
+                           [--update-cluster-autoscaler]
+  examples:
+  - summary: Enable cluster-autoscaler within node count range [1,5]
+    syntax: az aks nodepool update --enable-cluster-autoscaler --min-count 1 --max-count 5 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Disable cluster-autoscaler for an existing cluster
+    syntax: az aks nodepool update --disable-cluster-autoscaler -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Update min-count or max-count for cluster autoscaler.
+    syntax: az aks nodepool update --update-cluster-autoscaler --min-count 1 --max-count 10 -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  - summary: Change a node pool to system mode
+    syntax: az aks nodepool update --mode System -g MyResourceGroup -n nodepool1 --cluster-name MyManagedCluster
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disable-cluster-autoscaler -d
+    summary: Disable cluster autoscaler.
+    description: ''
+  - name: --enable-cluster-autoscaler -e
+    summary: Enable cluster autoscaler.
+    description: ''
+  - name: --max-count
+    summary: Maximum nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --min-count
+    summary: Minimun nodes count used for autoscaler, when "--enable-cluster-autoscaler" specified. Please specify the value in the range of [1, 100].
+    description: ''
+  - name: --mode
+    parameterValueGroup: System, User
+    summary: The mode for a node pool which defines a node pool's primary function. If set as "System", AKS prefers system pods scheduling to node pools with mode `System`. Learn more at https://aka.ms/aks/nodepool/mode.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --update-cluster-autoscaler -u
+    summary: Update min-count or max-count for cluster autoscaler.
+    description: ''
+- uid: az_aks_nodepool_upgrade
+  name: az aks nodepool upgrade
+  summary: Upgrade the node pool in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks nodepool upgrade --cluster-name
+                            --name
+                            --resource-group
+                            [--kubernetes-version]
+                            [--max-surge]
+                            [--no-wait]
+                            [--node-image-only]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The node pool name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kubernetes-version -k
+    summary: Version of Kubernetes to upgrade the node pool to, such as "1.11.12".
+    description: ''
+  - name: --max-surge
+    summary: Extra nodes used to speed upgrade. When specified, it represents the number or percent used, eg. 5 or 33%.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --node-image-only
+    summary: Only upgrade agent pool's node image.
+    description: ''
+commands:
+- az_aks_nodepool_add
+- az_aks_nodepool_delete
+- az_aks_nodepool_get-upgrades
+- az_aks_nodepool_list
+- az_aks_nodepool_scale
+- az_aks_nodepool_show
+- az_aks_nodepool_update
+- az_aks_nodepool_upgrade
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage node pools in managed Kubernetes cluster.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks/pod-identity.yml b/2019-03-01-hybrid/docs-ref-autogen/aks/pod-identity.yml
new file mode 100644
index 0000000000..f26eabfbd7
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks/pod-identity.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_pod-identity
+name: az aks pod-identity
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks pod-identity** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage pod identities in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_pod-identity_add
+  name: az aks pod-identity add
+  summary: Add a pod identity to a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity add --cluster-name
+                            --identity-resource-id
+                            --namespace
+                            --resource-group
+                            [--binding-selector]
+                            [--name]
+  examples:
+  - summary: Add pod identity
+    syntax: az aks pod-identity add --cluster-name MyManagedCluster --resource-group MyResourceGroup --namespace my-namespace --name my-identity --identity-resource-id <my-identity-resource-id>
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --identity-resource-id
+    summary: Resource id of the identity to use.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --binding-selector
+    summary: Optional binding selector to use.
+    description: ''
+  - name: --name -n
+    summary: The pod identity name. Generate if not specified.
+    description: ''
+- uid: az_aks_pod-identity_delete
+  name: az aks pod-identity delete
+  summary: Remove a pod identity from a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity delete --cluster-name
+                               --name
+                               --namespace
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity name.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity namespace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_list
+  name: az aks pod-identity list
+  summary: List pod identities in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity list --cluster-name
+                             --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_aks_pod-identity_add
+- az_aks_pod-identity_delete
+- az_aks_pod-identity_exception
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+- az_aks_pod-identity_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage pod identities in managed Kubernetes cluster.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/aks/pod-identity/exception.yml b/2019-03-01-hybrid/docs-ref-autogen/aks/pod-identity/exception.yml
new file mode 100644
index 0000000000..70b2724367
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/aks/pod-identity/exception.yml
@@ -0,0 +1,136 @@
+### YamlMime:AzureCLIGroup
+uid: az_aks_pod-identity_exception
+name: az aks pod-identity exception
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **aks-preview** extension for Azure CLI and requires version 2.0.49 or higher.  The extension will automatically install the first time you run an **az aks pod-identity exception** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage pod identity exceptions in managed Kubernetes cluster.
+description: ''
+directCommands:
+- uid: az_aks_pod-identity_exception_add
+  name: az aks pod-identity exception add
+  summary: Add a pod identity exception to a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception add --cluster-name
+                                      --namespace
+                                      --pod-labels
+                                      --resource-group
+                                      [--name]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace.
+    description: ''
+  - isRequired: true
+    name: --pod-labels
+    summary: 'Space-separated labels: key=value [key=value ...].'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name -n
+    summary: The pod identity exception name. Generate if not specified.
+    description: ''
+- uid: az_aks_pod-identity_exception_delete
+  name: az aks pod-identity exception delete
+  summary: Remove a pod identity exception from a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception delete --cluster-name
+                                         --name
+                                         --namespace
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity exception name to remove.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace to remove.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_exception_list
+  name: az aks pod-identity exception list
+  summary: List pod identity exceptions in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception list --cluster-name
+                                       --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_aks_pod-identity_exception_update
+  name: az aks pod-identity exception update
+  summary: Update a pod identity exception in a managed Kubernetes cluster.
+  description: ''
+  syntax: >-
+    az aks pod-identity exception update --cluster-name
+                                         --name
+                                         --namespace
+                                         --pod-labels
+                                         --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-name
+    summary: The cluster name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The pod identity exception name to remove.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: The pod identity exception namespace to remove.
+    description: ''
+  - isRequired: true
+    name: --pod-labels
+    summary: Pod labels in key=value [key=value ...].
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_aks_pod-identity_exception_add
+- az_aks_pod-identity_exception_delete
+- az_aks_pod-identity_exception_list
+- az_aks_pod-identity_exception_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage pod identity exceptions in managed Kubernetes cluster.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/alias.yml b/2019-03-01-hybrid/docs-ref-autogen/alias.yml
new file mode 100644
index 0000000000..06dd5690c2
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/alias.yml
@@ -0,0 +1,117 @@
+### YamlMime:AzureCLIGroup
+uid: az_alias
+name: az alias
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **alias** extension for Azure CLI and requires version 2.0.31.dev0 or higher.  The extension will automatically install the first time you run an **az alias** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure CLI Aliases.
+description: ''
+directCommands:
+- uid: az_alias_create
+  name: az alias create
+  summary: Create an alias.
+  description: ''
+  syntax: >-
+    az alias create --command
+                    --name
+  examples:
+  - summary: Create simple alias commands.
+    syntax: >-
+      az alias create --name rg --command group
+
+
+      az alias create --name ls --command list
+  - summary: Create a complex alias.
+    syntax: az alias create --name list-vm --command 'vm list --resource-group myResourceGroup'
+  - summary: Create an alias command with arguments.
+    syntax: >-
+      az alias create --name 'list-vm {{ resource_group }}' \
+        --command 'vm list --resource-group {{ resource_group }}'
+  - summary: Process arguments using Jinja2 templates.
+    syntax: >-
+      az alias create --name 'storage-ls {{ url }}' \
+        --command 'storage blob list
+          --account-name {{ url.replace("https://", "").split(".")[0] }}
+          --container-name {{ url.replace("https://", "").split("/")[1] }}'
+  requiredParameters:
+  - isRequired: true
+    name: --command -c
+    summary: The command that the alias points to.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the alias.
+    description: ''
+- uid: az_alias_export
+  name: az alias export
+  summary: Export all registered aliases to a given path, as an INI configuration file. If no export path is specified, the alias configuration file is exported to the current working directory.
+  description: ''
+  syntax: >-
+    az alias export [--exclude]
+                    [--path]
+  optionalParameters:
+  - name: --exclude -e
+    summary: Space-separated aliases excluded from export.
+    description: ''
+  - name: --path -p
+    summary: The path of the alias configuration file to export to.
+    description: ''
+- uid: az_alias_import
+  name: az alias import
+  summary: Import aliases from an INI configuration file or an URL.
+  description: ''
+  syntax: az alias import --source
+  requiredParameters:
+  - isRequired: true
+    name: --source -s
+    summary: The source of the aliases to import from.
+    description: ''
+- uid: az_alias_list
+  name: az alias list
+  summary: List the registered aliases.
+  description: ''
+  syntax: az alias list
+- uid: az_alias_remove
+  name: az alias remove
+  summary: Remove one or more aliases. Aliases to be removed are space-delimited.
+  description: ''
+  syntax: az alias remove --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Space-separated aliases.
+    description: ''
+- uid: az_alias_remove-all
+  name: az alias remove-all
+  summary: Remove all registered aliases.
+  description: ''
+  syntax: az alias remove-all [--yes]
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+commands:
+- az_alias_create
+- az_alias_export
+- az_alias_import
+- az_alias_list
+- az_alias_remove
+- az_alias_remove-all
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure CLI Aliases.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig.yml
index 1364e0e032..a01c1ea135 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig.yml
@@ -1,176 +1,173 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig
-  name: az appconfig
-  summary: Manage App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_create
-  - az_appconfig_delete
-  - az_appconfig_list
-  - az_appconfig_show
-  - az_appconfig_update
+### YamlMime:AzureCLIGroup
+uid: az_appconfig
+name: az appconfig
+summary: Manage App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_create
   name: az appconfig create
   summary: Create an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig create --location
+                        --name
+                        --resource-group
+                        [--assign-identity]
+                        [--enable-public-network {false, true}]
+                        [--sku {Free, Standard}]
+                        [--subscription]
   examples:
   - summary: Create an App Configuration with name, location, sku and resource group.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard
   - summary: Create an App Configuration with name, location, sku and resource group with system assigned identity.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity
   - summary: Create an App Configuration with name, location, sku and resource group with user assigned identity.
-    syntax:
-      content: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
-  parameters:
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --assign-identity /subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity
+  - summary: Create an App Configuration with name, location and resource group and enable public network access.
+    syntax: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --enable-public-network
+  requiredParameters:
   - isRequired: true
     name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - isRequired: true
-    name: --sku
-    parameterValueGroup: free, standard
-    summary: The sku of App Configuration.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --assign-identity
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified.
+    summary: Space-separated list of managed identities to be assigned. Use "[system]" to refer to system-assigned managed identity or a resource ID to refer to user-assigned managed identity. If this argument is provided without any value, system-assigned managed identity will be assigned by default. If this argument is not provided, no managed identities will be assigned to this App Configuration store.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: When true, requests coming from public networks have permission to access this store while private endpoint is enabled. When false, only requests made through Private Links can reach this store.
+    description: ''
+  - name: --sku
+    defaultValue: Standard
+    parameterValueGroup: Free, Standard
+    summary: The sku of App Configuration.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_delete
   name: az appconfig delete
   summary: Delete an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig delete --name
+                        [--resource-group]
+                        [--subscription]
+                        [--yes]
   examples:
   - summary: Delete an App Configuration under resource group
-    syntax:
-      content: az appconfig delete -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig delete -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_list
   name: az appconfig list
   summary: Lists all App Configurations under the current subscription.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig list [--query-examples]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: List all App Configurations under a resource group
-    syntax:
-      content: az appconfig list -g MyResourceGroup
-  parameters:
+    syntax: az appconfig list -g MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_show
   name: az appconfig show
   summary: Show properties of an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig show --name
+                      [--query-examples]
+                      [--resource-group]
+                      [--subscription]
   examples:
   - summary: Show properties of an App Configuration
-    syntax:
-      content: az appconfig show -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig show -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_update
   name: az appconfig update
   summary: Update an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig update --name
+                        [--enable-public-network {false, true}]
+                        [--encryption-key-name]
+                        [--encryption-key-vault]
+                        [--encryption-key-version]
+                        [--identity-client-id]
+                        [--resource-group]
+                        [--sku {Free, Standard}]
+                        [--subscription]
+                        [--tags]
   examples:
   - summary: Update tags of an App Configuration
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --tags key1=value1 key2=value2
   - summary: Upgrade sku of an App Configuration to standard
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --sku Standard
   - summary: Enable customer encryption key with system assigned identity
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name myKey --encryption-key-version keyVersion --encryption-key-vault https://keyVaultName.vault.azure.net
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name myKey --encryption-key-version keyVersion --encryption-key-vault https://keyVaultName.vault.azure.net
   - summary: Remove customer encryption key
-    syntax:
-      content: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name ""
-  parameters:
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --encryption-key-name ""
+  - summary: Update an App Configuration to enable public network access.
+    syntax: az appconfig update -g MyResourceGroup -n MyAppConfiguration --enable-public-network true
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --sku
-    parameterValueGroup: free, standard
-    summary: The sku of App Configuration.
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+  optionalParameters:
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: When true, requests coming from public networks have permission to access this store while private endpoint is enabled. When false, only requests made through Private Links can reach this store.
     description: ''
   - name: --encryption-key-name
     summary: The name of the KeyVault key.
@@ -182,135 +179,62 @@ items:
     summary: The version of the KeyVault key. Use the latest version by default.
     description: ''
   - name: --identity-client-id
-    summary: Client ID of the managed identity with wrap and unwrap access to encryption key. Use system assigned identity by default.
+    summary: Client ID of the managed identity with wrap and unwrap access to encryption key. Use system-assigned managed identity by default.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Free, Standard
+    summary: The sku of App Configuration.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_create
-  name: az appconfig create
-  summary: Create an App Configuration.
-- uid: az_appconfig_credential
-  name: az appconfig credential
-  summary: Manage credentials for App Configurations.
-- uid: az_appconfig_credential_list
-  name: az appconfig credential list
-  summary: List access keys of an App Configuration.
-- uid: az_appconfig_credential_regenerate
-  name: az appconfig credential regenerate
-  summary: Regenerate an access key for an App Configuration.
-- uid: az_appconfig_delete
-  name: az appconfig delete
-  summary: Delete an App Configuration.
-- uid: az_appconfig_feature
-  name: az appconfig feature
-  summary: Manage feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_delete
-  name: az appconfig feature delete
-  summary: Delete feature flag.
-- uid: az_appconfig_feature_disable
-  name: az appconfig feature disable
-  summary: Disable a feature flag to turn it OFF for use.
-- uid: az_appconfig_feature_enable
-  name: az appconfig feature enable
-  summary: Enable a feature flag to turn it ON for use.
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
-- uid: az_appconfig_feature_list
-  name: az appconfig feature list
-  summary: List feature flags.
-- uid: az_appconfig_feature_lock
-  name: az appconfig feature lock
-  summary: Lock a feature flag to prohibit write operations.
-- uid: az_appconfig_feature_set
-  name: az appconfig feature set
-  summary: Set a feature flag.
-- uid: az_appconfig_feature_show
-  name: az appconfig feature show
-  summary: Show all attributes of a feature flag.
-- uid: az_appconfig_feature_unlock
-  name: az appconfig feature unlock
-  summary: Unlock a feature to gain write operations.
-- uid: az_appconfig_identity
-  name: az appconfig identity
-  summary: Managed identities for App Configurations.
-- uid: az_appconfig_identity_assign
-  name: az appconfig identity assign
-  summary: Update managed identities for an App Configuration.
-- uid: az_appconfig_identity_remove
-  name: az appconfig identity remove
-  summary: Remove managed identities for an App Configuration.
-- uid: az_appconfig_identity_show
-  name: az appconfig identity show
-  summary: Display managed identities for an App Configuration.
-- uid: az_appconfig_kv
-  name: az appconfig kv
-  summary: Manage key-values stored in an App Configuration.
-- uid: az_appconfig_kv_delete
-  name: az appconfig kv delete
-  summary: Delete key-values.
-- uid: az_appconfig_kv_export
-  name: az appconfig kv export
-  summary: Export configurations to another place from your App Configuration.
-- uid: az_appconfig_kv_import
-  name: az appconfig kv import
-  summary: Import configurations into your App Configuration from another place.
-- uid: az_appconfig_kv_list
-  name: az appconfig kv list
-  summary: List key-values.
-- uid: az_appconfig_kv_lock
-  name: az appconfig kv lock
-  summary: Lock a key-value to prohibit write operations.
-- uid: az_appconfig_kv_restore
-  name: az appconfig kv restore
-  summary: Restore key-values.
-- uid: az_appconfig_kv_set
-  name: az appconfig kv set
-  summary: Set a key-value.
-- uid: az_appconfig_kv_set_keyvault
-  name: az appconfig kv set-keyvault
-  summary: Set a keyvault reference.
-- uid: az_appconfig_kv_show
-  name: az appconfig kv show
-  summary: Show all attributes of a key-value.
-- uid: az_appconfig_kv_unlock
-  name: az appconfig kv unlock
-  summary: Unlock a key-value to gain write operations.
-- uid: az_appconfig_list
-  name: az appconfig list
-  summary: Lists all App Configurations under the current subscription.
-- uid: az_appconfig_revision
-  name: az appconfig revision
-  summary: Manage revisions for key-values stored in an App Configuration.
-- uid: az_appconfig_revision_list
-  name: az appconfig revision list
-  summary: Lists revision history of key-values.
-- uid: az_appconfig_show
-  name: az appconfig show
-  summary: Show properties of an App Configuration.
-- uid: az_appconfig_update
-  name: az appconfig update
-  summary: Update an App Configuration.
+- az_appconfig_create
+- az_appconfig_credential
+- az_appconfig_credential_list
+- az_appconfig_credential_regenerate
+- az_appconfig_delete
+- az_appconfig_feature
+- az_appconfig_feature_delete
+- az_appconfig_feature_disable
+- az_appconfig_feature_enable
+- az_appconfig_feature_filter
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
+- az_appconfig_feature_list
+- az_appconfig_feature_lock
+- az_appconfig_feature_set
+- az_appconfig_feature_show
+- az_appconfig_feature_unlock
+- az_appconfig_identity
+- az_appconfig_identity_assign
+- az_appconfig_identity_remove
+- az_appconfig_identity_show
+- az_appconfig_kv
+- az_appconfig_kv_delete
+- az_appconfig_kv_export
+- az_appconfig_kv_import
+- az_appconfig_kv_list
+- az_appconfig_kv_lock
+- az_appconfig_kv_restore
+- az_appconfig_kv_set
+- az_appconfig_kv_set-keyvault
+- az_appconfig_kv_show
+- az_appconfig_kv_unlock
+- az_appconfig_list
+- az_appconfig_revision
+- az_appconfig_revision_list
+- az_appconfig_show
+- az_appconfig_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -326,10 +250,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage App Configurations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml
index 7a90cd2a3b..164466cbcd 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig/credential.yml
@@ -1,79 +1,69 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_credential
-  name: az appconfig credential
-  summary: Manage credentials for App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_credential_list
-  - az_appconfig_credential_regenerate
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_credential
+name: az appconfig credential
+summary: Manage credentials for App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_credential_list
   name: az appconfig credential list
   summary: List access keys of an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig credential list --name
+                                 [--query-examples]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List access keys of an App Configuration
-    syntax:
-      content: az appconfig credential list -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig credential list -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_credential_regenerate
   name: az appconfig credential regenerate
   summary: Regenerate an access key for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig credential regenerate --id
+                                       --name
+                                       [--resource-group]
+                                       [--subscription]
   examples:
   - summary: Regenerate a read only access key for an App Configuration
-    syntax:
-      content: az appconfig credential regenerate -g MyResourceGroup -n MyAppConfiguration --id 0-l0-s0:8ldbreMVH+d7EjaSUg3H
-  parameters:
+    syntax: az appconfig credential regenerate -g MyResourceGroup -n MyAppConfiguration --id 0-l0-s0:8ldbreMVH+d7EjaSUg3H
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Id of the key to be regenerated. Can be found using az appconfig credential list command.
     description: ''
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_credential_list
-  name: az appconfig credential list
-  summary: List access keys of an App Configuration.
-- uid: az_appconfig_credential_regenerate
-  name: az appconfig credential regenerate
-  summary: Regenerate an access key for an App Configuration.
+- az_appconfig_credential_list
+- az_appconfig_credential_regenerate
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -89,10 +79,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage credentials for App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage credentials for App Configurations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml
index 8f95bca75d..7171edc3d6 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature.yml
@@ -1,168 +1,198 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_feature
-  name: az appconfig feature
-  summary: Manage feature flags stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_feature_delete
-  - az_appconfig_feature_disable
-  - az_appconfig_feature_enable
-  - az_appconfig_feature_list
-  - az_appconfig_feature_lock
-  - az_appconfig_feature_set
-  - az_appconfig_feature_show
-  - az_appconfig_feature_unlock
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_feature
+name: az appconfig feature
+summary: Manage feature flags stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_feature_delete
   name: az appconfig feature delete
   summary: Delete feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature delete --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: Delete a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature delete -n MyAppConfiguration --feature color --label MyLabel --yes
+    syntax: az appconfig feature delete -n MyAppConfiguration --feature color --label MyLabel --yes
   - summary: Delete a feature using connection string.
-    syntax:
-      content: az appconfig feature delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label MyLabel
-  parameters:
+    syntax: az appconfig feature delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label MyLabel
+  - summary: Delete a feature using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature delete --endpoint https://myappconfiguration.azconfig.io --feature color --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be deleted. Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix. Comma separated keys are not supported. Please provide escaped string if your feature name contains comma.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, delete the feature flag with null label by default. Support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_disable
   name: az appconfig feature disable
   summary: Disable a feature flag to turn it OFF for use.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature disable --feature
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--endpoint]
+                                 [--label]
+                                 [--name]
+                                 [--subscription]
+                                 [--yes]
   examples:
   - summary: disable a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature disable -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature disable -n MyAppConfiguration --feature color --label test
   - summary: Force disabling a feature using connection string.
-    syntax:
-      content: az appconfig feature disable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature disable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be disabled.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, disable the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_enable
   name: az appconfig feature enable
   summary: Enable a feature flag to turn it ON for use.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature enable --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: enable a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature enable -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature enable -n MyAppConfiguration --feature color --label test
   - summary: Force enabling a feature using connection string.
-    syntax:
-      content: az appconfig feature enable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature enable --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be enabled.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, enable the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_list
   name: az appconfig feature list
   summary: List feature flags.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature list [--all]
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--feature]
+                              [--fields {conditions, description, key, label, last_modified, locked, state}]
+                              [--label]
+                              [--name]
+                              [--query-examples]
+                              [--subscription]
+                              [--top]
   examples:
   - summary: List all feature flags.
-    syntax:
-      content: az appconfig feature list -n MyAppConfiguration
+    syntax: az appconfig feature list -n MyAppConfiguration
   - summary: List all feature flags with null labels.
-    syntax:
-      content: az appconfig feature list -n MyAppConfiguration --label \0
+    syntax: az appconfig feature list -n MyAppConfiguration --label \0
   - summary: List a specfic feature for any label start with v1. using connection string.
-    syntax:
-      content: az appconfig feature list --feature color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
+    syntax: az appconfig feature list --feature color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
   - summary: List all features with any labels and query only key, state and conditions.
-    syntax:
-      content: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key state conditions
+    syntax: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key state conditions
   - summary: List 150 feature flags with any labels.
-    syntax:
-      content: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --top 150
+    syntax: az appconfig feature list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --top 150
   - summary: List feature flags with multiple labels.
-    syntax:
-      content: az appconfig feature list --label test,prod,\0 -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig feature list --label test,prod,\0 -n MyAppConfiguration
+  optionalParameters:
   - name: --all
     summary: List all feature flags.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --feature
     summary: Key of the feature to be listed. Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix. Comma separated keys are not supported. Please provide escaped string if your feature name contains comma.
@@ -175,121 +205,157 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_lock
   name: az appconfig feature lock
   summary: Lock a feature flag to prohibit write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature lock --feature
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--label]
+                              [--name]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Lock a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature lock -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature lock -n MyAppConfiguration --feature color --label test
   - summary: Force locking a feature using connection string.
-    syntax:
-      content: az appconfig feature lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be locked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, lock the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_set
   name: az appconfig feature set
   summary: Set a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature set --feature
+                             [--auth-mode {key, login}]
+                             [--connection-string]
+                             [--description]
+                             [--endpoint]
+                             [--label]
+                             [--name]
+                             [--subscription]
+                             [--yes]
   examples:
   - summary: Set a feature flag with label MyLabel.
-    syntax:
-      content: az appconfig feature set -n MyAppConfiguration --feature color --label MyLabel
+    syntax: az appconfig feature set -n MyAppConfiguration --feature color --label MyLabel
   - summary: Set a feature flag with null label using connection string and set a description.
-    syntax:
-      content: az appconfig feature set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
-  parameters:
+    syntax: az appconfig feature set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --description "This is a colorful feature"
+  - summary: Set a feature flag using your 'az login' credentials.
+    syntax: az appconfig feature set --endpoint https://myappconfiguration.azconfig.io --feature color --label MyLabel --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature flag to be set. Only alphanumeric characters, '.', '-' and '_' are allowed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --description
     summary: Description of the feature flag to be set.
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, set the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_show
   name: az appconfig feature show
   summary: Show all attributes of a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature show --feature
+                              [--auth-mode {key, login}]
+                              [--connection-string]
+                              [--endpoint]
+                              [--fields {conditions, description, key, label, last_modified, locked, state}]
+                              [--label]
+                              [--name]
+                              [--query-examples]
+                              [--subscription]
   examples:
   - summary: Show a feature flag using App Configuration name with a specific label
-    syntax:
-      content: az appconfig feature show -n MyAppConfiguration --feature color --label MyLabel
+    syntax: az appconfig feature show -n MyAppConfiguration --feature color --label MyLabel
   - summary: Show a feature flag using connection string and field filters
-    syntax:
-      content: az appconfig feature show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --fields key locked conditions state
-  parameters:
+    syntax: az appconfig feature show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --fields key locked conditions state
+  - summary: Show a feature flag using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature show --endpoint https://myappconfiguration.azconfig.io --feature color --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature flag to be retrieved.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --fields
     parameterValueGroup: conditions, description, key, label, last_modified, locked, state
@@ -299,96 +365,77 @@ items:
     summary: If no label specified, show entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_unlock
   name: az appconfig feature unlock
   summary: Unlock a feature to gain write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature unlock --feature
+                                [--auth-mode {key, login}]
+                                [--connection-string]
+                                [--endpoint]
+                                [--label]
+                                [--name]
+                                [--subscription]
+                                [--yes]
   examples:
   - summary: Unlock a feature using App Configuration name.
-    syntax:
-      content: az appconfig feature unlock -n MyAppConfiguration --feature color --label test
+    syntax: az appconfig feature unlock -n MyAppConfiguration --feature color --label test
   - summary: Force unlocking a feature using connection string.
-    syntax:
-      content: az appconfig feature unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
-  parameters:
+    syntax: az appconfig feature unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Key of the feature to be unlocked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, unlock the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_feature_delete
-  name: az appconfig feature delete
-  summary: Delete feature flag.
-- uid: az_appconfig_feature_disable
-  name: az appconfig feature disable
-  summary: Disable a feature flag to turn it OFF for use.
-- uid: az_appconfig_feature_enable
-  name: az appconfig feature enable
-  summary: Enable a feature flag to turn it ON for use.
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
-- uid: az_appconfig_feature_list
-  name: az appconfig feature list
-  summary: List feature flags.
-- uid: az_appconfig_feature_lock
-  name: az appconfig feature lock
-  summary: Lock a feature flag to prohibit write operations.
-- uid: az_appconfig_feature_set
-  name: az appconfig feature set
-  summary: Set a feature flag.
-- uid: az_appconfig_feature_show
-  name: az appconfig feature show
-  summary: Show all attributes of a feature flag.
-- uid: az_appconfig_feature_unlock
-  name: az appconfig feature unlock
-  summary: Unlock a feature to gain write operations.
+- az_appconfig_feature_delete
+- az_appconfig_feature_disable
+- az_appconfig_feature_enable
+- az_appconfig_feature_filter
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
+- az_appconfig_feature_list
+- az_appconfig_feature_lock
+- az_appconfig_feature_set
+- az_appconfig_feature_show
+- az_appconfig_feature_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -404,10 +451,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage feature flags stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage feature flags stored in an App Configuration.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml
index 983c38c78a..2b093aded9 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig/feature/filter.yml
@@ -1,33 +1,37 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_feature_filter
-  name: az appconfig feature filter
-  summary: Manage filters associated with feature flags stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_feature_filter_add
-  - az_appconfig_feature_filter_delete
-  - az_appconfig_feature_filter_list
-  - az_appconfig_feature_filter_show
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_feature_filter
+name: az appconfig feature filter
+summary: Manage filters associated with feature flags stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_feature_filter_add
   name: az appconfig feature filter add
   summary: Add a filter to a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter add --feature
+                                    --filter-name
+                                    [--auth-mode {key, login}]
+                                    [--connection-string]
+                                    [--endpoint]
+                                    [--filter-parameters]
+                                    [--index]
+                                    [--label]
+                                    [--name]
+                                    [--subscription]
+                                    [--yes]
   examples:
   - summary: Add a filter for feature 'color' with label MyLabel with name 'MyFilter' and 2 parameters.
-    syntax:
-      content: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters Name=Value Name2=Value2
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters Name=\"Value\" Name2=\"Value2\"
   - summary: Insert a filter at index 2 (zero-based index) for feature 'color' with label MyLabel and filter name 'MyFilter' with no parameters
-    syntax:
-      content: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --index 2
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --index 2
   - summary: Add a filter with name 'MyFilter' using connection string.
-    syntax:
-      content: az appconfig feature filter add --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
-  parameters:
+    syntax: az appconfig feature filter add --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
+  - summary: Add a filter with name 'MyFilter' using App Configuration endpoint and your 'az login' credentials.
+    syntax: az appconfig feature filter add --endpoint=https://contoso.azconfig.io --feature color --filter-name MyFilter --auth-mode login
+  - summary: Add a filter for feature 'color' with label MyLabel with name 'MyFilter' and array parameters.
+    syntax: az appconfig feature filter add -n MyAppConfiguration --feature color --label MyLabel --filter-name MyFilter --filter-parameters ArrayParam=[1,2,3]
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature to which you want to add the filter.
@@ -36,11 +40,20 @@ items:
     name: --filter-name
     summary: Name of the filter to be added.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --filter-parameters
-    summary: Space-separated filter parameters in 'name[=value]' format.
+    summary: Space-separated filter parameters in 'name[=value]' format. The value must be an escaped JSON string.
     description: ''
   - name: --index
     summary: Zero-based index in the list of filters where you want to insert the new filter. If no index is specified or index is invalid, filter will be added to the end of the list.
@@ -49,46 +62,57 @@ items:
     summary: If no label specified, add to the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_delete
   name: az appconfig feature filter delete
   summary: Delete a filter from a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter delete --feature
+                                       [--all]
+                                       [--auth-mode {key, login}]
+                                       [--connection-string]
+                                       [--endpoint]
+                                       [--filter-name]
+                                       [--index]
+                                       [--label]
+                                       [--name]
+                                       [--subscription]
+                                       [--yes]
   examples:
   - summary: Delete a filter from a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature filter delete -n MyAppConfiguration --feature color --filter-name MyFilter --yes
+    syntax: az appconfig feature filter delete -n MyAppConfiguration --feature color --filter-name MyFilter --yes
   - summary: Delete a filter from a feature when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter delete --feature color --filter-name MyFilter --index 2 --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx
+    syntax: az appconfig feature filter delete --feature color --filter-name MyFilter --index 2 --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx
   - summary: Delete all filters of a feature using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig feature filter delete -n MyAppConfiguration --feature color --label MyLabel --all --yes
-  parameters:
+    syntax: az appconfig feature filter delete -n MyAppConfiguration --feature color --label MyLabel --all --yes
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature from which you want to delete the filter.
     description: ''
+  optionalParameters:
   - name: --all
     summary: Delete all filters associated with a feature flag.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --filter-name
     summary: Name of the filter to be deleted.
@@ -100,76 +124,94 @@ items:
     summary: If no label specified, delete from the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_list
   name: az appconfig feature filter list
   summary: List all filters for a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter list --feature
+                                     [--all]
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--endpoint]
+                                     [--label]
+                                     [--name]
+                                     [--query-examples]
+                                     [--subscription]
+                                     [--top]
   examples:
   - summary: List all filters for feature flag 'color'.
-    syntax:
-      content: az appconfig feature filter list -n MyAppConfiguration --feature color --all
+    syntax: az appconfig feature filter list -n MyAppConfiguration --feature color --all
   - summary: List 150 filters for feature flag 'color'
-    syntax:
-      content: az appconfig feature filter list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --feature color --top 150
-  parameters:
+    syntax: az appconfig feature filter list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx  --feature color --top 150
+  - summary: List all filters for feature flag 'color' using your 'az login' credentials.
+    syntax: az appconfig feature filter list --endpoint https://myappconfiguration.azconfig.io --feature color --all --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature whose filters you want to be displayed.
     description: ''
+  optionalParameters:
   - name: --all
     summary: List all filters associated with a feature flag.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, display filters from the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_feature_filter_show
   name: az appconfig feature filter show
   summary: Show filters of a feature flag.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig feature filter show --feature
+                                     --filter-name
+                                     [--auth-mode {key, login}]
+                                     [--connection-string]
+                                     [--endpoint]
+                                     [--index]
+                                     [--label]
+                                     [--name]
+                                     [--query-examples]
+                                     [--subscription]
   examples:
   - summary: Show one unique feature filter when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter show -n MyAppConfiguration --feature color --filter-name MyFilter --index 2
+    syntax: az appconfig feature filter show -n MyAppConfiguration --feature color --filter-name MyFilter --index 2
   - summary: Show all instances of a feature filter when you have multiple filters with that same name.
-    syntax:
-      content: az appconfig feature filter show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
-  parameters:
+    syntax: az appconfig feature filter show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --feature color --filter-name MyFilter
+  requiredParameters:
   - isRequired: true
     name: --feature
     summary: Name of the feature which contains the filter.
@@ -178,8 +220,17 @@ items:
     name: --filter-name
     summary: Name of the filter to be displayed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --index
     summary: Zero-based index of the filter to be displayed in case there are multiple instances with same filter name.
@@ -188,30 +239,20 @@ items:
     summary: If no label specified, show the feature flag with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_feature_filter_add
-  name: az appconfig feature filter add
-  summary: Add a filter to a feature flag.
-- uid: az_appconfig_feature_filter_delete
-  name: az appconfig feature filter delete
-  summary: Delete a filter from a feature flag.
-- uid: az_appconfig_feature_filter_list
-  name: az appconfig feature filter list
-  summary: List all filters for a feature flag.
-- uid: az_appconfig_feature_filter_show
-  name: az appconfig feature filter show
-  summary: Show filters of a feature flag.
+- az_appconfig_feature_filter_add
+- az_appconfig_feature_filter_delete
+- az_appconfig_feature_filter_list
+- az_appconfig_feature_filter_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,10 +268,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage filters associated with feature flags stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage filters associated with feature flags stored in an App Configuration.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml
index 82e2696a02..97f9293862 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig/identity.yml
@@ -1,124 +1,105 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_identity
-  name: az appconfig identity
-  summary: Managed identities for App Configurations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_identity_assign
-  - az_appconfig_identity_remove
-  - az_appconfig_identity_show
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_identity
+name: az appconfig identity
+summary: Managed identities for App Configurations.
+description: ''
+directCommands:
 - uid: az_appconfig_identity_assign
   name: az appconfig identity assign
   summary: Update managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity assign --name
+                                 [--identities]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Enable the system-assigned identity for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration
   - summary: Assign a user-assigned managed identity for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
   - summary: Assign both system-assigned and user assigned identities for an existing App Configuration
-    syntax:
-      content: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
-  parameters:
+    syntax: az appconfig identity assign -g MyResourceGroup -n MyAppConfiguration --identities [system] "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --identities
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity or a resource id to refer user assigned identity. Use system assigned identity if not specified.
+    summary: Accept system-assigned or user-assigned managed identities separated by spaces. Use '[system]' to refer to system-assigned managed identity or a resource ID to refer to user-assigned managed identity. If this argument is not provided or this argument is provided without any value, system-assigned managed identity will be used by default.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_identity_remove
   name: az appconfig identity remove
   summary: Remove managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity remove --name
+                                 [--identities]
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: Remove the system-assigned identity from a App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration
   - summary: Remove a user assigned identity from a App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myUserAssignedIdentity"
   - summary: Remove all identities from an App Configuration.
-    syntax:
-      content: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
-  parameters:
+    syntax: az appconfig identity remove -g MyResourceGroup -n MyAppConfiguration --identities [all]
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
+  optionalParameters:
   - name: --identities
-    summary: Accept system or user assigned identities separated by spaces. Use '[system]' to refer system assigned identity, '[all]' for all identities or a resource id to refer user assigned identity. Remove system assigned identity if not specified.
+    summary: Accept system-assigned or user-assigned managed identities separated by spaces. Use '[system]' to refer to system-assigned managed identity, '[all]' for all managed identities or a resource ID to refer user-assigned managed identity. If this argument is not provided or this argument is provided without any value, system-assigned managed identity will be removed by default.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_identity_show
   name: az appconfig identity show
   summary: Display managed identities for an App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig identity show --name
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Display managed identities for a task.
-    syntax:
-      content: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig identity show -g MyResourceGroup -n MyAppConfiguration
+  requiredParameters:
   - isRequired: true
     name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_identity_assign
-  name: az appconfig identity assign
-  summary: Update managed identities for an App Configuration.
-- uid: az_appconfig_identity_remove
-  name: az appconfig identity remove
-  summary: Remove managed identities for an App Configuration.
-- uid: az_appconfig_identity_show
-  name: az appconfig identity show
-  summary: Display managed identities for an App Configuration.
+- az_appconfig_identity_assign
+- az_appconfig_identity_remove
+- az_appconfig_identity_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -134,10 +115,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Managed identities for App Configurations.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Managed identities for App Configurations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml
index 1c95aee6d7..6a6cfefa20 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig/kv.yml
@@ -1,135 +1,152 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_kv
-  name: az appconfig kv
-  summary: Manage key-values stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_kv_delete
-  - az_appconfig_kv_export
-  - az_appconfig_kv_import
-  - az_appconfig_kv_list
-  - az_appconfig_kv_lock
-  - az_appconfig_kv_restore
-  - az_appconfig_kv_set
-  - az_appconfig_kv_set_keyvault
-  - az_appconfig_kv_show
-  - az_appconfig_kv_unlock
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_kv
+name: az appconfig kv
+summary: Manage key-values stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_kv_delete
   name: az appconfig kv delete
   summary: Delete key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv delete --key
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--endpoint]
+                           [--label]
+                           [--name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Delete a key using App Configuration name without confirmation.
-    syntax:
-      content: az appconfig kv delete -n MyAppConfiguration --key color --label MyLabel --yes
+    syntax: az appconfig kv delete -n MyAppConfiguration --key color --label MyLabel --yes
   - summary: Delete a key using connection string.
-    syntax:
-      content: az appconfig kv delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
-  parameters:
+    syntax: az appconfig kv delete --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
+  - summary: Delete a key using your 'az login' credentials and App Configuration endpoint.
+    syntax: az appconfig kv delete --endpoint https://myappconfiguration.azconfig.io --key color --auth-mode login --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Support star sign as filters, for instance \* means all key and abc\* means keys with abc as prefix.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, delete entry with null label. Support star sign as filters, for instance \* means all label and abc\* means labels with abc as prefix.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_export
   name: az appconfig kv export
   summary: Export configurations to another place from your App Configuration.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv export --destination {appconfig, appservice, file}
+                           [--appservice-account]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--dest-auth-mode {key, login}]
+                           [--dest-connection-string]
+                           [--dest-endpoint]
+                           [--dest-label]
+                           [--dest-name]
+                           [--endpoint]
+                           [--format {json, properties, yaml}]
+                           [--key]
+                           [--label]
+                           [--name]
+                           [--naming-convention {camel, hyphen, pascal, underscore}]
+                           [--path]
+                           [--prefix]
+                           [--preserve-labels {false, true}]
+                           [--resolve-keyvault {false, true}]
+                           [--separator]
+                           [--skip-features {false, true}]
+                           [--skip-keyvault {false, true}]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Export all keys and feature flags with label test to a json file.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json
+    syntax: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json
   - summary: Export all keys with null label to an App Service application.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appservice  --appservice-account MyAppService
+    syntax: az appconfig kv export -n MyAppConfiguration -d appservice --appservice-account MyAppService
   - summary: Export all keys with label test excluding feature flags to a json file.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json --skip-features
+    syntax: az appconfig kv export -n MyAppConfiguration --label test -d file --path D:/abc.json --format json --skip-features
   - summary: Export all keys and feature flags with all labels to another App Configuration.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --preserve-labels
+    syntax: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --preserve-labels
   - summary: Export all keys and feature flags with all labels to another App Configuration and overwrite destination labels.
-    syntax:
-      content: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --dest-label ExportedKeys
-  parameters:
+    syntax: az appconfig kv export -n MyAppConfiguration -d appconfig --dest-name AnotherAppConfiguration --key * --label * --dest-label ExportedKeys
+  - summary: Export all keys to another App Configuration using your 'az login' credentials.
+    syntax: az appconfig kv export -d appconfig --endpoint https://myappconfiguration.azconfig.io --auth-mode login --dest-endpoint https://anotherappconfiguration.azconfig.io --dest-auth-mode login --key * --label * --preserve-labels
+  requiredParameters:
   - isRequired: true
     name: --destination -d
     parameterValueGroup: appconfig, appservice, file
     summary: The destination of exporting. Note that exporting feature flags to appservice is not supported.
     description: ''
-  - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
-    description: ''
-  - name: --key
-    summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be exported.
-    description: ''
-  - name: --label
-    summary: Only keys and feature flags with this label will be exported. If no label specified, export keys and feature flags with null label by default. Only when export destination is appconfig, we support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Label filters are not supported when exporting to file or appservice.
-    description: ''
-  - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --prefix
-    summary: Prefix to be trimmed from keys. Prefix will be ignored for feature flags.
+  optionalParameters:
+  - name: --appservice-account
+    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
     description: ''
-  - name: --skip-features
-    parameterValueGroup: false, true
-    summary: Export items excluding all feature flags. By default, all features with the specified label will be exported to file or appconfig. Not applicable for appservice.
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
     description: ''
-  - name: --skip-keyvault
-    parameterValueGroup: false, true
-    summary: Export items excluding all key vault references. By default, all key vault references with the specified label will be exported.
+  - name: --connection-string
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for preview.
+  - name: --dest-auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Auth mode for connecting to destination App Configuration. For details, refer to "--auth-mode" argument.
     description: ''
   - name: --dest-connection-string
     summary: Combination of access key and endpoint of the destination store.
     description: ''
+  - name: --dest-endpoint
+    summary: If --dest-auth-mode is "login", provide endpoint URL of the destination App Configuration.
+    description: ''
   - name: --dest-label
     summary: Exported KVs will be labeled with this destination label. If neither --dest-label nor --preserve-labels is specified, will assign null label.
     description: ''
   - name: --dest-name
     summary: The name of the destination App Configuration.
     description: ''
-  - name: --preserve-labels
-    parameterValueGroup: false, true
-    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --dest-label.
-    description: ''
-  - name: --appservice-account
-    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --format
     parameterValueGroup: json, properties, yaml
     summary: File format exporting to. Required for file arguments. Currently, feature flags are not supported in properties format.
     description: ''
+  - name: --key
+    summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be exported.
+    description: ''
+  - name: --label
+    summary: Only keys and feature flags with this label will be exported. If no label specified, export keys and feature flags with null label by default. Only when export destination is appconfig, we support star sign as filters, for instance \* means all labels and abc\* means labels with abc as prefix. Label filters are not supported when exporting to file or appservice.
+    description: ''
+  - name: --name -n
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
   - name: --naming-convention
     defaultValue: pascal
     parameterValueGroup: camel, hyphen, pascal, underscore
@@ -138,79 +155,143 @@ items:
   - name: --path
     summary: Local configuration file path. Required for file arguments.
     description: ''
+  - name: --prefix
+    summary: Prefix to be trimmed from keys. Prefix will be ignored for feature flags.
+    description: ''
+  - name: --preserve-labels
+    parameterValueGroup: false, true
+    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --dest-label.
+    description: ''
   - name: --resolve-keyvault
     parameterValueGroup: false, true
     summary: Resolve the content of key vault reference.
     description: ''
   - name: --separator
-    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Required for exporting hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
+    summary: "Delimiter for flattening the key-value pairs to json or yaml file. Required for exporting hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
+    description: ''
+  - name: --skip-features
+    parameterValueGroup: false, true
+    summary: Export items excluding all feature flags. By default, all features with the specified label will be exported to file or appconfig. Not applicable for appservice.
+    description: ''
+  - name: --skip-keyvault
+    parameterValueGroup: false, true
+    summary: Export items excluding all key vault references. By default, all key vault references with the specified label will be exported.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for preview.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_import
   name: az appconfig kv import
   summary: Import configurations into your App Configuration from another place.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv import --source {appconfig, appservice, file}
+                           [--appservice-account]
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--content-type]
+                           [--depth]
+                           [--endpoint]
+                           [--format {json, properties, yaml}]
+                           [--label]
+                           [--name]
+                           [--path]
+                           [--prefix]
+                           [--preserve-labels {false, true}]
+                           [--separator]
+                           [--skip-features {false, true}]
+                           [--src-auth-mode {key, login}]
+                           [--src-connection-string]
+                           [--src-endpoint]
+                           [--src-key]
+                           [--src-label]
+                           [--src-name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Import all keys and feature flags from a file and apply test label.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration --label test -s file --path D:/abc.json --format json
+    syntax: az appconfig kv import -n MyAppConfiguration --label test -s file --path D:/abc.json --format json
   - summary: Import all keys and feature flags with null label and apply new label from an App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --label ImportedKeys
-  - summary: Import all keys and apply null label from an App Service appliaction.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appservice --appservice-account MyAppService
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --label ImportedKeys
+  - summary: Import all keys and apply null label from an App Service application.
+    syntax: az appconfig kv import -n MyAppConfiguration -s appservice --appservice-account MyAppService
   - summary: Import all keys with label test and apply test2 label excluding feature flags from an App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-label test --label test2 --src-name AnotherAppConfiguration --skip-features
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-label test --label test2 --src-name AnotherAppConfiguration --skip-features
   - summary: Import all keys and feature flags with all labels to another App Configuration.
-    syntax:
-      content: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --src-key * --src-label * --preserve-labels
-  parameters:
+    syntax: az appconfig kv import -n MyAppConfiguration -s appconfig --src-name AnotherAppConfiguration --src-key * --src-label * --preserve-labels
+  - summary: Import all keys and feature flags from a JSON file and apply JSON content type.
+    syntax: az appconfig kv import -n MyAppConfiguration -s file --path D:/abc.json --format json --separator . --content-type application/json
+  - summary: Import all keys to another App Configuration using your 'az login' credentials.
+    syntax: az appconfig kv import -s appconfig --endpoint https://myappconfiguration.azconfig.io --auth-mode login --src-endpoint https://anotherappconfiguration.azconfig.io --src-auth-mode login --src-key * --src-label * --preserve-labels
+  requiredParameters:
   - isRequired: true
     name: --source -s
     parameterValueGroup: appconfig, appservice, file
     summary: The source of importing. Note that importing feature flags from appservice is not supported.
     description: ''
+  optionalParameters:
+  - name: --appservice-account
+    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
+    description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --content-type
     summary: Content type of all imported items.
     description: ''
+  - name: --depth
+    summary: Depth for flattening the json or yaml file to key-value pairs. Flatten to the deepest level by default if --separator is provided. Not applicable for property files or feature flags.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
+  - name: --format
+    parameterValueGroup: json, properties, yaml
+    summary: Imported file format. Required for file arguments. Currently, feature flags are not supported in properties format.
+    description: ''
   - name: --label
     summary: Imported KVs and feature flags will be assigned with this label. If no label specified, will assign null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --path
+    summary: Local configuration file path. Required for file arguments.
     description: ''
   - name: --prefix
     summary: This prefix will be appended to the front of imported keys. Prefix will be ignored for feature flags.
     description: ''
-  - name: --skip-features
+  - name: --preserve-labels
     parameterValueGroup: false, true
-    summary: Import only key values and exclude all feature flags. By default, all feature flags will be imported from file or appconfig. Not applicable for appservice.
+    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --label.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for preview.
+  - name: --separator
+    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
     description: ''
-  - name: --preserve-labels
+  - name: --skip-features
     parameterValueGroup: false, true
-    summary: Flag to preserve labels from source AppConfig. This argument should NOT be specified along with --label.
+    summary: Import only key values and exclude all feature flags. By default, all feature flags will be imported from file or appconfig. Not applicable for appservice.
+    description: ''
+  - name: --src-auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: Auth mode for connecting to source App Configuration. For details, refer to "--auth-mode" argument.
     description: ''
   - name: --src-connection-string
     summary: Combination of access key and endpoint of the source store.
     description: ''
+  - name: --src-endpoint
+    summary: If --src-auth-mode is "login", provide endpoint URL of the source App Configuration.
+    description: ''
   - name: --src-key
     summary: If no key specified, import all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix. Key filtering not applicable for feature flags. By default, all feature flags with specified label will be imported.
     description: ''
@@ -220,66 +301,65 @@ items:
   - name: --src-name
     summary: The name of the source App Configuration.
     description: ''
-  - name: --appservice-account
-    summary: ARM ID for AppService OR the name of the AppService, assuming it is in the same subscription and resource group as the App Configuration. Required for AppService arguments.
-    description: ''
-  - name: --depth
-    summary: Depth for flattening the json or yaml file to key-value pairs. Flatten to the deepest level by default. Not applicable for property files or feature flags.
-    description: ''
-  - name: --format
-    parameterValueGroup: json, properties, yaml
-    summary: Imported file format. Required for file arguments. Currently, feature flags are not supported in properties format.
-    description: ''
-  - name: --path
-    summary: Local configuration file path. Required for file arguments.
-    description: ''
-  - name: --separator
-    summary: "Delimiter for flattening the json or yaml file to key-value pairs. Required for importing hierarchical structure. Separator will be ignored for property files and feature flags. Supported values: '.', ',', ';', '-', '_', '__', '/', ':'."
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for preview.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_list
   name: az appconfig kv list
   summary: List key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv list [--all]
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--datetime]
+                         [--endpoint]
+                         [--fields {content_type, etag, key, label, last_modified, locked, tags, value}]
+                         [--key]
+                         [--label]
+                         [--name]
+                         [--query-examples]
+                         [--resolve-keyvault {false, true}]
+                         [--subscription]
+                         [--top]
   examples:
   - summary: List all key-values with null label.
-    syntax:
-      content: az appconfig kv list -n MyAppConfiguration --label \0
+    syntax: az appconfig kv list -n MyAppConfiguration --label \0
   - summary: List a specific key for any label start with v1. using connection string.
-    syntax:
-      content: az appconfig kv list --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
+    syntax: az appconfig kv list --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.*
   - summary: List all keys with any labels and query only key, value and tags.
-    syntax:
-      content: az appconfig kv list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value tags --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value tags --datetime "2019-05-01T11:24:12Z"
   - summary: List content of key vault reference with key prefix 'KVRef_' and only select key and value.
-    syntax:
-      content: az appconfig kv list -n MyAppConfiguration --key "KVRef_*" --resolve-keyvault --query "[*].{key:key, value:value}"
+    syntax: az appconfig kv list -n MyAppConfiguration --key "KVRef_*" --resolve-keyvault --query "[*].{key:key, value:value}"
   - summary: List key-values with multiple labels.
-    syntax:
-      content: az appconfig kv list --label test,prod,\0 -n MyAppConfiguration
-  parameters:
+    syntax: az appconfig kv list --label test,prod,\0 -n MyAppConfiguration
+  - summary: List all key-values with all labels using your 'az login' credentials.
+    syntax: az appconfig kv list --endpoint https://myappconfiguration.azconfig.io --auth-mode login
+  optionalParameters:
   - name: --all
     summary: List all items.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --fields
     parameterValueGroup: content_type, etag, key, label, last_modified, locked, tags, value
-    summary: Customize output fields.
+    summary: Space-separated customized output fields.
     description: ''
   - name: --key
     summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
@@ -288,134 +368,179 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --resolve-keyvault
     parameterValueGroup: false, true
     summary: Resolve the content of key vault reference. This argument should NOT be specified along with --fields. Instead use --query for customized query.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_lock
   name: az appconfig kv lock
   summary: Lock a key-value to prohibit write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv lock --key
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--endpoint]
+                         [--label]
+                         [--name]
+                         [--subscription]
+                         [--yes]
   examples:
   - summary: Lock a key-value using App Configuration name.
-    syntax:
-      content: az appconfig kv lock -n MyAppConfiguration --key color --label test
+    syntax: az appconfig kv lock -n MyAppConfiguration --key color --label test
   - summary: Force locking a key-value using connection string.
-    syntax:
-      content: az appconfig kv lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
-  parameters:
+    syntax: az appconfig kv lock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be locked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, lock entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_restore
   name: az appconfig kv restore
   summary: Restore key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv restore --datetime
+                            [--auth-mode {key, login}]
+                            [--connection-string]
+                            [--endpoint]
+                            [--key]
+                            [--label]
+                            [--name]
+                            [--subscription]
+                            [--yes]
   examples:
   - summary: Restore all key-values to a specific point in time.
-    syntax:
-      content: az appconfig kv restore -n MyAppConfiguration --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv restore -n MyAppConfiguration --datetime "2019-05-01T11:24:12Z"
   - summary: Restore a specific key for any label start with v1. using connection string to a specific point in time.
-    syntax:
-      content: az appconfig kv restore --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.* --datetime "2019-05-01T11:24:12Z"
-  parameters:
+    syntax: az appconfig kv restore --key color --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --label v1.* --datetime "2019-05-01T11:24:12Z"
+  requiredParameters:
   - isRequired: true
     name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --key
     summary: If no key specified, restore all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
     description: ''
   - name: --label
-    summary: If no label specified, restore all key-value pairs with all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix.
+    summary: If no label specified, restore all key-value pairs with all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_set
   name: az appconfig kv set
   summary: Set a key-value.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv set --key
+                        [--auth-mode {key, login}]
+                        [--connection-string]
+                        [--content-type]
+                        [--endpoint]
+                        [--label]
+                        [--name]
+                        [--subscription]
+                        [--tags]
+                        [--value]
+                        [--yes]
   examples:
   - summary: Set a key-value with label MyLabel.
-    syntax:
-      content: az appconfig kv set -n MyAppConfiguration --key color --label MyLabel --value red
+    syntax: az appconfig kv set -n MyAppConfiguration --key color --label MyLabel --value red
   - summary: Set a key with null label using connection string.
-    syntax:
-      content: az appconfig kv set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --value red --tags key1=value1 key2=value2
-  parameters:
+    syntax: az appconfig kv set --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --value red --tags key1=value1 key2=value2
+  - summary: Set a key with string value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key color --value \"red\" --content-type application/json
+  - summary: Set a key with list value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key options --value [1,2,3] --content-type application/activity+json;charset=utf-8
+  - summary: Set a key with null value and JSON content type.
+    syntax: az appconfig kv set -n MyAppConfiguration --key foo --value null --content-type application/json
+  - summary: Set a key-value using your 'az login' credentials.
+    syntax: az appconfig kv set --endpoint https://myappconfiguration.azconfig.io --key color --value red --auth-mode login
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be set. Key cannot be a '.' or '..', or contain the '%' character.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --content-type
     summary: Content type of the keyvalue to be set.
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, set the key with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -426,29 +551,28 @@ items:
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_appconfig_kv_set_keyvault
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
+- uid: az_appconfig_kv_set-keyvault
   name: az appconfig kv set-keyvault
   summary: Set a keyvault reference.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv set-keyvault --key
+                                 --secret-identifier
+                                 [--auth-mode {key, login}]
+                                 [--connection-string]
+                                 [--endpoint]
+                                 [--label]
+                                 [--name]
+                                 [--subscription]
+                                 [--tags]
+                                 [--yes]
   examples:
   - summary: Set a keyvault reference with label MyLabel.
-    syntax:
-      content: az appconfig kv set-keyvault -n MyAppConfiguration --key HostSecret --label MyLabel --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret/Dummyversion
+    syntax: az appconfig kv set-keyvault -n MyAppConfiguration --key HostSecret --label MyLabel --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret/Dummyversion
   - summary: Set a keyvault reference with null label and multiple tags using connection string.
-    syntax:
-      content: az appconfig kv set-keyvault --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key HostSecret --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret --tags tag1=value1 tag2=value2
-  parameters:
+    syntax: az appconfig kv set-keyvault --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key HostSecret --secret-identifier https://contoso.vault.azure.net/Secrets/DummySecret --tags tag1=value1 tag2=value2
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be set. Key cannot be a '.' or '..', or contain the '%' character.
@@ -457,14 +581,26 @@ items:
     name: --secret-identifier
     summary: ID of the Key Vault object. Can be found using 'az keyvault {collection} show' command, where collection is key, secret or certificate. To set reference to the latest version of your secret, remove version information from secret identifier.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, set the key with null label by default.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
@@ -472,124 +608,120 @@ items:
   - name: --yes -y
     summary: Do not prompt for confirmation.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_show
   name: az appconfig kv show
   summary: Show all attributes of a key-value.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv show --key
+                         [--auth-mode {key, login}]
+                         [--connection-string]
+                         [--datetime]
+                         [--endpoint]
+                         [--label]
+                         [--name]
+                         [--query-examples]
+                         [--subscription]
   examples:
   - summary: Show a key-value using App Configuration name with a specific label and datetime
-    syntax:
-      content: az appconfig kv show -n MyAppConfiguration --key color --label MyLabel --datetime "2019-05-01T11:24:12Z"
+    syntax: az appconfig kv show -n MyAppConfiguration --key color --label MyLabel --datetime "2019-05-01T11:24:12Z"
   - summary: Show a key-value using connection string with label
-    syntax:
-      content: az appconfig kv show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
-  parameters:
+    syntax: az appconfig kv show --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label MyLabel
+  - summary: Show a key-value using your 'az login' credentials.
+    syntax: az appconfig kv show --key color --auth-mode login --endpoint https://myappconfiguration.azconfig.io
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be showed.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --label
     summary: If no label specified, show entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 - uid: az_appconfig_kv_unlock
   name: az appconfig kv unlock
   summary: Unlock a key-value to gain write operations.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig kv unlock --key
+                           [--auth-mode {key, login}]
+                           [--connection-string]
+                           [--endpoint]
+                           [--label]
+                           [--name]
+                           [--subscription]
+                           [--yes]
   examples:
   - summary: Unlock a key-value using App Configuration name.
-    syntax:
-      content: az appconfig kv unlock -n MyAppConfiguration --key color --label test
+    syntax: az appconfig kv unlock -n MyAppConfiguration --key color --label test
   - summary: Force unlocking a key-value using connection string.
-    syntax:
-      content: az appconfig kv unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
-  parameters:
+    syntax: az appconfig kv unlock --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --label test --yes
+  requiredParameters:
   - isRequired: true
     name: --key
     summary: Key to be unlocked.
     description: ''
+  optionalParameters:
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
     description: ''
   - name: --label
     summary: If no label specified, unlock entry with null label. Filtering is not supported.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_kv_delete
-  name: az appconfig kv delete
-  summary: Delete key-values.
-- uid: az_appconfig_kv_export
-  name: az appconfig kv export
-  summary: Export configurations to another place from your App Configuration.
-- uid: az_appconfig_kv_import
-  name: az appconfig kv import
-  summary: Import configurations into your App Configuration from another place.
-- uid: az_appconfig_kv_list
-  name: az appconfig kv list
-  summary: List key-values.
-- uid: az_appconfig_kv_lock
-  name: az appconfig kv lock
-  summary: Lock a key-value to prohibit write operations.
-- uid: az_appconfig_kv_restore
-  name: az appconfig kv restore
-  summary: Restore key-values.
-- uid: az_appconfig_kv_set
-  name: az appconfig kv set
-  summary: Set a key-value.
-- uid: az_appconfig_kv_set_keyvault
-  name: az appconfig kv set-keyvault
-  summary: Set a keyvault reference.
-- uid: az_appconfig_kv_show
-  name: az appconfig kv show
-  summary: Show all attributes of a key-value.
-- uid: az_appconfig_kv_unlock
-  name: az appconfig kv unlock
-  summary: Unlock a key-value to gain write operations.
+- az_appconfig_kv_delete
+- az_appconfig_kv_export
+- az_appconfig_kv_import
+- az_appconfig_kv_list
+- az_appconfig_kv_lock
+- az_appconfig_kv_restore
+- az_appconfig_kv_set
+- az_appconfig_kv_set-keyvault
+- az_appconfig_kv_show
+- az_appconfig_kv_unlock
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -605,10 +737,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage key-values stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage key-values stored in an App Configuration.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml b/2019-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml
index 37c362f780..ce4398c928 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appconfig/revision.yml
@@ -1,42 +1,56 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appconfig_revision
-  name: az appconfig revision
-  summary: Manage revisions for key-values stored in an App Configuration.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appconfig_revision_list
+### YamlMime:AzureCLIGroup
+uid: az_appconfig_revision
+name: az appconfig revision
+summary: Manage revisions for key-values stored in an App Configuration.
+description: ''
+directCommands:
 - uid: az_appconfig_revision_list
   name: az appconfig revision list
   summary: Lists revision history of key-values.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appconfig revision list [--all]
+                               [--auth-mode {key, login}]
+                               [--connection-string]
+                               [--datetime]
+                               [--endpoint]
+                               [--fields {content_type, etag, key, label, last_modified, locked, tags, value}]
+                               [--key]
+                               [--label]
+                               [--name]
+                               [--query-examples]
+                               [--subscription]
+                               [--top]
   examples:
   - summary: List revision history of a key-value using App Configuration name.
-    syntax:
-      content: az appconfig revision list -n MyAppConfiguration --key color --label test
+    syntax: az appconfig revision list -n MyAppConfiguration --key color --label test
   - summary: List revision history of a key-value with multiple labels.
-    syntax:
-      content: az appconfig revision list -n MyAppConfiguration --key color --label test,prod,\0
+    syntax: az appconfig revision list -n MyAppConfiguration --key color --label test,prod,\0
   - summary: List revision history for key "color" with any labels using connection string
-    syntax:
-      content: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --datetime "2019-05-01T11:24:12Z"
-  parameters:
+    syntax: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --key color --datetime "2019-05-01T11:24:12Z"
+  - summary: List revision history for all items and query only key, value and last_modified.
+    syntax: az appconfig revision list --connection-string Endpoint=https://contoso.azconfig.io;Id=xxx;Secret=xxx --fields key value last_modified
+  optionalParameters:
   - name: --all
     summary: List all items.
     description: ''
+  - name: --auth-mode
+    defaultValue: key
+    parameterValueGroup: key, login
+    summary: This parameter can be used for indicating how a data operation is to be authorized. If the auth mode is "key", provide connection string or store name and your account access keys will be retrieved for authorization. If the auth mode is "login", provide the store endpoint or store name and your "az login" credentials will be used for authorization. You can configure the default auth mode using `az configure --defaults appconfig_auth_mode=<auth_mode>`. For more information, see https://docs.microsoft.com/en-us/azure/azure-app-configuration/concept-enable-rbac.
+    description: ''
   - name: --connection-string
-    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=&lt;connection_string&gt;` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
+    summary: Combination of access key and endpoint of App Configuration. Can be found using 'az appconfig credential list'. Users can preset it using `az configure --defaults appconfig_connection_string=<connection_string>` or environment variable with the name AZURE_APPCONFIG_CONNECTION_STRING.
     description: ''
   - name: --datetime
     summary: 'Format: "YYYY-MM-DDThh:mm:ssZ". If no time zone specified, use UTC by default.'
     description: ''
+  - name: --endpoint
+    summary: If auth mode is "login", provide endpoint URL of the App Configuration. The endpoint can be retrieved using "az appconfig show" command. You can configure the default endpoint using `az configure --defaults appconfig_endpoint=<endpoint>`.
+    description: ''
   - name: --fields
     parameterValueGroup: content_type, etag, key, label, last_modified, locked, tags, value
-    summary: Customize output fields.
+    summary: Space-separated customized output fields.
     description: ''
   - name: --key
     summary: If no key specified, return all keys by default. Support star sign as filters, for instance abc\* means keys with abc as prefix.
@@ -45,24 +59,20 @@ items:
     summary: If no label specified, list all labels. Support star sign as filters, for instance abc\* means labels with abc as prefix. Use '0' for null label.
     description: ''
   - name: --name -n
-    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=&lt;name&gt;`.
+    summary: Name of the App Configuration. You can configure the default name using `az configure --defaults app_configuration_store=<name>`.
     description: ''
-  - name: --top -t
-    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --top -t
+    summary: Maximum number of items to return. Must be a positive integer. Default to 100.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
 commands:
-- uid: az_appconfig_revision_list
-  name: az appconfig revision list
-  summary: Lists revision history of key-values.
+- az_appconfig_revision_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -78,10 +88,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/26e341bd9ce989aa68defdb81ceede36b6c5ba6f/src/azure-cli/azure/cli/command_modules/appconfig/_help.py
-updated_at: 5/7/2020 7:45:43 AM
-ms.date: 05/07/2020
-description: Manage revisions for key-values stored in an App Configuration.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 01/18/2021
+  description: Manage revisions for key-values stored in an App Configuration.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appservice.yml b/2019-03-01-hybrid/docs-ref-autogen/appservice.yml
index f42ac9e109..f2a5f3aab2 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appservice.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appservice.yml
@@ -1,99 +1,58 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appservice
-  name: az appservice
-  summary: Manage App Service plans.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appservice_list_locations
-- uid: az_appservice_list_locations
+### YamlMime:AzureCLIGroup
+uid: az_appservice
+name: az appservice
+summary: Manage App Service plans.
+description: ''
+directCommands:
+- uid: az_appservice_list-locations
   name: az appservice list-locations
   summary: List regions where a plan sku is available.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice list-locations --sku {B1, B2, B3, D1, F1, FREE, I1, I1v2, I2, I2v2, I3, I3v2, P1V2, P1V3, P2V2, P2V3, P3V2, P3V3, PC2, PC3, PC4, S1, S2, S3, SHARED}
+                                 [--linux-workers-enabled]
+                                 [--subscription]
   examples:
   - summary: List regions where a plan sku is available. (autogenerated)
-    syntax:
-      content: az appservice list-locations --sku F1
-  parameters:
+    syntax: az appservice list-locations --sku F1
+  requiredParameters:
   - isRequired: true
     name: --sku
-    parameterValueGroup: B1, B2, B3, D1, F1, FREE, I1, I2, I3, P1V2, P2V2, P3V2, PC2, PC3, PC4, S1, S2, S3, SHARED
-    summary: The pricing tiers, e.g., F1(Free), D1(Shared), B1(Basic Small), B2(Basic Medium), B3(Basic Large), S1(Standard Small), P1V2(Premium V2 Small), PC2 (Premium Container Small), PC3 (Premium Container Medium), PC4 (Premium Container Large), I1 (Isolated Small), I2 (Isolated Medium), I3 (Isolated Large).
+    parameterValueGroup: B1, B2, B3, D1, F1, FREE, I1, I1v2, I2, I2v2, I3, I3v2, P1V2, P1V3, P2V2, P2V3, P3V2, P3V3, PC2, PC3, PC4, S1, S2, S3, SHARED
+    summary: The pricing tiers, e.g., F1(Free), D1(Shared), B1(Basic Small), B2(Basic Medium), B3(Basic Large), S1(Standard Small), P1V2(Premium V2 Small), P1V3(Premium V3 Small), P2V3(Premium V3 Medium), P3V3(Premium V3 Large), PC2 (Premium Container Small), PC3 (Premium Container Medium), PC4 (Premium Container Large), I1 (Isolated Small), I2 (Isolated Medium), I3 (Isolated Large), I1v2 (Isolated V2 Small), I2v2 (Isolated V2 Medium), I3v2 (Isolated V2 Large).
     description: ''
+  optionalParameters:
   - name: --linux-workers-enabled
     summary: Get regions which support hosting web apps on Linux workers.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 commands:
-- uid: az_appservice_ase
-  name: az appservice ase
-  summary: Manage App Service Environments v2.
-- uid: az_appservice_ase_create
-  name: az appservice ase create
-  summary: Create app service environment.
-- uid: az_appservice_ase_delete
-  name: az appservice ase delete
-  summary: Delete app service environment.
-- uid: az_appservice_ase_list
-  name: az appservice ase list
-  summary: List app service environments.
-- uid: az_appservice_ase_list_addresses
-  name: az appservice ase list-addresses
-  summary: List VIPs associated with an app service environment.
-- uid: az_appservice_ase_list_plans
-  name: az appservice ase list-plans
-  summary: List app service plans associated with an app service environment.
-- uid: az_appservice_ase_show
-  name: az appservice ase show
-  summary: Show details of an app service environment.
-- uid: az_appservice_ase_update
-  name: az appservice ase update
-  summary: Update app service environment.
-- uid: az_appservice_hybrid_connection
-  name: az appservice hybrid-connection
-  summary: A method that sets the key a hybrid-connection uses.
-- uid: az_appservice_hybrid_connection_set_key
-  name: az appservice hybrid-connection set-key
-  summary: Set the key that all apps in an appservice plan use to connect to the hybrid-connections in that appservice plan.
-- uid: az_appservice_list_locations
-  name: az appservice list-locations
-  summary: List regions where a plan sku is available.
-- uid: az_appservice_plan
-  name: az appservice plan
-  summary: Manage app service plans.
-- uid: az_appservice_plan_create
-  name: az appservice plan create
-  summary: Create an app service plan.
-- uid: az_appservice_plan_delete
-  name: az appservice plan delete
-  summary: Delete an app service plan.
-- uid: az_appservice_plan_list
-  name: az appservice plan list
-  summary: List app service plans.
-- uid: az_appservice_plan_show
-  name: az appservice plan show
-  summary: Get the app service plans for a resource group or a set of resource groups.
-- uid: az_appservice_plan_update
-  name: az appservice plan update
-  summary: Update an app service plan. See <a href="https://docs.microsoft.com/azure/app-service/app-service-plan-manage#move-an-app-to-another-app-service-plan">https://docs.microsoft.com/azure/app-service/app-service-plan-manage#move-an-app-to-another-app-service-plan</a> to learn more.
-- uid: az_appservice_vnet_integration
-  name: az appservice vnet-integration
-  summary: A method that lists the virtual network integrations used in an appservice plan.
-- uid: az_appservice_vnet_integration_list
-  name: az appservice vnet-integration list
-  summary: List the virtual network integrations used in an appservice plan.
+- az_appservice_ase
+- az_appservice_ase_create
+- az_appservice_ase_create-inbound-services
+- az_appservice_ase_delete
+- az_appservice_ase_list
+- az_appservice_ase_list-addresses
+- az_appservice_ase_list-plans
+- az_appservice_ase_show
+- az_appservice_ase_update
+- az_appservice_domain
+- az_appservice_domain_create
+- az_appservice_domain_show-terms
+- az_appservice_hybrid-connection
+- az_appservice_hybrid-connection_set-key
+- az_appservice_list-locations
+- az_appservice_plan
+- az_appservice_plan_create
+- az_appservice_plan_delete
+- az_appservice_plan_list
+- az_appservice_plan_show
+- az_appservice_plan_update
+- az_appservice_vnet-integration
+- az_appservice_vnet-integration_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -109,10 +68,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/fe18bc1c9832da8f0d1dc9082d14bbcd800926e5/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-updated_at: 5/14/2020 1:44:42 AM
-ms.date: 05/14/2020
-description: Manage App Service plans.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage App Service plans.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appservice/ase.yml b/2019-03-01-hybrid/docs-ref-autogen/appservice/ase.yml
index ba2898de0e..f129465d4e 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appservice/ase.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appservice/ase.yml
@@ -1,72 +1,88 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appservice_ase
-  name: az appservice ase
-  summary: Manage App Service Environments v2.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appservice_ase_create
-  - az_appservice_ase_delete
-  - az_appservice_ase_list
-  - az_appservice_ase_list_addresses
-  - az_appservice_ase_list_plans
-  - az_appservice_ase_show
-  - az_appservice_ase_update
+### YamlMime:AzureCLIGroup
+uid: az_appservice_ase
+name: az appservice ase
+summary: Manage App Service Environments v2.
+description: ''
+directCommands:
 - uid: az_appservice_ase_create
   name: az appservice ase create
   summary: Create app service environment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase create --name
+                             --resource-group
+                             --subnet
+                             [--force-network-security-group {false, true}]
+                             [--force-route-table {false, true}]
+                             [--front-end-scale-factor]
+                             [--front-end-sku {I1, I2, I3}]
+                             [--ignore-network-security-group {false, true}]
+                             [--ignore-route-table {false, true}]
+                             [--ignore-subnet-size-validation {false, true}]
+                             [--kind {ASEv2, ASEv3}]
+                             [--location]
+                             [--no-wait]
+                             [--os-preference {Linux, Windows}]
+                             [--subscription]
+                             [--virtual-ip-type {External, Internal}]
+                             [--vnet-name]
   examples:
-  - summary: Create Resource Group, vNet and app service environment with default values.
-    syntax:
-      content: >-
-        az group create -g MyResourceGroup --location westeurope
+  - summary: Create Resource Group, vNet and app service environment v2 with default values.
+    syntax: >-
+      az group create -g MyResourceGroup --location westeurope
+
+
+      az network vnet create -g MyResourceGroup -n MyVirtualNetwork \
+        --address-prefixes 10.0.0.0/16 --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
+
+      az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
+        --subnet MyAseSubnet
+  - summary: Create External app service environments v2 with large front-ends and scale factor of 10 in existing resource group and vNet.
+    syntax: >-
+      az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
+        --subnet MyAseSubnet --front-end-sku I3 --front-end-scale-factor 10 \
+        --virtual-ip-type External
+  - summary: Create vNet and app service environment v2, but do not create network security group and route table in existing resource group.
+    syntax: >-
+      az network vnet create -g MyResourceGroup -n MyVirtualNetwork \
+        --address-prefixes 10.0.0.0/16 --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
 
+      az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
+        --subnet MyAseSubnet --ignore-network-security-group --ignore-route-table
+  - summary: Create vNet and app service environment v2 in a smaller than recommended subnet in existing resource group.
+    syntax: >-
+      az network vnet create -g MyResourceGroup -n MyVirtualNetwork \
+        --address-prefixes 10.0.0.0/16 --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/26
 
-        az network vnet create -g MyResourceGroup -n MyVirtualNetwork \
-          --address-prefixes 10.0.0.0/16 --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
+      az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
+        --subnet MyAseSubnet --ignore-subnet-size-validation
+  - summary: Create Resource Group, vNet and app service environment v3 with default values.
+    syntax: >-
+      az group create -g ASEv3ResourceGroup --location westeurope
 
-        az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
-          --subnet MyAseSubnet
-  - summary: Create External app service environments with large front-ends and scale factor of 10 in existing resource group and vNet.
-    syntax:
-      content: >-
-        az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
-          --subnet MyAseSubnet --front-end-sku I3 --front-end-scale-factor 10 \
-          --virtual-ip-type External
-  - summary: Create vNet and app service environment, but do not create network security group and route table in existing resource group.
-    syntax:
-      content: >-
-        az network vnet create -g MyResourceGroup -n MyVirtualNetwork \
-          --address-prefixes 10.0.0.0/16 --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/24
 
-        az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
-          --subnet MyAseSubnet --ignore-network-security-group --ignore-route-table
-  - summary: Create vNet and app service environment in a smaller than recommended subnet in existing resource group.
-    syntax:
-      content: >-
-        az network vnet create -g MyResourceGroup -n MyVirtualNetwork \
-          --address-prefixes 10.0.0.0/16 --subnet-name MyAseSubnet --subnet-prefixes 10.0.0.0/26
+      az network vnet create -g ASEv3ResourceGroup -n MyASEv3VirtualNetwork \
+        --address-prefixes 10.0.0.0/16 --subnet-name Inbound --subnet-prefixes 10.0.0.0/24
 
-        az appservice ase create -n MyAseName -g MyResourceGroup --vnet-name MyVirtualNetwork \
-          --subnet MyAseSubnet --ignore-subnet-size-validation
-  parameters:
+      az network vnet subnet create -g ASEv3ResourceGroup --vnet-name MyASEv3VirtualNetwork \
+        --name Outbound --address-prefixes 10.0.1.0/24
+
+      az appservice ase create -n MyASEv3Name -g ASEv3ResourceGroup \
+        --vnet-name MyASEv3VirtualNetwork --subnet Outbound --kind asev3
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the app service environment.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --subnet
     summary: Name or ID of existing subnet. To create vnet and/or subnet                    use `az network vnet [subnet] create`.
     description: ''
+  optionalParameters:
   - name: --force-network-security-group
     parameterValueGroup: false, true
     summary: Override network security group for subnet.
@@ -96,12 +112,24 @@ items:
     parameterValueGroup: false, true
     summary: Do not check if subnet is sized according to recommendations.
     description: ''
+  - name: --kind -k
+    defaultValue: ASEv2
+    parameterValueGroup: ASEv2, ASEv3
+    summary: Specify App Service Environment version.
+    description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
+  - name: --os-preference
+    parameterValueGroup: Linux, Windows
+    summary: Determine if app service environment should start with Linux workers. Applies to ASEv2 only.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --virtual-ip-type
     defaultValue: Internal
     parameterValueGroup: External, Internal
@@ -110,172 +138,206 @@ items:
   - name: --vnet-name
     summary: Name of the vNet. Mandatory if only subnet name is specified.
     description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
+- uid: az_appservice_ase_create-inbound-services
+  name: az appservice ase create-inbound-services
+  summary: Create the inbound services needed in preview for ASEv3 (private endpoint and DNS) or Private DNS Zone for Internal ASEv2.
+  description: ''
+  syntax: >-
+    az appservice ase create-inbound-services --name
+                                              --resource-group
+                                              --subnet
+                                              [--skip-dns {false, true}]
+                                              [--subscription]
+                                              [--vnet-name]
+  examples:
+  - summary: Create private endpoint, Private DNS Zone, A records and ensure subnet network policy.
+    syntax: >-
+      az appservice ase create-inbound-services -n MyASEName -g ASEResourceGroup \
+        --vnet-name MyASEVirtualNetwork --subnet MyAseSubnet
+  - summary: Create private endpoint and ensure subnet network policy (ASEv3), but do not create DNS Zone and records.
+    syntax: >-
+      az appservice ase create-inbound-services -n MyASEv3Name -g ASEv3ResourceGroup \
+        --vnet-name MyASEv3VirtualNetwork --subnet Inbound --skip-dns
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the app service environment.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --subnet
+    summary: Name or ID of existing subnet for inbound traffic to ASEv3.                    To create vnet and/or subnet use `az network vnet [subnet] create`.
+    description: ''
+  optionalParameters:
+  - name: --skip-dns
+    parameterValueGroup: false, true
+    summary: Do not create Private DNS Zone and DNS records.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --vnet-name
+    summary: Name of the vNet. Mandatory if only subnet name is specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_ase_delete
   name: az appservice ase delete
   summary: Delete app service environment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase delete --name
+                             [--no-wait]
+                             [--resource-group]
+                             [--subscription]
+                             [--yes]
   examples:
   - summary: Delete app service environment.
-    syntax:
-      content: az appservice ase delete -n MyAseName
-  parameters:
+    syntax: az appservice ase delete -n MyAseName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the app service environment.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_ase_list
   name: az appservice ase list
   summary: List app service environments.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase list [--query-examples]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: List all app service environments in subscription.
-    syntax:
-      content: az appservice ase list
-  - summary: List all app service environments in resource group.
-    syntax:
-      content: az appservice ase list --resource-group MyResourceGroup
-  parameters:
+    syntax: az appservice ase list
+  - summary: List all app service environment in resource group.
+    syntax: az appservice ase list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_appservice_ase_list_addresses
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
+- uid: az_appservice_ase_list-addresses
   name: az appservice ase list-addresses
   summary: List VIPs associated with an app service environment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase list-addresses --name
+                                     [--resource-group]
+                                     [--subscription]
   examples:
   - summary: List VIPs for an app service environments.
-    syntax:
-      content: az appservice ase list-addresses --name MyAseName
-  parameters:
+    syntax: az appservice ase list-addresses --name MyAseName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the app service environment.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_appservice_ase_list_plans
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
+- uid: az_appservice_ase_list-plans
   name: az appservice ase list-plans
   summary: List app service plans associated with an app service environment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase list-plans --name
+                                 [--resource-group]
+                                 [--subscription]
   examples:
   - summary: List app service plans for an app service environments.
-    syntax:
-      content: az appservice ase list-plans --name MyAseName
-  parameters:
+    syntax: az appservice ase list-plans --name MyAseName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the app service environment.
     description: ''
+  optionalParameters:
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_ase_show
   name: az appservice ase show
   summary: Show details of an app service environment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase show --name
+                           [--query-examples]
+                           [--resource-group]
+                           [--subscription]
   examples:
   - summary: Show app service environment.
-    syntax:
-      content: az appservice ase show --name MyAseName
-  parameters:
+    syntax: az appservice ase show --name MyAseName
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the app service environment.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_ase_update
   name: az appservice ase update
   summary: Update app service environment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice ase update --name
+                             [--front-end-scale-factor]
+                             [--front-end-sku {I1, I2, I3}]
+                             [--no-wait]
+                             [--resource-group]
+                             [--subscription]
   examples:
   - summary: Update app service environment with medium front-ends and scale factor of 10.
-    syntax:
-      content: >-
-        az appservice ase update -n MyAseName -g MyResourceGroup --front-end-sku I2 \
-          --front-end-scale-factor 10
-  parameters:
+    syntax: >-
+      az appservice ase update -n MyAseName -g MyResourceGroup --front-end-sku I2 \
+        --front-end-scale-factor 10
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the app service environment.
     description: ''
+  optionalParameters:
   - name: --front-end-scale-factor
     summary: Scale of front ends to app service plan instance ratio between 5 and 15.
     description: ''
@@ -287,39 +349,21 @@ items:
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 commands:
-- uid: az_appservice_ase_create
-  name: az appservice ase create
-  summary: Create app service environment.
-- uid: az_appservice_ase_delete
-  name: az appservice ase delete
-  summary: Delete app service environment.
-- uid: az_appservice_ase_list
-  name: az appservice ase list
-  summary: List app service environments.
-- uid: az_appservice_ase_list_addresses
-  name: az appservice ase list-addresses
-  summary: List VIPs associated with an app service environment.
-- uid: az_appservice_ase_list_plans
-  name: az appservice ase list-plans
-  summary: List app service plans associated with an app service environment.
-- uid: az_appservice_ase_show
-  name: az appservice ase show
-  summary: Show details of an app service environment.
-- uid: az_appservice_ase_update
-  name: az appservice ase update
-  summary: Update app service environment.
+- az_appservice_ase_create
+- az_appservice_ase_create-inbound-services
+- az_appservice_ase_delete
+- az_appservice_ase_list
+- az_appservice_ase_list-addresses
+- az_appservice_ase_list-plans
+- az_appservice_ase_show
+- az_appservice_ase_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -335,10 +379,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/fe18bc1c9832da8f0d1dc9082d14bbcd800926e5/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-updated_at: 5/14/2020 1:44:42 AM
-ms.date: 05/14/2020
-description: Manage App Service Environments v2.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage App Service Environments v2.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appservice/domain.yml b/2019-03-01-hybrid/docs-ref-autogen/appservice/domain.yml
new file mode 100644
index 0000000000..db1b196a03
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/appservice/domain.yml
@@ -0,0 +1,102 @@
+### YamlMime:AzureCLIGroup
+uid: az_appservice_domain
+name: az appservice domain
+summary: Manage custom domains.
+description: ''
+directCommands:
+- uid: az_appservice_domain_create
+  name: az appservice domain create
+  summary: Create and purchase a custom domain.
+  description: ''
+  syntax: >-
+    az appservice domain create --contact-info
+                                --hostname
+                                --resource-group
+                                [--accept-terms]
+                                [--auto-renew]
+                                [--dryrun]
+                                [--privacy]
+                                [--subscription]
+                                [--tags]
+  examples:
+  - summary: Accept the legal terms for purchasing and creating MyCustomDomain.com, then purchase and create domain.
+    syntax: az appservice domain create -g MyResourceGroup --hostname MyCustomDomain.com --contact-info=@'C:/path_to_contact_info.json' --accept-terms
+  - summary: View the details of the domain that will be purchased and created, without actually running the operation
+    syntax: az appservice domain create -g MyResourceGroup --hostname MyCustomDomain.com --contact-info=@'C:/path_to_contact_info.json' --dryrun
+  requiredParameters:
+  - isRequired: true
+    name: --contact-info -c
+    summary: 'The file path to a JSON object with your contact info for domain registration. Please see the following link for the format of the JSON file expected: https://github.com/AzureAppServiceCLI/appservice_domains_templates/blob/master/contact_info.json.'
+    description: ''
+  - isRequired: true
+    name: --hostname -n
+    summary: Name of the custom domain.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --accept-terms
+    summary: By using this flag, you are accepting the conditions shown using the --show-hostname-purchase-terms flag.
+    description: ''
+  - name: --auto-renew -a
+    defaultValue: "1"
+    summary: Enable auto-renew on the domain.
+    description: ''
+  - name: --dryrun
+    summary: Show summary of the purchase and create operation instead of executing it.
+    description: ''
+  - name: --privacy -p
+    defaultValue: "1"
+    summary: Enable privacy protection.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
+- uid: az_appservice_domain_show-terms
+  name: az appservice domain show-terms
+  summary: Show the legal terms for purchasing and creating a custom domain.
+  description: ''
+  syntax: >-
+    az appservice domain show-terms --hostname
+                                    [--subscription]
+  examples:
+  - summary: Show the legal terms for purchasing and creating MyCustomDomain.com
+    syntax: az appservice domain show-terms --hostname MyCustomDomain.com
+  requiredParameters:
+  - isRequired: true
+    name: --hostname -n
+    summary: Name of the custom domain.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
+commands:
+- az_appservice_domain_create
+- az_appservice_domain_show-terms
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage custom domains.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appservice/hybrid-connection.yml b/2019-03-01-hybrid/docs-ref-autogen/appservice/hybrid-connection.yml
index 0b363f5847..2c0d64e619 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appservice/hybrid-connection.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appservice/hybrid-connection.yml
@@ -1,24 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appservice_hybrid_connection
-  name: az appservice hybrid-connection
-  summary: A method that sets the key a hybrid-connection uses.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appservice_hybrid_connection_set_key
-- uid: az_appservice_hybrid_connection_set_key
+### YamlMime:AzureCLIGroup
+uid: az_appservice_hybrid-connection
+name: az appservice hybrid-connection
+summary: A method that sets the key a hybrid-connection uses.
+description: ''
+directCommands:
+- uid: az_appservice_hybrid-connection_set-key
   name: az appservice hybrid-connection set-key
   summary: Set the key that all apps in an appservice plan use to connect to the hybrid-connections in that appservice plan.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice hybrid-connection set-key --hybrid-connection
+                                            --key-type
+                                            --namespace
+                                            --plan
+                                            --resource-group
+                                            [--subscription]
   examples:
   - summary: set the key that all apps in an appservice plan use to connect to the hybrid-connections in that appservice plan
-    syntax:
-      content: az appservice hybrid-connection set-key -g MyResourceGroup --plan MyAppServicePlan --namespace [HybridConectionNamespace] --hybrid-connection [HybridConnectionName] --key-type ["primary"/"secondary"]
-  parameters:
+    syntax: az appservice hybrid-connection set-key -g MyResourceGroup --plan MyAppServicePlan --namespace [HybridConectionNamespace] --hybrid-connection [HybridConnectionName] --key-type ["primary"/"secondary"]
+  requiredParameters:
   - isRequired: true
     name: --hybrid-connection
     summary: Hybrid connection name.
@@ -37,21 +37,15 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 commands:
-- uid: az_appservice_hybrid_connection_set_key
-  name: az appservice hybrid-connection set-key
-  summary: Set the key that all apps in an appservice plan use to connect to the hybrid-connections in that appservice plan.
+- az_appservice_hybrid-connection_set-key
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -67,10 +61,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/fe18bc1c9832da8f0d1dc9082d14bbcd800926e5/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-updated_at: 5/14/2020 1:44:42 AM
-ms.date: 05/14/2020
-description: A method that sets the key a hybrid-connection uses.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: A method that sets the key a hybrid-connection uses.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appservice/plan.yml b/2019-03-01-hybrid/docs-ref-autogen/appservice/plan.yml
index 3e79dd268e..8b293e3b1b 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appservice/plan.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appservice/plan.yml
@@ -1,46 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appservice_plan
-  name: az appservice plan
-  summary: Manage app service plans.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appservice_plan_create
-  - az_appservice_plan_delete
-  - az_appservice_plan_list
-  - az_appservice_plan_show
-  - az_appservice_plan_update
+### YamlMime:AzureCLIGroup
+uid: az_appservice_plan
+name: az appservice plan
+summary: Manage app service plans.
+description: ''
+directCommands:
 - uid: az_appservice_plan_create
   name: az appservice plan create
   summary: Create an app service plan.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice plan create --name
+                              --resource-group
+                              [--app-service-environment]
+                              [--hyper-v]
+                              [--is-linux]
+                              [--location]
+                              [--no-wait]
+                              [--number-of-workers]
+                              [--per-site-scaling]
+                              [--sku {B1, B2, B3, D1, F1, FREE, I1, I1v2, I2, I2v2, I3, I3v2, P1V2, P1V3, P2V2, P2V3, P3V2, P3V3, PC2, PC3, PC4, S1, S2, S3, SHARED}]
+                              [--subscription]
+                              [--tags]
   examples:
   - summary: Create a basic app service plan.
-    syntax:
-      content: az appservice plan create -g MyResourceGroup -n MyPlan
-  - summary: Create a standard app service plan with with four Linux workers.
-    syntax:
-      content: >-
-        az appservice plan create -g MyResourceGroup -n MyPlan \
-            --is-linux --number-of-workers 4 --sku S1
+    syntax: az appservice plan create -g MyResourceGroup -n MyPlan
+  - summary: Create a standard app service plan with four Linux workers.
+    syntax: >-
+      az appservice plan create -g MyResourceGroup -n MyPlan \
+          --is-linux --number-of-workers 4 --sku S1
+  - summary: Create a Windows container app service plan.
+    syntax: az appservice plan create -g MyResourceGroup -n MyPlan \ --hyper-v --sku P1V3
   - summary: Create an app service plan for app service environment.
-    syntax:
-      content: >-
-        az appservice plan create -g MyResourceGroup -n MyPlan \
-            --app-service-environment MyAppServiceEnvironment --sku I1
-  parameters:
+    syntax: >-
+      az appservice plan create -g MyResourceGroup -n MyPlan \
+          --app-service-environment MyAppServiceEnvironment --sku I1
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of the new app service plan.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --app-service-environment -e
     summary: Name or ID of the app service environment.
     description: ''
@@ -51,7 +54,7 @@ items:
     summary: Host web app on Linux worker.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
     description: ''
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
@@ -65,35 +68,30 @@ items:
     description: ''
   - name: --sku
     defaultValue: B1
-    parameterValueGroup: B1, B2, B3, D1, F1, FREE, I1, I2, I3, P1V2, P2V2, P3V2, PC2, PC3, PC4, S1, S2, S3, SHARED
-    summary: The pricing tiers, e.g., F1(Free), D1(Shared), B1(Basic Small), B2(Basic Medium), B3(Basic Large), S1(Standard Small), P1V2(Premium V2 Small), PC2 (Premium Container Small), PC3 (Premium Container Medium), PC4 (Premium Container Large), I1 (Isolated Small), I2 (Isolated Medium), I3 (Isolated Large).
-    description: ''
-  - name: --tags
-    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    parameterValueGroup: B1, B2, B3, D1, F1, FREE, I1, I1v2, I2, I2v2, I3, I3v2, P1V2, P1V3, P2V2, P2V3, P3V2, P3V3, PC2, PC3, PC4, S1, S2, S3, SHARED
+    summary: The pricing tiers, e.g., F1(Free), D1(Shared), B1(Basic Small), B2(Basic Medium), B3(Basic Large), S1(Standard Small), P1V2(Premium V2 Small), P1V3(Premium V3 Small), P2V3(Premium V3 Medium), P3V3(Premium V3 Large), PC2 (Premium Container Small), PC3 (Premium Container Medium), PC4 (Premium Container Large), I1 (Isolated Small), I2 (Isolated Medium), I3 (Isolated Large), I1v2 (Isolated V2 Small), I2v2 (Isolated V2 Medium), I3v2 (Isolated V2 Large).
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_plan_delete
   name: az appservice plan delete
   summary: Delete an app service plan.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice plan delete [--ids]
+                              [--name]
+                              [--resource-group]
+                              [--subscription]
+                              [--yes]
   examples:
   - summary: Delete an app service plan. (autogenerated)
-    syntax:
-      content: az appservice plan delete --name MyAppServicePlan --resource-group MyResourceGroup
-  parameters:
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az appservice plan delete --name MyAppServicePlan --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
@@ -101,93 +99,94 @@ items:
     summary: The name of the app service plan.
     description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_plan_list
   name: az appservice plan list
   summary: List app service plans.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice plan list [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: List all free tier App Service plans.
-    syntax:
-      content: az appservice plan list --query "[?sku.tier=='Free']"
+    syntax: az appservice plan list --query "[?sku.tier=='Free']"
   - summary: List all App Service plans for an App Service environment.
-    syntax:
-      content: az appservice plan list --query "[?hostingEnvironmentProfile.name=='<ase-name>']"
-  parameters:
+    syntax: az appservice plan list --query "[?hostingEnvironmentProfile.name=='<ase-name>']"
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_plan_show
   name: az appservice plan show
   summary: Get the app service plans for a resource group or a set of resource groups.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice plan show [--ids]
+                            [--name]
+                            [--query-examples]
+                            [--resource-group]
+                            [--subscription]
   examples:
   - summary: Get the app service plans for a resource group or a set of resource groups. (autogenerated)
-    syntax:
-      content: az appservice plan show --name MyAppServicePlan   --resource-group MyResourceGroup
-  parameters:
+    syntax: az appservice plan show --name MyAppServicePlan   --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the app service plan.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 - uid: az_appservice_plan_update
   name: az appservice plan update
-  summary: Update an app service plan. See <a href="https://docs.microsoft.com/azure/app-service/app-service-plan-manage#move-an-app-to-another-app-service-plan">https://docs.microsoft.com/azure/app-service/app-service-plan-manage#move-an-app-to-another-app-service-plan</a> to learn more.
-  description: ''
-  langs:
-  - azurecli
+  summary: Update an app service plan.
+  description: See https:///go.microsoft.com/fwlink/?linkid=2133856 to learn more.
+  syntax: >-
+    az appservice plan update [--add]
+                              [--force-string]
+                              [--ids]
+                              [--name]
+                              [--no-wait]
+                              [--number-of-workers]
+                              [--remove]
+                              [--resource-group]
+                              [--set]
+                              [--sku {B1, B2, B3, D1, F1, FREE, I1, I1v2, I2, I2v2, I3, I3v2, P1V2, P1V3, P2V2, P2V3, P3V2, P3V3, PC2, PC3, PC4, S1, S2, S3, SHARED}]
+                              [--subscription]
   examples:
   - summary: Update an app service plan. (autogenerated)
-    syntax:
-      content: az appservice plan update --name MyAppServicePlan --resource-group MyResourceGroup --sku F1
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --number-of-workers
-    defaultValue: "1"
-    summary: Number of workers to be allocated.
+    syntax: az appservice plan update --name MyAppServicePlan --resource-group MyResourceGroup --sku F1
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
     description: ''
-  - name: --sku
-    parameterValueGroup: B1, B2, B3, D1, F1, FREE, I1, I2, I3, P1V2, P2V2, P3V2, PC2, PC3, PC4, S1, S2, S3, SHARED
-    summary: The pricing tiers, e.g., F1(Free), D1(Shared), B1(Basic Small), B2(Basic Medium), B3(Basic Large), S1(Standard Small), P1V2(Premium V2 Small), PC2 (Premium Container Small), PC3 (Premium Container Medium), PC4 (Premium Container Large), I1 (Isolated Small), I2 (Isolated Medium), I3 (Isolated Large).
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
     description: ''
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
@@ -195,46 +194,36 @@ items:
   - name: --name -n
     summary: The name of the app service plan.
     description: ''
-  - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  - name: --add
-    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
     description: ''
-  - name: --force-string
-    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+  - name: --number-of-workers
+    defaultValue: "1"
+    summary: Number of workers to be allocated.
     description: ''
   - name: --remove
     summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
     description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
   - name: --set
     summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --sku
+    parameterValueGroup: B1, B2, B3, D1, F1, FREE, I1, I1v2, I2, I2v2, I3, I3v2, P1V2, P1V3, P2V2, P2V3, P3V2, P3V3, PC2, PC3, PC4, S1, S2, S3, SHARED
+    summary: The pricing tiers, e.g., F1(Free), D1(Shared), B1(Basic Small), B2(Basic Medium), B3(Basic Large), S1(Standard Small), P1V2(Premium V2 Small), P1V3(Premium V3 Small), P2V3(Premium V3 Medium), P3V3(Premium V3 Large), PC2 (Premium Container Small), PC3 (Premium Container Medium), PC4 (Premium Container Large), I1 (Isolated Small), I2 (Isolated Medium), I3 (Isolated Large), I1v2 (Isolated V2 Small), I2v2 (Isolated V2 Medium), I3v2 (Isolated V2 Large).
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 commands:
-- uid: az_appservice_plan_create
-  name: az appservice plan create
-  summary: Create an app service plan.
-- uid: az_appservice_plan_delete
-  name: az appservice plan delete
-  summary: Delete an app service plan.
-- uid: az_appservice_plan_list
-  name: az appservice plan list
-  summary: List app service plans.
-- uid: az_appservice_plan_show
-  name: az appservice plan show
-  summary: Get the app service plans for a resource group or a set of resource groups.
-- uid: az_appservice_plan_update
-  name: az appservice plan update
-  summary: Update an app service plan. See <a href="https://docs.microsoft.com/azure/app-service/app-service-plan-manage#move-an-app-to-another-app-service-plan">https://docs.microsoft.com/azure/app-service/app-service-plan-manage#move-an-app-to-another-app-service-plan</a> to learn more.
+- az_appservice_plan_create
+- az_appservice_plan_delete
+- az_appservice_plan_list
+- az_appservice_plan_show
+- az_appservice_plan_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -250,10 +239,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/fe18bc1c9832da8f0d1dc9082d14bbcd800926e5/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-updated_at: 5/14/2020 1:44:42 AM
-ms.date: 05/14/2020
-description: Manage app service plans.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage app service plans.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/appservice/vnet-integration.yml b/2019-03-01-hybrid/docs-ref-autogen/appservice/vnet-integration.yml
index 441c5b7b45..3bb5b3f557 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/appservice/vnet-integration.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/appservice/vnet-integration.yml
@@ -1,45 +1,40 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_appservice_vnet_integration
-  name: az appservice vnet-integration
-  summary: A method that lists the virtual network integrations used in an appservice plan.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_appservice_vnet_integration_list
-- uid: az_appservice_vnet_integration_list
+### YamlMime:AzureCLIGroup
+uid: az_appservice_vnet-integration
+name: az appservice vnet-integration
+summary: A method that lists the virtual network integrations used in an appservice plan.
+description: ''
+directCommands:
+- uid: az_appservice_vnet-integration_list
   name: az appservice vnet-integration list
   summary: List the virtual network integrations used in an appservice plan.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az appservice vnet-integration list --plan
+                                        --resource-group
+                                        [--query-examples]
+                                        [--subscription]
   examples:
   - summary: list the virtual network integrations used in an appservice plan
-    syntax:
-      content: az appservice vnet-integration list -g MyResourceGroup --plan MyAppServicePlan
-  parameters:
+    syntax: az appservice vnet-integration list -g MyResourceGroup --plan MyAppServicePlan
+  requiredParameters:
   - isRequired: true
     name: --plan
     summary: AppService plan.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
 commands:
-- uid: az_appservice_vnet_integration_list
-  name: az appservice vnet-integration list
-  summary: List the virtual network integrations used in an appservice plan.
+- az_appservice_vnet-integration_list
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -55,10 +50,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/appservice/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/fe18bc1c9832da8f0d1dc9082d14bbcd800926e5/src/azure-cli/azure/cli/command_modules/appservice/_help.py
-updated_at: 5/14/2020 1:44:42 AM
-ms.date: 05/14/2020
-description: A method that lists the virtual network integrations used in an appservice plan.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: A method that lists the virtual network integrations used in an appservice plan.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/arcappliance.yml b/2019-03-01-hybrid/docs-ref-autogen/arcappliance.yml
new file mode 100644
index 0000000000..0ad8a69c53
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/arcappliance.yml
@@ -0,0 +1,90 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance
+name: az arcappliance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage an Arc Appliance.
+description: ''
+directCommands:
+- uid: az_arcappliance_get-credentials
+  name: az arcappliance get-credentials
+  summary: Command to get credentials.
+  description: ''
+  syntax: >-
+    az arcappliance get-credentials --name
+                                    --resource-group
+  examples:
+  - summary: Command to get credentials for a specific Appliance resource.
+    syntax: az arcappliance get-credentials --resource-group [REQUIRED] --name [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_list
+  name: az arcappliance list
+  summary: Command to list Arc Appliances.
+  description: ''
+  syntax: az arcappliance list [--resource-group]
+  examples:
+  - summary: Command to list Appliance resources in a resource group in current subscription context.
+    syntax: az arcappliance list -g [OPTIONAL]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_show
+  name: az arcappliance show
+  summary: Command to get an Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance show --name
+                         --resource-group
+  examples:
+  - summary: Command to give details about a particular Appliance resource in a resource group
+    syntax: az arcappliance show --resource-group [REQUIRED] --name [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_create
+- az_arcappliance_create_hci
+- az_arcappliance_create_vmware
+- az_arcappliance_delete
+- az_arcappliance_delete_hci
+- az_arcappliance_delete_vmware
+- az_arcappliance_deploy
+- az_arcappliance_deploy_hci
+- az_arcappliance_deploy_vmware
+- az_arcappliance_get-credentials
+- az_arcappliance_list
+- az_arcappliance_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage an Arc Appliance.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/arcappliance/create.yml b/2019-03-01-hybrid/docs-ref-autogen/arcappliance/create.yml
new file mode 100644
index 0000000000..8be82f7c92
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/arcappliance/create.yml
@@ -0,0 +1,94 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_create
+name: az arcappliance create
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance create** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for creation of appliance.
+description: ''
+directCommands:
+- uid: az_arcappliance_create_hci
+  name: az arcappliance create hci
+  summary: Command to create HCI Arc Appliance - must be done after Appliance has been deployed.
+  description: ''
+  syntax: >-
+    az arcappliance create hci --config-file
+                               --kubeconfig
+                               [--location]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Create Arc Appliance HCI Resource
+    syntax: az arcappliance create hci --config-file [REQUIRED] --kubeconfig [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  - isRequired: true
+    name: --kubeconfig
+    summary: Path to kubeconfig output from deploy command.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_create_vmware
+  name: az arcappliance create vmware
+  summary: Command to create VMware Arc Appliance - must be done Appliance has been deployed.
+  description: ''
+  syntax: >-
+    az arcappliance create vmware --config-file
+                                  --kubeconfig
+                                  [--location]
+                                  [--name]
+                                  [--resource-group]
+  examples:
+  - summary: Create Arc Appliance VMware Resource
+    syntax: az arcappliance create vmware --config-file [REQUIRED] --kubeconfig [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  - isRequired: true
+    name: --kubeconfig
+    summary: Path to kubeconfig output from deploy command.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_create_hci
+- az_arcappliance_create_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for creation of appliance.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/arcappliance/delete.yml b/2019-03-01-hybrid/docs-ref-autogen/arcappliance/delete.yml
new file mode 100644
index 0000000000..025b6b3708
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/arcappliance/delete.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_delete
+name: az arcappliance delete
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance delete** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for deletion of appliance cluster and resource.
+description: ''
+directCommands:
+- uid: az_arcappliance_delete_hci
+  name: az arcappliance delete hci
+  summary: Command to delete HCI Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance delete hci --config-file
+                               [--location]
+                               [--name]
+                               [--resource-group]
+                               [--yes]
+  examples:
+  - summary: Delete Arc Appliance HCI Resource
+    syntax: az arcappliance delete hci --config-file [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_arcappliance_delete_vmware
+  name: az arcappliance delete vmware
+  summary: Command to delete VMware Arc Appliance.
+  description: ''
+  syntax: >-
+    az arcappliance delete vmware --config-file
+                                  [--location]
+                                  [--name]
+                                  [--resource-group]
+                                  [--yes]
+  examples:
+  - summary: Delete Arc Appliance VMware Resource
+    syntax: az arcappliance delete vmware --config-file [REQUIRED]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+commands:
+- az_arcappliance_delete_hci
+- az_arcappliance_delete_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for deletion of appliance cluster and resource.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/arcappliance/deploy.yml b/2019-03-01-hybrid/docs-ref-autogen/arcappliance/deploy.yml
new file mode 100644
index 0000000000..ac8a09ca92
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/arcappliance/deploy.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_arcappliance_deploy
+name: az arcappliance deploy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **arcappliance** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az arcappliance deploy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Command group for deployment of appliance cluster.
+description: ''
+directCommands:
+- uid: az_arcappliance_deploy_hci
+  name: az arcappliance deploy hci
+  summary: Command to deploy HCI Arc Appliance - must be done before Azure Resource creation.
+  description: ''
+  syntax: >-
+    az arcappliance deploy hci --config-file
+                               [--location]
+                               [--name]
+                               [--outfile]
+                               [--resource-group]
+  examples:
+  - summary: Deploy Arc Appliance using HCI
+    syntax: az arcappliance deploy hci --config-file [REQUIRED]
+  - summary: Deploy Arc Appliance using HCI with a specified outfile
+    syntax: az arcappliance deploy hci --config-file [REQUIRED] --outfile [OPTIONAL]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --outfile
+    defaultValue: kubeconfig
+    summary: Path to where Kubeconfig should be output, defaults to ./kubeconfig.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_arcappliance_deploy_vmware
+  name: az arcappliance deploy vmware
+  summary: Command to deploy VMware Arc Appliance - must be done before Azure Resource creation.
+  description: ''
+  syntax: >-
+    az arcappliance deploy vmware --config-file
+                                  [--location]
+                                  [--name]
+                                  [--outfile]
+                                  [--resource-group]
+  examples:
+  - summary: Deploy Arc Appliance using VMware
+    syntax: az arcappliance deploy vmware --config-file [REQUIRED]
+  - summary: Deploy Arc Appliance using VMware with a specified outfile
+    syntax: az arcappliance deploy vmware --config-file [REQUIRED] --outfile [OPTIONAL]
+  requiredParameters:
+  - isRequired: true
+    name: --config-file
+    summary: Path to Appliance Config File.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name -n
+    summary: Name of the Arc Appliance.
+    description: ''
+  - name: --outfile
+    defaultValue: kubeconfig
+    summary: Path to where Kubeconfig should be output, defaults to ./kubeconfig.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_arcappliance_deploy_hci
+- az_arcappliance_deploy_vmware
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Command group for deployment of appliance cluster.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/artifacts.yml b/2019-03-01-hybrid/docs-ref-autogen/artifacts.yml
index 1cd52e4092..a5d005d483 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/artifacts.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/artifacts.yml
@@ -1,22 +1,12 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_artifacts
-  name: az artifacts
-  summary: Manage Azure Artifacts.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_artifacts
+name: az artifacts
+summary: Manage Azure Artifacts.
+description: This command group is a part of the azure-devops extension.
 commands:
-- uid: az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-- uid: az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
+- az_artifacts_universal
+- az_artifacts_universal_download
+- az_artifacts_universal_publish
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -32,4 +22,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml b/2019-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml
index 0a89664228..cfa0e7eb3d 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/artifacts/universal.yml
@@ -1,21 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_artifacts_universal
-  name: az artifacts universal
-  summary: Manage Universal Packages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_artifacts_universal_download
-  - az_artifacts_universal_publish
+### YamlMime:AzureCLIGroup
+uid: az_artifacts_universal
+name: az artifacts universal
+summary: Manage Universal Packages.
+description: ''
+directCommands:
 - uid: az_artifacts_universal_download
   name: az artifacts universal download
   summary: Download a package.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az artifacts universal download --feed
+                                    --name
+                                    --path
+                                    --version
+                                    [--detect {false, true}]
+                                    [--file-filter]
+                                    [--org]
+                                    [--project]
+                                    [--scope {organization, project}]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --feed
     summary: Name or ID of the feed.
@@ -32,6 +36,7 @@ items:
     name: --version -v
     summary: Version of the package, e.g. 1.0.0.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -40,7 +45,7 @@ items:
     summary: Wildcard filter for file download.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -57,9 +62,18 @@ items:
   name: az artifacts universal publish
   summary: Publish a package to a feed.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az artifacts universal publish --feed
+                                   --name
+                                   --path
+                                   --version
+                                   [--description]
+                                   [--detect {false, true}]
+                                   [--org]
+                                   [--project]
+                                   [--scope {organization, project}]
+                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --feed
     summary: Name or ID of the feed.
@@ -76,6 +90,7 @@ items:
     name: --version -v
     summary: Version of the package, e.g. '1.0.0'.
     description: ''
+  optionalParameters:
   - name: --description -d
     summary: Description of the package.
     description: ''
@@ -84,7 +99,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -98,12 +113,8 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_artifacts_universal_download
-  name: az artifacts universal download
-  summary: Download a package.
-- uid: az_artifacts_universal_publish
-  name: az artifacts universal publish
-  summary: Publish a package to a feed.
+- az_artifacts_universal_download
+- az_artifacts_universal_publish
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -119,4 +130,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Universal Packages.
+metadata:
+  description: Manage Universal Packages.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/attestation.yml b/2019-03-01-hybrid/docs-ref-autogen/attestation.yml
new file mode 100644
index 0000000000..9251c8c0e3
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/attestation.yml
@@ -0,0 +1,184 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation
+name: az attestation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Microsoft Azure Attestation (MAA).
+description: ''
+directCommands:
+- uid: az_attestation_create
+  name: az attestation create
+  summary: Creates a new Attestation Provider instance.
+  description: ''
+  syntax: >-
+    az attestation create --location
+                          --name
+                          --resource-group
+                          [--certs-input-path]
+                          [--tags]
+  examples:
+  - summary: AttestationProviders_Create
+    syntax: az attestation create --name "myattestationprovider" --resource-group "MyResourceGroup" -l westus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --certs-input-path
+    summary: Space-separated file paths to PEM/DER files containing certificates.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_attestation_delete
+  name: az attestation delete
+  summary: Delete Attestation Service.
+  description: ''
+  syntax: >-
+    az attestation delete [--id]
+                          [--name]
+                          [--resource-group]
+                          [--yes]
+  examples:
+  - summary: AttestationProviders_Delete
+    syntax: az attestation delete --name "myattestationprovider" --resource-group "sample-resource-group"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_attestation_get-default-by-location
+  name: az attestation get-default-by-location
+  summary: Get the default provider by location.
+  description: ''
+  syntax: az attestation get-default-by-location --location
+  examples:
+  - summary: AttestationProviders_GetDefaultWithLocation
+    syntax: az attestation get-default-by-location --location "Central US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. (eg: "West US").'
+    description: ''
+- uid: az_attestation_list
+  name: az attestation list
+  summary: Returns a list of attestation providers in a subscription.
+  description: ''
+  syntax: az attestation list [--resource-group]
+  examples:
+  - summary: AttestationProviders_ListByResourceGroup
+    syntax: az attestation list --resource-group "testrg1"
+  - summary: AttestationProviders_List
+    syntax: az attestation list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_list-default
+  name: az attestation list-default
+  summary: Get the default provider.
+  description: ''
+  syntax: az attestation list-default
+  examples:
+  - summary: AttestationProviders_GetDefault
+    syntax: az attestation list-default
+- uid: az_attestation_show
+  name: az attestation show
+  summary: Get the status of Attestation Provider.
+  description: ''
+  syntax: >-
+    az attestation show [--id]
+                        [--name]
+                        [--resource-group]
+  examples:
+  - summary: AttestationProviders_Get
+    syntax: az attestation show --name "myattestationprovider" --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_update
+  name: az attestation update
+  summary: Updates the Attestation Provider.
+  description: ''
+  syntax: >-
+    az attestation update --name
+                          --resource-group
+                          [--tags]
+  examples:
+  - summary: AttestationProviders_Update
+    syntax: >-
+      az attestation update --name "myattestationprovider" --resource-group "MyResourceGroup" \
+
+      --tags Property1="Value1" Property2="Value2" Property3="Value3"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the attestation service instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_attestation_create
+- az_attestation_delete
+- az_attestation_get-default-by-location
+- az_attestation_list
+- az_attestation_list-default
+- az_attestation_policy
+- az_attestation_policy_reset
+- az_attestation_policy_set
+- az_attestation_policy_show
+- az_attestation_show
+- az_attestation_signer
+- az_attestation_signer_add
+- az_attestation_signer_list
+- az_attestation_signer_remove
+- az_attestation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Microsoft Azure Attestation (MAA).
diff --git a/2019-03-01-hybrid/docs-ref-autogen/attestation/policy.yml b/2019-03-01-hybrid/docs-ref-autogen/attestation/policy.yml
new file mode 100644
index 0000000000..1ece84d673
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/attestation/policy.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation_policy
+name: az attestation policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage policies.
+description: ''
+directCommands:
+- uid: az_attestation_policy_reset
+  name: az attestation policy reset
+  summary: Resets the attestation policy for the specified tenant and reverts to the default policy.
+  description: ''
+  syntax: >-
+    az attestation policy reset --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                                [--id]
+                                [--name]
+                                [--policy-jws]
+                                [--resource-group]
+  examples:
+  - summary: Resets the attestation policy for the specified tenant and reverts to the default policy.
+    syntax: >-
+      az attestation policy reset -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --policy-jws "eyJhbGciOiJub25lIn0.."
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --policy-jws
+    defaultValue: eyJhbGciOiJub25lIn0..
+    summary: JSON Web Signature with an empty policy document.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_policy_set
+  name: az attestation policy set
+  summary: Sets the policy for a given kind of attestation type.
+  description: ''
+  syntax: >-
+    az attestation policy set --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                              [--id]
+                              [--name]
+                              [--new-attestation-policy]
+                              [--new-attestation-policy-file]
+                              [--policy-format {JWT, Text}]
+                              [--resource-group]
+  examples:
+  - summary: Sets the policy for a given kind of attestation type using JWT content.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy "{JWT}" --policy-format JWT
+  - summary: Sets the policy for a given kind of attestation type using Text content.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy "{json_text}"
+  - summary: Sets the policy for a given kind of attestation type using file name.
+    syntax: >-
+      az attestation policy set -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK --new-attestation-policy-file "{file_name}" --policy-format JWT
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --new-attestation-policy
+    summary: Content of the new attestation policy (Text or JWT).
+    description: ''
+  - name: --new-attestation-policy-file -f
+    summary: File name of the new attestation policy.
+    description: ''
+  - name: --policy-format
+    defaultValue: Text
+    parameterValueGroup: JWT, Text
+    summary: Specifies the format for the policy, either Text or JWT (JSON Web Token).
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_policy_show
+  name: az attestation policy show
+  summary: Retrieves the current policy for a given kind of attestation type.
+  description: ''
+  syntax: >-
+    az attestation policy show --attestation-type {SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM}
+                               [--id]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Retrieves the current policy for a given kind of attestation type.
+    syntax: >-
+      az attestation policy show -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --attestation-type SGX-OpenEnclaveSDK
+  requiredParameters:
+  - isRequired: true
+    name: --attestation-type
+    parameterValueGroup: SGX-IntelSDK, SGX-OpenEnclaveSDK, TPM
+    summary: Type of the attestation.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_attestation_policy_reset
+- az_attestation_policy_set
+- az_attestation_policy_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage policies.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/attestation/signer.yml b/2019-03-01-hybrid/docs-ref-autogen/attestation/signer.yml
new file mode 100644
index 0000000000..4f2e97e682
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/attestation/signer.yml
@@ -0,0 +1,116 @@
+### YamlMime:AzureCLIGroup
+uid: az_attestation_signer
+name: az attestation signer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **attestation** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az attestation signer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage signers.
+description: ''
+directCommands:
+- uid: az_attestation_signer_add
+  name: az attestation signer add
+  summary: Adds a new attestation policy certificate to the set of policy management certificates.
+  description: ''
+  syntax: >-
+    az attestation signer add [--id]
+                              [--name]
+                              [--resource-group]
+                              [--signer]
+                              [--signer-file]
+  examples:
+  - summary: Adds a new attestation policy certificate to the set of policy management certificates.
+    syntax: >-
+      az attestation signer add -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --signer "eyAiYWxnIjoiUlMyNTYiLCAie..."
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --signer
+    summary: The policy certificate to add. An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate" whose value is an RFC7517 JSON Web Key which specifies a new key to update. The RFC7519 JWT must be signed with one of the existing signing certificates.
+    description: ''
+  - name: --signer-file -f
+    summary: File name of the signer. (--signer and --signer-file/-f are mutually exclusive.).
+    description: ''
+- uid: az_attestation_signer_list
+  name: az attestation signer list
+  summary: Retrieves the set of certificates used to express policy for the current tenant.
+  description: ''
+  syntax: >-
+    az attestation signer list [--id]
+                               [--name]
+                               [--resource-group]
+  examples:
+  - summary: Retrieves the set of certificates used to express policy for the current tenant.
+    syntax: az attestation signer list -n "myattestationprovider" -g "MyResourceGroup"
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_attestation_signer_remove
+  name: az attestation signer remove
+  summary: Removes the specified policy management certificate.
+  description: ''
+  syntax: >-
+    az attestation signer remove [--id]
+                                 [--name]
+                                 [--resource-group]
+                                 [--signer]
+                                 [--signer-file]
+  examples:
+  - summary: Removes the specified policy management certificate.
+    syntax: >-
+      az attestation signer remove -n "myattestationprovider" -g "MyResourceGroup" \
+
+      --signer "eyAiYWxnIjoiUlMyNTYiLCAie..."
+  optionalParameters:
+  - name: --id
+    summary: Resource ID of the provider. Please omit --resource-group/-g or --name/-n if you have already specified --id.
+    description: ''
+  - name: --name -n
+    summary: Name of the attestation provider.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --signer
+    summary: The policy certificate to remove. An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate" whose value is an RFC7517 JSON Web Key which specifies a new key to update. The RFC7519 JWT must be signed with one of the existing signing certificates.
+    description: ''
+  - name: --signer-file -f
+    summary: File name of the signer. (--signer and --signer-file/-f are mutually exclusive.).
+    description: ''
+commands:
+- az_attestation_signer_add
+- az_attestation_signer_list
+- az_attestation_signer_remove
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage signers.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/automation.yml b/2019-03-01-hybrid/docs-ref-autogen/automation.yml
new file mode 100644
index 0000000000..d242ff42e5
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/automation.yml
@@ -0,0 +1,49 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation
+name: az automation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_automation_account
+- az_automation_account_create
+- az_automation_account_delete
+- az_automation_account_list
+- az_automation_account_show
+- az_automation_account_update
+- az_automation_job
+- az_automation_job_list
+- az_automation_job_resume
+- az_automation_job_show
+- az_automation_job_stop
+- az_automation_job_suspend
+- az_automation_runbook
+- az_automation_runbook_create
+- az_automation_runbook_delete
+- az_automation_runbook_list
+- az_automation_runbook_publish
+- az_automation_runbook_replace-content
+- az_automation_runbook_revert-to-published
+- az_automation_runbook_show
+- az_automation_runbook_start
+- az_automation_runbook_update
+- az_automation_runbook_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2019-03-01-hybrid/docs-ref-autogen/automation/account.yml b/2019-03-01-hybrid/docs-ref-autogen/automation/account.yml
new file mode 100644
index 0000000000..473fbb9e54
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/automation/account.yml
@@ -0,0 +1,153 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_account
+name: az automation account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Account.
+description: ''
+directCommands:
+- uid: az_automation_account_create
+  name: az automation account create
+  summary: Create automation account.
+  description: ''
+  syntax: >-
+    az automation account create --automation-account-name
+                                 --resource-group
+                                 [--location]
+                                 [--sku {Basic, Free}]
+                                 [--tags]
+  examples:
+  - summary: Create an automation account
+    syntax: az automation account create --automation-account-name "myAutomationAccount" --location "East US 2"                --sku "Free" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --sku
+    defaultValue: Basic
+    parameterValueGroup: Basic, Free
+    summary: Account SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_account_delete
+  name: az automation account delete
+  summary: Delete an automation account.
+  description: ''
+  syntax: >-
+    az automation account delete --automation-account-name
+                                 --resource-group
+                                 [--yes]
+  examples:
+  - summary: Delete automation account
+    syntax: az automation account delete --name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_automation_account_list
+  name: az automation account list
+  summary: Retrieve a list of accounts within a given resource group. And Retrieve a list of accounts within a given subscription.
+  description: ''
+  syntax: az automation account list [--resource-group]
+  examples:
+  - summary: List automation accounts by resource group
+    syntax: az automation account list --resource-group "rg"
+  - summary: List automation accounts by resource group
+    syntax: az automation account list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_account_show
+  name: az automation account show
+  summary: Get information about an Automation Account.
+  description: ''
+  syntax: >-
+    az automation account show --automation-account-name
+                               --resource-group
+  examples:
+  - summary: Get automation account
+    syntax: az automation account show --name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_account_update
+  name: az automation account update
+  summary: Update an automation account.
+  description: ''
+  syntax: >-
+    az automation account update --automation-account-name
+                                 --resource-group
+                                 [--sku {Basic, Free}]
+                                 [--tags]
+  examples:
+  - summary: Update an automation account
+    syntax: az automation account update --automation-account-name "myAutomationAccount" --tags KEY=VALUE                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name --name -n
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --sku
+    parameterValueGroup: Basic, Free
+    summary: Account SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_automation_account_create
+- az_automation_account_delete
+- az_automation_account_list
+- az_automation_account_show
+- az_automation_account_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/automation/job.yml b/2019-03-01-hybrid/docs-ref-autogen/automation/job.yml
new file mode 100644
index 0000000000..cac965160c
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/automation/job.yml
@@ -0,0 +1,148 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_job
+name: az automation job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Job.
+description: ''
+directCommands:
+- uid: az_automation_job_list
+  name: az automation job list
+  summary: Retrieve a list of jobs.
+  description: ''
+  syntax: >-
+    az automation job list --automation-account-name
+                           --resource-group
+  examples:
+  - summary: List jobs by automation account
+    syntax: az automation job list --automation-account-name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_resume
+  name: az automation job resume
+  summary: Resume the job identified by jobName.
+  description: ''
+  syntax: >-
+    az automation job resume --automation-account-name
+                             --job-name
+                             --resource-group
+  examples:
+  - summary: Resume job
+    syntax: az automation job resume --automation-account-name "myAutomationAccount" --name "foo"                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_show
+  name: az automation job show
+  summary: Retrieve the job identified by job name.
+  description: ''
+  syntax: >-
+    az automation job show --automation-account-name
+                           --job-name
+                           --resource-group
+  examples:
+  - summary: Get job
+    syntax: az automation job show --automation-account-name "myAutomationAccount" --name "foo" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_stop
+  name: az automation job stop
+  summary: Stop the job identified by jobName.
+  description: ''
+  syntax: >-
+    az automation job stop --automation-account-name
+                           --job-name
+                           --resource-group
+  examples:
+  - summary: Stop job
+    syntax: az automation job stop --automation-account-name "myAutomationAccount" --name "foo" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_job_suspend
+  name: az automation job suspend
+  summary: Suspend the job identified by job name.
+  description: ''
+  syntax: >-
+    az automation job suspend --automation-account-name
+                              --job-name
+                              --resource-group
+  examples:
+  - summary: Suspend job
+    syntax: az automation job suspend --automation-account-name "myAutomationAccount" --name "foo"                --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --job-name --name -n
+    summary: The job name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_automation_job_list
+- az_automation_job_resume
+- az_automation_job_show
+- az_automation_job_stop
+- az_automation_job_suspend
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Job.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/automation/runbook.yml b/2019-03-01-hybrid/docs-ref-autogen/automation/runbook.yml
new file mode 100644
index 0000000000..c8586384b9
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/automation/runbook.yml
@@ -0,0 +1,388 @@
+### YamlMime:AzureCLIGroup
+uid: az_automation_runbook
+name: az automation runbook
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **automation** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az automation runbook** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Automation Runbook.
+description: ''
+directCommands:
+- uid: az_automation_runbook_create
+  name: az automation runbook create
+  summary: Create the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook create --automation-account-name
+                                 --name
+                                 --resource-group
+                                 --type {Graph, GraphPowerShell, GraphPowerShellWorkflow, PowerShell, PowerShellWorkflow, Script}
+                                 [--description]
+                                 [--location]
+                                 [--log-activity-trace]
+                                 [--log-progress {false, true}]
+                                 [--log-verbose {false, true}]
+                                 [--tags]
+  examples:
+  - summary: Create a runbook
+    syntax: az automation runbook create --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook" --type "PowerShell" --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: Graph, GraphPowerShell, GraphPowerShellWorkflow, PowerShell, PowerShellWorkflow, Script
+    summary: Type of the runbook.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the runbook.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --log-activity-trace
+    summary: Activity level tracing options of the runbook.
+    description: ''
+  - name: --log-progress
+    parameterValueGroup: false, true
+    summary: Progress log option of the runbook.
+    description: ''
+  - name: --log-verbose
+    parameterValueGroup: false, true
+    summary: Verbose log option of the runbook.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_runbook_delete
+  name: az automation runbook delete
+  summary: Delete the runbook by name.
+  description: ''
+  syntax: >-
+    az automation runbook delete --automation-account-name
+                                 --name
+                                 --resource-group
+                                 [--yes]
+  examples:
+  - summary: Delete a runbook
+    syntax: az automation runbook delete --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_automation_runbook_list
+  name: az automation runbook list
+  summary: Retrieve a list of runbooks.
+  description: ''
+  syntax: >-
+    az automation runbook list --automation-account-name
+                               --resource-group
+  examples:
+  - summary: List runbooks by automation account
+    syntax: az automation runbook list --automation-account-name "myAutomationAccount" --resource-group "rg"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_publish
+  name: az automation runbook publish
+  summary: Publish runbook draft.
+  description: ''
+  syntax: >-
+    az automation runbook publish --automation-account-name
+                                  --name
+                                  --resource-group
+                                  [--no-wait]
+  examples:
+  - summary: Publish runbook draft
+    syntax: az automation runbook publish --automation-account-name "myAutomationAccount" --resource-group                "rg" --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The parameters supplied to the publish runbook operation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_automation_runbook_replace-content
+  name: az automation runbook replace-content
+  summary: Replace content of the runbook.
+  description: ''
+  syntax: >-
+    az automation runbook replace-content --automation-account-name
+                                          --content
+                                          --name
+                                          --resource-group
+                                          [--no-wait]
+  examples:
+  - summary: Replace content of the runbook
+    syntax: az automation runbook replace-content --automation-account-name "myAutomationAccount" --resource-group                "rg" --name "myRunbook" --content @/path/to/script
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --content
+    summary: The runbook content.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_automation_runbook_revert-to-published
+  name: az automation runbook revert-to-published
+  summary: Revert the runbook content to last known published state.
+  description: ''
+  syntax: >-
+    az automation runbook revert-to-published --automation-account-name
+                                              --name
+                                              --resource-group
+  examples:
+  - summary: Replace content of the runbook
+    syntax: az automation runbook revert-to-published --automation-account-name "myAutomationAccount"                --resource-group "rg" --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_show
+  name: az automation runbook show
+  summary: Retrieve the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook show --automation-account-name
+                               --name
+                               --resource-group
+  examples:
+  - summary: Get runbook
+    syntax: az automation runbook show --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_automation_runbook_start
+  name: az automation runbook start
+  summary: Start the runbook.
+  description: ''
+  syntax: >-
+    az automation runbook start --automation-account-name
+                                --resource-group
+                                [--name]
+                                [--parameters]
+                                [--run-on]
+  examples:
+  - summary: Start the runbook
+    syntax: az automation runbook start --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters of the job. Expect value: KEY1=VALUE1 KEY2=VALUE2 ...'
+    description: ''
+  - name: --run-on
+    summary: RunOn which specifies the group name where the job is to be executed.
+    description: ''
+- uid: az_automation_runbook_update
+  name: az automation runbook update
+  summary: Update the runbook identified by runbook name.
+  description: ''
+  syntax: >-
+    az automation runbook update --automation-account-name
+                                 --name
+                                 --resource-group
+                                 [--description]
+                                 [--log-activity-trace]
+                                 [--log-progress {false, true}]
+                                 [--log-verbose {false, true}]
+                                 [--tags]
+  examples:
+  - summary: Update a runbook
+    syntax: az automation runbook update --automation-account-name "myAutomationAccount" --description                "Runbook Description" --log-activity-trace 1 --log-progress true --log-verbose false                --resource-group "rg" --runbook-name "myRunbook"
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of the runbook.
+    description: ''
+  - name: --log-activity-trace
+    summary: Activity level tracing options of the runbook.
+    description: ''
+  - name: --log-progress
+    parameterValueGroup: false, true
+    summary: Progress log option of the runbook.
+    description: ''
+  - name: --log-verbose
+    parameterValueGroup: false, true
+    summary: Verbose log option of the runbook.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_automation_runbook_wait
+  name: az automation runbook wait
+  summary: Place the CLI in a waiting state until a condition of the automation runbook is met.
+  description: ''
+  syntax: >-
+    az automation runbook wait --automation-account-name
+                               --name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the automation runbook is successfully created.
+    syntax: az automation runbook wait --automation-account-name "myAutomationAccount" --resource-group "rg"                --name "myRunbook" --created
+  requiredParameters:
+  - isRequired: true
+    name: --automation-account-name
+    summary: The name of the automation account.
+    description: ''
+  - isRequired: true
+    name: --name --runbook-name -n
+    summary: The runbook name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_automation_runbook_create
+- az_automation_runbook_delete
+- az_automation_runbook_list
+- az_automation_runbook_publish
+- az_automation_runbook_replace-content
+- az_automation_runbook_revert-to-published
+- az_automation_runbook_show
+- az_automation_runbook_start
+- az_automation_runbook_update
+- az_automation_runbook_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Automation Runbook.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/baremetalinstance.yml b/2019-03-01-hybrid/docs-ref-autogen/baremetalinstance.yml
new file mode 100644
index 0000000000..4648feef1f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/baremetalinstance.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_baremetalinstance
+name: az baremetalinstance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **baremetal-infrastructure** extension for Azure CLI and requires version 2.12.0 or higher.  The extension will automatically install the first time you run an **az baremetalinstance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: (PREVIEW) Manage BareMetal Instances.
+description: ''
+directCommands:
+- uid: az_baremetalinstance_delete
+  name: az baremetalinstance delete
+  summary: Delete a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance delete --instance-name
+                                --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_list
+  name: az baremetalinstance list
+  summary: List BareMetal Instances.
+  description: ''
+  syntax: az baremetalinstance list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_restart
+  name: az baremetalinstance restart
+  summary: Restart a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance restart --instance-name
+                                 --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_show
+  name: az baremetalinstance show
+  summary: Get the details of a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance show --instance-name
+                              --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_shutdown
+  name: az baremetalinstance shutdown
+  summary: Shutdown a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance shutdown --instance-name
+                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_start
+  name: az baremetalinstance start
+  summary: Start a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance start --instance-name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_baremetalinstance_update
+  name: az baremetalinstance update
+  summary: Update the tags field of a BareMetal Instance.
+  description: ''
+  syntax: >-
+    az baremetalinstance update --instance-name
+                                --resource-group
+                                [--add]
+                                [--force-string]
+                                [--no-wait]
+                                [--remove]
+                                [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --instance-name -n
+    summary: The name of the BareMetal instance.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_baremetalinstance_delete
+- az_baremetalinstance_list
+- az_baremetalinstance_restart
+- az_baremetalinstance_show
+- az_baremetalinstance_shutdown
+- az_baremetalinstance_start
+- az_baremetalinstance_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: (PREVIEW) Manage BareMetal Instances.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/batch.yml b/2019-03-01-hybrid/docs-ref-autogen/batch.yml
new file mode 100644
index 0000000000..fc7056b203
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/batch.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch
+name: az batch
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Batch.
+description: ''
+commands:
+- az_batch_file
+- az_batch_file_download
+- az_batch_file_upload
+- az_batch_job
+- az_batch_job_create
+- az_batch_pool
+- az_batch_pool_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Batch.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/batch/file.yml b/2019-03-01-hybrid/docs-ref-autogen/batch/file.yml
new file mode 100644
index 0000000000..07eebdf0eb
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/batch/file.yml
@@ -0,0 +1,112 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_file
+name: az batch file
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch file** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch input files.
+description: ''
+directCommands:
+- uid: az_batch_file_download
+  name: az batch file download
+  summary: Download a specified file or directory of files to the specified storage path.
+  description: ''
+  syntax: >-
+    az batch file download --file-group
+                           --local-path
+                           [--account-endpoint]
+                           [--account-key]
+                           [--account-name]
+                           [--overwrite]
+                           [--remote-path]
+                           [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --file-group
+    summary: Name of a file group from which the files will be downloaded.
+    description: ''
+  - isRequired: true
+    name: --local-path
+    summary: Path to a local file or directory to be stored the download files.
+    description: ''
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --overwrite
+    summary: If set, an existing file in the local path will be overwritten.
+    description: ''
+  - name: --remote-path
+    summary: The subdirectory under which files exist remotely.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+- uid: az_batch_file_upload
+  name: az batch file upload
+  summary: Upload a specified file or directory of files to the specified storage path.
+  description: ''
+  syntax: >-
+    az batch file upload --file-group
+                         --local-path
+                         [--account-endpoint]
+                         [--account-key]
+                         [--account-name]
+                         [--flatten]
+                         [--remote-path]
+                         [--resource-group]
+  requiredParameters:
+  - isRequired: true
+    name: --file-group
+    summary: Name of a file group under which the files will be stored.
+    description: ''
+  - isRequired: true
+    name: --local-path
+    summary: Path to a local file or directory to be uploaded - can include wildcard patterns.
+    description: ''
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --flatten
+    summary: If set, will not retain local directory structure in storage.
+    description: ''
+  - name: --remote-path
+    summary: Group subdirectory under which files will be uploaded.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+commands:
+- az_batch_file_download
+- az_batch_file_upload
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch input files.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/batch/job.yml b/2019-03-01-hybrid/docs-ref-autogen/batch/job.yml
new file mode 100644
index 0000000000..0bdc131e1a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/batch/job.yml
@@ -0,0 +1,107 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_job
+name: az batch job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch jobs.
+description: ''
+directCommands:
+- uid: az_batch_job_create
+  name: az batch job create
+  summary: Add a job and associated task(s) to a Batch account.
+  description: ''
+  syntax: >-
+    az batch job create [--account-endpoint]
+                        [--account-key]
+                        [--account-name]
+                        [--id]
+                        [--job-manager-task-command-line]
+                        [--job-manager-task-environment-settings]
+                        [--job-manager-task-id]
+                        [--job-manager-task-resource-files]
+                        [--job-max-task-retry-count]
+                        [--job-max-wall-clock-time]
+                        [--json-file]
+                        [--metadata]
+                        [--parameters]
+                        [--pool-id]
+                        [--priority]
+                        [--resource-group]
+                        [--template]
+                        [--uses-task-dependencies]
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --id
+    summary: Required. A string that uniquely identifies the Job within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).
+    description: ''
+  - name: --job-manager-task-command-line
+    summary: The command line of the Job Manager task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
+    description: ''
+  - name: --job-manager-task-environment-settings
+    summary: A list of environment variable settings for the Job Manager task. Space separated values in 'key=value' format.
+    description: ''
+  - name: --job-manager-task-id
+    summary: A string that uniquely identifies the Job Manager task within the job. The id can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than 64 characters.
+    description: ''
+  - name: --job-manager-task-resource-files
+    summary: A list of files that the Batch service will download to the compute node before running the command line. Files listed under this element are located in the task's working directory. Space separated resource references in filename=httpurl format.
+    description: ''
+  - name: --job-max-task-retry-count
+    summary: The maximum number of times each task may be retried. The Batch service retries a task if its exit code is nonzero. Note that this value specifically controls the number of retries. The Batch service will try each task once, and may then retry up to this limit. For example, if the maximum retry count is 3, Batch tries a task up to 4 times (one initial try and 3 retries). If the maximum retry count is 0, the Batch service does not retry tasks. If the maximum retry count is -1, the Batch service retries tasks without limit. The default value is 0 (no retries).
+    description: ''
+  - name: --job-max-wall-clock-time
+    summary: The maximum elapsed time that the job may run, measured from the time the job is created. If the job does not complete within the time limit, the Batch service terminates it and any tasks that are still running. In this case, the termination reason will be MaxWallClockTimeExpiry. If this property is not specified, there is no time limit on how long the job may run. Expected format is an ISO-8601 duration.
+    description: ''
+  - name: --json-file
+    summary: The file containing the job to create in JSON format, if this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --metadata
+    summary: A list of name-value pairs associated with the job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code. Space separated values in 'key=value' format.
+    description: ''
+  - name: --parameters
+    summary: Parameter values for a Batch job JSON template file. Can only be used with --template.
+    description: ''
+  - name: --pool-id
+    summary: The id of an existing pool. All the tasks of the job will run on the specified pool.
+    description: ''
+  - name: --priority
+    summary: The priority of the Job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. The default value is 0.
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+  - name: --template
+    summary: A Batch job JSON template file. If this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --uses-task-dependencies
+    summary: The flag that determines if this job will use tasks with dependencies. True if flag present.
+    description: ''
+commands:
+- az_batch_job_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch jobs.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/batch/pool.yml b/2019-03-01-hybrid/docs-ref-autogen/batch/pool.yml
new file mode 100644
index 0000000000..95958ad097
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/batch/pool.yml
@@ -0,0 +1,135 @@
+### YamlMime:AzureCLIGroup
+uid: az_batch_pool
+name: az batch pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **azure-batch-cli-extensions** extension for Azure CLI and requires version 2.0.74 or higher.  The extension will automatically install the first time you run an **az batch pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Batch pools.
+description: ''
+directCommands:
+- uid: az_batch_pool_create
+  name: az batch pool create
+  summary: Create a Batch pool in an account. When creating a pool, choose arguments from either Cloud Services Configuration or Virtual Machine Configuration.
+  description: ''
+  syntax: >-
+    az batch pool create [--account-endpoint]
+                         [--account-key]
+                         [--account-name]
+                         [--application-licenses]
+                         [--application-package-references]
+                         [--auto-scale-formula]
+                         [--certificate-references]
+                         [--disk-encryption-targets]
+                         [--enable-inter-node-communication]
+                         [--id]
+                         [--image]
+                         [--json-file]
+                         [--metadata]
+                         [--node-agent-sku-id]
+                         [--os-family]
+                         [--parameters]
+                         [--resize-timeout]
+                         [--resource-group]
+                         [--start-task-command-line]
+                         [--start-task-resource-files]
+                         [--start-task-wait-for-success]
+                         [--target-dedicated-nodes]
+                         [--target-low-priority-nodes]
+                         [--template]
+                         [--vm-size]
+  optionalParameters:
+  - name: --account-endpoint
+    summary: 'Batch service endpoint. Alternatively, set by environment variable: AZURE_BATCH_ENDPOINT.'
+    description: ''
+  - name: --account-key
+    summary: 'The Batch account key. Alternatively, set by environment variable: AZURE_BATCH_ACCESS_KEY.'
+    description: ''
+  - name: --account-name
+    summary: 'The Batch account name. Alternatively, set by environment variable: AZURE_BATCH_ACCOUNT.'
+    description: ''
+  - name: --application-licenses
+    summary: The list of application licenses the Batch service will make available on each Compute Node in the Pool. The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, Pool creation will fail.
+    description: ''
+  - name: --application-package-references
+    summary: The list of Packages to be installed on each Compute Node in the Pool. Changes to Package references affect all new Nodes joining the Pool, but do not affect Compute Nodes that are already in the Pool until they are rebooted or reimaged. There is a maximum of 10 Package references on any given Pool.
+    description: ''
+  - name: --auto-scale-formula
+    summary: A formula for the desired number of Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to false. It is required if enableAutoScale is set to true. The formula is checked for validity before the Pool is created. If the formula is not valid, the Batch service rejects the request with detailed error information. For more information about specifying this formula, see 'Automatically scale Compute Nodes in an Azure Batch Pool' (https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/).
+    description: ''
+  - name: --certificate-references
+    summary: The list of Certificates to be installed on each Compute Node in the Pool. For Windows Nodes, the Batch service installs the Certificates to the specified Certificate store and location. For Linux Compute Nodes, the Certificates are stored in a directory inside the Task working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the Task to query for this location. For Certificates with visibility of 'remoteUser', a 'certs' directory is created in the user's home directory (e.g., /home/{user-name}/certs) and Certificates are placed in that directory.
+    description: ''
+  - name: --disk-encryption-targets
+    summary: A space seperated list of DiskEncryptionTargets. current possible values include OsDisk and TemporaryDisk.
+    description: ''
+  - name: --enable-inter-node-communication
+    summary: Whether the Pool permits direct communication between Compute Nodes. Enabling inter-node communication limits the maximum size of the Pool due to deployment restrictions on the Compute Nodes of the Pool. This may result in the Pool not reaching its desired size. The default value is false.
+    description: ''
+  - name: --id
+    summary: Required. A string that uniquely identifies the Pool within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two Pool IDs within an Account that differ only by case).
+    description: ''
+  - name: --image
+    summary: "OS image reference. This can be either 'publisher:offer:sku[:version]' format, or a fully qualified ARM image id of the form '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}'. If 'publisher:offer:sku[:version]' format, version is optional and if omitted latest will be used. Valid values can be retrieved via 'az batch pool node-agent-skus list'. For example: 'MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest'."
+    description: ''
+  - name: --json-file
+    summary: The file containing the pool to create in JSON format, if this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --metadata
+    summary: A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.
+    description: ''
+  - name: --node-agent-sku-id
+    summary: The SKU of the Batch node agent to be provisioned on compute nodes in the pool. The Batch node agent is a program that runs on each node in the pool, and provides the command-and-control interface between the node and the Batch service. There are different implementations of the node agent, known as SKUs, for different operating systems. You must specify a node agent SKU which matches the selected image reference. To get the list of supported node agent SKUs along with their list of verified image references, see the 'List supported node agent SKUs' operation.
+    description: ''
+  - name: --os-family
+    summary: 'The Azure Guest OS family to be installed on the virtual machines in the pool. Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to Windows Server 2016. For more information, see Azure Guest OS Releases (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). Allowed values: 2, 3, 4, 5.'
+    description: ''
+  - name: --parameters
+    summary: Parameter values for a Batch pool JSON template file. Can only be used with --template.
+    description: ''
+  - name: --resize-timeout
+    summary: The timeout for allocation of Compute Nodes to the Pool. This timeout applies only to manual scaling; it has no effect when enableAutoScale is set to true. The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).
+    description: ''
+  - name: --resource-group
+    summary: The resource group of the Batch account.
+    description: ''
+  - name: --start-task-command-line
+    summary: The command line of the start task. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux.
+    description: ''
+  - name: --start-task-resource-files
+    summary: A list of files that the Batch service will download to the compute node before running the command line. Space separated resource references in filename=httpurl format.
+    description: ''
+  - name: --start-task-wait-for-success
+    summary: Whether the Batch service should wait for the start task to complete successfully (that is, to exit with exit code 0) before scheduling any tasks on the compute node. If true and the start task fails on a compute node, the Batch service retries the start task up to its maximum retry count (maxTaskRetryCount). If the task has still not completed successfully after all retries, then the Batch service marks the compute node unusable, and will not schedule tasks to it. This condition can be detected via the node state and scheduling error detail. If false, the Batch service will not wait for the start task to complete. In this case, other tasks can start executing on the compute node while the start task is still running; and even if the start task fails, new tasks will continue to be scheduled on the node. The default is false. True if flag present.
+    description: ''
+  - name: --target-dedicated-nodes
+    summary: The desired number of dedicated Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
+    description: ''
+  - name: --target-low-priority-nodes
+    summary: The desired number of low-priority Compute Nodes in the Pool. This property must not be specified if enableAutoScale is set to true. If enableAutoScale is set to false, then you must set either targetDedicatedNodes, targetLowPriorityNodes, or both.
+    description: ''
+  - name: --template
+    summary: A Batch pool JSON template file. If this parameter is specified, all other parameters are ignored.
+    description: ''
+  - name: --vm-size
+    summary: Required. The size of virtual machines in the Pool. All virtual machines in a Pool are the same size. For information about available sizes of virtual machines for Cloud Services Pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for Pools using Images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
+    description: ''
+commands:
+- az_batch_pool_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Batch pools.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/bicep.yml b/2019-03-01-hybrid/docs-ref-autogen/bicep.yml
new file mode 100644
index 0000000000..556ba04f4e
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/bicep.yml
@@ -0,0 +1,132 @@
+### YamlMime:AzureCLIGroup
+uid: az_bicep
+name: az bicep
+summary: Bicep CLI command group.
+description: ''
+directCommands:
+- uid: az_bicep_build
+  name: az bicep build
+  summary: Build a Bicep file.
+  description: ''
+  syntax: >-
+    az bicep build --file
+                   [--outdir]
+                   [--outfile]
+                   [--stdout]
+                   [--subscription]
+  examples:
+  - summary: Build a Bicep file.
+    syntax: az bicep build --file {bicep_file}
+  - summary: Build a Bicep file and print all output to stdout.
+    syntax: az bicep build --file {bicep_file} --stdout
+  - summary: Build a Bicep file and save the result to the specified directory.
+    syntax: az bicep build --file {bicep_file} --outdir {out_dir}
+  - summary: Build a Bicep file and save the result to the specified file.
+    syntax: az bicep build --file {bicep_file} --outfile {out_file}
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The path to the Bicep file to build in the file system.
+    description: ''
+  optionalParameters:
+  - name: --outdir
+    summary: When set, saves the output at the specified directory.
+    description: ''
+  - name: --outfile
+    summary: When set, saves the output as the specified file path.
+    description: ''
+  - name: --stdout
+    summary: When set, prints all output to stdout instead of corresponding files.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_decompile
+  name: az bicep decompile
+  summary: Attempt to decompile an ARM template file to a Bicep file.
+  description: ''
+  syntax: >-
+    az bicep decompile --file
+                       [--subscription]
+  examples:
+  - summary: Decompile an ARM template file.
+    syntax: az bicep decompile --file {json_template_file}
+  requiredParameters:
+  - isRequired: true
+    name: --file -f
+    summary: The path to the ARM template to decompile in the file system.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_install
+  name: az bicep install
+  summary: Install Bicep CLI.
+  description: ''
+  syntax: >-
+    az bicep install [--subscription]
+                     [--version]
+  examples:
+  - summary: Install Bicep CLI.
+    syntax: az bicep install
+  - summary: Install a specific version of Bicep CLI.
+    syntax: az bicep install --version v0.2.212
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --version -v
+    summary: The version of Bicep CLI to be installed. Default to the latest if not specified.
+    description: ''
+- uid: az_bicep_list-versions
+  name: az bicep list-versions
+  summary: List out all available versions of Bicep CLI.
+  description: ''
+  syntax: az bicep list-versions [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_upgrade
+  name: az bicep upgrade
+  summary: Upgrade Bicep CLI to the latest version.
+  description: ''
+  syntax: az bicep upgrade [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+- uid: az_bicep_version
+  name: az bicep version
+  summary: Show the installed version of Bicep CLI.
+  description: ''
+  syntax: az bicep version [--subscription]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+commands:
+- az_bicep_build
+- az_bicep_decompile
+- az_bicep_install
+- az_bicep_list-versions
+- az_bicep_upgrade
+- az_bicep_version
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Bicep CLI command group.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blockchain.yml b/2019-03-01-hybrid/docs-ref-autogen/blockchain.yml
new file mode 100644
index 0000000000..e8b0f0bc05
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blockchain.yml
@@ -0,0 +1,47 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain
+name: az blockchain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_blockchain_consortium
+- az_blockchain_consortium_list
+- az_blockchain_member
+- az_blockchain_member_create
+- az_blockchain_member_delete
+- az_blockchain_member_list
+- az_blockchain_member_list-api-key
+- az_blockchain_member_list-consortium-member
+- az_blockchain_member_regenerate-api-key
+- az_blockchain_member_show
+- az_blockchain_member_update
+- az_blockchain_member_wait
+- az_blockchain_transaction-node
+- az_blockchain_transaction-node_create
+- az_blockchain_transaction-node_delete
+- az_blockchain_transaction-node_list
+- az_blockchain_transaction-node_list-api-key
+- az_blockchain_transaction-node_regenerate-api-key
+- az_blockchain_transaction-node_show
+- az_blockchain_transaction-node_update
+- az_blockchain_transaction-node_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blockchain/consortium.yml b/2019-03-01-hybrid/docs-ref-autogen/blockchain/consortium.yml
new file mode 100644
index 0000000000..2f97e5909f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blockchain/consortium.yml
@@ -0,0 +1,42 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_consortium
+name: az blockchain consortium
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain consortium** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain consortium.
+description: ''
+directCommands:
+- uid: az_blockchain_consortium_list
+  name: az blockchain consortium list
+  summary: List the available consortiums for a subscription.
+  description: ''
+  syntax: az blockchain consortium list --location
+  examples:
+  - summary: List the available consortiums for a subscription.
+    syntax: az blockchain consortium list --location "southeastasia"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_blockchain_consortium_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain consortium.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blockchain/member.yml b/2019-03-01-hybrid/docs-ref-autogen/blockchain/member.yml
new file mode 100644
index 0000000000..2c081dce30
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blockchain/member.yml
@@ -0,0 +1,315 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_member
+name: az blockchain member
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain member** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain member.
+description: ''
+directCommands:
+- uid: az_blockchain_member_create
+  name: az blockchain member create
+  summary: Create a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member create --name
+                                --resource-group
+                                [--consortium]
+                                [--consortium-management-account-password]
+                                [--firewall-rules]
+                                [--location]
+                                [--no-wait]
+                                [--password]
+                                [--protocol {Corda, NotSpecified, Parity, Quorum}]
+                                [--sku {Basic, Standard}]
+                                [--tags]
+                                [--validator-nodes-sku]
+  examples:
+  - summary: Create a blockchain member.
+    syntax: az blockchain member create --location "southeastasia" --consortium "ContoseConsortium" --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --validator-nodes-sku capacity=2 --protocol "Quorum" --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consortium
+    summary: Gets or sets the consortium for the blockchain member.
+    description: ''
+  - name: --consortium-management-account-password
+    summary: Sets the managed consortium management account password.
+    description: ''
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian member.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --password
+    summary: Sets the basic auth password of the blockchain member.
+    description: ''
+  - name: --protocol
+    parameterValueGroup: Corda, NotSpecified, Parity, Quorum
+    summary: Gets or sets the blockchain protocol.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Basic, Standard
+    summary: The Sku of the blockchain member.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validator-nodes-sku
+    summary: 'Gets or sets the blockchain validator nodes Sku. Expect value: capacity=xx.'
+    description: ''
+- uid: az_blockchain_member_delete
+  name: az blockchain member delete
+  summary: Delete a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member delete --name
+                                --resource-group
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete a blockchain member.
+    syntax: az blockchain member delete --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blockchain_member_list
+  name: az blockchain member list
+  summary: List the blockchain members.
+  description: ''
+  syntax: az blockchain member list [--resource-group]
+  examples:
+  - summary: List the blockchain members in a resource group.
+    syntax: az blockchain member list --resource-group "mygroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_list-api-key
+  name: az blockchain member list-api-key
+  summary: List the API keys for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member list-api-key --name
+                                      --resource-group
+  examples:
+  - summary: List the API keys for a blockchain member.
+    syntax: az blockchain member list-api-key --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_list-consortium-member
+  name: az blockchain member list-consortium-member
+  summary: List the consortium members for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member list-consortium-member --name
+                                                --resource-group
+  examples:
+  - summary: List the consortium members for a blockchain member.
+    syntax: az blockchain member list-consortium-member --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_regenerate-api-key
+  name: az blockchain member regenerate-api-key
+  summary: Regenerate the API keys for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member regenerate-api-key --name
+                                            --resource-group
+                                            [--key-name {key1, key2}]
+  examples:
+  - summary: Regenerate the API keys for a blockchain member.
+    syntax: az blockchain member regenerate-api-key --key-name "key1" --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: key1, key2
+    summary: Gets or sets the API key name.
+    description: ''
+- uid: az_blockchain_member_show
+  name: az blockchain member show
+  summary: Show the details about a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member show --name
+                              --resource-group
+  examples:
+  - summary: Show the details about a blockchain member.
+    syntax: az blockchain member show --name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_member_update
+  name: az blockchain member update
+  summary: Update a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain member update --name
+                                --resource-group
+                                [--consortium-management-account-password]
+                                [--firewall-rules]
+                                [--password]
+                                [--tags]
+  examples:
+  - summary: Update a blockchain member.
+    syntax: az blockchain member update --consortium-management-account-password "1234abcdEFG1" --password "1234abcdEFG1" --name "ContoseMember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --consortium-management-account-password
+    summary: Sets the managed consortium management account password.
+    description: ''
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian member.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_blockchain_member_wait
+  name: az blockchain member wait
+  summary: Wait until a blockchain member is created or deleted.
+  description: ''
+  syntax: >-
+    az blockchain member wait --name
+                              --resource-group
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Wait until a blockchain member is created.
+    syntax: az blockchain member wait --name "contosemember1" --resource-group "mygroup" --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_blockchain_member_create
+- az_blockchain_member_delete
+- az_blockchain_member_list
+- az_blockchain_member_list-api-key
+- az_blockchain_member_list-consortium-member
+- az_blockchain_member_regenerate-api-key
+- az_blockchain_member_show
+- az_blockchain_member_update
+- az_blockchain_member_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain member.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blockchain/transaction-node.yml b/2019-03-01-hybrid/docs-ref-autogen/blockchain/transaction-node.yml
new file mode 100644
index 0000000000..5af3848fca
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blockchain/transaction-node.yml
@@ -0,0 +1,307 @@
+### YamlMime:AzureCLIGroup
+uid: az_blockchain_transaction-node
+name: az blockchain transaction-node
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blockchain** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az blockchain transaction-node** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Blockchain transaction-node.
+description: ''
+directCommands:
+- uid: az_blockchain_transaction-node_create
+  name: az blockchain transaction-node create
+  summary: Create a transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node create --member-name
+                                          --name
+                                          --resource-group
+                                          [--firewall-rules]
+                                          [--location]
+                                          [--no-wait]
+                                          [--password]
+  examples:
+  - summary: Create a transaction node.
+    syntax: az blockchain transaction-node create --member-name "contosemember1" --resource-group "mygroup" --location "southeastasia" --password "1234abcdEFG1" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian transaction node.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+- uid: az_blockchain_transaction-node_delete
+  name: az blockchain transaction-node delete
+  summary: Delete the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node delete --member-name
+                                          --name
+                                          --resource-group
+                                          [--no-wait]
+                                          [--yes]
+  examples:
+  - summary: Delete the transaction node.
+    syntax: az blockchain transaction-node delete --member-name "contosemember1" --resource-group "mygroup" --name "txNode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blockchain_transaction-node_list
+  name: az blockchain transaction-node list
+  summary: List the transaction nodes for a blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node list --member-name
+                                        --resource-group
+  examples:
+  - summary: List the transaction nodes for a blockchain member.
+    syntax: az blockchain transaction-node list --member-name "contosemember1" --resource-group "mygroup"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_list-api-key
+  name: az blockchain transaction-node list-api-key
+  summary: List the API keys for the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node list-api-key --member-name
+                                                --name
+                                                --resource-group
+  examples:
+  - summary: List the API keys for the transaction node.
+    syntax: az blockchain transaction-node list-api-key --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_regenerate-api-key
+  name: az blockchain transaction-node regenerate-api-key
+  summary: Regenerate the API keys for the blockchain member.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node regenerate-api-key --member-name
+                                                      --name
+                                                      --resource-group
+                                                      [--key-name {key1, key2}]
+                                                      [--value]
+  examples:
+  - summary: Regenerate the API keys for the blockchain member.
+    syntax: az blockchain transaction-node regenerate-api-key --key-name "key1" --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: key1, key2
+    summary: Gets or sets the API key name.
+    description: ''
+  - name: --value
+    summary: Gets or sets the API key value.
+    description: ''
+- uid: az_blockchain_transaction-node_show
+  name: az blockchain transaction-node show
+  summary: Show the details of the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node show --member-name
+                                        --name
+                                        --resource-group
+  examples:
+  - summary: Show the details of the transaction node.
+    syntax: az blockchain transaction-node show --member-name "contosemember1" --resource-group "mygroup" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_blockchain_transaction-node_update
+  name: az blockchain transaction-node update
+  summary: Update the transaction node.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node update --member-name
+                                          --name
+                                          --resource-group
+                                          [--firewall-rules]
+                                          [--password]
+  examples:
+  - summary: Update the transaction node.
+    syntax: az blockchain transaction-node update --member-name "contosemember1" --resource-group "mygroup" --password "1234abcdEFG1" --name "txnode2"
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --firewall-rules
+    summary: Firewall rules of the blockchian transaction node.
+    description: >-
+      Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: rule-name, start-ip-address, end-ip-address.
+
+
+      Multiple firewall rules can be specified by using more than one `--firewall-rules` argument.
+  - name: --password
+    summary: Sets the transaction node dns endpoint basic auth password.
+    description: ''
+- uid: az_blockchain_transaction-node_wait
+  name: az blockchain transaction-node wait
+  summary: Wait until the transaction node is created or deleted.
+  description: ''
+  syntax: >-
+    az blockchain transaction-node wait --member-name
+                                        --name
+                                        --resource-group
+                                        [--created]
+                                        [--custom]
+                                        [--deleted]
+                                        [--exists]
+                                        [--interval]
+                                        [--timeout]
+                                        [--updated]
+  examples:
+  - summary: Wait until the transaction node is created.
+    syntax: az blockchain transaction-node wait --member-name "contosemember1" --resource-group "mygroup" --name "txNode2" --created
+  requiredParameters:
+  - isRequired: true
+    name: --member-name
+    summary: Blockchain member name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Transaction node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_blockchain_transaction-node_create
+- az_blockchain_transaction-node_delete
+- az_blockchain_transaction-node_list
+- az_blockchain_transaction-node_list-api-key
+- az_blockchain_transaction-node_regenerate-api-key
+- az_blockchain_transaction-node_show
+- az_blockchain_transaction-node_update
+- az_blockchain_transaction-node_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Blockchain transaction-node.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint.yml
new file mode 100644
index 0000000000..2135211f65
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint.yml
@@ -0,0 +1,368 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint
+name: az blueprint
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint.
+description: ''
+directCommands:
+- uid: az_blueprint_create
+  name: az blueprint create
+  summary: Create a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint create --name
+                        [--description]
+                        [--display-name]
+                        [--management-group]
+                        [--parameters]
+                        [--subscription]
+                        [--target-scope {managementGroup, subscription}]
+  examples:
+  - summary: Create a subscription blueprint
+    syntax: >-
+      az blueprint create --subscription MySubscription --name \
+
+      MyBlueprint --description \
+
+      "blueprint contains all artifacts" --target-scope \
+
+      subscription
+  - summary: Create a management group blueprint
+    syntax: >-
+      az blueprint create --management-group MyManagementGroup --name \
+
+      MyBlueprint --description \
+
+      "blueprint contains all artifact" --target-scope \
+
+      subscription
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --target-scope
+    defaultValue: subscription
+    parameterValueGroup: managementGroup, subscription
+    summary: The scope where this blueprint definition can be assigned.
+    description: ''
+- uid: az_blueprint_delete
+  name: az blueprint delete
+  summary: Delete a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint delete --name
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Delete a management group blueprint
+    syntax: >-
+      az blueprint delete --management-group MyManagementGroup --name \
+
+      MyBlueprint
+  - summary: Delete a subscription blueprint
+    syntax: >-
+      az blueprint delete --subscription MySubscription --name \
+
+      MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_export
+  name: az blueprint export
+  summary: Export a blueprint definition and artifacts to json file(s).
+  description: ''
+  syntax: >-
+    az blueprint export --name
+                        --output-path
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Export a blueprint definition and artifacts
+    syntax: >-
+      az blueprint export --name MyBlueprint \
+
+      --output-path "path/to/blueprint/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition to export.
+    description: ''
+  - isRequired: true
+    name: --output-path
+    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file will be named blueprint.json. Artifacts json files will be in a subdirectory named artifacts.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Skip user confirmation. When set, if directory does not exist, it will be created. If the directory exists and has contents, they will be overwritten. If not set, user will be prompted for permission to proceed.
+    description: ''
+- uid: az_blueprint_import
+  name: az blueprint import
+  summary: Import a blueprint definition and artifacts from a directoy of json files.
+  description: ''
+  syntax: >-
+    az blueprint import --input-path
+                        --name
+                        [--management-group]
+                        [--subscription]
+                        [--yes]
+  examples:
+  - summary: Import a blueprint definition and artifacts
+    syntax: >-
+      az blueprint import --name MyBlueprint \
+
+      --input-path "path/to/blueprint/directory"
+  requiredParameters:
+  - isRequired: true
+    name: --input-path
+    summary: The directory path for json definitions of the blueprint and artifacts. The blueprint definition file should be named blueprint.json. Artifacts json files should be in a subdirectory named artifacts.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_list
+  name: az blueprint list
+  summary: List blueprint definitions.
+  description: ''
+  syntax: >-
+    az blueprint list [--management-group]
+                      [--subscription]
+  examples:
+  - summary: List blueprints in a management group
+    syntax: az blueprint list --management-group MyManagementGroup
+  - summary: List blueprints in a subscription
+    syntax: az blueprint list --subscription MySubscription
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_publish
+  name: az blueprint publish
+  summary: Publish a new version of the blueprint definition with the latest artifacts. Published blueprint definitions are immutable.
+  description: ''
+  syntax: >-
+    az blueprint publish --blueprint-name
+                         --version
+                         [--change-notes]
+                         [--management-group]
+                         [--subscription]
+  examples:
+  - summary: Publish a management group blueprint
+    syntax: >-
+      az blueprint publish --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: Publish a subscription blueprint
+    syntax: >-
+      az blueprint publish --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --change-notes
+    summary: Version-specific change notes.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_show
+  name: az blueprint show
+  summary: Get a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint show --name
+                      [--management-group]
+                      [--subscription]
+  examples:
+  - summary: Show a management group blueprint
+    syntax: >-
+      az blueprint show --management-group MyManagementGroup --name \
+
+      MyBlueprint
+  - summary: Show a subscription blueprint
+    syntax: >-
+      az blueprint show --subscription MySubscription --name \
+
+      MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_update
+  name: az blueprint update
+  summary: Update a blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint update --name
+                        [--add]
+                        [--description]
+                        [--force-string]
+                        [--management-group]
+                        [--parameters]
+                        [--remove]
+                        [--set]
+                        [--subscription]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters required by this blueprint definition. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact
+- az_blueprint_artifact_delete
+- az_blueprint_artifact_list
+- az_blueprint_artifact_policy
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+- az_blueprint_artifact_role
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+- az_blueprint_artifact_show
+- az_blueprint_artifact_template
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+- az_blueprint_assignment
+- az_blueprint_assignment_create
+- az_blueprint_assignment_delete
+- az_blueprint_assignment_list
+- az_blueprint_assignment_show
+- az_blueprint_assignment_update
+- az_blueprint_assignment_wait
+- az_blueprint_assignment_who
+- az_blueprint_create
+- az_blueprint_delete
+- az_blueprint_export
+- az_blueprint_import
+- az_blueprint_list
+- az_blueprint_publish
+- az_blueprint_resource-group
+- az_blueprint_resource-group_add
+- az_blueprint_resource-group_list
+- az_blueprint_resource-group_remove
+- az_blueprint_resource-group_show
+- az_blueprint_resource-group_update
+- az_blueprint_show
+- az_blueprint_update
+- az_blueprint_version
+- az_blueprint_version_artifact
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+- az_blueprint_version_delete
+- az_blueprint_version_list
+- az_blueprint_version_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact.yml
new file mode 100644
index 0000000000..e51e30f6d4
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact.yml
@@ -0,0 +1,147 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact
+name: az blueprint artifact
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_delete
+  name: az blueprint artifact delete
+  summary: Delete a blueprint artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact delete --blueprint-name
+                                 --name
+                                 [--management-group]
+                                 [--subscription]
+                                 [--yes]
+  examples:
+  - summary: Delete a role assignment artifact
+    syntax: >-
+      az blueprint artifact delete --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --name OwnerAssignment
+  - summary: Delete an ARM template artifact
+    syntax: >-
+      az blueprint artifact delete --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint artifact.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_artifact_list
+  name: az blueprint artifact list
+  summary: List artifacts for a given blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint artifact list --blueprint-name
+                               [--management-group]
+                               [--subscription]
+  examples:
+  - summary: List artifcats for a management group blueprint
+    syntax: >-
+      az blueprint artifact list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint
+  - summary: List artifcats for a subscription blueprint
+    syntax: >-
+      az blueprint artifact list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_show
+  name: az blueprint artifact show
+  summary: Get a blueprint artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact show --blueprint-name
+                               --name
+                               [--management-group]
+                               [--subscription]
+  examples:
+  - summary: Show an artifact of a subscription blueprint
+    syntax: >-
+      az blueprint artifact show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --name OwnerAssignment
+  - summary: Show an artifact of a management group blueprint
+    syntax: >-
+      az blueprint artifact show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint artifact.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_delete
+- az_blueprint_artifact_list
+- az_blueprint_artifact_policy
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+- az_blueprint_artifact_role
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+- az_blueprint_artifact_show
+- az_blueprint_artifact_template
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint artifact.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/policy.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/policy.yml
new file mode 100644
index 0000000000..8fed0d0031
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/policy.yml
@@ -0,0 +1,141 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_policy
+name: az blueprint artifact policy
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact policy** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint policy assignment artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_policy_create
+  name: az blueprint artifact policy create
+  summary: Create blueprint policy artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact policy create --artifact-name
+                                        --blueprint-name
+                                        --policy-definition-id
+                                        [--depends-on]
+                                        [--description]
+                                        [--display-name]
+                                        [--management-group]
+                                        [--parameters]
+                                        [--resource-group-art]
+                                        [--subscription]
+  examples:
+  - summary: Create a policy artifact
+    syntax: >-
+      az blueprint artifact policy create \
+
+      --blueprint-name MyBlueprint --artifact-name MyPolicy --policy-definition-id \
+
+      "/providers/Microsoft.Authorization/policyDefinitions/00000000-0000-0000-0000-000000000000" \
+
+      --parameters path/to/file --display-name "Policy to do sth"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --policy-definition-id
+    summary: The full policy definition id.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_policy_update
+  name: az blueprint artifact policy update
+  summary: Update blueprint policy artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact policy update --artifact-name
+                                        --blueprint-name
+                                        [--depends-on]
+                                        [--description]
+                                        [--display-name]
+                                        [--management-group]
+                                        [--parameters]
+                                        [--resource-group-art]
+                                        [--subscription]
+  examples:
+  - summary: Update a policy artifact
+    syntax: >-
+      az blueprint artifact policy update \
+
+      --blueprint-name MyBlueprint --artifact-name MyPolicy --display-name "My Policy"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for policy assignment artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_policy_create
+- az_blueprint_artifact_policy_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint policy assignment artifact.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/role.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/role.yml
new file mode 100644
index 0000000000..5450ee1af5
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/role.yml
@@ -0,0 +1,138 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_role
+name: az blueprint artifact role
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact role** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint role assignment artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_role_create
+  name: az blueprint artifact role create
+  summary: Create blueprint role artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact role create --artifact-name
+                                      --blueprint-name
+                                      --principal-ids
+                                      --role-definition-id
+                                      [--depends-on]
+                                      [--description]
+                                      [--display-name]
+                                      [--management-group]
+                                      [--resource-group-art]
+                                      [--subscription]
+  examples:
+  - summary: Create a role artifact
+    syntax: >-
+      az blueprint artifact role create \
+
+      --blueprint-name MyBlueprint --artifact-name MyRole --role-definition-id \
+
+      "/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000" \
+
+      --principal-ids "[parameters('[Usergrouporapplicationname]:MyRoleAssignmentName')]"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --principal-ids
+    summary: Array of user or group identities in Azure Active Directory or a reference to the corresponding parameter in blueprint definiton. The roleDefinition will apply to each identity.
+    description: ''
+  - isRequired: true
+    name: --role-definition-id
+    summary: The full role definition id. Only built-in roles are supported.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_role_update
+  name: az blueprint artifact role update
+  summary: Update blueprint role artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact role update --artifact-name
+                                      --blueprint-name
+                                      [--depends-on]
+                                      [--description]
+                                      [--display-name]
+                                      [--management-group]
+                                      [--resource-group-art]
+                                      [--subscription]
+  examples:
+  - summary: Update a role artifact
+    syntax: >-
+      az blueprint artifact role update \
+
+      --blueprint-name MyBlueprint --artifact-name MyRole --display-name "My Big Role"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_artifact_role_create
+- az_blueprint_artifact_role_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint role assignment artifact.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/template.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/template.yml
new file mode 100644
index 0000000000..e28470c67e
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/artifact/template.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_artifact_template
+name: az blueprint artifact template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint artifact template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint ARM template artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_artifact_template_create
+  name: az blueprint artifact template create
+  summary: Create blueprint arm artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact template create --artifact-name
+                                          --blueprint-name
+                                          --template
+                                          [--depends-on]
+                                          [--description]
+                                          [--display-name]
+                                          [--management-group]
+                                          [--parameters]
+                                          [--resource-group-art]
+                                          [--subscription]
+  examples:
+  - summary: Create an arm artifact
+    syntax: >-
+      az blueprint artifact template create \
+
+      --blueprint-name MyBlueprint --artifact-name MyTemplate \
+
+      --parameters path/to/parameter/file --template path/to/template
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --template -t
+    summary: ARM template in JSON string or path to JSON file.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_artifact_template_update
+  name: az blueprint artifact template update
+  summary: Update blueprint arm artifact.
+  description: ''
+  syntax: >-
+    az blueprint artifact template update --artifact-name
+                                          --blueprint-name
+                                          [--depends-on]
+                                          [--description]
+                                          [--display-name]
+                                          [--management-group]
+                                          [--parameters]
+                                          [--resource-group-art]
+                                          [--subscription]
+                                          [--template]
+  examples:
+  - summary: Update a arm artifact
+    syntax: >-
+      az blueprint artifact template update \
+
+      --blueprint-name MyBlueprint --artifact-name MyTemplate --display-name "My Template"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: DisplayName of this artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --parameters -p
+    summary: Parameters for ARM template artifact. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-art
+    summary: Name of the resource group artifact to which the policy will be assigned.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --template -t
+    summary: ARM template in JSON string or path to JSON file.
+    description: ''
+commands:
+- az_blueprint_artifact_template_create
+- az_blueprint_artifact_template_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint ARM template artifact.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/assignment.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/assignment.yml
new file mode 100644
index 0000000000..00354fab87
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/assignment.yml
@@ -0,0 +1,349 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_assignment
+name: az blueprint assignment
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint assignment** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint assignment.
+description: ''
+directCommands:
+- uid: az_blueprint_assignment_create
+  name: az blueprint assignment create
+  summary: Create a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment create --name
+                                   [--blueprint-version]
+                                   [--description]
+                                   [--display-name]
+                                   [--identity-type {None, SystemAssigned, UserAssigned}]
+                                   [--location]
+                                   [--locks-excluded-principals]
+                                   [--locks-mode {AllResourcesDoNotDelete, AllResourcesReadOnly, None}]
+                                   [--management-group]
+                                   [--parameters]
+                                   [--resource-group-value]
+                                   [--subscription]
+                                   [--user-assigned-identity]
+  examples:
+  - summary: Assignment with system-assigned managed identity
+    syntax: >-
+      az blueprint assignment create --subscription MySubscription --name \
+
+      MyBlueprintAssignment --location eastus --identity-type SystemAssigned \
+
+      --description "Enforce pre-defined MyBlueprint to this subscription." \
+
+      --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup/provid \
+
+      ers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
+
+      --resource-group-value artifact_name=rg-art-1 name=rg1 location=westus \
+
+      --resource-group-value artifact_name=rg-art-2 name=rg2 location=eastus \
+
+      --parameters "path/to/parameter/file" \
+  - summary: Assignment with user-assigned managed identity
+    syntax: >-
+      az blueprint assignment create --subscription MySubscription --name \
+
+      MyBlueprintAssignment --location eastus --identity-type UserAssigned \
+
+      --user-assigned-identity "/subscriptions/00000000-0000-0000-0000-000000000000 \
+
+      /resourcegroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myIdentity"\
+
+      --description "Enforce pre-defined MyBlueprint to this subscription." \
+
+      --blueprint-version "/providers/Microsoft.Management/managementGroups/ContosoOnlineGroup \
+
+      /providers/Microsoft.Blueprint/blueprints/MyBlueprint/versions/v2" \
+
+      --resource-group-value artifact_name=rg-art-1 name=rg1 location=eastus \
+
+      --parameters "path/to/parameter/file" \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --blueprint-version
+    summary: Resource ID of the published version of a blueprint definition.
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --identity-type
+    defaultValue: SystemAssigned
+    parameterValueGroup: None, SystemAssigned, UserAssigned
+    summary: Type of the managed identity.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --locks-excluded-principals
+    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
+    description: ''
+  - name: --locks-mode
+    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
+    summary: Lock mode.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --parameters -p
+    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-value
+    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --user-assigned-identity
+    summary: The user-assigned managed identity associated with the resource.
+    description: ''
+- uid: az_blueprint_assignment_delete
+  name: az blueprint assignment delete
+  summary: Delete a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment delete --name
+                                   [--management-group]
+                                   [--subscription]
+                                   [--yes]
+  examples:
+  - summary: Delete an assignment
+    syntax: >-
+      az blueprint assignment delete --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_assignment_list
+  name: az blueprint assignment list
+  summary: List blueprint assignments within a subscription.
+  description: ''
+  syntax: >-
+    az blueprint assignment list [--management-group]
+                                 [--subscription]
+  examples:
+  - summary: List assignments
+    syntax: az blueprint assignment list --subscription MySubscription
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+- uid: az_blueprint_assignment_show
+  name: az blueprint assignment show
+  summary: Get a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment show --name
+                                 [--management-group]
+                                 [--subscription]
+  examples:
+  - summary: Show an assignment
+    syntax: >-
+      az blueprint assignment show --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+- uid: az_blueprint_assignment_update
+  name: az blueprint assignment update
+  summary: Update a blueprint assignment.
+  description: ''
+  syntax: >-
+    az blueprint assignment update --name
+                                   [--blueprint-version]
+                                   [--description]
+                                   [--display-name]
+                                   [--identity-type {None, SystemAssigned, UserAssigned}]
+                                   [--location]
+                                   [--locks-excluded-principals]
+                                   [--locks-mode {AllResourcesDoNotDelete, AllResourcesReadOnly, None}]
+                                   [--management-group]
+                                   [--parameters]
+                                   [--resource-group-value]
+                                   [--subscription]
+                                   [--user-assigned-identity]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --blueprint-version
+    summary: Resource ID of the published version of a blueprint definition.
+    description: ''
+  - name: --description
+    summary: Multi-line explain this resource.
+    description: ''
+  - name: --display-name
+    summary: One-liner string explain this resource.
+    description: ''
+  - name: --identity-type
+    parameterValueGroup: None, SystemAssigned, UserAssigned
+    summary: Type of the managed identity.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --locks-excluded-principals
+    summary: List of AAD principals excluded from blueprint locks. Up to 5 principals are permitted.
+    description: ''
+  - name: --locks-mode
+    parameterValueGroup: AllResourcesDoNotDelete, AllResourcesReadOnly, None
+    summary: Lock mode.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --parameters -p
+    summary: Blueprint assignment parameter values. It can be a JSON string or JSON file path.
+    description: ''
+  - name: --resource-group-value
+    summary: Key=Value pairs for a resource group. Keys include 'artifact_name'(required), 'name', 'location'.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --user-assigned-identity
+    summary: The user-assigned managed identity associated with the resource.
+    description: ''
+- uid: az_blueprint_assignment_wait
+  name: az blueprint assignment wait
+  summary: Place the CLI in a waiting state until a condition of the Blueprint Assignment is met.
+  description: ''
+  syntax: >-
+    az blueprint assignment wait --name
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--management-group]
+                                 [--subscription]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Blueprint Assignment is successfully provisioned.
+    syntax: az blueprint assignment wait --subscription MySubscription \ --name MyBlueprintAssignment --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+- uid: az_blueprint_assignment_who
+  name: az blueprint assignment who
+  summary: Get Blueprint Servie Principal Name objectId.
+  description: ''
+  syntax: >-
+    az blueprint assignment who --name
+                                [--management-group]
+                                [--subscription]
+  examples:
+  - summary: Get SPN objectId
+    syntax: >-
+      az blueprint assignment who --subscription MySubscription \
+
+      --name MyBlueprintAssignment
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the blueprint assignment.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the target scope of the blueprint assignment. It is reserved for future use. Use --subscription instead.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the target scope of the blueprint assignment. Default susbcription will be used if option not specified.
+    description: ''
+commands:
+- az_blueprint_assignment_create
+- az_blueprint_assignment_delete
+- az_blueprint_assignment_list
+- az_blueprint_assignment_show
+- az_blueprint_assignment_update
+- az_blueprint_assignment_wait
+- az_blueprint_assignment_who
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint assignment.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/resource-group.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/resource-group.yml
new file mode 100644
index 0000000000..758bae1ab7
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/resource-group.yml
@@ -0,0 +1,234 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_resource-group
+name: az blueprint resource-group
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint resource-group** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage blueprint resource group artifact.
+description: ''
+directCommands:
+- uid: az_blueprint_resource-group_add
+  name: az blueprint resource-group add
+  summary: Add a resource group artifact to the blueprint.
+  description: ''
+  syntax: >-
+    az blueprint resource-group add --blueprint-name
+                                    [--artifact-name]
+                                    [--depends-on]
+                                    [--description]
+                                    [--display-name]
+                                    [--management-group]
+                                    [--rg-location]
+                                    [--rg-name]
+                                    [--subscription]
+                                    [--tags]
+  examples:
+  - summary: Add a resource group artifact
+    syntax: >-
+      az blueprint resource-group add \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: Display name of this resource group artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --rg-location
+    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
+    description: ''
+  - name: --rg-name
+    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --tags
+    summary: Tags to be assigned to this resource group.
+    description: ''
+- uid: az_blueprint_resource-group_list
+  name: az blueprint resource-group list
+  summary: List blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group list --blueprint-name
+                                     [--management-group]
+                                     [--subscription]
+  examples:
+  - summary: List resource group artifacts
+    syntax: >-
+      az blueprint resource-group list \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_resource-group_remove
+  name: az blueprint resource-group remove
+  summary: Remove a blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group remove --artifact-name
+                                       --blueprint-name
+                                       [--management-group]
+                                       [--subscription]
+                                       [--yes]
+  examples:
+  - summary: Remove a resource group artifact
+    syntax: >-
+      az blueprint resource-group remove \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_resource-group_show
+  name: az blueprint resource-group show
+  summary: Show blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group show --artifact-name
+                                     --blueprint-name
+                                     [--management-group]
+                                     [--subscription]
+  examples:
+  - summary: Show a resource group artifact
+    syntax: >-
+      az blueprint resource-group show \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_resource-group_update
+  name: az blueprint resource-group update
+  summary: Update blueprint resource group artifact.
+  description: ''
+  syntax: >-
+    az blueprint resource-group update --artifact-name
+                                       --blueprint-name
+                                       [--depends-on]
+                                       [--description]
+                                       [--display-name]
+                                       [--management-group]
+                                       [--rg-location]
+                                       [--rg-name]
+                                       [--subscription]
+                                       [--tags]
+  examples:
+  - summary: Update a resource group artifact
+    syntax: >-
+      az blueprint resource-group update \
+
+      --blueprint-name MyBlueprint --artifact-name MyResourceGroupArt --display-name "My Resource Group"
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: A unique name of this resource group artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --depends-on
+    summary: Artifacts which need to be deployed before the specified artifact. Use '--depends-on' with no values to remove dependencies.
+    description: ''
+  - name: --description
+    summary: Description of the blueprint artifact.
+    description: ''
+  - name: --display-name
+    summary: Display name of this resource group artifact.
+    description: ''
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --rg-location
+    summary: Location of this resource group. Leave empty if the resource group location will be specified during the blueprint assignment.
+    description: ''
+  - name: --rg-name
+    summary: Name of this resource group. Leave empty if the resource group name will be specified during the blueprint assignment.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --tags
+    summary: Tags to be assigned to this resource group.
+    description: ''
+commands:
+- az_blueprint_resource-group_add
+- az_blueprint_resource-group_list
+- az_blueprint_resource-group_remove
+- az_blueprint_resource-group_show
+- az_blueprint_resource-group_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage blueprint resource group artifact.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/version.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/version.yml
new file mode 100644
index 0000000000..fd5f45f233
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/version.yml
@@ -0,0 +1,143 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_version
+name: az blueprint version
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint version** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage published blueprint versions.
+description: ''
+directCommands:
+- uid: az_blueprint_version_delete
+  name: az blueprint version delete
+  summary: Delete a published version of a blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version delete --blueprint-name
+                                --version
+                                [--management-group]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete a published subscription blueprint
+    syntax: >-
+      az blueprint version delete --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  - summary: Delete a published management group blueprint
+    syntax: >-
+      az blueprint version delete --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_blueprint_version_list
+  name: az blueprint version list
+  summary: List published versions of given blueprint definition.
+  description: ''
+  syntax: >-
+    az blueprint version list --blueprint-name
+                              [--management-group]
+                              [--subscription]
+  examples:
+  - summary: List published blueprints of a management group
+    syntax: >-
+      az blueprint version list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint
+  - summary: List published blueprints of a subscription
+    syntax: >-
+      az blueprint version list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_version_show
+  name: az blueprint version show
+  summary: Get a published version of a blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version show --blueprint-name
+                              --version
+                              [--management-group]
+                              [--subscription]
+  examples:
+  - summary: Get a published management group blueprint
+    syntax: >-
+      az blueprint version show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: Get a published subscription blueprint
+    syntax: >-
+      az blueprint version show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_version_artifact
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+- az_blueprint_version_delete
+- az_blueprint_version_list
+- az_blueprint_version_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage published blueprint versions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/blueprint/version/artifact.yml b/2019-03-01-hybrid/docs-ref-autogen/blueprint/version/artifact.yml
new file mode 100644
index 0000000000..276ac2e929
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/blueprint/version/artifact.yml
@@ -0,0 +1,111 @@
+### YamlMime:AzureCLIGroup
+uid: az_blueprint_version_artifact
+name: az blueprint version artifact
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **blueprint** extension for Azure CLI and requires version 2.3.0 or higher.  The extension will automatically install the first time you run an **az blueprint version artifact** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage published blueprint artifacts.
+description: ''
+directCommands:
+- uid: az_blueprint_version_artifact_list
+  name: az blueprint version artifact list
+  summary: List artifacts for a version of a published blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version artifact list --blueprint-name
+                                       --version
+                                       [--management-group]
+                                       [--subscription]
+  examples:
+  - summary: List artifacts of a published management group blueprint
+    syntax: >-
+      az blueprint version artifact list --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2
+  - summary: List artifacts of a published subscription blueprint
+    syntax: >-
+      az blueprint version artifact list --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2
+  requiredParameters:
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+- uid: az_blueprint_version_artifact_show
+  name: az blueprint version artifact show
+  summary: Show an artifact for a published blueprint.
+  description: ''
+  syntax: >-
+    az blueprint version artifact show --artifact-name
+                                       --blueprint-name
+                                       --version
+                                       [--management-group]
+                                       [--subscription]
+  examples:
+  - summary: Show a role assignment artifact
+    syntax: >-
+      az blueprint version artifact show --subscription MySubscription \
+
+      --blueprint-name MyBlueprint \
+
+      --version v2 --artifact-name OwnerAssignment
+  - summary: Show a template artifact
+    syntax: >-
+      az blueprint version artifact show --management-group MyManagementGroup --blueprint-name \
+
+      MyBlueprint --version v2 --artifact-name StorageTemplate
+  requiredParameters:
+  - isRequired: true
+    name: --artifact-name
+    summary: Name of the blueprint artifact.
+    description: ''
+  - isRequired: true
+    name: --blueprint-name
+    summary: Name of the blueprint definition.
+    description: ''
+  - isRequired: true
+    name: --version
+    summary: Version of the published blueprint definition.
+    description: ''
+  optionalParameters:
+  - name: --management-group -m
+    summary: Use management group for the scope of the blueprint.
+    description: ''
+  - name: --subscription -s
+    summary: Use subscription for the scope of the blueprint. If --management-group is not specified, --subscription value or the default subscription will be used as the scope.
+    description: ''
+commands:
+- az_blueprint_version_artifact_list
+- az_blueprint_version_artifact_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage published blueprint artifacts.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards.yml b/2019-03-01-hybrid/docs-ref-autogen/boards.yml
index 147a57aa03..5cf68a9755 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards.yml
@@ -1,20 +1,22 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards
-  name: az boards
-  summary: Manage Azure Boards.
-  description: This command group is a part of the azure-devops extension.
-  langs:
-  - azurecli
-  children:
-  - az_boards_query
+### YamlMime:AzureCLIGroup
+uid: az_boards
+name: az boards
+summary: Manage Azure Boards.
+description: This command group is a part of the azure-devops extension.
+directCommands:
 - uid: az_boards_query
   name: az boards query
   summary: Query for a list of work items.
   description: Only supports flat queries.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards query [--detect {false, true}]
+                    [--id]
+                    [--org]
+                    [--path]
+                    [--project]
+                    [--subscription]
+                    [--wiql]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -23,7 +25,7 @@ items:
     summary: The ID of an existing query.  Required unless --path or --wiql are specified.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: The path of an existing query.  Ignored if --id is specified.
@@ -31,130 +33,52 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --wiql
-    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --wiql
+    summary: The query in Work Item Query Language format.  Ignored if --id or --path is specified.
+    description: ''
 commands:
-- uid: az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
-- uid: az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
-- uid: az_boards_query
-  name: az boards query
-  summary: Query for a list of work items.
-- uid: az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-- uid: az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
+- az_boards_area
+- az_boards_area_project
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
+- az_boards_area_team
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
+- az_boards_iteration
+- az_boards_iteration_project
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
+- az_boards_iteration_team
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
+- az_boards_query
+- az_boards_work-item
+- az_boards_work-item_create
+- az_boards_work-item_delete
+- az_boards_work-item_relation
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
+- az_boards_work-item_show
+- az_boards_work-item_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -170,4 +94,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: This command group is a part of the azure-devops extension.
+metadata:
+  description: This command group is a part of the azure-devops extension.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/area.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/area.yml
index 7ca7d14214..1c10d2893a 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/area.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/area.yml
@@ -1,46 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area
-  name: az boards area
-  summary: Manage area paths.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_boards_area
+name: az boards area
+summary: Manage area paths.
+description: ''
 commands:
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
+- az_boards_area_project
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
+- az_boards_area_team
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -56,4 +30,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage area paths.
+metadata:
+  description: Manage area paths.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/area/project.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/area/project.yml
index 3664b29e8f..e014d7f2e9 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/area/project.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/area/project.yml
@@ -1,34 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area_project
-  name: az boards area project
-  summary: Manage areas for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_area_project_create
-  - az_boards_area_project_delete
-  - az_boards_area_project_list
-  - az_boards_area_project_show
-  - az_boards_area_project_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_area_project
+name: az boards area project
+summary: Manage areas for a project.
+description: ''
+directCommands:
 - uid: az_boards_area_project_create
   name: az boards area project create
   summary: Create area.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project create --name
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--path]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the area.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an area. Creates an area at root level if --path is not specified. Example:ProjectNameAreaAreaName.
@@ -43,36 +41,48 @@ items:
   name: az boards area project delete
   summary: Delete area.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project delete --path
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+                                  [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_boards_area_project_list
   name: az boards area project list
   summary: List areas for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project list [--depth]
+                                [--detect {false, true}]
+                                [--org]
+                                [--path]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  optionalParameters:
   - name: --depth
     defaultValue: "1"
     summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
@@ -82,7 +92,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
@@ -90,6 +100,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -97,23 +110,32 @@ items:
   name: az boards area project show
   summary: Show area details for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project show --id
+                                [--detect {false, true}]
+                                [--org]
+                                [--project]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Area ID.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -121,13 +143,20 @@ items:
   name: az boards area project update
   summary: Update area.
   description: Move area or update area name.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area project update --path
+                                  [--child-id]
+                                  [--detect {false, true}]
+                                  [--name]
+                                  [--org]
+                                  [--project]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an area. Example:ProjectNameAreaAreaName.
     description: ''
+  optionalParameters:
   - name: --child-id
     summary: Move an existing area and add as child node for this area.
     description: ''
@@ -139,7 +168,7 @@ items:
     summary: New name of the area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -148,21 +177,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_area_project_create
-  name: az boards area project create
-  summary: Create area.
-- uid: az_boards_area_project_delete
-  name: az boards area project delete
-  summary: Delete area.
-- uid: az_boards_area_project_list
-  name: az boards area project list
-  summary: List areas for a project.
-- uid: az_boards_area_project_show
-  name: az boards area project show
-  summary: Show area details for a project.
-- uid: az_boards_area_project_update
-  name: az boards area project update
-  summary: Update area.
+- az_boards_area_project_create
+- az_boards_area_project_delete
+- az_boards_area_project_list
+- az_boards_area_project_show
+- az_boards_area_project_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -178,4 +197,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a project.
+metadata:
+  description: Manage areas for a project.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/area/team.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/area/team.yml
index 40c1b91d7f..1cbf664774 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/area/team.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/area/team.yml
@@ -1,27 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_area_team
-  name: az boards area team
-  summary: Manage areas for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_area_team_add
-  - az_boards_area_team_list
-  - az_boards_area_team_remove
-  - az_boards_area_team_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_area_team
+name: az boards area team
+summary: Manage areas for a team.
+description: ''
+directCommands:
 - uid: az_boards_area_team_add
   name: az boards area team add
   summary: Add area to a team.
   description: Every team needs to have a default area configured which can't be empty. Hence, you need to pass --set-as-default while adding first area to your team. You can later configure any other area which already added to team as default by using `az boards area team update -h` command.
-  langs:
-  - azurecli
+  syntax: >-
+    az boards area team add --path
+                            --team
+                            [--detect {false, true}]
+                            [--include-sub-areas {false, true}]
+                            [--org]
+                            [--project]
+                            [--set-as-default]
+                            [--subscription]
   examples:
   - summary: Add area to a team.
-    syntax:
-      content: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
-  parameters:
+    syntax: az boards area team add --team 'ContosoTeam' --path '\ContosoProject\MyProjectAreaName'
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -30,6 +29,7 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -39,7 +39,7 @@ items:
     summary: Include child nodes of this area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -54,23 +54,32 @@ items:
   name: az boards area team list
   summary: List areas for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team list --team
+                             [--detect {false, true}]
+                             [--org]
+                             [--project]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -78,9 +87,14 @@ items:
   name: az boards area team remove
   summary: Remove area from a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team remove --path
+                               --team
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -89,12 +103,13 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -106,9 +121,16 @@ items:
   name: az boards area team update
   summary: Update team area.
   description: Update any area to include/exclude sub areas OR Set already added area as default.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards area team update --path
+                               --team
+                               [--detect {false, true}]
+                               [--include-sub-areas {false, true}]
+                               [--org]
+                               [--project]
+                               [--set-as-default]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Area path. Example:ProjectNameAreaName.
@@ -117,6 +139,7 @@ items:
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -126,7 +149,7 @@ items:
     summary: Include child nodes of this area.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -138,18 +161,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_area_team_add
-  name: az boards area team add
-  summary: Add area to a team.
-- uid: az_boards_area_team_list
-  name: az boards area team list
-  summary: List areas for a team.
-- uid: az_boards_area_team_remove
-  name: az boards area team remove
-  summary: Remove area from a team.
-- uid: az_boards_area_team_update
-  name: az boards area team update
-  summary: Update team area.
+- az_boards_area_team_add
+- az_boards_area_team_list
+- az_boards_area_team_remove
+- az_boards_area_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -165,4 +180,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage areas for a team.
+metadata:
+  description: Manage areas for a team.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/iteration.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/iteration.yml
index dea0301992..56a0d13dbf 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/iteration.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/iteration.yml
@@ -1,58 +1,24 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration
-  name: az boards iteration
-  summary: Manage iterations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration
+name: az boards iteration
+summary: Manage iterations.
+description: ''
 commands:
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
+- az_boards_iteration_project
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
+- az_boards_iteration_team
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -68,4 +34,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations.
+metadata:
+  description: Manage iterations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml
index c8de369d09..daf94a9ff1 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/project.yml
@@ -1,28 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration_project
-  name: az boards iteration project
-  summary: Manage iterations for a project.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_iteration_project_create
-  - az_boards_iteration_project_delete
-  - az_boards_iteration_project_list
-  - az_boards_iteration_project_show
-  - az_boards_iteration_project_update
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration_project
+name: az boards iteration project
+summary: Manage iterations for a project.
+description: ''
+directCommands:
 - uid: az_boards_iteration_project_create
   name: az boards iteration project create
   summary: Create iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project create --name
+                                       [--detect {false, true}]
+                                       [--finish-date]
+                                       [--org]
+                                       [--path]
+                                       [--project]
+                                       [--start-date]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the iteration.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -31,7 +31,7 @@ items:
     summary: 'Finish date of the iteration. Example : "2019-06-21".'
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an iteration. Creates an iteration at root level if --path is not specified. Example:ProjectNameIterationIterationName.
@@ -49,36 +49,48 @@ items:
   name: az boards iteration project delete
   summary: Delete iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project delete --path
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--project]
+                                       [--subscription]
+                                       [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_boards_iteration_project_list
   name: az boards iteration project list
   summary: List iterations for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project list [--depth]
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--path]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  optionalParameters:
   - name: --depth
     defaultValue: "1"
     summary: 'Depth of child nodes to be fetched. Example: --depth 3.'
@@ -88,7 +100,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
@@ -96,6 +108,9 @@ items:
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -103,23 +118,32 @@ items:
   name: az boards iteration project show
   summary: Show iteration details for a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project show --id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--project]
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Iteration ID.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -127,13 +151,22 @@ items:
   name: az boards iteration project update
   summary: Update project iteration.
   description: Move iteration or update iteration details like name AND/OR start-date and finish-date.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration project update --path
+                                       [--child-id]
+                                       [--detect {false, true}]
+                                       [--finish-date]
+                                       [--name]
+                                       [--org]
+                                       [--project]
+                                       [--start-date]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Absolute path of an iteration. Example:ProjectNameIterationIterationName.
     description: ''
+  optionalParameters:
   - name: --child-id
     summary: Move an existing iteration and add as child node for this iteration.
     description: ''
@@ -148,7 +181,7 @@ items:
     summary: New name of the iteration.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -160,21 +193,11 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_iteration_project_create
-  name: az boards iteration project create
-  summary: Create iteration.
-- uid: az_boards_iteration_project_delete
-  name: az boards iteration project delete
-  summary: Delete iteration.
-- uid: az_boards_iteration_project_list
-  name: az boards iteration project list
-  summary: List iterations for a project.
-- uid: az_boards_iteration_project_show
-  name: az boards iteration project show
-  summary: Show iteration details for a project.
-- uid: az_boards_iteration_project_update
-  name: az boards iteration project update
-  summary: Update project iteration.
+- az_boards_iteration_project_create
+- az_boards_iteration_project_delete
+- az_boards_iteration_project_list
+- az_boards_iteration_project_show
+- az_boards_iteration_project_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -190,4 +213,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a project.
+metadata:
+  description: Manage iterations for a project.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml
index 77a911bc04..f9feb16624 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/iteration/team.yml
@@ -1,27 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_iteration_team
-  name: az boards iteration team
-  summary: Manage iterations for a team.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_iteration_team_add
-  - az_boards_iteration_team_list
-  - az_boards_iteration_team_list_work_items
-  - az_boards_iteration_team_remove
-  - az_boards_iteration_team_set_backlog_iteration
-  - az_boards_iteration_team_set_default_iteration
-  - az_boards_iteration_team_show_backlog_iteration
-  - az_boards_iteration_team_show_default_iteration
+### YamlMime:AzureCLIGroup
+uid: az_boards_iteration_team
+name: az boards iteration team
+summary: Manage iterations for a team.
+description: ''
+directCommands:
 - uid: az_boards_iteration_team_add
   name: az boards iteration team add
   summary: Add iteration to a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team add --id
+                                 --team
+                                 [--detect {false, true}]
+                                 [--org]
+                                 [--project]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -30,12 +24,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,36 +42,51 @@ items:
   name: az boards iteration team list
   summary: List iterations for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team list --team
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--query-examples]
+                                  [--subscription]
+                                  [--timeframe]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --timeframe
-    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_list_work_items
+  - name: --timeframe
+    summary: A filter for which iterations are returned based on relative time. Only Current is supported currently.
+    description: ''
+- uid: az_boards_iteration_team_list-work-items
   name: az boards iteration team list-work-items
   summary: List work-items for an iteration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team list-work-items --id
+                                             --team
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -85,12 +95,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -102,9 +113,14 @@ items:
   name: az boards iteration team remove
   summary: Remove iteration from a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team remove --id
+                                    --team
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration.
@@ -113,12 +129,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -126,13 +143,18 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_set_backlog_iteration
+- uid: az_boards_iteration_team_set-backlog-iteration
   name: az boards iteration team set-backlog-iteration
   summary: Set backlog iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team set-backlog-iteration --id
+                                                   --team
+                                                   [--detect {false, true}]
+                                                   [--org]
+                                                   [--project]
+                                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier of the iteration which needs to be set as backlog iteration.
@@ -141,12 +163,13 @@ items:
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -154,17 +177,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_set_default_iteration
+- uid: az_boards_iteration_team_set-default-iteration
   name: az boards iteration team set-default-iteration
   summary: Set default iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team set-default-iteration --team
+                                                   [--default-iteration-macro]
+                                                   [--detect {false, true}]
+                                                   [--id]
+                                                   [--org]
+                                                   [--project]
+                                                   [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --default-iteration-macro
     summary: 'Default iteration macro. Example: @CurrentIteration.'
     description: ''
@@ -176,7 +206,7 @@ items:
     summary: Identifier of the iteration which needs to be set as default.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -184,23 +214,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_show_backlog_iteration
+- uid: az_boards_iteration_team_show-backlog-iteration
   name: az boards iteration team show-backlog-iteration
   summary: Show backlog iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team show-backlog-iteration --team
+                                                    [--detect {false, true}]
+                                                    [--org]
+                                                    [--project]
+                                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -208,23 +243,28 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_iteration_team_show_default_iteration
+- uid: az_boards_iteration_team_show-default-iteration
   name: az boards iteration team show-default-iteration
   summary: Show default iteration for a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards iteration team show-default-iteration --team
+                                                    [--detect {false, true}]
+                                                    [--org]
+                                                    [--project]
+                                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: Name or ID of the team.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -233,30 +273,14 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_iteration_team_add
-  name: az boards iteration team add
-  summary: Add iteration to a team.
-- uid: az_boards_iteration_team_list
-  name: az boards iteration team list
-  summary: List iterations for a team.
-- uid: az_boards_iteration_team_list_work_items
-  name: az boards iteration team list-work-items
-  summary: List work-items for an iteration.
-- uid: az_boards_iteration_team_remove
-  name: az boards iteration team remove
-  summary: Remove iteration from a team.
-- uid: az_boards_iteration_team_set_backlog_iteration
-  name: az boards iteration team set-backlog-iteration
-  summary: Set backlog iteration for a team.
-- uid: az_boards_iteration_team_set_default_iteration
-  name: az boards iteration team set-default-iteration
-  summary: Set default iteration for a team.
-- uid: az_boards_iteration_team_show_backlog_iteration
-  name: az boards iteration team show-backlog-iteration
-  summary: Show backlog iteration for a team.
-- uid: az_boards_iteration_team_show_default_iteration
-  name: az boards iteration team show-default-iteration
-  summary: Show default iteration for a team.
+- az_boards_iteration_team_add
+- az_boards_iteration_team_list
+- az_boards_iteration_team_list-work-items
+- az_boards_iteration_team_remove
+- az_boards_iteration_team_set-backlog-iteration
+- az_boards_iteration_team_set-default-iteration
+- az_boards_iteration_team_show-backlog-iteration
+- az_boards_iteration_team_show-default-iteration
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -272,4 +296,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage iterations for a team.
+metadata:
+  description: Manage iterations for a team.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/work-item.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/work-item.yml
index 948056d580..14c24db075 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/work-item.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/work-item.yml
@@ -1,23 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_work_item
-  name: az boards work-item
-  summary: Manage work items.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_work_item_create
-  - az_boards_work_item_delete
-  - az_boards_work_item_show
-  - az_boards_work_item_update
-- uid: az_boards_work_item_create
+### YamlMime:AzureCLIGroup
+uid: az_boards_work-item
+name: az boards work-item
+summary: Manage work items.
+description: ''
+directCommands:
+- uid: az_boards_work-item_create
   name: az boards work-item create
   summary: Create a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item create --title
+                               --type
+                               [--area]
+                               [--assigned-to]
+                               [--description]
+                               [--detect {false, true}]
+                               [--discussion]
+                               [--fields]
+                               [--iteration]
+                               [--open]
+                               [--org]
+                               [--project]
+                               [--reason]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --title
     summary: Title of the work item.
@@ -26,6 +32,7 @@ items:
     name: --type
     summary: Name of the work item type (e.g. Bug).
     description: ''
+  optionalParameters:
   - name: --area
     summary: Area the work item is assigned to (e.g. Demos).
     description: ''
@@ -43,7 +50,7 @@ items:
     summary: Comment to add to a discussion in a work item.
     description: ''
   - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
+    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
     description: ''
   - name: --iteration
     summary: Iteration path of the work item (e.g. DemosIteration 1).
@@ -52,7 +59,7 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -63,17 +70,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_delete
+- uid: az_boards_work-item_delete
   name: az boards work-item delete
   summary: Delete a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item delete --id
+                               [--destroy]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Unique id of the work item.
     description: ''
+  optionalParameters:
   - name: --destroy
     summary: Permanently delete this work item.
     description: ''
@@ -82,28 +96,37 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_show
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_boards_work-item_show
   name: az boards work-item show
   summary: Show details for a work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item show --id
+                             [--as-of]
+                             [--detect {false, true}]
+                             [--expand {all, fields, links, none, relations}]
+                             [--fields]
+                             [--open]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
     description: ''
+  optionalParameters:
   - name: --as-of
     summary: "Work item details as of a particular date and time. Provide a date or date time string. Assumes local time zone. Example: '2019-01-20', '2019-01-20 00:20:00'. For UTC, append 'UTC' to the date time string, '2019-01-20 00:20:00 UTC'."
     description: ''
@@ -123,22 +146,39 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_update
+- uid: az_boards_work-item_update
   name: az boards work-item update
   summary: Update work items.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item update --id
+                               [--area]
+                               [--assigned-to]
+                               [--description]
+                               [--detect {false, true}]
+                               [--discussion]
+                               [--fields]
+                               [--iteration]
+                               [--open]
+                               [--org]
+                               [--reason]
+                               [--state]
+                               [--subscription]
+                               [--title]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the work item to update.
     description: ''
+  optionalParameters:
   - name: --area
     summary: Area the work item is assigned to (e.g. Demos).
     description: ''
@@ -156,7 +196,7 @@ items:
     summary: Comment to add to a discussion in a work item.
     description: ''
   - name: --fields -f
-    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer <a href="https://aka.ms/azure-devops-cli-field-api">https://aka.ms/azure-devops-cli-field-api</a> for more details on fields.
+    summary: Space separated "field=value" pairs for custom fields you would like to set. Refer https://aka.ms/azure-devops-cli-field-api for more details on fields.
     description: ''
   - name: --iteration
     summary: Iteration path of the work item (e.g. DemosIteration 1).
@@ -165,7 +205,7 @@ items:
     summary: Open the work item in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --reason
     summary: Reason for the state of the work item.
@@ -173,40 +213,22 @@ items:
   - name: --state
     summary: State of the work item (e.g. active).
     description: ''
-  - name: --title
-    summary: Title of the work item.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --title
+    summary: Title of the work item.
+    description: ''
 commands:
-- uid: az_boards_work_item_create
-  name: az boards work-item create
-  summary: Create a work item.
-- uid: az_boards_work_item_delete
-  name: az boards work-item delete
-  summary: Delete a work item.
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
-- uid: az_boards_work_item_show
-  name: az boards work-item show
-  summary: Show details for a work item.
-- uid: az_boards_work_item_update
-  name: az boards work-item update
-  summary: Update work items.
+- az_boards_work-item_create
+- az_boards_work-item_delete
+- az_boards_work-item_relation
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
+- az_boards_work-item_show
+- az_boards_work-item_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -222,4 +244,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work items.
+metadata:
+  description: Manage work items.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml b/2019-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml
index dfea92aa34..3e6e9879a8 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/boards/work-item/relation.yml
@@ -1,23 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_boards_work_item_relation
-  name: az boards work-item relation
-  summary: Manage work item relations.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_boards_work_item_relation_add
-  - az_boards_work_item_relation_list_type
-  - az_boards_work_item_relation_remove
-  - az_boards_work_item_relation_show
-- uid: az_boards_work_item_relation_add
+### YamlMime:AzureCLIGroup
+uid: az_boards_work-item_relation
+name: az boards work-item relation
+summary: Manage work item relations.
+description: ''
+directCommands:
+- uid: az_boards_work-item_relation_add
   name: az boards work-item relation add
   summary: Add relation(s) to work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation add --id
+                                     --relation-type
+                                     --target-id
+                                     [--detect {false, true}]
+                                     [--org]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
@@ -30,40 +28,49 @@ items:
     name: --target-id
     summary: 'ID(s) of work-items to create relation with.                          Multiple values can be passed comma separated. Example: 1,2.'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_list_type
+- uid: az_boards_work-item_relation_list-type
   name: az boards work-item relation list-type
   summary: List work item relations supported in the organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation list-type [--detect {false, true}]
+                                           [--org]
+                                           [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_remove
+- uid: az_boards_work-item_relation_remove
   name: az boards work-item relation remove
   summary: Remove relation(s) from work item.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation remove --id
+                                        --relation-type
+                                        --target-id
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--subscription]
+                                        [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
@@ -76,53 +83,54 @@ items:
     name: --target-id
     summary: 'ID(s) of work-items to remove relation from.                          Multiple values can be passed comma separated. Example: 1,2.'
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_boards_work_item_relation_show
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_boards_work-item_relation_show
   name: az boards work-item relation show
   summary: Get work item, fill relations with friendly name.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az boards work-item relation show --id
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--query-examples]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The ID of the work item.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_boards_work_item_relation_add
-  name: az boards work-item relation add
-  summary: Add relation(s) to work item.
-- uid: az_boards_work_item_relation_list_type
-  name: az boards work-item relation list-type
-  summary: List work item relations supported in the organization.
-- uid: az_boards_work_item_relation_remove
-  name: az boards work-item relation remove
-  summary: Remove relation(s) from work item.
-- uid: az_boards_work_item_relation_show
-  name: az boards work-item relation show
-  summary: Get work item, fill relations with friendly name.
+- az_boards_work-item_relation_add
+- az_boards_work-item_relation_list-type
+- az_boards_work-item_relation_remove
+- az_boards_work-item_relation_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -138,4 +146,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage work item relations.
+metadata:
+  description: Manage work item relations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cache.yml b/2019-03-01-hybrid/docs-ref-autogen/cache.yml
index 948b187998..2599a6b9b2 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/cache.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/cache.yml
@@ -1,35 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_cache
-  name: az cache
-  summary: Commands to manage CLI objects cached using the `--defer` argument.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_cache_delete
-  - az_cache_list
-  - az_cache_purge
-  - az_cache_show
+### YamlMime:AzureCLIGroup
+uid: az_cache
+name: az cache
+summary: Commands to manage CLI objects cached using the `--defer` argument.
+description: ''
+directCommands:
 - uid: az_cache_delete
   name: az cache delete
   summary: Delete an object from the cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache delete --name
+                    --resource-group
+                    --resource-type
+                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-type -t
     summary: The resource type.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -37,9 +34,13 @@ items:
   name: az cache list
   summary: List the contents of the object cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache list [--query-examples]
+                  [--subscription]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -47,9 +48,8 @@ items:
   name: az cache purge
   summary: Clear the entire CLI object cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az cache purge [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -57,37 +57,37 @@ items:
   name: az cache show
   summary: Show the contents of a specific object in the cache.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cache show --name
+                  --resource-group
+                  --resource-type
+                  [--query-examples]
+                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - isRequired: true
     name: --resource-type -t
     summary: The resource type.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_cache_delete
-  name: az cache delete
-  summary: Delete an object from the cache.
-- uid: az_cache_list
-  name: az cache list
-  summary: List the contents of the object cache.
-- uid: az_cache_purge
-  name: az cache purge
-  summary: Clear the entire CLI object cache.
-- uid: az_cache_show
-  name: az cache show
-  summary: Show the contents of a specific object in the cache.
+- az_cache_delete
+- az_cache_list
+- az_cache_purge
+- az_cache_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -103,4 +103,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Commands to manage CLI objects cached using the `--defer` argument.
+metadata:
+  description: Commands to manage CLI objects cached using the `--defer` argument.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cli-translator.yml b/2019-03-01-hybrid/docs-ref-autogen/cli-translator.yml
new file mode 100644
index 0000000000..a0ae214250
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cli-translator.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_cli-translator
+name: az cli-translator
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cli-translator** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az cli-translator** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Translate ARM template or REST API to CLI scripts.
+description: ''
+commands:
+- az_cli-translator_arm
+- az_cli-translator_arm_translate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Translate ARM template or REST API to CLI scripts.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cli-translator/arm.yml b/2019-03-01-hybrid/docs-ref-autogen/cli-translator/arm.yml
new file mode 100644
index 0000000000..5a3c85efc8
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cli-translator/arm.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_cli-translator_arm
+name: az cli-translator arm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cli-translator** extension for Azure CLI and requires version 2.13.0 or higher.  The extension will automatically install the first time you run an **az cli-translator arm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
+description: ''
+directCommands:
+- uid: az_cli-translator_arm_translate
+  name: az cli-translator arm translate
+  summary: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
+  description: ''
+  syntax: >-
+    az cli-translator arm translate --parameters
+                                    --resource-group
+                                    --template
+                                    [--target-subscription]
+  examples:
+  - summary: Translate ARM template.json and parameters.json to CLI scripts
+    syntax: az cli-translator arm translate --target-subscription 00000000-0000-0000-0000-000000000000 --resource-group groupName --template /path/to/local/template --parameters /path/to/local/parameters
+  requiredParameters:
+  - isRequired: true
+    name: --parameters
+    summary: The local path or url of parameters.json file.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: The local path or url of template.json file.
+    description: ''
+  optionalParameters:
+  - name: --target-subscription
+    summary: The target subscription id. If omit, the current subscription id will be used.
+    description: ''
+commands:
+- az_cli-translator_arm_translate
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Translate ARM template to CLI scripts(Currently only support Compute, Network and Storage).
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cloud-service.yml b/2019-03-01-hybrid/docs-ref-autogen/cloud-service.yml
new file mode 100644
index 0000000000..5bc3ea321f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cloud-service.yml
@@ -0,0 +1,422 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service
+name: az cloud-service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service (extended support).
+description: ''
+directCommands:
+- uid: az_cloud-service_create
+  name: az cloud-service create
+  summary: Create a cloud service (extended support). Please note some properties can be set only during cloud service creation.
+  description: ''
+  syntax: >-
+    az cloud-service create --cloud-service-name
+                            --resource-group
+                            [--configuration]
+                            [--configuration-url]
+                            [--extensions]
+                            [--id]
+                            [--lb]
+                            [--location]
+                            [--no-wait]
+                            [--package-url]
+                            [--roles]
+                            [--secrets]
+                            [--start-cloud-service {false, true}]
+                            [--tags]
+                            [--upgrade-mode {Auto, Manual, Simultaneous}]
+  examples:
+  - summary: Create a cloud service with 2 roles, 2 load balancers (one has a public IP and another has a private IP), secrets and extensions.
+    syntax: 'az cloud-service create -g ResourceGroup -n CloudService --roles ContosoFrontend:Standard_D1_v2:1:Standard ContosoBackend:Standard_D1_v2:1:Standard --package-url PackageURL --configuration Config --load-balancer-configurations MyLoadBalancer:MyFe:PublicIP:: MyLoadBalancer2:MyFe2::SubnetIDd:PrivateIPID --secrets Vault0:Cert0:Cert1 Vault1:Cert2:Cert3:Cert4 --extensions "@extensions.json"'
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --configuration
+    summary: 'Specify the XML service configuration (.cscfg) for the cloud service. Expected value: xml-string/@xml-file.'
+    description: ''
+  - name: --configuration-url
+    summary: Specify a URL that refers to the location of the service configuration in the Blob service. The service package URL  can be Shared Access Signature (SAS) URI from any storage account. This is a write-only property and is not returned in GET calls.
+    description: ''
+  - name: --extensions
+    summary: 'List of extensions for the cloud service. Expected value: json-string/@json-file. Example: [{"properties": {"type": "RDP", "autoUpgradeMinorVersion": false, "protectedSettings": "settings","publisher": "Microsoft.Windows.Azure.Extensions", "settings": "settings", "typeHandlerVersion": "1.2.1"}, "name": "RDPExtension"}].'
+    description: ''
+  - name: --id
+    summary: Resource Id.
+    description: ''
+  - name: --lb --load-balancer-configurations
+    summary: 'The list of load balancer configurations separated by space for the cloud service. The public IP is a mandatory field. Format: LBName:FrontendIPConfiguration:PublicIPAddress:Subnet:PrivateIP.'
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --package-url
+    summary: Specify a URL that refers to the location of the service package in the Blob service. The service package URL can be Shared Access Signature (SAS) URI from any storage account. This is a write-only property and is not returned in GET calls.
+    description: ''
+  - name: --roles
+    summary: 'List of roles separated by space for the cloud service. Format: RoleName:SkuName:SkuCapacity:SkuTier.'
+    description: ''
+  - name: --secrets
+    summary: 'Specify certificates separated by space that should be installed onto the role instances. Format: KeyVaultName:CertificateUrl:CertificateUrl2:...:CertificateUrlN.'
+    description: ''
+  - name: --start-cloud-service
+    parameterValueGroup: false, true
+    summary: Indicate whether to start the cloud service immediately after it is created. The default value is `true`. If false, the service model is still deployed, but the code is not run immediately. Instead, the service is PoweredOff until you call Start, at which time the service will be started. A deployed service still incurs charges, even if it is poweredoff.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --upgrade-mode
+    parameterValueGroup: Auto, Manual, Simultaneous
+    summary: Update mode for the cloud service. Role instances are allocated to update domains when the service is deployed. Updates can be initiated manually in each update domain or initiated automatically in all update domains. Possible Values are Auto, Manual, Simultaneous. If not specified, the default value is Auto. If set to Manual, PUT UpdateDomain must be called to apply the update. If set to Auto, the update is automatically applied to each update domain in sequence.
+    description: ''
+- uid: az_cloud-service_delete
+  name: az cloud-service delete
+  summary: Delete a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service delete --cloud-service-name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_delete-instance
+  name: az cloud-service delete-instance
+  summary: Delete role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service delete-instance --cloud-service-name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--role-instances]
+                                     [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_list
+  name: az cloud-service list
+  summary: Get a list of all cloud services under a resource group.
+  description: ''
+  syntax: az cloud-service list --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_list-all
+  name: az cloud-service list-all
+  summary: Get a list of all cloud services in the subscription, regardless of the associated resource group.
+  description: ''
+  syntax: az cloud-service list-all
+- uid: az_cloud-service_power-off
+  name: az cloud-service power-off
+  summary: Power off the cloud service. Note that resources are still attached and you are getting charged for the resources.
+  description: ''
+  syntax: >-
+    az cloud-service power-off --cloud-service-name
+                               --resource-group
+                               [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_rebuild
+  name: az cloud-service rebuild
+  summary: Rebuild Role Instances. Reinstall the operating system on instances of web roles or worker roles and initialize the storage resources that are used by them. If you do not want to initialize storage resources, you can use Reimage Role Instances.
+  description: ''
+  syntax: >-
+    az cloud-service rebuild --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_reimage
+  name: az cloud-service reimage
+  summary: Reimage asynchronous operation reinstalls the operating system on instances of web roles or worker roles.
+  description: ''
+  syntax: >-
+    az cloud-service reimage --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_restart
+  name: az cloud-service restart
+  summary: Restart one or more role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service restart --cloud-service-name
+                             --resource-group
+                             [--no-wait]
+                             [--role-instances]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --role-instances
+    summary: List of cloud service role instance names. Value of '\*' will signify all role instances of the cloud service.
+    description: ''
+- uid: az_cloud-service_show
+  name: az cloud-service show
+  summary: Display information about a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service show --cloud-service-name
+                          --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_show-instance-view
+  name: az cloud-service show-instance-view
+  summary: Get the status of a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service show-instance-view --cloud-service-name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_start
+  name: az cloud-service start
+  summary: Start the cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service start --cloud-service-name
+                           --resource-group
+                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_update
+  name: az cloud-service update
+  summary: Update a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update --cloud-service-name
+                            --resource-group
+                            [--no-wait]
+                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_cloud-service_wait
+  name: az cloud-service wait
+  summary: Place the CLI in a waiting state until a condition of the cloud-service is met.
+  description: ''
+  syntax: >-
+    az cloud-service wait --cloud-service-name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name --name -n
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_cloud-service_create
+- az_cloud-service_delete
+- az_cloud-service_delete-instance
+- az_cloud-service_list
+- az_cloud-service_list-all
+- az_cloud-service_power-off
+- az_cloud-service_rebuild
+- az_cloud-service_reimage
+- az_cloud-service_restart
+- az_cloud-service_role
+- az_cloud-service_role_list
+- az_cloud-service_role_show
+- az_cloud-service_role-instance
+- az_cloud-service_role-instance_delete
+- az_cloud-service_role-instance_list
+- az_cloud-service_role-instance_rebuild
+- az_cloud-service_role-instance_reimage
+- az_cloud-service_role-instance_restart
+- az_cloud-service_role-instance_show
+- az_cloud-service_role-instance_show-instance-view
+- az_cloud-service_role-instance_show-remote-desktop-file
+- az_cloud-service_show
+- az_cloud-service_show-instance-view
+- az_cloud-service_start
+- az_cloud-service_update
+- az_cloud-service_update-domain
+- az_cloud-service_update-domain_list-update-domain
+- az_cloud-service_update-domain_show-update-domain
+- az_cloud-service_update-domain_walk-update-domain
+- az_cloud-service_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service (extended support).
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cloud-service/role-instance.yml b/2019-03-01-hybrid/docs-ref-autogen/cloud-service/role-instance.yml
new file mode 100644
index 0000000000..3fe7177b79
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cloud-service/role-instance.yml
@@ -0,0 +1,223 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_role-instance
+name: az cloud-service role-instance
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service role-instance** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service role instance with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_role-instance_delete
+  name: az cloud-service role-instance delete
+  summary: Delete a role instance from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance delete --cloud-service-name
+                                          --resource-group
+                                          --role-instance-name
+                                          [--no-wait]
+                                          [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_cloud-service_role-instance_list
+  name: az cloud-service role-instance list
+  summary: Get the list of all role instances in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance list --cloud-service-name
+                                        --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_role-instance_rebuild
+  name: az cloud-service role-instance rebuild
+  summary: The Rebuild Role Instance asynchronous operation reinstalls the operating system on instances of web roles or worker roles and initializes the storage resources that are used by them. If you do not want to initialize storage resources, you can use Reimage Role Instance.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance rebuild --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_reimage
+  name: az cloud-service role-instance reimage
+  summary: The Reimage Role Instance asynchronous operation reinstalls the operating system on instances of web roles or worker roles.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance reimage --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_restart
+  name: az cloud-service role-instance restart
+  summary: The Reboot Role Instance asynchronous operation requests a reboot of a role instance in the cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance restart --cloud-service-name
+                                           --resource-group
+                                           --role-instance-name
+                                           [--no-wait]
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_cloud-service_role-instance_show
+  name: az cloud-service role-instance show
+  summary: Get a role instance from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show --cloud-service-name
+                                        --resource-group
+                                        --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+- uid: az_cloud-service_role-instance_show-instance-view
+  name: az cloud-service role-instance show-instance-view
+  summary: Retrieve information about the run-time state of a role instance in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show-instance-view --cloud-service-name
+                                                      --resource-group
+                                                      --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+- uid: az_cloud-service_role-instance_show-remote-desktop-file
+  name: az cloud-service role-instance show-remote-desktop-file
+  summary: Get a remote desktop file for a role instance in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role-instance show-remote-desktop-file --cloud-service-name
+                                                            --resource-group
+                                                            --role-instance-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-instance-name
+    summary: Name of the role instance.
+    description: ''
+commands:
+- az_cloud-service_role-instance_delete
+- az_cloud-service_role-instance_list
+- az_cloud-service_role-instance_rebuild
+- az_cloud-service_role-instance_reimage
+- az_cloud-service_role-instance_restart
+- az_cloud-service_role-instance_show
+- az_cloud-service_role-instance_show-instance-view
+- az_cloud-service_role-instance_show-remote-desktop-file
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service role instance with cloud service.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cloud-service/role.yml b/2019-03-01-hybrid/docs-ref-autogen/cloud-service/role.yml
new file mode 100644
index 0000000000..389cec1fa5
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cloud-service/role.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_role
+name: az cloud-service role
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service role** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service role with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_role_list
+  name: az cloud-service role list
+  summary: Get a list of all roles in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role list --cloud-service-name
+                               --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_role_show
+  name: az cloud-service role show
+  summary: Get a role from a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service role show --cloud-service-name
+                               --resource-group
+                               --role-name
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Cloud service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --role-name
+    summary: Name of the role.
+    description: ''
+commands:
+- az_cloud-service_role_list
+- az_cloud-service_role_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service role with cloud service.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cloud-service/update-domain.yml b/2019-03-01-hybrid/docs-ref-autogen/cloud-service/update-domain.yml
new file mode 100644
index 0000000000..401a31b63a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cloud-service/update-domain.yml
@@ -0,0 +1,89 @@
+### YamlMime:AzureCLIGroup
+uid: az_cloud-service_update-domain
+name: az cloud-service update-domain
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cloud-service** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az cloud-service update-domain** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cloud service update domain with cloud service.
+description: ''
+directCommands:
+- uid: az_cloud-service_update-domain_list-update-domain
+  name: az cloud-service update-domain list-update-domain
+  summary: Get a list of all update domains in a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain list-update-domain --cloud-service-name
+                                                      --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cloud-service_update-domain_show-update-domain
+  name: az cloud-service update-domain show-update-domain
+  summary: Get the specified update domain of a cloud service.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain show-update-domain --cloud-service-name
+                                                      --resource-group
+                                                      --update-domain
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --update-domain
+    summary: 'Specifies an integer value that identifies the update domain. Update domains are identified with a zero-based index: the first update domain has an ID of 0, the second has an ID of 1, and so on.'
+    description: ''
+- uid: az_cloud-service_update-domain_walk-update-domain
+  name: az cloud-service update-domain walk-update-domain
+  summary: Update the role instances in the specified update domain.
+  description: ''
+  syntax: >-
+    az cloud-service update-domain walk-update-domain --cloud-service-name
+                                                      --resource-group
+                                                      --update-domain
+  requiredParameters:
+  - isRequired: true
+    name: --cloud-service-name
+    summary: Name of the cloud service.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --update-domain
+    summary: 'Specifies an integer value that identifies the update domain. Update domains are identified with a zero-based index: the first update domain has an ID of 0, the second has an ID of 1, and so on.'
+    description: ''
+commands:
+- az_cloud-service_update-domain_list-update-domain
+- az_cloud-service_update-domain_show-update-domain
+- az_cloud-service_update-domain_walk-update-domain
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cloud service update domain with cloud service.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cloud.yml b/2019-03-01-hybrid/docs-ref-autogen/cloud.yml
index 012b6e81dc..8cc5841bd3 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/cloud.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/cloud.yml
@@ -1,39 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_cloud
-  name: az cloud
-  summary: Manage registered Azure clouds.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_cloud_list
-  - az_cloud_list_profiles
-  - az_cloud_register
-  - az_cloud_set
-  - az_cloud_show
-  - az_cloud_unregister
-  - az_cloud_update
+### YamlMime:AzureCLIGroup
+uid: az_cloud
+name: az cloud
+summary: Manage registered Azure clouds.
+description: ''
+directCommands:
 - uid: az_cloud_list
   name: az cloud list
   summary: List registered clouds.
   description: ''
-  langs:
-  - azurecli
-  parameters: []
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
-- uid: az_cloud_list_profiles
+  syntax: az cloud list [--query-examples]
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
+- uid: az_cloud_list-profiles
   name: az cloud list-profiles
   summary: List the supported profiles for a cloud.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud list-profiles [--name]
+                           [--show-all]
+  optionalParameters:
   - name: --name -n
     defaultValue: AzureCloud
     summary: Name of a registered cloud.
@@ -41,23 +29,58 @@ items:
   - name: --show-all
     summary: Show all available profiles supported in the CLI.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_register
   name: az cloud register
   summary: Register a cloud.
   description: When registering a cloud, specify only the resource manager endpoint for the autodetection of other endpoints.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud register --name
+                      [--cloud-config]
+                      [--endpoint-active-directory]
+                      [--endpoint-active-directory-data-lake-resource-id]
+                      [--endpoint-active-directory-graph-resource-id]
+                      [--endpoint-active-directory-resource-id]
+                      [--endpoint-gallery]
+                      [--endpoint-management]
+                      [--endpoint-resource-manager]
+                      [--endpoint-sql-management]
+                      [--endpoint-vm-image-alias-doc]
+                      [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
+                      [--suffix-acr-login-server-endpoint]
+                      [--suffix-azure-datalake-analytics-catalog-and-job-endpoint]
+                      [--suffix-azure-datalake-store-file-system-endpoint]
+                      [--suffix-keyvault-dns]
+                      [--suffix-sql-server-hostname]
+                      [--suffix-storage-endpoint]
+  examples:
+  - summary: Register a cloud with a config file
+    syntax: >-
+      az cloud register -n MyCloud --cloud-config @"cloud.json"
+
+      ("cloud.json" supports all the endpoint and suffix options in camel case or the JSON output format from az cloud show. See the example content below.)
+
+      {
+        "endpointActiveDirectory": "https://login.microsoftonline.us",
+        "suffixAcrLoginServerEndpoint": ".azurecr.us"
+      }
+
+      or
+
+      {
+        "endpoints":{
+          "activeDirectory": "https://login.microsoftonline.us"
+        },
+        "suffixes":{
+          "acrLoginServerEndpoint": ".azurecr.us"
+        }
+      }
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
+  optionalParameters:
   - name: --cloud-config
     summary: JSON encoded cloud configuration. Use @{file} to load from a file.
     description: ''
@@ -89,7 +112,7 @@ items:
     summary: The uri of the document which caches commonly used virtual machine images.
     description: ''
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
   - name: --suffix-acr-login-server-endpoint
@@ -110,86 +133,85 @@ items:
   - name: --suffix-storage-endpoint
     summary: The endpoint suffix for storage accounts.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_set
   name: az cloud set
   summary: Set the active cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az cloud set --name
+                 [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
   examples:
   - summary: Set the active cloud. (autogenerated)
-    syntax:
-      content: az cloud set --name MyRegisteredCloud
-  parameters:
+    syntax: az cloud set --name MyRegisteredCloud
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
+  optionalParameters:
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_show
   name: az cloud show
   summary: Get the details of a registered cloud.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az cloud show [--name]
+                  [--query-examples]
+  optionalParameters:
   - name: --name -n
     defaultValue: AzureCloud
     summary: Name of a registered cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_unregister
   name: az cloud unregister
   summary: Unregister a cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: az cloud unregister --name
   examples:
   - summary: Unregister a cloud. (autogenerated)
-    syntax:
-      content: az cloud unregister --name MyRegisteredCloud
-  parameters:
+    syntax: az cloud unregister --name MyRegisteredCloud
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: Name of a registered cloud.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 - uid: az_cloud_update
   name: az cloud update
   summary: Update the configuration of a cloud.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az cloud update [--cloud-config]
+                    [--endpoint-active-directory]
+                    [--endpoint-active-directory-data-lake-resource-id]
+                    [--endpoint-active-directory-graph-resource-id]
+                    [--endpoint-active-directory-resource-id]
+                    [--endpoint-gallery]
+                    [--endpoint-management]
+                    [--endpoint-resource-manager]
+                    [--endpoint-sql-management]
+                    [--endpoint-vm-image-alias-doc]
+                    [--name]
+                    [--profile {2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest}]
+                    [--suffix-acr-login-server-endpoint]
+                    [--suffix-azure-datalake-analytics-catalog-and-job-endpoint]
+                    [--suffix-azure-datalake-store-file-system-endpoint]
+                    [--suffix-keyvault-dns]
+                    [--suffix-sql-server-hostname]
+                    [--suffix-storage-endpoint]
   examples:
   - summary: Update the configuration of a cloud. (autogenerated)
-    syntax:
-      content: az cloud update --profile latest
-  parameters:
+    syntax: az cloud update --profile latest
+  optionalParameters:
   - name: --cloud-config
     summary: JSON encoded cloud configuration. Use @{file} to load from a file.
     description: ''
@@ -225,7 +247,7 @@ items:
     summary: Name of a registered cloud.
     description: ''
   - name: --profile
-    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, latest
+    parameterValueGroup: 2017-03-09-profile, 2018-03-01-hybrid, 2019-03-01-hybrid, 2020-09-01-hybrid, latest
     summary: Profile to use for this cloud.
     description: ''
   - name: --suffix-acr-login-server-endpoint
@@ -246,34 +268,15 @@ items:
   - name: --suffix-storage-endpoint
     summary: The endpoint suffix for storage accounts.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
 commands:
-- uid: az_cloud_list
-  name: az cloud list
-  summary: List registered clouds.
-- uid: az_cloud_list_profiles
-  name: az cloud list-profiles
-  summary: List the supported profiles for a cloud.
-- uid: az_cloud_register
-  name: az cloud register
-  summary: Register a cloud.
-- uid: az_cloud_set
-  name: az cloud set
-  summary: Set the active cloud.
-- uid: az_cloud_show
-  name: az cloud show
-  summary: Get the details of a registered cloud.
-- uid: az_cloud_unregister
-  name: az cloud unregister
-  summary: Unregister a cloud.
-- uid: az_cloud_update
-  name: az cloud update
-  summary: Update the configuration of a cloud.
+- az_cloud_list
+- az_cloud_list-profiles
+- az_cloud_register
+- az_cloud_set
+- az_cloud_show
+- az_cloud_unregister
+- az_cloud_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -289,10 +292,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/cloud/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/cloud/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/800e711239d60c81de6679d73779563b2cedcc62/src/azure-cli/azure/cli/command_modules/cloud/_help.py
-updated_at: 2/13/2020 4:56:47 AM
-ms.date: 02/13/2020
-description: Manage registered Azure clouds.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 10/30/2020
+  description: Manage registered Azure clouds.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/codespace.yml b/2019-03-01-hybrid/docs-ref-autogen/codespace.yml
new file mode 100644
index 0000000000..65ea5c5a6b
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/codespace.yml
@@ -0,0 +1,364 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace
+name: az codespace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Visual Studio Codespaces.
+description: ''
+directCommands:
+- uid: az_codespace_create
+  name: az codespace create
+  summary: Create a Codespace.
+  description: ''
+  syntax: >-
+    az codespace create --name
+                        --plan
+                        [--dotfiles-command]
+                        [--dotfiles-path]
+                        [--dotfiles-repo]
+                        [--git-repo]
+                        [--git-user-email]
+                        [--git-user-name]
+                        [--instance-type]
+                        [--resource-group]
+                        [--suspend-after {120, 30, 5, 60}]
+  examples:
+  - summary: Create a Codespace with default plan settings
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace
+  - summary: Create a Codespace with a different instance type with custom suspend time
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux --suspend-after 5
+  - summary: Create a Codespace with a git repo
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --git-repo https://github.com/github/repo --git-user-name "User Name" --git-user-email user@example.com
+  - summary: Create a Codespace with a dotfiles repo
+    syntax: az codespace create -g my-rg --plan my-plan --name my-codespace --dotfiles-repo https://github.com/github/dotfiles --dotfiles-path ~/dotfiles --dotfiles-command bootstrap.sh
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --dotfiles-command
+    summary: The command we'll run after cloning your dotfiles repository.
+    description: ''
+  - name: --dotfiles-path
+    summary: Path where you expect your dotfiles repository to be cloned into the Codespace.
+    description: ''
+  - name: --dotfiles-repo
+    summary: 'Url of dotfiles git repository. More info: https://aka.ms/vso-docs/reference/personalizing.'
+    description: ''
+  - name: --git-repo
+    summary: Url of the git repository we'll clone into the Codespace.
+    description: ''
+  - name: --git-user-email
+    summary: Git user email. For example, the output of `git config user.email`.
+    description: ''
+  - name: --git-user-name
+    summary: Git username. For example, the output of `git config user.name`.
+    description: ''
+  - name: --instance-type
+    summary: Instance Type.
+    description: ''
+    valueFrom: az codespace location show
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Automatically suspend the inactive Codespace after this many minutes.
+    description: ''
+- uid: az_codespace_delete
+  name: az codespace delete
+  summary: Delete a Codespace.
+  description: ''
+  syntax: >-
+    az codespace delete --plan
+                        [--id]
+                        [--name]
+                        [--resource-group]
+                        [--yes]
+  examples:
+  - summary: Delete a Codespace given name
+    syntax: az codespace delete -g my-rg --plan my-plan --name my-codespace
+  - summary: Delete a Codespace given id
+    syntax: az codespace delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Delete a Codespace given plan id and Codespace name
+    syntax: az codespace delete --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_list
+  name: az codespace list
+  summary: List Codespaces.
+  description: ''
+  syntax: >-
+    az codespace list --plan
+                      [--all]
+                      [--resource-group]
+  examples:
+  - summary: List Codespaces
+    syntax: az codespace list -g my-rg --plan my-plan
+  - summary: List Codespaces given plan id
+    syntax: az codespace list --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --all
+    summary: Include the Codespaces of other users. You may not have access to connect or modify these other Codespaces.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_open
+  name: az codespace open
+  summary: Open a Codespace in the web browser.
+  description: Confirmation is required if the Codespace is not in the 'Available' state as opening a Codespace will automatically resume it.
+  syntax: >-
+    az codespace open --plan
+                      [--id]
+                      [--name]
+                      [--resource-group]
+                      [--yes]
+  examples:
+  - summary: Open a Codespace given name
+    syntax: az codespace open -g my-rg --plan my-plan --name my-codespace
+  - summary: Open a Codespace given id
+    syntax: az codespace open -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Open a Codespace given plan id and Codespace name
+    syntax: az codespace open --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_resume
+  name: az codespace resume
+  summary: Resume a Codespace.
+  description: ''
+  syntax: >-
+    az codespace resume --plan
+                        [--id]
+                        [--name]
+                        [--resource-group]
+  examples:
+  - summary: Resume a Codespace given name
+    syntax: az codespace resume -g my-rg --plan my-plan --name my-codespace
+  - summary: Resume a Codespace given id
+    syntax: az codespace resume -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Resume a Codespace given plan id and Codespace name
+    syntax: az codespace resume --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_set-config
+  name: az codespace set-config
+  summary: Set configuration for codespace commands.
+  description: ''
+  syntax: >-
+    az codespace set-config [--clear]
+                            [--domain]
+                            [--rp]
+  optionalParameters:
+  - name: --clear
+    summary: Clear current configuration to return to defaults.
+    description: ''
+  - name: --domain
+    summary: Service domain to use.
+    description: ''
+  - name: --rp
+    summary: Resource Provider API version to use.
+    description: ''
+- uid: az_codespace_show
+  name: az codespace show
+  summary: Show details of a Codespace.
+  description: ''
+  syntax: >-
+    az codespace show --plan
+                      [--id]
+                      [--name]
+                      [--resource-group]
+  examples:
+  - summary: Show details of a Codespace given name
+    syntax: az codespace show -g my-rg --plan my-plan --name my-codespace
+  - summary: Show details of a Codespace given id
+    syntax: az codespace show -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Show details of a Codespace given plan id and Codespace name
+    syntax: az codespace show --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_show-config
+  name: az codespace show-config
+  summary: Show current configuration for codespace commands.
+  description: ''
+  syntax: az codespace show-config
+- uid: az_codespace_suspend
+  name: az codespace suspend
+  summary: Suspend a Codespace.
+  description: ''
+  syntax: >-
+    az codespace suspend --plan
+                         [--id]
+                         [--name]
+                         [--resource-group]
+  examples:
+  - summary: Suspend a Codespace given name
+    syntax: az codespace suspend -g my-rg --plan my-plan --name my-codespace
+  - summary: Suspend a Codespace given id
+    syntax: az codespace suspend -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  - summary: Suspend a Codespace given plan id and Codespace name
+    syntax: az codespace suspend --plan /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Codespaces/plans/my-plan --name my-codespace
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_update
+  name: az codespace update
+  summary: Update a Codespace.
+  description: ''
+  syntax: >-
+    az codespace update --plan
+                        [--id]
+                        [--instance-type]
+                        [--name]
+                        [--resource-group]
+                        [--suspend-after {120, 30, 5, 60}]
+  examples:
+  - summary: Update a Codespace with a different instance type
+    syntax: az codespace update -g my-rg --plan my-plan --name my-codespace --instance-type premiumLinux
+  - summary: Update a Codespace with a different suspend after
+    syntax: az codespace update -g my-rg --plan my-plan --name my-codespace --suspend-after 30
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --id
+    summary: Id of the Codespace.
+    description: ''
+  - name: --instance-type
+    summary: Instance Type.
+    description: ''
+  - name: --name -n
+    summary: Name of the Codespace.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Automatically suspend the inactive Codespace after this many minutes.
+    description: ''
+commands:
+- az_codespace_create
+- az_codespace_delete
+- az_codespace_list
+- az_codespace_location
+- az_codespace_location_list
+- az_codespace_location_show
+- az_codespace_open
+- az_codespace_plan
+- az_codespace_plan_create
+- az_codespace_plan_delete
+- az_codespace_plan_list
+- az_codespace_plan_show
+- az_codespace_resume
+- az_codespace_secret
+- az_codespace_secret_create
+- az_codespace_secret_delete
+- az_codespace_secret_list
+- az_codespace_secret_update
+- az_codespace_set-config
+- az_codespace_show
+- az_codespace_show-config
+- az_codespace_suspend
+- az_codespace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Visual Studio Codespaces.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/codespace/location.yml b/2019-03-01-hybrid/docs-ref-autogen/codespace/location.yml
new file mode 100644
index 0000000000..86d607998a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/codespace/location.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_location
+name: az codespace location
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace location** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Information on available regions.
+description: ''
+directCommands:
+- uid: az_codespace_location_list
+  name: az codespace location list
+  summary: List available regions.
+  description: ''
+  syntax: az codespace location list
+- uid: az_codespace_location_show
+  name: az codespace location show
+  summary: Show details of a region.
+  description: ''
+  syntax: az codespace location show --name
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the region.
+    description: ''
+commands:
+- az_codespace_location_list
+- az_codespace_location_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Information on available regions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/codespace/plan.yml b/2019-03-01-hybrid/docs-ref-autogen/codespace/plan.yml
new file mode 100644
index 0000000000..f43310d8cf
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/codespace/plan.yml
@@ -0,0 +1,140 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_plan
+name: az codespace plan
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace plan** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Codespace plans.
+description: ''
+directCommands:
+- uid: az_codespace_plan_create
+  name: az codespace plan create
+  summary: Create a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan create --name
+                             --resource-group
+                             [--default-instance-type]
+                             [--default-suspend-after {120, 30, 5, 60}]
+                             [--location]
+                             [--subnet]
+                             [--tags]
+  examples:
+  - summary: Create a plan in same region as resource group
+    syntax: az codespace plan create -g my-rg -n my-plan
+  - summary: Create a plan in a specific region
+    syntax: az codespace plan create -g my-rg -n my-plan -l westus2
+  - summary: Create a plan with tags
+    syntax: az codespace plan create -g my-rg -n my-plan --tags tagname=tagvalue
+  - summary: Create a plan with a default instance type
+    syntax: az codespace plan create -g my-rg -n my-plan --default-instance-type premiumLinux
+  - summary: Create a plan with a default suspend after
+    syntax: az codespace plan create -g my-rg -n my-plan --default-suspend-after 120
+  - summary: Create a plan associated with a subnet
+    syntax: az codespace plan create -g my-rg -n my-plan --subnet /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-rg/providers/Microsoft.Network/virtualNetworks/my-vnet/subnets/default
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --default-instance-type
+    summary: Default Instance Type for Codespaces in this plan.
+    description: ''
+  - name: --default-suspend-after
+    parameterValueGroup: 120, 30, 5, 60
+    summary: Default minutes Codespaces in this plan should suspend after.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --subnet
+    summary: Resource ID of an existing subnet. If specified, all Codespaces in this plan will be created in this subnet. The subnet must be in the same region as the plan.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_codespace_plan_delete
+  name: az codespace plan delete
+  summary: Delete a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan delete --name
+                             --resource-group
+                             [--yes]
+  examples:
+  - summary: Delete a plan
+    syntax: az codespace plan delete -g my-rg -n my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_codespace_plan_list
+  name: az codespace plan list
+  summary: List Codespace plans.
+  description: ''
+  syntax: az codespace plan list [--resource-group]
+  examples:
+  - summary: List plans
+    syntax: az codespace plan list
+  - summary: List plans in a given resource group
+    syntax: az codespace plan list -g my-rg
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_plan_show
+  name: az codespace plan show
+  summary: Show details of a Codespace plan.
+  description: ''
+  syntax: >-
+    az codespace plan show --name
+                           --resource-group
+  examples:
+  - summary: Show details of a plan
+    syntax: az codespace plan show -g my-rg -n my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_codespace_plan_create
+- az_codespace_plan_delete
+- az_codespace_plan_list
+- az_codespace_plan_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Codespace plans.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/codespace/secret.yml b/2019-03-01-hybrid/docs-ref-autogen/codespace/secret.yml
new file mode 100644
index 0000000000..38cc2c474a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/codespace/secret.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_codespace_secret
+name: az codespace secret
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **codespaces** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az codespace secret** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage plan secrets.
+description: ''
+directCommands:
+- uid: az_codespace_secret_create
+  name: az codespace secret create
+  summary: Create a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret create --name
+                               --plan
+                               --value
+                               [--filters]
+                               [--note]
+                               [--resource-group]
+  examples:
+  - summary: Create a plan secret.
+    syntax: az codespace secret create -g my-rg --plan my-plan --name API_KEY --value "secretkey" --note "service api key"
+  - summary: Create a plan secret with filters.
+    syntax: az codespace secret create -g my-rg --plan my-plan --name API_KEY --value "secretkey" --filters GitRepo=https://github.com/repo/name CodespaceName=mycodespace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  - isRequired: true
+    name: --value
+    summary: Value of the secret.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: 'Space-separated filters: type=value [type=value ...]. Use "" to clear existing filters. Allowed types: GitRepo, CodespaceName.'
+    description: ''
+  - name: --note
+    summary: Note for the secret.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_delete
+  name: az codespace secret delete
+  summary: Delete a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret delete --id
+                               --plan
+                               [--resource-group]
+  examples:
+  - summary: Delete a plan secret.
+    syntax: az codespace secret delete -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_list
+  name: az codespace secret list
+  summary: List plan secrets.
+  description: ''
+  syntax: >-
+    az codespace secret list --plan
+                             [--resource-group]
+  examples:
+  - summary: List plan secrets.
+    syntax: az codespace secret list -g my-rg --plan my-plan
+  requiredParameters:
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_codespace_secret_update
+  name: az codespace secret update
+  summary: Update a plan secret.
+  description: ''
+  syntax: >-
+    az codespace secret update --id
+                               --plan
+                               [--filters]
+                               [--name]
+                               [--note]
+                               [--resource-group]
+                               [--value]
+  examples:
+  - summary: Update a plan secret with new values.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --name API_KEY --value "newsecretkey" --note "service api key"
+  - summary: Update a plan secret with new filters.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --filters GitRepo=https://github.com/repo/name CodespaceName=mycodespace
+  - summary: Update a plan secret and clear existing filters.
+    syntax: az codespace secret update -g my-rg --plan my-plan --id 00000000-0000-0000-0000-000000000000 --filters ''
+  requiredParameters:
+  - isRequired: true
+    name: --id
+    summary: Id of the secret.
+    description: ''
+  - isRequired: true
+    name: --plan -p
+    summary: Name or ID of the Codespace plan.
+    description: ''
+  optionalParameters:
+  - name: --filters
+    summary: 'Space-separated filters: type=value [type=value ...]. Use "" to clear existing filters. Allowed types: GitRepo, CodespaceName.'
+    description: ''
+  - name: --name -n
+    summary: Name of the secret.
+    description: ''
+  - name: --note
+    summary: Note for the secret.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --value
+    summary: Value of the secret.
+    description: ''
+commands:
+- az_codespace_secret_create
+- az_codespace_secret_delete
+- az_codespace_secret_list
+- az_codespace_secret_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage plan secrets.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/communication.yml b/2019-03-01-hybrid/docs-ref-autogen/communication.yml
new file mode 100644
index 0000000000..3cd874ba3f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/communication.yml
@@ -0,0 +1,300 @@
+### YamlMime:AzureCLIGroup
+uid: az_communication
+name: az communication
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **communication** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az communication** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage communication service.
+description: ''
+directCommands:
+- uid: az_communication_create
+  name: az communication create
+  summary: Create a new Communication Service or update an existing Communication Service.
+  description: ''
+  syntax: >-
+    az communication create --name
+                            --resource-group
+                            [--data-location]
+                            [--location]
+                            [--no-wait]
+                            [--tags]
+  examples:
+  - summary: Create a Communication Service
+    syntax: az communication create --name "MyCommunicationResource" --location "Global" --data-location "United States" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-location
+    summary: The location where the communication service stores its data at rest.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_communication_delete
+  name: az communication delete
+  summary: Operation to delete a Communication Service.
+  description: ''
+  syntax: >-
+    az communication delete --name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: Delete a Communication Service
+    syntax: az communication delete --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_communication_link-notification-hub
+  name: az communication link-notification-hub
+  summary: Link an Azure Notification Hub to this communication.
+  description: ''
+  syntax: >-
+    az communication link-notification-hub --name
+                                           --resource-group
+                                           [--connection-string]
+                                           [--resource-id]
+  examples:
+  - summary: Link a Communication Service to a existing notification hub
+    syntax: az communication link-notification-hub --name "MyCommunicationResource" --connection-string "Endpoint=sb://MyNamespace.servicebus.windows.net/;SharedAccessKey=abcd1234" --resource-id "/subscriptions/12345/resourceGroups/MyOtherResourceGroup/providers/Microsoft.NotificationHubs/namespaces/MyNamespace/notificationHubs/MyHub" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --connection-string
+    summary: Connection string for the notification hub.
+    description: ''
+  - name: --resource-id
+    summary: The resource ID of the notification hub.
+    description: ''
+- uid: az_communication_list
+  name: az communication list
+  summary: List all resources in a subscription or a resource group.
+  description: ''
+  syntax: az communication list [--resource-group]
+  examples:
+  - summary: List by resource group
+    syntax: az communication list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_list-key
+  name: az communication list-key
+  summary: Get the access keys of the Communication Service resource.
+  description: ''
+  syntax: >-
+    az communication list-key --name
+                              --resource-group
+  examples:
+  - summary: List access keys of a Communication Service
+    syntax: az communication list-key --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_regenerate-key
+  name: az communication regenerate-key
+  summary: Regenerate Communication Service access key. PrimaryKey and SecondaryKey cannot be regenerated at the same time.
+  description: ''
+  syntax: >-
+    az communication regenerate-key --name
+                                    --resource-group
+                                    [--key-type {Primary, Secondary}]
+  examples:
+  - summary: Regenerate primary access keys of a Communication Service
+    syntax: az communication regenerate-key --name "MyCommunicationResource" --key-type "Primary" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-type
+    parameterValueGroup: Primary, Secondary
+    summary: The keyType to regenerate. Must be either 'primary' or 'secondary'(case-insensitive).
+    description: ''
+- uid: az_communication_show
+  name: az communication show
+  summary: Get the Communication Service and its properties.
+  description: ''
+  syntax: >-
+    az communication show --name
+                          --resource-group
+  examples:
+  - summary: Get the detail of a Communication Service
+    syntax: az communication show --name "MyCommunicationResource" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_communication_show-status
+  name: az communication show-status
+  summary: Get the current status of an async operation.
+  description: ''
+  syntax: >-
+    az communication show-status --location
+                                 --operation-id
+  examples:
+  - summary: Get the current status of a specific operation
+    syntax: az communication show-status --operation-id "db5f291f-284d-46e9-9152-d5c83f7c14b8" --location "westus2"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --operation-id
+    summary: The ID of an ongoing async operation.
+    description: ''
+- uid: az_communication_update
+  name: az communication update
+  summary: Operation to update an existing Communication Service.
+  description: ''
+  syntax: >-
+    az communication update --name
+                            --resource-group
+                            [--tags]
+  examples:
+  - summary: Update a Communication Service
+    syntax: az communication update --name "MyCommunicationResource" --tags newTag="newVal" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_communication_wait
+  name: az communication wait
+  summary: Place the CLI in a waiting state until a condition of the communication is met.
+  description: ''
+  syntax: >-
+    az communication wait --name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the communication is successfully created.
+    syntax: az communication wait --name "MyCommunicationResource" --resource-group "MyResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the communication is successfully deleted.
+    syntax: az communication wait --name "MyCommunicationResource" --resource-group "MyResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the CommunicationService resource.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_communication_create
+- az_communication_delete
+- az_communication_link-notification-hub
+- az_communication_list
+- az_communication_list-key
+- az_communication_regenerate-key
+- az_communication_show
+- az_communication_show-status
+- az_communication_update
+- az_communication_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage communication service.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/config.yml b/2019-03-01-hybrid/docs-ref-autogen/config.yml
new file mode 100644
index 0000000000..7da352b168
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/config.yml
@@ -0,0 +1,108 @@
+### YamlMime:AzureCLIGroup
+uid: az_config
+name: az config
+summary: Manage Azure CLI configuration.
+description: Available since Azure CLI 2.10.0.
+directCommands:
+- uid: az_config_get
+  name: az config get
+  summary: Get a configuration.
+  description: ''
+  syntax: >-
+    az config get [--local]
+                  [<KEY>]
+  examples:
+  - summary: Get all configurations.
+    syntax: az config get
+  - summary: Get configurations in `core` section.
+    syntax: az config get core
+  - summary: Get the configuration of key `core.no_color`.
+    syntax: az config get core.no_color
+  optionalParameters:
+  - name: --local
+    summary: Include local configuration. Scan from the working directory up to the root drive, then the global configuration and return the first occurrence.
+    description: ''
+  - name: <KEY>
+    summary: The configuration to get. If not provided, all sections and configurations will be listed. If `section` is provided, all configurations under the specified section will be listed. If `<section>.<key>` is provided, only the corresponding configuration is shown.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_set
+  name: az config set
+  summary: Set a configuration.
+  description: >-
+    For available configuration options, see https://docs.microsoft.com/cli/azure/azure-cli-configuration.
+
+    By default without specifying --local, the configuration will be saved to `~/.azure/config`.
+  syntax: >-
+    az config set [--local]
+                  [<KEY_VALUE>]
+  examples:
+  - summary: Disable color with `core.no_color`.
+    syntax: az config set core.no_color=true
+  - summary: Hide warnings and only show errors with `core.only_show_errors`.
+    syntax: az config set core.only_show_errors=true
+  - summary: Turn on client-side telemetry.
+    syntax: az config set core.collect_telemetry=true
+  - summary: Turn on file logging and set its location.
+    syntax: >-
+      az config set logging.enable_log_file=true
+
+      az config set logging.log_dir=~/az-logs
+  - summary: Set the default location to `westus2` and default resource group to `myRG`.
+    syntax: az config set defaults.location=westus2 defaults.group=MyResourceGroup
+  - summary: Set the default resource group to `myRG` on a local scope.
+    syntax: az config set defaults.group=myRG --local
+  optionalParameters:
+  - name: --local
+    summary: Set as a local configuration in the working directory.
+    description: ''
+  - name: <KEY_VALUE>
+    summary: Space-separated configurations in the form of <section>.<key>=<value>.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_unset
+  name: az config unset
+  summary: Unset a configuration.
+  description: ''
+  syntax: >-
+    az config unset [--local]
+                    [<KEY>]
+  examples:
+  - summary: Unset the configuration of key `core.no_color`.
+    syntax: az config unset core.no_color
+  optionalParameters:
+  - name: --local
+    summary: Include local configuration. Scan from the working directory up to the root drive, then the global configuration and unset the first occurrence.
+    description: ''
+  - name: <KEY>
+    summary: The configuration to unset, in the form of <section>.<key>.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+commands:
+- az_config_get
+- az_config_param-persist
+- az_config_param-persist_delete
+- az_config_param-persist_off
+- az_config_param-persist_on
+- az_config_param-persist_show
+- az_config_set
+- az_config_unset
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 03/17/2021
+  description: Available since Azure CLI 2.10.0.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/config/param-persist.yml b/2019-03-01-hybrid/docs-ref-autogen/config/param-persist.yml
new file mode 100644
index 0000000000..55ecd5fcbc
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/config/param-persist.yml
@@ -0,0 +1,98 @@
+### YamlMime:AzureCLIGroup
+uid: az_config_param-persist
+name: az config param-persist
+summary: Manage parameter persistence.
+description: ''
+directCommands:
+- uid: az_config_param-persist_delete
+  name: az config param-persist delete
+  summary: Delete parameter persistence data.
+  description: ''
+  syntax: >-
+    az config param-persist delete [--all]
+                                   [--purge]
+                                   [--recursive]
+                                   [--yes]
+                                   [<NAME>]
+  examples:
+  - summary: Delete resource_group_name from parameter persistence
+    syntax: az config param-persist delete resource_group_name
+  - summary: Clear all parameter persistence data
+    syntax: az config param-persist delete --all
+  - summary: Delete parameter persistence file
+    syntax: az config param-persist delete --all --purge
+  - summary: Delete parameter persistence file recursively
+    syntax: az config param-persist delete --all --purge --recursive
+  optionalParameters:
+  - name: --all
+    summary: Clear all parameter persistence data. Either positional name argument  or --all can be specified.
+    description: ''
+  - name: --purge
+    summary: Delete parameter persistence file from working directory. Only available when --all is specified.
+    description: ''
+  - name: --recursive
+    summary: Indicate this is recursive delete of parameter persistence. Only available when --all is specified.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation. Only available when --all is specified.
+    description: ''
+  - name: <NAME>
+    summary: Space-separated list of parameter persistence names. Either positional name argument or --all can be specified.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_off
+  name: az config param-persist off
+  summary: Turn off parameter persistence.
+  description: ''
+  syntax: az config param-persist off
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_on
+  name: az config param-persist on
+  summary: Turn on parameter persistence.
+  description: ''
+  syntax: az config param-persist on
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+- uid: az_config_param-persist_show
+  name: az config param-persist show
+  summary: Show parameter persistence data.
+  description: ''
+  syntax: >-
+    az config param-persist show [--query-examples]
+                                 [<NAME>]
+  examples:
+  - summary: Show all parameter persistence value
+    syntax: az config param-persist show
+  - summary: Show resource_group_name parameter persistence value
+    syntax: az config param-persist show resource_group_name
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: <NAME>
+    summary: Space-separated list of parameter persistence names.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/config/_help.py
+commands:
+- az_config_param-persist_delete
+- az_config_param-persist_off
+- az_config_param-persist_on
+- az_config_param-persist_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 03/17/2021
+  description: Manage parameter persistence.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/confluent.yml b/2019-03-01-hybrid/docs-ref-autogen/confluent.yml
new file mode 100644
index 0000000000..708b242a84
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/confluent.yml
@@ -0,0 +1,36 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent
+name: az confluent
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage confluent resources.
+description: ''
+commands:
+- az_confluent_organization
+- az_confluent_organization_create
+- az_confluent_organization_delete
+- az_confluent_organization_list
+- az_confluent_organization_show
+- az_confluent_organization_update
+- az_confluent_organization_wait
+- az_confluent_terms
+- az_confluent_terms_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage confluent resources.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/confluent/organization.yml b/2019-03-01-hybrid/docs-ref-autogen/confluent/organization.yml
new file mode 100644
index 0000000000..08e6689dd4
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/confluent/organization.yml
@@ -0,0 +1,237 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent_organization
+name: az confluent organization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent organization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage organization with confluent.
+description: ''
+directCommands:
+- uid: az_confluent_organization_create
+  name: az confluent organization create
+  summary: Create Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization create --name
+                                     --resource-group
+                                     [--location]
+                                     [--no-wait]
+                                     [--offer-detail]
+                                     [--tags]
+                                     [--user-detail]
+  examples:
+  - summary: Organization_Create
+    syntax: az confluent organization create --location "West US" --offer-detail id="string" plan-id="string" plan-name="string" publisher-id="string" term-unit="string" --user-detail email-address="contoso@microsoft.com" first-name="string" last-name="string" --tags Environment="Dev" --name "myOrganization" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --offer-detail
+    summary: Confluent offer detail.
+    description: >-
+      Usage: --offer-detail publisher-id=XX id=XX plan-id=XX plan-name=XX term-unit=XX status=XX
+
+
+      publisher-id: Publisher Id
+
+      id: Offer Id
+
+      plan-id: Offer Plan Id
+
+      plan-name: Offer Plan Name
+
+      term-unit: Offer Plan Term unit
+
+      status: SaaS Offer Status.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --user-detail
+    summary: Subscriber detail.
+    description: >-
+      Usage: --user-detail first-name=XX last-name=XX email-address=XX
+
+
+      first-name: First name
+
+      last-name: Last name
+
+      email-address: Email address.
+- uid: az_confluent_organization_delete
+  name: az confluent organization delete
+  summary: Delete Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization delete --name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete organization
+    syntax: az confluent organization delete --name "myOrganization" --resource-group "myResourceGroup"
+  - summary: Delete organization using IDs
+    syntax: az confluent organization delete --ids "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Confluent/organizations/{myOrganization}"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_confluent_organization_list
+  name: az confluent organization list
+  summary: List all Organizations under the specified resource group. And List all organizations under the specified subscription.
+  description: ''
+  syntax: az confluent organization list [--resource-group]
+  examples:
+  - summary: Organization_ListByResourceGroup
+    syntax: az confluent organization list --resource-group "myResourceGroup"
+  - summary: Organization_ListBySubscription
+    syntax: az confluent organization list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_confluent_organization_show
+  name: az confluent organization show
+  summary: Get the properties of a specific Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization show --name
+                                   --resource-group
+  examples:
+  - summary: Show organization
+    syntax: az confluent organization show --name "myOrganization" --resource-group "myResourceGroup"
+  - summary: Show organization using IDs
+    syntax: az confluent organization show --ids "/subscriptions/{SubID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Confluent/organizations/{myOrganization}"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_confluent_organization_update
+  name: az confluent organization update
+  summary: Update Organization resource.
+  description: ''
+  syntax: >-
+    az confluent organization update --name
+                                     --resource-group
+                                     [--tags]
+  examples:
+  - summary: Confluent_Update
+    syntax: az confluent organization update --tags client="dev-client" env="dev" --name "myOrganization" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_confluent_organization_wait
+  name: az confluent organization wait
+  summary: Place the CLI in a waiting state until a condition of the confluent organization is met.
+  description: ''
+  syntax: >-
+    az confluent organization wait --name
+                                   --resource-group
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the confluent organization is successfully created.
+    syntax: az confluent organization wait --name "myOrganization" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the confluent organization is successfully deleted.
+    syntax: az confluent organization wait --name "myOrganization" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --name --organization-name -n
+    summary: Organization resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_confluent_organization_create
+- az_confluent_organization_delete
+- az_confluent_organization_list
+- az_confluent_organization_show
+- az_confluent_organization_update
+- az_confluent_organization_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage organization with confluent.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/confluent/terms.yml b/2019-03-01-hybrid/docs-ref-autogen/confluent/terms.yml
new file mode 100644
index 0000000000..377fb60bc6
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/confluent/terms.yml
@@ -0,0 +1,37 @@
+### YamlMime:AzureCLIGroup
+uid: az_confluent_terms
+name: az confluent terms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **confluent** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az confluent terms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage marketplace agreement with confluent.
+description: ''
+directCommands:
+- uid: az_confluent_terms_list
+  name: az confluent terms list
+  summary: List Confluent marketplace agreements in the subscription.
+  description: ''
+  syntax: az confluent terms list
+  examples:
+  - summary: MarketplaceAgreements_List
+    syntax: az confluent terms list
+commands:
+- az_confluent_terms_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage marketplace agreement with confluent.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/connectedk8s.yml b/2019-03-01-hybrid/docs-ref-autogen/connectedk8s.yml
new file mode 100644
index 0000000000..d473ecab4c
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/connectedk8s.yml
@@ -0,0 +1,423 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedk8s
+name: az connectedk8s
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedk8s** extension for Azure CLI and requires version 2.16.0 or higher.  The extension will automatically install the first time you run an **az connectedk8s** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage connected kubernetes clusters.
+description: ''
+directCommands:
+- uid: az_connectedk8s_connect
+  name: az connectedk8s connect
+  summary: Onboard a connected kubernetes cluster to azure.
+  description: ''
+  syntax: >-
+    az connectedk8s connect --name
+                            --resource-group
+                            [--custom-locations-oid]
+                            [--disable-auto-upgrade]
+                            [--distribution {aks, aks_engine, aks_management, aks_workload, auto, capz, eks, generic, gke, k3s, kind, minikube, openshift, rancher_rke, tkg}]
+                            [--infrastructure {auto, aws, azure, azure_stack_edge, azure_stack_hci, azure_stack_hub, gcp, generic, vsphere, windows_server}]
+                            [--kube-config]
+                            [--kube-context]
+                            [--location]
+                            [--no-wait]
+                            [--proxy-cert]
+                            [--proxy-http]
+                            [--proxy-https]
+                            [--proxy-skip-range]
+                            [--tags]
+  examples:
+  - summary: Onboard a connected kubernetes cluster with default kube config and kube context.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName
+  - summary: Onboard a connected kubernetes cluster with default kube config and kube context and disabling auto upgrade of arc agents.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --disable-auto-upgrade
+  - summary: Onboard a connected kubernetes cluster by specifying the kubeconfig and kubecontext.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
+  - summary: Onboard a connected kubernetes cluster by specifying the https proxy, http proxy, no proxy settings.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  - summary: Onboard a connected kubernetes cluster by specifying the https proxy, http proxy, no proxy  with cert settings.
+    syntax: az connectedk8s connect -g resourceGroupName -n connectedClusterName --proxy-cert /path/to/crt --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-locations-oid
+    summary: OID of 'custom-locations' app.
+    description: ''
+  - name: --disable-auto-upgrade
+    summary: Flag to disable auto upgrade of arc agents.
+    description: ''
+  - name: --distribution
+    defaultValue: auto
+    parameterValueGroup: aks, aks_engine, aks_management, aks_workload, auto, capz, eks, generic, gke, k3s, kind, minikube, openshift, rancher_rke, tkg
+    summary: The Kubernetes distribution which will be running on this connected cluster.
+    description: ''
+  - name: --infrastructure
+    defaultValue: auto
+    parameterValueGroup: auto, aws, azure, azure_stack_edge, azure_stack_hci, azure_stack_hub, gcp, generic, vsphere, windows_server
+    summary: The infrastructure on which the Kubernetes cluster represented by this connected cluster will be running on.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --proxy-cert
+    summary: Path to the certificate file for proxy.
+    description: ''
+  - name: --proxy-http
+    summary: Http proxy URL to be used.
+    description: ''
+  - name: --proxy-https
+    summary: Https proxy URL to be used.
+    description: ''
+  - name: --proxy-skip-range
+    summary: List of URLs/CIDRs for which proxy should not to be used.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_connectedk8s_delete
+  name: az connectedk8s delete
+  summary: Delete a connected kubernetes cluster along with connected cluster agents.
+  description: ''
+  syntax: >-
+    az connectedk8s delete --name
+                           --resource-group
+                           [--kube-config]
+                           [--kube-context]
+                           [--no-wait]
+                           [--yes]
+  examples:
+  - summary: Delete a connected kubernetes cluster and connected cluster agents with default kubeconfig and kubecontext.
+    syntax: az connectedk8s delete -g resourceGroupName -n connectedClusterName
+  - summary: Delete a connected kubernetes cluster by specifying the kubeconfig and kubecontext for connected cluster agents deletion.
+    syntax: az connectedk8s delete -g resourceGroupName -n connectedClusterName --kube-config /path/to/kubeconfig --kube-context kubeContextName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedk8s_disable-features
+  name: az connectedk8s disable-features
+  summary: Disables the selective features on the connected cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s disable-features --features {azure-rbac, cluster-connect, custom-locations}
+                                     --name
+                                     --resource-group
+                                     [--kube-config]
+                                     [--kube-context]
+                                     [--yes]
+  examples:
+  - summary: Disables the azure-rbac feature.
+    syntax: az connectedk8s disable-features -n clusterName -g resourceGroupName --features azure-rbac
+  - summary: Disable multiple features.
+    syntax: az connectedk8s disable-features -n clusterName -g resourceGroupName --features custom-locations azure-rbac
+  requiredParameters:
+  - isRequired: true
+    name: --features
+    parameterValueGroup: azure-rbac, cluster-connect, custom-locations
+    summary: Space-separated list of features you want to disable.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedk8s_enable-features
+  name: az connectedk8s enable-features
+  summary: Enables the selective features on the connected cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s enable-features --features {azure-rbac, cluster-connect, custom-locations}
+                                    --name
+                                    --resource-group
+                                    [--app-id]
+                                    [--app-secret]
+                                    [--custom-locations-oid]
+                                    [--kube-config]
+                                    [--kube-context]
+                                    [--skip-azure-rbac-list]
+  examples:
+  - summary: Enables the Cluster-Connect feature.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features cluster-connect
+  - summary: Enable Azure RBAC feature.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features azure-rbac --app-id appID --app-secret="appSecret" --skip-azure-rbac-list "user1@domain.com,spn_oid"
+  - summary: Enable multiple features.
+    syntax: az connectedk8s enable-features -n clusterName -g resourceGroupName --features cluster-connect custom-locations
+  requiredParameters:
+  - isRequired: true
+    name: --features
+    parameterValueGroup: azure-rbac, cluster-connect, custom-locations
+    summary: Space-separated list of features you want to enable.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --app-id
+    summary: Application ID for enabling Azure RBAC. Specify when enabling azure-rbac.
+    description: ''
+  - name: --app-secret
+    summary: Application secret for enabling Azure RBAC. Specify when enabling azure-rbac.
+    description: ''
+  - name: --custom-locations-oid
+    summary: OID of 'custom-locations' app.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --skip-azure-rbac-list
+    summary: Comma separated list of names of usernames/email/oid. Azure RBAC will be skipped for these users. Specify when enabling azure-rbac.
+    description: ''
+- uid: az_connectedk8s_list
+  name: az connectedk8s list
+  summary: List connected kubernetes clusters.
+  description: ''
+  syntax: az connectedk8s list [--resource-group]
+  examples:
+  - summary: List all connected kubernetes clusters in a resource group.
+    syntax: az connectedk8s list -g resourceGroupName --subscription subscriptionName
+  - summary: List all connected kubernetes clusters in a subscription.
+    syntax: az connectedk8s list --subscription subscriptionName
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedk8s_proxy
+  name: az connectedk8s proxy
+  summary: Get access to a connected kubernetes cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s proxy --name
+                          --resource-group
+                          [--file]
+                          [--kube-context]
+                          [--port]
+                          [--token]
+  examples:
+  - summary: Get access to a connected kubernetes cluster.
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName
+  - summary: Get access to a connected kubernetes cluster with custom port
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --port portValue
+  - summary: Get access to a connected kubernetes cluster with service account token
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --token tokenValue
+  - summary: Get access to a connected kubernetes cluster by specifying custom kubeconfig location
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName -f path/to/kubeconfig
+  - summary: Get access to a connected kubernetes cluster by specifying custom context
+    syntax: az connectedk8s proxy -n clusterName -g resourceGroupName --kube-context contextName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --file -f
+    defaultValue: ~/.kube/config
+    summary: Kubernetes configuration file to update. If not provided, updates the file '~/.kube/config'. Use '-' to print YAML to stdout instead.
+    description: ''
+  - name: --kube-context
+    summary: If specified, overwrite the default context name.
+    description: ''
+  - name: --port
+    defaultValue: "47011"
+    summary: Port used for accessing connected cluster.
+    description: ''
+  - name: --token
+    summary: Service account token to use to authenticate to the kubernetes cluster.
+    description: ''
+- uid: az_connectedk8s_show
+  name: az connectedk8s show
+  summary: Show details of a connected kubernetes cluster.
+  description: ''
+  syntax: >-
+    az connectedk8s show --name
+                         --resource-group
+  examples:
+  - summary: Show the details for a connected kubernetes cluster
+    syntax: az connectedk8s show -g resourceGroupName -n connectedClusterName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedk8s_update
+  name: az connectedk8s update
+  summary: Update properties of the onboarded agents.
+  description: ''
+  syntax: >-
+    az connectedk8s update --name
+                           --resource-group
+                           [--auto-upgrade {false, true}]
+                           [--disable-proxy]
+                           [--kube-config]
+                           [--kube-context]
+                           [--proxy-cert]
+                           [--proxy-http]
+                           [--proxy-https]
+                           [--proxy-skip-range]
+  examples:
+  - summary: Update proxy values for the agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName  --proxy-cert /path/to/crt --proxy-https https://proxy-url --proxy-http http://proxy-url --proxy-skip-range excludedIP,excludedCIDR,exampleCIDRfollowed,10.0.0.0/24
+  - summary: Disable proxy settings for agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName --disable-proxy
+  - summary: Disable auto-upgrade of agents
+    syntax: az connectedk8s update -g resourceGroupName -n connectedClusterName --auto-upgrade false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade
+    parameterValueGroup: false, true
+    summary: Flag to enable/disable auto upgrade of arc agents. By default, auto upgrade of agents is enabled.
+    description: ''
+  - name: --disable-proxy
+    summary: Disables proxy settings for agents.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+  - name: --proxy-cert
+    summary: Path to the certificate file for proxy.
+    description: ''
+  - name: --proxy-http
+    summary: Http proxy URL to be used.
+    description: ''
+  - name: --proxy-https
+    summary: Https proxy URL to be used.
+    description: ''
+  - name: --proxy-skip-range
+    summary: List of URLs/CIDRs for which proxy should not to be used.
+    description: ''
+- uid: az_connectedk8s_upgrade
+  name: az connectedk8s upgrade
+  summary: Atomically upgrade onboarded agents to the specific version or default to the latest version.
+  description: ''
+  syntax: >-
+    az connectedk8s upgrade --name
+                            --resource-group
+                            [--agent-version]
+                            [--kube-config]
+                            [--kube-context]
+  examples:
+  - summary: Upgrade the agents to the latest version
+    syntax: az connectedk8s upgrade -g resourceGroupName -n connectedClusterName
+  - summary: Upgrade the agents to a specific version
+    syntax: az connectedk8s upgrade -g resourceGroupName -n connectedClusterName --agent-version 0.2.62
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --agent-version
+    summary: Version of agent to update the helm charts to.
+    description: ''
+  - name: --kube-config
+    summary: Path to the kube config file.
+    description: ''
+  - name: --kube-context
+    summary: Kubconfig context from current machine.
+    description: ''
+commands:
+- az_connectedk8s_connect
+- az_connectedk8s_delete
+- az_connectedk8s_disable-features
+- az_connectedk8s_enable-features
+- az_connectedk8s_list
+- az_connectedk8s_proxy
+- az_connectedk8s_show
+- az_connectedk8s_update
+- az_connectedk8s_upgrade
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage connected kubernetes clusters.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/connectedmachine.yml b/2019-03-01-hybrid/docs-ref-autogen/connectedmachine.yml
new file mode 100644
index 0000000000..b6cb9c1f2b
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/connectedmachine.yml
@@ -0,0 +1,93 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedmachine
+name: az connectedmachine
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedmachine** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az connectedmachine** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Connectedmachine.
+description: ''
+directCommands:
+- uid: az_connectedmachine_delete
+  name: az connectedmachine delete
+  summary: The operation to remove a hybrid machine identity in Azure.
+  description: ''
+  syntax: >-
+    az connectedmachine delete --machine-name
+                               --resource-group
+                               [--yes]
+  examples:
+  - summary: Delete a Machine
+    syntax: az connectedmachine delete --name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: The name of the hybrid machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedmachine_list
+  name: az connectedmachine list
+  summary: Lists all the hybrid machines in the specified subscription.
+  description: ''
+  syntax: az connectedmachine list [--resource-group]
+  examples:
+  - summary: List Machines by resource group
+    syntax: az connectedmachine list --resource-group "myResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedmachine_show
+  name: az connectedmachine show
+  summary: Retrieves information about the model view or the instance view of a hybrid machine.
+  description: ''
+  syntax: >-
+    az connectedmachine show --machine-name
+                             --resource-group
+  examples:
+  - summary: Get Machine
+    syntax: az connectedmachine show --name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name --name -n
+    summary: The name of the hybrid machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+commands:
+- az_connectedmachine_delete
+- az_connectedmachine_extension
+- az_connectedmachine_extension_create
+- az_connectedmachine_extension_delete
+- az_connectedmachine_extension_list
+- az_connectedmachine_extension_show
+- az_connectedmachine_extension_update
+- az_connectedmachine_extension_wait
+- az_connectedmachine_list
+- az_connectedmachine_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Connectedmachine.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/connectedmachine/extension.yml b/2019-03-01-hybrid/docs-ref-autogen/connectedmachine/extension.yml
new file mode 100644
index 0000000000..beaf30f43f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/connectedmachine/extension.yml
@@ -0,0 +1,303 @@
+### YamlMime:AzureCLIGroup
+uid: az_connectedmachine_extension
+name: az connectedmachine extension
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **connectedmachine** extension for Azure CLI and requires version 2.11.0 or higher.  The extension will automatically install the first time you run an **az connectedmachine extension** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Connectedmachine extension.
+description: ''
+directCommands:
+- uid: az_connectedmachine_extension_create
+  name: az connectedmachine extension create
+  summary: The operation to create or update the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension create --extension-name
+                                         --location
+                                         --machine-name
+                                         --resource-group
+                                         [--auto-upgrade-minor {false, true}]
+                                         [--force-update-tag]
+                                         [--no-wait]
+                                         [--protected-settings]
+                                         [--publisher]
+                                         [--settings]
+                                         [--tags]
+                                         [--type]
+                                         [--type-handler-version]
+  examples:
+  - summary: Create a Machine Extension (PUT)
+    syntax: az connectedmachine extension create --machine-name "myMachine" --name "CustomScriptExtension" --location "eastus2euap" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\"commandToExecute\":\"powershell.exe -c \\\"Get-Process | Where-Object { $_.CPU -gt 10000 }\\\"\"}" --type-handler-version "1.10" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be created or updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade-minor
+    parameterValueGroup: false, true
+    summary: Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
+    description: ''
+  - name: --force-update-tag
+    summary: How the extension handler should be forced to update even if the extension configuration has not changed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protected-settings
+    summary: 'The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --publisher
+    summary: The name of the extension handler publisher.
+    description: ''
+  - name: --settings
+    summary: 'Json formatted public settings for the extension. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: Specifies the type of the extension; an example is "CustomScriptExtension".
+    description: ''
+  - name: --type-handler-version
+    summary: Specifies the version of the script handler.
+    description: ''
+- uid: az_connectedmachine_extension_delete
+  name: az connectedmachine extension delete
+  summary: The operation to delete the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension delete --extension-name
+                                         --machine-name
+                                         --resource-group
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete a Machine Extension
+    syntax: az connectedmachine extension delete --machine-name "myMachine" --name "MMA" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be deleted.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_connectedmachine_extension_list
+  name: az connectedmachine extension list
+  summary: The operation to get all extensions of a non-Azure machine.
+  description: ''
+  syntax: >-
+    az connectedmachine extension list --machine-name
+                                       --resource-group
+                                       [--expand]
+  examples:
+  - summary: Get all Machine Extensions
+    syntax: az connectedmachine extension list --machine-name "myMachine" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --expand
+    summary: The expand expression to apply on the operation.
+    description: ''
+- uid: az_connectedmachine_extension_show
+  name: az connectedmachine extension show
+  summary: The operation to get the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension show --extension-name
+                                       --machine-name
+                                       --resource-group
+  examples:
+  - summary: Get Machine Extension
+    syntax: az connectedmachine extension show --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_connectedmachine_extension_update
+  name: az connectedmachine extension update
+  summary: The operation to update the extension.
+  description: ''
+  syntax: >-
+    az connectedmachine extension update --extension-name
+                                         --machine-name
+                                         --resource-group
+                                         [--auto-upgrade-minor {false, true}]
+                                         [--force-update-tag]
+                                         [--no-wait]
+                                         [--protected-settings]
+                                         [--publisher]
+                                         [--settings]
+                                         [--tags]
+                                         [--type]
+                                         [--type-handler-version]
+  examples:
+  - summary: Update a Machine Extension (PATCH)
+    syntax: az connectedmachine extension update --machine-name "myMachine" --name "CustomScriptExtension" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\"commandToExecute\":\"powershell.exe -c \\\"Get-Process | Where-Object { $_.CPU -lt 100 }\\\"\"}" --type-handler-version "1.10" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine where the extension should be created or updated.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-upgrade-minor
+    parameterValueGroup: false, true
+    summary: Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.
+    description: ''
+  - name: --force-update-tag
+    summary: How the extension handler should be forced to update even if the extension configuration has not changed.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --protected-settings
+    summary: 'The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --publisher
+    summary: The name of the extension handler publisher.
+    description: ''
+  - name: --settings
+    summary: 'Json formatted public settings for the extension. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    summary: Specifies the type of the extension; an example is "CustomScriptExtension".
+    description: ''
+  - name: --type-handler-version
+    summary: Specifies the version of the script handler.
+    description: ''
+- uid: az_connectedmachine_extension_wait
+  name: az connectedmachine extension wait
+  summary: Place the CLI in a waiting state until a condition of the connectedmachine extension is met.
+  description: ''
+  syntax: >-
+    az connectedmachine extension wait --extension-name
+                                       --machine-name
+                                       --resource-group
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully created.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully updated.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the connectedmachine extension is successfully deleted.
+    syntax: az connectedmachine extension wait --machine-name "myMachine" --name "CustomScriptExtension" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --extension-name --name -n
+    summary: The name of the machine extension.
+    description: ''
+  - isRequired: true
+    name: --machine-name
+    summary: The name of the machine containing the extension.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_connectedmachine_extension_create
+- az_connectedmachine_extension_delete
+- az_connectedmachine_extension_list
+- az_connectedmachine_extension_show
+- az_connectedmachine_extension_update
+- az_connectedmachine_extension_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Connectedmachine extension.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/container.yml b/2019-03-01-hybrid/docs-ref-autogen/container.yml
new file mode 100644
index 0000000000..f2c7fa37eb
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/container.yml
@@ -0,0 +1,29 @@
+### YamlMime:AzureCLIGroup
+uid: az_container
+name: az container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Container Instances.
+description: ''
+commands:
+- az_container_app
+- az_container_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Container Instances.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/container/app.yml b/2019-03-01-hybrid/docs-ref-autogen/container/app.yml
new file mode 100644
index 0000000000..44cfc75479
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/container/app.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_container_app
+name: az container app
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **deploy-to-azure** extension for Azure CLI and requires version 2.0.60 or higher.  The extension will automatically install the first time you run an **az container app** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to Manage Azure Container Instances App.
+description: ''
+directCommands:
+- uid: az_container_app_up
+  name: az container app up
+  summary: Deploy to Azure Container Instances using GitHub Actions.
+  description: ''
+  syntax: >-
+    az container app up [--acr]
+                        [--branch-name]
+                        [--do-not-wait]
+                        [--port]
+                        [--repository]
+  optionalParameters:
+  - name: --acr
+    summary: Name of the Azure Container Registry to be used for pushing the image.
+    description: ''
+  - name: --branch-name
+    summary: New branch name to be created to check in files and raise a PR.
+    description: ''
+  - name: --do-not-wait
+    summary: Do not wait for workflow completion.
+    description: ''
+  - name: --port
+    summary: Port on which your application runs. Default is 8080.
+    description: ''
+  - name: --repository
+    summary: GitHub Repository URL e.g. https://github.com/contoso/webapp.
+    description: ''
+commands:
+- az_container_app_up
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to Manage Azure Container Instances App.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb.yml
new file mode 100644
index 0000000000..5a16ea2bf0
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb.yml
@@ -0,0 +1,378 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb
+name: az cosmosdb
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure Cosmos DB database accounts.
+description: ''
+directCommands:
+- uid: az_cosmosdb_create
+  name: az cosmosdb create
+  summary: Create a new Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb create --name
+                       --resource-group
+                       [--backup-interval]
+                       [--backup-policy-type {Continuous, Periodic}]
+                       [--backup-retention]
+                       [--capabilities]
+                       [--databases-to-restore]
+                       [--default-consistency-level {BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong}]
+                       [--disable-key-based-metadata-write-access {false, true}]
+                       [--enable-analytical-storage {false, true}]
+                       [--enable-automatic-failover {false, true}]
+                       [--enable-free-tier {false, true}]
+                       [--enable-multiple-write-locations {false, true}]
+                       [--enable-public-network {false, true}]
+                       [--enable-virtual-network {false, true}]
+                       [--ip-range-filter]
+                       [--is-restore-request {false, true}]
+                       [--key-uri]
+                       [--kind {GlobalDocumentDB, MongoDB, Parse}]
+                       [--locations]
+                       [--max-interval]
+                       [--max-staleness-prefix]
+                       [--restore-source]
+                       [--restore-timestamp]
+                       [--server-version {3.2, 3.6, 4.0}]
+                       [--tags]
+                       [--virtual-network-rules]
+  examples:
+  - summary: Create a new Azure Cosmos DB database account.
+    syntax: az cosmosdb create --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup --subscription MySubscription
+  - summary: Create a new Azure Cosmos DB database account with two regions. UK South is zone redundant.
+    syntax: az cosmosdb create -n myaccount -g mygroup --locations regionName=eastus failoverPriority=0 isZoneRedundant=False --locations regionName=uksouth failoverPriority=1 isZoneRedundant=True --enable-multiple-write-locations
+  - summary: Create a new Azure Cosmos DB database account by restoring from an existing account in the given location
+    syntax: az cosmosdb create -n restoredaccount -g mygroup --is-restore-request true --restore-source /subscriptions/2296c272-5d55-40d9-bc05-4d56dc2d7588/providers/Microsoft.DocumentDB/locations/westus/restorableDatabaseAccounts/d056a4f8-044a-436f-80c8-cd3edbc94c68 --restore-timestamp 2020-07-13T16:03:41+0000 --locations regionName=westus failoverPriority=0 isZoneRedundant=False
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-interval
+    summary: The frequency(in minutes) with which backups are taken (only for accounts with periodic mode backups).
+    description: ''
+  - name: --backup-policy-type
+    parameterValueGroup: Continuous, Periodic
+    summary: The type of backup policy of the account to create.
+    description: ''
+  - name: --backup-retention
+    summary: The time(in hours) for which each backup is retained (only for accounts with periodic mode backups).
+    description: ''
+  - name: --capabilities
+    summary: Set custom capabilities on the Cosmos DB database account.
+    description: ''
+  - name: --databases-to-restore
+    summary: Add a database and its collection names to restore.
+    description: 'Usage:          --databases-to-restore name=DatabaseName collections=collection1 [collection2 ...].'
+  - name: --default-consistency-level
+    parameterValueGroup: BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong
+    summary: Default consistency level of the Cosmos DB database account.
+    description: ''
+  - name: --disable-key-based-metadata-write-access
+    parameterValueGroup: false, true
+    summary: Disable write operations on metadata resources (databases, containers, throughput) via account keys.
+    description: ''
+  - name: --enable-analytical-storage
+    parameterValueGroup: false, true
+    summary: Flag to enable log storage on the account.
+    description: ''
+  - name: --enable-automatic-failover
+    parameterValueGroup: false, true
+    summary: Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.
+    description: ''
+  - name: --enable-free-tier
+    parameterValueGroup: false, true
+    summary: If enabled the account is free-tier.
+    description: ''
+  - name: --enable-multiple-write-locations
+    parameterValueGroup: false, true
+    summary: Enable Multiple Write Locations.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: Enable or disable public network access to server.
+    description: ''
+  - name: --enable-virtual-network
+    parameterValueGroup: false, true
+    summary: Enables virtual network on the Cosmos DB database account.
+    description: ''
+  - name: --ip-range-filter
+    summary: Firewall support. Specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma-separated and must not contain any spaces.
+    description: ''
+  - name: --is-restore-request -r
+    parameterValueGroup: false, true
+    summary: Restore from an existing/deleted account.
+    description: ''
+  - name: --key-uri
+    summary: The URI of the key vault.
+    description: ''
+  - name: --kind
+    defaultValue: GlobalDocumentDB
+    parameterValueGroup: GlobalDocumentDB, MongoDB, Parse
+    summary: The type of Cosmos DB database account to create.
+    description: ''
+  - name: --locations
+    summary: Add a location to the Cosmos DB database account.
+    description: >-
+      Usage:          --locations KEY=VALUE [KEY=VALUE ...]
+
+      Required Keys:  regionName, failoverPriority
+
+      Optional Key:   isZoneRedundant
+
+      Default:        single region account in the location of the specified resource group.
+
+      Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
+
+      Multiple locations can be specified by using more than one `--locations` argument.
+  - name: --max-interval
+    defaultValue: "5"
+    summary: When used with Bounded Staleness consistency, this value represents the time amount of staleness (in seconds) tolerated. Accepted range for this value is 1 - 100.
+    description: ''
+  - name: --max-staleness-prefix
+    defaultValue: "100"
+    summary: When used with Bounded Staleness consistency, this value represents the number of stale requests tolerated. Accepted range for this value is 1 - 2,147,483,647.
+    description: ''
+  - name: --restore-source
+    summary: The restorable-database-account Id of the source account from which the account has to be restored. Required if --is-restore-request is set to true.
+    description: ''
+  - name: --restore-timestamp
+    summary: The timestamp to which the account has to be restored to. Required if --is-restore-request is set to true.
+    description: ''
+  - name: --server-version
+    parameterValueGroup: 3.2, 3.6, 4.0
+    summary: Valid only for MongoDB accounts.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-network-rules
+    summary: ACL's for virtual network.
+    description: ''
+- uid: az_cosmosdb_list
+  name: az cosmosdb list
+  summary: List Azure Cosmos DB database accounts.
+  description: ''
+  syntax: az cosmosdb list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cosmosdb_restore
+  name: az cosmosdb restore
+  summary: Create a new Azure Cosmos DB database account by restoring from an existing database account.
+  description: ''
+  syntax: >-
+    az cosmosdb restore --account-name
+                        --location
+                        --resource-group
+                        --restore-timestamp
+                        --target-database-account-name
+                        [--databases-to-restore]
+  examples:
+  - summary: Create a new Azure Cosmos DB database account by restoring from an existing database account.
+    syntax: az cosmosdb restore --target-database-account-name MyRestoredCosmosDBDatabaseAccount --account-name MySourceAccount --restore-timestamp 2020-07-13T16:03:41+0000 -g MyResourceGroup --location westus
+  - summary: Create a new Azure Cosmos DB database account by restoring only the selected databases and collections from an existing database account.
+    syntax: az cosmosdb restore -g MyResourceGroup --target-database-account-name MyRestoredCosmosDBDatabaseAccount --account-name MySourceAccount --restore-timestamp 2020-07-13T16:03:41+0000 --location westus --databases-to-restore name=MyDB1 collections=collection1 collection2 --databases-to-restore name=MyDB2 collections=collection3 collection4
+  requiredParameters:
+  - isRequired: true
+    name: --account-name -a
+    summary: Name of the source Cosmos DB database account for the restore.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: The location of the source account from which restore is triggered. This will also be the write region of the restored account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp to which the account has to be restored to.
+    description: ''
+  - isRequired: true
+    name: --target-database-account-name -n
+    summary: Name of the new target Cosmos DB database account after the restore.
+    description: ''
+  optionalParameters:
+  - name: --databases-to-restore
+    summary: Add a database and its collection names to restore.
+    description: >-
+      Usage:          --databases-to-restore name=DatabaseName collections=collection1 [collection2 ...]
+
+      Multiple databases can be specified by using more than one `--databases-to-restore` argument.
+- uid: az_cosmosdb_show
+  name: az cosmosdb show
+  summary: Get the details of an Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb show --name
+                     --resource-group
+  examples:
+  - summary: Get the details of an Azure Cosmos DB database account. (autogenerated)
+    syntax: az cosmosdb show --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_cosmosdb_update
+  name: az cosmosdb update
+  summary: Update an Azure Cosmos DB database account.
+  description: ''
+  syntax: >-
+    az cosmosdb update --name
+                       --resource-group
+                       [--backup-interval]
+                       [--backup-retention]
+                       [--capabilities]
+                       [--default-consistency-level {BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong}]
+                       [--disable-key-based-metadata-write-access {false, true}]
+                       [--enable-analytical-storage {false, true}]
+                       [--enable-automatic-failover {false, true}]
+                       [--enable-multiple-write-locations {false, true}]
+                       [--enable-public-network {false, true}]
+                       [--enable-virtual-network {false, true}]
+                       [--ip-range-filter]
+                       [--locations]
+                       [--max-interval]
+                       [--max-staleness-prefix]
+                       [--tags]
+                       [--virtual-network-rules]
+  examples:
+  - summary: Update an Azure Cosmos DB database account.
+    syntax: az cosmosdb update --capabilities EnableGremlin --name MyCosmosDBDatabaseAccount --resource-group MyResourceGroup
+  - summary: Update an new Azure Cosmos DB database account with two regions. UK South is zone redundant.
+    syntax: az cosmosdb update -n myaccount -g mygroup --locations regionName=eastus failoverPriority=0 isZoneRedundant=False --locations regionName=uksouth failoverPriority=1 isZoneRedundant=True --enable-multiple-write-locations
+  - summary: Update the backup policy parameters of a database account with Periodic backup type.
+    syntax: az cosmosdb update -n myaccount -g mygroup --backup-interval 240 --backup-retention 24
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Cosmos DB database account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --backup-interval
+    summary: The frequency(in minutes) with which backups are taken (only for accounts with periodic mode backups).
+    description: ''
+  - name: --backup-retention
+    summary: The time(in hours) for which each backup is retained (only for accounts with periodic mode backups).
+    description: ''
+  - name: --capabilities
+    summary: Set custom capabilities on the Cosmos DB database account.
+    description: ''
+  - name: --default-consistency-level
+    parameterValueGroup: BoundedStaleness, ConsistentPrefix, Eventual, Session, Strong
+    summary: Default consistency level of the Cosmos DB database account.
+    description: ''
+  - name: --disable-key-based-metadata-write-access
+    parameterValueGroup: false, true
+    summary: Disable write operations on metadata resources (databases, containers, throughput) via account keys.
+    description: ''
+  - name: --enable-analytical-storage
+    parameterValueGroup: false, true
+    summary: Flag to enable log storage on the account.
+    description: ''
+  - name: --enable-automatic-failover
+    parameterValueGroup: false, true
+    summary: Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.
+    description: ''
+  - name: --enable-multiple-write-locations
+    parameterValueGroup: false, true
+    summary: Enable Multiple Write Locations.
+    description: ''
+  - name: --enable-public-network -e
+    parameterValueGroup: false, true
+    summary: Enable or disable public network access to server.
+    description: ''
+  - name: --enable-virtual-network
+    parameterValueGroup: false, true
+    summary: Enables virtual network on the Cosmos DB database account.
+    description: ''
+  - name: --ip-range-filter
+    summary: Firewall support. Specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma-separated and must not contain any spaces.
+    description: ''
+  - name: --locations
+    summary: Add a location to the Cosmos DB database account.
+    description: >-
+      Usage:          --locations KEY=VALUE [KEY=VALUE ...]
+
+      Required Keys:  regionName, failoverPriority
+
+      Optional Key:   isZoneRedundant
+
+      Default:        single region account in the location of the specified resource group.
+
+      Failover priority values are 0 for write regions and greater than 0 for read regions. A failover priority value must be unique and less than the total number of regions.
+
+      Multiple locations can be specified by using more than one `--locations` argument.
+  - name: --max-interval
+    summary: When used with Bounded Staleness consistency, this value represents the time amount of staleness (in seconds) tolerated. Accepted range for this value is 1 - 100.
+    description: ''
+  - name: --max-staleness-prefix
+    summary: When used with Bounded Staleness consistency, this value represents the number of stale requests tolerated. Accepted range for this value is 1 - 2,147,483,647.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --virtual-network-rules
+    summary: ACL's for virtual network.
+    description: ''
+commands:
+- az_cosmosdb_create
+- az_cosmosdb_list
+- az_cosmosdb_mongodb
+- az_cosmosdb_mongodb_restorable-collection
+- az_cosmosdb_mongodb_restorable-collection_list
+- az_cosmosdb_mongodb_restorable-database
+- az_cosmosdb_mongodb_restorable-database_list
+- az_cosmosdb_mongodb_restorable-resource
+- az_cosmosdb_mongodb_restorable-resource_list
+- az_cosmosdb_restorable-database-account
+- az_cosmosdb_restorable-database-account_list
+- az_cosmosdb_restorable-database-account_show
+- az_cosmosdb_restore
+- az_cosmosdb_show
+- az_cosmosdb_sql
+- az_cosmosdb_sql_restorable-container
+- az_cosmosdb_sql_restorable-container_list
+- az_cosmosdb_sql_restorable-database
+- az_cosmosdb_sql_restorable-database_list
+- az_cosmosdb_sql_restorable-resource
+- az_cosmosdb_sql_restorable-resource_list
+- az_cosmosdb_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure Cosmos DB database accounts.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb.yml
new file mode 100644
index 0000000000..610b76c9fd
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb
+name: az cosmosdb mongodb
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage MongoDB resources of Azure Cosmos DB account.
+description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-collection
+- az_cosmosdb_mongodb_restorable-collection_list
+- az_cosmosdb_mongodb_restorable-database
+- az_cosmosdb_mongodb_restorable-database_list
+- az_cosmosdb_mongodb_restorable-resource
+- az_cosmosdb_mongodb_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage MongoDB resources of Azure Cosmos DB account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml
new file mode 100644
index 0000000000..2374ca024c
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-collection.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-collection
+name: az cosmosdb mongodb restorable-collection
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-collection** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of mongodb collections that are restorable in a database of a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-collection_list
+  name: az cosmosdb mongodb restorable-collection list
+  summary: List all the versions of all the mongodb collections that were created / modified / deleted in the given database and restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-collection list --database-rid
+                                                   --instance-id
+                                                   --location
+  requiredParameters:
+  - isRequired: true
+    name: --database-rid -d
+    summary: Rid of the database.
+    description: ''
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-collection_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of mongodb collections that are restorable in a database of a Azure Cosmos DB account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml
new file mode 100644
index 0000000000..181857de0d
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-database.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-database
+name: az cosmosdb mongodb restorable-database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of mongodb databases that are restorable in a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-database_list
+  name: az cosmosdb mongodb restorable-database list
+  summary: List all the versions of all the mongodb databases that were created / modified / deleted in the given restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-database list --instance-id
+                                                 --location
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-database_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of mongodb databases that are restorable in a Azure Cosmos DB account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml
new file mode 100644
index 0000000000..2918518898
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/mongodb/restorable-resource.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_mongodb_restorable-resource
+name: az cosmosdb mongodb restorable-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb mongodb restorable-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the databases and its collections that can be restored in the given account at the given timesamp and region.
+description: ''
+directCommands:
+- uid: az_cosmosdb_mongodb_restorable-resource_list
+  name: az cosmosdb mongodb restorable-resource list
+  summary: List all the databases and its collections that can be restored in the given account at the given timesamp and region.
+  description: ''
+  syntax: >-
+    az cosmosdb mongodb restorable-resource list --instance-id
+                                                 --location
+                                                 --restore-location
+                                                 --restore-timestamp
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the account.
+    description: ''
+  - isRequired: true
+    name: --restore-location -r
+    summary: The region of the restore.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp of the restore.
+    description: ''
+commands:
+- az_cosmosdb_mongodb_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the databases and its collections that can be restored in the given account at the given timesamp and region.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/restorable-database-account.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/restorable-database-account.yml
new file mode 100644
index 0000000000..ad67088e6d
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/restorable-database-account.yml
@@ -0,0 +1,58 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_restorable-database-account
+name: az cosmosdb restorable-database-account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb restorable-database-account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage restorable Azure Cosmos DB accounts.
+description: ''
+directCommands:
+- uid: az_cosmosdb_restorable-database-account_list
+  name: az cosmosdb restorable-database-account list
+  summary: List all the database accounts that can be restored.
+  description: ''
+  syntax: >-
+    az cosmosdb restorable-database-account list [--account-name]
+                                                 [--location]
+  optionalParameters:
+  - name: --account-name -n
+    summary: Name of the Account.
+    description: ''
+  - name: --location -l
+    summary: Location.
+    description: ''
+- uid: az_cosmosdb_restorable-database-account_show
+  name: az cosmosdb restorable-database-account show
+  summary: Show the details of a database account that can be restored.
+  description: ''
+  syntax: >-
+    az cosmosdb restorable-database-account show [--instance-id]
+                                                 [--location]
+  optionalParameters:
+  - name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_restorable-database-account_list
+- az_cosmosdb_restorable-database-account_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage restorable Azure Cosmos DB accounts.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql.yml
new file mode 100644
index 0000000000..05446094e9
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql.yml
@@ -0,0 +1,33 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql
+name: az cosmosdb sql
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage SQL resources of Azure Cosmos DB account.
+description: ''
+commands:
+- az_cosmosdb_sql_restorable-container
+- az_cosmosdb_sql_restorable-container_list
+- az_cosmosdb_sql_restorable-database
+- az_cosmosdb_sql_restorable-database_list
+- az_cosmosdb_sql_restorable-resource
+- az_cosmosdb_sql_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage SQL resources of Azure Cosmos DB account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-container.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-container.yml
new file mode 100644
index 0000000000..02728ebe76
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-container.yml
@@ -0,0 +1,50 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-container
+name: az cosmosdb sql restorable-container
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-container** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of sql containers that are restorable in a database of a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-container_list
+  name: az cosmosdb sql restorable-container list
+  summary: List all the versions of all the sql containers that were created / modified / deleted in the given database and restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-container list --database-rid
+                                              --instance-id
+                                              --location
+  requiredParameters:
+  - isRequired: true
+    name: --database-rid -d
+    summary: Rid of the database.
+    description: ''
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-container_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of sql containers that are restorable in a database of a Azure Cosmos DB account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-database.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-database.yml
new file mode 100644
index 0000000000..69996d747a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-database.yml
@@ -0,0 +1,45 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-database
+name: az cosmosdb sql restorable-database
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-database** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage different versions of sql databases that are restorable in a Azure Cosmos DB account.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-database_list
+  name: az cosmosdb sql restorable-database list
+  summary: List all the versions of all the sql databases that were created / modified / deleted in the given restorable account.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-database list --instance-id
+                                             --location
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Location.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-database_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage different versions of sql databases that are restorable in a Azure Cosmos DB account.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml
new file mode 100644
index 0000000000..63c1c845e3
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/cosmosdb/sql/restorable-resource.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_cosmosdb_sql_restorable-resource
+name: az cosmosdb sql restorable-resource
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **cosmosdb-preview** extension for Azure CLI and requires version 2.17.1 or higher.  The extension will automatically install the first time you run an **az cosmosdb sql restorable-resource** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage the databases and its containers that can be restored in the given account at the given timesamp and region.
+description: ''
+directCommands:
+- uid: az_cosmosdb_sql_restorable-resource_list
+  name: az cosmosdb sql restorable-resource list
+  summary: List all the databases and its containers that can be restored in the given account at the given timesamp and region.
+  description: ''
+  syntax: >-
+    az cosmosdb sql restorable-resource list --instance-id
+                                             --location
+                                             --restore-location
+                                             --restore-timestamp
+  requiredParameters:
+  - isRequired: true
+    name: --instance-id -i
+    summary: InstanceId of the Account.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: Azure Location of the account.
+    description: ''
+  - isRequired: true
+    name: --restore-location -r
+    summary: The region of the restore.
+    description: ''
+  - isRequired: true
+    name: --restore-timestamp -t
+    summary: The timestamp of the restore.
+    description: ''
+commands:
+- az_cosmosdb_sql_restorable-resource_list
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage the databases and its containers that can be restored in the given account at the given timesamp and region.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/costmanagement.yml b/2019-03-01-hybrid/docs-ref-autogen/costmanagement.yml
new file mode 100644
index 0000000000..0384019aa3
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/costmanagement.yml
@@ -0,0 +1,92 @@
+### YamlMime:AzureCLIGroup
+uid: az_costmanagement
+name: az costmanagement
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **costmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az costmanagement** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage cost and billing in Azure.
+description: ''
+directCommands:
+- uid: az_costmanagement_query
+  name: az costmanagement query
+  summary: Query the usage data for scope defined.
+  description: ''
+  syntax: >-
+    az costmanagement query --scope
+                            --timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}
+                            --type {ActualCost, AmortizedCost, Usage}
+                            [--dataset-aggregation]
+                            [--dataset-configuration]
+                            [--dataset-filter]
+                            [--dataset-grouping]
+                            [--time-period]
+  examples:
+  - summary: Query in ManagementGroup scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
+  - summary: Query in ManagementGroupQuery scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "providers/Microsoft.Management/managementGroups/MyMgId"
+  - summary: Query in a ResourceGroup scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
+  - summary: Query in a ResourceGroupQuery scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceType" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ScreenSharingTest-peer"
+  - summary: Query in a Subscription scope
+    syntax: az costmanagement query --type "Usage" --dataset-filter "{\"and\":[{\"or\":[{\"dimension\":{\"name\":\"ResourceLocation\",\"operator\":\"In\",\"values\":[\"East US\",\"West Europe\"]}},{\"tag\":{\"name\":\"Environment\",\"operator\":\"In\",\"values\":[\"UAT\",\"Prod\"]}}]},{\"dimension\":{\"name\":\"ResourceGroup\",\"operator\":\"In\",\"values\":[\"API\"]}}]}" --timeframe "MonthToDate" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  - summary: Query in a Subscription scope via grouping
+    syntax: az costmanagement query --type "Usage" --dataset-aggregation "{\"totalCost\":{\"name\":\"PreTaxCost\",\"function\":\"Sum\"}}" --dataset-grouping name="ResourceGroup" type="Dimension" --timeframe "TheLastMonth" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes "/subscriptions/{subscriptionId}/" for subscription scope, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}" for resourceGroup scope, "/providers/Microsoft.Management/managementGroups/{managementGroupId}" for Management Group scope.
+    description: ''
+  - isRequired: true
+    name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query.If custom, then a specific time period must be provided.
+    description: ''
+  - isRequired: true
+    name: --type
+    parameterValueGroup: ActualCost, AmortizedCost, Usage
+    summary: The type of the query.
+    description: ''
+  optionalParameters:
+  - name: --dataset-aggregation
+    summary: 'Dictionary of aggregation expression to use in the query. The key of each item in the dictionary is the aliasfor the aggregated column. Query can have up to 2 aggregation clauses. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-filter
+    summary: 'Has filter expression to use in the query. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses.Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.'
+    description: ''
+commands:
+- az_costmanagement_export
+- az_costmanagement_export_create
+- az_costmanagement_export_delete
+- az_costmanagement_export_list
+- az_costmanagement_export_show
+- az_costmanagement_export_update
+- az_costmanagement_query
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage cost and billing in Azure.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/costmanagement/export.yml b/2019-03-01-hybrid/docs-ref-autogen/costmanagement/export.yml
new file mode 100644
index 0000000000..05d49aa1e2
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/costmanagement/export.yml
@@ -0,0 +1,243 @@
+### YamlMime:AzureCLIGroup
+uid: az_costmanagement_export
+name: az costmanagement export
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **costmanagement** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az costmanagement export** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Costmanagement export.
+description: ''
+directCommands:
+- uid: az_costmanagement_export_create
+  name: az costmanagement export create
+  summary: The operation to create an export.
+  description: ''
+  syntax: >-
+    az costmanagement export create --name
+                                    --scope
+                                    --storage-account-id
+                                    --storage-container
+                                    --timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}
+                                    [--dataset-configuration]
+                                    [--dataset-grouping]
+                                    [--recurrence {Annually, Daily, Monthly, Weekly}]
+                                    [--recurrence-period]
+                                    [--schedule-status {Active, Inactive}]
+                                    [--storage-directory]
+                                    [--time-period]
+                                    [--type {ActualCost, AmortizedCost, Usage}]
+  examples:
+  - summary: Create an export for ManagementGroup scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Create an export for ResourceGroup scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Create an export for Subscription scope
+    syntax: az costmanagement export create --name "TestExport" --type "Usage" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  - isRequired: true
+    name: --storage-account-id
+    summary: The ID of the storage account to store exports.
+    description: ''
+  - isRequired: true
+    name: --storage-container
+    summary: The storage container to deliver exports.
+    description: ''
+  - isRequired: true
+    name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
+    description: ''
+  optionalParameters:
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --recurrence
+    parameterValueGroup: Annually, Daily, Monthly, Weekly
+    summary: The schedule recurrence.
+    description: ''
+  - name: --recurrence-period
+    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
+    description: ''
+  - name: --schedule-status
+    parameterValueGroup: Active, Inactive
+    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
+    description: ''
+  - name: --storage-directory
+    summary: The root directory in the storage container to store exports.
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
+    description: ''
+  - name: --type
+    parameterValueGroup: ActualCost, AmortizedCost, Usage
+    summary: The type of the query.
+    description: ''
+- uid: az_costmanagement_export_delete
+  name: az costmanagement export delete
+  summary: The operation to delete an export.
+  description: ''
+  syntax: >-
+    az costmanagement export delete --name
+                                    --scope
+                                    [--yes]
+  examples:
+  - summary: delete an export for a ManagementGroup scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: delete an export for ResourceGroup scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: delete an export for Subscription scope
+    syntax: az costmanagement export delete --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_costmanagement_export_list
+  name: az costmanagement export list
+  summary: The operation to list all exports at the given scope.
+  description: ''
+  syntax: az costmanagement export list --scope
+  examples:
+  - summary: list exports in a ManagementGroup scope
+    syntax: az costmanagement export list --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: list exports in a ResourceGroup scope
+    syntax: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: list exports in a Subscription scope
+    syntax: az costmanagement export list --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+- uid: az_costmanagement_export_show
+  name: az costmanagement export show
+  summary: The operation to get the execution history of an export for the defined scope by export name.
+  description: ''
+  syntax: >-
+    az costmanagement export show --name
+                                  --scope
+  examples:
+  - summary: Show an export in a ManagementGroup scope
+    syntax: az costmanagement export show --name "TestExport" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Show an export in a ResourceGroup scope
+    syntax: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Show an export in a Subscription scope
+    syntax: az costmanagement export show --name "TestExport" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+- uid: az_costmanagement_export_update
+  name: az costmanagement export update
+  summary: The operation to update an export.
+  description: ''
+  syntax: >-
+    az costmanagement export update --name
+                                    --scope
+                                    [--dataset-configuration]
+                                    [--dataset-grouping]
+                                    [--recurrence {Annually, Daily, Monthly, Weekly}]
+                                    [--recurrence-period]
+                                    [--schedule-status {Active, Inactive}]
+                                    [--storage-account-id]
+                                    [--storage-container]
+                                    [--storage-directory]
+                                    [--time-period]
+                                    [--timeframe {BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate}]
+  examples:
+  - summary: Update an export in a ManagementGroup scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "providers/Microsoft.Management/managementGroups/TestMG"
+  - summary: Update an export in a ResourceGroup scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG"
+  - summary: Update an export in a Subscription scope
+    syntax: az costmanagement export update --name "TestExport" --dataset-configuration columns="Date" columns="MeterId" columns="InstanceId" columns="ResourceLocation" columns="PreTaxCost" --dataset-grouping name="SubscriptionName" type="Dimension" --dataset-grouping name="Environment" type="Tag" --timeframe "MonthToDate" --storage-container="exports" --storage-account-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MYDEVTESTRG/providers/Microsoft.Storage/storageAccounts/ccmeastusdiag182" --storage-directory="ad-hoc" --recurrence "Weekly" --recurrence-period from="2018-06-01T00:00:00Z" to="2018-10-31T00:00:00Z" --schedule-status "Active" --scope "subscriptions/00000000-0000-0000-0000-000000000000"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: Export Name.
+    description: ''
+  - isRequired: true
+    name: --scope
+    summary: The scope associated with query and export operations. This includes '/subscriptions/{subscriptionId}/' for subscription scope, '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}' for resourceGroup scope, '/providers/Microsoft.Management/managementGroups/{managementGroupId} for Management Group scope.
+    description: ''
+  optionalParameters:
+  - name: --dataset-configuration
+    summary: 'Has configuration information for the data in the export. The configuration will be ignored if aggregation and grouping are provided. Expect value: columns=xx.'
+    description: ''
+  - name: --dataset-grouping
+    summary: 'Array of group by expression to use in the query. Query can have up to 2 group by clauses. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: type, name.'
+    description: ''
+  - name: --recurrence
+    parameterValueGroup: Annually, Daily, Monthly, Weekly
+    summary: The schedule recurrence.
+    description: ''
+  - name: --recurrence-period
+    summary: 'Has start and end date of the recurrence. The start date must be in future. If present, the end date must be greater than start date. Expect value: KEY1=VALUE1 KEY2=VALUE2 ... , available KEYs are: from, to. The time format is like 2020-05-01T00:00:00.'
+    description: ''
+  - name: --schedule-status
+    parameterValueGroup: Active, Inactive
+    summary: The status of the schedule.Whether active or not. If inactive, the export's scheduled execution is paused.
+    description: ''
+  - name: --storage-account-id
+    summary: The ID of the storage account to store exports.
+    description: ''
+  - name: --storage-container
+    summary: The storage container to deliver exports.
+    description: ''
+  - name: --storage-directory
+    summary: The root directory in the storage container to store exports.
+    description: ''
+  - name: --time-period
+    summary: 'Has time period for pulling data for the query. Expect value: from=TIMESTAMP1 to=TIMESTAMP2. The timestamp format is like 2020-05-01T00:00:00.The TIMESTAMP1 must in the future and TIMESTAMP2 must be greater than TIMESTAMP1.'
+    description: ''
+  - name: --timeframe
+    parameterValueGroup: BillingMonthToDate, Custom, MonthToDate, TheLastBillingMonth, TheLastMonth, WeekToDate
+    summary: The time frame for pulling data for the query. If custom, then a specific time period must be provided.
+    description: ''
+commands:
+- az_costmanagement_export_create
+- az_costmanagement_export_delete
+- az_costmanagement_export_list
+- az_costmanagement_export_show
+- az_costmanagement_export_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Costmanagement export.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware.yml
new file mode 100644
index 0000000000..2404aeb9bf
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware.yml
@@ -0,0 +1,57 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware
+name: az csvmware
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure VMware Solution by CloudSimple.
+description: ''
+commands:
+- az_csvmware_private-cloud
+- az_csvmware_private-cloud_list
+- az_csvmware_private-cloud_show
+- az_csvmware_resource-pool
+- az_csvmware_resource-pool_list
+- az_csvmware_resource-pool_show
+- az_csvmware_virtual-network
+- az_csvmware_virtual-network_list
+- az_csvmware_virtual-network_show
+- az_csvmware_vm
+- az_csvmware_vm_create
+- az_csvmware_vm_delete
+- az_csvmware_vm_disk
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+- az_csvmware_vm_list
+- az_csvmware_vm_nic
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+- az_csvmware_vm_show
+- az_csvmware_vm_start
+- az_csvmware_vm_stop
+- az_csvmware_vm_update
+- az_csvmware_vm-template
+- az_csvmware_vm-template_list
+- az_csvmware_vm-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure VMware Solution by CloudSimple.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/private-cloud.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/private-cloud.yml
new file mode 100644
index 0000000000..fafa42ad1e
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/private-cloud.yml
@@ -0,0 +1,62 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_private-cloud
+name: az csvmware private-cloud
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware private-cloud** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware private clouds.
+description: ''
+directCommands:
+- uid: az_csvmware_private-cloud_list
+  name: az csvmware private-cloud list
+  summary: List details of private clouds in a region.
+  description: ''
+  syntax: az csvmware private-cloud list --location
+  examples:
+  - summary: List details of private clouds in East US.
+    syntax: az csvmware private-cloud list --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+- uid: az_csvmware_private-cloud_show
+  name: az csvmware private-cloud show
+  summary: Get the details of a private cloud in a region.
+  description: ''
+  syntax: >-
+    az csvmware private-cloud show --location
+                                   --name
+  examples:
+  - summary: Get the details of a private cloud which is in East US.
+    syntax: az csvmware private-cloud show -n MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_private-cloud_list
+- az_csvmware_private-cloud_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware private clouds.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/resource-pool.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/resource-pool.yml
new file mode 100644
index 0000000000..64acdc496e
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/resource-pool.yml
@@ -0,0 +1,73 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_resource-pool
+name: az csvmware resource-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware resource-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware resource pools.
+description: ''
+directCommands:
+- uid: az_csvmware_resource-pool_list
+  name: az csvmware resource-pool list
+  summary: List details of resource pools in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware resource-pool list --location
+                                   --private-cloud
+  examples:
+  - summary: List details of resource pools.
+    syntax: az csvmware resource-pool list -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+- uid: az_csvmware_resource-pool_show
+  name: az csvmware resource-pool show
+  summary: Get the details of a resource pool in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware resource-pool show --location
+                                   --name
+                                   --private-cloud
+  examples:
+  - summary: Get the details of a resource pool.
+    syntax: az csvmware resource-pool show -n MyResourcePool -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_resource-pool_list
+- az_csvmware_resource-pool_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware resource pools.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/virtual-network.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/virtual-network.yml
new file mode 100644
index 0000000000..f9864b1582
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/virtual-network.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_virtual-network
+name: az csvmware virtual-network
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware virtual-network** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage virtual networks.
+description: ''
+directCommands:
+- uid: az_csvmware_virtual-network_list
+  name: az csvmware virtual-network list
+  summary: List details of available virtual networks in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware virtual-network list --location
+                                     --private-cloud
+                                     --resource-pool
+  examples:
+  - summary: List details of virtual networks.
+    syntax: az csvmware virtual-network list -p MyPrivateCloud -r MyResourcePool --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the resource pool used to derive vSphere cluster which contains virtual networks. You can also pass the basename of the ID.
+    description: ''
+- uid: az_csvmware_virtual-network_show
+  name: az csvmware virtual-network show
+  summary: Get the details of a virtual network in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware virtual-network show --location
+                                     --name
+                                     --private-cloud
+  examples:
+  - summary: Get the details of a virtual network.
+    syntax: az csvmware virtual-network show -n MyVirtualNetwork -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the virtual network (vsphereId). You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_virtual-network_list
+- az_csvmware_virtual-network_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage virtual networks.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm-template.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm-template.yml
new file mode 100644
index 0000000000..dc1b6e9950
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm-template.yml
@@ -0,0 +1,78 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm-template
+name: az csvmware vm-template
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm-template** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine templates.
+description: ''
+directCommands:
+- uid: az_csvmware_vm-template_list
+  name: az csvmware vm-template list
+  summary: List details of VMware virtual machines templates in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware vm-template list --location
+                                 --private-cloud
+                                 --resource-pool
+  examples:
+  - summary: List details of VM templates.
+    syntax: az csvmware vm-template list -p MyPrivateCloud -r MyResourcePool --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the VMware resource pool in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+- uid: az_csvmware_vm-template_show
+  name: az csvmware vm-template show
+  summary: Get the details of a VMware virtual machines template in a private cloud.
+  description: ''
+  syntax: >-
+    az csvmware vm-template show --location
+                                 --name
+                                 --private-cloud
+  examples:
+  - summary: Get the details of a VM template.
+    syntax: az csvmware vm-template show  -n MyVmTemplate -p MyPrivateCloud --location eastus
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: Region in which the private cloud is present.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: ID of the vSphere virtual machine template. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+commands:
+- az_csvmware_vm-template_list
+- az_csvmware_vm-template_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine templates.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm.yml
new file mode 100644
index 0000000000..d3f8af1364
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm.yml
@@ -0,0 +1,277 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm
+name: az csvmware vm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machines.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_create
+  name: az csvmware vm create
+  summary: Create a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm create --name
+                          --private-cloud
+                          --resource-group
+                          --resource-pool
+                          --template
+                          [--cores]
+                          [--disk]
+                          [--expose-to-guest-vm {false, true}]
+                          [--location]
+                          [--nic]
+                          [--ram]
+  examples:
+  - summary: Creating a VM with default parameters from the vm template.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate
+  - summary: Creating a VM and adding an extra nic to the VM with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot. The name entered in the nic is for identification purposes only, to see if such a nic name exists in the vm template, else a nic is created and a new name is assigned. Lets say the vm template contains a nic with name "Network adapter 1".
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
+  - summary: Customizing specific properties of a VM. Changing the number of cores to 2 and adapter of "Network adapter 1" nic to E1000E, from that specified in the template. All other properties would be defaulted from the template.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --cores 2 --nic name="Network adapter 1" adapter=E1000E
+  - summary: Customizing specific properties of a VM. Changing the adapter of "Network adapter 1" nic to E1000E, from that specified in the template, and also adding another nic with virtual network MyVirtualNetwork, adapter VMXNET3, that power ups on boot.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --nic name="Network adapter 1" adapter=E1000E --nic name=NicNameWouldBeAssigned virtual-network=MyVirtualNetwork adapter=VMXNET3 power-on-boot=True
+  - summary: Creating a VM and adding an extra disk to the VM with SCSI controller 0, persistent mode, and 41943040 KB size. The name entered in the disk is for identification purposes only, to see if such a disk name exists in the vm template, else a disk is created and a new name is assigned. Lets say the vm template contains a disk with name "Hard disk 1".
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
+  - summary: Customizing specific properties of a VM. Changing the size of "Hard disk 1" disk to 21943040 KB, from that specified in the template, and also adding another disk with SCSI controller 0, persistent mode, and 41943040 KB size.
+    syntax: az csvmware vm create -n MyVm -g MyResourceGroup -p MyPrivateCloud -r MyResourcePool --template MyVmTemplate --disk name="Hard disk 1" size=21943040 --disk name=DiskNameWouldBeAssigned controller=1000 mode=persistent size=41943040
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --private-cloud -p
+    summary: Name or ID of the CloudSimple private cloud.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --resource-pool -r
+    summary: ID of the VMware resource pool for this virtual machine in your CloudSimple Private Cloud. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --template
+    summary: ID of the vSphere template from which this virtual machine will be created. You can also pass the basename of the ID.
+    description: ''
+  optionalParameters:
+  - name: --cores
+    summary: The number of CPU cores required. The default is taken from the vSphere VM template specified.
+    description: ''
+  - name: --disk
+    summary: Add or modify disks.
+    description: >-
+      By default, the disks will be added according to the vSphere VM template.
+
+      You can add more disks, or modify some properties of a disk specified in the VM template.
+
+      Multiple disks can be specified by using more than one `--disk` argument.
+
+      If a disk name already exists in the VM template, that disk would be modified according to the user input.
+
+      If a disk name does not exist in the VM template, a new disk would be created and a new name will be assigned to it.
+
+      Usage:   --disk name=MyDiskName controller=SCSIControllerID mode=IndependenceMode size=DiskSizeInKB.
+  - name: --expose-to-guest-vm
+    parameterValueGroup: false, true
+    summary: Will expose full CPU virtualization to the guest operating system. The default is taken from the vSphere VM template specified.
+    description: ''
+  - name: --location -l
+    summary: Region in which the private cloud is present. If default location is not configured, will default to the resource group's location.
+    description: ''
+  - name: --nic
+    summary: Add or modify NICs.
+    description: >-
+      By default, the nics will be added according to the vSphere VM template.
+
+      You can add more nics, or modify some properties of a nic specified in the VM template.
+
+      Multiple nics can be specified by using more than one `--nic` argument.
+
+      If a nic name already exists in the VM template, that nic would be modified according to the user input.
+
+      If a nic name does not exist in the VM template, a new nic would be created and a new name will be assigned to it.
+
+      Usage:   --nic name=MyNicName virtual-network=MyNetwork adapter=MyAdapter power-on-boot=True/False.
+  - name: --ram
+    summary: The amount of memory in MB. The default is taken from the vSphere VM template specified.
+    description: ''
+- uid: az_csvmware_vm_delete
+  name: az csvmware vm delete
+  summary: Delete a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm delete --name
+                          --resource-group
+  examples:
+  - summary: Delete a VMware VM.
+    syntax: az csvmware vm delete -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_list
+  name: az csvmware vm list
+  summary: List details of VMware virtual machines in the current subscription. If resource group is specified, only the details of virtual machines in that resource group would be listed.
+  description: ''
+  syntax: az csvmware vm list [--resource-group]
+  examples:
+  - summary: List details of VMware VMs in the current subscription.
+    syntax: az csvmware vm list
+  - summary: List details of VMware VMs in a particular resource group.
+    syntax: az csvmware vm list -g MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_show
+  name: az csvmware vm show
+  summary: Get the details of a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm show --name
+                        --resource-group
+  examples:
+  - summary: Get the details of a VMware VM.
+    syntax: az csvmware vm show -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_start
+  name: az csvmware vm start
+  summary: Start a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm start --name
+                         --resource-group
+  examples:
+  - summary: Start a VMware VM.
+    syntax: az csvmware vm start -n MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_stop
+  name: az csvmware vm stop
+  summary: Stop/Reboot/Suspend a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm stop --mode {poweroff, reboot, shutdown, suspend}
+                        --name
+                        --resource-group
+  examples:
+  - summary: Power off a VMware VM.
+    syntax: az csvmware vm stop -n MyVm -g MyResourceGroup --mode poweroff
+  - summary: Restart a VMware VM.
+    syntax: az csvmware vm stop -n MyVm -g MyResourceGroup --mode reboot
+  requiredParameters:
+  - isRequired: true
+    name: --mode
+    parameterValueGroup: poweroff, reboot, shutdown, suspend
+    summary: Stop mode.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_csvmware_vm_update
+  name: az csvmware vm update
+  summary: Update the tags field of a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm update --name
+                          --resource-group
+                          [--add]
+                          [--force-string]
+                          [--no-wait]
+                          [--remove]
+                          [--set]
+  examples:
+  - summary: Add or update a tag.
+    syntax: az csvmware vm update -n MyVm -g MyResourceGroup --set tags.tagName=tagValue
+  - summary: Remove a tag.
+    syntax: az csvmware vm update -n MyVm -g MyResourceGroup --remove tags.tagName
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the virtual machine.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_csvmware_vm_create
+- az_csvmware_vm_delete
+- az_csvmware_vm_disk
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+- az_csvmware_vm_list
+- az_csvmware_vm_nic
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+- az_csvmware_vm_show
+- az_csvmware_vm_start
+- az_csvmware_vm_stop
+- az_csvmware_vm_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machines.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm/disk.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm/disk.yml
new file mode 100644
index 0000000000..c32b9254ef
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm/disk.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm_disk
+name: az csvmware vm disk
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm disk** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine's disks.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_disk_add
+  name: az csvmware vm disk add
+  summary: Add disk to a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm disk add --resource-group
+                            --vm-name
+                            [--controller]
+                            [--mode {independent_nonpersistent, independent_persistent, persistent}]
+                            [--size]
+  examples:
+  - summary: Add a disk with default parameters in a VM.
+    syntax: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup
+  - summary: Add a disk with SATA controller 0 and 64 GB memory in a VM.
+    syntax: az csvmware vm disk add --vm-name MyVm -g MyResourceGroup --controller 15000 --size 67108864
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --controller
+    defaultValue: "1000"
+    summary: Id of the controller. Input 1000 for SCSI controller 0, and 15000 for SATA controller 0.
+    description: ''
+  - name: --mode
+    defaultValue: persistent
+    parameterValueGroup: independent_nonpersistent, independent_persistent, persistent
+    summary: The disk independence mode.
+    description: ''
+  - name: --size
+    defaultValue: "16777216"
+    summary: The amount of disk size in KB.
+    description: ''
+- uid: az_csvmware_vm_disk_delete
+  name: az csvmware vm disk delete
+  summary: Delete disks from a VM.
+  description: ''
+  syntax: >-
+    az csvmware vm disk delete --disks
+                               --resource-group
+                               --vm-name
+  examples:
+  - summary: Delete two disks from a VM.
+    syntax: az csvmware vm disk delete --vm-name MyVm -g MyResourceGroup --disks "My Disk Name 1" "My Disk Name 2"
+  requiredParameters:
+  - isRequired: true
+    name: --disks
+    summary: Names of disks.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_disk_list
+  name: az csvmware vm disk list
+  summary: List details of disks available on a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm disk list --resource-group
+                             --vm-name
+  examples:
+  - summary: List details of disks in a VM.
+    syntax: az csvmware vm disk list --vm-name MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_disk_show
+  name: az csvmware vm disk show
+  summary: Get the details of a VMware virtual machine's disk.
+  description: ''
+  syntax: >-
+    az csvmware vm disk show --name
+                             --resource-group
+                             --vm-name
+  examples:
+  - summary: Get the details of a disk in a VM.
+    syntax: az csvmware vm disk show --vm-name MyVm -g MyResourceGroup -n "My Disk Name"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the disk.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+commands:
+- az_csvmware_vm_disk_add
+- az_csvmware_vm_disk_delete
+- az_csvmware_vm_disk_list
+- az_csvmware_vm_disk_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine's disks.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm/nic.yml b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm/nic.yml
new file mode 100644
index 0000000000..06731d3613
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/csvmware/vm/nic.yml
@@ -0,0 +1,137 @@
+### YamlMime:AzureCLIGroup
+uid: az_csvmware_vm_nic
+name: az csvmware vm nic
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **csvmware** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az csvmware vm nic** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage VMware virtual machine's Network Interface Cards.
+description: ''
+directCommands:
+- uid: az_csvmware_vm_nic_add
+  name: az csvmware vm nic add
+  summary: Add NIC to a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm nic add --resource-group
+                           --virtual-network
+                           --vm-name
+                           [--adapter {E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3}]
+                           [--power-on-boot {false, true}]
+  examples:
+  - summary: Add a NIC with default parameters in a VM.
+    syntax: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork
+  - summary: Add a NIC with E1000E adapter that powers on boot in a VM.
+    syntax: az csvmware vm nic add --vm-name MyVm -g MyResourceGroup --virtual-network MyVirtualNetwork --adapter E1000E --power-on-boot true
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --virtual-network
+    summary: ID of the virtual network. You can also pass the basename of the ID.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+  optionalParameters:
+  - name: --adapter
+    defaultValue: VMXNET3
+    parameterValueGroup: E1000, E1000E, PCNET32, VMXNET, VMXNET2, VMXNET3
+    summary: The adapter for the NIC.
+    description: ''
+  - name: --power-on-boot
+    parameterValueGroup: false, true
+    summary: Will power on the NIC at boot time.
+    description: ''
+- uid: az_csvmware_vm_nic_delete
+  name: az csvmware vm nic delete
+  summary: Delete NICs from a VM.
+  description: ''
+  syntax: >-
+    az csvmware vm nic delete --nics
+                              --resource-group
+                              --vm-name
+  examples:
+  - summary: Delete two NICs from a VM.
+    syntax: az csvmware vm nic delete --vm-name MyVm -g MyResourceGroup --nics "My NIC Name 1" "My NIC Name 2"
+  requiredParameters:
+  - isRequired: true
+    name: --nics
+    summary: Names of NICs.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_nic_list
+  name: az csvmware vm nic list
+  summary: List details of NICs available on a VMware virtual machine.
+  description: ''
+  syntax: >-
+    az csvmware vm nic list --resource-group
+                            --vm-name
+  examples:
+  - summary: List details of NICs in a VM.
+    syntax: az csvmware vm nic list --vm-name MyVm -g MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+- uid: az_csvmware_vm_nic_show
+  name: az csvmware vm nic show
+  summary: Get the details of a VMware virtual machine's NIC.
+  description: ''
+  syntax: >-
+    az csvmware vm nic show --name
+                            --resource-group
+                            --vm-name
+  examples:
+  - summary: Get the details of a NIC in a VM.
+    syntax: az csvmware vm nic show --vm-name MyVm -g MyResourceGroup -n "My NIC Name"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the NIC.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --vm-name
+    summary: Name of the virtual machine.
+    description: ''
+commands:
+- az_csvmware_vm_nic_add
+- az_csvmware_vm_nic_delete
+- az_csvmware_vm_nic_list
+- az_csvmware_vm_nic_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage VMware virtual machine's Network Interface Cards.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/custom-providers.yml b/2019-03-01-hybrid/docs-ref-autogen/custom-providers.yml
new file mode 100644
index 0000000000..fb93fe6845
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/custom-providers.yml
@@ -0,0 +1,32 @@
+### YamlMime:AzureCLIGroup
+uid: az_custom-providers
+name: az custom-providers
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **custom-providers** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az custom-providers** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_custom-providers_resource-provider
+- az_custom-providers_resource-provider_create
+- az_custom-providers_resource-provider_delete
+- az_custom-providers_resource-provider_list
+- az_custom-providers_resource-provider_show
+- az_custom-providers_resource-provider_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2019-03-01-hybrid/docs-ref-autogen/custom-providers/resource-provider.yml b/2019-03-01-hybrid/docs-ref-autogen/custom-providers/resource-provider.yml
new file mode 100644
index 0000000000..7e4da4ca30
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/custom-providers/resource-provider.yml
@@ -0,0 +1,200 @@
+### YamlMime:AzureCLIGroup
+uid: az_custom-providers_resource-provider
+name: az custom-providers resource-provider
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **custom-providers** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az custom-providers resource-provider** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage custom resource provider.
+description: ''
+directCommands:
+- uid: az_custom-providers_resource-provider_create
+  name: az custom-providers resource-provider create
+  summary: Create or update the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider create --name
+                                                 --resource-group
+                                                 [--action]
+                                                 [--location]
+                                                 [--no-wait]
+                                                 [--resource-type]
+                                                 [--tags]
+                                                 [--validation]
+  examples:
+  - summary: Create or update a custom resource provider.
+    syntax: >-
+      az custom-providers resource-provider create -n MyRP -g MyRG \
+
+      --action name=ping endpoint=https://test.azurewebsites.net/api routing_type=Proxy \
+
+      --resource-type name=users endpoint=https://test.azurewebsites.net/api routing_type="Proxy, Cache" \
+
+      --validation validation_type=swagger specification=https://raw.githubusercontent.com/test.json
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --action -a
+    summary: Add an action to the custom resource provider.
+    description: >-
+      Usage: --action name=ping endpoint="https://test.azurewebsites.net/api/{requestPath}" routing_type=Proxy
+
+
+      name: Required. The name of the action.
+
+      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
+
+      routing_type: The routing types that are supported for action requests. Possible values include: 'Proxy'.
+
+
+      Multiple actions can be specified by using more than one `--action` argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-type -r
+    summary: Add a custom resource type to the custom resource provider.
+    description: >-
+      Usage: --resource-type name=user endpoint="https://test.azurewebsites.net/api/{requestPath}" routing_type="Proxy, Cache"
+
+
+      name: Required. The name of the resource type.
+
+      endpoint: Required. The endpoint URI that the custom resource provider will proxy requests to.
+
+      routing_type: The routing types that are supported for resource requests. Possible values include: 'Proxy', 'Proxy,Cache'.
+
+
+      Multiple resource types can be specified by using more than one `--resource-type` argument.
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation -v
+    summary: Add a validation to the custom resource provider.
+    description: >-
+      Usage: --validation specification="https://raw.githubusercontent.com/" validation_type="Swagger"
+
+
+      specification: A link to the validation specification.vThe specification must be hosted on raw.githubusercontent.com.
+
+      validation_type: The type of validation to run against a matching request. Possible values include: 'Swagger'.
+
+
+      Multiple validations can be specified by using more than one `--validation` argument.
+- uid: az_custom-providers_resource-provider_delete
+  name: az custom-providers resource-provider delete
+  summary: Delete the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider delete --name
+                                                 --resource-group
+                                                 [--no-wait]
+                                                 [--yes]
+  examples:
+  - summary: Delete a custom resource provider.
+    syntax: az custom-providers resource-provider delete -g MyRG -n MyRP
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_custom-providers_resource-provider_list
+  name: az custom-providers resource-provider list
+  summary: Get all the custom resource providers within a resource group or in the current subscription.
+  description: ''
+  syntax: az custom-providers resource-provider list [--resource-group]
+  examples:
+  - summary: List all custom resource providers in the resource group.
+    syntax: az custom-providers resource-provider list -g MyRG
+  - summary: List all custom resource providers in the current subscription.
+    syntax: az custom-providers resource-provider list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_custom-providers_resource-provider_show
+  name: az custom-providers resource-provider show
+  summary: Get the properties for the custom resource provider.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider show --name
+                                               --resource-group
+  examples:
+  - summary: Get a custom resource provider.
+    syntax: az custom-providers resource-provider show -g MyRG -n MyRP
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_custom-providers_resource-provider_update
+  name: az custom-providers resource-provider update
+  summary: Update the custom resource provider. Only tags can be updated.
+  description: ''
+  syntax: >-
+    az custom-providers resource-provider update --name
+                                                 --resource-group
+                                                 [--tags]
+  examples:
+  - summary: Update the tags for a custom resource provider.
+    syntax: az custom-providers resource-provider update -g MyRG -n MyRP --tags a=b
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the resource provider.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_custom-providers_resource-provider_create
+- az_custom-providers_resource-provider_delete
+- az_custom-providers_resource-provider_list
+- az_custom-providers_resource-provider_show
+- az_custom-providers_resource-provider_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage custom resource provider.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/customlocation.yml b/2019-03-01-hybrid/docs-ref-autogen/customlocation.yml
new file mode 100644
index 0000000000..f0f4b82228
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/customlocation.yml
@@ -0,0 +1,217 @@
+### YamlMime:AzureCLIGroup
+uid: az_customlocation
+name: az customlocation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **customlocation** extension for Azure CLI and requires version 2.0.67 or higher.  The extension will automatically install the first time you run an **az customlocation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to Create, Get, List and Delete CustomLocations.
+description: ''
+directCommands:
+- uid: az_customlocation_create
+  name: az customlocation create
+  summary: Create a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation create --cluster-extension-ids
+                             --host-resource-id
+                             --name
+                             --namespace
+                             --resource-group
+                             [--kubeconfig]
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --kubeconfig -k
+    summary: Admin Kubeconfig of Cluster. Needs to passed in as a file if the cluster is a non-AAD enabled Cluster.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_customlocation_delete
+  name: az customlocation delete
+  summary: Delete a Customlocation.
+  description: ''
+  syntax: >-
+    az customlocation delete --name
+                             --resource-group
+                             [--yes]
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_customlocation_list
+  name: az customlocation list
+  summary: Command to list CustomLocations.
+  description: ''
+  syntax: az customlocation list [--resource-group]
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_list-enabled-resource-types
+  name: az customlocation list-enabled-resource-types
+  summary: Get details of Enabled Resource Types for a CustomLocation.
+  description: ''
+  syntax: >-
+    az customlocation list-enabled-resource-types --name
+                                                  --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_patch
+  name: az customlocation patch
+  summary: Patch a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation patch --cluster-extension-ids
+                            --host-resource-id
+                            --name
+                            --namespace
+                            --resource-group
+                            [--display-name]
+                            [--location]
+                            [--tags]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --display-name -d
+    summary: Display Name of Custom Location.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags -t
+    summary: A json file for tags for Custom Location.
+    description: ''
+- uid: az_customlocation_show
+  name: az customlocation show
+  summary: Get details of a Customlocation.
+  description: ''
+  syntax: >-
+    az customlocation show --name
+                           --resource-group
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_customlocation_update
+  name: az customlocation update
+  summary: Update a Custom Location.
+  description: ''
+  syntax: >-
+    az customlocation update --cluster-extension-ids
+                             --host-resource-id
+                             --name
+                             --namespace
+                             --resource-group
+                             [--location]
+  requiredParameters:
+  - isRequired: true
+    name: --cluster-extension-ids -c
+    summary: Space-seperated list of the cluster extension ids - input full id in the format /subscription/.../resourceGroups/.../Microsoft.Kubernetes/connectedClusters/.../providers/Microsoft.KubernetesConfiguration/extensions/...
+    description: ''
+  - isRequired: true
+    name: --host-resource-id
+    summary: Host resource ID of the connected cluster.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the Customlocation.
+    description: ''
+  - isRequired: true
+    name: --namespace
+    summary: Namespace for Custom Location. Should match namespace where cluster extension operator was created in.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_customlocation_create
+- az_customlocation_delete
+- az_customlocation_list
+- az_customlocation_list-enabled-resource-types
+- az_customlocation_patch
+- az_customlocation_show
+- az_customlocation_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to Create, Get, List and Delete CustomLocations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databox.yml b/2019-03-01-hybrid/docs-ref-autogen/databox.yml
new file mode 100644
index 0000000000..4c7c3bf6ca
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databox.yml
@@ -0,0 +1,34 @@
+### YamlMime:AzureCLIGroup
+uid: az_databox
+name: az databox
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databox** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databox** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_databox_job
+- az_databox_job_cancel
+- az_databox_job_create
+- az_databox_job_delete
+- az_databox_job_list
+- az_databox_job_list-credentials
+- az_databox_job_show
+- az_databox_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databox/job.yml b/2019-03-01-hybrid/docs-ref-autogen/databox/job.yml
new file mode 100644
index 0000000000..e7805b9b48
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databox/job.yml
@@ -0,0 +1,352 @@
+### YamlMime:AzureCLIGroup
+uid: az_databox_job
+name: az databox job
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databox** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databox job** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databox job.
+description: ''
+directCommands:
+- uid: az_databox_job_cancel
+  name: az databox job cancel
+  summary: Cancel a job.
+  description: ''
+  syntax: >-
+    az databox job cancel --name
+                          --reason
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Cancel the job "SdkJob3971" under resource group "SdkRg4981".
+    syntax: az databox job cancel --resource-group "SdkRg4981" --name "SdkJob3971" --reason "CancelTest"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --reason
+    summary: Reason for cancellation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databox_job_create
+  name: az databox job create
+  summary: Create a new job with the specified parameters.
+  description: ''
+  syntax: >-
+    az databox job create --city
+                          --contact-name
+                          --country
+                          --email-list
+                          --location
+                          --name
+                          --phone
+                          --postal-code
+                          --resource-group
+                          --sku {DataBox, DataBoxDisk, DataBoxHeavy}
+                          --state-or-province
+                          --street-address1
+                          [--company-name]
+                          [--expected-data-size]
+                          [--mobile]
+                          [--resource-group-for-managed-disk]
+                          [--staging-storage-account]
+                          [--storage-accounts]
+                          [--street-address2]
+                          [--street-address3]
+                          [--tags]
+  examples:
+  - summary: Create a databox job to use both storage account and managed disk as data destination.
+    syntax: >-
+      az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
+
+      "westus" --sku "DataBox" --contact-name "Public SDK Test" \
+
+      --phone "1234567890" --email-list "testing@microsoft.com" \
+
+      --street-address1 "16 TOWNSEND ST" --street-address2 "Unit 1" --city "San Francisco"  \
+
+      --state-or-province "CA" --country "US" --postal-code "94107" --company-name "Microsoft" \
+
+      --storage-account sa1 sa2 --staging-storage-account sa \
+
+      --resource-group-for-managed-disk /subscriptions/sub/resourceGroups/rg
+  - summary: Create a databoxdisk job to use storage account as data destination.
+    syntax: >-
+      az databox job create --resource-group "SdkRg4981" --name "SdkJob3971" --location \
+
+      "westus" --sku "DataBoxDisk" --expected-data-size 1 --contact-name "Public SDK Test" \
+
+      --phone "1234567890" --email-list "testing@microsoft.com" --street-address1 "16 TOWNSEND ST" \
+
+      --street-address2 "Unit 1" --city "San Francisco" --state-or-province "CA" --country "US" \
+
+      --postal-code "94107" --company-name "Microsoft" --storage-account sa1
+  requiredParameters:
+  - isRequired: true
+    name: --city
+    summary: Name of the City.
+    description: ''
+  - isRequired: true
+    name: --contact-name
+    summary: Contact name of the person.
+    description: ''
+  - isRequired: true
+    name: --country
+    summary: 'Name of the Country. Ex: US.'
+    description: ''
+  - isRequired: true
+    name: --email-list
+    summary: Space-separated list of Email addresses to be notified about job progress.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --phone
+    summary: Phone number of the contact person.
+    description: ''
+  - isRequired: true
+    name: --postal-code
+    summary: Postal code.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: DataBox, DataBoxDisk, DataBoxHeavy
+    summary: The sku type of DataBox.
+    description: ''
+  - isRequired: true
+    name: --state-or-province
+    summary: Name of the State or Province.
+    description: ''
+  - isRequired: true
+    name: --street-address1
+    summary: Street Address line 1.
+    description: ''
+  optionalParameters:
+  - name: --company-name
+    summary: Name of the company.
+    description: ''
+  - name: --expected-data-size
+    summary: The expected size of the data which needs to be transferred in this job, in terabytes.The maximum usable capacity is up to 35 TB. This is only needed when sku is DataBoxDisk.
+    description: ''
+  - name: --mobile
+    summary: Mobile number of the contact person.
+    description: ''
+  - name: --resource-group-for-managed-disk
+    summary: The name or ID of the destination resource group where the Compute disks should be created.
+    description: ''
+  - name: --staging-storage-account
+    summary: The name or ID of the destination storage account that can be used to copy the vhd for staging.
+    description: ''
+  - name: --storage-accounts
+    summary: Space-separated list of the destination storage account. It can be the name or resource ID of storage account.
+    description: ''
+  - name: --street-address2
+    summary: Street Address line 2.
+    description: ''
+  - name: --street-address3
+    summary: Street Address line 3.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_databox_job_delete
+  name: az databox job delete
+  summary: Delete a job.
+  description: ''
+  syntax: >-
+    az databox job delete --name
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Delete the job "SdkJob3971" in resource group "SdkRg4981".
+    syntax: az databox job delete --resource-group "SdkRg4981" --name "SdkJob3971"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databox_job_list
+  name: az databox job list
+  summary: List all the jobs available under the given resource group or the given subscription.
+  description: ''
+  syntax: az databox job list [--resource-group]
+  examples:
+  - summary: List all the jobs available under the current subscription.
+    syntax: az databox job list
+  - summary: List all the jobs available under the resource group "SdkRg4981".
+    syntax: az databox job list --resource-group "SdkRg4981"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_list-credentials
+  name: az databox job list-credentials
+  summary: List the unencrypted secrets related to the job.
+  description: ''
+  syntax: >-
+    az databox job list-credentials --name
+                                    --resource-group
+  examples:
+  - summary: List the unencrypted secrets related to the job "TJ-636646322037905056".
+    syntax: az databox job list-credentials --resource-group "bvttoolrg6" --name "TJ-636646322037905056"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_show
+  name: az databox job show
+  summary: Get information about the specified job.
+  description: ''
+  syntax: >-
+    az databox job show --name
+                        --resource-group
+  examples:
+  - summary: Get the information about the job "SdkJob3971".
+    syntax: az databox job show --resource-group "SdkRg4981" --name "SdkJob3971"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databox_job_update
+  name: az databox job update
+  summary: Update an existing job with the specified parameters.
+  description: ''
+  syntax: >-
+    az databox job update --name
+                          --resource-group
+                          [--city]
+                          [--company-name]
+                          [--contact-name]
+                          [--country]
+                          [--email-list]
+                          [--mobile]
+                          [--phone]
+                          [--postal-code]
+                          [--state-or-province]
+                          [--street-address1]
+                          [--street-address2]
+                          [--street-address3]
+  examples:
+  - summary: Update the job "SdkJob3971" with the specified parameters.
+    syntax: >-
+      az databox job update --resource-group "SdkRg4981" --name "SdkJob3971" \
+
+      --contact-name "Update Job" --phone "1234567890" \
+
+      --email-list "testing@microsoft.com" \
+
+      --street-address1 "16 TOWNSEND ST" \
+
+      --city "San Francisco" --state-or-province "CA" \
+
+      --country "US" --postal-code "94107" \
+
+      --company-name "Microsoft" \
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the job resource within the specified resource group. job names must be between 3 and 24 characters in length and use any alphanumeric and underscore only.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --city
+    summary: Name of the City.
+    description: ''
+  - name: --company-name
+    summary: Name of the company.
+    description: ''
+  - name: --contact-name
+    summary: Contact name of the person.
+    description: ''
+  - name: --country
+    summary: 'Name of the Country. Ex: US.'
+    description: ''
+  - name: --email-list
+    summary: List of Email addresses to be notified about job progress.
+    description: ''
+  - name: --mobile
+    summary: Mobile number of the contact person.
+    description: ''
+  - name: --phone
+    summary: Phone number of the contact person.
+    description: ''
+  - name: --postal-code
+    summary: Postal code.
+    description: ''
+  - name: --state-or-province
+    summary: Name of the State or Province.
+    description: ''
+  - name: --street-address1
+    summary: Street Address line 1.
+    description: ''
+  - name: --street-address2
+    summary: Street Address line 2.
+    description: ''
+  - name: --street-address3
+    summary: Street Address line 3.
+    description: ''
+commands:
+- az_databox_job_cancel
+- az_databox_job_create
+- az_databox_job_delete
+- az_databox_job_list
+- az_databox_job_list-credentials
+- az_databox_job_show
+- az_databox_job_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databox job.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databoxedge.yml b/2019-03-01-hybrid/docs-ref-autogen/databoxedge.yml
new file mode 100644
index 0000000000..64b84682f5
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databoxedge.yml
@@ -0,0 +1,130 @@
+### YamlMime:AzureCLIGroup
+uid: az_databoxedge
+name: az databoxedge
+summary: Support data box edge device and management.
+description: ''
+directCommands:
+- uid: az_databoxedge_list-node
+  name: az databoxedge list-node
+  summary: Get all the nodes currently configured under this Data Box Edge device.
+  description: ''
+  syntax: >-
+    az databoxedge list-node --device-name
+                             --resource-group
+                             [--subscription]
+  examples:
+  - summary: Get all the nodes currently configured under this Data Box Edge device.
+    syntax: az databoxedge list-node --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --device-name -d
+    summary: The device name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_list-sku
+  name: az databoxedge list-sku
+  summary: List all the available Skus in the region and information related to them.
+  description: ''
+  syntax: >-
+    az databoxedge list-sku [--filter]
+                            [--subscription]
+  examples:
+  - summary: List all the available Skus in the region and information related to them.
+    syntax: az databoxedge list-sku
+  optionalParameters:
+  - name: --filter
+    summary: Specify $filter='location eq <location>' to filter on location.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_show-job
+  name: az databoxedge show-job
+  summary: Get the details of a specified job on a Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge show-job [--device-name]
+                            [--ids]
+                            [--name]
+                            [--resource-group]
+                            [--subscription]
+  examples:
+  - summary: Get the details of a specified job on a Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge show-job --name "159a00c7-8543-4343-9435-263ac87df3bb" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The job name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+commands:
+- az_databoxedge_alert
+- az_databoxedge_alert_list
+- az_databoxedge_alert_show
+- az_databoxedge_bandwidth-schedule
+- az_databoxedge_bandwidth-schedule_create
+- az_databoxedge_bandwidth-schedule_delete
+- az_databoxedge_bandwidth-schedule_list
+- az_databoxedge_bandwidth-schedule_show
+- az_databoxedge_bandwidth-schedule_update
+- az_databoxedge_bandwidth-schedule_wait
+- az_databoxedge_device
+- az_databoxedge_device_create
+- az_databoxedge_device_delete
+- az_databoxedge_device_download-update
+- az_databoxedge_device_install-update
+- az_databoxedge_device_list
+- az_databoxedge_device_scan-for-update
+- az_databoxedge_device_show
+- az_databoxedge_device_show-update-summary
+- az_databoxedge_device_update
+- az_databoxedge_device_wait
+- az_databoxedge_list-node
+- az_databoxedge_list-sku
+- az_databoxedge_order
+- az_databoxedge_order_create
+- az_databoxedge_order_delete
+- az_databoxedge_order_list
+- az_databoxedge_order_show
+- az_databoxedge_order_update
+- az_databoxedge_order_wait
+- az_databoxedge_show-job
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/23/2020
+  description: Support data box edge device and management.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databoxedge/alert.yml b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/alert.yml
new file mode 100644
index 0000000000..41e19a8639
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/alert.yml
@@ -0,0 +1,91 @@
+### YamlMime:AzureCLIGroup
+uid: az_databoxedge_alert
+name: az databoxedge alert
+summary: Manage alert with databoxedge.
+description: ''
+directCommands:
+- uid: az_databoxedge_alert_list
+  name: az databoxedge alert list
+  summary: Get all the alerts for a Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge alert list --device-name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: Get all the alerts for a Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge alert list --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --device-name -d
+    summary: The device name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_alert_show
+  name: az databoxedge alert show
+  summary: Get an alert by name.
+  description: ''
+  syntax: >-
+    az databoxedge alert show [--device-name]
+                              [--ids]
+                              [--name]
+                              [--query-examples]
+                              [--resource-group]
+                              [--subscription]
+  examples:
+  - summary: Get an alert by name.
+    syntax: az databoxedge alert show --name "159a00c7-8543-4343-9435-263ac87df3bb" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The alert name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+commands:
+- az_databoxedge_alert_list
+- az_databoxedge_alert_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/23/2020
+  description: Manage alert with databoxedge.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databoxedge/bandwidth-schedule.yml b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/bandwidth-schedule.yml
new file mode 100644
index 0000000000..e3a3efd941
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/bandwidth-schedule.yml
@@ -0,0 +1,317 @@
+### YamlMime:AzureCLIGroup
+uid: az_databoxedge_bandwidth-schedule
+name: az databoxedge bandwidth-schedule
+summary: Manage bandwidth schedule with databoxedge.
+description: ''
+directCommands:
+- uid: az_databoxedge_bandwidth-schedule_create
+  name: az databoxedge bandwidth-schedule create
+  summary: Create a bandwidth schedule.
+  description: ''
+  syntax: >-
+    az databoxedge bandwidth-schedule create --days
+                                             --device-name
+                                             --name
+                                             --rate-in-mbps
+                                             --resource-group
+                                             --start
+                                             --stop
+                                             [--no-wait]
+                                             [--subscription]
+  examples:
+  - summary: Create a bandwidth schedule.
+    syntax: az databoxedge bandwidth-schedule create --name "bandwidth-1" --device-name "testedgedevice" --days "Sunday" "Monday" --rate-in-mbps 100 --start "0:0:0" --stop "13:59:0" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --days
+    summary: The days of the week when this schedule is applicable.
+    description: ''
+  - isRequired: true
+    name: --device-name -d
+    summary: The device name.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The bandwidth schedule name which needs to be added/updated.
+    description: ''
+  - isRequired: true
+    name: --rate-in-mbps
+    summary: The bandwidth rate in Mbps.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --start
+    summary: The start time of the schedule in UTC.
+    description: ''
+  - isRequired: true
+    name: --stop
+    summary: The stop time of the schedule in UTC.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_bandwidth-schedule_delete
+  name: az databoxedge bandwidth-schedule delete
+  summary: Delete the specified bandwidth schedule.
+  description: ''
+  syntax: >-
+    az databoxedge bandwidth-schedule delete [--device-name]
+                                             [--ids]
+                                             [--name]
+                                             [--no-wait]
+                                             [--resource-group]
+                                             [--subscription]
+                                             [--yes]
+  examples:
+  - summary: Delete the specified bandwidth schedule.
+    syntax: az databoxedge bandwidth-schedule delete --name "bandwidth-1" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The bandwidth schedule name.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_bandwidth-schedule_list
+  name: az databoxedge bandwidth-schedule list
+  summary: Get all the bandwidth schedules for a Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge bandwidth-schedule list --device-name
+                                           --resource-group
+                                           [--query-examples]
+                                           [--subscription]
+  examples:
+  - summary: Get all the bandwidth schedules for a Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge bandwidth-schedule list --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --device-name -d
+    summary: The device name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_bandwidth-schedule_show
+  name: az databoxedge bandwidth-schedule show
+  summary: Get the properties of the specified bandwidth schedule.
+  description: ''
+  syntax: >-
+    az databoxedge bandwidth-schedule show [--device-name]
+                                           [--ids]
+                                           [--name]
+                                           [--query-examples]
+                                           [--resource-group]
+                                           [--subscription]
+  examples:
+  - summary: Get the properties of the specified bandwidth schedule.
+    syntax: az databoxedge bandwidth-schedule show --name "bandwidth-1" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The bandwidth schedule name.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_bandwidth-schedule_update
+  name: az databoxedge bandwidth-schedule update
+  summary: Update a bandwidth schedule.
+  description: ''
+  syntax: >-
+    az databoxedge bandwidth-schedule update [--add]
+                                             [--days]
+                                             [--device-name]
+                                             [--force-string]
+                                             [--ids]
+                                             [--name]
+                                             [--no-wait]
+                                             [--rate-in-mbps]
+                                             [--remove]
+                                             [--resource-group]
+                                             [--set]
+                                             [--start]
+                                             [--stop]
+                                             [--subscription]
+  examples:
+  - summary: Update a bandwidth schedule.
+    syntax: az databoxedge bandwidth-schedule update --name "bandwidth-1" --device-name "testedgedevice" --rate-in-mbps 150 --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --days
+    summary: The days of the week when this schedule is applicable.
+    description: ''
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --name -n
+    summary: The bandwidth schedule name which needs to be added/updated.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --rate-in-mbps
+    summary: The bandwidth rate in Mbps.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --start
+    summary: The start time of the schedule in UTC.
+    description: ''
+  - name: --stop
+    summary: The stop time of the schedule in UTC.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_bandwidth-schedule_wait
+  name: az databoxedge bandwidth-schedule wait
+  summary: Place the CLI in a waiting state until a condition of the databoxedge bandwidth-schedule is met.
+  description: ''
+  syntax: >-
+    az databoxedge bandwidth-schedule wait [--created]
+                                           [--custom]
+                                           [--deleted]
+                                           [--device-name]
+                                           [--exists]
+                                           [--ids]
+                                           [--interval]
+                                           [--name]
+                                           [--resource-group]
+                                           [--subscription]
+                                           [--timeout]
+                                           [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the databoxedge bandwidth-schedule is successfully created.
+    syntax: az databoxedge bandwidth-schedule wait --name "bandwidth-1" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation" --created
+  - summary: Pause executing next line of CLI script until the databoxedge bandwidth-schedule is successfully updated.
+    syntax: az databoxedge bandwidth-schedule wait --name "bandwidth-1" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation" --updated
+  - summary: Pause executing next line of CLI script until the databoxedge bandwidth-schedule is successfully deleted.
+    syntax: az databoxedge bandwidth-schedule wait --name "bandwidth-1" --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation" --deleted
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --name -n
+    summary: The bandwidth schedule name.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+commands:
+- az_databoxedge_bandwidth-schedule_create
+- az_databoxedge_bandwidth-schedule_delete
+- az_databoxedge_bandwidth-schedule_list
+- az_databoxedge_bandwidth-schedule_show
+- az_databoxedge_bandwidth-schedule_update
+- az_databoxedge_bandwidth-schedule_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/23/2020
+  description: Manage bandwidth schedule with databoxedge.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databoxedge/device.yml b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/device.yml
new file mode 100644
index 0000000000..068b026f21
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/device.yml
@@ -0,0 +1,395 @@
+### YamlMime:AzureCLIGroup
+uid: az_databoxedge_device
+name: az databoxedge device
+summary: Manage device with databoxedge.
+description: ''
+directCommands:
+- uid: az_databoxedge_device_create
+  name: az databoxedge device create
+  summary: Create a Data Box Edge/Data Box Gateway resource.
+  description: ''
+  syntax: >-
+    az databoxedge device create --device-name
+                                 --resource-group
+                                 [--description]
+                                 [--etag]
+                                 [--friendly-name]
+                                 [--location]
+                                 [--model-description]
+                                 [--no-wait]
+                                 [--sku {Edge, Gateway, TEA_1Node, TEA_1Node_Heater, TEA_1Node_UPS, TEA_1Node_UPS_Heater, TEA_4Node_Heater, TEA_4Node_UPS_Heater, TMA}]
+                                 [--status {Disconnected, Maintenance, NeedsAttention, Offline, Online, PartiallyDisconnected, ReadyToSetup}]
+                                 [--subscription]
+                                 [--tags]
+  examples:
+  - summary: Create a Data Box Edge resource.
+    syntax: az databoxedge device create --location "eastus" --sku "Edge" --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: The Description of the Data Box Edge/Gateway device.
+    description: ''
+  - name: --etag
+    summary: The etag for the devices.
+    description: ''
+  - name: --friendly-name
+    summary: The Data Box Edge/Gateway device name.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --model-description
+    summary: The description of the Data Box Edge/Gateway device model.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    parameterValueGroup: Edge, Gateway, TEA_1Node, TEA_1Node_Heater, TEA_1Node_UPS, TEA_1Node_UPS_Heater, TEA_4Node_Heater, TEA_4Node_UPS_Heater, TMA
+    summary: The SKU type.
+    description: ''
+  - name: --status
+    parameterValueGroup: Disconnected, Maintenance, NeedsAttention, Offline, Online, PartiallyDisconnected, ReadyToSetup
+    summary: The status of the Data Box Edge/Gateway device.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_delete
+  name: az databoxedge device delete
+  summary: Delete the Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge device delete [--device-name]
+                                 [--ids]
+                                 [--no-wait]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--yes]
+  examples:
+  - summary: Delete the Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge device delete --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_download-update
+  name: az databoxedge device download-update
+  summary: Download the updates on a Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge device download-update [--device-name]
+                                          [--ids]
+                                          [--no-wait]
+                                          [--resource-group]
+                                          [--subscription]
+  examples:
+  - summary: Download the updates on a Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge device download-update --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_install-update
+  name: az databoxedge device install-update
+  summary: Install the updates on the Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge device install-update [--device-name]
+                                         [--ids]
+                                         [--no-wait]
+                                         [--resource-group]
+                                         [--subscription]
+  examples:
+  - summary: Install the updates on the Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge device install-update --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_list
+  name: az databoxedge device list
+  summary: Get all the Data Box Edge/Data Box Gateway devices in a resource group or in a subscription.
+  description: ''
+  syntax: >-
+    az databoxedge device list [--expand]
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
+  examples:
+  - summary: Get all the Data Box Edge/Data Box Gateway devices in a resource group.
+    syntax: az databoxedge device list --resource-group "GroupForEdgeAutomation"
+  - summary: Get all the Data Box Edge/Data Box Gateway devices in a subscription.
+    syntax: az databoxedge device list
+  optionalParameters:
+  - name: --expand
+    summary: Specify $expand=details to populate additional fields related to the resource or Specify $skipToken=<token> to populate the next page in the list.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_scan-for-update
+  name: az databoxedge device scan-for-update
+  summary: Scan for updates on a Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge device scan-for-update [--device-name]
+                                          [--ids]
+                                          [--no-wait]
+                                          [--resource-group]
+                                          [--subscription]
+  examples:
+  - summary: Scan for updates on a Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge device scan-for-update --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_show
+  name: az databoxedge device show
+  summary: Get the properties of the Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge device show [--device-name]
+                               [--ids]
+                               [--query-examples]
+                               [--resource-group]
+                               [--subscription]
+  examples:
+  - summary: Get the properties of the Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge device show --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_show-update-summary
+  name: az databoxedge device show-update-summary
+  summary: Get information about the availability of updates based on the last scan of the device. It also gets information about any ongoing download or install jobs on the device.
+  description: ''
+  syntax: >-
+    az databoxedge device show-update-summary [--device-name]
+                                              [--ids]
+                                              [--resource-group]
+                                              [--subscription]
+  examples:
+  - summary: Get update summary of the device.
+    syntax: az databoxedge device show-update-summary --name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_update
+  name: az databoxedge device update
+  summary: Modify a Data Box Edge/Data Box Gateway resource.
+  description: ''
+  syntax: >-
+    az databoxedge device update [--device-name]
+                                 [--ids]
+                                 [--resource-group]
+                                 [--subscription]
+                                 [--tags]
+  examples:
+  - summary: Modify a Data Box Edge/Data Box Gateway resource.
+    syntax: az databoxedge device update --name "testedgedevice" --tags Key1="value1" Key2="value2" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_device_wait
+  name: az databoxedge device wait
+  summary: Place the CLI in a waiting state until a condition of the databoxedge device is met.
+  description: ''
+  syntax: >-
+    az databoxedge device wait [--created]
+                               [--custom]
+                               [--deleted]
+                               [--device-name]
+                               [--exists]
+                               [--ids]
+                               [--interval]
+                               [--resource-group]
+                               [--subscription]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the databoxedge device is successfully created.
+    syntax: az databoxedge device wait --name "testedgedevice" --resource-group "GroupForEdgeAutomation" --created
+  - summary: Pause executing next line of CLI script until the databoxedge device is successfully deleted.
+    syntax: az databoxedge device wait --name "testedgedevice" --resource-group "GroupForEdgeAutomation" --deleted
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --device-name --name -n
+    summary: The device name.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+commands:
+- az_databoxedge_device_create
+- az_databoxedge_device_delete
+- az_databoxedge_device_download-update
+- az_databoxedge_device_install-update
+- az_databoxedge_device_list
+- az_databoxedge_device_scan-for-update
+- az_databoxedge_device_show
+- az_databoxedge_device_show-update-summary
+- az_databoxedge_device_update
+- az_databoxedge_device_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/23/2020
+  description: Manage device with databoxedge.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databoxedge/order.yml b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/order.yml
new file mode 100644
index 0000000000..2f0d360e48
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databoxedge/order.yml
@@ -0,0 +1,375 @@
+### YamlMime:AzureCLIGroup
+uid: az_databoxedge_order
+name: az databoxedge order
+summary: Manage order with databoxedge.
+description: ''
+directCommands:
+- uid: az_databoxedge_order_create
+  name: az databoxedge order create
+  summary: Create an order.
+  description: ''
+  syntax: >-
+    az databoxedge order create --address-line1
+                                --city
+                                --company-name
+                                --contact-person
+                                --country
+                                --device-name
+                                --email-list
+                                --phone
+                                --postal-code
+                                --resource-group
+                                --state
+                                [--address-line2]
+                                [--address-line3]
+                                [--comments]
+                                [--no-wait]
+                                [--status {Arriving, AwaitingFulfilment, AwaitingPreparation, AwaitingReturnShipment, AwaitingShipment, CollectedAtMicrosoft, Declined, Delivered, LostDevice, ReplacementRequested, ReturnInitiated, Shipped, ShippedBack, Untracked}]
+                                [--subscription]
+  examples:
+  - summary: Create an order.
+    syntax: az databoxedge order create --device-name "testedgedevice" --company-name "Microsoft" --contact-person "John Mcclane" --email-list "john@microsoft.com" --phone "(800) 426-9400" --address-line1 "Microsoft Corporation" --address-line2 "One Microsoft Way" --address-line3 "Redmond" --city "WA" --country "United States" --postal-code "98052" --state "WA" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --address-line1
+    summary: The address line1.
+    description: ''
+  - isRequired: true
+    name: --city
+    summary: The city name.
+    description: ''
+  - isRequired: true
+    name: --company-name
+    summary: The name of the company.
+    description: ''
+  - isRequired: true
+    name: --contact-person
+    summary: The contact person name.
+    description: ''
+  - isRequired: true
+    name: --country
+    summary: The country name.
+    description: ''
+  - isRequired: true
+    name: --device-name -d
+    summary: The order details of a device.
+    description: ''
+  - isRequired: true
+    name: --email-list
+    summary: The email list.
+    description: ''
+  - isRequired: true
+    name: --phone
+    summary: The phone number.
+    description: ''
+  - isRequired: true
+    name: --postal-code
+    summary: The postal code.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --state
+    summary: The state name.
+    description: ''
+  optionalParameters:
+  - name: --address-line2
+    summary: The address line2.
+    description: ''
+  - name: --address-line3
+    summary: The address line3.
+    description: ''
+  - name: --comments
+    summary: Comments related to this status change.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --status
+    parameterValueGroup: Arriving, AwaitingFulfilment, AwaitingPreparation, AwaitingReturnShipment, AwaitingShipment, CollectedAtMicrosoft, Declined, Delivered, LostDevice, ReplacementRequested, ReturnInitiated, Shipped, ShippedBack, Untracked
+    summary: Status of the order as per the allowed status types.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_order_delete
+  name: az databoxedge order delete
+  summary: Delete the order related to the device.
+  description: ''
+  syntax: >-
+    az databoxedge order delete [--device-name]
+                                [--ids]
+                                [--no-wait]
+                                [--resource-group]
+                                [--subscription]
+                                [--yes]
+  examples:
+  - summary: Delete the order related to the device.
+    syntax: az databoxedge order delete --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_order_list
+  name: az databoxedge order list
+  summary: List all the orders related to a Data Box Edge/Data Box Gateway device.
+  description: ''
+  syntax: >-
+    az databoxedge order list --device-name
+                              --resource-group
+                              [--query-examples]
+                              [--subscription]
+  examples:
+  - summary: List all the orders related to a Data Box Edge/Data Box Gateway device.
+    syntax: az databoxedge order list --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  requiredParameters:
+  - isRequired: true
+    name: --device-name -d
+    summary: The device name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_order_show
+  name: az databoxedge order show
+  summary: Get a specific order by name.
+  description: ''
+  syntax: >-
+    az databoxedge order show [--device-name]
+                              [--ids]
+                              [--query-examples]
+                              [--resource-group]
+                              [--subscription]
+  examples:
+  - summary: Get a specific order by name.
+    syntax: az databoxedge order show --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation"
+  optionalParameters:
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_order_update
+  name: az databoxedge order update
+  summary: Update an order.
+  description: ''
+  syntax: >-
+    az databoxedge order update [--add]
+                                [--address-line1]
+                                [--address-line2]
+                                [--address-line3]
+                                [--city]
+                                [--comments]
+                                [--company-name]
+                                [--contact-person]
+                                [--country]
+                                [--device-name]
+                                [--email-list]
+                                [--force-string]
+                                [--ids]
+                                [--no-wait]
+                                [--phone]
+                                [--postal-code]
+                                [--remove]
+                                [--resource-group]
+                                [--set]
+                                [--state]
+                                [--status {Arriving, AwaitingFulfilment, AwaitingPreparation, AwaitingReturnShipment, AwaitingShipment, CollectedAtMicrosoft, Declined, Delivered, LostDevice, ReplacementRequested, ReturnInitiated, Shipped, ShippedBack, Untracked}]
+                                [--subscription]
+  examples:
+  - summary: Update an order
+    syntax: az databoxedge order update --phone "(800) 426-9432"
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --address-line1
+    summary: The address line1.
+    description: ''
+  - name: --address-line2
+    summary: The address line2.
+    description: ''
+  - name: --address-line3
+    summary: The address line3.
+    description: ''
+  - name: --city
+    summary: The city name.
+    description: ''
+  - name: --comments
+    summary: Comments related to this status change.
+    description: ''
+  - name: --company-name
+    summary: The name of the company.
+    description: ''
+  - name: --contact-person
+    summary: The contact person name.
+    description: ''
+  - name: --country
+    summary: The country name.
+    description: ''
+  - name: --device-name -d
+    summary: The order details of a device.
+    description: ''
+  - name: --email-list
+    summary: The email list.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --phone
+    summary: The phone number.
+    description: ''
+  - name: --postal-code
+    summary: The postal code.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --state
+    summary: The state name.
+    description: ''
+  - name: --status
+    parameterValueGroup: Arriving, AwaitingFulfilment, AwaitingPreparation, AwaitingReturnShipment, AwaitingShipment, CollectedAtMicrosoft, Declined, Delivered, LostDevice, ReplacementRequested, ReturnInitiated, Shipped, ShippedBack, Untracked
+    summary: Status of the order as per the allowed status types.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+- uid: az_databoxedge_order_wait
+  name: az databoxedge order wait
+  summary: Place the CLI in a waiting state until a condition of the databoxedge order is met.
+  description: ''
+  syntax: >-
+    az databoxedge order wait [--created]
+                              [--custom]
+                              [--deleted]
+                              [--device-name]
+                              [--exists]
+                              [--ids]
+                              [--interval]
+                              [--resource-group]
+                              [--subscription]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the databoxedge order is successfully created.
+    syntax: az databoxedge order wait --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation" --created
+  - summary: Pause executing next line of CLI script until the databoxedge order is successfully updated.
+    syntax: az databoxedge order wait --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation" --updated
+  - summary: Pause executing next line of CLI script until the databoxedge order is successfully deleted.
+    syntax: az databoxedge order wait --device-name "testedgedevice" --resource-group "GroupForEdgeAutomation" --deleted
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --device-name -d
+    summary: The device name.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --ids
+    summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/databoxedge/_help.py
+commands:
+- az_databoxedge_order_create
+- az_databoxedge_order_delete
+- az_databoxedge_order_list
+- az_databoxedge_order_show
+- az_databoxedge_order_update
+- az_databoxedge_order_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 12/23/2020
+  description: Manage order with databoxedge.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databricks.yml b/2019-03-01-hybrid/docs-ref-autogen/databricks.yml
new file mode 100644
index 0000000000..0fefc73812
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databricks.yml
@@ -0,0 +1,41 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks
+name: az databricks
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage databricks workspaces.
+description: ''
+commands:
+- az_databricks_workspace
+- az_databricks_workspace_create
+- az_databricks_workspace_delete
+- az_databricks_workspace_list
+- az_databricks_workspace_show
+- az_databricks_workspace_update
+- az_databricks_workspace_vnet-peering
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+- az_databricks_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage databricks workspaces.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databricks/workspace.yml b/2019-03-01-hybrid/docs-ref-autogen/databricks/workspace.yml
new file mode 100644
index 0000000000..a0e6c5ced3
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databricks/workspace.yml
@@ -0,0 +1,278 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks_workspace
+name: az databricks workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databricks workspace.
+description: ''
+directCommands:
+- uid: az_databricks_workspace_create
+  name: az databricks workspace create
+  summary: Create a new workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace create --location
+                                   --name
+                                   --resource-group
+                                   --sku {premium, standard, trial}
+                                   [--enable-no-public-ip]
+                                   [--managed-resource-group]
+                                   [--no-wait]
+                                   [--prepare-encryption]
+                                   [--private-subnet]
+                                   [--public-subnet]
+                                   [--require-infrastructure-encryption]
+                                   [--tags]
+                                   [--vnet]
+  examples:
+  - summary: Create a workspace
+    syntax: az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location westus --sku standard
+  - summary: Create a workspace with managed identity for storage account
+    syntax: az databricks workspace create --resource-group MyResourceGroup --name MyWorkspace --location eastus2euap --sku premium --prepare-encryption
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    parameterValueGroup: premium, standard, trial
+    summary: The SKU tier name.
+    description: ''
+  optionalParameters:
+  - name: --enable-no-public-ip
+    summary: Flag to enable the no public ip feature.
+    description: ''
+  - name: --managed-resource-group
+    summary: The managed resource group to create. It can be either a name or a resource ID.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prepare-encryption
+    summary: Flag to enable the Managed Identity for managed storage account to prepare for CMK encryption.
+    description: ''
+  - name: --private-subnet
+    summary: The name of a Private Subnet within the Virtual Network.
+    description: ''
+  - name: --public-subnet
+    summary: The name of a Public Subnet within the Virtual Network.
+    description: ''
+  - name: --require-infrastructure-encryption
+    summary: Flag to enable the DBFS root file system with secondary layer of encryption with platform managed keys for data at rest.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --vnet
+    summary: Virtual Network name or resource ID.
+    description: ''
+- uid: az_databricks_workspace_delete
+  name: az databricks workspace delete
+  summary: Delete the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace delete --name
+                                   --resource-group
+                                   [--no-wait]
+                                   [--yes]
+  examples:
+  - summary: Delete the workspace
+    syntax: az databricks workspace delete --resource-group MyResourceGroup --name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_databricks_workspace_list
+  name: az databricks workspace list
+  summary: Get all the workspaces.
+  description: ''
+  syntax: az databricks workspace list [--resource-group]
+  examples:
+  - summary: List workspaces within a resource group
+    syntax: az databricks workspace list --resource-group MyResourceGroup
+  - summary: List workspaces within the default subscription
+    syntax: az databricks workspace list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databricks_workspace_show
+  name: az databricks workspace show
+  summary: Show the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace show --name
+                                 --resource-group
+  examples:
+  - summary: Show the workspace
+    syntax: az databricks workspace show --resource-group MyResourceGroup --name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_databricks_workspace_update
+  name: az databricks workspace update
+  summary: Update the workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace update --name
+                                   --resource-group
+                                   [--key-name]
+                                   [--key-source {Default, Microsoft.Keyvault}]
+                                   [--key-vault]
+                                   [--key-version]
+                                   [--no-wait]
+                                   [--prepare-encryption]
+                                   [--tags]
+  examples:
+  - summary: Update the workspace's tags.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags key1=value1 key2=value2
+  - summary: Clean the workspace's tags.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --tags ""
+  - summary: Prepare for CMK encryption by assigning identity for storage account.
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --prepare-encryption
+  - summary: Configure CMK encryption
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --key-source Microsoft.KeyVault --key-name MyKey --key-vault https://myKeyVault.vault.azure.net/ --key-version 00000000000000000000000000000000
+  - summary: Revert encryption to Microsoft Managed Keys
+    syntax: az databricks workspace update --resource-group MyResourceGroup --name MyWorkspace --key-source Default
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    summary: The name of KeyVault key.
+    description: ''
+  - name: --key-source
+    parameterValueGroup: Default, Microsoft.Keyvault
+    summary: The encryption key source (provider).
+    description: ''
+  - name: --key-vault
+    summary: The Uri of KeyVault.
+    description: ''
+  - name: --key-version
+    summary: The version of KeyVault key. It is optional when updating CMK.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --prepare-encryption
+    summary: Flag to enable the Managed Identity for managed storage account to prepare for CMK encryption.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_databricks_workspace_wait
+  name: az databricks workspace wait
+  summary: Place the CLI in a waiting state until a condition of the Databricks workspace is met.
+  description: ''
+  syntax: >-
+    az databricks workspace wait --name
+                                 --resource-group
+                                 [--created]
+                                 [--custom]
+                                 [--deleted]
+                                 [--exists]
+                                 [--interval]
+                                 [--timeout]
+                                 [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Databricks workspace is successfully provisioned.
+    syntax: az databricks workspace wait --resource-group MyResourceGroup --name MyWorkspace \ --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_databricks_workspace_create
+- az_databricks_workspace_delete
+- az_databricks_workspace_list
+- az_databricks_workspace_show
+- az_databricks_workspace_update
+- az_databricks_workspace_vnet-peering
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+- az_databricks_workspace_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databricks workspace.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/databricks/workspace/vnet-peering.yml b/2019-03-01-hybrid/docs-ref-autogen/databricks/workspace/vnet-peering.yml
new file mode 100644
index 0000000000..3eb423318a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/databricks/workspace/vnet-peering.yml
@@ -0,0 +1,270 @@
+### YamlMime:AzureCLIGroup
+uid: az_databricks_workspace_vnet-peering
+name: az databricks workspace vnet-peering
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **databricks** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az databricks workspace vnet-peering** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage databricks workspace vnet peering.
+description: ''
+directCommands:
+- uid: az_databricks_workspace_vnet-peering_create
+  name: az databricks workspace vnet-peering create
+  summary: Create a vnet peering for a workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering create --name
+                                                --remote-vnet
+                                                --resource-group
+                                                --workspace-name
+                                                [--allow-forwarded-traffic {false, true}]
+                                                [--allow-gateway-transit {false, true}]
+                                                [--allow-virtual-network-access {false, true}]
+                                                [--no-wait]
+                                                [--use-remote-gateways {false, true}]
+  examples:
+  - summary: Create a vnet peering for a workspace
+    syntax: >-
+      az databricks workspace vnet-peering create --resource-group MyResourceGroup --workspace-name MyWorkspace \
+
+      -n MyPeering --remote-vnet /subscriptions/000000-0000-0000/resourceGroups/MyRG/providers/Microsoft.Network/virtualNetworks/MyVNet
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --remote-vnet
+    summary: The remote virtual network name or Resource ID.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --allow-forwarded-traffic
+    parameterValueGroup: false, true
+    summary: Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+    description: ''
+  - name: --allow-gateway-transit
+    parameterValueGroup: false, true
+    summary: If gateway links can be used in remote virtual networking to link to this virtual network.
+    description: ''
+  - name: --allow-virtual-network-access
+    parameterValueGroup: false, true
+    summary: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --use-remote-gateways
+    parameterValueGroup: false, true
+    summary: If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_delete
+  name: az databricks workspace vnet-peering delete
+  summary: Delete the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering delete --name
+                                                --resource-group
+                                                --workspace-name
+                                                [--no-wait]
+  examples:
+  - summary: Delete the vnet peering.
+    syntax: az databricks workspace vnet-peering delete --resource-group MyResourceGroup --workspace-name MyWorkspace -n MyPeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_list
+  name: az databricks workspace vnet-peering list
+  summary: List vnet peerings under a workspace.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering list --resource-group
+                                              --workspace-name
+  examples:
+  - summary: List vnet peerings under a workspace.
+    syntax: az databricks workspace vnet-peering list --resource-group MyResourceGroup --workspace-name MyWorkspace
+  requiredParameters:
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_show
+  name: az databricks workspace vnet-peering show
+  summary: Show the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering show --name
+                                              --resource-group
+                                              --workspace-name
+  examples:
+  - summary: Show the vnet peering
+    syntax: az databricks workspace vnet-peering show --resource-group MyResourceGroup --workspace-name MyWorkspace -n MyPeering
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_update
+  name: az databricks workspace vnet-peering update
+  summary: Update the vnet peering.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering update --name
+                                                --resource-group
+                                                --workspace-name
+                                                [--allow-forwarded-traffic {false, true}]
+                                                [--allow-gateway-transit {false, true}]
+                                                [--allow-virtual-network-access {false, true}]
+                                                [--no-wait]
+                                                [--use-remote-gateways {false, true}]
+  examples:
+  - summary: Update the vnet peering (enable gateway transit and disable virtual network access).
+    syntax: >-
+      az databricks workspace vnet-peering update --resource-group MyResourceGroup --workspace-name MyWorkspace \
+
+      -n MyPeering --allow-gateway-transit --allow-virtual-network-access false
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --allow-forwarded-traffic
+    parameterValueGroup: false, true
+    summary: Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network.
+    description: ''
+  - name: --allow-gateway-transit
+    parameterValueGroup: false, true
+    summary: If gateway links can be used in remote virtual networking to link to this virtual network.
+    description: ''
+  - name: --allow-virtual-network-access
+    parameterValueGroup: false, true
+    summary: Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --use-remote-gateways
+    parameterValueGroup: false, true
+    summary: If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway.
+    description: ''
+- uid: az_databricks_workspace_vnet-peering_wait
+  name: az databricks workspace vnet-peering wait
+  summary: Place the CLI in a waiting state until a condition of the Databricks workspace vnet peering is met.
+  description: ''
+  syntax: >-
+    az databricks workspace vnet-peering wait --name
+                                              --resource-group
+                                              --workspace-name
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the Databricks workspace vnet peering is successfully provisioned.
+    syntax: az databricks workspace vnet-peering wait --resource-group MyResourceGroup --workspace-name MyWorkspace \ --name MyPeering --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the vnet peering.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --workspace-name
+    summary: The name of the workspace.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_databricks_workspace_vnet-peering_create
+- az_databricks_workspace_vnet-peering_delete
+- az_databricks_workspace_vnet-peering_list
+- az_databricks_workspace_vnet-peering_show
+- az_databricks_workspace_vnet-peering_update
+- az_databricks_workspace_vnet-peering_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage databricks workspace vnet peering.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datadog.yml b/2019-03-01-hybrid/docs-ref-autogen/datadog.yml
new file mode 100644
index 0000000000..c022011242
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datadog.yml
@@ -0,0 +1,55 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog
+name: az datadog
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_datadog_monitor
+- az_datadog_monitor_create
+- az_datadog_monitor_delete
+- az_datadog_monitor_get-default-key
+- az_datadog_monitor_list
+- az_datadog_monitor_list-api-key
+- az_datadog_monitor_list-host
+- az_datadog_monitor_list-linked-resource
+- az_datadog_monitor_list-monitored-resource
+- az_datadog_monitor_refresh-set-password-link
+- az_datadog_monitor_set-default-key
+- az_datadog_monitor_show
+- az_datadog_monitor_update
+- az_datadog_monitor_wait
+- az_datadog_sso-config
+- az_datadog_sso-config_create
+- az_datadog_sso-config_list
+- az_datadog_sso-config_show
+- az_datadog_sso-config_update
+- az_datadog_sso-config_wait
+- az_datadog_tag-rule
+- az_datadog_tag-rule_create
+- az_datadog_tag-rule_list
+- az_datadog_tag-rule_show
+- az_datadog_tag-rule_update
+- az_datadog_terms
+- az_datadog_terms_create
+- az_datadog_terms_list
+- az_datadog_terms_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datadog/monitor.yml b/2019-03-01-hybrid/docs-ref-autogen/datadog/monitor.yml
new file mode 100644
index 0000000000..d434256cdc
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datadog/monitor.yml
@@ -0,0 +1,401 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_monitor
+name: az datadog monitor
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog monitor** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage monitor with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_monitor_create
+  name: az datadog monitor create
+  summary: Create a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor create --monitor-name
+                              --resource-group
+                              [--datadog-organization-properties]
+                              [--location]
+                              [--no-wait]
+                              [--sku-name]
+                              [--tags]
+                              [--type {SystemAssigned, UserAssigned}]
+                              [--user-info]
+  examples:
+  - summary: Monitors_Create
+    syntax: az datadog monitor create --name "myMonitor" --resource-group "myResourceGroup" --location "West US 2" --tags Environment="Dev" --user-info name="Alice" email-address="alice@microsoft.com" phone-number="123-456-7890" --type "SystemAssigned" --sku-name "payg_v2_Monthly"
+  - summary: Monitors creation with linking to Datadogo organization.
+    syntax: az datadog monitor create --name "myMonitor" --resource-group "myResourceGroup" --location "West US 2" --datadog-organization-properties api-key=XX application-key=XX --tags Environment="Dev" --user-info name="Alice" email-address="alice@microsoft.com" phone-number="123-456-7890" --type "SystemAssigned" --sku-name "Linked"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --datadog-organization-properties
+    summary: Datadog organization properties.
+    description: >-
+      Usage: --datadog-organization-properties linking-auth-code=XX linking-client-id=XX redirect-uri=XX api-key=XX application-key=XX enterprise-app-id=XX
+
+
+      linking-auth-code: The auth code used to linking to an existing datadog organization.
+
+      linking-client-id: The client_id from an existing in exchange for an auth token to link organization.
+
+      redirect-uri: The redirect uri for linking.
+
+      api-key: Api key associated to the Datadog organization.
+
+      application-key: Application key associated to the Datadog organization.
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign on.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku-name
+    summary: Name of the SKU.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --type
+    parameterValueGroup: SystemAssigned, UserAssigned
+    summary: Identity type.
+    description: ''
+  - name: --user-info
+    summary: User info.
+    description: >-
+      Usage: --user-info name=XX email-address=XX phone-number=XX
+
+
+      name: Name of the user
+
+      email-address: Email of the user used by Datadog for contacting them if needed
+
+      phone-number: Phone number of the user used by Datadog for contacting them if needed.
+- uid: az_datadog_monitor_delete
+  name: az datadog monitor delete
+  summary: Delete a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor delete --monitor-name
+                              --resource-group
+                              [--no-wait]
+                              [--yes]
+  examples:
+  - summary: Monitors_Delete
+    syntax: az datadog monitor delete --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datadog_monitor_get-default-key
+  name: az datadog monitor get-default-key
+  summary: Get the default api key.
+  description: ''
+  syntax: >-
+    az datadog monitor get-default-key --monitor-name
+                                       --resource-group
+  examples:
+  - summary: Monitors_GetDefaultKey
+    syntax: az datadog monitor get-default-key --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list
+  name: az datadog monitor list
+  summary: List all monitors under the specified resource group. And List all monitors under the specified subscription.
+  description: ''
+  syntax: az datadog monitor list [--resource-group]
+  examples:
+  - summary: Monitors_ListByResourceGroup
+    syntax: az datadog monitor list --resource-group "myResourceGroup"
+  - summary: Monitors_List
+    syntax: az datadog monitor list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-api-key
+  name: az datadog monitor list-api-key
+  summary: List the api keys for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-api-key --monitor-name
+                                    --resource-group
+  examples:
+  - summary: Monitors_ListApiKeys
+    syntax: az datadog monitor list-api-key --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-host
+  name: az datadog monitor list-host
+  summary: List the hosts for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-host --monitor-name
+                                 --resource-group
+  examples:
+  - summary: Monitors_ListHosts
+    syntax: az datadog monitor list-host --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-linked-resource
+  name: az datadog monitor list-linked-resource
+  summary: List all Azure resources associated to the same Datadog organization as the target resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-linked-resource --monitor-name
+                                            --resource-group
+  examples:
+  - summary: Monitors_ListLinkedResources
+    syntax: az datadog monitor list-linked-resource --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_list-monitored-resource
+  name: az datadog monitor list-monitored-resource
+  summary: List the resources currently being monitored by the Datadog monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor list-monitored-resource --monitor-name
+                                               --resource-group
+  examples:
+  - summary: Monitors_ListMonitoredResources
+    syntax: az datadog monitor list-monitored-resource --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_refresh-set-password-link
+  name: az datadog monitor refresh-set-password-link
+  summary: Refresh the set password link and return a latest one.
+  description: ''
+  syntax: >-
+    az datadog monitor refresh-set-password-link --monitor-name
+                                                 --resource-group
+  examples:
+  - summary: Monitors_RefreshSetPasswordLink
+    syntax: az datadog monitor refresh-set-password-link --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_set-default-key
+  name: az datadog monitor set-default-key
+  summary: Set the default api key.
+  description: ''
+  syntax: >-
+    az datadog monitor set-default-key --monitor-name
+                                       --resource-group
+                                       [--created]
+                                       [--created-by]
+                                       [--key]
+                                       [--name]
+  examples:
+  - summary: Monitors_SetDefaultKey
+    syntax: az datadog monitor set-default-key --monitor-name "myMonitor" --key "1111111111111111aaaaaaaaaaaaaaaa" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: The time of creation of the API key.
+    description: ''
+  - name: --created-by
+    summary: The user that created the API key.
+    description: ''
+  - name: --key
+    summary: The value of the API key.
+    description: ''
+  - name: --name
+    summary: The name of the API key.
+    description: ''
+- uid: az_datadog_monitor_show
+  name: az datadog monitor show
+  summary: Get the properties of a specific monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor show --monitor-name
+                            --resource-group
+  examples:
+  - summary: Monitors_Get
+    syntax: az datadog monitor show --name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_monitor_update
+  name: az datadog monitor update
+  summary: Update a monitor resource.
+  description: ''
+  syntax: >-
+    az datadog monitor update --monitor-name
+                              --resource-group
+                              [--tags]
+  examples:
+  - summary: Monitors_Update
+    syntax: az datadog monitor update --name "myMonitor" --tags Environment="Dev" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datadog_monitor_wait
+  name: az datadog monitor wait
+  summary: Place the CLI in a waiting state until a condition of the datadog monitor is met.
+  description: ''
+  syntax: >-
+    az datadog monitor wait --monitor-name
+                            --resource-group
+                            [--created]
+                            [--custom]
+                            [--deleted]
+                            [--exists]
+                            [--interval]
+                            [--timeout]
+                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datadog monitor is successfully created.
+    syntax: az datadog monitor wait --name "myMonitor" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the datadog monitor is successfully deleted.
+    syntax: az datadog monitor wait --name "myMonitor" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name --name -n
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datadog_monitor_create
+- az_datadog_monitor_delete
+- az_datadog_monitor_get-default-key
+- az_datadog_monitor_list
+- az_datadog_monitor_list-api-key
+- az_datadog_monitor_list-host
+- az_datadog_monitor_list-linked-resource
+- az_datadog_monitor_list-monitored-resource
+- az_datadog_monitor_refresh-set-password-link
+- az_datadog_monitor_set-default-key
+- az_datadog_monitor_show
+- az_datadog_monitor_update
+- az_datadog_monitor_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage monitor with datadog.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datadog/sso-config.yml b/2019-03-01-hybrid/docs-ref-autogen/datadog/sso-config.yml
new file mode 100644
index 0000000000..f650395664
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datadog/sso-config.yml
@@ -0,0 +1,224 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_sso-config
+name: az datadog sso-config
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog sso-config** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage sso config with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_sso-config_create
+  name: az datadog sso-config create
+  summary: Configures single-sign-on for this resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config create --configuration-name
+                                 --monitor-name
+                                 --resource-group
+                                 [--no-wait]
+                                 [--properties]
+  examples:
+  - summary: SingleSignOnConfigurations_CreateOrUpdate
+    syntax: az datadog sso-config create --configuration-name "default" --monitor-name "myMonitor" --properties enterprise-app-id="00000000-0000-0000-0000-000000000000" single-sign-on-state="Enable" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --properties
+    summary: ''
+    description: >-
+      Usage: --properties provisioning-state=XX single-sign-on-state=XX enterprise-app-id=XX
+
+
+      single-sign-on-state: Various states of the SSO resource
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign-on.
+- uid: az_datadog_sso-config_list
+  name: az datadog sso-config list
+  summary: List the single sign-on configurations for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config list --monitor-name
+                               --resource-group
+  examples:
+  - summary: SingleSignOnConfigurations_List
+    syntax: az datadog sso-config list --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_sso-config_show
+  name: az datadog sso-config show
+  summary: Gets the datadog single sign-on resource for the given Monitor.
+  description: ''
+  syntax: >-
+    az datadog sso-config show --configuration-name
+                               --monitor-name
+                               --resource-group
+  examples:
+  - summary: SingleSignOnConfigurations_Get
+    syntax: az datadog sso-config show --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_sso-config_update
+  name: az datadog sso-config update
+  summary: Configures single-sign-on for this resource.
+  description: ''
+  syntax: >-
+    az datadog sso-config update --configuration-name
+                                 --monitor-name
+                                 --resource-group
+                                 [--add]
+                                 [--force-string]
+                                 [--no-wait]
+                                 [--properties]
+                                 [--remove]
+                                 [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --properties
+    summary: ''
+    description: >-
+      Usage: --properties provisioning-state=XX single-sign-on-state=XX enterprise-app-id=XX
+
+
+      single-sign-on-state: Various states of the SSO resource
+
+      enterprise-app-id: The Id of the Enterprise App used for Single sign-on.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_datadog_sso-config_wait
+  name: az datadog sso-config wait
+  summary: Place the CLI in a waiting state until a condition of the datadog sso-config is met.
+  description: ''
+  syntax: >-
+    az datadog sso-config wait --configuration-name
+                               --monitor-name
+                               --resource-group
+                               [--created]
+                               [--custom]
+                               [--deleted]
+                               [--exists]
+                               [--interval]
+                               [--timeout]
+                               [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datadog sso-config is successfully created.
+    syntax: az datadog sso-config wait --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the datadog sso-config is successfully updated.
+    syntax: az datadog sso-config wait --configuration-name "default" --monitor-name "myMonitor" --resource-group "myResourceGroup" --updated
+  requiredParameters:
+  - isRequired: true
+    name: --configuration-name
+    summary: Configuration name.
+    description: ''
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datadog_sso-config_create
+- az_datadog_sso-config_list
+- az_datadog_sso-config_show
+- az_datadog_sso-config_update
+- az_datadog_sso-config_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage sso config with datadog.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datadog/tag-rule.yml b/2019-03-01-hybrid/docs-ref-autogen/datadog/tag-rule.yml
new file mode 100644
index 0000000000..f3ed087fa6
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datadog/tag-rule.yml
@@ -0,0 +1,228 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_tag-rule
+name: az datadog tag-rule
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog tag-rule** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage tag rule with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_tag-rule_create
+  name: az datadog tag-rule create
+  summary: Create a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule create --monitor-name
+                               --resource-group
+                               --rule-set-name
+                               [--filtering-tags]
+                               [--log-rules-filtering-tags]
+                               [--send-aad-logs {false, true}]
+                               [--send-resource-logs {false, true}]
+                               [--send-subscription-logs {false, true}]
+  examples:
+  - summary: TagRules_CreateOrUpdate
+    syntax: az datadog tag-rule create --monitor-name "myMonitor" --log-rules-filtering-tags name="Environment" action="Include" value="Prod" --log-rules-filtering-tags name="Environment" action="Exclude" value="Dev" --send-aad-logs false --send-resource-logs true --send-subscription-logs true --resource-group "myResourceGroup" --rule-set-name "default"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+  optionalParameters:
+  - name: --filtering-tags
+    summary: List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --filtering-tags argument.
+  - name: --log-rules-filtering-tags
+    summary: List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --log-rules-filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --log-rules-filtering-tags argument.
+  - name: --send-aad-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if AAD logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-resource-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure resource logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-subscription-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure subscription logs should be sent for the Monitor resource.
+    description: ''
+- uid: az_datadog_tag-rule_list
+  name: az datadog tag-rule list
+  summary: List the tag rules for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule list --monitor-name
+                             --resource-group
+  examples:
+  - summary: TagRules_List
+    syntax: az datadog tag-rule list --monitor-name "myMonitor" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datadog_tag-rule_show
+  name: az datadog tag-rule show
+  summary: Get a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule show --monitor-name
+                             --resource-group
+                             --rule-set-name
+  examples:
+  - summary: TagRules_Get
+    syntax: az datadog tag-rule show --monitor-name "myMonitor" --resource-group "myResourceGroup" --rule-set-name "default"
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+- uid: az_datadog_tag-rule_update
+  name: az datadog tag-rule update
+  summary: Update a tag rule set for a given monitor resource.
+  description: ''
+  syntax: >-
+    az datadog tag-rule update --monitor-name
+                               --resource-group
+                               --rule-set-name
+                               [--add]
+                               [--filtering-tags]
+                               [--force-string]
+                               [--log-rules-filtering-tags]
+                               [--remove]
+                               [--send-aad-logs {false, true}]
+                               [--send-resource-logs {false, true}]
+                               [--send-subscription-logs {false, true}]
+                               [--set]
+  requiredParameters:
+  - isRequired: true
+    name: --monitor-name
+    summary: Monitor resource name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --rule-set-name
+    summary: Rule set name.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --filtering-tags
+    summary: List of filtering tags to be used for capturing metrics. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --filtering-tags argument.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --log-rules-filtering-tags
+    summary: List of filtering tags to be used for capturing logs. This only takes effect if SendResourceLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.
+    description: >-
+      Usage: --log-rules-filtering-tags name=XX value=XX action=XX
+
+
+      name: The name (also known as the key) of the tag.
+
+      value: The value of the tag.
+
+      action: Valid actions for a filtering tag. Exclusion takes priority over inclusion.
+
+
+      Multiple actions can be specified by using more than one --log-rules-filtering-tags argument.
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --send-aad-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if AAD logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-resource-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure resource logs should be sent for the Monitor resource.
+    description: ''
+  - name: --send-subscription-logs
+    parameterValueGroup: false, true
+    summary: Flag specifying if Azure subscription logs should be sent for the Monitor resource.
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_datadog_tag-rule_create
+- az_datadog_tag-rule_list
+- az_datadog_tag-rule_show
+- az_datadog_tag-rule_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage tag rule with datadog.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datadog/terms.yml b/2019-03-01-hybrid/docs-ref-autogen/datadog/terms.yml
new file mode 100644
index 0000000000..43aee9f595
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datadog/terms.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_datadog_terms
+name: az datadog terms
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datadog** extension for Azure CLI and requires version 2.17.0 or higher.  The extension will automatically install the first time you run an **az datadog terms** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage marketplace agreements with datadog.
+description: ''
+directCommands:
+- uid: az_datadog_terms_create
+  name: az datadog terms create
+  summary: Create Datadog marketplace agreement in the subscription.
+  description: ''
+  syntax: az datadog terms create [--properties]
+  examples:
+  - summary: MarketplaceAgreements_CreateOrUpdate
+    syntax: az datadog terms create --properties accepted=true
+  optionalParameters:
+  - name: --properties
+    summary: Represents the properties of the resource.
+    description: >-
+      Usage: --properties publisher=XX product=XX plan=XX license-text-link=XX privacy-policy-link=XX retrieve-datetime=XX signature=XX accepted=XX
+
+
+      publisher: Publisher identifier string.
+
+      product: Product identifier string.
+
+      plan: Plan identifier string.
+
+      license-text-link: Link to HTML with Microsoft and Publisher terms.
+
+      privacy-policy-link: Link to the privacy policy of the publisher.
+
+      retrieve-datetime: Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.
+
+      signature: Terms signature.
+
+      accepted: If any version of the terms have been accepted, otherwise false.
+- uid: az_datadog_terms_list
+  name: az datadog terms list
+  summary: List datadog marketplace agreements.
+  description: ''
+  syntax: az datadog terms list
+  examples:
+  - summary: List marketplace agreements
+    syntax: az datadog terms list
+- uid: az_datadog_terms_update
+  name: az datadog terms update
+  summary: Update Datadog marketplace agreement in the subscription.
+  description: ''
+  syntax: az datadog terms update [--properties]
+  optionalParameters:
+  - name: --properties
+    summary: Represents the properties of the resource.
+    description: >-
+      Usage: --properties publisher=XX product=XX plan=XX license-text-link=XX privacy-policy-link=XX retrieve-datetime=XX signature=XX accepted=XX
+
+
+      publisher: Publisher identifier string.
+
+      product: Product identifier string.
+
+      plan: Plan identifier string.
+
+      license-text-link: Link to HTML with Microsoft and Publisher terms.
+
+      privacy-policy-link: Link to the privacy policy of the publisher.
+
+      retrieve-datetime: Date and time in UTC of when the terms were accepted. This is empty if Accepted is false.
+
+      signature: Terms signature.
+
+      accepted: If any version of the terms have been accepted, otherwise false.
+commands:
+- az_datadog_terms_create
+- az_datadog_terms_list
+- az_datadog_terms_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage marketplace agreements with datadog.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory.yml
new file mode 100644
index 0000000000..dddd6f3be0
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory.yml
@@ -0,0 +1,404 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory
+name: az datafactory
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage factory with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_configure-factory-repo
+  name: az datafactory configure-factory-repo
+  summary: Updates a factory's repo information.
+  description: ''
+  syntax: >-
+    az datafactory configure-factory-repo --location
+                                          [--factory-git-hub-configuration]
+                                          [--factory-resource-id]
+                                          [--factory-vsts-configuration]
+  examples:
+  - summary: Factories_ConfigureFactoryRepo
+    syntax: az datafactory configure-factory-repo --factory-resource-id "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName" --factory-vsts-configuration account-name="ADF" collaboration-branch="master" last-commit-id="" project-name="project" repository-name="repo" root-folder="/" tenant-id="" --location "East US"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  optionalParameters:
+  - name: --factory-git-hub-configuration --github-config
+    summary: Factory's GitHub repo information.
+    description: >-
+      Usage: --factory-git-hub-configuration host-name=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      host-name: GitHub Enterprise host name. For example: https://github.mydomain.com
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --factory-resource-id
+    summary: The factory resource id.
+    description: ''
+  - name: --factory-vsts-configuration --vsts-config
+    summary: Factory's VSTS repo information.
+    description: >-
+      Usage: --factory-vsts-configuration project-name=XX tenant-id=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      project-name: Required. VSTS project name.
+
+      tenant-id: VSTS tenant id.
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+- uid: az_datafactory_create
+  name: az datafactory create
+  summary: Create a factory.
+  description: ''
+  syntax: >-
+    az datafactory create --factory-name
+                          --resource-group
+                          [--factory-git-hub-configuration]
+                          [--factory-vsts-configuration]
+                          [--global-parameters]
+                          [--if-match]
+                          [--location]
+                          [--tags]
+  examples:
+  - summary: Factories_CreateOrUpdate
+    syntax: az datafactory create --location "East US" --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --factory-git-hub-configuration --github-config
+    summary: Factory's GitHub repo information.
+    description: >-
+      Usage: --factory-git-hub-configuration host-name=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      host-name: GitHub Enterprise host name. For example: https://github.mydomain.com
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --factory-vsts-configuration --vsts-config
+    summary: Factory's VSTS repo information.
+    description: >-
+      Usage: --factory-vsts-configuration project-name=XX tenant-id=XX type=XX account-name=XX repository-name=XX collaboration-branch=XX root-folder=XX last-commit-id=XX
+
+
+      project-name: Required. VSTS project name.
+
+      tenant-id: VSTS tenant id.
+
+      type: Required. Type of repo configuration.
+
+      account-name: Required. Account name.
+
+      repository-name: Required. Repository name.
+
+      collaboration-branch: Required. Collaboration branch.
+
+      root-folder: Required. Root folder.
+
+      last-commit-id: Last commit id.
+  - name: --global-parameters
+    summary: 'List of parameters for factory. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --if-match
+    summary: ETag of the factory entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datafactory_delete
+  name: az datafactory delete
+  summary: Deletes a factory.
+  description: ''
+  syntax: >-
+    az datafactory delete --factory-name
+                          --resource-group
+                          [--yes]
+  examples:
+  - summary: Factories_Delete
+    syntax: az datafactory delete --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_get-data-plane-access
+  name: az datafactory get-data-plane-access
+  summary: Get Data Plane access.
+  description: ''
+  syntax: >-
+    az datafactory get-data-plane-access --factory-name
+                                         --resource-group
+                                         [--access-resource-path]
+                                         [--expire-time]
+                                         [--permissions]
+                                         [--profile-name]
+                                         [--start-time]
+  examples:
+  - summary: Factories_GetDataPlaneAccess
+    syntax: az datafactory get-data-plane-access --name "exampleFactoryName" --access-resource-path "" --expire-time "2018-11-10T09:46:20.2659347Z" --permissions "r" --profile-name "DefaultProfile" --start-time "2018-11-10T02:46:20.2659347Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --access-resource-path
+    summary: The resource path to get access relative to factory. Currently only empty string is supported which corresponds to the factory resource.
+    description: ''
+  - name: --expire-time
+    summary: Expiration time for the token. Maximum duration for the token is eight hours and by default the token will expire in eight hours.
+    description: ''
+  - name: --permissions
+    summary: The string with permissions for Data Plane access. Currently only 'r' is supported which grants read only access.
+    description: ''
+  - name: --profile-name
+    summary: The name of the profile. Currently only the default is supported. The default value is DefaultProfile.
+    description: ''
+  - name: --start-time
+    summary: Start time for the token. If not specified the current time will be used.
+    description: ''
+- uid: az_datafactory_get-git-hub-access-token
+  name: az datafactory get-git-hub-access-token
+  summary: Get GitHub Access Token.
+  description: ''
+  syntax: >-
+    az datafactory get-git-hub-access-token --factory-name
+                                            --git-hub-access-code
+                                            --git-hub-access-token-base-url
+                                            --resource-group
+                                            [--git-hub-client-id]
+  examples:
+  - summary: Factories_GetGitHubAccessToken
+    syntax: az datafactory get-git-hub-access-token --name "exampleFactoryName" --git-hub-access-code "some" --git-hub-access-token-base-url "some" --git-hub-client-id "some" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --git-hub-access-code
+    summary: GitHub access code.
+    description: ''
+  - isRequired: true
+    name: --git-hub-access-token-base-url
+    summary: GitHub access token base URL.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --git-hub-client-id
+    summary: GitHub application client ID.
+    description: ''
+- uid: az_datafactory_list
+  name: az datafactory list
+  summary: Lists factories. And Lists factories under the specified subscription.
+  description: ''
+  syntax: az datafactory list [--resource-group]
+  examples:
+  - summary: Factories_ListByResourceGroup
+    syntax: az datafactory list --resource-group "exampleResourceGroup"
+  - summary: Factories_List
+    syntax: az datafactory list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_show
+  name: az datafactory show
+  summary: Gets a factory.
+  description: ''
+  syntax: >-
+    az datafactory show --factory-name
+                        --resource-group
+                        [--if-none-match]
+  examples:
+  - summary: Factories_Get
+    syntax: az datafactory show --name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the factory entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_update
+  name: az datafactory update
+  summary: Updates a factory.
+  description: ''
+  syntax: >-
+    az datafactory update --factory-name
+                          --resource-group
+                          [--tags]
+  examples:
+  - summary: Factories_Update
+    syntax: az datafactory update --name "exampleFactoryName" --tags exampleTag="exampleValue" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name --name -n
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_datafactory_activity-run
+- az_datafactory_activity-run_query-by-pipeline-run
+- az_datafactory_configure-factory-repo
+- az_datafactory_create
+- az_datafactory_dataset
+- az_datafactory_dataset_create
+- az_datafactory_dataset_delete
+- az_datafactory_dataset_list
+- az_datafactory_dataset_show
+- az_datafactory_dataset_update
+- az_datafactory_delete
+- az_datafactory_get-data-plane-access
+- az_datafactory_get-git-hub-access-token
+- az_datafactory_integration-runtime
+- az_datafactory_integration-runtime_delete
+- az_datafactory_integration-runtime_get-connection-info
+- az_datafactory_integration-runtime_get-monitoring-data
+- az_datafactory_integration-runtime_get-status
+- az_datafactory_integration-runtime_linked-integration-runtime
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+- az_datafactory_integration-runtime_list
+- az_datafactory_integration-runtime_list-auth-key
+- az_datafactory_integration-runtime_managed
+- az_datafactory_integration-runtime_managed_create
+- az_datafactory_integration-runtime_regenerate-auth-key
+- az_datafactory_integration-runtime_remove-link
+- az_datafactory_integration-runtime_self-hosted
+- az_datafactory_integration-runtime_self-hosted_create
+- az_datafactory_integration-runtime_show
+- az_datafactory_integration-runtime_start
+- az_datafactory_integration-runtime_stop
+- az_datafactory_integration-runtime_sync-credentials
+- az_datafactory_integration-runtime_update
+- az_datafactory_integration-runtime_upgrade
+- az_datafactory_integration-runtime_wait
+- az_datafactory_integration-runtime-node
+- az_datafactory_integration-runtime-node_delete
+- az_datafactory_integration-runtime-node_get-ip-address
+- az_datafactory_integration-runtime-node_show
+- az_datafactory_integration-runtime-node_update
+- az_datafactory_linked-service
+- az_datafactory_linked-service_create
+- az_datafactory_linked-service_delete
+- az_datafactory_linked-service_list
+- az_datafactory_linked-service_show
+- az_datafactory_linked-service_update
+- az_datafactory_list
+- az_datafactory_pipeline
+- az_datafactory_pipeline_create
+- az_datafactory_pipeline_create-run
+- az_datafactory_pipeline_delete
+- az_datafactory_pipeline_list
+- az_datafactory_pipeline_show
+- az_datafactory_pipeline_update
+- az_datafactory_pipeline-run
+- az_datafactory_pipeline-run_cancel
+- az_datafactory_pipeline-run_query-by-factory
+- az_datafactory_pipeline-run_show
+- az_datafactory_show
+- az_datafactory_trigger
+- az_datafactory_trigger_create
+- az_datafactory_trigger_delete
+- az_datafactory_trigger_get-event-subscription-status
+- az_datafactory_trigger_list
+- az_datafactory_trigger_query-by-factory
+- az_datafactory_trigger_show
+- az_datafactory_trigger_start
+- az_datafactory_trigger_stop
+- az_datafactory_trigger_subscribe-to-event
+- az_datafactory_trigger_unsubscribe-from-event
+- az_datafactory_trigger_update
+- az_datafactory_trigger_wait
+- az_datafactory_trigger-run
+- az_datafactory_trigger-run_cancel
+- az_datafactory_trigger-run_query-by-factory
+- az_datafactory_trigger-run_rerun
+- az_datafactory_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage factory with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/activity-run.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/activity-run.yml
new file mode 100644
index 0000000000..5a4487a65f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/activity-run.yml
@@ -0,0 +1,96 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_activity-run
+name: az datafactory activity-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory activity-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage activity run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_activity-run_query-by-pipeline-run
+  name: az datafactory activity-run query-by-pipeline-run
+  summary: Query activity runs based on input filter conditions.
+  description: ''
+  syntax: >-
+    az datafactory activity-run query-by-pipeline-run --factory-name
+                                                      --last-updated-after
+                                                      --last-updated-before
+                                                      --resource-group
+                                                      --run-id
+                                                      [--continuation-token]
+                                                      [--filters]
+                                                      [--order-by]
+  examples:
+  - summary: ActivityRuns_QueryByPipelineRun
+    syntax: az datafactory activity-run query-by-pipeline-run --factory-name "exampleFactoryName" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+commands:
+- az_datafactory_activity-run_query-by-pipeline-run
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage activity run with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/dataset.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/dataset.yml
new file mode 100644
index 0000000000..6d566d2665
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/dataset.yml
@@ -0,0 +1,226 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_dataset
+name: az datafactory dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage dataset with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_dataset_create
+  name: az datafactory dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset create --dataset-name
+                                  --factory-name
+                                  --properties
+                                  --resource-group
+                                  [--if-match]
+  examples:
+  - summary: Datasets_Create
+    syntax: az datafactory dataset create --properties "{\"type\":\"AzureBlob\",\"linkedServiceName\":{\"type\":\"LinkedServiceReference\",\"referenceName\":\"exampleLinkedService\"},\"parameters\":{\"MyFileName\":{\"type\":\"String\"},\"MyFolderPath\":{\"type\":\"String\"}},\"typeProperties\":{\"format\":{\"type\":\"TextFormat\"},\"fileName\":{\"type\":\"Expression\",\"value\":\"@dataset().MyFileName\"},\"folderPath\":{\"type\":\"Expression\",\"value\":\"@dataset().MyFolderPath\"}}}" --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Dataset properties. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the dataset entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_dataset_delete
+  name: az datafactory dataset delete
+  summary: Deletes a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset delete --dataset-name
+                                  --factory-name
+                                  --resource-group
+                                  [--yes]
+  examples:
+  - summary: Datasets_Delete
+    syntax: az datafactory dataset delete --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_dataset_list
+  name: az datafactory dataset list
+  summary: Lists datasets.
+  description: ''
+  syntax: >-
+    az datafactory dataset list --factory-name
+                                --resource-group
+  examples:
+  - summary: Datasets_ListByFactory
+    syntax: az datafactory dataset list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_dataset_show
+  name: az datafactory dataset show
+  summary: Gets a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset show --dataset-name
+                                --factory-name
+                                --resource-group
+                                [--if-none-match]
+  examples:
+  - summary: Datasets_Get
+    syntax: az datafactory dataset show --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the dataset entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_dataset_update
+  name: az datafactory dataset update
+  summary: Update a dataset.
+  description: ''
+  syntax: >-
+    az datafactory dataset update --dataset-name
+                                  --factory-name
+                                  --linked-service-name
+                                  --resource-group
+                                  [--add]
+                                  [--annotations]
+                                  [--description]
+                                  [--folder]
+                                  [--force-string]
+                                  [--if-match]
+                                  [--if-none-match]
+                                  [--parameters]
+                                  [--remove]
+                                  [--schema]
+                                  [--set]
+                                  [--structure]
+  examples:
+  - summary: Datasets_Update
+    syntax: az datafactory dataset update --description "Example description" --linked-service-name "{\"type\":\"LinkedServiceReference\",\"referenceName\":\"exampleLinkedService\"}" --parameters "{\"MyFileName\":{\"type\":\"String\"},\"MyFolderPath\":{\"type\":\"String\"}}" --name "exampleDataset" --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --dataset-name --name -n
+    summary: The dataset name.
+    description: ''
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name
+    summary: 'Linked service reference. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the Dataset. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Dataset description.
+    description: ''
+  - name: --folder
+    summary: The folder that this Dataset is in. If not specified, Dataset will appear at the root level.
+    description: >-
+      Usage: --folder name=XX
+
+
+      name: The name of the folder that this Dataset is in.
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the dataset entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the dataset entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters for dataset. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --schema
+    summary: 'Columns that define the physical type schema of the dataset. Type: array (or Expression with resultType array), itemType: DatasetSchemaDataElement. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --structure
+    summary: 'Columns that define the structure of the dataset. Type: array (or Expression with resultType array), itemType: DatasetDataElement. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_dataset_create
+- az_datafactory_dataset_delete
+- az_datafactory_dataset_list
+- az_datafactory_dataset_show
+- az_datafactory_dataset_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage dataset with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime-node.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime-node.yml
new file mode 100644
index 0000000000..17a025d274
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime-node.yml
@@ -0,0 +1,158 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime-node
+name: az datafactory integration-runtime-node
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime-node** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime node with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime-node_delete
+  name: az datafactory integration-runtime-node delete
+  summary: Deletes a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node delete --factory-name
+                                                   --integration-runtime-name
+                                                   --node-name
+                                                   --resource-group
+                                                   [--yes]
+  examples:
+  - summary: IntegrationRuntimesNodes_Delete
+    syntax: az datafactory integration-runtime-node delete --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_get-ip-address
+  name: az datafactory integration-runtime-node get-ip-address
+  summary: Get the IP address of self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node get-ip-address --factory-name
+                                                           --integration-runtime-name
+                                                           --node-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimeNodes_GetIpAddress
+    syntax: az datafactory integration-runtime-node get-ip-address --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_show
+  name: az datafactory integration-runtime-node show
+  summary: Gets a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node show --factory-name
+                                                 --integration-runtime-name
+                                                 --node-name
+                                                 --resource-group
+  examples:
+  - summary: IntegrationRuntimeNodes_Get
+    syntax: az datafactory integration-runtime-node show --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime-node_update
+  name: az datafactory integration-runtime-node update
+  summary: Updates a self-hosted integration runtime node.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime-node update --factory-name
+                                                   --integration-runtime-name
+                                                   --node-name
+                                                   --resource-group
+                                                   [--concurrent-jobs-limit]
+  examples:
+  - summary: IntegrationRuntimeNodes_Update
+    syntax: az datafactory integration-runtime-node update --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --node-name "Node_1" --resource-group "exampleResourceGroup" --concurrent-jobs-limit 2
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --node-name
+    summary: The integration runtime node name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --concurrent-jobs-limit
+    summary: The number of concurrent jobs permitted to run on the integration runtime node. Values between 1 and maxConcurrentJobs(inclusive) are allowed.
+    description: ''
+commands:
+- az_datafactory_integration-runtime-node_delete
+- az_datafactory_integration-runtime-node_get-ip-address
+- az_datafactory_integration-runtime-node_show
+- az_datafactory_integration-runtime-node_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime node with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime.yml
new file mode 100644
index 0000000000..88b13e9bad
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime.yml
@@ -0,0 +1,480 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime
+name: az datafactory integration-runtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_delete
+  name: az datafactory integration-runtime delete
+  summary: Deletes an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime delete --factory-name
+                                              --integration-runtime-name
+                                              --resource-group
+                                              [--yes]
+  examples:
+  - summary: IntegrationRuntimes_Delete
+    syntax: az datafactory integration-runtime delete --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-connection-info
+  name: az datafactory integration-runtime get-connection-info
+  summary: Gets the on-premises integration runtime connection information for encrypting the on-premises data source credentials.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-connection-info --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetConnectionInfo
+    syntax: az datafactory integration-runtime get-connection-info --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-monitoring-data
+  name: az datafactory integration-runtime get-monitoring-data
+  summary: Get the integration runtime monitoring data, which includes the monitor data for all the nodes under this integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-monitoring-data --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetMonitoringData
+    syntax: az datafactory integration-runtime get-monitoring-data --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_get-status
+  name: az datafactory integration-runtime get-status
+  summary: Gets detailed status information for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime get-status --factory-name
+                                                  --integration-runtime-name
+                                                  --resource-group
+  examples:
+  - summary: IntegrationRuntimes_GetStatus
+    syntax: az datafactory integration-runtime get-status --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_list
+  name: az datafactory integration-runtime list
+  summary: Lists integration runtimes.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime list --factory-name
+                                            --resource-group
+  examples:
+  - summary: IntegrationRuntimes_ListByFactory
+    syntax: az datafactory integration-runtime list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_list-auth-key
+  name: az datafactory integration-runtime list-auth-key
+  summary: Retrieves the authentication keys for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime list-auth-key --factory-name
+                                                     --integration-runtime-name
+                                                     --resource-group
+  examples:
+  - summary: IntegrationRuntimes_ListAuthKeys
+    syntax: az datafactory integration-runtime list-auth-key --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_regenerate-auth-key
+  name: az datafactory integration-runtime regenerate-auth-key
+  summary: Regenerates the authentication key for an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime regenerate-auth-key --factory-name
+                                                           --integration-runtime-name
+                                                           --resource-group
+                                                           [--key-name {authKey1, authKey2}]
+  examples:
+  - summary: IntegrationRuntimes_RegenerateAuthKey
+    syntax: az datafactory integration-runtime regenerate-auth-key --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --key-name "authKey2" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --key-name
+    parameterValueGroup: authKey1, authKey2
+    summary: The name of the authentication key to regenerate.
+    description: ''
+- uid: az_datafactory_integration-runtime_remove-link
+  name: az datafactory integration-runtime remove-link
+  summary: Remove all linked integration runtimes under specific data factory in a self-hosted integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime remove-link --factory-name
+                                                   --integration-runtime-name
+                                                   --linked-factory-name
+                                                   --resource-group
+  examples:
+  - summary: IntegrationRuntimes_Upgrade
+    syntax: az datafactory integration-runtime remove-link --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --linked-factory-name "exampleFactoryName-linked" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --linked-factory-name
+    summary: The data factory name for linked integration runtime.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_show
+  name: az datafactory integration-runtime show
+  summary: Gets an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime show --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--if-none-match]
+  examples:
+  - summary: IntegrationRuntimes_Get
+    syntax: az datafactory integration-runtime show --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_integration-runtime_start
+  name: az datafactory integration-runtime start
+  summary: Starts a ManagedReserved type integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime start --factory-name
+                                             --integration-runtime-name
+                                             --resource-group
+                                             [--no-wait]
+  examples:
+  - summary: IntegrationRuntimes_Start
+    syntax: az datafactory integration-runtime start --factory-name "exampleFactoryName" --name "exampleManagedIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_integration-runtime_stop
+  name: az datafactory integration-runtime stop
+  summary: Stops a ManagedReserved type integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime stop --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--no-wait]
+  examples:
+  - summary: IntegrationRuntimes_Stop
+    syntax: az datafactory integration-runtime stop --factory-name "exampleFactoryName" --name "exampleManagedIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_integration-runtime_sync-credentials
+  name: az datafactory integration-runtime sync-credentials
+  summary: Force the integration runtime to synchronize credentials across integration runtime nodes, and this will override the credentials across all worker nodes with those available on the dispatcher node. If you already have the latest credential backup file, you should manually import it (preferred) on any self-hosted integration runtime node than using this API directly.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime sync-credentials --factory-name
+                                                        --integration-runtime-name
+                                                        --resource-group
+  examples:
+  - summary: IntegrationRuntimes_SyncCredentials
+    syntax: az datafactory integration-runtime sync-credentials --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_update
+  name: az datafactory integration-runtime update
+  summary: Updates an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime update --factory-name
+                                              --integration-runtime-name
+                                              --resource-group
+                                              [--auto-update {Off, On}]
+                                              [--update-delay-offset]
+  examples:
+  - summary: IntegrationRuntimes_Update
+    syntax: az datafactory integration-runtime update --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup" --auto-update "Off" --update-delay-offset "\"PT3H\""
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --auto-update
+    parameterValueGroup: Off, On
+    summary: Enables or disables the auto-update feature of the self-hosted integration runtime. See https://go.microsoft.com/fwlink/?linkid=854189.
+    description: ''
+  - name: --update-delay-offset
+    summary: The time offset (in hours) in the day, e.g., PT03H is 3 hours. The integration runtime auto update will happen on that time.
+    description: ''
+- uid: az_datafactory_integration-runtime_upgrade
+  name: az datafactory integration-runtime upgrade
+  summary: Upgrade self-hosted integration runtime to latest version if availability.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime upgrade --factory-name
+                                               --integration-runtime-name
+                                               --resource-group
+  examples:
+  - summary: IntegrationRuntimes_Upgrade
+    syntax: az datafactory integration-runtime upgrade --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_integration-runtime_wait
+  name: az datafactory integration-runtime wait
+  summary: Place the CLI in a waiting state until a condition of the datafactory integration-runtime is met.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime wait --factory-name
+                                            --integration-runtime-name
+                                            --resource-group
+                                            [--created]
+                                            [--custom]
+                                            [--deleted]
+                                            [--exists]
+                                            [--if-none-match]
+                                            [--interval]
+                                            [--timeout]
+                                            [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datafactory integration-runtime is successfully created.
+    syntax: az datafactory integration-runtime wait --factory-name "exampleFactoryName" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup" --created
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the integration runtime entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datafactory_integration-runtime_delete
+- az_datafactory_integration-runtime_get-connection-info
+- az_datafactory_integration-runtime_get-monitoring-data
+- az_datafactory_integration-runtime_get-status
+- az_datafactory_integration-runtime_linked-integration-runtime
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+- az_datafactory_integration-runtime_list
+- az_datafactory_integration-runtime_list-auth-key
+- az_datafactory_integration-runtime_managed
+- az_datafactory_integration-runtime_managed_create
+- az_datafactory_integration-runtime_regenerate-auth-key
+- az_datafactory_integration-runtime_remove-link
+- az_datafactory_integration-runtime_self-hosted
+- az_datafactory_integration-runtime_self-hosted_create
+- az_datafactory_integration-runtime_show
+- az_datafactory_integration-runtime_start
+- az_datafactory_integration-runtime_stop
+- az_datafactory_integration-runtime_sync-credentials
+- az_datafactory_integration-runtime_update
+- az_datafactory_integration-runtime_upgrade
+- az_datafactory_integration-runtime_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml
new file mode 100644
index 0000000000..748df0e7d1
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/linked-integration-runtime.yml
@@ -0,0 +1,70 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_linked-integration-runtime
+name: az datafactory integration-runtime linked-integration-runtime
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime linked-integration-runtime** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group linked-integration-runtime.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_linked-integration-runtime_create
+  name: az datafactory integration-runtime linked-integration-runtime create
+  summary: Create a linked integration runtime entry in a shared integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime linked-integration-runtime create --factory-name
+                                                                         --integration-runtime-name
+                                                                         --resource-group
+                                                                         [--data-factory-name]
+                                                                         [--location]
+                                                                         [--name]
+                                                                         [--subscription-id]
+  examples:
+  - summary: IntegrationRuntimes_CreateLinkedIntegrationRuntime
+    syntax: az datafactory integration-runtime linked-integration-runtime create --name "bfa92911-9fb6-4fbe-8f23-beae87bc1c83" --location "West US" --data-factory-name "e9955d6d-56ea-4be3-841c-52a12c1a9981" --subscription-id "061774c7-4b5a-4159-a55b-365581830283" --factory-name "exampleFactoryName" --integration-runtime-name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --data-factory-name
+    summary: The name of the data factory that the linked integration runtime belongs to.
+    description: ''
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --name
+    summary: The name of the linked integration runtime.
+    description: ''
+  - name: --subscription-id
+    summary: The ID of the subscription that the linked integration runtime belongs to.
+    description: ''
+commands:
+- az_datafactory_integration-runtime_linked-integration-runtime_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group linked-integration-runtime.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/managed.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/managed.yml
new file mode 100644
index 0000000000..75036b9269
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/managed.yml
@@ -0,0 +1,67 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_managed
+name: az datafactory integration-runtime managed
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime managed** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group managed.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_managed_create
+  name: az datafactory integration-runtime managed create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime managed create --factory-name
+                                                      --integration-runtime-name
+                                                      --resource-group
+                                                      [--compute-properties]
+                                                      [--description]
+                                                      [--if-match]
+                                                      [--ssis-properties]
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --compute-properties
+    summary: 'The compute resource for managed integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --ssis-properties
+    summary: 'SSIS properties for managed integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_integration-runtime_managed_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group managed.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml
new file mode 100644
index 0000000000..1f867dcd53
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/integration-runtime/self-hosted.yml
@@ -0,0 +1,66 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_integration-runtime_self-hosted
+name: az datafactory integration-runtime self-hosted
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory integration-runtime self-hosted** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage integration runtime with datafactory sub group self-hosted.
+description: ''
+directCommands:
+- uid: az_datafactory_integration-runtime_self-hosted_create
+  name: az datafactory integration-runtime self-hosted create
+  summary: Create an integration runtime.
+  description: ''
+  syntax: >-
+    az datafactory integration-runtime self-hosted create --factory-name
+                                                          --integration-runtime-name
+                                                          --resource-group
+                                                          [--description]
+                                                          [--if-match]
+                                                          [--linked-info]
+  examples:
+  - summary: IntegrationRuntimes_Create
+    syntax: az datafactory integration-runtime self-hosted create --factory-name "exampleFactoryName" --description "A selfhosted integration runtime" --name "exampleIntegrationRuntime" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --integration-runtime-name --name -n
+    summary: The integration runtime name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Integration runtime description.
+    description: ''
+  - name: --if-match
+    summary: ETag of the integration runtime entity. Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --linked-info
+    summary: 'The base definition of a linked integration runtime. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_integration-runtime_self-hosted_create
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage integration runtime with datafactory sub group self-hosted.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/linked-service.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/linked-service.yml
new file mode 100644
index 0000000000..5db4a171b3
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/linked-service.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_linked-service
+name: az datafactory linked-service
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory linked-service** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage linked service with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_linked-service_create
+  name: az datafactory linked-service create
+  summary: Create a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service create --factory-name
+                                         --linked-service-name
+                                         --properties
+                                         --resource-group
+                                         [--if-match]
+  examples:
+  - summary: LinkedServices_Create
+    syntax: az datafactory linked-service create --factory-name "exampleFactoryName" --properties "{\"type\":\"AzureStorage\",\"typeProperties\":{\"connectionString\":{\"type\":\"SecureString\",\"value\":\"DefaultEndpointsProtocol=https;AccountName=examplestorageaccount;AccountKey=<storage key>\"}}}" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Properties of linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the linkedService entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_linked-service_delete
+  name: az datafactory linked-service delete
+  summary: Deletes a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service delete --factory-name
+                                         --linked-service-name
+                                         --resource-group
+                                         [--yes]
+  examples:
+  - summary: LinkedServices_Delete
+    syntax: az datafactory linked-service delete --factory-name "exampleFactoryName" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_linked-service_list
+  name: az datafactory linked-service list
+  summary: Lists linked services.
+  description: ''
+  syntax: >-
+    az datafactory linked-service list --factory-name
+                                       --resource-group
+  examples:
+  - summary: LinkedServices_ListByFactory
+    syntax: az datafactory linked-service list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_linked-service_show
+  name: az datafactory linked-service show
+  summary: Gets a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service show --factory-name
+                                       --linked-service-name
+                                       --resource-group
+                                       [--if-none-match]
+  examples:
+  - summary: LinkedServices_Get
+    syntax: az datafactory linked-service show --factory-name "exampleFactoryName" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the linked service entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_linked-service_update
+  name: az datafactory linked-service update
+  summary: Update a linked service.
+  description: ''
+  syntax: >-
+    az datafactory linked-service update --factory-name
+                                         --linked-service-name
+                                         --resource-group
+                                         [--add]
+                                         [--annotations]
+                                         [--connect-via]
+                                         [--description]
+                                         [--force-string]
+                                         [--if-match]
+                                         [--if-none-match]
+                                         [--parameters]
+                                         [--remove]
+                                         [--set]
+  examples:
+  - summary: LinkedServices_Update
+    syntax: az datafactory linked-service update --factory-name "exampleFactoryName" --description "Example description" --name "exampleLinkedService" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --linked-service-name --name -n
+    summary: The linked service name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --connect-via
+    summary: 'The integration runtime reference. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Linked service description.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the linkedService entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the linked service entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters for linked service. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+commands:
+- az_datafactory_linked-service_create
+- az_datafactory_linked-service_delete
+- az_datafactory_linked-service_list
+- az_datafactory_linked-service_show
+- az_datafactory_linked-service_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage linked service with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/pipeline-run.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/pipeline-run.yml
new file mode 100644
index 0000000000..812414abac
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/pipeline-run.yml
@@ -0,0 +1,147 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_pipeline-run
+name: az datafactory pipeline-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory pipeline-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage pipeline run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_pipeline-run_cancel
+  name: az datafactory pipeline-run cancel
+  summary: Cancel a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run cancel --factory-name
+                                       --resource-group
+                                       --run-id
+                                       [--is-recursive {false, true}]
+  examples:
+  - summary: PipelineRuns_Cancel
+    syntax: az datafactory pipeline-run cancel --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "16ac5348-ff82-4f95-a80d-638c1d47b721"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  optionalParameters:
+  - name: --is-recursive
+    parameterValueGroup: false, true
+    summary: If true, cancel all the Child pipelines that are triggered by the current pipeline.
+    description: ''
+- uid: az_datafactory_pipeline-run_query-by-factory
+  name: az datafactory pipeline-run query-by-factory
+  summary: Query pipeline runs in the factory based on input filter conditions.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run query-by-factory --factory-name
+                                                 --last-updated-after
+                                                 --last-updated-before
+                                                 --resource-group
+                                                 [--continuation-token]
+                                                 [--filters]
+                                                 [--order-by]
+  examples:
+  - summary: PipelineRuns_QueryByFactory
+    syntax: az datafactory pipeline-run query-by-factory --factory-name "exampleFactoryName" --filters operand="PipelineName" operator="Equals" values="examplePipeline" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+- uid: az_datafactory_pipeline-run_show
+  name: az datafactory pipeline-run show
+  summary: Get a pipeline run by its run ID.
+  description: ''
+  syntax: >-
+    az datafactory pipeline-run show --factory-name
+                                     --resource-group
+                                     --run-id
+  examples:
+  - summary: PipelineRuns_Get
+    syntax: az datafactory pipeline-run show --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+commands:
+- az_datafactory_pipeline-run_cancel
+- az_datafactory_pipeline-run_query-by-factory
+- az_datafactory_pipeline-run_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage pipeline run with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/pipeline.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/pipeline.yml
new file mode 100644
index 0000000000..aa76dd493e
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/pipeline.yml
@@ -0,0 +1,277 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_pipeline
+name: az datafactory pipeline
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory pipeline** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage pipeline with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_pipeline_create
+  name: az datafactory pipeline create
+  summary: Create a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline create --factory-name
+                                   --name
+                                   --pipeline
+                                   --resource-group
+                                   [--if-match]
+  examples:
+  - summary: Pipelines_Create
+    syntax: az datafactory pipeline create --factory-name "exampleFactoryName" --pipeline "{\"activities\":[{\"name\":\"ExampleForeachActivity\",\"type\":\"ForEach\",\"typeProperties\":{\"activities\":[{\"name\":\"ExampleCopyActivity\",\"type\":\"Copy\",\"inputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":\"examplecontainer.csv\",\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"outputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":{\"type\":\"Expression\",\"value\":\"@item()\"},\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"typeProperties\":{\"dataIntegrationUnits\":32,\"sink\":{\"type\":\"BlobSink\"},\"source\":{\"type\":\"BlobSource\"}}}],\"isSequential\":true,\"items\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.OutputBlobNameList\"}}}],\"parameters\":{\"JobId\":{\"type\":\"String\"},\"OutputBlobNameList\":{\"type\":\"Array\"}},\"variables\":{\"TestVariableArray\":{\"type\":\"Array\"}},\"runDimensions\":{\"JobId\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.JobId\"}},\"duration\":\"0.00:10:00\"}" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --pipeline
+    summary: 'Pipeline resource definition. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the pipeline entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_pipeline_create-run
+  name: az datafactory pipeline create-run
+  summary: Creates a run of a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline create-run --factory-name
+                                       --name
+                                       --resource-group
+                                       [--is-recovery {false, true}]
+                                       [--parameters]
+                                       [--reference-pipeline-run-id]
+                                       [--start-activity-name]
+                                       [--start-from-failure {false, true}]
+  examples:
+  - summary: Pipelines_CreateRun
+    syntax: az datafactory pipeline create-run --factory-name "exampleFactoryName" --parameters "{\"OutputBlobNameList\":[\"exampleoutput.csv\"]}" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --is-recovery
+    parameterValueGroup: false, true
+    summary: Recovery mode flag. If recovery mode is set to true, the specified referenced pipeline run and the new run will be grouped under the same groupId.
+    description: ''
+  - name: --parameters
+    summary: 'Parameters of the pipeline run. These parameters will be used only if the runId is not specified. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --reference-pipeline-run-id
+    summary: The pipeline run identifier. If run ID is specified the parameters of the specified run will be used to create a new run.
+    description: ''
+  - name: --start-activity-name
+    summary: In recovery mode, the rerun will start from this activity. If not specified, all activities will run.
+    description: ''
+  - name: --start-from-failure
+    parameterValueGroup: false, true
+    summary: In recovery mode, if set to true, the rerun will start from failed activities. The property will be used only if startActivityName is not specified.
+    description: ''
+- uid: az_datafactory_pipeline_delete
+  name: az datafactory pipeline delete
+  summary: Deletes a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline delete --factory-name
+                                   --name
+                                   --resource-group
+                                   [--yes]
+  examples:
+  - summary: Pipelines_Delete
+    syntax: az datafactory pipeline delete --factory-name "exampleFactoryName" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_pipeline_list
+  name: az datafactory pipeline list
+  summary: Lists pipelines.
+  description: ''
+  syntax: >-
+    az datafactory pipeline list --factory-name
+                                 --resource-group
+  examples:
+  - summary: Pipelines_ListByFactory
+    syntax: az datafactory pipeline list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_pipeline_show
+  name: az datafactory pipeline show
+  summary: Gets a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline show --factory-name
+                                 --name
+                                 --resource-group
+                                 [--if-none-match]
+  examples:
+  - summary: Pipelines_Get
+    syntax: az datafactory pipeline show --factory-name "exampleFactoryName" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the pipeline entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_pipeline_update
+  name: az datafactory pipeline update
+  summary: Update a pipeline.
+  description: ''
+  syntax: >-
+    az datafactory pipeline update --factory-name
+                                   --name
+                                   --resource-group
+                                   [--activities]
+                                   [--add]
+                                   [--annotations]
+                                   [--concurrency]
+                                   [--description]
+                                   [--duration]
+                                   [--folder-name]
+                                   [--force-string]
+                                   [--if-match]
+                                   [--if-none-match]
+                                   [--parameters]
+                                   [--remove]
+                                   [--run-dimensions]
+                                   [--set]
+                                   [--variables]
+  examples:
+  - summary: Pipelines_Update
+    syntax: az datafactory pipeline update --factory-name "exampleFactoryName" --description "Example description" --activities "[{\"name\":\"ExampleForeachActivity\",\"type\":\"ForEach\",\"typeProperties\":{\"activities\":[{\"name\":\"ExampleCopyActivity\",\"type\":\"Copy\",\"inputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":\"examplecontainer.csv\",\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"outputs\":[{\"type\":\"DatasetReference\",\"parameters\":{\"MyFileName\":{\"type\":\"Expression\",\"value\":\"@item()\"},\"MyFolderPath\":\"examplecontainer\"},\"referenceName\":\"exampleDataset\"}],\"typeProperties\":{\"dataIntegrationUnits\":32,\"sink\":{\"type\":\"BlobSink\"},\"source\":{\"type\":\"BlobSource\"}}}],\"isSequential\":true,\"items\":{\"type\":\"Expression\",\"value\":\"@pipeline().parameters.OutputBlobNameList\"}}}]" --parameters "{\"OutputBlobNameList\":{\"type\":\"Array\"}}" --duration "0.00:10:00" --name "examplePipeline" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --pipeline-name -n
+    summary: The pipeline name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --activities
+    summary: 'List of activities in pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the Pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --concurrency
+    summary: The max number of concurrent runs for the pipeline.
+    description: ''
+  - name: --description
+    summary: The description of the pipeline.
+    description: ''
+  - name: --duration
+    summary: 'TimeSpan value, after which an Azure Monitoring Metric is fired. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --folder-name
+    summary: The name of the folder that this Pipeline is in.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the pipeline entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the pipeline entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --parameters
+    summary: 'List of parameters for pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --run-dimensions
+    summary: 'Dimensions emitted by Pipeline. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+  - name: --variables
+    summary: 'List of variables for pipeline. Expected value: json-string/@json-file.'
+    description: ''
+commands:
+- az_datafactory_pipeline_create
+- az_datafactory_pipeline_create-run
+- az_datafactory_pipeline_delete
+- az_datafactory_pipeline_list
+- az_datafactory_pipeline_show
+- az_datafactory_pipeline_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage pipeline with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/trigger-run.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/trigger-run.yml
new file mode 100644
index 0000000000..76ef739154
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/trigger-run.yml
@@ -0,0 +1,151 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_trigger-run
+name: az datafactory trigger-run
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory trigger-run** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage trigger run with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_trigger-run_cancel
+  name: az datafactory trigger-run cancel
+  summary: Cancel a single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run cancel --factory-name
+                                      --resource-group
+                                      --run-id
+                                      --trigger-name
+  examples:
+  - summary: Triggers_Cancel
+    syntax: az datafactory trigger-run cancel --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --trigger-name
+    summary: The trigger name.
+    description: ''
+- uid: az_datafactory_trigger-run_query-by-factory
+  name: az datafactory trigger-run query-by-factory
+  summary: Query trigger runs.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run query-by-factory --factory-name
+                                                --last-updated-after
+                                                --last-updated-before
+                                                --resource-group
+                                                [--continuation-token]
+                                                [--filters]
+                                                [--order-by]
+  examples:
+  - summary: TriggerRuns_QueryByFactory
+    syntax: az datafactory trigger-run query-by-factory --factory-name "exampleFactoryName" --filters operand="TriggerName" operator="Equals" values="exampleTrigger" --last-updated-after "2018-06-16T00:36:44.3345758Z" --last-updated-before "2018-06-16T00:49:48.3686473Z" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --last-updated-after
+    summary: The time at or after which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --last-updated-before
+    summary: The time at or before which the run event was updated in 'ISO 8601' format.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --filters
+    summary: List of filters.
+    description: >-
+      Usage: --filters operand=XX operator=XX values=XX
+
+
+      operand: Required. Parameter name to be used for filter. The allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd and Status; to query activity runs are ActivityName, ActivityRunStart, ActivityRunEnd, ActivityType and Status, and to query trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      operator: Required. Operator to be used for filter.
+
+      values: Required. List of filter values.
+
+
+      Multiple actions can be specified by using more than one --filters argument.
+  - name: --order-by
+    summary: List of OrderBy option.
+    description: >-
+      Usage: --order-by order-by=XX order=XX
+
+
+      order-by: Required. Parameter name to be used for order by. The allowed parameters to order by for pipeline runs are PipelineName, RunStart, RunEnd and Status; for activity runs are ActivityName, ActivityRunStart, ActivityRunEnd and Status; for trigger runs are TriggerName, TriggerRunTimestamp and Status.
+
+      order: Required. Sorting order of the parameter.
+
+
+      Multiple actions can be specified by using more than one --order-by argument.
+- uid: az_datafactory_trigger-run_rerun
+  name: az datafactory trigger-run rerun
+  summary: Rerun single trigger instance by runId.
+  description: ''
+  syntax: >-
+    az datafactory trigger-run rerun --factory-name
+                                     --resource-group
+                                     --run-id
+                                     --trigger-name
+  examples:
+  - summary: Triggers_Rerun
+    syntax: az datafactory trigger-run rerun --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --run-id
+    summary: The pipeline run identifier.
+    description: ''
+  - isRequired: true
+    name: --trigger-name
+    summary: The trigger name.
+    description: ''
+commands:
+- az_datafactory_trigger-run_cancel
+- az_datafactory_trigger-run_query-by-factory
+- az_datafactory_trigger-run_rerun
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage trigger run with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datafactory/trigger.yml b/2019-03-01-hybrid/docs-ref-autogen/datafactory/trigger.yml
new file mode 100644
index 0000000000..1da72fb8c6
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datafactory/trigger.yml
@@ -0,0 +1,435 @@
+### YamlMime:AzureCLIGroup
+uid: az_datafactory_trigger
+name: az datafactory trigger
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datafactory** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az datafactory trigger** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage trigger with datafactory.
+description: ''
+directCommands:
+- uid: az_datafactory_trigger_create
+  name: az datafactory trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger create --factory-name
+                                  --name
+                                  --properties
+                                  --resource-group
+                                  [--if-match]
+  examples:
+  - summary: Triggers_Create
+    syntax: az datafactory trigger create --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --properties "{\"type\":\"ScheduleTrigger\",\"pipelines\":[{\"parameters\":{\"OutputBlobNameList\":[\"exampleoutput.csv\"]},\"pipelineReference\":{\"type\":\"PipelineReference\",\"referenceName\":\"examplePipeline\"}}],\"typeProperties\":{\"recurrence\":{\"endTime\":\"2018-06-16T00:55:13.8441801Z\",\"frequency\":\"Minute\",\"interval\":4,\"startTime\":\"2018-06-16T00:39:13.8441801Z\",\"timeZone\":\"UTC\"}}}" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --properties
+    summary: 'Properties of the trigger. Expected value: json-string/@json-file.'
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-match
+    summary: ETag of the trigger entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+- uid: az_datafactory_trigger_delete
+  name: az datafactory trigger delete
+  summary: Deletes a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger delete --factory-name
+                                  --name
+                                  --resource-group
+                                  [--yes]
+  examples:
+  - summary: Triggers_Delete
+    syntax: az datafactory trigger delete --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datafactory_trigger_get-event-subscription-status
+  name: az datafactory trigger get-event-subscription-status
+  summary: Get a trigger's event subscription status.
+  description: ''
+  syntax: >-
+    az datafactory trigger get-event-subscription-status --factory-name
+                                                         --name
+                                                         --resource-group
+  examples:
+  - summary: Triggers_GetEventSubscriptionStatus
+    syntax: az datafactory trigger get-event-subscription-status --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_trigger_list
+  name: az datafactory trigger list
+  summary: Lists triggers.
+  description: ''
+  syntax: >-
+    az datafactory trigger list --factory-name
+                                --resource-group
+  examples:
+  - summary: Triggers_ListByFactory
+    syntax: az datafactory trigger list --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datafactory_trigger_query-by-factory
+  name: az datafactory trigger query-by-factory
+  summary: Query triggers.
+  description: ''
+  syntax: >-
+    az datafactory trigger query-by-factory --factory-name
+                                            --resource-group
+                                            [--continuation-token]
+                                            [--parent-trigger-name]
+  examples:
+  - summary: Triggers_QueryByFactory
+    syntax: az datafactory trigger query-by-factory --factory-name "exampleFactoryName" --parent-trigger-name "exampleTrigger" --resource-group "exampleResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --continuation-token
+    summary: The continuation token for getting the next page of results. Null for first page.
+    description: ''
+  - name: --parent-trigger-name
+    summary: The name of the parent TumblingWindowTrigger to get the child rerun triggers.
+    description: ''
+- uid: az_datafactory_trigger_show
+  name: az datafactory trigger show
+  summary: Gets a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger show --factory-name
+                                --name
+                                --resource-group
+                                [--if-none-match]
+  examples:
+  - summary: Triggers_Get
+    syntax: az datafactory trigger show --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+- uid: az_datafactory_trigger_start
+  name: az datafactory trigger start
+  summary: Starts a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger start --factory-name
+                                 --name
+                                 --resource-group
+                                 [--no-wait]
+  examples:
+  - summary: Triggers_Start
+    syntax: az datafactory trigger start --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_stop
+  name: az datafactory trigger stop
+  summary: Stops a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger stop --factory-name
+                                --name
+                                --resource-group
+                                [--no-wait]
+  examples:
+  - summary: Triggers_Stop
+    syntax: az datafactory trigger stop --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_subscribe-to-event
+  name: az datafactory trigger subscribe-to-event
+  summary: Subscribe event trigger to events.
+  description: ''
+  syntax: >-
+    az datafactory trigger subscribe-to-event --factory-name
+                                              --name
+                                              --resource-group
+                                              [--no-wait]
+  examples:
+  - summary: Triggers_SubscribeToEvents
+    syntax: az datafactory trigger subscribe-to-event --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_unsubscribe-from-event
+  name: az datafactory trigger unsubscribe-from-event
+  summary: Unsubscribe event trigger from events.
+  description: ''
+  syntax: >-
+    az datafactory trigger unsubscribe-from-event --factory-name
+                                                  --name
+                                                  --resource-group
+                                                  [--no-wait]
+  examples:
+  - summary: Triggers_UnsubscribeFromEvents
+    syntax: az datafactory trigger unsubscribe-from-event --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datafactory_trigger_update
+  name: az datafactory trigger update
+  summary: Update a trigger.
+  description: ''
+  syntax: >-
+    az datafactory trigger update --factory-name
+                                  --name
+                                  --resource-group
+                                  [--add]
+                                  [--annotations]
+                                  [--description]
+                                  [--force-string]
+                                  [--if-match]
+                                  [--if-none-match]
+                                  [--remove]
+                                  [--set]
+  examples:
+  - summary: Triggers_Update
+    syntax: az datafactory trigger update --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --description "Example description" --name "exampleTrigger"
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --add
+    summary: 'Add an object to a list of objects by specifying a path and key value pairs.  Example: --add property.listProperty <key=value, string or JSON string>.'
+    description: ''
+  - name: --annotations
+    summary: 'List of tags that can be used for describing the trigger. Expected value: json-string/@json-file.'
+    description: ''
+  - name: --description
+    summary: Trigger description.
+    description: ''
+  - name: --force-string
+    summary: When using 'set' or 'add', preserve string literals instead of attempting to convert to JSON.
+    description: ''
+  - name: --if-match
+    summary: ETag of the trigger entity.  Should only be specified for update, for which it should match existing entity or can be \* for unconditional update.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --remove
+    summary: 'Remove a property or an element from a list.  Example: --remove property.list <indexToRemove> OR --remove propertyToRemove.'
+    description: ''
+  - name: --set
+    summary: 'Update an object by specifying a property path and value to set.  Example: --set property1.property2=<value>.'
+    description: ''
+- uid: az_datafactory_trigger_wait
+  name: az datafactory trigger wait
+  summary: Place the CLI in a waiting state until a condition of the datafactory trigger is met.
+  description: ''
+  syntax: >-
+    az datafactory trigger wait --factory-name
+                                --name
+                                --resource-group
+                                [--created]
+                                [--custom]
+                                [--deleted]
+                                [--exists]
+                                [--if-none-match]
+                                [--interval]
+                                [--timeout]
+                                [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datafactory trigger is successfully created.
+    syntax: az datafactory trigger wait --factory-name "exampleFactoryName" --resource-group "exampleResourceGroup" --name "exampleTrigger" --created
+  requiredParameters:
+  - isRequired: true
+    name: --factory-name
+    summary: The factory name.
+    description: ''
+  - isRequired: true
+    name: --name --trigger-name -n
+    summary: The trigger name.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --if-none-match
+    summary: ETag of the trigger entity. Should only be specified for get. If the ETag matches the existing entity tag, or if \* was provided, then no content will be returned.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datafactory_trigger_create
+- az_datafactory_trigger_delete
+- az_datafactory_trigger_get-event-subscription-status
+- az_datafactory_trigger_list
+- az_datafactory_trigger_query-by-factory
+- az_datafactory_trigger_show
+- az_datafactory_trigger_start
+- az_datafactory_trigger_stop
+- az_datafactory_trigger_subscribe-to-event
+- az_datafactory_trigger_unsubscribe-from-event
+- az_datafactory_trigger_update
+- az_datafactory_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage trigger with datafactory.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare.yml
new file mode 100644
index 0000000000..8402be1519
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare.yml
@@ -0,0 +1,265 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare
+name: az datashare
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare.
+description: For a summary of CLI commands for Data Share, see https://docs.microsoft.com/azure/data-share/azure-cli-references-for-data-share.
+directCommands:
+- uid: az_datashare_create
+  name: az datashare create
+  summary: Create a datashare.
+  description: ''
+  syntax: >-
+    az datashare create --account-name
+                        --name
+                        --resource-group
+                        [--description]
+                        [--share-kind {CopyBased, InPlace}]
+                        [--terms]
+  examples:
+  - summary: Create a datashare
+    syntax: az datashare create --account-name MyAccount --resource-group MyResourceGroup --description "share description" --share-kind "CopyBased" --terms "Confidential" --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Share description.
+    description: ''
+  - name: --share-kind
+    parameterValueGroup: CopyBased, InPlace
+    summary: Share kind.
+    description: ''
+  - name: --terms
+    summary: Share terms.
+    description: ''
+- uid: az_datashare_delete
+  name: az datashare delete
+  summary: Delete a datashare.
+  description: ''
+  syntax: >-
+    az datashare delete --account-name
+                        --name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: Delete a datashare
+    syntax: az datashare delete --account-name MyAccount --resource-group MyResourceGroup --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_list
+  name: az datashare list
+  summary: List datashares in an account.
+  description: ''
+  syntax: >-
+    az datashare list --account-name
+                      --resource-group
+  examples:
+  - summary: List datashares
+    syntax: az datashare list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_show
+  name: az datashare show
+  summary: Show a datashare.
+  description: ''
+  syntax: >-
+    az datashare show --account-name
+                      --name
+                      --resource-group
+  examples:
+  - summary: Show a datashare
+    syntax: az datashare show --account-name MyAccount --resource-group MyResourceGroup --name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_wait
+  name: az datashare wait
+  summary: Place the CLI in a waiting state until a condition of the datashare is met.
+  description: ''
+  syntax: >-
+    az datashare wait --account-name
+                      --name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare is successfully provisioned.
+    syntax: az datashare wait --account-name MyAccount --resource-group MyResourceGroup --name MyShare --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_account
+- az_datashare_account_create
+- az_datashare_account_delete
+- az_datashare_account_list
+- az_datashare_account_show
+- az_datashare_account_update
+- az_datashare_account_wait
+- az_datashare_consumer
+- az_datashare_consumer_dataset-mapping
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+- az_datashare_consumer_invitation
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+- az_datashare_consumer_share-subscription
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+- az_datashare_consumer_trigger
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+- az_datashare_create
+- az_datashare_dataset
+- az_datashare_dataset_create
+- az_datashare_dataset_delete
+- az_datashare_dataset_list
+- az_datashare_dataset_show
+- az_datashare_dataset_wait
+- az_datashare_delete
+- az_datashare_invitation
+- az_datashare_invitation_create
+- az_datashare_invitation_delete
+- az_datashare_invitation_list
+- az_datashare_invitation_show
+- az_datashare_list
+- az_datashare_provider-share-subscription
+- az_datashare_provider-share-subscription_list
+- az_datashare_provider-share-subscription_reinstate
+- az_datashare_provider-share-subscription_revoke
+- az_datashare_provider-share-subscription_show
+- az_datashare_provider-share-subscription_wait
+- az_datashare_show
+- az_datashare_synchronization
+- az_datashare_synchronization_list
+- az_datashare_synchronization_list-detail
+- az_datashare_synchronization-setting
+- az_datashare_synchronization-setting_create
+- az_datashare_synchronization-setting_delete
+- az_datashare_synchronization-setting_list
+- az_datashare_synchronization-setting_show
+- az_datashare_synchronization-setting_wait
+- az_datashare_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: For a summary of CLI commands for Data Share, see https://docs.microsoft.com/azure/data-share/azure-cli-references-for-data-share.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/account.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/account.yml
new file mode 100644
index 0000000000..a5e5d542d2
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/account.yml
@@ -0,0 +1,199 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_account
+name: az datashare account
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare account** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare accounts.
+description: ''
+directCommands:
+- uid: az_datashare_account_create
+  name: az datashare account create
+  summary: Create an account.
+  description: ''
+  syntax: >-
+    az datashare account create --name
+                                --resource-group
+                                [--location]
+                                [--no-wait]
+                                [--tags]
+  examples:
+  - summary: Create an account
+    syntax: az datashare account create --location "West US 2" --tags tag1=Red tag2=White --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datashare_account_delete
+  name: az datashare account delete
+  summary: Delete an account.
+  description: ''
+  syntax: >-
+    az datashare account delete --name
+                                --resource-group
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete the account
+    syntax: az datashare account delete --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_account_list
+  name: az datashare account list
+  summary: List datashare accounts.
+  description: ''
+  syntax: az datashare account list [--resource-group]
+  examples:
+  - summary: List accounts by resource group
+    syntax: az datashare account list --resource-group MyResourceGroup
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_account_show
+  name: az datashare account show
+  summary: Show an account.
+  description: ''
+  syntax: >-
+    az datashare account show --name
+                              --resource-group
+  examples:
+  - summary: Show account information
+    syntax: az datashare account show --name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_account_update
+  name: az datashare account update
+  summary: Patch an account.
+  description: ''
+  syntax: >-
+    az datashare account update --name
+                                --resource-group
+                                [--tags]
+  examples:
+  - summary: Update account tags
+    syntax: az datashare account update --name MyAccount --tags tag1=Red tag2=White --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_datashare_account_wait
+  name: az datashare account wait
+  summary: Place the CLI in a waiting state until a condition of the datashare account is met.
+  description: ''
+  syntax: >-
+    az datashare account wait --name
+                              --resource-group
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare account is successfully provisioned.
+    syntax: az datashare account wait --name MyAccount --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_account_create
+- az_datashare_account_delete
+- az_datashare_account_list
+- az_datashare_account_show
+- az_datashare_account_update
+- az_datashare_account_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage datashare accounts.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer.yml
new file mode 100644
index 0000000000..cfc6a3446c
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer.yml
@@ -0,0 +1,56 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer
+name: az datashare consumer
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare.
+description: ''
+commands:
+- az_datashare_consumer_dataset-mapping
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+- az_datashare_consumer_invitation
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+- az_datashare_consumer_share-subscription
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+- az_datashare_consumer_trigger
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/dataset-mapping.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/dataset-mapping.yml
new file mode 100644
index 0000000000..e5e22266e1
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/dataset-mapping.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_dataset-mapping
+name: az datashare consumer dataset-mapping
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer dataset-mapping** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare dataset mappings.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_dataset-mapping_create
+  name: az datashare consumer dataset-mapping create
+  summary: Create a dataSet mapping.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping create --account-name
+                                                 --mapping
+                                                 --name
+                                                 --resource-group
+                                                 --share-subscription-name
+  examples:
+  - summary: Create a Blob dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
+  - summary: Create a BlobFolder dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"BlobFolder\",\"properties\":{\"containerName\":\"C2\",\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"prefix\":\"folder21\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage3\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"
+  - summary: Create a SqlDBTable dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDBTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"databaseName\":\"Database1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
+  - summary: Create a AdlsGen2File dataset mapping
+    syntax: 'az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"AdlsGen2File\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"filePath\":\"file21\",\"fileSystem\": \"fileSystem\",\"outputType\":\"Csv\",\"resourceGroup\":\"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a SqlDWTable dataset mapping
+    syntax: az datashare consumer dataset-mapping create --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --mapping "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataSetId\":\"00000000-0000-0000-0000-000000000000\",\"dataWarehouseName\":\"DataWarehouse1\",\"schemaName\":\"dbo\",\"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\",\"tableName\":\"Table1\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --mapping
+    summary: Dataset mapping in JSON string or path to JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_delete
+  name: az datashare consumer dataset-mapping delete
+  summary: Delete a dataset mapping in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping delete --account-name
+                                                 --name
+                                                 --resource-group
+                                                 --share-subscription-name
+                                                 [--yes]
+  examples:
+  - summary: Delete a dataset mapping
+    syntax: az datashare consumer dataset-mapping delete --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_list
+  name: az datashare consumer dataset-mapping list
+  summary: List dataset mappings in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping list --account-name
+                                               --resource-group
+                                               --share-subscription-name
+  examples:
+  - summary: List dataset mappings
+    syntax: az datashare consumer dataset-mapping list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_dataset-mapping_show
+  name: az datashare consumer dataset-mapping show
+  summary: Show a dataset mapping in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer dataset-mapping show --account-name
+                                               --name
+                                               --resource-group
+                                               --share-subscription-name
+  examples:
+  - summary: Show a dataset mapping
+    syntax: az datashare consumer dataset-mapping show --account-name MyAccount --name MyDatasetMapping --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the datasetMapping.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+commands:
+- az_datashare_consumer_dataset-mapping_create
+- az_datashare_consumer_dataset-mapping_delete
+- az_datashare_consumer_dataset-mapping_list
+- az_datashare_consumer_dataset-mapping_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare dataset mappings.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/invitation.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/invitation.yml
new file mode 100644
index 0000000000..cb12ce6c0e
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/invitation.yml
@@ -0,0 +1,77 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_invitation
+name: az datashare consumer invitation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer invitation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare invitations.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_invitation_list
+  name: az datashare consumer invitation list
+  summary: List received invitations.
+  description: ''
+  syntax: az datashare consumer invitation list
+  examples:
+  - summary: List invitations
+    syntax: az datashare consumer invitation list
+- uid: az_datashare_consumer_invitation_reject
+  name: az datashare consumer invitation reject
+  summary: Reject an invitation.
+  description: ''
+  syntax: >-
+    az datashare consumer invitation reject --invitation-id
+                                            --location
+  examples:
+  - summary: Reject an invitation
+    syntax: az datashare consumer invitation reject --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --invitation-id
+    summary: An invitation id.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_datashare_consumer_invitation_show
+  name: az datashare consumer invitation show
+  summary: Show a received invitation.
+  description: ''
+  syntax: >-
+    az datashare consumer invitation show --invitation-id
+                                          --location
+  examples:
+  - summary: Show an invitation
+    syntax: az datashare consumer invitation show --invitation-id 00000000-0000-0000-0000-000000000000 --location "East US 2"
+  requiredParameters:
+  - isRequired: true
+    name: --invitation-id
+    summary: An invitation id.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+commands:
+- az_datashare_consumer_invitation_list
+- az_datashare_consumer_invitation_reject
+- az_datashare_consumer_invitation_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare invitations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription.yml
new file mode 100644
index 0000000000..d0ceefd8c0
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_share-subscription
+name: az datashare consumer share-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer share-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare share subscriptions.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_share-subscription_create
+  name: az datashare consumer share-subscription create
+  summary: Create a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription create --account-name
+                                                    --invitation-id
+                                                    --name
+                                                    --resource-group
+                                                    --source-share-location
+  examples:
+  - summary: Create a share subscription
+    syntax: az datashare consumer share-subscription create --account-name MyAccount --resource-group MyResourceGroup --invitation-id 00000000-0000-0000-0000-000000000000 --source-share-location "eastus2" --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --invitation-id
+    summary: The invitation id.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --source-share-location
+    summary: Source share location.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_delete
+  name: az datashare consumer share-subscription delete
+  summary: Delete a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription delete --account-name
+                                                    --name
+                                                    --resource-group
+                                                    [--no-wait]
+                                                    [--yes]
+  examples:
+  - summary: Delete a share subscription
+    syntax: az datashare consumer share-subscription delete --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list
+  name: az datashare consumer share-subscription list
+  summary: List share subscriptions in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list --account-name
+                                                  --resource-group
+  examples:
+  - summary: List share subscriptions
+    syntax: az datashare consumer share-subscription list --account-name MyAccount --resource-group MyResourceGroup
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list-source-dataset
+  name: az datashare consumer share-subscription list-source-dataset
+  summary: List source datasets of a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list-source-dataset --account-name
+                                                                 --resource-group
+                                                                 --share-subscription-name
+  examples:
+  - summary: List source datasets
+    syntax: az datashare consumer share-subscription list-source-dataset --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+  name: az datashare consumer share-subscription list-source-share-synchronization-setting
+  summary: List synchronization settings set on a share.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription list-source-share-synchronization-setting --account-name
+                                                                                       --resource-group
+                                                                                       --share-subscription-name
+  examples:
+  - summary: List synchronization settings
+    syntax: az datashare consumer share-subscription list-source-share-synchronization-setting --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_show
+  name: az datashare consumer share-subscription show
+  summary: Show a share subscription in an account.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription show --account-name
+                                                  --name
+                                                  --resource-group
+  examples:
+  - summary: Show a share subscription
+    syntax: az datashare consumer share-subscription show --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_wait
+  name: az datashare consumer share-subscription wait
+  summary: Place the CLI in a waiting state until a condition of the datashare share subscription is met.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription wait --account-name
+                                                  --name
+                                                  --resource-group
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare share subscription is successfully provisioned.
+    syntax: az datashare consumer share-subscription wait --account-name MyAccount --resource-group MyResourceGroup --name MyShareSubscription --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_share-subscription_create
+- az_datashare_consumer_share-subscription_delete
+- az_datashare_consumer_share-subscription_list
+- az_datashare_consumer_share-subscription_list-source-dataset
+- az_datashare_consumer_share-subscription_list-source-share-synchronization-setting
+- az_datashare_consumer_share-subscription_show
+- az_datashare_consumer_share-subscription_synchronization
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+- az_datashare_consumer_share-subscription_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare share subscriptions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml
new file mode 100644
index 0000000000..6d8b9e26ff
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/share-subscription/synchronization.yml
@@ -0,0 +1,216 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_share-subscription_synchronization
+name: az datashare consumer share-subscription synchronization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer share-subscription synchronization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare share subscription synchronizations.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_share-subscription_synchronization_cancel
+  name: az datashare consumer share-subscription synchronization cancel
+  summary: Request to cancel a synchronization.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization cancel --account-name
+                                                                    --resource-group
+                                                                    --share-subscription-name
+                                                                    --synchronization-id
+                                                                    [--no-wait]
+  examples:
+  - summary: Request to cancel a synchronization
+    syntax: az datashare consumer share-subscription synchronization cancel --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_list
+  name: az datashare consumer share-subscription synchronization list
+  summary: List synchronizations of a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization list --account-name
+                                                                  --resource-group
+                                                                  --share-subscription-name
+  examples:
+  - summary: List synchronizations
+    syntax: az datashare consumer share-subscription synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_list-detail
+  name: az datashare consumer share-subscription synchronization list-detail
+  summary: List synchronization details.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization list-detail --account-name
+                                                                         --resource-group
+                                                                         --share-subscription-name
+                                                                         --synchronization-id
+  examples:
+  - summary: List synchronization details
+    syntax: az datashare consumer share-subscription synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSub --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: Synchronization id.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_start
+  name: az datashare consumer share-subscription synchronization start
+  summary: Initiate a dataset synchronization.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization start --account-name
+                                                                   --resource-group
+                                                                   --share-subscription-name
+                                                                   [--no-wait]
+                                                                   [--synchronization-mode {FullSync, Incremental}]
+  examples:
+  - summary: Initiate a dataset synchronization
+    syntax: az datashare consumer share-subscription synchronization start --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-mode "Incremental"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --synchronization-mode
+    parameterValueGroup: FullSync, Incremental
+    summary: Synchronization mode.
+    description: ''
+- uid: az_datashare_consumer_share-subscription_synchronization_wait
+  name: az datashare consumer share-subscription synchronization wait
+  summary: Place the CLI in a waiting state until a condition of the datashare share subscription synchronization is met.
+  description: ''
+  syntax: >-
+    az datashare consumer share-subscription synchronization wait --account-name
+                                                                  --resource-group
+                                                                  --share-subscription-name
+                                                                  --synchronization-id
+                                                                  [--created]
+                                                                  [--custom]
+                                                                  [--deleted]
+                                                                  [--exists]
+                                                                  [--interval]
+                                                                  [--timeout]
+                                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization finishes successfully.
+    syntax: az datashare consumer share-subscription synchronization wait --custom "status=='Succeeded'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  - summary: Pause executing next line of CLI script until the datashare share subscription synchronization is cancelled.
+    syntax: az datashare consumer share-subscription synchronization wait --custom "status=='Cancelled'" --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_share-subscription_synchronization_cancel
+- az_datashare_consumer_share-subscription_synchronization_list
+- az_datashare_consumer_share-subscription_synchronization_list-detail
+- az_datashare_consumer_share-subscription_synchronization_start
+- az_datashare_consumer_share-subscription_synchronization_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare share subscription synchronizations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/trigger.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/trigger.yml
new file mode 100644
index 0000000000..01e55fb80c
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/consumer/trigger.yml
@@ -0,0 +1,235 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_consumer_trigger
+name: az datashare consumer trigger
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare consumer trigger** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for consumers to manage datashare consumer triggers.
+description: ''
+directCommands:
+- uid: az_datashare_consumer_trigger_create
+  name: az datashare consumer trigger create
+  summary: Create a trigger.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger create --account-name
+                                         --name
+                                         --recurrence-interval {Day, Hour}
+                                         --resource-group
+                                         --share-subscription-name
+                                         --synchronization-time
+                                         [--kind {ScheduleBased}]
+                                         [--no-wait]
+  examples:
+  - summary: Create a trigger
+    syntax: az datashare consumer trigger create --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --recurrence-interval
+    parameterValueGroup: Day, Hour
+    summary: Synchronization Recurrence Interval.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  - isRequired: true
+    name: --synchronization-time
+    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  optionalParameters:
+  - name: --kind
+    defaultValue: ScheduleBased
+    parameterValueGroup: ScheduleBased
+    summary: Kind of synchronization.
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_consumer_trigger_delete
+  name: az datashare consumer trigger delete
+  summary: Delete a trigger in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger delete --account-name
+                                         --name
+                                         --resource-group
+                                         --share-subscription-name
+                                         [--no-wait]
+                                         [--yes]
+  examples:
+  - summary: Delete a trigger
+    syntax: az datashare consumer trigger delete --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_consumer_trigger_list
+  name: az datashare consumer trigger list
+  summary: List triggers in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger list --account-name
+                                       --resource-group
+                                       --share-subscription-name
+  examples:
+  - summary: List triggers
+    syntax: az datashare consumer trigger list --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_trigger_show
+  name: az datashare consumer trigger show
+  summary: Show a trigger in a share subscription.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger show --account-name
+                                       --name
+                                       --resource-group
+                                       --share-subscription-name
+  examples:
+  - summary: Show a trigger
+    syntax: az datashare consumer trigger show --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the share subscription.
+    description: ''
+- uid: az_datashare_consumer_trigger_wait
+  name: az datashare consumer trigger wait
+  summary: Place the CLI in a waiting state until a condition of the datashare trigger is met.
+  description: ''
+  syntax: >-
+    az datashare consumer trigger wait --account-name
+                                       --name
+                                       --resource-group
+                                       --share-subscription-name
+                                       [--created]
+                                       [--custom]
+                                       [--deleted]
+                                       [--exists]
+                                       [--interval]
+                                       [--timeout]
+                                       [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare trigger is successfully provisioned.
+    syntax: az datashare consumer trigger wait --account-name MyAccount --resource-group MyResourceGroup --share-subscription-name MyShareSubscription --name MyTrigger --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the trigger.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-subscription-name
+    summary: The name of the shareSubscription.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_consumer_trigger_create
+- az_datashare_consumer_trigger_delete
+- az_datashare_consumer_trigger_list
+- az_datashare_consumer_trigger_show
+- az_datashare_consumer_trigger_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for consumers to manage datashare consumer triggers.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/dataset.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/dataset.yml
new file mode 100644
index 0000000000..5ea4f7943f
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/dataset.yml
@@ -0,0 +1,228 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_dataset
+name: az datashare dataset
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare dataset** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare datasets.
+description: ''
+directCommands:
+- uid: az_datashare_dataset_create
+  name: az datashare dataset create
+  summary: Create a dataset.
+  description: ''
+  syntax: >-
+    az datashare dataset create --account-name
+                                --dataset
+                                --name
+                                --resource-group
+                                --share-name
+  examples:
+  - summary: Create a Blob dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"Blob\",\"properties\":{\"containerName\":\"C1\",\"filePath\":\"file21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a BlobFolder dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"BlobFolder\",\"properties\":{\"containerName\":\"C1\",\"prefix\":\"folder21\",\"resourceGroup\": \"SampleResourceGroup\",\"storageAccountName\":\"storage2\",\"subscriptionId\":\"00000000-0000-0000-0000-000000000000\"}}"'
+  - summary: Create a KustoCluster dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoCluster\",\"properties\":{\"kustoClusterResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1\"}}"'
+  - summary: Create a KustoDatabase dataset
+    syntax: 'az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"KustoDatabase\",\"properties\":{\"kustoDatabaseResourceId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Kusto/clusters/Cluster1/databases/Database1\"}}"'
+  - summary: Create a SqlDBTable dataset
+    syntax: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDBTable\",\"properties\":{\"databaseName\":\"MySqlDB\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1\", \"tableName\":\"Table1\"}}"
+  - summary: Create a SqlDWTable dataset
+    syntax: az datashare dataset create --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare --dataset "{\"kind\":\"SqlDWTable\",\"properties\":{\"dataWarehouseName\":\"MyDataWarehouse\",\"schemaName\":\"dbo\", \"sqlServerResourceId\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup/providers/Microsoft.Sql/servers/MyServer\",\"tableName\":\"MyTable\"}}"
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --dataset
+    summary: Dataset parameters in JSON string or path to JSON file.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_delete
+  name: az datashare dataset delete
+  summary: Delete a dataset in a share.
+  description: ''
+  syntax: >-
+    az datashare dataset delete --account-name
+                                --name
+                                --resource-group
+                                --share-name
+                                [--no-wait]
+                                [--yes]
+  examples:
+  - summary: Delete a dataset
+    syntax: az datashare dataset delete --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_dataset_list
+  name: az datashare dataset list
+  summary: List datasets in a share.
+  description: ''
+  syntax: >-
+    az datashare dataset list --account-name
+                              --resource-group
+                              --share-name
+  examples:
+  - summary: List datasets
+    syntax: az datashare dataset list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_show
+  name: az datashare dataset show
+  summary: Show a dataset.
+  description: ''
+  syntax: >-
+    az datashare dataset show --account-name
+                              --name
+                              --resource-group
+                              --share-name
+  examples:
+  - summary: Show a dataset
+    syntax: az datashare dataset show --account-name MyAccount --name MyDataset --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_dataset_wait
+  name: az datashare dataset wait
+  summary: Place the CLI in a waiting state until a condition of the datashare dataset is met.
+  description: ''
+  syntax: >-
+    az datashare dataset wait --account-name
+                              --name
+                              --resource-group
+                              --share-name
+                              [--created]
+                              [--custom]
+                              [--deleted]
+                              [--exists]
+                              [--interval]
+                              [--timeout]
+                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare dataset is successfully provisioned.
+    syntax: az datashare dataset wait --account-name MyAccount --share-name MyShare --name MyDataset --resource-group MyResourceGroup --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dataset.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_dataset_create
+- az_datashare_dataset_delete
+- az_datashare_dataset_list
+- az_datashare_dataset_show
+- az_datashare_dataset_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare datasets.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/invitation.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/invitation.yml
new file mode 100644
index 0000000000..34f0ed0567
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/invitation.yml
@@ -0,0 +1,161 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_invitation
+name: az datashare invitation
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare invitation** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare invitations.
+description: ''
+directCommands:
+- uid: az_datashare_invitation_create
+  name: az datashare invitation create
+  summary: Create an invitation.
+  description: ''
+  syntax: >-
+    az datashare invitation create --account-name
+                                   --name
+                                   --resource-group
+                                   --share-name
+                                   [--target-active-directory-id]
+                                   [--target-email]
+                                   [--target-object-id]
+  examples:
+  - summary: Create an invitation
+    syntax: az datashare invitation create --account-name MyAccount --target-email "receiver@microsoft.com" --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --target-active-directory-id
+    summary: The target Azure AD Id. Can't be combined with email.
+    description: ''
+  - name: --target-email
+    summary: The email the invitation is directed to.
+    description: ''
+  - name: --target-object-id
+    summary: The target user or application Id that invitation is being sent to. Must be specified along TargetActiveDirectoryId. This enables sending invitations to specific users or applications in an AD tenant.
+    description: ''
+- uid: az_datashare_invitation_delete
+  name: az datashare invitation delete
+  summary: Delete an invitation in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation delete --account-name
+                                   --name
+                                   --resource-group
+                                   --share-name
+                                   [--yes]
+  examples:
+  - summary: Delete an invitation
+    syntax: az datashare invitation delete --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_invitation_list
+  name: az datashare invitation list
+  summary: List invitations in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation list --account-name
+                                 --resource-group
+                                 --share-name
+  examples:
+  - summary: List invitations
+    syntax: az datashare invitation list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_invitation_show
+  name: az datashare invitation show
+  summary: Show an invitation in a share.
+  description: ''
+  syntax: >-
+    az datashare invitation show --account-name
+                                 --name
+                                 --resource-group
+                                 --share-name
+  examples:
+  - summary: Show an invitation
+    syntax: az datashare invitation show --account-name MyAccount --name MyInvitation --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the invitation.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+commands:
+- az_datashare_invitation_create
+- az_datashare_invitation_delete
+- az_datashare_invitation_list
+- az_datashare_invitation_show
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare invitations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/provider-share-subscription.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/provider-share-subscription.yml
new file mode 100644
index 0000000000..a340735a88
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/provider-share-subscription.yml
@@ -0,0 +1,209 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_provider-share-subscription
+name: az datashare provider-share-subscription
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare provider-share-subscription** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare share subscriptions.
+description: ''
+directCommands:
+- uid: az_datashare_provider-share-subscription_list
+  name: az datashare provider-share-subscription list
+  summary: List share subscriptions in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription list --account-name
+                                                  --resource-group
+                                                  --share-name
+  examples:
+  - summary: List share subscriptions
+    syntax: az datashare provider-share-subscription list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_provider-share-subscription_reinstate
+  name: az datashare provider-share-subscription reinstate
+  summary: Reinstate a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription reinstate --account-name
+                                                       --resource-group
+                                                       --share-name
+                                                       --share-subscription
+  examples:
+  - summary: Reinstate a share subscription
+    syntax: az datashare provider-share-subscription reinstate --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+- uid: az_datashare_provider-share-subscription_revoke
+  name: az datashare provider-share-subscription revoke
+  summary: Revoke a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription revoke --account-name
+                                                    --resource-group
+                                                    --share-name
+                                                    --share-subscription
+                                                    [--no-wait]
+  examples:
+  - summary: Revoke a share subscription
+    syntax: az datashare provider-share-subscription revoke --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_datashare_provider-share-subscription_show
+  name: az datashare provider-share-subscription show
+  summary: Show a share subscription in a provider share.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription show --account-name
+                                                  --resource-group
+                                                  --share-name
+                                                  --share-subscription
+  examples:
+  - summary: Show a share subscription
+    syntax: az datashare provider-share-subscription show --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+- uid: az_datashare_provider-share-subscription_wait
+  name: az datashare provider-share-subscription wait
+  summary: Place the CLI in a waiting state until a condition of the datashare provider share subscription is met.
+  description: ''
+  syntax: >-
+    az datashare provider-share-subscription wait --account-name
+                                                  --resource-group
+                                                  --share-name
+                                                  --share-subscription
+                                                  [--created]
+                                                  [--custom]
+                                                  [--deleted]
+                                                  [--exists]
+                                                  [--interval]
+                                                  [--timeout]
+                                                  [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare provider share subscription is successfully provisioned.
+    syntax: az datashare provider-share-subscription wait --account-name MyAccount --share-subscription 00000000-0000-0000-0000-000000000000 --resource-group MyResourceGroup --share-name MyShare --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --share-subscription
+    summary: To locate share subscription.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_provider-share-subscription_list
+- az_datashare_provider-share-subscription_reinstate
+- az_datashare_provider-share-subscription_revoke
+- az_datashare_provider-share-subscription_show
+- az_datashare_provider-share-subscription_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare share subscriptions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/synchronization-setting.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/synchronization-setting.yml
new file mode 100644
index 0000000000..c56e275392
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/synchronization-setting.yml
@@ -0,0 +1,231 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_synchronization-setting
+name: az datashare synchronization-setting
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare synchronization-setting** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands for providers to manage datashare synchronization settings.
+description: ''
+directCommands:
+- uid: az_datashare_synchronization-setting_create
+  name: az datashare synchronization-setting create
+  summary: Create a synchronization setting.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting create --account-name
+                                                --name
+                                                --recurrence-interval {Day, Hour}
+                                                --resource-group
+                                                --share-name
+                                                --synchronization-time
+                                                [--kind {ScheduleBased}]
+  examples:
+  - summary: Create a synchronization setting
+    syntax: az datashare synchronization-setting create --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MyDataset --recurrence-interval Day --synchronization-time "2020-04-05 10:50:00 +00:00" --kind ScheduleBased
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --recurrence-interval
+    parameterValueGroup: Day, Hour
+    summary: Synchronization Recurrence Interval.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  - isRequired: true
+    name: --synchronization-time
+    summary: 'Synchronization time. Format: date (yyyy-mm-dd) time (hh:mm:ss.xxxxx) timezone (+/-hh:mm).'
+    description: ''
+  optionalParameters:
+  - name: --kind
+    defaultValue: ScheduleBased
+    parameterValueGroup: ScheduleBased
+    summary: Kind of synchronization.
+    description: ''
+- uid: az_datashare_synchronization-setting_delete
+  name: az datashare synchronization-setting delete
+  summary: Delete a synchronization setting in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting delete --account-name
+                                                --name
+                                                --resource-group
+                                                --share-name
+                                                [--no-wait]
+                                                [--yes]
+  examples:
+  - summary: Delete a synchronization setting
+    syntax: az datashare synchronization-setting delete --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_datashare_synchronization-setting_list
+  name: az datashare synchronization-setting list
+  summary: List synchronization settings in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting list --account-name
+                                              --resource-group
+                                              --share-name
+  examples:
+  - summary: List synchronization settings
+    syntax: az datashare synchronization-setting list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization-setting_show
+  name: az datashare synchronization-setting show
+  summary: Show a synchronization setting in a share.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting show --account-name
+                                              --name
+                                              --resource-group
+                                              --share-name
+  examples:
+  - summary: Show a synchronization setting
+    syntax: az datashare synchronization-setting show --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization-setting_wait
+  name: az datashare synchronization-setting wait
+  summary: Place the CLI in a waiting state until a condition of the datashare synchronization setting is met.
+  description: ''
+  syntax: >-
+    az datashare synchronization-setting wait --account-name
+                                              --name
+                                              --resource-group
+                                              --share-name
+                                              [--created]
+                                              [--custom]
+                                              [--deleted]
+                                              [--exists]
+                                              [--interval]
+                                              [--timeout]
+                                              [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the datashare synchronization setting is successfully provisioned.
+    syntax: az datashare synchronization-setting wait --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --name MySyncrhonizationSetting --created
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the synchronizationSetting.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_datashare_synchronization-setting_create
+- az_datashare_synchronization-setting_delete
+- az_datashare_synchronization-setting_list
+- az_datashare_synchronization-setting_show
+- az_datashare_synchronization-setting_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands for providers to manage datashare synchronization settings.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/datashare/synchronization.yml b/2019-03-01-hybrid/docs-ref-autogen/datashare/synchronization.yml
new file mode 100644
index 0000000000..f5cb5f65dc
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/datashare/synchronization.yml
@@ -0,0 +1,83 @@
+### YamlMime:AzureCLIGroup
+uid: az_datashare_synchronization
+name: az datashare synchronization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **datashare** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az datashare synchronization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Commands to manage datashare synchronization.
+description: ''
+directCommands:
+- uid: az_datashare_synchronization_list
+  name: az datashare synchronization list
+  summary: List synchronizations of a datashare.
+  description: ''
+  syntax: >-
+    az datashare synchronization list --account-name
+                                      --resource-group
+                                      --share-name
+  examples:
+  - summary: List synchronizations
+    syntax: az datashare synchronization list --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+- uid: az_datashare_synchronization_list-detail
+  name: az datashare synchronization list-detail
+  summary: List synchronization details.
+  description: ''
+  syntax: >-
+    az datashare synchronization list-detail --account-name
+                                             --resource-group
+                                             --share-name
+                                             [--synchronization-id]
+  examples:
+  - summary: List synchronization details
+    syntax: az datashare synchronization list-detail --account-name MyAccount --resource-group MyResourceGroup --share-name MyShare --synchronization-id 00000000-0000-0000-0000-000000000000
+  requiredParameters:
+  - isRequired: true
+    name: --account-name
+    summary: The name of the share account.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --share-name
+    summary: The name of the share.
+    description: ''
+  optionalParameters:
+  - name: --synchronization-id
+    summary: The synchronization GUID.
+    description: ''
+commands:
+- az_datashare_synchronization_list
+- az_datashare_synchronization_list-detail
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Commands to manage datashare synchronization.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/dedicated-hsm.yml b/2019-03-01-hybrid/docs-ref-autogen/dedicated-hsm.yml
new file mode 100644
index 0000000000..cded4c8275
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/dedicated-hsm.yml
@@ -0,0 +1,229 @@
+### YamlMime:AzureCLIGroup
+uid: az_dedicated-hsm
+name: az dedicated-hsm
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **hardware-security-modules** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az dedicated-hsm** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Dedicated-hsm to create, update, list, show, and delete HSMs.
+description: ''
+directCommands:
+- uid: az_dedicated-hsm_create
+  name: az dedicated-hsm create
+  summary: Create a dedicated HSM in the specified subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm create --location
+                            --name
+                            --resource-group
+                            [--network-profile-network-interfaces]
+                            [--no-wait]
+                            [--sku]
+                            [--stamp-id]
+                            [--subnet]
+                            [--tags]
+                            [--zones]
+  examples:
+  - summary: Create a new dedicated HSM
+    syntax: az dedicated-hsm create -n "hsm1" -l "japanwest" -i private-ip-address="1.0.0.1" -s id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.Network/virtualNetworks/hsm/subnets/hsm" --stamp-id "stamp1" --sku name="SafeNet Luna Network HSM A790" --tags Dept="hsm" Environment="dogfood" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: Name of the dedicated Hsm.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --network-profile-network-interfaces -i
+    summary: 'Specifies a list of ip address from the specfied subnet for the network interfaces associated with the dedicated HSM. Expected value: -i private-ip-address=xx.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --sku
+    summary: 'The HSM device SKU if a non-standard HSM is wanted (default is: SafeNet Luna Network HSM A790).'
+    description: ''
+  - name: --stamp-id
+    summary: This field will be used when RP does not support Availability zones.
+    description: ''
+  - name: --subnet -s
+    summary: 'Specifies the identifier of the subnet. Expected value: id=xx.'
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --zones
+    summary: The Dedicated Hsm zones.
+    description: ''
+- uid: az_dedicated-hsm_delete
+  name: az dedicated-hsm delete
+  summary: Deletes the specified Azure Dedicated HSM.
+  description: ''
+  syntax: >-
+    az dedicated-hsm delete --name
+                            --resource-group
+                            [--no-wait]
+                            [--yes]
+  examples:
+  - summary: Delete a dedicated HSM
+    syntax: az dedicated-hsm delete -n "hsm1" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dedicated HSM to delete.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_dedicated-hsm_list
+  name: az dedicated-hsm list
+  summary: The List operation gets information about the dedicated HSMs associated with the subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm list [--resource-group]
+                          [--top]
+  examples:
+  - summary: List dedicated HSM devices in a subscription
+    syntax: az dedicated-hsm list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - name: --top
+    summary: Maximum number of results to return.
+    description: ''
+- uid: az_dedicated-hsm_show
+  name: az dedicated-hsm show
+  summary: Gets the specified Azure dedicated HSM.
+  description: ''
+  syntax: >-
+    az dedicated-hsm show --name
+                          --resource-group
+  examples:
+  - summary: Get a dedicated HSM
+    syntax: az dedicated-hsm show -n "hsm1" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_dedicated-hsm_update
+  name: az dedicated-hsm update
+  summary: Update a dedicated HSM in the specified subscription.
+  description: ''
+  syntax: >-
+    az dedicated-hsm update --name
+                            --resource-group
+                            [--no-wait]
+                            [--tags]
+  examples:
+  - summary: Update an existing dedicated HSM
+    syntax: az dedicated-hsm update -n "hsm1" --tags Dept="hsm" Environment="dogfood" Slice="A" -g "hsm-group"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: Name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_dedicated-hsm_wait
+  name: az dedicated-hsm wait
+  summary: Waits for operation to complete.
+  description: ''
+  syntax: >-
+    az dedicated-hsm wait --name
+                          --resource-group
+                          [--created]
+                          [--custom]
+                          [--deleted]
+                          [--exists]
+                          [--interval]
+                          [--timeout]
+                          [--updated]
+  examples:
+  - summary: Delete a dedicated HSM
+    syntax: az dedicated-hsm wait --created -g "hsm-group" --name "hsm1"
+  requiredParameters:
+  - isRequired: true
+    name: --name
+    summary: The name of the dedicated HSM.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_dedicated-hsm_create
+- az_dedicated-hsm_delete
+- az_dedicated-hsm_list
+- az_dedicated-hsm_show
+- az_dedicated-hsm_update
+- az_dedicated-hsm_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Dedicated-hsm to create, update, list, show, and delete HSMs.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/demo.yml b/2019-03-01-hybrid/docs-ref-autogen/demo.yml
new file mode 100644
index 0000000000..ef37199548
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/demo.yml
@@ -0,0 +1,40 @@
+### YamlMime:AzureCLIGroup
+uid: az_demo
+name: az demo
+summary: Demos for designing, developing and demonstrating Azure CLI.
+description: ''
+directCommands:
+- uid: az_demo_style
+  name: az demo style
+  summary: A demo showing supported text styles.
+  description: ''
+  syntax: >-
+    az demo style [--subscription]
+                  [--theme {cloud-shell, dark, light, none}]
+  optionalParameters:
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
+  - name: --theme
+    parameterValueGroup: cloud-shell, dark, light, none
+    summary: The theme to format styled text. If unspecified, the default theme is used.
+    description: ''
+commands:
+- az_demo_style
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Demos for designing, developing and demonstrating Azure CLI.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml
index 48c6938705..e855d392e4 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment-scripts.yml
@@ -1,118 +1,117 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_scripts
-  name: az deployment-scripts
-  summary: Manage deployment scripts at subscription or resource group scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_scripts_delete
-  - az_deployment_scripts_list
-  - az_deployment_scripts_show
-  - az_deployment_scripts_show_log
-- uid: az_deployment_scripts_delete
+### YamlMime:AzureCLIGroup
+uid: az_deployment-scripts
+name: az deployment-scripts
+summary: Manage deployment scripts at subscription or resource group scope.
+description: ''
+directCommands:
+- uid: az_deployment-scripts_delete
   name: az deployment-scripts delete
   summary: Delete a deployment script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts delete --name
+                                 --resource-group
+                                 [--subscription]
+                                 [--yes]
   examples:
   - summary: Delete a deployment script found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts delete --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts delete --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_deployment-scripts_list
   name: az deployment-scripts list
   summary: List all deployment scripts.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts list [--query-examples]
+                               [--resource-group]
+                               [--subscription]
   examples:
   - summary: Retrieve all deployment scripts found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts list
+    syntax: az deployment-scripts list
   - summary: Retrieve all deployment scripts found in a resource group
-    syntax:
-      content: az deployment-scripts list --resource-group contoso-rg
-  parameters:
+    syntax: az deployment-scripts list --resource-group contoso-rg
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_show
+- uid: az_deployment-scripts_show
   name: az deployment-scripts show
   summary: Retrieve a deployment script.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts show --name
+                               --resource-group
+                               [--query-examples]
+                               [--subscription]
   examples:
   - summary: Retrieve a deployment script found in the user's logged-in default subscription.
-    syntax:
-      content: az deployment-scripts show --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts show --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_deployment_scripts_show_log
+- uid: az_deployment-scripts_show-log
   name: az deployment-scripts show-log
   summary: Show deployment script logs.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment-scripts show-log --name
+                                   --resource-group
+                                   [--subscription]
   examples:
   - summary: Retrieve deployment script logs found in the user's logged-in default subscription, max limit is 4MB.
-    syntax:
-      content: az deployment-scripts show-log --resource-group contoso-rg --name contosoBashScript
-  parameters:
+    syntax: az deployment-scripts show-log --resource-group contoso-rg --name contosoBashScript
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Deployment script resource name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_deployment_scripts_delete
-  name: az deployment-scripts delete
-  summary: Delete a deployment script.
-- uid: az_deployment_scripts_list
-  name: az deployment-scripts list
-  summary: List all deployment scripts.
-- uid: az_deployment_scripts_show
-  name: az deployment-scripts show
-  summary: Retrieve a deployment script.
-- uid: az_deployment_scripts_show_log
-  name: az deployment-scripts show-log
-  summary: Show deployment script logs.
+- az_deployment-scripts_delete
+- az_deployment-scripts_list
+- az_deployment-scripts_show
+- az_deployment-scripts_show-log
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -128,4 +127,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage deployment scripts at subscription or resource group scope.
+metadata:
+  description: Manage deployment scripts at subscription or resource group scope.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment.yml
index b507702cdb..e48b365c68 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment.yml
@@ -1,69 +1,63 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment
-  name: az deployment
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_cancel
-  - az_deployment_create
-  - az_deployment_delete
-  - az_deployment_export
-  - az_deployment_list
-  - az_deployment_show
-  - az_deployment_validate
-  - az_deployment_wait
+### YamlMime:AzureCLIGroup
+uid: az_deployment
+name: az deployment
+summary: Manage Azure Resource Manager template deployment at subscription scope.
+description: ''
+directCommands:
 - uid: az_deployment_cancel
   name: az deployment cancel
   summary: Cancel a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment cancel --name
+                         [--subscription]
   examples:
   - summary: Cancel a deployment at subscription scope.
-    syntax:
-      content: az deployment cancel -n deployment01
-  parameters:
+    syntax: az deployment cancel -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_create
   name: az deployment create
   summary: Start a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment create --location
+                         [--handle-extended-json-format]
+                         [--name]
+                         [--no-prompt {false, true}]
+                         [--no-wait]
+                         [--parameters]
+                         [--query-string]
+                         [--subscription]
+                         [--template-file]
+                         [--template-uri]
   examples:
   - summary: Create a deployment at subscription scope from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: az deployment create --location WestUS --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: az deployment create --location WestUS --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment at subscription scope from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az deployment create --location WestUS --template-file azuredeploy.json  \
-            --parameters "{ \"policyName\": { \"value\": \"policy2\" }}"
+    syntax: >-
+      az deployment create --location WestUS --template-file azuredeploy.json  \
+          --parameters "{ \"policyName\": { \"value\": \"policy2\" }}"
   - summary: Create a deployment at subscription scope from a local template, using a parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az deployment create --location WestUS --template-file azuredeploy.json  \
-            --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az deployment create --location WestUS --template-file azuredeploy.json  \
+          --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  - summary: Create a deployment at subscription scope from a template-spec
+    syntax: az deployment create --location WestUS --template-spec "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRG/providers/Microsoft.Resources/templateSpecs/myTemplateSpec/versions/1.0"
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: The location to store the deployment metadata.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -79,135 +73,133 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_delete
   name: az deployment delete
   summary: Delete a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment delete --name
+                         [--no-wait]
+                         [--subscription]
   examples:
   - summary: Delete a deployment at subscription scope.
-    syntax:
-      content: az deployment delete -n deployment01
-  parameters:
+    syntax: az deployment delete -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_export
   name: az deployment export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment export --name
+                         [--subscription]
   examples:
   - summary: Export the template used for a deployment at subscription scope.
-    syntax:
-      content: az deployment export --name MyDeployment
-  parameters:
+    syntax: az deployment export --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_list
   name: az deployment list
   summary: List deployments at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment list [--filter]
+                       [--query-examples]
+                       [--subscription]
   examples:
   - summary: List deployments at subscription scope.
-    syntax:
-      content: az deployment list
-  parameters:
+    syntax: az deployment list
+  optionalParameters:
   - name: --filter
-    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit <a href="https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters">https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters</a>.
+    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_show
   name: az deployment show
   summary: Show a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment show --name
+                       [--query-examples]
+                       [--subscription]
   examples:
   - summary: Show a deployment at subscription scope.
-    syntax:
-      content: az deployment show -n deployment01
-  parameters:
+    syntax: az deployment show -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_validate
   name: az deployment validate
   summary: Validate whether a template is valid at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment validate --location
+                           [--handle-extended-json-format]
+                           [--name]
+                           [--no-prompt {false, true}]
+                           [--parameters]
+                           [--query-string]
+                           [--subscription]
+                           [--template-file]
+                           [--template-uri]
   examples:
   - summary: Validate whether a template is valid at subscription scope.
-    syntax:
-      content: az deployment validate --location westus2 --parameters MyValue=This MyArray=@array.json --template-file azuredeploy.json
-  parameters:
+    syntax: az deployment validate --location westus2 --parameters MyValue=This MyArray=@array.json --template-file azuredeploy.json
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: The location to store the deployment metadata.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -220,37 +212,43 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_wait
   name: az deployment wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment wait --name
+                       [--created]
+                       [--custom]
+                       [--deleted]
+                       [--exists]
+                       [--interval]
+                       [--subscription]
+                       [--timeout]
+                       [--updated]
   examples:
   - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
-    syntax:
-      content: az deployment wait --deleted --name MyDeployment --subscription MySubscription
-  parameters:
+    syntax: az deployment wait --deleted --name MyDeployment --subscription MySubscription
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -267,6 +265,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -274,121 +275,43 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_cancel
-  name: az deployment cancel
-  summary: Cancel a deployment at subscription scope.
-- uid: az_deployment_create
-  name: az deployment create
-  summary: Start a deployment at subscription scope.
-- uid: az_deployment_delete
-  name: az deployment delete
-  summary: Delete a deployment at subscription scope.
-- uid: az_deployment_export
-  name: az deployment export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group
-  name: az deployment group
-  summary: Manage Azure Resource Manager template deployment at resource group.
-- uid: az_deployment_group_cancel
-  name: az deployment group cancel
-  summary: Cancel a deployment at resource group.
-- uid: az_deployment_group_create
-  name: az deployment group create
-  summary: Start a deployment at resource group.
-- uid: az_deployment_group_delete
-  name: az deployment group delete
-  summary: Delete a deployment at resource group.
-- uid: az_deployment_group_export
-  name: az deployment group export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group_list
-  name: az deployment group list
-  summary: List deployments at resource group.
-- uid: az_deployment_group_show
-  name: az deployment group show
-  summary: Show a deployment at resource group.
-- uid: az_deployment_group_validate
-  name: az deployment group validate
-  summary: Validate whether a template is valid at resource group.
-- uid: az_deployment_group_wait
-  name: az deployment group wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
-- uid: az_deployment_list
-  name: az deployment list
-  summary: List deployments at subscription scope.
-- uid: az_deployment_operation
-  name: az deployment operation
-  summary: Manage deployment operations at subscription scope.
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
-- uid: az_deployment_operation_list
-  name: az deployment operation list
-  summary: List deployment operations at subscription scope.
-- uid: az_deployment_operation_show
-  name: az deployment operation show
-  summary: Show a deployment operation at subscription scope.
-- uid: az_deployment_operation_sub
-  name: az deployment operation sub
-  summary: Manage deployment operations at subscription scope.
-- uid: az_deployment_operation_sub_list
-  name: az deployment operation sub list
-  summary: List deployment operations at subscription scope.
-- uid: az_deployment_operation_sub_show
-  name: az deployment operation sub show
-  summary: Show a deployment operation at subscription scope.
-- uid: az_deployment_show
-  name: az deployment show
-  summary: Show a deployment at subscription scope.
-- uid: az_deployment_sub
-  name: az deployment sub
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-- uid: az_deployment_sub_cancel
-  name: az deployment sub cancel
-  summary: Cancel a deployment at subscription scope.
-- uid: az_deployment_sub_create
-  name: az deployment sub create
-  summary: Start a deployment at subscription scope.
-- uid: az_deployment_sub_delete
-  name: az deployment sub delete
-  summary: Delete a deployment at subscription scope.
-- uid: az_deployment_sub_export
-  name: az deployment sub export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_sub_list
-  name: az deployment sub list
-  summary: List deployments at subscription scope.
-- uid: az_deployment_sub_show
-  name: az deployment sub show
-  summary: Show a deployment at subscription scope.
-- uid: az_deployment_sub_validate
-  name: az deployment sub validate
-  summary: Validate whether a template is valid at subscription scope.
-- uid: az_deployment_sub_wait
-  name: az deployment sub wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
-- uid: az_deployment_validate
-  name: az deployment validate
-  summary: Validate whether a template is valid at subscription scope.
-- uid: az_deployment_wait
-  name: az deployment wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_deployment_cancel
+- az_deployment_create
+- az_deployment_delete
+- az_deployment_export
+- az_deployment_group
+- az_deployment_group_cancel
+- az_deployment_group_create
+- az_deployment_group_delete
+- az_deployment_group_export
+- az_deployment_group_list
+- az_deployment_group_show
+- az_deployment_group_validate
+- az_deployment_group_wait
+- az_deployment_list
+- az_deployment_operation
+- az_deployment_operation_group
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
+- az_deployment_operation_list
+- az_deployment_operation_show
+- az_deployment_operation_sub
+- az_deployment_operation_sub_list
+- az_deployment_operation_sub_show
+- az_deployment_show
+- az_deployment_sub
+- az_deployment_sub_cancel
+- az_deployment_sub_create
+- az_deployment_sub_delete
+- az_deployment_sub_export
+- az_deployment_sub_list
+- az_deployment_sub_show
+- az_deployment_sub_validate
+- az_deployment_sub_wait
+- az_deployment_validate
+- az_deployment_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -404,10 +327,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at subscription scope.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment/group.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment/group.yml
index b58d0f36eb..da92300d71 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment/group.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment/group.yml
@@ -1,80 +1,78 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_group
-  name: az deployment group
-  summary: Manage Azure Resource Manager template deployment at resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_group_cancel
-  - az_deployment_group_create
-  - az_deployment_group_delete
-  - az_deployment_group_export
-  - az_deployment_group_list
-  - az_deployment_group_show
-  - az_deployment_group_validate
-  - az_deployment_group_wait
+### YamlMime:AzureCLIGroup
+uid: az_deployment_group
+name: az deployment group
+summary: Manage Azure Resource Manager template deployment at resource group.
+description: ''
+directCommands:
 - uid: az_deployment_group_cancel
   name: az deployment group cancel
   summary: Cancel a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group cancel --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Cancel a deployment at resource group.
-    syntax:
-      content: az deployment group cancel -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group cancel -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_create
   name: az deployment group create
   summary: Start a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group create --resource-group
+                               [--aux-subs]
+                               [--aux-tenants]
+                               [--handle-extended-json-format]
+                               [--mode {Complete, Incremental}]
+                               [--name]
+                               [--no-prompt {false, true}]
+                               [--no-wait]
+                               [--parameters]
+                               [--query-string]
+                               [--rollback-on-error]
+                               [--subscription]
+                               [--template-file]
+                               [--template-uri]
   examples:
   - summary: Create a deployment at resource group from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment at resource group from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-file azuredeploy.json  \
-            --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-file azuredeploy.json  \
+          --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
   - summary: Create a deployment at resource group from a local template file, using parameters from an array string.
-    syntax:
-      content: az deployment group create --resource-group testgroup --template-file demotemplate.json --parameters exampleString='inline string' exampleArray='("value1", "value2")'
+    syntax: az deployment group create --resource-group testgroup --template-file demotemplate.json --parameters exampleString='inline string' exampleArray='("value1", "value2")'
   - summary: Create a deployment at resource group from a local template, using a parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az deployment group create --resource-group testrg --name rollout01 \
-            --template-file azuredeploy.json  --parameters @params.json \
-            --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az deployment group create --resource-group testrg --name rollout01 \
+          --template-file azuredeploy.json  --parameters @params.json \
+          --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  - summary: Create a deployment at subscription scope from a template-spec
+    syntax: az deployment group create --resource-group testrg --template-spec "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Resources/templateSpecs/myTemplateSpec/versions/1.0"
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group to create deployment at.
     description: ''
+  optionalParameters:
   - name: --aux-subs
     summary: Auxiliary subscriptions which will be used during deployment across tenants.
     description: ''
@@ -101,154 +99,161 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_delete
   name: az deployment group delete
   summary: Delete a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group delete --name
+                               --resource-group
+                               [--no-wait]
+                               [--subscription]
   examples:
   - summary: Delete a deployment at resource group.
-    syntax:
-      content: az deployment group delete -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group delete -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_export
   name: az deployment group export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group export --name
+                               --resource-group
+                               [--subscription]
   examples:
   - summary: Export the template used for a deployment at resource group.
-    syntax:
-      content: az deployment group export --resource-group testrg --name MyDeployment
-  parameters:
+    syntax: az deployment group export --resource-group testrg --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_list
   name: az deployment group list
   summary: List deployments at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group list --resource-group
+                             [--filter]
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: List deployments at resource group.
-    syntax:
-      content: az deployment group list -g testrg
-  parameters:
+    syntax: az deployment group list -g testrg
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --filter
-    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit <a href="https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters">https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters</a>.
+    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_show
   name: az deployment group show
   summary: Show a deployment at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group show --name
+                             --resource-group
+                             [--query-examples]
+                             [--subscription]
   examples:
   - summary: Show a deployment at resource group.
-    syntax:
-      content: az deployment group show -g testrg -n deployment01
-  parameters:
+    syntax: az deployment group show -g testrg -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_validate
   name: az deployment group validate
   summary: Validate whether a template is valid at resource group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment group validate --resource-group
+                                 [--handle-extended-json-format]
+                                 [--mode {Complete, Incremental}]
+                                 [--name]
+                                 [--no-prompt {false, true}]
+                                 [--parameters]
+                                 [--query-string]
+                                 [--rollback-on-error]
+                                 [--subscription]
+                                 [--template-file]
+                                 [--template-uri]
   examples:
   - summary: Validate whether a template is valid at resource group.
-    syntax:
-      content: az deployment group validate --resource-group testrg --template-file {template-file}
-  parameters:
+    syntax: az deployment group validate --resource-group testrg --template-file {template-file}
+  - summary: Validate whether a template is valid at resource group. (autogenerated)
+    syntax: az deployment group validate --parameters MyValue=This MyArray=@array.json --resource-group testrg --template-file azuredeploy.json
+  requiredParameters:
   - isRequired: true
     name: --resource-group -g
     summary: The resource group to create deployment at.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -266,40 +271,51 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
   - name: --rollback-on-error
     summary: The name of a deployment to roll back to on error, or use as a flag to roll back to the last successful deployment.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_group_wait
   name: az deployment group wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment group wait --name
+                             --resource-group
+                             [--created]
+                             [--custom]
+                             [--deleted]
+                             [--exists]
+                             [--interval]
+                             [--subscription]
+                             [--timeout]
+                             [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
+    syntax: az deployment group wait --created --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -316,6 +332,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -323,40 +342,16 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_group_cancel
-  name: az deployment group cancel
-  summary: Cancel a deployment at resource group.
-- uid: az_deployment_group_create
-  name: az deployment group create
-  summary: Start a deployment at resource group.
-- uid: az_deployment_group_delete
-  name: az deployment group delete
-  summary: Delete a deployment at resource group.
-- uid: az_deployment_group_export
-  name: az deployment group export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_group_list
-  name: az deployment group list
-  summary: List deployments at resource group.
-- uid: az_deployment_group_show
-  name: az deployment group show
-  summary: Show a deployment at resource group.
-- uid: az_deployment_group_validate
-  name: az deployment group validate
-  summary: Validate whether a template is valid at resource group.
-- uid: az_deployment_group_wait
-  name: az deployment group wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_deployment_group_cancel
+- az_deployment_group_create
+- az_deployment_group_delete
+- az_deployment_group_export
+- az_deployment_group_list
+- az_deployment_group_show
+- az_deployment_group_validate
+- az_deployment_group_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -372,10 +367,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at resource group.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at resource group.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment/operation.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment/operation.yml
index 51c0dba589..92c73fcb43 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment/operation.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment/operation.yml
@@ -1,41 +1,43 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation
-  name: az deployment operation
-  summary: Manage deployment operations at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_operation_list
-  - az_deployment_operation_show
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation
+name: az deployment operation
+summary: Manage deployment operations at subscription scope.
+description: ''
+directCommands:
 - uid: az_deployment_operation_list
   name: az deployment operation list
   summary: List deployment operations at subscription scope.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation list --name
+                                 [--query-examples]
+                                 [--subscription]
+  examples:
+  - summary: List deployment operations at subscription scope. (autogenerated)
+    syntax: az deployment operation list --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_operation_show
   name: az deployment operation show
   summary: Show a deployment operation at subscription scope.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation show --name
+                                 --operation-ids
+                                 [--query-examples]
+                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -44,40 +46,23 @@ items:
     name: --operation-ids
     summary: A list of operation ids to show.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
-- uid: az_deployment_operation_list
-  name: az deployment operation list
-  summary: List deployment operations at subscription scope.
-- uid: az_deployment_operation_show
-  name: az deployment operation show
-  summary: Show a deployment operation at subscription scope.
-- uid: az_deployment_operation_sub
-  name: az deployment operation sub
-  summary: Manage deployment operations at subscription scope.
-- uid: az_deployment_operation_sub_list
-  name: az deployment operation sub list
-  summary: List deployment operations at subscription scope.
-- uid: az_deployment_operation_sub_show
-  name: az deployment operation sub show
-  summary: Show a deployment operation at subscription scope.
+- az_deployment_operation_group
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
+- az_deployment_operation_list
+- az_deployment_operation_show
+- az_deployment_operation_sub
+- az_deployment_operation_sub_list
+- az_deployment_operation_sub_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -93,10 +78,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at subscription scope.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml
index 30158d5936..d12db1d67a 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/group.yml
@@ -1,45 +1,49 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation_group
-  name: az deployment operation group
-  summary: Manage deployment operations at resource group.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_operation_group_list
-  - az_deployment_operation_group_show
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation_group
+name: az deployment operation group
+summary: Manage deployment operations at resource group.
+description: ''
+directCommands:
 - uid: az_deployment_operation_group_list
   name: az deployment operation group list
   summary: List deployment operations at resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation group list --name
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  examples:
+  - summary: List deployment operations at resource group (autogenerated)
+    syntax: az deployment operation group list --name MyDeployment --resource-group MyResourceGroup
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_operation_group_show
   name: az deployment operation group show
   summary: Show a deployment operation at resource group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation group show --name
+                                       --operation-ids
+                                       --resource-group
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -50,24 +54,19 @@ items:
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_operation_group_list
-  name: az deployment operation group list
-  summary: List deployment operations at resource group.
-- uid: az_deployment_operation_group_show
-  name: az deployment operation group show
-  summary: Show a deployment operation at resource group.
+- az_deployment_operation_group_list
+- az_deployment_operation_group_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -83,10 +82,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at resource group.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at resource group.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/sub.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/sub.yml
index bf62bde354..ed827c39ba 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/sub.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment/operation/sub.yml
@@ -1,41 +1,43 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_operation_sub
-  name: az deployment operation sub
-  summary: Manage deployment operations at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_operation_sub_list
-  - az_deployment_operation_sub_show
+### YamlMime:AzureCLIGroup
+uid: az_deployment_operation_sub
+name: az deployment operation sub
+summary: Manage deployment operations at subscription scope.
+description: ''
+directCommands:
 - uid: az_deployment_operation_sub_list
   name: az deployment operation sub list
   summary: List deployment operations at subscription scope.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation sub list --name
+                                     [--query-examples]
+                                     [--subscription]
+  examples:
+  - summary: List deployment operations at subscription scope. (autogenerated)
+    syntax: az deployment operation sub list --name mydeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_operation_sub_show
   name: az deployment operation sub show
   summary: Show a deployment operation at subscription scope.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment operation sub show --name
+                                     --operation-ids
+                                     [--query-examples]
+                                     [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
@@ -44,22 +46,17 @@ items:
     name: --operation-ids
     summary: A list of operation ids to show.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_operation_sub_list
-  name: az deployment operation sub list
-  summary: List deployment operations at subscription scope.
-- uid: az_deployment_operation_sub_show
-  name: az deployment operation sub show
-  summary: Show a deployment operation at subscription scope.
+- az_deployment_operation_sub_list
+- az_deployment_operation_sub_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -75,10 +72,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage deployment operations at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage deployment operations at subscription scope.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/deployment/sub.yml b/2019-03-01-hybrid/docs-ref-autogen/deployment/sub.yml
index 740528c18b..652d35cd43 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/deployment/sub.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/deployment/sub.yml
@@ -1,69 +1,61 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_deployment_sub
-  name: az deployment sub
-  summary: Manage Azure Resource Manager template deployment at subscription scope.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_deployment_sub_cancel
-  - az_deployment_sub_create
-  - az_deployment_sub_delete
-  - az_deployment_sub_export
-  - az_deployment_sub_list
-  - az_deployment_sub_show
-  - az_deployment_sub_validate
-  - az_deployment_sub_wait
+### YamlMime:AzureCLIGroup
+uid: az_deployment_sub
+name: az deployment sub
+summary: Manage Azure Resource Manager template deployment at subscription scope.
+description: ''
+directCommands:
 - uid: az_deployment_sub_cancel
   name: az deployment sub cancel
   summary: Cancel a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub cancel --name
+                             [--subscription]
   examples:
   - summary: Cancel a deployment at subscription scope.
-    syntax:
-      content: az deployment sub cancel -n deployment01
-  parameters:
+    syntax: az deployment sub cancel -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_create
   name: az deployment sub create
   summary: Start a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub create --location
+                             [--handle-extended-json-format]
+                             [--name]
+                             [--no-prompt {false, true}]
+                             [--no-wait]
+                             [--parameters]
+                             [--query-string]
+                             [--subscription]
+                             [--template-file]
+                             [--template-uri]
   examples:
   - summary: Create a deployment at subscription scope from a remote template file, using parameters from a local JSON file.
-    syntax:
-      content: az deployment sub create --location WestUS --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
+    syntax: az deployment sub create --location WestUS --template-uri https://myresource/azuredeploy.json --parameters @myparameters.json
   - summary: Create a deployment at subscription scope from a local template file, using parameters from a JSON string.
-    syntax:
-      content: >-
-        az deployment sub create --location WestUS --template-file azuredeploy.json  \
-            --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
+    syntax: >-
+      az deployment sub create --location WestUS --template-file azuredeploy.json  \
+          --parameters '{ \"policyName\": { \"value\": \"policy2\" } }'
   - summary: Create a deployment at subscription scope from a local template, using a parameter file, a remote parameter file, and selectively overriding key/value pairs.
-    syntax:
-      content: >-
-        az deployment sub create --location WestUS --template-file azuredeploy.json  \
-            --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
-  parameters:
+    syntax: >-
+      az deployment sub create --location WestUS --template-file azuredeploy.json  \
+          --parameters @params.json --parameters https://mysite/params.json --parameters MyValue=This MyArray=@array.json
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: The location to store the deployment metadata.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -79,135 +71,135 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_delete
   name: az deployment sub delete
   summary: Delete a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub delete --name
+                             [--no-wait]
+                             [--subscription]
   examples:
   - summary: Delete a deployment at subscription scope.
-    syntax:
-      content: az deployment sub delete -n deployment01
-  parameters:
+    syntax: az deployment sub delete -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --no-wait
     summary: Do not wait for the long-running operation to finish.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_export
   name: az deployment sub export
   summary: Export the template used for a deployment.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub export --name
+                             [--subscription]
   examples:
   - summary: Export the template used for a deployment at subscription scope.
-    syntax:
-      content: az deployment sub export --name MyDeployment
-  parameters:
+    syntax: az deployment sub export --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_list
   name: az deployment sub list
   summary: List deployments at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub list [--filter]
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: List deployments at subscription scope.
-    syntax:
-      content: az deployment sub list
-  parameters:
+    syntax: az deployment sub list
+  optionalParameters:
   - name: --filter
-    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit <a href="https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters">https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters</a>.
+    summary: Filter expression using OData notation. You can use --filter "provisioningState eq '{state}'" to filter provisioningState. To get more information, please visit https://docs.microsoft.com/en-us/rest/api/resources/deployments/listatsubscriptionscope#uri-parameters.
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_show
   name: az deployment sub show
   summary: Show a deployment at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub show --name
+                           [--query-examples]
+                           [--subscription]
   examples:
   - summary: Show a deployment at subscription scope.
-    syntax:
-      content: az deployment sub show -n deployment01
-  parameters:
+    syntax: az deployment sub show -n deployment01
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_validate
   name: az deployment sub validate
   summary: Validate whether a template is valid at subscription scope.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az deployment sub validate --location
+                               [--handle-extended-json-format]
+                               [--name]
+                               [--no-prompt {false, true}]
+                               [--parameters]
+                               [--query-string]
+                               [--subscription]
+                               [--template-file]
+                               [--template-uri]
   examples:
   - summary: Validate whether a template is valid at subscription scope.
-    syntax:
-      content: az deployment sub validate --location westus2 --template-file {template-file}
-  parameters:
+    syntax: az deployment sub validate --location westus2 --template-file {template-file}
+  - summary: Validate whether a template is valid at subscription scope. (autogenerated)
+    syntax: az deployment sub validate --location westus2 --parameters MyValue=This MyArray=@array.json --template-file azuredeploy.json
+  requiredParameters:
   - isRequired: true
     name: --location -l
     summary: The location to store the deployment metadata.
     description: ''
+  optionalParameters:
   - name: --handle-extended-json-format -j
     summary: Support to handle extended template content including multiline and comments in deployment.
     description: ''
@@ -220,33 +212,43 @@ items:
     description: ''
   - name: --parameters -p
     summary: Supply deployment parameter values.
-    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as &lt;KEY=VALUE&gt; pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+    description: Parameters may be supplied from a file using the `@{path}` syntax, a JSON string, or as <KEY=VALUE> pairs. Parameters are evaluated in order, so when a value is assigned twice, the latter value will be used. It is recommended that you supply your parameters file first, and then override selectively using KEY=VALUE syntax.
+  - name: --query-string -q
+    summary: The query string (a SAS token) to be used with the template-uri in the case of linked templates.
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --template-file -f
-    summary: The path to the template file.
+    summary: The path to the template file or Bicep file.
     description: ''
   - name: --template-uri -u
     summary: The URI to the template file.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 - uid: az_deployment_sub_wait
   name: az deployment sub wait
   summary: Place the CLI in a waiting state until a deployment condition is met.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az deployment sub wait --name
+                           [--created]
+                           [--custom]
+                           [--deleted]
+                           [--exists]
+                           [--interval]
+                           [--subscription]
+                           [--timeout]
+                           [--updated]
+  examples:
+  - summary: Place the CLI in a waiting state until a deployment condition is met. (autogenerated)
+    syntax: az deployment sub wait --created --name MyDeployment
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The deployment name.
     description: ''
+  optionalParameters:
   - name: --created
     summary: Wait until created with 'provisioningState' at 'Succeeded'.
     description: ''
@@ -263,6 +265,9 @@ items:
     defaultValue: "30"
     summary: Polling interval in seconds.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --timeout
     defaultValue: "3600"
     summary: Maximum wait in seconds.
@@ -270,40 +275,16 @@ items:
   - name: --updated
     summary: Wait until updated with provisioningState at 'Succeeded'.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
-  source:
-    path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-    remote:
-      branch: dev
-      path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-      repo: https://github.com/Azure/azure-cli.git
+  editLink: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
 commands:
-- uid: az_deployment_sub_cancel
-  name: az deployment sub cancel
-  summary: Cancel a deployment at subscription scope.
-- uid: az_deployment_sub_create
-  name: az deployment sub create
-  summary: Start a deployment at subscription scope.
-- uid: az_deployment_sub_delete
-  name: az deployment sub delete
-  summary: Delete a deployment at subscription scope.
-- uid: az_deployment_sub_export
-  name: az deployment sub export
-  summary: Export the template used for a deployment.
-- uid: az_deployment_sub_list
-  name: az deployment sub list
-  summary: List deployments at subscription scope.
-- uid: az_deployment_sub_show
-  name: az deployment sub show
-  summary: Show a deployment at subscription scope.
-- uid: az_deployment_sub_validate
-  name: az deployment sub validate
-  summary: Validate whether a template is valid at subscription scope.
-- uid: az_deployment_sub_wait
-  name: az deployment sub wait
-  summary: Place the CLI in a waiting state until a deployment condition is met.
+- az_deployment_sub_cancel
+- az_deployment_sub_create
+- az_deployment_sub_delete
+- az_deployment_sub_export
+- az_deployment_sub_list
+- az_deployment_sub_show
+- az_deployment_sub_validate
+- az_deployment_sub_wait
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -319,10 +300,7 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
-doc_source_url_path: src/azure-cli/azure/cli/command_modules/resource/_help.py
-original_content_git_url: https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/resource/_help.py
-gitcommit: https://github.com/Azure/azure-cli/blob/7dc5e27507bad50e89ed0cdb9062b6a7828214f1/src/azure-cli/azure/cli/command_modules/resource/_help.py
-updated_at: 5/28/2020 9:20:54 AM
-ms.date: 05/28/2020
-description: Manage Azure Resource Manager template deployment at subscription scope.
+metadata:
+  doc_source_url_repo: https://github.com/Azure/azure-cli/blob/dev/
+  ms.date: 05/21/2021
+  description: Manage Azure Resource Manager template deployment at subscription scope.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization.yml b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization.yml
new file mode 100644
index 0000000000..a8d860aefe
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization.yml
@@ -0,0 +1,44 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization
+name: az desktopvirtualization
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: ''
+description: ''
+commands:
+- az_desktopvirtualization_applicationgroup
+- az_desktopvirtualization_applicationgroup_create
+- az_desktopvirtualization_applicationgroup_delete
+- az_desktopvirtualization_applicationgroup_list
+- az_desktopvirtualization_applicationgroup_show
+- az_desktopvirtualization_applicationgroup_update
+- az_desktopvirtualization_hostpool
+- az_desktopvirtualization_hostpool_create
+- az_desktopvirtualization_hostpool_delete
+- az_desktopvirtualization_hostpool_list
+- az_desktopvirtualization_hostpool_show
+- az_desktopvirtualization_hostpool_update
+- az_desktopvirtualization_workspace
+- az_desktopvirtualization_workspace_create
+- az_desktopvirtualization_workspace_delete
+- az_desktopvirtualization_workspace_list
+- az_desktopvirtualization_workspace_show
+- az_desktopvirtualization_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata: {}
diff --git a/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/applicationgroup.yml b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/applicationgroup.yml
new file mode 100644
index 0000000000..7c2877b787
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/applicationgroup.yml
@@ -0,0 +1,168 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_applicationgroup
+name: az desktopvirtualization applicationgroup
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization applicationgroup** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization applicationgroup.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_applicationgroup_create
+  name: az desktopvirtualization applicationgroup create
+  summary: Create or update an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup create --application-group-type {Desktop, RemoteApp}
+                                                     --host-pool-arm-path
+                                                     --location
+                                                     --name
+                                                     --resource-group
+                                                     [--description]
+                                                     [--friendly-name]
+                                                     [--tags]
+  examples:
+  - summary: ApplicationGroup_Create
+    syntax: az desktopvirtualization applicationgroup create --location "centralus" --description "des1" --application-group-type "RemoteApp" --friendly-name "friendly" --host-pool-arm-path "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/MyResourceGroup/providers/Microsoft.DesktopVirtualization/hostPools/MyHostPool" --tags tag1="value1" tag2="value2" --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --application-group-type
+    parameterValueGroup: Desktop, RemoteApp
+    summary: Resource Type of ApplicationGroup.
+    description: ''
+  - isRequired: true
+    name: --host-pool-arm-path
+    summary: HostPool arm path of ApplicationGroup.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of ApplicationGroup.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of ApplicationGroup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_delete
+  name: az desktopvirtualization applicationgroup delete
+  summary: Remove an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup delete --name
+                                                     --resource-group
+  examples:
+  - summary: ApplicationGroup_Delete
+    syntax: az desktopvirtualization applicationgroup delete --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_list
+  name: az desktopvirtualization applicationgroup list
+  summary: List applicationGroups in subscription.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup list [--filter]
+                                                   [--resource-group]
+  examples:
+  - summary: ApplicationGroup_ListByResourceGroup
+    syntax: az desktopvirtualization applicationgroup list --filter "applicationGroupType eq 'RailApplication'" --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --filter
+    summary: OData filter expression. Valid properties for filtering are applicationGroupType.
+    description: ''
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_show
+  name: az desktopvirtualization applicationgroup show
+  summary: Get an application group.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup show --name
+                                                   --resource-group
+  examples:
+  - summary: ApplicationGroup_Get
+    syntax: az desktopvirtualization applicationgroup show --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_applicationgroup_update
+  name: az desktopvirtualization applicationgroup update
+  summary: Update an applicationGroup.
+  description: ''
+  syntax: >-
+    az desktopvirtualization applicationgroup update --name
+                                                     --resource-group
+                                                     [--description]
+                                                     [--friendly-name]
+                                                     [--tags]
+  examples:
+  - summary: ApplicationGroups_Update
+    syntax: az desktopvirtualization applicationgroup update --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyApplicationGroup" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the application group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --description
+    summary: Description of ApplicationGroup.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of ApplicationGroup.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_desktopvirtualization_applicationgroup_create
+- az_desktopvirtualization_applicationgroup_delete
+- az_desktopvirtualization_applicationgroup_list
+- az_desktopvirtualization_applicationgroup_show
+- az_desktopvirtualization_applicationgroup_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization applicationgroup.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/hostpool.yml b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/hostpool.yml
new file mode 100644
index 0000000000..fd474b922a
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/hostpool.yml
@@ -0,0 +1,254 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_hostpool
+name: az desktopvirtualization hostpool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization hostpool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization hostpool.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_hostpool_create
+  name: az desktopvirtualization hostpool create
+  summary: Create or update a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool create --host-pool-type {Personal, Pooled}
+                                             --load-balancer-type {BreadthFirst, DepthFirst, Persistent}
+                                             --location
+                                             --name
+                                             --personal-desktop-assignment-type {Automatic, Direct}
+                                             --resource-group
+                                             [--custom-rdp-property]
+                                             [--description]
+                                             [--friendly-name]
+                                             [--max-session-limit]
+                                             [--registration-info]
+                                             [--ring]
+                                             [--sso-context]
+                                             [--tags]
+                                             [--validation-environment {false, true}]
+                                             [--vm-template]
+  examples:
+  - summary: HostPool_Create
+    syntax: az desktopvirtualization hostpool create --location "centralus" --description "des1" --friendly-name "friendly" --host-pool-type "Pooled" --load-balancer-type "BreadthFirst" --max-session-limit 999999 --personal-desktop-assignment-type "Automatic" --registration-info expiration-time="2020-10-01T14:01:54.9571247Z" registration-token-operation="Update" --sso-context "KeyVaultPath" --tags tag1="value1" tag2="value2" --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --host-pool-type
+    parameterValueGroup: Personal, Pooled
+    summary: HostPool type for desktop.
+    description: ''
+  - isRequired: true
+    name: --load-balancer-type
+    parameterValueGroup: BreadthFirst, DepthFirst, Persistent
+    summary: The type of the load balancer.
+    description: ''
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --personal-desktop-assignment-type
+    parameterValueGroup: Automatic, Direct
+    summary: PersonalDesktopAssignment type for HostPool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-rdp-property
+    summary: Custom rdp property of HostPool.
+    description: ''
+  - name: --description
+    summary: Description of HostPool.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of HostPool.
+    description: ''
+  - name: --max-session-limit
+    summary: The max session limit of HostPool.
+    description: ''
+  - name: --registration-info
+    summary: The registration info of HostPool.
+    description: >-
+      Usage: --registration-info expiration-time=XX token=XX registration-token-operation=XX
+
+
+      expiration-time: Expiration time of registration token.
+
+      token: The registration token base64 encoded string.
+
+      registration-token-operation: The type of resetting the token.
+  - name: --ring
+    summary: The ring number of HostPool.
+    description: ''
+  - name: --sso-context
+    summary: Path to keyvault containing ssoContext secret.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation-environment
+    parameterValueGroup: false, true
+    summary: Is validation environment.
+    description: ''
+  - name: --vm-template
+    summary: VM template for sessionhosts configuration within hostpool.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_delete
+  name: az desktopvirtualization hostpool delete
+  summary: Remove a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool delete --name
+                                             --resource-group
+                                             [--force {false, true}]
+  examples:
+  - summary: HostPool_Delete
+    syntax: az desktopvirtualization hostpool delete --force true --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --force
+    parameterValueGroup: false, true
+    summary: Force flag to delete sessionHost.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_list
+  name: az desktopvirtualization hostpool list
+  summary: List hostPools in subscription.
+  description: ''
+  syntax: az desktopvirtualization hostpool list [--resource-group]
+  examples:
+  - summary: HostPool_ListByResourceGroup
+    syntax: az desktopvirtualization hostpool list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_show
+  name: az desktopvirtualization hostpool show
+  summary: Get a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool show --name
+                                           --resource-group
+  examples:
+  - summary: HostPool_Get
+    syntax: az desktopvirtualization hostpool show --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_hostpool_update
+  name: az desktopvirtualization hostpool update
+  summary: Update a host pool.
+  description: ''
+  syntax: >-
+    az desktopvirtualization hostpool update --name
+                                             --resource-group
+                                             [--custom-rdp-property]
+                                             [--description]
+                                             [--friendly-name]
+                                             [--load-balancer-type {BreadthFirst, DepthFirst, Persistent}]
+                                             [--max-session-limit]
+                                             [--personal-desktop-assignment-type {Automatic, Direct}]
+                                             [--registration-info]
+                                             [--ring]
+                                             [--sso-context]
+                                             [--tags]
+                                             [--validation-environment {false, true}]
+  examples:
+  - summary: HostPool_Update
+    syntax: az desktopvirtualization hostpool update --description "des1" --friendly-name "friendly" --load-balancer-type "BreadthFirst" --max-session-limit 999999 --personal-desktop-assignment-type "Automatic" --registration-info expiration-time="2020-10-01T15:01:54.9571247Z" registration-token-operation="Update" --sso-context "KeyVaultPath" --tags tag1="value1" tag2="value2" --name "MyHostPool" --resource-group "MyResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the host pool within the specified resource group.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --custom-rdp-property
+    summary: Custom rdp property of HostPool.
+    description: ''
+  - name: --description
+    summary: Description of HostPool.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of HostPool.
+    description: ''
+  - name: --load-balancer-type
+    parameterValueGroup: BreadthFirst, DepthFirst, Persistent
+    summary: The type of the load balancer.
+    description: ''
+  - name: --max-session-limit
+    summary: The max session limit of HostPool.
+    description: ''
+  - name: --personal-desktop-assignment-type
+    parameterValueGroup: Automatic, Direct
+    summary: PersonalDesktopAssignment type for HostPool.
+    description: ''
+  - name: --registration-info
+    summary: The registration info of HostPool.
+    description: >-
+      Usage: --registration-info expiration-time=XX registration-token-operation=XX
+
+
+      expiration-time: Expiration time of registration token.
+
+      registration-token-operation: The type of resetting the token.
+  - name: --ring
+    summary: The ring number of HostPool.
+    description: ''
+  - name: --sso-context
+    summary: Path to keyvault containing ssoContext secret.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+  - name: --validation-environment
+    parameterValueGroup: false, true
+    summary: Is validation environment.
+    description: ''
+commands:
+- az_desktopvirtualization_hostpool_create
+- az_desktopvirtualization_hostpool_delete
+- az_desktopvirtualization_hostpool_list
+- az_desktopvirtualization_hostpool_show
+- az_desktopvirtualization_hostpool_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization hostpool.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/workspace.yml b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/workspace.yml
new file mode 100644
index 0000000000..dc072fadea
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/desktopvirtualization/workspace.yml
@@ -0,0 +1,160 @@
+### YamlMime:AzureCLIGroup
+uid: az_desktopvirtualization_workspace
+name: az desktopvirtualization workspace
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **desktopvirtualization** extension for Azure CLI and requires version 2.3.1 or higher.  The extension will automatically install the first time you run an **az desktopvirtualization workspace** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Desktopvirtualization workspace.
+description: ''
+directCommands:
+- uid: az_desktopvirtualization_workspace_create
+  name: az desktopvirtualization workspace create
+  summary: Create or update a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace create --location
+                                              --name
+                                              --resource-group
+                                              [--application-group-references]
+                                              [--description]
+                                              [--friendly-name]
+                                              [--tags]
+  examples:
+  - summary: Workspace_Create
+    syntax: az desktopvirtualization workspace create --resource-group "MyResourceGroup" --location "centralus" --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-group-references
+    summary: List of applicationGroup resource Ids.
+    description: ''
+  - name: --description
+    summary: Description of Workspace.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of Workspace.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_desktopvirtualization_workspace_delete
+  name: az desktopvirtualization workspace delete
+  summary: Remove a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace delete --name
+                                              --resource-group
+  examples:
+  - summary: Workspace_Delete
+    syntax: az desktopvirtualization workspace delete --resource-group "MyResourceGroup" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_list
+  name: az desktopvirtualization workspace list
+  summary: List workspaces in subscription.
+  description: ''
+  syntax: az desktopvirtualization workspace list [--resource-group]
+  examples:
+  - summary: Workspace_ListByResourceGroup
+    syntax: az desktopvirtualization workspace list --resource-group "MyResourceGroup"
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_show
+  name: az desktopvirtualization workspace show
+  summary: Get a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace show --name
+                                            --resource-group
+  examples:
+  - summary: Workspace_Get
+    syntax: az desktopvirtualization workspace show --resource-group "MyResourceGroup" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_desktopvirtualization_workspace_update
+  name: az desktopvirtualization workspace update
+  summary: Update a workspace.
+  description: ''
+  syntax: >-
+    az desktopvirtualization workspace update --name
+                                              --resource-group
+                                              [--application-group-references]
+                                              [--description]
+                                              [--friendly-name]
+                                              [--tags]
+  examples:
+  - summary: Workspace_Update
+    syntax: az desktopvirtualization workspace update --resource-group "MyResourceGroup" --description "des1" --friendly-name "friendly" --tags tag1="value1" tag2="value2" --name "MyWorkspace"
+  requiredParameters:
+  - isRequired: true
+    name: --name -n
+    summary: The name of the workspace.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --application-group-references
+    summary: List of applicationGroup links.
+    description: ''
+  - name: --description
+    summary: Description of Workspace.
+    description: ''
+  - name: --friendly-name
+    summary: Friendly name of Workspace.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+commands:
+- az_desktopvirtualization_workspace_create
+- az_desktopvirtualization_workspace_delete
+- az_desktopvirtualization_workspace_list
+- az_desktopvirtualization_workspace_show
+- az_desktopvirtualization_workspace_update
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Desktopvirtualization workspace.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops.yml b/2019-03-01-hybrid/docs-ref-autogen/devops.yml
index bee17d2a03..ed8bcfb183 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops.yml
@@ -1,87 +1,91 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops
-  name: az devops
-  summary: Manage Azure DevOps organization level operations.
-  description: >-
-    Related Groups
+### YamlMime:AzureCLIGroup
+uid: az_devops
+name: az devops
+summary: Manage Azure DevOps organization level operations.
+description: >-
+  Related Groups
 
-    az pipelines: Manage Azure Pipelines
+  az pipelines: Manage Azure Pipelines
 
-    az boards: Manage Azure Boards
+  az boards: Manage Azure Boards
 
-    az repos: Manage Azure Repos
+  az repos: Manage Azure Repos
 
-    az artifacts: Manage Azure Artifacts.
-  langs:
-  - azurecli
-  children:
-  - az_devops_configure
-  - az_devops_feedback
-  - az_devops_invoke
-  - az_devops_login
-  - az_devops_logout
+  az artifacts: Manage Azure Artifacts.
+directCommands:
 - uid: az_devops_configure
   name: az devops configure
   summary: Configure the Azure DevOps CLI or view your configuration.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops configure [--defaults]
+                        [--list]
+                        [--subscription]
+                        [--use-git-aliases {false, true}]
+  optionalParameters:
   - name: --defaults -d
     summary: Space separated 'name=value' pairs for common arguments defaults, e.g. '--defaults project=my-project-name organization=https://dev.azure.com/organizationName arg=value'. Use '' to clear the defaults, e.g. --defaults project=''.
     description: ''
   - name: --list -l
     summary: Lists the contents of the config file.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --use-git-aliases
     parameterValueGroup: false, true
     summary: Set to 'true' to configure Git aliases global git config file (to enable commands like "git pr list"). Set to 'false' to remove any aliases set by the tool.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_feedback
   name: az devops feedback
   summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: az devops feedback [--subscription]
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 - uid: az_devops_invoke
   name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
+  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - https://docs.microsoft.com/en-us/rest/api/azure/devops/.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops invoke [--accept-media-type]
+                     [--api-version]
+                     [--area]
+                     [--detect {false, true}]
+                     [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                     [--http-method {DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT}]
+                     [--in-file]
+                     [--media-type]
+                     [--org]
+                     [--out-file]
+                     [--query-parameters]
+                     [--resource]
+                     [--route-parameters]
+                     [--subscription]
   examples:
   - summary: Discover areas related to 'Wiki'
-    syntax:
-      content: az devops invoke --query "[?contains(area,'wiki')]"
+    syntax: az devops invoke --query "[?contains(area,'wiki')]"
   - summary: Get all wikis in a project
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
+    syntax: >-
+      az devops invoke --area wiki --resource wikis --route-parameters project={Project Name} -o json
 
-        az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
+      az devops invoke --area wiki --resource wikis --route-parameters project=WikiIssue -o json
   - summary: Add page to a wiki
-    syntax:
-      content: >-
-        az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
+    syntax: >-
+      az devops invoke --area wiki --resource pages --route-parameters project={Project Name}
 
-        wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
+      wikiIdentifier={Wiki Id} --in-file {Full File Path containing text to add to wiki}
 
-        --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
+      --query-parameters path={Page Path In Wiki} --http-method PUT --api-version 5.1-preview -o json
 
-        az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
+      az devops invoke --area wiki --resource pages --route-parameters project=WikiIssue
 
-        wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
+      wikiIdentifier=e479f402-2be8-4953-bb0b-3a0209cbc2d2 --in-file D:/temp/createWikiRequestBody.txt
 
-        --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
-  parameters:
+      --encoding 'utf-8' --query-parameters path=sample738 --http-method PUT --api-version 5.1-preview -o json
+  optionalParameters:
   - name: --accept-media-type
     defaultValue: application/json
     summary: Specifies the content type of the response.
@@ -115,7 +119,7 @@ items:
     summary: Specifies the content type of the request.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --out-file
     summary: Path and file name to the file  for which this function saves the response body.
@@ -135,12 +139,13 @@ items:
 - uid: az_devops_login
   name: az devops login
   summary: Set the credential (PAT) to use for a particular organization.
-  description: Refer <a href="https://aka.ms/azure-devops-cli-auth">https://aka.ms/azure-devops-cli-auth</a> for more information on providing PAT as input.
-  langs:
-  - azurecli
-  parameters:
+  description: Refer https://aka.ms/azure-devops-cli-auth for more information on providing PAT as input.
+  syntax: >-
+    az devops login [--org]
+                    [--subscription]
+  optionalParameters:
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName">https://dev.azure.com/MyOrganizationName</a>.'
+    summary: 'Azure DevOps organization URL. Example: https://dev.azure.com/MyOrganizationName.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -149,250 +154,95 @@ items:
   name: az devops logout
   summary: Clear the credential for all or a particular organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops logout [--org]
+                     [--subscription]
+  optionalParameters:
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>. If no organization is specified, all organizations will be logged out.'
+    summary: 'Azure DevOps organization URL. Example: https://dev.azure.com/MyOrganizationName/. If no organization is specified, all organizations will be logged out.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
-- uid: az_devops_configure
-  name: az devops configure
-  summary: Configure the Azure DevOps CLI or view your configuration.
-- uid: az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-- uid: az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
-- uid: az_devops_feedback
-  name: az devops feedback
-  summary: Displays information on how to provide feedback to the Azure DevOps CLI team.
-- uid: az_devops_invoke
-  name: az devops invoke
-  summary: This command will invoke request for any DevOps area and resource. Please use only json output as the response of this command is not fixed. Helpful docs - <a href="https://docs.microsoft.com/en-us/rest/api/azure/devops/">https://docs.microsoft.com/en-us/rest/api/azure/devops/</a>.
-- uid: az_devops_login
-  name: az devops login
-  summary: Set the credential (PAT) to use for a particular organization.
-- uid: az_devops_logout
-  name: az devops logout
-  summary: Clear the credential for all or a particular organization.
-- uid: az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-- uid: az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
-- uid: az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
-- uid: az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
-- uid: az_devops_team
-  name: az devops team
-  summary: Manage teams.
-- uid: az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
-- uid: az_devops_user
-  name: az devops user
-  summary: Manage users.
-- uid: az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
-- uid: az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-- uid: az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
+- az_devops_admin
+- az_devops_admin_banner
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
+- az_devops_configure
+- az_devops_extension
+- az_devops_extension_disable
+- az_devops_extension_enable
+- az_devops_extension_install
+- az_devops_extension_list
+- az_devops_extension_search
+- az_devops_extension_show
+- az_devops_extension_uninstall
+- az_devops_feedback
+- az_devops_invoke
+- az_devops_login
+- az_devops_logout
+- az_devops_project
+- az_devops_project_create
+- az_devops_project_delete
+- az_devops_project_list
+- az_devops_project_show
+- az_devops_security
+- az_devops_security_group
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
+- az_devops_security_permission
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
+- az_devops_service-endpoint
+- az_devops_service-endpoint_azurerm
+- az_devops_service-endpoint_azurerm_create
+- az_devops_service-endpoint_create
+- az_devops_service-endpoint_delete
+- az_devops_service-endpoint_github
+- az_devops_service-endpoint_github_create
+- az_devops_service-endpoint_list
+- az_devops_service-endpoint_show
+- az_devops_service-endpoint_update
+- az_devops_team
+- az_devops_team_create
+- az_devops_team_delete
+- az_devops_team_list
+- az_devops_team_list-member
+- az_devops_team_show
+- az_devops_team_update
+- az_devops_user
+- az_devops_user_add
+- az_devops_user_list
+- az_devops_user_remove
+- az_devops_user_show
+- az_devops_user_update
+- az_devops_wiki
+- az_devops_wiki_create
+- az_devops_wiki_delete
+- az_devops_wiki_list
+- az_devops_wiki_page
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
+- az_devops_wiki_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -408,13 +258,14 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: >-
-  Related Groups
+metadata:
+  description: >-
+    Related Groups
 
-  az pipelines: Manage Azure Pipelines
+    az pipelines: Manage Azure Pipelines
 
-  az boards: Manage Azure Boards
+    az boards: Manage Azure Boards
 
-  az repos: Manage Azure Repos
+    az repos: Manage Azure Repos
 
-  az artifacts: Manage Azure Artifacts.
+    az artifacts: Manage Azure Artifacts.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/admin.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/admin.yml
index 321a3a2bf8..3e73a57e9c 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/admin.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/admin.yml
@@ -1,31 +1,15 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_admin
-  name: az devops admin
-  summary: Manage administration operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_devops_admin
+name: az devops admin
+summary: Manage administration operations.
+description: ''
 commands:
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
+- az_devops_admin_banner
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -41,4 +25,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage administration operations.
+metadata:
+  description: Manage administration operations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml
index 4223ec7ca4..bf702cf069 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/admin/banner.yml
@@ -1,28 +1,27 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_admin_banner
-  name: az devops admin banner
-  summary: Manage organization banner.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_admin_banner_add
-  - az_devops_admin_banner_list
-  - az_devops_admin_banner_remove
-  - az_devops_admin_banner_show
-  - az_devops_admin_banner_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_admin_banner
+name: az devops admin banner
+summary: Manage organization banner.
+description: ''
+directCommands:
 - uid: az_devops_admin_banner_add
   name: az devops admin banner add
   summary: Add a new banner and immediately show it.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner add --message
+                               [--detect {false, true}]
+                               [--expiration]
+                               [--id]
+                               [--org]
+                               [--subscription]
+                               [--type {error, info, warning}]
+  requiredParameters:
   - isRequired: true
     name: --message -m
     summary: Message (string) to show in the banner.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -34,28 +33,34 @@ items:
     summary: Identifier for the new banner. This identifier is needed to change or remove the message later. A unique identifier is automatically created if one is not specified.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --type -t
     parameterValueGroup: error, info, warning
     summary: Type of banner to present. Defaults is "info".
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_admin_banner_list
   name: az devops admin banner list
   summary: List banners.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner list [--detect {false, true}]
+                                [--org]
+                                [--query-examples]
+                                [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -64,19 +69,23 @@ items:
   name: az devops admin banner remove
   summary: Remove a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner remove --id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the banner to remove.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -85,19 +94,27 @@ items:
   name: az devops admin banner show
   summary: Show details for a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner show --id
+                                [--detect {false, true}]
+                                [--org]
+                                [--query-examples]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Identifier for the banner.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -106,13 +123,20 @@ items:
   name: az devops admin banner update
   summary: Update the message, level, or expiration date for a banner.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops admin banner update --id
+                                  [--detect {false, true}]
+                                  [--expiration]
+                                  [--message]
+                                  [--org]
+                                  [--subscription]
+                                  [--type {error, info, warning}]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the banner to update.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -124,31 +148,21 @@ items:
     summary: Message (string) to show in the banner.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
   - name: --type -t
     parameterValueGroup: error, info, warning
     summary: Type of banner to present. Defaults is "info".
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 commands:
-- uid: az_devops_admin_banner_add
-  name: az devops admin banner add
-  summary: Add a new banner and immediately show it.
-- uid: az_devops_admin_banner_list
-  name: az devops admin banner list
-  summary: List banners.
-- uid: az_devops_admin_banner_remove
-  name: az devops admin banner remove
-  summary: Remove a banner.
-- uid: az_devops_admin_banner_show
-  name: az devops admin banner show
-  summary: Show details for a banner.
-- uid: az_devops_admin_banner_update
-  name: az devops admin banner update
-  summary: Update the message, level, or expiration date for a banner.
+- az_devops_admin_banner_add
+- az_devops_admin_banner_list
+- az_devops_admin_banner_remove
+- az_devops_admin_banner_show
+- az_devops_admin_banner_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -164,4 +178,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage organization banner.
+metadata:
+  description: Manage organization banner.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/extension.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/extension.yml
index 9d37fa3efe..2313c84136 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/extension.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/extension.yml
@@ -1,26 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_extension
-  name: az devops extension
-  summary: Manage extensions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_extension_disable
-  - az_devops_extension_enable
-  - az_devops_extension_install
-  - az_devops_extension_list
-  - az_devops_extension_search
-  - az_devops_extension_show
-  - az_devops_extension_uninstall
+### YamlMime:AzureCLIGroup
+uid: az_devops_extension
+name: az devops extension
+summary: Manage extensions.
+description: ''
+directCommands:
 - uid: az_devops_extension_disable
   name: az devops extension disable
   summary: Disable an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension disable --extension-id
+                                --publisher-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -29,12 +23,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -43,9 +38,13 @@ items:
   name: az devops extension enable
   summary: Enable an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension enable --extension-id
+                               --publisher-id
+                               [--detect {false, true}]
+                               [--org]
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -54,12 +53,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -68,9 +68,13 @@ items:
   name: az devops extension install
   summary: Install an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension install --extension-id
+                                --publisher-id
+                                [--detect {false, true}]
+                                [--org]
+                                [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -79,12 +83,13 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -93,9 +98,14 @@ items:
   name: az devops extension list
   summary: List extensions installed in an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension list [--detect {false, true}]
+                             [--include-built-in {false, true}]
+                             [--include-disabled {false, true}]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -109,7 +119,10 @@ items:
     summary: Include disabled extensions.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -118,13 +131,15 @@ items:
   name: az devops extension search
   summary: Search extensions from marketplace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension search --search-query
+                               [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --search-query -q
     summary: Search term.
     description: ''
+  optionalParameters:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -132,9 +147,14 @@ items:
   name: az devops extension show
   summary: Get detail of single extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension show --extension-id
+                             --publisher-id
+                             [--detect {false, true}]
+                             [--org]
+                             [--query-examples]
+                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -143,12 +163,16 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -157,9 +181,14 @@ items:
   name: az devops extension uninstall
   summary: Uninstall an extension.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops extension uninstall --extension-id
+                                  --publisher-id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--subscription]
+                                  [--yes]
+  requiredParameters:
   - isRequired: true
     name: --extension-id
     summary: Extension Id. This will map to extension-name                           in the az devops extension search output.
@@ -168,41 +197,28 @@ items:
     name: --publisher-id
     summary: Publisher Id. This will map to publisher-name                           in the az devops extension search output.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 commands:
-- uid: az_devops_extension_disable
-  name: az devops extension disable
-  summary: Disable an extension.
-- uid: az_devops_extension_enable
-  name: az devops extension enable
-  summary: Enable an extension.
-- uid: az_devops_extension_install
-  name: az devops extension install
-  summary: Install an extension.
-- uid: az_devops_extension_list
-  name: az devops extension list
-  summary: List extensions installed in an organization.
-- uid: az_devops_extension_search
-  name: az devops extension search
-  summary: Search extensions from marketplace.
-- uid: az_devops_extension_show
-  name: az devops extension show
-  summary: Get detail of single extension.
-- uid: az_devops_extension_uninstall
-  name: az devops extension uninstall
-  summary: Uninstall an extension.
+- az_devops_extension_disable
+- az_devops_extension_enable
+- az_devops_extension_install
+- az_devops_extension_list
+- az_devops_extension_search
+- az_devops_extension_show
+- az_devops_extension_uninstall
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -218,4 +234,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage extensions.
+metadata:
+  description: Manage extensions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/project.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/project.yml
index 2a8368296c..48b5ecfe60 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/project.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/project.yml
@@ -1,27 +1,29 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_project
-  name: az devops project
-  summary: Manage team projects.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_project_create
-  - az_devops_project_delete
-  - az_devops_project_list
-  - az_devops_project_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_project
+name: az devops project
+summary: Manage team projects.
+description: ''
+directCommands:
 - uid: az_devops_project_create
   name: az devops project create
   summary: Create a team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project create --name
+                             [--description]
+                             [--detect {false, true}]
+                             [--open]
+                             [--org]
+                             [--process]
+                             [--source-control {git, tfvc}]
+                             [--subscription]
+                             [--visibility {private, public}]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new project.
     description: ''
+  optionalParameters:
   - name: --description -d
     summary: Description for the new project.
     description: ''
@@ -33,7 +35,7 @@ items:
     summary: Open the team project in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --process -p
     summary: Process to use. Default if not specified.
@@ -43,45 +45,58 @@ items:
     parameterValueGroup: git, tfvc
     summary: Source control type of the initial code repository created.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --visibility
     defaultValue: private
     parameterValueGroup: private, public
     summary: Project visibility.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_project_delete
   name: az devops project delete
   summary: Delete team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project delete --id
+                             [--detect {false, true}]
+                             [--org]
+                             [--subscription]
+                             [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the project to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_project_list
   name: az devops project list
   summary: List team projects.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project list [--continuation-token]
+                           [--detect {false, true}]
+                           [--get-default-team-image-url {false, true}]
+                           [--org]
+                           [--query-examples]
+                           [--skip]
+                           [--state-filter {all, createPending, deleted, deleting, new, unchanged, wellFormed}]
+                           [--subscription]
+                           [--top]
+  optionalParameters:
   - name: --continuation-token
     summary: Continuation token. This can be retrived from previous run of this command if more results are present.
     description: ''
@@ -94,7 +109,10 @@ items:
     summary: Whether to get default team image url or not.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: Number of results to skip.
@@ -104,23 +122,29 @@ items:
     parameterValueGroup: all, createPending, deleted, deleting, new, unchanged, wellFormed
     summary: State filter.
     description: ''
-  - name: --top
-    summary: Maximum number of results to list.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of results to list.
+    description: ''
 - uid: az_devops_project_show
   name: az devops project show
   summary: Show team project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops project show --project
+                           [--detect {false, true}]
+                           [--open]
+                           [--org]
+                           [--query-examples]
+                           [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -129,24 +153,19 @@ items:
     summary: Open the team project in the default web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_project_create
-  name: az devops project create
-  summary: Create a team project.
-- uid: az_devops_project_delete
-  name: az devops project delete
-  summary: Delete team project.
-- uid: az_devops_project_list
-  name: az devops project list
-  summary: List team projects.
-- uid: az_devops_project_show
-  name: az devops project show
-  summary: Show team project.
+- az_devops_project_create
+- az_devops_project_delete
+- az_devops_project_list
+- az_devops_project_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -162,4 +181,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage team projects.
+metadata:
+  description: Manage team projects.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/security.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/security.yml
index ab6577b7b7..5ab75e06d0 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/security.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/security.yml
@@ -1,70 +1,28 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security
-  name: az devops security
-  summary: Manage security related operations.
-  description: ''
-  langs:
-  - azurecli
-  children: []
+### YamlMime:AzureCLIGroup
+uid: az_devops_security
+name: az devops security
+summary: Manage security related operations.
+description: ''
 commands:
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
+- az_devops_security_group
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
+- az_devops_security_permission
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -80,4 +38,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security related operations.
+metadata:
+  description: Manage security related operations.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/security/group.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/security/group.yml
index 0cda88cc2c..87050e10c0 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/security/group.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/security/group.yml
@@ -1,51 +1,48 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_group
-  name: az devops security group
-  summary: Manage security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_group_create
-  - az_devops_security_group_delete
-  - az_devops_security_group_list
-  - az_devops_security_group_show
-  - az_devops_security_group_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_group
+name: az devops security group
+summary: Manage security groups.
+description: ''
+directCommands:
 - uid: az_devops_security_group_create
   name: az devops security group create
   summary: Create a new Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops security group create [--description]
+                                    [--detect {false, true}]
+                                    [--email-id]
+                                    [--groups]
+                                    [--name]
+                                    [--org]
+                                    [--origin-id]
+                                    [--project]
+                                    [--scope {organization, project}]
+                                    [--subscription]
   examples:
   - summary: Create an Azure DevOps Group with name and description
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
+    syntax: >-
+      az devops security group create --name 'Some group name'
 
-        --description 'Something to describe this group'
+      --description 'Something to describe this group'
   - summary: Add an existing AAD group to an Azure DevOps group
-    syntax:
-      content: >-
-        Get object ID of an existing AAD group
+    syntax: >-
+      Get object ID of an existing AAD group
 
-        az ad group show -g '{Group Name}'
+      az ad group show -g '{Group Name}'
 
-        az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
+      az devops security group create --origin-id '{Object ID}' --groups 'vssgp.someDescriptorForGroup'
   - summary: Add an existing AAD group to an Azure DevOps group with AAD group Email ID
-    syntax:
-      content: >-
-        az devops security group create --email-id '{Email ID of AAD group}'
+    syntax: >-
+      az devops security group create --email-id '{Email ID of AAD group}'
 
-        --groups 'vssgp.someDescriptorForGroup'
+      --groups 'vssgp.someDescriptorForGroup'
   - summary: Create a new Azure DevOps group and add it to existing Azure DevOps groups.
-    syntax:
-      content: >-
-        az devops security group create --name 'Some group name'
+    syntax: >-
+      az devops security group create --name 'Some group name'
 
-        --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
-  parameters:
+      --groups 'vssgp.someDescriptorForGroupOne,vssgp.someDescriptorForGroupTwo'
+  optionalParameters:
   - name: --description
     summary: Description of Azure DevOps group.
     description: ''
@@ -63,7 +60,7 @@ items:
     summary: Name of Azure DevOps group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --origin-id
     summary: Create new group using the OriginID as a reference to an existing group from an external AD or AAD backed provider. Required if name or email-id is missing.
@@ -83,33 +80,45 @@ items:
   name: az devops security group delete
   summary: Delete an Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group delete --id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--subscription]
+                                    [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_security_group_list
   name: az devops security group list
   summary: List all the groups in a project or organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group list [--continuation-token]
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--project]
+                                  [--query-examples]
+                                  [--scope {organization, project}]
+                                  [--subject-types]
+                                  [--subscription]
+  optionalParameters:
   - name: --continuation-token
     summary: If there are more results that can't be returned in a single page, the result set will contain a continuation token for retrieval of the next set of results.
     description: ''
@@ -118,11 +127,14 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: List groups for a particular project.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     defaultValue: project
     parameterValueGroup: organization, project
@@ -138,19 +150,27 @@ items:
   name: az devops security group show
   summary: Show group details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group show --id
+                                  [--detect {false, true}]
+                                  [--org]
+                                  [--query-examples]
+                                  [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -159,13 +179,19 @@ items:
   name: az devops security group update
   summary: Update name AND/OR description for an Azure DevOps group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group update --id
+                                    [--description]
+                                    [--detect {false, true}]
+                                    [--name]
+                                    [--org]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Descriptor of the group.
     description: ''
+  optionalParameters:
   - name: --description
     summary: New description for Azure DevOps group.
     description: ''
@@ -177,39 +203,21 @@ items:
     summary: New name for Azure DevOps group.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_group_create
-  name: az devops security group create
-  summary: Create a new Azure DevOps group.
-- uid: az_devops_security_group_delete
-  name: az devops security group delete
-  summary: Delete an Azure DevOps group.
-- uid: az_devops_security_group_list
-  name: az devops security group list
-  summary: List all the groups in a project or organization.
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
-- uid: az_devops_security_group_show
-  name: az devops security group show
-  summary: Show group details.
-- uid: az_devops_security_group_update
-  name: az devops security group update
-  summary: Update name AND/OR description for an Azure DevOps group.
+- az_devops_security_group_create
+- az_devops_security_group_delete
+- az_devops_security_group_list
+- az_devops_security_group_membership
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
+- az_devops_security_group_show
+- az_devops_security_group_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -225,4 +233,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security groups.
+metadata:
+  description: Manage security groups.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml
index afae7695f6..32ba3cfd76 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/security/group/membership.yml
@@ -1,22 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_group_membership
-  name: az devops security group membership
-  summary: Manage memberships for security groups.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_group_membership_add
-  - az_devops_security_group_membership_list
-  - az_devops_security_group_membership_remove
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_group_membership
+name: az devops security group membership
+summary: Manage memberships for security groups.
+description: ''
+directCommands:
 - uid: az_devops_security_group_membership_add
   name: az devops security group membership add
   summary: Add membership.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership add --group-id
+                                            --member-id
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --group-id
     summary: Descriptor of the group to which member needs to be added.
@@ -25,12 +23,13 @@ items:
     name: --member-id
     summary: Descriptor of the group or Email Id of the user to be added. User should already be a part of the organization. Use `az devops user add` command to add an user to organization.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -39,19 +38,28 @@ items:
   name: az devops security group membership list
   summary: List memberships for a group or user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership list --id
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--query-examples]
+                                             [--relationship {memberof, members}]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Group descriptor or User Email whose membership details are required.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --relationship
     defaultValue: members
@@ -65,9 +73,14 @@ items:
   name: az devops security group membership remove
   summary: Remove membership.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security group membership remove --group-id
+                                               --member-id
+                                               [--detect {false, true}]
+                                               [--org]
+                                               [--subscription]
+                                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --group-id
     summary: Descriptor of the group from which member needs to be removed.
@@ -76,29 +89,24 @@ items:
     name: --member-id
     summary: Descriptor of the group or Email Id of the user to be removed.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 commands:
-- uid: az_devops_security_group_membership_add
-  name: az devops security group membership add
-  summary: Add membership.
-- uid: az_devops_security_group_membership_list
-  name: az devops security group membership list
-  summary: List memberships for a group or user.
-- uid: az_devops_security_group_membership_remove
-  name: az devops security group membership remove
-  summary: Remove membership.
+- az_devops_security_group_membership_add
+- az_devops_security_group_membership_list
+- az_devops_security_group_membership_remove
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -114,4 +122,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage memberships for security groups.
+metadata:
+  description: Manage memberships for security groups.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml
index fea65aaca1..eb0bab97d2 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission.yml
@@ -1,24 +1,23 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_permission
-  name: az devops security permission
-  summary: Manage security permissions.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_permission_list
-  - az_devops_security_permission_reset
-  - az_devops_security_permission_reset_all
-  - az_devops_security_permission_show
-  - az_devops_security_permission_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_permission
+name: az devops security permission
+summary: Manage security permissions.
+description: ''
+directCommands:
 - uid: az_devops_security_permission_list
   name: az devops security permission list
   summary: List tokens for given user/group and namespace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission list --id
+                                       --subject
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--query-examples]
+                                       [--recurse]
+                                       [--subscription]
+                                       [--token]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -27,29 +26,39 @@ items:
     name: --subject
     summary: User Email ID or Group descriptor.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --recurse
     summary: If true and this is a hierarchical namespace, return child ACLs of the specified token.
     description: ''
-  - name: --token
-    summary: Security token.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --token
+    summary: Security token.
+    description: ''
 - uid: az_devops_security_permission_reset
   name: az devops security permission reset
   summary: Reset permission for given permission bit(s).
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission reset --id
+                                        --permission-bit
+                                        --subject
+                                        --token
+                                        [--detect {false, true}]
+                                        [--org]
+                                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -66,23 +75,30 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_security_permission_reset_all
+- uid: az_devops_security_permission_reset-all
   name: az devops security permission reset-all
   summary: Clear all permissions of this token for a user/group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission reset-all --id
+                                            --subject
+                                            --token
+                                            [--detect {false, true}]
+                                            [--org]
+                                            [--subscription]
+                                            [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -95,26 +111,33 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_security_permission_show
   name: az devops security permission show
   summary: Show permissions for given token, namespace and user/group.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission show --id
+                                       --subject
+                                       --token
+                                       [--detect {false, true}]
+                                       [--org]
+                                       [--query-examples]
+                                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -127,12 +150,16 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -140,20 +167,27 @@ items:
 - uid: az_devops_security_permission_update
   name: az devops security permission update
   summary: Assign allow or deny permission to given user/group.
-  description: Learn more at <a href="https://aka.ms/azure-devops-cli-security-permission">https://aka.ms/azure-devops-cli-security-permission</a>.
-  langs:
-  - azurecli
+  description: Learn more at https://aka.ms/azure-devops-cli-security-permission.
+  syntax: >-
+    az devops security permission update --id
+                                         --subject
+                                         --token
+                                         [--allow-bit]
+                                         [--deny-bit]
+                                         [--detect {false, true}]
+                                         [--merge {false, true}]
+                                         [--org]
+                                         [--subscription]
   examples:
   - summary: Assign view, edit and delete permission for team projects.
-    syntax:
-      content: >-
-        az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
+    syntax: >-
+      az devops security permission update  --allow-bit 7 --namespace-id            52d39943-cb85-4d7f-8fa8-c6baac873819 --subject user@fabrikam.com            --token "$PROJECT:vstfs:///Classification/TeamProject/e479xxxx-2be8-xxxx-bb0b-3a0209cxxxx"
 
 
-        You would need to add the bit value of the various permission bits to
+      You would need to add the bit value of the various permission bits to
 
-        simultaneously allow/deny multiple permissions.
-  parameters:
+      simultaneously allow/deny multiple permissions.
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
@@ -166,6 +200,7 @@ items:
     name: --token
     summary: Security token.
     description: ''
+  optionalParameters:
   - name: --allow-bit
     summary: Allow bit or addition of bits. Required if --deny-bit is missing.
     description: ''
@@ -182,36 +217,20 @@ items:
     summary: If set, the existing ACE has its allow and deny merged with                          the incoming ACE's allow and deny. If unset, the existing ACE is displaced.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_permission_list
-  name: az devops security permission list
-  summary: List tokens for given user/group and namespace.
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
-- uid: az_devops_security_permission_reset
-  name: az devops security permission reset
-  summary: Reset permission for given permission bit(s).
-- uid: az_devops_security_permission_reset_all
-  name: az devops security permission reset-all
-  summary: Clear all permissions of this token for a user/group.
-- uid: az_devops_security_permission_show
-  name: az devops security permission show
-  summary: Show permissions for given token, namespace and user/group.
-- uid: az_devops_security_permission_update
-  name: az devops security permission update
-  summary: Assign allow or deny permission to given user/group.
+- az_devops_security_permission_list
+- az_devops_security_permission_namespace
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
+- az_devops_security_permission_reset
+- az_devops_security_permission_reset-all
+- az_devops_security_permission_show
+- az_devops_security_permission_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -227,4 +246,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security permissions.
+metadata:
+  description: Manage security permissions.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml
index 9b76ef9021..703b38cf0c 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/security/permission/namespace.yml
@@ -1,21 +1,20 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_security_permission_namespace
-  name: az devops security permission namespace
-  summary: Manage security namespaces.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_security_permission_namespace_list
-  - az_devops_security_permission_namespace_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_security_permission_namespace
+name: az devops security permission namespace
+summary: Manage security namespaces.
+description: ''
+directCommands:
 - uid: az_devops_security_permission_namespace_list
   name: az devops security permission namespace list
   summary: List all available namespaces for an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission namespace list [--detect {false, true}]
+                                                 [--local-only]
+                                                 [--org]
+                                                 [--query-examples]
+                                                 [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -24,7 +23,10 @@ items:
     summary: If true, retrieve only local security namespaces.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -33,30 +35,34 @@ items:
   name: az devops security permission namespace show
   summary: Show details of permissions available in each namespace.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops security permission namespace show --id
+                                                 [--detect {false, true}]
+                                                 [--org]
+                                                 [--query-examples]
+                                                 [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id --namespace-id
     summary: ID of security namespace.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_security_permission_namespace_list
-  name: az devops security permission namespace list
-  summary: List all available namespaces for an organization.
-- uid: az_devops_security_permission_namespace_show
-  name: az devops security permission namespace show
-  summary: Show details of permissions available in each namespace.
+- az_devops_security_permission_namespace_list
+- az_devops_security_permission_namespace_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -72,4 +78,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage security namespaces.
+metadata:
+  description: Manage security namespaces.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml
index e14b0060a3..5d0fba1f03 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint.yml
@@ -1,28 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint
-  name: az devops service-endpoint
-  summary: Manage service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_create
-  - az_devops_service_endpoint_delete
-  - az_devops_service_endpoint_list
-  - az_devops_service_endpoint_show
-  - az_devops_service_endpoint_update
-- uid: az_devops_service_endpoint_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint
+name: az devops service-endpoint
+summary: Manage service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_create
   name: az devops service-endpoint create
   summary: Create a service endpoint using configuration file.
-  description: You can learn more about this at <a href="https://aka.ms/azure-devops-service-endpoint-config">https://aka.ms/azure-devops-service-endpoint-config</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: You can learn more about this at https://aka.ms/azure-devops-service-endpoint-config.
+  syntax: >-
+    az devops service-endpoint create --service-endpoint-configuration
+                                      [--detect {false, true}]
+                                      [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --service-endpoint-configuration
     summary: Configuration file with service endpoint request.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -33,7 +31,7 @@ items:
     summary: Encoding of the input file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -41,17 +39,24 @@ items:
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_delete
+- uid: az_devops_service-endpoint_delete
   name: az devops service-endpoint delete
   summary: Deletes service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint delete --id
+                                      [--deep]
+                                      [--detect {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+                                      [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: Id of the service endpoint to delete.
     description: ''
+  optionalParameters:
   - name: --deep
     summary: Specific to AzureRM endpoint created in Automatic flow. When it is specified, this will also delete corresponding AAD application in Azure.
     description: ''
@@ -60,72 +65,94 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_list
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_devops_service-endpoint_list
   name: az devops service-endpoint list
   summary: List service endpoints in a project.
   description: rtypelist of VssJsonCollectionWrapper.
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint list [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_show
+- uid: az_devops_service-endpoint_show
   name: az devops service-endpoint show
   summary: Get the details of a service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint show --id
+                                    [--detect {false, true}]
+                                    [--org]
+                                    [--project]
+                                    [--query-examples]
+                                    [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the service endpoint.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_service_endpoint_update
+- uid: az_devops_service-endpoint_update
   name: az devops service-endpoint update
   summary: Update a service endpoint.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops service-endpoint update --id
+                                      [--detect {false, true}]
+                                      [--enable-for-all {false, true}]
+                                      [--org]
+                                      [--project]
+                                      [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: ID of the service endpoint.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -135,7 +162,7 @@ items:
     summary: Allow all pipelines to access this service endpoint.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -144,33 +171,15 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
-- uid: az_devops_service_endpoint_create
-  name: az devops service-endpoint create
-  summary: Create a service endpoint using configuration file.
-- uid: az_devops_service_endpoint_delete
-  name: az devops service-endpoint delete
-  summary: Deletes service endpoint.
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
-- uid: az_devops_service_endpoint_list
-  name: az devops service-endpoint list
-  summary: List service endpoints in a project.
-- uid: az_devops_service_endpoint_show
-  name: az devops service-endpoint show
-  summary: Get the details of a service endpoint.
-- uid: az_devops_service_endpoint_update
-  name: az devops service-endpoint update
-  summary: Update a service endpoint.
+- az_devops_service-endpoint_azurerm
+- az_devops_service-endpoint_azurerm_create
+- az_devops_service-endpoint_create
+- az_devops_service-endpoint_delete
+- az_devops_service-endpoint_github
+- az_devops_service-endpoint_github_create
+- az_devops_service-endpoint_list
+- az_devops_service-endpoint_show
+- az_devops_service-endpoint_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -186,4 +195,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage service endpoints/connections.
+metadata:
+  description: Manage service endpoints/connections.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml
index 753c21aaf3..fc8eaab85b 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/azurerm.yml
@@ -1,20 +1,25 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint_azurerm
-  name: az devops service-endpoint azurerm
-  summary: Manage Azure RM service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_azurerm_create
-- uid: az_devops_service_endpoint_azurerm_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint_azurerm
+name: az devops service-endpoint azurerm
+summary: Manage Azure RM service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_azurerm_create
   name: az devops service-endpoint azurerm create
   summary: Create an Azure RM type service endpoint.
-  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: For automation, set service principal password/secret in AZURE_DEVOPS_EXT_AZURE_RM_SERVICE_PRINCIPAL_KEY environment variable. You can learn more about this at https://aka.ms/azure-devops-cli-azurerm-service-endpoint.
+  syntax: >-
+    az devops service-endpoint azurerm create --azure-rm-service-principal-id
+                                              --azure-rm-subscription-id
+                                              --azure-rm-subscription-name
+                                              --azure-rm-tenant-id
+                                              --name
+                                              [--azure-rm-service-principal-certificate-path]
+                                              [--detect {false, true}]
+                                              [--org]
+                                              [--project]
+                                              [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --azure-rm-service-principal-id
     summary: Service principal id for creating azure rm service endpoint.
@@ -35,15 +40,16 @@ items:
     name: --name
     summary: Name of service endpoint to create.
     description: ''
+  optionalParameters:
   - name: --azure-rm-service-principal-certificate-path
-    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:&lt;password_here&gt;". More details : <a href="https://aka.ms/azure-devops-cli-azurerm-service-endpoint">https://aka.ms/azure-devops-cli-azurerm-service-endpoint</a>.'
+    summary: 'Path to (.pem) which is certificate. Create using command "openssl pkcs12 -in file.pfx -out file.pem -nodes -password pass:<password_here>". More details : https://aka.ms/azure-devops-cli-azurerm-service-endpoint.'
     description: ''
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -52,9 +58,7 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_azurerm_create
-  name: az devops service-endpoint azurerm create
-  summary: Create an Azure RM type service endpoint.
+- az_devops_service-endpoint_azurerm_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -70,4 +74,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage Azure RM service endpoints/connections.
+metadata:
+  description: Manage Azure RM service endpoints/connections.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml
index e42bf8ec38..2532d9b542 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/service-endpoint/github.yml
@@ -1,20 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_service_endpoint_github
-  name: az devops service-endpoint github
-  summary: Manage GitHub service endpoints/connections.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_service_endpoint_github_create
-- uid: az_devops_service_endpoint_github_create
+### YamlMime:AzureCLIGroup
+uid: az_devops_service-endpoint_github
+name: az devops service-endpoint github
+summary: Manage GitHub service endpoints/connections.
+description: ''
+directCommands:
+- uid: az_devops_service-endpoint_github_create
   name: az devops service-endpoint github create
   summary: Create a GitHub service endpoint.
-  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at <a href="https://aka.ms/azure-devops-cli-service-endpoint">https://aka.ms/azure-devops-cli-service-endpoint</a>.
-  langs:
-  - azurecli
-  parameters:
+  description: For automation, set GitHub PAT token in AZURE_DEVOPS_EXT_GITHUB_PAT environment variable. You can learn more about this at https://aka.ms/azure-devops-cli-service-endpoint.
+  syntax: >-
+    az devops service-endpoint github create --github-url
+                                             --name
+                                             [--detect {false, true}]
+                                             [--org]
+                                             [--project]
+                                             [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --github-url
     summary: Url for github for creating service endpoint.
@@ -23,12 +24,13 @@ items:
     name: --name
     summary: Name of service endpoint to create.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -37,9 +39,7 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_service_endpoint_github_create
-  name: az devops service-endpoint github create
-  summary: Create a GitHub service endpoint.
+- az_devops_service-endpoint_github_create
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -55,4 +55,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage GitHub service endpoints/connections.
+metadata:
+  description: Manage GitHub service endpoints/connections.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/team.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/team.yml
index e130a3e250..54efcf73e6 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/team.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/team.yml
@@ -1,29 +1,26 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_team
-  name: az devops team
-  summary: Manage teams.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_team_create
-  - az_devops_team_delete
-  - az_devops_team_list
-  - az_devops_team_list_member
-  - az_devops_team_show
-  - az_devops_team_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_team
+name: az devops team
+summary: Manage teams.
+description: ''
+directCommands:
 - uid: az_devops_team_create
   name: az devops team create
   summary: Create a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team create --name
+                          [--description]
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --name
     summary: Name of the new team.
     description: ''
+  optionalParameters:
   - name: --description
     summary: Description of the new team.
     description: ''
@@ -32,7 +29,7 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -44,72 +41,94 @@ items:
   name: az devops team delete
   summary: Delete a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team delete --id
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --id
     summary: The id of the team to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_team_list
   name: az devops team list
   summary: List all teams in a project.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team list [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--skip]
+                        [--subscription]
+                        [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --skip
     summary: Number of teams to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of teams to return.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
-- uid: az_devops_team_list_member
+  - name: --top
+    summary: Maximum number of teams to return.
+    description: ''
+- uid: az_devops_team_list-member
   name: az devops team list-member
   summary: List members of a team.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team list-member --team
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--skip]
+                               [--subscription]
+                               [--top]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to show members of.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -117,33 +136,42 @@ items:
   - name: --skip
     summary: Number of members to skip.
     description: ''
-  - name: --top
-    summary: Maximum number of members to return.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --top
+    summary: Maximum number of members to return.
+    description: ''
 - uid: az_devops_team_show
   name: az devops team show
   summary: Show team details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team show --team
+                        [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to show.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
@@ -151,13 +179,20 @@ items:
   name: az devops team update
   summary: Update a team's name and/or description.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops team update --team
+                          [--description]
+                          [--detect {false, true}]
+                          [--name]
+                          [--org]
+                          [--project]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --team
     summary: The name or id of the team to be updated.
     description: ''
+  optionalParameters:
   - name: --description
     summary: New description of the team.
     description: ''
@@ -169,7 +204,7 @@ items:
     summary: New name of the team.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -178,24 +213,12 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_team_create
-  name: az devops team create
-  summary: Create a team.
-- uid: az_devops_team_delete
-  name: az devops team delete
-  summary: Delete a team.
-- uid: az_devops_team_list
-  name: az devops team list
-  summary: List all teams in a project.
-- uid: az_devops_team_list_member
-  name: az devops team list-member
-  summary: List members of a team.
-- uid: az_devops_team_show
-  name: az devops team show
-  summary: Show team details.
-- uid: az_devops_team_update
-  name: az devops team update
-  summary: Update a team's name and/or description.
+- az_devops_team_create
+- az_devops_team_delete
+- az_devops_team_list
+- az_devops_team_list-member
+- az_devops_team_show
+- az_devops_team_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -211,4 +234,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage teams.
+metadata:
+  description: Manage teams.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/user.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/user.yml
index 10f8218c6f..8257e0b579 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/user.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/user.yml
@@ -1,24 +1,21 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_user
-  name: az devops user
-  summary: Manage users.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_user_add
-  - az_devops_user_list
-  - az_devops_user_remove
-  - az_devops_user_show
-  - az_devops_user_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_user
+name: az devops user
+summary: Manage users.
+description: ''
+directCommands:
 - uid: az_devops_user_add
   name: az devops user add
   summary: Add user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user add --email-id
+                       --license-type {advanced, earlyAdopter, express, professional, stakeholder}
+                       [--detect {false, true}]
+                       [--org]
+                       [--send-email-invite {false, true}]
+                       [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --email-id
     summary: Email ID of the user.
@@ -28,12 +25,13 @@ items:
     parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
     summary: License type for the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --send-email-invite
     parameterValueGroup: false, true
@@ -46,67 +44,88 @@ items:
   name: az devops user list
   summary: List users in an organization [except for users which are added via AAD groups].
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user list [--detect {false, true}]
+                        [--org]
+                        [--query-examples]
+                        [--skip]
+                        [--subscription]
+                        [--top]
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --skip
     summary: 'Offset: Number of records to skip.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --top
     defaultValue: "100"
     summary: Maximum number of users to return. Max value is 10000.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_user_remove
   name: az devops user remove
   summary: Remove user from an organization.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user remove --user
+                          [--detect {false, true}]
+                          [--org]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_user_show
   name: az devops user show
   summary: Show user details.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user show --user
+                        [--detect {false, true}]
+                        [--org]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
+    description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
@@ -115,9 +134,13 @@ items:
   name: az devops user update
   summary: Update license type for a user.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops user update --license-type {advanced, earlyAdopter, express, professional, stakeholder}
+                          --user
+                          [--detect {false, true}]
+                          [--org]
+                          [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --license-type
     parameterValueGroup: advanced, earlyAdopter, express, professional, stakeholder
@@ -127,32 +150,23 @@ items:
     name: --user
     summary: Email ID or ID of the user.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_user_add
-  name: az devops user add
-  summary: Add user.
-- uid: az_devops_user_list
-  name: az devops user list
-  summary: List users in an organization [except for users which are added via AAD groups].
-- uid: az_devops_user_remove
-  name: az devops user remove
-  summary: Remove user from an organization.
-- uid: az_devops_user_show
-  name: az devops user show
-  summary: Show user details.
-- uid: az_devops_user_update
-  name: az devops user update
-  summary: Update license type for a user.
+- az_devops_user_add
+- az_devops_user_list
+- az_devops_user_remove
+- az_devops_user_show
+- az_devops_user_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -168,4 +182,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage users.
+metadata:
+  description: Manage users.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/wiki.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/wiki.yml
index 134f191558..98722ad2b5 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/wiki.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/wiki.yml
@@ -1,33 +1,32 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_wiki
-  name: az devops wiki
-  summary: Manage wikis.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_wiki_create
-  - az_devops_wiki_delete
-  - az_devops_wiki_list
-  - az_devops_wiki_show
+### YamlMime:AzureCLIGroup
+uid: az_devops_wiki
+name: az devops wiki
+summary: Manage wikis.
+description: ''
+directCommands:
 - uid: az_devops_wiki_create
   name: az devops wiki create
   summary: Create a wiki.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki create [--detect {false, true}]
+                          [--mapped-path]
+                          [--name]
+                          [--org]
+                          [--project]
+                          [--repository]
+                          [--subscription]
+                          [--type {codewiki, projectwiki}]
+                          [--version]
   examples:
   - summary: Create a project wiki
-    syntax:
-      content: az devops wiki create --name myprojectwiki
+    syntax: az devops wiki create --name myprojectwiki
   - summary: Create a code wiki from a folder in a code repository
-    syntax:
-      content: >-
-        az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
+    syntax: >-
+      az devops wiki create --name WIKI_NAME --type codewiki --version BRANCH_NAME
 
-        --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
-  parameters:
+      --repository REPO_NAME --mapped-path PATH_TO_PUBLISH
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -39,7 +38,7 @@ items:
     summary: Name of the new wiki.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -47,6 +46,9 @@ items:
   - name: --repository -r
     summary: '[Required for codewiki type] Name or ID of the repository to publish the wiki from.'
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --type --wiki-type
     defaultValue: projectwiki
     parameterValueGroup: codewiki, projectwiki
@@ -55,60 +57,69 @@ items:
   - name: --version -v
     summary: '[Required for codewiki type] Repository branch name to publish the code wiki from.'
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_devops_wiki_delete
   name: az devops wiki delete
   summary: Delete a wiki.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki delete --wiki
+                          [--detect {false, true}]
+                          [--org]
+                          [--project]
+                          [--subscription]
+                          [--yes]
+  requiredParameters:
   - isRequired: true
     name: --wiki
     summary: Name or Id of the wiki to delete.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_wiki_list
   name: az devops wiki list
   summary: List all the wikis in a project or organization.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki list [--detect {false, true}]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--scope {organization, project}]
+                        [--subscription]
   examples:
   - summary: List all wikis for a project
-    syntax:
-      content: az devops wiki list
+    syntax: az devops wiki list
   - summary: List all wikis in the organization
-    syntax:
-      content: az devops wiki list --scope organization
-  parameters:
+    syntax: az devops wiki list --scope organization
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --scope
     defaultValue: project
     parameterValueGroup: organization, project
@@ -121,13 +132,20 @@ items:
   name: az devops wiki show
   summary: Show details of a wiki.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki show --wiki
+                        [--detect {false, true}]
+                        [--open]
+                        [--org]
+                        [--project]
+                        [--query-examples]
+                        [--subscription]
+  requiredParameters:
   - isRequired: true
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -136,42 +154,27 @@ items:
     summary: Open the wiki in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
+    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_wiki_create
-  name: az devops wiki create
-  summary: Create a wiki.
-- uid: az_devops_wiki_delete
-  name: az devops wiki delete
-  summary: Delete a wiki.
-- uid: az_devops_wiki_list
-  name: az devops wiki list
-  summary: List all the wikis in a project or organization.
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
-- uid: az_devops_wiki_show
-  name: az devops wiki show
-  summary: Show details of a wiki.
+- az_devops_wiki_create
+- az_devops_wiki_delete
+- az_devops_wiki_list
+- az_devops_wiki_page
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
+- az_devops_wiki_show
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -187,4 +190,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wikis.
+metadata:
+  description: Manage wikis.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml b/2019-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml
index 2523227065..73bb957973 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/devops/wiki/page.yml
@@ -1,30 +1,30 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_devops_wiki_page
-  name: az devops wiki page
-  summary: Manage wiki pages.
-  description: ''
-  langs:
-  - azurecli
-  children:
-  - az_devops_wiki_page_create
-  - az_devops_wiki_page_delete
-  - az_devops_wiki_page_show
-  - az_devops_wiki_page_update
+### YamlMime:AzureCLIGroup
+uid: az_devops_wiki_page
+name: az devops wiki page
+summary: Manage wiki pages.
+description: ''
+directCommands:
 - uid: az_devops_wiki_page_create
   name: az devops wiki page create
   summary: Add a new page.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki page create --path
+                               --wiki
+                               [--comment]
+                               [--content]
+                               [--detect {false, true}]
+                               [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                               [--file-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
   examples:
   - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
+    syntax: az devops wiki page create --path 'my page' --wiki myprojectwiki --content "Hello World"
   - summary: Create a new page with path 'my page' in a wiki named 'myprojectwiki' with content from a file
-    syntax:
-      content: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
-  parameters:
+    syntax: az devops wiki page create --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -33,6 +33,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Added a new page using Azure DevOps CLI
     summary: Comment in the commit message of file add operation.
@@ -53,7 +54,7 @@ items:
     summary: Path of the file input if content is specified in the file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -65,9 +66,16 @@ items:
   name: az devops wiki page delete
   summary: Delete a page.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki page delete --path
+                               --wiki
+                               [--comment]
+                               [--detect {false, true}]
+                               [--org]
+                               [--project]
+                               [--subscription]
+                               [--yes]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -76,6 +84,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Deleted the page using Azure DevOps CLI
     summary: Comment in the commit message of delete operation.
@@ -85,24 +94,33 @@ items:
     summary: Automatically detect organization.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
 - uid: az_devops_wiki_page_show
   name: az devops wiki page show
   summary: Get the content of a page or open a page.
   description: ''
-  langs:
-  - azurecli
-  parameters:
+  syntax: >-
+    az devops wiki page show --path
+                             --wiki
+                             [--detect {false, true}]
+                             [--include-content]
+                             [--open]
+                             [--org]
+                             [--project]
+                             [--query-examples]
+                             [--subscription]
+                             [--version]
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -111,6 +129,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --detect
     parameterValueGroup: false, true
     summary: Automatically detect organization.
@@ -122,31 +141,42 @@ items:
     summary: Open the wiki page in your web browser.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
     description: ''
-  - name: --version -v
-    summary: Version (ETag) of the wiki page.
+  - name: --query-examples
+    summary: Recommend JMESPath string for you. You can copy one of the query and paste it after --query parameter within double quotation marks to see the results. You can add one or more positional keywords so that we can give suggestions based on these key words.
     description: ''
   - name: --subscription
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
+  - name: --version -v
+    summary: Version (ETag) of the wiki page.
+    description: ''
 - uid: az_devops_wiki_page_update
   name: az devops wiki page update
   summary: Edit a page.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az devops wiki page update --path
+                               --version
+                               --wiki
+                               [--comment]
+                               [--content]
+                               [--detect {false, true}]
+                               [--encoding {ascii, utf-16be, utf-16le, utf-8}]
+                               [--file-path]
+                               [--org]
+                               [--project]
+                               [--subscription]
   examples:
   - summary: Update content of page with path 'my page' in a wiki named 'myprojectwiki' with inline content
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
+    syntax: az devops wiki page update --path 'my page' --wiki myprojectwiki --content "Hello World"            --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
   - summary: Update content of page with path 'my page' in a wiki with content from a file
-    syntax:
-      content: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
-  parameters:
+    syntax: az devops wiki page update --path 'my page' --wiki myprojectwiki --file-path a.txt            --encoding utf-8 --version 4ae78ad5835cb7dd55072fe210c9ee7eb6d6413b
+  requiredParameters:
   - isRequired: true
     name: --path
     summary: Path of the wiki page.
@@ -159,6 +189,7 @@ items:
     name: --wiki
     summary: Name or Id of the wiki.
     description: ''
+  optionalParameters:
   - name: --comment
     defaultValue: Updated the page using Azure DevOps CLI
     summary: Comment in the commit message of file edit operation.
@@ -179,7 +210,7 @@ items:
     summary: Path of the file input if content is specified in the file.
     description: ''
   - name: --org --organization
-    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: <a href="https://dev.azure.com/MyOrganizationName/">https://dev.azure.com/MyOrganizationName/</a>.'
+    summary: 'Azure DevOps organization URL. You can configure the default organization using az devops configure -d organization=ORG_URL. Required if not configured as default or picked up via git config. Example: https://dev.azure.com/MyOrganizationName/.'
     description: ''
   - name: --project -p
     summary: Name or ID of the project. You can configure the default project using az devops configure -d project=NAME_OR_ID. Required if not configured as default or picked up via git config.
@@ -188,18 +219,10 @@ items:
     summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
     description: ''
 commands:
-- uid: az_devops_wiki_page_create
-  name: az devops wiki page create
-  summary: Add a new page.
-- uid: az_devops_wiki_page_delete
-  name: az devops wiki page delete
-  summary: Delete a page.
-- uid: az_devops_wiki_page_show
-  name: az devops wiki page show
-  summary: Get the content of a page or open a page.
-- uid: az_devops_wiki_page_update
-  name: az devops wiki page update
-  summary: Edit a page.
+- az_devops_wiki_page_create
+- az_devops_wiki_page_delete
+- az_devops_wiki_page_show
+- az_devops_wiki_page_update
 globalParameters:
 - name: --debug
   summary: Increase logging verbosity to show all debug logs.
@@ -215,4 +238,5 @@ globalParameters:
   summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
 - name: --verbose
   summary: Increase logging verbosity. Use --debug for full debug logs.
-description: Manage wiki pages.
+metadata:
+  description: Manage wiki pages.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/disk-pool.yml b/2019-03-01-hybrid/docs-ref-autogen/disk-pool.yml
new file mode 100644
index 0000000000..49a0cde4c1
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/disk-pool.yml
@@ -0,0 +1,325 @@
+### YamlMime:AzureCLIGroup
+uid: az_disk-pool
+name: az disk-pool
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **diskpool** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az disk-pool** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage Azure disk pool.
+description: ''
+directCommands:
+- uid: az_disk-pool_create
+  name: az disk-pool create
+  summary: Create Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool create --disk-pool-name
+                        --resource-group
+                        --sku
+                        --subnet-id
+                        [--additional-capabilities]
+                        [--availability-zones]
+                        [--disks]
+                        [--location]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Create or Update Disk pool
+    syntax: az disk-pool create --location "westus" --availability-zones "1" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --subnet-id "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myvnet/subnets/mysubnet" --sku name="Basic_V0" tier="Basic" --tags key="value" --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  - isRequired: true
+    name: --sku
+    summary: Determines the SKU of the Disk Pool.
+    description: >-
+      Usage: --sku name=XX tier=XX
+
+
+      name: Required. Sku name
+
+      tier: Sku tier.
+  - isRequired: true
+    name: --subnet-id
+    summary: Azure Resource ID of a Subnet for the Disk Pool.
+    description: ''
+  optionalParameters:
+  - name: --additional-capabilities -a
+    summary: List of additional capabilities for a Disk Pool.
+    description: ''
+  - name: --availability-zones
+    summary: 'Logical zone for Disk Pool resource; example: ["1"].'
+    description: ''
+  - name: --disks
+    summary: List of Azure Managed Disks to attach to a Disk Pool.
+    description: >-
+      The order of this parameter is specific customized. Usage:  --disks id-value
+
+
+      id: Required. Unique Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --disks argument.
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_disk-pool_delete
+  name: az disk-pool delete
+  summary: Delete a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool delete --disk-pool-name
+                        --resource-group
+                        [--no-wait]
+                        [--yes]
+  examples:
+  - summary: Delete Disk pool
+    syntax: az disk-pool delete --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk-pool_list
+  name: az disk-pool list
+  summary: Gets a list of DiskPools in a resource group. And Gets a list of Disk Pools in a subscription.
+  description: ''
+  syntax: az disk-pool list [--resource-group]
+  examples:
+  - summary: List Disk Pools
+    syntax: az disk-pool list --resource-group "myResourceGroup"
+  - summary: List Disk Pools by subscription
+    syntax: az disk-pool list
+  optionalParameters:
+  - name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_list-skus
+  name: az disk-pool list-skus
+  summary: Lists available Disk Pool Skus in an Azure location.
+  description: ''
+  syntax: az disk-pool list-skus [--location]
+  examples:
+  - summary: List Disk Pool Skus
+    syntax: az disk-pool list-skus --location "eastus"
+  optionalParameters:
+  - name: --location -l
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`.'
+    description: ''
+- uid: az_disk-pool_show
+  name: az disk-pool show
+  summary: Get a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool show --disk-pool-name
+                      --resource-group
+  examples:
+  - summary: Get Disk pool
+    syntax: az disk-pool show --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_start
+  name: az disk-pool start
+  summary: The operation to start a Disk Pool.
+  description: ''
+  syntax: >-
+    az disk-pool start --disk-pool-name
+                       --resource-group
+                       [--no-wait]
+  examples:
+  - summary: Start Disk Pool
+    syntax: az disk-pool start --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_disk-pool_stop
+  name: az disk-pool stop
+  summary: Shuts down the Disk Pool and releases the compute resources. You are not billed for the compute resources that this Disk Pool uses.
+  description: ''
+  syntax: >-
+    az disk-pool stop --disk-pool-name
+                      --resource-group
+                      [--no-wait]
+  examples:
+  - summary: Deallocate Disk Pool
+    syntax: az disk-pool stop --name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+- uid: az_disk-pool_update
+  name: az disk-pool update
+  summary: Update a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool update --disk-pool-name
+                        --resource-group
+                        [--disks]
+                        [--no-wait]
+                        [--tags]
+  examples:
+  - summary: Update Disk pool
+    syntax: az disk-pool update --name "myDiskPool" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_0" --disks "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --tags key="value" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --disks
+    summary: List of Azure Managed Disks to attach to a Disk Pool.
+    description: >-
+      The order of this parameter is specific customized. Usage:  --disks id-value
+
+
+      id: Required. Unique Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --disks argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --tags
+    summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
+    description: ''
+- uid: az_disk-pool_wait
+  name: az disk-pool wait
+  summary: Place the CLI in a waiting state until a condition of the disk-pool is met.
+  description: ''
+  syntax: >-
+    az disk-pool wait --disk-pool-name
+                      --resource-group
+                      [--created]
+                      [--custom]
+                      [--deleted]
+                      [--exists]
+                      [--interval]
+                      [--timeout]
+                      [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully created.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully updated.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the disk-pool is successfully deleted.
+    syntax: az disk-pool wait --name "myDiskPool" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name --name -n
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_disk-pool_create
+- az_disk-pool_delete
+- az_disk-pool_iscsi-target
+- az_disk-pool_iscsi-target_create
+- az_disk-pool_iscsi-target_delete
+- az_disk-pool_iscsi-target_list
+- az_disk-pool_iscsi-target_show
+- az_disk-pool_iscsi-target_update
+- az_disk-pool_iscsi-target_wait
+- az_disk-pool_list
+- az_disk-pool_list-skus
+- az_disk-pool_show
+- az_disk-pool_start
+- az_disk-pool_stop
+- az_disk-pool_update
+- az_disk-pool_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage Azure disk pool.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/disk-pool/iscsi-target.yml b/2019-03-01-hybrid/docs-ref-autogen/disk-pool/iscsi-target.yml
new file mode 100644
index 0000000000..0eb020a1c3
--- /dev/null
+++ b/2019-03-01-hybrid/docs-ref-autogen/disk-pool/iscsi-target.yml
@@ -0,0 +1,289 @@
+### YamlMime:AzureCLIGroup
+uid: az_disk-pool_iscsi-target
+name: az disk-pool iscsi-target
+extensionInformation: >-
+  > [!Note]
+
+  > This reference is part of the **diskpool** extension for Azure CLI and requires version 2.15.0 or higher.  The extension will automatically install the first time you run an **az disk-pool iscsi-target** command.  [Learn more](https://docs.microsoft.com/en-us/cli/azure/azure-cli-extensions-overview) about extensions.
+summary: Manage iSCSI target with a Disk Pool.
+description: ''
+directCommands:
+- uid: az_disk-pool_iscsi-target_create
+  name: az disk-pool iscsi-target create
+  summary: Create an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target create --acl-mode {Dynamic, Static}
+                                     --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--luns]
+                                     [--no-wait]
+                                     [--static-acls]
+                                     [--target-iqn]
+  examples:
+  - summary: Create or Update iSCSI Target
+    syntax: az disk-pool iscsi-target create --disk-pool-name "myDiskPool" --acl-mode "Dynamic" --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1" --target-iqn "iqn.2005-03.org.iscsi:server1" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --acl-mode
+    parameterValueGroup: Dynamic, Static
+    summary: Mode for Target connectivity.
+    description: ''
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --luns
+    summary: List of LUNs to be exposed through iSCSI Target.
+    description: >-
+      Usage: --luns name=XX managed-disk-azure-resource-id=XX
+
+
+      name: Required. User defined name for iSCSI LUN; example: "lun0"
+
+      managed-disk-azure-resource-id: Required. Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --luns argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --static-acls
+    summary: Access Control List (ACL) for an iSCSI Target; defines LUN masking policy.
+    description: >-
+      Usage: --static-acls initiator-iqn=XX mapped-luns=XX
+
+
+      initiator-iqn: Required. iSCSI initiator IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:client".
+
+      mapped-luns: Required. List of LUN names mapped to the ACL.
+
+
+      Multiple actions can be specified by using more than one --static-acls argument.
+  - name: --target-iqn
+    summary: 'ISCSI Target IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:server".'
+    description: ''
+- uid: az_disk-pool_iscsi-target_delete
+  name: az disk-pool iscsi-target delete
+  summary: Delete an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target delete --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--no-wait]
+                                     [--yes]
+  examples:
+  - summary: Delete iSCSI Target
+    syntax: az disk-pool iscsi-target delete --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --yes -y
+    summary: Do not prompt for confirmation.
+    description: ''
+- uid: az_disk-pool_iscsi-target_list
+  name: az disk-pool iscsi-target list
+  summary: Get iSCSI Targets in a Disk pool.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target list --disk-pool-name
+                                   --resource-group
+  examples:
+  - summary: List Disk Pools by Resource Group
+    syntax: az disk-pool iscsi-target list --disk-pool-name "myDiskPool" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_iscsi-target_show
+  name: az disk-pool iscsi-target show
+  summary: Get an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target show --disk-pool-name
+                                   --iscsi-target-name
+                                   --resource-group
+  examples:
+  - summary: Get iSCSI Target
+    syntax: az disk-pool iscsi-target show --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+- uid: az_disk-pool_iscsi-target_update
+  name: az disk-pool iscsi-target update
+  summary: Update an iSCSI Target.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target update --disk-pool-name
+                                     --iscsi-target-name
+                                     --resource-group
+                                     [--luns]
+                                     [--no-wait]
+                                     [--static-acls]
+  examples:
+  - summary: Update iSCSI Target
+    syntax: az disk-pool iscsi-target update --disk-pool-name "myDiskPool" --name "myIscsiTarget" --luns name="lun0" managed-disk-azure-resource-id="/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/vm-name_DataDisk_1"
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --luns
+    summary: List of LUNs to be exposed through iSCSI Target.
+    description: >-
+      Usage: --luns name=XX managed-disk-azure-resource-id=XX
+
+
+      name: Required. User defined name for iSCSI LUN; example: "lun0"
+
+      managed-disk-azure-resource-id: Required. Azure Resource ID of the Managed Disk.
+
+
+      Multiple actions can be specified by using more than one --luns argument.
+  - name: --no-wait
+    summary: Do not wait for the long-running operation to finish.
+    description: ''
+  - name: --static-acls
+    summary: Access Control List (ACL) for an iSCSI Target; defines LUN masking policy.
+    description: >-
+      Usage: --static-acls initiator-iqn=XX mapped-luns=XX
+
+
+      initiator-iqn: Required. iSCSI initiator IQN (iSCSI Qualified Name); example: "iqn.2005-03.org.iscsi:client".
+
+      mapped-luns: Required. List of LUN names mapped to the ACL.
+
+
+      Multiple actions can be specified by using more than one --static-acls argument.
+- uid: az_disk-pool_iscsi-target_wait
+  name: az disk-pool iscsi-target wait
+  summary: Place the CLI in a waiting state until a condition of the disk-pool iscsi-target is met.
+  description: ''
+  syntax: >-
+    az disk-pool iscsi-target wait --disk-pool-name
+                                   --iscsi-target-name
+                                   --resource-group
+                                   [--created]
+                                   [--custom]
+                                   [--deleted]
+                                   [--exists]
+                                   [--interval]
+                                   [--timeout]
+                                   [--updated]
+  examples:
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully created.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --created
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully updated.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --updated
+  - summary: Pause executing next line of CLI script until the disk-pool iscsi-target is successfully deleted.
+    syntax: az disk-pool iscsi-target wait --disk-pool-name "myDiskPool" --name "myIscsiTarget" --resource-group "myResourceGroup" --deleted
+  requiredParameters:
+  - isRequired: true
+    name: --disk-pool-name
+    summary: The name of the Disk Pool.
+    description: ''
+  - isRequired: true
+    name: --iscsi-target-name --name -n
+    summary: The name of the iSCSI Target.
+    description: ''
+  - isRequired: true
+    name: --resource-group -g
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
+    description: ''
+  optionalParameters:
+  - name: --created
+    summary: Wait until created with 'provisioningState' at 'Succeeded'.
+    description: ''
+  - name: --custom
+    summary: Wait until the condition satisfies a custom JMESPath query. E.g. provisioningState!='InProgress', instanceView.statuses[?code=='PowerState/running'].
+    description: ''
+  - name: --deleted
+    summary: Wait until deleted.
+    description: ''
+  - name: --exists
+    summary: Wait until the resource exists.
+    description: ''
+  - name: --interval
+    defaultValue: "30"
+    summary: Polling interval in seconds.
+    description: ''
+  - name: --timeout
+    defaultValue: "3600"
+    summary: Maximum wait in seconds.
+    description: ''
+  - name: --updated
+    summary: Wait until updated with provisioningState at 'Succeeded'.
+    description: ''
+commands:
+- az_disk-pool_iscsi-target_create
+- az_disk-pool_iscsi-target_delete
+- az_disk-pool_iscsi-target_list
+- az_disk-pool_iscsi-target_show
+- az_disk-pool_iscsi-target_update
+- az_disk-pool_iscsi-target_wait
+globalParameters:
+- name: --debug
+  summary: Increase logging verbosity to show all debug logs.
+- name: --help -h
+  summary: Show this help message and exit.
+- name: --only-show-errors
+  summary: Only show errors, suppressing warnings.
+- name: --output -o
+  defaultValue: json
+  parameterValueGroup: json, jsonc, table, tsv
+  summary: Output format.
+- name: --query
+  summary: JMESPath query string. See <a href="http://jmespath.org/">http://jmespath.org/</a> for more information and examples.
+- name: --verbose
+  summary: Increase logging verbosity. Use --debug for full debug logs.
+metadata:
+  description: Manage iSCSI target with a Disk Pool.
diff --git a/2019-03-01-hybrid/docs-ref-autogen/disk.yml b/2019-03-01-hybrid/docs-ref-autogen/disk.yml
index 6768c2fa9b..f03808d301 100644
--- a/2019-03-01-hybrid/docs-ref-autogen/disk.yml
+++ b/2019-03-01-hybrid/docs-ref-autogen/disk.yml
@@ -1,77 +1,88 @@
-### YamlMime:UniversalReference
-items:
-- uid: az_disk
-  name: az disk
-  summary: Manage Azure Managed Disks.
-  description: >-
-    Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
+### YamlMime:AzureCLIGroup
+uid: az_disk
+name: az disk
+summary: Manage Azure Managed Disks.
+description: >-
+  Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
 
-    Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
+  Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
 
-    For more information, see:
+  For more information, see:
 
-    - Azure Disks - <a href="https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds</a> and <a href="https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds">https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds</a>.
+  - Azure Disks - https://docs.microsoft.com/azure/virtual-machines/linux/about-disks-and-vhds and https://docs.microsoft.com/azure/virtual-machines/windows/about-disks-and-vhds.
 
-    - Larger Managed Disks in Public Preview - <a href="https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/">https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/</a>
+  - Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-public-preview-of-larger-managed-disks-sizes/
 
-    - Ultra SSD Managed Disks in Public Preview - <a href="https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd">https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd</a>.
-  langs:
-  - azurecli
-  children:
-  - az_disk_create
-  - az_disk_delete
-  - az_disk_grant_access
-  - az_disk_list
-  - az_disk_revoke_access
-  - az_disk_show
-  - az_disk_update
-  - az_disk_wait
+  - Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-machines/windows/disks-ultra-ssd.
+directCommands:
 - uid: az_disk_create
   name: az disk create
   summary: Create a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk create --name
+                   --resource-group
+                   [--disk-iops-read-only]
+                   [--disk-mbps-read-only]
+                   [--enable-bursting {false, true}]
+                   [--gallery-image-reference]
+                   [--gallery-image-reference-lun]
+                   [--image-reference]
+                   [--image-reference-lun]
+                   [--location]
+                   [--logical-sector-size]
+                   [--max-shares]
+                   [--no-wait]
+                   [--os-type {Linux, Windows}]
+                   [--size-gb]
+                   [--sku {Premium_LRS, Standard_LRS}]
+                   [--source]
+                   [--source-storage-account-id]
+                   [--subscription]
+                   [--tags]
+                   [--tier]
+                   [--zone {1, 2, 3}]
   examples:
   - summary: Create a managed disk by importing from a blob uri.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --source https://vhd1234.blob.core.windows.net/vhds/osdisk1234.vhd
+    syntax: az disk create -g MyResourceGroup -n MyDisk --source https://vhd1234.blob.core.windows.net/vhds/osdisk1234.vhd
   - summary: Create an empty managed disk.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 10
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10
+  - summary: Create an empty managed disk with bursting enabled.
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 1024 --location centraluseuap --enable-bursting
   - summary: Create a managed disk by copying an existing disk or snapshot.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk2 --source MyDisk
+    syntax: az disk create -g MyResourceGroup -n MyDisk2 --source MyDisk
   - summary: Create a disk in an availability zone in the region of "East US 2"
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --location eastus2 --zone 1
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --location eastus2 --zone 1
   - summary: Create a disk from image.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --image-reference Canonical:UbuntuServer:18.04-LTS:18.04.202002180
+    syntax: az disk create -g MyResourceGroup -n MyDisk --image-reference Canonical:UbuntuServer:18.04-LTS:18.04.202002180
   - summary: Create a disk from gallery image.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --gallery-image-reference $id
+    syntax: az disk create -g MyResourceGroup -n MyDisk --gallery-image-reference $id
   - summary: Create a disk with total number of IOPS and total throughput (MBps) limitation.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --sku UltraSSD_LRS --disk-iops-read-only 200 --disk-mbps-read-only 30
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --sku UltraSSD_LRS --disk-iops-read-only 200 --disk-mbps-read-only 30
   - summary: Create a disk and specify maximum number of VMs that can attach to the disk at the same time.
-    syntax:
-      content: az disk create -g MyResourceGroup -n MyDisk --size-gb 256 --max-shares 2 -l centraluseuap
-  parameters:
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 256 --max-shares 2 -l centraluseuap
+  - summary: Create a disk and associate it with a disk access resource.
+    syntax: az disk create -g MyResourceGroup -n MyDisk --size-gb 10 --network-access-policy AllowPrivate --disk-access MyDiskAccessID
+  requiredParameters:
   - isRequired: true
     name: --name -n
     summary: The name of the managed disk.
     description: ''
   - isRequired: true
     name: --resource-group -g
-    summary: Name of resource group. You can configure the default group using `az configure --defaults group=&lt;name&gt;`.
+    summary: Name of resource group. You can configure the default group using `az configure --defaults group=<name>`.
     description: ''
+  optionalParameters:
   - name: --disk-iops-read-only
     summary: The total number of IOPS that will be allowed across all VMs mounting the shared disk as ReadOnly. One operation can transfer between 4k and 256k bytes.
     description: ''
   - name: --disk-mbps-read-only
     summary: The total throughput (MBps) that will be allowed across all VMs mounting the shared disk as ReadOnly. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10.
     description: ''
+  - name: --enable-bursting
+    parameterValueGroup: false, true
+    summary: Enable bursting beyond the provisioned performance target of the disk. Bursting is disabled by default, and it does not apply to Ultra disks.
+    description: ''
   - name: --gallery-image-reference
     summary: ID of the shared galley image version from which to create a disk.
     description: ''
@@ -85,7 +96,10 @@ items:
     summary: If the disk is created from an image's data disk, this is an index that indicates which of the data disks in the image to use. For OS disks, this field is null.
     description: ''
   - name: --location -l
-    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=&lt;location&gt;`. If location is not specified and no default location specified, location will be automatically set as same as the resource group.'
+    summary: 'Location. Values from: `az account list-locations`. You can configure the default location using `az configure --defaults location=<location>`. If location is not specified and no default location specified, location will be automatically set as same as the resource group.'
+    description: ''
+  - name: --logical-sector-size
+    summary: Logical sector size in bytes for Ultra disks. Supported values are 512 ad 4096. 4096 is the default.
     description: ''
   - name: --max-shares
     summary: The maximum number of VMs that can attach to the disk at the same time. Value greater than one indicates a disk that can be mounted on multiple VMs at the same time.
@@ -111,60 +125,71 @@ items:
   - name: --source-storage-account-id
     summary: Used when source blob is in a different subscription.
     description: ''
+  - name: --subscription
+    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
+    description: ''
   - name: --tags
     summary: 'Space-separated tags: key[=value] [key[=value] ...]. Use "" to clear existing tags.'
     description: ''
+  - name: --tier
+    summary: 'Performance tier of the disk (e.g, P4, S10) as described here: https://azure.microsoft.com/en-us/pricing/details/managed-disks/. Does not apply to Ultra disks.'
+    description: ''
   - name: --zone
     parameterValueGroup: 1, 2, 3
     summary: Availability zone into which to provision the resource.
     description: ''
-  - name: --subscription
-    summary: Name or ID of subscription. You can configure the default subscription using `az account set -s NAME_OR_ID`.
-    description: ''
 - uid: az_disk_delete
   name: az disk delete
   summary: Delete a managed disk.
   description: ''
-  langs:
-  - azurecli
+  syntax: >-
+    az disk delete [--ids]
+                   [--name]
+                   [--no-wait]
+                   [--resource-group]
+                   [--subscription]
+                   [--yes]
   examples:
   - summary: Delete a managed disk. (autogenerated)
-    syntax:
-      content: az disk delete --name MyManagedDisk --resource-group MyResourceGroup
-  parameters:
-  - name: --no-wait
-    summary: Do not wait for the long-running operation to finish.
-    description: ''
-  - name: --yes -y
-    summary: Do not prompt for confirmation.
-    description: ''
+    syntax: az disk delete --name MyManagedDisk --resource-group MyResourceGroup
+  optionalParameters:
   - name: --ids
     summary: One or more resource IDs (space-delimited). It should be a complete resource ID containing all information of 'Resource Id' arguments. You should provide either --ids or other 'Resource Id' arguments.
     description: ''
   - name: --name -n
     summary: The name of the managed disk.
     description: ''
+  - name: --no-wait